X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Fload_layout.c;h=1b08f8c17eae72821d8b69499a92f8039b8d7e88;hb=78e99440f6ff144bb6842f3fb33c1f65faadc4df;hp=37322c4ea3857f2b92e85f05c5ee843054f8e975;hpb=46409ad656da15cb26cec7a2baf322f25fe7a65a;p=i3%2Fi3 diff --git a/src/load_layout.c b/src/load_layout.c index 37322c4e..1b08f8c1 100644 --- a/src/load_layout.c +++ b/src/load_layout.c @@ -1,14 +1,22 @@ +#undef I3__FILE__ +#define I3__FILE__ "load_layout.c" /* * vim:ts=4:sw=4:expandtab * + * i3 - an improved dynamic tiling window manager + * © 2009-2012 Michael Stapelberg and contributors (see also: LICENSE) + * + * load_layout.c: Restore (parts of) the layout, for example after an inplace + * restart. + * */ +#include "all.h" + #include #include #include #include -#include "all.h" - /* TODO: refactor the whole parsing thing */ static char *last_key; @@ -18,8 +26,19 @@ static bool parsing_swallows; static bool parsing_rect; static bool parsing_window_rect; static bool parsing_geometry; +static bool parsing_focus; struct Match *current_swallow; +/* 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; +}; + +static TAILQ_HEAD(focus_mappings_head, focus_mapping) focus_mappings = + TAILQ_HEAD_INITIALIZER(focus_mappings); + static int json_start_map(void *ctx) { LOG("start of map, last_key = %s\n", last_key); if (parsing_swallows) { @@ -32,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; } } @@ -50,6 +69,8 @@ static int json_end_map(void *ctx) { if (!parsing_swallows && !parsing_rect && !parsing_window_rect && !parsing_geometry) { 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) @@ -64,6 +85,29 @@ static int json_end_map(void *ctx) { static int json_end_array(void *ctx) { LOG("end of array\n"); parsing_swallows = false; + if (parsing_focus) { + /* Clear the list of focus mappings */ + struct focus_mapping *mapping; + 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) { + if (con->old_id != mapping->old_id) + continue; + LOG("got it! %p\n", con); + /* Move this entry to the top of the focus list. */ + TAILQ_REMOVE(&(json_node->focus_head), con, focused); + TAILQ_INSERT_HEAD(&(json_node->focus_head), con, focused); + break; + } + } + while (!TAILQ_EMPTY(&focus_mappings)) { + mapping = TAILQ_FIRST(&focus_mappings); + TAILQ_REMOVE(&focus_mappings, mapping, focus_mappings); + free(mapping); + } + parsing_focus = false; + } return 1; } @@ -76,15 +120,21 @@ static int json_key(void *ctx, const unsigned char *val, size_t len) { FREE(last_key); last_key = scalloc((len+1) * sizeof(char)); memcpy(last_key, val, len); - if (strcasecmp(last_key, "swallows") == 0) { + if (strcasecmp(last_key, "swallows") == 0) parsing_swallows = true; - } + 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; + + if (strcasecmp(last_key, "focus") == 0) + parsing_focus = true; + return 1; } @@ -93,7 +143,7 @@ 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", len, val, last_key); + LOG("string: %.*s for key %s\n", (int)len, val, last_key); if (parsing_swallows) { /* TODO: the other swallowing keys */ if (strcasecmp(last_key, "class") == 0) { @@ -110,32 +160,41 @@ static int json_string(void *ctx, const unsigned char *val, unsigned int len) { 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) { + /* Upgrade path from older versions of i3 (doing an inplace restart + * to a newer version): + * "orientation" is dumped before "layout". Therefore, we store + * whether the orientation was horizontal or vertical in the + * last_split_layout. When we then encounter layout == "default", + * we will use the last_split_layout as layout instead. */ char *buf = NULL; - asprintf(&buf, "%.*s", (int)len, val); - if (strcasecmp(buf, "none") == 0) - json_node->orientation = NO_ORIENTATION; - else if (strcasecmp(buf, "horizontal") == 0) - json_node->orientation = HORIZ; + sasprintf(&buf, "%.*s", (int)len, val); + if (strcasecmp(buf, "none") == 0 || + strcasecmp(buf, "horizontal") == 0) + json_node->last_split_layout = L_SPLITH; else if (strcasecmp(buf, "vertical") == 0) - json_node->orientation = VERT; + json_node->last_split_layout = L_SPLITV; else LOG("Unhandled orientation: %s\n", buf); free(buf); } else if (strcasecmp(last_key, "border") == 0) { char *buf = NULL; - asprintf(&buf, "%.*s", (int)len, val); + 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, "layout") == 0) { char *buf = NULL; - asprintf(&buf, "%.*s", (int)len, val); + sasprintf(&buf, "%.*s", (int)len, val); if (strcasecmp(buf, "default") == 0) - json_node->layout = L_DEFAULT; + /* This set above when we read "orientation". */ + json_node->layout = json_node->last_split_layout; else if (strcasecmp(buf, "stacked") == 0) json_node->layout = L_STACKED; else if (strcasecmp(buf, "tabbed") == 0) @@ -144,12 +203,58 @@ static int json_string(void *ctx, const unsigned char *val, unsigned int len) { json_node->layout = L_DOCKAREA; else if (strcasecmp(buf, "output") == 0) json_node->layout = L_OUTPUT; + else if (strcasecmp(buf, "splith") == 0) + json_node->layout = L_SPLITH; + else if (strcasecmp(buf, "splitv") == 0) + 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); + if (strcasecmp(buf, "splith") == 0) + 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); + free(buf); } else if (strcasecmp(last_key, "mark") == 0) { char *buf = NULL; - asprintf(&buf, "%.*s", (int)len, val); + sasprintf(&buf, "%.*s", (int)len, val); json_node->mark = buf; + } else if (strcasecmp(last_key, "floating") == 0) { + char *buf = NULL; + sasprintf(&buf, "%.*s", (int)len, val); + if (strcasecmp(buf, "auto_off") == 0) + json_node->floating = FLOATING_AUTO_OFF; + else if (strcasecmp(buf, "auto_on") == 0) + json_node->floating = FLOATING_AUTO_ON; + else if (strcasecmp(buf, "user_off") == 0) + json_node->floating = FLOATING_USER_OFF; + else if (strcasecmp(buf, "user_on") == 0) + json_node->floating = FLOATING_USER_ON; + free(buf); + } else if (strcasecmp(last_key, "scratchpad_state") == 0) { + char *buf = NULL; + sasprintf(&buf, "%.*s", (int)len, val); + if (strcasecmp(buf, "none") == 0) + json_node->scratchpad_state = SCRATCHPAD_NONE; + else if (strcasecmp(buf, "fresh") == 0) + json_node->scratchpad_state = SCRATCHPAD_FRESH; + else if (strcasecmp(buf, "changed") == 0) + json_node->scratchpad_state = SCRATCHPAD_CHANGED; + free(buf); } } return 1; @@ -162,15 +267,30 @@ 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 - if (strcasecmp(last_key, "type") == 0) { + if (strcasecmp(last_key, "type") == 0) json_node->type = val; - } - if (strcasecmp(last_key, "fullscreen_mode") == 0) { + + if (strcasecmp(last_key, "fullscreen_mode") == 0) json_node->fullscreen_mode = 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; + + if (parsing_focus) { + struct focus_mapping *focus_mapping = scalloc(sizeof(struct focus_mapping)); + focus_mapping->old_id = val; + TAILQ_INSERT_TAIL(&focus_mappings, focus_mapping, focus_mappings); + } + if (parsing_rect || parsing_window_rect || parsing_geometry) { Rect *r; if (parsing_rect) @@ -211,6 +331,11 @@ static int json_bool(void *ctx, int val) { to_focus = json_node; } + if (parsing_swallows) { + if (strcasecmp(last_key, "restart_mode") == 0) + current_swallow->restart_mode = val; + } + return 1; } @@ -226,11 +351,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;