fdo-mirrors/weston
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/weston.git synced 2026-06-16 21:38:22 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

xdg-shell: handle xdg_wm_base being destroyed before its children

Browse source 
According to the xdg-shell protocol specification, if the xdg_wm_base
object is destroyed while there are still xdg_surface objects associated
with it, the compositor must post a protocol error (DEFUNCT_SURFACES) to
the client. In this patch we do that.

Signed-off-by: Leandro Ribeiro <leandro.ribeiro@collabora.com>
This commit is contained in:
Leandro Ribeiro 2026-02-01 14:45:38 -03:00 • committed by Marius Vlad
parent 65e82a47d8
commit 2263cbf2ea
2 changed files with 40 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
libweston/desktop/xdg-shell-v6.c
View file

@ -1514,8 +1514,27 @@ weston_desktop_xdg_shell_protocol_pong(struct wl_client *wl_client,
weston_desktop_client_pong(client, serial);
}
static void
weston_desktop_xdg_shell_protocol_destroy(struct wl_client *wl_client,
struct wl_resource *resource)
{
struct weston_desktop_client *client =
wl_resource_get_user_data(resource);
struct wl_list *surface_list =
weston_desktop_client_get_surface_list(client);
if (!wl_list_empty(surface_list)) {
wl_resource_post_error(resource,
ZXDG_SHELL_V6_ERROR_DEFUNCT_SURFACES,
"xdg_wm_base being destroyed before child surfaces");
return;
}
weston_desktop_destroy_request(wl_client, resource);
}
static const struct zxdg_shell_v6_interface weston_desktop_xdg_shell_implementation = {
.destroy = weston_desktop_destroy_request,
.destroy = weston_desktop_xdg_shell_protocol_destroy,
.create_positioner = weston_desktop_xdg_shell_protocol_create_positioner,
.get_xdg_surface = weston_desktop_xdg_shell_protocol_get_xdg_surface,
.pong = weston_desktop_xdg_shell_protocol_pong,

21
libweston/desktop/xdg-shell.c
View file

@ -2102,8 +2102,27 @@ weston_desktop_xdg_shell_protocol_pong(struct wl_client *wl_client,
weston_desktop_client_pong(client, serial);
}
static void
weston_desktop_xdg_shell_protocol_destroy(struct wl_client *wl_client,
struct wl_resource *resource)
{
struct weston_desktop_client *client =
wl_resource_get_user_data(resource);
struct wl_list *surface_list =
weston_desktop_client_get_surface_list(client);
if (!wl_list_empty(surface_list)) {
wl_resource_post_error(resource,
XDG_WM_BASE_ERROR_DEFUNCT_SURFACES,
"xdg_wm_base being destroyed before child surfaces");
return;
}
weston_desktop_destroy_request(wl_client, resource);
}
static const struct xdg_wm_base_interface weston_desktop_xdg_shell_implementation = {
.destroy = weston_desktop_destroy_request,
.destroy = weston_desktop_xdg_shell_protocol_destroy,
.create_positioner = weston_desktop_xdg_shell_protocol_create_positioner,
.get_xdg_surface = weston_desktop_xdg_shell_protocol_get_xdg_surface,
.pong = weston_desktop_xdg_shell_protocol_pong,