1 files changed, 9 insertions, 15 deletions

diff --git a/sway/desktop/transaction.c b/sway/desktop/transaction.c
index acc3e3f9..d1898843 100644
--- a/sway/desktop/transaction.c
+++ b/sway/desktop/transaction.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <stdbool.h>
 #include <stdlib.h>
 #include <string.h>
@@ -11,6 +10,7 @@
 #include "sway/input/cursor.h"
 #include "sway/input/input-manager.h"
 #include "sway/output.h"
+#include "sway/server.h"
 #include "sway/tree/container.h"
 #include "sway/tree/node.h"
 #include "sway/tree/view.h"
@@ -606,21 +606,15 @@ static void arrange_output(struct sway_output *output, int width, int height) {
         }
 }
 
-static void arrange_popup(struct wlr_scene_tree *popup) {
+void arrange_popups(struct wlr_scene_tree *popups) {
         struct wlr_scene_node *node;
-        wl_list_for_each(node, &popup->children, link) {
-                struct sway_xdg_popup *popup = scene_descriptor_try_get(node,
+        wl_list_for_each(node, &popups->children, link) {
+                struct sway_popup_desc *popup = scene_descriptor_try_get(node,
                         SWAY_SCENE_DESC_POPUP);
 
-                // the popup layer may have popups from layer_shell surfaces, in this
-                // case those don't have a scene descriptor, so lets skip those here.
-                if (popup) {
-                        struct wlr_scene_tree *tree = popup->view->content_tree;
-
-                        int lx, ly;
-                        wlr_scene_node_coords(&tree->node, &lx, &ly);
-                        wlr_scene_node_set_position(&popup->scene_tree->node, lx, ly);
-                }
+                int lx, ly;
+                wlr_scene_node_coords(popup->relative, &lx, &ly);
+                wlr_scene_node_set_position(node, lx, ly);
         }
 }
 
@@ -679,7 +673,7 @@ static void arrange_root(struct sway_root *root) {
                 }
         }
 
-        arrange_popup(root->layers.popup);
+        arrange_popups(root->layers.popup);
 }
 
 /**
@@ -768,7 +762,7 @@ static bool should_configure(struct sway_node *node,
         }
         struct sway_container_state *cstate = &node->sway_container->current;
         struct sway_container_state *istate = &instruction->container_state;
-#if HAVE_XWAYLAND
+#if WLR_HAS_XWAYLAND
         // Xwayland views are position-aware and need to be reconfigured
         // when their position changes.
         if (node->sway_container->view->type == SWAY_VIEW_XWAYLAND) {