Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

New universal headers

This commit is contained in:
Jack Jansen 1995-10-09 23:12:22 +00:00
parent 732151473b
commit d40f3c60ca
10 changed files with 58 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Mac/Lib/toolbox/Events.py
View File

@ -1,4 +1,4 @@
# Generated from 'Sap:CodeWarrior6:Metrowerks C/C++:Headers:Universal Headers 2.0.1f:Events.h' # Generated from 'Sap:CodeWarrior7:Metrowerks CodeWarrior:MacOS Support:Headers:Universal Headers:Events.h'
nullEvent = 0 nullEvent = 0
mouseDown = 1 mouseDown = 1
@ -39,6 +39,16 @@ controlKey = 0x1000
rightShiftKey = 0x2000 rightShiftKey = 0x2000
rightOptionKey = 0x4000 rightOptionKey = 0x4000
rightControlKey = 0x8000 rightControlKey = 0x8000
activeFlagBit = 0
btnStateBit = 7
cmdKeyBit = 8
shiftKeyBit = 9
alphaLockBit = 10
optionKeyBit = 11
controlKeyBit = 12
rightShiftKeyBit = 13
rightOptionKeyBit = 14
rightControlKeyBit = 15
networkEvt = 10 networkEvt = 10
driverEvt = 11 driverEvt = 11
app1Evt = 12 app1Evt = 12

3
Mac/Lib/toolbox/Sound.py
View File

@ -1,4 +1,4 @@
# Generated from 'Sap:CodeWarrior6:Metrowerks C/C++:Headers:Universal Headers 2.0.1f:Sound.h' # Generated from 'Sap:CodeWarrior7:Metrowerks CodeWarrior:MacOS Support:Headers:Universal Headers:Sound.h'
soundListRsrc = 'snd ' soundListRsrc = 'snd '
rate44khz = 0xAC440000L rate44khz = 0xAC440000L
@ -98,6 +98,5 @@ secondSoundFormat = 0x0002
dbBufferReady = 0x00000001 dbBufferReady = 0x00000001
dbLastBuffer = 0x00000004 dbLastBuffer = 0x00000004
sysBeepDisable = 0x0000 sysBeepDisable = 0x0000
sysBeepEnable = 0x0001
unitTypeNoSelection = 0xFFFF unitTypeNoSelection = 0xFFFF
unitTypeSeconds = 0x0000 unitTypeSeconds = 0x0000

34
Mac/Modules/evt/Evtmodule.c
View File

@ -59,7 +59,7 @@ static PyObject *Evt_SetEventMask(_self, _args)
PyObject *_args; PyObject *_args;
{ {
PyObject *_res = NULL; PyObject *_res = NULL;
MacOSEventMask value; EventMask value;
if (!PyArg_ParseTuple(_args, "h", if (!PyArg_ParseTuple(_args, "h",
&value)) &value))
return NULL; return NULL;
@ -89,7 +89,7 @@ static PyObject *Evt_GetNextEvent(_self, _args)
{ {
PyObject *_res = NULL; PyObject *_res = NULL;
Boolean _rv; Boolean _rv;
MacOSEventMask eventMask; EventMask eventMask;
EventRecord theEvent; EventRecord theEvent;
if (!PyArg_ParseTuple(_args, "h", if (!PyArg_ParseTuple(_args, "h",
&eventMask)) &eventMask))
@ -108,7 +108,7 @@ static PyObject *Evt_WaitNextEvent(_self, _args)
{ {
PyObject *_res = NULL; PyObject *_res = NULL;
Boolean _rv; Boolean _rv;
MacOSEventMask eventMask; EventMask eventMask;
EventRecord theEvent; EventRecord theEvent;
UInt32 sleep; UInt32 sleep;
if (!PyArg_ParseTuple(_args, "hl", if (!PyArg_ParseTuple(_args, "hl",
@ -131,7 +131,7 @@ static PyObject *Evt_EventAvail(_self, _args)
{ {
PyObject *_res = NULL; PyObject *_res = NULL;
Boolean _rv; Boolean _rv;
MacOSEventMask eventMask; EventMask eventMask;
EventRecord theEvent; EventRecord theEvent;
if (!PyArg_ParseTuple(_args, "h", if (!PyArg_ParseTuple(_args, "h",
&eventMask)) &eventMask))
@ -235,7 +235,7 @@ static PyObject *Evt_PostEvent(_self, _args)
{ {
PyObject *_res = NULL; PyObject *_res = NULL;
OSErr _err; OSErr _err;
MacOSEventKind eventNum; EventKind eventNum;
UInt32 eventMsg; UInt32 eventMsg;
if (!PyArg_ParseTuple(_args, "hl", if (!PyArg_ParseTuple(_args, "hl",
&eventNum, &eventNum,
@ -255,7 +255,7 @@ static PyObject *Evt_OSEventAvail(_self, _args)
{ {
PyObject *_res = NULL; PyObject *_res = NULL;
Boolean _rv; Boolean _rv;
MacOSEventMask mask; EventMask mask;
EventRecord theEvent; EventRecord theEvent;
if (!PyArg_ParseTuple(_args, "h", if (!PyArg_ParseTuple(_args, "h",
&mask)) &mask))
@ -274,7 +274,7 @@ static PyObject *Evt_GetOSEvent(_self, _args)
{ {
PyObject *_res = NULL; PyObject *_res = NULL;
Boolean _rv; Boolean _rv;
MacOSEventMask mask; EventMask mask;
EventRecord theEvent; EventRecord theEvent;
if (!PyArg_ParseTuple(_args, "h", if (!PyArg_ParseTuple(_args, "h",
&mask)) &mask))
@ -292,8 +292,8 @@ static PyObject *Evt_FlushEvents(_self, _args)
PyObject *_args; PyObject *_args;
{ {
PyObject *_res = NULL; PyObject *_res = NULL;
MacOSEventMask whichMask; EventMask whichMask;
MacOSEventMask stopMask; EventMask stopMask;
if (!PyArg_ParseTuple(_args, "hh", if (!PyArg_ParseTuple(_args, "hh",
&whichMask, &whichMask,
&stopMask)) &stopMask))
@ -356,15 +356,15 @@ static PyMethodDef Evt_methods[] = {
{"GetCaretTime", (PyCFunction)Evt_GetCaretTime, 1, {"GetCaretTime", (PyCFunction)Evt_GetCaretTime, 1,
"() -> (UInt32 _rv)"}, "() -> (UInt32 _rv)"},
{"SetEventMask", (PyCFunction)Evt_SetEventMask, 1, {"SetEventMask", (PyCFunction)Evt_SetEventMask, 1,
"(MacOSEventMask value) -> None"}, "(EventMask value) -> None"},
{"GetDblTime", (PyCFunction)Evt_GetDblTime, 1, {"GetDblTime", (PyCFunction)Evt_GetDblTime, 1,
"() -> (UInt32 _rv)"}, "() -> (UInt32 _rv)"},
{"GetNextEvent", (PyCFunction)Evt_GetNextEvent, 1, {"GetNextEvent", (PyCFunction)Evt_GetNextEvent, 1,
"(MacOSEventMask eventMask) -> (Boolean _rv, EventRecord theEvent)"}, "(EventMask eventMask) -> (Boolean _rv, EventRecord theEvent)"},
{"WaitNextEvent", (PyCFunction)Evt_WaitNextEvent, 1, {"WaitNextEvent", (PyCFunction)Evt_WaitNextEvent, 1,
"(MacOSEventMask eventMask, UInt32 sleep) -> (Boolean _rv, EventRecord theEvent)"}, "(EventMask eventMask, UInt32 sleep) -> (Boolean _rv, EventRecord theEvent)"},
{"EventAvail", (PyCFunction)Evt_EventAvail, 1, {"EventAvail", (PyCFunction)Evt_EventAvail, 1,
"(MacOSEventMask eventMask) -> (Boolean _rv, EventRecord theEvent)"}, "(EventMask eventMask) -> (Boolean _rv, EventRecord theEvent)"},
{"GetMouse", (PyCFunction)Evt_GetMouse, 1, {"GetMouse", (PyCFunction)Evt_GetMouse, 1,
"() -> (Point mouseLoc)"}, "() -> (Point mouseLoc)"},
{"Button", (PyCFunction)Evt_Button, 1, {"Button", (PyCFunction)Evt_Button, 1,
@ -378,13 +378,13 @@ static PyMethodDef Evt_methods[] = {
{"TickCount", (PyCFunction)Evt_TickCount, 1, {"TickCount", (PyCFunction)Evt_TickCount, 1,
"() -> (UInt32 _rv)"}, "() -> (UInt32 _rv)"},
{"PostEvent", (PyCFunction)Evt_PostEvent, 1, {"PostEvent", (PyCFunction)Evt_PostEvent, 1,
"(MacOSEventKind eventNum, UInt32 eventMsg) -> None"}, "(EventKind eventNum, UInt32 eventMsg) -> None"},
{"OSEventAvail", (PyCFunction)Evt_OSEventAvail, 1, {"OSEventAvail", (PyCFunction)Evt_OSEventAvail, 1,
"(MacOSEventMask mask) -> (Boolean _rv, EventRecord theEvent)"}, "(EventMask mask) -> (Boolean _rv, EventRecord theEvent)"},
{"GetOSEvent", (PyCFunction)Evt_GetOSEvent, 1, {"GetOSEvent", (PyCFunction)Evt_GetOSEvent, 1,
"(MacOSEventMask mask) -> (Boolean _rv, EventRecord theEvent)"}, "(EventMask mask) -> (Boolean _rv, EventRecord theEvent)"},
{"FlushEvents", (PyCFunction)Evt_FlushEvents, 1, {"FlushEvents", (PyCFunction)Evt_FlushEvents, 1,
"(MacOSEventMask whichMask, MacOSEventMask stopMask) -> None"}, "(EventMask whichMask, EventMask stopMask) -> None"},
{"SystemClick", (PyCFunction)Evt_SystemClick, 1, {"SystemClick", (PyCFunction)Evt_SystemClick, 1,
"(EventRecord theEvent, WindowPtr theWindow) -> None"}, "(EventRecord theEvent, WindowPtr theWindow) -> None"},
{"SystemTask", (PyCFunction)Evt_SystemTask, 1, {"SystemTask", (PyCFunction)Evt_SystemTask, 1,

20
Mac/Modules/evt/evtgen.py
View File

@ -1,11 +1,11 @@
# Generated from 'Sap:CodeWarrior6:Metrowerks C/C++:Headers:Universal Headers 2.0.1f:Events.h' # Generated from 'Sap:CodeWarrior7:Metrowerks CodeWarrior:MacOS Support:Headers:Universal Headers:Events.h'
f = Function(UInt32, 'GetCaretTime', f = Function(UInt32, 'GetCaretTime',
) )
functions.append(f) functions.append(f)
f = Function(void, 'SetEventMask', f = Function(void, 'SetEventMask',
(MacOSEventMask, 'value', InMode), (EventMask, 'value', InMode),
) )
functions.append(f) functions.append(f)
@ -14,13 +14,13 @@ f = Function(UInt32, 'GetDblTime',
functions.append(f) functions.append(f)
f = Function(Boolean, 'GetNextEvent', f = Function(Boolean, 'GetNextEvent',
(MacOSEventMask, 'eventMask', InMode), (EventMask, 'eventMask', InMode),
(EventRecord, 'theEvent', OutMode), (EventRecord, 'theEvent', OutMode),
) )
functions.append(f) functions.append(f)
f = Function(Boolean, 'WaitNextEvent', f = Function(Boolean, 'WaitNextEvent',
(MacOSEventMask, 'eventMask', InMode), (EventMask, 'eventMask', InMode),
(EventRecord, 'theEvent', OutMode), (EventRecord, 'theEvent', OutMode),
(UInt32, 'sleep', InMode), (UInt32, 'sleep', InMode),
(RgnHandle, 'mouseRgn', InMode), (RgnHandle, 'mouseRgn', InMode),
@ -28,7 +28,7 @@ f = Function(Boolean, 'WaitNextEvent',
functions.append(f) functions.append(f)
f = Function(Boolean, 'EventAvail', f = Function(Boolean, 'EventAvail',
(MacOSEventMask, 'eventMask', InMode), (EventMask, 'eventMask', InMode),
(EventRecord, 'theEvent', OutMode), (EventRecord, 'theEvent', OutMode),
) )
functions.append(f) functions.append(f)
@ -60,26 +60,26 @@ f = Function(UInt32, 'TickCount',
functions.append(f) functions.append(f)
f = Function(OSErr, 'PostEvent', f = Function(OSErr, 'PostEvent',
(MacOSEventKind, 'eventNum', InMode), (EventKind, 'eventNum', InMode),
(UInt32, 'eventMsg', InMode), (UInt32, 'eventMsg', InMode),
) )
functions.append(f) functions.append(f)
f = Function(Boolean, 'OSEventAvail', f = Function(Boolean, 'OSEventAvail',
(MacOSEventMask, 'mask', InMode), (EventMask, 'mask', InMode),
(EventRecord, 'theEvent', OutMode), (EventRecord, 'theEvent', OutMode),
) )
functions.append(f) functions.append(f)
f = Function(Boolean, 'GetOSEvent', f = Function(Boolean, 'GetOSEvent',
(MacOSEventMask, 'mask', InMode), (EventMask, 'mask', InMode),
(EventRecord, 'theEvent', OutMode), (EventRecord, 'theEvent', OutMode),
) )
functions.append(f) functions.append(f)
f = Function(void, 'FlushEvents', f = Function(void, 'FlushEvents',
(MacOSEventMask, 'whichMask', InMode), (EventMask, 'whichMask', InMode),
(MacOSEventMask, 'stopMask', InMode), (EventMask, 'stopMask', InMode),
) )
functions.append(f) functions.append(f)

6
Mac/Modules/evt/evtsupport.py
View File

@ -27,8 +27,10 @@ from macsupport import *
RgnHandle = FakeType("(RgnHandle)0") # XXX RgnHandle = FakeType("(RgnHandle)0") # XXX
KeyMap = ArrayOutputBufferType("KeyMap") KeyMap = ArrayOutputBufferType("KeyMap")
MacOSEventKind = Type("MacOSEventKind", "h") MacOSEventKind = Type("MacOSEventKind", "h") # Old-style
MacOSEventMask = Type("MacOSEventMask", "h") MacOSEventMask = Type("MacOSEventMask", "h") # Old-style
EventMask = Type("EventMask", "h")
EventKind = Type("EventKind", "h")
includestuff = includestuff + """ includestuff = includestuff + """
#include <%s>""" % MACHEADERFILE + """ #include <%s>""" % MACHEADERFILE + """

1
Mac/Modules/res/Resmodule.c
View File

@ -1336,7 +1336,6 @@ static PyMethodDef Res_methods[] = {
PyObject *ResObj_OptNew(itself) PyObject *ResObj_OptNew(itself)
Handle itself; Handle itself;
{ {
ResourceObject *it;
if (itself == NULL) { if (itself == NULL) {
Py_INCREF(Py_None); Py_INCREF(Py_None);
return Py_None; return Py_None;

16
Mac/Modules/snd/Sndmodule.c
View File

@ -414,12 +414,12 @@ static PyObject *Snd_SndSoundManagerVersion(_self, _args)
PyObject *_args; PyObject *_args;
{ {
PyObject *_res = NULL; PyObject *_res = NULL;
NumVersion _rv; long _rv;
if (!PyArg_ParseTuple(_args, "")) if (!PyArg_ParseTuple(_args, ""))
return NULL; return NULL;
_rv = SndSoundManagerVersion(); _rv = SndSoundManagerVersion();
_res = Py_BuildValue("O&", _res = Py_BuildValue("l",
NumVer_New, _rv); _rv);
return _res; return _res;
} }
@ -479,12 +479,12 @@ static PyObject *Snd_MACEVersion(_self, _args)
PyObject *_args; PyObject *_args;
{ {
PyObject *_res = NULL; PyObject *_res = NULL;
NumVersion _rv; long _rv;
if (!PyArg_ParseTuple(_args, "")) if (!PyArg_ParseTuple(_args, ""))
return NULL; return NULL;
_rv = MACEVersion(); _rv = MACEVersion();
_res = Py_BuildValue("O&", _res = Py_BuildValue("l",
NumVer_New, _rv); _rv);
return _res; return _res;
} }
@ -759,7 +759,7 @@ static PyMethodDef Snd_methods[] = {
{"SndControl", (PyCFunction)Snd_SndControl, 1, {"SndControl", (PyCFunction)Snd_SndControl, 1,
"(short id) -> (SndCommand cmd)"}, "(short id) -> (SndCommand cmd)"},
{"SndSoundManagerVersion", (PyCFunction)Snd_SndSoundManagerVersion, 1, {"SndSoundManagerVersion", (PyCFunction)Snd_SndSoundManagerVersion, 1,
"() -> (NumVersion _rv)"}, "() -> (long _rv)"},
{"SndManagerStatus", (PyCFunction)Snd_SndManagerStatus, 1, {"SndManagerStatus", (PyCFunction)Snd_SndManagerStatus, 1,
"(short theLength) -> (SMStatus theStatus)"}, "(short theLength) -> (SMStatus theStatus)"},
{"SndGetSysBeepState", (PyCFunction)Snd_SndGetSysBeepState, 1, {"SndGetSysBeepState", (PyCFunction)Snd_SndGetSysBeepState, 1,
@ -767,7 +767,7 @@ static PyMethodDef Snd_methods[] = {
{"SndSetSysBeepState", (PyCFunction)Snd_SndSetSysBeepState, 1, {"SndSetSysBeepState", (PyCFunction)Snd_SndSetSysBeepState, 1,
"(short sysBeepState) -> None"}, "(short sysBeepState) -> None"},
{"MACEVersion", (PyCFunction)Snd_MACEVersion, 1, {"MACEVersion", (PyCFunction)Snd_MACEVersion, 1,
"() -> (NumVersion _rv)"}, "() -> (long _rv)"},
{"Comp3to1", (PyCFunction)Snd_Comp3to1, 1, {"Comp3to1", (PyCFunction)Snd_Comp3to1, 1,
"(Buffer buffer, StateBlock state, unsigned long numChannels, unsigned long whichChannel) -> (Buffer buffer, StateBlock state)"}, "(Buffer buffer, StateBlock state, unsigned long numChannels, unsigned long whichChannel) -> (Buffer buffer, StateBlock state)"},
{"Exp1to3", (PyCFunction)Snd_Exp1to3, 1, {"Exp1to3", (PyCFunction)Snd_Exp1to3, 1,

6
Mac/Modules/snd/sndgen.py
View File

@ -1,4 +1,4 @@
# Generated from 'Sap:CodeWarrior6:Metrowerks C/C++:Headers:Universal Headers 2.0.1f:Sound.h' # Generated from 'Sap:CodeWarrior7:Metrowerks CodeWarrior:MacOS Support:Headers:Universal Headers:Sound.h'
f = SndFunction(void, 'SetSoundVol', f = SndFunction(void, 'SetSoundVol',
(short, 'level', InMode), (short, 'level', InMode),
@ -44,7 +44,7 @@ f = SndFunction(OSErr, 'SndControl',
) )
functions.append(f) functions.append(f)
f = SndFunction(NumVersion, 'SndSoundManagerVersion', f = SndFunction(long, 'SndSoundManagerVersion',
) )
functions.append(f) functions.append(f)
@ -94,7 +94,7 @@ f = SndFunction(OSErr, 'SndSetSysBeepState',
) )
functions.append(f) functions.append(f)
f = SndFunction(NumVersion, 'MACEVersion', f = SndFunction(long, 'MACEVersion',
) )
functions.append(f) functions.append(f)

2
Mac/Modules/snd/sndscan.py
View File

@ -54,6 +54,8 @@ class SoundScanner(Scanner):
"GetSoundVol", "GetSoundVol",
"SetSoundVol", "SetSoundVol",
"UnsignedFixed", "UnsignedFixed",
# Don't have the time to dig into this...
"Component",
] ]
def makerepairinstructions(self): def makerepairinstructions(self):

4
Tools/bgen/bgen/scantools.py
View File

@ -29,8 +29,8 @@ except ImportError:
# Default preferences # Default preferences
#CREATOR = 'KAHL' # Guido's favorite text editor on the Mac #CREATOR = 'KAHL' # Guido's favorite text editor on the Mac
#INCLUDEDIR = "D:Development:THINK C:Mac #includes:Apple #includes:" #INCLUDEDIR = "D:Development:THINK C:Mac #includes:Apple #includes:"
CREATOR = 'MPCC' # Jack's favorite text editor on the Mac CREATOR = 'CWIE' # Jack's favorite text editor on the Mac
INCLUDEDIR = "Sap:CodeWarrior6:Metrowerks C/C++:Headers:Universal Headers 2.0.1f:" INCLUDEDIR = "Sap:CodeWarrior7:Metrowerks CodeWarrior:MacOS Support:Headers:Universal Headers:"
Error = "scantools.Error" Error = "scantools.Error"