From f587b2fd2c9f5967b9e8ca99fe70fbc80fb6c220 Mon Sep 17 00:00:00 2001
From: Armaël Guéneau <armael.gueneau@ens-lyon.org>
Date: Sat, 8 Jan 2022 17:41:45 +0100
Subject: fix client_set_tiled, which was ignoring its "edges" argument

---
 client.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'client.h')

diff --git a/client.h b/client.h
index 4fd1863..a6b3723 100644
--- a/client.h
+++ b/client.h
@@ -156,8 +156,7 @@ client_set_tiled(Client *c, uint32_t edges)
 	if (client_is_x11(c))
 		return;
 #endif
-	wlr_xdg_toplevel_set_tiled(c->surface.xdg, WLR_EDGE_TOP |
-			WLR_EDGE_BOTTOM | WLR_EDGE_LEFT | WLR_EDGE_RIGHT);
+	wlr_xdg_toplevel_set_tiled(c->surface.xdg, edges);
 }
 
 static inline struct wlr_surface *
-- 
cgit v1.2.3


From b8ce8d0fbb7cd1ad09ea15ded4a19dc1346e9bcd Mon Sep 17 00:00:00 2001
From: A Frederick Christensen <dwl@ivories.org>
Date: Thu, 3 Feb 2022 21:54:44 -0600
Subject: Account for changes expecting wlr_xdg_toplevel rather than
 wlr_xdg_surface

---
 client.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'client.h')

diff --git a/client.h b/client.h
index 4fd1863..ce41c1c 100644
--- a/client.h
+++ b/client.h
@@ -39,7 +39,7 @@ client_activate_surface(struct wlr_surface *s, int activated)
 #endif
 	if (wlr_surface_is_xdg_surface(s))
 		wlr_xdg_toplevel_set_activated(
-				wlr_xdg_surface_from_wlr_surface(s), activated);
+				wlr_xdg_surface_from_wlr_surface(s)->toplevel, activated);
 }
 
 static inline void
@@ -121,7 +121,7 @@ client_send_close(Client *c)
 		return;
 	}
 #endif
-	wlr_xdg_toplevel_send_close(c->surface.xdg);
+	wlr_xdg_toplevel_send_close(c->surface.xdg->toplevel);
 }
 
 static inline void
@@ -133,7 +133,7 @@ client_set_fullscreen(Client *c, int fullscreen)
 		return;
 	}
 #endif
-	wlr_xdg_toplevel_set_fullscreen(c->surface.xdg, fullscreen);
+	wlr_xdg_toplevel_set_fullscreen(c->surface.xdg->toplevel, fullscreen);
 }
 
 static inline uint32_t
@@ -146,7 +146,7 @@ client_set_size(Client *c, uint32_t width, uint32_t height)
 		return 0;
 	}
 #endif
-	return wlr_xdg_toplevel_set_size(c->surface.xdg, width, height);
+	return wlr_xdg_toplevel_set_size(c->surface.xdg->toplevel, width, height);
 }
 
 static inline void
@@ -156,7 +156,7 @@ client_set_tiled(Client *c, uint32_t edges)
 	if (client_is_x11(c))
 		return;
 #endif
-	wlr_xdg_toplevel_set_tiled(c->surface.xdg, WLR_EDGE_TOP |
+	wlr_xdg_toplevel_set_tiled(c->surface.xdg->toplevel, WLR_EDGE_TOP |
 			WLR_EDGE_BOTTOM | WLR_EDGE_LEFT | WLR_EDGE_RIGHT);
 }
 
-- 
cgit v1.2.3