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;
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;
+ }
}
}
// 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);
{
}
+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)
{
- return 0; // FIXME implement this
+ 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;
}