X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=vid_sdl.c;h=65d4bcb7913e0d54468477ba481499d0a3e47b92;hb=a53125498eeac71ffa52aa0160c3de455799877b;hp=0474a26c73f19976ab8e72a5c3cbea37a4eb9844;hpb=2fc59f0ef5696f7487c1f26d81c263f720991cf8;p=xonotic%2Fdarkplaces.git

diff --git a/vid_sdl.c b/vid_sdl.c
index 0474a26c..65d4bcb7 100644
--- a/vid_sdl.c
+++ b/vid_sdl.c
@@ -23,6 +23,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 // Tell startup code that we have a client
 int cl_available = true;
+
+qboolean vid_supportrefreshrate = false;
+
 static qboolean vid_usingmouse;
 static qboolean vid_isfullscreen;
 
@@ -251,6 +254,28 @@ static int Sys_EventFilter( SDL_Event *event )
 #endif
 }
 
+static keynum_t buttonremap[18] =
+{
+	K_MOUSE1,
+	K_MOUSE3,
+	K_MOUSE2,
+	K_MWHEELUP,
+	K_MWHEELDOWN,
+	K_MOUSE4,
+	K_MOUSE5,
+	K_MOUSE6,
+	K_MOUSE7,
+	K_MOUSE8,
+	K_MOUSE9,
+	K_MOUSE10,
+	K_MOUSE11,
+	K_MOUSE12,
+	K_MOUSE13,
+	K_MOUSE14,
+	K_MOUSE15,
+	K_MOUSE16,
+};
+
 void Sys_SendKeyEvents( void )
 {
 	SDL_Event event;
@@ -274,18 +299,12 @@ void Sys_SendKeyEvents( void )
 				}
 				break;
 			case SDL_MOUSEBUTTONDOWN:
-				if( event.button.button == SDL_BUTTON_MIDDLE )
-					event.button.button = SDL_BUTTON_RIGHT;
-				else if( event.button.button == SDL_BUTTON_RIGHT )
-					event.button.button = SDL_BUTTON_MIDDLE;
-				Key_Event( K_MOUSE1 + event.button.button - 1, 0, true );
+				if (event.button.button <= 18)
+					Key_Event( buttonremap[event.button.button - 1], 0, true );
 				break;
 			case SDL_MOUSEBUTTONUP:
-				if( event.button.button == SDL_BUTTON_MIDDLE )
-					event.button.button = SDL_BUTTON_RIGHT;
-				else if( event.button.button == SDL_BUTTON_RIGHT )
-					event.button.button = SDL_BUTTON_MIDDLE;
-				Key_Event( K_MOUSE1 + event.button.button - 1, 0, false );
+				if (event.button.button <= 18)
+					Key_Event( buttonremap[event.button.button - 1], 0, false );
 				break;
 		}
 }
@@ -305,7 +324,7 @@ static int Sys_EventFilter( SDL_Event *event );
 void VID_Init (void)
 {
 	if (SDL_Init(SDL_INIT_VIDEO) < 0)
-		Sys_Error ("Failed to init video: %s\n", SDL_GetError());
+		Sys_Error ("Failed to init video: %s", SDL_GetError());
 	vid_isfullscreen = false;
 }
 
@@ -327,7 +346,13 @@ static void VID_SetCaption()
 		return;
 
 	icon = LoadIcon( GetModuleHandle( NULL ), MAKEINTRESOURCE( IDI_ICON1 ) );
-	SetClassLong( info.window, GCL_HICON, (LONG) icon );
+#ifndef SetClassLongPtr
+#define SetClassLongPtr SetClassLong
+#endif
+#ifndef GCLP_HICON
+#define GCLP_HICON GCL_HICON
+#endif
+	SetClassLongPtr( info.window, GCLP_HICON, (LONG_PTR)icon );
 }
 #else
 static void VID_SetCaption()
@@ -346,7 +371,7 @@ static void VID_OutputVersion()
 					version->major, version->minor, version->patch );
 }
 
-int VID_InitMode(int fullscreen, int width, int height, int bpp)
+int VID_InitMode(int fullscreen, int width, int height, int bpp, int refreshrate)
 {
 	int i;
 	int flags = SDL_OPENGL;
@@ -359,9 +384,7 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp)
 		We cant switch from one OpenGL video mode to another.
 		Thus we first switch to some stupid 2D mode and then back to OpenGL.
 	*/
-#ifndef MACOSX
 	SDL_SetVideoMode( 0, 0, 0, 0 );
-#endif
 
 	// SDL usually knows best
 	drivername = NULL;
@@ -376,17 +399,15 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp)
 		return false;
 	}
 
-	qglGetString = GL_GetProcAddress("glGetString");
-
-	// Knghtbrd: should do platform-specific extension string function here
-
-	if (qglGetString == NULL)
+	if ((qglGetString = (const GLubyte* (GLAPIENTRY *)(GLenum name))GL_GetProcAddress("glGetString")) == NULL)
 	{
 		VID_Shutdown();
 		Con_Print("Required OpenGL function glGetString not found\n");
 		return false;
 	}
 
+	// Knghtbrd: should do platform-specific extension string function here
+
 	vid_isfullscreen = false;
 	if (fullscreen) {
 		flags |= SDL_FULLSCREEN;
@@ -428,10 +449,10 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp)
 	// enable key repeat since everyone expects it
 	SDL_EnableKeyRepeat(SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
 
-	gl_renderer = qglGetString(GL_RENDERER);
-	gl_vendor = qglGetString(GL_VENDOR);
-	gl_version = qglGetString(GL_VERSION);
-	gl_extensions = qglGetString(GL_EXTENSIONS);
+	gl_renderer = (const char *)qglGetString(GL_RENDERER);
+	gl_vendor = (const char *)qglGetString(GL_VENDOR);
+	gl_version = (const char *)qglGetString(GL_VERSION);
+	gl_extensions = (const char *)qglGetString(GL_EXTENSIONS);
 	gl_platform = "SDL";
 	// Knghtbrd: should assign platform-specific extensions here
 	//TODO: maybe ;)
@@ -462,7 +483,7 @@ int VID_GetGamma (unsigned short *ramps)
 	return !SDL_GetGammaRamp( ramps, ramps + 256, ramps + 512);
 }
 
-void VID_Finish (void)
+void VID_Finish (qboolean allowmousegrab)
 {
 	Uint8 appstate;
 	qboolean vid_usemouse;
@@ -474,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;