*/
static Binding *get_binding(i3_event_state_mask_t state_filtered, bool is_release, uint16_t input_code, input_type_t input_type) {
Binding *bind;
+ Binding *result = NULL;
if (!is_release) {
/* On a press event, we first reset all B_UPON_KEYRELEASE_IGNORE_MODS
/* For keyboard bindings where a symbol was specified by the user, we
* need to look in the array of translated keycodes for the event’s
* keycode */
+ bool found_keycode = false;
if (input_type == B_KEYBOARD && bind->symbol != NULL) {
xcb_keycode_t input_keycode = (xcb_keycode_t)input_code;
- bool found_keycode = false;
struct Binding_Keycode *binding_keycode;
TAILQ_FOREACH(binding_keycode, &(bind->keycodes_head), keycodes) {
const uint32_t modifiers_mask = (binding_keycode->modifiers & 0x0000FFFF);
const bool mods_match = (modifiers_mask == modifiers_state);
DLOG("binding_keycode->modifiers = %d, modifiers_mask = %d, modifiers_state = %d, mods_match = %s\n",
binding_keycode->modifiers, modifiers_mask, modifiers_state, (mods_match ? "yes" : "no"));
- if (binding_keycode->keycode == input_keycode && mods_match) {
+ if (binding_keycode->keycode == input_keycode &&
+ (mods_match || (bind->release == B_UPON_KEYRELEASE_IGNORE_MODS && is_release))) {
found_keycode = true;
break;
}
}
- if (!found_keycode) {
- continue;
- }
} else {
/* This case is easier: The user specified a keycode */
if (bind->keycode != input_code) {
continue;
}
- bool found_keycode = false;
struct Binding_Keycode *binding_keycode;
TAILQ_FOREACH(binding_keycode, &(bind->keycodes_head), keycodes) {
const uint32_t modifiers_mask = (binding_keycode->modifiers & 0x0000FFFF);
break;
}
}
- if (!found_keycode) {
- continue;
- }
+ }
+ if (!found_keycode) {
+ continue;
}
/* If this binding is a release binding, it matches the key which the
if (bind->release == B_UPON_KEYRELEASE && !is_release) {
bind->release = B_UPON_KEYRELEASE_IGNORE_MODS;
DLOG("marked bind %p as B_UPON_KEYRELEASE_IGNORE_MODS\n", bind);
- /* The correct binding has been found, so abort the search, but
- * also don’t return this binding, since it should not be executed
- * yet (only when the keys are released). */
- bind = TAILQ_END(bindings);
- break;
+ if (result) {
+ break;
+ }
+ continue;
}
/* Check if the binding is for a press or a release event */
- if ((bind->release == B_UPON_KEYPRESS && is_release) ||
- (bind->release >= B_UPON_KEYRELEASE && !is_release)) {
+ if ((bind->release == B_UPON_KEYPRESS && is_release)) {
continue;
}
- break;
+ if (is_release) {
+ return bind;
+ } else if (!result) {
+ /* Continue looping to mark needed B_UPON_KEYRELEASE_IGNORE_MODS. */
+ result = bind;
+ }
}
- return (bind == TAILQ_END(bindings) ? NULL : bind);
+ return result;
}
/*
translate_keysyms();
grab_all_keys(conn);
+ /* Reset all B_UPON_KEYRELEASE_IGNORE_MODS bindings to avoid possibly
+ * activating one of them. */
+ Binding *bind;
+ TAILQ_FOREACH(bind, bindings, bindings) {
+ if (bind->release == B_UPON_KEYRELEASE_IGNORE_MODS)
+ bind->release = B_UPON_KEYRELEASE;
+ }
+
char *event_msg;
sasprintf(&event_msg, "{\"change\":\"%s\", \"pango_markup\":%s}",
mode->name, (mode->pango_markup ? "true" : "false"));
return;
}
- ELOG("ERROR: Mode not found\n");
+ ELOG("Mode not found\n");
}
static int reorder_binding_cmp(const void *a, const void *b) {
xcb_intern_atom_reply_t *atom_reply;
size_t content_max_words = 256;
- xcb_window_t root = root_screen->root;
-
atom_reply = xcb_intern_atom_reply(
conn, xcb_intern_atom(conn, 0, strlen("_XKB_RULES_NAMES"), "_XKB_RULES_NAMES"), NULL);
if (atom_reply == NULL)