Getting more systematic about style

Also start removing _ANSI_ARGS_; the core's required ANSI C for a while now
Also fix [Bug 1252702]; size_t doesn't mix with Tcl_GetStringFromObj

1 files changed, 227 insertions, 220 deletions

diff --git a/generic/tkTextImage.c b/generic/tkTextImage.c
index fbbec00..fa95e3c 100644
--- a/generic/tkTextImage.c
+++ b/generic/tkTextImage.c
@@ -1,16 +1,15 @@
-/* 
+/*
  * tkImage.c --
  *
- *	This file contains code that allows images to be
- *	nested inside text widgets.  It also implements the "image"
- *	widget command for texts.
+ *	This file contains code that allows images to be nested inside text
+ *	widgets. It also implements the "image" widget command for texts.
  *
  * Copyright (c) 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: tkTextImage.c,v 1.14 2004/09/10 12:13:41 vincentdarley Exp $
+ * RCS: @(#) $Id: tkTextImage.c,v 1.15 2005/08/10 22:02:22 dkf Exp $
  */
 
 #include "tk.h"
@@ -21,52 +20,52 @@
  * Macro that determines the size of an embedded image segment:
  */
 
-#define EI_SEG_SIZE ((unsigned) (Tk_Offset(TkTextSegment, body) \
-	+ sizeof(TkTextEmbImage)))
+#define EI_SEG_SIZE \
+	((unsigned) (Tk_Offset(TkTextSegment, body) + sizeof(TkTextEmbImage)))
 
 /*
- * Prototypes for procedures defined in this file:
+ * Prototypes for functions defined in this file:
  */
 
-static TkTextSegment *	EmbImageCleanupProc _ANSI_ARGS_((TkTextSegment *segPtr,
-			    TkTextLine *linePtr));
-static void		EmbImageCheckProc _ANSI_ARGS_((TkTextSegment *segPtr,
-			    TkTextLine *linePtr));
-static void		EmbImageBboxProc _ANSI_ARGS_((TkText *textPtr,
-			    TkTextDispChunk *chunkPtr,
-			    int index, int y, int lineHeight, int baseline,
-			    int *xPtr, int *yPtr, int *widthPtr,
-			    int *heightPtr));
-static int		EmbImageConfigure _ANSI_ARGS_((TkText *textPtr,
-			    TkTextSegment *eiPtr, int objc, Tcl_Obj *CONST objv[]));
-static int		EmbImageDeleteProc _ANSI_ARGS_((TkTextSegment *segPtr,
-			    TkTextLine *linePtr, int treeGone));
-static void		EmbImageDisplayProc _ANSI_ARGS_((TkText *textPtr,
+static TkTextSegment *	EmbImageCleanupProc(TkTextSegment *segPtr,
+			    TkTextLine *linePtr);
+static void		EmbImageCheckProc(TkTextSegment *segPtr,
+			    TkTextLine *linePtr);
+static void		EmbImageBboxProc(TkText *textPtr,
+			    TkTextDispChunk *chunkPtr, int index, int y,
+			    int lineHeight, int baseline, int *xPtr, int *yPtr,
+			    int *widthPtr, int *heightPtr);
+static int		EmbImageConfigure(TkText *textPtr,
+			    TkTextSegment *eiPtr, int objc,
+			    Tcl_Obj *CONST objv[]);
+static int		EmbImageDeleteProc(TkTextSegment *segPtr,
+			    TkTextLine *linePtr, int treeGone);
+static void		EmbImageDisplayProc(TkText *textPtr,
 			    TkTextDispChunk *chunkPtr, int x, int y,
 			    int lineHeight, int baseline, Display *display,
-			    Drawable dst, int screenY));
-static int		EmbImageLayoutProc _ANSI_ARGS_((TkText *textPtr,
+			    Drawable dst, int screenY);
+static int		EmbImageLayoutProc(TkText *textPtr,
 			    TkTextIndex *indexPtr, TkTextSegment *segPtr,
 			    int offset, int maxX, int maxChars,
 			    int noCharsYet, TkWrapMode wrapMode,
-			    TkTextDispChunk *chunkPtr));
-static void		EmbImageProc _ANSI_ARGS_((ClientData clientData,
-			    int x, int y, int width, int height,
-			    int imageWidth, int imageHeight));
+			    TkTextDispChunk *chunkPtr);
+static void		EmbImageProc(ClientData clientData, int x, int y,
+			    int width, int height, int imageWidth,
+			    int imageHeight);
 
 /*
  * The following structure declares the "embedded image" segment type.
  */
 
 static Tk_SegType tkTextEmbImageType = {
-    "image",					/* name */
-    0,						/* leftGravity */
-    (Tk_SegSplitProc *) NULL,			/* splitProc */
-    EmbImageDeleteProc,				/* deleteProc */
-    EmbImageCleanupProc,			/* cleanupProc */
-    (Tk_SegLineChangeProc *) NULL,		/* lineChangeProc */
-    EmbImageLayoutProc,				/* layoutProc */
-    EmbImageCheckProc				/* checkProc */
+    "image",			/* name */
+    0,				/* leftGravity */
+    NULL,			/* splitProc */
+    EmbImageDeleteProc,		/* deleteProc */
+    EmbImageCleanupProc,	/* cleanupProc */
+    NULL,			/* lineChangeProc */
+    EmbImageLayoutProc,		/* layoutProc */
+    EmbImageCheckProc		/* checkProc */
 };
 
 /*
@@ -77,7 +76,7 @@ static char *alignStrings[] = {
     "baseline", "bottom", "center", "top", (char *) NULL
 };
 
-typedef enum {	
+typedef enum {
     ALIGN_BASELINE, ALIGN_BOTTOM, ALIGN_CENTER, ALIGN_TOP
 } alignMode;
 
@@ -87,13 +86,13 @@ typedef enum {
 
 static Tk_OptionSpec optionSpecs[] = {
     {TK_OPTION_STRING_TABLE, "-align", (char *) NULL, (char *) NULL,
-	"center", -1, Tk_Offset(TkTextEmbImage, align), 
+	"center", -1, Tk_Offset(TkTextEmbImage, align),
 	0, (ClientData) alignStrings, 0},
     {TK_OPTION_PIXELS, "-padx", (char *) NULL, (char *) NULL,
-	"0", -1, Tk_Offset(TkTextEmbImage, padX), 
+	"0", -1, Tk_Offset(TkTextEmbImage, padX),
 	0, 0, 0},
     {TK_OPTION_PIXELS, "-pady", (char *) NULL, (char *) NULL,
-	"0", -1, Tk_Offset(TkTextEmbImage, padY), 
+	"0", -1, Tk_Offset(TkTextEmbImage, padY),
 	0, 0, 0},
     {TK_OPTION_STRING, "-image", (char *) NULL, (char *) NULL,
 	(char *) NULL, -1, Tk_Offset(TkTextEmbImage, imageString),
@@ -110,9 +109,8 @@ static Tk_OptionSpec optionSpecs[] = {
  *
  * TkTextImageCmd --
  *
- *	This procedure implements the "image" widget command
- *	for text widgets.  See the user documentation for details
- *	on what it does.
+ *	This function implements the "image" widget command for text widgets.
+ *	See the user documentation for details on what it does.
  *
  * Results:
  *	A standard Tcl result or error.
@@ -141,7 +139,7 @@ TkTextImageCmd(textPtr, interp, objc, objv)
     enum opts {
 	CMD_CGET, CMD_CONF, CMD_CREATE, CMD_NAMES
     };
-    
+
     if (objc < 3) {
 	Tcl_WrongNumArgs(interp, 2, objv, "option ?arg arg ...?");
 	return TCL_ERROR;
@@ -152,7 +150,8 @@ TkTextImageCmd(textPtr, interp, objc, objv)
     }
     switch ((enum opts) idx) {
     case CMD_CGET: {
-        Tcl_Obj *objPtr;
+	Tcl_Obj *objPtr;
+
 	if (objc != 5) {
 	    Tcl_WrongNumArgs(interp, 3, objv, "index option");
 	    return TCL_ERROR;
@@ -163,11 +162,11 @@ TkTextImageCmd(textPtr, interp, objc, objv)
 	eiPtr = TkTextIndexToSeg(&index, (int *) NULL);
 	if (eiPtr->typePtr != &tkTextEmbImageType) {
 	    Tcl_AppendResult(interp, "no embedded image at index \"",
-			     Tcl_GetString(objv[3]), "\"", (char *) NULL);
+		    Tcl_GetString(objv[3]), "\"", (char *) NULL);
 	    return TCL_ERROR;
 	}
 	objPtr = Tk_GetOptionValue(interp, (char *) &eiPtr->body.ei,
-		  eiPtr->body.ei.optionTable, objv[4], textPtr->tkwin);
+		eiPtr->body.ei.optionTable, objv[4], textPtr->tkwin);
 	if (objPtr == NULL) {
 	    return TCL_ERROR;
 	} else {
@@ -175,7 +174,7 @@ TkTextImageCmd(textPtr, interp, objc, objv)
 	    return TCL_OK;
 	}
     }
-    case CMD_CONF: {
+    case CMD_CONF:
 	if (objc < 4) {
 	    Tcl_WrongNumArgs(interp, 3, objv, "index ?option value ...?");
 	    return TCL_ERROR;
@@ -186,14 +185,13 @@ TkTextImageCmd(textPtr, interp, objc, objv)
 	eiPtr = TkTextIndexToSeg(&index, (int *) NULL);
 	if (eiPtr->typePtr != &tkTextEmbImageType) {
 	    Tcl_AppendResult(interp, "no embedded image at index \"",
-			     Tcl_GetString(objv[3]), "\"", (char *) NULL);
+		    Tcl_GetString(objv[3]), "\"", (char *) NULL);
 	    return TCL_ERROR;
 	}
 	if (objc <= 5) {
-	    Tcl_Obj* objPtr = Tk_GetOptionInfo(interp, (char *) &eiPtr->body.ei,
-		    eiPtr->body.ei.optionTable,
-		    (objc == 5) ? objv[4] : (Tcl_Obj *) NULL,
-				      textPtr->tkwin);
+	    Tcl_Obj* objPtr = Tk_GetOptionInfo(interp,
+		    (char *) &eiPtr->body.ei, eiPtr->body.ei.optionTable,
+		    (objc == 5) ? objv[4] : (Tcl_Obj *) NULL, textPtr->tkwin);
 	    if (objPtr == NULL) {
 		return TCL_ERROR;
 	    } else {
@@ -202,23 +200,23 @@ TkTextImageCmd(textPtr, interp, objc, objv)
 	    }
 	} else {
 	    TkTextChanged(textPtr->sharedTextPtr, NULL, &index, &index);
-	    /* 
-	     * It's probably not true that all window configuration
-	     * can change the line height, so we could be more
-	     * efficient here and only call this when necessary.
+
+	    /*
+	     * It's probably not true that all window configuration can change
+	     * the line height, so we could be more efficient here and only
+	     * call this when necessary.
 	     */
-	    TkTextInvalidateLineMetrics(textPtr->sharedTextPtr, NULL, 
-					index.linePtr, 0,
-					TK_TEXT_INVALIDATE_ONLY);
+
+	    TkTextInvalidateLineMetrics(textPtr->sharedTextPtr, NULL,
+		    index.linePtr, 0, TK_TEXT_INVALIDATE_ONLY);
 	    return EmbImageConfigure(textPtr, eiPtr, objc-4, objv+4);
 	}
-    }
     case CMD_CREATE: {
 	int lineIndex;
 
 	/*
-	 * Add a new image.  Find where to put the new image, and
-	 * mark that position for redisplay.
+	 * Add a new image. Find where to put the new image, and mark that
+	 * position for redisplay.
 	 */
 
 	if (objc < 4) {
@@ -232,12 +230,13 @@ TkTextImageCmd(textPtr, interp, objc, objv)
 	/*
 	 * Don't allow insertions on the last (dummy) line of the text.
 	 */
-    
+
 	lineIndex = TkBTreeLinesTo(textPtr, index.linePtr);
-	if (lineIndex == TkBTreeNumLines(textPtr->sharedTextPtr->tree, textPtr)) {
+	if (lineIndex == TkBTreeNumLines(textPtr->sharedTextPtr->tree,
+		textPtr)) {
 	    lineIndex--;
-	    TkTextMakeByteIndex(textPtr->sharedTextPtr->tree, textPtr, 
-				lineIndex, 1000000, &index);
+	    TkTextMakeByteIndex(textPtr->sharedTextPtr->tree, textPtr,
+		    lineIndex, 1000000, &index);
 	}
 
 	/*
@@ -259,8 +258,8 @@ TkTextImageCmd(textPtr, interp, objc, objv)
 	eiPtr->body.ei.optionTable = Tk_CreateOptionTable(interp, optionSpecs);
 
 	/*
-	 * Link the segment into the text widget, then configure it (delete
-	 * it again if the configuration fails).
+	 * Link the segment into the text widget, then configure it (delete it
+	 * again if the configuration fails).
 	 */
 
 	TkTextChanged(textPtr->sharedTextPtr, NULL, &index, &index);
@@ -272,9 +271,8 @@ TkTextImageCmd(textPtr, interp, objc, objv)
 	    TkBTreeDeleteChars(textPtr->sharedTextPtr->tree, &index, &index2);
 	    return TCL_ERROR;
 	}
-	TkTextInvalidateLineMetrics(textPtr->sharedTextPtr, NULL, 
-				    index.linePtr, 0,
-				    TK_TEXT_INVALIDATE_ONLY);
+	TkTextInvalidateLineMetrics(textPtr->sharedTextPtr, NULL,
+		index.linePtr, 0, TK_TEXT_INVALIDATE_ONLY);
 	return TCL_OK;
     }
     case CMD_NAMES: {
@@ -285,8 +283,8 @@ TkTextImageCmd(textPtr, interp, objc, objv)
 	    Tcl_WrongNumArgs(interp, 3, objv, NULL);
 	    return TCL_ERROR;
 	}
-	for (hPtr = Tcl_FirstHashEntry(&textPtr->sharedTextPtr->imageTable, &search);
-		hPtr != NULL; hPtr = Tcl_NextHashEntry(&search)) {
+	for (hPtr = Tcl_FirstHashEntry(&textPtr->sharedTextPtr->imageTable,
+		&search); hPtr != NULL; hPtr = Tcl_NextHashEntry(&search)) {
 	    Tcl_AppendElement(interp,
 		    Tcl_GetHashKey(&textPtr->sharedTextPtr->markTable, hPtr));
 	}
@@ -303,24 +301,24 @@ TkTextImageCmd(textPtr, interp, objc, objv)
  *
  * EmbImageConfigure --
  *
- *	This procedure is called to handle configuration options
- *	for an embedded image, using an objc/objv list.
+ *	This function is called to handle configuration options for an
+ *	embedded image, using an objc/objv list.
  *
  * Results:
- *	The return value is a standard Tcl result.  If TCL_ERROR is
- *	returned, then the interp's result contains an error message..
+ *	The return value is a standard Tcl result. If TCL_ERROR is returned,
+ *	then the interp's result contains an error message..
  *
  * Side effects:
- *	Configuration information for the embedded image changes,
- *	such as alignment, or name of the image.
+ *	Configuration information for the embedded image changes, such as
+ *	alignment, or name of the image.
  *
  *--------------------------------------------------------------
  */
 
 static int
 EmbImageConfigure(textPtr, eiPtr, objc, objv)
-    TkText *textPtr;		/* Information about text widget that
-				 * contains embedded image. */
+    TkText *textPtr;		/* Information about text widget that contains
+				 * embedded image. */
     TkTextSegment *eiPtr;	/* Embedded image to be configured. */
     int objc;			/* Number of strings in objv. */
     Tcl_Obj *CONST objv[];	/* Array of strings describing configuration
@@ -335,24 +333,23 @@ EmbImageConfigure(textPtr, eiPtr, objc, objv)
     int count = 0;		/* The counter for picking a unique name */
     int conflict = 0;		/* True if we have a name conflict */
     unsigned int len;		/* length of image name */
-   
-    if (Tk_SetOptions(textPtr->interp, (char*)&eiPtr->body.ei, 
+
+    if (Tk_SetOptions(textPtr->interp, (char*)&eiPtr->body.ei,
 	    eiPtr->body.ei.optionTable,
 	    objc, objv, textPtr->tkwin, NULL, NULL) != TCL_OK) {
 	return TCL_ERROR;
     }
 
     /*
-     * Create the image.  Save the old image around and don't free it
-     * until after the new one is allocated.  This keeps the reference
-     * count from going to zero so the image doesn't have to be recreated
-     * if it hasn't changed.
+     * Create the image. Save the old image around and don't free it until
+     * after the new one is allocated. This keeps the reference count from
+     * going to zero so the image doesn't have to be recreated if it hasn't
+     * changed.
      */
 
     if (eiPtr->body.ei.imageString != NULL) {
-	image = Tk_GetImage(textPtr->interp, textPtr->tkwin, 
-			    eiPtr->body.ei.imageString, EmbImageProc, 
-			    (ClientData) eiPtr);
+	image = Tk_GetImage(textPtr->interp, textPtr->tkwin,
+		eiPtr->body.ei.imageString, EmbImageProc, (ClientData) eiPtr);
 	if (image == NULL) {
 	    return TCL_ERROR;
 	}
@@ -368,10 +365,10 @@ EmbImageConfigure(textPtr, eiPtr, objc, objv)
     	return TCL_OK;
     }
 
-    /* 
-     * Find a unique name for this image.  Use imageName (or imageString)
-     * if available, otherwise tack on a #nn and use it.  If a name is
-     * already associated with this image, delete the name.
+    /*
+     * Find a unique name for this image. Use imageName (or imageString) if
+     * available, otherwise tack on a #nn and use it. If a name is already
+     * associated with this image, delete the name.
      */
 
     name = eiPtr->body.ei.imageName;
@@ -379,16 +376,17 @@ EmbImageConfigure(textPtr, eiPtr, objc, objv)
     	name = eiPtr->body.ei.imageString;
     }
     if (name == NULL) {
-        Tcl_AppendResult(textPtr->interp,"Either a \"-name\" ",
+	Tcl_AppendResult(textPtr->interp,"Either a \"-name\" ",
 		"or a \"-image\" argument must be provided ",
-		"to the \"image create\" subcommand.",
-		(char *) NULL);
+		"to the \"image create\" subcommand.", (char *) NULL);
 	return TCL_ERROR;
     }
     len = strlen(name);
-    for (hPtr = Tcl_FirstHashEntry(&textPtr->sharedTextPtr->imageTable, &search);
-	    hPtr != NULL; hPtr = Tcl_NextHashEntry(&search)) {
-	char *haveName = Tcl_GetHashKey(&textPtr->sharedTextPtr->imageTable, hPtr);
+    for (hPtr = Tcl_FirstHashEntry(&textPtr->sharedTextPtr->imageTable,
+	    &search); hPtr != NULL; hPtr = Tcl_NextHashEntry(&search)) {
+	char *haveName =
+		Tcl_GetHashKey(&textPtr->sharedTextPtr->imageTable, hPtr);
+
 	if (strncmp(name, haveName, len) == 0) {
 	    new = 0;
 	    sscanf(haveName+len, "#%d", &new);
@@ -406,11 +404,12 @@ EmbImageConfigure(textPtr, eiPtr, objc, objv)
 
     if (conflict) {
     	char buf[4 + TCL_INTEGER_SPACE];
+
 	sprintf(buf, "#%d", count+1);
 	Tcl_DStringAppend(&newName, buf, -1);
     }
     name = Tcl_DStringValue(&newName);
-    hPtr = Tcl_CreateHashEntry(&textPtr->sharedTextPtr->imageTable, name, &new);
+    hPtr = Tcl_CreateHashEntry(&textPtr->sharedTextPtr->imageTable, name,&new);
     Tcl_SetHashValue(hPtr, eiPtr);
     Tcl_AppendResult(textPtr->interp, name , (char *) NULL);
     eiPtr->body.ei.name = ckalloc((unsigned) Tcl_DStringLength(&newName)+1);
@@ -425,8 +424,8 @@ EmbImageConfigure(textPtr, eiPtr, objc, objv)
  *
  * EmbImageDeleteProc --
  *
- *	This procedure is invoked by the text B-tree code whenever
- *	an embedded image lies in a range of characters being deleted.
+ *	This function is invoked by the text B-tree code whenever an embedded
+ *	image lies in a range of characters being deleted.
  *
  * Results:
  *	Returns 0 to indicate that the deletion has been accepted.
@@ -441,11 +440,11 @@ EmbImageConfigure(textPtr, eiPtr, objc, objv)
 	/* ARGSUSED */
 static int
 EmbImageDeleteProc(eiPtr, linePtr, treeGone)
-    TkTextSegment *eiPtr;		/* Segment being deleted. */
-    TkTextLine *linePtr;		/* Line containing segment. */
-    int treeGone;			/* Non-zero means the entire tree is
-					 * being deleted, so everything must
-					 * get cleaned up. */
+    TkTextSegment *eiPtr;	/* Segment being deleted. */
+    TkTextLine *linePtr;	/* Line containing segment. */
+    int treeGone;		/* Non-zero means the entire tree is being
+				 * deleted, so everything must get cleaned
+				 * up. */
 {
     Tcl_HashEntry *hPtr;
 
@@ -463,12 +462,14 @@ EmbImageDeleteProc(eiPtr, linePtr, treeGone)
 	}
 	Tk_FreeImage(eiPtr->body.ei.image);
     }
-    /* 
-     * No need to supply a tkwin argument, since we have no
-     * window-specific options.
+
+    /*
+     * No need to supply a tkwin argument, since we have no window-specific
+     * options.
      */
+
     Tk_FreeConfigOptions((char *) &eiPtr->body.ei, eiPtr->body.ei.optionTable,
-			 NULL);
+	    NULL);
     ckfree((char *) eiPtr);
     return 0;
 }
@@ -478,9 +479,8 @@ EmbImageDeleteProc(eiPtr, linePtr, treeGone)
  *
  * EmbImageCleanupProc --
  *
- *	This procedure is invoked by the B-tree code whenever a
- *	segment containing an embedded image is moved from one
- *	line to another.
+ *	This function is invoked by the B-tree code whenever a segment
+ *	containing an embedded image is moved from one line to another.
  *
  * Results:
  *	None.
@@ -493,8 +493,8 @@ EmbImageDeleteProc(eiPtr, linePtr, treeGone)
 
 static TkTextSegment *
 EmbImageCleanupProc(eiPtr, linePtr)
-    TkTextSegment *eiPtr;		/* Mark segment that's being moved. */
-    TkTextLine *linePtr;		/* Line that now contains segment. */
+    TkTextSegment *eiPtr;	/* Mark segment that's being moved. */
+    TkTextLine *linePtr;	/* Line that now contains segment. */
 {
     eiPtr->body.ei.linePtr = linePtr;
     return eiPtr;
@@ -505,12 +505,11 @@ EmbImageCleanupProc(eiPtr, linePtr)
  *
  * EmbImageLayoutProc --
  *
- *	This procedure is the "layoutProc" for embedded image
- *	segments.
+ *	This function is the "layoutProc" for embedded image segments.
  *
  * Results:
- *	1 is returned to indicate that the segment should be
- *	displayed.  The chunkPtr structure is filled in.
+ *	1 is returned to indicate that the segment should be displayed. The
+ *	chunkPtr structure is filled in.
  *
  * Side effects:
  *	None, except for filling in chunkPtr.
@@ -529,16 +528,17 @@ EmbImageLayoutProc(textPtr, indexPtr, eiPtr, offset, maxX, maxChars,
 				 * indexPtr (always 0). */
     int maxX;			/* Chunk must not occupy pixels at this
 				 * position or higher. */
-    int maxChars;		/* Chunk must not include more than this
-				 * many characters. */
+    int maxChars;		/* Chunk must not include more than this many
+				 * characters. */
     int noCharsYet;		/* Non-zero means no characters have been
 				 * assigned to this line yet. */
-    TkWrapMode wrapMode;	/* Wrap mode to use for line: TEXT_WRAPMODE_CHAR,
-				 * TEXT_WRAPMODE_NONE, or TEXT_WRAPMODE_WORD. */
+    TkWrapMode wrapMode;	/* Wrap mode to use for line:
+				 * TEXT_WRAPMODE_CHAR, TEXT_WRAPMODE_NONE, or
+				 * TEXT_WRAPMODE_WORD. */
     register TkTextDispChunk *chunkPtr;
-				/* Structure to fill in with information
-				 * about this chunk.  The x field has already
-				 * been set by the caller. */
+				/* Structure to fill in with information about
+				 * this chunk. The x field has already been
+				 * set by the caller. */
 {
     int width, height;
 
@@ -594,29 +594,30 @@ EmbImageLayoutProc(textPtr, indexPtr, eiPtr, offset, maxX, maxChars,
  *
  * EmbImageCheckProc --
  *
- *	This procedure is invoked by the B-tree code to perform
- *	consistency checks on embedded images.
+ *	This function is invoked by the B-tree code to perform consistency
+ *	checks on embedded images.
  *
  * Results:
  *	None.
  *
  * Side effects:
- *	The procedure panics if it detects anything wrong with
- *	the embedded image.
+ *	The function panics if it detects anything wrong with the embedded
+ *	image.
  *
  *--------------------------------------------------------------
  */
 
 static void
 EmbImageCheckProc(eiPtr, linePtr)
-    TkTextSegment *eiPtr;		/* Segment to check. */
-    TkTextLine *linePtr;		/* Line containing segment. */
+    TkTextSegment *eiPtr;	/* Segment to check. */
+    TkTextLine *linePtr;	/* Line containing segment. */
 {
     if (eiPtr->nextPtr == NULL) {
 	Tcl_Panic("EmbImageCheckProc: embedded image is last segment in line");
     }
     if (eiPtr->size != 1) {
-	Tcl_Panic("EmbImageCheckProc: embedded image has size %d", eiPtr->size);
+	Tcl_Panic("EmbImageCheckProc: embedded image has size %d",
+		eiPtr->size);
     }
 }
 
@@ -625,39 +626,36 @@ EmbImageCheckProc(eiPtr, linePtr)
  *
  * EmbImageDisplayProc --
  *
- *	This procedure is invoked by the text displaying code
- *	when it is time to actually draw an embedded image
- *	chunk on the screen.
+ *	This function is invoked by the text displaying code when it is time
+ *	to actually draw an embedded image chunk on the screen.
  *
  * Results:
  *	None.
  *
  * Side effects:
- *	The embedded image gets moved to the correct location
- *	and drawn onto the display.
+ *	The embedded image gets moved to the correct location and drawn onto
+ *	the display.
  *
  *--------------------------------------------------------------
  */
 
 static void
-EmbImageDisplayProc(textPtr, chunkPtr, x, y, lineHeight, baseline, display, 
-		    dst, screenY)
+EmbImageDisplayProc(textPtr, chunkPtr, x, y, lineHeight, baseline, display,
+	dst, screenY)
     TkText *textPtr;
-    TkTextDispChunk *chunkPtr;		/* Chunk that is to be drawn. */
-    int x;				/* X-position in dst at which to
-					 * draw this chunk (differs from
-					 * the x-position in the chunk because
-					 * of scrolling). */
-    int y;				/* Top of rectangular bounding box
-					 * for line: tells where to draw this
-					 * chunk in dst (x-position is in
-					 * the chunk itself). */
-    int lineHeight;			/* Total height of line. */
-    int baseline;			/* Offset of baseline from y. */
-    Display *display;			/* Display to use for drawing. */
-    Drawable dst;			/* Pixmap or window in which to draw */
-    int screenY;			/* Y-coordinate in text window that
-					 * corresponds to y. */
+    TkTextDispChunk *chunkPtr;	/* Chunk that is to be drawn. */
+    int x;			/* X-position in dst at which to draw this
+				 * chunk (differs from the x-position in the
+				 * chunk because of scrolling). */
+    int y;			/* Top of rectangular bounding box for line:
+				 * tells where to draw this chunk in dst
+				 * (x-position is in the chunk itself). */
+    int lineHeight;		/* Total height of line. */
+    int baseline;		/* Offset of baseline from y. */
+    Display *display;		/* Display to use for drawing. */
+    Drawable dst;		/* Pixmap or window in which to draw */
+    int screenY;		/* Y-coordinate in text window that
+				 * corresponds to y. */
 {
     TkTextSegment *eiPtr = (TkTextSegment *) chunkPtr->clientData;
     int lineX, imageX, imageY, width, height;
@@ -672,16 +670,15 @@ EmbImageDisplayProc(textPtr, chunkPtr, x, y, lineHeight, baseline, display,
     }
 
     /*
-     * Compute the image's location and size in the text widget, taking
-     * into account the align value for the image.
+     * Compute the image's location and size in the text widget, taking into
+     * account the align value for the image.
      */
 
     EmbImageBboxProc(textPtr, chunkPtr, 0, y, lineHeight, baseline, &lineX,
 	    &imageY, &width, &height);
     imageX = lineX - chunkPtr->x + x;
 
-    Tk_RedrawImage(image, 0, 0, width, height, dst,
-	    imageX, imageY);
+    Tk_RedrawImage(image, 0, 0, width, height, dst, imageX, imageY);
 }
 
 /*
@@ -689,17 +686,16 @@ EmbImageDisplayProc(textPtr, chunkPtr, x, y, lineHeight, baseline, display,
  *
  * EmbImageBboxProc --
  *
- *	This procedure is called to compute the bounding box of
- *	the area occupied by an embedded image.
+ *	This function is called to compute the bounding box of the area
+ *	occupied by an embedded image.
  *
  * Results:
- *	There is no return value.  *xPtr and *yPtr are filled in
- *	with the coordinates of the upper left corner of the
- *	image, and *widthPtr and *heightPtr are filled in with
- *	the dimensions of the image in pixels.  Note:  not all
- *	of the returned bbox is necessarily visible on the screen
- *	(the rightmost part might be off-screen to the right,
- *	and the bottommost part might be off-screen to the bottom).
+ *	There is no return value. *xPtr and *yPtr are filled in with the
+ *	coordinates of the upper left corner of the image, and *widthPtr and
+ *	*heightPtr are filled in with the dimensions of the image in pixels.
+ *	Note: not all of the returned bbox is necessarily visible on the
+ *	screen (the rightmost part might be off-screen to the right, and the
+ *	bottommost part might be off-screen to the bottom).
  *
  * Side effects:
  *	None.
@@ -711,20 +707,20 @@ static void
 EmbImageBboxProc(textPtr, chunkPtr, index, y, lineHeight, baseline, xPtr, yPtr,
 	widthPtr, heightPtr)
     TkText *textPtr;
-    TkTextDispChunk *chunkPtr;		/* Chunk containing desired char. */
-    int index;				/* Index of desired character within
-					 * the chunk. */
-    int y;				/* Topmost pixel in area allocated
-					 * for this line. */
-    int lineHeight;			/* Total height of line. */
-    int baseline;			/* Location of line's baseline, in
-					 * pixels measured down from y. */
-    int *xPtr, *yPtr;			/* Gets filled in with coords of
-					 * character's upper-left pixel. */
-    int *widthPtr;			/* Gets filled in with width of
-					 * image, in pixels. */
-    int *heightPtr;			/* Gets filled in with height of
-					 * image, in pixels. */
+    TkTextDispChunk *chunkPtr;	/* Chunk containing desired char. */
+    int index;			/* Index of desired character within the
+				 * chunk. */
+    int y;			/* Topmost pixel in area allocated for this
+				 * line. */
+    int lineHeight;		/* Total height of line. */
+    int baseline;		/* Location of line's baseline, in pixels
+				 * measured down from y. */
+    int *xPtr, *yPtr;		/* Gets filled in with coords of character's
+				 * upper-left pixel. */
+    int *widthPtr;		/* Gets filled in with width of image, in
+				 * pixels. */
+    int *heightPtr;		/* Gets filled in with height of image, in
+				 * pixels. */
 {
     TkTextSegment *eiPtr = (TkTextSegment *) chunkPtr->clientData;
     Tk_Image image;
@@ -736,20 +732,22 @@ EmbImageBboxProc(textPtr, chunkPtr, index, y, lineHeight, baseline, xPtr, yPtr,
 	*widthPtr = 0;
 	*heightPtr = 0;
     }
+
     *xPtr = chunkPtr->x + eiPtr->body.ei.padX;
+
     switch (eiPtr->body.ei.align) {
-	case ALIGN_BOTTOM:
-	    *yPtr = y + (lineHeight - *heightPtr - eiPtr->body.ei.padY);
-	    break;
-	case ALIGN_CENTER:
-	    *yPtr = y + (lineHeight - *heightPtr)/2;
-	    break;
-	case ALIGN_TOP:
-	    *yPtr = y + eiPtr->body.ei.padY;
-	    break;
-	case ALIGN_BASELINE:
-	    *yPtr = y + (baseline - *heightPtr);
-	    break;
+    case ALIGN_BOTTOM:
+	*yPtr = y + (lineHeight - *heightPtr - eiPtr->body.ei.padY);
+	break;
+    case ALIGN_CENTER:
+	*yPtr = y + (lineHeight - *heightPtr)/2;
+	break;
+    case ALIGN_TOP:
+	*yPtr = y + eiPtr->body.ei.padY;
+	break;
+    case ALIGN_BASELINE:
+	*yPtr = y + (baseline - *heightPtr);
+	break;
     }
 }
 
@@ -758,14 +756,13 @@ EmbImageBboxProc(textPtr, chunkPtr, index, y, lineHeight, baseline, xPtr, yPtr,
  *
  * TkTextImageIndex --
  *
- *	Given the name of an embedded image within a text widget,
- *	returns an index corresponding to the image's position
- *	in the text.
+ *	Given the name of an embedded image within a text widget, returns an
+ *	index corresponding to the image's position in the text.
  *
  * Results:
- *	The return value is 1 if there is an embedded image by
- *	the given name in the text widget, 0 otherwise.  If the
- *	image exists, *indexPtr is filled in with its index.
+ *	The return value is 1 if there is an embedded image by the given name
+ *	in the text widget, 0 otherwise. If the image exists, *indexPtr is
+ *	filled in with its index.
  *
  * Side effects:
  *	None.
@@ -776,7 +773,7 @@ EmbImageBboxProc(textPtr, chunkPtr, index, y, lineHeight, baseline, xPtr, yPtr,
 int
 TkTextImageIndex(textPtr, name, indexPtr)
     TkText *textPtr;		/* Text widget containing image. */
-    CONST char *name;			/* Name of image. */
+    CONST char *name;		/* Name of image. */
     TkTextIndex *indexPtr;	/* Index information gets stored here. */
 {
     Tcl_HashEntry *hPtr;
@@ -798,8 +795,8 @@ TkTextImageIndex(textPtr, name, indexPtr)
  *
  * EmbImageProc --
  *
- *	This procedure is called by the image code whenever an
- *	image or its contents changes.
+ *	This function is called by the image code whenever an image or its
+ *	contents changes.
  *
  * Results:
  *	None.
@@ -812,12 +809,12 @@ TkTextImageIndex(textPtr, name, indexPtr)
 
 static void
 EmbImageProc(clientData, x, y, width, height, imgWidth, imgHeight)
-    ClientData clientData;              /* Pointer to widget record. */
-    int x, y;                           /* Upper left pixel (within image)
-                                         * that must be redisplayed. */
-    int width, height;                  /* Dimensions of area to redisplay
-                                         * (may be <= 0). */
-    int imgWidth, imgHeight;            /* New dimensions of image. */
+    ClientData clientData;	/* Pointer to widget record. */
+    int x, y;			/* Upper left pixel (within image) that must
+				 * be redisplayed. */
+    int width, height;		/* Dimensions of area to redisplay (may be
+				 * <= 0). */
+    int imgWidth, imgHeight;	/* New dimensions of image. */
 
 {
     TkTextSegment *eiPtr = (TkTextSegment *) clientData;
@@ -827,11 +824,21 @@ EmbImageProc(clientData, x, y, width, height, imgWidth, imgHeight)
     index.linePtr = eiPtr->body.ei.linePtr;
     index.byteIndex = TkTextSegToOffset(eiPtr, eiPtr->body.ei.linePtr);
     TkTextChanged(eiPtr->body.ei.sharedTextPtr, NULL, &index, &index);
-    /* 
-     * It's probably not true that all image changes
-     * can change the line height, so we could be more
-     * efficient here and only call this when necessary.
+
+    /*
+     * It's probably not true that all image changes can change the line
+     * height, so we could be more efficient here and only call this when
+     * necessary.
      */
-    TkTextInvalidateLineMetrics(eiPtr->body.ei.sharedTextPtr, NULL, 
-				index.linePtr, 0, TK_TEXT_INVALIDATE_ONLY);
+
+    TkTextInvalidateLineMetrics(eiPtr->body.ei.sharedTextPtr, NULL,
+	    index.linePtr, 0, TK_TEXT_INVALIDATE_ONLY);
 }
+
+/*
+ * Local Variables:
+ * mode: c
+ * c-basic-offset: 4
+ * fill-column: 78
+ * End:
+ */