x: recurse x_push_node in focus order. reduces flickering when switching workspaces

[i3/i3] / src / load_layout.c

diff --git a/src/load_layout.c b/src/load_layout.c
index 72b23d9f1d57d5f7b7646400d6f48d20fab7a201..92cfecbd79d4c94b417636361c88f70d7adf09a6 100644 (file)
--- a/src/load_layout.c
+++ b/src/load_layout.c
@@ -22,18 +22,18 @@ struct Match *current_swallow;
 static int json_start_map(void *ctx) {
     LOG("start of map, last_key = %s\n", last_key);
     if (parsing_swallows) {
-        LOG("TODO: create new swallow\n");
+        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 && !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;
-                TAILQ_INSERT_TAIL(&(ws->floating_head), json_node, floating_windows);
-                TAILQ_INSERT_TAIL(&(ws->focus_head), json_node, focused);
+                DLOG("Parent is workspace = %p\n", ws);
             } else {
                 Con *parent = json_node;
                 json_node = con_new(NULL);