X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=i3bar%2Fsrc%2Fchild.c;h=d0f0c5fbc67deb004a66f73752e1b2c4a533038c;hb=db62b5a4df3d7ee7ac9363e4c430ea0155abba25;hp=9236de3fb99f7f32f5496d71046b2c3fa82e16bc;hpb=f691927aa7e857ea834698cefef6f9c230b87f17;p=i3%2Fi3 diff --git a/i3bar/src/child.c b/i3bar/src/child.c index 9236de3f..d0f0c5fb 100644 --- a/i3bar/src/child.c +++ b/i3bar/src/child.c @@ -13,6 +13,7 @@ #include #include #include +#include #include #include #include @@ -21,23 +22,28 @@ #include #include #include +#include +#include #include "common.h" /* Global variables for child_*() */ -pid_t child_pid; +i3bar_child child; /* stdin- and sigchild-watchers */ -ev_io *stdin_io; +ev_io *stdin_io; ev_child *child_sig; /* JSON parser for stdin */ -bool first_line = true; -bool plaintext = false; -yajl_callbacks callbacks; yajl_handle parser; +/* JSON generator for stdout */ +yajl_gen gen; + typedef struct parser_ctx { + /* True if one of the parsed blocks was urgent */ + bool has_urgent; + /* A copy of the last JSON map key. */ char *last_map_key; @@ -52,6 +58,55 @@ parser_ctx parser_context; struct statusline_head statusline_head = TAILQ_HEAD_INITIALIZER(statusline_head); char *statusline_buffer = NULL; +int child_stdin; + +/* + * Clears all blocks from the statusline structure in memory and frees their + * associated resources. + */ +static void clear_status_blocks() { + struct status_block *first; + while (!TAILQ_EMPTY(&statusline_head)) { + first = TAILQ_FIRST(&statusline_head); + I3STRING_FREE(first->full_text); + TAILQ_REMOVE(&statusline_head, first, blocks); + free(first); + } +} + +/* + * Replaces the statusline in memory with an error message. Pass a format + * string and format parameters as you would in `printf'. The next time + * `draw_bars' is called, the error message text will be drawn on the bar in + * the space allocated for the statusline. + */ +__attribute__((format(printf, 1, 2))) static void set_statusline_error(const char *format, ...) { + clear_status_blocks(); + + char *message; + va_list args; + va_start(args, format); + vasprintf(&message, format, args); + + struct status_block *err_block = scalloc(sizeof(struct status_block)); + err_block->full_text = i3string_from_utf8("Error: "); + err_block->name = "error"; + err_block->color = "red"; + err_block->no_separator = true; + + struct status_block *message_block = scalloc(sizeof(struct status_block)); + message_block->full_text = i3string_from_utf8(message); + message_block->name = "error_message"; + message_block->color = "red"; + message_block->no_separator = true; + + TAILQ_INSERT_HEAD(&statusline_head, err_block, blocks); + TAILQ_INSERT_TAIL(&statusline_head, message_block, blocks); + + FREE(message); + va_end(args); +} + /* * Stop and free() the stdin- and sigchild-watchers * @@ -69,6 +124,8 @@ void cleanup(void) { ev_child_stop(main_loop, child_sig); FREE(child_sig); } + + memset(&child, 0, sizeof(i3bar_child)); } /* @@ -82,6 +139,8 @@ static int stdin_start_array(void *context) { first = TAILQ_FIRST(&statusline_head); I3STRING_FREE(first->full_text); FREE(first->color); + FREE(first->name); + FREE(first->instance); TAILQ_REMOVE(&statusline_head, first, blocks); free(first); } @@ -95,25 +154,32 @@ static int stdin_start_array(void *context) { static int stdin_start_map(void *context) { parser_ctx *ctx = context; memset(&(ctx->block), '\0', sizeof(struct status_block)); + + /* Default width of the separator block. */ + ctx->block.sep_block_width = logical_px(9); + return 1; } -#if YAJL_MAJOR >= 2 static int stdin_map_key(void *context, const unsigned char *key, size_t len) { -#else -static int stdin_map_key(void *context, const unsigned char *key, unsigned int len) { -#endif parser_ctx *ctx = context; FREE(ctx->last_map_key); sasprintf(&(ctx->last_map_key), "%.*s", len, key); return 1; } -#if YAJL_MAJOR >= 2 +static int stdin_boolean(void *context, int val) { + parser_ctx *ctx = context; + if (strcasecmp(ctx->last_map_key, "urgent") == 0) { + ctx->block.urgent = val; + } + if (strcasecmp(ctx->last_map_key, "separator") == 0) { + ctx->block.no_separator = !val; + } + return 1; +} + static int stdin_string(void *context, const unsigned char *val, size_t len) { -#else -static int stdin_string(void *context, const unsigned char *val, unsigned int len) { -#endif parser_ctx *ctx = context; if (strcasecmp(ctx->last_map_key, "full_text") == 0) { ctx->block.full_text = i3string_from_utf8_with_length((const char *)val, len); @@ -121,6 +187,42 @@ static int stdin_string(void *context, const unsigned char *val, unsigned int le if (strcasecmp(ctx->last_map_key, "color") == 0) { sasprintf(&(ctx->block.color), "%.*s", len, val); } + if (strcasecmp(ctx->last_map_key, "align") == 0) { + if (len == strlen("center") && !strncmp((const char *)val, "center", strlen("center"))) { + ctx->block.align = ALIGN_CENTER; + } else if (len == strlen("right") && !strncmp((const char *)val, "right", strlen("right"))) { + ctx->block.align = ALIGN_RIGHT; + } else { + ctx->block.align = ALIGN_LEFT; + } + } else if (strcasecmp(ctx->last_map_key, "min_width") == 0) { + i3String *text = i3string_from_utf8_with_length((const char *)val, len); + ctx->block.min_width = (uint32_t)predict_text_width(text); + i3string_free(text); + } + 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; + } + 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; + } + return 1; +} + +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; + } + if (strcasecmp(ctx->last_map_key, "separator_block_width") == 0) { + ctx->block.sep_block_width = (uint32_t)val; + } return 1; } @@ -131,7 +233,9 @@ static int stdin_end_map(void *context) { /* Ensure we have a full_text set, so that when it is missing (or null), * i3bar doesn’t crash and the user gets an annoying message. */ if (!new_block->full_text) - new_block->full_text = i3string_from_utf8("SPEC VIOLATION (null)"); + new_block->full_text = i3string_from_utf8("SPEC VIOLATION: full_text is NULL!"); + if (new_block->urgent) + ctx->has_urgent = true; TAILQ_INSERT_TAIL(&statusline_head, new_block, blocks); return 1; } @@ -150,15 +254,17 @@ static int stdin_end_array(void *context) { /* * Helper function to read stdin * + * Returns NULL on EOF. + * */ static unsigned char *get_buffer(ev_io *watcher, int *ret_buffer_len) { int fd = watcher->fd; int n = 0; int rec = 0; int buffer_len = STDIN_CHUNK_SIZE; - unsigned char *buffer = smalloc(buffer_len+1); + unsigned char *buffer = smalloc(buffer_len + 1); buffer[0] = '\0'; - while(1) { + while (1) { n = read(fd, buffer + rec, buffer_len - rec); if (n == -1) { if (errno == EAGAIN) { @@ -169,10 +275,7 @@ static unsigned char *get_buffer(ev_io *watcher, int *ret_buffer_len) { exit(EXIT_FAILURE); } if (n == 0) { - /* end of file, kill the watcher */ ELOG("stdin: received EOF\n"); - cleanup(); - draw_bars(); *ret_buffer_len = -1; return NULL; } @@ -197,22 +300,33 @@ 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') - buffer[length-1] = '\0'; - else buffer[length] = '\0'; + if (buffer[length - 1] == '\n' || buffer[length - 1] == '\r') + buffer[length - 1] = '\0'; + else + buffer[length] = '\0'; first->full_text = i3string_from_utf8(buffer); } -static void read_json_input(unsigned char *input, int length) { +static bool read_json_input(unsigned char *input, int length) { yajl_status status = yajl_parse(parser, input, length); -#if YAJL_MAJOR >= 2 + bool has_urgent = false; if (status != yajl_status_ok) { -#else - if (status != yajl_status_ok && status != yajl_status_insufficient_data) { -#endif - fprintf(stderr, "[i3bar] Could not parse JSON input (code %d): %.*s\n", - status, length, input); + char *message = (char *)yajl_get_error(parser, 0, input, length); + + /* strip the newline yajl adds to the error message */ + if (message[strlen(message) - 1] == '\n') + message[strlen(message) - 1] = '\0'; + + fprintf(stderr, "[i3bar] Could not parse JSON input (code = %d, message = %s): %.*s\n", + status, message, length, input); + + set_statusline_error("Could not parse JSON (%s)", message); + yajl_free_error(parser, (unsigned char *)message); + draw_bars(false); + } else if (parser_context.has_urgent) { + has_urgent = true; } + return has_urgent; } /* @@ -225,32 +339,50 @@ void stdin_io_cb(struct ev_loop *loop, ev_io *watcher, int revents) { unsigned char *buffer = get_buffer(watcher, &rec); if (buffer == NULL) return; - unsigned char *json_input = buffer; - if (first_line) { - DLOG("Detecting input type based on buffer *%.*s*\n", rec, buffer); - /* Detect whether this is JSON or plain text. */ - unsigned int consumed = 0; - /* At the moment, we don’t care for the version. This might change - * in the future, but for now, we just discard it. */ - plaintext = (determine_json_version(buffer, rec, &consumed) == -1); - if (plaintext) { - /* 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)); - TAILQ_INSERT_TAIL(&statusline_head, new_block, blocks); - } else { - json_input += consumed; - rec -= consumed; - } - first_line = false; + bool has_urgent = false; + if (child.version > 0) { + has_urgent = read_json_input(buffer, rec); + } else { + read_flat_input((char *)buffer, rec); } - if (!plaintext) { - read_json_input(json_input, rec); + free(buffer); + draw_bars(has_urgent); +} + +/* + * Callbalk for stdin first line. We read the first line to detect + * whether this is JSON or plain text + * + */ +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) + return; + DLOG("Detecting input type based on buffer *%.*s*\n", rec, buffer); + /* Detect whether this is JSON or plain text. */ + unsigned int consumed = 0; + /* At the moment, we don’t care for the version. This might change + * in the future, but for now, we just discard it. */ + parse_json_header(&child, buffer, rec, &consumed); + if (child.version > 0) { + /* If hide-on-modifier is set, we start of by sending the + * child a SIGSTOP, because the bars aren't mapped at start */ + if (config.hide_on_modifier) { + stop_child(); + } + draw_bars(read_json_input(buffer + consumed, rec - consumed)); } else { - read_flat_input((char*)buffer, rec); + /* 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)); + TAILQ_INSERT_TAIL(&statusline_head, new_block, blocks); + read_flat_input((char *)buffer, rec); } free(buffer); - draw_bars(); + ev_io_stop(main_loop, stdin_io); + ev_io_init(stdin_io, &stdin_io_cb, STDIN_FILENO, EV_READ); + ev_io_start(main_loop, stdin_io); } /* @@ -260,98 +392,174 @@ void stdin_io_cb(struct ev_loop *loop, ev_io *watcher, int revents) { * */ 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", - child_pid, - watcher->rstatus); + child.pid, + exit_status); + + /* this error is most likely caused by a user giving a nonexecutable or + * nonexistent file, so we will handle those cases separately. */ + if (exit_status == 126) + set_statusline_error("status_command is not executable (exit %d)", exit_status); + else if (exit_status == 127) + set_statusline_error("status_command not found or is missing a library dependency (exit %d)", exit_status); + else + set_statusline_error("status_command process exited unexpectedly (exit %d)", exit_status); + cleanup(); + draw_bars(false); +} + +void child_write_output(void) { + if (child.click_events) { + const unsigned char *output; + size_t size; + + yajl_gen_get_buf(gen, &output, &size); + write(child_stdin, output, size); + write(child_stdin, "\n", 1); + yajl_gen_clear(gen); + } } /* * 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 + * about arguments and such. + * + * If `command' is NULL, such as in the case when no `status_command' is given + * in the bar config, no child will be started. * */ void start_child(char *command) { + if (command == NULL) + return; + /* Allocate a yajl parser which will be used to parse stdin. */ - memset(&callbacks, '\0', sizeof(yajl_callbacks)); - callbacks.yajl_map_key = stdin_map_key; - callbacks.yajl_string = stdin_string; - callbacks.yajl_start_array = stdin_start_array; - callbacks.yajl_end_array = stdin_end_array; - callbacks.yajl_start_map = stdin_start_map; - callbacks.yajl_end_map = stdin_end_map; -#if YAJL_MAJOR < 2 - yajl_parser_config parse_conf = { 0, 0 }; - - parser = yajl_alloc(&callbacks, &parse_conf, NULL, (void*)&parser_context); -#else + static yajl_callbacks callbacks = { + .yajl_boolean = stdin_boolean, + .yajl_integer = stdin_integer, + .yajl_string = stdin_string, + .yajl_start_map = stdin_start_map, + .yajl_map_key = stdin_map_key, + .yajl_end_map = stdin_end_map, + .yajl_start_array = stdin_start_array, + .yajl_end_array = stdin_end_array, + }; parser = yajl_alloc(&callbacks, NULL, &parser_context); -#endif - child_pid = 0; - if (command != NULL) { - int fd[2]; - if (pipe(fd) == -1) - err(EXIT_FAILURE, "pipe(fd)"); + gen = yajl_gen_alloc(NULL); - child_pid = fork(); - switch (child_pid) { - case -1: - ELOG("Couldn't fork(): %s\n", strerror(errno)); - exit(EXIT_FAILURE); - case 0: - /* Child-process. Reroute stdout and start shell */ - close(fd[0]); + int pipe_in[2]; /* pipe we read from */ + int pipe_out[2]; /* pipe we write to */ - dup2(fd[1], STDOUT_FILENO); + if (pipe(pipe_in) == -1) + err(EXIT_FAILURE, "pipe(pipe_in)"); + if (pipe(pipe_out) == -1) + err(EXIT_FAILURE, "pipe(pipe_out)"); - static const char *shell = NULL; + child.pid = fork(); + switch (child.pid) { + case -1: + ELOG("Couldn't fork(): %s\n", strerror(errno)); + exit(EXIT_FAILURE); + case 0: + /* Child-process. Reroute streams and start shell */ - if ((shell = getenv("SHELL")) == NULL) - shell = "/bin/sh"; + close(pipe_in[0]); + close(pipe_out[1]); - execl(shell, shell, "-c", command, (char*) NULL); - return; - default: - /* Parent-process. Rerout stdin */ - close(fd[1]); + dup2(pipe_in[1], STDOUT_FILENO); + dup2(pipe_out[0], STDIN_FILENO); - dup2(fd[0], STDIN_FILENO); + setpgid(child.pid, 0); + execl(_PATH_BSHELL, _PATH_BSHELL, "-c", command, (char *)NULL); + return; + default: + /* Parent-process. Reroute streams */ - /* If hide-on-modifier is set, we start of by sending the - * child a SIGSTOP, because the bars aren't mapped at start */ - if (config.hide_on_modifier) { - stop_child(); - } + close(pipe_in[1]); + close(pipe_out[0]); - break; - } + dup2(pipe_in[0], STDIN_FILENO); + child_stdin = pipe_out[1]; + + break; } /* We set O_NONBLOCK because blocking is evil in event-driven software */ fcntl(STDIN_FILENO, F_SETFL, O_NONBLOCK); stdin_io = smalloc(sizeof(ev_io)); - ev_io_init(stdin_io, &stdin_io_cb, STDIN_FILENO, EV_READ); + ev_io_init(stdin_io, &stdin_io_first_line_cb, STDIN_FILENO, EV_READ); ev_io_start(main_loop, stdin_io); /* We must cleanup, if the child unexpectedly terminates */ child_sig = smalloc(sizeof(ev_child)); - ev_child_init(child_sig, &child_sig_cb, child_pid, 0); + ev_child_init(child_sig, &child_sig_cb, child.pid, 0); ev_child_start(main_loop, child_sig); atexit(kill_child_at_exit); } +void child_click_events_initialize(void) { + if (!child.click_events_init) { + yajl_gen_array_open(gen); + child_write_output(); + child.click_events_init = true; + } +} + +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) { + if (!child.click_events) { + return; + } + + child_click_events_initialize(); + + yajl_gen_map_open(gen); + + if (name) { + child_click_events_key("name"); + yajl_gen_string(gen, (const unsigned char *)name, strlen(name)); + } + + if (instance) { + child_click_events_key("instance"); + yajl_gen_string(gen, (const unsigned char *)instance, strlen(instance)); + } + + child_click_events_key("button"); + yajl_gen_integer(gen, button); + + child_click_events_key("x"); + yajl_gen_integer(gen, x); + + child_click_events_key("y"); + yajl_gen_integer(gen, y); + + yajl_gen_map_close(gen); + child_write_output(); +} + /* * kill()s the child-process (if any). Called when exit()ing. * */ void kill_child_at_exit(void) { - if (child_pid != 0) { - kill(child_pid, SIGCONT); - kill(child_pid, SIGTERM); + if (child.pid > 0) { + if (child.cont_signal > 0 && child.stopped) + killpg(child.pid, child.cont_signal); + killpg(child.pid, SIGTERM); } } @@ -361,12 +569,12 @@ void kill_child_at_exit(void) { * */ void kill_child(void) { - if (child_pid != 0) { - kill(child_pid, SIGCONT); - kill(child_pid, SIGTERM); + if (child.pid > 0) { + if (child.cont_signal > 0 && child.stopped) + killpg(child.pid, child.cont_signal); + killpg(child.pid, SIGTERM); int status; - waitpid(child_pid, &status, 0); - child_pid = 0; + waitpid(child.pid, &status, 0); cleanup(); } } @@ -376,8 +584,9 @@ void kill_child(void) { * */ void stop_child(void) { - if (child_pid != 0) { - kill(child_pid, SIGSTOP); + if (child.stop_signal > 0 && !child.stopped) { + child.stopped = true; + killpg(child.pid, child.stop_signal); } } @@ -386,7 +595,16 @@ void stop_child(void) { * */ void cont_child(void) { - if (child_pid != 0) { - kill(child_pid, SIGCONT); + if (child.cont_signal > 0 && child.stopped) { + child.stopped = false; + killpg(child.pid, child.cont_signal); } } + +/* + * Whether or not the child want click events + * + */ +bool child_want_click_events(void) { + return child.click_events; +}