emilis
/
termion
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed unwraps on nones occuring on fast subsequent reads in async (+rustfmt)

This commit is contained in:
emilis 2023-01-24 12:51:31 +00:00
parent f2b8517c31
commit ce611b8283
1 changed files with 184 additions and 178 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

362
src/event.rs
View File

@ -107,30 +107,31 @@ pub enum Key {
/// Parse an Event from `item` and possibly subsequent bytes through `iter`. /// Parse an Event from `item` and possibly subsequent bytes through `iter`.
pub fn parse_event<I>(item: u8, iter: &mut I) -> Result<Event, Error> pub fn parse_event<I>(item: u8, iter: &mut I) -> Result<Event, Error>
where I: Iterator<Item = Result<u8, Error>> where
I: Iterator<Item = Result<u8, Error>>,
{ {
let error = Error::new(ErrorKind::Other, "Could not parse an event"); let error = Error::new(ErrorKind::Other, "Could not parse an event");
match item { match item {
b'\x1B' => { b'\x1B' => {
// This is an escape character, leading a control sequence. // This is an escape character, leading a control sequence.
Ok(match iter.next() { Ok(match iter.next() {
Some(Ok(b'O')) => { Some(Ok(b'O')) => {
match iter.next() { match iter.next() {
// F1-F4 // F1-F4
Some(Ok(val @ b'P'..=b'S')) => Event::Key(Key::F(1 + val - b'P')), Some(Ok(val @ b'P'..=b'S')) => Event::Key(Key::F(1 + val - b'P')),
_ => return Err(error), _ => return Err(error),
}
} }
} Some(Ok(b'[')) => {
Some(Ok(b'[')) => { // This is a CSI sequence.
// This is a CSI sequence. parse_csi(iter).ok_or(error)?
parse_csi(iter).ok_or(error)? }
} Some(Ok(c)) => {
Some(Ok(c)) => { let ch = parse_utf8_char(c, iter)?;
let ch = parse_utf8_char(c, iter)?; Event::Key(Key::Alt(ch))
Event::Key(Key::Alt(ch)) }
} Some(Err(_)) | None => return Err(error),
Some(Err(_)) | None => return Err(error), })
})
} }
b'\n' | b'\r' => Ok(Event::Key(Key::Char('\n'))), b'\n' | b'\r' => Ok(Event::Key(Key::Char('\n'))),
b'\t' => Ok(Event::Key(Key::Char('\t'))), b'\t' => Ok(Event::Key(Key::Char('\t'))),
@ -138,12 +139,10 @@ pub fn parse_event<I>(item: u8, iter: &mut I) -> Result<Event, Error>
c @ b'\x01'..=b'\x1A' => Ok(Event::Key(Key::Ctrl((c as u8 - 0x1 + b'a') as char))), c @ b'\x01'..=b'\x1A' => Ok(Event::Key(Key::Ctrl((c as u8 - 0x1 + b'a') as char))),
c @ b'\x1C'..=b'\x1F' => Ok(Event::Key(Key::Ctrl((c as u8 - 0x1C + b'4') as char))), c @ b'\x1C'..=b'\x1F' => Ok(Event::Key(Key::Ctrl((c as u8 - 0x1C + b'4') as char))),
b'\0' => Ok(Event::Key(Key::Null)), b'\0' => Ok(Event::Key(Key::Null)),
c => { c => Ok({
Ok({ let ch = parse_utf8_char(c, iter)?;
let ch = parse_utf8_char(c, iter)?; Event::Key(Key::Char(ch))
Event::Key(Key::Char(ch)) }),
})
}
} }
} }
@ -151,179 +150,186 @@ pub fn parse_event<I>(item: u8, iter: &mut I) -> Result<Event, Error>
/// ///
/// Returns None if an unrecognized sequence is found. /// Returns None if an unrecognized sequence is found.
fn parse_csi<I>(iter: &mut I) -> Option<Event> fn parse_csi<I>(iter: &mut I) -> Option<Event>
where I: Iterator<Item = Result<u8, Error>> where
I: Iterator<Item = Result<u8, Error>>,
{ {
Some(match iter.next() { Some(match iter.next() {
Some(Ok(b'[')) => match iter.next() { Some(Ok(b'[')) => match iter.next() {
Some(Ok(val @ b'A'..=b'E')) => Event::Key(Key::F(1 + val - b'A')), Some(Ok(val @ b'A'..=b'E')) => Event::Key(Key::F(1 + val - b'A')),
_ => return None,
},
Some(Ok(b'D')) => Event::Key(Key::Left),
Some(Ok(b'C')) => Event::Key(Key::Right),
Some(Ok(b'A')) => Event::Key(Key::Up),
Some(Ok(b'B')) => Event::Key(Key::Down),
Some(Ok(b'H')) => Event::Key(Key::Home),
Some(Ok(b'F')) => Event::Key(Key::End),
Some(Ok(b'Z')) => Event::Key(Key::BackTab),
Some(Ok(b'M')) => {
// X10 emulation mouse encoding: ESC [ CB Cx Cy (6 characters only).
let mut next = || iter.next().unwrap().unwrap();
let cb = next() as i8 - 32;
// (1, 1) are the coords for upper left.
let cx = next().saturating_sub(32) as u16;
let cy = next().saturating_sub(32) as u16;
Event::Mouse(match cb & 0b11 {
0 => {
if cb & 0x40 != 0 {
MouseEvent::Press(MouseButton::WheelUp, cx, cy)
} else {
MouseEvent::Press(MouseButton::Left, cx, cy)
}
}
1 => {
if cb & 0x40 != 0 {
MouseEvent::Press(MouseButton::WheelDown, cx, cy)
} else {
MouseEvent::Press(MouseButton::Middle, cx, cy)
}
}
2 => MouseEvent::Press(MouseButton::Right, cx, cy),
3 => MouseEvent::Release(cx, cy),
_ => return None,
})
}
Some(Ok(b'<')) => {
// xterm mouse encoding:
// ESC [ < Cb ; Cx ; Cy (;) (M or m)
let mut buf = Vec::new();
let mut c = iter.next().unwrap().unwrap();
while match c {
b'm' | b'M' => false,
_ => true,
} {
buf.push(c);
c = iter.next().unwrap().unwrap();
}
let str_buf = String::from_utf8(buf).unwrap();
let nums = &mut str_buf.split(';');
let cb = nums.next()
.unwrap()
.parse::<u16>()
.unwrap();
let cx = nums.next()
.unwrap()
.parse::<u16>()
.unwrap();
let cy = nums.next()
.unwrap()
.parse::<u16>()
.unwrap();
let event = match cb {
0..=2 | 64..=65 => {
let button = match cb {
0 => MouseButton::Left,
1 => MouseButton::Middle,
2 => MouseButton::Right,
64 => MouseButton::WheelUp,
65 => MouseButton::WheelDown,
_ => unreachable!(),
};
match c {
b'M' => MouseEvent::Press(button, cx, cy),
b'm' => MouseEvent::Release(cx, cy),
_ => return None,
}
}
32 => MouseEvent::Hold(cx, cy),
3 => MouseEvent::Release(cx, cy),
_ => return None, _ => return None,
}; },
Some(Ok(b'D')) => Event::Key(Key::Left),
Some(Ok(b'C')) => Event::Key(Key::Right),
Some(Ok(b'A')) => Event::Key(Key::Up),
Some(Ok(b'B')) => Event::Key(Key::Down),
Some(Ok(b'H')) => Event::Key(Key::Home),
Some(Ok(b'F')) => Event::Key(Key::End),
Some(Ok(b'Z')) => Event::Key(Key::BackTab),
Some(Ok(b'M')) => {
// X10 emulation mouse encoding: ESC [ CB Cx Cy (6 characters only).
let mut next = || iter.next().unwrap().unwrap();
Event::Mouse(event) let cb = next() as i8 - 32;
} // (1, 1) are the coords for upper left.
Some(Ok(c @ b'0'..=b'9')) => { let cx = next().saturating_sub(32) as u16;
// Numbered escape code. let cy = next().saturating_sub(32) as u16;
let mut buf = Vec::new(); Event::Mouse(match cb & 0b11 {
buf.push(c); 0 => {
let mut c = iter.next().unwrap().unwrap(); if cb & 0x40 != 0 {
// The final byte of a CSI sequence can be in the range 64-126, so MouseEvent::Press(MouseButton::WheelUp, cx, cy)
// let's keep reading anything else. } else {
while c < 64 || c > 126 { MouseEvent::Press(MouseButton::Left, cx, cy)
buf.push(c); }
c = iter.next().unwrap().unwrap(); }
1 => {
if cb & 0x40 != 0 {
MouseEvent::Press(MouseButton::WheelDown, cx, cy)
} else {
MouseEvent::Press(MouseButton::Middle, cx, cy)
}
}
2 => MouseEvent::Press(MouseButton::Right, cx, cy),
3 => MouseEvent::Release(cx, cy),
_ => return None,
})
} }
Some(Ok(b'<')) => {
match c { // xterm mouse encoding:
// rxvt mouse encoding: // ESC [ < Cb ; Cx ; Cy (;) (M or m)
// ESC [ Cb ; Cx ; Cy ; M let mut buf = Vec::new();
b'M' => { let mut c = match iter.next() {
let str_buf = String::from_utf8(buf).unwrap(); Some(next) => next.unwrap(),
None => return None,
let nums: Vec<u16> = str_buf.split(';').map(|n| n.parse().unwrap()).collect(); };
while match c {
let cb = nums[0]; b'm' | b'M' => false,
let cx = nums[1]; _ => true,
let cy = nums[2]; } {
buf.push(c);
let event = match cb { c = match iter.next() {
32 => MouseEvent::Press(MouseButton::Left, cx, cy), Some(next) => next.unwrap(),
33 => MouseEvent::Press(MouseButton::Middle, cx, cy), None => return None,
34 => MouseEvent::Press(MouseButton::Right, cx, cy),
35 => MouseEvent::Release(cx, cy),
64 => MouseEvent::Hold(cx, cy),
96 | 97 => MouseEvent::Press(MouseButton::WheelUp, cx, cy),
_ => return None,
}; };
Event::Mouse(event)
} }
// Special key code. let str_buf = String::from_utf8(buf).unwrap();
b'~' => { let nums = &mut str_buf.split(';');
let str_buf = String::from_utf8(buf).unwrap();
// This CSI sequence can be a list of semicolon-separated let cb = nums.next().unwrap().parse::<u16>().unwrap();
// numbers. let cx = nums.next().unwrap().parse::<u16>().unwrap();
let nums: Vec<u8> = str_buf.split(';').map(|n| n.parse().unwrap()).collect(); let cy = nums.next().unwrap().parse::<u16>().unwrap();
if nums.is_empty() { let event = match cb {
return None; 0..=2 | 64..=65 => {
let button = match cb {
0 => MouseButton::Left,
1 => MouseButton::Middle,
2 => MouseButton::Right,
64 => MouseButton::WheelUp,
65 => MouseButton::WheelDown,
_ => unreachable!(),
};
match c {
b'M' => MouseEvent::Press(button, cx, cy),
b'm' => MouseEvent::Release(cx, cy),
_ => return None,
}
} }
32 => MouseEvent::Hold(cx, cy),
3 => MouseEvent::Release(cx, cy),
_ => return None,
};
// TODO: handle multiple values for key modififiers (ex: values Event::Mouse(event)
// [3, 2] means Shift+Delete)
if nums.len() > 1 {
return None;
}
match nums[0] {
1 | 7 => Event::Key(Key::Home),
2 => Event::Key(Key::Insert),
3 => Event::Key(Key::Delete),
4 | 8 => Event::Key(Key::End),
5 => Event::Key(Key::PageUp),
6 => Event::Key(Key::PageDown),
v @ 11..=15 => Event::Key(Key::F(v - 10)),
v @ 17..=21 => Event::Key(Key::F(v - 11)),
v @ 23..=24 => Event::Key(Key::F(v - 12)),
_ => return None,
}
}
_ => return None,
} }
} Some(Ok(c @ b'0'..=b'9')) => {
_ => return None, // Numbered escape code.
}) let mut buf = Vec::new();
buf.push(c);
let mut c = match iter.next() {
Some(next) => next.unwrap(),
None => return None,
};
// The final byte of a CSI sequence can be in the range 64-126, so
// let's keep reading anything else.
while c < 64 || c > 126 {
buf.push(c);
c = match iter.next() {
Some(next) => next.unwrap(),
None => return None,
};
}
match c {
// rxvt mouse encoding:
// ESC [ Cb ; Cx ; Cy ; M
b'M' => {
let str_buf = String::from_utf8(buf).unwrap();
let nums: Vec<u16> = str_buf.split(';').map(|n| n.parse().unwrap()).collect();
let cb = nums[0];
let cx = nums[1];
let cy = nums[2];
let event = match cb {
32 => MouseEvent::Press(MouseButton::Left, cx, cy),
33 => MouseEvent::Press(MouseButton::Middle, cx, cy),
34 => MouseEvent::Press(MouseButton::Right, cx, cy),
35 => MouseEvent::Release(cx, cy),
64 => MouseEvent::Hold(cx, cy),
96 | 97 => MouseEvent::Press(MouseButton::WheelUp, cx, cy),
_ => return None,
};
Event::Mouse(event)
}
// Special key code.
b'~' => {
let str_buf = String::from_utf8(buf).unwrap();
// This CSI sequence can be a list of semicolon-separated
// numbers.
let nums: Vec<u8> = str_buf.split(';').map(|n| n.parse().unwrap()).collect();
if nums.is_empty() {
return None;
}
// TODO: handle multiple values for key modififiers (ex: values
// [3, 2] means Shift+Delete)
if nums.len() > 1 {
return None;
}
match nums[0] {
1 | 7 => Event::Key(Key::Home),
2 => Event::Key(Key::Insert),
3 => Event::Key(Key::Delete),
4 | 8 => Event::Key(Key::End),
5 => Event::Key(Key::PageUp),
6 => Event::Key(Key::PageDown),
v @ 11..=15 => Event::Key(Key::F(v - 10)),
v @ 17..=21 => Event::Key(Key::F(v - 11)),
v @ 23..=24 => Event::Key(Key::F(v - 12)),
_ => return None,
}
}
_ => return None,
}
}
_ => return None,
})
} }
/// Parse `c` as either a single byte ASCII char or a variable size UTF-8 char. /// Parse `c` as either a single byte ASCII char or a variable size UTF-8 char.
fn parse_utf8_char<I>(c: u8, iter: &mut I) -> Result<char, Error> fn parse_utf8_char<I>(c: u8, iter: &mut I) -> Result<char, Error>
where I: Iterator<Item = Result<u8, Error>> where
I: Iterator<Item = Result<u8, Error>>,
{ {
let error = Err(Error::new(ErrorKind::Other, "Input character is not valid UTF-8")); let error = Err(Error::new(
ErrorKind::Other,
"Input character is not valid UTF-8",
));
if c.is_ascii() { if c.is_ascii() {
Ok(c as char) Ok(c as char)
} else { } else {