diff options
Diffstat (limited to 'Mac/Modules/carbonevt/CarbonEvtsupport.py')
| -rw-r--r-- | Mac/Modules/carbonevt/CarbonEvtsupport.py | 69 |
1 files changed, 62 insertions, 7 deletions
diff --git a/Mac/Modules/carbonevt/CarbonEvtsupport.py b/Mac/Modules/carbonevt/CarbonEvtsupport.py index a43d47c..ef862ee 100644 --- a/Mac/Modules/carbonevt/CarbonEvtsupport.py +++ b/Mac/Modules/carbonevt/CarbonEvtsupport.py @@ -11,6 +11,7 @@ for typ in RefObjectTypes: execstr = "%(name)s = OpaqueByValueType('%(name)s')" % {"name": typ} exec execstr + if 0: # these types will have no methods and will merely be opaque blobs # should write getattr and setattr for them? @@ -53,6 +54,14 @@ EventHandlerProcPtr = FakeType("(EventHandlerProcPtr)0") CarbonEventsFunction = OSErrFunctionGenerator CarbonEventsMethod = OSErrMethodGenerator +class EventHandlerRefMethod(OSErrMethodGenerator): + def precheck(self): + OutLbrace('if (_self->ob_itself == NULL)') + Output('PyErr_SetString(CarbonEvents_Error, "Handler has been removed");') + Output('return NULL;') + OutRbrace() + + includestuff = r""" #ifdef WITHOUT_FRAMEWORKS #include <CarbonEvents.h> @@ -188,15 +197,31 @@ myEventHandlerUPP = NewEventHandlerUPP(myEventHandler); """ module = MacModule('_CarbonEvt', 'CarbonEvents', includestuff, finalstuff, initstuff) -#class CFReleaserObj(GlobalObjectDefinition): -# def outputFreeIt(self, name): -# Output("CFRelease(%s);" % name) + + + +class EventHandlerRefObjectDefinition(GlobalObjectDefinition): + def outputStructMembers(self): + Output("%s ob_itself;", self.itselftype) + Output("PyObject *ob_callback;") + def outputInitStructMembers(self): + Output("it->ob_itself = %sitself;", self.argref) + Output("it->ob_callback = NULL;") + def outputFreeIt(self, name): + OutLbrace("if (self->ob_itself != NULL)") + Output("RemoveEventHandler(self->ob_itself);") + Output("Py_DECREF(self->ob_callback);") + OutRbrace() for typ in RefObjectTypes: - execstr = typ + 'object = GlobalObjectDefinition(typ)' - exec execstr + if typ == 'EventHandlerRef': + EventHandlerRefobject = EventHandlerRefObjectDefinition('EventHandlerRef') + else: + execstr = typ + 'object = GlobalObjectDefinition(typ)' + exec execstr module.addobject(eval(typ + 'object')) + functions = [] for typ in RefObjectTypes: ## go thru all ObjectTypes as defined in CarbonEventsscan.py # initialize the lists for carbongen to fill @@ -205,6 +230,8 @@ for typ in RefObjectTypes: ## go thru all ObjectTypes as defined in CarbonEvents execfile('CarbonEventsgen.py') + + for f in functions: module.add(f) # add all the functions carboneventsgen put in the list for typ in RefObjectTypes: ## go thru all ObjectTypes as defined in CarbonEventsscan.py @@ -212,6 +239,29 @@ for typ in RefObjectTypes: ## go thru all ObjectTypes as defined in CarbonEv obj = eval(typ + 'object') ## get a reference to the object for m in methods: obj.add(m) ## add each method in the list to the object + +removeeventhandler = """ +OSStatus _err; +if (_self->ob_itself == NULL) { + PyErr_SetString(CarbonEvents_Error, "Handler has been removed"); + return NULL; +} +if (!PyArg_ParseTuple(_args, "")) + return NULL; +_err = RemoveEventHandler(_self->ob_itself); +if (_err != noErr) return PyMac_Error(_err); +_self->ob_itself = NULL; +Py_DECREF(_self->ob_callback); +_self->ob_callback = NULL; +Py_INCREF(Py_None); +_res = Py_None; +return _res;""" + +f = ManualGenerator("RemoveEventHandler", removeeventhandler); +f.docstring = lambda: "() -> None" +EventHandlerRefobject.add(f) + + installeventhandler = """ EventTypeSpec inSpec; PyObject *callback; @@ -224,10 +274,15 @@ if (!PyArg_ParseTuple(_args, "O&O", EventTypeSpec_Convert, &inSpec, &callback)) _err = InstallEventHandler(_self->ob_itself, myEventHandlerUPP, 1, &inSpec, (void *)callback, &outRef); if (_err != noErr) return PyMac_Error(_err); -return Py_BuildValue("O&", EventHandlerRef_New, outRef);""" +_res = EventHandlerRef_New(outRef); +if (_res != NULL) { + ((EventHandlerRefObject*)_res)->ob_callback = callback; + Py_INCREF(callback); +} +return _res;""" f = ManualGenerator("InstallEventHandler", installeventhandler); -f.docstring = lambda: "(EventTargetRef inTarget, EventTypeSpec inSpec, Method callback) -> (EventHandlerRef outRef)" +f.docstring = lambda: "(EventTypeSpec inSpec, Method callback) -> (EventHandlerRef outRef)" EventTargetRefobject.add(f) runappeventloop = """ |