wez/wezterm
1
1
Fork 0
mirror of https://github.com/wez/wezterm.git synced 2024-11-23 15:04:36 +03:00
Code Issues Projects Releases Wiki Activity

lineedit: add ctrl-d -> EOF

Browse Source
This commit is contained in:
Wez Furlong 2019-05-27 16:17:49 -07:00
parent a94c802a74
commit 330c8e8c1f
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
termwiz/src/lineedit/actions.rs
View File

@ -14,6 +14,7 @@ pub enum Movement {
pub enum Action {
AcceptLine,
Cancel,
EndOfFile,
InsertChar(RepeatCount, char),
InsertText(RepeatCount, String),
Repaint,

14
termwiz/src/lineedit/mod.rs
View File

@ -26,6 +26,7 @@
//! Ctrl-E, End | Move cursor to the end of the line
//! Ctrl-B, Left | Move cursor one grapheme to the left
//! Ctrl-C | Cancel the line editor
//! Ctrl-D | Cancel the line editor with an End-of-File result
//! Ctrl-F, Right | Move cursor one grapheme to the right
//! Ctrl-H, Backspace | Delete the grapheme to the left of the cursor
//! Ctrl-J, Ctrl-M, Enter | Finish line editing and accept the current line
@ -171,6 +172,12 @@ impl<T: Terminal> LineEditor<T> {
key: KeyCode::Char('C'),
modifiers: Modifiers::CTRL,
}) => Some(Action::Cancel),
InputEvent::Key(KeyEvent {
key: KeyCode::Char('D'),
modifiers: Modifiers::CTRL,
}) => Some(Action::EndOfFile),
InputEvent::Key(KeyEvent {
key: KeyCode::Char('J'),
modifiers: Modifiers::CTRL,
@ -409,6 +416,13 @@ impl<T: Terminal> LineEditor<T> {
match self.resolve_action(&event) {
Some(Action::Cancel) => return Ok(None),
Some(Action::AcceptLine) => break,
Some(Action::EndOfFile) => {
return Err(std::io::Error::new(
std::io::ErrorKind::UnexpectedEof,
"End Of File",
)
.into())
}
Some(Action::Kill(movement)) => self.kill_text(movement),
Some(Action::Move(movement)) => self.cursor = self.eval_movement(movement),
Some(Action::InsertChar(rep, c)) => {