fix all the () problems, and make gcc warn for them

[xonotic/darkplaces.git] / vid_agl.c

diff --git a/vid_agl.c b/vid_agl.c
index 4b2e02b1174a95625e3d0b3b795e976fbfd0d31c..8586ef07e7c8fdf7e71520133e41316e1ff5966c 100644 (file)
--- a/vid_agl.c
+++ b/vid_agl.c
@@ -78,7 +78,7 @@ static WindowRef window;
 
 static double originalMouseSpeed = -1.0;
 
-io_connect_t IN_GetIOHandle()
+io_connect_t IN_GetIOHandle(void)
 {
        io_connect_t iohandle = MACH_PORT_NULL;
        kern_return_t status;
@@ -473,13 +473,21 @@ static void VID_AppFocusChanged(qboolean windowIsActive)
                        VID_RestoreSystemGamma();
        }
 
-       if (sound_active != windowIsActive)
+       if (windowIsActive || !snd_mutewhenidle.integer)
        {
-               sound_active = windowIsActive;
-               if (sound_active)
+               if (!sound_active)
+               {
                        S_UnblockSound ();
-               else
+                       sound_active = true;
+               }
+       }
+       else
+       {
+               if (sound_active)
+               {
                        S_BlockSound ();
+                       sound_active = false;
+               }
        }
 }
 
@@ -629,7 +637,7 @@ int VID_InitMode(int fullscreen, int *width, int *height, int bpp, int refreshra
 
                // 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);
+               refDisplayMode = CGDisplayBestModeForParametersAndRefreshRateWithProperty(mainDisplay, bpp, *width, *height, refreshrate, kCGDisplayModeIsSafeForHardware, NULL);
                CGDisplaySwitchToMode(mainDisplay, refDisplayMode);
                DMGetGDeviceByDisplayID((DisplayIDType)mainDisplay, &gdhDisplay, false);
 
@@ -1121,3 +1129,49 @@ void Sys_SendKeyEvents(void)
 void IN_Move (void)
 {
 }
+
+static bool GetDictionaryBoolean(CFDictionaryRef d, const void *key)
+{
+    CFBooleanRef ref = (CFBooleanRef) CFDictionaryGetValue(d, key);
+    if(ref)
+        return CFBooleanGetValue(ref);
+    return false;
+}
+
+long GetDictionaryLong(CFDictionaryRef d, const void *key)
+{
+       long value = 0;
+    CFNumberRef ref = (CFNumberRef) CFDictionaryGetValue(d, key);
+    if(ref)
+        CFNumberGetValue(ref, kCFNumberLongType, &value);
+    return value;
+}
+
+size_t VID_ListModes(vid_mode_t *modes, size_t maxcount)
+{
+       CGDirectDisplayID mainDisplay = CGMainDisplayID();
+       CFArrayRef vidmodes = CGDisplayAvailableModes(mainDisplay);
+       CFDictionaryRef thismode;
+       unsigned int n = CFArrayGetCount(vidmodes);
+       unsigned int i;
+       size_t k;
+
+       k = 0;
+       for(i = 0; i < n; ++i)
+       {
+               thismode = (CFDictionaryRef) CFArrayGetValueAtIndex(vidmodes, i);
+               if(!GetDictionaryBoolean(thismode, kCGDisplayModeIsSafeForHardware))
+                       continue;
+
+               if(k >= maxcount)
+                       break;
+               modes[k].width = GetDictionaryLong(thismode, kCGDisplayWidth);
+               modes[k].height = GetDictionaryLong(thismode, kCGDisplayHeight);
+               modes[k].bpp = GetDictionaryLong(thismode, kCGDisplayBitsPerPixel);
+               modes[k].refreshrate = GetDictionaryLong(thismode, kCGDisplayRefreshRate);
+               modes[k].pixelheight_num = 1;
+               modes[k].pixelheight_denom = 1; // OS X doesn't expose this either
+               ++k;
+       }
+       return k;
+}