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/view.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/view.h')
-rw-r--r-- | include/sway/tree/view.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/sway/tree/view.h b/include/sway/tree/view.h index 5fdecc2b..f73ce571 100644 --- a/include/sway/tree/view.h +++ b/include/sway/tree/view.h | |||
@@ -284,10 +284,10 @@ void view_for_each_popup(struct sway_view *view, | |||
284 | void view_init(struct sway_view *view, enum sway_view_type type, | 284 | void view_init(struct sway_view *view, enum sway_view_type type, |
285 | const struct sway_view_impl *impl); | 285 | const struct sway_view_impl *impl); |
286 | 286 | ||
287 | void view_free(struct sway_view *view); | ||
288 | |||
289 | void view_destroy(struct sway_view *view); | 287 | void view_destroy(struct sway_view *view); |
290 | 288 | ||
289 | void view_begin_destroy(struct sway_view *view); | ||
290 | |||
291 | void view_map(struct sway_view *view, struct wlr_surface *wlr_surface); | 291 | void view_map(struct sway_view *view, struct wlr_surface *wlr_surface); |
292 | 292 | ||
293 | void view_unmap(struct sway_view *view); | 293 | void view_unmap(struct sway_view *view); |