Track draw target height

Author: oli-obk

src/in_memory.rs

@@ -26,7 +26,7 @@ impl InMemoryTerm {
 
     pub fn reset(&self) {
         let mut state = self.state.lock().unwrap();
-        *state = InMemoryTermState::new(state.parser.screen().size().0, state.width);
+        *state = InMemoryTermState::new(state.height, state.width);
     }
 
     pub fn contents(&self) -> String {
@@ -99,6 +99,10 @@ impl TermLike for InMemoryTerm {
         self.state.lock().unwrap().width
     }
 
+    fn height(&self) -> u16 {
+        self.state.lock().unwrap().height
+    }
+
     fn move_cursor_up(&self, n: usize) -> std::io::Result<()> {
         match n {
             0 => Ok(()),
@@ -158,13 +162,15 @@ impl TermLike for InMemoryTerm {
 
 struct InMemoryTermState {
     width: u16,
+    height: u16,
     parser: vt100::Parser,
 }
 
 impl InMemoryTermState {
     pub(crate) fn new(rows: u16, cols: u16) -> InMemoryTermState {
         InMemoryTermState {
             width: cols,
+            height: rows,
             parser: Parser::new(rows, cols, 0),
         }
     }

src/term_like.rs

@@ -11,14 +11,19 @@ use console::Term;
 pub trait TermLike: Debug + Send + Sync {
     /// Return the terminal width
     fn width(&self) -> u16;
+    /// Return the terminal height
+    fn height(&self) -> u16 {
+        // FIXME: remove this default impl in the next major version bump
+        20 // sensible default
+    }
 
     /// Move the cursor up by `n` lines
     fn move_cursor_up(&self, n: usize) -> io::Result<()>;
     /// Move the cursor down by `n` lines
     fn move_cursor_down(&self, n: usize) -> io::Result<()>;
-    /// Move the cursor right by `n` lines
+    /// Move the cursor right by `n` chars
     fn move_cursor_right(&self, n: usize) -> io::Result<()>;
-    /// Move the cursor left by `n` lines
+    /// Move the cursor left by `n` chars
     fn move_cursor_left(&self, n: usize) -> io::Result<()>;
 
     /// Write a string and add a newline.
@@ -36,6 +41,10 @@ impl TermLike for Term {
         self.size().1
     }
 
+    fn height(&self) -> u16 {
+        self.size().0
+    }
+
     fn move_cursor_up(&self, n: usize) -> io::Result<()> {
         self.move_cursor_up(n)
     }