mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

input: make sure the devices get the resource destruction signal

Browse Source 
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
This commit is contained in:
Giulio Camuffo
2013-12-06 12:46:27 +01:00
committed by Kristian Høgsberg
parent c8f8dd894e
commit 65a07f8aef
1 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/input.c
+15 -13
View File
@@ -620,8 +620,6 @@ weston_pointer_set_focus(struct weston_pointer *pointer,
pointer->focus->surface->resource); 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); move_resources(&pointer->resource_list, focus_resource_list);
} }
@@ -650,18 +648,20 @@ weston_pointer_set_focus(struct weston_pointer *pointer,
} }
pointer->focus_serial = serial; pointer->focus_serial = serial;
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_remove(&pointer->focus_view_listener.link); wl_list_init(&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);
pointer->focus = view;
pointer->focus_view_listener.notify = pointer_focus_view_destroyed;
if (view) if (view)
wl_signal_add(&view->destroy_signal, &pointer->focus_view_listener); 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);
pointer->focus = view;
pointer->focus_view_listener.notify = pointer_focus_view_destroyed;
wl_signal_emit(&pointer->focus_signal, pointer); 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, wl_keyboard_send_leave(resource, serial,
keyboard->focus->resource); 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); move_resources(&keyboard->resource_list, focus_resource_list);
} }
@@ -718,9 +716,13 @@ weston_keyboard_set_focus(struct weston_keyboard *keyboard,
surface, surface,
serial); serial);
keyboard->focus_serial = 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, wl_resource_add_destroy_listener(surface->resource,
&keyboard->focus_resource_listener); &keyboard->focus_resource_listener);
}
keyboard->focus = surface; keyboard->focus = surface;
wl_signal_emit(&keyboard->focus_signal, keyboard); wl_signal_emit(&keyboard->focus_signal, keyboard);