aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--config.c4
-rw-r--r--config.h2
-rw-r--r--tests/test-config.c6
-rw-r--r--wayland.h2
4 files changed, 7 insertions, 7 deletions
diff --git a/config.c b/config.c
index 0c9c8f43..011b4875 100644
--- a/config.c
+++ b/config.c
@@ -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;
diff --git a/config.h b/config.h
index a329af70..473cfdd4 100644
--- a/config.h
+++ b/config.h
@@ -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);
diff --git a/wayland.h b/wayland.h
index 78788278..ea0b8ae6 100644
--- a/wayland.h
+++ b/wayland.h
@@ -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;