Add guiEvent handling for web backends

blink1073 · blink1073 · commit cebbfe3f6ffa · 2015-02-15T08:57:23.000-06:00
diff --git a/lib/matplotlib/backends/backend_webagg_core.py b/lib/matplotlib/backends/backend_webagg_core.py
@@ -290,6 +290,7 @@ def handle_event(self, event):
             # Javascript button numbers and matplotlib button numbers are
             # off by 1
             button = event['button'] + 1
+            guiEvent = event['guiEvent']
 
             # The right mouse button pops up a context menu, which
             # doesn't work very well, so use the middle mouse button
@@ -299,23 +300,23 @@ def handle_event(self, event):
                 button = 3
 
             if e_type == 'button_press':
-                self.button_press_event(x, y, button)
+                self.button_press_event(x, y, button, guiEvent=guiEvent)
             elif e_type == 'button_release':
-                self.button_release_event(x, y, button)
+                self.button_release_event(x, y, button, guiEvent=guiEvent)
             elif e_type == 'motion_notify':
-                self.motion_notify_event(x, y)
+                self.motion_notify_event(x, y, guiEvent=guiEvent)
             elif e_type == 'figure_enter':
-                self.enter_notify_event(xy=(x, y))
+                self.enter_notify_event(xy=(x, y), guiEvent=guiEvent)
             elif e_type == 'figure_leave':
                 self.leave_notify_event()
             elif e_type == 'scroll':
-                self.scroll_event(x, y, event['step'])
+                self.scroll_event(x, y, event['step'], guiEvent=guiEvent)
         elif e_type in ('key_press', 'key_release'):
             key = _handle_key(event['key'])
             if e_type == 'key_press':
-                self.key_press_event(key)
+                self.key_press_event(key, guiEvent=guiEvent)
             elif e_type == 'key_release':
-                self.key_release_event(key)
+                self.key_release_event(key, guiEvent=guiEvent)
         elif e_type == 'toolbar_button':
             # TODO: Be more suspicious of the input
             getattr(self.toolbar, event['name'])()
diff --git a/lib/matplotlib/backends/web_backend/mpl.js b/lib/matplotlib/backends/web_backend/mpl.js
@@ -467,7 +467,8 @@ mpl.figure.prototype.mouse_event = function(event, name) {
     var y = canvas_pos.y;
 
     this.send_message(name, {x: x, y: y, button: event.button,
-                             step: event.step});
+                             step: event.step,
+                             guiEvent: event});
 
     /* This prevents the web browser from automatically changing to
      * the text insertion cursor when the button is pressed.  We want
@@ -507,7 +508,8 @@ mpl.figure.prototype.key_event = function(event, name) {
 
     this._key_event_extra(event, name);
 
-    this.send_message(name, {key: value});
+    this.send_message(name, {key: value,
+                             guiEvent: event});
     return false;
 }
 
