aboutsummaryrefslogtreecommitdiffstats
path: root/include/sway/tree
diff options
context:
space:
mode:
authorLibravatar Pascal Pascher <aur@clouddrop.de>2018-07-24 23:37:41 +0200
committerLibravatar Pascal Pascher <aur@clouddrop.de>2018-07-24 23:37:41 +0200
commit2bf893248a94c7f70a9557aad4a8228731041eeb (patch)
treeec86137e1b5881151b20917f311ecce3d24fba8f /include/sway/tree
parentAdded meson option "enable_xwayland" (default: true) to enable/disable xwayla... (diff)
downloadsway-2bf893248a94c7f70a9557aad4a8228731041eeb.tar.gz
sway-2bf893248a94c7f70a9557aad4a8228731041eeb.tar.zst
sway-2bf893248a94c7f70a9557aad4a8228731041eeb.zip
style fixes, exclude sway/desctop/xwayland.c when enable_xwayland: false
Diffstat (limited to 'include/sway/tree')
-rw-r--r--include/sway/tree/layout.h4
-rw-r--r--include/sway/tree/view.h12
2 files changed, 8 insertions, 8 deletions
diff --git a/include/sway/tree/layout.h b/include/sway/tree/layout.h
index da74e205..580acd16 100644
--- a/include/sway/tree/layout.h
+++ b/include/sway/tree/layout.h
@@ -27,9 +27,9 @@ struct sway_root {
27 struct wlr_output_layout *output_layout; 27 struct wlr_output_layout *output_layout;
28 28
29 struct wl_listener output_layout_change; 29 struct wl_listener output_layout_change;
30 #ifdef HAVE_XWAYLAND 30#ifdef HAVE_XWAYLAND
31 struct wl_list xwayland_unmanaged; // sway_xwayland_unmanaged::link 31 struct wl_list xwayland_unmanaged; // sway_xwayland_unmanaged::link
32 #endif 32#endif
33 struct wl_list drag_icons; // sway_drag_icon::link 33 struct wl_list drag_icons; // sway_drag_icon::link
34 34
35 struct wlr_texture *debug_tree; 35 struct wlr_texture *debug_tree;
diff --git a/include/sway/tree/view.h b/include/sway/tree/view.h
index af12cf88..d4416dd3 100644
--- a/include/sway/tree/view.h
+++ b/include/sway/tree/view.h
@@ -14,9 +14,9 @@ struct sway_container;
14enum sway_view_type { 14enum sway_view_type {
15 SWAY_VIEW_XDG_SHELL_V6, 15 SWAY_VIEW_XDG_SHELL_V6,
16 SWAY_VIEW_XDG_SHELL, 16 SWAY_VIEW_XDG_SHELL,
17 #ifdef HAVE_XWAYLAND 17#ifdef HAVE_XWAYLAND
18 SWAY_VIEW_XWAYLAND, 18 SWAY_VIEW_XWAYLAND,
19 #endif 19#endif
20}; 20};
21 21
22enum sway_view_prop { 22enum sway_view_prop {
@@ -26,9 +26,9 @@ enum sway_view_prop {
26 VIEW_PROP_INSTANCE, 26 VIEW_PROP_INSTANCE,
27 VIEW_PROP_WINDOW_TYPE, 27 VIEW_PROP_WINDOW_TYPE,
28 VIEW_PROP_WINDOW_ROLE, 28 VIEW_PROP_WINDOW_ROLE,
29 #ifdef HAVE_XWAYLAND 29#ifdef HAVE_XWAYLAND
30 VIEW_PROP_X11_WINDOW_ID, 30 VIEW_PROP_X11_WINDOW_ID,
31 #endif 31#endif
32}; 32};
33 33
34struct sway_view_impl { 34struct sway_view_impl {
@@ -96,9 +96,9 @@ struct sway_view {
96 union { 96 union {
97 struct wlr_xdg_surface_v6 *wlr_xdg_surface_v6; 97 struct wlr_xdg_surface_v6 *wlr_xdg_surface_v6;
98 struct wlr_xdg_surface *wlr_xdg_surface; 98 struct wlr_xdg_surface *wlr_xdg_surface;
99 #ifdef HAVE_XWAYLAND 99#ifdef HAVE_XWAYLAND
100 struct wlr_xwayland_surface *wlr_xwayland_surface; 100 struct wlr_xwayland_surface *wlr_xwayland_surface;
101 #endif 101#endif
102 struct wlr_wl_shell_surface *wlr_wl_shell_surface; 102 struct wlr_wl_shell_surface *wlr_wl_shell_surface;
103 }; 103 };
104 104