+#line 2 "render.c"
/*
* vim:ts=4:sw=4:expandtab
*
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 *ws = con_get_fullscreen_con(content, CF_OUTPUT);
Con *fullscreen = con_get_fullscreen_con(ws, CF_OUTPUT);
if (fullscreen) {
- DLOG("got fs node: %p\n", fullscreen);
fullscreen->rect = con->rect;
x_raise_con(fullscreen);
render_con(fullscreen, true);
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) {
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);
}
*
*/
void render_con(Con *con, bool render_fullscreen) {
- DLOG("currently rendering node %p / %s / layout %d\n",
- con, con->name, con->layout);
int children = con_num_children(con);
- DLOG("children: %d, orientation = %d\n", children, con->orientation);
+ 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 */
if (!render_fullscreen)
*inset = rect_add(*inset, con_border_style_rect(con));
- DLOG("Starting with inset = (%d, %d) %d x %d\n", inset->x, inset->y, inset->width, inset->height);
/* 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 &&
+ /* 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->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;
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) {
fullscreen = con_get_fullscreen_con(con, (con->type == CT_ROOT ? CF_GLOBAL : CF_OUTPUT));
}
if (fullscreen) {
- DLOG("got fs node: %p\n", fullscreen);
fullscreen->rect = rect;
x_raise_con(fullscreen);
render_con(fullscreen, true);
}
/* find the height for the decorations */
- int deco_height = config.font.height + 5;
+ int deco_height = config.font.height + 4;
+ if (config.font.height & 0x01)
+ ++deco_height;
/* precalculate the sizes to be able to correct rounding errors */
int sizes[children];
- if (con->layout == L_DEFAULT && children > 0) {
+ 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 == HORIZ ? rect.width : rect.height;
+ 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;
}
if (con->layout == L_OUTPUT) {
+ /* Skip i3-internal outputs */
+ if (con->name[0] == '_' && con->name[1] == '_')
+ return;
render_l_output(con);
} else if (con->type == CT_ROOT) {
- DLOG("Root node, rendering outputs\n");
- Con *child;
- TAILQ_FOREACH(child, &(con->nodes_head), nodes) {
- render_con(child, false);
+ 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 (output->name[0] == '_' && output->name[1] == '_')
+ continue;
+ /* Get the active workspace of that output */
+ Con *content = output_get_content(output);
+ Con *workspace = TAILQ_FIRST(&(content->focus_head));
+
+ /* Check for (floating!) fullscreen nodes */
+ /* XXX: This code duplication is unfortunate. Keep in mind to fix
+ * this when we clean up the whole render.c */
+ Con *fullscreen = NULL;
+ fullscreen = con_get_fullscreen_con(workspace, CF_OUTPUT);
+ if (fullscreen) {
+ /* Either the fullscreen window is inside the floating
+ * container, then we need to render and raise it now… */
+ if (con_inside_floating(fullscreen)) {
+ fullscreen->rect = output->rect;
+ x_raise_con(fullscreen);
+ render_con(fullscreen, true);
+ continue;
+ } else {
+ /* …or it’s a tiling window, in which case the floating
+ * windows should not overlap it, so we skip rendering this
+ * output. */
+ continue;
+ }
+ }
+
+ Con *child;
+ TAILQ_FOREACH(child, &(workspace->floating_head), floating_windows) {
+ 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: */
assert(children > 0);
/* default layout */
- if (con->layout == L_DEFAULT) {
- if (con->orientation == HORIZ) {
+ 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];
/* first we have the decoration, if this is a leaf node */
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;
/* 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;
/* 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;
/* 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;
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);
i++;
/* 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
x_raise_con(con);
}
}
-
- Con *child;
- TAILQ_FOREACH(child, &(con->floating_head), floating_windows) {
- 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, false);
- }
-
- DLOG("-- level up\n");
}