Disable moving mouse cursor to pen position only on Linux SDL3

Author: hwsmm

osu.Framework/Input/Handlers/INeedsMousePositionFeedback.cs

@@ -14,8 +14,7 @@ public interface INeedsMousePositionFeedback
         /// Receives the final mouse position from an <see cref="InputManager"/>.
         /// </summary>
         /// <param name="position">The final mouse position.</param>
-        /// <param name="isSelfFeedback">Whether the feedback was triggered from this handler.</param>
-        /// <param name="isOsCursor">Whether the position represents OS cursor.</param>
-        void FeedbackMousePositionChange(Vector2 position, bool isSelfFeedback, bool isOsCursor);
+        /// <param name="handler">A handler that reported the final mouse position.</param>
+        void FeedbackMousePositionChange(Vector2 position, InputHandler handler);
     }
 }

osu.Framework/Input/Handlers/InputHandler.cs

@@ -32,8 +32,6 @@ public abstract class InputHandler : IDisposable, IHasDescription
 
         private bool isInitialized;
 
-        public virtual bool IsOsCursor => false;
-
         /// <summary>
         /// Used to initialize resources specific to this InputHandler. It gets called once.
         /// </summary>

osu.Framework/Input/Handlers/Mouse/MouseHandler.cs

@@ -5,7 +5,9 @@
 
 using System.Diagnostics;
 using osu.Framework.Bindables;
+using osu.Framework.Configuration;
 using osu.Framework.Extensions.EnumExtensions;
+using osu.Framework.Input.Handlers.Pen;
 using osu.Framework.Input.StateChanges;
 using osu.Framework.Platform;
 using osu.Framework.Statistics;
@@ -37,8 +39,6 @@ public class MouseHandler : InputHandler, IHasCursorSensitivity, INeedsMousePosi
             Precision = 0.01
         };
 
-        public override bool IsOsCursor => true;
-
         public override string Description => "Mouse";
 
         public override bool IsActive => true;
@@ -139,12 +139,16 @@ public override bool Initialize(GameHost host)
             return true;
         }
 
-        public virtual void FeedbackMousePositionChange(Vector2 position, bool isSelfFeedback, bool isOsCursor)
+        public virtual void FeedbackMousePositionChange(Vector2 position, InputHandler handler)
         {
             if (!Enabled.Value)
                 return;
 
-            if (!isSelfFeedback && !isOsCursor && isActive.Value)
+            // https://github.com/ppy/osu/issues/31948
+            // Pen malfunctions if MouseHandler tries to move the mouse cursor to pen position on Linux/X11.
+            bool disableUpdatingMousePosition = handler is PenHandler && RuntimeInfo.OS == RuntimeInfo.Platform.Linux && FrameworkEnvironment.UseSDL3;
+
+            if (handler != this && isActive.Value && !disableUpdatingMousePosition)
                 // if another handler has updated the cursor position, handle updating the OS cursor so we can seamlessly revert
                 // to mouse control at any point.
                 window.UpdateMousePosition(position);

osu.Framework/Input/Handlers/Pen/PenHandler.cs

@@ -16,8 +16,6 @@ public class PenHandler : InputHandler
     {
         private static readonly GlobalStatistic<ulong> statistic_total_events = GlobalStatistics.Get<ulong>(StatisticGroupFor<PenHandler>(), "Total events");
 
-        public override bool IsOsCursor => true;
-
         public override bool IsActive => true;
 
         public override bool Initialize(GameHost host)

osu.Framework/Input/InputManager.cs

@@ -964,7 +964,7 @@ protected virtual void HandleMousePositionChange(MousePositionChangeEvent e)
             foreach (var h in InputHandlers)
             {
                 if (h.Enabled.Value && h is INeedsMousePositionFeedback handler)
-                    handler.FeedbackMousePositionChange(mouse.Position, h == mouseSource, mouseSource.IsOsCursor);
+                    handler.FeedbackMousePositionChange(mouse.Position, mouseSource);
             }
 
             handleMouseMove(state, e.LastPosition);

osu.Framework/Platform/Windows/WindowsMouseHandler.cs

@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Runtime.Versioning;
+using osu.Framework.Input.Handlers;
 using osu.Framework.Input.Handlers.Mouse;
 using osuTK;
 
@@ -31,10 +32,10 @@ public override bool Initialize(GameHost host)
             return base.Initialize(host);
         }
 
-        public override void FeedbackMousePositionChange(Vector2 position, bool isSelfFeedback, bool isOsCursor)
+        public override void FeedbackMousePositionChange(Vector2 position, InputHandler handler)
         {
             window.LastMousePosition = position;
-            base.FeedbackMousePositionChange(position, isSelfFeedback, isOsCursor);
+            base.FeedbackMousePositionChange(position, handler);
         }
     }
 }