fte
/
quakespasm
mirror of https://github.com/Shpoike/Quakespasm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

in_sdl.c: Fix numpad translation with SDL 1.2. 

git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@1090 af15c1b1-3010-417e-b628-4374ebc0bcbd
This commit is contained in:
svdijk 2014-10-06 20:47:35 +00:00
parent cec23e9fa5
commit cc15bab45a
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
quakespasm/Quake/in_sdl.c
View File

@ -569,7 +569,17 @@ static inline int IN_SDL2_ScancodeToQuakeKey(SDL_Scancode scancode)
} }
#endif #endif
static inline qboolean IN_IsNumpadKey (int key) static inline qboolean IN_NumlockDown (SDL_Event event)
{
#if defined(USE_SDL2)
return ((event.key.keysym.mod & KMOD_NUM) != 0);
#else
// Workaround for broken numlock state with SDL 1.2.
return (event.key.keysym.unicode != 0);
#endif
}
static inline qboolean IN_NumpadKey (int key)
{ {
switch (key) switch (key)
{ {
@ -594,7 +604,7 @@ void IN_SendKeyEvents (void)
{ {
SDL_Event event; SDL_Event event;
int key; int key;
qboolean down, numlock; qboolean down;
#if defined(USE_SDL2) #if defined(USE_SDL2)
static int lastKeyDown = 0; static int lastKeyDown = 0;
#endif #endif
@ -650,7 +660,6 @@ void IN_SendKeyEvents (void)
/* fallthrough */ /* fallthrough */
case SDL_KEYUP: case SDL_KEYUP:
down = (event.key.state == SDL_PRESSED); down = (event.key.state == SDL_PRESSED);
numlock = ((event.key.keysym.mod & KMOD_NUM) != 0);
#if defined(USE_SDL2) #if defined(USE_SDL2)
// SDL2: we interpret the keyboard as the US layout, so keybindings // SDL2: we interpret the keyboard as the US layout, so keybindings
@ -664,7 +673,7 @@ void IN_SendKeyEvents (void)
// to also send a char event. Doing this only for key down events // to also send a char event. Doing this only for key down events
// will generate some stray key up events, but that's much less // will generate some stray key up events, but that's much less
// problematic than missing key up events. // problematic than missing key up events.
if (down && textmode && numlock && IN_IsNumpadKey(key)) if (down && textmode && IN_NumlockDown(event) && IN_NumpadKey(key))
key = 0; key = 0;
#if defined(USE_SDL2) #if defined(USE_SDL2)