Properly block SDL IME results sent as multiple text events + upstream SDL fixes

osu.Framework/Platform/SDL2DesktopWindow.cs

@@ -231,8 +231,15 @@ public RectangleF? CursorConfineRect
 
         private const int default_icon_size = 256;
 
+        /// <summary>
+        /// Scheduler for actions to run before the next event loop.
+        /// </summary>
         private readonly Scheduler commandScheduler = new Scheduler();
-        private readonly Scheduler eventScheduler = new Scheduler();
+
+        /// <summary>
+        /// Scheduler for actions to run at the end of the current event loop.
+        /// </summary>
+        protected readonly Scheduler EventScheduler = new Scheduler();
 
         private readonly Dictionary<int, SDL2ControllerBindings> controllers = new Dictionary<int, SDL2ControllerBindings>();
 
@@ -543,7 +550,7 @@ public void Run()
                 if (!cursorInWindow.Value)
                     pollMouse();
 
-                eventScheduler.Update();
+                EventScheduler.Update();
 
                 Update?.Invoke();
             }
@@ -570,7 +577,7 @@ private void updateWindowSize()
 
             // This function may be invoked before the SDL internal states are all changed. (as documented here: https://wiki.libsdl.org/SDL_SetEventFilter)
             // Scheduling the store to config until after the event poll has run will ensure the window is in the correct state.
-            eventScheduler.AddOnce(storeWindowSizeToConfig);
+            EventScheduler.AddOnce(storeWindowSizeToConfig);
         }
 
         /// <summary>
@@ -689,7 +696,7 @@ public void SetTextInputRect(RectangleF rect) => ScheduleCommand(() =>
         /// Adds an <see cref="Action"/> to the <see cref="Scheduler"/> expected to handle event callbacks.
         /// </summary>
         /// <param name="action">The <see cref="Action"/> to execute.</param>
-        protected void ScheduleEvent(Action action) => eventScheduler.Add(action, false);
+        protected void ScheduleEvent(Action action) => EventScheduler.Add(action, false);
 
         protected void ScheduleCommand(Action action) => commandScheduler.Add(action, false);
 

osu.Framework/Platform/Windows/WindowsWindow.cs

@@ -4,6 +4,7 @@
 using System;
 using System.Drawing;
 using System.Runtime.InteropServices;
+using JetBrains.Annotations;
 using osu.Framework.Input.Handlers.Mouse;
 using osu.Framework.Platform.SDL2;
 using osu.Framework.Platform.Windows.Native;
@@ -105,12 +106,18 @@ public override void StartTextInput(bool allowIme)
 
         public override void ResetIme() => ScheduleCommand(() => Imm.CancelComposition(WindowHandle));
 
-        protected override void HandleTextInputEvent(SDL.SDL_TextInputEvent evtText)
+        protected override unsafe void HandleTextInputEvent(SDL.SDL_TextInputEvent evtText)
         {
-            // block SDL text input if there was a recent result from `handleImeMessage()`.
-            if (recentImeResult)
+            if (!SDL2Extensions.TryGetStringFromBytePointer(evtText.text, out string sdlResult))
+                return;
+
+            // Block SDL text input if it was already handled by `handleImeMessage()`.
+            // SDL truncates text over 32 bytes and sends it as multiple events.
+            // We assume these events will be handled in the same `pollSDLEvents()` call.
+            if (lastImeResult?.Contains(sdlResult) == true)
             {
-                recentImeResult = false;
+                // clear the result after this SDL event loop finishes so normal text input isn't blocked.
+                EventScheduler.AddOnce(() => lastImeResult = null);
                 return;
             }
 
@@ -132,10 +139,14 @@ protected override void HandleTextEditingEvent(SDL.SDL_TextEditingEvent evtEdit)
         private bool imeCompositionActive;
 
         /// <summary>
-        /// Whether an IME result was recently posted.
+        /// The last IME result.
         /// </summary>
-        /// <remarks>Used for blocking SDL IME results since we handle those ourselves.</remarks>
-        private bool recentImeResult;
+        /// <remarks>
+        /// Used for blocking SDL IME results since we handle those ourselves.
+        /// Cleared when the SDL events are blocked.
+        /// </remarks>
+        [CanBeNull]
+        private string lastImeResult;
 
         private void handleImeMessage(IntPtr hWnd, uint uMsg, long lParam)
         {
@@ -151,7 +162,7 @@ private void handleImeMessage(IntPtr hWnd, uint uMsg, long lParam)
                     {
                         if (inputContext.TryGetImeResult(out string resultText))
                         {
-                            recentImeResult = true;
+                            lastImeResult = resultText;
                             ScheduleEvent(() => TriggerTextInput(resultText));
                         }