block mouse mapping when mouse outside popup

Kenix3 · Dec 24, 2024 · 3c94495 · 3c94495
1 parent a272e1a
commit 3c94495
Show file tree

Hide file tree

Showing 9 changed files with 66 additions and 16 deletions.
diff --git a/src/controller/controldeck/ControlDeck.cpp b/src/controller/controldeck/ControlDeck.cpp
@@ -9,6 +9,7 @@
 #endif
 #include <imgui.h>
 #include "controller/deviceindex/ShipDeviceIndexMappingManager.h"
+#include "window/gui/BaseInputEditor.h"
 
 namespace Ship {
 
@@ -94,6 +95,19 @@ bool ControlDeck::MouseGameInputBlocked() {
            (window->ID != Context::GetInstance()->GetWindow()->GetGui()->GetMainGameWindowID());
 }
 
+bool ControlDeck::MouseMappingInputBlocked() {
+    static std::shared_ptr<BaseInputEditor> inputEditor = nullptr;
+    if (inputEditor == nullptr) {
+        inputEditor = std::dynamic_pointer_cast<BaseInputEditor>(
+            Ship::Context::GetInstance()->GetWindow()->GetGui()->GetGuiWindow("Custom Input Editor"));
+    }
+    if (inputEditor == nullptr) {
+        inputEditor = std::dynamic_pointer_cast<BaseInputEditor>(
+            Ship::Context::GetInstance()->GetWindow()->GetGui()->GetGuiWindow("Input Editor"));
+    }
+    return ImGui::IsAnyItemHovered() || inputEditor->IsMouseMappingBlocked();
+}
+
 std::shared_ptr<Controller> ControlDeck::GetControllerByPort(uint8_t port) {
     return mPorts[port]->GetConnectedController();
 }

diff --git a/src/controller/controldeck/ControlDeck.h b/src/controller/controldeck/ControlDeck.h
@@ -22,6 +22,7 @@ class ControlDeck {
     bool GamepadGameInputBlocked();
     bool KeyboardGameInputBlocked();
     bool MouseGameInputBlocked();
+    bool MouseMappingInputBlocked();
     void SetSinglePlayerMappingMode(bool singlePlayer);
     bool IsSinglePlayerMappingMode();
     bool ProcessKeyboardEvent(KbEventType eventType, KbScancode scancode);

diff --git a/src/controller/controldevice/controller/ControllerButton.cpp b/src/controller/controldevice/controller/ControllerButton.cpp
@@ -181,9 +181,9 @@ bool ControllerButton::AddOrEditButtonMappingFromRawPress(CONTROLLERBUTTONS_T bi
     mUseInputToCreateNewMapping = true;
     if (mKeyboardScancodeForNewMapping != LUS_KB_UNKNOWN) {
         mapping = std::make_shared<KeyboardKeyToButtonMapping>(mPortIndex, bitmask, mKeyboardScancodeForNewMapping);
-    } else if (!Context::GetInstance()->GetWindow()->GetGui()->IsMouseOverAnyGuiItem() &&
-               mMouseButtonForNewMapping != LUS_MOUSE_BTN_UNKNOWN) {
-        mapping = std::make_shared<MouseButtonToButtonMapping>(mPortIndex, bitmask, mMouseButtonForNewMapping);
+    } else if (!Context::GetInstance()->GetControlDeck()->MouseMappingInputBlocked() &&
+               mMouseButtonForNewMapping != MouseBtn::MOUSE_BTN_UNKNOWN) {
+        mapping = std::make_shared<MouseKeyToButtonMapping>(mPortIndex, bitmask, mMouseButtonForNewMapping);
     } else {
         mapping = ButtonMappingFactory::CreateButtonMappingFromSDLInput(mPortIndex, bitmask);
     }

diff --git a/src/controller/controldevice/controller/ControllerStick.cpp b/src/controller/controldevice/controller/ControllerStick.cpp
@@ -274,11 +274,10 @@ bool ControllerStick::AddOrEditAxisDirectionMappingFromRawPress(Direction direct
     mUseInputToCreateNewMapping = true;
     if (mKeyboardScancodeForNewMapping != LUS_KB_UNKNOWN) {
         mapping = std::make_shared<KeyboardKeyToAxisDirectionMapping>(mPortIndex, mStickIndex, direction,
-                                                                      mKeyboardScancodeForNewMapping);
-    } else if (!Context::GetInstance()->GetWindow()->GetGui()->IsMouseOverAnyGuiItem() &&
-               mMouseButtonForNewMapping != LUS_MOUSE_BTN_UNKNOWN) {
-        mapping = std::make_shared<MouseButtonToAxisDirectionMapping>(mPortIndex, mStickIndex, direction,
-                                                                      mMouseButtonForNewMapping);
+    } else if (!Context::GetInstance()->GetControlDeck()->MouseMappingInputBlocked() &&
+               mMouseButtonForNewMapping != MouseBtn::MOUSE_BTN_UNKNOWN) {
+        mapping =
+            std::make_shared<MouseKeyToAxisDirectionMapping>(mPortIndex, mStick, direction, mMouseButtonForNewMapping);
     } else {
         mapping =
             AxisDirectionMappingFactory::CreateAxisDirectionMappingFromSDLInput(mPortIndex, mStickIndex, direction);

diff --git a/src/window/gui/BaseInputEditor.h b/src/window/gui/BaseInputEditor.h
@@ -0,0 +1,8 @@
+#pragma once
+
+namespace Ship {
+class BaseInputEditor {
+  public:
+    virtual bool IsMouseMappingBlocked() = 0;
+};
+} // namespace Ship
diff --git a/src/window/gui/Gui.cpp b/src/window/gui/Gui.cpp
@@ -770,12 +770,17 @@ void Gui::SaveConsoleVariablesNextFrame() {
 }
 
 void Gui::AddGuiWindow(std::shared_ptr<GuiWindow> guiWindow) {
+    return Gui::AddGuiWindow(guiWindow, guiWindow->GetName());
+}
+
+void Gui::AddGuiWindow(std::shared_ptr<GuiWindow> guiWindow, std::string name) {
     if (mGuiWindows.contains(guiWindow->GetName())) {
-        SPDLOG_ERROR("ImGui::AddGuiWindow: Attempting to add duplicate window name {}", guiWindow->GetName());
+        SPDLOG_ERROR("ImGui::AddGuiWindow: Attempting to add duplicate window name {}", name);
+    if (mGuiWindows.contains(name)) {
         return;
     }
 
-    mGuiWindows[guiWindow->GetName()] = guiWindow;
+    mGuiWindows[name] = guiWindow;
     guiWindow->Init();
 }
 
@@ -990,10 +995,6 @@ bool Gui::GetMenuOrMenubarVisible() {
     return (GetMenuBar() && GetMenuBar()->IsVisible()) || (GetMenu() && GetMenu()->IsVisible());
 }
 
-bool Gui::IsMouseOverAnyGuiItem() {
-    return ImGui::IsAnyItemHovered();
-}
-
 std::shared_ptr<GuiWindow> Gui::GetMenu() {
     return mMenu;
 }

diff --git a/src/window/gui/Gui.h b/src/window/gui/Gui.h
@@ -80,6 +80,7 @@ class Gui {
     ImGuiID GetMainGameWindowID();
 
     void AddGuiWindow(std::shared_ptr<GuiWindow> guiWindow);
+    void AddGuiWindow(std::shared_ptr<GuiWindow> guiWindow, std::string name);
     std::shared_ptr<GuiWindow> GetGuiWindow(const std::string& name);
     void RemoveGuiWindow(std::shared_ptr<GuiWindow> guiWindow);
     void RemoveGuiWindow(const std::string& name);
@@ -99,7 +100,6 @@ class Gui {
     void SetMenu(std::shared_ptr<GuiWindow> menu);
     std::shared_ptr<GuiWindow> GetMenu();
     bool GetMenuOrMenubarVisible();
-    bool IsMouseOverAnyGuiItem();
 
     bool GamepadNavigationEnabled();
     void BlockGamepadNavigation();

diff --git a/src/window/gui/InputEditorWindow.cpp b/src/window/gui/InputEditorWindow.cpp
@@ -19,6 +19,7 @@ void InputEditorWindow::InitElement() {
     mRumbleTimer = INT32_MAX;
     mRumbleMappingToTest = nullptr;
     mInputEditorPopupOpen = false;
+    mCurrentMappingPopupId = 0;
 
     mButtonsBitmasks = { BTN_A, BTN_B, BTN_START, BTN_L, BTN_R, BTN_Z, BTN_CUP, BTN_CDOWN, BTN_CLEFT, BTN_CRIGHT };
     mDpadBitmasks = { BTN_DUP, BTN_DDOWN, BTN_DLEFT, BTN_DRIGHT };
@@ -217,6 +218,7 @@ void InputEditorWindow::DrawButtonLineAddMappingButton(uint8_t port, CONTROLLERB
     if (ImGui::Button(StringHelper::Sprintf("%s###addButtonMappingButton%d-%d", ICON_FA_PLUS, port, bitmask).c_str(),
                       ImVec2(SCALE_IMGUI_SIZE(20.0f), 0.0f))) {
         ImGui::OpenPopup(popupId.c_str());
+        mCurrentMappingPopupId = ImGui::GetID(popupId.c_str());
     };
     ImGui::PopStyleVar();
 
@@ -278,6 +280,7 @@ void InputEditorWindow::DrawButtonLineEditMappingButton(uint8_t port, CONTROLLER
                 .c_str(),
             ImVec2(ImGui::CalcTextSize(physicalInputDisplayName.c_str()).x + SCALE_IMGUI_SIZE(12.0f), 0.0f))) {
         ImGui::OpenPopup(popupId.c_str());
+        mCurrentMappingPopupId = ImGui::GetID(popupId.c_str());
     }
     if (ImGui::IsItemHovered(ImGuiHoveredFlags_DelayNormal | ImGuiHoveredFlags_NoSharedDelay)) {
         ImGui::SetTooltip("%s", mapping->GetPhysicalDeviceName().c_str());
@@ -325,6 +328,7 @@ void InputEditorWindow::DrawButtonLineEditMappingButton(uint8_t port, CONTROLLER
         if (ImGui::Button(StringHelper::Sprintf("%s###editAxisThresholdButton%s", ICON_FA_COG, id.c_str()).c_str(),
                           ImVec2(ImGui::CalcTextSize(ICON_FA_COG).x + SCALE_IMGUI_SIZE(10.0f), 0.0f))) {
             ImGui::OpenPopup(popupId.c_str());
+            mCurrentMappingPopupId = ImGui::GetID(popupId.c_str());
         }
         if (ImGui::IsItemHovered(ImGuiHoveredFlags_DelayNormal | ImGuiHoveredFlags_NoSharedDelay)) {
             ImGui::SetTooltip("Edit axis threshold");
@@ -460,6 +464,7 @@ void InputEditorWindow::DrawStickDirectionLineAddMappingButton(uint8_t port, uin
                 .c_str(),
             ImVec2(SCALE_IMGUI_SIZE(20.0f), 0.0f))) {
         ImGui::OpenPopup(popupId.c_str());
+        mCurrentMappingPopupId = ImGui::GetID(popupId.c_str());
     };
     ImGui::PopStyleVar();
 
@@ -546,6 +551,7 @@ void InputEditorWindow::DrawStickDirectionLineEditMappingButton(uint8_t port, ui
                 .c_str(),
             ImVec2(ImGui::CalcTextSize(physicalInputDisplayName.c_str()).x + SCALE_IMGUI_SIZE(12.0f), 0.0f))) {
         ImGui::OpenPopup(popupId.c_str());
+        mCurrentMappingPopupId = ImGui::GetID(popupId.c_str());
     }
     if (ImGui::IsItemHovered(ImGuiHoveredFlags_DelayNormal | ImGuiHoveredFlags_NoSharedDelay)) {
         ImGui::SetTooltip("%s", mapping->GetPhysicalDeviceName().c_str());
@@ -822,6 +828,7 @@ void InputEditorWindow::DrawAddRumbleMappingButton(uint8_t port) {
     if (ImGui::Button(StringHelper::Sprintf("%s###addRumbleMapping%d", ICON_FA_PLUS, port).c_str(),
                       ImVec2(SCALE_IMGUI_SIZE(20.0f), SCALE_IMGUI_SIZE(20.0f)))) {
         ImGui::OpenPopup(popupId.c_str());
+        mCurrentMappingPopupId = ImGui::GetID(popupId.c_str());
     }
     ImGui::PopStyleVar();
 
@@ -985,6 +992,21 @@ void InputEditorWindow::DrawRumbleSection(uint8_t port) {
     DrawAddRumbleMappingButton(port);
 }
 
+bool InputEditorWindow::IsMouseMappingBlocked() {
+    if (mCurrentMappingPopupId == 0) {
+        return true;
+    }
+    ImGuiContext* ctx = ImGui::GetCurrentContext();
+    if (ctx->HoveredWindow == NULL) {
+        return true;
+    }
+    ImGuiPopupData& popup = ctx->OpenPopupStack.back();
+    if (popup.Window == NULL) {
+        return true;
+    }
+    return !(ctx->HoveredWindow->ID == popup.Window->ID && popup.PopupId == mCurrentMappingPopupId);
+}
+
 void InputEditorWindow::DrawRemoveLEDMappingButton(uint8_t port, std::string id) {
     ImGui::SameLine();
     ImGui::PushStyleVar(ImGuiStyleVar_ButtonTextAlign, ImVec2(1.0f, 0.5f));
@@ -1002,6 +1024,7 @@ void InputEditorWindow::DrawAddLEDMappingButton(uint8_t port) {
     if (ImGui::Button(StringHelper::Sprintf("%s###addLEDMapping%d", ICON_FA_PLUS, port).c_str(),
                       ImVec2(SCALE_IMGUI_SIZE(20.0f), SCALE_IMGUI_SIZE(20.0f)))) {
         ImGui::OpenPopup(popupId.c_str());
+        mCurrentMappingPopupId = ImGui::GetID(popupId.c_str());
     }
     ImGui::PopStyleVar();
 
@@ -1081,6 +1104,7 @@ void InputEditorWindow::DrawAddGyroMappingButton(uint8_t port) {
     if (ImGui::Button(StringHelper::Sprintf("%s###addGyroMapping%d", ICON_FA_PLUS, port).c_str(),
                       ImVec2(SCALE_IMGUI_SIZE(20.0f), SCALE_IMGUI_SIZE(20.0f)))) {
         ImGui::OpenPopup(popupId.c_str());
+        mCurrentMappingPopupId = ImGui::GetID(popupId.c_str());
     }
     ImGui::PopStyleVar();
 

diff --git a/src/window/gui/InputEditorWindow.h b/src/window/gui/InputEditorWindow.h
@@ -2,6 +2,7 @@
 
 #include "stdint.h"
 #include "window/gui/GuiWindow.h"
+#include "window/gui/BaseInputEditor.h"
 #ifndef IMGUI_DEFINE_MATH_OPERATORS
 #define IMGUI_DEFINE_MATH_OPERATORS
 #endif
@@ -14,14 +15,15 @@
 
 namespace Ship {
 
-class InputEditorWindow : public GuiWindow {
+class InputEditorWindow : public GuiWindow, public BaseInputEditor {
   public:
     using GuiWindow::GuiWindow;
     ~InputEditorWindow();
 
     void DrawInputChip(const char* buttonName, ImVec4 color);
     void DrawAnalogPreview(const char* label, ImVec2 stick, float deadzone = 0, bool gyro = false);
     bool TestingRumble();
+    bool IsMouseMappingBlocked() override;
 
   protected:
     void InitElement() override;
@@ -76,6 +78,7 @@ class InputEditorWindow : public GuiWindow {
     void DrawGyroDeviceIcons(uint8_t portIndex);
     void DrawLEDDeviceIcons(uint8_t portIndex);
     bool mInputEditorPopupOpen;
+    ImGuiID mCurrentMappingPopupId;
     void DrawSetDefaultsButton(uint8_t portIndex);
     void DrawClearAllButton(uint8_t portIndex);