nordic-dev.net/wlroots
2
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2024-11-21 22:52:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Consolatis 2024-08-12 22:06:01 +02:00
parent e209fe2d05
commit adf9d8b0be
1 changed files with 18 additions and 3 deletions
Show Stats 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 #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, static void foreign_toplevel_handle_destroy(struct wl_client *client,
struct wl_resource *resource) { struct wl_resource *resource) {
assert(wl_resource_instance_of(resource,
&ext_foreign_toplevel_handle_v1_interface,
&toplevel_handle_impl));
wl_resource_destroy(resource); 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, .destroy = foreign_toplevel_handle_destroy,
}; };
@ -191,12 +195,23 @@ static void foreign_toplevel_list_handle_stop(struct wl_client *client,
&foreign_toplevel_list_impl)); &foreign_toplevel_list_impl));
ext_foreign_toplevel_list_v1_send_finished(resource); 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); wl_resource_destroy(resource);
} }
static const struct ext_foreign_toplevel_list_v1_interface static const struct ext_foreign_toplevel_list_v1_interface
foreign_toplevel_list_impl = { 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( static void foreign_toplevel_list_resource_destroy(