aboutsummaryrefslogtreecommitdiff
path: root/key-binding.c
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2022-04-17 14:29:30 +0000
committerDaniel Eklöf <daniel@ekloef.se>2022-04-17 14:34:04 +0000
commit24ee3dcc10c5e1cf57456cc39fa0b5e8700a06ed (patch)
treef5871e5c51a51600326a001ca592afddb3fa01f8 /key-binding.c
parentkey-binding: NOINLINE a couple of functions, for a minor code size reduction (diff)
wayland: refactor: remove ‘struct config’ pointer from wayland struct
The global config doesn’t necessarily reflect the correct configuration to use - we should *always* use the current terminal instance’s conf pointer. * Move selection override modifier mask to the key_binding_set struct * Always warn if XDG activation is unavailable, not just if bell.urgent is set (we no longer have access to this information) * Pass ‘bool presentation_timings’ as a parameter to wayl_init() * Remove ‘presentation_timings’ member from the ‘terminal’ struct Closes #932
Diffstat (limited to 'key-binding.c')
-rw-r--r--key-binding.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/key-binding.c b/key-binding.c
index a9e23d44..9133f60c 100644
--- a/key-binding.c
+++ b/key-binding.c
@@ -460,6 +460,9 @@ load_keymap(struct key_set *set)
convert_search_bindings(set);
convert_url_bindings(set);
convert_mouse_bindings(set);
+
+ set->public.selection_overrides = conf_modifiers_to_mask(
+ set->seat, &set->conf->mouse.selection_override_modifiers);
}
void
@@ -495,6 +498,7 @@ unload_keymap(struct key_set *set)
key_bindings_destroy(&set->public.search);
key_bindings_destroy(&set->public.url);
key_bindings_destroy(&set->public.mouse);
+ set->public.selection_overrides = 0;
}
void