diff options
| author | Daniel Eklöf <daniel@ekloef.se> | 2022-02-08 18:02:28 +0000 |
|---|---|---|
| committer | Daniel Eklöf <daniel@ekloef.se> | 2022-02-09 16:51:05 +0000 |
| commit | 9814d9620607f18c8ac7f99b2b87cdc7e100020d (patch) | |
| tree | ab0679dac23b506d2eb6074d9b796b4e66a8c80c | |
| parent | input: call wayl_bindings_reset() when receiving a new keymap (diff) | |
config: rename enum config_key_binding_type -> key_binding_type
| -rw-r--r-- | config.c | 4 | ||||
| -rw-r--r-- | config.h | 2 | ||||
| -rw-r--r-- | tests/test-config.c | 6 | ||||
| -rw-r--r-- | wayland.h | 2 |
4 files changed, 7 insertions, 7 deletions
@@ -1640,7 +1640,7 @@ mouse_button_code_to_name(int code) static bool NOINLINE value_to_key_combos(struct context *ctx, int action, struct argv *argv, struct config_key_binding_list *bindings, - enum config_key_binding_type type) + enum key_binding_type type) { if (strcasecmp(ctx->value, "none") == 0) { remove_from_key_bindings_list(bindings, action, argv); @@ -2002,7 +2002,7 @@ static bool NOINLINE resolve_key_binding_collisions(struct config *conf, const char *section_name, const char *const action_map[], struct config_key_binding_list *bindings, - enum config_key_binding_type type) + enum key_binding_type type) { bool ret = true; @@ -49,7 +49,7 @@ struct config_binding_pipe { bool master_copy; }; -enum config_key_binding_type { +enum key_binding_type { KEY_BINDING, MOUSE_BINDING, }; diff --git a/tests/test-config.c b/tests/test-config.c index bced6b5c..88f22a4a 100644 --- a/tests/test-config.c +++ b/tests/test-config.c @@ -677,7 +677,7 @@ static void test_key_binding(struct context *ctx, bool (*parse_fun)(struct context *ctx), int action, int max_action, const char *const *map, struct config_key_binding_list *bindings, - enum config_key_binding_type type) + enum key_binding_type type) { xassert(map[action] != NULL); xassert(bindings->count == 0); @@ -840,7 +840,7 @@ enum collision_test_mode { static void _test_binding_collisions(struct context *ctx, int max_action, const char *const *map, - enum config_key_binding_type type, + enum key_binding_type type, enum collision_test_mode test_mode) { struct config_key_binding *bindings_array = @@ -937,7 +937,7 @@ _test_binding_collisions(struct context *ctx, static void test_binding_collisions(struct context *ctx, int max_action, const char *const *map, - enum config_key_binding_type type) + enum key_binding_type type) { _test_binding_collisions(ctx, max_action, map, type, FAIL_DIFFERENT_ACTION); _test_binding_collisions(ctx, max_action, map, type, FAIL_DIFFERENT_ARGV); @@ -101,7 +101,7 @@ enum bind_action_url { typedef tll(xkb_keycode_t) xkb_keycode_list_t; struct key_binding { - enum config_key_binding_type type; + enum key_binding_type type; int action; /* enum bind_action_* */ char **pipe_argv; |
