Changeset 2340

Timestamp:

05/14/07 15:18:43 (2 years ago)

Author:

jstenar

Message:

pyreadline: fix pageup, pagedown scrolling of window. Started work on implementing kill_ring separate from clipboard. ctrl-k and esc no longer puts anything on clipboard

Files:

• pyreadline/trunk/doc/ChangeLog (modified) (1 diff)
• pyreadline/trunk/pyreadline/configuration/pyreadlineconfig.ini (modified) (1 diff)
• pyreadline/trunk/pyreadline/console/console.py (modified) (1 diff)
• pyreadline/trunk/pyreadline/lineeditor/lineobj.py (modified) (7 diffs)
• pyreadline/trunk/pyreadline/modes/emacs.py (modified) (2 diffs)

pyreadline/trunk/doc/ChangeLog

@@ +1 @@
+2007-05-14 Jörgen Stenarson  <jorgen.stenarson -at- bostream.nu>
+    * Fixing pageup pagedown scrolling of window
+    * Begining work on killring. ctrl-k ctrl-y will not use clipboard anymore
+
-2007-05-14 Jörgen Stenarson  <jorgen.stenarson -at- bostream.nu>
-    * pre_inputhook and startup_hook were not functioning properly.

pyreadline/trunk/pyreadline/configuration/pyreadlineconfig.ini

@@ -65 +65 @@
-
-bind_key("Control-v",           "paste")
-paste
+yank
-bind_key("Alt-v",               "ipython_paste")
-

pyreadline/trunk/pyreadline/console/console.py

@@ -508 +508 @@
-            if e.type == 'KeyPress' and e.keycode not in key_modifiers:
-                log(e)
-sym == 'N
+info.keyname == 'n
-                    self.scroll_window(12)
-sym == 'P
+info.keyname == 'p
-                    self.scroll_window(-12)
-                else:

pyreadline/trunk/pyreadline/lineeditor/lineobj.py

@@ -393 +393 @@
-        self.selection_mark=-1
-        self.enable_selection=True
-
+
-    def __repr__(self):
-        return 'ReadLineTextBuffer("%s",point=%s,mark=%s,selection_mark=%s)'%(self.line_buffer,self.point,self.mark,self.selection_mark)
@@ -635 +635 @@
-
-    def kill_line(self):
-
+
+
-        del self.line_buffer[self.point:]
-    
-    def kill_whole_line(self):
-
+
+
-        del self[:]
-    
-    def backward_kill_line(self):
-
+#
-        del self[StartOfLine:Point]
-        
@@ -652 +654 @@
-    def kill_word(self):
-        """Kills to next word ending"""
-
+#
-        del self[Point:NextWordEnd]
-
-    def backward_kill_word(self):
-        """Kills to next word ending"""
-
+#
-        if not self.delete_selection():
-            del self[PrevWordStart:Point]
@@ -664 +666 @@
-    def forward_kill_word(self):
-        """Kills to next word ending"""
-
+#
-        if not self.delete_selection():
-            del self[Point:NextWordEnd]
@@ -670 +672 @@
-
-    def unix_word_rubout(self):
-        self[PrevSpace:Point].to_clipboard()
-        if not self.delete_selection():
-            del self[PrevSpace:Point]
@@ -689 +690 @@
-
-    def yank(self):
-pass
+self.paste_from_kill_ring()
-
-    def yank_pop(self):
-        pass
-
-
-##############  Mark 
@@ -735 +735 @@
-
-
+############## Kill ring
+    def add_to_kill_ring(self,txt):
+        self.kill_ring=[txt]
+        
+
+    def paste_from_kill_ring(self):
+        if self.kill_ring:
+            self.insert_text(self.kill_ring[0])
+
+
-##################################################################
-q=ReadLineTextBuffer("asff asFArw  ewrWErhg",point=8)

pyreadline/trunk/pyreadline/modes/emacs.py

@@ -366 +366 @@
-    def yank(self, e): # (C-y)
-        '''Yank the top of the kill ring into the buffer at point. '''
-pass
+self.l_buffer.yank()
-
-    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.'''
-pass
+self.l_buffer.yank_pop()
-
-
@@ -581 +581 @@
-        self._bind_key('Control-v',         self.paste)
-        self._bind_key('Alt-v',             self.ipython_paste)
-paste
+yank
-        self._bind_key('Control-k',         self.kill_line)
-        self._bind_key('Control-m',         self.set_mark)