aboutsummaryrefslogtreecommitdiff
path: root/config.h
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2023-05-06 09:39:38 +0000
committerDaniel Eklöf <daniel@ekloef.se>2024-02-06 10:05:20 +0000
commit4730ff8d080e82fad0554dfcb957dfc82f6568b3 (patch)
treea5958828b1ee63c30f459c68f5ce72236e162607 /config.h
parentfeature: add resize-by-cells option to constrain window sizes... (diff)
input/config: support *all* modifier names
That is, allow custom modifiers (i.e. other than ctrl/shift/alt etc) in key bindings. This is done by no longer validating/translating modifier names to booleans for a pre-configured set of modifiers (ctrl, shift, alt, super). Instead, we keep the modifier *names* in a list, in the key binding struct. When a keymap is loaded, and we "convert" the key binding, _then_ we do modifier translation. For invalid modifier names, we print an error, and then ignore it. I.e. we no longer fail to load a config due to invalid modifier names. We also need to update how we determine the set of significant modifiers. Any modifier not in this list will be ignored when matching key bindings. Before this patch, we hardcoded this to shift/alt/ctrl/super. Now, to handle custom modifiers as well, we simply treat *all* modifiers defined by the current layout as significant. Typically, the only unwanted modifiers are "locked" modifiers. We are already filtering these out.
Diffstat (limited to 'config.h')
-rw-r--r--config.h13
1 files changed, 10 insertions, 3 deletions
diff --git a/config.h b/config.h
index cc4094c4..39f169f9 100644
--- a/config.h
+++ b/config.h
@@ -38,12 +38,14 @@ struct config_font {
};
DEFINE_LIST(struct config_font);
+#if 0
struct config_key_modifiers {
bool shift;
bool alt;
bool ctrl;
bool super;
};
+#endif
struct argv {
char **args;
@@ -74,9 +76,12 @@ enum key_binding_type {
MOUSE_BINDING,
};
+typedef tll(char *) config_modifier_list_t;
+
struct config_key_binding {
int action; /* One of the varios bind_action_* enums from wayland.h */
- struct config_key_modifiers modifiers;
+ //struct config_key_modifiers modifiers;
+ config_modifier_list_t modifiers;
union {
/* Key bindings */
struct {
@@ -263,7 +268,8 @@ struct config {
struct {
bool hide_when_typing;
bool alternate_scroll_mode;
- struct config_key_modifiers selection_override_modifiers;
+ //struct config_key_modifiers selection_override_modifiers;
+ config_modifier_list_t selection_override_modifiers;
} mouse;
struct {
@@ -375,10 +381,11 @@ struct config *config_clone(const struct config *old);
bool config_font_parse(const char *pattern, struct config_font *font);
void config_font_list_destroy(struct config_font_list *font_list);
+#if 0
struct seat;
xkb_mod_mask_t
conf_modifiers_to_mask(
const struct seat *seat, const struct config_key_modifiers *modifiers);
-
+#endif
bool check_if_font_is_monospaced(
const char *pattern, user_notifications_t *notifications);