X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=vid_sdl.c;h=60322025dcf4f6e60c7fb1b222902e4028cd9a90;hb=9d8f9edad938a541140dd34a3c205ff3dc76c800;hp=1e6eed59be2b554f2f689d71e140ffc31e675e99;hpb=3895fb3c013e84780f76ae3a2122556d84500660;p=xonotic%2Fdarkplaces.git

diff --git a/vid_sdl.c b/vid_sdl.c
index 1e6eed59..60322025 100644
--- a/vid_sdl.c
+++ b/vid_sdl.c
@@ -16,6 +16,7 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
+#undef WIN32_LEAN_AND_MEAN  //hush a warning, SDL.h redefines this
 #include <SDL.h>
 #include <stdio.h>
 
@@ -180,7 +181,7 @@ static unsigned int tbl_sdltoquake[] =
 	0,			//SDLK_LMETA	= 310,
 	0,			//SDLK_LSUPER	= 311,		/* Left "Windows" key */
 	0,			//SDLK_RSUPER	= 312,		/* Right "Windows" key */
-	0,			//SDLK_MODE		= 313,		/* "Alt Gr" key */
+	K_ALT,			//SDLK_MODE		= 313,		/* "Alt Gr" key */
 	0,			//SDLK_COMPOSE	= 314,		/* Multi-key compose key */
 	0,			//SDLK_HELP		= 315,
 	0,			//SDLK_PRINT	= 316,
@@ -346,7 +347,12 @@ static void VID_SetCaption()
 		return;
 
 	icon = LoadIcon( GetModuleHandle( NULL ), MAKEINTRESOURCE( IDI_ICON1 ) );
-	SetClassLong( info.window, GCL_HICON, (LONG) icon );
+#ifndef _W64 //If Windows 64bit data types don't exist
+#define SetClassLongPtr SetClassLong
+#define GCLP_HICON GCL_HICON
+#define LONG_PTR LONG
+#endif
+	SetClassLongPtr( info.window, GCLP_HICON, (LONG_PTR)icon );
 }
 #else
 static void VID_SetCaption()
@@ -467,35 +473,33 @@ void VID_Shutdown (void)
 	SDL_QuitSubSystem(SDL_INIT_VIDEO);
 }
 
-int VID_SetGamma (unsigned short *ramps)
+int VID_SetGamma (unsigned short *ramps, int rampsize)
 {
-	return !SDL_SetGammaRamp (ramps, ramps + 256, ramps + 512);
+	return !SDL_SetGammaRamp (ramps, ramps + rampsize, ramps + rampsize*2);
 }
 
-int VID_GetGamma (unsigned short *ramps)
+int VID_GetGamma (unsigned short *ramps, int rampsize)
 {
-	return !SDL_GetGammaRamp( ramps, ramps + 256, ramps + 512);
+	return !SDL_GetGammaRamp (ramps, ramps + rampsize, ramps + rampsize*2);
 }
 
-void VID_Finish (void)
+void VID_Finish (qboolean allowmousegrab)
 {
 	Uint8 appstate;
 	qboolean vid_usemouse;
 
-	if (r_speeds.integer || gl_finish.integer)
-		qglFinish();
-	SDL_GL_SwapBuffers();
-
 	//react on appstate changes
 	appstate = SDL_GetAppState();
 
-	if( !( appstate & SDL_APPMOUSEFOCUS ) || !( appstate & SDL_APPINPUTFOCUS ) )
+	vid_hidden = !(appstate & SDL_APPACTIVE);
+
+	if( vid_hidden || !( appstate & SDL_APPMOUSEFOCUS ) || !( appstate & SDL_APPINPUTFOCUS ) )
 		vid_activewindow = false;
 	else
 		vid_activewindow = true;
 
 	vid_usemouse = false;
-	if( 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_isfullscreen )
 		vid_usemouse = true;
@@ -503,4 +507,16 @@ void VID_Finish (void)
 		vid_usemouse = false;
 
 	IN_Activate(vid_usemouse);
+
+	VID_UpdateGamma(false, 256);
+
+	if (r_render.integer && !vid_hidden)
+	{
+		CHECKGLERROR
+		if (r_speeds.integer || gl_finish.integer)
+		{
+			qglFinish();CHECKGLERROR
+		}
+		SDL_GL_SwapBuffers();
+	}
 }