aboutsummaryrefslogtreecommitdiffstats
path: root/sway/input/seat.c
diff options
context:
space:
mode:
authorLibravatar Ryan Dwyer <ryandwyer1@gmail.com>2018-08-20 15:54:30 +1000
committerLibravatar Ryan Dwyer <ryandwyer1@gmail.com>2018-08-24 22:17:28 +1000
commitb6058703fa240780d66fac8ef96982c66b2b0263 (patch)
tree5e056a7859751c68c0cfb425fc6f37599c3f7400 /sway/input/seat.c
parentMerge pull request #2470 from ianyfan/completions (diff)
downloadsway-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/input/seat.c')
-rw-r--r--sway/input/seat.c21
1 files changed, 8 insertions, 13 deletions
diff --git a/sway/input/seat.c b/sway/input/seat.c
index 4077a8dd..997d7815 100644
--- a/sway/input/seat.c
+++ b/sway/input/seat.c
@@ -694,13 +694,11 @@ void seat_set_focus_warp(struct sway_seat *seat,
694 694
695 // clean up unfocused empty workspace on new output 695 // clean up unfocused empty workspace on new output
696 if (new_output_last_ws) { 696 if (new_output_last_ws) {
697 if (!workspace_is_visible(new_output_last_ws) 697 workspace_consider_destroy(new_output_last_ws);
698 && workspace_is_empty(new_output_last_ws)) { 698 if (new_output_last_ws->destroying &&
699 if (last_workspace == new_output_last_ws) { 699 last_workspace == new_output_last_ws) {
700 last_focus = NULL; 700 last_focus = NULL;
701 last_workspace = NULL; 701 last_workspace = NULL;
702 }
703 container_destroy(new_output_last_ws);
704 } 702 }
705 } 703 }
706 704
@@ -716,12 +714,9 @@ void seat_set_focus_warp(struct sway_seat *seat,
716 if (notify && last_workspace != new_workspace) { 714 if (notify && last_workspace != new_workspace) {
717 ipc_event_workspace(last_workspace, new_workspace, "focus"); 715 ipc_event_workspace(last_workspace, new_workspace, "focus");
718 } 716 }
719 if (!workspace_is_visible(last_workspace) 717 workspace_consider_destroy(last_workspace);
720 && workspace_is_empty(last_workspace)) { 718 if (last_workspace->destroying && last_workspace == last_focus) {
721 if (last_workspace == last_focus) { 719 last_focus = NULL;
722 last_focus = NULL;
723 }
724 container_destroy(last_workspace);
725 } 720 }
726 } 721 }
727 722