From 172f3563f753353f13e9d6cec88f4c28f66987eb Mon Sep 17 00:00:00 2001 From: Michael Stapelberg Date: Sat, 17 Sep 2011 19:28:41 +0100 Subject: [PATCH] Implement focus switching (focus left/right) for floating windows Fixes: #475 --- src/tree.c | 31 +++++++++++++++++++++++++++---- 1 file changed, 27 insertions(+), 4 deletions(-) diff --git a/src/tree.c b/src/tree.c index 240c22a6..3f0705fc 100644 --- a/src/tree.c +++ b/src/tree.c @@ -421,12 +421,35 @@ static bool _tree_next(Con *con, char way, orientation_t orientation, bool wrap) return true; } + Con *parent = con->parent; + if (con->type == CT_FLOATING_CON) { - /* TODO: implement focus for floating windows */ - return false; - } + /* left/right focuses the previous/next floating container */ + if (orientation == HORIZ) { + Con *next; + if (way == 'n') + next = TAILQ_NEXT(con, floating_windows); + else next = TAILQ_PREV(con, floating_head, floating_windows); + + /* If there is no next/previous container, wrap */ + if (!next) { + if (way == 'n') + next = TAILQ_FIRST(&(parent->floating_head)); + else next = TAILQ_LAST(&(parent->floating_head), floating_head); + } - Con *parent = con->parent; + /* Still no next/previous container? bail out */ + if (!next) + return false; + + con_focus(con_descend_focused(next)); + return true; + } else { + /* up/down cycles through the Z-index */ + /* TODO: implement cycling through the z-index */ + return false; + } + } /* If the orientation does not match or there is no other con to focus, we * need to go higher in the hierarchy */ -- 2.39.5