mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2025-11-04 13:30:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

src/layers.c: destroy layer surface on output loss

Browse source
This commit is contained in:
Consolatis 2022-12-30 01:14:27 +01:00 • committed by Johan Malm
parent a4c1c4815e
commit 0d8b459912
1 changed files with 4 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/layers.c
View file

@ -117,6 +117,7 @@ handle_output_destroy(struct wl_listener *listener, void *data)
struct lab_layer_surface *layer = struct lab_layer_surface *layer =
wl_container_of(listener, layer, output_destroy); wl_container_of(listener, layer, output_destroy);
layer->scene_layer_surface->layer_surface->output = NULL; layer->scene_layer_surface->layer_surface->output = NULL;
wlr_layer_surface_v1_destroy(layer->scene_layer_surface->layer_surface);
} }
static void static void
@ -272,19 +273,13 @@ handle_new_popup(struct wl_listener *listener, void *data)
wl_container_of(listener, toplevel, new_popup); wl_container_of(listener, toplevel, new_popup);
struct wlr_xdg_popup *wlr_popup = data; struct wlr_xdg_popup *wlr_popup = data;
int lx, ly;
struct server *server = toplevel->server; struct server *server = toplevel->server;
struct wlr_scene_layer_surface_v1 *surface = toplevel->scene_layer_surface; struct wlr_scene_layer_surface_v1 *surface = toplevel->scene_layer_surface;
wlr_scene_node_coords(&surface->tree->node, &lx, &ly);
if (!surface->layer_surface->output) {
/* Work-around for moving layer shell surfaces on output destruction */
struct wlr_output *wlr_output;
wlr_output = wlr_output_layout_output_at(server->output_layout, lx, ly);
surface->layer_surface->output = wlr_output;
}
struct output *output = surface->layer_surface->output->data; struct output *output = surface->layer_surface->output->data;
int lx, ly;
wlr_scene_node_coords(&surface->tree->node, &lx, &ly);
struct wlr_box output_box = { 0 }; struct wlr_box output_box = { 0 };
wlr_output_layout_get_box(server->output_layout, wlr_output_layout_get_box(server->output_layout,
output->wlr_output, &output_box); output->wlr_output, &output_box);