1 files changed, 125 insertions, 31 deletions

diff --git a/swaymsg/main.c b/swaymsg/main.c
index 60536e48..db9346c4 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>
@@ -58,7 +60,7 @@ static void pretty_print_cmd(json_object *r) {
         if (!success_object(r)) {
                 json_object *error;
                 if (!json_object_object_get_ex(r, "error", &error)) {
-                        printf("An unknkown error occurred");
+                        printf("An unknown error occurred");
                 } else {
                         printf("Error: %s\n", json_object_get_string(error));
                 }
@@ -183,12 +185,14 @@ static void pretty_print_seat(json_object *i) {
 }
 
 static void pretty_print_output(json_object *o) {
-        json_object *name, *rect, *focused, *active, *ws, *current_mode;
+        json_object *name, *rect, *focused, *active, *power, *ws, *current_mode, *non_desktop;
         json_object_object_get_ex(o, "name", &name);
         json_object_object_get_ex(o, "rect", &rect);
         json_object_object_get_ex(o, "focused", &focused);
         json_object_object_get_ex(o, "active", &active);
+        json_object_object_get_ex(o, "power", &power);
         json_object_object_get_ex(o, "current_workspace", &ws);
+        json_object_object_get_ex(o, "non_desktop", &non_desktop);
         json_object *make, *model, *serial, *scale, *scale_filter, *subpixel,
                 *transform, *max_render_time, *adaptive_sync_status;
         json_object_object_get_ex(o, "make", &make);
@@ -211,10 +215,19 @@ static void pretty_print_output(json_object *o) {
         json_object_object_get_ex(current_mode, "height", &height);
         json_object_object_get_ex(current_mode, "refresh", &refresh);
 
-        if (json_object_get_boolean(active)) {
+        if (json_object_get_boolean(non_desktop)) {
+                printf(
+                        "Output %s '%s %s %s' (non-desktop)\n",
+                        json_object_get_string(name),
+                        json_object_get_string(make),
+                        json_object_get_string(model),
+                        json_object_get_string(serial)
+                );
+        } else if (json_object_get_boolean(active)) {
                 printf(
                         "Output %s '%s %s %s'%s\n"
                         "  Current mode: %dx%d @ %.3f Hz\n"
+                        "  Power: %s\n"
                         "  Position: %d,%d\n"
                         "  Scale factor: %f\n"
                         "  Scale filter: %s\n"
@@ -229,6 +242,7 @@ static void pretty_print_output(json_object *o) {
                         json_object_get_int(width),
                         json_object_get_int(height),
                         (double)json_object_get_int(refresh) / 1000,
+                        json_object_get_boolean(power) ? "on" : "off",
                         json_object_get_int(x), json_object_get_int(y),
                         json_object_get_double(scale),
                         json_object_get_string(scale_filter),
@@ -245,7 +259,7 @@ static void pretty_print_output(json_object *o) {
                         json_object_get_string(adaptive_sync_status));
         } else {
                 printf(
-                        "Output %s '%s %s %s' (inactive)\n",
+                        "Output %s '%s %s %s' (disabled)\n",
                         json_object_get_string(name),
                         json_object_get_string(make),
                         json_object_get_string(model),
@@ -260,14 +274,22 @@ static void pretty_print_output(json_object *o) {
                 for (size_t i = 0; i < modes_len; ++i) {
                         json_object *mode = json_object_array_get_idx(modes, i);
 
-                        json_object *mode_width, *mode_height, *mode_refresh;
+                        json_object *mode_width, *mode_height, *mode_refresh,
+                                *mode_picture_aspect_ratio;
                         json_object_object_get_ex(mode, "width", &mode_width);
                         json_object_object_get_ex(mode, "height", &mode_height);
                         json_object_object_get_ex(mode, "refresh", &mode_refresh);
+                        json_object_object_get_ex(mode, "picture_aspect_ratio",
+                                &mode_picture_aspect_ratio);
 
-                        printf("    %dx%d @ %.3f Hz\n", json_object_get_int(mode_width),
+                        printf("    %dx%d @ %.3f Hz", json_object_get_int(mode_width),
                                 json_object_get_int(mode_height),
                                 (double)json_object_get_int(mode_refresh) / 1000);
+                        if (mode_picture_aspect_ratio &&
+                                        strcmp("none", json_object_get_string(mode_picture_aspect_ratio)) != 0) {
+                                printf(" (%s)", json_object_get_string(mode_picture_aspect_ratio));
+                        }
+                        printf("\n");
                 }
         }
 
@@ -286,28 +308,83 @@ 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) {
+        json_object *floating_nodes_obj;
+        json_bool floating_nodes = json_object_object_get_ex(obj, "floating_nodes", &floating_nodes_obj);
+        if (floating_nodes) {
+                size_t len = json_object_array_length(floating_nodes_obj);
+                for (size_t i = 0; i < len; i++) {
+                        pretty_print_tree(json_object_array_get_idx(floating_nodes_obj, i), indent + 1);
+                }
+        }
+}
+
+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 +420,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 +557,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 +602,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);