]> git.sur5r.net Git - i3/i3/blobdiff - src/randr.c
Don’t set the _NET_WM_WORKAREA hint at all (Thanks cg)
[i3/i3] / src / randr.c
index 20e4f54e89b86447ff65979b676c2c677ca79ea7..d1683e9f925ea7c3c504801be73ff560a9141418 100644 (file)
@@ -2,26 +2,21 @@
  * vim:ts=4:sw=4:expandtab
  *
  * i3 - an improved dynamic tiling window manager
- *
- * © 2009-2011 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 <time.h>
+#include "all.h"
 
+#include <time.h>
 #include <xcb/randr.h>
 
-#include "all.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 */
@@ -143,56 +138,51 @@ Output *get_output_most(direction_t direction, Output *current) {
     return candidate;
 }
 
-#if 0
 /*
- * 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;
 
-        SLIST_INIT(&(output->dock_clients));
+    TAILQ_FOREACH(output, &outputs, outputs) {
+        if (!output->active)
+            continue;
 
-        ipc_send_event("workspace", I3_IPC_EVENT_WORKSPACE, "{\"change\":\"init\"}");
-        DLOG("initialized output at (%d, %d) with %d x %d\n",
-                        output->rect.x, output->rect.y, output->rect.width, output->rect.height);
+        if (((direction == D_UP) || (direction == D_DOWN)) &&
+            (current->rect.x != output->rect.x))
+            continue;
 
-        DLOG("assigning configured workspaces to this output...\n");
-        Workspace *ws;
-        TAILQ_FOREACH(ws, workspaces, workspaces) {
-                if (ws == workspace)
-                        continue;
-                if (ws->preferred_output == NULL ||
-                    get_output_by_name(ws->preferred_output) != output)
-                        continue;
+        if (((direction == D_LEFT) || (direction == D_RIGHT)) &&
+            (current->rect.y != output->rect.y))
+            continue;
 
-                DLOG("assigning ws %d\n", ws->num + 1);
-                workspace_assign_to(ws, output, true);
+        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;
         }
+    }
+
+    return candidate;
 }
-#endif
 
 /*
  * Disables RandR support by creating exactly one output with the size of the
@@ -200,8 +190,6 @@ 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));
@@ -213,6 +201,7 @@ void disable_randr(xcb_connection_t *conn) {
     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);
 
@@ -223,9 +212,6 @@ void disable_randr(xcb_connection_t *conn) {
  * Initializes a CT_OUTPUT Con (searches existing ones from inplace restart
  * before) to use for the given Output.
  *
- * XXX: for assignments, we probably need to move workspace creation from here
- * to after the loop in randr_query_outputs().
- *
  */
 void output_init_con(Output *output) {
     Con *con = NULL, *current;
@@ -246,17 +232,18 @@ void output_init_con(Output *output) {
     }
 
     if (con == NULL) {
-        con = con_new(croot);
+        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;
-    asprintf(&name, "[i3 con] output %s", con->name);
+    sasprintf(&name, "[i3 con] output %s", con->name);
     x_set_name(con, name);
     FREE(name);
 
@@ -266,80 +253,247 @@ void output_init_con(Output *output) {
     }
 
     DLOG("Changing layout, adding top/bottom dockarea\n");
-    Con *topdock = con_new(NULL);
+    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 = true;
+    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");
 
-    asprintf(&name, "[i3 con] top dockarea %s", con->name);
+    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);
+    Con *content = con_new(NULL, NULL);
     content->type = CT_CON;
+    FREE(content->name);
     content->name = sstrdup("content");
 
-    asprintf(&name, "[i3 con] content %s", con->name);
+    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 *ws = con_new(NULL);
+    Con *out, *current;
+    bool exists = true;
+    Con *ws = con_new(NULL, NULL);
     ws->type = CT_WORKSPACE;
 
-    /* get the next unused workspace number */
-    DLOG("Getting next unused workspace\n");
-    int c = 0;
-    bool exists = true;
-    while (exists) {
-        Con *out, *current, *child;
+    /* 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);
 
-        c++;
+            break;
+        }
+    }
 
-        FREE(ws->name);
-        asprintf(&(ws->name), "%d", c);
+    if (exists) {
+        /* get the next unused workspace number */
+        DLOG("Getting next unused workspace by number\n");
+        int c = 0;
+        while (exists) {
+            c++;
 
-        exists = false;
-        TAILQ_FOREACH(out, &(croot->nodes_head), nodes) {
-            TAILQ_FOREACH(current, &(out->nodes_head), nodes) {
-                if (current->type != CT_CON)
-                    continue;
+            FREE(ws->name);
+            sasprintf(&(ws->name), "%d", c);
 
-                TAILQ_FOREACH(child, &(current->nodes_head), nodes) {
-                    if (strcasecmp(child->name, ws->name) != 0)
-                        continue;
+            current = NULL;
+            TAILQ_FOREACH(out, &(croot->nodes_head), nodes)
+                GREP_FIRST(current, output_get_content(out), !strcasecmp(child->name, ws->name));
+            exists = (current != NULL);
 
-                    exists = true;
-                    break;
-                }
-            }
+            DLOG("result for ws %s / %d: exists = %d\n", ws->name, c, exists);
         }
-
-        DLOG("result for ws %s / %d: exists = %d\n", ws->name, c, exists);
+        ws->num = c;
     }
-    ws->num = c;
     con_attach(ws, content, false);
 
-    asprintf(&name, "[i3 con] workspace %s", ws->name);
+    sasprintf(&name, "[i3 con] workspace %s", ws->name);
     x_set_name(ws, name);
     free(name);
 
     ws->fullscreen_mode = CF_OUTPUT;
-    ws->orientation = HORIZ;
+
+    /* 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;
+    }
+
 
     /* TODO: Set focus in main.c */
     con_focus(ws);
@@ -362,49 +516,30 @@ static void output_change_mode(xcb_connection_t *conn, Output *output) {
     DLOG("Output mode changed, updating rect\n");
     assert(output->con != NULL);
     output->con->rect = output->rect;
-#if 0
-    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;
 
-                SLIST_FOREACH(client, &(ws->focus_stack), focus_clients) {
-                        client->force_reconfigure = true;
-                        if (!client_is_floating(client))
-                                continue;
-                        /* For floating clients we need to translate the
-                         * coordinates (old workspace to new workspace) */
-                        DLOG("old: (%x, %x)\n", client->rect.x, client->rect.y);
-                        client->rect.x -= ws->rect.x;
-                        client->rect.y -= ws->rect.y;
-                        client->rect.x += ws->output->rect.x;
-                        client->rect.y += ws->output->rect.y;
-                        DLOG("new: (%x, %x)\n", client->rect.x, client->rect.y);
-                }
+    Con *content, *workspace, *child;
 
-                /* Update dimensions from output */
-                memcpy(&(ws->rect), &(ws->output->rect), sizeof(Rect));
+    /* Point content to the container of the workspaces */
+    content = output_get_content(output->con);
 
-                /* 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);
+    /* 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;
 
-                        r.x = 0;
-                        r.y = 0;
-                        xcb_set_window_rect(conn, client->child, r);
-                }
+            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);
+            }
         }
-#endif
+    }
 }
 
 /*
@@ -428,7 +563,7 @@ static void handle_output(xcb_connection_t *conn, xcb_randr_output_t id,
     new->id = id;
     new->primary = (primary && primary->output == id);
     FREE(new->name);
-    asprintf(&new->name, "%.*s",
+    sasprintf(&new->name, "%.*s",
             xcb_randr_get_output_info_name_length(output),
             xcb_randr_get_output_info_name(output));
 
@@ -576,6 +711,18 @@ void randr_query_outputs() {
         }
     }
 
+    /* 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) {
@@ -586,6 +733,9 @@ void randr_query_outputs() {
             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) {
@@ -594,7 +744,7 @@ void randr_query_outputs() {
                 Con *next = NULL;
                 if (TAILQ_FIRST(&(croot->focus_head)) == output->con) {
                     DLOG("This output (%p) was focused! Getting next\n", output->con);
-                    next = con_next_focused(output->con);
+                    next = focused;
                     DLOG("next = %p\n", next);
                 }
 
@@ -614,10 +764,31 @@ void randr_query_outputs() {
                 if (next) {
                     DLOG("now focusing next = %p\n", next);
                     con_focus(next);
+                    workspace_show(con_get_workspace(next));
+                }
+
+                /* 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");
+                    }
                 }
 
                 DLOG("destroying disappearing con %p\n", output->con);
-                tree_close(output->con, false, true);
+                tree_close(output->con, DONT_KILL_WINDOW, true, false);
                 DLOG("Done. Should be fine now\n");
                 output->con = NULL;
             }
@@ -626,12 +797,6 @@ void randr_query_outputs() {
             output->changed = false;
         }
 
-        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;
-        }
-
         if (output->changed) {
             output_change_mode(conn, output);
             output->changed = false;
@@ -643,17 +808,16 @@ void randr_query_outputs() {
         disable_randr(conn);
     }
 
-    //ewmh_update_workarea();
-
-#if 0
-    /* Just go through each active output and associate one workspace */
+    /* Just go through each active output and assign 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);
+        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);
     }
-#endif
 
     /* Focus the primary screen, if possible */
     TAILQ_FOREACH(output, &outputs, outputs) {
@@ -680,9 +844,10 @@ 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)
+    if (!extreply->present) {
         disable_randr(conn);
-    else randr_query_outputs();
+        return;
+    } else randr_query_outputs();
 
     if (event_base != NULL)
         *event_base = extreply->first_event;