From fec197d9ec9431cc790da803e497977fe7202715 Mon Sep 17 00:00:00 2001 From: madwind Date: Wed, 25 Dec 2024 10:39:07 +0800 Subject: [PATCH] log powerLevel --- src/Ryujinx.Input.SDL2/SDL2GamepadDriver.cs | 27 +++++--- src/Ryujinx.Input.SDL2/SDL2JoyConPair.cs | 76 +++++++++++---------- 2 files changed, 57 insertions(+), 46 deletions(-) diff --git a/src/Ryujinx.Input.SDL2/SDL2GamepadDriver.cs b/src/Ryujinx.Input.SDL2/SDL2GamepadDriver.cs index eefae8fb4..8c2fd82d7 100644 --- a/src/Ryujinx.Input.SDL2/SDL2GamepadDriver.cs +++ b/src/Ryujinx.Input.SDL2/SDL2GamepadDriver.cs @@ -1,7 +1,7 @@ +using Ryujinx.Common.Logging; using Ryujinx.SDL2.Common; using System; using System.Collections.Generic; -using System.Linq; using System.Threading; using static SDL2.SDL; @@ -12,7 +12,8 @@ namespace Ryujinx.Input.SDL2 private readonly Dictionary _gamepadsInstanceIdsMapping; private readonly List _gamepadsIds; private readonly Lock _lock = new(); - private readonly SDL2JoyConPair joyConPair; + private readonly SDL2JoyConPair _joyConPair; + public ReadOnlySpan GamepadsIds { get @@ -37,7 +38,7 @@ namespace Ryujinx.Input.SDL2 SDL2Driver.Instance.Initialize(); SDL2Driver.Instance.OnJoyStickConnected += HandleJoyStickConnected; SDL2Driver.Instance.OnJoystickDisconnected += HandleJoyStickDisconnected; - joyConPair = new SDL2JoyConPair(); + _joyConPair = new SDL2JoyConPair(); // Add already connected gamepads int numJoysticks = SDL_NumJoysticks(); @@ -90,9 +91,9 @@ namespace Ryujinx.Input.SDL2 lock (_lock) { _gamepadsIds.Remove(id); - if (joyConPair.GetJoyConPair(_gamepadsIds) == null) + if (_joyConPair.GetGamepad(_gamepadsIds) == null) { - _gamepadsIds.Remove(joyConPair.Id); + _gamepadsIds.Remove(_joyConPair.Id); } } @@ -125,12 +126,15 @@ namespace Ryujinx.Input.SDL2 _gamepadsIds.Insert(joystickDeviceId, id); else _gamepadsIds.Add(id); - if (joyConPair.GetJoyConPair(_gamepadsIds) != null) + var powerLevel = SDL_JoystickCurrentPowerLevel(GetJoystickIndexByGamepadId(id)); + Logger.Info?.Print(LogClass.Hid, $"Gamepad connected: {id}, power level: {powerLevel}"); + if (_joyConPair.GetGamepad(_gamepadsIds) != null) { - _gamepadsIds.Remove(joyConPair.Id); - _gamepadsIds.Add(joyConPair.Id); + _gamepadsIds.Remove(_joyConPair.Id); + _gamepadsIds.Add(_joyConPair.Id); } } + OnGamepadConnected?.Invoke(id); } } @@ -166,9 +170,12 @@ namespace Ryujinx.Input.SDL2 public IGamepad GetGamepad(string id) { - if (id == joyConPair.Id) + if (id == _joyConPair.Id) { - return joyConPair.GetJoyConPair(_gamepadsIds); + lock (_lock) + { + return _joyConPair.GetGamepad(_gamepadsIds); + } } int joystickIndex = GetJoystickIndexByGamepadId(id); diff --git a/src/Ryujinx.Input.SDL2/SDL2JoyConPair.cs b/src/Ryujinx.Input.SDL2/SDL2JoyConPair.cs index e3ca336df..0b8f2f72d 100644 --- a/src/Ryujinx.Input.SDL2/SDL2JoyConPair.cs +++ b/src/Ryujinx.Input.SDL2/SDL2JoyConPair.cs @@ -1,9 +1,9 @@ using Ryujinx.Common.Configuration.Hid; using Ryujinx.Common.Configuration.Hid.Controller; -using System; using System.Collections.Generic; using System.Linq; using System.Numerics; +using System.Threading; using static SDL2.SDL; namespace Ryujinx.Input.SDL2 @@ -14,33 +14,29 @@ namespace Ryujinx.Input.SDL2 private IGamepad _right; private StandardControllerInputConfig _configuration; - private readonly StickInputId[] _stickUserMapping = new StickInputId[(int)StickInputId.Count] -{ + private readonly StickInputId[] _stickUserMapping = + [ StickInputId.Unbound, StickInputId.Left, - StickInputId.Right, -}; + StickInputId.Right + ]; private readonly record struct ButtonMappingEntry(GamepadButtonInputId To, GamepadButtonInputId From) { public bool IsValid => To is not GamepadButtonInputId.Unbound && From is not GamepadButtonInputId.Unbound; } - private readonly List _buttonsUserMapping; - public SDL2JoyConPair() - { - _buttonsUserMapping = new List(20); - } + private readonly List _buttonsUserMapping = new(20); - private readonly object _userMappingLock = new(); + private readonly Lock _userMappingLock = new(); public GamepadFeaturesFlag Features => (_left?.Features ?? GamepadFeaturesFlag.None) | (_right?.Features ?? GamepadFeaturesFlag.None); public string Id => "JoyConPair"; public string Name => "Nintendo Switch Joy-Con (L/R)"; - private static readonly string leftName = "Nintendo Switch Joy-Con (L)"; - private static readonly string rightName = "Nintendo Switch Joy-Con (R)"; - public bool IsConnected => (_left != null && _left.IsConnected) && (_right != null && _right.IsConnected); + private const string _leftName = "Nintendo Switch Joy-Con (L)"; + private const string _rightName = "Nintendo Switch Joy-Con (R)"; + public bool IsConnected => _left is { IsConnected: true } && _right is { IsConnected: true }; public void Dispose() { @@ -98,17 +94,23 @@ namespace Ryujinx.Input.SDL2 public (float, float) GetStick(StickInputId inputId) { - if (inputId == StickInputId.Left) + switch (inputId) { - (float x, float y) = _left.GetStick(StickInputId.Left); - return (y, -x); + case StickInputId.Left: + { + (float x, float y) = _left.GetStick(StickInputId.Left); + return (y, -x); + } + case StickInputId.Right: + { + (float x, float y) = _right.GetStick(StickInputId.Left); + return (-y, x); + } + case StickInputId.Unbound: + case StickInputId.Count: + default: + return (0, 0); } - else if (inputId == StickInputId.Right) - { - (float x, float y) = _right.GetStick(StickInputId.Left); - return (-y, x); - } - return (0, 0); } public bool IsPressed(GamepadButtonInputId inputId) @@ -153,8 +155,8 @@ namespace Ryujinx.Input.SDL2 } if (lowFrequency == 0 && highFrequency == 0) { - _left.Rumble(lowFrequency, highFrequency, durationMs); - _right.Rumble(lowFrequency, highFrequency, durationMs); + _left.Rumble(0, 0, durationMs); + _right.Rumble(0, 0, durationMs); } } @@ -208,22 +210,24 @@ namespace Ryujinx.Input.SDL2 _right.SetTriggerThreshold(triggerThreshold); } - public SDL2JoyConPair GetJoyConPair(List _gamepadsIds) + public IGamepad GetGamepad(List gamepadsIds) { this.Dispose(); - var gamepadNames = _gamepadsIds.Where(gamepadId => gamepadId != Id).Select((gamepadId, index) => SDL_GameControllerNameForIndex(index)).ToList(); - int leftIndex = gamepadNames.IndexOf(leftName); - int rightIndex = gamepadNames.IndexOf(rightName); + var gamepadNames = gamepadsIds.Where(gamepadId => gamepadId != Id) + .Select((_, index) => SDL_GameControllerNameForIndex(index)).ToList(); + int leftIndex = gamepadNames.IndexOf(_leftName); + int rightIndex = gamepadNames.IndexOf(_rightName); - if (leftIndex != -1 && rightIndex != -1) + if (leftIndex == -1 || rightIndex == -1) { - nint leftGamepadHandle = SDL_GameControllerOpen(leftIndex); - nint rightGamepadHandle = SDL_GameControllerOpen(rightIndex); - _left = new SDL2Gamepad(leftGamepadHandle, _gamepadsIds[leftIndex]); - _right = new SDL2Gamepad(rightGamepadHandle, _gamepadsIds[leftIndex]); - return this; + return null; } - return null; + + nint leftGamepadHandle = SDL_GameControllerOpen(leftIndex); + nint rightGamepadHandle = SDL_GameControllerOpen(rightIndex); + _left = new SDL2Gamepad(leftGamepadHandle, gamepadsIds[leftIndex]); + _right = new SDL2Gamepad(rightGamepadHandle, gamepadsIds[leftIndex]); + return this; } } }