src/lib.rs

@@ -154,23 +154,6 @@ impl<W: Write> Multiview<W> {
         Ok(())
     }
 
-    /// Kills the selected tile.
-    pub fn kill(&mut self) -> io::Result<()> {
-        let tile = self.tile_mut(self.selected);
-        tile.kill()
-    }
-
-    /// Kills all tiles.
-    pub fn kill_all(&mut self) -> io::Result<()> {
-        for row in &mut self.tiles {
-            for tile in row {
-                tile.kill()?;
-            }
-        }
-
-        Ok(())
-    }
-
     /// Exits.
     pub fn exit(&mut self) {
         write!(self.stdout, "{}", cursor::Show).ok();
@@ -206,12 +189,6 @@ pub enum Msg {
     /// Restarts all tiles.
     RestartAll,
 
-    /// Kills the selected tile.
-    Kill,
-
-    /// Kills all tiles.
-    KillAll,
-
     /// Scroll up one line.
     ScrollUp,
 
@@ -292,8 +269,6 @@ pub fn main() -> io::Result<()> {
                 Event::Key(Key::Char('q')) => sender.send(Msg::Exit).unwrap(),
                 Event::Key(Key::Char('r')) => sender.send(Msg::Restart).unwrap(),
                 Event::Key(Key::Char('R')) => sender.send(Msg::RestartAll).unwrap(),
-                Event::Key(Key::Char('k')) => sender.send(Msg::Kill).unwrap(),
-                Event::Key(Key::Char('K')) => sender.send(Msg::KillAll).unwrap(),
                 Event::Key(Key::Down) => sender.send(Msg::ScrollDown).unwrap(),
                 Event::Key(Key::Up) => sender.send(Msg::ScrollUp).unwrap(),
                 Event::Key(Key::End) => sender.send(Msg::ScrollFullDown).unwrap(),
@@ -318,8 +293,6 @@ pub fn main() -> io::Result<()> {
             Ok(Msg::ScrollDown) => multiview.scroll_down(),
             Ok(Msg::Restart) => multiview.restart()?,
             Ok(Msg::RestartAll) => multiview.restart_all()?,
-            Ok(Msg::Kill) => multiview.kill()?,
-            Ok(Msg::KillAll) => multiview.kill_all()?,
             Ok(Msg::ScrollUp) => multiview.scroll_up(),
             Ok(Msg::ScrollFullDown) => multiview.scroll_full_down(),
             Ok(Msg::ScrollFullUp) => multiview.scroll_full_up(),

src/tile.rs

@@ -212,15 +212,6 @@ impl Tile {
             );
 
             sender.send(Msg::Stdout(coords, exit_string)).unwrap();
-
-            let mut line = String::new();
-            for _ in 0..size.0 - 1 {
-                line.push('─');
-            }
-
-            sender
-                .send(Msg::Stdout(coords, format!("\n{}\n", line)))
-                .unwrap();
         });
 
         thread::spawn(move || loop {
@@ -265,6 +256,7 @@ impl Tile {
                 }
 
                 _ => {
+                    // TODO fix utf8
                     self.stdout.last_mut().unwrap().push(c);
 
                     if self.counting {
@@ -406,6 +398,7 @@ impl Tile {
 
                 match &subbuffer[0..3] {
                     "\x1b[K" => {
+                        if line_index >= scroll && line_index <= h + scroll {
                             if current_char_index < w {
                                 let mut spaces = String::new();
                                 for _ in current_char_index..w {
@@ -425,6 +418,7 @@ impl Tile {
                                 ));
                             }
                         }
+                    }
                     _ => buffer.push(subbuffer),
                 }
 
@@ -436,6 +430,8 @@ impl Tile {
                     line_index += 1;
                     current_char_index = 0;
 
+                    if line_index >= scroll && line_index <= h + scroll {
+                        if max_char_index < w {
                             let mut spaces = format!(
                                 "{}",
                                 cursor::Goto(x + max_char_index, y + line_index as u16 - scroll)
@@ -444,6 +440,7 @@ impl Tile {
                                 spaces.push(DELETE_CHAR);
                             }
                             buffer.push(spaces);
+                        }
 
                         max_char_index = 0;
 
@@ -454,9 +451,11 @@ impl Tile {
 
                         last_line_index = line_index;
                     }
+                }
 
                 '\r' => {
                     current_char_index = 0;
+                    if line_index >= scroll && line_index <= h + scroll {
                         buffer.push(format!(
                             "{}",
                             cursor::Goto(x, y + line_index as u16 - scroll)
@@ -464,8 +463,10 @@ impl Tile {
 
                         last_line_index = line_index;
                     }
+                }
 
                 _ => {
+                    if line_index >= scroll && line_index <= h + scroll {
                         current_char_index += 1;
                         max_char_index = std::cmp::max(max_char_index, current_char_index);
 
@@ -474,6 +475,7 @@ impl Tile {
                             current_char_index = 1;
                             max_char_index = 1;
 
+                            if line_index >= scroll && line_index <= h + scroll {
                                 buffer.push(format!(
                                     "{}",
                                     cursor::Goto(x, y + line_index as u16 - scroll)
@@ -481,11 +483,13 @@ impl Tile {
 
                                 last_line_index = line_index;
                             }
+                        }
 
                         buffer.push(format!("{}", c));
                     }
                 }
             }
+        }
 
         let mut spaces = format!(
             "{}",