diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/grid.rs | 32 | ||||
| -rw-r--r-- | src/term.rs | 28 |
2 files changed, 37 insertions, 23 deletions
diff --git a/src/grid.rs b/src/grid.rs index b12216c..88c33eb 100644 --- a/src/grid.rs +++ b/src/grid.rs @@ -274,18 +274,20 @@ impl Grid { } // this can happen if you get the cursor off the end of a row, - // and then do something to clear the current row without - // moving the cursor (IL, ED, EL, etc). i can't see any way - // for this to happen without the entire current row being - // cleared (not just the last cell), so this seems - // prooooobably fine? + // and then do something to clear the end of the current row + // without moving the cursor (IL, DL, ED, EL, etc). we know + // there can't be something in the last column because we + // would have caught that above, so it should be safe to + // overwrite it. if !found { pos.row = orig_row; crate::term::MoveFromTo::new(prev_pos, pos) .write_buf(contents); contents.push(b' '); - crate::term::ClearRowBackward::default() - .write_buf(contents); + crate::term::SaveCursor::default().write_buf(contents); + crate::term::Backspace::default().write_buf(contents); + crate::term::EraseChar::new(1).write_buf(contents); + crate::term::RestoreCursor::default().write_buf(contents); } } } else { @@ -374,18 +376,20 @@ impl Grid { } // this can happen if you get the cursor off the end of a row, - // and then do something to clear the current row without - // moving the cursor (IL, ED, EL, etc). i can't see any way - // for this to happen without the entire current row being - // cleared (not just the last cell), so this seems - // prooooobably fine? + // and then do something to clear the end of the current row + // without moving the cursor (IL, DL, ED, EL, etc). we know + // there can't be something in the last column because we + // would have caught that above, so it should be safe to + // overwrite it. if !found { pos.row = orig_row; crate::term::MoveFromTo::new(prev_pos, pos) .write_buf(contents); contents.push(b' '); - crate::term::ClearRowBackward::default() - .write_buf(contents); + crate::term::SaveCursor::default().write_buf(contents); + crate::term::Backspace::default().write_buf(contents); + crate::term::EraseChar::new(1).write_buf(contents); + crate::term::RestoreCursor::default().write_buf(contents); } } } else { diff --git a/src/term.rs b/src/term.rs index 0a578c1..31e1f51 100644 --- a/src/term.rs +++ b/src/term.rs @@ -26,31 +26,41 @@ impl BufWrite for ClearRowForward { #[derive(Default, Debug)] #[must_use = "this struct does nothing unless you call write_buf"] -pub struct ClearRowBackward; +pub struct CRLF; -impl BufWrite for ClearRowBackward { +impl BufWrite for CRLF { fn write_buf(&self, buf: &mut Vec<u8>) { - buf.extend_from_slice(b"\x1b[1K"); + buf.extend_from_slice(b"\r\n"); } } #[derive(Default, Debug)] #[must_use = "this struct does nothing unless you call write_buf"] -pub struct CRLF; +pub struct Backspace; -impl BufWrite for CRLF { +impl BufWrite for Backspace { fn write_buf(&self, buf: &mut Vec<u8>) { - buf.extend_from_slice(b"\r\n"); + buf.extend_from_slice(b"\x08"); } } #[derive(Default, Debug)] #[must_use = "this struct does nothing unless you call write_buf"] -pub struct Backspace; +pub struct SaveCursor; -impl BufWrite for Backspace { +impl BufWrite for SaveCursor { fn write_buf(&self, buf: &mut Vec<u8>) { - buf.extend_from_slice(b"\x08"); + buf.extend_from_slice(b"\x1b7"); + } +} + +#[derive(Default, Debug)] +#[must_use = "this struct does nothing unless you call write_buf"] +pub struct RestoreCursor; + +impl BufWrite for RestoreCursor { + fn write_buf(&self, buf: &mut Vec<u8>) { + buf.extend_from_slice(b"\x1b8"); } } |