Merge branch 'master' into fix-resize-wiggle

1 files changed, 22 insertions, 0 deletions

diff --git a/sway/desktop/xdg_shell.c b/sway/desktop/xdg_shell.c
index e6e1527e..b364663d 100644
--- a/sway/desktop/xdg_shell.c
+++ b/sway/desktop/xdg_shell.c
@@ -179,6 +179,14 @@ static void for_each_surface(struct sway_view *view,
                 user_data);
 }
 
+static void for_each_popup(struct sway_view *view,
+                wlr_surface_iterator_func_t iterator, void *user_data) {
+        if (xdg_shell_view_from_view(view) == NULL) {
+                return;
+        }
+        wlr_xdg_surface_for_each_popup(view->wlr_xdg_surface, iterator, user_data);
+}
+
 static void _close(struct sway_view *view) {
         if (xdg_shell_view_from_view(view) == NULL) {
                 return;
@@ -189,6 +197,18 @@ static void _close(struct sway_view *view) {
         }
 }
 
+static void close_popups_iterator(struct wlr_surface *surface,
+                int sx, int sy, void *data) {
+        struct wlr_xdg_surface *xdg_surface =
+                wlr_xdg_surface_from_wlr_surface(surface);
+        wlr_xdg_surface_send_close(xdg_surface);
+}
+
+static void close_popups(struct sway_view *view) {
+        wlr_xdg_surface_for_each_popup(view->wlr_xdg_surface,
+                        close_popups_iterator, NULL);
+}
+
 static void destroy(struct sway_view *view) {
         struct sway_xdg_shell_view *xdg_shell_view =
                 xdg_shell_view_from_view(view);
@@ -207,7 +227,9 @@ static const struct sway_view_impl view_impl = {
         .set_fullscreen = set_fullscreen,
         .wants_floating = wants_floating,
         .for_each_surface = for_each_surface,
+        .for_each_popup = for_each_popup,
         .close = _close,
+        .close_popups = close_popups,
         .destroy = destroy,
 };