added vid_stereobuffer cvar based on patch from syschuck on the alientrap forums

[xonotic/darkplaces.git] / vid_agl.c

diff --git a/vid_agl.c b/vid_agl.c
index aa7e8b01f9c057f7f7711f106f84ad169ae7d8f4..de1775c235d5a0b53ff9fe86a5fc75fb0dc411b8 100644 (file)
--- a/vid_agl.c
+++ b/vid_agl.c
@@ -3,7 +3,7 @@
 
        Mac OS X OpenGL and input module, using Carbon and AGL
 
 
        Mac OS X OpenGL and input module, using Carbon and AGL
 

-       Copyright (C) 2005  Mathieu Olivier
+       Copyright (C) 2005-2006  Mathieu Olivier

 
        This program is free software; you can redistribute it and/or modify
        it under the terms of the GNU General Public License as published by
 
        This program is free software; you can redistribute it and/or modify
        it under the terms of the GNU General Public License as published by


@@ -31,14 +31,19 @@
 // Tell startup code that we have a client
 int cl_available = true;
 
 // Tell startup code that we have a client
 int cl_available = true;
 

+qboolean vid_supportrefreshrate = true;
+

 // AGL prototypes
 AGLPixelFormat (*qaglChoosePixelFormat) (const AGLDevice *gdevs, GLint ndev, const GLint *attribList);
 AGLContext (*qaglCreateContext) (AGLPixelFormat pix, AGLContext share);
 GLboolean (*qaglDestroyContext) (AGLContext ctx);
 void (*qaglDestroyPixelFormat) (AGLPixelFormat pix);
 // AGL prototypes
 AGLPixelFormat (*qaglChoosePixelFormat) (const AGLDevice *gdevs, GLint ndev, const GLint *attribList);
 AGLContext (*qaglCreateContext) (AGLPixelFormat pix, AGLContext share);
 GLboolean (*qaglDestroyContext) (AGLContext ctx);
 void (*qaglDestroyPixelFormat) (AGLPixelFormat pix);

+const GLubyte* (*qaglErrorString) (GLenum code);
+GLenum (*qaglGetError) (void);

 GLboolean (*qaglSetCurrentContext) (AGLContext ctx);
 GLboolean (*qaglSetDrawable) (AGLContext ctx, AGLDrawable draw);
 GLboolean (*qaglSetFullScreen) (AGLContext ctx, GLsizei width, GLsizei height, GLsizei freq, GLint device);
 GLboolean (*qaglSetCurrentContext) (AGLContext ctx);
 GLboolean (*qaglSetDrawable) (AGLContext ctx, AGLDrawable draw);
 GLboolean (*qaglSetFullScreen) (AGLContext ctx, GLsizei width, GLsizei height, GLsizei freq, GLint device);

+GLboolean (*qaglSetInteger) (AGLContext ctx, GLenum pname, const GLint *params);

 void (*qaglSwapBuffers) (AGLContext ctx);
 
 static qboolean mouse_avail = true;
 void (*qaglSwapBuffers) (AGLContext ctx);
 
 static qboolean mouse_avail = true;


@@ -46,11 +51,14 @@ static qboolean vid_usingmouse = false;
 static float mouse_x, mouse_y;
 
 static qboolean vid_isfullscreen = false;
 static float mouse_x, mouse_y;
 
 static qboolean vid_isfullscreen = false;

+static qboolean vid_usingvsync = false;
+
+static qboolean sound_active = true;

 
 static int scr_width, scr_height;
 
 static AGLContext context;
 
 static int scr_width, scr_height;
 
 static AGLContext context;

-static         WindowRef window;
+static WindowRef window;

 
 
 void VID_GetWindowSize (int *x, int *y, int *width, int *height)
 
 
 void VID_GetWindowSize (int *x, int *y, int *width, int *height)


@@ -70,7 +78,7 @@ static void IN_Activate( qboolean grab )
                        CGPoint winCenter;
 
                        SelectWindow(window);
                        CGPoint winCenter;
 
                        SelectWindow(window);

-                       HideCursor();
+                       CGDisplayHideCursor(CGMainDisplayID());

 
                        // Put the mouse cursor at the center of the window
                        GetWindowBounds (window, kWindowContentRgn, &winBounds);
 
                        // Put the mouse cursor at the center of the window
                        GetWindowBounds (window, kWindowContentRgn, &winBounds);


@@ -90,20 +98,22 @@ static void IN_Activate( qboolean grab )
                if (vid_usingmouse)
                {
                        CGAssociateMouseAndMouseCursorPosition(true);
                if (vid_usingmouse)
                {
                        CGAssociateMouseAndMouseCursorPosition(true);

-                       ShowCursor();
+                       CGDisplayShowCursor(CGMainDisplayID());

 
                        vid_usingmouse = false;
                }
        }
 }
 
 
                        vid_usingmouse = false;
                }
        }
 }
 

-void VID_Finish (void)
+#define GAMMA_TABLE_SIZE 256
+void VID_Finish (qboolean allowmousegrab)

 {
        qboolean vid_usemouse;
 {
        qboolean vid_usemouse;

+       qboolean vid_usevsync;

 
        // handle the mouse state when windowed if that's changed
        vid_usemouse = false;
 
        // handle the mouse state when windowed if that's changed
        vid_usemouse = false;

-       if (vid_mouse.integer && !key_consoleactive && !cls.demoplayback)
+       if (allowmousegrab && vid_mouse.integer && !key_consoleactive && (key_dest != key_game || !cls.demoplayback))

                vid_usemouse = true;
        if (!vid_activewindow)
                vid_usemouse = false;
                vid_usemouse = true;
        if (!vid_activewindow)
                vid_usemouse = false;


@@ -111,24 +121,86 @@ void VID_Finish (void)
                vid_usemouse = true;
        IN_Activate(vid_usemouse);
 
                vid_usemouse = true;
        IN_Activate(vid_usemouse);
 

+       // handle changes of the vsync option
+       vid_usevsync = (vid_vsync.integer && !cls.timedemo);
+       if (vid_usingvsync != vid_usevsync)
+       {
+               GLint sync = (vid_usevsync ? 1 : 0);
+
+               if (qaglSetInteger(context, AGL_SWAP_INTERVAL, &sync) == GL_TRUE)
+               {
+                       vid_usingvsync = vid_usevsync;
+                       Con_DPrintf("Vsync %s\n", vid_usevsync ? "activated" : "deactivated");
+               }
+               else
+                       Con_Printf("ERROR: can't %s vsync\n", vid_usevsync ? "activate" : "deactivate");
+       }
+

        if (r_render.integer)
        {
        if (r_render.integer)
        {

+               CHECKGLERROR

                if (r_speeds.integer || gl_finish.integer)
                if (r_speeds.integer || gl_finish.integer)

-                       qglFinish();
+               {
+                       qglFinish();CHECKGLERROR
+               }

                qaglSwapBuffers(context);
        }
                qaglSwapBuffers(context);
        }

+       VID_UpdateGamma(false, GAMMA_TABLE_SIZE);

 }
 
 }
 

-int VID_SetGamma(unsigned short *ramps)
+int VID_SetGamma(unsigned short *ramps, int rampsize)

 {
 {

-       // TODO
-       return false;
+       CGGammaValue table_red [GAMMA_TABLE_SIZE];
+       CGGammaValue table_green [GAMMA_TABLE_SIZE];
+       CGGammaValue table_blue [GAMMA_TABLE_SIZE];
+       int i;
+
+       // Convert the unsigned short table into 3 float tables
+       for (i = 0; i < rampsize; i++)
+               table_red[i] = (float)ramps[i] / 65535.0f;
+       for (i = 0; i < rampsize; i++)
+               table_green[i] = (float)ramps[i + rampsize] / 65535.0f;
+       for (i = 0; i < rampsize; i++)
+               table_blue[i] = (float)ramps[i + 2 * rampsize] / 65535.0f;
+
+       if (CGSetDisplayTransferByTable(CGMainDisplayID(), rampsize, table_red, table_green, table_blue) != CGDisplayNoErr)
+       {
+               Con_Print("VID_SetGamma: ERROR: CGSetDisplayTransferByTable failed!\n");
+               return false;
+       }
+
+       return true;

 }
 
 }
 

-int VID_GetGamma(unsigned short *ramps)
+int VID_GetGamma(unsigned short *ramps, int rampsize)

 {
 {

-       // TODO
-       return false;
+       CGGammaValue table_red [GAMMA_TABLE_SIZE];
+       CGGammaValue table_green [GAMMA_TABLE_SIZE];
+       CGGammaValue table_blue [GAMMA_TABLE_SIZE];
+       CGTableCount actualsize = 0;
+       int i;
+
+       // Get the gamma ramps from the system
+       if (CGGetDisplayTransferByTable(CGMainDisplayID(), rampsize, table_red, table_green, table_blue, &actualsize) != CGDisplayNoErr)
+       {
+               Con_Print("VID_GetGamma: ERROR: CGGetDisplayTransferByTable failed!\n");
+               return false;
+       }
+       if (actualsize != (unsigned int)rampsize)
+       {
+               Con_Printf("VID_GetGamma: ERROR: invalid gamma table size (%u != %u)\n", actualsize, rampsize);
+               return false;
+       }
+
+       // Convert the 3 float tables into 1 unsigned short table
+       for (i = 0; i < rampsize; i++)
+               ramps[i] = table_red[i] * 65535.0f;
+       for (i = 0; i < rampsize; i++)
+               ramps[i + rampsize] = table_green[i] * 65535.0f;
+       for (i = 0; i < rampsize; i++)
+               ramps[i + 2 * rampsize] = table_blue[i] * 65535.0f;
+
+       return true;

 }
 
 void signal_handler(int sig)
 }
 
 void signal_handler(int sig)


@@ -185,7 +257,7 @@ static int GL_OpenLibrary(void)
                Con_Printf("Unable to open symbol list for %s\n", name);
                return false;
        }
                Con_Printf("Unable to open symbol list for %s\n", name);
                return false;
        }

-       strcpy(gl_driver, name);
+       strlcpy(gl_driver, name, sizeof(gl_driver));

        return true;
 }
 
        return true;
 }
 


@@ -196,7 +268,7 @@ void *GL_GetProcAddress(const char *name)
 
 void VID_Shutdown(void)
 {
 
 void VID_Shutdown(void)
 {

-       if (context == NULL || window == NULL)
+       if (context == NULL && window == NULL)

                return;
 
        IN_Activate(false);
                return;
 
        IN_Activate(false);


@@ -208,6 +280,9 @@ void VID_Shutdown(void)
                context = NULL;
        }
 
                context = NULL;
        }
 

+       if (vid_isfullscreen)
+               CGReleaseAllDisplays();
+

        if (window != NULL)
        {
                DisposeWindow(window);
        if (window != NULL)
        {
                DisposeWindow(window);


@@ -231,19 +306,16 @@ static OSStatus MainWindowEventHandler (EventHandlerCallRef nextHandler, EventRe
        switch (GetEventKind (event))
        {
                case kEventWindowClosed:
        switch (GetEventKind (event))
        {
                case kEventWindowClosed:

-                       //Con_Printf(">> kEventWindowClosed (received) <<\n");

                        AsyncEvent_Quitting = true;
                        break;
 
                // Docked (start)
                case kEventWindowCollapsing:
                        AsyncEvent_Quitting = true;
                        break;
 
                // Docked (start)
                case kEventWindowCollapsing:

-                       //Con_Printf(">> kEventWindowCollapsing (received) <<\n");

                        AsyncEvent_Collapsed = true;
                        break;
 
                // Undocked / restored (end)
                case kEventWindowExpanded:
                        AsyncEvent_Collapsed = true;
                        break;
 
                // Undocked / restored (end)
                case kEventWindowExpanded:

-                       //Con_Printf(">> kEventWindowExpanded (received) <<\n");

                        AsyncEvent_Collapsed = false;
                        break;
 
                        AsyncEvent_Collapsed = false;
                        break;
 


@@ -255,32 +327,40 @@ static OSStatus MainWindowEventHandler (EventHandlerCallRef nextHandler, EventRe
        return err;
 }
 
        return err;
 }
 

+static void VID_AppFocusChanged(qboolean windowIsActive)
+{
+       if (vid_activewindow != windowIsActive)
+       {
+               vid_activewindow = windowIsActive;
+               if (!vid_activewindow)
+                       VID_RestoreSystemGamma();
+       }
+
+       if (sound_active != windowIsActive)
+       {
+               sound_active = windowIsActive;
+               if (sound_active)
+                       S_UnblockSound ();
+               else
+                       S_BlockSound ();
+       }
+}
+

 static void VID_ProcessPendingAsyncEvents (void)
 {
        // Collapsed / expanded
        if (AsyncEvent_Collapsed != vid_hidden)
        {
 static void VID_ProcessPendingAsyncEvents (void)
 {
        // Collapsed / expanded
        if (AsyncEvent_Collapsed != vid_hidden)
        {

-               /*
-               if (vid_hidden)
-                       Con_Printf(">> kEventWindowExpanded (processed) <<\n");
-               else
-                       Con_Printf(">> kEventWindowCollapsing (processed) <<\n");
-               */
-

                vid_hidden = !vid_hidden;
                vid_hidden = !vid_hidden;

-               vid_activewindow = false;
-               VID_RestoreSystemGamma();
+               VID_AppFocusChanged(!vid_hidden);

        }
 
        // Closed
        if (AsyncEvent_Quitting)
        }
 
        // Closed
        if (AsyncEvent_Quitting)

-       {
-               //Con_Printf(">> kEventWindowClosed (processed) <<\n");

                Sys_Quit();
                Sys_Quit();

-       }

 }
 
 }
 

-static void VID_BuildAGLAttrib(GLint *attrib, int stencil, qboolean fullscreen)
+static void VID_BuildAGLAttrib(GLint *attrib, qboolean stencil, qboolean fullscreen, qboolean stereobuffer)

 {
        *attrib++ = AGL_RGBA;
        *attrib++ = AGL_RED_SIZE;*attrib++ = 1;
 {
        *attrib++ = AGL_RGBA;
        *attrib++ = AGL_RED_SIZE;*attrib++ = 1;


@@ -288,6 +368,7 @@ static void VID_BuildAGLAttrib(GLint *attrib, int stencil, qboolean fullscreen)
        *attrib++ = AGL_BLUE_SIZE;*attrib++ = 1;
        *attrib++ = AGL_DOUBLEBUFFER;
        *attrib++ = AGL_DEPTH_SIZE;*attrib++ = 1;
        *attrib++ = AGL_BLUE_SIZE;*attrib++ = 1;
        *attrib++ = AGL_DOUBLEBUFFER;
        *attrib++ = AGL_DEPTH_SIZE;*attrib++ = 1;

+

        // if stencil is enabled, ask for alpha too
        if (stencil)
        {
        // if stencil is enabled, ask for alpha too
        if (stencil)
        {


@@ -296,10 +377,12 @@ static void VID_BuildAGLAttrib(GLint *attrib, int stencil, qboolean fullscreen)
        }
        if (fullscreen)
                *attrib++ = AGL_FULLSCREEN;
        }
        if (fullscreen)
                *attrib++ = AGL_FULLSCREEN;

+       if (stereobuffer)
+               *attrib++ = AGL_STEREO;

        *attrib++ = AGL_NONE;
 }
 
        *attrib++ = AGL_NONE;
 }
 

-int VID_InitMode(int fullscreen, int width, int height, int bpp)
+int VID_InitMode(int fullscreen, int width, int height, int bpp, int refreshrate, int stereobuffer)

 {
     const EventTypeSpec winEvents[] =
        {
 {
     const EventTypeSpec winEvents[] =
        {


@@ -309,9 +392,10 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp)
        };
        OSStatus carbonError;
        Rect windowBounds;
        };
        OSStatus carbonError;
        Rect windowBounds;

-       GDHandle screen;
+       CFStringRef windowTitle;

        AGLPixelFormat pixelFormat;
        GLint attributes [32];
        AGLPixelFormat pixelFormat;
        GLint attributes [32];

+       GLenum error;

 
        if (!GL_OpenLibrary())
        {
 
        if (!GL_OpenLibrary())
        {


@@ -319,14 +403,17 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp)
                return false;
        }
 
                return false;
        }
 

-       if ((qaglChoosePixelFormat = GL_GetProcAddress("aglChoosePixelFormat")) == NULL
-        || (qaglCreateContext = GL_GetProcAddress("aglCreateContext")) == NULL
-        || (qaglDestroyContext = GL_GetProcAddress("aglDestroyContext")) == NULL
-        || (qaglDestroyPixelFormat = GL_GetProcAddress("aglDestroyPixelFormat")) == NULL
-        || (qaglSetCurrentContext = GL_GetProcAddress("aglSetCurrentContext")) == NULL
-        || (qaglSetDrawable = GL_GetProcAddress("aglSetDrawable")) == NULL
-        || (qaglSetFullScreen = GL_GetProcAddress("aglSetFullScreen")) == NULL
-        || (qaglSwapBuffers = GL_GetProcAddress("aglSwapBuffers")) == NULL
+       if ((qaglChoosePixelFormat = (AGLPixelFormat (*) (const AGLDevice *gdevs, GLint ndev, const GLint *attribList))GL_GetProcAddress("aglChoosePixelFormat")) == NULL
+        || (qaglCreateContext = (AGLContext (*) (AGLPixelFormat pix, AGLContext share))GL_GetProcAddress("aglCreateContext")) == NULL
+        || (qaglDestroyContext = (GLboolean (*) (AGLContext ctx))GL_GetProcAddress("aglDestroyContext")) == NULL
+        || (qaglDestroyPixelFormat = (void (*) (AGLPixelFormat pix))GL_GetProcAddress("aglDestroyPixelFormat")) == NULL
+        || (qaglErrorString = (const GLubyte* (*) (GLenum code))GL_GetProcAddress("aglErrorString")) == NULL
+        || (qaglGetError = (GLenum (*) (void))GL_GetProcAddress("aglGetError")) == NULL
+        || (qaglSetCurrentContext = (GLboolean (*) (AGLContext ctx))GL_GetProcAddress("aglSetCurrentContext")) == NULL
+        || (qaglSetDrawable = (GLboolean (*) (AGLContext ctx, AGLDrawable draw))GL_GetProcAddress("aglSetDrawable")) == NULL
+        || (qaglSetFullScreen = (GLboolean (*) (AGLContext ctx, GLsizei width, GLsizei height, GLsizei freq, GLint device))GL_GetProcAddress("aglSetFullScreen")) == NULL
+        || (qaglSetInteger = (GLboolean (*) (AGLContext ctx, GLenum pname, const GLint *params))GL_GetProcAddress("aglSetInteger")) == NULL
+        || (qaglSwapBuffers = (void (*) (AGLContext ctx))GL_GetProcAddress("aglSwapBuffers")) == NULL

        )
        {
                Con_Printf("AGL functions not found\n");
        )
        {
                Con_Printf("AGL functions not found\n");


@@ -338,9 +425,11 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp)
        AsyncEvent_Quitting = false;
        AsyncEvent_Collapsed = false;
 
        AsyncEvent_Quitting = false;
        AsyncEvent_Collapsed = false;
 

-       // Create the window
-       SetRect(&windowBounds, 0, 0, width, height);
-       OffsetRect(&windowBounds, 100, 100);  // move it a bit towards the center of the screen
+       // Create the window, a bit towards the center of the screen
+       windowBounds.left = 100;
+       windowBounds.top = 100;
+       windowBounds.right = width + 100;
+       windowBounds.bottom = height + 100;

        carbonError = CreateNewWindow(kDocumentWindowClass, kWindowStandardFloatingAttributes | kWindowStandardHandlerAttribute, &windowBounds, &window);
        if (carbonError != noErr || window == NULL)
        {
        carbonError = CreateNewWindow(kDocumentWindowClass, kWindowStandardFloatingAttributes | kWindowStandardHandlerAttribute, &windowBounds, &window);
        if (carbonError != noErr || window == NULL)
        {


@@ -349,42 +438,107 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp)
        }
 
        // Set the window title
        }
 
        // Set the window title

-       CFStringRef windowTitle = CFSTR("DarkPlaces AGL");
+       windowTitle = CFSTR("DarkPlaces AGL");

        SetWindowTitleWithCFString(window, windowTitle);
        SetWindowTitleWithCFString(window, windowTitle);

-       CFRelease(windowTitle);

 
        // Install the callback function for the window events we can't get
        // through ReceiveNextEvent (i.e. close, collapse, and expand)
        InstallWindowEventHandler (window, NewEventHandlerUPP (MainWindowEventHandler),
                                                           GetEventTypeCount(winEvents), winEvents, window, NULL);
 
 
        // Install the callback function for the window events we can't get
        // through ReceiveNextEvent (i.e. close, collapse, and expand)
        InstallWindowEventHandler (window, NewEventHandlerUPP (MainWindowEventHandler),
                                                           GetEventTypeCount(winEvents), winEvents, window, NULL);
 

-       screen = GetGWorldDevice(GetWindowPort(window));
-       if (screen == NULL)
+       // Create the desired attribute list
+       VID_BuildAGLAttrib(attributes, bpp == 32, fullscreen, stereobuffer);
+
+       if (!fullscreen)

        {
        {

-               Con_Printf("Unable to get GDevice for window\n");
-               ReleaseWindow(window);
-               return false;
+               // Output to Window
+               pixelFormat = qaglChoosePixelFormat(NULL, 0, attributes);
+               error = qaglGetError();
+               if (error != AGL_NO_ERROR)
+               {
+                       Con_Printf("qaglChoosePixelFormat FAILED: %s\n",
+                                       (char *)qaglErrorString(error));
+                       ReleaseWindow(window);
+                       return false;
+               }
+       }
+       else  // Output is fullScreen
+       {
+               CGDirectDisplayID mainDisplay;
+               CFDictionaryRef refDisplayMode;
+               GDHandle gdhDisplay;
+
+               // Get the mainDisplay and set resolution to current
+               mainDisplay = CGMainDisplayID();
+               CGDisplayCapture(mainDisplay);
+
+               // TOCHECK: not sure whether or not it's necessary to change the resolution
+               // "by hand", or if aglSetFullscreen does the job anyway
+               refDisplayMode = CGDisplayBestModeForParametersAndRefreshRate(mainDisplay, bpp, width, height, refreshrate, NULL);
+               CGDisplaySwitchToMode(mainDisplay, refDisplayMode);
+               DMGetGDeviceByDisplayID((DisplayIDType)mainDisplay, &gdhDisplay, false);
+
+               // Set pixel format with built attribs
+               // Note: specifying a device is *required* for AGL_FullScreen
+               pixelFormat = qaglChoosePixelFormat(&gdhDisplay, 1, attributes);
+               error = qaglGetError();
+               if (error != AGL_NO_ERROR)
+               {
+                       Con_Printf("qaglChoosePixelFormat FAILED: %s\n",
+                                               (char *)qaglErrorString(error));
+                       ReleaseWindow(window);
+                       return false;
+               }
+       }
+
+       // Create a context using the pform
+       context = qaglCreateContext(pixelFormat, NULL);
+       error = qaglGetError();
+       if (error != AGL_NO_ERROR)
+       {
+               Con_Printf("qaglCreateContext FAILED: %s\n",
+                                       (char *)qaglErrorString(error));

        }
 
        }
 

-       // Create and set pixel format
-       VID_BuildAGLAttrib(attributes, bpp == 32, fullscreen);
-       pixelFormat = qaglChoosePixelFormat(&screen, 1, attributes);
-       if (pixelFormat == NULL)
+       // Make the context the current one ('enable' it)
+       qaglSetCurrentContext(context);
+       error = qaglGetError();
+       if (error != AGL_NO_ERROR)

        {
        {

-               Con_Printf("Unable to create pixel format\n");
+               Con_Printf("qaglSetCurrentContext FAILED: %s\n",
+                                       (char *)qaglErrorString(error));

                ReleaseWindow(window);
                return false;
        }
 
                ReleaseWindow(window);
                return false;
        }
 

-       // Set context and show the window
-       context = qaglCreateContext(pixelFormat, NULL);
+       // Discard pform

        qaglDestroyPixelFormat(pixelFormat);
        qaglDestroyPixelFormat(pixelFormat);

-       if (context == NULL)
-               Sys_Error ("aglCreateContext failed\n");
-       if (!qaglSetDrawable(context, GetWindowPort(window)))
-               Sys_Error ("aglSetDrawable failed\n");
-       if (!qaglSetCurrentContext(context))
-               Sys_Error ("aglSetCurrentContext failed\n");
+
+       // Attempt fullscreen if requested
+       if (fullscreen)
+       {
+               qaglSetFullScreen (context, width, height, refreshrate, 0);
+               error = qaglGetError();
+               if (error != AGL_NO_ERROR)
+               {
+                       Con_Printf("qaglSetFullScreen FAILED: %s\n",
+                                               (char *)qaglErrorString(error));
+                       return false;
+               }
+       }
+       else
+       {
+               // Set Window as Drawable
+               qaglSetDrawable(context, GetWindowPort(window));
+               error = qaglGetError();
+               if (error != AGL_NO_ERROR)
+               {
+                       Con_Printf("qaglSetDrawable FAILED: %s\n",
+                                               (char *)qaglErrorString(error));
+                       ReleaseWindow(window);
+                       return false;
+               }
+       }

 
        scr_width = width;
        scr_height = height;
 
        scr_width = width;
        scr_height = height;


@@ -392,23 +546,18 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp)
        if ((qglGetString = (const GLubyte* (GLAPIENTRY *)(GLenum name))GL_GetProcAddress("glGetString")) == NULL)
                Sys_Error("glGetString not found in %s", gl_driver);
 
        if ((qglGetString = (const GLubyte* (GLAPIENTRY *)(GLenum name))GL_GetProcAddress("glGetString")) == NULL)
                Sys_Error("glGetString not found in %s", gl_driver);
 

-       if (fullscreen)
-       {
-               if (!qaglSetFullScreen (context, width, height, 0, 0))
-                       Sys_Error("aglSetFullScreen failed\n");
-               vid_isfullscreen = true;
-       }
-

        gl_renderer = (const char *)qglGetString(GL_RENDERER);
        gl_vendor = (const char *)qglGetString(GL_VENDOR);
        gl_version = (const char *)qglGetString(GL_VERSION);
        gl_extensions = (const char *)qglGetString(GL_EXTENSIONS);
        gl_platform = "AGL";
        gl_renderer = (const char *)qglGetString(GL_RENDERER);
        gl_vendor = (const char *)qglGetString(GL_VENDOR);
        gl_version = (const char *)qglGetString(GL_VERSION);
        gl_extensions = (const char *)qglGetString(GL_EXTENSIONS);
        gl_platform = "AGL";

-       gl_videosyncavailable = false;
+       gl_videosyncavailable = true;

 
 

+       vid_isfullscreen = fullscreen;

        vid_usingmouse = false;
        vid_hidden = false;
        vid_activewindow = true;
        vid_usingmouse = false;
        vid_hidden = false;
        vid_activewindow = true;

+       sound_active = true;

        GL_Init();
 
        SelectWindow(window);
        GL_Init();
 
        SelectWindow(window);


@@ -419,42 +568,36 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp)
 
 static void Handle_KeyMod(UInt32 keymod)
 {
 
 static void Handle_KeyMod(UInt32 keymod)
 {

+       const struct keymod_to_event_s { UInt32 keybit; keynum_t event; } keymod_events [] =
+       {
+               { cmdKey,                                               K_AUX1 },
+               { shiftKey,                                             K_SHIFT },
+               { alphaLock,                                    K_CAPSLOCK },
+               { optionKey,                                    K_ALT },
+               { controlKey,                                   K_CTRL },
+               { kEventKeyModifierNumLockMask, K_NUMLOCK },
+               { kEventKeyModifierFnMask,              K_AUX2 }
+       };

        static UInt32 prev_keymod = 0;
        static UInt32 prev_keymod = 0;

-       UInt32 modChanges = prev_keymod ^ keymod;
+       unsigned int i;
+       UInt32 modChanges;

 
 

-       if ((modChanges & cmdKey) != 0)
-       {
-               Key_Event(K_AUX1, '\0', (keymod & cmdKey) != 0);
-       }
-       if ((modChanges & shiftKey) != 0 || (modChanges & rightShiftKey) != 0)
-       {
-               Key_Event(K_SHIFT, '\0', (keymod & shiftKey) != 0);
-       }
-       if ((modChanges & alphaLock) != 0)
-       {
-               Key_Event(K_CAPSLOCK, '\0', (keymod & alphaLock) != 0);
-       }
-       if ((modChanges & optionKey) != 0 || (modChanges & rightOptionKey) != 0)
-       {
-               Key_Event(K_ALT, '\0', (keymod & optionKey) != 0);
-       }
-       if ((modChanges & controlKey) != 0 || (modChanges & rightControlKey) != 0)
-       {
-               Key_Event(K_CTRL, '\0', (keymod & controlKey) != 0);
-       }
-       if ((modChanges & kEventKeyModifierNumLockMask) != 0)
-       {
-               Key_Event(K_NUMLOCK, '\0', (keymod & kEventKeyModifierNumLockMask) != 0);
-       }
-       if ((modChanges & kEventKeyModifierFnMask) != 0)
+       modChanges = prev_keymod ^ keymod;
+       if (modChanges == 0)
+               return;
+
+       for (i = 0; i < sizeof(keymod_events) / sizeof(keymod_events[0]); i++)

        {
        {

-               Key_Event(K_AUX2, '\0', (keymod & kEventKeyModifierFnMask) != 0);
+               UInt32 keybit = keymod_events[i].keybit;
+
+               if ((modChanges & keybit) != 0)
+                       Key_Event(keymod_events[i].event, '\0', (keymod & keybit) != 0);

        }
 
        prev_keymod = keymod;
 }
 
        }
 
        prev_keymod = keymod;
 }
 

-static void Handle_Key(qbyte charcode, qboolean keypressed)
+static void Handle_Key(unsigned char charcode, qboolean keypressed)

 {
        unsigned int keycode = 0;
        char ascii = '\0';
 {
        unsigned int keycode = 0;
        char ascii = '\0';


@@ -503,8 +646,9 @@ static void Handle_Key(qbyte charcode, qboolean keypressed)
                case kDeleteCharCode:
                        keycode = K_DEL;
                        break;
                case kDeleteCharCode:
                        keycode = K_DEL;
                        break;

+               case 0:

                case 191:
                case 191:

-                       // char 191 is sent by the mouse buttons (?!)
+                       // characters 0 and 191 are sent by the mouse buttons (?!)

                        break;
                default:
                        if ('A' <= charcode && charcode <= 'Z')
                        break;
                default:
                        if ('A' <= charcode && charcode <= 'Z')


@@ -512,7 +656,7 @@ static void Handle_Key(qbyte charcode, qboolean keypressed)
                                keycode = charcode + ('a' - 'A');  // lowercase it
                                ascii = charcode;
                        }
                                keycode = charcode + ('a' - 'A');  // lowercase it
                                ascii = charcode;
                        }

-                       else if (32 <= charcode && charcode <= 126)
+                       else if (charcode >= 32)

                        {
                                keycode = charcode;
                                ascii = charcode;
                        {
                                keycode = charcode;
                                ascii = charcode;


@@ -556,26 +700,25 @@ void Sys_SendKeyEvents(void)
                                                        default:
                                                        case kEventMouseButtonPrimary:
                                                                key = K_MOUSE1;
                                                        default:
                                                        case kEventMouseButtonPrimary:
                                                                key = K_MOUSE1;

-                                                               //Con_Printf(">> kEventMouseButtonPrimary <<\n");

                                                                break;
                                                        case kEventMouseButtonSecondary:
                                                                key = K_MOUSE2;
                                                                break;
                                                        case kEventMouseButtonSecondary:
                                                                key = K_MOUSE2;

-                                                               //Con_Printf(">> kEventMouseButtonSecondary <<\n");

                                                                break;
                                                        case kEventMouseButtonTertiary:
                                                                key = K_MOUSE3;
                                                                break;
                                                        case kEventMouseButtonTertiary:
                                                                key = K_MOUSE3;

-                                                               //Con_Printf(">> kEventMouseButtonTertiary <<\n");

                                                                break;
                                                }
                                                Key_Event(key, '\0', eventKind == kEventMouseDown);
                                                break;
 
                                                                break;
                                                }
                                                Key_Event(key, '\0', eventKind == kEventMouseDown);
                                                break;
 

+                                       // Note: These two events are mutual exclusives
+                                       // Treat MouseDragged in the same statement, so we don't block MouseMoved while a mousebutton is held

                                        case kEventMouseMoved:
                                        case kEventMouseMoved:

+                                       case kEventMouseDragged:

                                        {
                                                HIPoint deltaPos;
 
                                                GetEventParameter(theEvent, kEventParamMouseDelta, typeHIPoint, NULL, sizeof(deltaPos), NULL, &deltaPos);
                                        {
                                                HIPoint deltaPos;
 
                                                GetEventParameter(theEvent, kEventParamMouseDelta, typeHIPoint, NULL, sizeof(deltaPos), NULL, &deltaPos);

-                                               //Con_Printf(">> kEventMouseMoved (%f, %f) <<\n", deltaPos.x, deltaPos.y);

 
                                                mouse_x += deltaPos.x;
                                                mouse_y += deltaPos.y;
 
                                                mouse_x += deltaPos.x;
                                                mouse_y += deltaPos.y;


@@ -588,7 +731,6 @@ void Sys_SendKeyEvents(void)
                                                unsigned int wheelEvent;
 
                                                GetEventParameter(theEvent, kEventParamMouseWheelDelta, typeSInt32, NULL, sizeof(delta), NULL, &delta);
                                                unsigned int wheelEvent;
 
                                                GetEventParameter(theEvent, kEventParamMouseWheelDelta, typeSInt32, NULL, sizeof(delta), NULL, &delta);

-                                               //Con_Printf(">> kEventMouseWheelMoved (delta: %d) <<\n", delta);

 
                                                wheelEvent = (delta > 0) ? K_MWHEELUP : K_MWHEELDOWN;
                                                Key_Event(wheelEvent, 0, true);
 
                                                wheelEvent = (delta > 0) ? K_MWHEELUP : K_MWHEELDOWN;
                                                Key_Event(wheelEvent, 0, true);


@@ -596,10 +738,6 @@ void Sys_SendKeyEvents(void)
                                                break;
                                        }
 
                                                break;
                                        }
 

-                                       case kEventMouseDragged:
-                                               //Con_Printf(">> kEventMouseDragged <<\n");
-                                               break;
-

                                        default:
                                                Con_Printf (">> kEventClassMouse (UNKNOWN eventKind: %d) <<\n", eventKind);
                                                break;
                                        default:
                                                Con_Printf (">> kEventClassMouse (UNKNOWN eventKind: %d) <<\n", eventKind);
                                                break;


@@ -615,17 +753,14 @@ void Sys_SendKeyEvents(void)
                                        case kEventRawKeyDown:
                                                GetEventParameter(theEvent, kEventParamKeyMacCharCodes, typeChar, NULL, sizeof(keycode), NULL, &keycode);
                                                Handle_Key(keycode, true);
                                        case kEventRawKeyDown:
                                                GetEventParameter(theEvent, kEventParamKeyMacCharCodes, typeChar, NULL, sizeof(keycode), NULL, &keycode);
                                                Handle_Key(keycode, true);

-                                               //Con_Printf(">> kEventRawKeyDown (%d) <<\n", keycode);

                                                break;
 
                                        case kEventRawKeyRepeat:
                                                break;
 
                                        case kEventRawKeyRepeat:

-                                               //Con_Printf(">> kEventRawKeyRepeat <<\n");

                                                break;
 
                                        case kEventRawKeyUp:
                                                GetEventParameter(theEvent, kEventParamKeyMacCharCodes, typeChar, NULL, sizeof(keycode), NULL, &keycode);
                                                Handle_Key(keycode, false);
                                                break;
 
                                        case kEventRawKeyUp:
                                                GetEventParameter(theEvent, kEventParamKeyMacCharCodes, typeChar, NULL, sizeof(keycode), NULL, &keycode);
                                                Handle_Key(keycode, false);

-                                               //Con_Printf(">> kEventRawKeyUp (%d) <<\n", keycode);

                                                break;
 
                                        case kEventRawKeyModifiersChanged:
                                                break;
 
                                        case kEventRawKeyModifiersChanged:


@@ -633,20 +768,16 @@ void Sys_SendKeyEvents(void)
                                                UInt32 keymod = 0;
                                                GetEventParameter(theEvent, kEventParamKeyModifiers, typeUInt32, NULL, sizeof(keymod), NULL, &keymod);
                                                Handle_KeyMod(keymod);
                                                UInt32 keymod = 0;
                                                GetEventParameter(theEvent, kEventParamKeyModifiers, typeUInt32, NULL, sizeof(keymod), NULL, &keymod);
                                                Handle_KeyMod(keymod);

-                                               //Con_Printf(">> kEventRawKeyModifiersChanged (0x%08X) <<\n", keymod);

                                                break;
                                        }
 
                                        case kEventHotKeyPressed:
                                                break;
                                        }
 
                                        case kEventHotKeyPressed:

-                                               //Con_Printf(">> kEventHotKeyPressed <<\n");

                                                break;
 
                                        case kEventHotKeyReleased:
                                                break;
 
                                        case kEventHotKeyReleased:

-                                               //Con_Printf(">> kEventHotKeyReleased <<\n");

                                                break;
 
                                        case kEventMouseWheelMoved:
                                                break;
 
                                        case kEventMouseWheelMoved:

-                                               //Con_Printf(">> kEventMouseWheelMoved - via a keyboard event (!?) <<\n");

                                                break;
 
                                        default:
                                                break;
 
                                        default:


@@ -664,20 +795,15 @@ void Sys_SendKeyEvents(void)
                                switch (eventKind)
                                {
                                        case kEventAppActivated :
                                switch (eventKind)
                                {
                                        case kEventAppActivated :

-                                               //Con_Printf(">> kEventAppActivated <<\n");
-                                               vid_activewindow = true;
+                                               VID_AppFocusChanged(true);

                                                break;
                                        case kEventAppDeactivated:
                                                break;
                                        case kEventAppDeactivated:

-                                               //Con_Printf(">> kEventAppDeactivated <<\n");
-                                               vid_activewindow = false;
-                                               VID_RestoreSystemGamma();
+                                               VID_AppFocusChanged(false);

                                                break;
                                        case kEventAppQuit:
                                                break;
                                        case kEventAppQuit:

-                                               //Con_Printf(">> kEventAppQuit <<\n");

                                                Sys_Quit();
                                                break;
                                        case kEventAppActiveWindowChanged:
                                                Sys_Quit();
                                                break;
                                        case kEventAppActiveWindowChanged:

-                                               //Con_Printf(">> kEventAppActiveWindowChanged <<\n");

                                                break;
                                        default:
                                                Con_Printf(">> kEventClassApplication (UNKNOWN eventKind: %d) <<\n", eventKind);
                                                break;
                                        default:
                                                Con_Printf(">> kEventClassApplication (UNKNOWN eventKind: %d) <<\n", eventKind);


@@ -689,7 +815,6 @@ void Sys_SendKeyEvents(void)
                                switch (eventKind)
                                {
                                        case kEventAppleEvent :
                                switch (eventKind)
                                {
                                        case kEventAppleEvent :

-                                               //Con_Printf(">> kEventAppleEvent <<\n");

                                                break;
                                        default:
                                                Con_Printf(">> kEventClassAppleEvent (UNKNOWN eventKind: %d) <<\n", eventKind);
                                                break;
                                        default:
                                                Con_Printf(">> kEventClassAppleEvent (UNKNOWN eventKind: %d) <<\n", eventKind);


@@ -701,7 +826,6 @@ void Sys_SendKeyEvents(void)
                                switch (eventKind)
                                {
                                        case kEventWindowUpdate :
                                switch (eventKind)
                                {
                                        case kEventWindowUpdate :

-                                               //Con_Printf(">> kEventWindowUpdate <<\n");

                                                break;
                                        default:
                                                Con_Printf(">> kEventClassWindow (UNKNOWN eventKind: %d) <<\n", eventKind);
                                                break;
                                        default:
                                                Con_Printf(">> kEventClassWindow (UNKNOWN eventKind: %d) <<\n", eventKind);


@@ -710,7 +834,6 @@ void Sys_SendKeyEvents(void)
                                break;
 
                        case kEventClassControl:
                                break;
 
                        case kEventClassControl:

-                               //Con_Printf(">> kEventClassControl (%d) <<\n", eventKind);

                                break;
 
                        default:
                                break;
 
                        default: