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

Bugfix: restore focus to the correct window when a non-focused window gets destroyed (+testcase)

Browse Source
This commit is contained in:
Michael Stapelberg
2011-03-14 16:34:35 +01:00
parent f162e7efaa
commit cdeb49127f
2 changed files with 36 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/con.c
View File

@ -623,12 +623,18 @@ Con *con_next_focused(Con *con) {
return con_descend_focused(output_get_content(con->parent->parent));
}
/* try to focus the next container on the same level as this one */
next = TAILQ_NEXT(con, focused);
/* if that was not possible, go up to its parent */
if (next == TAILQ_END(&(parent->nodes_head)))
next = con->parent;
/* if 'con' is not the first entry in the focus stack, use the first one as
* it’s currently focused already */
Con *first = TAILQ_FIRST(&(con->parent->focus_head));
if (first != con) {
DLOG("Using first entry %p\n", first);
next = first;
} else {
/* try to focus the next container on the same level as this one or fall
* back to its parent */
if (!(next = TAILQ_NEXT(con, focused)))
next = con->parent;
}
/* now go down the focus stack as far as
* possible, excluding the current container */