Using new curtsies api: curtsies 0.1.x

thomasballinger · thomasballinger · commit f361657545b1 · 2014-07-06T14:30:43.000-04:00
diff --git a/bpython/curtsies.py b/bpython/curtsies.py
@@ -6,10 +6,9 @@
 
 import curtsies
 import curtsies.window
+import curtsies.input
 import curtsies.terminal
 import curtsies.events
-Window = curtsies.window.Window
-Terminal = curtsies.terminal.Terminal
 
 from bpython.curtsiesfrontend.repl import Repl
 from bpython.curtsiesfrontend.coderunner import SystemExitFromCodeGreenlet
@@ -52,36 +51,50 @@ def main(args=None, locals_=None, banner=None):
     mainloop(config, locals_, banner, interp, paste)
 
 def mainloop(config, locals_, banner, interp=None, paste=None):
-    with Terminal(paste_mode=True) as tc:
-        with Window(tc, keep_last_line=True, hide_cursor=False) as term:
+    with curtsies.input.Input(keynames='curses') as input_generator:
+        with curtsies.window.CursorAwareWindow(
+                sys.stdout,
+                sys.stdin,
+                keep_last_line=True,
+                hide_cursor=False) as window:
+
+            refresh_requests = []
+            def request_refresh():
+                refresh_requests.append(None)
+            def event_or_refresh():
+                while True:
+                    if refresh_requests:
+                        refresh_requests.pop()
+                        yield curtsies.events.RefreshRequestEvent()
+                    else:
+                        yield input_generator.next()
+
             with Repl(config=config,
                       locals_=locals_,
-                      request_refresh=tc.stuff_a_refresh_request,
+                      request_refresh=request_refresh,
                       banner=banner,
                       interp=interp) as repl:
-                rows, columns = tc.get_screen_size()
-                repl.width = columns
-                repl.height = rows
+                repl.height, repl.width = window.t.height, window.t.width
 
                 def process_event(e):
                     try:
                         repl.process_event(e)
                     except (SystemExitFromCodeGreenlet, SystemExit) as err:
                         array, cursor_pos = repl.paint(about_to_exit=True, user_quit=isinstance(err, SystemExitFromCodeGreenlet))
-                        scrolled = term.render_to_terminal(array, cursor_pos)
+                        scrolled = window.render_to_terminal(array, cursor_pos)
                         repl.scroll_offset += scrolled
                         raise
                     else:
                         array, cursor_pos = repl.paint()
-                        scrolled = term.render_to_terminal(array, cursor_pos)
+                        scrolled = window.render_to_terminal(array, cursor_pos)
                         repl.scroll_offset += scrolled
 
                 if paste:
-                    repl.process_event(term.get_annotated_event()) #first event will always be a window size set
                     process_event(paste)
 
-                while True:
-                    process_event(term.get_annotated_event(idle=find_iterator))
+                [None for _ in find_iterator] #TODO get idle events working (instead of this)
+                for e in event_or_refresh():
+                    process_event(e)
 
 if __name__ == '__main__':
     sys.exit(main())
diff --git a/bpython/curtsiesfrontend/repl.py b/bpython/curtsiesfrontend/repl.py
@@ -19,17 +19,17 @@
 from bpython.translations import _
 from bpython._py3compat import py3
 
-from curtsies.fsarray import FSArray
-from curtsies.fmtstr import fmtstr, FmtStr
+from curtsies import FSArray, fmtstr, FmtStr
 from curtsies.bpythonparse import parse as bpythonparse
 from curtsies.bpythonparse import func_for_letter, color_for_letter
+from curtsies import fmtfuncs
+from curtsies import events
 
 from bpython.curtsiesfrontend.manual_readline import char_sequences as rl_char_sequences
 from bpython.curtsiesfrontend.manual_readline import get_updated_char_sequences
 from bpython.curtsiesfrontend.interaction import StatusBar
 from bpython.curtsiesfrontend import sitefix; sitefix.monkeypatch_quit()
 import bpython.curtsiesfrontend.replpainter as paint
-import curtsies.events as events
 from bpython.curtsiesfrontend.coderunner import CodeRunner, FakeOutput
 
 #TODO other autocomplete modes (also fix in other bpython implementations)
diff --git a/bpython/curtsiesfrontend/replpainter.py b/bpython/curtsiesfrontend/replpainter.py
@@ -2,10 +2,10 @@
 import logging
 import os
 
-from curtsies.fmtfuncs import bold
-from curtsies.fsarray import fsarray
+from curtsies import fsarray, fmtstr
 from curtsies.bpythonparse import func_for_letter
-from curtsies.fmtstr import fmtstr, linesplit
+from curtsies.formatstring import linesplit
+from curtsies.fmtfuncs import bold
 
 from bpython._py3compat import py3
 if not py3:
diff --git a/setup.py b/setup.py
@@ -151,7 +151,7 @@ def initialize_options(self):
 
 if sys.version_info[:2] >= (2, 6):
     # curtsies only supports 2.6 and onwards
-    extras_require['curtsies'] = ['curtsies>=0.0.32', 'greenlet']
+    extras_require['curtsies'] = ['curtsies >=0.1.0, <0.2.0', 'greenlet']
     packages.append("bpython.curtsiesfrontend")
     entry_points['console_scripts'].append(
         'bpython-curtsies = bpython.curtsies:main [curtsies]')
