]> git.sur5r.net Git - i3/i3/blobdiff - src/layout.c
use decimal coordinates in debug message
[i3/i3] / src / layout.c
index 190dc04a839aa788a3675b7d3181e74d17f87dfe..b13380403731f3a3ebdb4ce54e51eee9ba3bc85d 100644 (file)
@@ -3,7 +3,7 @@
  *
  * i3 - an improved dynamic tiling window manager
  *
- * © 2009 Michael Stapelberg and contributors
+ * © 2009-2010 Michael Stapelberg and contributors
  *
  * See file LICENSE for license information.
  *
 #include <stdlib.h>
 #include <xcb/xcb.h>
 #include <assert.h>
+#include <math.h>
 
 #include "config.h"
 #include "i3.h"
 #include "xcb.h"
 #include "table.h"
 #include "util.h"
-#include "xinerama.h"
+#include "randr.h"
 #include "layout.h"
-
-/*
- * Updates *destination with new_value and returns true if it was changed or false
- * if it was the same
- *
- */
-static bool update_if_necessary(uint32_t *destination, const uint32_t new_value) {
-        int old_value = *destination;
-
-        return ((*destination = new_value) != old_value);
-}
+#include "client.h"
+#include "floating.h"
+#include "handlers.h"
+#include "workspace.h"
+#include "log.h"
+#include "container.h"
 
 /*
  * Gets the unoccupied space (= space which is available for windows which were resized by the user)
@@ -41,44 +37,38 @@ static bool update_if_necessary(uint32_t *destination, const uint32_t new_value)
  * windows correctly, meaning that the aspect ratio will be maintained when opening new windows.
  *
  */
-int get_unoccupied_x(Workspace *workspace, int row) {
-        int unoccupied = workspace->rect.width;
-        float default_factor = ((float)workspace->rect.width / workspace->cols) / workspace->rect.width;
-
-        LOG("get_unoccupied_x(), starting with %d, default_factor = %f\n", unoccupied, default_factor);
-
-        for (int cols = 0; cols < workspace->cols;) {
-                Container *con = workspace->table[cols][row];
-                LOG("width_factor[%d][%d] = %f, colspan = %d\n", cols, row, con->width_factor, con->colspan);
-                if (con->width_factor == 0)
-                        unoccupied -= workspace->rect.width * default_factor * con->colspan;
-                cols += con->colspan;
-        }
+int get_unoccupied_x(Workspace *workspace) {
+        double unoccupied = workspace->rect.width;
+        double default_factor = ((float)workspace->rect.width / workspace->cols) / workspace->rect.width;
 
-        assert(unoccupied != 0);
+        DLOG("get_unoccupied_x(), starting with %f, default_factor = %f\n", unoccupied, default_factor);
 
-        LOG("unoccupied space: %d\n", unoccupied);
+        for (int cols = 0; cols < workspace->cols; cols++) {
+                DLOG("width_factor[%d] = %f, unoccupied = %f\n", cols, workspace->width_factor[cols], unoccupied);
+
+                if (workspace->width_factor[cols] == 0)
+                        unoccupied -= workspace->rect.width * default_factor;
+        }
+
+        DLOG("unoccupied space: %f\n", unoccupied);
         return unoccupied;
 }
 
 /* See get_unoccupied_x() */
-int get_unoccupied_y(Workspace *workspace, int col) {
-        int unoccupied = workspace->rect.height;
-        float default_factor = ((float)workspace->rect.height / workspace->rows) / workspace->rect.height;
-
-        LOG("get_unoccupied_y(), starting with %d, default_factor = %f\n", unoccupied, default_factor);
-
-        for (int rows = 0; rows < workspace->rows;) {
-                Container *con = workspace->table[col][rows];
-                LOG("height_factor[%d][%d] = %f, rowspan %d\n", col, rows, con->height_factor, con->rowspan);
-                if (con->height_factor == 0)
-                        unoccupied -= workspace->rect.height * default_factor * con->rowspan;
-                rows += con->rowspan;
-        }
+int get_unoccupied_y(Workspace *workspace) {
+        int height = workspace_height(workspace);
+        double unoccupied = height;
+        double default_factor = ((float)height / workspace->rows) / height;
 
-        assert(unoccupied != 0);
+        DLOG("get_unoccupied_y(), starting with %f, default_factor = %f\n", unoccupied, default_factor);
 
-        LOG("unoccupied space: %d\n", unoccupied);
+        for (int rows = 0; rows < workspace->rows; rows++) {
+                DLOG("height_factor[%d] = %f, unoccupied = %f\n", rows, workspace->height_factor[rows], unoccupied);
+                if (workspace->height_factor[rows] == 0)
+                        unoccupied -= height * default_factor;
+        }
+
+        DLOG("unoccupied space: %f\n", unoccupied);
         return unoccupied;
 }
 
@@ -89,12 +79,14 @@ int get_unoccupied_y(Workspace *workspace, int col) {
  *
  */
 void redecorate_window(xcb_connection_t *conn, Client *client) {
-        if (client->container->mode == MODE_STACK) {
+        if (client->container != NULL &&
+            (client->container->mode == MODE_STACK ||
+             client->container->mode == MODE_TABBED)) {
                 render_container(conn, client->container);
                 /* We clear the frame to generate exposure events, because the color used
                    in drawing may be different */
                 xcb_clear_area(conn, true, client->frame, 0, 0, client->rect.width, client->rect.height);
-        } else decorate_window(conn, client, client->frame, client->titlegc, 0);
+        } else decorate_window(conn, client, client->frame, client->titlegc, 0, 0);
         xcb_flush(conn);
 }
 
@@ -103,121 +95,186 @@ void redecorate_window(xcb_connection_t *conn, Client *client) {
  * When in stacking mode, the window decorations are drawn onto an own window.
  *
  */
-void decorate_window(xcb_connection_t *conn, Client *client, xcb_drawable_t drawable, xcb_gcontext_t gc, int offset) {
+void decorate_window(xcb_connection_t *conn, Client *client, xcb_drawable_t drawable,
+                     xcb_gcontext_t gc, int offset_x, int offset_y) {
         i3Font *font = load_font(conn, config.font);
         int decoration_height = font->height + 2 + 2;
-        uint32_t background_color,
-                 text_color,
-                 border_color;
+        struct Colortriple *color;
+        Client *last_focused;
 
         /* Clients without a container (docks) won’t get decorated */
-        if (client->container == NULL)
+        if (client->dock)
                 return;
 
-        if (client->container->currently_focused == client) {
-                /* Distinguish if the window is currently focused… */
-                if (CUR_CELL->currently_focused == client)
-                        background_color = get_colorpixel(conn, "#285577");
-                /* …or if it is the focused window in a not focused container */
-                else background_color = get_colorpixel(conn, "#555555");
-
-                text_color = get_colorpixel(conn, "#ffffff");
-                border_color = get_colorpixel(conn, "#4c7899");
-        } else {
-                background_color = get_colorpixel(conn, "#222222");
-                text_color = get_colorpixel(conn, "#888888");
-                border_color = get_colorpixel(conn, "#333333");
+        last_focused = SLIST_FIRST(&(client->workspace->focus_stack));
+        /* Is the window urgent? */
+        if (client->urgent)
+                color = &(config.client.urgent);
+        else {
+                if (client_is_floating(client)) {
+                        if (last_focused == client)
+                                color = &(config.client.focused);
+                        else color = &(config.client.unfocused);
+                } else {
+                        if (client->container->currently_focused == client) {
+                                /* Distinguish if the window is currently focused… */
+                                if (last_focused == client && c_ws == client->workspace)
+                                        color = &(config.client.focused);
+                                /* …or if it is the focused window in a not focused container */
+                                else color = &(config.client.focused_inactive);
+                        } else color = &(config.client.unfocused);
+                }
         }
 
         /* Our plan is the following:
-           - Draw a rect around the whole client in background_color
+           - Draw a rect around the whole client in color->background
            - Draw two lines in a lighter color
            - Draw the window’s title
          */
+        int mode = container_mode(client->container, true);
 
         /* Draw a rectangle in background color around the window */
-        xcb_change_gc_single(conn, gc, XCB_GC_FOREGROUND, background_color);
+        if (client->borderless && mode == MODE_DEFAULT)
+                xcb_change_gc_single(conn, gc, XCB_GC_FOREGROUND, get_colorpixel(conn, "#000000"));
+        else xcb_change_gc_single(conn, gc, XCB_GC_FOREGROUND, color->background);
 
         /* In stacking mode, we only render the rect for this specific decoration */
-        if (client->container->mode == MODE_STACK) {
-                xcb_rectangle_t rect = {0, offset, client->container->width, offset + decoration_height };
-                xcb_poly_fill_rectangle(conn, drawable, gc, 1, &rect);
-        } else {
+        if (mode == MODE_STACK || mode == MODE_TABBED) {
                 /* We need to use the container’s width because it is the more recent value - when
                    in stacking mode, clients get reconfigured only on demand (the not active client
                    is not reconfigured), so the client’s rect.width would be wrong */
-                xcb_rectangle_t rect = {0, 0, client->container->width, client->rect.height};
+                xcb_rectangle_t rect = {offset_x, offset_y,
+                                        offset_x + client->container->width,
+                                        offset_y + decoration_height };
+                xcb_poly_fill_rectangle(conn, drawable, gc, 1, &rect);
+        } else {
+                xcb_rectangle_t rect = {0, 0, client->rect.width, client->rect.height};
                 xcb_poly_fill_rectangle(conn, drawable, gc, 1, &rect);
 
                 /* Draw the inner background to have a black frame around clients (such as mplayer)
                    which cannot be resized exactly in our frames and therefore are centered */
                 xcb_change_gc_single(conn, client->titlegc, XCB_GC_FOREGROUND, get_colorpixel(conn, "#000000"));
-                xcb_rectangle_t crect = {2, decoration_height,
-                                         client->rect.width - (2 + 2), client->rect.height - 2 - decoration_height};
-                xcb_poly_fill_rectangle(conn, client->frame, client->titlegc, 1, &crect);
+                if (client->titlebar_position == TITLEBAR_OFF && client->borderless) {
+                        xcb_rectangle_t crect = {0, 0, client->rect.width, client->rect.height};
+                        xcb_poly_fill_rectangle(conn, client->frame, client->titlegc, 1, &crect);
+                } else if (client->titlebar_position == TITLEBAR_OFF && !client->borderless) {
+                        xcb_rectangle_t crect = {1, 1, client->rect.width - (1 + 1), client->rect.height - (1 + 1)};
+                        xcb_poly_fill_rectangle(conn, client->frame, client->titlegc, 1, &crect);
+                } else {
+                        xcb_rectangle_t crect = {2, decoration_height,
+                                                 client->rect.width - (2 + 2), client->rect.height - 2 - decoration_height};
+                        xcb_poly_fill_rectangle(conn, client->frame, client->titlegc, 1, &crect);
+                }
         }
 
-        /* Draw the lines */
-        xcb_draw_line(conn, drawable, gc, border_color, 2, offset, client->rect.width, offset);
-        xcb_draw_line(conn, drawable, gc, border_color, 2, offset + font->height + 3,
-                      2 + client->rect.width, offset + font->height + 3);
-
-        /* Draw the font */
-        uint32_t mask = XCB_GC_FOREGROUND | XCB_GC_BACKGROUND | XCB_GC_FONT;
-        uint32_t values[] = { text_color, background_color, font->id };
-        xcb_change_gc(conn, gc, mask, values);
-
-        int real_strlen;
-        char *ucs2_label = convert_utf8_to_ucs2(client->name, &real_strlen);
-        xcb_image_text_16(conn, real_strlen, drawable, gc, 3 /* X */,
-                          offset + font->height /* Y = baseline of font */, (xcb_char2b_t*)ucs2_label);
-        free(ucs2_label);
+        mode = container_mode(client->container, false);
+
+        if (client->titlebar_position != TITLEBAR_OFF) {
+                /* Draw the lines */
+                xcb_draw_line(conn, drawable, gc, color->border, offset_x, offset_y, offset_x + client->rect.width, offset_y);
+                xcb_draw_line(conn, drawable, gc, color->border,
+                              offset_x + 2, /* x */
+                              offset_y + font->height + 3, /* y */
+                              offset_x + client->rect.width - 3, /* to_x */
+                              offset_y + font->height + 3 /* to_y */);
+        }
+
+        /* If the client has a title, we draw it */
+        if (client->name != NULL &&
+            (mode != MODE_DEFAULT || client->titlebar_position != TITLEBAR_OFF)) {
+                /* Draw the font */
+                uint32_t mask = XCB_GC_FOREGROUND | XCB_GC_BACKGROUND | XCB_GC_FONT;
+                uint32_t values[] = { color->text, color->background, font->id };
+                xcb_change_gc(conn, gc, mask, values);
+
+                /* name_len == -1 means this is a legacy application which does not specify _NET_WM_NAME,
+                   and we don’t handle the old window name (COMPOUND_TEXT) but only _NET_WM_NAME, which
+                   is UTF-8 */
+                if (client->name_len == -1)
+                        xcb_image_text_8(conn, strlen(client->name), drawable, gc, offset_x + 3 /* X */,
+                                         offset_y + font->height /* Y = baseline of font */, client->name);
+                else
+                        xcb_image_text_16(conn, client->name_len, drawable, gc, offset_x + 3 /* X */,
+                                          offset_y + font->height /* Y = baseline of font */, (xcb_char2b_t*)client->name);
+        }
 }
 
 /*
  * Pushes the client’s x and y coordinates to X11
  *
  */
-static void reposition_client(xcb_connection_t *conn, Client *client) {
-        LOG("frame needs to be pushed to %dx%d\n", client->rect.x, client->rect.y);
+void reposition_client(xcb_connection_t *conn, Client *client) {
+        Output *output;
+
+        DLOG("frame 0x%08x needs to be pushed to %dx%d\n", client->frame, client->rect.x, client->rect.y);
         /* Note: We can use a pointer to client->x like an array of uint32_ts
            because it is followed by client->y by definition */
         xcb_configure_window(conn, client->frame, XCB_CONFIG_WINDOW_X | XCB_CONFIG_WINDOW_Y, &(client->rect.x));
+
+        if (!client_is_floating(client))
+                return;
+
+        /* If the client is floating, we need to check if we moved it to a different workspace */
+        output = get_output_containing(client->rect.x + (client->rect.width / 2),
+                                       client->rect.y + (client->rect.height / 2));
+        if (client->workspace->output == output)
+                return;
+
+        if (output == NULL) {
+                DLOG("Boundary checking disabled, no output found for (%d, %d)\n", client->rect.x, client->rect.y);
+                return;
+        }
+
+        if (output->current_workspace == NULL) {
+                DLOG("Boundary checking deferred, no current workspace on output\n");
+                client->force_reconfigure = true;
+                return;
+        }
+
+        DLOG("Client is on workspace %p with output %p\n", client->workspace, client->workspace->output);
+        DLOG("but output at %d, %d is %p\n", client->rect.x, client->rect.y, output);
+        floating_assign_to_workspace(client, output->current_workspace);
+
+        set_focus(conn, client, true);
 }
 
 /*
- * Pushes the client’s width/height to X11 and resizes the child window
+ * Pushes the client’s width/height to X11 and resizes the child window. This
+ * function also updates the client’s position, so if you work on tiling clients
+ * only, you can use this function instead of separate calls to reposition_client
+ * and resize_client to reduce flickering.
  *
  */
-static void resize_client(xcb_connection_t *conn, Client *client) {
+void resize_client(xcb_connection_t *conn, Client *client) {
         i3Font *font = load_font(conn, config.font);
 
-        LOG("resizing client to %d x %d\n", client->rect.width, client->rect.height);
-        xcb_configure_window(conn, client->frame,
-                        XCB_CONFIG_WINDOW_WIDTH | XCB_CONFIG_WINDOW_HEIGHT,
-                        &(client->rect.width));
+        DLOG("frame 0x%08x needs to be pushed to %dx%d\n", client->frame, client->rect.x, client->rect.y);
+        DLOG("resizing client 0x%08x to %d x %d\n", client->frame, client->rect.width, client->rect.height);
+        xcb_set_window_rect(conn, client->frame, client->rect);
 
         /* Adjust the position of the child inside its frame.
          * The coordinates of the child are relative to its frame, we
          * add a border of 2 pixel to each value */
-        uint32_t mask = XCB_CONFIG_WINDOW_X |
-                        XCB_CONFIG_WINDOW_Y |
-                        XCB_CONFIG_WINDOW_WIDTH |
-                        XCB_CONFIG_WINDOW_HEIGHT;
         Rect *rect = &(client->child_rect);
-        switch (client->container->mode) {
+        switch (container_mode(client->container, true)) {
                 case MODE_STACK:
+                case MODE_TABBED:
                         rect->x = 2;
                         rect->y = 0;
                         rect->width = client->rect.width - (2 + 2);
                         rect->height = client->rect.height - 2;
                         break;
                 default:
-                        if (client->titlebar_position == TITLEBAR_OFF) {
+                        if (client->titlebar_position == TITLEBAR_OFF && client->borderless) {
                                 rect->x = 0;
                                 rect->y = 0;
                                 rect->width = client->rect.width;
                                 rect->height = client->rect.height;
+                        } else if (client->titlebar_position == TITLEBAR_OFF && !client->borderless) {
+                                rect->x = 1;
+                                rect->y = 1;
+                                rect->width = client->rect.width - 1 - 1;
+                                rect->height = client->rect.height - 1 - 1;
                         } else {
                                 rect->x = 2;
                                 rect->y = font->height + 2 + 2;
@@ -227,10 +284,13 @@ static void resize_client(xcb_connection_t *conn, Client *client) {
                         break;
         }
 
+        rect->width -= (2 * client->border_width);
+        rect->height -= (2 * client->border_width);
+
         /* Obey the ratio, if any */
         if (client->proportional_height != 0 &&
             client->proportional_width != 0) {
-                LOG("proportional height = %d, width = %d\n", client->proportional_height, client->proportional_width);
+                DLOG("proportional height = %d, width = %d\n", client->proportional_height, client->proportional_width);
                 double new_height = rect->height + 1;
                 int new_width = rect->width;
 
@@ -241,37 +301,43 @@ static void resize_client(xcb_connection_t *conn, Client *client) {
                                 new_width--;
                 }
                 /* Center the window */
-                rect->y += (rect->height / 2) - (new_height / 2);
-                rect->x += (rect->width / 2) - (new_width / 2);
+                rect->y += ceil(rect->height / 2) - floor(new_height / 2);
+                rect->x += ceil(rect->width / 2) - floor(new_width / 2);
 
                 rect->height = new_height;
                 rect->width = new_width;
-                LOG("new_height = %f, new_width = %d\n", new_height, new_width);
+                DLOG("new_height = %f, new_width = %d\n", new_height, new_width);
         }
 
-        LOG("child will be at %dx%d with size %dx%d\n", rect->x, rect->y, rect->width, rect->height);
-
-        xcb_configure_window(conn, client->child, mask, &(rect->x));
+        if (client->height_increment > 1) {
+                int old_height = rect->height;
+                rect->height -= (rect->height - client->base_height) % client->height_increment;
+                DLOG("Lost %d pixel due to client's height_increment (%d px, base_height = %d)\n",
+                    old_height - rect->height, client->height_increment, client->base_height);
+        }
 
-        /* After configuring a child window we need to fake a configure_notify_event according
-           to ICCCM 4.2.3. This seems rather broken, especially since X sends exactly the same
-           configure_notify_event automatically according to xtrace. Anyone knows details? */
-        xcb_configure_notify_event_t event;
+        if (client->width_increment > 1) {
+                int old_width = rect->width;
+                rect->width -= (rect->width - client->base_width) % client->width_increment;
+                DLOG("Lost %d pixel due to client's width_increment (%d px, base_width = %d)\n",
+                    old_width - rect->width, client->width_increment, client->base_width);
+        }
 
-        event.event = client->child;
-        event.window = client->child;
-        event.response_type = XCB_CONFIGURE_NOTIFY;
+        DLOG("child will be at %dx%d with size %dx%d\n", rect->x, rect->y, rect->width, rect->height);
 
-        event.x = rect->x;
-        event.y = rect->y;
-        event.width = rect->width;
-        event.height = rect->height;
+        xcb_set_window_rect(conn, client->child, *rect);
 
-        event.border_width = 0;
-        event.above_sibling = XCB_NONE;
-        event.override_redirect = false;
+        /* After configuring a child window we need to fake a configure_notify_event (see ICCCM 4.2.3).
+         * This is necessary to inform the client of its position relative to the root window,
+         * not relative to its frame (as done in the configure_notify_event by the x server). */
+        fake_absolute_configure_notify(conn, client);
 
-        xcb_send_event(conn, false, client->child, XCB_EVENT_MASK_STRUCTURE_NOTIFY, (char*)&event);
+        /* Force redrawing after resizing the window because any now lost
+         * pixels could contain old garbage. */
+        xcb_expose_event_t generated;
+        generated.window = client->frame;
+        generated.count = 0;
+        handle_expose_event(NULL, conn, &generated);
 }
 
 /*
@@ -283,14 +349,14 @@ void render_container(xcb_connection_t *conn, Container *container) {
         Client *client;
         int num_clients = 0, current_client = 0;
 
-        if (container->currently_focused == NULL)
-                return;
-
         CIRCLEQ_FOREACH(client, &(container->clients), clients)
                 num_clients++;
 
         if (container->mode == MODE_DEFAULT) {
-                LOG("got %d clients in this default container.\n", num_clients);
+                int height = (container->height / max(1, num_clients));
+                int rest_pixels = (container->height % max(1, num_clients));
+                DLOG("height per client = %d, rest = %d\n", height, rest_pixels);
+
                 CIRCLEQ_FOREACH(client, &(container->clients), clients) {
                         /* If the client is in fullscreen mode, it does not get reconfigured */
                         if (container->workspace->fullscreen_client == client) {
@@ -298,20 +364,25 @@ void render_container(xcb_connection_t *conn, Container *container) {
                                 continue;
                         }
 
+                        /* If we have some pixels left to distribute, add one
+                         * pixel to each client as long as possible. */
+                        int this_height = height;
+                        if (rest_pixels > 0) {
+                                height++;
+                                rest_pixels--;
+                        }
                         /* Check if we changed client->x or client->y by updating it.
                          * Note the bitwise OR instead of logical OR to force evaluation of both statements */
                         if (client->force_reconfigure |
                             update_if_necessary(&(client->rect.x), container->x) |
                             update_if_necessary(&(client->rect.y), container->y +
-                                        (container->height / num_clients) * current_client))
-                                reposition_client(conn, client);
-
-                        /* TODO: vertical default layout */
-                        if (client->force_reconfigure |
+                                        (container->height / num_clients) * current_client) |
                             update_if_necessary(&(client->rect.width), container->width) |
-                            update_if_necessary(&(client->rect.height), container->height / num_clients))
+                            update_if_necessary(&(client->rect.height), this_height))
                                 resize_client(conn, client);
 
+                        /* TODO: vertical default layout */
+
                         client->force_reconfigure = false;
 
                         current_client++;
@@ -320,17 +391,48 @@ void render_container(xcb_connection_t *conn, Container *container) {
                 i3Font *font = load_font(conn, config.font);
                 int decoration_height = (font->height + 2 + 2);
                 struct Stack_Window *stack_win = &(container->stack_win);
+                /* The size for each tab (width), necessary as a separate variable
+                 * because num_clients gets fixed to 1 in tabbed mode. */
+                int size_each = (num_clients == 0 ? container->width : container->width / num_clients);
+                int stack_lines = num_clients;
 
                 /* Check if we need to remap our stack title window, it gets unmapped when the container
                    is empty in src/handlers.c:unmap_notify() */
-                if (stack_win->rect.height == 0)
+                if (stack_win->rect.height == 0 && num_clients > 1) {
+                        DLOG("remapping stack win\n");
                         xcb_map_window(conn, stack_win->window);
+                } else DLOG("not remapping stackwin, height = %d, num_clients = %d\n",
+                                stack_win->rect.height, num_clients);
+
+                if (container->mode == MODE_TABBED) {
+                        /* By setting num_clients to 1 we force that the stack window will be only one line
+                         * high. The rest of the code is useful in both cases. */
+                        DLOG("tabbed mode, setting num_clients = 1\n");
+                        if (stack_lines > 1)
+                                stack_lines = 1;
+                }
+
+                if (container->stack_limit == STACK_LIMIT_COLS) {
+                        stack_lines = ceil((float)num_clients / container->stack_limit_value);
+                } else if (container->stack_limit == STACK_LIMIT_ROWS) {
+                        stack_lines = min(num_clients, container->stack_limit_value);
+                }
+
+                int height = decoration_height * stack_lines;
+                if (num_clients == 1) {
+                        height = 0;
+                        stack_win->rect.height = 0;
+                        xcb_unmap_window(conn, stack_win->window);
+
+                        DLOG("Just one client, setting height to %d\n", height);
+                }
 
                 /* Check if we need to reconfigure our stack title window */
-                if (update_if_necessary(&(stack_win->rect.x), container->x) |
-                    update_if_necessary(&(stack_win->rect.y), container->y) |
-                    update_if_necessary(&(stack_win->rect.width), container->width) |
-                    update_if_necessary(&(stack_win->rect.height), decoration_height * num_clients)) {
+                if (height > 0 && (
+                     update_if_necessary(&(stack_win->rect.x), container->x) |
+                     update_if_necessary(&(stack_win->rect.y), container->y) |
+                     update_if_necessary(&(stack_win->rect.width), container->width) |
+                     update_if_necessary(&(stack_win->rect.height), height))) {
 
                         /* Configuration can happen in two slightly different ways:
 
@@ -349,8 +451,13 @@ void render_container(xcb_connection_t *conn, Container *container) {
                                         XCB_CONFIG_WINDOW_WIDTH | XCB_CONFIG_WINDOW_HEIGHT |
                                         XCB_CONFIG_WINDOW_STACK_MODE;
 
-                        /* If there is no fullscreen client, we raise the stack window */
-                        if (container->workspace->fullscreen_client != NULL) {
+                        /* Raise the stack window, but keep it below the first floating client
+                         * and below the fullscreen client (if any) */
+                        Client *first_floating = TAILQ_FIRST(&(container->workspace->floating_clients));
+                        if (first_floating != TAILQ_END(&(container->workspace->floating_clients))) {
+                                mask |= XCB_CONFIG_WINDOW_SIBLING;
+                                values[4] = first_floating->frame;
+                        } else if (container->workspace->fullscreen_client != NULL) {
                                 mask |= XCB_CONFIG_WINDOW_SIBLING;
                                 values[4] = container->workspace->fullscreen_client->frame;
                         }
@@ -358,12 +465,24 @@ void render_container(xcb_connection_t *conn, Container *container) {
                         xcb_configure_window(conn, stack_win->window, mask, values);
                 }
 
-                /* Reconfigure the currently focused client, if necessary. It is the only visible one */
-                client = container->currently_focused;
-
-                if (container->workspace->fullscreen_client == NULL) {
-                        uint32_t values[] = { XCB_STACK_MODE_ABOVE };
-                        xcb_configure_window(conn, client->frame, XCB_CONFIG_WINDOW_STACK_MODE, values);
+                /* Prepare the pixmap for usage */
+                if (num_clients > 1)
+                        cached_pixmap_prepare(conn, &(stack_win->pixmap));
+
+                int current_row = 0, current_col = 0;
+                int wrap = 0;
+
+                if (container->stack_limit == STACK_LIMIT_COLS) {
+                        /* wrap stores the number of rows after which we will
+                         * wrap to a new column. */
+                        wrap = ceil((float)num_clients / container->stack_limit_value);
+                } else if (container->stack_limit == STACK_LIMIT_ROWS) {
+                        /* When limiting rows, the wrap variable serves a
+                         * slightly different purpose: it holds the number of
+                         * pixels which each client will get. This is constant
+                         * during the following loop, so it saves us some
+                         * divisions and ceil()ing. */
+                        wrap = (stack_win->rect.width / ceil((float)num_clients / container->stack_limit_value));
                 }
 
                 /* Render the decorations of all clients */
@@ -375,30 +494,91 @@ void render_container(xcb_connection_t *conn, Container *container) {
                         }
 
                         /* Check if we changed client->x or client->y by updating it.
-                         * Note the bitwise OR instead of logical OR to force evaluation of both statements */
+                         * Note the bitwise OR instead of logical OR to force evaluation of all statements */
                         if (client->force_reconfigure |
                             update_if_necessary(&(client->rect.x), container->x) |
-                            update_if_necessary(&(client->rect.y), container->y + (decoration_height * num_clients)))
-                                reposition_client(conn, client);
-
-                        if (client->force_reconfigure |
+                            update_if_necessary(&(client->rect.y), container->y + height) |
                             update_if_necessary(&(client->rect.width), container->width) |
-                            update_if_necessary(&(client->rect.height), container->height - (decoration_height * num_clients)))
+                            update_if_necessary(&(client->rect.height), container->height - height))
                                 resize_client(conn, client);
 
                         client->force_reconfigure = false;
 
-                        decorate_window(conn, client, stack_win->window, stack_win->gc,
-                                        current_client++ * decoration_height);
+                        int offset_x = 0;
+                        int offset_y = 0;
+                        if (container->mode == MODE_STACK ||
+                            (container->mode == MODE_TABBED &&
+                             container->stack_limit == STACK_LIMIT_COLS)) {
+                                if (container->stack_limit == STACK_LIMIT_COLS) {
+                                        offset_x = current_col * (stack_win->rect.width / container->stack_limit_value);
+                                        offset_y = current_row * decoration_height;
+                                        current_row++;
+                                        if ((current_row % wrap) == 0) {
+                                                current_col++;
+                                                current_row = 0;
+                                        }
+                                } else if (container->stack_limit == STACK_LIMIT_ROWS) {
+                                        offset_x = current_col * wrap;
+                                        offset_y = current_row * decoration_height;
+                                        current_row++;
+                                        if ((current_row % container->stack_limit_value) == 0) {
+                                                current_col++;
+                                                current_row = 0;
+                                        }
+                                } else {
+                                        offset_y = current_client * decoration_height;
+                                }
+                                current_client++;
+                        } else if (container->mode == MODE_TABBED) {
+                                if (container->stack_limit == STACK_LIMIT_ROWS) {
+                                        LOG("You limited a tabbed container in its rows. "
+                                            "This makes no sense in tabbing mode.\n");
+                                }
+                                offset_x = current_client++ * size_each;
+                        }
+                        if (stack_win->pixmap.id == XCB_NONE)
+                                continue;
+                        decorate_window(conn, client, stack_win->pixmap.id,
+                                        stack_win->pixmap.gc, offset_x, offset_y);
+                }
+
+                /* Check if we need to fill one column because of an uneven
+                 * amount of windows */
+                if (container->mode == MODE_STACK) {
+                        if (container->stack_limit == STACK_LIMIT_COLS && (current_col % 2) != 0) {
+                                xcb_change_gc_single(conn, stack_win->pixmap.gc, XCB_GC_FOREGROUND, get_colorpixel(conn, "#000000"));
+
+                                int offset_x = current_col * (stack_win->rect.width / container->stack_limit_value);
+                                int offset_y = current_row * decoration_height;
+                                xcb_rectangle_t rect = {offset_x, offset_y,
+                                                        offset_x + container->width,
+                                                        offset_y + decoration_height };
+                                xcb_poly_fill_rectangle(conn, stack_win->pixmap.id, stack_win->pixmap.gc, 1, &rect);
+                        } else if (container->stack_limit == STACK_LIMIT_ROWS && (current_row % 2) != 0) {
+                                xcb_change_gc_single(conn, stack_win->pixmap.gc, XCB_GC_FOREGROUND, get_colorpixel(conn, "#000000"));
+
+                                int offset_x = current_col * wrap;
+                                int offset_y = current_row * decoration_height;
+                                xcb_rectangle_t rect = {offset_x, offset_y,
+                                                        offset_x + container->width,
+                                                        offset_y + decoration_height };
+                                xcb_poly_fill_rectangle(conn, stack_win->pixmap.id, stack_win->pixmap.gc, 1, &rect);
+                        }
                 }
+
+                if (stack_win->pixmap.id == XCB_NONE)
+                        return;
+                xcb_copy_area(conn, stack_win->pixmap.id, stack_win->window, stack_win->pixmap.gc,
+                              0, 0, 0, 0, stack_win->rect.width, stack_win->rect.height);
         }
 }
 
 static void render_bars(xcb_connection_t *conn, Workspace *r_ws, int width, int *height) {
         Client *client;
-        SLIST_FOREACH(client, &(r_ws->dock_clients), dock_clients) {
+        SLIST_FOREACH(client, &(r_ws->output->dock_clients), dock_clients) {
+                DLOG("client is at %d, should be at %d\n", client->rect.y, *height);
                 if (client->force_reconfigure |
-                    update_if_necessary(&(client->rect.x), 0) |
+                    update_if_necessary(&(client->rect.x), r_ws->rect.x) |
                     update_if_necessary(&(client->rect.y), *height))
                         reposition_client(conn, client);
 
@@ -408,132 +588,192 @@ static void render_bars(xcb_connection_t *conn, Workspace *r_ws, int width, int
                         resize_client(conn, client);
 
                 client->force_reconfigure = false;
+                DLOG("desired_height = %d\n", client->desired_height);
                 *height += client->desired_height;
         }
 }
 
 static void render_internal_bar(xcb_connection_t *conn, Workspace *r_ws, int width, int height) {
-        LOG("Rendering internal bar\n");
         i3Font *font = load_font(conn, config.font);
-        i3Screen *screen = r_ws->screen;
+        Output *output = r_ws->output;
         enum { SET_NORMAL = 0, SET_FOCUSED = 1 };
-        uint32_t background_color[2],
-                 text_color[2],
-                 border_color[2],
-                 black;
-        char label[3];
-
-        black = get_colorpixel(conn, "#000000");
-
-        background_color[SET_NORMAL] = get_colorpixel(conn, "#222222");
-        text_color[SET_NORMAL] = get_colorpixel(conn, "#888888");
-        border_color[SET_NORMAL] = get_colorpixel(conn, "#333333");
-
-        background_color[SET_FOCUSED] = get_colorpixel(conn, "#285577");
-        text_color[SET_FOCUSED] = get_colorpixel(conn, "#ffffff");
-        border_color[SET_FOCUSED] = get_colorpixel(conn, "#4c7899");
 
         /* Fill the whole bar in black */
-        xcb_change_gc_single(conn, screen->bargc, XCB_GC_FOREGROUND, black);
+        xcb_change_gc_single(conn, output->bargc, XCB_GC_FOREGROUND, get_colorpixel(conn, "#000000"));
         xcb_rectangle_t rect = {0, 0, width, height};
-        xcb_poly_fill_rectangle(conn, screen->bar, screen->bargc, 1, &rect);
+        xcb_poly_fill_rectangle(conn, output->bar, output->bargc, 1, &rect);
 
         /* Set font */
-        xcb_change_gc_single(conn, screen->bargc, XCB_GC_FONT, font->id);
+        xcb_change_gc_single(conn, output->bargc, XCB_GC_FONT, font->id);
 
         int drawn = 0;
-        for (int c = 0; c < 10; c++) {
-                if (workspaces[c].screen == screen) {
-                        int set = (screen->current_workspace == c ? SET_FOCUSED : SET_NORMAL);
-
-                        xcb_draw_rect(conn, screen->bar, screen->bargc, border_color[set],
-                                      drawn * height, 1, height - 2, height - 2);
-                        xcb_draw_rect(conn, screen->bar, screen->bargc, background_color[set],
-                                      drawn * height + 1, 2, height - 4, height - 4);
-
-                        snprintf(label, sizeof(label), "%d", c+1);
-                        xcb_change_gc_single(conn, screen->bargc, XCB_GC_FOREGROUND, text_color[set]);
-                        xcb_change_gc_single(conn, screen->bargc, XCB_GC_BACKGROUND, background_color[set]);
-                        xcb_image_text_8(conn, strlen(label), screen->bar, screen->bargc, drawn * height + 5 /* X */,
-                                                        font->height + 1 /* Y = baseline of font */, label);
-                        drawn++;
-                }
+        Workspace *ws;
+        TAILQ_FOREACH(ws, workspaces, workspaces) {
+                if (ws->output != output)
+                        continue;
+
+                struct Colortriple *color;
+
+                if (output->current_workspace == ws)
+                        color = &(config.bar.focused);
+                else if (ws->urgent)
+                        color = &(config.bar.urgent);
+                else color = &(config.bar.unfocused);
+
+                /* Draw the outer rect */
+                xcb_draw_rect(conn, output->bar, output->bargc, color->border,
+                              drawn,              /* x */
+                              1,                  /* y */
+                              ws->text_width + 5 + 5, /* width = text width + 5 px left + 5px right */
+                              height - 2          /* height = max. height - 1 px upper and 1 px bottom border */);
+
+                /* Draw the background of this rect */
+                xcb_draw_rect(conn, output->bar, output->bargc, color->background,
+                              drawn + 1,
+                              2,
+                              ws->text_width + 4 + 4,
+                              height - 4);
+
+                xcb_change_gc_single(conn, output->bargc, XCB_GC_FOREGROUND, color->text);
+                xcb_change_gc_single(conn, output->bargc, XCB_GC_BACKGROUND, color->background);
+                xcb_image_text_16(conn, ws->name_len, output->bar, output->bargc, drawn + 5 /* X */,
+                                  font->height + 1 /* Y = baseline of font */,
+                                  (xcb_char2b_t*)ws->name);
+                drawn += ws->text_width + 12;
         }
+}
 
-        LOG("done rendering internal\n");
+/*
+ * Modifies the event mask of all clients on the given workspace to either ignore or to handle
+ * enter notifies. It is handy to ignore notifies because they will be sent when a window is mapped
+ * under the cursor, thus when the user didn’t enter the window actively at all.
+ *
+ */
+void ignore_enter_notify_forall(xcb_connection_t *conn, Workspace *workspace, bool ignore_enter_notify) {
+        Client *client;
+        uint32_t values[1];
+
+        FOR_TABLE(workspace) {
+                if (workspace->table[cols][rows] == NULL)
+                        continue;
+
+                CIRCLEQ_FOREACH(client, &(workspace->table[cols][rows]->clients), clients) {
+                        /* Change event mask for the decorations */
+                        values[0] = FRAME_EVENT_MASK;
+                        if (ignore_enter_notify)
+                                values[0] &= ~(XCB_EVENT_MASK_ENTER_WINDOW);
+                        xcb_change_window_attributes(conn, client->frame, XCB_CW_EVENT_MASK, values);
+
+                        /* Change event mask for the child itself */
+                        values[0] = CHILD_EVENT_MASK;
+                        if (ignore_enter_notify)
+                                values[0] &= ~(XCB_EVENT_MASK_ENTER_WINDOW);
+                        xcb_change_window_attributes(conn, client->child, XCB_CW_EVENT_MASK, values);
+                }
+        }
 }
 
-void render_layout(xcb_connection_t *conn) {
-        i3Screen *screen;
+/*
+ * Renders the given workspace on the given screen
+ *
+ */
+void render_workspace(xcb_connection_t *conn, Output *output, Workspace *r_ws) {
         i3Font *font = load_font(conn, config.font);
+        int width = r_ws->rect.width;
+        int height = r_ws->rect.height;
 
-        TAILQ_FOREACH(screen, virtual_screens, screens) {
-                /* r_ws (rendering workspace) is just a shortcut to the Workspace being currently rendered */
-                Workspace *r_ws = &(workspaces[screen->current_workspace]);
+        /* Reserve space for dock clients */
+        Client *client;
+        SLIST_FOREACH(client, &(output->dock_clients), dock_clients)
+                height -= client->desired_height;
 
-                LOG("Rendering screen %d\n", screen->num);
+        /* Space for the internal bar */
+        if (!config.disable_workspace_bar)
+                height -= (font->height + 6);
 
-                int width = r_ws->rect.width;
-                int height = r_ws->rect.height;
+        int xoffset[r_ws->rows];
+        int yoffset[r_ws->cols];
+        /* Initialize offsets */
+        for (int cols = 0; cols < r_ws->cols; cols++)
+                yoffset[cols] = r_ws->rect.y;
+        for (int rows = 0; rows < r_ws->rows; rows++)
+                xoffset[rows] = r_ws->rect.x;
+
+        ignore_enter_notify_forall(conn, r_ws, true);
+
+        /* Go through the whole table and render what’s necessary */
+        FOR_TABLE(r_ws) {
+                Container *container = r_ws->table[cols][rows];
+                if (container == NULL)
+                        continue;
+                int single_width = -1, single_height = -1;
+                /* Update position of the container */
+                container->row = rows;
+                container->col = cols;
+                container->x = xoffset[rows];
+                container->y = yoffset[cols];
+                container->width = 0;
+
+                for (int c = 0; c < container->colspan; c++) {
+                        if (r_ws->width_factor[cols+c] == 0)
+                                container->width += (width / r_ws->cols);
+                        else container->width += get_unoccupied_x(r_ws) * r_ws->width_factor[cols+c];
+
+                        if (single_width == -1)
+                                single_width = container->width;
+                }
 
-                /* Reserve space for dock clients */
-                Client *client;
-                SLIST_FOREACH(client, &(r_ws->dock_clients), dock_clients)
-                        height -= client->desired_height;
+                DLOG("height is %d\n", height);
 
-                /* Space for the internal bar */
-                height -= (font->height + 6);
+                container->height = 0;
 
-                LOG("got %d rows and %d cols\n", r_ws->rows, r_ws->cols);
-
-                int xoffset[r_ws->rows];
-                int yoffset[r_ws->cols];
-                /* Initialize offsets */
-                for (int cols = 0; cols < r_ws->cols; cols++)
-                        yoffset[cols] = r_ws->rect.y;
-                for (int rows = 0; rows < r_ws->rows; rows++)
-                        xoffset[rows] = r_ws->rect.x;
-
-                dump_table(conn, r_ws);
-                /* Go through the whole table and render what’s necessary */
-                for (int cols = 0; cols < r_ws->cols; cols++)
-                        for (int rows = 0; rows < r_ws->rows; rows++) {
-                                Container *container = r_ws->table[cols][rows];
-                                int single_width, single_height;
-                                LOG("\n");
-                                LOG("========\n");
-                                LOG("container has %d colspan, %d rowspan\n",
-                                                container->colspan, container->rowspan);
-                                LOG("container at %d, %d\n", xoffset[rows], yoffset[cols]);
-                                /* Update position of the container */
-                                container->row = rows;
-                                container->col = cols;
-                                container->x = xoffset[rows];
-                                container->y = yoffset[cols];
-
-                                if (container->width_factor == 0)
-                                        container->width = (width / r_ws->cols);
-                                else container->width = get_unoccupied_x(r_ws, rows) * container->width_factor;
-                                single_width = container->width;
-                                container->width *= container->colspan;
+                for (int c = 0; c < container->rowspan; c++) {
+                        if (r_ws->height_factor[rows+c] == 0)
+                                container->height += (height / r_ws->rows);
+                        else container->height += get_unoccupied_y(r_ws) * r_ws->height_factor[rows+c];
 
-                                if (container->height_factor == 0)
-                                        container->height = (height / r_ws->rows);
-                                else container->height = get_unoccupied_y(r_ws, cols) * container->height_factor;
+                        if (single_height == -1)
                                 single_height = container->height;
-                                container->height *= container->rowspan;
+                }
 
-                                /* Render the container if it is not empty */
-                                render_container(conn, container);
+                /* Render the container if it is not empty */
+                render_container(conn, container);
 
-                                xoffset[rows] += single_width;
-                                yoffset[cols] += single_height;
-                                LOG("==========\n");
-                        }
+                xoffset[rows] += single_width;
+                yoffset[cols] += single_height;
+        }
+
+        /* Reposition all floating clients with force_reconfigure == true */
+        TAILQ_FOREACH(client, &(r_ws->floating_clients), floating_clients) {
+                if (!client->force_reconfigure)
+                        continue;
 
-                render_bars(conn, r_ws, width, &height);
-                render_internal_bar(conn, r_ws, width, 18);
+                client->force_reconfigure = false;
+                reposition_client(conn, client);
+                resize_client(conn, client);
         }
 
+        ignore_enter_notify_forall(conn, r_ws, false);
+
+        render_bars(conn, r_ws, width, &height);
+        if (!config.disable_workspace_bar)
+                render_internal_bar(conn, r_ws, width, font->height + 6);
+}
+
+/*
+ * Renders the whole layout, that is: Go through each screen, each workspace, each container
+ * and render each client. This also renders the bars.
+ *
+ * If you don’t need to render *everything*, you should call render_container on the container
+ * you want to refresh.
+ *
+ */
+void render_layout(xcb_connection_t *conn) {
+        Output *output;
+
+        TAILQ_FOREACH(output, &outputs, outputs)
+                if (output->current_workspace != NULL)
+                        render_workspace(conn, output, output->current_workspace);
+
         xcb_flush(conn);
 }