X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Frender.c;h=1216241b49af184a8e2ef45cdf997768b6f54af0;hb=71ccb4bef2850bd5beab8a4ef4669bf53b5a9781;hp=e1a56d9a7735992109072081d8093fab491850cd;hpb=42d355f2b75376cdb42bf6c634aa5a9d4b36c447;p=i3%2Fi3

diff --git a/src/render.c b/src/render.c
index e1a56d9a..1216241b 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
  *
@@ -25,7 +27,6 @@ static void render_l_output(Con *con) {
     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. */
@@ -51,7 +52,6 @@ static void render_l_output(Con *con) {
     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);
@@ -67,13 +67,10 @@ static void render_l_output(Con *con) {
         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) {
@@ -96,7 +93,6 @@ static void render_l_output(Con *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);
     }
@@ -111,10 +107,10 @@ static void render_l_output(Con *con) {
  *
  */
 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 */
@@ -145,16 +141,22 @@ void render_con(Con *con, bool render_fullscreen) {
         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;
 
@@ -170,22 +172,13 @@ void render_con(Con *con, bool render_fullscreen) {
 
             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) {
-            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);
     }
@@ -196,7 +189,6 @@ void render_con(Con *con, bool render_fullscreen) {
         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);
@@ -204,15 +196,17 @@ void render_con(Con *con, bool render_fullscreen) {
     }
 
     /* 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;
@@ -230,13 +224,55 @@ void render_con(Con *con, bool render_fullscreen) {
     }
 
     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) {
-        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 (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));
+            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 (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);
+            }
         }
+
     } else {
 
         /* FIXME: refactor this into separate functions: */
@@ -245,8 +281,8 @@ void render_con(Con *con, bool render_fullscreen) {
         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];
@@ -262,7 +298,6 @@ void render_con(Con *con, bool render_fullscreen) {
 
             /* 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;
@@ -277,7 +312,6 @@ void render_con(Con *con, bool render_fullscreen) {
 
         /* 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;
@@ -288,7 +322,7 @@ void render_con(Con *con, bool render_fullscreen) {
             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);
             }
@@ -296,26 +330,26 @@ void render_con(Con *con, bool render_fullscreen) {
 
         /* 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;
             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);
             }
         }
 
         /* 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;
@@ -330,7 +364,6 @@ void render_con(Con *con, bool render_fullscreen) {
 
         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++;
@@ -338,12 +371,9 @@ void render_con(Con *con, bool render_fullscreen) {
 
     /* 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
@@ -359,14 +389,4 @@ void render_con(Con *con, bool render_fullscreen) {
             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");
 }