From 2e9c4d8ea90e47667ef4fa417aa3e6f46034699e Mon Sep 17 00:00:00 2001
From: "Devin J. Pohly" <djpohly@gmail.com>
Date: Sun, 5 Sep 2021 11:41:23 -0500
Subject: simplify client_for_each_surface

All the XDG surface iterator does is iterate the main wlr_surface, then
iterate the popups.  If we inline that function, we can merge part of it
with the X11 case.
---
 client.h | 30 ++++++++++++++----------------
 1 file changed, 14 insertions(+), 16 deletions(-)

(limited to 'client.h')

diff --git a/client.h b/client.h
index 56e3089..4fd1863 100644
--- a/client.h
+++ b/client.h
@@ -5,7 +5,7 @@
  * that they will simply compile out if the chosen #defines leave them unused.
  */
 
-/* Leave this function first; it's used in the others */
+/* Leave these functions first; they're used in the others */
 static inline int
 client_is_x11(Client *c)
 {
@@ -16,6 +16,16 @@ client_is_x11(Client *c)
 #endif
 }
 
+static inline struct wlr_surface *
+client_surface(Client *c)
+{
+#ifdef XWAYLAND
+	if (client_is_x11(c))
+		return c->surface.xwayland->surface;
+#endif
+	return c->surface.xdg->surface;
+}
+
 /* The others */
 static inline void
 client_activate_surface(struct wlr_surface *s, int activated)
@@ -35,14 +45,12 @@ client_activate_surface(struct wlr_surface *s, int activated)
 static inline void
 client_for_each_surface(Client *c, wlr_surface_iterator_func_t fn, void *data)
 {
+	wlr_surface_for_each_surface(client_surface(c), fn, data);
 #ifdef XWAYLAND
-	if (client_is_x11(c)) {
-		wlr_surface_for_each_surface(c->surface.xwayland->surface,
-				fn, data);
+	if (client_is_x11(c))
 		return;
-	}
 #endif
-	wlr_xdg_surface_for_each_surface(c->surface.xdg, fn, data);
+	wlr_xdg_surface_for_each_popup_surface(c->surface.xdg, fn, data);
 }
 
 static inline const char *
@@ -152,16 +160,6 @@ client_set_tiled(Client *c, uint32_t edges)
 			WLR_EDGE_BOTTOM | WLR_EDGE_LEFT | WLR_EDGE_RIGHT);
 }
 
-static inline struct wlr_surface *
-client_surface(Client *c)
-{
-#ifdef XWAYLAND
-	if (client_is_x11(c))
-		return c->surface.xwayland->surface;
-#endif
-	return c->surface.xdg->surface;
-}
-
 static inline struct wlr_surface *
 client_surface_at(Client *c, double cx, double cy, double *sx, double *sy)
 {
-- 
cgit v1.2.3