Implement dock mode, update testsuite

[i3/i3] / src / manage.c

diff --git a/src/manage.c b/src/manage.c
index a3bad45f2e72ad3db44e28c5d7e70d1e9bc9edd5..0c0dcae758e1ac3942aea7133e1dd7d836620e52 100644 (file)
--- a/src/manage.c
+++ b/src/manage.c
@@ -167,8 +167,9 @@ void manage_window(xcb_window_t window, xcb_get_window_attributes_cookie_t cooki
             LOG("using current container, focused = %p, focused->name = %s\n",
                             focused, focused->name);
             nc = focused;
-        } else nc = tree_open_con(NULL);
+        } else nc = tree_open_con(NULL, true);
     } else {
+        /* M_ACTIVE are assignments */
         if (match != NULL && match->insert_where == M_ACTIVE) {
             /* We need to go down the focus stack starting from nc */
             while (TAILQ_FIRST(&(nc->focus_head)) != TAILQ_END(&(nc->focus_head))) {
@@ -178,9 +179,16 @@ void manage_window(xcb_window_t window, xcb_get_window_attributes_cookie_t cooki
             /* We need to open a new con */
             /* TODO: make a difference between match-once containers (directly assign
              * cwindow) and match-multiple (tree_open_con first) */
-            nc = tree_open_con(nc->parent);
+            nc = tree_open_con(nc->parent, true);
+        }
+
+        /* M_BELOW inserts the new window as a child of the one which was
+         * matched (e.g. dock areas) */
+        else if (match != NULL && match->insert_where == M_BELOW) {
+            nc = tree_open_con(nc, !cwindow->dock);
         }
     }
+
     DLOG("new container = %p\n", nc);
     nc->window = cwindow;
     x_reinit(nc);
@@ -208,6 +216,8 @@ void manage_window(xcb_window_t window, xcb_get_window_attributes_cookie_t cooki
          con_by_window_id(cwindow->leader) != NULL))
         want_floating = true;
 
+    nc->geometry = (Rect){ geom->x, geom->y, geom->width, geom->height };
+
     if (want_floating) {
         nc->rect.x = geom->x;
         nc->rect.y = geom->y;