diff options
| author | Drew DeVault <sir@cmpwn.com> | 2018-04-07 11:19:25 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-07 11:19:25 -0400 |
| commit | f5a9bd5cb75b37376b98eadbff2facb7e0021d57 (patch) | |
| tree | f72219a5a2adec3380da5269fee025715f7bf333 /include/sway/tree | |
| parent | 2c9f0fb784f9781753679c8d1af3d8586c733f53 (diff) | |
| parent | 93ca8919f63c7022779c9780a24478559e7e47af (diff) | |
Merge pull request #1700 from swaywm/move-cmd-full
Implement move [left|right|up|down]
Diffstat (limited to 'include/sway/tree')
| -rw-r--r-- | include/sway/tree/container.h | 7 | ||||
| -rw-r--r-- | include/sway/tree/layout.h | 4 |
2 files changed, 10 insertions, 1 deletions
diff --git a/include/sway/tree/container.h b/include/sway/tree/container.h index 4c60530f..2a8b8aba 100644 --- a/include/sway/tree/container.h +++ b/include/sway/tree/container.h @@ -182,4 +182,11 @@ void container_create_notify(struct sway_container *container); void container_damage_whole(struct sway_container *container); +bool container_reap_empty(struct sway_container *con); + +struct sway_container *container_reap_empty_recursive( + struct sway_container *con); + +struct sway_container *container_flatten(struct sway_container *container); + #endif diff --git a/include/sway/tree/layout.h b/include/sway/tree/layout.h index fc5ce21f..49ae00e4 100644 --- a/include/sway/tree/layout.h +++ b/include/sway/tree/layout.h @@ -1,7 +1,7 @@ #ifndef _SWAY_LAYOUT_H #define _SWAY_LAYOUT_H - #include <wlr/types/wlr_output_layout.h> +#include <wlr/render/wlr_texture.h> #include "sway/tree/container.h" enum movement_direction { @@ -29,6 +29,8 @@ struct sway_root { struct wl_list xwayland_unmanaged; // sway_xwayland_unmanaged::link + struct wlr_texture *debug_tree; + struct { struct wl_signal new_container; } events; |