ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1698 from heuripedes/master 

Fix x11 keypad input handling
This commit is contained in:
Twinaphex 2015-05-15 16:28:34 +02:00
parent 0e467f99ed ae52f0f5c9
commit 4ba2722020
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
input/drivers_keyboard/keyboard_event_x11.c
View File

@ -80,19 +80,17 @@ static size_t conv_utf8_utf32(uint32_t *out,
void x11_handle_key_event(XEvent *event, XIC ic, bool filter) void x11_handle_key_event(XEvent *event, XIC ic, bool filter)
{ {
int i; int i;
unsigned state; unsigned state, key;
uint16_t mod = 0; uint16_t mod = 0;
char keybuf[32] = {0}; char keybuf[32] = {0};
uint32_t chars[32] = {0}; uint32_t chars[32] = {0};
bool down = event->type == KeyPress; bool down = event->type == KeyPress;
unsigned key = input_keymaps_translate_keysym_to_rk(XLookupKeysym(&event->xkey, 0)); int num = 0;
int num = 0; KeySym keysym = 0;
if (down && !filter) if (down && !filter)
{ {
KeySym keysym = 0;
#ifdef X_HAVE_UTF8_STRING #ifdef X_HAVE_UTF8_STRING
Status status = 0; Status status = 0;
@ -112,6 +110,7 @@ void x11_handle_key_event(XEvent *event, XIC ic, bool filter)
#endif #endif
} }
key = input_keymaps_translate_keysym_to_rk(keysym);
state = event->xkey.state; state = event->xkey.state;
if (state & ShiftMask) if (state & ShiftMask)
@ -124,6 +123,8 @@ void x11_handle_key_event(XEvent *event, XIC ic, bool filter)
mod |= RETROKMOD_ALT; mod |= RETROKMOD_ALT;
if (state & Mod4Mask) if (state & Mod4Mask)
mod |= RETROKMOD_META; mod |= RETROKMOD_META;
if (IsKeypadKey(keysym))
mod |= RETROKMOD_NUMLOCK;
input_keyboard_event(down, key, chars[0], mod, RETRO_DEVICE_KEYBOARD); input_keyboard_event(down, key, chars[0], mod, RETRO_DEVICE_KEYBOARD);