console colors

--HG--
branch : pmacs2

buffer/console.py

@@ -1,42 +1,31 @@
 from buffer import Buffer, ACT_NORM
+from buffer.color import ColorDataBuffer
 
 # console is another singleton
 console = None
-class ConsoleBuffer(Buffer):
+class ConsoleBuffer(ColorDataBuffer):
     btype       = 'console'
     #modename   = 'ipython'
     modename    = 'colortext'
+    bannerlines = [
+        '[r:d:*]# Python Console\n',
+        "[r:d:*]# Evaluate python expressions in the editor's context (self)\n",
+        '[r:d:*]# Press Control-] to exit\n',
+    ]
+    banner = ''.join(bannerlines)
     def __new__(cls, *args, **kwargs):
         global console
         if console is None:
             b = object.__new__(ConsoleBuffer, *args, **kwargs)
             console = b
         return console
-    def __init__(self):
-        Buffer.__init__(self)
-        self.clear()
-    def clear(self):
-        #lines = ['# Python Console\n',
-        #         "# Evaluate python expressions in the editor's context (self)\n",
-        #         '# Press Control-] to exit\n']
-        lines = ['[r:d:*]# Python Console\n',
-                 "# Evaluate python expressions in the editor's context (self)\n",
-                 '# Press Control-] to exit\n']
-        console.set_data(''.join(lines), force=True)
-    def name(self):
-        return '*Console*'
-    def changed(self):
-        return False
-    def close(self):
-        global console
-        console = None
-    def readonly(self):
-        return True
 
-    #new
+    def __init__(self): ColorDataBuffer.__init__(self, '*Console*', self.banner)
-    def input_insert_lines(self, p, lines, act=ACT_NORM, force=False):
+    def clear(self): console.set_data(self.banner, force=True)
-        pass
+    def name(self): return '*Console*'
-    def output_insert_lines(self, p, lines, act=ACT_NORM, force=False):
+    def changed(self): return False
-        pass
+    def close(self): global console; console = None
-    def result_insert_lines(self, p, lines, act=ACT_NORM, force=False):
+    def readonly(self): return True
-        pass
+    def input_insert_lines(self, p, lines, act=ACT_NORM, force=False): pass
+    def output_insert_lines(self, p, lines, act=ACT_NORM, force=False): pass
+    def result_insert_lines(self, p, lines, act=ACT_NORM, force=False): pass

mode/consolemini.py

@@ -23,7 +23,7 @@ class ConsoleExec(method.Method):
         if a.window().buffer is not b:
             a.switch_buffer(b)
         p = a.get_mini_buffer_prompt()
-        b.insert_string(b.get_buffer_end(), p + s + '\n', force=True)
+        b.insert_string(b.get_buffer_end(), '[c:d:*]' + p + '[d:d]' + s + '\n', force=True)
 
         if w.mode.saved_input:
             s = w.mode.saved_input + '\n' + s