Prevent repeat key events

blink1073 · blink1073 · commit 248bfefc1c50 · 2015-01-25T19:47:03.000-06:00
Prevent repeat key events

Add missing brace

Use cross-platform event.which and handle shift casing

Handle other special keys

Add support for firefox

Handle modified number keys (like #), pause, and capslock

Cleaner handling of shift

Style update

Style update

Handle all key events in chrome

Better handling of shift modifier in firefox
diff --git a/lib/matplotlib/backends/backend_webagg_core.py b/lib/matplotlib/backends/backend_webagg_core.py
@@ -18,6 +18,7 @@
 import io
 import json
 import os
+import re
 import time
 import warnings
 
@@ -47,6 +48,55 @@ 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):
+        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
+    return key
+
+
 class FigureCanvasWebAggCore(backend_agg.FigureCanvasAgg):
     supports_blit = False
 
@@ -222,7 +272,8 @@ def handle_event(self, event):
                 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)
             if e_type == 'key_press':
                 self.key_press_event(key)
             elif e_type == 'key_release':
diff --git a/lib/matplotlib/backends/web_backend/mpl.js b/lib/matplotlib/backends/web_backend/mpl.js
@@ -460,31 +460,55 @@ mpl.figure.prototype.mouse_event = function(event, name) {
 
 mpl.figure.prototype.key_event = function(event, name) {
 
-    // Ignore pause/break and caps lock
-    if (event.keyCode === 19 || event.keyCode === 20) 
-        return;
+    // Prevent repeat events
+    if (name == 'key_press') 
+    {
+        if (event.which === this._key)
+            return;
+        else
+            this._key = event.which;
+    }
+    if (name == 'key_release')
+        this._key = null;
+
     var value = '';
-    if (event.ctrlKey && !(event.keyCode == 17)) {
+    if (event.ctrlKey && !(event.which == 17))
         value += "ctrl+";
-    }
-    if (event.altKey && !(event.keyCode == 18)) {
+    if (event.altKey && !(event.which == 18))
         value += "alt+";
-    }
-    if (event.shiftKey && !(event.keyCode == 16)) {
-        value += "shift+";
-    }
 
-    if (event.keyCode == 17) {
+    if (event.which == 17) {
         value += "control";
+        if (event.shiftKey) 
+            value += "+shift"
     }
-    else if (event.keyCode == 18) {
+    else if (event.which == 18) {
         value += "alt";
+        if (event.shiftKey) 
+            value += "+shift"
     }
-    else if (event.keyCode == 16) {
+    else if (event.which == 16)
         value += "shift";
-    }
     else {
-        value += String.fromCharCode(event.keyCode).toLowerCase();
+        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);
     }
 
     this.send_message(name, {key: value});
