Improve multi-controller support in HID and Controller Applet (#1453)
* Initial commit Enable proper LED patterns Toggle Hotkeys only on focus Ignore Handheld on Docked mode Remove PrimaryController Validate NpadIdType Rewrite NpadDevices to process config in update loop Cleanup * Notify in log periodically when no matched controllers * Remove duplicate StructArrayHelpers in favor of Common.Memory Fix struct padding CS0169 warns in Touchscreen * Remove GTK markup from Controller Applet Use IList instead of List Explicit list capacity in 1ms loop Fix formatting * Restrict ControllerWindow to show valid controller types Add selected player name to ControllerWindow title * ControllerWindow: Fix controller type initial value NpadDevices: Simplify default battery charge * Address AcK's comments Use explicit types and fix formatting * Remove HashSet for SupportedPlayers Fixes potential exceptions due to race * Fix ControllerSupportArg struct packing Also comes with two revisions of struct for 4/8 players max.
This commit is contained in:
parent
01ff648bdf
commit
27179d0218
29 changed files with 445 additions and 242 deletions
|
@ -1,5 +1,7 @@
|
|||
using Ryujinx.Common;
|
||||
using Ryujinx.HLE.Exceptions;
|
||||
using Ryujinx.Common.Configuration.Hid;
|
||||
using System.Collections.Generic;
|
||||
using System.Runtime.CompilerServices;
|
||||
|
||||
namespace Ryujinx.HLE.HOS.Services.Hid
|
||||
|
@ -65,6 +67,24 @@ namespace Ryujinx.HLE.HOS.Services.Hid
|
|||
Npads = new NpadDevices(_device, true);
|
||||
}
|
||||
|
||||
internal void RefreshInputConfig(List<InputConfig> inputConfig)
|
||||
{
|
||||
ControllerConfig[] npadConfig = new ControllerConfig[inputConfig.Count];
|
||||
|
||||
for (int i = 0; i < npadConfig.Length; ++i)
|
||||
{
|
||||
npadConfig[i].Player = (PlayerIndex)inputConfig[i].PlayerIndex;
|
||||
npadConfig[i].Type = (ControllerType)inputConfig[i].ControllerType;
|
||||
}
|
||||
|
||||
_device.Hid.Npads.Configure(npadConfig);
|
||||
}
|
||||
|
||||
internal void RefreshInputConfigEvent(object _, ReactiveEventArgs<List<InputConfig>> args)
|
||||
{
|
||||
RefreshInputConfig(args.NewValue);
|
||||
}
|
||||
|
||||
public ControllerKeys UpdateStickButtons(JoystickPosition leftStick, JoystickPosition rightStick)
|
||||
{
|
||||
ControllerKeys result = 0;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue