i3bar_child child;
/* stdin- and sigchild-watchers */
-ev_io *stdin_io;
+ev_io *stdin_io;
ev_child *child_sig;
/* JSON parser for stdin */
* `draw_bars' is called, the error message text will be drawn on the bar in
* the space allocated for the statusline.
*/
-__attribute__ ((format (printf, 1, 2))) static void set_statusline_error(const char *format, ...) {
+__attribute__((format(printf, 1, 2))) static void set_statusline_error(const char *format, ...) {
clear_status_blocks();
char *message;
memset(&(ctx->block), '\0', sizeof(struct status_block));
/* Default width of the separator block. */
- ctx->block.sep_block_width = 9;
+ ctx->block.sep_block_width = logical_px(9);
return 1;
}
-#if YAJL_MAJOR >= 2
static int stdin_map_key(void *context, const unsigned char *key, size_t len) {
-#else
-static int stdin_map_key(void *context, const unsigned char *key, unsigned int len) {
-#endif
parser_ctx *ctx = context;
FREE(ctx->last_map_key);
sasprintf(&(ctx->last_map_key), "%.*s", len, key);
return 1;
}
-#if YAJL_MAJOR >= 2
static int stdin_string(void *context, const unsigned char *val, size_t len) {
-#else
-static int stdin_string(void *context, const unsigned char *val, unsigned int len) {
-#endif
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);
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"))) {
+ if (len == strlen("left") && !strncmp((const char *)val, "left", strlen("left"))) {
ctx->block.align = ALIGN_LEFT;
- } else if (len == strlen("right") && !strncmp((const char*)val, "right", strlen("right"))) {
+ } else if (len == strlen("right") && !strncmp((const char *)val, "right", strlen("right"))) {
ctx->block.align = ALIGN_RIGHT;
} else {
ctx->block.align = ALIGN_CENTER;
i3string_free(text);
}
if (strcasecmp(ctx->last_map_key, "name") == 0) {
- char *copy = (char*)malloc(len+1);
+ char *copy = (char *)malloc(len + 1);
strncpy(copy, (const char *)val, len);
copy[len] = 0;
ctx->block.name = copy;
}
if (strcasecmp(ctx->last_map_key, "instance") == 0) {
- char *copy = (char*)malloc(len+1);
+ char *copy = (char *)malloc(len + 1);
strncpy(copy, (const char *)val, len);
copy[len] = 0;
ctx->block.instance = copy;
return 1;
}
-#if YAJL_MAJOR >= 2
static int stdin_integer(void *context, long long val) {
-#else
-static int stdin_integer(void *context, long val) {
-#endif
parser_ctx *ctx = context;
if (strcasecmp(ctx->last_map_key, "min_width") == 0) {
ctx->block.min_width = (uint32_t)val;
static int stdin_end_array(void *context) {
DLOG("dumping statusline:\n");
struct status_block *current;
- TAILQ_FOREACH(current, &statusline_head, blocks) {
+ TAILQ_FOREACH (current, &statusline_head, blocks) {
DLOG("full_text = %s\n", i3string_as_utf8(current->full_text));
DLOG("color = %s\n", current->color);
}
/*
* Helper function to read stdin
*
+ * Returns NULL on EOF.
+ *
*/
static unsigned char *get_buffer(ev_io *watcher, int *ret_buffer_len) {
int fd = watcher->fd;
int n = 0;
int rec = 0;
int buffer_len = STDIN_CHUNK_SIZE;
- unsigned char *buffer = smalloc(buffer_len+1);
+ unsigned char *buffer = smalloc(buffer_len + 1);
buffer[0] = '\0';
- while(1) {
+ while (1) {
n = read(fd, buffer + rec, buffer_len - rec);
if (n == -1) {
if (errno == EAGAIN) {
exit(EXIT_FAILURE);
}
if (n == 0) {
- /* end of file, kill the watcher */
ELOG("stdin: received EOF\n");
- cleanup();
*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')
- buffer[length-1] = '\0';
- else buffer[length] = '\0';
+ if (buffer[length - 1] == '\n' || buffer[length - 1] == '\r')
+ buffer[length - 1] = '\0';
+ else
+ buffer[length] = '\0';
first->full_text = i3string_from_utf8(buffer);
}
static bool read_json_input(unsigned char *input, int length) {
yajl_status status = yajl_parse(parser, input, length);
bool has_urgent = false;
-#if YAJL_MAJOR >= 2
if (status != yajl_status_ok) {
-#else
- if (status != yajl_status_ok && status != yajl_status_insufficient_data) {
-#endif
char *message = (char *)yajl_get_error(parser, 0, input, length);
/* strip the newline yajl adds to the error message */
status, message, length, input);
set_statusline_error("Could not parse JSON (%s)", message);
- yajl_free_error(parser, (unsigned char*)message);
+ yajl_free_error(parser, (unsigned char *)message);
draw_bars(false);
} else if (parser_context.has_urgent) {
has_urgent = true;
if (child.version > 0) {
has_urgent = read_json_input(buffer, rec);
} else {
- read_flat_input((char*)buffer, rec);
+ read_flat_input((char *)buffer, rec);
}
free(buffer);
draw_bars(has_urgent);
* full_text pointer later. */
struct status_block *new_block = scalloc(sizeof(struct status_block));
TAILQ_INSERT_TAIL(&statusline_head, new_block, blocks);
- read_flat_input((char*)buffer, rec);
+ read_flat_input((char *)buffer, rec);
}
free(buffer);
ev_io_stop(main_loop, stdin_io);
int exit_status = WEXITSTATUS(watcher->rstatus);
ELOG("Child (pid: %d) unexpectedly exited with status %d\n",
- child.pid,
- exit_status);
+ child.pid,
+ exit_status);
/* this error is most likely caused by a user giving a nonexecutable or
* nonexistent file, so we will handle those cases separately. */
void child_write_output(void) {
if (child.click_events) {
const unsigned char *output;
-#if YAJL_MAJOR < 2
- unsigned int size;
-#else
size_t size;
-#endif
+
yajl_gen_get_buf(gen, &output, &size);
write(child_stdin, output, size);
write(child_stdin, "\n", 1);
.yajl_start_array = stdin_start_array,
.yajl_end_array = stdin_end_array,
};
-#if YAJL_MAJOR < 2
- yajl_parser_config parse_conf = { 0, 0 };
-
- parser = yajl_alloc(&callbacks, &parse_conf, NULL, (void*)&parser_context);
-
- gen = yajl_gen_alloc(NULL, NULL);
-#else
parser = yajl_alloc(&callbacks, NULL, &parser_context);
gen = yajl_gen_alloc(NULL);
-#endif
- int pipe_in[2]; /* pipe we read from */
+ int pipe_in[2]; /* pipe we read from */
int pipe_out[2]; /* pipe we write to */
if (pipe(pipe_in) == -1)
dup2(pipe_out[0], STDIN_FILENO);
setpgid(child.pid, 0);
- execl(_PATH_BSHELL, _PATH_BSHELL, "-c", command, (char*) NULL);
+ execl(_PATH_BSHELL, _PATH_BSHELL, "-c", command, (char *)NULL);
return;
default:
/* Parent-process. Reroute streams */
killpg(child.pid, child.cont_signal);
}
}
+
+/*
+ * Whether or not the child want click events
+ *
+ */
+bool child_want_click_events(void) {
+ return child.click_events;
+}
projects / i3 / i3 / blobdiff