From: Matthias Clasen <mclasen@redhat.com>
Date: Thu, 18 Feb 2021 03:57:41 +0000 (-0500)
Subject: imwayland: Return limited preedit attributes
X-Git-Tag: archive/raspbian/4.4.1+ds1-2+rpi1~1^2~83^2^2~393^2~1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=da71a379457ede018308ad0ce7605d90586a9f3b;p=gtk4.git

imwayland: Return limited preedit attributes

It should not matter, but it is the right thing to
do to limit the preedit attributes to the length
of the preedit text.
---

diff --git a/gtk/gtkimcontextwayland.c b/gtk/gtkimcontextwayland.c
index c5e0093584..915ad9e854 100644
--- a/gtk/gtkimcontextwayland.c
+++ b/gtk/gtkimcontextwayland.c
@@ -606,13 +606,23 @@ gtk_im_context_wayland_get_preedit_string (GtkIMContext   *context,
 
   if (attrs)
     {
+      PangoAttribute *attr;
+      guint len = strlen (preedit_str);
+
       if (!*attrs)
         *attrs = pango_attr_list_new ();
-      pango_attr_list_insert (*attrs,
-                              pango_attr_underline_new (PANGO_UNDERLINE_SINGLE));
+
+      attr = pango_attr_underline_new (PANGO_UNDERLINE_SINGLE);
+      attr->start_index = 0;
+      attr->end_index = len;
+      pango_attr_list_insert (*attrs, attr);
+
       /* enable fallback, since IBus will send us things like ⎄ */
-      pango_attr_list_insert (*attrs,
-                              pango_attr_fallback_new (TRUE));
+      attr = pango_attr_fallback_new (TRUE);
+      attr->start_index = 0;
+      attr->end_index = len;
+      pango_attr_list_insert (*attrs, attr);
+
       if (context_wayland->current_preedit.cursor_begin
           != context_wayland->current_preedit.cursor_end)
         {