Merge branch 'master' into next

[i3/i3] / src / load_layout.c

diff --git a/src/load_layout.c b/src/load_layout.c
index ecd0a982eb6d7d42f72381f21ebb2013e00c0454..37322c4ea3857f2b92e85f05c5ee843054f8e975 100644 (file)
--- a/src/load_layout.c
+++ b/src/load_layout.c
@@ -146,6 +146,10 @@ static int json_string(void *ctx, const unsigned char *val, unsigned int len) {
                 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;
@@ -153,10 +157,11 @@ static int json_string(void *ctx, const unsigned char *val, unsigned int len) {
 
 #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, "type") == 0) {
         json_node->type = val;
     }