aboutsummaryrefslogtreecommitdiff
path: root/Ryujinx.Common/Configuration/Hid/Controller
diff options
context:
space:
mode:
authorMary <me@thog.eu>2021-04-14 12:28:43 +0200
committerGitHub <noreply@github.com>2021-04-14 12:28:43 +0200
commit6cb22c9d38622225f9f787f483bd73369774cf77 (patch)
tree715a40903ceab05546f7392e5b0f429de75bdd02 /Ryujinx.Common/Configuration/Hid/Controller
parent978b69b706fc085d66b01e2dd27ef6d4acebf335 (diff)
Miria: The Death of OpenTK 3 (#2194)
* openal: Update to OpenTK 4 * Ryujinx.Graphics.OpenGL: Update to OpenTK 4 * Entirely removed OpenTK 3, still wip * Use SPB for context creation and handling Still need to test on GLX and readd input support * Start implementing a new input system So far only gamepad are supported, no configuration possible via UI but detected via hotplug/removal Button mapping backend is implemented TODO: front end, configuration handling and configuration migration TODO: keyboard support * Enforce RGB only framebuffer on the GLWidget Fix possible transparent window * Implement UI gamepad frontend Also fix bad mapping of minus button and ensure gamepad config is updated in real time * Handle controller being disconnected and reconnected again * Revert "Enforce RGB only framebuffer on the GLWidget" This reverts commit 0949715d1a03ec793e35e37f7b610cbff2d63965. * Fix first color clear * Filter SDL2 events a bit * Start working on the keyboard detail - Rework configuration classes a bit to be more clean. - Integrate fully the keyboard configuration to the front end (TODO: assigner) - Start skeleton for the GTK3 keyboard driver * Add KeyboardStateSnapshot and its integration * Implement keyboard assigner and GTK3 key mapping TODO: controller configuration mapping and IGamepad implementation for keyboard * Add missing SR and SL definitions * Fix copy pasta mistake on config for previous commit * Implement IGamepad interface for GTK3 keyboard * Fix some implementation still being commented in the controller ui for keyboard * Port screen handle code * Remove all configuration management code and move HidNew to Hid * Rename InputConfigNew to InputConfig * Add a version field to the input config * Prepare serialization and deserialization of new input config and migrate profile loading and saving * Support input configuration saving to config and bump config version to 23. * Clean up in ConfigurationState * Reference SPB via a nuget package * Move new input system to Ryujinx.Input project and SDL2 detail to Ryujinx.Input.SDL2 * move GTK3 input to the right directory * Fix triggers on SDL2 * Update to SDL2 2.0.14 via our own fork * Update buttons definition for SDL2 2.0.14 and report gamepad features * Implement motion support again with SDL2 TODO: cemu hooks integration * Switch to latest of nightly SDL2 * SDL2: Fix bugs in gamepad id matching allowing different gamepad to match on the same device index * Ensure values are set in UI when the gamepad get hot plugged * Avoid trying to add controllers in the Update method and don't open SDL2 gamepad instance before checking ids This fixes permanent rumble of pro controller in some hotplug scenario * Fix more UI bugs * Move legcay motion code around before reintegration * gamecontroller UI tweaks here and there * Hide Motion on non motion configurations * Update the TODO grave Some TODO were fixed long time ago or are quite oudated... * Integrate cemu hooks motion configuration * Integrate cemu hooks configuration options to the UI again * cemuhooks => cemuhooks * Add cemu hook support again * Fix regression on normal motion and fix some very nasty bugs around * Fix for XCB multithreads issue on Linux * Enable motion by default * Block inputs in the main view when in the controller configuration window * Some fixes for the controller ui again * Add joycon support and fixes other hints * Bug fixes and clean up - Invert default mapping if not a Nintendo controller - Keep alive the controller being selected on the controller window (allow to avoid big delay for controller needing time to init when doing button assignment) - Clean up hints in use - Remove debug logs around - Fixes potential double free with SDL2Gamepad * Move the button assigner and motion logic to the Ryujinx.Input project * Reimplement raw keyboard hle input Also move out the logic of the hotkeys * Move all remaining Input manager stuffs to the Ryujinx.Input project * Increment configuration version yet again because of master changes * Ensure input config isn't null when not present * Fixes for VS not being nice * Fix broken gamepad caching logic causing crashes on ui * Ensure the background context is destroyed * Update dependencies * Readd retrocompat with old format of the config to avoid parsing and crashes on those versions Also updated the debug Config.json * Document new input APIs * Isolate SDL2Driver to the project and remove external export of it * Add support for external gamepad db mappings on SDL2 * Last clean up before PR * Addresses first part of comments * Address gdkchan's comments * Do not use JsonException * Last comment fixes
Diffstat (limited to 'Ryujinx.Common/Configuration/Hid/Controller')
-rw-r--r--Ryujinx.Common/Configuration/Hid/Controller/GamepadInputId.cs54
-rw-r--r--Ryujinx.Common/Configuration/Hid/Controller/GenericControllerInputConfig.cs37
-rw-r--r--Ryujinx.Common/Configuration/Hid/Controller/JoyconConfigControllerStick.cs10
-rw-r--r--Ryujinx.Common/Configuration/Hid/Controller/Motion/CemuHookMotionConfigController.cs30
-rw-r--r--Ryujinx.Common/Configuration/Hid/Controller/Motion/JsonMotionConfigControllerConverter.cs76
-rw-r--r--Ryujinx.Common/Configuration/Hid/Controller/Motion/MotionConfigController.cs22
-rw-r--r--Ryujinx.Common/Configuration/Hid/Controller/Motion/MotionInputBackendType.cs9
-rw-r--r--Ryujinx.Common/Configuration/Hid/Controller/Motion/StandardMotionConfigController.cs4
-rw-r--r--Ryujinx.Common/Configuration/Hid/Controller/StandardControllerInputConfig.cs4
-rw-r--r--Ryujinx.Common/Configuration/Hid/Controller/StickInputId.cs11
10 files changed, 257 insertions, 0 deletions
diff --git a/Ryujinx.Common/Configuration/Hid/Controller/GamepadInputId.cs b/Ryujinx.Common/Configuration/Hid/Controller/GamepadInputId.cs
new file mode 100644
index 00000000..cae65fc9
--- /dev/null
+++ b/Ryujinx.Common/Configuration/Hid/Controller/GamepadInputId.cs
@@ -0,0 +1,54 @@
+namespace Ryujinx.Common.Configuration.Hid.Controller
+{
+ public enum GamepadInputId : byte
+ {
+ Unbound,
+ A,
+ B,
+ X,
+ Y,
+ LeftStick,
+ RightStick,
+ LeftShoulder,
+ RightShoulder,
+
+ // Likely axis
+ LeftTrigger,
+ // Likely axis
+ RightTrigger,
+
+ DpadUp,
+ DpadDown,
+ DpadLeft,
+ DpadRight,
+
+ // Special buttons
+
+ Minus,
+ Plus,
+
+ Back = Minus,
+ Start = Plus,
+
+ Guide,
+ Misc1,
+
+ // Xbox Elite paddle
+ Paddle1,
+ Paddle2,
+ Paddle3,
+ Paddle4,
+
+ // PS5 touchpad button
+ Touchpad,
+
+ // Virtual buttons for single joycon
+ SingleLeftTrigger0,
+ SingleRightTrigger0,
+
+ SingleLeftTrigger1,
+ SingleRightTrigger1,
+
+ Count
+ }
+}
diff --git a/Ryujinx.Common/Configuration/Hid/Controller/GenericControllerInputConfig.cs b/Ryujinx.Common/Configuration/Hid/Controller/GenericControllerInputConfig.cs
new file mode 100644
index 00000000..e3423bb5
--- /dev/null
+++ b/Ryujinx.Common/Configuration/Hid/Controller/GenericControllerInputConfig.cs
@@ -0,0 +1,37 @@
+using Ryujinx.Common.Configuration.Hid.Controller.Motion;
+
+namespace Ryujinx.Common.Configuration.Hid.Controller
+{
+ public class GenericControllerInputConfig<Button, Stick> : GenericInputConfigurationCommon<Button> where Button : unmanaged where Stick : unmanaged
+ {
+ /// <summary>
+ /// Left JoyCon Controller Stick Bindings
+ /// </summary>
+ public JoyconConfigControllerStick<Button, Stick> LeftJoyconStick { get; set; }
+
+ /// <summary>
+ /// Right JoyCon Controller Stick Bindings
+ /// </summary>
+ public JoyconConfigControllerStick<Button, Stick> RightJoyconStick { get; set; }
+
+ /// <summary>
+ /// Controller Left Analog Stick Deadzone
+ /// </summary>
+ public float DeadzoneLeft { get; set; }
+
+ /// <summary>
+ /// Controller Right Analog Stick Deadzone
+ /// </summary>
+ public float DeadzoneRight { get; set; }
+
+ /// <summary>
+ /// Controller Trigger Threshold
+ /// </summary>
+ public float TriggerThreshold { get; set; }
+
+ /// <summary>
+ /// Controller Motion Settings
+ /// </summary>
+ public MotionConfigController Motion { get; set; }
+ }
+}
diff --git a/Ryujinx.Common/Configuration/Hid/Controller/JoyconConfigControllerStick.cs b/Ryujinx.Common/Configuration/Hid/Controller/JoyconConfigControllerStick.cs
new file mode 100644
index 00000000..0a9ca9dd
--- /dev/null
+++ b/Ryujinx.Common/Configuration/Hid/Controller/JoyconConfigControllerStick.cs
@@ -0,0 +1,10 @@
+namespace Ryujinx.Common.Configuration.Hid.Controller
+{
+ public class JoyconConfigControllerStick<Button, Stick> where Button: unmanaged where Stick: unmanaged
+ {
+ public Stick Joystick { get; set; }
+ public bool InvertStickX { get; set; }
+ public bool InvertStickY { get; set; }
+ public Button StickButton { get; set; }
+ }
+}
diff --git a/Ryujinx.Common/Configuration/Hid/Controller/Motion/CemuHookMotionConfigController.cs b/Ryujinx.Common/Configuration/Hid/Controller/Motion/CemuHookMotionConfigController.cs
new file mode 100644
index 00000000..2a5a73ff
--- /dev/null
+++ b/Ryujinx.Common/Configuration/Hid/Controller/Motion/CemuHookMotionConfigController.cs
@@ -0,0 +1,30 @@
+namespace Ryujinx.Common.Configuration.Hid.Controller.Motion
+{
+ public class CemuHookMotionConfigController : MotionConfigController
+ {
+ /// <summary>
+ /// Motion Controller Slot
+ /// </summary>
+ public int Slot { get; set; }
+
+ /// <summary>
+ /// Motion Controller Alternative Slot, for RightJoyCon in Pair mode
+ /// </summary>
+ public int AltSlot { get; set; }
+
+ /// <summary>
+ /// Mirror motion input in Pair mode
+ /// </summary>
+ public bool MirrorInput { get; set; }
+
+ /// <summary>
+ /// Host address of the DSU Server
+ /// </summary>
+ public string DsuServerHost { get; set; }
+
+ /// <summary>
+ /// Port of the DSU Server
+ /// </summary>
+ public int DsuServerPort { get; set; }
+ }
+}
diff --git a/Ryujinx.Common/Configuration/Hid/Controller/Motion/JsonMotionConfigControllerConverter.cs b/Ryujinx.Common/Configuration/Hid/Controller/Motion/JsonMotionConfigControllerConverter.cs
new file mode 100644
index 00000000..d1c2e4e8
--- /dev/null
+++ b/Ryujinx.Common/Configuration/Hid/Controller/Motion/JsonMotionConfigControllerConverter.cs
@@ -0,0 +1,76 @@
+using System;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace Ryujinx.Common.Configuration.Hid.Controller.Motion
+{
+ class JsonMotionConfigControllerConverter : JsonConverter<MotionConfigController>
+ {
+ private static MotionInputBackendType GetMotionInputBackendType(ref Utf8JsonReader reader)
+ {
+ // Temporary reader to get the backend type
+ Utf8JsonReader tempReader = reader;
+
+ MotionInputBackendType result = MotionInputBackendType.Invalid;
+
+ while (tempReader.Read())
+ {
+ // NOTE: We scan all properties ignoring the depth entirely on purpose.
+ // The reason behind this is that we cannot track in a reliable way the depth of the object because Utf8JsonReader never emit the first TokenType == StartObject if the json start with an object.
+ // As such, this code will try to parse very field named "motion_backend" to the correct enum.
+ if (tempReader.TokenType == JsonTokenType.PropertyName)
+ {
+ string propertyName = tempReader.GetString();
+
+ if (propertyName.Equals("motion_backend"))
+ {
+ tempReader.Read();
+
+ if (tempReader.TokenType == JsonTokenType.String)
+ {
+ string backendTypeRaw = tempReader.GetString();
+
+ if (!Enum.TryParse(backendTypeRaw, out result))
+ {
+ result = MotionInputBackendType.Invalid;
+ }
+ else
+ {
+ break;
+ }
+ }
+ }
+ }
+ }
+
+ return result;
+ }
+
+ public override MotionConfigController Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+ {
+ MotionInputBackendType motionBackendType = GetMotionInputBackendType(ref reader);
+
+ return motionBackendType switch
+ {
+ MotionInputBackendType.GamepadDriver => (MotionConfigController)JsonSerializer.Deserialize(ref reader, typeof(StandardMotionConfigController), options),
+ MotionInputBackendType.CemuHook => (MotionConfigController)JsonSerializer.Deserialize(ref reader, typeof(CemuHookMotionConfigController), options),
+ _ => throw new InvalidOperationException($"Unknown backend type {motionBackendType}"),
+ };
+ }
+
+ public override void Write(Utf8JsonWriter writer, MotionConfigController value, JsonSerializerOptions options)
+ {
+ switch (value.MotionBackend)
+ {
+ case MotionInputBackendType.GamepadDriver:
+ JsonSerializer.Serialize(writer, value as StandardMotionConfigController, options);
+ break;
+ case MotionInputBackendType.CemuHook:
+ JsonSerializer.Serialize(writer, value as CemuHookMotionConfigController, options);
+ break;
+ default:
+ throw new ArgumentException($"Unknown motion backend type {value.MotionBackend}");
+ }
+ }
+ }
+}
diff --git a/Ryujinx.Common/Configuration/Hid/Controller/Motion/MotionConfigController.cs b/Ryujinx.Common/Configuration/Hid/Controller/Motion/MotionConfigController.cs
new file mode 100644
index 00000000..832aae0d
--- /dev/null
+++ b/Ryujinx.Common/Configuration/Hid/Controller/Motion/MotionConfigController.cs
@@ -0,0 +1,22 @@
+namespace Ryujinx.Common.Configuration.Hid.Controller.Motion
+{
+ public class MotionConfigController
+ {
+ public MotionInputBackendType MotionBackend { get; set; }
+
+ /// <summary>
+ /// Gyro Sensitivity
+ /// </summary>
+ public int Sensitivity { get; set; }
+
+ /// <summary>
+ /// Gyro Deadzone
+ /// </summary>
+ public double GyroDeadzone { get; set; }
+
+ /// <summary>
+ /// Enable Motion Controls
+ /// </summary>
+ public bool EnableMotion { get; set; }
+ }
+}
diff --git a/Ryujinx.Common/Configuration/Hid/Controller/Motion/MotionInputBackendType.cs b/Ryujinx.Common/Configuration/Hid/Controller/Motion/MotionInputBackendType.cs
new file mode 100644
index 00000000..45d654ed
--- /dev/null
+++ b/Ryujinx.Common/Configuration/Hid/Controller/Motion/MotionInputBackendType.cs
@@ -0,0 +1,9 @@
+namespace Ryujinx.Common.Configuration.Hid.Controller.Motion
+{
+ public enum MotionInputBackendType : byte
+ {
+ Invalid,
+ GamepadDriver,
+ CemuHook
+ }
+}
diff --git a/Ryujinx.Common/Configuration/Hid/Controller/Motion/StandardMotionConfigController.cs b/Ryujinx.Common/Configuration/Hid/Controller/Motion/StandardMotionConfigController.cs
new file mode 100644
index 00000000..df925444
--- /dev/null
+++ b/Ryujinx.Common/Configuration/Hid/Controller/Motion/StandardMotionConfigController.cs
@@ -0,0 +1,4 @@
+namespace Ryujinx.Common.Configuration.Hid.Controller.Motion
+{
+ public class StandardMotionConfigController : MotionConfigController { }
+}
diff --git a/Ryujinx.Common/Configuration/Hid/Controller/StandardControllerInputConfig.cs b/Ryujinx.Common/Configuration/Hid/Controller/StandardControllerInputConfig.cs
new file mode 100644
index 00000000..4154a42b
--- /dev/null
+++ b/Ryujinx.Common/Configuration/Hid/Controller/StandardControllerInputConfig.cs
@@ -0,0 +1,4 @@
+namespace Ryujinx.Common.Configuration.Hid.Controller
+{
+ public class StandardControllerInputConfig : GenericControllerInputConfig<GamepadInputId, StickInputId> { }
+}
diff --git a/Ryujinx.Common/Configuration/Hid/Controller/StickInputId.cs b/Ryujinx.Common/Configuration/Hid/Controller/StickInputId.cs
new file mode 100644
index 00000000..87945a75
--- /dev/null
+++ b/Ryujinx.Common/Configuration/Hid/Controller/StickInputId.cs
@@ -0,0 +1,11 @@
+namespace Ryujinx.Common.Configuration.Hid.Controller
+{
+ public enum StickInputId : byte
+ {
+ Unbound,
+ Left,
+ Right,
+
+ Count
+ }
+}