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

1 files changed, 122 insertions, 144 deletions

diff --git a/Ryujinx.Common/Configuration/ConfigurationState.cs b/Ryujinx.Common/Configuration/ConfigurationState.cs
index 1e26b4f4..7063110f 100644
--- a/Ryujinx.Common/Configuration/ConfigurationState.cs
+++ b/Ryujinx.Common/Configuration/ConfigurationState.cs
@@ -1,8 +1,8 @@
 using Ryujinx.Common;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Configuration.Hid;
+using Ryujinx.Common.Configuration.Hid.Keyboard;
 using Ryujinx.Common.Logging;
-using Ryujinx.Configuration.Hid;
 using Ryujinx.Configuration.System;
 using Ryujinx.Configuration.Ui;
 using System;
@@ -405,21 +405,6 @@ namespace Ryujinx.Configuration
 
         public ConfigurationFileFormat ToFileFormat()
         {
-            List<ControllerConfig> controllerConfigList = new List<ControllerConfig>();
-            List<KeyboardConfig>   keyboardConfigList   = new List<KeyboardConfig>();
-
-            foreach (InputConfig inputConfig in Hid.InputConfig.Value)
-            {
-                if (inputConfig is ControllerConfig controllerConfig)
-                {
-                    controllerConfigList.Add(controllerConfig);
-                }
-                else if (inputConfig is KeyboardConfig keyboardConfig)
-                {
-                    keyboardConfigList.Add(keyboardConfig);
-                }
-            }
-
             ConfigurationFileFormat configurationFile = new ConfigurationFileFormat
             {
                 Version                   = ConfigurationFileFormat.CurrentVersion,
@@ -479,8 +464,9 @@ namespace Ryujinx.Configuration
                 StartFullscreen           = Ui.StartFullscreen,
                 EnableKeyboard            = Hid.EnableKeyboard,
                 Hotkeys                   = Hid.Hotkeys,
-                KeyboardConfig            = keyboardConfigList,
-                ControllerConfig          = controllerConfigList
+                KeyboardConfig            = new List<object>(),
+                ControllerConfig          = new List<object>(),
+                InputConfig               = Hid.InputConfig,
             };
 
             return configurationFile;
@@ -543,54 +529,57 @@ namespace Ryujinx.Configuration
             };
             Hid.InputConfig.Value = new List<InputConfig>
             {
-                new KeyboardConfig
-                {
-                    Index          = 0,
-                    ControllerType = ControllerType.JoyconPair,
-                    PlayerIndex    = PlayerIndex.Player1,
-                    LeftJoycon     = new NpadKeyboardLeft
-                    {
-                        StickUp     = Key.W,
-                        StickDown   = Key.S,
-                        StickLeft   = Key.A,
-                        StickRight  = Key.D,
-                        StickButton = Key.F,
-                        DPadUp      = Key.Up,
-                        DPadDown    = Key.Down,
-                        DPadLeft    = Key.Left,
-                        DPadRight   = Key.Right,
-                        ButtonMinus = Key.Minus,
-                        ButtonL     = Key.E,
-                        ButtonZl    = Key.Q,
-                        ButtonSl    = Key.Home,
-                        ButtonSr    = Key.End
-                    },
-                    RightJoycon    = new NpadKeyboardRight
-                    {
-                        StickUp     = Key.I,
-                        StickDown   = Key.K,
-                        StickLeft   = Key.J,
-                        StickRight  = Key.L,
-                        StickButton = Key.H,
-                        ButtonA     = Key.Z,
-                        ButtonB     = Key.X,
-                        ButtonX     = Key.C,
-                        ButtonY     = Key.V,
-                        ButtonPlus  = Key.Plus,
-                        ButtonR     = Key.U,
-                        ButtonZr    = Key.O,
-                        ButtonSl    = Key.PageUp,
-                        ButtonSr    = Key.PageDown
-                    },
-                    EnableMotion  = false,
-                    MirrorInput   = false,
-                    Slot          = 0,
-                    AltSlot       = 0,
-                    Sensitivity   = 100,
-                    GyroDeadzone  = 1,
-                    DsuServerHost = "127.0.0.1",
-                    DsuServerPort = 26760
-                }
+                 new StandardKeyboardInputConfig
+                 {
+                        Version          = InputConfig.CurrentVersion,
+                        Backend          = InputBackendType.WindowKeyboard,
+                        Id               = "0",
+                        PlayerIndex      = PlayerIndex.Player1,
+                        ControllerType   = ControllerType.JoyconPair,
+                        LeftJoycon       = new LeftJoyconCommonConfig<Key>
+                        {
+                            DpadUp       = Key.Up,
+                            DpadDown     = Key.Down,
+                            DpadLeft     = Key.Left,
+                            DpadRight    = Key.Right,
+                            ButtonMinus  = Key.Minus,
+                            ButtonL      = Key.E,
+                            ButtonZl     = Key.Q,
+                            ButtonSl     = Key.Unbound,
+                            ButtonSr     = Key.Unbound
+                        },
+
+                        LeftJoyconStick  = new JoyconConfigKeyboardStick<Key>
+                        {
+                            StickUp      = Key.W,
+                            StickDown    = Key.S,
+                            StickLeft    = Key.A,
+                            StickRight   = Key.D,
+                            StickButton  = Key.F,
+                        },
+
+                        RightJoycon      = new RightJoyconCommonConfig<Key>
+                        {
+                            ButtonA      = Key.Z,
+                            ButtonB      = Key.X,
+                            ButtonX      = Key.C,
+                            ButtonY      = Key.V,
+                            ButtonPlus   = Key.Plus,
+                            ButtonR      = Key.U,
+                            ButtonZr     = Key.O,
+                            ButtonSl     = Key.Unbound,
+                            ButtonSr     = Key.Unbound
+                        },
+
+                        RightJoyconStick = new JoyconConfigKeyboardStick<Key>
+                        {
+                            StickUp      = Key.I,
+                            StickDown    = Key.K,
+                            StickLeft    = Key.J,
+                            StickRight   = Key.L,
+                            StickButton  = Key.H,
+                        }
+                 }
             };
         }
 
@@ -643,80 +632,6 @@ namespace Ryujinx.Configuration
                 configurationFileUpdated = true;
             }
 
-            if (configurationFileFormat.Version < 6)
-            {
-                Common.Logging.Logger.Warning?.Print(LogClass.Application, $"Outdated configuration version {configurationFileFormat.Version}, migrating to version 6.");
-
-                configurationFileFormat.ControllerConfig = new List<ControllerConfig>();
-                configurationFileFormat.KeyboardConfig   = new List<KeyboardConfig>
-                {
-                    new KeyboardConfig
-                    {
-                        Index          = 0,
-                        ControllerType = ControllerType.JoyconPair,
-                        PlayerIndex    = PlayerIndex.Player1,
-                        LeftJoycon     = new NpadKeyboardLeft
-                        {
-                            StickUp     = Key.W,
-                            StickDown   = Key.S,
-                            StickLeft   = Key.A,
-                            StickRight  = Key.D,
-                            StickButton = Key.F,
-                            DPadUp      = Key.Up,
-                            DPadDown    = Key.Down,
-                            DPadLeft    = Key.Left,
-                            DPadRight   = Key.Right,
-                            ButtonMinus = Key.Minus,
-                            ButtonL     = Key.E,
-                            ButtonZl    = Key.Q,
-                            ButtonSl    = Key.Unbound,
-                            ButtonSr    = Key.Unbound
-                        },
-                        RightJoycon    = new NpadKeyboardRight
-                        {
-                            StickUp     = Key.I,
-                            StickDown   = Key.K,
-                            StickLeft   = Key.J,
-                            StickRight  = Key.L,
-                            StickButton = Key.H,
-                            ButtonA     = Key.Z,
-                            ButtonB     = Key.X,
-                            ButtonX     = Key.C,
-                            ButtonY     = Key.V,
-                            ButtonPlus  = Key.Plus,
-                            ButtonR     = Key.U,
-                            ButtonZr    = Key.O,
-                            ButtonSl    = Key.Unbound,
-                            ButtonSr    = Key.Unbound
-                        },
-                        EnableMotion  = false,
-                        MirrorInput   = false,
-                        Slot          = 0,
-                        AltSlot       = 0,
-                        Sensitivity   = 100,
-                        GyroDeadzone  = 1,
-                        DsuServerHost = "127.0.0.1",
-                        DsuServerPort = 26760
-                    }
-                };
-
-                configurationFileUpdated = true;
-            }
-
-            // Only needed for version 6 configurations.
-            if (configurationFileFormat.Version == 6)
-            {
-                Common.Logging.Logger.Warning?.Print(LogClass.Application, $"Outdated configuration version {configurationFileFormat.Version}, migrating to version 7.");
-
-                for (int i = 0; i < configurationFileFormat.KeyboardConfig.Count; i++)
-                {
-                    if (configurationFileFormat.KeyboardConfig[i].Index != KeyboardConfig.AllKeyboardsIndex)
-                    {
-                        configurationFileFormat.KeyboardConfig[i].Index++;
-                    }
-                }
-            }
-
             if (configurationFileFormat.Version < 8)
             {
                 Common.Logging.Logger.Warning?.Print(LogClass.Application, $"Outdated configuration version {configurationFileFormat.Version}, migrating to version 8.");
@@ -826,9 +741,67 @@ namespace Ryujinx.Configuration
                 configurationFileUpdated = true;
             }
 
-            List<InputConfig> inputConfig = new List<InputConfig>();
-            inputConfig.AddRange(configurationFileFormat.ControllerConfig);
-            inputConfig.AddRange(configurationFileFormat.KeyboardConfig);
+            if (configurationFileFormat.Version < 24)
+            {
+                Common.Logging.Logger.Warning?.Print(LogClass.Application, $"Outdated configuration version {configurationFileFormat.Version}, migrating to version 24.");
+
+                configurationFileFormat.InputConfig = new List<InputConfig>
+                {
+                     new StandardKeyboardInputConfig
+                     {
+                            Version          = InputConfig.CurrentVersion,
+                            Backend          = InputBackendType.WindowKeyboard,
+                            Id               = "0",
+                            PlayerIndex      = PlayerIndex.Player1,
+                            ControllerType   = ControllerType.JoyconPair,
+                            LeftJoycon       = new LeftJoyconCommonConfig<Key>
+                            {
+                                DpadUp       = Key.Up,
+                                DpadDown     = Key.Down,
+                                DpadLeft     = Key.Left,
+                                DpadRight    = Key.Right,
+                                ButtonMinus  = Key.Minus,
+                                ButtonL      = Key.E,
+                                ButtonZl     = Key.Q,
+                                ButtonSl     = Key.Unbound,
+                                ButtonSr     = Key.Unbound
+                            },
+
+                            LeftJoyconStick  = new JoyconConfigKeyboardStick<Key>
+                            {
+                                StickUp      = Key.W,
+                                StickDown    = Key.S,
+                                StickLeft    = Key.A,
+                                StickRight   = Key.D,
+                                StickButton  = Key.F,
+                            },
+
+                            RightJoycon      = new RightJoyconCommonConfig<Key>
+                            {
+                                ButtonA      = Key.Z,
+                                ButtonB      = Key.X,
+                                ButtonX      = Key.C,
+                                ButtonY      = Key.V,
+                                ButtonPlus   = Key.Plus,
+                                ButtonR      = Key.U,
+                                ButtonZr     = Key.O,
+                                ButtonSl     = Key.Unbound,
+                                ButtonSr     = Key.Unbound
+                            },
+
+                            RightJoyconStick = new JoyconConfigKeyboardStick<Key>
+                            {
+                                StickUp      = Key.I,
+                                StickDown    = Key.K,
+                                StickLeft    = Key.J,
+                                StickRight   = Key.L,
+                                StickButton  = Key.H,
+                            }
+                     }
+                };
+
+                configurationFileUpdated = true;
+            }
 
             Graphics.ResScale.Value                = configurationFileFormat.ResScale;
             Graphics.ResScaleCustom.Value          = configurationFileFormat.ResScaleCustom;
@@ -880,7 +853,12 @@ namespace Ryujinx.Configuration
             Ui.StartFullscreen.Value               = configurationFileFormat.StartFullscreen;
             Hid.EnableKeyboard.Value               = configurationFileFormat.EnableKeyboard;
             Hid.Hotkeys.Value                      = configurationFileFormat.Hotkeys;
-            Hid.InputConfig.Value                  = inputConfig;
+            Hid.InputConfig.Value                  = configurationFileFormat.InputConfig;
+
+            if (Hid.InputConfig.Value == null)
+            {
+                Hid.InputConfig.Value = new List<InputConfig>();
+            }
 
             if (configurationFileUpdated)
             {