#include <yajl/yajl_common.h>
#include <yajl/yajl_gen.h>
#include <yajl/yajl_parse.h>
+#include <yajl/yajl_version.h>
#include "all.h"
static bool parsing_swallows;
static bool parsing_rect;
static bool parsing_window_rect;
+static bool parsing_geometry;
struct Match *current_swallow;
static int json_start_map(void *ctx) {
LOG("start of map, last_key = %s\n", last_key);
if (parsing_swallows) {
- LOG("TODO: create new swallow\n");
+ LOG("creating new swallow\n");
current_swallow = smalloc(sizeof(Match));
match_init(current_swallow);
TAILQ_INSERT_TAIL(&(json_node->swallow_head), current_swallow, matches);
} else {
- if (!parsing_rect && !parsing_window_rect) {
+ if (!parsing_rect && !parsing_window_rect && !parsing_geometry) {
if (last_key && strcasecmp(last_key, "floating_nodes") == 0) {
+ DLOG("New floating_node\n");
Con *ws = con_get_workspace(json_node);
- json_node = con_new(NULL);
+ json_node = con_new(NULL, NULL);
json_node->parent = ws;
- TAILQ_INSERT_TAIL(&(ws->floating_head), json_node, floating_windows);
- TAILQ_INSERT_TAIL(&(ws->focus_head), json_node, focused);
+ DLOG("Parent is workspace = %p\n", ws);
} else {
Con *parent = json_node;
- json_node = con_new(NULL);
+ json_node = con_new(NULL, NULL);
json_node->parent = parent;
}
}
static int json_end_map(void *ctx) {
LOG("end of map\n");
- if (!parsing_swallows && !parsing_rect && !parsing_window_rect) {
+ if (!parsing_swallows && !parsing_rect && !parsing_window_rect && !parsing_geometry) {
LOG("attaching\n");
- con_attach(json_node, json_node->parent, false);
+ con_attach(json_node, json_node->parent, true);
json_node = json_node->parent;
}
if (parsing_rect)
parsing_rect = false;
if (parsing_window_rect)
parsing_window_rect = false;
+ if (parsing_geometry)
+ parsing_geometry = false;
return 1;
}
return 1;
}
+#if YAJL_MAJOR < 2
static int json_key(void *ctx, const unsigned char *val, unsigned int len) {
- LOG("key: %.*s\n", len, val);
+#else
+static int json_key(void *ctx, const unsigned char *val, size_t len) {
+#endif
+ LOG("key: %.*s\n", (int)len, val);
FREE(last_key);
last_key = scalloc((len+1) * sizeof(char));
memcpy(last_key, val, len);
parsing_rect = true;
if (strcasecmp(last_key, "window_rect") == 0)
parsing_window_rect = true;
+ if (strcasecmp(last_key, "geometry") == 0)
+ parsing_geometry = true;
return 1;
}
+#if YAJL_MAJOR >= 2
+static int json_string(void *ctx, const unsigned char *val, size_t len) {
+#else
static int json_string(void *ctx, const unsigned char *val, unsigned int len) {
+#endif
LOG("string: %.*s for key %s\n", len, val, last_key);
if (parsing_swallows) {
/* TODO: the other swallowing keys */
LOG("sticky_group of this container is %s\n", json_node->sticky_group);
} else if (strcasecmp(last_key, "orientation") == 0) {
char *buf = NULL;
- asprintf(&buf, "%.*s", len, val);
+ asprintf(&buf, "%.*s", (int)len, val);
if (strcasecmp(buf, "none") == 0)
json_node->orientation = NO_ORIENTATION;
else if (strcasecmp(buf, "horizontal") == 0)
json_node->orientation = VERT;
else LOG("Unhandled orientation: %s\n", buf);
free(buf);
+ } else if (strcasecmp(last_key, "border") == 0) {
+ char *buf = NULL;
+ asprintf(&buf, "%.*s", (int)len, val);
+ if (strcasecmp(buf, "none") == 0)
+ json_node->border_style = BS_NONE;
+ else if (strcasecmp(buf, "1pixel") == 0)
+ json_node->border_style = BS_1PIXEL;
+ else if (strcasecmp(buf, "normal") == 0)
+ json_node->border_style = BS_NORMAL;
+ else LOG("Unhandled \"border\": %s\n", buf);
+ free(buf);
+ } else if (strcasecmp(last_key, "layout") == 0) {
+ char *buf = NULL;
+ asprintf(&buf, "%.*s", (int)len, val);
+ if (strcasecmp(buf, "default") == 0)
+ json_node->layout = L_DEFAULT;
+ else if (strcasecmp(buf, "stacked") == 0)
+ json_node->layout = L_STACKED;
+ else if (strcasecmp(buf, "tabbed") == 0)
+ json_node->layout = L_TABBED;
+ else if (strcasecmp(buf, "dockarea") == 0)
+ json_node->layout = L_DOCKAREA;
+ else if (strcasecmp(buf, "output") == 0)
+ json_node->layout = L_OUTPUT;
+ else LOG("Unhandled \"layout\": %s\n", buf);
+ free(buf);
+ } else if (strcasecmp(last_key, "mark") == 0) {
+ char *buf = NULL;
+ asprintf(&buf, "%.*s", (int)len, val);
+ json_node->mark = buf;
}
}
return 1;
}
+#if YAJL_MAJOR >= 2
+static int json_int(void *ctx, long long val) {
+ LOG("int %lld for key %s\n", val, last_key);
+#else
static int json_int(void *ctx, long val) {
- LOG("int %d for key %s\n", val, last_key);
- if (strcasecmp(last_key, "layout") == 0) {
- json_node->layout = val;
- }
+ LOG("int %ld for key %s\n", val, last_key);
+#endif
if (strcasecmp(last_key, "type") == 0) {
json_node->type = val;
}
if (strcasecmp(last_key, "fullscreen_mode") == 0) {
json_node->fullscreen_mode = val;
}
- if (strcasecmp(last_key, "focused") == 0 && val == 1) {
- to_focus = json_node;
- }
-
if (strcasecmp(last_key, "num") == 0)
json_node->num = val;
- if (parsing_rect || parsing_window_rect) {
- Rect *r = (parsing_rect ? &(json_node->rect) : &(json_node->window_rect));
+ if (parsing_rect || parsing_window_rect || parsing_geometry) {
+ Rect *r;
+ if (parsing_rect)
+ r = &(json_node->rect);
+ else if (parsing_window_rect)
+ r = &(json_node->window_rect);
+ else r = &(json_node->geometry);
if (strcasecmp(last_key, "x") == 0)
r->x = val;
else if (strcasecmp(last_key, "y") == 0)
current_swallow->id = val;
}
if (strcasecmp(last_key, "dock") == 0) {
- current_swallow->dock = true;
+ current_swallow->dock = val;
+ }
+ if (strcasecmp(last_key, "insert_where") == 0) {
+ current_swallow->insert_where = val;
}
}
return 1;
}
+static int json_bool(void *ctx, int val) {
+ LOG("bool %d for key %s\n", val, last_key);
+ if (strcasecmp(last_key, "focused") == 0 && val) {
+ to_focus = json_node;
+ }
+
+ return 1;
+}
+
static int json_double(void *ctx, double val) {
LOG("double %f for key %s\n", val, last_key);
if (strcasecmp(last_key, "percent") == 0) {
callbacks.yajl_map_key = json_key;
callbacks.yajl_integer = json_int;
callbacks.yajl_double = json_double;
+ callbacks.yajl_boolean = json_bool;
+#if YAJL_MAJOR >= 2
+ g = yajl_gen_alloc(NULL);
+ hand = yajl_alloc(&callbacks, NULL, (void*)g);
+#else
g = yajl_gen_alloc(NULL, NULL);
hand = yajl_alloc(&callbacks, NULL, NULL, (void*)g);
+#endif
yajl_status stat;
json_node = focused;
to_focus = NULL;
parsing_rect = false;
parsing_window_rect = false;
+ parsing_geometry = false;
setlocale(LC_NUMERIC, "C");
stat = yajl_parse(hand, (const unsigned char*)buf, n);
- if (stat != yajl_status_ok &&
- stat != yajl_status_insufficient_data)
+ if (stat != yajl_status_ok)
{
unsigned char * str = yajl_get_error(hand, 1, (const unsigned char*)buf, n);
fprintf(stderr, "%s\n", (const char *) str);
}
setlocale(LC_NUMERIC, "");
+#if YAJL_MAJOR >= 2
+ yajl_complete_parse(hand);
+#else
yajl_parse_complete(hand);
+#endif
fclose(f);
if (to_focus)
projects / i3 / i3 / blobdiff