* vim:ts=4:sw=4:expandtab
*
* i3bar - an xcb-based status- and ws-bar for i3
- * © 2010-2011 Axel Wagner and contributors (see also: LICENSE)
+ * © 2010-2012 Axel Wagner and contributors (see also: LICENSE)
*
* child.c: Getting Input for the statusline
*
* Stop and free() the stdin- and sigchild-watchers
*
*/
-void cleanup() {
+void cleanup(void) {
if (stdin_io != NULL) {
ev_io_stop(main_loop, stdin_io);
FREE(stdin_io);
struct status_block *first;
while (!TAILQ_EMPTY(&statusline_head)) {
first = TAILQ_FIRST(&statusline_head);
- FREE(first->full_text);
+ I3STRING_FREE(first->full_text);
FREE(first->color);
TAILQ_REMOVE(&statusline_head, first, blocks);
free(first);
#endif
parser_ctx *ctx = context;
if (strcasecmp(ctx->last_map_key, "full_text") == 0) {
- sasprintf(&(ctx->block.full_text), "%.*s", len, val);
+ ctx->block.full_text = i3string_from_utf8_with_length((const char *)val, len);
}
if (strcasecmp(ctx->last_map_key, "color") == 0) {
sasprintf(&(ctx->block.color), "%.*s", len, val);
/* 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 = sstrdup("SPEC VIOLATION (null)");
+ new_block->full_text = i3string_from_utf8("SPEC VIOLATION (null)");
TAILQ_INSERT_TAIL(&statusline_head, new_block, blocks);
return 1;
}
DLOG("dumping statusline:\n");
struct status_block *current;
TAILQ_FOREACH(current, &statusline_head, blocks) {
- DLOG("full_text = %s\n", current->full_text);
+ DLOG("full_text = %s\n", i3string_as_utf8(current->full_text));
DLOG("color = %s\n", current->color);
}
DLOG("end of dump\n");
}
/*
- * 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;
ELOG("stdin: received EOF\n");
cleanup();
draw_bars();
- return;
+ *ret_buffer_len = -1;
+ return NULL;
}
rec += n;
}
if (*buffer == '\0') {
FREE(buffer);
- return;
+ rec = -1;
+ }
+ *ret_buffer_len = rec;
+ return buffer;
+}
+
+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) {
+#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);
}
+}
+/*
+ * 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;
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. */
- plaintext = (strncasecmp((char*)buffer, "{\"version\":", strlen("{\"version\":")) != 0);
+ 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 {
- /* At the moment, we don’t care for the version. This might change
- * in the future, but for now, we just discard it. */
- while (*json_input != '\n' && *json_input != '\0') {
- json_input++;
- rec--;
- }
+ json_input += consumed;
+ rec -= consumed;
}
first_line = false;
}
if (!plaintext) {
- yajl_status status = yajl_parse(parser, json_input, rec);
- if (status != yajl_status_ok) {
- fprintf(stderr, "[i3bar] Could not parse JSON input: %.*s\n",
- rec, json_input);
- }
- free(buffer);
+ read_json_input(json_input, rec);
} else {
- struct status_block *first = TAILQ_FIRST(&statusline_head);
- /* Clear the old buffer if any. */
- 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 = (char*)buffer;
+ read_flat_input((char*)buffer, rec);
}
+ free(buffer);
draw_bars();
}
* kill()s the child-process (if any). Called when exit()ing.
*
*/
-void kill_child_at_exit() {
+void kill_child_at_exit(void) {
if (child_pid != 0) {
kill(child_pid, SIGCONT);
kill(child_pid, SIGTERM);
* free()s the stdin- and sigchild-watchers
*
*/
-void kill_child() {
+void kill_child(void) {
if (child_pid != 0) {
kill(child_pid, SIGCONT);
kill(child_pid, SIGTERM);
* Sends a SIGSTOP to the child-process (if existent)
*
*/
-void stop_child() {
+void stop_child(void) {
if (child_pid != 0) {
kill(child_pid, SIGSTOP);
}
* Sends a SIGCONT to the child-process (if existent)
*
*/
-void cont_child() {
+void cont_child(void) {
if (child_pid != 0) {
kill(child_pid, SIGCONT);
}
projects / i3 / i3 / blobdiff