blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Destroy layer surfaces on client destroyed

This commit is contained in:
Drew DeVault 2018-03-29 16:30:09 -04:00
parent b887af9a60
commit 4137d9fc80
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/wlr/types/wlr_layer_shell.h
View File

@ -22,6 +22,7 @@
struct wlr_layer_shell { struct wlr_layer_shell {
struct wl_global *wl_global; struct wl_global *wl_global;
struct wl_list client_resources; // wl_resource struct wl_list client_resources; // wl_resource
struct wl_list surfaces; // wl_layer_surface
struct wl_listener display_destroy; struct wl_listener display_destroy;
@ -50,6 +51,7 @@ struct wlr_layer_surface_configure {
}; };
struct wlr_layer_surface { struct wlr_layer_surface {
struct wl_list link; // wlr_layer_shell::surfaces
struct wlr_surface *surface; struct wlr_surface *surface;
struct wlr_output *output; struct wlr_output *output;
struct wl_resource *resource; struct wl_resource *resource;

9
types/wlr_layer_shell.c
View File

@ -159,7 +159,9 @@ static void layer_surface_destroy(struct wlr_layer_surface *surface) {
wlr_signal_emit_safe(&surface->events.destroy, surface); wlr_signal_emit_safe(&surface->events.destroy, surface);
wl_resource_set_user_data(surface->resource, NULL); wl_resource_set_user_data(surface->resource, NULL);
wl_list_remove(&surface->surface_destroy_listener.link); wl_list_remove(&surface->surface_destroy_listener.link);
wl_list_init(&surface->surface_destroy_listener.link);
wlr_surface_set_role_committed(surface->surface, NULL, NULL); wlr_surface_set_role_committed(surface->surface, NULL, NULL);
wl_list_remove(&surface->link);
free(surface); free(surface);
} }
@ -343,6 +345,7 @@ static void layer_shell_handle_get_layer_surface(struct wl_client *wl_client,
surface, surface->resource); surface, surface->resource);
wl_resource_set_implementation(surface->resource, wl_resource_set_implementation(surface->resource,
&layer_surface_implementation, surface, layer_surface_resource_destroy); &layer_surface_implementation, surface, layer_surface_resource_destroy);
wl_list_insert(&shell->surfaces, &surface->link);
} }
static const struct zwlr_layer_shell_v1_interface layer_shell_implementation = { static const struct zwlr_layer_shell_v1_interface layer_shell_implementation = {
@ -350,6 +353,11 @@ static const struct zwlr_layer_shell_v1_interface layer_shell_implementation = {
}; };
static void client_handle_destroy(struct wl_resource *resource) { static void client_handle_destroy(struct wl_resource *resource) {
struct wlr_layer_shell *shell = layer_shell_from_resource(resource);
struct wlr_layer_surface *surface, *tmp = NULL;
wl_list_for_each_safe(surface, tmp, &shell->surfaces, link) {
layer_surface_destroy(surface);
}
wl_list_remove(wl_resource_get_link(resource)); wl_list_remove(wl_resource_get_link(resource));
} }
@ -384,6 +392,7 @@ struct wlr_layer_shell *wlr_layer_shell_create(struct wl_display *display) {
} }
wl_list_init(&layer_shell->client_resources); wl_list_init(&layer_shell->client_resources);
wl_list_init(&layer_shell->surfaces);
struct wl_global *wl_global = wl_global_create(display, struct wl_global *wl_global = wl_global_create(display,
&zwlr_layer_shell_v1_interface, 1, layer_shell, layer_shell_bind); &zwlr_layer_shell_v1_interface, 1, layer_shell, layer_shell_bind);