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

fix floating focus behaviour, extend testcase

Browse Source
This commit is contained in:
Michael Stapelberg
2010-11-14 22:35:44 +01:00
parent ffff4b159f
commit a27af52706
4 changed files with 72 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/con.c
View File

@ -422,9 +422,24 @@ Con *con_next_focused(Con *con) {
/* floating containers are attached to a workspace, so we focus either the
* next floating container (if any) or the workspace itself. */
if (con->type == CT_FLOATING_CON) {
DLOG("selecting next for CT_FLOATING_CON\n");
next = TAILQ_NEXT(con, floating_windows);
if (next == TAILQ_END(&(parent->floating_head)))
next = con_get_workspace(con);
if (next == TAILQ_END(&(parent->floating_head))) {
Con *ws = con_get_workspace(con);
next = ws;
DLOG("no more floating containers for next = %p, restoring workspace focus\n", next);
while (next != TAILQ_END(&(ws->focus_head)) && !TAILQ_EMPTY(&(next->focus_head))) {
next = TAILQ_FIRST(&(next->focus_head));
if (next == con) {
DLOG("skipping container itself, we want the next client\n");
next = TAILQ_NEXT(next, focused);
}
}
if (next == TAILQ_END(&(ws->focus_head))) {
DLOG("Focus list empty, returning NULL\n");
next = NULL;
}
}
return next;
}