mpl-tkagg-1.4.0.patch

diff --git a/setupext.py b/setupext.py
index 0ae553a..9d83633 100755
--- a/setupext.py
+++ b/setupext.py
@@ -1487,11 +1487,10 @@ class BackendTkAgg(OptionalBackendPackage):
             major, minor1, minor2, s, tmp = sys.version_info
             if sys.version_info[0:2] < (3, 4):
                 ext.include_dirs.extend(['win32_static/include/tcl85'])
-                ext.libraries.extend(['tk85', 'tcl85'])
             else:
                 ext.include_dirs.extend(['win32_static/include/tcl86'])
-                ext.libraries.extend(['tk86t', 'tcl86t'])
-            ext.library_dirs.extend([os.path.join(sys.prefix, 'dlls')])
+            # PSAPI library needed for finding TCL / Tk at run time
+            ext.libraries.extend(['psapi'])
 
         elif sys.platform == 'darwin':
             # this config section lifted directly from Imaging - thanks to
@@ -1536,10 +1535,7 @@ class BackendTkAgg(OptionalBackendPackage):
                 # not found...
 
                 # tk_include_dirs.append('/usr/X11R6/include')
-                frameworks = ['-framework', 'Tcl', '-framework', 'Tk']
                 ext.include_dirs.extend(tk_include_dirs)
-                ext.extra_link_args.extend(frameworks)
-                ext.extra_compile_args.extend(frameworks)
 
         # you're still here? ok we'll try it this way...
         else:
@@ -1572,8 +1568,6 @@ class BackendTkAgg(OptionalBackendPackage):
             (tcl_lib_dir, tcl_inc_dir, tcl_lib,
              tk_lib_dir, tk_inc_dir, tk_lib) = result
             ext.include_dirs.extend([tcl_inc_dir, tk_inc_dir])
-            ext.library_dirs.extend([tcl_lib_dir, tk_lib_dir])
-            ext.libraries.extend([tcl_lib, tk_lib])
 
 
 class BackendGtk(OptionalBackendPackage):
diff --git a/src/_tkagg.cpp b/src/_tkagg.cpp
index 60fe2a0..a638c0b 100644
--- a/src/_tkagg.cpp
+++ b/src/_tkagg.cpp
@@ -46,9 +46,27 @@ typedef struct
     Tcl_Interp* interp;
 } TkappObject;
 
-static int
-PyAggImagePhoto(ClientData clientdata, Tcl_Interp* interp,
-                int argc, char **argv)
+// Load TCL / Tk symbols from tkinter extension module at run-time.
+// Typedefs, global vars for TCL / Tk library functions.
+typedef Tcl_Command (*tcl_cc)(Tcl_Interp *interp,
+        const char *cmdName, Tcl_CmdProc *proc,
+        ClientData clientData,
+        Tcl_CmdDeleteProc *deleteProc);
+static tcl_cc TCL_CREATE_COMMAND;
+typedef void (*tcl_app_res) (Tcl_Interp *interp, ...);
+static tcl_app_res TCL_APPEND_RESULT;
+typedef Tk_Window (*tk_mw) (Tcl_Interp *interp);
+static tk_mw TK_MAIN_WINDOW;
+typedef Tk_PhotoHandle (*tk_fp) (Tcl_Interp *interp, const char *imageName);
+static tk_fp TK_FIND_PHOTO;
+typedef void (*tk_ppb_nc) (Tk_PhotoHandle handle,
+        Tk_PhotoImageBlock *blockPtr, int x, int y,
+        int width, int height);
+static tk_ppb_nc TK_PHOTO_PUTBLOCK;
+typedef void (*tk_pb) (Tk_PhotoHandle handle);
+static tk_pb TK_PHOTO_BLANK;
+
+static int PyAggImagePhoto(ClientData clientdata, Tcl_Interp *interp, int argc, char **argv)
 {
     Tk_PhotoHandle photo;
     Tk_PhotoImageBlock block;
@@ -66,7 +84,7 @@ PyAggImagePhoto(ClientData clientdata, Tcl_Interp* interp,
 
     long mode;
     long nval;
-    if (Tk_MainWindow(interp) == NULL)
+    if (TK_MAIN_WINDOW(interp) == NULL)
     {
         // Will throw a _tkinter.TclError with "this isn't a Tk application"
         return TCL_ERROR;
@@ -74,22 +92,22 @@ PyAggImagePhoto(ClientData clientdata, Tcl_Interp* interp,
 
     if (argc != 5)
     {
-        Tcl_AppendResult(interp, "usage: ", argv[0],
+        TCL_APPEND_RESULT(interp, "usage: ", argv[0],
                          " destPhoto srcImage", (char *) NULL);
         return TCL_ERROR;
     }
 
     /* get Tcl PhotoImage handle */
-    photo = Tk_FindPhoto(interp, argv[1]);
+    photo = TK_FIND_PHOTO(interp, argv[1]);
     if (photo == NULL)
     {
-        Tcl_AppendResult(interp, "destination photo must exist", (char *) NULL);
+        TCL_APPEND_RESULT(interp, "destination photo must exist", (char *) NULL);
         return TCL_ERROR;
     }
     /* get array (or object that can be converted to array) pointer */
     if (sscanf(argv[2], SIZE_T_FORMAT, &aggl) != 1)
     {
-        Tcl_AppendResult(interp, "error casting pointer", (char *) NULL);
+        TCL_APPEND_RESULT(interp, "error casting pointer", (char *) NULL);
         return TCL_ERROR;
     }
     aggo = (PyObject*)aggl;
@@ -108,14 +126,14 @@ PyAggImagePhoto(ClientData clientdata, Tcl_Interp* interp,
     mode = atol(argv[3]);
     if ((mode != 0) && (mode != 1) && (mode != 2))
     {
-        Tcl_AppendResult(interp, "illegal image mode", (char *) NULL);
+        TCL_APPEND_RESULT(interp, "illegal image mode", (char *) NULL);
         return TCL_ERROR;
     }
 
     /* check for bbox/blitting */
     if (sscanf(argv[4], SIZE_T_FORMAT, &bboxl) != 1)
     {
-        Tcl_AppendResult(interp, "error casting pointer", (char *) NULL);
+        TCL_APPEND_RESULT(interp, "error casting pointer", (char *) NULL);
         return TCL_ERROR;
     }
     bboxo = (PyObject*)bboxl;
@@ -190,7 +208,7 @@ PyAggImagePhoto(ClientData clientdata, Tcl_Interp* interp,
         block.pitch = deststride;
         block.pixelPtr = destbuffer;
 
-        Tk_PhotoPutBlock(photo, &block, destx, desty, destwidth, destheight);
+        TK_PHOTO_PUTBLOCK(photo, &block, destx, desty, destwidth, destheight);
         delete [] destbuffer;
 
     }
@@ -202,9 +220,9 @@ PyAggImagePhoto(ClientData clientdata, Tcl_Interp* interp,
         block.pixelPtr =  aggRenderer->pixBuffer;
 
         /* Clear current contents */
-        Tk_PhotoBlank(photo);
+        TK_PHOTO_BLANK(photo);
         /* Copy opaque block to photo image, and leave the rest to TK */
-        Tk_PhotoPutBlock(photo, &block, 0, 0, block.width, block.height);
+        TK_PHOTO_PUTBLOCK(photo, &block, 0, 0, block.width, block.height);
     }
 
     return TCL_OK;
@@ -249,9 +267,11 @@ _tkinit(PyObject* self, PyObject* args)
 
     /* This will bomb if interp is invalid... */
 
-    Tcl_CreateCommand(interp, "PyAggImagePhoto",
-                      (Tcl_CmdProc *) PyAggImagePhoto,
-                      (ClientData) 0, (Tcl_CmdDeleteProc*) NULL);
+    TCL_CREATE_COMMAND(interp,
+                       "PyAggImagePhoto",
+                       (Tcl_CmdProc *)PyAggImagePhoto,
+                       (ClientData)0,
+                       (Tcl_CmdDeleteProc *)NULL);
 
     Py_INCREF(Py_None);
     return Py_None;
@@ -265,34 +285,239 @@ static PyMethodDef functions[] =
     {NULL, NULL} /* sentinel */
 };
 
+// Functions to fill global TCL / Tk function pointers by dynamic loading
+#if defined(_WIN32) || defined(__WIN32__) || defined(WIN32)
+
+/*
+ * On Windows, we can't load the tkinter module to get the TCL or Tk symbols,
+ * because Windows does not load symbols into the library name-space of
+ * importing modules. So, knowing that tkinter has already been imported by
+ * Python, we scan all modules in the running process for the TCL and Tk
+ * function names.
+ */
+#include <windows.h>
+#define PSAPI_VERSION 1
+#include <psapi.h>
+// Must be linked with 'psapi' library
+
+FARPROC _dfunc(HMODULE lib_handle, const char *func_name)
+{
+    // Load function `func_name` from `lib_handle`.
+    // Set Python exception if we can't find `func_name` in `lib_handle`.
+    // Returns function pointer or NULL if not present.
+
+    char message[100];
+
+    FARPROC func = GetProcAddress(lib_handle, func_name);
+    if (func == NULL) {
+        sprintf(message, "Cannot load function %s", func_name);
+        PyErr_SetString(PyExc_RuntimeError, message);
+    }
+    return func;
+}
+
+int get_tcl(HMODULE hMod)
+{
+    // Try to fill TCL global vars with function pointers. Return 0 for no
+    // functions found, 1 for all functions found, -1 for some but not all
+    // functions found.
+    TCL_CREATE_COMMAND = (tcl_cc) GetProcAddress(hMod, "Tcl_CreateCommand");
+    if (TCL_CREATE_COMMAND == NULL) {  // Maybe not TCL module
+        return 0;
+    }
+    TCL_APPEND_RESULT = (tcl_app_res) _dfunc(hMod, "Tcl_AppendResult");
+    return (TCL_APPEND_RESULT == NULL) ? -1 : 1;
+}
+
+int get_tk(HMODULE hMod)
+{
+    // Try to fill Tk global vars with function pointers. Return 0 for no
+    // functions found, 1 for all functions found, -1 for some but not all
+    // functions found.
+    TK_MAIN_WINDOW = (tk_mw) GetProcAddress(hMod, "Tk_MainWindow");
+    if (TK_MAIN_WINDOW == NULL) {  // Maybe not Tk module
+        return 0;
+    }
+    TK_FIND_PHOTO = (tk_fp) _dfunc(hMod, "Tk_FindPhoto");
+    TK_PHOTO_PUTBLOCK = (tk_ppb_nc) _dfunc(hMod,
+            "Tk_PhotoPutBlock_NoComposite");
+    TK_PHOTO_BLANK = (tk_pb) _dfunc(hMod, "Tk_PhotoBlank");
+    return ((TK_FIND_PHOTO == NULL) ||
+            (TK_PHOTO_PUTBLOCK == NULL) ||
+            (TK_PHOTO_BLANK == NULL)) ? -1 : 1;
+}
+
+int load_tkinter_funcs(void)
+{
+    // Load TCL and Tk functions by searching all modules in current process.
+    // Return 0 for success, non-zero for failure.
+
+    HMODULE hMods[1024];
+    HANDLE hProcess;
+    DWORD cbNeeded;
+    unsigned int i;
+    int found_tcl = 0;
+    int found_tk = 0;
+
+    // Returns pseudo-handle that does not need to be closed
+    hProcess = GetCurrentProcess();
+
+    // Iterate through modules in this process looking for TCL / Tk names
+    if (EnumProcessModules(hProcess, hMods, sizeof(hMods), &cbNeeded)) {
+        for (i = 0; i < (cbNeeded / sizeof(HMODULE)); i++) {
+            if (!found_tcl) {
+                found_tcl = get_tcl(hMods[i]);
+                if (found_tcl == -1) {
+                    return 1;
+                }
+            }
+            if (!found_tk) {
+                found_tk = get_tk(hMods[i]);
+                if (found_tk == -1) {
+                    return 1;
+                }
+            }
+            if (found_tcl && found_tk) {
+                return 0;
+            }
+        }
+    }
+
+    if (found_tcl == 0) {
+        PyErr_SetString(PyExc_RuntimeError, "Could not find TCL routines");
+    } else {
+        PyErr_SetString(PyExc_RuntimeError, "Could not find Tk routines");
+    }
+    return 1;
+}
+
+#else  // not Windows
+
+/*
+ * On Unix, we can get the TCL and Tk synbols from the tkinter module, because
+ * tkinter uses these symbols, and the symbols are therefore visible in the
+ * tkinter dynamic library (module).
+ */
 #if PY3K
-static PyModuleDef _tkagg_module = {
-    PyModuleDef_HEAD_INIT,
-    "_tkagg",
-    "",
-    -1,
-    functions,
-    NULL, NULL, NULL, NULL
-};
+#define TKINTER_PKG "tkinter"
+#define TKINTER_MOD "_tkinter"
+// From module __file__ attribute to char *string for dlopen.
+char *fname2char(PyObject *fname)
+{
+    PyObject *bytes = PyUnicode_EncodeFSDefault(fname);
+    if (bytes == NULL) {
+        return NULL;
+    }
+    return PyBytes_AsString(bytes);
+}
+#else
+#define TKINTER_PKG "Tkinter"
+#define TKINTER_MOD "tkinter"
+// From module __file__ attribute to char *string for dlopen
+#define fname2char(s) (PyString_AsString(s))
+#endif
+
+#include <dlfcn.h>
 
-PyMODINIT_FUNC
-PyInit__tkagg(void)
+void *_dfunc(void *lib_handle, const char *func_name)
 {
-    PyObject* m;
+    // Load function `func_name` from `lib_handle`.
+    // Set Python exception if we can't find `func_name` in `lib_handle`.
+    // Returns function pointer or NULL if not present.
+
+    // Reset errors.
+    dlerror();
+    void *func = dlsym(lib_handle, func_name);
+    if (func == NULL) {
+        const char *error = dlerror();
+        PyErr_SetString(PyExc_RuntimeError, error);
+    }
+    return func;
+}
+
+int _func_loader(void *lib)
+{
+    // Fill global function pointers from dynamic lib.
+    // Return 1 if any pointer is NULL, 0 otherwise.
+    return (
+         ((TCL_CREATE_COMMAND = (tcl_cc)
+           _dfunc(lib, "Tcl_CreateCommand")) == NULL) ||
+         ((TCL_APPEND_RESULT = (tcl_app_res)
+           _dfunc(lib, "Tcl_AppendResult")) == NULL) ||
+         ((TK_MAIN_WINDOW = (tk_mw)
+           _dfunc(lib, "Tk_MainWindow")) == NULL) ||
+         ((TK_FIND_PHOTO = (tk_fp)
+           _dfunc(lib, "Tk_FindPhoto")) == NULL) ||
+         ((TK_PHOTO_PUTBLOCK = (tk_ppb_nc)
+           _dfunc(lib, "Tk_PhotoPutBlock_NoComposite")) == NULL) ||
+         ((TK_PHOTO_BLANK = (tk_pb)
+           _dfunc(lib, "Tk_PhotoBlank")) == NULL));
+}
+
+int load_tkinter_funcs(void)
+{
+    // Load tkinter global funcs from tkinter compiled module.
+    // Return 0 for success, non-zero for failure.
+    int ret = -1;
+    void *tkinter_lib;
+    char *tkinter_libname;
+    PyObject *pModule = NULL, *pSubmodule = NULL, *pString = NULL;
+
+    pModule = PyImport_ImportModule(TKINTER_PKG);
+    if (pModule == NULL) {
+        goto exit;
+    }
+    pSubmodule = PyObject_GetAttrString(pModule, TKINTER_MOD);
+    if (pSubmodule == NULL) {
+        goto exit;
+    }
+    pString = PyObject_GetAttrString(pSubmodule, "__file__");
+    if (pString == NULL) {
+        goto exit;
+    }
+    tkinter_libname = fname2char(pString);
+    if (tkinter_libname == NULL) {
+        goto exit;
+    }
+    tkinter_lib = dlopen(tkinter_libname, RTLD_LAZY);
+    if (tkinter_lib == NULL) {
+        PyErr_SetString(PyExc_RuntimeError,
+                "Cannot dlopen tkinter module file");
+        goto exit;
+    }
+    ret = _func_loader(tkinter_lib);
+    // dlclose probably safe because tkinter has been imported.
+    dlclose(tkinter_lib);
+exit:
+    Py_XDECREF(pModule);
+    Py_XDECREF(pSubmodule);
+    Py_XDECREF(pString);
+    return ret;
+}
+#endif // end not Windows
+
+#if PY3K
+static PyModuleDef _tkagg_module = { PyModuleDef_HEAD_INIT, "_tkagg", "",   -1,  functions,
+                                     NULL,                  NULL,     NULL, NULL };
+
+PyMODINIT_FUNC PyInit__tkagg(void)
+{
+    PyObject *m;
 
     m = PyModule_Create(&_tkagg_module);
 
     import_array();
 
-    return m;
+    return (load_tkinter_funcs() == 0) ? m : NULL;
 }
 #else
-PyMODINIT_FUNC
-init_tkagg(void)
+PyMODINIT_FUNC init_tkagg(void)
 {
     import_array();
 
     Py_InitModule("_tkagg", functions);
+
+    load_tkinter_funcs();
 }
 #endif