feat: six new methods on FigureManagerMac: mpl_connect, mpl_disconnect, _window_resize_event, _window_move_event, _focus_in_event,

alberti42 · alberti42 · commit 7967d653773c · 2026-02-18T15:46:31.000+01:00
_focus_out_event. src/_macosx.m @interface Window — added - (PyObject*)pyManager; declaration. @interface View — added declarations for windowDidMove:, windowDidBecomeKey:, windowDidResignKey:. @implementation Window — added pyManager accessor (lines 1261–1264) between closeButtonPressed and close. windowDidResize: — augmented with a second PyObject_CallMethod on [window pyManager] calling _window_resize_event with (width, height), reusing the already-acquired GIL. Three new delegate methods added after windowDidResize:: - windowDidMove: — calls _window_move_event(x, y) with the window's new Cocoa origin - windowDidBecomeKey: — calls _focus_in_event() via gil_call_method - windowDidResignKey: — calls _focus_out_event() via gil_call_method backend_macosx.py FigureManagerMac.__init__ — initialises self._window_event_callbacks = cbook.CallbackRegistry(). Six new methods on FigureManagerMac: mpl_connect, mpl_disconnect, _window_resize_event, _window_move_event, _focus_in_event, _focus_out_event.
diff --git a/lib/matplotlib/backends/backend_macosx.py b/lib/matplotlib/backends/backend_macosx.py
@@ -150,6 +150,7 @@ class FigureManagerMac(_macosx.FigureManager, FigureManagerBase):
 
     def __init__(self, canvas, num, *, x=None, y=None):
         self._shown = False
+        self._window_event_callbacks = cbook.CallbackRegistry()
         kwargs = {}
         if x is not None:
             kwargs['x'] = x
@@ -170,6 +171,45 @@ def _close_button_pressed(self):
         Gcf.destroy(self)
         self.canvas.flush_events()
 
+    def mpl_connect(self, event_name, callback):
+        """Register *callback* to be called on a window event.
+
+        Parameters
+        ----------
+        event_name : str
+            One of ``'window_resize_event'``, ``'window_move_event'``,
+            ``'focus_in_event'``, ``'focus_out_event'``.
+        callback : callable
+            - ``'window_resize_event'``: called with ``(width, height)``
+              in logical pixels.
+            - ``'window_move_event'``: called with ``(x, y)`` in Cocoa
+              screen coordinates (origin at bottom-left of primary screen).
+            - ``'focus_in_event'``, ``'focus_out_event'``: called with
+              no arguments.
+
+        Returns
+        -------
+        int
+            A callback id that can be passed to `mpl_disconnect`.
+        """
+        return self._window_event_callbacks.connect(event_name, callback)
+
+    def mpl_disconnect(self, cid):
+        """Remove a callback previously registered with `mpl_connect`."""
+        self._window_event_callbacks.disconnect(cid)
+
+    def _window_resize_event(self, width, height):
+        self._window_event_callbacks.process('window_resize_event', width, height)
+
+    def _window_move_event(self, x, y):
+        self._window_event_callbacks.process('window_move_event', x, y)
+
+    def _focus_in_event(self):
+        self._window_event_callbacks.process('focus_in_event')
+
+    def _focus_out_event(self):
+        self._window_event_callbacks.process('focus_out_event')
+
     def destroy(self):
         # We need to clear any pending timers that never fired, otherwise
         # we get a memory leak from the timer callbacks holding a reference
diff --git a/src/_macosx.m b/src/_macosx.m
@@ -133,6 +133,7 @@ @interface Window : NSWindow
 - (Window*)initWithContentRect:(NSRect)rect styleMask:(unsigned int)mask backing:(NSBackingStoreType)bufferingType defer:(BOOL)deferCreation withManager: (PyObject*)theManager;
 - (NSRect)constrainFrameRect:(NSRect)rect toScreen:(NSScreen*)screen;
 - (BOOL)closeButtonPressed;
+- (PyObject*)pyManager;
 @end
 
 @interface View : NSView <NSWindowDelegate>
@@ -145,6 +146,9 @@ - (void)drawRect:(NSRect)rect;
 - (void)updateDevicePixelRatio:(double)scale;
 - (void)windowDidChangeBackingProperties:(NSNotification*)notification;
 - (void)windowDidResize:(NSNotification*)notification;
+- (void)windowDidMove:(NSNotification*)notification;
+- (void)windowDidBecomeKey:(NSNotification*)notification;
+- (void)windowDidResignKey:(NSNotification*)notification;
 - (View*)initWithFrame:(NSRect)rect;
 - (void)setCanvas: (PyObject*)newCanvas;
 - (void)windowWillClose:(NSNotification*)notification;
@@ -1254,6 +1258,11 @@ - (BOOL)closeButtonPressed
     return YES;
 }
 
+- (PyObject*)pyManager
+{
+    return manager;
+}
+
 - (void)close
 {
     [super close];
@@ -1452,10 +1461,41 @@ - (void)windowDidResize: (NSNotification*)notification
         Py_DECREF(result);
     else
         PyErr_Print();
+    result = PyObject_CallMethod(
+            [window pyManager], "_window_resize_event", "ii", width, height);
+    if (result)
+        Py_DECREF(result);
+    else
+        PyErr_Print();
     PyGILState_Release(gstate);
     [self setNeedsDisplay: YES];
 }
 
+- (void)windowDidMove:(NSNotification*)notification
+{
+    Window* window = (Window*)[self window];
+    NSRect frame = [window frame];
+    PyGILState_STATE gstate = PyGILState_Ensure();
+    PyObject* result = PyObject_CallMethod(
+            [window pyManager], "_window_move_event", "dd",
+            frame.origin.x, frame.origin.y);
+    if (result)
+        Py_DECREF(result);
+    else
+        PyErr_Print();
+    PyGILState_Release(gstate);
+}
+
+- (void)windowDidBecomeKey:(NSNotification*)notification
+{
+    gil_call_method([(Window*)[self window] pyManager], "_focus_in_event");
+}
+
+- (void)windowDidResignKey:(NSNotification*)notification
+{
+    gil_call_method([(Window*)[self window] pyManager], "_focus_out_event");
+}
+
 - (void)windowWillClose:(NSNotification*)notification
 {
     process_event(
