r1282 - in trunk/code: client sdl

[DONOTREPLY at icculus.org]

Author: thilo
Date: 2008-03-26 12:20:21 -0400 (Wed, 26 Mar 2008)
New Revision: 1282

Modified:
   trunk/code/client/cl_keys.c
   trunk/code/sdl/sdl_glimp.c
Log:
Make sure fullscreen does not work for in_nograb when manually Alt-Entering, too.


Modified: trunk/code/client/cl_keys.c
===================================================================
--- trunk/code/client/cl_keys.c	2008-03-26 03:13:30 UTC (rev 1281)
+++ trunk/code/client/cl_keys.c	2008-03-26 16:20:21 UTC (rev 1282)
@@ -1164,7 +1164,7 @@
 		{
 			if (keys[K_ALT].down)
 			{
-				Key_ClearStates();
+//				Key_ClearStates();  // Thilo: why should we clear the key states here?
 				Cvar_SetValue( "r_fullscreen",
 						!Cvar_VariableIntegerValue( "r_fullscreen" ) );
 				return;

Modified: trunk/code/sdl/sdl_glimp.c
===================================================================
--- trunk/code/sdl/sdl_glimp.c	2008-03-26 03:13:30 UTC (rev 1281)
+++ trunk/code/sdl/sdl_glimp.c	2008-03-26 16:20:21 UTC (rev 1282)
@@ -662,6 +662,13 @@
 				fullscreen = qtrue;
 			else
 				fullscreen = qfalse;
+				
+			if (r_fullscreen->integer && Cvar_VariableIntegerValue( "in_nograb" ))
+			{
+				ri.Printf( PRINT_ALL, "Fullscreen not allowed with in_nograb 1\n");
+				ri.Cvar_Set( "r_fullscreen", "0" );
+				r_fullscreen->modified = qfalse;
+			}
 
 			// Is the state we want different from the current state?
 			if( !!r_fullscreen->integer != fullscreen )