diff options
| author | Ryan Dwyer <RyanDwyer@users.noreply.github.com> | 2018-11-28 20:46:22 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-28 20:46:22 +1000 |
| commit | f737854e307a3cfeaba43f5ff18d540c23c65fa5 (patch) | |
| tree | 36829a49e6ee1a90b07ddbf10554650e234c6c05 /sway/tree | |
| parent | c931a13af962f3c0effd567d1fb0f78fe5f21b90 (diff) | |
| parent | 1d30b7c0f6068629760e692e594172e9972edf93 (diff) | |
| download | sway-f737854e307a3cfeaba43f5ff18d540c23c65fa5.tar.xz | |
Merge pull request #3199 from emersion/handle-subsurface-destroy
Handle destroyed subsurfaces
Diffstat (limited to 'sway/tree')
| -rw-r--r-- | sway/tree/view.c | 40 |
1 files changed, 36 insertions, 4 deletions
diff --git a/sway/tree/view.c b/sway/tree/view.c index 511c2ecc..0edefc8e 100644 --- a/sway/tree/view.c +++ b/sway/tree/view.c @@ -679,6 +679,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; @@ -694,18 +696,44 @@ 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; + 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) { @@ -786,6 +814,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); |