Made all keys configurable

ikanobori · ikanobori · commit 3a1a92b816ba · 2009-07-19T10:24:30.000+02:00
diff --git a/bpython/cli.py b/bpython/cli.py
@@ -1480,15 +1480,15 @@ def p_key(self):
             self.print_line(self.s)
             return ''
 
-        elif self.c in key_dispatch['C-r']: # C-r
+        elif self.c in key_dispatch[OPTS.undo_key]: # C-r
             self.undo()
             return ''
 
-        elif self.c in ('KEY_UP', ) + key_dispatch['C-p']: # Cursor Up/C-p
+        elif self.c in ('KEY_UP', ) + key_dispatch[OPTS.up_one_line_key]: # Cursor Up/C-p
             self.back()
             return ''
 
-        elif self.c in ('KEY_DOWN', ) + key_dispatch['C-n']: # Cursor Down/C-n
+        elif self.c in ('KEY_DOWN', ) + key_dispatch[OPTS.down_one_line_key]: # Cursor Down/C-n
             self.fwd()
             return ''
 
@@ -1512,30 +1512,30 @@ def p_key(self):
             # Redraw (as there might have been highlighted parens)
             self.print_line(self.s)
 
-        elif self.c in key_dispatch['C-k']: # cut to buffer
+        elif self.c in key_dispatch[OPTS.cut_to_buffer_key]: # cut to buffer
             self.cut_to_buffer()
             return ''
 
-        elif self.c in key_dispatch['C-y']: # yank from buffer
+        elif self.c in key_dispatch[OPTS.yank_from_buffer_key]: # yank from buffer
             self.yank_from_buffer()
             return ''
 
-        elif self.c in key_dispatch['C-w']: 
+        elif self.c in key_dispatch[OPTS.clear_word_key]: 
             self.bs_word()
             self.complete()
             return ''
 
-        elif self.c in key_dispatch['C-u']:
+        elif self.c in key_dispatch[OPTS.clear_line_key]:
             self.clrtobol()
             return ''
 
-        elif self.c in key_dispatch['C-l']: 
+        elif self.c in key_dispatch[OPTS.clear_screen_key]: 
             self.s_hist = [self.s_hist[-1]]
             self.highlighted_paren = None
             self.redraw()
             return ''
 
-        elif self.c in key_dispatch['C-d']: 
+        elif self.c in key_dispatch[OPTS.exit_key]: 
             if not self.s:
                 self.do_exit = True
                 return None
diff --git a/bpython/config.py b/bpython/config.py
@@ -61,6 +61,16 @@ def loadini(struct, configfile):
     struct.flush_output = config.safeget('general', 'flush_output', True)
     struct.pastebin_key = config.safeget('keyboard', 'pastebin', 'F8')
     struct.save_key = config.safeget('keyboard', 'save', 'C-s')
+    struct.undo_key = config.safeget('keyboard', 'undo', 'C-r')
+    struct.up_one_line_key = config.safeget('keyboard', 'up_one_line', 'C-p')
+    struct.down_one_line_key = config.safeget('keyboard', 'down_one_line', 'C-n')
+    struct.cut_to_buffer_key = config.safeget('keyboard', 'cut_to_buffer', 'C-k')
+    struct.yank_from_buffer_key = config.safeget('keybard', 'yank_from_buffer', 'C-y')
+    struct.clear_word_key = config.safeget('keyboard', 'clear_word', 'C-w')
+    struct.clear_line_key = config.safeget('keyboard', 'clear_line', 'C-u')
+    struct.clear_screen_key = config.safeget('keyboard', 'clear_screen', 'C-l')
+    struct.exit_key = config.safeget('keyboard', 'exit', 'C-d')
+ 
     color_scheme_name = config.safeget('general', 'color_scheme', 'default')
 
     if color_scheme_name == 'default':
