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

Merge branch 'master' into next

This commit is contained in:
Michael Stapelberg 2011-09-18 14:39:33 +01:00
parent 5c57e205f0 254299b4cd
commit c88425147e
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/con.c
View File

@ -835,15 +835,16 @@ Con *con_descend_tiling_focused(Con *con) {
*/ */
Con *con_descend_direction(Con *con, direction_t direction) { Con *con_descend_direction(Con *con, direction_t direction) {
Con *most = NULL; Con *most = NULL;
DLOG("con_descend_direction(%p, %d)\n", con, direction); int orientation = con_orientation(con);
DLOG("con_descend_direction(%p, orientation %d, direction %d)\n", con, orientation, direction);
if (direction == D_LEFT || direction == D_RIGHT) { if (direction == D_LEFT || direction == D_RIGHT) {
if (con->orientation == HORIZ) { if (orientation == HORIZ) {
/* If the direction is horizontal, we can use either the first /* If the direction is horizontal, we can use either the first
* (D_RIGHT) or the last con (D_LEFT) */ * (D_RIGHT) or the last con (D_LEFT) */
if (direction == D_RIGHT) if (direction == D_RIGHT)
most = TAILQ_FIRST(&(con->nodes_head)); most = TAILQ_FIRST(&(con->nodes_head));
else most = TAILQ_LAST(&(con->nodes_head), nodes_head); else most = TAILQ_LAST(&(con->nodes_head), nodes_head);
} else if (con->orientation == VERT) { } else if (orientation == VERT) {
/* Wrong orientation. We use the last focused con. Within that con, /* Wrong orientation. We use the last focused con. Within that con,
* we recurse to chose the left/right con or at least the last * we recurse to chose the left/right con or at least the last
* focused one. */ * focused one. */
@ -856,13 +857,13 @@ Con *con_descend_direction(Con *con, direction_t direction) {
} }
if (direction == D_UP || direction == D_DOWN) { if (direction == D_UP || direction == D_DOWN) {
if (con->orientation == VERT) { if (orientation == VERT) {
/* If the direction is vertical, we can use either the first /* If the direction is vertical, we can use either the first
* (D_DOWN) or the last con (D_UP) */ * (D_DOWN) or the last con (D_UP) */
if (direction == D_UP) if (direction == D_UP)
most = TAILQ_LAST(&(con->nodes_head), nodes_head); most = TAILQ_LAST(&(con->nodes_head), nodes_head);
else most = TAILQ_FIRST(&(con->nodes_head)); else most = TAILQ_FIRST(&(con->nodes_head));
} else if (con->orientation == HORIZ) { } else if (orientation == HORIZ) {
/* Wrong orientation. We use the last focused con. Within that con, /* Wrong orientation. We use the last focused con. Within that con,
* we recurse to chose the top/bottom con or at least the last * we recurse to chose the top/bottom con or at least the last
* focused one. */ * focused one. */