X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=i3bar%2Fsrc%2Fchild.c;h=7c527dc3707f1de7846614112164cfe244842f68;hb=3745e6f4843b638fcc73c3b499bdae4bc6f6132c;hp=efe028843d0e4b2e1b5fa02d70efc9bc3fa04f9f;hpb=487ccb536a6746656c1635078c7ad44892703d71;p=i3%2Fi3 diff --git a/i3bar/src/child.c b/i3bar/src/child.c index efe02884..7c527dc3 100644 --- a/i3bar/src/child.c +++ b/i3bar/src/child.c @@ -2,11 +2,14 @@ * 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) * - * child.c: Getting Input for the statusline + * child.c: Getting input for the statusline * */ +#include "common.h" +#include "yajl_utils.h" + #include #include #include @@ -25,12 +28,12 @@ #include #include -#include "common.h" +#include /* Global variables for child_*() */ i3bar_child child; -/* stdin- and sigchild-watchers */ +/* stdin- and SIGCHLD-watchers */ ev_io *stdin_io; ev_child *child_sig; @@ -70,9 +73,13 @@ static void clear_statusline(struct statusline_head *head, bool free_resources) first = TAILQ_FIRST(head); if (free_resources) { I3STRING_FREE(first->full_text); + I3STRING_FREE(first->short_text); FREE(first->color); FREE(first->name); FREE(first->instance); + FREE(first->min_width_str); + FREE(first->background); + FREE(first->border); } TAILQ_REMOVE(head, first, blocks); @@ -101,32 +108,35 @@ __attribute__((format(printf, 1, 2))) static void set_statusline_error(const cha char *message; va_list args; va_start(args, format); - vasprintf(&message, format, args); + if (vasprintf(&message, format, args) == -1) { + goto finish; + } - struct status_block *err_block = scalloc(sizeof(struct status_block)); + struct status_block *err_block = scalloc(1, sizeof(struct status_block)); err_block->full_text = i3string_from_utf8("Error: "); - err_block->name = "error"; - err_block->color = "red"; + err_block->name = sstrdup("error"); + err_block->color = sstrdup("#ff0000"); err_block->no_separator = true; - struct status_block *message_block = scalloc(sizeof(struct status_block)); + struct status_block *message_block = scalloc(1, sizeof(struct status_block)); message_block->full_text = i3string_from_utf8(message); - message_block->name = "error_message"; - message_block->color = "red"; + message_block->name = sstrdup("error_message"); + message_block->color = sstrdup("#ff0000"); message_block->no_separator = true; TAILQ_INSERT_HEAD(&statusline_head, err_block, blocks); TAILQ_INSERT_TAIL(&statusline_head, message_block, blocks); +finish: FREE(message); va_end(args); } /* - * Stop and free() the stdin- and sigchild-watchers + * Stop and free() the stdin- and SIGCHLD-watchers * */ -void cleanup(void) { +static void cleanup(void) { if (stdin_io != NULL) { ev_io_stop(main_loop, stdin_io); FREE(stdin_io); @@ -160,7 +170,10 @@ static int stdin_start_map(void *context) { memset(&(ctx->block), '\0', sizeof(struct status_block)); /* Default width of the separator block. */ - ctx->block.sep_block_width = logical_px(9); + if (config.separator_symbol == NULL) + ctx->block.sep_block_width = logical_px(9); + else + ctx->block.sep_block_width = logical_px(8) + separator_symbol_width; return 1; } @@ -176,10 +189,13 @@ static int stdin_boolean(void *context, int val) { parser_ctx *ctx = context; if (strcasecmp(ctx->last_map_key, "urgent") == 0) { ctx->block.urgent = val; + return 1; } if (strcasecmp(ctx->last_map_key, "separator") == 0) { ctx->block.no_separator = !val; + return 1; } + return 1; } @@ -187,9 +203,27 @@ static int stdin_string(void *context, const unsigned char *val, size_t len) { parser_ctx *ctx = context; if (strcasecmp(ctx->last_map_key, "full_text") == 0) { ctx->block.full_text = i3string_from_markup_with_length((const char *)val, len); + return 1; + } + if (strcasecmp(ctx->last_map_key, "short_text") == 0) { + ctx->block.short_text = i3string_from_markup_with_length((const char *)val, len); + return 1; } if (strcasecmp(ctx->last_map_key, "color") == 0) { sasprintf(&(ctx->block.color), "%.*s", len, val); + return 1; + } + if (strcasecmp(ctx->last_map_key, "background") == 0) { + sasprintf(&(ctx->block.background), "%.*s", len, val); + return 1; + } + if (strcasecmp(ctx->last_map_key, "border") == 0) { + sasprintf(&(ctx->block.border), "%.*s", len, val); + return 1; + } + if (strcasecmp(ctx->last_map_key, "markup") == 0) { + ctx->block.pango_markup = (len == strlen("pango") && !strncasecmp((const char *)val, "pango", strlen("pango"))); + return 1; } if (strcasecmp(ctx->last_map_key, "align") == 0) { if (len == strlen("center") && !strncmp((const char *)val, "center", strlen("center"))) { @@ -199,23 +233,21 @@ static int stdin_string(void *context, const unsigned char *val, size_t len) { } else { ctx->block.align = ALIGN_LEFT; } - } else if (strcasecmp(ctx->last_map_key, "min_width") == 0) { - i3String *text = i3string_from_markup_with_length((const char *)val, len); - ctx->block.min_width = (uint32_t)predict_text_width(text); - i3string_free(text); + return 1; + } + if (strcasecmp(ctx->last_map_key, "min_width") == 0) { + sasprintf(&(ctx->block.min_width_str), "%.*s", len, val); + return 1; } if (strcasecmp(ctx->last_map_key, "name") == 0) { - char *copy = (char *)malloc(len + 1); - strncpy(copy, (const char *)val, len); - copy[len] = 0; - ctx->block.name = copy; + sasprintf(&(ctx->block.name), "%.*s", len, val); + return 1; } if (strcasecmp(ctx->last_map_key, "instance") == 0) { - char *copy = (char *)malloc(len + 1); - strncpy(copy, (const char *)val, len); - copy[len] = 0; - ctx->block.instance = copy; + sasprintf(&(ctx->block.instance), "%.*s", len, val); + return 1; } + return 1; } @@ -223,10 +255,13 @@ static int stdin_integer(void *context, long long val) { parser_ctx *ctx = context; if (strcasecmp(ctx->last_map_key, "min_width") == 0) { ctx->block.min_width = (uint32_t)val; + return 1; } if (strcasecmp(ctx->last_map_key, "separator_block_width") == 0) { ctx->block.sep_block_width = (uint32_t)val; + return 1; } + return 1; } @@ -244,6 +279,19 @@ static int stdin_end_map(void *context) { new_block->full_text = i3string_from_utf8("SPEC VIOLATION: full_text is NULL!"); if (new_block->urgent) ctx->has_urgent = true; + + if (new_block->min_width_str) { + i3String *text = i3string_from_utf8(new_block->min_width_str); + i3string_set_markup(text, new_block->pango_markup); + new_block->min_width = (uint32_t)predict_text_width(text); + i3string_free(text); + } + + i3string_set_markup(new_block->full_text, new_block->pango_markup); + + if (new_block->short_text != NULL) + i3string_set_markup(new_block->short_text, new_block->pango_markup); + TAILQ_INSERT_TAIL(&statusline_buffer, new_block, blocks); return 1; } @@ -261,6 +309,7 @@ static int stdin_end_array(void *context) { struct status_block *current; TAILQ_FOREACH(current, &statusline_head, blocks) { DLOG("full_text = %s\n", i3string_as_utf8(current->full_text)); + DLOG("short_text = %s\n", (current->short_text == NULL ? NULL : i3string_as_utf8(current->short_text))); DLOG("color = %s\n", current->color); } DLOG("end of dump\n"); @@ -288,10 +337,12 @@ static unsigned char *get_buffer(ev_io *watcher, int *ret_buffer_len) { break; } ELOG("read() failed!: %s\n", strerror(errno)); + FREE(buffer); exit(EXIT_FAILURE); } if (n == 0) { ELOG("stdin: received EOF\n"); + FREE(buffer); *ret_buffer_len = -1; return NULL; } @@ -316,11 +367,13 @@ static void read_flat_input(char *buffer, int length) { I3STRING_FREE(first->full_text); /* Remove the trailing newline and terminate the string at the same * time. */ - if (buffer[length - 1] == '\n' || buffer[length - 1] == '\r') + if (buffer[length - 1] == '\n' || buffer[length - 1] == '\r') { buffer[length - 1] = '\0'; - else + } else { buffer[length] = '\0'; - first->full_text = i3string_from_markup(buffer); + } + + first->full_text = i3string_from_utf8(buffer); } static bool read_json_input(unsigned char *input, int length) { @@ -350,7 +403,7 @@ static bool read_json_input(unsigned char *input, int length) { * in statusline * */ -void stdin_io_cb(struct ev_loop *loop, ev_io *watcher, int revents) { +static void stdin_io_cb(struct ev_loop *loop, ev_io *watcher, int revents) { int rec; unsigned char *buffer = get_buffer(watcher, &rec); if (buffer == NULL) @@ -370,7 +423,7 @@ void stdin_io_cb(struct ev_loop *loop, ev_io *watcher, int revents) { * whether this is JSON or plain text * */ -void stdin_io_first_line_cb(struct ev_loop *loop, ev_io *watcher, int revents) { +static void stdin_io_first_line_cb(struct ev_loop *loop, ev_io *watcher, int revents) { int rec; unsigned char *buffer = get_buffer(watcher, &rec); if (buffer == NULL) @@ -391,7 +444,7 @@ void stdin_io_first_line_cb(struct ev_loop *loop, ev_io *watcher, int revents) { } else { /* In case of plaintext, we just add a single block and change its * full_text pointer later. */ - struct status_block *new_block = scalloc(sizeof(struct status_block)); + struct status_block *new_block = scalloc(1, sizeof(struct status_block)); TAILQ_INSERT_TAIL(&statusline_head, new_block, blocks); read_flat_input((char *)buffer, rec); } @@ -402,12 +455,12 @@ void stdin_io_first_line_cb(struct ev_loop *loop, ev_io *watcher, int revents) { } /* - * We received a sigchild, meaning, that the child-process terminated. - * We simply free the respective data-structures and don't care for input + * We received a SIGCHLD, meaning, that the child process terminated. + * We simply free the respective data structures and don't care for input * anymore * */ -void child_sig_cb(struct ev_loop *loop, ev_child *watcher, int revents) { +static void child_sig_cb(struct ev_loop *loop, ev_child *watcher, int revents) { int exit_status = WEXITSTATUS(watcher->rstatus); ELOG("Child (pid: %d) unexpectedly exited with status %d\n", @@ -427,20 +480,31 @@ void child_sig_cb(struct ev_loop *loop, ev_child *watcher, int revents) { draw_bars(false); } -void child_write_output(void) { +static void child_write_output(void) { if (child.click_events) { const unsigned char *output; size_t size; + ssize_t n; yajl_gen_get_buf(gen, &output, &size); - write(child_stdin, output, size); - write(child_stdin, "\n", 1); + + n = writeall(child_stdin, output, size); + if (n != -1) + n = writeall(child_stdin, "\n", 1); + yajl_gen_clear(gen); + + if (n == -1) { + child.click_events = false; + kill_child(); + set_statusline_error("child_write_output failed"); + draw_bars(false); + } } } /* - * Start a child-process with the specified command and reroute stdin. + * Start a child process with the specified command and reroute stdin. * We actually start a $SHELL to execute the command so we don't have to care * about arguments and such. * @@ -519,7 +583,7 @@ void start_child(char *command) { atexit(kill_child_at_exit); } -void child_click_events_initialize(void) { +static void child_click_events_initialize(void) { if (!child.click_events_init) { yajl_gen_array_open(gen); child_write_output(); @@ -527,15 +591,11 @@ void child_click_events_initialize(void) { } } -void child_click_events_key(const char *key) { - yajl_gen_string(gen, (const unsigned char *)key, strlen(key)); -} - /* * Generates a click event, if enabled. * */ -void send_block_clicked(int button, const char *name, const char *instance, int x, int y) { +void send_block_clicked(int button, const char *name, const char *instance, int x, int y, int x_rel, int y_rel, int width, int height, int mods) { if (!child.click_events) { return; } @@ -545,30 +605,60 @@ void send_block_clicked(int button, const char *name, const char *instance, int yajl_gen_map_open(gen); if (name) { - child_click_events_key("name"); - yajl_gen_string(gen, (const unsigned char *)name, strlen(name)); + ystr("name"); + ystr(name); } if (instance) { - child_click_events_key("instance"); - yajl_gen_string(gen, (const unsigned char *)instance, strlen(instance)); + ystr("instance"); + ystr(instance); } - child_click_events_key("button"); + ystr("button"); yajl_gen_integer(gen, button); - child_click_events_key("x"); + ystr("modifiers"); + yajl_gen_array_open(gen); + if (mods & XCB_MOD_MASK_SHIFT) + ystr("Shift"); + if (mods & XCB_MOD_MASK_CONTROL) + ystr("Control"); + if (mods & XCB_MOD_MASK_1) + ystr("Mod1"); + if (mods & XCB_MOD_MASK_2) + ystr("Mod2"); + if (mods & XCB_MOD_MASK_3) + ystr("Mod3"); + if (mods & XCB_MOD_MASK_4) + ystr("Mod4"); + if (mods & XCB_MOD_MASK_5) + ystr("Mod5"); + yajl_gen_array_close(gen); + + ystr("x"); yajl_gen_integer(gen, x); - child_click_events_key("y"); + ystr("y"); yajl_gen_integer(gen, y); + ystr("relative_x"); + yajl_gen_integer(gen, x_rel); + + ystr("relative_y"); + yajl_gen_integer(gen, y_rel); + + ystr("width"); + yajl_gen_integer(gen, width); + + ystr("height"); + yajl_gen_integer(gen, height); + yajl_gen_map_close(gen); child_write_output(); } /* - * kill()s the child-process (if any). Called when exit()ing. + * kill()s the child process (if any). Called when exit()ing. * */ void kill_child_at_exit(void) { @@ -580,8 +670,8 @@ void kill_child_at_exit(void) { } /* - * kill()s the child-process (if existent) and closes and - * free()s the stdin- and sigchild-watchers + * kill()s the child process (if existent) and closes and + * free()s the stdin- and SIGCHLD-watchers * */ void kill_child(void) { @@ -596,7 +686,7 @@ void kill_child(void) { } /* - * Sends a SIGSTOP to the child-process (if existent) + * Sends a SIGSTOP to the child process (if existent) * */ void stop_child(void) { @@ -607,7 +697,7 @@ void stop_child(void) { } /* - * Sends a SIGCONT to the child-process (if existent) + * Sends a SIGCONT to the child process (if existent) * */ void cont_child(void) {