]> git.sur5r.net Git - i3/i3/blobdiff - src/config.c
Implement assignments of workspaces to screens, big cleanup of workspace code
[i3/i3] / src / config.c
index ee188537845cb81054628ec8072e63210ca2c1ae..65bfd67d12dd4756d9681a1ebfed713fc12d2b2d 100644 (file)
 #include <stdlib.h>
 #include <glob.h>
 
+/* We need Xlib for XStringToKeysym */
+#include <X11/Xlib.h>
+
+#include <xcb/xcb_keysyms.h>
+
 #include "i3.h"
 #include "util.h"
 #include "config.h"
 #include "xcb.h"
+#include "table.h"
+#include "workspace.h"
 
 Config config;
 
@@ -57,15 +64,28 @@ static void replace_variable(char *buffer, const char *key, const char *value) {
         }
 }
 
-/*
- * Ungrab the bound keys
+/**
+ * Ungrabs all keys, to be called before re-grabbing the keys because of a
+ * mapping_notify event or a configuration file reload
  *
  */
 void ungrab_all_keys(xcb_connection_t *conn) {
-        Binding *bind;
-        TAILQ_FOREACH(bind, &bindings, bindings) {
-                LOG("Ungrabbing %d\n", bind->keycode);
-                xcb_ungrab_key(conn, bind->keycode, root, bind->keycode);
+        LOG("Ungrabbing all keys\n");
+        xcb_ungrab_key(conn, XCB_GRAB_ANY, root, XCB_BUTTON_MASK_ANY);
+}
+
+static void grab_keycode_for_binding(xcb_connection_t *conn, Binding *bind, uint32_t keycode) {
+        LOG("Grabbing %d\n", keycode);
+        if ((bind->mods & BIND_MODE_SWITCH) != 0)
+                xcb_grab_key(conn, 0, root, 0, keycode,
+                        XCB_GRAB_MODE_SYNC, XCB_GRAB_MODE_SYNC);
+        else {
+                /* Grab the key in all combinations */
+                #define GRAB_KEY(modifier) xcb_grab_key(conn, 0, root, modifier, keycode, \
+                                                        XCB_GRAB_MODE_SYNC, XCB_GRAB_MODE_ASYNC)
+                GRAB_KEY(bind->mods);
+                GRAB_KEY(bind->mods | xcb_numlock_mask);
+                GRAB_KEY(bind->mods | xcb_numlock_mask | XCB_MOD_MASK_LOCK);
         }
 }
 
@@ -76,18 +96,41 @@ void ungrab_all_keys(xcb_connection_t *conn) {
 void grab_all_keys(xcb_connection_t *conn) {
         Binding *bind;
         TAILQ_FOREACH(bind, &bindings, bindings) {
-                LOG("Grabbing %d\n", bind->keycode);
-                if ((bind->mods & BIND_MODE_SWITCH) != 0)
-                        xcb_grab_key(conn, 0, root, 0, bind->keycode,
-                                XCB_GRAB_MODE_SYNC, XCB_GRAB_MODE_SYNC);
-                else {
-                        /* Grab the key in all combinations */
-                        #define GRAB_KEY(modifier) xcb_grab_key(conn, 0, root, modifier, bind->keycode, \
-                                                                XCB_GRAB_MODE_SYNC, XCB_GRAB_MODE_ASYNC)
-                        GRAB_KEY(bind->mods);
-                        GRAB_KEY(bind->mods | xcb_numlock_mask);
-                        GRAB_KEY(bind->mods | xcb_numlock_mask | XCB_MOD_MASK_LOCK);
+                /* The easy case: the user specified a keycode directly. */
+                if (bind->keycode > 0) {
+                        grab_keycode_for_binding(conn, bind, bind->keycode);
+                        continue;
+                }
+
+                /* We need to translate the symbol to a keycode */
+                LOG("Translating symbol to keycode (\"%s\")\n", bind->symbol);
+                xcb_keysym_t keysym = XStringToKeysym(bind->symbol);
+                if (keysym == NoSymbol) {
+                        LOG("Could not translate string to key symbol: \"%s\"\n", bind->symbol);
+                        continue;
                 }
+
+                xcb_keycode_t *keycodes = xcb_key_symbols_get_keycode(keysyms, keysym);
+                if (keycodes == NULL) {
+                        LOG("Could not translate symbol \"%s\"\n", bind->symbol);
+                        continue;
+                }
+
+                uint32_t last_keycode;
+                bind->number_keycodes = 0;
+                for (xcb_keycode_t *walk = keycodes; *walk != 0; walk++) {
+                        /* We hope duplicate keycodes will be returned in order
+                         * and skip them */
+                        if (last_keycode == *walk)
+                                continue;
+                        grab_keycode_for_binding(conn, bind, *walk);
+                        last_keycode = *walk;
+                        bind->number_keycodes++;
+                }
+                LOG("Got %d different keycodes\n", bind->number_keycodes);
+                bind->translated_to = smalloc(bind->number_keycodes * sizeof(xcb_keycode_t));
+                memcpy(bind->translated_to, keycodes, bind->number_keycodes * sizeof(xcb_keycode_t));
+                free(keycodes);
         }
 }
 
@@ -232,7 +275,7 @@ void load_configuration(xcb_connection_t *conn, const char *override_configpath,
                 }
 
                 /* key bindings */
-                if (strcasecmp(key, "bind") == 0) {
+                if (strcasecmp(key, "bind") == 0 || strcasecmp(key, "bindsym") == 0) {
                         #define CHECK_MODIFIER(name) \
                                 if (strncasecmp(walk, #name, strlen(#name)) == 0) { \
                                         modifiers |= BIND_##name; \
@@ -257,14 +300,25 @@ void load_configuration(xcb_connection_t *conn, const char *override_configpath,
                                 break;
                         }
 
-                        /* Now check for the keycode */
-                        int keycode = strtol(walk, &rest, 10);
-                        if (!rest || *rest != ' ')
-                                die("Invalid binding\n");
+                        Binding *new = scalloc(sizeof(Binding));
+
+                        /* Now check for the keycode or copy the symbol */
+                        if (strcasecmp(key, "bind") == 0) {
+                                int keycode = strtol(walk, &rest, 10);
+                                if (!rest || *rest != ' ')
+                                        die("Invalid binding (keycode)\n");
+                                new->keycode = keycode;
+                        } else {
+                                rest = walk;
+                                char *sym = rest;
+                                while (*rest != '\0' && *rest != ' ')
+                                        rest++;
+                                if (*rest != ' ')
+                                        die("Invalid binding (keysym)\n");
+                                new->symbol = strndup(sym, (rest - sym));
+                        }
                         rest++;
-                        LOG("keycode = %d, modifiers = %d, command = *%s*\n", keycode, modifiers, rest);
-                        Binding *new = smalloc(sizeof(Binding));
-                        new->keycode = keycode;
+                        LOG("keycode = %d, symbol = %s, modifiers = %d, command = *%s*\n", new->keycode, new->symbol, modifiers, rest);
                         new->mods = modifiers;
                         new->command = sstrdup(rest);
                         TAILQ_INSERT_TAIL(&bindings, new, bindings);
@@ -295,6 +349,58 @@ void load_configuration(xcb_connection_t *conn, const char *override_configpath,
                         continue;
                 }
 
+                /* workspace "workspace number" [screen <screen>] ["name of the workspace"]
+                 * with screen := <number> | <position>, e.g. screen 1280 or screen 1 */
+                if (strcasecmp(key, "name") == 0 || strcasecmp(key, "workspace") == 0) {
+                        LOG("workspace: %s\n",value);
+                        char *ws_str = sstrdup(value);
+                        char *end = strchr(ws_str, ' ');
+                        if (end == NULL)
+                                die("Malformed name, couln't find terminating space\n");
+                        *end = '\0';
+
+                        /* Strip trailing whitespace */
+                        while (strlen(value) > 0 && value[strlen(value)-1] == ' ')
+                                value[strlen(value)-1] = '\0';
+
+                        int ws_num = atoi(ws_str);
+
+                        if (ws_num < 1 || ws_num > 10)
+                                die("Malformed name, invalid workspace number\n");
+
+                        /* find the name */
+                        char *name = value;
+                        name += strlen(ws_str) + 1;
+
+                        if (strncasecmp(name, "screen ", strlen("screen ")) == 0) {
+                                char *screen = strdup(name + strlen("screen "));
+                                if ((end = strchr(screen, ' ')) != NULL)
+                                        *end = '\0';
+                                LOG("Setting preferred screen for workspace %d to \"%s\"\n", ws_num, screen);
+                                workspaces[ws_num - 1].preferred_screen = screen;
+
+                                name += strlen("screen ") + strlen(screen);
+
+                        }
+
+                        /* Strip leading whitespace */
+                        while (*name != '\0' && *name == ' ')
+                                name++;
+
+                        LOG("rest to parse = %s\n", name);
+
+                        if (name == '\0') {
+                                free(ws_str);
+                                continue;
+                        }
+
+                        LOG("setting name to \"%s\"\n", name);
+
+                        workspace_set_name(&(workspaces[ws_num - 1]), name);
+                        free(ws_str);
+                        continue;
+                }
+
                 /* assign window class[/window title] → workspace */
                 if (strcasecmp(key, "assign") == 0) {
                         LOG("assign: \"%s\"\n", value);
@@ -374,6 +480,11 @@ void load_configuration(xcb_connection_t *conn, const char *override_configpath,
                         continue;
                 }
 
+                if (strcasecmp(key, "ipc-socket") == 0) {
+                        config.ipc_socket_path = sstrdup(value);
+                        continue;
+                }
+
                 die("Unknown configfile option: %s\n", key);
         }
         /* now grab all keys again */
@@ -391,6 +502,21 @@ void load_configuration(xcb_connection_t *conn, const char *override_configpath,
                 free(v->value);
                 free(v);
         }
+
+        /* Set an empty name for every workspace which got no name */
+        for (int i = 0; i < 10; i++) {
+                Workspace *ws = &(workspaces[i]);
+                if (ws->name != NULL) {
+                        /* If the font was not specified when the workspace name
+                         * was loaded, we need to predict the text width now */
+                        if (ws->text_width == 0)
+                                ws->text_width = predict_text_width(global_conn,
+                                                config.font, ws->name, ws->name_len);
+                        continue;
+                }
+
+                workspace_set_name(&(workspaces[i]), NULL);
+        }
  
         return;
 }