checkpoint - window changes are broken

thomasballinger · thomasballinger · commit 7c1f8899a4d2 · 2014-03-29T14:29:34.000-04:00
diff --git a/bpython/curtsies.py b/bpython/curtsies.py
@@ -75,11 +75,11 @@ def process_event(e):
                         term.render_to_terminal(array, cursor_pos)
 
                 if paste:
-                    repl.process_event(tc.get_event()) #first event will always be a window size set
+                    repl.process_event(term.get_annotated_event()) #first event will always be a window size set
                     process_event(paste)
 
                 while True:
-                    process_event(tc.get_event(idle=find_iterator))
+                    process_event(term.get_annotated_event(idle=find_iterator))
 
 if __name__ == '__main__':
     sys.exit(main())
diff --git a/bpython/curtsiesfrontend/repl.py b/bpython/curtsiesfrontend/repl.py
@@ -263,7 +263,10 @@ def process_event(self, e):
                 self.run_code_and_maybe_finish()
         elif isinstance(e, events.WindowChangeEvent):
             logging.debug('window change to %d %d', e.width, e.height)
+            #TODO when window gets larger, history is eaten up
+            self.scroll_offset -= e.cursor_dy
             self.width, self.height = e.width, e.height
+
         elif self.status_bar.has_focus:
             return self.status_bar.process_event(e)
         elif self.stdin.has_focus:
@@ -714,6 +717,7 @@ def _paint(self, about_to_exit=False, user_quit=False):
         if show_status_bar:
             min_height -= 1
 
+
         current_line_start_row = len(self.lines_for_display) - max(0, self.scroll_offset)
         if self.request_paint_to_clear_screen: # or show_status_bar and about_to_exit ?
             self.request_paint_to_clear_screen = False
@@ -726,7 +730,6 @@ def _paint(self, about_to_exit=False, user_quit=False):
         #TODO test case of current line filling up the whole screen (there aren't enough rows to show it)
 
         if current_line_start_row < 0: #if current line trying to be drawn off the top of the screen
-            #assert True, 'no room for current line: contiguity of history broken!'
             logging.debug('#<---History contiguity broken by rewind--->')
             msg = "#<---History contiguity broken by rewind--->"
             arr[0, 0:min(len(msg), width)] = [msg[:width]]
diff --git a/setup.py b/setup.py
@@ -153,7 +153,7 @@ def initialize_options(self):
         'pygments'
     ],
     extras_require = {
-        'curtsies': ['curtsies>=0.0.28', 'greenlet'],
+        'curtsies': ['curtsies>=0.0.29', 'greenlet'],
         'urwid' : ['urwid']
     },
     tests_require = ['mock'],
