mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-23 06:41:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor input_keyboard_event

Browse Source
This commit is contained in:
twinaphex 2015-01-18 19:39:58 +01:00
parent b4a26e2e30
commit 61f28bc000
1 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
input/keyboard_line.c
View File

@ -222,29 +222,35 @@ void input_keyboard_event(bool down, unsigned code,
if (deferred_wait_keys) if (deferred_wait_keys)
{ {
if (!down) if (down)
{ return;
input_keyboard_wait_keys_cancel();
deferred_wait_keys = false; input_keyboard_wait_keys_cancel();
} deferred_wait_keys = false;
} }
else if (g_keyboard_press_cb) else if (g_keyboard_press_cb)
{ {
if (down && code != RETROK_UNKNOWN if (!down)
&& !g_keyboard_press_cb(g_keyboard_press_data, code)) return;
deferred_wait_keys = true; if (code == RETROK_UNKNOWN)
return;
if (g_keyboard_press_cb(g_keyboard_press_data, code))
return;
deferred_wait_keys = true;
} }
else if (g_keyboard_line) else if (g_keyboard_line)
{ {
if (down && input_keyboard_line_event(g_keyboard_line, character)) if (!down)
{ return;
/* Line is complete, can free it now. */ if (!input_keyboard_line_event(g_keyboard_line, character))
input_keyboard_line_free(g_keyboard_line); return;
g_keyboard_line = NULL;
/* Unblock all hotkeys. */ /* Line is complete, can free it now. */
driver.block_input = false; input_keyboard_line_free(g_keyboard_line);
} g_keyboard_line = NULL;
/* Unblock all hotkeys. */
driver.block_input = false;
} }
else if (g_extern.system.key_event) else if (g_extern.system.key_event)
g_extern.system.key_event(down, code, character, mod); g_extern.system.key_event(down, code, character, mod);