static Con *to_focus;
static bool parsing_swallows;
static bool parsing_rect;
+static bool parsing_deco_rect;
static bool parsing_window_rect;
static bool parsing_geometry;
static bool parsing_focus;
match_init(current_swallow);
TAILQ_INSERT_TAIL(&(json_node->swallow_head), current_swallow, matches);
} else {
- if (!parsing_rect && !parsing_window_rect && !parsing_geometry) {
+ if (!parsing_rect && !parsing_deco_rect && !parsing_window_rect && !parsing_geometry) {
if (last_key && strcasecmp(last_key, "floating_nodes") == 0) {
DLOG("New floating_node\n");
Con *ws = con_get_workspace(json_node);
static int json_end_map(void *ctx) {
LOG("end of map\n");
- if (!parsing_swallows && !parsing_rect && !parsing_window_rect && !parsing_geometry) {
+ if (!parsing_swallows && !parsing_rect && !parsing_deco_rect && !parsing_window_rect && !parsing_geometry) {
/* Set a few default values to simplify manually crafted layout files. */
if (json_node->layout == L_DEFAULT) {
DLOG("Setting layout = L_SPLITH\n");
* workspace called “1”. */
Con *output;
Con *workspace = NULL;
- TAILQ_FOREACH (output, &(croot->nodes_head), nodes)
- GREP_FIRST(workspace, output_get_content(output), !strcasecmp(child->name, json_node->name));
+ TAILQ_FOREACH(output, &(croot->nodes_head), nodes)
+ GREP_FIRST(workspace, output_get_content(output), !strcasecmp(child->name, json_node->name));
char *base = sstrdup(json_node->name);
int cnt = 1;
while (workspace != NULL) {
FREE(json_node->name);
asprintf(&(json_node->name), "%s_%d", base, cnt++);
workspace = NULL;
- TAILQ_FOREACH (output, &(croot->nodes_head), nodes)
- GREP_FIRST(workspace, output_get_content(output), !strcasecmp(child->name, json_node->name));
+ TAILQ_FOREACH(output, &(croot->nodes_head), nodes)
+ GREP_FIRST(workspace, output_get_content(output), !strcasecmp(child->name, json_node->name));
}
free(base);
/* Set num accordingly so that i3bar will properly sort it. */
json_node->num = ws_name_to_number(json_node->name);
- } else {
- // TODO: remove this in the “next” branch.
- if (json_node->name == NULL || strcmp(json_node->name, "") == 0) {
- json_node->name = sstrdup("#ff0000");
- }
}
LOG("attaching\n");
x_con_init(json_node, json_node->depth);
json_node = json_node->parent;
}
- if (parsing_rect)
- parsing_rect = false;
- if (parsing_window_rect)
- parsing_window_rect = false;
- if (parsing_geometry)
- parsing_geometry = false;
+
+ parsing_rect = false;
+ parsing_deco_rect = false;
+ parsing_window_rect = false;
+ parsing_geometry = false;
return 1;
}
if (parsing_focus) {
/* Clear the list of focus mappings */
struct focus_mapping *mapping;
- TAILQ_FOREACH_REVERSE (mapping, &focus_mappings, focus_mappings_head, focus_mappings) {
+ TAILQ_FOREACH_REVERSE(mapping, &focus_mappings, focus_mappings_head, focus_mappings) {
LOG("focus (reverse) %d\n", mapping->old_id);
Con *con;
- TAILQ_FOREACH (con, &(json_node->focus_head), focused) {
+ TAILQ_FOREACH(con, &(json_node->focus_head), focused) {
if (con->old_id != mapping->old_id)
continue;
LOG("got it! %p\n", con);
if (strcasecmp(last_key, "rect") == 0)
parsing_rect = true;
+ if (strcasecmp(last_key, "deco_rect") == 0)
+ parsing_deco_rect = true;
+
if (strcasecmp(last_key, "window_rect") == 0)
parsing_window_rect = true;
}
static json_content_t content_result;
+ static int content_level;
+
+ static int json_determine_content_deeper(void *ctx) {
+ content_level++;
+ return 1;
+ }
+
+ static int json_determine_content_shallower(void *ctx) {
+ content_level--;
+ return 1;
+ }
static int json_determine_content_string(void *ctx, const unsigned char *val, size_t len) {
- if (strcasecmp(last_key, "type") != 0)
+ if (strcasecmp(last_key, "type") != 0 || content_level > 1)
return 1;
DLOG("string = %.*s, last_key = %s\n", (int)len, val, last_key);
// We default to JSON_CONTENT_CON because it is legal to not include
// “"type": "con"” in the JSON files for better readability.
content_result = JSON_CONTENT_CON;
+ content_level = 0;
yajl_gen g;
yajl_handle hand;
static yajl_callbacks callbacks = {
.yajl_string = json_determine_content_string,
.yajl_map_key = json_key,
+ .yajl_start_array = json_determine_content_deeper,
+ .yajl_start_map = json_determine_content_deeper,
+ .yajl_end_map = json_determine_content_shallower,
+ .yajl_end_array = json_determine_content_shallower,
};
g = yajl_gen_alloc(NULL);
hand = yajl_alloc(&callbacks, NULL, (void *)g);
to_focus = NULL;
parsing_swallows = false;
parsing_rect = false;
+ parsing_deco_rect = false;
parsing_window_rect = false;
parsing_geometry = false;
parsing_focus = false;
# Bug still in: 4.8-26-gf96ec19
use i3test;
use File::Temp qw(tempfile);
-use List::MoreUtils qw(uniq);
use IO::Handle;
my $ws = fresh_workspace;
cmd "append_layout $filename";
ok(workspace_exists('4'), 'workspace "4" exists now');
- my $ws = get_ws("4");
+ $ws = get_ws("4");
is($ws->{num}, 4, 'workspace number is 4');
+ ################################################################################
+ # Append a workspace with a numeric name, with the “type” property at the end
+ # of the JSON blurb (which is valid and sometimes happens).
+ ################################################################################
+
+ ok(!workspace_exists('5'), 'workspace "5" does not exist yet');
+
+ ($fh, $filename) = tempfile(UNLINK => 1);
+ print $fh <<'EOT';
+ // vim:ts=4:sw=4:et
+ {
+ // workspace with 1 children
+ "border": "pixel",
+ "floating": "auto_off",
+ "layout": "splith",
+ "percent": null,
+ "name": "5",
+ "nodes": [
+ {
+ "border": "pixel",
+ "floating": "auto_off",
+ "geometry": {
+ "height": 268,
+ "width": 484,
+ "x": 0,
+ "y": 0
+ },
+ "name": "vals@w00t: ~",
+ "percent": 1,
+ "swallows": [
+ {
+ // "class": "^URxvt$",
+ // "instance": "^urxvt$",
+ // "title": "^vals\\@w00t\\:\\ \\~$"
+ }
+ ],
+ "type": "con"
+ }
+ ],
+ "type": "workspace"
+ }
+ EOT
+ $fh->flush;
+ cmd "append_layout $filename";
+
+ ok(workspace_exists('5'), 'workspace "5" exists now');
+ $ws = get_ws("5");
+ is($ws->{num}, 5, 'workspace number is 5');
+
done_testing;
projects / i3 / i3 / commitdiff