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

(input_driver.c) Cleanups

This commit is contained in:
twinaphex 2016-12-01 03:38:25 +01:00
parent 5337e494c6
commit c351aed001
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
input/input_driver.c
View File

@ -536,14 +536,11 @@ static bool check_input_driver_block_hotkey(bool enable_hotkey)
&settings->input.binds[0][RARCH_ENABLE_HOTKEY]; &settings->input.binds[0][RARCH_ENABLE_HOTKEY];
const struct retro_keybind *autoconf_bind = const struct retro_keybind *autoconf_bind =
&settings->input.autoconf_binds[0][RARCH_ENABLE_HOTKEY]; &settings->input.autoconf_binds[0][RARCH_ENABLE_HOTKEY];
bool kb_mapping_is_blocked = current_input->keyboard_mapping_is_blocked &&
current_input->keyboard_mapping_is_blocked(current_input_data);
input_driver_block_hotkey = false;
/* Don't block the check to RARCH_ENABLE_HOTKEY /* Don't block the check to RARCH_ENABLE_HOTKEY
* unless we're really supposed to. */ * unless we're really supposed to. */
if (kb_mapping_is_blocked) if (current_input->keyboard_mapping_is_blocked &&
current_input->keyboard_mapping_is_blocked(current_input_data))
input_driver_block_hotkey = true; input_driver_block_hotkey = true;
/* If we haven't bound anything to this, /* If we haven't bound anything to this,
@ -684,10 +681,11 @@ uint64_t input_keys_pressed(void)
bool enable_hotkey = current_input->input_state(current_input_data, &binds, 0, bool enable_hotkey = current_input->input_state(current_input_data, &binds, 0,
RETRO_DEVICE_JOYPAD, 0, RARCH_ENABLE_HOTKEY); RETRO_DEVICE_JOYPAD, 0, RARCH_ENABLE_HOTKEY);
input_driver_block_libretro_input = false;
input_driver_block_hotkey = false;
if (check_input_driver_block_hotkey(enable_hotkey) && enable_hotkey) if (check_input_driver_block_hotkey(enable_hotkey) && enable_hotkey)
input_driver_block_libretro_input = true; input_driver_block_libretro_input = true;
else
input_driver_block_libretro_input = false;
for (i = 0; i < RARCH_BIND_LIST_END; i++) for (i = 0; i < RARCH_BIND_LIST_END; i++)
{ {
@ -798,11 +796,11 @@ uint64_t input_menu_keys_pressed(void)
enable_hotkey = current_input->input_state(current_input_data, &binds[0], 0, enable_hotkey = current_input->input_state(current_input_data, &binds[0], 0,
RETRO_DEVICE_JOYPAD, 0, RARCH_ENABLE_HOTKEY); RETRO_DEVICE_JOYPAD, 0, RARCH_ENABLE_HOTKEY);
input_driver_block_libretro_input = false;
input_driver_block_hotkey = false;
if (check_input_driver_block_hotkey(enable_hotkey) && enable_hotkey) if (check_input_driver_block_hotkey(enable_hotkey) && enable_hotkey)
input_driver_block_libretro_input = true; input_driver_block_libretro_input = true;
else
input_driver_block_libretro_input = false;
for (i = 0; i < RARCH_BIND_LIST_END; i++) for (i = 0; i < RARCH_BIND_LIST_END; i++)
{ {