Move key/mouse dead reckoning to standard callbacks.

anntzer · anntzer · commit 5ddbdcb84acc · 2022-07-21T13:43:30.000+02:00
diff --git a/lib/matplotlib/backend_bases.py b/lib/matplotlib/backend_bases.py
@@ -1418,17 +1418,6 @@ def __init__(self, name, canvas, x, y, button=None, key=None,
         self.step = step
         self.dblclick = dblclick
 
-    def _process(self):
-        if self.name == "button_press_event":
-            self.canvas._button = self.button
-        elif self.name == "button_release_event":
-            self.canvas._button = None
-        elif self.name == "motion_notify_event" and self.button is None:
-            self.button = self.canvas._button
-        if self.key is None:
-            self.key = self.canvas._key
-        super()._process()
-
     def __str__(self):
         return (f"{self.name}: "
                 f"xy=({self.x}, {self.y}) xydata=({self.xdata}, {self.ydata}) "
@@ -1521,28 +1510,41 @@ def __init__(self, name, canvas, key, x=0, y=0, guiEvent=None):
         super().__init__(name, canvas, x, y, guiEvent=guiEvent)
         self.key = key
 
-    def _process(self):
-        if self.name == "key_press_event":
-            self.canvas._key = self.key
-        elif self.name == "key_release_event":
-            self.canvas._key = None
-        super()._process()
 
-
-def _axes_enter_leave_emitter(event):
-    last = LocationEvent.lastevent
-    last_axes = last.inaxes if last is not None else None
-    if last_axes != event.inaxes:
-        if last_axes is not None:
-            try:
-                last.canvas.callbacks.process("axes_leave_event", last)
-            except Exception:
-                # The last canvas may already have been torn down.
-                pass
-        if event.inaxes is not None:
-            event.canvas.callbacks.process("axes_enter_event", event)
-    LocationEvent.lastevent = (
-        None if event.name == "figure_leave_event" else event)
+# Default callback for key events.
+def _key_handler(event):
+    # Dead reckoning of key.
+    if event.name == "key_press_event":
+        event.canvas._key = event.key
+    elif event.name == "key_release_event":
+        event.canvas._key = None
+
+
+# Default callback for mouse events.
+def _mouse_handler(event):
+    # Dead-reckoning of button and key.
+    if event.name == "button_press_event":
+        event.canvas._button = event.button
+    elif event.name == "button_release_event":
+        event.canvas._button = None
+    elif event.name == "motion_notify_event" and event.button is None:
+        event.button = event.canvas._button
+    if event.key is None:
+        event.key = event.canvas._key
+    # Emit axes_enter/axes_leave.
+    if event.name == "motion_notify_event":
+        last = LocationEvent.lastevent
+        last_axes = last.inaxes if last is not None else None
+        if last_axes != event.inaxes:
+            if last_axes is not None:
+                try:
+                    last.canvas.callbacks.process("axes_leave_event", last)
+                except Exception:
+                    pass  # The last canvas may already have been torn down.
+            if event.inaxes is not None:
+                event.canvas.callbacks.process("axes_enter_event", event)
+        LocationEvent.lastevent = (
+            None if event.name == "figure_leave_event" else event)
 
 
 def _get_renderer(figure, print_method=None):
diff --git a/lib/matplotlib/figure.py b/lib/matplotlib/figure.py
@@ -2376,8 +2376,16 @@ def __init__(self,
             'button_press_event', lambda event: self.canvas.pick(event))
         self._scroll_pick_id = self._canvas_callbacks.connect(
             'scroll_event', lambda event: self.canvas.pick(event))
-        self._axes_enter_leave_id = self._canvas_callbacks.connect(
-            'motion_notify_event', backend_bases._axes_enter_leave_emitter)
+        connect = self._canvas_callbacks._connect_picklable
+        self._mouse_key_ids = [
+            connect('key_press_event', backend_bases._key_handler),
+            connect('key_release_event', backend_bases._key_handler),
+            connect('key_release_event', backend_bases._key_handler),
+            connect('button_press_event', backend_bases._mouse_handler),
+            connect('button_release_event', backend_bases._mouse_handler),
+            connect('scroll_event', backend_bases._mouse_handler),
+            connect('motion_notify_event', backend_bases._mouse_handler),
+        ]
 
         if figsize is None:
             figsize = mpl.rcParams['figure.figsize']
