aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLibravatar Drew DeVault <sir@cmpwn.com>2018-04-07 11:19:25 -0400
committerLibravatar GitHub <noreply@github.com>2018-04-07 11:19:25 -0400
commitf5a9bd5cb75b37376b98eadbff2facb7e0021d57 (patch)
treef72219a5a2adec3380da5269fee025715f7bf333 /include
parentMerge pull request #1762 from DanySpin97/wlroots (diff)
parentDon't rejigger if parent has two children (diff)
downloadsway-f5a9bd5cb75b37376b98eadbff2facb7e0021d57.tar.gz
sway-f5a9bd5cb75b37376b98eadbff2facb7e0021d57.tar.zst
sway-f5a9bd5cb75b37376b98eadbff2facb7e0021d57.zip
Merge pull request #1700 from swaywm/move-cmd-full
Implement move [left|right|up|down]
Diffstat (limited to 'include')
-rw-r--r--include/sway/debug.h7
-rw-r--r--include/sway/tree/container.h7
-rw-r--r--include/sway/tree/layout.h4
3 files changed, 17 insertions, 1 deletions
diff --git a/include/sway/debug.h b/include/sway/debug.h
new file mode 100644
index 00000000..2430d319
--- /dev/null
+++ b/include/sway/debug.h
@@ -0,0 +1,7 @@
1#ifndef SWAY_DEBUG_H
2#define SWAY_DEBUG_H
3
4extern bool enable_debug_tree;
5void update_debug_tree();
6
7#endif
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);
182 182
183void container_damage_whole(struct sway_container *container); 183void container_damage_whole(struct sway_container *container);
184 184
185bool container_reap_empty(struct sway_container *con);
186
187struct sway_container *container_reap_empty_recursive(
188 struct sway_container *con);
189
190struct sway_container *container_flatten(struct sway_container *container);
191
185#endif 192#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 @@
1#ifndef _SWAY_LAYOUT_H 1#ifndef _SWAY_LAYOUT_H
2#define _SWAY_LAYOUT_H 2#define _SWAY_LAYOUT_H
3
4#include <wlr/types/wlr_output_layout.h> 3#include <wlr/types/wlr_output_layout.h>
4#include <wlr/render/wlr_texture.h>
5#include "sway/tree/container.h" 5#include "sway/tree/container.h"
6 6
7enum movement_direction { 7enum movement_direction {
@@ -29,6 +29,8 @@ struct sway_root {
29 29
30 struct wl_list xwayland_unmanaged; // sway_xwayland_unmanaged::link 30 struct wl_list xwayland_unmanaged; // sway_xwayland_unmanaged::link
31 31
32 struct wlr_texture *debug_tree;
33
32 struct { 34 struct {
33 struct wl_signal new_container; 35 struct wl_signal new_container;
34 } events; 36 } events;