diff options
| -rw-r--r-- | include/wlr/types/wlr_xdg_foreign_v1.h | 4 | ||||
| -rw-r--r-- | types/wlr_xdg_foreign_v1.c | 22 |
2 files changed, 13 insertions, 13 deletions
diff --git a/include/wlr/types/wlr_xdg_foreign_v1.h b/include/wlr/types/wlr_xdg_foreign_v1.h index 25bc1181..45f060df 100644 --- a/include/wlr/types/wlr_xdg_foreign_v1.h +++ b/include/wlr/types/wlr_xdg_foreign_v1.h @@ -34,7 +34,7 @@ struct wlr_xdg_exported_v1 { struct wlr_xdg_foreign_exported base; struct wl_resource *resource; - struct wl_listener xdg_surface_unmap; + struct wl_listener xdg_surface_destroy; struct wl_list link; // wlr_xdg_foreign_v1.exporter.objects }; @@ -54,7 +54,7 @@ struct wlr_xdg_imported_child_v1 { struct wl_list link; // wlr_xdg_imported_v1.children - struct wl_listener xdg_surface_unmap; + struct wl_listener xdg_surface_destroy; struct wl_listener xdg_toplevel_set_parent; }; diff --git a/types/wlr_xdg_foreign_v1.c b/types/wlr_xdg_foreign_v1.c index cff40b3a..8213c70b 100644 --- a/types/wlr_xdg_foreign_v1.c +++ b/types/wlr_xdg_foreign_v1.c @@ -46,15 +46,15 @@ static struct wlr_xdg_toplevel *verify_is_toplevel(struct wl_resource *resource, static void destroy_imported_child(struct wlr_xdg_imported_child_v1 *child) { wl_list_remove(&child->xdg_toplevel_set_parent.link); - wl_list_remove(&child->xdg_surface_unmap.link); + wl_list_remove(&child->xdg_surface_destroy.link); wl_list_remove(&child->link); free(child); } -static void handle_child_xdg_surface_unmap( +static void handle_child_xdg_surface_destroy( struct wl_listener *listener, void *data) { struct wlr_xdg_imported_child_v1 *child = - wl_container_of(listener, child, xdg_surface_unmap); + wl_container_of(listener, child, xdg_surface_destroy); destroy_imported_child(child); } @@ -104,12 +104,12 @@ static void xdg_imported_handle_set_parent_of(struct wl_client *client, return; } child->surface = wlr_surface_child; - child->xdg_surface_unmap.notify = handle_child_xdg_surface_unmap; + child->xdg_surface_destroy.notify = handle_child_xdg_surface_destroy; child->xdg_toplevel_set_parent.notify = handle_xdg_toplevel_set_parent; wlr_xdg_toplevel_set_parent(child_toplevel, surface->toplevel); - wl_signal_add(&child_toplevel->base->events.unmap, - &child->xdg_surface_unmap); + wl_signal_add(&child_toplevel->base->events.destroy, + &child->xdg_surface_destroy); wl_signal_add(&child_toplevel->events.set_parent, &child->xdg_toplevel_set_parent); @@ -170,7 +170,7 @@ static void destroy_imported(struct wlr_xdg_imported_v1 *imported) { static void destroy_exported(struct wlr_xdg_exported_v1 *exported) { wlr_xdg_foreign_exported_finish(&exported->base); - wl_list_remove(&exported->xdg_surface_unmap.link); + wl_list_remove(&exported->xdg_surface_destroy.link); wl_list_remove(&exported->link); wl_resource_set_user_data(exported->resource, NULL); free(exported); @@ -186,10 +186,10 @@ static void xdg_exported_handle_resource_destroy( } } -static void handle_xdg_surface_unmap( +static void handle_xdg_surface_destroy( struct wl_listener *listener, void *data) { struct wlr_xdg_exported_v1 *exported = - wl_container_of(listener, exported, xdg_surface_unmap); + wl_container_of(listener, exported, xdg_surface_destroy); destroy_exported(exported); } @@ -238,8 +238,8 @@ static void xdg_exporter_handle_export(struct wl_client *wl_client, zxdg_exported_v1_send_handle(exported->resource, exported->base.handle); - exported->xdg_surface_unmap.notify = handle_xdg_surface_unmap; - wl_signal_add(&xdg_toplevel->base->events.unmap, &exported->xdg_surface_unmap); + exported->xdg_surface_destroy.notify = handle_xdg_surface_destroy; + wl_signal_add(&xdg_toplevel->base->events.destroy, &exported->xdg_surface_destroy); } static const struct zxdg_exporter_v1_interface xdg_exporter_impl = { |