Merge branch 'wlroots' into feature/xwayland

2 files changed, 19 insertions, 1 deletions

diff --git a/include/sway/server.h b/include/sway/server.h
index 30b15e75..3fa72e84 100644
--- a/include/sway/server.h
+++ b/include/sway/server.h
@@ -33,6 +33,9 @@ struct sway_server {
 
         struct wlr_xwayland *xwayland;
         struct wl_listener xwayland_surface;
+
+        struct wlr_wl_shell *wl_shell;
+        struct wl_listener wl_shell_surface;
 };
 
 struct sway_server server;
@@ -46,5 +49,6 @@ void output_remove_notify(struct wl_listener *listener, void *data);
 
 void handle_xdg_shell_v6_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);
 
 #endif
diff --git a/include/sway/view.h b/include/sway/view.h
index 2d9b4ef5..83ac8285 100644
--- a/include/sway/view.h
+++ b/include/sway/view.h
@@ -33,6 +33,18 @@ struct sway_xwayland_surface {
         int pending_width, pending_height;
 };
 
+struct sway_wl_shell_surface {
+        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 destroy;
+
+        int pending_width, pending_height;
+};
+
 enum sway_view_type {
         SWAY_WL_SHELL_VIEW,
         SWAY_XDG_SHELL_V6_VIEW,
@@ -43,9 +55,9 @@ enum sway_view_type {
 
 enum sway_view_prop {
         VIEW_PROP_TITLE,
+        VIEW_PROP_APP_ID,
         VIEW_PROP_CLASS,
         VIEW_PROP_INSTANCE,
-        VIEW_PROP_APP_ID,
 };
 
 /**
@@ -61,11 +73,13 @@ struct sway_view {
         union {
                 struct wlr_xdg_surface_v6 *wlr_xdg_surface_v6;
                 struct wlr_xwayland_surface *wlr_xwayland_surface;
+                struct wlr_wl_shell_surface *wlr_wl_shell_surface;
         };
 
         union {
                 struct sway_xdg_surface_v6 *sway_xdg_surface_v6;
                 struct sway_xwayland_surface *sway_xwayland_surface;
+                struct sway_wl_shell_surface *sway_wl_shell_surface;
         };
 
         struct {