X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Frender.c;h=d7d576673e4b65bb13dcf9ddfbf1e5e20e2bf070;hb=6226400dfd19fb67f165ae543d1ceaa2d33008cc;hp=bad67f04c090b07d516537a7d22306133fce3e43;hpb=fb4ee17b054afa2f85ad64480353f554e5eae2d3;p=i3%2Fi3

diff --git a/src/render.c b/src/render.c
index bad67f04..d7d57667 100644
--- a/src/render.c
+++ b/src/render.c
@@ -1,3 +1,5 @@
+#undef I3__FILE__
+#define I3__FILE__ "render.c"
 /*
  * vim:ts=4:sw=4:expandtab
  *
@@ -14,6 +16,16 @@
  * container (for debugging purposes) */
 static bool show_debug_borders = false;
 
+/*
+ * Returns the height for the decorations
+ */
+int render_deco_height(void) {
+    int deco_height = config.font.height + 4;
+    if (config.font.height & 0x01)
+        ++deco_height;
+    return deco_height;
+}
+
 /*
  * 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.
@@ -42,12 +54,19 @@ static void render_l_output(Con *con) {
         }
     }
 
-    assert(content != NULL);
+    if (content == NULL) {
+        DLOG("Skipping this output because it is currently being destroyed.\n");
+        return;
+    }
 
     /* We need to find out if there is a fullscreen con on the current workspace
      * and take the short-cut to render it directly (the user does not want to
      * see the dockareas in that case) */
     Con *ws = con_get_fullscreen_con(content, CF_OUTPUT);
+    if (!ws) {
+        DLOG("Skipping this output because it is currently being destroyed.\n");
+        return;
+    }
     Con *fullscreen = con_get_fullscreen_con(ws, CF_OUTPUT);
     if (fullscreen) {
         fullscreen->rect = con->rect;
@@ -64,7 +83,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;
     }
@@ -90,7 +109,7 @@ 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);
     }
@@ -153,38 +172,31 @@ void render_con(Con *con, bool render_fullscreen) {
          * 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) {
+            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 = ((double)con->proportional_height / con->proportional_width) * new_width;
+                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 / 2);
+            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;
+            inset->height = new_height + .5;
             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);
     }
@@ -198,16 +210,23 @@ void render_con(Con *con, bool render_fullscreen) {
         fullscreen->rect = rect;
         x_raise_con(fullscreen);
         render_con(fullscreen, true);
-        return;
+        /* 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 */
-    int deco_height = config.font.height + 4;
-    if (config.font.height & 0x01)
-        ++deco_height;
+    int 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) {
         assert(!TAILQ_EMPTY(&con->nodes_head));
         Con *child;
@@ -218,8 +237,8 @@ void render_con(Con *con, bool render_fullscreen) {
             assigned += sizes[i++] = percentage * total;
         }
         assert(assigned == total ||
-                (assigned > total && assigned - total <= children * 2) ||
-                (assigned < total && total - assigned <= children * 2));
+               (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) {
@@ -231,13 +250,15 @@ void render_con(Con *con, bool render_fullscreen) {
 
     if (con->layout == L_OUTPUT) {
         /* Skip i3-internal outputs */
-        if (con->name[0] == '_' && con->name[1] == '_')
+        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);
+        if (!fullscreen) {
+            TAILQ_FOREACH(output, &(con->nodes_head), nodes) {
+                render_con(output, false);
+            }
         }
 
         /* We need to render floating windows after rendering all outputs’
@@ -246,153 +267,195 @@ void render_con(Con *con, bool render_fullscreen) {
          * 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] == '_')
+            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;
-                }
+            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) {
-                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 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 {
-
         /* FIXME: refactor this into separate functions: */
-    Con *child;
-    TAILQ_FOREACH(child, &(con->nodes_head), nodes) {
-        assert(children > 0);
+        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;
+                }
 
-        /* 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 {
+                /* 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 = sizes[i];
-                y += child->rect.height;
-            }
-
-            /* first we have the decoration, if this is a leaf node */
-            if (con_is_leaf(child) && 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->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);
+                }
             }
-        }
 
-        /* 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;
+            /* 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.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.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;
 
-            if (children > 1 || (child->border_style != BS_1PIXEL && child->border_style != BS_NONE)) {
-                child->rect.y += (deco_height * children);
-                child->rect.height -= (deco_height * children);
-            }
-        }
+                /* 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));
+                }
 
-        /* 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;
+                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);
+                }
+            }
 
-            child->deco_rect.width = child->rect.width / children;
-            child->deco_rect.height = deco_height;
-            child->deco_rect.x = x - con->rect.x + i * child->deco_rect.width;
-            child->deco_rect.y = y - con->rect.y;
+            /* 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;
 
-            if (children > 1 || (child->border_style != BS_1PIXEL && child->border_style != BS_NONE)) {
-                child->rect.y += deco_height;
-                child->rect.height -= deco_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;
             }
-        }
 
-        /* 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;
+            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++;
         }
 
-        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)
+        /* 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
+            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);
-        }
+                render_con(child, false);
+            }
 
-        if (children != 1)
-            /* Raise the stack con itself. This will put the stack decoration on
+            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);
-    }
+                x_raise_con(con);
+        }
     }
 }