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

Revert "Refactor CHECK_INPUT_DRIVER_BLOCK_HOTKEY"

Browse Source 
This reverts commit b9cb839abf05da747ba6a1e6b58af3a533697640.
This commit is contained in:
twinaphex 2020-07-06 10:15:59 +02:00
parent f763d94d00
commit 7895722f03
1 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
retroarch.c
View File

@ -1298,12 +1298,26 @@ static const camera_driver_t *camera_drivers[] = {
#define INPUT_REMOTE_KEY_PRESSED(key, port) (p_rarch->remote_st_ptr.buttons[(port)] & (UINT64_C(1) << (key))) #define INPUT_REMOTE_KEY_PRESSED(key, port) (p_rarch->remote_st_ptr.buttons[(port)] & (UINT64_C(1) << (key)))
#endif #endif
#define CHECK_INPUT_DRIVER_BLOCK_HOTKEY(normal_bind) \ /**
* check_input_driver_block_hotkey:
*
* Checks if 'hotkey enable' key is pressed.
*
* If we haven't bound anything to this,
* always allow hotkeys.
* If we hold ENABLE_HOTKEY button, block all libretro input to allow
* hotkeys to be bound to same keys as RetroPad.
**/
#define CHECK_INPUT_DRIVER_BLOCK_HOTKEY(normal_bind, autoconf_bind) \
( \ ( \
(((normal_bind)->key != RETROK_UNKNOWN) \ (((normal_bind)->key != RETROK_UNKNOWN) \
|| ((normal_bind)->mbutton != NO_BTN) \ || ((normal_bind)->mbutton != NO_BTN) \
|| ((normal_bind)->joykey != NO_BTN) \ || ((normal_bind)->joykey != NO_BTN) \
|| ((normal_bind)->joyaxis != AXIS_NONE)) \ || ((normal_bind)->joyaxis != AXIS_NONE) \
|| ((autoconf_bind)->key != RETROK_UNKNOWN) \
|| ((autoconf_bind)->joykey != NO_BTN) \
|| ((autoconf_bind)->joyaxis != AXIS_NONE)) \
) )
#define INHERIT_JOYAXIS(binds) (((binds)[x_plus].joyaxis == (binds)[x_minus].joyaxis) || ( (binds)[y_plus].joyaxis == (binds)[y_minus].joyaxis)) #define INHERIT_JOYAXIS(binds) (((binds)[x_plus].joyaxis == (binds)[x_minus].joyaxis) || ( (binds)[y_plus].joyaxis == (binds)[y_minus].joyaxis))
@ -25650,15 +25664,8 @@ static void input_keys_pressed(
{ {
unsigned i; unsigned i;
if ( CHECK_INPUT_DRIVER_BLOCK_HOTKEY(binds_norm) if (CHECK_INPUT_DRIVER_BLOCK_HOTKEY(binds_norm, binds_auto))
|| CHECK_INPUT_DRIVER_BLOCK_HOTKEY(binds_auto))
{ {
/* If we hold ENABLE_HOTKEY button, block all libretro input to allow
* hotkeys to be bound to same keys as RetroPad.
*
* If we haven't bound anything to this,
* always allow hotkeys.
**/
if ( p_rarch->current_input->input_state( if ( p_rarch->current_input->input_state(
p_rarch->current_input_data, joypad_info, p_rarch->current_input_data, joypad_info,
&binds[port], port, RETRO_DEVICE_JOYPAD, 0, &binds[port], port, RETRO_DEVICE_JOYPAD, 0,
@ -25686,8 +25693,8 @@ static void input_keys_pressed(
/* Allows rarch_focus_toggle hotkey to still work /* Allows rarch_focus_toggle hotkey to still work
* even though every hotkey is blocked */ * even though every hotkey is blocked */
if ( CHECK_INPUT_DRIVER_BLOCK_HOTKEY(focus_normal) if (CHECK_INPUT_DRIVER_BLOCK_HOTKEY(
|| CHECK_INPUT_DRIVER_BLOCK_HOTKEY(focus_binds_auto)) focus_normal, focus_binds_auto))
{ {
if (p_rarch->current_input->input_state( if (p_rarch->current_input->input_state(
p_rarch->current_input_data, p_rarch->current_input_data,