JJBanana13/ryujinx
1
0
Fork 0
mirror of https://git.ryujinx.app/ryubing/ryujinx.git synced 2026-06-05 20:09:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix macOS Caps Lock rebinding by buffering one-shot key-down events during keyboard assignment

Browse Source
This commit is contained in:
Babib3l
2026-03-24 22:45:37 +01:00
parent c1845aac4d
commit d3f6460fdf
4 changed files with 104 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/Ryujinx.Input/Assigner/KeyboardKeyAssigner.cs
View File

@@ -8,22 +8,28 @@ namespace Ryujinx.Input.Assigner
private readonly IKeyboard _keyboard;
private KeyboardStateSnapshot _keyboardState;
private Button? _pressedButton;
public KeyboardKeyAssigner(IKeyboard keyboard)
{
_keyboard = keyboard;
}
public void Initialize() { }
public void Initialize()
{
_pressedButton = null;
}
public void ReadInput()
{
_keyboardState = _keyboard.GetKeyboardStateSnapshot();
_pressedButton ??= GetPressedButtonFromState() ?? GetPressedButtonFromBufferedPress();
}
public bool IsAnyButtonPressed()
{
return GetPressedButton() is not null;
return _pressedButton is not null;
}
public bool ShouldCancel()
@@ -32,26 +38,33 @@ namespace Ryujinx.Input.Assigner
}
public Button? GetPressedButton()
{
return !ShouldCancel() ? _pressedButton : null;
}
private Button? GetPressedButtonFromState()
{
Key aliasedKey = GetAliasedPressedKey();
if (aliasedKey != Key.Unknown)
{
return !ShouldCancel() ? new Button(aliasedKey) : null;
return new Button(aliasedKey);
}
Button? keyPressed = null;
for (Key key = Key.Unknown; key < Key.Count; key++)
{
if (_keyboardState.IsPressed(key))
{
keyPressed = new(key);
break;
return new Button(key);
}
}
return !ShouldCancel() ? keyPressed : null;
return null;
}
private Button? GetPressedButtonFromBufferedPress()
{
return _keyboard.TryConsumePressedKey(out Key key) ? new Button(key) : null;
}
private Key GetAliasedPressedKey()