diff options
| author | Daniel Eklöf <daniel@ekloef.se> | 2020-12-05 10:21:17 +0000 |
|---|---|---|
| committer | Daniel Eklöf <daniel@ekloef.se> | 2020-12-05 10:21:17 +0000 |
| commit | 5e46672cf44f10fb879f2fb9ab8a5b19384dcd5c (patch) | |
| tree | a9e91528340df04046c5e99b8153af32b46a4798 /config.c | |
| parent | changelog: remove ‘crash when pasting non-textual clipboard content’ (diff) | |
config: ignore “self” when detecting key binding collisions
Previously, foot would not accept the following:
[key-bindings]
minimize=Escape
minimize=Escape
Now it does. I.e. key combos in the action being updated are ignored
when detecting collisions.
The example above is contrived; a real world example could be to
remove certain combos from an action with multiple combos; perhaps to
free up a combo for another action. Example:
[search-bindings]
cancel=Escape
This would previously cause an error since `cancel=Control+g Escape`
by default.
Closes #233
Diffstat (limited to 'config.c')
| -rw-r--r-- | config.c | 16 |
1 files changed, 12 insertions, 4 deletions
@@ -1024,10 +1024,14 @@ err: } static bool -has_key_binding_collisions(struct config *conf, const key_combo_list_t *key_combos, +has_key_binding_collisions(struct config *conf, enum bind_action_normal action, + const key_combo_list_t *key_combos, const char *path, unsigned lineno) { tll_foreach(conf->bindings.key, it) { + if (it->item.action == action) + continue; + tll_foreach(*key_combos, it2) { const struct config_key_modifiers *mods1 = &it->item.modifiers; const struct config_key_modifiers *mods2 = &it2->item.modifiers; @@ -1055,10 +1059,14 @@ has_key_binding_collisions(struct config *conf, const key_combo_list_t *key_comb } static bool -has_search_binding_collisions(struct config *conf, const key_combo_list_t *key_combos, +has_search_binding_collisions(struct config *conf, enum bind_action_search action, + const key_combo_list_t *key_combos, const char *path, unsigned lineno) { tll_foreach(conf->bindings.search, it) { + if (it->item.action == action) + continue; + tll_foreach(*key_combos, it2) { const struct config_key_modifiers *mods1 = &it->item.modifiers; const struct config_key_modifiers *mods2 = &it2->item.modifiers; @@ -1245,7 +1253,7 @@ parse_section_key_bindings( key_combo_list_t key_combos = tll_init(); if (!parse_key_combos(conf, value, &key_combos, path, lineno) || - has_key_binding_collisions(conf, &key_combos, path, lineno)) + has_key_binding_collisions(conf, action, &key_combos, path, lineno)) { free(pipe_argv); free(pipe_cmd); @@ -1325,7 +1333,7 @@ parse_section_search_bindings( key_combo_list_t key_combos = tll_init(); if (!parse_key_combos(conf, value, &key_combos, path, lineno) || - has_search_binding_collisions(conf, &key_combos, path, lineno)) + has_search_binding_collisions(conf, action, &key_combos, path, lineno)) { free_key_combo_list(&key_combos); return false; |
