nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

s/con->parent/parent to make it more readable 

(and necessary for the next commit)
This commit is contained in:
Michael Stapelberg 2010-07-17 00:54:03 +02:00
parent 7415f14448
commit 33572b8c4b
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/tree.c
View File

@ -132,6 +132,8 @@ static void fix_floating_parent(Con *con, Con *vanishing) {
* *
*/ */
void tree_close(Con *con, bool kill_window) { void tree_close(Con *con, bool kill_window) {
Con *parent = con->parent;
/* check floating clients and adjust old_parent if necessary */ /* check floating clients and adjust old_parent if necessary */
fix_floating_parent(croot, con); fix_floating_parent(croot, con);
@ -139,12 +141,12 @@ void tree_close(Con *con, bool kill_window) {
Con *next; Con *next;
if (con->type == CT_FLOATING_CON) { if (con->type == CT_FLOATING_CON) {
next = TAILQ_NEXT(con, floating_windows); next = TAILQ_NEXT(con, floating_windows);
if (next == TAILQ_END(&(con->parent->floating_head))) if (next == TAILQ_END(&(parent->floating_head)))
next = con_get_workspace(con); next = con_get_workspace(con);
} else { } else {
next = TAILQ_NEXT(con, focused); next = TAILQ_NEXT(con, focused);
if (next == TAILQ_END(&(con->parent->nodes_head))) { if (next == TAILQ_END(&(parent->nodes_head))) {
next = con->parent; next = parent;
while (!TAILQ_EMPTY(&(next->focus_head)) && while (!TAILQ_EMPTY(&(next->focus_head)) &&
TAILQ_FIRST(&(next->focus_head)) != con) TAILQ_FIRST(&(next->focus_head)) != con)
next = TAILQ_FIRST(&(next->focus_head)); next = TAILQ_FIRST(&(next->focus_head));
@ -176,14 +178,14 @@ void tree_close(Con *con, bool kill_window) {
x_con_kill(con); x_con_kill(con);
con_detach(con); con_detach(con);
con_fix_percent(con->parent, WINDOW_REMOVE); con_fix_percent(parent, WINDOW_REMOVE);
if (con_is_floating(con)) { if (con_is_floating(con)) {
DLOG("Container was floating, killing floating container\n"); DLOG("Container was floating, killing floating container\n");
TAILQ_REMOVE(&(con->parent->parent->floating_head), con->parent, floating_windows); TAILQ_REMOVE(&(parent->parent->floating_head), parent, floating_windows);
TAILQ_REMOVE(&(con->parent->parent->focus_head), con->parent, focused); TAILQ_REMOVE(&(parent->parent->focus_head), parent, focused);
tree_close(con->parent, false); tree_close(parent, false);
next = NULL; next = NULL;
} }