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

Bugfix: Correctly revert floating focus when killing the last floating window (+test)

This commit is contained in:
Michael Stapelberg 2011-07-01 01:10:43 +02:00
parent 9611e46eb6
commit 23d4917e43
2 changed files with 47 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/con.c
View File

@ -646,7 +646,12 @@ Con *con_next_focused(Con *con) {
if (con->type == CT_FLOATING_CON) { if (con->type == CT_FLOATING_CON) {
DLOG("selecting next for CT_FLOATING_CON\n"); DLOG("selecting next for CT_FLOATING_CON\n");
next = TAILQ_NEXT(con, floating_windows); next = TAILQ_NEXT(con, floating_windows);
if (next == TAILQ_END(&(parent->floating_head))) { DLOG("next = %p\n", next);
if (!next) {
next = TAILQ_PREV(con, floating_head, floating_windows);
DLOG("using prev, next = %p\n", next);
}
if (!next) {
Con *ws = con_get_workspace(con); Con *ws = con_get_workspace(con);
next = ws; next = ws;
DLOG("no more floating containers for next = %p, restoring workspace focus\n", next); DLOG("no more floating containers for next = %p, restoring workspace focus\n", next);

44
testcases/t/35-floating-focus.t
View File

@ -59,9 +59,9 @@ is($x->input_focus, $second->id, 'second con still focused after killing third')
$tmp = fresh_workspace; $tmp = fresh_workspace;
$first = open_standard_window($x); # window 5 $first = open_standard_window($x, '#ff0000'); # window 5
$second = open_standard_window($x); # window 6 $second = open_standard_window($x, '#00ff00'); # window 6
my $third = open_standard_window($x); # window 7 my $third = open_standard_window($x, '#0000ff'); # window 7
is($x->input_focus, $third->id, 'last container focused'); is($x->input_focus, $third->id, 'last container focused');
@ -87,4 +87,42 @@ sleep 0.25;
is($x->input_focus, $first->id, 'first con focused after killing all floating cons'); is($x->input_focus, $first->id, 'first con focused after killing all floating cons');
#############################################################################
# 4: same test as 3, but with another split con
#############################################################################
$tmp = fresh_workspace;
$first = open_standard_window($x, '#ff0000'); # window 5
cmd 'split v';
cmd 'layout stacked';
$second = open_standard_window($x, '#00ff00'); # window 6
$third = open_standard_window($x, '#0000ff'); # window 7
is($x->input_focus, $third->id, 'last container focused');
cmd 'floating enable';
cmd '[id="' . $second->id . '"] focus';
is($x->input_focus, $second->id, 'second con focused');
cmd 'floating enable';
sleep 0.5;
# now kill the second one. focus should fall back to the third one, which is
# also floating
cmd 'kill';
sleep 0.25;
is($x->input_focus, $third->id, 'second con focused');
cmd 'kill';
sleep 0.25;
is($x->input_focus, $first->id, 'first con focused after killing all floating cons');
done_testing; done_testing;