Lazy-init the OSX event loop.

anntzer · anntzer · commit eb39be5bea30 · 2018-07-09T14:32:41.000+02:00
diff --git a/lib/matplotlib/backends/__init__.py b/lib/matplotlib/backends/__init__.py
@@ -56,9 +56,6 @@ def _get_running_interactive_framework():
     except ImportError:
         pass
     else:
-        # Note that the NSApp event loop is also running when a non-native
-        # toolkit (e.g. Qt5) is active, but in that case we want to report the
-        # other toolkit; thus, this check comes after the other toolkits.
         if _macosx.event_loop_is_running():
             return "macosx"
     if sys.platform.startswith("linux") and not os.environ.get("DISPLAY"):
diff --git a/src/_macosx.m b/src/_macosx.m
@@ -267,6 +267,39 @@ - (int)index;
 
 /* ---------------------------- Python classes ---------------------------- */
 
+static bool backend_inited = false;
+
+static void lazy_init(void) {
+    if (backend_inited) {
+        return;
+    }
+    backend_inited = true;
+
+    NSApp = [NSApplication sharedApplication];
+
+    PyOS_InputHook = wait_for_stdin;
+
+    NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
+    WindowServerConnectionManager* connectionManager = [WindowServerConnectionManager sharedManager];
+    NSWorkspace* workspace = [NSWorkspace sharedWorkspace];
+    NSNotificationCenter* notificationCenter = [workspace notificationCenter];
+    [notificationCenter addObserver: connectionManager
+                           selector: @selector(launch:)
+                               name: NSWorkspaceDidLaunchApplicationNotification
+                             object: nil];
+    [pool release];
+}
+
+static PyObject*
+event_loop_is_running(PyObject* self)
+{
+    if (backend_inited) {
+        Py_RETURN_TRUE;
+    } else {
+        Py_RETURN_FALSE;
+    }
+}
+
 static CGFloat _get_device_scale(CGContextRef cr)
 {
     CGSize pixelSize = CGContextConvertSizeToDeviceSpace(cr, CGSizeMake(1, 1));
@@ -281,6 +314,7 @@ static CGFloat _get_device_scale(CGContextRef cr)
 static PyObject*
 FigureCanvas_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
 {
+    lazy_init();
     FigureCanvas *self = (FigureCanvas*)type->tp_alloc(type, 0);
     if (!self) return NULL;
     self->view = [View alloc];
@@ -641,6 +675,7 @@ static CGFloat _get_device_scale(CGContextRef cr)
 static PyObject*
 FigureManager_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
 {
+    lazy_init();
     Window* window = [Window alloc];
     if (!window) return NULL;
     FigureManager *self = (FigureManager*)type->tp_alloc(type, 0);
@@ -1016,6 +1051,7 @@ -(void)save_figure:(id)sender
 static PyObject*
 NavigationToolbar_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
 {
+    lazy_init();
     NavigationToolbarHandler* handler = [NavigationToolbarHandler alloc];
     if (!handler) return NULL;
     NavigationToolbar *self = (NavigationToolbar*)type->tp_alloc(type, 0);
@@ -1555,6 +1591,7 @@ -(void)save_figure:(id)sender
 static PyObject*
 NavigationToolbar2_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
 {
+    lazy_init();
     NavigationToolbar2Handler* handler = [NavigationToolbar2Handler alloc];
     if (!handler) return NULL;
     NavigationToolbar2 *self = (NavigationToolbar2*)type->tp_alloc(type, 0);
@@ -2789,16 +2826,6 @@ - (int)index
 }
 @end
 
-static PyObject*
-event_loop_is_running(PyObject* self)
-{
-    if ([NSApp isRunning]) {
-        Py_RETURN_TRUE;
-    } else {
-        Py_RETURN_FALSE;
-    }
-}
-
 static PyObject*
 show(PyObject* self)
 {
@@ -2825,6 +2852,7 @@ - (int)index
 static PyObject*
 Timer_new(PyTypeObject* type, PyObject *args, PyObject *kwds)
 {
+    lazy_init();
     Timer* self = (Timer*)type->tp_alloc(type, 0);
     if (!self) return NULL;
     self->timer = NULL;
@@ -3051,7 +3079,7 @@ static bool verify_framework(void)
    {"event_loop_is_running",
     (PyCFunction)event_loop_is_running,
     METH_NOARGS,
-    "Return whether the NSApp main event loop is currently running."
+    "Return whether the OSX backend has set up the NSApp main event loop."
    },
    {"show",
     (PyCFunction)show,
@@ -3097,13 +3125,12 @@ static bool verify_framework(void)
      || PyType_Ready(&TimerType) < 0)
         return NULL;
 
-    NSApp = [NSApplication sharedApplication];
-
     if (!verify_framework())
         return NULL;
 
     module = PyModule_Create(&moduledef);
-    if (module==NULL) return NULL;
+    if (!module)
+        return NULL;
 
     Py_INCREF(&FigureCanvasType);
     Py_INCREF(&FigureManagerType);
@@ -3116,16 +3143,5 @@ static bool verify_framework(void)
     PyModule_AddObject(module, "NavigationToolbar2", (PyObject*) &NavigationToolbar2Type);
     PyModule_AddObject(module, "Timer", (PyObject*) &TimerType);
 
-    PyOS_InputHook = wait_for_stdin;
-
-    NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
-    WindowServerConnectionManager* connectionManager = [WindowServerConnectionManager sharedManager];
-    NSWorkspace* workspace = [NSWorkspace sharedWorkspace];
-    NSNotificationCenter* notificationCenter = [workspace notificationCenter];
-    [notificationCenter addObserver: connectionManager
-                           selector: @selector(launch:)
-                               name: NSWorkspaceDidLaunchApplicationNotification
-                             object: nil];
-    [pool release];
     return module;
 }
