From dd989fa87b0d56737be97b6aa36bfe80786fbd1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ingo=20B=C3=BCrk?= Date: Wed, 9 Sep 2015 18:27:34 +0200 Subject: [PATCH 1/3] Refactor out some individual functions in render_con() to make the code more readable. --- include/render.h | 17 ++++ src/render.c | 256 +++++++++++++++++++++++++---------------------- 2 files changed, 154 insertions(+), 119 deletions(-) diff --git a/include/render.h b/include/render.h index 717459e9..d32f0310 100644 --- a/include/render.h +++ b/include/render.h @@ -10,6 +10,23 @@ */ #pragma once +/* This is used to keep a state to pass around when rendering a con in render_con(). */ +typedef struct render_params { + /* A copy of the coordinates of the container which is being rendered. */ + int x; + int y; + + /* The computed height for decorations. */ + int deco_height; + /* Container rect, subtract container border. This is the actually usable space + * inside this container for clients. */ + Rect rect; + /* The number of children of the container which is being rendered. */ + int children; + /* A precalculated list of sizes of each child. */ + int *sizes; +} render_params; + /** * "Renders" the given container (and its children), meaning that all rects are * updated correctly. Note that this function does not call any xcb_* diff --git a/src/render.c b/src/render.c index 7ada19eb..94404347 100644 --- a/src/render.c +++ b/src/render.c @@ -12,6 +12,12 @@ */ #include "all.h" +/* Forward declarations */ +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); + /* change this to 'true' if you want to have additional borders around every * container (for debugging purposes) */ static bool show_debug_borders = false; @@ -124,29 +130,26 @@ static void render_l_output(Con *con) { * */ void render_con(Con *con, bool render_fullscreen) { - int children = con_num_children(con); + render_params params = { + .rect = con->rect, + .x = con->rect.x, + .y = con->rect.y, + .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; + params.children); /* 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; + params.rect.x += 2; + params.rect.y += 2; + params.rect.width -= 2 * 2; + params.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 */ @@ -207,7 +210,7 @@ void render_con(Con *con, bool render_fullscreen) { fullscreen = con_get_fullscreen_con(con, (con->type == CT_ROOT ? CF_GLOBAL : CF_OUTPUT)); } if (fullscreen) { - fullscreen->rect = rect; + fullscreen->rect = params.rect; x_raise_con(fullscreen); render_con(fullscreen, true); /* Fullscreen containers are either global (underneath the CT_ROOT @@ -222,31 +225,33 @@ void render_con(Con *con, bool render_fullscreen) { } /* find the height for the decorations */ - int deco_height = render_deco_height(); + params.deco_height = render_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) { + int sizes[params.children]; + memset(sizes, 0, params.children * sizeof(int)); + if ((con->layout == L_SPLITH || con->layout == L_SPLITV) && params.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; + int total = con_orientation(con) == HORIZ ? params.rect.width : params.rect.height; TAILQ_FOREACH(child, &(con->nodes_head), nodes) { - double percentage = child->percent > 0.0 ? child->percent : 1.0 / children; + double percentage = child->percent > 0.0 ? child->percent : 1.0 / params.children; assigned += sizes[i++] = percentage * total; } assert(assigned == total || - (assigned > total && assigned - total <= children * 2) || - (assigned < total && total - assigned <= children * 2)); + (assigned > total && assigned - total <= params.children * 2) || + (assigned < total && total - assigned <= params.children * 2)); int signal = assigned < total ? 1 : -1; while (assigned != total) { - for (i = 0; i < children && assigned != total; ++i) { + for (i = 0; i < params.children && assigned != total; ++i) { sizes[i] += signal; assigned += signal; } } } + params.sizes = sizes; if (con->layout == L_OUTPUT) { /* Skip i3-internal outputs */ @@ -331,104 +336,18 @@ void render_con(Con *con, bool render_fullscreen) { } } else { - /* FIXME: refactor this into separate functions: */ Con *child; TAILQ_FOREACH(child, &(con->nodes_head), nodes) { - assert(children > 0); + assert(params.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; - } - - /* 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; - } - } - } - - /* 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; - - 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); - } - } - - /* 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; - - 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; - - /* 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)); - } - - 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; + render_con_split(con, child, ¶ms, i); + } else if (con->layout == L_STACKED) { + render_con_stacked(con, child, ¶ms, i); + } else if (con->layout == L_TABBED) { + render_con_tabbed(con, child, ¶ms, i); + } else if (con->layout == L_DOCKAREA) { + render_con_dockarea(con, child, ¶ms); } DLOG("child at (%d, %d) with (%d x %d)\n", @@ -450,7 +369,7 @@ void render_con(Con *con, bool render_fullscreen) { render_con(child, false); } - if (children != 1) + 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 @@ -459,3 +378,102 @@ void render_con(Con *con, bool render_fullscreen) { } } } + +static void render_con_split(Con *con, Con *child, render_params *p, int i) { + assert(con->layout == L_SPLITH || con->layout == L_SPLITV); + + 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; + } + + /* 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 += p->deco_height; + child->rect.height -= p->deco_height; + + 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; + } + } +} + +static void render_con_stacked(Con *con, Con *child, render_params *p, int i) { + assert(con->layout == L_STACKED); + + child->rect.x = p->x; + child->rect.y = p->y; + child->rect.width = p->rect.width; + child->rect.height = p->rect.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 (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); + } +} + +static void render_con_tabbed(Con *con, Con *child, render_params *p, int i) { + assert(con->layout == L_TABBED); + + child->rect.x = p->x; + child->rect.y = p->y; + child->rect.width = p->rect.width; + child->rect.height = p->rect.height; + + 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; + + /* 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)); + } + + 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); + } +} + +static void render_con_dockarea(Con *con, Con *child, render_params *p) { + assert(con->layout == L_DOCKAREA); + + 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; +} From a194cab5231e7e0ec1e40042695d794c2fdd0ee1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ingo=20B=C3=BCrk?= Date: Thu, 10 Sep 2015 20:43:33 +0200 Subject: [PATCH 2/3] Move precalculating the container sizes into a separate function --- src/render.c | 58 ++++++++++++++++++++++++++++++---------------------- 1 file changed, 33 insertions(+), 25 deletions(-) diff --git a/src/render.c b/src/render.c index 94404347..94814220 100644 --- a/src/render.c +++ b/src/render.c @@ -13,6 +13,7 @@ #include "all.h" /* Forward declarations */ +static int *precalculate_sizes(Con *con, render_params *p); 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); @@ -228,35 +229,12 @@ void render_con(Con *con, bool render_fullscreen) { params.deco_height = render_deco_height(); /* precalculate the sizes to be able to correct rounding errors */ - int sizes[params.children]; - memset(sizes, 0, params.children * sizeof(int)); - if ((con->layout == L_SPLITH || con->layout == L_SPLITV) && params.children > 0) { - assert(!TAILQ_EMPTY(&con->nodes_head)); - - Con *child; - int i = 0, assigned = 0; - int total = con_orientation(con) == HORIZ ? params.rect.width : params.rect.height; - TAILQ_FOREACH(child, &(con->nodes_head), nodes) { - double percentage = child->percent > 0.0 ? child->percent : 1.0 / params.children; - assigned += sizes[i++] = percentage * total; - } - assert(assigned == total || - (assigned > total && assigned - total <= params.children * 2) || - (assigned < total && total - assigned <= params.children * 2)); - int signal = assigned < total ? 1 : -1; - while (assigned != total) { - for (i = 0; i < params.children && assigned != total; ++i) { - sizes[i] += signal; - assigned += signal; - } - } - } - params.sizes = sizes; + params.sizes = precalculate_sizes(con, ¶ms); if (con->layout == L_OUTPUT) { /* Skip i3-internal outputs */ if (con_is_internal(con)) - return; + goto free_params; render_l_output(con); } else if (con->type == CT_ROOT) { Con *output; @@ -377,6 +355,36 @@ void render_con(Con *con, bool render_fullscreen) { x_raise_con(con); } } + +free_params: + FREE(params.sizes); +} + +static int *precalculate_sizes(Con *con, render_params *p) { + int *sizes = smalloc(p->children * sizeof(int)); + if ((con->layout == L_SPLITH || con->layout == L_SPLITV) && p->children > 0) { + assert(!TAILQ_EMPTY(&con->nodes_head)); + + Con *child; + int i = 0, assigned = 0; + int total = con_orientation(con) == HORIZ ? p->rect.width : p->rect.height; + TAILQ_FOREACH(child, &(con->nodes_head), nodes) { + double percentage = child->percent > 0.0 ? child->percent : 1.0 / p->children; + assigned += sizes[i++] = 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_con_split(Con *con, Con *child, render_params *p, int i) { From bb5be480e71dbe776afbebcdc033319f103733bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ingo=20B=C3=BCrk?= Date: Thu, 10 Sep 2015 20:49:14 +0200 Subject: [PATCH 3/3] Move rendering the root node into a separate function. --- src/render.c | 536 ++++++++++++++++++++++++++------------------------- 1 file changed, 270 insertions(+), 266 deletions(-) diff --git a/src/render.c b/src/render.c index 94814220..f8c49c38 100644 --- a/src/render.c +++ b/src/render.c @@ -14,6 +14,8 @@ /* 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); @@ -33,12 +35,279 @@ 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, bool render_fullscreen) { + render_params params = { + .rect = con->rect, + .x = con->rect.x, + .y = con->rect.y, + .children = con_num_children(con)}; + + DLOG("Rendering %snode %p / %s / layout %d / children %d\n", + (render_fullscreen ? "fullscreen " : ""), con, con->name, con->layout, + params.children); + + /* 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) { + params.rect.x += 2; + params.rect.y += 2; + params.rect.width -= 2 * 2; + params.rect.height -= 2 * 2; + } + + 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->window->aspect_ratio > 0.0) { + DLOG("aspect_ratio = %f, current width/height are %d/%d\n", + con->window->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->window->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 */ + + 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, true); + /* 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 http://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, ¶ms); + + 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, ¶ms, i); + } else if (con->layout == L_STACKED) { + render_con_stacked(con, child, ¶ms, i); + } else if (con->layout == L_TABBED) { + render_con_tabbed(con, child, ¶ms, i); + } else if (con->layout == L_DOCKAREA) { + render_con_dockarea(con, child, ¶ms); + } + + 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++; + } + + /* 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); + } + + 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) { + int *sizes = smalloc(p->children * sizeof(int)); + if ((con->layout == L_SPLITH || con->layout == L_SPLITV) && p->children > 0) { + assert(!TAILQ_EMPTY(&con->nodes_head)); + + Con *child; + int i = 0, assigned = 0; + int total = con_orientation(con) == HORIZ ? p->rect.width : p->rect.height; + TAILQ_FOREACH(child, &(con->nodes_head), nodes) { + double percentage = child->percent > 0.0 ? child->percent : 1.0 / p->children; + assigned += sizes[i++] = 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, 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 there is no fullscreen->window, this cannot be a + * transient window, so we _know_ we need to skip it. This + * happens during restarts where the container already exists, + * but the window was not yet associated. */ + if (fullscreen != NULL && fullscreen->window == NULL) + continue; + 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) { + 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, 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) { +static void render_output(Con *con) { Con *child, *dockchild; int x = con->rect.x; @@ -122,271 +391,6 @@ static void render_l_output(Con *con) { } } -/* - * "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) { - render_params params = { - .rect = con->rect, - .x = con->rect.x, - .y = con->rect.y, - .children = con_num_children(con)}; - - DLOG("Rendering %snode %p / %s / layout %d / children %d\n", - (render_fullscreen ? "fullscreen " : ""), con, con->name, con->layout, - params.children); - - /* 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) { - params.rect.x += 2; - params.rect.y += 2; - params.rect.width -= 2 * 2; - params.rect.height -= 2 * 2; - } - - 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->window->aspect_ratio > 0.0) { - DLOG("aspect_ratio = %f, current width/height are %d/%d\n", - con->window->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->window->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 */ - - 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, true); - /* 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 http://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, ¶ms); - - if (con->layout == L_OUTPUT) { - /* Skip i3-internal outputs */ - if (con_is_internal(con)) - goto free_params; - render_l_output(con); - } else if (con->type == CT_ROOT) { - Con *output; - if (!fullscreen) { - 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 there is no fullscreen->window, this cannot be a - * transient window, so we _know_ we need to skip it. This - * happens during restarts where the container already exists, - * but the window was not yet associated. */ - if (fullscreen != NULL && fullscreen->window == NULL) - continue; - 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) { - 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, false); - } - } - - } 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, ¶ms, i); - } else if (con->layout == L_STACKED) { - render_con_stacked(con, child, ¶ms, i); - } else if (con->layout == L_TABBED) { - render_con_tabbed(con, child, ¶ms, i); - } else if (con->layout == L_DOCKAREA) { - render_con_dockarea(con, child, ¶ms); - } - - 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++; - } - - /* 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); - } - - 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) { - int *sizes = smalloc(p->children * sizeof(int)); - if ((con->layout == L_SPLITH || con->layout == L_SPLITV) && p->children > 0) { - assert(!TAILQ_EMPTY(&con->nodes_head)); - - Con *child; - int i = 0, assigned = 0; - int total = con_orientation(con) == HORIZ ? p->rect.width : p->rect.height; - TAILQ_FOREACH(child, &(con->nodes_head), nodes) { - double percentage = child->percent > 0.0 ? child->percent : 1.0 / p->children; - assigned += sizes[i++] = 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_con_split(Con *con, Con *child, render_params *p, int i) { assert(con->layout == L_SPLITH || con->layout == L_SPLITV);