* 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 <stdlib.h>
#include <unistd.h>
#include <sys/types.h>
#include <yajl/yajl_gen.h>
#include <paths.h>
-#include "common.h"
-
/* Global variables for child_*() */
i3bar_child child;
-/* stdin- and sigchild-watchers */
+/* stdin- and SIGCHLD-watchers */
ev_io *stdin_io;
ev_child *child_sig;
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);
char *message;
va_list args;
va_start(args, format);
- vasprintf(&message, format, args);
+ if (vasprintf(&message, format, args) == -1) {
+ return;
+ }
- 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("red");
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("red");
message_block->no_separator = true;
TAILQ_INSERT_HEAD(&statusline_head, err_block, blocks);
}
/*
- * Stop and free() the stdin- and sigchild-watchers
+ * Stop and free() the stdin- and SIGCHLD-watchers
*
*/
void cleanup(void) {
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;
}
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;
}
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"))) {
} 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;
}
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;
}
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;
}
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");
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) {
} 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);
}
}
/*
- * 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
*
*/
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.
*
}
/*
- * 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) {
}
/*
- * 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) {
}
/*
- * Sends a SIGSTOP to the child-process (if existent)
+ * Sends a SIGSTOP to the child process (if existent)
*
*/
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) {