fdo-mirrors/weston
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/weston.git synced 2025-12-20 04:40:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'wip/mvlad/invalid-resource-popups' into 'main'

Browse source 
libweston/desktop/xdg-shell: Fixed invalid parent for pop-ups

See merge request wayland/weston!1633
This commit is contained in:
Marius Vlad 2025-12-17 01:14:45 +00:00
commit a20a60a08d
1 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -77,6 +77,7 @@ struct weston_desktop_xdg_surface {
bool configured;
struct wl_event_source *configure_idle;
struct wl_list configure_list; /* weston_desktop_xdg_surface_configure::link */
struct weston_desktop_xdg_popup *popup;
bool has_next_geometry;
struct weston_geometry next_geometry;
@ -1062,6 +1063,13 @@ weston_desktop_xdg_popup_update_position(struct weston_desktop_surface *dsurface
struct weston_desktop_surface *parent_dsurface;
struct weston_coord_surface offset;
if (!popup->parent) {
wl_resource_post_error(popup->resource,
XDG_WM_BASE_ERROR_INVALID_POPUP_PARENT,
"popup parent must be non-null");
return;
}
parent_dsurface = popup->parent->desktop_surface;
offset = weston_coord_surface(popup->geometry.x,
popup->geometry.y,
@ -1098,6 +1106,9 @@ weston_desktop_xdg_popup_destroy(struct weston_desktop_xdg_popup *popup)
"xdg_popup was destroyed while it was not the topmost popup.");
}
/* clear this popup as being a child of a parent xdg_surface */
popup->parent->popup = NULL;
weston_desktop_surface_popup_ungrab(popup->base.desktop_surface,
popup->seat);
}
@ -1388,6 +1399,7 @@ weston_desktop_xdg_surface_protocol_get_popup(struct wl_client *wl_client,
popup->base.role = WESTON_DESKTOP_XDG_SURFACE_ROLE_POPUP;
popup->parent = parent;
parent->popup = popup;
popup->geometry =
weston_desktop_xdg_positioner_get_geometry(positioner,
@ -1600,6 +1612,9 @@ weston_desktop_xdg_surface_destroy(struct weston_desktop_surface *dsurface,
wl_list_for_each_safe(configure, temp, &surface->configure_list, link)
free(configure);
if (surface->popup)
surface->popup->parent = NULL;
free(surface);
}