Enable option to disable Unicode box (fixes #254)

sebastinas · sebastinas · commit 566dfe5a5fab · 2015-01-11T23:16:09.000+01:00
Signed-off-by: Sebastian Ramacher &lt;sebastian+dev@ramacher.at&gt;
diff --git a/bpython/config.py b/bpython/config.py
@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
 from __future__ import with_statement
 import os
 import sys
@@ -60,7 +62,8 @@ def loadini(struct, configfile):
             'pastebin_expiry': '1week',
             'pastebin_helper': '',
             'save_append_py': False,
-            'editor': os.environ.get('VISUAL', os.environ.get('EDITOR', 'vi'))
+            'editor': os.environ.get('VISUAL', os.environ.get('EDITOR', 'vi')),
+            'unicode_box': True
         },
         'keyboard': {
             'backspace': 'C-h',
@@ -240,6 +243,27 @@ def get_key_no_doublebind(attr, already_used={}):
     if struct.autocomplete_mode not in bpython.autocomplete.ALL_MODES:
         struct.autocomplete_mode = default_completion
 
+    # set box drawing characters
+    if config.getboolean('general', 'unicode_box'):
+        struct.left_border = u'│'
+        struct.right_border = u'│'
+        struct.top_border = u'─'
+        struct.bottom_border = u'─'
+        struct.left_bottom_corner = u'└'
+        struct.right_bottom_corner = u'┘'
+        struct.left_top_corner = u'┌'
+        struct.right_top_corner = u'┐'
+    else:
+        struct.left_border = u'|'
+        struct.right_border = u'|'
+        struct.top_border = u'-'
+        struct.bottom_border = u'-'
+        struct.left_bottom_corner = u'+'
+        struct.right_bottom_corner = u'+'
+        struct.left_top_corner = u'+'
+        struct.right_top_corner = u'+'
+
+
 def load_theme(struct, path, colors, default_colors):
     theme = ConfigParser()
     with open(path, 'r') as f:
diff --git a/bpython/curtsiesfrontend/replpainter.py b/bpython/curtsiesfrontend/replpainter.py
@@ -154,10 +154,10 @@ def paint_infobox(rows, columns, matches, argspec, match, docstring, config, for
 
     output_lines = []
     border_color = func_for_letter(config.color_scheme['main'])
-    output_lines.append(border_color(u'┌─'+u'─'*width+u'─┐'))
+    output_lines.append(border_color(config.left_top_corner+config.top_border*(width+2)+config.right_top_corner))
     for line in lines:
-        output_lines.append(border_color(u'│ ')+((line+' '*(width - len(line)))[:width])+border_color(u' │'))
-    output_lines.append(border_color(u'└─'+u'─'*width+u'─┘'))
+        output_lines.append(border_color(config.left_border+u' ')+((line+' '*(width - len(line)))[:width])+border_color(u' ' + config.right_border))
+    output_lines.append(border_color(config.left_bottom_corner+config.bottom_border*(width+2)+config.right_bottom_corner))
     r = fsarray(output_lines[:min(rows-1, len(output_lines)-1)] + output_lines[-1:])
     return r
 
@@ -166,10 +166,10 @@ def paint_last_events(rows, columns, names):
         return fsarray([])
     width = min(max(len(name) for name in names), columns-2)
     output_lines = []
-    output_lines.append(u'┌'+u'─'*width+u'┐')
+    output_lines.append(config.left_top_corner+config.top_border*(width+2)+config.right_top_corner)
     for name in names[-(rows-2):]:
-        output_lines.append(u'│'+name[:width].center(width)+u'│')
-    output_lines.append(u'└'+u'─'*width+u'┘')
+        output_lines.append(config.left_border+name[:width].center(width)+config.right_border)
+    output_lines.append(config.left_bottom_corner+config.bottom_border*width+config.right_bottom_corner)
     return fsarray(output_lines)
 
 def paint_statusbar(rows, columns, msg, config):
