Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

imwayland: Be careful about cursor positions

Browse Source 
We don't want to hand out cursor positions based on
the original preedit text and then tweak the text to
be different.
This commit is contained in:
Matthias Clasen
2021-02-18 15:33:01 -05:00
parent 07295ac169
commit 3ee5354e0f
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
gtk/gtkimcontextwayland.c
View File

@@ -609,7 +609,7 @@ gtk_im_context_wayland_get_preedit_string (GtkIMContext *context,
int *cursor_pos)
{
GtkIMContextWayland *context_wayland = GTK_IM_CONTEXT_WAYLAND (context);
const char *preedit_str;
char *preedit_str;
if (attrs)
*attrs = NULL;
@@ -628,10 +628,8 @@ gtk_im_context_wayland_get_preedit_string (GtkIMContext *context,
}
preedit_str =
context_wayland->current_preedit.text ? context_wayland->current_preedit.text : "";
tweak_preedit (context_wayland->current_preedit.text ? context_wayland->current_preedit.text : "");
if (str)
*str = tweak_preedit (preedit_str);
if (cursor_pos)
*cursor_pos = g_utf8_strlen (preedit_str,
context_wayland->current_preedit.cursor_begin);
@@ -665,6 +663,10 @@ gtk_im_context_wayland_get_preedit_string (GtkIMContext *context,
pango_attr_list_insert (*attrs, cursor);
}
}
if (str)
*str = preedit_str;
else
g_free (preedit_str);
}
static gboolean