diff --git a/data/locale/en-US.ini b/data/locale/en-US.ini index 672f44d3..a8e25aad 100644 --- a/data/locale/en-US.ini +++ b/data/locale/en-US.ini @@ -390,6 +390,7 @@ AdvSceneSwitcher.condition.cursor="Cursor" AdvSceneSwitcher.condition.cursor.type.region="is in region" AdvSceneSwitcher.condition.cursor.type.moving="is moving" AdvSceneSwitcher.condition.cursor.type.click="clicked" +AdvSceneSwitcher.condition.cursor.type.held="button is held down" AdvSceneSwitcher.condition.cursor.button.left="Left mouse button" AdvSceneSwitcher.condition.cursor.button.middle="Middle mouse button" AdvSceneSwitcher.condition.cursor.button.right="Right mouse button" diff --git a/plugins/base/macro-condition-cursor.cpp b/plugins/base/macro-condition-cursor.cpp index fe02a76d..cc3b8220 100644 --- a/plugins/base/macro-condition-cursor.cpp +++ b/plugins/base/macro-condition-cursor.cpp @@ -25,6 +25,8 @@ const static std::map #ifdef _WIN32 // Not implemented for MacOS and Linux {MacroConditionCursor::Condition::CLICK, "AdvSceneSwitcher.condition.cursor.type.click"}, + {MacroConditionCursor::Condition::HELD, + "AdvSceneSwitcher.condition.cursor.type.held"}, #endif }; @@ -50,6 +52,19 @@ bool MacroConditionCursor::CheckClick() return false; } +bool MacroConditionCursor::CheckHeld() +{ + switch (_button) { + case MacroConditionCursor::Button::LEFT: + return IsMouseLeftButtonDown() || CheckClick(); + case MacroConditionCursor::Button::MIDDLE: + return IsMouseMiddleButtonDown() || CheckClick(); + case MacroConditionCursor::Button::RIGHT: + return IsMouseRightButtonDown() || CheckClick(); + } + return false; +} + bool MacroConditionCursor::CheckCondition() { bool ret = false; @@ -68,6 +83,9 @@ bool MacroConditionCursor::CheckCondition() case Condition::CLICK: ret = CheckClick(); break; + case Condition::HELD: + ret = CheckHeld(); + break; } _lastCheckTime = std::chrono::high_resolution_clock::now(); @@ -351,7 +369,9 @@ void MacroConditionCursorEdit::SetWidgetVisibility() } _buttons->setVisible(_entryData->_condition == - MacroConditionCursor::Condition::CLICK); + MacroConditionCursor::Condition::CLICK || + _entryData->_condition == + MacroConditionCursor::Condition::HELD); adjustSize(); } diff --git a/plugins/base/macro-condition-cursor.hpp b/plugins/base/macro-condition-cursor.hpp index 3cff3894..26afc95e 100644 --- a/plugins/base/macro-condition-cursor.hpp +++ b/plugins/base/macro-condition-cursor.hpp @@ -25,6 +25,7 @@ public: REGION, MOVING, CLICK, + HELD, }; enum class Button { @@ -41,6 +42,7 @@ private: void SetupTempVars(); bool CheckClick(); + bool CheckHeld(); std::chrono::high_resolution_clock::time_point _lastCheckTime{}; int _lastX = 0; int _lastY = 0; diff --git a/plugins/base/utils/cursor-helpers.cpp b/plugins/base/utils/cursor-helpers.cpp index 2e70bdef..6417c528 100644 --- a/plugins/base/utils/cursor-helpers.cpp +++ b/plugins/base/utils/cursor-helpers.cpp @@ -17,6 +17,18 @@ std::chrono::high_resolution_clock::time_point GetLastMouseRightClickTime() { return {}; } +bool IsMouseLeftButtonDown() +{ + return false; +} +bool IsMouseMiddleButtonDown() +{ + return false; +} +bool IsMouseRightButtonDown() +{ + return false; +} #endif } // namespace advss diff --git a/plugins/base/utils/cursor-helpers.hpp b/plugins/base/utils/cursor-helpers.hpp index f718aba1..8cd0aa26 100644 --- a/plugins/base/utils/cursor-helpers.hpp +++ b/plugins/base/utils/cursor-helpers.hpp @@ -6,5 +6,8 @@ namespace advss { std::chrono::high_resolution_clock::time_point GetLastMouseLeftClickTime(); std::chrono::high_resolution_clock::time_point GetLastMouseMiddleClickTime(); std::chrono::high_resolution_clock::time_point GetLastMouseRightClickTime(); +bool IsMouseLeftButtonDown(); +bool IsMouseMiddleButtonDown(); +bool IsMouseRightButtonDown(); } // namespace advss diff --git a/plugins/base/utils/windows/windows.cpp b/plugins/base/utils/windows/windows.cpp index b7699413..bdffec90 100644 --- a/plugins/base/utils/windows/windows.cpp +++ b/plugins/base/utils/windows/windows.cpp @@ -278,6 +278,21 @@ std::chrono::high_resolution_clock::time_point GetLastMouseRightClickTime() return lastMouseRightClickTime; } +bool IsMouseLeftButtonDown() +{ + return GetAsyncKeyState(VK_LBUTTON) & 0x8000; +} + +bool IsMouseMiddleButtonDown() +{ + return GetAsyncKeyState(VK_MBUTTON) & 0x8000; +} + +bool IsMouseRightButtonDown() +{ + return GetAsyncKeyState(VK_RBUTTON) & 0x8000; +} + static void handleRawMouseInput(LPARAM lParam) { UINT dwSize;