From: Michael Stapelberg <michael@stapelberg.de>
Date: Sat, 23 Jul 2011 20:29:01 +0000 (+0200)
Subject: Bugfix: use the global root variable, don’t get the first one (Thanks quaec)
X-Git-Tag: 4.0~14^2~73
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=ffe297f5e5b4842eb89e1d1840bb5498aabef724;p=i3%2Fi3

Bugfix: use the global root variable, don’t get the first one (Thanks quaec)
---

diff --git a/include/i3.h b/include/i3.h
index c54e3c33..22dcd476 100644
--- a/include/i3.h
+++ b/include/i3.h
@@ -30,6 +30,7 @@ extern TAILQ_HEAD(autostarts_always_head, Autostart) autostarts_always;
 extern TAILQ_HEAD(ws_assignments_head, Workspace_Assignment) ws_assignments;
 extern TAILQ_HEAD(assignments_head, Assignment) assignments;
 extern SLIST_HEAD(stack_wins_head, Stack_Window) stack_wins;
+extern xcb_screen_t *root_screen;
 extern uint8_t root_depth;
 extern bool xcursor_supported, xkb_supported;
 extern xcb_window_t root;
diff --git a/src/main.c b/src/main.c
index 3ef394a2..b88a2082 100644
--- a/src/main.c
+++ b/src/main.c
@@ -16,6 +16,7 @@ char **start_argv;
 
 xcb_connection_t *conn;
 
+xcb_screen_t *root_screen;
 xcb_window_t root;
 uint8_t root_depth;
 
@@ -270,7 +271,7 @@ int main(int argc, char *argv[]) {
     if (main_loop == NULL)
             die("Could not initialize libev. Bad LIBEV_FLAGS?\n");
 
-    xcb_screen_t *root_screen = xcb_aux_get_screen(conn, screens);
+    root_screen = xcb_aux_get_screen(conn, screens);
     root = root_screen->root;
     root_depth = root_screen->root_depth;
     xcb_get_geometry_cookie_t gcookie = xcb_get_geometry(conn, root);
diff --git a/src/randr.c b/src/randr.c
index f13cab67..bdd55365 100644
--- a/src/randr.c
+++ b/src/randr.c
@@ -149,8 +149,6 @@ Output *get_output_most(direction_t direction, Output *current) {
  *
  */
 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));