ipc: make 'focused' a bool

diff --git a/src/ipc.c b/src/ipc.c
index ca341dc75c32d7a2053bd6e8b7c18afc637666fa..b2cd482c3f1ba4023a3d15d09b4db7b90540e472 100644 (file)
--- a/src/ipc.c
+++ b/src/ipc.c
@@ -201,7 +201,7 @@ void dump_node(yajl_gen gen, struct Con *con, bool inplace_restart) {
     y(bool, con->urgent);
 
     ystr("focused");
-    y(integer, (con == focused));
+    y(bool, (con == focused));
 
     ystr("layout");
     switch (con->layout) {

diff --git a/testcases/t/16-nestedcons.t b/testcases/t/16-nestedcons.t
index 9bcff8c6acfc48629d2d2f6a2428a4ea4e5f4f6e..7763ce797ce6b428ff4c70690512b6c062f1d715 100644 (file)
--- a/testcases/t/16-nestedcons.t
+++ b/testcases/t/16-nestedcons.t
@@ -28,7 +28,7 @@ my $expected = {
     percent => undef,
     layout => 'default',
     focus => ignore(),
-    focused => 0,
+    focused => JSON::XS::false,
     urgent => JSON::XS::false,
     border => 'normal',
     'floating_nodes' => ignore(),

diff --git a/testcases/t/29-focus-after-close.t b/testcases/t/29-focus-after-close.t
index 5f5ef4af3174f1c7315b5bcdf565a3ca461770ca..fa9d86b54b7362f28e9699e903d0e3d6096f9514 100644 (file)
--- a/testcases/t/29-focus-after-close.t
+++ b/testcases/t/29-focus-after-close.t
@@ -22,10 +22,10 @@ cmd 'split v';
 
 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';
 ($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);
 
@@ -50,7 +50,7 @@ cmd 'kill';
 sleep 0.25;
 ($nodes, $focus) = get_ws_content($tmp);
 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)

diff --git a/testcases/t/32-move-workspace.t b/testcases/t/32-move-workspace.t
index 93bd4f8f8283e0b0dcca7f6a594bc4d47583aeca..8730cdfb361fa43b741e5fce20878db14ab20ff2 100644 (file)
--- a/testcases/t/32-move-workspace.t
+++ b/testcases/t/32-move-workspace.t
@@ -35,7 +35,7 @@ my ($nodes, $focus) = get_ws_content($tmp2);
 is($focus->[0], $second, 'same container on different ws');
 
 ($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