Merge pull request #137 from minus7/json

added json-c lib and implemented IPC get_version

4 files changed, 78 insertions, 73 deletions

diff --git a/CMake/FindJsonC.cmake b/CMake/FindJsonC.cmake
new file mode 100644
index 00000000..2ca0df39
--- /dev/null
+++ b/CMake/FindJsonC.cmake
@@ -0,0 +1,17 @@
+# - Find json-c
+# Find the json-c libraries
+#
+#  This module defines the following variables:
+#     JSONC_FOUND        - True if JSONC is found
+#     JSONC_LIBRARIES    - JSONC libraries
+#     JSONC_INCLUDE_DIRS - JSONC include directories
+#
+
+find_package(PkgConfig)
+pkg_check_modules(PC_JSONC QUIET JSONC)
+find_path(JSONC_INCLUDE_DIRS NAMES json-c/json.h HINTS ${PC_JSONC_INCLUDE_DIRS})
+find_library(JSONC_LIBRARIES NAMES json-c HINTS ${PC_JSONC_LIBRARY_DIRS})
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(JSONC DEFAULT_MSG JSONC_LIBRARIES JSONC_INCLUDE_DIRS)
+mark_as_advanced(JSONC_LIBRARIES JSONC_INCLUDE_DIRS)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index bbf61299..aad7f54d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -22,12 +22,14 @@ find_package(XKBCommon REQUIRED)
 find_package(WLC REQUIRED)
 find_package(A2X REQUIRED)
 find_package(PCRE REQUIRED)
+find_package(JsonC REQUIRED)
 
 FILE(GLOB sources ${PROJECT_SOURCE_DIR}/sway/*.c)
 
 include_directories(
    ${WLC_INCLUDE_DIRS}
    ${PCRE_INCLUDE_DIRS}
+   ${JSONC_INCLUDE_DIRS}
    include/
 )
 
@@ -39,6 +41,7 @@ target_link_libraries(sway
    ${WLC_LIBRARIES}
    ${XKBCOMMON_LIBRARIES}
    ${PCRE_LIBRARIES}
+   ${JSONC_LIBRARIES}
 )
 
 INSTALL(
diff --git a/sway/container.c b/sway/container.c
index 5321e3cd..fda90e5b 100644
--- a/sway/container.c
+++ b/sway/container.c
@@ -152,7 +152,7 @@ swayc_t *new_workspace(swayc_t *output, const char *name) {
 	workspace->width = output->width;
 	workspace->height = output->height;
 	workspace->name = strdup(name);
-	workspace->visible = true;
+	workspace->visible = false;
 	workspace->floating = create_list();
 
 	add_child(output, workspace);
@@ -503,18 +503,17 @@ bool swayc_is_active(swayc_t *view) {
 
 void container_map(swayc_t *container, void (*f)(swayc_t *view, void *data), void *data) {
 	if (container) {
+		f(container, data);
 		int i;
 		if (container->children)  {
 			for (i = 0; i < container->children->length; ++i) {
 				swayc_t *child = container->children->items[i];
-				f(child, data);
 				container_map(child, f, data);
 			}
 		}
 		if (container->floating) {
 			for (i = 0; i < container->floating->length; ++i) {
 				swayc_t *child = container->floating->items[i];
-				f(child, data);
 				container_map(child, f, data);
 			}
 		}
diff --git a/sway/ipc.c b/sway/ipc.c
index 0b36d758..d278c0a0 100644
--- a/sway/ipc.c
+++ b/sway/ipc.c
@@ -12,6 +12,7 @@
 #include <sys/ioctl.h>
 #include <fcntl.h>
 #include <ctype.h>
+#include <json-c/json.h>
 #include "ipc.h"
 #include "log.h"
 #include "config.h"
@@ -40,11 +41,9 @@ int ipc_client_handle_readable(int client_fd, uint32_t mask, void *data);
 void ipc_client_disconnect(struct ipc_client *client);
 void ipc_client_handle_command(struct ipc_client *client);
 bool ipc_send_reply(struct ipc_client *client, const char *payload, uint32_t payload_length);
-void ipc_get_workspaces_callback(swayc_t *container, void *data);
+void ipc_get_workspaces_callback(swayc_t *workspace, void *data);
 void ipc_get_outputs_callback(swayc_t *container, void *data);
 
-char *json_list(list_t *items);
-
 void ipc_init(void) {
 	ipc_socket = socket(AF_UNIX, SOCK_STREAM | SOCK_NONBLOCK | SOCK_CLOEXEC, 0);
 	if (ipc_socket == -1) {
@@ -208,22 +207,32 @@ void ipc_client_handle_command(struct ipc_client *client) {
 	}
 	case IPC_GET_WORKSPACES:
 	{
-		list_t *workspaces = create_list();
+		json_object *workspaces = json_object_new_array();
 		container_map(&root_container, ipc_get_workspaces_callback, workspaces);
-		char *json = json_list(workspaces);
-		free_flat_list(workspaces);
-		ipc_send_reply(client, json, strlen(json));
-		free(json);
+		const char *json_string = json_object_to_json_string(workspaces);
+		ipc_send_reply(client, json_string, (uint32_t) strlen(json_string));
+		json_object_put(workspaces); // free
 		break;
 	}
 	case IPC_GET_OUTPUTS:
 	{
-		list_t *outputs = create_list();
+		json_object *outputs = json_object_new_array();
 		container_map(&root_container, ipc_get_outputs_callback, outputs);
-		char *json = json_list(outputs);
-		free_flat_list(outputs);
-		ipc_send_reply(client, json, strlen(json));
-		free(json);
+		const char *json_string = json_object_to_json_string(outputs);
+		ipc_send_reply(client, json_string, (uint32_t) strlen(json_string));
+		json_object_put(outputs); // free
+		break;
+	}
+	case IPC_GET_VERSION:
+	{
+		json_object *json = json_object_new_object();
+		json_object_object_add(json, "human_readable", json_object_new_string(SWAY_GIT_VERSION));
+		json_object_object_add(json, "major", json_object_new_int(0));
+		json_object_object_add(json, "minor", json_object_new_int(0));
+		json_object_object_add(json, "patch", json_object_new_int(1));
+		const char *json_string = json_object_to_json_string(json);
+		ipc_send_reply(client, json_string, (uint32_t) strlen(json_string));
+		json_object_put(json); // free
 		break;
 	}
 	default:
@@ -259,67 +268,44 @@ bool ipc_send_reply(struct ipc_client *client, const char *payload, uint32_t pay
 	return true;
 }
 
-char *json_list(list_t *items) {
-	char *json_elements = join_list(items, ",");
-	size_t len = strlen(json_elements);
-	char *json = malloc(len + 3);
-	json[0] = '[';
-	memcpy(json + 1, json_elements, len);
-	json[len+1] = ']';
-	json[len+2] = '\0';
-	free(json_elements);
-	return json;
-}
-
-void ipc_get_workspaces_callback(swayc_t *container, void *data) {
-	if (container->type == C_WORKSPACE) {
-		char *json = malloc(512); // Output should usually be around 180 chars
-		int num = isdigit(container->name[0]) ? atoi(container->name) : -1;
-		// TODO: escape the name (quotation marks, unicode)
-		sprintf(json,
-			"{"
-				"\"num\":%d,"
-				"\"name\":\"%s\","
-				"\"visible\":%s,"
-				"\"focused\":%s,"
-				"\"rect\":{"
-					"\"x\":%d,"
-					"\"y\":%d,"
-					"\"width\":%d,"
-					"\"height\":%d"
-				"},"
-				"\"output\":\"%s\","
-				"\"urgent\":%s"
-			"}",
-			num, container->name, container->visible ? "true" : "false", container->is_focused ? "true" : "false",
-			(int)container->x, (int)container->y, (int)container->width, (int)container->height,
-			container->parent->name, "false" // TODO: urgent hint
-		);
-		list_add((list_t *)data, json);
+void ipc_get_workspaces_callback(swayc_t *workspace, void *data) {
+	if (workspace->type == C_WORKSPACE) {
+		int num = isdigit(workspace->name[0]) ? atoi(workspace->name) : -1;
+		json_object *object = json_object_new_object();
+		json_object *rect = json_object_new_object();
+		json_object_object_add(rect, "x", json_object_new_int((int32_t) workspace->x));
+		json_object_object_add(rect, "y", json_object_new_int((int32_t) workspace->y));
+		json_object_object_add(rect, "width", json_object_new_int((int32_t) workspace->width));
+		json_object_object_add(rect, "height", json_object_new_int((int32_t) workspace->height));
+
+		json_object_object_add(object, "num", json_object_new_int(num));
+		json_object_object_add(object, "name", json_object_new_string(workspace->name));
+		json_object_object_add(object, "visible", json_object_new_boolean(workspace->visible));
+		bool focused = root_container.focused == workspace->parent && workspace->parent->focused == workspace;
+		json_object_object_add(object, "focused", json_object_new_boolean(focused));
+		json_object_object_add(object, "rect", rect);
+		json_object_object_add(object, "output", json_object_new_string(workspace->parent->name));
+		json_object_object_add(object, "urgent", json_object_new_boolean(false));
+
+		json_object_array_add((json_object *)data, object);
 	}
 }
 
 void ipc_get_outputs_callback(swayc_t *container, void *data) {
 	if (container->type == C_OUTPUT) {
-		char *json = malloc(512); // Output should usually be around 130 chars
-		// TODO: escape the name (quotation marks, unicode)
-		sprintf(json,
-			"{"
-				"\"name\":\"%s\","
-				"\"active\":%s,"
-				"\"primary\":%s,"
-				"\"rect\":{"
-					"\"x\":%d,"
-					"\"y\":%d,"
-					"\"width\":%d,"
-					"\"height\":%d"
-				"},"
-				"\"current_workspace\":\"%s\""
-			"}",
-			container->name, "true", "false", // TODO: active, primary
-			(int)container->x, (int)container->y, (int)container->width, (int)container->height,
-			container->focused ? container->focused->name : ""
-		);
-		list_add((list_t *)data, json);
+		json_object *object = json_object_new_object();
+		json_object *rect = json_object_new_object();
+		json_object_object_add(rect, "x", json_object_new_int((int32_t) container->x));
+		json_object_object_add(rect, "y", json_object_new_int((int32_t) container->y));
+		json_object_object_add(rect, "width", json_object_new_int((int32_t) container->width));
+		json_object_object_add(rect, "height", json_object_new_int((int32_t) container->height));
+
+		json_object_object_add(object, "name", json_object_new_string(container->name));
+		json_object_object_add(object, "active", json_object_new_boolean(true));
+		json_object_object_add(object, "primary", json_object_new_boolean(false));
+		json_object_object_add(object, "rect", rect);
+		json_object_object_add(object, "current_workspace", container->focused ? json_object_new_string(container->focused->name) : NULL);
+
+		json_object_array_add((json_object *)data, object);
 	}
 }