Implement the urgency hint for windows/workspaces

[i3/i3] / src / mainx.c

diff --git a/src/mainx.c b/src/mainx.c
index 3ae04857e4f175ef3e25de05ff61b0fcb62fab4f..db3d184aa1a88d6e10d2d28af5fb7e291a0f9408 100644 (file)
--- a/src/mainx.c
+++ b/src/mainx.c
@@ -19,6 +19,7 @@
 #include <limits.h>
 #include <locale.h>
 #include <fcntl.h>
+#include <getopt.h>
 
 #include <X11/XKBlib.h>
 #include <X11/extensions/XKB.h>
@@ -147,6 +148,14 @@ int main(int argc, char *argv[], char *env[]) {
         xcb_connection_t *conn;
         xcb_property_handlers_t prophs;
         xcb_intern_atom_cookie_t atom_cookies[NUM_ATOMS];
+        static struct option long_options[] = {
+                {"no-autostart", no_argument, 0, 'a'},
+                {"config", required_argument, 0, 'c'},
+                {"version", no_argument, 0, 'v'},
+                {"help", no_argument, 0, 'h'},
+                {0, 0, 0, 0}
+        };
+        int option_index = 0;
 
         setlocale(LC_ALL, "");
 
@@ -156,7 +165,7 @@ int main(int argc, char *argv[], char *env[]) {
 
         start_argv = argv;
 
-        while ((opt = getopt(argc, argv, "c:va")) != -1) {
+        while ((opt = getopt_long(argc, argv, "c:vah", long_options, &option_index)) != -1) {
                 switch (opt) {
                         case 'a':
                                 LOG("Autostart disabled using -a\n");
@@ -169,7 +178,11 @@ int main(int argc, char *argv[], char *env[]) {
                                 printf("i3 version " I3_VERSION " © 2009 Michael Stapelberg and contributors\n");
                                 exit(EXIT_SUCCESS);
                         default:
-                                fprintf(stderr, "Usage: %s [-c configfile]\n", argv[0]);
+                                fprintf(stderr, "Usage: %s [-c configfile] [-a] [-v]\n", argv[0]);
+                                fprintf(stderr, "\n");
+                                fprintf(stderr, "-a: disable autostart\n");
+                                fprintf(stderr, "-v: display version and exit\n");
+                                fprintf(stderr, "-c <configfile>: use the provided configfile instead\n");
                                 exit(EXIT_FAILURE);
                 }
         }
@@ -385,6 +398,9 @@ int main(int argc, char *argv[], char *env[]) {
         /* Watch WM_CLIENT_LEADER (= logical parent window for toolbars etc.) */
         xcb_property_set_handler(&prophs, atoms[WM_CLIENT_LEADER], UINT_MAX, handle_clientleader_change, NULL);
 
+        /* Watch WM_HINTS (contains the urgent property) */
+        xcb_property_set_handler(&prophs, WM_HINTS, UINT_MAX, handle_hints, NULL);
+
         /* Set up the atoms we support */
         check_error(conn, xcb_change_property_checked(conn, XCB_PROP_MODE_REPLACE, root, atoms[_NET_SUPPORTED],
                        ATOM, 32, 7, atoms), "Could not set _NET_SUPPORTED");
@@ -413,8 +429,6 @@ int main(int argc, char *argv[], char *env[]) {
 
         xcb_flush(conn);
 
-        manage_existing_windows(conn, &prophs, root);
-
         /* Get pointer position to see on which screen we’re starting */
         xcb_query_pointer_reply_t *reply;
         if ((reply = xcb_query_pointer_reply(conn, xcb_query_pointer(conn, root), NULL)) == NULL) {
@@ -424,14 +438,16 @@ int main(int argc, char *argv[], char *env[]) {
 
         i3Screen *screen = get_screen_containing(reply->root_x, reply->root_y);
         if (screen == NULL) {
-                LOG("ERROR: No screen at %d x %d\n", reply->root_x, reply->root_y);
-                return 0;
-        }
-        if (screen->current_workspace != 0) {
-                LOG("Ok, I need to go to the other workspace\n");
-                c_ws = &workspaces[screen->current_workspace];
+                LOG("ERROR: No screen at %d x %d, starting on the first screen\n",
+                    reply->root_x, reply->root_y);
+                screen = TAILQ_FIRST(virtual_screens);
         }
 
+        LOG("Starting on %d\n", screen->current_workspace);
+        c_ws = &workspaces[screen->current_workspace];
+
+        manage_existing_windows(conn, &prophs, root);
+
         /* Create the UNIX domain socket for IPC */
         if (config.ipc_socket_path != NULL) {
                 int ipc_socket = ipc_create_socket(config.ipc_socket_path);