libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-11-25 00:49:47 +00:00
Code Issues Actions 23 Packages Projects Releases Wiki Activity

Move this outside of keys_pressed functions

Browse Source
This commit is contained in:
twinaphex 2019-06-21 07:09:07 +02:00
parent 088a688402
commit 569dfdfbb4
1 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
retroarch.c
View File

@ -3761,13 +3761,6 @@ static void input_keys_pressed(input_bits_t *p_new_state)
joypad_info.auto_binds = input_autoconf_binds[joypad_info.joy_idx]; joypad_info.auto_binds = input_autoconf_binds[joypad_info.joy_idx];
joypad_info.axis_threshold = input_driver_axis_threshold; joypad_info.axis_threshold = input_driver_axis_threshold;
input_driver_block_libretro_input = false;
input_driver_block_hotkey = false;
if ( current_input->keyboard_mapping_is_blocked
&& current_input->keyboard_mapping_is_blocked(current_input_data))
input_driver_block_hotkey = true;
if (check_input_driver_block_hotkey(binds_norm, binds_auto)) if (check_input_driver_block_hotkey(binds_norm, binds_auto))
{ {
const struct retro_keybind *enable_hotkey = const struct retro_keybind *enable_hotkey =
@ -3832,13 +3825,6 @@ static void input_menu_keys_pressed(input_bits_t *p_new_state)
joypad_info.joy_idx = 0; joypad_info.joy_idx = 0;
joypad_info.auto_binds = NULL; joypad_info.auto_binds = NULL;
input_driver_block_libretro_input = false;
input_driver_block_hotkey = false;
if (current_input->keyboard_mapping_is_blocked
&& current_input->keyboard_mapping_is_blocked(current_input_data))
input_driver_block_hotkey = true;
for (i = 0; i < max_users; i++) for (i = 0; i < max_users; i++)
{ {
struct retro_keybind *auto_binds = input_autoconf_binds[i]; struct retro_keybind *auto_binds = input_autoconf_binds[i];
@ -15821,6 +15807,14 @@ static enum runloop_state runloop_check_state(
BIT256_CLEAR_ALL_PTR(&current_bits); BIT256_CLEAR_ALL_PTR(&current_bits);
input_driver_block_libretro_input = false;
input_driver_block_hotkey = false;
if ( current_input->keyboard_mapping_is_blocked
&& current_input->keyboard_mapping_is_blocked(current_input_data))
input_driver_block_hotkey = true;
#ifdef HAVE_MENU #ifdef HAVE_MENU
if (menu_is_alive && !(settings->bools.menu_unified_controls && !menu_input_dialog_get_display_kb())) if (menu_is_alive && !(settings->bools.menu_unified_controls && !menu_input_dialog_get_display_kb()))
input_menu_keys_pressed(&current_bits); input_menu_keys_pressed(&current_bits);