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

Restrict directional focus in fullscreen. 

This reuses the same fullscreen focus logic to ensure that focus
doesn't escape a fullscreen container.
next
Fernando Tarlá Cardoso Lemos 2012-05-26 19:53:02 -03:00 committed by Michael Stapelberg
parent 250c260eaa
commit 8bf4e9e059
2 changed files with 77 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/tree.c
View File

@ -556,6 +556,10 @@ static bool _tree_next(Con *con, char way, orientation_t orientation, bool wrap)
else next = TAILQ_LAST(&(parent->nodes_head), nodes_head);
}
/* Don't violate fullscreen focus restrictions. */
if (!con_fullscreen_permits_focusing(next))
return false;
/* 3: focus choice comes in here. at the moment we will go down
* until we find a window */
/* TODO: check for window, atm we only go down as far as possible */

73
testcases/t/156-fullscreen-focus.t
View File

@ -131,6 +131,24 @@ is($x->input_focus, $right2->id, 'bottom right window focused again');
cmd '[id="' . $left->id . '"] focus';
is($x->input_focus, $right2->id, 'prevented focus change to left window');
cmd 'focus up';
is($x->input_focus, $right1->id, 'allowed focus up');
cmd 'focus down';
is($x->input_focus, $right2->id, 'allowed focus down');
cmd 'focus left';
is($x->input_focus, $right2->id, 'prevented focus left');
cmd 'focus right';
is($x->input_focus, $right2->id, 'prevented focus right');
cmd 'focus down';
is($x->input_focus, $right1->id, 'allowed focus wrap (down)');
cmd 'focus up';
is($x->input_focus, $right2->id, 'allowed focus wrap (up)');
cmd '[id="' . $diff_ws->id . '"] focus';
is($x->input_focus, $right2->id, 'prevented focus change to different ws');
@ -158,7 +176,62 @@ is($x->input_focus, $right2->id, 'bottom right window focused again');
cmd '[id="' . $left->id . '"] focus';
is($x->input_focus, $right2->id, 'prevented focus change to left window');
cmd 'focus up';
is($x->input_focus, $right1->id, 'allowed focus up');
cmd 'focus down';
is($x->input_focus, $right2->id, 'allowed focus down');
cmd 'focus left';
is($x->input_focus, $right2->id, 'prevented focus left');
cmd 'focus right';
is($x->input_focus, $right2->id, 'prevented focus right');
cmd 'focus down';
is($x->input_focus, $right1->id, 'allowed focus wrap (down)');
cmd 'focus up';
is($x->input_focus, $right2->id, 'allowed focus wrap (up)');
cmd '[id="' . $diff_ws->id . '"] focus';
is($x->input_focus, $diff_ws->id, 'allowed focus change to different ws');
################################################################################
# More testing of the interaction between wrapping and the fullscreen focus
# restrictions.
################################################################################
cmd '[id="' . $right1->id . '"] focus';
is($x->input_focus, $right1->id, 'upper right window focused');
cmd 'focus parent';
cmd 'fullscreen';
cmd 'focus child';
cmd 'split v';
my $right12 = open_window;
cmd 'focus down';
is($x->input_focus, $right2->id, 'bottom right window focused');
cmd 'split v';
my $right22 = open_window;
cmd 'focus parent';
cmd 'fullscreen';
cmd 'focus child';
cmd 'focus down';
is($x->input_focus, $right2->id, 'focus did not leave parent container (1)');
cmd 'focus down';
is($x->input_focus, $right22->id, 'focus did not leave parent container (2)');
cmd 'focus up';
is($x->input_focus, $right2->id, 'focus did not leave parent container (3)');
cmd 'focus up';
is($x->input_focus, $right22->id, 'focus did not leave parent container (4)');
done_testing;