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

Don't insert input in editor when control keys are pressed

Browse source
This commit is contained in:
Nathan Sobo 2022-02-21 18:21:27 -07:00
parent 7cd5dbd2a8
commit 618f0a127a
4 changed files with 34 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -21,11 +21,13 @@ impl Event {
match event_type {
NSEventType::NSKeyDown => {
let mut input = None;
let modifiers = native_event.modifierFlags();
let unmodified_chars = native_event.charactersIgnoringModifiers();
let unmodified_chars = CStr::from_ptr(unmodified_chars.UTF8String() as *mut c_char)
.to_str()
.unwrap();
let unmodified_chars = CStr::from_ptr(
native_event.charactersIgnoringModifiers().UTF8String() as *mut c_char,
)
.to_str()
.unwrap();
let unmodified_chars = if let Some(first_char) = unmodified_chars.chars().next() {
use cocoa::appkit::*;
@ -38,7 +40,10 @@ impl Event {
#[allow(non_upper_case_globals)]
match first_char as u16 {
SPACE_KEY => "space",
SPACE_KEY => {
input = Some(" ".to_string());
"space"
}
BACKSPACE_KEY => "backspace",
ENTER_KEY => "enter",
ESCAPE_KEY => "escape",
@ -65,18 +70,22 @@ impl Event {
NSF11FunctionKey => "f11",
NSF12FunctionKey => "f12",
_ => unmodified_chars,
_ => {
input = Some(
CStr::from_ptr(
native_event.characters().UTF8String() as *mut c_char
)
.to_str()
.unwrap()
.into(),
);
unmodified_chars
}
}
} else {
return None;
};
let chars = native_event.characters();
let chars = CStr::from_ptr(chars.UTF8String() as *mut c_char)
.to_str()
.unwrap()
.into();
Some(Self::KeyDown {
keystroke: Keystroke {
ctrl: modifiers.contains(NSEventModifierFlags::NSControlKeyMask),
@ -85,7 +94,7 @@ impl Event {
cmd: modifiers.contains(NSEventModifierFlags::NSCommandKeyMask),
key: unmodified_chars.into(),
},
chars,
input,
is_held: native_event.isARepeat() == YES,
})
}