From cda66e9a263d8467b6d1857808305d5e9f7bc3cd Mon Sep 17 00:00:00 2001
From: emersion <contact@emersion.fr>
Date: Mon, 18 Jun 2018 22:49:28 +0100
Subject: Automatically float xwayland windows

---
 include/sway/server.h | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'include/sway/server.h')

diff --git a/include/sway/server.h b/include/sway/server.h
index 65d96e7a..96cad69d 100644
--- a/include/sway/server.h
+++ b/include/sway/server.h
@@ -11,7 +11,7 @@
 #include <wlr/types/wlr_xdg_shell.h>
 #include <wlr/render/wlr_renderer.h>
 // TODO WLR: make Xwayland optional
-#include <wlr/xwayland.h>
+#include "sway/xwayland.h"
 
 struct sway_server {
 	struct wl_display *wl_display;
@@ -37,12 +37,9 @@ struct sway_server {
 	struct wlr_xdg_shell *xdg_shell;
 	struct wl_listener xdg_shell_surface;
 
-	struct wlr_xwayland *xwayland;
-	struct wlr_xcursor_manager *xcursor_manager;
+	struct sway_xwayland xwayland;
 	struct wl_listener xwayland_surface;
-
-	struct wlr_wl_shell *wl_shell;
-	struct wl_listener wl_shell_surface;
+	struct wl_listener xwayland_ready;
 };
 
 struct sway_server server;
-- 
cgit v1.2.3-54-g00ecf