Samuka007/asterinas
1
0
Fork 0
mirror of https://github.com/asterinas/asterinas.git synced 2025-06-24 18:03:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor the tty output logic

Browse Source
This commit is contained in:
Jianfeng Jiang
2023-06-15 14:52:55 +08:00
committed by Tate, Hongliang Tian
parent 288374ee09
commit 61c2f6ee82
1 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
services/libs/jinux-std/src/device/tty/line_discipline.rs
View File

@ -144,24 +144,24 @@ impl LineDiscipline {
// TODO: respect output flags // TODO: respect output flags
fn output_char(&self, item: u8, termios: &KernelTermios) { fn output_char(&self, item: u8, termios: &KernelTermios) {
if 0x20 <= item && item < 0x7f { match item {
let ch = char::from(item); b'\n' => print!("\n"),
print!("{}", ch); b'\r' => print!("\r\n"),
} item if item == *termios.get_special_char(CC_C_CHAR::VERASE) => {
if item == *termios.get_special_char(CC_C_CHAR::VERASE) { // write a space to overwrite current character
// write a space to overwrite current character let backspace: &str = core::str::from_utf8(&[b'\x08', b' ', b'\x08']).unwrap();
let bytes: [u8; 3] = [b'\x08', b' ', b'\x08']; print!("{}", backspace);
let backspace = core::str::from_utf8(&bytes).unwrap();
print!("{}", backspace);
}
if termios.contains_echo_ctl() {
// The unprintable chars between 1-31 are mapped to ctrl characters between 65-95.
// e.g., 0x3 is mapped to 0x43, which is C. So, we will print ^C when 0x3 is met.
if 0 < item && item < 0x20 {
let ctrl_char_ascii = item + 0x40;
let ctrl_char = char::from(ctrl_char_ascii);
print!("^{ctrl_char}");
} }
item if 0x20 <= item && item < 0x7f => print!("{}", char::from(item)),
item if 0 < item && item < 0x20 && termios.contains_echo_ctl() => {
// The unprintable chars between 1-31 are mapped to ctrl characters between 65-95.
// e.g., 0x3 is mapped to 0x43, which is C. So, we will print ^C when 0x3 is met.
if 0 < item && item < 0x20 {
let ctrl_char = char::from(item + 0x40);
print!("^{ctrl_char}");
}
}
item => {}
} }
} }