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

Bugfix: Initialize variable 'root' earlier 

Fixes a regression introduced in commit f2896d3 (create_window(), invoked
indirectly in expand_table_{rows,cols}, uses the root variable).
This commit is contained in:
Michael Stapelberg 2010-10-10 20:18:31 +02:00
parent 83a82d77bf
commit d1e3fd192f
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/mainx.c
View File

@ -283,6 +283,11 @@ int main(int argc, char *argv[], char *env[]) {
if (xcb_connection_has_error(conn)) if (xcb_connection_has_error(conn))
die("Cannot open display\n"); die("Cannot open display\n");
/* Get the root window */
xcb_screen_t *root_screen = xcb_aux_get_screen(conn, screens);
root = root_screen->root;
root_depth = root_screen->root_depth;
load_configuration(conn, override_configpath, false); load_configuration(conn, override_configpath, false);
if (only_check_config) { if (only_check_config) {
LOG("Done checking configuration file. Exiting.\n"); LOG("Done checking configuration file. Exiting.\n");
@ -441,11 +446,7 @@ int main(int argc, char *argv[], char *env[]) {
/* Watch size hints (to obey correct aspect ratio) */ /* Watch size hints (to obey correct aspect ratio) */
xcb_property_set_handler(&prophs, WM_NORMAL_HINTS, UINT_MAX, handle_normal_hints, NULL); xcb_property_set_handler(&prophs, WM_NORMAL_HINTS, UINT_MAX, handle_normal_hints, NULL);
/* Get the root window and set the event mask */ /* set event mask */
xcb_screen_t *root_screen = xcb_aux_get_screen(conn, screens);
root = root_screen->root;
root_depth = root_screen->root_depth;
uint32_t mask = XCB_CW_EVENT_MASK; uint32_t mask = XCB_CW_EVENT_MASK;
uint32_t values[] = { XCB_EVENT_MASK_SUBSTRUCTURE_REDIRECT | uint32_t values[] = { XCB_EVENT_MASK_SUBSTRUCTURE_REDIRECT |
XCB_EVENT_MASK_STRUCTURE_NOTIFY | /* when the user adds a screen (e.g. video XCB_EVENT_MASK_STRUCTURE_NOTIFY | /* when the user adds a screen (e.g. video