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 /include/ipc-client.h | |
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 'include/ipc-client.h')
-rw-r--r-- | include/ipc-client.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/ipc-client.h b/include/ipc-client.h index c9f5b344..d3895023 100644 --- a/include/ipc-client.h +++ b/include/ipc-client.h | |||
@@ -1,7 +1,9 @@ | |||
1 | #ifndef _SWAY_IPC_CLIENT_H | 1 | #ifndef _SWAY_IPC_CLIENT_H |
2 | #define _SWAY_IPC_CLIENT_H | 2 | #define _SWAY_IPC_CLIENT_H |
3 | 3 | ||
4 | #include <stdbool.h> | ||
4 | #include <stdint.h> | 5 | #include <stdint.h> |
6 | #include <sys/time.h> | ||
5 | 7 | ||
6 | #include "ipc.h" | 8 | #include "ipc.h" |
7 | 9 | ||
@@ -36,5 +38,9 @@ struct ipc_response *ipc_recv_response(int socketfd); | |||
36 | * Free ipc_response struct | 38 | * Free ipc_response struct |
37 | */ | 39 | */ |
38 | void free_ipc_response(struct ipc_response *response); | 40 | void free_ipc_response(struct ipc_response *response); |
41 | /** | ||
42 | * Sets the receive timeout for the IPC socket | ||
43 | */ | ||
44 | bool ipc_set_recv_timeout(int socketfd, struct timeval tv); | ||
39 | 45 | ||
40 | #endif | 46 | #endif |