X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=vid_agl.c;h=c5c55fa2b710ffc72d34e009abe5a0acedbf1908;hb=2f311cc6db562c4a78e216f914fdbeab4227aa69;hp=b08b10dd8ce4c483f5a908c326d2aa0bf7843d8b;hpb=453ba03a61788522c17bd63c159511021c458e8b;p=xonotic%2Fdarkplaces.git

diff --git a/vid_agl.c b/vid_agl.c
index b08b10dd..c5c55fa2 100644
--- 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;
@@ -219,7 +219,7 @@ void VID_Finish (void)
 			Con_Printf("ERROR: can't %s vsync\n", vid_usevsync ? "activate" : "deactivate");
 	}
 
-	if (r_render.integer)
+	if (!vid_hidden)
 	{
 		CHECKGLERROR
 		if (r_speeds.integer == 2 || gl_finish.integer)
@@ -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;
+		}
 	}
 }
 
@@ -1122,8 +1130,26 @@ 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);