From: Jan Beich <jbeich@FreeBSD.org>
Date: Thu, 3 Jun 2021 18:06:49 +0000 (+0000)
Subject: xdg: chase swaywm/wlroots@9e58301df7f0
X-Git-Url: https://git.mdlowis.com/?a=commitdiff_plain;h=874cc9e63706dd54d9f9fcb071f2d2e0c19d3d7e;p=proto%2Flabwc.git

xdg: chase swaywm/wlroots@9e58301df7f0

src/xdg.c:269:48: error: no member named 'subsurfaces' in 'struct wlr_surface'
                wl_list_for_each(subsurface, &view->surface->subsurfaces,
                                              ~~~~~~~~~~~~~  ^
/usr/include/wayland-util.h:443:30: note: expanded from macro 'wl_list_for_each'
        for (pos = wl_container_of((head)->next, pos, member);  \
                                    ^~~~
/usr/include/wayland-util.h:409:32: note: expanded from macro 'wl_container_of'
        (__typeof__(sample))((char *)(ptr) -                            \
                                      ^~~

Based on https://github.com/swaywm/sway/commit/3162766eef14
---

diff --git a/src/xdg.c b/src/xdg.c
index da34699b..1a99b71b 100644
--- a/src/xdg.c
+++ b/src/xdg.c
@@ -266,7 +266,11 @@ xdg_toplevel_view_map(struct view *view)
 		position_xdg_toplevel_view(view);
 
 		struct wlr_subsurface *subsurface;
-		wl_list_for_each(subsurface, &view->surface->subsurfaces,
+		wl_list_for_each(subsurface, &view->surface->subsurfaces_below,
+				 parent_link) {
+			subsurface_create(view, subsurface);
+		}
+		wl_list_for_each(subsurface, &view->surface->subsurfaces_above,
 				 parent_link) {
 			subsurface_create(view, subsurface);
 		}