Merge pull request #1970 from emersion/xdg-shell-stable

Add xdg-shell stable support

2 files changed, 32 insertions, 0 deletions

diff --git a/include/sway/server.h b/include/sway/server.h
index ac685bf8..d04ea896 100644
--- a/include/sway/server.h
+++ b/include/sway/server.h
@@ -8,6 +8,7 @@
 #include <wlr/types/wlr_data_device.h>
 #include <wlr/types/wlr_layer_shell.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 <wlr/xwayland.h>
@@ -33,6 +34,9 @@ struct sway_server {
         struct wlr_xdg_shell_v6 *xdg_shell_v6;
         struct wl_listener xdg_shell_v6_surface;
 
+        struct wlr_xdg_shell *xdg_shell;
+        struct wl_listener xdg_shell_surface;
+
         struct wlr_xwayland *xwayland;
         struct wlr_xcursor_manager *xcursor_manager;
         struct wl_listener xwayland_surface;
@@ -52,6 +56,7 @@ void handle_new_output(struct wl_listener *listener, void *data);
 
 void handle_layer_shell_surface(struct wl_listener *listener, void *data);
 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_xwayland_surface(struct wl_listener *listener, void *data);
 void handle_wl_shell_surface(struct wl_listener *listener, void *data);
 
diff --git a/include/sway/tree/view.h b/include/sway/tree/view.h
index 8091fe0c..17e579c8 100644
--- a/include/sway/tree/view.h
+++ b/include/sway/tree/view.h
@@ -12,6 +12,7 @@ struct sway_container;
 enum sway_view_type {
         SWAY_VIEW_WL_SHELL,
         SWAY_VIEW_XDG_SHELL_V6,
+        SWAY_VIEW_XDG_SHELL,
         SWAY_VIEW_XWAYLAND,
 };
 
@@ -54,6 +55,7 @@ struct sway_view {
 
         union {
                 struct wlr_xdg_surface_v6 *wlr_xdg_surface_v6;
+                struct wlr_xdg_surface *wlr_xdg_surface;
                 struct wlr_xwayland_surface *wlr_xwayland_surface;
                 struct wlr_wl_shell_surface *wlr_wl_shell_surface;
         };
@@ -82,6 +84,22 @@ struct sway_xdg_shell_v6_view {
         int pending_width, pending_height;
 };
 
+struct sway_xdg_shell_view {
+        struct sway_view view;
+
+        struct wl_listener commit;
+        struct wl_listener request_move;
+        struct wl_listener request_resize;
+        struct wl_listener request_maximize;
+        struct wl_listener request_fullscreen;
+        struct wl_listener new_popup;
+        struct wl_listener map;
+        struct wl_listener unmap;
+        struct wl_listener destroy;
+
+        int pending_width, pending_height;
+};
+
 struct sway_xwayland_view {
         struct sway_view view;
 
@@ -156,6 +174,15 @@ struct sway_xdg_popup_v6 {
         struct wl_listener destroy;
 };
 
+struct sway_xdg_popup {
+        struct sway_view_child child;
+
+        struct wlr_xdg_surface *wlr_xdg_surface;
+
+        struct wl_listener new_popup;
+        struct wl_listener destroy;
+};
+
 const char *view_get_title(struct sway_view *view);
 
 const char *view_get_app_id(struct sway_view *view);