mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-29 19:31:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #302 from fluxchief/destroy-workspace-fix

Browse source 
Make destroy_workspace behave as expected
This commit is contained in:
Drew DeVault 2015-12-13 12:28:04 -05:00
parent 6596582bc3 d77d03ce84
commit c0f75f68b9
2 changed files with 31 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
sway/container.c
View file

@ -323,9 +323,6 @@ swayc_t *destroy_workspace(swayc_t *workspace) {
if (!ASSERT_NONNULL(workspace)) { if (!ASSERT_NONNULL(workspace)) {
return NULL; return NULL;
} }
// NOTE: This is called from elsewhere without checking children length
// TODO move containers to other workspaces?
// for now just dont delete
// Do not destroy this if it's the last workspace on this output // Do not destroy this if it's the last workspace on this output
swayc_t *output = swayc_parent_by_type(workspace, C_OUTPUT); swayc_t *output = swayc_parent_by_type(workspace, C_OUTPUT);
@ -333,14 +330,35 @@ swayc_t *destroy_workspace(swayc_t *workspace) {
return NULL; return NULL;
} }
// Do not destroy if there are children swayc_t *parent = workspace->parent;
// destroy the WS if there are no children
if (workspace->children->length == 0 && workspace->floating->length == 0) { if (workspace->children->length == 0 && workspace->floating->length == 0) {
sway_log(L_DEBUG, "destroying workspace '%s'", workspace->name); sway_log(L_DEBUG, "destroying workspace '%s'", workspace->name);
swayc_t *parent = workspace->parent; } else {
free_swayc(workspace); // Move children to a different workspace on this output
return parent; swayc_t *new_workspace = NULL;
int i;
for(i = 0; i < output->children->length; i++) {
if(output->children->items[i] != workspace) {
break;
}
}
new_workspace = output->children->items[i];
sway_log(L_DEBUG, "moving children to different workspace '%s' -> '%s'",
workspace->name, new_workspace->name);
for(i = 0; i < workspace->children->length; i++) {
move_container_to(workspace->children->items[i], new_workspace);
}
for(i = 0; i < workspace->floating->length; i++) {
move_container_to(workspace->floating->items[i], new_workspace);
}
} }
return NULL;
free_swayc(workspace);
return parent;
} }
swayc_t *destroy_container(swayc_t *container) { swayc_t *destroy_container(swayc_t *container) {

6
sway/focus.c
View file

@ -37,7 +37,11 @@ static void update_focus(swayc_t *c) {
ipc_event_workspace(prev, c); ipc_event_workspace(prev, c);
// update visibility of old workspace // update visibility of old workspace
update_visibility(prev); update_visibility(prev);
destroy_workspace(prev);
// if the old workspace has no children, destroy it
if(prev->children->length == 0 && prev->floating->length == 0){
destroy_workspace(prev);
}
} }
// Update visibility of newly focused workspace // Update visibility of newly focused workspace
update_visibility(c); update_visibility(c);