mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-12-30 17:06:40 +01:00
Code Issues Projects Releases Packages Wiki Activity

Put ipc command result json in an array

Browse source 
For compatibility with i3, put the command result into an array.

Returning multiple command results is still unsupported.
This commit is contained in:
Tony Crisci 2016-07-23 23:13:09 -04:00
parent 4637462a68
commit 0d461ad988
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
sway/commands.c
View file

@ -3657,6 +3657,7 @@ void free_cmd_results(struct cmd_results *results) {
} }
const char *cmd_results_to_json(struct cmd_results *results) { const char *cmd_results_to_json(struct cmd_results *results) {
json_object *result_array = json_object_new_array();
json_object *root = json_object_new_object(); json_object *root = json_object_new_object();
json_object_object_add(root, "success", json_object_new_boolean(results->status == CMD_SUCCESS)); json_object_object_add(root, "success", json_object_new_boolean(results->status == CMD_SUCCESS));
if (results->input) { if (results->input) {
@ -3665,7 +3666,9 @@ const char *cmd_results_to_json(struct cmd_results *results) {
if (results->error) { if (results->error) {
json_object_object_add(root, "error", json_object_new_string(results->error)); json_object_object_add(root, "error", json_object_new_string(results->error));
} }
const char *json = json_object_to_json_string(root); json_object_array_add(result_array, root);
const char *json = json_object_to_json_string(result_array);
free(result_array);
free(root); free(root);
return json; return json;
} }