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;
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;
}
}
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 %ld for key %s\n", val, last_key);
#endif
- LOG("int %d for key %s\n", val, last_key);
- if (strcasecmp(last_key, "layout") == 0) {
- json_node->layout = val;
- }
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;
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);