MeloNX/Ryujinx-ryubing
11
0
Fork 0
Code Issues 184 Pull Requests 15 Actions Packages Projects Releases 36 Wiki Activity

delay 2000ms before ShowPowerLevel

Browse Source
This commit is contained in:
madwind 2024-12-25 16:57:36 +08:00
parent 714c68b548
commit e509ffa716
2 changed files with 87 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/Ryujinx.Input.SDL2/SDL2GamepadDriver.cs
View File

@ -1,4 +1,3 @@
using Ryujinx.Common.Logging;
using Ryujinx.SDL2.Common; using Ryujinx.SDL2.Common;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
@ -12,7 +11,7 @@ namespace Ryujinx.Input.SDL2
private readonly Dictionary<int, string> _gamepadsInstanceIdsMapping; private readonly Dictionary<int, string> _gamepadsInstanceIdsMapping;
private readonly List<string> _gamepadsIds; private readonly List<string> _gamepadsIds;
private readonly Lock _lock = new(); private readonly Lock _lock = new();
private readonly SDL2JoyConPair _joyConPair; private readonly SDL2JoyConPair joyConPair;
public ReadOnlySpan<string> GamepadsIds public ReadOnlySpan<string> GamepadsIds
{ {
@ -38,7 +37,7 @@ namespace Ryujinx.Input.SDL2
SDL2Driver.Instance.Initialize(); SDL2Driver.Instance.Initialize();
SDL2Driver.Instance.OnJoyStickConnected += HandleJoyStickConnected; SDL2Driver.Instance.OnJoyStickConnected += HandleJoyStickConnected;
SDL2Driver.Instance.OnJoystickDisconnected += HandleJoyStickDisconnected; SDL2Driver.Instance.OnJoystickDisconnected += HandleJoyStickDisconnected;
_joyConPair = new SDL2JoyConPair(); joyConPair = new SDL2JoyConPair();
// Add already connected gamepads // Add already connected gamepads
int numJoysticks = SDL_NumJoysticks(); int numJoysticks = SDL_NumJoysticks();
@ -91,9 +90,9 @@ namespace Ryujinx.Input.SDL2
lock (_lock) lock (_lock)
{ {
_gamepadsIds.Remove(id); _gamepadsIds.Remove(id);
if (_joyConPair.GetGamepad(_gamepadsIds) == null) if (joyConPair.GetGamepad(_gamepadsIds) == null)
{ {
_gamepadsIds.Remove(_joyConPair.Id); _gamepadsIds.Remove(joyConPair.Id);
} }
} }
@ -126,12 +125,10 @@ namespace Ryujinx.Input.SDL2
_gamepadsIds.Insert(joystickDeviceId, id); _gamepadsIds.Insert(joystickDeviceId, id);
else else
_gamepadsIds.Add(id); _gamepadsIds.Add(id);
var powerLevel = SDL_JoystickCurrentPowerLevel(GetJoystickIndexByGamepadId(id)); if (joyConPair.GetGamepad(_gamepadsIds) != null)
Logger.Info?.Print(LogClass.Hid, $"Gamepad connected: {id}, power level: {powerLevel}");
if (_joyConPair.GetGamepad(_gamepadsIds) != null)
{ {
_gamepadsIds.Remove(_joyConPair.Id); _gamepadsIds.Remove(joyConPair.Id);
_gamepadsIds.Add(_joyConPair.Id); _gamepadsIds.Add(joyConPair.Id);
} }
} }
@ -170,11 +167,11 @@ namespace Ryujinx.Input.SDL2
public IGamepad GetGamepad(string id) public IGamepad GetGamepad(string id)
{ {
if (id == _joyConPair.Id) if (id == joyConPair.Id)
{ {
lock (_lock) lock (_lock)
{ {
return _joyConPair.GetGamepad(_gamepadsIds); return joyConPair.GetGamepad(_gamepadsIds);
} }
} }
@ -192,6 +189,7 @@ namespace Ryujinx.Input.SDL2
return null; return null;
} }
Console.WriteLine("Game controller opened" + SDL_GameControllerName(gamepadHandle));
return new SDL2Gamepad(gamepadHandle, id); return new SDL2Gamepad(gamepadHandle, id);
} }
} }

106
src/Ryujinx.Input.SDL2/SDL2JoyConPair.cs
View File

@ -1,10 +1,12 @@
using Ryujinx.Common.Configuration.Hid; using Ryujinx.Common.Configuration.Hid;
using Ryujinx.Common.Configuration.Hid.Controller; using Ryujinx.Common.Configuration.Hid.Controller;
using Ryujinx.Common.Logging;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Numerics; using System.Numerics;
using System.Threading; using System.Threading;
using static SDL2.SDL; using static SDL2.SDL;
using Timer = System.Timers.Timer;
namespace Ryujinx.Input.SDL2 namespace Ryujinx.Input.SDL2
{ {
@ -12,14 +14,16 @@ namespace Ryujinx.Input.SDL2
{ {
private IGamepad _left; private IGamepad _left;
private IGamepad _right; private IGamepad _right;
private Timer timer;
private StandardControllerInputConfig _configuration; private StandardControllerInputConfig _configuration;
private readonly StickInputId[] _stickUserMapping = private readonly StickInputId[] _stickUserMapping =
[ [
StickInputId.Unbound, StickInputId.Unbound,
StickInputId.Left, StickInputId.Left,
StickInputId.Right StickInputId.Right
]; ];
private readonly record struct ButtonMappingEntry(GamepadButtonInputId To, GamepadButtonInputId From) private readonly record struct ButtonMappingEntry(GamepadButtonInputId To, GamepadButtonInputId From)
{ {
public bool IsValid => To is not GamepadButtonInputId.Unbound && From is not GamepadButtonInputId.Unbound; public bool IsValid => To is not GamepadButtonInputId.Unbound && From is not GamepadButtonInputId.Unbound;
@ -29,13 +33,14 @@ namespace Ryujinx.Input.SDL2
private readonly Lock _userMappingLock = new(); private readonly Lock _userMappingLock = new();
public GamepadFeaturesFlag Features => (_left?.Features ?? GamepadFeaturesFlag.None) | (_right?.Features ?? GamepadFeaturesFlag.None); public GamepadFeaturesFlag Features => (_left?.Features ?? GamepadFeaturesFlag.None) |
(_right?.Features ?? GamepadFeaturesFlag.None);
public string Id => "JoyConPair"; public string Id => "JoyConPair";
public string Name => "Nintendo Switch Joy-Con (L/R)"; public string Name => "Nintendo Switch Joy-Con (L/R)";
private const string _leftName = "Nintendo Switch Joy-Con (L)"; private const string LeftName = "Nintendo Switch Joy-Con (L)";
private const string _rightName = "Nintendo Switch Joy-Con (R)"; private const string RightName = "Nintendo Switch Joy-Con (R)";
public bool IsConnected => _left is { IsConnected: true } && _right is { IsConnected: true }; public bool IsConnected => _left is { IsConnected: true } && _right is { IsConnected: true };
public void Dispose() public void Dispose()
@ -43,6 +48,7 @@ namespace Ryujinx.Input.SDL2
_left?.Dispose(); _left?.Dispose();
_right?.Dispose(); _right?.Dispose();
} }
public GamepadStateSnapshot GetMappedStateSnapshot() public GamepadStateSnapshot GetMappedStateSnapshot()
{ {
GamepadStateSnapshot rawState = GetStateSnapshot(); GamepadStateSnapshot rawState = GetStateSnapshot();
@ -149,10 +155,12 @@ namespace Ryujinx.Input.SDL2
{ {
_right.Rumble(lowFrequency, lowFrequency, durationMs); _right.Rumble(lowFrequency, lowFrequency, durationMs);
} }
if (highFrequency != 0) if (highFrequency != 0)
{ {
_left.Rumble(highFrequency, highFrequency, durationMs); _left.Rumble(highFrequency, highFrequency, durationMs);
} }
if (lowFrequency == 0 && highFrequency == 0) if (lowFrequency == 0 && highFrequency == 0)
{ {
_left.Rumble(0, 0, durationMs); _left.Rumble(0, 0, durationMs);
@ -164,7 +172,6 @@ namespace Ryujinx.Input.SDL2
{ {
lock (_userMappingLock) lock (_userMappingLock)
{ {
_configuration = (StandardControllerInputConfig)configuration; _configuration = (StandardControllerInputConfig)configuration;
_left.SetConfiguration(configuration); _left.SetConfiguration(configuration);
_right.SetConfiguration(configuration); _right.SetConfiguration(configuration);
@ -176,32 +183,51 @@ namespace Ryujinx.Input.SDL2
_stickUserMapping[(int)StickInputId.Right] = (StickInputId)_configuration.RightJoyconStick.Joystick; _stickUserMapping[(int)StickInputId.Right] = (StickInputId)_configuration.RightJoyconStick.Joystick;
// Then left joycon // Then left joycon
_buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.LeftStick, (GamepadButtonInputId)_configuration.LeftJoyconStick.StickButton)); _buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.LeftStick,
_buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.DpadUp, (GamepadButtonInputId)_configuration.LeftJoycon.DpadUp)); (GamepadButtonInputId)_configuration.LeftJoyconStick.StickButton));
_buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.DpadDown, (GamepadButtonInputId)_configuration.LeftJoycon.DpadDown)); _buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.DpadUp,
_buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.DpadLeft, (GamepadButtonInputId)_configuration.LeftJoycon.DpadLeft)); (GamepadButtonInputId)_configuration.LeftJoycon.DpadUp));
_buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.DpadRight, (GamepadButtonInputId)_configuration.LeftJoycon.DpadRight)); _buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.DpadDown,
_buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.Minus, (GamepadButtonInputId)_configuration.LeftJoycon.ButtonMinus)); (GamepadButtonInputId)_configuration.LeftJoycon.DpadDown));
_buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.LeftShoulder, (GamepadButtonInputId)_configuration.LeftJoycon.ButtonL)); _buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.DpadLeft,
_buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.LeftTrigger, (GamepadButtonInputId)_configuration.LeftJoycon.ButtonZl)); (GamepadButtonInputId)_configuration.LeftJoycon.DpadLeft));
_buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.SingleRightTrigger0, (GamepadButtonInputId)_configuration.LeftJoycon.ButtonSr)); _buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.DpadRight,
_buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.SingleLeftTrigger0, (GamepadButtonInputId)_configuration.LeftJoycon.ButtonSl)); (GamepadButtonInputId)_configuration.LeftJoycon.DpadRight));
_buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.Minus,
(GamepadButtonInputId)_configuration.LeftJoycon.ButtonMinus));
_buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.LeftShoulder,
(GamepadButtonInputId)_configuration.LeftJoycon.ButtonL));
_buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.LeftTrigger,
(GamepadButtonInputId)_configuration.LeftJoycon.ButtonZl));
_buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.SingleRightTrigger0,
(GamepadButtonInputId)_configuration.LeftJoycon.ButtonSr));
_buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.SingleLeftTrigger0,
(GamepadButtonInputId)_configuration.LeftJoycon.ButtonSl));
// Finally right joycon // Finally right joycon
_buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.RightStick, (GamepadButtonInputId)_configuration.RightJoyconStick.StickButton)); _buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.RightStick,
_buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.A, (GamepadButtonInputId)_configuration.RightJoycon.ButtonA)); (GamepadButtonInputId)_configuration.RightJoyconStick.StickButton));
_buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.B, (GamepadButtonInputId)_configuration.RightJoycon.ButtonB)); _buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.A,
_buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.X, (GamepadButtonInputId)_configuration.RightJoycon.ButtonX)); (GamepadButtonInputId)_configuration.RightJoycon.ButtonA));
_buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.Y, (GamepadButtonInputId)_configuration.RightJoycon.ButtonY)); _buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.B,
_buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.Plus, (GamepadButtonInputId)_configuration.RightJoycon.ButtonPlus)); (GamepadButtonInputId)_configuration.RightJoycon.ButtonB));
_buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.RightShoulder, (GamepadButtonInputId)_configuration.RightJoycon.ButtonR)); _buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.X,
_buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.RightTrigger, (GamepadButtonInputId)_configuration.RightJoycon.ButtonZr)); (GamepadButtonInputId)_configuration.RightJoycon.ButtonX));
_buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.SingleRightTrigger1, (GamepadButtonInputId)_configuration.RightJoycon.ButtonSr)); _buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.Y,
_buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.SingleLeftTrigger1, (GamepadButtonInputId)_configuration.RightJoycon.ButtonSl)); (GamepadButtonInputId)_configuration.RightJoycon.ButtonY));
_buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.Plus,
(GamepadButtonInputId)_configuration.RightJoycon.ButtonPlus));
_buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.RightShoulder,
(GamepadButtonInputId)_configuration.RightJoycon.ButtonR));
_buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.RightTrigger,
(GamepadButtonInputId)_configuration.RightJoycon.ButtonZr));
_buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.SingleRightTrigger1,
(GamepadButtonInputId)_configuration.RightJoycon.ButtonSr));
_buttonsUserMapping.Add(new ButtonMappingEntry(GamepadButtonInputId.SingleLeftTrigger1,
(GamepadButtonInputId)_configuration.RightJoycon.ButtonSl));
SetTriggerThreshold(_configuration.TriggerThreshold); SetTriggerThreshold(_configuration.TriggerThreshold);
} }
} }
public void SetTriggerThreshold(float triggerThreshold) public void SetTriggerThreshold(float triggerThreshold)
@ -215,8 +241,8 @@ namespace Ryujinx.Input.SDL2
this.Dispose(); this.Dispose();
var gamepadNames = gamepadsIds.Where(gamepadId => gamepadId != Id) var gamepadNames = gamepadsIds.Where(gamepadId => gamepadId != Id)
.Select((_, index) => SDL_GameControllerNameForIndex(index)).ToList(); .Select((_, index) => SDL_GameControllerNameForIndex(index)).ToList();
int leftIndex = gamepadNames.IndexOf(_leftName); int leftIndex = gamepadNames.IndexOf(LeftName);
int rightIndex = gamepadNames.IndexOf(_rightName); int rightIndex = gamepadNames.IndexOf(RightName);
if (leftIndex == -1 || rightIndex == -1) if (leftIndex == -1 || rightIndex == -1)
{ {
@ -225,9 +251,31 @@ namespace Ryujinx.Input.SDL2
nint leftGamepadHandle = SDL_GameControllerOpen(leftIndex); nint leftGamepadHandle = SDL_GameControllerOpen(leftIndex);
nint rightGamepadHandle = SDL_GameControllerOpen(rightIndex); nint rightGamepadHandle = SDL_GameControllerOpen(rightIndex);
if (leftGamepadHandle == nint.Zero || rightGamepadHandle == nint.Zero)
{
return null;
}
_left = new SDL2Gamepad(leftGamepadHandle, gamepadsIds[leftIndex]); _left = new SDL2Gamepad(leftGamepadHandle, gamepadsIds[leftIndex]);
_right = new SDL2Gamepad(rightGamepadHandle, gamepadsIds[leftIndex]); _right = new SDL2Gamepad(rightGamepadHandle, gamepadsIds[rightIndex]);
ShowPowerLevel(leftGamepadHandle, rightGamepadHandle);
return this; return this;
} }
private void ShowPowerLevel(nint leftGamepadHandle, nint rightGamepadHandle)
{
timer?.Stop();
timer = new Timer(2000);
timer.Elapsed += (_, _) =>
{
timer.Stop();
var leftLevel = SDL_JoystickCurrentPowerLevel(SDL_GameControllerGetJoystick(leftGamepadHandle));
var rightLevel = SDL_JoystickCurrentPowerLevel(SDL_GameControllerGetJoystick(rightGamepadHandle));
Logger.Info?.Print(LogClass.Hid, $"Left power level: {leftLevel}, Right power level: {rightLevel}");
};
timer.AutoReset = false;
timer.Start();
}
} }
} }