AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-11-12 20:00:09 +00:00
Code Issues Projects Releases Wiki Activity

gtkimcontextwayland: Convert byte based offset to char based offset in delete_surrounding_text

Browse Source 
ClutterInputFocus/GtkIMContext uses char based offset for
delete_surrounding, however, text_input_v3 uses byte based offset for
it. Currently only GTK with mutter can work correctly via text_input_v3
because they both forget to convert between char based offset and byte
based offset.

This commit fixes it in GTK by converting byte based offset to char
based offset with the UTF-8 encoded surrounding text.

Fixes <https://gitlab.gnome.org/GNOME/gtk/-/issues/4566>.
This commit is contained in:
Alynx Zhou 2022-11-24 18:35:47 +08:00
parent 6af43f823e
commit 9651546b97
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
modules/input/imwayland.c
View File

@ -237,14 +237,24 @@ text_input_delete_surrounding_text (void *data,
{
GtkIMContextWaylandGlobal *global = data;
GtkIMContextWayland *context;
char *cursor_pointer;
uint32_t char_before_length;
uint32_t char_after_length;
if (!global->current)
return;
context = GTK_IM_CONTEXT_WAYLAND (global->current);
context->pending_surrounding_delete.before_length = before_length;
context->pending_surrounding_delete.after_length = after_length;
/* We already got byte lengths from text_input_v3, but GTK uses char lengths
* for delete_surrounding, So convert it here.
*/
cursor_pointer = context->surrounding.text + context->surrounding.cursor_idx;
char_before_length = g_utf8_pointer_to_offset (cursor_pointer - before_length, cursor_pointer);
char_after_length = g_utf8_pointer_to_offset (cursor_pointer, cursor_pointer + after_length);
context->pending_surrounding_delete.before_length = char_before_length;
context->pending_surrounding_delete.after_length = char_after_length;
}
static void