2 files changed, 103 insertions, 32 deletions

diff --git a/swaymsg/main.c b/swaymsg/main.c
index 60536e48..02bb12c6 100644
--- a/swaymsg/main.c
+++ b/swaymsg/main.c
@@ -1,4 +1,6 @@
 #define _POSIX_C_SOURCE 200809L
+
+#include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -286,28 +288,74 @@ static void pretty_print_config(json_object *c) {
         printf("%s\n", json_object_get_string(config));
 }
 
-static void pretty_print(int type, json_object *resp) {
-        if (type != IPC_COMMAND && type != IPC_GET_WORKSPACES &&
-                        type != IPC_GET_INPUTS && type != IPC_GET_OUTPUTS &&
-                        type != IPC_GET_VERSION && type != IPC_GET_SEATS &&
-                        type != IPC_GET_CONFIG && type != IPC_SEND_TICK) {
-                printf("%s\n", json_object_to_json_string_ext(resp,
-                        JSON_C_TO_STRING_PRETTY | JSON_C_TO_STRING_SPACED));
-                return;
+static void pretty_print_tree(json_object *obj, int indent) {
+        for (int i = 0; i < indent; i++) {
+                printf("  ");
         }
 
-        if (type == IPC_SEND_TICK) {
-                return;
+        int id = json_object_get_int(json_object_object_get(obj, "id"));
+        const char *name = json_object_get_string(json_object_object_get(obj, "name"));
+        const char *type = json_object_get_string(json_object_object_get(obj, "type"));
+        const char *shell = json_object_get_string(json_object_object_get(obj, "shell"));
+
+        printf("#%d: %s \"%s\"", id, type, name);
+
+        if (shell != NULL) {
+                int pid = json_object_get_int(json_object_object_get(obj, "pid"));
+                const char *app_id = json_object_get_string(json_object_object_get(obj, "app_id"));
+                json_object *window_props_obj = json_object_object_get(obj, "window_properties");
+                const char *instance = json_object_get_string(json_object_object_get(window_props_obj, "instance"));
+                const char *class = json_object_get_string(json_object_object_get(window_props_obj, "class"));
+                int x11_id = json_object_get_int(json_object_object_get(obj, "window"));
+
+                printf(" (%s, pid: %d", shell, pid);
+                if (app_id != NULL) {
+                        printf(", app_id: \"%s\"", app_id);
+                }
+                if (instance != NULL) {
+                        printf(", instance: \"%s\"", instance);
+                }
+                if (class != NULL) {
+                        printf(", class: \"%s\"", class);
+                }
+                if (x11_id != 0) {
+                        printf(", X11 window: 0x%X", x11_id);
+                }
+                printf(")");
         }
 
-        if (type == IPC_GET_VERSION) {
-                pretty_print_version(resp);
-                return;
+        printf("\n");
+
+        json_object *nodes_obj = json_object_object_get(obj, "nodes");
+        size_t len = json_object_array_length(nodes_obj);
+        for (size_t i = 0; i < len; i++) {
+                pretty_print_tree(json_object_array_get_idx(nodes_obj, i), indent + 1);
         }
+}
 
-        if (type == IPC_GET_CONFIG) {
+static void pretty_print(int type, json_object *resp) {
+        switch (type) {
+        case IPC_SEND_TICK:
+                return;
+        case IPC_GET_VERSION:
+                pretty_print_version(resp);
+                return;
+        case IPC_GET_CONFIG:
                 pretty_print_config(resp);
                 return;
+        case IPC_GET_TREE:
+                pretty_print_tree(resp, 0);
+                return;
+        case IPC_COMMAND:
+        case IPC_GET_WORKSPACES:
+        case IPC_GET_INPUTS:
+        case IPC_GET_OUTPUTS:
+        case IPC_GET_SEATS:
+                break;
+        default:
+                printf("%s\n", json_object_to_json_string_ext(resp,
+                        JSON_C_TO_STRING_PRETTY | JSON_C_TO_STRING_SPACED));
+                return;
         }
 
         json_object *obj;
@@ -343,7 +391,7 @@ int main(int argc, char **argv) {
 
         sway_log_init(SWAY_INFO, NULL);
 
-        static struct option long_options[] = {
+        static const struct option long_options[] = {
                 {"help", no_argument, NULL, 'h'},
                 {"monitor", no_argument, NULL, 'm'},
                 {"pretty", no_argument, NULL, 'p'},
@@ -480,12 +528,20 @@ int main(int argc, char **argv) {
         char *resp = ipc_single_command(socketfd, type, command, &len);
 
         // pretty print the json
-        json_object *obj = json_tokener_parse(resp);
-        if (obj == NULL) {
+        json_tokener *tok = json_tokener_new_ex(JSON_MAX_DEPTH);
+        if (tok == NULL) {
+                if (quiet) {
+                        exit(EXIT_FAILURE);
+                }
+                sway_abort("failed allocating json_tokener");
+        }
+        json_object *obj = json_tokener_parse_ex(tok, resp, -1);
+        enum json_tokener_error err = json_tokener_get_error(tok);
+        json_tokener_free(tok);
+        if (obj == NULL || err != json_tokener_success) {
                 if (!quiet) {
-                        fprintf(stderr, "ERROR: Could not parse json response from ipc. "
-                                        "This is a bug in sway.");
-                        printf("%s\n", resp);
+                        sway_log(SWAY_ERROR, "failed to parse payload as json: %s",
+                                json_tokener_error_desc(err));
                 }
                 ret = 1;
         } else {
@@ -517,13 +573,22 @@ int main(int argc, char **argv) {
                                 break;
                         }
 
-                        json_object *obj = json_tokener_parse(reply->payload);
-                        if (obj == NULL) {
+                        json_tokener *tok = json_tokener_new_ex(JSON_MAX_DEPTH);
+                        if (tok == NULL) {
+                                if (quiet) {
+                                        exit(EXIT_FAILURE);
+                                }
+                                sway_abort("failed allocating json_tokener");
+                        }
+                        json_object *obj = json_tokener_parse_ex(tok, reply->payload, -1);
+                        enum json_tokener_error err = json_tokener_get_error(tok);
+                        json_tokener_free(tok);
+                        if (obj == NULL || err != json_tokener_success) {
                                 if (!quiet) {
-                                        fprintf(stderr, "ERROR: Could not parse json response from"
-                                                        " ipc. This is a bug in sway.");
-                                        ret = 1;
+                                        sway_log(SWAY_ERROR, "failed to parse payload as json: %s",
+                                                json_tokener_error_desc(err));
                                 }
+                                ret = 1;
                                 break;
                         } else if (quiet) {
                                 json_object_put(obj);
diff --git a/swaymsg/swaymsg.1.scd b/swaymsg/swaymsg.1.scd
index b69013b5..24a9d6c9 100644
--- a/swaymsg/swaymsg.1.scd
+++ b/swaymsg/swaymsg.1.scd
@@ -21,12 +21,13 @@ _swaymsg_ [options...] [message]
 
 *-p, --pretty*
         Use pretty output even when not using a tty.
+        Not available for all message types.
 
 *-q, --quiet*
         Sends the IPC message but does not print the response from sway.
 
 *-r, --raw*
-        Use raw output even if using a tty.
+        Use raw JSON output even if using a tty.
 
 *-s, --socket* <path>
         Use the specified socket path. Otherwise, swaymsg will ask sway where the
@@ -46,6 +47,11 @@ _swaymsg_ [options...] [message]
 
         See *sway*(5) for a list of commands.
 
+        _swaymsg_ can return pretty printed (standalone-default) or JSON-formatted
+        (*--raw*) output. For detailed documentation on the returned JSON-data of
+        each message type listed below, refer to *sway-ipc*(7). The JSON-format can
+        contain more information than the pretty print.
+
         Tips:
         - Command expansion is performed twice: once by swaymsg, and again by sway.
           If you have quoted multi-word strings in your command, enclose the entire
@@ -60,20 +66,20 @@ _swaymsg_ [options...] [message]
           _swaymsg -- mark --add test_ instead of _swaymsg mark --add test_.
 
 *get\_workspaces*
-        Gets a JSON-encoded list of workspaces and their status.
+        Gets a list of workspaces and their status.
 
 *get\_inputs*
-        Gets a JSON-encoded list of current inputs.
+        Gets a list of current inputs.
 
 *get\_outputs*
-        Gets a JSON-encoded list of current outputs.
+        Gets a list of current outputs.
 
 *get\_tree*
         Gets a JSON-encoded layout tree of all open windows, containers, outputs,
         workspaces, and so on.
 
 *get\_seats*
-        Gets a JSON-encoded list of all seats,
+        Gets a list of all seats,
         its properties and all assigned devices.
 
 *get\_marks*
@@ -83,7 +89,7 @@ _swaymsg_ [options...] [message]
         Get a JSON-encoded configuration for swaybar.
 
 *get\_version*
-        Get JSON-encoded version information for the running instance of sway.
+        Get version information for the running instance of sway.
 
 *get\_binding\_modes*
         Gets a JSON-encoded list of currently configured binding modes.
@@ -92,7 +98,7 @@ _swaymsg_ [options...] [message]
         Gets JSON-encoded info about the current binding state.
 
 *get\_config*
-        Gets a JSON-encoded copy of the current configuration.
+        Gets a copy of the current configuration. Doesn't expand includes.
 
 *send\_tick*
         Sends a tick event to all subscribed clients.