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);
// handle the mouse state when windowed if that's changed
vid_usemouse = false;
- if (allowmousegrab && 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;
if (r_render.integer)
{
+ CHECKGLERROR
if (r_speeds.integer || gl_finish.integer)
- qglFinish();
+ {
+ qglFinish();CHECKGLERROR
+ }
qaglSwapBuffers(context);
}
VID_UpdateGamma(false, GAMMA_TABLE_SIZE);
CGGammaValue table_red [GAMMA_TABLE_SIZE];
CGGammaValue table_green [GAMMA_TABLE_SIZE];
CGGammaValue table_blue [GAMMA_TABLE_SIZE];
- unsigned int i;
+ int i;
// Convert the unsigned short table into 3 float tables
for (i = 0; i < rampsize; i++)
CGGammaValue table_green [GAMMA_TABLE_SIZE];
CGGammaValue table_blue [GAMMA_TABLE_SIZE];
CGTableCount actualsize = 0;
- unsigned int i;
+ 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 != rampsize)
+ if (actualsize != (unsigned int)rampsize)
{
Con_Printf("VID_GetGamma: ERROR: invalid gamma table size (%u != %u)\n", actualsize, rampsize);
return false;
void VID_Shutdown(void)
{
- if (context == NULL || window == NULL)
+ if (context == NULL && window == NULL)
return;
IN_Activate(false);
context = NULL;
}
+ if (vid_isfullscreen)
+ CGReleaseAllDisplays();
+
if (window != NULL)
{
DisposeWindow(window);
}
}
-static void VID_BuildAGLAttrib(GLint *attrib, int stencil, qboolean fullscreen)
+static void VID_BuildAGLAttrib(GLint *attrib, qboolean stencil, qboolean fullscreen)
{
*attrib++ = AGL_RGBA;
*attrib++ = AGL_RED_SIZE;*attrib++ = 1;
};
OSStatus carbonError;
Rect windowBounds;
+ CFStringRef windowTitle;
AGLPixelFormat pixelFormat;
GLint attributes [32];
+ GLenum error;
if (!GL_OpenLibrary())
{
|| (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
}
// Set the window title
- CFStringRef windowTitle = CFSTR("DarkPlaces AGL");
+ windowTitle = CFSTR("DarkPlaces AGL");
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);
- // Create and set pixel format
+ // Create the desired attribute list
VID_BuildAGLAttrib(attributes, bpp == 32, fullscreen);
- pixelFormat = qaglChoosePixelFormat(NULL, 1, attributes);
- if (pixelFormat == NULL)
+
+ if (!fullscreen)
{
- Con_Printf("Unable to create pixel format\n");
+ // 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));
+ }
+
+ // Make the context the current one ('enable' it)
+ qaglSetCurrentContext(context);
+ error = qaglGetError();
+ if (error != AGL_NO_ERROR)
+ {
+ Con_Printf("qaglSetCurrentContext FAILED: %s\n",
+ (char *)qaglErrorString(error));
ReleaseWindow(window);
return false;
}
- // Set context and show the window
- context = qaglCreateContext(pixelFormat, NULL);
- if (context == NULL)
- Sys_Error ("aglCreateContext failed");
+ // Discard pform
+ qaglDestroyPixelFormat(pixelFormat);
+
+ // Attempt fullscreen if requested
if (fullscreen)
{
- if (!qaglSetFullScreen (context, width, height, refreshrate, 0))
- Sys_Error("aglSetFullScreen failed");
- vid_isfullscreen = true;
+ 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
{
- if (!qaglSetDrawable(context, GetWindowPort(window)))
- Sys_Error ("aglSetDrawable failed");
+ // 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;
+ }
}
- if (!qaglSetCurrentContext(context))
- Sys_Error ("aglSetCurrentContext failed");
- qaglDestroyPixelFormat(pixelFormat);
scr_width = width;
scr_height = height;
gl_platform = "AGL";
gl_videosyncavailable = true;
+ vid_isfullscreen = fullscreen;
vid_usingmouse = false;
vid_hidden = false;
vid_activewindow = true;
static void Handle_KeyMod(UInt32 keymod)
{
+ const struct keymod_to_event_s { int 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;
- 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;
+
+ for (i = 0; i < sizeof(keymod_events) / sizeof(keymod_events[0]); i++)
{
- Key_Event(K_AUX2, '\0', (keymod & kEventKeyModifierFnMask) != 0);
+ int keybit = keymod_events[i].keybit;
+
+ if ((modChanges & keybit) != 0)
+ Key_Event(keymod_events[i].event, '\0', (keymod & keybit) != 0);
}
prev_keymod = keymod;
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 kEventMouseDragged:
{
HIPoint deltaPos;
break;
}
- case kEventMouseDragged:
- break;
-
default:
Con_Printf (">> kEventClassMouse (UNKNOWN eventKind: %d) <<\n", eventKind);
break;
projects / xonotic / darkplaces.git / blobdiff