Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #523 from zed-industries/no-cmd-ctrl-input

Browse source 
Don't insert input into editors when control or command keys are held
This commit is contained in:
Max Brunsfeld 2022-03-02 14:19:54 -08:00 • committed by GitHub
commit 9e519b9b10
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

33
crates/gpui/src/platform/mac/event.rs
View file

@ -21,14 +21,19 @@ impl Event {
match event_type { match event_type {
NSEventType::NSKeyDown => { NSEventType::NSKeyDown => {
let mut input = None;
let modifiers = native_event.modifierFlags(); let modifiers = native_event.modifierFlags();
let ctrl = modifiers.contains(NSEventModifierFlags::NSControlKeyMask);
let alt = modifiers.contains(NSEventModifierFlags::NSAlternateKeyMask);
let shift = modifiers.contains(NSEventModifierFlags::NSShiftKeyMask);
let cmd = modifiers.contains(NSEventModifierFlags::NSCommandKeyMask);
let unmodified_chars = CStr::from_ptr( let unmodified_chars = CStr::from_ptr(
native_event.charactersIgnoringModifiers().UTF8String() as *mut c_char, native_event.charactersIgnoringModifiers().UTF8String() as *mut c_char,
) )
.to_str() .to_str()
.unwrap(); .unwrap();
let mut input = None;
let unmodified_chars = if let Some(first_char) = unmodified_chars.chars().next() { let unmodified_chars = if let Some(first_char) = unmodified_chars.chars().next() {
use cocoa::appkit::*; use cocoa::appkit::*;
const BACKSPACE_KEY: u16 = 0x7f; const BACKSPACE_KEY: u16 = 0x7f;
@ -71,14 +76,16 @@ impl Event {
NSF12FunctionKey => "f12", NSF12FunctionKey => "f12",
_ => { _ => {
input = Some( if !cmd && !ctrl {
CStr::from_ptr( input = Some(
native_event.characters().UTF8String() as *mut c_char CStr::from_ptr(
) native_event.characters().UTF8String() as *mut c_char
.to_str() )
.unwrap() .to_str()
.into(), .unwrap()
); .into(),
);
}
unmodified_chars unmodified_chars
} }
} }
@ -88,10 +95,10 @@ impl Event {
Some(Self::KeyDown { Some(Self::KeyDown {
keystroke: Keystroke { keystroke: Keystroke {
ctrl: modifiers.contains(NSEventModifierFlags::NSControlKeyMask), ctrl,
alt: modifiers.contains(NSEventModifierFlags::NSAlternateKeyMask), alt,
shift: modifiers.contains(NSEventModifierFlags::NSShiftKeyMask), shift,
cmd: modifiers.contains(NSEventModifierFlags::NSCommandKeyMask), cmd,
key: unmodified_chars.into(), key: unmodified_chars.into(),
}, },
input, input,