-#undef I3__FILE__
-#define I3__FILE__ "load_layout.c"
/*
* vim:ts=4:sw=4:expandtab
*
static bool parsing_marks;
struct Match *current_swallow;
static bool swallow_is_empty;
+static int num_marks;
+static char **marks;
/* This list is used for reordering the focus stack after parsing the 'focus'
* array. */
struct focus_mapping {
int old_id;
- TAILQ_ENTRY(focus_mapping) focus_mappings;
+
+ TAILQ_ENTRY(focus_mapping)
+ focus_mappings;
};
static TAILQ_HEAD(focus_mappings_head, focus_mapping) focus_mappings =
LOG("creating new swallow\n");
current_swallow = smalloc(sizeof(Match));
match_init(current_swallow);
+ current_swallow->dock = M_DONTCHECK;
TAILQ_INSERT_TAIL(&(json_node->swallow_head), current_swallow, matches);
swallow_is_empty = true;
} else {
Match *match = TAILQ_FIRST(&(json_node->swallow_head));
TAILQ_REMOVE(&(json_node->swallow_head), match, matches);
match_free(match);
+ free(match);
}
}
floating_check_size(json_node);
}
+ if (num_marks > 0) {
+ for (int i = 0; i < num_marks; i++) {
+ con_mark(json_node, marks[i], MM_ADD);
+ free(marks[i]);
+ }
+
+ free(marks);
+ marks = NULL;
+ num_marks = 0;
+ }
+
LOG("attaching\n");
con_attach(json_node, json_node->parent, true);
LOG("Creating window\n");
- x_con_init(json_node, json_node->depth);
+ x_con_init(json_node);
json_node = json_node->parent;
}
if (strcasecmp(last_key, "focus") == 0)
parsing_focus = true;
- if (strcasecmp(last_key, "marks") == 0)
+ if (strcasecmp(last_key, "marks") == 0) {
+ num_marks = 0;
parsing_marks = true;
+ }
return 1;
}
char *mark;
sasprintf(&mark, "%.*s", (int)len, val);
- con_mark(json_node, mark, MM_ADD);
+ marks = srealloc(marks, (++num_marks) * sizeof(char *));
+ marks[num_marks - 1] = sstrdup(mark);
} else {
if (strcasecmp(last_key, "name") == 0) {
json_node->name = scalloc(len + 1, 1);
memcpy(json_node->name, val, len);
+ } else if (strcasecmp(last_key, "title_format") == 0) {
+ json_node->title_format = scalloc(len + 1, 1);
+ memcpy(json_node->title_format, val, len);
} else if (strcasecmp(last_key, "sticky_group") == 0) {
json_node->sticky_group = scalloc(len + 1, 1);
memcpy(json_node->sticky_group, val, len);
setlocale(LC_NUMERIC, "");
yajl_complete_parse(hand);
+ yajl_free(hand);
+ yajl_gen_free(g);
fclose(f);
+ free(buf);
if (to_focus)
con_focus(to_focus);
}