diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-04-11 22:03:53 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-04-11 22:03:53 (GMT) |
| commit | a3c8bde133c8b45cb260d20994d845acc133f071 (patch) | |
| tree | f9b1ad1499676bdd543cf30c9dfbaec02007cf3e | |
| parent | 3edf8c2d2a1364716f801d13faa894e4531f7a8a (diff) | |
| download | tk-a3c8bde133c8b45cb260d20994d845acc133f071.zip tk-a3c8bde133c8b45cb260d20994d845acc133f071.tar.gz tk-a3c8bde133c8b45cb260d20994d845acc133f071.tar.bz2 | |
sync tcl.m4 with Tcl, format tkInt.decls like Tk8.5/8.6
| -rw-r--r-- | generic/tkInt.decls | 1977 | ||||
| -rw-r--r-- | generic/tkIntDecls.h | 54 | ||||
| -rw-r--r-- | generic/tkIntPlatDecls.h | 8 | ||||
| -rw-r--r-- | generic/tkIntXlibDecls.h | 1187 | ||||
| -rw-r--r-- | generic/tkMain.c | 2 | ||||
| -rwxr-xr-x | unix/configure | 236 | ||||
| -rwxr-xr-x | unix/tcl.m4 | 1 | ||||
| -rwxr-xr-x | win/configure | 308 | ||||
| -rw-r--r-- | win/configure.in | 14 | ||||
| -rwxr-xr-x | win/tcl.m4 | 11 |
10 files changed, 1638 insertions, 2160 deletions
diff --git a/generic/tkInt.decls b/generic/tkInt.decls index 9ecfb72..e1f4ffc 100644 --- a/generic/tkInt.decls +++ b/generic/tkInt.decls @@ -1,695 +1,493 @@ - # tkInt.decls -- +# tkInt.decls -- # -# This file contains the declarations for all unsupported -# functions that are exported by the Tk library. This file -# is used to generate the tkIntDecls.h, tkIntPlatDecls.h, -# tkIntStub.c, and tkPlatStub.c files. +# This file contains the declarations for all unsupported functions that +# are exported by the Tk library. This file is used to generate the +# tkIntDecls.h, tkIntPlatDecls.h, tkIntStub.c, and tkPlatStub.c files. # # Copyright (c) 1998-1999 by Scriptics Corporation. # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. library tk + +############################################################################## # Define the unsupported generic interfaces. interface tkInt -# Declare each of the functions in the unsupported internal Tcl -# interface. These interfaces are allowed to changed between versions. -# Use at your own risk. Note that the position of functions should not -# be changed between versions to avoid gratuitous incompatibilities. +# Declare each of the functions in the unsupported internal Tcl interface. +# These interfaces are allowed to changed between versions. Use at your own +# risk. Note that the position of functions should not be changed between +# versions to avoid gratuitous incompatibilities. -declare 0 generic { - TkWindow * TkAllocWindow (TkDisplay *dispPtr, int screenNum, \ +declare 0 { + TkWindow *TkAllocWindow(TkDisplay *dispPtr, int screenNum, TkWindow *parentPtr) } - -declare 1 generic { - void TkBezierPoints (double control[], int numSteps, double *coordPtr) +declare 1 { + void TkBezierPoints(double control[], int numSteps, double *coordPtr) } - -declare 2 generic { - void TkBezierScreenPoints (Tk_Canvas canvas, double control[], \ +declare 2 { + void TkBezierScreenPoints(Tk_Canvas canvas, double control[], int numSteps, XPoint *xPointPtr) } - -declare 3 generic { - void TkBindDeadWindow (TkWindow *winPtr) +declare 3 { + void TkBindDeadWindow(TkWindow *winPtr) } - -declare 4 generic { - void TkBindEventProc (TkWindow *winPtr, XEvent *eventPtr) +declare 4 { + void TkBindEventProc(TkWindow *winPtr, XEvent *eventPtr) } - -declare 5 generic { - void TkBindFree (TkMainInfo *mainPtr) +declare 5 { + void TkBindFree(TkMainInfo *mainPtr) } - -declare 6 generic { - void TkBindInit (TkMainInfo *mainPtr) +declare 6 { + void TkBindInit(TkMainInfo *mainPtr) } - -declare 7 generic { - void TkChangeEventWindow (XEvent *eventPtr, TkWindow *winPtr) +declare 7 { + void TkChangeEventWindow(XEvent *eventPtr, TkWindow *winPtr) } - -declare 8 generic { - int TkClipInit (Tcl_Interp *interp, TkDisplay *dispPtr) +declare 8 { + int TkClipInit(Tcl_Interp *interp, TkDisplay *dispPtr) } - -declare 9 generic { - void TkComputeAnchor (Tk_Anchor anchor, Tk_Window tkwin, \ - int padX, int padY, int innerWidth, int innerHeight, \ - int *xPtr, int *yPtr) +declare 9 { + void TkComputeAnchor(Tk_Anchor anchor, Tk_Window tkwin, int padX, int padY, + int innerWidth, int innerHeight, int *xPtr, int *yPtr) } - -declare 10 generic { - int TkCopyAndGlobalEval (Tcl_Interp *interp, char *script) +declare 10 { + int TkCopyAndGlobalEval(Tcl_Interp *interp, char *script) } - -declare 11 generic { - unsigned long TkCreateBindingProcedure (Tcl_Interp *interp, \ - Tk_BindingTable bindingTable, \ - ClientData object, CONST char *eventString, \ - TkBindEvalProc *evalProc, TkBindFreeProc *freeProc, \ - ClientData clientData) +declare 11 { + unsigned long TkCreateBindingProcedure(Tcl_Interp *interp, + Tk_BindingTable bindingTable, ClientData object, + const char *eventString, TkBindEvalProc *evalProc, + TkBindFreeProc *freeProc, ClientData clientData) } - -declare 12 generic { - TkCursor * TkCreateCursorFromData (Tk_Window tkwin, \ - CONST char *source, CONST char *mask, int width, int height, \ +declare 12 { + TkCursor *TkCreateCursorFromData(Tk_Window tkwin, + const char *source, const char *mask, int width, int height, int xHot, int yHot, XColor fg, XColor bg) } - -declare 13 generic { - int TkCreateFrame (ClientData clientData, \ - Tcl_Interp *interp, int argc, char **argv, \ - int toplevel, char *appName) +declare 13 { + int TkCreateFrame(ClientData clientData, Tcl_Interp *interp, + int argc, char **argv, int toplevel, char *appName) } - -declare 14 generic { - Tk_Window TkCreateMainWindow (Tcl_Interp *interp, \ - CONST char *screenName, char *baseName) +declare 14 { + Tk_Window TkCreateMainWindow(Tcl_Interp *interp, + const char *screenName, char *baseName) } - -declare 15 generic { - Time TkCurrentTime (TkDisplay *dispPtr) +declare 15 { + Time TkCurrentTime(TkDisplay *dispPtr) } - -declare 16 generic { - void TkDeleteAllImages (TkMainInfo *mainPtr) +declare 16 { + void TkDeleteAllImages(TkMainInfo *mainPtr) } - -declare 17 generic { - void TkDoConfigureNotify (TkWindow *winPtr) +declare 17 { + void TkDoConfigureNotify(TkWindow *winPtr) } - -declare 18 generic { - void TkDrawInsetFocusHighlight (Tk_Window tkwin, GC gc, int width, \ +declare 18 { + void TkDrawInsetFocusHighlight(Tk_Window tkwin, GC gc, int width, Drawable drawable, int padding) } - -declare 19 generic { - void TkEventDeadWindow (TkWindow *winPtr) +declare 19 { + void TkEventDeadWindow(TkWindow *winPtr) } - -declare 20 generic { - void TkFillPolygon (Tk_Canvas canvas, \ - double *coordPtr, int numPoints, Display *display, \ - Drawable drawable, GC gc, GC outlineGC) +declare 20 { + void TkFillPolygon(Tk_Canvas canvas, double *coordPtr, int numPoints, + Display *display, Drawable drawable, GC gc, GC outlineGC) } - -declare 21 generic { - int TkFindStateNum (Tcl_Interp *interp, \ - CONST char *option, CONST TkStateMap *mapPtr, \ - CONST char *strKey) +declare 21 { + int TkFindStateNum(Tcl_Interp *interp, const char *option, + const TkStateMap *mapPtr, const char *strKey) } - -declare 22 generic { - char * TkFindStateString (CONST TkStateMap *mapPtr, int numKey) +declare 22 { + char *TkFindStateString(const TkStateMap *mapPtr, int numKey) } - -declare 23 generic { - void TkFocusDeadWindow (TkWindow *winPtr) +declare 23 { + void TkFocusDeadWindow(TkWindow *winPtr) } - -declare 24 generic { - int TkFocusFilterEvent (TkWindow *winPtr, XEvent *eventPtr) +declare 24 { + int TkFocusFilterEvent(TkWindow *winPtr, XEvent *eventPtr) } - -declare 25 generic { - TkWindow * TkFocusKeyEvent (TkWindow *winPtr, XEvent *eventPtr) +declare 25 { + TkWindow *TkFocusKeyEvent(TkWindow *winPtr, XEvent *eventPtr) } - -declare 26 generic { - void TkFontPkgInit (TkMainInfo *mainPtr) +declare 26 { + void TkFontPkgInit(TkMainInfo *mainPtr) } - -declare 27 generic { - void TkFontPkgFree (TkMainInfo *mainPtr) +declare 27 { + void TkFontPkgFree(TkMainInfo *mainPtr) } - -declare 28 generic { - void TkFreeBindingTags (TkWindow *winPtr) +declare 28 { + void TkFreeBindingTags(TkWindow *winPtr) } # Name change only, TkFreeCursor in Tcl 8.0.x now TkpFreeCursor -declare 29 generic { - void TkpFreeCursor (TkCursor *cursorPtr) +declare 29 { + void TkpFreeCursor(TkCursor *cursorPtr) } - -declare 30 generic { - char * TkGetBitmapData (Tcl_Interp *interp, \ - char *string, char *fileName, int *widthPtr, \ - int *heightPtr, int *hotXPtr, int *hotYPtr) +declare 30 { + char *TkGetBitmapData(Tcl_Interp *interp, char *string, + char *fileName, int *widthPtr, int *heightPtr, + int *hotXPtr, int *hotYPtr) } - -declare 31 generic { - void TkGetButtPoints (double p1[], double p2[], \ +declare 31 { + void TkGetButtPoints(double p1[], double p2[], double width, int project, double m1[], double m2[]) } - -declare 32 generic { - TkCursor * TkGetCursorByName (Tcl_Interp *interp, \ +declare 32 { + TkCursor *TkGetCursorByName(Tcl_Interp *interp, Tk_Window tkwin, Tk_Uid string) } - -declare 33 generic { - CONST84_RETURN char * TkGetDefaultScreenName (Tcl_Interp *interp, \ - CONST char *screenName) +declare 33 { + CONST84_RETURN char *TkGetDefaultScreenName(Tcl_Interp *interp, + const char *screenName) } - -declare 34 generic { - TkDisplay * TkGetDisplay (Display *display) +declare 34 { + TkDisplay *TkGetDisplay(Display *display) } - -declare 35 generic { - int TkGetDisplayOf (Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[], \ +declare 35 { + int TkGetDisplayOf(Tcl_Interp *interp, int objc, Tcl_Obj *const objv[], Tk_Window *tkwinPtr) } - -declare 36 generic { - TkWindow * TkGetFocusWin (TkWindow *winPtr) +declare 36 { + TkWindow *TkGetFocusWin(TkWindow *winPtr) } - -declare 37 generic { - int TkGetInterpNames (Tcl_Interp *interp, Tk_Window tkwin) +declare 37 { + int TkGetInterpNames(Tcl_Interp *interp, Tk_Window tkwin) } - -declare 38 generic { - int TkGetMiterPoints (double p1[], double p2[], double p3[], \ - double width, double m1[],double m2[]) +declare 38 { + int TkGetMiterPoints(double p1[], double p2[], double p3[], + double width, double m1[], double m2[]) } - -declare 39 generic { - void TkGetPointerCoords (Tk_Window tkwin, int *xPtr, int *yPtr) +declare 39 { + void TkGetPointerCoords(Tk_Window tkwin, int *xPtr, int *yPtr) } - -declare 40 generic { - void TkGetServerInfo (Tcl_Interp *interp, Tk_Window tkwin) +declare 40 { + void TkGetServerInfo(Tcl_Interp *interp, Tk_Window tkwin) } - -declare 41 generic { - void TkGrabDeadWindow (TkWindow *winPtr) +declare 41 { + void TkGrabDeadWindow(TkWindow *winPtr) } - -declare 42 generic { - int TkGrabState (TkWindow *winPtr) +declare 42 { + int TkGrabState(TkWindow *winPtr) } - -declare 43 generic { - void TkIncludePoint (Tk_Item *itemPtr, double *pointPtr) +declare 43 { + void TkIncludePoint(Tk_Item *itemPtr, double *pointPtr) } - -declare 44 generic { - void TkInOutEvents (XEvent *eventPtr, TkWindow *sourcePtr, \ - TkWindow *destPtr, int leaveType, int enterType, \ +declare 44 { + void TkInOutEvents(XEvent *eventPtr, TkWindow *sourcePtr, + TkWindow *destPtr, int leaveType, int enterType, Tcl_QueuePosition position) } - -declare 45 generic { - void TkInstallFrameMenu (Tk_Window tkwin) +declare 45 { + void TkInstallFrameMenu(Tk_Window tkwin) } - -declare 46 generic { - char * TkKeysymToString (KeySym keysym) +declare 46 { + char *TkKeysymToString(KeySym keysym) } - -declare 47 generic { - int TkLineToArea (double end1Ptr[], double end2Ptr[], double rectPtr[]) +declare 47 { + int TkLineToArea(double end1Ptr[], double end2Ptr[], double rectPtr[]) } - -declare 48 generic { - double TkLineToPoint (double end1Ptr[], \ - double end2Ptr[], double pointPtr[]) +declare 48 { + double TkLineToPoint(double end1Ptr[], double end2Ptr[], double pointPtr[]) } - -declare 49 generic { - int TkMakeBezierCurve (Tk_Canvas canvas, \ - double *pointPtr, int numPoints, int numSteps, \ - XPoint xPoints[], double dblPoints[]) +declare 49 { + int TkMakeBezierCurve(Tk_Canvas canvas, double *pointPtr, int numPoints, + int numSteps, XPoint xPoints[], double dblPoints[]) } - -declare 50 generic { - void TkMakeBezierPostscript (Tcl_Interp *interp, \ +declare 50 { + void TkMakeBezierPostscript(Tcl_Interp *interp, Tk_Canvas canvas, double *pointPtr, int numPoints) } - -declare 51 generic { - void TkOptionClassChanged (TkWindow *winPtr) +declare 51 { + void TkOptionClassChanged(TkWindow *winPtr) } - -declare 52 generic { - void TkOptionDeadWindow (TkWindow *winPtr) +declare 52 { + void TkOptionDeadWindow(TkWindow *winPtr) } - -declare 53 generic { - int TkOvalToArea (double *ovalPtr, double *rectPtr) +declare 53 { + int TkOvalToArea(double *ovalPtr, double *rectPtr) } - -declare 54 generic { - double TkOvalToPoint (double ovalPtr[], \ +declare 54 { + double TkOvalToPoint(double ovalPtr[], double width, int filled, double pointPtr[]) } - -declare 55 generic { - int TkpChangeFocus (TkWindow *winPtr, int force) +declare 55 { + int TkpChangeFocus(TkWindow *winPtr, int force) } - -declare 56 generic { - void TkpCloseDisplay (TkDisplay *dispPtr) +declare 56 { + void TkpCloseDisplay(TkDisplay *dispPtr) } - -declare 57 generic { - void TkpClaimFocus (TkWindow *topLevelPtr, int force) +declare 57 { + void TkpClaimFocus(TkWindow *topLevelPtr, int force) } - -declare 58 generic { - void TkpDisplayWarning (CONST char *msg, CONST char *title) +declare 58 { + void TkpDisplayWarning( const char *msg, const char *title) } - -declare 59 generic { - void TkpGetAppName (Tcl_Interp *interp, Tcl_DString *name) +declare 59 { + void TkpGetAppName(Tcl_Interp *interp, Tcl_DString *name) } - -declare 60 generic { - TkWindow * TkpGetOtherWindow (TkWindow *winPtr) +declare 60 { + TkWindow *TkpGetOtherWindow(TkWindow *winPtr) } - -declare 61 generic { - TkWindow * TkpGetWrapperWindow (TkWindow *winPtr) +declare 61 { + TkWindow *TkpGetWrapperWindow(TkWindow *winPtr) } - -declare 62 generic { - int TkpInit (Tcl_Interp *interp) +declare 62 { + int TkpInit(Tcl_Interp *interp) } - -declare 63 generic { - void TkpInitializeMenuBindings (Tcl_Interp *interp, \ +declare 63 { + void TkpInitializeMenuBindings(Tcl_Interp *interp, Tk_BindingTable bindingTable) } - -declare 64 generic { - void TkpMakeContainer (Tk_Window tkwin) +declare 64 { + void TkpMakeContainer(Tk_Window tkwin) } - -declare 65 generic { - void TkpMakeMenuWindow (Tk_Window tkwin, int transient) +declare 65 { + void TkpMakeMenuWindow(Tk_Window tkwin, int transient) } - -declare 66 generic { - Window TkpMakeWindow (TkWindow *winPtr, Window parent) +declare 66 { + Window TkpMakeWindow(TkWindow *winPtr, Window parent) } - -declare 67 generic { - void TkpMenuNotifyToplevelCreate (Tcl_Interp *interp1, char *menuName) +declare 67 { + void TkpMenuNotifyToplevelCreate(Tcl_Interp *interp, char *menuName) } - -declare 68 generic { - TkDisplay * TkpOpenDisplay (CONST char *display_name) +declare 68 { + TkDisplay *TkpOpenDisplay( const char *display_name) } - -declare 69 generic { - int TkPointerEvent (XEvent *eventPtr, TkWindow *winPtr) +declare 69 { + int TkPointerEvent(XEvent *eventPtr, TkWindow *winPtr) } - -declare 70 generic { - int TkPolygonToArea (double *polyPtr, int numPoints, double *rectPtr) +declare 70 { + int TkPolygonToArea(double *polyPtr, int numPoints, double *rectPtr) } - -declare 71 generic { - double TkPolygonToPoint (double *polyPtr, int numPoints, double *pointPtr) +declare 71 { + double TkPolygonToPoint(double *polyPtr, int numPoints, double *pointPtr) } - -declare 72 generic { - int TkPositionInTree (TkWindow *winPtr, TkWindow *treePtr) +declare 72 { + int TkPositionInTree(TkWindow *winPtr, TkWindow *treePtr) } - -declare 73 generic { - void TkpRedirectKeyEvent (TkWindow *winPtr, XEvent *eventPtr) +declare 73 { + void TkpRedirectKeyEvent(TkWindow *winPtr, XEvent *eventPtr) } - -declare 74 generic { - void TkpSetMainMenubar (Tcl_Interp *interp, \ - Tk_Window tkwin, char *menuName) +declare 74 { + void TkpSetMainMenubar(Tcl_Interp *interp, Tk_Window tkwin, char *menuName) } - -declare 75 generic { - int TkpUseWindow (Tcl_Interp *interp, Tk_Window tkwin, CONST char *string) +declare 75 { + int TkpUseWindow(Tcl_Interp *interp, Tk_Window tkwin, const char *string) } - -declare 76 generic { - int TkpWindowWasRecentlyDeleted (Window win, TkDisplay *dispPtr) +declare 76 { + int TkpWindowWasRecentlyDeleted(Window win, TkDisplay *dispPtr) } - -declare 77 generic { - void TkQueueEventForAllChildren (TkWindow *winPtr, XEvent *eventPtr) +declare 77 { + void TkQueueEventForAllChildren(TkWindow *winPtr, XEvent *eventPtr) } - -declare 78 generic { - int TkReadBitmapFile (Display* display, Drawable d, CONST char* filename, \ - unsigned int* width_return, unsigned int* height_return, \ - Pixmap* bitmap_return, int* x_hot_return, int* y_hot_return) +declare 78 { + int TkReadBitmapFile(Display *display, Drawable d, const char *filename, + unsigned int *width_return, unsigned int *height_return, + Pixmap *bitmap_return, int *x_hot_return, int *y_hot_return) } - -declare 79 generic { - int TkScrollWindow (Tk_Window tkwin, GC gc, \ - int x, int y, int width, int height, int dx, \ - int dy, TkRegion damageRgn) +declare 79 { + int TkScrollWindow(Tk_Window tkwin, GC gc, int x, int y, + int width, int height, int dx, int dy, TkRegion damageRgn) } - -declare 80 generic { - void TkSelDeadWindow (TkWindow *winPtr) +declare 80 { + void TkSelDeadWindow(TkWindow *winPtr) } - -declare 81 generic { - void TkSelEventProc (Tk_Window tkwin, XEvent *eventPtr) +declare 81 { + void TkSelEventProc(Tk_Window tkwin, XEvent *eventPtr) } - -declare 82 generic { - void TkSelInit (Tk_Window tkwin) +declare 82 { + void TkSelInit(Tk_Window tkwin) } - -declare 83 generic { - void TkSelPropProc (XEvent *eventPtr) +declare 83 { + void TkSelPropProc(XEvent *eventPtr) } # Exported publically as Tk_SetClassProcs in 8.4a2 -#declare 84 generic { -# void TkSetClassProcs (Tk_Window tkwin, \ +#declare 84 { +# void TkSetClassProcs(Tk_Window tkwin, # TkClassProcs *procs, ClientData instanceData) #} - -declare 85 generic { - void TkSetWindowMenuBar (Tcl_Interp *interp, \ - Tk_Window tkwin, char *oldMenuName, char *menuName) +declare 85 { + void TkSetWindowMenuBar(Tcl_Interp *interp, Tk_Window tkwin, + char *oldMenuName, char *menuName) } - -declare 86 generic { - KeySym TkStringToKeysym (char *name) +declare 86 { + KeySym TkStringToKeysym(char *name) } - -declare 87 generic { - int TkThickPolyLineToArea (double *coordPtr, \ - int numPoints, double width, int capStyle, \ - int joinStyle, double *rectPtr) +declare 87 { + int TkThickPolyLineToArea(double *coordPtr, int numPoints, + double width, int capStyle, int joinStyle, double *rectPtr) } - -declare 88 generic { - void TkWmAddToColormapWindows (TkWindow *winPtr) +declare 88 { + void TkWmAddToColormapWindows(TkWindow *winPtr) } - -declare 89 generic { - void TkWmDeadWindow (TkWindow *winPtr) +declare 89 { + void TkWmDeadWindow(TkWindow *winPtr) } - -declare 90 generic { - TkWindow * TkWmFocusToplevel (TkWindow *winPtr) +declare 90 { + TkWindow *TkWmFocusToplevel(TkWindow *winPtr) } - -declare 91 generic { - void TkWmMapWindow (TkWindow *winPtr) +declare 91 { + void TkWmMapWindow(TkWindow *winPtr) } - -declare 92 generic { - void TkWmNewWindow (TkWindow *winPtr) +declare 92 { + void TkWmNewWindow(TkWindow *winPtr) } - -declare 93 generic { - void TkWmProtocolEventProc (TkWindow *winPtr, XEvent *evenvPtr) +declare 93 { + void TkWmProtocolEventProc(TkWindow *winPtr, XEvent *evenvPtr) } - -declare 94 generic { - void TkWmRemoveFromColormapWindows (TkWindow *winPtr) +declare 94 { + void TkWmRemoveFromColormapWindows(TkWindow *winPtr) } - -declare 95 generic { - void TkWmRestackToplevel (TkWindow *winPtr, int aboveBelow, \ +declare 95 { + void TkWmRestackToplevel(TkWindow *winPtr, int aboveBelow, TkWindow *otherPtr) } - -declare 96 generic { - void TkWmSetClass (TkWindow *winPtr) +declare 96 { + void TkWmSetClass(TkWindow *winPtr) } - -declare 97 generic { - void TkWmUnmapWindow (TkWindow *winPtr) +declare 97 { + void TkWmUnmapWindow(TkWindow *winPtr) } # new for 8.1 -declare 98 generic { - Tcl_Obj * TkDebugBitmap ( Tk_Window tkwin, char *name) +declare 98 { + Tcl_Obj *TkDebugBitmap(Tk_Window tkwin, char *name) } - -declare 99 generic { - Tcl_Obj * TkDebugBorder ( Tk_Window tkwin, char *name) +declare 99 { + Tcl_Obj *TkDebugBorder(Tk_Window tkwin, char *name) } - -declare 100 generic { - Tcl_Obj * TkDebugCursor ( Tk_Window tkwin, char *name) +declare 100 { + Tcl_Obj *TkDebugCursor(Tk_Window tkwin, char *name) } - -declare 101 generic { - Tcl_Obj * TkDebugColor ( Tk_Window tkwin, char *name) +declare 101 { + Tcl_Obj *TkDebugColor(Tk_Window tkwin, char *name) } - -declare 102 generic { - Tcl_Obj * TkDebugConfig (Tcl_Interp *interp, Tk_OptionTable table) +declare 102 { + Tcl_Obj *TkDebugConfig(Tcl_Interp *interp, Tk_OptionTable table) } - -declare 103 generic { - Tcl_Obj * TkDebugFont ( Tk_Window tkwin, char *name) +declare 103 { + Tcl_Obj *TkDebugFont(Tk_Window tkwin, char *name) } - -declare 104 generic { - int TkFindStateNumObj (Tcl_Interp *interp, \ - Tcl_Obj *optionPtr, CONST TkStateMap *mapPtr, \ - Tcl_Obj *keyPtr) +declare 104 { + int TkFindStateNumObj(Tcl_Interp *interp, Tcl_Obj *optionPtr, + const TkStateMap *mapPtr, Tcl_Obj *keyPtr) } - -declare 105 generic { - Tcl_HashTable * TkGetBitmapPredefTable (void) +declare 105 { + Tcl_HashTable *TkGetBitmapPredefTable(void) } - -declare 106 generic { - TkDisplay * TkGetDisplayList (void) +declare 106 { + TkDisplay *TkGetDisplayList(void) } - -declare 107 generic { - TkMainInfo * TkGetMainInfoList (void) +declare 107 { + TkMainInfo *TkGetMainInfoList(void) } - -declare 108 generic { - int TkGetWindowFromObj (Tcl_Interp *interp, \ - Tk_Window tkwin, Tcl_Obj *objPtr, \ - Tk_Window *windowPtr) +declare 108 { + int TkGetWindowFromObj(Tcl_Interp *interp, Tk_Window tkwin, + Tcl_Obj *objPtr, Tk_Window *windowPtr) } - -declare 109 generic { - char * TkpGetString (TkWindow *winPtr, \ - XEvent *eventPtr, Tcl_DString *dsPtr) +declare 109 { + char *TkpGetString(TkWindow *winPtr, XEvent *eventPtr, Tcl_DString *dsPtr) } - -declare 110 generic { - void TkpGetSubFonts (Tcl_Interp *interp, Tk_Font tkfont) +declare 110 { + void TkpGetSubFonts(Tcl_Interp *interp, Tk_Font tkfont) } - -declare 111 generic { - Tcl_Obj * TkpGetSystemDefault (Tk_Window tkwin, \ - CONST char *dbName, CONST char *className) +declare 111 { + Tcl_Obj *TkpGetSystemDefault(Tk_Window tkwin, + const char *dbName, const char *className) } - -declare 112 generic { - void TkpMenuThreadInit (void) +declare 112 { + void TkpMenuThreadInit(void) } - -declare 113 {mac aqua win} { - void TkClipBox (TkRegion rgn, XRectangle* rect_return) +declare 113 {mac aqua win} { + void TkClipBox(TkRegion rgn, XRectangle *rect_return) } - -declare 114 {mac aqua win} { - TkRegion TkCreateRegion (void) +declare 114 {mac aqua win} { + TkRegion TkCreateRegion(void) } - declare 115 {mac aqua win} { - void TkDestroyRegion (TkRegion rgn) + void TkDestroyRegion(TkRegion rgn) } - declare 116 {mac aqua win} { - void TkIntersectRegion (TkRegion sra, TkRegion srcb, TkRegion dr_return) + void TkIntersectRegion(TkRegion sra, TkRegion srcb, TkRegion dr_return) } - declare 117 {mac aqua win} { - int TkRectInRegion (TkRegion rgn, int x, int y, unsigned int width, \ + int TkRectInRegion(TkRegion rgn, int x, int y, unsigned int width, unsigned int height) } - declare 118 {mac aqua win} { - void TkSetRegion (Display* display, GC gc, TkRegion rgn) + void TkSetRegion(Display *display, GC gc, TkRegion rgn) } - declare 119 {mac aqua win} { - void TkUnionRectWithRegion (XRectangle* rect, \ + void TkUnionRectWithRegion(XRectangle *rect, TkRegion src, TkRegion dr_return) } - -# removed duplicate from tkIntPlat table -#declare 120 mac { -# void TkGenerateActivateEvents (TkWindow *winPtr, int active) -#} - declare 121 {mac aqua} { - Pixmap TkpCreateNativeBitmap (Display *display, CONST char * source) + Pixmap TkpCreateNativeBitmap(Display *display, const char *source) } - declare 122 {mac aqua} { - void TkpDefineNativeBitmaps (void) + void TkpDefineNativeBitmaps(void) } - -# removed duplicate from tkIntPlat table -#declare 123 mac { -# unsigned long TkpGetMS (void) -#} - declare 124 {mac aqua} { - Pixmap TkpGetNativeAppBitmap (Display *display, \ - CONST char *name, int *width, int *height) + Pixmap TkpGetNativeAppBitmap(Display *display, + const char *name, int *width, int *height) } - -# removed duplicates from tkIntPlat table -#declare 125 mac { -# void TkPointerDeadWindow (TkWindow *winPtr) -#} -# -#declare 126 mac { -# void TkpSetCapture (TkWindow *winPtr) -#} -# -#declare 127 mac { -# void TkpSetCursor (TkpCursor cursor) -#} -# -#declare 128 mac { -# void TkpWmSetState (TkWindow *winPtr, int state) -#} -# -#declare 130 mac { -# Window TkGetTransientMaster (TkWindow *winPtr) -#} -# -#declare 131 mac { -# int TkGenerateButtonEvent (int x, int y, \ -# Window window, unsigned int state) -#} -# -#declare 133 mac { -# void TkGenWMDestroyEvent (Tk_Window tkwin) -#} -# -#declare 134 mac { -# void TkGenWMConfigureEvent (Tk_Window tkwin, int x, int y, \ -# int width, int height, int flags) -#} - -declare 135 generic { - void TkpDrawHighlightBorder (Tk_Window tkwin, GC fgGC, GC bgGC, \ +declare 135 { + void TkpDrawHighlightBorder(Tk_Window tkwin, GC fgGC, GC bgGC, int highlightWidth, Drawable drawable) } - -declare 136 generic { - void TkSetFocusWin (TkWindow *winPtr, int force) +declare 136 { + void TkSetFocusWin(TkWindow *winPtr, int force) } - -declare 137 generic { - void TkpSetKeycodeAndState (Tk_Window tkwin, KeySym keySym, \ +declare 137 { + void TkpSetKeycodeAndState(Tk_Window tkwin, KeySym keySym, XEvent *eventPtr) } - -declare 138 generic { - KeySym TkpGetKeySym (TkDisplay *dispPtr, XEvent *eventPtr) +declare 138 { + KeySym TkpGetKeySym(TkDisplay *dispPtr, XEvent *eventPtr) } - -declare 139 generic { - void TkpInitKeymapInfo (TkDisplay *dispPtr) +declare 139 { + void TkpInitKeymapInfo(TkDisplay *dispPtr) } - -declare 140 generic { - TkRegion TkPhotoGetValidRegion (Tk_PhotoHandle handle) +declare 140 { + TkRegion TkPhotoGetValidRegion(Tk_PhotoHandle handle) } - -declare 141 generic { - TkWindow ** TkWmStackorderToplevel(TkWindow *parentPtr) +declare 141 { + TkWindow **TkWmStackorderToplevel(TkWindow *parentPtr) } - -declare 142 generic { +declare 142 { void TkFocusFree(TkMainInfo *mainPtr) } - -declare 143 generic { +declare 143 { void TkClipCleanup(TkDisplay *dispPtr) } - -declare 144 generic { +declare 144 { void TkGCCleanup(TkDisplay *dispPtr) } - declare 145 {mac win aqua} { - void TkSubtractRegion (TkRegion sra, TkRegion srcb, TkRegion dr_return) + void TkSubtractRegion(TkRegion sra, TkRegion srcb, TkRegion dr_return) } - -declare 146 generic { - void TkStylePkgInit (TkMainInfo *mainPtr) +declare 146 { + void TkStylePkgInit(TkMainInfo *mainPtr) } -declare 147 generic { - void TkStylePkgFree (TkMainInfo *mainPtr) +declare 147 { + void TkStylePkgFree(TkMainInfo *mainPtr) } - -declare 148 generic { +declare 148 { Tk_Window TkToplevelWindowForCommand(Tcl_Interp *interp, - CONST char *cmdName) + const char *cmdName) } - -declare 149 generic { - CONST Tk_OptionSpec * TkGetOptionSpec (CONST char *name, - Tk_OptionTable optionTable) +declare 149 { + const Tk_OptionSpec *TkGetOptionSpec(const char *name, + Tk_OptionTable optionTable) } - -# TIP#168 - 8.5+ -#declare 150 generic { -# int TkMakeRawCurve (Tk_Canvas canvas, -# double *pointPtr, int numPoints, int numSteps, -# XPoint xPoints[], double dblPoints[]) -#} -#declare 151 generic { -# void TkMakeRawCurvePostscript (Tcl_Interp *interp, -# Tk_Canvas canvas, double *pointPtr, int numPoints) -#} - -declare 152 generic { +declare 152 { void TkpDrawFrame(Tk_Window tkwin, Tk_3DBorder border, - int highlightWidth, int borderWidth, int relief) + int highlightWidth, int borderWidth, int relief) } ############################################################################## @@ -699,200 +497,155 @@ declare 152 generic { interface tkIntPlat -######################### +################################ # Unix specific functions declare 0 x11 { - void TkCreateXEventSource (void) + void TkCreateXEventSource(void) } - declare 1 x11 { - void TkFreeWindowId (TkDisplay *dispPtr, Window w) + void TkFreeWindowId(TkDisplay *dispPtr, Window w) } - declare 2 x11 { - void TkInitXId (TkDisplay *dispPtr) + void TkInitXId(TkDisplay *dispPtr) } - declare 3 x11 { - int TkpCmapStressed (Tk_Window tkwin, Colormap colormap) + int TkpCmapStressed(Tk_Window tkwin, Colormap colormap) } - declare 4 x11 { - void TkpSync (Display *display) + void TkpSync(Display *display) } - declare 5 x11 { - Window TkUnixContainerId (TkWindow *winPtr) + Window TkUnixContainerId(TkWindow *winPtr) } - declare 6 x11 { - int TkUnixDoOneXEvent (Tcl_Time *timePtr) + int TkUnixDoOneXEvent(Tcl_Time *timePtr) } - declare 7 x11 { - void TkUnixSetMenubar (Tk_Window tkwin, Tk_Window menubar) + void TkUnixSetMenubar(Tk_Window tkwin, Tk_Window menubar) } - declare 8 x11 { - int TkpScanWindowId (Tcl_Interp *interp, CONST char *string, Window *idPtr) + int TkpScanWindowId(Tcl_Interp *interp, const char *string, Window *idPtr) } - declare 9 x11 { - void TkWmCleanup (TkDisplay *dispPtr) + void TkWmCleanup(TkDisplay *dispPtr) } - declare 10 x11 { - void TkSendCleanup (TkDisplay *dispPtr) + void TkSendCleanup(TkDisplay *dispPtr) } - declare 11 x11 { - void TkFreeXId (TkDisplay *dispPtr) + void TkFreeXId(TkDisplay *dispPtr) } - declare 12 x11 { - int TkpWmSetState (TkWindow *winPtr, int state) + int TkpWmSetState(TkWindow *winPtr, int state) } -############################ +################################ # Windows specific functions declare 0 win { - char * TkAlignImageData (XImage *image, int alignment, int bitOrder) + char *TkAlignImageData(XImage *image, int alignment, int bitOrder) } - declare 2 win { - void TkGenerateActivateEvents (TkWindow *winPtr, int active) + void TkGenerateActivateEvents(TkWindow *winPtr, int active) } - declare 3 win { - unsigned long TkpGetMS (void) + unsigned long TkpGetMS(void) } - declare 4 win { - void TkPointerDeadWindow (TkWindow *winPtr) + void TkPointerDeadWindow(TkWindow *winPtr) } - declare 5 win { - void TkpPrintWindowId (char *buf, Window window) + void TkpPrintWindowId(char *buf, Window window) } - declare 6 win { - int TkpScanWindowId (Tcl_Interp *interp, CONST char *string, Window *idPtr) + int TkpScanWindowId(Tcl_Interp *interp, const char *string, Window *idPtr) } - declare 7 win { - void TkpSetCapture (TkWindow *winPtr) + void TkpSetCapture(TkWindow *winPtr) } - declare 8 win { - void TkpSetCursor (TkpCursor cursor) + void TkpSetCursor(TkpCursor cursor) } - declare 9 win { - void TkpWmSetState (TkWindow *winPtr, int state) + void TkpWmSetState(TkWindow *winPtr, int state) } - declare 10 win { - void TkSetPixmapColormap (Pixmap pixmap, Colormap colormap) + void TkSetPixmapColormap(Pixmap pixmap, Colormap colormap) } - declare 11 win { - void TkWinCancelMouseTimer (void) + void TkWinCancelMouseTimer(void) } - declare 12 win { - void TkWinClipboardRender (TkDisplay *dispPtr, UINT format) + void TkWinClipboardRender(TkDisplay *dispPtr, UINT format) } - declare 13 win { - LRESULT TkWinEmbeddedEventProc (HWND hwnd, UINT message, \ + LRESULT TkWinEmbeddedEventProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) } - declare 14 win { - void TkWinFillRect (HDC dc, int x, int y, int width, int height, \ - int pixel) + void TkWinFillRect(HDC dc, int x, int y, int width, int height, int pixel) } - declare 15 win { - COLORREF TkWinGetBorderPixels (Tk_Window tkwin, Tk_3DBorder border, \ + COLORREF TkWinGetBorderPixels(Tk_Window tkwin, Tk_3DBorder border, int which) } - declare 16 win { - HDC TkWinGetDrawableDC (Display *display, Drawable d, TkWinDCState* state) + HDC TkWinGetDrawableDC(Display *display, Drawable d, TkWinDCState *state) } - declare 17 win { - int TkWinGetModifierState (void) + int TkWinGetModifierState(void) } - declare 18 win { - HPALETTE TkWinGetSystemPalette (void) + HPALETTE TkWinGetSystemPalette(void) } - declare 19 win { - HWND TkWinGetWrapperWindow (Tk_Window tkwin) + HWND TkWinGetWrapperWindow(Tk_Window tkwin) } - declare 20 win { - int TkWinHandleMenuEvent (HWND *phwnd, \ - UINT *pMessage, WPARAM *pwParam, LPARAM *plParam, \ - LRESULT *plResult) + int TkWinHandleMenuEvent(HWND *phwnd, UINT *pMessage, WPARAM *pwParam, + LPARAM *plParam, LRESULT *plResult) } - declare 21 win { - int TkWinIndexOfColor (XColor *colorPtr) + int TkWinIndexOfColor(XColor *colorPtr) } - declare 22 win { - void TkWinReleaseDrawableDC (Drawable d, HDC hdc, TkWinDCState* state) + void TkWinReleaseDrawableDC(Drawable d, HDC hdc, TkWinDCState *state) } - declare 23 win { - LRESULT TkWinResendEvent (WNDPROC wndproc, HWND hwnd, XEvent *eventPtr) + LRESULT TkWinResendEvent(WNDPROC wndproc, HWND hwnd, XEvent *eventPtr) } - declare 24 win { - HPALETTE TkWinSelectPalette (HDC dc, Colormap colormap) + HPALETTE TkWinSelectPalette(HDC dc, Colormap colormap) } - declare 25 win { - void TkWinSetMenu (Tk_Window tkwin, HMENU hMenu) + void TkWinSetMenu(Tk_Window tkwin, HMENU hMenu) } - declare 26 win { - void TkWinSetWindowPos (HWND hwnd, HWND siblingHwnd, int pos) + void TkWinSetWindowPos(HWND hwnd, HWND siblingHwnd, int pos) } - declare 27 win { - void TkWinWmCleanup (HINSTANCE hInstance) + void TkWinWmCleanup(HINSTANCE hInstance) } - declare 28 win { - void TkWinXCleanup (ClientData clientData) + void TkWinXCleanup(ClientData clientData) } - declare 29 win { - void TkWinXInit (HINSTANCE hInstance) + void TkWinXInit(HINSTANCE hInstance) } # new for 8.1 declare 30 win { - void TkWinSetForegroundWindow (TkWindow *winPtr) + void TkWinSetForegroundWindow(TkWindow *winPtr) } - declare 31 win { - void TkWinDialogDebug (int debug) + void TkWinDialogDebug(int debug) } - declare 32 win { - Tcl_Obj * TkWinGetMenuSystemDefault (Tk_Window tkwin, \ - CONST char *dbName, CONST char *className) + Tcl_Obj *TkWinGetMenuSystemDefault(Tk_Window tkwin, + const char *dbName, const char *className) } - declare 33 win { int TkWinGetPlatformId(void) } @@ -900,477 +653,375 @@ declare 33 win { # new for 8.4.1 declare 34 win { - void TkWinSetHINSTANCE (HINSTANCE hInstance) + void TkWinSetHINSTANCE(HINSTANCE hInstance) } -######################## +################################ # Mac specific functions declare 0 mac { - void TkGenerateActivateEvents (TkWindow *winPtr, int active) + void TkGenerateActivateEvents(TkWindow *winPtr, int active) } -# removed duplicates from tkInt table -#declare 1 mac { -# Pixmap TkpCreateNativeBitmap (Display *display, CONST char * source) -#} -# -#declare 2 mac { -# void TkpDefineNativeBitmaps (void) -#} - declare 3 mac { - unsigned long TkpGetMS (void) + unsigned long TkpGetMS(void) } - declare 5 mac { - void TkPointerDeadWindow (TkWindow *winPtr) + void TkPointerDeadWindow(TkWindow *winPtr) } - declare 6 mac { - void TkpSetCapture (TkWindow *winPtr) + void TkpSetCapture(TkWindow *winPtr) } - declare 7 mac { - void TkpSetCursor (TkpCursor cursor) + void TkpSetCursor(TkpCursor cursor) } - declare 8 mac { - void TkpWmSetState (TkWindow *winPtr, int state) + void TkpWmSetState(TkWindow *winPtr, int state) } - declare 10 mac { - void TkAboutDlg (void) + void TkAboutDlg(void) } - declare 13 mac { - Window TkGetTransientMaster (TkWindow *winPtr) + Window TkGetTransientMaster(TkWindow *winPtr) } - declare 14 mac { - int TkGenerateButtonEvent (int x, int y, \ + int TkGenerateButtonEvent(int x, int y, Window window, unsigned int state) } - declare 16 mac { - void TkGenWMDestroyEvent (Tk_Window tkwin) + void TkGenWMDestroyEvent(Tk_Window tkwin) } - -# removed duplicate from tkPlat table (tk.decls) +# removed duplicate from tkPlat table(tk.decls) #declare 17 mac { -# void TkGenWMConfigureEvent (Tk_Window tkwin, int x, int y, \ +# void TkGenWMConfigureEvent(Tk_Window tkwin, int x, int y, # int width, int height, int flags) #} - declare 18 mac { - unsigned int TkMacButtonKeyState (void) + unsigned int TkMacButtonKeyState(void) } - declare 19 mac { - void TkMacClearMenubarActive (void) + void TkMacClearMenubarActive(void) } - -# removed duplicate from tkPlat table (tk.decls) +# removed duplicate from tkPlat table(tk.decls) #declare 20 mac { -# int TkMacConvertEvent (EventRecord *eventPtr) +# int TkMacConvertEvent(EventRecord *eventPtr) #} - declare 21 mac { - int TkMacDispatchMenuEvent (int menuID, int index) + int TkMacDispatchMenuEvent(int menuID, int index) } - declare 22 mac { - void TkMacInstallCursor (int resizeOverride) + void TkMacInstallCursor(int resizeOverride) } - -# removed duplicate from tkPlat table (tk.decls) +# removed duplicate from tkPlat table(tk.decls) #declare 23 mac { -# int TkMacConvertTkEvent (EventRecord *eventPtr, Window window) +# int TkMacConvertTkEvent(EventRecord *eventPtr, Window window) #} - declare 24 mac { - void TkMacHandleTearoffMenu (void) + void TkMacHandleTearoffMenu(void) } - -# removed duplicate from tkPlat table (tk.decls) +# removed duplicate from tkPlat table(tk.decls) #declare 26 mac { -# void TkMacInvalClipRgns (TkWindow *winPtr) +# void TkMacInvalClipRgns(TkWindow *winPtr) #} - declare 27 mac { - void TkMacDoHLEvent (EventRecord *theEvent) + void TkMacDoHLEvent(EventRecord *theEvent) } - declare 29 mac { - Time TkMacGenerateTime (void) + Time TkMacGenerateTime(void) } - -# removed duplicate from tkPlat table (tk.decls) +# removed duplicate from tkPlat table(tk.decls) #declare 30 mac { -# GWorldPtr TkMacGetDrawablePort (Drawable drawable) +# GWorldPtr TkMacGetDrawablePort(Drawable drawable) #} - declare 31 mac { - TkWindow * TkMacGetScrollbarGrowWindow (TkWindow *winPtr) + TkWindow *TkMacGetScrollbarGrowWindow(TkWindow *winPtr) } - declare 32 mac { - Window TkMacGetXWindow (WindowRef macWinPtr) + Window TkMacGetXWindow(WindowRef macWinPtr) } - declare 33 mac { - int TkMacGrowToplevel (WindowRef whichWindow, Point start) + int TkMacGrowToplevel(WindowRef whichWindow, Point start) } - declare 34 mac { - void TkMacHandleMenuSelect (long mResult, int optionKeyPressed) + void TkMacHandleMenuSelect(long mResult, int optionKeyPressed) } - -# removed duplicates from tkPlat table (tk.decls) +# removed duplicates from tkPlat table(tk.decls) #declare 35 mac { -# int TkMacHaveAppearance (void) +# int TkMacHaveAppearance(void) #} # #declare 36 mac { -# void TkMacInitAppleEvents (Tcl_Interp *interp) +# void TkMacInitAppleEvents(Tcl_Interp *interp) #} # #declare 37 mac { -# void TkMacInitMenus (Tcl_Interp *interp) +# void TkMacInitMenus(Tcl_Interp *interp) #} - declare 38 mac { - void TkMacInvalidateWindow (MacDrawable *macWin, int flag) + void TkMacInvalidateWindow(MacDrawable *macWin, int flag) } - declare 39 mac { - int TkMacIsCharacterMissing (Tk_Font tkfont, unsigned int searchChar) + int TkMacIsCharacterMissing(Tk_Font tkfont, unsigned int searchChar) } - declare 40 mac { - void TkMacMakeRealWindowExist (TkWindow *winPtr) + void TkMacMakeRealWindowExist(TkWindow *winPtr) } - declare 41 mac { BitMapPtr TkMacMakeStippleMap(Drawable d1, Drawable d2) } - declare 42 mac { - void TkMacMenuClick (void) + void TkMacMenuClick(void) } - declare 43 mac { - void TkMacRegisterOffScreenWindow (Window window, GWorldPtr portPtr) + void TkMacRegisterOffScreenWindow(Window window, GWorldPtr portPtr) } - declare 44 mac { - int TkMacResizable (TkWindow *winPtr) + int TkMacResizable(TkWindow *winPtr) } - declare 46 mac { - void TkMacSetHelpMenuItemCount (void) + void TkMacSetHelpMenuItemCount(void) } - declare 47 mac { - void TkMacSetScrollbarGrow (TkWindow *winPtr, int flag) + void TkMacSetScrollbarGrow(TkWindow *winPtr, int flag) } - declare 48 mac { - void TkMacSetUpClippingRgn (Drawable drawable) + void TkMacSetUpClippingRgn(Drawable drawable) } - declare 49 mac { - void TkMacSetUpGraphicsPort (GC gc) + void TkMacSetUpGraphicsPort(GC gc) } - declare 50 mac { - void TkMacUpdateClipRgn (TkWindow *winPtr) + void TkMacUpdateClipRgn(TkWindow *winPtr) } - declare 51 mac { - void TkMacUnregisterMacWindow (GWorldPtr portPtr) + void TkMacUnregisterMacWindow(GWorldPtr portPtr) } - declare 52 mac { - int TkMacUseMenuID (short macID) + int TkMacUseMenuID(short macID) } - declare 53 mac { - RgnHandle TkMacVisableClipRgn (TkWindow *winPtr) + RgnHandle TkMacVisableClipRgn(TkWindow *winPtr) } - declare 54 mac { - void TkMacWinBounds (TkWindow *winPtr, Rect *geometry) + void TkMacWinBounds(TkWindow *winPtr, Rect *geometry) } - declare 55 mac { - void TkMacWindowOffset (WindowRef wRef, int *xOffset, int *yOffset) + void TkMacWindowOffset(WindowRef wRef, int *xOffset, int *yOffset) } - declare 57 mac { - int TkSetMacColor (unsigned long pixel, RGBColor *macColor) + int TkSetMacColor(unsigned long pixel, RGBColor *macColor) } - declare 58 mac { - void TkSetWMName (TkWindow *winPtr, Tk_Uid titleUid) + void TkSetWMName(TkWindow *winPtr, Tk_Uid titleUid) } - declare 59 mac { - void TkSuspendClipboard (void) + void TkSuspendClipboard(void) } - declare 61 mac { - int TkMacZoomToplevel (WindowPtr whichWindow, Point where, short zoomPart) + int TkMacZoomToplevel(WindowPtr whichWindow, Point where, short zoomPart) } - declare 62 mac { - Tk_Window Tk_TopCoordsToWindow (Tk_Window tkwin, \ + Tk_Window Tk_TopCoordsToWindow(Tk_Window tkwin, int rootX, int rootY, int *newX, int *newY) } - declare 63 mac { - MacDrawable * TkMacContainerId (TkWindow *winPtr) + MacDrawable *TkMacContainerId(TkWindow *winPtr) } - declare 64 mac { - MacDrawable * TkMacGetHostToplevel (TkWindow *winPtr) + MacDrawable *TkMacGetHostToplevel(TkWindow *winPtr) } - declare 65 mac { - void TkMacPreprocessMenu (void) + void TkMacPreprocessMenu(void) } - declare 66 mac { - int TkpIsWindowFloating (WindowRef window) + int TkpIsWindowFloating(WindowRef window) } - declare 35 win { - int TkWinGetPlatformTheme (void) + int TkWinGetPlatformTheme(void) } - -######################## -# Mac OS X specific functions +################################ +# Aqua specific functions declare 0 aqua { - void TkGenerateActivateEvents (TkWindow *winPtr, int active) + void TkGenerateActivateEvents(TkWindow *winPtr, int active) } # removed duplicates from tkInt table #declare 1 aqua { -# Pixmap TkpCreateNativeBitmap (Display *display, CONST char * source) +# Pixmap TkpCreateNativeBitmap(Display *display, const char *source) #} # #declare 2 aqua { -# void TkpDefineNativeBitmaps (void) +# void TkpDefineNativeBitmaps(void) #} declare 3 aqua { - void TkPointerDeadWindow (TkWindow *winPtr) + void TkPointerDeadWindow(TkWindow *winPtr) } - declare 4 aqua { - void TkpSetCapture (TkWindow *winPtr) + void TkpSetCapture(TkWindow *winPtr) } - declare 5 aqua { - void TkpSetCursor (TkpCursor cursor) + void TkpSetCursor(TkpCursor cursor) } - declare 6 aqua { - void TkpWmSetState (TkWindow *winPtr, int state) + void TkpWmSetState(TkWindow *winPtr, int state) } - declare 7 aqua { - void TkAboutDlg (void) + void TkAboutDlg(void) } - declare 8 aqua { - unsigned int TkMacOSXButtonKeyState (void) + unsigned int TkMacOSXButtonKeyState(void) } - declare 9 aqua { - void TkMacOSXClearMenubarActive (void) + void TkMacOSXClearMenubarActive(void) } - declare 10 aqua { - int TkMacOSXDispatchMenuEvent (int menuID, int index) + int TkMacOSXDispatchMenuEvent(int menuID, int index) } - declare 11 aqua { - void TkMacOSXInstallCursor (int resizeOverride) + void TkMacOSXInstallCursor(int resizeOverride) } - declare 12 aqua { - void TkMacOSXHandleTearoffMenu (void) + void TkMacOSXHandleTearoffMenu(void) } -# removed duplicate from tkPlat table (tk.decls) +# removed duplicate from tkPlat table(tk.decls) #declare 13 aqua { -# void TkMacOSXInvalClipRgns (TkWindow *winPtr) +# void TkMacOSXInvalClipRgns(TkWindow *winPtr) #} declare 14 aqua { - int TkMacOSXDoHLEvent (EventRecord *theEvent) + int TkMacOSXDoHLEvent(EventRecord *theEvent) } -# removed duplicate from tkPlat table (tk.decls) +# removed duplicate from tkPlat table(tk.decls) #declare 15 aqua { -# GWorldPtr TkMacOSXGetDrawablePort (Drawable drawable) +# GWorldPtr TkMacOSXGetDrawablePort(Drawable drawable) #} declare 16 aqua { - Window TkMacOSXGetXWindow (WindowRef macWinPtr) + Window TkMacOSXGetXWindow(WindowRef macWinPtr) } - declare 17 aqua { - int TkMacOSXGrowToplevel (WindowRef whichWindow, Point start) + int TkMacOSXGrowToplevel(WindowRef whichWindow, Point start) } - declare 18 aqua { - void TkMacOSXHandleMenuSelect(MenuID theMenu, MenuItemIndex theItem, int optionKeyPressed) + void TkMacOSXHandleMenuSelect(MenuID theMenu, MenuItemIndex theItem, + int optionKeyPressed) } -# removed duplicates from tkPlat table (tk.decls) +# removed duplicates from tkPlat table(tk.decls) #declare 19 aqua { -# void TkMacOSXInitAppleEvents (Tcl_Interp *interp) +# void TkMacOSXInitAppleEvents(Tcl_Interp *interp) #} # #declare 20 aqua { -# void TkMacOSXInitMenus (Tcl_Interp *interp) +# void TkMacOSXInitMenus(Tcl_Interp *interp) #} declare 21 aqua { - void TkMacOSXInvalidateWindow (MacDrawable *macWin, int flag) + void TkMacOSXInvalidateWindow(MacDrawable *macWin, int flag) } - declare 22 aqua { - int TkMacOSXIsCharacterMissing (Tk_Font tkfont, unsigned int searchChar) + int TkMacOSXIsCharacterMissing(Tk_Font tkfont, unsigned int searchChar) } - declare 23 aqua { - void TkMacOSXMakeRealWindowExist (TkWindow *winPtr) + void TkMacOSXMakeRealWindowExist(TkWindow *winPtr) } - declare 24 aqua { BitMapPtr TkMacOSXMakeStippleMap(Drawable d1, Drawable d2) } - declare 25 aqua { - void TkMacOSXMenuClick (void) + void TkMacOSXMenuClick(void) } - declare 26 aqua { - void TkMacOSXRegisterOffScreenWindow (Window window, GWorldPtr portPtr) + void TkMacOSXRegisterOffScreenWindow(Window window, GWorldPtr portPtr) } - declare 27 aqua { - int TkMacOSXResizable (TkWindow *winPtr) + int TkMacOSXResizable(TkWindow *winPtr) } - declare 28 aqua { - void TkMacOSXSetHelpMenuItemCount (void) + void TkMacOSXSetHelpMenuItemCount(void) } - declare 29 aqua { - void TkMacOSXSetScrollbarGrow (TkWindow *winPtr, int flag) + void TkMacOSXSetScrollbarGrow(TkWindow *winPtr, int flag) } - declare 30 aqua { - void TkMacOSXSetUpClippingRgn (Drawable drawable) + void TkMacOSXSetUpClippingRgn(Drawable drawable) } - declare 31 aqua { - void TkMacOSXSetUpGraphicsPort (GC gc, GWorldPtr destPort) + void TkMacOSXSetUpGraphicsPort(GC gc, GWorldPtr destPort) } - declare 32 aqua { - void TkMacOSXUpdateClipRgn (TkWindow *winPtr) + void TkMacOSXUpdateClipRgn(TkWindow *winPtr) } - declare 33 aqua { - void TkMacOSXUnregisterMacWindow (WindowRef portPtr) + void TkMacOSXUnregisterMacWindow(WindowRef portPtr) } - declare 34 aqua { - int TkMacOSXUseMenuID (short macID) + int TkMacOSXUseMenuID(short macID) } - declare 35 aqua { - RgnHandle TkMacOSXVisableClipRgn (TkWindow *winPtr) + RgnHandle TkMacOSXVisableClipRgn(TkWindow *winPtr) } - declare 36 aqua { - void TkMacOSXWinBounds (TkWindow *winPtr, Rect *geometry) + void TkMacOSXWinBounds(TkWindow *winPtr, Rect *geometry) } - declare 37 aqua { - void TkMacOSXWindowOffset (WindowRef wRef, int *xOffset, int *yOffset) + void TkMacOSXWindowOffset(WindowRef wRef, int *xOffset, int *yOffset) } - declare 38 aqua { - int TkSetMacColor (unsigned long pixel, RGBColor *macColor) + int TkSetMacColor(unsigned long pixel, RGBColor *macColor) } - declare 39 aqua { - void TkSetWMName (TkWindow *winPtr, Tk_Uid titleUid) + void TkSetWMName(TkWindow *winPtr, Tk_Uid titleUid) } - declare 40 aqua { - void TkSuspendClipboard (void) + void TkSuspendClipboard(void) } - declare 41 aqua { - int TkMacOSXZoomToplevel (WindowPtr whichWindow, short zoomPart) + int TkMacOSXZoomToplevel(WindowPtr whichWindow, short zoomPart) } - declare 42 aqua { - Tk_Window Tk_TopCoordsToWindow (Tk_Window tkwin, \ - int rootX, int rootY, int *newX, int *newY) + Tk_Window Tk_TopCoordsToWindow(Tk_Window tkwin, int rootX, int rootY, + int *newX, int *newY) } - declare 43 aqua { - MacDrawable * TkMacOSXContainerId (TkWindow *winPtr) + MacDrawable *TkMacOSXContainerId(TkWindow *winPtr) } - declare 44 aqua { - MacDrawable * TkMacOSXGetHostToplevel (TkWindow *winPtr) + MacDrawable *TkMacOSXGetHostToplevel(TkWindow *winPtr) } - declare 45 aqua { - void TkMacOSXPreprocessMenu (void) + void TkMacOSXPreprocessMenu(void) } - declare 46 aqua { - int TkpIsWindowFloating (WindowRef window) + int TkpIsWindowFloating(WindowRef window) } - declare 47 aqua { - Tk_Window TkMacOSXGetCapture (void) + Tk_Window TkMacOSXGetCapture(void) } - declare 49 aqua { - Window TkGetTransientMaster (TkWindow *winPtr) + Window TkGetTransientMaster(TkWindow *winPtr) } - declare 50 aqua { - int TkGenerateButtonEvent (int x, int y, \ - Window window, unsigned int state) + int TkGenerateButtonEvent(int x, int y, Window window, unsigned int state) } - declare 51 aqua { - void TkGenWMDestroyEvent (Tk_Window tkwin) + void TkGenWMDestroyEvent(Tk_Window tkwin) } # removed duplicate from tkPlat table (tk.decls) #declare 52 aqua { -# void TkGenWMConfigureEvent (Tk_Window tkwin, int x, int y, \ +# void TkGenWMConfigureEvent(Tk_Window tkwin, int x, int y, # int width, int height, int flags) #} declare 53 aqua { - unsigned long TkpGetMS (void) + unsigned long TkpGetMS(void) } - + ############################################################################## # Define the platform specific internal Xlib interfaces. These functions are @@ -1378,899 +1029,703 @@ declare 53 aqua { interface tkIntXlib +################################ # X functions for Windows declare 0 win { - void XSetDashes (Display* display, GC gc, int dash_offset, - _Xconst char* dash_list, int n) + void XSetDashes(Display *display, GC gc, int dash_offset, + _Xconst char *dash_list, int n) } - declare 1 win { - XModifierKeymap* XGetModifierMapping (Display* d) + XModifierKeymap *XGetModifierMapping(Display *d) } - declare 2 win { - XImage * XCreateImage (Display* d, Visual* v, unsigned int ui1, int i1, \ - int i2, char* cp, unsigned int ui2, unsigned int ui3, int i3, \ + XImage *XCreateImage(Display *d, Visual *v, unsigned int ui1, int i1, + int i2, char *cp, unsigned int ui2, unsigned int ui3, int i3, int i4) - } - declare 3 win { - XImage *XGetImage (Display* d, Drawable dr, int i1, int i2, \ + XImage *XGetImage(Display *d, Drawable dr, int i1, int i2, unsigned int ui1, unsigned int ui2, unsigned long ul, int i3) } - declare 4 win { - char *XGetAtomName (Display* d,Atom a) - + char *XGetAtomName(Display *d, Atom a) } - declare 5 win { - char *XKeysymToString (KeySym k) + char *XKeysymToString(KeySym k) } - declare 6 win { - Colormap XCreateColormap (Display* d, Window w, Visual* v, int i) - + Colormap XCreateColormap(Display *d, Window w, Visual *v, int i) } - declare 7 win { - Cursor XCreatePixmapCursor (Display* d, Pixmap p1, Pixmap p2, \ - XColor* x1, XColor* x2, \ - unsigned int ui1, unsigned int ui2) + Cursor XCreatePixmapCursor(Display *d, Pixmap p1, Pixmap p2, + XColor *x1, XColor *x2, unsigned int ui1, unsigned int ui2) } - declare 8 win { - Cursor XCreateGlyphCursor (Display* d, Font f1, Font f2, \ - unsigned int ui1, unsigned int ui2, XColor* x1, XColor* x2) + Cursor XCreateGlyphCursor(Display *d, Font f1, Font f2, + unsigned int ui1, unsigned int ui2, XColor *x1, XColor *x2) } - declare 9 win { - GContext XGContextFromGC (GC g) + GContext XGContextFromGC(GC g) } - declare 10 win { - XHostAddress *XListHosts (Display* d, int* i, Bool* b) + XHostAddress *XListHosts(Display *d, int *i, Bool *b) } - # second parameter was of type KeyCode declare 11 win { - KeySym XKeycodeToKeysym (Display* d, unsigned int k, int i) + KeySym XKeycodeToKeysym(Display *d, unsigned int k, int i) } - declare 12 win { - KeySym XStringToKeysym (_Xconst char* c) + KeySym XStringToKeysym(_Xconst char *c) } - declare 13 win { - Window XRootWindow (Display* d, int i) + Window XRootWindow(Display *d, int i) } - declare 14 win { - XErrorHandler XSetErrorHandler (XErrorHandler x) + XErrorHandler XSetErrorHandler(XErrorHandler x) } - declare 15 win { - Status XIconifyWindow (Display* d, Window w, int i) + Status XIconifyWindow(Display *d, Window w, int i) } - declare 16 win { - Status XWithdrawWindow (Display* d, Window w, int i) + Status XWithdrawWindow(Display *d, Window w, int i) } - declare 17 win { - Status XGetWMColormapWindows (Display* d, Window w, Window** wpp, int* ip) + Status XGetWMColormapWindows(Display *d, Window w, Window **wpp, int *ip) } - declare 18 win { - Status XAllocColor (Display* d, Colormap c, XColor* xp) + Status XAllocColor(Display *d, Colormap c, XColor *xp) } - declare 19 win { - void XBell (Display* d, int i) + void XBell(Display *d, int i) } - declare 20 win { - void XChangeProperty (Display* d, Window w, Atom a1, Atom a2, int i1, \ - int i2, _Xconst unsigned char* c, int i3) + void XChangeProperty(Display *d, Window w, Atom a1, Atom a2, int i1, + int i2, _Xconst unsigned char *c, int i3) } - declare 21 win { - void XChangeWindowAttributes (Display* d, Window w, unsigned long ul, \ - XSetWindowAttributes* x) + void XChangeWindowAttributes(Display *d, Window w, unsigned long ul, + XSetWindowAttributes *x) } - declare 22 win { - void XClearWindow (Display* d, Window w) + void XClearWindow(Display *d, Window w) } - declare 23 win { - void XConfigureWindow (Display* d, Window w, unsigned int i, \ - XWindowChanges* x) + void XConfigureWindow(Display *d, Window w, unsigned int i, + XWindowChanges *x) } - declare 24 win { - void XCopyArea (Display* d, Drawable dr1, Drawable dr2, GC g, int i1, \ - int i2, unsigned int ui1, \ - unsigned int ui2, int i3, int i4) + void XCopyArea(Display *d, Drawable dr1, Drawable dr2, GC g, int i1, + int i2, unsigned int ui1, unsigned int ui2, int i3, int i4) } - declare 25 win { - void XCopyPlane (Display* d, Drawable dr1, Drawable dr2, GC g, int i1, \ - int i2, unsigned int ui1, \ + void XCopyPlane(Display *d, Drawable dr1, Drawable dr2, GC g, int i1, + int i2, unsigned int ui1, unsigned int ui2, int i3, int i4, unsigned long ul) } - declare 26 win { - Pixmap XCreateBitmapFromData(Display* display, Drawable d, \ - _Xconst char* data, unsigned int width,unsigned int height) + Pixmap XCreateBitmapFromData(Display *display, Drawable d, + _Xconst char *data, unsigned int width, unsigned int height) } - declare 27 win { - void XDefineCursor (Display* d, Window w, Cursor c) + void XDefineCursor(Display *d, Window w, Cursor c) } - declare 28 win { - void XDeleteProperty (Display* d, Window w, Atom a) + void XDeleteProperty(Display *d, Window w, Atom a) } - declare 29 win { - void XDestroyWindow (Display* d, Window w) + void XDestroyWindow(Display *d, Window w) } - declare 30 win { - void XDrawArc (Display* d, Drawable dr, GC g, int i1, int i2, \ + void XDrawArc(Display *d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4) } - declare 31 win { - void XDrawLines (Display* d, Drawable dr, GC g, XPoint* x, int i1, int i2) + void XDrawLines(Display *d, Drawable dr, GC g, XPoint *x, int i1, int i2) } - declare 32 win { - void XDrawRectangle (Display* d, Drawable dr, GC g, int i1, int i2,\ + void XDrawRectangle(Display *d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2) } - declare 33 win { - void XFillArc (Display* d, Drawable dr, GC g, int i1, int i2, \ + void XFillArc(Display *d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4) } - declare 34 win { - void XFillPolygon (Display* d, Drawable dr, GC g, XPoint* x, \ + void XFillPolygon(Display *d, Drawable dr, GC g, XPoint *x, int i1, int i2, int i3) } - declare 35 win { - void XFillRectangles (Display* d, Drawable dr, GC g, XRectangle* x, int i) + void XFillRectangles(Display *d, Drawable dr, GC g, XRectangle *x, int i) } - declare 36 win { - void XForceScreenSaver (Display* d, int i) + void XForceScreenSaver(Display *d, int i) } - declare 37 win { - void XFreeColormap (Display* d, Colormap c) + void XFreeColormap(Display *d, Colormap c) } - declare 38 win { - void XFreeColors (Display* d, Colormap c, \ - unsigned long* ulp, int i, unsigned long ul) + void XFreeColors(Display *d, Colormap c, + unsigned long *ulp, int i, unsigned long ul) } - declare 39 win { - void XFreeCursor (Display* d, Cursor c) + void XFreeCursor(Display *d, Cursor c) } - declare 40 win { - void XFreeModifiermap (XModifierKeymap* x) + void XFreeModifiermap(XModifierKeymap *x) } - declare 41 win { - Status XGetGeometry (Display* d, Drawable dr, Window* w, int* i1, \ - int* i2, unsigned int* ui1, unsigned int* ui2, unsigned int* ui3, \ - unsigned int* ui4) + Status XGetGeometry(Display *d, Drawable dr, Window *w, int *i1, + int *i2, unsigned int *ui1, unsigned int *ui2, unsigned int *ui3, + unsigned int *ui4) } - declare 42 win { - void XGetInputFocus (Display* d, Window* w, int* i) + void XGetInputFocus(Display *d, Window *w, int *i) } - declare 43 win { - int XGetWindowProperty (Display* d, Window w, Atom a1, long l1, long l2, \ - Bool b, Atom a2, Atom* ap, int* ip, unsigned long* ulp1, \ - unsigned long* ulp2, unsigned char** cpp) + int XGetWindowProperty(Display *d, Window w, Atom a1, long l1, long l2, + Bool b, Atom a2, Atom *ap, int *ip, unsigned long *ulp1, + unsigned long *ulp2, unsigned char **cpp) } - declare 44 win { - Status XGetWindowAttributes (Display* d, Window w, XWindowAttributes* x) + Status XGetWindowAttributes(Display *d, Window w, XWindowAttributes *x) } - declare 45 win { - int XGrabKeyboard (Display* d, Window w, Bool b, int i1, int i2, Time t) + int XGrabKeyboard(Display *d, Window w, Bool b, int i1, int i2, Time t) } - declare 46 win { - int XGrabPointer (Display* d, Window w1, Bool b, unsigned int ui, \ + int XGrabPointer(Display *d, Window w1, Bool b, unsigned int ui, int i1, int i2, Window w2, Cursor c, Time t) } - declare 47 win { - KeyCode XKeysymToKeycode (Display* d, KeySym k) + KeyCode XKeysymToKeycode(Display *d, KeySym k) } - declare 48 win { - Status XLookupColor (Display* d, Colormap c1, _Xconst char* c2, \ - XColor* x1, XColor* x2) + Status XLookupColor(Display *d, Colormap c1, _Xconst char *c2, + XColor *x1, XColor *x2) } - declare 49 win { - void XMapWindow (Display* d, Window w) + void XMapWindow(Display *d, Window w) } - declare 50 win { - void XMoveResizeWindow (Display* d, Window w, int i1, int i2, \ + void XMoveResizeWindow(Display *d, Window w, int i1, int i2, unsigned int ui1, unsigned int ui2) } - declare 51 win { - void XMoveWindow (Display* d, Window w, int i1, int i2) + void XMoveWindow(Display *d, Window w, int i1, int i2) } - declare 52 win { - void XNextEvent (Display* d, XEvent* x) + void XNextEvent(Display *d, XEvent *x) } - declare 53 win { - void XPutBackEvent (Display* d, XEvent* x) + void XPutBackEvent(Display *d, XEvent *x) } - declare 54 win { - void XQueryColors (Display* d, Colormap c, XColor* x, int i) + void XQueryColors(Display *d, Colormap c, XColor *x, int i) } - declare 55 win { - Bool XQueryPointer (Display* d, Window w1, Window* w2, Window* w3, \ - int* i1, int* i2, int* i3, int* i4, unsigned int* ui) + Bool XQueryPointer(Display *d, Window w1, Window *w2, Window *w3, + int *i1, int *i2, int *i3, int *i4, unsigned int *ui) } - declare 56 win { - Status XQueryTree (Display* d, Window w1, Window* w2, Window* w3, \ - Window** w4, unsigned int* ui) + Status XQueryTree(Display *d, Window w1, Window *w2, Window *w3, + Window **w4, unsigned int *ui) } - declare 57 win { - void XRaiseWindow (Display* d, Window w) + void XRaiseWindow(Display *d, Window w) } - declare 58 win { - void XRefreshKeyboardMapping (XMappingEvent* x) + void XRefreshKeyboardMapping(XMappingEvent *x) } - declare 59 win { - void XResizeWindow (Display* d, Window w, unsigned int ui1, \ + void XResizeWindow(Display *d, Window w, unsigned int ui1, unsigned int ui2) } - declare 60 win { - void XSelectInput (Display* d, Window w, long l) + void XSelectInput(Display *d, Window w, long l) } - declare 61 win { - Status XSendEvent (Display* d, Window w, Bool b, long l, XEvent* x) + Status XSendEvent(Display *d, Window w, Bool b, long l, XEvent *x) } - declare 62 win { - void XSetCommand (Display* d, Window w, CONST char** c, int i) + void XSetCommand(Display *d, Window w, const char **c, int i) } - declare 63 win { - void XSetIconName (Display* d, Window w, _Xconst char* c) + void XSetIconName(Display *d, Window w, _Xconst char *c) } - declare 64 win { - void XSetInputFocus (Display* d, Window w, int i, Time t) + void XSetInputFocus(Display *d, Window w, int i, Time t) } - declare 65 win { - void XSetSelectionOwner (Display* d, Atom a, Window w, Time t) + void XSetSelectionOwner(Display *d, Atom a, Window w, Time t) } - declare 66 win { - void XSetWindowBackground (Display* d, Window w, unsigned long ul) + void XSetWindowBackground(Display *d, Window w, unsigned long ul) } - declare 67 win { - void XSetWindowBackgroundPixmap (Display* d, Window w, Pixmap p) + void XSetWindowBackgroundPixmap(Display *d, Window w, Pixmap p) } - declare 68 win { - void XSetWindowBorder (Display* d, Window w, unsigned long ul) + void XSetWindowBorder(Display *d, Window w, unsigned long ul) } - declare 69 win { - void XSetWindowBorderPixmap (Display* d, Window w, Pixmap p) + void XSetWindowBorderPixmap(Display *d, Window w, Pixmap p) } - declare 70 win { - void XSetWindowBorderWidth (Display* d, Window w, unsigned int ui) + void XSetWindowBorderWidth(Display *d, Window w, unsigned int ui) } - declare 71 win { - void XSetWindowColormap (Display* d, Window w, Colormap c) + void XSetWindowColormap(Display *d, Window w, Colormap c) } - declare 72 win { - Bool XTranslateCoordinates (Display* d, Window w1, Window w2, int i1,\ - int i2, int* i3, int* i4, Window* w3) + Bool XTranslateCoordinates(Display *d, Window w1, Window w2, int i1, + int i2, int *i3, int *i4, Window *w3) } - declare 73 win { - void XUngrabKeyboard (Display* d, Time t) + void XUngrabKeyboard(Display *d, Time t) } - declare 74 win { - void XUngrabPointer (Display* d, Time t) + void XUngrabPointer(Display *d, Time t) } - declare 75 win { - void XUnmapWindow (Display* d, Window w) + void XUnmapWindow(Display *d, Window w) } - declare 76 win { - void XWindowEvent (Display* d, Window w, long l, XEvent* x) + void XWindowEvent(Display *d, Window w, long l, XEvent *x) } - declare 77 win { - void XDestroyIC (XIC x) + void XDestroyIC(XIC x) } - declare 78 win { - Bool XFilterEvent (XEvent* x, Window w) + Bool XFilterEvent(XEvent *x, Window w) } - declare 79 win { - int XmbLookupString (XIC xi, XKeyPressedEvent* xk, \ - char* c, int i, KeySym* k, Status* s) + int XmbLookupString(XIC xi, XKeyPressedEvent *xk, char *c, int i, + KeySym *k, Status *s) } - declare 80 win { - void TkPutImage (unsigned long *colors, \ - int ncolors, Display* display, Drawable d, \ - GC gc, XImage* image, int src_x, int src_y, \ - int dest_x, int dest_y, unsigned int width, \ - unsigned int height) + void TkPutImage(unsigned long *colors, int ncolors, Display *display, + Drawable d, GC gc, XImage *image, int src_x, int src_y, + int dest_x, int dest_y, unsigned int width, unsigned int height) } # This slot is reserved for use by the clipping rectangle patch: # declare 81 win { -# XSetClipRectangles(Display *display, GC gc, int clip_x_origin, \ +# XSetClipRectangles(Display *display, GC gc, int clip_x_origin, # int clip_y_origin, XRectangle rectangles[], int n, int ordering) # } declare 82 win { - Status XParseColor (Display *display, Colormap map, \ - _Xconst char* spec, XColor *colorPtr) + Status XParseColor(Display *display, Colormap map, + _Xconst char *spec, XColor *colorPtr) } - declare 83 win { - GC XCreateGC(Display* display, Drawable d, \ - unsigned long valuemask, XGCValues* values) + GC XCreateGC(Display *display, Drawable d, + unsigned long valuemask, XGCValues *values) } - declare 84 win { - void XFreeGC(Display* display, GC gc) + void XFreeGC(Display *display, GC gc) } - declare 85 win { - Atom XInternAtom(Display* display,_Xconst char* atom_name, \ + Atom XInternAtom(Display *display, _Xconst char *atom_name, Bool only_if_exists) } - declare 86 win { - void XSetBackground(Display* display, GC gc, \ - unsigned long foreground) + void XSetBackground(Display *display, GC gc, unsigned long foreground) } - declare 87 win { - void XSetForeground(Display* display, GC gc, \ - unsigned long foreground) + void XSetForeground(Display *display, GC gc, unsigned long foreground) } - declare 88 win { - void XSetClipMask(Display* display, GC gc, Pixmap pixmap) + void XSetClipMask(Display *display, GC gc, Pixmap pixmap) } - declare 89 win { - void XSetClipOrigin(Display* display, GC gc, \ + void XSetClipOrigin(Display *display, GC gc, int clip_x_origin, int clip_y_origin) } - declare 90 win { - void XSetTSOrigin(Display* display, GC gc, \ + void XSetTSOrigin(Display *display, GC gc, int ts_x_origin, int ts_y_origin) } - declare 91 win { - void XChangeGC(Display * d, GC gc, unsigned long mask, XGCValues *values) + void XChangeGC(Display *d, GC gc, unsigned long mask, XGCValues *values) } - declare 92 win { void XSetFont(Display *display, GC gc, Font font) } - declare 93 win { void XSetArcMode(Display *display, GC gc, int arc_mode) } - declare 94 win { void XSetStipple(Display *display, GC gc, Pixmap stipple) } - declare 95 win { void XSetFillRule(Display *display, GC gc, int fill_rule) } - declare 96 win { void XSetFillStyle(Display *display, GC gc, int fill_style) } - declare 97 win { void XSetFunction(Display *display, GC gc, int function) } - declare 98 win { - void XSetLineAttributes(Display *display, GC gc, \ - unsigned int line_width, int line_style, \ - int cap_style, int join_style) + void XSetLineAttributes(Display *display, GC gc, unsigned int line_width, + int line_style, int cap_style, int join_style) } - declare 99 win { int _XInitImageFuncPtrs(XImage *image) } - declare 100 win { XIC XCreateIC(void) } - declare 101 win { - XVisualInfo *XGetVisualInfo(Display* display, long vinfo_mask, \ - XVisualInfo* vinfo_template, int* nitems_return) + XVisualInfo *XGetVisualInfo(Display *display, long vinfo_mask, + XVisualInfo *vinfo_template, int *nitems_return) } - declare 102 win { - void XSetWMClientMachine(Display* display, Window w, XTextProperty* text_prop) + void XSetWMClientMachine(Display *display, Window w, + XTextProperty *text_prop) } - declare 103 win { - Status XStringListToTextProperty(char** list, int count, \ - XTextProperty* text_prop_return) + Status XStringListToTextProperty(char **list, int count, + XTextProperty *text_prop_return) } declare 104 win { - void XDrawLine (Display* d, Drawable dr, GC g, int x1, int y1, \ + void XDrawLine(Display *d, Drawable dr, GC g, int x1, int y1, int x2, int y2) } declare 106 win { - void XFillRectangle (Display* display, Drawable d, GC gc, \ + void XFillRectangle(Display *display, Drawable d, GC gc, int x, int y, unsigned int width, unsigned int height) } declare 105 win { - void XWarpPointer (Display* d, Window s, Window dw, int sx, int sy, \ + void XWarpPointer(Display *d, Window s, Window dw, int sx, int sy, unsigned int sw, unsigned int sh, int dx, int dy) } +################################ # X functions for Mac and Aqua declare 0 {mac aqua} { - void XSetDashes (Display* display, GC gc, int dash_offset, - _Xconst char* dash_list, int n) + void XSetDashes(Display *display, GC gc, int dash_offset, + _Xconst char *dash_list, int n) } - declare 1 {mac aqua} { - XModifierKeymap* XGetModifierMapping (Display* d) + XModifierKeymap *XGetModifierMapping(Display *d) } - declare 2 {mac aqua} { - XImage * XCreateImage (Display* d, Visual* v, unsigned int ui1, int i1, \ - int i2, char* cp, unsigned int ui2, unsigned int ui3, int i3, \ + XImage *XCreateImage(Display *d, Visual *v, unsigned int ui1, int i1, + int i2, char *cp, unsigned int ui2, unsigned int ui3, int i3, int i4) - } - declare 3 {mac aqua} { - XImage *XGetImage (Display* d, Drawable dr, int i1, int i2, \ + XImage *XGetImage(Display *d, Drawable dr, int i1, int i2, unsigned int ui1, unsigned int ui2, unsigned long ul, int i3) } - declare 4 {mac aqua} { - char *XGetAtomName (Display* d,Atom a) - + char *XGetAtomName(Display *d, Atom a) } - declare 5 {mac aqua} { - char *XKeysymToString (KeySym k) + char *XKeysymToString(KeySym k) } - declare 6 {mac aqua} { - Colormap XCreateColormap (Display* d, Window w, Visual* v, int i) - + Colormap XCreateColormap(Display *d, Window w, Visual *v, int i) } - declare 7 {mac aqua} { - GContext XGContextFromGC (GC g) + GContext XGContextFromGC(GC g) } - declare 8 {mac aqua} { - KeySym XKeycodeToKeysym (Display* d, KeyCode k, int i) + KeySym XKeycodeToKeysym(Display *d, KeyCode k, int i) } - declare 9 {mac aqua} { - KeySym XStringToKeysym (_Xconst char* c) + KeySym XStringToKeysym(_Xconst char *c) } - declare 10 {mac aqua} { - Window XRootWindow (Display* d, int i) + Window XRootWindow(Display *d, int i) } - declare 11 {mac aqua} { - XErrorHandler XSetErrorHandler (XErrorHandler x) + XErrorHandler XSetErrorHandler(XErrorHandler x) } - declare 12 {mac aqua} { - Status XAllocColor (Display* d, Colormap c, XColor* xp) + Status XAllocColor(Display *d, Colormap c, XColor *xp) } - declare 13 {mac aqua} { - void XBell (Display* d, int i) + void XBell(Display *d, int i) } - declare 14 {mac aqua} { - void XChangeProperty (Display* d, Window w, Atom a1, Atom a2, int i1, \ - int i2, _Xconst unsigned char* c, int i3) + void XChangeProperty(Display *d, Window w, Atom a1, Atom a2, int i1, + int i2, _Xconst unsigned char *c, int i3) } - declare 15 {mac aqua} { - void XChangeWindowAttributes (Display* d, Window w, unsigned long ul, \ - XSetWindowAttributes* x) + void XChangeWindowAttributes(Display *d, Window w, unsigned long ul, + XSetWindowAttributes *x) } - declare 16 {mac aqua} { - void XConfigureWindow (Display* d, Window w, unsigned int i, \ - XWindowChanges* x) + void XConfigureWindow(Display *d, Window w, unsigned int i, + XWindowChanges *x) } - declare 17 {mac aqua} { - void XCopyArea (Display* d, Drawable dr1, Drawable dr2, GC g, int i1, \ - int i2, unsigned int ui1, \ - unsigned int ui2, int i3, int i4) + void XCopyArea(Display *d, Drawable dr1, Drawable dr2, GC g, int i1, + int i2, unsigned int ui1, unsigned int ui2, int i3, int i4) } - declare 18 {mac aqua} { - void XCopyPlane (Display* d, Drawable dr1, Drawable dr2, GC g, int i1, \ - int i2, unsigned int ui1, \ + void XCopyPlane(Display *d, Drawable dr1, Drawable dr2, GC g, int i1, + int i2, unsigned int ui1, unsigned int ui2, int i3, int i4, unsigned long ul) } - declare 19 {mac aqua} { - Pixmap XCreateBitmapFromData(Display* display, Drawable d, \ - _Xconst char* data, unsigned int width,unsigned int height) + Pixmap XCreateBitmapFromData(Display *display, Drawable d, + _Xconst char *data, unsigned int width, unsigned int height) } - declare 20 {mac aqua} { - void XDefineCursor (Display* d, Window w, Cursor c) + void XDefineCursor(Display *d, Window w, Cursor c) } - declare 21 {mac aqua} { - void XDestroyWindow (Display* d, Window w) + void XDestroyWindow(Display *d, Window w) } - declare 22 {mac aqua} { - void XDrawArc (Display* d, Drawable dr, GC g, int i1, int i2, \ + void XDrawArc(Display *d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4) } - declare 23 {mac aqua} { - void XDrawLines (Display* d, Drawable dr, GC g, XPoint* x, int i1, int i2) + void XDrawLines(Display *d, Drawable dr, GC g, XPoint *x, int i1, int i2) } - declare 24 {mac aqua} { - void XDrawRectangle (Display* d, Drawable dr, GC g, int i1, int i2,\ + void XDrawRectangle(Display *d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2) } - declare 25 {mac aqua} { - void XFillArc (Display* d, Drawable dr, GC g, int i1, int i2, \ + void XFillArc(Display *d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4) } - declare 26 {mac aqua} { - void XFillPolygon (Display* d, Drawable dr, GC g, XPoint* x, \ + void XFillPolygon(Display *d, Drawable dr, GC g, XPoint *x, int i1, int i2, int i3) } - declare 27 {mac aqua} { - void XFillRectangles (Display* d, Drawable dr, GC g, XRectangle* x, int i) + void XFillRectangles(Display *d, Drawable dr, GC g, XRectangle *x, int i) } - declare 28 {mac aqua} { - void XFreeColormap (Display* d, Colormap c) + void XFreeColormap(Display *d, Colormap c) } - declare 29 {mac aqua} { - void XFreeColors (Display* d, Colormap c, \ - unsigned long* ulp, int i, unsigned long ul) + void XFreeColors(Display *d, Colormap c, + unsigned long *ulp, int i, unsigned long ul) } - declare 30 {mac aqua} { - void XFreeModifiermap (XModifierKeymap* x) + void XFreeModifiermap(XModifierKeymap *x) } - declare 31 {mac aqua} { - Status XGetGeometry (Display* d, Drawable dr, Window* w, int* i1, \ - int* i2, unsigned int* ui1, unsigned int* ui2, unsigned int* ui3, \ - unsigned int* ui4) + Status XGetGeometry(Display *d, Drawable dr, Window *w, int *i1, + int *i2, unsigned int *ui1, unsigned int *ui2, unsigned int *ui3, + unsigned int *ui4) } - declare 32 {mac aqua} { - int XGetWindowProperty (Display* d, Window w, Atom a1, long l1, long l2, \ - Bool b, Atom a2, Atom* ap, int* ip, unsigned long* ulp1, \ - unsigned long* ulp2, unsigned char** cpp) + int XGetWindowProperty(Display *d, Window w, Atom a1, long l1, long l2, + Bool b, Atom a2, Atom *ap, int *ip, unsigned long *ulp1, + unsigned long *ulp2, unsigned char **cpp) } - declare 33 {mac aqua} { - int XGrabKeyboard (Display* d, Window w, Bool b, int i1, int i2, Time t) + int XGrabKeyboard(Display *d, Window w, Bool b, int i1, int i2, Time t) } - declare 34 {mac aqua} { - int XGrabPointer (Display* d, Window w1, Bool b, unsigned int ui, \ + int XGrabPointer(Display *d, Window w1, Bool b, unsigned int ui, int i1, int i2, Window w2, Cursor c, Time t) } - declare 35 {mac aqua} { - KeyCode XKeysymToKeycode (Display* d, KeySym k) + KeyCode XKeysymToKeycode(Display *d, KeySym k) } - declare 36 {mac aqua} { - void XMapWindow (Display* d, Window w) + void XMapWindow(Display *d, Window w) } - declare 37 {mac aqua} { - void XMoveResizeWindow (Display* d, Window w, int i1, int i2, \ + void XMoveResizeWindow(Display *d, Window w, int i1, int i2, unsigned int ui1, unsigned int ui2) } - declare 38 {mac aqua} { - void XMoveWindow (Display* d, Window w, int i1, int i2) + void XMoveWindow(Display *d, Window w, int i1, int i2) } - declare 39 {mac aqua} { - Bool XQueryPointer (Display* d, Window w1, Window* w2, Window* w3, \ - int* i1, int* i2, int* i3, int* i4, unsigned int* ui) + Bool XQueryPointer(Display *d, Window w1, Window *w2, Window *w3, + int *i1, int *i2, int *i3, int *i4, unsigned int *ui) } - declare 40 {mac aqua} { - void XRaiseWindow (Display* d, Window w) + void XRaiseWindow(Display *d, Window w) } - declare 41 {mac aqua} { - void XRefreshKeyboardMapping (XMappingEvent* x) + void XRefreshKeyboardMapping(XMappingEvent *x) } - declare 42 {mac aqua} { - void XResizeWindow (Display* d, Window w, unsigned int ui1, \ + void XResizeWindow(Display *d, Window w, unsigned int ui1, unsigned int ui2) } - declare 43 {mac aqua} { - void XSelectInput (Display* d, Window w, long l) + void XSelectInput(Display *d, Window w, long l) } - declare 44 {mac aqua} { - Status XSendEvent (Display* d, Window w, Bool b, long l, XEvent* x) + Status XSendEvent(Display *d, Window w, Bool b, long l, XEvent *x) } - declare 45 {mac aqua} { - void XSetIconName (Display* d, Window w, _Xconst char* c) + void XSetIconName(Display *d, Window w, _Xconst char *c) } - declare 46 {mac aqua} { - void XSetInputFocus (Display* d, Window w, int i, Time t) + void XSetInputFocus(Display *d, Window w, int i, Time t) } - declare 47 {mac aqua} { - void XSetSelectionOwner (Display* d, Atom a, Window w, Time t) + void XSetSelectionOwner(Display *d, Atom a, Window w, Time t) } - declare 48 {mac aqua} { - void XSetWindowBackground (Display* d, Window w, unsigned long ul) + void XSetWindowBackground(Display *d, Window w, unsigned long ul) } - declare 49 {mac aqua} { - void XSetWindowBackgroundPixmap (Display* d, Window w, Pixmap p) + void XSetWindowBackgroundPixmap(Display *d, Window w, Pixmap p) } - declare 50 {mac aqua} { - void XSetWindowBorder (Display* d, Window w, unsigned long ul) + void XSetWindowBorder(Display *d, Window w, unsigned long ul) } - declare 51 {mac aqua} { - void XSetWindowBorderPixmap (Display* d, Window w, Pixmap p) + void XSetWindowBorderPixmap(Display *d, Window w, Pixmap p) } - declare 52 {mac aqua} { - void XSetWindowBorderWidth (Display* d, Window w, unsigned int ui) + void XSetWindowBorderWidth(Display *d, Window w, unsigned int ui) } - declare 53 {mac aqua} { - void XSetWindowColormap (Display* d, Window w, Colormap c) + void XSetWindowColormap(Display *d, Window w, Colormap c) } - declare 54 {mac aqua} { - void XUngrabKeyboard (Display* d, Time t) + void XUngrabKeyboard(Display *d, Time t) } - declare 55 {mac aqua} { - void XUngrabPointer (Display* d, Time t) + void XUngrabPointer(Display *d, Time t) } - declare 56 {mac aqua} { - void XUnmapWindow (Display* d, Window w) + void XUnmapWindow(Display *d, Window w) } - declare 57 {mac aqua} { - void TkPutImage (unsigned long *colors, \ - int ncolors, Display* display, Drawable d, \ - GC gc, XImage* image, int src_x, int src_y, \ - int dest_x, int dest_y, unsigned int width, \ - unsigned int height) -} + void TkPutImage(unsigned long *colors, int ncolors, Display *display, + Drawable d, GC gc, XImage *image, int src_x, int src_y, + int dest_x, int dest_y, unsigned int width, unsigned int height) +} declare 58 {mac aqua} { - Status XParseColor (Display *display, Colormap map, \ - _Xconst char* spec, XColor *colorPtr) + Status XParseColor(Display *display, Colormap map, + _Xconst char *spec, XColor *colorPtr) } - declare 59 {mac aqua} { - GC XCreateGC(Display* display, Drawable d, \ - unsigned long valuemask, XGCValues* values) + GC XCreateGC(Display *display, Drawable d, + unsigned long valuemask, XGCValues *values) } - declare 60 {mac aqua} { - void XFreeGC(Display* display, GC gc) + void XFreeGC(Display *display, GC gc) } - declare 61 {mac aqua} { - Atom XInternAtom(Display* display,_Xconst char* atom_name, \ + Atom XInternAtom(Display *display, _Xconst char *atom_name, Bool only_if_exists) } - declare 62 {mac aqua} { - void XSetBackground(Display* display, GC gc, \ - unsigned long foreground) + void XSetBackground(Display *display, GC gc, unsigned long foreground) } - declare 63 {mac aqua} { - void XSetForeground(Display* display, GC gc, \ - unsigned long foreground) + void XSetForeground(Display *display, GC gc, unsigned long foreground) } - declare 64 {mac aqua} { - void XSetClipMask(Display* display, GC gc, Pixmap pixmap) + void XSetClipMask(Display *display, GC gc, Pixmap pixmap) } - declare 65 {mac aqua} { - void XSetClipOrigin(Display* display, GC gc, \ + void XSetClipOrigin(Display *display, GC gc, int clip_x_origin, int clip_y_origin) } - declare 66 {mac aqua} { - void XSetTSOrigin(Display* display, GC gc, \ + void XSetTSOrigin(Display *display, GC gc, int ts_x_origin, int ts_y_origin) } - declare 67 {mac aqua} { - void XChangeGC(Display * d, GC gc, unsigned long mask, XGCValues *values) + void XChangeGC(Display *d, GC gc, unsigned long mask, XGCValues *values) } - declare 68 {mac aqua} { void XSetFont(Display *display, GC gc, Font font) } - declare 69 {mac aqua} { void XSetArcMode(Display *display, GC gc, int arc_mode) } - declare 70 {mac aqua} { void XSetStipple(Display *display, GC gc, Pixmap stipple) } - declare 71 {mac aqua} { void XSetFillRule(Display *display, GC gc, int fill_rule) } - declare 72 {mac aqua} { void XSetFillStyle(Display *display, GC gc, int fill_style) } - declare 73 {mac aqua} { void XSetFunction(Display *display, GC gc, int function) } - declare 74 {mac aqua} { - void XSetLineAttributes(Display *display, GC gc, \ - unsigned int line_width, int line_style, \ + void XSetLineAttributes(Display *display, GC gc, + unsigned int line_width, int line_style, int cap_style, int join_style) } - declare 75 {mac aqua} { int _XInitImageFuncPtrs(XImage *image) } - declare 76 {mac aqua} { XIC XCreateIC(void) } - declare 77 {mac aqua} { - XVisualInfo *XGetVisualInfo(Display* display, long vinfo_mask, \ - XVisualInfo* vinfo_template, int* nitems_return) + XVisualInfo *XGetVisualInfo(Display *display, long vinfo_mask, + XVisualInfo *vinfo_template, int *nitems_return) } - declare 78 {mac aqua} { - void XSetWMClientMachine(Display* display, Window w, \ - XTextProperty* text_prop) + void XSetWMClientMachine(Display *display, Window w, + XTextProperty *text_prop) } - declare 79 {mac aqua} { - Status XStringListToTextProperty(char** list, int count, \ - XTextProperty* text_prop_return) + Status XStringListToTextProperty(char **list, int count, + XTextProperty *text_prop_return) } declare 80 {mac aqua} { - void XDrawSegments(Display *display, Drawable d, GC gc, \ - XSegment *segments, int nsegments) + void XDrawSegments(Display *display, Drawable d, GC gc, + XSegment *segments, int nsegments) } declare 81 {mac aqua} { - void XForceScreenSaver(Display* display, int mode) + void XForceScreenSaver(Display *display, int mode) } declare 82 {mac aqua} { - void XDrawLine (Display* d, Drawable dr, GC g, int x1, int y1, \ + void XDrawLine(Display *d, Drawable dr, GC g, int x1, int y1, int x2, int y2) } declare 83 {mac aqua} { - void XFillRectangle (Display* display, Drawable d, GC gc, \ + void XFillRectangle(Display *display, Drawable d, GC gc, int x, int y, unsigned int width, unsigned int height) } declare 84 {mac aqua} { - void XClearWindow (Display* d, Window w) + void XClearWindow(Display *d, Window w) } - declare 85 {mac aqua} { - void XDrawPoint (Display* display, Drawable d, GC gc, int x, int y) + void XDrawPoint(Display *display, Drawable d, GC gc, int x, int y) } - declare 86 {mac aqua} { - void XDrawPoints (Display* display, Drawable d, GC gc, XPoint *points, \ + void XDrawPoints(Display *display, Drawable d, GC gc, XPoint *points, int npoints, int mode) } - declare 87 {mac aqua} { - void XWarpPointer (Display* display, Window src_w, Window dest_w, \ - int src_x, int src_y, unsigned int src_width, \ + void XWarpPointer(Display *display, Window src_w, Window dest_w, + int src_x, int src_y, unsigned int src_width, unsigned int src_height, int dest_x, int dest_y) } - declare 88 {mac aqua} { - void XQueryColor (Display *display, Colormap colormap, XColor *def_in_out) + void XQueryColor(Display *display, Colormap colormap, XColor *def_in_out) } - declare 89 {mac aqua} { - void XQueryColors (Display *display, Colormap colormap, \ + void XQueryColors(Display *display, Colormap colormap, XColor *defs_in_out, int ncolors) } - declare 90 {mac aqua} { - Status XQueryTree (Display* d, Window w1, Window* w2, Window* w3, \ - Window** w4, unsigned int* ui) + Status XQueryTree(Display *d, Window w1, Window *w2, Window *w3, + Window **w4, unsigned int *ui) } -declare 91 {aqua} { +declare 91 aqua { int XSync(Display *display, Bool flag) } + +# Local Variables: +# mode: tcl +# End: diff --git a/generic/tkIntDecls.h b/generic/tkIntDecls.h index e7f2472..280e6c8 100644 --- a/generic/tkIntDecls.h +++ b/generic/tkIntDecls.h @@ -143,7 +143,7 @@ EXTERN CONST84_RETURN char * TkGetDefaultScreenName _ANSI_ARGS_(( EXTERN TkDisplay * TkGetDisplay _ANSI_ARGS_((Display *display)); /* 35 */ EXTERN int TkGetDisplayOf _ANSI_ARGS_((Tcl_Interp *interp, - int objc, Tcl_Obj *CONST objv[], + int objc, Tcl_Obj * CONST objv[], Tk_Window *tkwinPtr)); /* 36 */ EXTERN TkWindow * TkGetFocusWin _ANSI_ARGS_((TkWindow *winPtr)); @@ -266,12 +266,12 @@ EXTERN int TkpWindowWasRecentlyDeleted _ANSI_ARGS_((Window win, EXTERN void TkQueueEventForAllChildren _ANSI_ARGS_(( TkWindow *winPtr, XEvent *eventPtr)); /* 78 */ -EXTERN int TkReadBitmapFile _ANSI_ARGS_((Display*display, - Drawable d, CONST char*filename, - unsigned int*width_return, - unsigned int*height_return, - Pixmap*bitmap_return, int*x_hot_return, - int*y_hot_return)); +EXTERN int TkReadBitmapFile _ANSI_ARGS_((Display *display, + Drawable d, CONST char *filename, + unsigned int *width_return, + unsigned int *height_return, + Pixmap *bitmap_return, int *x_hot_return, + int *y_hot_return)); /* 79 */ EXTERN int TkScrollWindow _ANSI_ARGS_((Tk_Window tkwin, GC gc, int x, int y, int width, int height, int dx, @@ -365,17 +365,17 @@ EXTERN void TkpMenuThreadInit _ANSI_ARGS_((void)); #ifdef __WIN32__ /* 113 */ EXTERN void TkClipBox _ANSI_ARGS_((TkRegion rgn, - XRectangle*rect_return)); + XRectangle *rect_return)); #endif /* __WIN32__ */ #ifdef MAC_TCL /* 113 */ EXTERN void TkClipBox _ANSI_ARGS_((TkRegion rgn, - XRectangle*rect_return)); + XRectangle *rect_return)); #endif /* MAC_TCL */ #ifdef MAC_OSX_TK /* 113 */ EXTERN void TkClipBox _ANSI_ARGS_((TkRegion rgn, - XRectangle*rect_return)); + XRectangle *rect_return)); #endif /* MAC_OSX_TK */ #ifdef __WIN32__ /* 114 */ @@ -436,32 +436,32 @@ EXTERN int TkRectInRegion _ANSI_ARGS_((TkRegion rgn, int x, #endif /* MAC_OSX_TK */ #ifdef __WIN32__ /* 118 */ -EXTERN void TkSetRegion _ANSI_ARGS_((Display*display, GC gc, +EXTERN void TkSetRegion _ANSI_ARGS_((Display *display, GC gc, TkRegion rgn)); #endif /* __WIN32__ */ #ifdef MAC_TCL /* 118 */ -EXTERN void TkSetRegion _ANSI_ARGS_((Display*display, GC gc, +EXTERN void TkSetRegion _ANSI_ARGS_((Display *display, GC gc, TkRegion rgn)); #endif /* MAC_TCL */ #ifdef MAC_OSX_TK /* 118 */ -EXTERN void TkSetRegion _ANSI_ARGS_((Display*display, GC gc, +EXTERN void TkSetRegion _ANSI_ARGS_((Display *display, GC gc, TkRegion rgn)); #endif /* MAC_OSX_TK */ #ifdef __WIN32__ /* 119 */ -EXTERN void TkUnionRectWithRegion _ANSI_ARGS_((XRectangle*rect, +EXTERN void TkUnionRectWithRegion _ANSI_ARGS_((XRectangle *rect, TkRegion src, TkRegion dr_return)); #endif /* __WIN32__ */ #ifdef MAC_TCL /* 119 */ -EXTERN void TkUnionRectWithRegion _ANSI_ARGS_((XRectangle*rect, +EXTERN void TkUnionRectWithRegion _ANSI_ARGS_((XRectangle *rect, TkRegion src, TkRegion dr_return)); #endif /* MAC_TCL */ #ifdef MAC_OSX_TK /* 119 */ -EXTERN void TkUnionRectWithRegion _ANSI_ARGS_((XRectangle*rect, +EXTERN void TkUnionRectWithRegion _ANSI_ARGS_((XRectangle *rect, TkRegion src, TkRegion dr_return)); #endif /* MAC_OSX_TK */ /* Slot 120 is reserved */ @@ -602,7 +602,7 @@ typedef struct TkIntStubs { TkCursor * (*tkGetCursorByName) _ANSI_ARGS_((Tcl_Interp *interp, Tk_Window tkwin, Tk_Uid string)); /* 32 */ CONST84_RETURN char * (*tkGetDefaultScreenName) _ANSI_ARGS_((Tcl_Interp *interp, CONST char *screenName)); /* 33 */ TkDisplay * (*tkGetDisplay) _ANSI_ARGS_((Display *display)); /* 34 */ - int (*tkGetDisplayOf) _ANSI_ARGS_((Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[], Tk_Window *tkwinPtr)); /* 35 */ + int (*tkGetDisplayOf) _ANSI_ARGS_((Tcl_Interp *interp, int objc, Tcl_Obj * CONST objv[], Tk_Window *tkwinPtr)); /* 35 */ TkWindow * (*tkGetFocusWin) _ANSI_ARGS_((TkWindow *winPtr)); /* 36 */ int (*tkGetInterpNames) _ANSI_ARGS_((Tcl_Interp *interp, Tk_Window tkwin)); /* 37 */ int (*tkGetMiterPoints) _ANSI_ARGS_((double p1[], double p2[], double p3[], double width, double m1[], double m2[])); /* 38 */ @@ -645,7 +645,7 @@ typedef struct TkIntStubs { int (*tkpUseWindow) _ANSI_ARGS_((Tcl_Interp *interp, Tk_Window tkwin, CONST char *string)); /* 75 */ int (*tkpWindowWasRecentlyDeleted) _ANSI_ARGS_((Window win, TkDisplay *dispPtr)); /* 76 */ void (*tkQueueEventForAllChildren) _ANSI_ARGS_((TkWindow *winPtr, XEvent *eventPtr)); /* 77 */ - int (*tkReadBitmapFile) _ANSI_ARGS_((Display*display, Drawable d, CONST char*filename, unsigned int*width_return, unsigned int*height_return, Pixmap*bitmap_return, int*x_hot_return, int*y_hot_return)); /* 78 */ + int (*tkReadBitmapFile) _ANSI_ARGS_((Display *display, Drawable d, CONST char *filename, unsigned int *width_return, unsigned int *height_return, Pixmap *bitmap_return, int *x_hot_return, int *y_hot_return)); /* 78 */ int (*tkScrollWindow) _ANSI_ARGS_((Tk_Window tkwin, GC gc, int x, int y, int width, int height, int dx, int dy, TkRegion damageRgn)); /* 79 */ void (*tkSelDeadWindow) _ANSI_ARGS_((TkWindow *winPtr)); /* 80 */ void (*tkSelEventProc) _ANSI_ARGS_((Tk_Window tkwin, XEvent *eventPtr)); /* 81 */ @@ -684,13 +684,13 @@ typedef struct TkIntStubs { VOID *reserved113; #endif /* UNIX */ #ifdef __WIN32__ - void (*tkClipBox) _ANSI_ARGS_((TkRegion rgn, XRectangle*rect_return)); /* 113 */ + void (*tkClipBox) _ANSI_ARGS_((TkRegion rgn, XRectangle *rect_return)); /* 113 */ #endif /* __WIN32__ */ #ifdef MAC_TCL - void (*tkClipBox) _ANSI_ARGS_((TkRegion rgn, XRectangle*rect_return)); /* 113 */ + void (*tkClipBox) _ANSI_ARGS_((TkRegion rgn, XRectangle *rect_return)); /* 113 */ #endif /* MAC_TCL */ #ifdef MAC_OSX_TK - void (*tkClipBox) _ANSI_ARGS_((TkRegion rgn, XRectangle*rect_return)); /* 113 */ + void (*tkClipBox) _ANSI_ARGS_((TkRegion rgn, XRectangle *rect_return)); /* 113 */ #endif /* MAC_OSX_TK */ #if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */ VOID *reserved114; @@ -744,25 +744,25 @@ typedef struct TkIntStubs { VOID *reserved118; #endif /* UNIX */ #ifdef __WIN32__ - void (*tkSetRegion) _ANSI_ARGS_((Display*display, GC gc, TkRegion rgn)); /* 118 */ + void (*tkSetRegion) _ANSI_ARGS_((Display *display, GC gc, TkRegion rgn)); /* 118 */ #endif /* __WIN32__ */ #ifdef MAC_TCL - void (*tkSetRegion) _ANSI_ARGS_((Display*display, GC gc, TkRegion rgn)); /* 118 */ + void (*tkSetRegion) _ANSI_ARGS_((Display *display, GC gc, TkRegion rgn)); /* 118 */ #endif /* MAC_TCL */ #ifdef MAC_OSX_TK - void (*tkSetRegion) _ANSI_ARGS_((Display*display, GC gc, TkRegion rgn)); /* 118 */ + void (*tkSetRegion) _ANSI_ARGS_((Display *display, GC gc, TkRegion rgn)); /* 118 */ #endif /* MAC_OSX_TK */ #if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */ VOID *reserved119; #endif /* UNIX */ #ifdef __WIN32__ - void (*tkUnionRectWithRegion) _ANSI_ARGS_((XRectangle*rect, TkRegion src, TkRegion dr_return)); /* 119 */ + void (*tkUnionRectWithRegion) _ANSI_ARGS_((XRectangle *rect, TkRegion src, TkRegion dr_return)); /* 119 */ #endif /* __WIN32__ */ #ifdef MAC_TCL - void (*tkUnionRectWithRegion) _ANSI_ARGS_((XRectangle*rect, TkRegion src, TkRegion dr_return)); /* 119 */ + void (*tkUnionRectWithRegion) _ANSI_ARGS_((XRectangle *rect, TkRegion src, TkRegion dr_return)); /* 119 */ #endif /* MAC_TCL */ #ifdef MAC_OSX_TK - void (*tkUnionRectWithRegion) _ANSI_ARGS_((XRectangle*rect, TkRegion src, TkRegion dr_return)); /* 119 */ + void (*tkUnionRectWithRegion) _ANSI_ARGS_((XRectangle *rect, TkRegion src, TkRegion dr_return)); /* 119 */ #endif /* MAC_OSX_TK */ VOID *reserved120; #if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */ diff --git a/generic/tkIntPlatDecls.h b/generic/tkIntPlatDecls.h index 9c04bc0..b59ab19 100644 --- a/generic/tkIntPlatDecls.h +++ b/generic/tkIntPlatDecls.h @@ -74,7 +74,7 @@ EXTERN COLORREF TkWinGetBorderPixels _ANSI_ARGS_((Tk_Window tkwin, Tk_3DBorder border, int which)); /* 16 */ EXTERN HDC TkWinGetDrawableDC _ANSI_ARGS_((Display *display, - Drawable d, TkWinDCState*state)); + Drawable d, TkWinDCState *state)); /* 17 */ EXTERN int TkWinGetModifierState _ANSI_ARGS_((void)); /* 18 */ @@ -89,7 +89,7 @@ EXTERN int TkWinHandleMenuEvent _ANSI_ARGS_((HWND *phwnd, EXTERN int TkWinIndexOfColor _ANSI_ARGS_((XColor *colorPtr)); /* 22 */ EXTERN void TkWinReleaseDrawableDC _ANSI_ARGS_((Drawable d, - HDC hdc, TkWinDCState*state)); + HDC hdc, TkWinDCState *state)); /* 23 */ EXTERN LRESULT TkWinResendEvent _ANSI_ARGS_((WNDPROC wndproc, HWND hwnd, XEvent *eventPtr)); @@ -440,13 +440,13 @@ typedef struct TkIntPlatStubs { LRESULT (*tkWinEmbeddedEventProc) _ANSI_ARGS_((HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)); /* 13 */ void (*tkWinFillRect) _ANSI_ARGS_((HDC dc, int x, int y, int width, int height, int pixel)); /* 14 */ COLORREF (*tkWinGetBorderPixels) _ANSI_ARGS_((Tk_Window tkwin, Tk_3DBorder border, int which)); /* 15 */ - HDC (*tkWinGetDrawableDC) _ANSI_ARGS_((Display *display, Drawable d, TkWinDCState*state)); /* 16 */ + HDC (*tkWinGetDrawableDC) _ANSI_ARGS_((Display *display, Drawable d, TkWinDCState *state)); /* 16 */ int (*tkWinGetModifierState) _ANSI_ARGS_((void)); /* 17 */ HPALETTE (*tkWinGetSystemPalette) _ANSI_ARGS_((void)); /* 18 */ HWND (*tkWinGetWrapperWindow) _ANSI_ARGS_((Tk_Window tkwin)); /* 19 */ int (*tkWinHandleMenuEvent) _ANSI_ARGS_((HWND *phwnd, UINT *pMessage, WPARAM *pwParam, LPARAM *plParam, LRESULT *plResult)); /* 20 */ int (*tkWinIndexOfColor) _ANSI_ARGS_((XColor *colorPtr)); /* 21 */ - void (*tkWinReleaseDrawableDC) _ANSI_ARGS_((Drawable d, HDC hdc, TkWinDCState*state)); /* 22 */ + void (*tkWinReleaseDrawableDC) _ANSI_ARGS_((Drawable d, HDC hdc, TkWinDCState *state)); /* 22 */ LRESULT (*tkWinResendEvent) _ANSI_ARGS_((WNDPROC wndproc, HWND hwnd, XEvent *eventPtr)); /* 23 */ HPALETTE (*tkWinSelectPalette) _ANSI_ARGS_((HDC dc, Colormap colormap)); /* 24 */ void (*tkWinSetMenu) _ANSI_ARGS_((Tk_Window tkwin, HMENU hMenu)); /* 25 */ diff --git a/generic/tkIntXlibDecls.h b/generic/tkIntXlibDecls.h index 3039404..77f6b4d 100644 --- a/generic/tkIntXlibDecls.h +++ b/generic/tkIntXlibDecls.h @@ -38,278 +38,279 @@ #ifdef __WIN32__ /* 0 */ -EXTERN void XSetDashes _ANSI_ARGS_((Display*display, GC gc, - int dash_offset, _Xconst char*dash_list, +EXTERN void XSetDashes _ANSI_ARGS_((Display *display, GC gc, + int dash_offset, _Xconst char *dash_list, int n)); /* 1 */ -EXTERN XModifierKeymap* XGetModifierMapping _ANSI_ARGS_((Display*d)); +EXTERN XModifierKeymap * XGetModifierMapping _ANSI_ARGS_((Display *d)); /* 2 */ -EXTERN XImage * XCreateImage _ANSI_ARGS_((Display*d, Visual*v, - unsigned int ui1, int i1, int i2, char*cp, +EXTERN XImage * XCreateImage _ANSI_ARGS_((Display *d, Visual *v, + unsigned int ui1, int i1, int i2, char *cp, unsigned int ui2, unsigned int ui3, int i3, int i4)); /* 3 */ -EXTERN XImage * XGetImage _ANSI_ARGS_((Display*d, Drawable dr, +EXTERN XImage * XGetImage _ANSI_ARGS_((Display *d, Drawable dr, int i1, int i2, unsigned int ui1, unsigned int ui2, unsigned long ul, int i3)); /* 4 */ -EXTERN char * XGetAtomName _ANSI_ARGS_((Display*d, Atom a)); +EXTERN char * XGetAtomName _ANSI_ARGS_((Display *d, Atom a)); /* 5 */ EXTERN char * XKeysymToString _ANSI_ARGS_((KeySym k)); /* 6 */ -EXTERN Colormap XCreateColormap _ANSI_ARGS_((Display*d, Window w, - Visual*v, int i)); +EXTERN Colormap XCreateColormap _ANSI_ARGS_((Display *d, Window w, + Visual *v, int i)); /* 7 */ -EXTERN Cursor XCreatePixmapCursor _ANSI_ARGS_((Display*d, - Pixmap p1, Pixmap p2, XColor*x1, XColor*x2, +EXTERN Cursor XCreatePixmapCursor _ANSI_ARGS_((Display *d, + Pixmap p1, Pixmap p2, XColor *x1, XColor *x2, unsigned int ui1, unsigned int ui2)); /* 8 */ -EXTERN Cursor XCreateGlyphCursor _ANSI_ARGS_((Display*d, Font f1, +EXTERN Cursor XCreateGlyphCursor _ANSI_ARGS_((Display *d, Font f1, Font f2, unsigned int ui1, unsigned int ui2, - XColor*x1, XColor*x2)); + XColor *x1, XColor *x2)); /* 9 */ EXTERN GContext XGContextFromGC _ANSI_ARGS_((GC g)); /* 10 */ -EXTERN XHostAddress * XListHosts _ANSI_ARGS_((Display*d, int*i, Bool*b)); +EXTERN XHostAddress * XListHosts _ANSI_ARGS_((Display *d, int *i, Bool *b)); /* 11 */ -EXTERN KeySym XKeycodeToKeysym _ANSI_ARGS_((Display*d, +EXTERN KeySym XKeycodeToKeysym _ANSI_ARGS_((Display *d, unsigned int k, int i)); /* 12 */ -EXTERN KeySym XStringToKeysym _ANSI_ARGS_((_Xconst char*c)); +EXTERN KeySym XStringToKeysym _ANSI_ARGS_((_Xconst char *c)); /* 13 */ -EXTERN Window XRootWindow _ANSI_ARGS_((Display*d, int i)); +EXTERN Window XRootWindow _ANSI_ARGS_((Display *d, int i)); /* 14 */ EXTERN XErrorHandler XSetErrorHandler _ANSI_ARGS_((XErrorHandler x)); /* 15 */ -EXTERN Status XIconifyWindow _ANSI_ARGS_((Display*d, Window w, +EXTERN Status XIconifyWindow _ANSI_ARGS_((Display *d, Window w, int i)); /* 16 */ -EXTERN Status XWithdrawWindow _ANSI_ARGS_((Display*d, Window w, +EXTERN Status XWithdrawWindow _ANSI_ARGS_((Display *d, Window w, int i)); /* 17 */ -EXTERN Status XGetWMColormapWindows _ANSI_ARGS_((Display*d, - Window w, Window**wpp, int*ip)); +EXTERN Status XGetWMColormapWindows _ANSI_ARGS_((Display *d, + Window w, Window **wpp, int *ip)); /* 18 */ -EXTERN Status XAllocColor _ANSI_ARGS_((Display*d, Colormap c, - XColor*xp)); +EXTERN Status XAllocColor _ANSI_ARGS_((Display *d, Colormap c, + XColor *xp)); /* 19 */ -EXTERN void XBell _ANSI_ARGS_((Display*d, int i)); +EXTERN void XBell _ANSI_ARGS_((Display *d, int i)); /* 20 */ -EXTERN void XChangeProperty _ANSI_ARGS_((Display*d, Window w, +EXTERN void XChangeProperty _ANSI_ARGS_((Display *d, Window w, Atom a1, Atom a2, int i1, int i2, - _Xconst unsigned char*c, int i3)); + _Xconst unsigned char *c, int i3)); /* 21 */ -EXTERN void XChangeWindowAttributes _ANSI_ARGS_((Display*d, +EXTERN void XChangeWindowAttributes _ANSI_ARGS_((Display *d, Window w, unsigned long ul, - XSetWindowAttributes*x)); + XSetWindowAttributes *x)); /* 22 */ -EXTERN void XClearWindow _ANSI_ARGS_((Display*d, Window w)); +EXTERN void XClearWindow _ANSI_ARGS_((Display *d, Window w)); /* 23 */ -EXTERN void XConfigureWindow _ANSI_ARGS_((Display*d, Window w, - unsigned int i, XWindowChanges*x)); +EXTERN void XConfigureWindow _ANSI_ARGS_((Display *d, Window w, + unsigned int i, XWindowChanges *x)); /* 24 */ -EXTERN void XCopyArea _ANSI_ARGS_((Display*d, Drawable dr1, +EXTERN void XCopyArea _ANSI_ARGS_((Display *d, Drawable dr1, Drawable dr2, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4)); /* 25 */ -EXTERN void XCopyPlane _ANSI_ARGS_((Display*d, Drawable dr1, +EXTERN void XCopyPlane _ANSI_ARGS_((Display *d, Drawable dr1, Drawable dr2, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4, unsigned long ul)); /* 26 */ -EXTERN Pixmap XCreateBitmapFromData _ANSI_ARGS_((Display*display, - Drawable d, _Xconst char*data, +EXTERN Pixmap XCreateBitmapFromData _ANSI_ARGS_((Display *display, + Drawable d, _Xconst char *data, unsigned int width, unsigned int height)); /* 27 */ -EXTERN void XDefineCursor _ANSI_ARGS_((Display*d, Window w, +EXTERN void XDefineCursor _ANSI_ARGS_((Display *d, Window w, Cursor c)); /* 28 */ -EXTERN void XDeleteProperty _ANSI_ARGS_((Display*d, Window w, +EXTERN void XDeleteProperty _ANSI_ARGS_((Display *d, Window w, Atom a)); /* 29 */ -EXTERN void XDestroyWindow _ANSI_ARGS_((Display*d, Window w)); +EXTERN void XDestroyWindow _ANSI_ARGS_((Display *d, Window w)); /* 30 */ -EXTERN void XDrawArc _ANSI_ARGS_((Display*d, Drawable dr, GC g, +EXTERN void XDrawArc _ANSI_ARGS_((Display *d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4)); /* 31 */ -EXTERN void XDrawLines _ANSI_ARGS_((Display*d, Drawable dr, GC g, - XPoint*x, int i1, int i2)); +EXTERN void XDrawLines _ANSI_ARGS_((Display *d, Drawable dr, + GC g, XPoint *x, int i1, int i2)); /* 32 */ -EXTERN void XDrawRectangle _ANSI_ARGS_((Display*d, Drawable dr, +EXTERN void XDrawRectangle _ANSI_ARGS_((Display *d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2)); /* 33 */ -EXTERN void XFillArc _ANSI_ARGS_((Display*d, Drawable dr, GC g, +EXTERN void XFillArc _ANSI_ARGS_((Display *d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4)); /* 34 */ -EXTERN void XFillPolygon _ANSI_ARGS_((Display*d, Drawable dr, - GC g, XPoint*x, int i1, int i2, int i3)); +EXTERN void XFillPolygon _ANSI_ARGS_((Display *d, Drawable dr, + GC g, XPoint *x, int i1, int i2, int i3)); /* 35 */ -EXTERN void XFillRectangles _ANSI_ARGS_((Display*d, Drawable dr, - GC g, XRectangle*x, int i)); +EXTERN void XFillRectangles _ANSI_ARGS_((Display *d, Drawable dr, + GC g, XRectangle *x, int i)); /* 36 */ -EXTERN void XForceScreenSaver _ANSI_ARGS_((Display*d, int i)); +EXTERN void XForceScreenSaver _ANSI_ARGS_((Display *d, int i)); /* 37 */ -EXTERN void XFreeColormap _ANSI_ARGS_((Display*d, Colormap c)); +EXTERN void XFreeColormap _ANSI_ARGS_((Display *d, Colormap c)); /* 38 */ -EXTERN void XFreeColors _ANSI_ARGS_((Display*d, Colormap c, - unsigned long*ulp, int i, unsigned long ul)); +EXTERN void XFreeColors _ANSI_ARGS_((Display *d, Colormap c, + unsigned long *ulp, int i, unsigned long ul)); /* 39 */ -EXTERN void XFreeCursor _ANSI_ARGS_((Display*d, Cursor c)); +EXTERN void XFreeCursor _ANSI_ARGS_((Display *d, Cursor c)); /* 40 */ -EXTERN void XFreeModifiermap _ANSI_ARGS_((XModifierKeymap*x)); +EXTERN void XFreeModifiermap _ANSI_ARGS_((XModifierKeymap *x)); /* 41 */ -EXTERN Status XGetGeometry _ANSI_ARGS_((Display*d, Drawable dr, - Window*w, int*i1, int*i2, unsigned int*ui1, - unsigned int*ui2, unsigned int*ui3, - unsigned int*ui4)); +EXTERN Status XGetGeometry _ANSI_ARGS_((Display *d, Drawable dr, + Window *w, int *i1, int *i2, + unsigned int *ui1, unsigned int *ui2, + unsigned int *ui3, unsigned int *ui4)); /* 42 */ -EXTERN void XGetInputFocus _ANSI_ARGS_((Display*d, Window*w, - int*i)); +EXTERN void XGetInputFocus _ANSI_ARGS_((Display *d, Window *w, + int *i)); /* 43 */ -EXTERN int XGetWindowProperty _ANSI_ARGS_((Display*d, Window w, +EXTERN int XGetWindowProperty _ANSI_ARGS_((Display *d, Window w, Atom a1, long l1, long l2, Bool b, Atom a2, - Atom*ap, int*ip, unsigned long*ulp1, - unsigned long*ulp2, unsigned char**cpp)); + Atom *ap, int *ip, unsigned long *ulp1, + unsigned long *ulp2, unsigned char **cpp)); /* 44 */ -EXTERN Status XGetWindowAttributes _ANSI_ARGS_((Display*d, - Window w, XWindowAttributes*x)); +EXTERN Status XGetWindowAttributes _ANSI_ARGS_((Display *d, + Window w, XWindowAttributes *x)); /* 45 */ -EXTERN int XGrabKeyboard _ANSI_ARGS_((Display*d, Window w, +EXTERN int XGrabKeyboard _ANSI_ARGS_((Display *d, Window w, Bool b, int i1, int i2, Time t)); /* 46 */ -EXTERN int XGrabPointer _ANSI_ARGS_((Display*d, Window w1, +EXTERN int XGrabPointer _ANSI_ARGS_((Display *d, Window w1, Bool b, unsigned int ui, int i1, int i2, Window w2, Cursor c, Time t)); /* 47 */ -EXTERN KeyCode XKeysymToKeycode _ANSI_ARGS_((Display*d, KeySym k)); +EXTERN KeyCode XKeysymToKeycode _ANSI_ARGS_((Display *d, KeySym k)); /* 48 */ -EXTERN Status XLookupColor _ANSI_ARGS_((Display*d, Colormap c1, - _Xconst char*c2, XColor*x1, XColor*x2)); +EXTERN Status XLookupColor _ANSI_ARGS_((Display *d, Colormap c1, + _Xconst char *c2, XColor *x1, XColor *x2)); /* 49 */ -EXTERN void XMapWindow _ANSI_ARGS_((Display*d, Window w)); +EXTERN void XMapWindow _ANSI_ARGS_((Display *d, Window w)); /* 50 */ -EXTERN void XMoveResizeWindow _ANSI_ARGS_((Display*d, Window w, +EXTERN void XMoveResizeWindow _ANSI_ARGS_((Display *d, Window w, int i1, int i2, unsigned int ui1, unsigned int ui2)); /* 51 */ -EXTERN void XMoveWindow _ANSI_ARGS_((Display*d, Window w, int i1, - int i2)); +EXTERN void XMoveWindow _ANSI_ARGS_((Display *d, Window w, + int i1, int i2)); /* 52 */ -EXTERN void XNextEvent _ANSI_ARGS_((Display*d, XEvent*x)); +EXTERN void XNextEvent _ANSI_ARGS_((Display *d, XEvent *x)); /* 53 */ -EXTERN void XPutBackEvent _ANSI_ARGS_((Display*d, XEvent*x)); +EXTERN void XPutBackEvent _ANSI_ARGS_((Display *d, XEvent *x)); /* 54 */ -EXTERN void XQueryColors _ANSI_ARGS_((Display*d, Colormap c, - XColor*x, int i)); +EXTERN void XQueryColors _ANSI_ARGS_((Display *d, Colormap c, + XColor *x, int i)); /* 55 */ -EXTERN Bool XQueryPointer _ANSI_ARGS_((Display*d, Window w1, - Window*w2, Window*w3, int*i1, int*i2, int*i3, - int*i4, unsigned int*ui)); +EXTERN Bool XQueryPointer _ANSI_ARGS_((Display *d, Window w1, + Window *w2, Window *w3, int *i1, int *i2, + int *i3, int *i4, unsigned int *ui)); /* 56 */ -EXTERN Status XQueryTree _ANSI_ARGS_((Display*d, Window w1, - Window*w2, Window*w3, Window**w4, - unsigned int*ui)); +EXTERN Status XQueryTree _ANSI_ARGS_((Display *d, Window w1, + Window *w2, Window *w3, Window **w4, + unsigned int *ui)); /* 57 */ -EXTERN void XRaiseWindow _ANSI_ARGS_((Display*d, Window w)); +EXTERN void XRaiseWindow _ANSI_ARGS_((Display *d, Window w)); /* 58 */ -EXTERN void XRefreshKeyboardMapping _ANSI_ARGS_((XMappingEvent*x)); +EXTERN void XRefreshKeyboardMapping _ANSI_ARGS_(( + XMappingEvent *x)); /* 59 */ -EXTERN void XResizeWindow _ANSI_ARGS_((Display*d, Window w, +EXTERN void XResizeWindow _ANSI_ARGS_((Display *d, Window w, unsigned int ui1, unsigned int ui2)); /* 60 */ -EXTERN void XSelectInput _ANSI_ARGS_((Display*d, Window w, +EXTERN void XSelectInput _ANSI_ARGS_((Display *d, Window w, long l)); /* 61 */ -EXTERN Status XSendEvent _ANSI_ARGS_((Display*d, Window w, Bool b, - long l, XEvent*x)); +EXTERN Status XSendEvent _ANSI_ARGS_((Display *d, Window w, Bool b, + long l, XEvent *x)); /* 62 */ -EXTERN void XSetCommand _ANSI_ARGS_((Display*d, Window w, - CONST char**c, int i)); +EXTERN void XSetCommand _ANSI_ARGS_((Display *d, Window w, + CONST char **c, int i)); /* 63 */ -EXTERN void XSetIconName _ANSI_ARGS_((Display*d, Window w, - _Xconst char*c)); +EXTERN void XSetIconName _ANSI_ARGS_((Display *d, Window w, + _Xconst char *c)); /* 64 */ -EXTERN void XSetInputFocus _ANSI_ARGS_((Display*d, Window w, +EXTERN void XSetInputFocus _ANSI_ARGS_((Display *d, Window w, int i, Time t)); /* 65 */ -EXTERN void XSetSelectionOwner _ANSI_ARGS_((Display*d, Atom a, +EXTERN void XSetSelectionOwner _ANSI_ARGS_((Display *d, Atom a, Window w, Time t)); /* 66 */ -EXTERN void XSetWindowBackground _ANSI_ARGS_((Display*d, +EXTERN void XSetWindowBackground _ANSI_ARGS_((Display *d, Window w, unsigned long ul)); /* 67 */ -EXTERN void XSetWindowBackgroundPixmap _ANSI_ARGS_((Display*d, +EXTERN void XSetWindowBackgroundPixmap _ANSI_ARGS_((Display *d, Window w, Pixmap p)); /* 68 */ -EXTERN void XSetWindowBorder _ANSI_ARGS_((Display*d, Window w, +EXTERN void XSetWindowBorder _ANSI_ARGS_((Display *d, Window w, unsigned long ul)); /* 69 */ -EXTERN void XSetWindowBorderPixmap _ANSI_ARGS_((Display*d, +EXTERN void XSetWindowBorderPixmap _ANSI_ARGS_((Display *d, Window w, Pixmap p)); /* 70 */ -EXTERN void XSetWindowBorderWidth _ANSI_ARGS_((Display*d, +EXTERN void XSetWindowBorderWidth _ANSI_ARGS_((Display *d, Window w, unsigned int ui)); /* 71 */ -EXTERN void XSetWindowColormap _ANSI_ARGS_((Display*d, Window w, +EXTERN void XSetWindowColormap _ANSI_ARGS_((Display *d, Window w, Colormap c)); /* 72 */ -EXTERN Bool XTranslateCoordinates _ANSI_ARGS_((Display*d, - Window w1, Window w2, int i1, int i2, int*i3, - int*i4, Window*w3)); +EXTERN Bool XTranslateCoordinates _ANSI_ARGS_((Display *d, + Window w1, Window w2, int i1, int i2, + int *i3, int *i4, Window *w3)); /* 73 */ -EXTERN void XUngrabKeyboard _ANSI_ARGS_((Display*d, Time t)); +EXTERN void XUngrabKeyboard _ANSI_ARGS_((Display *d, Time t)); /* 74 */ -EXTERN void XUngrabPointer _ANSI_ARGS_((Display*d, Time t)); +EXTERN void XUngrabPointer _ANSI_ARGS_((Display *d, Time t)); /* 75 */ -EXTERN void XUnmapWindow _ANSI_ARGS_((Display*d, Window w)); +EXTERN void XUnmapWindow _ANSI_ARGS_((Display *d, Window w)); /* 76 */ -EXTERN void XWindowEvent _ANSI_ARGS_((Display*d, Window w, - long l, XEvent*x)); +EXTERN void XWindowEvent _ANSI_ARGS_((Display *d, Window w, + long l, XEvent *x)); /* 77 */ EXTERN void XDestroyIC _ANSI_ARGS_((XIC x)); /* 78 */ -EXTERN Bool XFilterEvent _ANSI_ARGS_((XEvent*x, Window w)); +EXTERN Bool XFilterEvent _ANSI_ARGS_((XEvent *x, Window w)); /* 79 */ EXTERN int XmbLookupString _ANSI_ARGS_((XIC xi, - XKeyPressedEvent*xk, char*c, int i, KeySym*k, - Status*s)); + XKeyPressedEvent *xk, char *c, int i, + KeySym *k, Status *s)); /* 80 */ EXTERN void TkPutImage _ANSI_ARGS_((unsigned long *colors, - int ncolors, Display*display, Drawable d, - GC gc, XImage*image, int src_x, int src_y, + int ncolors, Display *display, Drawable d, + GC gc, XImage *image, int src_x, int src_y, int dest_x, int dest_y, unsigned int width, unsigned int height)); /* Slot 81 is reserved */ /* 82 */ EXTERN Status XParseColor _ANSI_ARGS_((Display *display, - Colormap map, _Xconst char*spec, + Colormap map, _Xconst char *spec, XColor *colorPtr)); /* 83 */ -EXTERN GC XCreateGC _ANSI_ARGS_((Display*display, Drawable d, - unsigned long valuemask, XGCValues*values)); +EXTERN GC XCreateGC _ANSI_ARGS_((Display *display, Drawable d, + unsigned long valuemask, XGCValues *values)); /* 84 */ -EXTERN void XFreeGC _ANSI_ARGS_((Display*display, GC gc)); +EXTERN void XFreeGC _ANSI_ARGS_((Display *display, GC gc)); /* 85 */ -EXTERN Atom XInternAtom _ANSI_ARGS_((Display*display, - _Xconst char*atom_name, Bool only_if_exists)); +EXTERN Atom XInternAtom _ANSI_ARGS_((Display *display, + _Xconst char *atom_name, Bool only_if_exists)); /* 86 */ -EXTERN void XSetBackground _ANSI_ARGS_((Display*display, GC gc, +EXTERN void XSetBackground _ANSI_ARGS_((Display *display, GC gc, unsigned long foreground)); /* 87 */ -EXTERN void XSetForeground _ANSI_ARGS_((Display*display, GC gc, +EXTERN void XSetForeground _ANSI_ARGS_((Display *display, GC gc, unsigned long foreground)); /* 88 */ -EXTERN void XSetClipMask _ANSI_ARGS_((Display*display, GC gc, +EXTERN void XSetClipMask _ANSI_ARGS_((Display *display, GC gc, Pixmap pixmap)); /* 89 */ -EXTERN void XSetClipOrigin _ANSI_ARGS_((Display*display, GC gc, +EXTERN void XSetClipOrigin _ANSI_ARGS_((Display *display, GC gc, int clip_x_origin, int clip_y_origin)); /* 90 */ -EXTERN void XSetTSOrigin _ANSI_ARGS_((Display*display, GC gc, +EXTERN void XSetTSOrigin _ANSI_ARGS_((Display *display, GC gc, int ts_x_origin, int ts_y_origin)); /* 91 */ EXTERN void XChangeGC _ANSI_ARGS_((Display *d, GC gc, @@ -342,234 +343,235 @@ EXTERN int _XInitImageFuncPtrs _ANSI_ARGS_((XImage *image)); /* 100 */ EXTERN XIC XCreateIC _ANSI_ARGS_((void)); /* 101 */ -EXTERN XVisualInfo * XGetVisualInfo _ANSI_ARGS_((Display*display, - long vinfo_mask, XVisualInfo*vinfo_template, - int*nitems_return)); +EXTERN XVisualInfo * XGetVisualInfo _ANSI_ARGS_((Display *display, + long vinfo_mask, XVisualInfo *vinfo_template, + int *nitems_return)); /* 102 */ -EXTERN void XSetWMClientMachine _ANSI_ARGS_((Display*display, - Window w, XTextProperty*text_prop)); +EXTERN void XSetWMClientMachine _ANSI_ARGS_((Display *display, + Window w, XTextProperty *text_prop)); /* 103 */ -EXTERN Status XStringListToTextProperty _ANSI_ARGS_((char**list, - int count, XTextProperty*text_prop_return)); +EXTERN Status XStringListToTextProperty _ANSI_ARGS_((char **list, + int count, XTextProperty *text_prop_return)); /* 104 */ -EXTERN void XDrawLine _ANSI_ARGS_((Display*d, Drawable dr, GC g, +EXTERN void XDrawLine _ANSI_ARGS_((Display *d, Drawable dr, GC g, int x1, int y1, int x2, int y2)); /* 105 */ -EXTERN void XWarpPointer _ANSI_ARGS_((Display*d, Window s, +EXTERN void XWarpPointer _ANSI_ARGS_((Display *d, Window s, Window dw, int sx, int sy, unsigned int sw, unsigned int sh, int dx, int dy)); /* 106 */ -EXTERN void XFillRectangle _ANSI_ARGS_((Display*display, +EXTERN void XFillRectangle _ANSI_ARGS_((Display *display, Drawable d, GC gc, int x, int y, unsigned int width, unsigned int height)); #endif /* __WIN32__ */ #ifdef MAC_TCL /* 0 */ -EXTERN void XSetDashes _ANSI_ARGS_((Display*display, GC gc, - int dash_offset, _Xconst char*dash_list, +EXTERN void XSetDashes _ANSI_ARGS_((Display *display, GC gc, + int dash_offset, _Xconst char *dash_list, int n)); /* 1 */ -EXTERN XModifierKeymap* XGetModifierMapping _ANSI_ARGS_((Display*d)); +EXTERN XModifierKeymap * XGetModifierMapping _ANSI_ARGS_((Display *d)); /* 2 */ -EXTERN XImage * XCreateImage _ANSI_ARGS_((Display*d, Visual*v, - unsigned int ui1, int i1, int i2, char*cp, +EXTERN XImage * XCreateImage _ANSI_ARGS_((Display *d, Visual *v, + unsigned int ui1, int i1, int i2, char *cp, unsigned int ui2, unsigned int ui3, int i3, int i4)); /* 3 */ -EXTERN XImage * XGetImage _ANSI_ARGS_((Display*d, Drawable dr, +EXTERN XImage * XGetImage _ANSI_ARGS_((Display *d, Drawable dr, int i1, int i2, unsigned int ui1, unsigned int ui2, unsigned long ul, int i3)); /* 4 */ -EXTERN char * XGetAtomName _ANSI_ARGS_((Display*d, Atom a)); +EXTERN char * XGetAtomName _ANSI_ARGS_((Display *d, Atom a)); /* 5 */ EXTERN char * XKeysymToString _ANSI_ARGS_((KeySym k)); /* 6 */ -EXTERN Colormap XCreateColormap _ANSI_ARGS_((Display*d, Window w, - Visual*v, int i)); +EXTERN Colormap XCreateColormap _ANSI_ARGS_((Display *d, Window w, + Visual *v, int i)); /* 7 */ EXTERN GContext XGContextFromGC _ANSI_ARGS_((GC g)); /* 8 */ -EXTERN KeySym XKeycodeToKeysym _ANSI_ARGS_((Display*d, KeyCode k, +EXTERN KeySym XKeycodeToKeysym _ANSI_ARGS_((Display *d, KeyCode k, int i)); /* 9 */ -EXTERN KeySym XStringToKeysym _ANSI_ARGS_((_Xconst char*c)); +EXTERN KeySym XStringToKeysym _ANSI_ARGS_((_Xconst char *c)); /* 10 */ -EXTERN Window XRootWindow _ANSI_ARGS_((Display*d, int i)); +EXTERN Window XRootWindow _ANSI_ARGS_((Display *d, int i)); /* 11 */ EXTERN XErrorHandler XSetErrorHandler _ANSI_ARGS_((XErrorHandler x)); /* 12 */ -EXTERN Status XAllocColor _ANSI_ARGS_((Display*d, Colormap c, - XColor*xp)); +EXTERN Status XAllocColor _ANSI_ARGS_((Display *d, Colormap c, + XColor *xp)); /* 13 */ -EXTERN void XBell _ANSI_ARGS_((Display*d, int i)); +EXTERN void XBell _ANSI_ARGS_((Display *d, int i)); /* 14 */ -EXTERN void XChangeProperty _ANSI_ARGS_((Display*d, Window w, +EXTERN void XChangeProperty _ANSI_ARGS_((Display *d, Window w, Atom a1, Atom a2, int i1, int i2, - _Xconst unsigned char*c, int i3)); + _Xconst unsigned char *c, int i3)); /* 15 */ -EXTERN void XChangeWindowAttributes _ANSI_ARGS_((Display*d, +EXTERN void XChangeWindowAttributes _ANSI_ARGS_((Display *d, Window w, unsigned long ul, - XSetWindowAttributes*x)); + XSetWindowAttributes *x)); /* 16 */ -EXTERN void XConfigureWindow _ANSI_ARGS_((Display*d, Window w, - unsigned int i, XWindowChanges*x)); +EXTERN void XConfigureWindow _ANSI_ARGS_((Display *d, Window w, + unsigned int i, XWindowChanges *x)); /* 17 */ -EXTERN void XCopyArea _ANSI_ARGS_((Display*d, Drawable dr1, +EXTERN void XCopyArea _ANSI_ARGS_((Display *d, Drawable dr1, Drawable dr2, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4)); /* 18 */ -EXTERN void XCopyPlane _ANSI_ARGS_((Display*d, Drawable dr1, +EXTERN void XCopyPlane _ANSI_ARGS_((Display *d, Drawable dr1, Drawable dr2, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4, unsigned long ul)); /* 19 */ -EXTERN Pixmap XCreateBitmapFromData _ANSI_ARGS_((Display*display, - Drawable d, _Xconst char*data, +EXTERN Pixmap XCreateBitmapFromData _ANSI_ARGS_((Display *display, + Drawable d, _Xconst char *data, unsigned int width, unsigned int height)); /* 20 */ -EXTERN void XDefineCursor _ANSI_ARGS_((Display*d, Window w, +EXTERN void XDefineCursor _ANSI_ARGS_((Display *d, Window w, Cursor c)); /* 21 */ -EXTERN void XDestroyWindow _ANSI_ARGS_((Display*d, Window w)); +EXTERN void XDestroyWindow _ANSI_ARGS_((Display *d, Window w)); /* 22 */ -EXTERN void XDrawArc _ANSI_ARGS_((Display*d, Drawable dr, GC g, +EXTERN void XDrawArc _ANSI_ARGS_((Display *d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4)); /* 23 */ -EXTERN void XDrawLines _ANSI_ARGS_((Display*d, Drawable dr, GC g, - XPoint*x, int i1, int i2)); +EXTERN void XDrawLines _ANSI_ARGS_((Display *d, Drawable dr, + GC g, XPoint *x, int i1, int i2)); /* 24 */ -EXTERN void XDrawRectangle _ANSI_ARGS_((Display*d, Drawable dr, +EXTERN void XDrawRectangle _ANSI_ARGS_((Display *d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2)); /* 25 */ -EXTERN void XFillArc _ANSI_ARGS_((Display*d, Drawable dr, GC g, +EXTERN void XFillArc _ANSI_ARGS_((Display *d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4)); /* 26 */ -EXTERN void XFillPolygon _ANSI_ARGS_((Display*d, Drawable dr, - GC g, XPoint*x, int i1, int i2, int i3)); +EXTERN void XFillPolygon _ANSI_ARGS_((Display *d, Drawable dr, + GC g, XPoint *x, int i1, int i2, int i3)); /* 27 */ -EXTERN void XFillRectangles _ANSI_ARGS_((Display*d, Drawable dr, - GC g, XRectangle*x, int i)); +EXTERN void XFillRectangles _ANSI_ARGS_((Display *d, Drawable dr, + GC g, XRectangle *x, int i)); /* 28 */ -EXTERN void XFreeColormap _ANSI_ARGS_((Display*d, Colormap c)); +EXTERN void XFreeColormap _ANSI_ARGS_((Display *d, Colormap c)); /* 29 */ -EXTERN void XFreeColors _ANSI_ARGS_((Display*d, Colormap c, - unsigned long*ulp, int i, unsigned long ul)); +EXTERN void XFreeColors _ANSI_ARGS_((Display *d, Colormap c, + unsigned long *ulp, int i, unsigned long ul)); /* 30 */ -EXTERN void XFreeModifiermap _ANSI_ARGS_((XModifierKeymap*x)); +EXTERN void XFreeModifiermap _ANSI_ARGS_((XModifierKeymap *x)); /* 31 */ -EXTERN Status XGetGeometry _ANSI_ARGS_((Display*d, Drawable dr, - Window*w, int*i1, int*i2, unsigned int*ui1, - unsigned int*ui2, unsigned int*ui3, - unsigned int*ui4)); +EXTERN Status XGetGeometry _ANSI_ARGS_((Display *d, Drawable dr, + Window *w, int *i1, int *i2, + unsigned int *ui1, unsigned int *ui2, + unsigned int *ui3, unsigned int *ui4)); /* 32 */ -EXTERN int XGetWindowProperty _ANSI_ARGS_((Display*d, Window w, +EXTERN int XGetWindowProperty _ANSI_ARGS_((Display *d, Window w, Atom a1, long l1, long l2, Bool b, Atom a2, - Atom*ap, int*ip, unsigned long*ulp1, - unsigned long*ulp2, unsigned char**cpp)); + Atom *ap, int *ip, unsigned long *ulp1, + unsigned long *ulp2, unsigned char **cpp)); /* 33 */ -EXTERN int XGrabKeyboard _ANSI_ARGS_((Display*d, Window w, +EXTERN int XGrabKeyboard _ANSI_ARGS_((Display *d, Window w, Bool b, int i1, int i2, Time t)); /* 34 */ -EXTERN int XGrabPointer _ANSI_ARGS_((Display*d, Window w1, +EXTERN int XGrabPointer _ANSI_ARGS_((Display *d, Window w1, Bool b, unsigned int ui, int i1, int i2, Window w2, Cursor c, Time t)); /* 35 */ -EXTERN KeyCode XKeysymToKeycode _ANSI_ARGS_((Display*d, KeySym k)); +EXTERN KeyCode XKeysymToKeycode _ANSI_ARGS_((Display *d, KeySym k)); /* 36 */ -EXTERN void XMapWindow _ANSI_ARGS_((Display*d, Window w)); +EXTERN void XMapWindow _ANSI_ARGS_((Display *d, Window w)); /* 37 */ -EXTERN void XMoveResizeWindow _ANSI_ARGS_((Display*d, Window w, +EXTERN void XMoveResizeWindow _ANSI_ARGS_((Display *d, Window w, int i1, int i2, unsigned int ui1, unsigned int ui2)); /* 38 */ -EXTERN void XMoveWindow _ANSI_ARGS_((Display*d, Window w, int i1, - int i2)); +EXTERN void XMoveWindow _ANSI_ARGS_((Display *d, Window w, + int i1, int i2)); /* 39 */ -EXTERN Bool XQueryPointer _ANSI_ARGS_((Display*d, Window w1, - Window*w2, Window*w3, int*i1, int*i2, int*i3, - int*i4, unsigned int*ui)); +EXTERN Bool XQueryPointer _ANSI_ARGS_((Display *d, Window w1, + Window *w2, Window *w3, int *i1, int *i2, + int *i3, int *i4, unsigned int *ui)); /* 40 */ -EXTERN void XRaiseWindow _ANSI_ARGS_((Display*d, Window w)); +EXTERN void XRaiseWindow _ANSI_ARGS_((Display *d, Window w)); /* 41 */ -EXTERN void XRefreshKeyboardMapping _ANSI_ARGS_((XMappingEvent*x)); +EXTERN void XRefreshKeyboardMapping _ANSI_ARGS_(( + XMappingEvent *x)); /* 42 */ -EXTERN void XResizeWindow _ANSI_ARGS_((Display*d, Window w, +EXTERN void XResizeWindow _ANSI_ARGS_((Display *d, Window w, unsigned int ui1, unsigned int ui2)); /* 43 */ -EXTERN void XSelectInput _ANSI_ARGS_((Display*d, Window w, +EXTERN void XSelectInput _ANSI_ARGS_((Display *d, Window w, long l)); /* 44 */ -EXTERN Status XSendEvent _ANSI_ARGS_((Display*d, Window w, Bool b, - long l, XEvent*x)); +EXTERN Status XSendEvent _ANSI_ARGS_((Display *d, Window w, Bool b, + long l, XEvent *x)); /* 45 */ -EXTERN void XSetIconName _ANSI_ARGS_((Display*d, Window w, - _Xconst char*c)); +EXTERN void XSetIconName _ANSI_ARGS_((Display *d, Window w, + _Xconst char *c)); /* 46 */ -EXTERN void XSetInputFocus _ANSI_ARGS_((Display*d, Window w, +EXTERN void XSetInputFocus _ANSI_ARGS_((Display *d, Window w, int i, Time t)); /* 47 */ -EXTERN void XSetSelectionOwner _ANSI_ARGS_((Display*d, Atom a, +EXTERN void XSetSelectionOwner _ANSI_ARGS_((Display *d, Atom a, Window w, Time t)); /* 48 */ -EXTERN void XSetWindowBackground _ANSI_ARGS_((Display*d, +EXTERN void XSetWindowBackground _ANSI_ARGS_((Display *d, Window w, unsigned long ul)); /* 49 */ -EXTERN void XSetWindowBackgroundPixmap _ANSI_ARGS_((Display*d, +EXTERN void XSetWindowBackgroundPixmap _ANSI_ARGS_((Display *d, Window w, Pixmap p)); /* 50 */ -EXTERN void XSetWindowBorder _ANSI_ARGS_((Display*d, Window w, +EXTERN void XSetWindowBorder _ANSI_ARGS_((Display *d, Window w, unsigned long ul)); /* 51 */ -EXTERN void XSetWindowBorderPixmap _ANSI_ARGS_((Display*d, +EXTERN void XSetWindowBorderPixmap _ANSI_ARGS_((Display *d, Window w, Pixmap p)); /* 52 */ -EXTERN void XSetWindowBorderWidth _ANSI_ARGS_((Display*d, +EXTERN void XSetWindowBorderWidth _ANSI_ARGS_((Display *d, Window w, unsigned int ui)); /* 53 */ -EXTERN void XSetWindowColormap _ANSI_ARGS_((Display*d, Window w, +EXTERN void XSetWindowColormap _ANSI_ARGS_((Display *d, Window w, Colormap c)); /* 54 */ -EXTERN void XUngrabKeyboard _ANSI_ARGS_((Display*d, Time t)); +EXTERN void XUngrabKeyboard _ANSI_ARGS_((Display *d, Time t)); /* 55 */ -EXTERN void XUngrabPointer _ANSI_ARGS_((Display*d, Time t)); +EXTERN void XUngrabPointer _ANSI_ARGS_((Display *d, Time t)); /* 56 */ -EXTERN void XUnmapWindow _ANSI_ARGS_((Display*d, Window w)); +EXTERN void XUnmapWindow _ANSI_ARGS_((Display *d, Window w)); /* 57 */ EXTERN void TkPutImage _ANSI_ARGS_((unsigned long *colors, - int ncolors, Display*display, Drawable d, - GC gc, XImage*image, int src_x, int src_y, + int ncolors, Display *display, Drawable d, + GC gc, XImage *image, int src_x, int src_y, int dest_x, int dest_y, unsigned int width, unsigned int height)); /* 58 */ EXTERN Status XParseColor _ANSI_ARGS_((Display *display, - Colormap map, _Xconst char*spec, + Colormap map, _Xconst char *spec, XColor *colorPtr)); /* 59 */ -EXTERN GC XCreateGC _ANSI_ARGS_((Display*display, Drawable d, - unsigned long valuemask, XGCValues*values)); +EXTERN GC XCreateGC _ANSI_ARGS_((Display *display, Drawable d, + unsigned long valuemask, XGCValues *values)); /* 60 */ -EXTERN void XFreeGC _ANSI_ARGS_((Display*display, GC gc)); +EXTERN void XFreeGC _ANSI_ARGS_((Display *display, GC gc)); /* 61 */ -EXTERN Atom XInternAtom _ANSI_ARGS_((Display*display, - _Xconst char*atom_name, Bool only_if_exists)); +EXTERN Atom XInternAtom _ANSI_ARGS_((Display *display, + _Xconst char *atom_name, Bool only_if_exists)); /* 62 */ -EXTERN void XSetBackground _ANSI_ARGS_((Display*display, GC gc, +EXTERN void XSetBackground _ANSI_ARGS_((Display *display, GC gc, unsigned long foreground)); /* 63 */ -EXTERN void XSetForeground _ANSI_ARGS_((Display*display, GC gc, +EXTERN void XSetForeground _ANSI_ARGS_((Display *display, GC gc, unsigned long foreground)); /* 64 */ -EXTERN void XSetClipMask _ANSI_ARGS_((Display*display, GC gc, +EXTERN void XSetClipMask _ANSI_ARGS_((Display *display, GC gc, Pixmap pixmap)); /* 65 */ -EXTERN void XSetClipOrigin _ANSI_ARGS_((Display*display, GC gc, +EXTERN void XSetClipOrigin _ANSI_ARGS_((Display *display, GC gc, int clip_x_origin, int clip_y_origin)); /* 66 */ -EXTERN void XSetTSOrigin _ANSI_ARGS_((Display*display, GC gc, +EXTERN void XSetTSOrigin _ANSI_ARGS_((Display *display, GC gc, int ts_x_origin, int ts_y_origin)); /* 67 */ EXTERN void XChangeGC _ANSI_ARGS_((Display *d, GC gc, @@ -602,39 +604,40 @@ EXTERN int _XInitImageFuncPtrs _ANSI_ARGS_((XImage *image)); /* 76 */ EXTERN XIC XCreateIC _ANSI_ARGS_((void)); /* 77 */ -EXTERN XVisualInfo * XGetVisualInfo _ANSI_ARGS_((Display*display, - long vinfo_mask, XVisualInfo*vinfo_template, - int*nitems_return)); +EXTERN XVisualInfo * XGetVisualInfo _ANSI_ARGS_((Display *display, + long vinfo_mask, XVisualInfo *vinfo_template, + int *nitems_return)); /* 78 */ -EXTERN void XSetWMClientMachine _ANSI_ARGS_((Display*display, - Window w, XTextProperty*text_prop)); +EXTERN void XSetWMClientMachine _ANSI_ARGS_((Display *display, + Window w, XTextProperty *text_prop)); /* 79 */ -EXTERN Status XStringListToTextProperty _ANSI_ARGS_((char**list, - int count, XTextProperty*text_prop_return)); +EXTERN Status XStringListToTextProperty _ANSI_ARGS_((char **list, + int count, XTextProperty *text_prop_return)); /* 80 */ EXTERN void XDrawSegments _ANSI_ARGS_((Display *display, Drawable d, GC gc, XSegment *segments, int nsegments)); /* 81 */ -EXTERN void XForceScreenSaver _ANSI_ARGS_((Display*display, +EXTERN void XForceScreenSaver _ANSI_ARGS_((Display *display, int mode)); /* 82 */ -EXTERN void XDrawLine _ANSI_ARGS_((Display*d, Drawable dr, GC g, +EXTERN void XDrawLine _ANSI_ARGS_((Display *d, Drawable dr, GC g, int x1, int y1, int x2, int y2)); /* 83 */ -EXTERN void XFillRectangle _ANSI_ARGS_((Display*display, +EXTERN void XFillRectangle _ANSI_ARGS_((Display *display, Drawable d, GC gc, int x, int y, unsigned int width, unsigned int height)); /* 84 */ -EXTERN void XClearWindow _ANSI_ARGS_((Display*d, Window w)); +EXTERN void XClearWindow _ANSI_ARGS_((Display *d, Window w)); /* 85 */ -EXTERN void XDrawPoint _ANSI_ARGS_((Display*display, Drawable d, +EXTERN void XDrawPoint _ANSI_ARGS_((Display *display, Drawable d, GC gc, int x, int y)); /* 86 */ -EXTERN void XDrawPoints _ANSI_ARGS_((Display*display, Drawable d, - GC gc, XPoint *points, int npoints, int mode)); +EXTERN void XDrawPoints _ANSI_ARGS_((Display *display, + Drawable d, GC gc, XPoint *points, + int npoints, int mode)); /* 87 */ -EXTERN void XWarpPointer _ANSI_ARGS_((Display*display, +EXTERN void XWarpPointer _ANSI_ARGS_((Display *display, Window src_w, Window dest_w, int src_x, int src_y, unsigned int src_width, unsigned int src_height, int dest_x, @@ -647,217 +650,218 @@ EXTERN void XQueryColors _ANSI_ARGS_((Display *display, Colormap colormap, XColor *defs_in_out, int ncolors)); /* 90 */ -EXTERN Status XQueryTree _ANSI_ARGS_((Display*d, Window w1, - Window*w2, Window*w3, Window**w4, - unsigned int*ui)); +EXTERN Status XQueryTree _ANSI_ARGS_((Display *d, Window w1, + Window *w2, Window *w3, Window **w4, + unsigned int *ui)); #endif /* MAC_TCL */ #ifdef MAC_OSX_TK /* 0 */ -EXTERN void XSetDashes _ANSI_ARGS_((Display*display, GC gc, - int dash_offset, _Xconst char*dash_list, +EXTERN void XSetDashes _ANSI_ARGS_((Display *display, GC gc, + int dash_offset, _Xconst char *dash_list, int n)); /* 1 */ -EXTERN XModifierKeymap* XGetModifierMapping _ANSI_ARGS_((Display*d)); +EXTERN XModifierKeymap * XGetModifierMapping _ANSI_ARGS_((Display *d)); /* 2 */ -EXTERN XImage * XCreateImage _ANSI_ARGS_((Display*d, Visual*v, - unsigned int ui1, int i1, int i2, char*cp, +EXTERN XImage * XCreateImage _ANSI_ARGS_((Display *d, Visual *v, + unsigned int ui1, int i1, int i2, char *cp, unsigned int ui2, unsigned int ui3, int i3, int i4)); /* 3 */ -EXTERN XImage * XGetImage _ANSI_ARGS_((Display*d, Drawable dr, +EXTERN XImage * XGetImage _ANSI_ARGS_((Display *d, Drawable dr, int i1, int i2, unsigned int ui1, unsigned int ui2, unsigned long ul, int i3)); /* 4 */ -EXTERN char * XGetAtomName _ANSI_ARGS_((Display*d, Atom a)); +EXTERN char * XGetAtomName _ANSI_ARGS_((Display *d, Atom a)); /* 5 */ EXTERN char * XKeysymToString _ANSI_ARGS_((KeySym k)); /* 6 */ -EXTERN Colormap XCreateColormap _ANSI_ARGS_((Display*d, Window w, - Visual*v, int i)); +EXTERN Colormap XCreateColormap _ANSI_ARGS_((Display *d, Window w, + Visual *v, int i)); /* 7 */ EXTERN GContext XGContextFromGC _ANSI_ARGS_((GC g)); /* 8 */ -EXTERN KeySym XKeycodeToKeysym _ANSI_ARGS_((Display*d, KeyCode k, +EXTERN KeySym XKeycodeToKeysym _ANSI_ARGS_((Display *d, KeyCode k, int i)); /* 9 */ -EXTERN KeySym XStringToKeysym _ANSI_ARGS_((_Xconst char*c)); +EXTERN KeySym XStringToKeysym _ANSI_ARGS_((_Xconst char *c)); /* 10 */ -EXTERN Window XRootWindow _ANSI_ARGS_((Display*d, int i)); +EXTERN Window XRootWindow _ANSI_ARGS_((Display *d, int i)); /* 11 */ EXTERN XErrorHandler XSetErrorHandler _ANSI_ARGS_((XErrorHandler x)); /* 12 */ -EXTERN Status XAllocColor _ANSI_ARGS_((Display*d, Colormap c, - XColor*xp)); +EXTERN Status XAllocColor _ANSI_ARGS_((Display *d, Colormap c, + XColor *xp)); /* 13 */ -EXTERN void XBell _ANSI_ARGS_((Display*d, int i)); +EXTERN void XBell _ANSI_ARGS_((Display *d, int i)); /* 14 */ -EXTERN void XChangeProperty _ANSI_ARGS_((Display*d, Window w, +EXTERN void XChangeProperty _ANSI_ARGS_((Display *d, Window w, Atom a1, Atom a2, int i1, int i2, - _Xconst unsigned char*c, int i3)); + _Xconst unsigned char *c, int i3)); /* 15 */ -EXTERN void XChangeWindowAttributes _ANSI_ARGS_((Display*d, +EXTERN void XChangeWindowAttributes _ANSI_ARGS_((Display *d, Window w, unsigned long ul, - XSetWindowAttributes*x)); + XSetWindowAttributes *x)); /* 16 */ -EXTERN void XConfigureWindow _ANSI_ARGS_((Display*d, Window w, - unsigned int i, XWindowChanges*x)); +EXTERN void XConfigureWindow _ANSI_ARGS_((Display *d, Window w, + unsigned int i, XWindowChanges *x)); /* 17 */ -EXTERN void XCopyArea _ANSI_ARGS_((Display*d, Drawable dr1, +EXTERN void XCopyArea _ANSI_ARGS_((Display *d, Drawable dr1, Drawable dr2, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4)); /* 18 */ -EXTERN void XCopyPlane _ANSI_ARGS_((Display*d, Drawable dr1, +EXTERN void XCopyPlane _ANSI_ARGS_((Display *d, Drawable dr1, Drawable dr2, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4, unsigned long ul)); /* 19 */ -EXTERN Pixmap XCreateBitmapFromData _ANSI_ARGS_((Display*display, - Drawable d, _Xconst char*data, +EXTERN Pixmap XCreateBitmapFromData _ANSI_ARGS_((Display *display, + Drawable d, _Xconst char *data, unsigned int width, unsigned int height)); /* 20 */ -EXTERN void XDefineCursor _ANSI_ARGS_((Display*d, Window w, +EXTERN void XDefineCursor _ANSI_ARGS_((Display *d, Window w, Cursor c)); /* 21 */ -EXTERN void XDestroyWindow _ANSI_ARGS_((Display*d, Window w)); +EXTERN void XDestroyWindow _ANSI_ARGS_((Display *d, Window w)); /* 22 */ -EXTERN void XDrawArc _ANSI_ARGS_((Display*d, Drawable dr, GC g, +EXTERN void XDrawArc _ANSI_ARGS_((Display *d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4)); /* 23 */ -EXTERN void XDrawLines _ANSI_ARGS_((Display*d, Drawable dr, GC g, - XPoint*x, int i1, int i2)); +EXTERN void XDrawLines _ANSI_ARGS_((Display *d, Drawable dr, + GC g, XPoint *x, int i1, int i2)); /* 24 */ -EXTERN void XDrawRectangle _ANSI_ARGS_((Display*d, Drawable dr, +EXTERN void XDrawRectangle _ANSI_ARGS_((Display *d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2)); /* 25 */ -EXTERN void XFillArc _ANSI_ARGS_((Display*d, Drawable dr, GC g, +EXTERN void XFillArc _ANSI_ARGS_((Display *d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4)); /* 26 */ -EXTERN void XFillPolygon _ANSI_ARGS_((Display*d, Drawable dr, - GC g, XPoint*x, int i1, int i2, int i3)); +EXTERN void XFillPolygon _ANSI_ARGS_((Display *d, Drawable dr, + GC g, XPoint *x, int i1, int i2, int i3)); /* 27 */ -EXTERN void XFillRectangles _ANSI_ARGS_((Display*d, Drawable dr, - GC g, XRectangle*x, int i)); +EXTERN void XFillRectangles _ANSI_ARGS_((Display *d, Drawable dr, + GC g, XRectangle *x, int i)); /* 28 */ -EXTERN void XFreeColormap _ANSI_ARGS_((Display*d, Colormap c)); +EXTERN void XFreeColormap _ANSI_ARGS_((Display *d, Colormap c)); /* 29 */ -EXTERN void XFreeColors _ANSI_ARGS_((Display*d, Colormap c, - unsigned long*ulp, int i, unsigned long ul)); +EXTERN void XFreeColors _ANSI_ARGS_((Display *d, Colormap c, + unsigned long *ulp, int i, unsigned long ul)); /* 30 */ -EXTERN void XFreeModifiermap _ANSI_ARGS_((XModifierKeymap*x)); +EXTERN void XFreeModifiermap _ANSI_ARGS_((XModifierKeymap *x)); /* 31 */ -EXTERN Status XGetGeometry _ANSI_ARGS_((Display*d, Drawable dr, - Window*w, int*i1, int*i2, unsigned int*ui1, - unsigned int*ui2, unsigned int*ui3, - unsigned int*ui4)); +EXTERN Status XGetGeometry _ANSI_ARGS_((Display *d, Drawable dr, + Window *w, int *i1, int *i2, + unsigned int *ui1, unsigned int *ui2, + unsigned int *ui3, unsigned int *ui4)); /* 32 */ -EXTERN int XGetWindowProperty _ANSI_ARGS_((Display*d, Window w, +EXTERN int XGetWindowProperty _ANSI_ARGS_((Display *d, Window w, Atom a1, long l1, long l2, Bool b, Atom a2, - Atom*ap, int*ip, unsigned long*ulp1, - unsigned long*ulp2, unsigned char**cpp)); + Atom *ap, int *ip, unsigned long *ulp1, + unsigned long *ulp2, unsigned char **cpp)); /* 33 */ -EXTERN int XGrabKeyboard _ANSI_ARGS_((Display*d, Window w, +EXTERN int XGrabKeyboard _ANSI_ARGS_((Display *d, Window w, Bool b, int i1, int i2, Time t)); /* 34 */ -EXTERN int XGrabPointer _ANSI_ARGS_((Display*d, Window w1, +EXTERN int XGrabPointer _ANSI_ARGS_((Display *d, Window w1, Bool b, unsigned int ui, int i1, int i2, Window w2, Cursor c, Time t)); /* 35 */ -EXTERN KeyCode XKeysymToKeycode _ANSI_ARGS_((Display*d, KeySym k)); +EXTERN KeyCode XKeysymToKeycode _ANSI_ARGS_((Display *d, KeySym k)); /* 36 */ -EXTERN void XMapWindow _ANSI_ARGS_((Display*d, Window w)); +EXTERN void XMapWindow _ANSI_ARGS_((Display *d, Window w)); /* 37 */ -EXTERN void XMoveResizeWindow _ANSI_ARGS_((Display*d, Window w, +EXTERN void XMoveResizeWindow _ANSI_ARGS_((Display *d, Window w, int i1, int i2, unsigned int ui1, unsigned int ui2)); /* 38 */ -EXTERN void XMoveWindow _ANSI_ARGS_((Display*d, Window w, int i1, - int i2)); +EXTERN void XMoveWindow _ANSI_ARGS_((Display *d, Window w, + int i1, int i2)); /* 39 */ -EXTERN Bool XQueryPointer _ANSI_ARGS_((Display*d, Window w1, - Window*w2, Window*w3, int*i1, int*i2, int*i3, - int*i4, unsigned int*ui)); +EXTERN Bool XQueryPointer _ANSI_ARGS_((Display *d, Window w1, + Window *w2, Window *w3, int *i1, int *i2, + int *i3, int *i4, unsigned int *ui)); /* 40 */ -EXTERN void XRaiseWindow _ANSI_ARGS_((Display*d, Window w)); +EXTERN void XRaiseWindow _ANSI_ARGS_((Display *d, Window w)); /* 41 */ -EXTERN void XRefreshKeyboardMapping _ANSI_ARGS_((XMappingEvent*x)); +EXTERN void XRefreshKeyboardMapping _ANSI_ARGS_(( + XMappingEvent *x)); /* 42 */ -EXTERN void XResizeWindow _ANSI_ARGS_((Display*d, Window w, +EXTERN void XResizeWindow _ANSI_ARGS_((Display *d, Window w, unsigned int ui1, unsigned int ui2)); /* 43 */ -EXTERN void XSelectInput _ANSI_ARGS_((Display*d, Window w, +EXTERN void XSelectInput _ANSI_ARGS_((Display *d, Window w, long l)); /* 44 */ -EXTERN Status XSendEvent _ANSI_ARGS_((Display*d, Window w, Bool b, - long l, XEvent*x)); +EXTERN Status XSendEvent _ANSI_ARGS_((Display *d, Window w, Bool b, + long l, XEvent *x)); /* 45 */ -EXTERN void XSetIconName _ANSI_ARGS_((Display*d, Window w, - _Xconst char*c)); +EXTERN void XSetIconName _ANSI_ARGS_((Display *d, Window w, + _Xconst char *c)); /* 46 */ -EXTERN void XSetInputFocus _ANSI_ARGS_((Display*d, Window w, +EXTERN void XSetInputFocus _ANSI_ARGS_((Display *d, Window w, int i, Time t)); /* 47 */ -EXTERN void XSetSelectionOwner _ANSI_ARGS_((Display*d, Atom a, +EXTERN void XSetSelectionOwner _ANSI_ARGS_((Display *d, Atom a, Window w, Time t)); /* 48 */ -EXTERN void XSetWindowBackground _ANSI_ARGS_((Display*d, +EXTERN void XSetWindowBackground _ANSI_ARGS_((Display *d, Window w, unsigned long ul)); /* 49 */ -EXTERN void XSetWindowBackgroundPixmap _ANSI_ARGS_((Display*d, +EXTERN void XSetWindowBackgroundPixmap _ANSI_ARGS_((Display *d, Window w, Pixmap p)); /* 50 */ -EXTERN void XSetWindowBorder _ANSI_ARGS_((Display*d, Window w, +EXTERN void XSetWindowBorder _ANSI_ARGS_((Display *d, Window w, unsigned long ul)); /* 51 */ -EXTERN void XSetWindowBorderPixmap _ANSI_ARGS_((Display*d, +EXTERN void XSetWindowBorderPixmap _ANSI_ARGS_((Display *d, Window w, Pixmap p)); /* 52 */ -EXTERN void XSetWindowBorderWidth _ANSI_ARGS_((Display*d, +EXTERN void XSetWindowBorderWidth _ANSI_ARGS_((Display *d, Window w, unsigned int ui)); /* 53 */ -EXTERN void XSetWindowColormap _ANSI_ARGS_((Display*d, Window w, +EXTERN void XSetWindowColormap _ANSI_ARGS_((Display *d, Window w, Colormap c)); /* 54 */ -EXTERN void XUngrabKeyboard _ANSI_ARGS_((Display*d, Time t)); +EXTERN void XUngrabKeyboard _ANSI_ARGS_((Display *d, Time t)); /* 55 */ -EXTERN void XUngrabPointer _ANSI_ARGS_((Display*d, Time t)); +EXTERN void XUngrabPointer _ANSI_ARGS_((Display *d, Time t)); /* 56 */ -EXTERN void XUnmapWindow _ANSI_ARGS_((Display*d, Window w)); +EXTERN void XUnmapWindow _ANSI_ARGS_((Display *d, Window w)); /* 57 */ EXTERN void TkPutImage _ANSI_ARGS_((unsigned long *colors, - int ncolors, Display*display, Drawable d, - GC gc, XImage*image, int src_x, int src_y, + int ncolors, Display *display, Drawable d, + GC gc, XImage *image, int src_x, int src_y, int dest_x, int dest_y, unsigned int width, unsigned int height)); /* 58 */ EXTERN Status XParseColor _ANSI_ARGS_((Display *display, - Colormap map, _Xconst char*spec, + Colormap map, _Xconst char *spec, XColor *colorPtr)); /* 59 */ -EXTERN GC XCreateGC _ANSI_ARGS_((Display*display, Drawable d, - unsigned long valuemask, XGCValues*values)); +EXTERN GC XCreateGC _ANSI_ARGS_((Display *display, Drawable d, + unsigned long valuemask, XGCValues *values)); /* 60 */ -EXTERN void XFreeGC _ANSI_ARGS_((Display*display, GC gc)); +EXTERN void XFreeGC _ANSI_ARGS_((Display *display, GC gc)); /* 61 */ -EXTERN Atom XInternAtom _ANSI_ARGS_((Display*display, - _Xconst char*atom_name, Bool only_if_exists)); +EXTERN Atom XInternAtom _ANSI_ARGS_((Display *display, + _Xconst char *atom_name, Bool only_if_exists)); /* 62 */ -EXTERN void XSetBackground _ANSI_ARGS_((Display*display, GC gc, +EXTERN void XSetBackground _ANSI_ARGS_((Display *display, GC gc, unsigned long foreground)); /* 63 */ -EXTERN void XSetForeground _ANSI_ARGS_((Display*display, GC gc, +EXTERN void XSetForeground _ANSI_ARGS_((Display *display, GC gc, unsigned long foreground)); /* 64 */ -EXTERN void XSetClipMask _ANSI_ARGS_((Display*display, GC gc, +EXTERN void XSetClipMask _ANSI_ARGS_((Display *display, GC gc, Pixmap pixmap)); /* 65 */ -EXTERN void XSetClipOrigin _ANSI_ARGS_((Display*display, GC gc, +EXTERN void XSetClipOrigin _ANSI_ARGS_((Display *display, GC gc, int clip_x_origin, int clip_y_origin)); /* 66 */ -EXTERN void XSetTSOrigin _ANSI_ARGS_((Display*display, GC gc, +EXTERN void XSetTSOrigin _ANSI_ARGS_((Display *display, GC gc, int ts_x_origin, int ts_y_origin)); /* 67 */ EXTERN void XChangeGC _ANSI_ARGS_((Display *d, GC gc, @@ -890,39 +894,40 @@ EXTERN int _XInitImageFuncPtrs _ANSI_ARGS_((XImage *image)); /* 76 */ EXTERN XIC XCreateIC _ANSI_ARGS_((void)); /* 77 */ -EXTERN XVisualInfo * XGetVisualInfo _ANSI_ARGS_((Display*display, - long vinfo_mask, XVisualInfo*vinfo_template, - int*nitems_return)); +EXTERN XVisualInfo * XGetVisualInfo _ANSI_ARGS_((Display *display, + long vinfo_mask, XVisualInfo *vinfo_template, + int *nitems_return)); /* 78 */ -EXTERN void XSetWMClientMachine _ANSI_ARGS_((Display*display, - Window w, XTextProperty*text_prop)); +EXTERN void XSetWMClientMachine _ANSI_ARGS_((Display *display, + Window w, XTextProperty *text_prop)); /* 79 */ -EXTERN Status XStringListToTextProperty _ANSI_ARGS_((char**list, - int count, XTextProperty*text_prop_return)); +EXTERN Status XStringListToTextProperty _ANSI_ARGS_((char **list, + int count, XTextProperty *text_prop_return)); /* 80 */ EXTERN void XDrawSegments _ANSI_ARGS_((Display *display, Drawable d, GC gc, XSegment *segments, int nsegments)); /* 81 */ -EXTERN void XForceScreenSaver _ANSI_ARGS_((Display*display, +EXTERN void XForceScreenSaver _ANSI_ARGS_((Display *display, int mode)); /* 82 */ -EXTERN void XDrawLine _ANSI_ARGS_((Display*d, Drawable dr, GC g, +EXTERN void XDrawLine _ANSI_ARGS_((Display *d, Drawable dr, GC g, int x1, int y1, int x2, int y2)); /* 83 */ -EXTERN void XFillRectangle _ANSI_ARGS_((Display*display, +EXTERN void XFillRectangle _ANSI_ARGS_((Display *display, Drawable d, GC gc, int x, int y, unsigned int width, unsigned int height)); /* 84 */ -EXTERN void XClearWindow _ANSI_ARGS_((Display*d, Window w)); +EXTERN void XClearWindow _ANSI_ARGS_((Display *d, Window w)); /* 85 */ -EXTERN void XDrawPoint _ANSI_ARGS_((Display*display, Drawable d, +EXTERN void XDrawPoint _ANSI_ARGS_((Display *display, Drawable d, GC gc, int x, int y)); /* 86 */ -EXTERN void XDrawPoints _ANSI_ARGS_((Display*display, Drawable d, - GC gc, XPoint *points, int npoints, int mode)); +EXTERN void XDrawPoints _ANSI_ARGS_((Display *display, + Drawable d, GC gc, XPoint *points, + int npoints, int mode)); /* 87 */ -EXTERN void XWarpPointer _ANSI_ARGS_((Display*display, +EXTERN void XWarpPointer _ANSI_ARGS_((Display *display, Window src_w, Window dest_w, int src_x, int src_y, unsigned int src_width, unsigned int src_height, int dest_x, @@ -935,9 +940,9 @@ EXTERN void XQueryColors _ANSI_ARGS_((Display *display, Colormap colormap, XColor *defs_in_out, int ncolors)); /* 90 */ -EXTERN Status XQueryTree _ANSI_ARGS_((Display*d, Window w1, - Window*w2, Window*w3, Window**w4, - unsigned int*ui)); +EXTERN Status XQueryTree _ANSI_ARGS_((Display *d, Window w1, + Window *w2, Window *w3, Window **w4, + unsigned int *ui)); /* 91 */ EXTERN int XSync _ANSI_ARGS_((Display *display, Bool flag)); #endif /* MAC_OSX_TK */ @@ -947,97 +952,97 @@ typedef struct TkIntXlibStubs { struct TkIntXlibStubHooks *hooks; #ifdef __WIN32__ - void (*xSetDashes) _ANSI_ARGS_((Display*display, GC gc, int dash_offset, _Xconst char*dash_list, int n)); /* 0 */ - XModifierKeymap* (*xGetModifierMapping) _ANSI_ARGS_((Display*d)); /* 1 */ - XImage * (*xCreateImage) _ANSI_ARGS_((Display*d, Visual*v, unsigned int ui1, int i1, int i2, char*cp, unsigned int ui2, unsigned int ui3, int i3, int i4)); /* 2 */ - XImage * (*xGetImage) _ANSI_ARGS_((Display*d, Drawable dr, int i1, int i2, unsigned int ui1, unsigned int ui2, unsigned long ul, int i3)); /* 3 */ - char * (*xGetAtomName) _ANSI_ARGS_((Display*d, Atom a)); /* 4 */ + void (*xSetDashes) _ANSI_ARGS_((Display *display, GC gc, int dash_offset, _Xconst char *dash_list, int n)); /* 0 */ + XModifierKeymap * (*xGetModifierMapping) _ANSI_ARGS_((Display *d)); /* 1 */ + XImage * (*xCreateImage) _ANSI_ARGS_((Display *d, Visual *v, unsigned int ui1, int i1, int i2, char *cp, unsigned int ui2, unsigned int ui3, int i3, int i4)); /* 2 */ + XImage * (*xGetImage) _ANSI_ARGS_((Display *d, Drawable dr, int i1, int i2, unsigned int ui1, unsigned int ui2, unsigned long ul, int i3)); /* 3 */ + char * (*xGetAtomName) _ANSI_ARGS_((Display *d, Atom a)); /* 4 */ char * (*xKeysymToString) _ANSI_ARGS_((KeySym k)); /* 5 */ - Colormap (*xCreateColormap) _ANSI_ARGS_((Display*d, Window w, Visual*v, int i)); /* 6 */ - Cursor (*xCreatePixmapCursor) _ANSI_ARGS_((Display*d, Pixmap p1, Pixmap p2, XColor*x1, XColor*x2, unsigned int ui1, unsigned int ui2)); /* 7 */ - Cursor (*xCreateGlyphCursor) _ANSI_ARGS_((Display*d, Font f1, Font f2, unsigned int ui1, unsigned int ui2, XColor*x1, XColor*x2)); /* 8 */ + Colormap (*xCreateColormap) _ANSI_ARGS_((Display *d, Window w, Visual *v, int i)); /* 6 */ + Cursor (*xCreatePixmapCursor) _ANSI_ARGS_((Display *d, Pixmap p1, Pixmap p2, XColor *x1, XColor *x2, unsigned int ui1, unsigned int ui2)); /* 7 */ + Cursor (*xCreateGlyphCursor) _ANSI_ARGS_((Display *d, Font f1, Font f2, unsigned int ui1, unsigned int ui2, XColor *x1, XColor *x2)); /* 8 */ GContext (*xGContextFromGC) _ANSI_ARGS_((GC g)); /* 9 */ - XHostAddress * (*xListHosts) _ANSI_ARGS_((Display*d, int*i, Bool*b)); /* 10 */ - KeySym (*xKeycodeToKeysym) _ANSI_ARGS_((Display*d, unsigned int k, int i)); /* 11 */ - KeySym (*xStringToKeysym) _ANSI_ARGS_((_Xconst char*c)); /* 12 */ - Window (*xRootWindow) _ANSI_ARGS_((Display*d, int i)); /* 13 */ + XHostAddress * (*xListHosts) _ANSI_ARGS_((Display *d, int *i, Bool *b)); /* 10 */ + KeySym (*xKeycodeToKeysym) _ANSI_ARGS_((Display *d, unsigned int k, int i)); /* 11 */ + KeySym (*xStringToKeysym) _ANSI_ARGS_((_Xconst char *c)); /* 12 */ + Window (*xRootWindow) _ANSI_ARGS_((Display *d, int i)); /* 13 */ XErrorHandler (*xSetErrorHandler) _ANSI_ARGS_((XErrorHandler x)); /* 14 */ - Status (*xIconifyWindow) _ANSI_ARGS_((Display*d, Window w, int i)); /* 15 */ - Status (*xWithdrawWindow) _ANSI_ARGS_((Display*d, Window w, int i)); /* 16 */ - Status (*xGetWMColormapWindows) _ANSI_ARGS_((Display*d, Window w, Window**wpp, int*ip)); /* 17 */ - Status (*xAllocColor) _ANSI_ARGS_((Display*d, Colormap c, XColor*xp)); /* 18 */ - void (*xBell) _ANSI_ARGS_((Display*d, int i)); /* 19 */ - void (*xChangeProperty) _ANSI_ARGS_((Display*d, Window w, Atom a1, Atom a2, int i1, int i2, _Xconst unsigned char*c, int i3)); /* 20 */ - void (*xChangeWindowAttributes) _ANSI_ARGS_((Display*d, Window w, unsigned long ul, XSetWindowAttributes*x)); /* 21 */ - void (*xClearWindow) _ANSI_ARGS_((Display*d, Window w)); /* 22 */ - void (*xConfigureWindow) _ANSI_ARGS_((Display*d, Window w, unsigned int i, XWindowChanges*x)); /* 23 */ - void (*xCopyArea) _ANSI_ARGS_((Display*d, Drawable dr1, Drawable dr2, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4)); /* 24 */ - void (*xCopyPlane) _ANSI_ARGS_((Display*d, Drawable dr1, Drawable dr2, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4, unsigned long ul)); /* 25 */ - Pixmap (*xCreateBitmapFromData) _ANSI_ARGS_((Display*display, Drawable d, _Xconst char*data, unsigned int width, unsigned int height)); /* 26 */ - void (*xDefineCursor) _ANSI_ARGS_((Display*d, Window w, Cursor c)); /* 27 */ - void (*xDeleteProperty) _ANSI_ARGS_((Display*d, Window w, Atom a)); /* 28 */ - void (*xDestroyWindow) _ANSI_ARGS_((Display*d, Window w)); /* 29 */ - void (*xDrawArc) _ANSI_ARGS_((Display*d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4)); /* 30 */ - void (*xDrawLines) _ANSI_ARGS_((Display*d, Drawable dr, GC g, XPoint*x, int i1, int i2)); /* 31 */ - void (*xDrawRectangle) _ANSI_ARGS_((Display*d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2)); /* 32 */ - void (*xFillArc) _ANSI_ARGS_((Display*d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4)); /* 33 */ - void (*xFillPolygon) _ANSI_ARGS_((Display*d, Drawable dr, GC g, XPoint*x, int i1, int i2, int i3)); /* 34 */ - void (*xFillRectangles) _ANSI_ARGS_((Display*d, Drawable dr, GC g, XRectangle*x, int i)); /* 35 */ - void (*xForceScreenSaver) _ANSI_ARGS_((Display*d, int i)); /* 36 */ - void (*xFreeColormap) _ANSI_ARGS_((Display*d, Colormap c)); /* 37 */ - void (*xFreeColors) _ANSI_ARGS_((Display*d, Colormap c, unsigned long*ulp, int i, unsigned long ul)); /* 38 */ - void (*xFreeCursor) _ANSI_ARGS_((Display*d, Cursor c)); /* 39 */ - void (*xFreeModifiermap) _ANSI_ARGS_((XModifierKeymap*x)); /* 40 */ - Status (*xGetGeometry) _ANSI_ARGS_((Display*d, Drawable dr, Window*w, int*i1, int*i2, unsigned int*ui1, unsigned int*ui2, unsigned int*ui3, unsigned int*ui4)); /* 41 */ - void (*xGetInputFocus) _ANSI_ARGS_((Display*d, Window*w, int*i)); /* 42 */ - int (*xGetWindowProperty) _ANSI_ARGS_((Display*d, Window w, Atom a1, long l1, long l2, Bool b, Atom a2, Atom*ap, int*ip, unsigned long*ulp1, unsigned long*ulp2, unsigned char**cpp)); /* 43 */ - Status (*xGetWindowAttributes) _ANSI_ARGS_((Display*d, Window w, XWindowAttributes*x)); /* 44 */ - int (*xGrabKeyboard) _ANSI_ARGS_((Display*d, Window w, Bool b, int i1, int i2, Time t)); /* 45 */ - int (*xGrabPointer) _ANSI_ARGS_((Display*d, Window w1, Bool b, unsigned int ui, int i1, int i2, Window w2, Cursor c, Time t)); /* 46 */ - KeyCode (*xKeysymToKeycode) _ANSI_ARGS_((Display*d, KeySym k)); /* 47 */ - Status (*xLookupColor) _ANSI_ARGS_((Display*d, Colormap c1, _Xconst char*c2, XColor*x1, XColor*x2)); /* 48 */ - void (*xMapWindow) _ANSI_ARGS_((Display*d, Window w)); /* 49 */ - void (*xMoveResizeWindow) _ANSI_ARGS_((Display*d, Window w, int i1, int i2, unsigned int ui1, unsigned int ui2)); /* 50 */ - void (*xMoveWindow) _ANSI_ARGS_((Display*d, Window w, int i1, int i2)); /* 51 */ - void (*xNextEvent) _ANSI_ARGS_((Display*d, XEvent*x)); /* 52 */ - void (*xPutBackEvent) _ANSI_ARGS_((Display*d, XEvent*x)); /* 53 */ - void (*xQueryColors) _ANSI_ARGS_((Display*d, Colormap c, XColor*x, int i)); /* 54 */ - Bool (*xQueryPointer) _ANSI_ARGS_((Display*d, Window w1, Window*w2, Window*w3, int*i1, int*i2, int*i3, int*i4, unsigned int*ui)); /* 55 */ - Status (*xQueryTree) _ANSI_ARGS_((Display*d, Window w1, Window*w2, Window*w3, Window**w4, unsigned int*ui)); /* 56 */ - void (*xRaiseWindow) _ANSI_ARGS_((Display*d, Window w)); /* 57 */ - void (*xRefreshKeyboardMapping) _ANSI_ARGS_((XMappingEvent*x)); /* 58 */ - void (*xResizeWindow) _ANSI_ARGS_((Display*d, Window w, unsigned int ui1, unsigned int ui2)); /* 59 */ - void (*xSelectInput) _ANSI_ARGS_((Display*d, Window w, long l)); /* 60 */ - Status (*xSendEvent) _ANSI_ARGS_((Display*d, Window w, Bool b, long l, XEvent*x)); /* 61 */ - void (*xSetCommand) _ANSI_ARGS_((Display*d, Window w, CONST char**c, int i)); /* 62 */ - void (*xSetIconName) _ANSI_ARGS_((Display*d, Window w, _Xconst char*c)); /* 63 */ - void (*xSetInputFocus) _ANSI_ARGS_((Display*d, Window w, int i, Time t)); /* 64 */ - void (*xSetSelectionOwner) _ANSI_ARGS_((Display*d, Atom a, Window w, Time t)); /* 65 */ - void (*xSetWindowBackground) _ANSI_ARGS_((Display*d, Window w, unsigned long ul)); /* 66 */ - void (*xSetWindowBackgroundPixmap) _ANSI_ARGS_((Display*d, Window w, Pixmap p)); /* 67 */ - void (*xSetWindowBorder) _ANSI_ARGS_((Display*d, Window w, unsigned long ul)); /* 68 */ - void (*xSetWindowBorderPixmap) _ANSI_ARGS_((Display*d, Window w, Pixmap p)); /* 69 */ - void (*xSetWindowBorderWidth) _ANSI_ARGS_((Display*d, Window w, unsigned int ui)); /* 70 */ - void (*xSetWindowColormap) _ANSI_ARGS_((Display*d, Window w, Colormap c)); /* 71 */ - Bool (*xTranslateCoordinates) _ANSI_ARGS_((Display*d, Window w1, Window w2, int i1, int i2, int*i3, int*i4, Window*w3)); /* 72 */ - void (*xUngrabKeyboard) _ANSI_ARGS_((Display*d, Time t)); /* 73 */ - void (*xUngrabPointer) _ANSI_ARGS_((Display*d, Time t)); /* 74 */ - void (*xUnmapWindow) _ANSI_ARGS_((Display*d, Window w)); /* 75 */ - void (*xWindowEvent) _ANSI_ARGS_((Display*d, Window w, long l, XEvent*x)); /* 76 */ + Status (*xIconifyWindow) _ANSI_ARGS_((Display *d, Window w, int i)); /* 15 */ + Status (*xWithdrawWindow) _ANSI_ARGS_((Display *d, Window w, int i)); /* 16 */ + Status (*xGetWMColormapWindows) _ANSI_ARGS_((Display *d, Window w, Window **wpp, int *ip)); /* 17 */ + Status (*xAllocColor) _ANSI_ARGS_((Display *d, Colormap c, XColor *xp)); /* 18 */ + void (*xBell) _ANSI_ARGS_((Display *d, int i)); /* 19 */ + void (*xChangeProperty) _ANSI_ARGS_((Display *d, Window w, Atom a1, Atom a2, int i1, int i2, _Xconst unsigned char *c, int i3)); /* 20 */ + void (*xChangeWindowAttributes) _ANSI_ARGS_((Display *d, Window w, unsigned long ul, XSetWindowAttributes *x)); /* 21 */ + void (*xClearWindow) _ANSI_ARGS_((Display *d, Window w)); /* 22 */ + void (*xConfigureWindow) _ANSI_ARGS_((Display *d, Window w, unsigned int i, XWindowChanges *x)); /* 23 */ + void (*xCopyArea) _ANSI_ARGS_((Display *d, Drawable dr1, Drawable dr2, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4)); /* 24 */ + void (*xCopyPlane) _ANSI_ARGS_((Display *d, Drawable dr1, Drawable dr2, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4, unsigned long ul)); /* 25 */ + Pixmap (*xCreateBitmapFromData) _ANSI_ARGS_((Display *display, Drawable d, _Xconst char *data, unsigned int width, unsigned int height)); /* 26 */ + void (*xDefineCursor) _ANSI_ARGS_((Display *d, Window w, Cursor c)); /* 27 */ + void (*xDeleteProperty) _ANSI_ARGS_((Display *d, Window w, Atom a)); /* 28 */ + void (*xDestroyWindow) _ANSI_ARGS_((Display *d, Window w)); /* 29 */ + void (*xDrawArc) _ANSI_ARGS_((Display *d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4)); /* 30 */ + void (*xDrawLines) _ANSI_ARGS_((Display *d, Drawable dr, GC g, XPoint *x, int i1, int i2)); /* 31 */ + void (*xDrawRectangle) _ANSI_ARGS_((Display *d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2)); /* 32 */ + void (*xFillArc) _ANSI_ARGS_((Display *d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4)); /* 33 */ + void (*xFillPolygon) _ANSI_ARGS_((Display *d, Drawable dr, GC g, XPoint *x, int i1, int i2, int i3)); /* 34 */ + void (*xFillRectangles) _ANSI_ARGS_((Display *d, Drawable dr, GC g, XRectangle *x, int i)); /* 35 */ + void (*xForceScreenSaver) _ANSI_ARGS_((Display *d, int i)); /* 36 */ + void (*xFreeColormap) _ANSI_ARGS_((Display *d, Colormap c)); /* 37 */ + void (*xFreeColors) _ANSI_ARGS_((Display *d, Colormap c, unsigned long *ulp, int i, unsigned long ul)); /* 38 */ + void (*xFreeCursor) _ANSI_ARGS_((Display *d, Cursor c)); /* 39 */ + void (*xFreeModifiermap) _ANSI_ARGS_((XModifierKeymap *x)); /* 40 */ + Status (*xGetGeometry) _ANSI_ARGS_((Display *d, Drawable dr, Window *w, int *i1, int *i2, unsigned int *ui1, unsigned int *ui2, unsigned int *ui3, unsigned int *ui4)); /* 41 */ + void (*xGetInputFocus) _ANSI_ARGS_((Display *d, Window *w, int *i)); /* 42 */ + int (*xGetWindowProperty) _ANSI_ARGS_((Display *d, Window w, Atom a1, long l1, long l2, Bool b, Atom a2, Atom *ap, int *ip, unsigned long *ulp1, unsigned long *ulp2, unsigned char **cpp)); /* 43 */ + Status (*xGetWindowAttributes) _ANSI_ARGS_((Display *d, Window w, XWindowAttributes *x)); /* 44 */ + int (*xGrabKeyboard) _ANSI_ARGS_((Display *d, Window w, Bool b, int i1, int i2, Time t)); /* 45 */ + int (*xGrabPointer) _ANSI_ARGS_((Display *d, Window w1, Bool b, unsigned int ui, int i1, int i2, Window w2, Cursor c, Time t)); /* 46 */ + KeyCode (*xKeysymToKeycode) _ANSI_ARGS_((Display *d, KeySym k)); /* 47 */ + Status (*xLookupColor) _ANSI_ARGS_((Display *d, Colormap c1, _Xconst char *c2, XColor *x1, XColor *x2)); /* 48 */ + void (*xMapWindow) _ANSI_ARGS_((Display *d, Window w)); /* 49 */ + void (*xMoveResizeWindow) _ANSI_ARGS_((Display *d, Window w, int i1, int i2, unsigned int ui1, unsigned int ui2)); /* 50 */ + void (*xMoveWindow) _ANSI_ARGS_((Display *d, Window w, int i1, int i2)); /* 51 */ + void (*xNextEvent) _ANSI_ARGS_((Display *d, XEvent *x)); /* 52 */ + void (*xPutBackEvent) _ANSI_ARGS_((Display *d, XEvent *x)); /* 53 */ + void (*xQueryColors) _ANSI_ARGS_((Display *d, Colormap c, XColor *x, int i)); /* 54 */ + Bool (*xQueryPointer) _ANSI_ARGS_((Display *d, Window w1, Window *w2, Window *w3, int *i1, int *i2, int *i3, int *i4, unsigned int *ui)); /* 55 */ + Status (*xQueryTree) _ANSI_ARGS_((Display *d, Window w1, Window *w2, Window *w3, Window **w4, unsigned int *ui)); /* 56 */ + void (*xRaiseWindow) _ANSI_ARGS_((Display *d, Window w)); /* 57 */ + void (*xRefreshKeyboardMapping) _ANSI_ARGS_((XMappingEvent *x)); /* 58 */ + void (*xResizeWindow) _ANSI_ARGS_((Display *d, Window w, unsigned int ui1, unsigned int ui2)); /* 59 */ + void (*xSelectInput) _ANSI_ARGS_((Display *d, Window w, long l)); /* 60 */ + Status (*xSendEvent) _ANSI_ARGS_((Display *d, Window w, Bool b, long l, XEvent *x)); /* 61 */ + void (*xSetCommand) _ANSI_ARGS_((Display *d, Window w, CONST char **c, int i)); /* 62 */ + void (*xSetIconName) _ANSI_ARGS_((Display *d, Window w, _Xconst char *c)); /* 63 */ + void (*xSetInputFocus) _ANSI_ARGS_((Display *d, Window w, int i, Time t)); /* 64 */ + void (*xSetSelectionOwner) _ANSI_ARGS_((Display *d, Atom a, Window w, Time t)); /* 65 */ + void (*xSetWindowBackground) _ANSI_ARGS_((Display *d, Window w, unsigned long ul)); /* 66 */ + void (*xSetWindowBackgroundPixmap) _ANSI_ARGS_((Display *d, Window w, Pixmap p)); /* 67 */ + void (*xSetWindowBorder) _ANSI_ARGS_((Display *d, Window w, unsigned long ul)); /* 68 */ + void (*xSetWindowBorderPixmap) _ANSI_ARGS_((Display *d, Window w, Pixmap p)); /* 69 */ + void (*xSetWindowBorderWidth) _ANSI_ARGS_((Display *d, Window w, unsigned int ui)); /* 70 */ + void (*xSetWindowColormap) _ANSI_ARGS_((Display *d, Window w, Colormap c)); /* 71 */ + Bool (*xTranslateCoordinates) _ANSI_ARGS_((Display *d, Window w1, Window w2, int i1, int i2, int *i3, int *i4, Window *w3)); /* 72 */ + void (*xUngrabKeyboard) _ANSI_ARGS_((Display *d, Time t)); /* 73 */ + void (*xUngrabPointer) _ANSI_ARGS_((Display *d, Time t)); /* 74 */ + void (*xUnmapWindow) _ANSI_ARGS_((Display *d, Window w)); /* 75 */ + void (*xWindowEvent) _ANSI_ARGS_((Display *d, Window w, long l, XEvent *x)); /* 76 */ void (*xDestroyIC) _ANSI_ARGS_((XIC x)); /* 77 */ - Bool (*xFilterEvent) _ANSI_ARGS_((XEvent*x, Window w)); /* 78 */ - int (*xmbLookupString) _ANSI_ARGS_((XIC xi, XKeyPressedEvent*xk, char*c, int i, KeySym*k, Status*s)); /* 79 */ - void (*tkPutImage) _ANSI_ARGS_((unsigned long *colors, int ncolors, Display*display, Drawable d, GC gc, XImage*image, int src_x, int src_y, int dest_x, int dest_y, unsigned int width, unsigned int height)); /* 80 */ + Bool (*xFilterEvent) _ANSI_ARGS_((XEvent *x, Window w)); /* 78 */ + int (*xmbLookupString) _ANSI_ARGS_((XIC xi, XKeyPressedEvent *xk, char *c, int i, KeySym *k, Status *s)); /* 79 */ + void (*tkPutImage) _ANSI_ARGS_((unsigned long *colors, int ncolors, Display *display, Drawable d, GC gc, XImage *image, int src_x, int src_y, int dest_x, int dest_y, unsigned int width, unsigned int height)); /* 80 */ VOID *reserved81; - Status (*xParseColor) _ANSI_ARGS_((Display *display, Colormap map, _Xconst char*spec, XColor *colorPtr)); /* 82 */ - GC (*xCreateGC) _ANSI_ARGS_((Display*display, Drawable d, unsigned long valuemask, XGCValues*values)); /* 83 */ - void (*xFreeGC) _ANSI_ARGS_((Display*display, GC gc)); /* 84 */ - Atom (*xInternAtom) _ANSI_ARGS_((Display*display, _Xconst char*atom_name, Bool only_if_exists)); /* 85 */ - void (*xSetBackground) _ANSI_ARGS_((Display*display, GC gc, unsigned long foreground)); /* 86 */ - void (*xSetForeground) _ANSI_ARGS_((Display*display, GC gc, unsigned long foreground)); /* 87 */ - void (*xSetClipMask) _ANSI_ARGS_((Display*display, GC gc, Pixmap pixmap)); /* 88 */ - void (*xSetClipOrigin) _ANSI_ARGS_((Display*display, GC gc, int clip_x_origin, int clip_y_origin)); /* 89 */ - void (*xSetTSOrigin) _ANSI_ARGS_((Display*display, GC gc, int ts_x_origin, int ts_y_origin)); /* 90 */ + Status (*xParseColor) _ANSI_ARGS_((Display *display, Colormap map, _Xconst char *spec, XColor *colorPtr)); /* 82 */ + GC (*xCreateGC) _ANSI_ARGS_((Display *display, Drawable d, unsigned long valuemask, XGCValues *values)); /* 83 */ + void (*xFreeGC) _ANSI_ARGS_((Display *display, GC gc)); /* 84 */ + Atom (*xInternAtom) _ANSI_ARGS_((Display *display, _Xconst char *atom_name, Bool only_if_exists)); /* 85 */ + void (*xSetBackground) _ANSI_ARGS_((Display *display, GC gc, unsigned long foreground)); /* 86 */ + void (*xSetForeground) _ANSI_ARGS_((Display *display, GC gc, unsigned long foreground)); /* 87 */ + void (*xSetClipMask) _ANSI_ARGS_((Display *display, GC gc, Pixmap pixmap)); /* 88 */ + void (*xSetClipOrigin) _ANSI_ARGS_((Display *display, GC gc, int clip_x_origin, int clip_y_origin)); /* 89 */ + void (*xSetTSOrigin) _ANSI_ARGS_((Display *display, GC gc, int ts_x_origin, int ts_y_origin)); /* 90 */ void (*xChangeGC) _ANSI_ARGS_((Display *d, GC gc, unsigned long mask, XGCValues *values)); /* 91 */ void (*xSetFont) _ANSI_ARGS_((Display *display, GC gc, Font font)); /* 92 */ void (*xSetArcMode) _ANSI_ARGS_((Display *display, GC gc, int arc_mode)); /* 93 */ @@ -1048,81 +1053,81 @@ typedef struct TkIntXlibStubs { void (*xSetLineAttributes) _ANSI_ARGS_((Display *display, GC gc, unsigned int line_width, int line_style, int cap_style, int join_style)); /* 98 */ int (*_XInitImageFuncPtrs) _ANSI_ARGS_((XImage *image)); /* 99 */ XIC (*xCreateIC) _ANSI_ARGS_((void)); /* 100 */ - XVisualInfo * (*xGetVisualInfo) _ANSI_ARGS_((Display*display, long vinfo_mask, XVisualInfo*vinfo_template, int*nitems_return)); /* 101 */ - void (*xSetWMClientMachine) _ANSI_ARGS_((Display*display, Window w, XTextProperty*text_prop)); /* 102 */ - Status (*xStringListToTextProperty) _ANSI_ARGS_((char**list, int count, XTextProperty*text_prop_return)); /* 103 */ - void (*xDrawLine) _ANSI_ARGS_((Display*d, Drawable dr, GC g, int x1, int y1, int x2, int y2)); /* 104 */ - void (*xWarpPointer) _ANSI_ARGS_((Display*d, Window s, Window dw, int sx, int sy, unsigned int sw, unsigned int sh, int dx, int dy)); /* 105 */ - void (*xFillRectangle) _ANSI_ARGS_((Display*display, Drawable d, GC gc, int x, int y, unsigned int width, unsigned int height)); /* 106 */ + XVisualInfo * (*xGetVisualInfo) _ANSI_ARGS_((Display *display, long vinfo_mask, XVisualInfo *vinfo_template, int *nitems_return)); /* 101 */ + void (*xSetWMClientMachine) _ANSI_ARGS_((Display *display, Window w, XTextProperty *text_prop)); /* 102 */ + Status (*xStringListToTextProperty) _ANSI_ARGS_((char **list, int count, XTextProperty *text_prop_return)); /* 103 */ + void (*xDrawLine) _ANSI_ARGS_((Display *d, Drawable dr, GC g, int x1, int y1, int x2, int y2)); /* 104 */ + void (*xWarpPointer) _ANSI_ARGS_((Display *d, Window s, Window dw, int sx, int sy, unsigned int sw, unsigned int sh, int dx, int dy)); /* 105 */ + void (*xFillRectangle) _ANSI_ARGS_((Display *display, Drawable d, GC gc, int x, int y, unsigned int width, unsigned int height)); /* 106 */ #endif /* __WIN32__ */ #ifdef MAC_TCL - void (*xSetDashes) _ANSI_ARGS_((Display*display, GC gc, int dash_offset, _Xconst char*dash_list, int n)); /* 0 */ - XModifierKeymap* (*xGetModifierMapping) _ANSI_ARGS_((Display*d)); /* 1 */ - XImage * (*xCreateImage) _ANSI_ARGS_((Display*d, Visual*v, unsigned int ui1, int i1, int i2, char*cp, unsigned int ui2, unsigned int ui3, int i3, int i4)); /* 2 */ - XImage * (*xGetImage) _ANSI_ARGS_((Display*d, Drawable dr, int i1, int i2, unsigned int ui1, unsigned int ui2, unsigned long ul, int i3)); /* 3 */ - char * (*xGetAtomName) _ANSI_ARGS_((Display*d, Atom a)); /* 4 */ + void (*xSetDashes) _ANSI_ARGS_((Display *display, GC gc, int dash_offset, _Xconst char *dash_list, int n)); /* 0 */ + XModifierKeymap * (*xGetModifierMapping) _ANSI_ARGS_((Display *d)); /* 1 */ + XImage * (*xCreateImage) _ANSI_ARGS_((Display *d, Visual *v, unsigned int ui1, int i1, int i2, char *cp, unsigned int ui2, unsigned int ui3, int i3, int i4)); /* 2 */ + XImage * (*xGetImage) _ANSI_ARGS_((Display *d, Drawable dr, int i1, int i2, unsigned int ui1, unsigned int ui2, unsigned long ul, int i3)); /* 3 */ + char * (*xGetAtomName) _ANSI_ARGS_((Display *d, Atom a)); /* 4 */ char * (*xKeysymToString) _ANSI_ARGS_((KeySym k)); /* 5 */ - Colormap (*xCreateColormap) _ANSI_ARGS_((Display*d, Window w, Visual*v, int i)); /* 6 */ + Colormap (*xCreateColormap) _ANSI_ARGS_((Display *d, Window w, Visual *v, int i)); /* 6 */ GContext (*xGContextFromGC) _ANSI_ARGS_((GC g)); /* 7 */ - KeySym (*xKeycodeToKeysym) _ANSI_ARGS_((Display*d, KeyCode k, int i)); /* 8 */ - KeySym (*xStringToKeysym) _ANSI_ARGS_((_Xconst char*c)); /* 9 */ - Window (*xRootWindow) _ANSI_ARGS_((Display*d, int i)); /* 10 */ + KeySym (*xKeycodeToKeysym) _ANSI_ARGS_((Display *d, KeyCode k, int i)); /* 8 */ + KeySym (*xStringToKeysym) _ANSI_ARGS_((_Xconst char *c)); /* 9 */ + Window (*xRootWindow) _ANSI_ARGS_((Display *d, int i)); /* 10 */ XErrorHandler (*xSetErrorHandler) _ANSI_ARGS_((XErrorHandler x)); /* 11 */ - Status (*xAllocColor) _ANSI_ARGS_((Display*d, Colormap c, XColor*xp)); /* 12 */ - void (*xBell) _ANSI_ARGS_((Display*d, int i)); /* 13 */ - void (*xChangeProperty) _ANSI_ARGS_((Display*d, Window w, Atom a1, Atom a2, int i1, int i2, _Xconst unsigned char*c, int i3)); /* 14 */ - void (*xChangeWindowAttributes) _ANSI_ARGS_((Display*d, Window w, unsigned long ul, XSetWindowAttributes*x)); /* 15 */ - void (*xConfigureWindow) _ANSI_ARGS_((Display*d, Window w, unsigned int i, XWindowChanges*x)); /* 16 */ - void (*xCopyArea) _ANSI_ARGS_((Display*d, Drawable dr1, Drawable dr2, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4)); /* 17 */ - void (*xCopyPlane) _ANSI_ARGS_((Display*d, Drawable dr1, Drawable dr2, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4, unsigned long ul)); /* 18 */ - Pixmap (*xCreateBitmapFromData) _ANSI_ARGS_((Display*display, Drawable d, _Xconst char*data, unsigned int width, unsigned int height)); /* 19 */ - void (*xDefineCursor) _ANSI_ARGS_((Display*d, Window w, Cursor c)); /* 20 */ - void (*xDestroyWindow) _ANSI_ARGS_((Display*d, Window w)); /* 21 */ - void (*xDrawArc) _ANSI_ARGS_((Display*d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4)); /* 22 */ - void (*xDrawLines) _ANSI_ARGS_((Display*d, Drawable dr, GC g, XPoint*x, int i1, int i2)); /* 23 */ - void (*xDrawRectangle) _ANSI_ARGS_((Display*d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2)); /* 24 */ - void (*xFillArc) _ANSI_ARGS_((Display*d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4)); /* 25 */ - void (*xFillPolygon) _ANSI_ARGS_((Display*d, Drawable dr, GC g, XPoint*x, int i1, int i2, int i3)); /* 26 */ - void (*xFillRectangles) _ANSI_ARGS_((Display*d, Drawable dr, GC g, XRectangle*x, int i)); /* 27 */ - void (*xFreeColormap) _ANSI_ARGS_((Display*d, Colormap c)); /* 28 */ - void (*xFreeColors) _ANSI_ARGS_((Display*d, Colormap c, unsigned long*ulp, int i, unsigned long ul)); /* 29 */ - void (*xFreeModifiermap) _ANSI_ARGS_((XModifierKeymap*x)); /* 30 */ - Status (*xGetGeometry) _ANSI_ARGS_((Display*d, Drawable dr, Window*w, int*i1, int*i2, unsigned int*ui1, unsigned int*ui2, unsigned int*ui3, unsigned int*ui4)); /* 31 */ - int (*xGetWindowProperty) _ANSI_ARGS_((Display*d, Window w, Atom a1, long l1, long l2, Bool b, Atom a2, Atom*ap, int*ip, unsigned long*ulp1, unsigned long*ulp2, unsigned char**cpp)); /* 32 */ - int (*xGrabKeyboard) _ANSI_ARGS_((Display*d, Window w, Bool b, int i1, int i2, Time t)); /* 33 */ - int (*xGrabPointer) _ANSI_ARGS_((Display*d, Window w1, Bool b, unsigned int ui, int i1, int i2, Window w2, Cursor c, Time t)); /* 34 */ - KeyCode (*xKeysymToKeycode) _ANSI_ARGS_((Display*d, KeySym k)); /* 35 */ - void (*xMapWindow) _ANSI_ARGS_((Display*d, Window w)); /* 36 */ - void (*xMoveResizeWindow) _ANSI_ARGS_((Display*d, Window w, int i1, int i2, unsigned int ui1, unsigned int ui2)); /* 37 */ - void (*xMoveWindow) _ANSI_ARGS_((Display*d, Window w, int i1, int i2)); /* 38 */ - Bool (*xQueryPointer) _ANSI_ARGS_((Display*d, Window w1, Window*w2, Window*w3, int*i1, int*i2, int*i3, int*i4, unsigned int*ui)); /* 39 */ - void (*xRaiseWindow) _ANSI_ARGS_((Display*d, Window w)); /* 40 */ - void (*xRefreshKeyboardMapping) _ANSI_ARGS_((XMappingEvent*x)); /* 41 */ - void (*xResizeWindow) _ANSI_ARGS_((Display*d, Window w, unsigned int ui1, unsigned int ui2)); /* 42 */ - void (*xSelectInput) _ANSI_ARGS_((Display*d, Window w, long l)); /* 43 */ - Status (*xSendEvent) _ANSI_ARGS_((Display*d, Window w, Bool b, long l, XEvent*x)); /* 44 */ - void (*xSetIconName) _ANSI_ARGS_((Display*d, Window w, _Xconst char*c)); /* 45 */ - void (*xSetInputFocus) _ANSI_ARGS_((Display*d, Window w, int i, Time t)); /* 46 */ - void (*xSetSelectionOwner) _ANSI_ARGS_((Display*d, Atom a, Window w, Time t)); /* 47 */ - void (*xSetWindowBackground) _ANSI_ARGS_((Display*d, Window w, unsigned long ul)); /* 48 */ - void (*xSetWindowBackgroundPixmap) _ANSI_ARGS_((Display*d, Window w, Pixmap p)); /* 49 */ - void (*xSetWindowBorder) _ANSI_ARGS_((Display*d, Window w, unsigned long ul)); /* 50 */ - void (*xSetWindowBorderPixmap) _ANSI_ARGS_((Display*d, Window w, Pixmap p)); /* 51 */ - void (*xSetWindowBorderWidth) _ANSI_ARGS_((Display*d, Window w, unsigned int ui)); /* 52 */ - void (*xSetWindowColormap) _ANSI_ARGS_((Display*d, Window w, Colormap c)); /* 53 */ - void (*xUngrabKeyboard) _ANSI_ARGS_((Display*d, Time t)); /* 54 */ - void (*xUngrabPointer) _ANSI_ARGS_((Display*d, Time t)); /* 55 */ - void (*xUnmapWindow) _ANSI_ARGS_((Display*d, Window w)); /* 56 */ - void (*tkPutImage) _ANSI_ARGS_((unsigned long *colors, int ncolors, Display*display, Drawable d, GC gc, XImage*image, int src_x, int src_y, int dest_x, int dest_y, unsigned int width, unsigned int height)); /* 57 */ - Status (*xParseColor) _ANSI_ARGS_((Display *display, Colormap map, _Xconst char*spec, XColor *colorPtr)); /* 58 */ - GC (*xCreateGC) _ANSI_ARGS_((Display*display, Drawable d, unsigned long valuemask, XGCValues*values)); /* 59 */ - void (*xFreeGC) _ANSI_ARGS_((Display*display, GC gc)); /* 60 */ - Atom (*xInternAtom) _ANSI_ARGS_((Display*display, _Xconst char*atom_name, Bool only_if_exists)); /* 61 */ - void (*xSetBackground) _ANSI_ARGS_((Display*display, GC gc, unsigned long foreground)); /* 62 */ - void (*xSetForeground) _ANSI_ARGS_((Display*display, GC gc, unsigned long foreground)); /* 63 */ - void (*xSetClipMask) _ANSI_ARGS_((Display*display, GC gc, Pixmap pixmap)); /* 64 */ - void (*xSetClipOrigin) _ANSI_ARGS_((Display*display, GC gc, int clip_x_origin, int clip_y_origin)); /* 65 */ - void (*xSetTSOrigin) _ANSI_ARGS_((Display*display, GC gc, int ts_x_origin, int ts_y_origin)); /* 66 */ + Status (*xAllocColor) _ANSI_ARGS_((Display *d, Colormap c, XColor *xp)); /* 12 */ + void (*xBell) _ANSI_ARGS_((Display *d, int i)); /* 13 */ + void (*xChangeProperty) _ANSI_ARGS_((Display *d, Window w, Atom a1, Atom a2, int i1, int i2, _Xconst unsigned char *c, int i3)); /* 14 */ + void (*xChangeWindowAttributes) _ANSI_ARGS_((Display *d, Window w, unsigned long ul, XSetWindowAttributes *x)); /* 15 */ + void (*xConfigureWindow) _ANSI_ARGS_((Display *d, Window w, unsigned int i, XWindowChanges *x)); /* 16 */ + void (*xCopyArea) _ANSI_ARGS_((Display *d, Drawable dr1, Drawable dr2, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4)); /* 17 */ + void (*xCopyPlane) _ANSI_ARGS_((Display *d, Drawable dr1, Drawable dr2, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4, unsigned long ul)); /* 18 */ + Pixmap (*xCreateBitmapFromData) _ANSI_ARGS_((Display *display, Drawable d, _Xconst char *data, unsigned int width, unsigned int height)); /* 19 */ + void (*xDefineCursor) _ANSI_ARGS_((Display *d, Window w, Cursor c)); /* 20 */ + void (*xDestroyWindow) _ANSI_ARGS_((Display *d, Window w)); /* 21 */ + void (*xDrawArc) _ANSI_ARGS_((Display *d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4)); /* 22 */ + void (*xDrawLines) _ANSI_ARGS_((Display *d, Drawable dr, GC g, XPoint *x, int i1, int i2)); /* 23 */ + void (*xDrawRectangle) _ANSI_ARGS_((Display *d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2)); /* 24 */ + void (*xFillArc) _ANSI_ARGS_((Display *d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4)); /* 25 */ + void (*xFillPolygon) _ANSI_ARGS_((Display *d, Drawable dr, GC g, XPoint *x, int i1, int i2, int i3)); /* 26 */ + void (*xFillRectangles) _ANSI_ARGS_((Display *d, Drawable dr, GC g, XRectangle *x, int i)); /* 27 */ + void (*xFreeColormap) _ANSI_ARGS_((Display *d, Colormap c)); /* 28 */ + void (*xFreeColors) _ANSI_ARGS_((Display *d, Colormap c, unsigned long *ulp, int i, unsigned long ul)); /* 29 */ + void (*xFreeModifiermap) _ANSI_ARGS_((XModifierKeymap *x)); /* 30 */ + Status (*xGetGeometry) _ANSI_ARGS_((Display *d, Drawable dr, Window *w, int *i1, int *i2, unsigned int *ui1, unsigned int *ui2, unsigned int *ui3, unsigned int *ui4)); /* 31 */ + int (*xGetWindowProperty) _ANSI_ARGS_((Display *d, Window w, Atom a1, long l1, long l2, Bool b, Atom a2, Atom *ap, int *ip, unsigned long *ulp1, unsigned long *ulp2, unsigned char **cpp)); /* 32 */ + int (*xGrabKeyboard) _ANSI_ARGS_((Display *d, Window w, Bool b, int i1, int i2, Time t)); /* 33 */ + int (*xGrabPointer) _ANSI_ARGS_((Display *d, Window w1, Bool b, unsigned int ui, int i1, int i2, Window w2, Cursor c, Time t)); /* 34 */ + KeyCode (*xKeysymToKeycode) _ANSI_ARGS_((Display *d, KeySym k)); /* 35 */ + void (*xMapWindow) _ANSI_ARGS_((Display *d, Window w)); /* 36 */ + void (*xMoveResizeWindow) _ANSI_ARGS_((Display *d, Window w, int i1, int i2, unsigned int ui1, unsigned int ui2)); /* 37 */ + void (*xMoveWindow) _ANSI_ARGS_((Display *d, Window w, int i1, int i2)); /* 38 */ + Bool (*xQueryPointer) _ANSI_ARGS_((Display *d, Window w1, Window *w2, Window *w3, int *i1, int *i2, int *i3, int *i4, unsigned int *ui)); /* 39 */ + void (*xRaiseWindow) _ANSI_ARGS_((Display *d, Window w)); /* 40 */ + void (*xRefreshKeyboardMapping) _ANSI_ARGS_((XMappingEvent *x)); /* 41 */ + void (*xResizeWindow) _ANSI_ARGS_((Display *d, Window w, unsigned int ui1, unsigned int ui2)); /* 42 */ + void (*xSelectInput) _ANSI_ARGS_((Display *d, Window w, long l)); /* 43 */ + Status (*xSendEvent) _ANSI_ARGS_((Display *d, Window w, Bool b, long l, XEvent *x)); /* 44 */ + void (*xSetIconName) _ANSI_ARGS_((Display *d, Window w, _Xconst char *c)); /* 45 */ + void (*xSetInputFocus) _ANSI_ARGS_((Display *d, Window w, int i, Time t)); /* 46 */ + void (*xSetSelectionOwner) _ANSI_ARGS_((Display *d, Atom a, Window w, Time t)); /* 47 */ + void (*xSetWindowBackground) _ANSI_ARGS_((Display *d, Window w, unsigned long ul)); /* 48 */ + void (*xSetWindowBackgroundPixmap) _ANSI_ARGS_((Display *d, Window w, Pixmap p)); /* 49 */ + void (*xSetWindowBorder) _ANSI_ARGS_((Display *d, Window w, unsigned long ul)); /* 50 */ + void (*xSetWindowBorderPixmap) _ANSI_ARGS_((Display *d, Window w, Pixmap p)); /* 51 */ + void (*xSetWindowBorderWidth) _ANSI_ARGS_((Display *d, Window w, unsigned int ui)); /* 52 */ + void (*xSetWindowColormap) _ANSI_ARGS_((Display *d, Window w, Colormap c)); /* 53 */ + void (*xUngrabKeyboard) _ANSI_ARGS_((Display *d, Time t)); /* 54 */ + void (*xUngrabPointer) _ANSI_ARGS_((Display *d, Time t)); /* 55 */ + void (*xUnmapWindow) _ANSI_ARGS_((Display *d, Window w)); /* 56 */ + void (*tkPutImage) _ANSI_ARGS_((unsigned long *colors, int ncolors, Display *display, Drawable d, GC gc, XImage *image, int src_x, int src_y, int dest_x, int dest_y, unsigned int width, unsigned int height)); /* 57 */ + Status (*xParseColor) _ANSI_ARGS_((Display *display, Colormap map, _Xconst char *spec, XColor *colorPtr)); /* 58 */ + GC (*xCreateGC) _ANSI_ARGS_((Display *display, Drawable d, unsigned long valuemask, XGCValues *values)); /* 59 */ + void (*xFreeGC) _ANSI_ARGS_((Display *display, GC gc)); /* 60 */ + Atom (*xInternAtom) _ANSI_ARGS_((Display *display, _Xconst char *atom_name, Bool only_if_exists)); /* 61 */ + void (*xSetBackground) _ANSI_ARGS_((Display *display, GC gc, unsigned long foreground)); /* 62 */ + void (*xSetForeground) _ANSI_ARGS_((Display *display, GC gc, unsigned long foreground)); /* 63 */ + void (*xSetClipMask) _ANSI_ARGS_((Display *display, GC gc, Pixmap pixmap)); /* 64 */ + void (*xSetClipOrigin) _ANSI_ARGS_((Display *display, GC gc, int clip_x_origin, int clip_y_origin)); /* 65 */ + void (*xSetTSOrigin) _ANSI_ARGS_((Display *display, GC gc, int ts_x_origin, int ts_y_origin)); /* 66 */ void (*xChangeGC) _ANSI_ARGS_((Display *d, GC gc, unsigned long mask, XGCValues *values)); /* 67 */ void (*xSetFont) _ANSI_ARGS_((Display *display, GC gc, Font font)); /* 68 */ void (*xSetArcMode) _ANSI_ARGS_((Display *display, GC gc, int arc_mode)); /* 69 */ @@ -1133,89 +1138,89 @@ typedef struct TkIntXlibStubs { void (*xSetLineAttributes) _ANSI_ARGS_((Display *display, GC gc, unsigned int line_width, int line_style, int cap_style, int join_style)); /* 74 */ int (*_XInitImageFuncPtrs) _ANSI_ARGS_((XImage *image)); /* 75 */ XIC (*xCreateIC) _ANSI_ARGS_((void)); /* 76 */ - XVisualInfo * (*xGetVisualInfo) _ANSI_ARGS_((Display*display, long vinfo_mask, XVisualInfo*vinfo_template, int*nitems_return)); /* 77 */ - void (*xSetWMClientMachine) _ANSI_ARGS_((Display*display, Window w, XTextProperty*text_prop)); /* 78 */ - Status (*xStringListToTextProperty) _ANSI_ARGS_((char**list, int count, XTextProperty*text_prop_return)); /* 79 */ + XVisualInfo * (*xGetVisualInfo) _ANSI_ARGS_((Display *display, long vinfo_mask, XVisualInfo *vinfo_template, int *nitems_return)); /* 77 */ + void (*xSetWMClientMachine) _ANSI_ARGS_((Display *display, Window w, XTextProperty *text_prop)); /* 78 */ + Status (*xStringListToTextProperty) _ANSI_ARGS_((char **list, int count, XTextProperty *text_prop_return)); /* 79 */ void (*xDrawSegments) _ANSI_ARGS_((Display *display, Drawable d, GC gc, XSegment *segments, int nsegments)); /* 80 */ - void (*xForceScreenSaver) _ANSI_ARGS_((Display*display, int mode)); /* 81 */ - void (*xDrawLine) _ANSI_ARGS_((Display*d, Drawable dr, GC g, int x1, int y1, int x2, int y2)); /* 82 */ - void (*xFillRectangle) _ANSI_ARGS_((Display*display, Drawable d, GC gc, int x, int y, unsigned int width, unsigned int height)); /* 83 */ - void (*xClearWindow) _ANSI_ARGS_((Display*d, Window w)); /* 84 */ - void (*xDrawPoint) _ANSI_ARGS_((Display*display, Drawable d, GC gc, int x, int y)); /* 85 */ - void (*xDrawPoints) _ANSI_ARGS_((Display*display, Drawable d, GC gc, XPoint *points, int npoints, int mode)); /* 86 */ - void (*xWarpPointer) _ANSI_ARGS_((Display*display, Window src_w, Window dest_w, int src_x, int src_y, unsigned int src_width, unsigned int src_height, int dest_x, int dest_y)); /* 87 */ + void (*xForceScreenSaver) _ANSI_ARGS_((Display *display, int mode)); /* 81 */ + void (*xDrawLine) _ANSI_ARGS_((Display *d, Drawable dr, GC g, int x1, int y1, int x2, int y2)); /* 82 */ + void (*xFillRectangle) _ANSI_ARGS_((Display *display, Drawable d, GC gc, int x, int y, unsigned int width, unsigned int height)); /* 83 */ + void (*xClearWindow) _ANSI_ARGS_((Display *d, Window w)); /* 84 */ + void (*xDrawPoint) _ANSI_ARGS_((Display *display, Drawable d, GC gc, int x, int y)); /* 85 */ + void (*xDrawPoints) _ANSI_ARGS_((Display *display, Drawable d, GC gc, XPoint *points, int npoints, int mode)); /* 86 */ + void (*xWarpPointer) _ANSI_ARGS_((Display *display, Window src_w, Window dest_w, int src_x, int src_y, unsigned int src_width, unsigned int src_height, int dest_x, int dest_y)); /* 87 */ void (*xQueryColor) _ANSI_ARGS_((Display *display, Colormap colormap, XColor *def_in_out)); /* 88 */ void (*xQueryColors) _ANSI_ARGS_((Display *display, Colormap colormap, XColor *defs_in_out, int ncolors)); /* 89 */ - Status (*xQueryTree) _ANSI_ARGS_((Display*d, Window w1, Window*w2, Window*w3, Window**w4, unsigned int*ui)); /* 90 */ + Status (*xQueryTree) _ANSI_ARGS_((Display *d, Window w1, Window *w2, Window *w3, Window **w4, unsigned int *ui)); /* 90 */ #endif /* MAC_TCL */ #ifdef MAC_OSX_TK - void (*xSetDashes) _ANSI_ARGS_((Display*display, GC gc, int dash_offset, _Xconst char*dash_list, int n)); /* 0 */ - XModifierKeymap* (*xGetModifierMapping) _ANSI_ARGS_((Display*d)); /* 1 */ - XImage * (*xCreateImage) _ANSI_ARGS_((Display*d, Visual*v, unsigned int ui1, int i1, int i2, char*cp, unsigned int ui2, unsigned int ui3, int i3, int i4)); /* 2 */ - XImage * (*xGetImage) _ANSI_ARGS_((Display*d, Drawable dr, int i1, int i2, unsigned int ui1, unsigned int ui2, unsigned long ul, int i3)); /* 3 */ - char * (*xGetAtomName) _ANSI_ARGS_((Display*d, Atom a)); /* 4 */ + void (*xSetDashes) _ANSI_ARGS_((Display *display, GC gc, int dash_offset, _Xconst char *dash_list, int n)); /* 0 */ + XModifierKeymap * (*xGetModifierMapping) _ANSI_ARGS_((Display *d)); /* 1 */ + XImage * (*xCreateImage) _ANSI_ARGS_((Display *d, Visual *v, unsigned int ui1, int i1, int i2, char *cp, unsigned int ui2, unsigned int ui3, int i3, int i4)); /* 2 */ + XImage * (*xGetImage) _ANSI_ARGS_((Display *d, Drawable dr, int i1, int i2, unsigned int ui1, unsigned int ui2, unsigned long ul, int i3)); /* 3 */ + char * (*xGetAtomName) _ANSI_ARGS_((Display *d, Atom a)); /* 4 */ char * (*xKeysymToString) _ANSI_ARGS_((KeySym k)); /* 5 */ - Colormap (*xCreateColormap) _ANSI_ARGS_((Display*d, Window w, Visual*v, int i)); /* 6 */ + Colormap (*xCreateColormap) _ANSI_ARGS_((Display *d, Window w, Visual *v, int i)); /* 6 */ GContext (*xGContextFromGC) _ANSI_ARGS_((GC g)); /* 7 */ - KeySym (*xKeycodeToKeysym) _ANSI_ARGS_((Display*d, KeyCode k, int i)); /* 8 */ - KeySym (*xStringToKeysym) _ANSI_ARGS_((_Xconst char*c)); /* 9 */ - Window (*xRootWindow) _ANSI_ARGS_((Display*d, int i)); /* 10 */ + KeySym (*xKeycodeToKeysym) _ANSI_ARGS_((Display *d, KeyCode k, int i)); /* 8 */ + KeySym (*xStringToKeysym) _ANSI_ARGS_((_Xconst char *c)); /* 9 */ + Window (*xRootWindow) _ANSI_ARGS_((Display *d, int i)); /* 10 */ XErrorHandler (*xSetErrorHandler) _ANSI_ARGS_((XErrorHandler x)); /* 11 */ - Status (*xAllocColor) _ANSI_ARGS_((Display*d, Colormap c, XColor*xp)); /* 12 */ - void (*xBell) _ANSI_ARGS_((Display*d, int i)); /* 13 */ - void (*xChangeProperty) _ANSI_ARGS_((Display*d, Window w, Atom a1, Atom a2, int i1, int i2, _Xconst unsigned char*c, int i3)); /* 14 */ - void (*xChangeWindowAttributes) _ANSI_ARGS_((Display*d, Window w, unsigned long ul, XSetWindowAttributes*x)); /* 15 */ - void (*xConfigureWindow) _ANSI_ARGS_((Display*d, Window w, unsigned int i, XWindowChanges*x)); /* 16 */ - void (*xCopyArea) _ANSI_ARGS_((Display*d, Drawable dr1, Drawable dr2, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4)); /* 17 */ - void (*xCopyPlane) _ANSI_ARGS_((Display*d, Drawable dr1, Drawable dr2, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4, unsigned long ul)); /* 18 */ - Pixmap (*xCreateBitmapFromData) _ANSI_ARGS_((Display*display, Drawable d, _Xconst char*data, unsigned int width, unsigned int height)); /* 19 */ - void (*xDefineCursor) _ANSI_ARGS_((Display*d, Window w, Cursor c)); /* 20 */ - void (*xDestroyWindow) _ANSI_ARGS_((Display*d, Window w)); /* 21 */ - void (*xDrawArc) _ANSI_ARGS_((Display*d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4)); /* 22 */ - void (*xDrawLines) _ANSI_ARGS_((Display*d, Drawable dr, GC g, XPoint*x, int i1, int i2)); /* 23 */ - void (*xDrawRectangle) _ANSI_ARGS_((Display*d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2)); /* 24 */ - void (*xFillArc) _ANSI_ARGS_((Display*d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4)); /* 25 */ - void (*xFillPolygon) _ANSI_ARGS_((Display*d, Drawable dr, GC g, XPoint*x, int i1, int i2, int i3)); /* 26 */ - void (*xFillRectangles) _ANSI_ARGS_((Display*d, Drawable dr, GC g, XRectangle*x, int i)); /* 27 */ - void (*xFreeColormap) _ANSI_ARGS_((Display*d, Colormap c)); /* 28 */ - void (*xFreeColors) _ANSI_ARGS_((Display*d, Colormap c, unsigned long*ulp, int i, unsigned long ul)); /* 29 */ - void (*xFreeModifiermap) _ANSI_ARGS_((XModifierKeymap*x)); /* 30 */ - Status (*xGetGeometry) _ANSI_ARGS_((Display*d, Drawable dr, Window*w, int*i1, int*i2, unsigned int*ui1, unsigned int*ui2, unsigned int*ui3, unsigned int*ui4)); /* 31 */ - int (*xGetWindowProperty) _ANSI_ARGS_((Display*d, Window w, Atom a1, long l1, long l2, Bool b, Atom a2, Atom*ap, int*ip, unsigned long*ulp1, unsigned long*ulp2, unsigned char**cpp)); /* 32 */ - int (*xGrabKeyboard) _ANSI_ARGS_((Display*d, Window w, Bool b, int i1, int i2, Time t)); /* 33 */ - int (*xGrabPointer) _ANSI_ARGS_((Display*d, Window w1, Bool b, unsigned int ui, int i1, int i2, Window w2, Cursor c, Time t)); /* 34 */ - KeyCode (*xKeysymToKeycode) _ANSI_ARGS_((Display*d, KeySym k)); /* 35 */ - void (*xMapWindow) _ANSI_ARGS_((Display*d, Window w)); /* 36 */ - void (*xMoveResizeWindow) _ANSI_ARGS_((Display*d, Window w, int i1, int i2, unsigned int ui1, unsigned int ui2)); /* 37 */ - void (*xMoveWindow) _ANSI_ARGS_((Display*d, Window w, int i1, int i2)); /* 38 */ - Bool (*xQueryPointer) _ANSI_ARGS_((Display*d, Window w1, Window*w2, Window*w3, int*i1, int*i2, int*i3, int*i4, unsigned int*ui)); /* 39 */ - void (*xRaiseWindow) _ANSI_ARGS_((Display*d, Window w)); /* 40 */ - void (*xRefreshKeyboardMapping) _ANSI_ARGS_((XMappingEvent*x)); /* 41 */ - void (*xResizeWindow) _ANSI_ARGS_((Display*d, Window w, unsigned int ui1, unsigned int ui2)); /* 42 */ - void (*xSelectInput) _ANSI_ARGS_((Display*d, Window w, long l)); /* 43 */ - Status (*xSendEvent) _ANSI_ARGS_((Display*d, Window w, Bool b, long l, XEvent*x)); /* 44 */ - void (*xSetIconName) _ANSI_ARGS_((Display*d, Window w, _Xconst char*c)); /* 45 */ - void (*xSetInputFocus) _ANSI_ARGS_((Display*d, Window w, int i, Time t)); /* 46 */ - void (*xSetSelectionOwner) _ANSI_ARGS_((Display*d, Atom a, Window w, Time t)); /* 47 */ - void (*xSetWindowBackground) _ANSI_ARGS_((Display*d, Window w, unsigned long ul)); /* 48 */ - void (*xSetWindowBackgroundPixmap) _ANSI_ARGS_((Display*d, Window w, Pixmap p)); /* 49 */ - void (*xSetWindowBorder) _ANSI_ARGS_((Display*d, Window w, unsigned long ul)); /* 50 */ - void (*xSetWindowBorderPixmap) _ANSI_ARGS_((Display*d, Window w, Pixmap p)); /* 51 */ - void (*xSetWindowBorderWidth) _ANSI_ARGS_((Display*d, Window w, unsigned int ui)); /* 52 */ - void (*xSetWindowColormap) _ANSI_ARGS_((Display*d, Window w, Colormap c)); /* 53 */ - void (*xUngrabKeyboard) _ANSI_ARGS_((Display*d, Time t)); /* 54 */ - void (*xUngrabPointer) _ANSI_ARGS_((Display*d, Time t)); /* 55 */ - void (*xUnmapWindow) _ANSI_ARGS_((Display*d, Window w)); /* 56 */ - void (*tkPutImage) _ANSI_ARGS_((unsigned long *colors, int ncolors, Display*display, Drawable d, GC gc, XImage*image, int src_x, int src_y, int dest_x, int dest_y, unsigned int width, unsigned int height)); /* 57 */ - Status (*xParseColor) _ANSI_ARGS_((Display *display, Colormap map, _Xconst char*spec, XColor *colorPtr)); /* 58 */ - GC (*xCreateGC) _ANSI_ARGS_((Display*display, Drawable d, unsigned long valuemask, XGCValues*values)); /* 59 */ - void (*xFreeGC) _ANSI_ARGS_((Display*display, GC gc)); /* 60 */ - Atom (*xInternAtom) _ANSI_ARGS_((Display*display, _Xconst char*atom_name, Bool only_if_exists)); /* 61 */ - void (*xSetBackground) _ANSI_ARGS_((Display*display, GC gc, unsigned long foreground)); /* 62 */ - void (*xSetForeground) _ANSI_ARGS_((Display*display, GC gc, unsigned long foreground)); /* 63 */ - void (*xSetClipMask) _ANSI_ARGS_((Display*display, GC gc, Pixmap pixmap)); /* 64 */ - void (*xSetClipOrigin) _ANSI_ARGS_((Display*display, GC gc, int clip_x_origin, int clip_y_origin)); /* 65 */ - void (*xSetTSOrigin) _ANSI_ARGS_((Display*display, GC gc, int ts_x_origin, int ts_y_origin)); /* 66 */ + Status (*xAllocColor) _ANSI_ARGS_((Display *d, Colormap c, XColor *xp)); /* 12 */ + void (*xBell) _ANSI_ARGS_((Display *d, int i)); /* 13 */ + void (*xChangeProperty) _ANSI_ARGS_((Display *d, Window w, Atom a1, Atom a2, int i1, int i2, _Xconst unsigned char *c, int i3)); /* 14 */ + void (*xChangeWindowAttributes) _ANSI_ARGS_((Display *d, Window w, unsigned long ul, XSetWindowAttributes *x)); /* 15 */ + void (*xConfigureWindow) _ANSI_ARGS_((Display *d, Window w, unsigned int i, XWindowChanges *x)); /* 16 */ + void (*xCopyArea) _ANSI_ARGS_((Display *d, Drawable dr1, Drawable dr2, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4)); /* 17 */ + void (*xCopyPlane) _ANSI_ARGS_((Display *d, Drawable dr1, Drawable dr2, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4, unsigned long ul)); /* 18 */ + Pixmap (*xCreateBitmapFromData) _ANSI_ARGS_((Display *display, Drawable d, _Xconst char *data, unsigned int width, unsigned int height)); /* 19 */ + void (*xDefineCursor) _ANSI_ARGS_((Display *d, Window w, Cursor c)); /* 20 */ + void (*xDestroyWindow) _ANSI_ARGS_((Display *d, Window w)); /* 21 */ + void (*xDrawArc) _ANSI_ARGS_((Display *d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4)); /* 22 */ + void (*xDrawLines) _ANSI_ARGS_((Display *d, Drawable dr, GC g, XPoint *x, int i1, int i2)); /* 23 */ + void (*xDrawRectangle) _ANSI_ARGS_((Display *d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2)); /* 24 */ + void (*xFillArc) _ANSI_ARGS_((Display *d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4)); /* 25 */ + void (*xFillPolygon) _ANSI_ARGS_((Display *d, Drawable dr, GC g, XPoint *x, int i1, int i2, int i3)); /* 26 */ + void (*xFillRectangles) _ANSI_ARGS_((Display *d, Drawable dr, GC g, XRectangle *x, int i)); /* 27 */ + void (*xFreeColormap) _ANSI_ARGS_((Display *d, Colormap c)); /* 28 */ + void (*xFreeColors) _ANSI_ARGS_((Display *d, Colormap c, unsigned long *ulp, int i, unsigned long ul)); /* 29 */ + void (*xFreeModifiermap) _ANSI_ARGS_((XModifierKeymap *x)); /* 30 */ + Status (*xGetGeometry) _ANSI_ARGS_((Display *d, Drawable dr, Window *w, int *i1, int *i2, unsigned int *ui1, unsigned int *ui2, unsigned int *ui3, unsigned int *ui4)); /* 31 */ + int (*xGetWindowProperty) _ANSI_ARGS_((Display *d, Window w, Atom a1, long l1, long l2, Bool b, Atom a2, Atom *ap, int *ip, unsigned long *ulp1, unsigned long *ulp2, unsigned char **cpp)); /* 32 */ + int (*xGrabKeyboard) _ANSI_ARGS_((Display *d, Window w, Bool b, int i1, int i2, Time t)); /* 33 */ + int (*xGrabPointer) _ANSI_ARGS_((Display *d, Window w1, Bool b, unsigned int ui, int i1, int i2, Window w2, Cursor c, Time t)); /* 34 */ + KeyCode (*xKeysymToKeycode) _ANSI_ARGS_((Display *d, KeySym k)); /* 35 */ + void (*xMapWindow) _ANSI_ARGS_((Display *d, Window w)); /* 36 */ + void (*xMoveResizeWindow) _ANSI_ARGS_((Display *d, Window w, int i1, int i2, unsigned int ui1, unsigned int ui2)); /* 37 */ + void (*xMoveWindow) _ANSI_ARGS_((Display *d, Window w, int i1, int i2)); /* 38 */ + Bool (*xQueryPointer) _ANSI_ARGS_((Display *d, Window w1, Window *w2, Window *w3, int *i1, int *i2, int *i3, int *i4, unsigned int *ui)); /* 39 */ + void (*xRaiseWindow) _ANSI_ARGS_((Display *d, Window w)); /* 40 */ + void (*xRefreshKeyboardMapping) _ANSI_ARGS_((XMappingEvent *x)); /* 41 */ + void (*xResizeWindow) _ANSI_ARGS_((Display *d, Window w, unsigned int ui1, unsigned int ui2)); /* 42 */ + void (*xSelectInput) _ANSI_ARGS_((Display *d, Window w, long l)); /* 43 */ + Status (*xSendEvent) _ANSI_ARGS_((Display *d, Window w, Bool b, long l, XEvent *x)); /* 44 */ + void (*xSetIconName) _ANSI_ARGS_((Display *d, Window w, _Xconst char *c)); /* 45 */ + void (*xSetInputFocus) _ANSI_ARGS_((Display *d, Window w, int i, Time t)); /* 46 */ + void (*xSetSelectionOwner) _ANSI_ARGS_((Display *d, Atom a, Window w, Time t)); /* 47 */ + void (*xSetWindowBackground) _ANSI_ARGS_((Display *d, Window w, unsigned long ul)); /* 48 */ + void (*xSetWindowBackgroundPixmap) _ANSI_ARGS_((Display *d, Window w, Pixmap p)); /* 49 */ + void (*xSetWindowBorder) _ANSI_ARGS_((Display *d, Window w, unsigned long ul)); /* 50 */ + void (*xSetWindowBorderPixmap) _ANSI_ARGS_((Display *d, Window w, Pixmap p)); /* 51 */ + void (*xSetWindowBorderWidth) _ANSI_ARGS_((Display *d, Window w, unsigned int ui)); /* 52 */ + void (*xSetWindowColormap) _ANSI_ARGS_((Display *d, Window w, Colormap c)); /* 53 */ + void (*xUngrabKeyboard) _ANSI_ARGS_((Display *d, Time t)); /* 54 */ + void (*xUngrabPointer) _ANSI_ARGS_((Display *d, Time t)); /* 55 */ + void (*xUnmapWindow) _ANSI_ARGS_((Display *d, Window w)); /* 56 */ + void (*tkPutImage) _ANSI_ARGS_((unsigned long *colors, int ncolors, Display *display, Drawable d, GC gc, XImage *image, int src_x, int src_y, int dest_x, int dest_y, unsigned int width, unsigned int height)); /* 57 */ + Status (*xParseColor) _ANSI_ARGS_((Display *display, Colormap map, _Xconst char *spec, XColor *colorPtr)); /* 58 */ + GC (*xCreateGC) _ANSI_ARGS_((Display *display, Drawable d, unsigned long valuemask, XGCValues *values)); /* 59 */ + void (*xFreeGC) _ANSI_ARGS_((Display *display, GC gc)); /* 60 */ + Atom (*xInternAtom) _ANSI_ARGS_((Display *display, _Xconst char *atom_name, Bool only_if_exists)); /* 61 */ + void (*xSetBackground) _ANSI_ARGS_((Display *display, GC gc, unsigned long foreground)); /* 62 */ + void (*xSetForeground) _ANSI_ARGS_((Display *display, GC gc, unsigned long foreground)); /* 63 */ + void (*xSetClipMask) _ANSI_ARGS_((Display *display, GC gc, Pixmap pixmap)); /* 64 */ + void (*xSetClipOrigin) _ANSI_ARGS_((Display *display, GC gc, int clip_x_origin, int clip_y_origin)); /* 65 */ + void (*xSetTSOrigin) _ANSI_ARGS_((Display *display, GC gc, int ts_x_origin, int ts_y_origin)); /* 66 */ void (*xChangeGC) _ANSI_ARGS_((Display *d, GC gc, unsigned long mask, XGCValues *values)); /* 67 */ void (*xSetFont) _ANSI_ARGS_((Display *display, GC gc, Font font)); /* 68 */ void (*xSetArcMode) _ANSI_ARGS_((Display *display, GC gc, int arc_mode)); /* 69 */ @@ -1226,20 +1231,20 @@ typedef struct TkIntXlibStubs { void (*xSetLineAttributes) _ANSI_ARGS_((Display *display, GC gc, unsigned int line_width, int line_style, int cap_style, int join_style)); /* 74 */ int (*_XInitImageFuncPtrs) _ANSI_ARGS_((XImage *image)); /* 75 */ XIC (*xCreateIC) _ANSI_ARGS_((void)); /* 76 */ - XVisualInfo * (*xGetVisualInfo) _ANSI_ARGS_((Display*display, long vinfo_mask, XVisualInfo*vinfo_template, int*nitems_return)); /* 77 */ - void (*xSetWMClientMachine) _ANSI_ARGS_((Display*display, Window w, XTextProperty*text_prop)); /* 78 */ - Status (*xStringListToTextProperty) _ANSI_ARGS_((char**list, int count, XTextProperty*text_prop_return)); /* 79 */ + XVisualInfo * (*xGetVisualInfo) _ANSI_ARGS_((Display *display, long vinfo_mask, XVisualInfo *vinfo_template, int *nitems_return)); /* 77 */ + void (*xSetWMClientMachine) _ANSI_ARGS_((Display *display, Window w, XTextProperty *text_prop)); /* 78 */ + Status (*xStringListToTextProperty) _ANSI_ARGS_((char **list, int count, XTextProperty *text_prop_return)); /* 79 */ void (*xDrawSegments) _ANSI_ARGS_((Display *display, Drawable d, GC gc, XSegment *segments, int nsegments)); /* 80 */ - void (*xForceScreenSaver) _ANSI_ARGS_((Display*display, int mode)); /* 81 */ - void (*xDrawLine) _ANSI_ARGS_((Display*d, Drawable dr, GC g, int x1, int y1, int x2, int y2)); /* 82 */ - void (*xFillRectangle) _ANSI_ARGS_((Display*display, Drawable d, GC gc, int x, int y, unsigned int width, unsigned int height)); /* 83 */ - void (*xClearWindow) _ANSI_ARGS_((Display*d, Window w)); /* 84 */ - void (*xDrawPoint) _ANSI_ARGS_((Display*display, Drawable d, GC gc, int x, int y)); /* 85 */ - void (*xDrawPoints) _ANSI_ARGS_((Display*display, Drawable d, GC gc, XPoint *points, int npoints, int mode)); /* 86 */ - void (*xWarpPointer) _ANSI_ARGS_((Display*display, Window src_w, Window dest_w, int src_x, int src_y, unsigned int src_width, unsigned int src_height, int dest_x, int dest_y)); /* 87 */ + void (*xForceScreenSaver) _ANSI_ARGS_((Display *display, int mode)); /* 81 */ + void (*xDrawLine) _ANSI_ARGS_((Display *d, Drawable dr, GC g, int x1, int y1, int x2, int y2)); /* 82 */ + void (*xFillRectangle) _ANSI_ARGS_((Display *display, Drawable d, GC gc, int x, int y, unsigned int width, unsigned int height)); /* 83 */ + void (*xClearWindow) _ANSI_ARGS_((Display *d, Window w)); /* 84 */ + void (*xDrawPoint) _ANSI_ARGS_((Display *display, Drawable d, GC gc, int x, int y)); /* 85 */ + void (*xDrawPoints) _ANSI_ARGS_((Display *display, Drawable d, GC gc, XPoint *points, int npoints, int mode)); /* 86 */ + void (*xWarpPointer) _ANSI_ARGS_((Display *display, Window src_w, Window dest_w, int src_x, int src_y, unsigned int src_width, unsigned int src_height, int dest_x, int dest_y)); /* 87 */ void (*xQueryColor) _ANSI_ARGS_((Display *display, Colormap colormap, XColor *def_in_out)); /* 88 */ void (*xQueryColors) _ANSI_ARGS_((Display *display, Colormap colormap, XColor *defs_in_out, int ncolors)); /* 89 */ - Status (*xQueryTree) _ANSI_ARGS_((Display*d, Window w1, Window*w2, Window*w3, Window**w4, unsigned int*ui)); /* 90 */ + Status (*xQueryTree) _ANSI_ARGS_((Display *d, Window w1, Window *w2, Window *w3, Window **w4, unsigned int *ui)); /* 90 */ int (*xSync) _ANSI_ARGS_((Display *display, Bool flag)); /* 91 */ #endif /* MAC_OSX_TK */ } TkIntXlibStubs; diff --git a/generic/tkMain.c b/generic/tkMain.c index 34f9054..65a42a6 100644 --- a/generic/tkMain.c +++ b/generic/tkMain.c @@ -126,7 +126,7 @@ Tk_MainEx(argc, argv, appInitProc, interp) tsdPtr->interp = interp; Tcl_Preserve((ClientData) interp); -#if (defined(__WIN32__) || defined(MAC_TCL)) +#if ((defined(__WIN32__) && !defined(__CYGWIN__)) || defined(MAC_TCL)) Tk_InitConsoleChannels(interp); #endif diff --git a/unix/configure b/unix/configure index 2a30761..0e2a252 100755 --- a/unix/configure +++ b/unix/configure @@ -4044,6 +4044,10 @@ fi CFLAGS_DEFAULT='$(CFLAGS_OPTIMIZE)' LDFLAGS_DEFAULT='$(LDFLAGS_OPTIMIZE)' DBGX="" + cat >> confdefs.h <<\EOF +#define NDEBUG 1 +EOF + echo "$ac_t""no" 1>&6 else CFLAGS_DEFAULT='$(CFLAGS_DEBUG)' @@ -4091,21 +4095,21 @@ TK_DBGX=${DBGX} echo $ac_n "checking for required early compiler flags""... $ac_c" 1>&6 -echo "configure:4095: checking for required early compiler flags" >&5 +echo "configure:4099: checking for required early compiler flags" >&5 tcl_flags="" if eval "test \"`echo '$''{'tcl_cv_flag__isoc99_source'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4102 "configure" +#line 4106 "configure" #include "confdefs.h" #include <stdlib.h> int main() { char *p = (char *)strtoll; char *q = (char *)strtoull; ; return 0; } EOF -if { (eval echo configure:4109: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4113: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* tcl_cv_flag__isoc99_source=no else @@ -4113,7 +4117,7 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext <<EOF -#line 4117 "configure" +#line 4121 "configure" #include "confdefs.h" #define _ISOC99_SOURCE 1 #include <stdlib.h> @@ -4121,7 +4125,7 @@ int main() { char *p = (char *)strtoll; char *q = (char *)strtoull; ; return 0; } EOF -if { (eval echo configure:4125: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4129: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* tcl_cv_flag__isoc99_source=yes else @@ -4148,14 +4152,14 @@ EOF echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4152 "configure" +#line 4156 "configure" #include "confdefs.h" #include <sys/stat.h> int main() { struct stat64 buf; int i = stat64("/", &buf); ; return 0; } EOF -if { (eval echo configure:4159: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4163: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* tcl_cv_flag__largefile64_source=no else @@ -4163,7 +4167,7 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext <<EOF -#line 4167 "configure" +#line 4171 "configure" #include "confdefs.h" #define _LARGEFILE64_SOURCE 1 #include <sys/stat.h> @@ -4171,7 +4175,7 @@ int main() { struct stat64 buf; int i = stat64("/", &buf); ; return 0; } EOF -if { (eval echo configure:4175: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4179: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* tcl_cv_flag__largefile64_source=yes else @@ -4198,14 +4202,14 @@ EOF echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4202 "configure" +#line 4206 "configure" #include "confdefs.h" #include <sys/stat.h> int main() { char *p = (char *)open64; ; return 0; } EOF -if { (eval echo configure:4209: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4213: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* tcl_cv_flag__largefile_source64=no else @@ -4213,7 +4217,7 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext <<EOF -#line 4217 "configure" +#line 4221 "configure" #include "confdefs.h" #define _LARGEFILE_SOURCE64 1 #include <sys/stat.h> @@ -4221,7 +4225,7 @@ int main() { char *p = (char *)open64; ; return 0; } EOF -if { (eval echo configure:4225: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4229: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* tcl_cv_flag__largefile_source64=yes else @@ -4252,7 +4256,7 @@ EOF echo $ac_n "checking for 64-bit integer type""... $ac_c" 1>&6 -echo "configure:4256: checking for 64-bit integer type" >&5 +echo "configure:4260: checking for 64-bit integer type" >&5 if eval "test \"`echo '$''{'tcl_cv_type_64bit'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4260,14 +4264,14 @@ else tcl_cv_type_64bit=none # See if the compiler knows natively about __int64 cat > conftest.$ac_ext <<EOF -#line 4264 "configure" +#line 4268 "configure" #include "confdefs.h" int main() { __int64 value = (__int64) 0; ; return 0; } EOF -if { (eval echo configure:4271: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4275: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* tcl_type_64bit=__int64 else @@ -4281,7 +4285,7 @@ rm -f conftest* # type that is our current guess for a 64-bit type inside this check # program, so it should be modified only carefully... cat > conftest.$ac_ext <<EOF -#line 4285 "configure" +#line 4289 "configure" #include "confdefs.h" int main() { @@ -4290,7 +4294,7 @@ switch (0) { } ; return 0; } EOF -if { (eval echo configure:4294: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4298: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* tcl_cv_type_64bit=${tcl_type_64bit} else @@ -4315,13 +4319,13 @@ EOF # Now check for auxiliary declarations echo $ac_n "checking for struct dirent64""... $ac_c" 1>&6 -echo "configure:4319: checking for struct dirent64" >&5 +echo "configure:4323: checking for struct dirent64" >&5 if eval "test \"`echo '$''{'tcl_cv_struct_dirent64'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4325 "configure" +#line 4329 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/dirent.h> @@ -4329,7 +4333,7 @@ int main() { struct dirent64 p; ; return 0; } EOF -if { (eval echo configure:4333: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4337: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* tcl_cv_struct_dirent64=yes else @@ -4350,13 +4354,13 @@ EOF fi echo $ac_n "checking for struct stat64""... $ac_c" 1>&6 -echo "configure:4354: checking for struct stat64" >&5 +echo "configure:4358: checking for struct stat64" >&5 if eval "test \"`echo '$''{'tcl_cv_struct_stat64'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4360 "configure" +#line 4364 "configure" #include "confdefs.h" #include <sys/stat.h> int main() { @@ -4364,7 +4368,7 @@ struct stat64 p; ; return 0; } EOF -if { (eval echo configure:4368: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4372: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* tcl_cv_struct_stat64=yes else @@ -4387,12 +4391,12 @@ EOF for ac_func in open64 lseek64 do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4391: checking for $ac_func" >&5 +echo "configure:4395: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4396 "configure" +#line 4400 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -4415,7 +4419,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:4419: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4423: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4440,13 +4444,13 @@ fi done echo $ac_n "checking for off64_t""... $ac_c" 1>&6 -echo "configure:4444: checking for off64_t" >&5 +echo "configure:4448: checking for off64_t" >&5 if eval "test \"`echo '$''{'tcl_cv_type_off64_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4450 "configure" +#line 4454 "configure" #include "confdefs.h" #include <sys/types.h> int main() { @@ -4454,7 +4458,7 @@ off64_t offset; ; return 0; } EOF -if { (eval echo configure:4458: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4462: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* tcl_cv_type_off64_t=yes else @@ -4485,14 +4489,14 @@ EOF #-------------------------------------------------------------------- echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 -echo "configure:4489: checking whether byte ordering is bigendian" >&5 +echo "configure:4493: checking whether byte ordering is bigendian" >&5 if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_bigendian=unknown # See if sys/param.h defines the BYTE_ORDER macro. cat > conftest.$ac_ext <<EOF -#line 4496 "configure" +#line 4500 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/param.h> @@ -4503,11 +4507,11 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:4507: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4511: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* # It does; now see whether it defined to BIG_ENDIAN or not. cat > conftest.$ac_ext <<EOF -#line 4511 "configure" +#line 4515 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/param.h> @@ -4518,7 +4522,7 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:4522: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4526: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_bigendian=yes else @@ -4538,7 +4542,7 @@ if test "$cross_compiling" = yes; then { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <<EOF -#line 4542 "configure" +#line 4546 "configure" #include "confdefs.h" main () { /* Are we little or big endian? From Harbison&Steele. */ @@ -4551,7 +4555,7 @@ main () { exit (u.c[sizeof (long) - 1] == 1); } EOF -if { (eval echo configure:4555: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4559: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_bigendian=no else @@ -4603,20 +4607,20 @@ fi #-------------------------------------------------------------------- echo $ac_n "checking for fd_set in sys/types""... $ac_c" 1>&6 -echo "configure:4607: checking for fd_set in sys/types" >&5 +echo "configure:4611: checking for fd_set in sys/types" >&5 if eval "test \"`echo '$''{'tcl_cv_type_fd_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4613 "configure" +#line 4617 "configure" #include "confdefs.h" #include <sys/types.h> int main() { fd_set readMask, writeMask; ; return 0; } EOF -if { (eval echo configure:4620: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4624: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* tcl_cv_type_fd_set=yes else @@ -4632,13 +4636,13 @@ echo "$ac_t""$tcl_cv_type_fd_set" 1>&6 tk_ok=$tcl_cv_type_fd_set if test $tk_ok = no; then echo $ac_n "checking for fd_mask in sys/select""... $ac_c" 1>&6 -echo "configure:4636: checking for fd_mask in sys/select" >&5 +echo "configure:4640: checking for fd_mask in sys/select" >&5 if eval "test \"`echo '$''{'tcl_cv_grep_fd_mask'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4642 "configure" +#line 4646 "configure" #include "confdefs.h" #include <sys/select.h> EOF @@ -4678,17 +4682,17 @@ for ac_hdr in sys/time.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4682: checking for $ac_hdr" >&5 +echo "configure:4686: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4687 "configure" +#line 4691 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4692: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4696: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4715,12 +4719,12 @@ fi done echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:4719: checking whether time.h and sys/time.h may both be included" >&5 +echo "configure:4723: checking whether time.h and sys/time.h may both be included" >&5 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4724 "configure" +#line 4728 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/time.h> @@ -4729,7 +4733,7 @@ int main() { struct tm *tp; ; return 0; } EOF -if { (eval echo configure:4733: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4737: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else @@ -4759,12 +4763,12 @@ fi echo $ac_n "checking for strtod""... $ac_c" 1>&6 -echo "configure:4763: checking for strtod" >&5 +echo "configure:4767: checking for strtod" >&5 if eval "test \"`echo '$''{'ac_cv_func_strtod'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4768 "configure" +#line 4772 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char strtod(); below. */ @@ -4787,7 +4791,7 @@ strtod(); ; return 0; } EOF -if { (eval echo configure:4791: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4795: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_strtod=yes" else @@ -4809,7 +4813,7 @@ fi if test "$tcl_strtod" = 1; then echo $ac_n "checking for Solaris2.4/Tru64 strtod bugs""... $ac_c" 1>&6 -echo "configure:4813: checking for Solaris2.4/Tru64 strtod bugs" >&5 +echo "configure:4817: checking for Solaris2.4/Tru64 strtod bugs" >&5 if eval "test \"`echo '$''{'tcl_cv_strtod_buggy'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4818,7 +4822,7 @@ else tcl_cv_strtod_buggy=buggy else cat > conftest.$ac_ext <<EOF -#line 4822 "configure" +#line 4826 "configure" #include "confdefs.h" extern double strtod(); @@ -4841,7 +4845,7 @@ else exit(0); } EOF -if { (eval echo configure:4845: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4849: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then tcl_cv_strtod_buggy=ok else @@ -4872,12 +4876,12 @@ EOF #-------------------------------------------------------------------- echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:4876: checking for ANSI C header files" >&5 +echo "configure:4880: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4881 "configure" +#line 4885 "configure" #include "confdefs.h" #include <stdlib.h> #include <stdarg.h> @@ -4885,7 +4889,7 @@ else #include <float.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4889: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4893: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4902,7 +4906,7 @@ rm -f conftest* if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext <<EOF -#line 4906 "configure" +#line 4910 "configure" #include "confdefs.h" #include <string.h> EOF @@ -4920,7 +4924,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext <<EOF -#line 4924 "configure" +#line 4928 "configure" #include "confdefs.h" #include <stdlib.h> EOF @@ -4941,7 +4945,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext <<EOF -#line 4945 "configure" +#line 4949 "configure" #include "confdefs.h" #include <ctype.h> #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -4952,7 +4956,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:4956: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4960: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -4976,12 +4980,12 @@ EOF fi echo $ac_n "checking for mode_t""... $ac_c" 1>&6 -echo "configure:4980: checking for mode_t" >&5 +echo "configure:4984: checking for mode_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_mode_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4985 "configure" +#line 4989 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -5009,12 +5013,12 @@ EOF fi echo $ac_n "checking for pid_t""... $ac_c" 1>&6 -echo "configure:5013: checking for pid_t" >&5 +echo "configure:5017: checking for pid_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5018 "configure" +#line 5022 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -5042,12 +5046,12 @@ EOF fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:5046: checking for size_t" >&5 +echo "configure:5050: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5051 "configure" +#line 5055 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -5075,12 +5079,12 @@ EOF fi echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 -echo "configure:5079: checking for uid_t in sys/types.h" >&5 +echo "configure:5083: checking for uid_t in sys/types.h" >&5 if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5084 "configure" +#line 5088 "configure" #include "confdefs.h" #include <sys/types.h> EOF @@ -5114,20 +5118,20 @@ fi #------------------------------------------- echo $ac_n "checking pw_gecos in struct pwd""... $ac_c" 1>&6 -echo "configure:5118: checking pw_gecos in struct pwd" >&5 +echo "configure:5122: checking pw_gecos in struct pwd" >&5 if eval "test \"`echo '$''{'tcl_cv_pwd_pw_gecos'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5124 "configure" +#line 5128 "configure" #include "confdefs.h" #include <pwd.h> int main() { struct passwd pwd; pwd.pw_gecos; ; return 0; } EOF -if { (eval echo configure:5131: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5135: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* tcl_cv_pwd_pw_gecos=yes else @@ -5153,7 +5157,7 @@ fi if test "`uname -s`" = "Darwin" ; then echo $ac_n "checking whether to use Aqua""... $ac_c" 1>&6 -echo "configure:5157: checking whether to use Aqua" >&5 +echo "configure:5161: checking whether to use Aqua" >&5 # Check whether --enable-aqua or --disable-aqua was given. if test "${enable_aqua+set}" = set; then enableval="$enable_aqua" @@ -5180,7 +5184,7 @@ fi if test "$fat_32_64" = yes; then if test $tk_aqua = no; then echo $ac_n "checking for 64-bit X11""... $ac_c" 1>&6 -echo "configure:5184: checking for 64-bit X11" >&5 +echo "configure:5188: checking for 64-bit X11" >&5 if eval "test \"`echo '$''{'tcl_cv_lib_x11_64'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5191,14 +5195,14 @@ else CPPFLAGS="$CPPFLAGS -I/usr/X11R6/include" LDFLAGS="$LDFLAGS -L/usr/X11R6/lib -lX11" cat > conftest.$ac_ext <<EOF -#line 5195 "configure" +#line 5199 "configure" #include "confdefs.h" #include <X11/Xlib.h> int main() { XrmInitialize(); ; return 0; } EOF -if { (eval echo configure:5202: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5206: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* tcl_cv_lib_x11_64=yes else @@ -5258,7 +5262,7 @@ else # Uses ac_ vars as temps to allow command line to override cache and checks. # --without-x overrides everything else, but does not touch the cache. echo $ac_n "checking for X""... $ac_c" 1>&6 -echo "configure:5262: checking for X" >&5 +echo "configure:5266: checking for X" >&5 # Check whether --with-x or --without-x was given. if test "${with_x+set}" = set; then @@ -5320,12 +5324,12 @@ if test "$ac_x_includes" = NO; then # First, try using that file with no special directory specified. cat > conftest.$ac_ext <<EOF -#line 5324 "configure" +#line 5328 "configure" #include "confdefs.h" #include <$x_direct_test_include> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5329: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5333: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5394,14 +5398,14 @@ if test "$ac_x_libraries" = NO; then ac_save_LIBS="$LIBS" LIBS="-l$x_direct_test_library $LIBS" cat > conftest.$ac_ext <<EOF -#line 5398 "configure" +#line 5402 "configure" #include "confdefs.h" int main() { ${x_direct_test_function}() ; return 0; } EOF -if { (eval echo configure:5405: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5409: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* LIBS="$ac_save_LIBS" # We can link X programs with no special library path. @@ -5491,12 +5495,12 @@ fi if test "$no_x" = ""; then if test "$x_includes" = ""; then cat > conftest.$ac_ext <<EOF -#line 5495 "configure" +#line 5499 "configure" #include "confdefs.h" #include <X11/XIntrinsic.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5500: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5504: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -5516,15 +5520,15 @@ rm -f conftest* fi if test "$no_x" = "yes" -o "$not_really_there" = "yes"; then echo $ac_n "checking for X11 header files""... $ac_c" 1>&6 -echo "configure:5520: checking for X11 header files" >&5 +echo "configure:5524: checking for X11 header files" >&5 found_xincludes="no" cat > conftest.$ac_ext <<EOF -#line 5523 "configure" +#line 5527 "configure" #include "confdefs.h" #include <X11/Intrinsic.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5528: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5532: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5560,7 +5564,7 @@ rm -f conftest* if test "$no_x" = yes; then echo $ac_n "checking for X11 libraries""... $ac_c" 1>&6 -echo "configure:5564: checking for X11 libraries" >&5 +echo "configure:5568: checking for X11 libraries" >&5 XLIBSW=nope dirs="/usr/unsupported/lib /usr/local/lib /usr/X386/lib /usr/X11R6/lib /usr/X11R5/lib /usr/lib/X11R5 /usr/lib/X11R4 /usr/openwin/lib /usr/X11/lib /usr/sww/X11/lib" for i in $dirs ; do @@ -5580,7 +5584,7 @@ echo "configure:5564: checking for X11 libraries" >&5 fi if test "$XLIBSW" = nope ; then echo $ac_n "checking for XCreateWindow in -lXwindow""... $ac_c" 1>&6 -echo "configure:5584: checking for XCreateWindow in -lXwindow" >&5 +echo "configure:5588: checking for XCreateWindow in -lXwindow" >&5 ac_lib_var=`echo Xwindow'_'XCreateWindow | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5588,7 +5592,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lXwindow $LIBS" cat > conftest.$ac_ext <<EOF -#line 5592 "configure" +#line 5596 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -5599,7 +5603,7 @@ int main() { XCreateWindow() ; return 0; } EOF -if { (eval echo configure:5603: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5607: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5676,7 +5680,7 @@ eval "LD_SEARCH_FLAGS=\"$TCL_LD_SEARCH_FLAGS\"" if test $tk_aqua = no; then echo $ac_n "checking for main in -lXbsd""... $ac_c" 1>&6 -echo "configure:5680: checking for main in -lXbsd" >&5 +echo "configure:5684: checking for main in -lXbsd" >&5 ac_lib_var=`echo Xbsd'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5684,14 +5688,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lXbsd $LIBS" cat > conftest.$ac_ext <<EOF -#line 5688 "configure" +#line 5692 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:5695: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5699: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5715,12 +5719,12 @@ fi tk_checkBoth=0 echo $ac_n "checking for connect""... $ac_c" 1>&6 -echo "configure:5719: checking for connect" >&5 +echo "configure:5723: checking for connect" >&5 if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5724 "configure" +#line 5728 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char connect(); below. */ @@ -5743,7 +5747,7 @@ connect(); ; return 0; } EOF -if { (eval echo configure:5747: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5751: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_connect=yes" else @@ -5765,7 +5769,7 @@ fi if test "$tk_checkSocket" = 1; then echo $ac_n "checking for main in -lsocket""... $ac_c" 1>&6 -echo "configure:5769: checking for main in -lsocket" >&5 +echo "configure:5773: checking for main in -lsocket" >&5 ac_lib_var=`echo socket'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5773,14 +5777,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <<EOF -#line 5777 "configure" +#line 5781 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:5784: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5788: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5806,12 +5810,12 @@ if test "$tk_checkBoth" = 1; then tk_oldLibs=$LIBS LIBS="$LIBS -lsocket -lnsl" echo $ac_n "checking for accept""... $ac_c" 1>&6 -echo "configure:5810: checking for accept" >&5 +echo "configure:5814: checking for accept" >&5 if eval "test \"`echo '$''{'ac_cv_func_accept'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5815 "configure" +#line 5819 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char accept(); below. */ @@ -5834,7 +5838,7 @@ accept(); ; return 0; } EOF -if { (eval echo configure:5838: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5842: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_accept=yes" else @@ -5856,12 +5860,12 @@ fi fi echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6 -echo "configure:5860: checking for gethostbyname" >&5 +echo "configure:5864: checking for gethostbyname" >&5 if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5865 "configure" +#line 5869 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char gethostbyname(); below. */ @@ -5884,7 +5888,7 @@ gethostbyname(); ; return 0; } EOF -if { (eval echo configure:5888: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5892: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_gethostbyname=yes" else @@ -5902,7 +5906,7 @@ if eval "test \"`echo '$ac_cv_func_'gethostbyname`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for main in -lnsl""... $ac_c" 1>&6 -echo "configure:5906: checking for main in -lnsl" >&5 +echo "configure:5910: checking for main in -lnsl" >&5 ac_lib_var=`echo nsl'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5910,14 +5914,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <<EOF -#line 5914 "configure" +#line 5918 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:5921: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5925: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5953,13 +5957,13 @@ fi if test -d /usr/include/mit -a $tk_aqua = no; then echo $ac_n "checking MIT X libraries""... $ac_c" 1>&6 -echo "configure:5957: checking MIT X libraries" >&5 +echo "configure:5961: checking MIT X libraries" >&5 tk_oldCFlags=$CFLAGS CFLAGS="$CFLAGS -I/usr/include/mit" tk_oldLibs=$LIBS LIBS="$LIBS -lX11-mit" cat > conftest.$ac_ext <<EOF -#line 5963 "configure" +#line 5967 "configure" #include "confdefs.h" #include <X11/Xlib.h> @@ -5970,7 +5974,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:5974: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5978: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 @@ -5994,14 +5998,14 @@ fi #-------------------------------------------------------------------- echo $ac_n "checking whether char is unsigned""... $ac_c" 1>&6 -echo "configure:5998: checking whether char is unsigned" >&5 +echo "configure:6002: checking whether char is unsigned" >&5 if eval "test \"`echo '$''{'ac_cv_c_char_unsigned'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test "$GCC" = yes; then # GCC predefines this symbol on systems where it applies. cat > conftest.$ac_ext <<EOF -#line 6005 "configure" +#line 6009 "configure" #include "confdefs.h" #ifdef __CHAR_UNSIGNED__ yes @@ -6023,7 +6027,7 @@ if test "$cross_compiling" = yes; then { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <<EOF -#line 6027 "configure" +#line 6031 "configure" #include "confdefs.h" /* volatile prevents gcc2 from optimizing the test away on sparcs. */ #if !defined(__STDC__) || __STDC__ != 1 @@ -6033,7 +6037,7 @@ main() { volatile char c = 255; exit(c < 0); } EOF -if { (eval echo configure:6037: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:6041: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_char_unsigned=yes else @@ -6094,7 +6098,7 @@ if test "`uname -s`" = "Darwin" ; then if test "`uname -s`" = "Darwin" ; then echo $ac_n "checking how to package libraries""... $ac_c" 1>&6 -echo "configure:6098: checking how to package libraries" >&5 +echo "configure:6102: checking how to package libraries" >&5 # Check whether --enable-framework or --disable-framework was given. if test "${enable_framework+set}" = set; then enableval="$enable_framework" diff --git a/unix/tcl.m4 b/unix/tcl.m4 index 8ff420a..c804072 100755 --- a/unix/tcl.m4 +++ b/unix/tcl.m4 @@ -731,6 +731,7 @@ AC_DEFUN([SC_ENABLE_SYMBOLS], [ CFLAGS_DEFAULT='$(CFLAGS_OPTIMIZE)' LDFLAGS_DEFAULT='$(LDFLAGS_OPTIMIZE)' DBGX="" + AC_DEFINE(NDEBUG, 1, [Is no debugging enabled?]) AC_MSG_RESULT([no]) else CFLAGS_DEFAULT='$(CFLAGS_DEBUG)' diff --git a/win/configure b/win/configure index 89ed05d..9cacd06 100755 --- a/win/configure +++ b/win/configure @@ -16,6 +16,8 @@ ac_help="$ac_help ac_help="$ac_help --enable-shared build and link with shared libraries [--enable-shared]" ac_help="$ac_help + --with-tcl=DIR use Tcl 8.4 binaries from DIR" +ac_help="$ac_help --enable-64bit enable 64bit support (where applicable)" ac_help="$ac_help --enable-wince enable Win/CE support (where applicable)" @@ -25,8 +27,6 @@ ac_help="$ac_help --enable-symbols build with debugging symbols [--disable-symbols]" ac_help="$ac_help --enable-embedded-manifest embed manifest if possible (default: yes)" -ac_help="$ac_help - --with-tcl=DIR use Tcl 8.4 binaries from DIR" # Initialize some variables set by options. # The variables have the same names as the options, with @@ -1131,6 +1131,94 @@ EOF #-------------------------------------------------------------------- +# Locate and source the tclConfig.sh file. +#-------------------------------------------------------------------- + + + echo $ac_n "checking the location of tclConfig.sh""... $ac_c" 1>&6 +echo "configure:1140: checking the location of tclConfig.sh" >&5 + + if test -d ../../tcl8.4$TK_PATCH_LEVEL/win; then + TCL_BIN_DIR_DEFAULT=../../tcl8.4$TK_PATCH_LEVEL/win + elif test -d ../../tcl8.4/win; then + TCL_BIN_DIR_DEFAULT=../../tcl8.4/win + else + TCL_BIN_DIR_DEFAULT=../../tcl/win + fi + + # Check whether --with-tcl or --without-tcl was given. +if test "${with_tcl+set}" = set; then + withval="$with_tcl" + TCL_BIN_DIR=$withval +else + TCL_BIN_DIR=`cd $TCL_BIN_DIR_DEFAULT; pwd` +fi + + if test ! -d $TCL_BIN_DIR; then + { echo "configure: error: Tcl directory $TCL_BIN_DIR does not exist" 1>&2; exit 1; } + fi + if test ! -f $TCL_BIN_DIR/tclConfig.sh; then + if test ! -f $TCL_BIN_DIR/../unix/tclConfig.sh; then + { echo "configure: error: There is no tclConfig.sh in $TCL_BIN_DIR: perhaps you did not specify the Tcl *build* directory (not the toplevel Tcl directory) or you forgot to configure Tcl?" 1>&2; exit 1; } + fi + TCL_BIN_DIR=`cd ${TCL_BIN_DIR}/../unix; pwd` + fi + echo "$ac_t""$TCL_BIN_DIR/tclConfig.sh" 1>&6 + + + echo $ac_n "checking for existence of $TCL_BIN_DIR/tclConfig.sh""... $ac_c" 1>&6 +echo "configure:1171: checking for existence of $TCL_BIN_DIR/tclConfig.sh" >&5 + + if test -f "$TCL_BIN_DIR/tclConfig.sh" ; then + echo "$ac_t""loading" 1>&6 + . $TCL_BIN_DIR/tclConfig.sh + else + echo "$ac_t""file not found" 1>&6 + fi + + # + # If the TCL_BIN_DIR is the build directory (not the install directory), + # then set the common variable name to the value of the build variables. + # For example, the variable TCL_LIB_SPEC will be set to the value + # of TCL_BUILD_LIB_SPEC. An extension should make use of TCL_LIB_SPEC + # instead of TCL_BUILD_LIB_SPEC since it will work with both an + # installed and uninstalled version of Tcl. + # + + if test -f $TCL_BIN_DIR/Makefile ; then + TCL_LIB_SPEC=${TCL_BUILD_LIB_SPEC} + TCL_STUB_LIB_SPEC=${TCL_BUILD_STUB_LIB_SPEC} + TCL_STUB_LIB_PATH=${TCL_BUILD_STUB_LIB_PATH} + fi + + # + # eval is required to do the TCL_DBGX substitution + # + + eval "TCL_LIB_FILE=\"${TCL_LIB_FILE}\"" + eval "TCL_LIB_FLAG=\"${TCL_LIB_FLAG}\"" + eval "TCL_LIB_SPEC=\"${TCL_LIB_SPEC}\"" + + eval "TCL_STUB_LIB_FILE=\"${TCL_STUB_LIB_FILE}\"" + eval "TCL_STUB_LIB_FLAG=\"${TCL_STUB_LIB_FLAG}\"" + eval "TCL_STUB_LIB_SPEC=\"${TCL_STUB_LIB_SPEC}\"" + + + + + + + + + + + + + + + + +#-------------------------------------------------------------------- # The statements below define a collection of compile flags. This # macro depends on the value of SHARED_BUILD, and should be called # after SC_ENABLE_SHARED checks the configure switches. @@ -1141,7 +1229,7 @@ EOF # Step 0: Enable 64 bit support? echo $ac_n "checking if 64bit support is requested""... $ac_c" 1>&6 -echo "configure:1145: checking if 64bit support is requested" >&5 +echo "configure:1233: checking if 64bit support is requested" >&5 # Check whether --enable-64bit or --disable-64bit was given. if test "${enable_64bit+set}" = set; then enableval="$enable_64bit" @@ -1155,7 +1243,7 @@ fi # Cross-compiling options for Windows/CE builds echo $ac_n "checking if Windows/CE build is requested""... $ac_c" 1>&6 -echo "configure:1159: checking if Windows/CE build is requested" >&5 +echo "configure:1247: checking if Windows/CE build is requested" >&5 # Check whether --enable-wince or --disable-wince was given. if test "${enable_wince+set}" = set; then enableval="$enable_wince" @@ -1167,7 +1255,7 @@ fi echo "$ac_t""$doWince" 1>&6 echo $ac_n "checking for Windows/CE celib directory""... $ac_c" 1>&6 -echo "configure:1171: checking for Windows/CE celib directory" >&5 +echo "configure:1259: checking for Windows/CE celib directory" >&5 # Check whether --with-celib or --without-celib was given. if test "${with_celib+set}" = set; then withval="$with_celib" @@ -1184,7 +1272,7 @@ fi # Extract the first word of "cygpath", so it can be a program name with args. set dummy cygpath; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1188: checking for $ac_word" >&5 +echo "configure:1276: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CYGPATH'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1220,16 +1308,19 @@ fi if test "$GCC" = "yes"; then + if test "$TCL_CC" = "gcc"; then + CFLAGS="$CFLAGS -mwin32" + fi echo $ac_n "checking for cross-compile version of gcc""... $ac_c" 1>&6 -echo "configure:1225: checking for cross-compile version of gcc" >&5 +echo "configure:1316: checking for cross-compile version of gcc" >&5 if eval "test \"`echo '$''{'ac_cv_cross'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1230 "configure" +#line 1321 "configure" #include "confdefs.h" - #ifdef __WIN32__ + #ifndef __WIN32__ #error cross-compiler #endif @@ -1237,14 +1328,14 @@ int main() { ; return 0; } EOF -if { (eval echo configure:1241: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1332: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* - ac_cv_cross=yes + ac_cv_cross=no else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* - ac_cv_cross=no + ac_cv_cross=yes fi rm -f conftest* @@ -1286,9 +1377,9 @@ echo "$ac_t""$ac_cv_cross" 1>&6 echo "END" >> $conftest echo $ac_n "checking for Windows native path bug in windres""... $ac_c" 1>&6 -echo "configure:1290: checking for Windows native path bug in windres" >&5 +echo "configure:1381: checking for Windows native path bug in windres" >&5 cyg_conftest=`$CYGPATH $conftest` - if { ac_try='$RC -o conftest.res.o $cyg_conftest'; { (eval echo configure:1292: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } ; then + if { ac_try='$RC -o conftest.res.o $cyg_conftest'; { (eval echo configure:1383: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } ; then echo "$ac_t""no" 1>&6 else echo "$ac_t""yes" 1>&6 @@ -1308,12 +1399,12 @@ echo "configure:1290: checking for Windows native path bug in windres" >&5 if test "${GCC}" = "yes" ; then echo $ac_n "checking for mingw32 version of gcc""... $ac_c" 1>&6 -echo "configure:1312: checking for mingw32 version of gcc" >&5 +echo "configure:1403: checking for mingw32 version of gcc" >&5 if eval "test \"`echo '$''{'ac_cv_win32'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1317 "configure" +#line 1408 "configure" #include "confdefs.h" #ifdef __WIN32__ @@ -1324,7 +1415,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:1328: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1419: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_win32=no else @@ -1344,7 +1435,7 @@ echo "$ac_t""$ac_cv_win32" 1>&6 fi echo $ac_n "checking compiler flags""... $ac_c" 1>&6 -echo "configure:1348: checking compiler flags" >&5 +echo "configure:1439: checking compiler flags" >&5 if test "${GCC}" = "yes" ; then SHLIB_LD="" SHLIB_LD_LIBS="" @@ -1443,25 +1534,25 @@ echo "configure:1348: checking compiler flags" >&5 ;; *) cat > conftest.$ac_ext <<EOF -#line 1447 "configure" +#line 1538 "configure" #include "confdefs.h" - #ifdef _WIN64 - #error 64-bit + #ifndef _WIN64 + #error 32-bit #endif int main() { ; return 0; } EOF -if { (eval echo configure:1458: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1549: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* - tcl_win_64bit=no + tcl_win_64bit=yes else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* - tcl_win_64bit=yes + tcl_win_64bit=no fi rm -f conftest* @@ -1694,7 +1785,7 @@ EOF if test "${GCC}" = "yes" ; then echo $ac_n "checking for SEH support in compiler""... $ac_c" 1>&6 -echo "configure:1698: checking for SEH support in compiler" >&5 +echo "configure:1789: checking for SEH support in compiler" >&5 if eval "test \"`echo '$''{'tcl_cv_seh'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1702,7 +1793,7 @@ else tcl_cv_seh=no else cat > conftest.$ac_ext <<EOF -#line 1706 "configure" +#line 1797 "configure" #include "confdefs.h" #define WIN32_LEAN_AND_MEAN @@ -1721,7 +1812,7 @@ else } EOF -if { (eval echo configure:1725: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1816: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then tcl_cv_seh=yes else @@ -1751,12 +1842,12 @@ EOF # sufficient for getting the current code to work. # echo $ac_n "checking for EXCEPTION_DISPOSITION support in include files""... $ac_c" 1>&6 -echo "configure:1755: checking for EXCEPTION_DISPOSITION support in include files" >&5 +echo "configure:1846: checking for EXCEPTION_DISPOSITION support in include files" >&5 if eval "test \"`echo '$''{'tcl_cv_eh_disposition'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1760 "configure" +#line 1851 "configure" #include "confdefs.h" # define WIN32_LEAN_AND_MEAN @@ -1769,7 +1860,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:1773: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1864: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* tcl_cv_eh_disposition=yes else @@ -1795,12 +1886,12 @@ EOF # used by mingw and cygwin is known to do this. echo $ac_n "checking for winnt.h that ignores VOID define""... $ac_c" 1>&6 -echo "configure:1799: checking for winnt.h that ignores VOID define" >&5 +echo "configure:1890: checking for winnt.h that ignores VOID define" >&5 if eval "test \"`echo '$''{'tcl_cv_winnt_ignore_void'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1804 "configure" +#line 1895 "configure" #include "confdefs.h" #define VOID void @@ -1816,7 +1907,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:1820: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1911: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* tcl_cv_winnt_ignore_void=yes else @@ -1842,12 +1933,12 @@ EOF # warning when initializing a union member. echo $ac_n "checking for cast to union support""... $ac_c" 1>&6 -echo "configure:1846: checking for cast to union support" >&5 +echo "configure:1937: checking for cast to union support" >&5 if eval "test \"`echo '$''{'tcl_cv_cast_to_union'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1851 "configure" +#line 1942 "configure" #include "confdefs.h" int main() { @@ -1857,7 +1948,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:1861: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1952: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* tcl_cv_cast_to_union=yes else @@ -1891,7 +1982,7 @@ EOF #-------------------------------------------------------------------- echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1895: checking how to run the C preprocessor" >&5 +echo "configure:1986: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1906,13 +1997,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext <<EOF -#line 1910 "configure" +#line 2001 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1916: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2007: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1923,13 +2014,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext <<EOF -#line 1927 "configure" +#line 2018 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1933: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2024: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1940,13 +2031,13 @@ else rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext <<EOF -#line 1944 "configure" +#line 2035 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1950: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2041: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1972,17 +2063,17 @@ echo "$ac_t""$CPP" 1>&6 ac_safe=`echo "errno.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for errno.h""... $ac_c" 1>&6 -echo "configure:1976: checking for errno.h" >&5 +echo "configure:2067: checking for errno.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1981 "configure" +#line 2072 "configure" #include "confdefs.h" #include <errno.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1986: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2077: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2012,20 +2103,20 @@ fi if test "${MACHINE}" = "X86" ; then echo $ac_n "checking availability of _strtoi64""... $ac_c" 1>&6 -echo "configure:2016: checking availability of _strtoi64" >&5 +echo "configure:2107: checking availability of _strtoi64" >&5 if eval "test \"`echo '$''{'tcl_have_strtoi64'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2022 "configure" +#line 2113 "configure" #include "confdefs.h" #include <stdlib.h> int main() { _strtoi64(0,0,0) ; return 0; } EOF -if { (eval echo configure:2029: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2120: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* tcl_have_strtoi64=yes else @@ -2054,7 +2145,7 @@ fi echo $ac_n "checking for build with symbols""... $ac_c" 1>&6 -echo "configure:2058: checking for build with symbols" >&5 +echo "configure:2149: checking for build with symbols" >&5 # Check whether --enable-symbols or --disable-symbols was given. if test "${enable_symbols+set}" = set; then enableval="$enable_symbols" @@ -2068,6 +2159,10 @@ fi CFLAGS_DEFAULT='$(CFLAGS_OPTIMIZE)' LDFLAGS_DEFAULT='$(LDFLAGS_OPTIMIZE)' DBGX="" + cat >> confdefs.h <<\EOF +#define NDEBUG 1 +EOF + echo "$ac_t""no" 1>&6 else CFLAGS_DEFAULT='$(CFLAGS_DEBUG)' @@ -2115,7 +2210,7 @@ TK_DBGX=${DBGX} echo $ac_n "checking whether to embed manifest""... $ac_c" 1>&6 -echo "configure:2119: checking whether to embed manifest" >&5 +echo "configure:2214: checking whether to embed manifest" >&5 # Check whether --enable-embedded-manifest or --disable-embedded-manifest was given. if test "${enable_embedded_manifest+set}" = set; then enableval="$enable_embedded_manifest" @@ -2132,7 +2227,7 @@ fi -a "$GCC" != "yes" ; then # Add the magic to embed the manifest into the dll/exe cat > conftest.$ac_ext <<EOF -#line 2136 "configure" +#line 2231 "configure" #include "confdefs.h" #if defined(_MSC_VER) && _MSC_VER >= 1400 @@ -2163,101 +2258,16 @@ rm -f conftest* -#-------------------------------------------------------------------- -# Locate and source the tclConfig.sh file. -#-------------------------------------------------------------------- - - - echo $ac_n "checking the location of tclConfig.sh""... $ac_c" 1>&6 -echo "configure:2173: checking the location of tclConfig.sh" >&5 - - if test -d ../../tcl8.4$TK_PATCH_LEVEL/win; then - TCL_BIN_DIR_DEFAULT=../../tcl8.4$TK_PATCH_LEVEL/win - elif test -d ../../tcl8.4/win; then - TCL_BIN_DIR_DEFAULT=../../tcl8.4/win - else - TCL_BIN_DIR_DEFAULT=../../tcl/win - fi - - # Check whether --with-tcl or --without-tcl was given. -if test "${with_tcl+set}" = set; then - withval="$with_tcl" - TCL_BIN_DIR=$withval -else - TCL_BIN_DIR=`cd $TCL_BIN_DIR_DEFAULT; pwd` -fi - - if test ! -d $TCL_BIN_DIR; then - { echo "configure: error: Tcl directory $TCL_BIN_DIR does not exist" 1>&2; exit 1; } - fi - if test ! -f $TCL_BIN_DIR/tclConfig.sh; then - { echo "configure: error: There is no tclConfig.sh in $TCL_BIN_DIR: perhaps you did not specify the Tcl *build* directory (not the toplevel Tcl directory) or you forgot to configure Tcl?" 1>&2; exit 1; } - fi - echo "$ac_t""$TCL_BIN_DIR/tclConfig.sh" 1>&6 - - - echo $ac_n "checking for existence of $TCL_BIN_DIR/tclConfig.sh""... $ac_c" 1>&6 -echo "configure:2201: checking for existence of $TCL_BIN_DIR/tclConfig.sh" >&5 - - if test -f "$TCL_BIN_DIR/tclConfig.sh" ; then - echo "$ac_t""loading" 1>&6 - . $TCL_BIN_DIR/tclConfig.sh - else - echo "$ac_t""file not found" 1>&6 - fi - - # - # If the TCL_BIN_DIR is the build directory (not the install directory), - # then set the common variable name to the value of the build variables. - # For example, the variable TCL_LIB_SPEC will be set to the value - # of TCL_BUILD_LIB_SPEC. An extension should make use of TCL_LIB_SPEC - # instead of TCL_BUILD_LIB_SPEC since it will work with both an - # installed and uninstalled version of Tcl. - # - - if test -f $TCL_BIN_DIR/Makefile ; then - TCL_LIB_SPEC=${TCL_BUILD_LIB_SPEC} - TCL_STUB_LIB_SPEC=${TCL_BUILD_STUB_LIB_SPEC} - TCL_STUB_LIB_PATH=${TCL_BUILD_STUB_LIB_PATH} - fi - - # - # eval is required to do the TCL_DBGX substitution - # - - eval "TCL_LIB_FILE=\"${TCL_LIB_FILE}\"" - eval "TCL_LIB_FLAG=\"${TCL_LIB_FLAG}\"" - eval "TCL_LIB_SPEC=\"${TCL_LIB_SPEC}\"" - - eval "TCL_STUB_LIB_FILE=\"${TCL_STUB_LIB_FILE}\"" - eval "TCL_STUB_LIB_FLAG=\"${TCL_STUB_LIB_FLAG}\"" - eval "TCL_STUB_LIB_SPEC=\"${TCL_STUB_LIB_SPEC}\"" - - - - - - - - - - - - - - - - echo $ac_n "checking for tclsh in Tcl build directory""... $ac_c" 1>&6 -echo "configure:2254: checking for tclsh in Tcl build directory" >&5 +echo "configure:2264: checking for tclsh in Tcl build directory" >&5 BUILD_TCLSH=${TCL_BIN_DIR}/tclsh${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}${TCL_DBGX}${EXEEXT} echo "$ac_t""$BUILD_TCLSH" 1>&6 echo $ac_n "checking for tclsh""... $ac_c" 1>&6 -echo "configure:2261: checking for tclsh" >&5 +echo "configure:2271: checking for tclsh" >&5 if eval "test \"`echo '$''{'ac_cv_path_tclsh'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2596,6 +2606,16 @@ s%@SET_MAKE@%$SET_MAKE%g s%@OBJEXT@%$OBJEXT%g s%@EXEEXT@%$EXEEXT%g s%@TCL_THREADS@%$TCL_THREADS%g +s%@TCL_VERSION@%$TCL_VERSION%g +s%@TCL_BIN_DIR@%$TCL_BIN_DIR%g +s%@TCL_SRC_DIR@%$TCL_SRC_DIR%g +s%@TCL_LIB_FILE@%$TCL_LIB_FILE%g +s%@TCL_LIB_FLAG@%$TCL_LIB_FLAG%g +s%@TCL_LIB_SPEC@%$TCL_LIB_SPEC%g +s%@TCL_STUB_LIB_FILE@%$TCL_STUB_LIB_FILE%g +s%@TCL_STUB_LIB_FLAG@%$TCL_STUB_LIB_FLAG%g +s%@TCL_STUB_LIB_SPEC@%$TCL_STUB_LIB_SPEC%g +s%@TCL_DEFS@%$TCL_DEFS%g s%@CYGPATH@%$CYGPATH%g s%@CELIB_DIR@%$CELIB_DIR%g s%@DL_LIBS@%$DL_LIBS%g @@ -2608,16 +2628,6 @@ s%@CFLAGS_DEFAULT@%$CFLAGS_DEFAULT%g s%@LDFLAGS_DEFAULT@%$LDFLAGS_DEFAULT%g s%@VC_MANIFEST_EMBED_DLL@%$VC_MANIFEST_EMBED_DLL%g s%@VC_MANIFEST_EMBED_EXE@%$VC_MANIFEST_EMBED_EXE%g -s%@TCL_VERSION@%$TCL_VERSION%g -s%@TCL_BIN_DIR@%$TCL_BIN_DIR%g -s%@TCL_SRC_DIR@%$TCL_SRC_DIR%g -s%@TCL_LIB_FILE@%$TCL_LIB_FILE%g -s%@TCL_LIB_FLAG@%$TCL_LIB_FLAG%g -s%@TCL_LIB_SPEC@%$TCL_LIB_SPEC%g -s%@TCL_STUB_LIB_FILE@%$TCL_STUB_LIB_FILE%g -s%@TCL_STUB_LIB_FLAG@%$TCL_STUB_LIB_FLAG%g -s%@TCL_STUB_LIB_SPEC@%$TCL_STUB_LIB_SPEC%g -s%@TCL_DEFS@%$TCL_DEFS%g s%@BUILD_TCLSH@%$BUILD_TCLSH%g s%@TCLSH_PROG@%$TCLSH_PROG%g s%@TK_WIN_VERSION@%$TK_WIN_VERSION%g diff --git a/win/configure.in b/win/configure.in index ff9e2cc..5e73318 100644 --- a/win/configure.in +++ b/win/configure.in @@ -90,6 +90,13 @@ SC_ENABLE_THREADS SC_ENABLE_SHARED #-------------------------------------------------------------------- +# Locate and source the tclConfig.sh file. +#-------------------------------------------------------------------- + +SC_PATH_TCLCONFIG($TK_PATCH_LEVEL) +SC_LOAD_TCLCONFIG + +#-------------------------------------------------------------------- # The statements below define a collection of compile flags. This # macro depends on the value of SHARED_BUILD, and should be called # after SC_ENABLE_SHARED checks the configure switches. @@ -134,13 +141,6 @@ TK_DBGX=${DBGX} SC_EMBED_MANIFEST(wish.exe.manifest) -#-------------------------------------------------------------------- -# Locate and source the tclConfig.sh file. -#-------------------------------------------------------------------- - -SC_PATH_TCLCONFIG($TK_PATCH_LEVEL) -SC_LOAD_TCLCONFIG - SC_BUILD_TCLSH SC_PROG_TCLSH @@ -38,7 +38,6 @@ AC_DEFUN([SC_PATH_TCLCONFIG], [ AC_MSG_ERROR(There is no tclConfig.sh in $TCL_BIN_DIR: perhaps you did not specify the Tcl *build* directory (not the toplevel Tcl directory) or you forgot to configure Tcl?) fi TCL_BIN_DIR=`cd ${TCL_BIN_DIR}/../unix; pwd` - CFLAGS="$CFLAGS -mwin32" fi AC_MSG_RESULT($TCL_BIN_DIR/tclConfig.sh) ]) @@ -304,6 +303,7 @@ AC_DEFUN([SC_ENABLE_SYMBOLS], [ CFLAGS_DEFAULT='$(CFLAGS_OPTIMIZE)' LDFLAGS_DEFAULT='$(LDFLAGS_OPTIMIZE)' DBGX="" + AC_DEFINE(NDEBUG, 1, [Is no debugging enabled?]) AC_MSG_RESULT([no]) else CFLAGS_DEFAULT='$(CFLAGS_DEBUG)' @@ -317,12 +317,12 @@ AC_DEFUN([SC_ENABLE_SYMBOLS], [ AC_SUBST(LDFLAGS_DEFAULT) if test "$tcl_ok" = "mem" -o "$tcl_ok" = "all"; then - AC_DEFINE(TCL_MEM_DEBUG) + AC_DEFINE(TCL_MEM_DEBUG, 1, [Is memory debugging enabled?]) fi if test "$tcl_ok" = "compile" -o "$tcl_ok" = "all"; then - AC_DEFINE(TCL_COMPILE_DEBUG) - AC_DEFINE(TCL_COMPILE_STATS) + AC_DEFINE(TCL_COMPILE_DEBUG, 1, [Is bytecode debugging enabled?]) + AC_DEFINE(TCL_COMPILE_STATS, 1, [Are bytecode statistics enabled?]) fi if test "$tcl_ok" != "yes" -a "$tcl_ok" != "no"; then @@ -414,6 +414,9 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ if test "$GCC" = "yes"; then + if test "$TCL_CC" = "gcc"; then + CFLAGS="$CFLAGS -mwin32" + fi AC_CACHE_CHECK(for cross-compile version of gcc, ac_cv_cross, AC_TRY_COMPILE([ |