1 files changed, 34 insertions, 29 deletions

diff --git a/sway/xdg_decoration.c b/sway/xdg_decoration.c
index ec9e8d68..fa8c6279 100644
--- a/sway/xdg_decoration.c
+++ b/sway/xdg_decoration.c
@@ -23,37 +23,12 @@ static void xdg_decoration_handle_request_mode(struct wl_listener *listener,
                 void *data) {
         struct sway_xdg_decoration *deco =
                 wl_container_of(listener, deco, request_mode);
-        struct sway_view *view = deco->view;
-        enum wlr_xdg_toplevel_decoration_v1_mode mode =
-                WLR_XDG_TOPLEVEL_DECORATION_V1_MODE_SERVER_SIDE;
-        enum wlr_xdg_toplevel_decoration_v1_mode client_mode =
-                deco->wlr_xdg_decoration->requested_mode;
-
-        bool floating;
-        if (view->container) {
-                floating = container_is_floating(view->container);
-                bool csd = false;
-                csd = client_mode ==
-                        WLR_XDG_TOPLEVEL_DECORATION_V1_MODE_CLIENT_SIDE;
-                view_update_csd_from_client(view, csd);
-                arrange_container(view->container);
-                transaction_commit_dirty();
-        } else {
-                floating = view->impl->wants_floating &&
-                        view->impl->wants_floating(view);
-        }
-
-        if (floating && client_mode) {
-                mode = client_mode;
-        }
-
-        wlr_xdg_toplevel_decoration_v1_set_mode(deco->wlr_xdg_decoration,
-                        mode);
+        set_xdg_decoration_mode(deco);
 }
 
 void handle_xdg_decoration(struct wl_listener *listener, void *data) {
         struct wlr_xdg_toplevel_decoration_v1 *wlr_deco = data;
-        struct sway_xdg_shell_view *xdg_shell_view = wlr_deco->surface->data;
+        struct sway_xdg_shell_view *xdg_shell_view = wlr_deco->toplevel->base->data;
 
         struct sway_xdg_decoration *deco = calloc(1, sizeof(*deco));
         if (deco == NULL) {
@@ -72,16 +47,46 @@ void handle_xdg_decoration(struct wl_listener *listener, void *data) {
 
         wl_list_insert(&server.xdg_decorations, &deco->link);
 
-        xdg_decoration_handle_request_mode(&deco->request_mode, wlr_deco);
+        set_xdg_decoration_mode(deco);
 }
 
 struct sway_xdg_decoration *xdg_decoration_from_surface(
                 struct wlr_surface *surface) {
         struct sway_xdg_decoration *deco;
         wl_list_for_each(deco, &server.xdg_decorations, link) {
-                if (deco->wlr_xdg_decoration->surface->surface == surface) {
+                if (deco->wlr_xdg_decoration->toplevel->base->surface == surface) {
                         return deco;
                 }
         }
         return NULL;
 }
+
+void set_xdg_decoration_mode(struct sway_xdg_decoration *deco) {
+        struct sway_view *view = deco->view;
+        enum wlr_xdg_toplevel_decoration_v1_mode mode =
+                WLR_XDG_TOPLEVEL_DECORATION_V1_MODE_SERVER_SIDE;
+        enum wlr_xdg_toplevel_decoration_v1_mode client_mode =
+                deco->wlr_xdg_decoration->requested_mode;
+
+        bool floating;
+        if (view->container) {
+                floating = container_is_floating(view->container);
+                bool csd = false;
+                csd = client_mode ==
+                        WLR_XDG_TOPLEVEL_DECORATION_V1_MODE_CLIENT_SIDE;
+                view_update_csd_from_client(view, csd);
+                arrange_container(view->container);
+                transaction_commit_dirty();
+        } else {
+                floating = view->impl->wants_floating &&
+                        view->impl->wants_floating(view);
+        }
+
+        if (floating && client_mode) {
+                mode = client_mode;
+        }
+
+        if (view->wlr_xdg_toplevel->base->initialized) {
+                wlr_xdg_toplevel_decoration_v1_set_mode(deco->wlr_xdg_decoration, mode);
+        }
+}