fte/quakespasm
2
0
Fork 0
mirror of https://github.com/Shpoike/Quakespasm.git synced 2025-03-13 14:28:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

gl_vidsdl.c: some cleanup

Browse source 
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@810 af15c1b1-3010-417e-b628-4374ebc0bcbd
This commit is contained in:
svdijk 2013-02-19 18:18:38 +00:00
parent f83aa5e3cd
commit e48420f0e0
1 changed files with 9 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
quakespasm/Quake/gl_vidsdl.c
View file

@ -59,8 +59,6 @@ static vmode_t modelist[MAX_MODE_LIST];
static int nummodes; static int nummodes;
static qboolean vid_initialized = false; static qboolean vid_initialized = false;
static qboolean windowed;
static qboolean vid_toggle_works = true;
static SDL_Surface *draw_context; static SDL_Surface *draw_context;
@ -231,7 +229,7 @@ static int VID_SetMode (int width, int height, int bpp, qboolean fullscreen)
if (!draw_context) if (!draw_context)
Sys_Error ("Couldn't set video mode"); Sys_Error ("Couldn't set video mode");
sprintf(caption, "QuakeSpasm %1.2f.%d", (float)FITZQUAKE_VERSION, QUAKESPASM_VER_PATCH); q_snprintf(caption, sizeof(caption), "QuakeSpasm %1.2f.%d", (float)FITZQUAKE_VERSION, QUAKESPASM_VER_PATCH);
SDL_WM_SetCaption(caption, caption); SDL_WM_SetCaption(caption, caption);
vid.width = draw_context->w; vid.width = draw_context->w;
@ -308,7 +306,6 @@ static void VID_Restart (void)
return; return;
} }
windowed = false;
vid_default = i; vid_default = i;
} }
else //not fullscreen else //not fullscreen
@ -328,7 +325,6 @@ static void VID_Restart (void)
modelist[0].width = (int)vid_width.value; modelist[0].width = (int)vid_width.value;
modelist[0].height = (int)vid_height.value; modelist[0].height = (int)vid_height.value;
windowed = true;
vid_default = 0; vid_default = 0;
} }
// //
@ -358,7 +354,7 @@ static void VID_Restart (void)
// //
// update mouse grab // update mouse grab
// //
if (vid_fullscreen.value) if (modestate == MS_FULLSCREEN)
IN_Activate(); IN_Activate();
else if (key_dest == key_console || key_dest == key_menu) else if (key_dest == key_console || key_dest == key_menu)
IN_Deactivate(modestate == MS_WINDOWED); IN_Deactivate(modestate == MS_WINDOWED);
@ -988,12 +984,10 @@ void VID_Init (void)
if (!vid_fullscreen.value) if (!vid_fullscreen.value)
{ {
windowed = true;
vid_default = MS_WINDOWED; vid_default = MS_WINDOWED;
} }
else else
{ {
windowed = false;
vid_default = MS_UNINIT; vid_default = MS_UNINIT;
width = vid_width.value; width = vid_width.value;
@ -1104,7 +1098,6 @@ void VID_Init (void)
if (vid_default == MS_UNINIT) if (vid_default == MS_UNINIT)
{ {
Cvar_SetQuick (&vid_fullscreen, "0"); Cvar_SetQuick (&vid_fullscreen, "0");
windowed = true;
vid_default = MS_WINDOWED; vid_default = MS_WINDOWED;
} }
} }
@ -1148,6 +1141,8 @@ void VID_Init (void)
// new proc by S.A., called by alt-return key binding. // new proc by S.A., called by alt-return key binding.
void VID_Toggle (void) void VID_Toggle (void)
{ {
static qboolean vid_toggle_works = true;
S_ClearBuffer (); S_ClearBuffer ();
if (!vid_toggle_works) if (!vid_toggle_works)
@ -1157,20 +1152,17 @@ void VID_Toggle (void)
qboolean was_changed; qboolean was_changed;
Sbar_Changed (); // Sbar seems to need refreshing Sbar_Changed (); // Sbar seems to need refreshing
windowed = !windowed;
if (modestate == MS_FULLSCREEN) modestate = draw_context->flags & SDL_FULLSCREEN ? MS_FULLSCREEN : MS_WINDOWED;
modestate = MS_WINDOWED;
else
modestate = MS_FULLSCREEN;
// since we succeeded, ignore the vid_fullscreen // since we succeeded, ignore the vid_fullscreen
// callback function setting vid_changed to true. // callback function setting vid_changed to true.
was_changed = vid_changed; was_changed = vid_changed;
Cvar_SetQuick (&vid_fullscreen, vid_fullscreen.value ? "0" : "1"); Cvar_SetQuick (&vid_fullscreen, draw_context->flags & SDL_FULLSCREEN ? "1" : "0");
vid_changed = was_changed; vid_changed = was_changed;
// update mouse grab // update mouse grab
if (vid_fullscreen.value) if (modestate == MS_FULLSCREEN)
IN_Activate(); IN_Activate();
else if (key_dest == key_console || key_dest == key_menu) else if (key_dest == key_console || key_dest == key_menu)
IN_Deactivate(modestate == MS_WINDOWED); IN_Deactivate(modestate == MS_WINDOWED);
@ -1178,7 +1170,7 @@ void VID_Toggle (void)
else else
{ {
vid_toggle_works = false; vid_toggle_works = false;
Con_DPrintf ("ToggleFullScreen failed, attempting VID_Restart\n"); Con_DPrintf ("SDL_WM_ToggleFullScreen failed, attempting VID_Restart\n");
vrestart: vrestart:
Cvar_SetQuick (&vid_fullscreen, vid_fullscreen.value ? "0" : "1"); Cvar_SetQuick (&vid_fullscreen, vid_fullscreen.value ? "0" : "1");
Cbuf_AddText ("vid_restart\n"); Cbuf_AddText ("vid_restart\n");