fdo-mirrors/weston
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/weston.git synced 2025-12-21 20:20:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

input: Do not override keyboard focus on restore

Browse source 
If we start a special (grabbing) client when Weston is unfocused, it
would lose focus when coming back to Weston.

Signed-off-by: Quentin Glidic <sardemff7+git@sardemff7.net>
Reviewed-by: Daniel Stone <daniels@collabora.com>
This commit is contained in:
Quentin Glidic 2017-07-21 14:02:40 +02:00 • committed by Daniel Stone
parent b9906aaead
commit 85d55540cb
1 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
libweston/input.c
View file

@ -1336,6 +1336,7 @@ WL_EXPORT void
weston_keyboard_set_focus(struct weston_keyboard *keyboard, weston_keyboard_set_focus(struct weston_keyboard *keyboard,
struct weston_surface *surface) struct weston_surface *surface)
{ {
struct weston_seat *seat = keyboard->seat;
struct wl_resource *resource; struct wl_resource *resource;
struct wl_display *display = keyboard->seat->compositor->wl_display; struct wl_display *display = keyboard->seat->compositor->wl_display;
uint32_t serial; uint32_t serial;
@ -1369,6 +1370,11 @@ weston_keyboard_set_focus(struct weston_keyboard *keyboard,
keyboard->focus_serial = serial; keyboard->focus_serial = serial;
} }
if (seat->saved_kbd_focus) {
wl_list_remove(&seat->saved_kbd_focus_listener.link);
seat->saved_kbd_focus = NULL;
}
wl_list_remove(&keyboard->focus_resource_listener.link); wl_list_remove(&keyboard->focus_resource_listener.link);
wl_list_init(&keyboard->focus_resource_listener.link); wl_list_init(&keyboard->focus_resource_listener.link);
if (surface && surface->resource) if (surface && surface->resource)
@ -2060,11 +2066,8 @@ notify_keyboard_focus_in(struct weston_seat *seat, struct wl_array *keys,
} }
surface = seat->saved_kbd_focus; surface = seat->saved_kbd_focus;
if (surface) { if (surface) {
wl_list_remove(&seat->saved_kbd_focus_listener.link);
weston_keyboard_set_focus(keyboard, surface); weston_keyboard_set_focus(keyboard, surface);
seat->saved_kbd_focus = NULL;
} }
} }
@ -2074,6 +2077,7 @@ notify_keyboard_focus_out(struct weston_seat *seat)
struct weston_compositor *compositor = seat->compositor; struct weston_compositor *compositor = seat->compositor;
struct weston_keyboard *keyboard = weston_seat_get_keyboard(seat); struct weston_keyboard *keyboard = weston_seat_get_keyboard(seat);
struct weston_pointer *pointer = weston_seat_get_pointer(seat); struct weston_pointer *pointer = weston_seat_get_pointer(seat);
struct weston_surface *focus = keyboard->focus;
uint32_t *k, serial; uint32_t *k, serial;
serial = wl_display_next_serial(compositor->wl_display); serial = wl_display_next_serial(compositor->wl_display);
@ -2085,18 +2089,18 @@ notify_keyboard_focus_out(struct weston_seat *seat)
seat->modifier_state = 0; seat->modifier_state = 0;
if (keyboard->focus) {
seat->saved_kbd_focus = keyboard->focus;
seat->saved_kbd_focus_listener.notify =
destroy_device_saved_kbd_focus;
wl_signal_add(&keyboard->focus->destroy_signal,
&seat->saved_kbd_focus_listener);
}
weston_keyboard_set_focus(keyboard, NULL); weston_keyboard_set_focus(keyboard, NULL);
weston_keyboard_cancel_grab(keyboard); weston_keyboard_cancel_grab(keyboard);
if (pointer) if (pointer)
weston_pointer_cancel_grab(pointer); weston_pointer_cancel_grab(pointer);
if (focus) {
seat->saved_kbd_focus = focus;
seat->saved_kbd_focus_listener.notify =
destroy_device_saved_kbd_focus;
wl_signal_add(&focus->destroy_signal,
&seat->saved_kbd_focus_listener);
}
} }
WL_EXPORT void WL_EXPORT void