From 233fd9630b32deb59a535b3699bd4dc33d0748da Mon Sep 17 00:00:00 2001
From: Thomas Hurst <tom@hur.st>
Date: Wed, 13 Aug 2008 00:17:40 +0100
Subject: [PATCH] Make search actually only search valid buffer ranges.

---
 terminatorlib/terminatorterm.py | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/terminatorlib/terminatorterm.py b/terminatorlib/terminatorterm.py
index b5ce9013..eb593bf0 100755
--- a/terminatorlib/terminatorterm.py
+++ b/terminatorlib/terminatorterm.py
@@ -794,6 +794,7 @@ text/plain
     self._search_string = None
     self._search_result_label.set_text("")
     self._searchbox.hide()
+    self._scrollbar.set_value(self._vte.get_cursor_position()[1])
     self._vte.grab_focus()
 
   def do_search(self, widget):
@@ -803,7 +804,7 @@ text/plain
       return
 
     if string != self._search_string:
-      self._search_row = 0
+      self._search_row = self._get_vte_buffer_range()[0]
       self._search_string = string
 
     self._search_result_label.set_text("Searching scrollback")
@@ -814,23 +815,27 @@ text/plain
     return True
 
   def next_search(self):
-    column, row = self._vte.get_cursor_position()
+    startrow,endrow = self._get_vte_buffer_range()
     while True:
-      if self._search_row == row:
-        self._search_row = 0
+      if self._search_row == endrow:
+        self._search_row = startrow
         self._search_result_label.set_text("Finished Search")
         return
-      buffer = self._vte.get_text_range(self._search_row, 0, self._search_row + 1, -1, self._search_character)
+      buffer = self._vte.get_text_range(self._search_row, 0, self._search_row, -1, self._search_character)
 
-      #dbg("Row %d buffer: %s" % (self._search_row, repr(buffer)))
+      # dbg("Row %d buffer: %s" % (self._search_row, repr(buffer)))
       index = buffer.find(self._search_string)
       if index != -1:
         self._search_result_label.set_text("Found at row %d" % self._search_row)
-        self._scrollbar.set_value(self._search_row + 1)
+        self._scrollbar.set_value(self._search_row)
         self._search_row += 1
         return
       self._search_row += 1
 
+  def _get_vte_buffer_range(self):
+    column, endrow = self._vte.get_cursor_position()
+    startrow = max(0, endrow - self.conf.scrollback_lines)
+    return(startrow, endrow)
 
   def create_popup_menu (self, widget, event = None):
     menu = gtk.Menu ()