mirror of
https://github.com/Ryujinx/Ryujinx.git
synced 2024-09-10 17:58:50 +02:00
* 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
170 lines
5.3 KiB
C#
170 lines
5.3 KiB
C#
using Ryujinx.Common.Logging;
|
|
using System;
|
|
using System.IO;
|
|
using System.Threading;
|
|
using static SDL2.SDL;
|
|
|
|
namespace Ryujinx.Input.SDL2
|
|
{
|
|
class SDL2Driver : IDisposable
|
|
{
|
|
private static SDL2Driver _instance;
|
|
|
|
public static bool IsInitialized => _instance != null;
|
|
|
|
public static SDL2Driver Instance
|
|
{
|
|
get
|
|
{
|
|
if (_instance == null)
|
|
{
|
|
_instance = new SDL2Driver();
|
|
}
|
|
|
|
return _instance;
|
|
}
|
|
}
|
|
|
|
private const uint SdlInitFlags = SDL_INIT_EVENTS | SDL_INIT_GAMECONTROLLER | SDL_INIT_JOYSTICK | SDL_INIT_HAPTIC | SDL_INIT_SENSOR;
|
|
|
|
private bool _isRunning;
|
|
private uint _refereceCount;
|
|
private Thread _worker;
|
|
|
|
public event Action<int, int> OnJoyStickConnected;
|
|
public event Action<int> OnJoystickDisconnected;
|
|
|
|
private object _lock = new object();
|
|
|
|
private SDL2Driver() {}
|
|
|
|
public void Initialize()
|
|
{
|
|
lock (_lock)
|
|
{
|
|
_refereceCount++;
|
|
|
|
if (_isRunning)
|
|
{
|
|
return;
|
|
}
|
|
|
|
SDL_SetHint(SDL_HINT_JOYSTICK_HIDAPI_PS4_RUMBLE, "1");
|
|
SDL_SetHint(SDL_HINT_JOYSTICK_HIDAPI_PS5_RUMBLE, "1");
|
|
SDL_SetHint(SDL_HINT_JOYSTICK_ALLOW_BACKGROUND_EVENTS, "1");
|
|
// TODO: Add this in nuget package once SDL2 2.0.15 hit stable release.
|
|
SDL_SetHint("SDL_JOYSTICK_HIDAPI_SWITCH_HOME_LED", "0");
|
|
SDL_SetHint("SDL_JOYSTICK_HIDAPI_JOY_CONS", "1");
|
|
|
|
if (SDL_Init(SdlInitFlags) != 0)
|
|
{
|
|
string errorMessage = $"SDL2 initlaization failed with error \"{SDL_GetError()}\"";
|
|
|
|
Logger.Error?.Print(LogClass.Application, errorMessage);
|
|
|
|
throw new Exception(errorMessage);
|
|
}
|
|
|
|
// First ensure that we only enable joystick events (for connected/disconnected).
|
|
SDL_GameControllerEventState(SDL_DISABLE);
|
|
SDL_JoystickEventState(SDL_ENABLE);
|
|
|
|
// Disable all joysticks information, we don't need them no need to flood the event queue for that.
|
|
SDL_EventState(SDL_EventType.SDL_JOYAXISMOTION, SDL_DISABLE);
|
|
SDL_EventState(SDL_EventType.SDL_JOYBALLMOTION, SDL_DISABLE);
|
|
SDL_EventState(SDL_EventType.SDL_JOYHATMOTION, SDL_DISABLE);
|
|
SDL_EventState(SDL_EventType.SDL_JOYBUTTONDOWN, SDL_DISABLE);
|
|
SDL_EventState(SDL_EventType.SDL_JOYBUTTONUP, SDL_DISABLE);
|
|
|
|
SDL_EventState(SDL_EventType.SDL_CONTROLLERSENSORUPDATE, SDL_DISABLE);
|
|
|
|
string gamepadDbPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "SDL_GameControllerDB.txt");
|
|
|
|
if (File.Exists(gamepadDbPath))
|
|
{
|
|
SDL_GameControllerAddMappingsFromFile(gamepadDbPath);
|
|
}
|
|
|
|
_worker = new Thread(EventWorker);
|
|
_isRunning = true;
|
|
_worker.Start();
|
|
}
|
|
}
|
|
|
|
private void HandleSDLEvent(ref SDL_Event evnt)
|
|
{
|
|
if (evnt.type == SDL_EventType.SDL_JOYDEVICEADDED)
|
|
{
|
|
int deviceId = evnt.cbutton.which;
|
|
|
|
// SDL2 loves to be inconsistent here by providing the device id instead of the instance id (like on removed event), as such we just grab it and send it inside our system.
|
|
int instanceId = SDL_JoystickGetDeviceInstanceID(deviceId);
|
|
|
|
if (instanceId == -1)
|
|
{
|
|
return;
|
|
}
|
|
|
|
Logger.Debug?.Print(LogClass.Application, $"Added joystick instance id {instanceId}");
|
|
|
|
OnJoyStickConnected?.Invoke(deviceId, instanceId);
|
|
}
|
|
else if (evnt.type == SDL_EventType.SDL_JOYDEVICEREMOVED)
|
|
{
|
|
Logger.Debug?.Print(LogClass.Application, $"Removed joystick instance id {evnt.cbutton.which}");
|
|
|
|
OnJoystickDisconnected?.Invoke(evnt.cbutton.which);
|
|
}
|
|
}
|
|
|
|
private void EventWorker()
|
|
{
|
|
const int WaitTimeMs = 10;
|
|
|
|
using ManualResetEventSlim waitHandle = new ManualResetEventSlim(false);
|
|
|
|
while (_isRunning)
|
|
{
|
|
while (SDL_PollEvent(out SDL_Event evnt) != 0)
|
|
{
|
|
HandleSDLEvent(ref evnt);
|
|
}
|
|
|
|
waitHandle.Wait(WaitTimeMs);
|
|
}
|
|
}
|
|
|
|
protected virtual void Dispose(bool disposing)
|
|
{
|
|
if (!disposing)
|
|
{
|
|
return;
|
|
}
|
|
|
|
lock (_lock)
|
|
{
|
|
if (_isRunning)
|
|
{
|
|
_refereceCount--;
|
|
|
|
if (_refereceCount == 0)
|
|
{
|
|
_isRunning = false;
|
|
|
|
_worker?.Join();
|
|
|
|
SDL_Quit();
|
|
|
|
OnJoyStickConnected = null;
|
|
OnJoystickDisconnected = null;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
public void Dispose()
|
|
{
|
|
Dispose(true);
|
|
}
|
|
}
|
|
}
|