mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-01 04:20:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix mod-handling in X11.

Browse Source
This commit is contained in:
Themaister 2013-12-08 01:08:19 +01:00
parent 3a8608fb70
commit b809a59720
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
gfx/context/x11_common.c
View File

@ -266,18 +266,27 @@ void x11_handle_key_event(XEvent *event)
if (!g_extern.system.key_event) if (!g_extern.system.key_event)
return; return;
static XComposeStatus state;
char keybuf[32]; char keybuf[32];
bool down = event->type == KeyPress; bool down = event->type == KeyPress;
uint32_t character = 0; uint32_t character = 0;
unsigned key = input_translate_keysym_to_rk(XLookupKeysym(&event->xkey, 0)); unsigned key = input_translate_keysym_to_rk(XLookupKeysym(&event->xkey, 0));
// FIXME: UTF-8. // FIXME: UTF.
if (down && XLookupString(&event->xkey, keybuf, sizeof(keybuf), 0, &state)) if (down && XLookupString(&event->xkey, keybuf, sizeof(keybuf), 0, NULL))
character = keybuf[0]; character = keybuf[0];
// FIXME: Mod handling. if (character == -1u)
g_extern.system.key_event(down, key, character, 0); character = 0;
unsigned state = event->xkey.state;
uint16_t mod = 0;
mod |= (state & ShiftMask) ? RETROKMOD_SHIFT : 0;
mod |= (state & LockMask) ? RETROKMOD_SCROLLOCK : 0;
mod |= (state & ControlMask) ? RETROKMOD_CTRL : 0;
mod |= (state & Mod1Mask) ? RETROKMOD_ALT : 0;
mod |= (state & Mod4Mask) ? RETROKMOD_META : 0;
g_extern.system.key_event(down, key, character, mod);
} }