koma/i3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Validate matched containers for "kill" command correctly.

Browse Source 
We now execute the validations when "kill" is executed even if match
criteria are used. This prevents users from killing workspace containers,
which instead kills all clients (as before when not using criteria).

fixes #1761
This commit is contained in:
Ingo Bürk
2015-12-27 22:11:51 -05:00
parent 0dd71674de
commit 19c273a2ad
6 changed files with 44 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/tree.c
View File

@ -362,34 +362,6 @@ bool tree_close_internal(Con *con, kill_window_t kill_window, bool dont_kill_par
return true;
}
/*
* Closes the current container using tree_close_internal().
*
*/
void tree_close_con(kill_window_t kill_window) {
assert(focused != NULL);
/* There *should* be no possibility to focus outputs / root container */
assert(focused->type != CT_OUTPUT);
assert(focused->type != CT_ROOT);
if (focused->type == CT_WORKSPACE) {
DLOG("Workspaces cannot be close, closing all children instead\n");
Con *child, *nextchild;
for (child = TAILQ_FIRST(&(focused->focus_head)); child;) {
nextchild = TAILQ_NEXT(child, focused);
DLOG("killing child=%p\n", child);
tree_close_internal(child, kill_window, false, false);
child = nextchild;
}
return;
}
/* Kill con */
tree_close_internal(focused, kill_window, false, false);
}
/*
* Splits (horizontally or vertically) the given container by creating a new
* container which contains the old one and the future ones.