archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-06 15:01:28 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Qt: ignore all game window hotkeys on "disable kb hotkeys"

Browse source
This commit is contained in:
Megamouse 2025-02-04 01:50:45 +01:00
parent 85f288651b
commit 739c4bcfc8
1 changed files with 38 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

84
rpcs3/rpcs3qt/gs_frame.cpp
View file

@ -243,6 +243,11 @@ void gs_frame::handle_shortcut(gui::shortcuts::shortcut shortcut_key, const QKey
{ {
gui_log.notice("Game window registered shortcut: %s (%s)", shortcut_key, key_sequence.toString()); gui_log.notice("Game window registered shortcut: %s (%s)", shortcut_key, key_sequence.toString());
if (m_disable_kb_hotkeys)
{
return;
}
switch (shortcut_key) switch (shortcut_key)
{ {
case gui::shortcuts::shortcut::gw_toggle_fullscreen: case gui::shortcuts::shortcut::gw_toggle_fullscreen:
@ -252,7 +257,7 @@ void gs_frame::handle_shortcut(gui::shortcuts::shortcut shortcut_key, const QKey
} }
case gui::shortcuts::shortcut::gw_exit_fullscreen: case gui::shortcuts::shortcut::gw_exit_fullscreen:
{ {
if (visibility() == FullScreen && !m_disable_kb_hotkeys) if (visibility() == FullScreen)
{ {
toggle_fullscreen(); toggle_fullscreen();
} }
@ -281,70 +286,57 @@ void gs_frame::handle_shortcut(gui::shortcuts::shortcut shortcut_key, const QKey
} }
case gui::shortcuts::shortcut::gw_pause_play: case gui::shortcuts::shortcut::gw_pause_play:
{ {
if (!m_disable_kb_hotkeys) switch (Emu.GetStatus())
{ {
switch (Emu.GetStatus()) case system_state::ready:
{ {
case system_state::ready: Emu.Run(true);
{ return;
Emu.Run(true); }
return; case system_state::paused:
} {
case system_state::paused: Emu.Resume();
{ return;
Emu.Resume(); }
return; default:
} {
default: Emu.Pause();
{ return;
Emu.Pause(); }
return;
}
}
} }
break; break;
} }
case gui::shortcuts::shortcut::gw_restart: case gui::shortcuts::shortcut::gw_restart:
{ {
if (!m_disable_kb_hotkeys) if (Emu.IsStopped())
{ {
if (Emu.IsStopped()) Emu.Restart();
{ return;
Emu.Restart();
return;
}
extern bool boot_last_savestate(bool testing);
boot_last_savestate(false);
} }
extern bool boot_last_savestate(bool testing);
boot_last_savestate(false);
break; break;
} }
case gui::shortcuts::shortcut::gw_savestate: case gui::shortcuts::shortcut::gw_savestate:
{ {
if (!m_disable_kb_hotkeys) if (!g_cfg.savestate.suspend_emu)
{ {
if (!g_cfg.savestate.suspend_emu) Emu.after_kill_callback = []()
{ {
Emu.after_kill_callback = []() Emu.Restart();
{ };
Emu.Restart();
};
// Make sure we keep the game window opened // Make sure we keep the game window opened
Emu.SetContinuousMode(true); Emu.SetContinuousMode(true);
}
Emu.Kill(false, true);
return;
} }
break;
Emu.Kill(false, true);
return;
} }
case gui::shortcuts::shortcut::gw_rsx_capture: case gui::shortcuts::shortcut::gw_rsx_capture:
{ {
if (!m_disable_kb_hotkeys) g_user_asked_for_frame_capture = true;
{
g_user_asked_for_frame_capture = true;
}
break; break;
} }
case gui::shortcuts::shortcut::gw_frame_limit: case gui::shortcuts::shortcut::gw_frame_limit: