nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make conn_screen available outside of main() 

Will be used in other parts of the code for startup notification
This commit is contained in:
Michael Stapelberg 2011-10-09 18:19:31 +01:00
parent fb4b012013
commit 2a29d9c2c1
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/i3.h
View File

@ -20,6 +20,7 @@
#define _I3_H #define _I3_H
extern xcb_connection_t *conn; extern xcb_connection_t *conn;
extern int conn_screen;
extern xcb_key_symbols_t *keysyms; extern xcb_key_symbols_t *keysyms;
extern char **start_argv; extern char **start_argv;
extern Display *xlibdpy, *xkbdpy; extern Display *xlibdpy, *xkbdpy;

7
src/main.c
View File

@ -19,6 +19,8 @@ extern Con *focused;
char **start_argv; char **start_argv;
xcb_connection_t *conn; 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_screen_t *root_screen;
xcb_window_t root; xcb_window_t root;
@ -175,7 +177,6 @@ static void i3_exit() {
} }
int main(int argc, char *argv[]) { int main(int argc, char *argv[]) {
int screens;
char *override_configpath = NULL; char *override_configpath = NULL;
bool autostart = true; bool autostart = true;
char *layout_path = NULL; char *layout_path = NULL;
@ -357,7 +358,7 @@ int main(int argc, char *argv[]) {
LOG("i3 (tree) version " I3_VERSION " starting\n"); 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)) if (xcb_connection_has_error(conn))
errx(EXIT_FAILURE, "Cannot open display\n"); errx(EXIT_FAILURE, "Cannot open display\n");
@ -368,7 +369,7 @@ int main(int argc, char *argv[]) {
if (main_loop == NULL) if (main_loop == NULL)
die("Could not initialize libev. Bad LIBEV_FLAGS?\n"); 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 = root_screen->root;
root_depth = root_screen->root_depth; root_depth = root_screen->root_depth;
xcb_get_geometry_cookie_t gcookie = xcb_get_geometry(conn, root); xcb_get_geometry_cookie_t gcookie = xcb_get_geometry(conn, root);