X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Frandr.c;h=d1683e9f925ea7c3c504801be73ff560a9141418;hb=d25e77ce7597bf0736c610a04185c8c27694c890;hp=7531ecf2cd9facebcd4b3d1a189ba819cbf06e9d;hpb=ee76b2ebf619ed9c7c44d00ed790ae818f879a4b;p=i3%2Fi3

diff --git a/src/randr.c b/src/randr.c
index 7531ecf2..d1683e9f 100644
--- a/src/randr.c
+++ b/src/randr.c
@@ -1,46 +1,27 @@
 /*
- * vim:ts=8:expandtab
+ * vim:ts=4:sw=4:expandtab
  *
  * i3 - an improved dynamic tiling window manager
- *
- * © 2009-2010 Michael Stapelberg and contributors
- *
- * See file LICENSE for license information.
+ * © 2009-2011 Michael Stapelberg and contributors (see also: LICENSE)
  *
  * For more information on RandR, please see the X.org RandR specification at
  * http://cgit.freedesktop.org/xorg/proto/randrproto/tree/randrproto.txt
  * (take your time to read it completely, it answers all questions).
  *
  */
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdbool.h>
-#include <assert.h>
-#include <time.h>
-#include <unistd.h>
+#include "all.h"
 
-#include <xcb/xcb.h>
+#include <time.h>
 #include <xcb/randr.h>
 
-#include "queue.h"
-#include "i3.h"
-#include "data.h"
-#include "table.h"
-#include "util.h"
-#include "layout.h"
-#include "xcb.h"
-#include "config.h"
-#include "workspace.h"
-#include "log.h"
-#include "ewmh.h"
-
 /* While a clean namespace is usually a pretty good thing, we really need
  * to use shorter names than the whole xcb_randr_* default names. */
 typedef xcb_randr_get_crtc_info_reply_t crtc_info;
-typedef xcb_randr_mode_info_t mode_info;
 typedef xcb_randr_get_screen_resources_current_reply_t resources_reply;
 
+/* Pointer to the result of the query for primary output */
+xcb_randr_get_output_primary_reply_t *primary;
+
 /* Stores all outputs available in your current session. */
 struct outputs_head outputs = TAILQ_HEAD_INITIALIZER(outputs);
 
@@ -53,12 +34,12 @@ static bool randr_disabled = false;
  *
  */
 static Output *get_output_by_id(xcb_randr_output_t id) {
-        Output *output;
-        TAILQ_FOREACH(output, &outputs, outputs)
-                if (output->id == id)
-                        return output;
+    Output *output;
+    TAILQ_FOREACH(output, &outputs, outputs)
+        if (output->id == id)
+            return output;
 
-        return NULL;
+    return NULL;
 }
 
 /*
@@ -66,13 +47,13 @@ static Output *get_output_by_id(xcb_randr_output_t id) {
  *
  */
 Output *get_output_by_name(const char *name) {
-        Output *output;
-        TAILQ_FOREACH(output, &outputs, outputs)
-                if (output->active &&
-                    strcasecmp(output->name, name) == 0)
-                        return output;
+    Output *output;
+    TAILQ_FOREACH(output, &outputs, outputs)
+        if (output->active &&
+            strcasecmp(output->name, name) == 0)
+            return output;
 
-        return NULL;
+    return NULL;
 }
 
 /*
@@ -80,13 +61,13 @@ Output *get_output_by_name(const char *name) {
  *
  */
 Output *get_first_output() {
-        Output *output;
+    Output *output;
 
-        TAILQ_FOREACH(output, &outputs, outputs)
-                if (output->active)
-                        return output;
+    TAILQ_FOREACH(output, &outputs, outputs)
+        if (output->active)
+            return output;
 
-        return NULL;
+    return NULL;
 }
 
 /*
@@ -95,18 +76,18 @@ Output *get_first_output() {
  *
  */
 Output *get_output_containing(int x, int y) {
-        Output *output;
-        TAILQ_FOREACH(output, &outputs, outputs) {
-                if (!output->active)
-                        continue;
-                DLOG("comparing x=%d y=%d with x=%d and y=%d width %d height %d\n",
-                                x, y, output->rect.x, output->rect.y, output->rect.width, output->rect.height);
-                if (x >= output->rect.x && x < (output->rect.x + output->rect.width) &&
-                    y >= output->rect.y && y < (output->rect.y + output->rect.height))
-                        return output;
-        }
-
-        return NULL;
+    Output *output;
+    TAILQ_FOREACH(output, &outputs, outputs) {
+        if (!output->active)
+            continue;
+        DLOG("comparing x=%d y=%d with x=%d and y=%d width %d height %d\n",
+                        x, y, output->rect.x, output->rect.y, output->rect.width, output->rect.height);
+        if (x >= output->rect.x && x < (output->rect.x + output->rect.width) &&
+            y >= output->rect.y && y < (output->rect.y + output->rect.height))
+            return output;
+    }
+
+    return NULL;
 }
 
 /*
@@ -118,78 +99,89 @@ Output *get_output_containing(int x, int y) {
  *
  */
 Output *get_output_most(direction_t direction, Output *current) {
-        Output *output, *candidate = NULL;
-        int position = 0;
-        TAILQ_FOREACH(output, &outputs, outputs) {
-                if (!output->active)
-                        continue;
-
-                /* Repeated calls of WIN determine the winner of the comparison */
-                #define WIN(variable, condition) \
-                        if (variable condition) { \
-                                candidate = output; \
-                                position = variable; \
-                        } \
-                        break;
-
-                if (((direction == D_UP) || (direction == D_DOWN)) &&
-                    (current->rect.x != output->rect.x))
-                        continue;
-
-                if (((direction == D_LEFT) || (direction == D_RIGHT)) &&
-                    (current->rect.y != output->rect.y))
-                        continue;
-
-                switch (direction) {
-                        case D_UP:
-                                WIN(output->rect.y, <= position);
-                        case D_DOWN:
-                                WIN(output->rect.y, >= position);
-                        case D_LEFT:
-                                WIN(output->rect.x, <= position);
-                        case D_RIGHT:
-                                WIN(output->rect.x, >= position);
-                }
+    Output *output, *candidate = NULL;
+    int position = 0;
+    TAILQ_FOREACH(output, &outputs, outputs) {
+        if (!output->active)
+            continue;
+
+        /* Repeated calls of WIN determine the winner of the comparison */
+        #define WIN(variable, condition) \
+            if (variable condition) { \
+                candidate = output; \
+                position = variable; \
+            } \
+            break;
+
+        if (((direction == D_UP) || (direction == D_DOWN)) &&
+            (current->rect.x != output->rect.x))
+            continue;
+
+        if (((direction == D_LEFT) || (direction == D_RIGHT)) &&
+            (current->rect.y != output->rect.y))
+            continue;
+
+        switch (direction) {
+            case D_UP:
+                WIN(output->rect.y, <= position);
+            case D_DOWN:
+                WIN(output->rect.y, >= position);
+            case D_LEFT:
+                WIN(output->rect.x, <= position);
+            case D_RIGHT:
+                WIN(output->rect.x, >= position);
         }
+    }
 
-        assert(candidate != NULL);
+    assert(candidate != NULL);
 
-        return candidate;
+    return candidate;
 }
 
 /*
- * Initializes the specified output, assigning the specified workspace to it.
+ * Gets the output which is the next one in the given direction.
  *
  */
-void initialize_output(xcb_connection_t *conn, Output *output, Workspace *workspace) {
-        i3Font *font = load_font(conn, config.font);
-
-        workspace->output = output;
-        output->current_workspace = workspace;
-
-        /* Copy rect for the workspace */
-        memcpy(&(workspace->rect), &(output->rect), sizeof(Rect));
-
-        /* Map clients on the workspace, if any */
-        workspace_map_clients(conn, workspace);
-
-        /* Create a bar window on each output */
-        if (!config.disable_workspace_bar) {
-                Rect bar_rect = {output->rect.x,
-                                 output->rect.y + output->rect.height - (font->height + 6),
-                                 output->rect.x + output->rect.width,
-                                 font->height + 6};
-                uint32_t mask = XCB_CW_OVERRIDE_REDIRECT | XCB_CW_EVENT_MASK;
-                uint32_t values[] = {1, XCB_EVENT_MASK_EXPOSURE | XCB_EVENT_MASK_BUTTON_PRESS};
-                output->bar = create_window(conn, bar_rect, XCB_WINDOW_CLASS_INPUT_OUTPUT, XCB_CURSOR_LEFT_PTR, true, mask, values);
-                output->bargc = xcb_generate_id(conn);
-                xcb_create_gc(conn, output->bargc, output->bar, 0, 0);
+Output *get_output_next(direction_t direction, Output *current) {
+    Output *output, *candidate = NULL;
+
+    TAILQ_FOREACH(output, &outputs, outputs) {
+        if (!output->active)
+            continue;
+
+        if (((direction == D_UP) || (direction == D_DOWN)) &&
+            (current->rect.x != output->rect.x))
+            continue;
+
+        if (((direction == D_LEFT) || (direction == D_RIGHT)) &&
+            (current->rect.y != output->rect.y))
+            continue;
+
+        switch (direction) {
+            case D_UP:
+                if (output->rect.y < current->rect.y &&
+                    (!candidate || output->rect.y < candidate->rect.y))
+                    candidate = output;
+                break;
+            case D_DOWN:
+                if (output->rect.y > current->rect.y &&
+                    (!candidate || output->rect.y > candidate->rect.y))
+                    candidate = output;
+                break;
+            case D_LEFT:
+                if (output->rect.x < current->rect.x &&
+                    (!candidate || output->rect.x > candidate->rect.x))
+                    candidate = output;
+                break;
+            case D_RIGHT:
+                if (output->rect.x > current->rect.x &&
+                    (!candidate || output->rect.x < candidate->rect.x))
+                    candidate = output;
+                break;
         }
+    }
 
-        SLIST_INIT(&(output->dock_clients));
-
-        DLOG("initialized output at (%d, %d) with %d x %d\n",
-                        output->rect.x, output->rect.y, output->rect.width, output->rect.height);
+    return candidate;
 }
 
 /*
@@ -198,22 +190,313 @@ void initialize_output(xcb_connection_t *conn, Output *output, Workspace *worksp
  *
  */
 void disable_randr(xcb_connection_t *conn) {
-        xcb_screen_t *root_screen = xcb_setup_roots_iterator(xcb_get_setup(conn)).data;
+    DLOG("RandR extension unusable, disabling.\n");
+
+    Output *s = scalloc(sizeof(Output));
+
+    s->active = true;
+    s->rect.x = 0;
+    s->rect.y = 0;
+    s->rect.width = root_screen->width_in_pixels;
+    s->rect.height = root_screen->height_in_pixels;
+    s->name = "xroot-0";
+    output_init_con(s);
+    init_ws_for_output(s, output_get_content(s->con));
+
+    TAILQ_INSERT_TAIL(&outputs, s, outputs);
+
+    randr_disabled = true;
+}
+
+/*
+ * Initializes a CT_OUTPUT Con (searches existing ones from inplace restart
+ * before) to use for the given Output.
+ *
+ */
+void output_init_con(Output *output) {
+    Con *con = NULL, *current;
+    bool reused = false;
+
+    DLOG("init_con for output %s\n", output->name);
+
+    /* Search for a Con with that name directly below the root node. There
+     * might be one from a restored layout. */
+    TAILQ_FOREACH(current, &(croot->nodes_head), nodes) {
+        if (strcmp(current->name, output->name) != 0)
+            continue;
+
+        con = current;
+        reused = true;
+        DLOG("Using existing con %p / %s\n", con, con->name);
+        break;
+    }
+
+    if (con == NULL) {
+        con = con_new(croot, NULL);
+        FREE(con->name);
+        con->name = sstrdup(output->name);
+        con->type = CT_OUTPUT;
+        con->layout = L_OUTPUT;
+        con_fix_percent(croot);
+    }
+    con->rect = output->rect;
+    output->con = con;
+
+    char *name;
+    sasprintf(&name, "[i3 con] output %s", con->name);
+    x_set_name(con, name);
+    FREE(name);
+
+    if (reused) {
+        DLOG("Not adding workspace, this was a reused con\n");
+        return;
+    }
+
+    DLOG("Changing layout, adding top/bottom dockarea\n");
+    Con *topdock = con_new(NULL, NULL);
+    topdock->type = CT_DOCKAREA;
+    topdock->layout = L_DOCKAREA;
+    topdock->orientation = VERT;
+    /* this container swallows dock clients */
+    Match *match = scalloc(sizeof(Match));
+    match_init(match);
+    match->dock = M_DOCK_TOP;
+    match->insert_where = M_BELOW;
+    TAILQ_INSERT_TAIL(&(topdock->swallow_head), match, matches);
+
+    FREE(topdock->name);
+    topdock->name = sstrdup("topdock");
+
+    sasprintf(&name, "[i3 con] top dockarea %s", con->name);
+    x_set_name(topdock, name);
+    FREE(name);
+    DLOG("attaching\n");
+    con_attach(topdock, con, false);
+
+    /* content container */
+
+    DLOG("adding main content container\n");
+    Con *content = con_new(NULL, NULL);
+    content->type = CT_CON;
+    FREE(content->name);
+    content->name = sstrdup("content");
+
+    sasprintf(&name, "[i3 con] content %s", con->name);
+    x_set_name(content, name);
+    FREE(name);
+    con_attach(content, con, false);
+
+    /* bottom dock container */
+    Con *bottomdock = con_new(NULL, NULL);
+    bottomdock->type = CT_DOCKAREA;
+    bottomdock->layout = L_DOCKAREA;
+    bottomdock->orientation = VERT;
+    /* this container swallows dock clients */
+    match = scalloc(sizeof(Match));
+    match_init(match);
+    match->dock = M_DOCK_BOTTOM;
+    match->insert_where = M_BELOW;
+    TAILQ_INSERT_TAIL(&(bottomdock->swallow_head), match, matches);
+
+    FREE(bottomdock->name);
+    bottomdock->name = sstrdup("bottomdock");
+
+    sasprintf(&name, "[i3 con] bottom dockarea %s", con->name);
+    x_set_name(bottomdock, name);
+    FREE(name);
+    DLOG("attaching\n");
+    con_attach(bottomdock, con, false);
+}
+
+/*
+ * Initializes at least one workspace for this output, trying the following
+ * steps until there is at least one workspace:
+ *
+ * • Move existing workspaces, which are assigned to be on the given output, to
+ *   the output.
+ * • Create the first assigned workspace for this output.
+ * • Create the first unused workspace.
+ *
+ */
+void init_ws_for_output(Output *output, Con *content) {
+    char *name;
+
+    /* go through all assignments and move the existing workspaces to this output */
+    struct Workspace_Assignment *assignment;
+    TAILQ_FOREACH(assignment, &ws_assignments, ws_assignments) {
+        if (strcmp(assignment->output, output->name) != 0)
+            continue;
+
+        /* check if this workspace actually exists */
+        Con *workspace = NULL, *out;
+        TAILQ_FOREACH(out, &(croot->nodes_head), nodes)
+            GREP_FIRST(workspace, output_get_content(out),
+                       !strcasecmp(child->name, assignment->name));
+        if (workspace == NULL)
+            continue;
+
+        /* check that this workspace is not already attached (that means the
+         * user configured this assignment twice) */
+        Con *workspace_out = con_get_output(workspace);
+        if (workspace_out == output->con) {
+            LOG("Workspace \"%s\" assigned to output \"%s\", but it is already "
+                "there. Do you have two assignment directives for the same "
+                "workspace in your configuration file?\n",
+                workspace->name, output->name);
+            continue;
+        }
+
+        /* if so, move it over */
+        LOG("Moving workspace \"%s\" from output \"%s\" to \"%s\" due to assignment\n",
+            workspace->name, workspace_out->name, output->name);
+
+        /* if the workspace is currently visible on that output, we need to
+         * switch to a different workspace - otherwise the output would end up
+         * with no active workspace */
+        bool visible = workspace_is_visible(workspace);
+        Con *previous = NULL;
+        if (visible && (previous = TAILQ_NEXT(workspace, focused))) {
+            LOG("Switching to previously used workspace \"%s\" on output \"%s\"\n",
+                previous->name, workspace_out->name);
+            workspace_show(previous);
+        }
+
+        con_detach(workspace);
+        con_attach(workspace, content, false);
+
+        /* In case the workspace we just moved was visible but there was no
+         * other workspace to switch to, we need to initialize the source
+         * output aswell */
+        if (visible && previous == NULL) {
+            LOG("There is no workspace left on \"%s\", re-initializing\n",
+                workspace_out->name);
+            init_ws_for_output(get_output_by_name(workspace_out->name),
+                               output_get_content(workspace_out));
+            DLOG("Done re-initializing, continuing with \"%s\"\n", output->name);
+        }
+    }
+
+    /* if a workspace exists, we are done now */
+    if (!TAILQ_EMPTY(&(content->nodes_head))) {
+        /* ensure that one of the workspaces is actually visible (in fullscreen
+         * mode), if they were invisible before, this might not be the case. */
+        Con *visible = NULL;
+        GREP_FIRST(visible, content, child->fullscreen_mode == CF_OUTPUT);
+        if (!visible) {
+            visible = TAILQ_FIRST(&(content->nodes_head));
+            focused = content;
+            workspace_show(visible);
+        }
+        return;
+    }
+
+    /* otherwise, we create the first assigned ws for this output */
+    TAILQ_FOREACH(assignment, &ws_assignments, ws_assignments) {
+        if (strcmp(assignment->output, output->name) != 0)
+            continue;
+
+        LOG("Initializing first assigned workspace \"%s\" for output \"%s\"\n",
+            assignment->name, assignment->output);
+        focused = content;
+        workspace_show_by_name(assignment->name);
+        return;
+    }
+
+    /* if there is still no workspace, we create the first free workspace */
+    DLOG("Now adding a workspace\n");
+
+    /* add a workspace to this output */
+    Con *out, *current;
+    bool exists = true;
+    Con *ws = con_new(NULL, NULL);
+    ws->type = CT_WORKSPACE;
+
+    /* try the configured workspace bindings first to find a free name */
+    Binding *bind;
+    TAILQ_FOREACH(bind, bindings, bindings) {
+        DLOG("binding with command %s\n", bind->command);
+        if (strlen(bind->command) < strlen("workspace ") ||
+            strncasecmp(bind->command, "workspace", strlen("workspace")) != 0)
+            continue;
+        DLOG("relevant command = %s\n", bind->command);
+        char *target = bind->command + strlen("workspace ");
+        /* We check if this is the workspace next/prev/back_and_forth command.
+         * Beware: The workspace names "next", "prev" and "back_and_forth" are
+         * OK, so we check before stripping the double quotes */
+        if (strncasecmp(target, "next", strlen("next")) == 0 ||
+            strncasecmp(target, "prev", strlen("prev")) == 0 ||
+            strncasecmp(target, "back_and_forth", strlen("back_and_forth")) == 0)
+            continue;
+        if (*target == '"')
+            target++;
+        FREE(ws->name);
+        ws->name = strdup(target);
+        if (ws->name[strlen(ws->name)-1] == '"')
+            ws->name[strlen(ws->name)-1] = '\0';
+        DLOG("trying name *%s*\n", ws->name);
+
+        current = NULL;
+        TAILQ_FOREACH(out, &(croot->nodes_head), nodes)
+            GREP_FIRST(current, output_get_content(out), !strcasecmp(child->name, ws->name));
+
+        exists = (current != NULL);
+        if (!exists) {
+            /* Set ->num to the number of the workspace, if the name actually
+             * is a number or starts with a number */
+            char *endptr = NULL;
+            long parsed_num = strtol(ws->name, &endptr, 10);
+            if (parsed_num == LONG_MIN ||
+                parsed_num == LONG_MAX ||
+                parsed_num < 0 ||
+                endptr == ws->name)
+                ws->num = -1;
+            else ws->num = parsed_num;
+            LOG("Used number %d for workspace with name %s\n", ws->num, ws->name);
+
+            break;
+        }
+    }
 
-        DLOG("RandR extension unusable, disabling.\n");
+    if (exists) {
+        /* get the next unused workspace number */
+        DLOG("Getting next unused workspace by number\n");
+        int c = 0;
+        while (exists) {
+            c++;
 
-        Output *s = scalloc(sizeof(Output));
+            FREE(ws->name);
+            sasprintf(&(ws->name), "%d", c);
 
-        s->active = true;
-        s->rect.x = 0;
-        s->rect.y = 0;
-        s->rect.width = root_screen->width_in_pixels;
-        s->rect.height = root_screen->height_in_pixels;
-        s->name = "xroot-0";
+            current = NULL;
+            TAILQ_FOREACH(out, &(croot->nodes_head), nodes)
+                GREP_FIRST(current, output_get_content(out), !strcasecmp(child->name, ws->name));
+            exists = (current != NULL);
+
+            DLOG("result for ws %s / %d: exists = %d\n", ws->name, c, exists);
+        }
+        ws->num = c;
+    }
+    con_attach(ws, content, false);
+
+    sasprintf(&name, "[i3 con] workspace %s", ws->name);
+    x_set_name(ws, name);
+    free(name);
+
+    ws->fullscreen_mode = CF_OUTPUT;
+
+    /* If default_orientation is set to NO_ORIENTATION we determine
+     * orientation depending on output resolution. */
+    if (config.default_orientation == NO_ORIENTATION) {
+        ws->orientation = (output->rect.height > output->rect.width) ? VERT : HORIZ;
+        DLOG("Auto orientation. Workspace size set to (%d,%d), setting orientation to %d.\n",
+             output->rect.width, output->rect.height, ws->orientation);
+    } else {
+        ws->orientation = config.default_orientation;
+    }
 
-        TAILQ_INSERT_TAIL(&outputs, s, outputs);
 
-        randr_disabled = true;
+    /* TODO: Set focus in main.c */
+    con_focus(ws);
 }
 
 /*
@@ -228,41 +511,35 @@ void disable_randr(xcb_connection_t *conn) {
  *
  */
 static void output_change_mode(xcb_connection_t *conn, Output *output) {
-        i3Font *font = load_font(conn, config.font);
-        Workspace *ws;
-        Client *client;
-
-        DLOG("Output mode changed, reconfiguring bar, updating workspaces\n");
-        Rect bar_rect = {output->rect.x,
-                         output->rect.y + output->rect.height - (font->height + 6),
-                         output->rect.x + output->rect.width,
-                         font->height + 6};
-
-        xcb_set_window_rect(conn, output->bar, bar_rect);
-
-        /* go through all workspaces and set force_reconfigure */
-        TAILQ_FOREACH(ws, workspaces, workspaces) {
-                if (ws->output != output)
-                        continue;
-
-                /* Update dimensions from output */
-                memcpy(&(ws->rect), &(ws->output->rect), sizeof(Rect));
-
-                SLIST_FOREACH(client, &(ws->focus_stack), focus_clients)
-                        client->force_reconfigure = true;
-
-                /* Update the dimensions of a fullscreen client, if any */
-                if (ws->fullscreen_client != NULL) {
-                        DLOG("Updating fullscreen client size\n");
-                        client = ws->fullscreen_client;
-                        Rect r = ws->rect;
-                        xcb_set_window_rect(conn, client->frame, r);
-
-                        r.x = 0;
-                        r.y = 0;
-                        xcb_set_window_rect(conn, client->child, r);
-                }
+    //i3Font *font = load_font(conn, config.font);
+
+    DLOG("Output mode changed, updating rect\n");
+    assert(output->con != NULL);
+    output->con->rect = output->rect;
+
+    Con *content, *workspace, *child;
+
+    /* Point content to the container of the workspaces */
+    content = output_get_content(output->con);
+
+    /* If default_orientation is NO_ORIENTATION, we change the orientation of
+     * the workspaces and their childs depending on output resolution. This is
+     * only done for workspaces with maximum one child. */
+    if (config.default_orientation == NO_ORIENTATION) {
+        TAILQ_FOREACH(workspace, &(content->nodes_head), nodes) {
+            /* Workspaces with more than one child are left untouched because
+             * we do not want to change an existing layout. */
+            if (con_num_children(workspace) > 1)
+                continue;
+
+            workspace->orientation = (output->rect.height > output->rect.width) ? VERT : HORIZ;
+            DLOG("Setting workspace [%d,%s]'s orientation to %d.\n", workspace->num, workspace->name, workspace->orientation);
+            if ((child = TAILQ_FIRST(&(workspace->nodes_head)))) {
+                child->orientation = workspace->orientation;
+                DLOG("Setting child [%d,%s]'s orientation to %d.\n", child->num, child->name, child->orientation);
+            }
         }
+    }
 }
 
 /*
@@ -276,200 +553,286 @@ static void output_change_mode(xcb_connection_t *conn, Output *output) {
 static void handle_output(xcb_connection_t *conn, xcb_randr_output_t id,
                           xcb_randr_get_output_info_reply_t *output,
                           xcb_timestamp_t cts, resources_reply *res) {
-        /* each CRT controller has a position in which we are interested in */
-        crtc_info *crtc;
-
-        Output *new = get_output_by_id(id);
-        bool existing = (new != NULL);
-        if (!existing)
-                new = scalloc(sizeof(Output));
-        new->id = id;
-        asprintf(&new->name, "%.*s",
-                        xcb_randr_get_output_info_name_length(output),
-                        xcb_randr_get_output_info_name(output));
-
-        DLOG("found output with name %s\n", new->name);
-
-        /* Even if no CRTC is used at the moment, we store the output so that
-         * we do not need to change the list ever again (we only update the
-         * position/size) */
-        if (output->crtc == XCB_NONE) {
-                if (!existing)
-                        TAILQ_INSERT_TAIL(&outputs, new, outputs);
-                else if (new->active) {
-                        new->to_be_disabled = true;
-
-                }
-                free(output);
-                return;
-        }
-
-        xcb_randr_get_crtc_info_cookie_t icookie;
-        icookie = xcb_randr_get_crtc_info(conn, output->crtc, cts);
-        if ((crtc = xcb_randr_get_crtc_info_reply(conn, icookie, NULL)) == NULL) {
-                DLOG("Skipping output %s: could not get CRTC (%p)\n",
-                     new->name, crtc);
-                free(new);
-                free(output);
-                return;
-        }
-
-        new->active = true;
-        bool updated = update_if_necessary(&(new->rect.x), crtc->x) |
-                       update_if_necessary(&(new->rect.y), crtc->y) |
-                       update_if_necessary(&(new->rect.width), crtc->width) |
-                       update_if_necessary(&(new->rect.height), crtc->height);
-
-        DLOG("mode: %dx%d+%d+%d\n", new->rect.width, new->rect.height,
-                                    new->rect.x, new->rect.y);
-
-        /* If we don’t need to change an existing output or if the output
-         * does not exist in the first place, the case is simple: we either
-         * need to insert the new output or we are done. */
-        if (!updated || !existing) {
-                if (!existing)
-                        TAILQ_INSERT_TAIL(&outputs, new, outputs);
-                free(output);
-                return;
+    /* each CRT controller has a position in which we are interested in */
+    crtc_info *crtc;
+
+    Output *new = get_output_by_id(id);
+    bool existing = (new != NULL);
+    if (!existing)
+        new = scalloc(sizeof(Output));
+    new->id = id;
+    new->primary = (primary && primary->output == id);
+    FREE(new->name);
+    sasprintf(&new->name, "%.*s",
+            xcb_randr_get_output_info_name_length(output),
+            xcb_randr_get_output_info_name(output));
+
+    DLOG("found output with name %s\n", new->name);
+
+    /* Even if no CRTC is used at the moment, we store the output so that
+     * we do not need to change the list ever again (we only update the
+     * position/size) */
+    if (output->crtc == XCB_NONE) {
+        if (!existing) {
+            if (new->primary)
+                TAILQ_INSERT_HEAD(&outputs, new, outputs);
+            else TAILQ_INSERT_TAIL(&outputs, new, outputs);
+        } else if (new->active)
+            new->to_be_disabled = true;
+        return;
+    }
+
+    xcb_randr_get_crtc_info_cookie_t icookie;
+    icookie = xcb_randr_get_crtc_info(conn, output->crtc, cts);
+    if ((crtc = xcb_randr_get_crtc_info_reply(conn, icookie, NULL)) == NULL) {
+        DLOG("Skipping output %s: could not get CRTC (%p)\n",
+             new->name, crtc);
+        free(new);
+        return;
+    }
+
+    bool updated = update_if_necessary(&(new->rect.x), crtc->x) |
+                   update_if_necessary(&(new->rect.y), crtc->y) |
+                   update_if_necessary(&(new->rect.width), crtc->width) |
+                   update_if_necessary(&(new->rect.height), crtc->height);
+    free(crtc);
+    new->active = (new->rect.width != 0 && new->rect.height != 0);
+    if (!new->active) {
+        DLOG("width/height 0/0, disabling output\n");
+        return;
+    }
+
+    DLOG("mode: %dx%d+%d+%d\n", new->rect.width, new->rect.height,
+                                new->rect.x, new->rect.y);
+
+    /* If we don’t need to change an existing output or if the output
+     * does not exist in the first place, the case is simple: we either
+     * need to insert the new output or we are done. */
+    if (!updated || !existing) {
+        if (!existing) {
+            if (new->primary)
+                TAILQ_INSERT_HEAD(&outputs, new, outputs);
+            else TAILQ_INSERT_TAIL(&outputs, new, outputs);
         }
+        return;
+    }
 
-        new->changed = true;
+    new->changed = true;
 }
 
 /*
  * (Re-)queries the outputs via RandR and stores them in the list of outputs.
  *
  */
-void randr_query_outputs(xcb_connection_t *conn) {
-        Workspace *ws;
-        Output *output, *other, *first;
-        xcb_randr_get_screen_resources_current_cookie_t rcookie;
-        resources_reply *res;
-        /* timestamp of the configuration so that we get consistent replies to all
-         * requests (if the configuration changes between our different calls) */
-        xcb_timestamp_t cts;
-
-        /* an output is VGA-1, LVDS-1, etc. (usually physical video outputs) */
-        xcb_randr_output_t *randr_outputs;
-
-        if (randr_disabled)
-                return;
-
-        /* Get screen resources (crtcs, outputs, modes) */
-        rcookie = xcb_randr_get_screen_resources_current(conn, root);
-        if ((res = xcb_randr_get_screen_resources_current_reply(conn, rcookie, NULL)) == NULL) {
-                disable_randr(conn);
-                return;
+void randr_query_outputs() {
+    Output *output, *other, *first;
+    xcb_randr_get_output_primary_cookie_t pcookie;
+    xcb_randr_get_screen_resources_current_cookie_t rcookie;
+    resources_reply *res;
+
+    /* timestamp of the configuration so that we get consistent replies to all
+     * requests (if the configuration changes between our different calls) */
+    xcb_timestamp_t cts;
+
+    /* an output is VGA-1, LVDS-1, etc. (usually physical video outputs) */
+    xcb_randr_output_t *randr_outputs;
+
+    if (randr_disabled)
+        return;
+
+    /* Get screen resources (primary output, crtcs, outputs, modes) */
+    rcookie = xcb_randr_get_screen_resources_current(conn, root);
+    pcookie = xcb_randr_get_output_primary(conn, root);
+
+    if ((primary = xcb_randr_get_output_primary_reply(conn, pcookie, NULL)) == NULL)
+        ELOG("Could not get RandR primary output\n");
+    else DLOG("primary output is %08x\n", primary->output);
+    if ((res = xcb_randr_get_screen_resources_current_reply(conn, rcookie, NULL)) == NULL) {
+        disable_randr(conn);
+        return;
+    }
+    cts = res->config_timestamp;
+
+    int len = xcb_randr_get_screen_resources_current_outputs_length(res);
+    randr_outputs = xcb_randr_get_screen_resources_current_outputs(res);
+
+    /* Request information for each output */
+    xcb_randr_get_output_info_cookie_t ocookie[len];
+    for (int i = 0; i < len; i++)
+        ocookie[i] = xcb_randr_get_output_info(conn, randr_outputs[i], cts);
+
+    /* Loop through all outputs available for this X11 screen */
+    for (int i = 0; i < len; i++) {
+        xcb_randr_get_output_info_reply_t *output;
+
+        if ((output = xcb_randr_get_output_info_reply(conn, ocookie[i], NULL)) == NULL)
+            continue;
+
+        handle_output(conn, randr_outputs[i], output, cts, res);
+        free(output);
+    }
+
+    /* Check for clones, disable the clones and reduce the mode to the
+     * lowest common mode */
+    TAILQ_FOREACH(output, &outputs, outputs) {
+        if (!output->active || output->to_be_disabled)
+            continue;
+        DLOG("output %p / %s, position (%d, %d), checking for clones\n",
+                output, output->name, output->rect.x, output->rect.y);
+
+        for (other = output;
+             other != TAILQ_END(&outputs);
+             other = TAILQ_NEXT(other, outputs)) {
+            if (other == output || !other->active || other->to_be_disabled)
+                continue;
+
+            if (other->rect.x != output->rect.x ||
+                other->rect.y != output->rect.y)
+                continue;
+
+            DLOG("output %p has the same position, his mode = %d x %d\n",
+                            other, other->rect.width, other->rect.height);
+            uint32_t width = min(other->rect.width, output->rect.width);
+            uint32_t height = min(other->rect.height, output->rect.height);
+
+            if (update_if_necessary(&(output->rect.width), width) |
+                update_if_necessary(&(output->rect.height), height))
+                output->changed = true;
+
+            update_if_necessary(&(other->rect.width), width);
+            update_if_necessary(&(other->rect.height), height);
+
+            DLOG("disabling output %p (%s)\n", other, other->name);
+            other->to_be_disabled = true;
+
+            DLOG("new output mode %d x %d, other mode %d x %d\n",
+                            output->rect.width, output->rect.height,
+                            other->rect.width, other->rect.height);
         }
-        cts = res->config_timestamp;
-
-        int len = xcb_randr_get_screen_resources_current_outputs_length(res);
-        randr_outputs = xcb_randr_get_screen_resources_current_outputs(res);
-
-        /* Request information for each output */
-        xcb_randr_get_output_info_cookie_t ocookie[len];
-        for (int i = 0; i < len; i++)
-                ocookie[i] = xcb_randr_get_output_info(conn, randr_outputs[i], cts);
-
-        /* Loop through all outputs available for this X11 screen */
-        for (int i = 0; i < len; i++) {
-                xcb_randr_get_output_info_reply_t *output;
-
-                if ((output = xcb_randr_get_output_info_reply(conn, ocookie[i], NULL)) == NULL)
-                        continue;
-
-                handle_output(conn, randr_outputs[i], output, cts, res);
+    }
+
+    /* Ensure that all outputs which are active also have a con. This is
+     * necessary because in the next step, a clone might get disabled. Example:
+     * LVDS1 active, VGA1 gets activated as a clone of LVDS1 (has no con).
+     * LVDS1 gets disabled. */
+    TAILQ_FOREACH(output, &outputs, outputs) {
+        if (output->active && output->con == NULL) {
+            DLOG("Need to initialize a Con for output %s\n", output->name);
+            output_init_con(output);
+            output->changed = false;
         }
+    }
+
+    /* Handle outputs which have a new mode or are disabled now (either
+     * because the user disabled them or because they are clones) */
+    TAILQ_FOREACH(output, &outputs, outputs) {
+        if (output->to_be_disabled) {
+            output->active = false;
+            DLOG("Output %s disabled, re-assigning workspaces/docks\n", output->name);
+
+            if ((first = get_first_output()) == NULL)
+                die("No usable outputs available\n");
+
+            /* TODO: refactor the following code into a nice function. maybe
+             * use an on_destroy callback which is implement differently for
+             * different container types (CT_CONTENT vs. CT_DOCKAREA)? */
+            Con *first_content = output_get_content(first->con);
+
+            if (output->con != NULL) {
+                /* We need to move the workspaces from the disappearing output to the first output */
+                /* 1: Get the con to focus next, if the disappearing ws is focused */
+                Con *next = NULL;
+                if (TAILQ_FIRST(&(croot->focus_head)) == output->con) {
+                    DLOG("This output (%p) was focused! Getting next\n", output->con);
+                    next = focused;
+                    DLOG("next = %p\n", next);
+                }
 
-        free(res);
-        /* Check for clones, disable the clones and reduce the mode to the
-         * lowest common mode */
-        TAILQ_FOREACH(output, &outputs, outputs) {
-                if (!output->active || output->to_be_disabled)
-                        continue;
-                DLOG("output %p, position (%d, %d), checking for clones\n",
-                        output, output->rect.x, output->rect.y);
-
-                for (other = output;
-                     other != TAILQ_END(&outputs);
-                     other = TAILQ_NEXT(other, outputs)) {
-                        if (other == output || !other->active || other->to_be_disabled)
-                                continue;
-
-                        if (other->rect.x != output->rect.x ||
-                            other->rect.y != output->rect.y)
-                                continue;
-
-                        DLOG("output %p has the same position, his mode = %d x %d\n",
-                                        other, other->rect.width, other->rect.height);
-                        uint32_t width = min(other->rect.width, output->rect.width);
-                        uint32_t height = min(other->rect.height, output->rect.height);
-
-                        if (update_if_necessary(&(output->rect.width), width) |
-                            update_if_necessary(&(output->rect.height), height))
-                                output->changed = true;
-
-                        update_if_necessary(&(other->rect.width), width);
-                        update_if_necessary(&(other->rect.height), height);
-
-                        DLOG("disabling output %p (%s)\n", other, other->name);
-                        other->to_be_disabled = true;
+                /* 2: iterate through workspaces and re-assign them */
+                Con *current;
+                Con *old_content = output_get_content(output->con);
+                while (!TAILQ_EMPTY(&(old_content->nodes_head))) {
+                    current = TAILQ_FIRST(&(old_content->nodes_head));
+                    DLOG("Detaching current = %p / %s\n", current, current->name);
+                    con_detach(current);
+                    DLOG("Re-attaching current = %p / %s\n", current, current->name);
+                    con_attach(current, first_content, false);
+                    DLOG("Done, next\n");
+                }
+                DLOG("re-attached all workspaces\n");
 
-                        DLOG("new output mode %d x %d, other mode %d x %d\n",
-                                        output->rect.width, output->rect.height,
-                                        other->rect.width, other->rect.height);
+                if (next) {
+                    DLOG("now focusing next = %p\n", next);
+                    con_focus(next);
+                    workspace_show(con_get_workspace(next));
                 }
-        }
 
-        /* Handle outputs which have a new mode or are disabled now (either
-         * because the user disabled them or because they are clones) */
-        TAILQ_FOREACH(output, &outputs, outputs) {
-                if (output->to_be_disabled) {
-                        output->active = false;
-                        DLOG("Output %s disabled, re-assigning workspaces/docks\n", output->name);
-
-                        if ((first = get_first_output()) == NULL)
-                                die("No usable outputs available\n");
-
-                        bool needs_init = (first->current_workspace == NULL);
-
-                        TAILQ_FOREACH(ws, workspaces, workspaces) {
-                                if (ws->output != output)
-                                        continue;
-
-                                workspace_assign_to(ws, first, true);
-                                if (!needs_init)
-                                        continue;
-                                initialize_output(conn, first, ws);
-                                needs_init = false;
-                        }
-
-                        Client *dock;
-                        while (!SLIST_EMPTY(&(output->dock_clients))) {
-                                dock = SLIST_FIRST(&(output->dock_clients));
-                                SLIST_INSERT_HEAD(&(first->dock_clients), dock, dock_clients);
-                                SLIST_REMOVE_HEAD(&(output->dock_clients), dock_clients);
-                        }
-                        output->current_workspace = NULL;
-                        output->to_be_disabled = false;
-                } else if (output->changed) {
-                        output_change_mode(conn, output);
-                        output->changed = false;
+                /* 3: move the dock clients to the first output */
+                Con *child;
+                TAILQ_FOREACH(child, &(output->con->nodes_head), nodes) {
+                    if (child->type != CT_DOCKAREA)
+                        continue;
+                    DLOG("Handling dock con %p\n", child);
+                    Con *dock;
+                    while (!TAILQ_EMPTY(&(child->nodes_head))) {
+                        dock = TAILQ_FIRST(&(child->nodes_head));
+                        Con *nc;
+                        Match *match;
+                        nc = con_for_window(first->con, dock->window, &match);
+                        DLOG("Moving dock client %p to nc %p\n", dock, nc);
+                        con_detach(dock);
+                        DLOG("Re-attaching\n");
+                        con_attach(dock, nc, false);
+                        DLOG("Done\n");
+                    }
                 }
-        }
 
-        ewmh_update_workarea();
+                DLOG("destroying disappearing con %p\n", output->con);
+                tree_close(output->con, DONT_KILL_WINDOW, true, false);
+                DLOG("Done. Should be fine now\n");
+                output->con = NULL;
+            }
 
-        /* Just go through each active output and associate one workspace */
-        TAILQ_FOREACH(output, &outputs, outputs) {
-                if (!output->active || output->current_workspace != NULL)
-                        continue;
-                ws = get_first_workspace_for_output(output);
-                initialize_output(conn, output, ws);
+            output->to_be_disabled = false;
+            output->changed = false;
         }
 
-        /* render_layout flushes */
-        render_layout(conn);
+        if (output->changed) {
+            output_change_mode(conn, output);
+            output->changed = false;
+        }
+    }
+
+    if (TAILQ_EMPTY(&outputs)) {
+        ELOG("No outputs found via RandR, disabling\n");
+        disable_randr(conn);
+    }
+
+    /* Just go through each active output and assign one workspace */
+    TAILQ_FOREACH(output, &outputs, outputs) {
+        if (!output->active)
+            continue;
+        Con *content = output_get_content(output->con);
+        if (!TAILQ_EMPTY(&(content->nodes_head)))
+            continue;
+        DLOG("Should add ws for output %s\n", output->name);
+        init_ws_for_output(output, content);
+    }
+
+    /* Focus the primary screen, if possible */
+    TAILQ_FOREACH(output, &outputs, outputs) {
+        if (!output->primary || !output->con)
+            continue;
+
+        DLOG("Focusing primary output %s\n", output->name);
+        con_focus(con_descend_focused(output->con));
+    }
+
+    /* render_layout flushes */
+    tree_render();
+
+    FREE(res);
+    FREE(primary);
 }
 
 /*
@@ -477,22 +840,23 @@ void randr_query_outputs(xcb_connection_t *conn) {
  * XRandR information to setup workspaces for each screen.
  *
  */
-void initialize_randr(xcb_connection_t *conn, int *event_base) {
-        const xcb_query_extension_reply_t *extreply;
+void randr_init(int *event_base) {
+    const xcb_query_extension_reply_t *extreply;
 
-        extreply = xcb_get_extension_data(conn, &xcb_randr_id);
-        if (!extreply->present)
-                disable_randr(conn);
-        else randr_query_outputs(conn);
+    extreply = xcb_get_extension_data(conn, &xcb_randr_id);
+    if (!extreply->present) {
+        disable_randr(conn);
+        return;
+    } else randr_query_outputs();
 
-        if (event_base != NULL)
-                *event_base = extreply->first_event;
+    if (event_base != NULL)
+        *event_base = extreply->first_event;
 
-        xcb_randr_select_input(conn, root,
-                XCB_RANDR_NOTIFY_MASK_SCREEN_CHANGE |
-                XCB_RANDR_NOTIFY_MASK_OUTPUT_CHANGE |
-                XCB_RANDR_NOTIFY_MASK_CRTC_CHANGE |
-                XCB_RANDR_NOTIFY_MASK_OUTPUT_PROPERTY);
+    xcb_randr_select_input(conn, root,
+            XCB_RANDR_NOTIFY_MASK_SCREEN_CHANGE |
+            XCB_RANDR_NOTIFY_MASK_OUTPUT_CHANGE |
+            XCB_RANDR_NOTIFY_MASK_CRTC_CHANGE |
+            XCB_RANDR_NOTIFY_MASK_OUTPUT_PROPERTY);
 
-        xcb_flush(conn);
+    xcb_flush(conn);
 }