X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Frender.c;h=42992f3aab20d3b962b337c720140fd3970a87ae;hb=0abb4f7e88542bcdd47094450eeec22bdbf266d6;hp=2cc50d5739c9b83049b64d7b930a14a281e8da50;hpb=5beaea3034fe1a6fbac884cb802fcee546b34833;p=i3%2Fi3

diff --git a/src/render.c b/src/render.c
index 2cc50d57..42992f3a 100644
--- a/src/render.c
+++ b/src/render.c
@@ -1,10 +1,8 @@
-#undef I3__FILE__
-#define I3__FILE__ "render.c"
 /*
  * vim:ts=4:sw=4:expandtab
  *
  * i3 - an improved dynamic tiling window manager
- * © 2009-2011 Michael Stapelberg and contributors (see also: LICENSE)
+ * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  * render.c: Renders (determines position/sizes) the layout tree, updating the
  *           various rects. Needs to be pushed to X11 (see x.c) to be visible.
@@ -12,9 +10,14 @@
  */
 #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;
+/* Forward declarations */
+static int *precalculate_sizes(Con *con, render_params *p);
+static void render_root(Con *con, Con *fullscreen);
+static void render_output(Con *con);
+static void render_con_split(Con *con, Con *child, render_params *p, int i);
+static void render_con_stacked(Con *con, Con *child, render_params *p, int i);
+static void render_con_tabbed(Con *con, Con *child, render_params *p, int i);
+static void render_con_dockarea(Con *con, Con *child, render_params *p);
 
 /*
  * Returns the height for the decorations
@@ -26,12 +29,240 @@ int render_deco_height(void) {
     return deco_height;
 }
 
+/*
+ * "Renders" the given container (and its children), meaning that all rects are
+ * updated correctly. Note that this function does not call any xcb_*
+ * functions, so the changes are completely done in memory only (and
+ * side-effect free). As soon as you call x_push_changes(), the changes will be
+ * updated in X11.
+ *
+ */
+void render_con(Con *con) {
+    render_params params = {
+        .rect = con->rect,
+        .x = con->rect.x,
+        .y = con->rect.y,
+        .children = con_num_children(con)};
+
+    DLOG("Rendering node %p / %s / layout %d / children %d\n", con, con->name,
+         con->layout, params.children);
+
+    int i = 0;
+    con->mapped = true;
+
+    /* if this container contains a window, set the coordinates */
+    if (con->window) {
+        /* depending on the border style, the rect of the child window
+         * needs to be smaller */
+        Rect *inset = &(con->window_rect);
+        *inset = (Rect){0, 0, con->rect.width, con->rect.height};
+        if (con->fullscreen_mode == CF_NONE) {
+            *inset = rect_add(*inset, con_border_style_rect(con));
+        }
+
+        /* Obey x11 border */
+        inset->width -= (2 * con->border_width);
+        inset->height -= (2 * con->border_width);
+
+        /* NB: We used to respect resize increment size hints for tiling
+         * windows up until commit 0db93d9 here. However, since all terminal
+         * emulators cope with ignoring the size hints in a better way than we
+         * can (by providing their fake-transparency or background color), this
+         * code was removed. See also https://bugs.i3wm.org/540 */
+
+        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 = NULL;
+    if (con->type != CT_OUTPUT) {
+        fullscreen = con_get_fullscreen_con(con, (con->type == CT_ROOT ? CF_GLOBAL : CF_OUTPUT));
+    }
+    if (fullscreen) {
+        fullscreen->rect = params.rect;
+        x_raise_con(fullscreen);
+        render_con(fullscreen);
+        /* Fullscreen containers are either global (underneath the CT_ROOT
+         * container) or per-output (underneath the CT_CONTENT container). For
+         * global fullscreen containers, we cannot abort rendering here yet,
+         * because the floating windows (with popup_during_fullscreen smart)
+         * have not yet been rendered (see the CT_ROOT code path below). See
+         * also https://bugs.i3wm.org/1393 */
+        if (con->type != CT_ROOT) {
+            return;
+        }
+    }
+
+    /* find the height for the decorations */
+    params.deco_height = render_deco_height();
+
+    /* precalculate the sizes to be able to correct rounding errors */
+    params.sizes = precalculate_sizes(con, &params);
+
+    if (con->layout == L_OUTPUT) {
+        /* Skip i3-internal outputs */
+        if (con_is_internal(con))
+            goto free_params;
+        render_output(con);
+    } else if (con->type == CT_ROOT) {
+        render_root(con, fullscreen);
+    } else {
+        Con *child;
+        TAILQ_FOREACH(child, &(con->nodes_head), nodes) {
+            assert(params.children > 0);
+
+            if (con->layout == L_SPLITH || con->layout == L_SPLITV) {
+                render_con_split(con, child, &params, i);
+            } else if (con->layout == L_STACKED) {
+                render_con_stacked(con, child, &params, i);
+            } else if (con->layout == L_TABBED) {
+                render_con_tabbed(con, child, &params, i);
+            } else if (con->layout == L_DOCKAREA) {
+                render_con_dockarea(con, child, &params);
+            }
+
+            DLOG("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);
+            i++;
+        }
+
+        /* in a stacking or tabbed container, we ensure the focused client is raised */
+        if (con->layout == L_STACKED || con->layout == L_TABBED) {
+            TAILQ_FOREACH_REVERSE(child, &(con->focus_head), focus_head, focused)
+            x_raise_con(child);
+            if ((child = TAILQ_FIRST(&(con->focus_head)))) {
+                /* 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 as well. */
+                render_con(child);
+            }
+
+            if (params.children != 1)
+                /* Raise the stack con itself. This will put the stack
+                 * decoration on top of every stack window. That way, when a
+                 * new window is opened in the stack, the old window will not
+                 * obscure part of the decoration (it’s unmapped afterwards). */
+                x_raise_con(con);
+        }
+    }
+
+free_params:
+    FREE(params.sizes);
+}
+
+static int *precalculate_sizes(Con *con, render_params *p) {
+    if ((con->layout != L_SPLITH && con->layout != L_SPLITV) || p->children <= 0) {
+        return NULL;
+    }
+
+    int *sizes = smalloc(p->children * sizeof(int));
+    assert(!TAILQ_EMPTY(&con->nodes_head));
+
+    Con *child;
+    int i = 0, assigned = 0;
+    int total = con_rect_size_in_orientation(con);
+    TAILQ_FOREACH(child, &(con->nodes_head), nodes) {
+        double percentage = child->percent > 0.0 ? child->percent : 1.0 / p->children;
+        assigned += sizes[i++] = lround(percentage * total);
+    }
+    assert(assigned == total ||
+           (assigned > total && assigned - total <= p->children * 2) ||
+           (assigned < total && total - assigned <= p->children * 2));
+    int signal = assigned < total ? 1 : -1;
+    while (assigned != total) {
+        for (i = 0; i < p->children && assigned != total; ++i) {
+            sizes[i] += signal;
+            assigned += signal;
+        }
+    }
+
+    return sizes;
+}
+
+static void render_root(Con *con, Con *fullscreen) {
+    Con *output;
+    if (!fullscreen) {
+        TAILQ_FOREACH(output, &(con->nodes_head), nodes) {
+            render_con(output);
+        }
+    }
+
+    /* We need to render floating windows after rendering all outputs’
+     * tiling windows because they need to be on top of *every* output at
+     * all times. This is important when the user places floating
+     * windows/containers so that they overlap on another output. */
+    DLOG("Rendering floating windows:\n");
+    TAILQ_FOREACH(output, &(con->nodes_head), nodes) {
+        if (con_is_internal(output))
+            continue;
+        /* Get the active workspace of that output */
+        Con *content = output_get_content(output);
+        if (!content || TAILQ_EMPTY(&(content->focus_head))) {
+            DLOG("Skipping this output because it is currently being destroyed.\n");
+            continue;
+        }
+        Con *workspace = TAILQ_FIRST(&(content->focus_head));
+        Con *fullscreen = con_get_fullscreen_covering_ws(workspace);
+        Con *child;
+        TAILQ_FOREACH(child, &(workspace->floating_head), floating_windows) {
+            if (fullscreen != NULL) {
+                /* Don’t render floating windows when there is a fullscreen
+                 * window on that workspace. Necessary to make floating
+                 * fullscreen work correctly (ticket #564). Exception to the
+                 * above rule: smart popup_during_fullscreen handling (popups
+                 * belonging to the fullscreen app will be rendered). */
+                if (config.popup_during_fullscreen != PDF_SMART || fullscreen->window == NULL) {
+                    continue;
+                }
+
+                Con *floating_child = con_descend_focused(child);
+                Con *transient_con = floating_child;
+                bool is_transient_for = false;
+                while (transient_con != NULL &&
+                       transient_con->window != NULL &&
+                       transient_con->window->transient_for != XCB_NONE) {
+                    DLOG("transient_con = 0x%08x, transient_con->window->transient_for = 0x%08x, fullscreen_id = 0x%08x\n",
+                         transient_con->window->id, transient_con->window->transient_for, fullscreen->window->id);
+                    if (transient_con->window->transient_for == fullscreen->window->id) {
+                        is_transient_for = true;
+                        break;
+                    }
+                    Con *next_transient = con_by_window_id(transient_con->window->transient_for);
+                    if (next_transient == NULL)
+                        break;
+                    /* Some clients (e.g. x11-ssh-askpass) actually set
+                     * WM_TRANSIENT_FOR to their own window id, so break instead of
+                     * looping endlessly. */
+                    if (transient_con == next_transient)
+                        break;
+                    transient_con = next_transient;
+                }
+
+                if (!is_transient_for)
+                    continue;
+                else {
+                    DLOG("Rendering floating child even though in fullscreen mode: "
+                         "floating->transient_for (0x%08x) --> fullscreen->id (0x%08x)\n",
+                         floating_child->window->transient_for, fullscreen->window->id);
+                }
+            }
+            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);
+        }
+    }
+}
+
 /*
  * 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) {
+static void render_output(Con *con) {
     Con *child, *dockchild;
 
     int x = con->rect.x;
@@ -71,7 +302,7 @@ static void render_l_output(Con *con) {
     if (fullscreen) {
         fullscreen->rect = con->rect;
         x_raise_con(fullscreen);
-        render_con(fullscreen, true);
+        render_con(fullscreen);
         return;
     }
 
@@ -83,7 +314,7 @@ static void render_l_output(Con *con) {
 
         child->rect.height = 0;
         TAILQ_FOREACH(dockchild, &(child->nodes_head), nodes)
-            child->rect.height += dockchild->geometry.height;
+        child->rect.height += dockchild->geometry.height;
 
         height -= child->rect.height;
     }
@@ -109,336 +340,107 @@ static void render_l_output(Con *con) {
         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);
+             child->rect.x, child->rect.y, child->rect.width, child->rect.height);
         x_raise_con(child);
-        render_con(child, false);
+        render_con(child);
     }
 }
 
-/*
- * "Renders" the given container (and its children), meaning that all rects are
- * updated correctly. Note that this function does not call any xcb_*
- * functions, so the changes are completely done in memory only (and
- * side-effect free). As soon as you call x_push_changes(), the changes will be
- * updated in X11.
- *
- */
-void render_con(Con *con, bool render_fullscreen) {
-    int children = con_num_children(con);
-    DLOG("Rendering %snode %p / %s / layout %d / children %d\n",
-         (render_fullscreen ? "fullscreen " : ""), con, con->name, con->layout,
-         children);
-
-    /* Copy container rect, subtract container border */
-    /* This is the actually usable space inside this container for clients */
-    Rect rect = con->rect;
-
-    /* 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;
-
-    con->mapped = true;
-
-    /* if this container contains a window, set the coordinates */
-    if (con->window) {
-        /* depending on the border style, the rect of the child window
-         * needs to be smaller */
-        Rect *inset = &(con->window_rect);
-        *inset = (Rect){0, 0, con->rect.width, con->rect.height};
-        if (!render_fullscreen)
-            *inset = rect_add(*inset, con_border_style_rect(con));
-
-        /* Obey x11 border */
-        inset->width -= (2 * con->border_width);
-        inset->height -= (2 * con->border_width);
-
-        /* Obey the aspect ratio, if any, unless we are in fullscreen mode.
-         *
-         * The spec isn’t explicit on whether the aspect ratio hints should be
-         * respected during fullscreen mode. Other WMs such as Openbox don’t do
-         * that, and this post suggests that this is the correct way to do it:
-         * http://mail.gnome.org/archives/wm-spec-list/2003-May/msg00007.html
-         *
-         * Ignoring aspect ratio during fullscreen was necessary to fix MPlayer
-         * subtitle rendering, see http://bugs.i3wm.org/594 */
-        if (!render_fullscreen &&
-            con->aspect_ratio > 0.0) {
-            DLOG("aspect_ratio = %f, current width/height are %d/%d\n",
-                 con->aspect_ratio, inset->width, inset->height);
-            double new_height = inset->height + 1;
-            int new_width = inset->width;
-
-            while (new_height > inset->height) {
-                new_height = (1.0 / con->aspect_ratio) * new_width;
-
-                if (new_height > inset->height)
-                    new_width--;
-            }
-            /* Center the window */
-            inset->y += ceil(inset->height / 2) - floor((new_height + .5) / 2);
-            inset->x += ceil(inset->width / 2) - floor(new_width / 2);
-
-            inset->height = new_height + .5;
-            inset->width = new_width;
-        }
-
-        /* NB: We used to respect resize increment size hints for tiling
-         * windows up until commit 0db93d9 here. However, since all terminal
-         * emulators cope with ignoring the size hints in a better way than we
-         * can (by providing their fake-transparency or background color), this
-         * code was removed. See also http://bugs.i3wm.org/540 */
+static void render_con_split(Con *con, Con *child, render_params *p, int i) {
+    assert(con->layout == L_SPLITH || con->layout == L_SPLITV);
 
-        DLOG("child will be at %dx%d with size %dx%d\n", inset->x, inset->y, inset->width, inset->height);
+    if (con->layout == L_SPLITH) {
+        child->rect.x = p->x;
+        child->rect.y = p->y;
+        child->rect.width = p->sizes[i];
+        child->rect.height = p->rect.height;
+        p->x += child->rect.width;
+    } else {
+        child->rect.x = p->x;
+        child->rect.y = p->y;
+        child->rect.width = p->rect.width;
+        child->rect.height = p->sizes[i];
+        p->y += child->rect.height;
     }
 
-    /* Check for fullscreen nodes */
-    Con *fullscreen = NULL;
-    if (con->type != CT_OUTPUT) {
-        fullscreen = con_get_fullscreen_con(con, (con->type == CT_ROOT ? CF_GLOBAL : CF_OUTPUT));
-    }
-    if (fullscreen) {
-        fullscreen->rect = rect;
-        x_raise_con(fullscreen);
-        render_con(fullscreen, true);
-        return;
-    }
+    /* first we have the decoration, if this is a leaf node */
+    if (con_is_leaf(child)) {
+        if (child->border_style == BS_NORMAL) {
+            /* 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;
 
-    /* find the height for the decorations */
-    int deco_height = render_deco_height();
+            child->rect.y += p->deco_height;
+            child->rect.height -= p->deco_height;
 
-    /* precalculate the sizes to be able to correct rounding errors */
-    int sizes[children];
-    memset(sizes, 0, children*sizeof(int));
-    if ((con->layout == L_SPLITH || con->layout == L_SPLITV) && children > 0) {
-        assert(!TAILQ_EMPTY(&con->nodes_head));
-        Con *child;
-        int i = 0, assigned = 0;
-        int total = con_orientation(con) == 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;
-            }
+            child->deco_rect.width = child->rect.width;
+            child->deco_rect.height = p->deco_height;
+        } else {
+            child->deco_rect.x = 0;
+            child->deco_rect.y = 0;
+            child->deco_rect.width = 0;
+            child->deco_rect.height = 0;
         }
     }
+}
 
-    if (con->layout == L_OUTPUT) {
-        /* Skip i3-internal outputs */
-        if (con_is_internal(con))
-            return;
-        render_l_output(con);
-    } else if (con->type == CT_ROOT) {
-        Con *output;
-        TAILQ_FOREACH(output, &(con->nodes_head), nodes) {
-            render_con(output, false);
-        }
-
-        /* We need to render floating windows after rendering all outputs’
-         * tiling windows because they need to be on top of *every* output at
-         * all times. This is important when the user places floating
-         * windows/containers so that they overlap on another output. */
-        DLOG("Rendering floating windows:\n");
-        TAILQ_FOREACH(output, &(con->nodes_head), nodes) {
-            if (con_is_internal(output))
-                continue;
-            /* Get the active workspace of that output */
-            Con *content = output_get_content(output);
-            if (!content || TAILQ_EMPTY(&(content->focus_head))) {
-                DLOG("Skipping this output because it is currently being destroyed.\n");
-                continue;
-            }
-            Con *workspace = TAILQ_FIRST(&(content->focus_head));
-            Con *fullscreen = con_get_fullscreen_con(workspace, CF_OUTPUT);
-            Con *child;
-            TAILQ_FOREACH(child, &(workspace->floating_head), floating_windows) {
-                /* Don’t render floating windows when there is a fullscreen window
-                 * on that workspace. Necessary to make floating fullscreen work
-                 * correctly (ticket #564). */
-                if (fullscreen != NULL && fullscreen->window != NULL) {
-                    Con *floating_child = con_descend_focused(child);
-                    Con *transient_con = floating_child;
-                    bool is_transient_for = false;
-                    /* Exception to the above rule: smart
-                     * popup_during_fullscreen handling (popups belonging to
-                     * the fullscreen app will be rendered). */
-                    while (transient_con != NULL &&
-                           transient_con->window != NULL &&
-                           transient_con->window->transient_for != XCB_NONE) {
-                        if (transient_con->window->transient_for == fullscreen->window->id) {
-                            is_transient_for = true;
-                            break;
-                        }
-                        Con *next_transient = con_by_window_id(transient_con->window->transient_for);
-                        if (next_transient == NULL)
-                            break;
-                        /* Some clients (e.g. x11-ssh-askpass) actually set
-                         * WM_TRANSIENT_FOR to their own window id, so break instead of
-                         * looping endlessly. */
-                        if (transient_con == next_transient)
-                            break;
-                        transient_con = next_transient;
-                    }
-
-                    if (!is_transient_for)
-                        continue;
-                    else {
-                        DLOG("Rendering floating child even though in fullscreen mode: "
-                             "floating->transient_for (0x%08x) --> fullscreen->id (0x%08x)\n",
-                             floating_child->window->transient_for, fullscreen->window->id);
-                    }
-                }
-                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, false);
-            }
-        }
-
-    } 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_SPLITH || con->layout == L_SPLITV) {
-            if (con->layout == L_SPLITH) {
-                child->rect.x = x;
-                child->rect.y = y;
-                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 = sizes[i];
-                y += child->rect.height;
-            }
+static void render_con_stacked(Con *con, Con *child, render_params *p, int i) {
+    assert(con->layout == L_STACKED);
 
-            /* first we have the decoration, if this is a leaf node */
-            if (con_is_leaf(child)) {
-                if (child->border_style == BS_NORMAL) {
-                    /* 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 += deco_height;
-                    child->rect.height -= deco_height;
-
-                    child->deco_rect.width = child->rect.width;
-                    child->deco_rect.height = deco_height;
-                } else {
-                    child->deco_rect.x = 0;
-                    child->deco_rect.y = 0;
-                    child->deco_rect.width = 0;
-                    child->deco_rect.height = 0;
-                }
-            }
-        }
+    child->rect.x = p->x;
+    child->rect.y = p->y;
+    child->rect.width = p->rect.width;
+    child->rect.height = p->rect.height;
 
-        /* stacked layout */
-        else if (con->layout == L_STACKED) {
-            child->rect.x = x;
-            child->rect.y = y;
-            child->rect.width = rect.width;
-            child->rect.height = rect.height;
-
-            child->deco_rect.x = x - con->rect.x;
-            child->deco_rect.y = y - con->rect.y + (i * deco_height);
-            child->deco_rect.width = child->rect.width;
-            child->deco_rect.height = deco_height;
+    child->deco_rect.x = p->x - con->rect.x;
+    child->deco_rect.y = p->y - con->rect.y + (i * p->deco_height);
+    child->deco_rect.width = child->rect.width;
+    child->deco_rect.height = p->deco_height;
 
-            if (children > 1 || (child->border_style != BS_PIXEL && child->border_style != BS_NONE)) {
-                child->rect.y += (deco_height * children);
-                child->rect.height -= (deco_height * children);
-            }
-        }
+    if (p->children > 1 || (child->border_style != BS_PIXEL && child->border_style != BS_NONE)) {
+        child->rect.y += (p->deco_height * p->children);
+        child->rect.height -= (p->deco_height * p->children);
+    }
+}
 
-        /* tabbed layout */
-        else if (con->layout == L_TABBED) {
-            child->rect.x = x;
-            child->rect.y = y;
-            child->rect.width = rect.width;
-            child->rect.height = rect.height;
+static void render_con_tabbed(Con *con, Con *child, render_params *p, int i) {
+    assert(con->layout == L_TABBED);
 
-            child->deco_rect.width = floor((float)child->rect.width / children);
-            child->deco_rect.x = x - con->rect.x + i * child->deco_rect.width;
-            child->deco_rect.y = y - con->rect.y;
+    child->rect.x = p->x;
+    child->rect.y = p->y;
+    child->rect.width = p->rect.width;
+    child->rect.height = p->rect.height;
 
-            /* Since the tab width may be something like 31,6 px per tab, we
-             * let the last tab have all the extra space (0,6 * children). */
-            if (i == (children-1)) {
-                child->deco_rect.width += (child->rect.width - (child->deco_rect.x + child->deco_rect.width));
-            }
+    child->deco_rect.width = floor((float)child->rect.width / p->children);
+    child->deco_rect.x = p->x - con->rect.x + i * child->deco_rect.width;
+    child->deco_rect.y = p->y - con->rect.y;
 
-            if (children > 1 || (child->border_style != BS_PIXEL && child->border_style != BS_NONE)) {
-                child->rect.y += deco_height;
-                child->rect.height -= deco_height;
-                child->deco_rect.height = deco_height;
-            } else {
-                child->deco_rect.height = (child->border_style == BS_PIXEL ? 1 : 0);
-            }
-        }
-
-        /* dockarea layout */
-        else if (con->layout == L_DOCKAREA) {
-            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;
-        }
+    /* Since the tab width may be something like 31,6 px per tab, we
+     * let the last tab have all the extra space (0,6 * children). */
+    if (i == (p->children - 1)) {
+        child->deco_rect.width += (child->rect.width - (child->deco_rect.x + child->deco_rect.width));
+    }
 
-        DLOG("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, false);
-        i++;
+    if (p->children > 1 || (child->border_style != BS_PIXEL && child->border_style != BS_NONE)) {
+        child->rect.y += p->deco_height;
+        child->rect.height -= p->deco_height;
+        child->deco_rect.height = p->deco_height;
+    } else {
+        child->deco_rect.height = (child->border_style == BS_PIXEL ? 1 : 0);
     }
+}
 
-    /* in a stacking or tabbed container, we ensure the focused client is raised */
-    if (con->layout == L_STACKED || con->layout == L_TABBED) {
-        TAILQ_FOREACH_REVERSE(child, &(con->focus_head), focus_head, focused)
-            x_raise_con(child);
-        if ((child = TAILQ_FIRST(&(con->focus_head)))) {
-            /* 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);
-        }
+static void render_con_dockarea(Con *con, Con *child, render_params *p) {
+    assert(con->layout == L_DOCKAREA);
 
-        if (children != 1)
-            /* Raise the stack con itself. This will put the stack decoration on
-             * top of every stack window. That way, when a new window is opened in
-             * the stack, the old window will not obscure part of the decoration
-             * (it’s unmapped afterwards). */
-            x_raise_con(con);
-    }
-    }
+    child->rect.x = p->x;
+    child->rect.y = p->y;
+    child->rect.width = p->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;
+    p->y += child->rect.height;
 }