From fc79b7c2d27af881c57d193667d1efb2f7f90eb5 Mon Sep 17 00:00:00 2001 From: emersion Date: Mon, 26 Nov 2018 23:57:33 +0100 Subject: Handle destroyed subsurfaces Damage subsurfaces when they are destroyed. Since subsurfaces don't have an unmap event we need to do that on destroy. We also don't want to keep a sway_view_child when the wlr_subsurface has been destroyed. Fixes https://github.com/swaywm/sway/issues/3197 --- sway/tree/view.c | 39 +++++++++++++++++++++++++++++++++++---- 1 file changed, 35 insertions(+), 4 deletions(-) (limited to 'sway/tree/view.c') diff --git a/sway/tree/view.c b/sway/tree/view.c index febba3b9..c56b96f9 100644 --- a/sway/tree/view.c +++ b/sway/tree/view.c @@ -674,6 +674,8 @@ void view_update_size(struct sway_view *view, int width, int height) { container_set_geometry_from_content(view->container); } +static const struct sway_view_child_impl subsurface_impl; + static void subsurface_get_root_coords(struct sway_view_child *child, int *root_sx, int *root_sy) { struct wlr_surface *surface = child->surface; @@ -689,18 +691,47 @@ static void subsurface_get_root_coords(struct sway_view_child *child, } } +static void subsurface_destroy(struct sway_view_child *child) { + if (!sway_assert(child->impl == &subsurface_impl, + "Expected a subsurface")) { + return; + } + struct sway_subsurface *subsurface = (struct sway_subsurface *)child; + wl_list_remove(&subsurface->destroy.link); + free(subsurface); +} + static const struct sway_view_child_impl subsurface_impl = { .get_root_coords = subsurface_get_root_coords, + .destroy = subsurface_destroy, }; +static void view_child_damage(struct sway_view_child *child, bool whole); + +static void subsurface_handle_destroy(struct wl_listener *listener, + void *data) { + struct sway_subsurface *subsurface = + wl_container_of(listener, subsurface, destroy); + struct sway_view_child *child = &subsurface->child; + if (child->view->container != NULL) { + view_child_damage(child, true); + } + view_child_destroy(child); +} + static void view_subsurface_create(struct sway_view *view, - struct wlr_subsurface *subsurface) { - struct sway_view_child *child = calloc(1, sizeof(struct sway_view_child)); - if (child == NULL) { + struct wlr_subsurface *wlr_subsurface) { + struct sway_subsurface *subsurface = + calloc(1, sizeof(struct sway_subsurface)); + if (subsurface == NULL) { wlr_log(WLR_ERROR, "Allocation failed"); return; } - view_child_init(child, &subsurface_impl, view, subsurface->surface); + view_child_init(&subsurface->child, &subsurface_impl, view, + wlr_subsurface->surface); + + wl_signal_add(&wlr_subsurface->events.destroy, &subsurface->destroy); + subsurface->destroy.notify = subsurface_handle_destroy; } static void view_child_damage(struct sway_view_child *child, bool whole) { -- cgit v1.2.3-54-g00ecf From 1d30b7c0f6068629760e692e594172e9972edf93 Mon Sep 17 00:00:00 2001 From: emersion Date: Tue, 27 Nov 2018 21:13:08 +0100 Subject: Damage view child when destroyed --- sway/tree/view.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'sway/tree/view.c') diff --git a/sway/tree/view.c b/sway/tree/view.c index c56b96f9..f7af841c 100644 --- a/sway/tree/view.c +++ b/sway/tree/view.c @@ -713,9 +713,6 @@ static void subsurface_handle_destroy(struct wl_listener *listener, struct sway_subsurface *subsurface = wl_container_of(listener, subsurface, destroy); struct sway_view_child *child = &subsurface->child; - if (child->view->container != NULL) { - view_child_damage(child, true); - } view_child_destroy(child); } @@ -812,6 +809,10 @@ void view_child_init(struct sway_view_child *child, } void view_child_destroy(struct sway_view_child *child) { + if (child->view->container != NULL) { + view_child_damage(child, true); + } + wl_list_remove(&child->surface_commit.link); wl_list_remove(&child->surface_destroy.link); -- cgit v1.2.3-54-g00ecf