koma/i3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
The case of an X11 server having multiple displays is handled correctly by the
code in src/mainx.c. However, due to some functions not being correctly
refactored and still getting the first screen (and also the first root window)
from the XCB connection, i3 was operating on the wrong root window.
This commit is contained in:
Michael Stapelberg
2011-01-28 00:41:53 +01:00
parent 79bbde8766
commit 7b01bc5eb7
6 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
i3-input/main.c
View File

@ -50,6 +50,7 @@ static char *command_prefix;
static char *prompt;
static int prompt_len;
static int limit;
xcb_window_t root;
/*
* Concats the glyphs (either UCS-2 or UTF-8) to a single string, suitable for
@ -302,6 +303,9 @@ int main(int argc, char *argv[]) {
if (xcb_connection_has_error(conn))
die("Cannot open display\n");
xcb_screen_t *root_screen = xcb_aux_get_screen(conn, screens);
root = root_screen->root;
/* Set up event handlers for key press and key release */
xcb_event_handlers_t evenths;
memset(&evenths, 0, sizeof(xcb_event_handlers_t));
@ -320,8 +324,6 @@ int main(int argc, char *argv[]) {
win = open_input_window(conn, 500, font_height + 8);
/* Create pixmap */
xcb_screen_t *root_screen = xcb_aux_get_screen(conn, screens);
pixmap = xcb_generate_id(conn);
pixmap_gc = xcb_generate_id(conn);
xcb_create_pixmap(conn, root_screen->root_depth, pixmap, win, 500, font_height + 8);