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

ipc: change 'orientation' to human readable string instead of raw integer value

This commit is contained in:
Michael Stapelberg 2011-01-07 20:48:01 +01:00
parent 23b4271e1c
commit 186d2c7bfa
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/ipc.c
View File

@ -178,7 +178,17 @@ void dump_node(yajl_gen gen, struct Con *con, bool inplace_restart) {
y(integer, con->type); y(integer, con->type);
ystr("orientation"); ystr("orientation");
y(integer, con->orientation); switch (con->orientation) {
case NO_ORIENTATION:
ystr("none");
break;
case HORIZ:
ystr("horizontal");
break;
case VERT:
ystr("vertical");
break;
}
ystr("percent"); ystr("percent");
y(double, con->percent); y(double, con->percent);

10
testcases/t/22-split.t
View File

@ -12,10 +12,10 @@ my $tmp = get_unused_workspace();
$i3->command("workspace $tmp")->recv; $i3->command("workspace $tmp")->recv;
my $ws = get_ws($tmp); my $ws = get_ws($tmp);
is($ws->{orientation}, 1, 'orientation horizontal by default'); is($ws->{orientation}, 'horizontal', 'orientation horizontal by default');
$i3->command('split v')->recv; $i3->command('split v')->recv;
$ws = get_ws($tmp); $ws = get_ws($tmp);
is($ws->{orientation}, 2, 'split v changes workspace orientation'); is($ws->{orientation}, 'vertical', 'split v changes workspace orientation');
###################################################################### ######################################################################
# Open two containers, split, open another container. Then verify # Open two containers, split, open another container. Then verify
@ -45,7 +45,7 @@ $second = $content->[1];
is(@{$first->{nodes}}, 0, 'first container has no children'); is(@{$first->{nodes}}, 0, 'first container has no children');
isnt($second->{name}, $old_name, 'second container was replaced'); isnt($second->{name}, $old_name, 'second container was replaced');
is($second->{orientation}, 1, 'orientation is horizontal'); is($second->{orientation}, 'horizontal', 'orientation is horizontal');
is(@{$second->{nodes}}, 2, 'second container has 2 children'); is(@{$second->{nodes}}, 2, 'second container has 2 children');
is($second->{nodes}->[0]->{name}, $old_name, 'found old second container'); is($second->{nodes}->[0]->{name}, $old_name, 'found old second container');
@ -61,10 +61,10 @@ $tmp = get_unused_workspace();
$i3->command("workspace $tmp")->recv; $i3->command("workspace $tmp")->recv;
$ws = get_ws($tmp); $ws = get_ws($tmp);
is($ws->{orientation}, 1, 'orientation horizontal by default'); is($ws->{orientation}, 'horizontal', 'orientation horizontal by default');
$i3->command('split v')->recv; $i3->command('split v')->recv;
$ws = get_ws($tmp); $ws = get_ws($tmp);
is($ws->{orientation}, 2, 'split v changes workspace orientation'); is($ws->{orientation}, 'vertical', 'split v changes workspace orientation');
$i3->command('open')->recv; $i3->command('open')->recv;
my @content = @{get_ws_content($tmp)}; my @content = @{get_ws_content($tmp)};