X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Fload_layout.c;h=c4d39fcee57fa569be1ac07fced152b57b56b55f;hb=42515308e72e4ea6f6b49508c1ba286263dded64;hp=1b08f8c17eae72821d8b69499a92f8039b8d7e88;hpb=0f6b5fe8dafe0a7f903d84b1f1f9e6689bddfc1e;p=i3%2Fi3 diff --git a/src/load_layout.c b/src/load_layout.c index 1b08f8c1..c4d39fce 100644 --- a/src/load_layout.c +++ b/src/load_layout.c @@ -24,6 +24,7 @@ static Con *json_node; 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; @@ -37,7 +38,7 @@ struct focus_mapping { }; static TAILQ_HEAD(focus_mappings_head, focus_mapping) focus_mappings = - TAILQ_HEAD_INITIALIZER(focus_mappings); + TAILQ_HEAD_INITIALIZER(focus_mappings); static int json_start_map(void *ctx) { LOG("start of map, last_key = %s\n", last_key); @@ -47,16 +48,18 @@ static int json_start_map(void *ctx) { 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); json_node = con_new_skeleton(NULL, NULL); + json_node->name = NULL; json_node->parent = ws; DLOG("Parent is workspace = %p\n", ws); } else { Con *parent = json_node; json_node = con_new_skeleton(NULL, NULL); + json_node->name = NULL; json_node->parent = parent; } } @@ -66,25 +69,75 @@ 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) { + 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"); + 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); + } + } + + if (json_node->type == CT_WORKSPACE) { + /* Ensure the workspace has a name. */ + DLOG("Attaching workspace. name = %s\n", json_node->name); + if (json_node->name == NULL || strcmp(json_node->name, "") == 0) { + json_node->name = sstrdup("unnamed"); + } + + /* Prevent name clashes when appending a workspace, e.g. when the + * user tries to restore a workspace called “1” but already has a + * 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)); + char *base = sstrdup(json_node->name); + int cnt = 1; + while (workspace != NULL) { + FREE(json_node->name); + sasprintf(&(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)); + } + free(base); + + /* Set num accordingly so that i3bar will properly sort it. */ + json_node->num = ws_name_to_number(json_node->name); + } + 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) - 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; } 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; @@ -111,14 +164,10 @@ static int json_end_array(void *ctx) { return 1; } -#if YAJL_MAJOR < 2 -static int json_key(void *ctx, const unsigned char *val, unsigned int len) { -#else static int json_key(void *ctx, const unsigned char *val, size_t len) { -#endif LOG("key: %.*s\n", (int)len, val); FREE(last_key); - last_key = scalloc((len+1) * sizeof(char)); + last_key = scalloc((len + 1) * sizeof(char)); memcpy(last_key, val, len); if (strcasecmp(last_key, "swallows") == 0) parsing_swallows = true; @@ -126,6 +175,9 @@ static int json_key(void *ctx, const unsigned char *val, size_t len) { 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; @@ -138,25 +190,29 @@ static int json_key(void *ctx, const unsigned char *val, size_t len) { return 1; } -#if YAJL_MAJOR >= 2 static int json_string(void *ctx, const unsigned char *val, size_t len) { -#else -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)); + json_node->name = scalloc((len + 1) * sizeof(char)); memcpy(json_node->name, val, len); } else if (strcasecmp(last_key, "sticky_group") == 0) { - json_node->sticky_group = scalloc((len+1) * sizeof(char)); + json_node->sticky_group = scalloc((len + 1) * sizeof(char)); 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) { @@ -173,7 +229,8 @@ static int json_string(void *ctx, const unsigned char *val, unsigned int len) { json_node->last_split_layout = L_SPLITH; else if (strcasecmp(buf, "vertical") == 0) json_node->last_split_layout = L_SPLITV; - else LOG("Unhandled orientation: %s\n", buf); + else + LOG("Unhandled orientation: %s\n", buf); free(buf); } else if (strcasecmp(last_key, "border") == 0) { char *buf = NULL; @@ -187,7 +244,26 @@ static int json_string(void *ctx, const unsigned char *val, unsigned int len) { 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); + 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; @@ -207,7 +283,8 @@ static int json_string(void *ctx, const unsigned char *val, unsigned int len) { json_node->layout = L_SPLITH; else if (strcasecmp(buf, "splitv") == 0) json_node->layout = L_SPLITV; - else LOG("Unhandled \"layout\": %s\n", buf); + else + LOG("Unhandled \"layout\": %s\n", buf); free(buf); } else if (strcasecmp(last_key, "workspace_layout") == 0) { char *buf = NULL; @@ -218,7 +295,8 @@ static int json_string(void *ctx, const unsigned char *val, unsigned int len) { 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); + else + LOG("Unhandled \"workspace_layout\": %s\n", buf); free(buf); } else if (strcasecmp(last_key, "last_split_layout") == 0) { char *buf = NULL; @@ -227,7 +305,8 @@ static int json_string(void *ctx, const unsigned char *val, unsigned int len) { 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); + else + LOG("Unhandled \"last_splitlayout\": %s\n", buf); free(buf); } else if (strcasecmp(last_key, "mark") == 0) { char *buf = NULL; @@ -260,13 +339,9 @@ static int json_string(void *ctx, const unsigned char *val, unsigned int len) { return 1; } -#if YAJL_MAJOR >= 2 static int json_int(void *ctx, long long val) { LOG("int %lld for key %s\n", val, last_key); -#else -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; @@ -297,7 +372,8 @@ static int json_int(void *ctx, long val) { r = &(json_node->rect); else if (parsing_window_rect) r = &(json_node->window_rect); - else r = &(json_node->geometry); + else + r = &(json_node->geometry); if (strcasecmp(last_key, "x") == 0) r->x = val; else if (strcasecmp(last_key, "y") == 0) @@ -306,9 +382,10 @@ 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", - r->x, r->y, r->width, r->height); + 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) { if (strcasecmp(last_key, "id") == 0) { @@ -347,67 +424,154 @@ static int json_double(void *ctx, double val) { return 1; } -void tree_append_json(const char *filename) { - /* TODO: percent of other windows are not correctly fixed at the moment */ +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 || content_level > 1) + return 1; + + DLOG("string = %.*s, last_key = %s\n", (int)len, val, last_key); + if (strncasecmp((const char *)val, "workspace", len) == 0) + content_result = JSON_CONTENT_WORKSPACE; + return 0; +} + +/* Parses the given JSON file until it encounters the first “type” property to + * determine whether the file contains workspaces or regular containers, which + * is important to know when deciding where (and how) to append the contents. + * */ +json_content_t json_determine_content(const char *filename) { + FILE *f; + if ((f = fopen(filename, "r")) == NULL) { + ELOG("Cannot open file \"%s\"\n", filename); + return JSON_CONTENT_UNKNOWN; + } + struct stat stbuf; + if (fstat(fileno(f), &stbuf) != 0) { + ELOG("Cannot fstat() \"%s\"\n", filename); + fclose(f); + return JSON_CONTENT_UNKNOWN; + } + char *buf = smalloc(stbuf.st_size); + int n = fread(buf, 1, stbuf.st_size, f); + if (n != stbuf.st_size) { + ELOG("File \"%s\" could not be read entirely, not loading.\n", filename); + fclose(f); + return JSON_CONTENT_UNKNOWN; + } + DLOG("read %d bytes\n", n); + // 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); + /* 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; + setlocale(LC_NUMERIC, "C"); + stat = yajl_parse(hand, (const unsigned char *)buf, n); + if (stat != yajl_status_ok && stat != yajl_status_client_canceled) { + 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); + } + + setlocale(LC_NUMERIC, ""); + yajl_complete_parse(hand); + + fclose(f); + + return content_result; +} + +void tree_append_json(Con *con, const char *filename, char **errormsg) { FILE *f; if ((f = fopen(filename, "r")) == NULL) { - LOG("Cannot open file \"%s\"\n", filename); + ELOG("Cannot open file \"%s\"\n", filename); return; } struct stat stbuf; if (fstat(fileno(f), &stbuf) != 0) { - LOG("Cannot fstat() the file\n"); + ELOG("Cannot fstat() \"%s\"\n", filename); 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); + ELOG("File \"%s\" could not be read entirely, not loading.\n", filename); fclose(f); return; } - LOG("read %d bytes\n", n); + DLOG("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; -#if YAJL_MAJOR >= 2 + 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, + }; g = yajl_gen_alloc(NULL); - hand = yajl_alloc(&callbacks, NULL, (void*)g); -#else - g = yajl_gen_alloc(NULL, NULL); - hand = yajl_alloc(&callbacks, NULL, NULL, (void*)g); -#endif + hand = yajl_alloc(&callbacks, NULL, (void *)g); + /* 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; + json_node = con; to_focus = NULL; + parsing_swallows = false; parsing_rect = false; + parsing_deco_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); + 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); + 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(con); + setlocale(LC_NUMERIC, ""); -#if YAJL_MAJOR >= 2 yajl_complete_parse(hand); -#else - yajl_parse_complete(hand); -#endif fclose(f); if (to_focus)