Make conn_screen available outside of main()

Will be used in other parts of the code for startup notification

diff --git a/include/i3.h b/include/i3.h
index 22dcd476b9605349f2ef53fbd02039a3659498b1..f2b97824268266598447f554b2baaba1fdf82f23 100644 (file)
--- a/include/i3.h
+++ b/include/i3.h
@@ -20,6 +20,7 @@
 #define _I3_H
 
 extern xcb_connection_t *conn;
+extern int conn_screen;
 extern xcb_key_symbols_t *keysyms;
 extern char **start_argv;
 extern Display *xlibdpy, *xkbdpy;

diff --git a/src/main.c b/src/main.c
index 3ebfb5f404569889f4c34aabe98d3a21f37726e4..6020f109080a68a39d3b2d6dba9fb91286a30866 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -19,6 +19,8 @@ extern Con *focused;
 char **start_argv;
 
 xcb_connection_t *conn;
+/* The screen (0 when you are using DISPLAY=:0) of the connection 'conn' */
+int conn_screen;
 
 xcb_screen_t *root_screen;
 xcb_window_t root;
@@ -175,7 +177,6 @@ static void i3_exit() {
 }
 
 int main(int argc, char *argv[]) {
-    int screens;
     char *override_configpath = NULL;
     bool autostart = true;
     char *layout_path = NULL;
@@ -357,7 +358,7 @@ int main(int argc, char *argv[]) {
 
     LOG("i3 (tree) version " I3_VERSION " starting\n");
 
-    conn = xcb_connect(NULL, &screens);
+    conn = xcb_connect(NULL, &conn_screen);
     if (xcb_connection_has_error(conn))
         errx(EXIT_FAILURE, "Cannot open display\n");
 
@@ -368,7 +369,7 @@ int main(int argc, char *argv[]) {
     if (main_loop == NULL)
             die("Could not initialize libev. Bad LIBEV_FLAGS?\n");
 
-    root_screen = xcb_aux_get_screen(conn, screens);
+    root_screen = xcb_aux_get_screen(conn, conn_screen);
     root = root_screen->root;
     root_depth = root_screen->root_depth;
     xcb_get_geometry_cookie_t gcookie = xcb_get_geometry(conn, root);