mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-01-30 21:32:45 +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

22
input/keyboard_line.c
View File

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