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

Use XLookupKeysym instead. Add test. 

XKeycodeToKeysym is deprecated.
This commit is contained in:
Themaister 2012-12-08 12:50:05 +01:00
parent 94f89b4a70
commit 6709dcb274
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gfx/context/glx_ctx.c
View File

@ -222,13 +222,13 @@ static void gfx_ctx_check_window(bool *quit,
{ {
static XComposeStatus state; static XComposeStatus state;
char keybuf[32]; char keybuf[32];
const unsigned x_keycode = XKeycodeToKeysym(g_dpy, event.xkey.keycode, 0); const unsigned x_keycode = XLookupKeysym(&event.xkey, 0);
bool down = event.type == KeyPress; bool down = event.type == KeyPress;
uint32_t character = 0; uint32_t character = 0;
unsigned key = RETROK_UNKNOWN; unsigned key = RETROK_UNKNOWN;
for (int i = 0; i != RETROK_LAST; i ++) for (int i = 0; i < RETROK_LAST; i++)
{ {
if (keysym_lut[i] == x_keycode) if (keysym_lut[i] == x_keycode)
{ {

10
libretro-test/libretro-test.c
View File

@ -187,6 +187,13 @@ void retro_run(void)
render_audio(); render_audio();
} }
static void keyboard_cb(bool down, unsigned keycode,
uint32_t character, uint16_t mod)
{
fprintf(stderr, "Down: %s, Code: %d, Char: %u, Mod: %u.\n",
down ? "yes" : "no", keycode, character, mod);
}
bool retro_load_game(const struct retro_game_info *info) bool retro_load_game(const struct retro_game_info *info)
{ {
struct retro_input_descriptor desc[] = { struct retro_input_descriptor desc[] = {
@ -206,6 +213,9 @@ bool retro_load_game(const struct retro_game_info *info)
return false; return false;
} }
struct retro_keyboard_callback cb = { keyboard_cb };
environ_cb(RETRO_ENVIRONMENT_SET_KEYBOARD_CALLBACK, &cb);
(void)info; (void)info;
return true; return true;
} }