Clear wrapped lines when walking through history.

Trundle · Trundle · commit 62bab80fdf0d · 2009-09-18T10:51:33.000+02:00
diff --git a/bpython/cli.py b/bpython/cli.py
@@ -1249,6 +1249,7 @@ def back(self):
         if self.h_i < len(self.rl_hist):
             self.h_i += 1
 
+        self.clear_wrapped_lines()
         self.s = self.rl_hist[-self.h_i].rstrip('\n')
         self.print_line(self.s, clr=True)
 
@@ -1259,6 +1260,11 @@ def fwd(self):
 
         self.cpos = 0
 
+        width = self.scr.getmaxyx()[1]
+        for y in xrange(self.iy + 1, self.iy + len(self.s) // width + 1):
+            self.scr.move(y, 0)
+            self.scr.clrtoeol()
+
         if self.h_i > 1:
             self.h_i -= 1
             self.s = self.rl_hist[-self.h_i].rstrip('\n')
@@ -1549,12 +1555,7 @@ def bs(self, delete_tabs=True):
 
         n = 1
 
-        # Delete following lines if the current string is greater than the
-        # screen width. Curses does not handle that on its own.
-        width = self.scr.getmaxyx()[1]
-        for y in xrange(self.iy + 1, self.iy + len(self.s) // width + 1):
-            self.scr.move(y, 0)
-            self.scr.clrtoeol()
+        self.clear_wrapped_lines()
 
         if not self.cpos:
 # I know the nested if blocks look nasty. :(
@@ -1604,12 +1605,7 @@ def yank_from_buffer(self):
 
     def clrtobol(self):
         """Clear from cursor to beginning of line; usual C-u behaviour"""
-        # It seems as if curses does not handle this on its own, which
-        # makes me sad.
-        width = self.scr.getmaxyx()[1]
-        for y in xrange(self.iy + 1, self.iy + len(self.s) // width + 1):
-            self.scr.move(y, 0)
-            self.scr.clrtoeol()
+        self.clear_wrapped_lines()
 
         if not self.cpos:
             self.s = ''
@@ -1620,6 +1616,15 @@ def clrtobol(self):
         self.scr.redrawwin()
         self.scr.refresh()
 
+    def clear_wrapped_lines(self):
+        """Clear the wrapped lines of the current input."""
+        # curses does not handle this on its own. Sad.
+        width = self.scr.getmaxyx()[1]
+        for y in xrange(self.iy + 1, self.iy + len(self.s) // width + 1):
+            self.scr.move(y, 0)
+            self.scr.clrtoeol()
+
+
     def p_key(self, key):
         """Process a keypress"""
 
