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 /sway/tree/root.c | |
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 'sway/tree/root.c')
-rw-r--r-- | sway/tree/root.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sway/tree/root.c b/sway/tree/root.c index c27ff2c3..5602f0a0 100644 --- a/sway/tree/root.c +++ b/sway/tree/root.c | |||
@@ -39,6 +39,7 @@ void root_create(void) { | |||
39 | wl_list_init(&root_container.sway_root->drag_icons); | 39 | wl_list_init(&root_container.sway_root->drag_icons); |
40 | wl_signal_init(&root_container.sway_root->events.new_container); | 40 | wl_signal_init(&root_container.sway_root->events.new_container); |
41 | root_container.sway_root->scratchpad = create_list(); | 41 | root_container.sway_root->scratchpad = create_list(); |
42 | root_container.sway_root->saved_workspaces = create_list(); | ||
42 | 43 | ||
43 | root_container.sway_root->output_layout_change.notify = | 44 | root_container.sway_root->output_layout_change.notify = |
44 | output_layout_handle_change; | 45 | output_layout_handle_change; |
@@ -50,6 +51,7 @@ void root_destroy(void) { | |||
50 | // sway_root | 51 | // sway_root |
51 | wl_list_remove(&root_container.sway_root->output_layout_change.link); | 52 | wl_list_remove(&root_container.sway_root->output_layout_change.link); |
52 | list_free(root_container.sway_root->scratchpad); | 53 | list_free(root_container.sway_root->scratchpad); |
54 | list_free(root_container.sway_root->saved_workspaces); | ||
53 | wlr_output_layout_destroy(root_container.sway_root->output_layout); | 55 | wlr_output_layout_destroy(root_container.sway_root->output_layout); |
54 | free(root_container.sway_root); | 56 | free(root_container.sway_root); |
55 | 57 | ||