diff options
Diffstat (limited to 'include/sway/tree')
| -rw-r--r-- | include/sway/tree/container.h | 4 | ||||
| -rw-r--r-- | include/sway/tree/view.h | 7 |
2 files changed, 5 insertions, 6 deletions
diff --git a/include/sway/tree/container.h b/include/sway/tree/container.h index 751612e2..05761150 100644 --- a/include/sway/tree/container.h +++ b/include/sway/tree/container.h @@ -2,7 +2,7 @@ #define _SWAY_CONTAINER_H #include <stdint.h> #include <sys/types.h> -#include <wlr/types/wlr_compositor.h> +#include <wlr/types/wlr_surface.h> #include "list.h" #include "sway/tree/node.h" @@ -364,7 +364,7 @@ bool container_is_sticky_or_child(struct sway_container *con); * This will destroy pairs of redundant H/V splits * e.g. H[V[H[app app]] app] -> H[app app app] * The middle "V[H[" are eliminated by a call to container_squash - * on the V[ con. It's grandchildren are added to its parent. + * on the V[ con. It's grandchildren are added to it's parent. * * This function is roughly equivalent to i3's tree_flatten here: * https://github.com/i3/i3/blob/1f0c628cde40cf87371481041b7197344e0417c6/src/tree.c#L651 diff --git a/include/sway/tree/view.h b/include/sway/tree/view.h index 1fb39ce7..ee34af48 100644 --- a/include/sway/tree/view.h +++ b/include/sway/tree/view.h @@ -1,7 +1,7 @@ #ifndef _SWAY_VIEW_H #define _SWAY_VIEW_H #include <wayland-server-core.h> -#include <wlr/types/wlr_compositor.h> +#include <wlr/types/wlr_surface.h> #include "config.h" #if HAVE_XWAYLAND #include <wlr/xwayland.h> @@ -109,7 +109,7 @@ struct sway_view { list_t *executed_criteria; // struct criteria * union { - struct wlr_xdg_toplevel *wlr_xdg_toplevel; + struct wlr_xdg_surface *wlr_xdg_surface; #if HAVE_XWAYLAND struct wlr_xwayland_surface *wlr_xwayland_surface; #endif @@ -170,7 +170,6 @@ struct sway_xwayland_unmanaged { int lx, ly; - struct wl_listener request_activate; struct wl_listener request_configure; struct wl_listener request_fullscreen; struct wl_listener commit; @@ -218,7 +217,7 @@ struct sway_subsurface { struct sway_xdg_popup { struct sway_view_child child; - struct wlr_xdg_popup *wlr_xdg_popup; + struct wlr_xdg_surface *wlr_xdg_surface; struct wl_listener new_popup; struct wl_listener destroy; |