save and pastebin both work well

thomasballinger · thomasballinger · commit 402bb3355fa5 · 2013-12-19T14:08:44.000-05:00
--HG--
branch : scroll-frontend
diff --git a/bpython/curtsiesfrontend/interaction.py b/bpython/curtsiesfrontend/interaction.py
@@ -1,5 +1,6 @@
 import greenlet
 import time
+import curtsies.events as events
 
 from bpython.repl import Interaction as BpythonInteraction
 
@@ -18,22 +19,24 @@ class StatusBar(BpythonInteraction):
     functionality in a evented or callback style, but trying to integrate
     bpython.Repl code.
     """
-    def __init__(self, initial_message='', permanent_text=""):
+    def __init__(self, initial_message='', permanent_text="", stuff_a_refresh_request=lambda: None):
         self._current_line = ''
         self.cursor_offset_in_line = 0
         self.in_prompt = False
         self.in_confirm = False
+        self.waiting_for_refresh = False
         self.prompt = ''
         self._message = initial_message
         self.message_start_time = time.time()
         self.message_time = 3
         self.permanent_text = permanent_text
         self.main_greenlet = greenlet.getcurrent()
         self.request_greenlet = None
+        self.stuff_a_refresh_request = stuff_a_refresh_request
 
     @property
     def has_focus(self):
-        return self.in_prompt or self.in_confirm
+        return self.in_prompt or self.in_confirm or self.waiting_for_refresh
 
     def message(self, msg):
         self.message_start_time = time.time()
@@ -45,8 +48,11 @@ def _check_for_expired_message(self):
 
     def process_event(self, e):
         """Returns True if shutting down"""
-        assert self.in_prompt or self.in_confirm
-        if e in rl_char_sequences:
+        assert self.in_prompt or self.in_confirm or self.waiting_for_refresh
+        if isinstance(e, events.RefreshRequestEvent):
+            self.waiting_for_refresh = False
+            self.request_greenlet.switch()
+        elif e in rl_char_sequences:
             self.cursor_offset_in_line, self._current_line = rl_char_sequences[e](self.cursor_offset_in_line, self._current_line)
         elif e == "":
             raise KeyboardInterrupt()
@@ -55,7 +61,7 @@ def process_event(self, e):
         elif self.in_prompt and e in ("\n", "\r"):
             line = self._current_line
             self.escape()
-            self.main_greenlet_switch(line)
+            self.request_greenlet.switch(line)
         elif self.in_confirm:
             if e in ('y', 'Y'):
                 self.request_greenlet.switch(True)
@@ -94,6 +100,8 @@ def notify(self, msg, n=3):
         self.request_greenlet = greenlet.getcurrent()
         self.message_time = n
         self.message(msg)
+        self.waiting_for_refresh = True
+        self.stuff_a_refresh_request()
         self.main_greenlet.switch(msg)
 
     # below Really ought to be called from greenlets other than main because they block
@@ -108,4 +116,5 @@ def file_prompt(self, s):
         self.request_greenlet = greenlet.getcurrent()
         self.prompt = s.replace('Esc', 'Tab')
         self.in_prompt = True
-        return self.main_greenlet.switch(s)
+        result = self.main_greenlet.switch(s)
+        return result
diff --git a/bpython/curtsiesfrontend/repl.py b/bpython/curtsiesfrontend/repl.py
@@ -140,9 +140,20 @@ def __init__(self, locals_=None, config=None, stuff_a_refresh_request=lambda: No
         if config.cli_suggestion_width <= 0 or config.cli_suggestion_width > 1:
             config.cli_suggestion_width = 1
 
+        self.reevaluating = False
+        self.fake_refresh_request = False
+        def request_refresh():
+            if self.reevaluating:
+                self.fake_refresh_request = True
+            else:
+                stuff_a_refresh_request()
+        self.stuff_a_refresh_request = request_refresh
+
         self.status_bar = StatusBar(banner if config.curtsies_fill_terminal else '', _(
             " <%s> Rewind  <%s> Save  <%s> Pastebin <%s> Editor"
-            ) % (config.undo_key, config.save_key, config.pastebin_key, config.external_editor_key))
+            ) % (config.undo_key, config.save_key, config.pastebin_key, config.external_editor_key),
+            stuff_a_refresh_request=self.stuff_a_refresh_request
+            )
         self.rl_char_sequences = get_updated_char_sequences(key_dispatch, config)
         logging.debug("starting parent init")
         super(Repl, self).__init__(interp, config)
@@ -165,14 +176,6 @@ def __init__(self, locals_=None, config=None, stuff_a_refresh_request=lambda: No
         self.cursor_offset_in_line = 0 # from the left, 0 means first char
         self.done = True
 
-        self.reevaluating = False
-        self.fake_refresh_request = False
-        def request_refresh():
-            if self.reevaluating:
-                self.fake_refresh_request = True
-            else:
-                stuff_a_refresh_request()
-        self.stuff_a_refresh_request = request_refresh
         self.coderunner = CodeRunner(self.interp, request_refresh)
         self.stdout = FakeOutput(self.coderunner, self.send_to_stdout)
         self.stderr = FakeOutput(self.coderunner, self.send_to_stderr)
@@ -231,8 +234,11 @@ def process_event(self, e):
         result = None
         logging.debug("processing event %r", e)
         if isinstance(e, events.RefreshRequestEvent):
-            assert self.coderunner.code_is_waiting
-            self.run_code_and_maybe_finish()
+            if self.status_bar.has_focus:
+                self.status_bar.process_event(e)
+            else:
+                assert self.coderunner.code_is_waiting
+                self.run_code_and_maybe_finish()
         elif isinstance(e, events.WindowChangeEvent):
             logging.debug('window change to %d %d', e.width, e.height)
             self.width, self.height = e.width, e.height
