diff options
| author |  Ryan Dwyer <ryandwyer1@gmail.com> | 2018-06-29 20:04:24 +1000 |
|---|---|---|
| committer | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-06-29 20:04:24 +1000 |
| commit | a2fbb20a616444213ff3967b33eed7f4561e3978 (patch) | |
| tree | 276a133eb78d6e0655bc164693650454d43a22ca /include/sway/server.h | |
| parent | Add comment about usage to arrange_windows declaration (diff) | |
| parent | Merge pull request #2172 from apreiml/fix-keybinding-modifier-handling (diff) | |
| download | sway-a2fbb20a616444213ff3967b33eed7f4561e3978.tar.gz sway-a2fbb20a616444213ff3967b33eed7f4561e3978.tar.zst sway-a2fbb20a616444213ff3967b33eed7f4561e3978.zip | |
Merge remote-tracking branch 'upstream/master' into atomic
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 | ||