summaryrefslogtreecommitdiffstats
path: root/Mac
diff options
context:
space:
mode:
Diffstat (limited to 'Mac')
-rw-r--r--Mac/Include/macglue.h28
-rw-r--r--Mac/Include/pymactoolbox.h123
-rw-r--r--Mac/Python/macglue.c376
3 files changed, 2 insertions, 525 deletions
diff --git a/Mac/Include/macglue.h b/Mac/Include/macglue.h
index e0c0ff5..6f29a20 100644
--- a/Mac/Include/macglue.h
+++ b/Mac/Include/macglue.h
@@ -31,6 +31,8 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <Carbon/Carbon.h>
#endif
+#include "pymactoolbox.h"
+
#ifdef __cplusplus
extern "C" {
#endif
@@ -44,15 +46,11 @@ typedef struct {
double bg_yield; /* yield at most so long when in background */
} PyMacSchedParams;
-char *PyMac_getscript(void); /* Get the default encoding for our 8bit character set */
#ifdef USE_GUSI1
void PyMac_FixGUSIcd(void); /* Workaround for GUSI chdir() call */
extern void PyMac_SetGUSISpin(void); /* Install our private GUSI spin routine */
#endif
-char *PyMac_StrError(int); /* strerror with mac errors */
-PyObject *PyErr_Mac(PyObject *, int); /* Exception with a mac error */
-PyObject *PyMac_Error(OSErr); /* Uses PyMac_GetOSErrException */
unsigned char *Pstring(char *str); /* Convert c-string to pascal-string in static buffer */
#ifdef USE_GUSI
@@ -97,28 +95,6 @@ void PyMac_PromptGetFile(short numTypes, ConstSFTypeListPtr typeList,
StandardFileReply *reply, char *prompt); /* Ask user for file, with prompt */
#endif /* TARGET_API_MAC_OS8 */
-int PyMac_GetOSType(PyObject *, OSType *); /* argument parser for OSType */
-PyObject *PyMac_BuildOSType(OSType); /* Convert OSType to PyObject */
-
-PyObject *PyMac_BuildNumVersion(NumVersion); /* Convert NumVersion to PyObject */
-
-int PyMac_GetStr255(PyObject *, Str255); /* argument parser for Str255 */
-PyObject *PyMac_BuildStr255(Str255); /* Convert Str255 to PyObject */
-PyObject *PyMac_BuildOptStr255(Str255); /* Convert Str255 to PyObject, NULL to None */
-
-int PyMac_GetRect(PyObject *, Rect *); /* argument parser for Rect */
-PyObject *PyMac_BuildRect(Rect *); /* Convert Rect to PyObject */
-
-int PyMac_GetPoint(PyObject *, Point *); /* argument parser for Point */
-PyObject *PyMac_BuildPoint(Point); /* Convert Point to PyObject */
-
-int PyMac_GetEventRecord(PyObject *, EventRecord *); /* argument parser for EventRecord */
-PyObject *PyMac_BuildEventRecord(EventRecord *); /* Convert EventRecord to PyObject */
-
-int PyMac_GetFixed(PyObject *, Fixed *); /* argument parser for Fixed */
-PyObject *PyMac_BuildFixed(Fixed); /* Convert Fixed to PyObject */
-int PyMac_Getwide(PyObject *, wide *); /* argument parser for wide */
-PyObject *PyMac_Buildwide(wide *); /* Convert wide to PyObject */
void PyMac_InitApplet(void); /* Initialize and run an Applet */
void PyMac_Initialize(void); /* Initialize function for embedding Python */
diff --git a/Mac/Include/pymactoolbox.h b/Mac/Include/pymactoolbox.h
deleted file mode 100644
index 64ac823..0000000
--- a/Mac/Include/pymactoolbox.h
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
-** pymactoolbox.h - global routines exported by the toolbox modules
-*/
-
-#ifdef __cplusplus
- extern "C" {
-#endif
-
-#ifdef WITHOUT_FRAMEWORKS
-#include <Memory.h>
-#include <Dialogs.h>
-#include <Menus.h>
-#include <Controls.h>
-#include <Components.h>
-#include <Lists.h>
-#include <Movies.h>
-#include <Errors.h>
-#else
-#include <Carbon/Carbon.h>
-#include <QuickTime/QuickTime.h>
-#endif
-
-#ifdef USE_TOOLBOX_OBJECT_GLUE
-/*
-** These macros are used in the module init code. If we use toolbox object glue
-** it sets the function pointer to point to the real function.
-*/
-#define PyMac_INIT_TOOLBOX_OBJECT_NEW(object, rtn) { \
- extern PyObject *(*PyMacGluePtr_##rtn)(object); \
- PyMacGluePtr_##rtn = _##rtn; \
-}
-#define PyMac_INIT_TOOLBOX_OBJECT_CONVERT(object, rtn) { \
- extern int (*PyMacGluePtr_##rtn)(PyObject *, object *); \
- PyMacGluePtr_##rtn = _##rtn; \
-}
-#else
-/*
-** If we don't use toolbox object glue the init macros are empty. Moreover, we define
-** _xxx_New to be the same as xxx_New, and the code in mactoolboxglue isn't included.
-*/
-#define PyMac_INIT_TOOLBOX_OBJECT_NEW(object, rtn)
-#define PyMac_INIT_TOOLBOX_OBJECT_CONVERT(object, rtn)
-#endif /* USE_TOOLBOX_OBJECT_GLUE */
-
-/* macfs exports */
-extern int PyMac_GetFSSpec(PyObject *, FSSpec *);
-
-/* AE exports */
-extern PyObject *AEDesc_New(AppleEvent *); /* XXXX Why passed by address?? */
-extern int AEDesc_Convert(PyObject *, AppleEvent *);
-
-/* Cm exports */
-extern PyObject *CmpObj_New(Component);
-extern int CmpObj_Convert(PyObject *, Component *);
-extern PyObject *CmpInstObj_New(ComponentInstance);
-extern int CmpInstObj_Convert(PyObject *, ComponentInstance *);
-
-/* Ctl exports */
-extern PyObject *CtlObj_New(ControlHandle);
-extern int CtlObj_Convert(PyObject *, ControlHandle *);
-
-/* Dlg exports */
-extern PyObject *DlgObj_New(DialogPtr);
-extern int DlgObj_Convert(PyObject *, DialogPtr *);
-extern PyObject *DlgObj_WhichDialog(DialogPtr);
-
-/* Drag exports */
-extern PyObject *DragObj_New(DragReference);
-extern int DragObj_Convert(PyObject *, DragReference *);
-
-/* List exports */
-extern PyObject *ListObj_New(ListHandle);
-extern int ListObj_Convert(PyObject *, ListHandle *);
-
-/* Menu exports */
-extern PyObject *MenuObj_New(MenuHandle);
-extern int MenuObj_Convert(PyObject *, MenuHandle *);
-
-/* Qd exports */
-extern PyObject *GrafObj_New(GrafPtr);
-extern int GrafObj_Convert(PyObject *, GrafPtr *);
-extern PyObject *BMObj_New(BitMapPtr);
-extern int BMObj_Convert(PyObject *, BitMapPtr *);
-extern PyObject *QdRGB_New(RGBColor *);
-extern int QdRGB_Convert(PyObject *, RGBColor *);
-
-/* Qdoffs exports */
-extern PyObject *GWorldObj_New(GWorldPtr);
-extern int GWorldObj_Convert(PyObject *, GWorldPtr *);
-
-/* Qt exports */
-extern PyObject *TrackObj_New(Track);
-extern int TrackObj_Convert(PyObject *, Track *);
-extern PyObject *MovieObj_New(Movie);
-extern int MovieObj_Convert(PyObject *, Movie *);
-extern PyObject *MovieCtlObj_New(MovieController);
-extern int MovieCtlObj_Convert(PyObject *, MovieController *);
-extern PyObject *TimeBaseObj_New(TimeBase);
-extern int TimeBaseObj_Convert(PyObject *, TimeBase *);
-extern PyObject *UserDataObj_New(UserData);
-extern int UserDataObj_Convert(PyObject *, UserData *);
-extern PyObject *MediaObj_New(Media);
-extern int MediaObj_Convert(PyObject *, Media *);
-
-/* Res exports */
-extern PyObject *ResObj_New(Handle);
-extern int ResObj_Convert(PyObject *, Handle *);
-extern PyObject *OptResObj_New(Handle);
-extern int OptResObj_Convert(PyObject *, Handle *);
-
-/* TE exports */
-extern PyObject *TEObj_New(TEHandle);
-extern int TEObj_Convert(PyObject *, TEHandle *);
-
-/* Win exports */
-extern PyObject *WinObj_New(WindowPtr);
-extern int WinObj_Convert(PyObject *, WindowPtr *);
-extern PyObject *WinObj_WhichWindow(WindowPtr);
-
-
-#ifdef __cplusplus
- }
-#endif
diff --git a/Mac/Python/macglue.c b/Mac/Python/macglue.c
index a8993f5..a118372 100644
--- a/Mac/Python/macglue.c
+++ b/Mac/Python/macglue.c
@@ -179,42 +179,6 @@ static PyObject *python_event_handler;
*/
int PyMac_AppearanceCompliant;
-/*
-** Find out what the current script is.
-** Donated by Fredrik Lund.
-*/
-char *PyMac_getscript()
-{
- int font, script, lang;
- font = 0;
- font = GetSysFont();
- script = FontToScript(font);
- switch (script) {
- case smRoman:
- lang = GetScriptVariable(script, smScriptLang);
- if (lang == langIcelandic)
- return "mac-iceland";
- else if (lang == langTurkish)
- return "mac-turkish";
- else if (lang == langGreek)
- return "mac-greek";
- else
- return "mac-roman";
- break;
-#if 0
- /* We don't have a codec for this, so don't return it */
- case smJapanese:
- return "mac-japan";
-#endif
- case smGreek:
- return "mac-greek";
- case smCyrillic:
- return "mac-cyrillic";
- default:
- return "ascii"; /* better than nothing */
- }
-}
-
/* Given an FSSpec, return the FSSpec of the parent folder */
static OSErr
@@ -421,66 +385,6 @@ c2pstrcpy(unsigned char *dst, const char *src)
}
#endif /* TARGET_API_MAC_OS8 */
-/* Like strerror() but for Mac OS error numbers */
-char *PyMac_StrError(int err)
-{
- static char buf[256];
- Handle h;
- char *str;
-
- h = GetResource('Estr', err);
- if ( h ) {
- HLock(h);
- str = (char *)*h;
- memcpy(buf, str+1, (unsigned char)str[0]);
- buf[(unsigned char)str[0]] = '\0';
- HUnlock(h);
- ReleaseResource(h);
- } else {
- sprintf(buf, "Mac OS error code %d", err);
- }
- return buf;
-}
-
-/* Exception object shared by all Mac specific modules for Mac OS errors */
-PyObject *PyMac_OSErrException;
-
-/* Initialize and return PyMac_OSErrException */
-PyObject *
-PyMac_GetOSErrException()
-{
- if (PyMac_OSErrException == NULL)
- PyMac_OSErrException = PyString_FromString("MacOS.Error");
- return PyMac_OSErrException;
-}
-
-/* Set a MAC-specific error from errno, and return NULL; return None if no error */
-PyObject *
-PyErr_Mac(PyObject *eobj, int err)
-{
- char *msg;
- PyObject *v;
-
- if (err == 0 && !PyErr_Occurred()) {
- Py_INCREF(Py_None);
- return Py_None;
- }
- if (err == -1 && PyErr_Occurred())
- return NULL;
- msg = PyMac_StrError(err);
- v = Py_BuildValue("(is)", err, msg);
- PyErr_SetObject(eobj, v);
- Py_DECREF(v);
- return NULL;
-}
-
-/* Call PyErr_Mac with PyMac_OSErrException */
-PyObject *
-PyMac_Error(OSErr err)
-{
- return PyErr_Mac(PyMac_GetOSErrException(), err);
-}
-
#ifdef USE_STACKCHECK
/* Check for stack overflow */
int
@@ -959,284 +863,4 @@ void PyMac_PromptGetFile(short numTypes, ConstSFTypeListPtr typeList,
}
#endif /* TARGET_API_MAC_OS8 */
-/* Convert a 4-char string object argument to an OSType value */
-int
-PyMac_GetOSType(PyObject *v, OSType *pr)
-{
- if (!PyString_Check(v) || PyString_Size(v) != 4) {
- PyErr_SetString(PyExc_TypeError,
- "OSType arg must be string of 4 chars");
- return 0;
- }
- memcpy((char *)pr, PyString_AsString(v), 4);
- return 1;
-}
-
-/* Convert an OSType value to a 4-char string object */
-PyObject *
-PyMac_BuildOSType(OSType t)
-{
- return PyString_FromStringAndSize((char *)&t, 4);
-}
-
-/* Convert an NumVersion value to a 4-element tuple */
-PyObject *
-PyMac_BuildNumVersion(NumVersion t)
-{
- return Py_BuildValue("(hhhh)", t.majorRev, t.minorAndBugRev, t.stage, t.nonRelRev);
-}
-
-/* Convert a Python string object to a Str255 */
-int
-PyMac_GetStr255(PyObject *v, Str255 pbuf)
-{
- int len;
- if (!PyString_Check(v) || (len = PyString_Size(v)) > 255) {
- PyErr_SetString(PyExc_TypeError,
- "Str255 arg must be string of at most 255 chars");
- return 0;
- }
- pbuf[0] = len;
- memcpy((char *)(pbuf+1), PyString_AsString(v), len);
- return 1;
-}
-
-/* Convert a Str255 to a Python string object */
-PyObject *
-PyMac_BuildStr255(Str255 s)
-{
- if ( s == NULL ) {
- PyErr_SetString(PyExc_SystemError, "Str255 pointer is NULL");
- return NULL;
- }
- return PyString_FromStringAndSize((char *)&s[1], (int)s[0]);
-}
-
-PyObject *
-PyMac_BuildOptStr255(Str255 s)
-{
- if ( s == NULL ) {
- Py_INCREF(Py_None);
- return Py_None;
- }
- return PyString_FromStringAndSize((char *)&s[1], (int)s[0]);
-}
-
-
-
-/* Convert a Python object to a Rect.
- The object must be a (left, top, right, bottom) tuple.
- (This differs from the order in the struct but is consistent with
- the arguments to SetRect(), and also with STDWIN). */
-int
-PyMac_GetRect(PyObject *v, Rect *r)
-{
- return PyArg_Parse(v, "(hhhh)", &r->left, &r->top, &r->right, &r->bottom);
-}
-
-/* Convert a Rect to a Python object */
-PyObject *
-PyMac_BuildRect(Rect *r)
-{
- return Py_BuildValue("(hhhh)", r->left, r->top, r->right, r->bottom);
-}
-
-
-/* Convert a Python object to a Point.
- The object must be a (h, v) tuple.
- (This differs from the order in the struct but is consistent with
- the arguments to SetPoint(), and also with STDWIN). */
-int
-PyMac_GetPoint(PyObject *v, Point *p)
-{
- return PyArg_Parse(v, "(hh)", &p->h, &p->v);
-}
-
-/* Convert a Point to a Python object */
-PyObject *
-PyMac_BuildPoint(Point p)
-{
- return Py_BuildValue("(hh)", p.h, p.v);
-}
-
-
-/* Convert a Python object to an EventRecord.
- The object must be a (what, message, when, (v, h), modifiers) tuple. */
-int
-PyMac_GetEventRecord(PyObject *v, EventRecord *e)
-{
- return PyArg_Parse(v, "(Hll(hh)H)",
- &e->what,
- &e->message,
- &e->when,
- &e->where.h,
- &e->where.v,
- &e->modifiers);
-}
-
-/* Convert a Rect to an EventRecord object */
-PyObject *
-PyMac_BuildEventRecord(EventRecord *e)
-{
- return Py_BuildValue("(hll(hh)h)",
- e->what,
- e->message,
- e->when,
- e->where.h,
- e->where.v,
- e->modifiers);
-}
-
-/* Convert Python object to Fixed */
-int
-PyMac_GetFixed(PyObject *v, Fixed *f)
-{
- double d;
-
- if( !PyArg_Parse(v, "d", &d))
- return 0;
- *f = (Fixed)(d * 0x10000);
- return 1;
-}
-
-/* Convert a Point to a Python object */
-PyObject *
-PyMac_BuildFixed(Fixed f)
-{
- double d;
-
- d = f;
- d = d / 0x10000;
- return Py_BuildValue("d", d);
-}
-
-/* Convert wide to/from Python int or (hi, lo) tuple. XXXX Should use Python longs */
-int
-PyMac_Getwide(PyObject *v, wide *rv)
-{
- if (PyInt_Check(v)) {
- rv->hi = 0;
- rv->lo = PyInt_AsLong(v);
- if( rv->lo & 0x80000000 )
- rv->hi = -1;
- return 1;
- }
- return PyArg_Parse(v, "(ll)", &rv->hi, &rv->lo);
-}
-
-
-PyObject *
-PyMac_Buildwide(wide *w)
-{
- if ( (w->hi == 0 && (w->lo & 0x80000000) == 0) ||
- (w->hi == -1 && (w->lo & 0x80000000) ) )
- return PyInt_FromLong(w->lo);
- return Py_BuildValue("(ll)", w->hi, w->lo);
-}
-
-#ifdef USE_TOOLBOX_OBJECT_GLUE
-/*
-** Glue together the toolbox objects.
-**
-** Because toolbox modules interdepend on each other, they use each others
-** object types, on MacOSX/MachO this leads to the situation that they
-** cannot be dynamically loaded (or they would all have to be lumped into
-** a single .so, but this would be bad for extensibility).
-**
-** This file defines wrappers for all the _New and _Convert functions,
-** which are the Py_BuildValue and PyArg_ParseTuple helpers. The wrappers
-** check an indirection function pointer, and if it isn't filled in yet
-** they import the appropriate module, whose init routine should fill in
-** the pointer.
-*/
-
-#define GLUE_NEW(object, routinename, module) \
-PyObject *(*PyMacGluePtr_##routinename)(object); \
-\
-PyObject *routinename(object cobj) { \
- if (!PyMacGluePtr_##routinename) { \
- if (!PyImport_ImportModule(module)) return NULL; \
- if (!PyMacGluePtr_##routinename) { \
- PyErr_SetString(PyExc_ImportError, "Module did not provide routine: " module ": " #routinename); \
- return NULL; \
- } \
- } \
- return (*PyMacGluePtr_##routinename)(cobj); \
-}
-
-#define GLUE_CONVERT(object, routinename, module) \
-int (*PyMacGluePtr_##routinename)(PyObject *, object *); \
-\
-int routinename(PyObject *pyobj, object *cobj) { \
- if (!PyMacGluePtr_##routinename) { \
- if (!PyImport_ImportModule(module)) return NULL; \
- if (!PyMacGluePtr_##routinename) { \
- PyErr_SetString(PyExc_ImportError, "Module did not provide routine: " module ": " #routinename); \
- return NULL; \
- } \
- } \
- return (*PyMacGluePtr_##routinename)(pyobj, cobj); \
-}
-GLUE_CONVERT(FSSpec, PyMac_GetFSSpec, "macfs")
-
-GLUE_NEW(AppleEvent *, AEDesc_New, "AE") /* XXXX Why by address? */
-GLUE_CONVERT(AppleEvent, AEDesc_Convert, "AE")
-
-GLUE_NEW(Component, CmpObj_New, "Cm")
-GLUE_CONVERT(Component, CmpObj_Convert, "Cm")
-GLUE_NEW(ComponentInstance, CmpInstObj_New, "Cm")
-GLUE_CONVERT(ComponentInstance, CmpInstObj_Convert, "Cm")
-
-GLUE_NEW(ControlHandle, CtlObj_New, "Ctl")
-GLUE_CONVERT(ControlHandle, CtlObj_Convert, "Ctl")
-
-GLUE_NEW(DialogPtr, DlgObj_New, "Dlg")
-GLUE_CONVERT(DialogPtr, DlgObj_Convert, "Dlg")
-GLUE_NEW(DialogPtr, DlgObj_WhichDialog, "Dlg")
-
-GLUE_NEW(DragReference, DragObj_New, "Drag")
-GLUE_CONVERT(DragReference, DragObj_Convert, "Drag")
-
-GLUE_NEW(ListHandle, ListObj_New, "List")
-GLUE_CONVERT(ListHandle, ListObj_Convert, "List")
-
-GLUE_NEW(MenuHandle, MenuObj_New, "Menu")
-GLUE_CONVERT(MenuHandle, MenuObj_Convert, "Menu")
-
-GLUE_NEW(GrafPtr, GrafObj_New, "Qd")
-GLUE_CONVERT(GrafPtr, GrafObj_Convert, "Qd")
-GLUE_NEW(BitMapPtr, BMObj_New, "Qd")
-GLUE_CONVERT(BitMapPtr, BMObj_Convert, "Qd")
-GLUE_NEW(RGBColor *, QdRGB_New, "Qd") /* XXXX Why? */
-GLUE_CONVERT(RGBColor, QdRGB_Convert, "Qd")
-
-GLUE_NEW(GWorldPtr, GWorldObj_New, "Qdoffs")
-GLUE_CONVERT(GWorldPtr, GWorldObj_Convert, "Qdoffs")
-
-GLUE_NEW(Track, TrackObj_New, "Qt")
-GLUE_CONVERT(Track, TrackObj_Convert, "Qt")
-GLUE_NEW(Movie, MovieObj_New, "Qt")
-GLUE_CONVERT(Movie, MovieObj_Convert, "Qt")
-GLUE_NEW(MovieController, MovieCtlObj_New, "Qt")
-GLUE_CONVERT(MovieController, MovieCtlObj_Convert, "Qt")
-GLUE_NEW(TimeBase, TimeBaseObj_New, "Qt")
-GLUE_CONVERT(TimeBase, TimeBaseObj_Convert, "Qt")
-GLUE_NEW(UserData, UserDataObj_New, "Qt")
-GLUE_CONVERT(UserData, UserDataObj_Convert, "Qt")
-GLUE_NEW(Media, MediaObj_New, "Qt")
-GLUE_CONVERT(Media, MediaObj_Convert, "Qt")
-
-GLUE_NEW(Handle, ResObj_New, "Res")
-GLUE_CONVERT(Handle, ResObj_Convert, "Res")
-GLUE_NEW(Handle, OptResObj_New, "Res")
-GLUE_CONVERT(Handle, OptResObj_Convert, "Res")
-
-GLUE_NEW(TEHandle, TEObj_New, "TE")
-GLUE_CONVERT(TEHandle, TEObj_Convert, "TE")
-
-GLUE_NEW(WindowPtr, WinObj_New, "Win")
-GLUE_CONVERT(WindowPtr, WinObj_Convert, "Win")
-GLUE_NEW(WindowPtr, WinObj_WhichWindow, "Win")
-
-#endif /* USE_TOOLBOX_OBJECT_GLUE */ \ No newline at end of file
generated by cgit v0.12 at 2024-11-19 14:42:00 (GMT)