diff options
| -rw-r--r-- | src/Ryujinx.Input/HLE/NpadController.cs | 41 | ||||
| -rw-r--r-- | src/Ryujinx.Input/HLE/NpadManager.cs | 10 |
2 files changed, 24 insertions, 27 deletions
diff --git a/src/Ryujinx.Input/HLE/NpadController.cs b/src/Ryujinx.Input/HLE/NpadController.cs index cde20f5d..38074528 100644 --- a/src/Ryujinx.Input/HLE/NpadController.cs +++ b/src/Ryujinx.Input/HLE/NpadController.cs @@ -487,38 +487,35 @@ namespace Ryujinx.Input.HLE return value; } - public KeyboardInput? GetHLEKeyboardInput() + public static KeyboardInput GetHLEKeyboardInput(IGamepadDriver KeyboardDriver) { - if (_gamepad is IKeyboard keyboard) - { - KeyboardStateSnapshot keyboardState = keyboard.GetKeyboardStateSnapshot(); + var keyboard = KeyboardDriver.GetGamepad("0") as IKeyboard; - KeyboardInput hidKeyboard = new() - { - Modifier = 0, - Keys = new ulong[0x4], - }; + KeyboardStateSnapshot keyboardState = keyboard.GetKeyboardStateSnapshot(); - foreach (HLEKeyboardMappingEntry entry in _keyMapping) - { - ulong value = keyboardState.IsPressed(entry.TargetKey) ? 1UL : 0UL; + KeyboardInput hidKeyboard = new() + { + Modifier = 0, + Keys = new ulong[0x4], + }; - hidKeyboard.Keys[entry.Target / 0x40] |= (value << (entry.Target % 0x40)); - } + foreach (HLEKeyboardMappingEntry entry in _keyMapping) + { + ulong value = keyboardState.IsPressed(entry.TargetKey) ? 1UL : 0UL; - foreach (HLEKeyboardMappingEntry entry in _keyModifierMapping) - { - int value = keyboardState.IsPressed(entry.TargetKey) ? 1 : 0; + hidKeyboard.Keys[entry.Target / 0x40] |= (value << (entry.Target % 0x40)); + } - hidKeyboard.Modifier |= value << entry.Target; - } + foreach (HLEKeyboardMappingEntry entry in _keyModifierMapping) + { + int value = keyboardState.IsPressed(entry.TargetKey) ? 1 : 0; - return hidKeyboard; + hidKeyboard.Modifier |= value << entry.Target; } - return null; - } + return hidKeyboard; + } protected virtual void Dispose(bool disposing) { diff --git a/src/Ryujinx.Input/HLE/NpadManager.cs b/src/Ryujinx.Input/HLE/NpadManager.cs index 5ae73bda..4c7bb8b7 100644 --- a/src/Ryujinx.Input/HLE/NpadManager.cs +++ b/src/Ryujinx.Input/HLE/NpadManager.cs @@ -231,11 +231,6 @@ namespace Ryujinx.Input.HLE var altMotionState = isJoyconPair ? controller.GetHLEMotionState(true) : default; motionState = (controller.GetHLEMotionState(), altMotionState); - - if (_enableKeyboard) - { - hleKeyboardInput = controller.GetHLEKeyboardInput(); - } } else { @@ -257,6 +252,11 @@ namespace Ryujinx.Input.HLE } } + if (!_blockInputUpdates && _enableKeyboard) + { + hleKeyboardInput = NpadController.GetHLEKeyboardInput(_keyboardDriver); + } + _device.Hid.Npads.Update(hleInputStates); _device.Hid.Npads.UpdateSixAxis(hleMotionStates); |