X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=sidebyside;f=i3bar%2Fsrc%2Fipc.c;h=3eb50beb34bb817c231947f70b64f091d1e4b3d6;hb=3b4ae812e3543681a331bb72e6ae50038c4ab7bc;hp=2f5d481c70b43c1c4ac4aa817b71a89f65c4df69;hpb=778268c9bbd176f976ee0ea4c137d1f90a8bd229;p=i3%2Fi3 diff --git a/i3bar/src/ipc.c b/i3bar/src/ipc.c index 2f5d481c..3eb50beb 100644 --- a/i3bar/src/ipc.c +++ b/i3bar/src/ipc.c @@ -1,17 +1,17 @@ /* - * i3bar - an xcb-based status- and ws-bar for i3 - * - * © 2010 Axel Wagner and contributors + * vim:ts=4:sw=4:expandtab * - * See file LICNSE for license information + * i3bar - an xcb-based status- and ws-bar for i3 + * © 2010-2012 Axel Wagner and contributors (see also: LICENSE) * - * src/ipc.c: Communicating with i3 + * ipc.c: Communicating with i3 * */ #include #include #include #include +#include #include #include #include @@ -20,47 +20,11 @@ #include "common.h" -ev_io *i3_connection; -ev_timer *reconn = NULL; +ev_io *i3_connection; const char *sock_path; -typedef void(*handler_t)(char*); - -/* - * Retry to connect. - * - */ -void retry_connection(struct ev_loop *loop, ev_timer *w, int events) { - static int retries = 8; - if (init_connection(sock_path) == 0) { - if (retries == 0) { - ELOG("Retried 8 times - connection failed!\n"); - exit(EXIT_FAILURE); - } - retries--; - return; - } - retries = 8; - ev_timer_stop(loop, w); - subscribe_events(); - reconfig_windows(); -} - -/* - * Schedule a reconnect - * - */ -void reconnect() { - if (reconn == NULL) { - if ((reconn = malloc(sizeof(ev_timer))) == NULL) { - ELOG("malloc() failed: %s\n", strerror(errno)); - exit(EXIT_FAILURE); - } - } - ev_timer_init(reconn, retry_connection, 0.25, 0.25); - ev_timer_start(main_loop, reconn); -} +typedef void (*handler_t)(char *); /* * Called, when we get a reply to a command from i3. @@ -78,7 +42,7 @@ void got_command_reply(char *reply) { void got_workspace_reply(char *reply) { DLOG("Got Workspace-Data!\n"); parse_workspaces_json(reply); - draw_bars(); + draw_bars(false); } /* @@ -100,7 +64,44 @@ void got_output_reply(char *reply) { parse_outputs_json(reply); DLOG("Reconfiguring Windows...\n"); realloc_sl_buffer(); - reconfig_windows(); + reconfig_windows(false); + + i3_output *o_walk; + SLIST_FOREACH(o_walk, outputs, slist) { + kick_tray_clients(o_walk); + } + + draw_bars(false); +} + +/* + * Called when we get the configuration for our bar instance + * + */ +void got_bar_config(char *reply) { + DLOG("Received bar config \"%s\"\n", reply); + /* We initiate the main-function by requesting infos about the outputs and + * workspaces. Everything else (creating the bars, showing the right workspace- + * buttons and more) is taken care of by the event-drivenness of the code */ + i3_send_msg(I3_IPC_MESSAGE_TYPE_GET_OUTPUTS, NULL); + + free_colors(&(config.colors)); + parse_config_json(reply); + + /* Now we can actually use 'config', so let's subscribe to the appropriate + * events and request the workspaces if necessary. */ + subscribe_events(); + if (!config.disable_ws) + i3_send_msg(I3_IPC_MESSAGE_TYPE_GET_WORKSPACES, NULL); + + /* Initialize the rest of XCB */ + init_xcb_late(config.fontname); + + /* Resolve color strings to colorpixels and save them, then free the strings. */ + init_colors(&(config.colors)); + + start_child(config.command); + FREE(config.command); } /* Data-structure to easily call the reply-handlers later */ @@ -109,6 +110,9 @@ handler_t reply_handlers[] = { &got_workspace_reply, &got_subscribe_reply, &got_output_reply, + NULL, + NULL, + &got_bar_config, }; /* @@ -132,10 +136,52 @@ void got_output_event(char *event) { } } -/* Data-structure to easily call the reply-handlers later */ +/* + * Called, when a mode-event arrives (i3 changed binding mode). + * + */ +void got_mode_event(char *event) { + DLOG("Got Mode Event!\n"); + parse_mode_json(event); + draw_bars(false); +} + +/* + * Called, when a barconfig_update event arrives (i.e. i3 changed the bar hidden_state or mode) + * + */ +void got_bar_config_update(char *event) { + /* check whether this affect this bar instance by checking the bar_id */ + char *expected_id; + sasprintf(&expected_id, "\"id\":\"%s\"", config.bar_id); + char *found_id = strstr(event, expected_id); + FREE(expected_id); + if (found_id == NULL) + return; + + free_colors(&(config.colors)); + + /* update the configuration with the received settings */ + DLOG("Received bar config update \"%s\"\n", event); + bar_display_mode_t old_mode = config.hide_on_modifier; + parse_config_json(event); + if (old_mode != config.hide_on_modifier) { + reconfig_windows(true); + } + + init_colors(&(config.colors)); + realloc_sl_buffer(); + + draw_bars(false); +} + +/* Data-structure to easily call the event-handlers later */ handler_t event_handlers[] = { &got_workspace_event, - &got_output_event + &got_output_event, + &got_mode_event, + NULL, + &got_bar_config_update, }; /* @@ -147,12 +193,8 @@ void got_data(struct ev_loop *loop, ev_io *watcher, int events) { int fd = watcher->fd; /* First we only read the header, because we know its length */ - uint32_t header_len = strlen(I3_IPC_MAGIC) + sizeof(uint32_t)*2; - char *header = malloc(header_len); - if (header == NULL) { - ELOG("Could not allocate memory: %s\n", strerror(errno)); - exit(EXIT_FAILURE); - } + uint32_t header_len = strlen(I3_IPC_MAGIC) + sizeof(uint32_t) * 2; + char *header = smalloc(header_len); /* We first parse the fixed-length IPC-header, to know, how much data * we have to expect */ @@ -164,19 +206,18 @@ void got_data(struct ev_loop *loop, ev_io *watcher, int events) { exit(EXIT_FAILURE); } if (n == 0) { - /* EOF received. We try to recover a few times, because most likely - * i3 just restarted */ - ELOG("EOF received, try to recover...\n"); - destroy_connection(); - reconnect(); - return; + /* EOF received. Since i3 will restart i3bar instances as appropriate, + * we exit here. */ + DLOG("EOF received, exiting...\n"); + clean_xcb(); + exit(EXIT_SUCCESS); } rec += n; } if (strncmp(header, I3_IPC_MAGIC, strlen(I3_IPC_MAGIC))) { ELOG("Wrong magic code: %.*s\n Expected: %s\n", - (int) strlen(I3_IPC_MAGIC), + (int)strlen(I3_IPC_MAGIC), header, I3_IPC_MAGIC); exit(EXIT_FAILURE); @@ -184,22 +225,14 @@ void got_data(struct ev_loop *loop, ev_io *watcher, int events) { char *walk = header + strlen(I3_IPC_MAGIC); uint32_t size; - memcpy(&size, (uint32_t*)walk, sizeof(uint32_t)); + memcpy(&size, (uint32_t *)walk, sizeof(uint32_t)); walk += sizeof(uint32_t); uint32_t type; - memcpy(&type, (uint32_t*)walk, sizeof(uint32_t)); + memcpy(&type, (uint32_t *)walk, sizeof(uint32_t)); /* Now that we know, what to expect, we can start read()ing the rest * of the message */ - char *buffer = malloc(size + 1); - if (buffer == NULL) { - /* EOF received. We try to recover a few times, because most likely - * i3 just restarted */ - ELOG("EOF received, try to recover...\n"); - destroy_connection(); - reconnect(); - return; - } + char *buffer = smalloc(size + 1); rec = 0; while (rec < size) { @@ -221,7 +254,8 @@ void got_data(struct ev_loop *loop, ev_io *watcher, int events) { type ^= 1 << 31; event_handlers[type](buffer); } else { - reply_handlers[type](buffer); + if (reply_handlers[type]) + reply_handlers[type](buffer); } FREE(header); @@ -240,16 +274,11 @@ int i3_send_msg(uint32_t type, const char *payload) { } /* We are a wellbehaved client and send a proper header first */ - uint32_t to_write = strlen (I3_IPC_MAGIC) + sizeof(uint32_t)*2 + len; + uint32_t to_write = strlen(I3_IPC_MAGIC) + sizeof(uint32_t) * 2 + len; /* TODO: I'm not entirely sure if this buffer really has to contain more * than the pure header (why not just write() the payload from *payload?), * but we leave it for now */ - char *buffer = malloc(to_write); - if (buffer == NULL) { - ELOG("Could not allocate memory: %s\n", strerror(errno)); - exit(EXIT_FAILURE); - } - + char *buffer = smalloc(to_write); char *walk = buffer; strncpy(buffer, I3_IPC_MAGIC, strlen(I3_IPC_MAGIC)); @@ -287,27 +316,8 @@ int i3_send_msg(uint32_t type, const char *payload) { */ int init_connection(const char *socket_path) { sock_path = socket_path; - int sockfd = socket(AF_LOCAL, SOCK_STREAM, 0); - if (sockfd == -1) { - ELOG("Could not create Socket: %s\n", strerror(errno)); - exit(EXIT_FAILURE); - } - - struct sockaddr_un addr; - memset(&addr, 0, sizeof(struct sockaddr_un)); - addr.sun_family = AF_LOCAL; - strcpy(addr.sun_path, sock_path); - if (connect(sockfd, (const struct sockaddr*) &addr, sizeof(struct sockaddr_un)) < 0) { - ELOG("Could not connect to i3! %s: %s\n", sock_path, strerror(errno)); - reconnect(); - return 0; - } - - i3_connection = malloc(sizeof(ev_io)); - if (i3_connection == NULL) { - ELOG("malloc() failed: %s\n", strerror(errno)); - exit(EXIT_FAILURE); - } + int sockfd = ipc_connect(socket_path); + i3_connection = smalloc(sizeof(ev_io)); ev_io_init(i3_connection, &got_data, sockfd, EV_READ); ev_io_start(main_loop, i3_connection); return 1; @@ -316,7 +326,7 @@ int init_connection(const char *socket_path) { /* * Destroy the connection to i3. */ -void destroy_connection() { +void destroy_connection(void) { close(i3_connection->fd); ev_io_stop(main_loop, i3_connection); } @@ -325,10 +335,10 @@ void destroy_connection() { * Subscribe to all the i3-events, we need * */ -void subscribe_events() { +void subscribe_events(void) { if (config.disable_ws) { - i3_send_msg(I3_IPC_MESSAGE_TYPE_SUBSCRIBE, "[ \"output\" ]"); + i3_send_msg(I3_IPC_MESSAGE_TYPE_SUBSCRIBE, "[ \"output\", \"mode\", \"barconfig_update\" ]"); } else { - i3_send_msg(I3_IPC_MESSAGE_TYPE_SUBSCRIBE, "[ \"workspace\", \"output\" ]"); + i3_send_msg(I3_IPC_MESSAGE_TYPE_SUBSCRIBE, "[ \"workspace\", \"output\", \"mode\", \"barconfig_update\" ]"); } }