parser_ctx parser_context;
-/* The buffer statusline points to */
struct statusline_head statusline_head = TAILQ_HEAD_INITIALIZER(statusline_head);
-char *statusline_buffer = NULL;
+/* Used temporarily while reading a statusline */
+struct statusline_head statusline_buffer = TAILQ_HEAD_INITIALIZER(statusline_buffer);
int child_stdin;
/*
- * Clears all blocks from the statusline structure in memory and frees their
- * associated resources.
+ * Remove all blocks from the given statusline.
+ * If free_resources is set, the fields of each status block will be free'd.
*/
-static void clear_status_blocks() {
+static void clear_statusline(struct statusline_head *head, bool free_resources) {
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);
+ while (!TAILQ_EMPTY(head)) {
+ 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);
+ }
+
+ TAILQ_REMOVE(head, first, blocks);
free(first);
}
}
+static void copy_statusline(struct statusline_head *from, struct statusline_head *to) {
+ struct status_block *current;
+ TAILQ_FOREACH(current, from, blocks) {
+ struct status_block *new_block = smalloc(sizeof(struct status_block));
+ memcpy(new_block, current, sizeof(struct status_block));
+ TAILQ_INSERT_TAIL(to, new_block, blocks);
+ }
+}
+
/*
* Replaces the statusline in memory with an error message. Pass a format
* string and format parameters as you would in `printf'. The next time
* the space allocated for the statusline.
*/
__attribute__((format(printf, 1, 2))) static void set_statusline_error(const char *format, ...) {
- clear_status_blocks();
+ clear_statusline(&statusline_head, true);
char *message;
va_list args;
if (stdin_io != NULL) {
ev_io_stop(main_loop, stdin_io);
FREE(stdin_io);
- FREE(statusline_buffer);
- /* statusline pointed to memory within statusline_buffer */
- statusline = NULL;
}
if (child_sig != NULL) {
/*
* The start of a new array is the start of a new status line, so we clear all
- * previous entries.
- *
+ * previous entries from the buffer.
*/
static int stdin_start_array(void *context) {
- struct status_block *first;
- while (!TAILQ_EMPTY(&statusline_head)) {
- 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);
- }
+ // the blocks are still used by statusline_head, so we won't free the
+ // resources here.
+ clear_statusline(&statusline_buffer, false);
return 1;
}
static int stdin_string(void *context, const unsigned char *val, size_t len) {
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);
+ ctx->block.full_text = i3string_from_markup_with_length((const char *)val, len);
+ }
+ if (strcasecmp(ctx->last_map_key, "short_text") == 0) {
+ ctx->block.short_text = i3string_from_markup_with_length((const char *)val, len);
}
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("left") && !strncmp((const char *)val, "left", strlen("left"))) {
- ctx->block.align = ALIGN_LEFT;
+ 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_CENTER;
+ 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);
+ 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;
}
+/*
+ * When a map is finished, we have an entire status block.
+ * Move it from the parser's context to the statusline buffer.
+ */
static int stdin_end_map(void *context) {
parser_ctx *ctx = context;
struct status_block *new_block = smalloc(sizeof(struct status_block));
/* 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);
+ TAILQ_INSERT_TAIL(&statusline_buffer, new_block, blocks);
return 1;
}
+/*
+ * When an array is finished, we have an entire statusline.
+ * Copy it from the buffer to the actual statusline.
+ */
static int stdin_end_array(void *context) {
+ DLOG("copying statusline_buffer to statusline_head\n");
+ clear_statusline(&statusline_head, true);
+ copy_statusline(&statusline_buffer, &statusline_head);
+
DLOG("dumping statusline:\n");
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", i3string_as_utf8(current->short_text));
DLOG("color = %s\n", current->color);
}
DLOG("end of dump\n");
buffer[length - 1] = '\0';
else
buffer[length] = '\0';
- first->full_text = i3string_from_utf8(buffer);
+ first->full_text = i3string_from_markup(buffer);
}
static bool read_json_input(unsigned char *input, int length) {
*
*/
void send_block_clicked(int button, const char *name, const char *instance, int x, int y) {
- if (child.click_events) {
- child_click_events_initialize();
+ if (!child.click_events) {
+ return;
+ }
- yajl_gen_map_open(gen);
+ child_click_events_initialize();
- if (name) {
- child_click_events_key("name");
- yajl_gen_string(gen, (const unsigned char *)name, strlen(name));
- }
+ yajl_gen_map_open(gen);
- if (instance) {
- child_click_events_key("instance");
- yajl_gen_string(gen, (const unsigned char *)instance, strlen(instance));
- }
+ if (name) {
+ child_click_events_key("name");
+ yajl_gen_string(gen, (const unsigned char *)name, strlen(name));
+ }
- child_click_events_key("button");
- yajl_gen_integer(gen, button);
+ if (instance) {
+ child_click_events_key("instance");
+ yajl_gen_string(gen, (const unsigned char *)instance, strlen(instance));
+ }
- child_click_events_key("x");
- yajl_gen_integer(gen, x);
+ child_click_events_key("button");
+ yajl_gen_integer(gen, button);
- child_click_events_key("y");
- yajl_gen_integer(gen, y);
+ child_click_events_key("x");
+ yajl_gen_integer(gen, x);
- yajl_gen_map_close(gen);
- child_write_output();
- }
+ child_click_events_key("y");
+ yajl_gen_integer(gen, y);
+
+ yajl_gen_map_close(gen);
+ child_write_output();
}
/*
projects / i3 / i3 / blobdiff