* 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;
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);
- (void)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 = 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 = sstrdup("error_message");
message_block->color = sstrdup("red");
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.is_markup = (len == strlen("pango") && !strncasecmp((const char *)val, "pango", strlen("pango")));
+ ctx->block.pango_markup = (len == strlen("pango") && !strncasecmp((const char *)val, "pango", strlen("pango")));
return 1;
}
if (strcasecmp(ctx->last_map_key, "align") == 0) {
return 1;
}
if (strcasecmp(ctx->last_map_key, "min_width") == 0) {
- char *copy = (char *)malloc(len + 1);
- strncpy(copy, (const char *)val, len);
- copy[len] = 0;
- ctx->block.min_width_str = copy;
+ 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;
}
if (new_block->min_width_str) {
i3String *text = i3string_from_utf8(new_block->min_width_str);
- i3string_set_markup(text, new_block->is_markup);
+ 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->is_markup);
+ 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->is_markup);
+ i3string_set_markup(new_block->short_text, new_block->pango_markup);
TAILQ_INSERT_TAIL(&statusline_buffer, new_block, blocks);
return 1;
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);
}