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

Remove useless conditions

This commit is contained in:
Thomas Forgione 2023-10-25 21:42:36 +02:00
parent 75f4e69949
commit 7c77ce4179
1 changed files with 50 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

113
src/tile.rs
View File

@ -265,7 +265,6 @@ impl Tile {
} }
_ => { _ => {
// TODO fix utf8
self.stdout.last_mut().unwrap().push(c); self.stdout.last_mut().unwrap().push(c);
if self.counting { if self.counting {
@ -407,25 +406,23 @@ impl Tile {
match &subbuffer[0..3] { match &subbuffer[0..3] {
"\x1b[K" => { "\x1b[K" => {
if line_index >= scroll && line_index <= h + scroll { if current_char_index < w {
if current_char_index < w { let mut spaces = String::new();
let mut spaces = String::new(); for _ in current_char_index..w {
for _ in current_char_index..w { spaces.push(DELETE_CHAR);
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), _ => buffer.push(subbuffer),
@ -439,32 +436,44 @@ impl Tile {
line_index += 1; line_index += 1;
current_char_index = 0; current_char_index = 0;
if line_index >= scroll && line_index <= h + scroll { let mut spaces = format!(
if max_char_index < w { "{}",
let mut spaces = format!( cursor::Goto(x + max_char_index, y + line_index as u16 - scroll)
"{}", );
cursor::Goto(x + max_char_index, y + line_index as u16 - scroll) for _ in max_char_index..w {
); spaces.push(DELETE_CHAR);
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;
} }
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' => { '\r' => {
current_char_index = 0; 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;
}
_ => {
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;
buffer.push(format!( buffer.push(format!(
"{}", "{}",
cursor::Goto(x, y + line_index as u16 - scroll) cursor::Goto(x, y + line_index as u16 - scroll)
@ -472,30 +481,8 @@ impl Tile {
last_line_index = line_index; last_line_index = line_index;
} }
}
_ => { buffer.push(format!("{}", c));
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));
}
} }
} }
} }