From: xdavidwu <xdavidwuph@gmail.com>
Date: Fri, 17 Jan 2020 08:01:01 +0000 (+0800)
Subject: imwayland: Fix get_preedit_string cursor position
X-Git-Tag: archive/raspbian/4.4.1+ds1-2+rpi1^2~18^2~20^2~311^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=9576222b475129d3b178a1fac9b511976c9695b7;p=gtk4.git

imwayland: Fix get_preedit_string cursor position

GtkIMContext get_preedit_string should return cursor position counted
in characters, but cursor_begin here is counted in bytes. This add the
missing conversion.
---

diff --git a/gtk/gtkimcontextwayland.c b/gtk/gtkimcontextwayland.c
index 3344a68cad..4fcc2f9a01 100644
--- a/gtk/gtkimcontextwayland.c
+++ b/gtk/gtkimcontextwayland.c
@@ -592,7 +592,8 @@ gtk_im_context_wayland_get_preedit_string (GtkIMContext   *context,
   if (str)
     *str = g_strdup (preedit_str);
   if (cursor_pos)
-    *cursor_pos = context_wayland->current_preedit.cursor_begin;
+    *cursor_pos = g_utf8_strlen (preedit_str,
+                                 context_wayland->current_preedit.cursor_begin);
 
   if (attrs)
     {