diff options
author | Pascal Pascher <aur@clouddrop.de> | 2018-07-24 22:16:06 +0200 |
---|---|---|
committer | Pascal Pascher <aur@clouddrop.de> | 2018-07-24 22:16:06 +0200 |
commit | 24ad1c3983192b47345566fd876e26b45160d68e (patch) | |
tree | b617f8d15cb20897b1c016fb67fab80d7245c66a /include/sway/tree/view.h | |
parent | Merge pull request #2165 from swaywm/pid-workspaces (diff) | |
download | sway-24ad1c3983192b47345566fd876e26b45160d68e.tar.gz sway-24ad1c3983192b47345566fd876e26b45160d68e.tar.zst sway-24ad1c3983192b47345566fd876e26b45160d68e.zip |
Added meson option "enable_xwayland" (default: true) to enable/disable xwayland support
Diffstat (limited to 'include/sway/tree/view.h')
-rw-r--r-- | include/sway/tree/view.h | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/include/sway/tree/view.h b/include/sway/tree/view.h index 3bdfe252..af12cf88 100644 --- a/include/sway/tree/view.h +++ b/include/sway/tree/view.h | |||
@@ -3,7 +3,9 @@ | |||
3 | #include <wayland-server.h> | 3 | #include <wayland-server.h> |
4 | #include <wlr/types/wlr_surface.h> | 4 | #include <wlr/types/wlr_surface.h> |
5 | #include <wlr/types/wlr_xdg_shell_v6.h> | 5 | #include <wlr/types/wlr_xdg_shell_v6.h> |
6 | #ifdef HAVE_XWAYLAND | ||
6 | #include <wlr/xwayland.h> | 7 | #include <wlr/xwayland.h> |
8 | #endif | ||
7 | #include "sway/input/input-manager.h" | 9 | #include "sway/input/input-manager.h" |
8 | #include "sway/input/seat.h" | 10 | #include "sway/input/seat.h" |
9 | 11 | ||
@@ -12,7 +14,9 @@ struct sway_container; | |||
12 | enum sway_view_type { | 14 | enum sway_view_type { |
13 | SWAY_VIEW_XDG_SHELL_V6, | 15 | SWAY_VIEW_XDG_SHELL_V6, |
14 | SWAY_VIEW_XDG_SHELL, | 16 | SWAY_VIEW_XDG_SHELL, |
17 | #ifdef HAVE_XWAYLAND | ||
15 | SWAY_VIEW_XWAYLAND, | 18 | SWAY_VIEW_XWAYLAND, |
19 | #endif | ||
16 | }; | 20 | }; |
17 | 21 | ||
18 | enum sway_view_prop { | 22 | enum sway_view_prop { |
@@ -22,7 +26,9 @@ enum sway_view_prop { | |||
22 | VIEW_PROP_INSTANCE, | 26 | VIEW_PROP_INSTANCE, |
23 | VIEW_PROP_WINDOW_TYPE, | 27 | VIEW_PROP_WINDOW_TYPE, |
24 | VIEW_PROP_WINDOW_ROLE, | 28 | VIEW_PROP_WINDOW_ROLE, |
29 | #ifdef HAVE_XWAYLAND | ||
25 | VIEW_PROP_X11_WINDOW_ID, | 30 | VIEW_PROP_X11_WINDOW_ID, |
31 | #endif | ||
26 | }; | 32 | }; |
27 | 33 | ||
28 | struct sway_view_impl { | 34 | struct sway_view_impl { |
@@ -90,7 +96,9 @@ struct sway_view { | |||
90 | union { | 96 | union { |
91 | struct wlr_xdg_surface_v6 *wlr_xdg_surface_v6; | 97 | struct wlr_xdg_surface_v6 *wlr_xdg_surface_v6; |
92 | struct wlr_xdg_surface *wlr_xdg_surface; | 98 | struct wlr_xdg_surface *wlr_xdg_surface; |
99 | #ifdef HAVE_XWAYLAND | ||
93 | struct wlr_xwayland_surface *wlr_xwayland_surface; | 100 | struct wlr_xwayland_surface *wlr_xwayland_surface; |
101 | #endif | ||
94 | struct wlr_wl_shell_surface *wlr_wl_shell_surface; | 102 | struct wlr_wl_shell_surface *wlr_wl_shell_surface; |
95 | }; | 103 | }; |
96 | 104 | ||
@@ -133,7 +141,7 @@ struct sway_xdg_shell_view { | |||
133 | struct wl_listener unmap; | 141 | struct wl_listener unmap; |
134 | struct wl_listener destroy; | 142 | struct wl_listener destroy; |
135 | }; | 143 | }; |
136 | 144 | #ifdef HAVE_XWAYLAND | |
137 | struct sway_xwayland_view { | 145 | struct sway_xwayland_view { |
138 | struct sway_view view; | 146 | struct sway_view view; |
139 | 147 | ||
@@ -165,7 +173,7 @@ struct sway_xwayland_unmanaged { | |||
165 | struct wl_listener unmap; | 173 | struct wl_listener unmap; |
166 | struct wl_listener destroy; | 174 | struct wl_listener destroy; |
167 | }; | 175 | }; |
168 | 176 | #endif | |
169 | struct sway_view_child; | 177 | struct sway_view_child; |
170 | 178 | ||
171 | struct sway_view_child_impl { | 179 | struct sway_view_child_impl { |
@@ -281,9 +289,10 @@ struct sway_view *view_from_wlr_xdg_surface( | |||
281 | struct wlr_xdg_surface *xdg_surface); | 289 | struct wlr_xdg_surface *xdg_surface); |
282 | struct sway_view *view_from_wlr_xdg_surface_v6( | 290 | struct sway_view *view_from_wlr_xdg_surface_v6( |
283 | struct wlr_xdg_surface_v6 *xdg_surface_v6); | 291 | struct wlr_xdg_surface_v6 *xdg_surface_v6); |
292 | #ifdef HAVE_XWAYLAND | ||
284 | struct sway_view *view_from_wlr_xwayland_surface( | 293 | struct sway_view *view_from_wlr_xwayland_surface( |
285 | struct wlr_xwayland_surface *xsurface); | 294 | struct wlr_xwayland_surface *xsurface); |
286 | 295 | #endif | |
287 | struct sway_view *view_from_wlr_surface(struct wlr_surface *surface); | 296 | struct sway_view *view_from_wlr_surface(struct wlr_surface *surface); |
288 | 297 | ||
289 | /** | 298 | /** |