xcb_window_t root;
uint8_t root_depth;
+struct ev_loop *main_loop;
+
xcb_key_symbols_t *keysyms;
/* Those are our connections to X11 for use with libXcursor and XKB */
if (!isatty(fileno(stdout)))
setbuf(stdout, NULL);
+ init_logging();
+
start_argv = argv;
while ((opt = getopt_long(argc, argv, "c:CvaL:hld:V", long_options, &option_index)) != -1) {
if (xcb_connection_has_error(conn))
errx(EXIT_FAILURE, "Cannot open display\n");
+ /* Initialize the libev event loop. This needs to be done before loading
+ * the config file because the parser will install an ev_child watcher
+ * for the nagbar when config errors are found. */
+ main_loop = EV_DEFAULT;
+ if (main_loop == NULL)
+ die("Could not initialize libev. Bad LIBEV_FLAGS?\n");
+
xcb_screen_t *root_screen = xcb_aux_get_screen(conn, screens);
root = root_screen->root;
root_depth = root_screen->root_depth;
+ xcb_get_geometry_cookie_t gcookie = xcb_get_geometry(conn, root);
load_configuration(conn, override_configpath, false);
if (only_check_config) {
cookie = xcb_change_window_attributes_checked(conn, root, mask, values);
check_error(conn, cookie, "Another window manager seems to be running");
+ xcb_get_geometry_reply_t *greply = xcb_get_geometry_reply(conn, gcookie, NULL);
+ if (greply == NULL) {
+ ELOG("Could not get geometry of the root window, exiting\n");
+ return 1;
+ }
+ DLOG("root geometry reply: (%d, %d) %d x %d\n", greply->x, greply->y, greply->width, greply->height);
+
/* Place requests for the atoms we need as soon as possible */
#define xmacro(atom) \
xcb_intern_atom_cookie_t atom ## _cookie = xcb_intern_atom(conn, 0, strlen(#atom), #atom);
bool needs_tree_init = true;
if (layout_path) {
LOG("Trying to restore the layout from %s...", layout_path);
- needs_tree_init = !tree_restore(layout_path);
+ needs_tree_init = !tree_restore(layout_path, greply);
if (delete_layout_path)
unlink(layout_path);
free(layout_path);
}
if (needs_tree_init)
- tree_init();
+ tree_init(greply);
+
+ free(greply);
if (force_xinerama) {
xinerama_init();
tree_render();
- struct ev_loop *loop = ev_loop_new(0);
- if (loop == NULL)
- die("Could not initialize libev. Bad LIBEV_FLAGS?\n");
-
/* Create the UNIX domain socket for IPC */
int ipc_socket = ipc_create_socket(config.ipc_socket_path);
if (ipc_socket == -1) {
free(config.ipc_socket_path);
struct ev_io *ipc_io = scalloc(sizeof(struct ev_io));
ev_io_init(ipc_io, ipc_new_client, ipc_socket, EV_READ);
- ev_io_start(loop, ipc_io);
+ ev_io_start(main_loop, ipc_io);
}
/* Set up i3 specific atoms like I3_SOCKET_PATH and I3_CONFIG_PATH */
struct ev_prepare *xcb_prepare = scalloc(sizeof(struct ev_prepare));
ev_io_init(xcb_watcher, xcb_got_event, xcb_get_file_descriptor(conn), EV_READ);
- ev_io_start(loop, xcb_watcher);
+ ev_io_start(main_loop, xcb_watcher);
if (xkb_supported) {
ev_io_init(xkb, xkb_got_event, ConnectionNumber(xkbdpy), EV_READ);
- ev_io_start(loop, xkb);
+ ev_io_start(main_loop, xkb);
/* Flush the buffer so that libev can properly get new events */
XFlush(xkbdpy);
}
ev_check_init(xcb_check, xcb_check_cb);
- ev_check_start(loop, xcb_check);
+ ev_check_start(main_loop, xcb_check);
ev_prepare_init(xcb_prepare, xcb_prepare_cb);
- ev_prepare_start(loop, xcb_prepare);
+ ev_prepare_start(main_loop, xcb_prepare);
xcb_flush(conn);
}
}
- ev_loop(loop, 0);
+ ev_loop(main_loop, 0);
}