mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-11-03 09:01:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

subsurface handle parent destroy

Browse source
This commit is contained in:
Tony Crisci 2017-09-30 13:24:59 -04:00
parent 4c1bd9bde8
commit 8b7ae61ad4
2 changed files with 29 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/wlr/types/wlr_surface.h
View file

@ -52,6 +52,8 @@ struct wlr_subsurface {
struct wl_list parent_link; struct wl_list parent_link;
struct wl_list parent_pending_link; struct wl_list parent_pending_link;
struct wl_listener parent_destroy_listener;
}; };
struct wlr_surface { struct wlr_surface {

29
types/wlr_surface.c
View file

@ -537,7 +537,13 @@ static void wlr_surface_state_destroy(struct wlr_surface_state *state) {
void wlr_subsurface_destroy(struct wlr_subsurface *subsurface) { void wlr_subsurface_destroy(struct wlr_subsurface *subsurface) {
wlr_surface_state_destroy(subsurface->cached); wlr_surface_state_destroy(subsurface->cached);
if (subsurface->parent) {
wl_list_remove(&subsurface->parent_link); wl_list_remove(&subsurface->parent_link);
wl_list_remove(&subsurface->parent_pending_link);
wl_list_remove(&subsurface->parent_destroy_listener.link);
}
wl_resource_set_user_data(subsurface->resource, NULL); wl_resource_set_user_data(subsurface->resource, NULL);
if (subsurface->surface) { if (subsurface->surface) {
subsurface->surface->subsurface = NULL; subsurface->surface->subsurface = NULL;
@ -742,6 +748,16 @@ static const struct wl_subsurface_interface subsurface_implementation = {
.set_desync = subsurface_set_desync, .set_desync = subsurface_set_desync,
}; };
static void subsurface_handle_parent_destroy(struct wl_listener *listener,
void *data) {
struct wlr_subsurface *subsurface =
wl_container_of(listener, subsurface, parent_destroy_listener);
wl_list_remove(&subsurface->parent_link);
wl_list_remove(&subsurface->parent_pending_link);
wl_list_remove(&subsurface->parent_destroy_listener.link);
subsurface->parent = NULL;
}
void wlr_surface_make_subsurface(struct wlr_surface *surface, void wlr_surface_make_subsurface(struct wlr_surface *surface,
struct wlr_surface *parent, uint32_t id) { struct wlr_surface *parent, uint32_t id) {
assert(surface->subsurface == NULL); assert(surface->subsurface == NULL);
@ -752,11 +768,18 @@ void wlr_surface_make_subsurface(struct wlr_surface *surface,
return; return;
} }
subsurface->cached = wlr_surface_state_create(); subsurface->cached = wlr_surface_state_create();
subsurface->surface = surface;
subsurface->parent = parent;
subsurface->synchronized = true; subsurface->synchronized = true;
subsurface->surface = surface;
// link parent
subsurface->parent = parent;
wl_signal_add(&parent->signals.destroy,
&subsurface->parent_destroy_listener);
subsurface->parent_destroy_listener.notify =
subsurface_handle_parent_destroy;
wl_list_insert(&parent->subsurface_list, &subsurface->parent_link); wl_list_insert(&parent->subsurface_list, &subsurface->parent_link);
wl_list_insert(&parent->subsurface_pending_list,
&subsurface->parent_pending_link);
struct wl_client *client = wl_resource_get_client(surface->resource); struct wl_client *client = wl_resource_get_client(surface->resource);