X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=vid_sdl.c;h=a00029bfc6658c8988b5903c49eb1a51a6194750;hb=c0d54f21bcaba56302f5e9475b8182056f4841c0;hp=b6b005979384f5229f295f858173e2cd4951d544;hpb=8256e6f5cf262b68a5e1e59bb3545393df001126;p=xonotic%2Fdarkplaces.git

diff --git a/vid_sdl.c b/vid_sdl.c
index b6b00597..a00029bf 100644
--- a/vid_sdl.c
+++ b/vid_sdl.c
@@ -22,13 +22,17 @@ 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;
 
 qboolean vid_supportrefreshrate = false;
 
 cvar_t joy_detected = {CVAR_READONLY, "joy_detected", "0", "number of joysticks detected by engine"};
-cvar_t joy_enable = {0, "joy_enable", "1", "enables joystick support"};
+cvar_t joy_enable = {CVAR_SAVE, "joy_enable", "0", "enables joystick support"};
 cvar_t joy_index = {0, "joy_index", "0", "selects which joystick to use if you have multiple"};
 cvar_t joy_axisforward = {0, "joy_axisforward", "1", "which joystick axis to query for forward/backward movement"};
 cvar_t joy_axisside = {0, "joy_axisside", "0", "which joystick axis to query for right/left movement"};
@@ -49,13 +53,17 @@ 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
 static SDL_Joystick *vid_joysticks[MAX_JOYSTICKS];
 
+static int win_half_width = 50;
+static int win_half_height = 50;
+static int video_bpp, video_flags;
+
 static SDL_Surface *screen;
 
 /////////////////////////
@@ -229,27 +237,18 @@ static int MapKey( unsigned int sdlkey )
     return tbl_sdltoquake[ sdlkey ];
 }
 
-static void IN_Activate( qboolean grab )
+void VID_SetMouse(qboolean fullscreengrab, qboolean relative, qboolean hidecursor)
 {
-	if (grab)
+	if (vid_usingmouse != relative)
 	{
-		if (!vid_usingmouse)
-		{
-			vid_usingmouse = true;
-			cl_ignoremousemove = true;
-			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_ignoremousemove = true;
-			SDL_WM_GrabInput( SDL_GRAB_OFF );
-			SDL_ShowCursor( SDL_ENABLE );
-		}
+		vid_usinghidecursor = hidecursor;
+		SDL_ShowCursor( hidecursor ? SDL_DISABLE : SDL_ENABLE);
 	}
 }
 
@@ -268,13 +267,43 @@ static double IN_JoystickGetAxis(SDL_Joystick *joy, int axis, double sensitivity
 void IN_Move( void )
 {
 	int j;
+	static int old_x = 0, old_y = 0;
+	static int stuck = 0;
 	int x, y;
-	if( vid_usingmouse )
+	if (vid_usingmouse)
 	{
-		SDL_GetRelativeMouseState( &x, &y );
-		in_mouse_x = x;
-		in_mouse_y = y;
+		if(vid_stick_mouse.integer)
+		{
+			// have the mouse stuck in the middle, example use: prevent expose effect of beryl during the game when not using
+			// window grabbing. --blub
+
+			// we need 2 frames to initialize the center position
+			if(!stuck)
+			{
+				SDL_WarpMouse(win_half_width, win_half_height);
+				SDL_GetMouseState(&x, &y);
+				SDL_GetRelativeMouseState(&x, &y);
+				++stuck;
+			} else {
+				SDL_GetRelativeMouseState(&x, &y);
+				in_mouse_x = x + old_x;
+				in_mouse_y = y + old_y;
+				SDL_GetMouseState(&x, &y);
+				old_x = x - win_half_width;
+				old_y = y - win_half_height;
+				SDL_WarpMouse(win_half_width, win_half_height);
+			}
+		} else {
+			SDL_GetRelativeMouseState( &x, &y );
+			in_mouse_x = x;
+			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];
@@ -301,16 +330,30 @@ void IN_Move( void )
 static int Sys_EventFilter( SDL_Event *event )
 {
 	//TODO: Add a quit query in linux, too - though linux user are more likely to know what they do
+	if (event->type == SDL_QUIT)
+	{
 #ifdef WIN32
-	if( event->type == SDL_QUIT && MessageBox( NULL, "Are you sure you want to quit?", "Confirm Exit", MB_YESNO | MB_SETFOREGROUND | MB_ICONQUESTION ) == IDNO )
-		return 0;
-	else
-		return 1;
-#else
-	return 1;
+		if (MessageBox( NULL, "Are you sure you want to quit?", "Confirm Exit", MB_YESNO | MB_SETFOREGROUND | MB_ICONQUESTION ) == IDNO)
+			return 0;
 #endif
+	}
+	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,
@@ -345,10 +388,10 @@ void Sys_SendKeyEvents( void )
 				break;
 			case SDL_KEYDOWN:
 			case SDL_KEYUP:
-				Key_Event( MapKey( event.key.keysym.sym ), (char)event.key.keysym.unicode, (event.key.state == SDL_PRESSED) );
+				Key_Event( MapKey( event.key.keysym.sym ), 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;
@@ -368,10 +411,27 @@ void Sys_SendKeyEvents( void )
 				if (event.jbutton.button < 48)
 					Key_Event( event.jbutton.button + (event.jbutton.button < 16 ? K_JOY1 : K_AUX1 - 16), 0, (event.jbutton.state == SDL_PRESSED) );
 				break;
+			case SDL_VIDEORESIZE:
+				if(vid_resizable.integer < 2)
+				{
+					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)
 		{
@@ -402,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);
@@ -425,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());
@@ -438,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;
@@ -453,20 +518,135 @@ static void VID_SetCaption()
 
 	icon = LoadIcon( GetModuleHandle( NULL ), MAKEINTRESOURCE( IDI_ICON1 ) );
 #ifndef _W64 //If Windows 64bit data types don't exist
+#ifndef SetClassLongPtr
 #define SetClassLongPtr SetClassLong
+#endif
+#ifndef GCLP_HICON
 #define GCLP_HICON GCL_HICON
+#endif
+#ifndef LONG_PTR
 #define LONG_PTR LONG
+#endif
 #endif
 	SetClassLongPtr( info.window, GCLP_HICON, (LONG_PTR)icon );
 }
+static void VID_SetIcon(void)
+{
+}
 #else
-static void VID_SetCaption()
+// Adding the OS independent XPM version --blub
+#include "darkplaces.xpm"
+#include "nexuiz.xpm"
+static SDL_Surface *icon = NULL;
+static void VID_SetIcon(void)
+{
+	/*
+	 * Somewhat restricted XPM reader. Only supports XPMs saved by GIMP 2.4 at
+	 * default settings with less than 91 colors and transparency.
+	 */
+
+	int width, height, colors, isize, i, j;
+	int thenone = -1;
+	static SDL_Color palette[256];
+	unsigned short palenc[256]; // store color id by char
+
+	char **idata = ENGINE_ICON;
+	char *data = idata[0];
+
+	if(sscanf(data, "%i %i %i %i", &width, &height, &colors, &isize) != 4)
+	{
+		// NOTE: Only 1-char colornames are supported
+		Con_Printf("Sorry, but this does not even look similar to an XPM.\n");
+		return;
+	}
+
+	if(isize != 1)
+	{
+		// NOTE: Only 1-char colornames are supported
+		Con_Printf("This XPM's palette is either huge or idiotically unoptimized. It's key size is %i\n", isize);
+		return;
+	}
+
+	for(i = 0; i < colors; ++i)
+	{
+		unsigned int r, g, b;
+		char idx;
+
+		if(sscanf(idata[i+1], "%c c #%02x%02x%02x", &idx, &r, &g, &b) != 4)
+		{
+			char foo[2];
+			if(sscanf(idata[i+1], "%c c Non%1[e]", &idx, foo) != 2) // I take the DailyWTF credit for this. --div0
+			{
+				Con_Printf("This XPM's palette looks odd. Can't continue.\n");
+				return;
+			}
+			else
+			{
+				palette[i].r = 255; // color key
+				palette[i].g = 0;
+				palette[i].b = 255;
+				thenone = i; // weeeee
+			}
+		}
+		else
+		{
+			palette[i].r = r - (r == 255 && g == 0 && b == 255); // change 255/0/255 pink to 254/0/255 for color key
+			palette[i].g = g;
+			palette[i].b = b;
+		}
+
+		palenc[(unsigned char) idx] = i;
+	}
+
+	// allocate the image data
+	data = (char*) malloc(width*height);
+
+	for(j = 0; j < height; ++j)
+	{
+		for(i = 0; i < width; ++i)
+		{
+			// casting to the safest possible datatypes ^^
+			data[j * width + i] = palenc[((unsigned char*)idata[colors+j+1])[i]];
+		}
+	}
+
+	if(icon != NULL)
+	{
+		// SDL_FreeSurface should free the data too
+		// but for completeness' sake...
+		if(icon->flags & SDL_PREALLOC)
+		{
+			free(icon->pixels);
+			icon->pixels = NULL; // safety
+		}
+		SDL_FreeSurface(icon);
+	}
+
+	icon = SDL_CreateRGBSurface(SDL_SRCCOLORKEY, width, height, 8, 0,0,0,0);// rmask, gmask, bmask, amask); no mask needed
+	// 8 bit surfaces get an empty palette allocated according to the docs
+	// so it's a palette image for sure :) no endian check necessary for the mask
+
+	if(icon == NULL) {
+		Con_Printf(	"Failed to create surface for the window Icon!\n"
+				"%s\n", SDL_GetError());
+		free(data);
+		return;
+	}
+	icon->pixels = data;
+	SDL_SetPalette(icon, SDL_PHYSPAL|SDL_LOGPAL, palette, 0, colors);
+	SDL_SetColorKey(icon, SDL_SRCCOLORKEY, thenone);
+
+	SDL_WM_SetIcon(icon, NULL);
+}
+
+
+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();
@@ -476,13 +656,19 @@ 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)
+qboolean VID_InitMode(viddef_mode_t *mode)
 {
 	int i;
 	static int notfirstvideomode = false;
 	int flags = SDL_OPENGL;
 	const char *drivername;
 
+	win_half_width = mode->width>>1;
+	win_half_height = mode->height>>1;
+
+	if(vid_resizable.integer)
+		flags |= SDL_RESIZABLE;
+
 	VID_OutputVersion();
 
 	/*
@@ -517,13 +703,14 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp, int refreshrate
 	// Knghtbrd: should do platform-specific extension string function here
 
 	vid_isfullscreen = false;
-	if (fullscreen) {
+	if (mode->fullscreen) {
 		flags |= SDL_FULLSCREEN;
 		vid_isfullscreen = true;
 	}
+	//flags |= SDL_HWSURFACE;
 
 	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
-	if (bpp >= 32)
+	if (mode->bitsperpixel >= 32)
 	{
 		SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 8);
 		SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 8);
@@ -534,18 +721,31 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp, int refreshrate
 	}
 	else
 	{
-		SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 1);
-		SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 1);
-		SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 1);
+		SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);
+		SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
+		SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
 		SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16);
 	}
-	if (stereobuffer)
+	if (mode->stereobuffer)
 		SDL_GL_SetAttribute (SDL_GL_STEREO, 1);
+	if (vid_vsync.integer)
+		SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
+	else
+		SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 0);
+	if (mode->samples > 1)
+	{
+		SDL_GL_SetAttribute (SDL_GL_MULTISAMPLEBUFFERS, 1);
+		SDL_GL_SetAttribute (SDL_GL_MULTISAMPLESAMPLES, mode->samples);
+	}
+
+	video_bpp = mode->bitsperpixel;
+	video_flags = flags;
+	VID_SetIcon();
+	screen = SDL_SetVideoMode(mode->width, mode->height, mode->bitsperpixel, 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", mode->width, mode->height, SDL_GetError());
 		VID_Shutdown();
 		return false;
 	}
@@ -559,15 +759,8 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp, int refreshrate
 	// enable key repeat since everyone expects it
 	SDL_EnableKeyRepeat(SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
 
-	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 ;)
 	gl_platformextensions = "";
-	gl_videosyncavailable = false;
 
 	GL_Init();
 
@@ -591,16 +784,23 @@ 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;
 }
 
 void VID_Shutdown (void)
 {
-	// this is needed to retry gamma after a vid_restart
+	VID_SetMouse(false, false, false);
 	VID_RestoreSystemGamma();
 
-	IN_Activate(false);
 	SDL_QuitSubSystem(SDL_INIT_VIDEO);
+
+	gl_driver[0] = 0;
+	gl_extensions = "";
+	gl_platform = "";
+	gl_platformextensions = "";
 }
 
 int VID_SetGamma (unsigned short *ramps, int rampsize)
@@ -613,10 +813,9 @@ int VID_GetGamma (unsigned short *ramps, int rampsize)
 	return !SDL_GetGammaRamp (ramps, ramps + rampsize, ramps + rampsize*2);
 }
 
-void VID_Finish (qboolean allowmousegrab)
+void VID_Finish (void)
 {
 	Uint8 appstate;
-	qboolean vid_usemouse;
 
 	//react on appstate changes
 	appstate = SDL_GetAppState();
@@ -628,25 +827,37 @@ void VID_Finish (qboolean allowmousegrab)
 	else
 		vid_activewindow = true;
 
-	vid_usemouse = false;
-	if( allowmousegrab && vid_mouse.integer && !key_consoleactive && (key_dest != key_game || !cls.demoplayback) )
-		vid_usemouse = true;
-	if( vid_isfullscreen )
-		vid_usemouse = true;
-	if( !vid_activewindow )
-		vid_usemouse = false;
-
-	IN_Activate(vid_usemouse);
-
 	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;
+}