mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-26 18:01:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #810 from acrisci/feature/swaymsg-pretty

Browse source 
swaymsg: pretty print ipc response
This commit is contained in:
Drew DeVault 2016-08-02 14:52:41 -04:00 committed by GitHub
parent c7d12faefc 6535da7bde
commit 506be24b62
2 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
swaymsg/CMakeLists.txt
View file

@ -4,6 +4,7 @@ add_executable(swaymsg
target_link_libraries(swaymsg
sway-common
${JSONC_LIBRARIES}
)
install(

14
swaymsg/main.c
View file

@ -6,6 +6,7 @@
#include <sys/un.h>
#include <sys/socket.h>
#include <unistd.h>
#include <json-c/json.h>
#include "stringop.h"
#include "ipc-client.h"
#include "readline.h"
@ -109,16 +110,27 @@ int main(int argc, char **argv) {
command = join_args(argv + optind, argc - optind);
}
int ret = 0;
int socketfd = ipc_open_socket(socket_path);
uint32_t len = strlen(command);
char *resp = ipc_single_command(socketfd, type, command, &len);
if (!quiet) {
// pretty print the json
json_object *obj = json_tokener_parse(resp);
if (obj == NULL) {
fprintf(stderr, "ERROR: Could not parse json response from ipc. This is a bug in sway.");
printf("%s\n", resp);
ret = 1;
} else {
printf("%s\n", json_object_to_json_string_ext(obj, JSON_C_TO_STRING_PRETTY | JSON_C_TO_STRING_SPACED));
free(obj);
}
}
close(socketfd);
free(command);
free(resp);
free(socket_path);
return 0;
return ret;
}