mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-11-26 06:59:52 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

ext-foreign-toplevel-list: use correct interface and add missing handler

Browse source 
Without this patch, a client calling handle.destroy() will trigger
an assert in libwayland due to a NULL pointer for the destroy handler.

Also implement a missing .destroy handler for the manager itself
and delay destruction of the manager resource from the .stop handler
to the .destroy handler.

(cherry picked from commit adf9d8b0be)
This commit is contained in:
Consolatis 2024-08-12 22:06:01 +02:00 • committed by Simon Zeni
parent 2b8f94cf09
commit 490769f2a6
1 changed files with 18 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

21
types/wlr_ext_foreign_toplevel_list_v1.c
View file

@ -12,14 +12,18 @@
#define FOREIGN_TOPLEVEL_LIST_V1_VERSION 1
static const struct ext_foreign_toplevel_list_v1_interface toplevel_handle_impl;
static const struct ext_foreign_toplevel_handle_v1_interface toplevel_handle_impl;
static void foreign_toplevel_handle_destroy(struct wl_client *client,
struct wl_resource *resource) {
assert(wl_resource_instance_of(resource,
&ext_foreign_toplevel_handle_v1_interface,
&toplevel_handle_impl));
wl_resource_destroy(resource);
}
static const struct ext_foreign_toplevel_list_v1_interface toplevel_handle_impl = {
static const struct ext_foreign_toplevel_handle_v1_interface toplevel_handle_impl = {
.destroy = foreign_toplevel_handle_destroy,
};
@ -191,12 +195,23 @@ static void foreign_toplevel_list_handle_stop(struct wl_client *client,
&foreign_toplevel_list_impl));
ext_foreign_toplevel_list_v1_send_finished(resource);
wl_list_remove(wl_resource_get_link(resource));
wl_list_init(wl_resource_get_link(resource));
}
static void foreign_toplevel_list_handle_destroy(struct wl_client *client,
struct wl_resource *resource) {
assert(wl_resource_instance_of(resource,
&ext_foreign_toplevel_list_v1_interface,
&foreign_toplevel_list_impl));
wl_resource_destroy(resource);
}
static const struct ext_foreign_toplevel_list_v1_interface
foreign_toplevel_list_impl = {
.stop = foreign_toplevel_list_handle_stop
.stop = foreign_toplevel_list_handle_stop,
.destroy = foreign_toplevel_list_handle_destroy
};
static void foreign_toplevel_list_resource_destroy(