RPCS3/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2026-04-20 22:05:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

input: fix input guard button offsets for closing native overlays

Browse source 
L2, R1 and all hat buttons were incorrectly enforcing the
pad interception after closing a native dialog.
This commit is contained in:
Megamouse 2026-02-09 19:46:57 +01:00
parent 3bb21db71b
commit 6a07c3f46d
1 changed files with 12 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

21
rpcs3/Input/pad_thread.cpp
View file

@ -631,15 +631,18 @@ void pad_thread::operator()()
if (!pad->is_connected()) if (!pad->is_connected())
continue; continue;
for (const auto& button : pad->m_buttons) for (const Button& button : pad->m_buttons)
{ {
if (button.m_pressed && ( if (button.m_pressed && (
button.m_outKeyCode == CELL_PAD_CTRL_CROSS || (button.m_offset == CELL_PAD_BTN_OFFSET_DIGITAL1 && (
button.m_outKeyCode == CELL_PAD_CTRL_CIRCLE || button.m_outKeyCode == CELL_PAD_CTRL_START ||
button.m_outKeyCode == CELL_PAD_CTRL_TRIANGLE || button.m_outKeyCode == CELL_PAD_CTRL_SELECT)) ||
button.m_outKeyCode == CELL_PAD_CTRL_SQUARE || (button.m_offset == CELL_PAD_BTN_OFFSET_DIGITAL2 && (
button.m_outKeyCode == CELL_PAD_CTRL_START || button.m_outKeyCode == CELL_PAD_CTRL_CROSS ||
button.m_outKeyCode == CELL_PAD_CTRL_SELECT)) button.m_outKeyCode == CELL_PAD_CTRL_CIRCLE ||
button.m_outKeyCode == CELL_PAD_CTRL_TRIANGLE ||
button.m_outKeyCode == CELL_PAD_CTRL_SQUARE))
))
{ {
any_button_pressed = true; any_button_pressed = true;
break; break;
@ -676,7 +679,7 @@ void pad_thread::operator()()
break; break;
} }
for (const auto& button : pad->m_buttons) for (const Button& button : pad->m_buttons)
{ {
if (button.m_offset == CELL_PAD_BTN_OFFSET_DIGITAL1 && button.m_outKeyCode == CELL_PAD_CTRL_PS && button.m_pressed) if (button.m_offset == CELL_PAD_BTN_OFFSET_DIGITAL1 && button.m_outKeyCode == CELL_PAD_CTRL_PS && button.m_pressed)
{ {
@ -735,7 +738,7 @@ void pad_thread::operator()()
if (!pad->is_connected()) if (!pad->is_connected())
continue; continue;
for (const auto& button : pad->m_buttons) for (const Button& button : pad->m_buttons)
{ {
if (button.m_offset == CELL_PAD_BTN_OFFSET_DIGITAL1 && button.m_outKeyCode == CELL_PAD_CTRL_START && button.m_pressed) if (button.m_offset == CELL_PAD_BTN_OFFSET_DIGITAL1 && button.m_outKeyCode == CELL_PAD_CTRL_START && button.m_pressed)
{ {