static qboolean vid_isfullscreen = false;
static qboolean vid_usingvsync = false;
+static qboolean sound_active = true;
+
static int scr_width, scr_height;
static AGLContext context;
// 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);
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;
}
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);
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, qboolean stencil, qboolean fullscreen)
+static void VID_BuildAGLAttrib(GLint *attrib, qboolean stencil, qboolean fullscreen, qboolean stereobuffer)
{
*attrib++ = AGL_RGBA;
*attrib++ = AGL_RED_SIZE;*attrib++ = 1;
}
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[] =
{
};
OSStatus carbonError;
Rect windowBounds;
+ CFStringRef windowTitle;
AGLPixelFormat pixelFormat;
GLint attributes [32];
GLenum error;
carbonError = CreateNewWindow(kDocumentWindowClass, kWindowStandardFloatingAttributes | kWindowStandardHandlerAttribute, &windowBounds, &window);
if (carbonError != noErr || window == NULL)
{
- Con_Printf("Unable to create window (error %d)\n", carbonError);
+ Con_Printf("Unable to create window (error %u)\n", (unsigned)carbonError);
return false;
}
// 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)
GetEventTypeCount(winEvents), winEvents, window, NULL);
// Create the desired attribute list
- VID_BuildAGLAttrib(attributes, bpp == 32, fullscreen);
+ VID_BuildAGLAttrib(attributes, bpp == 32, fullscreen, stereobuffer);
if (!fullscreen)
{
CGDirectDisplayID mainDisplay;
CFDictionaryRef refDisplayMode;
GDHandle gdhDisplay;
-
+
// Get the mainDisplay and set resolution to current
- mainDisplay = CGMainDisplayID ();
- CGDisplayCapture (mainDisplay);
- refDisplayMode = CGDisplayBestModeForParameters (mainDisplay, bpp, width, height, NULL);
- CGDisplaySwitchToMode (mainDisplay, refDisplayMode);
- DMGetGDeviceByDisplayID ((DisplayIDType)mainDisplay, &gdhDisplay, false);
+ 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
}
// Make the context the current one ('enable' it)
- qaglSetCurrentContext(context);
+ qaglSetCurrentContext(context);
error = qaglGetError();
if (error != AGL_NO_ERROR)
{
vid_usingmouse = false;
vid_hidden = false;
vid_activewindow = true;
+ sound_active = true;
GL_Init();
SelectWindow(window);
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;
}
default:
- Con_Printf (">> kEventClassMouse (UNKNOWN eventKind: %d) <<\n", eventKind);
+ Con_Printf (">> kEventClassMouse (UNKNOWN eventKind: %u) <<\n", (unsigned)eventKind);
break;
}
}
break;
default:
- Con_Printf (">> kEventClassKeyboard (UNKNOWN eventKind: %d) <<\n", eventKind);
+ Con_Printf (">> kEventClassKeyboard (UNKNOWN eventKind: %u) <<\n", (unsigned)eventKind);
break;
}
break;
}
case kEventClassTextInput:
- Con_Printf(">> kEventClassTextInput (%d) <<\n", eventKind);
+ Con_Printf(">> kEventClassTextInput (%d) <<\n", (int)eventKind);
break;
case kEventClassApplication:
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();
case kEventAppActiveWindowChanged:
break;
default:
- Con_Printf(">> kEventClassApplication (UNKNOWN eventKind: %d) <<\n", eventKind);
+ Con_Printf(">> kEventClassApplication (UNKNOWN eventKind: %u) <<\n", (unsigned)eventKind);
break;
}
break;
case kEventAppleEvent :
break;
default:
- Con_Printf(">> kEventClassAppleEvent (UNKNOWN eventKind: %d) <<\n", eventKind);
+ Con_Printf(">> kEventClassAppleEvent (UNKNOWN eventKind: %u) <<\n", (unsigned)eventKind);
break;
}
break;
case kEventWindowUpdate :
break;
default:
- Con_Printf(">> kEventClassWindow (UNKNOWN eventKind: %d) <<\n", eventKind);
+ Con_Printf(">> kEventClassWindow (UNKNOWN eventKind: %u) <<\n", (unsigned)eventKind);
break;
}
break;
projects / xonotic / darkplaces.git / blobdiff