Introduce orientation_from_direction

This commit is contained in:
Orestis Floros 2018-08-23 15:36:23 +03:00
parent 72cc719c5d
commit 6e1b79e057
No known key found for this signature in database
GPG Key ID: E9AD9F32E401E38F
4 changed files with 16 additions and 2 deletions

View File

@ -174,3 +174,9 @@ bool parse_long(const char *str, long *out, int base);
* *
*/ */
ssize_t slurp(const char *path, char **buf); ssize_t slurp(const char *path, char **buf);
/**
* Convert a direction to its corresponding orientation.
*
*/
orientation_t orientation_from_direction(direction_t direction);

View File

@ -265,7 +265,7 @@ void tree_move(Con *con, int direction) {
return; return;
} }
orientation_t o = (direction == D_LEFT || direction == D_RIGHT ? HORIZ : VERT); orientation_t o = orientation_from_direction(direction);
Con *same_orientation = con_parent_with_orientation(con, o); Con *same_orientation = con_parent_with_orientation(con, o);
/* The do {} while is used to 'restart' at this point with a different /* The do {} while is used to 'restart' at this point with a different

View File

@ -57,7 +57,7 @@ bool resize_find_tiling_participants(Con **current, Con **other, direction_t dir
} }
/* Go up in the tree and search for a container to resize */ /* Go up in the tree and search for a container to resize */
const orientation_t search_orientation = ((direction == D_LEFT || direction == D_RIGHT) ? HORIZ : VERT); const orientation_t search_orientation = orientation_from_direction(direction);
const bool dir_backwards = (direction == D_UP || direction == D_LEFT); const bool dir_backwards = (direction == D_UP || direction == D_LEFT);
while (first->type != CT_WORKSPACE && while (first->type != CT_WORKSPACE &&
first->type != CT_FLOATING_CON && first->type != CT_FLOATING_CON &&

View File

@ -507,3 +507,11 @@ ssize_t slurp(const char *path, char **buf) {
} }
return (ssize_t)n; return (ssize_t)n;
} }
/*
* Convert a direction to its corresponding orientation.
*
*/
orientation_t orientation_from_direction(direction_t direction) {
return (direction == D_LEFT || direction == D_RIGHT) ? HORIZ : VERT;
}