itycodes
/
wlseeds
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xdg-foreign-v1: s/unmap/destroy

Browse Source 
dac040f87f mistakenly renamed
xdg_surface_destroy listener, which was listening to *unmap* events, to
xdg_surface_unmap. The actual fix, however, is to listen to destroy
events. This fixes various crashes.
Kirill Primak 2 years ago
parent d8ef9a95de
commit ba7bbab3ab
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File

4
include/wlr/types/wlr_xdg_foreign_v1.h
Unescape View File

@ -34,7 +34,7 @@ struct wlr_xdg_exported_v1 {
struct wlr_xdg_foreign_exported base; struct wlr_xdg_foreign_exported base;
struct wl_resource *resource; 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 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_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; struct wl_listener xdg_toplevel_set_parent;
}; };

22
types/wlr_xdg_foreign_v1.c
Unescape View File

@ -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) { 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_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); wl_list_remove(&child->link);
free(child); free(child);
} }
static void handle_child_xdg_surface_unmap( static void handle_child_xdg_surface_destroy(
struct wl_listener *listener, void *data) { struct wl_listener *listener, void *data) {
struct wlr_xdg_imported_child_v1 *child = 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); destroy_imported_child(child);
} }
@ -104,12 +104,12 @@ static void xdg_imported_handle_set_parent_of(struct wl_client *client,
return; return;
} }
child->surface = wlr_surface_child; 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; child->xdg_toplevel_set_parent.notify = handle_xdg_toplevel_set_parent;
wlr_xdg_toplevel_set_parent(child_toplevel, surface->toplevel); wlr_xdg_toplevel_set_parent(child_toplevel, surface->toplevel);
wl_signal_add(&child_toplevel->base->events.unmap, wl_signal_add(&child_toplevel->base->events.destroy,
&child->xdg_surface_unmap); &child->xdg_surface_destroy);
wl_signal_add(&child_toplevel->events.set_parent, wl_signal_add(&child_toplevel->events.set_parent,
&child->xdg_toplevel_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) { static void destroy_exported(struct wlr_xdg_exported_v1 *exported) {
wlr_xdg_foreign_exported_finish(&exported->base); 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_list_remove(&exported->link);
wl_resource_set_user_data(exported->resource, NULL); wl_resource_set_user_data(exported->resource, NULL);
free(exported); 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 wl_listener *listener, void *data) {
struct wlr_xdg_exported_v1 *exported = 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); 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); zxdg_exported_v1_send_handle(exported->resource, exported->base.handle);
exported->xdg_surface_unmap.notify = handle_xdg_surface_unmap; exported->xdg_surface_destroy.notify = handle_xdg_surface_destroy;
wl_signal_add(&xdg_toplevel->base->events.unmap, &exported->xdg_surface_unmap); wl_signal_add(&xdg_toplevel->base->events.destroy, &exported->xdg_surface_destroy);
} }
static const struct zxdg_exporter_v1_interface xdg_exporter_impl = { static const struct zxdg_exporter_v1_interface xdg_exporter_impl = {

Write Preview
Loading…
Cancel
Save