misc: chore: Use collection expressions in Input projects

This commit is contained in:
Evan Husted 2025-01-26 15:43:58 -06:00
parent 9f3eac7f26
commit 45125c16cf
6 changed files with 31 additions and 28 deletions

View file

@ -23,8 +23,8 @@ namespace Ryujinx.Input.SDL2
private StandardControllerInputConfig _configuration;
private static readonly SDL_GameControllerButton[] _buttonsDriverMapping = new SDL_GameControllerButton[(int)GamepadButtonInputId.Count]
{
private static readonly SDL_GameControllerButton[] _buttonsDriverMapping =
[
// Unbound, ignored.
SDL_GameControllerButton.SDL_CONTROLLER_BUTTON_INVALID,
@ -59,19 +59,19 @@ namespace Ryujinx.Input.SDL2
SDL_GameControllerButton.SDL_CONTROLLER_BUTTON_INVALID,
SDL_GameControllerButton.SDL_CONTROLLER_BUTTON_INVALID,
SDL_GameControllerButton.SDL_CONTROLLER_BUTTON_INVALID,
SDL_GameControllerButton.SDL_CONTROLLER_BUTTON_INVALID,
};
SDL_GameControllerButton.SDL_CONTROLLER_BUTTON_INVALID
];
private readonly Lock _userMappingLock = new();
private readonly List<ButtonMappingEntry> _buttonsUserMapping;
private readonly StickInputId[] _stickUserMapping = new StickInputId[(int)StickInputId.Count]
{
private readonly StickInputId[] _stickUserMapping =
[
StickInputId.Unbound,
StickInputId.Left,
StickInputId.Right,
};
StickInputId.Right
];
public GamepadFeaturesFlag Features { get; }

View file

@ -31,7 +31,7 @@ namespace Ryujinx.Input.SDL2
public SDL2GamepadDriver()
{
_gamepadsInstanceIdsMapping = new Dictionary<int, string>();
_gamepadsIds = new List<string>();
_gamepadsIds = [];
SDL2Driver.Instance.Initialize();
SDL2Driver.Instance.OnJoyStickConnected += HandleJoyStickConnected;

View file

@ -27,8 +27,8 @@ namespace Ryujinx.Input.SDL2
private StandardKeyboardInputConfig _configuration;
private readonly List<ButtonMappingEntry> _buttonsUserMapping;
private static readonly SDL_Keycode[] _keysDriverMapping = new SDL_Keycode[(int)Key.Count]
{
private static readonly SDL_Keycode[] _keysDriverMapping =
[
// INVALID
SDL_Keycode.SDLK_0,
// Presented as modifiers, so invalid here.
@ -166,15 +166,15 @@ namespace Ryujinx.Input.SDL2
SDL_Keycode.SDLK_BACKSLASH,
// Invalids
SDL_Keycode.SDLK_0,
};
SDL_Keycode.SDLK_0
];
public SDL2Keyboard(SDL2KeyboardDriver driver, string id, string name)
{
_driver = driver;
Id = id;
Name = name;
_buttonsUserMapping = new List<ButtonMappingEntry>();
_buttonsUserMapping = [];
}
private bool HasConfiguration => _configuration != null;

View file

@ -13,7 +13,7 @@ namespace Ryujinx.Input.SDL2
public string DriverName => "SDL2";
private static readonly string[] _keyboardIdentifers = new string[1] { "0" };
private static readonly string[] _keyboardIdentifers = ["0"];
public ReadOnlySpan<string> GamepadsIds => _keyboardIdentifers;