blasthavers/minicrossterm
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix ALT + numbers and ignore invalid keys (#488)

Browse Source
This commit is contained in:
sigmaSd 2020-09-18 14:52:27 +02:00 committed by GitHub
parent 729f3c6931
commit 2857b30f24
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/event/sys/windows/parse.rs
View File

@ -79,19 +79,16 @@ fn parse_key_event_record(key_event: &KeyEventRecord) -> Option<KeyEvent> {
let character_raw = key_event.u_char; let character_raw = key_event.u_char;
if character_raw < 255 { if character_raw < 255 {
// Invalid character
if character_raw == 0 {
return None;
}
let mut character = character_raw as u8 as char; let mut character = character_raw as u8 as char;
if modifiers.contains(KeyModifiers::ALT) { if modifiers.contains(KeyModifiers::CONTROL)
// If the ALT key is held down, pressing the A key produces ALT+A, which the system does not treat as a character at all, but rather as a system command. && !modifiers.contains(KeyModifiers::ALT)
// The pressed command is stored in `virtual_key_code`. {
let command = key_event.virtual_key_code as u8 as char;
if command.is_alphabetic() {
character = command;
} else {
return None;
}
} else if modifiers.contains(KeyModifiers::CONTROL) {
// we need to do some parsing // we need to do some parsing
character = match character_raw as u8 { character = match character_raw as u8 {
c @ b'\x01'..=b'\x1A' => (c as u8 - 0x1 + b'a') as char, c @ b'\x01'..=b'\x1A' => (c as u8 - 0x1 + b'a') as char,