mslot
/
alacritty
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix invisible selection 

This resolves a bug where the very first/last cell would still be
selected when both the start and the end were below/above the viewport.
This commit is contained in:
Christian Duerr 2020-03-21 00:47:52 +00:00 committed by GitHub
parent 3d7a789fd3
commit ba05e505d5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
alacritty_terminal/src/grid/mod.rs
View File

@ -650,11 +650,6 @@ impl<T> Grid<T> {
GridIterator { grid: self, cur: point }
}
#[inline]
pub fn contains(&self, point: &Point) -> bool {
self.lines > point.line && self.cols > point.col
}
#[inline]
pub fn display_offset(&self) -> usize {
self.display_offset

10
alacritty_terminal/src/term/mod.rs
View File

@ -226,7 +226,6 @@ impl<'a, C> RenderableCellsIter<'a, C> {
selection: Option<SelectionRange>,
) -> RenderableCellsIter<'b, C> {
let grid = &term.grid;
let num_cols = grid.num_cols();
let inner = grid.display_iter();
@ -234,9 +233,16 @@ impl<'a, C> RenderableCellsIter<'a, C> {
let (limit_start, limit_end) = if span.is_block {
(span.start.col, span.end.col)
} else {
(Column(0), num_cols - 1)
(Column(0), grid.num_cols() - 1)
};
// Do not render completely offscreen selection
let viewport_start = grid.display_offset();
let viewport_end = viewport_start + grid.num_lines().0;
if span.end.line >= viewport_end || span.start.line < viewport_start {
return None;
}
// Get on-screen lines of the selection's locations
let mut start = grid.clamp_buffer_to_visible(span.start);
let mut end = grid.clamp_buffer_to_visible(span.end);