Translate bindsym bindings upon ISO_Next_Group

[i3/i3] / src / bindings.c

diff --git a/src/bindings.c b/src/bindings.c
index 63ca0836a352a784f1c3de7da12bb71d61a8a85d..adca55464d6076da40f981d6a782d59126a3a2bd 100644 (file)
--- a/src/bindings.c
+++ b/src/bindings.c
@@ -33,9 +33,9 @@ static struct Mode *mode_from_name(const char *name) {
     }
 
     /* If the mode was not found, create a new one */
-    mode = scalloc(sizeof(struct Mode));
+    mode = scalloc(1, sizeof(struct Mode));
     mode->name = sstrdup(name);
-    mode->bindings = scalloc(sizeof(struct bindings_head));
+    mode->bindings = scalloc(1, sizeof(struct bindings_head));
     TAILQ_INIT(mode->bindings);
     SLIST_INSERT_HEAD(&modes, mode, modes);
 
@@ -51,7 +51,7 @@ static struct Mode *mode_from_name(const char *name) {
 Binding *configure_binding(const char *bindtype, const char *modifiers, const char *input_code,
                            const char *release, const char *border, const char *whole_window,
                            const char *command, const char *modename) {
-    Binding *new_binding = scalloc(sizeof(Binding));
+    Binding *new_binding = scalloc(1, sizeof(Binding));
     DLOG("bindtype %s, modifiers %s, input code %s, release %s\n", bindtype, modifiers, input_code, release);
     new_binding->release = (release != NULL ? B_UPON_KEYRELEASE : B_UPON_KEYPRESS);
     new_binding->border = (border != NULL);
@@ -111,9 +111,7 @@ static void grab_keycode_for_binding(xcb_connection_t *conn, Binding *bind, uint
 void grab_all_keys(xcb_connection_t *conn, bool bind_mode_switch) {
     Binding *bind;
     TAILQ_FOREACH(bind, bindings, bindings) {
-        if (bind->input_type != B_KEYBOARD ||
-            (bind_mode_switch && (bind->mods & BIND_MODE_SWITCH) == 0) ||
-            (!bind_mode_switch && (bind->mods & BIND_MODE_SWITCH) != 0))
+        if (bind->input_type != B_KEYBOARD)
             continue;
 
         /* The easy case: the user specified a keycode directly. */
@@ -225,7 +223,7 @@ Binding *get_binding_from_xcb_event(xcb_generic_event_t *event) {
     /* No match? Then the user has Mode_switch enabled but does not have a
      * specific keybinding. Fall back to the default keybindings (without
      * Mode_switch). Makes it much more convenient for users of a hybrid
-     * layout (like ru). */
+     * layout (like {us, ru} or {dvorak, us}, see e.g. ticket #1775). */
     if (bind == NULL) {
         state_filtered &= ~(BIND_MODE_SWITCH);
         DLOG("no match, new state_filtered = %d\n", state_filtered);
@@ -252,6 +250,8 @@ void translate_keysyms(void) {
     int col;
     xcb_keycode_t i, min_keycode, max_keycode;
 
+    const bool mode_switch = (xkb_current_group == XCB_XKB_GROUP_2);
+
     min_keycode = xcb_get_setup(conn)->min_keycode;
     max_keycode = xcb_get_setup(conn)->max_keycode;
 
@@ -282,7 +282,7 @@ void translate_keysyms(void) {
          * the base column and the corresponding shift column, so without
          * mode_switch, we look in 0 and 1, with mode_switch we look in 2 and
          * 3. */
-        col = (bind->mods & BIND_MODE_SWITCH ? 2 : 0);
+        col = (bind->mods & BIND_MODE_SWITCH || mode_switch ? 2 : 0);
 
         FREE(bind->translated_to);
         bind->number_keycodes = 0;
@@ -393,9 +393,9 @@ static Binding *binding_copy(Binding *bind) {
     Binding *ret = smalloc(sizeof(Binding));
     *ret = *bind;
     if (bind->symbol != NULL)
-        ret->symbol = strdup(bind->symbol);
+        ret->symbol = sstrdup(bind->symbol);
     if (bind->command != NULL)
-        ret->command = strdup(bind->command);
+        ret->command = sstrdup(bind->command);
     if (bind->translated_to != NULL) {
         ret->translated_to = smalloc(sizeof(xcb_keycode_t) * bind->number_keycodes);
         memcpy(ret->translated_to, bind->translated_to, sizeof(xcb_keycode_t) * bind->number_keycodes);