alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge pull request #3199 from emersion/handle-subsurface-destroy

Browse source 
Handle destroyed subsurfaces
This commit is contained in:
Ryan Dwyer 2018-11-28 20:46:22 +10:00 committed by GitHub
parent c931a13af9 1d30b7c0f6
commit f737854e30
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 42 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
include/sway/tree/view.h
View file

@ -203,6 +203,12 @@ struct sway_view_child {
struct wl_listener surface_destroy; struct wl_listener surface_destroy;
}; };
struct sway_subsurface {
struct sway_view_child child;
struct wl_listener destroy;
};
struct sway_xdg_popup_v6 { struct sway_xdg_popup_v6 {
struct sway_view_child child; struct sway_view_child child;

40
sway/tree/view.c
View file

@ -679,6 +679,8 @@ void view_update_size(struct sway_view *view, int width, int height) {
container_set_geometry_from_content(view->container); 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, static void subsurface_get_root_coords(struct sway_view_child *child,
int *root_sx, int *root_sy) { int *root_sx, int *root_sy) {
struct wlr_surface *surface = child->surface; 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 = { static const struct sway_view_child_impl subsurface_impl = {
.get_root_coords = subsurface_get_root_coords, .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, static void view_subsurface_create(struct sway_view *view,
struct wlr_subsurface *subsurface) { struct wlr_subsurface *wlr_subsurface) {
struct sway_view_child *child = calloc(1, sizeof(struct sway_view_child)); struct sway_subsurface *subsurface =
if (child == NULL) { calloc(1, sizeof(struct sway_subsurface));
if (subsurface == NULL) {
wlr_log(WLR_ERROR, "Allocation failed"); wlr_log(WLR_ERROR, "Allocation failed");
return; 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) { 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) { 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_commit.link);
wl_list_remove(&child->surface_destroy.link); wl_list_remove(&child->surface_destroy.link);