libretro/RetroArch
1
0 Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2026-11-09 03:29:43 -10:00
Code Issues Packages Projects Releases 1 Wiki Activity

(menu_event) Fix stray menu Left/Right input across OSK sessions

Browse Source 
Follow-up to c09a057, which fixed the same class of bug for 'ok_old'.

'switch_old' is the edge detector for menu Left/Right:

   switch_current = BIT256_GET_PTR(p_input, RETRO_DEVICE_ID_JOYPAD_LEFT)
                  | BIT256_GET_PTR(p_input, RETRO_DEVICE_ID_JOYPAD_RIGHT);
   switch_trigger = switch_current & ~switch_old;
   switch_old     = switch_current;

It was declared inside the 'else' branch of 'if (display_kb)', so
although static, it was only ever updated when the on-screen keyboard
was closed. While the OSK is open the sibling branch consumes Left and
Right for cursor movement and then clears the trigger bits, so the user
is actively pressing the direction while 'switch_old' stays frozen at
its last non-OSK value. Closing the keyboard mid-hold therefore emits a
stale edge on the first frame back.

This matters because 'switch_trigger' gates the ST_BOOL debounce that
stops a held direction from repeatedly toggling a boolean setting:

   /* Ignore direction if switch is already in that position */
   ...
      switch_trigger = 0;

A stale trigger bypasses that guard and can flip a boolean setting the
user never intended to change.

Hoist 'switch_old' to function scope and compute the edge before the
'display_kb' branch so it is maintained in both paths. Update it on the
BLOCK_ALL_INPUT and screensaver early returns as well, for the same
reason c09a057 updates 'ok_old' there. 'ok_enum_idx' and 'keydown[]'
are hoisted alongside it as they share the same declaration site and
the same restricted update path.
This commit is contained in:
libretroadmin committed 2026-07-20 09:31:52 +02:00
1 parent d67ee9925b
commit 8ab71e91ca
1 file changed
+19 -8
Download Patch File Download Diff File Expand all files Collapse all files
menu/menu_driver.c
+19 -8
View File
@@ -5135,10 +5135,15 @@ unsigned menu_event(
static float delay_timer = 0.0f;
static float delay_count = 0.0f;
static unsigned ok_old = 0;
static uint8_t switch_old = 0;
static size_t ok_enum_idx = 0;
static bool keydown[RARCH_FIRST_CUSTOM_BIND] = {false};
static bool navigation_reset_delay = true;
static bool hold_initial = true;
static bool hold_reset = true;
unsigned ret = MENU_ACTION_NOOP;
uint8_t switch_current = 0;
uint8_t switch_trigger = 0;
bool set_scroll = false;
unsigned new_scroll_accel = 0;
struct menu_state *menu_st = &menu_driver_state;
@@ -5207,6 +5212,8 @@ unsigned menu_event(
if (menu_st->flags & MENU_ST_FLAG_BLOCK_ALL_INPUT)
{
ok_old = ok_current;
switch_old = BIT256_GET_PTR(p_input, RETRO_DEVICE_ID_JOYPAD_LEFT)
| BIT256_GET_PTR(p_input, RETRO_DEVICE_ID_JOYPAD_RIGHT);
return MENU_ACTION_NOOP;
}
@@ -5343,6 +5350,8 @@ unsigned menu_event(
| MENU_INP_PTR_FLG_PRESS_RIGHT);
menu_input->select_inhibit = true;
menu_input->cancel_inhibit = true;
switch_old = BIT256_GET_PTR(p_input, RETRO_DEVICE_ID_JOYPAD_LEFT)
| BIT256_GET_PTR(p_input, RETRO_DEVICE_ID_JOYPAD_RIGHT);
return MENU_ACTION_NOOP;
}
@@ -5411,6 +5420,16 @@ unsigned menu_event(
if (set_scroll)
menu_st->scroll.acceleration = new_scroll_accel;
/* Left/Right edge detection
* > Must be maintained regardless of the on-screen keyboard
* state, otherwise 'switch_old' freezes for the duration of
* the OSK session and a stale edge is emitted on the first
* frame after it closes, bypassing the ST_BOOL debounce */
switch_current = BIT256_GET_PTR(p_input, RETRO_DEVICE_ID_JOYPAD_LEFT)
| BIT256_GET_PTR(p_input, RETRO_DEVICE_ID_JOYPAD_RIGHT);
switch_trigger = switch_current & ~switch_old;
switch_old = switch_current;
if (display_kb)
{
#ifdef HAVE_MIST
@@ -5521,16 +5540,8 @@ unsigned menu_event(
}
else
{
static size_t ok_enum_idx = 0;
static uint8_t switch_old = 0;
static bool keydown[RARCH_FIRST_CUSTOM_BIND] = {false};
unsigned onkeyup =
input_combo_type_onkeyup_lut[settings->uints.input_menu_toggle_gamepad_combo];
uint8_t switch_current = BIT256_GET_PTR(p_input, RETRO_DEVICE_ID_JOYPAD_LEFT)
| BIT256_GET_PTR(p_input, RETRO_DEVICE_ID_JOYPAD_RIGHT);
uint8_t switch_trigger = switch_current & ~switch_old;
switch_old = switch_current;
/* Always process Select and Start on release */
onkeyup |= (1 << RETRO_DEVICE_ID_JOYPAD_SELECT)