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/output.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/output.h')
-rw-r--r-- | include/sway/output.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/sway/output.h b/include/sway/output.h index d0d034b3..098540fb 100644 --- a/include/sway/output.h +++ b/include/sway/output.h | |||
@@ -39,6 +39,12 @@ struct sway_output { | |||
39 | } events; | 39 | } events; |
40 | }; | 40 | }; |
41 | 41 | ||
42 | struct sway_container *output_create(struct sway_output *sway_output); | ||
43 | |||
44 | void output_destroy(struct sway_container *output); | ||
45 | |||
46 | void output_begin_destroy(struct sway_container *output); | ||
47 | |||
42 | typedef void (*sway_surface_iterator_func_t)(struct sway_output *output, | 48 | typedef void (*sway_surface_iterator_func_t)(struct sway_output *output, |
43 | struct wlr_surface *surface, struct wlr_box *box, float rotation, | 49 | struct wlr_surface *surface, struct wlr_box *box, float rotation, |
44 | void *user_data); | 50 | void *user_data); |