From 56cb6df3f82ff216dcb0aa04980bda7b6554d893 Mon Sep 17 00:00:00 2001 From: Ian Ray Date: Wed, 20 Nov 2024 20:21:00 +0200 Subject: [PATCH] shared: fix binding-modifier none Fix binding-modifier "none" which was defaulting to Super. Commit [1] introduced the original support for "none" but the logic was subsequently lost in f7ba35f5. [1] 553d1248 ("desktop-shell: Allow binding-modifier weston.ini option to be none") Fixes: #976 Fixes: f7ba35f5 ("kiosk-shell: Enable debug keybindings") Signed-off-by: Ian Ray (cherry picked from commit fc278fb3ccfa81fe1231b896fc1a181311669353) --- shared/config-parser.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/shared/config-parser.c b/shared/config-parser.c index 749158df7..cd93e5f34 100644 --- a/shared/config-parser.c +++ b/shared/config-parser.c @@ -600,7 +600,7 @@ weston_config_get_binding_modifier(struct weston_config *config, weston_config_section_get_string(shell_section, "binding-modifier", &mod_string, "super"); - if (!mod_string || !strcmp(mod_string, "none")) + if (!mod_string) mod = default_mod; else if (!strcmp(mod_string, "super")) mod = MODIFIER_SUPER; @@ -610,6 +610,8 @@ weston_config_get_binding_modifier(struct weston_config *config, mod = MODIFIER_CTRL; else if (!strcmp(mod_string, "shift")) mod = MODIFIER_SHIFT; + else if (!strcmp(mod_string, "none")) + mod = 0; free(mod_string);