mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-01 22:20:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix input state combos and empty binds (#16233)

Browse Source
This commit is contained in:
sonninnos 2024-02-14 02:16:39 +02:00 committed by GitHub
parent 34e28f548a
commit e8956418a8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
input/input_driver.c
View File

@ -91,6 +91,18 @@
|| ((autoconf_bind)->joyaxis != AXIS_NONE)) \ || ((autoconf_bind)->joyaxis != AXIS_NONE)) \
) )
/* Checks if hotkey or RetroPad has any bindings at all. */
#define CHECK_INPUT_DRIVER_EMPTY_BIND(port, i) \
( \
(binds[port][i].key == RETROK_UNKNOWN) \
&& (binds[port][i].mbutton == NO_BTN) \
&& ( ( binds[port][i].joykey == NO_BTN \
&& binds[port][i].joyaxis == AXIS_NONE) \
|| ( joypad_info->auto_binds[i].joykey == NO_BTN \
&& joypad_info->auto_binds[i].joyaxis == AXIS_NONE) \
) \
)
/* Human readable order of input binds */ /* Human readable order of input binds */
const unsigned input_config_bind_order[24] = { const unsigned input_config_bind_order[24] = {
RETRO_DEVICE_ID_JOYPAD_UP, RETRO_DEVICE_ID_JOYPAD_UP,
@ -782,31 +794,21 @@ static int32_t input_state_wrap(
if (device == RETRO_DEVICE_JOYPAD) if (device == RETRO_DEVICE_JOYPAD)
{ {
/* Drivers can overflow when sending too many keys at once.. */
if (id == RETRO_DEVICE_ID_JOYPAD_MASK && ret)
{
/* Deal with menu toggle combo buttons that won't stay inside +32767. */
if (ret == -0x8000) /* R3 */
ret = 0x8000;
else if (ret == -0x4000) /* LR+R3 */
ret = 0x8000 + 0x4000;
else if (ret < 0)
ret = 0;
return ret;
}
/* No binds, no input. This is for ignoring RETROK_UNKNOWN /* No binds, no input. This is for ignoring RETROK_UNKNOWN
* if the driver allows setting the key down somehow. * if the driver allows setting the key down somehow.
* Otherwise all hotkeys and inputs with null bind get triggered. */ * Otherwise all hotkeys and inputs with null bind get triggered. */
if ( id != RETRO_DEVICE_ID_JOYPAD_MASK && ret if (id == RETRO_DEVICE_ID_JOYPAD_MASK)
&& binds[_port][id].key == RETROK_UNKNOWN {
&& binds[_port][id].mbutton == NO_BTN int i;
&& ( ( binds[_port][id].joykey == NO_BTN for (i = 0; i < RARCH_FIRST_META_KEY; i++)
&& binds[_port][id].joyaxis == AXIS_NONE) {
|| ( joypad_info->auto_binds[id].joykey == NO_BTN if (CHECK_INPUT_DRIVER_EMPTY_BIND(_port, i))
&& joypad_info->auto_binds[id].joyaxis == AXIS_NONE) ret &= ~(UINT64_C(1) << i);
) }
) return ret;
}
else if (id != RETRO_DEVICE_ID_JOYPAD_MASK
&& CHECK_INPUT_DRIVER_EMPTY_BIND(_port, id))
return 0; return 0;
} }