Changeset 2896

Timestamp:

12/17/07 12:30:39 (1 year ago)

Author:

jstenar

Message:

pyreadline comitted first cut of a callback interface to the callback branch

Files:

• pyreadline/branches/callback/pyreadline/__init__.py (modified) (1 diff)
• pyreadline/branches/callback/pyreadline/examples (added)
• pyreadline/branches/callback/pyreadline/examples/callback_example.py (added)
• pyreadline/branches/callback/pyreadline/modes/emacs.py (modified) (5 diffs)
• pyreadline/branches/callback/pyreadline/rlmain.py (modified) (3 diffs)

pyreadline/branches/callback/pyreadline/__init__.py

@@ -28 +28 @@
-            'get_completer_delims',
-            'add_history',
+            'callback_handler_install',
+            'callback_handler_remove',
+            'callback_read_char',
-            'GetOutputFile',
-            'rl',

pyreadline/branches/callback/pyreadline/modes/emacs.py

@@ -34 +34 @@
-        self.previous_func=None
-        self.prompt=">>>"
+
-    def __repr__(self):
-        return "<EmacsMode>"
@@ -40 +41 @@
-        """logfun should be function that takes disp_fun and line_buffer object """
-        self._keylog=logfun
-
-
+
+
+
-        c=self.console
-        def nop(e):
-            pass
+        try:
+            event = c.getkeypress()
+        except KeyboardInterrupt:
+            event=self.handle_ctrl_c()
+            self._update_line()
+            return False
+
+        if self.next_meta:
+            self.next_meta = False
+            control, meta, shift, code = event.keyinfo
+            event.keyinfo = (control, True, shift, code)
+
+        #Process exit keys. Only exit on empty line
+        keyinfo=event.keyinfo.tuple()
+        if keyinfo in self.exit_dispatch:
+            if lineobj.EndOfLine(self.l_buffer) == 0:
+                raise EOFError
+        if len(keyinfo[-1])>1:
+            default=nop
+        else:
+            default=self.self_insert
+        dispatch_func = self.key_dispatch.get(keyinfo,default)
+
+        log("readline from keyboard:%s,%s"%(keyinfo,dispatch_func))
+        log_sock("%s|%s"%(format(keyinfo),dispatch_func.__name__),"bound_function")
+        r = None
+        if dispatch_func:
+            r = dispatch_func(event)
+            self._keylog(dispatch_func,self.l_buffer)
+            self.l_buffer.push_undo()
+
+        self.previous_func = dispatch_func
+        self._update_line()
+        if r:
+            return True
+        return False
+
+
+    def handle_ctrl_c(self):
+        from pyreadline.keysyms.common import KeyPress
+        from pyreadline.console.event import Event
+        log_sock("KBDIRQ")
+        event=Event(0,0)
+        event.char="c"
+        event.keyinfo=KeyPress("c",shift=False,control=True,meta=False,keyname=None)
+        if self.allow_ctrl_c:
+            now=time.time()
+            if (now-self.ctrl_c_timeout)<self.ctrl_c_tap_time_interval:
+                log_sock("Raise KeyboardInterrupt")
+                raise KeyboardInterrupt
+            else:
+                self.ctrl_c_timeout=now
+        else:
+            raise KeyboardInterrupt
+
+        dispatch_func = self.key_dispatch.get(event.keyinfo.tuple(),None)
+        if dispatch_func:
+            r = dispatch_func(event)
+            self._keylog(dispatch_func,self.l_buffer)
+            self.l_buffer.push_undo()
+        
+    def _readline_from_keyboard(self):
-        while 1:
+            if self._readline_from_keyboard_poll():
+                break
+
+    def readline_event_available(self):
+        return self.console.peek()
+
+    def readline(self, prompt=''):
+        c = self.console
+        self.readline_setup(prompt)
+        log("in readline: %s"%self.paste_line_buffer)
+        if len(self.paste_line_buffer)>0:
+            self.l_buffer=lineobj.ReadLineTextBuffer(self.paste_line_buffer[0])
-            self._update_line()
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-        '''Try to act like GNU readline.'''
-        # handle startup_hook
@@ -123 +160 @@
-                traceback.print_exc()
-                self.pre_input_hook = None
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-#########  History commands
@@ -370 +394 @@
-    def yank(self, e): # (C-y)
-        '''Yank the top of the kill ring into the buffer at point. '''
-self.l_buffer.yank()
+pass
-
-    def yank_pop(self, e): # (M-y)
-        '''Rotate the kill-ring, and yank the new top. You can only do this
-        if the prior command is yank or yank-pop.'''
-self.l_buffer.yank_pop()
+pass
-
-
@@ -583 +607 @@
-        self._bind_key('Control-v',         self.paste)
-        self._bind_key('Alt-v',             self.ipython_paste)
-yank
+paste
-        self._bind_key('Control-k',         self.kill_line)
-        self._bind_key('Control-m',         self.set_mark)

pyreadline/branches/callback/pyreadline/rlmain.py

@@ -89 +89 @@
-
-        self.paste_line_buffer=[]
+        self.callback = None
-
-    #Below is for refactoring, raise errors when using old style attributes 
@@ -341 +342 @@
-    def readline(self, prompt=''):
-        return self.mode.readline(prompt)
+
+    def event_available(self):
+        return self.mode.readline_event_available()
+
+    def setup(self,prompt=""):
+        return self.mode.readline_setup(prompt)
+
+    def keyboard_poll(self):
+        return self.mode._readline_from_keyboard_poll()
+
+#
+# Callback interface
+#
+
+    def callback_handler_install(self, prompt, callback):
+        '''bool readline_callback_handler_install ( string prompt, callback callback)
+        Initializes the readline callback interface and terminal, prints the prompt and returns immediately
+        '''
+        self.callback = callback
+        self.mode.readline_setup(prompt)
+
+    def callback_handler_remove(self):
+        '''Removes a previously installed callback handler and restores terminal settings'''
+        self.callback = None
+
+    def callback_read_char(self):
+        '''Reads a character and informs the readline callback interface when a line is received'''
+        if self.keyboard_poll():
+            line = self.l_buffer.get_line_text() + '\n'
+            self.console.write('\r\n') # this is the newline terminating input
+            # however there is another newline added by
+            # self.mode.readline_setup(prompt) which is called by callback_handler_install
+            # this differs from GNU readline
+            self.add_history(self.l_buffer.copy())
+            # TADA:
+            self.callback(line)
-
-    def read_inputrc(self,inputrcpath=os.path.expanduser("~/pyreadlineconfig.ini")):
@@ -471 +508 @@
-set_startup_hook = rl.set_startup_hook
-set_pre_input_hook = rl.set_pre_input_hook
+callback_handler_install=rl.callback_handler_install
+callback_handler_remove=rl.callback_handler_remove
+callback_read_char=rl.callback_read_char
-
-if __name__ == '__main__':