config: rename enum config_key_binding_type -> key_binding_type

This commit is contained in:
Daniel Eklöf 2022-02-08 19:02:28 +01:00
parent 56b948ca20
commit 9814d96206
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
4 changed files with 7 additions and 7 deletions

View file

@ -1640,7 +1640,7 @@ mouse_button_code_to_name(int code)
static bool NOINLINE static bool NOINLINE
value_to_key_combos(struct context *ctx, int action, struct argv *argv, value_to_key_combos(struct context *ctx, int action, struct argv *argv,
struct config_key_binding_list *bindings, struct config_key_binding_list *bindings,
enum config_key_binding_type type) enum key_binding_type type)
{ {
if (strcasecmp(ctx->value, "none") == 0) { if (strcasecmp(ctx->value, "none") == 0) {
remove_from_key_bindings_list(bindings, action, argv); 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, resolve_key_binding_collisions(struct config *conf, const char *section_name,
const char *const action_map[], const char *const action_map[],
struct config_key_binding_list *bindings, struct config_key_binding_list *bindings,
enum config_key_binding_type type) enum key_binding_type type)
{ {
bool ret = true; bool ret = true;

View file

@ -49,7 +49,7 @@ struct config_binding_pipe {
bool master_copy; bool master_copy;
}; };
enum config_key_binding_type { enum key_binding_type {
KEY_BINDING, KEY_BINDING,
MOUSE_BINDING, MOUSE_BINDING,
}; };

View file

@ -677,7 +677,7 @@ static void
test_key_binding(struct context *ctx, bool (*parse_fun)(struct context *ctx), test_key_binding(struct context *ctx, bool (*parse_fun)(struct context *ctx),
int action, int max_action, const char *const *map, int action, int max_action, const char *const *map,
struct config_key_binding_list *bindings, struct config_key_binding_list *bindings,
enum config_key_binding_type type) enum key_binding_type type)
{ {
xassert(map[action] != NULL); xassert(map[action] != NULL);
xassert(bindings->count == 0); xassert(bindings->count == 0);
@ -840,7 +840,7 @@ enum collision_test_mode {
static void static void
_test_binding_collisions(struct context *ctx, _test_binding_collisions(struct context *ctx,
int max_action, const char *const *map, int max_action, const char *const *map,
enum config_key_binding_type type, enum key_binding_type type,
enum collision_test_mode test_mode) enum collision_test_mode test_mode)
{ {
struct config_key_binding *bindings_array = struct config_key_binding *bindings_array =
@ -937,7 +937,7 @@ _test_binding_collisions(struct context *ctx,
static void static void
test_binding_collisions(struct context *ctx, test_binding_collisions(struct context *ctx,
int max_action, const char *const *map, 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_ACTION);
_test_binding_collisions(ctx, max_action, map, type, FAIL_DIFFERENT_ARGV); _test_binding_collisions(ctx, max_action, map, type, FAIL_DIFFERENT_ARGV);

View file

@ -101,7 +101,7 @@ enum bind_action_url {
typedef tll(xkb_keycode_t) xkb_keycode_list_t; typedef tll(xkb_keycode_t) xkb_keycode_list_t;
struct key_binding { struct key_binding {
enum config_key_binding_type type; enum key_binding_type type;
int action; /* enum bind_action_* */ int action; /* enum bind_action_* */
char **pipe_argv; char **pipe_argv;