diff options
| author | Leonardo Hernández Hernández <leohdz172@protonmail.com> | 2022-05-17 15:31:31 -0500 |
|---|---|---|
| committer | Leonardo Hernández Hernández <leohdz172@protonmail.com> | 2022-05-17 15:31:31 -0500 |
| commit | 88a8b784d08ec2e8bdbfc50f1e9adb7f7fbcce9c (patch) | |
| tree | cde18fd9e4a862295f08e2ae237f694ff2f34c75 /client.h | |
| parent | 79a148224ffb5a55510de691f95eda2d32c6d2bf (diff) | |
| parent | 8870ba0bb8106a4a367bd8dee78178891b8c19db (diff) | |
Merge remote-tracking branch 'djpohly/main' into wlroots-next
chase wlroots X11 hints update
Diffstat (limited to 'client.h')
| -rw-r--r-- | client.h | 24 |
1 files changed, 16 insertions, 8 deletions
@@ -30,16 +30,19 @@ client_surface(Client *c) static inline void client_activate_surface(struct wlr_surface *s, int activated) { + struct wlr_xdg_surface *surface; #ifdef XWAYLAND - if (wlr_surface_is_xwayland_surface(s)) { - wlr_xwayland_surface_activate( - wlr_xwayland_surface_from_wlr_surface(s), activated); + struct wlr_xwayland_surface *xsurface; + if (wlr_surface_is_xwayland_surface(s) + && (xsurface = wlr_xwayland_surface_from_wlr_surface(s))) { + wlr_xwayland_surface_activate(xsurface, activated); return; } #endif - if (wlr_surface_is_xdg_surface(s)) - wlr_xdg_toplevel_set_activated( - wlr_xdg_surface_from_wlr_surface(s)->toplevel, activated); + if (wlr_surface_is_xdg_surface(s) + && (surface = wlr_xdg_surface_from_wlr_surface(s)) + && surface->role == WLR_XDG_SURFACE_ROLE_TOPLEVEL) + wlr_xdg_toplevel_set_activated(surface->toplevel, activated); } static inline void @@ -211,8 +214,13 @@ client_min_size(Client *c, int *width, int *height) #ifdef XWAYLAND if (client_is_x11(c)) { xcb_size_hints_t *size_hints = c->surface.xwayland->size_hints; - *width = size_hints->min_width; - *height = size_hints->min_height; + if (size_hints) { + *width = size_hints->min_width; + *height = size_hints->min_height; + } else { + *width = 0; + *height = 0; + } return; } #endif |