Move key code handling logic to python

Move key code handling logic to python

Add support for space key

Rename keys for consistency with Qt backend

Add a link to the key codes

Add comments

Author: blink1073

lib/matplotlib/backends/backend_webagg_core.py

@@ -49,52 +49,93 @@ def new_figure_manager_given_figure(num, figure):
     return manager
 
 
-_KEY_LUT = {'shift+À': '~',
-            'À': '`',
-            '\x1b': 'esc',
-            '\x08': 'backspace',
-            'shift+Ü': '|',
-            'Ü': '\\',
-            'shift+Ý': '}',
-            'Ý': ']',
-            'shift+Û': '{',
-            'Û': '[',
-            'shift+º': ':',
-            'º': ';',
-            'shift+Þ': '"',
-            'Þ': "'",
-            'shift+¼': '<',
-            '¼': ',',
-            'shift+¾': '>',
-            '¾': '.',
-            'shift+¿': '?',
-            '¿': '/',
-            'shift+»': '+',
-            '»': '=',
-            'shift+½': '_',
-            '½': '-',
-            '\x7f': 'del',
-            '\t': 'tab'}
-
-
-def _get_key(key):
-    """Handle key codes with unicode characters"""
-    ind = key.index('u+')
-    char = chr(int(key[ind + 2:], 16))
-    if re.match('\d', char):
+# http://www.cambiaresearch.com/articles/15/javascript-char-codes-key-codes
+_SHIFT_LUT = {59: ':',
+              61: '+',
+              173: '_',
+              186: ':',
+              187: '+',
+              188: '<',
+              189: '_',
+              190: '>',
+              191: '?',
+              192: '~',
+              219: '{',
+              220: '|',
+              221: '}',
+              222: '"'}
+
+_LUT = {8: 'backspace',
+        9: 'tab',
+        13: 'enter',
+        16: 'shift',
+        17: 'control',
+        18: 'alt',
+        19: 'pause',
+        20: 'caps',
+        27: 'escape',
+        32: ' ',
+        33: 'pageup',
+        34: 'pagedown',
+        35: 'end',
+        36: 'home',
+        37: 'left',
+        38: 'up',
+        39: 'right',
+        40: 'down',
+        45: 'insert',
+        46: 'delete',
+        91: 'super',
+        92: 'super',
+        93: 'select',
+        106: '*',
+        107: '+',
+        109: '-',
+        110: '.',
+        111: '/',
+        144: 'num_lock',
+        145: 'scroll_lock',
+        186: ':',
+        187: '=',
+        188: ',',
+        189: '-',
+        190: '.',
+        191: '/',
+        192: '`',
+        219: '[',
+        220: '\\',
+        221: ']',
+        222: "'"}
+
+
+def _handle_key(key):
+    """Handle key codes"""
+    code = int(key[key.index('k') + 1:])
+    value = chr(code)
+    # letter keys
+    if code >= 65 and code <= 90:
         if 'shift+' in key:
-            num = int(key[-1])
             key = key.replace('shift+', '')
-            char = ')!@#$%^&*('[num]
-    elif 'shift+' in key:
-        if 'shift+' + char in _KEY_LUT:
-            key = key.replace('shift+', '')
-            char = _KEY_LUT['shift+' + char]
         else:
-            char = _KEY_LUT[char]
-    else:
-        char = _KEY_LUT.get(char, char)
-    key = key[:key.index('u+')] + char
+            value = value.lower()
+    # number keys
+    elif code >= 48 and code <= 57:
+        if 'shift+' in key:
+            value = ')!@#$%^&*('[int(value)]
+            key = key.replace('shift+', '')
+    # function keys
+    elif code >= 112 and code <= 123:
+        value = 'f%s' % (code - 111)
+    # number pad keys
+    elif code >= 96 and code <= 105:
+        value = '%s' % (code - 96)
+    # keys with shift alternatives
+    elif code in _SHIFT_LUT and 'shift+' in key:
+        key = key.replace('shift+', '')
+        value = _SHIFT_LUT[code]
+    elif code in _LUT:
+        value = _LUT[code]
+    key = key[:key.index('k')] + value
     return key
 
 
@@ -272,9 +313,7 @@ def handle_event(self, event):
             elif e_type == 'scroll':
                 self.scroll_event(x, y, event['step'])
         elif e_type in ('key_press', 'key_release'):
-            key = event['key']
-            if 'u+' in key:
-                key = _get_key(key)
+            key = _handle_key(event['key'])
             if e_type == 'key_press':
                 self.key_press_event(key)
             elif e_type == 'key_release':

lib/matplotlib/backends/web_backend/mpl.js

@@ -472,44 +472,15 @@ mpl.figure.prototype.key_event = function(event, name) {
         this._key = null;
 
     var value = '';
-    if (event.ctrlKey && !(event.which == 17))
+    if (event.ctrlKey && event.which != 17)
         value += "ctrl+";
-    if (event.altKey && !(event.which == 18))
+    if (event.altKey && event.which != 18)
         value += "alt+";
+    if (event.shiftKey && event.which != 16)
+        value += "shift+";
 
-    if (event.which == 17) {
-        value += "control";
-        if (event.shiftKey) 
-            value += "+shift"
-    }
-    else if (event.which == 18) {
-        value += "alt";
-        if (event.shiftKey) 
-            value += "+shift"
-    }
-    else if (event.which == 16)
-        value += "shift";
-    else {
-        if (event.which >= 65 && event.which <= 90) {
-            if (event.shiftKey)
-                value += String.fromCharCode(event.which);
-            else
-                value += String.fromCharCode(event.which).toLowerCase();
-        }
-        else if (event.key) {
-            if (event.shiftKey && (event.which <= 46 || 
-                    (event.key >= 91 && event.key <= 145)))
-                value += "shift+"
-            value += event.key.toLowerCase();
-        }
-        else if (event.originalEvent.keyIdentifier) {
-            if (event.shiftKey)
-                value += "shift+"
-            value += event.originalEvent.keyIdentifier.toLowerCase();
-        }
-        else
-            value += String.fromCharCode(event.which);
-    }
+    value += 'k';
+    value += event.which.toString();
 
     this.send_message(name, {key: value});
     return false;