hyprwm/wlroots-hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/wlroots-hyprland.git synced 2024-11-22 21:05:58 +01:00
Code Issues Projects Releases Packages Wiki Activity

seat: fix keyboard/pointer/touch resource destroy

Browse source 
We need to always unlink the resource, even if it's already inert.
seat_client_destroy_*() may be called multiple times on the same
resource.

Closes: https://gitlab.freedesktop.org/wlroots/wlroots/-/issues/3638
This commit is contained in:
Simon Ser 2023-06-15 15:14:35 +02:00
parent c4d4409deb
commit 1e68e1f661
3 changed files with 0 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
types/seat/wlr_seat_keyboard.c
View file

@ -473,11 +473,6 @@ void seat_client_create_inert_keyboard(struct wl_client *client,
} }
void seat_client_destroy_keyboard(struct wl_resource *resource) { void seat_client_destroy_keyboard(struct wl_resource *resource) {
struct wlr_seat_client *seat_client =
seat_client_from_keyboard_resource(resource);
if (seat_client == NULL) {
return;
}
wl_list_remove(wl_resource_get_link(resource)); wl_list_remove(wl_resource_get_link(resource));
wl_list_init(wl_resource_get_link(resource)); wl_list_init(wl_resource_get_link(resource));
wl_resource_set_user_data(resource, NULL); wl_resource_set_user_data(resource, NULL);

5
types/seat/wlr_seat_pointer.c
View file

@ -553,11 +553,6 @@ void seat_client_create_inert_pointer(struct wl_client *client,
} }
void seat_client_destroy_pointer(struct wl_resource *resource) { void seat_client_destroy_pointer(struct wl_resource *resource) {
struct wlr_seat_client *seat_client =
wlr_seat_client_from_pointer_resource(resource);
if (seat_client == NULL) {
return;
}
wl_list_remove(wl_resource_get_link(resource)); wl_list_remove(wl_resource_get_link(resource));
wl_list_init(wl_resource_get_link(resource)); wl_list_init(wl_resource_get_link(resource));
wl_resource_set_user_data(resource, NULL); wl_resource_set_user_data(resource, NULL);

5
types/seat/wlr_seat_touch.c
View file

@ -454,11 +454,6 @@ void seat_client_create_inert_touch(struct wl_client *client, uint32_t version,
} }
void seat_client_destroy_touch(struct wl_resource *resource) { void seat_client_destroy_touch(struct wl_resource *resource) {
struct wlr_seat_client *seat_client =
seat_client_from_touch_resource(resource);
if (seat_client == NULL) {
return;
}
wl_list_remove(wl_resource_get_link(resource)); wl_list_remove(wl_resource_get_link(resource));
wl_list_init(wl_resource_get_link(resource)); wl_list_init(wl_resource_get_link(resource));
wl_resource_set_user_data(resource, NULL); wl_resource_set_user_data(resource, NULL);