* vim:ts=4:sw=4:expandtab
*
* i3 - an improved dynamic tiling window manager
- * © 2009-2012 Michael Stapelberg and contributors (see also: LICENSE)
+ * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
*
* i3-msg/main.c: Utility which sends messages to a running i3-instance using
* IPC via UNIX domain sockets.
* Additionally, it’s even useful sometimes :-).
*
*/
+#include "libi3.h"
+
#include <stdio.h>
#include <stdbool.h>
#include <sys/types.h>
#include <xcb/xcb.h>
#include <xcb/xcb_aux.h>
-#include "libi3.h"
#include <i3/ipc.h>
static char *socket_path;
return 1;
}
-#if YAJL_MAJOR >= 2
static int reply_string_cb(void *params, const unsigned char *val, size_t len) {
-#else
-static int reply_string_cb(void *params, const unsigned char *val, unsigned int len) {
-#endif
- char *str = scalloc(len + 1);
- strncpy(str, (const char*)val, len);
+ char *str = scalloc(len + 1, 1);
+ strncpy(str, (const char *)val, len);
if (strcmp(last_key, "error") == 0)
last_reply.error = str;
else if (strcmp(last_key, "input") == 0)
last_reply.input = str;
else if (strcmp(last_key, "errorposition") == 0)
last_reply.errorposition = str;
- else free(str);
+ else
+ free(str);
return 1;
}
return 1;
}
-
-#if YAJL_MAJOR >= 2
static int reply_map_key_cb(void *params, const unsigned char *keyVal, size_t keyLen) {
-#else
-static int reply_map_key_cb(void *params, const unsigned char *keyVal, unsigned keyLen) {
-#endif
free(last_key);
- last_key = scalloc(keyLen + 1);
- strncpy(last_key, (const char*)keyVal, keyLen);
+ last_key = scalloc(keyLen + 1, 1);
+ strncpy(last_key, (const char *)keyVal, keyLen);
return 1;
}
-yajl_callbacks reply_callbacks = {
- NULL,
- &reply_boolean_cb,
- NULL,
- NULL,
- NULL,
- &reply_string_cb,
- &reply_start_map_cb,
- &reply_map_key_cb,
- &reply_end_map_cb,
- NULL,
- NULL
+static yajl_callbacks reply_callbacks = {
+ .yajl_boolean = reply_boolean_cb,
+ .yajl_string = reply_string_cb,
+ .yajl_start_map = reply_start_map_cb,
+ .yajl_map_key = reply_map_key_cb,
+ .yajl_end_map = reply_end_map_cb,
};
int main(int argc, char *argv[]) {
- socket_path = getenv("I3SOCK");
+#if defined(__OpenBSD__)
+ if (pledge("stdio rpath unix", NULL) == -1)
+ err(EXIT_FAILURE, "pledge");
+#endif
+ char *env_socket_path = getenv("I3SOCK");
+ if (env_socket_path)
+ socket_path = sstrdup(env_socket_path);
+ else
+ socket_path = NULL;
int o, option_index = 0;
uint32_t message_type = I3_IPC_MESSAGE_TYPE_COMMAND;
char *payload = NULL;
{"version", no_argument, 0, 'v'},
{"quiet", no_argument, 0, 'q'},
{"help", no_argument, 0, 'h'},
- {0, 0, 0, 0}
- };
+ {0, 0, 0, 0}};
char *options_string = "s:t:vhq";
message_type = I3_IPC_MESSAGE_TYPE_GET_MARKS;
else if (strcasecmp(optarg, "get_bar_config") == 0)
message_type = I3_IPC_MESSAGE_TYPE_GET_BAR_CONFIG;
+ else if (strcasecmp(optarg, "get_binding_modes") == 0)
+ message_type = I3_IPC_MESSAGE_TYPE_GET_BINDING_MODES;
else if (strcasecmp(optarg, "get_version") == 0)
message_type = I3_IPC_MESSAGE_TYPE_GET_VERSION;
else {
printf("Unknown message type\n");
- printf("Known types: command, get_workspaces, get_outputs, get_tree, get_marks, get_bar_config, get_version\n");
+ printf("Known types: command, get_workspaces, get_outputs, get_tree, get_marks, get_bar_config, get_binding_modes, get_version\n");
exit(EXIT_FAILURE);
}
} else if (o == 'q') {
payload = sstrdup(argv[optind]);
} else {
char *both;
- if (asprintf(&both, "%s %s", payload, argv[optind]) == -1)
- err(EXIT_FAILURE, "asprintf");
+ sasprintf(&both, "%s %s", payload, argv[optind]);
free(payload);
payload = both;
}
}
if (!payload)
- payload = "";
+ payload = sstrdup("");
int sockfd = socket(AF_LOCAL, SOCK_STREAM, 0);
if (sockfd == -1)
memset(&addr, 0, sizeof(struct sockaddr_un));
addr.sun_family = AF_LOCAL;
strncpy(addr.sun_path, socket_path, sizeof(addr.sun_path) - 1);
- if (connect(sockfd, (const struct sockaddr*)&addr, sizeof(struct sockaddr_un)) < 0)
+ if (connect(sockfd, (const struct sockaddr *)&addr, sizeof(struct sockaddr_un)) < 0)
err(EXIT_FAILURE, "Could not connect to i3 on socket \"%s\"", socket_path);
- if (ipc_send_message(sockfd, strlen(payload), message_type, (uint8_t*)payload) == -1)
+ if (ipc_send_message(sockfd, strlen(payload), message_type, (uint8_t *)payload) == -1)
err(EXIT_FAILURE, "IPC: write()");
+ free(payload);
if (quiet)
return 0;
/* For the reply of commands, have a look if that command was successful.
* If not, nicely format the error message. */
if (reply_type == I3_IPC_MESSAGE_TYPE_COMMAND) {
- yajl_handle handle;
-#if YAJL_MAJOR < 2
- yajl_parser_config parse_conf = { 0, 0 };
+ yajl_handle handle = yajl_alloc(&reply_callbacks, NULL, NULL);
+ yajl_status state = yajl_parse(handle, (const unsigned char *)reply, reply_length);
+ yajl_free(handle);
- handle = yajl_alloc(&reply_callbacks, &parse_conf, NULL, NULL);
-#else
- handle = yajl_alloc(&reply_callbacks, NULL, NULL);
-#endif
- yajl_status state = yajl_parse(handle, (const unsigned char*)reply, reply_length);
switch (state) {
case yajl_status_ok:
break;
case yajl_status_client_canceled:
-#if YAJL_MAJOR < 2
- case yajl_status_insufficient_data:
-#endif
case yajl_status_error:
errx(EXIT_FAILURE, "IPC: Could not parse JSON reply.");
}