From d7d29fe546ab0acb332013eb380f8193e1d5b9fc Mon Sep 17 00:00:00 2001 From: Brian Ashworth Date: Wed, 17 Apr 2019 01:57:34 -0400 Subject: 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. --- include/ipc-client.h | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'include') 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 @@ #ifndef _SWAY_IPC_CLIENT_H #define _SWAY_IPC_CLIENT_H +#include #include +#include #include "ipc.h" @@ -36,5 +38,9 @@ struct ipc_response *ipc_recv_response(int socketfd); * Free ipc_response struct */ void free_ipc_response(struct ipc_response *response); +/** + * Sets the receive timeout for the IPC socket + */ +bool ipc_set_recv_timeout(int socketfd, struct timeval tv); #endif -- cgit v1.2.3-54-g00ecf