json_node->layout = L_SPLITH;
}
+ /* Sanity check: swallow criteria don’t make any sense on a split
+ * container. */
+ if (con_is_split(json_node) > 0 && !TAILQ_EMPTY(&(json_node->swallow_head))) {
+ DLOG("sanity check: removing swallows specification from split container\n");
+ while (!TAILQ_EMPTY(&(json_node->swallow_head))) {
+ Match *match = TAILQ_FIRST(&(json_node->swallow_head));
+ TAILQ_REMOVE(&(json_node->swallow_head), match, matches);
+ match_free(match);
+ }
+ }
+
LOG("attaching\n");
con_attach(json_node, json_node->parent, true);
LOG("Creating window\n");
static int json_end_array(void *ctx) {
LOG("end of array\n");
- parsing_swallows = false;
+ if (!parsing_swallows && !parsing_focus) {
+ con_fix_percent(json_node);
+ }
+ if (parsing_swallows) {
+ parsing_swallows = false;
+ }
if (parsing_focus) {
/* Clear the list of focus mappings */
struct focus_mapping *mapping;
#endif
LOG("string: %.*s for key %s\n", (int)len, val, last_key);
if (parsing_swallows) {
- /* TODO: the other swallowing keys */
+ char *sval;
+ sasprintf(&sval, "%.*s", len, val);
if (strcasecmp(last_key, "class") == 0) {
- current_swallow->class = scalloc((len+1) * sizeof(char));
- memcpy(current_swallow->class, val, len);
+ current_swallow->class = regex_new(sval);
+ } else if (strcasecmp(last_key, "instance") == 0) {
+ current_swallow->instance = regex_new(sval);
+ } else if (strcasecmp(last_key, "window_role") == 0) {
+ current_swallow->window_role = regex_new(sval);
+ } else if (strcasecmp(last_key, "title") == 0) {
+ current_swallow->title = regex_new(sval);
+ } else {
+ ELOG("swallow key %s unknown\n", last_key);
}
- LOG("unhandled yet: swallow\n");
+ free(sval);
} else {
if (strcasecmp(last_key, "name") == 0) {
json_node->name = scalloc((len+1) * sizeof(char));
json_node->border_style = BS_NORMAL;
else LOG("Unhandled \"border\": %s\n", buf);
free(buf);
+ } else if (strcasecmp(last_key, "type") == 0) {
+ char *buf = NULL;
+ sasprintf(&buf, "%.*s", (int)len, val);
+ if (strcasecmp(buf, "root") == 0)
+ json_node->type = CT_ROOT;
+ else if (strcasecmp(buf, "output") == 0)
+ json_node->type = CT_OUTPUT;
+ else if (strcasecmp(buf, "con") == 0)
+ json_node->type = CT_CON;
+ else if (strcasecmp(buf, "floating_con") == 0)
+ json_node->type = CT_FLOATING_CON;
+ else if (strcasecmp(buf, "workspace") == 0)
+ json_node->type = CT_WORKSPACE;
+ else if (strcasecmp(buf, "dockarea") == 0)
+ json_node->type = CT_DOCKAREA;
+ else LOG("Unhandled \"type\": %s\n", buf);
+ free(buf);
} else if (strcasecmp(last_key, "layout") == 0) {
char *buf = NULL;
sasprintf(&buf, "%.*s", (int)len, val);
static int json_int(void *ctx, long val) {
LOG("int %ld for key %s\n", val, last_key);
#endif
+ /* For backwards compatibility with i3 < 4.8 */
if (strcasecmp(last_key, "type") == 0)
json_node->type = val;
r->width = val;
else if (strcasecmp(last_key, "height") == 0)
r->height = val;
- else printf("WARNING: unknown key %s in rect\n", last_key);
- printf("rect now: (%d, %d, %d, %d)\n",
+ else ELOG("WARNING: unknown key %s in rect\n", last_key);
+ DLOG("rect now: (%d, %d, %d, %d)\n",
r->x, r->y, r->width, r->height);
}
if (parsing_swallows) {
return 1;
}
-void tree_append_json(const char *filename) {
- /* TODO: percent of other windows are not correctly fixed at the moment */
+void tree_append_json(const char *filename, char **errormsg) {
FILE *f;
if ((f = fopen(filename, "r")) == NULL) {
LOG("Cannot open file \"%s\"\n", filename);
LOG("read %d bytes\n", n);
yajl_gen g;
yajl_handle hand;
- yajl_callbacks callbacks;
- memset(&callbacks, '\0', sizeof(yajl_callbacks));
- callbacks.yajl_start_map = json_start_map;
- callbacks.yajl_end_map = json_end_map;
- callbacks.yajl_end_array = json_end_array;
- callbacks.yajl_string = json_string;
- callbacks.yajl_map_key = json_key;
- callbacks.yajl_integer = json_int;
- callbacks.yajl_double = json_double;
- callbacks.yajl_boolean = json_bool;
+ static yajl_callbacks callbacks = {
+ .yajl_boolean = json_bool,
+ .yajl_integer = json_int,
+ .yajl_double = json_double,
+ .yajl_string = json_string,
+ .yajl_start_map = json_start_map,
+ .yajl_map_key = json_key,
+ .yajl_end_map = json_end_map,
+ .yajl_end_array = json_end_array,
+ };
#if YAJL_MAJOR >= 2
g = yajl_gen_alloc(NULL);
hand = yajl_alloc(&callbacks, NULL, (void*)g);
g = yajl_gen_alloc(NULL, NULL);
hand = yajl_alloc(&callbacks, NULL, NULL, (void*)g);
#endif
+ /* Allowing comments allows for more user-friendly layout files. */
+ yajl_config(hand, yajl_allow_comments, true);
+ /* Allow multiple values, i.e. multiple nodes to attach */
+ yajl_config(hand, yajl_allow_multiple_values, true);
yajl_status stat;
json_node = focused;
to_focus = NULL;
+ parsing_swallows = false;
parsing_rect = false;
parsing_window_rect = false;
parsing_geometry = false;
+ parsing_focus = false;
setlocale(LC_NUMERIC, "C");
stat = yajl_parse(hand, (const unsigned char*)buf, n);
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);
+ unsigned char *str = yajl_get_error(hand, 1, (const unsigned char*)buf, n);
+ ELOG("JSON parsing error: %s\n", str);
+ if (errormsg != NULL)
+ *errormsg = sstrdup((const char*)str);
yajl_free_error(hand, str);
}
+ /* In case not all containers were restored, we need to fix the
+ * percentages, otherwise i3 will crash immediately when rendering the
+ * next time. */
+ con_fix_percent(focused);
+
setlocale(LC_NUMERIC, "");
#if YAJL_MAJOR >= 2
yajl_complete_parse(hand);
projects / i3 / i3 / blobdiff