From 6af0378916afad201facb1fcccf0fee961130ef7 Mon Sep 17 00:00:00 2001 From: Johannes Altmanninger Date: Sun, 30 Mar 2025 08:33:24 +0200 Subject: [PATCH] Don't insert text from keys like super-i While at it, use declaration order for modifiers. (cherry picked from commit 35ae0bf1f216a866066775db640282e3c50353d0) --- src/input_common.rs | 2 +- src/key.rs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/input_common.rs b/src/input_common.rs index 687816795..ca7508acc 100644 --- a/src/input_common.rs +++ b/src/input_common.rs @@ -560,10 +560,10 @@ pub(crate) fn terminal_protocols_disable_ifn() { fn parse_mask(mask: u32) -> Modifiers { Modifiers { - sup: (mask & 8) != 0, ctrl: (mask & 4) != 0, alt: (mask & 2) != 0, shift: (mask & 1) != 0, + sup: (mask & 8) != 0, } } diff --git a/src/key.rs b/src/key.rs index d18c7d2bb..7b8346ff5 100644 --- a/src/key.rs +++ b/src/key.rs @@ -72,10 +72,10 @@ const fn new() -> Self { m }; pub(crate) fn is_some(&self) -> bool { - self.ctrl || self.alt || self.shift + *self != Self::new() } pub(crate) fn is_none(&self) -> bool { - !self.is_some() + *self == Self::new() } }