GTK gets its own color scheme which is more sane and readable (on a white background)

ikanobori · ikanobori · commit 221659da0b12 · 2010-02-25T00:15:16.000+01:00
diff --git a/bpython/config.py b/bpython/config.py
@@ -67,7 +67,8 @@ def loadini(struct, configfile):
             'up_one_line': 'C-p',
             'yank_from_buffer': 'C-y'},
         'gtk': {
-            'font': 'monospace 10'}})
+            'font': 'monospace 10',
+            'color_scheme': 'default'}})
     config.read(config_path)
 
     struct.dedent_after = config.getint('general', 'dedent_after')
@@ -106,6 +107,7 @@ def loadini(struct, configfile):
     struct.gtk_font = config.get('gtk', 'font')
 
     color_scheme_name = config.get('general', 'color_scheme')
+    color_gtk_scheme_name = config.get('gtk', 'color_scheme')
 
     default_colors = {
             'keyword': 'y',
@@ -125,18 +127,44 @@ def loadini(struct, configfile):
             'prompt_more': 'g',
         }
  
+    default_gtk_colors = {
+            'keyword': 'b',
+            'name': 'k',
+            'comment': 'b',
+            'string': 'm',
+            'error': 'r',
+            'number': 'G',
+            'operator': 'B',
+            'punctuation': 'g',
+            'token': 'C',
+            'background': 'w',
+            'output': 'k',
+            'main': 'c',
+            'paren': 'R',
+            'prompt': 'b',
+            'prompt_more': 'g',
+        }
+
+    # TODO consolidate
     if color_scheme_name == 'default':
         struct.color_scheme = default_colors
     else:
         path = os.path.expanduser('~/.bpython/%s.theme' % (color_scheme_name,))
         load_theme(struct, path, config_path, default_colors)
 
+    if color_gtk_scheme_name == 'default':
+        struct.color_gtk_scheme = default_gtk_colors
+    else:
+        path = os.path.expanduser('~/.bpython/%s.theme' % (color_gtk_scheme_name,))
+        load_gtk_theme(struct, path, config_path, default_gtk_colors)
+
+
     # checks for valid key configuration this part still sucks
     for key in (struct.pastebin_key, struct.save_key):
         key_dispatch[key]
 
-
-def load_theme(struct, path, inipath, default_colors):
+# TODO consolidate
+def load_gtk_theme(struct, path, inipath, default_colors):
     theme = ConfigParser()
     try:
         f = open(path, 'r')
@@ -145,7 +173,7 @@ def load_theme(struct, path, inipath, default_colors):
                          (inipath, e))
         sys.exit(1)
     theme.readfp(f)
-    struct.color_scheme = {}
+    struct.color_gtk_scheme = {}
     for k, v in chain(theme.items('syntax'), theme.items('interface')):
         if theme.has_option('syntax', k):
             struct.color_scheme[k] = theme.get('syntax', k)
@@ -159,6 +187,7 @@ def load_theme(struct, path, inipath, default_colors):
     f.close()
 
 
+
 def migrate_rc(path):
     """Use the shlex module to convert the old configuration file to the new
     format.
diff --git a/bpython/gtk_.py b/bpython/gtk_.py
@@ -267,11 +267,11 @@ def __init__(self, interpreter, config):
                               self.on_suggestion_selection_changed)
         self.list_win.hide()
 
-        self.modify_base('normal', gtk.gdk.color_parse(_COLORS[self.config.color_scheme['background']]))
+        self.modify_base('normal', gtk.gdk.color_parse(_COLORS[self.config.color_gtk_scheme['background']]))
 
         self.text_buffer = self.get_buffer()
         tags = dict()
-        for (name, value) in self.config.color_scheme.iteritems():
+        for (name, value) in self.config.color_gtk_scheme.iteritems():
             tag = tags[name] = self.text_buffer.create_tag(name)
             for (char, prop) in zip(value, ['foreground', 'background']):
                 if char.lower() == 'd':
