From 24ee3dcc10c5e1cf57456cc39fa0b5e8700a06ed Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Sun, 17 Apr 2022 16:29:30 +0200 Subject: wayland: refactor: remove ‘struct config’ pointer from wayland struct MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- key-binding.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'key-binding.c') 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 -- cgit v1.3