X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=vid_sdl.c;h=d18b5a42506c640b52b5c23275cfbd4c3b3c8a6c;hb=24dc8f4f68c57d500a0f97c5d6834be22b27c604;hp=3a636cc17ab7c9555052b85705752672854f643c;hpb=64a00997d5d76bae2e6aae5e2de6ac17ea3504a9;p=xonotic%2Fdarkplaces.git

diff --git a/vid_sdl.c b/vid_sdl.c
index 3a636cc1..d18b5a42 100644
--- a/vid_sdl.c
+++ b/vid_sdl.c
@@ -22,6 +22,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "quakedef.h"
 
+#ifdef WIN32
+#define SDL_R_RESTART
+#endif
+
 // Tell startup code that we have a client
 int cl_available = true;
 
@@ -49,7 +53,8 @@ cvar_t joy_sensitivitypitch = {0, "joy_sensitivitypitch", "1", "movement multipl
 cvar_t joy_sensitivityyaw = {0, "joy_sensitivityyaw", "-1", "movement multiplier"};
 cvar_t joy_sensitivityroll = {0, "joy_sensitivityroll", "1", "movement multiplier"};
 
-static qboolean vid_usingmouse;
+static qboolean vid_usingmouse = false;
+static qboolean vid_usinghidecursor = false;
 static qboolean vid_isfullscreen;
 static int vid_numjoysticks = 0;
 #define MAX_JOYSTICKS 8
@@ -232,29 +237,18 @@ static int MapKey( unsigned int sdlkey )
     return tbl_sdltoquake[ sdlkey ];
 }
 
-void VID_GrabMouse(qboolean grab)
+void VID_SetMouse(qboolean fullscreengrab, qboolean relative, qboolean hidecursor)
 {
-	//SDL_WM_GrabInput( SDL_GRAB_OFF );
-	//Con_Printf("< Turning off input-grabbing. --blub\n");
-	if (grab)
+	if (vid_usingmouse != relative)
 	{
-		if (!vid_usingmouse)
-		{
-			vid_usingmouse = true;
-			cl_ignoremousemoves = 2;
-			SDL_WM_GrabInput( SDL_GRAB_ON );
-			SDL_ShowCursor( SDL_DISABLE );
-		}
+		vid_usingmouse = relative;
+		cl_ignoremousemoves = 2;
+		SDL_WM_GrabInput( relative ? SDL_GRAB_ON : SDL_GRAB_OFF );
 	}
-	else
+	if (vid_usinghidecursor != hidecursor)
 	{
-		if (vid_usingmouse)
-		{
-			vid_usingmouse = false;
-			cl_ignoremousemoves = 2;
-			SDL_WM_GrabInput( SDL_GRAB_OFF );
-			SDL_ShowCursor( SDL_ENABLE );
-		}
+		vid_usinghidecursor = hidecursor;
+		SDL_ShowCursor( hidecursor ? SDL_DISABLE : SDL_ENABLE);
 	}
 }
 
@@ -276,7 +270,7 @@ void IN_Move( void )
 	static int old_x = 0, old_y = 0;
 	static int stuck = 0;
 	int x, y;
-	if( vid_usingmouse )
+	if (vid_usingmouse)
 	{
 		if(vid_stick_mouse.integer)
 		{
@@ -305,6 +299,11 @@ void IN_Move( void )
 			in_mouse_y = y;
 		}
 	}
+
+	SDL_GetMouseState(&x, &y);
+	in_windowmouse_x = x;
+	in_windowmouse_y = y;
+
 	if (vid_numjoysticks && joy_enable.integer && joy_index.integer >= 0 && joy_index.integer < vid_numjoysticks)
 	{
 		SDL_Joystick *joy = vid_joysticks[joy_index.integer];
@@ -341,6 +340,20 @@ static int Sys_EventFilter( SDL_Event *event )
 	return 1;
 }
 
+#ifdef SDL_R_RESTART
+static qboolean sdl_needs_restart;
+static void sdl_start(void)
+{
+}
+static void sdl_shutdown(void)
+{
+	sdl_needs_restart = false;
+}
+static void sdl_newmap(void)
+{
+}
+#endif
+
 static keynum_t buttonremap[18] =
 {
 	K_MOUSE1,
@@ -378,7 +391,7 @@ void Sys_SendKeyEvents( void )
 				Key_Event( MapKey( event.key.keysym.sym ), (char)event.key.keysym.unicode, (event.key.state == SDL_PRESSED) );
 				break;
 			case SDL_ACTIVEEVENT:
-				if( event.active.state == SDL_APPACTIVE )
+				if( event.active.state & SDL_APPACTIVE )
 				{
 					if( event.active.gain )
 						vid_hidden = false;
@@ -404,12 +417,21 @@ void Sys_SendKeyEvents( void )
 					vid.width = event.resize.w;
 					vid.height = event.resize.h;
 					SDL_SetVideoMode(vid.width, vid.height, video_bpp, video_flags);
+#ifdef SDL_R_RESTART
+					// better not call R_Modules_Restart from here directly, as this may wreak havoc...
+					// so, let's better queue it for next frame
+					if(!sdl_needs_restart)
+					{
+						Cbuf_AddText("\nr_restart\n");
+						sdl_needs_restart = true;
+					}
+#endif
 				}
 				break;
 		}
 
 	// enable/disable sound on focus gain/loss
-	if (!vid_hidden && (vid_activewindow || !snd_mutewhenidle.integer))
+	if ((!vid_hidden && vid_activewindow) || !snd_mutewhenidle.integer)
 	{
 		if (!sound_active)
 		{
@@ -440,6 +462,7 @@ void *GL_GetProcAddress(const char *name)
 
 static int Sys_EventFilter( SDL_Event *event );
 static qboolean vid_sdl_initjoysticksystem = false;
+
 void VID_Init (void)
 {
 	Cvar_RegisterVariable(&joy_detected);
@@ -463,6 +486,10 @@ void VID_Init (void)
 	Cvar_RegisterVariable(&joy_sensitivitypitch);
 	Cvar_RegisterVariable(&joy_sensitivityyaw);
 	//Cvar_RegisterVariable(&joy_sensitivityroll);
+	
+#ifdef SDL_R_RESTART
+	R_RegisterModule("SDL", sdl_start, sdl_shutdown, sdl_newmap);
+#endif
 
 	if (SDL_Init(SDL_INIT_VIDEO) < 0)
 		Sys_Error ("Failed to init SDL video subsystem: %s", SDL_GetError());
@@ -476,7 +503,7 @@ void VID_Init (void)
 #ifdef WIN32
 #include "resource.h"
 #include <SDL_syswm.h>
-static void VID_SetCaption()
+static void VID_SetCaption(void)
 {
     SDL_SysWMinfo	info;
 	HICON			icon;
@@ -503,7 +530,7 @@ static void VID_SetCaption()
 #endif
 	SetClassLongPtr( info.window, GCLP_HICON, (LONG_PTR)icon );
 }
-static void VID_SetIcon()
+static void VID_SetIcon(void)
 {
 }
 #else
@@ -511,7 +538,7 @@ static void VID_SetIcon()
 #include "darkplaces.xpm"
 #include "nexuiz.xpm"
 static SDL_Surface *icon = NULL;
-static void VID_SetIcon()
+static void VID_SetIcon(void)
 {
 	/*
 	 * Somewhat restricted XPM reader. Only supports XPMs saved by GIMP 2.4 at
@@ -542,7 +569,7 @@ static void VID_SetIcon()
 
 	for(i = 0; i < colors; ++i)
 	{
-		int r, g, b;
+		unsigned int r, g, b;
 		char idx;
 
 		if(sscanf(idata[i+1], "%c c #%02x%02x%02x", &idx, &r, &g, &b) != 4)
@@ -613,13 +640,13 @@ static void VID_SetIcon()
 }
 
 
-static void VID_SetCaption()
+static void VID_SetCaption(void)
 {
 	SDL_WM_SetCaption( gamename, NULL );
 }
 #endif
 
-static void VID_OutputVersion()
+static void VID_OutputVersion(void)
 {
 	const SDL_version *version;
 	version = SDL_Linked_Version();
@@ -629,15 +656,15 @@ static void VID_OutputVersion()
 					version->major, version->minor, version->patch );
 }
 
-int VID_InitMode(int fullscreen, int width, int height, int bpp, int refreshrate, int stereobuffer, int samples)
+int VID_InitMode(int fullscreen, int *width, int *height, int bpp, int refreshrate, int stereobuffer, int samples)
 {
 	int i;
 	static int notfirstvideomode = false;
 	int flags = SDL_OPENGL;
 	const char *drivername;
 
-	win_half_width = width>>1;
-	win_half_height = height>>1;
+	win_half_width = *width>>1;
+	win_half_height = *height>>1;
 
 	if(vid_resizable.integer)
 		flags |= SDL_RESIZABLE;
@@ -714,11 +741,11 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp, int refreshrate
 	video_bpp = bpp;
 	video_flags = flags;
 	VID_SetIcon();
-	screen = SDL_SetVideoMode(width, height, bpp, flags);
+	screen = SDL_SetVideoMode(*width, *height, bpp, flags);
 
 	if (screen == NULL)
 	{
-		Con_Printf("Failed to set video mode to %ix%i: %s\n", width, height, SDL_GetError());
+		Con_Printf("Failed to set video mode to %ix%i: %s\n", *width, *height, SDL_GetError());
 		VID_Shutdown();
 		return false;
 	}
@@ -758,6 +785,7 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp, int refreshrate
 	vid_hidden = false;
 	vid_activewindow = false;
 	vid_usingmouse = false;
+	vid_usinghidecursor = false;
 
 	SDL_WM_GrabInput(SDL_GRAB_OFF);
 	return true;
@@ -765,7 +793,7 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp, int refreshrate
 
 void VID_Shutdown (void)
 {
-	VID_GrabMouse(false);
+	VID_SetMouse(false, false, false);
 	VID_RestoreSystemGamma();
 
 	SDL_QuitSubSystem(SDL_INIT_VIDEO);
@@ -802,13 +830,35 @@ void VID_Finish (void)
 
 	VID_UpdateGamma(false, 256);
 
-	if (r_render.integer && !vid_hidden)
+	if (!vid_hidden)
 	{
 		CHECKGLERROR
-		if (r_speeds.integer || gl_finish.integer)
+		if (r_speeds.integer == 2 || gl_finish.integer)
 		{
 			qglFinish();CHECKGLERROR
 		}
 		SDL_GL_SwapBuffers();
 	}
 }
+
+size_t VID_ListModes(vid_mode_t *modes, size_t maxcount)
+{
+	size_t k;
+	SDL_Rect **vidmodes;
+	int bpp = SDL_GetVideoInfo()->vfmt->BitsPerPixel;
+
+	k = 0;
+	for(vidmodes = SDL_ListModes(NULL, SDL_FULLSCREEN|SDL_HWSURFACE); *vidmodes; ++vidmodes)
+	{
+		if(k >= maxcount)
+			break;
+		modes[k].width = (*vidmodes)->w;
+		modes[k].height = (*vidmodes)->h;
+		modes[k].bpp = bpp;
+		modes[k].refreshrate = 60; // no support for refresh rate in SDL
+		modes[k].pixelheight_num = 1;
+		modes[k].pixelheight_denom = 1; // SDL does not provide this
+		++k;
+	}
+	return k;
+}