#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.
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) {
* 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
/* Resolve color strings to colorpixels and save them, then free the strings. */
init_colors(&(config.colors));
- free_colors(&(config.colors));
- /* The name of this function is actually misleading. Even if no command is
- * specified, this function initiates the watchers to listen on stdin and
- * react accordingly */
start_child(config.command);
FREE(config.command);
}
}
}
-/* 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,
};
/*
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
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);
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 */
}
/* 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 */
*/
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\" ]");
}
}