pogmommy/zellij
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

moar performance improvements

Browse source
This commit is contained in:
Aram Drevekenin 2020-07-27 19:36:05 +02:00
parent 0d57a74247
commit 347fe698b2
1 changed files with 35 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
src/main.rs
View file

@ -247,18 +247,37 @@ impl TerminalOutput {
let mut i = self.characters.len(); let mut i = self.characters.len();
let mut current_line: VecDeque<TerminalCharacter> = VecDeque::new(); let mut current_line: VecDeque<TerminalCharacter> = VecDeque::new();
let newline_indices: HashSet<&usize> = HashSet::from_iter(self.newline_indices.iter()); let mut newline_indices = self.newline_indices.iter().rev();
let linebreak_indices: HashSet<&usize> = HashSet::from_iter(self.linebreak_indices.iter()); let mut linebreak_indices = self.linebreak_indices.iter().rev();
let mut next_newline_index = newline_indices.next();
let mut next_linebreak_index = linebreak_indices.next();
loop { loop {
i -= 1; i -= 1;
let terminal_character = self.characters.get(i).unwrap(); let terminal_character = self.characters.get(i).unwrap();
current_line.push_front(terminal_character.clone()); current_line.push_front(terminal_character.clone());
if newline_indices.contains(&i) || linebreak_indices.contains(&i) { if let Some(newline_index) = next_newline_index {
if newline_index == &i {
// pad line // pad line
for _ in current_line.len()..self.display_cols as usize { for _ in current_line.len()..self.display_cols as usize {
current_line.push_back(TerminalCharacter::new(' ')); current_line.push_back(TerminalCharacter::new(' '));
} }
output.push_front(Vec::from(current_line.drain(..).collect::<Vec<TerminalCharacter>>())); output.push_front(Vec::from(current_line.drain(..).collect::<Vec<TerminalCharacter>>()));
next_newline_index = newline_indices.next();
continue;
}
}
if let Some(linebreak_index) = next_linebreak_index {
if linebreak_index == &i {
// pad line
for _ in current_line.len()..self.display_cols as usize {
current_line.push_back(TerminalCharacter::new(' '));
}
output.push_front(Vec::from(current_line.drain(..).collect::<Vec<TerminalCharacter>>()));
next_linebreak_index = linebreak_indices.next();
continue;
}
} }
if i == 0 || output.len() == self.display_rows as usize { if i == 0 || output.len() == self.display_rows as usize {
break; break;
@ -604,21 +623,27 @@ impl Screen {
return return
} }
let mut last_character_was_changed = false; let mut last_character_was_changed = false;
let mut last_rendered_char_style = None;
for i in 0..last_frame.len() { for i in 0..last_frame.len() {
let current_character = frame.get(i).unwrap(); let current_character = frame.get(i).unwrap();
let row = i / full_screen_ws.ws_col as usize + 1; let row = i / full_screen_ws.ws_col as usize + 1;
let col = i % full_screen_ws.ws_col as usize + 1; let col = i % full_screen_ws.ws_col as usize + 1;
if !character_is_already_onscreen(&last_frame, &frame, i, &col) { if !character_is_already_onscreen(&last_frame, &frame, i, &col) {
if !last_character_was_changed { if !last_character_was_changed {
data_lines.push_str(&format!("\u{1b}[{};{}H", row, &col)); // goto row/col data_lines.push_str(&format!("\u{1b}[{};{}H\u{1b}[m", row, &col)); // goto row/col
data_lines.push_str("\u{1b}[m"); // reset style
} }
// TODO: only render the ansi_code if it is different from the previous // TODO: only render the ansi_code if it is different from the previous
// rendered ansi code (previous char in this loop) // rendered ansi code (previous char in this loop)
if last_rendered_char_style == current_character.ansi_code && last_character_was_changed {
data_lines.push(current_character.character);
} else {
data_lines.push_str(&current_character.to_string()); data_lines.push_str(&current_character.to_string());
last_rendered_char_style = current_character.ansi_code.clone();
}
last_character_was_changed = true; last_character_was_changed = true;
} else { } else {
last_character_was_changed = false; last_character_was_changed = false;
last_rendered_char_style = None;
} }
} }
}, },