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

Update menu_keys_pressed

Browse Source
This commit is contained in:
twinaphex 2016-10-27 06:34:53 +02:00
parent 6235a5cd0d
commit 8f30b3e706
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
input/input_driver.c
View File

@ -694,6 +694,14 @@ uint64_t input_menu_keys_pressed(void)
for (i = 0; i < RARCH_BIND_LIST_END; i++) for (i = 0; i < RARCH_BIND_LIST_END; i++)
{ {
bool state = false; bool state = false;
#if 0
if (((!input_driver_block_libretro_input && ((i < RARCH_FIRST_META_KEY)))
|| !input_driver_block_hotkey) && current_input->key_pressed)
state = current_input->key_pressed(current_input_data, i);
if (i >= RARCH_FIRST_META_KEY)
state |= current_input->meta_key_pressed(current_input_data, i);
#else
if (((((!input_driver_block_libretro_input && ((i < RARCH_FIRST_META_KEY))) if (((((!input_driver_block_libretro_input && ((i < RARCH_FIRST_META_KEY)))
|| !input_driver_block_hotkey) && current_input->key_pressed)) || !input_driver_block_hotkey) && current_input->key_pressed))
&& settings->input.binds[0][i].valid) && settings->input.binds[0][i].valid)
@ -705,6 +713,7 @@ uint64_t input_menu_keys_pressed(void)
if (i >= RARCH_FIRST_META_KEY && settings->input.binds[0][i].valid) if (i >= RARCH_FIRST_META_KEY && settings->input.binds[0][i].valid)
state |= input_joypad_pressed(input_driver_get_joypad_driver(), state |= input_joypad_pressed(input_driver_get_joypad_driver(),
0, settings->input.binds[0], i); 0, settings->input.binds[0], i);
#endif
#ifdef HAVE_OVERLAY #ifdef HAVE_OVERLAY
state |= input_overlay_key_pressed(i); state |= input_overlay_key_pressed(i);