diff options
author | Brian Ashworth <bosrsf04@gmail.com> | 2019-04-17 01:57:34 -0400 |
---|---|---|
committer | Simon Ser <contact@emersion.fr> | 2019-04-17 09:07:08 +0300 |
commit | d7d29fe546ab0acb332013eb380f8193e1d5b9fc (patch) | |
tree | 06bf13f5f682906ee3d705aa9287cc29c5b8b7f1 /swaymsg | |
parent | Fix the payload type returned by IPC (diff) | |
download | sway-d7d29fe546ab0acb332013eb380f8193e1d5b9fc.tar.gz sway-d7d29fe546ab0acb332013eb380f8193e1d5b9fc.tar.zst sway-d7d29fe546ab0acb332013eb380f8193e1d5b9fc.zip |
swaymsg: add timeout and type checks
This adds a 3 second timeout to the initial reply in swaymsg. This
prevents swaymsg from hanging when `swaymsg -t get_{inputs,seats}` is
used in i3. The timeout is removed when waiting for a subscribed event
or monitoring for subscribed events.
This also adds type checks to commands where i3 does not reply with all
of the properties that sway does (such as `modes` in `get_outputs`).
This is mostly just a behavioral adjustment since swaymsg should run on
i3. When running under i3, some command reply's (such as the one for
`get_outputs) may have more useful information in the raw json than the
pretty printed version.
Diffstat (limited to 'swaymsg')
-rw-r--r-- | swaymsg/main.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/swaymsg/main.c b/swaymsg/main.c index ccc847f5..518993af 100644 --- a/swaymsg/main.c +++ b/swaymsg/main.c | |||
@@ -7,6 +7,7 @@ | |||
7 | #include <stdint.h> | 7 | #include <stdint.h> |
8 | #include <sys/un.h> | 8 | #include <sys/un.h> |
9 | #include <sys/socket.h> | 9 | #include <sys/socket.h> |
10 | #include <sys/time.h> | ||
10 | #include <ctype.h> | 11 | #include <ctype.h> |
11 | #include <unistd.h> | 12 | #include <unistd.h> |
12 | #include <json.h> | 13 | #include <json.h> |
@@ -238,7 +239,8 @@ static void pretty_print_output(json_object *o) { | |||
238 | ); | 239 | ); |
239 | } | 240 | } |
240 | 241 | ||
241 | size_t modes_len = json_object_array_length(modes); | 242 | size_t modes_len = json_object_is_type(modes, json_type_array) |
243 | ? json_object_array_length(modes) : 0; | ||
242 | if (modes_len > 0) { | 244 | if (modes_len > 0) { |
243 | printf(" Available modes:\n"); | 245 | printf(" Available modes:\n"); |
244 | for (size_t i = 0; i < modes_len; ++i) { | 246 | for (size_t i = 0; i < modes_len; ++i) { |
@@ -448,6 +450,8 @@ int main(int argc, char **argv) { | |||
448 | 450 | ||
449 | int ret = 0; | 451 | int ret = 0; |
450 | int socketfd = ipc_open_socket(socket_path); | 452 | int socketfd = ipc_open_socket(socket_path); |
453 | struct timeval timeout = {.tv_sec = 3, .tv_usec = 0}; | ||
454 | ipc_set_recv_timeout(socketfd, timeout); | ||
451 | uint32_t len = strlen(command); | 455 | uint32_t len = strlen(command); |
452 | char *resp = ipc_single_command(socketfd, type, command, &len); | 456 | char *resp = ipc_single_command(socketfd, type, command, &len); |
453 | if (!quiet) { | 457 | if (!quiet) { |
@@ -478,6 +482,11 @@ int main(int argc, char **argv) { | |||
478 | free(resp); | 482 | free(resp); |
479 | 483 | ||
480 | if (type == IPC_SUBSCRIBE && ret == 0) { | 484 | if (type == IPC_SUBSCRIBE && ret == 0) { |
485 | // Remove the timeout for subscribed events | ||
486 | timeout.tv_sec = 0; | ||
487 | timeout.tv_usec = 0; | ||
488 | ipc_set_recv_timeout(socketfd, timeout); | ||
489 | |||
481 | do { | 490 | do { |
482 | struct ipc_response *reply = ipc_recv_response(socketfd); | 491 | struct ipc_response *reply = ipc_recv_response(socketfd); |
483 | if (!reply) { | 492 | if (!reply) { |