From 6d4f833f03077008641899e644367e63de921e22 Mon Sep 17 00:00:00 2001
From: Daniel Micay <danielmicay@gmail.com>
Date: Mon, 9 Jul 2012 19:29:22 -0400
Subject: [PATCH] clamp cursor_row between first/last rows

---
 Makefile  |  2 +-
 termite.c | 17 +++++++++++++----
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 026144c..703ab16 100644
--- a/Makefile
+++ b/Makefile
@@ -10,7 +10,7 @@ CFLAGS := -std=c99 -O3 \
 	  -Wshadow \
 	  -Wformat=2 \
 	  -Wmissing-declarations \
-	  -Wstrict-overflow=5 \
+	  -Wstrict-overflow=4 \
 	  -Wcast-align \
 	  -Wcast-qual \
 	  -Wconversion \
diff --git a/termite.c b/termite.c
index 61294f3..6729b4c 100644
--- a/termite.c
+++ b/termite.c
@@ -147,24 +147,33 @@ static void toggle_visual(VteTerminal *vte, select_info *select, select_mode mod
     }
 }
 
+static long first_row(VteTerminal *vte) {
+    GtkAdjustment *adjust = gtk_scrollable_get_vadjustment(GTK_SCROLLABLE(vte));
+    double scroll_lower = gtk_adjustment_get_lower(adjust);
+    return (long)scroll_lower;
+}
+
+static long last_row(VteTerminal *vte) {
+    GtkAdjustment *adjust = gtk_scrollable_get_vadjustment(GTK_SCROLLABLE(vte));
+    double scroll_upper = gtk_adjustment_get_upper(adjust);
+    return (long)scroll_upper - 1;
+}
+
 static void move(VteTerminal *vte, select_info *select, long col, long row) {
     GtkAdjustment *adjust = gtk_scrollable_get_vadjustment(GTK_SCROLLABLE(vte));
     double scroll_row = gtk_adjustment_get_value(adjust);
     long n_rows = vte_terminal_get_row_count(vte);
 
     const long end_col = vte_terminal_get_column_count(vte) - 1;
-    /*const long end_row = vte_terminal_get_row_count(vte) - 1;*/
 
     select->cursor_col = CLAMP(select->cursor_col + col, 0, end_col);
-    select->cursor_row = MAX(select->cursor_row + row, 0);
-    /*select->cursor_row = CLAMP(select->cursor_row + row, 0, end_row);*/
+    select->cursor_row = CLAMP(select->cursor_row + row, first_row(vte), last_row(vte));
 
     if (select->cursor_row < scroll_row) {
         gtk_adjustment_set_value(adjust, (double)select->cursor_row);
     } else if (select->cursor_row - n_rows >= (long)scroll_row) {
         gtk_adjustment_set_value(adjust, (double)(select->cursor_row - n_rows + 1));
     }
-
     update_selection(vte, select);
 }