X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Fload_layout.c;h=92cfecbd79d4c94b417636361c88f70d7adf09a6;hb=b644fb5f26c1768b70c5b49d8cd917a63a2d1d91;hp=c7e77eef80f9c690c77b693225da90319c9b4d39;hpb=c145f7e5297ef06aaf84689762a736d5bc8cbb83;p=i3%2Fi3 diff --git a/src/load_layout.c b/src/load_layout.c index c7e77eef..92cfecbd 100644 --- a/src/load_layout.c +++ b/src/load_layout.c @@ -1,3 +1,7 @@ +/* + * vim:ts=4:sw=4:expandtab + * + */ #include #include #include @@ -8,29 +12,51 @@ static char *last_key; static Con *json_node; +static Con *to_focus; static bool parsing_swallows; static bool parsing_rect; +static bool parsing_window_rect; +static bool parsing_geometry; struct Match *current_swallow; static int json_start_map(void *ctx) { - LOG("start of map\n"); + LOG("start of map, last_key = %s\n", last_key); if (parsing_swallows) { - LOG("TODO: create new swallow\n"); - current_swallow = scalloc(sizeof(Match)); + LOG("creating new swallow\n"); + current_swallow = smalloc(sizeof(Match)); + match_init(current_swallow); TAILQ_INSERT_TAIL(&(json_node->swallow_head), current_swallow, matches); } else { - if (!parsing_rect) - json_node = con_new(json_node); + if (!parsing_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(NULL); + json_node->parent = ws; + DLOG("Parent is workspace = %p\n", ws); + } else { + Con *parent = json_node; + json_node = con_new(NULL); + json_node->parent = parent; + } + } } return 1; } static int json_end_map(void *ctx) { LOG("end of map\n"); - if (!parsing_swallows && !parsing_rect) + if (!parsing_swallows && !parsing_rect && !parsing_window_rect && !parsing_geometry) { + LOG("attaching\n"); + con_attach(json_node, json_node->parent, false); 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; return 1; } @@ -50,6 +76,10 @@ static int json_key(void *ctx, const unsigned char *val, unsigned int len) { } if (strcasecmp(last_key, "rect") == 0) parsing_rect = true; + if (strcasecmp(last_key, "window_rect") == 0) + parsing_window_rect = true; + if (strcasecmp(last_key, "geometry") == 0) + parsing_geometry = true; return 1; } @@ -66,6 +96,21 @@ static int json_string(void *ctx, const unsigned char *val, unsigned int len) { if (strcasecmp(last_key, "name") == 0) { 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)); + 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) { + char *buf = NULL; + asprintf(&buf, "%.*s", len, val); + if (strcasecmp(buf, "none") == 0) + json_node->orientation = NO_ORIENTATION; + else if (strcasecmp(buf, "horizontal") == 0) + json_node->orientation = HORIZ; + else if (strcasecmp(buf, "vertical") == 0) + json_node->orientation = VERT; + else LOG("Unhandled orientation: %s\n", buf); + free(buf); } } return 1; @@ -73,9 +118,6 @@ static int json_string(void *ctx, const unsigned char *val, unsigned int len) { static int json_int(void *ctx, long val) { LOG("int %d for key %s\n", val, last_key); - if (strcasecmp(last_key, "orientation") == 0) { - json_node->orientation = val; - } if (strcasecmp(last_key, "layout") == 0) { json_node->layout = val; } @@ -85,25 +127,42 @@ static int json_int(void *ctx, long val) { if (strcasecmp(last_key, "fullscreen_mode") == 0) { json_node->fullscreen_mode = val; } + if (strcasecmp(last_key, "focused") == 0 && val == 1) { + to_focus = json_node; + } - if (parsing_rect) { + if (strcasecmp(last_key, "num") == 0) + json_node->num = val; + + if (parsing_rect || parsing_window_rect || parsing_geometry) { + Rect *r; + if (parsing_rect) + r = &(json_node->rect); + else if (parsing_window_rect) + r = &(json_node->window_rect); + else r = &(json_node->geometry); if (strcasecmp(last_key, "x") == 0) - json_node->rect.x = val; + r->x = val; else if (strcasecmp(last_key, "y") == 0) - json_node->rect.y = val; + r->y = val; else if (strcasecmp(last_key, "width") == 0) - json_node->rect.width = val; + r->width = val; else if (strcasecmp(last_key, "height") == 0) - json_node->rect.height = val; + r->height = val; else printf("WARNING: unknown key %s in rect\n", last_key); printf("rect now: (%d, %d, %d, %d)\n", - json_node->rect.x, json_node->rect.y, - json_node->rect.width, json_node->rect.height); + r->x, r->y, r->width, r->height); } if (parsing_swallows) { if (strcasecmp(last_key, "id") == 0) { current_swallow->id = val; } + if (strcasecmp(last_key, "dock") == 0) { + current_swallow->dock = val; + } + if (strcasecmp(last_key, "insert_where") == 0) { + current_swallow->insert_where = val; + } } return 1; @@ -142,13 +201,17 @@ void tree_append_json(const char *filename) { hand = yajl_alloc(&callbacks, NULL, NULL, (void*)g); yajl_status stat; json_node = focused; + to_focus = NULL; + parsing_rect = false; + parsing_window_rect = false; + parsing_geometry = false; setlocale(LC_NUMERIC, "C"); stat = yajl_parse(hand, (const unsigned char*)buf, n); if (stat != yajl_status_ok && stat != yajl_status_insufficient_data) { unsigned char * str = yajl_get_error(hand, 1, (const unsigned char*)buf, n); - fprintf(stderr, (const char *) str); + fprintf(stderr, "%s\n", (const char *) str); yajl_free_error(hand, str); } @@ -156,5 +219,6 @@ void tree_append_json(const char *filename) { yajl_parse_complete(hand); fclose(f); - //con_focus(json_node); + if (to_focus) + con_focus(to_focus); }