aboutsummaryrefslogtreecommitdiff
path: root/sway/input
diff options
context:
space:
mode:
authorRyan Dwyer <ryandwyer1@gmail.com>2018-08-20 15:54:30 +1000
committerRyan Dwyer <ryandwyer1@gmail.com>2018-08-24 22:17:28 +1000
commitb6058703fa240780d66fac8ef96982c66b2b0263 (patch)
tree5e056a7859751c68c0cfb425fc6f37599c3f7400 /sway/input
parentf53c28d52a6954108592c246c013c0c4b076f09c (diff)
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')
-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,
// clean up unfocused empty workspace on new output
if (new_output_last_ws) {
- if (!workspace_is_visible(new_output_last_ws)
- && workspace_is_empty(new_output_last_ws)) {
- if (last_workspace == new_output_last_ws) {
- last_focus = NULL;
- last_workspace = NULL;
- }
- container_destroy(new_output_last_ws);
+ workspace_consider_destroy(new_output_last_ws);
+ if (new_output_last_ws->destroying &&
+ last_workspace == new_output_last_ws) {
+ last_focus = NULL;
+ last_workspace = NULL;
}
}
@@ -716,12 +714,9 @@ void seat_set_focus_warp(struct sway_seat *seat,
if (notify && last_workspace != new_workspace) {
ipc_event_workspace(last_workspace, new_workspace, "focus");
}
- if (!workspace_is_visible(last_workspace)
- && workspace_is_empty(last_workspace)) {
- if (last_workspace == last_focus) {
- last_focus = NULL;
- }
- container_destroy(last_workspace);
+ workspace_consider_destroy(last_workspace);
+ if (last_workspace->destroying && last_workspace == last_focus) {
+ last_focus = NULL;
}
}