Implement 'split'

This commit is contained in:
Michael Stapelberg
2010-05-10 09:33:10 +02:00
parent 145ebc7584
commit 6a1c34d2c5
7 changed files with 86 additions and 8 deletions

View File

@ -1,5 +1,5 @@
test:
PERL_DL_NONLAZY=1 /usr/bin/perl "-MExtUtils::Command::MM" "-e" "test_harness(1)" -It/lib t/21*
PERL_DL_NONLAZY=1 /usr/bin/perl "-MExtUtils::Command::MM" "-e" "test_harness(1)" -It/lib t/22*
all: test

View File

@ -81,10 +81,4 @@ $i3->command('next horizontal')->recv;
($nodes, $focus) = get_ws_content($tmp);
is($focus->[0], $right, 'right container focused');
#
# TODO: extend this test-case (as soon as splitting is implemented):
# - wrapping (no horizontal switch possible, goes level-up)
# - going level-up "manually"
diag( "Testing i3, Perl $], $^X" );

58
testcases/t/22-split.t Normal file
View File

@ -0,0 +1,58 @@
#!perl
# vim:ts=4:sw=4:expandtab
#
# Tests splitting
#
use i3test tests => 11;
use X11::XCB qw(:all);
use v5.10;
my $i3 = i3("/tmp/nestedcons");
my $tmp = get_unused_workspace();
$i3->command("workspace $tmp")->recv;
my $ws = get_ws($tmp);
is($ws->{orientation}, 0, 'orientation horizontal by default');
$i3->command('split v')->recv;
$ws = get_ws($tmp);
is($ws->{orientation}, 1, 'split v changes workspace orientation');
######################################################################
# Open two containers, split, open another container. Then verify
# the layout is like we expect it to be
######################################################################
$i3->command('open')->recv;
$i3->command('open')->recv;
my $content = get_ws_content($tmp);
is(@{$content}, 2, 'two containers on workspace level');
my $first = $content->[0];
my $second = $content->[1];
is(@{$first->{nodes}}, 0, 'first container has no children');
is(@{$second->{nodes}}, 0, 'second container has no children (yet)');
my $old_name = $second->{name};
$i3->command('split h')->recv;
$i3->command('open')->recv;
$content = get_ws_content($tmp);
is(@{$content}, 2, 'two containers on workspace level');
$first = $content->[0];
$second = $content->[1];
is(@{$first->{nodes}}, 0, 'first container has no children');
isnt($second->{name}, $old_name, 'second container was replaced');
is($second->{orientation}, 0, 'orientation is horizontal');
is(@{$second->{nodes}}, 2, 'second container has 2 children');
is($second->{nodes}->[0]->{name}, $old_name, 'found old second container');
# TODO: extend this test-case (test next/prev)
# - wrapping (no horizontal switch possible, goes level-up)
# - going level-up "manually"
diag( "Testing i3, Perl $], $^X" );

View File

@ -19,7 +19,7 @@ use AnyEvent::I3;
#use Exporter qw(import);
use base 'Exporter';
our @EXPORT = qw(get_workspace_names get_unused_workspace get_ws_content);
our @EXPORT = qw(get_workspace_names get_unused_workspace get_ws_content get_ws);
BEGIN {
my $window_count = 0;
@ -76,4 +76,14 @@ sub get_ws_content {
return wantarray ? ($cons[0]->{nodes}, $cons[0]->{focus}) : $cons[0]->{nodes};
}
sub get_ws {
my ($name) = @_;
my $i3 = i3("/tmp/nestedcons");
my $tree = $i3->get_workspaces->recv;
my @ws = map { @{$_->{nodes}} } @{$tree->{nodes}};
my @cons = grep { $_->{name} eq $name } @ws;
return $cons[0];
}
1