sway

commit 506be24b62a43c03766ec426fae4da58adc2e0e7
parent c7d12faefc6a1f07cb41696e73e74ca87958bcf9
Author: Drew DeVault <sir@cmpwn.com>
Date:   Tue,  2 Aug 2016 14:52:41 -0400

Merge pull request #810 from acrisci/feature/swaymsg-pretty

swaymsg: pretty print ipc response
Diffstat:
M
swaymsg/CMakeLists.txt
 | 
3
++-
M
swaymsg/main.c
 | 
16
++++++++++++++--

2 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/swaymsg/CMakeLists.txt b/swaymsg/CMakeLists.txt
@@ -4,7 +4,8 @@ add_executable(swaymsg
 
 target_link_libraries(swaymsg
 	sway-common
-	)
+	${JSONC_LIBRARIES}
+)
 
 install(
 	TARGETS swaymsg
diff --git a/swaymsg/main.c b/swaymsg/main.c
@@ -6,6 +6,7 @@
 #include <sys/un.h>
 #include <sys/socket.h>
 #include <unistd.h>
+#include <json-c/json.h>
 #include "stringop.h"
 #include "ipc-client.h"
 #include "readline.h"
@@ -109,16 +110,27 @@ int main(int argc, char **argv) {
 		command = join_args(argv + optind, argc - optind);
 	}
 
+	int ret = 0;
 	int socketfd = ipc_open_socket(socket_path);
 	uint32_t len = strlen(command);
 	char *resp = ipc_single_command(socketfd, type, command, &len);
 	if (!quiet) {
-		printf("%s\n", resp);
+		// pretty print the json
+		json_object *obj = json_tokener_parse(resp);
+
+		if (obj == NULL) {
+			fprintf(stderr, "ERROR: Could not parse json response from ipc. This is a bug in sway.");
+			printf("%s\n", resp);
+			ret = 1;
+		} else {
+			printf("%s\n", json_object_to_json_string_ext(obj, JSON_C_TO_STRING_PRETTY | JSON_C_TO_STRING_SPACED));
+			free(obj);
+		}
 	}
 	close(socketfd);
 
 	free(command);
 	free(resp);
 	free(socket_path);
-	return 0;
+	return ret;
 }