Merge branch 'master' into next

[i3/i3] / src / config.c

diff --git a/src/config.c b/src/config.c
index fcf3841ed3be21387a334deef437e974d4c82171..595aa435da66805e4baa9ea1f7f2b51ff0eace9c 100644 (file)
--- a/src/config.c
+++ b/src/config.c
@@ -6,8 +6,8 @@
  * i3 - an improved dynamic tiling window manager
  * © 2009-2012 Michael Stapelberg and contributors (see also: LICENSE)
  *
- * config.c: Configuration file (calling the parser (src/cfgparse.y) with the
- *           correct path, switching key bindings mode).
+ * config.c: Configuration file (calling the parser (src/config_parser.c) with
+ *           the correct path, switching key bindings mode).
  *
  */
 #include "all.h"
@@ -31,7 +31,7 @@ void ungrab_all_keys(xcb_connection_t *conn) {
 }
 
 static void grab_keycode_for_binding(xcb_connection_t *conn, Binding *bind, uint32_t keycode) {
-    DLOG("Grabbing %d\n", keycode);
+    DLOG("Grabbing %d with modifiers %d (with mod_mask_lock %d)\n", keycode, bind->mods, bind->mods | XCB_MOD_MASK_LOCK);
     /* Grab the key in all combinations */
     #define GRAB_KEY(modifier) \
         do { \
@@ -46,6 +46,7 @@ static void grab_keycode_for_binding(xcb_connection_t *conn, Binding *bind, uint
     }
     GRAB_KEY(mods);
     GRAB_KEY(mods | xcb_numlock_mask);
+    GRAB_KEY(mods | XCB_MOD_MASK_LOCK);
     GRAB_KEY(mods | xcb_numlock_mask | XCB_MOD_MASK_LOCK);
 }
 
@@ -64,14 +65,6 @@ Binding *get_binding(uint16_t modifiers, bool key_release, xcb_keycode_t keycode
             if (bind->release == B_UPON_KEYRELEASE_IGNORE_MODS)
                 bind->release = B_UPON_KEYRELEASE;
         }
-
-        /* Then we transition the KeyRelease bindings into a state where the
-         * modifiers no longer matter for the KeyRelease event so that users
-         * can release the modifier key before releasing the actual key. */
-        TAILQ_FOREACH(bind, bindings, bindings) {
-            if (bind->release == B_UPON_KEYRELEASE && !key_release)
-                bind->release = B_UPON_KEYRELEASE_IGNORE_MODS;
-        }
     }
 
     TAILQ_FOREACH(bind, bindings, bindings) {
@@ -83,23 +76,33 @@ Binding *get_binding(uint16_t modifiers, bool key_release, xcb_keycode_t keycode
              !key_release))
             continue;
 
-        /* Check if the binding is for a KeyPress or a KeyRelease event */
-        if ((bind->release == B_UPON_KEYPRESS && key_release) ||
-            (bind->release >= B_UPON_KEYRELEASE && !key_release))
-            continue;
-
         /* If a symbol was specified by the user, we need to look in
          * the array of translated keycodes for the event’s keycode */
         if (bind->symbol != NULL) {
             if (memmem(bind->translated_to,
                        bind->number_keycodes * sizeof(xcb_keycode_t),
-                       &keycode, sizeof(xcb_keycode_t)) != NULL)
-                break;
+                       &keycode, sizeof(xcb_keycode_t)) == NULL)
+                continue;
         } else {
             /* This case is easier: The user specified a keycode */
-            if (bind->keycode == keycode)
-                break;
+            if (bind->keycode != keycode)
+                continue;
         }
+
+        /* If this keybinding is a KeyRelease binding, it matches the key which
+         * the user pressed. We therefore mark it as
+         * B_UPON_KEYRELEASE_IGNORE_MODS for later, so that the user can
+         * release the modifiers before the actual key and the KeyRelease will
+         * still be matched. */
+        if (bind->release == B_UPON_KEYRELEASE && !key_release)
+            bind->release = B_UPON_KEYRELEASE_IGNORE_MODS;
+
+        /* Check if the binding is for a KeyPress or a KeyRelease event */
+        if ((bind->release == B_UPON_KEYPRESS && key_release) ||
+            (bind->release >= B_UPON_KEYRELEASE && !key_release))
+            continue;
+
+        break;
     }
 
     return (bind == TAILQ_END(bindings) ? NULL : bind);
@@ -194,6 +197,13 @@ void switch_mode(const char *new_mode) {
         bindings = mode->bindings;
         translate_keysyms();
         grab_all_keys(conn, false);
+
+        char *event_msg;
+        sasprintf(&event_msg, "{\"change\":\"%s\"}", mode->name);
+
+        ipc_send_event("mode", I3_IPC_EVENT_MODE, event_msg);
+        FREE(event_msg);
+
         return;
     }
 
@@ -410,9 +420,14 @@ void load_configuration(xcb_connection_t *conn, const char *override_configpath,
 
     config.default_border = BS_NORMAL;
     config.default_floating_border = BS_NORMAL;
+    config.default_border_width = 2;
     /* Set default_orientation to NO_ORIENTATION for auto orientation. */
     config.default_orientation = NO_ORIENTATION;
 
+    /* Set default urgency reset delay to 500ms */
+    if (config.workspace_urgency_timer == 0)
+        config.workspace_urgency_timer = 0.5;
+
     parse_configuration(override_configpath);
 
     if (reload) {