1 files changed, 17 insertions, 2 deletions

diff --git a/sway/desktop/xdg_shell.c b/sway/desktop/xdg_shell.c
index 7cdd97c8..7c417891 100644
--- a/sway/desktop/xdg_shell.c
+++ b/sway/desktop/xdg_shell.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 199309L
 #include <float.h>
 #include <stdbool.h>
 #include <stdlib.h>
@@ -36,6 +35,7 @@ static void popup_handle_destroy(struct wl_listener *listener, void *data) {
         wl_list_remove(&popup->new_popup.link);
         wl_list_remove(&popup->destroy.link);
         wl_list_remove(&popup->surface_commit.link);
+        wl_list_remove(&popup->reposition.link);
         wlr_scene_node_destroy(&popup->scene_tree->node);
         free(popup);
 }
@@ -71,6 +71,11 @@ static void popup_handle_surface_commit(struct wl_listener *listener, void *data
         }
 }
 
+static void popup_handle_reposition(struct wl_listener *listener, void *data) {
+        struct sway_xdg_popup *popup = wl_container_of(listener, popup, reposition);
+        popup_unconstrain(popup);
+}
+
 static struct sway_xdg_popup *popup_create(struct wlr_xdg_popup *wlr_popup,
                 struct sway_view *view, struct wlr_scene_tree *parent) {
         struct wlr_xdg_surface *xdg_surface = wlr_popup->base;
@@ -97,8 +102,11 @@ static struct sway_xdg_popup *popup_create(struct wlr_xdg_popup *wlr_popup,
                 return NULL;
         }
 
+        popup->desc.relative = &view->content_tree->node;
+        popup->desc.view = view;
+
         if (!scene_descriptor_assign(&popup->scene_tree->node,
-                        SWAY_SCENE_DESC_POPUP, popup)) {
+                        SWAY_SCENE_DESC_POPUP, &popup->desc)) {
                 sway_log(SWAY_ERROR, "Failed to allocate a popup scene descriptor");
                 wlr_scene_node_destroy(&popup->scene_tree->node);
                 free(popup);
@@ -114,6 +122,8 @@ static struct sway_xdg_popup *popup_create(struct wlr_xdg_popup *wlr_popup,
         popup->surface_commit.notify = popup_handle_surface_commit;
         wl_signal_add(&xdg_surface->events.new_popup, &popup->new_popup);
         popup->new_popup.notify = popup_handle_new_popup;
+        wl_signal_add(&wlr_popup->events.reposition, &popup->reposition);
+        popup->reposition.notify = popup_handle_reposition;
         wl_signal_add(&wlr_popup->events.destroy, &popup->destroy);
         popup->destroy.notify = popup_handle_destroy;
 
@@ -279,6 +289,7 @@ static void handle_commit(struct wl_listener *listener, void *data) {
                 }
                 // XXX: https://github.com/swaywm/sway/issues/2176
                 wlr_xdg_surface_schedule_configure(xdg_surface);
+                // TODO: wlr_xdg_toplevel_set_bounds()
                 return;
         }
 
@@ -337,6 +348,7 @@ static void handle_set_app_id(struct wl_listener *listener, void *data) {
         struct sway_xdg_shell_view *xdg_shell_view =
                 wl_container_of(listener, xdg_shell_view, set_app_id);
         struct sway_view *view = &xdg_shell_view->view;
+        view_update_app_id(view);
         view_execute_criteria(view);
 }
 
@@ -563,4 +575,7 @@ void handle_xdg_shell_toplevel(struct wl_listener *listener, void *data) {
         wlr_scene_xdg_surface_create(xdg_shell_view->view.content_tree, xdg_toplevel->base);
 
         xdg_toplevel->base->data = xdg_shell_view;
+
+        wlr_xdg_toplevel_set_wm_capabilities(xdg_toplevel,
+                XDG_TOPLEVEL_WM_CAPABILITIES_FULLSCREEN);
 }