Eliminated last stronghold of static data in the Tk core...until the next one.

17 files changed, 815 insertions, 746 deletions

diff --git a/generic/tk.h b/generic/tk.h
index a8c1a99..7299d5c 100644
--- a/generic/tk.h
+++ b/generic/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.1.4.10 1999/02/16 06:00:40 lfb Exp $
+ * RCS: @(#) $Id: tk.h,v 1.1.4.11 1999/02/16 11:39:29 lfb Exp $
  */
 
 #ifndef _TK
@@ -330,7 +330,7 @@ typedef struct Tk_ConfigSpec {
 typedef enum {
     TK_CONFIG_BOOLEAN, TK_CONFIG_INT, TK_CONFIG_DOUBLE, TK_CONFIG_STRING,
     TK_CONFIG_UID, TK_CONFIG_COLOR, TK_CONFIG_FONT, TK_CONFIG_BITMAP,
-    TK_CONFIG_BORDER, TK_CONFIG_RELIEF, TK_CONFIG_STATE, TK_CONFIG_CURSOR, 
+    TK_CONFIG_BORDER, TK_CONFIG_RELIEF, TK_CONFIG_CURSOR, 
     TK_CONFIG_ACTIVE_CURSOR, TK_CONFIG_JUSTIFY, TK_CONFIG_ANCHOR, 
     TK_CONFIG_SYNONYM, TK_CONFIG_CAP_STYLE, TK_CONFIG_JOIN_STYLE,
     TK_CONFIG_PIXELS, TK_CONFIG_MM, TK_CONFIG_WINDOW, TK_CONFIG_CUSTOM, 
@@ -432,16 +432,6 @@ typedef enum {
 #define TK_RELIEF_SUNKEN	5
 
 /*
- * Values used to represent various widget states, used by
- * Tk_GetState, Tk_GetStateFromObj.
- */ 
-
-#define TK_STATE_ACTIVE         0
-#define TK_STATE_DISABLED       1
-#define TK_STATE_NORMAL         2
-#define TK_STATE_UNDEFINED      -1
-
-/*
  * "Which" argument values for Tk_3DBorderGC:
  */
 
@@ -1509,13 +1499,14 @@ EXTERN void		Tk_GetRootCoords _ANSI_ARGS_ ((Tk_Window tkwin,
 EXTERN int		Tk_GetScrollInfo _ANSI_ARGS_((Tcl_Interp *interp,
 			    int argc, char **argv, double *dblPtr,
 			    int *intPtr));
+EXTERN int		Tk_GetScrollInfoObj _ANSI_ARGS_((Tcl_Interp *interp,
+			    int objc, Tcl_Obj *CONST objv[], double *dblPtr,
+			    int *intPtr));
 EXTERN int		Tk_GetScreenMM _ANSI_ARGS_((Tcl_Interp *interp,
 			    Tk_Window tkwin, char *string, double *doublePtr));
 EXTERN int		Tk_GetSelection _ANSI_ARGS_((Tcl_Interp *interp,
 			    Tk_Window tkwin, Atom selection, Atom target,
 			    Tk_GetSelProc *proc, ClientData clientData));
-EXTERN int		Tk_GetState _ANSI_ARGS_((Tcl_Interp *interp,
-			    char *name, int *statePtr));
 EXTERN Tk_Uid		Tk_GetUid _ANSI_ARGS_((CONST char *string));
 EXTERN Visual *		Tk_GetVisual _ANSI_ARGS_((Tcl_Interp *interp,
 			    Tk_Window tkwin, char *string, int *depthPtr,
@@ -1575,7 +1566,6 @@ EXTERN char *		Tk_NameOfImage _ANSI_ARGS_((
 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_NameOfState _ANSI_ARGS_((int state));
 EXTERN Tk_Window	Tk_NameToWindow _ANSI_ARGS_((Tcl_Interp *interp,
 			    char *pathName, Tk_Window tkwin));
 EXTERN void		Tk_OwnSelection _ANSI_ARGS_((Tk_Window tkwin,
@@ -1713,8 +1703,9 @@ EXTERN int              Tk_ChooseFontObjCmd _ANSI_ARGS_((ClientData clientData,
 			    Tcl_Obj *CONST objv[]));
 EXTERN int		Tk_DestroyCmd _ANSI_ARGS_((ClientData clientData,
 			    Tcl_Interp *interp, int argc, char **argv));
-EXTERN int		Tk_EntryCmd _ANSI_ARGS_((ClientData clientData,
-			    Tcl_Interp *interp, int argc, char **argv));
+EXTERN int		Tk_EntryObjCmd _ANSI_ARGS_((ClientData clientData,
+			    Tcl_Interp *interp, int objc, 
+                            Tcl_Obj *CONST objv[]));
 EXTERN int		Tk_EventObjCmd _ANSI_ARGS_((ClientData clientData,
 			    Tcl_Interp *interp, int objc,
 			    Tcl_Obj *CONST objv[]));
diff --git a/generic/tkCanvArc.c b/generic/tkCanvArc.c
index 37e117e..d658384 100644
--- a/generic/tkCanvArc.c
+++ b/generic/tkCanvArc.c
@@ -9,7 +9,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkCanvArc.c,v 1.1.4.3 1998/12/13 08:16:01 lfb Exp $
+ * RCS: @(#) $Id: tkCanvArc.c,v 1.1.4.4 1999/02/16 11:39:30 lfb Exp $
  */
 
 #include <stdio.h>
@@ -168,17 +168,6 @@ Tk_ItemType tkArcType = {
 #    define PI 3.14159265358979323846
 #endif
 
-/*
- * The uid's below comprise the legal values for the "-style"
- * option for arcs.
- */
-
-static Tk_Uid arcUid =  NULL;
-static Tk_Uid chordUid =  NULL;
-static Tk_Uid pieSliceUid = NULL;
-
-TCL_DECLARE_MUTEX(arcMutex)   /* Used to guard access to Tk_Uids above.*/
-
 
 /*
  *--------------------------------------------------------------
@@ -221,20 +210,6 @@ CreateArc(interp, canvas, itemPtr, argc, argv)
     }
 
     /*
-     * Carry out once-only initialization.
-     */
-
-    if (pieSliceUid == NULL) {
-        Tcl_MutexLock(&arcMutex);
-	if (pieSliceUid == NULL) {
-	    arcUid = Tk_GetUid("arc");
-	    chordUid = Tk_GetUid("chord");
-	    pieSliceUid = Tk_GetUid("pieslice");
-	}
-        Tcl_MutexUnlock(&arcMutex);
-    }
-
-    /*
      * Carry out initialization that is needed in order to clean
      * up after errors during the the remainder of this procedure.
      */
@@ -248,7 +223,7 @@ CreateArc(interp, canvas, itemPtr, argc, argv)
     arcPtr->fillColor = NULL;
     arcPtr->fillStipple = None;
     arcPtr->outlineStipple = None;
-    arcPtr->style = pieSliceUid;
+    arcPtr->style = Tk_GetUid("pieslice");
     arcPtr->outlineGC = None;
     arcPtr->fillGC = None;
 
@@ -389,12 +364,13 @@ ConfigureArc(interp, canvas, itemPtr, argc, argv, flags)
     i = (int) (arcPtr->extent/360.0);
     arcPtr->extent -= i*360.0;
 
-    if ((arcPtr->style != arcUid) && (arcPtr->style != chordUid)
-	    && (arcPtr->style != pieSliceUid)) {
+    if ((arcPtr->style != Tk_GetUid("arc")) 
+            && (arcPtr->style != Tk_GetUid("chord"))
+	    && (arcPtr->style != Tk_GetUid("pieslice"))) {
 	Tcl_AppendResult(interp, "bad -style option \"",
 		arcPtr->style, "\": must be arc, chord, or pieslice",
 		(char *) NULL);
-	arcPtr->style = pieSliceUid;
+	arcPtr->style = Tk_GetUid("pieslice");
 	return TCL_ERROR;
     }
 
@@ -420,11 +396,11 @@ ConfigureArc(interp, canvas, itemPtr, argc, argv, flags)
     }
     arcPtr->outlineGC = newGC;
 
-    if ((arcPtr->fillColor == NULL) || (arcPtr->style == arcUid)) {
+    if ((arcPtr->fillColor == NULL) || (arcPtr->style == Tk_GetUid("arc"))) {
 	newGC = None;
     } else {
 	gcValues.foreground = arcPtr->fillColor->pixel;
-	if (arcPtr->style == chordUid) {
+	if (arcPtr->style == Tk_GetUid("chord")) {
 	    gcValues.arc_mode = ArcChord;
 	} else {
 	    gcValues.arc_mode = ArcPieSlice;
@@ -553,7 +529,7 @@ ComputeArcBbox(canvas, arcPtr)
     TkIncludePoint((Tk_Item *) arcPtr, arcPtr->center2);
     center[0] = (arcPtr->bbox[0] + arcPtr->bbox[2])/2;
     center[1] = (arcPtr->bbox[1] + arcPtr->bbox[3])/2;
-    if (arcPtr->style == pieSliceUid) {
+    if (arcPtr->style == Tk_GetUid("pieslice")) {
 	TkIncludePoint((Tk_Item *) arcPtr, center);
     }
 
@@ -697,10 +673,10 @@ DisplayArc(canvas, itemPtr, display, drawable, x, y, width, height)
 	    Tk_CanvasDrawableCoords(canvas, arcPtr->center2[0],
 		    arcPtr->center2[1], &x2, &y2);
 
-	    if (arcPtr->style == chordUid) {
+	    if (arcPtr->style == Tk_GetUid("chord")) {
 		XDrawLine(display, drawable, arcPtr->outlineGC,
 			x1, y1, x2, y2);
-	    } else if (arcPtr->style == pieSliceUid) {
+	    } else if (arcPtr->style == Tk_GetUid("pieslice")) {
 		short cx, cy;
 
 		Tk_CanvasDrawableCoords(canvas,
@@ -712,10 +688,10 @@ DisplayArc(canvas, itemPtr, display, drawable, x, y, width, height)
 			cx, cy, x2, y2);
 	    }
 	} else {
-	    if (arcPtr->style == chordUid) {
+	    if (arcPtr->style == Tk_GetUid("chord")) {
 		TkFillPolygon(canvas, arcPtr->outlinePtr, CHORD_OUTLINE_PTS,
 			display, drawable, arcPtr->outlineGC, None);
-	    } else if (arcPtr->style == pieSliceUid) {
+	    } else if (arcPtr->style == Tk_GetUid("pieslice")) {
 		TkFillPolygon(canvas, arcPtr->outlinePtr, PIE_OUTLINE1_PTS,
 			display, drawable, arcPtr->outlineGC, None);
 		TkFillPolygon(canvas, arcPtr->outlinePtr + 2*PIE_OUTLINE1_PTS,
@@ -793,7 +769,7 @@ ArcToPoint(canvas, itemPtr, pointPtr)
      * we're dealing with.
      */
 
-    if (arcPtr->style == arcUid) {
+    if (arcPtr->style == Tk_GetUid("arc")) {
 	if (angleInRange) {
 	    return TkOvalToPoint(arcPtr->bbox, (double) arcPtr->width,
 		    0, pointPtr);
@@ -819,7 +795,7 @@ ArcToPoint(canvas, itemPtr, pointPtr)
 	width = arcPtr->width;
     }
 
-    if (arcPtr->style == pieSliceUid) {
+    if (arcPtr->style == Tk_GetUid("pieslice")) {
 	if (width > 1.0) {
 	    dist = TkPolygonToPoint(arcPtr->outlinePtr, PIE_OUTLINE1_PTS,
 		    pointPtr);
@@ -974,7 +950,7 @@ ArcToArea(canvas, itemPtr, rectPtr)
     numPoints = 2;
     pointPtr += 4;
 
-    if ((arcPtr->style == pieSliceUid) && (arcPtr->extent < 180.0)) {
+    if ((arcPtr->style == Tk_GetUid("pieslice")) && (arcPtr->extent < 180.0)) {
 	pointPtr[0] = 0.0;
 	pointPtr[1] = 0.0;
 	numPoints++;
@@ -1048,7 +1024,7 @@ ArcToArea(canvas, itemPtr, rectPtr)
      * polygon(s) forming the sides of a chord or pie-slice.
      */
 
-    if (arcPtr->style == pieSliceUid) {
+    if (arcPtr->style == Tk_GetUid("pieslice")) {
 	if (width >= 1.0) {
 	    if (TkPolygonToArea(arcPtr->outlinePtr, PIE_OUTLINE1_PTS,
 		    rectPtr) != -1)  {
@@ -1064,7 +1040,7 @@ ArcToArea(canvas, itemPtr, rectPtr)
 		return 0;
 	    }
 	}
-    } else if (arcPtr->style == chordUid) {
+    } else if (arcPtr->style == Tk_GetUid("chord")) {
 	if (width >= 1.0) {
 	    if (TkPolygonToArea(arcPtr->outlinePtr, CHORD_OUTLINE_PTS,
 		    rectPtr) != -1) {
@@ -1315,7 +1291,7 @@ ComputeArcOutline(arcPtr)
      * center point.  The second point is the corner point.
      */
 
-    if (arcPtr->style == chordUid) {
+    if (arcPtr->style == Tk_GetUid("chord")) {
 	outlinePtr[0] = outlinePtr[12] = corner1[0];
 	outlinePtr[1] = outlinePtr[13] = corner1[1];
 	TkGetButtPoints(arcPtr->center2, arcPtr->center1,
@@ -1330,7 +1306,7 @@ ComputeArcOutline(arcPtr)
 		- arcPtr->center1[0];
 	outlinePtr[9] = arcPtr->center2[1] + outlinePtr[11]
 		- arcPtr->center1[1];
-    } else if (arcPtr->style == pieSliceUid) {
+    } else if (arcPtr->style == Tk_GetUid("pieslice")) {
 	/*
 	 * For pie slices, generate two polygons, one for each side
 	 * of the pie slice.  The first arm has a shape like this,
@@ -1626,7 +1602,7 @@ ArcToPostscript(interp, canvas, itemPtr, prepass)
 		(arcPtr->bbox[0] + arcPtr->bbox[2])/2, (y1 + y2)/2,
 		(arcPtr->bbox[2] - arcPtr->bbox[0])/2, (y1 - y2)/2);
 	Tcl_AppendResult(interp, buffer, (char *) NULL);
-	if (arcPtr->style == chordUid) {
+	if (arcPtr->style == Tk_GetUid("chord")) {
 	    sprintf(buffer, "0 0 1 %.15g %.15g arc closepath\nsetmatrix\n",
 		    ang1, ang2);
 	} else {
@@ -1678,9 +1654,9 @@ ArcToPostscript(interp, canvas, itemPtr, prepass)
 	} else {
 	    Tcl_AppendResult(interp, "stroke\n", (char *) NULL);
 	}
-	if (arcPtr->style != arcUid) {
+	if (arcPtr->style != Tk_GetUid("arc")) {
 	    Tcl_AppendResult(interp, "grestore gsave\n", (char *) NULL);
-	    if (arcPtr->style == chordUid) {
+	    if (arcPtr->style == Tk_GetUid("chord")) {
 		Tk_CanvasPsPath(interp, canvas, arcPtr->outlinePtr,
 			CHORD_OUTLINE_PTS);
 	    } else {
diff --git a/generic/tkCanvLine.c b/generic/tkCanvLine.c
index a9601d5..81b7ecb 100644
--- a/generic/tkCanvLine.c
+++ b/generic/tkCanvLine.c
@@ -10,7 +10,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkCanvLine.c,v 1.1.4.4 1999/02/11 04:13:45 stanton Exp $
+ * RCS: @(#) $Id: tkCanvLine.c,v 1.1.4.5 1999/02/16 11:39:30 lfb Exp $
  */
 
 #include <stdio.h>
@@ -181,17 +181,6 @@ Tk_ItemType tkLineType = {
 };
 
 /*
- * The Tk_Uid's below refer to uids for the various arrow types:
- */
-
-static Tk_Uid noneUid = NULL;
-static Tk_Uid firstUid = NULL;
-static Tk_Uid lastUid = NULL;
-static Tk_Uid bothUid = NULL;
-
-TCL_DECLARE_MUTEX(lineMutex)  /* Used to guard access to Tk_Uids above.*/
-
-/*
  * The definition below determines how large are static arrays
  * used to hold spline points (splines larger than this have to
  * have their arrays malloc-ed).
@@ -255,15 +244,7 @@ CreateLine(interp, canvas, itemPtr, argc, argv)
     linePtr->joinStyle = JoinRound;
     linePtr->gc = None;
     linePtr->arrowGC = None;
-    if (bothUid == NULL) {
-        Tcl_MutexLock(&lineMutex);
-	noneUid = Tk_GetUid("none");
-	firstUid = Tk_GetUid("first");
-	lastUid = Tk_GetUid("last");
-	bothUid = Tk_GetUid("both");
-        Tcl_MutexUnlock(&lineMutex);
-    }
-    linePtr->arrow = noneUid;
+    linePtr->arrow = Tk_GetUid("none");
     linePtr->arrowShapeA = (float)8.0;
     linePtr->arrowShapeB = (float)10.0;
     linePtr->arrowShapeC = (float)3.0;
@@ -390,7 +371,7 @@ LineCoords(interp, canvas, itemPtr, argc, argv)
 	    ckfree((char *) linePtr->lastArrowPtr);
 	    linePtr->lastArrowPtr = NULL;
 	}
-	if (linePtr->arrow != noneUid) {
+	if (linePtr->arrow != Tk_GetUid("none")) {
 	    ConfigureArrows(canvas, linePtr);
 	}
 	ComputeLineBbox(canvas, linePtr);
@@ -431,6 +412,10 @@ ConfigureLine(interp, canvas, itemPtr, argc, argv, flags)
     GC newGC, arrowGC;
     unsigned long mask;
     Tk_Window tkwin;
+    Tk_Uid noneUid = Tk_GetUid("none");
+    Tk_Uid bothUid = Tk_GetUid("both");
+    Tk_Uid firstUid = Tk_GetUid("first");
+    Tk_Uid lastUid = Tk_GetUid("last");
 
     tkwin = Tk_CanvasTkwin(canvas);
     if (Tk_ConfigureWidget(interp, tkwin, configSpecs, argc, argv,
@@ -498,8 +483,8 @@ ConfigureLine(interp, canvas, itemPtr, argc, argv, flags)
 	ckfree((char *) linePtr->firstArrowPtr);
 	linePtr->firstArrowPtr = NULL;
     }
-    if ((linePtr->lastArrowPtr != NULL) && (linePtr->arrow != lastUid)
-	    && (linePtr->arrow != bothUid)) {
+    if ((linePtr->lastArrowPtr != NULL) && (linePtr->arrow != lastUid) 
+            && (linePtr->arrow != bothUid)) {
 	int i;
 
 	i = 2*(linePtr->numPoints-1);
@@ -510,7 +495,7 @@ ConfigureLine(interp, canvas, itemPtr, argc, argv, flags)
     }
     if (linePtr->arrow != noneUid) {
 	if ((linePtr->arrow != firstUid) && (linePtr->arrow != lastUid)
-		&& (linePtr->arrow != bothUid)) {
+       	        && (linePtr->arrow != bothUid)) {
 	    Tcl_AppendResult(interp, "bad arrow spec \"",
 		    linePtr->arrow, "\": must be none, first, last, or both",
 		    (char *) NULL);
@@ -657,14 +642,14 @@ ComputeLineBbox(canvas, linePtr)
      * Add in the sizes of arrowheads, if any.
      */
 
-    if (linePtr->arrow != noneUid) {
-	if (linePtr->arrow != lastUid) {
+    if (linePtr->arrow != Tk_GetUid("none")) {
+	if (linePtr->arrow != Tk_GetUid("last")) {
 	    for (i = 0, coordPtr = linePtr->firstArrowPtr; i < PTS_IN_ARROW;
 		    i++, coordPtr += 2) {
 		TkIncludePoint((Tk_Item *) linePtr, coordPtr);
 	    }
 	}
-	if (linePtr->arrow != firstUid) {
+	if (linePtr->arrow != Tk_GetUid("first")) {
 	    for (i = 0, coordPtr = linePtr->lastArrowPtr; i < PTS_IN_ARROW;
 		    i++, coordPtr += 2) {
 		TkIncludePoint((Tk_Item *) linePtr, coordPtr);
@@ -965,8 +950,8 @@ LineToPoint(canvas, itemPtr, pointPtr)
      * If there are arrowheads, check the distance to the arrowheads.
      */
 
-    if (linePtr->arrow != noneUid) {
-	if (linePtr->arrow != lastUid) {
+    if (linePtr->arrow != Tk_GetUid("none")) {
+	if (linePtr->arrow != Tk_GetUid("last")) {
 	    dist = TkPolygonToPoint(linePtr->firstArrowPtr, PTS_IN_ARROW,
 		    pointPtr);
 	    if (dist <= 0.0) {
@@ -976,7 +961,7 @@ LineToPoint(canvas, itemPtr, pointPtr)
 		bestDist = dist;
 	    }
 	}
-	if (linePtr->arrow != firstUid) {
+	if (linePtr->arrow != Tk_GetUid("first")) {
 	    dist = TkPolygonToPoint(linePtr->lastArrowPtr, PTS_IN_ARROW,
 		    pointPtr);
 	    if (dist <= 0.0) {
@@ -1069,15 +1054,15 @@ LineToArea(canvas, itemPtr, rectPtr)
      * Check arrowheads, if any.
      */
 
-    if (linePtr->arrow != noneUid) {
-	if (linePtr->arrow != lastUid) {
+    if (linePtr->arrow != Tk_GetUid("none")) {
+	if (linePtr->arrow != Tk_GetUid("last")) {
 	    if (TkPolygonToArea(linePtr->firstArrowPtr, PTS_IN_ARROW,
 		    rectPtr) != result) {
 		result = 0;
 		goto done;
 	    }
 	}
-	if (linePtr->arrow != firstUid) {
+	if (linePtr->arrow != Tk_GetUid("first")) {
 	    if (TkPolygonToArea(linePtr->lastArrowPtr, PTS_IN_ARROW,
 		    rectPtr) != result) {
 		result = 0;
@@ -1150,7 +1135,7 @@ ScaleLine(canvas, itemPtr, originX, originY, scaleX, scaleY)
 	coordPtr[0] = originX + scaleX*(*coordPtr - originX);
 	coordPtr[1] = originY + scaleY*(coordPtr[1] - originY);
     }
-    if (linePtr->arrow != noneUid) {
+    if (linePtr->arrow != Tk_GetUid("none")) {
 	ConfigureArrows(canvas, linePtr);
     }
     ComputeLineBbox(canvas, linePtr);
@@ -1371,7 +1356,7 @@ ConfigureArrows(canvas, linePtr)
 
     fracHeight = (linePtr->width/2.0)/shapeC;
     backup = fracHeight*shapeB + shapeA*(1.0 - fracHeight)/2.0;
-    if (linePtr->arrow != lastUid) {
+    if (linePtr->arrow != Tk_GetUid("last")) {
 	poly = linePtr->firstArrowPtr;
 	if (poly == NULL) {
 	    poly = (double *) ckalloc((unsigned)
@@ -1416,7 +1401,7 @@ ConfigureArrows(canvas, linePtr)
      * Similar arrowhead calculation for the last point of the line.
      */
 
-    if (linePtr->arrow != firstUid) {
+    if (linePtr->arrow != Tk_GetUid("first")) {
 	coordPtr = linePtr->coordPtr + 2*(linePtr->numPoints-2);
 	poly = linePtr->lastArrowPtr;
 	if (poly == NULL) {
diff --git a/generic/tkCanvas.c b/generic/tkCanvas.c
index 601ef15..48ee754 100644
--- a/generic/tkCanvas.c
+++ b/generic/tkCanvas.c
@@ -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: tkCanvas.c,v 1.1.4.4 1998/12/13 08:16:02 lfb Exp $
+ * RCS: @(#) $Id: tkCanvas.c,v 1.1.4.5 1999/02/16 11:39:30 lfb Exp $
  */
 
 #include "default.h"
@@ -152,13 +152,6 @@ extern Tk_ItemType tkOvalType, tkPolygonType;
 extern Tk_ItemType tkRectangleType, tkTextType, tkWindowType;
 
 /*
- * Various Tk_Uid's used by this module (set up during initialization):
- */
-
-static Tk_Uid allUid = NULL;
-static Tk_Uid currentUid = NULL;
-
-/*
  * Prototypes for procedures defined later in this file:
  */
 
@@ -2164,8 +2157,6 @@ InitCanvas()
     tkBitmapType.nextPtr = &tkArcType;
     tkArcType.nextPtr = &tkWindowType;
     tkWindowType.nextPtr = NULL;
-    allUid = Tk_GetUid("all");
-    currentUid = Tk_GetUid("current");
 }
 
 /*
@@ -2255,7 +2246,7 @@ StartTagSearch(canvasPtr, tag, searchPtr)
     }
 
     searchPtr->tag = uid = Tk_GetUid(tag);
-    if (uid == allUid) {
+    if (uid == Tk_GetUid("all")) {
 
 	/*
 	 * All items match.
@@ -3143,7 +3134,7 @@ PickCurrentItem(canvasPtr, eventPtr)
 
 	if ((itemPtr == canvasPtr->currentItemPtr) && !buttonDown) {
 	    for (i = itemPtr->numTags-1; i >= 0; i--) {
-		if (itemPtr->tagPtr[i] == currentUid) {
+		if (itemPtr->tagPtr[i] == Tk_GetUid("current")) {
 		    itemPtr->tagPtr[i] = itemPtr->tagPtr[itemPtr->numTags-1];
 		    itemPtr->numTags--;
 		    break;
@@ -3173,7 +3164,8 @@ PickCurrentItem(canvasPtr, eventPtr)
     if (canvasPtr->currentItemPtr != NULL) {
 	XEvent event;
 
-	DoItem((Tcl_Interp *) NULL, canvasPtr->currentItemPtr, currentUid);
+	DoItem((Tcl_Interp *) NULL, canvasPtr->currentItemPtr, 
+                Tk_GetUid("current"));
 	event = canvasPtr->pickEvent;
 	event.type = EnterNotify;
 	event.xcrossing.detail = NotifyAncestor;
@@ -3289,7 +3281,7 @@ CanvasDoEvent(canvasPtr, eventPtr)
 	objectPtr = (ClientData *) ckalloc((unsigned)
 		(numObjects * sizeof(ClientData)));
     }
-    objectPtr[0] = (ClientData) allUid;
+    objectPtr[0] = (ClientData) Tk_GetUid("all");
     for (i = itemPtr->numTags-1; i >= 0; i--) {
 	objectPtr[i+1] = (ClientData) itemPtr->tagPtr[i];
     }
diff --git a/generic/tkCmds.c b/generic/tkCmds.c
index 216dc1a..9d40616 100644
--- a/generic/tkCmds.c
+++ b/generic/tkCmds.c
@@ -10,7 +10,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkCmds.c,v 1.1.4.3 1998/12/13 08:16:03 lfb Exp $
+ * RCS: @(#) $Id: tkCmds.c,v 1.1.4.4 1999/02/16 11:39:31 lfb Exp $
  */
 
 #include "tkPort.h"
@@ -184,7 +184,6 @@ TkBindEventProc(winPtr, eventPtr)
 {
 #define MAX_OBJS 20
     ClientData objects[MAX_OBJS], *objPtr;
-    static Tk_Uid allUid = NULL;
     TkWindow *topLevPtr;
     int i, count;
     char *p;
@@ -232,10 +231,7 @@ TkBindEventProc(winPtr, eventPtr)
 	} else {
 	    count = 3;
 	}
-	if (allUid == NULL) {
-	    allUid = Tk_GetUid("all");
-	}
-	objPtr[count-1] = (ClientData) allUid;
+	objPtr[count-1] = (ClientData) Tk_GetUid("all");
     }
     Tk_BindEvent(winPtr->mainPtr->bindingTable, eventPtr, (Tk_Window) winPtr,
 	    count, objPtr);
diff --git a/generic/tkEntry.c b/generic/tkEntry.c
index 7ccd73a..cedd835 100644
--- a/generic/tkEntry.c
+++ b/generic/tkEntry.c
@@ -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: tkEntry.c,v 1.1.4.3 1999/01/07 02:42:49 lfb Exp $
+ * RCS: @(#) $Id: tkEntry.c,v 1.1.4.4 1999/02/16 11:39:31 lfb Exp $
  */
 
 #include "tkInt.h"
@@ -32,6 +32,9 @@ typedef struct {
 				 * freed even after tkwin has gone away. */
     Tcl_Interp *interp;		/* Interpreter associated with entry. */
     Tcl_Command widgetCmd;	/* Token for entry's widget command. */
+    Tk_OptionTable optionTable;	/* Table that defines configuration options
+				 * available for this widget. */
+
 
     /*
      * Fields that are set by widget commands other than "configure".
@@ -174,6 +177,7 @@ typedef struct {
 #define GOT_FOCUS		8
 #define UPDATE_SCROLLBAR	0x10
 #define GOT_SELECTION		0x20
+#define ENTRY_DELETED           0x40
 
 /*
  * The following macro defines how many extra pixels to leave on each
@@ -184,93 +188,108 @@ typedef struct {
 #define YPAD 1
 
 /*
+ * The following enum is used to define a type for the -state option
+ * of the Entry widget.  These values are used as indices into the 
+ * string table below.
+ */
+
+enum state {
+    STATE_DISABLED, STATE_NORMAL
+};
+
+static char *stateStrings[] = {
+    "disabled", "normal", (char *) NULL
+};
+
+/*
  * Information used for argv parsing.
  */
 
-static Tk_ConfigSpec configSpecs[] = {
-    {TK_CONFIG_BORDER, "-background", "background", "Background",
-	DEF_ENTRY_BG_COLOR, Tk_Offset(Entry, normalBorder),
-	TK_CONFIG_COLOR_ONLY},
-    {TK_CONFIG_BORDER, "-background", "background", "Background",
-	DEF_ENTRY_BG_MONO, Tk_Offset(Entry, normalBorder),
-	TK_CONFIG_MONO_ONLY},
-    {TK_CONFIG_SYNONYM, "-bd", "borderWidth", (char *) NULL,
-	(char *) NULL, 0, 0},
-    {TK_CONFIG_SYNONYM, "-bg", "background", (char *) NULL,
-	(char *) NULL, 0, 0},
-    {TK_CONFIG_PIXELS, "-borderwidth", "borderWidth", "BorderWidth",
-	DEF_ENTRY_BORDER_WIDTH, Tk_Offset(Entry, borderWidth), 0},
-    {TK_CONFIG_ACTIVE_CURSOR, "-cursor", "cursor", "Cursor",
-	DEF_ENTRY_CURSOR, Tk_Offset(Entry, cursor), TK_CONFIG_NULL_OK},
-    {TK_CONFIG_BOOLEAN, "-exportselection", "exportSelection",
-	"ExportSelection", DEF_ENTRY_EXPORT_SELECTION,
-	Tk_Offset(Entry, exportSelection), 0},
-    {TK_CONFIG_SYNONYM, "-fg", "foreground", (char *) NULL,
-	(char *) NULL, 0, 0},
-    {TK_CONFIG_FONT, "-font", "font", "Font",
-	DEF_ENTRY_FONT, Tk_Offset(Entry, tkfont), 0},
-    {TK_CONFIG_COLOR, "-foreground", "foreground", "Foreground",
-	DEF_ENTRY_FG, Tk_Offset(Entry, fgColorPtr), 0},
-    {TK_CONFIG_COLOR, "-highlightbackground", "highlightBackground",
+static Tk_OptionSpec optionSpecs[] = {
+    {TK_OPTION_BORDER, "-background", "background", "Background",
+	DEF_ENTRY_BG_COLOR, -1, Tk_Offset(Entry, normalBorder),
+	0, (ClientData) DEF_ENTRY_BG_MONO, 0},
+    {TK_OPTION_SYNONYM, "-bd", (char *) NULL, (char *) NULL,
+	(char *) NULL, 0, -1, 0, (ClientData) "-borderwidth", 0},
+    {TK_OPTION_SYNONYM, "-bg", (char *) NULL, (char *) NULL,
+	(char *) NULL, 0, -1, 0, (ClientData) "-background", 0},
+    {TK_OPTION_PIXELS, "-borderwidth", "borderWidth", "BorderWidth",
+	DEF_ENTRY_BORDER_WIDTH, -1, Tk_Offset(Entry, borderWidth), 
+        0, 0, 0},
+    {TK_OPTION_CURSOR, "-cursor", "cursor", "Cursor",
+	DEF_ENTRY_CURSOR, -1, Tk_Offset(Entry, cursor),
+	TK_OPTION_NULL_OK, 0, 0},
+    {TK_OPTION_BOOLEAN, "-exportselection", "exportSelection",
+        "ExportSelection", DEF_ENTRY_EXPORT_SELECTION, -1, 
+        Tk_Offset(Entry, exportSelection), 0, 0, 0},
+    {TK_OPTION_SYNONYM, "-fg", "foreground", (char *) NULL,
+	(char *) NULL, 0, -1, 0, (ClientData) "-foreground", 0},
+    {TK_OPTION_FONT, "-font", "font", "Font",
+	DEF_ENTRY_FONT, -1, Tk_Offset(Entry, tkfont), 0, 0, 0},
+    {TK_OPTION_COLOR, "-foreground", "foreground", "Foreground",
+	DEF_ENTRY_FG, -1, Tk_Offset(Entry, fgColorPtr), 0, 
+        0, 0},
+    {TK_OPTION_COLOR, "-highlightbackground", "highlightBackground",
 	"HighlightBackground", DEF_ENTRY_HIGHLIGHT_BG,
-	Tk_Offset(Entry, highlightBgColorPtr), 0},
-    {TK_CONFIG_COLOR, "-highlightcolor", "highlightColor", "HighlightColor",
-	DEF_ENTRY_HIGHLIGHT, Tk_Offset(Entry, highlightColorPtr), 0},
-    {TK_CONFIG_PIXELS, "-highlightthickness", "highlightThickness",
-	"HighlightThickness",
-	DEF_ENTRY_HIGHLIGHT_WIDTH, Tk_Offset(Entry, highlightWidth), 0},
-    {TK_CONFIG_BORDER, "-insertbackground", "insertBackground", "Foreground",
-	DEF_ENTRY_INSERT_BG, Tk_Offset(Entry, insertBorder), 0},
-    {TK_CONFIG_PIXELS, "-insertborderwidth", "insertBorderWidth", "BorderWidth",
-	DEF_ENTRY_INSERT_BD_COLOR, Tk_Offset(Entry, insertBorderWidth),
-	TK_CONFIG_COLOR_ONLY},
-    {TK_CONFIG_PIXELS, "-insertborderwidth", "insertBorderWidth", "BorderWidth",
-	DEF_ENTRY_INSERT_BD_MONO, Tk_Offset(Entry, insertBorderWidth),
-	TK_CONFIG_MONO_ONLY},
-    {TK_CONFIG_INT, "-insertofftime", "insertOffTime", "OffTime",
-	DEF_ENTRY_INSERT_OFF_TIME, Tk_Offset(Entry, insertOffTime), 0},
-    {TK_CONFIG_INT, "-insertontime", "insertOnTime", "OnTime",
-	DEF_ENTRY_INSERT_ON_TIME, Tk_Offset(Entry, insertOnTime), 0},
-    {TK_CONFIG_PIXELS, "-insertwidth", "insertWidth", "InsertWidth",
-	DEF_ENTRY_INSERT_WIDTH, Tk_Offset(Entry, insertWidth), 0},
-    {TK_CONFIG_JUSTIFY, "-justify", "justify", "Justify",
-	DEF_ENTRY_JUSTIFY, Tk_Offset(Entry, justify), 0},
-    {TK_CONFIG_RELIEF, "-relief", "relief", "Relief",
-	DEF_ENTRY_RELIEF, Tk_Offset(Entry, relief), 0},
-    {TK_CONFIG_BORDER, "-selectbackground", "selectBackground", "Foreground",
-	DEF_ENTRY_SELECT_COLOR, Tk_Offset(Entry, selBorder),
-	TK_CONFIG_COLOR_ONLY},
-    {TK_CONFIG_BORDER, "-selectbackground", "selectBackground", "Foreground",
-	DEF_ENTRY_SELECT_MONO, Tk_Offset(Entry, selBorder),
-	TK_CONFIG_MONO_ONLY},
-    {TK_CONFIG_PIXELS, "-selectborderwidth", "selectBorderWidth", "BorderWidth",
-	DEF_ENTRY_SELECT_BD_COLOR, Tk_Offset(Entry, selBorderWidth),
-	TK_CONFIG_COLOR_ONLY},
-    {TK_CONFIG_PIXELS, "-selectborderwidth", "selectBorderWidth", "BorderWidth",
-	DEF_ENTRY_SELECT_BD_MONO, Tk_Offset(Entry, selBorderWidth),
-	TK_CONFIG_MONO_ONLY},
-    {TK_CONFIG_COLOR, "-selectforeground", "selectForeground", "Background",
-	DEF_ENTRY_SELECT_FG_COLOR, Tk_Offset(Entry, selFgColorPtr),
-	TK_CONFIG_COLOR_ONLY},
-    {TK_CONFIG_COLOR, "-selectforeground", "selectForeground", "Background",
-	DEF_ENTRY_SELECT_FG_MONO, Tk_Offset(Entry, selFgColorPtr),
-	TK_CONFIG_MONO_ONLY},
+	-1, Tk_Offset(Entry, highlightBgColorPtr), 
+        0, 0, 0},
+    {TK_OPTION_COLOR, "-highlightcolor", "highlightColor", "HighlightColor",
+	DEF_ENTRY_HIGHLIGHT, -1, Tk_Offset(Entry, highlightColorPtr),
+	0, 0, 0},
+    {TK_OPTION_PIXELS, "-highlightthickness", "highlightThickness",
+	"HighlightThickness", DEF_ENTRY_HIGHLIGHT_WIDTH, -1, 
+	Tk_Offset(Entry, highlightWidth), 0, 0, 0},
+    {TK_OPTION_BORDER, "-insertbackground", "insertBackground", "Foreground",
+	DEF_ENTRY_INSERT_BG,
+	-1, Tk_Offset(Entry, insertBorder), 
+        0, 0, 0},
+    {TK_OPTION_PIXELS, "-insertborderwidth", "insertBorderWidth", 
+        "BorderWidth", DEF_ENTRY_INSERT_BD_COLOR, -1, 
+        Tk_Offset(Entry, insertBorderWidth), 0, 
+        (ClientData) DEF_ENTRY_INSERT_BD_MONO, 0},
+    {TK_OPTION_INT, "-insertofftime", "insertOffTime", "OffTime",
+        DEF_ENTRY_INSERT_OFF_TIME, -1, Tk_Offset(Entry, insertOffTime), 
+        0, 0, 0},
+    {TK_OPTION_INT, "-insertontime", "insertOnTime", "OnTime",
+        DEF_ENTRY_INSERT_ON_TIME, -1, Tk_Offset(Entry, insertOnTime), 
+        0, 0, 0},
+    {TK_OPTION_PIXELS, "-insertwidth", "insertWidth", "InsertWidth",
+	DEF_ENTRY_INSERT_WIDTH, -1, Tk_Offset(Entry, insertWidth), 
+        0, 0, 0},
+    {TK_OPTION_JUSTIFY, "-justify", "justify", "Justify",
+	DEF_ENTRY_JUSTIFY, -1, Tk_Offset(Entry, justify), 0, 0, 0},
+    {TK_OPTION_RELIEF, "-relief", "relief", "Relief",
+	DEF_ENTRY_RELIEF, -1, Tk_Offset(Entry, relief), 
+        0, 0, 0},
+    {TK_OPTION_BORDER, "-selectbackground", "selectBackground", "Foreground",
+        DEF_ENTRY_SELECT_COLOR, -1, Tk_Offset(Entry, selBorder),
+        0, (ClientData) DEF_ENTRY_SELECT_MONO, 0},
+    {TK_OPTION_PIXELS, "-selectborderwidth", "selectBorderWidth", 
+        "BorderWidth", DEF_ENTRY_SELECT_BD_COLOR, -1, 
+        Tk_Offset(Entry, selBorderWidth), 
+        0, (ClientData) DEF_ENTRY_SELECT_BD_MONO, 0},
+    {TK_OPTION_COLOR, "-selectforeground", "selectForeground", "Background",
+	DEF_ENTRY_SELECT_FG_COLOR, -1, Tk_Offset(Entry, selFgColorPtr),
+	0, (ClientData) DEF_ENTRY_SELECT_FG_MONO, 0},
     {TK_CONFIG_STRING, "-show", "show", "Show",
-	DEF_ENTRY_SHOW, Tk_Offset(Entry, showChar), TK_CONFIG_NULL_OK},
-    {TK_CONFIG_STATE, "-state", "state", "State",
-	DEF_ENTRY_STATE, Tk_Offset(Entry, state), 0},
-    {TK_CONFIG_STRING, "-takefocus", "takeFocus", "TakeFocus",
-	DEF_ENTRY_TAKE_FOCUS, Tk_Offset(Entry, takeFocus), TK_CONFIG_NULL_OK},
-    {TK_CONFIG_STRING, "-textvariable", "textVariable", "Variable",
-	DEF_ENTRY_TEXT_VARIABLE, Tk_Offset(Entry, textVarName),
-	TK_CONFIG_NULL_OK},
-    {TK_CONFIG_INT, "-width", "width", "Width",
-	DEF_ENTRY_WIDTH, Tk_Offset(Entry, prefWidth), 0},
-    {TK_CONFIG_STRING, "-xscrollcommand", "xScrollCommand", "ScrollCommand",
-	DEF_ENTRY_SCROLL_COMMAND, Tk_Offset(Entry, scrollCmd),
-	TK_CONFIG_NULL_OK},
-    {TK_CONFIG_END, (char *) NULL, (char *) NULL, (char *) NULL,
-	(char *) NULL, 0, 0}
+        DEF_ENTRY_SHOW, -1, Tk_Offset(Entry, showChar), 
+        TK_OPTION_NULL_OK, 0, 0},
+    {TK_OPTION_STRING_TABLE, "-state", "state", "State",
+	DEF_ENTRY_STATE, -1, Tk_Offset(Entry, state), 
+        0, (ClientData) stateStrings, 0},
+    {TK_OPTION_STRING, "-takefocus", "takeFocus", "TakeFocus",
+	DEF_ENTRY_TAKE_FOCUS, -1, Tk_Offset(Entry, takeFocus), 
+        TK_CONFIG_NULL_OK, 0, 0},
+    {TK_OPTION_STRING, "-textvariable", "textVariable", "Variable",
+	DEF_ENTRY_TEXT_VARIABLE, -1, Tk_Offset(Entry, textVarName),
+	TK_CONFIG_NULL_OK, 0, 0},
+    {TK_OPTION_INT, "-width", "width", "Width",
+	DEF_ENTRY_WIDTH, -1, Tk_Offset(Entry, prefWidth), 0, 0, 0},
+    {TK_OPTION_STRING, "-xscrollcommand", "xScrollCommand", "ScrollCommand",
+	DEF_ENTRY_SCROLL_COMMAND, -1, Tk_Offset(Entry, scrollCmd),
+	TK_CONFIG_NULL_OK, 0, 0},
+    {TK_OPTION_END, (char *) NULL, (char *) NULL, (char *) NULL,
+	(char *) NULL, 0, -1, 0, 0, 0}
 };
 
 /*
@@ -281,12 +300,38 @@ static Tk_ConfigSpec configSpecs[] = {
 #define LAST_PLUS_ONE_OK	2
 
 /*
+ * The following tables define the entry widget commands (and sub-
+ * commands) and map the indexes into the string tables into 
+ * enumerated types used to dispatch the entry widget command.
+ */
+
+static char *commandNames[] = {
+    "bbox", "cget", "configure", "delete", "get", "icursor", "index", 
+    "insert", "scan", "selection", "xview", (char *) NULL
+};
+
+enum command {
+    COMMAND_BBOX, COMMAND_CGET, COMMAND_CONFIGURE, COMMAND_DELETE, 
+    COMMAND_GET, COMMAND_ICURSOR, COMMAND_INDEX, COMMAND_INSERT, 
+    COMMAND_SCAN, COMMAND_SELECTION, COMMAND_XVIEW
+};
+
+static char *selCommandNames[] = {
+    "adjust", "clear", "from", "present", "range", "to", (char *) NULL
+};
+
+enum selcommand {
+    SELECTION_ADJUST, SELECTION_CLEAR, SELECTION_FROM, 
+    SELECTION_PRESENT, SELECTION_RANGE, SELECTION_TO
+};
+
+/*
  * Forward declarations for procedures defined later in this file:
  */
 
 static int		ConfigureEntry _ANSI_ARGS_((Tcl_Interp *interp,
-			    Entry *entryPtr, int argc, char **argv,
-			    int flags));
+			    Entry *entryPtr, int objc, 
+                            Tcl_Obj *CONST objv[], int flags));
 static void		DeleteChars _ANSI_ARGS_((Entry *entryPtr, int index,
 			    int count));
 static void		DestroyEntry _ANSI_ARGS_((char *memPtr));
@@ -316,8 +361,9 @@ static void		EntryUpdateScrollbar _ANSI_ARGS_((Entry *entryPtr));
 static void		EntryValueChanged _ANSI_ARGS_((Entry *entryPtr));
 static void		EntryVisibleRange _ANSI_ARGS_((Entry *entryPtr,
 			    double *firstPtr, double *lastPtr));
-static int		EntryWidgetCmd _ANSI_ARGS_((ClientData clientData,
-			    Tcl_Interp *interp, int argc, char **argv));
+static int		EntryWidgetObjCmd _ANSI_ARGS_((ClientData clientData,
+			    Tcl_Interp *interp, int objc, 
+			    Tcl_Obj *CONST objv[]));
 static void		EntryWorldChanged _ANSI_ARGS_((
 			    ClientData instanceData));
 static int		GetEntryIndex _ANSI_ARGS_((Tcl_Interp *interp,
@@ -340,7 +386,7 @@ static TkClassProcs entryClass = {
 /*
  *--------------------------------------------------------------
  *
- * Tk_EntryCmd --
+ * Tk_EntryObjCmd --
  *
  *	This procedure is invoked to process the "entry" Tcl
  *	command.  See the user documentation for details on what
@@ -356,25 +402,43 @@ static TkClassProcs entryClass = {
  */
 
 int
-Tk_EntryCmd(clientData, interp, argc, argv)
-    ClientData clientData;	/* Main window associated with
-				 * interpreter. */
+Tk_EntryObjCmd(clientData, interp, objc, objv)
+    ClientData clientData;	/* Either NULL or pointer to option table. */
     Tcl_Interp *interp;		/* Current interpreter. */
-    int argc;			/* Number of arguments. */
-    char **argv;		/* Argument strings. */
+    int objc;			/* Number of arguments. */
+    Tcl_Obj *CONST objv[];      /* Argument objects. */
 {
-    Tk_Window tkwin = (Tk_Window) clientData;
-    Entry *entryPtr;
-    Tk_Window new;
+    register Entry *entryPtr;
+    Tk_OptionTable optionTable;
+    Tk_Window tkwin;
+
+    optionTable = (Tk_OptionTable) clientData;
+    if (optionTable == NULL) {
+	Tcl_CmdInfo info;
+	char *name;
 
-    if (argc < 2) {
-	Tcl_AppendResult(interp, "wrong # args: should be \"", argv[0],
-		" pathName ?options?\"", (char *) NULL);
+	/*
+	 * We haven't created the option table for this widget class
+	 * yet.  Do it now and save the table as the clientData for
+	 * the command, so we'll have access to it in future
+	 * invocations of the command.
+	 */
+
+	optionTable = Tk_CreateOptionTable(interp, optionSpecs);
+	name = Tcl_GetString(objv[0]);
+	Tcl_GetCommandInfo(interp, name, &info);
+	info.objClientData = (ClientData) optionTable;
+	Tcl_SetCommandInfo(interp, name, &info);
+    }
+
+    if (objc < 2) {
+	Tcl_WrongNumArgs(interp, 1, objv, "pathName ?options?");
 	return TCL_ERROR;
     }
 
-    new = Tk_CreateWindowFromPath(interp, tkwin, argv[1], (char *) NULL);
-    if (new == NULL) {
+    tkwin = Tk_CreateWindowFromPath(interp, Tk_MainWindow(interp),
+            Tcl_GetString(objv[1]), (char *) NULL);
+    if (tkwin == NULL) {
 	return TCL_ERROR;
     }
 
@@ -385,12 +449,13 @@ Tk_EntryCmd(clientData, interp, argc, argv)
      */
 
     entryPtr = (Entry *) ckalloc(sizeof(Entry));
-    entryPtr->tkwin = new;
-    entryPtr->display = Tk_Display(new);
+    entryPtr->tkwin = tkwin;
+    entryPtr->display = Tk_Display(tkwin);
     entryPtr->interp = interp;
-    entryPtr->widgetCmd = Tcl_CreateCommand(interp,
-	    Tk_PathName(entryPtr->tkwin), EntryWidgetCmd,
+    entryPtr->widgetCmd = Tcl_CreateObjCommand(interp,
+	    Tk_PathName(entryPtr->tkwin), EntryWidgetObjCmd,
 	    (ClientData) entryPtr, EntryCmdDeletedProc);
+    entryPtr->optionTable = optionTable;
     entryPtr->string = (char *) ckalloc(1);
     entryPtr->string[0] = '\0';
     entryPtr->insertPos = 0;
@@ -420,12 +485,11 @@ Tk_EntryCmd(clientData, interp, argc, argv)
     entryPtr->selBorderWidth = 0;
     entryPtr->selFgColorPtr = NULL;
     entryPtr->showChar = NULL;
-    entryPtr->state = TK_STATE_NORMAL;
+    entryPtr->state = STATE_NORMAL;
     entryPtr->textVarName = NULL;
     entryPtr->takeFocus = NULL;
     entryPtr->prefWidth = 0;
     entryPtr->scrollCmd = NULL;
-
     entryPtr->numBytes = 0;
     entryPtr->numChars = 0;
     entryPtr->displayString = entryPtr->string;
@@ -450,10 +514,16 @@ Tk_EntryCmd(clientData, interp, argc, argv)
 	    EntryEventProc, (ClientData) entryPtr);
     Tk_CreateSelHandler(entryPtr->tkwin, XA_PRIMARY, XA_STRING,
 	    EntryFetchSelection, (ClientData) entryPtr, XA_STRING);
-    if (ConfigureEntry(interp, entryPtr, argc-2, argv+2, 0) != TCL_OK) {
+
+    if (Tk_InitOptions(interp, (char *) entryPtr, optionTable, tkwin)
+	    != TCL_OK) {
+	Tk_DestroyWindow(entryPtr->tkwin);
+	return TCL_ERROR;
+    }
+    if (ConfigureEntry(interp, entryPtr, objc-2, objv+2, 0) != TCL_OK) {
 	goto error;
     }
-
+    
     Tcl_SetResult(interp, Tk_PathName(entryPtr->tkwin), TCL_STATIC);
     return TCL_OK;
 
@@ -465,7 +535,7 @@ Tk_EntryCmd(clientData, interp, argc, argv)
 /*
  *--------------------------------------------------------------
  *
- * EntryWidgetCmd --
+ * EntryWidgetObjCmd --
  *
  *	This procedure is invoked to process the Tcl command
  *	that corresponds to a widget managed by this module.
@@ -481,340 +551,406 @@ Tk_EntryCmd(clientData, interp, argc, argv)
  */
 
 static int
-EntryWidgetCmd(clientData, interp, argc, argv)
+EntryWidgetObjCmd(clientData, interp, objc, objv)
     ClientData clientData;	/* Information about entry widget. */
     Tcl_Interp *interp;		/* Current interpreter. */
-    int argc;			/* Number of arguments. */
-    char **argv;		/* Argument strings. */
+    int objc;			/* Number of arguments. */
+    Tcl_Obj *CONST objv[];	/* Argument objects. */
 {
     Entry *entryPtr = (Entry *) clientData;
-    int result = TCL_OK;
-    size_t length;
-    int c;
+    int cmdIndex, selIndex, result;
+    Tcl_Obj *objPtr;
 
-    if (argc < 2) {
-	Tcl_AppendResult(interp, "wrong # args: should be \"",
-		argv[0], " option ?arg arg ...?\"", (char *) NULL);
+    if (objc < 2) {
+	Tcl_WrongNumArgs(interp, 1, objv, "option ?arg arg ...?");
 	return TCL_ERROR;
     }
     Tcl_Preserve((ClientData) entryPtr);
-    c = argv[1][0];
-    length = strlen(argv[1]);
-    if ((c == 'b') && (strncmp(argv[1], "bbox", length) == 0)) {
-	int index, byteIndex, x, y, width, height;
-	char *string;
-	char buf[TCL_INTEGER_SPACE * 4];
-
-	if (argc != 3) {
-	    Tcl_AppendResult(interp, "wrong # args: should be \"",
-		    argv[0], " bbox index\"",
-		    (char *) NULL);
-	    goto error;
-	}
-	if (GetEntryIndex(interp, entryPtr, argv[2], &index) != TCL_OK) {
-	    goto error;
-	}
-	if ((index == entryPtr->numChars) && (index > 0)) {
-	    index--;
-	}
-	string = entryPtr->displayString;
-	byteIndex = Tcl_UtfAtIndex(string, index) - string;
-	Tk_CharBbox(entryPtr->textLayout, byteIndex, &x, &y, &width, &height);
-	sprintf(buf, "%d %d %d %d", x + entryPtr->layoutX,
-		y + entryPtr->layoutY, width, height);
-	Tcl_SetResult(interp, buf, TCL_VOLATILE);
-    } else if ((c == 'c') && (strncmp(argv[1], "cget", length) == 0)
-	    && (length >= 2)) {
-	if (argc != 3) {
-	    Tcl_AppendResult(interp, "wrong # args: should be \"",
-		    argv[0], " cget option\"",
-		    (char *) NULL);
-	    goto error;
-	}
-	result = Tk_ConfigureValue(interp, entryPtr->tkwin, configSpecs,
-		(char *) entryPtr, argv[2], 0);
-    } else if ((c == 'c') && (strncmp(argv[1], "configure", length) == 0)
-	    && (length >= 2)) {
-	if (argc == 2) {
-	    result = Tk_ConfigureInfo(interp, entryPtr->tkwin, configSpecs,
-		    (char *) entryPtr, (char *) NULL, 0);
-	} else if (argc == 3) {
-	    result = Tk_ConfigureInfo(interp, entryPtr->tkwin, configSpecs,
-		    (char *) entryPtr, argv[2], 0);
-	} else {
-	    result = ConfigureEntry(interp, entryPtr, argc-2, argv+2,
-		    TK_CONFIG_ARGV_ONLY);
-	}
-    } else if ((c == 'd') && (strncmp(argv[1], "delete", length) == 0)) {
-	int first, last;
-
-	if ((argc < 3) || (argc > 4)) {
-	    Tcl_AppendResult(interp, "wrong # args: should be \"",
-		    argv[0], " delete firstIndex ?lastIndex?\"",
-		    (char *) NULL);
-	    goto error;
-	}
-	if (GetEntryIndex(interp, entryPtr, argv[2], &first) != TCL_OK) {
-	    goto error;
-	}
-	if (argc == 3) {
-	    last = first + 1;
-	} else {
-	    if (GetEntryIndex(interp, entryPtr, argv[3], &last) != TCL_OK) {
+
+    /* 
+     * Parse the widget command by looking up the second token in
+     * the list of valid command names. 
+     */
+
+    result = Tcl_GetIndexFromObj(interp, objv[1], commandNames,
+	    "option", 0, &cmdIndex);
+    if (result != TCL_OK) {
+	return result;
+    }
+
+    switch (cmdIndex) {
+        case COMMAND_BBOX: {
+	    int index, byteIndex, x, y, width, height;
+	    char *string;
+	    char buf[TCL_INTEGER_SPACE * 4];
+
+	    if (objc != 3) {
+	        Tcl_WrongNumArgs(interp, 1, objv, "bbox index");
 		goto error;
 	    }
-	}
-	if ((last >= first) && (entryPtr->state == TK_STATE_NORMAL)) {
-	    DeleteChars(entryPtr, first, last - first);
-	}
-    } else if ((c == 'g') && (strncmp(argv[1], "get", length) == 0)) {
-	if (argc != 2) {
-	    Tcl_AppendResult(interp, "wrong # args: should be \"",
-		    argv[0], " get\"", (char *) NULL);
-	    goto error;
-	}
-	Tcl_SetResult(interp, entryPtr->string, TCL_STATIC);
-    } else if ((c == 'i') && (strncmp(argv[1], "icursor", length) == 0)
-	    && (length >= 2)) {
-	if (argc != 3) {
-	    Tcl_AppendResult(interp, "wrong # args: should be \"",
-		    argv[0], " icursor pos\"",
-		    (char *) NULL);
-	    goto error;
-	}
-	if (GetEntryIndex(interp, entryPtr, argv[2], &entryPtr->insertPos)
-		!= TCL_OK) {
-	    goto error;
-	}
-	EventuallyRedraw(entryPtr);
-    } else if ((c == 'i') && (strncmp(argv[1], "index", length) == 0)
-	    && (length >= 3)) {
-	int index;
-	char buf[TCL_INTEGER_SPACE];
-
-	if (argc != 3) {
-	    Tcl_AppendResult(interp, "wrong # args: should be \"",
-		    argv[0], " index string\"", (char *) NULL);
-	    goto error;
-	}
-	if (GetEntryIndex(interp, entryPtr, argv[2], &index) != TCL_OK) {
-	    goto error;
-	}
-	sprintf(buf, "%d", index);
-	Tcl_SetResult(interp, buf, TCL_VOLATILE);
-    } else if ((c == 'i') && (strncmp(argv[1], "insert", length) == 0)
-	    && (length >= 3)) {
-	int index;
-
-	if (argc != 4) {
-	    Tcl_AppendResult(interp, "wrong # args: should be \"",
-		    argv[0], " insert index text\"",
-		    (char *) NULL);
-	    goto error;
-	}
-	if (GetEntryIndex(interp, entryPtr, argv[2], &index) != TCL_OK) {
-	    goto error;
-	}
-	if (entryPtr->state == TK_STATE_NORMAL) {
-	    InsertChars(entryPtr, index, argv[3]);
-	}
-    } else if ((c == 's') && (length >= 2)
-	    && (strncmp(argv[1], "scan", length) == 0)) {
-	int x;
-
-	if (argc != 4) {
-	    Tcl_AppendResult(interp, "wrong # args: should be \"",
-		    argv[0], " scan mark|dragto x\"", (char *) NULL);
-	    goto error;
-	}
-	if (Tcl_GetInt(interp, argv[3], &x) != TCL_OK) {
-	    goto error;
-	}
-	if ((argv[2][0] == 'm')
-		&& (strncmp(argv[2], "mark", strlen(argv[2])) == 0)) {
-	    entryPtr->scanMarkX = x;
-	    entryPtr->scanMarkIndex = entryPtr->leftIndex;
-	} else if ((argv[2][0] == 'd')
-		&& (strncmp(argv[2], "dragto", strlen(argv[2])) == 0)) {
-	    EntryScanTo(entryPtr, x);
-	} else {
-	    Tcl_AppendResult(interp, "bad scan option \"", argv[2],
-		    "\": must be mark or dragto", (char *) NULL);
-	    goto error;
-	}
-    } else if ((c == 's') && (length >= 2)
-	    && (strncmp(argv[1], "selection", length) == 0)) {
-	int index, index2;
-
-	if (argc < 3) {
-	    Tcl_AppendResult(interp, "wrong # args: should be \"",
-		    argv[0], " select option ?index?\"", (char *) NULL);
-	    goto error;
-	}
-	length = strlen(argv[2]);
-	c = argv[2][0];
-	if ((c == 'c') && (strncmp(argv[2], "clear", length) == 0)) {
-	    if (argc != 3) {
-		Tcl_AppendResult(interp, "wrong # args: should be \"",
-			argv[0], " selection clear\"", (char *) NULL);
-		goto error;
+	    if (GetEntryIndex(interp, entryPtr, Tcl_GetString(objv[2]), 
+                    &index) != TCL_OK) {
+	        goto error;
 	    }
-	    if (entryPtr->selectFirst >= 0) {
-		entryPtr->selectFirst = -1;
-		entryPtr->selectLast = -1;
-		EventuallyRedraw(entryPtr);
+	    if ((index == entryPtr->numChars) && (index > 0)) {
+	        index--;
 	    }
-	    goto done;
-	} else if ((c == 'p') && (strncmp(argv[2], "present", length) == 0)) {
-	    if (argc != 3) {
-		Tcl_AppendResult(interp, "wrong # args: should be \"",
-			argv[0], " selection present\"", (char *) NULL);
+	    string = entryPtr->displayString;
+	    byteIndex = Tcl_UtfAtIndex(string, index) - string;
+	    Tk_CharBbox(entryPtr->textLayout, byteIndex, &x, &y, 
+                    &width, &height);
+	    sprintf(buf, "%d %d %d %d", x + entryPtr->layoutX,
+		    y + entryPtr->layoutY, width, height);
+	    Tcl_SetResult(interp, buf, TCL_VOLATILE);
+	    break;
+	} 
+	
+        case COMMAND_CGET: {
+	    if (objc != 3) {
+	        Tcl_WrongNumArgs(interp, 1, objv, "cget option");
 		goto error;
 	    }
-	    if (entryPtr->selectFirst < 0) {
-		Tcl_SetResult(interp, "0", TCL_STATIC);
+	    
+	    objPtr = Tk_GetOptionValue(interp, (char *) entryPtr,
+		    entryPtr->optionTable, objv[2], entryPtr->tkwin);
+	    if (objPtr == NULL) {
+		 goto error;
 	    } else {
-		Tcl_SetResult(interp, "1", TCL_STATIC);
+		Tcl_SetObjResult(interp, objPtr);
 	    }
-	    goto done;
+	    break;
 	}
-	if (argc >= 4) {
-	    if (GetEntryIndex(interp, entryPtr, argv[3], &index) != TCL_OK) {
-		goto error;
+
+        case COMMAND_CONFIGURE: {
+	    if (objc <= 3) {
+		objPtr = Tk_GetOptionInfo(interp, (char *) entryPtr,
+			entryPtr->optionTable,
+			(objc == 3) ? objv[2] : (Tcl_Obj *) NULL,
+			entryPtr->tkwin);
+		if (objPtr == NULL) {
+		    goto error;
+		} else {
+		    Tcl_SetObjResult(interp, objPtr);
+		}
+	    } else {
+		result = ConfigureEntry(interp, entryPtr, objc-2, objv+2, 0);
 	    }
+	    break;
 	}
-	if ((c == 'a') && (strncmp(argv[2], "adjust", length) == 0)) {
-	    if (argc != 4) {
-		Tcl_AppendResult(interp, "wrong # args: should be \"",
-			argv[0], " selection adjust index\"",
-			(char *) NULL);
+
+        case COMMAND_DELETE: {
+	    int first, last;
+
+	    if ((objc < 3) || (objc > 4)) {
+	        Tcl_WrongNumArgs(interp, 1, objv, 
+                        "delete firstIndex ?lastIndex?");
 		goto error;
 	    }
-	    if (entryPtr->selectFirst >= 0) {
-		int half1, half2;
-		
-		half1 = (entryPtr->selectFirst + entryPtr->selectLast)/2;
-		half2 = (entryPtr->selectFirst + entryPtr->selectLast + 1)/2;
-		if (index < half1) {
-		    entryPtr->selectAnchor = entryPtr->selectLast;
-		} else if (index > half2) {
-		    entryPtr->selectAnchor = entryPtr->selectFirst;
-		} else {
-		    /*
-		     * We're at about the halfway point in the selection;
-		     * just keep the existing anchor.
-		     */
+	    if (GetEntryIndex(interp, entryPtr, Tcl_GetString(objv[2]), 
+                    &first) != TCL_OK) {
+	        goto error;
+	    }
+	    if (objc == 3) {
+	        last = first + 1;
+	    } else {
+	        if (GetEntryIndex(interp, entryPtr, Tcl_GetString(objv[3]), 
+                        &last) != TCL_OK) {
+		    goto error;
 		}
 	    }
-	    EntrySelectTo(entryPtr, index);
-	} else if ((c == 'f') && (strncmp(argv[2], "from", length) == 0)) {
-	    if (argc != 4) {
-		Tcl_AppendResult(interp, "wrong # args: should be \"",
-			argv[0], " selection from index\"",
-			(char *) NULL);
-		goto error;
+	    if ((last >= first) && (entryPtr->state == STATE_NORMAL)) {
+	        DeleteChars(entryPtr, first, last - first);
 	    }
-	    entryPtr->selectAnchor = index;
-	} else if ((c == 'r') && (strncmp(argv[2], "range", length) == 0)) {
-	    if (argc != 5) {
-		Tcl_AppendResult(interp, "wrong # args: should be \"",
-			argv[0], " selection range start end\"",
-			(char *) NULL);
+	    break;
+	}
+
+        case COMMAND_GET: {
+	    if (objc != 2) {
+	        Tcl_WrongNumArgs(interp, 1, objv, "get");
 		goto error;
 	    }
-	    if (GetEntryIndex(interp, entryPtr, argv[4], &index2) != TCL_OK) {
+	    Tcl_SetResult(interp, entryPtr->string, TCL_STATIC);
+	    break;
+	}
+
+        case COMMAND_ICURSOR: {
+	    if (objc != 3) {
+	        Tcl_WrongNumArgs(interp, 1, objv, "icursor pos");
 		goto error;
 	    }
-	    if (index >= index2) {
-		entryPtr->selectFirst = -1;
-		entryPtr->selectLast = -1;
-	    } else {
-		entryPtr->selectFirst = index;
-		entryPtr->selectLast = index2;
-	    }
-	    if (!(entryPtr->flags & GOT_SELECTION)
-		    && (entryPtr->exportSelection)) {
-		Tk_OwnSelection(entryPtr->tkwin, XA_PRIMARY, 
-			EntryLostSelection, (ClientData) entryPtr);
-		entryPtr->flags |= GOT_SELECTION;
+	    if (GetEntryIndex(interp, entryPtr, Tcl_GetString(objv[2]),
+                    &entryPtr->insertPos) != TCL_OK) {
+	        goto error;
 	    }
 	    EventuallyRedraw(entryPtr);
-	} else if ((c == 't') && (strncmp(argv[2], "to", length) == 0)) {
-	    if (argc != 4) {
-		Tcl_AppendResult(interp, "wrong # args: should be \"",
-			argv[0], " selection to index\"",
-			(char *) NULL);
+	    break;
+	}
+	
+        case COMMAND_INDEX: {
+	    int index;
+	    char buf[TCL_INTEGER_SPACE];
+
+	    if (objc != 3) {
+	        Tcl_WrongNumArgs(interp, 1, objv, "index string");
 		goto error;
 	    }
-	    EntrySelectTo(entryPtr, index);
-	} else {
-	    Tcl_AppendResult(interp, "bad selection option \"", argv[2],
-		    "\": must be adjust, clear, from, present, range, or to",
-		    (char *) NULL);
-	    goto error;
+	    if (GetEntryIndex(interp, entryPtr, Tcl_GetString(objv[2]), 
+                    &index) != TCL_OK) {
+	        goto error;
+	    }
+	    sprintf(buf, "%d", index);
+	    Tcl_SetResult(interp, buf, TCL_VOLATILE);
+	    break;
 	}
-    } else if ((c == 'x') && (strncmp(argv[1], "xview", length) == 0)) {
-	int index;
 
-	if (argc == 2) {
-	    double first, last;
-	    char buf[TCL_DOUBLE_SPACE * 2];
+        case COMMAND_INSERT: {
+	    int index;
+
+	    if (objc != 4) {
+	        Tcl_WrongNumArgs(interp, 1, objv, "insert index text");
+		goto error;
+	    }
+	    if (GetEntryIndex(interp, entryPtr, Tcl_GetString(objv[2]), 
+                    &index) != TCL_OK) {
+	        goto error;
+	    }
+	    if (entryPtr->state == STATE_NORMAL) {
+	        InsertChars(entryPtr, index, Tcl_GetString(objv[3]));
+	    }
+	    break;
+	}
+
+        case COMMAND_SCAN: {
+	    int x;
+	    char *minorCmd;
+
+	    if (objc != 4) {
+	        Tcl_WrongNumArgs(interp, 1, objv, "scan mark|dragto x");
+		goto error;
+	    }
+	    if (Tcl_GetIntFromObj(interp, objv[3], &x) != TCL_OK) {
+	        goto error;
+	    }
+
+	    minorCmd = Tcl_GetString(objv[2]);
+	    if (minorCmd[0] == 'm' 
+                    && (strncmp(minorCmd, "mark", strlen(minorCmd)) == 0)) {
+	        entryPtr->scanMarkX = x;
+		entryPtr->scanMarkIndex = entryPtr->leftIndex;
+	    } else if ((minorCmd[0] == 'd')
+		&& (strncmp(minorCmd, "dragto", strlen(minorCmd)) == 0)) {
+	        EntryScanTo(entryPtr, x);
+	    } else {
+	        Tcl_AppendResult(interp, "bad scan option \"", 
+                        Tcl_GetString(objv[2]), "\": must be mark or dragto", 
+                        (char *) NULL);
+		goto error;
+	    }
+	    break;
+	}
 	    
-	    EntryVisibleRange(entryPtr, &first, &last);
-	    sprintf(buf, "%g %g", first, last);
-	    Tcl_SetResult(interp, buf, TCL_VOLATILE);
-	    goto done;
-	} else if (argc == 3) {
-	    if (GetEntryIndex(interp, entryPtr, argv[2], &index) != TCL_OK) {
+	case COMMAND_SELECTION: {
+	    int index, index2;
+
+	    if (objc < 3) {
+	        Tcl_WrongNumArgs(interp, 1, objv, "select option ?index?");
 		goto error;
 	    }
-	} else {
-	    double fraction;
-	    int count;
 
-	    index = entryPtr->leftIndex;
-	    switch (Tk_GetScrollInfo(interp, argc, argv, &fraction, &count)) {
-		case TK_SCROLL_ERROR: {
-		    goto error;
+	    /* 
+	     * Parse the selection sub-command, using the command
+	     * table "selCommandNames" defined above.
+	     */
+	    
+	    result = Tcl_GetIndexFromObj(interp, objv[2], selCommandNames,
+                    "selection option", 0, &selIndex);
+	    if (result != TCL_OK) {
+	        goto error;
+	    }
+
+	    switch(selIndex) {
+	        case SELECTION_ADJUST: {
+		    if (objc != 4) {
+		        Tcl_WrongNumArgs(interp, 1, objv, 
+                                "selection adjust index");
+			goto error;
+		    }
+		    if (GetEntryIndex(interp, entryPtr, 
+                            Tcl_GetString(objv[3]), &index) != TCL_OK) {
+		        goto error;
+		    }
+		    if (entryPtr->selectFirst >= 0) {
+		        int half1, half2;
+		
+			half1 = (entryPtr->selectFirst 
+			        + entryPtr->selectLast)/2;
+			half2 = (entryPtr->selectFirst 
+				+ entryPtr->selectLast + 1)/2;
+			if (index < half1) {
+			    entryPtr->selectAnchor = entryPtr->selectLast;
+			} else if (index > half2) {
+			    entryPtr->selectAnchor = entryPtr->selectFirst;
+			} else {
+			  /*
+			   * We're at about the halfway point in the 
+			   * selection; just keep the existing anchor.
+			   */
+			}
+		    }
+		    EntrySelectTo(entryPtr, index);
+		    break;
+		}
+
+	        case SELECTION_CLEAR: {
+		    if (objc != 3) {
+		        Tcl_WrongNumArgs(interp, 1, objv, "selection clear");
+			goto error;
+		    }
+		    if (entryPtr->selectFirst >= 0) {
+		        entryPtr->selectFirst = -1;
+			entryPtr->selectLast = -1;
+			EventuallyRedraw(entryPtr);
+		    }
+		    goto done;
 		}
-		case TK_SCROLL_MOVETO: {
-		    index = (int) ((fraction * entryPtr->numChars) + 0.5);
+
+	        case SELECTION_FROM: {
+		    if (objc != 4) {
+		        Tcl_WrongNumArgs(interp, 1, objv, 
+			        "selection from index");
+			goto error;
+		    }
+		    if (GetEntryIndex(interp, entryPtr, 
+                            Tcl_GetString(objv[3]), &index) != TCL_OK) {
+		        goto error;
+		    }
+		    entryPtr->selectAnchor = index;
 		    break;
 		}
-		case TK_SCROLL_PAGES: {
-		    int charsPerPage;
-		    
-		    charsPerPage = ((Tk_Width(entryPtr->tkwin)
-			    - 2 * entryPtr->inset) / entryPtr->avgWidth) - 2;
-		    if (charsPerPage < 1) {
-			charsPerPage = 1;
+
+	        case SELECTION_PRESENT: {
+		    if (objc != 3) {
+		        Tcl_WrongNumArgs(interp, 1, objv, "selection present");
+			goto error;
+		    }
+		    if (entryPtr->selectFirst < 0) {
+		        Tcl_SetResult(interp, "0", TCL_STATIC);
+		    } else {
+		        Tcl_SetResult(interp, "1", TCL_STATIC);
 		    }
-		    index += count * charsPerPage;
+		    goto done;
+		}
+
+	        case SELECTION_RANGE: {
+		    if (objc != 5) {
+		        Tcl_WrongNumArgs(interp, 1, objv, 
+                                "selection range start end");
+			goto error;
+		    }
+		    if (GetEntryIndex(interp, entryPtr, 
+                            Tcl_GetString(objv[3]), &index) != TCL_OK) {
+		        goto error;
+		    }
+		    if (GetEntryIndex(interp, entryPtr, 
+                            Tcl_GetString(objv[4]),& index2) != TCL_OK) {
+		        goto error;
+		    }
+		    if (index >= index2) {
+		        entryPtr->selectFirst = -1;
+			entryPtr->selectLast = -1;
+		    } else {
+		        entryPtr->selectFirst = index;
+			entryPtr->selectLast = index2;
+		    }
+		    if (!(entryPtr->flags & GOT_SELECTION)
+			    && (entryPtr->exportSelection)) {
+		        Tk_OwnSelection(entryPtr->tkwin, XA_PRIMARY, 
+			        EntryLostSelection, (ClientData) entryPtr);
+			entryPtr->flags |= GOT_SELECTION;
+		    }
+		    EventuallyRedraw(entryPtr);
 		    break;
 		}
-		case TK_SCROLL_UNITS: {
-		    index += count;
+		
+	        case SELECTION_TO: {
+		    if (objc != 4) {
+		        Tcl_WrongNumArgs(interp, 1, objv, 
+                                "selection to index");
+			goto error;
+		    }
+		    if (GetEntryIndex(interp, entryPtr, 
+                            Tcl_GetString(objv[3]), &index) != TCL_OK) {
+		        goto error;
+		    }
+		    EntrySelectTo(entryPtr, index);
 		    break;
 		}
 	    }
+	    break;
 	}
-	if (index >= entryPtr->numChars) {
-	    index = entryPtr->numChars - 1;
-	}
-	if (index < 0) {
-	    index = 0;
+
+        case COMMAND_XVIEW: {
+	    int index;
+
+	    if (objc == 2) {
+	        double first, last;
+		char buf[TCL_DOUBLE_SPACE * 2];
+	    
+		EntryVisibleRange(entryPtr, &first, &last);
+		sprintf(buf, "%g %g", first, last);
+		Tcl_SetResult(interp, buf, TCL_VOLATILE);
+		goto done;
+	    } else if (objc == 3) {
+	        if (GetEntryIndex(interp, entryPtr, Tcl_GetString(objv[2]), 
+                        &index) != TCL_OK) {
+		    goto error;
+		}
+	    } else {
+	        double fraction;
+		int count;
+
+		index = entryPtr->leftIndex;
+		switch (Tk_GetScrollInfoObj(interp, objc, objv, &fraction, 
+                        &count)) {
+		    case TK_SCROLL_ERROR: {
+		        goto error;
+		    }
+		    case TK_SCROLL_MOVETO: {
+		        index = (int) ((fraction * entryPtr->numChars) + 0.5);
+			break;
+		    }
+		    case TK_SCROLL_PAGES: {
+		        int charsPerPage;
+		    
+			charsPerPage = ((Tk_Width(entryPtr->tkwin)
+    			        - 2 * entryPtr->inset) 
+                                / entryPtr->avgWidth) - 2;
+			if (charsPerPage < 1) {
+			    charsPerPage = 1;
+			}
+			index += count * charsPerPage;
+			break;
+		    }
+		    case TK_SCROLL_UNITS: {
+		        index += count;
+			break;
+		    }
+		}
+	    }
+	    if (index >= entryPtr->numChars) {
+	        index = entryPtr->numChars - 1;
+	    }
+	    if (index < 0) {
+	        index = 0;
+	    }
+	    entryPtr->leftIndex = index;
+	    entryPtr->flags |= UPDATE_SCROLLBAR;
+	    EntryComputeGeometry(entryPtr);
+	    EventuallyRedraw(entryPtr);
+	    break;
 	}
-	entryPtr->leftIndex = index;
-	entryPtr->flags |= UPDATE_SCROLLBAR;
-	EntryComputeGeometry(entryPtr);
-	EventuallyRedraw(entryPtr);
-    } else {
-	Tcl_AppendResult(interp, "bad option \"", argv[1],
-		"\": must be bbox, cget, configure, delete, get, ",
-		"icursor, index, insert, scan, selection, or xview",
-		(char *) NULL);
-	goto error;
     }
+
     done:
     Tcl_Release((ClientData) entryPtr);
     return result;
@@ -847,6 +983,12 @@ DestroyEntry(memPtr)
     char *memPtr;		/* Info about entry widget. */
 {
     Entry *entryPtr = (Entry *) memPtr;
+    entryPtr->flags |= ENTRY_DELETED;
+
+    Tcl_DeleteCommandFromToken(entryPtr->interp, entryPtr->widgetCmd);
+    if (entryPtr->flags & REDRAW_PENDING) {
+        Tcl_CancelIdleCall(DisplayEntry, (ClientData) entryPtr);
+    }
 
     /*
      * Free up all the stuff that requires special handling, then
@@ -871,7 +1013,9 @@ DestroyEntry(memPtr)
 	ckfree(entryPtr->displayString);
     }
     Tk_FreeTextLayout(entryPtr->textLayout);
-    Tk_FreeOptions(configSpecs, (char *) entryPtr, entryPtr->display, 0);
+    Tk_FreeConfigOptions((char *) entryPtr, entryPtr->optionTable,
+	    entryPtr->tkwin);
+    entryPtr->tkwin = NULL;
     ckfree((char *) entryPtr);
 }
 
@@ -897,14 +1041,17 @@ DestroyEntry(memPtr)
  */
 
 static int
-ConfigureEntry(interp, entryPtr, argc, argv, flags)
+ConfigureEntry(interp, entryPtr, objc, objv, flags)
     Tcl_Interp *interp;		/* Used for error reporting. */
     Entry *entryPtr;		/* Information about widget; may or may not
 				 * already have values for some fields. */
-    int argc;			/* Number of valid entries in argv. */
-    char **argv;		/* Arguments. */
+    int objc;			/* Number of valid entries in argv. */
+    Tcl_Obj *CONST objv[];	/* Argument objects. */
     int flags;			/* Flags to pass to Tk_ConfigureWidget. */
 {
+    Tk_SavedOptions savedOptions;
+    Tcl_Obj *errorResult;
+    int error;
     int oldExport;
 
     /*
@@ -918,9 +1065,79 @@ ConfigureEntry(interp, entryPtr, argc, argv, flags)
     }
 
     oldExport = entryPtr->exportSelection;
-    if (Tk_ConfigureWidget(interp, entryPtr->tkwin, configSpecs,
-	    argc, argv, (char *) entryPtr, flags) != TCL_OK) {
-	return TCL_ERROR;
+
+    for (error = 0; error <= 1; error++) {
+	if (!error) {
+	    /*
+	     * First pass: set options to new values.
+	     */
+
+	    if (Tk_SetOptions(interp, (char *) entryPtr,
+		    entryPtr->optionTable, objc, objv,
+		    entryPtr->tkwin, &savedOptions, (int *) NULL) != TCL_OK) {
+		continue;
+	    }
+	} else {
+	    /*
+	     * Second pass: restore options to old values.
+	     */
+
+	    errorResult = Tcl_GetObjResult(interp);
+	    Tcl_IncrRefCount(errorResult);
+	    Tk_RestoreSavedOptions(&savedOptions);
+	}
+
+	/*
+	 * A few other options also need special processing, such as parsing
+	 * the geometry and setting the background from a 3-D border.
+	 */
+
+	Tk_SetBackgroundFromBorder(entryPtr->tkwin, entryPtr->normalBorder);
+
+	if (entryPtr->insertWidth <= 0) {
+	    entryPtr->insertWidth = 2;
+	}
+	if (entryPtr->insertBorderWidth > entryPtr->insertWidth/2) {
+	    entryPtr->insertBorderWidth = entryPtr->insertWidth/2;
+	}
+
+	/*
+	 * Restart the cursor timing sequence in case the on-time or 
+	 * off-time just changed.
+	 */
+
+	if (entryPtr->flags & GOT_FOCUS) {
+	  EntryFocusProc(entryPtr, 1);
+	}
+
+	/*
+	 * Claim the selection if we've suddenly started exporting it.
+	 */
+
+	if (entryPtr->exportSelection && (!oldExport)
+	        && (entryPtr->selectFirst != -1)
+	        && !(entryPtr->flags & GOT_SELECTION)) {
+	    Tk_OwnSelection(entryPtr->tkwin, XA_PRIMARY, EntryLostSelection,
+		    (ClientData) entryPtr);
+	    entryPtr->flags |= GOT_SELECTION;
+	}
+
+	/*
+	 * Recompute the window's geometry and arrange for it to be
+	 * redisplayed.
+	 */
+
+	Tk_SetInternalBorder(entryPtr->tkwin,
+	        entryPtr->borderWidth + entryPtr->highlightWidth);
+	if (entryPtr->highlightWidth <= 0) {
+	    entryPtr->highlightWidth = 0;
+	}
+	entryPtr->inset = entryPtr->highlightWidth 
+	        + entryPtr->borderWidth + XPAD;
+	break;
+    }
+    if (!error) {
+	Tk_FreeSavedOptions(&savedOptions);
     }
 
     /*
@@ -943,63 +1160,14 @@ ConfigureEntry(interp, entryPtr, argc, argv, flags)
 		EntryTextVarProc, (ClientData) entryPtr);
     }
 
-    /*
-     * A few other options also need special processing, such as parsing
-     * the geometry and setting the background from a 3-D border.
-     */
-
-    if ((entryPtr->state != TK_STATE_NORMAL)
-	    && (entryPtr->state != TK_STATE_DISABLED)) {
-	Tcl_AppendResult(interp, "bad state value \"", entryPtr->state,
-		"\": must be normal or disabled", (char *) NULL);
-	entryPtr->state = TK_STATE_NORMAL;
+    EntryWorldChanged((ClientData) entryPtr);
+    if (error) {
+        Tcl_SetObjResult(interp, errorResult);
+	Tcl_DecrRefCount(errorResult);
 	return TCL_ERROR;
+    } else {
+        return TCL_OK;
     }
-
-    Tk_SetBackgroundFromBorder(entryPtr->tkwin, entryPtr->normalBorder);
-
-    if (entryPtr->insertWidth <= 0) {
-	entryPtr->insertWidth = 2;
-    }
-    if (entryPtr->insertBorderWidth > entryPtr->insertWidth/2) {
-	entryPtr->insertBorderWidth = entryPtr->insertWidth/2;
-    }
-
-    /*
-     * Restart the cursor timing sequence in case the on-time or off-time
-     * just changed.
-     */
-
-    if (entryPtr->flags & GOT_FOCUS) {
-	EntryFocusProc(entryPtr, 1);
-    }
-
-    /*
-     * Claim the selection if we've suddenly started exporting it.
-     */
-
-    if (entryPtr->exportSelection && (!oldExport)
-	    && (entryPtr->selectFirst != -1)
-	    && !(entryPtr->flags & GOT_SELECTION)) {
-	Tk_OwnSelection(entryPtr->tkwin, XA_PRIMARY, EntryLostSelection,
-		(ClientData) entryPtr);
-	entryPtr->flags |= GOT_SELECTION;
-    }
-
-    /*
-     * Recompute the window's geometry and arrange for it to be
-     * redisplayed.
-     */
-
-    Tk_SetInternalBorder(entryPtr->tkwin,
-	    entryPtr->borderWidth + entryPtr->highlightWidth);
-    if (entryPtr->highlightWidth <= 0) {
-	entryPtr->highlightWidth = 0;
-    }
-    entryPtr->inset = entryPtr->highlightWidth + entryPtr->borderWidth + XPAD;
-
-    EntryWorldChanged((ClientData) entryPtr);
-    return TCL_OK;
 }
 
 /*
@@ -1185,7 +1353,7 @@ DisplayEntry(clientData)
      */
 
     if ((entryPtr->insertPos >= entryPtr->leftIndex)
-	    && (entryPtr->state == TK_STATE_NORMAL)
+	    && (entryPtr->state == STATE_NORMAL)
 	    && (entryPtr->flags & GOT_FOCUS)) {
 	int insertByte;
 
@@ -1730,14 +1898,7 @@ EntryEventProc(clientData, eventPtr)
 	EventuallyRedraw(entryPtr);
 	entryPtr->flags |= BORDER_NEEDED;
     } else if (eventPtr->type == DestroyNotify) {
-	if (entryPtr->tkwin != NULL) {
-	    entryPtr->tkwin = NULL;
-            Tcl_DeleteCommandFromToken(entryPtr->interp, entryPtr->widgetCmd);
-	}
-	if (entryPtr->flags & REDRAW_PENDING) {
-	    Tcl_CancelIdleCall(DisplayEntry, (ClientData) entryPtr);
-	}
-	Tcl_EventuallyFree((ClientData) entryPtr, DestroyEntry);
+        DestroyEntry((char *) clientData);
     } else if (eventPtr->type == ConfigureNotify) {
 	Tcl_Preserve((ClientData) entryPtr);
 	entryPtr->flags |= UPDATE_SCROLLBAR;
@@ -1778,7 +1939,6 @@ EntryCmdDeletedProc(clientData)
     ClientData clientData;	/* Pointer to widget record for widget. */
 {
     Entry *entryPtr = (Entry *) clientData;
-    Tk_Window tkwin = entryPtr->tkwin;
 
     /*
      * This procedure could be invoked either because the window was
@@ -1787,9 +1947,8 @@ EntryCmdDeletedProc(clientData)
      * destroys the widget.
      */
 
-    if (tkwin != NULL) {
-	entryPtr->tkwin = NULL;
-	Tk_DestroyWindow(tkwin);
+    if (! entryPtr->flags & ENTRY_DELETED) {
+        Tk_DestroyWindow(entryPtr->tkwin);
     }
 }
 
diff --git a/generic/tkGet.c b/generic/tkGet.c
index c6997d6..7d6cc95 100644
--- a/generic/tkGet.c
+++ b/generic/tkGet.c
@@ -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: tkGet.c,v 1.1.4.4 1999/01/07 02:42:50 lfb Exp $
+ * RCS: @(#) $Id: tkGet.c,v 1.1.4.5 1999/02/16 11:39:31 lfb Exp $
  */
 
 #include "tkInt.h"
@@ -676,84 +676,5 @@ Tk_GetPixels(interp, tkwin, string, intPtr)
     }
     return TCL_OK;
 }
-
-/*
- *----------------------------------------------------------------------
- *
- * Tk_GetState --
- *
- *	Parse a state description and return the corresponding
- *	state value, or an error.
- *
- * Results:
- *	A standard Tcl return value.  If all goes well then
- *	*statePtr is filled in with one of the values
- *	TK_STATE_ACTIVE, TK_STATE_DISABLED, or TK_STATE_NORMAL.
- *      If an unknown state value is used, then *statePtr is
- *      filled with TK_STATE_UNDEFINED.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tk_GetState(interp, name, statePtr)
-    Tcl_Interp *interp;		/* For error messages. */
-    char *name;			/* Name of a state type. */
-    int *statePtr;		/* Where to store converted state. */
-{
-    char c;
-    size_t length;
-
-    c = name[0];
-    length = strlen(name);
-    if ((c == 'a') && (strncmp(name, "active", length) == 0)) {
-	*statePtr = TK_STATE_ACTIVE;
-    } else if ((c == 'd') && (strncmp(name, "disabled", length) == 0)
-	    && (length >= 2)) {
-        *statePtr = TK_STATE_DISABLED;
-    } else if ((c == 'n') && (strncmp(name, "normal", length) == 0)
-	    && (length >= 2)) {
-	*statePtr = TK_STATE_NORMAL;
-    } else {
-        *statePtr = TK_STATE_UNDEFINED;
-    }
-    return TCL_OK;
-}
-
-/*
- *--------------------------------------------------------------
- *
- * Tk_NameOfState --
- *
- *	Given a state value, produce a string describing that
- *	state value.
- *
- * Results:
- *	The return value is a static string that is equivalent
- *	to state.
- *
- * Side effects:
- *	None.
- *
- *--------------------------------------------------------------
- */
 
-char *
-Tk_NameOfState(state)
-    int state;		/* One of TK_STATE_ACTIVE, TK_STATE_DISABLED,
-			 * or TK_STATE_NORMAL */
-{
-    if (state == TK_STATE_ACTIVE) {
-	return "active";
-    } else if (state == TK_STATE_DISABLED) {
-	return "disabled";
-    } else if (state == TK_STATE_NORMAL) {
-	return "normal";
-    } else {
-	return "unknown state";
-    }
-}
 
diff --git a/generic/tkOldConfig.c b/generic/tkOldConfig.c
index ec2944b..1b2ed20 100644
--- a/generic/tkOldConfig.c
+++ b/generic/tkOldConfig.c
@@ -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: tkOldConfig.c,v 1.1.2.3 1999/01/07 02:42:50 lfb Exp $
+ * RCS: @(#) $Id: tkOldConfig.c,v 1.1.2.4 1999/02/16 11:39:31 lfb Exp $
  */
 
 #include "tkPort.h"
@@ -462,12 +462,6 @@ DoConfig(interp, tkwin, specPtr, value, valueIsUid, widgRec)
 		    return TCL_ERROR;
 		}
 		break;
-	    case TK_CONFIG_STATE:
-		uid = valueIsUid ? (Tk_Uid) value : Tk_GetUid(value);
-		if (Tk_GetState(interp, uid, (int *) ptr) != TCL_OK) {
-		    return TCL_ERROR;
-		}
-		break;
 	    case TK_CONFIG_CURSOR:
 	    case TK_CONFIG_ACTIVE_CURSOR: {
 		Tk_Cursor new, old;
@@ -825,9 +819,6 @@ FormatConfigValue(interp, tkwin, specPtr, widgRec, buffer, freeProcPtr)
 	case TK_CONFIG_RELIEF:
 	    result = Tk_NameOfRelief(*((int *) ptr));
 	    break;
-	case TK_CONFIG_STATE:
-	    result = Tk_NameOfState(*((int *) ptr));
-	    break;
 	case TK_CONFIG_CURSOR:
 	case TK_CONFIG_ACTIVE_CURSOR: {
 	    Tk_Cursor cursor = *((Tk_Cursor *) ptr);
diff --git a/generic/tkScale.c b/generic/tkScale.c
index f742627..e33c957 100644
--- a/generic/tkScale.c
+++ b/generic/tkScale.c
@@ -17,7 +17,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkScale.c,v 1.1.4.5 1999/02/16 06:00:41 lfb Exp $
+ * RCS: @(#) $Id: tkScale.c,v 1.1.4.6 1999/02/16 11:39:32 lfb Exp $
  */
 
 #include "tkPort.h"
@@ -162,7 +162,7 @@ static void		ComputeFormat _ANSI_ARGS_((TkScale *scalePtr));
 static void		ComputeScaleGeometry _ANSI_ARGS_((TkScale *scalePtr));
 static int		ConfigureScale _ANSI_ARGS_((Tcl_Interp *interp,
 			    TkScale *scalePtr, int objc,
-			    Tcl_Obj *CONST objv[], int flags));
+			    Tcl_Obj *CONST objv[]));
 static void		DestroyScale _ANSI_ARGS_((char *memPtr));
 static void		ScaleCmdDeletedProc _ANSI_ARGS_((
 			    ClientData clientData));
@@ -320,7 +320,7 @@ Tk_ScaleObjCmd(clientData, interp, objc, objv)
 	Tk_DestroyWindow(scalePtr->tkwin);
 	return TCL_ERROR;
     }
-    if (ConfigureScale(interp, scalePtr, objc - 2, objv + 2, 0) != TCL_OK) {
+    if (ConfigureScale(interp, scalePtr, objc - 2, objv + 2) != TCL_OK) {
 	Tk_DestroyWindow(scalePtr->tkwin);
 	return TCL_ERROR;
     }
@@ -357,8 +357,7 @@ ScaleWidgetObjCmd(clientData, interp, objc, objv)
 {
     TkScale *scalePtr = (TkScale *) clientData;
     Tcl_Obj *objPtr;
-    int index;
-    int result;
+    int index, result;
 
     if (objc < 2) {
         Tcl_WrongNumArgs(interp, 1, objv, "option ?arg arg ...?");
@@ -370,7 +369,7 @@ ScaleWidgetObjCmd(clientData, interp, objc, objv)
 
     switch (index) {
         case COMMAND_CGET: {
-  	    if (objc !=3) {
+  	    if (objc != 3) {
 	        Tcl_WrongNumArgs(interp, 1, objv, "cget option");
 		goto error;
 	    }
@@ -395,8 +394,7 @@ ScaleWidgetObjCmd(clientData, interp, objc, objv)
 		    Tcl_SetObjResult(interp, objPtr);
 		}
 	    } else {
-		result = ConfigureScale(interp, scalePtr, objc-2, objv+2,
-                        TK_CONFIG_ARGV_ONLY);
+		result = ConfigureScale(interp, scalePtr, objc-2, objv+2);
 	    }
 	    break;
 	}
@@ -573,13 +571,12 @@ DestroyScale(memPtr)
  */
 
 static int
-ConfigureScale(interp, scalePtr, objc, objv, flags)
+ConfigureScale(interp, scalePtr, objc, objv)
     Tcl_Interp *interp;		/* Used for error reporting. */
     register TkScale *scalePtr;	/* Information about widget;  may or may
 				 * not already have values for some fields. */
     int objc;			/* Number of valid entries in objv. */
     Tcl_Obj *CONST objv[];	/* Argument values. */
-    int flags;			/* Flags to pass to Tk_ConfigureWidget. */
 {
     Tk_SavedOptions savedOptions;
     Tcl_Obj *errorResult;
diff --git a/generic/tkText.c b/generic/tkText.c
index 4baa957..d0e0acf 100644
--- a/generic/tkText.c
+++ b/generic/tkText.c
@@ -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: tkText.c,v 1.1.4.4 1999/02/11 04:13:47 stanton Exp $
+ * RCS: @(#) $Id: tkText.c,v 1.1.4.5 1999/02/16 11:39:32 lfb Exp $
  */
 
 #include "default.h"
@@ -112,7 +112,7 @@ static Tk_ConfigSpec configSpecs[] = {
     {TK_CONFIG_PIXELS, "-spacing3", "spacing3", "Spacing",
 	DEF_TEXT_SPACING3, Tk_Offset(TkText, spacing3),
 	TK_CONFIG_DONT_SET_DEFAULT},
-    {TK_CONFIG_STATE, "-state", "state", "State",
+    {TK_CONFIG_UID, "-state", "state", "State",
 	DEF_TEXT_STATE, Tk_Offset(TkText, state), 0},
     {TK_CONFIG_STRING, "-tabs", "tabs", "Tabs",
 	DEF_TEXT_TABS, Tk_Offset(TkText, tabOptionString), TK_CONFIG_NULL_OK},
@@ -134,14 +134,6 @@ static Tk_ConfigSpec configSpecs[] = {
 };
 
 /*
- * Tk_Uid's used to represent text states:
- */
-
-Tk_Uid tkTextCharUid = NULL;
-Tk_Uid tkTextNoneUid = NULL;
-Tk_Uid tkTextWordUid = NULL;
-
-/*
  * Boolean variable indicating whether or not special debugging code
  * should be executed.
  */
@@ -230,16 +222,6 @@ Tk_TextCmd(clientData, interp, argc, argv)
     }
 
     /*
-     * Perform once-only initialization:
-     */
-
-    if (tkTextCharUid == NULL) {
-	tkTextCharUid = Tk_GetUid("char");
-	tkTextNoneUid = Tk_GetUid("none");
-	tkTextWordUid = Tk_GetUid("word");
-    }
-
-    /*
      * Create the window.
      */
 
@@ -261,7 +243,7 @@ Tk_TextCmd(clientData, interp, argc, argv)
     Tcl_InitHashTable(&textPtr->markTable, TCL_STRING_KEYS);
     Tcl_InitHashTable(&textPtr->windowTable, TCL_STRING_KEYS);
     Tcl_InitHashTable(&textPtr->imageTable, TCL_STRING_KEYS);
-    textPtr->state = TK_STATE_NORMAL;
+    textPtr->state = Tk_GetUid("normal");
     textPtr->border = NULL;
     textPtr->borderWidth = 0;
     textPtr->padX = 0;
@@ -279,7 +261,7 @@ Tk_TextCmd(clientData, interp, argc, argv)
     textPtr->spacing3 = 0;
     textPtr->tabOptionString = NULL;
     textPtr->tabArrayPtr = NULL;
-    textPtr->wrapMode = tkTextCharUid;
+    textPtr->wrapMode = Tk_GetUid("char");
     textPtr->width = 0;
     textPtr->height = 0;
     textPtr->setGrid = 0;
@@ -497,7 +479,7 @@ TextWidgetCmd(clientData, interp, argc, argv)
 	    result = TCL_ERROR;
 	    goto done;
 	}
-	if (textPtr->state == TK_STATE_NORMAL) {
+	if (textPtr->state == Tk_GetUid("normal")) {
 	    result = DeleteChars(textPtr, argv[2],
 		    (argc == 4) ? argv[3] : (char *) NULL);
 	}
@@ -605,7 +587,7 @@ TextWidgetCmd(clientData, interp, argc, argv)
 	    result = TCL_ERROR;
 	    goto done;
 	}
-	if (textPtr->state == TK_STATE_NORMAL) {
+	if (textPtr->state == Tk_GetUid("normal")) {
 	    for (j = 3;  j < argc; j += 2) {
 		InsertChars(textPtr, &index1, argv[j]);
 		if (argc > (j+1)) {
@@ -781,20 +763,20 @@ ConfigureText(interp, textPtr, argc, argv, flags)
      * the geometry and setting the background from a 3-D border.
      */
 
-    if ((textPtr->state != TK_STATE_NORMAL)
-	    && (textPtr->state != TK_STATE_DISABLED)) {
+    if ((textPtr->state != Tk_GetUid("normal"))
+	    && (textPtr->state != Tk_GetUid("disabled"))) {
 	Tcl_AppendResult(interp, "bad state value \"", textPtr->state,
 		"\": must be normal or disabled", (char *) NULL);
-	textPtr->state = TK_STATE_NORMAL;
+	textPtr->state = Tk_GetUid("normal");
 	return TCL_ERROR;
     }
 
-    if ((textPtr->wrapMode != tkTextCharUid)
-	    && (textPtr->wrapMode != tkTextNoneUid)
-	    && (textPtr->wrapMode != tkTextWordUid)) {
+    if ((textPtr->wrapMode != Tk_GetUid("char"))
+	    && (textPtr->wrapMode != Tk_GetUid("none"))
+	    && (textPtr->wrapMode != Tk_GetUid("word"))) {
 	Tcl_AppendResult(interp, "bad wrap mode \"", textPtr->wrapMode,
 		"\": must be char, none, or word", (char *) NULL);
-	textPtr->wrapMode = tkTextCharUid;
+	textPtr->wrapMode = Tk_GetUid("char");
 	return TCL_ERROR;
     }
 
diff --git a/generic/tkText.h b/generic/tkText.h
index 8e2b12f..fb7cbbd 100644
--- a/generic/tkText.h
+++ b/generic/tkText.h
@@ -10,7 +10,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkText.h,v 1.1.4.3 1999/02/11 04:13:47 stanton Exp $
+ * RCS: @(#) $Id: tkText.h,v 1.1.4.4 1999/02/16 11:39:32 lfb Exp $
  */
 
 #ifndef _TKTEXT
@@ -470,7 +470,8 @@ typedef struct TkText {
 				 * image segment doesn't yet have an
 				 * associated image, there is no entry for
 				 * it here. */
-    int state;			/* One of the TK_STATE_* values. */
+    Tk_Uid state;		/* Either normal or disabled. A text 
+				 * widget is read-only when disabled. */
 
     /*
      * Default information for displaying (may be overridden by tags
diff --git a/generic/tkTextDisp.c b/generic/tkTextDisp.c
index 73d86d1..816d887 100644
--- a/generic/tkTextDisp.c
+++ b/generic/tkTextDisp.c
@@ -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: tkTextDisp.c,v 1.1.4.3 1999/01/07 02:42:52 lfb Exp $
+ * RCS: @(#) $Id: tkTextDisp.c,v 1.1.4.4 1999/02/16 11:39:32 lfb Exp $
  */
 
 #include "tkPort.h"
@@ -56,8 +56,7 @@ typedef struct StyleValues {
     int underline;		/* Non-zero means draw underline underneath
 				 * text. */
     Tk_Uid wrapMode;		/* How to handle wrap-around for this tag.
-				 * One of tkTextCharUid, tkTextNoneUid,
-				 * or tkTextWordUid. */
+				 * One of char, none, or text. */
 } StyleValues;
 
 /*
@@ -808,7 +807,7 @@ LayoutDLine(textPtr, indexPtr)
     tabChunkPtr = NULL;
     tabArrayPtr = NULL;
     rMargin = 0;
-    wrapMode = tkTextCharUid;
+    wrapMode = Tk_GetUid("char");
     tabSize = 0;
     lastCharChunkPtr = NULL;
 
@@ -850,7 +849,7 @@ LayoutDLine(textPtr, indexPtr)
 	    x = ((curIndex.byteIndex == 0)
 		    ? chunkPtr->stylePtr->sValuePtr->lMargin1
 		    : chunkPtr->stylePtr->sValuePtr->lMargin2);
-	    if (wrapMode == tkTextNoneUid) {
+	    if (wrapMode == Tk_GetUid("none")) {
 		maxX = -1;
 	    } else {
 		maxX = textPtr->dInfoPtr->maxX - textPtr->dInfoPtr->x
@@ -1023,7 +1022,7 @@ LayoutDLine(textPtr, indexPtr)
      * what is implemented below.
      */
 
-    if (wrapMode == tkTextNoneUid) {
+    if (wrapMode == Tk_GetUid("none")) {
 	maxX = textPtr->dInfoPtr->maxX - textPtr->dInfoPtr->x - rMargin;
     }
     dlPtr->length = lastChunkPtr->x + lastChunkPtr->width;
@@ -1581,7 +1580,7 @@ DisplayDLine(textPtr, dlPtr, prevPtr, pixmap)
      * to its left.
      */
 
-    if (textPtr->state == TK_STATE_NORMAL) {
+    if (textPtr->state == Tk_GetUid("normal")) {
 	for (chunkPtr = dlPtr->chunkPtr; (chunkPtr != NULL);
 		chunkPtr = chunkPtr->nextPtr) {
 	    x = chunkPtr->x + dInfoPtr->x - dInfoPtr->curPixelOffset;
@@ -4242,8 +4241,8 @@ TkTextCharLayoutProc(textPtr, indexPtr, segPtr, byteOffset, maxX, maxBytes,
 				 * many characters. */
     int noCharsYet;		/* Non-zero means no characters have been
 				 * assigned to this display line yet. */
-    Tk_Uid wrapMode;		/* How to handle line wrapping: tkTextCharUid,
-				 * tkTextNoneUid, or tkTextWordUid. */
+    Tk_Uid wrapMode;		/* How to handle line wrapping: char, 
+				 * none, or text. */
     register TkTextDispChunk *chunkPtr;
 				/* Structure to fill in with information
 				 * about this chunk.  The x field has already
@@ -4337,7 +4336,7 @@ TkTextCharLayoutProc(textPtr, indexPtr, segPtr, byteOffset, maxX, maxBytes,
      * is not a character segment.
      */
 
-    if (wrapMode != tkTextWordUid) {
+    if (wrapMode != Tk_GetUid("word")) {
 	chunkPtr->breakIndex = chunkPtr->numBytes;
     } else {
 	for (count = bytesThatFit, p += bytesThatFit - 1; count > 0;
diff --git a/generic/tkTextImage.c b/generic/tkTextImage.c
index 94c1dd1..d134683 100644
--- a/generic/tkTextImage.c
+++ b/generic/tkTextImage.c
@@ -10,7 +10,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkTextImage.c,v 1.1.4.2 1998/09/30 02:17:24 stanton Exp $
+ * RCS: @(#) $Id: tkTextImage.c,v 1.1.4.3 1999/02/16 11:39:33 lfb Exp $
  */
 
 #include "tk.h"
@@ -604,8 +604,8 @@ EmbImageLayoutProc(textPtr, indexPtr, eiPtr, offset, maxX, maxChars,
 				 * many characters. */
     int noCharsYet;		/* Non-zero means no characters have been
 				 * assigned to this line yet. */
-    Tk_Uid wrapMode;		/* Wrap mode to use for line: tkTextCharUid,
-				 * tkTextNoneUid, or tkTextWordUid. */
+    Tk_Uid wrapMode;		/* Wrap mode to use for line: char, 
+				 * text, or word. */
     register TkTextDispChunk *chunkPtr;
 				/* Structure to fill in with information
 				 * about this chunk.  The x field has already
@@ -630,7 +630,7 @@ EmbImageLayoutProc(textPtr, indexPtr, eiPtr, offset, maxX, maxChars,
 	height += 2*eiPtr->body.ei.padY;
     }
     if ((width > (maxX - chunkPtr->x))
-	    && !noCharsYet && (textPtr->wrapMode != tkTextNoneUid)) {
+	    && !noCharsYet && (textPtr->wrapMode != Tk_GetUid("none"))) {
 	return 0;
     }
 
diff --git a/generic/tkTextTag.c b/generic/tkTextTag.c
index a1602b7..c7f1986 100644
--- a/generic/tkTextTag.c
+++ b/generic/tkTextTag.c
@@ -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: tkTextTag.c,v 1.1.4.2 1998/09/30 02:17:26 stanton Exp $
+ * RCS: @(#) $Id: tkTextTag.c,v 1.1.4.3 1999/02/16 11:39:33 lfb Exp $
  */
 
 #include "default.h"
@@ -392,9 +392,9 @@ TkTextTagCmd(textPtr, interp, argc, argv)
 		}
 	    }
 	    if ((tagPtr->wrapMode != NULL)
-		    && (tagPtr->wrapMode != tkTextCharUid)
-		    && (tagPtr->wrapMode != tkTextNoneUid)
-		    && (tagPtr->wrapMode != tkTextWordUid)) {
+		    && (tagPtr->wrapMode != Tk_GetUid("char"))
+		    && (tagPtr->wrapMode != Tk_GetUid("none"))
+		    && (tagPtr->wrapMode != Tk_GetUid("word"))) {
 		Tcl_AppendResult(interp, "bad wrap mode \"", tagPtr->wrapMode,
 			"\": must be char, none, or word", (char *) NULL);
 		tagPtr->wrapMode = NULL;
diff --git a/generic/tkTextWind.c b/generic/tkTextWind.c
index 06d8b4d..27fe1c6 100644
--- a/generic/tkTextWind.c
+++ b/generic/tkTextWind.c
@@ -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: tkTextWind.c,v 1.1.4.2 1998/09/30 02:17:26 stanton Exp $
+ * RCS: @(#) $Id: tkTextWind.c,v 1.1.4.3 1999/02/16 11:39:33 lfb Exp $
  */
 
 #include "tk.h"
@@ -835,7 +835,7 @@ EmbWinLayoutProc(textPtr, indexPtr, ewPtr, offset, maxX, maxChars,
 	height = Tk_ReqHeight(ewPtr->body.ew.tkwin) + 2*ewPtr->body.ew.padY;
     }
     if ((width > (maxX - chunkPtr->x))
-	    && !noCharsYet && (textPtr->wrapMode != tkTextNoneUid)) {
+	    && !noCharsYet && (textPtr->wrapMode != Tk_GetUid("none"))) {
 	return 0;
     }
 
diff --git a/generic/tkUtil.c b/generic/tkUtil.c
index 1c05140..34888a6 100644
--- a/generic/tkUtil.c
+++ b/generic/tkUtil.c
@@ -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: tkUtil.c,v 1.1.4.2 1998/09/30 02:17:27 stanton Exp $
+ * RCS: @(#) $Id: tkUtil.c,v 1.1.4.3 1999/02/16 11:39:34 lfb Exp $
  */
 
 #include "tkInt.h"
@@ -211,6 +211,85 @@ Tk_GetScrollInfo(interp, argc, argv, dblPtr, intPtr)
 }
 
 /*
+ *----------------------------------------------------------------------
+ *
+ * Tk_GetScrollInfoObj --
+ *
+ *	This procedure is invoked to parse "xview" and "yview"
+ *	scrolling commands for widgets using the new scrolling
+ *	command syntax ("moveto" or "scroll" options).
+ *
+ * Results:
+ *	The return value is either TK_SCROLL_MOVETO, TK_SCROLL_PAGES,
+ *	TK_SCROLL_UNITS, or TK_SCROLL_ERROR.  This indicates whether
+ *	the command was successfully parsed and what form the command
+ *	took.  If TK_SCROLL_MOVETO, *dblPtr is filled in with the
+ *	desired position;  if TK_SCROLL_PAGES or TK_SCROLL_UNITS,
+ *	*intPtr is filled in with the number of lines to move (may be
+ *	negative);  if TK_SCROLL_ERROR, the interp's result contains an
+ *	error message.
+ *
+ * Side effects:
+ *	None.
+ *
+ *----------------------------------------------------------------------
+ */
+
+int
+Tk_GetScrollInfoObj(interp, objc, objv, dblPtr, intPtr)
+    Tcl_Interp *interp;			/* Used for error reporting. */
+    int objc;				/* # arguments for command. */
+    Tcl_Obj *CONST objv[];		/* Arguments for command. */
+    double *dblPtr;			/* Filled in with argument "moveto"
+					 * option, if any. */
+    int *intPtr;			/* Filled in with number of pages
+					 * or lines to scroll, if any. */
+{
+    int c;
+    size_t length;
+    char *arg2, *arg4;
+
+    arg2 = Tcl_GetString(objv[2]);
+    length = strlen(arg2);
+    c = arg2[0];
+    if ((c == 'm') && (strncmp(arg2, "moveto", length) == 0)) {
+	if (objc != 4) {
+	    Tcl_WrongNumArgs(interp, 2, objv, "moveto fraction");
+	    return TK_SCROLL_ERROR;
+	}
+	if (Tcl_GetDoubleFromObj(interp, objv[3], dblPtr) != TCL_OK) {
+	    return TK_SCROLL_ERROR;
+	}
+	return TK_SCROLL_MOVETO;
+    } else if ((c == 's')
+	    && (strncmp(arg2, "scroll", length) == 0)) {
+	if (objc != 5) {
+	    Tcl_WrongNumArgs(interp, 2, objv, "scroll number units|pages");
+	    return TK_SCROLL_ERROR;
+	}
+	if (Tcl_GetIntFromObj(interp, objv[3], intPtr) != TCL_OK) {
+	    return TK_SCROLL_ERROR;
+	}
+	arg4 = Tcl_GetString(objv[4]);
+	length = (strlen(arg4));
+	c = arg4[0];
+	if ((c == 'p') && (strncmp(arg4, "pages", length) == 0)) {
+	    return TK_SCROLL_PAGES;
+	} else if ((c == 'u')
+		&& (strncmp(arg4, "units", length) == 0)) {
+	    return TK_SCROLL_UNITS;
+	} else {
+	    Tcl_AppendResult(interp, "bad argument \"", arg4,
+		    "\": must be units or pages", (char *) NULL);
+	    return TK_SCROLL_ERROR;
+	}
+    }
+    Tcl_AppendResult(interp, "unknown option \"", arg2,
+	    "\": must be moveto or scroll", (char *) NULL);
+    return TK_SCROLL_ERROR;
+}
+
+/*
  *---------------------------------------------------------------------------
  *
  * TkComputeAnchor --
diff --git a/generic/tkWindow.c b/generic/tkWindow.c
index f9ead85..8c53c61 100644
--- a/generic/tkWindow.c
+++ b/generic/tkWindow.c
@@ -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: tkWindow.c,v 1.1.4.7 1999/02/16 06:00:41 lfb Exp $
+ * RCS: @(#) $Id: tkWindow.c,v 1.1.4.8 1999/02/16 11:39:34 lfb Exp $
  */
 
 #include "tkPort.h"
@@ -131,7 +131,7 @@ static TkCmd commands[] = {
     {"button",		NULL,			Tk_ButtonObjCmd,	1, 0},
     {"canvas",		Tk_CanvasCmd,		NULL,			1, 1},
     {"checkbutton",	NULL,			Tk_CheckbuttonObjCmd,	1, 0},
-    {"entry",		Tk_EntryCmd,		NULL,			1, 1},
+    {"entry",		NULL,                   Tk_EntryObjCmd,		1, 0},
     {"frame",		Tk_FrameCmd,		NULL,			1, 1},
     {"label",		NULL,			Tk_LabelObjCmd,		1, 0},
     {"listbox",		Tk_ListboxCmd,		NULL,			1, 1},