diff options
| author | Ac_K <Acoustik666@gmail.com> | 2021-06-23 22:52:55 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-23 22:52:55 +0200 |
| commit | eb2393333185a2a3e71fadb0d1339d49ea68902f (patch) | |
| tree | 5909949859166e76336cde2ee49529d7e0e59524 /Ryujinx.HLE/HOS/Services/Hid/HidDevices | |
| parent | 9efe124fc58db84b27b155cf8fa986a51f30a093 (diff) | |
hid: Cleanup and implement some calls (#2380)
Diffstat (limited to 'Ryujinx.HLE/HOS/Services/Hid/HidDevices')
| -rw-r--r-- | Ryujinx.HLE/HOS/Services/Hid/HidDevices/NpadDevices.cs | 64 |
1 files changed, 35 insertions, 29 deletions
diff --git a/Ryujinx.HLE/HOS/Services/Hid/HidDevices/NpadDevices.cs b/Ryujinx.HLE/HOS/Services/Hid/HidDevices/NpadDevices.cs index 3ff7e733..a063b41f 100644 --- a/Ryujinx.HLE/HOS/Services/Hid/HidDevices/NpadDevices.cs +++ b/Ryujinx.HLE/HOS/Services/Hid/HidDevices/NpadDevices.cs @@ -239,45 +239,51 @@ namespace Ryujinx.HLE.HOS.Services.Hid switch (type) { case ControllerType.ProController: - controller.StyleSet = NpadStyleTag.FullKey; - controller.DeviceType = DeviceType.FullKey; - controller.SystemProperties |= NpadSystemProperties.IsAbxyButtonOriented | - NpadSystemProperties.IsPlusAvailable | - NpadSystemProperties.IsMinusAvailable; + controller.StyleSet = NpadStyleTag.FullKey; + controller.DeviceType = DeviceType.FullKey; + controller.SystemProperties |= NpadSystemProperties.IsAbxyButtonOriented | + NpadSystemProperties.IsPlusAvailable | + NpadSystemProperties.IsMinusAvailable; + controller.AppletFooterUiType = AppletFooterUiType.SwitchProController; break; case ControllerType.Handheld: - controller.StyleSet = NpadStyleTag.Handheld; - controller.DeviceType = DeviceType.HandheldLeft | - DeviceType.HandheldRight; - controller.SystemProperties |= NpadSystemProperties.IsAbxyButtonOriented | - NpadSystemProperties.IsPlusAvailable | - NpadSystemProperties.IsMinusAvailable; + controller.StyleSet = NpadStyleTag.Handheld; + controller.DeviceType = DeviceType.HandheldLeft | + DeviceType.HandheldRight; + controller.SystemProperties |= NpadSystemProperties.IsAbxyButtonOriented | + NpadSystemProperties.IsPlusAvailable | + NpadSystemProperties.IsMinusAvailable; + controller.AppletFooterUiType = AppletFooterUiType.HandheldJoyConLeftJoyConRight; break; case ControllerType.JoyconPair: - controller.StyleSet = NpadStyleTag.JoyDual; - controller.DeviceType = DeviceType.JoyLeft | - DeviceType.JoyRight; - controller.SystemProperties |= NpadSystemProperties.IsAbxyButtonOriented | - NpadSystemProperties.IsPlusAvailable | - NpadSystemProperties.IsMinusAvailable; + controller.StyleSet = NpadStyleTag.JoyDual; + controller.DeviceType = DeviceType.JoyLeft | + DeviceType.JoyRight; + controller.SystemProperties |= NpadSystemProperties.IsAbxyButtonOriented | + NpadSystemProperties.IsPlusAvailable | + NpadSystemProperties.IsMinusAvailable; + controller.AppletFooterUiType = _device.System.State.DockedMode ? AppletFooterUiType.JoyDual : AppletFooterUiType.HandheldJoyConLeftJoyConRight; break; case ControllerType.JoyconLeft: - controller.StyleSet = NpadStyleTag.JoyLeft; - controller.JoyAssignmentMode = NpadJoyAssignmentMode.Single; - controller.DeviceType = DeviceType.JoyLeft; - controller.SystemProperties |= NpadSystemProperties.IsSlSrButtonOriented | - NpadSystemProperties.IsMinusAvailable; + controller.StyleSet = NpadStyleTag.JoyLeft; + controller.JoyAssignmentMode = NpadJoyAssignmentMode.Single; + controller.DeviceType = DeviceType.JoyLeft; + controller.SystemProperties |= NpadSystemProperties.IsSlSrButtonOriented | + NpadSystemProperties.IsMinusAvailable; + controller.AppletFooterUiType = _device.System.State.DockedMode ? AppletFooterUiType.JoyDualLeftOnly : AppletFooterUiType.HandheldJoyConLeftOnly; break; case ControllerType.JoyconRight: - controller.StyleSet = NpadStyleTag.JoyRight; - controller.JoyAssignmentMode = NpadJoyAssignmentMode.Single; - controller.DeviceType = DeviceType.JoyRight; - controller.SystemProperties |= NpadSystemProperties.IsSlSrButtonOriented | - NpadSystemProperties.IsPlusAvailable; + controller.StyleSet = NpadStyleTag.JoyRight; + controller.JoyAssignmentMode = NpadJoyAssignmentMode.Single; + controller.DeviceType = DeviceType.JoyRight; + controller.SystemProperties |= NpadSystemProperties.IsSlSrButtonOriented | + NpadSystemProperties.IsPlusAvailable; + controller.AppletFooterUiType = _device.System.State.DockedMode ? AppletFooterUiType.JoyDualRightOnly : AppletFooterUiType.HandheldJoyConRightOnly; break; case ControllerType.Pokeball: - controller.StyleSet = NpadStyleTag.Palma; - controller.DeviceType = DeviceType.Palma; + controller.StyleSet = NpadStyleTag.Palma; + controller.DeviceType = DeviceType.Palma; + controller.AppletFooterUiType = AppletFooterUiType.None; break; } |