simplified event handling

ricardokirkner · ricardokirkner · commit d00c68dbca26 · 2009-04-10T21:33:48.000Z
- also enhanced console scrolling behaviour
diff --git a/cocos/interpreter/interpreter.py b/cocos/interpreter/interpreter.py
@@ -104,22 +104,24 @@ def on_completion(self, command):
             output.append('\n')
             for symbol in possibilities:
                 output.append(symbol + '\n')
-        self.stdout.dispatch_event('on_completed', completed or slice, ''.join(output))
+        self.dispatch_event('on_completion_done', completed or slice, ''.join(output))
 
     def on_history_prev(self, command):
         item = self.history.previous()
-        self.stdout.dispatch_event('on_set_command', item)
+        self.dispatch_event('on_history_result', item)
 
     def on_history_next(self, command):
         item = self.history.next()
-        self.stdout.dispatch_event('on_set_command', item)
-
-    def on_update_completer(self, ns_locals):
-        self.completer.namespace = ns_locals
-
-Interpreter.register_event_type('on_exit')
-Interpreter.register_event_type('on_command')
-Interpreter.register_event_type('on_completion')
-Interpreter.register_event_type('on_history_prev')
-Interpreter.register_event_type('on_history_next')
-Interpreter.register_event_type('on_update_completer')
+        self.dispatch_event('on_history_result', item)
+
+    def update_namespace(self, ns_locals=None, ns_globals=None):
+        namespace = self.completer.namespace
+        if ns_globals is not None:
+            namespace.update(ns_globals)
+        if ns_locals is not None:
+            namespace.update(ns_locals)
+        self.completer.namespace = namespace
+
+Interpreter.register_event_type('on_command_done')
+Interpreter.register_event_type('on_completion_done')
+Interpreter.register_event_type('on_history_result')
diff --git a/cocos/layer/interpreter.py b/cocos/layer/interpreter.py
@@ -3,7 +3,6 @@
 
 import pyglet
 
-from pyglet.event import EventDispatcher
 from pyglet.text import caret, document, layout
 from pyglet.window import key
 
@@ -12,8 +11,10 @@
 from cocos.layer.util_layers import ColorLayer
 from cocos.interpreter import Interpreter
 
+LINE_HEIGHT = 20
 
-class InterpreterLayer(Layer, EventDispatcher):
+
+class InterpreterLayer(Layer):
     name = "py"
 
     prompt = ">>> "             #: first line prompt
@@ -104,6 +105,8 @@ def write(self, text):
             'color': self.cfg['code.color'],
         })
         self.layout.end_update()
+        lines = len(text.split())
+        self._scroll(lines)
 
     #################
     # Layer API
@@ -129,6 +132,9 @@ def write_prompt(self, first_line=True):
         self.prompt_end = len(self.document.text)
         self.caret.position = len(self.document.text)
 
+    def _scroll(self, amount):
+        self.layout.view_y -= amount * LINE_HEIGHT
+
     #################
     # Layer Events
     #################
@@ -162,7 +168,7 @@ def on_exit(self):
     #################
     def on_text(self, text):
         if text == '\r':
-            self.dispatch_event('on_command', self.get_command())
+            self.on_command(self.get_command())
         else:
             self.caret.on_text(text)
 
@@ -178,9 +184,9 @@ def on_text_motion(self, motion):
         elif motion == key.MOTION_DELETE:
             self.caret.on_text_motion(motion)
         elif motion == key.MOTION_UP:
-            self.interpreter.dispatch_event('on_history_prev', self.get_command())
+            self.interpreter.on_history_prev(self.get_command())
         elif motion == key.MOTION_DOWN:
-            self.interpreter.dispatch_event('on_history_next', self.get_command())
+            self.interpreter.on_history_next(self.get_command())
         elif motion == key.MOTION_BEGINNING_OF_LINE:
             self.caret.position = self.prompt_start
         elif motion == key.MOTION_END_OF_LINE:
@@ -193,7 +199,7 @@ def on_text_motion_select(self, motion):
     # Mouse Events
     #################
     def on_mouse_scroll(self, x, y, dx, dy):
-        self.layout.view_y += dy * 16
+        self._scroll(dy)
 
     def on_mouse_press(self, x, y, button, modifiers):
         self.caret.on_mouse_press(x, y, button, modifiers)
@@ -225,11 +231,11 @@ def on_key_press(self, symbol, modifiers):
             self.document.delete_text(self.prompt_end, len(self.document.text))
             self.caret.position = self.prompt_end
         elif symbol == key.TAB:
-            self.dispatch_event('on_completion', self.get_command())
+            self.on_completion(self.get_command())
         elif symbol == key.PAGEUP:
-            self.layout.view_y += 16
+            self._scroll(-1)
         elif symbol == key.PAGEDOWN:
-            self.layout.view_y -= 16
+            self._scroll(1)
         else:
             return pyglet.event.EVENT_UNHANDLED
         return pyglet.event.EVENT_HANDLED
@@ -238,8 +244,11 @@ def on_key_press(self, symbol, modifiers):
     # Command Events
     #################
     def on_command(self, command):
+        # clear autocompletion results
+        self.document.delete_text(self.caret.position, len(self.document.text))
         self.write('\n')
-        self.interpreter.dispatch_event('on_command', command)
+        # execute command
+        self.interpreter.on_command(command)
 
     def on_command_done(self):
         self.write_prompt()
@@ -250,9 +259,9 @@ def on_completion(self, command):
         # clear the command line
         self.document.delete_text(self.prompt_end, len(self.document.text))
         # request completion
-        self.interpreter.dispatch_event('on_completion', command)
+        self.interpreter.on_completion(command)
 
-    def on_completed(self, completed, output):
+    def on_completion_done(self, completed, output):
         # write out the result of completion
         self.write(completed)
         self.caret.position = len(self.document.text)
@@ -263,16 +272,10 @@ def on_completed(self, completed, output):
             # so write out all possibilities
             self.write(output)
 
+    def on_history_result(self, command):
+        self.set_command(command)
+
     def on_get_command(self):
         command = self.get_command()
         self.write(command + '\n')
 
-    def on_set_command(self, command):
-        self.set_command(command)
-
-InterpreterLayer.register_event_type('on_command')
-InterpreterLayer.register_event_type('on_command_done')
-InterpreterLayer.register_event_type('on_completion')
-InterpreterLayer.register_event_type('on_completed')
-InterpreterLayer.register_event_type('on_get_command')
-InterpreterLayer.register_event_type('on_set_command')
diff --git a/cocos/utils.py b/cocos/utils.py
@@ -45,6 +45,7 @@
 __all__ = ['SequenceScene', 'FileIn', 'FileOut']
 
 from StringIO import StringIO
+from pyglet.event import EventDispatcher
 
 from cocos.layer import *
 from cocos.scene import Scene
@@ -71,23 +72,20 @@ def on_enter(self):
         self.p += 1
 
 
-class FileIO(StringIO):
+class FileIO(StringIO, EventDispatcher):
     """
     A fake file object. If asked for a file number, returns one set on
     instance creation
     """
 
     def __init__(self, buffer, fn=-1):
-        StringIO.__init__(self)
+        super(FileIO, self).__init__()
         self.buffer = buffer
         self.fn = fn
 
     def fileno(self):
         return self.fn
 
-    def dispatch_event(self, event_type, *args):
-        self.buffer.dispatch_event(event_type, *args)
-
 
 class FileIn(FileIO):
     """
@@ -98,9 +96,12 @@ def read(self, n=-1):
         return self.readline()
 
     def readline(self, length=None):
-        self.buffer.dispatch_event('on_get_command')
+        import pdb; pdb.set_trace()
+        self.dispatch_event('on_get_command')
         return ''
 
+FileIn.register_event_type('on_get_command')
+
 
 class FileOut(FileIO):
     """
