Skip to content

Commit f9b60b1

Browse files
authored
Merge pull request #11 from fufesou/fix/macos_convert_unicode
fix: macos, convert unicode, shift
2 parents c6982ca + 3678a58 commit f9b60b1

File tree

1 file changed

+14
-8
lines changed

1 file changed

+14
-8
lines changed

src/macos/common.rs

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -208,15 +208,21 @@ pub unsafe fn convert(
208208
EventType::KeyPress(..) => {
209209
let code =
210210
cg_event.get_integer_value_field(EventField::KEYBOARD_EVENT_KEYCODE) as u32;
211-
if code == kVK_Shift as _ || code == kVK_RightShift as _ {
212-
return None;
211+
#[allow(non_upper_case_globals)]
212+
let skip_unicode = match code as CGKeyCode {
213+
kVK_Shift | kVK_RightShift | kVK_ForwardDelete => true,
214+
_ => false,
215+
};
216+
if skip_unicode {
217+
None
218+
} else {
219+
let flags = cg_event.get_flags();
220+
let s = keyboard_state.create_unicode_for_key(code, flags);
221+
// if s.is_none() {
222+
// s = Some(key_to_name(_k).to_owned())
223+
// }
224+
s
213225
}
214-
let flags = cg_event.get_flags();
215-
let s = keyboard_state.create_unicode_for_key(code, flags);
216-
// if s.is_none() {
217-
// s = Some(key_to_name(_k).to_owned())
218-
// }
219-
s
220226
}
221227
EventType::KeyRelease(..) => None,
222228
_ => None,

0 commit comments

Comments
 (0)