Only in .: #readme.vms#
Only in .: Makefile.VMS
Only in .: Makefile.VMS.~1~
Only in /src/users/damania/Pursuits/tk: ToDo
Only in .: bitmaps
Only in .: demos
Only in .: diff_unix_vms
Only in .: diff_unix_vms.~1~
Common subdirectories: ./library and /src/users/damania/Pursuits/tk/library
Only in .: libtk.olb
diff -c ./main.c /src/users/damania/Pursuits/tk/main.c
*** ./main.c	Mon Mar 29 15:05:36 1993
--- /src/users/damania/Pursuits/tk/main.c	Tue Mar 30 09:20:16 1993
***************
*** 20,48 ****
  static char rcsid[] = "$Header: /user6/ouster/wish/RCS/main.c,v 1.72 93/02/03 10:20:42 ouster Exp $ SPRITE (Berkeley)";
  #endif
  
! #include "tkconfig.h"
! #include "tkint.h"
  
- #ifdef VMS
- #include <ssdef.h>
- #include <iodef.h>
- 
- #define	GOOD_EXIT_STATUS	SS$_NORMAL
- #define	BAD_EXIT_STATUS		SS$_ABORT
- #define STDIN_EVENT_FLAG	2
- #define	CONTROL(x)		(x & 037)
- 
- static char	line[200];
- static short	stdinIosb[4];
- static short	stdinChannel;
- 
- #else	/* !VMS */
- 
- #define	GOOD_EXIT_STATUS	0
- #define	BAD_EXIT_STATUS		1
- 
- #endif	/* VMS */
- 
  /*
   * Declarations for library procedures:
   */
--- 20,28 ----
  static char rcsid[] = "$Header: /user6/ouster/wish/RCS/main.c,v 1.72 93/02/03 10:20:42 ouster Exp $ SPRITE (Berkeley)";
  #endif
  
! #include "tkConfig.h"
! #include "tkInt.h"
  
  /*
   * Declarations for library procedures:
   */
***************
*** 53,63 ****
   * Command used to initialize wish:
   */
  
- #ifdef VMS
- static char initCmd[] = "source [info library]wish.tcl";
- #else
  static char initCmd[] = "source $tk_library/wish.tcl";
- #endif
  
  /*
   * Global variables used by the main program:
--- 33,39 ----
***************
*** 121,127 ****
  			    int mask));
  static void		StructureProc _ANSI_ARGS_((ClientData clientData,
  			    XEvent *eventPtr));
- static void             queueStdinRead(int prompt);
  
  /*
   *----------------------------------------------------------------------
--- 97,102 ----
***************
*** 164,170 ****
      if (Tk_ParseArgv(interp, (Tk_Window) NULL, &argc, argv, argTable, 0)
  	    != TCL_OK) {
  	fprintf(stderr, "%s\n", interp->result);
! 	exit(BAD_EXIT_STATUS);
      }
      if (name == NULL) {
  	if (fileName != NULL) {
--- 139,145 ----
      if (Tk_ParseArgv(interp, (Tk_Window) NULL, &argc, argv, argTable, 0)
  	    != TCL_OK) {
  	fprintf(stderr, "%s\n", interp->result);
! 	exit(1);
      }
      if (name == NULL) {
  	if (fileName != NULL) {
***************
*** 172,190 ****
  	} else {
  	    p = argv[0];
  	}
! #ifdef VMS
! 	/*
! 	    Remove the directory and extension from the image name
! 	*/
! 	name = strrchr(p, ']');
! 	if (name) {
! 	    args = strchr(name, '.');
! 	    if (args)
! 		*args = 0;
! 	}
! #else	
!         name = strrchr(p, '/');
! #endif
  	if (name != NULL) {
  	    name++;
  	} else {
--- 147,153 ----
  	} else {
  	    p = argv[0];
  	}
! 	name = strrchr(p, '/');
  	if (name != NULL) {
  	    name++;
  	} else {
***************
*** 202,208 ****
      w = Tk_CreateMainWindow(interp, display, name);
      if (w == NULL) {
  	fprintf(stderr, "%s\n", interp->result);
! 	exit(BAD_EXIT_STATUS);
      }
      Tk_SetClass(w, "Tk");
      Tk_CreateEventHandler(w, StructureNotifyMask, StructureProc,
--- 165,171 ----
      w = Tk_CreateMainWindow(interp, display, name);
      if (w == NULL) {
  	fprintf(stderr, "%s\n", interp->result);
! 	exit(1);
      }
      Tk_SetClass(w, "Tk");
      Tk_CreateEventHandler(w, StructureNotifyMask, StructureProc,
***************
*** 274,307 ****
  	 * device is a terminal.
  	 */
  
- #ifdef VMS
- 	if (tty) {
- 	    short iosb[4];
- 	    int	 status;
- 	    struct {
- 	    	int	l;
- 	    	char	*a;
- 	    } d;
- 
- 	    d.l = strlen("SYS$INPUT:");
- 	    d.a = "SYS$INPUT:";
- 	    status = sys$assign(&d, &stdinChannel, 0, 0);
- 	    if (status & 1) {
- 		Tk_CreateFileHandler(STDIN_EVENT_FLAG, TK_READABLE,
- 				     StdinProc, (ClientData) 0);
- 		queueStdinRead(1);
- 	    }
- 	    else {
- 	    	fprintf(stderr, "Could not create channel to stdin\n");
- 	    	exit(status);
- 	    }
- 	}
- #else
  	Tk_CreateFileHandler(0, TK_READABLE, StdinProc, (ClientData) 0);
  	if (tty) {
  	    printf("wish: ");
  	}
- #endif
      }
      fflush(stdout);
      buffer = Tcl_CreateCmdBuf();
--- 237,246 ----
***************
*** 316,322 ****
      Tk_MainLoop();
      Tcl_DeleteInterp(interp);
      Tcl_DeleteCmdBuf(buffer);
!     exit(GOOD_EXIT_STATUS);
  
  error:
      msg = Tcl_GetVar(interp, "errorInfo", TCL_GLOBAL_ONLY);
--- 255,261 ----
      Tk_MainLoop();
      Tcl_DeleteInterp(interp);
      Tcl_DeleteCmdBuf(buffer);
!     exit(0);
  
  error:
      msg = Tcl_GetVar(interp, "errorInfo", TCL_GLOBAL_ONLY);
***************
*** 325,356 ****
      }
      fprintf(stderr, "%s\n", msg);
      Tcl_Eval(interp, "destroy .", 0, (char **) NULL);
!     exit(BAD_EXIT_STATUS);
      return 0;			/* Needed only to prevent compiler warnings. */
  }
  
- #ifdef VMS
- #define	WISH_PROMPT	"wish: "
- 
- static void
- queueStdinRead(int prompt)
- {
-     int status;
-     
-     sys$clref(STDIN_EVENT_FLAG);
-     if (prompt)
- 	status = sys$qio(STDIN_EVENT_FLAG, stdinChannel, IO$_READPROMPT,
- 			 stdinIosb, 0, 0, line, sizeof(line), 0, 0,
- 			 WISH_PROMPT, sizeof(WISH_PROMPT)-1);
-     else
- 	status = sys$qio(STDIN_EVENT_FLAG, stdinChannel, IO$_READVBLK,
- 			 stdinIosb, 0, 0, line, sizeof(line), 0, 0, 0, 0);
-     if (!(status & 1)) {
- 	fprintf(stderr, "Could not initiate read on stdin\n");
- 	exit(status);    
-     }
- }
- #endif
  /*
   *----------------------------------------------------------------------
   *
--- 264,273 ----
      }
      fprintf(stderr, "%s\n", msg);
      Tcl_Eval(interp, "destroy .", 0, (char **) NULL);
!     exit(1);
      return 0;			/* Needed only to prevent compiler warnings. */
  }
  
  /*
   *----------------------------------------------------------------------
   *
***************
*** 383,433 ****
      char *cmd;
      int result, count;
  
- #ifdef VMS
- 	if (stdinIosb[0] & 1 && stdinIosb[2] != CONTROL('z')) {
- 	    line[stdinIosb[1]] = '\n';
- 	    line[stdinIosb[1]+1] = 0;
- 	}
-         else
- #else
      count = read(fileno(stdin), input, BUFFER_SIZE);
!     if (count <= 0) 
! #endif
!     {
  	if (!gotPartial) {
  	    if (tty) {
  		Tcl_Eval(interp, "destroy .", 0, (char **) NULL);
! 		exit(GOOD_EXIT_STATUS);
! 	    } 
! #ifndef VMS
!               else {
  		Tk_DeleteFileHandler(0);
  	    }
- #endif
  	    return;
  	} else {
- #ifdef VMS
- 	    line[0] = 0;
- #else
  	    input[0] = 0;
- #endif
  	}
- #ifndef VMS
      } else {
  	input[count] = 0;
- #endif
      }
- #ifdef VMS
-     cmd = Tcl_AssembleCmd(buffer, line);
- #else
      cmd = Tcl_AssembleCmd(buffer, input);
- #endif
      if (cmd == NULL) {
  	gotPartial = 1;
! #ifdef VMS
! 	 queueStdinRead(0);
! #endif	
!         return;
      }
      gotPartial = 0;
      result = Tcl_RecordAndEval(interp, cmd, 0);
--- 300,325 ----
      char *cmd;
      int result, count;
  
      count = read(fileno(stdin), input, BUFFER_SIZE);
!     if (count <= 0) {
  	if (!gotPartial) {
  	    if (tty) {
  		Tcl_Eval(interp, "destroy .", 0, (char **) NULL);
! 		exit(0);
! 	    } else {
  		Tk_DeleteFileHandler(0);
  	    }
  	    return;
  	} else {
  	    input[0] = 0;
  	}
      } else {
  	input[count] = 0;
      }
      cmd = Tcl_AssembleCmd(buffer, input);
      if (cmd == NULL) {
  	gotPartial = 1;
! 	return;
      }
      gotPartial = 0;
      result = Tcl_RecordAndEval(interp, cmd, 0);
***************
*** 437,448 ****
  	}
      }
      if (tty) {
! #ifdef VMS
! 	queueStdinRead(1);
! #else	
!         printf("wish: ");
  	fflush(stdout);
- #endif
      }
  }
  
--- 329,336 ----
  	}
      }
      if (tty) {
! 	printf("wish: ");
  	fflush(stdout);
      }
  }
  
Only in .: main.obj
diff -c ./makefile /src/users/damania/Pursuits/tk/makefile
*** ./makefile	Mon Mar 29 16:23:05 1993
--- /src/users/damania/Pursuits/tk/makefile	Tue Mar 30 09:51:17 1993
***************
*** 3,90 ****
  # it to compile Tk, you may wish to reset some of the following variables:
  #
  # TCL_DIR -		Name of directory holding tcl.h and tcl.a.
! # XLIB -		Name of archive containing Xlib binaries.
  #
  
! # You may also wish to add some of the following switches to the CFLAGS
! # variable:
! #
! # -DX11R3		Causes code that depends on R4 facilities not to
! #			be compiled.  I haven't tested Tk with R3 in quite
! #			a while, so this switch may not be enough to
! #			generate a working R3 version of Tk.  Furthermore,
! #			use of this switch will disable some of the facilities
! #			of Tk.
! # -DNO_PROTOTYPE	Turns off ANSI-style procedure prototypes and the
! #			corresponding compile-time checks.  Without this
! #			defininition, prototypes will be turned on if the
! #			compiler supports ANSI C by defining __STDC__.
! #
! 
! #TCL_DIR		= ../tcl
! TCL_DIR		= [-.tcl]
! XLIB		= -lX11
! CC		= cc
! CFLAGS		= /debug /inc=(sys$disk:[], $(TCL_DIR)) /def="TK_VERSION=""3.2/"""
! 
! LIBS = libtk.olb/lib, $(TCL_DIR)libtcl.olb/lib, sys$disk:[]x11opt.opt/opt
! 
! VMSOBJS = tkvms.obj
! 
! WIDGOBJS = tkbutton.obj, tkentry.obj, tkframe.obj, tklistbox.obj, \
! 	tkmenu.obj, tkmenubutton.obj, tkmessage.obj, tkscale.obj, \
! 	tkscrollbar.obj
! 
! CANVOBJS = tkcanvas.obj, tkcanvarc.obj, tkcanvbmap.obj, tkcanvline.obj, \
! 	tkcanvpoly.obj, tkcanvps.obj, tkcanvtext.obj, tkcanvwind.obj, \
! 	tkrectoval.obj, tktrig.obj
! 
! TEXTOBJS = tktext.obj, tktextbtree.obj, tktextdisp.obj, tktextindex.obj, \
! 	tktexttag.obj
  
! OBJS = tk3d.obj, tkargv.obj, tkatom.obj, tkbind.obj, tkbitmap.obj, \
!         tkcmds.obj, tkcolor.obj, tkconfig.obj, tkcursor.obj, tkerror.obj, \
!         tkevent.obj, tkfocus.obj, tkfont.obj, tkget.obj, tkgc.obj, tkgeometry.obj, \
!         tkgrab.obj, tkoption.obj, tkpack.obj, tkplace.obj, tkpreserve.obj, \
!         tkselect.obj, tksend.obj, tkwindow.obj, tkwm.obj, \
! 	$(WIDGOBJS), $(CANVOBJS), $(TEXTOBJS), $(VMSOBJS), \
!  	tkgeommanager.obj, tkpack2.obj, tkporthole.obj, tktable.obj
  
! VMSSRC = tkvms.c
  
! WIDGSRCS = tkbutton.c tkentry.c tkframe.c tklistbox.c \
! 	tkmenu.c tkmenubutton.c tkmessage.c tkscale.c \
! 	tkscrollbar.c tktext.c
  
! CANVSRCS = tkcanvas.c tkcanvarc.c tkcanvbmap.c tkcanvline.c \
! 	tkcanvpoly.c tkcanvps.c tkcanvtext.c tkcanvwind.c \
! 	tkrectoval.c tktrig.c
  
! TEXTSRCS = tktext.c tktextbtree.c tktextdisp.c tktextindex.c \
! 	tktexttag.c
! 
! SRCS = tk3d.c tkargv.c tkatom.c tkbind.c tkbitmap.c \
!         tkcmds.o tkcolor.c tkconfig.c tkcursor.c tkerror.c \
!         tkevent.c tkfocus.c tkfont.c tkget.c tkgc.c tkgeometry.c \
!         tkgrab.c tkoption.c tkpack.c tkplace.c tkpreserve.c tkselect.c \
!         tksend.c tkwindow.c tkwm.c $(WIDGSRCS) $(CANVSRCS) \
!         $(TEXTSRCS) $(VMSSRC) \
!  	tkgeommanager.c tkpack2.c tkporthole.c tktable.c
! 
! all : wish.exe
! 
! libtk.olb : $(OBJS)
! 	- delete/noconfirm libtk.olb.*
! 	library/create $@ $(OBJS)
! 
! # LDFLAGS = /debug
! 
! wish.exe : main.obj, libtk.olb
! 	link/exe=$@ $(LDFLAGS) main.obj, $(LIBS)
! 
! clean :
! 	- del *.exe;*, *.obj;*, *.map;*
! 
! $(OBJS) : tk.h tkint.h
! $(WIDGOBJS) : default.h
! main.o : tk.h tkint.h
--- 3,207 ----
  # it to compile Tk, you may wish to reset some of the following variables:
  #
  # TCL_DIR -		Name of directory holding tcl.h and tcl.a.
! # XLIB -		If your Xlib library isn't in the standard place,
! #			you can replace "-lX11" with the name of the file
! #			containing your library archive.
! # INSTALL_DIR -		Full path name of top-level directory where
! #			information is installed.
! # TK_LIBRARY -		Full path name of directory to contain scripts
! #			and other library files used by Tk.  This value
! #			is available to applications as the variable
! #			$tk_library.  If the environment variable
! #			TK_LIBRARY is defined by a user, it will override
! #			the value specified in this Makefile.
! # LIB_DIR -		Directory in which to install the archive libtcl.a
! # BIN_DIR -		Directory in which to install executables such as wish.
! # INCLUDE_DIR -		Directory in which to install header files.
! # MANx_DIR -		Directories in which to install manual entries.
! # RANLIB -		If you're using a System-V-based UNIX that doesn't
! #			have ranlib, change this definition to "echo" or
! #			something else harmless.
! # SHELL -		Some versions of make (e.g. SGI's) use this variable
! #			to determine which shell to use for executing
! #			commands.
  #
  
! TCL_DIR		= tcl
! #XLIB		= -lX11                 # *jk*
! XBASE		= /usr/local/X11R5      # *jk*
! XLIB		= -L$(XBASE)/lib -lX11  # *jk*
! INSTALL_DIR	= /usr/local
! LIB_DIR		= $(INSTALL_DIR)/lib
! TK_LIBRARY	= $(INSTALL_DIR)/lib/tk
! BIN_DIR		= $(INSTALL_DIR)/bin
! INCLUDE_DIR	= $(INSTALL_DIR)/include
! MAN1_DIR	= $(INSTALL_DIR)/man/man1
! MAN3_DIR	= $(INSTALL_DIR)/man/man3
! MANN_DIR	= $(INSTALL_DIR)/man/mann
! RANLIB		= ranlib
! SHELL		= /bin/sh
! 
! # ANSI-C procedure prototypes are turned on by default if supported
! # by the compiler.  To turn them off, uncomment the following line:
  
! # NP =		-DNO_PROTOTYPE
  
! # To compile under OpenWindows, uncomment the following line:
  
! # OW =		-I/usr/openwin/include -L/usr/openwin/lib
  
! XINCL = $(XBASE)/include                # *jk*
  
! CC		= cc
! CFLAGS		= -I. -I$(TCL_DIR) -O -DTK_LIBRARY=\"${TK_LIBRARY}\" \
! 	-I$(XINCL)  ${NP} ${OW}          # *jk*
! #	${NP} ${OW}
! 
! #-----------------------------------------------------------------------------
! TK_REV=3.2								# *jk*
! 
! SHLIB_LDFLAGS= -assert pure-text					# *jk*
! SHLIB_CCFLAGS= -PIC							# *jk*
! 
! # the .c.o rule is from the X11R5 distribution, via			  *jk*
! # ehrlich@cs.psu.edu (Dan Ehrlich):					  *jk*
! .c.o:									# *jk*
! 	rm -f shared/$@							# *jk*
! 	$(CC) -c $(CFLAGS) $(SHLIB_CCFLAGS) $*.c			# *jk*
! 	mv $@ shared/$@							# *jk*
! 	$(CC) -c $(CFLAGS) $*.c						# *jk*
! 
! SHLIBS= libtk.so $(TCL_DIR)/libtcl.so					# *jk*
! ACC_LOCAL_SHLIBS= -L. -ltk  -Ltcl -ltcl					# *jk*
! ACC_STD_SHLIBS= -ltk -ltcl						# *jk*
! #-----------------------------------------------------------------------------
! 
! LIBS = libtk.a $(TCL_DIR)/libtcl.a
! 
! WIDGOBJS = tkButton.o tkEntry.o tkFrame.o tkListbox.o \
! 	tkMenu.o tkMenubutton.o tkMessage.o tkScale.o \
! 	tkScrollbar.o
! 
! CANVOBJS = tkCanvas.o tkCanvArc.o tkCanvBmap.o tkCanvLine.o \
! 	tkCanvPoly.o tkCanvPs.o tkCanvText.o tkCanvWind.o \
! 	tkRectOval.o tkTrig.o
! 
! TEXTOBJS = tkText.o tkTextBTree.o tkTextDisp.o tkTextIndex.o tkTextTag.o
! 
! OBJS = tk3d.o tkArgv.o tkAtom.o tkBind.o tkBitmap.o tkCmds.o \
! 	tkColor.o tkConfig.o tkCursor.o tkError.o tkEvent.o \
! 	tkFocus.o tkFont.o tkGet.o tkGC.o tkGeometry.o tkGrab.o \
!         tkOption.o tkPack.o tkPlace.o tkPreserve.o tkSelect.o \
!         tkSend.o tkWindow.o tkWm.o $(WIDGOBJS) \
! 	$(CANVOBJS) $(TEXTOBJS)
! 
! WIDGSRCS = tkButton.c tkEntry.c tkFrame.c tkListbox.c \
! 	tkMenu.c tkMenubutton.c tkMessage.c tkScale.c \
! 	tkScrollbar.c tkText.c tkTextBTree.c tkTextDisp.c \
! 	tkTextIndex.c
! 
! CANVSRCS = tkCanvas.c tkCanvArc.c tkCanvBmap.c tkCanvLine.c \
! 	tkCanvPoly.c tkCanvPs.c tkCanvText.c tkCanvWind.c \
! 	tkRectOval.c tkTrig.c
! 
! TEXTSRCS = tkText.c tkTextBTree.c tkTextDisp.c tkTextIndex.c tkTextTag.c
! 
! SRCS = tk3d.c tkArgv.c tkAtom.c tkBind.c tkBitmap.c tkCmds.c \
! 	tkColor.c tkConfig.c tkCursor.c tkError.c tkEvent.c \
! 	tkFocus.c tkFont.c tkGet.c tkGC.c tkGeometry.c tkGrab.c \
!         tkOption.c tkPack.c tkPlace.c tkPreserve.c tkSelect.c \
!         tkSend.c tkWindow.c tkWm.c $(WIDGSRCS) \
! 	$(CANVSRCS) $(TEXTSRCS)
! 
! all: shared   libtk.a wish  libtk.so wish-so				# *jk*
! 
! wish: main.o $(LIBS)
! 	$(CC) $(CFLAGS) main.o $(LIBS) $(XLIB) -lm -o wish
! 
! libtk.a: $(OBJS)
! 	rm -f libtk.a
! 	ar cr libtk.a $(OBJS)
! 	$(RANLIB) libtk.a
! 
! #-----------------------------------------------------------------------------
! libtk.so: libtk.so.$(TK_REV)						# *jk*
! 
! libtk.so.$(TK_REV): shared $(OBJS)					# *jk*
! 	cd shared ; ld -o ../$@  $(OBJS) $(SHLIB_LDFLAGS)		# *jk*
! 
! wish-so: wish-so-local wish-so-std
! 
! wish-so-local: shared/main.o $(SHLIBS)					# *jk*
! 	${CC} ${CFLAGS} shared/main.o $(ACC_LOCAL_SHLIBS) $(XLIB) \
! 					    -lm -o wish-so-local	# *jk*
! 
! wish-so-std: shared/main.o $(SHLIBS)					# *jk*
! 	${CC} ${CFLAGS} shared/main.o \
! 	    -L /usr/local/lib $(ACC_STD_SHLIBS) $(XLIB) \
! 				    -lm -o wish-so-std			# *jk*
! 
! $(TCL_DIR)/libtcl.so:							# *jk*
! 	cd $(TCL_DIR); $(MAKE) $(MFLAGS) libtcl.so			# *jk*
! 
! shared: 								# *jk*
! 	if [ ! -d $@ ] ; then    mkdir $@ ; fi 				# *jk*
! 
! clean-so: clean-shared 							# *jk*
! clean-shared: 								# *jk*
! 	rm -f libtk.so.$(TK_REV) wish-so-local wish-so-std		# *jk*
! #-----------------------------------------------------------------------------
! 
! $(TCL_DIR)/libtcl.a:
! 	cd $(TCL_DIR); $(MAKE) $(MFLAGS) libtcl.a
! 
! install: libtk.a wish $(TCL_DIR)/libtcl.a    all			# *jk*
! 	-if [ ! -d $(LIB_DIR) ] ; then mkdir -p $(LIB_DIR); fi
! 	-if [ ! -d $(INSTALL_DIR)/include ] ; then mkdir -p $(INSTALL_DIR)/include; fi
! 	-if [ ! -d $(TK_LIBRARY) ] ; then mkdir -p $(TK_LIBRARY); fi
! 	-if [ ! -d $(BIN_DIR) ] ; then mkdir -p $(BIN_DIR); fi
! 	-if [ ! -d $(MAN1_DIR) ] ; then mkdir -p $(MAN1_DIR); fi
! 	-if [ ! -d $(MAN3_DIR) ] ; then mkdir -p $(MAN3_DIR); fi
! 	-if [ ! -d $(MANN_DIR) ] ; then mkdir -p $(MANN_DIR); fi
! 	-if [ ! -d $(INSTALL_DIR)/include ] ; then \
! 		mkdir -p $(INSTALL_DIR)/include; fi
! 	rm -rf $(TK_LIBRARY)/*
! 	cp -r library/*.tcl library/tclIndex library/demos $(TK_LIBRARY)
! 	cp library/prolog.ps $(TK_LIBRARY)
! 	rm -f $(LIB_DIR)/libtk.a
! 	cp libtk.a $(LIB_DIR)
! 	$(RANLIB) $(LIB_DIR)/libtk.a
! 	cd $(TCL_DIR); $(MAKE) $(MFLAGS) INSTALL_DIR=$(INSTALL_DIR) install
! 	cp libtk.so.${TK_REV} $(LIB_DIR)	                       # *jk*
! 	$(MAKE) $(MFLAGS) wish-so-std             		       # *jk*
! 	rm -f $(BIN_DIR)/wish
! 	cp wish-so-std $(BIN_DIR)/wish				       # *jk*
! 	rm -f $(INCLUDE_DIR)/tk.h
! 	cp tk.h $(INCLUDE_DIR)
! 	cd doc; for i in *.1; \
! 	    do \
! 	    rm -f $(MAN1_DIR)/$$i; \
! 	    sed -e '/man\.macros/r man.macros' -e '/man\.macros/d' \
! 		    $$i > $(MAN1_DIR)/$$i; \
! 	    done; cd ..
! 	cd doc; for i in *.3; \
! 	    do \
! 	    rm -f $(MAN3_DIR)/$$i; \
! 	    sed -e '/man\.macros/r man.macros' -e '/man\.macros/d' \
! 		    $$i > $(MAN3_DIR)/$$i; \
! 	    done; cd ..
! 	cd doc; for i in *.n; \
! 	    do \
! 	    rm -f $(MANN_DIR)/$$i; \
! 	    sed -e '/man\.macros/r man.macros' -e '/man\.macros/d' \
! 		    $$i > $(MANN_DIR)/$$i; \
! 	    done; cd ..
! 
! clean:
! 	rm -f $(OBJS) main.o libtk.a wish
! 	cd $(TCL_DIR); $(MAKE) $(MFLAGS) clean
! 
! $(OBJS): tk.h tkInt.h tkConfig.h
! $(WIDGOBJS): default.h
! $(CANVOBJS): default.h tkCanvas.h
! $(TEXTOBJS): default.h tkText.h
! main.o: tk.h tkInt.h
Only in .: newdemos
Only in .: porthole.c
Only in .: readme.vms
Only in .: tests
diff -c ./tk.h /src/users/damania/Pursuits/tk/tk.h
*** ./tk.h	Mon Mar 29 15:09:59 1993
--- /src/users/damania/Pursuits/tk/tk.h	Tue Mar 30 09:20:17 1993
***************
*** 172,179 ****
  #define TK_CONFIG_MM		19
  #define TK_CONFIG_WINDOW	20
  #define TK_CONFIG_CUSTOM	21
! #define TK_CONFIG_WRAP		22
! #define TK_CONFIG_END		23
  
  /*
   * Macro to use to fill in "offset" fields of Tk_ConfigInfos.
--- 172,178 ----
  #define TK_CONFIG_MM		19
  #define TK_CONFIG_WINDOW	20
  #define TK_CONFIG_CUSTOM	21
! #define TK_CONFIG_END		22
  
  /*
   * Macro to use to fill in "offset" fields of Tk_ConfigInfos.
***************
*** 247,261 ****
  #define TK_RELIEF_SUNKEN	4
  
  /*
-  * Wrap mode values returned by Tk_GetWrapMode:
-  */
- 
- #define TK_WRAP_NONE		1
- #define TK_WRAP_CHAR		2
- #define TK_WRAP_WORD		3
- #define TK_WRAP_FIXED		4
- 
- /*
   * Special EnterNotify/LeaveNotify "mode" for use in events
   * generated by tkShare.c.  Pick a high enough value that it's
   * unlikely to conflict with existing values (like NotifyNormal)
--- 246,251 ----
***************
*** 596,604 ****
  extern int		Tk_GetSelection _ANSI_ARGS_((Tcl_Interp *interp,
  			    Tk_Window tkwin, Atom target, Tk_GetSelProc *proc,
  			    ClientData clientData));
- extern int		Tk_GetWrapMode _ANSI_ARGS_((Tcl_Interp *interp,
- 						    char *name,
- 			    ClientData wrapPtr));
  extern Tk_Uid		Tk_GetUid _ANSI_ARGS_((char *string));
  extern void		Tk_GetVRootGeometry _ANSI_ARGS_((Tk_Window tkwin,
  			    int *xPtr, int *yPtr, unsigned int *widthPtr,
--- 586,591 ----
***************
*** 633,639 ****
  extern char *		Tk_NameOfJoinStyle _ANSI_ARGS_((int join));
  extern char *		Tk_NameOfJustify _ANSI_ARGS_((Tk_Justify justify));
  extern char *		Tk_NameOfRelief _ANSI_ARGS_((int relief));
- extern char *		Tk_NameOfWrapMode _ANSI_ARGS_((int wrap));
  extern Tk_Window	Tk_NameToWindow _ANSI_ARGS_((Tcl_Interp *interp,
  			    char *pathName, Tk_Window tkwin));
  extern void		Tk_OwnSelection _ANSI_ARGS_((Tk_Window tkwin,
--- 620,625 ----
***************
*** 739,750 ****
  			    Tcl_Interp *interp, int argc, char **argv));
  extern int		Tk_WmCmd _ANSI_ARGS_((ClientData clientData,
  			    Tcl_Interp *interp, int argc, char **argv));
- 
- extern int		Tk_Pack2Cmd _ANSI_ARGS_((ClientData clientData,
- 			    Tcl_Interp *interp, int argc, char **argv));
- extern int		Tk_PortholeCmd _ANSI_ARGS_((ClientData clientData,
- 			    Tcl_Interp *interp, int argc, char **argv));
- extern int		Tk_TableCmd _ANSI_ARGS_((ClientData clientData,
- 			    Tcl_Interp *interp, int argc, char **argv));
  
  #endif /* _TK */
--- 725,729 ----
diff -c ./tk3d.c /src/users/damania/Pursuits/tk/tk3d.c
*** ./tk3d.c	Mon Mar 29 15:05:39 1993
--- /src/users/damania/Pursuits/tk/tk3d.c	Tue Mar 30 09:20:18 1993
***************
*** 18,24 ****
  static char rcsid[] = "$Header: /user6/ouster/wish/RCS/tk3d.c,v 1.33 92/12/14 11:24:56 ouster Exp $ SPRITE (Berkeley)";
  #endif
  
! #include "tkconfig.h"
  #include "tk.h"
  
  /*
--- 18,24 ----
  static char rcsid[] = "$Header: /user6/ouster/wish/RCS/tk3d.c,v 1.33 92/12/14 11:24:56 ouster Exp $ SPRITE (Berkeley)";
  #endif
  
! #include "tkConfig.h"
  #include "tk.h"
  
  /*
Only in .: tk3d.obj
Only in /src/users/damania/Pursuits/tk: tkCanvPs.c.orig
diff -c ./tkargv.c /src/users/damania/Pursuits/tk/tkargv.c
*** ./tkargv.c	Mon Mar 29 15:05:41 1993
--- /src/users/damania/Pursuits/tk/tkargv.c	Tue Mar 30 09:20:18 1993
***************
*** 18,24 ****
  static char rcsid[] = "$Header: /user6/ouster/wish/RCS/tkArgv.c,v 1.13 92/10/07 11:27:30 ouster Exp $ SPRITE (Berkeley)";
  #endif
  
! #include "tkconfig.h"
  #include "tk.h"
  
  /*
--- 18,24 ----
  static char rcsid[] = "$Header: /user6/ouster/wish/RCS/tkArgv.c,v 1.13 92/10/07 11:27:30 ouster Exp $ SPRITE (Berkeley)";
  #endif
  
! #include "tkConfig.h"
  #include "tk.h"
  
  /*
Only in .: tkargv.obj
diff -c ./tkatom.c /src/users/damania/Pursuits/tk/tkatom.c
*** ./tkatom.c	Mon Mar 29 15:05:42 1993
--- /src/users/damania/Pursuits/tk/tkatom.c	Tue Mar 30 09:20:18 1993
***************
*** 21,28 ****
  static char rcsid[] = "$Header: /user6/ouster/wish/RCS/tkAtom.c,v 1.7 92/11/13 16:32:47 ouster Exp $ SPRITE (Berkeley)";
  #endif
  
! #include "tkconfig.h"
! #include "tkint.h"
  
  /*
   * Forward references to procedures defined in this file:
--- 21,28 ----
  static char rcsid[] = "$Header: /user6/ouster/wish/RCS/tkAtom.c,v 1.7 92/11/13 16:32:47 ouster Exp $ SPRITE (Berkeley)";
  #endif
  
! #include "tkConfig.h"
! #include "tkInt.h"
  
  /*
   * Forward references to procedures defined in this file:
Only in .: tkatom.obj
diff -c ./tkbind.c /src/users/damania/Pursuits/tk/tkbind.c
*** ./tkbind.c	Mon Mar 29 15:05:49 1993
--- /src/users/damania/Pursuits/tk/tkbind.c	Tue Mar 30 09:20:19 1993
***************
*** 18,25 ****
  static char rcsid[] = "$Header: /user6/ouster/wish/RCS/tkBind.c,v 1.55 93/01/29 10:40:23 ouster Exp $ SPRITE (Berkeley)";
  #endif /* not lint */
  
! #include "tkconfig.h"
! #include "tkint.h"
  
  /*
   * The structure below represents a binding table.  A binding table
--- 18,25 ----
  static char rcsid[] = "$Header: /user6/ouster/wish/RCS/tkBind.c,v 1.55 93/01/29 10:40:23 ouster Exp $ SPRITE (Berkeley)";
  #endif /* not lint */
  
! #include "tkConfig.h"
! #include "tkInt.h"
  
  /*
   * The structure below represents a binding table.  A binding table
Only in .: tkbind.obj
diff -c ./tkbitmap.c /src/users/damania/Pursuits/tk/tkbitmap.c
*** ./tkbitmap.c	Mon Mar 29 15:05:55 1993
--- /src/users/damania/Pursuits/tk/tkbitmap.c	Tue Mar 30 09:20:19 1993
***************
*** 19,38 ****
  static char rcsid[] = "$Header: /user6/ouster/wish/RCS/tkBitmap.c,v 1.18 93/02/03 10:42:35 ouster Exp $ SPRITE (Berkeley)";
  #endif /* not lint */
  
! #include "tkconfig.h"
  #include "tk.h"
  
  /*
   * The includes below are for pre-defined bitmaps.
   */
  
- #ifdef VMS
- #include "[.bitmaps]gray50."
- #include "[.bitmaps]gray25."
- #else
  #include "bitmaps/gray50"
  #include "bitmaps/gray25"
- #endif
  
  /*
   * One of the following data structures exists for each bitmap that is
--- 19,33 ----
  static char rcsid[] = "$Header: /user6/ouster/wish/RCS/tkBitmap.c,v 1.18 93/02/03 10:42:35 ouster Exp $ SPRITE (Berkeley)";
  #endif /* not lint */
  
! #include "tkConfig.h"
  #include "tk.h"
  
  /*
   * The includes below are for pre-defined bitmaps.
   */
  
  #include "bitmaps/gray50"
  #include "bitmaps/gray25"
  
  /*
   * One of the following data structures exists for each bitmap that is
Only in .: tkbitmap.obj
diff -c ./tkbutton.c /src/users/damania/Pursuits/tk/tkbutton.c
*** ./tkbutton.c	Mon Mar 29 15:06:01 1993
--- /src/users/damania/Pursuits/tk/tkbutton.c	Tue Mar 30 09:20:21 1993
***************
*** 21,28 ****
  #endif
  
  #include "default.h"
! #include "tkconfig.h"
! #include "tkint.h"
  
  /*
   * A data structure of the following type is kept for each
--- 21,28 ----
  #endif
  
  #include "default.h"
! #include "tkConfig.h"
! #include "tkInt.h"
  
  /*
   * A data structure of the following type is kept for each
Only in .: tkbutton.obj
diff -c ./tkcanvarc.c /src/users/damania/Pursuits/tk/tkcanvarc.c
*** ./tkcanvarc.c	Mon Mar 29 15:06:05 1993
--- /src/users/damania/Pursuits/tk/tkcanvarc.c	Tue Mar 30 09:20:21 1993
***************
*** 19,26 ****
  
  #include <stdio.h>
  #include <math.h>
! #include "tkint.h"
! #include "tkcanvas.h"
  
  /*
   * The structure below defines the record for each arc item.
--- 19,26 ----
  
  #include <stdio.h>
  #include <math.h>
! #include "tkInt.h"
! #include "tkCanvas.h"
  
  /*
   * The structure below defines the record for each arc item.
Only in .: tkcanvarc.obj
diff -c ./tkcanvas.c /src/users/damania/Pursuits/tk/tkcanvas.c
*** ./tkcanvas.c	Mon Mar 29 15:06:21 1993
--- /src/users/damania/Pursuits/tk/tkcanvas.c	Tue Mar 30 09:20:25 1993
***************
*** 23,31 ****
  #include <stdlib.h>
  #include <string.h>
  #include "default.h"
! #include "tkint.h"
! #include "tkconfig.h"
! #include "tkcanvas.h"
  
  /*
   * See tkCanvas.h for key data structures used to implement canvases.
--- 23,31 ----
  #include <stdlib.h>
  #include <string.h>
  #include "default.h"
! #include "tkInt.h"
! #include "tkConfig.h"
! #include "tkCanvas.h"
  
  /*
   * See tkCanvas.h for key data structures used to implement canvases.
Only in .: tkcanvas.obj
diff -c ./tkcanvbmap.c /src/users/damania/Pursuits/tk/tkcanvbmap.c
*** ./tkcanvbmap.c	Mon Mar 29 15:06:26 1993
--- /src/users/damania/Pursuits/tk/tkcanvbmap.c	Tue Mar 30 09:20:22 1993
***************
*** 19,26 ****
  
  #include <stdio.h>
  #include <math.h>
! #include "tkint.h"
! #include "tkcanvas.h"
  
  /*
   * The structure below defines the record for each rectangle/oval item.
--- 19,26 ----
  
  #include <stdio.h>
  #include <math.h>
! #include "tkInt.h"
! #include "tkCanvas.h"
  
  /*
   * The structure below defines the record for each rectangle/oval item.
Only in .: tkcanvbmap.obj
diff -c ./tkcanvline.c /src/users/damania/Pursuits/tk/tkcanvline.c
*** ./tkcanvline.c	Mon Mar 29 15:06:32 1993
--- /src/users/damania/Pursuits/tk/tkcanvline.c	Tue Mar 30 09:20:22 1993
***************
*** 19,27 ****
  
  #include <stdio.h>
  #include <math.h>
! #include "tkint.h"
! #include "tkcanvas.h"
! #include "tkconfig.h"
  
  /*
   * The structure below defines the record for each line item.
--- 19,27 ----
  
  #include <stdio.h>
  #include <math.h>
! #include "tkInt.h"
! #include "tkCanvas.h"
! #include "tkConfig.h"
  
  /*
   * The structure below defines the record for each line item.
***************
*** 787,797 ****
      int changedMiterToBevel;	/* Non-zero means that a mitered corner
  				 * had to be treated as beveled after all
  				 * because the angle was < 11 degrees. */
! #ifdef VMS
!     bestDist = 1.0e36;
! #else
      bestDist = 1.0e40;
- #endif
  
      /*
       * Handle smoothed lines by generating an expanded set of points
--- 787,794 ----
      int changedMiterToBevel;	/* Non-zero means that a mitered corner
  				 * had to be treated as beveled after all
  				 * because the angle was < 11 degrees. */
! 
      bestDist = 1.0e40;
  
      /*
       * Handle smoothed lines by generating an expanded set of points
Only in .: tkcanvline.obj
diff -c ./tkcanvpoly.c /src/users/damania/Pursuits/tk/tkcanvpoly.c
*** ./tkcanvpoly.c	Mon Mar 29 15:06:36 1993
--- /src/users/damania/Pursuits/tk/tkcanvpoly.c	Tue Mar 30 09:20:23 1993
***************
*** 19,27 ****
  
  #include <stdio.h>
  #include <math.h>
! #include "tkint.h"
! #include "tkcanvas.h"
! #include "tkconfig.h"
  
  /*
   * The structure below defines the record for each polygon item.
--- 19,27 ----
  
  #include <stdio.h>
  #include <math.h>
! #include "tkInt.h"
! #include "tkCanvas.h"
! #include "tkConfig.h"
  
  /*
   * The structure below defines the record for each polygon item.
Only in .: tkcanvpoly.obj
diff -c ./tkcanvps.c /src/users/damania/Pursuits/tk/tkcanvps.c
*** ./tkcanvps.c	Mon Mar 29 15:06:40 1993
--- /src/users/damania/Pursuits/tk/tkcanvps.c	Tue Mar 30 09:20:23 1993
***************
*** 20,28 ****
  #endif
  
  #include <stdio.h>
! #include "tkint.h"
! #include "tkcanvas.h"
! #include "tkconfig.h"
  
  /*
   * See tkCanvas.h for key data structures used to implement canvases.
--- 20,28 ----
  #endif
  
  #include <stdio.h>
! #include "tkInt.h"
! #include "tkCanvas.h"
! #include "tkConfig.h"
  
  /*
   * See tkCanvas.h for key data structures used to implement canvases.
***************
*** 350,365 ****
  
      Tcl_AppendResult(canvasPtr->interp, "%!PS-Adobe-3.0 EPSF-3.0\n",
  	    "%%Creator: Tk Canvas Widget\n", (char *) NULL);
- #ifdef VMS
-     Tcl_AppendResult(canvasPtr->interp, "%%For: ", "Unknown", "\n",
- 	    (char *) NULL);
- #else
      pwPtr = getpwuid(getuid());
      Tcl_AppendResult(canvasPtr->interp, "%%For: ",
  	    (pwPtr != NULL) ? pwPtr->pw_gecos : "Unknown", "\n",
  	    (char *) NULL);
      endpwent();
- #endif
      Tcl_AppendResult(canvasPtr->interp, "%%Title: Window ",
  	    Tk_PathName(canvasPtr->tkwin), "\n", (char *) NULL);
      time(&now);
--- 350,360 ----
***************
*** 774,788 ****
      if (weightSize == 0) {
  	goto error;
      }
- #ifdef VMS
-     if (strncmp(fieldPtrs[WEIGHT_FIELD], "medium", weightSize) == 0) {
- 	weightString = "";
-     } else if (strncmp(fieldPtrs[WEIGHT_FIELD], "bold", weightSize) == 0) {
- 	weightString = "Bold";
-     } else {
- 	goto error;
-     }
- #else
      if (strncasecmp(fieldPtrs[WEIGHT_FIELD], "medium", weightSize) == 0) {
  	weightString = "";
      } else if (strncasecmp(fieldPtrs[WEIGHT_FIELD], "bold", weightSize) == 0) {
--- 769,774 ----
***************
*** 790,796 ****
      } else {
  	goto error;
      }
- #endif
      if (fieldPtrs[SLANT_FIELD+1] != (fieldPtrs[SLANT_FIELD] + 2)) {
  	goto error;
      }
--- 776,781 ----
Only in .: tkcanvps.c.orig
Only in .: tkcanvps.obj
diff -c ./tkcanvtext.c /src/users/damania/Pursuits/tk/tkcanvtext.c
*** ./tkcanvtext.c	Mon Mar 29 15:06:45 1993
--- /src/users/damania/Pursuits/tk/tkcanvtext.c	Tue Mar 30 09:20:24 1993
***************
*** 18,26 ****
  #endif
  
  #include <stdio.h>
! #include "tkint.h"
! #include "tkcanvas.h"
! #include "tkconfig.h"
  
  /*
   * One of the following structures is kept for each line of text
--- 18,26 ----
  #endif
  
  #include <stdio.h>
! #include "tkInt.h"
! #include "tkCanvas.h"
! #include "tkConfig.h"
  
  /*
   * One of the following structures is kept for each line of text
Only in .: tkcanvtext.obj
diff -c ./tkcanvwind.c /src/users/damania/Pursuits/tk/tkcanvwind.c
*** ./tkcanvwind.c	Mon Mar 29 15:06:49 1993
--- /src/users/damania/Pursuits/tk/tkcanvwind.c	Tue Mar 30 09:20:24 1993
***************
*** 19,26 ****
  
  #include <stdio.h>
  #include <math.h>
! #include "tkint.h"
! #include "tkcanvas.h"
  
  /*
   * The structure below defines the record for each window item.
--- 19,26 ----
  
  #include <stdio.h>
  #include <math.h>
! #include "tkInt.h"
! #include "tkCanvas.h"
  
  /*
   * The structure below defines the record for each window item.
Only in .: tkcanvwind.obj
diff -c ./tkcmds.c /src/users/damania/Pursuits/tk/tkcmds.c
*** ./tkcmds.c	Mon Mar 29 15:06:53 1993
--- /src/users/damania/Pursuits/tk/tkcmds.c	Tue Mar 30 09:20:26 1993
***************
*** 18,25 ****
  static char rcsid[] = "$Header: /user6/ouster/wish/RCS/tkCmds.c,v 1.43 93/02/04 11:23:18 ouster Exp $ SPRITE (Berkeley)";
  #endif /* not lint */
  
! #include "tkconfig.h"
! #include "tkint.h"
  
  /*
   * The data structure below is used by the "after" command to remember
--- 18,25 ----
  static char rcsid[] = "$Header: /user6/ouster/wish/RCS/tkCmds.c,v 1.43 93/02/04 11:23:18 ouster Exp $ SPRITE (Berkeley)";
  #endif /* not lint */
  
! #include "tkConfig.h"
! #include "tkInt.h"
  
  /*
   * The data structure below is used by the "after" command to remember
Only in .: tkcmds.obj
diff -c ./tkcolor.c /src/users/damania/Pursuits/tk/tkcolor.c
*** ./tkcolor.c	Mon Mar 29 15:06:58 1993
--- /src/users/damania/Pursuits/tk/tkcolor.c	Tue Mar 30 09:20:26 1993
***************
*** 19,27 ****
  static char rcsid[] = "$Header: /user6/ouster/wish/RCS/tkColor.c,v 1.22 93/01/21 16:51:47 ouster Exp $ SPRITE (Berkeley)";
  #endif /* not lint */
  
! #include "tkconfig.h"
  #include "tk.h"
! #include "tkint.h"
  
  /*
   * A two-level data structure is used to manage the color database.
--- 19,27 ----
  static char rcsid[] = "$Header: /user6/ouster/wish/RCS/tkColor.c,v 1.22 93/01/21 16:51:47 ouster Exp $ SPRITE (Berkeley)";
  #endif /* not lint */
  
! #include "tkConfig.h"
  #include "tk.h"
! #include "tkInt.h"
  
  /*
   * A two-level data structure is used to manage the color database.
Only in .: tkcolor.obj
diff -c ./tkconfig.c /src/users/damania/Pursuits/tk/tkconfig.c
*** ./tkconfig.c	Mon Mar 29 15:07:02 1993
--- /src/users/damania/Pursuits/tk/tkconfig.c	Tue Mar 30 09:20:26 1993
***************
*** 17,23 ****
  static char rcsid[] = "$Header: /user6/ouster/wish/RCS/tkConfig.c,v 1.32 92/12/16 09:59:31 ouster Exp $ SPRITE (Berkeley)";
  #endif
  
! #include "tkconfig.h"
  #include "tk.h"
  
  /*
--- 17,23 ----
  static char rcsid[] = "$Header: /user6/ouster/wish/RCS/tkConfig.c,v 1.32 92/12/16 09:59:31 ouster Exp $ SPRITE (Berkeley)";
  #endif
  
! #include "tkConfig.h"
  #include "tk.h"
  
  /*
***************
*** 464,474 ****
  		    return TCL_ERROR;
  		}
  		break;
- 	    case TK_CONFIG_WRAP:
- 		if (Tk_GetWrapMode(interp, uid, (int *) ptr) != TCL_OK) {
-  		    return TCL_ERROR;
-  		}
-  		break;
  	    case TK_CONFIG_CURSOR:
  	    case TK_CONFIG_ACTIVE_CURSOR: {
  		Cursor new, old;
--- 464,469 ----
***************
*** 753,761 ****
  	case TK_CONFIG_RELIEF:
  	    argv[4] = Tk_NameOfRelief(*((int *) ptr));
  	    break;
- 	case TK_CONFIG_WRAP:
-  	    argv[4] = Tk_NameOfWrapMode(*((int *) ptr));
-   	    break;
  	case TK_CONFIG_CURSOR:
  	case TK_CONFIG_ACTIVE_CURSOR: {
  	    Cursor cursor = *((Cursor *) ptr);
--- 748,753 ----
diff -c ./tkconfig.h /src/users/damania/Pursuits/tk/tkconfig.h
*** ./tkconfig.h	Mon Mar 29 15:10:02 1993
--- /src/users/damania/Pursuits/tk/tkconfig.h	Tue Mar 30 09:20:27 1993
***************
*** 37,79 ****
  
  #include <stdio.h>
  #include <ctype.h>
- #ifndef VMS
  #include <fcntl.h>
- #include <pwd.h>
- #endif
  #include <math.h>
  #include <stdlib.h>
  #include <string.h>
- #ifdef VMS
- #include <types.h>
- #include <file.h>
- #include <stat.h>
- #include <time.h>
- struct timeval {
-     long tv_sec;
-     long tv_usec;
-   };
- #else
  #include <sys/types.h>
  #include <sys/file.h>
  #include <sys/stat.h>
  #include <sys/time.h>
- #endif
  #ifndef _TCL
  #   include <tcl.h>
  #endif
  #ifndef _TCLHASH
! #   include <tclhash.h>
  #endif
- #ifdef VMS
- #include <decw$include/Xlib.h>
- #include <decw$include/cursorfont.h>
- #include <decw$include/keysym.h>
- #include <decw$include/Xatom.h>
- #include <decw$include/Xproto.h>
- #include <decw$include/Xresource.h>
- #include <decw$include/Xutil.h>
- #else
  #include <X11/Xlib.h>
  #include <X11/cursorfont.h>
  #include <X11/keysym.h>
--- 37,57 ----
  
  #include <stdio.h>
  #include <ctype.h>
  #include <fcntl.h>
  #include <math.h>
+ #include <pwd.h>
  #include <stdlib.h>
  #include <string.h>
  #include <sys/types.h>
  #include <sys/file.h>
  #include <sys/stat.h>
  #include <sys/time.h>
  #ifndef _TCL
  #   include <tcl.h>
  #endif
  #ifndef _TCLHASH
! #   include <tclHash.h>
  #endif
  #include <X11/Xlib.h>
  #include <X11/cursorfont.h>
  #include <X11/keysym.h>
***************
*** 81,87 ****
  #include <X11/Xproto.h>
  #include <X11/Xresource.h>
  #include <X11/Xutil.h>
- #endif
  
  /*
   * Macro to use instead of "void" for arguments that must have
--- 59,64 ----
***************
*** 102,117 ****
   * file does it explicitly.
   */
  
- #ifndef VMS
  extern int errno;
- #endif
- 
- /** Temporary fix to allow display to take place on other hosts */
- #ifdef VMS
- #define OPEN_MAX 63
- #endif
  
! /**
   * Define OPEN_MAX if it isn't already defined for this system.
   */
  
--- 79,87 ----
   * file does it explicitly.
   */
  
  extern int errno;
  
! /*
   * Define OPEN_MAX if it isn't already defined for this system.
   */
  
***************
*** 142,150 ****
  extern int		close _ANSI_ARGS_((int fd));
  extern int		gettimeofday _ANSI_ARGS_((struct timeval *tp,
  			    struct timezone *tzp));
- #ifndef VMS
  extern uid_t		getuid _ANSI_ARGS_((void));
- #endif
  #if !(defined(_CRAY) || defined(sparc) || defined(_IBMR2))
  extern int		open _ANSI_ARGS_((CONST char *path, int flags, ...));
  #endif
--- 112,118 ----
Only in .: tkconfig.obj
diff -c ./tkcursor.c /src/users/damania/Pursuits/tk/tkcursor.c
*** ./tkcursor.c	Mon Mar 29 15:07:07 1993
--- /src/users/damania/Pursuits/tk/tkcursor.c	Tue Mar 30 09:20:27 1993
***************
*** 19,26 ****
  static char rcsid[] = "$Header: /user6/ouster/wish/RCS/tkCursor.c,v 1.15 93/02/03 10:42:21 ouster Exp $ SPRITE (Berkeley)";
  #endif /* not lint */
  
! #include "tkconfig.h"
! #include "tkint.h"
  
  /*
   * One of the following data structures exists for each cursor that is
--- 19,26 ----
  static char rcsid[] = "$Header: /user6/ouster/wish/RCS/tkCursor.c,v 1.15 93/02/03 10:42:21 ouster Exp $ SPRITE (Berkeley)";
  #endif /* not lint */
  
! #include "tkConfig.h"
! #include "tkInt.h"
  
  /*
   * One of the following data structures exists for each cursor that is
Only in .: tkcursor.obj
diff -c ./tkentry.c /src/users/damania/Pursuits/tk/tkentry.c
*** ./tkentry.c	Mon Mar 29 15:07:15 1993
--- /src/users/damania/Pursuits/tk/tkentry.c	Tue Mar 30 09:20:28 1993
***************
*** 20,27 ****
  #endif
  
  #include "default.h"
! #include "tkconfig.h"
! #include "tkint.h"
  
  /*
   * A data structure of the following type is kept for each entry
--- 20,27 ----
  #endif
  
  #include "default.h"
! #include "tkConfig.h"
! #include "tkInt.h"
  
  /*
   * A data structure of the following type is kept for each entry
Only in .: tkentry.obj
diff -c ./tkerror.c /src/users/damania/Pursuits/tk/tkerror.c
*** ./tkerror.c	Mon Mar 29 15:07:18 1993
--- /src/users/damania/Pursuits/tk/tkerror.c	Tue Mar 30 09:20:28 1993
***************
*** 20,27 ****
  static char rcsid[] = "$Header: /user6/ouster/wish/RCS/tkError.c,v 1.10 92/04/12 17:02:08 ouster Exp $ SPRITE (Berkeley)";
  #endif
  
! #include "tkconfig.h"
! #include "tkint.h"
  
  static initialized = 0;
  
--- 20,27 ----
  static char rcsid[] = "$Header: /user6/ouster/wish/RCS/tkError.c,v 1.10 92/04/12 17:02:08 ouster Exp $ SPRITE (Berkeley)";
  #endif
  
! #include "tkConfig.h"
! #include "tkInt.h"
  
  static initialized = 0;
  
***************
*** 290,302 ****
       */
  
      couldntHandle:
- #ifdef VMS
-     /*
-      * There must be a better way.
-      */
-     fprintf(stderr, "X Error\n");
-     return 0;
- #else    
      return _XDefaultError(display, errEventPtr);
- #endif
  }
--- 290,294 ----
Only in .: tkerror.obj
diff -c ./tkevent.c /src/users/damania/Pursuits/tk/tkevent.c
*** ./tkevent.c	Mon Mar 29 15:07:27 1993
--- /src/users/damania/Pursuits/tk/tkevent.c	Tue Mar 30 09:20:29 1993
***************
*** 19,26 ****
  static char rcsid[] = "$Header: /user6/ouster/wish/RCS/tkEvent.c,v 1.69 92/12/21 12:01:19 ouster Exp $ SPRITE (Berkeley)";
  #endif
  
! #include "tkconfig.h"
! #include "tkint.h"
  #include <errno.h>
  #include <signal.h>
  
--- 19,26 ----
  static char rcsid[] = "$Header: /user6/ouster/wish/RCS/tkEvent.c,v 1.69 92/12/21 12:01:19 ouster Exp $ SPRITE (Berkeley)";
  #endif
  
! #include "tkConfig.h"
! #include "tkInt.h"
  #include <errno.h>
  #include <signal.h>
  
***************
*** 1227,1235 ****
  		    XNoOp(display);
  		    XFlush(display);
  		    (void) signal(SIGPIPE, oldHandler);
- #ifdef VMS
- 		    sys$clref(ConnectionNumber(display));
- #endif
  		    return 1;
  		}
  		if (restrictProc != NULL) {
--- 1227,1232 ----
***************
*** 1242,1250 ****
  		}
  	    } else {
  		if (QLength(display) == 0) {
- #ifdef VMS
- 		    sys$clref(ConnectionNumber(display));
- #endif
  		    continue;
  		}
  		if (restrictProc != NULL) {
--- 1239,1244 ----
Only in .: tkevent.obj
diff -c ./tkfocus.c /src/users/damania/Pursuits/tk/tkfocus.c
*** ./tkfocus.c	Mon Mar 29 15:07:31 1993
--- /src/users/damania/Pursuits/tk/tkfocus.c	Tue Mar 30 09:20:29 1993
***************
*** 18,25 ****
  static char rcsid[] = "$Header: /user6/ouster/wish/RCS/tkFocus.c,v 1.4 93/02/03 10:02:23 ouster Exp $ SPRITE (Berkeley)";
  #endif
  
! #include "tkint.h"
! #include "tkconfig.h"
  
  /*
   * The variable below records the address of the last focus event
--- 18,25 ----
  static char rcsid[] = "$Header: /user6/ouster/wish/RCS/tkFocus.c,v 1.4 93/02/03 10:02:23 ouster Exp $ SPRITE (Berkeley)";
  #endif
  
! #include "tkInt.h"
! #include "tkConfig.h"
  
  /*
   * The variable below records the address of the last focus event
Only in .: tkfocus.obj
diff -c ./tkfont.c /src/users/damania/Pursuits/tk/tkfont.c
*** ./tkfont.c	Mon Mar 29 15:07:36 1993
--- /src/users/damania/Pursuits/tk/tkfont.c	Tue Mar 30 09:20:30 1993
***************
*** 19,26 ****
  static char rcsid[] = "$Header: /user6/ouster/wish/RCS/tkFont.c,v 1.22 93/01/08 08:41:59 ouster Exp $ SPRITE (Berkeley)";
  #endif
  
! #include "tkconfig.h"
! #include "tkint.h"
  
  /*
   * This module caches extra information about fonts in addition to
--- 19,26 ----
  static char rcsid[] = "$Header: /user6/ouster/wish/RCS/tkFont.c,v 1.22 93/01/08 08:41:59 ouster Exp $ SPRITE (Berkeley)";
  #endif
  
! #include "tkConfig.h"
! #include "tkInt.h"
  
  /*
   * This module caches extra information about fonts in addition to
Only in .: tkfont.obj
diff -c ./tkframe.c /src/users/damania/Pursuits/tk/tkframe.c
*** ./tkframe.c	Mon Mar 29 15:07:39 1993
--- /src/users/damania/Pursuits/tk/tkframe.c	Tue Mar 30 09:20:30 1993
***************
*** 20,26 ****
  #endif
  
  #include "default.h"
! #include "tkconfig.h"
  #include "tk.h"
  
  /*
--- 20,26 ----
  #endif
  
  #include "default.h"
! #include "tkConfig.h"
  #include "tk.h"
  
  /*
Only in .: tkframe.obj
diff -c ./tkgc.c /src/users/damania/Pursuits/tk/tkgc.c
*** ./tkgc.c	Mon Mar 29 15:07:41 1993
--- /src/users/damania/Pursuits/tk/tkgc.c	Tue Mar 30 09:20:30 1993
***************
*** 18,24 ****
  static char rcsid[] = "$Header: /user6/ouster/wish/RCS/tkGC.c,v 1.11 92/12/14 11:18:09 ouster Exp $ SPRITE (Berkeley)";
  #endif /* not lint */
  
! #include "tkconfig.h"
  #include "tk.h"
  
  /*
--- 18,24 ----
  static char rcsid[] = "$Header: /user6/ouster/wish/RCS/tkGC.c,v 1.11 92/12/14 11:18:09 ouster Exp $ SPRITE (Berkeley)";
  #endif /* not lint */
  
! #include "tkConfig.h"
  #include "tk.h"
  
  /*
Only in .: tkgc.obj
diff -c ./tkgeometry.c /src/users/damania/Pursuits/tk/tkgeometry.c
*** ./tkgeometry.c	Mon Mar 29 15:07:42 1993
--- /src/users/damania/Pursuits/tk/tkgeometry.c	Tue Mar 30 09:20:30 1993
***************
*** 20,27 ****
  static char rcsid[] = "$Header: /user6/ouster/wish/RCS/tkGeometry.c,v 1.18 92/05/13 16:51:17 ouster Exp $ SPRITE (Berkeley)";
  #endif
  
! #include "tkconfig.h"
! #include "tkint.h"
  
  /*
   *--------------------------------------------------------------
--- 20,27 ----
  static char rcsid[] = "$Header: /user6/ouster/wish/RCS/tkGeometry.c,v 1.18 92/05/13 16:51:17 ouster Exp $ SPRITE (Berkeley)";
  #endif
  
! #include "tkConfig.h"
! #include "tkInt.h"
  
  /*
   *--------------------------------------------------------------
Only in .: tkgeometry.obj
Only in .: tkgeommanager.c
Only in .: tkgeommanager.h
Only in .: tkgeommanager.obj
diff -c ./tkget.c /src/users/damania/Pursuits/tk/tkget.c
*** ./tkget.c	Mon Mar 29 15:07:46 1993
--- /src/users/damania/Pursuits/tk/tkget.c	Tue Mar 30 09:20:31 1993
***************
*** 22,28 ****
  #endif /* not lint */
  
  #include <tk.h>
! #include "tkconfig.h"
  
  /*
   * The hash table below is used to keep track of all the Tk_Uids created
--- 22,28 ----
  #endif /* not lint */
  
  #include <tk.h>
! #include "tkConfig.h"
  
  /*
   * The hash table below is used to keep track of all the Tk_Uids created
Only in .: tkget.obj
diff -c ./tkgrab.c /src/users/damania/Pursuits/tk/tkgrab.c
*** ./tkgrab.c	Mon Mar 29 15:07:51 1993
--- /src/users/damania/Pursuits/tk/tkgrab.c	Tue Mar 30 09:20:31 1993
***************
*** 17,24 ****
  static char rcsid[] = "$Header: /user6/ouster/wish/RCS/tkGrab.c,v 1.29 92/12/12 16:17:28 ouster Exp $ SPRITE (Berkeley)";
  #endif
  
! #include "tkconfig.h"
! #include "tkint.h"
  
  /*
   * This module is ridiculously complicated... sorry about that.  The
--- 17,24 ----
  static char rcsid[] = "$Header: /user6/ouster/wish/RCS/tkGrab.c,v 1.29 92/12/12 16:17:28 ouster Exp $ SPRITE (Berkeley)";
  #endif
  
! #include "tkConfig.h"
! #include "tkInt.h"
  
  /*
   * This module is ridiculously complicated... sorry about that.  The
Only in .: tkgrab.obj
diff -c ./tkint.h /src/users/damania/Pursuits/tk/tkint.h
*** ./tkint.h	Mon Mar 29 15:10:05 1993
--- /src/users/damania/Pursuits/tk/tkint.h	Tue Mar 30 09:20:31 1993
***************
*** 32,38 ****
  #include "tcl.h"
  #endif
  #ifndef _TCLHASH
! #include "tclhash.h"
  #endif
  
  /*
--- 32,38 ----
  #include "tcl.h"
  #endif
  #ifndef _TCLHASH
! #include "tclHash.h"
  #endif
  
  /*
***************
*** 471,482 ****
   */
  
  #ifndef TK_LIBRARY
- #ifdef VMS 
- #define TK_LIBRARY "flash$dua1:[damania.tcl-tk.tk.32]"
- #else
  #define TK_LIBRARY "/usr/local/lib/tk"
  #endif
- #endif
  
  /*
   * Miscellaneous variables shared among Tk modules but not exported
--- 471,478 ----
diff -c ./tklistbox.c /src/users/damania/Pursuits/tk/tklistbox.c
*** ./tklistbox.c	Mon Mar 29 15:07:56 1993
--- /src/users/damania/Pursuits/tk/tklistbox.c	Tue Mar 30 09:20:32 1993
***************
*** 19,27 ****
  static char rcsid[] = "$Header: /user6/ouster/wish/RCS/tkListbox.c,v 1.62 93/01/21 16:51:48 ouster Exp $ SPRITE (Berkeley)";
  #endif
  
! #include "tkconfig.h"
  #include "default.h"
! #include "tkint.h"
  
  /*
   * One record of the following type is kept for each element
--- 19,27 ----
  static char rcsid[] = "$Header: /user6/ouster/wish/RCS/tkListbox.c,v 1.62 93/01/21 16:51:48 ouster Exp $ SPRITE (Berkeley)";
  #endif
  
! #include "tkConfig.h"
  #include "default.h"
! #include "tkInt.h"
  
  /*
   * One record of the following type is kept for each element
Only in .: tklistbox.obj
diff -c ./tkmenu.c /src/users/damania/Pursuits/tk/tkmenu.c
*** ./tkmenu.c	Mon Mar 29 15:08:01 1993
--- /src/users/damania/Pursuits/tk/tkmenu.c	Tue Mar 30 09:20:33 1993
***************
*** 20,28 ****
  static char rcsid[] = "$Header: /user6/ouster/wish/RCS/tkMenu.c,v 1.46 93/01/28 16:00:32 ouster Exp $ SPRITE (Berkeley)";
  #endif
  
! #include "tkconfig.h"
  #include "default.h"
! #include "tkint.h"
  
  /*
   * One of the following data structures is kept for each entry of each
--- 20,28 ----
  static char rcsid[] = "$Header: /user6/ouster/wish/RCS/tkMenu.c,v 1.46 93/01/28 16:00:32 ouster Exp $ SPRITE (Berkeley)";
  #endif
  
! #include "tkConfig.h"
  #include "default.h"
! #include "tkInt.h"
  
  /*
   * One of the following data structures is kept for each entry of each
Only in .: tkmenu.obj
diff -c ./tkmenubutton.c /src/users/damania/Pursuits/tk/tkmenubutton.c
*** ./tkmenubutton.c	Mon Mar 29 15:08:05 1993
--- /src/users/damania/Pursuits/tk/tkmenubutton.c	Tue Mar 30 09:20:33 1993
***************
*** 18,26 ****
  static char rcsid[] = "$Header: /user6/ouster/wish/RCS/tkMenubutton.c,v 1.37 93/01/21 16:51:57 ouster Exp Locker: ouster $ SPRITE (Berkeley)";
  #endif
  
! #include "tkconfig.h"
  #include "default.h"
! #include "tkint.h"
  
  /*
   * A data structure of the following type is kept for each
--- 18,26 ----
  static char rcsid[] = "$Header: /user6/ouster/wish/RCS/tkMenubutton.c,v 1.37 93/01/21 16:51:57 ouster Exp Locker: ouster $ SPRITE (Berkeley)";
  #endif
  
! #include "tkConfig.h"
  #include "default.h"
! #include "tkInt.h"
  
  /*
   * A data structure of the following type is kept for each
Only in .: tkmenubutton.obj
diff -c ./tkmessage.c /src/users/damania/Pursuits/tk/tkmessage.c
*** ./tkmessage.c	Mon Mar 29 15:08:07 1993
--- /src/users/damania/Pursuits/tk/tkmessage.c	Tue Mar 30 09:20:33 1993
***************
*** 19,27 ****
  static char rcsid[] = "$Header: /user6/ouster/wish/RCS/tkMessage.c,v 1.37 92/12/14 11:17:44 ouster Exp $ SPRITE (Berkeley)";
  #endif
  
! #include "tkconfig.h"
  #include "default.h"
! #include "tkint.h"
  
  /*
   * A data structure of the following type is kept for each message
--- 19,27 ----
  static char rcsid[] = "$Header: /user6/ouster/wish/RCS/tkMessage.c,v 1.37 92/12/14 11:17:44 ouster Exp $ SPRITE (Berkeley)";
  #endif
  
! #include "tkConfig.h"
  #include "default.h"
! #include "tkInt.h"
  
  /*
   * A data structure of the following type is kept for each message
Only in .: tkmessage.obj
diff -c ./tkoption.c /src/users/damania/Pursuits/tk/tkoption.c
*** ./tkoption.c	Mon Mar 29 15:08:11 1993
--- /src/users/damania/Pursuits/tk/tkoption.c	Tue Mar 30 09:20:34 1993
***************
*** 19,26 ****
  static char rcsid[] = "$Header: /user6/ouster/wish/RCS/tkOption.c,v 1.25 92/03/16 08:46:14 ouster Exp $ SPRITE (Berkeley)";
  #endif
  
! #include "tkconfig.h"
! #include "tkint.h"
  
  /*
   * The option database is stored as one tree for each main window.
--- 19,26 ----
  static char rcsid[] = "$Header: /user6/ouster/wish/RCS/tkOption.c,v 1.25 92/03/16 08:46:14 ouster Exp $ SPRITE (Berkeley)";
  #endif
  
! #include "tkConfig.h"
! #include "tkInt.h"
  
  /*
   * The option database is stored as one tree for each main window.
Only in .: tkoption.obj
diff -c ./tkpack.c /src/users/damania/Pursuits/tk/tkpack.c
*** ./tkpack.c	Mon Mar 29 15:08:15 1993
--- /src/users/damania/Pursuits/tk/tkpack.c	Tue Mar 30 09:20:34 1993
***************
*** 18,25 ****
  static char rcsid[] = "$Header: /user6/ouster/wish/RCS/tkPack.c,v 1.33 93/02/04 14:55:40 ouster Exp $ SPRITE (Berkeley)";
  #endif
  
! #include "tkconfig.h"
! #include "tkint.h"
  
  typedef enum {TOP, BOTTOM, LEFT, RIGHT} Side;
  
--- 18,25 ----
  static char rcsid[] = "$Header: /user6/ouster/wish/RCS/tkPack.c,v 1.33 93/02/04 14:55:40 ouster Exp $ SPRITE (Berkeley)";
  #endif
  
! #include "tkConfig.h"
! #include "tkInt.h"
  
  typedef enum {TOP, BOTTOM, LEFT, RIGHT} Side;
  
Only in .: tkpack.obj
Only in .: tkpack2.c
Only in .: tkpack2.obj
diff -c ./tkplace.c /src/users/damania/Pursuits/tk/tkplace.c
*** ./tkplace.c	Mon Mar 29 15:08:23 1993
--- /src/users/damania/Pursuits/tk/tkplace.c	Tue Mar 30 09:20:35 1993
***************
*** 18,25 ****
  static char rcsid[] = "$Header: /user6/ouster/wish/RCS/tkPlace.c,v 1.7 92/11/29 16:28:45 ouster Exp Locker: ouster $ SPRITE (Berkeley)";
  #endif /* not lint */
  
! #include "tkconfig.h"
! #include "tkint.h"
  
  /*
   * Border modes for relative placement:
--- 18,25 ----
  static char rcsid[] = "$Header: /user6/ouster/wish/RCS/tkPlace.c,v 1.7 92/11/29 16:28:45 ouster Exp Locker: ouster $ SPRITE (Berkeley)";
  #endif /* not lint */
  
! #include "tkConfig.h"
! #include "tkInt.h"
  
  /*
   * Border modes for relative placement:
Only in .: tkplace.obj
Only in .: tkporthole.c
Only in .: tkporthole.obj
diff -c ./tkpreserve.c /src/users/damania/Pursuits/tk/tkpreserve.c
*** ./tkpreserve.c	Mon Mar 29 15:08:29 1993
--- /src/users/damania/Pursuits/tk/tkpreserve.c	Tue Mar 30 09:20:35 1993
***************
*** 20,26 ****
  static char rcsid[] = "$Header: /user6/ouster/wish/RCS/tkPreserve.c,v 1.6 92/06/15 13:44:51 ouster Exp $ SPRITE (Berkeley)";
  #endif /* not lint */
  
! #include "tkconfig.h"
  #include "tk.h"
  
  /*
--- 20,26 ----
  static char rcsid[] = "$Header: /user6/ouster/wish/RCS/tkPreserve.c,v 1.6 92/06/15 13:44:51 ouster Exp $ SPRITE (Berkeley)";
  #endif /* not lint */
  
! #include "tkConfig.h"
  #include "tk.h"
  
  /*
Only in .: tkpreserve.obj
diff -c ./tkrectoval.c /src/users/damania/Pursuits/tk/tkrectoval.c
*** ./tkrectoval.c	Mon Mar 29 15:08:33 1993
--- /src/users/damania/Pursuits/tk/tkrectoval.c	Tue Mar 30 09:20:35 1993
***************
*** 20,28 ****
  
  #include <stdio.h>
  #include <math.h>
! #include "tkconfig.h"
! #include "tkint.h"
! #include "tkcanvas.h"
  
  /*
   * The structure below defines the record for each rectangle/oval item.
--- 20,28 ----
  
  #include <stdio.h>
  #include <math.h>
! #include "tkConfig.h"
! #include "tkInt.h"
! #include "tkCanvas.h"
  
  /*
   * The structure below defines the record for each rectangle/oval item.
Only in .: tkrectoval.obj
diff -c ./tkscale.c /src/users/damania/Pursuits/tk/tkscale.c
*** ./tkscale.c	Mon Mar 29 15:08:36 1993
--- /src/users/damania/Pursuits/tk/tkscale.c	Tue Mar 30 09:20:36 1993
***************
*** 20,28 ****
  static char rcsid[] = "$Header: /user6/ouster/wish/RCS/tkScale.c,v 1.31 92/12/16 11:59:16 ouster Exp $ SPRITE (Berkeley)";
  #endif
  
! #include "tkconfig.h"
  #include "default.h"
! #include "tkint.h"
  
  /*
   * A data structure of the following type is kept for each scale
--- 20,28 ----
  static char rcsid[] = "$Header: /user6/ouster/wish/RCS/tkScale.c,v 1.31 92/12/16 11:59:16 ouster Exp $ SPRITE (Berkeley)";
  #endif
  
! #include "tkConfig.h"
  #include "default.h"
! #include "tkInt.h"
  
  /*
   * A data structure of the following type is kept for each scale
Only in .: tkscale.obj
diff -c ./tkscrollbar.c /src/users/damania/Pursuits/tk/tkscrollbar.c
*** ./tkscrollbar.c	Mon Mar 29 15:08:39 1993
--- /src/users/damania/Pursuits/tk/tkscrollbar.c	Tue Mar 30 09:20:36 1993
***************
*** 20,28 ****
  static char rcsid[] = "$Header: /user6/ouster/wish/RCS/tkScrollbar.c,v 1.39 93/01/21 16:51:27 ouster Exp $ SPRITE (Berkeley)";
  #endif
  
! #include "tkconfig.h"
  #include "default.h"
! #include "tkint.h"
  
  /*
   * A data structure of the following type is kept for each scrollbar
--- 20,28 ----
  static char rcsid[] = "$Header: /user6/ouster/wish/RCS/tkScrollbar.c,v 1.39 93/01/21 16:51:27 ouster Exp $ SPRITE (Berkeley)";
  #endif
  
! #include "tkConfig.h"
  #include "default.h"
! #include "tkInt.h"
  
  /*
   * A data structure of the following type is kept for each scrollbar
Only in .: tkscrollbar.obj
diff -c ./tkselect.c /src/users/damania/Pursuits/tk/tkselect.c
*** ./tkselect.c	Mon Mar 29 15:08:44 1993
--- /src/users/damania/Pursuits/tk/tkselect.c	Tue Mar 30 09:20:37 1993
***************
*** 19,26 ****
  static char rcsid[] = "$Header: /user6/ouster/wish/RCS/tkSelect.c,v 1.30 92/12/28 14:16:23 ouster Exp $ SPRITE (Berkeley)";
  #endif
  
! #include "tkconfig.h"
! #include "tkint.h"
  
  /*
   * When the selection is being retrieved, one of the following
--- 19,26 ----
  static char rcsid[] = "$Header: /user6/ouster/wish/RCS/tkSelect.c,v 1.30 92/12/28 14:16:23 ouster Exp $ SPRITE (Berkeley)";
  #endif
  
! #include "tkConfig.h"
! #include "tkInt.h"
  
  /*
   * When the selection is being retrieved, one of the following
Only in .: tkselect.obj
diff -c ./tksend.c /src/users/damania/Pursuits/tk/tksend.c
*** ./tksend.c	Mon Mar 29 15:08:48 1993
--- /src/users/damania/Pursuits/tk/tksend.c	Tue Mar 30 09:20:37 1993
***************
*** 19,26 ****
  static char rcsid[] = "$Header: /user6/ouster/wish/RCS/tkSend.c,v 1.28 93/01/31 16:08:48 ouster Exp $ SPRITE (Berkeley)";
  #endif
  
! #include "tkconfig.h"
! #include "tkint.h"
  
  /* 
   * The following structure is used to keep track of the
--- 19,26 ----
  static char rcsid[] = "$Header: /user6/ouster/wish/RCS/tkSend.c,v 1.28 93/01/31 16:08:48 ouster Exp $ SPRITE (Berkeley)";
  #endif
  
! #include "tkConfig.h"
! #include "tkInt.h"
  
  /* 
   * The following structure is used to keep track of the
Only in .: tksend.obj
Only in .: tktable.c
Only in .: tktable.obj
diff -c ./tktext.c /src/users/damania/Pursuits/tk/tktext.c
*** ./tktext.c	Mon Mar 29 15:08:54 1993
--- /src/users/damania/Pursuits/tk/tktext.c	Tue Mar 30 09:20:38 1993
***************
*** 22,30 ****
  #endif
  
  #include "default.h"
! #include "tkconfig.h"
  #include "tk.h"
! #include "tktext.h"
  
  /*
   * Information used to parse text configuration options:
--- 22,30 ----
  #endif
  
  #include "default.h"
! #include "tkConfig.h"
  #include "tk.h"
! #include "tkText.h"
  
  /*
   * Information used to parse text configuration options:
***************
*** 147,197 ****
  static int		TextWidgetCmd _ANSI_ARGS_((ClientData clientData,
  			    Tcl_Interp *interp, int argc, char **argv));
  
- int
- Tk_GetWrapMode(interp, name, wrapPtr)
-     Tcl_Interp *interp;         /* For error messages. */
-     char *name;                 /* Name of a relief type. */
-     int *wrapPtr;               /* Where to store converted wrap mode. */
- {
-     char c;
-     int length;
- 
-     c = name[0];
-     length = strlen(name);
-     if ((c == 'n') && (strncmp(name, "none", length) == 0)) {
-         *wrapPtr = TK_WRAP_NONE;
-     } else if ((c == 'c') && (strncmp(name, "char", length) == 0)) {
-         *wrapPtr = TK_WRAP_CHAR;
-     } else if ((c == 'w') && (strncmp(name, "word", length) == 0)) {
-         *wrapPtr = TK_WRAP_WORD;
-     } else if ((c == 'f') && (strncmp(name, "fixed", length) == 0)) {
- 	*wrapPtr = TK_WRAP_FIXED;
-     } else {
-         sprintf(interp->result, "bad wrap mode \"%.50s\":  must be %s",
-                 name, "none, char, word or fixed");
-         return TCL_ERROR;
-     }
-     return TCL_OK;
- }
- 
- char *
- Tk_NameOfWrapMode(wrap)
-     int wrap;
- 
- {
-     if (wrap == TK_WRAP_NONE) {
-         return "flat";
-     } else if (wrap == TK_WRAP_CHAR) {
-         return "sunken";
-     } else if (wrap == TK_WRAP_WORD) {
-         return "raised";
-     } else if (wrap == TK_WRAP_FIXED) {
- 	return "fixed";
-     } else {
-         return "unknown relief";
-     }
- }
- 
  /*
   *--------------------------------------------------------------
   *
--- 147,152 ----
Only in .: tktext.obj
diff -c ./tktextbtree.c /src/users/damania/Pursuits/tk/tktextbtree.c
*** ./tktextbtree.c	Mon Mar 29 15:09:00 1993
--- /src/users/damania/Pursuits/tk/tktextbtree.c	Tue Mar 30 09:20:39 1993
***************
*** 19,27 ****
  static char rcsid[] = "$Header: /user6/ouster/wish/RCS/tkTextBTree.c,v 1.17 92/10/01 13:59:46 ouster Exp $ SPRITE (Berkeley)";
  #endif /* not lint */
  
! #include "tkint.h"
! #include "tkconfig.h"
! #include "tktext.h"
  
  
  /*
--- 19,27 ----
  static char rcsid[] = "$Header: /user6/ouster/wish/RCS/tkTextBTree.c,v 1.17 92/10/01 13:59:46 ouster Exp $ SPRITE (Berkeley)";
  #endif /* not lint */
  
! #include "tkInt.h"
! #include "tkConfig.h"
! #include "tkText.h"
  
  
  /*
Only in .: tktextbtree.obj
diff -c ./tktextdisp.c /src/users/damania/Pursuits/tk/tktextdisp.c
*** ./tktextdisp.c	Mon Mar 29 15:09:05 1993
--- /src/users/damania/Pursuits/tk/tktextdisp.c	Tue Mar 30 09:20:39 1993
***************
*** 19,27 ****
  static char rcsid[] = "$Header: /user6/ouster/wish/RCS/tkTextDisp.c,v 1.28 93/01/23 17:41:41 ouster Exp $ SPRITE (Berkeley)";
  #endif
  
! #include "tkconfig.h"
! #include "tkint.h"
! #include "tktext.h"
  
  /*
   * The following structure describes how to display a range of characters.
--- 19,27 ----
  static char rcsid[] = "$Header: /user6/ouster/wish/RCS/tkTextDisp.c,v 1.28 93/01/23 17:41:41 ouster Exp $ SPRITE (Berkeley)";
  #endif
  
! #include "tkConfig.h"
! #include "tkInt.h"
! #include "tkText.h"
  
  /*
   * The following structure describes how to display a range of characters.
Only in .: tktextdisp.obj
diff -c ./tktextindex.c /src/users/damania/Pursuits/tk/tktextindex.c
*** ./tktextindex.c	Mon Mar 29 15:09:07 1993
--- /src/users/damania/Pursuits/tk/tktextindex.c	Tue Mar 30 09:20:40 1993
***************
*** 19,27 ****
  #endif
  
  #include "default.h"
! #include "tkconfig.h"
  #include "tk.h"
! #include "tktext.h"
  
  /*
   * Forward declarations for procedures defined later in this file:
--- 19,27 ----
  #endif
  
  #include "default.h"
! #include "tkConfig.h"
  #include "tk.h"
! #include "tkText.h"
  
  /*
   * Forward declarations for procedures defined later in this file:
Only in .: tktextindex.obj
diff -c ./tktexttag.c /src/users/damania/Pursuits/tk/tktexttag.c
*** ./tktexttag.c	Mon Mar 29 15:09:11 1993
--- /src/users/damania/Pursuits/tk/tktexttag.c	Tue Mar 30 09:20:41 1993
***************
*** 20,28 ****
  #endif
  
  #include "default.h"
! #include "tkconfig.h"
  #include "tk.h"
! #include "tktext.h"
  
  /*
   * Information used for parsing tag configuration information:
--- 20,28 ----
  #endif
  
  #include "default.h"
! #include "tkConfig.h"
  #include "tk.h"
! #include "tkText.h"
  
  /*
   * Information used for parsing tag configuration information:
Only in .: tktexttag.obj
diff -c ./tktrig.c /src/users/damania/Pursuits/tk/tktrig.c
*** ./tktrig.c	Mon Mar 29 15:09:14 1993
--- /src/users/damania/Pursuits/tk/tktrig.c	Tue Mar 30 09:20:41 1993
***************
*** 22,30 ****
  
  #include <stdio.h>
  #include <math.h>
! #include "tkint.h"
! #include "tkconfig.h"
! #include "tkcanvas.h"
  
  #undef MIN
  #define MIN(a,b) (((a) < (b)) ? (a) : (b))
--- 22,30 ----
  
  #include <stdio.h>
  #include <math.h>
! #include "tkInt.h"
! #include "tkConfig.h"
! #include "tkCanvas.h"
  
  #undef MIN
  #define MIN(a,b) (((a) < (b)) ? (a) : (b))
***************
*** 318,328 ****
       * count it as two intersections.
       */
  
- #ifdef VMS
-     bestDist = 1.0e36;
- #else
      bestDist = 1.0e40;
- #endif
      intersections = 0;
  
      for (count = numPoints, pPtr = polyPtr; count > 1; count--, pPtr += 2) {
--- 318,324 ----
Only in .: tktrig.obj
Only in .: tkvms.c
Only in .: tkvms.obj
diff -c ./tkwindow.c /src/users/damania/Pursuits/tk/tkwindow.c
*** ./tkwindow.c	Mon Mar 29 15:09:19 1993
--- /src/users/damania/Pursuits/tk/tkwindow.c	Tue Mar 30 09:20:42 1993
***************
*** 20,27 ****
  static char rcsid[] = "$Header: /user6/ouster/wish/RCS/tkWindow.c,v 1.108 93/01/23 16:59:23 ouster Exp $ SPRITE (Berkeley)";
  #endif
  
! #include "tkconfig.h"
! #include "tkint.h"
  
  /*
   * Count of number of main windows currently open in this process.
--- 20,27 ----
  static char rcsid[] = "$Header: /user6/ouster/wish/RCS/tkWindow.c,v 1.108 93/01/23 16:59:23 ouster Exp $ SPRITE (Berkeley)";
  #endif
  
! #include "tkConfig.h"
! #include "tkInt.h"
  
  /*
   * Count of number of main windows currently open in this process.
***************
*** 113,123 ****
      {"grab",		Tk_GrabCmd},
      {"option",		Tk_OptionCmd},
      {"pack",		Tk_PackCmd},
-     {"pack2",		Tk_Pack2Cmd},
-     {"porthole",	Tk_PortholeCmd},
      {"place",		Tk_PlaceCmd},
      {"selection",	Tk_SelectionCmd},
-     {"table",		Tk_TableCmd},
      {"tk",		Tk_TkCmd},
      {"tkwait",		Tk_TkwaitCmd},
      {"update",		Tk_UpdateCmd},
--- 113,120 ----
***************
*** 154,160 ****
  static void		DoConfigureNotify _ANSI_ARGS_((TkWindow *winPtr));
  static TkDisplay *	GetScreen _ANSI_ARGS_((Tcl_Interp *interp,
  			    char *screenName, int *screenPtr));
! int		NameWindow _ANSI_ARGS_((Tcl_Interp *interp,
  			    TkWindow *winPtr, TkWindow *parentPtr,
  			    char *name));
  static TkWindow	*	NewWindow _ANSI_ARGS_((TkDisplay *dispPtr,
--- 151,157 ----
  static void		DoConfigureNotify _ANSI_ARGS_((TkWindow *winPtr));
  static TkDisplay *	GetScreen _ANSI_ARGS_((Tcl_Interp *interp,
  			    char *screenName, int *screenPtr));
! static int		NameWindow _ANSI_ARGS_((Tcl_Interp *interp,
  			    TkWindow *winPtr, TkWindow *parentPtr,
  			    char *name));
  static TkWindow	*	NewWindow _ANSI_ARGS_((TkDisplay *dispPtr,
***************
*** 290,300 ****
       */
  
      if ((screenName == NULL) || (screenName[0] == '\0')) {
- #ifdef VMS
- 	screenName = getenv("DECW$DISPLAY");
- #else
  	screenName = getenv("DISPLAY");
- #endif
  	if (screenName == NULL) {
  	    interp->result =
  		    "no display name and no $DISPLAY environment variable";
--- 287,293 ----
***************
*** 471,477 ****
   *----------------------------------------------------------------------
   */
  
! int
  NameWindow(interp, winPtr, parentPtr, name)
      Tcl_Interp *interp;		/* Interpreter to use for error reporting. */
      register TkWindow *winPtr;	/* Window that is to be named and inserted. */
--- 464,470 ----
   *----------------------------------------------------------------------
   */
  
! static int
  NameWindow(interp, winPtr, parentPtr, name)
      Tcl_Interp *interp;		/* Interpreter to use for error reporting. */
      register TkWindow *winPtr;	/* Window that is to be named and inserted. */
***************
*** 546,563 ****
      winPtr->pathName = Tcl_GetHashKey(&parentPtr->mainPtr->nameTable, hPtr);
      return TCL_OK;
  }
- 
- void
- TkUnnameWindow(tkwin)
-     Tk_Window tkwin;
- {
-     register TkWindow *winPtr = (TkWindow *) tkwin;
- 
-     if (winPtr->pathName != NULL) {
- 	Tcl_DeleteHashEntry(Tcl_FindHashEntry(&winPtr->mainPtr->nameTable,
- 					      winPtr->pathName));
-     }
- }
  
  /*
   *----------------------------------------------------------------------
--- 539,544 ----
Only in .: tkwindow.obj
diff -c ./tkwm.c /src/users/damania/Pursuits/tk/tkwm.c
*** ./tkwm.c	Mon Mar 29 15:09:27 1993
--- /src/users/damania/Pursuits/tk/tkwm.c	Tue Mar 30 09:20:44 1993
***************
*** 20,27 ****
  static char rcsid[] = "$Header: /user6/ouster/wish/RCS/tkWm.c,v 1.50 93/01/23 17:01:10 ouster Exp $ SPRITE (Berkeley)";
  #endif
  
! #include "tkconfig.h"
! #include "tkint.h"
  
  /*
   * A data structure of the following type holds information for
--- 20,27 ----
  static char rcsid[] = "$Header: /user6/ouster/wish/RCS/tkWm.c,v 1.50 93/01/23 17:01:10 ouster Exp $ SPRITE (Berkeley)";
  #endif
  
! #include "tkConfig.h"
! #include "tkInt.h"
  
  /*
   * A data structure of the following type holds information for
Only in .: tkwm.obj
Only in .: vaxcrtl.opt
Only in .: wish.exe
Only in .: x11opt.opt
