Merge branch 'master' into next

[i3/i3] / src / load_layout.c

diff --git a/src/load_layout.c b/src/load_layout.c
index 37322c4ea3857f2b92e85f05c5ee843054f8e975..08d03bd13e50cadbb4c834f1e979bfeb1524ef6f 100644 (file)
--- a/src/load_layout.c
+++ b/src/load_layout.c
@@ -1,14 +1,20 @@
 /*
  * vim:ts=4:sw=4:expandtab
  *
+ * i3 - an improved dynamic tiling window manager
+ * © 2009-2011 Michael Stapelberg and contributors (see also: LICENSE)
+ *
+ * load_layout.c: Restore (parts of) the layout, for example after an inplace
+ *                restart.
+ *
  */
+#include "all.h"
+
 #include <yajl/yajl_common.h>
 #include <yajl/yajl_gen.h>
 #include <yajl/yajl_parse.h>
 #include <yajl/yajl_version.h>
 
-#include "all.h"
-
 /* TODO: refactor the whole parsing thing */
 
 static char *last_key;
@@ -111,7 +117,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", (int)len, val);
+            sasprintf(&buf, "%.*s", (int)len, val);
             if (strcasecmp(buf, "none") == 0)
                 json_node->orientation = NO_ORIENTATION;
             else if (strcasecmp(buf, "horizontal") == 0)
@@ -122,7 +128,7 @@ static int json_string(void *ctx, const unsigned char *val, unsigned int len) {
             free(buf);
         } else if (strcasecmp(last_key, "border") == 0) {
             char *buf = NULL;
-            asprintf(&buf, "%.*s", (int)len, val);
+            sasprintf(&buf, "%.*s", (int)len, val);
             if (strcasecmp(buf, "none") == 0)
                 json_node->border_style = BS_NONE;
             else if (strcasecmp(buf, "1pixel") == 0)
@@ -133,7 +139,7 @@ static int json_string(void *ctx, const unsigned char *val, unsigned int len) {
             free(buf);
         } else if (strcasecmp(last_key, "layout") == 0) {
             char *buf = NULL;
-            asprintf(&buf, "%.*s", (int)len, val);
+            sasprintf(&buf, "%.*s", (int)len, val);
             if (strcasecmp(buf, "default") == 0)
                 json_node->layout = L_DEFAULT;
             else if (strcasecmp(buf, "stacked") == 0)
@@ -148,8 +154,30 @@ static int json_string(void *ctx, const unsigned char *val, unsigned int len) {
             free(buf);
         } else if (strcasecmp(last_key, "mark") == 0) {
             char *buf = NULL;
-            asprintf(&buf, "%.*s", (int)len, val);
+            sasprintf(&buf, "%.*s", (int)len, val);
             json_node->mark = buf;
+        } else if (strcasecmp(last_key, "floating") == 0) {
+            char *buf = NULL;
+            sasprintf(&buf, "%.*s", (int)len, val);
+            if (strcasecmp(buf, "auto_off") == 0)
+                json_node->floating = FLOATING_AUTO_OFF;
+            else if (strcasecmp(buf, "auto_on") == 0)
+                json_node->floating = FLOATING_AUTO_ON;
+            else if (strcasecmp(buf, "user_off") == 0)
+                json_node->floating = FLOATING_USER_OFF;
+            else if (strcasecmp(buf, "user_on") == 0)
+                json_node->floating = FLOATING_USER_ON;
+            free(buf);
+        } else if (strcasecmp(last_key, "scratchpad_state") == 0) {
+            char *buf = NULL;
+            sasprintf(&buf, "%.*s", (int)len, val);
+            if (strcasecmp(buf, "none") == 0)
+                json_node->scratchpad_state = SCRATCHPAD_NONE;
+            else if (strcasecmp(buf, "fresh") == 0)
+                json_node->scratchpad_state = SCRATCHPAD_FRESH;
+            else if (strcasecmp(buf, "changed") == 0)
+                json_node->scratchpad_state = SCRATCHPAD_CHANGED;
+            free(buf);
         }
     }
     return 1;