dwl

commit 7ae5039b4f35c6f5fd09f2d650c62dc7304ce6fe
parent cf9c5745e5a895faf12b2db86ca3696d72c376ce
Author: Job79 <job@plabble.org>
Date:   Wed,  1 Feb 2023 20:09:45 +0100

follow upstream xwayland_surface changes

wlroots removed the `wlr_surface_is_xwayland_surface` function, and renamed `wlr_xwayland_surface_from_wlr_surface` to `wlr_xwayland_surface_try_from_wlr_surface`.

related commit: https://gitlab.freedesktop.org/wlroots/wlroots/-/commit/fbf5982e3838ee28b5345e98832f6956c402b225

Diffstat:
M
client.h
 | 
6
++----

1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/client.h b/client.h
@@ -69,8 +69,7 @@ toplevel_from_wlr_surface(struct wlr_surface *s, Client **pc, LayerSurface **pl)
 	root_surface = wlr_surface_get_root_surface(s);
 
 #ifdef XWAYLAND
-	if (wlr_surface_is_xwayland_surface(root_surface)
-			&& (xsurface = wlr_xwayland_surface_from_wlr_surface(root_surface))) {
+	if ((xsurface = wlr_xwayland_surface_try_from_wlr_surface(root_surface))) {
 		c = xsurface->data;
 		type = c->type;
 		goto end;
@@ -121,8 +120,7 @@ client_activate_surface(struct wlr_surface *s, int activated)
 	struct wlr_xdg_surface *surface;
 #ifdef XWAYLAND
 	struct wlr_xwayland_surface *xsurface;
-	if (wlr_surface_is_xwayland_surface(s)
-			&& (xsurface = wlr_xwayland_surface_from_wlr_surface(s))) {
+	if ((xsurface = wlr_xwayland_surface_try_from_wlr_surface(s))) {
 		wlr_xwayland_surface_activate(xsurface, activated);
 		return;
 	}