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

reduce the variations on set/delta for cursor positioning

Browse Source
This commit is contained in:
Wez Furlong 2018-02-02 00:46:04 -08:00
parent bb186da400
commit d152055700
2 changed files with 79 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
term/src/csi.rs
View File

@ -35,8 +35,7 @@ pub enum CSIAction {
SetReverse(bool),
SetStrikethrough(bool),
SetInvisible(bool),
SetCursorXY(i64, i64),
DeltaCursorXY { x: i64, y: i64 },
SetCursorXY { x: Position, y: Position },
EraseInLine(LineErase),
EraseInDisplay(DisplayErase),
SetDecPrivateMode(DecPrivateMode, bool),
@ -369,26 +368,56 @@ impl<'a> Iterator for CSIParser<'a> {
match (self.byte, self.intermediates, params) {
(_, _, None) => None,
// CUU - Cursor Up n times
('A', &[], Some(&[])) => Some(CSIAction::DeltaCursorXY { x: 0, y: -1 }),
('A', &[], Some(&[y])) => Some(CSIAction::DeltaCursorXY { x: 0, y: -y }),
('A', &[], Some(&[])) => Some(CSIAction::SetCursorXY {
x: Position::Relative(0),
y: Position::Relative(-1),
}),
('A', &[], Some(&[y])) => Some(CSIAction::SetCursorXY {
x: Position::Relative(0),
y: Position::Relative(-y),
}),
// CUD - Cursor Down n times
('B', &[], Some(&[])) => Some(CSIAction::DeltaCursorXY { x: 0, y: 1 }),
('B', &[], Some(&[y])) => Some(CSIAction::DeltaCursorXY { x: 0, y: y }),
('B', &[], Some(&[])) => Some(CSIAction::SetCursorXY {
x: Position::Relative(0),
y: Position::Relative(1),
}),
('B', &[], Some(&[y])) => Some(CSIAction::SetCursorXY {
x: Position::Relative(0),
y: Position::Relative(y),
}),
// CUF - Cursor n forward
('C', &[], Some(&[])) => Some(CSIAction::DeltaCursorXY { x: 1, y: 0 }),
('C', &[], Some(&[x])) => Some(CSIAction::DeltaCursorXY { x: x, y: 0 }),
('C', &[], Some(&[])) => Some(CSIAction::SetCursorXY {
x: Position::Relative(1),
y: Position::Relative(0),
}),
('C', &[], Some(&[x])) => Some(CSIAction::SetCursorXY {
x: Position::Relative(x),
y: Position::Relative(0),
}),
// CUB - Cursor n backward
('D', &[], Some(&[])) => Some(CSIAction::DeltaCursorXY { x: -1, y: 0 }),
('D', &[], Some(&[x])) => Some(CSIAction::DeltaCursorXY { x: -x, y: 0 }),
('D', &[], Some(&[])) => Some(CSIAction::SetCursorXY {
x: Position::Relative(-1),
y: Position::Relative(0),
}),
('D', &[], Some(&[x])) => Some(CSIAction::SetCursorXY {
x: Position::Relative(-x),
y: Position::Relative(0),
}),
// Cursor Position (CUP)
('H', &[], Some(&[])) => Some(CSIAction::SetCursorXY(0, 0)),
('H', &[], Some(&[])) => Some(CSIAction::SetCursorXY {
x: Position::Absolute(0),
y: Position::Absolute(0),
}),
('H', &[], Some(&[y, x])) => {
// Co-ordinates are 1-based, but we want 0-based
Some(CSIAction::SetCursorXY(x.max(1) - 1, y.max(1) - 1))
Some(CSIAction::SetCursorXY {
x: Position::Absolute(x.max(1) - 1),
y: Position::Absolute(y.max(1) - 1),
})
}
// Erase in Display (ED)
@ -417,8 +446,14 @@ impl<'a> Iterator for CSIParser<'a> {
('S', &[], Some(&[n])) => Some(CSIAction::ScrollLines(-n)),
// HPR - Character position Relative
('a', &[], Some(&[])) => Some(CSIAction::DeltaCursorXY { x: 1, y: 0 }),
('a', &[], Some(&[x])) => Some(CSIAction::DeltaCursorXY { x: x, y: 0 }),
('a', &[], Some(&[])) => Some(CSIAction::SetCursorXY {
x: Position::Relative(1),
y: Position::Relative(0),
}),
('a', &[], Some(&[x])) => Some(CSIAction::SetCursorXY {
x: Position::Relative(x),
y: Position::Relative(0),
}),
('c', &[b'>'], Some(&[])) |
('c', &[], Some(&[])) |

59
term/src/lib.rs
View File

@ -16,6 +16,12 @@ use std::ops::{Deref, DerefMut};
#[macro_use]
mod debug;
#[derive(Debug)]
pub enum Position {
Absolute(i64),
Relative(i64),
}
pub mod color;
mod csi;
use self::csi::*;
@ -709,25 +715,28 @@ impl TerminalState {
/// Sets the cursor position. x and y are 0-based and relative to the
/// top left of the visible screen.
/// TODO: DEC origin mode impacts the interpreation of these
fn set_cursor_pos(&mut self, x: usize, y: usize) {
fn set_cursor_pos(&mut self, x: &Position, y: &Position) {
let x = match x {
&Position::Relative(x) => (self.cursor_x as i64 + x).max(0),
&Position::Absolute(x) => x,
};
let y = match y {
&Position::Relative(y) => (self.cursor_y as i64 + y).max(0),
&Position::Absolute(y) => y,
};
let rows = self.screen().physical_rows;
let cols = self.screen().physical_cols;
let old_y = self.cursor_y;
let new_y = y.min(rows - 1);
let new_y = y.min(rows as i64 - 1);
self.cursor_x = x.min(cols - 1);
self.cursor_y = new_y;
self.cursor_x = x.min(cols as i64 - 1) as usize;
self.cursor_y = new_y as usize;
self.wrap_next = false;
let screen = self.screen_mut();
screen.dirty_line(old_y);
screen.dirty_line(new_y);
}
fn delta_cursor_pos(&mut self, x: i64, y: i64) {
let x = (self.cursor_x as i64 + x).max(0);
let y = (self.cursor_y as i64 + y).max(0);
self.set_cursor_pos(x as usize, y as usize)
screen.dirty_line(old_y as usize);
screen.dirty_line(new_y as usize);
}
fn scroll_up(&mut self, num_rows: usize) {
@ -755,7 +764,7 @@ impl TerminalState {
} else {
y + 1
};
self.set_cursor_pos(x, y);
self.set_cursor_pos(&Position::Absolute(x as i64), &Position::Absolute(y as i64));
}
fn push_answerback(&mut self, buf: &[u8]) {
@ -772,8 +781,7 @@ impl TerminalState {
} else {
y - 1
};
let x = self.cursor_x;
self.set_cursor_pos(x, y);
self.set_cursor_pos(&Position::Relative(0), &Position::Absolute(y as i64));
}
}
@ -850,7 +858,7 @@ impl vte::Perform for TerminalState {
if x + 1 < width {
// TODO: the 1 here should be based on the glyph width
self.set_cursor_pos(x + 1, y);
self.set_cursor_pos(&Position::Relative(1), &Position::Relative(0));
} else {
self.wrap_next = true;
}
@ -863,11 +871,10 @@ impl vte::Perform for TerminalState {
self.new_line(true /* TODO: depend on terminal mode */)
}
b'\r' => /* CR */ {
let row = self.cursor_y;
self.set_cursor_pos(0, row);
self.set_cursor_pos(&Position::Absolute(0), &Position::Relative(0));
}
0x08 /* BS */ => {
self.delta_cursor_pos(-1, 0);
self.set_cursor_pos(&Position::Relative(-1), &Position::Relative(0));
}
_ => println!("unhandled vte execute {}", byte),
}
@ -926,11 +933,8 @@ impl vte::Perform for TerminalState {
CSIAction::SetInvisible(on) => {
self.pen.set_invisible(on);
}
CSIAction::SetCursorXY(x, y) => {
self.set_cursor_pos(x as usize, y as usize);
}
CSIAction::DeltaCursorXY { x, y } => {
self.delta_cursor_pos(x, y);
CSIAction::SetCursorXY { x, y } => {
self.set_cursor_pos(&x, &y);
}
CSIAction::EraseInLine(erase) => {
let cx = self.cursor_x;
@ -1040,13 +1044,10 @@ impl vte::Perform for TerminalState {
self.cursor_y = saved_y.min(rows - 1);
}
CSIAction::LinePositionAbsolute(row) => {
let x = self.cursor_x;
self.set_cursor_pos(x, row as usize);
self.set_cursor_pos(&Position::Relative(0), &Position::Absolute(row));
}
CSIAction::LinePositionRelative(row) => {
let x = self.cursor_x;
let y = self.cursor_y;
self.set_cursor_pos(x, (y as i64 + row).min(0) as usize);
self.set_cursor_pos(&Position::Relative(0), &Position::Relative(row));
}
CSIAction::ScrollLines(amount) => {
if amount > 0 {