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

input: Move fullscreen and console toggle from in_sdl.c to keys.c.

Browse source 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1096 af15c1b1-3010-417e-b628-4374ebc0bcbd
This commit is contained in:
Sander van Dijk 2014-10-11 08:49:45 +00:00
parent d1b3e7c4a3
commit 1440636ec6
2 changed files with 15 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
Quake/in_sdl.c
View file

@ -637,19 +637,6 @@ void IN_SendKeyEvents (void)
break; break;
#endif #endif
case SDL_KEYDOWN: case SDL_KEYDOWN:
if ((event.key.keysym.sym == SDLK_RETURN) &&
(event.key.keysym.mod & KMOD_ALT))
{
VID_Toggle();
break;
}
if ((event.key.keysym.sym == SDLK_ESCAPE) &&
(event.key.keysym.mod & KMOD_SHIFT))
{
Con_ToggleConsole_f();
break;
}
/* fallthrough */
case SDL_KEYUP: case SDL_KEYUP:
down = (event.key.state == SDL_PRESSED); down = (event.key.state == SDL_PRESSED);

15
Quake/keys.c
View file

@ -965,6 +965,13 @@ void Key_Event (int key, qboolean down)
if (key < 0 || key >= MAX_KEYS) if (key < 0 || key >= MAX_KEYS)
return; return;
// handle fullscreen toggle
if (down && (key == K_ENTER || key == K_KP_ENTER) && keydown[K_ALT])
{
VID_Toggle();
return;
}
// handle autorepeats and stray key up events // handle autorepeats and stray key up events
if (down) if (down)
{ {
@ -993,6 +1000,13 @@ void Key_Event (int key, qboolean down)
{ {
if (!down) if (!down)
return; return;
if (keydown[K_SHIFT])
{
Con_ToggleConsole_f();
return;
}
switch (key_dest) switch (key_dest)
{ {
case key_message: case key_message:
@ -1008,6 +1022,7 @@ void Key_Event (int key, qboolean down)
default: default:
Sys_Error ("Bad key_dest"); Sys_Error ("Bad key_dest");
} }
return; return;
} }