ANSIfy

1 files changed, 328 insertions, 326 deletions

diff --git a/generic/tkUtil.c b/generic/tkUtil.c
index 415b0f6..f73a2dd 100644
--- a/generic/tkUtil.c
+++ b/generic/tkUtil.c
@@ -1,62 +1,60 @@
-/* 
+/*
  * tkUtil.c --
  *
- *	This file contains miscellaneous utility procedures that
- *	are used by the rest of Tk, such as a procedure for drawing
- *	a focus highlight.
+ *	This file contains miscellaneous utility functions that are used by
+ *	the rest of Tk, such as a function for drawing a focus highlight.
  *
  * Copyright (c) 1994 The Regents of the University of California.
  * Copyright (c) 1994-1997 Sun Microsystems, Inc.
  *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+ * See the file "license.terms" for information on usage and redistribution of
+ * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkUtil.c,v 1.12 2002/08/05 04:30:40 dgp Exp $
+ * RCS: @(#) $Id: tkUtil.c,v 1.13 2005/11/13 00:45:47 dkf Exp $
  */
 
 #include "tkInt.h"
 #include "tkPort.h"
 
 /*
- * The structure below defines the implementation of the "statekey"
- * Tcl object, used for quickly finding a mapping in a TkStateMap.
+ * The structure below defines the implementation of the "statekey" Tcl
+ * object, used for quickly finding a mapping in a TkStateMap.
  */
 
 Tcl_ObjType tkStateKeyObjType = {
-    "statekey",				/* name */
-    (Tcl_FreeInternalRepProc *) NULL,	/* freeIntRepProc */
-    (Tcl_DupInternalRepProc *) NULL,	/* dupIntRepProc */
-    (Tcl_UpdateStringProc *) NULL,	/* updateStringProc */
-    (Tcl_SetFromAnyProc *) NULL		/* setFromAnyProc */
+    "statekey",			/* name */
+    NULL,			/* freeIntRepProc */
+    NULL,			/* dupIntRepProc */
+    NULL,			/* updateStringProc */
+    NULL			/* setFromAnyProc */
 };
-
 
 /*
  *--------------------------------------------------------------
  *
  * TkStateParseProc --
  *
- *	This procedure is invoked during option processing to handle
- *	the "-state" and "-default" options.
+ *	This function is invoked during option processing to handle the
+ *	"-state" and "-default" options.
  *
  * Results:
  *	A standard Tcl return value.
  *
  * Side effects:
- *	The state for a given item gets replaced by the state
- *	indicated in the value argument.
+ *	The state for a given item gets replaced by the state indicated in the
+ *	value argument.
  *
  *--------------------------------------------------------------
  */
 
 int
-TkStateParseProc(clientData, interp, tkwin, value, widgRec, offset)
-    ClientData clientData;		/* some flags.*/
-    Tcl_Interp *interp;			/* Used for reporting errors. */
-    Tk_Window tkwin;			/* Window containing canvas widget. */
-    CONST char *value;			/* Value of option. */
-    char *widgRec;			/* Pointer to record for item. */
-    int offset;				/* Offset into item. */
+TkStateParseProc(
+    ClientData clientData,	/* some flags.*/
+    Tcl_Interp *interp,		/* Used for reporting errors. */
+    Tk_Window tkwin,		/* Window containing canvas widget. */
+    CONST char *value,		/* Value of option. */
+    char *widgRec,		/* Pointer to record for item. */
+    int offset)			/* Offset into item. */
 {
     int c;
     int flags = (int)clientData;
@@ -90,18 +88,17 @@ TkStateParseProc(clientData, interp, tkwin, value, widgRec, offset)
     }
 
     Tcl_AppendResult(interp, "bad ", (flags&4)?"-default" : "state",
-	    " value \"", value, "\": must be normal",
-	    (char *) NULL);
+	    " value \"", value, "\": must be normal", NULL);
     if (flags&1) {
-	Tcl_AppendResult(interp, ", active",(char *) NULL);
+	Tcl_AppendResult(interp, ", active", NULL);
     }
     if (flags&2) {
-	Tcl_AppendResult(interp, ", hidden",(char *) NULL);
+	Tcl_AppendResult(interp, ", hidden", NULL);
     }
     if (flags&3) {
-	Tcl_AppendResult(interp, ",",(char *) NULL);
+	Tcl_AppendResult(interp, ",", NULL);
     }
-    Tcl_AppendResult(interp, " or disabled",(char *) NULL);
+    Tcl_AppendResult(interp, " or disabled", NULL);
     *statePtr = TK_STATE_NORMAL;
     return TCL_ERROR;
 }
@@ -111,16 +108,15 @@ TkStateParseProc(clientData, interp, tkwin, value, widgRec, offset)
  *
  * TkStatePrintProc --
  *
- *	This procedure is invoked by the Tk configuration code
- *	to produce a printable string for the "-state"
- *	configuration option.
+ *	This function is invoked by the Tk configuration code to produce a
+ *	printable string for the "-state" configuration option.
  *
  * Results:
- *	The return value is a string describing the state for
- *	the item referred to by "widgRec".  In addition, *freeProcPtr
- *	is filled in with the address of a procedure to call to free
- *	the result string when it's no longer needed (or NULL to
- *	indicate that the string doesn't need to be freed).
+ *	The return value is a string describing the state for the item
+ *	referred to by "widgRec". In addition, *freeProcPtr is filled in with
+ *	the address of a function to call to free the result string when it's
+ *	no longer needed (or NULL to indicate that the string doesn't need to
+ *	be freed).
  *
  * Side effects:
  *	None.
@@ -129,14 +125,14 @@ TkStateParseProc(clientData, interp, tkwin, value, widgRec, offset)
  */
 
 char *
-TkStatePrintProc(clientData, tkwin, widgRec, offset, freeProcPtr)
-    ClientData clientData;		/* Ignored. */
-    Tk_Window tkwin;			/* Window containing canvas widget. */
-    char *widgRec;			/* Pointer to record for item. */
-    int offset;				/* Offset into item. */
-    Tcl_FreeProc **freeProcPtr;		/* Pointer to variable to fill in with
-					 * information about how to reclaim
-					 * storage for return string. */
+TkStatePrintProc(
+    ClientData clientData,	/* Ignored. */
+    Tk_Window tkwin,		/* Window containing canvas widget. */
+    char *widgRec,		/* Pointer to record for item. */
+    int offset,			/* Offset into item. */
+    Tcl_FreeProc **freeProcPtr)	/* Pointer to variable to fill in with
+				 * information about how to reclaim storage
+				 * for return string. */
 {
     register Tk_State *statePtr = (Tk_State *) (widgRec + offset);
 
@@ -158,8 +154,8 @@ TkStatePrintProc(clientData, tkwin, widgRec, offset, freeProcPtr)
  *
  * TkOrientParseProc --
  *
- *	This procedure is invoked during option processing to handle
- *	the "-orient" option.
+ *	This function is invoked during option processing to handle the
+ *	"-orient" option.
  *
  * Results:
  *	A standard Tcl return value.
@@ -172,13 +168,13 @@ TkStatePrintProc(clientData, tkwin, widgRec, offset, freeProcPtr)
  */
 
 int
-TkOrientParseProc(clientData, interp, tkwin, value, widgRec, offset)
-    ClientData clientData;		/* some flags.*/
-    Tcl_Interp *interp;			/* Used for reporting errors. */
-    Tk_Window tkwin;			/* Window containing canvas widget. */
-    CONST char *value;			/* Value of option. */
-    char *widgRec;			/* Pointer to record for item. */
-    int offset;				/* Offset into item. */
+TkOrientParseProc(
+    ClientData clientData,	/* some flags.*/
+    Tcl_Interp *interp,		/* Used for reporting errors. */
+    Tk_Window tkwin,		/* Window containing canvas widget. */
+    CONST char *value,		/* Value of option. */
+    char *widgRec,		/* Pointer to record for item. */
+    int offset)			/* Offset into item. */
 {
     int c;
     size_t length;
@@ -202,8 +198,7 @@ TkOrientParseProc(clientData, interp, tkwin, value, widgRec, offset)
 	return TCL_OK;
     }
     Tcl_AppendResult(interp, "bad orientation \"", value,
-	    "\": must be vertical or horizontal",
-	    (char *) NULL);
+	    "\": must be vertical or horizontal", NULL);
     *orientPtr = 0;
     return TCL_ERROR;
 }
@@ -213,16 +208,15 @@ TkOrientParseProc(clientData, interp, tkwin, value, widgRec, offset)
  *
  * TkOrientPrintProc --
  *
- *	This procedure is invoked by the Tk configuration code
- *	to produce a printable string for the "-orient"
- *	configuration option.
+ *	This function is invoked by the Tk configuration code to produce a
+ *	printable string for the "-orient" configuration option.
  *
  * Results:
- *	The return value is a string describing the orientation for
- *	the item referred to by "widgRec".  In addition, *freeProcPtr
- *	is filled in with the address of a procedure to call to free
- *	the result string when it's no longer needed (or NULL to
- *	indicate that the string doesn't need to be freed).
+ *	The return value is a string describing the orientation for the item
+ *	referred to by "widgRec". In addition, *freeProcPtr is filled in with
+ *	the address of a function to call to free the result string when it's
+ *	no longer needed (or NULL to indicate that the string doesn't need to
+ *	be freed).
  *
  * Side effects:
  *	None.
@@ -231,14 +225,14 @@ TkOrientParseProc(clientData, interp, tkwin, value, widgRec, offset)
  */
 
 char *
-TkOrientPrintProc(clientData, tkwin, widgRec, offset, freeProcPtr)
-    ClientData clientData;		/* Ignored. */
-    Tk_Window tkwin;			/* Window containing canvas widget. */
-    char *widgRec;			/* Pointer to record for item. */
-    int offset;				/* Offset into item. */
-    Tcl_FreeProc **freeProcPtr;		/* Pointer to variable to fill in with
-					 * information about how to reclaim
-					 * storage for return string. */
+TkOrientPrintProc(
+    ClientData clientData,	/* Ignored. */
+    Tk_Window tkwin,		/* Window containing canvas widget. */
+    char *widgRec,		/* Pointer to record for item. */
+    int offset,			/* Offset into item. */
+    Tcl_FreeProc **freeProcPtr)	/* Pointer to variable to fill in with
+				 * information about how to reclaim storage
+				 * for return string. */
 {
     register int *statePtr = (int *) (widgRec + offset);
 
@@ -254,19 +248,20 @@ TkOrientPrintProc(clientData, tkwin, widgRec, offset, freeProcPtr)
  *
  * TkOffsetParseProc --
  *
- *	Converts the offset of a stipple or tile into the Tk_TSOffset structure.
+ *	Converts the offset of a stipple or tile into the Tk_TSOffset
+ *	structure.
  *
  *----------------------------------------------------------------------
  */
 
 int
-TkOffsetParseProc(clientData, interp, tkwin, value, widgRec, offset)
-    ClientData clientData;	/* not used */
-    Tcl_Interp *interp;		/* Interpreter to send results back to */
-    Tk_Window tkwin;		/* Window on same display as tile */
-    CONST char *value;		/* Name of image */
-    char *widgRec;		/* Widget structure record */
-    int offset;			/* Offset of tile in record */
+TkOffsetParseProc(
+    ClientData clientData,	/* not used */
+    Tcl_Interp *interp,		/* Interpreter to send results back to */
+    Tk_Window tkwin,		/* Window on same display as tile */
+    CONST char *value,		/* Name of image */
+    char *widgRec,		/* Widget structure record */
+    int offset)			/* Offset of tile in record */
 {
     Tk_TSOffset *offsetPtr = (Tk_TSOffset *)(widgRec + offset);
     Tk_TSOffset tsoffset;
@@ -281,58 +276,67 @@ TkOffsetParseProc(clientData, interp, tkwin, value, widgRec, offset)
     p = value;
 
     switch(value[0]) {
-	case '#':
-	    if (((int)clientData) & TK_OFFSET_RELATIVE) {
-		tsoffset.flags = TK_OFFSET_RELATIVE;
-		p++; break;
-	    }
-	    goto badTSOffset;
-	case 'e':
-	    switch(value[1]) {
-		case '\0':
-		    tsoffset.flags = TK_OFFSET_RIGHT|TK_OFFSET_MIDDLE;
-		    goto goodTSOffset;
-		case 'n':
-		    if (value[2]!='d' || value[3]!='\0') {goto badTSOffset;}
-		    tsoffset.flags = INT_MAX;
-		    goto goodTSOffset;
-	    }
-	case 'w':
-	    if (value[1] != '\0') {goto badTSOffset;}
-	    tsoffset.flags = TK_OFFSET_LEFT|TK_OFFSET_MIDDLE;
+    case '#':
+	if (((int)clientData) & TK_OFFSET_RELATIVE) {
+	    tsoffset.flags = TK_OFFSET_RELATIVE;
+	    p++;
+	    break;
+	}
+	goto badTSOffset;
+    case 'e':
+	switch(value[1]) {
+	case '\0':
+	    tsoffset.flags = TK_OFFSET_RIGHT|TK_OFFSET_MIDDLE;
 	    goto goodTSOffset;
 	case 'n':
-	    if ((value[1] != '\0') && (value[2] != '\0')) {
+	    if (value[2]!='d' || value[3]!='\0') {
 		goto badTSOffset;
 	    }
-	    switch(value[1]) {
-		case '\0': tsoffset.flags = TK_OFFSET_CENTER|TK_OFFSET_TOP;
-			   goto goodTSOffset;
-		case 'w': tsoffset.flags = TK_OFFSET_LEFT|TK_OFFSET_TOP;
-			   goto goodTSOffset;
-		case 'e': tsoffset.flags = TK_OFFSET_RIGHT|TK_OFFSET_TOP;
-			   goto goodTSOffset;
-	    }
+	    tsoffset.flags = INT_MAX;
+	    goto goodTSOffset;
+	}
+    case 'w':
+	if (value[1] != '\0') {goto badTSOffset;}
+	tsoffset.flags = TK_OFFSET_LEFT|TK_OFFSET_MIDDLE;
+	goto goodTSOffset;
+    case 'n':
+	if ((value[1] != '\0') && (value[2] != '\0')) {
 	    goto badTSOffset;
-	case 's':
-	    if ((value[1] != '\0') && (value[2] != '\0')) {
-		goto badTSOffset;
-	    }
-	    switch(value[1]) {
-		case '\0': tsoffset.flags = TK_OFFSET_CENTER|TK_OFFSET_BOTTOM;
-			   goto goodTSOffset;
-		case 'w': tsoffset.flags = TK_OFFSET_LEFT|TK_OFFSET_BOTTOM;
-			   goto goodTSOffset;
-		case 'e': tsoffset.flags = TK_OFFSET_RIGHT|TK_OFFSET_BOTTOM;
-			   goto goodTSOffset;
-	    }
+	}
+	switch(value[1]) {
+	case '\0':
+	    tsoffset.flags = TK_OFFSET_CENTER|TK_OFFSET_TOP;
+	    goto goodTSOffset;
+	case 'w':
+	    tsoffset.flags = TK_OFFSET_LEFT|TK_OFFSET_TOP;
+	    goto goodTSOffset;
+	case 'e':
+	    tsoffset.flags = TK_OFFSET_RIGHT|TK_OFFSET_TOP;
+	    goto goodTSOffset;
+	}
+	goto badTSOffset;
+    case 's':
+	if ((value[1] != '\0') && (value[2] != '\0')) {
 	    goto badTSOffset;
-	case 'c':
-	    if (strncmp(value, "center", strlen(value)) != 0) {
-		goto badTSOffset;
-	    }
-	    tsoffset.flags = TK_OFFSET_CENTER|TK_OFFSET_MIDDLE;
+	}
+	switch(value[1]) {
+	case '\0':
+	    tsoffset.flags = TK_OFFSET_CENTER|TK_OFFSET_BOTTOM;
+	    goto goodTSOffset;
+	case 'w':
+	    tsoffset.flags = TK_OFFSET_LEFT|TK_OFFSET_BOTTOM;
 	    goto goodTSOffset;
+	case 'e':
+	    tsoffset.flags = TK_OFFSET_RIGHT|TK_OFFSET_BOTTOM;
+	    goto goodTSOffset;
+	}
+	goto badTSOffset;
+    case 'c':
+	if (strncmp(value, "center", strlen(value)) != 0) {
+	    goto badTSOffset;
+	}
+	tsoffset.flags = TK_OFFSET_CENTER|TK_OFFSET_MIDDLE;
+	goto goodTSOffset;
     }
     if ((q = strchr(p,',')) == NULL) {
 	if (((int)clientData) & TK_OFFSET_INDEX) {
@@ -351,33 +355,31 @@ TkOffsetParseProc(clientData, interp, tkwin, value, widgRec, offset)
     if (result != TCL_OK) {
 	return TCL_ERROR;
     }
-    if (Tk_GetPixels(interp, tkwin, (char *) q+1, &tsoffset.yoffset) != TCL_OK) {
+    if (Tk_GetPixels(interp, tkwin, (char*)q+1, &tsoffset.yoffset) != TCL_OK) {
 	return TCL_ERROR;
     }
 
-
-goodTSOffset:
-    /* below is a hack to allow the stipple/tile offset to be stored
-     * in the internal tile structure. Most of the times, offsetPtr
-     * is a pointer to an already existing tile structure. However
-     * if this structure is not already created, we must do it
-     * with Tk_GetTile()!!!!;
+  goodTSOffset:
+    /*
+     * Below is a hack to allow the stipple/tile offset to be stored in the
+     * internal tile structure. Most of the times, offsetPtr is a pointer to
+     * an already existing tile structure. However if this structure is not
+     * already created, we must do it with Tk_GetTile()!!!!;
      */
 
-    memcpy(offsetPtr,&tsoffset, sizeof(Tk_TSOffset));
+    memcpy(offsetPtr, &tsoffset, sizeof(Tk_TSOffset));
     return TCL_OK;
 
-badTSOffset:
+  badTSOffset:
     Tcl_AppendResult(interp, "bad offset \"", value,
-	    "\": expected \"x,y\"", (char *) NULL);
+	    "\": expected \"x,y\"", NULL);
     if (((int) clientData) & TK_OFFSET_RELATIVE) {
-	Tcl_AppendResult(interp, ", \"#x,y\"", (char *) NULL);
+	Tcl_AppendResult(interp, ", \"#x,y\"", NULL);
     }
     if (((int) clientData) & TK_OFFSET_INDEX) {
-	Tcl_AppendResult(interp, ", <index>", (char *) NULL);
+	Tcl_AppendResult(interp, ", <index>", NULL);
     }
-    Tcl_AppendResult(interp, ", n, ne, e, se, s, sw, w, nw, or center",
-	    (char *) NULL);
+    Tcl_AppendResult(interp, ", n, ne, e, se, s, sw, w, nw, or center", NULL);
     return TCL_ERROR;
 }
 
@@ -395,12 +397,12 @@ badTSOffset:
  */
 
 char *
-TkOffsetPrintProc(clientData, tkwin, widgRec, offset, freeProcPtr)
-    ClientData clientData;	/* not used */
-    Tk_Window tkwin;		/* not used */
-    char *widgRec;		/* Widget structure record */
-    int offset;			/* Offset of tile in record */
-    Tcl_FreeProc **freeProcPtr;	/* not used */
+TkOffsetPrintProc(
+    ClientData clientData,	/* not used */
+    Tk_Window tkwin,		/* not used */
+    char *widgRec,		/* Widget structure record */
+    int offset,			/* Offset of tile in record */
+    Tcl_FreeProc **freeProcPtr)	/* not used */
 {
     Tk_TSOffset *offsetPtr = (Tk_TSOffset *)(widgRec + offset);
     char *p, *q;
@@ -438,7 +440,7 @@ TkOffsetPrintProc(clientData, tkwin, widgRec, offset, freeProcPtr)
 	} else if ((offsetPtr->flags) & TK_OFFSET_RIGHT) {
 	    return "se";
 	}
-    } 
+    }
     q = p = (char *) ckalloc(32);
     if ((offsetPtr->flags) & TK_OFFSET_RELATIVE) {
 	*q++ = '#';
@@ -448,7 +450,6 @@ TkOffsetPrintProc(clientData, tkwin, widgRec, offset, freeProcPtr)
     return p;
 }
 
-
 /*
  *----------------------------------------------------------------------
  *
@@ -460,14 +461,14 @@ TkOffsetPrintProc(clientData, tkwin, widgRec, offset, freeProcPtr)
  */
 
 int
-TkPixelParseProc(clientData, interp, tkwin, value, widgRec, offset)
-    ClientData clientData;	/* if non-NULL, negative values are
-				 * allowed as well */
-    Tcl_Interp *interp;		/* Interpreter to send results back to */
-    Tk_Window tkwin;		/* Window on same display as tile */
-    CONST char *value;		/* Name of image */
-    char *widgRec;		/* Widget structure record */
-    int offset;			/* Offset of tile in record */
+TkPixelParseProc(
+    ClientData clientData,	/* If non-NULL, negative values are allowed as
+				 * well */
+    Tcl_Interp *interp,		/* Interpreter to send results back to */
+    Tk_Window tkwin,		/* Window on same display as tile */
+    CONST char *value,		/* Name of image */
+    char *widgRec,		/* Widget structure record */
+    int offset)			/* Offset of tile in record */
 {
     double *doublePtr = (double *)(widgRec + offset);
     int result;
@@ -475,8 +476,7 @@ TkPixelParseProc(clientData, interp, tkwin, value, widgRec, offset)
     result = TkGetDoublePixels(interp, tkwin, value, doublePtr);
 
     if ((result == TCL_OK) && (clientData == NULL) && (*doublePtr < 0.0)) {
-	Tcl_AppendResult(interp, "bad screen distance \"", value,
-		"\"", (char *) NULL);
+	Tcl_AppendResult(interp, "bad screen distance \"", value, "\"", NULL);
 	return TCL_ERROR;
     }
     return result;
@@ -496,18 +496,18 @@ TkPixelParseProc(clientData, interp, tkwin, value, widgRec, offset)
  */
 
 char *
-TkPixelPrintProc(clientData, tkwin, widgRec, offset, freeProcPtr)
-    ClientData clientData;	/* not used */
-    Tk_Window tkwin;		/* not used */
-    char *widgRec;		/* Widget structure record */
-    int offset;			/* Offset of tile in record */
-    Tcl_FreeProc **freeProcPtr;	/* not used */
+TkPixelPrintProc(
+    ClientData clientData,	/* not used */
+    Tk_Window tkwin,		/* not used */
+    char *widgRec,		/* Widget structure record */
+    int offset,			/* Offset of tile in record */
+    Tcl_FreeProc **freeProcPtr)	/* not used */
 {
     double *doublePtr = (double *)(widgRec + offset);
     char *p;
 
     p = (char *) ckalloc(24);
-    Tcl_PrintDouble((Tcl_Interp *) NULL, *doublePtr, p);
+    Tcl_PrintDouble(NULL, *doublePtr, p);
     *freeProcPtr = TCL_DYNAMIC;
     return p;
 }
@@ -517,31 +517,31 @@ TkPixelPrintProc(clientData, tkwin, widgRec, offset, freeProcPtr)
  *
  * TkDrawInsetFocusHighlight --
  *
- *	This procedure draws a rectangular ring around the outside of
- *	a widget to indicate that it has received the input focus.  It
- *	takes an additional padding argument that specifies how much
- *	padding is present outside th widget.
+ *	This function draws a rectangular ring around the outside of a widget
+ *	to indicate that it has received the input focus. It takes an
+ *	additional padding argument that specifies how much padding is present
+ *	outside the widget.
  *
  * Results:
  *	None.
  *
  * Side effects:
- *	A rectangle "width" pixels wide is drawn in "drawable",
- *	corresponding to the outer area of "tkwin".
+ *	A rectangle "width" pixels wide is drawn in "drawable", corresponding
+ *	to the outer area of "tkwin".
  *
  *----------------------------------------------------------------------
  */
 
 void
-TkDrawInsetFocusHighlight(tkwin, gc, width, drawable, padding)
-    Tk_Window tkwin;		/* Window whose focus highlight ring is
-				 * to be drawn. */
-    GC gc;			/* Graphics context to use for drawing
-				 * the highlight ring. */
-    int width;			/* Width of the highlight ring, in pixels. */
-    Drawable drawable;		/* Where to draw the ring (typically a
-				 * pixmap for double buffering). */
-    int padding;		/* Width of padding outside of widget. */
+TkDrawInsetFocusHighlight(
+    Tk_Window tkwin,		/* Window whose focus highlight ring is to be
+				 * drawn. */
+    GC gc,			/* Graphics context to use for drawing the
+				 * highlight ring. */
+    int width,			/* Width of the highlight ring, in pixels. */
+    Drawable drawable,		/* Where to draw the ring (typically a pixmap
+				 * for double buffering). */
+    int padding)		/* Width of padding outside of widget. */
 {
     XRectangle rects[4];
 
@@ -569,34 +569,34 @@ TkDrawInsetFocusHighlight(tkwin, gc, width, drawable, padding)
  *
  * Tk_DrawFocusHighlight --
  *
- *	This procedure draws a rectangular ring around the outside of
- *	a widget to indicate that it has received the input focus.
+ *	This function draws a rectangular ring around the outside of a widget
+ *	to indicate that it has received the input focus.
  *
- *      This function is now deprecated.  Use TkpDrawHighlightBorder instead,
- *      since this function does not handle drawing the Focus ring properly
- *      on the Macintosh - you need to know the background GC as well 
- *      as the foreground since the Mac focus ring separated from the widget
- *      by a 1 pixel border.
+ *      This function is now deprecated. Use TkpDrawHighlightBorder instead,
+ *      since this function does not handle drawing the Focus ring properly on
+ *      the Macintosh - you need to know the background GC as well as the
+ *      foreground since the Mac focus ring separated from the widget by a 1
+ *      pixel border.
  *
  * Results:
  *	None.
  *
  * Side effects:
- *	A rectangle "width" pixels wide is drawn in "drawable",
- *	corresponding to the outer area of "tkwin".
+ *	A rectangle "width" pixels wide is drawn in "drawable", corresponding
+ *	to the outer area of "tkwin".
  *
  *----------------------------------------------------------------------
  */
 
 void
-Tk_DrawFocusHighlight(tkwin, gc, width, drawable)
-    Tk_Window tkwin;		/* Window whose focus highlight ring is
-				 * to be drawn. */
-    GC gc;			/* Graphics context to use for drawing
-				 * the highlight ring. */
-    int width;			/* Width of the highlight ring, in pixels. */
-    Drawable drawable;		/* Where to draw the ring (typically a
-				 * pixmap for double buffering). */
+Tk_DrawFocusHighlight(
+    Tk_Window tkwin,		/* Window whose focus highlight ring is to be
+				 * drawn. */
+    GC gc,			/* Graphics context to use for drawing the
+				 * highlight ring. */
+    int width,			/* Width of the highlight ring, in pixels. */
+    Drawable drawable)		/* Where to draw the ring (typically a pixmap
+				 * for double buffering). */
 {
     TkDrawInsetFocusHighlight(tkwin, gc, width, drawable, 0);
 }
@@ -606,19 +606,18 @@ Tk_DrawFocusHighlight(tkwin, gc, width, drawable)
  *
  * Tk_GetScrollInfo --
  *
- *	This procedure is invoked to parse "xview" and "yview"
- *	scrolling commands for widgets using the new scrolling
- *	command syntax ("moveto" or "scroll" options).
+ *	This function 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.
+ *	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.
@@ -627,14 +626,14 @@ Tk_DrawFocusHighlight(tkwin, gc, width, drawable)
  */
 
 int
-Tk_GetScrollInfo(interp, argc, argv, dblPtr, intPtr)
-    Tcl_Interp *interp;			/* Used for error reporting. */
-    int argc;				/* # arguments for command. */
-    CONST char **argv;			/* 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. */
+Tk_GetScrollInfo(
+    Tcl_Interp *interp,		/* Used for error reporting. */
+    int argc,			/* # arguments for command. */
+    CONST char **argv,		/* 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;
@@ -643,9 +642,8 @@ Tk_GetScrollInfo(interp, argc, argv, dblPtr, intPtr)
     c = argv[2][0];
     if ((c == 'm') && (strncmp(argv[2], "moveto", length) == 0)) {
 	if (argc != 4) {
-	    Tcl_AppendResult(interp, "wrong # args: should be \"",
-		    argv[0], " ", argv[1], " moveto fraction\"",
-		    (char *) NULL);
+	    Tcl_AppendResult(interp, "wrong # args: should be \"", argv[0],
+		    " ", argv[1], " moveto fraction\"", NULL);
 	    return TK_SCROLL_ERROR;
 	}
 	if (Tcl_GetDouble(interp, argv[3], dblPtr) != TCL_OK) {
@@ -655,9 +653,8 @@ Tk_GetScrollInfo(interp, argc, argv, dblPtr, intPtr)
     } else if ((c == 's')
 	    && (strncmp(argv[2], "scroll", length) == 0)) {
 	if (argc != 5) {
-	    Tcl_AppendResult(interp, "wrong # args: should be \"",
-		    argv[0], " ", argv[1], " scroll number units|pages\"",
-		    (char *) NULL);
+	    Tcl_AppendResult(interp, "wrong # args: should be \"", argv[0],
+		    " ", argv[1], " scroll number units|pages\"", NULL);
 	    return TK_SCROLL_ERROR;
 	}
 	if (Tcl_GetInt(interp, argv[3], intPtr) != TCL_OK) {
@@ -667,17 +664,16 @@ Tk_GetScrollInfo(interp, argc, argv, dblPtr, intPtr)
 	c = argv[4][0];
 	if ((c == 'p') && (strncmp(argv[4], "pages", length) == 0)) {
 	    return TK_SCROLL_PAGES;
-	} else if ((c == 'u')
-		&& (strncmp(argv[4], "units", length) == 0)) {
+	} else if ((c == 'u') && (strncmp(argv[4], "units", length) == 0)) {
 	    return TK_SCROLL_UNITS;
 	} else {
 	    Tcl_AppendResult(interp, "bad argument \"", argv[4],
-		    "\": must be units or pages", (char *) NULL);
+		    "\": must be units or pages", NULL);
 	    return TK_SCROLL_ERROR;
 	}
     }
     Tcl_AppendResult(interp, "unknown option \"", argv[2],
-	    "\": must be moveto or scroll", (char *) NULL);
+	    "\": must be moveto or scroll", NULL);
     return TK_SCROLL_ERROR;
 }
 
@@ -686,19 +682,18 @@ 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).
+ *	This function 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.
+ *	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.
@@ -707,14 +702,14 @@ Tk_GetScrollInfo(interp, argc, argv, dblPtr, intPtr)
  */
 
 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. */
+Tk_GetScrollInfoObj(
+    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;
@@ -746,17 +741,16 @@ Tk_GetScrollInfoObj(interp, objc, objv, dblPtr, intPtr)
 	c = arg4[0];
 	if ((c == 'p') && (strncmp(arg4, "pages", length) == 0)) {
 	    return TK_SCROLL_PAGES;
-	} else if ((c == 'u')
-		&& (strncmp(arg4, "units", length) == 0)) {
+	} 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);
+		    "\": must be units or pages", NULL);
 	    return TK_SCROLL_ERROR;
 	}
     }
     Tcl_AppendResult(interp, "unknown option \"", arg2,
-	    "\": must be moveto or scroll", (char *) NULL);
+	    "\": must be moveto or scroll", NULL);
     return TK_SCROLL_ERROR;
 }
 
@@ -766,66 +760,68 @@ Tk_GetScrollInfoObj(interp, objc, objv, dblPtr, intPtr)
  * TkComputeAnchor --
  *
  *	Determine where to place a rectangle so that it will be properly
- *	anchored with respect to the given window.  Used by widgets
- *	to align a box of text inside a window.  When anchoring with
- *	respect to one of the sides, the rectangle be placed inside of
- *	the internal border of the window.
+ *	anchored with respect to the given window. Used by widgets to align a
+ *	box of text inside a window. When anchoring with respect to one of the
+ *	sides, the rectangle be placed inside of the internal border of the
+ *	window.
  *
  * Results:
- *	*xPtr and *yPtr set to the upper-left corner of the rectangle
- *	anchored in the window.
+ *	*xPtr and *yPtr set to the upper-left corner of the rectangle anchored
+ *	in the window.
  *
  * Side effects:
  *	None.
  *
  *---------------------------------------------------------------------------
  */
+
 void
-TkComputeAnchor(anchor, tkwin, padX, padY, innerWidth, innerHeight, xPtr, yPtr)
-    Tk_Anchor anchor;		/* Desired anchor. */
-    Tk_Window tkwin;		/* Anchored with respect to this window. */
-    int padX, padY;		/* Use this extra padding inside window, in
+TkComputeAnchor(
+    Tk_Anchor anchor,		/* Desired anchor. */
+    Tk_Window tkwin,		/* Anchored with respect to this window. */
+    int padX, int padY,		/* Use this extra padding inside window, in
 				 * addition to the internal border. */
-    int innerWidth, innerHeight;/* Size of rectangle to anchor in window. */
-    int *xPtr, *yPtr;		/* Returns upper-left corner of anchored
+    int innerWidth, int innerHeight;
+				/* Size of rectangle to anchor in window. */
+    int *xPtr, int *yPtr)	/* Returns upper-left corner of anchored
 				 * rectangle. */
 {
     switch (anchor) {
-	case TK_ANCHOR_NW:
-	case TK_ANCHOR_W:
-	case TK_ANCHOR_SW:
-	    *xPtr = Tk_InternalBorderLeft(tkwin) + padX;
-	    break;
+    case TK_ANCHOR_NW:
+    case TK_ANCHOR_W:
+    case TK_ANCHOR_SW:
+	*xPtr = Tk_InternalBorderLeft(tkwin) + padX;
+	break;
 
-	case TK_ANCHOR_N:
-	case TK_ANCHOR_CENTER:
-	case TK_ANCHOR_S:
-	    *xPtr = (Tk_Width(tkwin) - innerWidth) / 2;
-	    break;
+    case TK_ANCHOR_N:
+    case TK_ANCHOR_CENTER:
+    case TK_ANCHOR_S:
+	*xPtr = (Tk_Width(tkwin) - innerWidth) / 2;
+	break;
 
-	default:
-	    *xPtr = Tk_Width(tkwin) - (Tk_InternalBorderRight(tkwin) + padX)
-		    - innerWidth;
-	    break;
+    default:
+	*xPtr = Tk_Width(tkwin) - (Tk_InternalBorderRight(tkwin) + padX)
+		- innerWidth;
+	break;
     }
 
     switch (anchor) {
-	case TK_ANCHOR_NW:
-	case TK_ANCHOR_N:
-	case TK_ANCHOR_NE:
-	    *yPtr = Tk_InternalBorderTop(tkwin) + padY;
-	    break;
-
-	case TK_ANCHOR_W:
-	case TK_ANCHOR_CENTER:
-	case TK_ANCHOR_E:
-	    *yPtr = (Tk_Height(tkwin) - innerHeight) / 2;
-	    break;
-
-	default:
-	    *yPtr = Tk_Height(tkwin) - Tk_InternalBorderBottom(tkwin) - padY
-		    - innerHeight;
-	    break;
+    case TK_ANCHOR_NW:
+    case TK_ANCHOR_N:
+    case TK_ANCHOR_NE:
+	*yPtr = Tk_InternalBorderTop(tkwin) + padY;
+	break;
+
+    case TK_ANCHOR_W:
+    case TK_ANCHOR_CENTER:
+    case TK_ANCHOR_E:
+	*yPtr = (Tk_Height(tkwin) - innerHeight) / 2;
+	break;
+
+    default:
+	*yPtr = Tk_Height(tkwin) - Tk_InternalBorderBottom(tkwin) - padY
+		- innerHeight;
+	break;
     }
 }
 
@@ -837,10 +833,9 @@ TkComputeAnchor(anchor, tkwin, padX, padY, innerWidth, innerHeight, xPtr, yPtr)
  *	Given a lookup table, map a number to a string in the table.
  *
  * Results:
- *	If numKey was equal to the numeric key of one of the elements
- *	in the table, returns the string key of that element.
- *	Returns NULL if numKey was not equal to any of the numeric keys
- *	in the table.
+ *	If numKey was equal to the numeric key of one of the elements in the
+ *	table, returns the string key of that element. Returns NULL if numKey
+ *	was not equal to any of the numeric keys in the table.
  *
  * Side effects.
  *	None.
@@ -849,9 +844,9 @@ TkComputeAnchor(anchor, tkwin, padX, padY, innerWidth, innerHeight, xPtr, yPtr)
  */
 
 char *
-TkFindStateString(mapPtr, numKey)
-    CONST TkStateMap *mapPtr;	/* The state table. */
-    int numKey;			/* The key to try to find in the table. */
+TkFindStateString(
+    CONST TkStateMap *mapPtr,	/* The state table. */
+    int numKey)			/* The key to try to find in the table. */
 {
     for ( ; mapPtr->strKey != NULL; mapPtr++) {
 	if (numKey == mapPtr->numKey) {
@@ -869,12 +864,12 @@ TkFindStateString(mapPtr, numKey)
  *	Given a lookup table, map a string to a number in the table.
  *
  * Results:
- *	If strKey was equal to the string keys of one of the elements
- *	in the table, returns the numeric key of that element.
- *	Returns the numKey associated with the last element (the NULL
- *	string one) in the table if strKey was not equal to any of the
- *	string keys in the table.  In that case, an error message is
- *	also left in the interp's result (if interp is not NULL).
+ *	If strKey was equal to the string keys of one of the elements in the
+ *	table, returns the numeric key of that element. Returns the numKey
+ *	associated with the last element (the NULL string one) in the table if
+ *	strKey was not equal to any of the string keys in the table. In that
+ *	case, an error message is also left in the interp's result (if interp
+ *	is not NULL).
  *
  * Side effects.
  *	None.
@@ -883,11 +878,11 @@ TkFindStateString(mapPtr, numKey)
  */
 
 int
-TkFindStateNum(interp, option, mapPtr, strKey)
-    Tcl_Interp *interp;		/* Interp for error reporting. */
-    CONST char *option;		/* String to use when constructing error. */
-    CONST TkStateMap *mapPtr;	/* Lookup table. */
-    CONST char *strKey;		/* String to try to find in lookup table. */
+TkFindStateNum(
+    Tcl_Interp *interp,		/* Interp for error reporting. */
+    CONST char *option,		/* String to use when constructing error. */
+    CONST TkStateMap *mapPtr,	/* Lookup table. */
+    CONST char *strKey)		/* String to try to find in lookup table. */
 {
     CONST TkStateMap *mPtr;
 
@@ -899,22 +894,22 @@ TkFindStateNum(interp, option, mapPtr, strKey)
     if (interp != NULL) {
 	mPtr = mapPtr;
 	Tcl_AppendResult(interp, "bad ", option, " value \"", strKey,
-		"\": must be ", mPtr->strKey, (char *) NULL);
+		"\": must be ", mPtr->strKey, NULL);
 	for (mPtr++; mPtr->strKey != NULL; mPtr++) {
-	    Tcl_AppendResult(interp, 
-		    ((mPtr[1].strKey != NULL) ? ", " : ", or "), 
-		    mPtr->strKey, (char *) NULL);
+	    Tcl_AppendResult(interp,
+		    ((mPtr[1].strKey != NULL) ? ", " : ", or "),
+		    mPtr->strKey, NULL);
 	}
     }
     return mPtr->numKey;
 }
 
 int
-TkFindStateNumObj(interp, optionPtr, mapPtr, keyPtr)
-    Tcl_Interp *interp;		/* Interp for error reporting. */
-    Tcl_Obj *optionPtr;		/* String to use when constructing error. */
-    CONST TkStateMap *mapPtr;	/* Lookup table. */
-    Tcl_Obj *keyPtr;		/* String key to find in lookup table. */
+TkFindStateNumObj(
+    Tcl_Interp *interp,		/* Interp for error reporting. */
+    Tcl_Obj *optionPtr,		/* String to use when constructing error. */
+    CONST TkStateMap *mapPtr,	/* Lookup table. */
+    Tcl_Obj *keyPtr)		/* String key to find in lookup table. */
 {
     CONST TkStateMap *mPtr;
     CONST char *key;
@@ -934,20 +929,27 @@ TkFindStateNumObj(interp, optionPtr, mapPtr, keyPtr)
 	    }
 	    keyPtr->internalRep.twoPtrValue.ptr1 = (VOID *) mapPtr;
 	    keyPtr->internalRep.twoPtrValue.ptr2 = (VOID *) mPtr->numKey;
-	    keyPtr->typePtr = &tkStateKeyObjType;	    
+	    keyPtr->typePtr = &tkStateKeyObjType;
 	    return mPtr->numKey;
 	}
     }
     if (interp != NULL) {
 	mPtr = mapPtr;
-	Tcl_AppendResult(interp, "bad ",
-		Tcl_GetStringFromObj(optionPtr, NULL), " value \"", key,
-		"\": must be ", mPtr->strKey, (char *) NULL);
+	Tcl_AppendResult(interp, "bad ", Tcl_GetString(optionPtr),
+		" value \"", key, "\": must be ", mPtr->strKey, NULL);
 	for (mPtr++; mPtr->strKey != NULL; mPtr++) {
-	    Tcl_AppendResult(interp, 
-		((mPtr[1].strKey != NULL) ? ", " : ", or "), 
-		mPtr->strKey, (char *) NULL);
+	    Tcl_AppendResult(interp,
+		((mPtr[1].strKey != NULL) ? ", " : ", or "),
+		mPtr->strKey, NULL);
 	}
     }
     return mPtr->numKey;
 }
+
+/*
+ * Local Variables:
+ * mode: c
+ * c-basic-offset: 4
+ * fill-column: 78
+ * End:
+ */