From 65389700878640fa0e90419b9cf34f48e4186fca Mon Sep 17 00:00:00 2001 From: alaricljs Date: Sat, 12 Apr 2025 10:43:13 -0400 Subject: binds: add drag_threshold for click/drag isolation (#9839) --------- Co-authored-by: Leeman --- src/managers/KeybindManager.cpp | 16 +++++++++++++++- src/managers/KeybindManager.hpp | 3 +++ src/managers/input/InputManager.hpp | 5 +++-- 3 files changed, 21 insertions(+), 3 deletions(-) (limited to 'src/managers') diff --git a/src/managers/KeybindManager.cpp b/src/managers/KeybindManager.cpp index 948ef11e..2644cf53 100644 --- a/src/managers/KeybindManager.cpp +++ b/src/managers/KeybindManager.cpp @@ -460,6 +460,7 @@ bool CKeybindManager::onKeyEvent(std::any event, SP pKeyboard) { .modmaskAtPressTime = MODS, .sent = true, .submapAtPress = m_szCurrentSelectedSubmap, + .mousePosAtPress = g_pInputManager->getMouseCoordsInternal(), }; m_vActiveKeybinds.clear(); @@ -551,6 +552,7 @@ bool CKeybindManager::onMouseEvent(const IPointer::SButtonEvent& e) { const auto KEY = SPressedKeyWithMods{ .keyName = KEY_NAME, .modmaskAtPressTime = MODS, + .mousePosAtPress = g_pInputManager->getMouseCoordsInternal(), }; m_vActiveKeybinds.clear(); @@ -638,7 +640,9 @@ std::string CKeybindManager::getCurrentSubmap() { SDispatchResult CKeybindManager::handleKeybinds(const uint32_t modmask, const SPressedKeyWithMods& key, bool pressed) { static auto PDISABLEINHIBIT = CConfigValue("binds:disable_keybind_grabbing"); - bool found = false; + static auto PDRAGTHRESHOLD = CConfigValue("binds:drag_threshold"); + + bool found = false; SDispatchResult res; if (pressed) { @@ -736,6 +740,14 @@ SDispatchResult CKeybindManager::handleKeybinds(const uint32_t modmask, const SP found = true; // suppress the event continue; } + + // Require mouse to stay inside drag_threshold for clicks, outside for drags + // Check if either a mouse bind has triggered or currently over the threshold (maybe there is no mouse bind on the same key) + const auto THRESHOLDREACHED = key.mousePosAtPress.distanceSq(g_pInputManager->getMouseCoordsInternal()) > std::pow(*PDRAGTHRESHOLD, 2); + if (k->click && (g_pInputManager->m_bDragThresholdReached || THRESHOLDREACHED)) + continue; + else if (k->drag && !g_pInputManager->m_bDragThresholdReached && !THRESHOLDREACHED) + continue; } if (k->longPress) { @@ -788,6 +800,8 @@ SDispatchResult CKeybindManager::handleKeybinds(const uint32_t modmask, const SP found = true; } + g_pInputManager->m_bDragThresholdReached = false; + // if keybind wasn't found (or dispatcher said to) then pass event res.passEvent |= !found; diff --git a/src/managers/KeybindManager.hpp b/src/managers/KeybindManager.hpp index 8b13bac2..0040d761 100644 --- a/src/managers/KeybindManager.hpp +++ b/src/managers/KeybindManager.hpp @@ -39,6 +39,8 @@ struct SKeybind { bool multiKey = false; bool hasDescription = false; bool dontInhibit = false; + bool click = false; + bool drag = false; // DO NOT INITIALIZE bool shadowed = false; @@ -62,6 +64,7 @@ struct SPressedKeyWithMods { uint32_t modmaskAtPressTime = 0; bool sent = false; std::string submapAtPress = ""; + Vector2D mousePosAtPress = {}; }; struct SParsedKey { diff --git a/src/managers/input/InputManager.hpp b/src/managers/input/InputManager.hpp index fa06454f..406e1845 100644 --- a/src/managers/input/InputManager.hpp +++ b/src/managers/input/InputManager.hpp @@ -147,8 +147,9 @@ class CInputManager { // for dragging floating windows PHLWINDOWREF currentlyDraggedWindow; - eMouseBindMode dragMode = MBIND_INVALID; - bool m_bWasDraggingWindow = false; + eMouseBindMode dragMode = MBIND_INVALID; + bool m_bWasDraggingWindow = false; + bool m_bDragThresholdReached = false; // for refocus to be forced PHLWINDOWREF m_pForcedFocus; -- cgit v1.2.3