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 da34699b14d49a1c98d5a2191a1ca795992eeb27..1a99b71be7ef3f3b1d6308aed284b10e1eb5319a 100644 (file)
--- 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);
                }