Refactor the interface of commands.c

[i3/i3] / src / ipc.c

diff --git a/src/ipc.c b/src/ipc.c
index dee68e5f64a6b83ad1c8e240ec9a0a37de4a10af..3733034dec5713ae6fabaef1988beadf83010088 100644 (file)
--- a/src/ipc.c
+++ b/src/ipc.c
@@ -119,16 +119,18 @@ IPC_HANDLER(command) {
     char *command = scalloc(message_size + 1);
     strncpy(command, (const char*)message, message_size);
     LOG("IPC: received: *%s*\n", command);
-    char *reply = parse_command((const char*)command);
-    char *save_reply = reply;
+    struct CommandResult *command_output = parse_command((const char*)command);
     free(command);
 
+    if (command_output->needs_tree_render)
+        tree_render();
+
     /* If no reply was provided, we just use the default success message */
-    if (reply == NULL)
-        reply = "{\"success\":true}";
-    ipc_send_message(fd, strlen(reply), I3_IPC_REPLY_TYPE_COMMAND, (const uint8_t*)reply);
+    ipc_send_message(fd, strlen(command_output->json_output),
+                     I3_IPC_REPLY_TYPE_COMMAND,
+                     (const uint8_t*)command_output->json_output);
 
-    FREE(save_reply);
+    free(command_output->json_output);
 }
 
 static void dump_rect(yajl_gen gen, const char *name, Rect r) {