* 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
*
*/
+#include "common.h"
+#include "yajl_utils.h"
+
#include <stdlib.h>
#include <unistd.h>
#include <sys/types.h>
#include <yajl/yajl_gen.h>
#include <paths.h>
-#include "common.h"
+#include <xcb/xcb_keysyms.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) {
+ goto finish;
+ }
- 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("#ff0000");
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("#ff0000");
message_block->no_separator = true;
TAILQ_INSERT_HEAD(&statusline_head, err_block, blocks);
TAILQ_INSERT_TAIL(&statusline_head, message_block, blocks);
+finish:
FREE(message);
va_end(args);
}
* Stop and free() the stdin- and SIGCHLD-watchers
*
*/
-void cleanup(void) {
+static void cleanup(void) {
if (stdin_io != NULL) {
ev_io_stop(main_loop, stdin_io);
FREE(stdin_io);
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;
}
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;
break;
}
ELOG("read() failed!: %s\n", strerror(errno));
+ FREE(buffer);
exit(EXIT_FAILURE);
}
if (n == 0) {
ELOG("stdin: received EOF\n");
+ FREE(buffer);
*ret_buffer_len = -1;
return NULL;
}
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) {
* in statusline
*
*/
-void stdin_io_cb(struct ev_loop *loop, ev_io *watcher, int revents) {
+static 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)
* whether this is JSON or plain text
*
*/
-void stdin_io_first_line_cb(struct ev_loop *loop, ev_io *watcher, int revents) {
+static void stdin_io_first_line_cb(struct ev_loop *loop, ev_io *watcher, int revents) {
int rec;
unsigned char *buffer = get_buffer(watcher, &rec);
if (buffer == NULL)
} 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);
}
* anymore
*
*/
-void child_sig_cb(struct ev_loop *loop, ev_child *watcher, int revents) {
+static void child_sig_cb(struct ev_loop *loop, ev_child *watcher, int revents) {
int exit_status = WEXITSTATUS(watcher->rstatus);
ELOG("Child (pid: %d) unexpectedly exited with status %d\n",
draw_bars(false);
}
-void child_write_output(void) {
+static void child_write_output(void) {
if (child.click_events) {
const unsigned char *output;
size_t size;
atexit(kill_child_at_exit);
}
-void child_click_events_initialize(void) {
+static void child_click_events_initialize(void) {
if (!child.click_events_init) {
yajl_gen_array_open(gen);
child_write_output();
}
}
-void child_click_events_key(const char *key) {
- yajl_gen_string(gen, (const unsigned char *)key, strlen(key));
-}
-
/*
* Generates a click event, if enabled.
*
*/
-void send_block_clicked(int button, const char *name, const char *instance, int x, int y) {
+void send_block_clicked(int button, const char *name, const char *instance, int x, int y, int x_rel, int y_rel, int width, int height, int mods) {
if (!child.click_events) {
return;
}
yajl_gen_map_open(gen);
if (name) {
- child_click_events_key("name");
- yajl_gen_string(gen, (const unsigned char *)name, strlen(name));
+ ystr("name");
+ ystr(name);
}
if (instance) {
- child_click_events_key("instance");
- yajl_gen_string(gen, (const unsigned char *)instance, strlen(instance));
+ ystr("instance");
+ ystr(instance);
}
- child_click_events_key("button");
+ ystr("button");
yajl_gen_integer(gen, button);
- child_click_events_key("x");
+ ystr("modifiers");
+ yajl_gen_array_open(gen);
+ if (mods & XCB_MOD_MASK_SHIFT)
+ ystr("Shift");
+ if (mods & XCB_MOD_MASK_CONTROL)
+ ystr("Control");
+ if (mods & XCB_MOD_MASK_1)
+ ystr("Mod1");
+ if (mods & XCB_MOD_MASK_2)
+ ystr("Mod2");
+ if (mods & XCB_MOD_MASK_3)
+ ystr("Mod3");
+ if (mods & XCB_MOD_MASK_4)
+ ystr("Mod4");
+ if (mods & XCB_MOD_MASK_5)
+ ystr("Mod5");
+ yajl_gen_array_close(gen);
+
+ ystr("x");
yajl_gen_integer(gen, x);
- child_click_events_key("y");
+ ystr("y");
yajl_gen_integer(gen, y);
+ ystr("relative_x");
+ yajl_gen_integer(gen, x_rel);
+
+ ystr("relative_y");
+ yajl_gen_integer(gen, y_rel);
+
+ ystr("width");
+ yajl_gen_integer(gen, width);
+
+ ystr("height");
+ yajl_gen_integer(gen, height);
+
yajl_gen_map_close(gen);
child_write_output();
}