aboutsummaryrefslogtreecommitdiffstats
path: root/include/sway/tree/view.h
diff options
context:
space:
mode:
authorLibravatar emersion <contact@emersion.fr>2018-11-18 00:33:06 +0100
committerLibravatar emersion <contact@emersion.fr>2018-11-18 00:33:06 +0100
commitcad851805bea6b4777685df1c6adf8cb9fa71835 (patch)
tree145fcb048cc3df3d04a8b6afb90de68dd2dd80a9 /include/sway/tree/view.h
parentMerge pull request #3142 from RyanDwyer/move-view-properties (diff)
downloadsway-cad851805bea6b4777685df1c6adf8cb9fa71835.tar.gz
sway-cad851805bea6b4777685df1c6adf8cb9fa71835.tar.zst
sway-cad851805bea6b4777685df1c6adf8cb9fa71835.zip
Use #if instead of #ifdef
Diffstat (limited to 'include/sway/tree/view.h')
-rw-r--r--include/sway/tree/view.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/include/sway/tree/view.h b/include/sway/tree/view.h
index 8f045c6a..4716c688 100644
--- a/include/sway/tree/view.h
+++ b/include/sway/tree/view.h
@@ -4,7 +4,7 @@
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#include "config.h" 6#include "config.h"
7#ifdef HAVE_XWAYLAND 7#if HAVE_XWAYLAND
8#include <wlr/xwayland.h> 8#include <wlr/xwayland.h>
9#endif 9#endif
10#include "sway/input/input-manager.h" 10#include "sway/input/input-manager.h"
@@ -16,7 +16,7 @@ struct sway_xdg_decoration;
16enum sway_view_type { 16enum sway_view_type {
17 SWAY_VIEW_XDG_SHELL_V6, 17 SWAY_VIEW_XDG_SHELL_V6,
18 SWAY_VIEW_XDG_SHELL, 18 SWAY_VIEW_XDG_SHELL,
19#ifdef HAVE_XWAYLAND 19#if HAVE_XWAYLAND
20 SWAY_VIEW_XWAYLAND, 20 SWAY_VIEW_XWAYLAND,
21#endif 21#endif
22}; 22};
@@ -28,7 +28,7 @@ enum sway_view_prop {
28 VIEW_PROP_INSTANCE, 28 VIEW_PROP_INSTANCE,
29 VIEW_PROP_WINDOW_TYPE, 29 VIEW_PROP_WINDOW_TYPE,
30 VIEW_PROP_WINDOW_ROLE, 30 VIEW_PROP_WINDOW_ROLE,
31#ifdef HAVE_XWAYLAND 31#if HAVE_XWAYLAND
32 VIEW_PROP_X11_WINDOW_ID, 32 VIEW_PROP_X11_WINDOW_ID,
33 VIEW_PROP_X11_PARENT_ID, 33 VIEW_PROP_X11_PARENT_ID,
34#endif 34#endif
@@ -100,7 +100,7 @@ struct sway_view {
100 union { 100 union {
101 struct wlr_xdg_surface_v6 *wlr_xdg_surface_v6; 101 struct wlr_xdg_surface_v6 *wlr_xdg_surface_v6;
102 struct wlr_xdg_surface *wlr_xdg_surface; 102 struct wlr_xdg_surface *wlr_xdg_surface;
103#ifdef HAVE_XWAYLAND 103#if HAVE_XWAYLAND
104 struct wlr_xwayland_surface *wlr_xwayland_surface; 104 struct wlr_xwayland_surface *wlr_xwayland_surface;
105#endif 105#endif
106 struct wlr_wl_shell_surface *wlr_wl_shell_surface; 106 struct wlr_wl_shell_surface *wlr_wl_shell_surface;
@@ -144,7 +144,7 @@ struct sway_xdg_shell_view {
144 struct wl_listener unmap; 144 struct wl_listener unmap;
145 struct wl_listener destroy; 145 struct wl_listener destroy;
146}; 146};
147#ifdef HAVE_XWAYLAND 147#if HAVE_XWAYLAND
148struct sway_xwayland_view { 148struct sway_xwayland_view {
149 struct sway_view view; 149 struct sway_view view;
150 150
@@ -323,7 +323,7 @@ struct sway_view *view_from_wlr_xdg_surface(
323 struct wlr_xdg_surface *xdg_surface); 323 struct wlr_xdg_surface *xdg_surface);
324struct sway_view *view_from_wlr_xdg_surface_v6( 324struct sway_view *view_from_wlr_xdg_surface_v6(
325 struct wlr_xdg_surface_v6 *xdg_surface_v6); 325 struct wlr_xdg_surface_v6 *xdg_surface_v6);
326#ifdef HAVE_XWAYLAND 326#if HAVE_XWAYLAND
327struct sway_view *view_from_wlr_xwayland_surface( 327struct sway_view *view_from_wlr_xwayland_surface(
328 struct wlr_xwayland_surface *xsurface); 328 struct wlr_xwayland_surface *xsurface);
329#endif 329#endif