From ba05e505d51d273a92795adbac9bac5c3d888aaf Mon Sep 17 00:00:00 2001
From: Christian Duerr <contact@christianduerr.com>
Date: Sat, 21 Mar 2020 00:47:52 +0000
Subject: [PATCH] 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.
---
 alacritty_terminal/src/grid/mod.rs |  5 -----
 alacritty_terminal/src/term/mod.rs | 10 ++++++++--
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/alacritty_terminal/src/grid/mod.rs b/alacritty_terminal/src/grid/mod.rs
index 37cf0eb6..85d1a0bb 100644
--- a/alacritty_terminal/src/grid/mod.rs
+++ b/alacritty_terminal/src/grid/mod.rs
@@ -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
diff --git a/alacritty_terminal/src/term/mod.rs b/alacritty_terminal/src/term/mod.rs
index 89c3723f..b5fced05 100644
--- a/alacritty_terminal/src/term/mod.rs
+++ b/alacritty_terminal/src/term/mod.rs
@@ -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);