Allow focus child/parent when in fullscreen.

This is now restricted according to the already defined fullscreen
focus constraints. Test case 157 was removed, as we don't prevent
level up/down in fullscreen anymore. Those commands are properly
tested in fullscreen by test case 156.

Fixes: #612
This commit is contained in:
Fernando Tarlá Cardoso Lemos
2012-05-26 18:36:25 -03:00
committed by Michael Stapelberg
parent da1e232757
commit 250c260eaa
6 changed files with 48 additions and 80 deletions

View File

@ -375,38 +375,34 @@ void tree_split(Con *con, orientation_t orientation) {
}
/*
* Moves focus one level up.
* Moves focus one level up. Returns true if focus changed.
*
*/
void level_up(void) {
/* We cannot go up when we are in fullscreen mode at the moment, that would
* be totally not intuitive */
if (focused->fullscreen_mode != CF_NONE) {
LOG("Currently in fullscreen, not going up\n");
return;
}
bool level_up(void) {
/* We can focus up to the workspace, but not any higher in the tree */
if ((focused->parent->type != CT_CON &&
focused->parent->type != CT_WORKSPACE) ||
focused->type == CT_WORKSPACE) {
LOG("Cannot go up any further\n");
return;
return false;
}
con_focus(focused->parent);
return true;
}
/*
* Moves focus one level down.
* Moves focus one level down. Returns true if focus changed.
*
*/
void level_down(void) {
bool level_down(void) {
/* Go down the focus stack of the current node */
Con *next = TAILQ_FIRST(&(focused->focus_head));
if (next == TAILQ_END(&(focused->focus_head))) {
printf("cannot go down\n");
return;
return false;
}
con_focus(next);
return true;
}
static void mark_unmapped(Con *con) {