From 6f34a6d3a6f6604af2c4c257343a31064983651f Mon Sep 17 00:00:00 2001 From: Leonardo Hernández Hernández Date: Sat, 10 Aug 2024 11:25:41 -0600 Subject: use wlr_xwayland_surface_has_window_type() (wlroots!4553) References: https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/4553 --- client.h | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'client.h') diff --git a/client.h b/client.h index 389b4f0..f1e2ab5 100644 --- a/client.h +++ b/client.h @@ -213,16 +213,15 @@ client_is_float_type(Client *c) if (client_is_x11(c)) { struct wlr_xwayland_surface *surface = c->surface.xwayland; xcb_size_hints_t *size_hints = surface->size_hints; - size_t i; if (surface->modal) return 1; - for (i = 0; i < surface->window_type_len; i++) - if (surface->window_type[i] == netatom[NetWMWindowTypeDialog] - || surface->window_type[i] == netatom[NetWMWindowTypeSplash] - || surface->window_type[i] == netatom[NetWMWindowTypeToolbar] - || surface->window_type[i] == netatom[NetWMWindowTypeUtility]) - return 1; + if (wlr_xwayland_surface_has_window_type(surface, WLR_XWAYLAND_NET_WM_WINDOW_TYPE_DIALOG) + || wlr_xwayland_surface_has_window_type(surface, WLR_XWAYLAND_NET_WM_WINDOW_TYPE_SPLASH) + || wlr_xwayland_surface_has_window_type(surface, WLR_XWAYLAND_NET_WM_WINDOW_TYPE_TOOLBAR) + || wlr_xwayland_surface_has_window_type(surface, WLR_XWAYLAND_NET_WM_WINDOW_TYPE_UTILITY)) { + return 1; + } return size_hints && size_hints->min_width > 0 && size_hints->min_height > 0 && (size_hints->max_width == size_hints->min_width -- cgit v1.2.3