diff options
| author | Daniel Eklöf <daniel@ekloef.se> | 2020-12-07 18:11:50 +0000 |
|---|---|---|
| committer | Daniel Eklöf <daniel@ekloef.se> | 2020-12-07 18:11:50 +0000 |
| commit | cbda2fb9c1aa89540645ab64f92dedf0f07daf43 (patch) | |
| tree | a9e91528340df04046c5e99b8153af32b46a4798 | |
| parent | changelog: remove ‘crash when pasting non-textual clipboard content’ (diff) | |
| parent | config: ignore “self” when detecting key binding collisions (diff) | |
Merge branch 'allow-key-collision-if-action-is-the-same'
Closes #233
| -rw-r--r-- | CHANGELOG.md | 5 | ||||
| -rw-r--r-- | config.c | 16 |
2 files changed, 17 insertions, 4 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 74a8932e..d50a39af 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -96,6 +96,11 @@ means foot can be PGO:d in e.g. sandboxed build scripts. See ### Deprecated ### Removed ### Fixed + +* Error when re-assigning a default key binding + (https://codeberg.org/dnkl/foot/issues/233). + + ### Security @@ -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; |
