From 65a07f8aef9538602792b33cb33fe856708173c0 Mon Sep 17 00:00:00 2001 From: Giulio Camuffo Date: Fri, 6 Dec 2013 12:46:27 +0100 Subject: [PATCH] input: make sure the devices get the resource destruction signal The device may not have a resource for the client yet, but install the listeners nevertheless. Fixes https://bugs.freedesktop.org/show_bug.cgi?id=65726 --- src/input.c | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/src/input.c b/src/input.c index e2910ea..f4944b6 100644 --- a/src/input.c +++ b/src/input.c @@ -620,8 +620,6 @@ weston_pointer_set_focus(struct weston_pointer *pointer, pointer->focus->surface->resource); } - wl_list_remove(&pointer->focus_resource_listener.link); - wl_list_init(&pointer->focus_resource_listener.link); move_resources(&pointer->resource_list, focus_resource_list); } @@ -650,18 +648,20 @@ weston_pointer_set_focus(struct weston_pointer *pointer, } pointer->focus_serial = serial; + } + + wl_list_remove(&pointer->focus_view_listener.link); + wl_list_init(&pointer->focus_view_listener.link); + wl_list_remove(&pointer->focus_resource_listener.link); + wl_list_init(&pointer->focus_resource_listener.link); + if (view) + wl_signal_add(&view->destroy_signal, &pointer->focus_view_listener); + if (view && view->surface->resource) wl_resource_add_destroy_listener(view->surface->resource, &pointer->focus_resource_listener); - } - if (!wl_list_empty(&pointer->focus_view_listener.link)) { - wl_list_remove(&pointer->focus_view_listener.link); - wl_list_init(&pointer->focus_view_listener.link); - } pointer->focus = view; pointer->focus_view_listener.notify = pointer_focus_view_destroyed; - if (view) - wl_signal_add(&view->destroy_signal, &pointer->focus_view_listener); wl_signal_emit(&pointer->focus_signal, pointer); } @@ -698,8 +698,6 @@ weston_keyboard_set_focus(struct weston_keyboard *keyboard, wl_keyboard_send_leave(resource, serial, keyboard->focus->resource); } - wl_list_remove(&keyboard->focus_resource_listener.link); - wl_list_init(&keyboard->focus_resource_listener.link); move_resources(&keyboard->resource_list, focus_resource_list); } @@ -718,9 +716,13 @@ weston_keyboard_set_focus(struct weston_keyboard *keyboard, surface, serial); keyboard->focus_serial = serial; + } + + wl_list_remove(&keyboard->focus_resource_listener.link); + wl_list_init(&keyboard->focus_resource_listener.link); + if (surface && surface->resource) wl_resource_add_destroy_listener(surface->resource, &keyboard->focus_resource_listener); - } keyboard->focus = surface; wl_signal_emit(&keyboard->focus_signal, keyboard); -- 2.7.4