diff options
author | Narr the Reg <juangerman-13@hotmail.com> | 2022-12-20 18:34:33 +0100 |
---|---|---|
committer | Narr the Reg <juangerman-13@hotmail.com> | 2023-01-20 01:05:20 +0100 |
commit | d80e6c399bf8196646cca5ac1265d122638bb96b (patch) | |
tree | 328254642e4edcd5e0aadfe9190f3f133d34708e /src/common/input.h | |
parent | Merge pull request #9556 from vonchenplus/draw_texture (diff) | |
download | yuzu-d80e6c399bf8196646cca5ac1265d122638bb96b.tar yuzu-d80e6c399bf8196646cca5ac1265d122638bb96b.tar.gz yuzu-d80e6c399bf8196646cca5ac1265d122638bb96b.tar.bz2 yuzu-d80e6c399bf8196646cca5ac1265d122638bb96b.tar.lz yuzu-d80e6c399bf8196646cca5ac1265d122638bb96b.tar.xz yuzu-d80e6c399bf8196646cca5ac1265d122638bb96b.tar.zst yuzu-d80e6c399bf8196646cca5ac1265d122638bb96b.zip |
Diffstat (limited to '')
-rw-r--r-- | src/common/input.h | 26 |
1 files changed, 23 insertions, 3 deletions
diff --git a/src/common/input.h b/src/common/input.h index d27b1d772..1e5ba038d 100644 --- a/src/common/input.h +++ b/src/common/input.h @@ -51,6 +51,8 @@ enum class PollingMode { NFC, // Enable infrared camera polling IR, + // Enable ring controller polling + Ring, }; enum class CameraFormat { @@ -67,6 +69,7 @@ enum class VibrationError { None, NotSupported, Disabled, + InvalidHandle, Unknown, }; @@ -74,6 +77,7 @@ enum class VibrationError { enum class PollingError { None, NotSupported, + InvalidHandle, Unknown, }; @@ -190,6 +194,8 @@ struct TouchStatus { struct BodyColorStatus { u32 body{}; u32 buttons{}; + u32 left_grip{}; + u32 right_grip{}; }; // HD rumble data @@ -228,17 +234,31 @@ enum class ButtonNames { Engine, // This will display the button by value instead of the button name Value, + + // Joycon button names ButtonLeft, ButtonRight, ButtonDown, ButtonUp, - TriggerZ, - TriggerR, - TriggerL, ButtonA, ButtonB, ButtonX, ButtonY, + ButtonPlus, + ButtonMinus, + ButtonHome, + ButtonCapture, + ButtonStickL, + ButtonStickR, + TriggerL, + TriggerZL, + TriggerSL, + TriggerR, + TriggerZR, + TriggerSR, + + // GC button names + TriggerZ, ButtonStart, // DS4 button names |