mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2025-11-01 22:58:47 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Destroy xdg_popups when its parent is destroyed

Browse source 
Fixes: #2845
This commit is contained in:
Consolatis 2025-06-18 17:40:04 +02:00 • committed by Johan Malm
parent a8df2487b2
commit 30248e1ba3
4 changed files with 35 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
include/layers.h
View file

@ -9,6 +9,7 @@ struct output;
struct seat; struct seat;
struct lab_layer_surface { struct lab_layer_surface {
struct wlr_layer_surface_v1 *layer_surface;
struct wlr_scene_layer_surface_v1 *scene_layer_surface; struct wlr_scene_layer_surface_v1 *scene_layer_surface;
struct server *server; struct server *server;
struct output *output; struct output *output;

23
src/layers.c
View file

@ -314,6 +314,22 @@ handle_node_destroy(struct wl_listener *listener, void *data)
{ {
struct lab_layer_surface *layer = struct lab_layer_surface *layer =
wl_container_of(listener, layer, node_destroy); wl_container_of(listener, layer, node_destroy);
/*
* Important:
*
* We can no longer access layer->scene_layer_surface anymore
* because it has already been free'd by wlroots.
* Set it to NULL to run into a proper crash rather than accessing
* random free'd memory.
*/
layer->scene_layer_surface = NULL;
struct wlr_xdg_popup *popup, *tmp;
wl_list_for_each_safe(popup, tmp, &layer->layer_surface->popups, link) {
wlr_xdg_popup_destroy(popup);
}
/* /*
* TODO: Determine if this layer is being used by an exclusive client. * TODO: Determine if this layer is being used by an exclusive client.
* If it is, try and find another layer owned by this client to pass * If it is, try and find another layer owned by this client to pass
@ -377,6 +393,12 @@ handle_popup_destroy(struct wl_listener *listener, void *data)
{ {
struct lab_layer_popup *popup = struct lab_layer_popup *popup =
wl_container_of(listener, popup, destroy); wl_container_of(listener, popup, destroy);
struct wlr_xdg_popup *_popup, *tmp;
wl_list_for_each_safe(_popup, tmp, &popup->wlr_popup->base->popups, link) {
wlr_xdg_popup_destroy(_popup);
}
wl_list_remove(&popup->destroy.link); wl_list_remove(&popup->destroy.link);
wl_list_remove(&popup->new_popup.link); wl_list_remove(&popup->new_popup.link);
wl_list_remove(&popup->reposition.link); wl_list_remove(&popup->reposition.link);
@ -565,6 +587,7 @@ handle_new_layer_surface(struct wl_listener *listener, void *data)
} }
struct lab_layer_surface *surface = znew(*surface); struct lab_layer_surface *surface = znew(*surface);
surface->layer_surface = layer_surface;
struct output *output = layer_surface->output->data; struct output *output = layer_surface->output->data;
surface->output = output; surface->output = output;

6
src/xdg-popup.c
View file

@ -73,6 +73,12 @@ static void
handle_destroy(struct wl_listener *listener, void *data) handle_destroy(struct wl_listener *listener, void *data)
{ {
struct xdg_popup *popup = wl_container_of(listener, popup, destroy); struct xdg_popup *popup = wl_container_of(listener, popup, destroy);
struct wlr_xdg_popup *_popup, *tmp;
wl_list_for_each_safe(_popup, tmp, &popup->wlr_popup->base->popups, link) {
wlr_xdg_popup_destroy(_popup);
}
wl_list_remove(&popup->destroy.link); wl_list_remove(&popup->destroy.link);
wl_list_remove(&popup->new_popup.link); wl_list_remove(&popup->new_popup.link);
wl_list_remove(&popup->reposition.link); wl_list_remove(&popup->reposition.link);

5
src/xdg.c
View file

@ -345,6 +345,11 @@ handle_destroy(struct wl_listener *listener, void *data)
struct xdg_toplevel_view *xdg_toplevel_view = struct xdg_toplevel_view *xdg_toplevel_view =
xdg_toplevel_view_from_view(view); xdg_toplevel_view_from_view(view);
struct wlr_xdg_popup *popup, *tmp;
wl_list_for_each_safe(popup, tmp, &xdg_toplevel_view->xdg_surface->popups, link) {
wlr_xdg_popup_destroy(popup);
}
xdg_toplevel_view->xdg_surface->data = NULL; xdg_toplevel_view->xdg_surface->data = NULL;
xdg_toplevel_view->xdg_surface = NULL; xdg_toplevel_view->xdg_surface = NULL;