[gtk/unintrusive-compose-preedit-3: 2/2] imwayland: Tweak preedit text

[Matthias Clasen <matthiasc src gnome org>]

commit f8206f18b1c1c311174795cea9afdc20ba76a5bb
Author: Matthias Clasen <mclasen redhat com>
Date:   Thu Feb 18 13:14:31 2021 -0500

    imwayland: Tweak preedit text
    
    Tweak the preedit text we get from IBus (via the compositor) to
    match what GtkIMContextSimple produces for Compose sequences now.
    
    This provides a unified experience.

 modules/input/imwayland.c | 35 ++++++++++++++++++++++++++++++++++-
 1 file changed, 34 insertions(+), 1 deletion(-)
---
diff --git a/modules/input/imwayland.c b/modules/input/imwayland.c
index 87c4ae806f..a9bddd29bb 100644
--- a/modules/input/imwayland.c
+++ b/modules/input/imwayland.c
@@ -483,6 +483,39 @@ gtk_im_context_wayland_finalize (GObject *object)
   G_OBJECT_CLASS (parent_class)->finalize (object);
 }
 
+/* We want a unified experience between GtkIMContextSimple and IBus / Wayland
+ * when it comes to Compose sequences. IBus initial implementation of preedit
+ * for Compose sequences shows U+2384, which has been described as 'distracting'.
+ * This function tries to detect this case, and tweaks the text to match what
+ * GtkIMContextSimple produces.
+ */
+static char *
+tweak_preedit (const char *text)
+{
+  GString *s;
+  guint len;
+
+  s = g_string_new ("");
+
+  len = g_utf8_strlen (text, -1);
+
+  for (const char *p = text; *p; p = g_utf8_next_char (p))
+    {
+      gunichar ch = g_utf8_get_char (p);
+
+      if (ch == 0x2384)
+        {
+          if (len == 1 || p > text)
+            g_string_append (s, "·");
+        }
+      else
+        g_string_append_unichar (s, ch);
+    }
+
+  return g_string_free (s, FALSE);
+}
+
+
 static void
 gtk_im_context_wayland_get_preedit_string (GtkIMContext   *context,
                                            gchar         **str,
@@ -512,7 +545,7 @@ gtk_im_context_wayland_get_preedit_string (GtkIMContext   *context,
     context_wayland->current_preedit.text ? context_wayland->current_preedit.text : "";
 
   if (str)
-    *str = g_strdup (preedit_str);
+    *str = tweak_preedit (preedit_str);
   if (cursor_pos)
     *cursor_pos = g_utf8_strlen (preedit_str,
                                  context_wayland->current_preedit.cursor_begin);