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

wlr-foreign-toplevel: avoid wl_resource_find_for_client()

Browse source 
If the client application is composed of multiple components and they
bind the manager global separately, choosing a single toplevel resource
with wl_resource_find_for_client() may result in a component only seeing
unknown toplevel handles from another component.

Maybe we should track which toplevel handle resource originate from
which manager resource so that a component never sees toplevel handles
resources from another component, but it's too annoying to implement.
This commit is contained in:
tokyo4j 2025-11-24 16:53:19 +09:00 • committed by Simon Ser
parent 811765ffa0
commit abf80b529e
1 changed files with 15 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

26
types/wlr_foreign_toplevel_management_v1.c
View file

@ -417,16 +417,17 @@ static void toplevel_resource_send_parent(
return;
}
struct wl_client *client = wl_resource_get_client(toplevel_resource);
struct wl_resource *parent_resource = NULL;
if (parent) {
parent_resource = wl_resource_find_for_client(&parent->resources, client);
if (!parent_resource) {
/* don't send an event if this client destroyed the parent handle */
return;
struct wl_resource *parent_resource;
wl_resource_for_each(parent_resource, &parent->resources) {
if (wl_resource_get_client(parent_resource) == client) {
zwlr_foreign_toplevel_handle_v1_send_parent(
toplevel_resource, parent_resource);
}
}
} else {
zwlr_foreign_toplevel_handle_v1_send_parent(toplevel_resource, NULL);
}
zwlr_foreign_toplevel_handle_v1_send_parent(toplevel_resource,
parent_resource);
}
void wlr_foreign_toplevel_handle_v1_set_parent(
@ -624,10 +625,13 @@ static void foreign_toplevel_manager_bind(struct wl_client *client, void *data,
}
/* Second loop: send details about each toplevel. */
wl_list_for_each_safe(toplevel, tmp, &manager->toplevels, link) {
struct wl_resource *toplevel_resource =
wl_resource_find_for_client(&toplevel->resources, client);
toplevel_send_details_to_toplevel_resource(toplevel,
toplevel_resource);
struct wl_resource *toplevel_resource;
wl_resource_for_each(toplevel_resource, &toplevel->resources) {
if (wl_resource_get_client(toplevel_resource) == client) {
toplevel_send_details_to_toplevel_resource(toplevel,
toplevel_resource);
}
}
}
}