diff options
author | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-08-20 15:54:30 +1000 |
---|---|---|
committer | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-08-24 22:17:28 +1000 |
commit | b6058703fa240780d66fac8ef96982c66b2b0263 (patch) | |
tree | 5e056a7859751c68c0cfb425fc6f37599c3f7400 /include/sway/tree/workspace.h | |
parent | Merge pull request #2470 from ianyfan/completions (diff) | |
download | sway-b6058703fa240780d66fac8ef96982c66b2b0263.tar.gz sway-b6058703fa240780d66fac8ef96982c66b2b0263.tar.zst sway-b6058703fa240780d66fac8ef96982c66b2b0263.zip |
Refactor destroy functions and save workspaces when there's no outputs
This changes the destroy functions to the following:
* output_begin_destroy
* output_destroy
* workspace_begin_destroy
* workspace_destroy
* container_begin_destroy
* container_destroy
* view_begin_destroy
* view_destroy
The terminology was `destroy` and `free`, and it has been changed to
`begin_destroy` and `destroy` respectively.
When the last output is disconnected, its workspaces will now be stashed
in the root. Upon connection of a new output they will be restored.
There is a new function `workspace_consider_destroy` which decides
whether the given workspace should be destroyed or not (ie. empty and
not visible).
Calling container_begin_destroy will no longer automatically reap the
parents. In some places we want to reap the parents and in some we
don't, so this is left to the caller.
container_reap_empty_recursive and container_reap_empty have been
combined into one function and it will recurse up the tree.
Diffstat (limited to 'include/sway/tree/workspace.h')
-rw-r--r-- | include/sway/tree/workspace.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/include/sway/tree/workspace.h b/include/sway/tree/workspace.h index 35c91017..efcb7c69 100644 --- a/include/sway/tree/workspace.h +++ b/include/sway/tree/workspace.h | |||
@@ -18,6 +18,15 @@ extern char *prev_workspace_name; | |||
18 | 18 | ||
19 | struct sway_container *workspace_get_initial_output(const char *name); | 19 | struct sway_container *workspace_get_initial_output(const char *name); |
20 | 20 | ||
21 | struct sway_container *workspace_create(struct sway_container *output, | ||
22 | const char *name); | ||
23 | |||
24 | void workspace_destroy(struct sway_container *workspace); | ||
25 | |||
26 | void workspace_begin_destroy(struct sway_container *workspace); | ||
27 | |||
28 | void workspace_consider_destroy(struct sway_container *ws); | ||
29 | |||
21 | char *workspace_next_name(const char *output_name); | 30 | char *workspace_next_name(const char *output_name); |
22 | 31 | ||
23 | bool workspace_switch(struct sway_container *workspace, | 32 | bool workspace_switch(struct sway_container *workspace, |