cmdparse: s/direction/split_direction to be more clear

[i3/i3] / src / load_layout.c

diff --git a/src/load_layout.c b/src/load_layout.c
index 92cfecbd79d4c94b417636361c88f70d7adf09a6..6e311f1f9903f2b1aa8be0240d0db29913fa02d8 100644 (file)
--- a/src/load_layout.c
+++ b/src/load_layout.c
@@ -5,6 +5,7 @@
 #include <yajl/yajl_common.h>
 #include <yajl/yajl_gen.h>
 #include <yajl/yajl_parse.h>
+#include <yajl/yajl_version.h>
 
 #include "all.h"
 
@@ -31,12 +32,12 @@ static int json_start_map(void *ctx) {
             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;
             }
         }
@@ -48,7 +49,7 @@ static int json_end_map(void *ctx) {
     LOG("end of map\n");
     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)
@@ -66,8 +67,12 @@ static int json_end_array(void *ctx) {
     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);
@@ -83,7 +88,11 @@ static int json_key(void *ctx, const unsigned char *val, unsigned int len) {
     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 */
@@ -102,7 +111,7 @@ static int json_string(void *ctx, const unsigned char *val, unsigned int len) {
             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)
@@ -111,13 +120,44 @@ static int json_string(void *ctx, const unsigned char *val, unsigned int len) {
                 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);
         }
     }
     return 1;
 }
 
+#if YAJL_MAJOR >= 2
+static int json_int(void *ctx, long long val) {
+#else
 static int json_int(void *ctx, long val) {
+#endif
     LOG("int %d for key %s\n", val, last_key);
+    // TODO: remove this after the next preview release
     if (strcasecmp(last_key, "layout") == 0) {
         json_node->layout = val;
     }
@@ -197,8 +237,13 @@ void tree_append_json(const char *filename) {
     callbacks.yajl_map_key = json_key;
     callbacks.yajl_integer = json_int;
     callbacks.yajl_double = json_double;
+#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;
@@ -207,8 +252,7 @@ void tree_append_json(const char *filename) {
     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);
@@ -216,7 +260,11 @@ void tree_append_json(const char *filename) {
     }
 
     setlocale(LC_NUMERIC, "");
+#if YAJL_MAJOR >= 2
+    yajl_complete_parse(hand);
+#else
     yajl_parse_complete(hand);
+#endif
 
     fclose(f);
     if (to_focus)