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/layout.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/layout.c')
-rw-r--r-- | sway/tree/layout.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sway/tree/layout.c b/sway/tree/layout.c index a3de44ce..12e7342b 100644 --- a/sway/tree/layout.c +++ b/sway/tree/layout.c | |||
@@ -302,7 +302,7 @@ static void workspace_rejigger(struct sway_container *ws, | |||
302 | move_dir == MOVE_LEFT || move_dir == MOVE_RIGHT ? L_HORIZ : L_VERT; | 302 | move_dir == MOVE_LEFT || move_dir == MOVE_RIGHT ? L_HORIZ : L_VERT; |
303 | 303 | ||
304 | container_flatten(ws); | 304 | container_flatten(ws); |
305 | container_reap_empty_recursive(original_parent); | 305 | container_reap_empty(original_parent); |
306 | container_create_notify(new_parent); | 306 | container_create_notify(new_parent); |
307 | } | 307 | } |
308 | 308 | ||
@@ -325,7 +325,7 @@ static void move_out_of_tabs_stacks(struct sway_container *container, | |||
325 | container_insert_child(new_parent->parent, container, offs < 0 ? 0 : 1); | 325 | container_insert_child(new_parent->parent, container, offs < 0 ? 0 : 1); |
326 | } else { | 326 | } else { |
327 | container_insert_child(new_parent, container, offs < 0 ? 0 : 1); | 327 | container_insert_child(new_parent, container, offs < 0 ? 0 : 1); |
328 | container_reap_empty_recursive(new_parent->parent); | 328 | container_reap_empty(new_parent->parent); |
329 | container_flatten(new_parent->parent); | 329 | container_flatten(new_parent->parent); |
330 | } | 330 | } |
331 | container_create_notify(new_parent); | 331 | container_create_notify(new_parent); |