Merge branch 'reset-input-handlers' into tablet

osu.Framework.Tests/Visual/Input/TestSceneInputManager.cs

···
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Input;
 using osu.Framework.Input.Events;
+using osu.Framework.Platform;
 using osu.Framework.Platform.Windows;
 using osuTK;
 using osuTK.Graphics;
···
         [Resolved]
         private FrameworkConfigManager config { get; set; }
 
+        [Resolved]
+        private GameHost host { get; set; }
+
         [BackgroundDependencyLoader]
         private void load()
         {
···
             setRawInputConfig(false);
             AddToggleStep("Toggle ConfineMouseMode", setConfineMouseModeConfig);
             setConfineMouseModeConfig(false);
+            AddStep("Reset handlers", () => host.ResetInputHandlers());
         }
 
         private void setCursorSensivityConfig(double x)

osu.Framework/Platform/GameHost.cs

···
                     IsActive.BindTo(Window.IsActive);
                 }
 
-                resetInputHandlers();
+                initialiseInputHandlers();
 
                 threadRunner.Start();
 
···
             Logger.Storage = Storage.GetStorageForDirectory("logs");
         }
 
-        private void resetInputHandlers()
+        private void initialiseInputHandlers()
         {
-            if (AvailableInputHandlers != null)
-            {
-                foreach (var h in AvailableInputHandlers)
-                    h.Dispose();
-            }
-
             AvailableInputHandlers = CreateAvailableInputHandlers().ToImmutableArray();
 
+            // disable any ignored handlers before performing initialisation.
+            ignoredInputHandlers.TriggerChange();
+
             foreach (var handler in AvailableInputHandlers)
             {
+                (handler as IHasCursorSensitivity)?.Sensitivity.BindTo(cursorSensitivity);
+
+                if (!handler.Enabled.Value)
+                    continue;
+
                 if (!handler.Initialize(this))
                 {
                     handler.Enabled.Value = false;
-                    continue;
                 }
+            }
+        }
 
-                (handler as IHasCursorSensitivity)?.Sensitivity.BindTo(cursorSensitivity);
+        /// <summary>
+        /// Reset all input handlers' settings to a default state.
+        /// </summary>
+        public void ResetInputHandlers()
+        {
+            // disable any ignored handlers before performing initialisation.
+            ignoredInputHandlers.TriggerChange();
+
+            foreach (var handler in AvailableInputHandlers)
+            {
+                (handler as IHasCursorSensitivity)?.Sensitivity.SetDefault();
             }
         }
 
···
             {
                 var configIgnores = e.NewValue.Split(' ').Where(s => !string.IsNullOrWhiteSpace(s));
 
-                // for now, we always want at least one handler disabled (don't want raw and non-raw mouse at once).
-                // Todo: We renamed OpenTK to osuTK, the second condition can be removed after some time has passed
-                bool restoreDefaults = !configIgnores.Any() || e.NewValue.Contains("OpenTK");
-
-                if (restoreDefaults)
-                {
-                    resetInputHandlers();
-                    ignoredInputHandlers.Value = string.Join(' ', AvailableInputHandlers.Where(h => !h.Enabled.Value).Select(h => h.ToString()));
-                }
-                else
+                foreach (var handler in AvailableInputHandlers)
                 {
-                    foreach (var handler in AvailableInputHandlers)
-                    {
-                        var handlerType = handler.ToString();
-                        handler.Enabled.Value = configIgnores.All(ch => ch != handlerType);
-                    }
+                    var handlerType = handler.ToString();
+                    handler.Enabled.Value = configIgnores.All(ch => ch != handlerType);
                 }
             };