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

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

This commit is contained in:
Michael Stapelberg 2011-07-23 22:29:01 +02:00
parent 44f46a5ee6
commit ffe297f5e5
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/i3.h
View File

@ -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(ws_assignments_head, Workspace_Assignment) ws_assignments;
extern TAILQ_HEAD(assignments_head, Assignment) assignments; extern TAILQ_HEAD(assignments_head, Assignment) assignments;
extern SLIST_HEAD(stack_wins_head, Stack_Window) stack_wins; extern SLIST_HEAD(stack_wins_head, Stack_Window) stack_wins;
extern xcb_screen_t *root_screen;
extern uint8_t root_depth; extern uint8_t root_depth;
extern bool xcursor_supported, xkb_supported; extern bool xcursor_supported, xkb_supported;
extern xcb_window_t root; extern xcb_window_t root;

3
src/main.c
View File

@ -16,6 +16,7 @@ char **start_argv;
xcb_connection_t *conn; xcb_connection_t *conn;
xcb_screen_t *root_screen;
xcb_window_t root; xcb_window_t root;
uint8_t root_depth; uint8_t root_depth;
@ -270,7 +271,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");
xcb_screen_t *root_screen = xcb_aux_get_screen(conn, screens); root_screen = xcb_aux_get_screen(conn, screens);
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);

2
src/randr.c
View File

@ -149,8 +149,6 @@ Output *get_output_most(direction_t direction, Output *current) {
* *
*/ */
void disable_randr(xcb_connection_t *conn) { 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"); DLOG("RandR extension unusable, disabling.\n");
Output *s = scalloc(sizeof(Output)); Output *s = scalloc(sizeof(Output));