diff options
| author | bunnei <bunneidev@gmail.com> | 2018-11-19 08:30:10 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-19 08:30:10 -0800 |
| commit | 048da7240d793245b156eb29ac52e9b5a514a64d (patch) | |
| tree | 30662cee6d3b3ce2a93c40530939902b6f3900db /src/core/hle/service/hid/controllers/mouse.h | |
| parent | f02b125ac8903db5d2dad351a9c68b2a062c4467 (diff) | |
| parent | aef0d88165d08732120de11364701a5f5d0f9a7f (diff) | |
Merge pull request #1634 from DarkLordZach/better-hid-2
hid: Add support for multiplayer and multilayout controllers
Diffstat (limited to 'src/core/hle/service/hid/controllers/mouse.h')
| -rw-r--r-- | src/core/hle/service/hid/controllers/mouse.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/core/hle/service/hid/controllers/mouse.h b/src/core/hle/service/hid/controllers/mouse.h index 543b0b71f..70b654d07 100644 --- a/src/core/hle/service/hid/controllers/mouse.h +++ b/src/core/hle/service/hid/controllers/mouse.h @@ -7,7 +7,9 @@ #include <array> #include "common/common_types.h" #include "common/swap.h" +#include "core/frontend/input.h" #include "core/hle/service/hid/controllers/controller_base.h" +#include "core/settings.h" namespace Service::HID { class Controller_Mouse final : public ControllerBase { @@ -35,7 +37,8 @@ private: s32_le y; s32_le delta_x; s32_le delta_y; - s32_le mouse_wheel; + s32_le mouse_wheel_x; + s32_le mouse_wheel_y; s32_le button; s32_le attribute; }; @@ -46,5 +49,9 @@ private: std::array<MouseState, 17> mouse_states; }; SharedMemory shared_memory{}; + + std::unique_ptr<Input::MouseDevice> mouse_device; + std::array<std::unique_ptr<Input::ButtonDevice>, Settings::NativeMouseButton::NumMouseButtons> + mouse_button_devices; }; } // namespace Service::HID |