#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.
*
*/
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) {
*/
void got_subscribe_reply(char *reply) {
DLOG("Got Subscribe Reply: %s\n", reply);
- /* TODO: Error handling for subscribe-commands */
+ /* 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) {
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) {
*/
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);
/* Resolve color strings to colorpixels and save them, then free the strings. */
init_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 */
+/* Data-structure to easily call the reply handlers later */
handler_t reply_handlers[] = {
&got_command_reply,
&got_workspace_reply,
};
/*
- * 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) {
}
/*
- * 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) {
}
/*
- * 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) {
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;
+
+ /* 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);
+ 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));
+ realloc_sl_buffer();
+
+ draw_bars(false);
+}
-/* Data-structure to easily call the reply-handlers later */
+/* Data-structure to easily call the event handlers later */
handler_t event_handlers[] = {
&got_workspace_event,
&got_output_event,
- &got_mode_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 */
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);
/*
* 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) {
*/
void subscribe_events(void) {
if (config.disable_ws) {
- i3_send_msg(I3_IPC_MESSAGE_TYPE_SUBSCRIBE, "[ \"output\", \"mode\" ]");
+ i3_send_msg(I3_IPC_MESSAGE_TYPE_SUBSCRIBE, "[ \"output\", \"mode\", \"barconfig_update\" ]");
} else {
- i3_send_msg(I3_IPC_MESSAGE_TYPE_SUBSCRIBE, "[ \"workspace\", \"output\", \"mode\" ]");
+ i3_send_msg(I3_IPC_MESSAGE_TYPE_SUBSCRIBE, "[ \"workspace\", \"output\", \"mode\", \"barconfig_update\" ]");
}
}
projects / i3 / i3 / blobdiff