split up process_event

thomasballinger · thomasballinger · commit eb94d34ea083 · 2014-08-12T16:40:40.000-04:00
diff --git a/bpython/curtsiesfrontend/repl.py b/bpython/curtsiesfrontend/repl.py
@@ -372,14 +372,18 @@ def clean_up_current_line_for_exit(self):
     def process_event(self, e):
         """Returns True if shutting down, otherwise returns None.
         Mostly mutates state of Repl object"""
-        # event names uses here are curses compatible, or the full names
-        # for a full list of what should have pretty names, see curtsies.events.CURSES_TABLE
+        # for a full list of what should have pretty names, try python -m curtsies.events
 
-        if not isinstance(e, events.Event):
+        logger.debug("processing event %r", e)
+        if isinstance(e, events.Event):
+            return self.proccess_control_event(e)
+        else:
             self.last_events.append(e)
             self.last_events.pop(0)
+            return self.process_key_event(e)
+
+    def proccess_control_event(self, e):
 
-        logger.debug("processing event %r", e)
         if isinstance(e, events.RefreshRequestEvent):
             if e.when != 'now':
                 pass # This is a scheduled refresh - it's really just a refresh (so nop)
@@ -388,6 +392,7 @@ def process_event(self, e):
             else:
                 assert self.coderunner.code_is_waiting
                 self.run_code_and_maybe_finish()
+
         elif self.status_bar.has_focus:
             return self.status_bar.process_event(e)
 
@@ -419,6 +424,17 @@ def process_event(self, e):
                 self.update_completion()
                 self.status_bar.message('Reloaded at ' + time.strftime('%H:%M:%S') + ' because ' + ' & '.join(e.files_modified) + ' modified')
 
+        else:
+            raise ValueError("don't know how to handle this event type: %r" % e)
+
+    def process_key_event(self, e):
+
+        if self.status_bar.has_focus:
+            return self.status_bar.process_event(e)
+
+        elif self.stdin.has_focus:
+            return self.stdin.process_event(e)
+
         elif e in key_dispatch[self.config.toggle_file_watch_key]:
             if self.watcher:
                 msg = "Auto-reloading active, watching for file changes..."
