Add xdg-decoration-unstable-v1 support

2 files changed, 16 insertions, 6 deletions

diff --git a/include/rootston/desktop.h b/include/rootston/desktop.h
index 2d28fa10..51cf68db 100644
--- a/include/rootston/desktop.h
+++ b/include/rootston/desktop.h
@@ -5,6 +5,7 @@
 #include <wlr/config.h>
 #include <wlr/types/wlr_compositor.h>
 #include <wlr/types/wlr_gamma_control.h>
+#include <wlr/types/wlr_idle_inhibit_v1.h>
 #include <wlr/types/wlr_idle.h>
 #include <wlr/types/wlr_input_inhibitor.h>
 #include <wlr/types/wlr_layer_shell.h>
@@ -13,17 +14,14 @@
 #include <wlr/types/wlr_output_layout.h>
 #include <wlr/types/wlr_output.h>
 #include <wlr/types/wlr_primary_selection.h>
+#include <wlr/types/wlr_screencopy_v1.h>
 #include <wlr/types/wlr_screenshooter.h>
 #include <wlr/types/wlr_virtual_keyboard_v1.h>
 #include <wlr/types/wlr_wl_shell.h>
 #include <wlr/types/wlr_xcursor_manager.h>
+#include <wlr/types/wlr_xdg_decoration_v1.h>
 #include <wlr/types/wlr_xdg_shell_v6.h>
 #include <wlr/types/wlr_xdg_shell.h>
-#include <wlr/types/wlr_list.h>
-#include <wlr/types/wlr_idle.h>
-#include <wlr/types/wlr_idle_inhibit_v1.h>
-#include <wlr/types/wlr_screencopy_v1.h>
-#include "rootston/view.h"
 #include "rootston/config.h"
 #include "rootston/output.h"
 #include "rootston/view.h"
@@ -48,6 +46,7 @@ struct roots_desktop {
 	struct wlr_screenshooter *screenshooter;
 	struct wlr_export_dmabuf_manager_v1 *export_dmabuf_manager_v1;
 	struct wlr_server_decoration_manager *server_decoration_manager;
+	struct wlr_xdg_decoration_manager_v1 *xdg_decoration_manager;
 	struct wlr_primary_selection_device_manager *primary_selection_device_manager;
 	struct wlr_idle *idle;
 	struct wlr_idle_inhibit_manager_v1 *idle_inhibit;
@@ -64,7 +63,7 @@ struct roots_desktop {
 	struct wl_listener xdg_shell_surface;
 	struct wl_listener wl_shell_surface;
 	struct wl_listener layer_shell_surface;
-	struct wl_listener decoration_new;
+	struct wl_listener xdg_toplevel_decoration;
 	struct wl_listener input_inhibit_activate;
 	struct wl_listener input_inhibit_deactivate;
 	struct wl_listener virtual_keyboard_new;
@@ -94,6 +93,7 @@ void view_apply_damage(struct roots_view *view);
 void view_damage_whole(struct roots_view *view);
 void view_update_position(struct roots_view *view, double x, double y);
 void view_update_size(struct roots_view *view, uint32_t width, uint32_t height);
+void view_update_decorated(struct roots_view *view, bool decorated);
 void view_initial_focus(struct roots_view *view);
 void view_map(struct roots_view *view, struct wlr_surface *surface);
 void view_unmap(struct roots_view *view);
@@ -101,6 +101,7 @@ void view_arrange_maximized(struct roots_view *view);
 
 void handle_xdg_shell_v6_surface(struct wl_listener *listener, void *data);
 void handle_xdg_shell_surface(struct wl_listener *listener, void *data);
+void handle_xdg_toplevel_decoration(struct wl_listener *listener, void *data);
 void handle_wl_shell_surface(struct wl_listener *listener, void *data);
 void handle_layer_shell_surface(struct wl_listener *listener, void *data);
 void handle_xwayland_surface(struct wl_listener *listener, void *data);
diff --git a/include/rootston/view.h b/include/rootston/view.h
index 4e3859d5..69cbc87c 100644
--- a/include/rootston/view.h
+++ b/include/rootston/view.h
@@ -4,6 +4,7 @@
 #include <wlr/config.h>
 #include <wlr/types/wlr_box.h>
 #include <wlr/types/wlr_surface.h>
+#include <wlr/types/wlr_xdg_decoration_v1.h>
 #include <wlr/types/wlr_xdg_shell_v6.h>
 #include <wlr/types/wlr_xdg_shell.h>
 
@@ -190,6 +191,14 @@ struct roots_xdg_popup {
 	struct wl_listener new_popup;
 };
 
+struct roots_xdg_toplevel_decoration {
+	struct wlr_xdg_toplevel_decoration_v1 *wlr_decoration;
+	struct roots_xdg_surface *surface;
+	struct wl_listener destroy;
+	struct wl_listener request_mode;
+	struct wl_listener surface_commit;
+};
+
 void view_get_box(const struct roots_view *view, struct wlr_box *box);
 void view_activate(struct roots_view *view, bool active);
 void view_move(struct roots_view *view, double x, double y);