#include "common.h"
/* Global variables for child_*() */
-pid_t child_pid;
+i3bar_child child = { 0 };
/* stdin- and sigchild-watchers */
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;
ev_child_stop(main_loop, child_sig);
FREE(child_sig);
}
+
+ memset(&child, 0, sizeof(i3bar_child));
}
/*
}
/*
- * Callbalk for stdin. We read a line from stdin and store the result
- * in statusline
+ * Helper function to read stdin
*
*/
-void stdin_io_cb(struct ev_loop *loop, ev_io *watcher, int revents) {
+static unsigned char *get_buffer(ev_io *watcher, int *ret_buffer_len) {
int fd = watcher->fd;
int n = 0;
int rec = 0;
/* end of file, kill the watcher */
ELOG("stdin: received EOF\n");
cleanup();
- draw_bars();
- return;
+ draw_bars(false);
+ *ret_buffer_len = -1;
+ return NULL;
}
rec += n;
}
if (*buffer == '\0') {
FREE(buffer);
- return;
+ rec = -1;
}
+ *ret_buffer_len = rec;
+ return buffer;
+}
- 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, buffer_len, &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;
- }
- if (!plaintext) {
- yajl_status status = yajl_parse(parser, json_input, rec);
+static void read_flat_input(char *buffer, int length) {
+ struct status_block *first = TAILQ_FIRST(&statusline_head);
+ /* Clear the old buffer if any. */
+ 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';
+ first->full_text = i3string_from_utf8(buffer);
+}
+
+static void read_json_input(unsigned char *input, int length) {
+ yajl_status status = yajl_parse(parser, input, length);
#if YAJL_MAJOR >= 2
- if (status != yajl_status_ok) {
+ if (status != yajl_status_ok) {
#else
- if (status != yajl_status_ok && status != yajl_status_insufficient_data) {
+ if (status != yajl_status_ok && status != yajl_status_insufficient_data) {
#endif
- fprintf(stderr, "[i3bar] Could not parse JSON input (code %d): %.*s\n",
- status, rec, json_input);
+ fprintf(stderr, "[i3bar] Could not parse JSON input (code %d): %.*s\n",
+ status, length, input);
+ }
+}
+
+/*
+ * Callbalk for stdin. We read a line from stdin and store the result
+ * in statusline
+ *
+ */
+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)
+ return;
+ if (child.version > 0) {
+ read_json_input(buffer, rec);
+ } else {
+ read_flat_input((char*)buffer, rec);
+ }
+ free(buffer);
+ draw_bars(false);
+}
+
+/*
+ * 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();
}
+ read_json_input(buffer + consumed, rec - consumed);
} else {
- struct status_block *first = TAILQ_FIRST(&statusline_head);
- /* Clear the old buffer if any. */
- I3STRING_FREE(first->full_text);
- /* Remove the trailing newline and terminate the string at the same
- * time. */
- if (buffer[rec-1] == '\n' || buffer[rec-1] == '\r')
- buffer[rec-1] = '\0';
- else buffer[rec] = '\0';
- first->full_text = i3string_from_utf8((const char *)buffer);
+ /* 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);
}
/*
*/
void child_sig_cb(struct ev_loop *loop, ev_child *watcher, int revents) {
ELOG("Child (pid: %d) unexpectedly exited with status %d\n",
- child_pid,
+ child.pid,
watcher->rstatus);
cleanup();
}
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)");
- child_pid = fork();
- switch (child_pid) {
+ child.pid = fork();
+ switch (child.pid) {
case -1:
ELOG("Couldn't fork(): %s\n", strerror(errno));
exit(EXIT_FAILURE);
dup2(fd[0], STDIN_FILENO);
- /* 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();
- }
-
break;
}
}
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 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)
+ kill(child.pid, child.cont_signal);
+ kill(child.pid, SIGTERM);
}
}
*
*/
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)
+ kill(child.pid, child.cont_signal);
+ kill(child.pid, SIGTERM);
int status;
- waitpid(child_pid, &status, 0);
- child_pid = 0;
+ waitpid(child.pid, &status, 0);
cleanup();
}
}
*
*/
void stop_child(void) {
- if (child_pid != 0) {
- kill(child_pid, SIGSTOP);
+ if (child.stop_signal > 0 && !child.stopped) {
+ child.stopped = true;
+ kill(child.pid, child.stop_signal);
}
}
*
*/
void cont_child(void) {
- if (child_pid != 0) {
- kill(child_pid, SIGCONT);
+ if (child.cont_signal > 0 && child.stopped) {
+ child.stopped = false;
+ kill(child.pid, child.cont_signal);
}
}
projects / i3 / i3 / blobdiff