* updated in X11.
*
*/
-void render_con(Con *con, bool render_fullscreen) {
+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 %snode %p / %s / layout %d / children %d\n",
- (render_fullscreen ? "fullscreen " : ""), con, con->name, con->layout,
- params.children);
+ DLOG("Rendering node %p / %s / layout %d / children %d\n", con, con->name,
+ con->layout, params.children);
int i = 0;
con->mapped = true;
* needs to be smaller */
Rect *inset = &(con->window_rect);
*inset = (Rect){0, 0, con->rect.width, con->rect.height};
- if (!render_fullscreen)
+ 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);
- /* 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:
- * https://mail.gnome.org/archives/wm-spec-list/2003-May/msg00007.html
- *
- * Ignoring aspect ratio during fullscreen was necessary to fix MPlayer
- * subtitle rendering, see https://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
if (fullscreen) {
fullscreen->rect = params.rect;
x_raise_con(fullscreen);
- render_con(fullscreen, true);
+ 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,
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);
+ render_con(child);
i++;
}
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, false);
+ * 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). */
+ /* 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);
}
}
Con *output;
if (!fullscreen) {
TAILQ_FOREACH(output, &(con->nodes_head), nodes) {
- render_con(output, false);
+ render_con(output);
}
}
* 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) {
+ if (config.popup_during_fullscreen != PDF_SMART || fullscreen->window == NULL) {
continue;
}
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);
+ render_con(child);
}
}
}
if (fullscreen) {
fullscreen->rect = con->rect;
x_raise_con(fullscreen);
- render_con(fullscreen, true);
+ render_con(fullscreen);
return;
}
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);
+ render_con(child);
}
}