From 149c52bd4496eb4dd13eaa53bec690c60499502a Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Tue, 29 Jun 2021 18:08:15 +0200 Subject: config: remove replaced/removed key bindings, instead of marking as ‘unused’ MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Instead of keeping removed/replaced key bindings in the key binding array (marked as ‘unused’), remove them, by compacting the array. The invariant is thus that there should be *no* entries in the key binding list with the `BIND_ACTION_NONE` for action. Add code to debug builds that verifies this, plus a unit test. Closes #614 --- input.c | 6 ------ 1 file changed, 6 deletions(-) (limited to 'input.c') diff --git a/input.c b/input.c index 7db3ca85..9cf18b53 100644 --- a/input.c +++ b/input.c @@ -529,8 +529,6 @@ convert_key_bindings(const struct config *conf, struct seat *seat) { for (size_t i = 0; i < conf->bindings.key.count; i++) { const struct config_key_binding *binding = &conf->bindings.key.arr[i]; - if (binding->action == BIND_ACTION_NONE) - continue; convert_key_binding(seat, binding, &seat->kbd.bindings.key); } } @@ -540,8 +538,6 @@ convert_search_bindings(const struct config *conf, struct seat *seat) { for (size_t i = 0; i < conf->bindings.search.count; i++) { const struct config_key_binding *binding = &conf->bindings.search.arr[i]; - if (binding->action == BIND_ACTION_SEARCH_NONE) - continue; convert_key_binding(seat, binding, &seat->kbd.bindings.search); } } @@ -551,8 +547,6 @@ convert_url_bindings(const struct config *conf, struct seat *seat) { for (size_t i = 0; i < conf->bindings.url.count; i++) { const struct config_key_binding *binding = &conf->bindings.url.arr[i]; - if (binding->action == BIND_ACTION_URL_NONE) - continue; convert_key_binding(seat, binding, &seat->kbd.bindings.url); } } -- cgit v1.3