nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #3270 from orestisf1993/ADD_TRANSLATED_KEY 

Define ADD_TRANSLATED_KEY once
This commit is contained in:
Ingo Bürk 2018-04-30 10:02:34 +02:00 committed by GitHub
parent 6f11b6fa4a 1681ab4496
commit e8057b2fbc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/bindings.c
View File

@ -361,6 +361,14 @@ struct resolve {
struct xkb_state *xkb_state_numlock_no_shift; struct xkb_state *xkb_state_numlock_no_shift;
}; };
#define ADD_TRANSLATED_KEY(code, mods) \
do { \
struct Binding_Keycode *binding_keycode = smalloc(sizeof(struct Binding_Keycode)); \
binding_keycode->modifiers = (mods); \
binding_keycode->keycode = (code); \
TAILQ_INSERT_TAIL(&(bind->keycodes_head), binding_keycode, keycodes); \
} while (0)
/* /*
* add_keycode_if_matches is called for each keycode in the keymap and will add * add_keycode_if_matches is called for each keycode in the keymap and will add
* the keycode to |data->bind| if the keycode can result in the keysym * the keycode to |data->bind| if the keycode can result in the keysym
@ -390,18 +398,10 @@ static void add_keycode_if_matches(struct xkb_keymap *keymap, xkb_keycode_t key,
} }
Binding *bind = resolving->bind; Binding *bind = resolving->bind;
#define ADD_TRANSLATED_KEY(mods) \ ADD_TRANSLATED_KEY(key, bind->event_state_mask);
do { \
struct Binding_Keycode *binding_keycode = smalloc(sizeof(struct Binding_Keycode)); \
binding_keycode->modifiers = (mods); \
binding_keycode->keycode = key; \
TAILQ_INSERT_TAIL(&(bind->keycodes_head), binding_keycode, keycodes); \
} while (0)
ADD_TRANSLATED_KEY(bind->event_state_mask);
/* Also bind the key with active CapsLock */ /* Also bind the key with active CapsLock */
ADD_TRANSLATED_KEY(bind->event_state_mask | XCB_MOD_MASK_LOCK); ADD_TRANSLATED_KEY(key, bind->event_state_mask | XCB_MOD_MASK_LOCK);
/* If this binding is not explicitly for NumLock, check whether we need to /* If this binding is not explicitly for NumLock, check whether we need to
* add a fallback. */ * add a fallback. */
@ -413,17 +413,15 @@ static void add_keycode_if_matches(struct xkb_keymap *keymap, xkb_keycode_t key,
xkb_keysym_t sym_numlock = xkb_state_key_get_one_sym(numlock_state, key); xkb_keysym_t sym_numlock = xkb_state_key_get_one_sym(numlock_state, key);
if (sym_numlock == resolving->keysym) { if (sym_numlock == resolving->keysym) {
/* Also bind the key with active NumLock */ /* Also bind the key with active NumLock */
ADD_TRANSLATED_KEY(bind->event_state_mask | xcb_numlock_mask); ADD_TRANSLATED_KEY(key, bind->event_state_mask | xcb_numlock_mask);
/* Also bind the key with active NumLock+CapsLock */ /* Also bind the key with active NumLock+CapsLock */
ADD_TRANSLATED_KEY(bind->event_state_mask | xcb_numlock_mask | XCB_MOD_MASK_LOCK); ADD_TRANSLATED_KEY(key, bind->event_state_mask | xcb_numlock_mask | XCB_MOD_MASK_LOCK);
} else { } else {
DLOG("Skipping automatic numlock fallback, key %d resolves to 0x%x with numlock\n", DLOG("Skipping automatic numlock fallback, key %d resolves to 0x%x with numlock\n",
key, sym_numlock); key, sym_numlock);
} }
} }
#undef ADD_TRANSLATED_KEY
} }
/* /*
@ -447,14 +445,6 @@ void translate_keysyms(void) {
Binding *bind; Binding *bind;
TAILQ_FOREACH(bind, bindings, bindings) { TAILQ_FOREACH(bind, bindings, bindings) {
#define ADD_TRANSLATED_KEY(code, mods) \
do { \
struct Binding_Keycode *binding_keycode = smalloc(sizeof(struct Binding_Keycode)); \
binding_keycode->modifiers = (mods); \
binding_keycode->keycode = (code); \
TAILQ_INSERT_TAIL(&(bind->keycodes_head), binding_keycode, keycodes); \
} while (0)
if (bind->input_type == B_MOUSE) { if (bind->input_type == B_MOUSE) {
long button; long button;
if (!parse_long(bind->symbol + (sizeof("button") - 1), &button, 10)) { if (!parse_long(bind->symbol + (sizeof("button") - 1), &button, 10)) {
@ -605,8 +595,6 @@ void translate_keysyms(void) {
DLOG("state=0x%x, cfg=\"%s\", sym=0x%x → keycodes%s (%d)\n", DLOG("state=0x%x, cfg=\"%s\", sym=0x%x → keycodes%s (%d)\n",
bind->event_state_mask, bind->symbol, keysym, keycodes, num_keycodes); bind->event_state_mask, bind->symbol, keysym, keycodes, num_keycodes);
free(keycodes); free(keycodes);
#undef ADD_TRANSLATED_KEY
} }
out: out:
@ -620,6 +608,8 @@ out:
} }
} }
#undef ADD_TRANSLATED_KEY
/* /*
* Switches the key bindings to the given mode, if the mode exists * Switches the key bindings to the given mode, if the mode exists
* *