aboutsummaryrefslogtreecommitdiff
path: root/config.c
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2021-02-27 19:42:31 +0000
committerDaniel Eklöf <daniel@ekloef.se>2021-03-04 08:43:43 +0000
commit5e64e06a550c2499a23f03749986791136cbbcb9 (patch)
tree0922e869989e2f55ba2b3aa5d14ff0b78a954a50 /config.c
parentinput: ask XKB for consumed modifiers, but don’t actually use them just yet (diff)
input: rewrite of how we match foot’s own key bindings
Bindings are matched in one out of three ways: * By translated (by XKB) symbols * By untranslated symbols * By raw key codes A translated symbol is affected by pressed modifiers, some of which can be “consumed”. Consumed modifiers to not partake in the comparison with the binding’s modifiers. In this mode, ctrl+shift+2 maps to ctrl+@ on a US layout. Untranslated symbols, or un-shifted symbols refer to the “base” symbol of the pressed key, i.e. it’s unaffected by modifiers. In this mode, consumed modifiers *do* partake in the comparison with the binding’s modifiers, and ctrl+shift+2 maps to ctrl+shift+2 on a US layout. More examples: ctrl+shift+u maps to ctrl+U in the translated lookup, while ctrl+shift+u maps to ctrl+shift+u in the untranslated lookup. Finally, we also match raw key codes. This allows our bindings to work using the same physical keys when the user switches between latin and non-latin layouts. This means key bindings in foot.ini *must* not include both +shift+ and a *shifted* key. I.e. ctrl+shift+U is not a valid combo as it cannot be triggered. Unfortunately, this was how you were supposed to write bindings up until now... so, we try to detect such bindings, log a deprecation warning and then “fix” the binding for the user. When specifying bindings in foot.ini, both ctrl+U and ctrl+shift+u are valid, and will work. The latter is preferred though, since we cannot detect the raw key code for the former variant. Personally, I also prefer the latter one because it is more explicit; it’s more obvious which keys are involved. However, in some cases it makes more sense to use the other variant. Typically for non-letter combos.
Diffstat (limited to 'config.c')
-rw-r--r--config.c35
1 files changed, 26 insertions, 9 deletions
diff --git a/config.c b/config.c
index 13673123..b1653916 100644
--- a/config.c
+++ b/config.c
@@ -1168,6 +1168,7 @@ out:
static bool
parse_key_combos(struct config *conf, const char *combos, key_combo_list_t *key_combos,
+ const char *section, const char *option,
const char *path, unsigned lineno)
{
xassert(tll_length(*key_combos) == 0);
@@ -1179,7 +1180,7 @@ parse_key_combos(struct config *conf, const char *combos, key_combo_list_t *key_
combo = strtok_r(NULL, " ", &tok_ctx))
{
struct config_key_modifiers modifiers = {0};
- const char *key = strrchr(combo, '+');
+ char *key = strrchr(combo, '+');
if (key == NULL) {
/* No modifiers */
@@ -1190,11 +1191,26 @@ parse_key_combos(struct config *conf, const char *combos, key_combo_list_t *key_
key++; /* Skip past the '+' */
}
+ if (modifiers.shift && strlen(key) == 1 && (*key >= 'A' && *key <= 'Z')) {
+ LOG_WARN(
+ "%s:%d: [%s]: %s: %s: "
+ "upper case keys not supported with explicit 'Shift' modifier",
+ path, lineno, section, option, combo);
+ user_notification_add(
+ &conf->notifications, USER_NOTIFICATION_DEPRECATED,
+ "%s:%d: [%s]: %s: \033[1m%s\033[m: "
+ "shifted keys not supported with explicit \033[1mShift\033[m "
+ "modifier",
+ path, lineno, section, option, combo);
+ *key = tolower(*key);
+ }
+
/* Translate key name to symbol */
xkb_keysym_t sym = xkb_keysym_from_name(key, 0);
if (sym == XKB_KEY_NoSymbol) {
- LOG_AND_NOTIFY_ERR("%s:%d: %s: key is not a valid XKB key name",
- path, lineno, key);
+ LOG_AND_NOTIFY_ERR(
+ "%s:%d: [%s]: %s: ]%s: key is not a valid XKB key name",
+ path, lineno, section, option, key);
goto err;
}
@@ -1373,7 +1389,8 @@ parse_key_binding_section(
}
key_combo_list_t key_combos = tll_init();
- if (!parse_key_combos(conf, value, &key_combos, path, lineno) ||
+ if (!parse_key_combos(
+ conf, value, &key_combos, section, key, path, lineno) ||
has_key_binding_collisions(
conf, action, binding_action_map, bindings, &key_combos,
path, lineno))
@@ -2040,10 +2057,10 @@ add_default_key_bindings(struct config *conf)
add_binding(BIND_ACTION_SCROLLBACK_UP_PAGE, shift, XKB_KEY_Page_Up);
add_binding(BIND_ACTION_SCROLLBACK_DOWN_PAGE, shift, XKB_KEY_Page_Down);
- add_binding(BIND_ACTION_CLIPBOARD_COPY, ctrl_shift, XKB_KEY_C);
- add_binding(BIND_ACTION_CLIPBOARD_PASTE, ctrl_shift, XKB_KEY_V);
+ add_binding(BIND_ACTION_CLIPBOARD_COPY, ctrl_shift, XKB_KEY_c);
+ add_binding(BIND_ACTION_CLIPBOARD_PASTE, ctrl_shift, XKB_KEY_v);
add_binding(BIND_ACTION_PRIMARY_PASTE, shift, XKB_KEY_Insert);
- add_binding(BIND_ACTION_SEARCH_START, ctrl_shift, XKB_KEY_R);
+ add_binding(BIND_ACTION_SEARCH_START, ctrl_shift, XKB_KEY_r);
add_binding(BIND_ACTION_FONT_SIZE_UP, ctrl, XKB_KEY_plus);
add_binding(BIND_ACTION_FONT_SIZE_UP, ctrl, XKB_KEY_equal);
add_binding(BIND_ACTION_FONT_SIZE_UP, ctrl, XKB_KEY_KP_Add);
@@ -2051,8 +2068,8 @@ add_default_key_bindings(struct config *conf)
add_binding(BIND_ACTION_FONT_SIZE_DOWN, ctrl, XKB_KEY_KP_Subtract);
add_binding(BIND_ACTION_FONT_SIZE_RESET, ctrl, XKB_KEY_0);
add_binding(BIND_ACTION_FONT_SIZE_RESET, ctrl, XKB_KEY_KP_0);
- add_binding(BIND_ACTION_SPAWN_TERMINAL, ctrl_shift, XKB_KEY_N);
- add_binding(BIND_ACTION_SHOW_URLS_LAUNCH, ctrl_shift, XKB_KEY_U);
+ add_binding(BIND_ACTION_SPAWN_TERMINAL, ctrl_shift, XKB_KEY_n);
+ add_binding(BIND_ACTION_SHOW_URLS_LAUNCH, ctrl_shift, XKB_KEY_u);
#undef add_binding
}