diff options
author | bunnei <bunneidev@gmail.com> | 2021-03-08 23:50:58 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-03-08 23:50:58 +0100 |
commit | 9c4c9f1e7df65d74fed156c1788f48df6424e917 (patch) | |
tree | e04abbe4824d77458205596ad27f28816c38e597 /src/input_common/mouse/mouse_input.h | |
parent | Merge pull request #6041 from bunnei/fiber-leaks (diff) | |
parent | inputCommon: Mouse fixes (diff) | |
download | yuzu-9c4c9f1e7df65d74fed156c1788f48df6424e917.tar yuzu-9c4c9f1e7df65d74fed156c1788f48df6424e917.tar.gz yuzu-9c4c9f1e7df65d74fed156c1788f48df6424e917.tar.bz2 yuzu-9c4c9f1e7df65d74fed156c1788f48df6424e917.tar.lz yuzu-9c4c9f1e7df65d74fed156c1788f48df6424e917.tar.xz yuzu-9c4c9f1e7df65d74fed156c1788f48df6424e917.tar.zst yuzu-9c4c9f1e7df65d74fed156c1788f48df6424e917.zip |
Diffstat (limited to 'src/input_common/mouse/mouse_input.h')
-rw-r--r-- | src/input_common/mouse/mouse_input.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/input_common/mouse/mouse_input.h b/src/input_common/mouse/mouse_input.h index 46aa676c1..3622fe080 100644 --- a/src/input_common/mouse/mouse_input.h +++ b/src/input_common/mouse/mouse_input.h @@ -18,10 +18,12 @@ namespace MouseInput { enum class MouseButton { Left, - Wheel, Right, - Forward, + Wheel, Backward, + Forward, + Task, + Extra, Undefined, }; @@ -51,7 +53,7 @@ public: * @param y the y-coordinate of the cursor * @param button_ the button pressed */ - void PressButton(int x, int y, int button_); + void PressButton(int x, int y, MouseButton button_); /** * Signals that mouse has moved. @@ -65,7 +67,7 @@ public: /** * Signals that a motion sensor tilt has ended. */ - void ReleaseButton(int button_); + void ReleaseButton(MouseButton button_); [[nodiscard]] Common::SPSCQueue<MouseStatus>& GetMouseQueue(); [[nodiscard]] const Common::SPSCQueue<MouseStatus>& GetMouseQueue() const; @@ -94,7 +96,7 @@ private: u16 buttons{}; std::thread update_thread; MouseButton last_button{MouseButton::Undefined}; - std::array<MouseInfo, 5> mouse_info; + std::array<MouseInfo, 7> mouse_info; Common::SPSCQueue<MouseStatus> mouse_queue; bool configuring{false}; bool update_thread_running{true}; |