mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2025-04-03 19:07:45 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

swaymsg: add timeout and type checks

Browse source 
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.
This commit is contained in:
Brian Ashworth 2019-04-17 01:57:34 -04:00 • committed by Simon Ser
parent aa4deef8a8
commit d7d29fe546
3 changed files with 26 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

10
common/ipc-client.c
View file

@ -69,6 +69,16 @@ int ipc_open_socket(const char *socket_path) {
return socketfd;
}
bool ipc_set_recv_timeout(int socketfd, struct timeval tv) {
if (setsockopt(socketfd, SOL_SOCKET, SO_RCVTIMEO, &tv, sizeof(tv)) == -1) {
sway_log_errno(SWAY_ERROR, "Failed to set ipc recv timeout");
return false;
}
sway_log(SWAY_DEBUG, "ipc recv timeout set to %ld.%06ld",
tv.tv_sec, tv.tv_usec);
return true;
}
struct ipc_response *ipc_recv_response(int socketfd) {
char data[IPC_HEADER_SIZE];
uint32_t *data32 = (uint32_t *)(data + sizeof(ipc_magic));