mirrors/foot
1
0
Fork 0
mirror of https://codeberg.org/dnkl/foot.git synced 2026-04-27 06:46:44 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

config: unify key- and mouse bindings

Browse source 
With this patch, key- and mouse-bindings structs (the non-layout
specific ones) are unified into a single struct.

The logic that parses, and manages, the key- and mouse binding lists
are almost identical. The *only* difference between a key- and a mouse
binding is that key bindings have an XKB symbol, and mouse bindings a
button and click-count.

The new, unified, struct uses a union around these, and all functions
that need to know which members to use/operate on now takes a ‘type’
parameter.
This commit is contained in:
Daniel Eklöf 2021-12-06 21:04:38 +01:00
parent 4c50c44cf7
commit f6a591b80a
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
3 changed files with 242 additions and 411 deletions
Download patch file Download diff file Expand all files Collapse all files

23
config.h
View file

@ -40,10 +40,27 @@ struct config_binding_pipe {
bool master_copy;
};
enum config_key_binding_type {
KEY_BINDING,
MOUSE_BINDING,
};
struct config_key_binding {
int action; /* One of the varios bind_action_* enums from wayland.h */
struct config_key_modifiers modifiers;
xkb_keysym_t sym;
union {
/* Key bindings */
struct {
xkb_keysym_t sym;
} k;
/* Mouse bindings */
struct {
int button;
int count;
} m;
};
struct config_binding_pipe pipe;
/* For error messages in collision handling */
@ -52,6 +69,7 @@ struct config_key_binding {
};
DEFINE_LIST(struct config_key_binding);
#if 0
struct config_mouse_binding {
enum bind_action_normal action;
struct config_key_modifiers modifiers;
@ -64,6 +82,7 @@ struct config_mouse_binding {
int lineno;
};
DEFINE_LIST(struct config_mouse_binding);
#endif
typedef tll(char *) config_override_t;
@ -207,7 +226,7 @@ struct config {
struct {
/* Bindings for "normal" mode */
struct config_key_binding_list key;
struct config_mouse_binding_list mouse;
struct config_key_binding_list mouse;
/*
* Special modes