diff --git a/src/config.rs b/src/config.rs index 2e746623..0c774f37 100644 --- a/src/config.rs +++ b/src/config.rs @@ -106,6 +106,17 @@ pub struct Url { pub modifiers: ModifiersState, } +impl Url { + // Make sure that modifiers in the config are always present, + // but ignore surplus modifiers. + pub fn mods_match_relaxed(&self, mods: ModifiersState) -> bool { + !((self.modifiers.shift && !mods.shift) + || (self.modifiers.ctrl && !mods.ctrl) + || (self.modifiers.alt && !mods.alt) + || (self.modifiers.logo && !mods.logo)) + } +} + fn deserialize_modifiers<'a, D>(deserializer: D) -> ::std::result::Result where D: de::Deserializer<'a> { diff --git a/src/input.rs b/src/input.rs index 49a9101e..b705fd19 100644 --- a/src/input.rs +++ b/src/input.rs @@ -520,7 +520,9 @@ impl<'a, A: ActionContext + 'a> Processor<'a, A> { // Spawn URL launcher when clicking on URLs fn launch_url(&self, modifiers: ModifiersState) -> Option<()> { - if modifiers != self.mouse_config.url.modifiers || self.ctx.mouse().block_url_launcher { + if !self.mouse_config.url.mods_match_relaxed(modifiers) + || self.ctx.mouse().block_url_launcher + { return None; }