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

ipc: make 'focused' a bool

This commit is contained in:
Michael Stapelberg 2011-07-24 15:00:09 +02:00
parent b09bb0fc2a
commit 34eb9b2664
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ipc.c
View File

@ -201,7 +201,7 @@ void dump_node(yajl_gen gen, struct Con *con, bool inplace_restart) {
y(bool, con->urgent); y(bool, con->urgent);
ystr("focused"); ystr("focused");
y(integer, (con == focused)); y(bool, (con == focused));
ystr("layout"); ystr("layout");
switch (con->layout) { switch (con->layout) {

2
testcases/t/16-nestedcons.t
View File

@ -28,7 +28,7 @@ my $expected = {
percent => undef, percent => undef,
layout => 'default', layout => 'default',
focus => ignore(), focus => ignore(),
focused => 0, focused => JSON::XS::false,
urgent => JSON::XS::false, urgent => JSON::XS::false,
border => 'normal', border => 'normal',
'floating_nodes' => ignore(), 'floating_nodes' => ignore(),

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

@ -22,10 +22,10 @@ cmd 'split v';
my ($nodes, $focus) = get_ws_content($tmp); my ($nodes, $focus) = get_ws_content($tmp);
is($nodes->[1]->{focused}, 0, 'split container not focused'); ok(!$nodes->[1]->{focused}, 'split container not focused');
cmd 'focus parent'; cmd 'focus parent';
($nodes, $focus) = get_ws_content($tmp); ($nodes, $focus) = get_ws_content($tmp);
is($nodes->[1]->{focused}, 1, 'split container focused after focus parent'); ok($nodes->[1]->{focused}, 'split container focused after focus parent');
my $third = open_empty_con($i3); my $third = open_empty_con($i3);
@ -50,7 +50,7 @@ cmd 'kill';
sleep 0.25; sleep 0.25;
($nodes, $focus) = get_ws_content($tmp); ($nodes, $focus) = get_ws_content($tmp);
is($nodes->[1]->{nodes}->[0]->{id}, $second, 'second container found'); is($nodes->[1]->{nodes}->[0]->{id}, $second, 'second container found');
is($nodes->[1]->{nodes}->[0]->{focused}, 1, 'second container focused'); ok($nodes->[1]->{nodes}->[0]->{focused}, 'second container focused');
############################################################## ##############################################################
# another case, using a slightly different layout (regression) # another case, using a slightly different layout (regression)

2
testcases/t/32-move-workspace.t
View File

@ -35,7 +35,7 @@ my ($nodes, $focus) = get_ws_content($tmp2);
is($focus->[0], $second, 'same container on different ws'); is($focus->[0], $second, 'same container on different ws');
($nodes, $focus) = get_ws_content($tmp); ($nodes, $focus) = get_ws_content($tmp);
is($nodes->[0]->{focused}, 1, 'first container focused on first ws'); ok($nodes->[0]->{focused}, 'first container focused on first ws');
################################################################### ###################################################################
# check if floating cons are moved to new workspaces properly # check if floating cons are moved to new workspaces properly