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

Simplify keyboard input cleanup paths

Browse Source
This commit is contained in:
Babib3l
2026-03-22 00:40:45 +01:00
parent e4b920002f
commit d1464eb5f2
7 changed files with 167 additions and 196 deletions
Download Patch File Download Diff File Expand all files Collapse all files

94
src/Ryujinx/UI/Helpers/Converters/KeyValueConverter.cs
View File

@@ -5,6 +5,7 @@ using Ryujinx.Common.Configuration.Hid.Controller;
using System;
using System.Collections.Generic;
using System.Globalization;
using Key = Ryujinx.Input.Key;
namespace Ryujinx.Ava.UI.Helpers
{
@@ -12,79 +13,6 @@ namespace Ryujinx.Ava.UI.Helpers
{
public static readonly KeyValueConverter Instance = new();
private static readonly Dictionary<Key, LocaleKeys> _keysMap = new()
{
{ Key.Unknown, LocaleKeys.KeyboardLayout_KeyUnknown },
{ Key.ShiftLeft, LocaleKeys.KeyboardLayout_KeyShiftLeft },
{ Key.ShiftRight, LocaleKeys.KeyboardLayout_KeyShiftRight },
{ Key.ControlLeft, LocaleKeys.KeyboardLayout_KeyControlLeft },
{ Key.ControlRight, LocaleKeys.KeyboardLayout_KeyControlRight },
{ Key.AltLeft, LocaleKeys.KeyboardLayout_KeyAltLeft },
{ Key.AltRight, LocaleKeys.KeyboardLayout_KeyAltRight },
{ Key.WinLeft, LocaleKeys.KeyboardLayout_KeyWinLeft },
{ Key.WinRight, LocaleKeys.KeyboardLayout_KeyWinRight },
{ Key.Up, LocaleKeys.KeyboardLayout_KeyUp },
{ Key.Down, LocaleKeys.KeyboardLayout_KeyDown },
{ Key.Left, LocaleKeys.KeyboardLayout_KeyLeft },
{ Key.Right, LocaleKeys.KeyboardLayout_KeyRight },
{ Key.Enter, LocaleKeys.KeyboardLayout_KeyEnter },
{ Key.Escape, LocaleKeys.KeyboardLayout_KeyEscape },
{ Key.Space, LocaleKeys.KeyboardLayout_KeySpace },
{ Key.Tab, LocaleKeys.KeyboardLayout_KeyTab },
{ Key.BackSpace, LocaleKeys.KeyboardLayout_KeyBackSpace },
{ Key.Insert, LocaleKeys.KeyboardLayout_KeyInsert },
{ Key.Delete, LocaleKeys.KeyboardLayout_KeyDelete },
{ Key.PageUp, LocaleKeys.KeyboardLayout_KeyPageUp },
{ Key.PageDown, LocaleKeys.KeyboardLayout_KeyPageDown },
{ Key.Home, LocaleKeys.KeyboardLayout_KeyHome },
{ Key.End, LocaleKeys.KeyboardLayout_KeyEnd },
{ Key.CapsLock, LocaleKeys.KeyboardLayout_KeyCapsLock },
{ Key.ScrollLock, LocaleKeys.KeyboardLayout_KeyScrollLock },
{ Key.PrintScreen, LocaleKeys.KeyboardLayout_KeyPrintScreen },
{ Key.Pause, LocaleKeys.KeyboardLayout_KeyPause },
{ Key.NumLock, LocaleKeys.KeyboardLayout_KeyNumLock },
{ Key.Clear, LocaleKeys.KeyboardLayout_KeyClear },
{ Key.Keypad0, LocaleKeys.KeyboardLayout_KeyKeypad0 },
{ Key.Keypad1, LocaleKeys.KeyboardLayout_KeyKeypad1 },
{ Key.Keypad2, LocaleKeys.KeyboardLayout_KeyKeypad2 },
{ Key.Keypad3, LocaleKeys.KeyboardLayout_KeyKeypad3 },
{ Key.Keypad4, LocaleKeys.KeyboardLayout_KeyKeypad4 },
{ Key.Keypad5, LocaleKeys.KeyboardLayout_KeyKeypad5 },
{ Key.Keypad6, LocaleKeys.KeyboardLayout_KeyKeypad6 },
{ Key.Keypad7, LocaleKeys.KeyboardLayout_KeyKeypad7 },
{ Key.Keypad8, LocaleKeys.KeyboardLayout_KeyKeypad8 },
{ Key.Keypad9, LocaleKeys.KeyboardLayout_KeyKeypad9 },
{ Key.KeypadDivide, LocaleKeys.KeyboardLayout_KeyKeypadDivide },
{ Key.KeypadMultiply, LocaleKeys.KeyboardLayout_KeyKeypadMultiply },
{ Key.KeypadSubtract, LocaleKeys.KeyboardLayout_KeyKeypadSubtract },
{ Key.KeypadAdd, LocaleKeys.KeyboardLayout_KeyKeypadAdd },
{ Key.KeypadDecimal, LocaleKeys.KeyboardLayout_KeyKeypadDecimal },
{ Key.KeypadEnter, LocaleKeys.KeyboardLayout_KeyKeypadEnter },
{ Key.Number0, LocaleKeys.KeyboardLayout_KeyNumber0 },
{ Key.Number1, LocaleKeys.KeyboardLayout_KeyNumber1 },
{ Key.Number2, LocaleKeys.KeyboardLayout_KeyNumber2 },
{ Key.Number3, LocaleKeys.KeyboardLayout_KeyNumber3 },
{ Key.Number4, LocaleKeys.KeyboardLayout_KeyNumber4 },
{ Key.Number5, LocaleKeys.KeyboardLayout_KeyNumber5 },
{ Key.Number6, LocaleKeys.KeyboardLayout_KeyNumber6 },
{ Key.Number7, LocaleKeys.KeyboardLayout_KeyNumber7 },
{ Key.Number8, LocaleKeys.KeyboardLayout_KeyNumber8 },
{ Key.Number9, LocaleKeys.KeyboardLayout_KeyNumber9 },
{ Key.Tilde, LocaleKeys.KeyboardLayout_KeyTilde },
{ Key.Grave, LocaleKeys.KeyboardLayout_KeyGrave },
{ Key.Minus, LocaleKeys.KeyboardLayout_KeyMinus },
{ Key.Plus, LocaleKeys.KeyboardLayout_KeyPlus },
{ Key.BracketLeft, LocaleKeys.KeyboardLayout_KeyBracketLeft },
{ Key.BracketRight, LocaleKeys.KeyboardLayout_KeyBracketRight },
{ Key.Semicolon, LocaleKeys.KeyboardLayout_KeySemicolon },
{ Key.Quote, LocaleKeys.KeyboardLayout_KeyQuote },
{ Key.Comma, LocaleKeys.KeyboardLayout_KeyComma },
{ Key.Period, LocaleKeys.KeyboardLayout_KeyPeriod },
{ Key.Slash, LocaleKeys.KeyboardLayout_KeySlash },
{ Key.BackSlash, LocaleKeys.KeyboardLayout_KeyBackSlash },
{ Key.Unbound, LocaleKeys.KeyboardLayout_KeyUnbound },
};
private static readonly Dictionary<GamepadInputId, LocaleKeys> _gamepadInputIdMap = new()
{
{ GamepadInputId.LeftStick, LocaleKeys.GamepadLeftStick },
@@ -123,28 +51,13 @@ namespace Ryujinx.Ava.UI.Helpers
public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
{
string keyString = string.Empty;
LocaleKeys localeKey;
switch (value)
{
case Key key:
if (_keysMap.TryGetValue(key, out localeKey))
if (KeyboardLayoutLocaleHelper.TryGetSemanticLabel(key, out string localizedKeyLabel))
{
if (OperatingSystem.IsMacOS())
{
localeKey = localeKey switch
{
LocaleKeys.KeyboardLayout_KeyControlLeft => LocaleKeys.KeyboardLayout_KeyMacControlLeft,
LocaleKeys.KeyboardLayout_KeyControlRight => LocaleKeys.KeyboardLayout_KeyMacControlRight,
LocaleKeys.KeyboardLayout_KeyAltLeft => LocaleKeys.KeyboardLayout_KeyMacAltLeft,
LocaleKeys.KeyboardLayout_KeyAltRight => LocaleKeys.KeyboardLayout_KeyMacAltRight,
LocaleKeys.KeyboardLayout_KeyWinLeft => LocaleKeys.KeyboardLayout_KeyMacWinLeft,
LocaleKeys.KeyboardLayout_KeyWinRight => LocaleKeys.KeyboardLayout_KeyMacWinRight,
_ => localeKey
};
}
keyString = LocaleManager.Instance[localeKey];
keyString = localizedKeyLabel;
}
else
{
@@ -156,6 +69,7 @@ namespace Ryujinx.Ava.UI.Helpers
keyString = PhysicalKeyLabelHelper.GetDisplayString(physicalKey);
break;
case GamepadInputId gamepadInputId:
LocaleKeys localeKey;
if (_gamepadInputIdMap.TryGetValue(gamepadInputId, out localeKey))
{
keyString = LocaleManager.Instance[localeKey];