Skip to content

fix: 修复键盘码解析器没能正确处理类似ctrl C的控制字符的问题 #877

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 6, 2024
Merged

fix: 修复键盘码解析器没能正确处理类似ctrl C的控制字符的问题 #877

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4c43a07
fix: 修复键盘码解析器没能正确处理类似ctrl C的控制字符的问题
fslongjin Aug 2, 2024
b989e34
fix: 解决ntty潜在的panic问题
fslongjin Aug 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions kernel/src/driver/tty/tty_ldisc/ntty.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -388,9 +388,9 @@ impl NTtyData {
continue;
}

if self.char_map.get(c as usize).unwrap() {
if ((c as usize) < self.char_map.size()) && self.char_map.get(c as usize).unwrap() {
// 特殊字符
self.receive_special_char(c, tty.clone(), lookahead_done)
self.receive_special_char(c, tty.clone(), lookahead_done);
} else {
self.receive_char(c, tty.clone());
}
Expand Down
18 changes: 12 additions & 6 deletions kernel/src/libs/keyboard_parser.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,8 @@ impl TypeOneFSMState {
}

// shift被按下
if scancode_status.shift_l || scancode_status.shift_r {
let shift = scancode_status.shift_l || scancode_status.shift_r;
if shift {
col = true;
}

Expand All @@ -327,20 +328,25 @@ impl TypeOneFSMState {

let mut ch = TYPE1_KEY_CODE_MAPTABLE[col as usize + 2 * index as usize];
if key != KeyFlag::NoneFlag {
// debug!("EMIT: ch is '{}', keyflag is {:?}\n", ch as char, key);
if scancode_status.ctrl_l || scancode_status.ctrl_r {
ch = Self::to_ctrl(ch);
ch = Self::to_ctrl(ch, shift);
}
Self::emit(ch);
}
return TypeOneFSMState::Start;
}

#[inline]
fn to_ctrl(ch: u8) -> u8 {
fn to_ctrl(ch: u8, shift: bool) -> u8 {
return match ch as char {
'a'..='z' => ch - 0x40,
'A'..='Z' => ch - 0x40,
'a'..='z' => ch - 0x60,
'A'..='Z' => {
if shift {
ch
} else {
ch - 0x40
}
}
'@'..='_' => ch - 0x40,
_ => ch,
};
Expand Down
Loading