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/desktop/output.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/desktop/output.c')
-rw-r--r-- | sway/desktop/output.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sway/desktop/output.c b/sway/desktop/output.c index 3d8bbff5..401d3c44 100644 --- a/sway/desktop/output.c +++ b/sway/desktop/output.c | |||
@@ -498,7 +498,7 @@ void output_damage_whole_container(struct sway_output *output, | |||
498 | static void damage_handle_destroy(struct wl_listener *listener, void *data) { | 498 | static void damage_handle_destroy(struct wl_listener *listener, void *data) { |
499 | struct sway_output *output = | 499 | struct sway_output *output = |
500 | wl_container_of(listener, output, damage_destroy); | 500 | wl_container_of(listener, output, damage_destroy); |
501 | container_destroy(output->swayc); | 501 | output_begin_destroy(output->swayc); |
502 | } | 502 | } |
503 | 503 | ||
504 | static void handle_destroy(struct wl_listener *listener, void *data) { | 504 | static void handle_destroy(struct wl_listener *listener, void *data) { |
@@ -506,7 +506,7 @@ static void handle_destroy(struct wl_listener *listener, void *data) { | |||
506 | wl_signal_emit(&output->events.destroy, output); | 506 | wl_signal_emit(&output->events.destroy, output); |
507 | 507 | ||
508 | if (output->swayc) { | 508 | if (output->swayc) { |
509 | container_destroy(output->swayc); | 509 | output_begin_destroy(output->swayc); |
510 | } | 510 | } |
511 | 511 | ||
512 | wl_list_remove(&output->link); | 512 | wl_list_remove(&output->link); |