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

seat: Allow binding to inert seats

Browse source 
If a seat is destroyed while a client is trying to bind it, wlroots
needs to create an inert seat resource instead of crashing.
This commit is contained in:
Väinö Mäkelä 2023-06-01 10:05:46 +03:00 committed by Simon Ser
parent 52b93f7eb4
commit 0e5f76186e
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
types/seat/wlr_seat.c
View file

@ -176,8 +176,9 @@ static struct wlr_seat_client *seat_client_create(struct wlr_seat *wlr_seat,
static void seat_handle_bind(struct wl_client *client, void *_wlr_seat, static void seat_handle_bind(struct wl_client *client, void *_wlr_seat,
uint32_t version, uint32_t id) { uint32_t version, uint32_t id) {
// `wlr_seat` can be NULL if the seat global is being destroyed
struct wlr_seat *wlr_seat = _wlr_seat; struct wlr_seat *wlr_seat = _wlr_seat;
assert(client && wlr_seat); assert(client);
struct wl_resource *wl_resource = struct wl_resource *wl_resource =
wl_resource_create(client, &wl_seat_interface, version, id); wl_resource_create(client, &wl_seat_interface, version, id);
@ -185,6 +186,12 @@ static void seat_handle_bind(struct wl_client *client, void *_wlr_seat,
wl_client_post_no_memory(client); wl_client_post_no_memory(client);
return; return;
} }
wl_resource_set_implementation(wl_resource, &seat_impl, NULL,
seat_client_handle_resource_destroy);
wl_list_init(wl_resource_get_link(wl_resource));
if (wlr_seat == NULL) {
return;
}
struct wlr_seat_client *seat_client = struct wlr_seat_client *seat_client =
wlr_seat_client_for_wl_client(wlr_seat, client); wlr_seat_client_for_wl_client(wlr_seat, client);
@ -198,8 +205,7 @@ static void seat_handle_bind(struct wl_client *client, void *_wlr_seat,
return; return;
} }
wl_resource_set_implementation(wl_resource, &seat_impl, wl_resource_set_user_data(wl_resource, seat_client);
seat_client, seat_client_handle_resource_destroy);
wl_list_insert(&seat_client->resources, wl_resource_get_link(wl_resource)); wl_list_insert(&seat_client->resources, wl_resource_get_link(wl_resource));
if (version >= WL_SEAT_NAME_SINCE_VERSION) { if (version >= WL_SEAT_NAME_SINCE_VERSION) {
wl_seat_send_name(wl_resource, wlr_seat->name); wl_seat_send_name(wl_resource, wlr_seat->name);