add i3-nagbar. tells you about config file errors (for example)

[i3/i3] / src / main.c

diff --git a/src/main.c b/src/main.c
index 2f632dd658c43c7fab5f77a0e8d280df061f1747..a2764cc18067054724a6e1bd53f6f94546875e43 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -19,6 +19,8 @@ xcb_connection_t *conn;
 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 */
@@ -33,6 +35,10 @@ struct autostarts_head autostarts = TAILQ_HEAD_INITIALIZER(autostarts);
 /* The list of assignments */
 struct assignments_head assignments = TAILQ_HEAD_INITIALIZER(assignments);
 
+/* The list of workspace assignments (which workspace should end up on which
+ * output) */
+struct ws_assignments_head ws_assignments = TAILQ_HEAD_INITIALIZER(ws_assignments);
+
 /* We hope that those are supported and set them to true */
 bool xcursor_supported = true;
 bool xkb_supported = true;
@@ -174,6 +180,8 @@ int main(int argc, char *argv[]) {
     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) {
@@ -250,9 +258,17 @@ int main(int argc, char *argv[]) {
     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) {
@@ -261,7 +277,11 @@ int main(int argc, char *argv[]) {
     }
 
     if (config.ipc_socket_path == NULL) {
-        config.ipc_socket_path = getenv("I3SOCK");
+        /* Fall back to a file name in /tmp/ based on the PID */
+        if ((config.ipc_socket_path = getenv("I3SOCK")) == NULL)
+            config.ipc_socket_path = get_process_filename("ipc-socket");
+        else
+            config.ipc_socket_path = sstrdup(config.ipc_socket_path);
     }
 
     uint32_t mask = XCB_CW_EVENT_MASK;
@@ -276,6 +296,13 @@ int main(int argc, char *argv[]) {
     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);
@@ -350,9 +377,6 @@ int main(int argc, char *argv[]) {
     xcb_change_property(conn, XCB_PROP_MODE_REPLACE, root, A__NET_SUPPORTING_WM_CHECK, A_WINDOW, 32, 1, &root);
     xcb_change_property(conn, XCB_PROP_MODE_REPLACE, root, A__NET_WM_NAME, A_UTF8_STRING, 8, strlen("i3"), "i3");
 
-    /* Set up i3 specific atoms like I3_SOCKET_PATH and I3_CONFIG_PATH */
-    x_set_i3_atoms();
-
     keysyms = xcb_key_symbols_alloc(conn);
 
     xcb_get_numlock_mask(conn);
@@ -363,13 +387,15 @@ int main(int argc, char *argv[]) {
     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();
@@ -380,44 +406,42 @@ int main(int argc, char *argv[]) {
 
     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 */
-    if (config.ipc_socket_path != NULL) {
-        int ipc_socket = ipc_create_socket(config.ipc_socket_path);
-        if (ipc_socket == -1) {
-            ELOG("Could not create the IPC socket, IPC disabled\n");
-        } else {
-            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);
-        }
+    int ipc_socket = ipc_create_socket(config.ipc_socket_path);
+    if (ipc_socket == -1) {
+        ELOG("Could not create the IPC socket, IPC disabled\n");
+    } else {
+        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(main_loop, ipc_io);
     }
 
+    /* Set up i3 specific atoms like I3_SOCKET_PATH and I3_CONFIG_PATH */
+    x_set_i3_atoms();
+
     struct ev_io *xcb_watcher = scalloc(sizeof(struct ev_io));
     struct ev_io *xkb = scalloc(sizeof(struct ev_io));
     struct ev_check *xcb_check = scalloc(sizeof(struct ev_check));
     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);
 
@@ -439,5 +463,5 @@ int main(int argc, char *argv[]) {
         }
     }
 
-    ev_loop(loop, 0);
+    ev_loop(main_loop, 0);
 }