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

Bugfix: restore focus to the correct window when a non-focused window gets destroyed (+testcase)

This commit is contained in:
Michael Stapelberg 2011-03-14 16:34:35 +01:00
parent f162e7efaa
commit cdeb49127f
2 changed files with 36 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/con.c
View File

@ -623,12 +623,18 @@ Con *con_next_focused(Con *con) {
return con_descend_focused(output_get_content(con->parent->parent)); return con_descend_focused(output_get_content(con->parent->parent));
} }
/* try to focus the next container on the same level as this one */ /* if 'con' is not the first entry in the focus stack, use the first one as
next = TAILQ_NEXT(con, focused); * it’s currently focused already */
Con *first = TAILQ_FIRST(&(con->parent->focus_head));
/* if that was not possible, go up to its parent */ if (first != con) {
if (next == TAILQ_END(&(parent->nodes_head))) DLOG("Using first entry %p\n", first);
next = con->parent; next = first;
} else {
/* try to focus the next container on the same level as this one or fall
* back to its parent */
if (!(next = TAILQ_NEXT(con, focused)))
next = con->parent;
}
/* now go down the focus stack as far as /* now go down the focus stack as far as
* possible, excluding the current container */ * possible, excluding the current container */

24
testcases/t/29-focus-after-close.t
View File

@ -4,8 +4,11 @@
# Check if the focus is correctly restored after closing windows. # Check if the focus is correctly restored after closing windows.
# #
use i3test; use i3test;
use X11::XCB qw(:all);
use List::Util qw(first); use List::Util qw(first);
my $x = X11::XCB::Connection->new;
my $i3 = i3("/tmp/nestedcons"); my $i3 = i3("/tmp/nestedcons");
my $tmp = fresh_workspace; my $tmp = fresh_workspace;
@ -87,6 +90,27 @@ is(get_focused($tmp), $right, 'top right container focused (in focus stack)');
my $tr = first { $_->{id} eq $right } @{$nodes->[0]->{nodes}}; my $tr = first { $_->{id} eq $right } @{$nodes->[0]->{nodes}};
is($tr->{focused}, 1, 'top right container really has focus'); is($tr->{focused}, 1, 'top right container really has focus');
##############################################################
# check if focus is correct after closing an unfocused window
##############################################################
$tmp = fresh_workspace;
ok(@{get_ws_content($tmp)} == 0, 'no containers yet');
$first = open_empty_con($i3);
$middle = open_empty_con($i3);
# XXX: the $right empty con will be filled with the x11 window we are creating afterwards
$right = open_empty_con($i3);
my $win = open_standard_window($x, '#00ff00');
cmd qq|[con_id="$middle"] focus|;
$win->destroy;
sleep 0.25;
is(get_focused($tmp), $middle, 'middle container focused');
############################################################## ##############################################################
# and now for something completely different: # and now for something completely different:
# check if the pointer position is relevant when restoring focus # check if the pointer position is relevant when restoring focus