summaryrefslogtreecommitdiffstats
path: root/sway
diff options
context:
space:
mode:
authorLibravatar Tony Crisci <tony@dubstepdish.com>2016-07-23 23:13:09 -0400
committerLibravatar Tony Crisci <tony@dubstepdish.com>2016-07-23 23:13:09 -0400
commit0d461ad98891bc60ea114765379587f42ad94a4d (patch)
tree6265109dc0030ad6e3a3ae120ba7a4ca5fd1f4e3 /sway
parentMerge pull request #785 from thejan2009/floating-scroll-event-passthrough (diff)
downloadsway-0d461ad98891bc60ea114765379587f42ad94a4d.tar.gz
sway-0d461ad98891bc60ea114765379587f42ad94a4d.tar.zst
sway-0d461ad98891bc60ea114765379587f42ad94a4d.zip
Put ipc command result json in an array
For compatibility with i3, put the command result into an array. Returning multiple command results is still unsupported.
Diffstat (limited to 'sway')
-rw-r--r--sway/commands.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/sway/commands.c b/sway/commands.c
index 5cf93c53..ed561764 100644
--- a/sway/commands.c
+++ b/sway/commands.c
@@ -3657,6 +3657,7 @@ void free_cmd_results(struct cmd_results *results) {
3657} 3657}
3658 3658
3659const char *cmd_results_to_json(struct cmd_results *results) { 3659const char *cmd_results_to_json(struct cmd_results *results) {
3660 json_object *result_array = json_object_new_array();
3660 json_object *root = json_object_new_object(); 3661 json_object *root = json_object_new_object();
3661 json_object_object_add(root, "success", json_object_new_boolean(results->status == CMD_SUCCESS)); 3662 json_object_object_add(root, "success", json_object_new_boolean(results->status == CMD_SUCCESS));
3662 if (results->input) { 3663 if (results->input) {
@@ -3665,7 +3666,9 @@ const char *cmd_results_to_json(struct cmd_results *results) {
3665 if (results->error) { 3666 if (results->error) {
3666 json_object_object_add(root, "error", json_object_new_string(results->error)); 3667 json_object_object_add(root, "error", json_object_new_string(results->error));
3667 } 3668 }
3668 const char *json = json_object_to_json_string(root); 3669 json_object_array_add(result_array, root);
3670 const char *json = json_object_to_json_string(result_array);
3671 free(result_array);
3669 free(root); 3672 free(root);
3670 return json; 3673 return json;
3671} 3674}