diff options
Diffstat (limited to 'include/sway/server.h')
-rw-r--r-- | include/sway/server.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/include/sway/server.h b/include/sway/server.h index 0efc6baa..1e1aa3cc 100644 --- a/include/sway/server.h +++ b/include/sway/server.h | |||
@@ -11,8 +11,8 @@ | |||
11 | #include <wlr/types/wlr_xdg_shell.h> | 11 | #include <wlr/types/wlr_xdg_shell.h> |
12 | #include <wlr/render/wlr_renderer.h> | 12 | #include <wlr/render/wlr_renderer.h> |
13 | // TODO WLR: make Xwayland optional | 13 | // TODO WLR: make Xwayland optional |
14 | #include <wlr/xwayland.h> | ||
15 | #include "list.h" | 14 | #include "list.h" |
15 | #include "sway/xwayland.h" | ||
16 | 16 | ||
17 | struct sway_server { | 17 | struct sway_server { |
18 | struct wl_display *wl_display; | 18 | struct wl_display *wl_display; |
@@ -38,12 +38,9 @@ struct sway_server { | |||
38 | struct wlr_xdg_shell *xdg_shell; | 38 | struct wlr_xdg_shell *xdg_shell; |
39 | struct wl_listener xdg_shell_surface; | 39 | struct wl_listener xdg_shell_surface; |
40 | 40 | ||
41 | struct wlr_xwayland *xwayland; | 41 | struct sway_xwayland xwayland; |
42 | struct wlr_xcursor_manager *xcursor_manager; | ||
43 | struct wl_listener xwayland_surface; | 42 | struct wl_listener xwayland_surface; |
44 | 43 | struct wl_listener xwayland_ready; | |
45 | struct wlr_wl_shell *wl_shell; | ||
46 | struct wl_listener wl_shell_surface; | ||
47 | 44 | ||
48 | bool debug_txn_timings; | 45 | bool debug_txn_timings; |
49 | 46 | ||