From 3364eec07e91eb51f770f2f7d619a07d96c0b5c4 Mon Sep 17 00:00:00 2001 From: Isaac Freund Date: Thu, 12 Aug 2021 21:30:58 +0200 Subject: layer-shell: replace close() with destroy() The protocol specifies that all requests (aside from destroy) are ignored after the compositor sends the closed event. Therefore, destroying the wlroots object and rendering the resource inert when sending the closed event keeps things simpler for wlroots and compositors. --- include/wlr/types/wlr_layer_shell_v1.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'include/wlr') diff --git a/include/wlr/types/wlr_layer_shell_v1.h b/include/wlr/types/wlr_layer_shell_v1.h index 846b9466..6f951556 100644 --- a/include/wlr/types/wlr_layer_shell_v1.h +++ b/include/wlr/types/wlr_layer_shell_v1.h @@ -70,7 +70,7 @@ struct wlr_layer_surface_v1 { char *namespace; - bool added, configured, mapped, closed; + bool added, configured, mapped; uint32_t configure_serial; uint32_t configure_next_serial; struct wl_list configure_list; @@ -125,9 +125,10 @@ void wlr_layer_surface_v1_configure(struct wlr_layer_surface_v1 *surface, uint32_t width, uint32_t height); /** - * Unmaps this layer surface and notifies the client that it has been closed. + * Notify the client that the surface has been closed and destroy the + * wlr_layer_surface_v1, rendering the resource inert. */ -void wlr_layer_surface_v1_close(struct wlr_layer_surface_v1 *surface); +void wlr_layer_surface_v1_destroy(struct wlr_layer_surface_v1 *surface); bool wlr_surface_is_layer_surface(struct wlr_surface *surface); -- cgit v1.2.3