X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=i3-msg%2Fmain.c;h=91a714e56637b5df408885509f680ad14e6c4b48;hb=e4d6458cc31281297da3c1c906b8f321865929cc;hp=915d326f52052d70dfefe4302b0ca6003bd87e82;hpb=fea0bc1a454788a0a7db563ffb307bf8896fc0df;p=i3%2Fi3 diff --git a/i3-msg/main.c b/i3-msg/main.c index 915d326f..91a714e5 100644 --- a/i3-msg/main.c +++ b/i3-msg/main.c @@ -38,8 +38,6 @@ #include -static char *socket_path; - /* * Having verboselog() and errorlog() is necessary when using libi3. * @@ -119,18 +117,51 @@ static yajl_callbacks reply_callbacks = { .yajl_end_map = reply_end_map_cb, }; +/******************************************************************************* + * Config reply callbacks + *******************************************************************************/ + +static char *config_last_key = NULL; + +static int config_string_cb(void *params, const unsigned char *val, size_t len) { + char *str = scalloc(len + 1, 1); + strncpy(str, (const char *)val, len); + if (strcmp(config_last_key, "config") == 0) { + fprintf(stdout, "%s", str); + } + free(str); + return 1; +} + +static int config_start_map_cb(void *params) { + return 1; +} + +static int config_end_map_cb(void *params) { + return 1; +} + +static int config_map_key_cb(void *params, const unsigned char *keyVal, size_t keyLen) { + config_last_key = scalloc(keyLen + 1, 1); + strncpy(config_last_key, (const char *)keyVal, keyLen); + return 1; +} + +static yajl_callbacks config_callbacks = { + .yajl_string = config_string_cb, + .yajl_start_map = config_start_map_cb, + .yajl_map_key = config_map_key_cb, + .yajl_end_map = config_end_map_cb, +}; + int main(int argc, char *argv[]) { #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; + char *socket_path = NULL; int o, option_index = 0; - uint32_t message_type = I3_IPC_MESSAGE_TYPE_COMMAND; + uint32_t message_type = I3_IPC_MESSAGE_TYPE_RUN_COMMAND; char *payload = NULL; bool quiet = false; @@ -146,29 +177,34 @@ int main(int argc, char *argv[]) { while ((o = getopt_long(argc, argv, options_string, long_options, &option_index)) != -1) { if (o == 's') { - if (socket_path != NULL) - free(socket_path); + free(socket_path); socket_path = sstrdup(optarg); } else if (o == 't') { - if (strcasecmp(optarg, "command") == 0) - message_type = I3_IPC_MESSAGE_TYPE_COMMAND; - else if (strcasecmp(optarg, "get_workspaces") == 0) + if (strcasecmp(optarg, "command") == 0) { + message_type = I3_IPC_MESSAGE_TYPE_RUN_COMMAND; + } else if (strcasecmp(optarg, "run_command") == 0) { + message_type = I3_IPC_MESSAGE_TYPE_RUN_COMMAND; + } else if (strcasecmp(optarg, "get_workspaces") == 0) { message_type = I3_IPC_MESSAGE_TYPE_GET_WORKSPACES; - else if (strcasecmp(optarg, "get_outputs") == 0) + } else if (strcasecmp(optarg, "get_outputs") == 0) { message_type = I3_IPC_MESSAGE_TYPE_GET_OUTPUTS; - else if (strcasecmp(optarg, "get_tree") == 0) + } else if (strcasecmp(optarg, "get_tree") == 0) { message_type = I3_IPC_MESSAGE_TYPE_GET_TREE; - else if (strcasecmp(optarg, "get_marks") == 0) + } else if (strcasecmp(optarg, "get_marks") == 0) { message_type = I3_IPC_MESSAGE_TYPE_GET_MARKS; - else if (strcasecmp(optarg, "get_bar_config") == 0) + } 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) + } else if (strcasecmp(optarg, "get_binding_modes") == 0) { message_type = I3_IPC_MESSAGE_TYPE_GET_BINDING_MODES; - else if (strcasecmp(optarg, "get_version") == 0) + } else if (strcasecmp(optarg, "get_version") == 0) { message_type = I3_IPC_MESSAGE_TYPE_GET_VERSION; - else { + } else if (strcasecmp(optarg, "get_config") == 0) { + message_type = I3_IPC_MESSAGE_TYPE_GET_CONFIG; + } else if (strcasecmp(optarg, "send_tick") == 0) { + message_type = I3_IPC_MESSAGE_TYPE_SEND_TICK; + } else { printf("Unknown message type\n"); - printf("Known types: command, get_workspaces, get_outputs, get_tree, get_marks, get_bar_config, get_binding_modes, get_version\n"); + printf("Known types: run_command, get_workspaces, get_outputs, get_tree, get_marks, get_bar_config, get_binding_modes, get_version, get_config, send_tick\n"); exit(EXIT_FAILURE); } } else if (o == 'q') { @@ -180,16 +216,11 @@ int main(int argc, char *argv[]) { printf("i3-msg " I3_VERSION "\n"); printf("i3-msg [-s ] [-t ] \n"); return 0; + } else if (o == '?') { + exit(EXIT_FAILURE); } } - if (socket_path == NULL) - socket_path = root_atom_contents("I3_SOCKET_PATH", NULL, 0); - - /* Fall back to the default socket path */ - if (socket_path == NULL) - socket_path = sstrdup("/tmp/i3-ipc.sock"); - /* Use all arguments, separated by whitespace, as payload. * This way, you don’t have to do i3-msg 'mark foo', you can use * i3-msg mark foo */ @@ -208,17 +239,7 @@ int main(int argc, char *argv[]) { if (!payload) payload = sstrdup(""); - int sockfd = socket(AF_LOCAL, SOCK_STREAM, 0); - if (sockfd == -1) - err(EXIT_FAILURE, "Could not create socket"); - - struct sockaddr_un addr; - 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) - err(EXIT_FAILURE, "Could not connect to i3 on socket \"%s\"", socket_path); - + int sockfd = ipc_connect(socket_path); if (ipc_send_message(sockfd, strlen(payload), message_type, (uint8_t *)payload) == -1) err(EXIT_FAILURE, "IPC: write()"); free(payload); @@ -239,10 +260,11 @@ int main(int argc, char *argv[]) { errx(EXIT_FAILURE, "IPC: Received reply of type %d but expected %d", reply_type, message_type); /* 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; - handle = yajl_alloc(&reply_callbacks, NULL, NULL); + if (reply_type == I3_IPC_REPLY_TYPE_COMMAND) { + yajl_handle handle = yajl_alloc(&reply_callbacks, NULL, NULL); yajl_status state = yajl_parse(handle, (const unsigned char *)reply, reply_length); + yajl_free(handle); + switch (state) { case yajl_status_ok: break; @@ -253,8 +275,24 @@ int main(int argc, char *argv[]) { /* NB: We still fall-through and print the reply, because even if one * command failed, that doesn’t mean that all commands failed. */ + } else if (reply_type == I3_IPC_REPLY_TYPE_CONFIG) { + yajl_handle handle = yajl_alloc(&config_callbacks, NULL, NULL); + yajl_status state = yajl_parse(handle, (const unsigned char *)reply, reply_length); + yajl_free(handle); + + switch (state) { + case yajl_status_ok: + break; + case yajl_status_client_canceled: + case yajl_status_error: + errx(EXIT_FAILURE, "IPC: Could not parse JSON reply."); + } + + goto exit; } printf("%.*s\n", reply_length, reply); + +exit: free(reply); close(sockfd);