Initial work on urwid shortcuts working, todo: cleanup

ikanobori · ikanobori · commit 261cf201aaf4 · 2010-09-19T23:29:57.000+02:00
diff --git a/bpython/cli.py b/bpython/cli.py
@@ -54,7 +54,7 @@
 from bpython.config import Struct
 
 # This for keys
-from bpython.keys import key_dispatch
+from bpython.keys import cli_key_dispatch as key_dispatch
 
 # This for i18n
 from bpython import translations
diff --git a/bpython/config.py b/bpython/config.py
@@ -3,7 +3,7 @@
 import sys
 from ConfigParser import ConfigParser
 from itertools import chain
-from bpython.keys import key_dispatch
+from bpython.keys import cli_key_dispatch as key_dispatch
 
 
 class Struct(object):
diff --git a/bpython/keys.py b/bpython/keys.py
@@ -47,20 +47,27 @@ def __delitem__(self, key):
     def __setitem__(self, key, value):
         self.map[key] = value
 
-key_dispatch = KeyMap()
+cli_key_dispatch = KeyMap()
+urwid_key_dispatch = KeyMap()
 
 # fill dispatch with letters
 for c in string.ascii_lowercase:
-    key_dispatch['C-%s' % c] = (chr(string.ascii_lowercase.index(c) + 1),
+    cli_key_dispatch['C-%s' % c] = (chr(string.ascii_lowercase.index(c) + 1),
                                 '^%s' % c.upper())
 
+for c in string.ascii_lowercase:
+    urwid_key_dispatch['C-%s' % c] = 'ctrl %s' % c 
+
 # 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), '^_')
+cli_key_dispatch['C-['] = (chr(27), '^[')
+cli_key_dispatch['C-\\'] = (chr(28), '^\\')
+cli_key_dispatch['C-]'] = (chr(29), '^]')
+cli_key_dispatch['C-^'] = (chr(30), '^^')
+cli_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),)
+    cli_key_dispatch['F%s' % str(x)] = ('KEY_F(%s)' % str(x),)
+
+for x in xrange(1, 13):
+    urwid_key_dispatch['F%s' % str(x)] = 'F%s' % str(x)
diff --git a/bpython/urwid.py b/bpython/urwid.py
@@ -49,6 +49,8 @@
 from bpython.importcompletion import find_coroutine
 from bpython.translations import _
 
+from bpython.keys import urwid_key_dispatch as key_dispatch
+
 import urwid
 
 py3 = sys.version_info[0] == 3
@@ -77,6 +79,8 @@
     'd': 'default',
     }
 
+# Add our keys to the urwid command_map
+
 
 try:
     from twisted.internet import protocol
@@ -215,12 +219,13 @@ class BPythonEdit(urwid.Edit):
 
     signals = ['edit-pos-changed']
 
-    def __init__(self, tab_length, *args, **kwargs):
+    def __init__(self, config, *args, **kwargs):
         self._bpy_text = ''
         self._bpy_attr = []
         self._bpy_selectable = True
         self._bpy_may_move_cursor = False
-        self.tab_length = tab_length
+        self.config = config
+        self.tab_length = config.tab_length 
         urwid.Edit.__init__(self, *args, **kwargs)
 
     def set_edit_pos(self, pos):
@@ -294,6 +299,9 @@ def keypress(self, size, key):
                 if not (cpos or len(line) % self.tab_length or line.strip()):
                     self.set_edit_text(line[:-self.tab_length])
                     return None
+            elif key == 'pastebin':
+                # do pastebin
+                pass
             # TODO: Add in specific keypress fetching code here
             return urwid.Edit.keypress(self, size, key)
         finally:
@@ -451,6 +459,8 @@ def __init__(self, event_loop, palette, interpreter, config):
         self.edit = None
         self._completion_update_suppressed = False
 
+        load_urwid_command_map(config)
+
     # Subclasses of Repl need to implement echo, current_line, cw
     def echo(self, s):
         s = s.rstrip('\n')
@@ -722,11 +732,11 @@ def prompt(self, more):
         self.rl_history.reset()
         # XXX what is s_hist?
         if not more:
-            self.edit = BPythonEdit(self.config.tab_length,
+            self.edit = BPythonEdit(self.config,
                                     caption=('prompt', '>>> '))
             self.stdout_hist += '>>> '
         else:
-            self.edit = BPythonEdit(self.config.tab_length,
+            self.edit = BPythonEdit(self.config,
                                     caption=('prompt_more', '... '))
             self.stdout_hist += '... '
 
@@ -1036,6 +1046,25 @@ def run_find_coroutine():
         sys.stdout.write(myrepl.getstdout())
     sys.stdout.flush()
 
-
+def load_urwid_command_map(config):
+    urwid.command_map[key_dispatch[config.up_one_line_key]] = 'cursor up'
+    urwid.command_map[key_dispatch[config.down_one_line_key]] = 'cursor down'
+"""
+            'clear_line': 'C-u',
+            'clear_screen': 'C-l',
+            'clear_word': 'C-w',
+            'cut_to_buffer': 'C-k',
+            'delete': 'C-d',
+            'down_one_line': 'C-n',
+            'exit': '',
+            'last_output': 'F9',
+            'pastebin': 'F8',
+            'save': 'C-s',
+            'show_source': 'F2',
+            'suspend': 'C-z',
+            'undo': 'C-r',
+            'up_one_line': 'C-p',
+            'yank_from_buffer': 'C-y'},
+"""
 if __name__ == '__main__':
     main()
