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

more mouse grab/release fixes

Browse source 
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@759 af15c1b1-3010-417e-b628-4374ebc0bcbd
This commit is contained in:
svdijk 2012-10-05 18:58:59 +00:00
parent 05ebf704bd
commit f2f1b2bdb6
2 changed files with 28 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Quake/cl_main.c
View file

@ -133,6 +133,11 @@ void CL_Disconnect (void)
cls.state = ca_disconnected; cls.state = ca_disconnected;
if (sv.active) if (sv.active)
Host_ShutdownServer(false); Host_ShutdownServer(false);
if (cls.state != ca_dedicated && key_dest != key_menu)
{
key_dest = key_console;
IN_Deactivate(vid.type == MODE_WINDOWED);
}
} }
cls.demoplayback = cls.timedemo = false; cls.demoplayback = cls.timedemo = false;
@ -145,6 +150,11 @@ void CL_Disconnect_f (void)
CL_Disconnect (); CL_Disconnect ();
if (sv.active) if (sv.active)
Host_ShutdownServer (false); Host_ShutdownServer (false);
if (cls.state != ca_dedicated && key_dest != key_menu)
{
key_dest = key_console;
IN_Deactivate(vid.type == MODE_WINDOWED);
}
} }

21
Quake/gl_vidsdl.c
View file

@ -411,6 +411,11 @@ static void VID_Restart (void)
Cvar_SetValueQuick (&vid_height, modelist[vid_default].height); Cvar_SetValueQuick (&vid_height, modelist[vid_default].height);
Cvar_SetValueQuick (&vid_bpp, modelist[vid_default].bpp); Cvar_SetValueQuick (&vid_bpp, modelist[vid_default].bpp);
Cvar_SetQuick (&vid_fullscreen, (windowed) ? "0" : "1"); Cvar_SetQuick (&vid_fullscreen, (windowed) ? "0" : "1");
if (vid_fullscreen.value)
IN_Activate();
else if (key_dest == key_console || key_dest == key_menu)
IN_Deactivate(vid.type == MODE_WINDOWED);
} }
/* /*
@ -1345,6 +1350,11 @@ void VID_Toggle (void)
was_changed = vid_changed; was_changed = vid_changed;
Cvar_SetQuick (&vid_fullscreen, vid_fullscreen.value ? "0" : "1"); Cvar_SetQuick (&vid_fullscreen, vid_fullscreen.value ? "0" : "1");
vid_changed = was_changed; vid_changed = was_changed;
if (vid_fullscreen.value)
IN_Activate();
else if (key_dest == key_console || key_dest == key_menu)
IN_Deactivate(vid.type == MODE_WINDOWED);
} }
else else
{ {
@ -1702,10 +1712,15 @@ static void VID_MenuKey (int key)
Cbuf_AddText ("vid_test\n"); Cbuf_AddText ("vid_test\n");
break; break;
case 6: case 6:
Cbuf_AddText ("vid_restart\n");
key_dest = key_game;
m_state = m_none; m_state = m_none;
IN_Activate(); Cbuf_AddText ("vid_restart\n");
if (cls.state == ca_connected)
{
key_dest = key_game;
IN_Activate();
}
else
key_dest = key_console;
break; break;
default: default:
break; break;