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

wayland/text-input: Reset focus state when destroying text_input

Browse Source 
When closing some wayland apps using text-input-v3, text_input_destructor
could remove resource in focus_resource_list without resetting focus.

This could be an issue if, the focus is on a wayland app not using text-
input-v3 after closing those. Text committing would fail, and the
candidate window would always show on previous entry.

This commit adds check in text_input_destructor, resetting focus if
necessary.

Closes: https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/4776
Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/4164>
This commit is contained in:
Keyu Tao 2025-02-21 17:44:13 +08:00 committed by Marge Bot
parent 54c606ed8e
commit 57698c2689
1 changed files with 24 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -378,6 +378,27 @@ move_resources_for_client (struct wl_list *destination,
} }
} }
static void
reset_text_input_focus (MetaWaylandTextInput *text_input)
{
if (wl_list_empty (&text_input->focus_resource_list))
{
ClutterInputFocus *focus = text_input->input_focus;
MetaBackend *backend = backend_from_text_input (text_input);
ClutterBackend *clutter_backend =
meta_backend_get_clutter_backend (backend);
ClutterInputMethod *input_method;
if (clutter_input_focus_is_focused (focus))
{
input_method = clutter_backend_get_input_method (clutter_backend);
clutter_input_focus_reset (focus);
meta_wayland_text_input_focus_flush_done (focus);
clutter_input_method_focus_out (input_method);
}
}
}
void void
meta_wayland_text_input_set_focus (MetaWaylandTextInput *text_input, meta_wayland_text_input_set_focus (MetaWaylandTextInput *text_input,
MetaWaylandSurface *surface) MetaWaylandSurface *surface)
@ -391,21 +412,8 @@ meta_wayland_text_input_set_focus (MetaWaylandTextInput *text_input,
{ {
if (!wl_list_empty (&text_input->focus_resource_list)) if (!wl_list_empty (&text_input->focus_resource_list))
{ {
ClutterInputFocus *focus = text_input->input_focus;
MetaBackend *backend = backend_from_text_input (text_input);
ClutterBackend *clutter_backend =
meta_backend_get_clutter_backend (backend);
ClutterInputMethod *input_method;
struct wl_resource *resource; struct wl_resource *resource;
if (clutter_input_focus_is_focused (focus))
{
input_method = clutter_backend_get_input_method (clutter_backend);
clutter_input_focus_reset (focus);
meta_wayland_text_input_focus_flush_done (focus);
clutter_input_method_focus_out (input_method);
}
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_leave (resource, zwp_text_input_v3_send_leave (resource,
@ -414,6 +422,8 @@ meta_wayland_text_input_set_focus (MetaWaylandTextInput *text_input,
move_resources (&text_input->resource_list, move_resources (&text_input->resource_list,
&text_input->focus_resource_list); &text_input->focus_resource_list);
reset_text_input_focus (text_input);
} }
wl_list_remove (&text_input->surface_listener.link); wl_list_remove (&text_input->surface_listener.link);
@ -459,6 +469,7 @@ text_input_destructor (struct wl_resource *resource)
g_hash_table_remove (text_input->resource_serials, resource); g_hash_table_remove (text_input->resource_serials, resource);
wl_list_remove (wl_resource_get_link (resource)); wl_list_remove (wl_resource_get_link (resource));
reset_text_input_focus (text_input);
} }
static void static void