From 41412cadbef34e0c5d2f25e6b874c1ad4540ff01 Mon Sep 17 00:00:00 2001 From: Kirill Primak Date: Sat, 8 Jan 2022 22:52:52 +0300 Subject: xdg-popup: fix functions' main argument type With this commit, `wlr_xdg_popup_*()` functions now expect a `wlr_xdg_popup` instead of a `wlr_xdg_surface`. --- include/wlr/types/wlr_xdg_shell.h | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'include/wlr') diff --git a/include/wlr/types/wlr_xdg_shell.h b/include/wlr/types/wlr_xdg_shell.h index e16d3218..736861e2 100644 --- a/include/wlr/types/wlr_xdg_shell.h +++ b/include/wlr/types/wlr_xdg_shell.h @@ -265,7 +265,13 @@ struct wlr_xdg_shell *wlr_xdg_shell_create(struct wl_display *display); */ struct wlr_xdg_surface *wlr_xdg_surface_from_resource( struct wl_resource *resource); -struct wlr_xdg_surface *wlr_xdg_surface_from_popup_resource( + +/** Get the corresponding wlr_xdg_popup from a resource. + * + * Aborts if the resource doesn't have the correct type. Returns NULL if the + * resource is inert. + */ +struct wlr_xdg_popup *wlr_xdg_popup_from_resource( struct wl_resource *resource); /** Get the corresponding wlr_xdg_toplevel from a resource. @@ -339,7 +345,7 @@ void wlr_xdg_toplevel_set_parent(struct wlr_xdg_toplevel *toplevel, /** * Request that this xdg popup closes. **/ -void wlr_xdg_popup_destroy(struct wlr_xdg_surface *surface); +void wlr_xdg_popup_destroy(struct wlr_xdg_popup *popup); /** * Get the position for this popup in the surface parent's coordinate system. -- cgit v1.2.3