PolytreeDE/alacritty
1
0
Fork 0
mirror of https://github.com/alacritty/alacritty.git synced 2024-11-25 14:05:41 -05:00
Code Releases Activity

Fix old vi cursor not being properly damaged

Browse source 
Co-authored-by: Christian Duerr <contact@christianduerr.com>
This commit is contained in:
Kirill Chibisov 2022-06-07 11:09:03 +03:00 committed by GitHub
parent bb7b1201c9
commit 29b1ff59e2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
alacritty_terminal/src/term/mod.rs
View file

@ -372,48 +372,52 @@ impl<T> Term<T> {
self.mark_fully_damaged(); self.mark_fully_damaged();
} }
// Update tracking of cursor, selection, and vi mode cursor.
let display_offset = self.grid().display_offset();
let vi_cursor_point = if self.mode.contains(TermMode::VI) {
point_to_viewport(display_offset, self.vi_mode_cursor.point)
} else {
None
};
let previous_cursor = mem::replace(&mut self.damage.last_cursor, self.grid.cursor.point);
let previous_selection = mem::replace(&mut self.damage.last_selection, selection);
let previous_vi_cursor_point =
mem::replace(&mut self.damage.last_vi_cursor_point, vi_cursor_point);
// Early return if the entire terminal is damaged. // Early return if the entire terminal is damaged.
if self.damage.is_fully_damaged { if self.damage.is_fully_damaged {
self.damage.last_cursor = self.grid.cursor.point;
self.damage.last_selection = selection;
return TermDamage::Full; return TermDamage::Full;
} }
// Add information about old cursor position and new one if they are not the same, so we // Add information about old cursor position and new one if they are not the same, so we
// cover everything that was produced by `Term::input`. // cover everything that was produced by `Term::input`.
if self.damage.last_cursor != self.grid.cursor.point { if self.damage.last_cursor != previous_cursor {
// Cursor cooridanates are always inside viewport even if you have `display_offset`. // Cursor cooridanates are always inside viewport even if you have `display_offset`.
let point = let point = Point::new(previous_cursor.line.0 as usize, previous_cursor.column);
Point::new(self.damage.last_cursor.line.0 as usize, self.damage.last_cursor.column);
self.damage.damage_point(point); self.damage.damage_point(point);
} }
// Always damage current cursor. // Always damage current cursor.
self.damage_cursor(); self.damage_cursor();
self.damage.last_cursor = self.grid.cursor.point;
// Vi mode doesn't update the terminal content, thus only last vi cursor position and the // Vi mode doesn't update the terminal content, thus only last vi cursor position and the
// new one should be damaged. // new one should be damaged.
if let Some(last_vi_cursor_point) = self.damage.last_vi_cursor_point.take() { if let Some(previous_vi_cursor_point) = previous_vi_cursor_point {
self.damage.damage_point(last_vi_cursor_point) self.damage.damage_point(previous_vi_cursor_point)
} }
let display_offset = self.grid().display_offset();
// Damage Vi cursor if it's present. // Damage Vi cursor if it's present.
if self.mode.contains(TermMode::VI) { if let Some(vi_cursor_point) = self.damage.last_vi_cursor_point {
let vi_cursor_point =
point_to_viewport(display_offset, self.vi_mode_cursor.point).unwrap();
self.damage.last_vi_cursor_point = Some(vi_cursor_point);
self.damage.damage_point(vi_cursor_point); self.damage.damage_point(vi_cursor_point);
} }
if self.damage.last_selection != selection { if self.damage.last_selection != previous_selection {
for selection in self.damage.last_selection.into_iter().chain(selection) { for selection in self.damage.last_selection.into_iter().chain(previous_selection) {
self.damage.damage_selection(selection, display_offset, self.columns()); self.damage.damage_selection(selection, display_offset, self.columns());
} }
} }
self.damage.last_selection = selection;
TermDamage::Partial(TermDamageIterator::new(&self.damage.lines)) TermDamage::Partial(TermDamageIterator::new(&self.damage.lines))
} }