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

Bugfix: Correctly restore focus after close (and add testcase)

This commit is contained in:
Michael Stapelberg 2010-07-04 19:50:44 +02:00
parent 5adcea6b3c
commit b186446fb7
2 changed files with 53 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/tree.c
View File

@ -143,8 +143,11 @@ void tree_close(Con *con, bool kill_window) {
next = con_get_workspace(con);
} else {
next = TAILQ_NEXT(con, focused);
if (next == TAILQ_END(&(con->parent->nodes_head)))
if (next == TAILQ_END(&(con->parent->nodes_head))) {
next = con->parent;
while (!TAILQ_EMPTY(&(next->focus_head)))
next = TAILQ_FIRST(&(next->focus_head));
}
}
DLOG("closing %p, kill_window = %d\n", con, kill_window);

49
testcases/t/29-focus-after-close.t Normal file
View File

@ -0,0 +1,49 @@
#!perl
# vim:ts=4:sw=4:expandtab
#
# Check if the focus is correctly restored after closing windows.
#
use i3test tests => 6;
use Time::HiRes qw(sleep);
my $i3 = i3("/tmp/nestedcons");
my $tmp = get_unused_workspace();
$i3->command("workspace $tmp")->recv;
ok(@{get_ws_content($tmp)} == 0, 'no containers yet');
$i3->command('open')->recv;
my ($nodes, $focus) = get_ws_content($tmp);
my $first = $focus->[0];
$i3->command('split v')->recv;
($nodes, $focus) = get_ws_content($tmp);
is($nodes->[0]->{focused}, 0, 'split container not focused');
$i3->command('level up')->recv;
($nodes, $focus) = get_ws_content($tmp);
is($nodes->[0]->{focused}, 1, 'split container focused after level up');
$i3->command('open')->recv;
($nodes, $focus) = get_ws_content($tmp);
my $second = $focus->[0];
isnt($first, $second, 'different container focused');
##############################################################
# see if the focus goes down to $first (not to its split parent)
# when closing $second
##############################################################
$i3->command('kill')->recv;
# TODO: this testcase sometimes has different outcomes when the
# sleep is missing. why?
sleep 0.25;
($nodes, $focus) = get_ws_content($tmp);
is($nodes->[0]->{nodes}->[0]->{id}, $first, 'first container found');
is($nodes->[0]->{nodes}->[0]->{focused}, 1, 'first container focused');
diag( "Testing i3, Perl $], $^X" );