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/config/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/config/output.c')
-rw-r--r-- | sway/config/output.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sway/config/output.c b/sway/config/output.c index 1d8cb3ef..7f9b1007 100644 --- a/sway/config/output.c +++ b/sway/config/output.c | |||
@@ -181,13 +181,11 @@ void apply_output_config(struct output_config *oc, struct sway_container *output | |||
181 | struct wlr_output *wlr_output = output->sway_output->wlr_output; | 181 | struct wlr_output *wlr_output = output->sway_output->wlr_output; |
182 | 182 | ||
183 | if (oc && oc->enabled == 0) { | 183 | if (oc && oc->enabled == 0) { |
184 | struct sway_output *sway_output = output->sway_output; | ||
185 | if (output->sway_output->bg_pid != 0) { | 184 | if (output->sway_output->bg_pid != 0) { |
186 | terminate_swaybg(output->sway_output->bg_pid); | 185 | terminate_swaybg(output->sway_output->bg_pid); |
187 | output->sway_output->bg_pid = 0; | 186 | output->sway_output->bg_pid = 0; |
188 | } | 187 | } |
189 | container_destroy(output); | 188 | output_begin_destroy(output); |
190 | sway_output->swayc = NULL; | ||
191 | wlr_output_layout_remove(root_container.sway_root->output_layout, | 189 | wlr_output_layout_remove(root_container.sway_root->output_layout, |
192 | wlr_output); | 190 | wlr_output); |
193 | return; | 191 | return; |