isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-24 17:10:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

wayland: Avoid clutter_input_focus method calls when unfocused

Browse Source 
If text_input_enable() is called when there no active IM (eg. running plain
mutter), some ClutterInputFocus method calls that are not allowed while
unfocused will end up called, triggering critical warnings.

If there is no IM return early here, all other calls are superfluous then.
This commit is contained in:
Carlos Garnacho 2018-02-11 22:04:30 +01:00
parent 37aab9280a
commit 6934b83f44
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -301,6 +301,8 @@ text_input_enable (struct wl_client *client,
input_method = clutter_backend_get_input_method (clutter_get_default_backend ()); input_method = clutter_backend_get_input_method (clutter_get_default_backend ());
if (input_method) if (input_method)
clutter_input_method_focus_in (input_method, focus); clutter_input_method_focus_in (input_method, focus);
else
return;
} }
show_preedit = (flags & GTK_TEXT_INPUT_ENABLE_FLAGS_CAN_SHOW_PREEDIT) != 0; show_preedit = (flags & GTK_TEXT_INPUT_ENABLE_FLAGS_CAN_SHOW_PREEDIT) != 0;