diff options
author | Tony Crisci <tony@dubstepdish.com> | 2018-03-30 16:16:12 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-03-30 16:16:12 -0400 |
commit | 7e0d430a0cee8c24fd4461711f264829b0f67e2e (patch) | |
tree | d55cdd62bd7470ff67953613c25a3a9b85182f50 /include | |
parent | Use the new map/unmap events for xwayland views (diff) | |
parent | Merge pull request #1662 from swaywm/workspace-delete-fixes (diff) | |
download | sway-7e0d430a0cee8c24fd4461711f264829b0f67e2e.tar.gz sway-7e0d430a0cee8c24fd4461711f264829b0f67e2e.tar.zst sway-7e0d430a0cee8c24fd4461711f264829b0f67e2e.zip |
Merge branch 'wlroots' into wlroots-xwayland-map
Diffstat (limited to 'include')
-rw-r--r-- | include/sway/tree/container.h | 2 | ||||
-rw-r--r-- | include/sway/tree/layout.h | 2 | ||||
-rw-r--r-- | include/sway/tree/workspace.h | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/include/sway/tree/container.h b/include/sway/tree/container.h index 24e8468e..6aa66da0 100644 --- a/include/sway/tree/container.h +++ b/include/sway/tree/container.h | |||
@@ -104,7 +104,7 @@ struct sway_container *container_workspace_destroy( | |||
104 | 104 | ||
105 | struct sway_container *container_view_destroy(struct sway_container *view); | 105 | struct sway_container *container_view_destroy(struct sway_container *view); |
106 | 106 | ||
107 | void container_destroy(struct sway_container *cont); | 107 | struct sway_container *container_destroy(struct sway_container *cont); |
108 | 108 | ||
109 | struct sway_container *container_set_layout(struct sway_container *container, | 109 | struct sway_container *container_set_layout(struct sway_container *container, |
110 | enum sway_container_layout layout); | 110 | enum sway_container_layout layout); |
diff --git a/include/sway/tree/layout.h b/include/sway/tree/layout.h index 8239366b..0a904c4b 100644 --- a/include/sway/tree/layout.h +++ b/include/sway/tree/layout.h | |||
@@ -39,6 +39,8 @@ struct sway_container *container_add_sibling(struct sway_container *parent, | |||
39 | 39 | ||
40 | struct sway_container *container_remove_child(struct sway_container *child); | 40 | struct sway_container *container_remove_child(struct sway_container *child); |
41 | 41 | ||
42 | struct sway_container *container_reap_empty(struct sway_container *container); | ||
43 | |||
42 | void container_move_to(struct sway_container* container, | 44 | void container_move_to(struct sway_container* container, |
43 | struct sway_container* destination); | 45 | struct sway_container* destination); |
44 | 46 | ||
diff --git a/include/sway/tree/workspace.h b/include/sway/tree/workspace.h index d73b29c1..4e4c3450 100644 --- a/include/sway/tree/workspace.h +++ b/include/sway/tree/workspace.h | |||
@@ -23,4 +23,6 @@ struct sway_container *workspace_output_prev(struct sway_container *current); | |||
23 | 23 | ||
24 | struct sway_container *workspace_prev(struct sway_container *current); | 24 | struct sway_container *workspace_prev(struct sway_container *current); |
25 | 25 | ||
26 | bool workspace_is_visible(struct sway_container *ws); | ||
27 | |||
26 | #endif | 28 | #endif |