Add option to disable DirectInput

DirectInput might end up causing random freezes for a few seconds due to faulty drivers, even with no controllers attached. This seems to be rare, but annoying enough where a keyboard user probably would want to disable DirectInput to avoid this issue.

GSR.Input/InputManager.cs

@@ -31,6 +31,7 @@ public sealed class InputManager : IDisposable
 	private volatile Exception _inputThreadException;
 
 	private readonly SDL_SysWMinfo _mainWindowWmInfo;
+	private volatile bool _enableDirectInput;
 
 	// These must be created/destroyed on the input thread!
 	private IKeyInput _keyInput;
@@ -47,7 +48,7 @@ private void InputThreadProc()
 		try
 		{
 			_keyInput = KeyInputFactory.CreateKeyInput(in _mainWindowWmInfo);
-			_sdlJoysticks = new();
+			_sdlJoysticks = new(_enableDirectInput);
 
 			_inputThreadInitFinished.Set();
 
@@ -62,7 +63,7 @@ private void InputThreadProc()
 				}
 #endif
 				var keyEvents = _keyInput.GetEvents();
-				var joystickInputs = _sdlJoysticks.GetInputs();
+				var joystickInputs = _sdlJoysticks.GetInputs(_enableDirectInput);
 
 				foreach (var keyEvent in keyEvents)
 				{
@@ -120,9 +121,10 @@ private void CheckInputThreadException()
 		}
 	}
 
-	public InputManager(in SDL_SysWMinfo mainWindowWmInfo)
+	public InputManager(in SDL_SysWMinfo mainWindowWmInfo, bool enableDirectInput)
 	{
 		_mainWindowWmInfo = mainWindowWmInfo;
+		_enableDirectInput = enableDirectInput;
 		_inputThread = new(InputThreadProc) { IsBackground = true, Name = "Input Thread" };
 		_inputThread.Start();
 		_inputThreadInitFinished.Wait();
@@ -143,6 +145,13 @@ public void Dispose()
 		_inputThreadLoopThrottle.Dispose();
 	}
 
+#if GSR_WINDOWS
+	public void SetDirectInputEnable(bool enableDirectInput)
+	{
+		_enableDirectInput = enableDirectInput;
+	}
+#endif
+
 	/// <summary>
 	/// NOTE: CALLED ON GUI THREAD
 	/// </summary>

GSR.Input/Joysticks/SDLJoysticks.cs

@@ -10,17 +10,25 @@ namespace GSR.Input.Joysticks;
 
 internal class SDLJoysticks : IDisposable
 {
-	private readonly Dictionary<int, SDL2Joystick> Joysticks = new();
+	private readonly Dictionary<int, SDL2Joystick> Joysticks = [];
 	private readonly SDL_Event[] _sdlEvents = new SDL_Event[10];
+	private bool _enableDirectInput;
 
 	static SDLJoysticks()
 	{
 		SDL_SetHint(SDL_HINT_JOYSTICK_ALLOW_BACKGROUND_EVENTS, "1");
 		SDL_SetHint(SDL_HINT_JOYSTICK_HIDAPI, "1");
 	}
 
-	public SDLJoysticks()
+	public SDLJoysticks(bool enableDirectInput)
 	{
+		Initialize(enableDirectInput);
+	}
+
+	private void Initialize(bool enableDirectInput)
+	{
+		_enableDirectInput = enableDirectInput;
+		SDL_SetHint("SDL_DIRECTINPUT_ENABLED", _enableDirectInput ? "1" : "0");
 		if (SDL_Init(SDL_INIT_JOYSTICK | SDL_INIT_GAMECONTROLLER) != 0)
 		{
 			throw new($"SDL failed to init, SDL error: {SDL_GetError()}");
@@ -35,6 +43,7 @@ public void Dispose()
 		}
 
 		SDL_QuitSubSystem(SDL_INIT_JOYSTICK | SDL_INIT_GAMECONTROLLER);
+		SDL_FlushEvents(SDL_EventType.SDL_JOYDEVICEADDED, SDL_EventType.SDL_JOYDEVICEREMOVED);
 	}
 
 	private void RefreshJoyIndexes()
@@ -85,8 +94,17 @@ public void RemoveJoyDevice(int deviceInstanceId)
 		RefreshJoyIndexes();
 	}
 
-	public IEnumerable<JoystickInput> GetInputs()
+	public IEnumerable<JoystickInput> GetInputs(bool enableDirectInput)
 	{
+		// to change direct input being enabled, we have to deinit and init again
+		// this can only be done on the input thread, hence the deferring
+		if (_enableDirectInput != enableDirectInput)
+		{
+			Dispose();
+			Joysticks.Clear();
+			Initialize(enableDirectInput);
+		}
+
 		// This is needed to add joy add/remove events
 		SDL_JoystickUpdate();
 

GSR/Config.cs

@@ -54,6 +54,7 @@ internal sealed class Config
 	public HotkeyBindings HotkeyBindings { get; set; } = new();
 	public bool AllowBackgroundInput { get; set; }
 	public bool BackgroundInputForJoysticksOnly { get; set; }
+	public bool EnableDirectInput { get; set; } = true;
 
 	public bool KeepAspectRatio { get; set; } = true;
 	public ScalingFilter OutputFilter { get; set; } = ScalingFilter.SharpBilinear;

GSR/GSR.cs

@@ -180,7 +180,7 @@ public GSR()
 		{
 			_config = Config.LoadConfig(PathResolver.GetConfigPath());
 			_mainWindow = new("GSR", _config, true);
-			_inputManager = new(in _mainWindow.SdlSysWMInfo);
+			_inputManager = new(in _mainWindow.SdlSysWMInfo, _config.EnableDirectInput);
 			// input manager is needed to fully load the config, as input bindings depend on user's keyboard layout
 			// default bindings will be set if this fails for some reason
 			_config.DeserializeInputBindings(_inputManager, _mainWindow);

GSR/Gui/ImGuiModals.cs

@@ -476,6 +476,17 @@ static string AddBiosPathButton(string system, string biosPathConfig, ImGuiWindo
 						ImGui.EndDisabled();
 					}
 
+#if GSR_WINDOWS
+					ImGui.Separator();
+
+					var enableDirectInput = _config.EnableDirectInput;
+					if (ImGui.Checkbox("Enable DirectInput", ref enableDirectInput))
+					{
+						_config.EnableDirectInput = enableDirectInput;
+						_inputManager.SetDirectInputEnable(enableDirectInput);
+					}
+#endif
+
 					ImGui.EndTabItem();
 				}
 #endif