+#undef I3__FILE__
+#define I3__FILE__ "render.c"
/*
* vim:ts=4:sw=4:expandtab
*
*/
void render_con(Con *con, bool render_fullscreen) {
int children = con_num_children(con);
- DLOG("Rendering %snode %p / %s / layout %d / children %d / orient %d\n",
+ DLOG("Rendering %snode %p / %s / layout %d / children %d\n",
(render_fullscreen ? "fullscreen " : ""), con, con->name, con->layout,
- children, con->orientation);
+ children);
/* Copy container rect, subtract container border */
/* This is the actually usable space inside this container for clients */
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) {
double new_height = inset->height + 1;
int new_width = inset->width;
inset->width = 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);
- }
+ /* 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);
}
/* 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_is_internal(con))
+ return;
render_l_output(con);
} else if (con->type == CT_ROOT) {
Con *output;
* 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);
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 *fullscreen = con_get_fullscreen_con(workspace, CF_OUTPUT);
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);
+ /* 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) {
+ Con *floating_child = con_descend_focused(child);
+ /* Exception to the above rule: smart
+ * popup_during_fullscreen handling (popups belonging to
+ * the fullscreen app will be rendered). */
+ if (floating_child->window == NULL ||
+ fullscreen->window == NULL ||
+ floating_child->window->transient_for != fullscreen->window->id)
+ 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);
}
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];
child->deco_rect.width = child->rect.width;
child->deco_rect.height = deco_height;
- if (children > 1 || (child->border_style != BS_1PIXEL && child->border_style != BS_NONE)) {
+ 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);
}
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.width = ceil((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;
- if (children > 1 || (child->border_style != BS_1PIXEL && child->border_style != BS_NONE)) {
+ 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);
}
}
projects / i3 / i3 / blobdiff