From 4b77cfd53b8bf31c83898878f7a26a617a908124 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Mon, 24 Feb 2025 10:23:11 -0600 Subject: [PATCH] Add confirmation popup support on Exit App key This adds a new mechanism so we can delay "vkey" events until the next frame, making for safer code. Will move a bunch of the virtkeys to this later. Fixes #20020 --- Core/ControlMapper.cpp | 22 +++++++++++----------- Core/ControlMapper.h | 12 ++++++------ Core/KeyMap.h | 2 +- UI/EmuScreen.cpp | 36 +++++++++++++++++++++++++++++++++--- UI/EmuScreen.h | 8 ++++++-- 5 files changed, 57 insertions(+), 23 deletions(-) diff --git a/Core/ControlMapper.cpp b/Core/ControlMapper.cpp index 5687735c8454..f32a6faaa158 100644 --- a/Core/ControlMapper.cpp +++ b/Core/ControlMapper.cpp @@ -147,8 +147,8 @@ void ConvertAnalogStick(float x, float y, float *outX, float *outY) { } void ControlMapper::SetCallbacks( - std::function onVKey, - std::function onVKeyAnalog, + std::function onVKey, + std::function onVKeyAnalog, std::function updatePSPButtons, std::function setPSPAnalog, std::function setRawAnalog) { @@ -421,7 +421,7 @@ bool ControlMapper::UpdatePSPState(const InputMapping &changedMapping, double no // OK, handle all the virtual keys next. For these we need to do deltas here and send events. // Note that virtual keys include the analog directions, as they are driven by them. for (int i = 0; i < VIRTKEY_COUNT; i++) { - int vkId = i + VIRTKEY_FIRST; + VirtKey vkId = (VirtKey)(i + VIRTKEY_FIRST); uint32_t idForMapping = vkId; SwapMappingIfEnabled(&idForMapping); @@ -578,7 +578,7 @@ void ControlMapper::ToggleSwapAxes() { updatePSPButtons_(0, CTRL_LEFT | CTRL_RIGHT | CTRL_UP | CTRL_DOWN); - for (uint32_t vkey = VIRTKEY_FIRST; vkey < VIRTKEY_LAST; vkey++) { + for (VirtKey vkey = VIRTKEY_FIRST; vkey < VIRTKEY_LAST; vkey = (VirtKey)(vkey + 1)) { if (IsSwappableVKey(vkey)) { if (virtKeyOn_[vkey - VIRTKEY_FIRST]) { onVKey_(vkey, false); @@ -668,13 +668,13 @@ void ControlMapper::PSPKey(int deviceId, int pspKeyCode, int flags) { int vk = pspKeyCode - VIRTKEY_FIRST; if (flags & KEY_DOWN) { virtKeys_[vk] = 1.0f; - onVKey(pspKeyCode, true); - onVKeyAnalog(deviceId, pspKeyCode, 1.0f); + onVKey((VirtKey)pspKeyCode, true); + onVKeyAnalog(deviceId, (VirtKey)pspKeyCode, 1.0f); } if (flags & KEY_UP) { virtKeys_[vk] = 0.0f; - onVKey(pspKeyCode, false); - onVKeyAnalog(deviceId, pspKeyCode, 0.0f); + onVKey((VirtKey)pspKeyCode, false); + onVKeyAnalog(deviceId, (VirtKey)pspKeyCode, 0.0f); } } else { // INFO_LOG(Log::System, "pspKey %d %d", pspKeyCode, flags); @@ -685,7 +685,7 @@ void ControlMapper::PSPKey(int deviceId, int pspKeyCode, int flags) { } } -void ControlMapper::onVKeyAnalog(int deviceId, int vkey, float value) { +void ControlMapper::onVKeyAnalog(int deviceId, VirtKey vkey, float value) { // Unfortunately, for digital->analog inputs to work sanely, we need to sum up // with the opposite value too. int stick = 0; @@ -716,7 +716,7 @@ void ControlMapper::onVKeyAnalog(int deviceId, int vkey, float value) { SetPSPAxis(deviceId, stick, axis, sign * value); } -void ControlMapper::onVKey(int vkey, bool down) { +void ControlMapper::onVKey(VirtKey vkey, bool down) { switch (vkey) { case VIRTKEY_ANALOG_ROTATE_CW: if (down) { @@ -745,7 +745,7 @@ void ControlMapper::onVKey(int vkey, bool down) { void ControlMapper::GetDebugString(char *buffer, size_t bufSize) const { std::stringstream str; - for (auto iter : curInput_) { + for (auto &iter : curInput_) { char temp[256]; iter.first.FormatDebug(temp, sizeof(temp)); str << temp << ": " << iter.second.value << std::endl; diff --git a/Core/ControlMapper.h b/Core/ControlMapper.h index 313453bac070..cde5ea688481 100644 --- a/Core/ControlMapper.h +++ b/Core/ControlMapper.h @@ -21,8 +21,8 @@ class ControlMapper { // Required callbacks. // TODO: These are so many now that a virtual interface might be more appropriate.. void SetCallbacks( - std::function onVKey, - std::function onVKeyAnalog, + std::function onVKey, + std::function onVKeyAnalog, std::function updatePSPButtons, std::function setPSPAnalog, std::function setRawAnalog); @@ -58,8 +58,8 @@ class ControlMapper { void SetPSPAxis(int deviceId, int stick, char axis, float value); void UpdateAnalogOutput(int stick); - void onVKey(int vkey, bool down); - void onVKeyAnalog(int deviceId, int vkey, float value); + void onVKey(VirtKey vkey, bool down); + void onVKeyAnalog(int deviceId, VirtKey vkey, float value); void UpdateCurInputAxis(const InputMapping &mapping, float value, double timestamp); float GetDeviceAxisThreshold(int device, const InputMapping &mapping); @@ -93,8 +93,8 @@ class ControlMapper { std::map curInput_; // Callbacks - std::function onVKey_; - std::function onVKeyAnalog_; + std::function onVKey_; + std::function onVKeyAnalog_; std::function updatePSPButtons_; std::function setPSPAnalog_; std::function setRawAnalog_; diff --git a/Core/KeyMap.h b/Core/KeyMap.h index 47e99625e921..1e0cf93fc596 100644 --- a/Core/KeyMap.h +++ b/Core/KeyMap.h @@ -31,7 +31,7 @@ #define KEYMAP_ERROR_UNKNOWN_KEY 0 // Don't change any of these - it'll break backwards compatibility with configs. -enum { +enum VirtKey { VIRTKEY_FIRST = 0x40000001, VIRTKEY_AXIS_X_MIN = 0x40000001, VIRTKEY_AXIS_Y_MIN = 0x40000002, diff --git a/UI/EmuScreen.cpp b/UI/EmuScreen.cpp index f254137df4f8..5af330eabc06 100644 --- a/UI/EmuScreen.cpp +++ b/UI/EmuScreen.cpp @@ -690,7 +690,7 @@ static void ShowFpsLimitNotice() { g_OSD.Show(OSDType::TRANSPARENT_STATUS, temp, "", "I_FASTFORWARD", 1.5f, "altspeed"); } -void EmuScreen::onVKey(int virtualKeyCode, bool down) { +void EmuScreen::onVKey(VirtKey virtualKeyCode, bool down) { auto sc = GetI18NCategory(I18NCat::SCREEN); auto mc = GetI18NCategory(I18NCat::MAPPABLECONTROLS); @@ -953,13 +953,41 @@ void EmuScreen::onVKey(int virtualKeyCode, bool down) { "%s: %s", n->T("Enable networking"), g_Config.bEnableWlan ? di->T("Enabled") : di->T("Disabled")), 2.0, "toggle_wlan"); } break; + default: + // To make sure we're not in an async context. + if (down) { + queuedVirtKey_ = virtualKeyCode; + } + break; + } +} + +void EmuScreen::ProcessQueuedVKeys() { + switch (queuedVirtKey_) { case VIRTKEY_EXIT_APP: - System_ExitApp(); + { + std::string confirmExitMessage = GetConfirmExitMessage(); + if (!confirmExitMessage.empty()) { + auto di = GetI18NCategory(I18NCat::DIALOG); + confirmExitMessage += '\n'; + confirmExitMessage += di->T("Are you sure you want to exit?"); + screenManager()->push(new PromptScreen(gamePath_, confirmExitMessage, di->T("Yes"), di->T("No"), [=](bool result) { + if (result) { + System_ExitApp(); + } + })); + } else { + System_ExitApp(); + } break; } + default: + break; + } + queuedVirtKey_ = (VirtKey)0; } -void EmuScreen::onVKeyAnalog(int virtualKeyCode, float value) { +void EmuScreen::onVKeyAnalog(VirtKey virtualKeyCode, float value) { if (virtualKeyCode != VIRTKEY_SPEED_ANALOG) { return; } @@ -1478,6 +1506,8 @@ ScreenRenderFlags EmuScreen::render(ScreenRenderMode mode) { GamepadUpdateOpacity(); + ProcessQueuedVKeys(); + bool skipBufferEffects = g_Config.bSkipBufferEffects; bool framebufferBound = false; diff --git a/UI/EmuScreen.h b/UI/EmuScreen.h index 27f42f3a9198..d24479d9a910 100644 --- a/UI/EmuScreen.h +++ b/UI/EmuScreen.h @@ -82,12 +82,14 @@ class EmuScreen : public UIScreen { void runImDebugger(); void renderImDebugger(); - void onVKey(int virtualKeyCode, bool down); - void onVKeyAnalog(int virtualKeyCode, float value); + void onVKey(VirtKey virtualKeyCode, bool down); + void onVKeyAnalog(VirtKey virtualKeyCode, float value); void autoLoad(); bool checkPowerDown(); + void ProcessQueuedVKeys(); + UI::Event OnDevMenu; UI::Event OnChatMenu; bool bootPending_ = true; @@ -144,6 +146,8 @@ class EmuScreen : public UIScreen { bool keyAltRight_ = false; bool lastImguiEnabled_ = false; + + VirtKey queuedVirtKey_ = (VirtKey)0; }; bool MustRunBehind();