From 700941dde8d270b7986bd592fcb42333e7626718 Mon Sep 17 00:00:00 2001
From: emersion <contact@emersion.fr>
Date: Fri, 13 Jul 2018 21:53:56 +0100
Subject: Listen to server-decoration mode changes

---
 include/sway/decoration.h | 13 +++++++++++++
 include/sway/server.h     | 10 +++++++++-
 2 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 include/sway/decoration.h

(limited to 'include')

diff --git a/include/sway/decoration.h b/include/sway/decoration.h
new file mode 100644
index 00000000..c77c04c7
--- /dev/null
+++ b/include/sway/decoration.h
@@ -0,0 +1,13 @@
+#ifndef _SWAY_DECORATION_H
+#define _SWAY_DECORATION_H
+
+#include <wlr/types/wlr_server_decoration.h>
+
+struct sway_server_decoration {
+	struct wlr_server_decoration *wlr_server_decoration;
+
+	struct wl_listener destroy;
+	struct wl_listener mode;
+};
+
+#endif
diff --git a/include/sway/server.h b/include/sway/server.h
index a3782f91..7e73fb4f 100644
--- a/include/sway/server.h
+++ b/include/sway/server.h
@@ -4,12 +4,13 @@
 #include <wayland-server.h>
 #include <wlr/backend.h>
 #include <wlr/backend/session.h>
+#include <wlr/render/wlr_renderer.h>
 #include <wlr/types/wlr_compositor.h>
 #include <wlr/types/wlr_data_device.h>
 #include <wlr/types/wlr_layer_shell.h>
+#include <wlr/types/wlr_server_decoration.h>
 #include <wlr/types/wlr_xdg_shell_v6.h>
 #include <wlr/types/wlr_xdg_shell.h>
-#include <wlr/render/wlr_renderer.h>
 // TODO WLR: make Xwayland optional
 #include "list.h"
 #include "config.h"
@@ -42,11 +43,16 @@ struct sway_server {
 
 	struct wlr_xdg_shell *xdg_shell;
 	struct wl_listener xdg_shell_surface;
+
 #ifdef HAVE_XWAYLAND
 	struct sway_xwayland xwayland;
 	struct wl_listener xwayland_surface;
 	struct wl_listener xwayland_ready;
 #endif
+
+	struct wlr_server_decoration_manager *server_decoration_manager;
+	struct wl_listener server_decoration;
+
 	bool debug_txn_timings;
 
 	list_t *transactions;
@@ -71,4 +77,6 @@ void handle_xdg_shell_surface(struct wl_listener *listener, void *data);
 #ifdef HAVE_XWAYLAND
 void handle_xwayland_surface(struct wl_listener *listener, void *data);
 #endif
+void handle_server_decoration(struct wl_listener *listener, void *data);
+
 #endif
-- 
cgit v1.2.3


From 9d578e0a0f08e053dfc1982e32d9fda172b0087f Mon Sep 17 00:00:00 2001
From: emersion <contact@emersion.fr>
Date: Sun, 29 Jul 2018 18:31:10 +0100
Subject: Handle views created after decoration mode is sent for xdg-shell

---
 include/sway/decoration.h | 4 ++++
 include/sway/server.h     | 1 +
 include/sway/tree/view.h  | 4 ++++
 3 files changed, 9 insertions(+)

(limited to 'include')

diff --git a/include/sway/decoration.h b/include/sway/decoration.h
index c77c04c7..7916746e 100644
--- a/include/sway/decoration.h
+++ b/include/sway/decoration.h
@@ -5,9 +5,13 @@
 
 struct sway_server_decoration {
 	struct wlr_server_decoration *wlr_server_decoration;
+	struct wl_list link;
 
 	struct wl_listener destroy;
 	struct wl_listener mode;
 };
 
+struct sway_server_decoration *decoration_from_surface(
+	struct wlr_surface *surface);
+
 #endif
diff --git a/include/sway/server.h b/include/sway/server.h
index 7e73fb4f..b93584b6 100644
--- a/include/sway/server.h
+++ b/include/sway/server.h
@@ -52,6 +52,7 @@ struct sway_server {
 
 	struct wlr_server_decoration_manager *server_decoration_manager;
 	struct wl_listener server_decoration;
+	struct wl_list decorations; // sway_server_decoration::link
 
 	bool debug_txn_timings;
 
diff --git a/include/sway/tree/view.h b/include/sway/tree/view.h
index 37fd02bc..e91d2a20 100644
--- a/include/sway/tree/view.h
+++ b/include/sway/tree/view.h
@@ -118,6 +118,8 @@ struct sway_view {
 struct sway_xdg_shell_v6_view {
 	struct sway_view view;
 
+	enum wlr_server_decoration_manager_mode deco_mode;
+
 	struct wl_listener commit;
 	struct wl_listener request_move;
 	struct wl_listener request_resize;
@@ -134,6 +136,8 @@ struct sway_xdg_shell_v6_view {
 struct sway_xdg_shell_view {
 	struct sway_view view;
 
+	enum wlr_server_decoration_manager_mode deco_mode;
+
 	struct wl_listener commit;
 	struct wl_listener request_move;
 	struct wl_listener request_resize;
-- 
cgit v1.2.3