nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

make i3bar work with tree branch again (current_workspace is a string now)

This commit is contained in:
Michael Stapelberg 2010-11-22 00:07:52 +01:00 committed by Axel Wagner
parent a88f7fb392
commit 3de12beef6
1 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
i3bar/src/outputs.c
View File

@ -11,6 +11,7 @@
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#include <errno.h>
#include <i3/ipc.h> #include <i3/ipc.h>
#include <yajl/yajl_parse.h> #include <yajl/yajl_parse.h>
@ -102,6 +103,22 @@ static int outputs_integer_cb(void *params_, long val) {
static int outputs_string_cb(void *params_, const unsigned char *val, unsigned int len) { static int outputs_string_cb(void *params_, const unsigned char *val, unsigned int len) {
struct outputs_json_params *params = (struct outputs_json_params*) params_; struct outputs_json_params *params = (struct outputs_json_params*) params_;
if (!strcmp(params->cur_key, "current_workspace")) {
char *copy = malloc(sizeof(const unsigned char) * (len + 1));
strncpy(copy, (const char*) val, len);
copy[len] = '\0';
char *end;
errno = 0;
long parsed_num = strtol(copy, &end, 10);
if (errno == 0 &&
(end && *end == '\0'))
params->outputs_walk->ws = parsed_num;
free(copy);
FREE(params->cur_key);
return 1;
}
if (strcmp(params->cur_key, "name")) { if (strcmp(params->cur_key, "name")) {
return 0; return 0;
} }