Handle views created after decoration mode is sent for xdg-shell

1 files changed, 32 insertions, 2 deletions

diff --git a/sway/decoration.c b/sway/decoration.c
index 73b3f45d..0e3e67ac 100644
--- a/sway/decoration.c
+++ b/sway/decoration.c
@@ -9,6 +9,8 @@ static void server_decoration_handle_destroy(struct wl_listener *listener,
 	struct sway_server_decoration *deco =
 		wl_container_of(listener, deco, destroy);
 	wl_list_remove(&deco->destroy.link);
+	wl_list_remove(&deco->mode.link);
+	wl_list_remove(&deco->link);
 	free(deco);
 }
 
@@ -18,9 +20,24 @@ static void server_decoration_handle_mode(struct wl_listener *listener,
 		wl_container_of(listener, deco, mode);
 	struct sway_view *view =
 		view_from_wlr_surface(deco->wlr_server_decoration->surface);
+	if (view == NULL || view->surface != deco->wlr_server_decoration->surface) {
+		return;
+	}
 
-	// TODO
-	wlr_log(WLR_ERROR, "%p %d", view, deco->wlr_server_decoration->mode);
+	switch (view->type) {
+	case SWAY_VIEW_XDG_SHELL_V6:;
+		struct sway_xdg_shell_v6_view *xdg_shell_v6_view =
+			(struct sway_xdg_shell_v6_view *)view;
+		xdg_shell_v6_view->deco_mode = deco->wlr_server_decoration->mode;
+		break;
+	case SWAY_VIEW_XDG_SHELL:;
+		struct sway_xdg_shell_view *xdg_shell_view =
+			(struct sway_xdg_shell_view *)view;
+		xdg_shell_view->deco_mode = deco->wlr_server_decoration->mode;
+		break;
+	default:
+		break;
+	}
 }
 
 void handle_server_decoration(struct wl_listener *listener, void *data) {
@@ -38,4 +55,17 @@ void handle_server_decoration(struct wl_listener *listener, void *data) {
 
 	wl_signal_add(&wlr_deco->events.mode, &deco->mode);
 	deco->mode.notify = server_decoration_handle_mode;
+
+	wl_list_insert(&server.decorations, &deco->link);
+}
+
+struct sway_server_decoration *decoration_from_surface(
+		struct wlr_surface *surface) {
+	struct sway_server_decoration *deco;
+	wl_list_for_each(deco, &server.decorations, link) {
+		if (deco->wlr_server_decoration->surface == surface) {
+			return deco;
+		}
+	}
+	return NULL;
 }