2 files changed, 20 insertions, 0 deletions

diff --git a/include/sway/server.h b/include/sway/server.h
index bfdb7b8a..3fa72e84 100644
--- a/include/sway/server.h
+++ b/include/sway/server.h
@@ -31,6 +31,9 @@ struct sway_server {
         struct wlr_xdg_shell_v6 *xdg_shell_v6;
         struct wl_listener xdg_shell_v6_surface;
 
+        struct wlr_xwayland *xwayland;
+        struct wl_listener xwayland_surface;
+
         struct wlr_wl_shell *wl_shell;
         struct wl_listener wl_shell_surface;
 };
@@ -45,6 +48,7 @@ void output_add_notify(struct wl_listener *listener, void *data);
 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 7aa04794..83ac8285 100644
--- a/include/sway/view.h
+++ b/include/sway/view.h
@@ -3,6 +3,7 @@
 #include <wayland-server.h>
 #include <wlr/types/wlr_surface.h>
 #include <wlr/types/wlr_xdg_shell_v6.h>
+#include <wlr/xwayland.h>
 
 struct sway_container;
 struct sway_view;
@@ -19,6 +20,19 @@ struct sway_xdg_surface_v6 {
         int pending_width, pending_height;
 };
 
+struct sway_xwayland_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 request_configure;
+        struct wl_listener destroy;
+
+        int pending_width, pending_height;
+};
+
 struct sway_wl_shell_surface {
         struct sway_view *view;
 
@@ -58,11 +72,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;
         };