diff options
author | 2018-07-24 23:37:41 +0200 | |
---|---|---|
committer | 2018-07-24 23:37:41 +0200 | |
commit | 2bf893248a94c7f70a9557aad4a8228731041eeb (patch) | |
tree | ec86137e1b5881151b20917f311ecce3d24fba8f /include/sway | |
parent | Added meson option "enable_xwayland" (default: true) to enable/disable xwayla... (diff) | |
download | sway-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')
-rw-r--r-- | include/sway/criteria.h | 4 | ||||
-rw-r--r-- | include/sway/server.h | 4 | ||||
-rw-r--r-- | include/sway/tree/layout.h | 4 | ||||
-rw-r--r-- | include/sway/tree/view.h | 12 |
4 files changed, 12 insertions, 12 deletions
diff --git a/include/sway/criteria.h b/include/sway/criteria.h index 5b5c0f58..23efe9d4 100644 --- a/include/sway/criteria.h +++ b/include/sway/criteria.h | |||
@@ -25,9 +25,9 @@ struct criteria { | |||
25 | pcre *instance; | 25 | pcre *instance; |
26 | pcre *con_mark; | 26 | pcre *con_mark; |
27 | uint32_t con_id; // internal ID | 27 | uint32_t con_id; // internal ID |
28 | #ifdef HAVE_XWAYLAND | 28 | #ifdef HAVE_XWAYLAND |
29 | uint32_t id; // X11 window ID | 29 | uint32_t id; // X11 window ID |
30 | #endif | 30 | #endif |
31 | pcre *window_role; | 31 | pcre *window_role; |
32 | uint32_t window_type; | 32 | uint32_t window_type; |
33 | bool floating; | 33 | bool floating; |
diff --git a/include/sway/server.h b/include/sway/server.h index fb22125f..b6a6bde3 100644 --- a/include/sway/server.h +++ b/include/sway/server.h | |||
@@ -41,11 +41,11 @@ struct sway_server { | |||
41 | 41 | ||
42 | struct wlr_xdg_shell *xdg_shell; | 42 | struct wlr_xdg_shell *xdg_shell; |
43 | struct wl_listener xdg_shell_surface; | 43 | struct wl_listener xdg_shell_surface; |
44 | #ifdef HAVE_XWAYLAND | 44 | #ifdef HAVE_XWAYLAND |
45 | struct sway_xwayland xwayland; | 45 | struct sway_xwayland xwayland; |
46 | struct wl_listener xwayland_surface; | 46 | struct wl_listener xwayland_surface; |
47 | struct wl_listener xwayland_ready; | 47 | struct wl_listener xwayland_ready; |
48 | #endif | 48 | #endif |
49 | bool debug_txn_timings; | 49 | bool debug_txn_timings; |
50 | 50 | ||
51 | list_t *transactions; | 51 | list_t *transactions; |
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; | |||
14 | enum sway_view_type { | 14 | enum 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 | ||
22 | enum sway_view_prop { | 22 | enum 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 | ||
34 | struct sway_view_impl { | 34 | struct 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 | ||