From 19833fbc8b607ce881fe9a7f65116240c7ecc87c Mon Sep 17 00:00:00 2001 From: Mikkel Oscar Lyderik Date: Sun, 3 Jan 2016 20:37:10 +0100 Subject: Add IPC event types Adds custom IPC_EVENT_* types --- include/ipc.h | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'include') diff --git a/include/ipc.h b/include/ipc.h index 75be58a6..e0b3b736 100644 --- a/include/ipc.h +++ b/include/ipc.h @@ -10,6 +10,13 @@ enum ipc_command_type { IPC_GET_MARKS = 5, IPC_GET_BAR_CONFIG = 6, IPC_GET_VERSION = 7, + // Events send from sway to clients. Events have the higest bit set. + IPC_EVENT_WORKSPACE = (1 << 31 | 0), + IPC_EVENT_OUTPUT = (1 << 31 | 1), + IPC_EVENT_MODE = (1 << 31 | 2), + IPC_EVENT_WINDOW = (1 << 31 | 3), + IPC_EVENT_BARCONFIG_UPDATE = (1 << 31 | 4), + IPC_EVENT_BINDING = (1 << 31 | 5), IPC_SWAY_GET_PIXELS = 0x81 }; -- cgit v1.2.3 From 7298a9c67aed2d7a5c5c1df55bfa6052cac04d51 Mon Sep 17 00:00:00 2001 From: Mikkel Oscar Lyderik Date: Sun, 3 Jan 2016 20:40:50 +0100 Subject: Add type to returned response. Makes `ipc_recv_response` return a struct with size, type and payload rather than just the payload string. This is useful if the type has to be checked on the client. --- include/ipc-client.h | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) (limited to 'include') diff --git a/include/ipc-client.h b/include/ipc-client.h index a4cfd87f..030c80b6 100644 --- a/include/ipc-client.h +++ b/include/ipc-client.h @@ -3,6 +3,16 @@ #include "ipc.h" +/** + * IPC response including type of IPC response, size of payload and the json + * encoded payload string. + */ +struct ipc_response { + uint32_t size; + uint32_t type; + char *payload; +}; + /** * Gets the path to the IPC socket from sway. */ @@ -17,9 +27,12 @@ int ipc_open_socket(const char *socket_path); */ char *ipc_single_command(int socketfd, uint32_t type, const char *payload, uint32_t *len); /** - * Receives a single IPC resposne and returns the buffer. len will be updated - * with the length of the buffer returned from sway. + * Receives a single IPC response and returns an ipc_response. + */ +struct ipc_response *ipc_recv_response(int socketfd); +/** + * Free ipc_response struct */ -char *ipc_recv_response(int socketfd, uint32_t *len); +void free_ipc_response(struct ipc_response *response); #endif -- cgit v1.2.3