From d559219f4016139d6c52d3b386903821a99c54d2 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Fri, 10 Sep 1999 06:05:32 +0000 Subject: [PATCH] Lots more support for event-less callbacks Exported some symbols for the other modules to use etc. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3604 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- utils/wxPython/src/helpers.cpp | 314 ++++++++++------------- utils/wxPython/src/helpers.h | 423 ++++++++++++++++++++----------- utils/wxPython/src/my_typemaps.i | 22 +- 3 files changed, 419 insertions(+), 340 deletions(-) diff --git a/utils/wxPython/src/helpers.cpp b/utils/wxPython/src/helpers.cpp index 1cd1d14937..c74c75de36 100644 --- a/utils/wxPython/src/helpers.cpp +++ b/utils/wxPython/src/helpers.cpp @@ -154,7 +154,6 @@ void __wxPreStart() #ifdef WXP_WITH_THREAD PyThreadState* wxPyEventThreadState = NULL; -bool wxPyInEvent = false; #endif static char* __nullArgv[1] = { 0 }; @@ -252,8 +251,7 @@ PyObject* __wxSetDictionary(PyObject* /* self */, PyObject* args) //--------------------------------------------------------------------------- -PyObject* wxPyConstructObject(void* ptr, char* className) -{ +PyObject* wxPyConstructObject(void* ptr, char* className) { char buff[64]; // should always be big enough... char swigptr[64]; @@ -274,27 +272,68 @@ PyObject* wxPyConstructObject(void* ptr, char* className) return obj; } +//--------------------------------------------------------------------------- +//static bool _wxPyInEvent = false; +static unsigned int _wxPyNestCount = 0; -wxPyCallback::wxPyCallback(PyObject* func) { - m_func = func; - Py_INCREF(m_func); -} - -wxPyCallback::~wxPyCallback() { +HELPEREXPORT bool wxPyRestoreThread() { +// #ifdef WXP_WITH_THREAD +// //if (wxPyEventThreadState != PyThreadState_Get()) { +// if (! _wxPyInEvent) { +// PyEval_RestoreThread(wxPyEventThreadState); +// _wxPyInEvent = true; +// return TRUE; +// } else +// #endif +// return FALSE; + + // NOTE: The Python API docs state that if a thread already has the + // interpreter lock and calls PyEval_RestoreThread again a deadlock + // occurs, so I put in the above code as a guard condition since there are + // many possibilites for nested events and callbacks in wxPython. + // + // Unfortunately, it seems like somebody was lying (or I'm not + // understanding...) because each of the nested calls to this function + // MUST call PyEval_RestoreThread or Python pukes with a thread error (at + // least on Win32.) + // + // until I know better, this is how I am doing it instead: #ifdef WXP_WITH_THREAD - //if (! wxPyInEvent) - PyEval_RestoreThread(wxPyEventThreadState); + PyEval_RestoreThread(wxPyEventThreadState); + _wxPyNestCount += 1; + if (_wxPyNestCount == 1) + return TRUE; + else #endif + return FALSE; +} - Py_DECREF(m_func); +HELPEREXPORT void wxPySaveThread(bool doSave) { #ifdef WXP_WITH_THREAD - //if (! wxPyInEvent) + if (doSave) { PyEval_SaveThread(); + //_wxPyInEvent = false; + } + _wxPyNestCount -= 1; #endif } +//--------------------------------------------------------------------------- + + +wxPyCallback::wxPyCallback(PyObject* func) { + m_func = func; + Py_INCREF(m_func); +} + +wxPyCallback::~wxPyCallback() { + bool doSave = wxPyRestoreThread(); + Py_DECREF(m_func); + wxPySaveThread(doSave); +} + @@ -307,10 +346,7 @@ void wxPyCallback::EventThunker(wxEvent& event) { PyObject* tuple; -#ifdef WXP_WITH_THREAD - PyEval_RestoreThread(wxPyEventThreadState); - wxPyInEvent = true; -#endif + bool doSave = wxPyRestoreThread(); arg = wxPyConstructObject((void*)&event, event.GetClassInfo()->GetClassName()); tuple = PyTuple_New(1); @@ -323,101 +359,85 @@ void wxPyCallback::EventThunker(wxEvent& event) { } else { PyErr_Print(); } -#ifdef WXP_WITH_THREAD - PyEval_SaveThread(); - wxPyInEvent = false; -#endif + wxPySaveThread(doSave); } -//--------------------------------------------------------------------------- +//---------------------------------------------------------------------- -// wxPyMenu::wxPyMenu(const wxString& title, PyObject* _func) -// : wxMenu(title, (wxFunction)(func ? MenuCallback : NULL)), func(0) { +wxPyCallbackHelper::wxPyCallbackHelper() { + m_self = NULL; + m_lastFound = NULL; +} -// if (_func) { -// func = _func; -// Py_INCREF(func); -// } -// } -// wxPyMenu::~wxPyMenu() { -// #ifdef WXP_WITH_THREAD -// //if (! wxPyInEvent) -// PyEval_RestoreThread(wxPyEventThreadState); -// #endif +wxPyCallbackHelper::~wxPyCallbackHelper() { + bool doSave = wxPyRestoreThread(); + Py_XDECREF(m_self); + wxPySaveThread(doSave); +} -// if (func) -// Py_DECREF(func); +void wxPyCallbackHelper::setSelf(PyObject* self) { + m_self = self; + Py_INCREF(m_self); +} -// #ifdef WXP_WITH_THREAD -// //if (! wxPyInEvent) -// PyEval_SaveThread(); -// #endif -// } +bool wxPyCallbackHelper::findCallback(const wxString& name) { + m_lastFound = NULL; + if (m_self && PyObject_HasAttrString(m_self, (char*)name.c_str())) + m_lastFound = PyObject_GetAttrString(m_self, (char*)name.c_str()); -// void wxPyMenu::MenuCallback(wxMenu& menu, wxCommandEvent& evt) { -// PyObject* evtobj; -// PyObject* menuobj; -// PyObject* func; -// PyObject* args; -// PyObject* res; + return m_lastFound != NULL; +} -// #ifdef WXP_WITH_THREAD -// PyEval_RestoreThread(wxPyEventThreadState); -// wxPyInEvent = true; -// #endif -// evtobj = wxPyConstructObject((void*)&evt, "wxCommandEvent"); -// menuobj = wxPyConstructObject((void*)&menu, "wxMenu"); -// if (PyErr_Occurred()) { -// // bail out if a problem -// PyErr_Print(); -// goto done; -// } -// // Now call the callback... -// func = ((wxPyMenu*)&menu)->func; -// args = PyTuple_New(2); -// PyTuple_SET_ITEM(args, 0, menuobj); -// PyTuple_SET_ITEM(args, 1, evtobj); -// res = PyEval_CallObject(func, args); -// Py_DECREF(args); -// Py_XDECREF(res); /* In case res is a NULL pointer */ -// done: -// #ifdef WXP_WITH_THREAD -// PyEval_SaveThread(); -// wxPyInEvent = false; -// #endif -// return; -// } + +int wxPyCallbackHelper::callCallback(PyObject* argTuple) { + PyObject* result; + int retval = FALSE; + + result = callCallbackObj(argTuple); + if (result) { // Assumes an integer return type... + retval = PyInt_AsLong(result); + Py_DECREF(result); + PyErr_Clear(); // forget about it if it's not... + } + return retval; +} + +// Invoke the Python callable object, returning the raw PyObject return +// value. Caller should DECREF the return value and also call PyEval_SaveThread. +PyObject* wxPyCallbackHelper::callCallbackObj(PyObject* argTuple) { + PyObject* result; + + result = PyEval_CallObject(m_lastFound, argTuple); + Py_DECREF(argTuple); + if (!result) { + PyErr_Print(); + } + return result; +} + +//--------------------------------------------------------------------------- //--------------------------------------------------------------------------- + wxPyTimer::wxPyTimer(PyObject* callback) { func = callback; Py_INCREF(func); } wxPyTimer::~wxPyTimer() { -#ifdef WXP_WITH_THREAD - //if (! wxPyInEvent) - PyEval_RestoreThread(wxPyEventThreadState); -#endif - + bool doSave = wxPyRestoreThread(); Py_DECREF(func); - -#ifdef WXP_WITH_THREAD - //if (! wxPyInEvent) - PyEval_SaveThread(); -#endif + wxPySaveThread(doSave); } void wxPyTimer::Notify() { -#ifdef WXP_WITH_THREAD - PyEval_RestoreThread(wxPyEventThreadState); - wxPyInEvent = true; -#endif + bool doSave = wxPyRestoreThread(); + PyObject* result; PyObject* args = Py_BuildValue("()"); @@ -429,10 +449,7 @@ void wxPyTimer::Notify() { } else { PyErr_Print(); } -#ifdef WXP_WITH_THREAD - PyEval_SaveThread(); - wxPyInEvent = false; -#endif + wxPySaveThread(doSave); } @@ -451,18 +468,12 @@ wxPyEvent::wxPyEvent(wxEventType commandType, PyObject* userData) wxPyEvent::~wxPyEvent() { -#ifdef WXP_WITH_THREAD - //if (! wxPyInEvent) - PyEval_RestoreThread(wxPyEventThreadState); -#endif + bool doSave = wxPyRestoreThread(); if (m_userData != Py_None) { Py_DECREF(m_userData); m_userData = Py_None; } -#ifdef WXP_WITH_THREAD - //if (! wxPyInEvent) - PyEval_SaveThread(); -#endif + wxPySaveThread(doSave); } @@ -488,7 +499,7 @@ PyObject* wxPyEvent::GetUserData() { // imcluded in every file... -byte* byte_LIST_helper(PyObject* source) { +HELPEREXPORT byte* byte_LIST_helper(PyObject* source) { if (!PyList_Check(source)) { PyErr_SetString(PyExc_TypeError, "Expected a list object."); return NULL; @@ -511,7 +522,7 @@ byte* byte_LIST_helper(PyObject* source) { } -int* int_LIST_helper(PyObject* source) { +HELPEREXPORT int* int_LIST_helper(PyObject* source) { if (!PyList_Check(source)) { PyErr_SetString(PyExc_TypeError, "Expected a list object."); return NULL; @@ -534,7 +545,7 @@ int* int_LIST_helper(PyObject* source) { } -long* long_LIST_helper(PyObject* source) { +HELPEREXPORT long* long_LIST_helper(PyObject* source) { if (!PyList_Check(source)) { PyErr_SetString(PyExc_TypeError, "Expected a list object."); return NULL; @@ -557,7 +568,7 @@ long* long_LIST_helper(PyObject* source) { } -char** string_LIST_helper(PyObject* source) { +HELPEREXPORT char** string_LIST_helper(PyObject* source) { if (!PyList_Check(source)) { PyErr_SetString(PyExc_TypeError, "Expected a list object."); return NULL; @@ -581,7 +592,7 @@ char** string_LIST_helper(PyObject* source) { -wxPoint* wxPoint_LIST_helper(PyObject* source) { +HELPEREXPORT wxPoint* wxPoint_LIST_helper(PyObject* source) { if (!PyList_Check(source)) { PyErr_SetString(PyExc_TypeError, "Expected a list object."); return NULL; @@ -594,22 +605,21 @@ wxPoint* wxPoint_LIST_helper(PyObject* source) { } for (int x=0; x