X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=i3bar%2Fsrc%2Fipc.c;h=9a7fb21eb401038c1a63376d36a2874ddc3d4a25;hb=7c0994dafc91944477e03700304b2308b0e3fdb1;hp=6a2c0e625d0972e5d7391e7fc12dca29c5b89485;hpb=cd0cd0c3d22d7acba240ca10d8594621cc67ee34;p=i3%2Fi3 diff --git a/i3bar/src/ipc.c b/i3bar/src/ipc.c index 6a2c0e62..9a7fb21e 100644 --- a/i3bar/src/ipc.c +++ b/i3bar/src/ipc.c @@ -2,11 +2,13 @@ * vim:ts=4:sw=4:expandtab * * i3bar - an xcb-based status- and ws-bar for i3 - * © 2010-2012 Axel Wagner and contributors (see also: LICENSE) + * © 2010 Axel Wagner and contributors (see also: LICENSE) * * ipc.c: Communicating with i3 * */ +#include "common.h" + #include #include #include @@ -17,14 +19,15 @@ #include #include #include +#ifdef I3_ASAN_ENABLED +#include +#endif -#include "common.h" - -ev_io *i3_connection; +ev_io *i3_connection; const char *sock_path; -typedef void(*handler_t)(char*); +typedef void (*handler_t)(char *); /* * Called, when we get a reply to a command from i3. @@ -32,15 +35,15 @@ typedef void(*handler_t)(char*); * */ void got_command_reply(char *reply) { - /* TODO: Error handling for command-replies */ + /* TODO: Error handling for command replies */ } /* - * Called, when we get a reply with workspaces-data + * Called, when we get a reply with workspaces data * */ void got_workspace_reply(char *reply) { - DLOG("Got Workspace-Data!\n"); + DLOG("Got workspace data!\n"); parse_workspaces_json(reply); draw_bars(false); } @@ -51,19 +54,21 @@ void got_workspace_reply(char *reply) { * */ void got_subscribe_reply(char *reply) { - DLOG("Got Subscribe Reply: %s\n", reply); - /* TODO: Error handling for subscribe-commands */ + DLOG("Got subscribe reply: %s\n", reply); + /* TODO: Error handling for subscribe commands */ } /* - * Called, when we get a reply with outputs-data + * Called, when we get a reply with outputs data * */ void got_output_reply(char *reply) { - DLOG("Parsing Outputs-JSON...\n"); + DLOG("Clearing old output configuration...\n"); + free_outputs(); + + DLOG("Parsing outputs JSON...\n"); parse_outputs_json(reply); - DLOG("Reconfiguring Windows...\n"); - realloc_sl_buffer(); + DLOG("Reconfiguring windows...\n"); reconfig_windows(false); i3_output *o_walk; @@ -71,6 +76,10 @@ void got_output_reply(char *reply) { kick_tray_clients(o_walk); } + if (!config.disable_ws) { + i3_send_msg(I3_IPC_MESSAGE_TYPE_GET_WORKSPACES, NULL); + } + draw_bars(false); } @@ -80,7 +89,7 @@ void got_output_reply(char *reply) { */ 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 + /* 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); @@ -101,35 +110,39 @@ void got_bar_config(char *reply) { init_colors(&(config.colors)); start_child(config.command); - FREE(config.command); } -/* Data-structure to easily call the reply-handlers later */ +/* Data structure to easily call the reply handlers later */ handler_t reply_handlers[] = { - &got_command_reply, - &got_workspace_reply, - &got_subscribe_reply, - &got_output_reply, - NULL, - NULL, - &got_bar_config, + &got_command_reply, /* I3_IPC_REPLY_TYPE_COMMAND */ + &got_workspace_reply, /* I3_IPC_REPLY_TYPE_WORKSPACES */ + &got_subscribe_reply, /* I3_IPC_REPLY_TYPE_SUBSCRIBE */ + &got_output_reply, /* I3_IPC_REPLY_TYPE_OUTPUTS */ + NULL, /* I3_IPC_REPLY_TYPE_TREE */ + NULL, /* I3_IPC_REPLY_TYPE_MARKS */ + &got_bar_config, /* I3_IPC_REPLY_TYPE_BAR_CONFIG */ + NULL, /* I3_IPC_REPLY_TYPE_VERSION */ + NULL, /* I3_IPC_REPLY_TYPE_BINDING_MODES */ + NULL, /* I3_IPC_REPLY_TYPE_CONFIG */ + NULL, /* I3_IPC_REPLY_TYPE_TICK */ + NULL, /* I3_IPC_REPLY_TYPE_SYNC */ }; /* - * Called, when a workspace-event arrives (i.e. the user changed the workspace) + * Called, when a workspace event arrives (i.e. the user changed the workspace) * */ void got_workspace_event(char *event) { - DLOG("Got Workspace Event!\n"); + DLOG("Got workspace event!\n"); i3_send_msg(I3_IPC_MESSAGE_TYPE_GET_WORKSPACES, NULL); } /* - * Called, when an output-event arrives (i.e. the screen-configuration changed) + * Called, when an output event arrives (i.e. the screen configuration changed) * */ void got_output_event(char *event) { - DLOG("Got Output Event!\n"); + DLOG("Got output event!\n"); i3_send_msg(I3_IPC_MESSAGE_TYPE_GET_OUTPUTS, NULL); if (!config.disable_ws) { i3_send_msg(I3_IPC_MESSAGE_TYPE_GET_WORKSPACES, NULL); @@ -137,11 +150,11 @@ void got_output_event(char *event) { } /* - * Called, when a mode-event arrives (i3 changed binding mode). + * Called, when a mode event arrives (i3 changed binding mode). * */ void got_mode_event(char *event) { - DLOG("Got Mode Event!\n"); + DLOG("Got mode event!\n"); parse_mode_json(event); draw_bars(false); } @@ -157,20 +170,37 @@ void got_bar_config_update(char *event) { char *found_id = strstr(event, expected_id); FREE(expected_id); if (found_id == NULL) - return; + return; + + /* reconfigure the bar based on the current outputs */ + i3_send_msg(I3_IPC_MESSAGE_TYPE_GET_OUTPUTS, NULL); + + free_colors(&(config.colors)); /* update the configuration with the received settings */ DLOG("Received bar config update \"%s\"\n", event); + char *old_command = config.command ? sstrdup(config.command) : NULL; bar_display_mode_t old_mode = config.hide_on_modifier; parse_config_json(event); if (old_mode != config.hide_on_modifier) { reconfig_windows(true); } + /* update fonts and colors */ + init_xcb_late(config.fontname); + init_colors(&(config.colors)); + + /* restart status command process */ + if (old_command && strcmp(old_command, config.command) != 0) { + kill_child(); + start_child(config.command); + } + free(old_command); + draw_bars(false); } -/* Data-structure to easily call the event-handlers later */ +/* Data structure to easily call the event handlers later */ handler_t event_handlers[] = { &got_workspace_event, &got_output_event, @@ -188,10 +218,10 @@ 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; + 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 first parse the fixed-length IPC header, to know, how much data * we have to expect */ uint32_t rec = 0; while (rec < header_len) { @@ -204,6 +234,9 @@ void got_data(struct ev_loop *loop, ev_io *watcher, int events) { /* EOF received. Since i3 will restart i3bar instances as appropriate, * we exit here. */ DLOG("EOF received, exiting...\n"); +#ifdef I3_ASAN_ENABLED + __lsan_do_leak_check(); +#endif clean_xcb(); exit(EXIT_SUCCESS); } @@ -212,7 +245,7 @@ void got_data(struct ev_loop *loop, ev_io *watcher, int events) { 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); @@ -220,10 +253,10 @@ 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 */ @@ -245,8 +278,8 @@ void got_data(struct ev_loop *loop, ev_io *watcher, int events) { buffer[size] = '\0'; /* And call the callback (indexed by the type) */ - if (type & (1 << 31)) { - type ^= 1 << 31; + if (type & (1UL << 31)) { + type ^= 1UL << 31; event_handlers[type](buffer); } else { if (reply_handlers[type]) @@ -258,7 +291,7 @@ void got_data(struct ev_loop *loop, ev_io *watcher, int events) { } /* - * Sends a Message to i3. + * Sends a message to i3. * type must be a valid I3_IPC_MESSAGE_TYPE (see i3/ipc.h for further information) * */ @@ -269,14 +302,14 @@ 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 = smalloc(to_write); char *walk = buffer; - strncpy(buffer, I3_IPC_MAGIC, strlen(I3_IPC_MAGIC)); + memcpy(buffer, I3_IPC_MAGIC, strlen(I3_IPC_MAGIC)); walk += strlen(I3_IPC_MAGIC); memcpy(walk, &len, sizeof(uint32_t)); walk += sizeof(uint32_t); @@ -286,18 +319,7 @@ int i3_send_msg(uint32_t type, const char *payload) { if (payload != NULL) strncpy(walk, payload, len); - uint32_t written = 0; - - while (to_write > 0) { - int n = write(i3_connection->fd, buffer + written, to_write); - if (n == -1) { - ELOG("write() failed: %s\n", strerror(errno)); - exit(EXIT_FAILURE); - } - - to_write -= n; - written += n; - } + swrite(i3_connection->fd, buffer, to_write); FREE(buffer); @@ -306,7 +328,7 @@ int i3_send_msg(uint32_t type, const char *payload) { /* * Initiate a connection to i3. - * socket-path must be a valid path to the ipc_socket of i3 + * socket_path must be a valid path to the ipc_socket of i3 * */ int init_connection(const char *socket_path) {