Temp status bar things messages clear automatically

thomasballinger · thomasballinger · commit c53cf2a56d7e · 2014-08-05T17:02:40.000-04:00
requires master curtsies
TODO use a different event type - this kind of scheduled refresh
is really different than "I need a refresh so I can keep doing
my thing"
diff --git a/bpython/curtsies.py b/bpython/curtsies.py
@@ -1,8 +1,9 @@
 from __future__ import absolute_import
 
-import sys
 import code
 import logging
+import sys
+import time
 from subprocess import Popen, PIPE
 from optparse import Option
 from itertools import izip
@@ -79,8 +80,8 @@ def mainloop(config, locals_, banner, interp=None, paste=None, interactive=True)
             def request_reload(desc):
                 reload_requests.append(curtsies.events.ReloadEvent([desc]))
             refresh_requests = []
-            def request_refresh():
-                refresh_requests.append(curtsies.events.RefreshRequestEvent())
+            def request_refresh(when='now'):
+                refresh_requests.append(curtsies.events.RefreshRequestEvent(when=when))
 
             watcher = wdtest.ModuleChangedEventHandler([], request_reload)
 
@@ -95,17 +96,17 @@ def new_import(name, globals={}, locals={}, fromlist=[], level=-1):
 
             def event_or_refresh(timeout=None):
                 while True:
-                    if refresh_requests:
-                        yield refresh_requests.pop()
-                    else:
-                        while True:
-                            if reload_requests:
-                                e = reload_requests.pop()
-                            else:
-                                e = input_generator.send(.2)
-                            if e is not None:
-                                break
+                    t = time.time()
+                    refresh_requests.sort(key=lambda r: 0 if r.when == 'now' else r.when)
+                    if refresh_requests and (refresh_requests[0].when == 'now' or refresh_requests[-1].when < t):
+                        yield refresh_requests.pop(0)
+                    elif reload_requests:
+                        e = reload_requests.pop()
                         yield e
+                    else:
+                        e = input_generator.send(.2)
+                        if e is not None:
+                            yield e
 
             global repl # global for easy introspection `from bpython.curtsies import repl`
             with Repl(config=config,
diff --git a/bpython/curtsiesfrontend/interaction.py b/bpython/curtsiesfrontend/interaction.py
@@ -41,6 +41,7 @@ def has_focus(self):
     def message(self, msg):
         self.message_start_time = time.time()
         self._message = msg
+        self.refresh_request(time.time() + self.message_time)
 
     def _check_for_expired_message(self):
         if self._message and time.time() > self.message_start_time + self.message_time:
diff --git a/bpython/curtsiesfrontend/repl.py b/bpython/curtsiesfrontend/repl.py
@@ -183,6 +183,7 @@ def __init__(self, locals_=None, config=None,
         config is a bpython config.Struct with config attributes
         request_refresh is a function that will be called when the Repl
             wants to refresh the display, but wants control returned to it afterwards
+            Takes as a kwarg when= which is when to fire
         get_term_hw is a function that returns the current width and height
             of the terminal
         get_cursor_vertical_diff is a function that returns how the cursor moved
@@ -210,11 +211,11 @@ def __init__(self, locals_=None, config=None,
 
         self.reevaluating = False
         self.fake_refresh_requested = False
-        def smarter_request_refresh():
+        def smarter_request_refresh(when='now'):
             if self.reevaluating or self.paste_mode:
                 self.fake_refresh_requested = True
             else:
-                request_refresh()
+                request_refresh(when=when)
         self.request_refresh = smarter_request_refresh
         self.get_term_hw = get_term_hw
         self.get_cursor_vertical_diff = get_cursor_vertical_diff
@@ -328,7 +329,9 @@ def process_event(self, e):
 
         logger.debug("processing event %r", e)
         if isinstance(e, events.RefreshRequestEvent):
-            if self.status_bar.has_focus:
+            if e.when != 'now':
+                pass # This is a scheduled refresh - it's really just a refresh (so nop)
+            elif self.status_bar.has_focus:
                 self.status_bar.process_event(e)
             else:
                 assert self.coderunner.code_is_waiting
