From 4644521f8ccce4d55585d33bd8d4c7b822a12e40 Mon Sep 17 00:00:00 2001
From: ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com>
Date: Tue, 20 Jan 2026 11:41:45 +0100
Subject: Move call to fl_utf8_remove_context_dependent() to more appropriate
 place.

---
 src/Fl_x.cxx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Fl_x.cxx b/src/Fl_x.cxx
index 150438755..02ff2f5ed 100644
--- a/src/Fl_x.cxx
+++ b/src/Fl_x.cxx
@@ -1834,7 +1834,6 @@ int fl_handle(const XEvent& thisevent)
         Status status;
         len = XUtf8LookupString(Fl_X11_Screen_Driver::xim_ic, (XKeyPressedEvent *)&xevent.xkey,
                              kp_buffer, kp_buffer_len, &keysym, &status);
-        len = fl_utf8_remove_context_dependent(kp_buffer, len);
 
         while (status == XBufferOverflow && kp_buffer_len < 50000) {
           kp_buffer_len = kp_buffer_len * 5 + 1;
@@ -1842,6 +1841,7 @@ int fl_handle(const XEvent& thisevent)
           len = XUtf8LookupString(Fl_X11_Screen_Driver::xim_ic, (XKeyPressedEvent *)&xevent.xkey,
                              kp_buffer, kp_buffer_len, &keysym, &status);
         }
+        len = fl_utf8_remove_context_dependent(kp_buffer, len);
         keysym = fl_KeycodeToKeysym(fl_display, keycode, 0);
       } else {
         //static XComposeStatus compose;
-- 
cgit v1.2.3