diff --git a/.gitignore b/.gitignore index c4f52dcf32957172055a3771015da39aa9f85ec9..84340d47ddc4cc9aea136fcf212b2616d78d19bf 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,6 @@ /compile_colibri *.o *.exe +*.so +*.dll +*.log \ No newline at end of file diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e488a550c761f5468e6012b718ac7b41ff453665..540267fec1293eea617a07cc84fd6a00776c6d44 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,45 +1,18 @@ -tests_without_recompilation: - #debian/stable - image: debian@sha256:7ceacc4462a98718b236cbdeb850d4b7603afe4bab791336a0ed1c030f769f02 - script: - - apt-get update - - apt-get install -y ocaml-nox - #Eclipse Prolog compilation of COLIBRI - - ocamlopt -o compile_colibri unix.cmxa compile_colibri.ml - - ./compile_colibri - #Bundle in bundle directory - - ./bundle.sh bundle - - cp -ra Bin/ECLIPSE_V7.0_45/ bundle/ECLIPSE/ - #Test - - apt-get update - - apt-get install -y parallel - - ./test.sh -j2 - artifacts: - paths: - - logs - expire_in: 1 week - tags: - - docker - tests_with_recompilation: - #ocaml/opam:debian-10-ocaml-4.11 - image: ocaml/opam@sha256:eaabdd3f42bd1ddfaa4b670b6bfb0acf3790a8927255d3fbc40576252798ce76 + image: ocaml/opam@sha256:aabf10d76f588677f6ee8007aae3d4dd45d28000501abce5aabda9de50e88dc7 script: - - rm -f Src/COLIBRI/lib/v7/x86_64_linux/* Src/COLIBRI/simplex_ocaml.pl - #OCaml dependencies - - opam depext --install "dune.2.7.1" "ocplib-simplex.0.4" "zarith.1.9.1" "parsexp.v0.14.0" "menhir.20200624" "fmt.0.8.8" "spelll.0.3" "uutf.1.0.2" "gen.0.5.3" - #OCaml compilation - - make ECLIPSEBIN=$(pwd)/Bin/ECLIPSE_V7.0_45/ - #Bundle in bundle directory - - ./bundle.sh bundle - - cp -ra Bin/ECLIPSE_V7.0_45/ bundle/ECLIPSE/ - #Test - sudo apt-get update - - sudo apt-get install -y parallel - - ./test.sh -j2 + - sudo apt-get install -y make parallel libgmp-dev + - opam install dune.3.12.1 fmt.0.9.0 gen.1.1 menhir.20230608 ocplib-simplex.0.5 parsexp.v0.16.0 spelll.0.4 uutf.1.0.3 zarith.1.13 + - make clean + - make clean_install + - make + - make install + - make test artifacts: paths: - logs + - bundle expire_in: 1 week tags: - docker diff --git a/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/bin/tclsh8.5 b/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/bin/tclsh8.5 index b99bc046a04ed34e48f194035efa52d1bc75ea31..a2aa61a55f4037475e9f8707b3d902c5c10c8b96 100755 Binary files a/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/bin/tclsh8.5 and b/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/bin/tclsh8.5 differ diff --git a/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/bin/wish8.5 b/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/bin/wish8.5 index e7231cdc4973140350a7372ac88be54fcd76e396..d8152ebd7c83a1b4c8edd44e9c2dc366dfc704cc 100755 Binary files a/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/bin/wish8.5 and b/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/bin/wish8.5 differ diff --git a/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/include/tcl.h b/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/include/tcl.h index 33926f2a13a3651ab1f082f5b70077eba4384ed1..8f51eb1baa66c532e88f6245a2b89e4711cbe726 100644 --- a/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/include/tcl.h +++ b/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/include/tcl.h @@ -13,7 +13,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tcl.h,v 1.254.2.16 2010/08/04 17:02:39 dgp Exp $ + * RCS: @(#) $Id: tcl.h,v 1.254 2008/03/28 17:31:44 dgp Exp $ */ #ifndef _TCL @@ -60,10 +60,10 @@ extern "C" { #define TCL_MAJOR_VERSION 8 #define TCL_MINOR_VERSION 5 #define TCL_RELEASE_LEVEL TCL_FINAL_RELEASE -#define TCL_RELEASE_SERIAL 9 +#define TCL_RELEASE_SERIAL 2 #define TCL_VERSION "8.5" -#define TCL_PATCH_LEVEL "8.5.9" +#define TCL_PATCH_LEVEL "8.5.2" /* * The following definitions set up the proper options for Windows compilers. @@ -145,7 +145,7 @@ extern "C" { * * The following TCL_VARARGS* macros are to support old extensions * written for older versions of Tcl where the macros permitted - * support for the varargs.h system as well as stdarg.h . + * support for the varargs.h system as well as stdarg.h . * * New code should just directly be written to use stdarg.h conventions. */ @@ -167,32 +167,31 @@ extern "C" { * Note: when building static but linking dynamically to MSVCRT we must still * correctly decorate the C library imported function. Use CRTIMPORT * for this purpose. _DLL is defined by the compiler when linking to - * MSVCRT. + * MSVCRT. */ #if (defined(__WIN32__) && (defined(_MSC_VER) || (__BORLANDC__ >= 0x0550) || defined(__LCC__) || defined(__WATCOMC__) || (defined(__GNUC__) && defined(__declspec)))) # define HAVE_DECLSPEC 1 -# ifdef STATIC_BUILD -# define DLLIMPORT -# define DLLEXPORT -# ifdef _DLL -# define CRTIMPORT __declspec(dllimport) -# else -# define CRTIMPORT -# endif +#endif + +#ifdef STATIC_BUILD +# define DLLIMPORT +# define DLLEXPORT +# if HAVE_DECLSPEC && defined(_DLL) +# define CRTIMPORT __declspec(dllimport) # else -# define DLLIMPORT __declspec(dllimport) -# define DLLEXPORT __declspec(dllexport) -# define CRTIMPORT __declspec(dllimport) +# define CRTIMPORT # endif #else -# define DLLIMPORT -# if defined(__GNUC__) && __GNUC__ > 3 -# define DLLEXPORT __attribute__ ((visibility("default"))) +# if HAVE_DECLSPEC +# define DLLIMPORT __declspec(dllimport) +# define DLLEXPORT __declspec(dllexport) +# define CRTIMPORT __declspec(dllimport) # else -# define DLLEXPORT +# define DLLIMPORT +# define DLLEXPORT +# define CRTIMPORT # endif -# define CRTIMPORT #endif /* @@ -262,7 +261,7 @@ extern "C" { #endif /* - * Make sure EXTERN isn't defined elsewhere. + * Make sure EXTERN isn't defined elsewhere */ #ifdef EXTERN @@ -315,7 +314,7 @@ typedef long LONG; #endif /* - * Darwin specific configure overrides (to support fat compiles, where + * Darwin specifc configure overrides (to support fat compiles, where * configure runs only once for multiple architectures): */ @@ -359,7 +358,7 @@ typedef long LONG; # if defined(__WIN32__) && !defined(__CYGWIN__) # define TCL_LL_MODIFIER "I64" # else -# define TCL_LL_MODIFIER "ll" +# define TCL_LL_MODIFIER "L" # endif typedef struct stat Tcl_StatBuf; # elif defined(__WIN32__) @@ -514,10 +513,9 @@ typedef void (Tcl_ThreadCreateProc) _ANSI_ARGS_((ClientData clientData)); * given to Tcl_CreateThread. */ -#define TCL_THREAD_STACK_DEFAULT (0) /* Use default size for stack. */ -#define TCL_THREAD_NOFLAGS (0000) /* Standard flags, default - * behaviour. */ -#define TCL_THREAD_JOINABLE (0001) /* Mark the thread as joinable. */ +#define TCL_THREAD_STACK_DEFAULT (0) /* Use default size for stack */ +#define TCL_THREAD_NOFLAGS (0000) /* Standard flags, default behaviour */ +#define TCL_THREAD_JOINABLE (0001) /* Mark the thread as joinable */ /* * Flag values passed to Tcl_StringCaseMatch. @@ -529,20 +527,20 @@ typedef void (Tcl_ThreadCreateProc) _ANSI_ARGS_((ClientData clientData)); * Flag values passed to Tcl_GetRegExpFromObj. */ -#define TCL_REG_BASIC 000000 /* BREs (convenience). */ -#define TCL_REG_EXTENDED 000001 /* EREs. */ -#define TCL_REG_ADVF 000002 /* Advanced features in EREs. */ -#define TCL_REG_ADVANCED 000003 /* AREs (which are also EREs). */ -#define TCL_REG_QUOTE 000004 /* No special characters, none. */ -#define TCL_REG_NOCASE 000010 /* Ignore case. */ -#define TCL_REG_NOSUB 000020 /* Don't care about subexpressions. */ -#define TCL_REG_EXPANDED 000040 /* Expanded format, white space & - * comments. */ +#define TCL_REG_BASIC 000000 /* BREs (convenience) */ +#define TCL_REG_EXTENDED 000001 /* EREs */ +#define TCL_REG_ADVF 000002 /* advanced features in EREs */ +#define TCL_REG_ADVANCED 000003 /* AREs (which are also EREs) */ +#define TCL_REG_QUOTE 000004 /* no special characters, none */ +#define TCL_REG_NOCASE 000010 /* ignore case */ +#define TCL_REG_NOSUB 000020 /* don't care about subexpressions */ +#define TCL_REG_EXPANDED 000040 /* expanded format, white space & + * comments */ #define TCL_REG_NLSTOP 000100 /* \n doesn't match . or [^ ] */ -#define TCL_REG_NLANCH 000200 /* ^ matches after \n, $ before. */ -#define TCL_REG_NEWLINE 000300 /* Newlines are line terminators. */ -#define TCL_REG_CANMATCH 001000 /* Report details on partial/limited - * matches. */ +#define TCL_REG_NLANCH 000200 /* ^ matches after \n, $ before */ +#define TCL_REG_NEWLINE 000300 /* newlines are line terminators */ +#define TCL_REG_CANMATCH 001000 /* report details on partial/limited + * matches */ /* * Flags values passed to Tcl_RegExpExecObj. @@ -601,13 +599,13 @@ typedef struct stat *Tcl_OldStat_; * interpreter's result is meaningless. */ -#define TCL_OK 0 -#define TCL_ERROR 1 -#define TCL_RETURN 2 -#define TCL_BREAK 3 -#define TCL_CONTINUE 4 +#define TCL_OK 0 +#define TCL_ERROR 1 +#define TCL_RETURN 2 +#define TCL_BREAK 3 +#define TCL_CONTINUE 4 -#define TCL_RESULT_SIZE 200 +#define TCL_RESULT_SIZE 200 /* * Flags to control what substitutions are performed by Tcl_SubstObj(): @@ -762,19 +760,19 @@ typedef struct Tcl_Obj { * internal rep. NULL indicates the object has * no internal rep (has no type). */ union { /* The internal representation: */ - long longValue; /* - an long integer value. */ - double doubleValue; /* - a double-precision floating value. */ - VOID *otherValuePtr; /* - another, type-specific value. */ - Tcl_WideInt wideValue; /* - a long long value. */ - struct { /* - internal rep as two pointers. */ + long longValue; /* - an long integer value */ + double doubleValue; /* - a double-precision floating value */ + VOID *otherValuePtr; /* - another, type-specific value */ + Tcl_WideInt wideValue; /* - a long long value */ + struct { /* - internal rep as two pointers */ VOID *ptr1; VOID *ptr2; } twoPtrValue; struct { /* - internal rep as a wide int, tightly - * packed fields. */ - VOID *ptr; /* Pointer to digits. */ + * packed fields */ + VOID *ptr; /* Pointer to digits */ unsigned long value;/* Alloc, used, and signum packed into a - * single word. */ + * single word */ } ptrAndLongRep; } internalRep; } Tcl_Obj; @@ -860,17 +858,16 @@ typedef struct Tcl_CallFrame { Tcl_Namespace *nsPtr; int dummy1; int dummy2; - VOID *dummy3; - VOID *dummy4; - VOID *dummy5; + char *dummy3; + char *dummy4; + char *dummy5; int dummy6; - VOID *dummy7; - VOID *dummy8; + char *dummy7; + char *dummy8; int dummy9; - VOID *dummy10; - VOID *dummy11; - VOID *dummy12; - VOID *dummy13; + char *dummy10; + char *dummy11; + char *dummy12; } Tcl_CallFrame; /* @@ -937,8 +934,8 @@ typedef struct Tcl_DString { * buffer space required by Tcl_PrintDouble. */ -#define TCL_MAX_PREC 17 -#define TCL_DOUBLE_SPACE (TCL_MAX_PREC+10) +#define TCL_MAX_PREC 17 +#define TCL_DOUBLE_SPACE (TCL_MAX_PREC+10) /* * Definition for a number of bytes of buffer space sufficient to hold the @@ -995,9 +992,9 @@ typedef struct Tcl_DString { * page for details): */ -#define TCL_VOLATILE ((Tcl_FreeProc *) 1) -#define TCL_STATIC ((Tcl_FreeProc *) 0) -#define TCL_DYNAMIC ((Tcl_FreeProc *) 3) +#define TCL_VOLATILE ((Tcl_FreeProc *) 1) +#define TCL_STATIC ((Tcl_FreeProc *) 0) +#define TCL_DYNAMIC ((Tcl_FreeProc *) 3) /* * Flag values passed to variable-related functions. @@ -1350,9 +1347,9 @@ typedef void (Tcl_ScaleTimeProc) _ANSI_ARGS_((Tcl_Time *timebuf, * indicate what sorts of events are of interest: */ -#define TCL_READABLE (1<<1) -#define TCL_WRITABLE (1<<2) -#define TCL_EXCEPTION (1<<3) +#define TCL_READABLE (1<<1) +#define TCL_WRITABLE (1<<2) +#define TCL_EXCEPTION (1<<3) /* * Flag values to pass to Tcl_OpenCommandChannel to indicate the disposition @@ -1370,15 +1367,15 @@ typedef void (Tcl_ScaleTimeProc) _ANSI_ARGS_((Tcl_Time *timebuf, * should be closed. */ -#define TCL_CLOSE_READ (1<<1) -#define TCL_CLOSE_WRITE (1<<2) +#define TCL_CLOSE_READ (1<<1) +#define TCL_CLOSE_WRITE (1<<2) /* * Value to use as the closeProc for a channel that supports the close2Proc * interface. */ -#define TCL_CLOSE2PROC ((Tcl_DriverCloseProc *) 1) +#define TCL_CLOSE2PROC ((Tcl_DriverCloseProc *)1) /* * Channel version tag. This was introduced in 8.3.2/8.4. @@ -1391,7 +1388,7 @@ typedef void (Tcl_ScaleTimeProc) _ANSI_ARGS_((Tcl_Time *timebuf, #define TCL_CHANNEL_VERSION_5 ((Tcl_ChannelTypeVersion) 0x5) /* - * TIP #218: Channel Actions, Ids for Tcl_DriverThreadActionProc. + * TIP #218: Channel Actions, Ids for Tcl_DriverThreadActionProc */ #define TCL_CHANNEL_THREAD_INSERT (0) @@ -1487,7 +1484,7 @@ typedef struct Tcl_ChannelType { /* Set blocking mode for the raw channel. May * be NULL. */ /* - * Only valid in TCL_CHANNEL_VERSION_2 channels or later. + * Only valid in TCL_CHANNEL_VERSION_2 channels or later */ Tcl_DriverFlushProc *flushProc; /* Function to call to flush a channel. May be @@ -1497,7 +1494,7 @@ typedef struct Tcl_ChannelType { * This will be passed up the stacked channel * chain. */ /* - * Only valid in TCL_CHANNEL_VERSION_3 channels or later. + * Only valid in TCL_CHANNEL_VERSION_3 channels or later */ Tcl_DriverWideSeekProc *wideSeekProc; /* Function to call to seek on the channel @@ -1505,8 +1502,8 @@ typedef struct Tcl_ChannelType { * NULL, and must be NULL if seekProc is * NULL. */ /* - * Only valid in TCL_CHANNEL_VERSION_4 channels or later. - * TIP #218, Channel Thread Actions. + * Only valid in TCL_CHANNEL_VERSION_4 channels or later + * TIP #218, Channel Thread Actions */ Tcl_DriverThreadActionProc *threadActionProc; /* Function to call to notify the driver of @@ -1514,8 +1511,8 @@ typedef struct Tcl_ChannelType { * be NULL. */ /* - * Only valid in TCL_CHANNEL_VERSION_5 channels or later. - * TIP #208, File Truncation. + * Only valid in TCL_CHANNEL_VERSION_5 channels or later + * TIP #208, File Truncation */ Tcl_DriverTruncateProc *truncateProc; /* Function to call to truncate the underlying @@ -1549,14 +1546,14 @@ typedef enum Tcl_PathType { */ typedef struct Tcl_GlobTypeData { - int type; /* Corresponds to bcdpfls as in 'find -t'. */ - int perm; /* Corresponds to file permissions. */ - Tcl_Obj *macType; /* Acceptable Mac type. */ - Tcl_Obj *macCreator; /* Acceptable Mac creator. */ + int type; /* Corresponds to bcdpfls as in 'find -t' */ + int perm; /* Corresponds to file permissions */ + Tcl_Obj *macType; /* Acceptable mac type */ + Tcl_Obj *macCreator; /* Acceptable mac creator */ } Tcl_GlobTypeData; /* - * Type and permission definitions for glob command. + * Type and permission definitions for glob command */ #define TCL_GLOB_TYPE_BLOCK (1<<0) @@ -1575,7 +1572,7 @@ typedef struct Tcl_GlobTypeData { #define TCL_GLOB_PERM_X (1<<4) /* - * Flags for the unload callback function. + * Flags for the unload callback function */ #define TCL_UNLOAD_DETACH_FROM_INTERPRETER (1<<0) @@ -2159,9 +2156,9 @@ typedef unsigned short Tcl_UniChar; typedef struct Tcl_Config { CONST char *key; /* Configuration key to register. ASCII - * encoded, thus UTF-8. */ + * encoded, thus UTF-8 */ CONST char *value; /* The value associated with the key. System - * encoding. */ + * encoding */ } Tcl_Config; /* @@ -2181,10 +2178,14 @@ typedef void (Tcl_LimitHandlerProc) _ANSI_ARGS_((ClientData clientData, Tcl_Interp *interp)); typedef void (Tcl_LimitHandlerDeleteProc) _ANSI_ARGS_((ClientData clientData)); +#ifndef MP_INT_DECLARED typedef struct mp_int mp_int; #define MP_INT_DECLARED -typedef unsigned int mp_digit; +#endif +#ifndef MP_DIGIT_DECLARED +typedef unsigned long mp_digit; #define MP_DIGIT_DECLARED +#endif /* * The following constant is used to test for older versions of Tcl in the @@ -2194,7 +2195,7 @@ typedef unsigned int mp_digit; * value since the stubs tables don't match. */ -#define TCL_STUB_MAGIC ((int) 0xFCA3BACF) +#define TCL_STUB_MAGIC ((int)0xFCA3BACF) /* * The following function is required to be defined in all stubs aware @@ -2299,7 +2300,7 @@ EXTERN void Tcl_GetMemoryInfo _ANSI_ARGS_((Tcl_DString *dsPtr)); # define Tcl_IncrRefCount(objPtr) \ ++(objPtr)->refCount /* - * Use do/while0 idiom for optimum correctness without compiler warnings. + * Use do/while0 idiom for optimum correctness without compiler warnings * http://c2.com/cgi/wiki?TrivialDoWhileLoop */ # define Tcl_DecrRefCount(objPtr) \ diff --git a/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/include/tclDecls.h b/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/include/tclDecls.h index 19046da3017ec98f3a506c2e011416e80dcd3a59..865dd6c5b2b772cea7bd814f1a2c37318856f6bd 100644 --- a/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/include/tclDecls.h +++ b/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/include/tclDecls.h @@ -8,7 +8,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclDecls.h,v 1.130.2.2 2010/02/07 22:16:54 nijtmans Exp $ + * RCS: @(#) $Id: tclDecls.h,v 1.130 2007/12/13 15:23:16 dgp Exp $ */ #ifndef _TCLDECLS @@ -40,3375 +40,3466 @@ #ifndef Tcl_PkgProvideEx_TCL_DECLARED #define Tcl_PkgProvideEx_TCL_DECLARED /* 0 */ -EXTERN int Tcl_PkgProvideEx(Tcl_Interp *interp, - CONST char *name, CONST char *version, +EXTERN int Tcl_PkgProvideEx (Tcl_Interp* interp, + CONST char* name, CONST char* version, ClientData clientData); #endif #ifndef Tcl_PkgRequireEx_TCL_DECLARED #define Tcl_PkgRequireEx_TCL_DECLARED /* 1 */ -EXTERN CONST84_RETURN char * Tcl_PkgRequireEx(Tcl_Interp *interp, - CONST char *name, CONST char *version, - int exact, ClientData *clientDataPtr); +EXTERN CONST84_RETURN char * Tcl_PkgRequireEx (Tcl_Interp * interp, + CONST char * name, CONST char * version, + int exact, ClientData * clientDataPtr); #endif #ifndef Tcl_Panic_TCL_DECLARED #define Tcl_Panic_TCL_DECLARED /* 2 */ -EXTERN void Tcl_Panic(CONST char *format, ...); +EXTERN void Tcl_Panic (CONST char * format, ...); #endif #ifndef Tcl_Alloc_TCL_DECLARED #define Tcl_Alloc_TCL_DECLARED /* 3 */ -EXTERN char * Tcl_Alloc(unsigned int size); +EXTERN char * Tcl_Alloc (unsigned int size); #endif #ifndef Tcl_Free_TCL_DECLARED #define Tcl_Free_TCL_DECLARED /* 4 */ -EXTERN void Tcl_Free(char *ptr); +EXTERN void Tcl_Free (char * ptr); #endif #ifndef Tcl_Realloc_TCL_DECLARED #define Tcl_Realloc_TCL_DECLARED /* 5 */ -EXTERN char * Tcl_Realloc(char *ptr, unsigned int size); +EXTERN char * Tcl_Realloc (char * ptr, unsigned int size); #endif #ifndef Tcl_DbCkalloc_TCL_DECLARED #define Tcl_DbCkalloc_TCL_DECLARED /* 6 */ -EXTERN char * Tcl_DbCkalloc(unsigned int size, CONST char *file, +EXTERN char * Tcl_DbCkalloc (unsigned int size, CONST char * file, int line); #endif #ifndef Tcl_DbCkfree_TCL_DECLARED #define Tcl_DbCkfree_TCL_DECLARED /* 7 */ -EXTERN int Tcl_DbCkfree(char *ptr, CONST char *file, int line); +EXTERN int Tcl_DbCkfree (char * ptr, CONST char * file, + int line); #endif #ifndef Tcl_DbCkrealloc_TCL_DECLARED #define Tcl_DbCkrealloc_TCL_DECLARED /* 8 */ -EXTERN char * Tcl_DbCkrealloc(char *ptr, unsigned int size, - CONST char *file, int line); +EXTERN char * Tcl_DbCkrealloc (char * ptr, unsigned int size, + CONST char * file, int line); #endif #if !defined(__WIN32__) && !defined(MAC_OSX_TCL) /* UNIX */ #ifndef Tcl_CreateFileHandler_TCL_DECLARED #define Tcl_CreateFileHandler_TCL_DECLARED /* 9 */ -EXTERN void Tcl_CreateFileHandler(int fd, int mask, - Tcl_FileProc *proc, ClientData clientData); +EXTERN void Tcl_CreateFileHandler (int fd, int mask, + Tcl_FileProc * proc, ClientData clientData); #endif #endif /* UNIX */ #ifdef MAC_OSX_TCL /* MACOSX */ #ifndef Tcl_CreateFileHandler_TCL_DECLARED #define Tcl_CreateFileHandler_TCL_DECLARED /* 9 */ -EXTERN void Tcl_CreateFileHandler(int fd, int mask, - Tcl_FileProc *proc, ClientData clientData); +EXTERN void Tcl_CreateFileHandler (int fd, int mask, + Tcl_FileProc * proc, ClientData clientData); #endif #endif /* MACOSX */ #if !defined(__WIN32__) && !defined(MAC_OSX_TCL) /* UNIX */ #ifndef Tcl_DeleteFileHandler_TCL_DECLARED #define Tcl_DeleteFileHandler_TCL_DECLARED /* 10 */ -EXTERN void Tcl_DeleteFileHandler(int fd); +EXTERN void Tcl_DeleteFileHandler (int fd); #endif #endif /* UNIX */ #ifdef MAC_OSX_TCL /* MACOSX */ #ifndef Tcl_DeleteFileHandler_TCL_DECLARED #define Tcl_DeleteFileHandler_TCL_DECLARED /* 10 */ -EXTERN void Tcl_DeleteFileHandler(int fd); +EXTERN void Tcl_DeleteFileHandler (int fd); #endif #endif /* MACOSX */ #ifndef Tcl_SetTimer_TCL_DECLARED #define Tcl_SetTimer_TCL_DECLARED /* 11 */ -EXTERN void Tcl_SetTimer(Tcl_Time *timePtr); +EXTERN void Tcl_SetTimer (Tcl_Time * timePtr); #endif #ifndef Tcl_Sleep_TCL_DECLARED #define Tcl_Sleep_TCL_DECLARED /* 12 */ -EXTERN void Tcl_Sleep(int ms); +EXTERN void Tcl_Sleep (int ms); #endif #ifndef Tcl_WaitForEvent_TCL_DECLARED #define Tcl_WaitForEvent_TCL_DECLARED /* 13 */ -EXTERN int Tcl_WaitForEvent(Tcl_Time *timePtr); +EXTERN int Tcl_WaitForEvent (Tcl_Time * timePtr); #endif #ifndef Tcl_AppendAllObjTypes_TCL_DECLARED #define Tcl_AppendAllObjTypes_TCL_DECLARED /* 14 */ -EXTERN int Tcl_AppendAllObjTypes(Tcl_Interp *interp, - Tcl_Obj *objPtr); +EXTERN int Tcl_AppendAllObjTypes (Tcl_Interp * interp, + Tcl_Obj * objPtr); #endif #ifndef Tcl_AppendStringsToObj_TCL_DECLARED #define Tcl_AppendStringsToObj_TCL_DECLARED /* 15 */ -EXTERN void Tcl_AppendStringsToObj(Tcl_Obj *objPtr, ...); +EXTERN void Tcl_AppendStringsToObj (Tcl_Obj * objPtr, ...); #endif #ifndef Tcl_AppendToObj_TCL_DECLARED #define Tcl_AppendToObj_TCL_DECLARED /* 16 */ -EXTERN void Tcl_AppendToObj(Tcl_Obj *objPtr, CONST char *bytes, +EXTERN void Tcl_AppendToObj (Tcl_Obj* objPtr, CONST char* bytes, int length); #endif #ifndef Tcl_ConcatObj_TCL_DECLARED #define Tcl_ConcatObj_TCL_DECLARED /* 17 */ -EXTERN Tcl_Obj * Tcl_ConcatObj(int objc, Tcl_Obj *CONST objv[]); +EXTERN Tcl_Obj * Tcl_ConcatObj (int objc, Tcl_Obj *CONST objv[]); #endif #ifndef Tcl_ConvertToType_TCL_DECLARED #define Tcl_ConvertToType_TCL_DECLARED /* 18 */ -EXTERN int Tcl_ConvertToType(Tcl_Interp *interp, - Tcl_Obj *objPtr, Tcl_ObjType *typePtr); +EXTERN int Tcl_ConvertToType (Tcl_Interp * interp, + Tcl_Obj * objPtr, Tcl_ObjType * typePtr); #endif #ifndef Tcl_DbDecrRefCount_TCL_DECLARED #define Tcl_DbDecrRefCount_TCL_DECLARED /* 19 */ -EXTERN void Tcl_DbDecrRefCount(Tcl_Obj *objPtr, CONST char *file, - int line); +EXTERN void Tcl_DbDecrRefCount (Tcl_Obj * objPtr, + CONST char * file, int line); #endif #ifndef Tcl_DbIncrRefCount_TCL_DECLARED #define Tcl_DbIncrRefCount_TCL_DECLARED /* 20 */ -EXTERN void Tcl_DbIncrRefCount(Tcl_Obj *objPtr, CONST char *file, - int line); +EXTERN void Tcl_DbIncrRefCount (Tcl_Obj * objPtr, + CONST char * file, int line); #endif #ifndef Tcl_DbIsShared_TCL_DECLARED #define Tcl_DbIsShared_TCL_DECLARED /* 21 */ -EXTERN int Tcl_DbIsShared(Tcl_Obj *objPtr, CONST char *file, +EXTERN int Tcl_DbIsShared (Tcl_Obj * objPtr, CONST char * file, int line); #endif #ifndef Tcl_DbNewBooleanObj_TCL_DECLARED #define Tcl_DbNewBooleanObj_TCL_DECLARED /* 22 */ -EXTERN Tcl_Obj * Tcl_DbNewBooleanObj(int boolValue, CONST char *file, - int line); +EXTERN Tcl_Obj * Tcl_DbNewBooleanObj (int boolValue, + CONST char * file, int line); #endif #ifndef Tcl_DbNewByteArrayObj_TCL_DECLARED #define Tcl_DbNewByteArrayObj_TCL_DECLARED /* 23 */ -EXTERN Tcl_Obj * Tcl_DbNewByteArrayObj(CONST unsigned char *bytes, - int length, CONST char *file, int line); +EXTERN Tcl_Obj * Tcl_DbNewByteArrayObj (CONST unsigned char * bytes, + int length, CONST char * file, int line); #endif #ifndef Tcl_DbNewDoubleObj_TCL_DECLARED #define Tcl_DbNewDoubleObj_TCL_DECLARED /* 24 */ -EXTERN Tcl_Obj * Tcl_DbNewDoubleObj(double doubleValue, - CONST char *file, int line); +EXTERN Tcl_Obj * Tcl_DbNewDoubleObj (double doubleValue, + CONST char * file, int line); #endif #ifndef Tcl_DbNewListObj_TCL_DECLARED #define Tcl_DbNewListObj_TCL_DECLARED /* 25 */ -EXTERN Tcl_Obj * Tcl_DbNewListObj(int objc, Tcl_Obj *CONST *objv, - CONST char *file, int line); +EXTERN Tcl_Obj * Tcl_DbNewListObj (int objc, Tcl_Obj *CONST * objv, + CONST char * file, int line); #endif #ifndef Tcl_DbNewLongObj_TCL_DECLARED #define Tcl_DbNewLongObj_TCL_DECLARED /* 26 */ -EXTERN Tcl_Obj * Tcl_DbNewLongObj(long longValue, CONST char *file, +EXTERN Tcl_Obj * Tcl_DbNewLongObj (long longValue, CONST char * file, int line); #endif #ifndef Tcl_DbNewObj_TCL_DECLARED #define Tcl_DbNewObj_TCL_DECLARED /* 27 */ -EXTERN Tcl_Obj * Tcl_DbNewObj(CONST char *file, int line); +EXTERN Tcl_Obj * Tcl_DbNewObj (CONST char * file, int line); #endif #ifndef Tcl_DbNewStringObj_TCL_DECLARED #define Tcl_DbNewStringObj_TCL_DECLARED /* 28 */ -EXTERN Tcl_Obj * Tcl_DbNewStringObj(CONST char *bytes, int length, - CONST char *file, int line); +EXTERN Tcl_Obj * Tcl_DbNewStringObj (CONST char * bytes, int length, + CONST char * file, int line); #endif #ifndef Tcl_DuplicateObj_TCL_DECLARED #define Tcl_DuplicateObj_TCL_DECLARED /* 29 */ -EXTERN Tcl_Obj * Tcl_DuplicateObj(Tcl_Obj *objPtr); +EXTERN Tcl_Obj * Tcl_DuplicateObj (Tcl_Obj * objPtr); #endif #ifndef TclFreeObj_TCL_DECLARED #define TclFreeObj_TCL_DECLARED /* 30 */ -EXTERN void TclFreeObj(Tcl_Obj *objPtr); +EXTERN void TclFreeObj (Tcl_Obj * objPtr); #endif #ifndef Tcl_GetBoolean_TCL_DECLARED #define Tcl_GetBoolean_TCL_DECLARED /* 31 */ -EXTERN int Tcl_GetBoolean(Tcl_Interp *interp, CONST char *src, - int *boolPtr); +EXTERN int Tcl_GetBoolean (Tcl_Interp * interp, + CONST char * src, int * boolPtr); #endif #ifndef Tcl_GetBooleanFromObj_TCL_DECLARED #define Tcl_GetBooleanFromObj_TCL_DECLARED /* 32 */ -EXTERN int Tcl_GetBooleanFromObj(Tcl_Interp *interp, - Tcl_Obj *objPtr, int *boolPtr); +EXTERN int Tcl_GetBooleanFromObj (Tcl_Interp * interp, + Tcl_Obj * objPtr, int * boolPtr); #endif #ifndef Tcl_GetByteArrayFromObj_TCL_DECLARED #define Tcl_GetByteArrayFromObj_TCL_DECLARED /* 33 */ -EXTERN unsigned char * Tcl_GetByteArrayFromObj(Tcl_Obj *objPtr, - int *lengthPtr); +EXTERN unsigned char * Tcl_GetByteArrayFromObj (Tcl_Obj * objPtr, + int * lengthPtr); #endif #ifndef Tcl_GetDouble_TCL_DECLARED #define Tcl_GetDouble_TCL_DECLARED /* 34 */ -EXTERN int Tcl_GetDouble(Tcl_Interp *interp, CONST char *src, - double *doublePtr); +EXTERN int Tcl_GetDouble (Tcl_Interp * interp, CONST char * src, + double * doublePtr); #endif #ifndef Tcl_GetDoubleFromObj_TCL_DECLARED #define Tcl_GetDoubleFromObj_TCL_DECLARED /* 35 */ -EXTERN int Tcl_GetDoubleFromObj(Tcl_Interp *interp, - Tcl_Obj *objPtr, double *doublePtr); +EXTERN int Tcl_GetDoubleFromObj (Tcl_Interp * interp, + Tcl_Obj * objPtr, double * doublePtr); #endif #ifndef Tcl_GetIndexFromObj_TCL_DECLARED #define Tcl_GetIndexFromObj_TCL_DECLARED /* 36 */ -EXTERN int Tcl_GetIndexFromObj(Tcl_Interp *interp, - Tcl_Obj *objPtr, CONST84 char **tablePtr, - CONST char *msg, int flags, int *indexPtr); +EXTERN int Tcl_GetIndexFromObj (Tcl_Interp * interp, + Tcl_Obj * objPtr, CONST84 char ** tablePtr, + CONST char * msg, int flags, int * indexPtr); #endif #ifndef Tcl_GetInt_TCL_DECLARED #define Tcl_GetInt_TCL_DECLARED /* 37 */ -EXTERN int Tcl_GetInt(Tcl_Interp *interp, CONST char *src, - int *intPtr); +EXTERN int Tcl_GetInt (Tcl_Interp * interp, CONST char * src, + int * intPtr); #endif #ifndef Tcl_GetIntFromObj_TCL_DECLARED #define Tcl_GetIntFromObj_TCL_DECLARED /* 38 */ -EXTERN int Tcl_GetIntFromObj(Tcl_Interp *interp, - Tcl_Obj *objPtr, int *intPtr); +EXTERN int Tcl_GetIntFromObj (Tcl_Interp * interp, + Tcl_Obj * objPtr, int * intPtr); #endif #ifndef Tcl_GetLongFromObj_TCL_DECLARED #define Tcl_GetLongFromObj_TCL_DECLARED /* 39 */ -EXTERN int Tcl_GetLongFromObj(Tcl_Interp *interp, - Tcl_Obj *objPtr, long *longPtr); +EXTERN int Tcl_GetLongFromObj (Tcl_Interp * interp, + Tcl_Obj * objPtr, long * longPtr); #endif #ifndef Tcl_GetObjType_TCL_DECLARED #define Tcl_GetObjType_TCL_DECLARED /* 40 */ -EXTERN Tcl_ObjType * Tcl_GetObjType(CONST char *typeName); +EXTERN Tcl_ObjType * Tcl_GetObjType (CONST char * typeName); #endif #ifndef Tcl_GetStringFromObj_TCL_DECLARED #define Tcl_GetStringFromObj_TCL_DECLARED /* 41 */ -EXTERN char * Tcl_GetStringFromObj(Tcl_Obj *objPtr, int *lengthPtr); +EXTERN char * Tcl_GetStringFromObj (Tcl_Obj * objPtr, + int * lengthPtr); #endif #ifndef Tcl_InvalidateStringRep_TCL_DECLARED #define Tcl_InvalidateStringRep_TCL_DECLARED /* 42 */ -EXTERN void Tcl_InvalidateStringRep(Tcl_Obj *objPtr); +EXTERN void Tcl_InvalidateStringRep (Tcl_Obj * objPtr); #endif #ifndef Tcl_ListObjAppendList_TCL_DECLARED #define Tcl_ListObjAppendList_TCL_DECLARED /* 43 */ -EXTERN int Tcl_ListObjAppendList(Tcl_Interp *interp, - Tcl_Obj *listPtr, Tcl_Obj *elemListPtr); +EXTERN int Tcl_ListObjAppendList (Tcl_Interp * interp, + Tcl_Obj * listPtr, Tcl_Obj * elemListPtr); #endif #ifndef Tcl_ListObjAppendElement_TCL_DECLARED #define Tcl_ListObjAppendElement_TCL_DECLARED /* 44 */ -EXTERN int Tcl_ListObjAppendElement(Tcl_Interp *interp, - Tcl_Obj *listPtr, Tcl_Obj *objPtr); +EXTERN int Tcl_ListObjAppendElement (Tcl_Interp * interp, + Tcl_Obj * listPtr, Tcl_Obj * objPtr); #endif #ifndef Tcl_ListObjGetElements_TCL_DECLARED #define Tcl_ListObjGetElements_TCL_DECLARED /* 45 */ -EXTERN int Tcl_ListObjGetElements(Tcl_Interp *interp, - Tcl_Obj *listPtr, int *objcPtr, - Tcl_Obj ***objvPtr); +EXTERN int Tcl_ListObjGetElements (Tcl_Interp * interp, + Tcl_Obj * listPtr, int * objcPtr, + Tcl_Obj *** objvPtr); #endif #ifndef Tcl_ListObjIndex_TCL_DECLARED #define Tcl_ListObjIndex_TCL_DECLARED /* 46 */ -EXTERN int Tcl_ListObjIndex(Tcl_Interp *interp, - Tcl_Obj *listPtr, int index, - Tcl_Obj **objPtrPtr); +EXTERN int Tcl_ListObjIndex (Tcl_Interp * interp, + Tcl_Obj * listPtr, int index, + Tcl_Obj ** objPtrPtr); #endif #ifndef Tcl_ListObjLength_TCL_DECLARED #define Tcl_ListObjLength_TCL_DECLARED /* 47 */ -EXTERN int Tcl_ListObjLength(Tcl_Interp *interp, - Tcl_Obj *listPtr, int *lengthPtr); +EXTERN int Tcl_ListObjLength (Tcl_Interp * interp, + Tcl_Obj * listPtr, int * lengthPtr); #endif #ifndef Tcl_ListObjReplace_TCL_DECLARED #define Tcl_ListObjReplace_TCL_DECLARED /* 48 */ -EXTERN int Tcl_ListObjReplace(Tcl_Interp *interp, - Tcl_Obj *listPtr, int first, int count, +EXTERN int Tcl_ListObjReplace (Tcl_Interp * interp, + Tcl_Obj * listPtr, int first, int count, int objc, Tcl_Obj *CONST objv[]); #endif #ifndef Tcl_NewBooleanObj_TCL_DECLARED #define Tcl_NewBooleanObj_TCL_DECLARED /* 49 */ -EXTERN Tcl_Obj * Tcl_NewBooleanObj(int boolValue); +EXTERN Tcl_Obj * Tcl_NewBooleanObj (int boolValue); #endif #ifndef Tcl_NewByteArrayObj_TCL_DECLARED #define Tcl_NewByteArrayObj_TCL_DECLARED /* 50 */ -EXTERN Tcl_Obj * Tcl_NewByteArrayObj(CONST unsigned char *bytes, +EXTERN Tcl_Obj * Tcl_NewByteArrayObj (CONST unsigned char* bytes, int length); #endif #ifndef Tcl_NewDoubleObj_TCL_DECLARED #define Tcl_NewDoubleObj_TCL_DECLARED /* 51 */ -EXTERN Tcl_Obj * Tcl_NewDoubleObj(double doubleValue); +EXTERN Tcl_Obj * Tcl_NewDoubleObj (double doubleValue); #endif #ifndef Tcl_NewIntObj_TCL_DECLARED #define Tcl_NewIntObj_TCL_DECLARED /* 52 */ -EXTERN Tcl_Obj * Tcl_NewIntObj(int intValue); +EXTERN Tcl_Obj * Tcl_NewIntObj (int intValue); #endif #ifndef Tcl_NewListObj_TCL_DECLARED #define Tcl_NewListObj_TCL_DECLARED /* 53 */ -EXTERN Tcl_Obj * Tcl_NewListObj(int objc, Tcl_Obj *CONST objv[]); +EXTERN Tcl_Obj * Tcl_NewListObj (int objc, Tcl_Obj *CONST objv[]); #endif #ifndef Tcl_NewLongObj_TCL_DECLARED #define Tcl_NewLongObj_TCL_DECLARED /* 54 */ -EXTERN Tcl_Obj * Tcl_NewLongObj(long longValue); +EXTERN Tcl_Obj * Tcl_NewLongObj (long longValue); #endif #ifndef Tcl_NewObj_TCL_DECLARED #define Tcl_NewObj_TCL_DECLARED /* 55 */ -EXTERN Tcl_Obj * Tcl_NewObj(void); +EXTERN Tcl_Obj * Tcl_NewObj (void); #endif #ifndef Tcl_NewStringObj_TCL_DECLARED #define Tcl_NewStringObj_TCL_DECLARED /* 56 */ -EXTERN Tcl_Obj * Tcl_NewStringObj(CONST char *bytes, int length); +EXTERN Tcl_Obj * Tcl_NewStringObj (CONST char * bytes, int length); #endif #ifndef Tcl_SetBooleanObj_TCL_DECLARED #define Tcl_SetBooleanObj_TCL_DECLARED /* 57 */ -EXTERN void Tcl_SetBooleanObj(Tcl_Obj *objPtr, int boolValue); +EXTERN void Tcl_SetBooleanObj (Tcl_Obj * objPtr, int boolValue); #endif #ifndef Tcl_SetByteArrayLength_TCL_DECLARED #define Tcl_SetByteArrayLength_TCL_DECLARED /* 58 */ -EXTERN unsigned char * Tcl_SetByteArrayLength(Tcl_Obj *objPtr, int length); +EXTERN unsigned char * Tcl_SetByteArrayLength (Tcl_Obj * objPtr, int length); #endif #ifndef Tcl_SetByteArrayObj_TCL_DECLARED #define Tcl_SetByteArrayObj_TCL_DECLARED /* 59 */ -EXTERN void Tcl_SetByteArrayObj(Tcl_Obj *objPtr, - CONST unsigned char *bytes, int length); +EXTERN void Tcl_SetByteArrayObj (Tcl_Obj * objPtr, + CONST unsigned char * bytes, int length); #endif #ifndef Tcl_SetDoubleObj_TCL_DECLARED #define Tcl_SetDoubleObj_TCL_DECLARED /* 60 */ -EXTERN void Tcl_SetDoubleObj(Tcl_Obj *objPtr, double doubleValue); +EXTERN void Tcl_SetDoubleObj (Tcl_Obj * objPtr, + double doubleValue); #endif #ifndef Tcl_SetIntObj_TCL_DECLARED #define Tcl_SetIntObj_TCL_DECLARED /* 61 */ -EXTERN void Tcl_SetIntObj(Tcl_Obj *objPtr, int intValue); +EXTERN void Tcl_SetIntObj (Tcl_Obj * objPtr, int intValue); #endif #ifndef Tcl_SetListObj_TCL_DECLARED #define Tcl_SetListObj_TCL_DECLARED /* 62 */ -EXTERN void Tcl_SetListObj(Tcl_Obj *objPtr, int objc, +EXTERN void Tcl_SetListObj (Tcl_Obj * objPtr, int objc, Tcl_Obj *CONST objv[]); #endif #ifndef Tcl_SetLongObj_TCL_DECLARED #define Tcl_SetLongObj_TCL_DECLARED /* 63 */ -EXTERN void Tcl_SetLongObj(Tcl_Obj *objPtr, long longValue); +EXTERN void Tcl_SetLongObj (Tcl_Obj * objPtr, long longValue); #endif #ifndef Tcl_SetObjLength_TCL_DECLARED #define Tcl_SetObjLength_TCL_DECLARED /* 64 */ -EXTERN void Tcl_SetObjLength(Tcl_Obj *objPtr, int length); +EXTERN void Tcl_SetObjLength (Tcl_Obj * objPtr, int length); #endif #ifndef Tcl_SetStringObj_TCL_DECLARED #define Tcl_SetStringObj_TCL_DECLARED /* 65 */ -EXTERN void Tcl_SetStringObj(Tcl_Obj *objPtr, CONST char *bytes, +EXTERN void Tcl_SetStringObj (Tcl_Obj* objPtr, CONST char* bytes, int length); #endif #ifndef Tcl_AddErrorInfo_TCL_DECLARED #define Tcl_AddErrorInfo_TCL_DECLARED /* 66 */ -EXTERN void Tcl_AddErrorInfo(Tcl_Interp *interp, - CONST char *message); +EXTERN void Tcl_AddErrorInfo (Tcl_Interp * interp, + CONST char * message); #endif #ifndef Tcl_AddObjErrorInfo_TCL_DECLARED #define Tcl_AddObjErrorInfo_TCL_DECLARED /* 67 */ -EXTERN void Tcl_AddObjErrorInfo(Tcl_Interp *interp, - CONST char *message, int length); +EXTERN void Tcl_AddObjErrorInfo (Tcl_Interp * interp, + CONST char * message, int length); #endif #ifndef Tcl_AllowExceptions_TCL_DECLARED #define Tcl_AllowExceptions_TCL_DECLARED /* 68 */ -EXTERN void Tcl_AllowExceptions(Tcl_Interp *interp); +EXTERN void Tcl_AllowExceptions (Tcl_Interp * interp); #endif #ifndef Tcl_AppendElement_TCL_DECLARED #define Tcl_AppendElement_TCL_DECLARED /* 69 */ -EXTERN void Tcl_AppendElement(Tcl_Interp *interp, - CONST char *element); +EXTERN void Tcl_AppendElement (Tcl_Interp * interp, + CONST char * element); #endif #ifndef Tcl_AppendResult_TCL_DECLARED #define Tcl_AppendResult_TCL_DECLARED /* 70 */ -EXTERN void Tcl_AppendResult(Tcl_Interp *interp, ...); +EXTERN void Tcl_AppendResult (Tcl_Interp * interp, ...); #endif #ifndef Tcl_AsyncCreate_TCL_DECLARED #define Tcl_AsyncCreate_TCL_DECLARED /* 71 */ -EXTERN Tcl_AsyncHandler Tcl_AsyncCreate(Tcl_AsyncProc *proc, +EXTERN Tcl_AsyncHandler Tcl_AsyncCreate (Tcl_AsyncProc * proc, ClientData clientData); #endif #ifndef Tcl_AsyncDelete_TCL_DECLARED #define Tcl_AsyncDelete_TCL_DECLARED /* 72 */ -EXTERN void Tcl_AsyncDelete(Tcl_AsyncHandler async); +EXTERN void Tcl_AsyncDelete (Tcl_AsyncHandler async); #endif #ifndef Tcl_AsyncInvoke_TCL_DECLARED #define Tcl_AsyncInvoke_TCL_DECLARED /* 73 */ -EXTERN int Tcl_AsyncInvoke(Tcl_Interp *interp, int code); +EXTERN int Tcl_AsyncInvoke (Tcl_Interp * interp, int code); #endif #ifndef Tcl_AsyncMark_TCL_DECLARED #define Tcl_AsyncMark_TCL_DECLARED /* 74 */ -EXTERN void Tcl_AsyncMark(Tcl_AsyncHandler async); +EXTERN void Tcl_AsyncMark (Tcl_AsyncHandler async); #endif #ifndef Tcl_AsyncReady_TCL_DECLARED #define Tcl_AsyncReady_TCL_DECLARED /* 75 */ -EXTERN int Tcl_AsyncReady(void); +EXTERN int Tcl_AsyncReady (void); #endif #ifndef Tcl_BackgroundError_TCL_DECLARED #define Tcl_BackgroundError_TCL_DECLARED /* 76 */ -EXTERN void Tcl_BackgroundError(Tcl_Interp *interp); +EXTERN void Tcl_BackgroundError (Tcl_Interp * interp); #endif #ifndef Tcl_Backslash_TCL_DECLARED #define Tcl_Backslash_TCL_DECLARED /* 77 */ -EXTERN char Tcl_Backslash(CONST char *src, int *readPtr); +EXTERN char Tcl_Backslash (CONST char * src, int * readPtr); #endif #ifndef Tcl_BadChannelOption_TCL_DECLARED #define Tcl_BadChannelOption_TCL_DECLARED /* 78 */ -EXTERN int Tcl_BadChannelOption(Tcl_Interp *interp, - CONST char *optionName, - CONST char *optionList); +EXTERN int Tcl_BadChannelOption (Tcl_Interp * interp, + CONST char * optionName, + CONST char * optionList); #endif #ifndef Tcl_CallWhenDeleted_TCL_DECLARED #define Tcl_CallWhenDeleted_TCL_DECLARED /* 79 */ -EXTERN void Tcl_CallWhenDeleted(Tcl_Interp *interp, - Tcl_InterpDeleteProc *proc, +EXTERN void Tcl_CallWhenDeleted (Tcl_Interp * interp, + Tcl_InterpDeleteProc * proc, ClientData clientData); #endif #ifndef Tcl_CancelIdleCall_TCL_DECLARED #define Tcl_CancelIdleCall_TCL_DECLARED /* 80 */ -EXTERN void Tcl_CancelIdleCall(Tcl_IdleProc *idleProc, +EXTERN void Tcl_CancelIdleCall (Tcl_IdleProc * idleProc, ClientData clientData); #endif #ifndef Tcl_Close_TCL_DECLARED #define Tcl_Close_TCL_DECLARED /* 81 */ -EXTERN int Tcl_Close(Tcl_Interp *interp, Tcl_Channel chan); +EXTERN int Tcl_Close (Tcl_Interp * interp, Tcl_Channel chan); #endif #ifndef Tcl_CommandComplete_TCL_DECLARED #define Tcl_CommandComplete_TCL_DECLARED /* 82 */ -EXTERN int Tcl_CommandComplete(CONST char *cmd); +EXTERN int Tcl_CommandComplete (CONST char * cmd); #endif #ifndef Tcl_Concat_TCL_DECLARED #define Tcl_Concat_TCL_DECLARED /* 83 */ -EXTERN char * Tcl_Concat(int argc, CONST84 char *CONST *argv); +EXTERN char * Tcl_Concat (int argc, CONST84 char * CONST * argv); #endif #ifndef Tcl_ConvertElement_TCL_DECLARED #define Tcl_ConvertElement_TCL_DECLARED /* 84 */ -EXTERN int Tcl_ConvertElement(CONST char *src, char *dst, +EXTERN int Tcl_ConvertElement (CONST char * src, char * dst, int flags); #endif #ifndef Tcl_ConvertCountedElement_TCL_DECLARED #define Tcl_ConvertCountedElement_TCL_DECLARED /* 85 */ -EXTERN int Tcl_ConvertCountedElement(CONST char *src, - int length, char *dst, int flags); +EXTERN int Tcl_ConvertCountedElement (CONST char * src, + int length, char * dst, int flags); #endif #ifndef Tcl_CreateAlias_TCL_DECLARED #define Tcl_CreateAlias_TCL_DECLARED /* 86 */ -EXTERN int Tcl_CreateAlias(Tcl_Interp *slave, - CONST char *slaveCmd, Tcl_Interp *target, - CONST char *targetCmd, int argc, - CONST84 char *CONST *argv); +EXTERN int Tcl_CreateAlias (Tcl_Interp * slave, + CONST char * slaveCmd, Tcl_Interp * target, + CONST char * targetCmd, int argc, + CONST84 char * CONST * argv); #endif #ifndef Tcl_CreateAliasObj_TCL_DECLARED #define Tcl_CreateAliasObj_TCL_DECLARED /* 87 */ -EXTERN int Tcl_CreateAliasObj(Tcl_Interp *slave, - CONST char *slaveCmd, Tcl_Interp *target, - CONST char *targetCmd, int objc, +EXTERN int Tcl_CreateAliasObj (Tcl_Interp * slave, + CONST char * slaveCmd, Tcl_Interp * target, + CONST char * targetCmd, int objc, Tcl_Obj *CONST objv[]); #endif #ifndef Tcl_CreateChannel_TCL_DECLARED #define Tcl_CreateChannel_TCL_DECLARED /* 88 */ -EXTERN Tcl_Channel Tcl_CreateChannel(Tcl_ChannelType *typePtr, - CONST char *chanName, +EXTERN Tcl_Channel Tcl_CreateChannel (Tcl_ChannelType * typePtr, + CONST char * chanName, ClientData instanceData, int mask); #endif #ifndef Tcl_CreateChannelHandler_TCL_DECLARED #define Tcl_CreateChannelHandler_TCL_DECLARED /* 89 */ -EXTERN void Tcl_CreateChannelHandler(Tcl_Channel chan, int mask, - Tcl_ChannelProc *proc, ClientData clientData); +EXTERN void Tcl_CreateChannelHandler (Tcl_Channel chan, int mask, + Tcl_ChannelProc * proc, + ClientData clientData); #endif #ifndef Tcl_CreateCloseHandler_TCL_DECLARED #define Tcl_CreateCloseHandler_TCL_DECLARED /* 90 */ -EXTERN void Tcl_CreateCloseHandler(Tcl_Channel chan, - Tcl_CloseProc *proc, ClientData clientData); +EXTERN void Tcl_CreateCloseHandler (Tcl_Channel chan, + Tcl_CloseProc * proc, ClientData clientData); #endif #ifndef Tcl_CreateCommand_TCL_DECLARED #define Tcl_CreateCommand_TCL_DECLARED /* 91 */ -EXTERN Tcl_Command Tcl_CreateCommand(Tcl_Interp *interp, - CONST char *cmdName, Tcl_CmdProc *proc, - ClientData clientData, - Tcl_CmdDeleteProc *deleteProc); +EXTERN Tcl_Command Tcl_CreateCommand (Tcl_Interp * interp, + CONST char * cmdName, Tcl_CmdProc * proc, + ClientData clientData, + Tcl_CmdDeleteProc * deleteProc); #endif #ifndef Tcl_CreateEventSource_TCL_DECLARED #define Tcl_CreateEventSource_TCL_DECLARED /* 92 */ -EXTERN void Tcl_CreateEventSource(Tcl_EventSetupProc *setupProc, - Tcl_EventCheckProc *checkProc, +EXTERN void Tcl_CreateEventSource ( + Tcl_EventSetupProc * setupProc, + Tcl_EventCheckProc * checkProc, ClientData clientData); #endif #ifndef Tcl_CreateExitHandler_TCL_DECLARED #define Tcl_CreateExitHandler_TCL_DECLARED /* 93 */ -EXTERN void Tcl_CreateExitHandler(Tcl_ExitProc *proc, +EXTERN void Tcl_CreateExitHandler (Tcl_ExitProc * proc, ClientData clientData); #endif #ifndef Tcl_CreateInterp_TCL_DECLARED #define Tcl_CreateInterp_TCL_DECLARED /* 94 */ -EXTERN Tcl_Interp * Tcl_CreateInterp(void); +EXTERN Tcl_Interp * Tcl_CreateInterp (void); #endif #ifndef Tcl_CreateMathFunc_TCL_DECLARED #define Tcl_CreateMathFunc_TCL_DECLARED /* 95 */ -EXTERN void Tcl_CreateMathFunc(Tcl_Interp *interp, - CONST char *name, int numArgs, - Tcl_ValueType *argTypes, Tcl_MathProc *proc, - ClientData clientData); +EXTERN void Tcl_CreateMathFunc (Tcl_Interp * interp, + CONST char * name, int numArgs, + Tcl_ValueType * argTypes, + Tcl_MathProc * proc, ClientData clientData); #endif #ifndef Tcl_CreateObjCommand_TCL_DECLARED #define Tcl_CreateObjCommand_TCL_DECLARED /* 96 */ -EXTERN Tcl_Command Tcl_CreateObjCommand(Tcl_Interp *interp, - CONST char *cmdName, Tcl_ObjCmdProc *proc, - ClientData clientData, - Tcl_CmdDeleteProc *deleteProc); +EXTERN Tcl_Command Tcl_CreateObjCommand (Tcl_Interp * interp, + CONST char * cmdName, Tcl_ObjCmdProc * proc, + ClientData clientData, + Tcl_CmdDeleteProc * deleteProc); #endif #ifndef Tcl_CreateSlave_TCL_DECLARED #define Tcl_CreateSlave_TCL_DECLARED /* 97 */ -EXTERN Tcl_Interp * Tcl_CreateSlave(Tcl_Interp *interp, - CONST char *slaveName, int isSafe); +EXTERN Tcl_Interp * Tcl_CreateSlave (Tcl_Interp * interp, + CONST char * slaveName, int isSafe); #endif #ifndef Tcl_CreateTimerHandler_TCL_DECLARED #define Tcl_CreateTimerHandler_TCL_DECLARED /* 98 */ -EXTERN Tcl_TimerToken Tcl_CreateTimerHandler(int milliseconds, - Tcl_TimerProc *proc, ClientData clientData); +EXTERN Tcl_TimerToken Tcl_CreateTimerHandler (int milliseconds, + Tcl_TimerProc * proc, ClientData clientData); #endif #ifndef Tcl_CreateTrace_TCL_DECLARED #define Tcl_CreateTrace_TCL_DECLARED /* 99 */ -EXTERN Tcl_Trace Tcl_CreateTrace(Tcl_Interp *interp, int level, - Tcl_CmdTraceProc *proc, +EXTERN Tcl_Trace Tcl_CreateTrace (Tcl_Interp * interp, int level, + Tcl_CmdTraceProc * proc, ClientData clientData); #endif #ifndef Tcl_DeleteAssocData_TCL_DECLARED #define Tcl_DeleteAssocData_TCL_DECLARED /* 100 */ -EXTERN void Tcl_DeleteAssocData(Tcl_Interp *interp, - CONST char *name); +EXTERN void Tcl_DeleteAssocData (Tcl_Interp * interp, + CONST char * name); #endif #ifndef Tcl_DeleteChannelHandler_TCL_DECLARED #define Tcl_DeleteChannelHandler_TCL_DECLARED /* 101 */ -EXTERN void Tcl_DeleteChannelHandler(Tcl_Channel chan, - Tcl_ChannelProc *proc, ClientData clientData); +EXTERN void Tcl_DeleteChannelHandler (Tcl_Channel chan, + Tcl_ChannelProc * proc, + ClientData clientData); #endif #ifndef Tcl_DeleteCloseHandler_TCL_DECLARED #define Tcl_DeleteCloseHandler_TCL_DECLARED /* 102 */ -EXTERN void Tcl_DeleteCloseHandler(Tcl_Channel chan, - Tcl_CloseProc *proc, ClientData clientData); +EXTERN void Tcl_DeleteCloseHandler (Tcl_Channel chan, + Tcl_CloseProc * proc, ClientData clientData); #endif #ifndef Tcl_DeleteCommand_TCL_DECLARED #define Tcl_DeleteCommand_TCL_DECLARED /* 103 */ -EXTERN int Tcl_DeleteCommand(Tcl_Interp *interp, - CONST char *cmdName); +EXTERN int Tcl_DeleteCommand (Tcl_Interp * interp, + CONST char * cmdName); #endif #ifndef Tcl_DeleteCommandFromToken_TCL_DECLARED #define Tcl_DeleteCommandFromToken_TCL_DECLARED /* 104 */ -EXTERN int Tcl_DeleteCommandFromToken(Tcl_Interp *interp, +EXTERN int Tcl_DeleteCommandFromToken (Tcl_Interp * interp, Tcl_Command command); #endif #ifndef Tcl_DeleteEvents_TCL_DECLARED #define Tcl_DeleteEvents_TCL_DECLARED /* 105 */ -EXTERN void Tcl_DeleteEvents(Tcl_EventDeleteProc *proc, +EXTERN void Tcl_DeleteEvents (Tcl_EventDeleteProc * proc, ClientData clientData); #endif #ifndef Tcl_DeleteEventSource_TCL_DECLARED #define Tcl_DeleteEventSource_TCL_DECLARED /* 106 */ -EXTERN void Tcl_DeleteEventSource(Tcl_EventSetupProc *setupProc, - Tcl_EventCheckProc *checkProc, +EXTERN void Tcl_DeleteEventSource ( + Tcl_EventSetupProc * setupProc, + Tcl_EventCheckProc * checkProc, ClientData clientData); #endif #ifndef Tcl_DeleteExitHandler_TCL_DECLARED #define Tcl_DeleteExitHandler_TCL_DECLARED /* 107 */ -EXTERN void Tcl_DeleteExitHandler(Tcl_ExitProc *proc, +EXTERN void Tcl_DeleteExitHandler (Tcl_ExitProc * proc, ClientData clientData); #endif #ifndef Tcl_DeleteHashEntry_TCL_DECLARED #define Tcl_DeleteHashEntry_TCL_DECLARED /* 108 */ -EXTERN void Tcl_DeleteHashEntry(Tcl_HashEntry *entryPtr); +EXTERN void Tcl_DeleteHashEntry (Tcl_HashEntry * entryPtr); #endif #ifndef Tcl_DeleteHashTable_TCL_DECLARED #define Tcl_DeleteHashTable_TCL_DECLARED /* 109 */ -EXTERN void Tcl_DeleteHashTable(Tcl_HashTable *tablePtr); +EXTERN void Tcl_DeleteHashTable (Tcl_HashTable * tablePtr); #endif #ifndef Tcl_DeleteInterp_TCL_DECLARED #define Tcl_DeleteInterp_TCL_DECLARED /* 110 */ -EXTERN void Tcl_DeleteInterp(Tcl_Interp *interp); +EXTERN void Tcl_DeleteInterp (Tcl_Interp * interp); +#endif +#if !defined(__WIN32__) && !defined(MAC_OSX_TCL) /* UNIX */ +#ifndef Tcl_DetachPids_TCL_DECLARED +#define Tcl_DetachPids_TCL_DECLARED +/* 111 */ +EXTERN void Tcl_DetachPids (int numPids, Tcl_Pid * pidPtr); +#endif +#endif /* UNIX */ +#ifdef __WIN32__ /* WIN */ +#ifndef Tcl_DetachPids_TCL_DECLARED +#define Tcl_DetachPids_TCL_DECLARED +/* 111 */ +EXTERN void Tcl_DetachPids (int numPids, Tcl_Pid * pidPtr); #endif +#endif /* WIN */ +#ifdef MAC_OSX_TCL /* MACOSX */ #ifndef Tcl_DetachPids_TCL_DECLARED #define Tcl_DetachPids_TCL_DECLARED /* 111 */ -EXTERN void Tcl_DetachPids(int numPids, Tcl_Pid *pidPtr); +EXTERN void Tcl_DetachPids (int numPids, Tcl_Pid * pidPtr); #endif +#endif /* MACOSX */ #ifndef Tcl_DeleteTimerHandler_TCL_DECLARED #define Tcl_DeleteTimerHandler_TCL_DECLARED /* 112 */ -EXTERN void Tcl_DeleteTimerHandler(Tcl_TimerToken token); +EXTERN void Tcl_DeleteTimerHandler (Tcl_TimerToken token); #endif #ifndef Tcl_DeleteTrace_TCL_DECLARED #define Tcl_DeleteTrace_TCL_DECLARED /* 113 */ -EXTERN void Tcl_DeleteTrace(Tcl_Interp *interp, Tcl_Trace trace); +EXTERN void Tcl_DeleteTrace (Tcl_Interp * interp, + Tcl_Trace trace); #endif #ifndef Tcl_DontCallWhenDeleted_TCL_DECLARED #define Tcl_DontCallWhenDeleted_TCL_DECLARED /* 114 */ -EXTERN void Tcl_DontCallWhenDeleted(Tcl_Interp *interp, - Tcl_InterpDeleteProc *proc, +EXTERN void Tcl_DontCallWhenDeleted (Tcl_Interp * interp, + Tcl_InterpDeleteProc * proc, ClientData clientData); #endif #ifndef Tcl_DoOneEvent_TCL_DECLARED #define Tcl_DoOneEvent_TCL_DECLARED /* 115 */ -EXTERN int Tcl_DoOneEvent(int flags); +EXTERN int Tcl_DoOneEvent (int flags); #endif #ifndef Tcl_DoWhenIdle_TCL_DECLARED #define Tcl_DoWhenIdle_TCL_DECLARED /* 116 */ -EXTERN void Tcl_DoWhenIdle(Tcl_IdleProc *proc, +EXTERN void Tcl_DoWhenIdle (Tcl_IdleProc * proc, ClientData clientData); #endif #ifndef Tcl_DStringAppend_TCL_DECLARED #define Tcl_DStringAppend_TCL_DECLARED /* 117 */ -EXTERN char * Tcl_DStringAppend(Tcl_DString *dsPtr, - CONST char *bytes, int length); +EXTERN char * Tcl_DStringAppend (Tcl_DString * dsPtr, + CONST char * bytes, int length); #endif #ifndef Tcl_DStringAppendElement_TCL_DECLARED #define Tcl_DStringAppendElement_TCL_DECLARED /* 118 */ -EXTERN char * Tcl_DStringAppendElement(Tcl_DString *dsPtr, - CONST char *element); +EXTERN char * Tcl_DStringAppendElement (Tcl_DString * dsPtr, + CONST char * element); #endif #ifndef Tcl_DStringEndSublist_TCL_DECLARED #define Tcl_DStringEndSublist_TCL_DECLARED /* 119 */ -EXTERN void Tcl_DStringEndSublist(Tcl_DString *dsPtr); +EXTERN void Tcl_DStringEndSublist (Tcl_DString * dsPtr); #endif #ifndef Tcl_DStringFree_TCL_DECLARED #define Tcl_DStringFree_TCL_DECLARED /* 120 */ -EXTERN void Tcl_DStringFree(Tcl_DString *dsPtr); +EXTERN void Tcl_DStringFree (Tcl_DString * dsPtr); #endif #ifndef Tcl_DStringGetResult_TCL_DECLARED #define Tcl_DStringGetResult_TCL_DECLARED /* 121 */ -EXTERN void Tcl_DStringGetResult(Tcl_Interp *interp, - Tcl_DString *dsPtr); +EXTERN void Tcl_DStringGetResult (Tcl_Interp * interp, + Tcl_DString * dsPtr); #endif #ifndef Tcl_DStringInit_TCL_DECLARED #define Tcl_DStringInit_TCL_DECLARED /* 122 */ -EXTERN void Tcl_DStringInit(Tcl_DString *dsPtr); +EXTERN void Tcl_DStringInit (Tcl_DString * dsPtr); #endif #ifndef Tcl_DStringResult_TCL_DECLARED #define Tcl_DStringResult_TCL_DECLARED /* 123 */ -EXTERN void Tcl_DStringResult(Tcl_Interp *interp, - Tcl_DString *dsPtr); +EXTERN void Tcl_DStringResult (Tcl_Interp * interp, + Tcl_DString * dsPtr); #endif #ifndef Tcl_DStringSetLength_TCL_DECLARED #define Tcl_DStringSetLength_TCL_DECLARED /* 124 */ -EXTERN void Tcl_DStringSetLength(Tcl_DString *dsPtr, int length); +EXTERN void Tcl_DStringSetLength (Tcl_DString * dsPtr, + int length); #endif #ifndef Tcl_DStringStartSublist_TCL_DECLARED #define Tcl_DStringStartSublist_TCL_DECLARED /* 125 */ -EXTERN void Tcl_DStringStartSublist(Tcl_DString *dsPtr); +EXTERN void Tcl_DStringStartSublist (Tcl_DString * dsPtr); #endif #ifndef Tcl_Eof_TCL_DECLARED #define Tcl_Eof_TCL_DECLARED /* 126 */ -EXTERN int Tcl_Eof(Tcl_Channel chan); +EXTERN int Tcl_Eof (Tcl_Channel chan); #endif #ifndef Tcl_ErrnoId_TCL_DECLARED #define Tcl_ErrnoId_TCL_DECLARED /* 127 */ -EXTERN CONST84_RETURN char * Tcl_ErrnoId(void); +EXTERN CONST84_RETURN char * Tcl_ErrnoId (void); #endif #ifndef Tcl_ErrnoMsg_TCL_DECLARED #define Tcl_ErrnoMsg_TCL_DECLARED /* 128 */ -EXTERN CONST84_RETURN char * Tcl_ErrnoMsg(int err); +EXTERN CONST84_RETURN char * Tcl_ErrnoMsg (int err); #endif #ifndef Tcl_Eval_TCL_DECLARED #define Tcl_Eval_TCL_DECLARED /* 129 */ -EXTERN int Tcl_Eval(Tcl_Interp *interp, CONST char *script); +EXTERN int Tcl_Eval (Tcl_Interp * interp, CONST char * script); #endif #ifndef Tcl_EvalFile_TCL_DECLARED #define Tcl_EvalFile_TCL_DECLARED /* 130 */ -EXTERN int Tcl_EvalFile(Tcl_Interp *interp, - CONST char *fileName); +EXTERN int Tcl_EvalFile (Tcl_Interp * interp, + CONST char * fileName); #endif #ifndef Tcl_EvalObj_TCL_DECLARED #define Tcl_EvalObj_TCL_DECLARED /* 131 */ -EXTERN int Tcl_EvalObj(Tcl_Interp *interp, Tcl_Obj *objPtr); +EXTERN int Tcl_EvalObj (Tcl_Interp * interp, Tcl_Obj * objPtr); #endif #ifndef Tcl_EventuallyFree_TCL_DECLARED #define Tcl_EventuallyFree_TCL_DECLARED /* 132 */ -EXTERN void Tcl_EventuallyFree(ClientData clientData, - Tcl_FreeProc *freeProc); +EXTERN void Tcl_EventuallyFree (ClientData clientData, + Tcl_FreeProc * freeProc); #endif #ifndef Tcl_Exit_TCL_DECLARED #define Tcl_Exit_TCL_DECLARED /* 133 */ -EXTERN void Tcl_Exit(int status); +EXTERN void Tcl_Exit (int status); #endif #ifndef Tcl_ExposeCommand_TCL_DECLARED #define Tcl_ExposeCommand_TCL_DECLARED /* 134 */ -EXTERN int Tcl_ExposeCommand(Tcl_Interp *interp, - CONST char *hiddenCmdToken, - CONST char *cmdName); +EXTERN int Tcl_ExposeCommand (Tcl_Interp * interp, + CONST char * hiddenCmdToken, + CONST char * cmdName); #endif #ifndef Tcl_ExprBoolean_TCL_DECLARED #define Tcl_ExprBoolean_TCL_DECLARED /* 135 */ -EXTERN int Tcl_ExprBoolean(Tcl_Interp *interp, CONST char *expr, - int *ptr); +EXTERN int Tcl_ExprBoolean (Tcl_Interp * interp, + CONST char * expr, int * ptr); #endif #ifndef Tcl_ExprBooleanObj_TCL_DECLARED #define Tcl_ExprBooleanObj_TCL_DECLARED /* 136 */ -EXTERN int Tcl_ExprBooleanObj(Tcl_Interp *interp, - Tcl_Obj *objPtr, int *ptr); +EXTERN int Tcl_ExprBooleanObj (Tcl_Interp * interp, + Tcl_Obj * objPtr, int * ptr); #endif #ifndef Tcl_ExprDouble_TCL_DECLARED #define Tcl_ExprDouble_TCL_DECLARED /* 137 */ -EXTERN int Tcl_ExprDouble(Tcl_Interp *interp, CONST char *expr, - double *ptr); +EXTERN int Tcl_ExprDouble (Tcl_Interp * interp, + CONST char * expr, double * ptr); #endif #ifndef Tcl_ExprDoubleObj_TCL_DECLARED #define Tcl_ExprDoubleObj_TCL_DECLARED /* 138 */ -EXTERN int Tcl_ExprDoubleObj(Tcl_Interp *interp, - Tcl_Obj *objPtr, double *ptr); +EXTERN int Tcl_ExprDoubleObj (Tcl_Interp * interp, + Tcl_Obj * objPtr, double * ptr); #endif #ifndef Tcl_ExprLong_TCL_DECLARED #define Tcl_ExprLong_TCL_DECLARED /* 139 */ -EXTERN int Tcl_ExprLong(Tcl_Interp *interp, CONST char *expr, - long *ptr); +EXTERN int Tcl_ExprLong (Tcl_Interp * interp, CONST char * expr, + long * ptr); #endif #ifndef Tcl_ExprLongObj_TCL_DECLARED #define Tcl_ExprLongObj_TCL_DECLARED /* 140 */ -EXTERN int Tcl_ExprLongObj(Tcl_Interp *interp, Tcl_Obj *objPtr, - long *ptr); +EXTERN int Tcl_ExprLongObj (Tcl_Interp * interp, + Tcl_Obj * objPtr, long * ptr); #endif #ifndef Tcl_ExprObj_TCL_DECLARED #define Tcl_ExprObj_TCL_DECLARED /* 141 */ -EXTERN int Tcl_ExprObj(Tcl_Interp *interp, Tcl_Obj *objPtr, - Tcl_Obj **resultPtrPtr); +EXTERN int Tcl_ExprObj (Tcl_Interp * interp, Tcl_Obj * objPtr, + Tcl_Obj ** resultPtrPtr); #endif #ifndef Tcl_ExprString_TCL_DECLARED #define Tcl_ExprString_TCL_DECLARED /* 142 */ -EXTERN int Tcl_ExprString(Tcl_Interp *interp, CONST char *expr); +EXTERN int Tcl_ExprString (Tcl_Interp * interp, + CONST char * expr); #endif #ifndef Tcl_Finalize_TCL_DECLARED #define Tcl_Finalize_TCL_DECLARED /* 143 */ -EXTERN void Tcl_Finalize(void); +EXTERN void Tcl_Finalize (void); #endif #ifndef Tcl_FindExecutable_TCL_DECLARED #define Tcl_FindExecutable_TCL_DECLARED /* 144 */ -EXTERN void Tcl_FindExecutable(CONST char *argv0); +EXTERN void Tcl_FindExecutable (CONST char * argv0); #endif #ifndef Tcl_FirstHashEntry_TCL_DECLARED #define Tcl_FirstHashEntry_TCL_DECLARED /* 145 */ -EXTERN Tcl_HashEntry * Tcl_FirstHashEntry(Tcl_HashTable *tablePtr, - Tcl_HashSearch *searchPtr); +EXTERN Tcl_HashEntry * Tcl_FirstHashEntry (Tcl_HashTable * tablePtr, + Tcl_HashSearch * searchPtr); #endif #ifndef Tcl_Flush_TCL_DECLARED #define Tcl_Flush_TCL_DECLARED /* 146 */ -EXTERN int Tcl_Flush(Tcl_Channel chan); +EXTERN int Tcl_Flush (Tcl_Channel chan); #endif #ifndef Tcl_FreeResult_TCL_DECLARED #define Tcl_FreeResult_TCL_DECLARED /* 147 */ -EXTERN void Tcl_FreeResult(Tcl_Interp *interp); +EXTERN void Tcl_FreeResult (Tcl_Interp * interp); #endif #ifndef Tcl_GetAlias_TCL_DECLARED #define Tcl_GetAlias_TCL_DECLARED /* 148 */ -EXTERN int Tcl_GetAlias(Tcl_Interp *interp, - CONST char *slaveCmd, - Tcl_Interp **targetInterpPtr, - CONST84 char **targetCmdPtr, int *argcPtr, - CONST84 char ***argvPtr); +EXTERN int Tcl_GetAlias (Tcl_Interp * interp, + CONST char * slaveCmd, + Tcl_Interp ** targetInterpPtr, + CONST84 char ** targetCmdPtr, int * argcPtr, + CONST84 char *** argvPtr); #endif #ifndef Tcl_GetAliasObj_TCL_DECLARED #define Tcl_GetAliasObj_TCL_DECLARED /* 149 */ -EXTERN int Tcl_GetAliasObj(Tcl_Interp *interp, - CONST char *slaveCmd, - Tcl_Interp **targetInterpPtr, - CONST84 char **targetCmdPtr, int *objcPtr, - Tcl_Obj ***objv); +EXTERN int Tcl_GetAliasObj (Tcl_Interp * interp, + CONST char * slaveCmd, + Tcl_Interp ** targetInterpPtr, + CONST84 char ** targetCmdPtr, int * objcPtr, + Tcl_Obj *** objv); #endif #ifndef Tcl_GetAssocData_TCL_DECLARED #define Tcl_GetAssocData_TCL_DECLARED /* 150 */ -EXTERN ClientData Tcl_GetAssocData(Tcl_Interp *interp, - CONST char *name, - Tcl_InterpDeleteProc **procPtr); +EXTERN ClientData Tcl_GetAssocData (Tcl_Interp * interp, + CONST char * name, + Tcl_InterpDeleteProc ** procPtr); #endif #ifndef Tcl_GetChannel_TCL_DECLARED #define Tcl_GetChannel_TCL_DECLARED /* 151 */ -EXTERN Tcl_Channel Tcl_GetChannel(Tcl_Interp *interp, - CONST char *chanName, int *modePtr); +EXTERN Tcl_Channel Tcl_GetChannel (Tcl_Interp * interp, + CONST char * chanName, int * modePtr); #endif #ifndef Tcl_GetChannelBufferSize_TCL_DECLARED #define Tcl_GetChannelBufferSize_TCL_DECLARED /* 152 */ -EXTERN int Tcl_GetChannelBufferSize(Tcl_Channel chan); +EXTERN int Tcl_GetChannelBufferSize (Tcl_Channel chan); #endif #ifndef Tcl_GetChannelHandle_TCL_DECLARED #define Tcl_GetChannelHandle_TCL_DECLARED /* 153 */ -EXTERN int Tcl_GetChannelHandle(Tcl_Channel chan, int direction, - ClientData *handlePtr); +EXTERN int Tcl_GetChannelHandle (Tcl_Channel chan, + int direction, ClientData * handlePtr); #endif #ifndef Tcl_GetChannelInstanceData_TCL_DECLARED #define Tcl_GetChannelInstanceData_TCL_DECLARED /* 154 */ -EXTERN ClientData Tcl_GetChannelInstanceData(Tcl_Channel chan); +EXTERN ClientData Tcl_GetChannelInstanceData (Tcl_Channel chan); #endif #ifndef Tcl_GetChannelMode_TCL_DECLARED #define Tcl_GetChannelMode_TCL_DECLARED /* 155 */ -EXTERN int Tcl_GetChannelMode(Tcl_Channel chan); +EXTERN int Tcl_GetChannelMode (Tcl_Channel chan); #endif #ifndef Tcl_GetChannelName_TCL_DECLARED #define Tcl_GetChannelName_TCL_DECLARED /* 156 */ -EXTERN CONST84_RETURN char * Tcl_GetChannelName(Tcl_Channel chan); +EXTERN CONST84_RETURN char * Tcl_GetChannelName (Tcl_Channel chan); #endif #ifndef Tcl_GetChannelOption_TCL_DECLARED #define Tcl_GetChannelOption_TCL_DECLARED /* 157 */ -EXTERN int Tcl_GetChannelOption(Tcl_Interp *interp, - Tcl_Channel chan, CONST char *optionName, - Tcl_DString *dsPtr); +EXTERN int Tcl_GetChannelOption (Tcl_Interp * interp, + Tcl_Channel chan, CONST char * optionName, + Tcl_DString * dsPtr); #endif #ifndef Tcl_GetChannelType_TCL_DECLARED #define Tcl_GetChannelType_TCL_DECLARED /* 158 */ -EXTERN Tcl_ChannelType * Tcl_GetChannelType(Tcl_Channel chan); +EXTERN Tcl_ChannelType * Tcl_GetChannelType (Tcl_Channel chan); #endif #ifndef Tcl_GetCommandInfo_TCL_DECLARED #define Tcl_GetCommandInfo_TCL_DECLARED /* 159 */ -EXTERN int Tcl_GetCommandInfo(Tcl_Interp *interp, - CONST char *cmdName, Tcl_CmdInfo *infoPtr); +EXTERN int Tcl_GetCommandInfo (Tcl_Interp * interp, + CONST char * cmdName, Tcl_CmdInfo * infoPtr); #endif #ifndef Tcl_GetCommandName_TCL_DECLARED #define Tcl_GetCommandName_TCL_DECLARED /* 160 */ -EXTERN CONST84_RETURN char * Tcl_GetCommandName(Tcl_Interp *interp, +EXTERN CONST84_RETURN char * Tcl_GetCommandName (Tcl_Interp * interp, Tcl_Command command); #endif #ifndef Tcl_GetErrno_TCL_DECLARED #define Tcl_GetErrno_TCL_DECLARED /* 161 */ -EXTERN int Tcl_GetErrno(void); +EXTERN int Tcl_GetErrno (void); #endif #ifndef Tcl_GetHostName_TCL_DECLARED #define Tcl_GetHostName_TCL_DECLARED /* 162 */ -EXTERN CONST84_RETURN char * Tcl_GetHostName(void); +EXTERN CONST84_RETURN char * Tcl_GetHostName (void); #endif #ifndef Tcl_GetInterpPath_TCL_DECLARED #define Tcl_GetInterpPath_TCL_DECLARED /* 163 */ -EXTERN int Tcl_GetInterpPath(Tcl_Interp *askInterp, - Tcl_Interp *slaveInterp); +EXTERN int Tcl_GetInterpPath (Tcl_Interp * askInterp, + Tcl_Interp * slaveInterp); #endif #ifndef Tcl_GetMaster_TCL_DECLARED #define Tcl_GetMaster_TCL_DECLARED /* 164 */ -EXTERN Tcl_Interp * Tcl_GetMaster(Tcl_Interp *interp); +EXTERN Tcl_Interp * Tcl_GetMaster (Tcl_Interp * interp); #endif #ifndef Tcl_GetNameOfExecutable_TCL_DECLARED #define Tcl_GetNameOfExecutable_TCL_DECLARED /* 165 */ -EXTERN CONST char * Tcl_GetNameOfExecutable(void); +EXTERN CONST char * Tcl_GetNameOfExecutable (void); #endif #ifndef Tcl_GetObjResult_TCL_DECLARED #define Tcl_GetObjResult_TCL_DECLARED /* 166 */ -EXTERN Tcl_Obj * Tcl_GetObjResult(Tcl_Interp *interp); +EXTERN Tcl_Obj * Tcl_GetObjResult (Tcl_Interp * interp); #endif #if !defined(__WIN32__) && !defined(MAC_OSX_TCL) /* UNIX */ #ifndef Tcl_GetOpenFile_TCL_DECLARED #define Tcl_GetOpenFile_TCL_DECLARED /* 167 */ -EXTERN int Tcl_GetOpenFile(Tcl_Interp *interp, - CONST char *chanID, int forWriting, - int checkUsage, ClientData *filePtr); +EXTERN int Tcl_GetOpenFile (Tcl_Interp * interp, + CONST char * chanID, int forWriting, + int checkUsage, ClientData * filePtr); #endif #endif /* UNIX */ #ifdef MAC_OSX_TCL /* MACOSX */ #ifndef Tcl_GetOpenFile_TCL_DECLARED #define Tcl_GetOpenFile_TCL_DECLARED /* 167 */ -EXTERN int Tcl_GetOpenFile(Tcl_Interp *interp, - CONST char *chanID, int forWriting, - int checkUsage, ClientData *filePtr); +EXTERN int Tcl_GetOpenFile (Tcl_Interp * interp, + CONST char * chanID, int forWriting, + int checkUsage, ClientData * filePtr); #endif #endif /* MACOSX */ #ifndef Tcl_GetPathType_TCL_DECLARED #define Tcl_GetPathType_TCL_DECLARED /* 168 */ -EXTERN Tcl_PathType Tcl_GetPathType(CONST char *path); +EXTERN Tcl_PathType Tcl_GetPathType (CONST char * path); #endif #ifndef Tcl_Gets_TCL_DECLARED #define Tcl_Gets_TCL_DECLARED /* 169 */ -EXTERN int Tcl_Gets(Tcl_Channel chan, Tcl_DString *dsPtr); +EXTERN int Tcl_Gets (Tcl_Channel chan, Tcl_DString * dsPtr); #endif #ifndef Tcl_GetsObj_TCL_DECLARED #define Tcl_GetsObj_TCL_DECLARED /* 170 */ -EXTERN int Tcl_GetsObj(Tcl_Channel chan, Tcl_Obj *objPtr); +EXTERN int Tcl_GetsObj (Tcl_Channel chan, Tcl_Obj * objPtr); #endif #ifndef Tcl_GetServiceMode_TCL_DECLARED #define Tcl_GetServiceMode_TCL_DECLARED /* 171 */ -EXTERN int Tcl_GetServiceMode(void); +EXTERN int Tcl_GetServiceMode (void); #endif #ifndef Tcl_GetSlave_TCL_DECLARED #define Tcl_GetSlave_TCL_DECLARED /* 172 */ -EXTERN Tcl_Interp * Tcl_GetSlave(Tcl_Interp *interp, - CONST char *slaveName); +EXTERN Tcl_Interp * Tcl_GetSlave (Tcl_Interp * interp, + CONST char * slaveName); #endif #ifndef Tcl_GetStdChannel_TCL_DECLARED #define Tcl_GetStdChannel_TCL_DECLARED /* 173 */ -EXTERN Tcl_Channel Tcl_GetStdChannel(int type); +EXTERN Tcl_Channel Tcl_GetStdChannel (int type); #endif #ifndef Tcl_GetStringResult_TCL_DECLARED #define Tcl_GetStringResult_TCL_DECLARED /* 174 */ -EXTERN CONST84_RETURN char * Tcl_GetStringResult(Tcl_Interp *interp); +EXTERN CONST84_RETURN char * Tcl_GetStringResult (Tcl_Interp * interp); #endif #ifndef Tcl_GetVar_TCL_DECLARED #define Tcl_GetVar_TCL_DECLARED /* 175 */ -EXTERN CONST84_RETURN char * Tcl_GetVar(Tcl_Interp *interp, - CONST char *varName, int flags); +EXTERN CONST84_RETURN char * Tcl_GetVar (Tcl_Interp * interp, + CONST char * varName, int flags); #endif #ifndef Tcl_GetVar2_TCL_DECLARED #define Tcl_GetVar2_TCL_DECLARED /* 176 */ -EXTERN CONST84_RETURN char * Tcl_GetVar2(Tcl_Interp *interp, - CONST char *part1, CONST char *part2, +EXTERN CONST84_RETURN char * Tcl_GetVar2 (Tcl_Interp * interp, + CONST char * part1, CONST char * part2, int flags); #endif #ifndef Tcl_GlobalEval_TCL_DECLARED #define Tcl_GlobalEval_TCL_DECLARED /* 177 */ -EXTERN int Tcl_GlobalEval(Tcl_Interp *interp, - CONST char *command); +EXTERN int Tcl_GlobalEval (Tcl_Interp * interp, + CONST char * command); #endif #ifndef Tcl_GlobalEvalObj_TCL_DECLARED #define Tcl_GlobalEvalObj_TCL_DECLARED /* 178 */ -EXTERN int Tcl_GlobalEvalObj(Tcl_Interp *interp, - Tcl_Obj *objPtr); +EXTERN int Tcl_GlobalEvalObj (Tcl_Interp * interp, + Tcl_Obj * objPtr); #endif #ifndef Tcl_HideCommand_TCL_DECLARED #define Tcl_HideCommand_TCL_DECLARED /* 179 */ -EXTERN int Tcl_HideCommand(Tcl_Interp *interp, - CONST char *cmdName, - CONST char *hiddenCmdToken); +EXTERN int Tcl_HideCommand (Tcl_Interp * interp, + CONST char * cmdName, + CONST char * hiddenCmdToken); #endif #ifndef Tcl_Init_TCL_DECLARED #define Tcl_Init_TCL_DECLARED /* 180 */ -EXTERN int Tcl_Init(Tcl_Interp *interp); +EXTERN int Tcl_Init (Tcl_Interp * interp); #endif #ifndef Tcl_InitHashTable_TCL_DECLARED #define Tcl_InitHashTable_TCL_DECLARED /* 181 */ -EXTERN void Tcl_InitHashTable(Tcl_HashTable *tablePtr, +EXTERN void Tcl_InitHashTable (Tcl_HashTable * tablePtr, int keyType); #endif #ifndef Tcl_InputBlocked_TCL_DECLARED #define Tcl_InputBlocked_TCL_DECLARED /* 182 */ -EXTERN int Tcl_InputBlocked(Tcl_Channel chan); +EXTERN int Tcl_InputBlocked (Tcl_Channel chan); #endif #ifndef Tcl_InputBuffered_TCL_DECLARED #define Tcl_InputBuffered_TCL_DECLARED /* 183 */ -EXTERN int Tcl_InputBuffered(Tcl_Channel chan); +EXTERN int Tcl_InputBuffered (Tcl_Channel chan); #endif #ifndef Tcl_InterpDeleted_TCL_DECLARED #define Tcl_InterpDeleted_TCL_DECLARED /* 184 */ -EXTERN int Tcl_InterpDeleted(Tcl_Interp *interp); +EXTERN int Tcl_InterpDeleted (Tcl_Interp * interp); #endif #ifndef Tcl_IsSafe_TCL_DECLARED #define Tcl_IsSafe_TCL_DECLARED /* 185 */ -EXTERN int Tcl_IsSafe(Tcl_Interp *interp); +EXTERN int Tcl_IsSafe (Tcl_Interp * interp); #endif #ifndef Tcl_JoinPath_TCL_DECLARED #define Tcl_JoinPath_TCL_DECLARED /* 186 */ -EXTERN char * Tcl_JoinPath(int argc, CONST84 char *CONST *argv, - Tcl_DString *resultPtr); +EXTERN char * Tcl_JoinPath (int argc, CONST84 char * CONST * argv, + Tcl_DString * resultPtr); #endif #ifndef Tcl_LinkVar_TCL_DECLARED #define Tcl_LinkVar_TCL_DECLARED /* 187 */ -EXTERN int Tcl_LinkVar(Tcl_Interp *interp, CONST char *varName, - char *addr, int type); +EXTERN int Tcl_LinkVar (Tcl_Interp * interp, + CONST char * varName, char * addr, int type); #endif /* Slot 188 is reserved */ #ifndef Tcl_MakeFileChannel_TCL_DECLARED #define Tcl_MakeFileChannel_TCL_DECLARED /* 189 */ -EXTERN Tcl_Channel Tcl_MakeFileChannel(ClientData handle, int mode); +EXTERN Tcl_Channel Tcl_MakeFileChannel (ClientData handle, int mode); #endif #ifndef Tcl_MakeSafe_TCL_DECLARED #define Tcl_MakeSafe_TCL_DECLARED /* 190 */ -EXTERN int Tcl_MakeSafe(Tcl_Interp *interp); +EXTERN int Tcl_MakeSafe (Tcl_Interp * interp); #endif #ifndef Tcl_MakeTcpClientChannel_TCL_DECLARED #define Tcl_MakeTcpClientChannel_TCL_DECLARED /* 191 */ -EXTERN Tcl_Channel Tcl_MakeTcpClientChannel(ClientData tcpSocket); +EXTERN Tcl_Channel Tcl_MakeTcpClientChannel (ClientData tcpSocket); #endif #ifndef Tcl_Merge_TCL_DECLARED #define Tcl_Merge_TCL_DECLARED /* 192 */ -EXTERN char * Tcl_Merge(int argc, CONST84 char *CONST *argv); +EXTERN char * Tcl_Merge (int argc, CONST84 char * CONST * argv); #endif #ifndef Tcl_NextHashEntry_TCL_DECLARED #define Tcl_NextHashEntry_TCL_DECLARED /* 193 */ -EXTERN Tcl_HashEntry * Tcl_NextHashEntry(Tcl_HashSearch *searchPtr); +EXTERN Tcl_HashEntry * Tcl_NextHashEntry (Tcl_HashSearch * searchPtr); #endif #ifndef Tcl_NotifyChannel_TCL_DECLARED #define Tcl_NotifyChannel_TCL_DECLARED /* 194 */ -EXTERN void Tcl_NotifyChannel(Tcl_Channel channel, int mask); +EXTERN void Tcl_NotifyChannel (Tcl_Channel channel, int mask); #endif #ifndef Tcl_ObjGetVar2_TCL_DECLARED #define Tcl_ObjGetVar2_TCL_DECLARED /* 195 */ -EXTERN Tcl_Obj * Tcl_ObjGetVar2(Tcl_Interp *interp, Tcl_Obj *part1Ptr, - Tcl_Obj *part2Ptr, int flags); +EXTERN Tcl_Obj * Tcl_ObjGetVar2 (Tcl_Interp * interp, + Tcl_Obj * part1Ptr, Tcl_Obj * part2Ptr, + int flags); #endif #ifndef Tcl_ObjSetVar2_TCL_DECLARED #define Tcl_ObjSetVar2_TCL_DECLARED /* 196 */ -EXTERN Tcl_Obj * Tcl_ObjSetVar2(Tcl_Interp *interp, Tcl_Obj *part1Ptr, - Tcl_Obj *part2Ptr, Tcl_Obj *newValuePtr, - int flags); +EXTERN Tcl_Obj * Tcl_ObjSetVar2 (Tcl_Interp * interp, + Tcl_Obj * part1Ptr, Tcl_Obj * part2Ptr, + Tcl_Obj * newValuePtr, int flags); #endif +#if !defined(__WIN32__) && !defined(MAC_OSX_TCL) /* UNIX */ +#ifndef Tcl_OpenCommandChannel_TCL_DECLARED +#define Tcl_OpenCommandChannel_TCL_DECLARED +/* 197 */ +EXTERN Tcl_Channel Tcl_OpenCommandChannel (Tcl_Interp * interp, + int argc, CONST84 char ** argv, int flags); +#endif +#endif /* UNIX */ +#ifdef __WIN32__ /* WIN */ #ifndef Tcl_OpenCommandChannel_TCL_DECLARED #define Tcl_OpenCommandChannel_TCL_DECLARED /* 197 */ -EXTERN Tcl_Channel Tcl_OpenCommandChannel(Tcl_Interp *interp, int argc, - CONST84 char **argv, int flags); +EXTERN Tcl_Channel Tcl_OpenCommandChannel (Tcl_Interp * interp, + int argc, CONST84 char ** argv, int flags); #endif +#endif /* WIN */ +#ifdef MAC_OSX_TCL /* MACOSX */ +#ifndef Tcl_OpenCommandChannel_TCL_DECLARED +#define Tcl_OpenCommandChannel_TCL_DECLARED +/* 197 */ +EXTERN Tcl_Channel Tcl_OpenCommandChannel (Tcl_Interp * interp, + int argc, CONST84 char ** argv, int flags); +#endif +#endif /* MACOSX */ #ifndef Tcl_OpenFileChannel_TCL_DECLARED #define Tcl_OpenFileChannel_TCL_DECLARED /* 198 */ -EXTERN Tcl_Channel Tcl_OpenFileChannel(Tcl_Interp *interp, - CONST char *fileName, CONST char *modeString, - int permissions); +EXTERN Tcl_Channel Tcl_OpenFileChannel (Tcl_Interp * interp, + CONST char * fileName, + CONST char * modeString, int permissions); #endif #ifndef Tcl_OpenTcpClient_TCL_DECLARED #define Tcl_OpenTcpClient_TCL_DECLARED /* 199 */ -EXTERN Tcl_Channel Tcl_OpenTcpClient(Tcl_Interp *interp, int port, - CONST char *address, CONST char *myaddr, +EXTERN Tcl_Channel Tcl_OpenTcpClient (Tcl_Interp * interp, int port, + CONST char * address, CONST char * myaddr, int myport, int async); #endif #ifndef Tcl_OpenTcpServer_TCL_DECLARED #define Tcl_OpenTcpServer_TCL_DECLARED /* 200 */ -EXTERN Tcl_Channel Tcl_OpenTcpServer(Tcl_Interp *interp, int port, - CONST char *host, - Tcl_TcpAcceptProc *acceptProc, +EXTERN Tcl_Channel Tcl_OpenTcpServer (Tcl_Interp * interp, int port, + CONST char * host, + Tcl_TcpAcceptProc * acceptProc, ClientData callbackData); #endif #ifndef Tcl_Preserve_TCL_DECLARED #define Tcl_Preserve_TCL_DECLARED /* 201 */ -EXTERN void Tcl_Preserve(ClientData data); +EXTERN void Tcl_Preserve (ClientData data); #endif #ifndef Tcl_PrintDouble_TCL_DECLARED #define Tcl_PrintDouble_TCL_DECLARED /* 202 */ -EXTERN void Tcl_PrintDouble(Tcl_Interp *interp, double value, - char *dst); +EXTERN void Tcl_PrintDouble (Tcl_Interp * interp, double value, + char * dst); #endif #ifndef Tcl_PutEnv_TCL_DECLARED #define Tcl_PutEnv_TCL_DECLARED /* 203 */ -EXTERN int Tcl_PutEnv(CONST char *assignment); +EXTERN int Tcl_PutEnv (CONST char * assignment); #endif #ifndef Tcl_PosixError_TCL_DECLARED #define Tcl_PosixError_TCL_DECLARED /* 204 */ -EXTERN CONST84_RETURN char * Tcl_PosixError(Tcl_Interp *interp); +EXTERN CONST84_RETURN char * Tcl_PosixError (Tcl_Interp * interp); #endif #ifndef Tcl_QueueEvent_TCL_DECLARED #define Tcl_QueueEvent_TCL_DECLARED /* 205 */ -EXTERN void Tcl_QueueEvent(Tcl_Event *evPtr, +EXTERN void Tcl_QueueEvent (Tcl_Event * evPtr, Tcl_QueuePosition position); #endif #ifndef Tcl_Read_TCL_DECLARED #define Tcl_Read_TCL_DECLARED /* 206 */ -EXTERN int Tcl_Read(Tcl_Channel chan, char *bufPtr, int toRead); +EXTERN int Tcl_Read (Tcl_Channel chan, char * bufPtr, + int toRead); +#endif +#if !defined(__WIN32__) && !defined(MAC_OSX_TCL) /* UNIX */ +#ifndef Tcl_ReapDetachedProcs_TCL_DECLARED +#define Tcl_ReapDetachedProcs_TCL_DECLARED +/* 207 */ +EXTERN void Tcl_ReapDetachedProcs (void); #endif +#endif /* UNIX */ +#ifdef __WIN32__ /* WIN */ #ifndef Tcl_ReapDetachedProcs_TCL_DECLARED #define Tcl_ReapDetachedProcs_TCL_DECLARED /* 207 */ -EXTERN void Tcl_ReapDetachedProcs(void); +EXTERN void Tcl_ReapDetachedProcs (void); #endif +#endif /* WIN */ +#ifdef MAC_OSX_TCL /* MACOSX */ +#ifndef Tcl_ReapDetachedProcs_TCL_DECLARED +#define Tcl_ReapDetachedProcs_TCL_DECLARED +/* 207 */ +EXTERN void Tcl_ReapDetachedProcs (void); +#endif +#endif /* MACOSX */ #ifndef Tcl_RecordAndEval_TCL_DECLARED #define Tcl_RecordAndEval_TCL_DECLARED /* 208 */ -EXTERN int Tcl_RecordAndEval(Tcl_Interp *interp, - CONST char *cmd, int flags); +EXTERN int Tcl_RecordAndEval (Tcl_Interp * interp, + CONST char * cmd, int flags); #endif #ifndef Tcl_RecordAndEvalObj_TCL_DECLARED #define Tcl_RecordAndEvalObj_TCL_DECLARED /* 209 */ -EXTERN int Tcl_RecordAndEvalObj(Tcl_Interp *interp, - Tcl_Obj *cmdPtr, int flags); +EXTERN int Tcl_RecordAndEvalObj (Tcl_Interp * interp, + Tcl_Obj * cmdPtr, int flags); #endif #ifndef Tcl_RegisterChannel_TCL_DECLARED #define Tcl_RegisterChannel_TCL_DECLARED /* 210 */ -EXTERN void Tcl_RegisterChannel(Tcl_Interp *interp, +EXTERN void Tcl_RegisterChannel (Tcl_Interp * interp, Tcl_Channel chan); #endif #ifndef Tcl_RegisterObjType_TCL_DECLARED #define Tcl_RegisterObjType_TCL_DECLARED /* 211 */ -EXTERN void Tcl_RegisterObjType(Tcl_ObjType *typePtr); +EXTERN void Tcl_RegisterObjType (Tcl_ObjType * typePtr); #endif #ifndef Tcl_RegExpCompile_TCL_DECLARED #define Tcl_RegExpCompile_TCL_DECLARED /* 212 */ -EXTERN Tcl_RegExp Tcl_RegExpCompile(Tcl_Interp *interp, - CONST char *pattern); +EXTERN Tcl_RegExp Tcl_RegExpCompile (Tcl_Interp * interp, + CONST char * pattern); #endif #ifndef Tcl_RegExpExec_TCL_DECLARED #define Tcl_RegExpExec_TCL_DECLARED /* 213 */ -EXTERN int Tcl_RegExpExec(Tcl_Interp *interp, Tcl_RegExp regexp, - CONST char *text, CONST char *start); +EXTERN int Tcl_RegExpExec (Tcl_Interp * interp, + Tcl_RegExp regexp, CONST char * text, + CONST char * start); #endif #ifndef Tcl_RegExpMatch_TCL_DECLARED #define Tcl_RegExpMatch_TCL_DECLARED /* 214 */ -EXTERN int Tcl_RegExpMatch(Tcl_Interp *interp, CONST char *text, - CONST char *pattern); +EXTERN int Tcl_RegExpMatch (Tcl_Interp * interp, + CONST char * text, CONST char * pattern); #endif #ifndef Tcl_RegExpRange_TCL_DECLARED #define Tcl_RegExpRange_TCL_DECLARED /* 215 */ -EXTERN void Tcl_RegExpRange(Tcl_RegExp regexp, int index, - CONST84 char **startPtr, - CONST84 char **endPtr); +EXTERN void Tcl_RegExpRange (Tcl_RegExp regexp, int index, + CONST84 char ** startPtr, + CONST84 char ** endPtr); #endif #ifndef Tcl_Release_TCL_DECLARED #define Tcl_Release_TCL_DECLARED /* 216 */ -EXTERN void Tcl_Release(ClientData clientData); +EXTERN void Tcl_Release (ClientData clientData); #endif #ifndef Tcl_ResetResult_TCL_DECLARED #define Tcl_ResetResult_TCL_DECLARED /* 217 */ -EXTERN void Tcl_ResetResult(Tcl_Interp *interp); +EXTERN void Tcl_ResetResult (Tcl_Interp * interp); #endif #ifndef Tcl_ScanElement_TCL_DECLARED #define Tcl_ScanElement_TCL_DECLARED /* 218 */ -EXTERN int Tcl_ScanElement(CONST char *str, int *flagPtr); +EXTERN int Tcl_ScanElement (CONST char * str, int * flagPtr); #endif #ifndef Tcl_ScanCountedElement_TCL_DECLARED #define Tcl_ScanCountedElement_TCL_DECLARED /* 219 */ -EXTERN int Tcl_ScanCountedElement(CONST char *str, int length, - int *flagPtr); +EXTERN int Tcl_ScanCountedElement (CONST char * str, int length, + int * flagPtr); #endif #ifndef Tcl_SeekOld_TCL_DECLARED #define Tcl_SeekOld_TCL_DECLARED /* 220 */ -EXTERN int Tcl_SeekOld(Tcl_Channel chan, int offset, int mode); +EXTERN int Tcl_SeekOld (Tcl_Channel chan, int offset, int mode); #endif #ifndef Tcl_ServiceAll_TCL_DECLARED #define Tcl_ServiceAll_TCL_DECLARED /* 221 */ -EXTERN int Tcl_ServiceAll(void); +EXTERN int Tcl_ServiceAll (void); #endif #ifndef Tcl_ServiceEvent_TCL_DECLARED #define Tcl_ServiceEvent_TCL_DECLARED /* 222 */ -EXTERN int Tcl_ServiceEvent(int flags); +EXTERN int Tcl_ServiceEvent (int flags); #endif #ifndef Tcl_SetAssocData_TCL_DECLARED #define Tcl_SetAssocData_TCL_DECLARED /* 223 */ -EXTERN void Tcl_SetAssocData(Tcl_Interp *interp, - CONST char *name, Tcl_InterpDeleteProc *proc, +EXTERN void Tcl_SetAssocData (Tcl_Interp * interp, + CONST char * name, + Tcl_InterpDeleteProc * proc, ClientData clientData); #endif #ifndef Tcl_SetChannelBufferSize_TCL_DECLARED #define Tcl_SetChannelBufferSize_TCL_DECLARED /* 224 */ -EXTERN void Tcl_SetChannelBufferSize(Tcl_Channel chan, int sz); +EXTERN void Tcl_SetChannelBufferSize (Tcl_Channel chan, int sz); #endif #ifndef Tcl_SetChannelOption_TCL_DECLARED #define Tcl_SetChannelOption_TCL_DECLARED /* 225 */ -EXTERN int Tcl_SetChannelOption(Tcl_Interp *interp, - Tcl_Channel chan, CONST char *optionName, - CONST char *newValue); +EXTERN int Tcl_SetChannelOption (Tcl_Interp * interp, + Tcl_Channel chan, CONST char * optionName, + CONST char * newValue); #endif #ifndef Tcl_SetCommandInfo_TCL_DECLARED #define Tcl_SetCommandInfo_TCL_DECLARED /* 226 */ -EXTERN int Tcl_SetCommandInfo(Tcl_Interp *interp, - CONST char *cmdName, - CONST Tcl_CmdInfo *infoPtr); +EXTERN int Tcl_SetCommandInfo (Tcl_Interp * interp, + CONST char * cmdName, + CONST Tcl_CmdInfo * infoPtr); #endif #ifndef Tcl_SetErrno_TCL_DECLARED #define Tcl_SetErrno_TCL_DECLARED /* 227 */ -EXTERN void Tcl_SetErrno(int err); +EXTERN void Tcl_SetErrno (int err); #endif #ifndef Tcl_SetErrorCode_TCL_DECLARED #define Tcl_SetErrorCode_TCL_DECLARED /* 228 */ -EXTERN void Tcl_SetErrorCode(Tcl_Interp *interp, ...); +EXTERN void Tcl_SetErrorCode (Tcl_Interp * interp, ...); #endif #ifndef Tcl_SetMaxBlockTime_TCL_DECLARED #define Tcl_SetMaxBlockTime_TCL_DECLARED /* 229 */ -EXTERN void Tcl_SetMaxBlockTime(Tcl_Time *timePtr); +EXTERN void Tcl_SetMaxBlockTime (Tcl_Time * timePtr); #endif #ifndef Tcl_SetPanicProc_TCL_DECLARED #define Tcl_SetPanicProc_TCL_DECLARED /* 230 */ -EXTERN void Tcl_SetPanicProc(Tcl_PanicProc *panicProc); +EXTERN void Tcl_SetPanicProc (Tcl_PanicProc * panicProc); #endif #ifndef Tcl_SetRecursionLimit_TCL_DECLARED #define Tcl_SetRecursionLimit_TCL_DECLARED /* 231 */ -EXTERN int Tcl_SetRecursionLimit(Tcl_Interp *interp, int depth); +EXTERN int Tcl_SetRecursionLimit (Tcl_Interp * interp, + int depth); #endif #ifndef Tcl_SetResult_TCL_DECLARED #define Tcl_SetResult_TCL_DECLARED /* 232 */ -EXTERN void Tcl_SetResult(Tcl_Interp *interp, char *result, - Tcl_FreeProc *freeProc); +EXTERN void Tcl_SetResult (Tcl_Interp * interp, char * result, + Tcl_FreeProc * freeProc); #endif #ifndef Tcl_SetServiceMode_TCL_DECLARED #define Tcl_SetServiceMode_TCL_DECLARED /* 233 */ -EXTERN int Tcl_SetServiceMode(int mode); +EXTERN int Tcl_SetServiceMode (int mode); #endif #ifndef Tcl_SetObjErrorCode_TCL_DECLARED #define Tcl_SetObjErrorCode_TCL_DECLARED /* 234 */ -EXTERN void Tcl_SetObjErrorCode(Tcl_Interp *interp, - Tcl_Obj *errorObjPtr); +EXTERN void Tcl_SetObjErrorCode (Tcl_Interp * interp, + Tcl_Obj * errorObjPtr); #endif #ifndef Tcl_SetObjResult_TCL_DECLARED #define Tcl_SetObjResult_TCL_DECLARED /* 235 */ -EXTERN void Tcl_SetObjResult(Tcl_Interp *interp, - Tcl_Obj *resultObjPtr); +EXTERN void Tcl_SetObjResult (Tcl_Interp * interp, + Tcl_Obj * resultObjPtr); #endif #ifndef Tcl_SetStdChannel_TCL_DECLARED #define Tcl_SetStdChannel_TCL_DECLARED /* 236 */ -EXTERN void Tcl_SetStdChannel(Tcl_Channel channel, int type); +EXTERN void Tcl_SetStdChannel (Tcl_Channel channel, int type); #endif #ifndef Tcl_SetVar_TCL_DECLARED #define Tcl_SetVar_TCL_DECLARED /* 237 */ -EXTERN CONST84_RETURN char * Tcl_SetVar(Tcl_Interp *interp, - CONST char *varName, CONST char *newValue, +EXTERN CONST84_RETURN char * Tcl_SetVar (Tcl_Interp * interp, + CONST char * varName, CONST char * newValue, int flags); #endif #ifndef Tcl_SetVar2_TCL_DECLARED #define Tcl_SetVar2_TCL_DECLARED /* 238 */ -EXTERN CONST84_RETURN char * Tcl_SetVar2(Tcl_Interp *interp, - CONST char *part1, CONST char *part2, - CONST char *newValue, int flags); +EXTERN CONST84_RETURN char * Tcl_SetVar2 (Tcl_Interp * interp, + CONST char * part1, CONST char * part2, + CONST char * newValue, int flags); #endif #ifndef Tcl_SignalId_TCL_DECLARED #define Tcl_SignalId_TCL_DECLARED /* 239 */ -EXTERN CONST84_RETURN char * Tcl_SignalId(int sig); +EXTERN CONST84_RETURN char * Tcl_SignalId (int sig); #endif #ifndef Tcl_SignalMsg_TCL_DECLARED #define Tcl_SignalMsg_TCL_DECLARED /* 240 */ -EXTERN CONST84_RETURN char * Tcl_SignalMsg(int sig); +EXTERN CONST84_RETURN char * Tcl_SignalMsg (int sig); #endif #ifndef Tcl_SourceRCFile_TCL_DECLARED #define Tcl_SourceRCFile_TCL_DECLARED /* 241 */ -EXTERN void Tcl_SourceRCFile(Tcl_Interp *interp); +EXTERN void Tcl_SourceRCFile (Tcl_Interp * interp); #endif #ifndef Tcl_SplitList_TCL_DECLARED #define Tcl_SplitList_TCL_DECLARED /* 242 */ -EXTERN int Tcl_SplitList(Tcl_Interp *interp, - CONST char *listStr, int *argcPtr, - CONST84 char ***argvPtr); +EXTERN int Tcl_SplitList (Tcl_Interp * interp, + CONST char * listStr, int * argcPtr, + CONST84 char *** argvPtr); #endif #ifndef Tcl_SplitPath_TCL_DECLARED #define Tcl_SplitPath_TCL_DECLARED /* 243 */ -EXTERN void Tcl_SplitPath(CONST char *path, int *argcPtr, - CONST84 char ***argvPtr); +EXTERN void Tcl_SplitPath (CONST char * path, int * argcPtr, + CONST84 char *** argvPtr); #endif #ifndef Tcl_StaticPackage_TCL_DECLARED #define Tcl_StaticPackage_TCL_DECLARED /* 244 */ -EXTERN void Tcl_StaticPackage(Tcl_Interp *interp, - CONST char *pkgName, - Tcl_PackageInitProc *initProc, - Tcl_PackageInitProc *safeInitProc); +EXTERN void Tcl_StaticPackage (Tcl_Interp * interp, + CONST char * pkgName, + Tcl_PackageInitProc * initProc, + Tcl_PackageInitProc * safeInitProc); #endif #ifndef Tcl_StringMatch_TCL_DECLARED #define Tcl_StringMatch_TCL_DECLARED /* 245 */ -EXTERN int Tcl_StringMatch(CONST char *str, CONST char *pattern); +EXTERN int Tcl_StringMatch (CONST char * str, + CONST char * pattern); #endif #ifndef Tcl_TellOld_TCL_DECLARED #define Tcl_TellOld_TCL_DECLARED /* 246 */ -EXTERN int Tcl_TellOld(Tcl_Channel chan); +EXTERN int Tcl_TellOld (Tcl_Channel chan); #endif #ifndef Tcl_TraceVar_TCL_DECLARED #define Tcl_TraceVar_TCL_DECLARED /* 247 */ -EXTERN int Tcl_TraceVar(Tcl_Interp *interp, CONST char *varName, - int flags, Tcl_VarTraceProc *proc, +EXTERN int Tcl_TraceVar (Tcl_Interp * interp, + CONST char * varName, int flags, + Tcl_VarTraceProc * proc, ClientData clientData); #endif #ifndef Tcl_TraceVar2_TCL_DECLARED #define Tcl_TraceVar2_TCL_DECLARED /* 248 */ -EXTERN int Tcl_TraceVar2(Tcl_Interp *interp, CONST char *part1, - CONST char *part2, int flags, - Tcl_VarTraceProc *proc, +EXTERN int Tcl_TraceVar2 (Tcl_Interp * interp, + CONST char * part1, CONST char * part2, + int flags, Tcl_VarTraceProc * proc, ClientData clientData); #endif #ifndef Tcl_TranslateFileName_TCL_DECLARED #define Tcl_TranslateFileName_TCL_DECLARED /* 249 */ -EXTERN char * Tcl_TranslateFileName(Tcl_Interp *interp, - CONST char *name, Tcl_DString *bufferPtr); +EXTERN char * Tcl_TranslateFileName (Tcl_Interp * interp, + CONST char * name, Tcl_DString * bufferPtr); #endif #ifndef Tcl_Ungets_TCL_DECLARED #define Tcl_Ungets_TCL_DECLARED /* 250 */ -EXTERN int Tcl_Ungets(Tcl_Channel chan, CONST char *str, +EXTERN int Tcl_Ungets (Tcl_Channel chan, CONST char * str, int len, int atHead); #endif #ifndef Tcl_UnlinkVar_TCL_DECLARED #define Tcl_UnlinkVar_TCL_DECLARED /* 251 */ -EXTERN void Tcl_UnlinkVar(Tcl_Interp *interp, - CONST char *varName); +EXTERN void Tcl_UnlinkVar (Tcl_Interp * interp, + CONST char * varName); #endif #ifndef Tcl_UnregisterChannel_TCL_DECLARED #define Tcl_UnregisterChannel_TCL_DECLARED /* 252 */ -EXTERN int Tcl_UnregisterChannel(Tcl_Interp *interp, +EXTERN int Tcl_UnregisterChannel (Tcl_Interp * interp, Tcl_Channel chan); #endif #ifndef Tcl_UnsetVar_TCL_DECLARED #define Tcl_UnsetVar_TCL_DECLARED /* 253 */ -EXTERN int Tcl_UnsetVar(Tcl_Interp *interp, CONST char *varName, - int flags); +EXTERN int Tcl_UnsetVar (Tcl_Interp * interp, + CONST char * varName, int flags); #endif #ifndef Tcl_UnsetVar2_TCL_DECLARED #define Tcl_UnsetVar2_TCL_DECLARED /* 254 */ -EXTERN int Tcl_UnsetVar2(Tcl_Interp *interp, CONST char *part1, - CONST char *part2, int flags); +EXTERN int Tcl_UnsetVar2 (Tcl_Interp * interp, + CONST char * part1, CONST char * part2, + int flags); #endif #ifndef Tcl_UntraceVar_TCL_DECLARED #define Tcl_UntraceVar_TCL_DECLARED /* 255 */ -EXTERN void Tcl_UntraceVar(Tcl_Interp *interp, - CONST char *varName, int flags, - Tcl_VarTraceProc *proc, +EXTERN void Tcl_UntraceVar (Tcl_Interp * interp, + CONST char * varName, int flags, + Tcl_VarTraceProc * proc, ClientData clientData); #endif #ifndef Tcl_UntraceVar2_TCL_DECLARED #define Tcl_UntraceVar2_TCL_DECLARED /* 256 */ -EXTERN void Tcl_UntraceVar2(Tcl_Interp *interp, - CONST char *part1, CONST char *part2, - int flags, Tcl_VarTraceProc *proc, +EXTERN void Tcl_UntraceVar2 (Tcl_Interp * interp, + CONST char * part1, CONST char * part2, + int flags, Tcl_VarTraceProc * proc, ClientData clientData); #endif #ifndef Tcl_UpdateLinkedVar_TCL_DECLARED #define Tcl_UpdateLinkedVar_TCL_DECLARED /* 257 */ -EXTERN void Tcl_UpdateLinkedVar(Tcl_Interp *interp, - CONST char *varName); +EXTERN void Tcl_UpdateLinkedVar (Tcl_Interp * interp, + CONST char * varName); #endif #ifndef Tcl_UpVar_TCL_DECLARED #define Tcl_UpVar_TCL_DECLARED /* 258 */ -EXTERN int Tcl_UpVar(Tcl_Interp *interp, CONST char *frameName, - CONST char *varName, CONST char *localName, - int flags); +EXTERN int Tcl_UpVar (Tcl_Interp * interp, + CONST char * frameName, CONST char * varName, + CONST char * localName, int flags); #endif #ifndef Tcl_UpVar2_TCL_DECLARED #define Tcl_UpVar2_TCL_DECLARED /* 259 */ -EXTERN int Tcl_UpVar2(Tcl_Interp *interp, CONST char *frameName, - CONST char *part1, CONST char *part2, - CONST char *localName, int flags); +EXTERN int Tcl_UpVar2 (Tcl_Interp * interp, + CONST char * frameName, CONST char * part1, + CONST char * part2, CONST char * localName, + int flags); #endif #ifndef Tcl_VarEval_TCL_DECLARED #define Tcl_VarEval_TCL_DECLARED /* 260 */ -EXTERN int Tcl_VarEval(Tcl_Interp *interp, ...); +EXTERN int Tcl_VarEval (Tcl_Interp * interp, ...); #endif #ifndef Tcl_VarTraceInfo_TCL_DECLARED #define Tcl_VarTraceInfo_TCL_DECLARED /* 261 */ -EXTERN ClientData Tcl_VarTraceInfo(Tcl_Interp *interp, - CONST char *varName, int flags, - Tcl_VarTraceProc *procPtr, +EXTERN ClientData Tcl_VarTraceInfo (Tcl_Interp * interp, + CONST char * varName, int flags, + Tcl_VarTraceProc * procPtr, ClientData prevClientData); #endif #ifndef Tcl_VarTraceInfo2_TCL_DECLARED #define Tcl_VarTraceInfo2_TCL_DECLARED /* 262 */ -EXTERN ClientData Tcl_VarTraceInfo2(Tcl_Interp *interp, - CONST char *part1, CONST char *part2, - int flags, Tcl_VarTraceProc *procPtr, +EXTERN ClientData Tcl_VarTraceInfo2 (Tcl_Interp * interp, + CONST char * part1, CONST char * part2, + int flags, Tcl_VarTraceProc * procPtr, ClientData prevClientData); #endif #ifndef Tcl_Write_TCL_DECLARED #define Tcl_Write_TCL_DECLARED /* 263 */ -EXTERN int Tcl_Write(Tcl_Channel chan, CONST char *s, int slen); +EXTERN int Tcl_Write (Tcl_Channel chan, CONST char * s, + int slen); #endif #ifndef Tcl_WrongNumArgs_TCL_DECLARED #define Tcl_WrongNumArgs_TCL_DECLARED /* 264 */ -EXTERN void Tcl_WrongNumArgs(Tcl_Interp *interp, int objc, - Tcl_Obj *CONST objv[], CONST char *message); +EXTERN void Tcl_WrongNumArgs (Tcl_Interp * interp, int objc, + Tcl_Obj *CONST objv[], CONST char * message); #endif #ifndef Tcl_DumpActiveMemory_TCL_DECLARED #define Tcl_DumpActiveMemory_TCL_DECLARED /* 265 */ -EXTERN int Tcl_DumpActiveMemory(CONST char *fileName); +EXTERN int Tcl_DumpActiveMemory (CONST char * fileName); #endif #ifndef Tcl_ValidateAllMemory_TCL_DECLARED #define Tcl_ValidateAllMemory_TCL_DECLARED /* 266 */ -EXTERN void Tcl_ValidateAllMemory(CONST char *file, int line); +EXTERN void Tcl_ValidateAllMemory (CONST char * file, int line); #endif #ifndef Tcl_AppendResultVA_TCL_DECLARED #define Tcl_AppendResultVA_TCL_DECLARED /* 267 */ -EXTERN void Tcl_AppendResultVA(Tcl_Interp *interp, +EXTERN void Tcl_AppendResultVA (Tcl_Interp * interp, va_list argList); #endif #ifndef Tcl_AppendStringsToObjVA_TCL_DECLARED #define Tcl_AppendStringsToObjVA_TCL_DECLARED /* 268 */ -EXTERN void Tcl_AppendStringsToObjVA(Tcl_Obj *objPtr, +EXTERN void Tcl_AppendStringsToObjVA (Tcl_Obj * objPtr, va_list argList); #endif #ifndef Tcl_HashStats_TCL_DECLARED #define Tcl_HashStats_TCL_DECLARED /* 269 */ -EXTERN char * Tcl_HashStats(Tcl_HashTable *tablePtr); +EXTERN CONST84_RETURN char * Tcl_HashStats (Tcl_HashTable * tablePtr); #endif #ifndef Tcl_ParseVar_TCL_DECLARED #define Tcl_ParseVar_TCL_DECLARED /* 270 */ -EXTERN CONST84_RETURN char * Tcl_ParseVar(Tcl_Interp *interp, - CONST char *start, CONST84 char **termPtr); +EXTERN CONST84_RETURN char * Tcl_ParseVar (Tcl_Interp * interp, + CONST char * start, CONST84 char ** termPtr); #endif #ifndef Tcl_PkgPresent_TCL_DECLARED #define Tcl_PkgPresent_TCL_DECLARED /* 271 */ -EXTERN CONST84_RETURN char * Tcl_PkgPresent(Tcl_Interp *interp, - CONST char *name, CONST char *version, +EXTERN CONST84_RETURN char * Tcl_PkgPresent (Tcl_Interp * interp, + CONST char * name, CONST char * version, int exact); #endif #ifndef Tcl_PkgPresentEx_TCL_DECLARED #define Tcl_PkgPresentEx_TCL_DECLARED /* 272 */ -EXTERN CONST84_RETURN char * Tcl_PkgPresentEx(Tcl_Interp *interp, - CONST char *name, CONST char *version, - int exact, ClientData *clientDataPtr); +EXTERN CONST84_RETURN char * Tcl_PkgPresentEx (Tcl_Interp * interp, + CONST char * name, CONST char * version, + int exact, ClientData * clientDataPtr); #endif #ifndef Tcl_PkgProvide_TCL_DECLARED #define Tcl_PkgProvide_TCL_DECLARED /* 273 */ -EXTERN int Tcl_PkgProvide(Tcl_Interp *interp, CONST char *name, - CONST char *version); +EXTERN int Tcl_PkgProvide (Tcl_Interp * interp, + CONST char * name, CONST char * version); #endif #ifndef Tcl_PkgRequire_TCL_DECLARED #define Tcl_PkgRequire_TCL_DECLARED /* 274 */ -EXTERN CONST84_RETURN char * Tcl_PkgRequire(Tcl_Interp *interp, - CONST char *name, CONST char *version, +EXTERN CONST84_RETURN char * Tcl_PkgRequire (Tcl_Interp * interp, + CONST char * name, CONST char * version, int exact); #endif #ifndef Tcl_SetErrorCodeVA_TCL_DECLARED #define Tcl_SetErrorCodeVA_TCL_DECLARED /* 275 */ -EXTERN void Tcl_SetErrorCodeVA(Tcl_Interp *interp, +EXTERN void Tcl_SetErrorCodeVA (Tcl_Interp * interp, va_list argList); #endif #ifndef Tcl_VarEvalVA_TCL_DECLARED #define Tcl_VarEvalVA_TCL_DECLARED /* 276 */ -EXTERN int Tcl_VarEvalVA(Tcl_Interp *interp, va_list argList); +EXTERN int Tcl_VarEvalVA (Tcl_Interp * interp, va_list argList); #endif #ifndef Tcl_WaitPid_TCL_DECLARED #define Tcl_WaitPid_TCL_DECLARED /* 277 */ -EXTERN Tcl_Pid Tcl_WaitPid(Tcl_Pid pid, int *statPtr, int options); +EXTERN Tcl_Pid Tcl_WaitPid (Tcl_Pid pid, int * statPtr, int options); #endif #ifndef Tcl_PanicVA_TCL_DECLARED #define Tcl_PanicVA_TCL_DECLARED /* 278 */ -EXTERN void Tcl_PanicVA(CONST char *format, va_list argList); +EXTERN void Tcl_PanicVA (CONST char * format, va_list argList); #endif #ifndef Tcl_GetVersion_TCL_DECLARED #define Tcl_GetVersion_TCL_DECLARED /* 279 */ -EXTERN void Tcl_GetVersion(int *major, int *minor, - int *patchLevel, int *type); +EXTERN void Tcl_GetVersion (int * major, int * minor, + int * patchLevel, int * type); #endif #ifndef Tcl_InitMemory_TCL_DECLARED #define Tcl_InitMemory_TCL_DECLARED /* 280 */ -EXTERN void Tcl_InitMemory(Tcl_Interp *interp); +EXTERN void Tcl_InitMemory (Tcl_Interp * interp); #endif #ifndef Tcl_StackChannel_TCL_DECLARED #define Tcl_StackChannel_TCL_DECLARED /* 281 */ -EXTERN Tcl_Channel Tcl_StackChannel(Tcl_Interp *interp, - Tcl_ChannelType *typePtr, - ClientData instanceData, int mask, +EXTERN Tcl_Channel Tcl_StackChannel (Tcl_Interp * interp, + Tcl_ChannelType * typePtr, + ClientData instanceData, int mask, Tcl_Channel prevChan); #endif #ifndef Tcl_UnstackChannel_TCL_DECLARED #define Tcl_UnstackChannel_TCL_DECLARED /* 282 */ -EXTERN int Tcl_UnstackChannel(Tcl_Interp *interp, +EXTERN int Tcl_UnstackChannel (Tcl_Interp * interp, Tcl_Channel chan); #endif #ifndef Tcl_GetStackedChannel_TCL_DECLARED #define Tcl_GetStackedChannel_TCL_DECLARED /* 283 */ -EXTERN Tcl_Channel Tcl_GetStackedChannel(Tcl_Channel chan); +EXTERN Tcl_Channel Tcl_GetStackedChannel (Tcl_Channel chan); #endif #ifndef Tcl_SetMainLoop_TCL_DECLARED #define Tcl_SetMainLoop_TCL_DECLARED /* 284 */ -EXTERN void Tcl_SetMainLoop(Tcl_MainLoopProc *proc); +EXTERN void Tcl_SetMainLoop (Tcl_MainLoopProc * proc); #endif /* Slot 285 is reserved */ #ifndef Tcl_AppendObjToObj_TCL_DECLARED #define Tcl_AppendObjToObj_TCL_DECLARED /* 286 */ -EXTERN void Tcl_AppendObjToObj(Tcl_Obj *objPtr, - Tcl_Obj *appendObjPtr); +EXTERN void Tcl_AppendObjToObj (Tcl_Obj * objPtr, + Tcl_Obj * appendObjPtr); #endif #ifndef Tcl_CreateEncoding_TCL_DECLARED #define Tcl_CreateEncoding_TCL_DECLARED /* 287 */ -EXTERN Tcl_Encoding Tcl_CreateEncoding(CONST Tcl_EncodingType *typePtr); +EXTERN Tcl_Encoding Tcl_CreateEncoding (const Tcl_EncodingType * typePtr); #endif #ifndef Tcl_CreateThreadExitHandler_TCL_DECLARED #define Tcl_CreateThreadExitHandler_TCL_DECLARED /* 288 */ -EXTERN void Tcl_CreateThreadExitHandler(Tcl_ExitProc *proc, +EXTERN void Tcl_CreateThreadExitHandler (Tcl_ExitProc * proc, ClientData clientData); #endif #ifndef Tcl_DeleteThreadExitHandler_TCL_DECLARED #define Tcl_DeleteThreadExitHandler_TCL_DECLARED /* 289 */ -EXTERN void Tcl_DeleteThreadExitHandler(Tcl_ExitProc *proc, +EXTERN void Tcl_DeleteThreadExitHandler (Tcl_ExitProc * proc, ClientData clientData); #endif #ifndef Tcl_DiscardResult_TCL_DECLARED #define Tcl_DiscardResult_TCL_DECLARED /* 290 */ -EXTERN void Tcl_DiscardResult(Tcl_SavedResult *statePtr); +EXTERN void Tcl_DiscardResult (Tcl_SavedResult * statePtr); #endif #ifndef Tcl_EvalEx_TCL_DECLARED #define Tcl_EvalEx_TCL_DECLARED /* 291 */ -EXTERN int Tcl_EvalEx(Tcl_Interp *interp, CONST char *script, +EXTERN int Tcl_EvalEx (Tcl_Interp * interp, CONST char * script, int numBytes, int flags); #endif #ifndef Tcl_EvalObjv_TCL_DECLARED #define Tcl_EvalObjv_TCL_DECLARED /* 292 */ -EXTERN int Tcl_EvalObjv(Tcl_Interp *interp, int objc, +EXTERN int Tcl_EvalObjv (Tcl_Interp * interp, int objc, Tcl_Obj *CONST objv[], int flags); #endif #ifndef Tcl_EvalObjEx_TCL_DECLARED #define Tcl_EvalObjEx_TCL_DECLARED /* 293 */ -EXTERN int Tcl_EvalObjEx(Tcl_Interp *interp, Tcl_Obj *objPtr, +EXTERN int Tcl_EvalObjEx (Tcl_Interp * interp, Tcl_Obj * objPtr, int flags); #endif #ifndef Tcl_ExitThread_TCL_DECLARED #define Tcl_ExitThread_TCL_DECLARED /* 294 */ -EXTERN void Tcl_ExitThread(int status); +EXTERN void Tcl_ExitThread (int status); #endif #ifndef Tcl_ExternalToUtf_TCL_DECLARED #define Tcl_ExternalToUtf_TCL_DECLARED /* 295 */ -EXTERN int Tcl_ExternalToUtf(Tcl_Interp *interp, - Tcl_Encoding encoding, CONST char *src, - int srcLen, int flags, - Tcl_EncodingState *statePtr, char *dst, - int dstLen, int *srcReadPtr, - int *dstWrotePtr, int *dstCharsPtr); +EXTERN int Tcl_ExternalToUtf (Tcl_Interp * interp, + Tcl_Encoding encoding, CONST char * src, + int srcLen, int flags, + Tcl_EncodingState * statePtr, char * dst, + int dstLen, int * srcReadPtr, + int * dstWrotePtr, int * dstCharsPtr); #endif #ifndef Tcl_ExternalToUtfDString_TCL_DECLARED #define Tcl_ExternalToUtfDString_TCL_DECLARED /* 296 */ -EXTERN char * Tcl_ExternalToUtfDString(Tcl_Encoding encoding, - CONST char *src, int srcLen, - Tcl_DString *dsPtr); +EXTERN char * Tcl_ExternalToUtfDString (Tcl_Encoding encoding, + CONST char * src, int srcLen, + Tcl_DString * dsPtr); #endif #ifndef Tcl_FinalizeThread_TCL_DECLARED #define Tcl_FinalizeThread_TCL_DECLARED /* 297 */ -EXTERN void Tcl_FinalizeThread(void); +EXTERN void Tcl_FinalizeThread (void); #endif #ifndef Tcl_FinalizeNotifier_TCL_DECLARED #define Tcl_FinalizeNotifier_TCL_DECLARED /* 298 */ -EXTERN void Tcl_FinalizeNotifier(ClientData clientData); +EXTERN void Tcl_FinalizeNotifier (ClientData clientData); #endif #ifndef Tcl_FreeEncoding_TCL_DECLARED #define Tcl_FreeEncoding_TCL_DECLARED /* 299 */ -EXTERN void Tcl_FreeEncoding(Tcl_Encoding encoding); +EXTERN void Tcl_FreeEncoding (Tcl_Encoding encoding); #endif #ifndef Tcl_GetCurrentThread_TCL_DECLARED #define Tcl_GetCurrentThread_TCL_DECLARED /* 300 */ -EXTERN Tcl_ThreadId Tcl_GetCurrentThread(void); +EXTERN Tcl_ThreadId Tcl_GetCurrentThread (void); #endif #ifndef Tcl_GetEncoding_TCL_DECLARED #define Tcl_GetEncoding_TCL_DECLARED /* 301 */ -EXTERN Tcl_Encoding Tcl_GetEncoding(Tcl_Interp *interp, CONST char *name); +EXTERN Tcl_Encoding Tcl_GetEncoding (Tcl_Interp * interp, + CONST char * name); #endif #ifndef Tcl_GetEncodingName_TCL_DECLARED #define Tcl_GetEncodingName_TCL_DECLARED /* 302 */ -EXTERN CONST84_RETURN char * Tcl_GetEncodingName(Tcl_Encoding encoding); +EXTERN CONST84_RETURN char * Tcl_GetEncodingName (Tcl_Encoding encoding); #endif #ifndef Tcl_GetEncodingNames_TCL_DECLARED #define Tcl_GetEncodingNames_TCL_DECLARED /* 303 */ -EXTERN void Tcl_GetEncodingNames(Tcl_Interp *interp); +EXTERN void Tcl_GetEncodingNames (Tcl_Interp * interp); #endif #ifndef Tcl_GetIndexFromObjStruct_TCL_DECLARED #define Tcl_GetIndexFromObjStruct_TCL_DECLARED /* 304 */ -EXTERN int Tcl_GetIndexFromObjStruct(Tcl_Interp *interp, - Tcl_Obj *objPtr, CONST VOID *tablePtr, - int offset, CONST char *msg, int flags, - int *indexPtr); +EXTERN int Tcl_GetIndexFromObjStruct (Tcl_Interp * interp, + Tcl_Obj * objPtr, CONST VOID * tablePtr, + int offset, CONST char * msg, int flags, + int * indexPtr); #endif #ifndef Tcl_GetThreadData_TCL_DECLARED #define Tcl_GetThreadData_TCL_DECLARED /* 305 */ -EXTERN VOID * Tcl_GetThreadData(Tcl_ThreadDataKey *keyPtr, +EXTERN VOID * Tcl_GetThreadData (Tcl_ThreadDataKey * keyPtr, int size); #endif #ifndef Tcl_GetVar2Ex_TCL_DECLARED #define Tcl_GetVar2Ex_TCL_DECLARED /* 306 */ -EXTERN Tcl_Obj * Tcl_GetVar2Ex(Tcl_Interp *interp, CONST char *part1, - CONST char *part2, int flags); +EXTERN Tcl_Obj * Tcl_GetVar2Ex (Tcl_Interp * interp, + CONST char * part1, CONST char * part2, + int flags); #endif #ifndef Tcl_InitNotifier_TCL_DECLARED #define Tcl_InitNotifier_TCL_DECLARED /* 307 */ -EXTERN ClientData Tcl_InitNotifier(void); +EXTERN ClientData Tcl_InitNotifier (void); #endif #ifndef Tcl_MutexLock_TCL_DECLARED #define Tcl_MutexLock_TCL_DECLARED /* 308 */ -EXTERN void Tcl_MutexLock(Tcl_Mutex *mutexPtr); +EXTERN void Tcl_MutexLock (Tcl_Mutex * mutexPtr); #endif #ifndef Tcl_MutexUnlock_TCL_DECLARED #define Tcl_MutexUnlock_TCL_DECLARED /* 309 */ -EXTERN void Tcl_MutexUnlock(Tcl_Mutex *mutexPtr); +EXTERN void Tcl_MutexUnlock (Tcl_Mutex * mutexPtr); #endif #ifndef Tcl_ConditionNotify_TCL_DECLARED #define Tcl_ConditionNotify_TCL_DECLARED /* 310 */ -EXTERN void Tcl_ConditionNotify(Tcl_Condition *condPtr); +EXTERN void Tcl_ConditionNotify (Tcl_Condition * condPtr); #endif #ifndef Tcl_ConditionWait_TCL_DECLARED #define Tcl_ConditionWait_TCL_DECLARED /* 311 */ -EXTERN void Tcl_ConditionWait(Tcl_Condition *condPtr, - Tcl_Mutex *mutexPtr, Tcl_Time *timePtr); +EXTERN void Tcl_ConditionWait (Tcl_Condition * condPtr, + Tcl_Mutex * mutexPtr, Tcl_Time * timePtr); #endif #ifndef Tcl_NumUtfChars_TCL_DECLARED #define Tcl_NumUtfChars_TCL_DECLARED /* 312 */ -EXTERN int Tcl_NumUtfChars(CONST char *src, int length); +EXTERN int Tcl_NumUtfChars (CONST char * src, int length); #endif #ifndef Tcl_ReadChars_TCL_DECLARED #define Tcl_ReadChars_TCL_DECLARED /* 313 */ -EXTERN int Tcl_ReadChars(Tcl_Channel channel, Tcl_Obj *objPtr, +EXTERN int Tcl_ReadChars (Tcl_Channel channel, Tcl_Obj * objPtr, int charsToRead, int appendFlag); #endif #ifndef Tcl_RestoreResult_TCL_DECLARED #define Tcl_RestoreResult_TCL_DECLARED /* 314 */ -EXTERN void Tcl_RestoreResult(Tcl_Interp *interp, - Tcl_SavedResult *statePtr); +EXTERN void Tcl_RestoreResult (Tcl_Interp * interp, + Tcl_SavedResult * statePtr); #endif #ifndef Tcl_SaveResult_TCL_DECLARED #define Tcl_SaveResult_TCL_DECLARED /* 315 */ -EXTERN void Tcl_SaveResult(Tcl_Interp *interp, - Tcl_SavedResult *statePtr); +EXTERN void Tcl_SaveResult (Tcl_Interp * interp, + Tcl_SavedResult * statePtr); #endif #ifndef Tcl_SetSystemEncoding_TCL_DECLARED #define Tcl_SetSystemEncoding_TCL_DECLARED /* 316 */ -EXTERN int Tcl_SetSystemEncoding(Tcl_Interp *interp, - CONST char *name); +EXTERN int Tcl_SetSystemEncoding (Tcl_Interp * interp, + CONST char * name); #endif #ifndef Tcl_SetVar2Ex_TCL_DECLARED #define Tcl_SetVar2Ex_TCL_DECLARED /* 317 */ -EXTERN Tcl_Obj * Tcl_SetVar2Ex(Tcl_Interp *interp, CONST char *part1, - CONST char *part2, Tcl_Obj *newValuePtr, - int flags); +EXTERN Tcl_Obj * Tcl_SetVar2Ex (Tcl_Interp * interp, + CONST char * part1, CONST char * part2, + Tcl_Obj * newValuePtr, int flags); #endif #ifndef Tcl_ThreadAlert_TCL_DECLARED #define Tcl_ThreadAlert_TCL_DECLARED /* 318 */ -EXTERN void Tcl_ThreadAlert(Tcl_ThreadId threadId); +EXTERN void Tcl_ThreadAlert (Tcl_ThreadId threadId); #endif #ifndef Tcl_ThreadQueueEvent_TCL_DECLARED #define Tcl_ThreadQueueEvent_TCL_DECLARED /* 319 */ -EXTERN void Tcl_ThreadQueueEvent(Tcl_ThreadId threadId, - Tcl_Event *evPtr, Tcl_QueuePosition position); +EXTERN void Tcl_ThreadQueueEvent (Tcl_ThreadId threadId, + Tcl_Event* evPtr, Tcl_QueuePosition position); #endif #ifndef Tcl_UniCharAtIndex_TCL_DECLARED #define Tcl_UniCharAtIndex_TCL_DECLARED /* 320 */ -EXTERN Tcl_UniChar Tcl_UniCharAtIndex(CONST char *src, int index); +EXTERN Tcl_UniChar Tcl_UniCharAtIndex (CONST char * src, int index); #endif #ifndef Tcl_UniCharToLower_TCL_DECLARED #define Tcl_UniCharToLower_TCL_DECLARED /* 321 */ -EXTERN Tcl_UniChar Tcl_UniCharToLower(int ch); +EXTERN Tcl_UniChar Tcl_UniCharToLower (int ch); #endif #ifndef Tcl_UniCharToTitle_TCL_DECLARED #define Tcl_UniCharToTitle_TCL_DECLARED /* 322 */ -EXTERN Tcl_UniChar Tcl_UniCharToTitle(int ch); +EXTERN Tcl_UniChar Tcl_UniCharToTitle (int ch); #endif #ifndef Tcl_UniCharToUpper_TCL_DECLARED #define Tcl_UniCharToUpper_TCL_DECLARED /* 323 */ -EXTERN Tcl_UniChar Tcl_UniCharToUpper(int ch); +EXTERN Tcl_UniChar Tcl_UniCharToUpper (int ch); #endif #ifndef Tcl_UniCharToUtf_TCL_DECLARED #define Tcl_UniCharToUtf_TCL_DECLARED /* 324 */ -EXTERN int Tcl_UniCharToUtf(int ch, char *buf); +EXTERN int Tcl_UniCharToUtf (int ch, char * buf); #endif #ifndef Tcl_UtfAtIndex_TCL_DECLARED #define Tcl_UtfAtIndex_TCL_DECLARED /* 325 */ -EXTERN CONST84_RETURN char * Tcl_UtfAtIndex(CONST char *src, int index); +EXTERN CONST84_RETURN char * Tcl_UtfAtIndex (CONST char * src, int index); #endif #ifndef Tcl_UtfCharComplete_TCL_DECLARED #define Tcl_UtfCharComplete_TCL_DECLARED /* 326 */ -EXTERN int Tcl_UtfCharComplete(CONST char *src, int length); +EXTERN int Tcl_UtfCharComplete (CONST char * src, int length); #endif #ifndef Tcl_UtfBackslash_TCL_DECLARED #define Tcl_UtfBackslash_TCL_DECLARED /* 327 */ -EXTERN int Tcl_UtfBackslash(CONST char *src, int *readPtr, - char *dst); +EXTERN int Tcl_UtfBackslash (CONST char * src, int * readPtr, + char * dst); #endif #ifndef Tcl_UtfFindFirst_TCL_DECLARED #define Tcl_UtfFindFirst_TCL_DECLARED /* 328 */ -EXTERN CONST84_RETURN char * Tcl_UtfFindFirst(CONST char *src, int ch); +EXTERN CONST84_RETURN char * Tcl_UtfFindFirst (CONST char * src, int ch); #endif #ifndef Tcl_UtfFindLast_TCL_DECLARED #define Tcl_UtfFindLast_TCL_DECLARED /* 329 */ -EXTERN CONST84_RETURN char * Tcl_UtfFindLast(CONST char *src, int ch); +EXTERN CONST84_RETURN char * Tcl_UtfFindLast (CONST char * src, int ch); #endif #ifndef Tcl_UtfNext_TCL_DECLARED #define Tcl_UtfNext_TCL_DECLARED /* 330 */ -EXTERN CONST84_RETURN char * Tcl_UtfNext(CONST char *src); +EXTERN CONST84_RETURN char * Tcl_UtfNext (CONST char * src); #endif #ifndef Tcl_UtfPrev_TCL_DECLARED #define Tcl_UtfPrev_TCL_DECLARED /* 331 */ -EXTERN CONST84_RETURN char * Tcl_UtfPrev(CONST char *src, CONST char *start); +EXTERN CONST84_RETURN char * Tcl_UtfPrev (CONST char * src, + CONST char * start); #endif #ifndef Tcl_UtfToExternal_TCL_DECLARED #define Tcl_UtfToExternal_TCL_DECLARED /* 332 */ -EXTERN int Tcl_UtfToExternal(Tcl_Interp *interp, - Tcl_Encoding encoding, CONST char *src, - int srcLen, int flags, - Tcl_EncodingState *statePtr, char *dst, - int dstLen, int *srcReadPtr, - int *dstWrotePtr, int *dstCharsPtr); +EXTERN int Tcl_UtfToExternal (Tcl_Interp * interp, + Tcl_Encoding encoding, CONST char * src, + int srcLen, int flags, + Tcl_EncodingState * statePtr, char * dst, + int dstLen, int * srcReadPtr, + int * dstWrotePtr, int * dstCharsPtr); #endif #ifndef Tcl_UtfToExternalDString_TCL_DECLARED #define Tcl_UtfToExternalDString_TCL_DECLARED /* 333 */ -EXTERN char * Tcl_UtfToExternalDString(Tcl_Encoding encoding, - CONST char *src, int srcLen, - Tcl_DString *dsPtr); +EXTERN char * Tcl_UtfToExternalDString (Tcl_Encoding encoding, + CONST char * src, int srcLen, + Tcl_DString * dsPtr); #endif #ifndef Tcl_UtfToLower_TCL_DECLARED #define Tcl_UtfToLower_TCL_DECLARED /* 334 */ -EXTERN int Tcl_UtfToLower(char *src); +EXTERN int Tcl_UtfToLower (char * src); #endif #ifndef Tcl_UtfToTitle_TCL_DECLARED #define Tcl_UtfToTitle_TCL_DECLARED /* 335 */ -EXTERN int Tcl_UtfToTitle(char *src); +EXTERN int Tcl_UtfToTitle (char * src); #endif #ifndef Tcl_UtfToUniChar_TCL_DECLARED #define Tcl_UtfToUniChar_TCL_DECLARED /* 336 */ -EXTERN int Tcl_UtfToUniChar(CONST char *src, Tcl_UniChar *chPtr); +EXTERN int Tcl_UtfToUniChar (CONST char * src, + Tcl_UniChar * chPtr); #endif #ifndef Tcl_UtfToUpper_TCL_DECLARED #define Tcl_UtfToUpper_TCL_DECLARED /* 337 */ -EXTERN int Tcl_UtfToUpper(char *src); +EXTERN int Tcl_UtfToUpper (char * src); #endif #ifndef Tcl_WriteChars_TCL_DECLARED #define Tcl_WriteChars_TCL_DECLARED /* 338 */ -EXTERN int Tcl_WriteChars(Tcl_Channel chan, CONST char *src, +EXTERN int Tcl_WriteChars (Tcl_Channel chan, CONST char * src, int srcLen); #endif #ifndef Tcl_WriteObj_TCL_DECLARED #define Tcl_WriteObj_TCL_DECLARED /* 339 */ -EXTERN int Tcl_WriteObj(Tcl_Channel chan, Tcl_Obj *objPtr); +EXTERN int Tcl_WriteObj (Tcl_Channel chan, Tcl_Obj * objPtr); #endif #ifndef Tcl_GetString_TCL_DECLARED #define Tcl_GetString_TCL_DECLARED /* 340 */ -EXTERN char * Tcl_GetString(Tcl_Obj *objPtr); +EXTERN char * Tcl_GetString (Tcl_Obj * objPtr); #endif #ifndef Tcl_GetDefaultEncodingDir_TCL_DECLARED #define Tcl_GetDefaultEncodingDir_TCL_DECLARED /* 341 */ -EXTERN CONST84_RETURN char * Tcl_GetDefaultEncodingDir(void); +EXTERN CONST84_RETURN char * Tcl_GetDefaultEncodingDir (void); #endif #ifndef Tcl_SetDefaultEncodingDir_TCL_DECLARED #define Tcl_SetDefaultEncodingDir_TCL_DECLARED /* 342 */ -EXTERN void Tcl_SetDefaultEncodingDir(CONST char *path); +EXTERN void Tcl_SetDefaultEncodingDir (CONST char * path); #endif #ifndef Tcl_AlertNotifier_TCL_DECLARED #define Tcl_AlertNotifier_TCL_DECLARED /* 343 */ -EXTERN void Tcl_AlertNotifier(ClientData clientData); +EXTERN void Tcl_AlertNotifier (ClientData clientData); #endif #ifndef Tcl_ServiceModeHook_TCL_DECLARED #define Tcl_ServiceModeHook_TCL_DECLARED /* 344 */ -EXTERN void Tcl_ServiceModeHook(int mode); +EXTERN void Tcl_ServiceModeHook (int mode); #endif #ifndef Tcl_UniCharIsAlnum_TCL_DECLARED #define Tcl_UniCharIsAlnum_TCL_DECLARED /* 345 */ -EXTERN int Tcl_UniCharIsAlnum(int ch); +EXTERN int Tcl_UniCharIsAlnum (int ch); #endif #ifndef Tcl_UniCharIsAlpha_TCL_DECLARED #define Tcl_UniCharIsAlpha_TCL_DECLARED /* 346 */ -EXTERN int Tcl_UniCharIsAlpha(int ch); +EXTERN int Tcl_UniCharIsAlpha (int ch); #endif #ifndef Tcl_UniCharIsDigit_TCL_DECLARED #define Tcl_UniCharIsDigit_TCL_DECLARED /* 347 */ -EXTERN int Tcl_UniCharIsDigit(int ch); +EXTERN int Tcl_UniCharIsDigit (int ch); #endif #ifndef Tcl_UniCharIsLower_TCL_DECLARED #define Tcl_UniCharIsLower_TCL_DECLARED /* 348 */ -EXTERN int Tcl_UniCharIsLower(int ch); +EXTERN int Tcl_UniCharIsLower (int ch); #endif #ifndef Tcl_UniCharIsSpace_TCL_DECLARED #define Tcl_UniCharIsSpace_TCL_DECLARED /* 349 */ -EXTERN int Tcl_UniCharIsSpace(int ch); +EXTERN int Tcl_UniCharIsSpace (int ch); #endif #ifndef Tcl_UniCharIsUpper_TCL_DECLARED #define Tcl_UniCharIsUpper_TCL_DECLARED /* 350 */ -EXTERN int Tcl_UniCharIsUpper(int ch); +EXTERN int Tcl_UniCharIsUpper (int ch); #endif #ifndef Tcl_UniCharIsWordChar_TCL_DECLARED #define Tcl_UniCharIsWordChar_TCL_DECLARED /* 351 */ -EXTERN int Tcl_UniCharIsWordChar(int ch); +EXTERN int Tcl_UniCharIsWordChar (int ch); #endif #ifndef Tcl_UniCharLen_TCL_DECLARED #define Tcl_UniCharLen_TCL_DECLARED /* 352 */ -EXTERN int Tcl_UniCharLen(CONST Tcl_UniChar *uniStr); +EXTERN int Tcl_UniCharLen (CONST Tcl_UniChar * uniStr); #endif #ifndef Tcl_UniCharNcmp_TCL_DECLARED #define Tcl_UniCharNcmp_TCL_DECLARED /* 353 */ -EXTERN int Tcl_UniCharNcmp(CONST Tcl_UniChar *ucs, - CONST Tcl_UniChar *uct, +EXTERN int Tcl_UniCharNcmp (CONST Tcl_UniChar * ucs, + CONST Tcl_UniChar * uct, unsigned long numChars); #endif #ifndef Tcl_UniCharToUtfDString_TCL_DECLARED #define Tcl_UniCharToUtfDString_TCL_DECLARED /* 354 */ -EXTERN char * Tcl_UniCharToUtfDString(CONST Tcl_UniChar *uniStr, - int uniLength, Tcl_DString *dsPtr); +EXTERN char * Tcl_UniCharToUtfDString (CONST Tcl_UniChar * uniStr, + int uniLength, Tcl_DString * dsPtr); #endif #ifndef Tcl_UtfToUniCharDString_TCL_DECLARED #define Tcl_UtfToUniCharDString_TCL_DECLARED /* 355 */ -EXTERN Tcl_UniChar * Tcl_UtfToUniCharDString(CONST char *src, int length, - Tcl_DString *dsPtr); +EXTERN Tcl_UniChar * Tcl_UtfToUniCharDString (CONST char * src, + int length, Tcl_DString * dsPtr); #endif #ifndef Tcl_GetRegExpFromObj_TCL_DECLARED #define Tcl_GetRegExpFromObj_TCL_DECLARED /* 356 */ -EXTERN Tcl_RegExp Tcl_GetRegExpFromObj(Tcl_Interp *interp, - Tcl_Obj *patObj, int flags); +EXTERN Tcl_RegExp Tcl_GetRegExpFromObj (Tcl_Interp * interp, + Tcl_Obj * patObj, int flags); #endif #ifndef Tcl_EvalTokens_TCL_DECLARED #define Tcl_EvalTokens_TCL_DECLARED /* 357 */ -EXTERN Tcl_Obj * Tcl_EvalTokens(Tcl_Interp *interp, - Tcl_Token *tokenPtr, int count); +EXTERN Tcl_Obj * Tcl_EvalTokens (Tcl_Interp * interp, + Tcl_Token * tokenPtr, int count); #endif #ifndef Tcl_FreeParse_TCL_DECLARED #define Tcl_FreeParse_TCL_DECLARED /* 358 */ -EXTERN void Tcl_FreeParse(Tcl_Parse *parsePtr); +EXTERN void Tcl_FreeParse (Tcl_Parse * parsePtr); #endif #ifndef Tcl_LogCommandInfo_TCL_DECLARED #define Tcl_LogCommandInfo_TCL_DECLARED /* 359 */ -EXTERN void Tcl_LogCommandInfo(Tcl_Interp *interp, - CONST char *script, CONST char *command, +EXTERN void Tcl_LogCommandInfo (Tcl_Interp * interp, + CONST char * script, CONST char * command, int length); #endif #ifndef Tcl_ParseBraces_TCL_DECLARED #define Tcl_ParseBraces_TCL_DECLARED /* 360 */ -EXTERN int Tcl_ParseBraces(Tcl_Interp *interp, - CONST char *start, int numBytes, - Tcl_Parse *parsePtr, int append, - CONST84 char **termPtr); +EXTERN int Tcl_ParseBraces (Tcl_Interp * interp, + CONST char * start, int numBytes, + Tcl_Parse * parsePtr, int append, + CONST84 char ** termPtr); #endif #ifndef Tcl_ParseCommand_TCL_DECLARED #define Tcl_ParseCommand_TCL_DECLARED /* 361 */ -EXTERN int Tcl_ParseCommand(Tcl_Interp *interp, - CONST char *start, int numBytes, int nested, - Tcl_Parse *parsePtr); +EXTERN int Tcl_ParseCommand (Tcl_Interp * interp, + CONST char * start, int numBytes, int nested, + Tcl_Parse * parsePtr); #endif #ifndef Tcl_ParseExpr_TCL_DECLARED #define Tcl_ParseExpr_TCL_DECLARED /* 362 */ -EXTERN int Tcl_ParseExpr(Tcl_Interp *interp, CONST char *start, - int numBytes, Tcl_Parse *parsePtr); +EXTERN int Tcl_ParseExpr (Tcl_Interp * interp, + CONST char * start, int numBytes, + Tcl_Parse * parsePtr); #endif #ifndef Tcl_ParseQuotedString_TCL_DECLARED #define Tcl_ParseQuotedString_TCL_DECLARED /* 363 */ -EXTERN int Tcl_ParseQuotedString(Tcl_Interp *interp, - CONST char *start, int numBytes, - Tcl_Parse *parsePtr, int append, - CONST84 char **termPtr); +EXTERN int Tcl_ParseQuotedString (Tcl_Interp * interp, + CONST char * start, int numBytes, + Tcl_Parse * parsePtr, int append, + CONST84 char ** termPtr); #endif #ifndef Tcl_ParseVarName_TCL_DECLARED #define Tcl_ParseVarName_TCL_DECLARED /* 364 */ -EXTERN int Tcl_ParseVarName(Tcl_Interp *interp, - CONST char *start, int numBytes, - Tcl_Parse *parsePtr, int append); +EXTERN int Tcl_ParseVarName (Tcl_Interp * interp, + CONST char * start, int numBytes, + Tcl_Parse * parsePtr, int append); #endif #ifndef Tcl_GetCwd_TCL_DECLARED #define Tcl_GetCwd_TCL_DECLARED /* 365 */ -EXTERN char * Tcl_GetCwd(Tcl_Interp *interp, Tcl_DString *cwdPtr); +EXTERN char * Tcl_GetCwd (Tcl_Interp * interp, + Tcl_DString * cwdPtr); #endif #ifndef Tcl_Chdir_TCL_DECLARED #define Tcl_Chdir_TCL_DECLARED /* 366 */ -EXTERN int Tcl_Chdir(CONST char *dirName); +EXTERN int Tcl_Chdir (CONST char * dirName); #endif #ifndef Tcl_Access_TCL_DECLARED #define Tcl_Access_TCL_DECLARED /* 367 */ -EXTERN int Tcl_Access(CONST char *path, int mode); +EXTERN int Tcl_Access (CONST char * path, int mode); #endif #ifndef Tcl_Stat_TCL_DECLARED #define Tcl_Stat_TCL_DECLARED /* 368 */ -EXTERN int Tcl_Stat(CONST char *path, struct stat *bufPtr); +EXTERN int Tcl_Stat (CONST char * path, struct stat * bufPtr); #endif #ifndef Tcl_UtfNcmp_TCL_DECLARED #define Tcl_UtfNcmp_TCL_DECLARED /* 369 */ -EXTERN int Tcl_UtfNcmp(CONST char *s1, CONST char *s2, +EXTERN int Tcl_UtfNcmp (CONST char * s1, CONST char * s2, unsigned long n); #endif #ifndef Tcl_UtfNcasecmp_TCL_DECLARED #define Tcl_UtfNcasecmp_TCL_DECLARED /* 370 */ -EXTERN int Tcl_UtfNcasecmp(CONST char *s1, CONST char *s2, +EXTERN int Tcl_UtfNcasecmp (CONST char * s1, CONST char * s2, unsigned long n); #endif #ifndef Tcl_StringCaseMatch_TCL_DECLARED #define Tcl_StringCaseMatch_TCL_DECLARED /* 371 */ -EXTERN int Tcl_StringCaseMatch(CONST char *str, - CONST char *pattern, int nocase); +EXTERN int Tcl_StringCaseMatch (CONST char * str, + CONST char * pattern, int nocase); #endif #ifndef Tcl_UniCharIsControl_TCL_DECLARED #define Tcl_UniCharIsControl_TCL_DECLARED /* 372 */ -EXTERN int Tcl_UniCharIsControl(int ch); +EXTERN int Tcl_UniCharIsControl (int ch); #endif #ifndef Tcl_UniCharIsGraph_TCL_DECLARED #define Tcl_UniCharIsGraph_TCL_DECLARED /* 373 */ -EXTERN int Tcl_UniCharIsGraph(int ch); +EXTERN int Tcl_UniCharIsGraph (int ch); #endif #ifndef Tcl_UniCharIsPrint_TCL_DECLARED #define Tcl_UniCharIsPrint_TCL_DECLARED /* 374 */ -EXTERN int Tcl_UniCharIsPrint(int ch); +EXTERN int Tcl_UniCharIsPrint (int ch); #endif #ifndef Tcl_UniCharIsPunct_TCL_DECLARED #define Tcl_UniCharIsPunct_TCL_DECLARED /* 375 */ -EXTERN int Tcl_UniCharIsPunct(int ch); +EXTERN int Tcl_UniCharIsPunct (int ch); #endif #ifndef Tcl_RegExpExecObj_TCL_DECLARED #define Tcl_RegExpExecObj_TCL_DECLARED /* 376 */ -EXTERN int Tcl_RegExpExecObj(Tcl_Interp *interp, - Tcl_RegExp regexp, Tcl_Obj *textObj, +EXTERN int Tcl_RegExpExecObj (Tcl_Interp * interp, + Tcl_RegExp regexp, Tcl_Obj * textObj, int offset, int nmatches, int flags); #endif #ifndef Tcl_RegExpGetInfo_TCL_DECLARED #define Tcl_RegExpGetInfo_TCL_DECLARED /* 377 */ -EXTERN void Tcl_RegExpGetInfo(Tcl_RegExp regexp, - Tcl_RegExpInfo *infoPtr); +EXTERN void Tcl_RegExpGetInfo (Tcl_RegExp regexp, + Tcl_RegExpInfo * infoPtr); #endif #ifndef Tcl_NewUnicodeObj_TCL_DECLARED #define Tcl_NewUnicodeObj_TCL_DECLARED /* 378 */ -EXTERN Tcl_Obj * Tcl_NewUnicodeObj(CONST Tcl_UniChar *unicode, +EXTERN Tcl_Obj * Tcl_NewUnicodeObj (CONST Tcl_UniChar * unicode, int numChars); #endif #ifndef Tcl_SetUnicodeObj_TCL_DECLARED #define Tcl_SetUnicodeObj_TCL_DECLARED /* 379 */ -EXTERN void Tcl_SetUnicodeObj(Tcl_Obj *objPtr, - CONST Tcl_UniChar *unicode, int numChars); +EXTERN void Tcl_SetUnicodeObj (Tcl_Obj * objPtr, + CONST Tcl_UniChar * unicode, int numChars); #endif #ifndef Tcl_GetCharLength_TCL_DECLARED #define Tcl_GetCharLength_TCL_DECLARED /* 380 */ -EXTERN int Tcl_GetCharLength(Tcl_Obj *objPtr); +EXTERN int Tcl_GetCharLength (Tcl_Obj * objPtr); #endif #ifndef Tcl_GetUniChar_TCL_DECLARED #define Tcl_GetUniChar_TCL_DECLARED /* 381 */ -EXTERN Tcl_UniChar Tcl_GetUniChar(Tcl_Obj *objPtr, int index); +EXTERN Tcl_UniChar Tcl_GetUniChar (Tcl_Obj * objPtr, int index); #endif #ifndef Tcl_GetUnicode_TCL_DECLARED #define Tcl_GetUnicode_TCL_DECLARED /* 382 */ -EXTERN Tcl_UniChar * Tcl_GetUnicode(Tcl_Obj *objPtr); +EXTERN Tcl_UniChar * Tcl_GetUnicode (Tcl_Obj * objPtr); #endif #ifndef Tcl_GetRange_TCL_DECLARED #define Tcl_GetRange_TCL_DECLARED /* 383 */ -EXTERN Tcl_Obj * Tcl_GetRange(Tcl_Obj *objPtr, int first, int last); +EXTERN Tcl_Obj * Tcl_GetRange (Tcl_Obj * objPtr, int first, int last); #endif #ifndef Tcl_AppendUnicodeToObj_TCL_DECLARED #define Tcl_AppendUnicodeToObj_TCL_DECLARED /* 384 */ -EXTERN void Tcl_AppendUnicodeToObj(Tcl_Obj *objPtr, - CONST Tcl_UniChar *unicode, int length); +EXTERN void Tcl_AppendUnicodeToObj (Tcl_Obj * objPtr, + CONST Tcl_UniChar * unicode, int length); #endif #ifndef Tcl_RegExpMatchObj_TCL_DECLARED #define Tcl_RegExpMatchObj_TCL_DECLARED /* 385 */ -EXTERN int Tcl_RegExpMatchObj(Tcl_Interp *interp, - Tcl_Obj *textObj, Tcl_Obj *patternObj); +EXTERN int Tcl_RegExpMatchObj (Tcl_Interp * interp, + Tcl_Obj * textObj, Tcl_Obj * patternObj); #endif #ifndef Tcl_SetNotifier_TCL_DECLARED #define Tcl_SetNotifier_TCL_DECLARED /* 386 */ -EXTERN void Tcl_SetNotifier(Tcl_NotifierProcs *notifierProcPtr); +EXTERN void Tcl_SetNotifier (Tcl_NotifierProcs * notifierProcPtr); #endif #ifndef Tcl_GetAllocMutex_TCL_DECLARED #define Tcl_GetAllocMutex_TCL_DECLARED /* 387 */ -EXTERN Tcl_Mutex * Tcl_GetAllocMutex(void); +EXTERN Tcl_Mutex * Tcl_GetAllocMutex (void); #endif #ifndef Tcl_GetChannelNames_TCL_DECLARED #define Tcl_GetChannelNames_TCL_DECLARED /* 388 */ -EXTERN int Tcl_GetChannelNames(Tcl_Interp *interp); +EXTERN int Tcl_GetChannelNames (Tcl_Interp * interp); #endif #ifndef Tcl_GetChannelNamesEx_TCL_DECLARED #define Tcl_GetChannelNamesEx_TCL_DECLARED /* 389 */ -EXTERN int Tcl_GetChannelNamesEx(Tcl_Interp *interp, - CONST char *pattern); +EXTERN int Tcl_GetChannelNamesEx (Tcl_Interp * interp, + CONST char * pattern); #endif #ifndef Tcl_ProcObjCmd_TCL_DECLARED #define Tcl_ProcObjCmd_TCL_DECLARED /* 390 */ -EXTERN int Tcl_ProcObjCmd(ClientData clientData, - Tcl_Interp *interp, int objc, +EXTERN int Tcl_ProcObjCmd (ClientData clientData, + Tcl_Interp * interp, int objc, Tcl_Obj *CONST objv[]); #endif #ifndef Tcl_ConditionFinalize_TCL_DECLARED #define Tcl_ConditionFinalize_TCL_DECLARED /* 391 */ -EXTERN void Tcl_ConditionFinalize(Tcl_Condition *condPtr); +EXTERN void Tcl_ConditionFinalize (Tcl_Condition * condPtr); #endif #ifndef Tcl_MutexFinalize_TCL_DECLARED #define Tcl_MutexFinalize_TCL_DECLARED /* 392 */ -EXTERN void Tcl_MutexFinalize(Tcl_Mutex *mutex); +EXTERN void Tcl_MutexFinalize (Tcl_Mutex * mutex); #endif #ifndef Tcl_CreateThread_TCL_DECLARED #define Tcl_CreateThread_TCL_DECLARED /* 393 */ -EXTERN int Tcl_CreateThread(Tcl_ThreadId *idPtr, - Tcl_ThreadCreateProc proc, - ClientData clientData, int stackSize, +EXTERN int Tcl_CreateThread (Tcl_ThreadId * idPtr, + Tcl_ThreadCreateProc proc, + ClientData clientData, int stackSize, int flags); #endif #ifndef Tcl_ReadRaw_TCL_DECLARED #define Tcl_ReadRaw_TCL_DECLARED /* 394 */ -EXTERN int Tcl_ReadRaw(Tcl_Channel chan, char *dst, +EXTERN int Tcl_ReadRaw (Tcl_Channel chan, char * dst, int bytesToRead); #endif #ifndef Tcl_WriteRaw_TCL_DECLARED #define Tcl_WriteRaw_TCL_DECLARED /* 395 */ -EXTERN int Tcl_WriteRaw(Tcl_Channel chan, CONST char *src, +EXTERN int Tcl_WriteRaw (Tcl_Channel chan, CONST char * src, int srcLen); #endif #ifndef Tcl_GetTopChannel_TCL_DECLARED #define Tcl_GetTopChannel_TCL_DECLARED /* 396 */ -EXTERN Tcl_Channel Tcl_GetTopChannel(Tcl_Channel chan); +EXTERN Tcl_Channel Tcl_GetTopChannel (Tcl_Channel chan); #endif #ifndef Tcl_ChannelBuffered_TCL_DECLARED #define Tcl_ChannelBuffered_TCL_DECLARED /* 397 */ -EXTERN int Tcl_ChannelBuffered(Tcl_Channel chan); +EXTERN int Tcl_ChannelBuffered (Tcl_Channel chan); #endif #ifndef Tcl_ChannelName_TCL_DECLARED #define Tcl_ChannelName_TCL_DECLARED /* 398 */ -EXTERN CONST84_RETURN char * Tcl_ChannelName( - CONST Tcl_ChannelType *chanTypePtr); +EXTERN CONST84_RETURN char * Tcl_ChannelName ( + CONST Tcl_ChannelType * chanTypePtr); #endif #ifndef Tcl_ChannelVersion_TCL_DECLARED #define Tcl_ChannelVersion_TCL_DECLARED /* 399 */ -EXTERN Tcl_ChannelTypeVersion Tcl_ChannelVersion( - CONST Tcl_ChannelType *chanTypePtr); +EXTERN Tcl_ChannelTypeVersion Tcl_ChannelVersion ( + CONST Tcl_ChannelType * chanTypePtr); #endif #ifndef Tcl_ChannelBlockModeProc_TCL_DECLARED #define Tcl_ChannelBlockModeProc_TCL_DECLARED /* 400 */ -EXTERN Tcl_DriverBlockModeProc * Tcl_ChannelBlockModeProc( - CONST Tcl_ChannelType *chanTypePtr); +EXTERN Tcl_DriverBlockModeProc * Tcl_ChannelBlockModeProc ( + CONST Tcl_ChannelType * chanTypePtr); #endif #ifndef Tcl_ChannelCloseProc_TCL_DECLARED #define Tcl_ChannelCloseProc_TCL_DECLARED /* 401 */ -EXTERN Tcl_DriverCloseProc * Tcl_ChannelCloseProc( - CONST Tcl_ChannelType *chanTypePtr); +EXTERN Tcl_DriverCloseProc * Tcl_ChannelCloseProc ( + CONST Tcl_ChannelType * chanTypePtr); #endif #ifndef Tcl_ChannelClose2Proc_TCL_DECLARED #define Tcl_ChannelClose2Proc_TCL_DECLARED /* 402 */ -EXTERN Tcl_DriverClose2Proc * Tcl_ChannelClose2Proc( - CONST Tcl_ChannelType *chanTypePtr); +EXTERN Tcl_DriverClose2Proc * Tcl_ChannelClose2Proc ( + CONST Tcl_ChannelType * chanTypePtr); #endif #ifndef Tcl_ChannelInputProc_TCL_DECLARED #define Tcl_ChannelInputProc_TCL_DECLARED /* 403 */ -EXTERN Tcl_DriverInputProc * Tcl_ChannelInputProc( - CONST Tcl_ChannelType *chanTypePtr); +EXTERN Tcl_DriverInputProc * Tcl_ChannelInputProc ( + CONST Tcl_ChannelType * chanTypePtr); #endif #ifndef Tcl_ChannelOutputProc_TCL_DECLARED #define Tcl_ChannelOutputProc_TCL_DECLARED /* 404 */ -EXTERN Tcl_DriverOutputProc * Tcl_ChannelOutputProc( - CONST Tcl_ChannelType *chanTypePtr); +EXTERN Tcl_DriverOutputProc * Tcl_ChannelOutputProc ( + CONST Tcl_ChannelType * chanTypePtr); #endif #ifndef Tcl_ChannelSeekProc_TCL_DECLARED #define Tcl_ChannelSeekProc_TCL_DECLARED /* 405 */ -EXTERN Tcl_DriverSeekProc * Tcl_ChannelSeekProc( - CONST Tcl_ChannelType *chanTypePtr); +EXTERN Tcl_DriverSeekProc * Tcl_ChannelSeekProc ( + CONST Tcl_ChannelType * chanTypePtr); #endif #ifndef Tcl_ChannelSetOptionProc_TCL_DECLARED #define Tcl_ChannelSetOptionProc_TCL_DECLARED /* 406 */ -EXTERN Tcl_DriverSetOptionProc * Tcl_ChannelSetOptionProc( - CONST Tcl_ChannelType *chanTypePtr); +EXTERN Tcl_DriverSetOptionProc * Tcl_ChannelSetOptionProc ( + CONST Tcl_ChannelType * chanTypePtr); #endif #ifndef Tcl_ChannelGetOptionProc_TCL_DECLARED #define Tcl_ChannelGetOptionProc_TCL_DECLARED /* 407 */ -EXTERN Tcl_DriverGetOptionProc * Tcl_ChannelGetOptionProc( - CONST Tcl_ChannelType *chanTypePtr); +EXTERN Tcl_DriverGetOptionProc * Tcl_ChannelGetOptionProc ( + CONST Tcl_ChannelType * chanTypePtr); #endif #ifndef Tcl_ChannelWatchProc_TCL_DECLARED #define Tcl_ChannelWatchProc_TCL_DECLARED /* 408 */ -EXTERN Tcl_DriverWatchProc * Tcl_ChannelWatchProc( - CONST Tcl_ChannelType *chanTypePtr); +EXTERN Tcl_DriverWatchProc * Tcl_ChannelWatchProc ( + CONST Tcl_ChannelType * chanTypePtr); #endif #ifndef Tcl_ChannelGetHandleProc_TCL_DECLARED #define Tcl_ChannelGetHandleProc_TCL_DECLARED /* 409 */ -EXTERN Tcl_DriverGetHandleProc * Tcl_ChannelGetHandleProc( - CONST Tcl_ChannelType *chanTypePtr); +EXTERN Tcl_DriverGetHandleProc * Tcl_ChannelGetHandleProc ( + CONST Tcl_ChannelType * chanTypePtr); #endif #ifndef Tcl_ChannelFlushProc_TCL_DECLARED #define Tcl_ChannelFlushProc_TCL_DECLARED /* 410 */ -EXTERN Tcl_DriverFlushProc * Tcl_ChannelFlushProc( - CONST Tcl_ChannelType *chanTypePtr); +EXTERN Tcl_DriverFlushProc * Tcl_ChannelFlushProc ( + CONST Tcl_ChannelType * chanTypePtr); #endif #ifndef Tcl_ChannelHandlerProc_TCL_DECLARED #define Tcl_ChannelHandlerProc_TCL_DECLARED /* 411 */ -EXTERN Tcl_DriverHandlerProc * Tcl_ChannelHandlerProc( - CONST Tcl_ChannelType *chanTypePtr); +EXTERN Tcl_DriverHandlerProc * Tcl_ChannelHandlerProc ( + CONST Tcl_ChannelType * chanTypePtr); #endif #ifndef Tcl_JoinThread_TCL_DECLARED #define Tcl_JoinThread_TCL_DECLARED /* 412 */ -EXTERN int Tcl_JoinThread(Tcl_ThreadId threadId, int *result); +EXTERN int Tcl_JoinThread (Tcl_ThreadId threadId, int* result); #endif #ifndef Tcl_IsChannelShared_TCL_DECLARED #define Tcl_IsChannelShared_TCL_DECLARED /* 413 */ -EXTERN int Tcl_IsChannelShared(Tcl_Channel channel); +EXTERN int Tcl_IsChannelShared (Tcl_Channel channel); #endif #ifndef Tcl_IsChannelRegistered_TCL_DECLARED #define Tcl_IsChannelRegistered_TCL_DECLARED /* 414 */ -EXTERN int Tcl_IsChannelRegistered(Tcl_Interp *interp, +EXTERN int Tcl_IsChannelRegistered (Tcl_Interp* interp, Tcl_Channel channel); #endif #ifndef Tcl_CutChannel_TCL_DECLARED #define Tcl_CutChannel_TCL_DECLARED /* 415 */ -EXTERN void Tcl_CutChannel(Tcl_Channel channel); +EXTERN void Tcl_CutChannel (Tcl_Channel channel); #endif #ifndef Tcl_SpliceChannel_TCL_DECLARED #define Tcl_SpliceChannel_TCL_DECLARED /* 416 */ -EXTERN void Tcl_SpliceChannel(Tcl_Channel channel); +EXTERN void Tcl_SpliceChannel (Tcl_Channel channel); #endif #ifndef Tcl_ClearChannelHandlers_TCL_DECLARED #define Tcl_ClearChannelHandlers_TCL_DECLARED /* 417 */ -EXTERN void Tcl_ClearChannelHandlers(Tcl_Channel channel); +EXTERN void Tcl_ClearChannelHandlers (Tcl_Channel channel); #endif #ifndef Tcl_IsChannelExisting_TCL_DECLARED #define Tcl_IsChannelExisting_TCL_DECLARED /* 418 */ -EXTERN int Tcl_IsChannelExisting(CONST char *channelName); +EXTERN int Tcl_IsChannelExisting (CONST char* channelName); #endif #ifndef Tcl_UniCharNcasecmp_TCL_DECLARED #define Tcl_UniCharNcasecmp_TCL_DECLARED /* 419 */ -EXTERN int Tcl_UniCharNcasecmp(CONST Tcl_UniChar *ucs, - CONST Tcl_UniChar *uct, +EXTERN int Tcl_UniCharNcasecmp (CONST Tcl_UniChar * ucs, + CONST Tcl_UniChar * uct, unsigned long numChars); #endif #ifndef Tcl_UniCharCaseMatch_TCL_DECLARED #define Tcl_UniCharCaseMatch_TCL_DECLARED /* 420 */ -EXTERN int Tcl_UniCharCaseMatch(CONST Tcl_UniChar *uniStr, - CONST Tcl_UniChar *uniPattern, int nocase); +EXTERN int Tcl_UniCharCaseMatch (CONST Tcl_UniChar * uniStr, + CONST Tcl_UniChar * uniPattern, int nocase); #endif #ifndef Tcl_FindHashEntry_TCL_DECLARED #define Tcl_FindHashEntry_TCL_DECLARED /* 421 */ -EXTERN Tcl_HashEntry * Tcl_FindHashEntry(Tcl_HashTable *tablePtr, - CONST char *key); +EXTERN Tcl_HashEntry * Tcl_FindHashEntry (Tcl_HashTable * tablePtr, + CONST char * key); #endif #ifndef Tcl_CreateHashEntry_TCL_DECLARED #define Tcl_CreateHashEntry_TCL_DECLARED /* 422 */ -EXTERN Tcl_HashEntry * Tcl_CreateHashEntry(Tcl_HashTable *tablePtr, - CONST char *key, int *newPtr); +EXTERN Tcl_HashEntry * Tcl_CreateHashEntry (Tcl_HashTable * tablePtr, + CONST char * key, int * newPtr); #endif #ifndef Tcl_InitCustomHashTable_TCL_DECLARED #define Tcl_InitCustomHashTable_TCL_DECLARED /* 423 */ -EXTERN void Tcl_InitCustomHashTable(Tcl_HashTable *tablePtr, - int keyType, Tcl_HashKeyType *typePtr); +EXTERN void Tcl_InitCustomHashTable (Tcl_HashTable * tablePtr, + int keyType, Tcl_HashKeyType * typePtr); #endif #ifndef Tcl_InitObjHashTable_TCL_DECLARED #define Tcl_InitObjHashTable_TCL_DECLARED /* 424 */ -EXTERN void Tcl_InitObjHashTable(Tcl_HashTable *tablePtr); +EXTERN void Tcl_InitObjHashTable (Tcl_HashTable * tablePtr); #endif #ifndef Tcl_CommandTraceInfo_TCL_DECLARED #define Tcl_CommandTraceInfo_TCL_DECLARED /* 425 */ -EXTERN ClientData Tcl_CommandTraceInfo(Tcl_Interp *interp, - CONST char *varName, int flags, - Tcl_CommandTraceProc *procPtr, +EXTERN ClientData Tcl_CommandTraceInfo (Tcl_Interp * interp, + CONST char * varName, int flags, + Tcl_CommandTraceProc * procPtr, ClientData prevClientData); #endif #ifndef Tcl_TraceCommand_TCL_DECLARED #define Tcl_TraceCommand_TCL_DECLARED /* 426 */ -EXTERN int Tcl_TraceCommand(Tcl_Interp *interp, - CONST char *varName, int flags, - Tcl_CommandTraceProc *proc, +EXTERN int Tcl_TraceCommand (Tcl_Interp * interp, + CONST char * varName, int flags, + Tcl_CommandTraceProc * proc, ClientData clientData); #endif #ifndef Tcl_UntraceCommand_TCL_DECLARED #define Tcl_UntraceCommand_TCL_DECLARED /* 427 */ -EXTERN void Tcl_UntraceCommand(Tcl_Interp *interp, - CONST char *varName, int flags, - Tcl_CommandTraceProc *proc, +EXTERN void Tcl_UntraceCommand (Tcl_Interp * interp, + CONST char * varName, int flags, + Tcl_CommandTraceProc * proc, ClientData clientData); #endif #ifndef Tcl_AttemptAlloc_TCL_DECLARED #define Tcl_AttemptAlloc_TCL_DECLARED /* 428 */ -EXTERN char * Tcl_AttemptAlloc(unsigned int size); +EXTERN char * Tcl_AttemptAlloc (unsigned int size); #endif #ifndef Tcl_AttemptDbCkalloc_TCL_DECLARED #define Tcl_AttemptDbCkalloc_TCL_DECLARED /* 429 */ -EXTERN char * Tcl_AttemptDbCkalloc(unsigned int size, - CONST char *file, int line); +EXTERN char * Tcl_AttemptDbCkalloc (unsigned int size, + CONST char * file, int line); #endif #ifndef Tcl_AttemptRealloc_TCL_DECLARED #define Tcl_AttemptRealloc_TCL_DECLARED /* 430 */ -EXTERN char * Tcl_AttemptRealloc(char *ptr, unsigned int size); +EXTERN char * Tcl_AttemptRealloc (char * ptr, unsigned int size); #endif #ifndef Tcl_AttemptDbCkrealloc_TCL_DECLARED #define Tcl_AttemptDbCkrealloc_TCL_DECLARED /* 431 */ -EXTERN char * Tcl_AttemptDbCkrealloc(char *ptr, unsigned int size, - CONST char *file, int line); +EXTERN char * Tcl_AttemptDbCkrealloc (char * ptr, + unsigned int size, CONST char * file, + int line); #endif #ifndef Tcl_AttemptSetObjLength_TCL_DECLARED #define Tcl_AttemptSetObjLength_TCL_DECLARED /* 432 */ -EXTERN int Tcl_AttemptSetObjLength(Tcl_Obj *objPtr, int length); +EXTERN int Tcl_AttemptSetObjLength (Tcl_Obj * objPtr, + int length); #endif #ifndef Tcl_GetChannelThread_TCL_DECLARED #define Tcl_GetChannelThread_TCL_DECLARED /* 433 */ -EXTERN Tcl_ThreadId Tcl_GetChannelThread(Tcl_Channel channel); +EXTERN Tcl_ThreadId Tcl_GetChannelThread (Tcl_Channel channel); #endif #ifndef Tcl_GetUnicodeFromObj_TCL_DECLARED #define Tcl_GetUnicodeFromObj_TCL_DECLARED /* 434 */ -EXTERN Tcl_UniChar * Tcl_GetUnicodeFromObj(Tcl_Obj *objPtr, - int *lengthPtr); +EXTERN Tcl_UniChar * Tcl_GetUnicodeFromObj (Tcl_Obj * objPtr, + int * lengthPtr); #endif #ifndef Tcl_GetMathFuncInfo_TCL_DECLARED #define Tcl_GetMathFuncInfo_TCL_DECLARED /* 435 */ -EXTERN int Tcl_GetMathFuncInfo(Tcl_Interp *interp, - CONST char *name, int *numArgsPtr, - Tcl_ValueType **argTypesPtr, - Tcl_MathProc **procPtr, - ClientData *clientDataPtr); +EXTERN int Tcl_GetMathFuncInfo (Tcl_Interp * interp, + CONST char * name, int * numArgsPtr, + Tcl_ValueType ** argTypesPtr, + Tcl_MathProc ** procPtr, + ClientData * clientDataPtr); #endif #ifndef Tcl_ListMathFuncs_TCL_DECLARED #define Tcl_ListMathFuncs_TCL_DECLARED /* 436 */ -EXTERN Tcl_Obj * Tcl_ListMathFuncs(Tcl_Interp *interp, - CONST char *pattern); +EXTERN Tcl_Obj * Tcl_ListMathFuncs (Tcl_Interp * interp, + CONST char * pattern); #endif #ifndef Tcl_SubstObj_TCL_DECLARED #define Tcl_SubstObj_TCL_DECLARED /* 437 */ -EXTERN Tcl_Obj * Tcl_SubstObj(Tcl_Interp *interp, Tcl_Obj *objPtr, +EXTERN Tcl_Obj * Tcl_SubstObj (Tcl_Interp * interp, Tcl_Obj * objPtr, int flags); #endif #ifndef Tcl_DetachChannel_TCL_DECLARED #define Tcl_DetachChannel_TCL_DECLARED /* 438 */ -EXTERN int Tcl_DetachChannel(Tcl_Interp *interp, +EXTERN int Tcl_DetachChannel (Tcl_Interp* interp, Tcl_Channel channel); #endif #ifndef Tcl_IsStandardChannel_TCL_DECLARED #define Tcl_IsStandardChannel_TCL_DECLARED /* 439 */ -EXTERN int Tcl_IsStandardChannel(Tcl_Channel channel); +EXTERN int Tcl_IsStandardChannel (Tcl_Channel channel); #endif #ifndef Tcl_FSCopyFile_TCL_DECLARED #define Tcl_FSCopyFile_TCL_DECLARED /* 440 */ -EXTERN int Tcl_FSCopyFile(Tcl_Obj *srcPathPtr, - Tcl_Obj *destPathPtr); +EXTERN int Tcl_FSCopyFile (Tcl_Obj * srcPathPtr, + Tcl_Obj * destPathPtr); #endif #ifndef Tcl_FSCopyDirectory_TCL_DECLARED #define Tcl_FSCopyDirectory_TCL_DECLARED /* 441 */ -EXTERN int Tcl_FSCopyDirectory(Tcl_Obj *srcPathPtr, - Tcl_Obj *destPathPtr, Tcl_Obj **errorPtr); +EXTERN int Tcl_FSCopyDirectory (Tcl_Obj * srcPathPtr, + Tcl_Obj * destPathPtr, Tcl_Obj ** errorPtr); #endif #ifndef Tcl_FSCreateDirectory_TCL_DECLARED #define Tcl_FSCreateDirectory_TCL_DECLARED /* 442 */ -EXTERN int Tcl_FSCreateDirectory(Tcl_Obj *pathPtr); +EXTERN int Tcl_FSCreateDirectory (Tcl_Obj * pathPtr); #endif #ifndef Tcl_FSDeleteFile_TCL_DECLARED #define Tcl_FSDeleteFile_TCL_DECLARED /* 443 */ -EXTERN int Tcl_FSDeleteFile(Tcl_Obj *pathPtr); +EXTERN int Tcl_FSDeleteFile (Tcl_Obj * pathPtr); #endif #ifndef Tcl_FSLoadFile_TCL_DECLARED #define Tcl_FSLoadFile_TCL_DECLARED /* 444 */ -EXTERN int Tcl_FSLoadFile(Tcl_Interp *interp, Tcl_Obj *pathPtr, - CONST char *sym1, CONST char *sym2, - Tcl_PackageInitProc **proc1Ptr, - Tcl_PackageInitProc **proc2Ptr, - Tcl_LoadHandle *handlePtr, - Tcl_FSUnloadFileProc **unloadProcPtr); +EXTERN int Tcl_FSLoadFile (Tcl_Interp * interp, + Tcl_Obj * pathPtr, CONST char * sym1, + CONST char * sym2, + Tcl_PackageInitProc ** proc1Ptr, + Tcl_PackageInitProc ** proc2Ptr, + Tcl_LoadHandle * handlePtr, + Tcl_FSUnloadFileProc ** unloadProcPtr); #endif #ifndef Tcl_FSMatchInDirectory_TCL_DECLARED #define Tcl_FSMatchInDirectory_TCL_DECLARED /* 445 */ -EXTERN int Tcl_FSMatchInDirectory(Tcl_Interp *interp, - Tcl_Obj *result, Tcl_Obj *pathPtr, - CONST char *pattern, Tcl_GlobTypeData *types); +EXTERN int Tcl_FSMatchInDirectory (Tcl_Interp * interp, + Tcl_Obj * result, Tcl_Obj * pathPtr, + CONST char * pattern, + Tcl_GlobTypeData * types); #endif #ifndef Tcl_FSLink_TCL_DECLARED #define Tcl_FSLink_TCL_DECLARED /* 446 */ -EXTERN Tcl_Obj * Tcl_FSLink(Tcl_Obj *pathPtr, Tcl_Obj *toPtr, +EXTERN Tcl_Obj * Tcl_FSLink (Tcl_Obj * pathPtr, Tcl_Obj * toPtr, int linkAction); #endif #ifndef Tcl_FSRemoveDirectory_TCL_DECLARED #define Tcl_FSRemoveDirectory_TCL_DECLARED /* 447 */ -EXTERN int Tcl_FSRemoveDirectory(Tcl_Obj *pathPtr, - int recursive, Tcl_Obj **errorPtr); +EXTERN int Tcl_FSRemoveDirectory (Tcl_Obj * pathPtr, + int recursive, Tcl_Obj ** errorPtr); #endif #ifndef Tcl_FSRenameFile_TCL_DECLARED #define Tcl_FSRenameFile_TCL_DECLARED /* 448 */ -EXTERN int Tcl_FSRenameFile(Tcl_Obj *srcPathPtr, - Tcl_Obj *destPathPtr); +EXTERN int Tcl_FSRenameFile (Tcl_Obj * srcPathPtr, + Tcl_Obj * destPathPtr); #endif #ifndef Tcl_FSLstat_TCL_DECLARED #define Tcl_FSLstat_TCL_DECLARED /* 449 */ -EXTERN int Tcl_FSLstat(Tcl_Obj *pathPtr, Tcl_StatBuf *buf); +EXTERN int Tcl_FSLstat (Tcl_Obj * pathPtr, Tcl_StatBuf * buf); #endif #ifndef Tcl_FSUtime_TCL_DECLARED #define Tcl_FSUtime_TCL_DECLARED /* 450 */ -EXTERN int Tcl_FSUtime(Tcl_Obj *pathPtr, struct utimbuf *tval); +EXTERN int Tcl_FSUtime (Tcl_Obj * pathPtr, + struct utimbuf * tval); #endif #ifndef Tcl_FSFileAttrsGet_TCL_DECLARED #define Tcl_FSFileAttrsGet_TCL_DECLARED /* 451 */ -EXTERN int Tcl_FSFileAttrsGet(Tcl_Interp *interp, int index, - Tcl_Obj *pathPtr, Tcl_Obj **objPtrRef); +EXTERN int Tcl_FSFileAttrsGet (Tcl_Interp * interp, int index, + Tcl_Obj * pathPtr, Tcl_Obj ** objPtrRef); #endif #ifndef Tcl_FSFileAttrsSet_TCL_DECLARED #define Tcl_FSFileAttrsSet_TCL_DECLARED /* 452 */ -EXTERN int Tcl_FSFileAttrsSet(Tcl_Interp *interp, int index, - Tcl_Obj *pathPtr, Tcl_Obj *objPtr); +EXTERN int Tcl_FSFileAttrsSet (Tcl_Interp * interp, int index, + Tcl_Obj * pathPtr, Tcl_Obj * objPtr); #endif #ifndef Tcl_FSFileAttrStrings_TCL_DECLARED #define Tcl_FSFileAttrStrings_TCL_DECLARED /* 453 */ -EXTERN CONST char ** Tcl_FSFileAttrStrings(Tcl_Obj *pathPtr, - Tcl_Obj **objPtrRef); +EXTERN CONST char ** Tcl_FSFileAttrStrings (Tcl_Obj * pathPtr, + Tcl_Obj ** objPtrRef); #endif #ifndef Tcl_FSStat_TCL_DECLARED #define Tcl_FSStat_TCL_DECLARED /* 454 */ -EXTERN int Tcl_FSStat(Tcl_Obj *pathPtr, Tcl_StatBuf *buf); +EXTERN int Tcl_FSStat (Tcl_Obj * pathPtr, Tcl_StatBuf * buf); #endif #ifndef Tcl_FSAccess_TCL_DECLARED #define Tcl_FSAccess_TCL_DECLARED /* 455 */ -EXTERN int Tcl_FSAccess(Tcl_Obj *pathPtr, int mode); +EXTERN int Tcl_FSAccess (Tcl_Obj * pathPtr, int mode); #endif #ifndef Tcl_FSOpenFileChannel_TCL_DECLARED #define Tcl_FSOpenFileChannel_TCL_DECLARED /* 456 */ -EXTERN Tcl_Channel Tcl_FSOpenFileChannel(Tcl_Interp *interp, - Tcl_Obj *pathPtr, CONST char *modeString, +EXTERN Tcl_Channel Tcl_FSOpenFileChannel (Tcl_Interp * interp, + Tcl_Obj * pathPtr, CONST char * modeString, int permissions); #endif #ifndef Tcl_FSGetCwd_TCL_DECLARED #define Tcl_FSGetCwd_TCL_DECLARED /* 457 */ -EXTERN Tcl_Obj * Tcl_FSGetCwd(Tcl_Interp *interp); +EXTERN Tcl_Obj* Tcl_FSGetCwd (Tcl_Interp * interp); #endif #ifndef Tcl_FSChdir_TCL_DECLARED #define Tcl_FSChdir_TCL_DECLARED /* 458 */ -EXTERN int Tcl_FSChdir(Tcl_Obj *pathPtr); +EXTERN int Tcl_FSChdir (Tcl_Obj * pathPtr); #endif #ifndef Tcl_FSConvertToPathType_TCL_DECLARED #define Tcl_FSConvertToPathType_TCL_DECLARED /* 459 */ -EXTERN int Tcl_FSConvertToPathType(Tcl_Interp *interp, - Tcl_Obj *pathPtr); +EXTERN int Tcl_FSConvertToPathType (Tcl_Interp * interp, + Tcl_Obj * pathPtr); #endif #ifndef Tcl_FSJoinPath_TCL_DECLARED #define Tcl_FSJoinPath_TCL_DECLARED /* 460 */ -EXTERN Tcl_Obj * Tcl_FSJoinPath(Tcl_Obj *listObj, int elements); +EXTERN Tcl_Obj* Tcl_FSJoinPath (Tcl_Obj * listObj, int elements); #endif #ifndef Tcl_FSSplitPath_TCL_DECLARED #define Tcl_FSSplitPath_TCL_DECLARED /* 461 */ -EXTERN Tcl_Obj * Tcl_FSSplitPath(Tcl_Obj *pathPtr, int *lenPtr); +EXTERN Tcl_Obj* Tcl_FSSplitPath (Tcl_Obj* pathPtr, int * lenPtr); #endif #ifndef Tcl_FSEqualPaths_TCL_DECLARED #define Tcl_FSEqualPaths_TCL_DECLARED /* 462 */ -EXTERN int Tcl_FSEqualPaths(Tcl_Obj *firstPtr, - Tcl_Obj *secondPtr); +EXTERN int Tcl_FSEqualPaths (Tcl_Obj* firstPtr, + Tcl_Obj* secondPtr); #endif #ifndef Tcl_FSGetNormalizedPath_TCL_DECLARED #define Tcl_FSGetNormalizedPath_TCL_DECLARED /* 463 */ -EXTERN Tcl_Obj * Tcl_FSGetNormalizedPath(Tcl_Interp *interp, - Tcl_Obj *pathPtr); +EXTERN Tcl_Obj* Tcl_FSGetNormalizedPath (Tcl_Interp * interp, + Tcl_Obj* pathPtr); #endif #ifndef Tcl_FSJoinToPath_TCL_DECLARED #define Tcl_FSJoinToPath_TCL_DECLARED /* 464 */ -EXTERN Tcl_Obj * Tcl_FSJoinToPath(Tcl_Obj *pathPtr, int objc, +EXTERN Tcl_Obj* Tcl_FSJoinToPath (Tcl_Obj * pathPtr, int objc, Tcl_Obj *CONST objv[]); #endif #ifndef Tcl_FSGetInternalRep_TCL_DECLARED #define Tcl_FSGetInternalRep_TCL_DECLARED /* 465 */ -EXTERN ClientData Tcl_FSGetInternalRep(Tcl_Obj *pathPtr, - Tcl_Filesystem *fsPtr); +EXTERN ClientData Tcl_FSGetInternalRep (Tcl_Obj* pathPtr, + Tcl_Filesystem * fsPtr); #endif #ifndef Tcl_FSGetTranslatedPath_TCL_DECLARED #define Tcl_FSGetTranslatedPath_TCL_DECLARED /* 466 */ -EXTERN Tcl_Obj * Tcl_FSGetTranslatedPath(Tcl_Interp *interp, - Tcl_Obj *pathPtr); +EXTERN Tcl_Obj* Tcl_FSGetTranslatedPath (Tcl_Interp * interp, + Tcl_Obj* pathPtr); #endif #ifndef Tcl_FSEvalFile_TCL_DECLARED #define Tcl_FSEvalFile_TCL_DECLARED /* 467 */ -EXTERN int Tcl_FSEvalFile(Tcl_Interp *interp, Tcl_Obj *fileName); +EXTERN int Tcl_FSEvalFile (Tcl_Interp * interp, + Tcl_Obj * fileName); #endif #ifndef Tcl_FSNewNativePath_TCL_DECLARED #define Tcl_FSNewNativePath_TCL_DECLARED /* 468 */ -EXTERN Tcl_Obj * Tcl_FSNewNativePath(Tcl_Filesystem *fromFilesystem, +EXTERN Tcl_Obj* Tcl_FSNewNativePath (Tcl_Filesystem* fromFilesystem, ClientData clientData); #endif #ifndef Tcl_FSGetNativePath_TCL_DECLARED #define Tcl_FSGetNativePath_TCL_DECLARED /* 469 */ -EXTERN CONST char * Tcl_FSGetNativePath(Tcl_Obj *pathPtr); +EXTERN CONST char* Tcl_FSGetNativePath (Tcl_Obj* pathPtr); #endif #ifndef Tcl_FSFileSystemInfo_TCL_DECLARED #define Tcl_FSFileSystemInfo_TCL_DECLARED /* 470 */ -EXTERN Tcl_Obj * Tcl_FSFileSystemInfo(Tcl_Obj *pathPtr); +EXTERN Tcl_Obj* Tcl_FSFileSystemInfo (Tcl_Obj* pathPtr); #endif #ifndef Tcl_FSPathSeparator_TCL_DECLARED #define Tcl_FSPathSeparator_TCL_DECLARED /* 471 */ -EXTERN Tcl_Obj * Tcl_FSPathSeparator(Tcl_Obj *pathPtr); +EXTERN Tcl_Obj* Tcl_FSPathSeparator (Tcl_Obj* pathPtr); #endif #ifndef Tcl_FSListVolumes_TCL_DECLARED #define Tcl_FSListVolumes_TCL_DECLARED /* 472 */ -EXTERN Tcl_Obj * Tcl_FSListVolumes(void); +EXTERN Tcl_Obj* Tcl_FSListVolumes (void); #endif #ifndef Tcl_FSRegister_TCL_DECLARED #define Tcl_FSRegister_TCL_DECLARED /* 473 */ -EXTERN int Tcl_FSRegister(ClientData clientData, - Tcl_Filesystem *fsPtr); +EXTERN int Tcl_FSRegister (ClientData clientData, + Tcl_Filesystem * fsPtr); #endif #ifndef Tcl_FSUnregister_TCL_DECLARED #define Tcl_FSUnregister_TCL_DECLARED /* 474 */ -EXTERN int Tcl_FSUnregister(Tcl_Filesystem *fsPtr); +EXTERN int Tcl_FSUnregister (Tcl_Filesystem * fsPtr); #endif #ifndef Tcl_FSData_TCL_DECLARED #define Tcl_FSData_TCL_DECLARED /* 475 */ -EXTERN ClientData Tcl_FSData(Tcl_Filesystem *fsPtr); +EXTERN ClientData Tcl_FSData (Tcl_Filesystem * fsPtr); #endif #ifndef Tcl_FSGetTranslatedStringPath_TCL_DECLARED #define Tcl_FSGetTranslatedStringPath_TCL_DECLARED /* 476 */ -EXTERN CONST char * Tcl_FSGetTranslatedStringPath(Tcl_Interp *interp, - Tcl_Obj *pathPtr); +EXTERN CONST char* Tcl_FSGetTranslatedStringPath (Tcl_Interp * interp, + Tcl_Obj* pathPtr); #endif #ifndef Tcl_FSGetFileSystemForPath_TCL_DECLARED #define Tcl_FSGetFileSystemForPath_TCL_DECLARED /* 477 */ -EXTERN Tcl_Filesystem * Tcl_FSGetFileSystemForPath(Tcl_Obj *pathPtr); +EXTERN Tcl_Filesystem* Tcl_FSGetFileSystemForPath (Tcl_Obj* pathPtr); #endif #ifndef Tcl_FSGetPathType_TCL_DECLARED #define Tcl_FSGetPathType_TCL_DECLARED /* 478 */ -EXTERN Tcl_PathType Tcl_FSGetPathType(Tcl_Obj *pathPtr); +EXTERN Tcl_PathType Tcl_FSGetPathType (Tcl_Obj * pathPtr); #endif #ifndef Tcl_OutputBuffered_TCL_DECLARED #define Tcl_OutputBuffered_TCL_DECLARED /* 479 */ -EXTERN int Tcl_OutputBuffered(Tcl_Channel chan); +EXTERN int Tcl_OutputBuffered (Tcl_Channel chan); #endif #ifndef Tcl_FSMountsChanged_TCL_DECLARED #define Tcl_FSMountsChanged_TCL_DECLARED /* 480 */ -EXTERN void Tcl_FSMountsChanged(Tcl_Filesystem *fsPtr); +EXTERN void Tcl_FSMountsChanged (Tcl_Filesystem * fsPtr); #endif #ifndef Tcl_EvalTokensStandard_TCL_DECLARED #define Tcl_EvalTokensStandard_TCL_DECLARED /* 481 */ -EXTERN int Tcl_EvalTokensStandard(Tcl_Interp *interp, - Tcl_Token *tokenPtr, int count); +EXTERN int Tcl_EvalTokensStandard (Tcl_Interp * interp, + Tcl_Token * tokenPtr, int count); #endif #ifndef Tcl_GetTime_TCL_DECLARED #define Tcl_GetTime_TCL_DECLARED /* 482 */ -EXTERN void Tcl_GetTime(Tcl_Time *timeBuf); +EXTERN void Tcl_GetTime (Tcl_Time* timeBuf); #endif #ifndef Tcl_CreateObjTrace_TCL_DECLARED #define Tcl_CreateObjTrace_TCL_DECLARED /* 483 */ -EXTERN Tcl_Trace Tcl_CreateObjTrace(Tcl_Interp *interp, int level, - int flags, Tcl_CmdObjTraceProc *objProc, - ClientData clientData, - Tcl_CmdObjTraceDeleteProc *delProc); +EXTERN Tcl_Trace Tcl_CreateObjTrace (Tcl_Interp* interp, int level, + int flags, Tcl_CmdObjTraceProc* objProc, + ClientData clientData, + Tcl_CmdObjTraceDeleteProc* delProc); #endif #ifndef Tcl_GetCommandInfoFromToken_TCL_DECLARED #define Tcl_GetCommandInfoFromToken_TCL_DECLARED /* 484 */ -EXTERN int Tcl_GetCommandInfoFromToken(Tcl_Command token, - Tcl_CmdInfo *infoPtr); +EXTERN int Tcl_GetCommandInfoFromToken (Tcl_Command token, + Tcl_CmdInfo* infoPtr); #endif #ifndef Tcl_SetCommandInfoFromToken_TCL_DECLARED #define Tcl_SetCommandInfoFromToken_TCL_DECLARED /* 485 */ -EXTERN int Tcl_SetCommandInfoFromToken(Tcl_Command token, - CONST Tcl_CmdInfo *infoPtr); +EXTERN int Tcl_SetCommandInfoFromToken (Tcl_Command token, + CONST Tcl_CmdInfo* infoPtr); #endif #ifndef Tcl_DbNewWideIntObj_TCL_DECLARED #define Tcl_DbNewWideIntObj_TCL_DECLARED /* 486 */ -EXTERN Tcl_Obj * Tcl_DbNewWideIntObj(Tcl_WideInt wideValue, - CONST char *file, int line); +EXTERN Tcl_Obj * Tcl_DbNewWideIntObj (Tcl_WideInt wideValue, + CONST char * file, int line); #endif #ifndef Tcl_GetWideIntFromObj_TCL_DECLARED #define Tcl_GetWideIntFromObj_TCL_DECLARED /* 487 */ -EXTERN int Tcl_GetWideIntFromObj(Tcl_Interp *interp, - Tcl_Obj *objPtr, Tcl_WideInt *widePtr); +EXTERN int Tcl_GetWideIntFromObj (Tcl_Interp * interp, + Tcl_Obj * objPtr, Tcl_WideInt * widePtr); #endif #ifndef Tcl_NewWideIntObj_TCL_DECLARED #define Tcl_NewWideIntObj_TCL_DECLARED /* 488 */ -EXTERN Tcl_Obj * Tcl_NewWideIntObj(Tcl_WideInt wideValue); +EXTERN Tcl_Obj * Tcl_NewWideIntObj (Tcl_WideInt wideValue); #endif #ifndef Tcl_SetWideIntObj_TCL_DECLARED #define Tcl_SetWideIntObj_TCL_DECLARED /* 489 */ -EXTERN void Tcl_SetWideIntObj(Tcl_Obj *objPtr, +EXTERN void Tcl_SetWideIntObj (Tcl_Obj * objPtr, Tcl_WideInt wideValue); #endif #ifndef Tcl_AllocStatBuf_TCL_DECLARED #define Tcl_AllocStatBuf_TCL_DECLARED /* 490 */ -EXTERN Tcl_StatBuf * Tcl_AllocStatBuf(void); +EXTERN Tcl_StatBuf * Tcl_AllocStatBuf (void); #endif #ifndef Tcl_Seek_TCL_DECLARED #define Tcl_Seek_TCL_DECLARED /* 491 */ -EXTERN Tcl_WideInt Tcl_Seek(Tcl_Channel chan, Tcl_WideInt offset, +EXTERN Tcl_WideInt Tcl_Seek (Tcl_Channel chan, Tcl_WideInt offset, int mode); #endif #ifndef Tcl_Tell_TCL_DECLARED #define Tcl_Tell_TCL_DECLARED /* 492 */ -EXTERN Tcl_WideInt Tcl_Tell(Tcl_Channel chan); +EXTERN Tcl_WideInt Tcl_Tell (Tcl_Channel chan); #endif #ifndef Tcl_ChannelWideSeekProc_TCL_DECLARED #define Tcl_ChannelWideSeekProc_TCL_DECLARED /* 493 */ -EXTERN Tcl_DriverWideSeekProc * Tcl_ChannelWideSeekProc( - CONST Tcl_ChannelType *chanTypePtr); +EXTERN Tcl_DriverWideSeekProc * Tcl_ChannelWideSeekProc ( + CONST Tcl_ChannelType * chanTypePtr); #endif #ifndef Tcl_DictObjPut_TCL_DECLARED #define Tcl_DictObjPut_TCL_DECLARED /* 494 */ -EXTERN int Tcl_DictObjPut(Tcl_Interp *interp, Tcl_Obj *dictPtr, - Tcl_Obj *keyPtr, Tcl_Obj *valuePtr); +EXTERN int Tcl_DictObjPut (Tcl_Interp * interp, + Tcl_Obj * dictPtr, Tcl_Obj * keyPtr, + Tcl_Obj * valuePtr); #endif #ifndef Tcl_DictObjGet_TCL_DECLARED #define Tcl_DictObjGet_TCL_DECLARED /* 495 */ -EXTERN int Tcl_DictObjGet(Tcl_Interp *interp, Tcl_Obj *dictPtr, - Tcl_Obj *keyPtr, Tcl_Obj **valuePtrPtr); +EXTERN int Tcl_DictObjGet (Tcl_Interp * interp, + Tcl_Obj * dictPtr, Tcl_Obj * keyPtr, + Tcl_Obj ** valuePtrPtr); #endif #ifndef Tcl_DictObjRemove_TCL_DECLARED #define Tcl_DictObjRemove_TCL_DECLARED /* 496 */ -EXTERN int Tcl_DictObjRemove(Tcl_Interp *interp, - Tcl_Obj *dictPtr, Tcl_Obj *keyPtr); +EXTERN int Tcl_DictObjRemove (Tcl_Interp * interp, + Tcl_Obj * dictPtr, Tcl_Obj * keyPtr); #endif #ifndef Tcl_DictObjSize_TCL_DECLARED #define Tcl_DictObjSize_TCL_DECLARED /* 497 */ -EXTERN int Tcl_DictObjSize(Tcl_Interp *interp, Tcl_Obj *dictPtr, - int *sizePtr); +EXTERN int Tcl_DictObjSize (Tcl_Interp * interp, + Tcl_Obj * dictPtr, int * sizePtr); #endif #ifndef Tcl_DictObjFirst_TCL_DECLARED #define Tcl_DictObjFirst_TCL_DECLARED /* 498 */ -EXTERN int Tcl_DictObjFirst(Tcl_Interp *interp, - Tcl_Obj *dictPtr, Tcl_DictSearch *searchPtr, - Tcl_Obj **keyPtrPtr, Tcl_Obj **valuePtrPtr, - int *donePtr); +EXTERN int Tcl_DictObjFirst (Tcl_Interp * interp, + Tcl_Obj * dictPtr, + Tcl_DictSearch * searchPtr, + Tcl_Obj ** keyPtrPtr, Tcl_Obj ** valuePtrPtr, + int * donePtr); #endif #ifndef Tcl_DictObjNext_TCL_DECLARED #define Tcl_DictObjNext_TCL_DECLARED /* 499 */ -EXTERN void Tcl_DictObjNext(Tcl_DictSearch *searchPtr, - Tcl_Obj **keyPtrPtr, Tcl_Obj **valuePtrPtr, - int *donePtr); +EXTERN void Tcl_DictObjNext (Tcl_DictSearch * searchPtr, + Tcl_Obj ** keyPtrPtr, Tcl_Obj ** valuePtrPtr, + int * donePtr); #endif #ifndef Tcl_DictObjDone_TCL_DECLARED #define Tcl_DictObjDone_TCL_DECLARED /* 500 */ -EXTERN void Tcl_DictObjDone(Tcl_DictSearch *searchPtr); +EXTERN void Tcl_DictObjDone (Tcl_DictSearch * searchPtr); #endif #ifndef Tcl_DictObjPutKeyList_TCL_DECLARED #define Tcl_DictObjPutKeyList_TCL_DECLARED /* 501 */ -EXTERN int Tcl_DictObjPutKeyList(Tcl_Interp *interp, - Tcl_Obj *dictPtr, int keyc, - Tcl_Obj *CONST *keyv, Tcl_Obj *valuePtr); +EXTERN int Tcl_DictObjPutKeyList (Tcl_Interp * interp, + Tcl_Obj * dictPtr, int keyc, + Tcl_Obj *CONST * keyv, Tcl_Obj * valuePtr); #endif #ifndef Tcl_DictObjRemoveKeyList_TCL_DECLARED #define Tcl_DictObjRemoveKeyList_TCL_DECLARED /* 502 */ -EXTERN int Tcl_DictObjRemoveKeyList(Tcl_Interp *interp, - Tcl_Obj *dictPtr, int keyc, - Tcl_Obj *CONST *keyv); +EXTERN int Tcl_DictObjRemoveKeyList (Tcl_Interp * interp, + Tcl_Obj * dictPtr, int keyc, + Tcl_Obj *CONST * keyv); #endif #ifndef Tcl_NewDictObj_TCL_DECLARED #define Tcl_NewDictObj_TCL_DECLARED /* 503 */ -EXTERN Tcl_Obj * Tcl_NewDictObj(void); +EXTERN Tcl_Obj * Tcl_NewDictObj (void); #endif #ifndef Tcl_DbNewDictObj_TCL_DECLARED #define Tcl_DbNewDictObj_TCL_DECLARED /* 504 */ -EXTERN Tcl_Obj * Tcl_DbNewDictObj(CONST char *file, int line); +EXTERN Tcl_Obj * Tcl_DbNewDictObj (CONST char * file, int line); #endif #ifndef Tcl_RegisterConfig_TCL_DECLARED #define Tcl_RegisterConfig_TCL_DECLARED /* 505 */ -EXTERN void Tcl_RegisterConfig(Tcl_Interp *interp, - CONST char *pkgName, - Tcl_Config *configuration, - CONST char *valEncoding); +EXTERN void Tcl_RegisterConfig (Tcl_Interp* interp, + CONST char* pkgName, + Tcl_Config* configuration, + CONST char* valEncoding); #endif #ifndef Tcl_CreateNamespace_TCL_DECLARED #define Tcl_CreateNamespace_TCL_DECLARED /* 506 */ -EXTERN Tcl_Namespace * Tcl_CreateNamespace(Tcl_Interp *interp, - CONST char *name, ClientData clientData, - Tcl_NamespaceDeleteProc *deleteProc); +EXTERN Tcl_Namespace * Tcl_CreateNamespace (Tcl_Interp * interp, + CONST char * name, ClientData clientData, + Tcl_NamespaceDeleteProc * deleteProc); #endif #ifndef Tcl_DeleteNamespace_TCL_DECLARED #define Tcl_DeleteNamespace_TCL_DECLARED /* 507 */ -EXTERN void Tcl_DeleteNamespace(Tcl_Namespace *nsPtr); +EXTERN void Tcl_DeleteNamespace (Tcl_Namespace * nsPtr); #endif #ifndef Tcl_AppendExportList_TCL_DECLARED #define Tcl_AppendExportList_TCL_DECLARED /* 508 */ -EXTERN int Tcl_AppendExportList(Tcl_Interp *interp, - Tcl_Namespace *nsPtr, Tcl_Obj *objPtr); +EXTERN int Tcl_AppendExportList (Tcl_Interp * interp, + Tcl_Namespace * nsPtr, Tcl_Obj * objPtr); #endif #ifndef Tcl_Export_TCL_DECLARED #define Tcl_Export_TCL_DECLARED /* 509 */ -EXTERN int Tcl_Export(Tcl_Interp *interp, Tcl_Namespace *nsPtr, - CONST char *pattern, int resetListFirst); +EXTERN int Tcl_Export (Tcl_Interp * interp, + Tcl_Namespace * nsPtr, CONST char * pattern, + int resetListFirst); #endif #ifndef Tcl_Import_TCL_DECLARED #define Tcl_Import_TCL_DECLARED /* 510 */ -EXTERN int Tcl_Import(Tcl_Interp *interp, Tcl_Namespace *nsPtr, - CONST char *pattern, int allowOverwrite); +EXTERN int Tcl_Import (Tcl_Interp * interp, + Tcl_Namespace * nsPtr, CONST char * pattern, + int allowOverwrite); #endif #ifndef Tcl_ForgetImport_TCL_DECLARED #define Tcl_ForgetImport_TCL_DECLARED /* 511 */ -EXTERN int Tcl_ForgetImport(Tcl_Interp *interp, - Tcl_Namespace *nsPtr, CONST char *pattern); +EXTERN int Tcl_ForgetImport (Tcl_Interp * interp, + Tcl_Namespace * nsPtr, CONST char * pattern); #endif #ifndef Tcl_GetCurrentNamespace_TCL_DECLARED #define Tcl_GetCurrentNamespace_TCL_DECLARED /* 512 */ -EXTERN Tcl_Namespace * Tcl_GetCurrentNamespace(Tcl_Interp *interp); +EXTERN Tcl_Namespace * Tcl_GetCurrentNamespace (Tcl_Interp * interp); #endif #ifndef Tcl_GetGlobalNamespace_TCL_DECLARED #define Tcl_GetGlobalNamespace_TCL_DECLARED /* 513 */ -EXTERN Tcl_Namespace * Tcl_GetGlobalNamespace(Tcl_Interp *interp); +EXTERN Tcl_Namespace * Tcl_GetGlobalNamespace (Tcl_Interp * interp); #endif #ifndef Tcl_FindNamespace_TCL_DECLARED #define Tcl_FindNamespace_TCL_DECLARED /* 514 */ -EXTERN Tcl_Namespace * Tcl_FindNamespace(Tcl_Interp *interp, - CONST char *name, - Tcl_Namespace *contextNsPtr, int flags); +EXTERN Tcl_Namespace * Tcl_FindNamespace (Tcl_Interp * interp, + CONST char * name, + Tcl_Namespace * contextNsPtr, int flags); #endif #ifndef Tcl_FindCommand_TCL_DECLARED #define Tcl_FindCommand_TCL_DECLARED /* 515 */ -EXTERN Tcl_Command Tcl_FindCommand(Tcl_Interp *interp, CONST char *name, - Tcl_Namespace *contextNsPtr, int flags); +EXTERN Tcl_Command Tcl_FindCommand (Tcl_Interp * interp, + CONST char * name, + Tcl_Namespace * contextNsPtr, int flags); #endif #ifndef Tcl_GetCommandFromObj_TCL_DECLARED #define Tcl_GetCommandFromObj_TCL_DECLARED /* 516 */ -EXTERN Tcl_Command Tcl_GetCommandFromObj(Tcl_Interp *interp, - Tcl_Obj *objPtr); +EXTERN Tcl_Command Tcl_GetCommandFromObj (Tcl_Interp * interp, + Tcl_Obj * objPtr); #endif #ifndef Tcl_GetCommandFullName_TCL_DECLARED #define Tcl_GetCommandFullName_TCL_DECLARED /* 517 */ -EXTERN void Tcl_GetCommandFullName(Tcl_Interp *interp, - Tcl_Command command, Tcl_Obj *objPtr); +EXTERN void Tcl_GetCommandFullName (Tcl_Interp * interp, + Tcl_Command command, Tcl_Obj * objPtr); #endif #ifndef Tcl_FSEvalFileEx_TCL_DECLARED #define Tcl_FSEvalFileEx_TCL_DECLARED /* 518 */ -EXTERN int Tcl_FSEvalFileEx(Tcl_Interp *interp, - Tcl_Obj *fileName, CONST char *encodingName); +EXTERN int Tcl_FSEvalFileEx (Tcl_Interp * interp, + Tcl_Obj * fileName, + CONST char * encodingName); #endif #ifndef Tcl_SetExitProc_TCL_DECLARED #define Tcl_SetExitProc_TCL_DECLARED /* 519 */ -EXTERN Tcl_ExitProc * Tcl_SetExitProc(Tcl_ExitProc *proc); +EXTERN Tcl_ExitProc * Tcl_SetExitProc (Tcl_ExitProc * proc); #endif #ifndef Tcl_LimitAddHandler_TCL_DECLARED #define Tcl_LimitAddHandler_TCL_DECLARED /* 520 */ -EXTERN void Tcl_LimitAddHandler(Tcl_Interp *interp, int type, - Tcl_LimitHandlerProc *handlerProc, - ClientData clientData, - Tcl_LimitHandlerDeleteProc *deleteProc); +EXTERN void Tcl_LimitAddHandler (Tcl_Interp * interp, int type, + Tcl_LimitHandlerProc * handlerProc, + ClientData clientData, + Tcl_LimitHandlerDeleteProc * deleteProc); #endif #ifndef Tcl_LimitRemoveHandler_TCL_DECLARED #define Tcl_LimitRemoveHandler_TCL_DECLARED /* 521 */ -EXTERN void Tcl_LimitRemoveHandler(Tcl_Interp *interp, int type, - Tcl_LimitHandlerProc *handlerProc, +EXTERN void Tcl_LimitRemoveHandler (Tcl_Interp * interp, + int type, Tcl_LimitHandlerProc * handlerProc, ClientData clientData); #endif #ifndef Tcl_LimitReady_TCL_DECLARED #define Tcl_LimitReady_TCL_DECLARED /* 522 */ -EXTERN int Tcl_LimitReady(Tcl_Interp *interp); +EXTERN int Tcl_LimitReady (Tcl_Interp * interp); #endif #ifndef Tcl_LimitCheck_TCL_DECLARED #define Tcl_LimitCheck_TCL_DECLARED /* 523 */ -EXTERN int Tcl_LimitCheck(Tcl_Interp *interp); +EXTERN int Tcl_LimitCheck (Tcl_Interp * interp); #endif #ifndef Tcl_LimitExceeded_TCL_DECLARED #define Tcl_LimitExceeded_TCL_DECLARED /* 524 */ -EXTERN int Tcl_LimitExceeded(Tcl_Interp *interp); +EXTERN int Tcl_LimitExceeded (Tcl_Interp * interp); #endif #ifndef Tcl_LimitSetCommands_TCL_DECLARED #define Tcl_LimitSetCommands_TCL_DECLARED /* 525 */ -EXTERN void Tcl_LimitSetCommands(Tcl_Interp *interp, +EXTERN void Tcl_LimitSetCommands (Tcl_Interp * interp, int commandLimit); #endif #ifndef Tcl_LimitSetTime_TCL_DECLARED #define Tcl_LimitSetTime_TCL_DECLARED /* 526 */ -EXTERN void Tcl_LimitSetTime(Tcl_Interp *interp, - Tcl_Time *timeLimitPtr); +EXTERN void Tcl_LimitSetTime (Tcl_Interp * interp, + Tcl_Time * timeLimitPtr); #endif #ifndef Tcl_LimitSetGranularity_TCL_DECLARED #define Tcl_LimitSetGranularity_TCL_DECLARED /* 527 */ -EXTERN void Tcl_LimitSetGranularity(Tcl_Interp *interp, int type, - int granularity); +EXTERN void Tcl_LimitSetGranularity (Tcl_Interp * interp, + int type, int granularity); #endif #ifndef Tcl_LimitTypeEnabled_TCL_DECLARED #define Tcl_LimitTypeEnabled_TCL_DECLARED /* 528 */ -EXTERN int Tcl_LimitTypeEnabled(Tcl_Interp *interp, int type); +EXTERN int Tcl_LimitTypeEnabled (Tcl_Interp * interp, int type); #endif #ifndef Tcl_LimitTypeExceeded_TCL_DECLARED #define Tcl_LimitTypeExceeded_TCL_DECLARED /* 529 */ -EXTERN int Tcl_LimitTypeExceeded(Tcl_Interp *interp, int type); +EXTERN int Tcl_LimitTypeExceeded (Tcl_Interp * interp, int type); #endif #ifndef Tcl_LimitTypeSet_TCL_DECLARED #define Tcl_LimitTypeSet_TCL_DECLARED /* 530 */ -EXTERN void Tcl_LimitTypeSet(Tcl_Interp *interp, int type); +EXTERN void Tcl_LimitTypeSet (Tcl_Interp * interp, int type); #endif #ifndef Tcl_LimitTypeReset_TCL_DECLARED #define Tcl_LimitTypeReset_TCL_DECLARED /* 531 */ -EXTERN void Tcl_LimitTypeReset(Tcl_Interp *interp, int type); +EXTERN void Tcl_LimitTypeReset (Tcl_Interp * interp, int type); #endif #ifndef Tcl_LimitGetCommands_TCL_DECLARED #define Tcl_LimitGetCommands_TCL_DECLARED /* 532 */ -EXTERN int Tcl_LimitGetCommands(Tcl_Interp *interp); +EXTERN int Tcl_LimitGetCommands (Tcl_Interp * interp); #endif #ifndef Tcl_LimitGetTime_TCL_DECLARED #define Tcl_LimitGetTime_TCL_DECLARED /* 533 */ -EXTERN void Tcl_LimitGetTime(Tcl_Interp *interp, - Tcl_Time *timeLimitPtr); +EXTERN void Tcl_LimitGetTime (Tcl_Interp * interp, + Tcl_Time * timeLimitPtr); #endif #ifndef Tcl_LimitGetGranularity_TCL_DECLARED #define Tcl_LimitGetGranularity_TCL_DECLARED /* 534 */ -EXTERN int Tcl_LimitGetGranularity(Tcl_Interp *interp, int type); +EXTERN int Tcl_LimitGetGranularity (Tcl_Interp * interp, + int type); #endif #ifndef Tcl_SaveInterpState_TCL_DECLARED #define Tcl_SaveInterpState_TCL_DECLARED /* 535 */ -EXTERN Tcl_InterpState Tcl_SaveInterpState(Tcl_Interp *interp, int status); +EXTERN Tcl_InterpState Tcl_SaveInterpState (Tcl_Interp * interp, int status); #endif #ifndef Tcl_RestoreInterpState_TCL_DECLARED #define Tcl_RestoreInterpState_TCL_DECLARED /* 536 */ -EXTERN int Tcl_RestoreInterpState(Tcl_Interp *interp, +EXTERN int Tcl_RestoreInterpState (Tcl_Interp * interp, Tcl_InterpState state); #endif #ifndef Tcl_DiscardInterpState_TCL_DECLARED #define Tcl_DiscardInterpState_TCL_DECLARED /* 537 */ -EXTERN void Tcl_DiscardInterpState(Tcl_InterpState state); +EXTERN void Tcl_DiscardInterpState (Tcl_InterpState state); #endif #ifndef Tcl_SetReturnOptions_TCL_DECLARED #define Tcl_SetReturnOptions_TCL_DECLARED /* 538 */ -EXTERN int Tcl_SetReturnOptions(Tcl_Interp *interp, - Tcl_Obj *options); +EXTERN int Tcl_SetReturnOptions (Tcl_Interp * interp, + Tcl_Obj * options); #endif #ifndef Tcl_GetReturnOptions_TCL_DECLARED #define Tcl_GetReturnOptions_TCL_DECLARED /* 539 */ -EXTERN Tcl_Obj * Tcl_GetReturnOptions(Tcl_Interp *interp, int result); +EXTERN Tcl_Obj * Tcl_GetReturnOptions (Tcl_Interp * interp, + int result); #endif #ifndef Tcl_IsEnsemble_TCL_DECLARED #define Tcl_IsEnsemble_TCL_DECLARED /* 540 */ -EXTERN int Tcl_IsEnsemble(Tcl_Command token); +EXTERN int Tcl_IsEnsemble (Tcl_Command token); #endif #ifndef Tcl_CreateEnsemble_TCL_DECLARED #define Tcl_CreateEnsemble_TCL_DECLARED /* 541 */ -EXTERN Tcl_Command Tcl_CreateEnsemble(Tcl_Interp *interp, - CONST char *name, - Tcl_Namespace *namespacePtr, int flags); +EXTERN Tcl_Command Tcl_CreateEnsemble (Tcl_Interp * interp, + CONST char * name, + Tcl_Namespace * namespacePtr, int flags); #endif #ifndef Tcl_FindEnsemble_TCL_DECLARED #define Tcl_FindEnsemble_TCL_DECLARED /* 542 */ -EXTERN Tcl_Command Tcl_FindEnsemble(Tcl_Interp *interp, - Tcl_Obj *cmdNameObj, int flags); +EXTERN Tcl_Command Tcl_FindEnsemble (Tcl_Interp * interp, + Tcl_Obj * cmdNameObj, int flags); #endif #ifndef Tcl_SetEnsembleSubcommandList_TCL_DECLARED #define Tcl_SetEnsembleSubcommandList_TCL_DECLARED /* 543 */ -EXTERN int Tcl_SetEnsembleSubcommandList(Tcl_Interp *interp, - Tcl_Command token, Tcl_Obj *subcmdList); +EXTERN int Tcl_SetEnsembleSubcommandList (Tcl_Interp * interp, + Tcl_Command token, Tcl_Obj * subcmdList); #endif #ifndef Tcl_SetEnsembleMappingDict_TCL_DECLARED #define Tcl_SetEnsembleMappingDict_TCL_DECLARED /* 544 */ -EXTERN int Tcl_SetEnsembleMappingDict(Tcl_Interp *interp, - Tcl_Command token, Tcl_Obj *mapDict); +EXTERN int Tcl_SetEnsembleMappingDict (Tcl_Interp * interp, + Tcl_Command token, Tcl_Obj * mapDict); #endif #ifndef Tcl_SetEnsembleUnknownHandler_TCL_DECLARED #define Tcl_SetEnsembleUnknownHandler_TCL_DECLARED /* 545 */ -EXTERN int Tcl_SetEnsembleUnknownHandler(Tcl_Interp *interp, - Tcl_Command token, Tcl_Obj *unknownList); +EXTERN int Tcl_SetEnsembleUnknownHandler (Tcl_Interp * interp, + Tcl_Command token, Tcl_Obj * unknownList); #endif #ifndef Tcl_SetEnsembleFlags_TCL_DECLARED #define Tcl_SetEnsembleFlags_TCL_DECLARED /* 546 */ -EXTERN int Tcl_SetEnsembleFlags(Tcl_Interp *interp, +EXTERN int Tcl_SetEnsembleFlags (Tcl_Interp * interp, Tcl_Command token, int flags); #endif #ifndef Tcl_GetEnsembleSubcommandList_TCL_DECLARED #define Tcl_GetEnsembleSubcommandList_TCL_DECLARED /* 547 */ -EXTERN int Tcl_GetEnsembleSubcommandList(Tcl_Interp *interp, - Tcl_Command token, Tcl_Obj **subcmdListPtr); +EXTERN int Tcl_GetEnsembleSubcommandList (Tcl_Interp * interp, + Tcl_Command token, Tcl_Obj ** subcmdListPtr); #endif #ifndef Tcl_GetEnsembleMappingDict_TCL_DECLARED #define Tcl_GetEnsembleMappingDict_TCL_DECLARED /* 548 */ -EXTERN int Tcl_GetEnsembleMappingDict(Tcl_Interp *interp, - Tcl_Command token, Tcl_Obj **mapDictPtr); +EXTERN int Tcl_GetEnsembleMappingDict (Tcl_Interp * interp, + Tcl_Command token, Tcl_Obj ** mapDictPtr); #endif #ifndef Tcl_GetEnsembleUnknownHandler_TCL_DECLARED #define Tcl_GetEnsembleUnknownHandler_TCL_DECLARED /* 549 */ -EXTERN int Tcl_GetEnsembleUnknownHandler(Tcl_Interp *interp, - Tcl_Command token, Tcl_Obj **unknownListPtr); +EXTERN int Tcl_GetEnsembleUnknownHandler (Tcl_Interp * interp, + Tcl_Command token, Tcl_Obj ** unknownListPtr); #endif #ifndef Tcl_GetEnsembleFlags_TCL_DECLARED #define Tcl_GetEnsembleFlags_TCL_DECLARED /* 550 */ -EXTERN int Tcl_GetEnsembleFlags(Tcl_Interp *interp, - Tcl_Command token, int *flagsPtr); +EXTERN int Tcl_GetEnsembleFlags (Tcl_Interp * interp, + Tcl_Command token, int * flagsPtr); #endif #ifndef Tcl_GetEnsembleNamespace_TCL_DECLARED #define Tcl_GetEnsembleNamespace_TCL_DECLARED /* 551 */ -EXTERN int Tcl_GetEnsembleNamespace(Tcl_Interp *interp, - Tcl_Command token, - Tcl_Namespace **namespacePtrPtr); +EXTERN int Tcl_GetEnsembleNamespace (Tcl_Interp * interp, + Tcl_Command token, + Tcl_Namespace ** namespacePtrPtr); #endif #ifndef Tcl_SetTimeProc_TCL_DECLARED #define Tcl_SetTimeProc_TCL_DECLARED /* 552 */ -EXTERN void Tcl_SetTimeProc(Tcl_GetTimeProc *getProc, - Tcl_ScaleTimeProc *scaleProc, +EXTERN void Tcl_SetTimeProc (Tcl_GetTimeProc* getProc, + Tcl_ScaleTimeProc* scaleProc, ClientData clientData); #endif #ifndef Tcl_QueryTimeProc_TCL_DECLARED #define Tcl_QueryTimeProc_TCL_DECLARED /* 553 */ -EXTERN void Tcl_QueryTimeProc(Tcl_GetTimeProc **getProc, - Tcl_ScaleTimeProc **scaleProc, - ClientData *clientData); +EXTERN void Tcl_QueryTimeProc (Tcl_GetTimeProc** getProc, + Tcl_ScaleTimeProc** scaleProc, + ClientData* clientData); #endif #ifndef Tcl_ChannelThreadActionProc_TCL_DECLARED #define Tcl_ChannelThreadActionProc_TCL_DECLARED /* 554 */ -EXTERN Tcl_DriverThreadActionProc * Tcl_ChannelThreadActionProc( - CONST Tcl_ChannelType *chanTypePtr); +EXTERN Tcl_DriverThreadActionProc * Tcl_ChannelThreadActionProc ( + CONST Tcl_ChannelType * chanTypePtr); #endif #ifndef Tcl_NewBignumObj_TCL_DECLARED #define Tcl_NewBignumObj_TCL_DECLARED /* 555 */ -EXTERN Tcl_Obj * Tcl_NewBignumObj(mp_int *value); +EXTERN Tcl_Obj* Tcl_NewBignumObj (mp_int* value); #endif #ifndef Tcl_DbNewBignumObj_TCL_DECLARED #define Tcl_DbNewBignumObj_TCL_DECLARED /* 556 */ -EXTERN Tcl_Obj * Tcl_DbNewBignumObj(mp_int *value, CONST char *file, +EXTERN Tcl_Obj* Tcl_DbNewBignumObj (mp_int* value, CONST char* file, int line); #endif #ifndef Tcl_SetBignumObj_TCL_DECLARED #define Tcl_SetBignumObj_TCL_DECLARED /* 557 */ -EXTERN void Tcl_SetBignumObj(Tcl_Obj *obj, mp_int *value); +EXTERN void Tcl_SetBignumObj (Tcl_Obj* obj, mp_int* value); #endif #ifndef Tcl_GetBignumFromObj_TCL_DECLARED #define Tcl_GetBignumFromObj_TCL_DECLARED /* 558 */ -EXTERN int Tcl_GetBignumFromObj(Tcl_Interp *interp, - Tcl_Obj *obj, mp_int *value); +EXTERN int Tcl_GetBignumFromObj (Tcl_Interp* interp, + Tcl_Obj* obj, mp_int* value); #endif #ifndef Tcl_TakeBignumFromObj_TCL_DECLARED #define Tcl_TakeBignumFromObj_TCL_DECLARED /* 559 */ -EXTERN int Tcl_TakeBignumFromObj(Tcl_Interp *interp, - Tcl_Obj *obj, mp_int *value); +EXTERN int Tcl_TakeBignumFromObj (Tcl_Interp* interp, + Tcl_Obj* obj, mp_int* value); #endif #ifndef Tcl_TruncateChannel_TCL_DECLARED #define Tcl_TruncateChannel_TCL_DECLARED /* 560 */ -EXTERN int Tcl_TruncateChannel(Tcl_Channel chan, +EXTERN int Tcl_TruncateChannel (Tcl_Channel chan, Tcl_WideInt length); #endif #ifndef Tcl_ChannelTruncateProc_TCL_DECLARED #define Tcl_ChannelTruncateProc_TCL_DECLARED /* 561 */ -EXTERN Tcl_DriverTruncateProc * Tcl_ChannelTruncateProc( - CONST Tcl_ChannelType *chanTypePtr); +EXTERN Tcl_DriverTruncateProc * Tcl_ChannelTruncateProc ( + CONST Tcl_ChannelType * chanTypePtr); #endif #ifndef Tcl_SetChannelErrorInterp_TCL_DECLARED #define Tcl_SetChannelErrorInterp_TCL_DECLARED /* 562 */ -EXTERN void Tcl_SetChannelErrorInterp(Tcl_Interp *interp, - Tcl_Obj *msg); +EXTERN void Tcl_SetChannelErrorInterp (Tcl_Interp* interp, + Tcl_Obj* msg); #endif #ifndef Tcl_GetChannelErrorInterp_TCL_DECLARED #define Tcl_GetChannelErrorInterp_TCL_DECLARED /* 563 */ -EXTERN void Tcl_GetChannelErrorInterp(Tcl_Interp *interp, - Tcl_Obj **msg); +EXTERN void Tcl_GetChannelErrorInterp (Tcl_Interp* interp, + Tcl_Obj** msg); #endif #ifndef Tcl_SetChannelError_TCL_DECLARED #define Tcl_SetChannelError_TCL_DECLARED /* 564 */ -EXTERN void Tcl_SetChannelError(Tcl_Channel chan, Tcl_Obj *msg); +EXTERN void Tcl_SetChannelError (Tcl_Channel chan, Tcl_Obj* msg); #endif #ifndef Tcl_GetChannelError_TCL_DECLARED #define Tcl_GetChannelError_TCL_DECLARED /* 565 */ -EXTERN void Tcl_GetChannelError(Tcl_Channel chan, Tcl_Obj **msg); +EXTERN void Tcl_GetChannelError (Tcl_Channel chan, Tcl_Obj** msg); #endif #ifndef Tcl_InitBignumFromDouble_TCL_DECLARED #define Tcl_InitBignumFromDouble_TCL_DECLARED /* 566 */ -EXTERN int Tcl_InitBignumFromDouble(Tcl_Interp *interp, - double initval, mp_int *toInit); +EXTERN int Tcl_InitBignumFromDouble (Tcl_Interp* interp, + double initval, mp_int * toInit); #endif #ifndef Tcl_GetNamespaceUnknownHandler_TCL_DECLARED #define Tcl_GetNamespaceUnknownHandler_TCL_DECLARED /* 567 */ -EXTERN Tcl_Obj * Tcl_GetNamespaceUnknownHandler(Tcl_Interp *interp, - Tcl_Namespace *nsPtr); +EXTERN Tcl_Obj * Tcl_GetNamespaceUnknownHandler (Tcl_Interp * interp, + Tcl_Namespace * nsPtr); #endif #ifndef Tcl_SetNamespaceUnknownHandler_TCL_DECLARED #define Tcl_SetNamespaceUnknownHandler_TCL_DECLARED /* 568 */ -EXTERN int Tcl_SetNamespaceUnknownHandler(Tcl_Interp *interp, - Tcl_Namespace *nsPtr, Tcl_Obj *handlerPtr); +EXTERN int Tcl_SetNamespaceUnknownHandler (Tcl_Interp * interp, + Tcl_Namespace * nsPtr, Tcl_Obj * handlerPtr); #endif #ifndef Tcl_GetEncodingFromObj_TCL_DECLARED #define Tcl_GetEncodingFromObj_TCL_DECLARED /* 569 */ -EXTERN int Tcl_GetEncodingFromObj(Tcl_Interp *interp, - Tcl_Obj *objPtr, Tcl_Encoding *encodingPtr); +EXTERN int Tcl_GetEncodingFromObj (Tcl_Interp* interp, + Tcl_Obj* objPtr, Tcl_Encoding* encodingPtr); #endif #ifndef Tcl_GetEncodingSearchPath_TCL_DECLARED #define Tcl_GetEncodingSearchPath_TCL_DECLARED /* 570 */ -EXTERN Tcl_Obj * Tcl_GetEncodingSearchPath(void); +EXTERN Tcl_Obj* Tcl_GetEncodingSearchPath (void); #endif #ifndef Tcl_SetEncodingSearchPath_TCL_DECLARED #define Tcl_SetEncodingSearchPath_TCL_DECLARED /* 571 */ -EXTERN int Tcl_SetEncodingSearchPath(Tcl_Obj *searchPath); +EXTERN int Tcl_SetEncodingSearchPath (Tcl_Obj* searchPath); #endif #ifndef Tcl_GetEncodingNameFromEnvironment_TCL_DECLARED #define Tcl_GetEncodingNameFromEnvironment_TCL_DECLARED /* 572 */ -EXTERN CONST char * Tcl_GetEncodingNameFromEnvironment( - Tcl_DString *bufPtr); +EXTERN CONST char * Tcl_GetEncodingNameFromEnvironment ( + Tcl_DString* bufPtr); #endif #ifndef Tcl_PkgRequireProc_TCL_DECLARED #define Tcl_PkgRequireProc_TCL_DECLARED /* 573 */ -EXTERN int Tcl_PkgRequireProc(Tcl_Interp *interp, - CONST char *name, int objc, - Tcl_Obj *CONST objv[], - ClientData *clientDataPtr); +EXTERN int Tcl_PkgRequireProc (Tcl_Interp * interp, + CONST char * name, int objc, + Tcl_Obj *CONST objv[], + ClientData * clientDataPtr); #endif #ifndef Tcl_AppendObjToErrorInfo_TCL_DECLARED #define Tcl_AppendObjToErrorInfo_TCL_DECLARED /* 574 */ -EXTERN void Tcl_AppendObjToErrorInfo(Tcl_Interp *interp, - Tcl_Obj *objPtr); +EXTERN void Tcl_AppendObjToErrorInfo (Tcl_Interp * interp, + Tcl_Obj * objPtr); #endif #ifndef Tcl_AppendLimitedToObj_TCL_DECLARED #define Tcl_AppendLimitedToObj_TCL_DECLARED /* 575 */ -EXTERN void Tcl_AppendLimitedToObj(Tcl_Obj *objPtr, - CONST char *bytes, int length, int limit, - CONST char *ellipsis); +EXTERN void Tcl_AppendLimitedToObj (Tcl_Obj * objPtr, + CONST char * bytes, int length, int limit, + CONST char * ellipsis); #endif #ifndef Tcl_Format_TCL_DECLARED #define Tcl_Format_TCL_DECLARED /* 576 */ -EXTERN Tcl_Obj * Tcl_Format(Tcl_Interp *interp, CONST char *format, - int objc, Tcl_Obj *CONST objv[]); +EXTERN Tcl_Obj * Tcl_Format (Tcl_Interp * interp, CONST char * format, + int objc, Tcl_Obj * CONST objv[]); #endif #ifndef Tcl_AppendFormatToObj_TCL_DECLARED #define Tcl_AppendFormatToObj_TCL_DECLARED /* 577 */ -EXTERN int Tcl_AppendFormatToObj(Tcl_Interp *interp, - Tcl_Obj *objPtr, CONST char *format, - int objc, Tcl_Obj *CONST objv[]); +EXTERN int Tcl_AppendFormatToObj (Tcl_Interp * interp, + Tcl_Obj * objPtr, CONST char * format, + int objc, Tcl_Obj * CONST objv[]); #endif #ifndef Tcl_ObjPrintf_TCL_DECLARED #define Tcl_ObjPrintf_TCL_DECLARED /* 578 */ -EXTERN Tcl_Obj * Tcl_ObjPrintf(CONST char *format, ...); +EXTERN Tcl_Obj * Tcl_ObjPrintf (CONST char * format, ...); #endif #ifndef Tcl_AppendPrintfToObj_TCL_DECLARED #define Tcl_AppendPrintfToObj_TCL_DECLARED /* 579 */ -EXTERN void Tcl_AppendPrintfToObj(Tcl_Obj *objPtr, - CONST char *format, ...); +EXTERN void Tcl_AppendPrintfToObj (Tcl_Obj * objPtr, + CONST char * format, ...); #endif typedef struct TclStubHooks { @@ -3421,23 +3512,23 @@ typedef struct TclStubs { int magic; struct TclStubHooks *hooks; - int (*tcl_PkgProvideEx) (Tcl_Interp *interp, CONST char *name, CONST char *version, ClientData clientData); /* 0 */ - CONST84_RETURN char * (*tcl_PkgRequireEx) (Tcl_Interp *interp, CONST char *name, CONST char *version, int exact, ClientData *clientDataPtr); /* 1 */ - void (*tcl_Panic) (CONST char *format, ...); /* 2 */ + int (*tcl_PkgProvideEx) (Tcl_Interp* interp, CONST char* name, CONST char* version, ClientData clientData); /* 0 */ + CONST84_RETURN char * (*tcl_PkgRequireEx) (Tcl_Interp * interp, CONST char * name, CONST char * version, int exact, ClientData * clientDataPtr); /* 1 */ + void (*tcl_Panic) (CONST char * format, ...); /* 2 */ char * (*tcl_Alloc) (unsigned int size); /* 3 */ - void (*tcl_Free) (char *ptr); /* 4 */ - char * (*tcl_Realloc) (char *ptr, unsigned int size); /* 5 */ - char * (*tcl_DbCkalloc) (unsigned int size, CONST char *file, int line); /* 6 */ - int (*tcl_DbCkfree) (char *ptr, CONST char *file, int line); /* 7 */ - char * (*tcl_DbCkrealloc) (char *ptr, unsigned int size, CONST char *file, int line); /* 8 */ + void (*tcl_Free) (char * ptr); /* 4 */ + char * (*tcl_Realloc) (char * ptr, unsigned int size); /* 5 */ + char * (*tcl_DbCkalloc) (unsigned int size, CONST char * file, int line); /* 6 */ + int (*tcl_DbCkfree) (char * ptr, CONST char * file, int line); /* 7 */ + char * (*tcl_DbCkrealloc) (char * ptr, unsigned int size, CONST char * file, int line); /* 8 */ #if !defined(__WIN32__) && !defined(MAC_OSX_TCL) /* UNIX */ - void (*tcl_CreateFileHandler) (int fd, int mask, Tcl_FileProc *proc, ClientData clientData); /* 9 */ + void (*tcl_CreateFileHandler) (int fd, int mask, Tcl_FileProc * proc, ClientData clientData); /* 9 */ #endif /* UNIX */ #ifdef __WIN32__ /* WIN */ void *reserved9; #endif /* WIN */ #ifdef MAC_OSX_TCL /* MACOSX */ - void (*tcl_CreateFileHandler) (int fd, int mask, Tcl_FileProc *proc, ClientData clientData); /* 9 */ + void (*tcl_CreateFileHandler) (int fd, int mask, Tcl_FileProc * proc, ClientData clientData); /* 9 */ #endif /* MACOSX */ #if !defined(__WIN32__) && !defined(MAC_OSX_TCL) /* UNIX */ void (*tcl_DeleteFileHandler) (int fd); /* 10 */ @@ -3448,346 +3539,370 @@ typedef struct TclStubs { #ifdef MAC_OSX_TCL /* MACOSX */ void (*tcl_DeleteFileHandler) (int fd); /* 10 */ #endif /* MACOSX */ - void (*tcl_SetTimer) (Tcl_Time *timePtr); /* 11 */ + void (*tcl_SetTimer) (Tcl_Time * timePtr); /* 11 */ void (*tcl_Sleep) (int ms); /* 12 */ - int (*tcl_WaitForEvent) (Tcl_Time *timePtr); /* 13 */ - int (*tcl_AppendAllObjTypes) (Tcl_Interp *interp, Tcl_Obj *objPtr); /* 14 */ - void (*tcl_AppendStringsToObj) (Tcl_Obj *objPtr, ...); /* 15 */ - void (*tcl_AppendToObj) (Tcl_Obj *objPtr, CONST char *bytes, int length); /* 16 */ + int (*tcl_WaitForEvent) (Tcl_Time * timePtr); /* 13 */ + int (*tcl_AppendAllObjTypes) (Tcl_Interp * interp, Tcl_Obj * objPtr); /* 14 */ + void (*tcl_AppendStringsToObj) (Tcl_Obj * objPtr, ...); /* 15 */ + void (*tcl_AppendToObj) (Tcl_Obj* objPtr, CONST char* bytes, int length); /* 16 */ Tcl_Obj * (*tcl_ConcatObj) (int objc, Tcl_Obj *CONST objv[]); /* 17 */ - int (*tcl_ConvertToType) (Tcl_Interp *interp, Tcl_Obj *objPtr, Tcl_ObjType *typePtr); /* 18 */ - void (*tcl_DbDecrRefCount) (Tcl_Obj *objPtr, CONST char *file, int line); /* 19 */ - void (*tcl_DbIncrRefCount) (Tcl_Obj *objPtr, CONST char *file, int line); /* 20 */ - int (*tcl_DbIsShared) (Tcl_Obj *objPtr, CONST char *file, int line); /* 21 */ - Tcl_Obj * (*tcl_DbNewBooleanObj) (int boolValue, CONST char *file, int line); /* 22 */ - Tcl_Obj * (*tcl_DbNewByteArrayObj) (CONST unsigned char *bytes, int length, CONST char *file, int line); /* 23 */ - Tcl_Obj * (*tcl_DbNewDoubleObj) (double doubleValue, CONST char *file, int line); /* 24 */ - Tcl_Obj * (*tcl_DbNewListObj) (int objc, Tcl_Obj *CONST *objv, CONST char *file, int line); /* 25 */ - Tcl_Obj * (*tcl_DbNewLongObj) (long longValue, CONST char *file, int line); /* 26 */ - Tcl_Obj * (*tcl_DbNewObj) (CONST char *file, int line); /* 27 */ - Tcl_Obj * (*tcl_DbNewStringObj) (CONST char *bytes, int length, CONST char *file, int line); /* 28 */ - Tcl_Obj * (*tcl_DuplicateObj) (Tcl_Obj *objPtr); /* 29 */ - void (*tclFreeObj) (Tcl_Obj *objPtr); /* 30 */ - int (*tcl_GetBoolean) (Tcl_Interp *interp, CONST char *src, int *boolPtr); /* 31 */ - int (*tcl_GetBooleanFromObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, int *boolPtr); /* 32 */ - unsigned char * (*tcl_GetByteArrayFromObj) (Tcl_Obj *objPtr, int *lengthPtr); /* 33 */ - int (*tcl_GetDouble) (Tcl_Interp *interp, CONST char *src, double *doublePtr); /* 34 */ - int (*tcl_GetDoubleFromObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, double *doublePtr); /* 35 */ - int (*tcl_GetIndexFromObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, CONST84 char **tablePtr, CONST char *msg, int flags, int *indexPtr); /* 36 */ - int (*tcl_GetInt) (Tcl_Interp *interp, CONST char *src, int *intPtr); /* 37 */ - int (*tcl_GetIntFromObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, int *intPtr); /* 38 */ - int (*tcl_GetLongFromObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, long *longPtr); /* 39 */ - Tcl_ObjType * (*tcl_GetObjType) (CONST char *typeName); /* 40 */ - char * (*tcl_GetStringFromObj) (Tcl_Obj *objPtr, int *lengthPtr); /* 41 */ - void (*tcl_InvalidateStringRep) (Tcl_Obj *objPtr); /* 42 */ - int (*tcl_ListObjAppendList) (Tcl_Interp *interp, Tcl_Obj *listPtr, Tcl_Obj *elemListPtr); /* 43 */ - int (*tcl_ListObjAppendElement) (Tcl_Interp *interp, Tcl_Obj *listPtr, Tcl_Obj *objPtr); /* 44 */ - int (*tcl_ListObjGetElements) (Tcl_Interp *interp, Tcl_Obj *listPtr, int *objcPtr, Tcl_Obj ***objvPtr); /* 45 */ - int (*tcl_ListObjIndex) (Tcl_Interp *interp, Tcl_Obj *listPtr, int index, Tcl_Obj **objPtrPtr); /* 46 */ - int (*tcl_ListObjLength) (Tcl_Interp *interp, Tcl_Obj *listPtr, int *lengthPtr); /* 47 */ - int (*tcl_ListObjReplace) (Tcl_Interp *interp, Tcl_Obj *listPtr, int first, int count, int objc, Tcl_Obj *CONST objv[]); /* 48 */ + int (*tcl_ConvertToType) (Tcl_Interp * interp, Tcl_Obj * objPtr, Tcl_ObjType * typePtr); /* 18 */ + void (*tcl_DbDecrRefCount) (Tcl_Obj * objPtr, CONST char * file, int line); /* 19 */ + void (*tcl_DbIncrRefCount) (Tcl_Obj * objPtr, CONST char * file, int line); /* 20 */ + int (*tcl_DbIsShared) (Tcl_Obj * objPtr, CONST char * file, int line); /* 21 */ + Tcl_Obj * (*tcl_DbNewBooleanObj) (int boolValue, CONST char * file, int line); /* 22 */ + Tcl_Obj * (*tcl_DbNewByteArrayObj) (CONST unsigned char * bytes, int length, CONST char * file, int line); /* 23 */ + Tcl_Obj * (*tcl_DbNewDoubleObj) (double doubleValue, CONST char * file, int line); /* 24 */ + Tcl_Obj * (*tcl_DbNewListObj) (int objc, Tcl_Obj *CONST * objv, CONST char * file, int line); /* 25 */ + Tcl_Obj * (*tcl_DbNewLongObj) (long longValue, CONST char * file, int line); /* 26 */ + Tcl_Obj * (*tcl_DbNewObj) (CONST char * file, int line); /* 27 */ + Tcl_Obj * (*tcl_DbNewStringObj) (CONST char * bytes, int length, CONST char * file, int line); /* 28 */ + Tcl_Obj * (*tcl_DuplicateObj) (Tcl_Obj * objPtr); /* 29 */ + void (*tclFreeObj) (Tcl_Obj * objPtr); /* 30 */ + int (*tcl_GetBoolean) (Tcl_Interp * interp, CONST char * src, int * boolPtr); /* 31 */ + int (*tcl_GetBooleanFromObj) (Tcl_Interp * interp, Tcl_Obj * objPtr, int * boolPtr); /* 32 */ + unsigned char * (*tcl_GetByteArrayFromObj) (Tcl_Obj * objPtr, int * lengthPtr); /* 33 */ + int (*tcl_GetDouble) (Tcl_Interp * interp, CONST char * src, double * doublePtr); /* 34 */ + int (*tcl_GetDoubleFromObj) (Tcl_Interp * interp, Tcl_Obj * objPtr, double * doublePtr); /* 35 */ + int (*tcl_GetIndexFromObj) (Tcl_Interp * interp, Tcl_Obj * objPtr, CONST84 char ** tablePtr, CONST char * msg, int flags, int * indexPtr); /* 36 */ + int (*tcl_GetInt) (Tcl_Interp * interp, CONST char * src, int * intPtr); /* 37 */ + int (*tcl_GetIntFromObj) (Tcl_Interp * interp, Tcl_Obj * objPtr, int * intPtr); /* 38 */ + int (*tcl_GetLongFromObj) (Tcl_Interp * interp, Tcl_Obj * objPtr, long * longPtr); /* 39 */ + Tcl_ObjType * (*tcl_GetObjType) (CONST char * typeName); /* 40 */ + char * (*tcl_GetStringFromObj) (Tcl_Obj * objPtr, int * lengthPtr); /* 41 */ + void (*tcl_InvalidateStringRep) (Tcl_Obj * objPtr); /* 42 */ + int (*tcl_ListObjAppendList) (Tcl_Interp * interp, Tcl_Obj * listPtr, Tcl_Obj * elemListPtr); /* 43 */ + int (*tcl_ListObjAppendElement) (Tcl_Interp * interp, Tcl_Obj * listPtr, Tcl_Obj * objPtr); /* 44 */ + int (*tcl_ListObjGetElements) (Tcl_Interp * interp, Tcl_Obj * listPtr, int * objcPtr, Tcl_Obj *** objvPtr); /* 45 */ + int (*tcl_ListObjIndex) (Tcl_Interp * interp, Tcl_Obj * listPtr, int index, Tcl_Obj ** objPtrPtr); /* 46 */ + int (*tcl_ListObjLength) (Tcl_Interp * interp, Tcl_Obj * listPtr, int * lengthPtr); /* 47 */ + int (*tcl_ListObjReplace) (Tcl_Interp * interp, Tcl_Obj * listPtr, int first, int count, int objc, Tcl_Obj *CONST objv[]); /* 48 */ Tcl_Obj * (*tcl_NewBooleanObj) (int boolValue); /* 49 */ - Tcl_Obj * (*tcl_NewByteArrayObj) (CONST unsigned char *bytes, int length); /* 50 */ + Tcl_Obj * (*tcl_NewByteArrayObj) (CONST unsigned char* bytes, int length); /* 50 */ Tcl_Obj * (*tcl_NewDoubleObj) (double doubleValue); /* 51 */ Tcl_Obj * (*tcl_NewIntObj) (int intValue); /* 52 */ Tcl_Obj * (*tcl_NewListObj) (int objc, Tcl_Obj *CONST objv[]); /* 53 */ Tcl_Obj * (*tcl_NewLongObj) (long longValue); /* 54 */ Tcl_Obj * (*tcl_NewObj) (void); /* 55 */ - Tcl_Obj * (*tcl_NewStringObj) (CONST char *bytes, int length); /* 56 */ - void (*tcl_SetBooleanObj) (Tcl_Obj *objPtr, int boolValue); /* 57 */ - unsigned char * (*tcl_SetByteArrayLength) (Tcl_Obj *objPtr, int length); /* 58 */ - void (*tcl_SetByteArrayObj) (Tcl_Obj *objPtr, CONST unsigned char *bytes, int length); /* 59 */ - void (*tcl_SetDoubleObj) (Tcl_Obj *objPtr, double doubleValue); /* 60 */ - void (*tcl_SetIntObj) (Tcl_Obj *objPtr, int intValue); /* 61 */ - void (*tcl_SetListObj) (Tcl_Obj *objPtr, int objc, Tcl_Obj *CONST objv[]); /* 62 */ - void (*tcl_SetLongObj) (Tcl_Obj *objPtr, long longValue); /* 63 */ - void (*tcl_SetObjLength) (Tcl_Obj *objPtr, int length); /* 64 */ - void (*tcl_SetStringObj) (Tcl_Obj *objPtr, CONST char *bytes, int length); /* 65 */ - void (*tcl_AddErrorInfo) (Tcl_Interp *interp, CONST char *message); /* 66 */ - void (*tcl_AddObjErrorInfo) (Tcl_Interp *interp, CONST char *message, int length); /* 67 */ - void (*tcl_AllowExceptions) (Tcl_Interp *interp); /* 68 */ - void (*tcl_AppendElement) (Tcl_Interp *interp, CONST char *element); /* 69 */ - void (*tcl_AppendResult) (Tcl_Interp *interp, ...); /* 70 */ - Tcl_AsyncHandler (*tcl_AsyncCreate) (Tcl_AsyncProc *proc, ClientData clientData); /* 71 */ + Tcl_Obj * (*tcl_NewStringObj) (CONST char * bytes, int length); /* 56 */ + void (*tcl_SetBooleanObj) (Tcl_Obj * objPtr, int boolValue); /* 57 */ + unsigned char * (*tcl_SetByteArrayLength) (Tcl_Obj * objPtr, int length); /* 58 */ + void (*tcl_SetByteArrayObj) (Tcl_Obj * objPtr, CONST unsigned char * bytes, int length); /* 59 */ + void (*tcl_SetDoubleObj) (Tcl_Obj * objPtr, double doubleValue); /* 60 */ + void (*tcl_SetIntObj) (Tcl_Obj * objPtr, int intValue); /* 61 */ + void (*tcl_SetListObj) (Tcl_Obj * objPtr, int objc, Tcl_Obj *CONST objv[]); /* 62 */ + void (*tcl_SetLongObj) (Tcl_Obj * objPtr, long longValue); /* 63 */ + void (*tcl_SetObjLength) (Tcl_Obj * objPtr, int length); /* 64 */ + void (*tcl_SetStringObj) (Tcl_Obj* objPtr, CONST char* bytes, int length); /* 65 */ + void (*tcl_AddErrorInfo) (Tcl_Interp * interp, CONST char * message); /* 66 */ + void (*tcl_AddObjErrorInfo) (Tcl_Interp * interp, CONST char * message, int length); /* 67 */ + void (*tcl_AllowExceptions) (Tcl_Interp * interp); /* 68 */ + void (*tcl_AppendElement) (Tcl_Interp * interp, CONST char * element); /* 69 */ + void (*tcl_AppendResult) (Tcl_Interp * interp, ...); /* 70 */ + Tcl_AsyncHandler (*tcl_AsyncCreate) (Tcl_AsyncProc * proc, ClientData clientData); /* 71 */ void (*tcl_AsyncDelete) (Tcl_AsyncHandler async); /* 72 */ - int (*tcl_AsyncInvoke) (Tcl_Interp *interp, int code); /* 73 */ + int (*tcl_AsyncInvoke) (Tcl_Interp * interp, int code); /* 73 */ void (*tcl_AsyncMark) (Tcl_AsyncHandler async); /* 74 */ int (*tcl_AsyncReady) (void); /* 75 */ - void (*tcl_BackgroundError) (Tcl_Interp *interp); /* 76 */ - char (*tcl_Backslash) (CONST char *src, int *readPtr); /* 77 */ - int (*tcl_BadChannelOption) (Tcl_Interp *interp, CONST char *optionName, CONST char *optionList); /* 78 */ - void (*tcl_CallWhenDeleted) (Tcl_Interp *interp, Tcl_InterpDeleteProc *proc, ClientData clientData); /* 79 */ - void (*tcl_CancelIdleCall) (Tcl_IdleProc *idleProc, ClientData clientData); /* 80 */ - int (*tcl_Close) (Tcl_Interp *interp, Tcl_Channel chan); /* 81 */ - int (*tcl_CommandComplete) (CONST char *cmd); /* 82 */ - char * (*tcl_Concat) (int argc, CONST84 char *CONST *argv); /* 83 */ - int (*tcl_ConvertElement) (CONST char *src, char *dst, int flags); /* 84 */ - int (*tcl_ConvertCountedElement) (CONST char *src, int length, char *dst, int flags); /* 85 */ - int (*tcl_CreateAlias) (Tcl_Interp *slave, CONST char *slaveCmd, Tcl_Interp *target, CONST char *targetCmd, int argc, CONST84 char *CONST *argv); /* 86 */ - int (*tcl_CreateAliasObj) (Tcl_Interp *slave, CONST char *slaveCmd, Tcl_Interp *target, CONST char *targetCmd, int objc, Tcl_Obj *CONST objv[]); /* 87 */ - Tcl_Channel (*tcl_CreateChannel) (Tcl_ChannelType *typePtr, CONST char *chanName, ClientData instanceData, int mask); /* 88 */ - void (*tcl_CreateChannelHandler) (Tcl_Channel chan, int mask, Tcl_ChannelProc *proc, ClientData clientData); /* 89 */ - void (*tcl_CreateCloseHandler) (Tcl_Channel chan, Tcl_CloseProc *proc, ClientData clientData); /* 90 */ - Tcl_Command (*tcl_CreateCommand) (Tcl_Interp *interp, CONST char *cmdName, Tcl_CmdProc *proc, ClientData clientData, Tcl_CmdDeleteProc *deleteProc); /* 91 */ - void (*tcl_CreateEventSource) (Tcl_EventSetupProc *setupProc, Tcl_EventCheckProc *checkProc, ClientData clientData); /* 92 */ - void (*tcl_CreateExitHandler) (Tcl_ExitProc *proc, ClientData clientData); /* 93 */ + void (*tcl_BackgroundError) (Tcl_Interp * interp); /* 76 */ + char (*tcl_Backslash) (CONST char * src, int * readPtr); /* 77 */ + int (*tcl_BadChannelOption) (Tcl_Interp * interp, CONST char * optionName, CONST char * optionList); /* 78 */ + void (*tcl_CallWhenDeleted) (Tcl_Interp * interp, Tcl_InterpDeleteProc * proc, ClientData clientData); /* 79 */ + void (*tcl_CancelIdleCall) (Tcl_IdleProc * idleProc, ClientData clientData); /* 80 */ + int (*tcl_Close) (Tcl_Interp * interp, Tcl_Channel chan); /* 81 */ + int (*tcl_CommandComplete) (CONST char * cmd); /* 82 */ + char * (*tcl_Concat) (int argc, CONST84 char * CONST * argv); /* 83 */ + int (*tcl_ConvertElement) (CONST char * src, char * dst, int flags); /* 84 */ + int (*tcl_ConvertCountedElement) (CONST char * src, int length, char * dst, int flags); /* 85 */ + int (*tcl_CreateAlias) (Tcl_Interp * slave, CONST char * slaveCmd, Tcl_Interp * target, CONST char * targetCmd, int argc, CONST84 char * CONST * argv); /* 86 */ + int (*tcl_CreateAliasObj) (Tcl_Interp * slave, CONST char * slaveCmd, Tcl_Interp * target, CONST char * targetCmd, int objc, Tcl_Obj *CONST objv[]); /* 87 */ + Tcl_Channel (*tcl_CreateChannel) (Tcl_ChannelType * typePtr, CONST char * chanName, ClientData instanceData, int mask); /* 88 */ + void (*tcl_CreateChannelHandler) (Tcl_Channel chan, int mask, Tcl_ChannelProc * proc, ClientData clientData); /* 89 */ + void (*tcl_CreateCloseHandler) (Tcl_Channel chan, Tcl_CloseProc * proc, ClientData clientData); /* 90 */ + Tcl_Command (*tcl_CreateCommand) (Tcl_Interp * interp, CONST char * cmdName, Tcl_CmdProc * proc, ClientData clientData, Tcl_CmdDeleteProc * deleteProc); /* 91 */ + void (*tcl_CreateEventSource) (Tcl_EventSetupProc * setupProc, Tcl_EventCheckProc * checkProc, ClientData clientData); /* 92 */ + void (*tcl_CreateExitHandler) (Tcl_ExitProc * proc, ClientData clientData); /* 93 */ Tcl_Interp * (*tcl_CreateInterp) (void); /* 94 */ - void (*tcl_CreateMathFunc) (Tcl_Interp *interp, CONST char *name, int numArgs, Tcl_ValueType *argTypes, Tcl_MathProc *proc, ClientData clientData); /* 95 */ - Tcl_Command (*tcl_CreateObjCommand) (Tcl_Interp *interp, CONST char *cmdName, Tcl_ObjCmdProc *proc, ClientData clientData, Tcl_CmdDeleteProc *deleteProc); /* 96 */ - Tcl_Interp * (*tcl_CreateSlave) (Tcl_Interp *interp, CONST char *slaveName, int isSafe); /* 97 */ - Tcl_TimerToken (*tcl_CreateTimerHandler) (int milliseconds, Tcl_TimerProc *proc, ClientData clientData); /* 98 */ - Tcl_Trace (*tcl_CreateTrace) (Tcl_Interp *interp, int level, Tcl_CmdTraceProc *proc, ClientData clientData); /* 99 */ - void (*tcl_DeleteAssocData) (Tcl_Interp *interp, CONST char *name); /* 100 */ - void (*tcl_DeleteChannelHandler) (Tcl_Channel chan, Tcl_ChannelProc *proc, ClientData clientData); /* 101 */ - void (*tcl_DeleteCloseHandler) (Tcl_Channel chan, Tcl_CloseProc *proc, ClientData clientData); /* 102 */ - int (*tcl_DeleteCommand) (Tcl_Interp *interp, CONST char *cmdName); /* 103 */ - int (*tcl_DeleteCommandFromToken) (Tcl_Interp *interp, Tcl_Command command); /* 104 */ - void (*tcl_DeleteEvents) (Tcl_EventDeleteProc *proc, ClientData clientData); /* 105 */ - void (*tcl_DeleteEventSource) (Tcl_EventSetupProc *setupProc, Tcl_EventCheckProc *checkProc, ClientData clientData); /* 106 */ - void (*tcl_DeleteExitHandler) (Tcl_ExitProc *proc, ClientData clientData); /* 107 */ - void (*tcl_DeleteHashEntry) (Tcl_HashEntry *entryPtr); /* 108 */ - void (*tcl_DeleteHashTable) (Tcl_HashTable *tablePtr); /* 109 */ - void (*tcl_DeleteInterp) (Tcl_Interp *interp); /* 110 */ - void (*tcl_DetachPids) (int numPids, Tcl_Pid *pidPtr); /* 111 */ + void (*tcl_CreateMathFunc) (Tcl_Interp * interp, CONST char * name, int numArgs, Tcl_ValueType * argTypes, Tcl_MathProc * proc, ClientData clientData); /* 95 */ + Tcl_Command (*tcl_CreateObjCommand) (Tcl_Interp * interp, CONST char * cmdName, Tcl_ObjCmdProc * proc, ClientData clientData, Tcl_CmdDeleteProc * deleteProc); /* 96 */ + Tcl_Interp * (*tcl_CreateSlave) (Tcl_Interp * interp, CONST char * slaveName, int isSafe); /* 97 */ + Tcl_TimerToken (*tcl_CreateTimerHandler) (int milliseconds, Tcl_TimerProc * proc, ClientData clientData); /* 98 */ + Tcl_Trace (*tcl_CreateTrace) (Tcl_Interp * interp, int level, Tcl_CmdTraceProc * proc, ClientData clientData); /* 99 */ + void (*tcl_DeleteAssocData) (Tcl_Interp * interp, CONST char * name); /* 100 */ + void (*tcl_DeleteChannelHandler) (Tcl_Channel chan, Tcl_ChannelProc * proc, ClientData clientData); /* 101 */ + void (*tcl_DeleteCloseHandler) (Tcl_Channel chan, Tcl_CloseProc * proc, ClientData clientData); /* 102 */ + int (*tcl_DeleteCommand) (Tcl_Interp * interp, CONST char * cmdName); /* 103 */ + int (*tcl_DeleteCommandFromToken) (Tcl_Interp * interp, Tcl_Command command); /* 104 */ + void (*tcl_DeleteEvents) (Tcl_EventDeleteProc * proc, ClientData clientData); /* 105 */ + void (*tcl_DeleteEventSource) (Tcl_EventSetupProc * setupProc, Tcl_EventCheckProc * checkProc, ClientData clientData); /* 106 */ + void (*tcl_DeleteExitHandler) (Tcl_ExitProc * proc, ClientData clientData); /* 107 */ + void (*tcl_DeleteHashEntry) (Tcl_HashEntry * entryPtr); /* 108 */ + void (*tcl_DeleteHashTable) (Tcl_HashTable * tablePtr); /* 109 */ + void (*tcl_DeleteInterp) (Tcl_Interp * interp); /* 110 */ +#if !defined(__WIN32__) && !defined(MAC_OSX_TCL) /* UNIX */ + void (*tcl_DetachPids) (int numPids, Tcl_Pid * pidPtr); /* 111 */ +#endif /* UNIX */ +#ifdef __WIN32__ /* WIN */ + void (*tcl_DetachPids) (int numPids, Tcl_Pid * pidPtr); /* 111 */ +#endif /* WIN */ +#ifdef MAC_OSX_TCL /* MACOSX */ + void (*tcl_DetachPids) (int numPids, Tcl_Pid * pidPtr); /* 111 */ +#endif /* MACOSX */ void (*tcl_DeleteTimerHandler) (Tcl_TimerToken token); /* 112 */ - void (*tcl_DeleteTrace) (Tcl_Interp *interp, Tcl_Trace trace); /* 113 */ - void (*tcl_DontCallWhenDeleted) (Tcl_Interp *interp, Tcl_InterpDeleteProc *proc, ClientData clientData); /* 114 */ + void (*tcl_DeleteTrace) (Tcl_Interp * interp, Tcl_Trace trace); /* 113 */ + void (*tcl_DontCallWhenDeleted) (Tcl_Interp * interp, Tcl_InterpDeleteProc * proc, ClientData clientData); /* 114 */ int (*tcl_DoOneEvent) (int flags); /* 115 */ - void (*tcl_DoWhenIdle) (Tcl_IdleProc *proc, ClientData clientData); /* 116 */ - char * (*tcl_DStringAppend) (Tcl_DString *dsPtr, CONST char *bytes, int length); /* 117 */ - char * (*tcl_DStringAppendElement) (Tcl_DString *dsPtr, CONST char *element); /* 118 */ - void (*tcl_DStringEndSublist) (Tcl_DString *dsPtr); /* 119 */ - void (*tcl_DStringFree) (Tcl_DString *dsPtr); /* 120 */ - void (*tcl_DStringGetResult) (Tcl_Interp *interp, Tcl_DString *dsPtr); /* 121 */ - void (*tcl_DStringInit) (Tcl_DString *dsPtr); /* 122 */ - void (*tcl_DStringResult) (Tcl_Interp *interp, Tcl_DString *dsPtr); /* 123 */ - void (*tcl_DStringSetLength) (Tcl_DString *dsPtr, int length); /* 124 */ - void (*tcl_DStringStartSublist) (Tcl_DString *dsPtr); /* 125 */ + void (*tcl_DoWhenIdle) (Tcl_IdleProc * proc, ClientData clientData); /* 116 */ + char * (*tcl_DStringAppend) (Tcl_DString * dsPtr, CONST char * bytes, int length); /* 117 */ + char * (*tcl_DStringAppendElement) (Tcl_DString * dsPtr, CONST char * element); /* 118 */ + void (*tcl_DStringEndSublist) (Tcl_DString * dsPtr); /* 119 */ + void (*tcl_DStringFree) (Tcl_DString * dsPtr); /* 120 */ + void (*tcl_DStringGetResult) (Tcl_Interp * interp, Tcl_DString * dsPtr); /* 121 */ + void (*tcl_DStringInit) (Tcl_DString * dsPtr); /* 122 */ + void (*tcl_DStringResult) (Tcl_Interp * interp, Tcl_DString * dsPtr); /* 123 */ + void (*tcl_DStringSetLength) (Tcl_DString * dsPtr, int length); /* 124 */ + void (*tcl_DStringStartSublist) (Tcl_DString * dsPtr); /* 125 */ int (*tcl_Eof) (Tcl_Channel chan); /* 126 */ CONST84_RETURN char * (*tcl_ErrnoId) (void); /* 127 */ CONST84_RETURN char * (*tcl_ErrnoMsg) (int err); /* 128 */ - int (*tcl_Eval) (Tcl_Interp *interp, CONST char *script); /* 129 */ - int (*tcl_EvalFile) (Tcl_Interp *interp, CONST char *fileName); /* 130 */ - int (*tcl_EvalObj) (Tcl_Interp *interp, Tcl_Obj *objPtr); /* 131 */ - void (*tcl_EventuallyFree) (ClientData clientData, Tcl_FreeProc *freeProc); /* 132 */ + int (*tcl_Eval) (Tcl_Interp * interp, CONST char * script); /* 129 */ + int (*tcl_EvalFile) (Tcl_Interp * interp, CONST char * fileName); /* 130 */ + int (*tcl_EvalObj) (Tcl_Interp * interp, Tcl_Obj * objPtr); /* 131 */ + void (*tcl_EventuallyFree) (ClientData clientData, Tcl_FreeProc * freeProc); /* 132 */ void (*tcl_Exit) (int status); /* 133 */ - int (*tcl_ExposeCommand) (Tcl_Interp *interp, CONST char *hiddenCmdToken, CONST char *cmdName); /* 134 */ - int (*tcl_ExprBoolean) (Tcl_Interp *interp, CONST char *expr, int *ptr); /* 135 */ - int (*tcl_ExprBooleanObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, int *ptr); /* 136 */ - int (*tcl_ExprDouble) (Tcl_Interp *interp, CONST char *expr, double *ptr); /* 137 */ - int (*tcl_ExprDoubleObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, double *ptr); /* 138 */ - int (*tcl_ExprLong) (Tcl_Interp *interp, CONST char *expr, long *ptr); /* 139 */ - int (*tcl_ExprLongObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, long *ptr); /* 140 */ - int (*tcl_ExprObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, Tcl_Obj **resultPtrPtr); /* 141 */ - int (*tcl_ExprString) (Tcl_Interp *interp, CONST char *expr); /* 142 */ + int (*tcl_ExposeCommand) (Tcl_Interp * interp, CONST char * hiddenCmdToken, CONST char * cmdName); /* 134 */ + int (*tcl_ExprBoolean) (Tcl_Interp * interp, CONST char * expr, int * ptr); /* 135 */ + int (*tcl_ExprBooleanObj) (Tcl_Interp * interp, Tcl_Obj * objPtr, int * ptr); /* 136 */ + int (*tcl_ExprDouble) (Tcl_Interp * interp, CONST char * expr, double * ptr); /* 137 */ + int (*tcl_ExprDoubleObj) (Tcl_Interp * interp, Tcl_Obj * objPtr, double * ptr); /* 138 */ + int (*tcl_ExprLong) (Tcl_Interp * interp, CONST char * expr, long * ptr); /* 139 */ + int (*tcl_ExprLongObj) (Tcl_Interp * interp, Tcl_Obj * objPtr, long * ptr); /* 140 */ + int (*tcl_ExprObj) (Tcl_Interp * interp, Tcl_Obj * objPtr, Tcl_Obj ** resultPtrPtr); /* 141 */ + int (*tcl_ExprString) (Tcl_Interp * interp, CONST char * expr); /* 142 */ void (*tcl_Finalize) (void); /* 143 */ - void (*tcl_FindExecutable) (CONST char *argv0); /* 144 */ - Tcl_HashEntry * (*tcl_FirstHashEntry) (Tcl_HashTable *tablePtr, Tcl_HashSearch *searchPtr); /* 145 */ + void (*tcl_FindExecutable) (CONST char * argv0); /* 144 */ + Tcl_HashEntry * (*tcl_FirstHashEntry) (Tcl_HashTable * tablePtr, Tcl_HashSearch * searchPtr); /* 145 */ int (*tcl_Flush) (Tcl_Channel chan); /* 146 */ - void (*tcl_FreeResult) (Tcl_Interp *interp); /* 147 */ - int (*tcl_GetAlias) (Tcl_Interp *interp, CONST char *slaveCmd, Tcl_Interp **targetInterpPtr, CONST84 char **targetCmdPtr, int *argcPtr, CONST84 char ***argvPtr); /* 148 */ - int (*tcl_GetAliasObj) (Tcl_Interp *interp, CONST char *slaveCmd, Tcl_Interp **targetInterpPtr, CONST84 char **targetCmdPtr, int *objcPtr, Tcl_Obj ***objv); /* 149 */ - ClientData (*tcl_GetAssocData) (Tcl_Interp *interp, CONST char *name, Tcl_InterpDeleteProc **procPtr); /* 150 */ - Tcl_Channel (*tcl_GetChannel) (Tcl_Interp *interp, CONST char *chanName, int *modePtr); /* 151 */ + void (*tcl_FreeResult) (Tcl_Interp * interp); /* 147 */ + int (*tcl_GetAlias) (Tcl_Interp * interp, CONST char * slaveCmd, Tcl_Interp ** targetInterpPtr, CONST84 char ** targetCmdPtr, int * argcPtr, CONST84 char *** argvPtr); /* 148 */ + int (*tcl_GetAliasObj) (Tcl_Interp * interp, CONST char * slaveCmd, Tcl_Interp ** targetInterpPtr, CONST84 char ** targetCmdPtr, int * objcPtr, Tcl_Obj *** objv); /* 149 */ + ClientData (*tcl_GetAssocData) (Tcl_Interp * interp, CONST char * name, Tcl_InterpDeleteProc ** procPtr); /* 150 */ + Tcl_Channel (*tcl_GetChannel) (Tcl_Interp * interp, CONST char * chanName, int * modePtr); /* 151 */ int (*tcl_GetChannelBufferSize) (Tcl_Channel chan); /* 152 */ - int (*tcl_GetChannelHandle) (Tcl_Channel chan, int direction, ClientData *handlePtr); /* 153 */ + int (*tcl_GetChannelHandle) (Tcl_Channel chan, int direction, ClientData * handlePtr); /* 153 */ ClientData (*tcl_GetChannelInstanceData) (Tcl_Channel chan); /* 154 */ int (*tcl_GetChannelMode) (Tcl_Channel chan); /* 155 */ CONST84_RETURN char * (*tcl_GetChannelName) (Tcl_Channel chan); /* 156 */ - int (*tcl_GetChannelOption) (Tcl_Interp *interp, Tcl_Channel chan, CONST char *optionName, Tcl_DString *dsPtr); /* 157 */ + int (*tcl_GetChannelOption) (Tcl_Interp * interp, Tcl_Channel chan, CONST char * optionName, Tcl_DString * dsPtr); /* 157 */ Tcl_ChannelType * (*tcl_GetChannelType) (Tcl_Channel chan); /* 158 */ - int (*tcl_GetCommandInfo) (Tcl_Interp *interp, CONST char *cmdName, Tcl_CmdInfo *infoPtr); /* 159 */ - CONST84_RETURN char * (*tcl_GetCommandName) (Tcl_Interp *interp, Tcl_Command command); /* 160 */ + int (*tcl_GetCommandInfo) (Tcl_Interp * interp, CONST char * cmdName, Tcl_CmdInfo * infoPtr); /* 159 */ + CONST84_RETURN char * (*tcl_GetCommandName) (Tcl_Interp * interp, Tcl_Command command); /* 160 */ int (*tcl_GetErrno) (void); /* 161 */ CONST84_RETURN char * (*tcl_GetHostName) (void); /* 162 */ - int (*tcl_GetInterpPath) (Tcl_Interp *askInterp, Tcl_Interp *slaveInterp); /* 163 */ - Tcl_Interp * (*tcl_GetMaster) (Tcl_Interp *interp); /* 164 */ + int (*tcl_GetInterpPath) (Tcl_Interp * askInterp, Tcl_Interp * slaveInterp); /* 163 */ + Tcl_Interp * (*tcl_GetMaster) (Tcl_Interp * interp); /* 164 */ CONST char * (*tcl_GetNameOfExecutable) (void); /* 165 */ - Tcl_Obj * (*tcl_GetObjResult) (Tcl_Interp *interp); /* 166 */ + Tcl_Obj * (*tcl_GetObjResult) (Tcl_Interp * interp); /* 166 */ #if !defined(__WIN32__) && !defined(MAC_OSX_TCL) /* UNIX */ - int (*tcl_GetOpenFile) (Tcl_Interp *interp, CONST char *chanID, int forWriting, int checkUsage, ClientData *filePtr); /* 167 */ + int (*tcl_GetOpenFile) (Tcl_Interp * interp, CONST char * chanID, int forWriting, int checkUsage, ClientData * filePtr); /* 167 */ #endif /* UNIX */ #ifdef __WIN32__ /* WIN */ void *reserved167; #endif /* WIN */ #ifdef MAC_OSX_TCL /* MACOSX */ - int (*tcl_GetOpenFile) (Tcl_Interp *interp, CONST char *chanID, int forWriting, int checkUsage, ClientData *filePtr); /* 167 */ + int (*tcl_GetOpenFile) (Tcl_Interp * interp, CONST char * chanID, int forWriting, int checkUsage, ClientData * filePtr); /* 167 */ #endif /* MACOSX */ - Tcl_PathType (*tcl_GetPathType) (CONST char *path); /* 168 */ - int (*tcl_Gets) (Tcl_Channel chan, Tcl_DString *dsPtr); /* 169 */ - int (*tcl_GetsObj) (Tcl_Channel chan, Tcl_Obj *objPtr); /* 170 */ + Tcl_PathType (*tcl_GetPathType) (CONST char * path); /* 168 */ + int (*tcl_Gets) (Tcl_Channel chan, Tcl_DString * dsPtr); /* 169 */ + int (*tcl_GetsObj) (Tcl_Channel chan, Tcl_Obj * objPtr); /* 170 */ int (*tcl_GetServiceMode) (void); /* 171 */ - Tcl_Interp * (*tcl_GetSlave) (Tcl_Interp *interp, CONST char *slaveName); /* 172 */ + Tcl_Interp * (*tcl_GetSlave) (Tcl_Interp * interp, CONST char * slaveName); /* 172 */ Tcl_Channel (*tcl_GetStdChannel) (int type); /* 173 */ - CONST84_RETURN char * (*tcl_GetStringResult) (Tcl_Interp *interp); /* 174 */ - CONST84_RETURN char * (*tcl_GetVar) (Tcl_Interp *interp, CONST char *varName, int flags); /* 175 */ - CONST84_RETURN char * (*tcl_GetVar2) (Tcl_Interp *interp, CONST char *part1, CONST char *part2, int flags); /* 176 */ - int (*tcl_GlobalEval) (Tcl_Interp *interp, CONST char *command); /* 177 */ - int (*tcl_GlobalEvalObj) (Tcl_Interp *interp, Tcl_Obj *objPtr); /* 178 */ - int (*tcl_HideCommand) (Tcl_Interp *interp, CONST char *cmdName, CONST char *hiddenCmdToken); /* 179 */ - int (*tcl_Init) (Tcl_Interp *interp); /* 180 */ - void (*tcl_InitHashTable) (Tcl_HashTable *tablePtr, int keyType); /* 181 */ + CONST84_RETURN char * (*tcl_GetStringResult) (Tcl_Interp * interp); /* 174 */ + CONST84_RETURN char * (*tcl_GetVar) (Tcl_Interp * interp, CONST char * varName, int flags); /* 175 */ + CONST84_RETURN char * (*tcl_GetVar2) (Tcl_Interp * interp, CONST char * part1, CONST char * part2, int flags); /* 176 */ + int (*tcl_GlobalEval) (Tcl_Interp * interp, CONST char * command); /* 177 */ + int (*tcl_GlobalEvalObj) (Tcl_Interp * interp, Tcl_Obj * objPtr); /* 178 */ + int (*tcl_HideCommand) (Tcl_Interp * interp, CONST char * cmdName, CONST char * hiddenCmdToken); /* 179 */ + int (*tcl_Init) (Tcl_Interp * interp); /* 180 */ + void (*tcl_InitHashTable) (Tcl_HashTable * tablePtr, int keyType); /* 181 */ int (*tcl_InputBlocked) (Tcl_Channel chan); /* 182 */ int (*tcl_InputBuffered) (Tcl_Channel chan); /* 183 */ - int (*tcl_InterpDeleted) (Tcl_Interp *interp); /* 184 */ - int (*tcl_IsSafe) (Tcl_Interp *interp); /* 185 */ - char * (*tcl_JoinPath) (int argc, CONST84 char *CONST *argv, Tcl_DString *resultPtr); /* 186 */ - int (*tcl_LinkVar) (Tcl_Interp *interp, CONST char *varName, char *addr, int type); /* 187 */ + int (*tcl_InterpDeleted) (Tcl_Interp * interp); /* 184 */ + int (*tcl_IsSafe) (Tcl_Interp * interp); /* 185 */ + char * (*tcl_JoinPath) (int argc, CONST84 char * CONST * argv, Tcl_DString * resultPtr); /* 186 */ + int (*tcl_LinkVar) (Tcl_Interp * interp, CONST char * varName, char * addr, int type); /* 187 */ void *reserved188; Tcl_Channel (*tcl_MakeFileChannel) (ClientData handle, int mode); /* 189 */ - int (*tcl_MakeSafe) (Tcl_Interp *interp); /* 190 */ + int (*tcl_MakeSafe) (Tcl_Interp * interp); /* 190 */ Tcl_Channel (*tcl_MakeTcpClientChannel) (ClientData tcpSocket); /* 191 */ - char * (*tcl_Merge) (int argc, CONST84 char *CONST *argv); /* 192 */ - Tcl_HashEntry * (*tcl_NextHashEntry) (Tcl_HashSearch *searchPtr); /* 193 */ + char * (*tcl_Merge) (int argc, CONST84 char * CONST * argv); /* 192 */ + Tcl_HashEntry * (*tcl_NextHashEntry) (Tcl_HashSearch * searchPtr); /* 193 */ void (*tcl_NotifyChannel) (Tcl_Channel channel, int mask); /* 194 */ - Tcl_Obj * (*tcl_ObjGetVar2) (Tcl_Interp *interp, Tcl_Obj *part1Ptr, Tcl_Obj *part2Ptr, int flags); /* 195 */ - Tcl_Obj * (*tcl_ObjSetVar2) (Tcl_Interp *interp, Tcl_Obj *part1Ptr, Tcl_Obj *part2Ptr, Tcl_Obj *newValuePtr, int flags); /* 196 */ - Tcl_Channel (*tcl_OpenCommandChannel) (Tcl_Interp *interp, int argc, CONST84 char **argv, int flags); /* 197 */ - Tcl_Channel (*tcl_OpenFileChannel) (Tcl_Interp *interp, CONST char *fileName, CONST char *modeString, int permissions); /* 198 */ - Tcl_Channel (*tcl_OpenTcpClient) (Tcl_Interp *interp, int port, CONST char *address, CONST char *myaddr, int myport, int async); /* 199 */ - Tcl_Channel (*tcl_OpenTcpServer) (Tcl_Interp *interp, int port, CONST char *host, Tcl_TcpAcceptProc *acceptProc, ClientData callbackData); /* 200 */ + Tcl_Obj * (*tcl_ObjGetVar2) (Tcl_Interp * interp, Tcl_Obj * part1Ptr, Tcl_Obj * part2Ptr, int flags); /* 195 */ + Tcl_Obj * (*tcl_ObjSetVar2) (Tcl_Interp * interp, Tcl_Obj * part1Ptr, Tcl_Obj * part2Ptr, Tcl_Obj * newValuePtr, int flags); /* 196 */ +#if !defined(__WIN32__) && !defined(MAC_OSX_TCL) /* UNIX */ + Tcl_Channel (*tcl_OpenCommandChannel) (Tcl_Interp * interp, int argc, CONST84 char ** argv, int flags); /* 197 */ +#endif /* UNIX */ +#ifdef __WIN32__ /* WIN */ + Tcl_Channel (*tcl_OpenCommandChannel) (Tcl_Interp * interp, int argc, CONST84 char ** argv, int flags); /* 197 */ +#endif /* WIN */ +#ifdef MAC_OSX_TCL /* MACOSX */ + Tcl_Channel (*tcl_OpenCommandChannel) (Tcl_Interp * interp, int argc, CONST84 char ** argv, int flags); /* 197 */ +#endif /* MACOSX */ + Tcl_Channel (*tcl_OpenFileChannel) (Tcl_Interp * interp, CONST char * fileName, CONST char * modeString, int permissions); /* 198 */ + Tcl_Channel (*tcl_OpenTcpClient) (Tcl_Interp * interp, int port, CONST char * address, CONST char * myaddr, int myport, int async); /* 199 */ + Tcl_Channel (*tcl_OpenTcpServer) (Tcl_Interp * interp, int port, CONST char * host, Tcl_TcpAcceptProc * acceptProc, ClientData callbackData); /* 200 */ void (*tcl_Preserve) (ClientData data); /* 201 */ - void (*tcl_PrintDouble) (Tcl_Interp *interp, double value, char *dst); /* 202 */ - int (*tcl_PutEnv) (CONST char *assignment); /* 203 */ - CONST84_RETURN char * (*tcl_PosixError) (Tcl_Interp *interp); /* 204 */ - void (*tcl_QueueEvent) (Tcl_Event *evPtr, Tcl_QueuePosition position); /* 205 */ - int (*tcl_Read) (Tcl_Channel chan, char *bufPtr, int toRead); /* 206 */ + void (*tcl_PrintDouble) (Tcl_Interp * interp, double value, char * dst); /* 202 */ + int (*tcl_PutEnv) (CONST char * assignment); /* 203 */ + CONST84_RETURN char * (*tcl_PosixError) (Tcl_Interp * interp); /* 204 */ + void (*tcl_QueueEvent) (Tcl_Event * evPtr, Tcl_QueuePosition position); /* 205 */ + int (*tcl_Read) (Tcl_Channel chan, char * bufPtr, int toRead); /* 206 */ +#if !defined(__WIN32__) && !defined(MAC_OSX_TCL) /* UNIX */ + void (*tcl_ReapDetachedProcs) (void); /* 207 */ +#endif /* UNIX */ +#ifdef __WIN32__ /* WIN */ void (*tcl_ReapDetachedProcs) (void); /* 207 */ - int (*tcl_RecordAndEval) (Tcl_Interp *interp, CONST char *cmd, int flags); /* 208 */ - int (*tcl_RecordAndEvalObj) (Tcl_Interp *interp, Tcl_Obj *cmdPtr, int flags); /* 209 */ - void (*tcl_RegisterChannel) (Tcl_Interp *interp, Tcl_Channel chan); /* 210 */ - void (*tcl_RegisterObjType) (Tcl_ObjType *typePtr); /* 211 */ - Tcl_RegExp (*tcl_RegExpCompile) (Tcl_Interp *interp, CONST char *pattern); /* 212 */ - int (*tcl_RegExpExec) (Tcl_Interp *interp, Tcl_RegExp regexp, CONST char *text, CONST char *start); /* 213 */ - int (*tcl_RegExpMatch) (Tcl_Interp *interp, CONST char *text, CONST char *pattern); /* 214 */ - void (*tcl_RegExpRange) (Tcl_RegExp regexp, int index, CONST84 char **startPtr, CONST84 char **endPtr); /* 215 */ +#endif /* WIN */ +#ifdef MAC_OSX_TCL /* MACOSX */ + void (*tcl_ReapDetachedProcs) (void); /* 207 */ +#endif /* MACOSX */ + int (*tcl_RecordAndEval) (Tcl_Interp * interp, CONST char * cmd, int flags); /* 208 */ + int (*tcl_RecordAndEvalObj) (Tcl_Interp * interp, Tcl_Obj * cmdPtr, int flags); /* 209 */ + void (*tcl_RegisterChannel) (Tcl_Interp * interp, Tcl_Channel chan); /* 210 */ + void (*tcl_RegisterObjType) (Tcl_ObjType * typePtr); /* 211 */ + Tcl_RegExp (*tcl_RegExpCompile) (Tcl_Interp * interp, CONST char * pattern); /* 212 */ + int (*tcl_RegExpExec) (Tcl_Interp * interp, Tcl_RegExp regexp, CONST char * text, CONST char * start); /* 213 */ + int (*tcl_RegExpMatch) (Tcl_Interp * interp, CONST char * text, CONST char * pattern); /* 214 */ + void (*tcl_RegExpRange) (Tcl_RegExp regexp, int index, CONST84 char ** startPtr, CONST84 char ** endPtr); /* 215 */ void (*tcl_Release) (ClientData clientData); /* 216 */ - void (*tcl_ResetResult) (Tcl_Interp *interp); /* 217 */ - int (*tcl_ScanElement) (CONST char *str, int *flagPtr); /* 218 */ - int (*tcl_ScanCountedElement) (CONST char *str, int length, int *flagPtr); /* 219 */ + void (*tcl_ResetResult) (Tcl_Interp * interp); /* 217 */ + int (*tcl_ScanElement) (CONST char * str, int * flagPtr); /* 218 */ + int (*tcl_ScanCountedElement) (CONST char * str, int length, int * flagPtr); /* 219 */ int (*tcl_SeekOld) (Tcl_Channel chan, int offset, int mode); /* 220 */ int (*tcl_ServiceAll) (void); /* 221 */ int (*tcl_ServiceEvent) (int flags); /* 222 */ - void (*tcl_SetAssocData) (Tcl_Interp *interp, CONST char *name, Tcl_InterpDeleteProc *proc, ClientData clientData); /* 223 */ + void (*tcl_SetAssocData) (Tcl_Interp * interp, CONST char * name, Tcl_InterpDeleteProc * proc, ClientData clientData); /* 223 */ void (*tcl_SetChannelBufferSize) (Tcl_Channel chan, int sz); /* 224 */ - int (*tcl_SetChannelOption) (Tcl_Interp *interp, Tcl_Channel chan, CONST char *optionName, CONST char *newValue); /* 225 */ - int (*tcl_SetCommandInfo) (Tcl_Interp *interp, CONST char *cmdName, CONST Tcl_CmdInfo *infoPtr); /* 226 */ + int (*tcl_SetChannelOption) (Tcl_Interp * interp, Tcl_Channel chan, CONST char * optionName, CONST char * newValue); /* 225 */ + int (*tcl_SetCommandInfo) (Tcl_Interp * interp, CONST char * cmdName, CONST Tcl_CmdInfo * infoPtr); /* 226 */ void (*tcl_SetErrno) (int err); /* 227 */ - void (*tcl_SetErrorCode) (Tcl_Interp *interp, ...); /* 228 */ - void (*tcl_SetMaxBlockTime) (Tcl_Time *timePtr); /* 229 */ - void (*tcl_SetPanicProc) (Tcl_PanicProc *panicProc); /* 230 */ - int (*tcl_SetRecursionLimit) (Tcl_Interp *interp, int depth); /* 231 */ - void (*tcl_SetResult) (Tcl_Interp *interp, char *result, Tcl_FreeProc *freeProc); /* 232 */ + void (*tcl_SetErrorCode) (Tcl_Interp * interp, ...); /* 228 */ + void (*tcl_SetMaxBlockTime) (Tcl_Time * timePtr); /* 229 */ + void (*tcl_SetPanicProc) (Tcl_PanicProc * panicProc); /* 230 */ + int (*tcl_SetRecursionLimit) (Tcl_Interp * interp, int depth); /* 231 */ + void (*tcl_SetResult) (Tcl_Interp * interp, char * result, Tcl_FreeProc * freeProc); /* 232 */ int (*tcl_SetServiceMode) (int mode); /* 233 */ - void (*tcl_SetObjErrorCode) (Tcl_Interp *interp, Tcl_Obj *errorObjPtr); /* 234 */ - void (*tcl_SetObjResult) (Tcl_Interp *interp, Tcl_Obj *resultObjPtr); /* 235 */ + void (*tcl_SetObjErrorCode) (Tcl_Interp * interp, Tcl_Obj * errorObjPtr); /* 234 */ + void (*tcl_SetObjResult) (Tcl_Interp * interp, Tcl_Obj * resultObjPtr); /* 235 */ void (*tcl_SetStdChannel) (Tcl_Channel channel, int type); /* 236 */ - CONST84_RETURN char * (*tcl_SetVar) (Tcl_Interp *interp, CONST char *varName, CONST char *newValue, int flags); /* 237 */ - CONST84_RETURN char * (*tcl_SetVar2) (Tcl_Interp *interp, CONST char *part1, CONST char *part2, CONST char *newValue, int flags); /* 238 */ + CONST84_RETURN char * (*tcl_SetVar) (Tcl_Interp * interp, CONST char * varName, CONST char * newValue, int flags); /* 237 */ + CONST84_RETURN char * (*tcl_SetVar2) (Tcl_Interp * interp, CONST char * part1, CONST char * part2, CONST char * newValue, int flags); /* 238 */ CONST84_RETURN char * (*tcl_SignalId) (int sig); /* 239 */ CONST84_RETURN char * (*tcl_SignalMsg) (int sig); /* 240 */ - void (*tcl_SourceRCFile) (Tcl_Interp *interp); /* 241 */ - int (*tcl_SplitList) (Tcl_Interp *interp, CONST char *listStr, int *argcPtr, CONST84 char ***argvPtr); /* 242 */ - void (*tcl_SplitPath) (CONST char *path, int *argcPtr, CONST84 char ***argvPtr); /* 243 */ - void (*tcl_StaticPackage) (Tcl_Interp *interp, CONST char *pkgName, Tcl_PackageInitProc *initProc, Tcl_PackageInitProc *safeInitProc); /* 244 */ - int (*tcl_StringMatch) (CONST char *str, CONST char *pattern); /* 245 */ + void (*tcl_SourceRCFile) (Tcl_Interp * interp); /* 241 */ + int (*tcl_SplitList) (Tcl_Interp * interp, CONST char * listStr, int * argcPtr, CONST84 char *** argvPtr); /* 242 */ + void (*tcl_SplitPath) (CONST char * path, int * argcPtr, CONST84 char *** argvPtr); /* 243 */ + void (*tcl_StaticPackage) (Tcl_Interp * interp, CONST char * pkgName, Tcl_PackageInitProc * initProc, Tcl_PackageInitProc * safeInitProc); /* 244 */ + int (*tcl_StringMatch) (CONST char * str, CONST char * pattern); /* 245 */ int (*tcl_TellOld) (Tcl_Channel chan); /* 246 */ - int (*tcl_TraceVar) (Tcl_Interp *interp, CONST char *varName, int flags, Tcl_VarTraceProc *proc, ClientData clientData); /* 247 */ - int (*tcl_TraceVar2) (Tcl_Interp *interp, CONST char *part1, CONST char *part2, int flags, Tcl_VarTraceProc *proc, ClientData clientData); /* 248 */ - char * (*tcl_TranslateFileName) (Tcl_Interp *interp, CONST char *name, Tcl_DString *bufferPtr); /* 249 */ - int (*tcl_Ungets) (Tcl_Channel chan, CONST char *str, int len, int atHead); /* 250 */ - void (*tcl_UnlinkVar) (Tcl_Interp *interp, CONST char *varName); /* 251 */ - int (*tcl_UnregisterChannel) (Tcl_Interp *interp, Tcl_Channel chan); /* 252 */ - int (*tcl_UnsetVar) (Tcl_Interp *interp, CONST char *varName, int flags); /* 253 */ - int (*tcl_UnsetVar2) (Tcl_Interp *interp, CONST char *part1, CONST char *part2, int flags); /* 254 */ - void (*tcl_UntraceVar) (Tcl_Interp *interp, CONST char *varName, int flags, Tcl_VarTraceProc *proc, ClientData clientData); /* 255 */ - void (*tcl_UntraceVar2) (Tcl_Interp *interp, CONST char *part1, CONST char *part2, int flags, Tcl_VarTraceProc *proc, ClientData clientData); /* 256 */ - void (*tcl_UpdateLinkedVar) (Tcl_Interp *interp, CONST char *varName); /* 257 */ - int (*tcl_UpVar) (Tcl_Interp *interp, CONST char *frameName, CONST char *varName, CONST char *localName, int flags); /* 258 */ - int (*tcl_UpVar2) (Tcl_Interp *interp, CONST char *frameName, CONST char *part1, CONST char *part2, CONST char *localName, int flags); /* 259 */ - int (*tcl_VarEval) (Tcl_Interp *interp, ...); /* 260 */ - ClientData (*tcl_VarTraceInfo) (Tcl_Interp *interp, CONST char *varName, int flags, Tcl_VarTraceProc *procPtr, ClientData prevClientData); /* 261 */ - ClientData (*tcl_VarTraceInfo2) (Tcl_Interp *interp, CONST char *part1, CONST char *part2, int flags, Tcl_VarTraceProc *procPtr, ClientData prevClientData); /* 262 */ - int (*tcl_Write) (Tcl_Channel chan, CONST char *s, int slen); /* 263 */ - void (*tcl_WrongNumArgs) (Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[], CONST char *message); /* 264 */ - int (*tcl_DumpActiveMemory) (CONST char *fileName); /* 265 */ - void (*tcl_ValidateAllMemory) (CONST char *file, int line); /* 266 */ - void (*tcl_AppendResultVA) (Tcl_Interp *interp, va_list argList); /* 267 */ - void (*tcl_AppendStringsToObjVA) (Tcl_Obj *objPtr, va_list argList); /* 268 */ - char * (*tcl_HashStats) (Tcl_HashTable *tablePtr); /* 269 */ - CONST84_RETURN char * (*tcl_ParseVar) (Tcl_Interp *interp, CONST char *start, CONST84 char **termPtr); /* 270 */ - CONST84_RETURN char * (*tcl_PkgPresent) (Tcl_Interp *interp, CONST char *name, CONST char *version, int exact); /* 271 */ - CONST84_RETURN char * (*tcl_PkgPresentEx) (Tcl_Interp *interp, CONST char *name, CONST char *version, int exact, ClientData *clientDataPtr); /* 272 */ - int (*tcl_PkgProvide) (Tcl_Interp *interp, CONST char *name, CONST char *version); /* 273 */ - CONST84_RETURN char * (*tcl_PkgRequire) (Tcl_Interp *interp, CONST char *name, CONST char *version, int exact); /* 274 */ - void (*tcl_SetErrorCodeVA) (Tcl_Interp *interp, va_list argList); /* 275 */ - int (*tcl_VarEvalVA) (Tcl_Interp *interp, va_list argList); /* 276 */ - Tcl_Pid (*tcl_WaitPid) (Tcl_Pid pid, int *statPtr, int options); /* 277 */ - void (*tcl_PanicVA) (CONST char *format, va_list argList); /* 278 */ - void (*tcl_GetVersion) (int *major, int *minor, int *patchLevel, int *type); /* 279 */ - void (*tcl_InitMemory) (Tcl_Interp *interp); /* 280 */ - Tcl_Channel (*tcl_StackChannel) (Tcl_Interp *interp, Tcl_ChannelType *typePtr, ClientData instanceData, int mask, Tcl_Channel prevChan); /* 281 */ - int (*tcl_UnstackChannel) (Tcl_Interp *interp, Tcl_Channel chan); /* 282 */ + int (*tcl_TraceVar) (Tcl_Interp * interp, CONST char * varName, int flags, Tcl_VarTraceProc * proc, ClientData clientData); /* 247 */ + int (*tcl_TraceVar2) (Tcl_Interp * interp, CONST char * part1, CONST char * part2, int flags, Tcl_VarTraceProc * proc, ClientData clientData); /* 248 */ + char * (*tcl_TranslateFileName) (Tcl_Interp * interp, CONST char * name, Tcl_DString * bufferPtr); /* 249 */ + int (*tcl_Ungets) (Tcl_Channel chan, CONST char * str, int len, int atHead); /* 250 */ + void (*tcl_UnlinkVar) (Tcl_Interp * interp, CONST char * varName); /* 251 */ + int (*tcl_UnregisterChannel) (Tcl_Interp * interp, Tcl_Channel chan); /* 252 */ + int (*tcl_UnsetVar) (Tcl_Interp * interp, CONST char * varName, int flags); /* 253 */ + int (*tcl_UnsetVar2) (Tcl_Interp * interp, CONST char * part1, CONST char * part2, int flags); /* 254 */ + void (*tcl_UntraceVar) (Tcl_Interp * interp, CONST char * varName, int flags, Tcl_VarTraceProc * proc, ClientData clientData); /* 255 */ + void (*tcl_UntraceVar2) (Tcl_Interp * interp, CONST char * part1, CONST char * part2, int flags, Tcl_VarTraceProc * proc, ClientData clientData); /* 256 */ + void (*tcl_UpdateLinkedVar) (Tcl_Interp * interp, CONST char * varName); /* 257 */ + int (*tcl_UpVar) (Tcl_Interp * interp, CONST char * frameName, CONST char * varName, CONST char * localName, int flags); /* 258 */ + int (*tcl_UpVar2) (Tcl_Interp * interp, CONST char * frameName, CONST char * part1, CONST char * part2, CONST char * localName, int flags); /* 259 */ + int (*tcl_VarEval) (Tcl_Interp * interp, ...); /* 260 */ + ClientData (*tcl_VarTraceInfo) (Tcl_Interp * interp, CONST char * varName, int flags, Tcl_VarTraceProc * procPtr, ClientData prevClientData); /* 261 */ + ClientData (*tcl_VarTraceInfo2) (Tcl_Interp * interp, CONST char * part1, CONST char * part2, int flags, Tcl_VarTraceProc * procPtr, ClientData prevClientData); /* 262 */ + int (*tcl_Write) (Tcl_Channel chan, CONST char * s, int slen); /* 263 */ + void (*tcl_WrongNumArgs) (Tcl_Interp * interp, int objc, Tcl_Obj *CONST objv[], CONST char * message); /* 264 */ + int (*tcl_DumpActiveMemory) (CONST char * fileName); /* 265 */ + void (*tcl_ValidateAllMemory) (CONST char * file, int line); /* 266 */ + void (*tcl_AppendResultVA) (Tcl_Interp * interp, va_list argList); /* 267 */ + void (*tcl_AppendStringsToObjVA) (Tcl_Obj * objPtr, va_list argList); /* 268 */ + CONST84_RETURN char * (*tcl_HashStats) (Tcl_HashTable * tablePtr); /* 269 */ + CONST84_RETURN char * (*tcl_ParseVar) (Tcl_Interp * interp, CONST char * start, CONST84 char ** termPtr); /* 270 */ + CONST84_RETURN char * (*tcl_PkgPresent) (Tcl_Interp * interp, CONST char * name, CONST char * version, int exact); /* 271 */ + CONST84_RETURN char * (*tcl_PkgPresentEx) (Tcl_Interp * interp, CONST char * name, CONST char * version, int exact, ClientData * clientDataPtr); /* 272 */ + int (*tcl_PkgProvide) (Tcl_Interp * interp, CONST char * name, CONST char * version); /* 273 */ + CONST84_RETURN char * (*tcl_PkgRequire) (Tcl_Interp * interp, CONST char * name, CONST char * version, int exact); /* 274 */ + void (*tcl_SetErrorCodeVA) (Tcl_Interp * interp, va_list argList); /* 275 */ + int (*tcl_VarEvalVA) (Tcl_Interp * interp, va_list argList); /* 276 */ + Tcl_Pid (*tcl_WaitPid) (Tcl_Pid pid, int * statPtr, int options); /* 277 */ + void (*tcl_PanicVA) (CONST char * format, va_list argList); /* 278 */ + void (*tcl_GetVersion) (int * major, int * minor, int * patchLevel, int * type); /* 279 */ + void (*tcl_InitMemory) (Tcl_Interp * interp); /* 280 */ + Tcl_Channel (*tcl_StackChannel) (Tcl_Interp * interp, Tcl_ChannelType * typePtr, ClientData instanceData, int mask, Tcl_Channel prevChan); /* 281 */ + int (*tcl_UnstackChannel) (Tcl_Interp * interp, Tcl_Channel chan); /* 282 */ Tcl_Channel (*tcl_GetStackedChannel) (Tcl_Channel chan); /* 283 */ - void (*tcl_SetMainLoop) (Tcl_MainLoopProc *proc); /* 284 */ + void (*tcl_SetMainLoop) (Tcl_MainLoopProc * proc); /* 284 */ void *reserved285; - void (*tcl_AppendObjToObj) (Tcl_Obj *objPtr, Tcl_Obj *appendObjPtr); /* 286 */ - Tcl_Encoding (*tcl_CreateEncoding) (CONST Tcl_EncodingType *typePtr); /* 287 */ - void (*tcl_CreateThreadExitHandler) (Tcl_ExitProc *proc, ClientData clientData); /* 288 */ - void (*tcl_DeleteThreadExitHandler) (Tcl_ExitProc *proc, ClientData clientData); /* 289 */ - void (*tcl_DiscardResult) (Tcl_SavedResult *statePtr); /* 290 */ - int (*tcl_EvalEx) (Tcl_Interp *interp, CONST char *script, int numBytes, int flags); /* 291 */ - int (*tcl_EvalObjv) (Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[], int flags); /* 292 */ - int (*tcl_EvalObjEx) (Tcl_Interp *interp, Tcl_Obj *objPtr, int flags); /* 293 */ + void (*tcl_AppendObjToObj) (Tcl_Obj * objPtr, Tcl_Obj * appendObjPtr); /* 286 */ + Tcl_Encoding (*tcl_CreateEncoding) (const Tcl_EncodingType * typePtr); /* 287 */ + void (*tcl_CreateThreadExitHandler) (Tcl_ExitProc * proc, ClientData clientData); /* 288 */ + void (*tcl_DeleteThreadExitHandler) (Tcl_ExitProc * proc, ClientData clientData); /* 289 */ + void (*tcl_DiscardResult) (Tcl_SavedResult * statePtr); /* 290 */ + int (*tcl_EvalEx) (Tcl_Interp * interp, CONST char * script, int numBytes, int flags); /* 291 */ + int (*tcl_EvalObjv) (Tcl_Interp * interp, int objc, Tcl_Obj *CONST objv[], int flags); /* 292 */ + int (*tcl_EvalObjEx) (Tcl_Interp * interp, Tcl_Obj * objPtr, int flags); /* 293 */ void (*tcl_ExitThread) (int status); /* 294 */ - int (*tcl_ExternalToUtf) (Tcl_Interp *interp, Tcl_Encoding encoding, CONST char *src, int srcLen, int flags, Tcl_EncodingState *statePtr, char *dst, int dstLen, int *srcReadPtr, int *dstWrotePtr, int *dstCharsPtr); /* 295 */ - char * (*tcl_ExternalToUtfDString) (Tcl_Encoding encoding, CONST char *src, int srcLen, Tcl_DString *dsPtr); /* 296 */ + int (*tcl_ExternalToUtf) (Tcl_Interp * interp, Tcl_Encoding encoding, CONST char * src, int srcLen, int flags, Tcl_EncodingState * statePtr, char * dst, int dstLen, int * srcReadPtr, int * dstWrotePtr, int * dstCharsPtr); /* 295 */ + char * (*tcl_ExternalToUtfDString) (Tcl_Encoding encoding, CONST char * src, int srcLen, Tcl_DString * dsPtr); /* 296 */ void (*tcl_FinalizeThread) (void); /* 297 */ void (*tcl_FinalizeNotifier) (ClientData clientData); /* 298 */ void (*tcl_FreeEncoding) (Tcl_Encoding encoding); /* 299 */ Tcl_ThreadId (*tcl_GetCurrentThread) (void); /* 300 */ - Tcl_Encoding (*tcl_GetEncoding) (Tcl_Interp *interp, CONST char *name); /* 301 */ + Tcl_Encoding (*tcl_GetEncoding) (Tcl_Interp * interp, CONST char * name); /* 301 */ CONST84_RETURN char * (*tcl_GetEncodingName) (Tcl_Encoding encoding); /* 302 */ - void (*tcl_GetEncodingNames) (Tcl_Interp *interp); /* 303 */ - int (*tcl_GetIndexFromObjStruct) (Tcl_Interp *interp, Tcl_Obj *objPtr, CONST VOID *tablePtr, int offset, CONST char *msg, int flags, int *indexPtr); /* 304 */ - VOID * (*tcl_GetThreadData) (Tcl_ThreadDataKey *keyPtr, int size); /* 305 */ - Tcl_Obj * (*tcl_GetVar2Ex) (Tcl_Interp *interp, CONST char *part1, CONST char *part2, int flags); /* 306 */ + void (*tcl_GetEncodingNames) (Tcl_Interp * interp); /* 303 */ + int (*tcl_GetIndexFromObjStruct) (Tcl_Interp * interp, Tcl_Obj * objPtr, CONST VOID * tablePtr, int offset, CONST char * msg, int flags, int * indexPtr); /* 304 */ + VOID * (*tcl_GetThreadData) (Tcl_ThreadDataKey * keyPtr, int size); /* 305 */ + Tcl_Obj * (*tcl_GetVar2Ex) (Tcl_Interp * interp, CONST char * part1, CONST char * part2, int flags); /* 306 */ ClientData (*tcl_InitNotifier) (void); /* 307 */ - void (*tcl_MutexLock) (Tcl_Mutex *mutexPtr); /* 308 */ - void (*tcl_MutexUnlock) (Tcl_Mutex *mutexPtr); /* 309 */ - void (*tcl_ConditionNotify) (Tcl_Condition *condPtr); /* 310 */ - void (*tcl_ConditionWait) (Tcl_Condition *condPtr, Tcl_Mutex *mutexPtr, Tcl_Time *timePtr); /* 311 */ - int (*tcl_NumUtfChars) (CONST char *src, int length); /* 312 */ - int (*tcl_ReadChars) (Tcl_Channel channel, Tcl_Obj *objPtr, int charsToRead, int appendFlag); /* 313 */ - void (*tcl_RestoreResult) (Tcl_Interp *interp, Tcl_SavedResult *statePtr); /* 314 */ - void (*tcl_SaveResult) (Tcl_Interp *interp, Tcl_SavedResult *statePtr); /* 315 */ - int (*tcl_SetSystemEncoding) (Tcl_Interp *interp, CONST char *name); /* 316 */ - Tcl_Obj * (*tcl_SetVar2Ex) (Tcl_Interp *interp, CONST char *part1, CONST char *part2, Tcl_Obj *newValuePtr, int flags); /* 317 */ + void (*tcl_MutexLock) (Tcl_Mutex * mutexPtr); /* 308 */ + void (*tcl_MutexUnlock) (Tcl_Mutex * mutexPtr); /* 309 */ + void (*tcl_ConditionNotify) (Tcl_Condition * condPtr); /* 310 */ + void (*tcl_ConditionWait) (Tcl_Condition * condPtr, Tcl_Mutex * mutexPtr, Tcl_Time * timePtr); /* 311 */ + int (*tcl_NumUtfChars) (CONST char * src, int length); /* 312 */ + int (*tcl_ReadChars) (Tcl_Channel channel, Tcl_Obj * objPtr, int charsToRead, int appendFlag); /* 313 */ + void (*tcl_RestoreResult) (Tcl_Interp * interp, Tcl_SavedResult * statePtr); /* 314 */ + void (*tcl_SaveResult) (Tcl_Interp * interp, Tcl_SavedResult * statePtr); /* 315 */ + int (*tcl_SetSystemEncoding) (Tcl_Interp * interp, CONST char * name); /* 316 */ + Tcl_Obj * (*tcl_SetVar2Ex) (Tcl_Interp * interp, CONST char * part1, CONST char * part2, Tcl_Obj * newValuePtr, int flags); /* 317 */ void (*tcl_ThreadAlert) (Tcl_ThreadId threadId); /* 318 */ - void (*tcl_ThreadQueueEvent) (Tcl_ThreadId threadId, Tcl_Event *evPtr, Tcl_QueuePosition position); /* 319 */ - Tcl_UniChar (*tcl_UniCharAtIndex) (CONST char *src, int index); /* 320 */ + void (*tcl_ThreadQueueEvent) (Tcl_ThreadId threadId, Tcl_Event* evPtr, Tcl_QueuePosition position); /* 319 */ + Tcl_UniChar (*tcl_UniCharAtIndex) (CONST char * src, int index); /* 320 */ Tcl_UniChar (*tcl_UniCharToLower) (int ch); /* 321 */ Tcl_UniChar (*tcl_UniCharToTitle) (int ch); /* 322 */ Tcl_UniChar (*tcl_UniCharToUpper) (int ch); /* 323 */ - int (*tcl_UniCharToUtf) (int ch, char *buf); /* 324 */ - CONST84_RETURN char * (*tcl_UtfAtIndex) (CONST char *src, int index); /* 325 */ - int (*tcl_UtfCharComplete) (CONST char *src, int length); /* 326 */ - int (*tcl_UtfBackslash) (CONST char *src, int *readPtr, char *dst); /* 327 */ - CONST84_RETURN char * (*tcl_UtfFindFirst) (CONST char *src, int ch); /* 328 */ - CONST84_RETURN char * (*tcl_UtfFindLast) (CONST char *src, int ch); /* 329 */ - CONST84_RETURN char * (*tcl_UtfNext) (CONST char *src); /* 330 */ - CONST84_RETURN char * (*tcl_UtfPrev) (CONST char *src, CONST char *start); /* 331 */ - int (*tcl_UtfToExternal) (Tcl_Interp *interp, Tcl_Encoding encoding, CONST char *src, int srcLen, int flags, Tcl_EncodingState *statePtr, char *dst, int dstLen, int *srcReadPtr, int *dstWrotePtr, int *dstCharsPtr); /* 332 */ - char * (*tcl_UtfToExternalDString) (Tcl_Encoding encoding, CONST char *src, int srcLen, Tcl_DString *dsPtr); /* 333 */ - int (*tcl_UtfToLower) (char *src); /* 334 */ - int (*tcl_UtfToTitle) (char *src); /* 335 */ - int (*tcl_UtfToUniChar) (CONST char *src, Tcl_UniChar *chPtr); /* 336 */ - int (*tcl_UtfToUpper) (char *src); /* 337 */ - int (*tcl_WriteChars) (Tcl_Channel chan, CONST char *src, int srcLen); /* 338 */ - int (*tcl_WriteObj) (Tcl_Channel chan, Tcl_Obj *objPtr); /* 339 */ - char * (*tcl_GetString) (Tcl_Obj *objPtr); /* 340 */ + int (*tcl_UniCharToUtf) (int ch, char * buf); /* 324 */ + CONST84_RETURN char * (*tcl_UtfAtIndex) (CONST char * src, int index); /* 325 */ + int (*tcl_UtfCharComplete) (CONST char * src, int length); /* 326 */ + int (*tcl_UtfBackslash) (CONST char * src, int * readPtr, char * dst); /* 327 */ + CONST84_RETURN char * (*tcl_UtfFindFirst) (CONST char * src, int ch); /* 328 */ + CONST84_RETURN char * (*tcl_UtfFindLast) (CONST char * src, int ch); /* 329 */ + CONST84_RETURN char * (*tcl_UtfNext) (CONST char * src); /* 330 */ + CONST84_RETURN char * (*tcl_UtfPrev) (CONST char * src, CONST char * start); /* 331 */ + int (*tcl_UtfToExternal) (Tcl_Interp * interp, Tcl_Encoding encoding, CONST char * src, int srcLen, int flags, Tcl_EncodingState * statePtr, char * dst, int dstLen, int * srcReadPtr, int * dstWrotePtr, int * dstCharsPtr); /* 332 */ + char * (*tcl_UtfToExternalDString) (Tcl_Encoding encoding, CONST char * src, int srcLen, Tcl_DString * dsPtr); /* 333 */ + int (*tcl_UtfToLower) (char * src); /* 334 */ + int (*tcl_UtfToTitle) (char * src); /* 335 */ + int (*tcl_UtfToUniChar) (CONST char * src, Tcl_UniChar * chPtr); /* 336 */ + int (*tcl_UtfToUpper) (char * src); /* 337 */ + int (*tcl_WriteChars) (Tcl_Channel chan, CONST char * src, int srcLen); /* 338 */ + int (*tcl_WriteObj) (Tcl_Channel chan, Tcl_Obj * objPtr); /* 339 */ + char * (*tcl_GetString) (Tcl_Obj * objPtr); /* 340 */ CONST84_RETURN char * (*tcl_GetDefaultEncodingDir) (void); /* 341 */ - void (*tcl_SetDefaultEncodingDir) (CONST char *path); /* 342 */ + void (*tcl_SetDefaultEncodingDir) (CONST char * path); /* 342 */ void (*tcl_AlertNotifier) (ClientData clientData); /* 343 */ void (*tcl_ServiceModeHook) (int mode); /* 344 */ int (*tcl_UniCharIsAlnum) (int ch); /* 345 */ @@ -3797,234 +3912,234 @@ typedef struct TclStubs { int (*tcl_UniCharIsSpace) (int ch); /* 349 */ int (*tcl_UniCharIsUpper) (int ch); /* 350 */ int (*tcl_UniCharIsWordChar) (int ch); /* 351 */ - int (*tcl_UniCharLen) (CONST Tcl_UniChar *uniStr); /* 352 */ - int (*tcl_UniCharNcmp) (CONST Tcl_UniChar *ucs, CONST Tcl_UniChar *uct, unsigned long numChars); /* 353 */ - char * (*tcl_UniCharToUtfDString) (CONST Tcl_UniChar *uniStr, int uniLength, Tcl_DString *dsPtr); /* 354 */ - Tcl_UniChar * (*tcl_UtfToUniCharDString) (CONST char *src, int length, Tcl_DString *dsPtr); /* 355 */ - Tcl_RegExp (*tcl_GetRegExpFromObj) (Tcl_Interp *interp, Tcl_Obj *patObj, int flags); /* 356 */ - Tcl_Obj * (*tcl_EvalTokens) (Tcl_Interp *interp, Tcl_Token *tokenPtr, int count); /* 357 */ - void (*tcl_FreeParse) (Tcl_Parse *parsePtr); /* 358 */ - void (*tcl_LogCommandInfo) (Tcl_Interp *interp, CONST char *script, CONST char *command, int length); /* 359 */ - int (*tcl_ParseBraces) (Tcl_Interp *interp, CONST char *start, int numBytes, Tcl_Parse *parsePtr, int append, CONST84 char **termPtr); /* 360 */ - int (*tcl_ParseCommand) (Tcl_Interp *interp, CONST char *start, int numBytes, int nested, Tcl_Parse *parsePtr); /* 361 */ - int (*tcl_ParseExpr) (Tcl_Interp *interp, CONST char *start, int numBytes, Tcl_Parse *parsePtr); /* 362 */ - int (*tcl_ParseQuotedString) (Tcl_Interp *interp, CONST char *start, int numBytes, Tcl_Parse *parsePtr, int append, CONST84 char **termPtr); /* 363 */ - int (*tcl_ParseVarName) (Tcl_Interp *interp, CONST char *start, int numBytes, Tcl_Parse *parsePtr, int append); /* 364 */ - char * (*tcl_GetCwd) (Tcl_Interp *interp, Tcl_DString *cwdPtr); /* 365 */ - int (*tcl_Chdir) (CONST char *dirName); /* 366 */ - int (*tcl_Access) (CONST char *path, int mode); /* 367 */ - int (*tcl_Stat) (CONST char *path, struct stat *bufPtr); /* 368 */ - int (*tcl_UtfNcmp) (CONST char *s1, CONST char *s2, unsigned long n); /* 369 */ - int (*tcl_UtfNcasecmp) (CONST char *s1, CONST char *s2, unsigned long n); /* 370 */ - int (*tcl_StringCaseMatch) (CONST char *str, CONST char *pattern, int nocase); /* 371 */ + int (*tcl_UniCharLen) (CONST Tcl_UniChar * uniStr); /* 352 */ + int (*tcl_UniCharNcmp) (CONST Tcl_UniChar * ucs, CONST Tcl_UniChar * uct, unsigned long numChars); /* 353 */ + char * (*tcl_UniCharToUtfDString) (CONST Tcl_UniChar * uniStr, int uniLength, Tcl_DString * dsPtr); /* 354 */ + Tcl_UniChar * (*tcl_UtfToUniCharDString) (CONST char * src, int length, Tcl_DString * dsPtr); /* 355 */ + Tcl_RegExp (*tcl_GetRegExpFromObj) (Tcl_Interp * interp, Tcl_Obj * patObj, int flags); /* 356 */ + Tcl_Obj * (*tcl_EvalTokens) (Tcl_Interp * interp, Tcl_Token * tokenPtr, int count); /* 357 */ + void (*tcl_FreeParse) (Tcl_Parse * parsePtr); /* 358 */ + void (*tcl_LogCommandInfo) (Tcl_Interp * interp, CONST char * script, CONST char * command, int length); /* 359 */ + int (*tcl_ParseBraces) (Tcl_Interp * interp, CONST char * start, int numBytes, Tcl_Parse * parsePtr, int append, CONST84 char ** termPtr); /* 360 */ + int (*tcl_ParseCommand) (Tcl_Interp * interp, CONST char * start, int numBytes, int nested, Tcl_Parse * parsePtr); /* 361 */ + int (*tcl_ParseExpr) (Tcl_Interp * interp, CONST char * start, int numBytes, Tcl_Parse * parsePtr); /* 362 */ + int (*tcl_ParseQuotedString) (Tcl_Interp * interp, CONST char * start, int numBytes, Tcl_Parse * parsePtr, int append, CONST84 char ** termPtr); /* 363 */ + int (*tcl_ParseVarName) (Tcl_Interp * interp, CONST char * start, int numBytes, Tcl_Parse * parsePtr, int append); /* 364 */ + char * (*tcl_GetCwd) (Tcl_Interp * interp, Tcl_DString * cwdPtr); /* 365 */ + int (*tcl_Chdir) (CONST char * dirName); /* 366 */ + int (*tcl_Access) (CONST char * path, int mode); /* 367 */ + int (*tcl_Stat) (CONST char * path, struct stat * bufPtr); /* 368 */ + int (*tcl_UtfNcmp) (CONST char * s1, CONST char * s2, unsigned long n); /* 369 */ + int (*tcl_UtfNcasecmp) (CONST char * s1, CONST char * s2, unsigned long n); /* 370 */ + int (*tcl_StringCaseMatch) (CONST char * str, CONST char * pattern, int nocase); /* 371 */ int (*tcl_UniCharIsControl) (int ch); /* 372 */ int (*tcl_UniCharIsGraph) (int ch); /* 373 */ int (*tcl_UniCharIsPrint) (int ch); /* 374 */ int (*tcl_UniCharIsPunct) (int ch); /* 375 */ - int (*tcl_RegExpExecObj) (Tcl_Interp *interp, Tcl_RegExp regexp, Tcl_Obj *textObj, int offset, int nmatches, int flags); /* 376 */ - void (*tcl_RegExpGetInfo) (Tcl_RegExp regexp, Tcl_RegExpInfo *infoPtr); /* 377 */ - Tcl_Obj * (*tcl_NewUnicodeObj) (CONST Tcl_UniChar *unicode, int numChars); /* 378 */ - void (*tcl_SetUnicodeObj) (Tcl_Obj *objPtr, CONST Tcl_UniChar *unicode, int numChars); /* 379 */ - int (*tcl_GetCharLength) (Tcl_Obj *objPtr); /* 380 */ - Tcl_UniChar (*tcl_GetUniChar) (Tcl_Obj *objPtr, int index); /* 381 */ - Tcl_UniChar * (*tcl_GetUnicode) (Tcl_Obj *objPtr); /* 382 */ - Tcl_Obj * (*tcl_GetRange) (Tcl_Obj *objPtr, int first, int last); /* 383 */ - void (*tcl_AppendUnicodeToObj) (Tcl_Obj *objPtr, CONST Tcl_UniChar *unicode, int length); /* 384 */ - int (*tcl_RegExpMatchObj) (Tcl_Interp *interp, Tcl_Obj *textObj, Tcl_Obj *patternObj); /* 385 */ - void (*tcl_SetNotifier) (Tcl_NotifierProcs *notifierProcPtr); /* 386 */ + int (*tcl_RegExpExecObj) (Tcl_Interp * interp, Tcl_RegExp regexp, Tcl_Obj * textObj, int offset, int nmatches, int flags); /* 376 */ + void (*tcl_RegExpGetInfo) (Tcl_RegExp regexp, Tcl_RegExpInfo * infoPtr); /* 377 */ + Tcl_Obj * (*tcl_NewUnicodeObj) (CONST Tcl_UniChar * unicode, int numChars); /* 378 */ + void (*tcl_SetUnicodeObj) (Tcl_Obj * objPtr, CONST Tcl_UniChar * unicode, int numChars); /* 379 */ + int (*tcl_GetCharLength) (Tcl_Obj * objPtr); /* 380 */ + Tcl_UniChar (*tcl_GetUniChar) (Tcl_Obj * objPtr, int index); /* 381 */ + Tcl_UniChar * (*tcl_GetUnicode) (Tcl_Obj * objPtr); /* 382 */ + Tcl_Obj * (*tcl_GetRange) (Tcl_Obj * objPtr, int first, int last); /* 383 */ + void (*tcl_AppendUnicodeToObj) (Tcl_Obj * objPtr, CONST Tcl_UniChar * unicode, int length); /* 384 */ + int (*tcl_RegExpMatchObj) (Tcl_Interp * interp, Tcl_Obj * textObj, Tcl_Obj * patternObj); /* 385 */ + void (*tcl_SetNotifier) (Tcl_NotifierProcs * notifierProcPtr); /* 386 */ Tcl_Mutex * (*tcl_GetAllocMutex) (void); /* 387 */ - int (*tcl_GetChannelNames) (Tcl_Interp *interp); /* 388 */ - int (*tcl_GetChannelNamesEx) (Tcl_Interp *interp, CONST char *pattern); /* 389 */ - int (*tcl_ProcObjCmd) (ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]); /* 390 */ - void (*tcl_ConditionFinalize) (Tcl_Condition *condPtr); /* 391 */ - void (*tcl_MutexFinalize) (Tcl_Mutex *mutex); /* 392 */ - int (*tcl_CreateThread) (Tcl_ThreadId *idPtr, Tcl_ThreadCreateProc proc, ClientData clientData, int stackSize, int flags); /* 393 */ - int (*tcl_ReadRaw) (Tcl_Channel chan, char *dst, int bytesToRead); /* 394 */ - int (*tcl_WriteRaw) (Tcl_Channel chan, CONST char *src, int srcLen); /* 395 */ + int (*tcl_GetChannelNames) (Tcl_Interp * interp); /* 388 */ + int (*tcl_GetChannelNamesEx) (Tcl_Interp * interp, CONST char * pattern); /* 389 */ + int (*tcl_ProcObjCmd) (ClientData clientData, Tcl_Interp * interp, int objc, Tcl_Obj *CONST objv[]); /* 390 */ + void (*tcl_ConditionFinalize) (Tcl_Condition * condPtr); /* 391 */ + void (*tcl_MutexFinalize) (Tcl_Mutex * mutex); /* 392 */ + int (*tcl_CreateThread) (Tcl_ThreadId * idPtr, Tcl_ThreadCreateProc proc, ClientData clientData, int stackSize, int flags); /* 393 */ + int (*tcl_ReadRaw) (Tcl_Channel chan, char * dst, int bytesToRead); /* 394 */ + int (*tcl_WriteRaw) (Tcl_Channel chan, CONST char * src, int srcLen); /* 395 */ Tcl_Channel (*tcl_GetTopChannel) (Tcl_Channel chan); /* 396 */ int (*tcl_ChannelBuffered) (Tcl_Channel chan); /* 397 */ - CONST84_RETURN char * (*tcl_ChannelName) (CONST Tcl_ChannelType *chanTypePtr); /* 398 */ - Tcl_ChannelTypeVersion (*tcl_ChannelVersion) (CONST Tcl_ChannelType *chanTypePtr); /* 399 */ - Tcl_DriverBlockModeProc * (*tcl_ChannelBlockModeProc) (CONST Tcl_ChannelType *chanTypePtr); /* 400 */ - Tcl_DriverCloseProc * (*tcl_ChannelCloseProc) (CONST Tcl_ChannelType *chanTypePtr); /* 401 */ - Tcl_DriverClose2Proc * (*tcl_ChannelClose2Proc) (CONST Tcl_ChannelType *chanTypePtr); /* 402 */ - Tcl_DriverInputProc * (*tcl_ChannelInputProc) (CONST Tcl_ChannelType *chanTypePtr); /* 403 */ - Tcl_DriverOutputProc * (*tcl_ChannelOutputProc) (CONST Tcl_ChannelType *chanTypePtr); /* 404 */ - Tcl_DriverSeekProc * (*tcl_ChannelSeekProc) (CONST Tcl_ChannelType *chanTypePtr); /* 405 */ - Tcl_DriverSetOptionProc * (*tcl_ChannelSetOptionProc) (CONST Tcl_ChannelType *chanTypePtr); /* 406 */ - Tcl_DriverGetOptionProc * (*tcl_ChannelGetOptionProc) (CONST Tcl_ChannelType *chanTypePtr); /* 407 */ - Tcl_DriverWatchProc * (*tcl_ChannelWatchProc) (CONST Tcl_ChannelType *chanTypePtr); /* 408 */ - Tcl_DriverGetHandleProc * (*tcl_ChannelGetHandleProc) (CONST Tcl_ChannelType *chanTypePtr); /* 409 */ - Tcl_DriverFlushProc * (*tcl_ChannelFlushProc) (CONST Tcl_ChannelType *chanTypePtr); /* 410 */ - Tcl_DriverHandlerProc * (*tcl_ChannelHandlerProc) (CONST Tcl_ChannelType *chanTypePtr); /* 411 */ - int (*tcl_JoinThread) (Tcl_ThreadId threadId, int *result); /* 412 */ + CONST84_RETURN char * (*tcl_ChannelName) (CONST Tcl_ChannelType * chanTypePtr); /* 398 */ + Tcl_ChannelTypeVersion (*tcl_ChannelVersion) (CONST Tcl_ChannelType * chanTypePtr); /* 399 */ + Tcl_DriverBlockModeProc * (*tcl_ChannelBlockModeProc) (CONST Tcl_ChannelType * chanTypePtr); /* 400 */ + Tcl_DriverCloseProc * (*tcl_ChannelCloseProc) (CONST Tcl_ChannelType * chanTypePtr); /* 401 */ + Tcl_DriverClose2Proc * (*tcl_ChannelClose2Proc) (CONST Tcl_ChannelType * chanTypePtr); /* 402 */ + Tcl_DriverInputProc * (*tcl_ChannelInputProc) (CONST Tcl_ChannelType * chanTypePtr); /* 403 */ + Tcl_DriverOutputProc * (*tcl_ChannelOutputProc) (CONST Tcl_ChannelType * chanTypePtr); /* 404 */ + Tcl_DriverSeekProc * (*tcl_ChannelSeekProc) (CONST Tcl_ChannelType * chanTypePtr); /* 405 */ + Tcl_DriverSetOptionProc * (*tcl_ChannelSetOptionProc) (CONST Tcl_ChannelType * chanTypePtr); /* 406 */ + Tcl_DriverGetOptionProc * (*tcl_ChannelGetOptionProc) (CONST Tcl_ChannelType * chanTypePtr); /* 407 */ + Tcl_DriverWatchProc * (*tcl_ChannelWatchProc) (CONST Tcl_ChannelType * chanTypePtr); /* 408 */ + Tcl_DriverGetHandleProc * (*tcl_ChannelGetHandleProc) (CONST Tcl_ChannelType * chanTypePtr); /* 409 */ + Tcl_DriverFlushProc * (*tcl_ChannelFlushProc) (CONST Tcl_ChannelType * chanTypePtr); /* 410 */ + Tcl_DriverHandlerProc * (*tcl_ChannelHandlerProc) (CONST Tcl_ChannelType * chanTypePtr); /* 411 */ + int (*tcl_JoinThread) (Tcl_ThreadId threadId, int* result); /* 412 */ int (*tcl_IsChannelShared) (Tcl_Channel channel); /* 413 */ - int (*tcl_IsChannelRegistered) (Tcl_Interp *interp, Tcl_Channel channel); /* 414 */ + int (*tcl_IsChannelRegistered) (Tcl_Interp* interp, Tcl_Channel channel); /* 414 */ void (*tcl_CutChannel) (Tcl_Channel channel); /* 415 */ void (*tcl_SpliceChannel) (Tcl_Channel channel); /* 416 */ void (*tcl_ClearChannelHandlers) (Tcl_Channel channel); /* 417 */ - int (*tcl_IsChannelExisting) (CONST char *channelName); /* 418 */ - int (*tcl_UniCharNcasecmp) (CONST Tcl_UniChar *ucs, CONST Tcl_UniChar *uct, unsigned long numChars); /* 419 */ - int (*tcl_UniCharCaseMatch) (CONST Tcl_UniChar *uniStr, CONST Tcl_UniChar *uniPattern, int nocase); /* 420 */ - Tcl_HashEntry * (*tcl_FindHashEntry) (Tcl_HashTable *tablePtr, CONST char *key); /* 421 */ - Tcl_HashEntry * (*tcl_CreateHashEntry) (Tcl_HashTable *tablePtr, CONST char *key, int *newPtr); /* 422 */ - void (*tcl_InitCustomHashTable) (Tcl_HashTable *tablePtr, int keyType, Tcl_HashKeyType *typePtr); /* 423 */ - void (*tcl_InitObjHashTable) (Tcl_HashTable *tablePtr); /* 424 */ - ClientData (*tcl_CommandTraceInfo) (Tcl_Interp *interp, CONST char *varName, int flags, Tcl_CommandTraceProc *procPtr, ClientData prevClientData); /* 425 */ - int (*tcl_TraceCommand) (Tcl_Interp *interp, CONST char *varName, int flags, Tcl_CommandTraceProc *proc, ClientData clientData); /* 426 */ - void (*tcl_UntraceCommand) (Tcl_Interp *interp, CONST char *varName, int flags, Tcl_CommandTraceProc *proc, ClientData clientData); /* 427 */ + int (*tcl_IsChannelExisting) (CONST char* channelName); /* 418 */ + int (*tcl_UniCharNcasecmp) (CONST Tcl_UniChar * ucs, CONST Tcl_UniChar * uct, unsigned long numChars); /* 419 */ + int (*tcl_UniCharCaseMatch) (CONST Tcl_UniChar * uniStr, CONST Tcl_UniChar * uniPattern, int nocase); /* 420 */ + Tcl_HashEntry * (*tcl_FindHashEntry) (Tcl_HashTable * tablePtr, CONST char * key); /* 421 */ + Tcl_HashEntry * (*tcl_CreateHashEntry) (Tcl_HashTable * tablePtr, CONST char * key, int * newPtr); /* 422 */ + void (*tcl_InitCustomHashTable) (Tcl_HashTable * tablePtr, int keyType, Tcl_HashKeyType * typePtr); /* 423 */ + void (*tcl_InitObjHashTable) (Tcl_HashTable * tablePtr); /* 424 */ + ClientData (*tcl_CommandTraceInfo) (Tcl_Interp * interp, CONST char * varName, int flags, Tcl_CommandTraceProc * procPtr, ClientData prevClientData); /* 425 */ + int (*tcl_TraceCommand) (Tcl_Interp * interp, CONST char * varName, int flags, Tcl_CommandTraceProc * proc, ClientData clientData); /* 426 */ + void (*tcl_UntraceCommand) (Tcl_Interp * interp, CONST char * varName, int flags, Tcl_CommandTraceProc * proc, ClientData clientData); /* 427 */ char * (*tcl_AttemptAlloc) (unsigned int size); /* 428 */ - char * (*tcl_AttemptDbCkalloc) (unsigned int size, CONST char *file, int line); /* 429 */ - char * (*tcl_AttemptRealloc) (char *ptr, unsigned int size); /* 430 */ - char * (*tcl_AttemptDbCkrealloc) (char *ptr, unsigned int size, CONST char *file, int line); /* 431 */ - int (*tcl_AttemptSetObjLength) (Tcl_Obj *objPtr, int length); /* 432 */ + char * (*tcl_AttemptDbCkalloc) (unsigned int size, CONST char * file, int line); /* 429 */ + char * (*tcl_AttemptRealloc) (char * ptr, unsigned int size); /* 430 */ + char * (*tcl_AttemptDbCkrealloc) (char * ptr, unsigned int size, CONST char * file, int line); /* 431 */ + int (*tcl_AttemptSetObjLength) (Tcl_Obj * objPtr, int length); /* 432 */ Tcl_ThreadId (*tcl_GetChannelThread) (Tcl_Channel channel); /* 433 */ - Tcl_UniChar * (*tcl_GetUnicodeFromObj) (Tcl_Obj *objPtr, int *lengthPtr); /* 434 */ - int (*tcl_GetMathFuncInfo) (Tcl_Interp *interp, CONST char *name, int *numArgsPtr, Tcl_ValueType **argTypesPtr, Tcl_MathProc **procPtr, ClientData *clientDataPtr); /* 435 */ - Tcl_Obj * (*tcl_ListMathFuncs) (Tcl_Interp *interp, CONST char *pattern); /* 436 */ - Tcl_Obj * (*tcl_SubstObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, int flags); /* 437 */ - int (*tcl_DetachChannel) (Tcl_Interp *interp, Tcl_Channel channel); /* 438 */ + Tcl_UniChar * (*tcl_GetUnicodeFromObj) (Tcl_Obj * objPtr, int * lengthPtr); /* 434 */ + int (*tcl_GetMathFuncInfo) (Tcl_Interp * interp, CONST char * name, int * numArgsPtr, Tcl_ValueType ** argTypesPtr, Tcl_MathProc ** procPtr, ClientData * clientDataPtr); /* 435 */ + Tcl_Obj * (*tcl_ListMathFuncs) (Tcl_Interp * interp, CONST char * pattern); /* 436 */ + Tcl_Obj * (*tcl_SubstObj) (Tcl_Interp * interp, Tcl_Obj * objPtr, int flags); /* 437 */ + int (*tcl_DetachChannel) (Tcl_Interp* interp, Tcl_Channel channel); /* 438 */ int (*tcl_IsStandardChannel) (Tcl_Channel channel); /* 439 */ - int (*tcl_FSCopyFile) (Tcl_Obj *srcPathPtr, Tcl_Obj *destPathPtr); /* 440 */ - int (*tcl_FSCopyDirectory) (Tcl_Obj *srcPathPtr, Tcl_Obj *destPathPtr, Tcl_Obj **errorPtr); /* 441 */ - int (*tcl_FSCreateDirectory) (Tcl_Obj *pathPtr); /* 442 */ - int (*tcl_FSDeleteFile) (Tcl_Obj *pathPtr); /* 443 */ - int (*tcl_FSLoadFile) (Tcl_Interp *interp, Tcl_Obj *pathPtr, CONST char *sym1, CONST char *sym2, Tcl_PackageInitProc **proc1Ptr, Tcl_PackageInitProc **proc2Ptr, Tcl_LoadHandle *handlePtr, Tcl_FSUnloadFileProc **unloadProcPtr); /* 444 */ - int (*tcl_FSMatchInDirectory) (Tcl_Interp *interp, Tcl_Obj *result, Tcl_Obj *pathPtr, CONST char *pattern, Tcl_GlobTypeData *types); /* 445 */ - Tcl_Obj * (*tcl_FSLink) (Tcl_Obj *pathPtr, Tcl_Obj *toPtr, int linkAction); /* 446 */ - int (*tcl_FSRemoveDirectory) (Tcl_Obj *pathPtr, int recursive, Tcl_Obj **errorPtr); /* 447 */ - int (*tcl_FSRenameFile) (Tcl_Obj *srcPathPtr, Tcl_Obj *destPathPtr); /* 448 */ - int (*tcl_FSLstat) (Tcl_Obj *pathPtr, Tcl_StatBuf *buf); /* 449 */ - int (*tcl_FSUtime) (Tcl_Obj *pathPtr, struct utimbuf *tval); /* 450 */ - int (*tcl_FSFileAttrsGet) (Tcl_Interp *interp, int index, Tcl_Obj *pathPtr, Tcl_Obj **objPtrRef); /* 451 */ - int (*tcl_FSFileAttrsSet) (Tcl_Interp *interp, int index, Tcl_Obj *pathPtr, Tcl_Obj *objPtr); /* 452 */ - CONST char ** (*tcl_FSFileAttrStrings) (Tcl_Obj *pathPtr, Tcl_Obj **objPtrRef); /* 453 */ - int (*tcl_FSStat) (Tcl_Obj *pathPtr, Tcl_StatBuf *buf); /* 454 */ - int (*tcl_FSAccess) (Tcl_Obj *pathPtr, int mode); /* 455 */ - Tcl_Channel (*tcl_FSOpenFileChannel) (Tcl_Interp *interp, Tcl_Obj *pathPtr, CONST char *modeString, int permissions); /* 456 */ - Tcl_Obj * (*tcl_FSGetCwd) (Tcl_Interp *interp); /* 457 */ - int (*tcl_FSChdir) (Tcl_Obj *pathPtr); /* 458 */ - int (*tcl_FSConvertToPathType) (Tcl_Interp *interp, Tcl_Obj *pathPtr); /* 459 */ - Tcl_Obj * (*tcl_FSJoinPath) (Tcl_Obj *listObj, int elements); /* 460 */ - Tcl_Obj * (*tcl_FSSplitPath) (Tcl_Obj *pathPtr, int *lenPtr); /* 461 */ - int (*tcl_FSEqualPaths) (Tcl_Obj *firstPtr, Tcl_Obj *secondPtr); /* 462 */ - Tcl_Obj * (*tcl_FSGetNormalizedPath) (Tcl_Interp *interp, Tcl_Obj *pathPtr); /* 463 */ - Tcl_Obj * (*tcl_FSJoinToPath) (Tcl_Obj *pathPtr, int objc, Tcl_Obj *CONST objv[]); /* 464 */ - ClientData (*tcl_FSGetInternalRep) (Tcl_Obj *pathPtr, Tcl_Filesystem *fsPtr); /* 465 */ - Tcl_Obj * (*tcl_FSGetTranslatedPath) (Tcl_Interp *interp, Tcl_Obj *pathPtr); /* 466 */ - int (*tcl_FSEvalFile) (Tcl_Interp *interp, Tcl_Obj *fileName); /* 467 */ - Tcl_Obj * (*tcl_FSNewNativePath) (Tcl_Filesystem *fromFilesystem, ClientData clientData); /* 468 */ - CONST char * (*tcl_FSGetNativePath) (Tcl_Obj *pathPtr); /* 469 */ - Tcl_Obj * (*tcl_FSFileSystemInfo) (Tcl_Obj *pathPtr); /* 470 */ - Tcl_Obj * (*tcl_FSPathSeparator) (Tcl_Obj *pathPtr); /* 471 */ - Tcl_Obj * (*tcl_FSListVolumes) (void); /* 472 */ - int (*tcl_FSRegister) (ClientData clientData, Tcl_Filesystem *fsPtr); /* 473 */ - int (*tcl_FSUnregister) (Tcl_Filesystem *fsPtr); /* 474 */ - ClientData (*tcl_FSData) (Tcl_Filesystem *fsPtr); /* 475 */ - CONST char * (*tcl_FSGetTranslatedStringPath) (Tcl_Interp *interp, Tcl_Obj *pathPtr); /* 476 */ - Tcl_Filesystem * (*tcl_FSGetFileSystemForPath) (Tcl_Obj *pathPtr); /* 477 */ - Tcl_PathType (*tcl_FSGetPathType) (Tcl_Obj *pathPtr); /* 478 */ + int (*tcl_FSCopyFile) (Tcl_Obj * srcPathPtr, Tcl_Obj * destPathPtr); /* 440 */ + int (*tcl_FSCopyDirectory) (Tcl_Obj * srcPathPtr, Tcl_Obj * destPathPtr, Tcl_Obj ** errorPtr); /* 441 */ + int (*tcl_FSCreateDirectory) (Tcl_Obj * pathPtr); /* 442 */ + int (*tcl_FSDeleteFile) (Tcl_Obj * pathPtr); /* 443 */ + int (*tcl_FSLoadFile) (Tcl_Interp * interp, Tcl_Obj * pathPtr, CONST char * sym1, CONST char * sym2, Tcl_PackageInitProc ** proc1Ptr, Tcl_PackageInitProc ** proc2Ptr, Tcl_LoadHandle * handlePtr, Tcl_FSUnloadFileProc ** unloadProcPtr); /* 444 */ + int (*tcl_FSMatchInDirectory) (Tcl_Interp * interp, Tcl_Obj * result, Tcl_Obj * pathPtr, CONST char * pattern, Tcl_GlobTypeData * types); /* 445 */ + Tcl_Obj * (*tcl_FSLink) (Tcl_Obj * pathPtr, Tcl_Obj * toPtr, int linkAction); /* 446 */ + int (*tcl_FSRemoveDirectory) (Tcl_Obj * pathPtr, int recursive, Tcl_Obj ** errorPtr); /* 447 */ + int (*tcl_FSRenameFile) (Tcl_Obj * srcPathPtr, Tcl_Obj * destPathPtr); /* 448 */ + int (*tcl_FSLstat) (Tcl_Obj * pathPtr, Tcl_StatBuf * buf); /* 449 */ + int (*tcl_FSUtime) (Tcl_Obj * pathPtr, struct utimbuf * tval); /* 450 */ + int (*tcl_FSFileAttrsGet) (Tcl_Interp * interp, int index, Tcl_Obj * pathPtr, Tcl_Obj ** objPtrRef); /* 451 */ + int (*tcl_FSFileAttrsSet) (Tcl_Interp * interp, int index, Tcl_Obj * pathPtr, Tcl_Obj * objPtr); /* 452 */ + CONST char ** (*tcl_FSFileAttrStrings) (Tcl_Obj * pathPtr, Tcl_Obj ** objPtrRef); /* 453 */ + int (*tcl_FSStat) (Tcl_Obj * pathPtr, Tcl_StatBuf * buf); /* 454 */ + int (*tcl_FSAccess) (Tcl_Obj * pathPtr, int mode); /* 455 */ + Tcl_Channel (*tcl_FSOpenFileChannel) (Tcl_Interp * interp, Tcl_Obj * pathPtr, CONST char * modeString, int permissions); /* 456 */ + Tcl_Obj* (*tcl_FSGetCwd) (Tcl_Interp * interp); /* 457 */ + int (*tcl_FSChdir) (Tcl_Obj * pathPtr); /* 458 */ + int (*tcl_FSConvertToPathType) (Tcl_Interp * interp, Tcl_Obj * pathPtr); /* 459 */ + Tcl_Obj* (*tcl_FSJoinPath) (Tcl_Obj * listObj, int elements); /* 460 */ + Tcl_Obj* (*tcl_FSSplitPath) (Tcl_Obj* pathPtr, int * lenPtr); /* 461 */ + int (*tcl_FSEqualPaths) (Tcl_Obj* firstPtr, Tcl_Obj* secondPtr); /* 462 */ + Tcl_Obj* (*tcl_FSGetNormalizedPath) (Tcl_Interp * interp, Tcl_Obj* pathPtr); /* 463 */ + Tcl_Obj* (*tcl_FSJoinToPath) (Tcl_Obj * pathPtr, int objc, Tcl_Obj *CONST objv[]); /* 464 */ + ClientData (*tcl_FSGetInternalRep) (Tcl_Obj* pathPtr, Tcl_Filesystem * fsPtr); /* 465 */ + Tcl_Obj* (*tcl_FSGetTranslatedPath) (Tcl_Interp * interp, Tcl_Obj* pathPtr); /* 466 */ + int (*tcl_FSEvalFile) (Tcl_Interp * interp, Tcl_Obj * fileName); /* 467 */ + Tcl_Obj* (*tcl_FSNewNativePath) (Tcl_Filesystem* fromFilesystem, ClientData clientData); /* 468 */ + CONST char* (*tcl_FSGetNativePath) (Tcl_Obj* pathPtr); /* 469 */ + Tcl_Obj* (*tcl_FSFileSystemInfo) (Tcl_Obj* pathPtr); /* 470 */ + Tcl_Obj* (*tcl_FSPathSeparator) (Tcl_Obj* pathPtr); /* 471 */ + Tcl_Obj* (*tcl_FSListVolumes) (void); /* 472 */ + int (*tcl_FSRegister) (ClientData clientData, Tcl_Filesystem * fsPtr); /* 473 */ + int (*tcl_FSUnregister) (Tcl_Filesystem * fsPtr); /* 474 */ + ClientData (*tcl_FSData) (Tcl_Filesystem * fsPtr); /* 475 */ + CONST char* (*tcl_FSGetTranslatedStringPath) (Tcl_Interp * interp, Tcl_Obj* pathPtr); /* 476 */ + Tcl_Filesystem* (*tcl_FSGetFileSystemForPath) (Tcl_Obj* pathPtr); /* 477 */ + Tcl_PathType (*tcl_FSGetPathType) (Tcl_Obj * pathPtr); /* 478 */ int (*tcl_OutputBuffered) (Tcl_Channel chan); /* 479 */ - void (*tcl_FSMountsChanged) (Tcl_Filesystem *fsPtr); /* 480 */ - int (*tcl_EvalTokensStandard) (Tcl_Interp *interp, Tcl_Token *tokenPtr, int count); /* 481 */ - void (*tcl_GetTime) (Tcl_Time *timeBuf); /* 482 */ - Tcl_Trace (*tcl_CreateObjTrace) (Tcl_Interp *interp, int level, int flags, Tcl_CmdObjTraceProc *objProc, ClientData clientData, Tcl_CmdObjTraceDeleteProc *delProc); /* 483 */ - int (*tcl_GetCommandInfoFromToken) (Tcl_Command token, Tcl_CmdInfo *infoPtr); /* 484 */ - int (*tcl_SetCommandInfoFromToken) (Tcl_Command token, CONST Tcl_CmdInfo *infoPtr); /* 485 */ - Tcl_Obj * (*tcl_DbNewWideIntObj) (Tcl_WideInt wideValue, CONST char *file, int line); /* 486 */ - int (*tcl_GetWideIntFromObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, Tcl_WideInt *widePtr); /* 487 */ + void (*tcl_FSMountsChanged) (Tcl_Filesystem * fsPtr); /* 480 */ + int (*tcl_EvalTokensStandard) (Tcl_Interp * interp, Tcl_Token * tokenPtr, int count); /* 481 */ + void (*tcl_GetTime) (Tcl_Time* timeBuf); /* 482 */ + Tcl_Trace (*tcl_CreateObjTrace) (Tcl_Interp* interp, int level, int flags, Tcl_CmdObjTraceProc* objProc, ClientData clientData, Tcl_CmdObjTraceDeleteProc* delProc); /* 483 */ + int (*tcl_GetCommandInfoFromToken) (Tcl_Command token, Tcl_CmdInfo* infoPtr); /* 484 */ + int (*tcl_SetCommandInfoFromToken) (Tcl_Command token, CONST Tcl_CmdInfo* infoPtr); /* 485 */ + Tcl_Obj * (*tcl_DbNewWideIntObj) (Tcl_WideInt wideValue, CONST char * file, int line); /* 486 */ + int (*tcl_GetWideIntFromObj) (Tcl_Interp * interp, Tcl_Obj * objPtr, Tcl_WideInt * widePtr); /* 487 */ Tcl_Obj * (*tcl_NewWideIntObj) (Tcl_WideInt wideValue); /* 488 */ - void (*tcl_SetWideIntObj) (Tcl_Obj *objPtr, Tcl_WideInt wideValue); /* 489 */ + void (*tcl_SetWideIntObj) (Tcl_Obj * objPtr, Tcl_WideInt wideValue); /* 489 */ Tcl_StatBuf * (*tcl_AllocStatBuf) (void); /* 490 */ Tcl_WideInt (*tcl_Seek) (Tcl_Channel chan, Tcl_WideInt offset, int mode); /* 491 */ Tcl_WideInt (*tcl_Tell) (Tcl_Channel chan); /* 492 */ - Tcl_DriverWideSeekProc * (*tcl_ChannelWideSeekProc) (CONST Tcl_ChannelType *chanTypePtr); /* 493 */ - int (*tcl_DictObjPut) (Tcl_Interp *interp, Tcl_Obj *dictPtr, Tcl_Obj *keyPtr, Tcl_Obj *valuePtr); /* 494 */ - int (*tcl_DictObjGet) (Tcl_Interp *interp, Tcl_Obj *dictPtr, Tcl_Obj *keyPtr, Tcl_Obj **valuePtrPtr); /* 495 */ - int (*tcl_DictObjRemove) (Tcl_Interp *interp, Tcl_Obj *dictPtr, Tcl_Obj *keyPtr); /* 496 */ - int (*tcl_DictObjSize) (Tcl_Interp *interp, Tcl_Obj *dictPtr, int *sizePtr); /* 497 */ - int (*tcl_DictObjFirst) (Tcl_Interp *interp, Tcl_Obj *dictPtr, Tcl_DictSearch *searchPtr, Tcl_Obj **keyPtrPtr, Tcl_Obj **valuePtrPtr, int *donePtr); /* 498 */ - void (*tcl_DictObjNext) (Tcl_DictSearch *searchPtr, Tcl_Obj **keyPtrPtr, Tcl_Obj **valuePtrPtr, int *donePtr); /* 499 */ - void (*tcl_DictObjDone) (Tcl_DictSearch *searchPtr); /* 500 */ - int (*tcl_DictObjPutKeyList) (Tcl_Interp *interp, Tcl_Obj *dictPtr, int keyc, Tcl_Obj *CONST *keyv, Tcl_Obj *valuePtr); /* 501 */ - int (*tcl_DictObjRemoveKeyList) (Tcl_Interp *interp, Tcl_Obj *dictPtr, int keyc, Tcl_Obj *CONST *keyv); /* 502 */ + Tcl_DriverWideSeekProc * (*tcl_ChannelWideSeekProc) (CONST Tcl_ChannelType * chanTypePtr); /* 493 */ + int (*tcl_DictObjPut) (Tcl_Interp * interp, Tcl_Obj * dictPtr, Tcl_Obj * keyPtr, Tcl_Obj * valuePtr); /* 494 */ + int (*tcl_DictObjGet) (Tcl_Interp * interp, Tcl_Obj * dictPtr, Tcl_Obj * keyPtr, Tcl_Obj ** valuePtrPtr); /* 495 */ + int (*tcl_DictObjRemove) (Tcl_Interp * interp, Tcl_Obj * dictPtr, Tcl_Obj * keyPtr); /* 496 */ + int (*tcl_DictObjSize) (Tcl_Interp * interp, Tcl_Obj * dictPtr, int * sizePtr); /* 497 */ + int (*tcl_DictObjFirst) (Tcl_Interp * interp, Tcl_Obj * dictPtr, Tcl_DictSearch * searchPtr, Tcl_Obj ** keyPtrPtr, Tcl_Obj ** valuePtrPtr, int * donePtr); /* 498 */ + void (*tcl_DictObjNext) (Tcl_DictSearch * searchPtr, Tcl_Obj ** keyPtrPtr, Tcl_Obj ** valuePtrPtr, int * donePtr); /* 499 */ + void (*tcl_DictObjDone) (Tcl_DictSearch * searchPtr); /* 500 */ + int (*tcl_DictObjPutKeyList) (Tcl_Interp * interp, Tcl_Obj * dictPtr, int keyc, Tcl_Obj *CONST * keyv, Tcl_Obj * valuePtr); /* 501 */ + int (*tcl_DictObjRemoveKeyList) (Tcl_Interp * interp, Tcl_Obj * dictPtr, int keyc, Tcl_Obj *CONST * keyv); /* 502 */ Tcl_Obj * (*tcl_NewDictObj) (void); /* 503 */ - Tcl_Obj * (*tcl_DbNewDictObj) (CONST char *file, int line); /* 504 */ - void (*tcl_RegisterConfig) (Tcl_Interp *interp, CONST char *pkgName, Tcl_Config *configuration, CONST char *valEncoding); /* 505 */ - Tcl_Namespace * (*tcl_CreateNamespace) (Tcl_Interp *interp, CONST char *name, ClientData clientData, Tcl_NamespaceDeleteProc *deleteProc); /* 506 */ - void (*tcl_DeleteNamespace) (Tcl_Namespace *nsPtr); /* 507 */ - int (*tcl_AppendExportList) (Tcl_Interp *interp, Tcl_Namespace *nsPtr, Tcl_Obj *objPtr); /* 508 */ - int (*tcl_Export) (Tcl_Interp *interp, Tcl_Namespace *nsPtr, CONST char *pattern, int resetListFirst); /* 509 */ - int (*tcl_Import) (Tcl_Interp *interp, Tcl_Namespace *nsPtr, CONST char *pattern, int allowOverwrite); /* 510 */ - int (*tcl_ForgetImport) (Tcl_Interp *interp, Tcl_Namespace *nsPtr, CONST char *pattern); /* 511 */ - Tcl_Namespace * (*tcl_GetCurrentNamespace) (Tcl_Interp *interp); /* 512 */ - Tcl_Namespace * (*tcl_GetGlobalNamespace) (Tcl_Interp *interp); /* 513 */ - Tcl_Namespace * (*tcl_FindNamespace) (Tcl_Interp *interp, CONST char *name, Tcl_Namespace *contextNsPtr, int flags); /* 514 */ - Tcl_Command (*tcl_FindCommand) (Tcl_Interp *interp, CONST char *name, Tcl_Namespace *contextNsPtr, int flags); /* 515 */ - Tcl_Command (*tcl_GetCommandFromObj) (Tcl_Interp *interp, Tcl_Obj *objPtr); /* 516 */ - void (*tcl_GetCommandFullName) (Tcl_Interp *interp, Tcl_Command command, Tcl_Obj *objPtr); /* 517 */ - int (*tcl_FSEvalFileEx) (Tcl_Interp *interp, Tcl_Obj *fileName, CONST char *encodingName); /* 518 */ - Tcl_ExitProc * (*tcl_SetExitProc) (Tcl_ExitProc *proc); /* 519 */ - void (*tcl_LimitAddHandler) (Tcl_Interp *interp, int type, Tcl_LimitHandlerProc *handlerProc, ClientData clientData, Tcl_LimitHandlerDeleteProc *deleteProc); /* 520 */ - void (*tcl_LimitRemoveHandler) (Tcl_Interp *interp, int type, Tcl_LimitHandlerProc *handlerProc, ClientData clientData); /* 521 */ - int (*tcl_LimitReady) (Tcl_Interp *interp); /* 522 */ - int (*tcl_LimitCheck) (Tcl_Interp *interp); /* 523 */ - int (*tcl_LimitExceeded) (Tcl_Interp *interp); /* 524 */ - void (*tcl_LimitSetCommands) (Tcl_Interp *interp, int commandLimit); /* 525 */ - void (*tcl_LimitSetTime) (Tcl_Interp *interp, Tcl_Time *timeLimitPtr); /* 526 */ - void (*tcl_LimitSetGranularity) (Tcl_Interp *interp, int type, int granularity); /* 527 */ - int (*tcl_LimitTypeEnabled) (Tcl_Interp *interp, int type); /* 528 */ - int (*tcl_LimitTypeExceeded) (Tcl_Interp *interp, int type); /* 529 */ - void (*tcl_LimitTypeSet) (Tcl_Interp *interp, int type); /* 530 */ - void (*tcl_LimitTypeReset) (Tcl_Interp *interp, int type); /* 531 */ - int (*tcl_LimitGetCommands) (Tcl_Interp *interp); /* 532 */ - void (*tcl_LimitGetTime) (Tcl_Interp *interp, Tcl_Time *timeLimitPtr); /* 533 */ - int (*tcl_LimitGetGranularity) (Tcl_Interp *interp, int type); /* 534 */ - Tcl_InterpState (*tcl_SaveInterpState) (Tcl_Interp *interp, int status); /* 535 */ - int (*tcl_RestoreInterpState) (Tcl_Interp *interp, Tcl_InterpState state); /* 536 */ + Tcl_Obj * (*tcl_DbNewDictObj) (CONST char * file, int line); /* 504 */ + void (*tcl_RegisterConfig) (Tcl_Interp* interp, CONST char* pkgName, Tcl_Config* configuration, CONST char* valEncoding); /* 505 */ + Tcl_Namespace * (*tcl_CreateNamespace) (Tcl_Interp * interp, CONST char * name, ClientData clientData, Tcl_NamespaceDeleteProc * deleteProc); /* 506 */ + void (*tcl_DeleteNamespace) (Tcl_Namespace * nsPtr); /* 507 */ + int (*tcl_AppendExportList) (Tcl_Interp * interp, Tcl_Namespace * nsPtr, Tcl_Obj * objPtr); /* 508 */ + int (*tcl_Export) (Tcl_Interp * interp, Tcl_Namespace * nsPtr, CONST char * pattern, int resetListFirst); /* 509 */ + int (*tcl_Import) (Tcl_Interp * interp, Tcl_Namespace * nsPtr, CONST char * pattern, int allowOverwrite); /* 510 */ + int (*tcl_ForgetImport) (Tcl_Interp * interp, Tcl_Namespace * nsPtr, CONST char * pattern); /* 511 */ + Tcl_Namespace * (*tcl_GetCurrentNamespace) (Tcl_Interp * interp); /* 512 */ + Tcl_Namespace * (*tcl_GetGlobalNamespace) (Tcl_Interp * interp); /* 513 */ + Tcl_Namespace * (*tcl_FindNamespace) (Tcl_Interp * interp, CONST char * name, Tcl_Namespace * contextNsPtr, int flags); /* 514 */ + Tcl_Command (*tcl_FindCommand) (Tcl_Interp * interp, CONST char * name, Tcl_Namespace * contextNsPtr, int flags); /* 515 */ + Tcl_Command (*tcl_GetCommandFromObj) (Tcl_Interp * interp, Tcl_Obj * objPtr); /* 516 */ + void (*tcl_GetCommandFullName) (Tcl_Interp * interp, Tcl_Command command, Tcl_Obj * objPtr); /* 517 */ + int (*tcl_FSEvalFileEx) (Tcl_Interp * interp, Tcl_Obj * fileName, CONST char * encodingName); /* 518 */ + Tcl_ExitProc * (*tcl_SetExitProc) (Tcl_ExitProc * proc); /* 519 */ + void (*tcl_LimitAddHandler) (Tcl_Interp * interp, int type, Tcl_LimitHandlerProc * handlerProc, ClientData clientData, Tcl_LimitHandlerDeleteProc * deleteProc); /* 520 */ + void (*tcl_LimitRemoveHandler) (Tcl_Interp * interp, int type, Tcl_LimitHandlerProc * handlerProc, ClientData clientData); /* 521 */ + int (*tcl_LimitReady) (Tcl_Interp * interp); /* 522 */ + int (*tcl_LimitCheck) (Tcl_Interp * interp); /* 523 */ + int (*tcl_LimitExceeded) (Tcl_Interp * interp); /* 524 */ + void (*tcl_LimitSetCommands) (Tcl_Interp * interp, int commandLimit); /* 525 */ + void (*tcl_LimitSetTime) (Tcl_Interp * interp, Tcl_Time * timeLimitPtr); /* 526 */ + void (*tcl_LimitSetGranularity) (Tcl_Interp * interp, int type, int granularity); /* 527 */ + int (*tcl_LimitTypeEnabled) (Tcl_Interp * interp, int type); /* 528 */ + int (*tcl_LimitTypeExceeded) (Tcl_Interp * interp, int type); /* 529 */ + void (*tcl_LimitTypeSet) (Tcl_Interp * interp, int type); /* 530 */ + void (*tcl_LimitTypeReset) (Tcl_Interp * interp, int type); /* 531 */ + int (*tcl_LimitGetCommands) (Tcl_Interp * interp); /* 532 */ + void (*tcl_LimitGetTime) (Tcl_Interp * interp, Tcl_Time * timeLimitPtr); /* 533 */ + int (*tcl_LimitGetGranularity) (Tcl_Interp * interp, int type); /* 534 */ + Tcl_InterpState (*tcl_SaveInterpState) (Tcl_Interp * interp, int status); /* 535 */ + int (*tcl_RestoreInterpState) (Tcl_Interp * interp, Tcl_InterpState state); /* 536 */ void (*tcl_DiscardInterpState) (Tcl_InterpState state); /* 537 */ - int (*tcl_SetReturnOptions) (Tcl_Interp *interp, Tcl_Obj *options); /* 538 */ - Tcl_Obj * (*tcl_GetReturnOptions) (Tcl_Interp *interp, int result); /* 539 */ + int (*tcl_SetReturnOptions) (Tcl_Interp * interp, Tcl_Obj * options); /* 538 */ + Tcl_Obj * (*tcl_GetReturnOptions) (Tcl_Interp * interp, int result); /* 539 */ int (*tcl_IsEnsemble) (Tcl_Command token); /* 540 */ - Tcl_Command (*tcl_CreateEnsemble) (Tcl_Interp *interp, CONST char *name, Tcl_Namespace *namespacePtr, int flags); /* 541 */ - Tcl_Command (*tcl_FindEnsemble) (Tcl_Interp *interp, Tcl_Obj *cmdNameObj, int flags); /* 542 */ - int (*tcl_SetEnsembleSubcommandList) (Tcl_Interp *interp, Tcl_Command token, Tcl_Obj *subcmdList); /* 543 */ - int (*tcl_SetEnsembleMappingDict) (Tcl_Interp *interp, Tcl_Command token, Tcl_Obj *mapDict); /* 544 */ - int (*tcl_SetEnsembleUnknownHandler) (Tcl_Interp *interp, Tcl_Command token, Tcl_Obj *unknownList); /* 545 */ - int (*tcl_SetEnsembleFlags) (Tcl_Interp *interp, Tcl_Command token, int flags); /* 546 */ - int (*tcl_GetEnsembleSubcommandList) (Tcl_Interp *interp, Tcl_Command token, Tcl_Obj **subcmdListPtr); /* 547 */ - int (*tcl_GetEnsembleMappingDict) (Tcl_Interp *interp, Tcl_Command token, Tcl_Obj **mapDictPtr); /* 548 */ - int (*tcl_GetEnsembleUnknownHandler) (Tcl_Interp *interp, Tcl_Command token, Tcl_Obj **unknownListPtr); /* 549 */ - int (*tcl_GetEnsembleFlags) (Tcl_Interp *interp, Tcl_Command token, int *flagsPtr); /* 550 */ - int (*tcl_GetEnsembleNamespace) (Tcl_Interp *interp, Tcl_Command token, Tcl_Namespace **namespacePtrPtr); /* 551 */ - void (*tcl_SetTimeProc) (Tcl_GetTimeProc *getProc, Tcl_ScaleTimeProc *scaleProc, ClientData clientData); /* 552 */ - void (*tcl_QueryTimeProc) (Tcl_GetTimeProc **getProc, Tcl_ScaleTimeProc **scaleProc, ClientData *clientData); /* 553 */ - Tcl_DriverThreadActionProc * (*tcl_ChannelThreadActionProc) (CONST Tcl_ChannelType *chanTypePtr); /* 554 */ - Tcl_Obj * (*tcl_NewBignumObj) (mp_int *value); /* 555 */ - Tcl_Obj * (*tcl_DbNewBignumObj) (mp_int *value, CONST char *file, int line); /* 556 */ - void (*tcl_SetBignumObj) (Tcl_Obj *obj, mp_int *value); /* 557 */ - int (*tcl_GetBignumFromObj) (Tcl_Interp *interp, Tcl_Obj *obj, mp_int *value); /* 558 */ - int (*tcl_TakeBignumFromObj) (Tcl_Interp *interp, Tcl_Obj *obj, mp_int *value); /* 559 */ + Tcl_Command (*tcl_CreateEnsemble) (Tcl_Interp * interp, CONST char * name, Tcl_Namespace * namespacePtr, int flags); /* 541 */ + Tcl_Command (*tcl_FindEnsemble) (Tcl_Interp * interp, Tcl_Obj * cmdNameObj, int flags); /* 542 */ + int (*tcl_SetEnsembleSubcommandList) (Tcl_Interp * interp, Tcl_Command token, Tcl_Obj * subcmdList); /* 543 */ + int (*tcl_SetEnsembleMappingDict) (Tcl_Interp * interp, Tcl_Command token, Tcl_Obj * mapDict); /* 544 */ + int (*tcl_SetEnsembleUnknownHandler) (Tcl_Interp * interp, Tcl_Command token, Tcl_Obj * unknownList); /* 545 */ + int (*tcl_SetEnsembleFlags) (Tcl_Interp * interp, Tcl_Command token, int flags); /* 546 */ + int (*tcl_GetEnsembleSubcommandList) (Tcl_Interp * interp, Tcl_Command token, Tcl_Obj ** subcmdListPtr); /* 547 */ + int (*tcl_GetEnsembleMappingDict) (Tcl_Interp * interp, Tcl_Command token, Tcl_Obj ** mapDictPtr); /* 548 */ + int (*tcl_GetEnsembleUnknownHandler) (Tcl_Interp * interp, Tcl_Command token, Tcl_Obj ** unknownListPtr); /* 549 */ + int (*tcl_GetEnsembleFlags) (Tcl_Interp * interp, Tcl_Command token, int * flagsPtr); /* 550 */ + int (*tcl_GetEnsembleNamespace) (Tcl_Interp * interp, Tcl_Command token, Tcl_Namespace ** namespacePtrPtr); /* 551 */ + void (*tcl_SetTimeProc) (Tcl_GetTimeProc* getProc, Tcl_ScaleTimeProc* scaleProc, ClientData clientData); /* 552 */ + void (*tcl_QueryTimeProc) (Tcl_GetTimeProc** getProc, Tcl_ScaleTimeProc** scaleProc, ClientData* clientData); /* 553 */ + Tcl_DriverThreadActionProc * (*tcl_ChannelThreadActionProc) (CONST Tcl_ChannelType * chanTypePtr); /* 554 */ + Tcl_Obj* (*tcl_NewBignumObj) (mp_int* value); /* 555 */ + Tcl_Obj* (*tcl_DbNewBignumObj) (mp_int* value, CONST char* file, int line); /* 556 */ + void (*tcl_SetBignumObj) (Tcl_Obj* obj, mp_int* value); /* 557 */ + int (*tcl_GetBignumFromObj) (Tcl_Interp* interp, Tcl_Obj* obj, mp_int* value); /* 558 */ + int (*tcl_TakeBignumFromObj) (Tcl_Interp* interp, Tcl_Obj* obj, mp_int* value); /* 559 */ int (*tcl_TruncateChannel) (Tcl_Channel chan, Tcl_WideInt length); /* 560 */ - Tcl_DriverTruncateProc * (*tcl_ChannelTruncateProc) (CONST Tcl_ChannelType *chanTypePtr); /* 561 */ - void (*tcl_SetChannelErrorInterp) (Tcl_Interp *interp, Tcl_Obj *msg); /* 562 */ - void (*tcl_GetChannelErrorInterp) (Tcl_Interp *interp, Tcl_Obj **msg); /* 563 */ - void (*tcl_SetChannelError) (Tcl_Channel chan, Tcl_Obj *msg); /* 564 */ - void (*tcl_GetChannelError) (Tcl_Channel chan, Tcl_Obj **msg); /* 565 */ - int (*tcl_InitBignumFromDouble) (Tcl_Interp *interp, double initval, mp_int *toInit); /* 566 */ - Tcl_Obj * (*tcl_GetNamespaceUnknownHandler) (Tcl_Interp *interp, Tcl_Namespace *nsPtr); /* 567 */ - int (*tcl_SetNamespaceUnknownHandler) (Tcl_Interp *interp, Tcl_Namespace *nsPtr, Tcl_Obj *handlerPtr); /* 568 */ - int (*tcl_GetEncodingFromObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, Tcl_Encoding *encodingPtr); /* 569 */ - Tcl_Obj * (*tcl_GetEncodingSearchPath) (void); /* 570 */ - int (*tcl_SetEncodingSearchPath) (Tcl_Obj *searchPath); /* 571 */ - CONST char * (*tcl_GetEncodingNameFromEnvironment) (Tcl_DString *bufPtr); /* 572 */ - int (*tcl_PkgRequireProc) (Tcl_Interp *interp, CONST char *name, int objc, Tcl_Obj *CONST objv[], ClientData *clientDataPtr); /* 573 */ - void (*tcl_AppendObjToErrorInfo) (Tcl_Interp *interp, Tcl_Obj *objPtr); /* 574 */ - void (*tcl_AppendLimitedToObj) (Tcl_Obj *objPtr, CONST char *bytes, int length, int limit, CONST char *ellipsis); /* 575 */ - Tcl_Obj * (*tcl_Format) (Tcl_Interp *interp, CONST char *format, int objc, Tcl_Obj *CONST objv[]); /* 576 */ - int (*tcl_AppendFormatToObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, CONST char *format, int objc, Tcl_Obj *CONST objv[]); /* 577 */ - Tcl_Obj * (*tcl_ObjPrintf) (CONST char *format, ...); /* 578 */ - void (*tcl_AppendPrintfToObj) (Tcl_Obj *objPtr, CONST char *format, ...); /* 579 */ + Tcl_DriverTruncateProc * (*tcl_ChannelTruncateProc) (CONST Tcl_ChannelType * chanTypePtr); /* 561 */ + void (*tcl_SetChannelErrorInterp) (Tcl_Interp* interp, Tcl_Obj* msg); /* 562 */ + void (*tcl_GetChannelErrorInterp) (Tcl_Interp* interp, Tcl_Obj** msg); /* 563 */ + void (*tcl_SetChannelError) (Tcl_Channel chan, Tcl_Obj* msg); /* 564 */ + void (*tcl_GetChannelError) (Tcl_Channel chan, Tcl_Obj** msg); /* 565 */ + int (*tcl_InitBignumFromDouble) (Tcl_Interp* interp, double initval, mp_int * toInit); /* 566 */ + Tcl_Obj * (*tcl_GetNamespaceUnknownHandler) (Tcl_Interp * interp, Tcl_Namespace * nsPtr); /* 567 */ + int (*tcl_SetNamespaceUnknownHandler) (Tcl_Interp * interp, Tcl_Namespace * nsPtr, Tcl_Obj * handlerPtr); /* 568 */ + int (*tcl_GetEncodingFromObj) (Tcl_Interp* interp, Tcl_Obj* objPtr, Tcl_Encoding* encodingPtr); /* 569 */ + Tcl_Obj* (*tcl_GetEncodingSearchPath) (void); /* 570 */ + int (*tcl_SetEncodingSearchPath) (Tcl_Obj* searchPath); /* 571 */ + CONST char * (*tcl_GetEncodingNameFromEnvironment) (Tcl_DString* bufPtr); /* 572 */ + int (*tcl_PkgRequireProc) (Tcl_Interp * interp, CONST char * name, int objc, Tcl_Obj *CONST objv[], ClientData * clientDataPtr); /* 573 */ + void (*tcl_AppendObjToErrorInfo) (Tcl_Interp * interp, Tcl_Obj * objPtr); /* 574 */ + void (*tcl_AppendLimitedToObj) (Tcl_Obj * objPtr, CONST char * bytes, int length, int limit, CONST char * ellipsis); /* 575 */ + Tcl_Obj * (*tcl_Format) (Tcl_Interp * interp, CONST char * format, int objc, Tcl_Obj * CONST objv[]); /* 576 */ + int (*tcl_AppendFormatToObj) (Tcl_Interp * interp, Tcl_Obj * objPtr, CONST char * format, int objc, Tcl_Obj * CONST objv[]); /* 577 */ + Tcl_Obj * (*tcl_ObjPrintf) (CONST char * format, ...); /* 578 */ + void (*tcl_AppendPrintfToObj) (Tcl_Obj * objPtr, CONST char * format, ...); /* 579 */ } TclStubs; #ifdef __cplusplus @@ -4501,10 +4616,24 @@ extern TclStubs *tclStubsPtr; #define Tcl_DeleteInterp \ (tclStubsPtr->tcl_DeleteInterp) /* 110 */ #endif +#if !defined(__WIN32__) && !defined(MAC_OSX_TCL) /* UNIX */ +#ifndef Tcl_DetachPids +#define Tcl_DetachPids \ + (tclStubsPtr->tcl_DetachPids) /* 111 */ +#endif +#endif /* UNIX */ +#ifdef __WIN32__ /* WIN */ +#ifndef Tcl_DetachPids +#define Tcl_DetachPids \ + (tclStubsPtr->tcl_DetachPids) /* 111 */ +#endif +#endif /* WIN */ +#ifdef MAC_OSX_TCL /* MACOSX */ #ifndef Tcl_DetachPids #define Tcl_DetachPids \ (tclStubsPtr->tcl_DetachPids) /* 111 */ #endif +#endif /* MACOSX */ #ifndef Tcl_DeleteTimerHandler #define Tcl_DeleteTimerHandler \ (tclStubsPtr->tcl_DeleteTimerHandler) /* 112 */ @@ -4850,10 +4979,24 @@ extern TclStubs *tclStubsPtr; #define Tcl_ObjSetVar2 \ (tclStubsPtr->tcl_ObjSetVar2) /* 196 */ #endif +#if !defined(__WIN32__) && !defined(MAC_OSX_TCL) /* UNIX */ +#ifndef Tcl_OpenCommandChannel +#define Tcl_OpenCommandChannel \ + (tclStubsPtr->tcl_OpenCommandChannel) /* 197 */ +#endif +#endif /* UNIX */ +#ifdef __WIN32__ /* WIN */ +#ifndef Tcl_OpenCommandChannel +#define Tcl_OpenCommandChannel \ + (tclStubsPtr->tcl_OpenCommandChannel) /* 197 */ +#endif +#endif /* WIN */ +#ifdef MAC_OSX_TCL /* MACOSX */ #ifndef Tcl_OpenCommandChannel #define Tcl_OpenCommandChannel \ (tclStubsPtr->tcl_OpenCommandChannel) /* 197 */ #endif +#endif /* MACOSX */ #ifndef Tcl_OpenFileChannel #define Tcl_OpenFileChannel \ (tclStubsPtr->tcl_OpenFileChannel) /* 198 */ @@ -4890,10 +5033,24 @@ extern TclStubs *tclStubsPtr; #define Tcl_Read \ (tclStubsPtr->tcl_Read) /* 206 */ #endif +#if !defined(__WIN32__) && !defined(MAC_OSX_TCL) /* UNIX */ +#ifndef Tcl_ReapDetachedProcs +#define Tcl_ReapDetachedProcs \ + (tclStubsPtr->tcl_ReapDetachedProcs) /* 207 */ +#endif +#endif /* UNIX */ +#ifdef __WIN32__ /* WIN */ #ifndef Tcl_ReapDetachedProcs #define Tcl_ReapDetachedProcs \ (tclStubsPtr->tcl_ReapDetachedProcs) /* 207 */ #endif +#endif /* WIN */ +#ifdef MAC_OSX_TCL /* MACOSX */ +#ifndef Tcl_ReapDetachedProcs +#define Tcl_ReapDetachedProcs \ + (tclStubsPtr->tcl_ReapDetachedProcs) /* 207 */ +#endif +#endif /* MACOSX */ #ifndef Tcl_RecordAndEval #define Tcl_RecordAndEval \ (tclStubsPtr->tcl_RecordAndEval) /* 208 */ diff --git a/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/include/tclPlatDecls.h b/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/include/tclPlatDecls.h index 75975273e5b7cfbfc8ca6eee1a2de0dbdb730daa..c5812743d0b792e7ce442d4d54324221f5781d52 100644 --- a/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/include/tclPlatDecls.h +++ b/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/include/tclPlatDecls.h @@ -6,7 +6,7 @@ * Copyright (c) 1998-1999 by Scriptics Corporation. * All rights reserved. * - * RCS: @(#) $Id: tclPlatDecls.h,v 1.27.2.2 2010/05/21 12:18:17 nijtmans Exp $ + * RCS: @(#) $Id: tclPlatDecls.h,v 1.27 2007/12/13 15:23:20 dgp Exp $ */ #ifndef _TCLPLATDECLS @@ -26,13 +26,19 @@ /* * Pull in the typedef of TCHAR for windows. */ -#if defined(__WIN32__) && !defined(_TCHAR_DEFINED) +#if defined(__CYGWIN__) + typedef char TCHAR; +#elif defined(__WIN32__) && !defined(_TCHAR_DEFINED) # include <tchar.h> # ifndef _TCHAR_DEFINED /* Borland seems to forget to set this. */ - typedef _TCHAR TCHAR; + typedef _TCHAR TCHAR; # define _TCHAR_DEFINED # endif +# if defined(_MSC_VER) && defined(__STDC__) + /* MSVC++ misses this. */ + typedef _TCHAR TCHAR; +# endif #endif /* !BEGIN!: Do not edit below this line. */ @@ -45,32 +51,32 @@ #ifndef Tcl_WinUtfToTChar_TCL_DECLARED #define Tcl_WinUtfToTChar_TCL_DECLARED /* 0 */ -EXTERN TCHAR * Tcl_WinUtfToTChar(CONST char *str, int len, - Tcl_DString *dsPtr); +EXTERN TCHAR * Tcl_WinUtfToTChar (CONST char * str, int len, + Tcl_DString * dsPtr); #endif #ifndef Tcl_WinTCharToUtf_TCL_DECLARED #define Tcl_WinTCharToUtf_TCL_DECLARED /* 1 */ -EXTERN char * Tcl_WinTCharToUtf(CONST TCHAR *str, int len, - Tcl_DString *dsPtr); +EXTERN char * Tcl_WinTCharToUtf (CONST TCHAR * str, int len, + Tcl_DString * dsPtr); #endif #endif /* WIN */ #ifdef MAC_OSX_TCL /* MACOSX */ #ifndef Tcl_MacOSXOpenBundleResources_TCL_DECLARED #define Tcl_MacOSXOpenBundleResources_TCL_DECLARED /* 0 */ -EXTERN int Tcl_MacOSXOpenBundleResources(Tcl_Interp *interp, - CONST char *bundleName, int hasResourceFile, - int maxPathLen, char *libraryPath); +EXTERN int Tcl_MacOSXOpenBundleResources (Tcl_Interp * interp, + CONST char * bundleName, int hasResourceFile, + int maxPathLen, char * libraryPath); #endif #ifndef Tcl_MacOSXOpenVersionedBundleResources_TCL_DECLARED #define Tcl_MacOSXOpenVersionedBundleResources_TCL_DECLARED /* 1 */ -EXTERN int Tcl_MacOSXOpenVersionedBundleResources( - Tcl_Interp *interp, CONST char *bundleName, - CONST char *bundleVersion, - int hasResourceFile, int maxPathLen, - char *libraryPath); +EXTERN int Tcl_MacOSXOpenVersionedBundleResources ( + Tcl_Interp * interp, CONST char * bundleName, + CONST char * bundleVersion, + int hasResourceFile, int maxPathLen, + char * libraryPath); #endif #endif /* MACOSX */ @@ -79,12 +85,12 @@ typedef struct TclPlatStubs { struct TclPlatStubHooks *hooks; #ifdef __WIN32__ /* WIN */ - TCHAR * (*tcl_WinUtfToTChar) (CONST char *str, int len, Tcl_DString *dsPtr); /* 0 */ - char * (*tcl_WinTCharToUtf) (CONST TCHAR *str, int len, Tcl_DString *dsPtr); /* 1 */ + TCHAR * (*tcl_WinUtfToTChar) (CONST char * str, int len, Tcl_DString * dsPtr); /* 0 */ + char * (*tcl_WinTCharToUtf) (CONST TCHAR * str, int len, Tcl_DString * dsPtr); /* 1 */ #endif /* WIN */ #ifdef MAC_OSX_TCL /* MACOSX */ - int (*tcl_MacOSXOpenBundleResources) (Tcl_Interp *interp, CONST char *bundleName, int hasResourceFile, int maxPathLen, char *libraryPath); /* 0 */ - int (*tcl_MacOSXOpenVersionedBundleResources) (Tcl_Interp *interp, CONST char *bundleName, CONST char *bundleVersion, int hasResourceFile, int maxPathLen, char *libraryPath); /* 1 */ + int (*tcl_MacOSXOpenBundleResources) (Tcl_Interp * interp, CONST char * bundleName, int hasResourceFile, int maxPathLen, char * libraryPath); /* 0 */ + int (*tcl_MacOSXOpenVersionedBundleResources) (Tcl_Interp * interp, CONST char * bundleName, CONST char * bundleVersion, int hasResourceFile, int maxPathLen, char * libraryPath); /* 1 */ #endif /* MACOSX */ } TclPlatStubs; diff --git a/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/include/tclTomMath.h b/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/include/tclTomMath.h index 31c423adf4d543109e1f26f69f0b9be6841fab33..d05178c186afb987a32e0b09a2093fa5bbdf0f3c 100644 --- a/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/include/tclTomMath.h +++ b/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/include/tclTomMath.h @@ -26,6 +26,8 @@ #include <ctype.h> #include <limits.h> +#include <tommath_class.h> + #ifndef MIN #define MIN(x,y) ((x)<(y)?(x):(y)) #endif @@ -838,6 +840,6 @@ MODULE_SCOPE const char *mp_s_rmap; /* $Source: /cvsroot/tcl/tcl/generic/tclTomMath.h,v $ */ /* Based on Tom's version 1.8 */ -/* $Revision: 1.10.4.1 $ */ -/* $Date: 2009/10/06 16:30:39 $ */ +/* $Revision: 1.10 $ */ +/* $Date: 2007/02/14 17:59:21 $ */ diff --git a/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/include/tclTomMathDecls.h b/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/include/tclTomMathDecls.h index a626cde0af286d185306b7b9d23645aabdfc4c21..785c61b45be1a032b9788fcbfca08de5e107de2b 100644 --- a/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/include/tclTomMathDecls.h +++ b/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/include/tclTomMathDecls.h @@ -11,7 +11,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclTomMathDecls.h,v 1.2.4.1 2010/02/07 22:16:54 nijtmans Exp $ + * RCS: @(#) $Id: tclTomMathDecls.h,v 1.2 2006/11/15 14:58:27 dgp Exp $ */ #ifndef _TCLTOMMATHDECLS @@ -140,316 +140,317 @@ #ifndef TclBN_epoch_TCL_DECLARED #define TclBN_epoch_TCL_DECLARED /* 0 */ -EXTERN int TclBN_epoch(void); +EXTERN int TclBN_epoch (void); #endif #ifndef TclBN_revision_TCL_DECLARED #define TclBN_revision_TCL_DECLARED /* 1 */ -EXTERN int TclBN_revision(void); +EXTERN int TclBN_revision (void); #endif #ifndef TclBN_mp_add_TCL_DECLARED #define TclBN_mp_add_TCL_DECLARED /* 2 */ -EXTERN int TclBN_mp_add(mp_int *a, mp_int *b, mp_int *c); +EXTERN int TclBN_mp_add (mp_int* a, mp_int* b, mp_int* c); #endif #ifndef TclBN_mp_add_d_TCL_DECLARED #define TclBN_mp_add_d_TCL_DECLARED /* 3 */ -EXTERN int TclBN_mp_add_d(mp_int *a, mp_digit b, mp_int *c); +EXTERN int TclBN_mp_add_d (mp_int* a, mp_digit b, mp_int* c); #endif #ifndef TclBN_mp_and_TCL_DECLARED #define TclBN_mp_and_TCL_DECLARED /* 4 */ -EXTERN int TclBN_mp_and(mp_int *a, mp_int *b, mp_int *c); +EXTERN int TclBN_mp_and (mp_int* a, mp_int* b, mp_int* c); #endif #ifndef TclBN_mp_clamp_TCL_DECLARED #define TclBN_mp_clamp_TCL_DECLARED /* 5 */ -EXTERN void TclBN_mp_clamp(mp_int *a); +EXTERN void TclBN_mp_clamp (mp_int* a); #endif #ifndef TclBN_mp_clear_TCL_DECLARED #define TclBN_mp_clear_TCL_DECLARED /* 6 */ -EXTERN void TclBN_mp_clear(mp_int *a); +EXTERN void TclBN_mp_clear (mp_int* a); #endif #ifndef TclBN_mp_clear_multi_TCL_DECLARED #define TclBN_mp_clear_multi_TCL_DECLARED /* 7 */ -EXTERN void TclBN_mp_clear_multi(mp_int *a, ...); +EXTERN void TclBN_mp_clear_multi (mp_int* a, ...); #endif #ifndef TclBN_mp_cmp_TCL_DECLARED #define TclBN_mp_cmp_TCL_DECLARED /* 8 */ -EXTERN int TclBN_mp_cmp(mp_int *a, mp_int *b); +EXTERN int TclBN_mp_cmp (mp_int* a, mp_int* b); #endif #ifndef TclBN_mp_cmp_d_TCL_DECLARED #define TclBN_mp_cmp_d_TCL_DECLARED /* 9 */ -EXTERN int TclBN_mp_cmp_d(mp_int *a, mp_digit b); +EXTERN int TclBN_mp_cmp_d (mp_int* a, mp_digit b); #endif #ifndef TclBN_mp_cmp_mag_TCL_DECLARED #define TclBN_mp_cmp_mag_TCL_DECLARED /* 10 */ -EXTERN int TclBN_mp_cmp_mag(mp_int *a, mp_int *b); +EXTERN int TclBN_mp_cmp_mag (mp_int* a, mp_int* b); #endif #ifndef TclBN_mp_copy_TCL_DECLARED #define TclBN_mp_copy_TCL_DECLARED /* 11 */ -EXTERN int TclBN_mp_copy(mp_int *a, mp_int *b); +EXTERN int TclBN_mp_copy (mp_int* a, mp_int* b); #endif #ifndef TclBN_mp_count_bits_TCL_DECLARED #define TclBN_mp_count_bits_TCL_DECLARED /* 12 */ -EXTERN int TclBN_mp_count_bits(mp_int *a); +EXTERN int TclBN_mp_count_bits (mp_int* a); #endif #ifndef TclBN_mp_div_TCL_DECLARED #define TclBN_mp_div_TCL_DECLARED /* 13 */ -EXTERN int TclBN_mp_div(mp_int *a, mp_int *b, mp_int *q, - mp_int *r); +EXTERN int TclBN_mp_div (mp_int* a, mp_int* b, mp_int* q, + mp_int* r); #endif #ifndef TclBN_mp_div_d_TCL_DECLARED #define TclBN_mp_div_d_TCL_DECLARED /* 14 */ -EXTERN int TclBN_mp_div_d(mp_int *a, mp_digit b, mp_int *q, - mp_digit *r); +EXTERN int TclBN_mp_div_d (mp_int* a, mp_digit b, mp_int* q, + mp_digit* r); #endif #ifndef TclBN_mp_div_2_TCL_DECLARED #define TclBN_mp_div_2_TCL_DECLARED /* 15 */ -EXTERN int TclBN_mp_div_2(mp_int *a, mp_int *q); +EXTERN int TclBN_mp_div_2 (mp_int* a, mp_int* q); #endif #ifndef TclBN_mp_div_2d_TCL_DECLARED #define TclBN_mp_div_2d_TCL_DECLARED /* 16 */ -EXTERN int TclBN_mp_div_2d(mp_int *a, int b, mp_int *q, - mp_int *r); +EXTERN int TclBN_mp_div_2d (mp_int* a, int b, mp_int* q, + mp_int* r); #endif #ifndef TclBN_mp_div_3_TCL_DECLARED #define TclBN_mp_div_3_TCL_DECLARED /* 17 */ -EXTERN int TclBN_mp_div_3(mp_int *a, mp_int *q, mp_digit *r); +EXTERN int TclBN_mp_div_3 (mp_int* a, mp_int* q, mp_digit* r); #endif #ifndef TclBN_mp_exch_TCL_DECLARED #define TclBN_mp_exch_TCL_DECLARED /* 18 */ -EXTERN void TclBN_mp_exch(mp_int *a, mp_int *b); +EXTERN void TclBN_mp_exch (mp_int* a, mp_int* b); #endif #ifndef TclBN_mp_expt_d_TCL_DECLARED #define TclBN_mp_expt_d_TCL_DECLARED /* 19 */ -EXTERN int TclBN_mp_expt_d(mp_int *a, mp_digit b, mp_int *c); +EXTERN int TclBN_mp_expt_d (mp_int* a, mp_digit b, mp_int* c); #endif #ifndef TclBN_mp_grow_TCL_DECLARED #define TclBN_mp_grow_TCL_DECLARED /* 20 */ -EXTERN int TclBN_mp_grow(mp_int *a, int size); +EXTERN int TclBN_mp_grow (mp_int* a, int size); #endif #ifndef TclBN_mp_init_TCL_DECLARED #define TclBN_mp_init_TCL_DECLARED /* 21 */ -EXTERN int TclBN_mp_init(mp_int *a); +EXTERN int TclBN_mp_init (mp_int* a); #endif #ifndef TclBN_mp_init_copy_TCL_DECLARED #define TclBN_mp_init_copy_TCL_DECLARED /* 22 */ -EXTERN int TclBN_mp_init_copy(mp_int *a, mp_int *b); +EXTERN int TclBN_mp_init_copy (mp_int * a, mp_int* b); #endif #ifndef TclBN_mp_init_multi_TCL_DECLARED #define TclBN_mp_init_multi_TCL_DECLARED /* 23 */ -EXTERN int TclBN_mp_init_multi(mp_int *a, ...); +EXTERN int TclBN_mp_init_multi (mp_int* a, ...); #endif #ifndef TclBN_mp_init_set_TCL_DECLARED #define TclBN_mp_init_set_TCL_DECLARED /* 24 */ -EXTERN int TclBN_mp_init_set(mp_int *a, mp_digit b); +EXTERN int TclBN_mp_init_set (mp_int* a, mp_digit b); #endif #ifndef TclBN_mp_init_size_TCL_DECLARED #define TclBN_mp_init_size_TCL_DECLARED /* 25 */ -EXTERN int TclBN_mp_init_size(mp_int *a, int size); +EXTERN int TclBN_mp_init_size (mp_int* a, int size); #endif #ifndef TclBN_mp_lshd_TCL_DECLARED #define TclBN_mp_lshd_TCL_DECLARED /* 26 */ -EXTERN int TclBN_mp_lshd(mp_int *a, int shift); +EXTERN int TclBN_mp_lshd (mp_int* a, int shift); #endif #ifndef TclBN_mp_mod_TCL_DECLARED #define TclBN_mp_mod_TCL_DECLARED /* 27 */ -EXTERN int TclBN_mp_mod(mp_int *a, mp_int *b, mp_int *r); +EXTERN int TclBN_mp_mod (mp_int* a, mp_int* b, mp_int* r); #endif #ifndef TclBN_mp_mod_2d_TCL_DECLARED #define TclBN_mp_mod_2d_TCL_DECLARED /* 28 */ -EXTERN int TclBN_mp_mod_2d(mp_int *a, int b, mp_int *r); +EXTERN int TclBN_mp_mod_2d (mp_int* a, int b, mp_int* r); #endif #ifndef TclBN_mp_mul_TCL_DECLARED #define TclBN_mp_mul_TCL_DECLARED /* 29 */ -EXTERN int TclBN_mp_mul(mp_int *a, mp_int *b, mp_int *p); +EXTERN int TclBN_mp_mul (mp_int* a, mp_int* b, mp_int* p); #endif #ifndef TclBN_mp_mul_d_TCL_DECLARED #define TclBN_mp_mul_d_TCL_DECLARED /* 30 */ -EXTERN int TclBN_mp_mul_d(mp_int *a, mp_digit b, mp_int *p); +EXTERN int TclBN_mp_mul_d (mp_int* a, mp_digit b, mp_int* p); #endif #ifndef TclBN_mp_mul_2_TCL_DECLARED #define TclBN_mp_mul_2_TCL_DECLARED /* 31 */ -EXTERN int TclBN_mp_mul_2(mp_int *a, mp_int *p); +EXTERN int TclBN_mp_mul_2 (mp_int* a, mp_int* p); #endif #ifndef TclBN_mp_mul_2d_TCL_DECLARED #define TclBN_mp_mul_2d_TCL_DECLARED /* 32 */ -EXTERN int TclBN_mp_mul_2d(mp_int *a, int d, mp_int *p); +EXTERN int TclBN_mp_mul_2d (mp_int* a, int d, mp_int* p); #endif #ifndef TclBN_mp_neg_TCL_DECLARED #define TclBN_mp_neg_TCL_DECLARED /* 33 */ -EXTERN int TclBN_mp_neg(mp_int *a, mp_int *b); +EXTERN int TclBN_mp_neg (mp_int* a, mp_int* b); #endif #ifndef TclBN_mp_or_TCL_DECLARED #define TclBN_mp_or_TCL_DECLARED /* 34 */ -EXTERN int TclBN_mp_or(mp_int *a, mp_int *b, mp_int *c); +EXTERN int TclBN_mp_or (mp_int* a, mp_int* b, mp_int* c); #endif #ifndef TclBN_mp_radix_size_TCL_DECLARED #define TclBN_mp_radix_size_TCL_DECLARED /* 35 */ -EXTERN int TclBN_mp_radix_size(mp_int *a, int radix, int *size); +EXTERN int TclBN_mp_radix_size (mp_int* a, int radix, int* size); #endif #ifndef TclBN_mp_read_radix_TCL_DECLARED #define TclBN_mp_read_radix_TCL_DECLARED /* 36 */ -EXTERN int TclBN_mp_read_radix(mp_int *a, const char *str, +EXTERN int TclBN_mp_read_radix (mp_int* a, const char* str, int radix); #endif #ifndef TclBN_mp_rshd_TCL_DECLARED #define TclBN_mp_rshd_TCL_DECLARED /* 37 */ -EXTERN void TclBN_mp_rshd(mp_int *a, int shift); +EXTERN void TclBN_mp_rshd (mp_int * a, int shift); #endif #ifndef TclBN_mp_shrink_TCL_DECLARED #define TclBN_mp_shrink_TCL_DECLARED /* 38 */ -EXTERN int TclBN_mp_shrink(mp_int *a); +EXTERN int TclBN_mp_shrink (mp_int* a); #endif #ifndef TclBN_mp_set_TCL_DECLARED #define TclBN_mp_set_TCL_DECLARED /* 39 */ -EXTERN void TclBN_mp_set(mp_int *a, mp_digit b); +EXTERN void TclBN_mp_set (mp_int* a, mp_digit b); #endif #ifndef TclBN_mp_sqr_TCL_DECLARED #define TclBN_mp_sqr_TCL_DECLARED /* 40 */ -EXTERN int TclBN_mp_sqr(mp_int *a, mp_int *b); +EXTERN int TclBN_mp_sqr (mp_int* a, mp_int* b); #endif #ifndef TclBN_mp_sqrt_TCL_DECLARED #define TclBN_mp_sqrt_TCL_DECLARED /* 41 */ -EXTERN int TclBN_mp_sqrt(mp_int *a, mp_int *b); +EXTERN int TclBN_mp_sqrt (mp_int* a, mp_int* b); #endif #ifndef TclBN_mp_sub_TCL_DECLARED #define TclBN_mp_sub_TCL_DECLARED /* 42 */ -EXTERN int TclBN_mp_sub(mp_int *a, mp_int *b, mp_int *c); +EXTERN int TclBN_mp_sub (mp_int* a, mp_int* b, mp_int* c); #endif #ifndef TclBN_mp_sub_d_TCL_DECLARED #define TclBN_mp_sub_d_TCL_DECLARED /* 43 */ -EXTERN int TclBN_mp_sub_d(mp_int *a, mp_digit b, mp_int *c); +EXTERN int TclBN_mp_sub_d (mp_int* a, mp_digit b, mp_int* c); #endif #ifndef TclBN_mp_to_unsigned_bin_TCL_DECLARED #define TclBN_mp_to_unsigned_bin_TCL_DECLARED /* 44 */ -EXTERN int TclBN_mp_to_unsigned_bin(mp_int *a, unsigned char *b); +EXTERN int TclBN_mp_to_unsigned_bin (mp_int* a, + unsigned char* b); #endif #ifndef TclBN_mp_to_unsigned_bin_n_TCL_DECLARED #define TclBN_mp_to_unsigned_bin_n_TCL_DECLARED /* 45 */ -EXTERN int TclBN_mp_to_unsigned_bin_n(mp_int *a, - unsigned char *b, unsigned long *outlen); +EXTERN int TclBN_mp_to_unsigned_bin_n (mp_int* a, + unsigned char* b, unsigned long* outlen); #endif #ifndef TclBN_mp_toradix_n_TCL_DECLARED #define TclBN_mp_toradix_n_TCL_DECLARED /* 46 */ -EXTERN int TclBN_mp_toradix_n(mp_int *a, char *str, int radix, +EXTERN int TclBN_mp_toradix_n (mp_int* a, char* str, int radix, int maxlen); #endif #ifndef TclBN_mp_unsigned_bin_size_TCL_DECLARED #define TclBN_mp_unsigned_bin_size_TCL_DECLARED /* 47 */ -EXTERN int TclBN_mp_unsigned_bin_size(mp_int *a); +EXTERN int TclBN_mp_unsigned_bin_size (mp_int* a); #endif #ifndef TclBN_mp_xor_TCL_DECLARED #define TclBN_mp_xor_TCL_DECLARED /* 48 */ -EXTERN int TclBN_mp_xor(mp_int *a, mp_int *b, mp_int *c); +EXTERN int TclBN_mp_xor (mp_int* a, mp_int* b, mp_int* c); #endif #ifndef TclBN_mp_zero_TCL_DECLARED #define TclBN_mp_zero_TCL_DECLARED /* 49 */ -EXTERN void TclBN_mp_zero(mp_int *a); +EXTERN void TclBN_mp_zero (mp_int* a); #endif #ifndef TclBN_reverse_TCL_DECLARED #define TclBN_reverse_TCL_DECLARED /* 50 */ -EXTERN void TclBN_reverse(unsigned char *s, int len); +EXTERN void TclBN_reverse (unsigned char* s, int len); #endif #ifndef TclBN_fast_s_mp_mul_digs_TCL_DECLARED #define TclBN_fast_s_mp_mul_digs_TCL_DECLARED /* 51 */ -EXTERN int TclBN_fast_s_mp_mul_digs(mp_int *a, mp_int *b, - mp_int *c, int digs); +EXTERN int TclBN_fast_s_mp_mul_digs (mp_int * a, mp_int * b, + mp_int * c, int digs); #endif #ifndef TclBN_fast_s_mp_sqr_TCL_DECLARED #define TclBN_fast_s_mp_sqr_TCL_DECLARED /* 52 */ -EXTERN int TclBN_fast_s_mp_sqr(mp_int *a, mp_int *b); +EXTERN int TclBN_fast_s_mp_sqr (mp_int* a, mp_int* b); #endif #ifndef TclBN_mp_karatsuba_mul_TCL_DECLARED #define TclBN_mp_karatsuba_mul_TCL_DECLARED /* 53 */ -EXTERN int TclBN_mp_karatsuba_mul(mp_int *a, mp_int *b, - mp_int *c); +EXTERN int TclBN_mp_karatsuba_mul (mp_int* a, mp_int* b, + mp_int* c); #endif #ifndef TclBN_mp_karatsuba_sqr_TCL_DECLARED #define TclBN_mp_karatsuba_sqr_TCL_DECLARED /* 54 */ -EXTERN int TclBN_mp_karatsuba_sqr(mp_int *a, mp_int *b); +EXTERN int TclBN_mp_karatsuba_sqr (mp_int* a, mp_int* b); #endif #ifndef TclBN_mp_toom_mul_TCL_DECLARED #define TclBN_mp_toom_mul_TCL_DECLARED /* 55 */ -EXTERN int TclBN_mp_toom_mul(mp_int *a, mp_int *b, mp_int *c); +EXTERN int TclBN_mp_toom_mul (mp_int* a, mp_int* b, mp_int* c); #endif #ifndef TclBN_mp_toom_sqr_TCL_DECLARED #define TclBN_mp_toom_sqr_TCL_DECLARED /* 56 */ -EXTERN int TclBN_mp_toom_sqr(mp_int *a, mp_int *b); +EXTERN int TclBN_mp_toom_sqr (mp_int* a, mp_int* b); #endif #ifndef TclBN_s_mp_add_TCL_DECLARED #define TclBN_s_mp_add_TCL_DECLARED /* 57 */ -EXTERN int TclBN_s_mp_add(mp_int *a, mp_int *b, mp_int *c); +EXTERN int TclBN_s_mp_add (mp_int* a, mp_int* b, mp_int* c); #endif #ifndef TclBN_s_mp_mul_digs_TCL_DECLARED #define TclBN_s_mp_mul_digs_TCL_DECLARED /* 58 */ -EXTERN int TclBN_s_mp_mul_digs(mp_int *a, mp_int *b, mp_int *c, +EXTERN int TclBN_s_mp_mul_digs (mp_int* a, mp_int* b, mp_int* c, int digs); #endif #ifndef TclBN_s_mp_sqr_TCL_DECLARED #define TclBN_s_mp_sqr_TCL_DECLARED /* 59 */ -EXTERN int TclBN_s_mp_sqr(mp_int *a, mp_int *b); +EXTERN int TclBN_s_mp_sqr (mp_int* a, mp_int* b); #endif #ifndef TclBN_s_mp_sub_TCL_DECLARED #define TclBN_s_mp_sub_TCL_DECLARED /* 60 */ -EXTERN int TclBN_s_mp_sub(mp_int *a, mp_int *b, mp_int *c); +EXTERN int TclBN_s_mp_sub (mp_int* a, mp_int* b, mp_int* c); #endif typedef struct TclTomMathStubs { @@ -458,65 +459,65 @@ typedef struct TclTomMathStubs { int (*tclBN_epoch) (void); /* 0 */ int (*tclBN_revision) (void); /* 1 */ - int (*tclBN_mp_add) (mp_int *a, mp_int *b, mp_int *c); /* 2 */ - int (*tclBN_mp_add_d) (mp_int *a, mp_digit b, mp_int *c); /* 3 */ - int (*tclBN_mp_and) (mp_int *a, mp_int *b, mp_int *c); /* 4 */ - void (*tclBN_mp_clamp) (mp_int *a); /* 5 */ - void (*tclBN_mp_clear) (mp_int *a); /* 6 */ - void (*tclBN_mp_clear_multi) (mp_int *a, ...); /* 7 */ - int (*tclBN_mp_cmp) (mp_int *a, mp_int *b); /* 8 */ - int (*tclBN_mp_cmp_d) (mp_int *a, mp_digit b); /* 9 */ - int (*tclBN_mp_cmp_mag) (mp_int *a, mp_int *b); /* 10 */ - int (*tclBN_mp_copy) (mp_int *a, mp_int *b); /* 11 */ - int (*tclBN_mp_count_bits) (mp_int *a); /* 12 */ - int (*tclBN_mp_div) (mp_int *a, mp_int *b, mp_int *q, mp_int *r); /* 13 */ - int (*tclBN_mp_div_d) (mp_int *a, mp_digit b, mp_int *q, mp_digit *r); /* 14 */ - int (*tclBN_mp_div_2) (mp_int *a, mp_int *q); /* 15 */ - int (*tclBN_mp_div_2d) (mp_int *a, int b, mp_int *q, mp_int *r); /* 16 */ - int (*tclBN_mp_div_3) (mp_int *a, mp_int *q, mp_digit *r); /* 17 */ - void (*tclBN_mp_exch) (mp_int *a, mp_int *b); /* 18 */ - int (*tclBN_mp_expt_d) (mp_int *a, mp_digit b, mp_int *c); /* 19 */ - int (*tclBN_mp_grow) (mp_int *a, int size); /* 20 */ - int (*tclBN_mp_init) (mp_int *a); /* 21 */ - int (*tclBN_mp_init_copy) (mp_int *a, mp_int *b); /* 22 */ - int (*tclBN_mp_init_multi) (mp_int *a, ...); /* 23 */ - int (*tclBN_mp_init_set) (mp_int *a, mp_digit b); /* 24 */ - int (*tclBN_mp_init_size) (mp_int *a, int size); /* 25 */ - int (*tclBN_mp_lshd) (mp_int *a, int shift); /* 26 */ - int (*tclBN_mp_mod) (mp_int *a, mp_int *b, mp_int *r); /* 27 */ - int (*tclBN_mp_mod_2d) (mp_int *a, int b, mp_int *r); /* 28 */ - int (*tclBN_mp_mul) (mp_int *a, mp_int *b, mp_int *p); /* 29 */ - int (*tclBN_mp_mul_d) (mp_int *a, mp_digit b, mp_int *p); /* 30 */ - int (*tclBN_mp_mul_2) (mp_int *a, mp_int *p); /* 31 */ - int (*tclBN_mp_mul_2d) (mp_int *a, int d, mp_int *p); /* 32 */ - int (*tclBN_mp_neg) (mp_int *a, mp_int *b); /* 33 */ - int (*tclBN_mp_or) (mp_int *a, mp_int *b, mp_int *c); /* 34 */ - int (*tclBN_mp_radix_size) (mp_int *a, int radix, int *size); /* 35 */ - int (*tclBN_mp_read_radix) (mp_int *a, const char *str, int radix); /* 36 */ - void (*tclBN_mp_rshd) (mp_int *a, int shift); /* 37 */ - int (*tclBN_mp_shrink) (mp_int *a); /* 38 */ - void (*tclBN_mp_set) (mp_int *a, mp_digit b); /* 39 */ - int (*tclBN_mp_sqr) (mp_int *a, mp_int *b); /* 40 */ - int (*tclBN_mp_sqrt) (mp_int *a, mp_int *b); /* 41 */ - int (*tclBN_mp_sub) (mp_int *a, mp_int *b, mp_int *c); /* 42 */ - int (*tclBN_mp_sub_d) (mp_int *a, mp_digit b, mp_int *c); /* 43 */ - int (*tclBN_mp_to_unsigned_bin) (mp_int *a, unsigned char *b); /* 44 */ - int (*tclBN_mp_to_unsigned_bin_n) (mp_int *a, unsigned char *b, unsigned long *outlen); /* 45 */ - int (*tclBN_mp_toradix_n) (mp_int *a, char *str, int radix, int maxlen); /* 46 */ - int (*tclBN_mp_unsigned_bin_size) (mp_int *a); /* 47 */ - int (*tclBN_mp_xor) (mp_int *a, mp_int *b, mp_int *c); /* 48 */ - void (*tclBN_mp_zero) (mp_int *a); /* 49 */ - void (*tclBN_reverse) (unsigned char *s, int len); /* 50 */ - int (*tclBN_fast_s_mp_mul_digs) (mp_int *a, mp_int *b, mp_int *c, int digs); /* 51 */ - int (*tclBN_fast_s_mp_sqr) (mp_int *a, mp_int *b); /* 52 */ - int (*tclBN_mp_karatsuba_mul) (mp_int *a, mp_int *b, mp_int *c); /* 53 */ - int (*tclBN_mp_karatsuba_sqr) (mp_int *a, mp_int *b); /* 54 */ - int (*tclBN_mp_toom_mul) (mp_int *a, mp_int *b, mp_int *c); /* 55 */ - int (*tclBN_mp_toom_sqr) (mp_int *a, mp_int *b); /* 56 */ - int (*tclBN_s_mp_add) (mp_int *a, mp_int *b, mp_int *c); /* 57 */ - int (*tclBN_s_mp_mul_digs) (mp_int *a, mp_int *b, mp_int *c, int digs); /* 58 */ - int (*tclBN_s_mp_sqr) (mp_int *a, mp_int *b); /* 59 */ - int (*tclBN_s_mp_sub) (mp_int *a, mp_int *b, mp_int *c); /* 60 */ + int (*tclBN_mp_add) (mp_int* a, mp_int* b, mp_int* c); /* 2 */ + int (*tclBN_mp_add_d) (mp_int* a, mp_digit b, mp_int* c); /* 3 */ + int (*tclBN_mp_and) (mp_int* a, mp_int* b, mp_int* c); /* 4 */ + void (*tclBN_mp_clamp) (mp_int* a); /* 5 */ + void (*tclBN_mp_clear) (mp_int* a); /* 6 */ + void (*tclBN_mp_clear_multi) (mp_int* a, ...); /* 7 */ + int (*tclBN_mp_cmp) (mp_int* a, mp_int* b); /* 8 */ + int (*tclBN_mp_cmp_d) (mp_int* a, mp_digit b); /* 9 */ + int (*tclBN_mp_cmp_mag) (mp_int* a, mp_int* b); /* 10 */ + int (*tclBN_mp_copy) (mp_int* a, mp_int* b); /* 11 */ + int (*tclBN_mp_count_bits) (mp_int* a); /* 12 */ + int (*tclBN_mp_div) (mp_int* a, mp_int* b, mp_int* q, mp_int* r); /* 13 */ + int (*tclBN_mp_div_d) (mp_int* a, mp_digit b, mp_int* q, mp_digit* r); /* 14 */ + int (*tclBN_mp_div_2) (mp_int* a, mp_int* q); /* 15 */ + int (*tclBN_mp_div_2d) (mp_int* a, int b, mp_int* q, mp_int* r); /* 16 */ + int (*tclBN_mp_div_3) (mp_int* a, mp_int* q, mp_digit* r); /* 17 */ + void (*tclBN_mp_exch) (mp_int* a, mp_int* b); /* 18 */ + int (*tclBN_mp_expt_d) (mp_int* a, mp_digit b, mp_int* c); /* 19 */ + int (*tclBN_mp_grow) (mp_int* a, int size); /* 20 */ + int (*tclBN_mp_init) (mp_int* a); /* 21 */ + int (*tclBN_mp_init_copy) (mp_int * a, mp_int* b); /* 22 */ + int (*tclBN_mp_init_multi) (mp_int* a, ...); /* 23 */ + int (*tclBN_mp_init_set) (mp_int* a, mp_digit b); /* 24 */ + int (*tclBN_mp_init_size) (mp_int* a, int size); /* 25 */ + int (*tclBN_mp_lshd) (mp_int* a, int shift); /* 26 */ + int (*tclBN_mp_mod) (mp_int* a, mp_int* b, mp_int* r); /* 27 */ + int (*tclBN_mp_mod_2d) (mp_int* a, int b, mp_int* r); /* 28 */ + int (*tclBN_mp_mul) (mp_int* a, mp_int* b, mp_int* p); /* 29 */ + int (*tclBN_mp_mul_d) (mp_int* a, mp_digit b, mp_int* p); /* 30 */ + int (*tclBN_mp_mul_2) (mp_int* a, mp_int* p); /* 31 */ + int (*tclBN_mp_mul_2d) (mp_int* a, int d, mp_int* p); /* 32 */ + int (*tclBN_mp_neg) (mp_int* a, mp_int* b); /* 33 */ + int (*tclBN_mp_or) (mp_int* a, mp_int* b, mp_int* c); /* 34 */ + int (*tclBN_mp_radix_size) (mp_int* a, int radix, int* size); /* 35 */ + int (*tclBN_mp_read_radix) (mp_int* a, const char* str, int radix); /* 36 */ + void (*tclBN_mp_rshd) (mp_int * a, int shift); /* 37 */ + int (*tclBN_mp_shrink) (mp_int* a); /* 38 */ + void (*tclBN_mp_set) (mp_int* a, mp_digit b); /* 39 */ + int (*tclBN_mp_sqr) (mp_int* a, mp_int* b); /* 40 */ + int (*tclBN_mp_sqrt) (mp_int* a, mp_int* b); /* 41 */ + int (*tclBN_mp_sub) (mp_int* a, mp_int* b, mp_int* c); /* 42 */ + int (*tclBN_mp_sub_d) (mp_int* a, mp_digit b, mp_int* c); /* 43 */ + int (*tclBN_mp_to_unsigned_bin) (mp_int* a, unsigned char* b); /* 44 */ + int (*tclBN_mp_to_unsigned_bin_n) (mp_int* a, unsigned char* b, unsigned long* outlen); /* 45 */ + int (*tclBN_mp_toradix_n) (mp_int* a, char* str, int radix, int maxlen); /* 46 */ + int (*tclBN_mp_unsigned_bin_size) (mp_int* a); /* 47 */ + int (*tclBN_mp_xor) (mp_int* a, mp_int* b, mp_int* c); /* 48 */ + void (*tclBN_mp_zero) (mp_int* a); /* 49 */ + void (*tclBN_reverse) (unsigned char* s, int len); /* 50 */ + int (*tclBN_fast_s_mp_mul_digs) (mp_int * a, mp_int * b, mp_int * c, int digs); /* 51 */ + int (*tclBN_fast_s_mp_sqr) (mp_int* a, mp_int* b); /* 52 */ + int (*tclBN_mp_karatsuba_mul) (mp_int* a, mp_int* b, mp_int* c); /* 53 */ + int (*tclBN_mp_karatsuba_sqr) (mp_int* a, mp_int* b); /* 54 */ + int (*tclBN_mp_toom_mul) (mp_int* a, mp_int* b, mp_int* c); /* 55 */ + int (*tclBN_mp_toom_sqr) (mp_int* a, mp_int* b); /* 56 */ + int (*tclBN_s_mp_add) (mp_int* a, mp_int* b, mp_int* c); /* 57 */ + int (*tclBN_s_mp_mul_digs) (mp_int* a, mp_int* b, mp_int* c, int digs); /* 58 */ + int (*tclBN_s_mp_sqr) (mp_int* a, mp_int* b); /* 59 */ + int (*tclBN_s_mp_sub) (mp_int* a, mp_int* b, mp_int* c); /* 60 */ } TclTomMathStubs; #ifdef __cplusplus diff --git a/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/include/tk.h b/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/include/tk.h index 726d429b3c4a4af75995711ef0c7e44943f26a9e..86693dc3adddac6c5d386739f825d74da287182b 100644 --- a/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/include/tk.h +++ b/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/include/tk.h @@ -12,7 +12,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tk.h,v 1.109.2.13 2010/08/04 17:06:52 dgp Exp $ + * RCS: @(#) $Id: tk.h,v 1.109 2008/03/28 18:13:39 dgp Exp $ */ #ifndef _TK @@ -53,10 +53,10 @@ extern "C" { #define TK_MAJOR_VERSION 8 #define TK_MINOR_VERSION 5 #define TK_RELEASE_LEVEL TCL_FINAL_RELEASE -#define TK_RELEASE_SERIAL 9 +#define TK_RELEASE_SERIAL 2 #define TK_VERSION "8.5" -#define TK_PATCH_LEVEL "8.5.9" +#define TK_PATCH_LEVEL "8.5.2" /* * A special definition used to allow this header file to be included from @@ -627,15 +627,17 @@ typedef struct Tk_GeomMgr { *--------------------------------------------------------------------------- */ -#define VirtualEvent (MappingNotify + 1) -#define ActivateNotify (MappingNotify + 2) -#define DeactivateNotify (MappingNotify + 3) -#define MouseWheelEvent (MappingNotify + 4) -#define TK_LASTEVENT (MappingNotify + 5) +#define VirtualEvent (LASTEvent) +#define ActivateNotify (LASTEvent + 1) +#define DeactivateNotify (LASTEvent + 2) +#define MouseWheelEvent (LASTEvent + 3) +#define TK_LASTEVENT (LASTEvent + 4) #define MouseWheelMask (1L << 28) + #define ActivateMask (1L << 29) #define VirtualEventMask (1L << 30) +#define TK_LASTEVENT (LASTEvent + 4) /* * A virtual event shares most of its fields with the XKeyEvent and @@ -722,8 +724,6 @@ typedef XActivateDeactivateEvent XDeactivateEvent; (((Tk_FakeWin *) (tkwin))->flags & TK_WIN_MANAGED) #define Tk_TopWinHierarchy(tkwin) \ (((Tk_FakeWin *) (tkwin))->flags & TK_TOP_HIERARCHY) -#define Tk_IsManageable(tkwin) \ - (((Tk_FakeWin *) (tkwin))->flags & TK_WM_MANAGEABLE) #define Tk_ReqWidth(tkwin) (((Tk_FakeWin *) (tkwin))->reqWidth) #define Tk_ReqHeight(tkwin) (((Tk_FakeWin *) (tkwin))->reqHeight) /* Tk_InternalBorderWidth is deprecated */ @@ -859,8 +859,6 @@ typedef struct Tk_FakeWin { * TK_PROP_PROPCHANGE 1 means that PropertyNotify events in the * window's children should propagate up to this * window. - * TK_WM_MANAGEABLE 1 marks a window as capable of being converted - * into a toplevel using [wm manage]. */ #define TK_MAPPED 1 @@ -882,7 +880,6 @@ typedef struct Tk_FakeWin { #define TK_WIN_MANAGED 0x10000 #define TK_TOP_HIERARCHY 0x20000 #define TK_PROP_PROPCHANGE 0x40000 -#define TK_WM_MANAGEABLE 0x80000 /* *-------------------------------------------------------------- @@ -1489,7 +1486,7 @@ typedef struct Tk_ElementSpec { const char * Tk_InitStubs _ANSI_ARGS_((Tcl_Interp *interp, const char *version, int exact)); -EXTERN const char * Tk_PkgInitStubsCheck _ANSI_ARGS_((Tcl_Interp *interp, +const char * Tk_PkgInitStubsCheck _ANSI_ARGS_((Tcl_Interp *interp, const char *version, int exact)); #ifndef USE_TK_STUBS diff --git a/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/include/tkDecls.h b/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/include/tkDecls.h index 953925e105cd0125b33408c1432bf31e226f5e4b..407150156bea9a58227e2b4ac5720e7e28269240 100644 --- a/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/include/tkDecls.h +++ b/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/include/tkDecls.h @@ -8,7 +8,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkDecls.h,v 1.30.4.1 2010/02/07 23:24:13 nijtmans Exp $ + * RCS: @(#) $Id: tkDecls.h,v 1.30 2007/05/14 20:58:26 dgp Exp $ */ #ifndef _TKDECLS @@ -34,1647 +34,1665 @@ #ifndef Tk_MainLoop_TCL_DECLARED #define Tk_MainLoop_TCL_DECLARED /* 0 */ -EXTERN void Tk_MainLoop(void); +EXTERN void Tk_MainLoop (void); #endif #ifndef Tk_3DBorderColor_TCL_DECLARED #define Tk_3DBorderColor_TCL_DECLARED /* 1 */ -EXTERN XColor * Tk_3DBorderColor(Tk_3DBorder border); +EXTERN XColor * Tk_3DBorderColor (Tk_3DBorder border); #endif #ifndef Tk_3DBorderGC_TCL_DECLARED #define Tk_3DBorderGC_TCL_DECLARED /* 2 */ -EXTERN GC Tk_3DBorderGC(Tk_Window tkwin, Tk_3DBorder border, +EXTERN GC Tk_3DBorderGC (Tk_Window tkwin, Tk_3DBorder border, int which); #endif #ifndef Tk_3DHorizontalBevel_TCL_DECLARED #define Tk_3DHorizontalBevel_TCL_DECLARED /* 3 */ -EXTERN void Tk_3DHorizontalBevel(Tk_Window tkwin, - Drawable drawable, Tk_3DBorder border, int x, - int y, int width, int height, int leftIn, +EXTERN void Tk_3DHorizontalBevel (Tk_Window tkwin, + Drawable drawable, Tk_3DBorder border, int x, + int y, int width, int height, int leftIn, int rightIn, int topBevel, int relief); #endif #ifndef Tk_3DVerticalBevel_TCL_DECLARED #define Tk_3DVerticalBevel_TCL_DECLARED /* 4 */ -EXTERN void Tk_3DVerticalBevel(Tk_Window tkwin, - Drawable drawable, Tk_3DBorder border, int x, - int y, int width, int height, int leftBevel, +EXTERN void Tk_3DVerticalBevel (Tk_Window tkwin, + Drawable drawable, Tk_3DBorder border, int x, + int y, int width, int height, int leftBevel, int relief); #endif #ifndef Tk_AddOption_TCL_DECLARED #define Tk_AddOption_TCL_DECLARED /* 5 */ -EXTERN void Tk_AddOption(Tk_Window tkwin, CONST char *name, - CONST char *value, int priority); +EXTERN void Tk_AddOption (Tk_Window tkwin, CONST char * name, + CONST char * value, int priority); #endif #ifndef Tk_BindEvent_TCL_DECLARED #define Tk_BindEvent_TCL_DECLARED /* 6 */ -EXTERN void Tk_BindEvent(Tk_BindingTable bindingTable, - XEvent *eventPtr, Tk_Window tkwin, - int numObjects, ClientData *objectPtr); +EXTERN void Tk_BindEvent (Tk_BindingTable bindingTable, + XEvent * eventPtr, Tk_Window tkwin, + int numObjects, ClientData * objectPtr); #endif #ifndef Tk_CanvasDrawableCoords_TCL_DECLARED #define Tk_CanvasDrawableCoords_TCL_DECLARED /* 7 */ -EXTERN void Tk_CanvasDrawableCoords(Tk_Canvas canvas, double x, - double y, short *drawableXPtr, - short *drawableYPtr); +EXTERN void Tk_CanvasDrawableCoords (Tk_Canvas canvas, double x, + double y, short * drawableXPtr, + short * drawableYPtr); #endif #ifndef Tk_CanvasEventuallyRedraw_TCL_DECLARED #define Tk_CanvasEventuallyRedraw_TCL_DECLARED /* 8 */ -EXTERN void Tk_CanvasEventuallyRedraw(Tk_Canvas canvas, int x1, +EXTERN void Tk_CanvasEventuallyRedraw (Tk_Canvas canvas, int x1, int y1, int x2, int y2); #endif #ifndef Tk_CanvasGetCoord_TCL_DECLARED #define Tk_CanvasGetCoord_TCL_DECLARED /* 9 */ -EXTERN int Tk_CanvasGetCoord(Tcl_Interp *interp, - Tk_Canvas canvas, CONST char *str, - double *doublePtr); +EXTERN int Tk_CanvasGetCoord (Tcl_Interp * interp, + Tk_Canvas canvas, CONST char * str, + double * doublePtr); #endif #ifndef Tk_CanvasGetTextInfo_TCL_DECLARED #define Tk_CanvasGetTextInfo_TCL_DECLARED /* 10 */ -EXTERN Tk_CanvasTextInfo * Tk_CanvasGetTextInfo(Tk_Canvas canvas); +EXTERN Tk_CanvasTextInfo * Tk_CanvasGetTextInfo (Tk_Canvas canvas); #endif #ifndef Tk_CanvasPsBitmap_TCL_DECLARED #define Tk_CanvasPsBitmap_TCL_DECLARED /* 11 */ -EXTERN int Tk_CanvasPsBitmap(Tcl_Interp *interp, - Tk_Canvas canvas, Pixmap bitmap, int x, +EXTERN int Tk_CanvasPsBitmap (Tcl_Interp * interp, + Tk_Canvas canvas, Pixmap bitmap, int x, int y, int width, int height); #endif #ifndef Tk_CanvasPsColor_TCL_DECLARED #define Tk_CanvasPsColor_TCL_DECLARED /* 12 */ -EXTERN int Tk_CanvasPsColor(Tcl_Interp *interp, - Tk_Canvas canvas, XColor *colorPtr); +EXTERN int Tk_CanvasPsColor (Tcl_Interp * interp, + Tk_Canvas canvas, XColor * colorPtr); #endif #ifndef Tk_CanvasPsFont_TCL_DECLARED #define Tk_CanvasPsFont_TCL_DECLARED /* 13 */ -EXTERN int Tk_CanvasPsFont(Tcl_Interp *interp, Tk_Canvas canvas, - Tk_Font font); +EXTERN int Tk_CanvasPsFont (Tcl_Interp * interp, + Tk_Canvas canvas, Tk_Font font); #endif #ifndef Tk_CanvasPsPath_TCL_DECLARED #define Tk_CanvasPsPath_TCL_DECLARED /* 14 */ -EXTERN void Tk_CanvasPsPath(Tcl_Interp *interp, Tk_Canvas canvas, - double *coordPtr, int numPoints); +EXTERN void Tk_CanvasPsPath (Tcl_Interp * interp, + Tk_Canvas canvas, double * coordPtr, + int numPoints); #endif #ifndef Tk_CanvasPsStipple_TCL_DECLARED #define Tk_CanvasPsStipple_TCL_DECLARED /* 15 */ -EXTERN int Tk_CanvasPsStipple(Tcl_Interp *interp, +EXTERN int Tk_CanvasPsStipple (Tcl_Interp * interp, Tk_Canvas canvas, Pixmap bitmap); #endif #ifndef Tk_CanvasPsY_TCL_DECLARED #define Tk_CanvasPsY_TCL_DECLARED /* 16 */ -EXTERN double Tk_CanvasPsY(Tk_Canvas canvas, double y); +EXTERN double Tk_CanvasPsY (Tk_Canvas canvas, double y); #endif #ifndef Tk_CanvasSetStippleOrigin_TCL_DECLARED #define Tk_CanvasSetStippleOrigin_TCL_DECLARED /* 17 */ -EXTERN void Tk_CanvasSetStippleOrigin(Tk_Canvas canvas, GC gc); +EXTERN void Tk_CanvasSetStippleOrigin (Tk_Canvas canvas, GC gc); #endif #ifndef Tk_CanvasTagsParseProc_TCL_DECLARED #define Tk_CanvasTagsParseProc_TCL_DECLARED /* 18 */ -EXTERN int Tk_CanvasTagsParseProc(ClientData clientData, - Tcl_Interp *interp, Tk_Window tkwin, - CONST char *value, char *widgRec, int offset); +EXTERN int Tk_CanvasTagsParseProc (ClientData clientData, + Tcl_Interp * interp, Tk_Window tkwin, + CONST char * value, char * widgRec, + int offset); #endif #ifndef Tk_CanvasTagsPrintProc_TCL_DECLARED #define Tk_CanvasTagsPrintProc_TCL_DECLARED /* 19 */ -EXTERN char * Tk_CanvasTagsPrintProc(ClientData clientData, - Tk_Window tkwin, char *widgRec, int offset, - Tcl_FreeProc **freeProcPtr); +EXTERN char * Tk_CanvasTagsPrintProc (ClientData clientData, + Tk_Window tkwin, char * widgRec, int offset, + Tcl_FreeProc ** freeProcPtr); #endif #ifndef Tk_CanvasTkwin_TCL_DECLARED #define Tk_CanvasTkwin_TCL_DECLARED /* 20 */ -EXTERN Tk_Window Tk_CanvasTkwin(Tk_Canvas canvas); +EXTERN Tk_Window Tk_CanvasTkwin (Tk_Canvas canvas); #endif #ifndef Tk_CanvasWindowCoords_TCL_DECLARED #define Tk_CanvasWindowCoords_TCL_DECLARED /* 21 */ -EXTERN void Tk_CanvasWindowCoords(Tk_Canvas canvas, double x, - double y, short *screenXPtr, - short *screenYPtr); +EXTERN void Tk_CanvasWindowCoords (Tk_Canvas canvas, double x, + double y, short * screenXPtr, + short * screenYPtr); #endif #ifndef Tk_ChangeWindowAttributes_TCL_DECLARED #define Tk_ChangeWindowAttributes_TCL_DECLARED /* 22 */ -EXTERN void Tk_ChangeWindowAttributes(Tk_Window tkwin, - unsigned long valueMask, - XSetWindowAttributes *attsPtr); +EXTERN void Tk_ChangeWindowAttributes (Tk_Window tkwin, + unsigned long valueMask, + XSetWindowAttributes * attsPtr); #endif #ifndef Tk_CharBbox_TCL_DECLARED #define Tk_CharBbox_TCL_DECLARED /* 23 */ -EXTERN int Tk_CharBbox(Tk_TextLayout layout, int index, - int *xPtr, int *yPtr, int *widthPtr, - int *heightPtr); +EXTERN int Tk_CharBbox (Tk_TextLayout layout, int index, + int * xPtr, int * yPtr, int * widthPtr, + int * heightPtr); #endif #ifndef Tk_ClearSelection_TCL_DECLARED #define Tk_ClearSelection_TCL_DECLARED /* 24 */ -EXTERN void Tk_ClearSelection(Tk_Window tkwin, Atom selection); +EXTERN void Tk_ClearSelection (Tk_Window tkwin, Atom selection); #endif #ifndef Tk_ClipboardAppend_TCL_DECLARED #define Tk_ClipboardAppend_TCL_DECLARED /* 25 */ -EXTERN int Tk_ClipboardAppend(Tcl_Interp *interp, - Tk_Window tkwin, Atom target, Atom format, - char *buffer); +EXTERN int Tk_ClipboardAppend (Tcl_Interp * interp, + Tk_Window tkwin, Atom target, Atom format, + char* buffer); #endif #ifndef Tk_ClipboardClear_TCL_DECLARED #define Tk_ClipboardClear_TCL_DECLARED /* 26 */ -EXTERN int Tk_ClipboardClear(Tcl_Interp *interp, +EXTERN int Tk_ClipboardClear (Tcl_Interp * interp, Tk_Window tkwin); #endif #ifndef Tk_ConfigureInfo_TCL_DECLARED #define Tk_ConfigureInfo_TCL_DECLARED /* 27 */ -EXTERN int Tk_ConfigureInfo(Tcl_Interp *interp, Tk_Window tkwin, - Tk_ConfigSpec *specs, char *widgRec, - CONST char *argvName, int flags); +EXTERN int Tk_ConfigureInfo (Tcl_Interp * interp, + Tk_Window tkwin, Tk_ConfigSpec * specs, + char * widgRec, CONST char * argvName, + int flags); #endif #ifndef Tk_ConfigureValue_TCL_DECLARED #define Tk_ConfigureValue_TCL_DECLARED /* 28 */ -EXTERN int Tk_ConfigureValue(Tcl_Interp *interp, - Tk_Window tkwin, Tk_ConfigSpec *specs, - char *widgRec, CONST char *argvName, +EXTERN int Tk_ConfigureValue (Tcl_Interp * interp, + Tk_Window tkwin, Tk_ConfigSpec * specs, + char * widgRec, CONST char * argvName, int flags); #endif #ifndef Tk_ConfigureWidget_TCL_DECLARED #define Tk_ConfigureWidget_TCL_DECLARED /* 29 */ -EXTERN int Tk_ConfigureWidget(Tcl_Interp *interp, - Tk_Window tkwin, Tk_ConfigSpec *specs, - int argc, CONST84 char **argv, char *widgRec, - int flags); +EXTERN int Tk_ConfigureWidget (Tcl_Interp * interp, + Tk_Window tkwin, Tk_ConfigSpec * specs, + int argc, CONST84 char ** argv, + char * widgRec, int flags); #endif #ifndef Tk_ConfigureWindow_TCL_DECLARED #define Tk_ConfigureWindow_TCL_DECLARED /* 30 */ -EXTERN void Tk_ConfigureWindow(Tk_Window tkwin, - unsigned int valueMask, - XWindowChanges *valuePtr); +EXTERN void Tk_ConfigureWindow (Tk_Window tkwin, + unsigned int valueMask, + XWindowChanges * valuePtr); #endif #ifndef Tk_ComputeTextLayout_TCL_DECLARED #define Tk_ComputeTextLayout_TCL_DECLARED /* 31 */ -EXTERN Tk_TextLayout Tk_ComputeTextLayout(Tk_Font font, CONST char *str, - int numChars, int wrapLength, - Tk_Justify justify, int flags, int *widthPtr, - int *heightPtr); +EXTERN Tk_TextLayout Tk_ComputeTextLayout (Tk_Font font, CONST char * str, + int numChars, int wrapLength, + Tk_Justify justify, int flags, + int * widthPtr, int * heightPtr); #endif #ifndef Tk_CoordsToWindow_TCL_DECLARED #define Tk_CoordsToWindow_TCL_DECLARED /* 32 */ -EXTERN Tk_Window Tk_CoordsToWindow(int rootX, int rootY, +EXTERN Tk_Window Tk_CoordsToWindow (int rootX, int rootY, Tk_Window tkwin); #endif #ifndef Tk_CreateBinding_TCL_DECLARED #define Tk_CreateBinding_TCL_DECLARED /* 33 */ -EXTERN unsigned long Tk_CreateBinding(Tcl_Interp *interp, - Tk_BindingTable bindingTable, - ClientData object, CONST char *eventStr, - CONST char *command, int append); +EXTERN unsigned long Tk_CreateBinding (Tcl_Interp * interp, + Tk_BindingTable bindingTable, + ClientData object, CONST char * eventStr, + CONST char * command, int append); #endif #ifndef Tk_CreateBindingTable_TCL_DECLARED #define Tk_CreateBindingTable_TCL_DECLARED /* 34 */ -EXTERN Tk_BindingTable Tk_CreateBindingTable(Tcl_Interp *interp); +EXTERN Tk_BindingTable Tk_CreateBindingTable (Tcl_Interp * interp); #endif #ifndef Tk_CreateErrorHandler_TCL_DECLARED #define Tk_CreateErrorHandler_TCL_DECLARED /* 35 */ -EXTERN Tk_ErrorHandler Tk_CreateErrorHandler(Display *display, int errNum, - int request, int minorCode, - Tk_ErrorProc *errorProc, +EXTERN Tk_ErrorHandler Tk_CreateErrorHandler (Display * display, int errNum, + int request, int minorCode, + Tk_ErrorProc * errorProc, ClientData clientData); #endif #ifndef Tk_CreateEventHandler_TCL_DECLARED #define Tk_CreateEventHandler_TCL_DECLARED /* 36 */ -EXTERN void Tk_CreateEventHandler(Tk_Window token, - unsigned long mask, Tk_EventProc *proc, +EXTERN void Tk_CreateEventHandler (Tk_Window token, + unsigned long mask, Tk_EventProc * proc, ClientData clientData); #endif #ifndef Tk_CreateGenericHandler_TCL_DECLARED #define Tk_CreateGenericHandler_TCL_DECLARED /* 37 */ -EXTERN void Tk_CreateGenericHandler(Tk_GenericProc *proc, +EXTERN void Tk_CreateGenericHandler (Tk_GenericProc * proc, ClientData clientData); #endif #ifndef Tk_CreateImageType_TCL_DECLARED #define Tk_CreateImageType_TCL_DECLARED /* 38 */ -EXTERN void Tk_CreateImageType(Tk_ImageType *typePtr); +EXTERN void Tk_CreateImageType (Tk_ImageType * typePtr); #endif #ifndef Tk_CreateItemType_TCL_DECLARED #define Tk_CreateItemType_TCL_DECLARED /* 39 */ -EXTERN void Tk_CreateItemType(Tk_ItemType *typePtr); +EXTERN void Tk_CreateItemType (Tk_ItemType * typePtr); #endif #ifndef Tk_CreatePhotoImageFormat_TCL_DECLARED #define Tk_CreatePhotoImageFormat_TCL_DECLARED /* 40 */ -EXTERN void Tk_CreatePhotoImageFormat( - Tk_PhotoImageFormat *formatPtr); +EXTERN void Tk_CreatePhotoImageFormat ( + Tk_PhotoImageFormat * formatPtr); #endif #ifndef Tk_CreateSelHandler_TCL_DECLARED #define Tk_CreateSelHandler_TCL_DECLARED /* 41 */ -EXTERN void Tk_CreateSelHandler(Tk_Window tkwin, Atom selection, - Atom target, Tk_SelectionProc *proc, +EXTERN void Tk_CreateSelHandler (Tk_Window tkwin, Atom selection, + Atom target, Tk_SelectionProc * proc, ClientData clientData, Atom format); #endif #ifndef Tk_CreateWindow_TCL_DECLARED #define Tk_CreateWindow_TCL_DECLARED /* 42 */ -EXTERN Tk_Window Tk_CreateWindow(Tcl_Interp *interp, Tk_Window parent, - CONST char *name, CONST char *screenName); +EXTERN Tk_Window Tk_CreateWindow (Tcl_Interp * interp, + Tk_Window parent, CONST char * name, + CONST char * screenName); #endif #ifndef Tk_CreateWindowFromPath_TCL_DECLARED #define Tk_CreateWindowFromPath_TCL_DECLARED /* 43 */ -EXTERN Tk_Window Tk_CreateWindowFromPath(Tcl_Interp *interp, - Tk_Window tkwin, CONST char *pathName, - CONST char *screenName); +EXTERN Tk_Window Tk_CreateWindowFromPath (Tcl_Interp * interp, + Tk_Window tkwin, CONST char * pathName, + CONST char * screenName); #endif #ifndef Tk_DefineBitmap_TCL_DECLARED #define Tk_DefineBitmap_TCL_DECLARED /* 44 */ -EXTERN int Tk_DefineBitmap(Tcl_Interp *interp, CONST char *name, - CONST char *source, int width, int height); +EXTERN int Tk_DefineBitmap (Tcl_Interp * interp, + CONST char * name, CONST char * source, + int width, int height); #endif #ifndef Tk_DefineCursor_TCL_DECLARED #define Tk_DefineCursor_TCL_DECLARED /* 45 */ -EXTERN void Tk_DefineCursor(Tk_Window window, Tk_Cursor cursor); +EXTERN void Tk_DefineCursor (Tk_Window window, Tk_Cursor cursor); #endif #ifndef Tk_DeleteAllBindings_TCL_DECLARED #define Tk_DeleteAllBindings_TCL_DECLARED /* 46 */ -EXTERN void Tk_DeleteAllBindings(Tk_BindingTable bindingTable, +EXTERN void Tk_DeleteAllBindings (Tk_BindingTable bindingTable, ClientData object); #endif #ifndef Tk_DeleteBinding_TCL_DECLARED #define Tk_DeleteBinding_TCL_DECLARED /* 47 */ -EXTERN int Tk_DeleteBinding(Tcl_Interp *interp, - Tk_BindingTable bindingTable, - ClientData object, CONST char *eventStr); +EXTERN int Tk_DeleteBinding (Tcl_Interp * interp, + Tk_BindingTable bindingTable, + ClientData object, CONST char * eventStr); #endif #ifndef Tk_DeleteBindingTable_TCL_DECLARED #define Tk_DeleteBindingTable_TCL_DECLARED /* 48 */ -EXTERN void Tk_DeleteBindingTable(Tk_BindingTable bindingTable); +EXTERN void Tk_DeleteBindingTable (Tk_BindingTable bindingTable); #endif #ifndef Tk_DeleteErrorHandler_TCL_DECLARED #define Tk_DeleteErrorHandler_TCL_DECLARED /* 49 */ -EXTERN void Tk_DeleteErrorHandler(Tk_ErrorHandler handler); +EXTERN void Tk_DeleteErrorHandler (Tk_ErrorHandler handler); #endif #ifndef Tk_DeleteEventHandler_TCL_DECLARED #define Tk_DeleteEventHandler_TCL_DECLARED /* 50 */ -EXTERN void Tk_DeleteEventHandler(Tk_Window token, - unsigned long mask, Tk_EventProc *proc, +EXTERN void Tk_DeleteEventHandler (Tk_Window token, + unsigned long mask, Tk_EventProc * proc, ClientData clientData); #endif #ifndef Tk_DeleteGenericHandler_TCL_DECLARED #define Tk_DeleteGenericHandler_TCL_DECLARED /* 51 */ -EXTERN void Tk_DeleteGenericHandler(Tk_GenericProc *proc, +EXTERN void Tk_DeleteGenericHandler (Tk_GenericProc * proc, ClientData clientData); #endif #ifndef Tk_DeleteImage_TCL_DECLARED #define Tk_DeleteImage_TCL_DECLARED /* 52 */ -EXTERN void Tk_DeleteImage(Tcl_Interp *interp, CONST char *name); +EXTERN void Tk_DeleteImage (Tcl_Interp * interp, + CONST char * name); #endif #ifndef Tk_DeleteSelHandler_TCL_DECLARED #define Tk_DeleteSelHandler_TCL_DECLARED /* 53 */ -EXTERN void Tk_DeleteSelHandler(Tk_Window tkwin, Atom selection, +EXTERN void Tk_DeleteSelHandler (Tk_Window tkwin, Atom selection, Atom target); #endif #ifndef Tk_DestroyWindow_TCL_DECLARED #define Tk_DestroyWindow_TCL_DECLARED /* 54 */ -EXTERN void Tk_DestroyWindow(Tk_Window tkwin); +EXTERN void Tk_DestroyWindow (Tk_Window tkwin); #endif #ifndef Tk_DisplayName_TCL_DECLARED #define Tk_DisplayName_TCL_DECLARED /* 55 */ -EXTERN CONST84_RETURN char * Tk_DisplayName(Tk_Window tkwin); +EXTERN CONST84_RETURN char * Tk_DisplayName (Tk_Window tkwin); #endif #ifndef Tk_DistanceToTextLayout_TCL_DECLARED #define Tk_DistanceToTextLayout_TCL_DECLARED /* 56 */ -EXTERN int Tk_DistanceToTextLayout(Tk_TextLayout layout, int x, +EXTERN int Tk_DistanceToTextLayout (Tk_TextLayout layout, int x, int y); #endif #ifndef Tk_Draw3DPolygon_TCL_DECLARED #define Tk_Draw3DPolygon_TCL_DECLARED /* 57 */ -EXTERN void Tk_Draw3DPolygon(Tk_Window tkwin, Drawable drawable, - Tk_3DBorder border, XPoint *pointPtr, - int numPoints, int borderWidth, +EXTERN void Tk_Draw3DPolygon (Tk_Window tkwin, Drawable drawable, + Tk_3DBorder border, XPoint * pointPtr, + int numPoints, int borderWidth, int leftRelief); #endif #ifndef Tk_Draw3DRectangle_TCL_DECLARED #define Tk_Draw3DRectangle_TCL_DECLARED /* 58 */ -EXTERN void Tk_Draw3DRectangle(Tk_Window tkwin, - Drawable drawable, Tk_3DBorder border, int x, - int y, int width, int height, +EXTERN void Tk_Draw3DRectangle (Tk_Window tkwin, + Drawable drawable, Tk_3DBorder border, int x, + int y, int width, int height, int borderWidth, int relief); #endif #ifndef Tk_DrawChars_TCL_DECLARED #define Tk_DrawChars_TCL_DECLARED /* 59 */ -EXTERN void Tk_DrawChars(Display *display, Drawable drawable, - GC gc, Tk_Font tkfont, CONST char *source, +EXTERN void Tk_DrawChars (Display * display, Drawable drawable, + GC gc, Tk_Font tkfont, CONST char * source, int numBytes, int x, int y); #endif #ifndef Tk_DrawFocusHighlight_TCL_DECLARED #define Tk_DrawFocusHighlight_TCL_DECLARED /* 60 */ -EXTERN void Tk_DrawFocusHighlight(Tk_Window tkwin, GC gc, +EXTERN void Tk_DrawFocusHighlight (Tk_Window tkwin, GC gc, int width, Drawable drawable); #endif #ifndef Tk_DrawTextLayout_TCL_DECLARED #define Tk_DrawTextLayout_TCL_DECLARED /* 61 */ -EXTERN void Tk_DrawTextLayout(Display *display, - Drawable drawable, GC gc, - Tk_TextLayout layout, int x, int y, +EXTERN void Tk_DrawTextLayout (Display * display, + Drawable drawable, GC gc, + Tk_TextLayout layout, int x, int y, int firstChar, int lastChar); #endif #ifndef Tk_Fill3DPolygon_TCL_DECLARED #define Tk_Fill3DPolygon_TCL_DECLARED /* 62 */ -EXTERN void Tk_Fill3DPolygon(Tk_Window tkwin, Drawable drawable, - Tk_3DBorder border, XPoint *pointPtr, - int numPoints, int borderWidth, +EXTERN void Tk_Fill3DPolygon (Tk_Window tkwin, Drawable drawable, + Tk_3DBorder border, XPoint * pointPtr, + int numPoints, int borderWidth, int leftRelief); #endif #ifndef Tk_Fill3DRectangle_TCL_DECLARED #define Tk_Fill3DRectangle_TCL_DECLARED /* 63 */ -EXTERN void Tk_Fill3DRectangle(Tk_Window tkwin, - Drawable drawable, Tk_3DBorder border, int x, - int y, int width, int height, +EXTERN void Tk_Fill3DRectangle (Tk_Window tkwin, + Drawable drawable, Tk_3DBorder border, int x, + int y, int width, int height, int borderWidth, int relief); #endif #ifndef Tk_FindPhoto_TCL_DECLARED #define Tk_FindPhoto_TCL_DECLARED /* 64 */ -EXTERN Tk_PhotoHandle Tk_FindPhoto(Tcl_Interp *interp, - CONST char *imageName); +EXTERN Tk_PhotoHandle Tk_FindPhoto (Tcl_Interp * interp, + CONST char * imageName); #endif #ifndef Tk_FontId_TCL_DECLARED #define Tk_FontId_TCL_DECLARED /* 65 */ -EXTERN Font Tk_FontId(Tk_Font font); +EXTERN Font Tk_FontId (Tk_Font font); #endif #ifndef Tk_Free3DBorder_TCL_DECLARED #define Tk_Free3DBorder_TCL_DECLARED /* 66 */ -EXTERN void Tk_Free3DBorder(Tk_3DBorder border); +EXTERN void Tk_Free3DBorder (Tk_3DBorder border); #endif #ifndef Tk_FreeBitmap_TCL_DECLARED #define Tk_FreeBitmap_TCL_DECLARED /* 67 */ -EXTERN void Tk_FreeBitmap(Display *display, Pixmap bitmap); +EXTERN void Tk_FreeBitmap (Display * display, Pixmap bitmap); #endif #ifndef Tk_FreeColor_TCL_DECLARED #define Tk_FreeColor_TCL_DECLARED /* 68 */ -EXTERN void Tk_FreeColor(XColor *colorPtr); +EXTERN void Tk_FreeColor (XColor * colorPtr); #endif #ifndef Tk_FreeColormap_TCL_DECLARED #define Tk_FreeColormap_TCL_DECLARED /* 69 */ -EXTERN void Tk_FreeColormap(Display *display, Colormap colormap); +EXTERN void Tk_FreeColormap (Display * display, + Colormap colormap); #endif #ifndef Tk_FreeCursor_TCL_DECLARED #define Tk_FreeCursor_TCL_DECLARED /* 70 */ -EXTERN void Tk_FreeCursor(Display *display, Tk_Cursor cursor); +EXTERN void Tk_FreeCursor (Display * display, Tk_Cursor cursor); #endif #ifndef Tk_FreeFont_TCL_DECLARED #define Tk_FreeFont_TCL_DECLARED /* 71 */ -EXTERN void Tk_FreeFont(Tk_Font f); +EXTERN void Tk_FreeFont (Tk_Font f); #endif #ifndef Tk_FreeGC_TCL_DECLARED #define Tk_FreeGC_TCL_DECLARED /* 72 */ -EXTERN void Tk_FreeGC(Display *display, GC gc); +EXTERN void Tk_FreeGC (Display * display, GC gc); #endif #ifndef Tk_FreeImage_TCL_DECLARED #define Tk_FreeImage_TCL_DECLARED /* 73 */ -EXTERN void Tk_FreeImage(Tk_Image image); +EXTERN void Tk_FreeImage (Tk_Image image); #endif #ifndef Tk_FreeOptions_TCL_DECLARED #define Tk_FreeOptions_TCL_DECLARED /* 74 */ -EXTERN void Tk_FreeOptions(Tk_ConfigSpec *specs, char *widgRec, - Display *display, int needFlags); +EXTERN void Tk_FreeOptions (Tk_ConfigSpec * specs, + char * widgRec, Display * display, + int needFlags); #endif #ifndef Tk_FreePixmap_TCL_DECLARED #define Tk_FreePixmap_TCL_DECLARED /* 75 */ -EXTERN void Tk_FreePixmap(Display *display, Pixmap pixmap); +EXTERN void Tk_FreePixmap (Display * display, Pixmap pixmap); #endif #ifndef Tk_FreeTextLayout_TCL_DECLARED #define Tk_FreeTextLayout_TCL_DECLARED /* 76 */ -EXTERN void Tk_FreeTextLayout(Tk_TextLayout textLayout); +EXTERN void Tk_FreeTextLayout (Tk_TextLayout textLayout); #endif #ifndef Tk_FreeXId_TCL_DECLARED #define Tk_FreeXId_TCL_DECLARED /* 77 */ -EXTERN void Tk_FreeXId(Display *display, XID xid); +EXTERN void Tk_FreeXId (Display * display, XID xid); #endif #ifndef Tk_GCForColor_TCL_DECLARED #define Tk_GCForColor_TCL_DECLARED /* 78 */ -EXTERN GC Tk_GCForColor(XColor *colorPtr, Drawable drawable); +EXTERN GC Tk_GCForColor (XColor * colorPtr, Drawable drawable); #endif #ifndef Tk_GeometryRequest_TCL_DECLARED #define Tk_GeometryRequest_TCL_DECLARED /* 79 */ -EXTERN void Tk_GeometryRequest(Tk_Window tkwin, int reqWidth, +EXTERN void Tk_GeometryRequest (Tk_Window tkwin, int reqWidth, int reqHeight); #endif #ifndef Tk_Get3DBorder_TCL_DECLARED #define Tk_Get3DBorder_TCL_DECLARED /* 80 */ -EXTERN Tk_3DBorder Tk_Get3DBorder(Tcl_Interp *interp, Tk_Window tkwin, +EXTERN Tk_3DBorder Tk_Get3DBorder (Tcl_Interp * interp, Tk_Window tkwin, Tk_Uid colorName); #endif #ifndef Tk_GetAllBindings_TCL_DECLARED #define Tk_GetAllBindings_TCL_DECLARED /* 81 */ -EXTERN void Tk_GetAllBindings(Tcl_Interp *interp, - Tk_BindingTable bindingTable, +EXTERN void Tk_GetAllBindings (Tcl_Interp * interp, + Tk_BindingTable bindingTable, ClientData object); #endif #ifndef Tk_GetAnchor_TCL_DECLARED #define Tk_GetAnchor_TCL_DECLARED /* 82 */ -EXTERN int Tk_GetAnchor(Tcl_Interp *interp, CONST char *str, - Tk_Anchor *anchorPtr); +EXTERN int Tk_GetAnchor (Tcl_Interp * interp, CONST char * str, + Tk_Anchor * anchorPtr); #endif #ifndef Tk_GetAtomName_TCL_DECLARED #define Tk_GetAtomName_TCL_DECLARED /* 83 */ -EXTERN CONST84_RETURN char * Tk_GetAtomName(Tk_Window tkwin, Atom atom); +EXTERN CONST84_RETURN char * Tk_GetAtomName (Tk_Window tkwin, Atom atom); #endif #ifndef Tk_GetBinding_TCL_DECLARED #define Tk_GetBinding_TCL_DECLARED /* 84 */ -EXTERN CONST84_RETURN char * Tk_GetBinding(Tcl_Interp *interp, - Tk_BindingTable bindingTable, - ClientData object, CONST char *eventStr); +EXTERN CONST84_RETURN char * Tk_GetBinding (Tcl_Interp * interp, + Tk_BindingTable bindingTable, + ClientData object, CONST char * eventStr); #endif #ifndef Tk_GetBitmap_TCL_DECLARED #define Tk_GetBitmap_TCL_DECLARED /* 85 */ -EXTERN Pixmap Tk_GetBitmap(Tcl_Interp *interp, Tk_Window tkwin, - CONST char *str); +EXTERN Pixmap Tk_GetBitmap (Tcl_Interp * interp, Tk_Window tkwin, + CONST char * str); #endif #ifndef Tk_GetBitmapFromData_TCL_DECLARED #define Tk_GetBitmapFromData_TCL_DECLARED /* 86 */ -EXTERN Pixmap Tk_GetBitmapFromData(Tcl_Interp *interp, - Tk_Window tkwin, CONST char *source, +EXTERN Pixmap Tk_GetBitmapFromData (Tcl_Interp * interp, + Tk_Window tkwin, CONST char * source, int width, int height); #endif #ifndef Tk_GetCapStyle_TCL_DECLARED #define Tk_GetCapStyle_TCL_DECLARED /* 87 */ -EXTERN int Tk_GetCapStyle(Tcl_Interp *interp, CONST char *str, - int *capPtr); +EXTERN int Tk_GetCapStyle (Tcl_Interp * interp, + CONST char * str, int * capPtr); #endif #ifndef Tk_GetColor_TCL_DECLARED #define Tk_GetColor_TCL_DECLARED /* 88 */ -EXTERN XColor * Tk_GetColor(Tcl_Interp *interp, Tk_Window tkwin, +EXTERN XColor * Tk_GetColor (Tcl_Interp * interp, Tk_Window tkwin, Tk_Uid name); #endif #ifndef Tk_GetColorByValue_TCL_DECLARED #define Tk_GetColorByValue_TCL_DECLARED /* 89 */ -EXTERN XColor * Tk_GetColorByValue(Tk_Window tkwin, XColor *colorPtr); +EXTERN XColor * Tk_GetColorByValue (Tk_Window tkwin, + XColor * colorPtr); #endif #ifndef Tk_GetColormap_TCL_DECLARED #define Tk_GetColormap_TCL_DECLARED /* 90 */ -EXTERN Colormap Tk_GetColormap(Tcl_Interp *interp, Tk_Window tkwin, - CONST char *str); +EXTERN Colormap Tk_GetColormap (Tcl_Interp * interp, Tk_Window tkwin, + CONST char * str); #endif #ifndef Tk_GetCursor_TCL_DECLARED #define Tk_GetCursor_TCL_DECLARED /* 91 */ -EXTERN Tk_Cursor Tk_GetCursor(Tcl_Interp *interp, Tk_Window tkwin, +EXTERN Tk_Cursor Tk_GetCursor (Tcl_Interp * interp, Tk_Window tkwin, Tk_Uid str); #endif #ifndef Tk_GetCursorFromData_TCL_DECLARED #define Tk_GetCursorFromData_TCL_DECLARED /* 92 */ -EXTERN Tk_Cursor Tk_GetCursorFromData(Tcl_Interp *interp, - Tk_Window tkwin, CONST char *source, - CONST char *mask, int width, int height, +EXTERN Tk_Cursor Tk_GetCursorFromData (Tcl_Interp * interp, + Tk_Window tkwin, CONST char * source, + CONST char * mask, int width, int height, int xHot, int yHot, Tk_Uid fg, Tk_Uid bg); #endif #ifndef Tk_GetFont_TCL_DECLARED #define Tk_GetFont_TCL_DECLARED /* 93 */ -EXTERN Tk_Font Tk_GetFont(Tcl_Interp *interp, Tk_Window tkwin, - CONST char *str); +EXTERN Tk_Font Tk_GetFont (Tcl_Interp * interp, Tk_Window tkwin, + CONST char * str); #endif #ifndef Tk_GetFontFromObj_TCL_DECLARED #define Tk_GetFontFromObj_TCL_DECLARED /* 94 */ -EXTERN Tk_Font Tk_GetFontFromObj(Tk_Window tkwin, Tcl_Obj *objPtr); +EXTERN Tk_Font Tk_GetFontFromObj (Tk_Window tkwin, Tcl_Obj * objPtr); #endif #ifndef Tk_GetFontMetrics_TCL_DECLARED #define Tk_GetFontMetrics_TCL_DECLARED /* 95 */ -EXTERN void Tk_GetFontMetrics(Tk_Font font, - Tk_FontMetrics *fmPtr); +EXTERN void Tk_GetFontMetrics (Tk_Font font, + Tk_FontMetrics * fmPtr); #endif #ifndef Tk_GetGC_TCL_DECLARED #define Tk_GetGC_TCL_DECLARED /* 96 */ -EXTERN GC Tk_GetGC(Tk_Window tkwin, unsigned long valueMask, - XGCValues *valuePtr); +EXTERN GC Tk_GetGC (Tk_Window tkwin, unsigned long valueMask, + XGCValues * valuePtr); #endif #ifndef Tk_GetImage_TCL_DECLARED #define Tk_GetImage_TCL_DECLARED /* 97 */ -EXTERN Tk_Image Tk_GetImage(Tcl_Interp *interp, Tk_Window tkwin, - CONST char *name, - Tk_ImageChangedProc *changeProc, +EXTERN Tk_Image Tk_GetImage (Tcl_Interp * interp, Tk_Window tkwin, + CONST char * name, + Tk_ImageChangedProc * changeProc, ClientData clientData); #endif #ifndef Tk_GetImageMasterData_TCL_DECLARED #define Tk_GetImageMasterData_TCL_DECLARED /* 98 */ -EXTERN ClientData Tk_GetImageMasterData(Tcl_Interp *interp, - CONST char *name, Tk_ImageType **typePtrPtr); +EXTERN ClientData Tk_GetImageMasterData (Tcl_Interp * interp, + CONST char * name, + Tk_ImageType ** typePtrPtr); #endif #ifndef Tk_GetItemTypes_TCL_DECLARED #define Tk_GetItemTypes_TCL_DECLARED /* 99 */ -EXTERN Tk_ItemType * Tk_GetItemTypes(void); +EXTERN Tk_ItemType * Tk_GetItemTypes (void); #endif #ifndef Tk_GetJoinStyle_TCL_DECLARED #define Tk_GetJoinStyle_TCL_DECLARED /* 100 */ -EXTERN int Tk_GetJoinStyle(Tcl_Interp *interp, CONST char *str, - int *joinPtr); +EXTERN int Tk_GetJoinStyle (Tcl_Interp * interp, + CONST char * str, int * joinPtr); #endif #ifndef Tk_GetJustify_TCL_DECLARED #define Tk_GetJustify_TCL_DECLARED /* 101 */ -EXTERN int Tk_GetJustify(Tcl_Interp *interp, CONST char *str, - Tk_Justify *justifyPtr); +EXTERN int Tk_GetJustify (Tcl_Interp * interp, CONST char * str, + Tk_Justify * justifyPtr); #endif #ifndef Tk_GetNumMainWindows_TCL_DECLARED #define Tk_GetNumMainWindows_TCL_DECLARED /* 102 */ -EXTERN int Tk_GetNumMainWindows(void); +EXTERN int Tk_GetNumMainWindows (void); #endif #ifndef Tk_GetOption_TCL_DECLARED #define Tk_GetOption_TCL_DECLARED /* 103 */ -EXTERN Tk_Uid Tk_GetOption(Tk_Window tkwin, CONST char *name, - CONST char *className); +EXTERN Tk_Uid Tk_GetOption (Tk_Window tkwin, CONST char * name, + CONST char * className); #endif #ifndef Tk_GetPixels_TCL_DECLARED #define Tk_GetPixels_TCL_DECLARED /* 104 */ -EXTERN int Tk_GetPixels(Tcl_Interp *interp, Tk_Window tkwin, - CONST char *str, int *intPtr); +EXTERN int Tk_GetPixels (Tcl_Interp * interp, Tk_Window tkwin, + CONST char * str, int * intPtr); #endif #ifndef Tk_GetPixmap_TCL_DECLARED #define Tk_GetPixmap_TCL_DECLARED /* 105 */ -EXTERN Pixmap Tk_GetPixmap(Display *display, Drawable d, int width, - int height, int depth); +EXTERN Pixmap Tk_GetPixmap (Display * display, Drawable d, + int width, int height, int depth); #endif #ifndef Tk_GetRelief_TCL_DECLARED #define Tk_GetRelief_TCL_DECLARED /* 106 */ -EXTERN int Tk_GetRelief(Tcl_Interp *interp, CONST char *name, - int *reliefPtr); +EXTERN int Tk_GetRelief (Tcl_Interp * interp, CONST char * name, + int * reliefPtr); #endif #ifndef Tk_GetRootCoords_TCL_DECLARED #define Tk_GetRootCoords_TCL_DECLARED /* 107 */ -EXTERN void Tk_GetRootCoords(Tk_Window tkwin, int *xPtr, - int *yPtr); +EXTERN void Tk_GetRootCoords (Tk_Window tkwin, int * xPtr, + int * yPtr); #endif #ifndef Tk_GetScrollInfo_TCL_DECLARED #define Tk_GetScrollInfo_TCL_DECLARED /* 108 */ -EXTERN int Tk_GetScrollInfo(Tcl_Interp *interp, int argc, - CONST84 char **argv, double *dblPtr, - int *intPtr); +EXTERN int Tk_GetScrollInfo (Tcl_Interp * interp, int argc, + CONST84 char ** argv, double * dblPtr, + int * intPtr); #endif #ifndef Tk_GetScreenMM_TCL_DECLARED #define Tk_GetScreenMM_TCL_DECLARED /* 109 */ -EXTERN int Tk_GetScreenMM(Tcl_Interp *interp, Tk_Window tkwin, - CONST char *str, double *doublePtr); +EXTERN int Tk_GetScreenMM (Tcl_Interp * interp, Tk_Window tkwin, + CONST char * str, double * doublePtr); #endif #ifndef Tk_GetSelection_TCL_DECLARED #define Tk_GetSelection_TCL_DECLARED /* 110 */ -EXTERN int Tk_GetSelection(Tcl_Interp *interp, Tk_Window tkwin, - Atom selection, Atom target, - Tk_GetSelProc *proc, ClientData clientData); +EXTERN int Tk_GetSelection (Tcl_Interp * interp, + Tk_Window tkwin, Atom selection, Atom target, + Tk_GetSelProc * proc, ClientData clientData); #endif #ifndef Tk_GetUid_TCL_DECLARED #define Tk_GetUid_TCL_DECLARED /* 111 */ -EXTERN Tk_Uid Tk_GetUid(CONST char *str); +EXTERN Tk_Uid Tk_GetUid (CONST char * str); #endif #ifndef Tk_GetVisual_TCL_DECLARED #define Tk_GetVisual_TCL_DECLARED /* 112 */ -EXTERN Visual * Tk_GetVisual(Tcl_Interp *interp, Tk_Window tkwin, - CONST char *str, int *depthPtr, - Colormap *colormapPtr); +EXTERN Visual * Tk_GetVisual (Tcl_Interp * interp, Tk_Window tkwin, + CONST char * str, int * depthPtr, + Colormap * colormapPtr); #endif #ifndef Tk_GetVRootGeometry_TCL_DECLARED #define Tk_GetVRootGeometry_TCL_DECLARED /* 113 */ -EXTERN void Tk_GetVRootGeometry(Tk_Window tkwin, int *xPtr, - int *yPtr, int *widthPtr, int *heightPtr); +EXTERN void Tk_GetVRootGeometry (Tk_Window tkwin, int * xPtr, + int * yPtr, int * widthPtr, int * heightPtr); #endif #ifndef Tk_Grab_TCL_DECLARED #define Tk_Grab_TCL_DECLARED /* 114 */ -EXTERN int Tk_Grab(Tcl_Interp *interp, Tk_Window tkwin, +EXTERN int Tk_Grab (Tcl_Interp * interp, Tk_Window tkwin, int grabGlobal); #endif #ifndef Tk_HandleEvent_TCL_DECLARED #define Tk_HandleEvent_TCL_DECLARED /* 115 */ -EXTERN void Tk_HandleEvent(XEvent *eventPtr); +EXTERN void Tk_HandleEvent (XEvent * eventPtr); #endif #ifndef Tk_IdToWindow_TCL_DECLARED #define Tk_IdToWindow_TCL_DECLARED /* 116 */ -EXTERN Tk_Window Tk_IdToWindow(Display *display, Window window); +EXTERN Tk_Window Tk_IdToWindow (Display * display, Window window); #endif #ifndef Tk_ImageChanged_TCL_DECLARED #define Tk_ImageChanged_TCL_DECLARED /* 117 */ -EXTERN void Tk_ImageChanged(Tk_ImageMaster master, int x, int y, - int width, int height, int imageWidth, +EXTERN void Tk_ImageChanged (Tk_ImageMaster master, int x, int y, + int width, int height, int imageWidth, int imageHeight); #endif #ifndef Tk_Init_TCL_DECLARED #define Tk_Init_TCL_DECLARED /* 118 */ -EXTERN int Tk_Init(Tcl_Interp *interp); +EXTERN int Tk_Init (Tcl_Interp * interp); #endif #ifndef Tk_InternAtom_TCL_DECLARED #define Tk_InternAtom_TCL_DECLARED /* 119 */ -EXTERN Atom Tk_InternAtom(Tk_Window tkwin, CONST char *name); +EXTERN Atom Tk_InternAtom (Tk_Window tkwin, CONST char * name); #endif #ifndef Tk_IntersectTextLayout_TCL_DECLARED #define Tk_IntersectTextLayout_TCL_DECLARED /* 120 */ -EXTERN int Tk_IntersectTextLayout(Tk_TextLayout layout, int x, +EXTERN int Tk_IntersectTextLayout (Tk_TextLayout layout, int x, int y, int width, int height); #endif #ifndef Tk_MaintainGeometry_TCL_DECLARED #define Tk_MaintainGeometry_TCL_DECLARED /* 121 */ -EXTERN void Tk_MaintainGeometry(Tk_Window slave, - Tk_Window master, int x, int y, int width, +EXTERN void Tk_MaintainGeometry (Tk_Window slave, + Tk_Window master, int x, int y, int width, int height); #endif #ifndef Tk_MainWindow_TCL_DECLARED #define Tk_MainWindow_TCL_DECLARED /* 122 */ -EXTERN Tk_Window Tk_MainWindow(Tcl_Interp *interp); +EXTERN Tk_Window Tk_MainWindow (Tcl_Interp * interp); #endif #ifndef Tk_MakeWindowExist_TCL_DECLARED #define Tk_MakeWindowExist_TCL_DECLARED /* 123 */ -EXTERN void Tk_MakeWindowExist(Tk_Window tkwin); +EXTERN void Tk_MakeWindowExist (Tk_Window tkwin); #endif #ifndef Tk_ManageGeometry_TCL_DECLARED #define Tk_ManageGeometry_TCL_DECLARED /* 124 */ -EXTERN void Tk_ManageGeometry(Tk_Window tkwin, - CONST Tk_GeomMgr *mgrPtr, +EXTERN void Tk_ManageGeometry (Tk_Window tkwin, + CONST Tk_GeomMgr * mgrPtr, ClientData clientData); #endif #ifndef Tk_MapWindow_TCL_DECLARED #define Tk_MapWindow_TCL_DECLARED /* 125 */ -EXTERN void Tk_MapWindow(Tk_Window tkwin); +EXTERN void Tk_MapWindow (Tk_Window tkwin); #endif #ifndef Tk_MeasureChars_TCL_DECLARED #define Tk_MeasureChars_TCL_DECLARED /* 126 */ -EXTERN int Tk_MeasureChars(Tk_Font tkfont, CONST char *source, - int numBytes, int maxPixels, int flags, - int *lengthPtr); +EXTERN int Tk_MeasureChars (Tk_Font tkfont, CONST char * source, + int numBytes, int maxPixels, int flags, + int * lengthPtr); #endif #ifndef Tk_MoveResizeWindow_TCL_DECLARED #define Tk_MoveResizeWindow_TCL_DECLARED /* 127 */ -EXTERN void Tk_MoveResizeWindow(Tk_Window tkwin, int x, int y, +EXTERN void Tk_MoveResizeWindow (Tk_Window tkwin, int x, int y, int width, int height); #endif #ifndef Tk_MoveWindow_TCL_DECLARED #define Tk_MoveWindow_TCL_DECLARED /* 128 */ -EXTERN void Tk_MoveWindow(Tk_Window tkwin, int x, int y); +EXTERN void Tk_MoveWindow (Tk_Window tkwin, int x, int y); #endif #ifndef Tk_MoveToplevelWindow_TCL_DECLARED #define Tk_MoveToplevelWindow_TCL_DECLARED /* 129 */ -EXTERN void Tk_MoveToplevelWindow(Tk_Window tkwin, int x, int y); +EXTERN void Tk_MoveToplevelWindow (Tk_Window tkwin, int x, int y); #endif #ifndef Tk_NameOf3DBorder_TCL_DECLARED #define Tk_NameOf3DBorder_TCL_DECLARED /* 130 */ -EXTERN CONST84_RETURN char * Tk_NameOf3DBorder(Tk_3DBorder border); +EXTERN CONST84_RETURN char * Tk_NameOf3DBorder (Tk_3DBorder border); #endif #ifndef Tk_NameOfAnchor_TCL_DECLARED #define Tk_NameOfAnchor_TCL_DECLARED /* 131 */ -EXTERN CONST84_RETURN char * Tk_NameOfAnchor(Tk_Anchor anchor); +EXTERN CONST84_RETURN char * Tk_NameOfAnchor (Tk_Anchor anchor); #endif #ifndef Tk_NameOfBitmap_TCL_DECLARED #define Tk_NameOfBitmap_TCL_DECLARED /* 132 */ -EXTERN CONST84_RETURN char * Tk_NameOfBitmap(Display *display, Pixmap bitmap); +EXTERN CONST84_RETURN char * Tk_NameOfBitmap (Display * display, + Pixmap bitmap); #endif #ifndef Tk_NameOfCapStyle_TCL_DECLARED #define Tk_NameOfCapStyle_TCL_DECLARED /* 133 */ -EXTERN CONST84_RETURN char * Tk_NameOfCapStyle(int cap); +EXTERN CONST84_RETURN char * Tk_NameOfCapStyle (int cap); #endif #ifndef Tk_NameOfColor_TCL_DECLARED #define Tk_NameOfColor_TCL_DECLARED /* 134 */ -EXTERN CONST84_RETURN char * Tk_NameOfColor(XColor *colorPtr); +EXTERN CONST84_RETURN char * Tk_NameOfColor (XColor * colorPtr); #endif #ifndef Tk_NameOfCursor_TCL_DECLARED #define Tk_NameOfCursor_TCL_DECLARED /* 135 */ -EXTERN CONST84_RETURN char * Tk_NameOfCursor(Display *display, +EXTERN CONST84_RETURN char * Tk_NameOfCursor (Display * display, Tk_Cursor cursor); #endif #ifndef Tk_NameOfFont_TCL_DECLARED #define Tk_NameOfFont_TCL_DECLARED /* 136 */ -EXTERN CONST84_RETURN char * Tk_NameOfFont(Tk_Font font); +EXTERN CONST84_RETURN char * Tk_NameOfFont (Tk_Font font); #endif #ifndef Tk_NameOfImage_TCL_DECLARED #define Tk_NameOfImage_TCL_DECLARED /* 137 */ -EXTERN CONST84_RETURN char * Tk_NameOfImage(Tk_ImageMaster imageMaster); +EXTERN CONST84_RETURN char * Tk_NameOfImage (Tk_ImageMaster imageMaster); #endif #ifndef Tk_NameOfJoinStyle_TCL_DECLARED #define Tk_NameOfJoinStyle_TCL_DECLARED /* 138 */ -EXTERN CONST84_RETURN char * Tk_NameOfJoinStyle(int join); +EXTERN CONST84_RETURN char * Tk_NameOfJoinStyle (int join); #endif #ifndef Tk_NameOfJustify_TCL_DECLARED #define Tk_NameOfJustify_TCL_DECLARED /* 139 */ -EXTERN CONST84_RETURN char * Tk_NameOfJustify(Tk_Justify justify); +EXTERN CONST84_RETURN char * Tk_NameOfJustify (Tk_Justify justify); #endif #ifndef Tk_NameOfRelief_TCL_DECLARED #define Tk_NameOfRelief_TCL_DECLARED /* 140 */ -EXTERN CONST84_RETURN char * Tk_NameOfRelief(int relief); +EXTERN CONST84_RETURN char * Tk_NameOfRelief (int relief); #endif #ifndef Tk_NameToWindow_TCL_DECLARED #define Tk_NameToWindow_TCL_DECLARED /* 141 */ -EXTERN Tk_Window Tk_NameToWindow(Tcl_Interp *interp, - CONST char *pathName, Tk_Window tkwin); +EXTERN Tk_Window Tk_NameToWindow (Tcl_Interp * interp, + CONST char * pathName, Tk_Window tkwin); #endif #ifndef Tk_OwnSelection_TCL_DECLARED #define Tk_OwnSelection_TCL_DECLARED /* 142 */ -EXTERN void Tk_OwnSelection(Tk_Window tkwin, Atom selection, - Tk_LostSelProc *proc, ClientData clientData); +EXTERN void Tk_OwnSelection (Tk_Window tkwin, Atom selection, + Tk_LostSelProc * proc, ClientData clientData); #endif #ifndef Tk_ParseArgv_TCL_DECLARED #define Tk_ParseArgv_TCL_DECLARED /* 143 */ -EXTERN int Tk_ParseArgv(Tcl_Interp *interp, Tk_Window tkwin, - int *argcPtr, CONST84 char **argv, - Tk_ArgvInfo *argTable, int flags); +EXTERN int Tk_ParseArgv (Tcl_Interp * interp, Tk_Window tkwin, + int * argcPtr, CONST84 char ** argv, + Tk_ArgvInfo * argTable, int flags); #endif #ifndef Tk_PhotoPutBlock_NoComposite_TCL_DECLARED #define Tk_PhotoPutBlock_NoComposite_TCL_DECLARED /* 144 */ -EXTERN void Tk_PhotoPutBlock_NoComposite(Tk_PhotoHandle handle, - Tk_PhotoImageBlock *blockPtr, int x, int y, +EXTERN void Tk_PhotoPutBlock_NoComposite (Tk_PhotoHandle handle, + Tk_PhotoImageBlock * blockPtr, int x, int y, int width, int height); #endif #ifndef Tk_PhotoPutZoomedBlock_NoComposite_TCL_DECLARED #define Tk_PhotoPutZoomedBlock_NoComposite_TCL_DECLARED /* 145 */ -EXTERN void Tk_PhotoPutZoomedBlock_NoComposite( - Tk_PhotoHandle handle, - Tk_PhotoImageBlock *blockPtr, int x, int y, - int width, int height, int zoomX, int zoomY, +EXTERN void Tk_PhotoPutZoomedBlock_NoComposite ( + Tk_PhotoHandle handle, + Tk_PhotoImageBlock * blockPtr, int x, int y, + int width, int height, int zoomX, int zoomY, int subsampleX, int subsampleY); #endif #ifndef Tk_PhotoGetImage_TCL_DECLARED #define Tk_PhotoGetImage_TCL_DECLARED /* 146 */ -EXTERN int Tk_PhotoGetImage(Tk_PhotoHandle handle, - Tk_PhotoImageBlock *blockPtr); +EXTERN int Tk_PhotoGetImage (Tk_PhotoHandle handle, + Tk_PhotoImageBlock * blockPtr); #endif #ifndef Tk_PhotoBlank_TCL_DECLARED #define Tk_PhotoBlank_TCL_DECLARED /* 147 */ -EXTERN void Tk_PhotoBlank(Tk_PhotoHandle handle); +EXTERN void Tk_PhotoBlank (Tk_PhotoHandle handle); #endif #ifndef Tk_PhotoExpand_Panic_TCL_DECLARED #define Tk_PhotoExpand_Panic_TCL_DECLARED /* 148 */ -EXTERN void Tk_PhotoExpand_Panic(Tk_PhotoHandle handle, +EXTERN void Tk_PhotoExpand_Panic (Tk_PhotoHandle handle, int width, int height); #endif #ifndef Tk_PhotoGetSize_TCL_DECLARED #define Tk_PhotoGetSize_TCL_DECLARED /* 149 */ -EXTERN void Tk_PhotoGetSize(Tk_PhotoHandle handle, int *widthPtr, - int *heightPtr); +EXTERN void Tk_PhotoGetSize (Tk_PhotoHandle handle, + int * widthPtr, int * heightPtr); #endif #ifndef Tk_PhotoSetSize_Panic_TCL_DECLARED #define Tk_PhotoSetSize_Panic_TCL_DECLARED /* 150 */ -EXTERN void Tk_PhotoSetSize_Panic(Tk_PhotoHandle handle, +EXTERN void Tk_PhotoSetSize_Panic (Tk_PhotoHandle handle, int width, int height); #endif #ifndef Tk_PointToChar_TCL_DECLARED #define Tk_PointToChar_TCL_DECLARED /* 151 */ -EXTERN int Tk_PointToChar(Tk_TextLayout layout, int x, int y); +EXTERN int Tk_PointToChar (Tk_TextLayout layout, int x, int y); #endif #ifndef Tk_PostscriptFontName_TCL_DECLARED #define Tk_PostscriptFontName_TCL_DECLARED /* 152 */ -EXTERN int Tk_PostscriptFontName(Tk_Font tkfont, - Tcl_DString *dsPtr); +EXTERN int Tk_PostscriptFontName (Tk_Font tkfont, + Tcl_DString * dsPtr); #endif #ifndef Tk_PreserveColormap_TCL_DECLARED #define Tk_PreserveColormap_TCL_DECLARED /* 153 */ -EXTERN void Tk_PreserveColormap(Display *display, +EXTERN void Tk_PreserveColormap (Display * display, Colormap colormap); #endif #ifndef Tk_QueueWindowEvent_TCL_DECLARED #define Tk_QueueWindowEvent_TCL_DECLARED /* 154 */ -EXTERN void Tk_QueueWindowEvent(XEvent *eventPtr, +EXTERN void Tk_QueueWindowEvent (XEvent * eventPtr, Tcl_QueuePosition position); #endif #ifndef Tk_RedrawImage_TCL_DECLARED #define Tk_RedrawImage_TCL_DECLARED /* 155 */ -EXTERN void Tk_RedrawImage(Tk_Image image, int imageX, - int imageY, int width, int height, - Drawable drawable, int drawableX, +EXTERN void Tk_RedrawImage (Tk_Image image, int imageX, + int imageY, int width, int height, + Drawable drawable, int drawableX, int drawableY); #endif #ifndef Tk_ResizeWindow_TCL_DECLARED #define Tk_ResizeWindow_TCL_DECLARED /* 156 */ -EXTERN void Tk_ResizeWindow(Tk_Window tkwin, int width, +EXTERN void Tk_ResizeWindow (Tk_Window tkwin, int width, int height); #endif #ifndef Tk_RestackWindow_TCL_DECLARED #define Tk_RestackWindow_TCL_DECLARED /* 157 */ -EXTERN int Tk_RestackWindow(Tk_Window tkwin, int aboveBelow, +EXTERN int Tk_RestackWindow (Tk_Window tkwin, int aboveBelow, Tk_Window other); #endif #ifndef Tk_RestrictEvents_TCL_DECLARED #define Tk_RestrictEvents_TCL_DECLARED /* 158 */ -EXTERN Tk_RestrictProc * Tk_RestrictEvents(Tk_RestrictProc *proc, - ClientData arg, ClientData *prevArgPtr); +EXTERN Tk_RestrictProc * Tk_RestrictEvents (Tk_RestrictProc * proc, + ClientData arg, ClientData * prevArgPtr); #endif #ifndef Tk_SafeInit_TCL_DECLARED #define Tk_SafeInit_TCL_DECLARED /* 159 */ -EXTERN int Tk_SafeInit(Tcl_Interp *interp); +EXTERN int Tk_SafeInit (Tcl_Interp * interp); #endif #ifndef Tk_SetAppName_TCL_DECLARED #define Tk_SetAppName_TCL_DECLARED /* 160 */ -EXTERN CONST char * Tk_SetAppName(Tk_Window tkwin, CONST char *name); +EXTERN CONST char * Tk_SetAppName (Tk_Window tkwin, CONST char * name); #endif #ifndef Tk_SetBackgroundFromBorder_TCL_DECLARED #define Tk_SetBackgroundFromBorder_TCL_DECLARED /* 161 */ -EXTERN void Tk_SetBackgroundFromBorder(Tk_Window tkwin, +EXTERN void Tk_SetBackgroundFromBorder (Tk_Window tkwin, Tk_3DBorder border); #endif #ifndef Tk_SetClass_TCL_DECLARED #define Tk_SetClass_TCL_DECLARED /* 162 */ -EXTERN void Tk_SetClass(Tk_Window tkwin, CONST char *className); +EXTERN void Tk_SetClass (Tk_Window tkwin, CONST char * className); #endif #ifndef Tk_SetGrid_TCL_DECLARED #define Tk_SetGrid_TCL_DECLARED /* 163 */ -EXTERN void Tk_SetGrid(Tk_Window tkwin, int reqWidth, +EXTERN void Tk_SetGrid (Tk_Window tkwin, int reqWidth, int reqHeight, int gridWidth, int gridHeight); #endif #ifndef Tk_SetInternalBorder_TCL_DECLARED #define Tk_SetInternalBorder_TCL_DECLARED /* 164 */ -EXTERN void Tk_SetInternalBorder(Tk_Window tkwin, int width); +EXTERN void Tk_SetInternalBorder (Tk_Window tkwin, int width); #endif #ifndef Tk_SetWindowBackground_TCL_DECLARED #define Tk_SetWindowBackground_TCL_DECLARED /* 165 */ -EXTERN void Tk_SetWindowBackground(Tk_Window tkwin, +EXTERN void Tk_SetWindowBackground (Tk_Window tkwin, unsigned long pixel); #endif #ifndef Tk_SetWindowBackgroundPixmap_TCL_DECLARED #define Tk_SetWindowBackgroundPixmap_TCL_DECLARED /* 166 */ -EXTERN void Tk_SetWindowBackgroundPixmap(Tk_Window tkwin, +EXTERN void Tk_SetWindowBackgroundPixmap (Tk_Window tkwin, Pixmap pixmap); #endif #ifndef Tk_SetWindowBorder_TCL_DECLARED #define Tk_SetWindowBorder_TCL_DECLARED /* 167 */ -EXTERN void Tk_SetWindowBorder(Tk_Window tkwin, +EXTERN void Tk_SetWindowBorder (Tk_Window tkwin, unsigned long pixel); #endif #ifndef Tk_SetWindowBorderWidth_TCL_DECLARED #define Tk_SetWindowBorderWidth_TCL_DECLARED /* 168 */ -EXTERN void Tk_SetWindowBorderWidth(Tk_Window tkwin, int width); +EXTERN void Tk_SetWindowBorderWidth (Tk_Window tkwin, int width); #endif #ifndef Tk_SetWindowBorderPixmap_TCL_DECLARED #define Tk_SetWindowBorderPixmap_TCL_DECLARED /* 169 */ -EXTERN void Tk_SetWindowBorderPixmap(Tk_Window tkwin, +EXTERN void Tk_SetWindowBorderPixmap (Tk_Window tkwin, Pixmap pixmap); #endif #ifndef Tk_SetWindowColormap_TCL_DECLARED #define Tk_SetWindowColormap_TCL_DECLARED /* 170 */ -EXTERN void Tk_SetWindowColormap(Tk_Window tkwin, +EXTERN void Tk_SetWindowColormap (Tk_Window tkwin, Colormap colormap); #endif #ifndef Tk_SetWindowVisual_TCL_DECLARED #define Tk_SetWindowVisual_TCL_DECLARED /* 171 */ -EXTERN int Tk_SetWindowVisual(Tk_Window tkwin, Visual *visual, +EXTERN int Tk_SetWindowVisual (Tk_Window tkwin, Visual * visual, int depth, Colormap colormap); #endif #ifndef Tk_SizeOfBitmap_TCL_DECLARED #define Tk_SizeOfBitmap_TCL_DECLARED /* 172 */ -EXTERN void Tk_SizeOfBitmap(Display *display, Pixmap bitmap, - int *widthPtr, int *heightPtr); +EXTERN void Tk_SizeOfBitmap (Display * display, Pixmap bitmap, + int * widthPtr, int * heightPtr); #endif #ifndef Tk_SizeOfImage_TCL_DECLARED #define Tk_SizeOfImage_TCL_DECLARED /* 173 */ -EXTERN void Tk_SizeOfImage(Tk_Image image, int *widthPtr, - int *heightPtr); +EXTERN void Tk_SizeOfImage (Tk_Image image, int * widthPtr, + int * heightPtr); #endif #ifndef Tk_StrictMotif_TCL_DECLARED #define Tk_StrictMotif_TCL_DECLARED /* 174 */ -EXTERN int Tk_StrictMotif(Tk_Window tkwin); +EXTERN int Tk_StrictMotif (Tk_Window tkwin); #endif #ifndef Tk_TextLayoutToPostscript_TCL_DECLARED #define Tk_TextLayoutToPostscript_TCL_DECLARED /* 175 */ -EXTERN void Tk_TextLayoutToPostscript(Tcl_Interp *interp, +EXTERN void Tk_TextLayoutToPostscript (Tcl_Interp * interp, Tk_TextLayout layout); #endif #ifndef Tk_TextWidth_TCL_DECLARED #define Tk_TextWidth_TCL_DECLARED /* 176 */ -EXTERN int Tk_TextWidth(Tk_Font font, CONST char *str, +EXTERN int Tk_TextWidth (Tk_Font font, CONST char * str, int numBytes); #endif #ifndef Tk_UndefineCursor_TCL_DECLARED #define Tk_UndefineCursor_TCL_DECLARED /* 177 */ -EXTERN void Tk_UndefineCursor(Tk_Window window); +EXTERN void Tk_UndefineCursor (Tk_Window window); #endif #ifndef Tk_UnderlineChars_TCL_DECLARED #define Tk_UnderlineChars_TCL_DECLARED /* 178 */ -EXTERN void Tk_UnderlineChars(Display *display, - Drawable drawable, GC gc, Tk_Font tkfont, - CONST char *source, int x, int y, +EXTERN void Tk_UnderlineChars (Display * display, + Drawable drawable, GC gc, Tk_Font tkfont, + CONST char * source, int x, int y, int firstByte, int lastByte); #endif #ifndef Tk_UnderlineTextLayout_TCL_DECLARED #define Tk_UnderlineTextLayout_TCL_DECLARED /* 179 */ -EXTERN void Tk_UnderlineTextLayout(Display *display, - Drawable drawable, GC gc, - Tk_TextLayout layout, int x, int y, +EXTERN void Tk_UnderlineTextLayout (Display * display, + Drawable drawable, GC gc, + Tk_TextLayout layout, int x, int y, int underline); #endif #ifndef Tk_Ungrab_TCL_DECLARED #define Tk_Ungrab_TCL_DECLARED /* 180 */ -EXTERN void Tk_Ungrab(Tk_Window tkwin); +EXTERN void Tk_Ungrab (Tk_Window tkwin); #endif #ifndef Tk_UnmaintainGeometry_TCL_DECLARED #define Tk_UnmaintainGeometry_TCL_DECLARED /* 181 */ -EXTERN void Tk_UnmaintainGeometry(Tk_Window slave, +EXTERN void Tk_UnmaintainGeometry (Tk_Window slave, Tk_Window master); #endif #ifndef Tk_UnmapWindow_TCL_DECLARED #define Tk_UnmapWindow_TCL_DECLARED /* 182 */ -EXTERN void Tk_UnmapWindow(Tk_Window tkwin); +EXTERN void Tk_UnmapWindow (Tk_Window tkwin); #endif #ifndef Tk_UnsetGrid_TCL_DECLARED #define Tk_UnsetGrid_TCL_DECLARED /* 183 */ -EXTERN void Tk_UnsetGrid(Tk_Window tkwin); +EXTERN void Tk_UnsetGrid (Tk_Window tkwin); #endif #ifndef Tk_UpdatePointer_TCL_DECLARED #define Tk_UpdatePointer_TCL_DECLARED /* 184 */ -EXTERN void Tk_UpdatePointer(Tk_Window tkwin, int x, int y, +EXTERN void Tk_UpdatePointer (Tk_Window tkwin, int x, int y, int state); #endif #ifndef Tk_AllocBitmapFromObj_TCL_DECLARED #define Tk_AllocBitmapFromObj_TCL_DECLARED /* 185 */ -EXTERN Pixmap Tk_AllocBitmapFromObj(Tcl_Interp *interp, - Tk_Window tkwin, Tcl_Obj *objPtr); +EXTERN Pixmap Tk_AllocBitmapFromObj (Tcl_Interp * interp, + Tk_Window tkwin, Tcl_Obj * objPtr); #endif #ifndef Tk_Alloc3DBorderFromObj_TCL_DECLARED #define Tk_Alloc3DBorderFromObj_TCL_DECLARED /* 186 */ -EXTERN Tk_3DBorder Tk_Alloc3DBorderFromObj(Tcl_Interp *interp, - Tk_Window tkwin, Tcl_Obj *objPtr); +EXTERN Tk_3DBorder Tk_Alloc3DBorderFromObj (Tcl_Interp * interp, + Tk_Window tkwin, Tcl_Obj * objPtr); #endif #ifndef Tk_AllocColorFromObj_TCL_DECLARED #define Tk_AllocColorFromObj_TCL_DECLARED /* 187 */ -EXTERN XColor * Tk_AllocColorFromObj(Tcl_Interp *interp, - Tk_Window tkwin, Tcl_Obj *objPtr); +EXTERN XColor * Tk_AllocColorFromObj (Tcl_Interp * interp, + Tk_Window tkwin, Tcl_Obj * objPtr); #endif #ifndef Tk_AllocCursorFromObj_TCL_DECLARED #define Tk_AllocCursorFromObj_TCL_DECLARED /* 188 */ -EXTERN Tk_Cursor Tk_AllocCursorFromObj(Tcl_Interp *interp, - Tk_Window tkwin, Tcl_Obj *objPtr); +EXTERN Tk_Cursor Tk_AllocCursorFromObj (Tcl_Interp * interp, + Tk_Window tkwin, Tcl_Obj * objPtr); #endif #ifndef Tk_AllocFontFromObj_TCL_DECLARED #define Tk_AllocFontFromObj_TCL_DECLARED /* 189 */ -EXTERN Tk_Font Tk_AllocFontFromObj(Tcl_Interp *interp, - Tk_Window tkwin, Tcl_Obj *objPtr); +EXTERN Tk_Font Tk_AllocFontFromObj (Tcl_Interp * interp, + Tk_Window tkwin, Tcl_Obj * objPtr); #endif #ifndef Tk_CreateOptionTable_TCL_DECLARED #define Tk_CreateOptionTable_TCL_DECLARED /* 190 */ -EXTERN Tk_OptionTable Tk_CreateOptionTable(Tcl_Interp *interp, - CONST Tk_OptionSpec *templatePtr); +EXTERN Tk_OptionTable Tk_CreateOptionTable (Tcl_Interp * interp, + CONST Tk_OptionSpec * templatePtr); #endif #ifndef Tk_DeleteOptionTable_TCL_DECLARED #define Tk_DeleteOptionTable_TCL_DECLARED /* 191 */ -EXTERN void Tk_DeleteOptionTable(Tk_OptionTable optionTable); +EXTERN void Tk_DeleteOptionTable (Tk_OptionTable optionTable); #endif #ifndef Tk_Free3DBorderFromObj_TCL_DECLARED #define Tk_Free3DBorderFromObj_TCL_DECLARED /* 192 */ -EXTERN void Tk_Free3DBorderFromObj(Tk_Window tkwin, - Tcl_Obj *objPtr); +EXTERN void Tk_Free3DBorderFromObj (Tk_Window tkwin, + Tcl_Obj * objPtr); #endif #ifndef Tk_FreeBitmapFromObj_TCL_DECLARED #define Tk_FreeBitmapFromObj_TCL_DECLARED /* 193 */ -EXTERN void Tk_FreeBitmapFromObj(Tk_Window tkwin, - Tcl_Obj *objPtr); +EXTERN void Tk_FreeBitmapFromObj (Tk_Window tkwin, + Tcl_Obj * objPtr); #endif #ifndef Tk_FreeColorFromObj_TCL_DECLARED #define Tk_FreeColorFromObj_TCL_DECLARED /* 194 */ -EXTERN void Tk_FreeColorFromObj(Tk_Window tkwin, Tcl_Obj *objPtr); +EXTERN void Tk_FreeColorFromObj (Tk_Window tkwin, + Tcl_Obj * objPtr); #endif #ifndef Tk_FreeConfigOptions_TCL_DECLARED #define Tk_FreeConfigOptions_TCL_DECLARED /* 195 */ -EXTERN void Tk_FreeConfigOptions(char *recordPtr, +EXTERN void Tk_FreeConfigOptions (char * recordPtr, Tk_OptionTable optionToken, Tk_Window tkwin); #endif #ifndef Tk_FreeSavedOptions_TCL_DECLARED #define Tk_FreeSavedOptions_TCL_DECLARED /* 196 */ -EXTERN void Tk_FreeSavedOptions(Tk_SavedOptions *savePtr); +EXTERN void Tk_FreeSavedOptions (Tk_SavedOptions * savePtr); #endif #ifndef Tk_FreeCursorFromObj_TCL_DECLARED #define Tk_FreeCursorFromObj_TCL_DECLARED /* 197 */ -EXTERN void Tk_FreeCursorFromObj(Tk_Window tkwin, - Tcl_Obj *objPtr); +EXTERN void Tk_FreeCursorFromObj (Tk_Window tkwin, + Tcl_Obj * objPtr); #endif #ifndef Tk_FreeFontFromObj_TCL_DECLARED #define Tk_FreeFontFromObj_TCL_DECLARED /* 198 */ -EXTERN void Tk_FreeFontFromObj(Tk_Window tkwin, Tcl_Obj *objPtr); +EXTERN void Tk_FreeFontFromObj (Tk_Window tkwin, + Tcl_Obj * objPtr); #endif #ifndef Tk_Get3DBorderFromObj_TCL_DECLARED #define Tk_Get3DBorderFromObj_TCL_DECLARED /* 199 */ -EXTERN Tk_3DBorder Tk_Get3DBorderFromObj(Tk_Window tkwin, - Tcl_Obj *objPtr); +EXTERN Tk_3DBorder Tk_Get3DBorderFromObj (Tk_Window tkwin, + Tcl_Obj * objPtr); #endif #ifndef Tk_GetAnchorFromObj_TCL_DECLARED #define Tk_GetAnchorFromObj_TCL_DECLARED /* 200 */ -EXTERN int Tk_GetAnchorFromObj(Tcl_Interp *interp, - Tcl_Obj *objPtr, Tk_Anchor *anchorPtr); +EXTERN int Tk_GetAnchorFromObj (Tcl_Interp * interp, + Tcl_Obj * objPtr, Tk_Anchor * anchorPtr); #endif #ifndef Tk_GetBitmapFromObj_TCL_DECLARED #define Tk_GetBitmapFromObj_TCL_DECLARED /* 201 */ -EXTERN Pixmap Tk_GetBitmapFromObj(Tk_Window tkwin, Tcl_Obj *objPtr); +EXTERN Pixmap Tk_GetBitmapFromObj (Tk_Window tkwin, + Tcl_Obj * objPtr); #endif #ifndef Tk_GetColorFromObj_TCL_DECLARED #define Tk_GetColorFromObj_TCL_DECLARED /* 202 */ -EXTERN XColor * Tk_GetColorFromObj(Tk_Window tkwin, Tcl_Obj *objPtr); +EXTERN XColor * Tk_GetColorFromObj (Tk_Window tkwin, + Tcl_Obj * objPtr); #endif #ifndef Tk_GetCursorFromObj_TCL_DECLARED #define Tk_GetCursorFromObj_TCL_DECLARED /* 203 */ -EXTERN Tk_Cursor Tk_GetCursorFromObj(Tk_Window tkwin, Tcl_Obj *objPtr); +EXTERN Tk_Cursor Tk_GetCursorFromObj (Tk_Window tkwin, + Tcl_Obj * objPtr); #endif #ifndef Tk_GetOptionInfo_TCL_DECLARED #define Tk_GetOptionInfo_TCL_DECLARED /* 204 */ -EXTERN Tcl_Obj * Tk_GetOptionInfo(Tcl_Interp *interp, char *recordPtr, - Tk_OptionTable optionTable, Tcl_Obj *namePtr, - Tk_Window tkwin); +EXTERN Tcl_Obj * Tk_GetOptionInfo (Tcl_Interp * interp, + char * recordPtr, Tk_OptionTable optionTable, + Tcl_Obj * namePtr, Tk_Window tkwin); #endif #ifndef Tk_GetOptionValue_TCL_DECLARED #define Tk_GetOptionValue_TCL_DECLARED /* 205 */ -EXTERN Tcl_Obj * Tk_GetOptionValue(Tcl_Interp *interp, - char *recordPtr, Tk_OptionTable optionTable, - Tcl_Obj *namePtr, Tk_Window tkwin); +EXTERN Tcl_Obj * Tk_GetOptionValue (Tcl_Interp * interp, + char * recordPtr, Tk_OptionTable optionTable, + Tcl_Obj * namePtr, Tk_Window tkwin); #endif #ifndef Tk_GetJustifyFromObj_TCL_DECLARED #define Tk_GetJustifyFromObj_TCL_DECLARED /* 206 */ -EXTERN int Tk_GetJustifyFromObj(Tcl_Interp *interp, - Tcl_Obj *objPtr, Tk_Justify *justifyPtr); +EXTERN int Tk_GetJustifyFromObj (Tcl_Interp * interp, + Tcl_Obj * objPtr, Tk_Justify * justifyPtr); #endif #ifndef Tk_GetMMFromObj_TCL_DECLARED #define Tk_GetMMFromObj_TCL_DECLARED /* 207 */ -EXTERN int Tk_GetMMFromObj(Tcl_Interp *interp, Tk_Window tkwin, - Tcl_Obj *objPtr, double *doublePtr); +EXTERN int Tk_GetMMFromObj (Tcl_Interp * interp, + Tk_Window tkwin, Tcl_Obj * objPtr, + double * doublePtr); #endif #ifndef Tk_GetPixelsFromObj_TCL_DECLARED #define Tk_GetPixelsFromObj_TCL_DECLARED /* 208 */ -EXTERN int Tk_GetPixelsFromObj(Tcl_Interp *interp, - Tk_Window tkwin, Tcl_Obj *objPtr, - int *intPtr); +EXTERN int Tk_GetPixelsFromObj (Tcl_Interp * interp, + Tk_Window tkwin, Tcl_Obj * objPtr, + int * intPtr); #endif #ifndef Tk_GetReliefFromObj_TCL_DECLARED #define Tk_GetReliefFromObj_TCL_DECLARED /* 209 */ -EXTERN int Tk_GetReliefFromObj(Tcl_Interp *interp, - Tcl_Obj *objPtr, int *resultPtr); +EXTERN int Tk_GetReliefFromObj (Tcl_Interp * interp, + Tcl_Obj * objPtr, int * resultPtr); #endif #ifndef Tk_GetScrollInfoObj_TCL_DECLARED #define Tk_GetScrollInfoObj_TCL_DECLARED /* 210 */ -EXTERN int Tk_GetScrollInfoObj(Tcl_Interp *interp, int objc, - Tcl_Obj *CONST objv[], double *dblPtr, - int *intPtr); +EXTERN int Tk_GetScrollInfoObj (Tcl_Interp * interp, int objc, + Tcl_Obj *CONST objv[], double * dblPtr, + int * intPtr); #endif #ifndef Tk_InitOptions_TCL_DECLARED #define Tk_InitOptions_TCL_DECLARED /* 211 */ -EXTERN int Tk_InitOptions(Tcl_Interp *interp, char *recordPtr, - Tk_OptionTable optionToken, Tk_Window tkwin); +EXTERN int Tk_InitOptions (Tcl_Interp * interp, + char * recordPtr, Tk_OptionTable optionToken, + Tk_Window tkwin); #endif #ifndef Tk_MainEx_TCL_DECLARED #define Tk_MainEx_TCL_DECLARED /* 212 */ -EXTERN void Tk_MainEx(int argc, char **argv, - Tcl_AppInitProc *appInitProc, - Tcl_Interp *interp); +EXTERN void Tk_MainEx (int argc, char ** argv, + Tcl_AppInitProc * appInitProc, + Tcl_Interp * interp); #endif #ifndef Tk_RestoreSavedOptions_TCL_DECLARED #define Tk_RestoreSavedOptions_TCL_DECLARED /* 213 */ -EXTERN void Tk_RestoreSavedOptions(Tk_SavedOptions *savePtr); +EXTERN void Tk_RestoreSavedOptions (Tk_SavedOptions * savePtr); #endif #ifndef Tk_SetOptions_TCL_DECLARED #define Tk_SetOptions_TCL_DECLARED /* 214 */ -EXTERN int Tk_SetOptions(Tcl_Interp *interp, char *recordPtr, - Tk_OptionTable optionTable, int objc, - Tcl_Obj *CONST objv[], Tk_Window tkwin, - Tk_SavedOptions *savePtr, int *maskPtr); +EXTERN int Tk_SetOptions (Tcl_Interp * interp, char * recordPtr, + Tk_OptionTable optionTable, int objc, + Tcl_Obj *CONST objv[], Tk_Window tkwin, + Tk_SavedOptions * savePtr, int * maskPtr); #endif #ifndef Tk_InitConsoleChannels_TCL_DECLARED #define Tk_InitConsoleChannels_TCL_DECLARED /* 215 */ -EXTERN void Tk_InitConsoleChannels(Tcl_Interp *interp); +EXTERN void Tk_InitConsoleChannels (Tcl_Interp * interp); #endif #ifndef Tk_CreateConsoleWindow_TCL_DECLARED #define Tk_CreateConsoleWindow_TCL_DECLARED /* 216 */ -EXTERN int Tk_CreateConsoleWindow(Tcl_Interp *interp); +EXTERN int Tk_CreateConsoleWindow (Tcl_Interp * interp); #endif #ifndef Tk_CreateSmoothMethod_TCL_DECLARED #define Tk_CreateSmoothMethod_TCL_DECLARED /* 217 */ -EXTERN void Tk_CreateSmoothMethod(Tcl_Interp *interp, - Tk_SmoothMethod *method); +EXTERN void Tk_CreateSmoothMethod (Tcl_Interp * interp, + Tk_SmoothMethod * method); #endif /* Slot 218 is reserved */ /* Slot 219 is reserved */ #ifndef Tk_GetDash_TCL_DECLARED #define Tk_GetDash_TCL_DECLARED /* 220 */ -EXTERN int Tk_GetDash(Tcl_Interp *interp, CONST char *value, - Tk_Dash *dash); +EXTERN int Tk_GetDash (Tcl_Interp * interp, CONST char * value, + Tk_Dash * dash); #endif #ifndef Tk_CreateOutline_TCL_DECLARED #define Tk_CreateOutline_TCL_DECLARED /* 221 */ -EXTERN void Tk_CreateOutline(Tk_Outline *outline); +EXTERN void Tk_CreateOutline (Tk_Outline * outline); #endif #ifndef Tk_DeleteOutline_TCL_DECLARED #define Tk_DeleteOutline_TCL_DECLARED /* 222 */ -EXTERN void Tk_DeleteOutline(Display *display, - Tk_Outline *outline); +EXTERN void Tk_DeleteOutline (Display * display, + Tk_Outline * outline); #endif #ifndef Tk_ConfigOutlineGC_TCL_DECLARED #define Tk_ConfigOutlineGC_TCL_DECLARED /* 223 */ -EXTERN int Tk_ConfigOutlineGC(XGCValues *gcValues, - Tk_Canvas canvas, Tk_Item *item, - Tk_Outline *outline); +EXTERN int Tk_ConfigOutlineGC (XGCValues * gcValues, + Tk_Canvas canvas, Tk_Item * item, + Tk_Outline * outline); #endif #ifndef Tk_ChangeOutlineGC_TCL_DECLARED #define Tk_ChangeOutlineGC_TCL_DECLARED /* 224 */ -EXTERN int Tk_ChangeOutlineGC(Tk_Canvas canvas, Tk_Item *item, - Tk_Outline *outline); +EXTERN int Tk_ChangeOutlineGC (Tk_Canvas canvas, Tk_Item * item, + Tk_Outline * outline); #endif #ifndef Tk_ResetOutlineGC_TCL_DECLARED #define Tk_ResetOutlineGC_TCL_DECLARED /* 225 */ -EXTERN int Tk_ResetOutlineGC(Tk_Canvas canvas, Tk_Item *item, - Tk_Outline *outline); +EXTERN int Tk_ResetOutlineGC (Tk_Canvas canvas, Tk_Item * item, + Tk_Outline * outline); #endif #ifndef Tk_CanvasPsOutline_TCL_DECLARED #define Tk_CanvasPsOutline_TCL_DECLARED /* 226 */ -EXTERN int Tk_CanvasPsOutline(Tk_Canvas canvas, Tk_Item *item, - Tk_Outline *outline); +EXTERN int Tk_CanvasPsOutline (Tk_Canvas canvas, Tk_Item * item, + Tk_Outline * outline); #endif #ifndef Tk_SetTSOrigin_TCL_DECLARED #define Tk_SetTSOrigin_TCL_DECLARED /* 227 */ -EXTERN void Tk_SetTSOrigin(Tk_Window tkwin, GC gc, int x, int y); +EXTERN void Tk_SetTSOrigin (Tk_Window tkwin, GC gc, int x, int y); #endif #ifndef Tk_CanvasGetCoordFromObj_TCL_DECLARED #define Tk_CanvasGetCoordFromObj_TCL_DECLARED /* 228 */ -EXTERN int Tk_CanvasGetCoordFromObj(Tcl_Interp *interp, - Tk_Canvas canvas, Tcl_Obj *obj, - double *doublePtr); +EXTERN int Tk_CanvasGetCoordFromObj (Tcl_Interp * interp, + Tk_Canvas canvas, Tcl_Obj * obj, + double * doublePtr); #endif #ifndef Tk_CanvasSetOffset_TCL_DECLARED #define Tk_CanvasSetOffset_TCL_DECLARED /* 229 */ -EXTERN void Tk_CanvasSetOffset(Tk_Canvas canvas, GC gc, - Tk_TSOffset *offset); +EXTERN void Tk_CanvasSetOffset (Tk_Canvas canvas, GC gc, + Tk_TSOffset * offset); #endif #ifndef Tk_DitherPhoto_TCL_DECLARED #define Tk_DitherPhoto_TCL_DECLARED /* 230 */ -EXTERN void Tk_DitherPhoto(Tk_PhotoHandle handle, int x, int y, +EXTERN void Tk_DitherPhoto (Tk_PhotoHandle handle, int x, int y, int width, int height); #endif #ifndef Tk_PostscriptBitmap_TCL_DECLARED #define Tk_PostscriptBitmap_TCL_DECLARED /* 231 */ -EXTERN int Tk_PostscriptBitmap(Tcl_Interp *interp, - Tk_Window tkwin, Tk_PostscriptInfo psInfo, - Pixmap bitmap, int startX, int startY, +EXTERN int Tk_PostscriptBitmap (Tcl_Interp * interp, + Tk_Window tkwin, Tk_PostscriptInfo psInfo, + Pixmap bitmap, int startX, int startY, int width, int height); #endif #ifndef Tk_PostscriptColor_TCL_DECLARED #define Tk_PostscriptColor_TCL_DECLARED /* 232 */ -EXTERN int Tk_PostscriptColor(Tcl_Interp *interp, - Tk_PostscriptInfo psInfo, XColor *colorPtr); +EXTERN int Tk_PostscriptColor (Tcl_Interp * interp, + Tk_PostscriptInfo psInfo, XColor * colorPtr); #endif #ifndef Tk_PostscriptFont_TCL_DECLARED #define Tk_PostscriptFont_TCL_DECLARED /* 233 */ -EXTERN int Tk_PostscriptFont(Tcl_Interp *interp, +EXTERN int Tk_PostscriptFont (Tcl_Interp * interp, Tk_PostscriptInfo psInfo, Tk_Font font); #endif #ifndef Tk_PostscriptImage_TCL_DECLARED #define Tk_PostscriptImage_TCL_DECLARED /* 234 */ -EXTERN int Tk_PostscriptImage(Tk_Image image, - Tcl_Interp *interp, Tk_Window tkwin, - Tk_PostscriptInfo psinfo, int x, int y, +EXTERN int Tk_PostscriptImage (Tk_Image image, + Tcl_Interp * interp, Tk_Window tkwin, + Tk_PostscriptInfo psinfo, int x, int y, int width, int height, int prepass); #endif #ifndef Tk_PostscriptPath_TCL_DECLARED #define Tk_PostscriptPath_TCL_DECLARED /* 235 */ -EXTERN void Tk_PostscriptPath(Tcl_Interp *interp, - Tk_PostscriptInfo psInfo, double *coordPtr, +EXTERN void Tk_PostscriptPath (Tcl_Interp * interp, + Tk_PostscriptInfo psInfo, double * coordPtr, int numPoints); #endif #ifndef Tk_PostscriptStipple_TCL_DECLARED #define Tk_PostscriptStipple_TCL_DECLARED /* 236 */ -EXTERN int Tk_PostscriptStipple(Tcl_Interp *interp, - Tk_Window tkwin, Tk_PostscriptInfo psInfo, +EXTERN int Tk_PostscriptStipple (Tcl_Interp * interp, + Tk_Window tkwin, Tk_PostscriptInfo psInfo, Pixmap bitmap); #endif #ifndef Tk_PostscriptY_TCL_DECLARED #define Tk_PostscriptY_TCL_DECLARED /* 237 */ -EXTERN double Tk_PostscriptY(double y, Tk_PostscriptInfo psInfo); +EXTERN double Tk_PostscriptY (double y, Tk_PostscriptInfo psInfo); #endif #ifndef Tk_PostscriptPhoto_TCL_DECLARED #define Tk_PostscriptPhoto_TCL_DECLARED /* 238 */ -EXTERN int Tk_PostscriptPhoto(Tcl_Interp *interp, - Tk_PhotoImageBlock *blockPtr, - Tk_PostscriptInfo psInfo, int width, +EXTERN int Tk_PostscriptPhoto (Tcl_Interp * interp, + Tk_PhotoImageBlock * blockPtr, + Tk_PostscriptInfo psInfo, int width, int height); #endif #ifndef Tk_CreateClientMessageHandler_TCL_DECLARED #define Tk_CreateClientMessageHandler_TCL_DECLARED /* 239 */ -EXTERN void Tk_CreateClientMessageHandler( - Tk_ClientMessageProc *proc); +EXTERN void Tk_CreateClientMessageHandler ( + Tk_ClientMessageProc * proc); #endif #ifndef Tk_DeleteClientMessageHandler_TCL_DECLARED #define Tk_DeleteClientMessageHandler_TCL_DECLARED /* 240 */ -EXTERN void Tk_DeleteClientMessageHandler( - Tk_ClientMessageProc *proc); +EXTERN void Tk_DeleteClientMessageHandler ( + Tk_ClientMessageProc * proc); #endif #ifndef Tk_CreateAnonymousWindow_TCL_DECLARED #define Tk_CreateAnonymousWindow_TCL_DECLARED /* 241 */ -EXTERN Tk_Window Tk_CreateAnonymousWindow(Tcl_Interp *interp, - Tk_Window parent, CONST char *screenName); +EXTERN Tk_Window Tk_CreateAnonymousWindow (Tcl_Interp * interp, + Tk_Window parent, CONST char * screenName); #endif #ifndef Tk_SetClassProcs_TCL_DECLARED #define Tk_SetClassProcs_TCL_DECLARED /* 242 */ -EXTERN void Tk_SetClassProcs(Tk_Window tkwin, - Tk_ClassProcs *procs, +EXTERN void Tk_SetClassProcs (Tk_Window tkwin, + Tk_ClassProcs * procs, ClientData instanceData); #endif #ifndef Tk_SetInternalBorderEx_TCL_DECLARED #define Tk_SetInternalBorderEx_TCL_DECLARED /* 243 */ -EXTERN void Tk_SetInternalBorderEx(Tk_Window tkwin, int left, +EXTERN void Tk_SetInternalBorderEx (Tk_Window tkwin, int left, int right, int top, int bottom); #endif #ifndef Tk_SetMinimumRequestSize_TCL_DECLARED #define Tk_SetMinimumRequestSize_TCL_DECLARED /* 244 */ -EXTERN void Tk_SetMinimumRequestSize(Tk_Window tkwin, +EXTERN void Tk_SetMinimumRequestSize (Tk_Window tkwin, int minWidth, int minHeight); #endif #ifndef Tk_SetCaretPos_TCL_DECLARED #define Tk_SetCaretPos_TCL_DECLARED /* 245 */ -EXTERN void Tk_SetCaretPos(Tk_Window tkwin, int x, int y, +EXTERN void Tk_SetCaretPos (Tk_Window tkwin, int x, int y, int height); #endif #ifndef Tk_PhotoPutBlock_Panic_TCL_DECLARED #define Tk_PhotoPutBlock_Panic_TCL_DECLARED /* 246 */ -EXTERN void Tk_PhotoPutBlock_Panic(Tk_PhotoHandle handle, - Tk_PhotoImageBlock *blockPtr, int x, int y, +EXTERN void Tk_PhotoPutBlock_Panic (Tk_PhotoHandle handle, + Tk_PhotoImageBlock * blockPtr, int x, int y, int width, int height, int compRule); #endif #ifndef Tk_PhotoPutZoomedBlock_Panic_TCL_DECLARED #define Tk_PhotoPutZoomedBlock_Panic_TCL_DECLARED /* 247 */ -EXTERN void Tk_PhotoPutZoomedBlock_Panic(Tk_PhotoHandle handle, - Tk_PhotoImageBlock *blockPtr, int x, int y, - int width, int height, int zoomX, int zoomY, +EXTERN void Tk_PhotoPutZoomedBlock_Panic (Tk_PhotoHandle handle, + Tk_PhotoImageBlock * blockPtr, int x, int y, + int width, int height, int zoomX, int zoomY, int subsampleX, int subsampleY, int compRule); #endif #ifndef Tk_CollapseMotionEvents_TCL_DECLARED #define Tk_CollapseMotionEvents_TCL_DECLARED /* 248 */ -EXTERN int Tk_CollapseMotionEvents(Display *display, +EXTERN int Tk_CollapseMotionEvents (Display * display, int collapse); #endif #ifndef Tk_RegisterStyleEngine_TCL_DECLARED #define Tk_RegisterStyleEngine_TCL_DECLARED /* 249 */ -EXTERN Tk_StyleEngine Tk_RegisterStyleEngine(CONST char *name, +EXTERN Tk_StyleEngine Tk_RegisterStyleEngine (CONST char * name, Tk_StyleEngine parent); #endif #ifndef Tk_GetStyleEngine_TCL_DECLARED #define Tk_GetStyleEngine_TCL_DECLARED /* 250 */ -EXTERN Tk_StyleEngine Tk_GetStyleEngine(CONST char *name); +EXTERN Tk_StyleEngine Tk_GetStyleEngine (CONST char * name); #endif #ifndef Tk_RegisterStyledElement_TCL_DECLARED #define Tk_RegisterStyledElement_TCL_DECLARED /* 251 */ -EXTERN int Tk_RegisterStyledElement(Tk_StyleEngine engine, - Tk_ElementSpec *templatePtr); +EXTERN int Tk_RegisterStyledElement (Tk_StyleEngine engine, + Tk_ElementSpec * templatePtr); #endif #ifndef Tk_GetElementId_TCL_DECLARED #define Tk_GetElementId_TCL_DECLARED /* 252 */ -EXTERN int Tk_GetElementId(CONST char *name); +EXTERN int Tk_GetElementId (CONST char * name); #endif #ifndef Tk_CreateStyle_TCL_DECLARED #define Tk_CreateStyle_TCL_DECLARED /* 253 */ -EXTERN Tk_Style Tk_CreateStyle(CONST char *name, +EXTERN Tk_Style Tk_CreateStyle (CONST char * name, Tk_StyleEngine engine, ClientData clientData); #endif #ifndef Tk_GetStyle_TCL_DECLARED #define Tk_GetStyle_TCL_DECLARED /* 254 */ -EXTERN Tk_Style Tk_GetStyle(Tcl_Interp *interp, CONST char *name); +EXTERN Tk_Style Tk_GetStyle (Tcl_Interp * interp, CONST char * name); #endif #ifndef Tk_FreeStyle_TCL_DECLARED #define Tk_FreeStyle_TCL_DECLARED /* 255 */ -EXTERN void Tk_FreeStyle(Tk_Style style); +EXTERN void Tk_FreeStyle (Tk_Style style); #endif #ifndef Tk_NameOfStyle_TCL_DECLARED #define Tk_NameOfStyle_TCL_DECLARED /* 256 */ -EXTERN CONST char * Tk_NameOfStyle(Tk_Style style); +EXTERN CONST char * Tk_NameOfStyle (Tk_Style style); #endif #ifndef Tk_AllocStyleFromObj_TCL_DECLARED #define Tk_AllocStyleFromObj_TCL_DECLARED /* 257 */ -EXTERN Tk_Style Tk_AllocStyleFromObj(Tcl_Interp *interp, - Tcl_Obj *objPtr); +EXTERN Tk_Style Tk_AllocStyleFromObj (Tcl_Interp * interp, + Tcl_Obj * objPtr); #endif #ifndef Tk_GetStyleFromObj_TCL_DECLARED #define Tk_GetStyleFromObj_TCL_DECLARED /* 258 */ -EXTERN Tk_Style Tk_GetStyleFromObj(Tcl_Obj *objPtr); +EXTERN Tk_Style Tk_GetStyleFromObj (Tcl_Obj * objPtr); #endif #ifndef Tk_FreeStyleFromObj_TCL_DECLARED #define Tk_FreeStyleFromObj_TCL_DECLARED /* 259 */ -EXTERN void Tk_FreeStyleFromObj(Tcl_Obj *objPtr); +EXTERN void Tk_FreeStyleFromObj (Tcl_Obj * objPtr); #endif #ifndef Tk_GetStyledElement_TCL_DECLARED #define Tk_GetStyledElement_TCL_DECLARED /* 260 */ -EXTERN Tk_StyledElement Tk_GetStyledElement(Tk_Style style, int elementId, +EXTERN Tk_StyledElement Tk_GetStyledElement (Tk_Style style, int elementId, Tk_OptionTable optionTable); #endif #ifndef Tk_GetElementSize_TCL_DECLARED #define Tk_GetElementSize_TCL_DECLARED /* 261 */ -EXTERN void Tk_GetElementSize(Tk_Style style, - Tk_StyledElement element, char *recordPtr, - Tk_Window tkwin, int width, int height, - int inner, int *widthPtr, int *heightPtr); +EXTERN void Tk_GetElementSize (Tk_Style style, + Tk_StyledElement element, char * recordPtr, + Tk_Window tkwin, int width, int height, + int inner, int * widthPtr, int * heightPtr); #endif #ifndef Tk_GetElementBox_TCL_DECLARED #define Tk_GetElementBox_TCL_DECLARED /* 262 */ -EXTERN void Tk_GetElementBox(Tk_Style style, - Tk_StyledElement element, char *recordPtr, - Tk_Window tkwin, int x, int y, int width, - int height, int inner, int *xPtr, int *yPtr, - int *widthPtr, int *heightPtr); +EXTERN void Tk_GetElementBox (Tk_Style style, + Tk_StyledElement element, char * recordPtr, + Tk_Window tkwin, int x, int y, int width, + int height, int inner, int * xPtr, + int * yPtr, int * widthPtr, int * heightPtr); #endif #ifndef Tk_GetElementBorderWidth_TCL_DECLARED #define Tk_GetElementBorderWidth_TCL_DECLARED /* 263 */ -EXTERN int Tk_GetElementBorderWidth(Tk_Style style, - Tk_StyledElement element, char *recordPtr, +EXTERN int Tk_GetElementBorderWidth (Tk_Style style, + Tk_StyledElement element, char * recordPtr, Tk_Window tkwin); #endif #ifndef Tk_DrawElement_TCL_DECLARED #define Tk_DrawElement_TCL_DECLARED /* 264 */ -EXTERN void Tk_DrawElement(Tk_Style style, - Tk_StyledElement element, char *recordPtr, - Tk_Window tkwin, Drawable d, int x, int y, +EXTERN void Tk_DrawElement (Tk_Style style, + Tk_StyledElement element, char * recordPtr, + Tk_Window tkwin, Drawable d, int x, int y, int width, int height, int state); #endif #ifndef Tk_PhotoExpand_TCL_DECLARED #define Tk_PhotoExpand_TCL_DECLARED /* 265 */ -EXTERN int Tk_PhotoExpand(Tcl_Interp *interp, +EXTERN int Tk_PhotoExpand (Tcl_Interp * interp, Tk_PhotoHandle handle, int width, int height); #endif #ifndef Tk_PhotoPutBlock_TCL_DECLARED #define Tk_PhotoPutBlock_TCL_DECLARED /* 266 */ -EXTERN int Tk_PhotoPutBlock(Tcl_Interp *interp, - Tk_PhotoHandle handle, - Tk_PhotoImageBlock *blockPtr, int x, int y, +EXTERN int Tk_PhotoPutBlock (Tcl_Interp * interp, + Tk_PhotoHandle handle, + Tk_PhotoImageBlock * blockPtr, int x, int y, int width, int height, int compRule); #endif #ifndef Tk_PhotoPutZoomedBlock_TCL_DECLARED #define Tk_PhotoPutZoomedBlock_TCL_DECLARED /* 267 */ -EXTERN int Tk_PhotoPutZoomedBlock(Tcl_Interp *interp, - Tk_PhotoHandle handle, - Tk_PhotoImageBlock *blockPtr, int x, int y, - int width, int height, int zoomX, int zoomY, +EXTERN int Tk_PhotoPutZoomedBlock (Tcl_Interp * interp, + Tk_PhotoHandle handle, + Tk_PhotoImageBlock * blockPtr, int x, int y, + int width, int height, int zoomX, int zoomY, int subsampleX, int subsampleY, int compRule); #endif #ifndef Tk_PhotoSetSize_TCL_DECLARED #define Tk_PhotoSetSize_TCL_DECLARED /* 268 */ -EXTERN int Tk_PhotoSetSize(Tcl_Interp *interp, +EXTERN int Tk_PhotoSetSize (Tcl_Interp * interp, Tk_PhotoHandle handle, int width, int height); #endif #ifndef Tk_GetUserInactiveTime_TCL_DECLARED #define Tk_GetUserInactiveTime_TCL_DECLARED /* 269 */ -EXTERN long Tk_GetUserInactiveTime(Display *dpy); +EXTERN long Tk_GetUserInactiveTime (Display * dpy); #endif #ifndef Tk_ResetUserInactiveTime_TCL_DECLARED #define Tk_ResetUserInactiveTime_TCL_DECLARED /* 270 */ -EXTERN void Tk_ResetUserInactiveTime(Display *dpy); +EXTERN void Tk_ResetUserInactiveTime (Display * dpy); #endif #ifndef Tk_Interp_TCL_DECLARED #define Tk_Interp_TCL_DECLARED /* 271 */ -EXTERN Tcl_Interp * Tk_Interp(Tk_Window tkwin); +EXTERN Tcl_Interp * Tk_Interp (Tk_Window tkwin); #endif #ifndef Tk_CreateOldImageType_TCL_DECLARED #define Tk_CreateOldImageType_TCL_DECLARED /* 272 */ -EXTERN void Tk_CreateOldImageType(Tk_ImageType *typePtr); +EXTERN void Tk_CreateOldImageType (Tk_ImageType * typePtr); #endif #ifndef Tk_CreateOldPhotoImageFormat_TCL_DECLARED #define Tk_CreateOldPhotoImageFormat_TCL_DECLARED /* 273 */ -EXTERN void Tk_CreateOldPhotoImageFormat( - Tk_PhotoImageFormat *formatPtr); +EXTERN void Tk_CreateOldPhotoImageFormat ( + Tk_PhotoImageFormat * formatPtr); #endif typedef struct TkStubHooks { @@ -1693,164 +1711,164 @@ typedef struct TkStubs { GC (*tk_3DBorderGC) (Tk_Window tkwin, Tk_3DBorder border, int which); /* 2 */ void (*tk_3DHorizontalBevel) (Tk_Window tkwin, Drawable drawable, Tk_3DBorder border, int x, int y, int width, int height, int leftIn, int rightIn, int topBevel, int relief); /* 3 */ void (*tk_3DVerticalBevel) (Tk_Window tkwin, Drawable drawable, Tk_3DBorder border, int x, int y, int width, int height, int leftBevel, int relief); /* 4 */ - void (*tk_AddOption) (Tk_Window tkwin, CONST char *name, CONST char *value, int priority); /* 5 */ - void (*tk_BindEvent) (Tk_BindingTable bindingTable, XEvent *eventPtr, Tk_Window tkwin, int numObjects, ClientData *objectPtr); /* 6 */ - void (*tk_CanvasDrawableCoords) (Tk_Canvas canvas, double x, double y, short *drawableXPtr, short *drawableYPtr); /* 7 */ + void (*tk_AddOption) (Tk_Window tkwin, CONST char * name, CONST char * value, int priority); /* 5 */ + void (*tk_BindEvent) (Tk_BindingTable bindingTable, XEvent * eventPtr, Tk_Window tkwin, int numObjects, ClientData * objectPtr); /* 6 */ + void (*tk_CanvasDrawableCoords) (Tk_Canvas canvas, double x, double y, short * drawableXPtr, short * drawableYPtr); /* 7 */ void (*tk_CanvasEventuallyRedraw) (Tk_Canvas canvas, int x1, int y1, int x2, int y2); /* 8 */ - int (*tk_CanvasGetCoord) (Tcl_Interp *interp, Tk_Canvas canvas, CONST char *str, double *doublePtr); /* 9 */ + int (*tk_CanvasGetCoord) (Tcl_Interp * interp, Tk_Canvas canvas, CONST char * str, double * doublePtr); /* 9 */ Tk_CanvasTextInfo * (*tk_CanvasGetTextInfo) (Tk_Canvas canvas); /* 10 */ - int (*tk_CanvasPsBitmap) (Tcl_Interp *interp, Tk_Canvas canvas, Pixmap bitmap, int x, int y, int width, int height); /* 11 */ - int (*tk_CanvasPsColor) (Tcl_Interp *interp, Tk_Canvas canvas, XColor *colorPtr); /* 12 */ - int (*tk_CanvasPsFont) (Tcl_Interp *interp, Tk_Canvas canvas, Tk_Font font); /* 13 */ - void (*tk_CanvasPsPath) (Tcl_Interp *interp, Tk_Canvas canvas, double *coordPtr, int numPoints); /* 14 */ - int (*tk_CanvasPsStipple) (Tcl_Interp *interp, Tk_Canvas canvas, Pixmap bitmap); /* 15 */ + int (*tk_CanvasPsBitmap) (Tcl_Interp * interp, Tk_Canvas canvas, Pixmap bitmap, int x, int y, int width, int height); /* 11 */ + int (*tk_CanvasPsColor) (Tcl_Interp * interp, Tk_Canvas canvas, XColor * colorPtr); /* 12 */ + int (*tk_CanvasPsFont) (Tcl_Interp * interp, Tk_Canvas canvas, Tk_Font font); /* 13 */ + void (*tk_CanvasPsPath) (Tcl_Interp * interp, Tk_Canvas canvas, double * coordPtr, int numPoints); /* 14 */ + int (*tk_CanvasPsStipple) (Tcl_Interp * interp, Tk_Canvas canvas, Pixmap bitmap); /* 15 */ double (*tk_CanvasPsY) (Tk_Canvas canvas, double y); /* 16 */ void (*tk_CanvasSetStippleOrigin) (Tk_Canvas canvas, GC gc); /* 17 */ - int (*tk_CanvasTagsParseProc) (ClientData clientData, Tcl_Interp *interp, Tk_Window tkwin, CONST char *value, char *widgRec, int offset); /* 18 */ - char * (*tk_CanvasTagsPrintProc) (ClientData clientData, Tk_Window tkwin, char *widgRec, int offset, Tcl_FreeProc **freeProcPtr); /* 19 */ + int (*tk_CanvasTagsParseProc) (ClientData clientData, Tcl_Interp * interp, Tk_Window tkwin, CONST char * value, char * widgRec, int offset); /* 18 */ + char * (*tk_CanvasTagsPrintProc) (ClientData clientData, Tk_Window tkwin, char * widgRec, int offset, Tcl_FreeProc ** freeProcPtr); /* 19 */ Tk_Window (*tk_CanvasTkwin) (Tk_Canvas canvas); /* 20 */ - void (*tk_CanvasWindowCoords) (Tk_Canvas canvas, double x, double y, short *screenXPtr, short *screenYPtr); /* 21 */ - void (*tk_ChangeWindowAttributes) (Tk_Window tkwin, unsigned long valueMask, XSetWindowAttributes *attsPtr); /* 22 */ - int (*tk_CharBbox) (Tk_TextLayout layout, int index, int *xPtr, int *yPtr, int *widthPtr, int *heightPtr); /* 23 */ + void (*tk_CanvasWindowCoords) (Tk_Canvas canvas, double x, double y, short * screenXPtr, short * screenYPtr); /* 21 */ + void (*tk_ChangeWindowAttributes) (Tk_Window tkwin, unsigned long valueMask, XSetWindowAttributes * attsPtr); /* 22 */ + int (*tk_CharBbox) (Tk_TextLayout layout, int index, int * xPtr, int * yPtr, int * widthPtr, int * heightPtr); /* 23 */ void (*tk_ClearSelection) (Tk_Window tkwin, Atom selection); /* 24 */ - int (*tk_ClipboardAppend) (Tcl_Interp *interp, Tk_Window tkwin, Atom target, Atom format, char *buffer); /* 25 */ - int (*tk_ClipboardClear) (Tcl_Interp *interp, Tk_Window tkwin); /* 26 */ - int (*tk_ConfigureInfo) (Tcl_Interp *interp, Tk_Window tkwin, Tk_ConfigSpec *specs, char *widgRec, CONST char *argvName, int flags); /* 27 */ - int (*tk_ConfigureValue) (Tcl_Interp *interp, Tk_Window tkwin, Tk_ConfigSpec *specs, char *widgRec, CONST char *argvName, int flags); /* 28 */ - int (*tk_ConfigureWidget) (Tcl_Interp *interp, Tk_Window tkwin, Tk_ConfigSpec *specs, int argc, CONST84 char **argv, char *widgRec, int flags); /* 29 */ - void (*tk_ConfigureWindow) (Tk_Window tkwin, unsigned int valueMask, XWindowChanges *valuePtr); /* 30 */ - Tk_TextLayout (*tk_ComputeTextLayout) (Tk_Font font, CONST char *str, int numChars, int wrapLength, Tk_Justify justify, int flags, int *widthPtr, int *heightPtr); /* 31 */ + int (*tk_ClipboardAppend) (Tcl_Interp * interp, Tk_Window tkwin, Atom target, Atom format, char* buffer); /* 25 */ + int (*tk_ClipboardClear) (Tcl_Interp * interp, Tk_Window tkwin); /* 26 */ + int (*tk_ConfigureInfo) (Tcl_Interp * interp, Tk_Window tkwin, Tk_ConfigSpec * specs, char * widgRec, CONST char * argvName, int flags); /* 27 */ + int (*tk_ConfigureValue) (Tcl_Interp * interp, Tk_Window tkwin, Tk_ConfigSpec * specs, char * widgRec, CONST char * argvName, int flags); /* 28 */ + int (*tk_ConfigureWidget) (Tcl_Interp * interp, Tk_Window tkwin, Tk_ConfigSpec * specs, int argc, CONST84 char ** argv, char * widgRec, int flags); /* 29 */ + void (*tk_ConfigureWindow) (Tk_Window tkwin, unsigned int valueMask, XWindowChanges * valuePtr); /* 30 */ + Tk_TextLayout (*tk_ComputeTextLayout) (Tk_Font font, CONST char * str, int numChars, int wrapLength, Tk_Justify justify, int flags, int * widthPtr, int * heightPtr); /* 31 */ Tk_Window (*tk_CoordsToWindow) (int rootX, int rootY, Tk_Window tkwin); /* 32 */ - unsigned long (*tk_CreateBinding) (Tcl_Interp *interp, Tk_BindingTable bindingTable, ClientData object, CONST char *eventStr, CONST char *command, int append); /* 33 */ - Tk_BindingTable (*tk_CreateBindingTable) (Tcl_Interp *interp); /* 34 */ - Tk_ErrorHandler (*tk_CreateErrorHandler) (Display *display, int errNum, int request, int minorCode, Tk_ErrorProc *errorProc, ClientData clientData); /* 35 */ - void (*tk_CreateEventHandler) (Tk_Window token, unsigned long mask, Tk_EventProc *proc, ClientData clientData); /* 36 */ - void (*tk_CreateGenericHandler) (Tk_GenericProc *proc, ClientData clientData); /* 37 */ - void (*tk_CreateImageType) (Tk_ImageType *typePtr); /* 38 */ - void (*tk_CreateItemType) (Tk_ItemType *typePtr); /* 39 */ - void (*tk_CreatePhotoImageFormat) (Tk_PhotoImageFormat *formatPtr); /* 40 */ - void (*tk_CreateSelHandler) (Tk_Window tkwin, Atom selection, Atom target, Tk_SelectionProc *proc, ClientData clientData, Atom format); /* 41 */ - Tk_Window (*tk_CreateWindow) (Tcl_Interp *interp, Tk_Window parent, CONST char *name, CONST char *screenName); /* 42 */ - Tk_Window (*tk_CreateWindowFromPath) (Tcl_Interp *interp, Tk_Window tkwin, CONST char *pathName, CONST char *screenName); /* 43 */ - int (*tk_DefineBitmap) (Tcl_Interp *interp, CONST char *name, CONST char *source, int width, int height); /* 44 */ + unsigned long (*tk_CreateBinding) (Tcl_Interp * interp, Tk_BindingTable bindingTable, ClientData object, CONST char * eventStr, CONST char * command, int append); /* 33 */ + Tk_BindingTable (*tk_CreateBindingTable) (Tcl_Interp * interp); /* 34 */ + Tk_ErrorHandler (*tk_CreateErrorHandler) (Display * display, int errNum, int request, int minorCode, Tk_ErrorProc * errorProc, ClientData clientData); /* 35 */ + void (*tk_CreateEventHandler) (Tk_Window token, unsigned long mask, Tk_EventProc * proc, ClientData clientData); /* 36 */ + void (*tk_CreateGenericHandler) (Tk_GenericProc * proc, ClientData clientData); /* 37 */ + void (*tk_CreateImageType) (Tk_ImageType * typePtr); /* 38 */ + void (*tk_CreateItemType) (Tk_ItemType * typePtr); /* 39 */ + void (*tk_CreatePhotoImageFormat) (Tk_PhotoImageFormat * formatPtr); /* 40 */ + void (*tk_CreateSelHandler) (Tk_Window tkwin, Atom selection, Atom target, Tk_SelectionProc * proc, ClientData clientData, Atom format); /* 41 */ + Tk_Window (*tk_CreateWindow) (Tcl_Interp * interp, Tk_Window parent, CONST char * name, CONST char * screenName); /* 42 */ + Tk_Window (*tk_CreateWindowFromPath) (Tcl_Interp * interp, Tk_Window tkwin, CONST char * pathName, CONST char * screenName); /* 43 */ + int (*tk_DefineBitmap) (Tcl_Interp * interp, CONST char * name, CONST char * source, int width, int height); /* 44 */ void (*tk_DefineCursor) (Tk_Window window, Tk_Cursor cursor); /* 45 */ void (*tk_DeleteAllBindings) (Tk_BindingTable bindingTable, ClientData object); /* 46 */ - int (*tk_DeleteBinding) (Tcl_Interp *interp, Tk_BindingTable bindingTable, ClientData object, CONST char *eventStr); /* 47 */ + int (*tk_DeleteBinding) (Tcl_Interp * interp, Tk_BindingTable bindingTable, ClientData object, CONST char * eventStr); /* 47 */ void (*tk_DeleteBindingTable) (Tk_BindingTable bindingTable); /* 48 */ void (*tk_DeleteErrorHandler) (Tk_ErrorHandler handler); /* 49 */ - void (*tk_DeleteEventHandler) (Tk_Window token, unsigned long mask, Tk_EventProc *proc, ClientData clientData); /* 50 */ - void (*tk_DeleteGenericHandler) (Tk_GenericProc *proc, ClientData clientData); /* 51 */ - void (*tk_DeleteImage) (Tcl_Interp *interp, CONST char *name); /* 52 */ + void (*tk_DeleteEventHandler) (Tk_Window token, unsigned long mask, Tk_EventProc * proc, ClientData clientData); /* 50 */ + void (*tk_DeleteGenericHandler) (Tk_GenericProc * proc, ClientData clientData); /* 51 */ + void (*tk_DeleteImage) (Tcl_Interp * interp, CONST char * name); /* 52 */ void (*tk_DeleteSelHandler) (Tk_Window tkwin, Atom selection, Atom target); /* 53 */ void (*tk_DestroyWindow) (Tk_Window tkwin); /* 54 */ CONST84_RETURN char * (*tk_DisplayName) (Tk_Window tkwin); /* 55 */ int (*tk_DistanceToTextLayout) (Tk_TextLayout layout, int x, int y); /* 56 */ - void (*tk_Draw3DPolygon) (Tk_Window tkwin, Drawable drawable, Tk_3DBorder border, XPoint *pointPtr, int numPoints, int borderWidth, int leftRelief); /* 57 */ + void (*tk_Draw3DPolygon) (Tk_Window tkwin, Drawable drawable, Tk_3DBorder border, XPoint * pointPtr, int numPoints, int borderWidth, int leftRelief); /* 57 */ void (*tk_Draw3DRectangle) (Tk_Window tkwin, Drawable drawable, Tk_3DBorder border, int x, int y, int width, int height, int borderWidth, int relief); /* 58 */ - void (*tk_DrawChars) (Display *display, Drawable drawable, GC gc, Tk_Font tkfont, CONST char *source, int numBytes, int x, int y); /* 59 */ + void (*tk_DrawChars) (Display * display, Drawable drawable, GC gc, Tk_Font tkfont, CONST char * source, int numBytes, int x, int y); /* 59 */ void (*tk_DrawFocusHighlight) (Tk_Window tkwin, GC gc, int width, Drawable drawable); /* 60 */ - void (*tk_DrawTextLayout) (Display *display, Drawable drawable, GC gc, Tk_TextLayout layout, int x, int y, int firstChar, int lastChar); /* 61 */ - void (*tk_Fill3DPolygon) (Tk_Window tkwin, Drawable drawable, Tk_3DBorder border, XPoint *pointPtr, int numPoints, int borderWidth, int leftRelief); /* 62 */ + void (*tk_DrawTextLayout) (Display * display, Drawable drawable, GC gc, Tk_TextLayout layout, int x, int y, int firstChar, int lastChar); /* 61 */ + void (*tk_Fill3DPolygon) (Tk_Window tkwin, Drawable drawable, Tk_3DBorder border, XPoint * pointPtr, int numPoints, int borderWidth, int leftRelief); /* 62 */ void (*tk_Fill3DRectangle) (Tk_Window tkwin, Drawable drawable, Tk_3DBorder border, int x, int y, int width, int height, int borderWidth, int relief); /* 63 */ - Tk_PhotoHandle (*tk_FindPhoto) (Tcl_Interp *interp, CONST char *imageName); /* 64 */ + Tk_PhotoHandle (*tk_FindPhoto) (Tcl_Interp * interp, CONST char * imageName); /* 64 */ Font (*tk_FontId) (Tk_Font font); /* 65 */ void (*tk_Free3DBorder) (Tk_3DBorder border); /* 66 */ - void (*tk_FreeBitmap) (Display *display, Pixmap bitmap); /* 67 */ - void (*tk_FreeColor) (XColor *colorPtr); /* 68 */ - void (*tk_FreeColormap) (Display *display, Colormap colormap); /* 69 */ - void (*tk_FreeCursor) (Display *display, Tk_Cursor cursor); /* 70 */ + void (*tk_FreeBitmap) (Display * display, Pixmap bitmap); /* 67 */ + void (*tk_FreeColor) (XColor * colorPtr); /* 68 */ + void (*tk_FreeColormap) (Display * display, Colormap colormap); /* 69 */ + void (*tk_FreeCursor) (Display * display, Tk_Cursor cursor); /* 70 */ void (*tk_FreeFont) (Tk_Font f); /* 71 */ - void (*tk_FreeGC) (Display *display, GC gc); /* 72 */ + void (*tk_FreeGC) (Display * display, GC gc); /* 72 */ void (*tk_FreeImage) (Tk_Image image); /* 73 */ - void (*tk_FreeOptions) (Tk_ConfigSpec *specs, char *widgRec, Display *display, int needFlags); /* 74 */ - void (*tk_FreePixmap) (Display *display, Pixmap pixmap); /* 75 */ + void (*tk_FreeOptions) (Tk_ConfigSpec * specs, char * widgRec, Display * display, int needFlags); /* 74 */ + void (*tk_FreePixmap) (Display * display, Pixmap pixmap); /* 75 */ void (*tk_FreeTextLayout) (Tk_TextLayout textLayout); /* 76 */ - void (*tk_FreeXId) (Display *display, XID xid); /* 77 */ - GC (*tk_GCForColor) (XColor *colorPtr, Drawable drawable); /* 78 */ + void (*tk_FreeXId) (Display * display, XID xid); /* 77 */ + GC (*tk_GCForColor) (XColor * colorPtr, Drawable drawable); /* 78 */ void (*tk_GeometryRequest) (Tk_Window tkwin, int reqWidth, int reqHeight); /* 79 */ - Tk_3DBorder (*tk_Get3DBorder) (Tcl_Interp *interp, Tk_Window tkwin, Tk_Uid colorName); /* 80 */ - void (*tk_GetAllBindings) (Tcl_Interp *interp, Tk_BindingTable bindingTable, ClientData object); /* 81 */ - int (*tk_GetAnchor) (Tcl_Interp *interp, CONST char *str, Tk_Anchor *anchorPtr); /* 82 */ + Tk_3DBorder (*tk_Get3DBorder) (Tcl_Interp * interp, Tk_Window tkwin, Tk_Uid colorName); /* 80 */ + void (*tk_GetAllBindings) (Tcl_Interp * interp, Tk_BindingTable bindingTable, ClientData object); /* 81 */ + int (*tk_GetAnchor) (Tcl_Interp * interp, CONST char * str, Tk_Anchor * anchorPtr); /* 82 */ CONST84_RETURN char * (*tk_GetAtomName) (Tk_Window tkwin, Atom atom); /* 83 */ - CONST84_RETURN char * (*tk_GetBinding) (Tcl_Interp *interp, Tk_BindingTable bindingTable, ClientData object, CONST char *eventStr); /* 84 */ - Pixmap (*tk_GetBitmap) (Tcl_Interp *interp, Tk_Window tkwin, CONST char *str); /* 85 */ - Pixmap (*tk_GetBitmapFromData) (Tcl_Interp *interp, Tk_Window tkwin, CONST char *source, int width, int height); /* 86 */ - int (*tk_GetCapStyle) (Tcl_Interp *interp, CONST char *str, int *capPtr); /* 87 */ - XColor * (*tk_GetColor) (Tcl_Interp *interp, Tk_Window tkwin, Tk_Uid name); /* 88 */ - XColor * (*tk_GetColorByValue) (Tk_Window tkwin, XColor *colorPtr); /* 89 */ - Colormap (*tk_GetColormap) (Tcl_Interp *interp, Tk_Window tkwin, CONST char *str); /* 90 */ - Tk_Cursor (*tk_GetCursor) (Tcl_Interp *interp, Tk_Window tkwin, Tk_Uid str); /* 91 */ - Tk_Cursor (*tk_GetCursorFromData) (Tcl_Interp *interp, Tk_Window tkwin, CONST char *source, CONST char *mask, int width, int height, int xHot, int yHot, Tk_Uid fg, Tk_Uid bg); /* 92 */ - Tk_Font (*tk_GetFont) (Tcl_Interp *interp, Tk_Window tkwin, CONST char *str); /* 93 */ - Tk_Font (*tk_GetFontFromObj) (Tk_Window tkwin, Tcl_Obj *objPtr); /* 94 */ - void (*tk_GetFontMetrics) (Tk_Font font, Tk_FontMetrics *fmPtr); /* 95 */ - GC (*tk_GetGC) (Tk_Window tkwin, unsigned long valueMask, XGCValues *valuePtr); /* 96 */ - Tk_Image (*tk_GetImage) (Tcl_Interp *interp, Tk_Window tkwin, CONST char *name, Tk_ImageChangedProc *changeProc, ClientData clientData); /* 97 */ - ClientData (*tk_GetImageMasterData) (Tcl_Interp *interp, CONST char *name, Tk_ImageType **typePtrPtr); /* 98 */ + CONST84_RETURN char * (*tk_GetBinding) (Tcl_Interp * interp, Tk_BindingTable bindingTable, ClientData object, CONST char * eventStr); /* 84 */ + Pixmap (*tk_GetBitmap) (Tcl_Interp * interp, Tk_Window tkwin, CONST char * str); /* 85 */ + Pixmap (*tk_GetBitmapFromData) (Tcl_Interp * interp, Tk_Window tkwin, CONST char * source, int width, int height); /* 86 */ + int (*tk_GetCapStyle) (Tcl_Interp * interp, CONST char * str, int * capPtr); /* 87 */ + XColor * (*tk_GetColor) (Tcl_Interp * interp, Tk_Window tkwin, Tk_Uid name); /* 88 */ + XColor * (*tk_GetColorByValue) (Tk_Window tkwin, XColor * colorPtr); /* 89 */ + Colormap (*tk_GetColormap) (Tcl_Interp * interp, Tk_Window tkwin, CONST char * str); /* 90 */ + Tk_Cursor (*tk_GetCursor) (Tcl_Interp * interp, Tk_Window tkwin, Tk_Uid str); /* 91 */ + Tk_Cursor (*tk_GetCursorFromData) (Tcl_Interp * interp, Tk_Window tkwin, CONST char * source, CONST char * mask, int width, int height, int xHot, int yHot, Tk_Uid fg, Tk_Uid bg); /* 92 */ + Tk_Font (*tk_GetFont) (Tcl_Interp * interp, Tk_Window tkwin, CONST char * str); /* 93 */ + Tk_Font (*tk_GetFontFromObj) (Tk_Window tkwin, Tcl_Obj * objPtr); /* 94 */ + void (*tk_GetFontMetrics) (Tk_Font font, Tk_FontMetrics * fmPtr); /* 95 */ + GC (*tk_GetGC) (Tk_Window tkwin, unsigned long valueMask, XGCValues * valuePtr); /* 96 */ + Tk_Image (*tk_GetImage) (Tcl_Interp * interp, Tk_Window tkwin, CONST char * name, Tk_ImageChangedProc * changeProc, ClientData clientData); /* 97 */ + ClientData (*tk_GetImageMasterData) (Tcl_Interp * interp, CONST char * name, Tk_ImageType ** typePtrPtr); /* 98 */ Tk_ItemType * (*tk_GetItemTypes) (void); /* 99 */ - int (*tk_GetJoinStyle) (Tcl_Interp *interp, CONST char *str, int *joinPtr); /* 100 */ - int (*tk_GetJustify) (Tcl_Interp *interp, CONST char *str, Tk_Justify *justifyPtr); /* 101 */ + int (*tk_GetJoinStyle) (Tcl_Interp * interp, CONST char * str, int * joinPtr); /* 100 */ + int (*tk_GetJustify) (Tcl_Interp * interp, CONST char * str, Tk_Justify * justifyPtr); /* 101 */ int (*tk_GetNumMainWindows) (void); /* 102 */ - Tk_Uid (*tk_GetOption) (Tk_Window tkwin, CONST char *name, CONST char *className); /* 103 */ - int (*tk_GetPixels) (Tcl_Interp *interp, Tk_Window tkwin, CONST char *str, int *intPtr); /* 104 */ - Pixmap (*tk_GetPixmap) (Display *display, Drawable d, int width, int height, int depth); /* 105 */ - int (*tk_GetRelief) (Tcl_Interp *interp, CONST char *name, int *reliefPtr); /* 106 */ - void (*tk_GetRootCoords) (Tk_Window tkwin, int *xPtr, int *yPtr); /* 107 */ - int (*tk_GetScrollInfo) (Tcl_Interp *interp, int argc, CONST84 char **argv, double *dblPtr, int *intPtr); /* 108 */ - int (*tk_GetScreenMM) (Tcl_Interp *interp, Tk_Window tkwin, CONST char *str, double *doublePtr); /* 109 */ - int (*tk_GetSelection) (Tcl_Interp *interp, Tk_Window tkwin, Atom selection, Atom target, Tk_GetSelProc *proc, ClientData clientData); /* 110 */ - Tk_Uid (*tk_GetUid) (CONST char *str); /* 111 */ - Visual * (*tk_GetVisual) (Tcl_Interp *interp, Tk_Window tkwin, CONST char *str, int *depthPtr, Colormap *colormapPtr); /* 112 */ - void (*tk_GetVRootGeometry) (Tk_Window tkwin, int *xPtr, int *yPtr, int *widthPtr, int *heightPtr); /* 113 */ - int (*tk_Grab) (Tcl_Interp *interp, Tk_Window tkwin, int grabGlobal); /* 114 */ - void (*tk_HandleEvent) (XEvent *eventPtr); /* 115 */ - Tk_Window (*tk_IdToWindow) (Display *display, Window window); /* 116 */ + Tk_Uid (*tk_GetOption) (Tk_Window tkwin, CONST char * name, CONST char * className); /* 103 */ + int (*tk_GetPixels) (Tcl_Interp * interp, Tk_Window tkwin, CONST char * str, int * intPtr); /* 104 */ + Pixmap (*tk_GetPixmap) (Display * display, Drawable d, int width, int height, int depth); /* 105 */ + int (*tk_GetRelief) (Tcl_Interp * interp, CONST char * name, int * reliefPtr); /* 106 */ + void (*tk_GetRootCoords) (Tk_Window tkwin, int * xPtr, int * yPtr); /* 107 */ + int (*tk_GetScrollInfo) (Tcl_Interp * interp, int argc, CONST84 char ** argv, double * dblPtr, int * intPtr); /* 108 */ + int (*tk_GetScreenMM) (Tcl_Interp * interp, Tk_Window tkwin, CONST char * str, double * doublePtr); /* 109 */ + int (*tk_GetSelection) (Tcl_Interp * interp, Tk_Window tkwin, Atom selection, Atom target, Tk_GetSelProc * proc, ClientData clientData); /* 110 */ + Tk_Uid (*tk_GetUid) (CONST char * str); /* 111 */ + Visual * (*tk_GetVisual) (Tcl_Interp * interp, Tk_Window tkwin, CONST char * str, int * depthPtr, Colormap * colormapPtr); /* 112 */ + void (*tk_GetVRootGeometry) (Tk_Window tkwin, int * xPtr, int * yPtr, int * widthPtr, int * heightPtr); /* 113 */ + int (*tk_Grab) (Tcl_Interp * interp, Tk_Window tkwin, int grabGlobal); /* 114 */ + void (*tk_HandleEvent) (XEvent * eventPtr); /* 115 */ + Tk_Window (*tk_IdToWindow) (Display * display, Window window); /* 116 */ void (*tk_ImageChanged) (Tk_ImageMaster master, int x, int y, int width, int height, int imageWidth, int imageHeight); /* 117 */ - int (*tk_Init) (Tcl_Interp *interp); /* 118 */ - Atom (*tk_InternAtom) (Tk_Window tkwin, CONST char *name); /* 119 */ + int (*tk_Init) (Tcl_Interp * interp); /* 118 */ + Atom (*tk_InternAtom) (Tk_Window tkwin, CONST char * name); /* 119 */ int (*tk_IntersectTextLayout) (Tk_TextLayout layout, int x, int y, int width, int height); /* 120 */ void (*tk_MaintainGeometry) (Tk_Window slave, Tk_Window master, int x, int y, int width, int height); /* 121 */ - Tk_Window (*tk_MainWindow) (Tcl_Interp *interp); /* 122 */ + Tk_Window (*tk_MainWindow) (Tcl_Interp * interp); /* 122 */ void (*tk_MakeWindowExist) (Tk_Window tkwin); /* 123 */ - void (*tk_ManageGeometry) (Tk_Window tkwin, CONST Tk_GeomMgr *mgrPtr, ClientData clientData); /* 124 */ + void (*tk_ManageGeometry) (Tk_Window tkwin, CONST Tk_GeomMgr * mgrPtr, ClientData clientData); /* 124 */ void (*tk_MapWindow) (Tk_Window tkwin); /* 125 */ - int (*tk_MeasureChars) (Tk_Font tkfont, CONST char *source, int numBytes, int maxPixels, int flags, int *lengthPtr); /* 126 */ + int (*tk_MeasureChars) (Tk_Font tkfont, CONST char * source, int numBytes, int maxPixels, int flags, int * lengthPtr); /* 126 */ void (*tk_MoveResizeWindow) (Tk_Window tkwin, int x, int y, int width, int height); /* 127 */ void (*tk_MoveWindow) (Tk_Window tkwin, int x, int y); /* 128 */ void (*tk_MoveToplevelWindow) (Tk_Window tkwin, int x, int y); /* 129 */ CONST84_RETURN char * (*tk_NameOf3DBorder) (Tk_3DBorder border); /* 130 */ CONST84_RETURN char * (*tk_NameOfAnchor) (Tk_Anchor anchor); /* 131 */ - CONST84_RETURN char * (*tk_NameOfBitmap) (Display *display, Pixmap bitmap); /* 132 */ + CONST84_RETURN char * (*tk_NameOfBitmap) (Display * display, Pixmap bitmap); /* 132 */ CONST84_RETURN char * (*tk_NameOfCapStyle) (int cap); /* 133 */ - CONST84_RETURN char * (*tk_NameOfColor) (XColor *colorPtr); /* 134 */ - CONST84_RETURN char * (*tk_NameOfCursor) (Display *display, Tk_Cursor cursor); /* 135 */ + CONST84_RETURN char * (*tk_NameOfColor) (XColor * colorPtr); /* 134 */ + CONST84_RETURN char * (*tk_NameOfCursor) (Display * display, Tk_Cursor cursor); /* 135 */ CONST84_RETURN char * (*tk_NameOfFont) (Tk_Font font); /* 136 */ CONST84_RETURN char * (*tk_NameOfImage) (Tk_ImageMaster imageMaster); /* 137 */ CONST84_RETURN char * (*tk_NameOfJoinStyle) (int join); /* 138 */ CONST84_RETURN char * (*tk_NameOfJustify) (Tk_Justify justify); /* 139 */ CONST84_RETURN char * (*tk_NameOfRelief) (int relief); /* 140 */ - Tk_Window (*tk_NameToWindow) (Tcl_Interp *interp, CONST char *pathName, Tk_Window tkwin); /* 141 */ - void (*tk_OwnSelection) (Tk_Window tkwin, Atom selection, Tk_LostSelProc *proc, ClientData clientData); /* 142 */ - int (*tk_ParseArgv) (Tcl_Interp *interp, Tk_Window tkwin, int *argcPtr, CONST84 char **argv, Tk_ArgvInfo *argTable, int flags); /* 143 */ - void (*tk_PhotoPutBlock_NoComposite) (Tk_PhotoHandle handle, Tk_PhotoImageBlock *blockPtr, int x, int y, int width, int height); /* 144 */ - void (*tk_PhotoPutZoomedBlock_NoComposite) (Tk_PhotoHandle handle, Tk_PhotoImageBlock *blockPtr, int x, int y, int width, int height, int zoomX, int zoomY, int subsampleX, int subsampleY); /* 145 */ - int (*tk_PhotoGetImage) (Tk_PhotoHandle handle, Tk_PhotoImageBlock *blockPtr); /* 146 */ + Tk_Window (*tk_NameToWindow) (Tcl_Interp * interp, CONST char * pathName, Tk_Window tkwin); /* 141 */ + void (*tk_OwnSelection) (Tk_Window tkwin, Atom selection, Tk_LostSelProc * proc, ClientData clientData); /* 142 */ + int (*tk_ParseArgv) (Tcl_Interp * interp, Tk_Window tkwin, int * argcPtr, CONST84 char ** argv, Tk_ArgvInfo * argTable, int flags); /* 143 */ + void (*tk_PhotoPutBlock_NoComposite) (Tk_PhotoHandle handle, Tk_PhotoImageBlock * blockPtr, int x, int y, int width, int height); /* 144 */ + void (*tk_PhotoPutZoomedBlock_NoComposite) (Tk_PhotoHandle handle, Tk_PhotoImageBlock * blockPtr, int x, int y, int width, int height, int zoomX, int zoomY, int subsampleX, int subsampleY); /* 145 */ + int (*tk_PhotoGetImage) (Tk_PhotoHandle handle, Tk_PhotoImageBlock * blockPtr); /* 146 */ void (*tk_PhotoBlank) (Tk_PhotoHandle handle); /* 147 */ void (*tk_PhotoExpand_Panic) (Tk_PhotoHandle handle, int width, int height); /* 148 */ - void (*tk_PhotoGetSize) (Tk_PhotoHandle handle, int *widthPtr, int *heightPtr); /* 149 */ + void (*tk_PhotoGetSize) (Tk_PhotoHandle handle, int * widthPtr, int * heightPtr); /* 149 */ void (*tk_PhotoSetSize_Panic) (Tk_PhotoHandle handle, int width, int height); /* 150 */ int (*tk_PointToChar) (Tk_TextLayout layout, int x, int y); /* 151 */ - int (*tk_PostscriptFontName) (Tk_Font tkfont, Tcl_DString *dsPtr); /* 152 */ - void (*tk_PreserveColormap) (Display *display, Colormap colormap); /* 153 */ - void (*tk_QueueWindowEvent) (XEvent *eventPtr, Tcl_QueuePosition position); /* 154 */ + int (*tk_PostscriptFontName) (Tk_Font tkfont, Tcl_DString * dsPtr); /* 152 */ + void (*tk_PreserveColormap) (Display * display, Colormap colormap); /* 153 */ + void (*tk_QueueWindowEvent) (XEvent * eventPtr, Tcl_QueuePosition position); /* 154 */ void (*tk_RedrawImage) (Tk_Image image, int imageX, int imageY, int width, int height, Drawable drawable, int drawableX, int drawableY); /* 155 */ void (*tk_ResizeWindow) (Tk_Window tkwin, int width, int height); /* 156 */ int (*tk_RestackWindow) (Tk_Window tkwin, int aboveBelow, Tk_Window other); /* 157 */ - Tk_RestrictProc * (*tk_RestrictEvents) (Tk_RestrictProc *proc, ClientData arg, ClientData *prevArgPtr); /* 158 */ - int (*tk_SafeInit) (Tcl_Interp *interp); /* 159 */ - CONST char * (*tk_SetAppName) (Tk_Window tkwin, CONST char *name); /* 160 */ + Tk_RestrictProc * (*tk_RestrictEvents) (Tk_RestrictProc * proc, ClientData arg, ClientData * prevArgPtr); /* 158 */ + int (*tk_SafeInit) (Tcl_Interp * interp); /* 159 */ + CONST char * (*tk_SetAppName) (Tk_Window tkwin, CONST char * name); /* 160 */ void (*tk_SetBackgroundFromBorder) (Tk_Window tkwin, Tk_3DBorder border); /* 161 */ - void (*tk_SetClass) (Tk_Window tkwin, CONST char *className); /* 162 */ + void (*tk_SetClass) (Tk_Window tkwin, CONST char * className); /* 162 */ void (*tk_SetGrid) (Tk_Window tkwin, int reqWidth, int reqHeight, int gridWidth, int gridHeight); /* 163 */ void (*tk_SetInternalBorder) (Tk_Window tkwin, int width); /* 164 */ void (*tk_SetWindowBackground) (Tk_Window tkwin, unsigned long pixel); /* 165 */ @@ -1859,109 +1877,109 @@ typedef struct TkStubs { void (*tk_SetWindowBorderWidth) (Tk_Window tkwin, int width); /* 168 */ void (*tk_SetWindowBorderPixmap) (Tk_Window tkwin, Pixmap pixmap); /* 169 */ void (*tk_SetWindowColormap) (Tk_Window tkwin, Colormap colormap); /* 170 */ - int (*tk_SetWindowVisual) (Tk_Window tkwin, Visual *visual, int depth, Colormap colormap); /* 171 */ - void (*tk_SizeOfBitmap) (Display *display, Pixmap bitmap, int *widthPtr, int *heightPtr); /* 172 */ - void (*tk_SizeOfImage) (Tk_Image image, int *widthPtr, int *heightPtr); /* 173 */ + int (*tk_SetWindowVisual) (Tk_Window tkwin, Visual * visual, int depth, Colormap colormap); /* 171 */ + void (*tk_SizeOfBitmap) (Display * display, Pixmap bitmap, int * widthPtr, int * heightPtr); /* 172 */ + void (*tk_SizeOfImage) (Tk_Image image, int * widthPtr, int * heightPtr); /* 173 */ int (*tk_StrictMotif) (Tk_Window tkwin); /* 174 */ - void (*tk_TextLayoutToPostscript) (Tcl_Interp *interp, Tk_TextLayout layout); /* 175 */ - int (*tk_TextWidth) (Tk_Font font, CONST char *str, int numBytes); /* 176 */ + void (*tk_TextLayoutToPostscript) (Tcl_Interp * interp, Tk_TextLayout layout); /* 175 */ + int (*tk_TextWidth) (Tk_Font font, CONST char * str, int numBytes); /* 176 */ void (*tk_UndefineCursor) (Tk_Window window); /* 177 */ - void (*tk_UnderlineChars) (Display *display, Drawable drawable, GC gc, Tk_Font tkfont, CONST char *source, int x, int y, int firstByte, int lastByte); /* 178 */ - void (*tk_UnderlineTextLayout) (Display *display, Drawable drawable, GC gc, Tk_TextLayout layout, int x, int y, int underline); /* 179 */ + void (*tk_UnderlineChars) (Display * display, Drawable drawable, GC gc, Tk_Font tkfont, CONST char * source, int x, int y, int firstByte, int lastByte); /* 178 */ + void (*tk_UnderlineTextLayout) (Display * display, Drawable drawable, GC gc, Tk_TextLayout layout, int x, int y, int underline); /* 179 */ void (*tk_Ungrab) (Tk_Window tkwin); /* 180 */ void (*tk_UnmaintainGeometry) (Tk_Window slave, Tk_Window master); /* 181 */ void (*tk_UnmapWindow) (Tk_Window tkwin); /* 182 */ void (*tk_UnsetGrid) (Tk_Window tkwin); /* 183 */ void (*tk_UpdatePointer) (Tk_Window tkwin, int x, int y, int state); /* 184 */ - Pixmap (*tk_AllocBitmapFromObj) (Tcl_Interp *interp, Tk_Window tkwin, Tcl_Obj *objPtr); /* 185 */ - Tk_3DBorder (*tk_Alloc3DBorderFromObj) (Tcl_Interp *interp, Tk_Window tkwin, Tcl_Obj *objPtr); /* 186 */ - XColor * (*tk_AllocColorFromObj) (Tcl_Interp *interp, Tk_Window tkwin, Tcl_Obj *objPtr); /* 187 */ - Tk_Cursor (*tk_AllocCursorFromObj) (Tcl_Interp *interp, Tk_Window tkwin, Tcl_Obj *objPtr); /* 188 */ - Tk_Font (*tk_AllocFontFromObj) (Tcl_Interp *interp, Tk_Window tkwin, Tcl_Obj *objPtr); /* 189 */ - Tk_OptionTable (*tk_CreateOptionTable) (Tcl_Interp *interp, CONST Tk_OptionSpec *templatePtr); /* 190 */ + Pixmap (*tk_AllocBitmapFromObj) (Tcl_Interp * interp, Tk_Window tkwin, Tcl_Obj * objPtr); /* 185 */ + Tk_3DBorder (*tk_Alloc3DBorderFromObj) (Tcl_Interp * interp, Tk_Window tkwin, Tcl_Obj * objPtr); /* 186 */ + XColor * (*tk_AllocColorFromObj) (Tcl_Interp * interp, Tk_Window tkwin, Tcl_Obj * objPtr); /* 187 */ + Tk_Cursor (*tk_AllocCursorFromObj) (Tcl_Interp * interp, Tk_Window tkwin, Tcl_Obj * objPtr); /* 188 */ + Tk_Font (*tk_AllocFontFromObj) (Tcl_Interp * interp, Tk_Window tkwin, Tcl_Obj * objPtr); /* 189 */ + Tk_OptionTable (*tk_CreateOptionTable) (Tcl_Interp * interp, CONST Tk_OptionSpec * templatePtr); /* 190 */ void (*tk_DeleteOptionTable) (Tk_OptionTable optionTable); /* 191 */ - void (*tk_Free3DBorderFromObj) (Tk_Window tkwin, Tcl_Obj *objPtr); /* 192 */ - void (*tk_FreeBitmapFromObj) (Tk_Window tkwin, Tcl_Obj *objPtr); /* 193 */ - void (*tk_FreeColorFromObj) (Tk_Window tkwin, Tcl_Obj *objPtr); /* 194 */ - void (*tk_FreeConfigOptions) (char *recordPtr, Tk_OptionTable optionToken, Tk_Window tkwin); /* 195 */ - void (*tk_FreeSavedOptions) (Tk_SavedOptions *savePtr); /* 196 */ - void (*tk_FreeCursorFromObj) (Tk_Window tkwin, Tcl_Obj *objPtr); /* 197 */ - void (*tk_FreeFontFromObj) (Tk_Window tkwin, Tcl_Obj *objPtr); /* 198 */ - Tk_3DBorder (*tk_Get3DBorderFromObj) (Tk_Window tkwin, Tcl_Obj *objPtr); /* 199 */ - int (*tk_GetAnchorFromObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, Tk_Anchor *anchorPtr); /* 200 */ - Pixmap (*tk_GetBitmapFromObj) (Tk_Window tkwin, Tcl_Obj *objPtr); /* 201 */ - XColor * (*tk_GetColorFromObj) (Tk_Window tkwin, Tcl_Obj *objPtr); /* 202 */ - Tk_Cursor (*tk_GetCursorFromObj) (Tk_Window tkwin, Tcl_Obj *objPtr); /* 203 */ - Tcl_Obj * (*tk_GetOptionInfo) (Tcl_Interp *interp, char *recordPtr, Tk_OptionTable optionTable, Tcl_Obj *namePtr, Tk_Window tkwin); /* 204 */ - Tcl_Obj * (*tk_GetOptionValue) (Tcl_Interp *interp, char *recordPtr, Tk_OptionTable optionTable, Tcl_Obj *namePtr, Tk_Window tkwin); /* 205 */ - int (*tk_GetJustifyFromObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, Tk_Justify *justifyPtr); /* 206 */ - int (*tk_GetMMFromObj) (Tcl_Interp *interp, Tk_Window tkwin, Tcl_Obj *objPtr, double *doublePtr); /* 207 */ - int (*tk_GetPixelsFromObj) (Tcl_Interp *interp, Tk_Window tkwin, Tcl_Obj *objPtr, int *intPtr); /* 208 */ - int (*tk_GetReliefFromObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, int *resultPtr); /* 209 */ - int (*tk_GetScrollInfoObj) (Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[], double *dblPtr, int *intPtr); /* 210 */ - int (*tk_InitOptions) (Tcl_Interp *interp, char *recordPtr, Tk_OptionTable optionToken, Tk_Window tkwin); /* 211 */ - void (*tk_MainEx) (int argc, char **argv, Tcl_AppInitProc *appInitProc, Tcl_Interp *interp); /* 212 */ - void (*tk_RestoreSavedOptions) (Tk_SavedOptions *savePtr); /* 213 */ - int (*tk_SetOptions) (Tcl_Interp *interp, char *recordPtr, Tk_OptionTable optionTable, int objc, Tcl_Obj *CONST objv[], Tk_Window tkwin, Tk_SavedOptions *savePtr, int *maskPtr); /* 214 */ - void (*tk_InitConsoleChannels) (Tcl_Interp *interp); /* 215 */ - int (*tk_CreateConsoleWindow) (Tcl_Interp *interp); /* 216 */ - void (*tk_CreateSmoothMethod) (Tcl_Interp *interp, Tk_SmoothMethod *method); /* 217 */ + void (*tk_Free3DBorderFromObj) (Tk_Window tkwin, Tcl_Obj * objPtr); /* 192 */ + void (*tk_FreeBitmapFromObj) (Tk_Window tkwin, Tcl_Obj * objPtr); /* 193 */ + void (*tk_FreeColorFromObj) (Tk_Window tkwin, Tcl_Obj * objPtr); /* 194 */ + void (*tk_FreeConfigOptions) (char * recordPtr, Tk_OptionTable optionToken, Tk_Window tkwin); /* 195 */ + void (*tk_FreeSavedOptions) (Tk_SavedOptions * savePtr); /* 196 */ + void (*tk_FreeCursorFromObj) (Tk_Window tkwin, Tcl_Obj * objPtr); /* 197 */ + void (*tk_FreeFontFromObj) (Tk_Window tkwin, Tcl_Obj * objPtr); /* 198 */ + Tk_3DBorder (*tk_Get3DBorderFromObj) (Tk_Window tkwin, Tcl_Obj * objPtr); /* 199 */ + int (*tk_GetAnchorFromObj) (Tcl_Interp * interp, Tcl_Obj * objPtr, Tk_Anchor * anchorPtr); /* 200 */ + Pixmap (*tk_GetBitmapFromObj) (Tk_Window tkwin, Tcl_Obj * objPtr); /* 201 */ + XColor * (*tk_GetColorFromObj) (Tk_Window tkwin, Tcl_Obj * objPtr); /* 202 */ + Tk_Cursor (*tk_GetCursorFromObj) (Tk_Window tkwin, Tcl_Obj * objPtr); /* 203 */ + Tcl_Obj * (*tk_GetOptionInfo) (Tcl_Interp * interp, char * recordPtr, Tk_OptionTable optionTable, Tcl_Obj * namePtr, Tk_Window tkwin); /* 204 */ + Tcl_Obj * (*tk_GetOptionValue) (Tcl_Interp * interp, char * recordPtr, Tk_OptionTable optionTable, Tcl_Obj * namePtr, Tk_Window tkwin); /* 205 */ + int (*tk_GetJustifyFromObj) (Tcl_Interp * interp, Tcl_Obj * objPtr, Tk_Justify * justifyPtr); /* 206 */ + int (*tk_GetMMFromObj) (Tcl_Interp * interp, Tk_Window tkwin, Tcl_Obj * objPtr, double * doublePtr); /* 207 */ + int (*tk_GetPixelsFromObj) (Tcl_Interp * interp, Tk_Window tkwin, Tcl_Obj * objPtr, int * intPtr); /* 208 */ + int (*tk_GetReliefFromObj) (Tcl_Interp * interp, Tcl_Obj * objPtr, int * resultPtr); /* 209 */ + int (*tk_GetScrollInfoObj) (Tcl_Interp * interp, int objc, Tcl_Obj *CONST objv[], double * dblPtr, int * intPtr); /* 210 */ + int (*tk_InitOptions) (Tcl_Interp * interp, char * recordPtr, Tk_OptionTable optionToken, Tk_Window tkwin); /* 211 */ + void (*tk_MainEx) (int argc, char ** argv, Tcl_AppInitProc * appInitProc, Tcl_Interp * interp); /* 212 */ + void (*tk_RestoreSavedOptions) (Tk_SavedOptions * savePtr); /* 213 */ + int (*tk_SetOptions) (Tcl_Interp * interp, char * recordPtr, Tk_OptionTable optionTable, int objc, Tcl_Obj *CONST objv[], Tk_Window tkwin, Tk_SavedOptions * savePtr, int * maskPtr); /* 214 */ + void (*tk_InitConsoleChannels) (Tcl_Interp * interp); /* 215 */ + int (*tk_CreateConsoleWindow) (Tcl_Interp * interp); /* 216 */ + void (*tk_CreateSmoothMethod) (Tcl_Interp * interp, Tk_SmoothMethod * method); /* 217 */ void *reserved218; void *reserved219; - int (*tk_GetDash) (Tcl_Interp *interp, CONST char *value, Tk_Dash *dash); /* 220 */ - void (*tk_CreateOutline) (Tk_Outline *outline); /* 221 */ - void (*tk_DeleteOutline) (Display *display, Tk_Outline *outline); /* 222 */ - int (*tk_ConfigOutlineGC) (XGCValues *gcValues, Tk_Canvas canvas, Tk_Item *item, Tk_Outline *outline); /* 223 */ - int (*tk_ChangeOutlineGC) (Tk_Canvas canvas, Tk_Item *item, Tk_Outline *outline); /* 224 */ - int (*tk_ResetOutlineGC) (Tk_Canvas canvas, Tk_Item *item, Tk_Outline *outline); /* 225 */ - int (*tk_CanvasPsOutline) (Tk_Canvas canvas, Tk_Item *item, Tk_Outline *outline); /* 226 */ + int (*tk_GetDash) (Tcl_Interp * interp, CONST char * value, Tk_Dash * dash); /* 220 */ + void (*tk_CreateOutline) (Tk_Outline * outline); /* 221 */ + void (*tk_DeleteOutline) (Display * display, Tk_Outline * outline); /* 222 */ + int (*tk_ConfigOutlineGC) (XGCValues * gcValues, Tk_Canvas canvas, Tk_Item * item, Tk_Outline * outline); /* 223 */ + int (*tk_ChangeOutlineGC) (Tk_Canvas canvas, Tk_Item * item, Tk_Outline * outline); /* 224 */ + int (*tk_ResetOutlineGC) (Tk_Canvas canvas, Tk_Item * item, Tk_Outline * outline); /* 225 */ + int (*tk_CanvasPsOutline) (Tk_Canvas canvas, Tk_Item * item, Tk_Outline * outline); /* 226 */ void (*tk_SetTSOrigin) (Tk_Window tkwin, GC gc, int x, int y); /* 227 */ - int (*tk_CanvasGetCoordFromObj) (Tcl_Interp *interp, Tk_Canvas canvas, Tcl_Obj *obj, double *doublePtr); /* 228 */ - void (*tk_CanvasSetOffset) (Tk_Canvas canvas, GC gc, Tk_TSOffset *offset); /* 229 */ + int (*tk_CanvasGetCoordFromObj) (Tcl_Interp * interp, Tk_Canvas canvas, Tcl_Obj * obj, double * doublePtr); /* 228 */ + void (*tk_CanvasSetOffset) (Tk_Canvas canvas, GC gc, Tk_TSOffset * offset); /* 229 */ void (*tk_DitherPhoto) (Tk_PhotoHandle handle, int x, int y, int width, int height); /* 230 */ - int (*tk_PostscriptBitmap) (Tcl_Interp *interp, Tk_Window tkwin, Tk_PostscriptInfo psInfo, Pixmap bitmap, int startX, int startY, int width, int height); /* 231 */ - int (*tk_PostscriptColor) (Tcl_Interp *interp, Tk_PostscriptInfo psInfo, XColor *colorPtr); /* 232 */ - int (*tk_PostscriptFont) (Tcl_Interp *interp, Tk_PostscriptInfo psInfo, Tk_Font font); /* 233 */ - int (*tk_PostscriptImage) (Tk_Image image, Tcl_Interp *interp, Tk_Window tkwin, Tk_PostscriptInfo psinfo, int x, int y, int width, int height, int prepass); /* 234 */ - void (*tk_PostscriptPath) (Tcl_Interp *interp, Tk_PostscriptInfo psInfo, double *coordPtr, int numPoints); /* 235 */ - int (*tk_PostscriptStipple) (Tcl_Interp *interp, Tk_Window tkwin, Tk_PostscriptInfo psInfo, Pixmap bitmap); /* 236 */ + int (*tk_PostscriptBitmap) (Tcl_Interp * interp, Tk_Window tkwin, Tk_PostscriptInfo psInfo, Pixmap bitmap, int startX, int startY, int width, int height); /* 231 */ + int (*tk_PostscriptColor) (Tcl_Interp * interp, Tk_PostscriptInfo psInfo, XColor * colorPtr); /* 232 */ + int (*tk_PostscriptFont) (Tcl_Interp * interp, Tk_PostscriptInfo psInfo, Tk_Font font); /* 233 */ + int (*tk_PostscriptImage) (Tk_Image image, Tcl_Interp * interp, Tk_Window tkwin, Tk_PostscriptInfo psinfo, int x, int y, int width, int height, int prepass); /* 234 */ + void (*tk_PostscriptPath) (Tcl_Interp * interp, Tk_PostscriptInfo psInfo, double * coordPtr, int numPoints); /* 235 */ + int (*tk_PostscriptStipple) (Tcl_Interp * interp, Tk_Window tkwin, Tk_PostscriptInfo psInfo, Pixmap bitmap); /* 236 */ double (*tk_PostscriptY) (double y, Tk_PostscriptInfo psInfo); /* 237 */ - int (*tk_PostscriptPhoto) (Tcl_Interp *interp, Tk_PhotoImageBlock *blockPtr, Tk_PostscriptInfo psInfo, int width, int height); /* 238 */ - void (*tk_CreateClientMessageHandler) (Tk_ClientMessageProc *proc); /* 239 */ - void (*tk_DeleteClientMessageHandler) (Tk_ClientMessageProc *proc); /* 240 */ - Tk_Window (*tk_CreateAnonymousWindow) (Tcl_Interp *interp, Tk_Window parent, CONST char *screenName); /* 241 */ - void (*tk_SetClassProcs) (Tk_Window tkwin, Tk_ClassProcs *procs, ClientData instanceData); /* 242 */ + int (*tk_PostscriptPhoto) (Tcl_Interp * interp, Tk_PhotoImageBlock * blockPtr, Tk_PostscriptInfo psInfo, int width, int height); /* 238 */ + void (*tk_CreateClientMessageHandler) (Tk_ClientMessageProc * proc); /* 239 */ + void (*tk_DeleteClientMessageHandler) (Tk_ClientMessageProc * proc); /* 240 */ + Tk_Window (*tk_CreateAnonymousWindow) (Tcl_Interp * interp, Tk_Window parent, CONST char * screenName); /* 241 */ + void (*tk_SetClassProcs) (Tk_Window tkwin, Tk_ClassProcs * procs, ClientData instanceData); /* 242 */ void (*tk_SetInternalBorderEx) (Tk_Window tkwin, int left, int right, int top, int bottom); /* 243 */ void (*tk_SetMinimumRequestSize) (Tk_Window tkwin, int minWidth, int minHeight); /* 244 */ void (*tk_SetCaretPos) (Tk_Window tkwin, int x, int y, int height); /* 245 */ - void (*tk_PhotoPutBlock_Panic) (Tk_PhotoHandle handle, Tk_PhotoImageBlock *blockPtr, int x, int y, int width, int height, int compRule); /* 246 */ - void (*tk_PhotoPutZoomedBlock_Panic) (Tk_PhotoHandle handle, Tk_PhotoImageBlock *blockPtr, int x, int y, int width, int height, int zoomX, int zoomY, int subsampleX, int subsampleY, int compRule); /* 247 */ - int (*tk_CollapseMotionEvents) (Display *display, int collapse); /* 248 */ - Tk_StyleEngine (*tk_RegisterStyleEngine) (CONST char *name, Tk_StyleEngine parent); /* 249 */ - Tk_StyleEngine (*tk_GetStyleEngine) (CONST char *name); /* 250 */ - int (*tk_RegisterStyledElement) (Tk_StyleEngine engine, Tk_ElementSpec *templatePtr); /* 251 */ - int (*tk_GetElementId) (CONST char *name); /* 252 */ - Tk_Style (*tk_CreateStyle) (CONST char *name, Tk_StyleEngine engine, ClientData clientData); /* 253 */ - Tk_Style (*tk_GetStyle) (Tcl_Interp *interp, CONST char *name); /* 254 */ + void (*tk_PhotoPutBlock_Panic) (Tk_PhotoHandle handle, Tk_PhotoImageBlock * blockPtr, int x, int y, int width, int height, int compRule); /* 246 */ + void (*tk_PhotoPutZoomedBlock_Panic) (Tk_PhotoHandle handle, Tk_PhotoImageBlock * blockPtr, int x, int y, int width, int height, int zoomX, int zoomY, int subsampleX, int subsampleY, int compRule); /* 247 */ + int (*tk_CollapseMotionEvents) (Display * display, int collapse); /* 248 */ + Tk_StyleEngine (*tk_RegisterStyleEngine) (CONST char * name, Tk_StyleEngine parent); /* 249 */ + Tk_StyleEngine (*tk_GetStyleEngine) (CONST char * name); /* 250 */ + int (*tk_RegisterStyledElement) (Tk_StyleEngine engine, Tk_ElementSpec * templatePtr); /* 251 */ + int (*tk_GetElementId) (CONST char * name); /* 252 */ + Tk_Style (*tk_CreateStyle) (CONST char * name, Tk_StyleEngine engine, ClientData clientData); /* 253 */ + Tk_Style (*tk_GetStyle) (Tcl_Interp * interp, CONST char * name); /* 254 */ void (*tk_FreeStyle) (Tk_Style style); /* 255 */ CONST char * (*tk_NameOfStyle) (Tk_Style style); /* 256 */ - Tk_Style (*tk_AllocStyleFromObj) (Tcl_Interp *interp, Tcl_Obj *objPtr); /* 257 */ - Tk_Style (*tk_GetStyleFromObj) (Tcl_Obj *objPtr); /* 258 */ - void (*tk_FreeStyleFromObj) (Tcl_Obj *objPtr); /* 259 */ + Tk_Style (*tk_AllocStyleFromObj) (Tcl_Interp * interp, Tcl_Obj * objPtr); /* 257 */ + Tk_Style (*tk_GetStyleFromObj) (Tcl_Obj * objPtr); /* 258 */ + void (*tk_FreeStyleFromObj) (Tcl_Obj * objPtr); /* 259 */ Tk_StyledElement (*tk_GetStyledElement) (Tk_Style style, int elementId, Tk_OptionTable optionTable); /* 260 */ - void (*tk_GetElementSize) (Tk_Style style, Tk_StyledElement element, char *recordPtr, Tk_Window tkwin, int width, int height, int inner, int *widthPtr, int *heightPtr); /* 261 */ - void (*tk_GetElementBox) (Tk_Style style, Tk_StyledElement element, char *recordPtr, Tk_Window tkwin, int x, int y, int width, int height, int inner, int *xPtr, int *yPtr, int *widthPtr, int *heightPtr); /* 262 */ - int (*tk_GetElementBorderWidth) (Tk_Style style, Tk_StyledElement element, char *recordPtr, Tk_Window tkwin); /* 263 */ - void (*tk_DrawElement) (Tk_Style style, Tk_StyledElement element, char *recordPtr, Tk_Window tkwin, Drawable d, int x, int y, int width, int height, int state); /* 264 */ - int (*tk_PhotoExpand) (Tcl_Interp *interp, Tk_PhotoHandle handle, int width, int height); /* 265 */ - int (*tk_PhotoPutBlock) (Tcl_Interp *interp, Tk_PhotoHandle handle, Tk_PhotoImageBlock *blockPtr, int x, int y, int width, int height, int compRule); /* 266 */ - int (*tk_PhotoPutZoomedBlock) (Tcl_Interp *interp, Tk_PhotoHandle handle, Tk_PhotoImageBlock *blockPtr, int x, int y, int width, int height, int zoomX, int zoomY, int subsampleX, int subsampleY, int compRule); /* 267 */ - int (*tk_PhotoSetSize) (Tcl_Interp *interp, Tk_PhotoHandle handle, int width, int height); /* 268 */ - long (*tk_GetUserInactiveTime) (Display *dpy); /* 269 */ - void (*tk_ResetUserInactiveTime) (Display *dpy); /* 270 */ + void (*tk_GetElementSize) (Tk_Style style, Tk_StyledElement element, char * recordPtr, Tk_Window tkwin, int width, int height, int inner, int * widthPtr, int * heightPtr); /* 261 */ + void (*tk_GetElementBox) (Tk_Style style, Tk_StyledElement element, char * recordPtr, Tk_Window tkwin, int x, int y, int width, int height, int inner, int * xPtr, int * yPtr, int * widthPtr, int * heightPtr); /* 262 */ + int (*tk_GetElementBorderWidth) (Tk_Style style, Tk_StyledElement element, char * recordPtr, Tk_Window tkwin); /* 263 */ + void (*tk_DrawElement) (Tk_Style style, Tk_StyledElement element, char * recordPtr, Tk_Window tkwin, Drawable d, int x, int y, int width, int height, int state); /* 264 */ + int (*tk_PhotoExpand) (Tcl_Interp * interp, Tk_PhotoHandle handle, int width, int height); /* 265 */ + int (*tk_PhotoPutBlock) (Tcl_Interp * interp, Tk_PhotoHandle handle, Tk_PhotoImageBlock * blockPtr, int x, int y, int width, int height, int compRule); /* 266 */ + int (*tk_PhotoPutZoomedBlock) (Tcl_Interp * interp, Tk_PhotoHandle handle, Tk_PhotoImageBlock * blockPtr, int x, int y, int width, int height, int zoomX, int zoomY, int subsampleX, int subsampleY, int compRule); /* 267 */ + int (*tk_PhotoSetSize) (Tcl_Interp * interp, Tk_PhotoHandle handle, int width, int height); /* 268 */ + long (*tk_GetUserInactiveTime) (Display * dpy); /* 269 */ + void (*tk_ResetUserInactiveTime) (Display * dpy); /* 270 */ Tcl_Interp * (*tk_Interp) (Tk_Window tkwin); /* 271 */ - void (*tk_CreateOldImageType) (Tk_ImageType *typePtr); /* 272 */ - void (*tk_CreateOldPhotoImageFormat) (Tk_PhotoImageFormat *formatPtr); /* 273 */ + void (*tk_CreateOldImageType) (Tk_ImageType * typePtr); /* 272 */ + void (*tk_CreateOldPhotoImageFormat) (Tk_PhotoImageFormat * formatPtr); /* 273 */ } TkStubs; #ifdef __cplusplus diff --git a/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/include/tkPlatDecls.h b/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/include/tkPlatDecls.h index 5ea29994badf52f225fcc7c027535c38d6773c91..e311c1290b66976cc8296d427c1c84ee98dbbac5 100644 --- a/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/include/tkPlatDecls.h +++ b/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/include/tkPlatDecls.h @@ -8,7 +8,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkPlatDecls.h,v 1.15.2.1 2010/02/07 23:24:13 nijtmans Exp $ + * RCS: @(#) $Id: tkPlatDecls.h,v 1.15 2007/12/13 15:24:16 dgp Exp $ */ #ifndef _TKPLATDECLS @@ -35,97 +35,97 @@ #ifndef Tk_AttachHWND_TCL_DECLARED #define Tk_AttachHWND_TCL_DECLARED /* 0 */ -EXTERN Window Tk_AttachHWND(Tk_Window tkwin, HWND hwnd); +EXTERN Window Tk_AttachHWND (Tk_Window tkwin, HWND hwnd); #endif #ifndef Tk_GetHINSTANCE_TCL_DECLARED #define Tk_GetHINSTANCE_TCL_DECLARED /* 1 */ -EXTERN HINSTANCE Tk_GetHINSTANCE(void); +EXTERN HINSTANCE Tk_GetHINSTANCE (void); #endif #ifndef Tk_GetHWND_TCL_DECLARED #define Tk_GetHWND_TCL_DECLARED /* 2 */ -EXTERN HWND Tk_GetHWND(Window window); +EXTERN HWND Tk_GetHWND (Window window); #endif #ifndef Tk_HWNDToWindow_TCL_DECLARED #define Tk_HWNDToWindow_TCL_DECLARED /* 3 */ -EXTERN Tk_Window Tk_HWNDToWindow(HWND hwnd); +EXTERN Tk_Window Tk_HWNDToWindow (HWND hwnd); #endif #ifndef Tk_PointerEvent_TCL_DECLARED #define Tk_PointerEvent_TCL_DECLARED /* 4 */ -EXTERN void Tk_PointerEvent(HWND hwnd, int x, int y); +EXTERN void Tk_PointerEvent (HWND hwnd, int x, int y); #endif #ifndef Tk_TranslateWinEvent_TCL_DECLARED #define Tk_TranslateWinEvent_TCL_DECLARED /* 5 */ -EXTERN int Tk_TranslateWinEvent(HWND hwnd, UINT message, - WPARAM wParam, LPARAM lParam, - LRESULT *result); +EXTERN int Tk_TranslateWinEvent (HWND hwnd, UINT message, + WPARAM wParam, LPARAM lParam, + LRESULT * result); #endif #endif /* WIN */ #ifdef MAC_OSX_TK /* AQUA */ #ifndef Tk_MacOSXSetEmbedHandler_TCL_DECLARED #define Tk_MacOSXSetEmbedHandler_TCL_DECLARED /* 0 */ -EXTERN void Tk_MacOSXSetEmbedHandler( - Tk_MacOSXEmbedRegisterWinProc *registerWinProcPtr, - Tk_MacOSXEmbedGetGrafPortProc *getPortProcPtr, - Tk_MacOSXEmbedMakeContainerExistProc *containerExistProcPtr, - Tk_MacOSXEmbedGetClipProc *getClipProc, - Tk_MacOSXEmbedGetOffsetInParentProc *getOffsetProc); +EXTERN void Tk_MacOSXSetEmbedHandler ( + Tk_MacOSXEmbedRegisterWinProc * registerWinProcPtr, + Tk_MacOSXEmbedGetGrafPortProc * getPortProcPtr, + Tk_MacOSXEmbedMakeContainerExistProc * containerExistProcPtr, + Tk_MacOSXEmbedGetClipProc * getClipProc, + Tk_MacOSXEmbedGetOffsetInParentProc * getOffsetProc); #endif #ifndef Tk_MacOSXTurnOffMenus_TCL_DECLARED #define Tk_MacOSXTurnOffMenus_TCL_DECLARED /* 1 */ -EXTERN void Tk_MacOSXTurnOffMenus(void); +EXTERN void Tk_MacOSXTurnOffMenus (void); #endif #ifndef Tk_MacOSXTkOwnsCursor_TCL_DECLARED #define Tk_MacOSXTkOwnsCursor_TCL_DECLARED /* 2 */ -EXTERN void Tk_MacOSXTkOwnsCursor(int tkOwnsIt); +EXTERN void Tk_MacOSXTkOwnsCursor (int tkOwnsIt); #endif #ifndef TkMacOSXInitMenus_TCL_DECLARED #define TkMacOSXInitMenus_TCL_DECLARED /* 3 */ -EXTERN void TkMacOSXInitMenus(Tcl_Interp *interp); +EXTERN void TkMacOSXInitMenus (Tcl_Interp * interp); #endif #ifndef TkMacOSXInitAppleEvents_TCL_DECLARED #define TkMacOSXInitAppleEvents_TCL_DECLARED /* 4 */ -EXTERN void TkMacOSXInitAppleEvents(Tcl_Interp *interp); +EXTERN void TkMacOSXInitAppleEvents (Tcl_Interp * interp); #endif #ifndef TkGenWMConfigureEvent_TCL_DECLARED #define TkGenWMConfigureEvent_TCL_DECLARED /* 5 */ -EXTERN void TkGenWMConfigureEvent(Tk_Window tkwin, int x, int y, +EXTERN void TkGenWMConfigureEvent (Tk_Window tkwin, int x, int y, int width, int height, int flags); #endif #ifndef TkMacOSXInvalClipRgns_TCL_DECLARED #define TkMacOSXInvalClipRgns_TCL_DECLARED /* 6 */ -EXTERN void TkMacOSXInvalClipRgns(Tk_Window tkwin); +EXTERN void TkMacOSXInvalClipRgns (Tk_Window tkwin); #endif #ifndef TkMacOSXGetDrawablePort_TCL_DECLARED #define TkMacOSXGetDrawablePort_TCL_DECLARED /* 7 */ -EXTERN GWorldPtr TkMacOSXGetDrawablePort(Drawable drawable); +EXTERN GWorldPtr TkMacOSXGetDrawablePort (Drawable drawable); #endif #ifndef TkMacOSXGetRootControl_TCL_DECLARED #define TkMacOSXGetRootControl_TCL_DECLARED /* 8 */ -EXTERN ControlRef TkMacOSXGetRootControl(Drawable drawable); +EXTERN ControlRef TkMacOSXGetRootControl (Drawable drawable); #endif #ifndef Tk_MacOSXSetupTkNotifier_TCL_DECLARED #define Tk_MacOSXSetupTkNotifier_TCL_DECLARED /* 9 */ -EXTERN void Tk_MacOSXSetupTkNotifier(void); +EXTERN void Tk_MacOSXSetupTkNotifier (void); #endif #ifndef Tk_MacOSXIsAppInFront_TCL_DECLARED #define Tk_MacOSXIsAppInFront_TCL_DECLARED /* 10 */ -EXTERN int Tk_MacOSXIsAppInFront(void); +EXTERN int Tk_MacOSXIsAppInFront (void); #endif #endif /* AQUA */ @@ -139,14 +139,14 @@ typedef struct TkPlatStubs { HWND (*tk_GetHWND) (Window window); /* 2 */ Tk_Window (*tk_HWNDToWindow) (HWND hwnd); /* 3 */ void (*tk_PointerEvent) (HWND hwnd, int x, int y); /* 4 */ - int (*tk_TranslateWinEvent) (HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam, LRESULT *result); /* 5 */ + int (*tk_TranslateWinEvent) (HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam, LRESULT * result); /* 5 */ #endif /* WIN */ #ifdef MAC_OSX_TK /* AQUA */ - void (*tk_MacOSXSetEmbedHandler) (Tk_MacOSXEmbedRegisterWinProc *registerWinProcPtr, Tk_MacOSXEmbedGetGrafPortProc *getPortProcPtr, Tk_MacOSXEmbedMakeContainerExistProc *containerExistProcPtr, Tk_MacOSXEmbedGetClipProc *getClipProc, Tk_MacOSXEmbedGetOffsetInParentProc *getOffsetProc); /* 0 */ + void (*tk_MacOSXSetEmbedHandler) (Tk_MacOSXEmbedRegisterWinProc * registerWinProcPtr, Tk_MacOSXEmbedGetGrafPortProc * getPortProcPtr, Tk_MacOSXEmbedMakeContainerExistProc * containerExistProcPtr, Tk_MacOSXEmbedGetClipProc * getClipProc, Tk_MacOSXEmbedGetOffsetInParentProc * getOffsetProc); /* 0 */ void (*tk_MacOSXTurnOffMenus) (void); /* 1 */ void (*tk_MacOSXTkOwnsCursor) (int tkOwnsIt); /* 2 */ - void (*tkMacOSXInitMenus) (Tcl_Interp *interp); /* 3 */ - void (*tkMacOSXInitAppleEvents) (Tcl_Interp *interp); /* 4 */ + void (*tkMacOSXInitMenus) (Tcl_Interp * interp); /* 3 */ + void (*tkMacOSXInitAppleEvents) (Tcl_Interp * interp); /* 4 */ void (*tkGenWMConfigureEvent) (Tk_Window tkwin, int x, int y, int width, int height, int flags); /* 5 */ void (*tkMacOSXInvalClipRgns) (Tk_Window tkwin); /* 6 */ GWorldPtr (*tkMacOSXGetDrawablePort) (Drawable drawable); /* 7 */ diff --git a/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tcl8.5/clock.tcl b/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tcl8.5/clock.tcl index 4e7df3130353e5a9ca96a15ed66748581c56c7c2..c657234d7be9a16c6e0c497aac1717240623a660 100644 --- a/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tcl8.5/clock.tcl +++ b/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tcl8.5/clock.tcl @@ -13,7 +13,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# RCS: @(#) $Id: clock.tcl,v 1.47.2.9 2009/10/29 01:17:03 kennykb Exp $ +# RCS: @(#) $Id: clock.tcl,v 1.47 2008/02/27 02:08:27 kennykb Exp $ # #---------------------------------------------------------------------- @@ -687,8 +687,7 @@ proc ::tcl::clock::format { args } { # name in the 'FormatProc' array to avoid losing its internal # representation, which contains the name resolution. - set procName formatproc'$format'$locale - set procName [namespace current]::[string map {: {\:} \\ {\\}} $procName] + set procName ::tcl::clock::formatproc'$format'$locale if {[info exists FormatProc($procName)]} { set procName $FormatProc($procName) } else { @@ -1369,7 +1368,7 @@ proc ::tcl::clock::FreeScan { string base timezone locale } { [dict get $date dayOfMonth] } result] if { $status != 0 } { - return -code error "unable to convert date-time string \"$string\": $result" + return -code error "unable to convert date-time string \"$string\"" } lassign $result parseDate parseTime parseZone parseRel \ @@ -1532,8 +1531,7 @@ proc ::tcl::clock::ParseClockScanFormat {formatString locale} { # Check whether the format has been parsed previously, and return # the existing recognizer if it has. - set procName scanproc'$formatString'$locale - set procName [namespace current]::[string map {: {\:} \\ {\\}} $procName] + set procName [namespace current]::scanproc'$formatString'$locale if { [namespace which $procName] != {} } { return $procName } @@ -1996,20 +1994,6 @@ proc ::tcl::clock::ParseClockScanFormat {formatString locale} { append procBody $postcode append procBody [list set changeover [mc GREGORIAN_CHANGE_DATE]] \n - # Get time zone if needed - - if { ![dict exists $fieldSet seconds] - && ![dict exists $fieldSet starDate] } { - if { [dict exists $fieldSet tzName] } { - append procBody { - set timeZone [dict get $date tzName] - } - } - append procBody { - ::tcl::clock::SetupTimeZone $timeZone - } - } - # Add code that gets Julian Day Number from the fields. append procBody [MakeParseCodeFromFields $fieldSet $DateParseActions] @@ -2032,7 +2016,17 @@ proc ::tcl::clock::ParseClockScanFormat {formatString locale} { + ( 86400 * wide([dict get $date julianDay]) ) + [dict get $date secondOfDay] }] } + } + + if { ![dict exists $fieldSet seconds] + && ![dict exists $fieldSet starDate] } { + if { [dict exists $fieldSet tzName] } { + append procBody { + set timeZone [dict get $date tzName] + } + } append procBody { + ::tcl::clock::SetupTimeZone $timeZone set date [::tcl::clock::ConvertLocalToUTC $date[set date {}] \ $TZData($timeZone) \ $changeover] @@ -2563,28 +2557,25 @@ proc ::tcl::clock::LocalizeFormat { locale format } { } set inFormat $format - # Handle locale-dependent format groups by mapping them out of the format - # string. Note that the order of the [string map] operations is - # significant because later formats can refer to later ones; for example - # %c can refer to %X, which in turn can refer to %T. + # Handle locale-dependent format groups by mapping them out of + # the input string. Note that the order of the [string map] + # operations is significant because earlier formats can refer + # to later ones; for example %c can refer to %X, which in turn + # can refer to %T. - set list { - %% %% - %D %m/%d/%Y - %+ {%a %b %e %H:%M:%S %Z %Y} - } - lappend list %EY [string map $list [mc LOCALE_YEAR_FORMAT]] - lappend list %T [string map $list [mc TIME_FORMAT_24_SECS]] - lappend list %R [string map $list [mc TIME_FORMAT_24]] - lappend list %r [string map $list [mc TIME_FORMAT_12]] - lappend list %X [string map $list [mc TIME_FORMAT]] - lappend list %EX [string map $list [mc LOCALE_TIME_FORMAT]] - lappend list %x [string map $list [mc DATE_FORMAT]] - lappend list %Ex [string map $list [mc LOCALE_DATE_FORMAT]] - lappend list %c [string map $list [mc DATE_TIME_FORMAT]] - lappend list %Ec [string map $list [mc LOCALE_DATE_TIME_FORMAT]] - set format [string map $list $format] - + set format [string map [list %c [mc DATE_TIME_FORMAT] \ + %Ec [mc LOCALE_DATE_TIME_FORMAT]] $format] + set format [string map [list %x [mc DATE_FORMAT] \ + %Ex [mc LOCALE_DATE_FORMAT] \ + %X [mc TIME_FORMAT] \ + %EX [mc LOCALE_TIME_FORMAT]] $format] + set format [string map [list %r [mc TIME_FORMAT_12] \ + %R [mc TIME_FORMAT_24] \ + %T [mc TIME_FORMAT_24_SECS]] $format] + set format [string map [list %D %m/%d/%Y \ + %EY [mc LOCALE_YEAR_FORMAT]\ + %+ {%a %b %e %H:%M:%S %Z %Y}] $format] + dict set McLoaded $locale FORMAT $inFormat $format return $format } @@ -3223,7 +3214,7 @@ proc ::tcl::clock::SetupTimeZone { timezone } { # again with a time zone file - this time without a colon if { [catch { LoadTimeZoneFile $timezone }] - && [catch { LoadZoneinfoFile $timezone } - opts] } { + && [catch { ZoneinfoFile $timezone } - opts] } { dict unset opts -errorinfo return -options $opts "time zone $timezone not found" } @@ -3892,50 +3883,23 @@ proc ::tcl::clock::ProcessPosixTimeZone { z } { * $dstSignum }] } - # Fill in defaults for European or US DST rules - # US start time is the second Sunday in March - # EU start time is the last Sunday in March - # US end time is the first Sunday in November. - # EU end time is the last Sunday in October + # Fill in defaults for US DST rules if { [dict get $z startDayOfYear] eq {} && [dict get $z startMonth] eq {} } { - if {($stdSignum * $stdHours>=0) && ($stdSignum * $stdHours<=12)} { - # EU - dict set z startWeekOfMonth 5 - if {$stdHours>2} { - dict set z startHours 2 - } else { - dict set z startHours [expr {$stdHours+1}] - } - } else { - # US - dict set z startWeekOfMonth 2 - dict set z startHours 2 - } dict set z startMonth 3 + dict set z startWeekOfMonth 2 dict set z startDayOfWeek 0 + dict set z startHours 2 dict set z startMinutes 0 dict set z startSeconds 0 } if { [dict get $z endDayOfYear] eq {} && [dict get $z endMonth] eq {} } { - if {($stdSignum * $stdHours>=0) && ($stdSignum * $stdHours<=12)} { - # EU - dict set z endMonth 10 - dict set z endWeekOfMonth 5 - if {$stdHours>2} { - dict set z endHours 3 - } else { - dict set z endHours [expr {$stdHours+2}] - } - } else { - # US - dict set z endMonth 11 - dict set z endWeekOfMonth 1 - dict set z endHours 2 - } + dict set z endMonth 11 + dict set z endWeekOfMonth 1 dict set z endDayOfWeek 0 + dict set z endHours 2 dict set z endMinutes 0 dict set z endSeconds 0 } @@ -4393,8 +4357,8 @@ proc ::tcl::clock::add { clockval args } { } default { return -code error \ - -errorcode [list CLOCK badSwitch $a] \ - "bad switch \"$a\",\ + -errorcode [list CLOCK badSwitch $flag] \ + "bad switch \"$flag\",\ must be -gmt, -locale or -timezone" } } diff --git a/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tcl8.5/init.tcl b/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tcl8.5/init.tcl index f4ab708aca5d4514d721fa36faa8241bef84103e..ef823f12f6096ad861f2069edcac1759867aea6b 100644 --- a/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tcl8.5/init.tcl +++ b/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tcl8.5/init.tcl @@ -3,7 +3,7 @@ # Default system startup file for Tcl-based applications. Defines # "unknown" procedure and auto-load facilities. # -# RCS: @(#) $Id: init.tcl,v 1.104.2.15 2010/08/04 17:02:39 dgp Exp $ +# RCS: @(#) $Id: init.tcl,v 1.104 2008/03/28 17:31:44 dgp Exp $ # # Copyright (c) 1991-1993 The Regents of the University of California. # Copyright (c) 1994-1996 Sun Microsystems, Inc. @@ -17,7 +17,7 @@ if {[info commands package] == ""} { error "version mismatch: library\nscripts expect Tcl version 7.5b1 or later but the loaded version is\nonly [info patchlevel]" } -package require -exact Tcl 8.5.9 +package require -exact Tcl 8.5.2 # Compute the auto path to use in this interpreter. # The values on the path come from several locations: @@ -109,7 +109,6 @@ namespace eval tcl { } return $val } - namespace export min max } } @@ -157,7 +156,7 @@ if {(![interp issafe]) && ($tcl_platform(platform) eq "windows")} { if {[interp issafe]} { - package unknown {::tcl::tm::UnknownHandler ::tclPkgUnknown} + package unknown ::tclPkgUnknown } else { # Set up search for Tcl Modules (TIP #189). # and setup platform specific unknown package handlers @@ -276,16 +275,8 @@ proc unknown args { unset UnknownPending } if {$msg} { - if {[info exists savedErrorCode]} { - set ::errorCode $savedErrorCode - } else { - unset -nocomplain ::errorCode - } - if {[info exists savedErrorInfo]} { - set ::errorInfo $savedErrorInfo - } else { - unset -nocomplain ::errorInfo - } + catch {set ::errorCode $savedErrorCode} + catch {set ::errorInfo $savedErrorInfo} set code [catch {uplevel 1 $args} msg opts] if {$code == 1} { # @@ -659,7 +650,7 @@ proc auto_execok name { # Add an initial ; to have the {} extension check first. set execExtensions [split ";$env(PATHEXT)" ";"] } else { - set execExtensions [list {} .com .exe .bat .cmd] + set execExtensions [list {} .com .exe .bat] } if {$name in $shellBuiltins} { diff --git a/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tcl8.5/msgs/he.msg b/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tcl8.5/msgs/he.msg index 4fd921d695580d913869978074a8bc5f1e6b5b71..52a94e26dd89ad18fa2ce5b717f8d1f71806b486 100644 --- a/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tcl8.5/msgs/he.msg +++ b/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tcl8.5/msgs/he.msg @@ -44,8 +44,8 @@ namespace eval ::tcl::clock { "\u05e0\u05d5\u05d1\u05de\u05d1\u05e8"\ "\u05d3\u05e6\u05de\u05d1\u05e8"\ ""] - ::msgcat::mcset he BCE "\u05dc\u05e1\u05d4\u0022\u05e0" - ::msgcat::mcset he CE "\u05dc\u05e4\u05e1\u05d4\u0022\u05e0" + ::msgcat::mcset he BCE "\u05dc\u05e1\u05d4"\u05e0" + ::msgcat::mcset he CE "\u05dc\u05e4\u05e1\u05d4"\u05e0" ::msgcat::mcset he DATE_FORMAT "%d/%m/%Y" ::msgcat::mcset he TIME_FORMAT "%H:%M:%S" ::msgcat::mcset he DATE_TIME_FORMAT "%d/%m/%Y %H:%M:%S %z" diff --git a/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tcl8.5/package.tcl b/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tcl8.5/package.tcl index 6aa8be535b97b5522729167629e059555b1239e9..64197f7b0cd41185b434a1d92bf177cfd8c879f5 100644 --- a/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tcl8.5/package.tcl +++ b/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tcl8.5/package.tcl @@ -3,7 +3,7 @@ # utility procs formerly in init.tcl which can be loaded on demand # for package management. # -# RCS: @(#) $Id: package.tcl,v 1.35.4.1 2008/07/03 17:22:59 dgp Exp $ +# RCS: @(#) $Id: package.tcl,v 1.35 2006/11/03 00:34:52 hobbs Exp $ # # Copyright (c) 1991-1993 The Regents of the University of California. # Copyright (c) 1994-1998 Sun Microsystems, Inc. @@ -485,15 +485,8 @@ proc tclPkgUnknown {name args} { foreach file [glob -directory $dir -join -nocomplain \ * pkgIndex.tcl] { set dir [file dirname $file] - if {![info exists procdDirs($dir)]} { - set code [catch {source $file} msg opt] - if {$code == 1 && - [lindex [dict get $opt -errorcode] 0] eq "POSIX" && - [lindex [dict get $opt -errorcode] 1] eq "EACCES"} { - # $file was not readable; silently ignore - continue - } - if {$code} { + if {![info exists procdDirs($dir)] && [file readable $file]} { + if {[catch {source $file} msg]} { tclLog "error reading package index file $file: $msg" } else { set procdDirs($dir) 1 @@ -504,16 +497,10 @@ proc tclPkgUnknown {name args} { set dir [lindex $use_path end] if {![info exists procdDirs($dir)]} { set file [file join $dir pkgIndex.tcl] - # safe interps usually don't have "file exists", - if {([interp issafe] || [file exists $file])} { - set code [catch {source $file} msg opt] - if {$code == 1 && - [lindex [dict get $opt -errorcode] 0] eq "POSIX" && - [lindex [dict get $opt -errorcode] 1] eq "EACCES"} { - # $file was not readable; silently ignore - continue - } - if {$code} { + # safe interps usually don't have "file readable", + # nor stderr channel + if {([interp issafe] || [file readable $file])} { + if {[catch {source $file} msg] && ![interp issafe]} { tclLog "error reading package index file $file: $msg" } else { set procdDirs($dir) 1 @@ -559,6 +546,8 @@ proc tclPkgUnknown {name args} { # This procedure extends the "package unknown" function for MacOSX. # It scans the Resources/Scripts directories of the immediate children # of the auto_path directories for pkgIndex files. +# Only installed in interps that are not safe so we don't check +# for [interp issafe] as in tclPkgUnknown. # # Arguments: # original - original [package unknown] procedure @@ -594,15 +583,8 @@ proc tcl::MacOSXPkgUnknown {original name args} { foreach file [glob -directory $dir -join -nocomplain \ * Resources Scripts pkgIndex.tcl] { set dir [file dirname $file] - if {![info exists procdDirs($dir)]} { - set code [catch {source $file} msg opt] - if {$code == 1 && - [lindex [dict get $opt -errorcode] 0] eq "POSIX" && - [lindex [dict get $opt -errorcode] 1] eq "EACCES"} { - # $file was not readable; silently ignore - continue - } - if {$code} { + if {![info exists procdDirs($dir)] && [file readable $file]} { + if {[catch {source $file} msg]} { tclLog "error reading package index file $file: $msg" } else { set procdDirs($dir) 1 diff --git a/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tcl8.5/safe.tcl b/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tcl8.5/safe.tcl index 6a2cdbe78b0cff776339c7f77fac42335c271b94..186c2e7c06db33371b772b8b98caaf5a23387b92 100644 --- a/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tcl8.5/safe.tcl +++ b/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tcl8.5/safe.tcl @@ -9,1108 +9,901 @@ # # Copyright (c) 1996-1997 Sun Microsystems, Inc. # -# See the file "license.terms" for information on usage and redistribution of -# this file, and for a DISCLAIMER OF ALL WARRANTIES. +# See the file "license.terms" for information on usage and redistribution +# of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# RCS: @(#) $Id: safe.tcl,v 1.16.4.8 2010/09/02 18:30:29 andreas_kupries Exp $ +# RCS: @(#) $Id: safe.tcl,v 1.16 2006/11/03 00:34:52 hobbs Exp $ # -# The implementation is based on namespaces. These naming conventions are -# followed: +# The implementation is based on namespaces. These naming conventions +# are followed: # Private procs starts with uppercase. # Public procs are exported and starts with lowercase # # Needed utilities package -package require opt 0.4.1 +package require opt 0.4.1; # Create the safe namespace namespace eval ::safe { + # Exported API: namespace export interpCreate interpInit interpConfigure interpDelete \ - interpAddToAccessPath interpFindInAccessPath setLogCmd -} + interpAddToAccessPath interpFindInAccessPath setLogCmd -# Helper function to resolve the dual way of specifying staticsok (either -# by -noStatics or -statics 0) -proc ::safe::InterpStatics {} { - foreach v {Args statics noStatics} { - upvar $v $v - } - set flag [::tcl::OptProcArgGiven -noStatics] - if {$flag && (!$noStatics == !$statics) - && ([::tcl::OptProcArgGiven -statics])} { - return -code error\ - "conflicting values given for -statics and -noStatics" - } - if {$flag} { - return [expr {!$noStatics}] - } else { - return $statics - } -} + #### + # + # Setup the arguments parsing + # + #### -# Helper function to resolve the dual way of specifying nested loading -# (either by -nestedLoadOk or -nested 1) -proc ::safe::InterpNested {} { - foreach v {Args nested nestedLoadOk} { - upvar $v $v - } - set flag [::tcl::OptProcArgGiven -nestedLoadOk] - # note that the test here is the opposite of the "InterpStatics" one - # (it is not -noNested... because of the wanted default value) - if {$flag && (!$nestedLoadOk != !$nested) - && ([::tcl::OptProcArgGiven -nested])} { - return -code error\ - "conflicting values given for -nested and -nestedLoadOk" + # Make sure that our temporary variable is local to this + # namespace. [Bug 981733] + variable temp + + # Share the descriptions + set temp [::tcl::OptKeyRegister { + {-accessPath -list {} "access path for the slave"} + {-noStatics "prevent loading of statically linked pkgs"} + {-statics true "loading of statically linked pkgs"} + {-nestedLoadOk "allow nested loading"} + {-nested false "nested loading"} + {-deleteHook -script {} "delete hook"} + }] + + # create case (slave is optional) + ::tcl::OptKeyRegister { + {?slave? -name {} "name of the slave (optional)"} + } ::safe::interpCreate + # adding the flags sub programs to the command program + # (relying on Opt's internal implementation details) + lappend ::tcl::OptDesc(::safe::interpCreate) $::tcl::OptDesc($temp) + + # init and configure (slave is needed) + ::tcl::OptKeyRegister { + {slave -name {} "name of the slave"} + } ::safe::interpIC + # adding the flags sub programs to the command program + # (relying on Opt's internal implementation details) + lappend ::tcl::OptDesc(::safe::interpIC) $::tcl::OptDesc($temp) + # temp not needed anymore + ::tcl::OptKeyDelete $temp + + + # Helper function to resolve the dual way of specifying staticsok + # (either by -noStatics or -statics 0) + proc InterpStatics {} { + foreach v {Args statics noStatics} { + upvar $v $v + } + set flag [::tcl::OptProcArgGiven -noStatics]; + if {$flag && (!$noStatics == !$statics) + && ([::tcl::OptProcArgGiven -statics])} { + return -code error\ + "conflicting values given for -statics and -noStatics" + } + if {$flag} { + return [expr {!$noStatics}] + } else { + return $statics + } } - if {$flag} { - # another difference with "InterpStatics" - return $nestedLoadOk - } else { - return $nested + + # Helper function to resolve the dual way of specifying nested loading + # (either by -nestedLoadOk or -nested 1) + proc InterpNested {} { + foreach v {Args nested nestedLoadOk} { + upvar $v $v + } + set flag [::tcl::OptProcArgGiven -nestedLoadOk]; + # note that the test here is the opposite of the "InterpStatics" + # one (it is not -noNested... because of the wanted default value) + if {$flag && (!$nestedLoadOk != !$nested) + && ([::tcl::OptProcArgGiven -nested])} { + return -code error\ + "conflicting values given for -nested and -nestedLoadOk" + } + if {$flag} { + # another difference with "InterpStatics" + return $nestedLoadOk + } else { + return $nested + } } -} -#### -# -# API entry points that needs argument parsing : -# -#### + #### + # + # API entry points that needs argument parsing : + # + #### -# Interface/entry point function and front end for "Create" -proc ::safe::interpCreate {args} { - set Args [::tcl::OptKeyParse ::safe::interpCreate $args] - InterpCreate $slave $accessPath \ - [InterpStatics] [InterpNested] $deleteHook -} -proc ::safe::interpInit {args} { - set Args [::tcl::OptKeyParse ::safe::interpIC $args] - if {![::interp exists $slave]} { - return -code error "\"$slave\" is not an interpreter" + # Interface/entry point function and front end for "Create" + proc interpCreate {args} { + set Args [::tcl::OptKeyParse ::safe::interpCreate $args] + InterpCreate $slave $accessPath \ + [InterpStatics] [InterpNested] $deleteHook } - InterpInit $slave $accessPath \ - [InterpStatics] [InterpNested] $deleteHook -} -# Check that the given slave is "one of us" -proc ::safe::CheckInterp {slave} { - namespace upvar ::safe S$slave state - if {![info exists state] || ![::interp exists $slave]} { - return -code error \ - "\"$slave\" is not an interpreter managed by ::safe::" + proc interpInit {args} { + set Args [::tcl::OptKeyParse ::safe::interpIC $args] + if {![::interp exists $slave]} { + return -code error "\"$slave\" is not an interpreter" + } + InterpInit $slave $accessPath \ + [InterpStatics] [InterpNested] $deleteHook; } -} -# Interface/entry point function and front end for "Configure". This code -# is awfully pedestrian because it would need more coupling and support -# between the way we store the configuration values in safe::interp's and -# the Opt package. Obviously we would like an OptConfigure to avoid -# duplicating all this code everywhere. -# -> TODO (the app should share or access easily the program/value stored -# by opt) - -# This is even more complicated by the boolean flags with no values that -# we had the bad idea to support for the sake of user simplicity in -# create/init but which makes life hard in configure... -# So this will be hopefully written and some integrated with opt1.0 -# (hopefully for tcl8.1 ?) -proc ::safe::interpConfigure {args} { - switch [llength $args] { - 1 { - # If we have exactly 1 argument the semantic is to return all - # the current configuration. We still call OptKeyParse though - # we know that "slave" is our given argument because it also - # checks for the "-help" option. - set Args [::tcl::OptKeyParse ::safe::interpIC $args] - CheckInterp $slave - namespace upvar ::safe S$slave state - - return [join [list \ - [list -accessPath $state(access_path)] \ - [list -statics $state(staticsok)] \ - [list -nested $state(nestedok)] \ - [list -deleteHook $state(cleanupHook)]]] + proc CheckInterp {slave} { + if {![IsInterp $slave]} { + return -code error \ + "\"$slave\" is not an interpreter managed by ::safe::" } - 2 { - # If we have exactly 2 arguments the semantic is a "configure - # get" - lassign $args slave arg - - # get the flag sub program (we 'know' about Opt's internal - # representation of data) - set desc [lindex [::tcl::OptKeyGetDesc ::safe::interpIC] 2] - set hits [::tcl::OptHits desc $arg] - if {$hits > 1} { - return -code error [::tcl::OptAmbigous $desc $arg] - } elseif {$hits == 0} { - return -code error [::tcl::OptFlagUsage $desc $arg] + } + + # Interface/entry point function and front end for "Configure" + # This code is awfully pedestrian because it would need + # more coupling and support between the way we store the + # configuration values in safe::interp's and the Opt package + # Obviously we would like an OptConfigure + # to avoid duplicating all this code everywhere. -> TODO + # (the app should share or access easily the program/value + # stored by opt) + # This is even more complicated by the boolean flags with no values + # that we had the bad idea to support for the sake of user simplicity + # in create/init but which makes life hard in configure... + # So this will be hopefully written and some integrated with opt1.0 + # (hopefully for tcl8.1 ?) + proc interpConfigure {args} { + switch [llength $args] { + 1 { + # If we have exactly 1 argument + # the semantic is to return all the current configuration + # We still call OptKeyParse though we know that "slave" + # is our given argument because it also checks + # for the "-help" option. + set Args [::tcl::OptKeyParse ::safe::interpIC $args] + CheckInterp $slave + set res {} + lappend res [list -accessPath [Set [PathListName $slave]]] + lappend res [list -statics [Set [StaticsOkName $slave]]] + lappend res [list -nested [Set [NestedOkName $slave]]] + lappend res [list -deleteHook [Set [DeleteHookName $slave]]] + join $res } - CheckInterp $slave - namespace upvar ::safe S$slave state - - set item [::tcl::OptCurDesc $desc] - set name [::tcl::OptName $item] - switch -exact -- $name { - -accessPath {return [list -accessPath $state(access_path)]} - -statics {return [list -statics $state(staticsok)]} - -nested {return [list -nested $state(nestedok)]} - -deleteHook {return [list -deleteHook $state(cleanupHook)]} - -noStatics { - # it is most probably a set in fact but we would need - # then to jump to the set part and it is not *sure* - # that it is a set action that the user want, so force - # it to use the unambigous -statics ?value? instead: - return -code error\ - "ambigous query (get or set -noStatics ?)\ + 2 { + # If we have exactly 2 arguments + # the semantic is a "configure get" + ::tcl::Lassign $args slave arg + # get the flag sub program (we 'know' about Opt's internal + # representation of data) + set desc [lindex [::tcl::OptKeyGetDesc ::safe::interpIC] 2] + set hits [::tcl::OptHits desc $arg] + if {$hits > 1} { + return -code error [::tcl::OptAmbigous $desc $arg] + } elseif {$hits == 0} { + return -code error [::tcl::OptFlagUsage $desc $arg] + } + CheckInterp $slave + set item [::tcl::OptCurDesc $desc] + set name [::tcl::OptName $item] + switch -exact -- $name { + -accessPath { + return [list -accessPath [Set [PathListName $slave]]] + } + -statics { + return [list -statics [Set [StaticsOkName $slave]]] + } + -nested { + return [list -nested [Set [NestedOkName $slave]]] + } + -deleteHook { + return [list -deleteHook [Set [DeleteHookName $slave]]] + } + -noStatics { + # it is most probably a set in fact + # but we would need then to jump to the set part + # and it is not *sure* that it is a set action + # that the user want, so force it to use the + # unambigous -statics ?value? instead: + return -code error\ + "ambigous query (get or set -noStatics ?)\ use -statics instead" - } - -nestedLoadOk { - return -code error\ - "ambigous query (get or set -nestedLoadOk ?)\ + } + -nestedLoadOk { + return -code error\ + "ambigous query (get or set -nestedLoadOk ?)\ use -nested instead" - } - default { - return -code error "unknown flag $name (bug)" + } + default { + return -code error "unknown flag $name (bug)" + } } } - } - default { - # Otherwise we want to parse the arguments like init and - # create did - set Args [::tcl::OptKeyParse ::safe::interpIC $args] - CheckInterp $slave - namespace upvar ::safe S$slave state - - # Get the current (and not the default) values of whatever has - # not been given: - if {![::tcl::OptProcArgGiven -accessPath]} { - set doreset 1 - set accessPath $state(access_path) - } else { - set doreset 0 - } - if { - ![::tcl::OptProcArgGiven -statics] - && ![::tcl::OptProcArgGiven -noStatics] - } { - set statics $state(staticsok) - } else { - set statics [InterpStatics] - } - if { - [::tcl::OptProcArgGiven -nested] || - [::tcl::OptProcArgGiven -nestedLoadOk] - } { - set nested [InterpNested] - } else { - set nested $state(nestedok) - } - if {![::tcl::OptProcArgGiven -deleteHook]} { - set deleteHook $state(cleanupHook) - } - # we can now reconfigure : - InterpSetConfig $slave $accessPath $statics $nested $deleteHook - # auto_reset the slave (to completly synch the new access_path) - if {$doreset} { - if {[catch {::interp eval $slave {auto_reset}} msg]} { - Log $slave "auto_reset failed: $msg" + default { + # Otherwise we want to parse the arguments like init and create + # did + set Args [::tcl::OptKeyParse ::safe::interpIC $args] + CheckInterp $slave + # Get the current (and not the default) values of + # whatever has not been given: + if {![::tcl::OptProcArgGiven -accessPath]} { + set doreset 1 + set accessPath [Set [PathListName $slave]] } else { - Log $slave "successful auto_reset" NOTICE + set doreset 0 + } + if {(![::tcl::OptProcArgGiven -statics]) \ + && (![::tcl::OptProcArgGiven -noStatics]) } { + set statics [Set [StaticsOkName $slave]] + } else { + set statics [InterpStatics] + } + if {([::tcl::OptProcArgGiven -nested]) \ + || ([::tcl::OptProcArgGiven -nestedLoadOk]) } { + set nested [InterpNested] + } else { + set nested [Set [NestedOkName $slave]] + } + if {![::tcl::OptProcArgGiven -deleteHook]} { + set deleteHook [Set [DeleteHookName $slave]] + } + # we can now reconfigure : + InterpSetConfig $slave $accessPath $statics $nested $deleteHook + # auto_reset the slave (to completly synch the new access_path) + if {$doreset} { + if {[catch {::interp eval $slave {auto_reset}} msg]} { + Log $slave "auto_reset failed: $msg" + } else { + Log $slave "successful auto_reset" NOTICE + } } } } } -} -#### -# -# Functions that actually implements the exported APIs -# -#### -# -# safe::InterpCreate : doing the real job -# -# This procedure creates a safe slave and initializes it with the safe -# base aliases. -# NB: slave name must be simple alphanumeric string, no spaces, no (), no -# {},... {because the state array is stored as part of the name} -# -# Returns the slave name. -# -# Optional Arguments : -# + slave name : if empty, generated name will be used -# + access_path: path list controlling where load/source can occur, -# if empty: the master auto_path will be used. -# + staticsok : flag, if 0 :no static package can be loaded (load {} Xxx) -# if 1 :static packages are ok. -# + nestedok: flag, if 0 :no loading to sub-sub interps (load xx xx sub) -# if 1 : multiple levels are ok. - -# use the full name and no indent so auto_mkIndex can find us -proc ::safe::InterpCreate { - slave - access_path - staticsok - nestedok - deletehook - } { - # Create the slave. - if {$slave ne ""} { - ::interp create -safe $slave - } else { - # empty argument: generate slave name - set slave [::interp create -safe] - } - Log $slave "Created" NOTICE + #### + # + # Functions that actually implements the exported APIs + # + #### - # Initialize it. (returns slave name) - InterpInit $slave $access_path $staticsok $nestedok $deletehook -} -# -# InterpSetConfig (was setAccessPath) : -# Sets up slave virtual auto_path and corresponding structure within -# the master. Also sets the tcl_library in the slave to be the first -# directory in the path. -# NB: If you change the path after the slave has been initialized you -# probably need to call "auto_reset" in the slave in order that it gets -# the right auto_index() array values. - -proc ::safe::InterpSetConfig {slave access_path staticsok nestedok deletehook} { - global auto_path - - # determine and store the access path if empty - if {$access_path eq ""} { - set access_path $auto_path - - # Make sure that tcl_library is in auto_path and at the first - # position (needed by setAccessPath) - set where [lsearch -exact $access_path [info library]] - if {$where == -1} { - # not found, add it. - set access_path [linsert $access_path 0 [info library]] - Log $slave "tcl_library was not in auto_path,\ - added it to slave's access_path" NOTICE - } elseif {$where != 0} { - # not first, move it first - set access_path [linsert \ - [lreplace $access_path $where $where] \ - 0 [info library]] - Log $slave "tcl_libray was not in first in auto_path,\ - moved it to front of slave's access_path" NOTICE + # + # safe::InterpCreate : doing the real job + # + # This procedure creates a safe slave and initializes it with the + # safe base aliases. + # NB: slave name must be simple alphanumeric string, no spaces, + # no (), no {},... {because the state array is stored as part of the name} + # + # Returns the slave name. + # + # Optional Arguments : + # + slave name : if empty, generated name will be used + # + access_path: path list controlling where load/source can occur, + # if empty: the master auto_path will be used. + # + staticsok : flag, if 0 :no static package can be loaded (load {} Xxx) + # if 1 :static packages are ok. + # + nestedok: flag, if 0 :no loading to sub-sub interps (load xx xx sub) + # if 1 : multiple levels are ok. + + # use the full name and no indent so auto_mkIndex can find us + proc ::safe::InterpCreate { + slave + access_path + staticsok + nestedok + deletehook + } { + # Create the slave. + if {$slave ne ""} { + ::interp create -safe $slave + } else { + # empty argument: generate slave name + set slave [::interp create -safe] } + Log $slave "Created" NOTICE - # Add 1st level sub dirs (will searched by auto loading from tcl - # code in the slave using glob and thus fail, so we add them here - # so by default it works the same). - set access_path [AddSubDirs $access_path] + # Initialize it. (returns slave name) + InterpInit $slave $access_path $staticsok $nestedok $deletehook } - Log $slave "Setting accessPath=($access_path) staticsok=$staticsok\ - nestedok=$nestedok deletehook=($deletehook)" NOTICE - namespace upvar ::safe S$slave state - - # clear old autopath if it existed - # build new one - # Extend the access list with the paths used to look for Tcl Modules. - # We save the virtual form separately as well, as syncing it with the - # slave has to be defered until the necessary commands are present for - # setup. - - set norm_access_path {} - set slave_access_path {} - set map_access_path {} - set remap_access_path {} - set slave_tm_path {} - - set i 0 - foreach dir $access_path { - set token [PathToken $i] - lappend slave_access_path $token - lappend map_access_path $token $dir - lappend remap_access_path $dir $token - lappend norm_access_path [file normalize $dir] - incr i - } + # + # InterpSetConfig (was setAccessPath) : + # Sets up slave virtual auto_path and corresponding structure + # within the master. Also sets the tcl_library in the slave + # to be the first directory in the path. + # Nb: If you change the path after the slave has been initialized + # you probably need to call "auto_reset" in the slave in order that it + # gets the right auto_index() array values. + + proc ::safe::InterpSetConfig {slave access_path staticsok\ + nestedok deletehook} { + + # determine and store the access path if empty + if {$access_path eq ""} { + set access_path [uplevel \#0 set auto_path] + # Make sure that tcl_library is in auto_path + # and at the first position (needed by setAccessPath) + set where [lsearch -exact $access_path [info library]] + if {$where == -1} { + # not found, add it. + set access_path [concat [list [info library]] $access_path] + Log $slave "tcl_library was not in auto_path,\ + added it to slave's access_path" NOTICE + } elseif {$where != 0} { + # not first, move it first + set access_path [concat [list [info library]]\ + [lreplace $access_path $where $where]] + Log $slave "tcl_libray was not in first in auto_path,\ + moved it to front of slave's access_path" NOTICE + + } - set morepaths [::tcl::tm::list] - while {[llength $morepaths]} { - set addpaths $morepaths - set morepaths {} + # Add 1st level sub dirs (will searched by auto loading from tcl + # code in the slave using glob and thus fail, so we add them + # here so by default it works the same). + set access_path [AddSubDirs $access_path] + } - foreach dir $addpaths { - # Prevent the addition of dirs on the tm list to the - # result if they are already known. - if {[dict exists $remap_access_path $dir]} { - continue + Log $slave "Setting accessPath=($access_path) staticsok=$staticsok\ + nestedok=$nestedok deletehook=($deletehook)" NOTICE + + # clear old autopath if it existed + set nname [PathNumberName $slave] + if {[Exists $nname]} { + set n [Set $nname] + for {set i 0} {$i<$n} {incr i} { + Unset [PathToken $i $slave] } + } - set token [PathToken $i] - lappend access_path $dir - lappend slave_access_path $token - lappend map_access_path $token $dir - lappend remap_access_path $dir $token - lappend norm_access_path [file normalize $dir] - lappend slave_tm_path $token + # build new one + set slave_auto_path {} + set i 0 + foreach dir $access_path { + Set [PathToken $i $slave] $dir + lappend slave_auto_path "\$[PathToken $i]" incr i + } + Set $nname $i + Set [PathListName $slave] $access_path + Set [VirtualPathListName $slave] $slave_auto_path + + Set [StaticsOkName $slave] $staticsok + Set [NestedOkName $slave] $nestedok + Set [DeleteHookName $slave] $deletehook + + SyncAccessPath $slave + } - # [Bug 2854929] - # Recursively find deeper paths which may contain - # modules. Required to handle modules with names like - # 'platform::shell', which translate into - # 'platform/shell-X.tm', i.e arbitrarily deep - # subdirectories. - lappend morepaths {*}[glob -nocomplain -directory $dir -type d *] + # + # + # FindInAccessPath: + # Search for a real directory and returns its virtual Id + # (including the "$") +proc ::safe::interpFindInAccessPath {slave path} { + set access_path [GetAccessPath $slave] + set where [lsearch -exact $access_path $path] + if {$where == -1} { + return -code error "$path not found in access path $access_path" } + return "\$[PathToken $where]" } - set state(access_path) $access_path - set state(access_path,map) $map_access_path - set state(access_path,remap) $remap_access_path - set state(access_path,norm) $norm_access_path - set state(access_path,slave) $slave_access_path - set state(tm_path_slave) $slave_tm_path - set state(staticsok) $staticsok - set state(nestedok) $nestedok - set state(cleanupHook) $deletehook - - SyncAccessPath $slave -} + # + # addToAccessPath: + # add (if needed) a real directory to access path + # and return its virtual token (including the "$"). +proc ::safe::interpAddToAccessPath {slave path} { + # first check if the directory is already in there + if {![catch {interpFindInAccessPath $slave $path} res]} { + return $res + } + # new one, add it: + set nname [PathNumberName $slave] + set n [Set $nname] + Set [PathToken $n $slave] $path -# -# -# FindInAccessPath: -# Search for a real directory and returns its virtual Id (including the -# "$") -proc ::safe::interpFindInAccessPath {slave path} { - namespace upvar ::safe S$slave state + set token "\$[PathToken $n]" + + Lappend [VirtualPathListName $slave] $token + Lappend [PathListName $slave] $path + Set $nname [expr {$n+1}] + + SyncAccessPath $slave - if {![dict exists $state(access_path,remap) $path]} { - return -code error "$path not found in access path $access_path" + return $token } - return [dict get $state(access_path,remap) $path] -} + # This procedure applies the initializations to an already existing + # interpreter. It is useful when you want to install the safe base + # aliases into a preexisting safe interpreter. + proc ::safe::InterpInit { + slave + access_path + staticsok + nestedok + deletehook + } { -# -# addToAccessPath: -# add (if needed) a real directory to access path and return its -# virtual token (including the "$"). -proc ::safe::interpAddToAccessPath {slave path} { - # first check if the directory is already in there - # (inlined interpFindInAccessPath). - namespace upvar ::safe S$slave state + # Configure will generate an access_path when access_path is + # empty. + InterpSetConfig $slave $access_path $staticsok $nestedok $deletehook - if {[dict exists $state(access_path,remap) $path]} { - return [dict get $state(access_path,remap) $path] - } + # These aliases let the slave load files to define new commands - # new one, add it: - set token [PathToken [llength $state(access_path)]] + # NB we need to add [namespace current], aliases are always + # absolute paths. + ::interp alias $slave source {} [namespace current]::AliasSource $slave + ::interp alias $slave load {} [namespace current]::AliasLoad $slave - lappend state(access_path) $path - lappend state(access_path,slave) $token - lappend state(access_path,map) $token $path - lappend state(access_path,remap) $path $token - lappend state(access_path,norm) [file normalize $path] + # This alias lets the slave use the encoding names, convertfrom, + # convertto, and system, but not "encoding system <name>" to set + # the system encoding. - SyncAccessPath $slave - return $token -} + ::interp alias $slave encoding {} [namespace current]::AliasEncoding \ + $slave -# This procedure applies the initializations to an already existing -# interpreter. It is useful when you want to install the safe base aliases -# into a preexisting safe interpreter. -proc ::safe::InterpInit { - slave - access_path - staticsok - nestedok - deletehook - } { - # Configure will generate an access_path when access_path is empty. - InterpSetConfig $slave $access_path $staticsok $nestedok $deletehook - - # NB we need to add [namespace current], aliases are always absolute - # paths. - - # These aliases let the slave load files to define new commands - # This alias lets the slave use the encoding names, convertfrom, - # convertto, and system, but not "encoding system <name>" to set the - # system encoding. - # Handling Tcl Modules, we need a restricted form of Glob. - # This alias interposes on the 'exit' command and cleanly terminates - # the slave. - - foreach {command alias} { - source AliasSource - load AliasLoad - encoding AliasEncoding - exit interpDelete - glob AliasGlob - } { - ::interp alias $slave $command {} [namespace current]::$alias $slave - } + # This alias lets the slave have access to a subset of the 'file' + # command functionality. - # This alias lets the slave have access to a subset of the 'file' - # command functionality. + AliasSubset $slave file file dir.* join root.* ext.* tail \ + path.* split - AliasSubset $slave file \ - file dir.* join root.* ext.* tail path.* split + # This alias interposes on the 'exit' command and cleanly terminates + # the slave. - # Subcommands of info - foreach {subcommand alias} { - nameofexecutable AliasExeName - } { - ::interp alias $slave ::tcl::info::$subcommand \ - {} [namespace current]::$alias $slave - } + ::interp alias $slave exit {} [namespace current]::interpDelete $slave - # The allowed slave variables already have been set by Tcl_MakeSafe(3) + # The allowed slave variables already have been set + # by Tcl_MakeSafe(3) - # Source init.tcl and tm.tcl into the slave, to get auto_load and - # other procedures defined: - if {[catch {::interp eval $slave { - source [file join $tcl_library init.tcl] - }} msg]} { - Log $slave "can't source init.tcl ($msg)" - return -code error "can't source init.tcl into slave $slave ($msg)" - } + # Source init.tcl into the slave, to get auto_load and other + # procedures defined: - if {[catch {::interp eval $slave { - source [file join $tcl_library tm.tcl] - }} msg]} { - Log $slave "can't source tm.tcl ($msg)" - return -code error "can't source tm.tcl into slave $slave ($msg)" - } + if {[catch {::interp eval $slave\ + {source [file join $tcl_library init.tcl]}} msg]} { + Log $slave "can't source init.tcl ($msg)" + error "can't source init.tcl into slave $slave ($msg)" + } - # Sync the paths used to search for Tcl modules. This can be done only - # now, after tm.tcl was loaded. - namespace upvar ::safe S$slave state - ::interp eval $slave [list \ - ::tcl::tm::add {*}$state(tm_path_slave)] + return $slave + } - return $slave -} -# Add (only if needed, avoid duplicates) 1 level of sub directories to an -# existing path list. Also removes non directories from the returned -# list. -proc ::safe::AddSubDirs {pathList} { - set res {} - foreach dir $pathList { - if {[file isdirectory $dir]} { - # check that we don't have it yet as a children of a previous - # dir - if {$dir ni $res} { - lappend res $dir - } - foreach sub [glob -directory $dir -nocomplain *] { - if {[file isdirectory $sub] && ($sub ni $res)} { - # new sub dir, add it ! - lappend res $sub + # Add (only if needed, avoid duplicates) 1 level of + # sub directories to an existing path list. + # Also removes non directories from the returned list. + proc AddSubDirs {pathList} { + set res {} + foreach dir $pathList { + if {[file isdirectory $dir]} { + # check that we don't have it yet as a children + # of a previous dir + if {[lsearch -exact $res $dir]<0} { + lappend res $dir + } + foreach sub [glob -directory $dir -nocomplain *] { + if {([file isdirectory $sub]) \ + && ([lsearch -exact $res $sub]<0) } { + # new sub dir, add it ! + lappend res $sub + } } } } + return $res } - return $res -} -# This procedure deletes a safe slave managed by Safe Tcl and cleans up -# associated state: + # This procedure deletes a safe slave managed by Safe Tcl and + # cleans up associated state: proc ::safe::interpDelete {slave} { - Log $slave "About to delete" NOTICE - - namespace upvar ::safe S$slave state - - # If the slave has a cleanup hook registered, call it. Check the - # existance because we might be called to delete an interp which has - # not been registered with us at all - - if {[info exists state(cleanupHook)]} { - set hook $state(cleanupHook) - if {[llength $hook]} { - # remove the hook now, otherwise if the hook calls us somehow, - # we'll loop - unset state(cleanupHook) - if {[catch { - {*}$hook $slave - } err]} { - Log $slave "Delete hook error ($err)" + + Log $slave "About to delete" NOTICE + + # If the slave has a cleanup hook registered, call it. + # check the existance because we might be called to delete an interp + # which has not been registered with us at all + set hookname [DeleteHookName $slave] + if {[Exists $hookname]} { + set hook [Set $hookname] + if {![::tcl::Lempty $hook]} { + # remove the hook now, otherwise if the hook + # calls us somehow, we'll loop + Unset $hookname + if {[catch {{*}$hook $slave} err]} { + Log $slave "Delete hook error ($err)" + } } } - } - # Discard the global array of state associated with the slave, and - # delete the interpreter. + # Discard the global array of state associated with the slave, and + # delete the interpreter. - if {[info exists state]} { - unset state - } + set statename [InterpStateName $slave] + if {[Exists $statename]} { + Unset $statename + } - # if we have been called twice, the interp might have been deleted - # already - if {[::interp exists $slave]} { - ::interp delete $slave - Log $slave "Deleted" NOTICE - } + # if we have been called twice, the interp might have been deleted + # already + if {[::interp exists $slave]} { + ::interp delete $slave + Log $slave "Deleted" NOTICE + } - return -} + return + } -# Set (or get) the logging mecanism + # Set (or get) the loging mecanism proc ::safe::setLogCmd {args} { variable Log - set la [llength $args] - if {$la == 0} { + if {[llength $args] == 0} { return $Log - } elseif {$la == 1} { - set Log [lindex $args 0] } else { - set Log $args - } - - if {$Log eq ""} { - # Disable logging completely. Calls to it will be compiled out - # of all users. - proc ::safe::Log {args} {} - } else { - # Activate logging, define proper command. - - proc ::safe::Log {slave msg {type ERROR}} { - variable Log - {*}$Log "$type for slave $slave : $msg" - return + if {[llength $args] == 1} { + set Log [lindex $args 0] + } else { + set Log $args } } } -# ------------------- END OF PUBLIC METHODS ------------ - -# -# Sets the slave auto_path to the master recorded value. Also sets -# tcl_library to the first token of the virtual path. -# -proc ::safe::SyncAccessPath {slave} { - namespace upvar ::safe S$slave state - - set slave_access_path $state(access_path,slave) - ::interp eval $slave [list set auto_path $slave_access_path] - - Log $slave "auto_path in $slave has been set to $slave_access_path"\ - NOTICE - - # This code assumes that info library is the first element in the - # list of auto_path's. See -> InterpSetConfig for the code which - # ensures this condition. - - ::interp eval $slave [list \ - set tcl_library [lindex $slave_access_path 0]] -} - -# Returns the virtual token for directory number N. -proc ::safe::PathToken {n} { - # We need to have a ":" in the token string so [file join] on the - # mac won't turn it into a relative path. - return "\$p(:$n:)" ;# Form tested by case 7.2 -} - -# -# translate virtual path into real path -# -proc ::safe::TranslatePath {slave path} { - namespace upvar ::safe S$slave state - - # somehow strip the namespaces 'functionality' out (the danger is that - # we would strip valid macintosh "../" queries... : - if {[string match "*::*" $path] || [string match "*..*" $path]} { - return -code error "invalid characters in path $path" - } + # internal variable + variable Log {} - # Use a cached map instead of computed local vars and subst. + # ------------------- END OF PUBLIC METHODS ------------ - return [string map $state(access_path,map) $path] -} -# file name control (limit access to files/resources that should be a -# valid tcl source file) -proc ::safe::CheckFileName {slave file} { - # This used to limit what can be sourced to ".tcl" and forbid files - # with more than 1 dot and longer than 14 chars, but I changed that - # for 8.4 as a safe interp has enough internal protection already to - # allow sourcing anything. - hobbs - - if {![file exists $file]} { - # don't tell the file path - return -code error "no such file or directory" + # + # sets the slave auto_path to the master recorded value. + # also sets tcl_library to the first token of the virtual path. + # + proc SyncAccessPath {slave} { + set slave_auto_path [Set [VirtualPathListName $slave]] + ::interp eval $slave [list set auto_path $slave_auto_path] + Log $slave "auto_path in $slave has been set to $slave_auto_path"\ + NOTICE + ::interp eval $slave [list set tcl_library [lindex $slave_auto_path 0]] + } + + # base name for storing all the slave states + # the array variable name for slave foo is thus "Sfoo" + # and for sub slave {foo bar} "Sfoo bar" (spaces are handled + # ok everywhere (or should)) + # We add the S prefix to avoid that a slave interp called "Log" + # would smash our "Log" variable. + proc InterpStateName {slave} { + return "S$slave" + } + + # Check that the given slave is "one of us" + proc IsInterp {slave} { + expr {[Exists [InterpStateName $slave]] && [::interp exists $slave]} + } + + # returns the virtual token for directory number N + # if the slave argument is given, + # it will return the corresponding master global variable name + proc PathToken {n {slave ""}} { + if {$slave ne ""} { + return "[InterpStateName $slave](access_path,$n)" + } else { + # We need to have a ":" in the token string so + # [file join] on the mac won't turn it into a relative + # path. + return "p(:$n:)" + } } - - if {![file readable $file]} { - # don't tell the file path - return -code error "not readable" + # returns the variable name of the complete path list + proc PathListName {slave} { + return "[InterpStateName $slave](access_path)" } -} - -# AliasGlob is the target of the "glob" alias in safe interpreters. -proc ::safe::AliasGlob {slave args} { - Log $slave "GLOB ! $args" NOTICE - set cmd {} - set at 0 - array set got { - -directory 0 - -nocomplain 0 - -join 0 - -tails 0 - -- 0 + # returns the variable name of the complete path list + proc VirtualPathListName {slave} { + return "[InterpStateName $slave](access_path_slave)" } - - if {$::tcl_platform(platform) eq "windows"} { - set dirPartRE {^(.*)[\\/]} - } else { - set dirPartRE {^(.*)/} + # returns the variable name of the number of items + proc PathNumberName {slave} { + return "[InterpStateName $slave](access_path,n)" } - - set dir {} - set virtualdir {} - - while {$at < [llength $args]} { - switch -glob -- [set opt [lindex $args $at]] { - -nocomplain - -- - -join - -tails { - lappend cmd $opt - set got($opt) 1 - incr at - } - -types - -type { - lappend cmd -types [lindex $args [incr at]] - incr at - } - -directory { - if {$got($opt)} { - return -code error \ - {"-directory" cannot be used with "-path"} - } - set got($opt) 1 - set virtualdir [lindex $args [incr at]] - incr at - } - pkgIndex.tcl { - # Oops, this is globbing a subdirectory in regular package - # search. That is not wanted. Abort, handler does catch - # already (because glob was not defined before). See - # package.tcl, lines 484ff in tclPkgUnknown. - return -code error "unknown command glob" - } - -* { - Log $slave "Safe base rejecting glob option '$opt'" - return -code error "Safe base rejecting glob option '$opt'" - } - default { - break - } - } - if {$got(--)} break + # returns the staticsok flag var name + proc StaticsOkName {slave} { + return "[InterpStateName $slave](staticsok)" } - - # Get the real path from the virtual one and check that the path is in the - # access path of that slave. Done after basic argument processing so that - # we know if -nocomplain is set. - if {$got(-directory)} { - if {[catch { - set dir [TranslatePath $slave $virtualdir] - DirInAccessPath $slave $dir - } msg]} { - Log $slave $msg - if {!$got(-nocomplain)} { - return -code error "permission denied" - } else { - return - } - } - lappend cmd -directory $dir + # returns the nestedok flag var name + proc NestedOkName {slave} { + return "[InterpStateName $slave](nestedok)" } - - # Apply the -join semantics ourselves - if {$got(-join)} { - set args [lreplace $args $at end [join [lrange $args $at end] "/"]] + # Run some code at the namespace toplevel + proc Toplevel {args} { + namespace eval [namespace current] $args } - - # Process remaining pattern arguments - set firstPattern [llength $cmd] - while {$at < [llength $args]} { - set opt [lindex $args $at] - incr at - if {[regexp $dirPartRE $opt -> thedir] && [catch { - set thedir [file join $virtualdir $thedir] - DirInAccessPath $slave [TranslatePath $slave $thedir] - } msg]} { - Log $slave $msg - if {$got(-nocomplain)} { - continue - } else { - return -code error "permission denied" - } - } - lappend cmd $opt - } - - Log $slave "GLOB = $cmd" NOTICE - - if {$got(-nocomplain) && [llength $cmd] eq $firstPattern} { - return + # set/get values + proc Set {args} { + Toplevel set {*}$args } - if {[catch { - ::interp invokehidden $slave glob {*}$cmd - } msg]} { - Log $slave $msg - return -code error "script error" + # lappend on toplevel vars + proc Lappend {args} { + Toplevel lappend {*}$args } - - Log $slave "GLOB @ $msg" NOTICE - - # Translate path back to what the slave should see. - set res {} - set l [string length $dir] - foreach p $msg { - if {[string equal -length $l $dir $p]} { - set p [string replace $p 0 [expr {$l-1}] $virtualdir] - } - lappend res $p + # unset a var/token (currently just an global level eval) + proc Unset {args} { + Toplevel unset {*}$args } - - Log $slave "GLOB @ $res" NOTICE - return $res -} - -# AliasSource is the target of the "source" alias in safe interpreters. - -proc ::safe::AliasSource {slave args} { - set argc [llength $args] - # Extended for handling of Tcl Modules to allow not only "source - # filename", but "source -encoding E filename" as well. - if {[lindex $args 0] eq "-encoding"} { - incr argc -2 - set encoding [lindex $args 1] - set at 2 - if {$encoding eq "identity"} { - Log $slave "attempt to use the identity encoding" - return -code error "permission denied" - } - } else { - set at 0 - set encoding {} + # test existance + proc Exists {varname} { + Toplevel info exists $varname } - if {$argc != 1} { - set msg "wrong # args: should be \"source ?-encoding E? fileName\"" - Log $slave "$msg ($args)" - return -code error $msg + # short cut for access path getting + proc GetAccessPath {slave} { + Set [PathListName $slave] } - set file [lindex $args $at] - - # get the real path from the virtual one. - if {[catch { - set realfile [TranslatePath $slave $file] - } msg]} { - Log $slave $msg - return -code error "permission denied" + # short cut for statics ok flag getting + proc StaticsOk {slave} { + Set [StaticsOkName $slave] } - - # check that the path is in the access path of that slave - if {[catch { - FileInAccessPath $slave $realfile - } msg]} { - Log $slave $msg - return -code error "permission denied" + # short cut for getting the multiples interps sub loading ok flag + proc NestedOk {slave} { + Set [NestedOkName $slave] } - - # do the checks on the filename : - if {[catch { - CheckFileName $slave $realfile - } msg]} { - Log $slave "$realfile:$msg" - return -code error $msg + # interp deletion storing hook name + proc DeleteHookName {slave} { + return [InterpStateName $slave](cleanupHook) } - # Passed all the tests, lets source it. Note that we do this all manually - # because we want to control [info script] in the slave so information - # doesn't leak so much. [Bug 2913625] - set old [::interp eval $slave {info script}] - set code [catch { - set f [open $realfile] - fconfigure $f -eofchar \032 - if {$encoding ne ""} { - fconfigure $f -encoding $encoding + # + # translate virtual path into real path + # + proc TranslatePath {slave path} { + # somehow strip the namespaces 'functionality' out (the danger + # is that we would strip valid macintosh "../" queries... : + if {[string match "*::*" $path] || [string match "*..*" $path]} { + error "invalid characters in path $path" } - set contents [read $f] - close $f - ::interp eval $slave [list info script $file] - ::interp eval $slave $contents - } msg opt] - catch {interp eval $slave [list info script $old]} - # Note that all non-errors are fine result codes from [source], so we must - # take a little care to do it properly. [Bug 2923613] - if {$code == 1} { - Log $slave $msg - return -code error "script error" + set n [expr {[Set [PathNumberName $slave]]-1}] + for {} {$n>=0} {incr n -1} { + # fill the token virtual names with their real value + set [PathToken $n] [Set [PathToken $n $slave]] + } + # replaces the token by their value + subst -nobackslashes -nocommands $path } - return -code $code -options $opt $msg -} -# AliasLoad is the target of the "load" alias in safe interpreters. -proc ::safe::AliasLoad {slave file args} { - set argc [llength $args] - if {$argc > 2} { - set msg "load error: too many arguments" - Log $slave "$msg ($argc) {$file $args}" - return -code error $msg + # Log eventually log an error + # to enable error logging, set Log to {puts stderr} for instance + proc Log {slave msg {type ERROR}} { + variable Log + if {[info exists Log] && [llength $Log]} { + {*}$Log "$type for slave $slave : $msg" + } } - # package name (can be empty if file is not). - set package [lindex $args 0] - namespace upvar ::safe S$slave state + # file name control (limit access to files/ressources that should be + # a valid tcl source file) + proc CheckFileName {slave file} { + # This used to limit what can be sourced to ".tcl" and forbid files + # with more than 1 dot and longer than 14 chars, but I changed that + # for 8.4 as a safe interp has enough internal protection already + # to allow sourcing anything. - hobbs - # Determine where to load. load use a relative interp path and {} - # means self, so we can directly and safely use passed arg. - set target [lindex $args 1] - if {$target ne ""} { - # we will try to load into a sub sub interp; check that we want to - # authorize that. - if {!$state(nestedok)} { - Log $slave "loading to a sub interp (nestedok)\ - disabled (trying to load $package to $target)" - return -code error "permission denied (nested load)" + if {![file exists $file]} { + # don't tell the file path + error "no such file or directory" + } + + if {![file readable $file]} { + # don't tell the file path + error "not readable" } } - # Determine what kind of load is requested - if {$file eq ""} { - # static package loading - if {$package eq ""} { - set msg "load error: empty filename and no package name" - Log $slave $msg + + # AliasSource is the target of the "source" alias in safe interpreters. + + proc AliasSource {slave args} { + + set argc [llength $args] + # Allow only "source filename" + if {$argc != 1} { + set msg "wrong # args: should be \"source fileName\"" + Log $slave "$msg ($args)" return -code error $msg } - if {!$state(staticsok)} { - Log $slave "static packages loading disabled\ - (trying to load $package to $target)" - return -code error "permission denied (static package)" - } - } else { - # file loading - + set file [lindex $args 0] + # get the real path from the virtual one. - if {[catch { - set file [TranslatePath $slave $file] - } msg]} { + if {[catch {set file [TranslatePath $slave $file]} msg]} { Log $slave $msg return -code error "permission denied" } - - # check the translated path - if {[catch { - FileInAccessPath $slave $file - } msg]} { + + # check that the path is in the access path of that slave + if {[catch {FileInAccessPath $slave $file} msg]} { Log $slave $msg - return -code error "permission denied (path)" + return -code error "permission denied" } - } - if {[catch { - ::interp invokehidden $slave load $file $package $target - } msg]} { - Log $slave $msg - return -code error $msg - } + # do the checks on the filename : + if {[catch {CheckFileName $slave $file} msg]} { + Log $slave "$file:$msg" + return -code error $msg + } - return $msg -} + # passed all the tests , lets source it: + if {[catch {::interp invokehidden $slave source $file} msg]} { + Log $slave $msg + return -code error "script error" + } + return $msg + } -# FileInAccessPath raises an error if the file is not found in the list of -# directories contained in the (master side recorded) slave's access path. + # AliasLoad is the target of the "load" alias in safe interpreters. -# the security here relies on "file dirname" answering the proper -# result... needs checking ? -proc ::safe::FileInAccessPath {slave file} { - namespace upvar ::safe S$slave state - set access_path $state(access_path) + proc AliasLoad {slave file args} { - if {[file isdirectory $file]} { - return -code error "\"$file\": is a directory" - } - set parent [file dirname $file] + set argc [llength $args] + if {$argc > 2} { + set msg "load error: too many arguments" + Log $slave "$msg ($argc) {$file $args}" + return -code error $msg + } - # Normalize paths for comparison since lsearch knows nothing of - # potential pathname anomalies. - set norm_parent [file normalize $parent] + # package name (can be empty if file is not). + set package [lindex $args 0] + + # Determine where to load. load use a relative interp path + # and {} means self, so we can directly and safely use passed arg. + set target [lindex $args 1] + if {$target ne ""} { + # we will try to load into a sub sub interp + # check that we want to authorize that. + if {![NestedOk $slave]} { + Log $slave "loading to a sub interp (nestedok)\ + disabled (trying to load $package to $target)" + return -code error "permission denied (nested load)" + } + + } - namespace upvar ::safe S$slave state - if {$norm_parent ni $state(access_path,norm)} { - return -code error "\"$file\": not in access_path" - } -} + # Determine what kind of load is requested + if {$file eq ""} { + # static package loading + if {$package eq ""} { + set msg "load error: empty filename and no package name" + Log $slave $msg + return -code error $msg + } + if {![StaticsOk $slave]} { + Log $slave "static packages loading disabled\ + (trying to load $package to $target)" + return -code error "permission denied (static package)" + } + } else { + # file loading -proc ::safe::DirInAccessPath {slave dir} { - namespace upvar ::safe S$slave state - set access_path $state(access_path) + # get the real path from the virtual one. + if {[catch {set file [TranslatePath $slave $file]} msg]} { + Log $slave $msg + return -code error "permission denied" + } - if {[file isfile $dir]} { - return -code error "\"$dir\": is a file" - } + # check the translated path + if {[catch {FileInAccessPath $slave $file} msg]} { + Log $slave $msg + return -code error "permission denied (path)" + } + } - # Normalize paths for comparison since lsearch knows nothing of - # potential pathname anomalies. - set norm_dir [file normalize $dir] + if {[catch {::interp invokehidden\ + $slave load $file $package $target} msg]} { + Log $slave $msg + return -code error $msg + } - namespace upvar ::safe S$slave state - if {$norm_dir ni $state(access_path,norm)} { - return -code error "\"$dir\": not in access_path" + return $msg } -} -# This procedure enables access from a safe interpreter to only a subset -# of the subcommands of a command: + # FileInAccessPath raises an error if the file is not found in + # the list of directories contained in the (master side recorded) slave's + # access path. -proc ::safe::Subset {slave command okpat args} { - set subcommand [lindex $args 0] - if {[regexp $okpat $subcommand]} { - return [$command {*}$args] - } - set msg "not allowed to invoke subcommand $subcommand of $command" - Log $slave $msg - return -code error $msg -} - -# This procedure installs an alias in a slave that invokes "safesubset" in -# the master to execute allowed subcommands. It precomputes the pattern of -# allowed subcommands; you can use wildcards in the pattern if you wish to -# allow subcommand abbreviation. -# -# Syntax is: AliasSubset slave alias target subcommand1 subcommand2... + # the security here relies on "file dirname" answering the proper + # result.... needs checking ? + proc FileInAccessPath {slave file} { -proc ::safe::AliasSubset {slave alias target args} { - set pat "^([join $args |])\$" - ::interp alias $slave $alias {}\ - [namespace current]::Subset $slave $target $pat -} + set access_path [GetAccessPath $slave] -# AliasEncoding is the target of the "encoding" alias in safe interpreters. + if {[file isdirectory $file]} { + error "\"$file\": is a directory" + } + set parent [file dirname $file] -proc ::safe::AliasEncoding {slave option args} { - # Careful; do not want empty option to get through to the [string equal] - if {[regexp {^(name.*|convert.*|)$} $option]} { - return [::interp invokehidden $slave encoding $option {*}$args] - } + # Normalize paths for comparison since lsearch knows nothing of + # potential pathname anomalies. + set norm_parent [file normalize $parent] + foreach path $access_path { + lappend norm_access_path [file normalize $path] + } - if {[string equal -length [string length $option] $option "system"]} { - if {[llength $args] == 0} { - # passed all the tests , lets source it: - if {[catch { - set sysenc [::interp invokehidden $slave encoding system] - } msg]} { - Log $slave $msg - return -code error "script error" - } - return $sysenc + if {[lsearch -exact $norm_access_path $norm_parent] == -1} { + error "\"$file\": not in access_path" } - set msg "wrong # args: should be \"encoding system\"" - set code {TCL WRONGARGS} - } else { - set msg "bad option \"$option\": must be convertfrom, convertto, names, or system" - set code [list TCL LOOKUP INDEX option $option] } - Log $slave $msg - return -code error -errorcode $code $msg -} -# Various minor hiding of platform features. [Bug 2913625] + # This procedure enables access from a safe interpreter to only a subset of + # the subcommands of a command: -proc ::safe::AliasExeName {slave} { - return "" -} + proc Subset {slave command okpat args} { + set subcommand [lindex $args 0] + if {[regexp $okpat $subcommand]} { + return [$command {*}$args] + } + set msg "not allowed to invoke subcommand $subcommand of $command" + Log $slave $msg + error $msg + } -proc ::safe::Setup {} { - #### - # - # Setup the arguments parsing + # This procedure installs an alias in a slave that invokes "safesubset" + # in the master to execute allowed subcommands. It precomputes the pattern + # of allowed subcommands; you can use wildcards in the pattern if you wish + # to allow subcommand abbreviation. # - #### - - # Share the descriptions - set temp [::tcl::OptKeyRegister { - {-accessPath -list {} "access path for the slave"} - {-noStatics "prevent loading of statically linked pkgs"} - {-statics true "loading of statically linked pkgs"} - {-nestedLoadOk "allow nested loading"} - {-nested false "nested loading"} - {-deleteHook -script {} "delete hook"} - }] + # Syntax is: AliasSubset slave alias target subcommand1 subcommand2... - # create case (slave is optional) - ::tcl::OptKeyRegister { - {?slave? -name {} "name of the slave (optional)"} - } ::safe::interpCreate + proc AliasSubset {slave alias target args} { + set pat ^(; set sep "" + foreach sub $args { + append pat $sep$sub + set sep | + } + append pat )\$ + ::interp alias $slave $alias {}\ + [namespace current]::Subset $slave $target $pat + } - # adding the flags sub programs to the command program (relying on Opt's - # internal implementation details) - lappend ::tcl::OptDesc(::safe::interpCreate) $::tcl::OptDesc($temp) + # AliasEncoding is the target of the "encoding" alias in safe interpreters. - # init and configure (slave is needed) - ::tcl::OptKeyRegister { - {slave -name {} "name of the slave"} - } ::safe::interpIC + proc AliasEncoding {slave args} { - # adding the flags sub programs to the command program (relying on Opt's - # internal implementation details) - lappend ::tcl::OptDesc(::safe::interpIC) $::tcl::OptDesc($temp) + set argc [llength $args] - # temp not needed anymore - ::tcl::OptKeyDelete $temp - - #### - # - # Default: No logging. - # - #### + set okpat "^(name.*|convert.*)\$" + set subcommand [lindex $args 0] - setLogCmd {} - - # Log eventually. - # To enable error logging, set Log to {puts stderr} for instance, - # via setLogCmd. - return -} + if {[regexp $okpat $subcommand]} { + return [::interp invokehidden $slave encoding {*}$args] + } -namespace eval ::safe { - # internal variables + if {[string first $subcommand system] == 0} { + if {$argc == 1} { + # passed all the tests , lets source it: + if {[catch {::interp invokehidden \ + $slave encoding system} msg]} { + Log $slave $msg + return -code error "script error" + } + } else { + set msg "wrong # args: should be \"encoding system\"" + Log $slave $msg + error $msg + } + } else { + set msg "wrong # args: should be \"encoding option ?arg ...?\"" + Log $slave $msg + error $msg + } - # Log command, set via 'setLogCmd'. Logging is disabled when empty. - variable Log {} + return $msg + } - # The package maintains a state array per slave interp under its - # control. The name of this array is S<interp-name>. This array is - # brought into scope where needed, using 'namespace upvar'. The S - # prefix is used to avoid that a slave interp called "Log" smashes - # the "Log" variable. - # - # The array's elements are: - # - # access_path : List of paths accessible to the slave. - # access_path,norm : Ditto, in normalized form. - # access_path,slave : Ditto, as the path tokens as seen by the slave. - # access_path,map : dict ( token -> path ) - # access_path,remap : dict ( path -> token ) - # tm_path_slave : List of TM root directories, as tokens seen by the slave. - # staticsok : Value of option -statics - # nestedok : Value of option -nested - # cleanupHook : Value of option -deleteHook } - -::safe::Setup diff --git a/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tcl8.5/tclIndex b/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tcl8.5/tclIndex index 010616fef971d130c357370761341e9efc01ec9a..2fcf4a5630db42317c9ec1df9e4d8bb5eef918e0 100644 --- a/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tcl8.5/tclIndex +++ b/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tcl8.5/tclIndex @@ -27,6 +27,7 @@ set auto_index(::tcl::HistRedo) [list source [file join $dir history.tcl]] set auto_index(::tcl::HistIndex) [list source [file join $dir history.tcl]] set auto_index(::tcl::HistEvent) [list source [file join $dir history.tcl]] set auto_index(::tcl::HistChange) [list source [file join $dir history.tcl]] +set auto_index(tclLdAout) [list source [file join $dir ldAout.tcl]] set auto_index(pkg_mkIndex) [list source [file join $dir package.tcl]] set auto_index(tclPkgSetup) [list source [file join $dir package.tcl]] set auto_index(tclPkgUnknown) [list source [file join $dir package.tcl]] diff --git a/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tcl8.5/tm.tcl b/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tcl8.5/tm.tcl index c5db437ca922f7d589a8e4db3280b7c1b06672a4..aee74f5ee41df50c6876b06ba0d23d0535eabae7 100644 --- a/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tcl8.5/tm.tcl +++ b/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tcl8.5/tm.tcl @@ -214,11 +214,11 @@ proc ::tcl::tm::UnknownHandler {original name args} { set satisfied 0 foreach path $paths { - if {![interp issafe] && ![file exists $path]} { + if {![file exists $path]} { continue } set currentsearchpath [file join $path $pkgroot] - if {![interp issafe] && ![file exists $currentsearchpath]} { + if {![file exists $currentsearchpath]} { continue } set strip [llength [file split $path]] @@ -254,18 +254,7 @@ proc ::tcl::tm::UnknownHandler {original name args} { # means something else without the namespace # specifier. - # NOTE. When making changes to the format of the - # provide command generated below CHECK that the - # 'LOCATE' procedure in core file - # 'platform/shell.tcl' still understands it, or, - # if not, update its implementation appropriately. - # - # Right now LOCATE's implementation assumes that - # the path of the package file is the last element - # in the list. - - package ifneeded $pkgname $pkgversion \ - "[::list package provide $pkgname $pkgversion];[::list source -encoding utf-8 $file]" + package ifneeded $pkgname $pkgversion [::list source -encoding utf-8 $file] # We abort in this unknown handler only if we got # a satisfying candidate for the requested @@ -363,13 +352,9 @@ proc ::tcl::tm::roots {paths} { foreach pa $paths { set p [file join $pa tcl$major] for {set n $minor} {$n >= 0} {incr n -1} { - set px [file join $p ${major}.${n}] - if {![interp issafe]} { set px [file normalize $px] } - path add $px + path add [file normalize [file join $p ${major}.${n}]] } - set px [file join $p site-tcl] - if {![interp issafe]} { set px [file normalize $px] } - path add $px + path add [file normalize [file join $p site-tcl]] } return } @@ -377,4 +362,4 @@ proc ::tcl::tm::roots {paths} { # Initialization. Set up the default paths, then insert the new # handler into the chain. -if {![interp issafe]} { ::tcl::tm::Defaults } +::tcl::tm::Defaults diff --git a/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tclConfig.sh b/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tclConfig.sh index c6b20df7e5646441ae69ae364e1ebffd9caf09b7..214bba840bc4ce8a01e1573c66463f93a577dd42 100644 --- a/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tclConfig.sh +++ b/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tclConfig.sh @@ -9,19 +9,19 @@ # # The information in this file is specific to a single platform. # -# RCS: @(#) $Id: tclConfig.sh.in,v 1.21.10.1 2010/08/12 00:11:23 hobbs Exp $ +# RCS: @(#) $Id: tclConfig.sh.in,v 1.21 2005/05/10 18:35:27 kennykb Exp $ # Tcl's version number. TCL_VERSION='8.5' TCL_MAJOR_VERSION='8' TCL_MINOR_VERSION='5' -TCL_PATCH_LEVEL='.9' +TCL_PATCH_LEVEL='.2' # C compiler to use for compilation. TCL_CC='gcc' # -D flags for use with the C compiler. -TCL_DEFS='-DPACKAGE_NAME=\"tcl\" -DPACKAGE_TARNAME=\"tcl\" -DPACKAGE_VERSION=\"8.5\" -DPACKAGE_STRING=\"tcl\ 8.5\" -DPACKAGE_BUGREPORT=\"\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_LIMITS_H=1 -DHAVE_SYS_PARAM_H=1 -DTCL_CFGVAL_ENCODING=\"iso8859-1\" -DMODULE_SCOPE=extern\ __attribute__\(\(__visibility__\(\"hidden\"\)\)\) -DTCL_SHLIB_EXT=\".so\" -DTCL_CFG_OPTIMIZED=1 -DTCL_CFG_DEBUG=1 -DTCL_TOMMATH=1 -DMP_PREC=4 -D_LARGEFILE64_SOURCE=1 -DTCL_WIDE_INT_IS_LONG=1 -DHAVE_GETCWD=1 -DHAVE_OPENDIR=1 -DHAVE_STRTOL=1 -DHAVE_WAITPID=1 -DHAVE_GETADDRINFO=1 -DUSE_TERMIOS=1 -DHAVE_SYS_TIME_H=1 -DTIME_WITH_SYS_TIME=1 -DHAVE_GMTIME_R=1 -DHAVE_LOCALTIME_R=1 -DHAVE_MKTIME=1 -DHAVE_TM_GMTOFF=1 -DHAVE_TIMEZONE_VAR=1 -DHAVE_STRUCT_STAT_ST_BLOCKS=1 -DHAVE_STRUCT_STAT_ST_BLKSIZE=1 -DHAVE_BLKCNT_T=1 -DHAVE_INTPTR_T=1 -DHAVE_UINTPTR_T=1 -DHAVE_SIGNED_CHAR=1 -DHAVE_LANGINFO=1 -DHAVE_SYS_IOCTL_H=1 -DTCL_UNLOAD_DLLS=1 ' +TCL_DEFS='-DPACKAGE_NAME=\"tcl\" -DPACKAGE_TARNAME=\"tcl\" -DPACKAGE_VERSION=\"8.5\" -DPACKAGE_STRING=\"tcl\ 8.5\" -DPACKAGE_BUGREPORT=\"\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_LIMITS_H=1 -DHAVE_SYS_PARAM_H=1 -DTCL_CFGVAL_ENCODING=\"iso8859-1\" -DMODULE_SCOPE=extern\ __attribute__\(\(__visibility__\(\"hidden\"\)\)\) -DPEEK_XCLOSEIM=1 -DTCL_SHLIB_EXT=\".so\" -DTCL_CFG_OPTIMIZED=1 -DTCL_CFG_DEBUG=1 -DTCL_TOMMATH=1 -DMP_PREC=4 -D_LARGEFILE64_SOURCE=1 -DTCL_WIDE_INT_IS_LONG=1 -DHAVE_GETCWD=1 -DHAVE_OPENDIR=1 -DHAVE_STRTOL=1 -DHAVE_WAITPID=1 -DHAVE_GETADDRINFO=1 -DUSE_TERMIOS=1 -DHAVE_SYS_TIME_H=1 -DTIME_WITH_SYS_TIME=1 -DHAVE_STRUCT_TM_TM_ZONE=1 -DHAVE_TM_ZONE=1 -DHAVE_GMTIME_R=1 -DHAVE_LOCALTIME_R=1 -DHAVE_MKTIME=1 -DHAVE_TM_GMTOFF=1 -DHAVE_TIMEZONE_VAR=1 -DHAVE_STRUCT_STAT_ST_BLKSIZE=1 -DHAVE_ST_BLKSIZE=1 -DHAVE_INTPTR_T=1 -DHAVE_UINTPTR_T=1 -DHAVE_SIGNED_CHAR=1 -DHAVE_LANGINFO=1 -DHAVE_SYS_IOCTL_H=1 -DTCL_UNLOAD_DLLS=1 ' # TCL_DBGX used to be used to distinguish debug vs. non-debug builds. # This was a righteous pain so the core doesn't do that any more. @@ -41,22 +41,31 @@ TCL_SHARED_BUILD=1 # The name of the Tcl library (may be either a .a file or a shared library): TCL_LIB_FILE='libtcl8.5.so' +# Flag to indicate whether shared libraries need export files. +TCL_NEEDS_EXP_FILE=0 + +# String that can be evaluated to generate the part of the export file +# name that comes after the "libxxx" (includes version number, if any, +# extension, and anything else needed). May depend on the variables +# VERSION. On most UNIX systems this is ${VERSION}.exp. +TCL_EXPORT_FILE_SUFFIX='' + # Additional libraries to use when linking Tcl. TCL_LIBS='-ldl -lieee -lm' # Top-level directory in which Tcl's platform-independent files are # installed. -TCL_PREFIX='/opt/shared/thirdparty/tcltk8.5/x86_64_linux' +TCL_PREFIX='/homes/kish/TclTk' # Top-level directory in which Tcl's platform-specific files (e.g. # executables) are installed. -TCL_EXEC_PREFIX='/opt/shared/thirdparty/tcltk8.5/x86_64_linux' +TCL_EXEC_PREFIX='/homes/kish/TclTk/x86_64_linux' # Flags to pass to cc when compiling the components of a shared library: TCL_SHLIB_CFLAGS='-fPIC' # Flags to pass to cc to get warning messages -TCL_CFLAGS_WARNING='-Wall' +TCL_CFLAGS_WARNING='-Wall -Wno-implicit-int' # Extra flags to pass to cc: TCL_EXTRA_CFLAGS=' -pipe ' @@ -102,15 +111,15 @@ TCL_LIB_FLAG='-ltcl8.5' # String to pass to linker to pick up the Tcl library from its # build directory. -TCL_BUILD_LIB_SPEC='-L/opt/shared/tools/src/tcl8.5.9/unix/x86_64_linux -ltcl8.5' +TCL_BUILD_LIB_SPEC='-L/homes/kish/TclTk/tcl8.5.2/unix/x86_64_linux -ltcl8.5' # String to pass to linker to pick up the Tcl library from its # installed directory. -TCL_LIB_SPEC='-L/opt/shared/thirdparty/tcltk8.5/x86_64_linux/lib -ltcl8.5' +TCL_LIB_SPEC='-L/homes/kish/TclTk/x86_64_linux/lib -ltcl8.5' # String to pass to the compiler so that an extension can # find installed Tcl headers. -TCL_INCLUDE_SPEC='-I/opt/shared/thirdparty/tcltk8.5/x86_64_linux/include' +TCL_INCLUDE_SPEC='-I/homes/kish/TclTk/include' # Indicates whether a version numbers should be used in -l switches # ("ok" means it's safe to use switches like -ltcl7.5; "nodots" means @@ -137,12 +146,12 @@ TCL_UNSHARED_LIB_SUFFIX='${VERSION}.a' # different place than the directory containing the source files, this # points to the location of the sources, not the location where Tcl was # compiled. -TCL_SRC_DIR='/opt/shared/tools/src/tcl8.5.9' +TCL_SRC_DIR='/homes/kish/TclTk/tcl8.5.2' # List of standard directories in which to look for packages during # "package require" commands. Contains the "prefix" directory plus also # the "exec_prefix" directory, if it is different. -TCL_PACKAGE_PATH='/opt/shared/thirdparty/tcltk8.5/x86_64_linux/lib ' +TCL_PACKAGE_PATH='/homes/kish/TclTk/x86_64_linux/lib /homes/kish/TclTk/lib ' # Tcl supports stub. TCL_SUPPORTS_STUBS=1 @@ -155,17 +164,17 @@ TCL_STUB_LIB_FLAG='-ltclstub8.5' # String to pass to linker to pick up the Tcl stub library from its # build directory. -TCL_BUILD_STUB_LIB_SPEC='-L/opt/shared/tools/src/tcl8.5.9/unix/x86_64_linux -ltclstub8.5' +TCL_BUILD_STUB_LIB_SPEC='-L/homes/kish/TclTk/tcl8.5.2/unix/x86_64_linux -ltclstub8.5' # String to pass to linker to pick up the Tcl stub library from its # installed directory. -TCL_STUB_LIB_SPEC='-L/opt/shared/thirdparty/tcltk8.5/x86_64_linux/lib -ltclstub8.5' +TCL_STUB_LIB_SPEC='-L/homes/kish/TclTk/x86_64_linux/lib -ltclstub8.5' # Path to the Tcl stub library in the build directory. -TCL_BUILD_STUB_LIB_PATH='/opt/shared/tools/src/tcl8.5.9/unix/x86_64_linux/libtclstub8.5.a' +TCL_BUILD_STUB_LIB_PATH='/homes/kish/TclTk/tcl8.5.2/unix/x86_64_linux/libtclstub8.5.a' # Path to the Tcl stub library in the install directory. -TCL_STUB_LIB_PATH='/opt/shared/thirdparty/tcltk8.5/x86_64_linux/lib/libtclstub8.5.a' +TCL_STUB_LIB_PATH='/homes/kish/TclTk/x86_64_linux/lib/libtclstub8.5.a' # Flag, 1: we built Tcl with threads enables, 0 we didn't TCL_THREADS=0 diff --git a/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/bgerror.tcl b/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/bgerror.tcl index af4f7c0582d1abe759c77a9ee41d12fd19a1d356..a169e8c79431bd9d71f974dd0d554a66e02abb59 100644 --- a/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/bgerror.tcl +++ b/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/bgerror.tcl @@ -10,8 +10,8 @@ # Copyright (c) 2007 by ActiveState Software Inc. # Copyright (c) 2007 Daniel A. Steffen <das@users.sourceforge.net> # -# RCS: @(#) $Id: bgerror.tcl,v 1.38.2.1 2010/01/20 23:43:50 patthoyts Exp $ -# $Id: bgerror.tcl,v 1.38.2.1 2010/01/20 23:43:50 patthoyts Exp $ +# RCS: @(#) $Id: bgerror.tcl,v 1.38 2007/12/13 15:26:26 dgp Exp $ +# $Id: bgerror.tcl,v 1.38 2007/12/13 15:26:26 dgp Exp $ namespace eval ::tk::dialog::error { namespace import -force ::tk::msgcat::* @@ -142,8 +142,6 @@ proc ::tk::dialog::error::bgerror err { if {$windowingsystem eq "aqua"} { ::tk::unsupported::MacWindowStyle style $dlg moveableAlert {} - } elseif {$windowingsystem eq "x11"} { - wm attributes $dlg -type dialog } frame $dlg.bot diff --git a/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/button.tcl b/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/button.tcl index abad17fc5dfd5d171b16fe5d07fb3acdaa8a7391..28c233b58857d6bb0fa1fc390840516c53c0dcf5 100644 --- a/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/button.tcl +++ b/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/button.tcl @@ -4,7 +4,7 @@ # checkbutton, and radiobutton widgets and provides procedures # that help in implementing those bindings. # -# RCS: @(#) $Id: button.tcl,v 1.19.4.3 2010/08/03 23:12:06 hobbs Exp $ +# RCS: @(#) $Id: button.tcl,v 1.19 2005/07/25 09:06:01 dkf Exp $ # # Copyright (c) 1992-1994 The Regents of the University of California. # Copyright (c) 1994-1996 Sun Microsystems, Inc. @@ -37,9 +37,6 @@ if {[tk windowingsystem] eq "aqua"} { bind Checkbutton <ButtonRelease-1> { tk::ButtonUp %W } - bind Checkbutton <Leave> { - tk::ButtonLeave %W - } } if {"windows" eq $tcl_platform(platform)} { bind Checkbutton <equal> { @@ -60,9 +57,6 @@ if {"windows" eq $tcl_platform(platform)} { bind Checkbutton <Enter> { tk::CheckRadioEnter %W } - bind Checkbutton <Leave> { - tk::ButtonLeave %W - } bind Radiobutton <1> { tk::CheckRadioDown %W @@ -77,7 +71,7 @@ if {"windows" eq $tcl_platform(platform)} { if {"x11" eq [tk windowingsystem]} { bind Checkbutton <Return> { if {!$tk_strictMotif} { - tk::CheckInvoke %W + tk::CheckRadioInvoke %W } } bind Radiobutton <Return> { @@ -86,20 +80,17 @@ if {"x11" eq [tk windowingsystem]} { } } bind Checkbutton <1> { - tk::CheckInvoke %W + tk::CheckRadioInvoke %W } bind Radiobutton <1> { tk::CheckRadioInvoke %W } bind Checkbutton <Enter> { - tk::CheckEnter %W + tk::ButtonEnter %W } bind Radiobutton <Enter> { tk::ButtonEnter %W } - bind Checkbutton <Leave> { - tk::CheckLeave %W - } } bind Button <space> { @@ -127,6 +118,9 @@ bind Button <ButtonRelease-1> { } bind Checkbutton <FocusIn> {} +bind Checkbutton <Leave> { + tk::ButtonLeave %W +} bind Radiobutton <FocusIn> {} bind Radiobutton <Leave> { @@ -641,110 +635,3 @@ proc ::tk::CheckRadioInvoke {w {cmd invoke}} { uplevel #0 [list $w $cmd] } } - -# Special versions of the handlers for checkbuttons on Unix that do the magic -# to make things work right when the checkbutton indicator is hidden; -# radiobuttons don't need this complexity. - -# ::tk::CheckInvoke -- -# The procedure below invokes the checkbutton, like ButtonInvoke, but handles -# what to do when the checkbutton indicator is missing. Only used on Unix. -# -# Arguments: -# w - The name of the widget. - -proc ::tk::CheckInvoke {w} { - variable ::tk::Priv - if {[$w cget -state] ne "disabled"} { - # Additional logic to switch the "selected" colors around if necessary - # (when we're indicator-less). - - if {![$w cget -indicatoron] && [info exist Priv($w,selectcolor)]} { - if {[$w cget -selectcolor] eq $Priv($w,aselectcolor)} { - $w configure -selectcolor $Priv($w,selectcolor) - } else { - $w configure -selectcolor $Priv($w,aselectcolor) - } - } - uplevel #0 [list $w invoke] - } -} - -# ::tk::CheckEnter -- -# The procedure below enters the checkbutton, like ButtonEnter, but handles -# what to do when the checkbutton indicator is missing. Only used on Unix. -# -# Arguments: -# w - The name of the widget. - -proc ::tk::CheckEnter {w} { - variable ::tk::Priv - if {[$w cget -state] ne "disabled"} { - # On unix the state is active just with mouse-over - $w configure -state active - - # If the mouse button is down, set the relief to sunken on entry. - # Overwise, if there's an -overrelief value, set the relief to that. - - set Priv($w,relief) [$w cget -relief] - if {$Priv(buttonWindow) eq $w} { - $w configure -relief sunken - set Priv($w,prelief) sunken - } elseif {[set over [$w cget -overrelief]] ne ""} { - $w configure -relief $over - set Priv($w,prelief) $over - } - - # Compute what the "selected and active" color should be. - - if {![$w cget -indicatoron] && [$w cget -selectcolor] ne ""} { - set Priv($w,selectcolor) [$w cget -selectcolor] - lassign [winfo rgb $w [$w cget -selectcolor]] r1 g1 b1 - lassign [winfo rgb $w [$w cget -activebackground]] r2 g2 b2 - set Priv($w,aselectcolor) \ - [format "#%04x%04x%04x" [expr {($r1+$r2)/2}] \ - [expr {($g1+$g2)/2}] [expr {($b1+$b2)/2}]] - # use uplevel to work with other var resolvers - if {[uplevel #0 [list set [$w cget -variable]]] - eq [$w cget -onvalue]} { - $w configure -selectcolor $Priv($w,aselectcolor) - } - } - } - set Priv(window) $w -} - -# ::tk::CheckLeave -- -# The procedure below leaves the checkbutton, like ButtonLeave, but handles -# what to do when the checkbutton indicator is missing. Only used on Unix. -# -# Arguments: -# w - The name of the widget. - -proc ::tk::CheckLeave {w} { - variable ::tk::Priv - if {[$w cget -state] ne "disabled"} { - $w configure -state normal - } - - # Restore the original button "selected" color; assume that the user - # wasn't monkeying around with things too much. - - if {![$w cget -indicatoron] && [info exist Priv($w,selectcolor)]} { - $w configure -selectcolor $Priv($w,selectcolor) - } - unset -nocomplain Priv($w,selectcolor) Priv($w,aselectcolor) - - # Restore the original button relief if it was changed by Tk. That is - # signaled by the existence of Priv($w,prelief). - - if {[info exists Priv($w,relief)]} { - if {[info exists Priv($w,prelief)] && \ - $Priv($w,prelief) eq [$w cget -relief]} { - $w configure -relief $Priv($w,relief) - } - unset -nocomplain Priv($w,relief) Priv($w,prelief) - } - - set Priv(window) "" -} diff --git a/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/clrpick.tcl b/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/clrpick.tcl index b249e31d395d8b216365f7e00705e330104cdba1..216cdb8f1a7a25633add04eb07a875518d380072 100644 --- a/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/clrpick.tcl +++ b/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/clrpick.tcl @@ -3,7 +3,7 @@ # Color selection dialog for platforms that do not support a # standard color selection dialog. # -# RCS: @(#) $Id: clrpick.tcl,v 1.22.4.1 2010/01/20 23:43:51 patthoyts Exp $ +# RCS: @(#) $Id: clrpick.tcl,v 1.22 2006/03/17 11:13:15 patthoyts Exp $ # # Copyright (c) 1996 Sun Microsystems, Inc. # @@ -74,7 +74,6 @@ proc ::tk::dialog::color:: {args} { destroy $w } toplevel $w -class TkColorDialog -screen $sc - if {[tk windowingsystem] eq "x11"} {wm attributes $w -type dialog} BuildDialog $w } diff --git a/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/console.tcl b/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/console.tcl index 441ce485e75932e497b6e8bc06a9a3d0aff89b0a..6c176bcee35598e3fd79a138e5bf44192c049e34 100644 --- a/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/console.tcl +++ b/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/console.tcl @@ -4,7 +4,7 @@ # can be used by non-unix systems that do not have built-in support # for shells. # -# RCS: @(#) $Id: console.tcl,v 1.37.2.3 2010/01/04 21:34:12 patthoyts Exp $ +# RCS: @(#) $Id: console.tcl,v 1.37 2007/12/13 15:26:27 dgp Exp $ # # Copyright (c) 1995-1997 Sun Microsystems, Inc. # Copyright (c) 1998-2000 Ajuba Solutions. @@ -69,7 +69,10 @@ proc ::tk::ConsoleInit {} { -command {wm withdraw .} AmpMenuArgs .menubar.file add command -label [mc "&Clear Console"] \ -command {.console delete 1.0 "promptEnd linestart"} - if {[tk windowingsystem] ne "aqua"} { + if {[tk windowingsystem] eq "aqua"} { + AmpMenuArgs .menubar.file add command \ + -label [mc &Quit] -command {exit} -accel "Cmd-Q" + } else { AmpMenuArgs .menubar.file add command -label [mc E&xit] -command {exit} } @@ -103,7 +106,7 @@ proc ::tk::ConsoleInit {} { . configure -menu .menubar # See if we can find a better font than the TkFixedFont - catch {font create TkConsoleFont {*}[font configure TkFixedFont]} + font create TkConsoleFont {*}[font configure TkFixedFont] set families [font families] switch -exact -- [tk windowingsystem] { aqua { set preferred {Monaco 10} } @@ -325,39 +328,6 @@ proc ::tk::ConsolePrompt {{partial normal}} { $w see end } -# Copy selected text from the console -proc ::tk::console::Copy {w} { - if {![catch {set data [$w get sel.first sel.last]}]} { - clipboard clear -displayof $w - clipboard append -displayof $w $data - } -} -# Copies selected text. If the selection is within the current active edit -# region then it will be cut, if not it is only copied. -proc ::tk::console::Cut {w} { - if {![catch {set data [$w get sel.first sel.last]}]} { - clipboard clear -displayof $w - clipboard append -displayof $w $data - if {[$w compare sel.first >= output]} { - $w delete sel.first sel.last - } - } -} -# Paste text from the clipboard -proc ::tk::console::Paste {w} { - catch { - set clip [::tk::GetSelection $w CLIPBOARD] - set list [split $clip \n\r] - tk::ConsoleInsert $w [lindex $list 0] - foreach x [lrange $list 1 end] { - $w mark set insert {end - 1c} - tk::ConsoleInsert $w "\n" - tk::ConsoleInvoke - tk::ConsoleInsert $w $x - } - } -} - # ::tk::ConsoleBind -- # This procedure first ensures that the default bindings for the Text # class have been defined. Then certain bindings are overridden for @@ -384,8 +354,6 @@ proc ::tk::ConsoleBind {w} { # Ignore all Alt, Meta, and Control keypresses unless explicitly bound. # Otherwise, if a widget binding for one of these is defined, the - # <Keypress> class binding will also fire and insert the character - # which is wrong. bind Console <Alt-KeyPress> {# nothing } bind Console <Meta-KeyPress> {# nothing} @@ -558,10 +526,32 @@ proc ::tk::ConsoleBind {w} { exit } } - bind Console <<Cut>> { ::tk::console::Cut %W } - bind Console <<Copy>> { ::tk::console::Copy %W } - bind Console <<Paste>> { ::tk::console::Paste %W } - + bind Console <<Cut>> { + # Same as the copy event + if {![catch {set data [%W get sel.first sel.last]}]} { + clipboard clear -displayof %W + clipboard append -displayof %W $data + } + } + bind Console <<Copy>> { + if {![catch {set data [%W get sel.first sel.last]}]} { + clipboard clear -displayof %W + clipboard append -displayof %W $data + } + } + bind Console <<Paste>> { + catch { + set clip [::tk::GetSelection %W CLIPBOARD] + set list [split $clip \n\r] + tk::ConsoleInsert %W [lindex $list 0] + foreach x [lrange $list 1 end] { + %W mark set insert {end - 1c} + tk::ConsoleInsert %W "\n" + tk::ConsoleInvoke + tk::ConsoleInsert %W $x + } + } + } bind Console <<Console_FontSizeIncr>> { set size [font configure TkConsoleFont -size] font configure TkConsoleFont -size [incr size] @@ -599,6 +589,7 @@ proc ::tk::ConsoleBind {w} { if {"%A" ne ""} { ::tk::console::TagProc %W } + break } } diff --git a/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/demos/ctext.tcl b/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/demos/ctext.tcl index 679dcc4dc4ea62c77aa2b38c0950e8fb9384d9d4..b65635b782050fdb370b94067505912b8c023b2b 100644 --- a/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/demos/ctext.tcl +++ b/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/demos/ctext.tcl @@ -3,7 +3,7 @@ # This demonstration script creates a canvas widget with a text # item that can be edited and reconfigured in various ways. # -# RCS: @(#) $Id: ctext.tcl,v 1.5.4.1 2009/10/27 14:02:58 dkf Exp $ +# RCS: @(#) $Id: ctext.tcl,v 1.5 2004/12/21 11:56:35 dkf Exp $ if {![info exists widgetDemo]} { error "This script should be run from the \"widget\" demo." @@ -42,7 +42,7 @@ $c create rectangle 245 195 255 205 -outline black -fill red # First, create the text item and give it bindings so it can be edited. -$c addtag text withtag [$c create text 250 200 -text "This is just a string of text to demonstrate the text facilities of canvas widgets. Bindings have been been defined to support editing (see above)." -width 440 -anchor n -font $textFont -justify left] +$c addtag text withtag [$c create text 250 200 -text "This is just a string of text to demonstrate the text facilities of canvas widgets. Bindings have been been defined to support editing (see above)." -width 440 -anchor n -font {Helvetica 24} -justify left] $c bind text <1> "textB1Press $c %x %y" $c bind text <B1-Motion> "textB1Move $c %x %y" $c bind text <Shift-1> "$c select adjust current @%x,%y" diff --git a/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/demos/filebox.tcl b/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/demos/filebox.tcl index e6088d82c011d6a80a4a9d86bed5ee38fb7de878..d9144560bfee8aa215460ab48cdb48e223166a8e 100644 --- a/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/demos/filebox.tcl +++ b/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/demos/filebox.tcl @@ -2,7 +2,7 @@ # # This demonstration script prompts the user to select a file. # -# RCS: @(#) $Id: filebox.tcl,v 1.9.2.1 2009/04/10 16:42:13 das Exp $ +# RCS: @(#) $Id: filebox.tcl,v 1.9 2007/12/13 15:27:07 dgp Exp $ if {![info exists widgetDemo]} { error "This script should be run from the \"widget\" demo." @@ -35,7 +35,7 @@ foreach i {open save} { pack $f -fill x -padx 1c -pady 3 } -if {[tk windowingsystem] eq "x11"} { +if {$tcl_platform(platform) eq "unix"} { checkbutton $w.strict -text "Use Motif Style Dialog" \ -variable tk_strictMotif -onvalue 1 -offvalue 0 pack $w.strict -anchor c diff --git a/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/demos/knightstour.tcl b/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/demos/knightstour.tcl index b52e38f951a43a046925de1f486750b0795cef0f..95ee6cacb92b3f06b00218eadec08a1dbd27516d 100644 --- a/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/demos/knightstour.tcl +++ b/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/demos/knightstour.tcl @@ -245,11 +245,13 @@ proc CreateGUI {} { tkwait window $dlg } -if {![winfo exists .knightstour]} { - if {![info exists widgetDemo]} { wm withdraw . } - set r [catch [linsert $argv 0 CreateGUI] err] - if {$r} { - tk_messageBox -icon error -title "Error" -message $err +if {!$tcl_interactive} { + if {![winfo exists .knightstour]} { + if {![info exists widgetDemo]} { wm withdraw . } + set r [catch [linsert $argv 0 CreateGUI] err] + if {$r} { + tk_messageBox -icon error -title "Error" -message $err + } + if {![info exists widgetDemo]} { exit $r } } - if {![info exists widgetDemo]} { exit $r } } diff --git a/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/demos/license.terms b/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/demos/license.terms index 50619a32ddca7bf0fbc3d06a284101fee8b1f5bf..03ca6fcb319dd8cece2e24c349e6ec59d8c1bb20 100644 --- a/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/demos/license.terms +++ b/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/demos/license.terms @@ -33,7 +33,7 @@ Acquisition Regulations (FARs) in Clause 52.227.19 (c) (2). If you are acquiring the software on behalf of the Department of Defense, the software shall be classified as "Commercial Computer Software" and the Government shall have only "Restricted Rights" as defined in Clause -252.227-7013 (b) (3) of DFARs. Notwithstanding the foregoing, the +252.227-7013 (c) (1) of DFARs. Notwithstanding the foregoing, the authors grant the U.S. Government and others acting in its behalf permission to use and distribute the software in accordance with the terms specified in this license. diff --git a/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/demos/pendulum.tcl b/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/demos/pendulum.tcl index f785303edef5b1c7f70a146afdb53f3e5bae2bbc..b70cbf12a9e956dbe4c71bb901120f9f7103d4d7 100644 --- a/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/demos/pendulum.tcl +++ b/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/demos/pendulum.tcl @@ -3,7 +3,7 @@ # This demonstration illustrates how Tcl/Tk can be used to construct # simulations of physical systems. # -# RCS: @(#) $Id: pendulum.tcl,v 1.3.4.1 2009/08/08 08:28:40 dkf Exp $ +# RCS: @(#) $Id: pendulum.tcl,v 1.3 2006/10/17 05:52:40 das Exp $ if {![info exists widgetDemo]} { error "This script should be run from the \"widget\" demo." @@ -35,10 +35,10 @@ $w.p add [labelframe $w.p.l2 -text "Phase Space"] canvas $w.c -width 320 -height 200 -background white -bd 2 -relief sunken $w.c create text 5 5 -anchor nw -text "Click to Adjust Bob Start Position" # Coordinates of these items don't matter; they will be set properly below -$w.c create line 0 25 320 25 -tags plate -fill grey50 -width 2 -$w.c create oval 155 20 165 30 -tags pivot -fill grey50 -outline {} -$w.c create line 1 1 1 1 -tags rod -fill black -width 3 -$w.c create oval 1 1 2 2 -tags bob -fill yellow -outline black +$w.c create line 0 25 320 25 -width 2 -fill grey50 -tags plate +$w.c create line 1 1 1 1 -tags pendulumRod -width 3 -fill black +$w.c create oval 1 1 2 2 -tags pendulumBob -fill yellow -outline black +$w.c create oval 155 20 165 30 -fill grey50 -outline {} pack $w.c -in $w.p.l1 -fill both -expand true # Create the canvas containing the phase space graph; this consists of @@ -62,7 +62,6 @@ set Theta 45.0 set dTheta 0.0 set pi 3.1415926535897933 set length 150 -set home 160 # This procedure makes the pendulum appear at the correct place on the # canvas. If the additional arguments "at $x $y" are passed (the 'at' @@ -71,20 +70,20 @@ set home 160 # length and angle are computed in reverse from the given location # (which is taken to be the centre of the pendulum bob.) proc showPendulum {canvas {at {}} {x {}} {y {}}} { - global Theta dTheta pi length home - if {$at eq "at" && ($x!=$home || $y!=25)} { + global Theta dTheta pi length + if {$at eq "at" && ($x!=160 || $y!=25)} { set dTheta 0.0 - set x2 [expr {$x - $home}] - set y2 [expr {$y - 25}] - set length [expr {hypot($x2, $y2)}] - set Theta [expr {atan2($x2, $y2) * 180/$pi}] + set x2 [expr {$x-160}] + set y2 [expr {$y-25}] + set length [expr {hypot($x2,$y2)}] + set Theta [expr {atan2($x2,$y2)*180/$pi}] } else { set angle [expr {$Theta * $pi/180}] - set x [expr {$home + $length*sin($angle)}] - set y [expr {25 + $length*cos($angle)}] + set x [expr {160+$length*sin($angle)}] + set y [expr {25+$length*cos($angle)}] } - $canvas coords rod $home 25 $x $y - $canvas coords bob \ + $canvas coords pendulumRod 160 25 $x $y + $canvas coords pendulumBob \ [expr {$x-15}] [expr {$y-15}] [expr {$x+15}] [expr {$y+15}] } showPendulum $w.c @@ -128,8 +127,6 @@ bind $w.c <ButtonRelease-1> { } bind $w.c <Configure> { %W coords plate 0 25 %w 25 - set home [expr %w/2] - %W coords pivot [expr $home-5] 20 [expr $home+5] 30 } bind $w.k <Configure> { set psh [expr %h/2] diff --git a/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/demos/unicodeout.tcl b/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/demos/unicodeout.tcl index 8e108b685fce947d6db15db3420829d00daf5184..3d733e1519c73bac1f2f9fbe1d077e12a46d64b3 100644 --- a/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/demos/unicodeout.tcl +++ b/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/demos/unicodeout.tcl @@ -3,7 +3,7 @@ # This demonstration script shows how you can produce output (in label # widgets) using many different alphabets. # -# RCS: @(#) $Id: unicodeout.tcl,v 1.7.2.1 2009/12/15 03:43:33 kennykb Exp $ +# RCS: @(#) $Id: unicodeout.tcl,v 1.7 2007/12/13 15:27:07 dgp Exp $ if {![info exists widgetDemo]} { error "This script should be run from the \"widget\" demo." @@ -11,26 +11,6 @@ if {![info exists widgetDemo]} { package require Tk -# On Windows, we need to determine whether the font system will render -# right-to-left text. - -if {[tk windowingsystem] eq {win32}} { - set rkey [join { - HKEY_LOCAL_MACHINE - SOFTWARE - Microsoft - {Windows NT} - CurrentVersion - LanguagePack - } \\] - set w32langs {} - if {![catch {package require registry}]} { - if {[catch {registry values $rkey} w32langs]} { - set w32langs {} - } - } -} - set w .unicodeout catch {destroy $w} toplevel $w @@ -75,34 +55,32 @@ set oldCursor [$w cget -cursor] $w conf -cursor watch update -if {[tk windowingsystem] eq {x11} - || (([tk windowingsystem] eq {win32}) && ({ARABIC} ni $w32langs))} { - # Using presentation forms (pre-layouted) - addSample $w Arabic \ - "\uFE94\uFEF4\uFE91\uFEAE\uFECC\uFEDF\uFE8D " \ - "\uFE94\uFEE4\uFEE0\uFEDC\uFEDF\uFE8D" +if {[tk windowingsystem] in {x11 win32}} { + # Using presentation forms (pre-layouted) + addSample $w Arabic \ + "\uFE94\uFEF4\uFE91\uFEAE\uFECC\uFEDF\uFE8D " \ + "\uFE94\uFEE4\uFEE0\uFEDC\uFEDF\uFE8D" } else { - # Using standard text characters - addSample $w Arabic \ - "\u0627\u0644\u0643\u0644\u0645\u0629 " \ - "\u0627\u0644\u0639\u0631\u0628\u064A\u0629" + # Using standard text characters + addSample $w Arabic \ + "\u0627\u0644\u0643\u0644\u0645\u0629 " \ + "\u0627\u0644\u0639\u0631\u0628\u064A\u0629" } addSample $w "Trad. Chinese" "\u4E2D\u570B\u7684\u6F22\u5B57" addSample $w "Simpl. Chinese" "\u6C49\u8BED" addSample $w Greek \ "\u0395\u03BB\u03BB\u03B7\u03BD\u03B9\u03BA\u03AE " \ "\u03B3\u03BB\u03CE\u03C3\u03C3\u03B1" -if {[tk windowingsystem] eq {x11} - || (([tk windowingsystem] eq {win32}) && ({HEBREW} ni $w32langs))} { - # Visual order (pre-layouted) - addSample $w Hebrew \ - "\u05EA\u05D9\u05E8\u05D1\u05E2 " \ - "\u05D1\u05EA\u05DB" +if {[tk windowingsystem] in {x11 win32}} { + # Visual order (pre-layouted) + addSample $w Hebrew \ + "\u05DD\u05D9\u05DC\u05E9\u05D5\u05E8\u05D9 " \ + "\u05DC\u05D9\u05D0\u05E8\u05E9\u05D9" } else { - # Standard logical order - addSample $w Hebrew \ - "\u05DB\u05EA\u05D1 " \ - "\u05E2\u05D1\u05E8\u05D9\u05EA" + # Standard logical order + addSample $w Hebrew \ + "\u05D9\u05E9\u05E8\u05D0\u05D9\u05DC " \ + "\u05D9\u05E8\u05D5\u05E9\u05DC\u05D9\u05DD" } addSample $w Japanese \ "\u65E5\u672C\u8A9E\u306E\u3072\u3089\u304C\u306A, " \ diff --git a/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/demos/widget b/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/demos/widget index 0f920db644bad8c954b09137be47bdc9fc4f1000..cefb75cffd9ee1a338c9394c60e297178269071c 100755 --- a/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/demos/widget +++ b/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/demos/widget @@ -10,7 +10,7 @@ exec wish8.5 "$0" "$@" # separate ".tcl" files is this directory, which are sourced by this script as # needed. # -# RCS: @(#) $Id: widget,v 1.51.2.3 2010/01/20 23:43:51 patthoyts Exp $ +# RCS: @(#) $Id: widget,v 1.51 2008/03/11 22:30:17 das Exp $ package require Tcl 8.5 package require Tk 8.5 @@ -199,12 +199,12 @@ set lastLine "" .t tag bind demo <Enter> { set lastLine [.t index {@%x,%y linestart}] .t tag add hot "$lastLine +1 chars" "$lastLine lineend -1 chars" - .t config -cursor [::ttk::cursor link] + .t config -cursor hand2 showStatus [.t index {@%x,%y}] } .t tag bind demo <Leave> { .t tag remove hot 1.0 end - .t config -cursor [::ttk::cursor text] + .t config -cursor xterm .statusBar.lab config -text "" } .t tag bind demo <Motion> { @@ -365,8 +365,6 @@ addFormattedText { @@demo hscale Horizontal scale @@demo vscale Vertical scale @@new - @@demo ttkscale Themed scale linked to a label with traces - @@new @@demo ttkprogress Progress bar @@subtitle Paned Windows and Notebooks @@ -473,7 +471,6 @@ proc positionWindow w { proc showVars {w args} { catch {destroy $w} toplevel $w - if {[tk windowingsystem] eq "x11"} {wm attributes $w -type dialog} wm title $w [mc "Variable values"] set b [ttk::frame $w.frame] @@ -519,7 +516,7 @@ proc invoke index { return } set cursor [.t cget -cursor] - .t configure -cursor [::ttk::cursor busy] + .t configure -cursor watch update set demo [string range [lindex $tags $i] 5 end] uplevel 1 [list source [file join $tk_demoDirectory $demo.tcl]] @@ -540,11 +537,11 @@ proc showStatus index { set cursor [.t cget -cursor] if {$i < 0} { .statusBar.lab config -text " " - set newcursor [::ttk::cursor text] + set newcursor xterm } else { set demo [string range [lindex $tags $i] 5 end] .statusBar.lab config -text [mc "Run the \"%s\" sample program" $demo] - set newcursor [::ttk::cursor link] + set newcursor hand2 } if {$cursor ne $newcursor} { .t config -cursor $newcursor @@ -575,7 +572,6 @@ proc showCode w { set top .code if {![winfo exists $top]} { toplevel $top - if {[tk windowingsystem] eq "x11"} {wm attributes $top -type dialog} set t [frame $top.f] set text [text $t.text -font fixedFont -height 24 -wrap word \ diff --git a/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/dialog.tcl b/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/dialog.tcl index 6add77d239aad5596a2c1f4f0463a39080d56543..b032b624bded3858350e90196f14a913dbed05bb 100644 --- a/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/dialog.tcl +++ b/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/dialog.tcl @@ -3,7 +3,7 @@ # This file defines the procedure tk_dialog, which creates a dialog # box containing a bitmap, a message, and one or more buttons. # -# RCS: @(#) $Id: dialog.tcl,v 1.24.2.2 2010/01/20 23:43:51 patthoyts Exp $ +# RCS: @(#) $Id: dialog.tcl,v 1.24 2007/12/13 15:26:27 dgp Exp $ # # Copyright (c) 1992-1993 The Regents of the University of California. # Copyright (c) 1994-1997 Sun Microsystems, Inc. @@ -74,8 +74,6 @@ proc ::tk_dialog {w title text bitmap default args} { if {$windowingsystem eq "aqua"} { ::tk::unsupported::MacWindowStyle style $w moveableModal {} - } elseif {$windowingsystem eq "x11"} { - wm attributes $w -type dialog } frame $w.bot @@ -131,14 +129,15 @@ proc ::tk_dialog {w title text bitmap default args} { # 4. Create a binding for <Return> on the dialog if there is a # default button. - # Convention also dictates that if the keyboard focus moves among the - # the buttons that the <Return> binding affects the button with the focus. if {$default >= 0} { - bind $w <Return> [list $w.button$default invoke] + bind $w <Return> " + [list $w.button$default] configure -state active -relief sunken + update idletasks + after 100 + set ::tk::Priv(button) $default + " } - bind $w <<PrevWindow>> [list bind $w <Return> {[tk_focusPrev %W] invoke}] - bind $w <Tab> [list bind $w <Return> {[tk_focusNext %W] invoke}] # 5. Create a <Destroy> binding for the window that sets the # button variable to -1; this is needed in case something happens @@ -173,12 +172,17 @@ proc ::tk_dialog {w title text bitmap default args} { # 7. Set a grab and claim the focus too. + set oldFocus [focus] + set oldGrab [grab current $w] + if {$oldGrab ne ""} { + set grabStatus [grab status $oldGrab] + } + grab $w if {$default >= 0} { - set focus $w.button$default + focus $w.button$default } else { - set focus $w + focus $w } - tk::SetFocusGrab $w $focus # 8. Wait for the user to respond, then restore the focus and # return the index of the selected button. Restore the focus @@ -187,14 +191,21 @@ proc ::tk_dialog {w title text bitmap default args} { # restore any grab that was in effect. vwait ::tk::Priv(button) - + catch {focus $oldFocus} catch { # It's possible that the window has already been destroyed, # hence this "catch". Delete the Destroy handler so that # Priv(button) doesn't get reset by it. bind $w <Destroy> {} + destroy $w + } + if {$oldGrab ne ""} { + if {$grabStatus ne "global"} { + grab $oldGrab + } else { + grab -global $oldGrab + } } - tk::RestoreFocusGrab $w $focus return $Priv(button) } diff --git a/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/menu.tcl b/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/menu.tcl index bf5c955ca0f7fd346335bc4744f2dd2cb4f37474..eda9478e55761d8815125a5c0435ef7943c92d3d 100644 --- a/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/menu.tcl +++ b/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/menu.tcl @@ -4,7 +4,7 @@ # It also implements keyboard traversal of menus and implements a few # other utility procedures related to menus. # -# RCS: @(#) $Id: menu.tcl,v 1.26.2.6 2010/01/09 00:51:38 patthoyts Exp $ +# RCS: @(#) $Id: menu.tcl,v 1.26 2007/12/13 15:26:27 dgp Exp $ # # Copyright (c) 1992-1994 The Regents of the University of California. # Copyright (c) 1994-1997 Sun Microsystems, Inc. @@ -261,10 +261,8 @@ proc ::tk::MbPost {w {x {}} {y {}}} { if {$cur ne ""} { MenuUnpost {} } - if {$::tk_strictMotif} { - set Priv(cursor) [$w cget -cursor] - $w configure -cursor arrow - } + set Priv(cursor) [$w cget -cursor] + $w configure -cursor arrow if {[tk windowingsystem] ne "aqua"} { set Priv(relief) [$w cget -relief] $w configure -relief raised @@ -307,7 +305,7 @@ proc ::tk::MbPost {w {x {}} {y {}}} { set x [expr {[winfo rootx $w] - [winfo reqwidth $menu]}] set y [expr {(2 * [winfo rooty $w] + [winfo height $w]) / 2}] set entry [MenuFindName $menu [$w cget -text]] - if {[$w cget -indicatoron] && $entry ne ""} { + if {[$w cget -indicatoron]} { if {$entry == [$menu index last]} { incr y [expr {-([$menu yposition $entry] \ + [winfo reqheight $menu])/2}] @@ -327,7 +325,7 @@ proc ::tk::MbPost {w {x {}} {y {}}} { set x [expr {[winfo rootx $w] + [winfo width $w]}] set y [expr {(2 * [winfo rooty $w] + [winfo height $w]) / 2}] set entry [MenuFindName $menu [$w cget -text]] - if {[$w cget -indicatoron] && $entry ne ""} { + if {[$w cget -indicatoron]} { if {$entry == [$menu index last]} { incr y [expr {-([$menu yposition $entry] \ + [winfo reqheight $menu])/2}] @@ -406,17 +404,12 @@ proc ::tk::MenuUnpost menu { # Unpost menu(s) and restore some stuff that's dependent on # what was posted. - after cancel [array get Priv menuActivatedTimer] - unset -nocomplain Priv(menuActivated) - catch { if {$mb ne ""} { set menu [$mb cget -menu] $menu unpost set Priv(postedMb) {} - if {$::tk_strictMotif} { - $mb configure -cursor $Priv(cursor) - } + $mb configure -cursor $Priv(cursor) if {[tk windowingsystem] ne "aqua"} { $mb configure -relief $Priv(relief) } else { @@ -464,9 +457,7 @@ proc ::tk::MenuUnpost menu { } RestoreOldGrab if {$Priv(menuBar) ne ""} { - if {$::tk_strictMotif} { - $Priv(menuBar) configure -cursor $Priv(cursor) - } + $Priv(menuBar) configure -cursor $Priv(cursor) set Priv(menuBar) {} } if {[tk windowingsystem] ne "x11"} { @@ -550,7 +541,6 @@ proc ::tk::MbButtonUp w { proc ::tk::MenuMotion {menu x y state} { variable ::tk::Priv if {$menu eq $Priv(window)} { - set activeindex [$menu index active] if {[$menu cget -type] eq "menubar"} { if {[info exists Priv(focus)] && $menu ne $Priv(focus)} { $menu activate @$x,$y @@ -560,18 +550,9 @@ proc ::tk::MenuMotion {menu x y state} { $menu activate @$x,$y GenerateMenuSelect $menu } - set index [$menu index @$x,$y] - if {[info exists Priv(menuActivated)] \ - && $index ne "none" \ - && $index ne $activeindex \ - && [$menu type $index] eq "cascade"} { - set mode [option get $menu clickToFocus ClickToFocus] - if {$mode eq "" || ([string is boolean $mode] && !$mode)} { - set delay [expr {[$menu cget -type] eq "menubar"? 0 : 50}] - set Priv(menuActivatedTimer) \ - [after $delay [list $menu postcascade active]] - } - } + } + if {($state & 0x1f00) != 0} { + $menu postcascade active } } @@ -609,13 +590,8 @@ proc ::tk::MenuButtonDown menu { if {$Priv(menuBar) eq {}} { set Priv(menuBar) $menu - if {$::tk_strictMotif} { - set Priv(cursor) [$menu cget -cursor] - $menu configure -cursor arrow - } - if {[$menu type active] eq "cascade"} { - set Priv(menuActivated) 1 - } + set Priv(cursor) [$menu cget -cursor] + $menu configure -cursor arrow } # Don't update grab information if the grab window isn't changing. @@ -1327,7 +1303,6 @@ proc ::tk_popup {menu x y {entry {}}} { tk::SaveGrabInfo $menu grab -global $menu set Priv(popup) $menu - set Priv(menuActivated) 1 tk_menuSetFocus $menu } } diff --git a/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/msgbox.tcl b/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/msgbox.tcl index 60b733fb3ea9aa62c1b4fb87d568713ad709043e..04d26a7e55d4b8753db3e05a8162efee3e5a4624 100644 --- a/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/msgbox.tcl +++ b/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/msgbox.tcl @@ -3,7 +3,7 @@ # Implements messageboxes for platforms that do not have native # messagebox support. # -# RCS: @(#) $Id: msgbox.tcl,v 1.36.2.3 2010/01/20 23:43:51 patthoyts Exp $ +# RCS: @(#) $Id: msgbox.tcl,v 1.36 2008/01/31 23:33:42 hobbs Exp $ # # Copyright (c) 1994-1997 Sun Microsystems, Inc. # @@ -271,8 +271,6 @@ proc ::tk::MessageBox {args} { if {$windowingsystem eq "aqua"} { ::tk::unsupported::MacWindowStyle style $w moveableModal {} - } elseif {$windowingsystem eq "x11"} { - wm attributes $w -type dialog } ttk::frame $w.bot;# -background $bg @@ -304,7 +302,7 @@ proc ::tk::MessageBox {args} { if {$windowingsystem eq "aqua" || ([winfo depth $w] < 4) || $tk_strictMotif} { # ttk::label has no -bitmap option - label $w.bitmap -bitmap $data(-icon);# -background $bg + label $w.bitmap -bitmap $data(-icon) -background $bg } else { canvas $w.bitmap -width 32 -height 32 -highlightthickness 0 \ -background $bg @@ -398,12 +396,12 @@ proc ::tk::MessageBox {args} { if {$data(-default) ne ""} { bind $w <FocusIn> { - if {[winfo class %W] in "Button TButton"} { + if {[winfo class %W] eq "Button"} { %W configure -default active } } bind $w <FocusOut> { - if {[winfo class %W] in "Button TButton"} { + if {[winfo class %W] eq "Button"} { %W configure -default normal } } @@ -412,7 +410,7 @@ proc ::tk::MessageBox {args} { # 6. Create bindings for <Return>, <Escape> and <Destroy> on the dialog bind $w <Return> { - if {[winfo class %W] in "Button TButton"} { + if {[winfo class %W] eq "Button"} { %W invoke } } diff --git a/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/msgs/pl.msg b/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/msgs/pl.msg index debebcb8f4d29a45670eb36b485da4140251fb93..02e6ffcf95f9b3636ba57bd67562c83984ed8d4b 100644 --- a/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/msgs/pl.msg +++ b/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/msgs/pl.msg @@ -1,66 +1,66 @@ namespace eval ::tk { - ::msgcat::mcset pl "&Abort" "&Przerwij" - ::msgcat::mcset pl "&About..." "O programie..." + ::msgcat::mcset pl "&Abort" "&Anuluj" + ::msgcat::mcset pl "&About..." "O Programie..." ::msgcat::mcset pl "All Files" "Wszystkie pliki" - ::msgcat::mcset pl "Application Error" "B\u0142\u0105d w programie" + ::msgcat::mcset pl "Application Error" "Bl\u0105d w Programie" ::msgcat::mcset pl "&Blue" "&Niebieski" ::msgcat::mcset pl "&Cancel" "&Anuluj" - ::msgcat::mcset pl "Cannot change to the directory \"%1\$s\".\nPermission denied." "Nie mo\u017cna otworzy\u0107 katalogu \"%1\$s\".\nOdmowa dost\u0119pu." + ::msgcat::mcset pl "Cannot change to the directory \"%1\$s\".\nPermission denied." "Katalog \"%1\$s\" nie mo\u017ce zosta\u0107 odczytany lub nie istnieje." ::msgcat::mcset pl "Choose Directory" "Wybierz katalog" - ::msgcat::mcset pl "Cl&ear" "&Wyczy\u015b\u0107" + ::msgcat::mcset pl "&Clear" "&Wyczy\u015b\u0107" ::msgcat::mcset pl "&Clear Console" "&Wyczy\u015b\u0107 konsol\u0119" ::msgcat::mcset pl "Color" "Kolor" ::msgcat::mcset pl "Console" "Konsola" ::msgcat::mcset pl "&Copy" "&Kopiuj" ::msgcat::mcset pl "Cu&t" "&Wytnij" ::msgcat::mcset pl "&Delete" "&Usu\u0144" - ::msgcat::mcset pl "Details >>" "Szczeg\u00f3\u0142y >>" - ::msgcat::mcset pl "Directory \"%1\$s\" does not exist." "Katalog \"%1\$s\" nie istnieje." + ::msgcat::mcset pl "Details >>" "Detale >>" + ::msgcat::mcset pl "Directory \"%1\$s\" does not exist." "Katalog \"%1\$s\" nie istniej." ::msgcat::mcset pl "&Directory:" "&Katalog:" ::msgcat::mcset pl "&Edit" "&Edytuj" ::msgcat::mcset pl "Error: %1\$s" "B\u0142\u0105d: %1\$s" - ::msgcat::mcset pl "E&xit" "&Wyjd\u017a" + ::msgcat::mcset pl "E&xit" "&Zako\u0144cz" ::msgcat::mcset pl "&File" "&Plik" - ::msgcat::mcset pl "File \"%1\$s\" already exists.\nDo you want to overwrite it?" "Plik \"%1\$s\" ju\u017c istnieje.\nCzy chcesz go nadpisa\u0107?" - ::msgcat::mcset pl "File \"%1\$s\" already exists.\n\n" "Plik \"%1\$s\" ju\u017c istnieje.\n\n" + ::msgcat::mcset pl "File \"%1\$s\" already exists.\nDo you want to overwrite it?" "Plik \"%1\$s\" ju\u017c istnieje.\nCzy chcesz go zast\u0105pi\u0107?" + ::msgcat::mcset pl "File \"%1\$s\" already exists.\n\n" "Plik \"%1\$s\" ju\u017c istnieje. \n\n" ::msgcat::mcset pl "File \"%1\$s\" does not exist." "Plik \"%1\$s\" nie istnieje." ::msgcat::mcset pl "File &name:" "Nazwa &pliku:" ::msgcat::mcset pl "File &names:" "Nazwy &plik\u00f3w:" ::msgcat::mcset pl "Files of &type:" "Pliki &typu:" ::msgcat::mcset pl "Fi&les:" "Pli&ki:" - ::msgcat::mcset pl "&Filter" "&Filtr" - ::msgcat::mcset pl "Fil&ter:" "&Filtr:" + ::msgcat::mcset pl "&Filter" "&Filter" + ::msgcat::mcset pl "Fil&ter:" "&Filter:" ::msgcat::mcset pl "&Green" "&Zielony" ::msgcat::mcset pl "&Help" "&Pomoc" ::msgcat::mcset pl "Hi" "Witaj" - ::msgcat::mcset pl "&Hide Console" "&Ukryj konsol\u0119" + ::msgcat::mcset pl "&Hide Console" "&Schowaj konsol\u0119" ::msgcat::mcset pl "&Ignore" "&Ignoruj" ::msgcat::mcset pl "Invalid file name \"%1\$s\"." "Niew\u0142a\u015bciwa nazwa pliku \"%1\$s\"." - ::msgcat::mcset pl "Log Files" "Pliki dziennika" + ::msgcat::mcset pl "Log Files" "Protoko\u0142uj" ::msgcat::mcset pl "&No" "&Nie" - ::msgcat::mcset pl "OK" "OK" - ::msgcat::mcset pl "Ok" "Ok" - ::msgcat::mcset pl "Open" "Otw\u00f3rz" - ::msgcat::mcset pl "&Open" "&Otw\u00f3rz" - ::msgcat::mcset pl "Open Multiple Files" "Otw\u00f3rz wiele plik\u00f3w" + ::msgcat::mcset pl "OK" + ::msgcat::mcset pl "Ok" + ::msgcat::mcset pl "Open" "Wczytaj" + ::msgcat::mcset pl "&Open" "&Wczytaj" + ::msgcat::mcset pl "Open Multiple Files" "Wczytuj wiele plik\u00f3w" ::msgcat::mcset pl "P&aste" "&Wklej" ::msgcat::mcset pl "&Quit" "&Zako\u0144cz" - ::msgcat::mcset pl "&Red" "&Czerwony" - ::msgcat::mcset pl "Replace existing file?" "Czy zast\u0105pi\u0107 istniej\u0105cy plik?" - ::msgcat::mcset pl "&Retry" "&Pon\u00f3w" + ::msgcat::mcset pl "&Red" "&Czerwonz" + ::msgcat::mcset pl "Replace existing file?" "Czy zost\u0105pi\u0107 instniej\u0105cy plik?" + ::msgcat::mcset pl "&Retry" "&Powt\u00f3rz" ::msgcat::mcset pl "&Save" "&Zapisz" ::msgcat::mcset pl "Save As" "Zapisz jako" - ::msgcat::mcset pl "Save To Log" "Wpisz do dziennika" - ::msgcat::mcset pl "Select Log File" "Wybierz plik dziennika" + ::msgcat::mcset pl "Save To Log" "Wpisz do protoko\u0142u" + ::msgcat::mcset pl "Select Log File" "Wybierz plik proko\u0142u" ::msgcat::mcset pl "Select a file to source" "Wybierz plik do wykonania" ::msgcat::mcset pl "&Selection:" "&Wyb\u00f3r:" - ::msgcat::mcset pl "Skip Messages" "Pomi\u0144 pozosta\u0142e komunikaty" + ::msgcat::mcset pl "Skip Messages" "Omi\u0144 pozosta\u0142e komunikaty" ::msgcat::mcset pl "&Source..." "&Kod \u017ar\u00f3d\u0142owy..." - ::msgcat::mcset pl "Tcl Scripts" "Skrypty Tcl" - ::msgcat::mcset pl "Tcl for Windows" "Tcl dla Windows" - ::msgcat::mcset pl "Text Files" "Pliki tekstowe" + ::msgcat::mcset pl "Tcl Scripts" "Tcl-skrypty" + ::msgcat::mcset pl "Tcl for Windows" "Tcl dla Okienek (Windows)" + ::msgcat::mcset pl "Text Files" "Pliki Tekstowe" ::msgcat::mcset pl "&Yes" "&Tak" - ::msgcat::mcset pl "abort" "przerwij" + ::msgcat::mcset pl "abort" "zako\u0144cz" ::msgcat::mcset pl "blue" "niebieski" ::msgcat::mcset pl "cancel" "anuluj" ::msgcat::mcset pl "extension" "rozszerzenie" @@ -68,6 +68,6 @@ namespace eval ::tk { ::msgcat::mcset pl "green" "zielony" ::msgcat::mcset pl "ignore" "ignoruj" ::msgcat::mcset pl "red" "czerwony" - ::msgcat::mcset pl "retry" "pon\u00f3w" + ::msgcat::mcset pl "retry" "potw\u00f3rz" ::msgcat::mcset pl "yes" "tak" } diff --git a/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/obsolete.tcl b/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/obsolete.tcl index 395d1b069b1c188650d2bd1a703d1b8c0732bcfd..327fc02103715695b48ff3f01101f6bba56dbfef 100644 --- a/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/obsolete.tcl +++ b/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/obsolete.tcl @@ -3,7 +3,7 @@ # This file contains obsolete procedures that people really shouldn't # be using anymore, but which are kept around for backward compatibility. # -# RCS: @(#) $Id: obsolete.tcl,v 1.4.2.2 2010/01/09 00:54:06 patthoyts Exp $ +# RCS: @(#) $Id: obsolete.tcl,v 1.4 2007/12/13 15:26:27 dgp Exp $ # # Copyright (c) 1994 The Regents of the University of California. # Copyright (c) 1994 Sun Microsystems, Inc. @@ -117,8 +117,6 @@ proc ::tk::classic::restore_menu {args} { if {[tk windowingsystem] eq "x11"} { option add *Menu.activeBorderWidth 2 $prio; # 1 option add *Menu.borderWidth 2 $prio; # 1 - option add *Menu.clickToFocus true $prio - option add *Menu.useMotifHelp true $prio } if {[tk windowingsystem] ne "aqua"} { option add *Menu.font "TkDefaultFont" $prio; # "TkMenuFont" diff --git a/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/palette.tcl b/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/palette.tcl index 13600bec342d4d65c4563bdeda92213607ebe898..eae93d9fd0c601c7f2142ac0a2bbcfc826b086fd 100644 --- a/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/palette.tcl +++ b/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/palette.tcl @@ -3,7 +3,7 @@ # This file contains procedures that change the color palette used # by Tk. # -# RCS: @(#) $Id: palette.tcl,v 1.12.4.1 2009/04/10 16:55:19 jenglish Exp $ +# RCS: @(#) $Id: palette.tcl,v 1.12 2007/05/09 12:51:55 das Exp $ # # Copyright (c) 1995-1997 Sun Microsystems, Inc. # @@ -100,6 +100,9 @@ proc ::tk_setPalette {args} { if {![info exists new(troughColor)]} { set new(troughColor) $darkerBg } + if {![info exists new(selectColor)]} { + set new(selectColor) #b03060 + } # let's make one of each of the widgets so we know what the # defaults are currently for this platform. @@ -239,7 +242,7 @@ proc ::tk_bisque {} { tk_setPalette activeBackground #e6ceb1 activeForeground black \ background #ffe4c4 disabledForeground #b0b0b0 foreground black \ highlightBackground #ffe4c4 highlightColor black \ - insertBackground black \ + insertBackground black selectColor #b03060 \ selectBackground #e6ceb1 selectForeground black \ troughColor #cdb79e } diff --git a/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/pkgIndex.tcl b/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/pkgIndex.tcl index cc922fad97ff3bb0de56ae3dd0f0837d8437fdf2..7adc6c6f932089f3b002381df18b7f0ad288b9c7 100644 --- a/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/pkgIndex.tcl +++ b/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/pkgIndex.tcl @@ -1,2 +1,2 @@ -if {[catch {package present Tcl 8.5.0}]} { return } -package ifneeded Tk 8.5.9 [list load [file join $dir .. libtk8.5.so] Tk] +if {[catch {package present Tcl 8.5.2}]} { return } +package ifneeded Tk 8.5.2 [list load [file join $dir .. libtk8.5.so] Tk] diff --git a/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/safetk.tcl b/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/safetk.tcl index ae198d9d89c70306f1550bf67bd38f89038a5273..58cb95458217a6b10287a008d7ccf27279d6c4d6 100644 --- a/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/safetk.tcl +++ b/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/safetk.tcl @@ -2,7 +2,7 @@ # # Support procs to use Tk in safe interpreters. # -# RCS: @(#) $Id: safetk.tcl,v 1.12.2.1 2009/12/10 00:34:12 andreas_kupries Exp $ +# RCS: @(#) $Id: safetk.tcl,v 1.12 2008/03/27 21:05:09 hobbs Exp $ # # Copyright (c) 1997 Sun Microsystems, Inc. # @@ -81,23 +81,19 @@ proc ::safe::loadTk {} {} } } } - - # Get state for access to the cleanupHook. - namespace upvar ::safe S$slave state - if {![::tcl::OptProcArgGiven "-use"]} { # create a decorated toplevel ::tcl::Lassign [tkTopLevel $slave $display] w use # set our delete hook (slave arg is added by interpDelete) # to clean up both window related code and tkInit(slave) - set state(cleanupHook) [list tkDelete {} $w] + Set [DeleteHookName $slave] [list tkDelete {} $w] } else { # set our delete hook (slave arg is added by interpDelete) # to clean up tkInit(slave) - set state(cleanupHook) [list disallowTk] + Set [DeleteHookName $slave] [list disallowTk] # Let's be nice and also accept tk window names instead of ids if {[string match ".*" $use]} { diff --git a/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/tearoff.tcl b/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/tearoff.tcl index e5ab02d1fd876adf8240f8976dd6987a40f5c4bd..9a8bd28818dbf7b2a044ab227a323b1a5b12de27 100644 --- a/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/tearoff.tcl +++ b/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/tearoff.tcl @@ -2,7 +2,7 @@ # # This file contains procedures that implement tear-off menus. # -# RCS: @(#) $Id: tearoff.tcl,v 1.11.4.1 2010/01/03 01:17:48 patthoyts Exp $ +# RCS: @(#) $Id: tearoff.tcl,v 1.11 2007/04/23 21:16:43 das Exp $ # # Copyright (c) 1994 The Regents of the University of California. # Copyright (c) 1994-1997 Sun Microsystems, Inc. @@ -80,11 +80,6 @@ proc ::tk::TearOffMenu {w {x 0} {y 0}} { } } - if {[tk windowingsystem] eq "win32"} { - wm transient $menu [winfo toplevel $parent] - wm attributes $menu -toolwindow 1 - } - $menu post $x $y if {[winfo exists $menu] == 0} { diff --git a/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/text.tcl b/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/text.tcl index acdaa8e47a0cac757a14d9cd827a9f539da253df..36a15c23ab2ca5af3a36a99240af6e3e16d02167 100644 --- a/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/text.tcl +++ b/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/text.tcl @@ -3,7 +3,7 @@ # This file defines the default bindings for Tk text widgets and provides # procedures that help in implementing the bindings. # -# RCS: @(#) $Id: text.tcl,v 1.41.4.3 2010/08/12 07:59:15 dkf Exp $ +# RCS: @(#) $Id: text.tcl,v 1.41 2006/09/10 17:06:32 das Exp $ # # Copyright (c) 1992-1994 The Regents of the University of California. # Copyright (c) 1994-1997 Sun Microsystems, Inc. @@ -33,7 +33,6 @@ # char, word, or line. # x, y - Last known mouse coordinates for scanning # and auto-scanning. -# #------------------------------------------------------------------------- #------------------------------------------------------------------------- @@ -208,27 +207,27 @@ bind Text <Return> { } } bind Text <Delete> { - if {[tk::TextCursorInSelection %W]} { + if {[%W tag nextrange sel 1.0 end] ne ""} { %W delete sel.first sel.last - } elseif {[%W compare end != insert+1c]} { + } else { %W delete insert + %W see insert } - %W see insert } bind Text <BackSpace> { - if {[tk::TextCursorInSelection %W]} { + if {[%W tag nextrange sel 1.0 end] ne ""} { %W delete sel.first sel.last } elseif {[%W compare insert != 1.0]} { %W delete insert-1c + %W see insert } - %W see insert } bind Text <Control-space> { - %W mark set [tk::TextAnchor %W] insert + %W mark set tk::anchor%W insert } bind Text <Select> { - %W mark set [tk::TextAnchor %W] insert + %W mark set tk::anchor%W insert } bind Text <Control-Shift-space> { set tk::Priv(selectMode) char @@ -296,7 +295,7 @@ bind Text <Control-b> { } } bind Text <Control-d> { - if {!$tk_strictMotif && [%W compare end != insert+1c]} { + if {!$tk_strictMotif} { %W delete insert } } @@ -311,7 +310,7 @@ bind Text <Control-f> { } } bind Text <Control-k> { - if {!$tk_strictMotif && [%W compare end != insert+1c]} { + if {!$tk_strictMotif} { if {[%W compare insert == {insert lineend}]} { %W delete insert } else { @@ -355,7 +354,7 @@ bind Text <Meta-b> { } } bind Text <Meta-d> { - if {!$tk_strictMotif && [%W compare end != insert+1c]} { + if {!$tk_strictMotif} { %W delete insert [tk::TextNextWord %W insert] } } @@ -528,16 +527,15 @@ proc ::tk::TextButton1 {w x y} { set Priv(selectMode) char set Priv(mouseMoved) 0 set Priv(pressX) $x - set anchorname [tk::TextAnchor $w] $w mark set insert [TextClosestGap $w $x $y] - $w mark set $anchorname insert + $w mark set tk::anchor$w insert # Set the anchor mark's gravity depending on the click position # relative to the gap - set bbox [$w bbox [$w index $anchorname]] + set bbox [$w bbox [$w index tk::anchor$w]] if {$x > [lindex $bbox 0]} { - $w mark gravity $anchorname right + $w mark gravity tk::anchor$w right } else { - $w mark gravity $anchorname left + $w mark gravity tk::anchor$w left } # Allow focus in any case on Windows, because that will let the # selection be displayed even for state disabled text widgets. @@ -567,47 +565,36 @@ proc ::tk::TextButton1 {w x y} { # x - Mouse x position. # y - Mouse y position. -set ::tk::Priv(textanchoruid) 0 - -proc ::tk::TextAnchor {w} { - variable Priv - if {![info exists Priv(textanchor,$w)]} { - set Priv(textanchor,$w) tk::anchor[incr Priv(textanchoruid)] - } - return $Priv(textanchor,$w) -} - proc ::tk::TextSelectTo {w x y {extend 0}} { global tcl_platform variable ::tk::Priv - set anchorname [tk::TextAnchor $w] set cur [TextClosestGap $w $x $y] - if {[catch {$w index $anchorname}]} { - $w mark set $anchorname $cur + if {[catch {$w index tk::anchor$w}]} { + $w mark set tk::anchor$w $cur } - set anchor [$w index $anchorname] + set anchor [$w index tk::anchor$w] if {[$w compare $cur != $anchor] || (abs($Priv(pressX) - $x) >= 3)} { set Priv(mouseMoved) 1 } switch -- $Priv(selectMode) { char { - if {[$w compare $cur < $anchorname]} { + if {[$w compare $cur < tk::anchor$w]} { set first $cur - set last $anchorname + set last tk::anchor$w } else { - set first $anchorname + set first tk::anchor$w set last $cur } } word { # Set initial range based only on the anchor (1 char min width) - if {[$w mark gravity $anchorname] eq "right"} { - set first $anchorname - set last "$anchorname + 1c" + if {[$w mark gravity tk::anchor$w] eq "right"} { + set first "tk::anchor$w" + set last "tk::anchor$w + 1c" } else { - set first "$anchorname - 1c" - set last $anchorname + set first "tk::anchor$w - 1c" + set last "tk::anchor$w" } # Extend range (if necessary) based on the current point if {[$w compare $cur < $first]} { @@ -622,8 +609,8 @@ proc ::tk::TextSelectTo {w x y {extend 0}} { } line { # Set initial range based only on the anchor - set first "$anchorname linestart" - set last "$anchorname lineend" + set first "tk::anchor$w linestart" + set last "tk::anchor$w lineend" # Extend range (if necessary) based on the current point if {[$w compare $cur < $first]} { @@ -655,17 +642,16 @@ proc ::tk::TextSelectTo {w x y {extend 0}} { proc ::tk::TextKeyExtend {w index} { - set anchorname [tk::TextAnchor $w] set cur [$w index $index] - if {[catch {$w index $anchorname}]} { - $w mark set $anchorname $cur + if {[catch {$w index tk::anchor$w}]} { + $w mark set tk::anchor$w $cur } - set anchor [$w index $anchorname] - if {[$w compare $cur < $anchorname]} { + set anchor [$w index tk::anchor$w] + if {[$w compare $cur < tk::anchor$w]} { set first $cur - set last $anchorname + set last tk::anchor$w } else { - set first $anchorname + set first tk::anchor$w set last $cur } $w tag remove sel 0.0 $first @@ -742,6 +728,7 @@ proc ::tk::TextAutoScan {w} { # pos - The desired new position for the cursor in the window. proc ::tk::TextSetCursor {w pos} { + if {[$w compare $pos == end]} { set pos {end - 1 chars} } @@ -764,20 +751,20 @@ proc ::tk::TextSetCursor {w pos} { # actually been moved to this position yet). proc ::tk::TextKeySelect {w new} { - set anchorname [tk::TextAnchor $w] + if {[$w tag nextrange sel 1.0 end] eq ""} { if {[$w compare $new < insert]} { $w tag add sel $new insert } else { $w tag add sel insert $new } - $w mark set $anchorname insert + $w mark set tk::anchor$w insert } else { - if {[$w compare $new < $anchorname]} { + if {[$w compare $new < tk::anchor$w]} { set first $new - set last $anchorname + set last tk::anchor$w } else { - set first $anchorname + set first tk::anchor$w set last $new } $w tag remove sel 1.0 $first @@ -811,16 +798,15 @@ proc ::tk::TextResetAnchor {w index} { # the two clicks will be selected. [Bug: 5929]. return } - set anchorname [tk::TextAnchor $w] set a [$w index $index] set b [$w index sel.first] set c [$w index sel.last] if {[$w compare $a < $b]} { - $w mark set $anchorname sel.last + $w mark set tk::anchor$w sel.last return } if {[$w compare $a > $c]} { - $w mark set $anchorname sel.first + $w mark set tk::anchor$w sel.first return } scan $a "%d.%d" lineA chA @@ -832,31 +818,16 @@ proc ::tk::TextResetAnchor {w index} { return } if {[string length [$w get $b $a]] < ($total/2)} { - $w mark set $anchorname sel.last + $w mark set tk::anchor$w sel.last } else { - $w mark set $anchorname sel.first + $w mark set tk::anchor$w sel.first } return } if {($lineA-$lineB) < ($lineC-$lineA)} { - $w mark set $anchorname sel.last + $w mark set tk::anchor$w sel.last } else { - $w mark set $anchorname sel.first - } -} - -# ::tk::TextCursorInSelection -- -# Check whether the selection exists and contains the insertion cursor. Note -# that it assumes that the selection is contiguous. -# -# Arguments: -# w - The text widget whose selection is to be checked - -proc ::tk::TextCursorInSelection {w} { - expr { - [llength [$w tag ranges sel]] - && [$w compare sel.first <= insert] - && [$w compare sel.last >= insert] + $w mark set tk::anchor$w sel.first } } @@ -874,17 +845,21 @@ proc ::tk::TextInsert {w s} { return } set compound 0 - if {[TextCursorInSelection $w]} { - set compound [$w cget -autoseparators] - if {$compound} { - $w configure -autoseparators 0 - $w edit separator + if {[llength [set range [$w tag ranges sel]]]} { + if {[$w compare [lindex $range 0] <= insert] \ + && [$w compare [lindex $range end] >= insert]} { + set oldSeparator [$w cget -autoseparators] + if {$oldSeparator} { + $w configure -autoseparators 0 + $w edit separator + set compound 1 + } + $w delete [lindex $range 0] [lindex $range end] } - $w delete sel.first sel.last } $w insert insert $s $w see insert - if {$compound} { + if {$compound && $oldSeparator} { $w edit separator $w configure -autoseparators 1 } diff --git a/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/tk.tcl b/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/tk.tcl index d6f0e24df1986985e6b547c12a2684db5f618f36..7c31b92f0f7138cc7cb50a3c3726a288d8a667b7 100644 --- a/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/tk.tcl +++ b/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/tk.tcl @@ -1,23 +1,23 @@ # tk.tcl -- # -# Initialization script normally executed in the interpreter for each Tk-based -# application. Arranges class bindings for widgets. +# Initialization script normally executed in the interpreter for each +# Tk-based application. Arranges class bindings for widgets. # -# RCS: @(#) $Id: tk.tcl,v 1.73.2.15 2010/08/04 17:06:52 dgp Exp $ +# RCS: @(#) $Id: tk.tcl,v 1.73 2008/03/28 18:13:39 dgp Exp $ # # Copyright (c) 1992-1994 The Regents of the University of California. # Copyright (c) 1994-1996 Sun Microsystems, Inc. # Copyright (c) 1998-2000 Ajuba Solutions. # -# See the file "license.terms" for information on usage and redistribution of -# this file, and for a DISCLAIMER OF ALL WARRANTIES. +# See the file "license.terms" for information on usage and redistribution +# of this file, and for a DISCLAIMER OF ALL WARRANTIES. -package require Tcl 8.5 ;# Guard against [source] in an 8.4- interp before - ;# using 8.5 [package] features. +package require Tcl 8.5 ;# Guard against [source] in an 8.4- interp + ;# before using 8.5 [package] features. # Insist on running with compatible version of Tcl -package require Tcl 8.5.0 +package require Tcl 8.5.0-8.6 # Verify that we have Tk binary and script components from the same release -package require -exact Tk 8.5.9 +package require -exact Tk 8.5.2 # Create a ::tk namespace namespace eval ::tk { @@ -25,8 +25,8 @@ namespace eval ::tk { namespace eval msgcat { namespace export mc mcmax if {[interp issafe] || [catch {package require msgcat}]} { - # The msgcat package is not available. Supply our own minimal - # replacement. + # The msgcat package is not available. Supply our own + # minimal replacement. proc mc {src args} { return [format $src {*}$args] } @@ -69,13 +69,13 @@ if {[info exists ::auto_path] && ($::tk_library ne "") set ::tk_strictMotif 0 -# Turn on useinputmethods (X Input Methods) by default. We catch this because -# safe interpreters may not allow the call. +# Turn on useinputmethods (X Input Methods) by default. +# We catch this because safe interpreters may not allow the call. catch {tk useinputmethods 1} - + # ::tk::PlaceWindow -- -# Place a toplevel at a particular position +# place a toplevel at a particular position # Arguments: # toplevel name of toplevel window # ?placement? pointer ?center? ; places $w centered on the pointer @@ -137,9 +137,9 @@ proc ::tk::PlaceWindow {w {place ""} {anchor ""}} { wm geometry $w +$x+$y wm deiconify $w } - + # ::tk::SetFocusGrab -- -# Swap out current focus and grab temporarily (for dialogs) +# swap out current focus and grab temporarily (for dialogs) # Arguments: # grab new window to grab # focus window to give focus to @@ -156,8 +156,8 @@ proc ::tk::SetFocusGrab {grab {focus {}}} { if {[winfo exists $oldGrab]} { lappend data [grab status $oldGrab] } - # The "grab" command will fail if another application already holds the - # grab. So catch it. + # The "grab" command will fail if another application + # already holds the grab. So catch it. catch {grab $grab} if {[winfo exists $focus]} { focus $focus @@ -165,7 +165,7 @@ proc ::tk::SetFocusGrab {grab {focus {}}} { } # ::tk::RestoreFocusGrab -- -# Restore old focus and grab (for dialogs) +# restore old focus and grab (for dialogs) # Arguments: # grab window that had taken grab # focus window that had taken focus @@ -197,12 +197,12 @@ proc ::tk::RestoreFocusGrab {grab focus {destroy destroy}} { } } } - + # ::tk::GetSelection -- -# This tries to obtain the default selection. On Unix, we first try and get -# a UTF8_STRING, a type supported by modern Unix apps for passing Unicode -# data safely. We fall back on the default STRING type otherwise. On -# Windows, only the STRING type is necessary. +# This tries to obtain the default selection. On Unix, we first try +# and get a UTF8_STRING, a type supported by modern Unix apps for +# passing Unicode data safely. We fall back on the default STRING +# type otherwise. On Windows, only the STRING type is necessary. # Arguments: # w The widget for which the selection will be retrieved. # Important for the -displayof property. @@ -229,18 +229,18 @@ if {$tcl_platform(platform) eq "unix"} { } } } - + # ::tk::ScreenChanged -- -# This procedure is invoked by the binding mechanism whenever the "current" -# screen is changing. The procedure does two things. First, it uses "upvar" -# to make variable "::tk::Priv" point at an array variable that holds state -# for the current display. Second, it initializes the array if it didn't -# already exist. +# This procedure is invoked by the binding mechanism whenever the +# "current" screen is changing. The procedure does two things. +# First, it uses "upvar" to make variable "::tk::Priv" point at an +# array variable that holds state for the current display. Second, +# it initializes the array if it didn't already exist. # # Arguments: # screen - The name of the new screen. -proc ::tk::ScreenChanged {screen} { +proc ::tk::ScreenChanged screen { set x [string last . $screen] if {$x > 0} { set disp [string range $screen 0 [expr {$x - 1}]] @@ -248,12 +248,7 @@ proc ::tk::ScreenChanged {screen} { set disp $screen } - # Ensure that namespace separators never occur in the display name (as - # they cause problems in variable names). Double-colons exist in some VNC - # display names. [Bug 2912473] - set disp [string map {:: _doublecolon_} $disp] - - uplevel #0 [list upvar #0 ::tk::Priv.$disp ::tk::Priv] + uplevel #0 upvar #0 ::tk::Priv.$disp ::tk::Priv variable ::tk::Priv global tcl_platform @@ -293,10 +288,11 @@ proc ::tk::ScreenChanged {screen} { # value, which will cause trouble later). tk::ScreenChanged [winfo screen .] - + # ::tk::EventMotifBindings -- -# This procedure is invoked as a trace whenever ::tk_strictMotif is changed. -# It is used to turn on or turn off the motif virtual bindings. +# This procedure is invoked as a trace whenever ::tk_strictMotif is +# changed. It is used to turn on or turn off the motif virtual +# bindings. # # Arguments: # n1 - the name of the variable being changed ("::tk_strictMotif"). @@ -315,10 +311,10 @@ proc ::tk::EventMotifBindings {n1 dummy dummy} { event $op <<Paste>> <Control-Key-y> event $op <<Undo>> <Control-underscore> } - + #---------------------------------------------------------------------- -# Define common dialogs on platforms where they are not implemented using -# compiled code. +# Define common dialogs on platforms where they are not implemented +# using compiled code. #---------------------------------------------------------------------- if {![llength [info commands tk_chooseColor]]} { @@ -354,56 +350,53 @@ if {![llength [info command tk_chooseDirectory]]} { return [::tk::dialog::file::chooseDir:: {*}$args] } } - + #---------------------------------------------------------------------- # Define the set of common virtual events. #---------------------------------------------------------------------- -switch -exact -- [tk windowingsystem] { +switch -- [tk windowingsystem] { "x11" { - event add <<Cut>> <Control-Key-x> <Key-F20> <Control-Lock-Key-X> - event add <<Copy>> <Control-Key-c> <Key-F16> <Control-Lock-Key-C> - event add <<Paste>> <Control-Key-v> <Key-F18> <Control-Lock-Key-V> + event add <<Cut>> <Control-Key-x> <Key-F20> + event add <<Copy>> <Control-Key-c> <Key-F16> + event add <<Paste>> <Control-Key-v> <Key-F18> event add <<PasteSelection>> <ButtonRelease-2> - event add <<Undo>> <Control-Key-z> <Control-Lock-Key-Z> - event add <<Redo>> <Control-Key-Z> <Control-Lock-Key-z> - # Some OS's define a goofy (as in, not <Shift-Tab>) keysym that is - # returned when the user presses <Shift-Tab>. In order for tab - # traversal to work, we have to add these keysyms to the PrevWindow - # event. We use catch just in case the keysym isn't recognized. This - # is needed for XFree86 systems + event add <<Undo>> <Control-Key-z> + event add <<Redo>> <Control-Key-Z> + # Some OS's define a goofy (as in, not <Shift-Tab>) keysym + # that is returned when the user presses <Shift-Tab>. In order for + # tab traversal to work, we have to add these keysyms to the + # PrevWindow event. + # We use catch just in case the keysym isn't recognized. + # This is needed for XFree86 systems catch { event add <<PrevWindow>> <ISO_Left_Tab> } # This seems to be correct on *some* HP systems. catch { event add <<PrevWindow>> <hpBackTab> } trace add variable ::tk_strictMotif write ::tk::EventMotifBindings set ::tk_strictMotif $::tk_strictMotif - # On unix, we want to always display entry/text selection, regardless - # of which window has focus + # On unix, we want to always display entry/text selection, + # regardless of which window has focus set ::tk::AlwaysShowSelection 1 } "win32" { - event add <<Cut>> <Control-Key-x> <Shift-Key-Delete> \ - <Control-Lock-Key-X> - event add <<Copy>> <Control-Key-c> <Control-Key-Insert> \ - <Control-Lock-Key-C> - event add <<Paste>> <Control-Key-v> <Shift-Key-Insert> \ - <Control-Lock-Key-V> + event add <<Cut>> <Control-Key-x> <Shift-Key-Delete> + event add <<Copy>> <Control-Key-c> <Control-Key-Insert> + event add <<Paste>> <Control-Key-v> <Shift-Key-Insert> event add <<PasteSelection>> <ButtonRelease-2> - event add <<Undo>> <Control-Key-z> <Control-Lock-Key-Z> - event add <<Redo>> <Control-Key-y> <Control-Lock-Key-Y> + event add <<Undo>> <Control-Key-z> + event add <<Redo>> <Control-Key-y> } "aqua" { - event add <<Cut>> <Command-Key-x> <Key-F2> <Control-Lock-Key-X> - event add <<Copy>> <Command-Key-c> <Key-F3> <Control-Lock-Key-C> - event add <<Paste>> <Command-Key-v> <Key-F4> <Control-Lock-Key-V> + event add <<Cut>> <Command-Key-x> <Key-F2> + event add <<Copy>> <Command-Key-c> <Key-F3> + event add <<Paste>> <Command-Key-v> <Key-F4> event add <<PasteSelection>> <ButtonRelease-2> event add <<Clear>> <Clear> - event add <<Undo>> <Command-Key-z> <Control-Lock-Key-Z> - event add <<Redo>> <Command-Key-y> <Control-Lock-Key-Y> + event add <<Undo>> <Command-Key-z> + event add <<Redo>> <Command-Key-y> } } - # ---------------------------------------------------------------------- # Read in files that define all of the class bindings. # ---------------------------------------------------------------------- @@ -424,7 +417,6 @@ if {$::tk_library ne ""} { SourceLibFile text } } - # ---------------------------------------------------------------------- # Default bindings for keyboard traversal. # ---------------------------------------------------------------------- @@ -432,11 +424,12 @@ if {$::tk_library ne ""} { event add <<PrevWindow>> <Shift-Tab> bind all <Tab> {tk::TabToWindow [tk_focusNext %W]} bind all <<PrevWindow>> {tk::TabToWindow [tk_focusPrev %W]} - + # ::tk::CancelRepeat -- -# This procedure is invoked to cancel an auto-repeat action described by -# ::tk::Priv(afterId). It's used by several widgets to auto-scroll the widget -# when the mouse is dragged out of the widget with a button pressed. +# This procedure is invoked to cancel an auto-repeat action described +# by ::tk::Priv(afterId). It's used by several widgets to auto-scroll +# the widget when the mouse is dragged out of the widget with a +# button pressed. # # Arguments: # None. @@ -446,12 +439,12 @@ proc ::tk::CancelRepeat {} { after cancel $Priv(afterId) set Priv(afterId) {} } - + # ::tk::TabToWindow -- # This procedure moves the focus to the given widget. -# It sends a <<TraverseOut>> virtual event to the previous focus window, if -# any, before changing the focus, and a <<TraverseIn>> event to the new focus -# window afterwards. +# It sends a <<TraverseOut>> virtual event to the previous focus window, +# if any, before changing the focus, and a <<TraverseIn>> event +# to the new focus window afterwards. # # Arguments: # w - Window to which focus should be set. @@ -464,21 +457,38 @@ proc ::tk::TabToWindow {w} { focus $w event generate $w <<TraverseIn>> } - + # ::tk::UnderlineAmpersand -- -# This procedure takes some text with ampersand and returns text w/o ampersand -# and position of the ampersand. Double ampersands are converted to single -# ones. Position returned is -1 when there is no ampersand. +# This procedure takes some text with ampersand and returns +# text w/o ampersand and position of the ampersand. +# Double ampersands are converted to single ones. +# Position returned is -1 when there is no ampersand. # proc ::tk::UnderlineAmpersand {text} { - set s [string map {&& & & \ufeff} $text] - set idx [string first \ufeff $s] - return [list [string map {\ufeff {}} $s] $idx] + set idx [string first "&" $text] + if {$idx >= 0} { + set underline $idx + # ignore "&&" + while {[string match "&" [string index $text [expr {$idx + 1}]]]} { + set base [expr {$idx + 2}] + set idx [string first "&" [string range $text $base end]] + if {$idx < 0} { + break + } else { + set underline [expr {$underline + $idx + 1}] + incr idx $base + } + } + } + if {$idx >= 0} { + regsub -all -- {&([^&])} $text {\1} text + } + return [list $text $idx] } # ::tk::SetAmpText -- -# Given widget path and text with "magic ampersands", sets -text and -# -underline options for the widget +# Given widget path and text with "magic ampersands", +# sets -text and -underline options for the widget # proc ::tk::SetAmpText {widget text} { lassign [UnderlineAmpersand $text] newtext under @@ -486,8 +496,8 @@ proc ::tk::SetAmpText {widget text} { } # ::tk::AmpWidget -- -# Creates new widget, turning -text option into -text and -underline options, -# returned by ::tk::UnderlineAmpersand. +# Creates new widget, turning -text option into -text and +# -underline options, returned by ::tk::UnderlineAmpersand. # proc ::tk::AmpWidget {class path args} { set options {} @@ -500,15 +510,15 @@ proc ::tk::AmpWidget {class path args} { } } set result [$class $path {*}$options] - if {[string match "*button" $class]} { + if {$class eq "button"} { bind $path <<AltUnderlined>> [list $path invoke] } return $result } # ::tk::AmpMenuArgs -- -# Processes arguments for a menu entry, turning -label option into -label and -# -underline options, returned by ::tk::UnderlineAmpersand. +# Processes arguments for a menu entry, turning -label option into +# -label and -underline options, returned by ::tk::UnderlineAmpersand. # proc ::tk::AmpMenuArgs {widget add type args} { set options {} @@ -522,15 +532,15 @@ proc ::tk::AmpMenuArgs {widget add type args} { } $widget add $type {*}$options } - + # ::tk::FindAltKeyTarget -- -# Search recursively through the hierarchy of visible widgets to find button -# or label which has $char as underlined character +# search recursively through the hierarchy of visible widgets +# to find button or label which has $char as underlined character # proc ::tk::FindAltKeyTarget {path char} { switch -- [winfo class $path] { - Button - Label - - TButton - TLabel - TCheckbutton { + Button - + Label { if {[string equal -nocase $char \ [string index [$path cget -text] [$path cget -underline]]]} { return $path @@ -552,15 +562,15 @@ proc ::tk::FindAltKeyTarget {path char} { } # ::tk::AltKeyInDialog -- -# <Alt-Key> event handler for standard dialogs. Sends <<AltUnderlined>> to -# button or label which has appropriate underlined character +# <Alt-Key> event handler for standard dialogs. Sends <<AltUnderlined>> +# to button or label which has appropriate underlined character # proc ::tk::AltKeyInDialog {path key} { set target [FindAltKeyTarget $path $key] if { $target eq ""} return event generate $target <<AltUnderlined>> } - + # ::tk::mcmaxamp -- # Replacement for mcmax, used for texts with "magic ampersand" in it. # @@ -577,21 +587,15 @@ proc ::tk::mcmaxamp {args} { } return $maxlen } - # For now, turn off the custom mdef proc for the mac: if {[tk windowingsystem] eq "aqua"} { namespace eval ::tk::mac { - variable useCustomMDEF 0 + set useCustomMDEF 0 } } # Run the Ttk themed widget set initialization if {$::ttk::library ne ""} { - uplevel \#0 [list source [file join $::ttk::library ttk.tcl]] + uplevel \#0 [list source $::ttk::library/ttk.tcl] } - -# Local Variables: -# mode: tcl -# fill-column: 78 -# End: diff --git a/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/tkfbox.tcl b/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/tkfbox.tcl index efde9345fc45b30571cea896c1095b9eb6bd5244..cb8cd419a6348aab3c009b35bcfd84dc07e34e1a 100644 --- a/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/tkfbox.tcl +++ b/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/tkfbox.tcl @@ -11,7 +11,7 @@ # files by clicking on the file icons or by entering a filename # in the "Filename:" entry. # -# RCS: @(#) $Id: tkfbox.tcl,v 1.68.2.5 2010/01/20 23:43:51 patthoyts Exp $ +# RCS: @(#) $Id: tkfbox.tcl,v 1.68 2007/12/13 15:26:27 dgp Exp $ # # Copyright (c) 1994-1998 Sun Microsystems, Inc. # @@ -227,7 +227,7 @@ proc ::tk::IconList_Create {w} { upvar ::tk::$w data ttk::frame $w - ttk::entry $w.cHull -takefocus 0 -cursor {} + ttk::entry $w.cHull -takefocus 0 set data(sbar) [ttk::scrollbar $w.cHull.sbar -orient horizontal -takefocus 0] catch {$data(sbar) configure -highlightthickness 0} set data(canvas) [canvas $w.cHull.canvas -highlightthick 0 \ @@ -581,11 +581,12 @@ proc ::tk::IconList_ShiftBtn1 {w x y} { if {$i eq ""} { return } - if {[IconList_Index $w anchor] eq ""} { - IconList_Selection $w anchor $i + set a [IconList_Index $w anchor] + if {$a eq ""} { + set a $i } IconList_Selection $w clear 0 end - IconList_Selection $w set anchor $i + IconList_Selection $w set $a $i } } @@ -888,11 +889,9 @@ proc ::tk::dialog::file:: {type args} { # Default type and name to first entry set initialtype [lindex $data(-filetypes) 0] set initialTypeName [lindex $initialtype 0] - if {$data(-typevariable) ne ""} { - upvar #0 $data(-typevariable) typeVariable - if {[info exists typeVariable]} { - set initialTypeName $typeVariable - } + if {($data(-typevariable) ne "") + && [uplevel 2 [list info exists $data(-typevariable)]]} { + set initialTypeName [uplevel 2 [list set $data(-typevariable)]] } foreach type $data(-filetypes) { set title [lindex $type 0] @@ -1047,7 +1046,6 @@ proc ::tk::dialog::file::Create {w class} { global tk_library toplevel $w -class $class - if {[tk windowingsystem] eq "x11"} {wm attributes $w -type dialog} pack [ttk::frame $w.contents] -expand 1 -fill both #set w $w.contents @@ -1610,8 +1608,20 @@ proc ::tk::dialog::file::ActivateEnt {w} { set text [$data(ent) get] if {$data(-multiple)} { - foreach t $text { - VerifyFileName $w $t + # For the multiple case we have to be careful to get the file + # names as a true list, watching out for a single file with a + # space in the name. Thus we query the IconList directly. + + set selIcos [::tk::IconList_CurSelection $data(icons)] + set data(selectFile) "" + if {[llength $selIcos] == 0 && $text ne ""} { + # This assumes the user typed something in without selecting + # files - so assume they only type in a single filename. + VerifyFileName $w $text + } else { + foreach item $selIcos { + VerifyFileName $w [::tk::IconList_Get $data(icons) $item] + } } } else { VerifyFileName $w $text @@ -1773,7 +1783,7 @@ proc ::tk::dialog::file::ListBrowse {w} { if {[llength $text] == 0} { return } - if {$data(-multiple)} { + if { [llength $text] > 1 } { set newtext {} foreach file $text { set fullfile [JoinFile $data(selectPath) $file] @@ -1820,7 +1830,7 @@ proc ::tk::dialog::file::ListInvoke {w filenames} { if {$class eq "TkChooseDir" || [file isdirectory $file]} { set appPWD [pwd] if {[catch {cd $file}]} { - tk_messageBox -type ok -parent $w -icon warning -message \ + tk_messageBox -type ok -parent $w -message -icon warning \ [mc "Cannot change to the directory \"%1\$s\".\nPermission denied." $file] } else { cd $appPWD @@ -1870,10 +1880,10 @@ proc ::tk::dialog::file::Done {w {selectFilePath ""}} { } } if {[info exists data(-typevariable)] && $data(-typevariable) ne "" - && [info exists data(-filetypes)] && [llength $data(-filetypes)] - && [info exists data(filterType)] && $data(filterType) ne ""} { - upvar #0 $data(-typevariable) typeVariable - set typeVariable [lindex $data(filterType) 0] + && [info exists data(-filetypes)] && [llength $data(-filetypes)] + && [info exists data(filterType)] && $data(filterType) ne ""} { + upvar 4 $data(-typevariable) initialTypeName + set initialTypeName [lindex $data(filterType) 0] } } bind $data(okBtn) <Destroy> {} diff --git a/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/ttk/altTheme.tcl b/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/ttk/altTheme.tcl index 28e1bc1833cd0407a14ef719609b296877c16cbc..c92e3d58418e4e3ba34fb316be017a450ef83714 100644 --- a/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/ttk/altTheme.tcl +++ b/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/ttk/altTheme.tcl @@ -1,5 +1,5 @@ # -# $Id: altTheme.tcl,v 1.6.2.1 2010/08/26 02:06:10 hobbs Exp $ +# $Id: altTheme.tcl,v 1.6 2007/12/13 15:27:07 dgp Exp $ # # Ttk widget set: Alternate theme # @@ -11,7 +11,6 @@ namespace eval ttk::theme::alt { -frame "#d9d9d9" -window "#ffffff" -darker "#c3c3c3" - -border "#414141" -activebg "#ececec" -disabledfg "#a3a3a3" -selectbg "#4a6984" @@ -24,7 +23,6 @@ namespace eval ttk::theme::alt { -background $colors(-frame) \ -foreground black \ -troughcolor $colors(-darker) \ - -bordercolor $colors(-border) \ -selectbackground $colors(-selectbg) \ -selectforeground $colors(-selectfg) \ -font TkDefaultFont \ @@ -61,13 +59,6 @@ namespace eval ttk::theme::alt { ttk::style configure TCombobox -padding 1 ttk::style map TCombobox -fieldbackground \ [list readonly $colors(-frame) disabled $colors(-frame)] - ttk::style configure ComboboxPopdownFrame \ - -relief solid -borderwidth 1 - - ttk::style configure TSpinbox -arrowsize 10 -padding {2 0 10 0} - ttk::style map TSpinbox -fieldbackground \ - [list readonly $colors(-frame) disabled $colors(-frame)] \ - -arrowcolor [list disabled $colors(-disabledfg)] ttk::style configure Toolbutton -relief flat -padding 2 ttk::style map Toolbutton -relief \ @@ -89,8 +80,15 @@ namespace eval ttk::theme::alt { # Treeview: ttk::style configure Heading -font TkHeadingFont -relief raised - ttk::style configure Treeview -background $colors(-window) - ttk::style map Treeview \ + ttk::style configure Row -background $colors(-window) + ttk::style configure Cell -background $colors(-window) + ttk::style map Row \ + -background [list selected $colors(-selectbg)] \ + -foreground [list selected $colors(-selectfg)] ; + ttk::style map Cell \ + -background [list selected $colors(-selectbg)] \ + -foreground [list selected $colors(-selectfg)] ; + ttk::style map Item \ -background [list selected $colors(-selectbg)] \ -foreground [list selected $colors(-selectfg)] ; diff --git a/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/ttk/aquaTheme.tcl b/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/ttk/aquaTheme.tcl index 471e919102f3f8ec6344ae71d311dde8a255a5fd..bc6d4e9da0018c0bef4d5c088b30084cd7700f70 100644 --- a/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/ttk/aquaTheme.tcl +++ b/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/ttk/aquaTheme.tcl @@ -1,5 +1,5 @@ # -# $Id: aquaTheme.tcl,v 1.11.2.2 2010/08/26 02:06:10 hobbs Exp $ +# $Id: aquaTheme.tcl,v 1.11 2007/12/13 15:27:08 dgp Exp $ # # Aqua theme (OSX native look and feel) # @@ -8,43 +8,44 @@ namespace eval ttk::theme::aqua { ttk::style theme settings aqua { ttk::style configure . \ - -font TkDefaultFont \ - -background systemWindowBody \ - -foreground systemModelessDialogActiveText \ - -selectbackground systemHighlight \ - -selectforeground systemModelessDialogActiveText \ + -font System \ + -background White \ + -foreground Black \ + -selectbackground SystemHighlight \ + -selectforeground SystemHighlightText \ -selectborderwidth 0 \ - -insertwidth 1 - + -insertwidth 1 \ + ; ttk::style map . \ - -foreground {disabled systemModelessDialogInactiveText - background systemModelessDialogInactiveText} \ - -selectbackground {background systemHighlightSecondary - !focus systemHighlightSecondary} \ - -selectforeground {background systemModelessDialogInactiveText - !focus systemDialogActiveText} + -foreground [list disabled "#7f7f7f" background "#7f7f7f"] \ + -selectbackground [list background "#c3c3c3" !focus "#c3c3c3"] \ + -selectforeground [list background "#a3a3a3" !focus "#000000"] \ + ; # Workaround for #1100117: # Actually, on Aqua we probably shouldn't stipple images in # disabled buttons even if it did work... + # ttk::style configure . -stipple {} ttk::style configure TButton -anchor center -width -6 ttk::style configure Toolbutton -padding 4 - - ttk::style configure TNotebook -tabmargins {10 0} -tabposition n - ttk::style configure TNotebook -padding {18 8 18 17} - ttk::style configure TNotebook.Tab -padding {12 3 12 2} + # See Apple HIG figs 14-63, 14-65 + ttk::style configure TNotebook -tabposition n -padding {20 12} + ttk::style configure TNotebook.Tab -padding {10 2 10 2} # Combobox: ttk::style configure TCombobox -postoffset {5 -2 -10 0} # Treeview: + ttk::style configure Treeview -rowheight 18 ttk::style configure Heading -font TkHeadingFont - ttk::style configure Treeview -rowheight 18 -background White - ttk::style map Treeview \ - -background {{selected background} systemHighlightSecondary - selected systemHighlight} + ttk::style map Row -background [list \ + {selected background} "#c3c3c3" selected SystemHighlight] ; + ttk::style map Cell -foreground [list \ + {selected background} "#000000" selected SystemHighlightText] ; + ttk::style map Item -foreground [list \ + {selected background} "#000000" selected SystemHighlightText] ; # Enable animation for ttk::progressbar widget: ttk::style configure TProgressbar -period 100 -maxphase 255 @@ -53,7 +54,7 @@ namespace eval ttk::theme::aqua { # with a 14 pixel inset and 4 pixels spacing between border and label # (ref: Apple Human Interface Guidelines / Controls / Grouping Controls) # - ttk::style configure TLabelframe \ + ttk::style configure TLabelframe \ -labeloutside true -labelmargins {14 0 14 4} # TODO: panedwindow sashes should be 9 pixels (HIG:Controls:Split Views) diff --git a/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/ttk/button.tcl b/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/ttk/button.tcl index fc9c1bb8050142f0d0166f9107b7815d2f463b63..494a674fb7cde0363b90932444fd7a91a150f4dd 100644 --- a/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/ttk/button.tcl +++ b/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/ttk/button.tcl @@ -1,5 +1,5 @@ # -# $Id: button.tcl,v 1.2.4.1 2010/08/26 02:06:10 hobbs Exp $ +# $Id: button.tcl,v 1.2 2006/11/27 06:53:55 jenglish Exp $ # # Bindings for Buttons, Checkbuttons, and Radiobuttons. # @@ -54,7 +54,7 @@ bind TRadiobutton <KeyPress-Down> { ttk::button::RadioTraverse %W +1 } proc ttk::button::activate {w} { $w instate disabled { return } set oldState [$w state pressed] - update idletasks; after 100 ;# block event loop to avoid reentrancy + update idletasks; after 100 $w state $oldState $w invoke } diff --git a/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/ttk/clamTheme.tcl b/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/ttk/clamTheme.tcl index ea29abe2dffeb6e8e825a69109a963271bfcf043..c4c818471c7a2da8ecae42ee275fb9ce2f916c5e 100644 --- a/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/ttk/clamTheme.tcl +++ b/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/ttk/clamTheme.tcl @@ -1,5 +1,5 @@ # -# $Id: clamTheme.tcl,v 1.6.2.1 2010/08/26 02:06:10 hobbs Exp $ +# $Id: clamTheme.tcl,v 1.6 2007/12/13 15:27:08 dgp Exp $ # # "Clam" theme. # @@ -105,13 +105,6 @@ namespace eval ttk::theme::clam { readonly $colors(-frame)] \ -foreground [list {readonly focus} $colors(-selectfg)] \ ; - ttk::style configure ComboboxPopdownFrame \ - -relief solid -borderwidth 1 - - ttk::style configure TSpinbox -arrowsize 10 -padding {2 0 10 0} - ttk::style map TSpinbox \ - -background [list readonly $colors(-frame)] \ - -arrowcolor [list disabled $colors(-disabledfg)] ttk::style configure TNotebook.Tab -padding {6 2 6 2} ttk::style map TNotebook.Tab \ @@ -123,8 +116,15 @@ namespace eval ttk::theme::clam { # Treeview: ttk::style configure Heading \ -font TkHeadingFont -relief raised -padding {3} - ttk::style configure Treeview -background $colors(-window) - ttk::style map Treeview \ + ttk::style configure Row -background $colors(-window) + ttk::style configure Cell -background $colors(-window) + ttk::style map Row \ + -background [list selected $colors(-selectbg)] \ + -foreground [list selected $colors(-selectfg)] ; + ttk::style map Cell \ + -background [list selected $colors(-selectbg)] \ + -foreground [list selected $colors(-selectfg)] ; + ttk::style map Item \ -background [list selected $colors(-selectbg)] \ -foreground [list selected $colors(-selectfg)] ; diff --git a/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/ttk/classicTheme.tcl b/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/ttk/classicTheme.tcl index bd165a54d937ae348a1d01cc45d895c7f57d9b95..c96d7ffd719c7e81b99c110b4def260d7dead4b0 100644 --- a/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/ttk/classicTheme.tcl +++ b/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/ttk/classicTheme.tcl @@ -1,5 +1,5 @@ # -# $Id: classicTheme.tcl,v 1.6.2.1 2010/08/26 02:06:10 hobbs Exp $ +# $Id: classicTheme.tcl,v 1.6 2007/12/13 15:27:08 dgp Exp $ # # "classic" Tk theme. # @@ -70,12 +70,6 @@ namespace eval ttk::theme::classic { ttk::style configure TCombobox -padding 1 ttk::style map TCombobox -fieldbackground \ [list readonly $colors(-frame) disabled $colors(-frame)] - ttk::style configure ComboboxPopdownFrame \ - -relief solid -borderwidth 1 - - ttk::style configure TSpinbox -arrowsize 10 -padding {2 0 10 0} - ttk::style map TSpinbox -fieldbackground \ - [list readonly $colors(-frame) disabled $colors(-frame)] ttk::style configure TLabelframe -borderwidth 2 -relief groove @@ -93,8 +87,12 @@ namespace eval ttk::theme::classic { # Treeview: ttk::style configure Heading -font TkHeadingFont -relief raised - ttk::style configure Treeview -background $colors(-window) - ttk::style map Treeview \ + ttk::style configure Row -background $colors(-window) + ttk::style configure Cell -background $colors(-window) + ttk::style map Row \ + -background [list selected $colors(-selectbg)] \ + -foreground [list selected $colors(-selectfg)] ; + ttk::style map Cell \ -background [list selected $colors(-selectbg)] \ -foreground [list selected $colors(-selectfg)] ; diff --git a/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/ttk/combobox.tcl b/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/ttk/combobox.tcl index f04aaaa01010f27e35f8acb2d313604d174a855f..2f4838fae865f0f6f97a4f3d5b24cd75711a0122 100644 --- a/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/ttk/combobox.tcl +++ b/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/ttk/combobox.tcl @@ -1,8 +1,13 @@ # -# $Id: combobox.tcl,v 1.12.2.4 2010/08/26 02:06:10 hobbs Exp $ +# $Id: combobox.tcl,v 1.12 2008/02/23 18:41:07 jenglish Exp $ # # Combobox bindings. # +# Each combobox $cb has a child $cb.popdown, which contains +# a listbox $cb.popdown.l and a scrollbar. The listbox -listvariable +# is set to a namespace variable, which is used to synchronize the +# combobox values with the listbox values. +# # <<NOTE-WM-TRANSIENT>>: # # Need to set [wm transient] just before mapping the popdown @@ -55,9 +60,12 @@ bind TCombobox <Shift-ButtonPress-1> { ttk::combobox::Press "s" %W %x %y } bind TCombobox <Double-ButtonPress-1> { ttk::combobox::Press "2" %W %x %y } bind TCombobox <Triple-ButtonPress-1> { ttk::combobox::Press "3" %W %x %y } bind TCombobox <B1-Motion> { ttk::combobox::Drag %W %x } -bind TCombobox <Motion> { ttk::combobox::Motion %W %x %y } -ttk::bindMouseWheel TCombobox [list ttk::combobox::Scroll %W] +bind TCombobox <MouseWheel> { ttk::combobox::Scroll %W [expr {%D/-120}] } +if {[tk windowingsystem] eq "x11"} { + bind TCombobox <ButtonPress-4> { ttk::combobox::Scroll %W -1 } + bind TCombobox <ButtonPress-5> { ttk::combobox::Scroll %W 1 } +} bind TCombobox <<TraverseIn>> { ttk::combobox::TraverseIn %W } @@ -144,19 +152,6 @@ proc ttk::combobox::Drag {w x} { } } -## Motion -- -# Set cursor. -# -proc ttk::combobox::Motion {w x y} { - if { [$w identify $x $y] eq "textarea" - && [$w instate {!readonly !disabled}] - } { - ttk::setCursor $w text - } else { - ttk::setCursor $w "" - } -} - ## TraverseIn -- receive focus due to keyboard navigation # For editable comboboxes, set the selection and insert cursor. # @@ -221,9 +216,9 @@ proc ttk::combobox::LBTab {lb dir} { LBSelect $lb Unpost $cb # The [grab release] call in [Unpost] queues events that later - # re-set the focus (@@@ NOTE: this might not be true anymore). - # Set new focus later: - after 0 [list ttk::traverseTo $newFocus] + # re-set the focus. [update] to make sure these get processed first: + update + ttk::traverseTo $newFocus } } @@ -270,8 +265,7 @@ proc ttk::combobox::PopdownWindow {cb} { variable scrollbar if {![winfo exists $cb.popdown]} { - set poplevel [PopdownToplevel $cb.popdown] - set popdown [ttk::frame $poplevel.f -style ComboboxPopdownFrame] + set popdown [PopdownToplevel $cb.popdown] $scrollbar $popdown.sb \ -orient vertical -command [list $popdown.l yview] @@ -286,14 +280,9 @@ proc ttk::combobox::PopdownWindow {cb} { bindtags $popdown.l \ [list $popdown.l ComboboxListbox Listbox $popdown all] - grid $popdown.l -row 0 -column 0 -padx {1 0} -pady 1 -sticky nsew - grid $popdown.sb -row 0 -column 1 -padx {0 1} -pady 1 -sticky ns + grid $popdown.l $popdown.sb -sticky news grid columnconfigure $popdown 0 -weight 1 grid rowconfigure $popdown 0 -weight 1 - - grid $popdown -sticky news -padx 0 -pady 0 - grid rowconfigure $poplevel 0 -weight 1 - grid columnconfigure $poplevel 0 -weight 1 } return $cb.popdown } @@ -308,14 +297,12 @@ proc ttk::combobox::PopdownToplevel {w} { switch -- [tk windowingsystem] { default - x11 { - $w configure -relief flat -borderwidth 0 - wm attributes $w -type combo + $w configure -relief solid -borderwidth 1 wm overrideredirect $w true } win32 { - $w configure -relief flat -borderwidth 0 + $w configure -relief solid -borderwidth 1 wm overrideredirect $w true - wm attributes $w -topmost 1 } aqua { $w configure -relief solid -borderwidth 0 @@ -334,7 +321,7 @@ proc ttk::combobox::PopdownToplevel {w} { proc ttk::combobox::ConfigureListbox {cb} { variable Values - set popdown [PopdownWindow $cb].f + set popdown [PopdownWindow $cb] set values [$cb cget -values] set current [$cb current] if {$current < 0} { @@ -349,10 +336,8 @@ proc ttk::combobox::ConfigureListbox {cb} { if {$height > [$cb cget -height]} { set height [$cb cget -height] grid $popdown.sb - grid configure $popdown.l -padx {1 0} } else { grid remove $popdown.sb - grid configure $popdown.l -padx 1 } $popdown.l configure -height $height } @@ -397,7 +382,7 @@ proc ttk::combobox::Post {cb} { set popdown [PopdownWindow $cb] ConfigureListbox $cb - update idletasks ;# needed for geometry propagation. + update idletasks PlacePopdown $cb $popdown # See <<NOTE-WM-TRANSIENT>> switch -- [tk windowingsystem] { @@ -406,7 +391,6 @@ proc ttk::combobox::Post {cb} { # Post the listbox: # - wm attribute $popdown -topmost 1 wm deiconify $popdown raise $popdown } @@ -425,7 +409,7 @@ proc ttk::combobox::Unpost {cb} { # Return the combobox main widget that owns the listbox. # proc ttk::combobox::LBMaster {lb} { - winfo parent [winfo parent [winfo parent $lb]] + winfo parent [winfo parent $lb] } ## LBSelect $lb -- diff --git a/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/ttk/cursors.tcl b/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/ttk/cursors.tcl index 23198bdd0fa4f269f41c4169ebf5acdd68707756..a151194cc27caf0dfbba657a8ad69dc5125ed8db 100644 --- a/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/ttk/cursors.tcl +++ b/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/ttk/cursors.tcl @@ -1,188 +1,35 @@ # -# $Id: cursors.tcl,v 1.1.4.2 2010/08/26 02:06:10 hobbs Exp $ +# $Id: cursors.tcl,v 1.1 2006/10/31 01:42:27 hobbs Exp $ # -# Map symbolic cursor names to platform-appropriate cursors. +# Ttk package: Symbolic cursor names. # -# The following cursors are defined: -# -# standard -- default cursor for most controls -# "" -- inherit cursor from parent window -# none -- no cursor -# -# text -- editable widgets (entry, text) -# link -- hyperlinks within text -# crosshair -- graphic selection, fine control -# busy -- operation in progress -# forbidden -- action not allowed -# -# hresize -- horizontal resizing -# vresize -- vertical resizing -# -# Also resize cursors for each of the compass points, -# {nw,n,ne,w,e,sw,s,se}resize. -# -# Platform notes: -# -# Windows doesn't distinguish resizing at the 8 compass points, -# only horizontal, vertical, and the two diagonals. -# -# OSX doesn't have resize cursors for nw, ne, sw, or se corners. -# We use the Tk-defined X11 fallbacks for these. -# -# X11 doesn't have a "forbidden" cursor (usually a slashed circle); -# "pirate" seems to be the conventional cursor for this purpose. -# -# Windows has an IDC_HELP cursor, but it's not available from Tk. -# -# Tk does not support "none" on Windows. +# @@@ TODO: Figure out appropriate platform-specific cursors +# for the various functions. # namespace eval ttk { variable Cursors - # Use X11 cursor names as defaults, since Tk supplies these - # on all platforms. - # - array set Cursors { - "" "" - none none - - standard left_ptr - text xterm - link hand2 - crosshair crosshair - busy watch - forbidden pirate - - hresize sb_h_double_arrow - vresize sb_v_double_arrow - - nresize top_side - sresize bottom_side - wresize left_side - eresize right_side - nwresize top_left_corner - neresize top_right_corner - swresize bottom_left_corner - seresize bottom_right_corner - move fleur - - } - - # Platform-specific overrides for Windows and OSX. - # - switch [tk windowingsystem] { - "win32" { + switch -glob $::tcl_platform(platform) { + "windows" { array set Cursors { - none {} - - standard arrow - text ibeam - link hand2 - crosshair crosshair - busy wait - forbidden no - - vresize size_ns - nresize size_ns - sresize size_ns - - wresize size_we - eresize size_we - hresize size_we - - nwresize size_nw_se - swresize size_ne_sw - - neresize size_ne_sw + hresize sb_h_double_arrow + vresize sb_v_double_arrow seresize size_nw_se } } - "aqua" { - if {[package vsatisfies [package provide Tk] 8.5]} { - # appeared 2007-04-23, Tk 8.5a6 - array set Cursors { - standard arrow - text ibeam - link pointinghand - crosshair crosshair - busy watch - forbidden notallowed - - hresize resizeleftright - vresize resizeupdown - nresize resizeup - sresize resizedown - wresize resizeleft - eresize resizeright - } + "unix" - + * { + array set Cursors { + hresize sb_h_double_arrow + vresize sb_v_double_arrow + seresize bottom_right_corner } } - } -} - -## ttk::cursor $cursor -- -# Return platform-specific cursor for specified symbolic cursor. -# -proc ttk::cursor {name} { - variable Cursors - return $Cursors($name) -} - -## ttk::setCursor $w $cursor -- -# Set the cursor for specified window. -# -# [ttk::setCursor] should be used in <Motion> bindings -# instead of directly calling [$w configure -cursor ...], -# as the latter always incurs a server round-trip and -# can lead to high CPU load (see [#1184746]) -# -proc ttk::setCursor {w name} { - variable Cursors - if {[$w cget -cursor] ne $Cursors($name)} { - $w configure -cursor $Cursors($name) - } -} - -## Interactive test harness: -# -proc ttk::CursorSampler {f} { - ttk::frame $f - - set r 0 - foreach row { - {nwresize nresize neresize} - { wresize move eresize} - {swresize sresize seresize} - {text link crosshair} - {hresize vresize ""} - {busy forbidden ""} - {none standard ""} - } { - set c 0 - foreach cursor $row { - set w $f.${r}${c} - ttk::label $w -text $cursor -cursor [ttk::cursor $cursor] \ - -relief solid -borderwidth 1 -padding 3 - grid $w -row $r -column $c -sticky nswe - grid columnconfigure $f $c -uniform cols -weight 1 - incr c - } - grid rowconfigure $f $r -uniform rows -weight 1 - incr r } - - return $f -} - -if {[info exists argv0] && $argv0 eq [info script]} { - wm title . "[array size ::ttk::Cursors] cursors" - pack [ttk::CursorSampler .f] -expand true -fill both - bind . <KeyPress-Escape> [list destroy .] - focus .f } #*EOF* diff --git a/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/ttk/defaults.tcl b/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/ttk/defaults.tcl index 30830de5ff2fe11ca6ab99d30e6ca21f3f5570cb..500562d08a5dc44a5385f81db24f6d25546b1991 100644 --- a/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/ttk/defaults.tcl +++ b/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/ttk/defaults.tcl @@ -1,5 +1,5 @@ # -# $Id: defaults.tcl,v 1.6.2.1 2010/08/26 02:06:10 hobbs Exp $ +# $Id: defaults.tcl,v 1.6 2007/12/13 15:27:08 dgp Exp $ # # Settings for default theme. # @@ -8,9 +8,7 @@ namespace eval ttk::theme::default { variable colors array set colors { -frame "#d9d9d9" - -foreground "#000000" -window "#ffffff" - -text "#000000" -activebg "#ececec" -selectbg "#4a6984" -selectfg "#ffffff" @@ -24,7 +22,7 @@ namespace eval ttk::theme::default { ttk::style configure "." \ -borderwidth 1 \ -background $colors(-frame) \ - -foreground $colors(-foreground) \ + -foreground black \ -troughcolor $colors(-darker) \ -font TkDefaultFont \ -selectborderwidth 1 \ @@ -66,11 +64,6 @@ namespace eval ttk::theme::default { ttk::style map TCombobox -fieldbackground \ [list readonly $colors(-frame) disabled $colors(-frame)] - ttk::style configure TSpinbox -arrowsize 10 -padding {2 0 10 0} - ttk::style map TSpinbox -fieldbackground \ - [list readonly $colors(-frame) disabled $colors(-frame)] \ - -arrowcolor [list disabled $colors(-disabledfg)] - ttk::style configure TLabelframe \ -relief groove -borderwidth 2 @@ -92,19 +85,17 @@ namespace eval ttk::theme::default { # Treeview. # ttk::style configure Heading -font TkHeadingFont -relief raised - ttk::style configure Treeview \ - -background $colors(-window) \ - -foreground $colors(-text) ; - ttk::style map Treeview \ + ttk::style configure Row -background $colors(-window) + ttk::style configure Cell -background $colors(-window) + ttk::style map Row \ + -background [list selected $colors(-selectbg)] \ + -foreground [list selected $colors(-selectfg)] ; + ttk::style map Cell \ + -background [list selected $colors(-selectbg)] \ + -foreground [list selected $colors(-selectfg)] ; + ttk::style map Item \ -background [list selected $colors(-selectbg)] \ -foreground [list selected $colors(-selectfg)] ; - - # Combobox popdown frame - ttk::style layout ComboboxPopdownFrame { - ComboboxPopdownFrame.border -sticky nswe - } - ttk::style configure ComboboxPopdownFrame \ - -borderwidth 1 -relief solid # # Toolbar buttons: diff --git a/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/ttk/entry.tcl b/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/ttk/entry.tcl index ebabcb4f155192e8367b9301165d9445b6f41ba7..37a2419728922a8d510e2a0ecbe6625f6e8a9c17 100644 --- a/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/ttk/entry.tcl +++ b/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/ttk/entry.tcl @@ -1,5 +1,5 @@ # -# $Id: entry.tcl,v 1.4.2.2 2010/09/01 16:40:15 jenglish Exp $ +# $Id: entry.tcl,v 1.4 2007/12/13 15:27:08 dgp Exp $ # # DERIVED FROM: tk/library/entry.tcl r1.22 # @@ -34,17 +34,13 @@ namespace eval ttk { } } -### Option database settings. -# -option add *TEntry.cursor [ttk::cursor text] - ### Bindings. # # Removed the following standard Tk bindings: # # <Control-Key-space>, <Control-Shift-Key-space>, # <Key-Select>, <Shift-Key-Select>: -# ttk::entry widget doesn't use selection anchor. +# Ttk entry widget doesn't use selection anchor. # <Key-Insert>: # Inserts PRIMARY selection (on non-Windows platforms). # This is inconsistent with typical platform bindings. @@ -137,9 +133,6 @@ bind TEntry <Key-Tab> {# nothing} if {[tk windowingsystem] eq "aqua"} { bind TEntry <Command-KeyPress> {# nothing} } -# Tk-on-Cocoa generates characters for these two keys. [Bug 2971663] -bind TEntry <Down> {# nothing} -bind TEntry <Up> {# nothing} ## Additional emacs-like bindings: # @@ -231,7 +224,7 @@ proc ttk::entry::See {w {index insert}} { # position following the next end-of-word position. # set ::ttk::entry::State(startNext) \ - [string equal $::tcl_platform(platform) "windows"] + [string equal $tcl_platform(platform) "windows"] proc ttk::entry::NextWord {w start} { variable State diff --git a/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/ttk/notebook.tcl b/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/ttk/notebook.tcl index cf5ffc13d66d8f9acfe4fece735fd76b91f9140c..4fe58ccd0a93b8b8f1f71d6db9109d73ee5b4730 100644 --- a/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/ttk/notebook.tcl +++ b/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/ttk/notebook.tcl @@ -1,5 +1,5 @@ # -# $Id: notebook.tcl,v 1.4.4.1 2010/08/26 02:06:10 hobbs Exp $ +# $Id: notebook.tcl,v 1.4 2007/02/24 09:15:07 das Exp $ # # Bindings for TNotebook widget # @@ -21,26 +21,21 @@ bind TNotebook <Destroy> { ttk::notebook::Cleanup %W } # ActivateTab $nb $tab -- # Select the specified tab and set focus. # -# Desired behavior: -# + take focus when reselecting the currently-selected tab; -# + keep focus if the notebook already has it; -# + otherwise set focus to the first traversable widget -# in the newly-selected tab; -# + do not leave the focus in a deselected tab. +# If $tab was already the current tab, set the focus to the +# notebook widget. Otherwise, set the focus to the first +# traversable widget in the pane. The behavior is that the +# notebook takes focus when the user selects the same tab +# a second time. This mirrors Windows tab behavior. # proc ttk::notebook::ActivateTab {w tab} { - set oldtab [$w select] - $w select $tab - set newtab [$w select] ;# NOTE: might not be $tab, if $tab is disabled - - if {[focus] eq $w} { return } - if {$newtab eq $oldtab} { focus $w ; return } - - update idletasks ;# needed so focus logic sees correct mapped states - if {[set f [ttk::focusFirst $newtab]] ne ""} { - ttk::traverseTo $f - } else { + if {[$w index $tab] eq [$w index current]} { focus $w + } else { + $w select $tab + update ;# needed so focus logic sees correct mapped/unmapped states + if {[set f [ttk::focusFirst [$w select]]] ne ""} { + tk::TabToWindow $f + } } } @@ -107,8 +102,6 @@ proc ttk::notebook::enableTraversal {nb} { if {![info exists TLNotebooks($top)]} { # Augment $top bindings: # - bind $top <Control-Key-Next> {+ttk::notebook::TLCycleTab %W 1} - bind $top <Control-Key-Prior> {+ttk::notebook::TLCycleTab %W -1} bind $top <Control-Key-Tab> {+ttk::notebook::TLCycleTab %W 1} bind $top <Shift-Control-Key-Tab> {+ttk::notebook::TLCycleTab %W -1} catch { diff --git a/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/ttk/panedwindow.tcl b/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/ttk/panedwindow.tcl index 06c6c5099efb1ca693c3e0ecfd1e7c7e8930639a..423baa9fdf2f73daaf8996c225f221e2386a97b7 100644 --- a/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/ttk/panedwindow.tcl +++ b/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/ttk/panedwindow.tcl @@ -1,5 +1,5 @@ # -# $Id: panedwindow.tcl,v 1.5.2.1 2010/08/26 02:06:10 hobbs Exp $ +# $Id: panedwindow.tcl,v 1.5 2007/12/13 15:27:08 dgp Exp $ # # Bindings for ttk::panedwindow widget. # @@ -27,6 +27,7 @@ bind TPanedwindow <Leave> { ttk::panedwindow::ResetCursor %W } # See <<NOTE-PW-LEAVE-NOTIFYINFERIOR>> bind TPanedwindow <<EnteredChild>> { ttk::panedwindow::ResetCursor %W } + ## Sash movement: # proc ttk::panedwindow::Press {w x y} { @@ -65,20 +66,22 @@ proc ttk::panedwindow::Release {w x y} { proc ttk::panedwindow::ResetCursor {w} { variable State if {!$State(pressed)} { - ttk::setCursor $w {} + $w configure -cursor {} } } proc ttk::panedwindow::SetCursor {w x y} { - set cursor "" - if {[llength [$w identify $x $y]]} { + variable ::ttk::Cursors + + if {![llength [$w identify $x $y]]} { + ResetCursor $w + } else { # Assume we're over a sash. switch -- [$w cget -orient] { - horizontal { set cursor hresize } - vertical { set cursor vresize } + horizontal { $w configure -cursor $Cursors(hresize) } + vertical { $w configure -cursor $Cursors(vresize) } } } - ttk::setCursor $w $cursor } #*EOF* diff --git a/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/ttk/scale.tcl b/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/ttk/scale.tcl index 20255885a527e7b7ee68f726404001e2fc315bb7..2a5cf2e301b8abd4c08502ce015555c6f896c173 100644 --- a/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/ttk/scale.tcl +++ b/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/ttk/scale.tcl @@ -2,7 +2,7 @@ # # Bindings for the TScale widget # -# $Id: scale.tcl,v 1.1.4.2 2010/08/26 02:06:10 hobbs Exp $ +# $Id: scale.tcl,v 1.1 2006/10/31 01:42:27 hobbs Exp $ namespace eval ttk::scale { variable State @@ -15,25 +15,6 @@ bind TScale <ButtonPress-1> { ttk::scale::Press %W %x %y } bind TScale <B1-Motion> { ttk::scale::Drag %W %x %y } bind TScale <ButtonRelease-1> { ttk::scale::Release %W %x %y } -bind TScale <ButtonPress-2> { ttk::scale::Jump %W %x %y } -bind TScale <B2-Motion> { ttk::scale::Drag %W %x %y } -bind TScale <ButtonRelease-2> { ttk::scale::Release %W %x %y } - -bind TScale <ButtonPress-3> { ttk::scale::Jump %W %x %y } -bind TScale <B3-Motion> { ttk::scale::Drag %W %x %y } -bind TScale <ButtonRelease-3> { ttk::scale::Release %W %x %y } - -bind TScale <Left> { ttk::scale::Increment %W -1 } -bind TScale <Up> { ttk::scale::Increment %W -1 } -bind TScale <Right> { ttk::scale::Increment %W 1 } -bind TScale <Down> { ttk::scale::Increment %W 1 } -bind TScale <Control-Left> { ttk::scale::Increment %W -10 } -bind TScale <Control-Up> { ttk::scale::Increment %W -10 } -bind TScale <Control-Right> { ttk::scale::Increment %W 10 } -bind TScale <Control-Down> { ttk::scale::Increment %W 10 } -bind TScale <Home> { %W set [%W cget -from] } -bind TScale <End> { %W set [%W cget -to] } - proc ttk::scale::Press {w x y} { variable State set State(dragging) 0 @@ -41,8 +22,11 @@ proc ttk::scale::Press {w x y} { switch -glob -- [$w identify $x $y] { *track - *trough { - set inc [expr {([$w get $x $y] <= [$w get]) ? -1 : 1}] - ttk::Repeatedly Increment $w $inc + if {[$w get $x $y] <= [$w get]} { + ttk::Repeatedly Increment $w -1 + } else { + ttk::Repeatedly Increment $w 1 + } } *slider { set State(dragging) 1 @@ -51,26 +35,6 @@ proc ttk::scale::Press {w x y} { } } -# scale::Jump -- ButtonPress-2/3 binding for scale acts like -# Press except that clicking in the trough jumps to the -# clicked position. -proc ttk::scale::Jump {w x y} { - variable State - set State(dragging) 0 - - switch -glob -- [$w identify $x $y] { - *track - - *trough { - $w set [$w get $x $y] - set State(dragging) 1 - set State(initial) [$w get] - } - *slider { - Press $w $x $y - } - } -} - proc ttk::scale::Drag {w x y} { variable State if {$State(dragging)} { diff --git a/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/ttk/sizegrip.tcl b/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/ttk/sizegrip.tcl index 1b9119bf039645effd8f32b353d191f6c8467b9d..f1b87b18ff1f421892c379eee85f65188ba555f3 100644 --- a/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/ttk/sizegrip.tcl +++ b/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/ttk/sizegrip.tcl @@ -1,22 +1,14 @@ # -# $Id: sizegrip.tcl,v 1.1.4.2 2010/08/26 02:06:10 hobbs Exp $ +# $Id: sizegrip.tcl,v 1.1 2006/10/31 01:42:27 hobbs Exp $ # -# Sizegrip widget bindings. +# Ttk widget set -- sizegrip widget bindings. # # Dragging a sizegrip widget resizes the containing toplevel. # # NOTE: the sizegrip widget must be in the lower right hand corner. # -switch -- [tk windowingsystem] { - x11 - - win32 { - option add *TSizegrip.cursor [ttk::cursor seresize] - } - aqua { - # Aqua sizegrips use default Arrow cursor. - } -} +option add *TSizegrip.cursor $::ttk::Cursors(seresize) namespace eval ttk::sizegrip { variable State @@ -28,8 +20,6 @@ namespace eval ttk::sizegrip { height 0 widthInc 1 heightInc 1 - resizeX 1 - resizeY 1 toplevel {} } } @@ -41,21 +31,13 @@ bind TSizegrip <ButtonRelease-1> { ttk::sizegrip::Release %W %X %Y } proc ttk::sizegrip::Press {W X Y} { variable State - if {[$W instate disabled]} { return } - set top [winfo toplevel $W] - # If the toplevel is not resizable then bail - foreach {State(resizeX) State(resizeY)} [wm resizable $top] break - if {!$State(resizeX) && !$State(resizeY)} { - return - } - # Sanity-checks: # If a negative X or Y position was specified for [wm geometry], # just bail out -- there's no way to handle this cleanly. # - if {[scan [wm geometry $top] "%dx%d+%d+%d" width height x y] != 4} { + if {[scan [wm geometry $top] "%dx%d+%d+%d" width height _x _y] != 4} { return; } @@ -74,26 +56,17 @@ proc ttk::sizegrip::Press {W X Y} { set State(pressY) $Y set State(width) $width set State(height) $height - set State(x) $x - set State(y) $y set State(pressed) 1 } proc ttk::sizegrip::Drag {W X Y} { variable State if {!$State(pressed)} { return } - set w $State(width) - set h $State(height) - if {$State(resizeX)} { - set w [expr {$w + ($X - $State(pressX))/$State(widthInc)}] - } - if {$State(resizeY)} { - set h [expr {$h + ($Y - $State(pressY))/$State(heightInc)}] - } + set w [expr {$State(width) + ($X - $State(pressX))/$State(widthInc)}] + set h [expr {$State(height) + ($Y - $State(pressY))/$State(heightInc)}] if {$w <= 0} { set w 1 } if {$h <= 0} { set h 1 } - set x $State(x) ; set y $State(y) - wm geometry $State(toplevel) ${w}x${h}+${x}+${y} + wm geometry $State(toplevel) ${w}x${h} } proc ttk::sizegrip::Release {W X Y} { diff --git a/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/ttk/treeview.tcl b/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/ttk/treeview.tcl index 632bf7ac262d20c928f58badb11bef4d7f6c48df..473e21b6c891d9a5b4506fc803487c3ec25393d9 100644 --- a/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/ttk/treeview.tcl +++ b/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/ttk/treeview.tcl @@ -1,4 +1,4 @@ -# $Id: treeview.tcl,v 1.4.2.2 2010/08/26 02:06:10 hobbs Exp $ +# $Id: treeview.tcl,v 1.4 2008/01/30 05:33:19 jenglish Exp $ # # ttk::treeview widget bindings and utilities. # @@ -21,6 +21,15 @@ namespace eval ttk::treeview { # For pressmode == "heading" set State(heading) {} + + # Provide [lassign] if not already present + # (@@@ TODO: check if this is still needed after horrible-identify purge) + # + if {![llength [info commands lassign]]} { + proc lassign {vals args} { + uplevel 1 [list foreach $args $vals break] + } + } } ### Widget bindings. @@ -103,15 +112,21 @@ proc ttk::treeview::Keynav {w dir} { # Sets cursor, active element ... # proc ttk::treeview::Motion {w x y} { + variable ::ttk::Cursors + variable State + set cursor {} set activeHeading {} - switch -- [$w identify region $x $y] { - separator { set cursor hresize } - heading { set activeHeading [$w identify column $x $y] } + lassign [$w identify $x $y] what where detail + switch -- $what { + separator { set cursor $Cursors(hresize) } + heading { set activeHeading $where } } - ttk::setCursor $w $cursor + if {[$w cget -cursor] ne $cursor} { + $w configure -cursor $cursor + } ActivateHeading $w $activeHeading } @@ -155,20 +170,19 @@ proc ttk::treeview::DoubleClick {w x y} { ## Press -- ButtonPress binding. # proc ttk::treeview::Press {w x y} { - focus $w - switch -- [$w identify region $x $y] { + lassign [$w identify $x $y] what where detail + focus $w ;# or: ClickToFocus? + + switch -- $what { nothing { } - heading { heading.press $w $x $y } - separator { resize.press $w $x $y } - tree - - cell { - set item [$w identify item $x $y] - SelectOp $w $item choose - switch -glob -- [$w identify element $x $y] { - *indicator - - *disclosure { Toggle $w $item } - } - } + heading { heading.press $w $where } + separator { resize.press $w $x $where } + cell - + row - + item { SelectOp $w $where choose } + } + if {$what eq "item" && [string match *indicator $detail]} { + Toggle $w $where } } @@ -194,10 +208,10 @@ proc ttk::treeview::Release {w x y} { ### Interactive column resizing. # -proc ttk::treeview::resize.press {w x y} { +proc ttk::treeview::resize.press {w x column} { variable State set State(pressMode) "resize" - set State(resizeColumn) [$w identify column $x $y] + set State(resizeColumn) $column } proc ttk::treeview::resize.drag {w x} { @@ -212,9 +226,8 @@ proc ttk::treeview::resize.release {w x} { ### Heading activation. # -proc ttk::treeview::heading.press {w x y} { +proc ttk::treeview::heading.press {w column} { variable State - set column [$w identify column $x $y] set State(pressMode) "heading" set State(heading) $column $w heading $column state pressed @@ -222,9 +235,8 @@ proc ttk::treeview::heading.press {w x y} { proc ttk::treeview::heading.drag {w x y} { variable State - if { [$w identify region $x $y] eq "heading" - && [$w identify column $x $y] eq $State(heading) - } { + lassign [$w identify $x $y] what where detail + if {$what eq "heading" && $where eq $State(heading)} { $w heading $State(heading) state pressed } else { $w heading $State(heading) state !pressed @@ -234,7 +246,7 @@ proc ttk::treeview::heading.drag {w x y} { proc ttk::treeview::heading.release {w} { variable State if {[lsearch -exact [$w heading $State(heading) state] pressed] >= 0} { - after 0 [$w heading $State(heading) -command] + after idle [$w heading $State(heading) -command] } $w heading $State(heading) state !pressed } @@ -268,7 +280,7 @@ proc ttk::treeview::select.choose.extended {w item} { BrowseTo $w $item } proc ttk::treeview::select.toggle.extended {w item} { - $w selection toggle [list $item] + $w selection toggle $item } proc ttk::treeview::select.extend.extended {w item} { if {[set anchor [$w focus]] ne ""} { diff --git a/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/ttk/ttk.tcl b/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/ttk/ttk.tcl index 6740d174048b738af62368ecb8fa76dc9d0fd36c..c4d0ff115c0c01b273bc0772c13a638c2dd74b75 100644 --- a/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/ttk/ttk.tcl +++ b/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/ttk/ttk.tcl @@ -1,5 +1,5 @@ # -# $Id: ttk.tcl,v 1.8.2.2 2010/08/26 02:06:10 hobbs Exp $ +# $Id: ttk.tcl,v 1.8 2007/12/13 15:27:08 dgp Exp $ # # Ttk widget set initialization script. # @@ -44,11 +44,8 @@ proc ttk::deprecated'warning {old new} { ### Backward-compatibility. # -# -# Make [package require tile] an effective no-op; -# see SF#3016598 for discussion. -# -package ifneeded tile 0.8.6 { package provide tile 0.8.6 } + +package ifneeded tile 0.8.0 { package require Tk ; package provide tile 0.8.0 } # ttk::panedwindow used to be named ttk::paned. Keep the alias for now. # @@ -108,7 +105,6 @@ source [file join $::ttk::library notebook.tcl] source [file join $::ttk::library panedwindow.tcl] source [file join $::ttk::library entry.tcl] source [file join $::ttk::library combobox.tcl] ;# dependency: entry.tcl -source [file join $::ttk::library spinbox.tcl] ;# dependency: entry.tcl source [file join $::ttk::library treeview.tcl] source [file join $::ttk::library sizegrip.tcl] @@ -127,18 +123,16 @@ proc ttk::LoadThemes {} { uplevel #0 [list source [file join $library defaults.tcl]] set builtinThemes [style theme names] - foreach {theme scripts} { + foreach {theme script} { classic classicTheme.tcl alt altTheme.tcl clam clamTheme.tcl winnative winTheme.tcl - xpnative {xpTheme.tcl vistaTheme.tcl} + xpnative xpTheme.tcl aqua aquaTheme.tcl } { if {[lsearch -exact $builtinThemes $theme] >= 0} { - foreach script $scripts { - uplevel #0 [list source [file join $library $script]] - } + uplevel #0 [list source [file join $library $script]] } } } @@ -147,7 +141,7 @@ ttk::LoadThemes; rename ::ttk::LoadThemes {} ### Select platform-specific default theme: # -# Notes: +# Notes: # + On OSX, aqua theme is the default # + On Windows, xpnative takes precedence over winnative if available. # + On X11, users can use the X resource database to @@ -156,17 +150,17 @@ ttk::LoadThemes; rename ::ttk::LoadThemes {} # proc ttk::DefaultTheme {} { - set preferred [list aqua vista xpnative winnative] + set preferred [list aqua xpnative winnative] set userTheme [option get . tkTheme TkTheme] - if {$userTheme ne {} && ![catch { + if {$userTheme != {} && ![catch { uplevel #0 [list package require ttk::theme::$userTheme] }]} { return $userTheme } foreach theme $preferred { - if {[package provide ttk::theme::$theme] ne ""} { + if {[package provide ttk::theme::$theme] != ""} { return $theme } } diff --git a/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/ttk/utils.tcl b/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/ttk/utils.tcl index 60aa5a7006da15fa91f5733fb2685d271767b60c..1de8ec809d1f2e188f4c0bbb3e061e8b474bde15 100644 --- a/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/ttk/utils.tcl +++ b/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/ttk/utils.tcl @@ -1,52 +1,22 @@ # -# $Id: utils.tcl,v 1.6.2.1 2010/08/26 02:06:10 hobbs Exp $ +# $Id: utils.tcl,v 1.6 2008/01/06 19:16:12 jenglish Exp $ # # Utilities for widget implementations. # ### Focus management. # -# See also: #1516479 -# ## ttk::takefocus -- # This is the default value of the "-takefocus" option -# for ttk::* widgets that participate in keyboard navigation. -# -# NOTES: -# tk::FocusOK (called by tk_focusNext) tests [winfo viewable] -# if -takefocus is 1, empty, or missing; but not if it's a -# script prefix, so we have to check that here as well. +# for widgets that participate in keyboard navigation. # +# See also: tk::FocusOK # proc ttk::takefocus {w} { expr {[$w instate !disabled] && [winfo viewable $w]} } -## ttk::GuessTakeFocus -- -# This routine is called as a fallback for widgets -# with a missing or empty -takefocus option. -# -# It implements the same heuristics as tk::FocusOK. -# -proc ttk::GuessTakeFocus {w} { - # Don't traverse to widgets with '-state disabled': - # - if {![catch {$w cget -state} state] && $state eq "disabled"} { - return 0 - } - - # Allow traversal to widgets with explicit key or focus bindings: - # - if {[regexp {Key|Focus} [concat [bind $w] [bind [winfo class $w]]]]} { - return 1; - } - - # Default is nontraversable: - # - return 0; -} - ## ttk::traverseTo $w -- # Set the keyboard focus to the specified window. # @@ -68,26 +38,36 @@ proc ttk::clickToFocus {w} { } ## ttk::takesFocus w -- -# Test if the widget can take keyboard focus. +# Test if the widget can take keyboard focus: # -# See the description of the -takefocus option in options(n) -# for details. +# + widget is viewable, AND: +# - if -takefocus is missing or empty, return 0, OR +# - if -takefocus is 0 or 1, return that value, OR +# - append the widget name to -takefocus and evaluate it +# as a script. +# +# See also: tk::FocusOK +# +# Note: This routine doesn't implement the same fallback heuristics +# as tk::FocusOK. # proc ttk::takesFocus {w} { - if {![winfo viewable $w]} { - return 0 - } elseif {[catch {$w cget -takefocus} takefocus]} { - return [GuessTakeFocus $w] - } else { + + if {![winfo viewable $w]} { return 0 } + + if {![catch {$w cget -takefocus} takefocus]} { switch -- $takefocus { - "" { return [GuessTakeFocus $w] } - 0 { return 0 } - 1 { return 1 } + 0 - + 1 { return $takefocus } + "" { return 0 } default { - return [expr {[uplevel #0 $takefocus [list $w]] == 1}] + set value [uplevel #0 $takefocus [list $w]] + return [expr {$value eq 1}] } } } + + return 0 } ## ttk::focusFirst $w -- @@ -271,7 +251,10 @@ proc ttk::copyBindings {from to} { } } -### Mousewheel bindings. +## Standard mousewheel bindings. +# +# Usage: [ttk::copyBindings TtkScrollable $bindtag] +# adds mousewheel support to a scrollable widget. # # Platform inconsistencies: # @@ -295,35 +278,6 @@ proc ttk::copyBindings {from to} { # Gtk+ and Qt do not appear to use as large a factor). # -## ttk::bindMouseWheel $bindtag $command... -# Adds basic mousewheel support to $bindtag. -# $command will be passed one additional argument -# specifying the mousewheel direction (-1: up, +1: down). -# - -proc ttk::bindMouseWheel {bindtag callback} { - switch -- [tk windowingsystem] { - x11 { - bind $bindtag <ButtonPress-4> "$callback -1" - bind $bindtag <ButtonPress-5> "$callback +1" - } - win32 { - bind $bindtag <MouseWheel> [append callback { [expr {-(%D/120)}]}] - } - aqua { - bind $bindtag <MouseWheel> [append callback { [expr {-(%D)}]} ] - } - } -} - -## Mousewheel bindings for standard scrollable widgets. -# -# Usage: [ttk::copyBindings TtkScrollable $bindtag] -# -# $bindtag should be for a widget that supports the -# standard scrollbar protocol. -# - switch -- [tk windowingsystem] { x11 { bind TtkScrollable <ButtonPress-4> { %W yview scroll -5 units } diff --git a/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/ttk/winTheme.tcl b/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/ttk/winTheme.tcl index 3062294fee49df730ba0b5294473fc6e7b1c0159..20f45decf1433cc2fe2a7215aea48f1cb206028a 100644 --- a/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/ttk/winTheme.tcl +++ b/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/ttk/winTheme.tcl @@ -1,5 +1,5 @@ # -# $Id: winTheme.tcl,v 1.6.2.2 2010/09/02 17:46:11 jenglish Exp $ +# $Id: winTheme.tcl,v 1.6 2007/12/13 15:27:08 dgp Exp $ # # Settings for 'winnative' theme. # @@ -41,22 +41,10 @@ namespace eval ttk::theme::winnative { ttk::style map TCombobox \ -selectbackground [list !focus SystemWindow] \ -selectforeground [list !focus SystemWindowText] \ - -fieldbackground [list \ - readonly SystemButtonFace \ - disabled SystemButtonFace] \ - -foreground [list \ - disabled SystemGrayText \ - {readonly focus} SystemHighlightText \ - ] \ + -foreground [list {readonly focus} SystemHighlightText] \ -focusfill [list {readonly focus} SystemHighlight] \ ; - ttk::style element create ComboboxPopdownFrame.border from default - ttk::style configure ComboboxPopdownFrame \ - -borderwidth 1 -relief solid - - ttk::style configure TSpinbox -padding {2 0 16 0} - ttk::style configure TLabelframe -borderwidth 2 -relief groove ttk::style configure Toolbutton -relief flat -padding {8 4} @@ -71,8 +59,15 @@ namespace eval ttk::theme::winnative { # Treeview: ttk::style configure Heading -font TkHeadingFont -relief raised - ttk::style configure Treeview -background SystemWindow - ttk::style map Treeview \ + ttk::style configure Row -background SystemWindow + ttk::style configure Cell -background SystemWindow + ttk::style map Row \ + -background [list selected SystemHighlight] \ + -foreground [list selected SystemHighlightText] ; + ttk::style map Cell \ + -background [list selected SystemHighlight] \ + -foreground [list selected SystemHighlightText] ; + ttk::style map Item \ -background [list selected SystemHighlight] \ -foreground [list selected SystemHighlightText] ; diff --git a/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/ttk/xpTheme.tcl b/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/ttk/xpTheme.tcl index 6eeb3e056ea1e65077e7217319465f8cb89e9d15..14d8ae87aed5cdee3660071eb15b795bd9925449 100644 --- a/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/ttk/xpTheme.tcl +++ b/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/ttk/xpTheme.tcl @@ -1,5 +1,5 @@ # -# $Id: xpTheme.tcl,v 1.6.2.5 2010/09/02 17:46:11 jenglish Exp $ +# $Id: xpTheme.tcl,v 1.6 2007/12/13 15:27:08 dgp Exp $ # # Settings for 'xpnative' theme # @@ -31,12 +31,19 @@ namespace eval ttk::theme::xpnative { # Treeview: ttk::style configure Heading -font TkHeadingFont - ttk::style configure Treeview -background SystemWindow - ttk::style map Treeview \ + ttk::style configure Row -background SystemWindow + ttk::style configure Cell -background SystemWindow + ttk::style map Row \ + -background [list selected SystemHighlight] \ + -foreground [list selected SystemHighlightText] ; + ttk::style map Cell \ + -background [list selected SystemHighlight] \ + -foreground [list selected SystemHighlightText] ; + ttk::style map Item \ -background [list selected SystemHighlight] \ -foreground [list selected SystemHighlightText] ; - ttk::style configure TLabelframe.Label -foreground "#0046d5" + ttk::style configure TLabelframe -foreground "#0046d5" # OR: -padding {3 3 3 6}, which some apps seem to use. ttk::style configure TEntry -padding {2 2 2 4} @@ -48,20 +55,10 @@ namespace eval ttk::theme::xpnative { ttk::style map TCombobox \ -selectbackground [list !focus SystemWindow] \ -selectforeground [list !focus SystemWindowText] \ - -foreground [list \ - disabled SystemGrayText \ - {readonly focus} SystemHighlightText \ - ] \ + -foreground [list {readonly focus} SystemHighlightText] \ -focusfill [list {readonly focus} SystemHighlight] \ ; - ttk::style configure TSpinbox -padding {2 0 14 0} - ttk::style map TSpinbox \ - -selectbackground [list !focus SystemWindow] \ - -selectforeground [list !focus SystemWindowText] \ - ; - ttk::style configure Toolbutton -padding {4 4} - } } diff --git a/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/xmfbox.tcl b/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/xmfbox.tcl index 048713e3c8c334eab290de84dae634bd919288b6..d79627acd1e41b65f8adb2cf7f4970ecbb2cf42b 100644 --- a/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/xmfbox.tcl +++ b/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tk8.5/xmfbox.tcl @@ -4,7 +4,7 @@ # Unix platform. This implementation is used only if the # "::tk_strictMotif" flag is set. # -# RCS: @(#) $Id: xmfbox.tcl,v 1.31.2.1 2009/10/22 10:27:58 dkf Exp $ +# RCS: @(#) $Id: xmfbox.tcl,v 1.31 2007/12/13 15:26:28 dgp Exp $ # # Copyright (c) 1996 Sun Microsystems, Inc. # Copyright (c) 1998-2000 Scriptics Corporation @@ -159,11 +159,9 @@ proc ::tk::MotifFDialog_FileTypes {w} { # set data(fileType) $data(-defaulttype) # Default type to first entry set initialTypeName [lindex $data(-filetypes) 0 0] - if {$data(-typevariable) ne ""} { - upvar #0 $data(-typevariable) typeVariable - if {[info exist typeVariable]} { - set initialTypeName $typeVariable - } + if {($data(-typevariable) ne "") + && [uplevel 4 [list info exists $data(-typevariable)]]} { + set initialTypeName [uplevel 4 [list set $data(-typevariable)]] } set ix 0 set data(fileType) 0 @@ -865,9 +863,9 @@ proc ::tk::MotifFDialog_ActivateSEnt {w} { # Return selected filter if {[info exists data(-typevariable)] && $data(-typevariable) ne "" - && [info exists data(-filetypes)] && $data(-filetypes) ne ""} { - upvar #0 $data(-typevariable) typeVariable - set typeVariable [lindex $data(-filetypes) $data(fileType) 0] + && [info exists data(-filetypes)] && $data(-filetypes) ne ""} { + upvar 2 $data(-typevariable) initialTypeName + set initialTypeName [lindex $data(-filetypes) $data(fileType) 0] } if {$data(-multiple) != 0} { diff --git a/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tkConfig.sh b/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tkConfig.sh index 1112edae943e1a8a9acb4859adf7d6691d12f861..667a03ded78a34294372f07b9ccd73458f02f47e 100644 --- a/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tkConfig.sh +++ b/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_linux/lib/tkConfig.sh @@ -11,16 +11,16 @@ # # The information in this file is specific to a single platform. # -# RCS: @(#) $Id: tkConfig.sh.in,v 1.13.2.1 2008/08/29 03:35:47 dgp Exp $ +# RCS: @(#) $Id: tkConfig.sh.in,v 1.13 2007/12/13 15:28:50 dgp Exp $ # Tk's version number. TK_VERSION='8.5' TK_MAJOR_VERSION='8' TK_MINOR_VERSION='5' -TK_PATCH_LEVEL='.9' +TK_PATCH_LEVEL='.2' # -D flags for use with the C compiler. -TK_DEFS='-DPACKAGE_NAME=\"tk\" -DPACKAGE_TARNAME=\"tk\" -DPACKAGE_VERSION=\"8.5\" -DPACKAGE_STRING=\"tk\ 8.5\" -DPACKAGE_BUGREPORT=\"\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_LIMITS_H=1 -DMODULE_SCOPE=extern\ __attribute__\(\(__visibility__\(\"hidden\"\)\)\) -DTCL_SHLIB_EXT=\".so\" -DTCL_CFG_OPTIMIZED=1 -DTCL_CFG_DEBUG=1 -D_LARGEFILE64_SOURCE=1 -DTCL_WIDE_INT_IS_LONG=1 -DHAVE_SYS_TIME_H=1 -DTIME_WITH_SYS_TIME=1 -DHAVE_INTPTR_T=1 -DHAVE_UINTPTR_T=1 -DHAVE_PW_GECOS=1 -DHAVE_LIBXFT=1 -DHAVE_XFT=1 ' +TK_DEFS='-DPACKAGE_NAME=\"tk\" -DPACKAGE_TARNAME=\"tk\" -DPACKAGE_VERSION=\"8.5\" -DPACKAGE_STRING=\"tk\ 8.5\" -DPACKAGE_BUGREPORT=\"\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_LIMITS_H=1 -DMODULE_SCOPE=extern\ __attribute__\(\(__visibility__\(\"hidden\"\)\)\) -DTCL_SHLIB_EXT=\".so\" -DTCL_CFG_OPTIMIZED=1 -DTCL_CFG_DEBUG=1 -D_LARGEFILE64_SOURCE=1 -DTCL_WIDE_INT_IS_LONG=1 -DHAVE_SYS_TIME_H=1 -DTIME_WITH_SYS_TIME=1 -DHAVE_INTPTR_T=1 -DHAVE_UINTPTR_T=1 -DHAVE_PW_GECOS=1 -DHAVE_XSS=1 -DHAVE_LIBXFT=1 -DHAVE_XFT=1 ' # Flag, 1: we built a shared lib, 0 we didn't TK_SHARED_BUILD=1 @@ -34,36 +34,36 @@ TK_DBGX= TK_LIB_FILE='libtk8.5.so' # Additional libraries to use when linking Tk. -TK_LIBS='-L/usr/lib64 -lX11 -lXft -lXrender -lfontconfig -lfreetype -lX11 -ldl -lieee -lm' +TK_LIBS='-L/usr/X11R6/lib64 -lX11 -lXss -lXext -ldl -lieee -lm' # Top-level directory in which Tk's platform-independent files are # installed. -TK_PREFIX='/opt/shared/thirdparty/tcltk8.5/x86_64_linux' +TK_PREFIX='/homes/kish/TclTk' # Top-level directory in which Tk's platform-specific files (e.g. # executables) are installed. -TK_EXEC_PREFIX='/opt/shared/thirdparty/tcltk8.5/x86_64_linux' +TK_EXEC_PREFIX='/homes/kish/TclTk/x86_64_linux' # -I switch(es) to use to make all of the X11 include files accessible: -TK_XINCLUDES='' +TK_XINCLUDES='-I/usr/X11R6/include' # Linker switch(es) to use to link with the X11 library archive. -TK_XLIBSW='-L/usr/lib64 -lX11' +TK_XLIBSW='-L/usr/X11R6/lib64 -lX11 -lXss -lXext' # -l flag to pass to the linker to pick up the Tk library TK_LIB_FLAG='-ltk8.5' # String to pass to linker to pick up the Tk library from its # build directory. -TK_BUILD_LIB_SPEC='-L/opt/shared/tools/src/tk8.5.9/unix/x86_64_linux -ltk8.5' +TK_BUILD_LIB_SPEC='-L/homes/kish/TclTk/tk8.5.2/unix/x86_64_linux -ltk8.5' # String to pass to linker to pick up the Tk library from its # installed directory. -TK_LIB_SPEC='-L/opt/shared/thirdparty/tcltk8.5/x86_64_linux/lib -ltk8.5' +TK_LIB_SPEC='-L/homes/kish/TclTk/x86_64_linux/lib -ltk8.5' # String to pass to the compiler so that an extension can # find installed Tk headers. -TK_INCLUDE_SPEC='-I/opt/shared/thirdparty/tcltk8.5/x86_64_linux/include' +TK_INCLUDE_SPEC='-I/homes/kish/TclTk/include' # Location of the top-level source directory from which Tk was built. # This is the directory that contains a README file as well as @@ -71,7 +71,7 @@ TK_INCLUDE_SPEC='-I/opt/shared/thirdparty/tcltk8.5/x86_64_linux/include' # different place than the directory containing the source files, this # points to the location of the sources, not the location where Tk was # compiled. -TK_SRC_DIR='/opt/shared/tools/src/tk8.5.9' +TK_SRC_DIR='/homes/kish/TclTk/tk8.5.2' # Needed if you want to make a 'fat' shared library library # containing tk objects or link a different wish. @@ -86,14 +86,14 @@ TK_STUB_LIB_FLAG='-ltkstub8.5' # String to pass to linker to pick up the Tk stub library from its # build directory. -TK_BUILD_STUB_LIB_SPEC='-L/opt/shared/tools/src/tk8.5.9/unix/x86_64_linux -ltkstub8.5' +TK_BUILD_STUB_LIB_SPEC='-L/homes/kish/TclTk/tk8.5.2/unix/x86_64_linux -ltkstub8.5' # String to pass to linker to pick up the Tk stub library from its # installed directory. -TK_STUB_LIB_SPEC='-L/opt/shared/thirdparty/tcltk8.5/x86_64_linux/lib -ltkstub8.5' +TK_STUB_LIB_SPEC='-L/homes/kish/TclTk/x86_64_linux/lib -ltkstub8.5' # Path to the Tk stub library in the build directory. -TK_BUILD_STUB_LIB_PATH='/opt/shared/tools/src/tk8.5.9/unix/x86_64_linux/libtkstub8.5.a' +TK_BUILD_STUB_LIB_PATH='/homes/kish/TclTk/tk8.5.2/unix/x86_64_linux/libtkstub8.5.a' # Path to the Tk stub library in the install directory. -TK_STUB_LIB_PATH='/opt/shared/thirdparty/tcltk8.5/x86_64_linux/lib/libtkstub8.5.a' +TK_STUB_LIB_PATH='/homes/kish/TclTk/x86_64_linux/lib/libtkstub8.5.a' diff --git a/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_nt/lib/libtcl85.a b/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_nt/lib/libtcl85.a new file mode 100644 index 0000000000000000000000000000000000000000..382801b833618c9f9f044c04b152a029bbf27e74 Binary files /dev/null and b/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_nt/lib/libtcl85.a differ diff --git a/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_nt/lib/libtclstub85.a b/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_nt/lib/libtclstub85.a new file mode 100644 index 0000000000000000000000000000000000000000..f6c196861a0340c65da7db2b8622e8ebdf2e1e9e Binary files /dev/null and b/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_nt/lib/libtclstub85.a differ diff --git a/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_nt/lib/libtk85.a b/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_nt/lib/libtk85.a new file mode 100644 index 0000000000000000000000000000000000000000..786ef056b3a89f8f5c55cca7b06a578342308bcd Binary files /dev/null and b/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_nt/lib/libtk85.a differ diff --git a/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_nt/lib/libtkstub85.a b/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_nt/lib/libtkstub85.a new file mode 100644 index 0000000000000000000000000000000000000000..5136520147cbb5a31854342cb4c125691901104e Binary files /dev/null and b/Bin/ECLIPSE_V7.0_45/tcltk/x86_64_nt/lib/libtkstub85.a differ diff --git a/Makefile b/Makefile index 467ea0d14edcc19dbde34baab97d239ef62cfa60..f55ee744e6b796121e85b84c93e5626f4605be47 100644 --- a/Makefile +++ b/Makefile @@ -1,17 +1,139 @@ -.PHONY: build install - -PREFIX= -ECLIPSEBIN= - -build: - rm -f Src/COLIBRI/lib/v7/x86_64_linux/* Src/COLIBRI/simplex_ocaml.pl - (cd Src/COLIBRI/simplex_ocaml; ECLIPSEBIN=$(ECLIPSEBIN) dune build simplex_ocaml_mod_v7.so simplex_ocaml.pl) - (cd Src/COLIBRI/simplex_ocaml; cp _build/default/simplex_ocaml.pl ..) - mkdir -p Src/COLIBRI/lib/v7/x86_64_linux - (cd Src/COLIBRI/simplex_ocaml; cp _build/default/simplex_ocaml_mod_v7.so ../lib/v7/x86_64_linux/simplex_ocaml.so) - (cd Src/Floats; g++ -fPIC -O -D__LINUX__ -I $(ECLIPSEBIN)/include/x86_64_linux -shared EclipseInterfaceSimFloat2.2.cpp Floatcpp-3.0_SimFloat2.2.cpp -o ../COLIBRI/lib/v7/x86_64_linux/float_util.so) - ocamlopt -o compile_colibri unix.cmxa compile_colibri.ml +.PHONY: all install clean clean_install simplex simplex_epilog + +# Bundle prefix, override to specify a different directory +BUNDLE ?= $(PWD)/bundle + +# Which eclipse version to use, among {v5|v7} +# (v5 is currently broken) +ECL_VERSION ?= v7 + +all : build + +# ================================================== +# MACRO +# ================================================== + +# Target of copy dependencies are added to this variable. +COPY_DEPS := + +define add_copy_rule +COPY_DEPS += $(2) +$(2) : $(1) + mkdir -p $(dir $(2)) + cp $(1) $(2) +endef + +# Add a rule to copy a file from a source to a destination, while +# ensuring that the target directory exists. +# +# $(1): source +# $(2): destination +# +define require_copy +$(eval $(call add_copy_rule,$(1),$(2))) +endef + +# ================================================== +# CONFIGURATION +# ================================================== + +ROOT := $(realpath Src/) +COLIBRI := $(ROOT)/COLIBRI +SIMPLEX_BUILD := $(COLIBRI)/simplex_ocaml/_build/default +$(call require_copy,$(SIMPLEX_BUILD)/simplex_ocaml.pl,$(COLIBRI)/simplex_ocaml.pl) + +ifeq ($(ECL_VERSION),v7) +export ECLIPSEBIN=$(PWD)/Bin/ECLIPSE_V7.0_45 +LIBDIR=$(COLIBRI)/lib/v7 +SIMPLEX := simplex_ocaml_mod_v7.so +FLOAT_LIB := $(LIBDIR)/x86_64_linux/float_util.so +$(call require_copy,$(SIMPLEX_BUILD)/simplex_ocaml_mod_v7.so,$(LIBDIR)/x86_64_linux/simplex_ocaml.so) +endif + +ifeq ($(ECL_VERSION),v5) +export ECLIPSEBIN= +LIBDIR=$(COLIBRI)/lib/v5 +SIMPLEX := simplex_ocaml_mod.so +FLOAT_LIB := $(LIBDIR)/x86_64_linux/float_util.so +$(call require_copy,$(SIMPLEX_BUILD)/simplex_ocaml_mod.so,$(LIBDIR)/x86_64_linux/simplex_ocaml.so) +endif + +# ================================================== +# INFOS +# ================================================== + +$(info BUNDLE=$(BUNDLE)) +$(info ECL_VERSION=$(ECL_VERSION)) +$(info COLIBRI=$(COLIBRI)) +$(info ECLIPSEBIN=$(ECLIPSEBIN)) + +# ================================================== +# SIMPLEX_OCAML +# ================================================== + +simplex: $(ECLIPSEBIN) + cd $(COLIBRI)/simplex_ocaml && dune build $(SIMPLEX) simplex_ocaml.pl + +simplex_epilog : simplex $(COPY_DEPS) + @true + +# ================================================== +# FLOAT LIBRARY +# ================================================== + +CPP_FLAGS := -fPIC -O -D__LINUX__ -shared +CPP_FLAGS += -I $(ECLIPSEBIN)/include/x86_64_linux + +CPP_FILES := \ + $(ROOT)/Floats/EclipseInterfaceSimFloat2.2.cpp \ + $(ROOT)/Floats/Floatcpp-3.0_SimFloat2.2.cpp + +$(FLOAT_LIB) : $(CPP_FILES) + g++ $(CPP_FLAGS) $(CPP_FILES) -o $@ + +# ================================================== +# BUILD +# ================================================== + +clean: + rm -rf $(LIBDIR) + rm -f $(COLIBRI)/simplex_ocaml.pl + rm -f $(FLOAT_LIB) + rm -f compile_colibri + +compile_colibri : compile_colibri.ml + ocamlopt -o $@ unix.cmxa $^ + +build: simplex_epilog $(FLOAT_LIB) compile_colibri ./compile_colibri --eclipsedir $(ECLIPSEBIN) -install: - ./bundle.sh $(PREFIX) +# ================================================== +# INSTALL +# ================================================== + +BUNDLE_SRC := \ + Src/COLIBRI/col_solve.eco \ + Src/COLIBRI/filter_smtlib_file \ + Src/COLIBRI/filter_smtlib_file.exe + +$(BUNDLE)/colibri.exe : colibri_for_bundle.ml + ocamlopt -o $@ unix.cmxa $^ + chmod u+x $@ + +clean_install: + rm -fr $(BUNDLE) + +$(BUNDLE): + mkdir -p $(BUNDLE) + +install: $(BUNDLE) $(BUNDLE)/colibri.exe + cp $(BUNDLE)/colibri.exe $(BUNDLE)/colibri + mkdir -p $(BUNDLE)/COLIBRI/lib/ + cp -ra $(LIBDIR) $(BUNDLE)/COLIBRI/lib/ + cp -ra $(BUNDLE_SRC) $(BUNDLE)/COLIBRI/ + cp -ra compile_flag.pl $(BUNDLE)/COLIBRI/ + cp -ra version $(BUNDLE)/ + cp -ra $(ECLIPSEBIN) $(BUNDLE)/ECLIPSE/ + +test: + ./test.sh -j2 diff --git a/README.md b/README.md index 098a7b014b516660dd2aa3a94bf7a6e7ff9c039c..1aab66a85fa313452576e984bb899c7825b7981a 100644 --- a/README.md +++ b/README.md @@ -1,21 +1,32 @@ -# COLIBRI # +# COLIBRI +## Special directories + +`Bin/` and `Src/` directories are copied from their respective +repositories using the `release_colibri_opensource.sh` script found in +`gatel/Src`'s original repository. They should be considered read-only +here. + +## Bundle In order to create a bundle of everything needed to run COLIBRI. run `./compile_colibri.sh` then run `./bundle.sh` it will create a relocalisable directory `bundle`. +## Compilation on linux -# Compilation on linux # - The up-to-date information could be found in `.gitlab-ci.yml`. +The up-to-date information could be found in `.gitlab-ci.yml`. -# Compilation on windows # - The compilation is helped by using - https://fdopen.github.io/opam-repository-mingw/ , it will install ocaml - compiler but also mingw for the C part. Use ocaml-env to setup the environement - for the compilation. Then the compilation is the same than for linux. +## Compilation on windows -# LICENCE +The compilation is helped by using +https://fdopen.github.io/opam-repository-mingw/, it will install ocaml +compiler but also mingw for the C part. Use ocaml-env to setup the +environement for the compilation. Then the compilation is the same +than for linux. + +## LICENCE This is the open-source colibri distribution. This software under the LGP2.1 LICENCE. + diff --git a/Src/COLIBRI/check_ineq.pl b/Src/COLIBRI/check_ineq.pl index dfb4d60c5f9260c7c28b37b26e6a668bdccfc33c..2c5d1bd625fe513b2f53474a9cdf592011b6d720 100644 --- a/Src/COLIBRI/check_ineq.pl +++ b/Src/COLIBRI/check_ineq.pl @@ -405,50 +405,49 @@ exists_diff_Rel(A,B) :- %% A = B + C avec A,B,C variables launch_delta_add(A,B,C) :- - mfd:dvar_range(B,MinB,MaxB), - ((MinB < 0, - MaxB > 0, - not_unify(B,0)) - -> - %% Delta non signe - SB = '#' - ; SB = '+'), - ndelta:launch_delta_bis2(C,A,SB,MinB..MaxB,Chk1,LO1,Abort1), - kill_leq_lt_from_delta(+,MinB..MaxB,C,A), - (var(Abort1) -> - %% On n'a pas fait d'unification - mfd:dvar_range(C,MinC,MaxC), - ((MinC < 0, - MaxC > 0, - not_unify(C,0)) - -> - %% Delta non signe - SC = '#' - ; SC = '+'), - launch_delta_bis2(B,A,SC,MinC..MaxC,Chk2,LO2,Abort2), - kill_leq_lt_from_delta(+,MinC..MaxC,B,A), - (var(Abort2) -> - %% On n'a pas fait d'unification - %% Un seul check_delta_cycle pour les deux - %% launch_delta. - (var(Chk1) -> - (var(Chk2) -> - true - ; ndelta:check_delta_cycle(B,A,LO2)) - ; ((var(LO1), - nonvar(Chk2), - nonvar(LO2)) - -> - ndelta:check_delta_cycle(B,A,LO2) - ; ndelta:check_delta_cycle(C,A,LO1))) - ; %% On a unifie A et B - %% donc C = 0 - protected_unify(C = 0)) - ; %% On a unifie A et C - %% donc B = 0 - protected_unify(B = 0)),!. + mfd:dvar_range(B,MinB,MaxB), + ((MinB < 0, + MaxB > 0, + not_unify(B,0)) + -> + % Delta non signe + SB = '#' + ; SB = '+'), + ndelta:launch_delta_bis2(C,A,SB,MinB..MaxB,Chk1,LO1,Abort1), + kill_leq_lt_from_delta(+,MinB..MaxB,C,A), + (var(Abort1) -> + % On n'a pas fait d'unification + mfd:dvar_range(C,MinC,MaxC), + ((MinC < 0, + MaxC > 0, + not_unify(C,0)) + -> + % Delta non signe + SC = '#' + ; SC = '+'), + launch_delta_bis2(B,A,SC,MinC..MaxC,Chk2,LO2,Abort2), + kill_leq_lt_from_delta(+,MinC..MaxC,B,A), + (var(Abort2) -> + % On n'a pas fait d'unification + % Un seul check_delta_cycle pour les deux launch_delta. + (var(Chk1) -> + (var(Chk2) -> + true + ; ndelta:check_delta_cycle(B,A,LO2)) + ; ((var(LO1), + nonvar(Chk2), + nonvar(LO2)) + -> + ndelta:check_delta_cycle(B,A,LO2) + ; ndelta:check_delta_cycle(C,A,LO1))) + ; % On a unifie A et B donc C = 0 + protected_unify(C = 0)) + ; % On a unifie A et C + % donc B = 0 + protected_unify(B = 0)), + !. launch_delta_add(A,B,C) :- - ndelta:fail_delta. + ndelta:fail_delta. diff --git a/Src/COLIBRI/check_lin_expr.pl b/Src/COLIBRI/check_lin_expr.pl index cab1fe10812e0ac65593db19d37932f37f8fed07..9110251a5a95cf0ee0187e6e8bc20642c1874558 100755 --- a/Src/COLIBRI/check_lin_expr.pl +++ b/Src/COLIBRI/check_lin_expr.pl @@ -466,10 +466,12 @@ get_args_from_add_mult_giving(Type,LC,V,LArgs,ELArgs,NLC) :- ((Z == V, (number(X), rational(X,RX), - Args = [RX*Y],Arg = Y; + Args = [RX*Y];%,Arg = Y; number(Y), rational(Y,RY), - Args = [RY*X],Arg = X)) + Args = [RY*X]))%,Arg = X)) + % A FAIRE: garder sort([X,Y],L) et Args = [1_1*L] + % et changer le matching de occurs -> OLC = ILC, OLArgs = [Args|ILArgs] diff --git a/Src/COLIBRI/col_solve.pl b/Src/COLIBRI/col_solve.pl index c048f958235061ce308abb504c595febe3d44e5e..c9cd25ef2e9df0789aed6f4c6ed4d9095615253f 100644 --- a/Src/COLIBRI/col_solve.pl +++ b/Src/COLIBRI/col_solve.pl @@ -573,7 +573,7 @@ smt_solve_bis0(Test,FILE,Code) :- setval(logic,"ALL")@eclipse, % les deltas sont utiles pour les tableaux % positionné par smt_interp0, lu dans solve.pl - setval(keep_deltas_if_arrays,0)@eclipse, + setval(keep_deltas_if_arrays_or_reals,0)@eclipse, ((exists(FILE), get_file_info(FILE, readable, on)) -> diff --git a/Src/COLIBRI/lib/v5/i386_linux/float_util.so b/Src/COLIBRI/lib/v5/i386_linux/float_util.so deleted file mode 100755 index 7cc566f97dd1459b1bebfa6ef27e29c0310b586b..0000000000000000000000000000000000000000 Binary files a/Src/COLIBRI/lib/v5/i386_linux/float_util.so and /dev/null differ diff --git a/Src/COLIBRI/lib/v5/i386_linux/libgmp.so b/Src/COLIBRI/lib/v5/i386_linux/libgmp.so deleted file mode 100644 index 104eb60da9deb8e61681f7673c5ec47e2d2e90bd..0000000000000000000000000000000000000000 Binary files a/Src/COLIBRI/lib/v5/i386_linux/libgmp.so and /dev/null differ diff --git a/Src/COLIBRI/lib/v5/i386_linux/simplex_ocaml.so b/Src/COLIBRI/lib/v5/i386_linux/simplex_ocaml.so deleted file mode 100755 index 0d6063a9064bfcbd2c7a67a0ffdc5b146bdb6fa4..0000000000000000000000000000000000000000 Binary files a/Src/COLIBRI/lib/v5/i386_linux/simplex_ocaml.so and /dev/null differ diff --git a/Src/COLIBRI/lib/v5/i386_nt/float_util.dll b/Src/COLIBRI/lib/v5/i386_nt/float_util.dll deleted file mode 100755 index 5b514418c5e7b369b0d040c8734055576ad53800..0000000000000000000000000000000000000000 Binary files a/Src/COLIBRI/lib/v5/i386_nt/float_util.dll and /dev/null differ diff --git a/Src/COLIBRI/lib/v5/i386_nt/libgmp.dll b/Src/COLIBRI/lib/v5/i386_nt/libgmp.dll deleted file mode 100644 index ab35e1bfedfd239ec034da3d0a3e8e943b7b6d98..0000000000000000000000000000000000000000 Binary files a/Src/COLIBRI/lib/v5/i386_nt/libgmp.dll and /dev/null differ diff --git a/Src/COLIBRI/lib/v5/i386_nt/simplex_ocaml.dll b/Src/COLIBRI/lib/v5/i386_nt/simplex_ocaml.dll deleted file mode 100644 index aef15da418392d04442fd40994b0ee1ac84f5699..0000000000000000000000000000000000000000 Binary files a/Src/COLIBRI/lib/v5/i386_nt/simplex_ocaml.dll and /dev/null differ diff --git a/Src/COLIBRI/lib/v5/x86_64_linux/float_util.so b/Src/COLIBRI/lib/v5/x86_64_linux/float_util.so deleted file mode 100755 index e36fa9d910199acd818cb3d2f82081d0b38161a2..0000000000000000000000000000000000000000 Binary files a/Src/COLIBRI/lib/v5/x86_64_linux/float_util.so and /dev/null differ diff --git a/Src/COLIBRI/lib/v5/x86_64_linux/libgmp.so b/Src/COLIBRI/lib/v5/x86_64_linux/libgmp.so deleted file mode 100644 index 8c2c8b32e811609d951a51e5356143f55f68ae9f..0000000000000000000000000000000000000000 Binary files a/Src/COLIBRI/lib/v5/x86_64_linux/libgmp.so and /dev/null differ diff --git a/Src/COLIBRI/lib/v5/x86_64_linux/simplex_ocaml.so b/Src/COLIBRI/lib/v5/x86_64_linux/simplex_ocaml.so deleted file mode 100755 index 1a566810e923017c9c2d4e0ba008527f0590f003..0000000000000000000000000000000000000000 Binary files a/Src/COLIBRI/lib/v5/x86_64_linux/simplex_ocaml.so and /dev/null differ diff --git a/Src/COLIBRI/lib/v7/x86_64_linux/float_util.so b/Src/COLIBRI/lib/v7/x86_64_linux/float_util.so deleted file mode 100755 index 53ca24681bff6f562c0ac6a5d4cfb4342f8019c4..0000000000000000000000000000000000000000 Binary files a/Src/COLIBRI/lib/v7/x86_64_linux/float_util.so and /dev/null differ diff --git a/Src/COLIBRI/lib/v7/x86_64_linux/simplex_ocaml.so b/Src/COLIBRI/lib/v7/x86_64_linux/simplex_ocaml.so deleted file mode 100755 index 99bce94f5d33146e1c5446d41b99843bddd67307..0000000000000000000000000000000000000000 Binary files a/Src/COLIBRI/lib/v7/x86_64_linux/simplex_ocaml.so and /dev/null differ diff --git a/Src/COLIBRI/lib/v7/x86_64_nt/float_util.dll b/Src/COLIBRI/lib/v7/x86_64_nt/float_util.dll deleted file mode 100644 index edf11a826e0aedd2cd2f1f9022d0099323b33099..0000000000000000000000000000000000000000 Binary files a/Src/COLIBRI/lib/v7/x86_64_nt/float_util.dll and /dev/null differ diff --git a/Src/COLIBRI/lib/v7/x86_64_nt/libgcc_s_seh-1.dll b/Src/COLIBRI/lib/v7/x86_64_nt/libgcc_s_seh-1.dll deleted file mode 100644 index 232e328f25b39c80b0b55855213976560e48cac1..0000000000000000000000000000000000000000 Binary files a/Src/COLIBRI/lib/v7/x86_64_nt/libgcc_s_seh-1.dll and /dev/null differ diff --git a/Src/COLIBRI/lib/v7/x86_64_nt/libgmp-10.dll b/Src/COLIBRI/lib/v7/x86_64_nt/libgmp-10.dll deleted file mode 100644 index c04070f39c3eab7b7786b9236d52e63570c10bbd..0000000000000000000000000000000000000000 Binary files a/Src/COLIBRI/lib/v7/x86_64_nt/libgmp-10.dll and /dev/null differ diff --git a/Src/COLIBRI/lib/v7/x86_64_nt/libstdc++-6.dll b/Src/COLIBRI/lib/v7/x86_64_nt/libstdc++-6.dll deleted file mode 100644 index d1da95db1bba176ff79140669c2ae492256c5f40..0000000000000000000000000000000000000000 Binary files a/Src/COLIBRI/lib/v7/x86_64_nt/libstdc++-6.dll and /dev/null differ diff --git a/Src/COLIBRI/lib/v7/x86_64_nt/libwinpthread-1.dll b/Src/COLIBRI/lib/v7/x86_64_nt/libwinpthread-1.dll deleted file mode 100644 index d9c0992867b66fda6a096b7ff8364e448e55c6fe..0000000000000000000000000000000000000000 Binary files a/Src/COLIBRI/lib/v7/x86_64_nt/libwinpthread-1.dll and /dev/null differ diff --git a/Src/COLIBRI/lib/v7/x86_64_nt/simplex_ocaml.dll b/Src/COLIBRI/lib/v7/x86_64_nt/simplex_ocaml.dll deleted file mode 100644 index 625c57af47a2c08f0349b01a02001757eadc2b44..0000000000000000000000000000000000000000 Binary files a/Src/COLIBRI/lib/v7/x86_64_nt/simplex_ocaml.dll and /dev/null differ diff --git a/Src/COLIBRI/ndelta.pl b/Src/COLIBRI/ndelta.pl index 8b792c08595f6611b5c7598bc7c38f74c3822590..1ad66cf232d7e9dea79c0a5fcb57a7912e6b5cdb 100755 --- a/Src/COLIBRI/ndelta.pl +++ b/Src/COLIBRI/ndelta.pl @@ -333,6 +333,7 @@ col_timeout_body(Goal,TO,TOGoal,Mod) :- Tag, (set_solve_timeout(OMaxT), (Tag == timeout_col -> + check_solve_timeout, % ??? call(TOGoal)@Mod ; exit_block(Tag)))). @@ -1711,6 +1712,7 @@ check_delta_join0(X,Y,Loop) :- init_delta_join_and_delta_equal(Previous,Y,[]), set_seen_delta(Y), setval(delta_credit,100), + %setval(delta_credit,50), %incval(nb_steps)@eclipse, block(check_previous_deltas(Loop,Vars,Last,[Y],X,Y,_NewLoop), Tag, diff --git a/Src/COLIBRI/realarith.pl b/Src/COLIBRI/realarith.pl index a3833f9aa9b980be1f0aa4ac11b5885768e5f880..c91423525641f27a23155ec59005e8cabbebcc80 100644 --- a/Src/COLIBRI/realarith.pl +++ b/Src/COLIBRI/realarith.pl @@ -5515,9 +5515,25 @@ inv2_minus_real_dom(Rel12,FI,Dom1,Dom2,Dom,NewDom) :- %% Les calculs de delta supposent que A, B et C ont %% deja ete reduits par le point fixe des projections add_real_ineqs(Type,A,B,C) :- - getval(use_delta,1)@eclipse, - !, - ndelta:disable_delta_check, + (getval(use_delta,1)@eclipse -> + ndelta:disable_delta_check, + ((add_real_ineqs0(Type,A,B,C), + ndelta:allow_delta_check) + -> + true + ; ndelta:allow_delta_check, + fail) + ; ((Type == real, + not_zero(C)) + -> + check_exists_lin_expr_giving_diff_args(real,C,0.0,_Stop) + ; true), + % pour unsat/issue35.smt2 ???? + check_add_op_real(Type,A,B,C), + average_add_real_ineqs(Type,A,B,C), + bin_op_real_ineq(Type,add_real1,A,B,C)). + +add_real_ineqs0(Type,A,B,C) :- (var(C) -> (Type == real -> add_real_int_ineqs(A,B,C) @@ -5546,7 +5562,6 @@ add_real_ineqs(Type,A,B,C) :- -> add_real_2_args_equal(Type,A,B,C,_Continue) ; true), - ndelta:allow_delta_check, ((Type == real, not_zero(C)) -> @@ -5555,17 +5570,6 @@ add_real_ineqs(Type,A,B,C) :- %check_add_op_real(Type,A,B,C), average_add_real_ineqs(Type,A,B,C), bin_op_real_ineq(Type,add_real1,A,B,C). -%add_real_ineqs(Type,A,B,C). -add_real_ineqs(Type,A,B,C) :- - ((Type == real, - not_zero(C)) - -> - check_exists_lin_expr_giving_diff_args(real,C,0.0,_Stop) - ; true), - % pour unsat/issue35.smt2 ???? - check_add_op_real(Type,A,B,C), - average_add_real_ineqs(Type,A,B,C), - bin_op_real_ineq(Type,add_real1,A,B,C). average_add_real_ineqs(Type,A,B,C) :- !. average_add_real_ineqs(Type,A,B,C) :- @@ -5676,85 +5680,233 @@ get_op_real(A,OpA) :- OpA = X). %bin_op_real_ineq(Type,Op,A,B,C) :- !. -bin_op_real_ineq(Type,Op,A,B,C) :- +bin_op_real_ineq(real,Op,A,B,C) ?- + getval(use_delta,1)@eclipse, + ndelta:disable_delta_check, % Si on a un carré et que les résultats sont en relation % alors les arguments non identiques ont la même relation + % A + B = C et X + B = Z et C > Z --> A > X % pour les Op commutatifs ou les arg1 pour les Op non commutatifs + % A - B = C et X - B = Z et C > Z --> A > X % Les arg2 sur les Op non commutatifs sont en relation opposée - Type == real, - occurs(Op,(add_real1,mult_real1,minus_real1,div_real1)), + % A - B = C et A - Y = Z et C > Z --> B < Y + % DANGER SUR LES SIGNES pour * ET / + % A * B = C et A * Y = Z et C > Z , + % si A pos --> par ex. 2*B > 2*Y donc B > Y + % si A neg --> par ex. -2*B > -2*Y donc 2*Y > 2*B et Y > B (OpRel) + % A/B = C et A/Y = Z et C > Z + % si A pos A/B > A/Y donc Y > B + % si A neg -OpA/B > -OpA/Y donc OpA/B < OpA/Y donc Y > B + % A/B = C et X/B = Z et C > Z + % si B pos alors A/B > X/B donc A > X + % si B neg alors A/-OpB > X/-OpB donc A/OpB < X/OpB et A < X (OpRel) +% occurs(Op,(add_real1,minus_real1,mult_real1,div_real1)), + occurs(Op,(add_real1,minus_real)), (occurs(Op,(mult_real1,div_real1)) -> + not_zero(A), + not_zero(B), not_zero(C) ; true),!, - (occurs(Op,(minus_real1,div_real1)) -> - Only_arg1 = 1 + (get_sign_real(A,SA) -> + SignA = SA + ; true), + (get_sign_real(B,SB) -> + SignB = SB ; true), get_saved_cstr_suspensions(LSusp), - SGoal =.. [Op,Type,X,Y,Z], - ((member((_,SGoal),LSusp), - (occurs(Op,(mult_real1,div_real1)) -> - not_zero(X), - not_zero(Y), - not_zero(Z) - ; true), - (A == X -> - OpRel = 1, - O1 = B, - O2 = Y - ; (B == Y -> - O1 = A, - O2 = X - ; nonvar(Only_arg1), - (A == Y -> - O1 = B, - O2 = X - ; B == X, - O1 = A, - O2 = Y))), - get_rel_between_real_args(C,Z,Rel0), - Rel0 \== '?', - ((var(Only_arg1); - var(OpRel); - occurs(Rel0,(=,#))) - -> - Rel = Rel0 - ; op_rel(Rel0,Rel))) - -> - (Rel == '=' -> - Goal = protected_unify(O1,O2) - ; get_rel_between_real_args(O1,O2,Rel12), - (Rel == '<' -> - not occurs(Rel12,('=','>')), - (Rel == Rel12 -> - true - ; Goal = launch_gt_real(Type,O2,O1)) - ; (Rel == '=<' -> - not occurs(Rel12,('>')), - (Rel == Rel12 -> - true - ; Goal = launch_geq_real(Type,O2,O1)) - ; (Rel == '>' -> - not occurs(Rel12,('=','<')), - (Rel == Rel12 -> - true - ; Goal = launch_gt_real(Type,O1,O2)) - ; (Rel == '>=' -> - not occurs(Rel12,('<')), - (Rel == Rel12 -> - true - ; Goal = launch_geq_real(Type,O1,O2)) - ; % Rel = # - (Rel == Rel12 -> - true - ; Goal = launch_diff_real(Type,O1,O2))))))), - (var(Goal) -> - true - ; call(Goal)), - % on restaure - setval(saved_suspensions,(1,LSusp)) - ; true). + (foreach((_,Goal),LSusp), + param(Op,SignA,SignB,A,B,C,Done) do + ((%member((_,Goal),LSusp), + var(Done), + once (Goal =.. [Op,real,X,Y,Z]; + Op == mult_real1, + Goal = op_real1(real,T,OpT), + %call(spy_here)@eclipse, + get_rel_between_real_args(C,T,R0), + (R0 \== '?' -> + Z = T, + X = OpT, + Y = -1.0 + ; get_rel_between_real_args(C,OpT,R1), + R1 \== '?', + Z = OpT, + X = T, + Y = -1.0)), + get_rel_between_real_args(C,Z,Rel), + Rel \== '?', + (occurs(Op,(mult_real1,div_real1)) -> + not_zero(X), + not_zero(Y), + not_zero(Z) + ; true)) + -> + bin_op_real_ineq(Op,Rel,SignA,SignB,A,B,C,X,Y,Z,Done) + ; true) + ), + % on restaure + setval(saved_suspensions,(1,LSusp)), + ndelta:allow_delta_check. bin_op_real_ineq(Type,Op,A,B,C). +bin_op_real_ineq(add_real1,Rel,SA,SB,A,B,C,X,Y,Z,Done) ?- + (A == X -> + O1 = B, + O2 = Y + ; (B == Y -> + O1 = A, + O2 = X + ; (A == Y -> + O1 = B, + O2 = X + ; B == X, + O1 = A, + O2 = Y))), + !, + (Rel == '=' -> + protected_unify(O1,O2) + ; get_rel_between_real_args(O1,O2,ORel), + check_compatible_rels(ORel,Rel,Stronger), + (nonvar(Stronger) -> + launch_real_ineq(Rel,real,O1,O2) + ; true), + (not (occurs(ORel,('?',Rel))) -> + Done = 1 + ; true)). +bin_op_real_ineq(minus_real1,Rel,SA,SB,A,B,C,X,Y,Z,Done) ?- + % A - B = C et X - B = Z et C > Z --> A > X + % A - B = C et A - Y = Z et C > Z --> B < Y + (A == X -> + (Rel \== '#' -> + OpRel = 1 + ; true), + O1 = B, + O2 = Y + ; O1 = A, + O2 = X), + !, + (Rel == '=' -> + protected_unify(O1,O2) + ; (Rel == '#' -> + launch_real_ineq(Rel,real,O1,O2) + ; (nonvar(OpRel) -> + op_rel(Rel,NRel) + ; NRel = Rel); + get_rel_between_real_args(O1,O2,ORel), + check_compatible_rels(ORel,NRel,Stronger), + (nonvar(Stronger) -> + launch_real_ineq(NRel,real,O1,O2) + ; true), + (not (occurs(ORel,('?',NRel))) -> + Done = 1 + ; true))). +bin_op_real_ineq(mult_real1,Rel,SA,SB,A,B,C,X,Y,Z,Done) ?- + % A * B = C et A * Y = Z et C > Z , + % si A pos --> par ex. 2*B > 2*Y donc B > Y + % si A neg --> par ex. -2*B > -2*Y donc 2*Y > 2*B et Y > B (OpRel) + (A == X -> + nonvar(SA), + Sign = SA, + O1 = B, + O2 = Y + ; (B == Y -> + nonvar(SB), + Sign = SB, + O1 = A, + O2 = X + ; (A == Y -> + nonvar(SA), + Sign = SA, + O1 = B, + O2 = X + ; B == X, + nonvar(SB), + Sign = SB, + O1 = A, + O2 = Y))), + !, + (Rel == '=' -> + protected_unify(O1,O2) + ; ((Rel == '#'; + Sign == pos) + -> + NRel = Rel + ; op_rel(Rel,NRel)), + get_rel_between_real_args(O1,O2,ORel), + check_compatible_rels(ORel,NRel,Stronger), + (nonvar(Stronger) -> + launch_real_ineq(NRel,real,O1,O2) + ; true), + (not (occurs(ORel,('?',NRel))) -> + Done = 1 + ; true)). +bin_op_real_ineq(div_real1,Rel,SA,SB,A,B,C,X,Y,Z,Done) ?- + % A/B = C et A/Y = Z et C > Z + % si A pos A/B > A/Y donc B < Y (OpRel) + % si A neg -OpA/B > -OpA/Y donc OpA/B < OpA/Y donc B > Y + % A/B = C et X/B = Z et C > Z + % si B pos alors A/B > X/B donc A > X + % si B neg alors A/-OpB > X/-OpB donc A/OpB < X/OpB et A < X (OpRel) + (A == X -> + nonvar(SA), + (SA == pos -> + OpRel = 1 + ; true), + O1 = B, + O2 = Y + ; B == Y, + nonvar(SB), + (SB == pos -> + OpRel = 1 + ; true), + O1 = A, + O2 = X), + !, + (Rel == '=' -> + protected_unify(O1,O2) + ; ((OpRel == 1, + Rel \== '#') + -> + op_rel(Rel,NRel) + ; NRel = Rel), + get_rel_between_real_args(O1,O2,ORel), + check_compatible_rels(ORel,NRel,Stronger), + (nonvar(Stronger) -> + launch_real_ineq(NRel,real,O1,O2) + ; true), + (not (occurs(ORel,('?',NRel))) -> + Done = 1 + ; true)). +bin_op_real_ineq(_,Rel,SA,SB,A,B,C,X,Y,Z,Done). + +check_compatible_rels('=',Rel,_) ?- + !, + not occurs(Rel,('#','<','>')). +check_compatible_rels('#',Rel,Stronger) ?- + !, + not Rel == '=', + (occurs(Rel,(<,>,=<,>=)) -> + Stronger = 1 + ; true). +check_compatible_rels('=<',Rel,Stronger) ?- + !, + not Rel == '>', + (occurs(Rel,(>=,<,#,=)) -> + Stronger = 1 + ; true). +check_compatible_rels('<',Rel,_) ?- + !, + not occurs(Rel,('=','>')). +check_compatible_rels('>=',Rel,Stronger) ?- + !, + not Rel == '<', + (occurs(Rel,(=,#,>,=<)) -> + Stronger = 1 + ; true). +check_compatible_rels('>',Rel,_) ?- + !, + not occurs(Rel,('=','<')). +check_compatible_rels(ORel,Rel,_). + real_ineqs_with_other_add_minus_int(Type,A,B,C,Exact) :- ((is_float_int_number(A), @@ -8149,6 +8301,16 @@ op_real_ineq(Type,A,B) :- var(B), getval(use_delta,1)@eclipse, !, + ndelta:disable_delta_check, + ((op_real_ineq0(Type,A,B), + ndelta:allow_delta_check) + -> + true + ; ndelta:allow_delta_check, + fail). +op_real_ineq(_,_,_). + +op_real_ineq0(Type,A,B) :- (Type == real -> op_real_int_ineqs(A,B) ; % A et B sont deja reduits @@ -8231,7 +8393,6 @@ op_real_ineq(Type,A,B) :- true ; diff_real_ineq(Type,A,OpT)))))) ; true)). -op_real_ineq(_,_,_). op_real_inst(real,A,B,Continue) :- !, @@ -8818,9 +8979,22 @@ minus_real_2_args_equal(_,_,_,_,1). %% Les calculs de delta supposent que A, B et C ont %% deja ete reduits par le point fixe des projections minus_real_ineqs(Type,A,B,C) :- - getval(use_delta,1)@eclipse, - !, - ndelta:disable_delta_check, + (getval(use_delta,1)@eclipse -> + ndelta:disable_delta_check, + ((minus_real_ineqs0(Type,A,B,C), + ndelta:allow_delta_check) + -> + true + ; ndelta:allow_delta_check, + fail) + ; ((Type == real, + not_zero(C)) + -> + check_exists_lin_expr_giving_diff_args(real,C,0.0,_Stop) + ; true), + bin_op_real_ineq(Type,minus_real1,A,B,C)). + +minus_real_ineqs0(Type,A,B,C) :- (Type == real -> minus_real_int_ineqs(A,B,C) ; true), @@ -8851,15 +9025,6 @@ minus_real_ineqs(Type,A,B,C) :- ; geq_real_ineq(Type,A,B)) ; true)), minus_minus_add_real_ineqs(Type,A,B,C), - ndelta:allow_delta_check, - ((Type == real, - not_zero(C)) - -> - check_exists_lin_expr_giving_diff_args(real,C,0.0,_Stop) - ; true), - bin_op_real_ineq(Type,minus_real1,A,B,C). -%minus_real_ineqs(Type,A,B,C). -minus_real_ineqs(Type,A,B,C) :- ((Type == real, not_zero(C)) -> @@ -10455,36 +10620,6 @@ mult_real_int_ineqs0(NZ,SC,SOther,Other,Fact,C) :- % C - Other = Diff -> C = Diff + Other mreal:dvar_range(Diff,LD0,HD0), launch_delta(Other,C,+,LD0..HD0). -/* - (SOther \== SC -> - (SOther == pos -> - % C neg, Other pos, Other >= C - HD1 is min(HD0,0.0), - LD1 = LD0 - ; % Other neg, C pos, Other =< C - HD1 = HD0, - LD1 is min(LD0,0.0)) - ; LD1 = LD0, - HD1 = HD0), - (LD1 == -1.0Inf -> - LD = LD1 - ; ((LD1 == 0.0, - nonvar(NZ), - not_unify(Fact,1.0)) - -> - LD = 1_1 - ; rational(LD1,LD))), - (HD1 == 1.0Inf -> - HD = HD1 - ; call(spy_here)@eclipse, - ((HD1 == 0.0, - nonvar(NZ), - not_unify(Fact,1.0)) - -> - HD is -1_1 - ; rational(HD1,HD))), - launch_delta(Other,C,+,LD..HD). -*/ op_rel(<,>). op_rel(>,<). @@ -12741,8 +12876,8 @@ div_real_dom(Rel12,FI1,FI2,FI,Dom1,Dom2,Dom,NewDom) :- ((Inter1 = [Z1], Z1 == 0.0; (Inter2 = [MP1], - MP1 == 1.0; - MP1 == -1.0)) + (MP1 == 1.0; + MP1 == -1.0))) -> (Z1 == 0.0 -> mreal:dom_intersection(dom(real,[0.0],1),Dom,NewDom,_) @@ -12824,13 +12959,13 @@ div_real_dom_bounds(Rel12,FI1,FI2,FI,Dom1,Dom2,Dom,NewDom) :- ((Inter10 = [Z1], Z1 == 0.0; (Inter20 = [MP1], - MP1 == 1.0; - MP1 == -1.0)) + (MP1 == 1.0; + MP1 == -1.0))) -> (Z1 == 0.0 -> mreal:dom_intersection(dom(real,[0.0],1),Dom,NewDom,_) ; (MP1 == 1.0 -> - mreal:dom_intersection(Dom2,Dom,NDom,_) + mreal:dom_intersection(Dom1,Dom,NDom,_) ; % -1 op_real_intervals(Type,Inter10,-1.0Inf,[],Inter), mreal:list_to_typed_dom(real,Inter,NDom0), @@ -17758,6 +17893,7 @@ sqrt_real(A,B) :- getval(float_eval,Type)@eclipse, sqrt_real_type(Type,A,B). sqrt_real_type(real,A,B) ?- !, + trigo_no_rat(B), sqrt_real(real,A,B). sqrt_real_type(Type,A,B) :- (getval(no_float_error,1)@eclipse -> @@ -17766,13 +17902,13 @@ sqrt_real_type(Type,A,B) :- fp_sqrt(as(A,Type)) $= as(B,Type)). sqrt_real(Type,A,B) :- - get_priority(Prio), - set_priority(1), + get_priority(Prio), + set_priority(1), ensure_not_NaN((A,B)), set_lazy_domain(Type,A), - set_lazy_domain(Type,B), + set_lazy_domain(Type,B), check_no_float_error(Type,(A,B)), - (Type == real -> + (Type == real -> set_intervals(real,A,[0.0 .. 1.0Inf]), set_intervals(real,B,[0.0 .. 1.0Inf]) ; mreal:dvar_remove_smaller(A,-0.0), @@ -17783,7 +17919,7 @@ sqrt_real(Type,A,B) :- sqrt_real1(Type,A,B), lin_sqrt(A,B)), set_priority(Prio), - wake_if_other_scheduled(Prio). + wake_if_other_scheduled(Prio). %% Typage et calcul de la projection directe @@ -19666,7 +19802,7 @@ geq_real_ineq(Type,A,B) :- %geq_real_int_ineq(A,B) :- !. geq_real_int_ineq(A,B) :- - % A et B sont déjà réduits + % A et B ne sont pas forcément réduits getval(use_delta,1)@eclipse, var(A), var(B),!, @@ -19676,6 +19812,8 @@ geq_real_int_ineq(A,B) :- (is_real_box_rat(B,MinB) -> MaxB = MinB ; mreal:dvar_range(B,MinB,MaxB)), + % peut échouer + MaxA >= MinB, ((abs(MaxA) =:= 1.0Inf; abs(MinB) =:= 1.0Inf) -> @@ -20019,7 +20157,7 @@ gt_real_ineq(Type,A,B) :- gt_real_int_ineq(A,B) :- getval(use_delta,1)@eclipse, - % A et B sont déjà réduits + % A et B ne sont pas forcément réduits var(A), var(B),!, (is_real_box_rat(A,MinA) -> @@ -20028,6 +20166,8 @@ gt_real_int_ineq(A,B) :- (is_real_box_rat(B,MinB) -> MaxB = MinB ; mreal:dvar_range(B,MinB,MaxB)), + % peut échouer + MaxA >= MinB, ((abs(MaxA) =:= 1.0Inf; abs(MinB) =:= 1.0Inf) -> diff --git a/Src/COLIBRI/simplex_ocaml/Dockerfile b/Src/COLIBRI/simplex_ocaml/Dockerfile index 3056e8c88fc854894c7d1b647b500c1dbff6942d..0159eb806c60caf5f507e3c568b0fae01c4f36de 100644 --- a/Src/COLIBRI/simplex_ocaml/Dockerfile +++ b/Src/COLIBRI/simplex_ocaml/Dockerfile @@ -3,7 +3,7 @@ # centos-7-ocaml-4.11 FROM ocaml/opam@sha256:74f5ad45af9d6489a47a1606483135a5991080db7b0917a62b97a3b9108a931e -RUN [ "opam-2.1", "install", "dune.2.7.1", "ocplib-simplex.0.4", "zarith.1.9.1", "parsexp.v0.14.0", "menhir.20200624", "fmt.0.8.8", "spelll.0.3", "uutf.1.0.2", "gen.0.5.3" ] +RUN [ "opam-2.1", "install", "dune.2.7.1", "ocplib-simplex.0.5", "zarith.1.9.1", "parsexp.v0.14.0", "menhir.20200624", "fmt.0.8.8", "spelll.0.3", "uutf.1.0.2", "gen.0.5.3" ] RUN [ "opam-2.1", "install", "pp_loc" ] diff --git a/Src/COLIBRI/simplex_ocaml/simplex.ml b/Src/COLIBRI/simplex_ocaml/simplex.ml index 7b3e715af6d127ba98cad6c34ed6bc778465ff72..372be7d1dd9aeec72ec5442ea1bf70eb0a2a9f0e 100644 --- a/Src/COLIBRI/simplex_ocaml/simplex.ml +++ b/Src/COLIBRI/simplex_ocaml/simplex.ml @@ -1,22 +1,19 @@ include Simplex_common -let env_empty = Sim.Core.empty ~is_int:false ~check_invs:false ~debug:0 +let env_empty = Sim.Core.empty ~is_int:false ~check_invs:false let poly_empty = Sim.Core.P.empty - let poly_add_monome = (fun c v p -> fst (Sim.Core.P.accumulate v c p)) +let bound bound = + (* Create non-strict bound (zero epsilon) with no explanation *) + { Sim.Core.bvalue = (Sim.Core.R2.of_r bound); + Sim.Core.explanation = () } -let assert_var_leq = (fun e min v -> fst (Sim.Assert.var e v (Some (min,Rat.zero)) () None ())) - - -let assert_var_geq = (fun e v max -> fst (Sim.Assert.var e v None () (Some (max,Rat.zero)) ())) - - - -let assert_var_leq_geq = (fun e min v max -> fst (Sim.Assert.var e v (Some (min,Rat.zero)) () (Some (max,Rat.zero)) ())) - +let assert_var_leq = (fun e min v -> fst (Sim.Assert.var e v ~min:(bound min))) +let assert_var_geq = (fun e v max -> fst (Sim.Assert.var e v ~max:(bound max))) +let assert_var_leq_geq = (fun e min v max -> fst (Sim.Assert.var e v ~min:(bound min) ~max:(bound max))) let histo_poly_size = Hashtbl.create 10 let histo_incr i = @@ -38,14 +35,10 @@ let assert_poly e p min max = histo_incr (-(List.length (Sim.Core.P.bindings p))) | _ -> () end; - let to_bound = function - | None -> None - | Some x -> (Some (x,Rat.zero)) - in if Sim.Core.P.is_polynomial p then let slack = var_create "_" in - fst (Sim.Assert.poly e p slack (to_bound min) () (to_bound max) ()) + fst (Sim.Assert.poly e p slack ?min:(Option.map bound min) ?max:(Option.map bound max)) else match Sim.Core.P.bindings p with | [] -> (* p = 0 *) @@ -55,7 +48,7 @@ let assert_poly e p min max = if leq min (Some Rat.zero) && leq (Some Rat.zero) max then e else (* unsat: 1 <= 0 *) - let e,_ = Sim.Assert.var e unsat_var (to_bound (Some Rat.one)) () (to_bound (Some Rat.zero)) () in + let e,_ = Sim.Assert.var e unsat_var ~min:(bound Rat.one) ~max:(bound Rat.zero) in e | [v,r] -> assert (not (Rat.equal r Rat.zero)); @@ -64,11 +57,11 @@ let assert_poly e p min max = then min,max else max,min in - let mul_bound = function + let maybe_div = function | None -> None - | Some b -> Some (Rat.div b r) + | Some b -> Some (bound (Rat.div b r)) in - fst (Sim.Assert.var e v (to_bound (mul_bound min)) () (to_bound (mul_bound max)) ()) + fst (Sim.Assert.var e v ?min:(maybe_div min) ?max:(maybe_div max)) | _ -> assert false (* absurd: it is not a polynomial *) let assert_poly_leq_geq = (fun e min p max -> assert_poly e p (Some min) (Some max)) @@ -115,10 +108,9 @@ let presolve_max_with_timeout timeout e p = r let result_get_max = function - | Sim.Core.Max (m,_) -> (Lazy.force m).max_v + | Sim.Core.Max (m,_) -> (Lazy.force m).max_v.bvalue.v | _ -> Rat.zero - let result_get_value r v = let open Sim.Core in match r with diff --git a/Src/COLIBRI/simplex_ocaml/simplex_common.ml b/Src/COLIBRI/simplex_ocaml/simplex_common.ml index 52ae6c4dbdb184991bbdc39deace3035d761792a..70531a9155410c91b085e5bfae9663c72b3ed89a 100644 --- a/Src/COLIBRI/simplex_ocaml/simplex_common.ml +++ b/Src/COLIBRI/simplex_ocaml/simplex_common.ml @@ -1,4 +1,3 @@ - module Var = struct type t = {id: int64; name: string; is_int: bool} let print fmt s = Format.fprintf fmt "%s%Li" s.name s.id @@ -104,6 +103,8 @@ module Rat = struct let mult = Q.mul let minus = Q.neg let is_m_one v = Q.equal v m_one + let floor x = Q.of_bigint (Z.fdiv x.Q.num x.Q.den) + let ceiling x = Q.of_bigint (Z.cdiv x.Q.num x.Q.den) let create a b = let mk x = Z.of_string x in diff --git a/Src/COLIBRI/simplex_ocaml/simplex_ocaml.ml b/Src/COLIBRI/simplex_ocaml/simplex_ocaml.ml index 602b12c79d4d672dd516fc3ac1bb07efb81aac1a..f294ae3134fc192b7ab8df765c6ba783725bc6e8 100644 --- a/Src/COLIBRI/simplex_ocaml/simplex_ocaml.ml +++ b/Src/COLIBRI/simplex_ocaml/simplex_ocaml.ml @@ -14,8 +14,6 @@ open Ocaml_eclipse let rat : (Rat.t,_) typ = register_abstract_type "rat" ~pp:Rat.to_string ~equal:Rat.equal ~place_holder:"Rat.zero" - - let () = register ~name:"rat_create" rat_create (string @-> string @-> (ret rat)) diff --git a/Src/COLIBRI/smt_import.pl b/Src/COLIBRI/smt_import.pl index 0ecd85539de7cc71eff604c2c4a43d0cce2cf3ff..0d02d674ed20a19930fa72c6b77e97ac823edb78 100644 --- a/Src/COLIBRI/smt_import.pl +++ b/Src/COLIBRI/smt_import.pl @@ -6,6 +6,7 @@ % a la place des entiers bornes :- setval(def_real_for_int,1). %:- setval(def_real_for_int,0). + % pour indiquer une abstaction de forall/exists :- setval(quantifier,0). % pour activer le scrambler en mode test @@ -2339,7 +2340,7 @@ smt_interp0(A = B,Eq,bool) :- !, Type = array(TI,TE))) -> (Type = array(_,_) -> - setval(keep_deltas_if_arrays,1)@eclipse + setval(keep_deltas_if_arrays_or_reals,1)@eclipse ; true), (nonvar(S) -> % on peut avoir besoin de deux valeurs @@ -2376,7 +2377,7 @@ smt_interp0(distinct(L),Diff,bool) :- !, % constantes décimales ! fail ; (Type = array(_,_) -> - setval(keep_deltas_if_arrays,1)@eclipse + setval(keep_deltas_if_arrays_or_reals,1)@eclipse ; true)), ((real_type(Type,_); NL = [_,_,_|_]; @@ -2451,6 +2452,7 @@ smt_interp0(A + B,Iadd,Type) :- !, smt_interp(A,IA0,Type), smt_interp(B,IB,Type), ((occurs(Type,(real,real_int)), + %setval(keep_deltas_if_arrays_or_reals,1)@eclipse, check_rat_expr(+,IA0,IB,Rat)) -> term_string(Rat,SRat), @@ -2461,6 +2463,7 @@ smt_interp0(A - B,Iminus,Type) :- !, smt_interp(A,IA0,Type), smt_interp(B,IB,Type), ((occurs(Type,(real,real_int)), + %setval(keep_deltas_if_arrays_or_reals,1)@eclipse, check_rat_expr(-,IA0,IB,Rat)) -> term_string(Rat,SRat), @@ -2471,6 +2474,7 @@ smt_interp0(A * B,Imul,Type) :- !, smt_interp(A,IA0,Type), smt_interp(B,IB,Type), ((occurs(Type,(real,real_int)), + %setval(keep_deltas_if_arrays_or_reals,1)@eclipse, check_rat_expr(*,IA0,IB,Rat)) -> term_string(Rat,SRat), @@ -2485,6 +2489,7 @@ smt_interp0(A div B,Idiv,Type) :- !, (Type == int -> Idiv = (IA div IB) ; %Type = real, + %setval(keep_deltas_if_arrays_or_reals,1)@eclipse, Idiv = irdiv(IA,IB)). smt_interp0(A mod B,Imod,Type) :- !, smt_interp(A,IA0,Type), @@ -2494,10 +2499,12 @@ smt_interp0(A mod B,Imod,Type) :- !, (Type == int -> Imod = (IA mod IB) ; %Type = real, + %setval(keep_deltas_if_arrays_or_reals,1)@eclipse, Imod = irmod(IA,IB)). smt_interp0(A / B,Idiv,real) :- !, smt_interp(A,IA0,real), smt_interp(B,IB,real), + %setval(keep_deltas_if_arrays_or_reals,1)@eclipse, (check_rat_expr(/,IA0,IB,Rat) -> term_string(Rat,SRat), Idiv = realString(SRat) @@ -3062,7 +3069,7 @@ smt_interp0(store(A,I,E),store(IA,II,IE),array(TI,TE)) :- !, new_index_elem_val(TI,I), new_index_elem_val(TE,E). smt_interp0(select(A,I),select(IA,II),TE) :- !, - setval(keep_deltas_if_arrays,1)@eclipse, + setval(keep_deltas_if_arrays_or_reals,1)@eclipse, smt_interp(A,IA,array(TI,TE)), smt_interp(I,II0,TI), check_eval(TI,II0,II), diff --git a/Src/COLIBRI/solve.pl b/Src/COLIBRI/solve.pl index f66f3bf6abb1dbd7fd888f0de9b5853d12db32ec..6d4ae13590578384fda60fc2aeb8e6dc5fd5ed86 100644 --- a/Src/COLIBRI/solve.pl +++ b/Src/COLIBRI/solve.pl @@ -6736,27 +6736,6 @@ unfold_real_expr(abs(EA),D,Cstr,Type,R) ?- real_type(Type,RType), make_conj(CA,abs_val_real(RType,A,R),Cstr). -/* -unfold_real_expr(fp_abs(EA),D,Cstr,Type,R) ?- - ND is D + 1, - (check_not_NaN(R) -> - ensure_not_NaN(A) - ; true), - unfold_real_expr(EA,ND,CA,Type,A), - !, - (check_not_NaN(A) -> - ensure_not_NaN(R), - Cond = true, - BCond = 0 - ; int_vars(bool,BCond), - unfold_int_expr(isNaN(as(A,Type)),D,Cond,bool,BCond), - get_reif_var_depth_from_labchoice(DD), - insert_dep_inst(inst_cstr(DD,BCond))), - insert_dep_inst(dep(R,D,[A,BCond])), - insert_dep_inst(dep(A,D,[BCond])), - make_conj(CA,Cond,CACond), - make_conj(CACond,fp_abs(BCond,Type,A,R),Cstr). -*/ unfold_real_expr(fp_abs(EA),D,Cstr,Type,R) ?- ND is D + 1, (check_not_NaN(R) -> @@ -6803,7 +6782,8 @@ unfold_real_expr(EA + EB,D,Cstr,Type,R) ?- unfold_real_expr(EA,ND,CA,Type,A), unfold_real_expr(EB,ND,CB,Type,B), !, - ((fail,nonvar(Type), + ((fail, + nonvar(Type), real_type(Type,real), ((CA = (PC,op_real(_,Op,_)); CA = op_real(_,Op,_), @@ -6861,14 +6841,6 @@ unfold_real_expr(fp_add(Rnd0,EA,EB),D,Cstr,Type,R) ?- (as(A,Type) $\= as(B,Type)), as(0,bool))), D,Cond,bool,BCond), -/* - unfold_int_expr(chk_nan(isNaN(as(A,Type)) or isNaN(as(B,Type)), - as(1,bool), - (isInfinite(as(A,Type)) and - (isInfinite(as(B,Type)) and - (as(A,Type) $\= as(B,Type))))), - D,Cond,bool,BCond), -*/ !, int_vars(bool,BCond), get_reif_var_depth_from_labchoice(DD), @@ -11819,6 +11791,8 @@ get_most_constrained_bool_var([(V,D,Adj)|UseList],VN,NUseList,Seen,OVar,ONb,Var, % fail, real_type(Type,_), mreal:get_intervals(E,EI), + % pour DTNU + not is_irred(E), once (EI = [L,H], number(L), number(H); @@ -11852,11 +11826,15 @@ get_most_constrained_bool_var([(V,D,Adj)|UseList],VN,NUseList,Seen,OVar,ONb,Var, csolve([]) :- !. csolve([V|LV]) :- - narrow_vars([V]), - (var(V) -> +% narrow_vars([V]), + ((var(V), + not is_irred(V)) + -> + force_lin_solve_var(V), simple_solve_var(V,_), - (var(V) -> narrow_vars([V]);true), - append(LV,[V],NLV), + (var(V) -> + append(LV,[V],NLV) + ; NLV = LV), csolve(NLV) ; csolve(LV)). @@ -12011,7 +11989,7 @@ choose_fd_var([Adj|UseList],Var,Size,NUseList) :- filter_array_goals([],[]). filter_array_goals([G|LG],[NG|NLG]) :- functor(G,FG,Ar), - (occurs(FG,(smtlib_select,eq_array,diff_array1,diff_reif_array)) -> + (occurs(FG,(irred,smtlib_select,eq_array,diff_array1,diff_reif_array)) -> ( G = diff_reif_array(_,_,_,_,Bool) -> NG = Bool ; G = diff_array1(_,_,_,SureA,SureB) -> @@ -12019,7 +11997,9 @@ filter_array_goals([G|LG],[NG|NLG]) :- ; G = eq_array(_,_,_,_,_,SureA,SureB) -> NG = (SureA,SureB) ; G = smtlib_select(_,_,I,_,_,_), - NG = I) + NG = I + ; % G = irred(_,_,_), % pour DTNU + NG = 0) ; NG = G), filter_array_goals(LG,NLG). @@ -12173,7 +12153,8 @@ filter_constrained_vars([],[]). filter_constrained_vars([V|L],NL) :- ((no_constraint(V); is_sin_cos_value(V); - is_real_box_rat(V,_)) + is_real_box_rat(V,_); + is_irred(V)) -> NL = ENL ; NL = [V|ENL]), @@ -12928,12 +12909,14 @@ simple_resol_real(Var) :- -> % ESSAI BM: on regarde d'abord le min puis le max % avant de piocher au hasard - (protected_unify(Var,Min0) ; + (Min0 \== -1.0Inf, + protected_unify(Var,Min0) ; get_next_float(real,Min0,Min1), (Min1 == 1.0Inf -> launch_box(Var) ; mreal:set_typed_intervals(Var,real,[Min1..Max0]), - (protected_unify(Var,Max0) ; + (Max0 \== 1.0Inf, + protected_unify(Var,Max0) ; get_previous_float(real,Max0,Max1), (Max1 == -1.0Inf -> launch_box(Var) @@ -13310,7 +13293,7 @@ choose_real_value(Inter,Value) :- % Pour désactiver seulement le simplex si on a des tableaux % Les deltas sont utiles gour gérer les index -:- setval(keep_deltas_if_arrays,0)@eclipse. +:- setval(keep_deltas_if_arrays_or_reals,0)@eclipse. :- export smt_start_enable_delta_check/1. smt_start_enable_delta_check(DDSteps) :- cputime(T), @@ -13342,7 +13325,7 @@ smt_check_disabled_delta :- writeln(output,"Delay/Steps disabled delta":Diff/Steps1/Steps2) ; true), smt_disable_delta_check, - ((getval(keep_deltas_if_arrays,1)@eclipse) -> + ((getval(keep_deltas_if_arrays_or_reals,1)@eclipse) -> no_simplex ; no_delta) % donc no_simplex ; true) diff --git a/Src/COLIBRI/util.pl b/Src/COLIBRI/util.pl index ec9614fbfede79068f91b52ae914c41744f2785c..f2415acee1bb4098c7eeb40fef5a4cc78a25a0de 100755 --- a/Src/COLIBRI/util.pl +++ b/Src/COLIBRI/util.pl @@ -1437,3 +1437,25 @@ check_one_is_contained(LI1,LI2,LI) :- once (O1 == <; O1 == =), (O2 == >; O2 == =), LI = LI2). + +% Essai pou DTNU +irred(X,L,L) ?- !, + protected_unify(X,L). +irred(X,L,H) :- + var(X), + get_type(X,Type0), + (Type0 == int -> + Type = int + ; Type = real), + set_intervals(Type,X,[L..H]), + (Type == real -> + mreal:dvar_range(X,LX,HX) + ; mfd:dvar_range(X,LX,HX)), + LX == L, + HX == H, + my_suspend(irred(X,L,H),0,X->suspend:constrained). + +is_irred(X) :- + suspensions(X,LS), + member(S,LS), + get_suspension_data(S,goal,irred(_,_,_)). \ No newline at end of file diff --git a/bundle.sh b/bundle.sh deleted file mode 100755 index 533d1dad625ce6839e6f1c772bb53339e1e0aaaa..0000000000000000000000000000000000000000 --- a/bundle.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh - -PREFIX=$1 -rm -fr $PREFIX -mkdir -p $PREFIX/COLIBRI/lib/ - -cp -ra Src/COLIBRI/lib/v7 $PREFIX/COLIBRI/lib/ -cp -ra Src/COLIBRI/col_solve.eco Src/COLIBRI/filter_smtlib_file Src/COLIBRI/filter_smtlib_file.exe $PREFIX/COLIBRI/ -cp -ra compile_flag.pl $PREFIX/COLIBRI/ -cp -ra version $PREFIX/ -ocamlopt unix.cmxa -o $PREFIX/colibri.exe colibri_for_bundle.ml -cp $PREFIX/colibri.exe $PREFIX/colibri -chmod u+x $PREFIX/colibri diff --git a/compile_colibri.ml b/compile_colibri.ml index 06fcdbc3873f6ab890595e68d973fa105510eebc..fc21fda0dd83a43959650287e177b10691ff9c26 100644 --- a/compile_colibri.ml +++ b/compile_colibri.ml @@ -1,3 +1,15 @@ +module S = Set.Make(String) + +let env_vars = ref (S.empty) + +let env_var_modified v = + env_vars := S.add v !env_vars + +let display_env_vars () = + let display var = Printf.printf "%s=%s\n" var (Unix.getenv var) + in S.iter display !env_vars; + Stdlib.flush Stdlib.stdout + let coldir = Filename.dirname Sys.executable_name let concats base dirs = List.fold_left Filename.concat base dirs @@ -26,9 +38,13 @@ let () = Unix.putenv "ARCH" arch let path_sep = if Sys.win32 then ";" else ":" let extend_env var value = - match Unix.getenv var with - | exception Not_found -> Unix.putenv var value - | s -> Unix.putenv var (value^path_sep^s) + begin + (match Unix.getenv var with + | exception Not_found -> + Unix.putenv var value + | s -> Unix.putenv var (value^path_sep^s)); + env_var_modified var + end let eclipselib = Filename.concat !eclipsedir "lib" let eclipseexe = Filename.concat eclipselib arch @@ -46,6 +62,9 @@ let () = let () = Sys.chdir colibridir; + env_var_modified "ECLIPSEDIR"; + env_var_modified "ARCH"; + display_env_vars (); let exe = Filename.concat eclipseexe "eclipse.exe" in Unix.execv exe [| exe; diff --git a/filtered_file_17384 b/filtered_file_17384 deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 diff --git a/filtered_file_17944 b/filtered_file_17944 deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 diff --git a/test.sh b/test.sh index b648399d3ed6a6203a62760109f7fde9c0035867..036efc3384dbbbd8d965087195db6da47da0f091 100755 --- a/test.sh +++ b/test.sh @@ -2,35 +2,28 @@ STEPS=100000 FAIL=false +TIMEOUT=200 +PARALLEL_OPTIONS="$@" -echo check SAT tests -if find tests/sat -name "*.smt2" | parallel "$@" --timeout 200 --joblog sat.log "./neno 1 bundle/colibri --max-steps $STEPS {}"; then - echo OK -else - echo KO - awk '$7 == -1' sat.log - FAIL=true -fi +mkdir -p logs -echo check UNSAT tests -if find tests/unsat -name "*.smt2" | parallel "$@" --timeout 200 --joblog unsat.log "./neno 0 bundle/colibri --max-steps $STEPS {}"; then - echo OK -else - echo KO - awk '$7 == -1' unsat.log - FAIL=true -fi +run_tests() { + local path=$1 + local log=$2 + local redirect=$3 + echo $path + if find ${path} -name "*.smt2" | parallel ${PARALLEL_OPTIONS} --timeout ${TIMEOUT} --joblog ${log} "./neno ${redirect} bundle/colibri --max-steps ${STEPS} {}"; then + echo OK + else + echo KO + awk '$7 == -1' ${log} + FAIL=true + fi +} -echo check UNKNOWN tests -if find tests/unknown -name "*.smt2" | parallel "$@" --timeout 200 --joblog unknown.log "./neno 2 bundle/colibri --max-steps $STEPS {}"; then - echo OK -else - awk '$7 == -1' unknown.log - FAIL=true -fi +run_tests tests/sat logs/sat.log 1 +run_tests tests/unsat logs/unsat.log 0 +run_tests tests/unknown logs/unknown.log 2 if $FAIL; then exit 1; fi - -#echo check TIMEOUT tests -#find tests/timeout -name "*.smt2" | parallel "$@" --timeout 200 --joblog timeout.log "./neno 2 bundle/colibri --max-steps $STEPS {}" || (awk '$7 != -1' timeout.log && false)