koma/i3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

layout restoring: append at the nearest split container (or workspace) (Thanks chris)

Browse Source 
Before this commit, leaf containers (such as terminal emulators) would
get children appended, which is not intended.

fixes #1223
This commit is contained in:
Michael Stapelberg
2014-04-18 20:30:27 +02:00
parent 702906d0cf
commit 524f20b8a0
4 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/load_layout.c
View File

@ -395,7 +395,7 @@ static int json_double(void *ctx, double val) {
return 1;
}
void tree_append_json(const char *filename, char **errormsg) {
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);
@ -439,7 +439,7 @@ void tree_append_json(const char *filename, char **errormsg) {
/* 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;
@ -460,7 +460,7 @@ void tree_append_json(const char *filename, char **errormsg) {
/* 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(focused);
con_fix_percent(con);
setlocale(LC_NUMERIC, "");
#if YAJL_MAJOR >= 2