Changeset 1452

Timestamp:

07/18/06 13:57:25 (2 years ago)

Author:

jstenar

Message:

pyreadline: Improvements to ansi color handling. Added do nothing method as tabcompletion default.

Files:

• pyreadline/trunk/doc/ChangeLog (modified) (1 diff)
• pyreadline/trunk/pyreadline/ansi.py (added)
• pyreadline/trunk/pyreadline/console.py (modified) (4 diffs)
• pyreadline/trunk/pyreadline/rlmain.py (modified) (3 diffs)

pyreadline/trunk/doc/ChangeLog

@@ +1 @@
+2006-07-18 Jörgen Stenarson  <jorgen.stenarson -at- bostream.nu>
+    * Added AnsiState class to simplify work with getting the aansi color handling to work properly
+    * Added NOP function to readline class to have an empty function to bind to tab completion
+    * Tab completion bound to do nothing method NOP by default. 
+    
-2006-06-27 Jörgen Stenarson  <jorgen.stenarson -at- bostream.nu>
-    * Changes from yesterday were not correct. Resulted in invisible docstrings

pyreadline/trunk/pyreadline/console.py

@@ -156 +156 @@
-                  0x5b:1, # windows key
-                 }
+from ansi import AnsiState,AnsiWriter
+
-
-class Console(object):
@@ -184 +186 @@
-        self.attr = info.wAttributes
-        self.saveattr = info.wAttributes # remember the initial colors
+        
+        self.defaultstate=AnsiState()
+        self.defaultstate.winattr=info.wAttributes
+        
+        self.ansiwriter=AnsiWriter(self.defaultstate)
+        
+        
-        log('initial attr=%x' % self.attr)
-
@@ -202 +211 @@
-        import atexit
-        atexit.register(exit)
-
+
+
+
+
+
-
-    def __del__(self):
@@ -342 +355 @@
-        return n
-
+    def write_color(self, text, attr=None):
+        n,res= self.ansiwriter.write_color(text,attr)
+        junk = c_int(0)
+        for attr,chunk in res:
+            log(str(attr))
+            log(str(chunk))
+            self.SetConsoleTextAttribute(self.hout, attr.winattr)
+            self.WriteConsoleA(self.hout, chunk, len(chunk), byref(junk), None)
+        return n
+
-    def write_plain(self, text, attr=None):
-        '''write text at current cursor position.'''

pyreadline/trunk/pyreadline/rlmain.py

@@ -180 +180 @@
-                control, meta, shift, code = event.keyinfo
-                event.keyinfo = (control, True, shift, code)
-
+
-            #Process exit keys. Only exit on empty line
-            if event.keyinfo in self.exit_dispatch:
@@ -1120 +1120 @@
-        pass
-
+    def NOP(self,e):
+        pass
+
-    def _bind_key(self, key, func):
-        '''setup the mapping from key to call the function.'''
@@ -1139 +1142 @@
-
-        # I often accidentally hold the shift or control while typing space
+        self._bind_key('Tab',               self.NOP)
-        self._bind_key('Shift-space',       self.self_insert)
-        self._bind_key('Control-space',     self.self_insert)