From: Tony Crisci <tony@dubstepdish.com>
Date: Mon, 22 Sep 2014 05:09:25 +0000 (-0400)
Subject: IPC: set ws reply "num" member to -1 when named
X-Git-Tag: 4.9~51
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=fd8a2b0e5114afea50dad4589d7668fc054ea78e;p=i3%2Fi3

IPC: set ws reply "num" member to -1 when named

When a named workspace (i.e., a workspace that has a name that does not
begin with text that can be parsed as an integer greater than or equal
to zero) is represented by the ipc as a workspace json object such as
can be queried with `i3-msg -t get_workspaces`, set the num property to
-1 instead of json null.

This is for convenience of ipc consumers using type-constrained
languages such as C which have difficulty cleanly expressing nullable
integers.

fixes #1368
---

diff --git a/docs/ipc b/docs/ipc
index f0829dc2..ce38a546 100644
--- a/docs/ipc
+++ b/docs/ipc
@@ -156,7 +156,7 @@ following properties:
 
 num (integer)::
 	The logical number of the workspace. Corresponds to the command
-	to switch to this workspace.
+	to switch to this workspace. For named workspaces, this will be -1.
 name (string)::
 	The name of this workspace (by default num+1), as changed by the
 	user. Encoded in UTF-8.
diff --git a/src/ipc.c b/src/ipc.c
index 03b3d5ad..6dab654c 100644
--- a/src/ipc.c
+++ b/src/ipc.c
@@ -617,10 +617,7 @@ IPC_HANDLER(get_workspaces) {
             y(map_open);
 
             ystr("num");
-            if (ws->num == -1)
-                y(null);
-            else
-                y(integer, ws->num);
+            y(integer, ws->num);
 
             ystr("name");
             ystr(ws->name);
diff --git a/testcases/t/139-ws-numbers.t b/testcases/t/139-ws-numbers.t
index 6829a147..f76ee04b 100644
--- a/testcases/t/139-ws-numbers.t
+++ b/testcases/t/139-ws-numbers.t
@@ -24,7 +24,7 @@ sub check_order {
     my ($msg) = @_;
 
     my @ws = @{$i3->get_workspaces->recv};
-    my @nums = map { $_->{num} } grep { defined($_->{num}) } @ws;
+    my @nums = map { $_->{num} } grep { $_->{num} != -1 } @ws;
     my @sorted = sort @nums;
 
     is_deeply(\@nums, \@sorted, $msg);