X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fload_layout.c;h=588f2d3b1dc30f7121aeeb438af7b6f8d43c2cd8;hb=a32b6da71249a71487b5708e0f043e5cb3b146c1;hp=795fb6d8ce516e86ecb9e40df40751bdae09b4a8;hpb=794783defbb7073f5ca4676e9b088308baac5540;p=i3%2Fi3 diff --git a/src/load_layout.c b/src/load_layout.c index 795fb6d8..588f2d3b 100644 --- a/src/load_layout.c +++ b/src/load_layout.c @@ -51,12 +51,12 @@ static int json_start_map(void *ctx) { if (last_key && strcasecmp(last_key, "floating_nodes") == 0) { DLOG("New floating_node\n"); Con *ws = con_get_workspace(json_node); - json_node = con_new(NULL, NULL); + json_node = con_new_skeleton(NULL, NULL); json_node->parent = ws; DLOG("Parent is workspace = %p\n", ws); } else { Con *parent = json_node; - json_node = con_new(NULL, NULL); + json_node = con_new_skeleton(NULL, NULL); json_node->parent = parent; } } @@ -67,8 +67,16 @@ static int json_start_map(void *ctx) { static int json_end_map(void *ctx) { LOG("end of map\n"); if (!parsing_swallows && !parsing_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"); + json_node->layout = L_SPLITH; + } + LOG("attaching\n"); con_attach(json_node, json_node->parent, true); + LOG("Creating window\n"); + x_con_init(json_node, json_node->depth); json_node = json_node->parent; } if (parsing_rect) @@ -143,12 +151,20 @@ static int json_string(void *ctx, const unsigned char *val, unsigned int len) { #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)); @@ -172,23 +188,38 @@ static int json_string(void *ctx, const unsigned char *val, unsigned int len) { else if (strcasecmp(buf, "vertical") == 0) 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; sasprintf(&buf, "%.*s", (int)len, val); if (strcasecmp(buf, "none") == 0) json_node->border_style = BS_NONE; - else if (strcasecmp(buf, "1pixel") == 0) - json_node->border_style = BS_1PIXEL; + else if (strcasecmp(buf, "1pixel") == 0) { + json_node->border_style = BS_PIXEL; + json_node->current_border_width = 1; + } else if (strcasecmp(buf, "pixel") == 0) + json_node->border_style = BS_PIXEL; else if (strcasecmp(buf, "normal") == 0) 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); @@ -199,11 +230,9 @@ static int json_string(void *ctx, const unsigned char *val, unsigned int len) { 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; - /* Necessary for migrating from older versions of i3. */ - json_node->split = false; - } else if (strcasecmp(buf, "output") == 0) + else if (strcasecmp(buf, "output") == 0) json_node->layout = L_OUTPUT; else if (strcasecmp(buf, "splith") == 0) json_node->layout = L_SPLITH; @@ -211,6 +240,17 @@ static int json_string(void *ctx, const unsigned char *val, unsigned int len) { json_node->layout = L_SPLITV; else LOG("Unhandled \"layout\": %s\n", buf); free(buf); + } else if (strcasecmp(last_key, "workspace_layout") == 0) { + char *buf = NULL; + sasprintf(&buf, "%.*s", (int)len, val); + if (strcasecmp(buf, "default") == 0) + json_node->workspace_layout = L_DEFAULT; + else if (strcasecmp(buf, "stacked") == 0) + json_node->workspace_layout = L_STACKED; + else if (strcasecmp(buf, "tabbed") == 0) + json_node->workspace_layout = L_TABBED; + else LOG("Unhandled \"workspace_layout\": %s\n", buf); + free(buf); } else if (strcasecmp(last_key, "last_split_layout") == 0) { char *buf = NULL; sasprintf(&buf, "%.*s", (int)len, val); @@ -258,6 +298,7 @@ static int json_int(void *ctx, long long 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; @@ -267,6 +308,12 @@ static int json_int(void *ctx, long val) { if (strcasecmp(last_key, "num") == 0) json_node->num = val; + if (strcasecmp(last_key, "current_border_width") == 0) + json_node->current_border_width = val; + + if (strcasecmp(last_key, "depth") == 0) + json_node->depth = val; + if (!parsing_swallows && strcasecmp(last_key, "id") == 0) json_node->old_id = val; @@ -291,8 +338,8 @@ static int json_int(void *ctx, long 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) { @@ -316,9 +363,6 @@ static int json_bool(void *ctx, int 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; @@ -339,11 +383,22 @@ void tree_append_json(const char *filename) { /* TODO: percent of other windows are not correctly fixed at the moment */ FILE *f; if ((f = fopen(filename, "r")) == NULL) { - LOG("Cannot open file\n"); + LOG("Cannot open file \"%s\"\n", filename); + return; + } + struct stat stbuf; + if (fstat(fileno(f), &stbuf) != 0) { + LOG("Cannot fstat() the file\n"); + fclose(f); + return; + } + char *buf = smalloc(stbuf.st_size); + int n = fread(buf, 1, stbuf.st_size, f); + if (n != stbuf.st_size) { + LOG("File \"%s\" could not be read entirely, not loading.\n", filename); + fclose(f); return; } - char *buf = malloc(65535); /* TODO */ - int n = fread(buf, 1, 65535, f); LOG("read %d bytes\n", n); yajl_gen g; yajl_handle hand; @@ -364,6 +419,10 @@ void tree_append_json(const char *filename) { 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; @@ -374,8 +433,8 @@ void tree_append_json(const char *filename) { 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); yajl_free_error(hand, str); }