diff options
| author | 2021-11-14 14:09:29 -0600 | |
|---|---|---|
| committer | 2021-11-24 20:30:28 -0600 | |
| commit | 654d76e79e84a3384fa503fac9003a5d0a32f28b (patch) | |
| tree | 7a0d436a55aa73401d7b77bae4870c10ceca16cd /src/common/settings_input.h | |
| parent | input_common: Allow keyboard to be backwards compatible (diff) | |
| download | yuzu-654d76e79e84a3384fa503fac9003a5d0a32f28b.tar.gz yuzu-654d76e79e84a3384fa503fac9003a5d0a32f28b.tar.xz yuzu-654d76e79e84a3384fa503fac9003a5d0a32f28b.zip | |
core/hid: Fully implement native mouse
Diffstat (limited to 'src/common/settings_input.h')
| -rw-r--r-- | src/common/settings_input.h | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/src/common/settings_input.h b/src/common/settings_input.h index a2982fca4..9a8804488 100644 --- a/src/common/settings_input.h +++ b/src/common/settings_input.h | |||
| @@ -126,6 +126,17 @@ constexpr int NUM_MOUSE_HID = NumMouseButtons; | |||
| 126 | extern const std::array<const char*, NumMouseButtons> mapping; | 126 | extern const std::array<const char*, NumMouseButtons> mapping; |
| 127 | } // namespace NativeMouseButton | 127 | } // namespace NativeMouseButton |
| 128 | 128 | ||
| 129 | namespace NativeMouseWheel { | ||
| 130 | enum Values { | ||
| 131 | X, | ||
| 132 | Y, | ||
| 133 | |||
| 134 | NumMouseWheels, | ||
| 135 | }; | ||
| 136 | |||
| 137 | extern const std::array<const char*, NumMouseWheels> mapping; | ||
| 138 | } // namespace NativeMouseWheel | ||
| 139 | |||
| 129 | namespace NativeKeyboard { | 140 | namespace NativeKeyboard { |
| 130 | enum Keys { | 141 | enum Keys { |
| 131 | None, | 142 | None, |
| @@ -348,10 +359,6 @@ using ButtonsRaw = std::array<std::string, NativeButton::NumButtons>; | |||
| 348 | using MotionsRaw = std::array<std::string, NativeMotion::NumMotions>; | 359 | using MotionsRaw = std::array<std::string, NativeMotion::NumMotions>; |
| 349 | using VibrationsRaw = std::array<std::string, NativeVibration::NumVibrations>; | 360 | using VibrationsRaw = std::array<std::string, NativeVibration::NumVibrations>; |
| 350 | 361 | ||
| 351 | using MouseButtonsRaw = std::array<std::string, NativeMouseButton::NumMouseButtons>; | ||
| 352 | using KeyboardKeysRaw = std::array<std::string, NativeKeyboard::NumKeyboardKeys>; | ||
| 353 | using KeyboardModsRaw = std::array<std::string, NativeKeyboard::NumKeyboardMods>; | ||
| 354 | |||
| 355 | constexpr u32 JOYCON_BODY_NEON_RED = 0xFF3C28; | 362 | constexpr u32 JOYCON_BODY_NEON_RED = 0xFF3C28; |
| 356 | constexpr u32 JOYCON_BUTTONS_NEON_RED = 0x1E0A0A; | 363 | constexpr u32 JOYCON_BUTTONS_NEON_RED = 0x1E0A0A; |
| 357 | constexpr u32 JOYCON_BODY_NEON_BLUE = 0x0AB9E6; | 364 | constexpr u32 JOYCON_BODY_NEON_BLUE = 0x0AB9E6; |