diff options
| author | Daniel Eklöf <daniel@ekloef.se> | 2019-08-15 17:38:50 +0000 |
|---|---|---|
| committer | Daniel Eklöf <daniel@ekloef.se> | 2019-08-15 17:38:50 +0000 |
| commit | 44112e55915dda631980a55d72fa973d1cd006d6 (patch) | |
| tree | 341689e4fed716aaeef38701374e7ddc11671f58 /input.c | |
| parent | input: track meta modifier (diff) | |
input: handle meta modifier when modifying "other" keys
When handling keys without a specific map defined (i.e. keys
corresponding roughly to xterm's "otherKeys"), recognize the meta
modifier and report the correct modifier code.
Diffstat (limited to 'input.c')
| -rw-r--r-- | input.c | 13 |
1 files changed, 12 insertions, 1 deletions
@@ -276,7 +276,7 @@ keyboard_key(void *data, struct wl_keyboard *wl_keyboard, uint32_t serial, (count == 1 && !IS_CTRL(buf[0])) && sym < 256) { - static const int mod_param_map[16] = { + static const int mod_param_map[32] = { [MOD_SHIFT] = 2, [MOD_ALT] = 3, [MOD_SHIFT | MOD_ALT] = 4, @@ -284,8 +284,19 @@ keyboard_key(void *data, struct wl_keyboard *wl_keyboard, uint32_t serial, [MOD_SHIFT | MOD_CTRL] = 6, [MOD_ALT | MOD_CTRL] = 7, [MOD_SHIFT | MOD_ALT | MOD_CTRL] = 8, + [MOD_META] = 9, + [MOD_META | MOD_SHIFT] = 10, + [MOD_META | MOD_ALT] = 11, + [MOD_META | MOD_SHIFT | MOD_ALT] = 12, + [MOD_META | MOD_CTRL] = 13, + [MOD_META | MOD_SHIFT | MOD_CTRL] = 14, + [MOD_META | MOD_ALT | MOD_CTRL] = 15, + [MOD_META | MOD_SHIFT | MOD_ALT | MOD_CTRL] = 16, }; + + assert(keymap_mods < sizeof(mod_param_map) / sizeof(mod_param_map[0])); int modify_param = mod_param_map[keymap_mods]; + LOG_INFO("modify_param = %d", modify_param); assert(modify_param != 0); char reply[1024]; |
