aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2019-08-15 17:38:28 +0000
committerDaniel Eklöf <daniel@ekloef.se>2019-08-15 17:38:28 +0000
commit9ca01436ee0e6c170894be0cdefd715a5dd8c834 (patch)
tree1c3efe9c7ad92a4b985160fb75ac9136cf556f7a
parentkeymap: don't ESC prefix return when 'shift' is held down (diff)
input: track meta modifier
-rw-r--r--input.c9
-rw-r--r--keymap.h1
-rw-r--r--terminal.h2
3 files changed, 10 insertions, 2 deletions
diff --git a/input.c b/input.c
index 69ff2ef3..1a6ea4cf 100644
--- a/input.c
+++ b/input.c
@@ -66,6 +66,7 @@ keyboard_keymap(void *data, struct wl_keyboard *wl_keyboard,
term->kbd.mod_shift = xkb_keymap_mod_get_index(term->kbd.xkb_keymap, "Shift");
term->kbd.mod_alt = xkb_keymap_mod_get_index(term->kbd.xkb_keymap, "Mod1") ;
term->kbd.mod_ctrl = xkb_keymap_mod_get_index(term->kbd.xkb_keymap, "Control");
+ term->kbd.mod_meta = xkb_keymap_mod_get_index(term->kbd.xkb_keymap, "Mod4");
/* Compose (dead keys) */
term->kbd.xkb_compose_table = xkb_compose_table_new_from_locale(
@@ -147,6 +148,7 @@ keyboard_key(void *data, struct wl_keyboard *wl_keyboard, uint32_t serial,
const xkb_mod_mask_t ctrl = 1 << term->kbd.mod_ctrl;
const xkb_mod_mask_t alt = 1 << term->kbd.mod_alt;
const xkb_mod_mask_t shift = 1 << term->kbd.mod_shift;
+ const xkb_mod_mask_t meta = 1 << term->kbd.mod_meta;
if (state == XKB_KEY_UP) {
stop_repeater(term, key);
@@ -173,13 +175,13 @@ keyboard_key(void *data, struct wl_keyboard *wl_keyboard, uint32_t serial,
term->kbd.xkb_state, XKB_STATE_MODS_DEPRESSED);
//xkb_mod_mask_t consumed = xkb_state_key_get_consumed_mods(term->kbd.xkb_state, key);
xkb_mod_mask_t consumed = 0x0;
- xkb_mod_mask_t significant = ctrl | alt | shift;
+ xkb_mod_mask_t significant = ctrl | alt | shift | meta;
xkb_mod_mask_t effective_mods = mods & ~consumed & significant;
#if 0
for (size_t i = 0; i < 32; i++) {
if (mods & (1 << i)) {
- LOG_DBG("%s", xkb_keymap_mod_get_name(term->kbd.xkb_keymap, i));
+ LOG_INFO("%s", xkb_keymap_mod_get_name(term->kbd.xkb_keymap, i));
}
}
#endif
@@ -194,6 +196,7 @@ keyboard_key(void *data, struct wl_keyboard *wl_keyboard, uint32_t serial,
keymap_mods |= term->kbd.shift ? MOD_SHIFT : MOD_NONE;
keymap_mods |= term->kbd.alt ? MOD_ALT : MOD_NONE;
keymap_mods |= term->kbd.ctrl ? MOD_CTRL : MOD_NONE;
+ keymap_mods |= term->kbd.meta ? MOD_META : MOD_NONE;
if (effective_mods == shift) {
if (sym == XKB_KEY_Page_Up) {
@@ -329,6 +332,8 @@ keyboard_modifiers(void *data, struct wl_keyboard *wl_keyboard, uint32_t serial,
term->kbd.xkb_state, term->kbd.mod_alt, XKB_STATE_MODS_DEPRESSED);
term->kbd.ctrl = xkb_state_mod_index_is_active(
term->kbd.xkb_state, term->kbd.mod_ctrl, XKB_STATE_MODS_DEPRESSED);
+ term->kbd.meta = xkb_state_mod_index_is_active(
+ term->kbd.xkb_state, term->kbd.mod_meta, XKB_STATE_MODS_DEPRESSED);
}
static void
diff --git a/keymap.h b/keymap.h
index 469b5ce7..26d5021f 100644
--- a/keymap.h
+++ b/keymap.h
@@ -11,6 +11,7 @@ enum modifier {
MOD_SHIFT = 0x2,
MOD_ALT = 0x4,
MOD_CTRL = 0x8,
+ MOD_META = 0x10,
};
struct key_data {
diff --git a/terminal.h b/terminal.h
index c88c433f..2baa5f59 100644
--- a/terminal.h
+++ b/terminal.h
@@ -188,11 +188,13 @@ struct kbd {
xkb_mod_index_t mod_shift;
xkb_mod_index_t mod_alt;
xkb_mod_index_t mod_ctrl;
+ xkb_mod_index_t mod_meta;
/* Enabled modifiers */
bool shift;
bool alt;
bool ctrl;
+ bool meta;
};
enum cursor_keys { CURSOR_KEYS_DONTCARE, CURSOR_KEYS_NORMAL, CURSOR_KEYS_APPLICATION};