diff options
Diffstat (limited to 'include/sway/tree/view.h')
| -rw-r--r-- | include/sway/tree/view.h | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/include/sway/tree/view.h b/include/sway/tree/view.h index 4a8c3cb1..4716c688 100644 --- a/include/sway/tree/view.h +++ b/include/sway/tree/view.h @@ -4,7 +4,7 @@ #include <wlr/types/wlr_surface.h> #include <wlr/types/wlr_xdg_shell_v6.h> #include "config.h" -#ifdef HAVE_XWAYLAND +#if HAVE_XWAYLAND #include <wlr/xwayland.h> #endif #include "sway/input/input-manager.h" @@ -16,7 +16,7 @@ struct sway_xdg_decoration; enum sway_view_type { SWAY_VIEW_XDG_SHELL_V6, SWAY_VIEW_XDG_SHELL, -#ifdef HAVE_XWAYLAND +#if HAVE_XWAYLAND SWAY_VIEW_XWAYLAND, #endif }; @@ -28,7 +28,7 @@ enum sway_view_prop { VIEW_PROP_INSTANCE, VIEW_PROP_WINDOW_TYPE, VIEW_PROP_WINDOW_ROLE, -#ifdef HAVE_XWAYLAND +#if HAVE_XWAYLAND VIEW_PROP_X11_WINDOW_ID, VIEW_PROP_X11_PARENT_ID, #endif @@ -67,10 +67,6 @@ struct sway_view { pid_t pid; - // Geometry of the view itself (excludes borders) in layout coordinates - double x, y; - int width, height; - double saved_x, saved_y; int saved_width, saved_height; @@ -104,7 +100,7 @@ struct sway_view { union { struct wlr_xdg_surface_v6 *wlr_xdg_surface_v6; struct wlr_xdg_surface *wlr_xdg_surface; -#ifdef HAVE_XWAYLAND +#if HAVE_XWAYLAND struct wlr_xwayland_surface *wlr_xwayland_surface; #endif struct wlr_wl_shell_surface *wlr_wl_shell_surface; @@ -148,7 +144,7 @@ struct sway_xdg_shell_view { struct wl_listener unmap; struct wl_listener destroy; }; -#ifdef HAVE_XWAYLAND +#if HAVE_XWAYLAND struct sway_xwayland_view { struct sway_view view; @@ -327,7 +323,7 @@ struct sway_view *view_from_wlr_xdg_surface( struct wlr_xdg_surface *xdg_surface); struct sway_view *view_from_wlr_xdg_surface_v6( struct wlr_xdg_surface_v6 *xdg_surface_v6); -#ifdef HAVE_XWAYLAND +#if HAVE_XWAYLAND struct sway_view *view_from_wlr_xwayland_surface( struct wlr_xwayland_surface *xsurface); #endif |