brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wayland: Always update preedit with text_input.done()

Browse Source 
Compensate the protocol statelessness with our ClutterInputFocus
statefulness. This becomes more necessary now, since sending
consecutive .done() events is now considered acceptable behavior.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2365>
This commit is contained in:
Carlos Garnacho 2022-04-06 13:28:46 +02:00 committed by Marge Bot
parent 43ae37a93e
commit be2a1d85a5
1 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/wayland/meta-wayland-text-input.c
View File

@ -73,6 +73,13 @@ struct _MetaWaylandTextInput
uint32_t text_change_cause; uint32_t text_change_cause;
gboolean enabled; gboolean enabled;
struct
{
char *string;
uint32_t cursor;
uint32_t anchor;
} preedit;
guint done_idle_id; guint done_idle_id;
}; };
@ -128,6 +135,10 @@ clutter_input_focus_send_done (ClutterInputFocus *focus)
wl_resource_for_each (resource, &text_input->focus_resource_list) wl_resource_for_each (resource, &text_input->focus_resource_list)
{ {
zwp_text_input_v3_send_preedit_string (resource,
text_input->preedit.string,
text_input->preedit.cursor,
text_input->preedit.anchor);
zwp_text_input_v3_send_done (resource, zwp_text_input_v3_send_done (resource,
lookup_serial (text_input, resource)); lookup_serial (text_input, resource));
} }
@ -233,7 +244,6 @@ meta_wayland_text_input_focus_set_preedit_text (ClutterInputFocus *focus,
guint cursor) guint cursor)
{ {
MetaWaylandTextInput *text_input; MetaWaylandTextInput *text_input;
struct wl_resource *resource;
gsize pos = 0; gsize pos = 0;
text_input = META_WAYLAND_TEXT_INPUT_FOCUS (focus)->text_input; text_input = META_WAYLAND_TEXT_INPUT_FOCUS (focus)->text_input;
@ -241,10 +251,14 @@ meta_wayland_text_input_focus_set_preedit_text (ClutterInputFocus *focus,
if (text) if (text)
pos = g_utf8_offset_to_pointer (text, cursor) - text; pos = g_utf8_offset_to_pointer (text, cursor) - text;
wl_resource_for_each (resource, &text_input->focus_resource_list) g_clear_pointer (&text_input->preedit.string, g_free);
{ text_input->preedit.string = g_strdup (text);
zwp_text_input_v3_send_preedit_string (resource, text, pos, pos);
} if (text)
pos = g_utf8_offset_to_pointer (text, cursor) - text;
text_input->preedit.cursor = pos;
text_input->preedit.anchor = pos;
meta_wayland_text_input_focus_defer_done (focus); meta_wayland_text_input_focus_defer_done (focus);
} }
@ -662,6 +676,8 @@ meta_wayland_text_input_destroy (MetaWaylandTextInput *text_input)
meta_wayland_text_input_set_focus (text_input, NULL); meta_wayland_text_input_set_focus (text_input, NULL);
g_object_unref (text_input->input_focus); g_object_unref (text_input->input_focus);
g_hash_table_destroy (text_input->resource_serials); g_hash_table_destroy (text_input->resource_serials);
g_clear_pointer (&text_input->preedit.string, g_free);
g_clear_pointer (&text_input->surrounding.text, g_free);
g_free (text_input); g_free (text_input);
} }