tforgione
/
multiview
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: tforgione:7c77ce41792829790d26ae7887e7f899e15bf810
Branches Tags
tforgione:main
..
compare: tforgione:4aca298ba53e4195f442ec2c2a4320acba7e496f
Branches Tags
tforgione:main

No commits in common. "7c77ce41792829790d26ae7887e7f899e15bf810" and "4aca298ba53e4195f442ec2c2a4320acba7e496f" have entirely different histories.
7c77ce4179 ... 4aca298ba5

2 changed files with 66 additions and 89 deletions
Show Stats Expand all files Collapse all files

27
src/lib.rs
View File

@ -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(),

128
src/tile.rs
View File

@ -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,23 +398,25 @@ impl Tile {
match &subbuffer[0..3] {
"\x1b[K" => {
if current_char_index < w {
let mut spaces = String::new();
for _ in current_char_index..w {
spaces.push(DELETE_CHAR);
if line_index >= scroll && line_index <= h + scroll {
if current_char_index < w {
let mut spaces = String::new();
for _ in current_char_index..w {
spaces.push(DELETE_CHAR);
}
buffer.push(format!(
"{}{}{}",
cursor::Goto(
x + current_char_index,
y + line_index as u16 - scroll
),
spaces,
cursor::Goto(
x + current_char_index,
y + line_index as u16 - scroll
),
));
}
buffer.push(format!(
"{}{}{}",
cursor::Goto(
x + current_char_index,
y + line_index as u16 - scroll
),
spaces,
cursor::Goto(
x + current_char_index,
y + line_index as u16 - scroll
),
));
}
}
_ => buffer.push(subbuffer),
@ -436,43 +430,19 @@ impl Tile {
line_index += 1;
current_char_index = 0;
let mut spaces = format!(
"{}",
cursor::Goto(x + max_char_index, y + line_index as u16 - scroll)
);
for _ in max_char_index..w {
spaces.push(DELETE_CHAR);
}
buffer.push(spaces);
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)
);
for _ in max_char_index..w {
spaces.push(DELETE_CHAR);
}
buffer.push(spaces);
}
max_char_index = 0;
buffer.push(format!(
"{}",
cursor::Goto(x, y + line_index as u16 - scroll)
));
last_line_index = line_index;
}
'\r' => {
current_char_index = 0;
buffer.push(format!(
"{}",
cursor::Goto(x, y + line_index as u16 - scroll)
));
last_line_index = line_index;
}
_ => {
current_char_index += 1;
max_char_index = std::cmp::max(max_char_index, current_char_index);
if current_char_index == w + 1 {
line_index += 1;
current_char_index = 1;
max_char_index = 1;
max_char_index = 0;
buffer.push(format!(
"{}",
@ -481,8 +451,42 @@ impl Tile {
last_line_index = line_index;
}
}
buffer.push(format!("{}", c));
'\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)
));
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);
if current_char_index == w + 1 {
line_index += 1;
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)
));
last_line_index = line_index;
}
}
buffer.push(format!("{}", c));
}
}
}
}