+#undef I3__FILE__
+#define I3__FILE__ "load_layout.c"
/*
* vim:ts=4:sw=4:expandtab
*
#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);
+ LOG("string: %.*s for key %s\n", (int)len, val, last_key);
if (parsing_swallows) {
/* TODO: the other swallowing keys */
if (strcasecmp(last_key, "class") == 0) {
memcpy(json_node->sticky_group, val, len);
LOG("sticky_group of this container is %s\n", json_node->sticky_group);
} else if (strcasecmp(last_key, "orientation") == 0) {
+ /* Upgrade path from older versions of i3 (doing an inplace restart
+ * to a newer version):
+ * "orientation" is dumped before "layout". Therefore, we store
+ * whether the orientation was horizontal or vertical in the
+ * last_split_layout. When we then encounter layout == "default",
+ * we will use the last_split_layout as layout instead. */
char *buf = NULL;
sasprintf(&buf, "%.*s", (int)len, val);
- if (strcasecmp(buf, "none") == 0)
- json_node->orientation = NO_ORIENTATION;
- else if (strcasecmp(buf, "horizontal") == 0)
- json_node->orientation = HORIZ;
+ if (strcasecmp(buf, "none") == 0 ||
+ strcasecmp(buf, "horizontal") == 0)
+ json_node->last_split_layout = L_SPLITH;
else if (strcasecmp(buf, "vertical") == 0)
- json_node->orientation = VERT;
+ json_node->last_split_layout = L_SPLITV;
else LOG("Unhandled orientation: %s\n", buf);
+
+ /* What used to be an implicit check whether orientation !=
+ * NO_ORIENTATION is now a proper separate flag. */
+ if (strcasecmp(buf, "none") != 0)
+ json_node->split = true;
free(buf);
} else if (strcasecmp(last_key, "border") == 0) {
char *buf = NULL;
char *buf = NULL;
sasprintf(&buf, "%.*s", (int)len, val);
if (strcasecmp(buf, "default") == 0)
- json_node->layout = L_DEFAULT;
+ /* This set above when we read "orientation". */
+ json_node->layout = json_node->last_split_layout;
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)
+ else if (strcasecmp(buf, "dockarea") == 0) {
json_node->layout = L_DOCKAREA;
- else if (strcasecmp(buf, "output") == 0)
+ /* Necessary for migrating from older versions of i3. */
+ json_node->split = false;
+ } else if (strcasecmp(buf, "output") == 0)
json_node->layout = L_OUTPUT;
+ else if (strcasecmp(buf, "splith") == 0)
+ json_node->layout = L_SPLITH;
+ else if (strcasecmp(buf, "splitv") == 0)
+ json_node->layout = L_SPLITV;
else LOG("Unhandled \"layout\": %s\n", buf);
free(buf);
+ } else if (strcasecmp(last_key, "last_split_layout") == 0) {
+ char *buf = NULL;
+ sasprintf(&buf, "%.*s", (int)len, val);
+ if (strcasecmp(buf, "splith") == 0)
+ json_node->last_split_layout = L_SPLITH;
+ else if (strcasecmp(buf, "splitv") == 0)
+ json_node->last_split_layout = L_SPLITV;
+ else LOG("Unhandled \"last_splitlayout\": %s\n", buf);
+ free(buf);
} else if (strcasecmp(last_key, "mark") == 0) {
char *buf = NULL;
sasprintf(&buf, "%.*s", (int)len, val);
to_focus = json_node;
}
+ if (strcasecmp(last_key, "split") == 0)
+ json_node->split = val;
+
if (parsing_swallows) {
if (strcasecmp(last_key, "restart_mode") == 0)
current_swallow->restart_mode = val;