X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=vid_sdl.c;h=0df9e422a0b1649ca1d809584d86c9c1bdc23d13;hb=1c341aa1923856369c95aa2be1268f71e4ff65b4;hp=e5c844e5362718c3aeb0ae943bc47e05716a77cb;hpb=40453f3c58be439a5bafff7b1916b93aa049a986;p=xonotic%2Fdarkplaces.git

diff --git a/vid_sdl.c b/vid_sdl.c
index e5c844e5..0df9e422 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>
 
@@ -254,11 +255,13 @@ static int Sys_EventFilter( SDL_Event *event )
 #endif
 }
 
-static keynum_t buttonremap[16] =
+static keynum_t buttonremap[18] =
 {
 	K_MOUSE1,
 	K_MOUSE3,
 	K_MOUSE2,
+	K_MWHEELUP,
+	K_MWHEELDOWN,
 	K_MOUSE4,
 	K_MOUSE5,
 	K_MOUSE6,
@@ -297,11 +300,11 @@ void Sys_SendKeyEvents( void )
 				}
 				break;
 			case SDL_MOUSEBUTTONDOWN:
-				if (event.button.button <= 16)
+				if (event.button.button <= 18)
 					Key_Event( buttonremap[event.button.button - 1], 0, true );
 				break;
 			case SDL_MOUSEBUTTONUP:
-				if (event.button.button <= 16)
+				if (event.button.button <= 18)
 					Key_Event( buttonremap[event.button.button - 1], 0, false );
 				break;
 		}
@@ -344,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()
@@ -465,17 +473,17 @@ 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;
@@ -487,13 +495,15 @@ void VID_Finish (void)
 	//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 && !cls.demoplayback )
 		vid_usemouse = true;
 	if( vid_isfullscreen )
 		vid_usemouse = true;
@@ -501,4 +511,6 @@ void VID_Finish (void)
 		vid_usemouse = false;
 
 	IN_Activate(vid_usemouse);
+
+	VID_UpdateGamma(false, 256);
 }