Skip to content

loading TCL / Tk symbols dynamically #6442

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 14 commits into from
May 24, 2016
Merged

loading TCL / Tk symbols dynamically #6442

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
edc80a3
WIP: loading TCL / Tk symbols dynamically
matthew-brett May 17, 2016
64f01dd
RF: refactor C code to Michael D's commments
matthew-brett May 17, 2016
89535be
NF: add Windows support for TCL dynamic loading
matthew-brett May 18, 2016
fc5d060
RF: make dynamic loading of TCL the one true way
matthew-brett May 18, 2016
1c85968
RF: disable build-time link against TCL/Tk
matthew-brett May 18, 2016
830d7a3
RF: find TCL / Tk symbols correctly on Windows
matthew-brett May 19, 2016
4c5a3ab
RF: short-circuit the Tk function tests
matthew-brett May 20, 2016
94bb457
WIP: Add excerpts from TCL / Tk header
matthew-brett May 20, 2016
3f5407a
RF: check, edit, refactor Tcl / tk mini header
matthew-brett May 21, 2016
573aeb5
RF: remove Tcl / Tk header / lib discovery
matthew-brett May 21, 2016
626a1d2
RF: remove build-time check of Tkinter
matthew-brett May 22, 2016
0c2c5a0
RF: force TkAgg / Agg extensions with messages
matthew-brett May 23, 2016
de99a76
BF: fix goofy double "installing" message
matthew-brett May 23, 2016
aa275c6
TST: add test of tkagg backend import
matthew-brett May 24, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
NF: add Windows support for TCL dynamic loading 
Try adding defines etc for using LoadLibrary on Windows to get the TCL /
Tk routines.
  • Loading branch information
@matthew-brett
matthew-brett committed May 18, 2016
commit 89535be9cebc41341b8434b578d2f85a989fbc0a
36 changes: 30 additions & 6 deletions src/_tkagg.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,8 +267,6 @@ static PyMethodDef functions[] = {
#ifdef DYNAMIC_TKINTER
// Functions to fill global TCL / Tk function pointers from tkinter module.

#include <dlfcn.h>

#if PY3K
#define TKINTER_PKG "tkinter"
#define TKINTER_MOD "_tkinter"
Expand All @@ -288,6 +286,31 @@ char *fname2char(PyObject *fname)
#define fname2char(s) (PyString_AsString(s))
#endif

#if defined(_MSC_VER)
#include <windows.h>
#define LIB_PTR_TYPE HMODULE
#define LOAD_LIB(name) LoadLibrary(name)
#define CLOSE_LIB(name) FreeLibrary(name)
FARPROC _dfunc(LIB_PTR_TYPE 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;
}
#else
#include <dlfcn.h>
#define LIB_PTR_TYPE void*
#define LOAD_LIB(name) dlopen(name, RTLD_LAZY)
#define CLOSE_LIB(name) dlclose(name)
void *_dfunc(void *lib_handle, const char *func_name)
{
// Load function `func_name` from `lib_handle`.
Expand All @@ -303,8 +326,9 @@ void *_dfunc(void *lib_handle, const char *func_name)
}
return func;
}
#endif

int _func_loader(void *lib)
int _func_loader(LIB_PTR_TYPE lib)
{
// Fill global function pointers from dynamic lib.
// Return 1 if any pointer is NULL, 0 otherwise.
Expand All @@ -328,7 +352,7 @@ 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;
LIB_PTR_TYPE tkinter_lib;
char *tkinter_libname;
PyObject *pModule = NULL, *pSubmodule = NULL, *pString = NULL;

Expand All @@ -348,15 +372,15 @@ int load_tkinter_funcs(void)
if (tkinter_libname == NULL) {
goto exit;
}
tkinter_lib = dlopen(tkinter_libname, RTLD_LAZY);
tkinter_lib = LOAD_LIB(tkinter_libname);
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);
CLOSE_LIB(tkinter_lib);
exit:
Py_XDECREF(pModule);
Py_XDECREF(pSubmodule);
Expand Down