First start at configurable keys

ikanobori · ikanobori · commit 3150f82958ed · 2009-06-08T23:52:28.000+02:00
diff --git a/bpython/cli.py b/bpython/cli.py
@@ -65,6 +65,9 @@
 # This for config
 from bpython.config import Struct, loadini, migrate_rc
 
+# This for keys
+from bpython.keys import key_dispatch
+
 from bpython import __version__
 
 def log(x):
@@ -1323,11 +1326,11 @@ def p_key(self):
             else:
                 return ''
 
-        elif self.c == 'KEY_F(2)':
+        elif self.c in key_dispatch[OPTS.save_key]:
             self.write2file()
             return ''
 
-        elif self.c == 'KEY_F(8)':
+        elif self.c == key_dispatch[OPTS.pastebin_key]:
             self.pastebin()
             return ''
 
@@ -1618,7 +1621,6 @@ def get_key(self):
                 if self.idle:
                     self.idle(self)
 
-
 class Statusbar(object):
     """This class provides the status bar at the bottom of the screen.
     It has message() and prompt() methods for user interactivity, as
@@ -1720,7 +1722,7 @@ def bs(s):
                 o = bs(o)
                 continue
 
-            if not c or c > 127:
+            if not c or c < 0 or c > 127:
                 continue
             c = chr(c)
 
@@ -1783,7 +1785,7 @@ def init_wins(scr, cols):
 # This should show to be configured keys from bpython.ini
 # 
     statusbar = Statusbar(scr, main_win,
-        ".:: <C-d> Exit  <C-r> Rewind  <F2> Save  <F8> Pastebin ::.",
+        ".:: <C-d> Exit  <C-r> Rewind  <%s> Save  <%s> Pastebin ::." % (OPTS.save_key, OPTS.pastebin_key),
             get_colpair('main'))
 
     return main_win, statusbar
@@ -1903,6 +1905,8 @@ def main_curses(scr):
 
     main_win, statusbar = init_wins(scr, cols)
 
+    curses.raw(True)
+
     interpreter = Interpreter()
 
     repl = Repl(main_win, interpreter, statusbar, idle)
diff --git a/bpython/config.py b/bpython/config.py
@@ -41,6 +41,8 @@ def loadini(struct, configfile):
     struct.hist_file = config.safeget('general', 'hist_file', '~/.pythonhist')
     struct.hist_length = config.safeget('general', 'hist_length', 100)
     struct.flush_output = config.safeget('general', 'flush_output', True)
+    struct.pastebin_key = config.safeget('keyboard', 'pastebin', 'C-p')
+    struct.save_key = config.safeget('keyboard', 'save', 'C-s')
     color_scheme_name = config.safeget('general', 'color_scheme', 'default')
 
     if color_scheme_name == 'default':
diff --git a/bpython/keys.py b/bpython/keys.py
@@ -0,0 +1,43 @@
+#!/usr/bin/env python
+#
+# The MIT License
+#
+# Copyright (c) 2008 Simon de Vlieger
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+#
+
+import string
+
+key_dispatch = {}
+
+# fill dispatch with letters
+for c in string.lowercase:
+    key_dispatch['C-%s' % c] = (chr(string.lowercase.index(c)+1), '^%s' % c.upper())
+
+# fill dispatch with cool characters
+key_dispatch['C-['] = (chr(27), '^[')
+key_dispatch['C-\\'] = (chr(28), '^\\')
+key_dispatch['C-]'] = (chr(29), '^]')
+key_dispatch['C-^'] = (chr(30), '^^')
+key_dispatch['C-_'] = (chr(31), '^_')
+
+# fill dispatch with function keys
+for x in xrange(1,13):
+    key_dispatch['F%s' % str(x)] = 'KEY_F(%s)' % str(x)
diff --git a/sample.ini b/sample.ini
@@ -30,6 +30,8 @@ tab_length = 4
 # Color schemes should be put in ~/.bpython/
 # e.g. to use the theme ~/.bpython/foo.theme set color_scheme = foo
 # Leave blank or set to "default" to use the default theme
-color_scheme = dark
-
+color_scheme = default
 
+[keyboard]
+pastebin = F8
+save = C-s
