/* Global variables for child_*() */
i3bar_child child;
-/* stdin- and sigchild-watchers */
+/* stdin- and SIGCHLD-watchers */
ev_io *stdin_io;
ev_child *child_sig;
FREE(first->color);
FREE(first->name);
FREE(first->instance);
+ FREE(first->min_width_str);
}
TAILQ_REMOVE(head, first, blocks);
char *message;
va_list args;
va_start(args, format);
- vasprintf(&message, format, args);
+ (void)vasprintf(&message, format, args);
struct status_block *err_block = scalloc(sizeof(struct status_block));
err_block->full_text = i3string_from_utf8("Error: ");
}
/*
- * Stop and free() the stdin- and sigchild-watchers
+ * Stop and free() the stdin- and SIGCHLD-watchers
*
*/
void cleanup(void) {
/* Default width of the separator block. */
ctx->block.sep_block_width = logical_px(9);
+ /* Use markup by default */
+ ctx->block.is_markup = true;
+
return 1;
}
if (strcasecmp(ctx->last_map_key, "color") == 0) {
sasprintf(&(ctx->block.color), "%.*s", len, val);
}
+ if (strcasecmp(ctx->last_map_key, "markup") == 0) {
+ ctx->block.is_markup = (len == strlen("pango") && !strncasecmp((const char *)val, "pango", strlen("pango")));
+ }
if (strcasecmp(ctx->last_map_key, "align") == 0) {
if (len == strlen("center") && !strncmp((const char *)val, "center", strlen("center"))) {
ctx->block.align = ALIGN_CENTER;
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);
+ char *copy = (char *)malloc(len + 1);
+ strncpy(copy, (const char *)val, len);
+ copy[len] = 0;
+ ctx->block.min_width_str = copy;
}
if (strcasecmp(ctx->last_map_key, "name") == 0) {
char *copy = (char *)malloc(len + 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->is_markup);
+ new_block->min_width = (uint32_t)predict_text_width(text);
+ i3string_free(text);
+ }
+
+ i3string_set_markup(new_block->full_text, new_block->is_markup);
+ i3string_set_markup(new_block->short_text, new_block->is_markup);
+
TAILQ_INSERT_TAIL(&statusline_buffer, new_block, blocks);
return 1;
}
}
/*
- * 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) {