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

Merge branch 'master' into next

This commit is contained in:
Michael Stapelberg 2012-01-07 18:50:46 +00:00
parent 6345124049 3ce7f03f02
commit 470ee00012
2 changed files with 55 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/con.c
View File

@ -810,7 +810,7 @@ Con *con_get_next(Con *con, char way, orientation_t orientation) {
*/ */
Con *con_descend_focused(Con *con) { Con *con_descend_focused(Con *con) {
Con *next = con; Con *next = con;
while (!TAILQ_EMPTY(&(next->focus_head))) while (next != focused && !TAILQ_EMPTY(&(next->focus_head)))
next = TAILQ_FIRST(&(next->focus_head)); next = TAILQ_FIRST(&(next->focus_head));
return next; return next;
} }
@ -827,6 +827,8 @@ Con *con_descend_tiling_focused(Con *con) {
Con *next = con; Con *next = con;
Con *before; Con *before;
Con *child; Con *child;
if (next == focused)
return next;
do { do {
before = next; before = next;
TAILQ_FOREACH(child, &(next->focus_head), focused) { TAILQ_FOREACH(child, &(next->focus_head), focused) {
@ -836,7 +838,7 @@ Con *con_descend_tiling_focused(Con *con) {
next = child; next = child;
break; break;
} }
} while (before != next); } while (before != next && next != focused);
return next; return next;
} }

51
testcases/t/186-regress-assign-focus-parent.t Normal file
View File

@ -0,0 +1,51 @@
#!perl
# vim:ts=4:sw=4:expandtab
#
# Regression test: New windows were not opened in the correct place if they
# matched an assignment.
# Wrong behaviour manifested itself up to (including) commit
# f78caf8c5815ae7a66de9e4b734546fd740cc19d
#
use i3test i3_autostart => 0;
my $config = <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
assign [title="testcase"] targetws
EOT
my $pid = launch_with_config($config);
my $i3 = i3(get_socket_path(0));
cmd 'workspace targetws';
open_window(name => "testcase");
my $nodes = get_ws_content('targetws');
is(scalar @$nodes, 1, 'precisely one window');
open_window(name => "testcase");
$nodes = get_ws_content('targetws');
is(scalar @$nodes, 2, 'precisely two windows');
cmd 'split v';
open_window(name => "testcase");
$nodes = get_ws_content('targetws');
is(scalar @$nodes, 2, 'still two windows');
# focus parent. the new window should now be opened right next to the last one.
cmd 'focus parent';
open_window(name => "testcase");
$nodes = get_ws_content('targetws');
is(scalar @$nodes, 3, 'new window opened next to last one');
exit_gracefully($pid);
done_testing;