mirror of
https://github.com/hyprwm/wlroots-hyprland.git
synced 2024-11-04 20:55:58 +01:00
xdg-foreign-v2: use error enum
A wayland-protocols patch [1] has added error codes for invalid surfaces. [1]: https://gitlab.freedesktop.org/wayland/wayland-protocols/-/merge_requests/57 Closes: https://github.com/swaywm/wlroots/issues/2600
This commit is contained in:
parent
fb393ddf84
commit
3d6ca9942d
1 changed files with 17 additions and 11 deletions
|
@ -30,19 +30,25 @@ static void xdg_imported_handle_destroy(struct wl_client *client,
|
|||
|
||||
static bool verify_is_toplevel(struct wl_resource *client_resource,
|
||||
struct wlr_surface *surface) {
|
||||
if (wlr_surface_is_xdg_surface(surface)) {
|
||||
struct wlr_xdg_surface *xdg_surface =
|
||||
wlr_xdg_surface_from_wlr_surface(surface);
|
||||
if (xdg_surface->role != WLR_XDG_SURFACE_ROLE_TOPLEVEL) {
|
||||
wl_resource_post_error(client_resource, -1,
|
||||
"surface must be an xdg_toplevel");
|
||||
return false;
|
||||
}
|
||||
} else {
|
||||
wl_resource_post_error(client_resource, -1,
|
||||
"surface must be an xdg_surface");
|
||||
// Note: the error codes are the same for zxdg_exporter_v2 and
|
||||
// zxdg_importer_v2
|
||||
|
||||
if (!wlr_surface_is_xdg_surface(surface)) {
|
||||
wl_resource_post_error(client_resource,
|
||||
ZXDG_EXPORTER_V2_ERROR_INVALID_SURFACE,
|
||||
"surface must be an xdg_surface");
|
||||
return false;
|
||||
}
|
||||
|
||||
struct wlr_xdg_surface *xdg_surface =
|
||||
wlr_xdg_surface_from_wlr_surface(surface);
|
||||
if (xdg_surface->role != WLR_XDG_SURFACE_ROLE_TOPLEVEL) {
|
||||
wl_resource_post_error(client_resource,
|
||||
ZXDG_EXPORTER_V2_ERROR_INVALID_SURFACE,
|
||||
"surface must be an xdg_toplevel");
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue