X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=vid_agl.c;h=de1775c235d5a0b53ff9fe86a5fc75fb0dc411b8;hp=d86441fd47829f96dfd1275c7334129a6d33a024;hb=bf7fdc26371e2823650c8af6d78ef1e28513f7eb;hpb=eabf1215930a0d26f23c1c83cb36da40710b235f diff --git a/vid_agl.c b/vid_agl.c index d86441fd..de1775c2 100644 --- a/vid_agl.c +++ b/vid_agl.c @@ -38,6 +38,8 @@ AGLPixelFormat (*qaglChoosePixelFormat) (const AGLDevice *gdevs, GLint ndev, con 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); @@ -51,6 +53,8 @@ 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; @@ -109,7 +113,7 @@ void VID_Finish (qboolean allowmousegrab) // 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; @@ -134,8 +138,11 @@ void VID_Finish (qboolean allowmousegrab) if (r_render.integer) { + CHECKGLERROR if (r_speeds.integer || gl_finish.integer) - qglFinish(); + { + qglFinish();CHECKGLERROR + } qaglSwapBuffers(context); } VID_UpdateGamma(false, GAMMA_TABLE_SIZE); @@ -146,7 +153,7 @@ int VID_SetGamma(unsigned short *ramps, int rampsize) 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++) @@ -171,7 +178,7 @@ int VID_GetGamma(unsigned short *ramps, int rampsize) 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) @@ -179,7 +186,7 @@ int VID_GetGamma(unsigned short *ramps, int rampsize) 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; @@ -250,7 +257,7 @@ static int GL_OpenLibrary(void) 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; } @@ -261,7 +268,7 @@ void *GL_GetProcAddress(const char *name) void VID_Shutdown(void) { - if (context == NULL || window == NULL) + if (context == NULL && window == NULL) return; IN_Activate(false); @@ -273,6 +280,9 @@ void VID_Shutdown(void) context = NULL; } + if (vid_isfullscreen) + CGReleaseAllDisplays(); + if (window != NULL) { DisposeWindow(window); @@ -317,24 +327,40 @@ static OSStatus MainWindowEventHandler (EventHandlerCallRef nextHandler, EventRe 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) { vid_hidden = !vid_hidden; - vid_activewindow = false; - VID_RestoreSystemGamma(); + VID_AppFocusChanged(!vid_hidden); } // Closed if (AsyncEvent_Quitting) - { 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; @@ -351,10 +377,12 @@ static void VID_BuildAGLAttrib(GLint *attrib, int stencil, qboolean fullscreen) } if (fullscreen) *attrib++ = AGL_FULLSCREEN; + if (stereobuffer) + *attrib++ = AGL_STEREO; *attrib++ = AGL_NONE; } -int VID_InitMode(int fullscreen, int width, int height, int bpp, int refreshrate) +int VID_InitMode(int fullscreen, int width, int height, int bpp, int refreshrate, int stereobuffer) { const EventTypeSpec winEvents[] = { @@ -364,8 +392,10 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp, int refreshrate }; OSStatus carbonError; Rect windowBounds; + CFStringRef windowTitle; AGLPixelFormat pixelFormat; GLint attributes [32]; + GLenum error; if (!GL_OpenLibrary()) { @@ -377,6 +407,8 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp, int refreshrate || (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 @@ -406,43 +438,107 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp, int refreshrate } // 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 - VID_BuildAGLAttrib(attributes, bpp == 32, fullscreen); - pixelFormat = qaglChoosePixelFormat(NULL, 1, attributes); - if (pixelFormat == NULL) + // Create the desired attribute list + VID_BuildAGLAttrib(attributes, bpp == 32, fullscreen, stereobuffer); + + if (!fullscreen) + { + // 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("Unable to create pixel format\n"); + 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; @@ -457,9 +553,11 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp, int refreshrate gl_platform = "AGL"; gl_videosyncavailable = true; + vid_isfullscreen = fullscreen; vid_usingmouse = false; vid_hidden = false; vid_activewindow = true; + sound_active = true; GL_Init(); SelectWindow(window); @@ -470,36 +568,30 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp, int refreshrate 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; - 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; @@ -619,7 +711,10 @@ void Sys_SendKeyEvents(void) 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; @@ -643,9 +738,6 @@ void Sys_SendKeyEvents(void) break; } - case kEventMouseDragged: - break; - default: Con_Printf (">> kEventClassMouse (UNKNOWN eventKind: %d) <<\n", eventKind); break; @@ -703,11 +795,10 @@ void Sys_SendKeyEvents(void) switch (eventKind) { case kEventAppActivated : - vid_activewindow = true; + VID_AppFocusChanged(true); break; case kEventAppDeactivated: - vid_activewindow = false; - VID_RestoreSystemGamma(); + VID_AppFocusChanged(false); break; case kEventAppQuit: Sys_Quit();