X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Frender.c;h=5bdc2e218519ed364b6295d1899c9b2011aea87d;hb=b644fb5f26c1768b70c5b49d8cd917a63a2d1d91;hp=c0dbdd5f07c35b76b4f9d3e7dd3739d0ff4c8d59;hpb=24725cd94a5350e561ea7bc8e75f703542744836;p=i3%2Fi3

diff --git a/src/render.c b/src/render.c
index c0dbdd5f..5bdc2e21 100644
--- a/src/render.c
+++ b/src/render.c
@@ -4,6 +4,98 @@
 
 #include "all.h"
 
+/* change this to 'true' if you want to have additional borders around every
+ * container (for debugging purposes) */
+static bool show_debug_borders = false;
+
+/*
+ * Renders a container with layout L_OUTPUT. In this layout, all CT_DOCKAREAs
+ * get the height of their content and the remaining CT_CON gets the rest.
+ *
+ */
+static void render_l_output(Con *con) {
+    Con *child, *dockchild;
+
+    int x = con->rect.x;
+    int y = con->rect.y;
+    int height = con->rect.height;
+    DLOG("Available height: %d\n", height);
+
+    /* Find the content container and ensure that there is exactly one. Also
+     * check for any non-CT_DOCKAREA clients. */
+    Con *content = NULL;
+    TAILQ_FOREACH(child, &(con->nodes_head), nodes) {
+        if (child->type == CT_CON) {
+            if (content != NULL) {
+                DLOG("More than one CT_CON on output container\n");
+                assert(false);
+            }
+            content = child;
+        } else if (child->type != CT_DOCKAREA) {
+            DLOG("Child %p of type %d is inside the OUTPUT con\n", child, child->type);
+            assert(false);
+        }
+    }
+
+    assert(content != NULL);
+
+    /* We need to find out if there is a fullscreen con on the current workspace
+     * and take the short-cut to render it directly (the user does not want to
+     * see the dockareas in that case) */
+    Con *ws = con_get_fullscreen_con(content);
+    Con *fullscreen = con_get_fullscreen_con(ws);
+    if (fullscreen) {
+        DLOG("got fs node: %p\n", fullscreen);
+        fullscreen->rect = con->rect;
+        x_raise_con(fullscreen);
+        render_con(fullscreen, true);
+        return;
+    }
+
+    /* First pass: determine the height of all CT_DOCKAREAs (the sum of their
+     * children) and figure out how many pixels we have left for the rest */
+    TAILQ_FOREACH(child, &(con->nodes_head), nodes) {
+        if (child->type != CT_DOCKAREA)
+            continue;
+
+        child->rect.height = 0;
+        TAILQ_FOREACH(dockchild, &(child->nodes_head), nodes)
+            child->rect.height += dockchild->geometry.height;
+        DLOG("This dockarea's height: %d\n", child->rect.height);
+
+        height -= child->rect.height;
+    }
+
+    DLOG("Remaining: %d\n", height);
+
+    /* Second pass: Set the widths/heights */
+    TAILQ_FOREACH(child, &(con->nodes_head), nodes) {
+        if (child->type == CT_CON) {
+            child->rect.x = x;
+            child->rect.y = y;
+            child->rect.width = con->rect.width;
+            child->rect.height = height;
+        }
+
+        child->rect.x = x;
+        child->rect.y = y;
+        child->rect.width = con->rect.width;
+
+        child->deco_rect.x = 0;
+        child->deco_rect.y = 0;
+        child->deco_rect.width = 0;
+        child->deco_rect.height = 0;
+
+        y += child->rect.height;
+
+        DLOG("child at (%d, %d) with (%d x %d)\n",
+                child->rect.x, child->rect.y, child->rect.width, child->rect.height);
+        DLOG("x now %d, y now %d\n", x, y);
+        x_raise_con(child);
+        render_con(child, false);
+    }
+}
+
 /*
  * "Renders" the given container (and its children), meaning that all rects are
  * updated correctly. Note that this function does not call any xcb_*
@@ -12,29 +104,30 @@
  * updated in X11.
  *
  */
-void render_con(Con *con) {
-    printf("currently rendering node %p / %s / layout %d\n",
+void render_con(Con *con, bool render_fullscreen) {
+    DLOG("currently rendering node %p / %s / layout %d\n",
             con, con->name, con->layout);
-    int children = 0;
-    Con *child;
-    TAILQ_FOREACH(child, &(con->nodes_head), nodes)
-        children++;
-    printf("children: %d, orientation = %d\n", children, con->orientation);
+    int children = con_num_children(con);
+    DLOG("children: %d, orientation = %d\n", children, con->orientation);
 
     /* Copy container rect, subtract container border */
     /* This is the actually usable space inside this container for clients */
     Rect rect = con->rect;
-    rect.x += 2;
-    rect.y += 2;
-    rect.width -= 2 * 2;
-    rect.height -= 2 * 2;
+
+    /* Display a border if this is a leaf node. For container nodes, we don’t
+     * draw borders (except when in debug mode) */
+    if (show_debug_borders) {
+        rect.x += 2;
+        rect.y += 2;
+        rect.width -= 2 * 2;
+        rect.height -= 2 * 2;
+    }
 
     int x = rect.x;
     int y = rect.y;
 
     int i = 0;
 
-    printf("mapped = true\n");
     con->mapped = true;
 
     /* if this container contains a window, set the coordinates */
@@ -43,96 +136,214 @@ void render_con(Con *con) {
          * needs to be smaller */
         Rect *inset = &(con->window_rect);
         *inset = (Rect){0, 0, con->rect.width, con->rect.height};
-        /* TODO: different border styles */
-        inset->x += 2;
-        inset->width -= 2 * 2;
-        inset->height -= 2;
+        if (!render_fullscreen)
+            *inset = rect_add(*inset, con_border_style_rect(con));
+
+        /* Obey x11 border */
+        DLOG("X11 border: %d\n", con->border_width);
+        inset->width -= (2 * con->border_width);
+        inset->height -= (2 * con->border_width);
+
+        /* Obey the aspect ratio, if any */
+        if (con->proportional_height != 0 &&
+            con->proportional_width != 0) {
+            DLOG("proportional height = %d, width = %d\n", con->proportional_height, con->proportional_width);
+            double new_height = inset->height + 1;
+            int new_width = inset->width;
+
+            while (new_height > inset->height) {
+                new_height = ((double)con->proportional_height / con->proportional_width) * new_width;
+
+                if (new_height > inset->height)
+                    new_width--;
+            }
+            /* Center the window */
+            inset->y += ceil(inset->height / 2) - floor(new_height / 2);
+            inset->x += ceil(inset->width / 2) - floor(new_width / 2);
+
+            inset->height = new_height;
+            inset->width = new_width;
+            DLOG("new_height = %f, new_width = %d\n", new_height, new_width);
+        }
+
+        if (con->height_increment > 1) {
+            int old_height = inset->height;
+            inset->height -= (inset->height - con->base_height) % con->height_increment;
+            DLOG("Lost %d pixel due to client's height_increment (%d px, base_height = %d)\n",
+                old_height - inset->height, con->height_increment, con->base_height);
+        }
+
+        if (con->width_increment > 1) {
+            int old_width = inset->width;
+            inset->width -= (inset->width - con->base_width) % con->width_increment;
+            DLOG("Lost %d pixel due to client's width_increment (%d px, base_width = %d)\n",
+                old_width - inset->width, con->width_increment, con->base_width);
+        }
+
+        DLOG("child will be at %dx%d with size %dx%d\n", inset->x, inset->y, inset->width, inset->height);
     }
 
     /* Check for fullscreen nodes */
-    Con *fullscreen = con_get_fullscreen_con(con);
+    Con *fullscreen = (con->type == CT_OUTPUT ? NULL : con_get_fullscreen_con(con));
     if (fullscreen) {
-        LOG("got fs node: %p\n", fullscreen);
+        DLOG("got fs node: %p\n", fullscreen);
         fullscreen->rect = rect;
-        render_con(fullscreen);
+        x_raise_con(fullscreen);
+        render_con(fullscreen, true);
         return;
     }
 
+    /* find the height for the decorations */
+    int deco_height = config.font.height + 5;
+
+    /* precalculate the sizes to be able to correct rounding errors */
+    int sizes[children];
+    if (con->layout == L_DEFAULT && children > 0) {
+        assert(!TAILQ_EMPTY(&con->nodes_head));
+        Con *child;
+        int i = 0, assigned = 0;
+        int total = con->orientation == HORIZ ? rect.width : rect.height;
+        TAILQ_FOREACH(child, &(con->nodes_head), nodes) {
+            double percentage = child->percent > 0.0 ? child->percent : 1.0 / children;
+            assigned += sizes[i++] = percentage * total;
+        }
+        assert(assigned == total ||
+                (assigned > total && assigned - total <= children * 2) ||
+                (assigned < total && total - assigned <= children * 2));
+        int signal = assigned < total ? 1 : -1;
+        while (assigned != total) {
+            for (i = 0; i < children && assigned != total; ++i) {
+                sizes[i] += signal;
+                assigned += signal;
+            }
+        }
+    }
+
+    if (con->layout == L_OUTPUT) {
+        render_l_output(con);
+    } else {
+
+        /* FIXME: refactor this into separate functions: */
+    Con *child;
     TAILQ_FOREACH(child, &(con->nodes_head), nodes) {
+        assert(children > 0);
 
         /* default layout */
         if (con->layout == L_DEFAULT) {
-            double percentage = 1.0 / children;
-            if (child->percent > 0.0)
-                percentage = child->percent;
-            printf("child %p / %s requests percentage %f\n",
-                    child, child->name, percentage);
-
             if (con->orientation == HORIZ) {
                 child->rect.x = x;
                 child->rect.y = y;
-                child->rect.width = percentage * rect.width;
+                child->rect.width = sizes[i];
                 child->rect.height = rect.height;
                 x += child->rect.width;
             } else {
                 child->rect.x = x;
                 child->rect.y = y;
                 child->rect.width = rect.width;
-                child->rect.height = percentage * rect.height;
+                child->rect.height = sizes[i];
                 y += child->rect.height;
             }
 
             /* first we have the decoration, if this is a leaf node */
-            if (con_is_leaf(child)) {
-                printf("that child is a leaf node, subtracting deco\n");
+            if (con_is_leaf(child) && child->border_style == BS_NORMAL) {
+                DLOG("that child is a leaf node, subtracting deco\n");
                 /* TODO: make a function for relative coords? */
                 child->deco_rect.x = child->rect.x - con->rect.x;
                 child->deco_rect.y = child->rect.y - con->rect.y;
 
-                child->rect.y += 17;
-                child->rect.height -= 17;
+                child->rect.y += deco_height;
+                child->rect.height -= deco_height;
 
                 child->deco_rect.width = child->rect.width;
-                child->deco_rect.height = 17;
+                child->deco_rect.height = deco_height;
             }
         }
 
-        if (con->layout == L_STACKED) {
-            printf("stacked con\n");
+        /* stacked layout */
+        else if (con->layout == L_STACKED) {
+            DLOG("stacked con\n");
             child->rect.x = x;
             child->rect.y = y;
             child->rect.width = rect.width;
             child->rect.height = rect.height;
 
-            child->rect.y += (17 * children);
-            child->rect.height -= (17 * children);
-
             child->deco_rect.x = x - con->rect.x;
-            child->deco_rect.y = y - con->rect.y + (i * 17);
+            child->deco_rect.y = y - con->rect.y + (i * deco_height);
             child->deco_rect.width = child->rect.width;
-            child->deco_rect.height = 17;
+            child->deco_rect.height = deco_height;
+
+            if (children > 1 || (child->border_style != BS_1PIXEL && child->border_style != BS_NONE)) {
+                child->rect.y += (deco_height * children);
+                child->rect.height -= (deco_height * children);
+            }
+        }
+
+        /* tabbed layout */
+        else if (con->layout == L_TABBED) {
+            DLOG("tabbed con\n");
+            child->rect.x = x;
+            child->rect.y = y;
+            child->rect.width = rect.width;
+            child->rect.height = rect.height;
+
+            child->deco_rect.width = child->rect.width / children;
+            child->deco_rect.height = deco_height;
+            child->deco_rect.x = x - con->rect.x + i * child->deco_rect.width;
+            child->deco_rect.y = y - con->rect.y;
+
+            if (children > 1 || (child->border_style != BS_1PIXEL && child->border_style != BS_NONE)) {
+                child->rect.y += deco_height;
+                child->rect.height -= deco_height;
+            }
+        }
+
+        /* dockarea layout */
+        else if (con->layout == L_DOCKAREA) {
+            DLOG("dockarea con\n");
+            child->rect.x = x;
+            child->rect.y = y;
+            child->rect.width = rect.width;
+            child->rect.height = child->geometry.height;
+
+            child->deco_rect.x = 0;
+            child->deco_rect.y = 0;
+            child->deco_rect.width = 0;
+            child->deco_rect.height = 0;
+            y += child->rect.height;
         }
 
-        printf("child at (%d, %d) with (%d x %d)\n",
+        DLOG("child at (%d, %d) with (%d x %d)\n",
                 child->rect.x, child->rect.y, child->rect.width, child->rect.height);
-        printf("x now %d, y now %d\n", x, y);
+        DLOG("x now %d, y now %d\n", x, y);
         x_raise_con(child);
-        render_con(child);
+        render_con(child, false);
         i++;
     }
 
-    /* in a stacking container, we ensure the focused client is raised */
-    if (con->layout == L_STACKED) {
-        Con *foc = TAILQ_FIRST(&(con->focus_head));
-        x_raise_con(foc);
+    /* in a stacking or tabbed container, we ensure the focused client is raised */
+    if (con->layout == L_STACKED || con->layout == L_TABBED) {
+        DLOG("stacked/tabbed, raising focused reverse\n");
+        TAILQ_FOREACH_REVERSE(child, &(con->focus_head), focus_head, focused)
+            x_raise_con(child);
+        DLOG("done\n");
+        if ((child = TAILQ_FIRST(&(con->focus_head)))) {
+            DLOG("con %p is stacking, raising %p\n", con, child);
+            /* By rendering the stacked container again, we handle the case
+             * that we have a non-leaf-container inside the stack. In that
+             * case, the children of the non-leaf-container need to be raised
+             * aswell. */
+            render_con(child, false);
+        }
+    }
     }
 
+    Con *child;
     TAILQ_FOREACH(child, &(con->floating_head), floating_windows) {
-        LOG("render floating:\n");
-        LOG("floating child at (%d,%d) with %d x %d\n", child->rect.x, child->rect.y, child->rect.width, child->rect.height);
+        DLOG("render floating:\n");
+        DLOG("floating child at (%d,%d) with %d x %d\n", child->rect.x, child->rect.y, child->rect.width, child->rect.height);
         x_raise_con(child);
-        render_con(child);
+        render_con(child, false);
     }
 
-    printf("-- level up\n");
+    DLOG("-- level up\n");
 }