Changeset 1382

Timestamp:

06/27/06 15:20:12 (2 years ago)

Author:

jstenar

Message:

pyreadline: ANSI color changes were buggy. Changes today adds config support for prompt and input color, defaults to dos-color when python was launched.

Files:

• pyreadline/trunk/doc/ChangeLog (modified) (1 diff)
• pyreadline/trunk/pyreadline/configuration/pyreadlineconfig.ini (modified) (1 diff)
• pyreadline/trunk/pyreadline/console.py (modified) (2 diffs)
• pyreadline/trunk/pyreadline/rlmain.py (modified) (3 diffs)

pyreadline/trunk/doc/ChangeLog

@@ +1 @@
+2006-06-27 Jörgen Stenarson  <jorgen.stenarson -at- bostream.nu>
+    * Changes from yesterday were not correct. Resulted in invisible docstrings
+      when using ? in ipython.
+    * ANSI sequence Esc[0m in write_color will now result in a white color with no 
+      attributes (same as in cygwin). But the color of input text is controlled
+      set_input_color in config file with default same as dos-color was when
+      launching python. set_prompt_color controls prompt and raw_input text
+      and also defaults to same as dos-color was when launching python.
+      Unfortunately I have not found a way to control color of text that is printed 
+      with a print statement.
+
-2006-06-26 Jörgen Stenarson  <jorgen.stenarson -at- bostream.nu>
-    * Changes to ansi handling to preserve initial consoles color

pyreadline/trunk/pyreadline/configuration/pyreadlineconfig.ini

@@ -70 +70 @@
-history_filename("~/.pythonhistory")
-history_length(200) #value of -1 means no limit
+
+#set_input_color("yellow") #set color of input text
+#set_prompt_color("red")   #set color of prompt and raw_input text

pyreadline/trunk/pyreadline/console.py

@@ -196 +196 @@
-        self.inputHookPtr = c_int.from_address(addressof(self.pythondll.PyOS_InputHook)).value
-        setattr(Console, 'PyMem_Malloc', self.pythondll.PyMem_Malloc)
+        def exit():
+            self.SetConsoleTextAttribute(self.hout, self.saveattr)
+            self.SetConsoleMode(self.hin, self.inmode)
+            self.FreeConsole()
+        import atexit
+        atexit.register(exit)
+            
-
-    def __del__(self):
@@ -313 +320 @@
-            if m:
-                for part in m.group(1).split(";"):
-
-0
+ but white
+7
-                    elif part == "7": # switch on reverse
-                        attr |= 0x4000

pyreadline/trunk/pyreadline/rlmain.py

@@ -51 +51 @@
-        self.console = console.Console()
-        self.size = self.console.size()
-None
-None
+self.console.saveattr
+self.console.saveattr
-        self.key_dispatch = {}
-        self.exit_dispatch = {}
@@ -1224 +1224 @@
-            logger.start_log(on,filename)
-            logger.log("STARTING LOG")
+        def set_prompt_color(color):
+            trtable={"black":0,"darkred":4,"darkgreen":2,"darkyellow":6,"darkblue":1,"darkmagenta":5,"darkcyan":3,"gray":7,
+                     "red":4+8,"green":2+8,"yellow":6+8,"blue":1+8,"magenta":5+8,"cyan":3+8,"white":7+8}
+            self.prompt_color=trtable.get(color.lower(),7)            
+            
+        def set_input_color(color):
+            trtable={"black":0,"darkred":4,"darkgreen":2,"darkyellow":6,"darkblue":1,"darkmagenta":5,"darkcyan":3,"gray":7,
+                     "red":4+8,"green":2+8,"yellow":6+8,"blue":1+8,"magenta":5+8,"cyan":3+8,"white":7+8}
+            self.command_color=trtable.get(color.lower(),7)            
+            
+    
-        loc={"branch":release.branch,
-             "bind_key":bind_key,
@@ -1235 +1246 @@
-             "debug_output":debug_output,
-             "history_filename":sethistoryfilename,
-
+
+
+
-        if os.path.isfile(inputrcpath): 
-            try: