archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-04 05:51:27 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

overlays/osk: keep dialog open in continuous mode

Browse source
This commit is contained in:
Megamouse 2023-01-21 19:01:20 +01:00
parent 641fadc1fb
commit d1a950d59f
8 changed files with 189 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

21
rpcs3/Input/pad_thread.cpp
View file

@ -406,7 +406,9 @@ void pad_thread::operator()()
// Handle home menu if requested
if (!is_vsh && !m_home_menu_open && Emu.IsRunning())
{
for (usz i = 0; i < m_pads.size(); i++)
bool ps_button_pressed = false;
for (usz i = 0; i < m_pads.size() && !ps_button_pressed; i++)
{
const auto& pad = m_pads[i];
@ -417,11 +419,18 @@ void pad_thread::operator()()
{
if (button.m_offset == CELL_PAD_BTN_OFFSET_DIGITAL2 && button.m_outKeyCode == CELL_PAD_CTRL_PS && button.m_pressed)
{
open_home_menu();
// Make sure we call this function only once per button press
if (!m_ps_button_pressed)
{
open_home_menu();
}
ps_button_pressed = true;
break;
}
}
}
m_ps_button_pressed = ps_button_pressed;
}
// Handle paused emulation (if triggered by home menu).
@ -619,9 +628,17 @@ void pad_thread::InitPadConfig(cfg_pad& cfg, pad_handler type, std::shared_ptr<P
extern bool send_open_home_menu_cmds();
extern void send_close_home_menu_cmds();
extern bool close_osk_from_ps_button();
void pad_thread::open_home_menu()
{
// Check if the OSK is open and can be closed
if (!close_osk_from_ps_button())
{
rsx::overlays::queue_message(get_localized_string(localized_string_id::CELL_OSK_DIALOG_BUSY));
return;
}
if (auto manager = g_fxo->try_get<rsx::overlays::display_manager>())
{
if (m_home_menu_open.exchange(true))