Strip trailing whitespace from source files

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>

22 files changed, 374 insertions, 374 deletions

diff --git a/Makefile.am b/Makefile.am
index d2ca5dd..4592a00 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
-# 
+#
 #  Copyright 2005  Red Hat, Inc.
-# 
+#
 #  Permission to use, copy, modify, distribute, and sell this software and its
 #  documentation for any purpose is hereby granted without fee, provided that
 #  the above copyright notice appear in all copies and that both that
@@ -10,7 +10,7 @@
 #  specific, written prior permission.  Red Hat makes no
 #  representations about the suitability of this software for any purpose.  It
 #  is provided "as is" without express or implied warranty.
-# 
+#
 #  RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
 #  INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
 #  EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR
diff --git a/Xmark b/Xmark
index 691f705..6850769 100644
--- a/Xmark
+++ b/Xmark
@@ -9,10 +9,10 @@
 #
 # CHANGE HISTORY:
 #
-# X11perfcompDR  --  Creates a Digital Review compatible breakdown of 
+# X11perfcompDR  --  Creates a Digital Review compatible breakdown of
 # x11perf v1.2 results as described in "Take Your Pick Of Graphics"
-# by John Montgomery, Digital Review, May 7th, 1990, Page 44. 
-# 8/30/90  v1.0 program created by Lonnie Mandigo 
+# by John Montgomery, Digital Review, May 7th, 1990, Page 44.
+# 8/30/90  v1.0 program created by Lonnie Mandigo
 # 1/18/91  Modification by  Lonnie Mandigo
 #	   Fixed a bug to include UCIRC in data.
 # 2/5/91   Modification by  Lonnie Mandigo
@@ -21,7 +21,7 @@
 #          Minor aesethic cleanups and better error handling.
 #          Lonnie Mandigo and Jason Levitt (jason@cs.utexas.edu)
 # 3/4/93   Converted to Xmark by Bob Kuseski
-#          to produce a single number representing the ratio between 
+#          to produce a single number representing the ratio between
 #	   the xpc weighted averages of the output from x11perf Rev 1.3
 #	   for the server under test and a SparcStation 1
 # 3/10/93  Changed to produce THREE output numbers and added bounds
@@ -43,7 +43,7 @@
 #
 ############################################################
 # Instructions:
-# 
+#
 # Usage: Xmark datafile
 #
 # where: 'datafile' is created by running x11perf Rev 1.3
@@ -60,7 +60,7 @@
 # Xmark summarizes the results relative to the data contained in
 # the datafile.  Xmark writes to standard out, so if you want to
 # capture the output in a file, use:
-# 
+#
 #   Xmark datafile > output.comp
 #
 # The 'output.comp' contains THREE numbers:
@@ -109,7 +109,7 @@ then
 	echo ""
     fi
 fi
- 
+
 DATA=$1
 
 grep trep $DATA		> temp.$$
@@ -596,7 +596,7 @@ EOS
 awk -f awkfile.$$ temp.$$ > rates.$$
 rm -f awkfile.$$				# cleanup
 
-# calculate the weighted average 
+# calculate the weighted average
 
 sumofweights=`grep sumof rates.$$ | awk -F: ' { print($2) }' - `
 if [ "$sumofweights" != "4566.0" ]
@@ -627,7 +627,7 @@ awk -F: '
 	printf("Weighted x11perf of %s server =%6.0f\n", name,WeightedAverage);
 	printf("Weighted x11perf of SparcStation 1 server =%5.0f\n", SparcStation1);
 	printf("Xmark =%8.4f\n", WeightedAverage/SparcStation1);
-    }' rates.$$	
+    }' rates.$$
 
 rm -f temp.$$ rates.$$ awkfile.$$			# cleanup
 
diff --git a/bitmaps.c b/bitmaps.c
index e8d739a..f16b3bd 100644
--- a/bitmaps.c
+++ b/bitmaps.c
@@ -3,13 +3,13 @@ Copyright 1988, 1989 by Digital Equipment Corporation, Maynard, Massachusetts.
 
                         All Rights Reserved
 
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
 provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
+both that copyright notice and this permission notice appear in
 supporting documentation, and that the name of Digital not be
 used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
+software without specific, written prior permission.
 
 DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
 ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
diff --git a/bitmaps.h b/bitmaps.h
index 2971bea..97dfed4 100644
--- a/bitmaps.h
+++ b/bitmaps.h
@@ -3,13 +3,13 @@ Copyright 1988, 1989 by Digital Equipment Corporation, Maynard, Massachusetts.
 
                         All Rights Reserved
 
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
 provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
+both that copyright notice and this permission notice appear in
 supporting documentation, and that the name of Digital not be
 used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
+software without specific, written prior permission.
 
 DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
 ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
diff --git a/configure.ac b/configure.ac
index a425ba2..93036b7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 dnl  Copyright 2005 Red Hat, Inc.
-dnl 
+dnl
 dnl  Permission to use, copy, modify, distribute, and sell this software and its
 dnl  documentation for any purpose is hereby granted without fee, provided that
 dnl  the above copyright notice appear in all copies and that both that
@@ -9,7 +9,7 @@ dnl  advertising or publicity pertaining to distribution of the software without
 dnl  specific, written prior permission.  Red Hat makes no
 dnl  representations about the suitability of this software for any purpose.  It
 dnl  is provided "as is" without express or implied warranty.
-dnl 
+dnl
 dnl  RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
 dnl  INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
 dnl  EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR
@@ -69,7 +69,7 @@ case "$xext_found" in
 yes)
 	save_LIBS="$LIBS"
 	LIBS="$XEXT_LIBS $LIBS"
-	AC_CHECK_FUNCS([XShmQueryExtension], 
+	AC_CHECK_FUNCS([XShmQueryExtension],
 		       AC_DEFINE(MITSHM, 1, [MIT-SHM extension available]))
 	LIBS="$save_LIBS"
 	;;
diff --git a/do_arcs.c b/do_arcs.c
index 6ab1547..435ca62 100644
--- a/do_arcs.c
+++ b/do_arcs.c
@@ -3,13 +3,13 @@ Copyright 1988, 1989 by Digital Equipment Corporation, Maynard, Massachusetts.
 
                         All Rights Reserved
 
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
 provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
+both that copyright notice and this permission notice appear in
 supporting documentation, and that the name of Digital not be
 used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
+software without specific, written prior permission.
 
 DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
 ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
@@ -28,7 +28,7 @@ static GC   pgc;
 
 #define DegreesToX(degrees) (degrees * 64)
 
-static void 
+static void
 GenerateCircles(XParms xp, Parms p, Bool partialArcs, Bool ddashed)
 {
     int     rows;       /* Number of rows filled in current column	    */
@@ -88,14 +88,14 @@ GenerateCircles(XParms xp, Parms p, Bool partialArcs, Bool ddashed)
     }
 }
 
-int 
+int
 InitCircles(XParms xp, Parms p, int64_t reps)
 {
     GenerateCircles(xp, p, False, False);
     return reps;
 }
 
-int 
+int
 InitPartCircles(XParms xp, Parms p, int64_t reps)
 {
     GenerateCircles(xp, p, True, False);
@@ -103,7 +103,7 @@ InitPartCircles(XParms xp, Parms p, int64_t reps)
 }
 
 
-int 
+int
 InitChordPartCircles(XParms xp, Parms p, int64_t reps)
 {
     GenerateCircles(xp, p, True, False);
@@ -113,7 +113,7 @@ InitChordPartCircles(XParms xp, Parms p, int64_t reps)
 }
 
 
-int 
+int
 InitSlicePartCircles(XParms xp, Parms p, int64_t reps)
 {
     GenerateCircles(xp, p, True, False);
@@ -144,21 +144,21 @@ GenerateWideCircles(XParms xp, Parms p, Bool partialArcs, Bool ddashed)
     }
 }
 
-int 
+int
 InitWideCircles(XParms xp, Parms p, int64_t reps)
 {
     GenerateWideCircles (xp, p, False, False);
     return reps;
 }
- 
-int 
+
+int
 InitPartWideCircles(XParms xp, Parms p, int64_t reps)
 {
     GenerateWideCircles (xp, p, True, False);
     return reps;
 }
- 
-int 
+
+int
 InitDashedCircles(XParms xp, Parms p, int64_t reps)
 {
     char dashes[2];
@@ -174,7 +174,7 @@ InitDashedCircles(XParms xp, Parms p, int64_t reps)
     return reps;
 }
 
-int 
+int
 InitWideDashedCircles(XParms xp, Parms p, int64_t reps)
 {
     int		size;
@@ -195,7 +195,7 @@ InitWideDashedCircles(XParms xp, Parms p, int64_t reps)
     return reps;
 }
 
-int 
+int
 InitDoubleDashedCircles(XParms xp, Parms p, int64_t reps)
 {
     char dashes[2];
@@ -211,7 +211,7 @@ InitDoubleDashedCircles(XParms xp, Parms p, int64_t reps)
     return reps;
 }
 
-int 
+int
 InitWideDoubleDashedCircles(XParms xp, Parms p, int64_t reps)
 {
     int		size;
@@ -232,7 +232,7 @@ InitWideDoubleDashedCircles(XParms xp, Parms p, int64_t reps)
     return reps;
 }
 
-static void 
+static void
 GenerateEllipses(XParms xp, Parms p, int partialArcs, Bool ddashed)
 {
     int     size;
@@ -294,7 +294,7 @@ GenerateEllipses(XParms xp, Parms p, int partialArcs, Bool ddashed)
 		x = half;
 	    }
 	}
-	
+
 	vsize += vsizeinc;
 	if (vsize > size) {
 	    vsize -= size;
@@ -303,7 +303,7 @@ GenerateEllipses(XParms xp, Parms p, int partialArcs, Bool ddashed)
     }
 }
 
-int 
+int
 InitEllipses(XParms xp, Parms p, int64_t reps)
 {
     GenerateEllipses(xp, p, False, False);
@@ -311,7 +311,7 @@ InitEllipses(XParms xp, Parms p, int64_t reps)
 }
 
 
-int 
+int
 InitPartEllipses(XParms xp, Parms p, int64_t reps)
 {
     GenerateEllipses(xp, p, True, False);
@@ -319,7 +319,7 @@ InitPartEllipses(XParms xp, Parms p, int64_t reps)
 }
 
 
-int 
+int
 InitChordPartEllipses(XParms xp, Parms p, int64_t reps)
 {
     GenerateEllipses(xp, p, True, False);
@@ -329,7 +329,7 @@ InitChordPartEllipses(XParms xp, Parms p, int64_t reps)
 }
 
 
-int 
+int
 InitSlicePartEllipses(XParms xp, Parms p, int64_t reps)
 {
     GenerateEllipses(xp, p, True, False);
@@ -361,21 +361,21 @@ GenerateWideEllipses(XParms xp, Parms p, Bool partialArcs, Bool ddashed)
 
 }
 
-int 
+int
 InitWideEllipses(XParms xp, Parms p, int64_t reps)
 {
     GenerateWideEllipses(xp, p, False, False);
     return reps;
 }
- 
-int 
+
+int
 InitPartWideEllipses(XParms xp, Parms p, int64_t reps)
 {
     GenerateWideEllipses(xp, p, True, False);
     return reps;
 }
- 
-int 
+
+int
 InitDashedEllipses(XParms xp, Parms p, int64_t reps)
 {
     char dashes[2];
@@ -391,7 +391,7 @@ InitDashedEllipses(XParms xp, Parms p, int64_t reps)
     return reps;
 }
 
-int 
+int
 InitWideDashedEllipses(XParms xp, Parms p, int64_t reps)
 {
     int		size;
@@ -412,7 +412,7 @@ InitWideDashedEllipses(XParms xp, Parms p, int64_t reps)
     return reps;
 }
 
-int 
+int
 InitDoubleDashedEllipses(XParms xp, Parms p, int64_t reps)
 {
     char dashes[2];
@@ -428,7 +428,7 @@ InitDoubleDashedEllipses(XParms xp, Parms p, int64_t reps)
     return reps;
 }
 
-int 
+int
 InitWideDoubleDashedEllipses(XParms xp, Parms p, int64_t reps)
 {
     int		size;
@@ -449,7 +449,7 @@ InitWideDoubleDashedEllipses(XParms xp, Parms p, int64_t reps)
     return reps;
 }
 
-void 
+void
 DoArcs(XParms xp, Parms p, int64_t reps)
 {
     for (int i = 0; i != reps; i++) {
@@ -466,7 +466,7 @@ DoArcs(XParms xp, Parms p, int64_t reps)
     }
 }
 
-void 
+void
 DoFilledArcs(XParms xp, Parms p, int64_t reps)
 {
     for (int i = 0; i != reps; i++) {
@@ -483,7 +483,7 @@ DoFilledArcs(XParms xp, Parms p, int64_t reps)
     }
 }
 
-void 
+void
 EndArcs(XParms xp, Parms p)
 {
     free(arcs);
diff --git a/do_blt.c b/do_blt.c
index 318fb03..432a208 100644
--- a/do_blt.c
+++ b/do_blt.c
@@ -3,13 +3,13 @@ Copyright 1988, 1989 by Digital Equipment Corporation, Maynard, Massachusetts.
 
                         All Rights Reserved
 
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
 provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
+both that copyright notice and this permission notice appear in
 supporting documentation, and that the name of Digital not be
 used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
+software without specific, written prior permission.
 
 DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
 ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
@@ -34,7 +34,7 @@ static XSegment *segsa2, *segsb2;
 
 #define NegMod(x, y) ((y) - (((-x)-1) % (7)) - 1)
 
-static void 
+static void
 InitBltLines(void)
 {
     int x, y;
@@ -49,7 +49,7 @@ InitBltLines(void)
 	y += HEIGHT / (NUMPOINTS/2);
 	points[i].y = y;
     }
-    
+
     x = 0;
     for (int i = NUMPOINTS/2; i!= NUMPOINTS; i++) {
 	if (i & 1) {
@@ -62,7 +62,7 @@ InitBltLines(void)
     }
 }
 
-int 
+int
 InitScroll(XParms xp, Parms p, int64_t reps)
 {
     InitBltLines();
@@ -70,7 +70,7 @@ InitScroll(XParms xp, Parms p, int64_t reps)
     return reps;
 }
 
-void 
+void
 DoScroll(XParms xp, Parms p, int64_t reps)
 {
     int size, x, y, xorg, yorg, delta;
@@ -111,20 +111,20 @@ DoScroll(XParms xp, Parms p, int64_t reps)
     }
 }
 
-void 
+void
 MidScroll(XParms xp, Parms p)
 {
     XClearWindow(xp->d, xp->w);
     XDrawLines(xp->d, xp->w, xp->fggc, points, NUMPOINTS, CoordModeOrigin);
 }
 
-void 
+void
 EndScroll(XParms xp, Parms p)
 {
 }
 
-static void 
-InitCopyLocations(int size, int mul, int div, 
+static void
+InitCopyLocations(int size, int mul, int div,
 		  int64_t reps, XSegment **ap, XSegment **bp)
 {
     int x1, y1, x2, y2;
@@ -143,12 +143,12 @@ InitCopyLocations(int size, int mul, int div,
 
     width = (WIDTH - size) & ~31;
     height = (HEIGHT - size) & ~31;
-    
+
     x1 = 0;
     y1 = 0;
     x2 = width;
     y2 = height;
-    
+
     *ap = a = malloc(reps * sizeof(XSegment));
     *bp = b = malloc(reps * sizeof(XSegment));
     for (int i = 0; i != reps; i++) {
@@ -185,7 +185,7 @@ InitCopyLocations(int size, int mul, int div,
 }
 
 
-int 
+int
 InitCopyWin(XParms xp, Parms p, int64_t reps)
 {
     (void) InitScroll(xp, p, reps);
@@ -193,7 +193,7 @@ InitCopyWin(XParms xp, Parms p, int64_t reps)
     return reps;
 }
 
-int 
+int
 InitCopyPix(XParms xp, Parms p, int64_t reps)
 {
     GC		pixgc;
@@ -208,7 +208,7 @@ InitCopyPix(XParms xp, Parms p, int64_t reps)
     return reps;
 }
 
-int 
+int
 InitGetImage(XParms xp, Parms p, int64_t reps)
 {
     (void) InitCopyWin(xp, p, reps);
@@ -219,11 +219,11 @@ InitGetImage(XParms xp, Parms p, int64_t reps)
     if(image==NULL){
 	printf("XGetImage failed\n");
 	return False;
-    }	
+    }
     return reps;
 }
 
-int 
+int
 InitPutImage(XParms xp, Parms p, int64_t reps)
 {
     if(!InitGetImage(xp, p, reps))return False;
@@ -231,7 +231,7 @@ InitPutImage(XParms xp, Parms p, int64_t reps)
     return reps;
 }
 
-static void 
+static void
 CopyArea(XParms xp, Parms p, int64_t reps, Drawable src, Drawable dst)
 {
     int i, size;
@@ -251,33 +251,33 @@ CopyArea(XParms xp, Parms p, int64_t reps, Drawable src, Drawable dst)
     }
 }
 
-void 
+void
 DoCopyWinWin(XParms xp, Parms p, int64_t reps)
 {
     CopyArea(xp, p, reps, xp->w, xp->w);
 }
 
-void 
+void
 DoCopyPixWin(XParms xp, Parms p, int64_t reps)
 {
     CopyArea(xp, p, reps, pix, xp->w);
 }
 
-void 
+void
 DoCopyWinPix(XParms xp, Parms p, int64_t reps)
 {
     CopyArea(xp, p, reps, xp->w, pix);
     xp->p = pix;	/* HardwareSync will now sync on pixmap */
 }
 
-void 
+void
 DoCopyPixPix(XParms xp, Parms p, int64_t reps)
 {
     CopyArea(xp, p, reps, pix, pix);
     xp->p = pix;	/* HardwareSync will now sync on pixmap */
 }
 
-void 
+void
 DoGetImage(XParms xp, Parms p, int64_t reps)
 {
     int i, size;
@@ -318,7 +318,7 @@ rectangle.
     }
 }
 
-void 
+void
 DoPutImage(XParms xp, Parms p, int64_t reps)
 {
     int i, size;
@@ -356,14 +356,14 @@ static XShmSegmentInfo	shm_info;
 static int haderror;
 static int (*origerrorhandler)(Display *, XErrorEvent *);
 
-static int 
+static int
 shmerrorhandler(Display *d, XErrorEvent *e)
 {
     haderror++;
     if(e->error_code==BadAccess) {
 	fprintf(stderr,"failed to attach shared memory\n");
 	return 0;
-    } else 
+    } else
 	return (*origerrorhandler)(d,e);
 }
 
@@ -384,7 +384,7 @@ InitShmImage(XParms xp, Parms p, int64_t reps, Bool read_only)
     	free(segsa);
     	free(segsb);
     	return False;
-    }	
+    }
     shm_image = *image;
     image_size = image->bytes_per_line * image->height;
     /* allow XYPixmap choice: */
@@ -463,7 +463,7 @@ InitShmGetImage(XParms xp, Parms p, int64_t reps)
     return InitShmImage(xp, p, reps, False);
 }
 
-void 
+void
 DoShmPutImage(XParms xp, Parms p, int64_t reps)
 {
     int i, size;
@@ -530,13 +530,13 @@ EndShmPutImage(XParms xp, Parms p)
 #endif
 
 
-void 
+void
 MidCopyPix(XParms xp, Parms p)
 {
     XClearWindow(xp->d, xp->w);
 }
 
-void 
+void
 EndCopyWin(XParms xp, Parms p)
 {
     EndScroll(xp, p);
@@ -549,7 +549,7 @@ EndCopyWin(XParms xp, Parms p)
     segsa = segsb = segsa2 = segsb2 = NULL;
 }
 
-void 
+void
 EndCopyPix(XParms xp, Parms p)
 {
     EndCopyWin(xp, p);
@@ -560,7 +560,7 @@ EndCopyPix(XParms xp, Parms p)
     xp->p = (Pixmap)0;
 }
 
-void 
+void
 EndGetImage(XParms xp, Parms p)
 {
     EndCopyWin(xp, p);
@@ -577,12 +577,12 @@ InitCopyPlane(XParms xp, Parms p, int64_t reps)
     InitCopyLocations(p->special, 1, 1, reps, &segsa, &segsb);
 
     /* Create pixmap to write stuff into, and initialize it */
-    pix = XCreatePixmap(xp->d, xp->w, WIDTH, HEIGHT, 
+    pix = XCreatePixmap(xp->d, xp->w, WIDTH, HEIGHT,
 	    p->font==NULL ? 1 : xp->vinfo.depth);
     gcv.graphics_exposures = False;
     gcv.foreground = 0;
     gcv.background = 1;
-    pixgc = XCreateGC(xp->d, pix, 
+    pixgc = XCreateGC(xp->d, pix,
 		GCForeground | GCBackground | GCGraphicsExposures, &gcv);
     XFillRectangle(xp->d, pix, pixgc, 0, 0, WIDTH, HEIGHT);
     gcv.foreground = 1;
@@ -594,7 +594,7 @@ InitCopyPlane(XParms xp, Parms p, int64_t reps)
     return reps;
 }
 
-void 
+void
 DoCopyPlane(XParms xp, Parms p, int64_t reps)
 {
     int		i, size;
@@ -643,7 +643,7 @@ InitCompositePix(XParms xp, Parms p, int64_t reps)
     static XRenderColor c = { 0xffff, 0x0000, 0xffff, 0xffff };
 
     (void) InitCompositeWin (xp, p, reps);
-    
+
     /* Create pixmap to write stuff into, and initialize it */
     switch (xp->planemask) {
     case PictStandardNative:
@@ -671,14 +671,14 @@ InitCompositePix(XParms xp, Parms p, int64_t reps)
     }
     if (!format)
 	format = XRenderFindStandardFormat (xp->d, xp->planemask);
-    
+
     pix = XCreatePixmap(xp->d, xp->w, WIDTH, HEIGHT, depth);
     pixPict = XRenderCreatePicture (xp->d, pix, format, 0, NULL);
-    
+
     XRenderComposite (xp->d, PictOpClear,
 		      winPict, None, pixPict,
 		      0, 0, 0, 0, 0, 0, WIDTH, HEIGHT);
-    
+
     XRenderFillRectangle (xp->d, PictOpSrc,
 			  pixPict, &c, 0, 0, WIDTH, HEIGHT);
 #if 1
@@ -713,13 +713,13 @@ EndCompositeWin (XParms xp, Parms p)
     }
 }
 
-static void 
+static void
 CompositeArea(XParms xp, Parms p, int64_t reps, Picture src, Picture dst)
 {
     int size;
     XSegment *sa, *sb;
     XSegment *sa2, *sb2;
-    
+
 
     size = p->special;
     sa = segsa;
diff --git a/do_complex.c b/do_complex.c
index 8fcabe8..5b4a9bd 100644
--- a/do_complex.c
+++ b/do_complex.c
@@ -3,13 +3,13 @@ Copyright 1988, 1989 by Digital Equipment Corporation, Maynard, Massachusetts.
 
                         All Rights Reserved
 
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
 provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
+both that copyright notice and this permission notice appear in
 supporting documentation, and that the name of Digital not be
 used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
+software without specific, written prior permission.
 
 DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
 ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
@@ -35,7 +35,7 @@ static GC       pgc;
 #define PI M_PI
 #endif /* QNX4 */
 
-int 
+int
 InitComplexPoly(XParms xp, Parms p, int64_t reps)
 {
     int     numPoints;
@@ -66,7 +66,7 @@ InitComplexPoly(XParms xp, Parms p, int64_t reps)
     }
     iradius = (int) radius + 1;
 
-    numPoints = (p->objects) * NUM_POINTS;  
+    numPoints = (p->objects) * NUM_POINTS;
     points = malloc(numPoints * sizeof(XPoint));
     curPoint = points;
     x = iradius;
@@ -95,13 +95,13 @@ InitComplexPoly(XParms xp, Parms p, int64_t reps)
     return reps;
 }
 
-void 
+void
 DoComplexPoly(XParms xp, Parms p, int64_t reps)
 {
     for (int i = 0; i != reps; i++) {
         XPoint  *curPoint = points;
         for (int j = 0; j != p->objects; j++) {
-            XFillPolygon(xp->d, xp->w, pgc, curPoint, NUM_POINTS, Complex, 
+            XFillPolygon(xp->d, xp->w, pgc, curPoint, NUM_POINTS, Complex,
 			 CoordModeOrigin);
             curPoint += NUM_POINTS;
 	  }
@@ -113,13 +113,13 @@ DoComplexPoly(XParms xp, Parms p, int64_t reps)
     }
 }
 
-void 
+void
 EndComplexPoly(XParms xp, Parms p)
 {
     free(points);
 }
 
-int 
+int
 InitGeneralPoly(XParms xp, Parms p, int64_t reps)
 {
     int     numPoints;
@@ -165,7 +165,7 @@ InitGeneralPoly(XParms xp, Parms p, int64_t reps)
     return reps;
 }
 
-void 
+void
 DoGeneralPoly(XParms xp, Parms p, int64_t reps)
 {
     int	    nsides;
@@ -176,7 +176,7 @@ DoGeneralPoly(XParms xp, Parms p, int64_t reps)
     for (int i = 0; i != reps; i++) {
         XPoint  *curPoint = points;
         for (int j = 0; j != p->objects; j++) {
-            XFillPolygon(xp->d, xp->w, pgc, curPoint, nsides, mode, 
+            XFillPolygon(xp->d, xp->w, pgc, curPoint, nsides, mode,
 			 CoordModeOrigin);
             curPoint += nsides;
 	  }
diff --git a/do_dots.c b/do_dots.c
index 38944e0..c2e8e47 100644
--- a/do_dots.c
+++ b/do_dots.c
@@ -3,13 +3,13 @@ Copyright 1988, 1989 by Digital Equipment Corporation, Maynard, Massachusetts.
 
                         All Rights Reserved
 
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
 provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
+both that copyright notice and this permission notice appear in
 supporting documentation, and that the name of Digital not be
 used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
+software without specific, written prior permission.
 
 DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
 ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
@@ -26,7 +26,7 @@ SOFTWARE.
 static XPoint   *points;
 static GC       pgc;
 
-int 
+int
 InitDots(XParms xp, Parms p, int64_t reps)
 {
     pgc = xp->fggc;
@@ -40,7 +40,7 @@ InitDots(XParms xp, Parms p, int64_t reps)
     return reps;
 }
 
-void 
+void
 DoDots(XParms xp, Parms p, int64_t reps)
 {
     for (int i = 0; i != reps; i++) {
@@ -53,7 +53,7 @@ DoDots(XParms xp, Parms p, int64_t reps)
     }
 }
 
-void 
+void
 EndDots(XParms xp, Parms p)
 {
     free(points);
diff --git a/do_lines.c b/do_lines.c
index 1cead86..e6ab80a 100644
--- a/do_lines.c
+++ b/do_lines.c
@@ -3,13 +3,13 @@ Copyright 1988, 1989 by Digital Equipment Corporation, Maynard, Massachusetts.
 
                         All Rights Reserved
 
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
 provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
+both that copyright notice and this permission notice appear in
 supporting documentation, and that the name of Digital not be
 used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
+software without specific, written prior permission.
 
 DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
 ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
@@ -26,7 +26,7 @@ SOFTWARE.
 static XPoint   *points;
 static GC       pgc;
 
-static void 
+static void
 GenerateLines(XParms xp, Parms p, Bool ddashed)
 {
     int size;
@@ -34,7 +34,7 @@ GenerateLines(XParms xp, Parms p, Bool ddashed)
     int     rows;       /* Number of rows filled in current column      */
     int x, y;		/* Next point					*/
     int xdir, ydir;	/* Which direction x, y are going		*/
-    int bigxdir;	
+    int bigxdir;
     int x1 = 0, y1 = 0;	/* offsets to compute next point from current	*/
     int phase;		/* how far into 0..4*(size_1) we are		*/
     float phasef;       /* how far we are in real numbers		*/
@@ -79,7 +79,7 @@ GenerateLines(XParms xp, Parms p, Bool ddashed)
 	phase = phasef;
 	switch (phase / (size+1)) {
 	case 0:
-	    x1 = size;			
+	    x1 = size;
 	    y1 = phase;
 	    break;
 
@@ -159,15 +159,15 @@ GenerateLines(XParms xp, Parms p, Bool ddashed)
 
     }
 }
- 
-int 
+
+int
 InitLines(XParms xp, Parms p, int64_t reps)
 {
     GenerateLines(xp, p, False);
 	return reps;
 }
 
-static int 
+static int
 GenerateWideLines(XParms xp, Parms p, int64_t reps, Bool ddashed)
 {
     int size;
@@ -191,13 +191,13 @@ GenerateWideLines(XParms xp, Parms p, int64_t reps, Bool ddashed)
     return reps;
 }
 
-int 
+int
 InitWideLines(XParms xp, Parms p, int64_t reps)
 {
     return GenerateWideLines(xp, p, reps, False);
 }
- 
-int 
+
+int
 InitDashedLines(XParms xp, Parms p, int64_t reps)
 {
     char dashes[2];
@@ -213,7 +213,7 @@ InitDashedLines(XParms xp, Parms p, int64_t reps)
     return reps;
 }
 
-int 
+int
 InitWideDashedLines(XParms xp, Parms p, int64_t reps)
 {
     int		size;
@@ -234,7 +234,7 @@ InitWideDashedLines(XParms xp, Parms p, int64_t reps)
     return reps;
 }
 
-int 
+int
 InitDoubleDashedLines(XParms xp, Parms p, int64_t reps)
 {
     char dashes[2];
@@ -250,7 +250,7 @@ InitDoubleDashedLines(XParms xp, Parms p, int64_t reps)
     return reps;
 }
 
-int 
+int
 InitWideDoubleDashedLines(XParms xp, Parms p, int64_t reps)
 {
     int		size;
@@ -271,7 +271,7 @@ InitWideDoubleDashedLines(XParms xp, Parms p, int64_t reps)
     return reps;
 }
 
-void 
+void
 DoLines(XParms xp, Parms p, int64_t reps)
 {
     for (int i = 0; i != reps; i++)
@@ -289,7 +289,7 @@ DoLines(XParms xp, Parms p, int64_t reps)
     }
 }
 
-void 
+void
 EndLines(XParms xp, Parms p)
 {
     free(points);
diff --git a/do_movewin.c b/do_movewin.c
index b7f0b44..bb3e665 100644
--- a/do_movewin.c
+++ b/do_movewin.c
@@ -3,13 +3,13 @@ Copyright 1988, 1989 by Digital Equipment Corporation, Maynard, Massachusetts.
 
                         All Rights Reserved
 
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
 provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
+both that copyright notice and this permission notice appear in
 supporting documentation, and that the name of Digital not be
 used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
+software without specific, written prior permission.
 
 DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
 ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
@@ -33,11 +33,11 @@ static int delta1;		/* Private global data for DoResizeWindows */
 
 #define STACK (4*(HEIGHT-10)/CHILDSIZE)
 
-int 
+int
 InitMoveWindows(XParms xp, Parms p, int64_t reps)
 {
     rows = (p->objects + MAXCOLS - 1) / MAXCOLS;
-    
+
     x_offset = 0;
     y_offset = 0;
     delta1   = 1;
@@ -60,7 +60,7 @@ InitMoveWindows(XParms xp, Parms p, int64_t reps)
     return reps;
 }
 
-void 
+void
 DoMoveWindows(XParms xp, Parms p, int64_t reps)
 {
     for (int i = 0; i != reps; i++) {
@@ -78,14 +78,14 @@ DoMoveWindows(XParms xp, Parms p, int64_t reps)
     }
 }
 
-void 
+void
 EndMoveWindows(XParms xp, Parms p)
 {
     free(children);
     free(positions);
 }
 
-void 
+void
 DoResizeWindows(XParms xp, Parms p, int64_t reps)
 {
     for (int i = 0; i != reps; i++) {
@@ -109,7 +109,7 @@ InitCircWindows(XParms xp, Parms p, int64_t reps)
     for (int i = 0; i != p->objects; i++) {
 	int pos = i % STACK;
 	int color = (i & 1 ? xp->foreground : xp->background);
-	children[i] = XCreateSimpleWindow (xp->d, xp->w, 
+	children[i] = XCreateSimpleWindow (xp->d, xp->w,
 	    pos*CHILDSIZE/4 + (i/STACK)*2*CHILDSIZE, pos*CHILDSIZE/4,
 	    CHILDSIZE, CHILDSIZE, 0, color, color);
     }
@@ -118,7 +118,7 @@ InitCircWindows(XParms xp, Parms p, int64_t reps)
     return reps;
 }
 
-void 
+void
 DoCircWindows(XParms xp, Parms p, int64_t reps)
 {
     for (int i = 0; i != reps; i++)
@@ -129,18 +129,18 @@ DoCircWindows(XParms xp, Parms p, int64_t reps)
     }
 }
 
-void 
+void
 EndCircWindows(XParms xp, Parms p)
 {
     free(children);
 }
 
 
-int 
+int
 InitMoveTree(XParms xp, Parms p, int64_t reps)
 {
     rows = (p->objects + MAXCOLS - 1) / MAXCOLS;
-    
+
     x_offset = 0;
     y_offset = 0;
     delta1   = 1;
@@ -154,7 +154,7 @@ InitMoveTree(XParms xp, Parms p, int64_t reps)
     cover = XCreateSimpleWindow(xp->d, xp->w,
 				0, 0, xmax, ymax, 0,
 				xp->background, xp->background);
-				
+
     for (int i = 0; i != p->objects; i++) {
 	positions[i].x = (CHILDSIZE+CHILDSPACE) * (i/rows) + CHILDSPACE/2;
 	positions[i].y = (CHILDSIZE+CHILDSPACE) * (i%rows) + CHILDSPACE/2;
@@ -167,7 +167,7 @@ InitMoveTree(XParms xp, Parms p, int64_t reps)
     return reps;
 }
 
-void 
+void
 DoMoveTree(XParms xp, Parms p, int64_t reps)
 {
     for (int i = 0; i != reps; i++) {
@@ -182,7 +182,7 @@ DoMoveTree(XParms xp, Parms p, int64_t reps)
     }
 }
 
-void 
+void
 EndMoveTree(XParms xp, Parms p)
 {
     XDestroyWindow(xp->d, cover);
diff --git a/do_rects.c b/do_rects.c
index 4c03d9c..58f9f1a 100644
--- a/do_rects.c
+++ b/do_rects.c
@@ -3,13 +3,13 @@ Copyright 1988, 1989 by Digital Equipment Corporation, Maynard, Massachusetts.
 
                         All Rights Reserved
 
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
 provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
+both that copyright notice and this permission notice appear in
 supporting documentation, and that the name of Digital not be
 used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
+software without specific, written prior permission.
 
 DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
 ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
@@ -27,7 +27,7 @@ SOFTWARE.
 static XRectangle   *rects;
 static GC	    pgc;
 
-int 
+int
 InitRectangles(XParms xp, Parms p, int64_t reps)
 {
     int size = p->special;
@@ -82,7 +82,7 @@ InitRectangles(XParms xp, Parms p, int64_t reps)
     return reps;
 }
 
-void 
+void
 DoRectangles(XParms xp, Parms p, int64_t reps)
 {
     for (int i = 0; i != reps; i++) {
@@ -95,7 +95,7 @@ DoRectangles(XParms xp, Parms p, int64_t reps)
     }
 }
 
-void 
+void
 DoOutlineRectangles(XParms xp, Parms  p, int64_t reps)
 {
     for (int i = 0; i != reps; i++) {
@@ -108,7 +108,7 @@ DoOutlineRectangles(XParms xp, Parms  p, int64_t reps)
     }
 }
 
-void 
+void
 EndRectangles(XParms xp, Parms p)
 {
     free(rects);
diff --git a/do_segs.c b/do_segs.c
index db1cd46..3c9c8f6 100644
--- a/do_segs.c
+++ b/do_segs.c
@@ -3,13 +3,13 @@ Copyright 1988, 1989 by Digital Equipment Corporation, Maynard, Massachusetts.
 
                         All Rights Reserved
 
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
 provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
+both that copyright notice and this permission notice appear in
 supporting documentation, and that the name of Digital not be
 used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
+software without specific, written prior permission.
 
 DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
 ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
@@ -26,7 +26,7 @@ SOFTWARE.
 static XSegment *segments;
 static GC       pgc;
 
-static void 
+static void
 GenerateSegments(XParms xp, Parms p, Bool ddashed)
 {
     int     size;
@@ -71,7 +71,7 @@ GenerateSegments(XParms xp, Parms p, Bool ddashed)
     if (phaseinc == 0) phaseinc = 1;
     rows = 0;
 
-    for (i = 0; i != p->objects; i++) {    
+    for (i = 0; i != p->objects; i++) {
 	switch (phase / size) {
 	case 0:
 	    x1 = 0;
@@ -81,7 +81,7 @@ GenerateSegments(XParms xp, Parms p, Bool ddashed)
 	    break;
 
 	case 1:
-	    x1 = phase % size;    
+	    x1 = phase % size;
 	    y1 = 0;
 	    x2 = size;
 	    y2 = size;
@@ -164,15 +164,15 @@ GenerateSegments(XParms xp, Parms p, Bool ddashed)
 	XChangeGC(xp->d, xp->bggc, GCCapStyle, &gcv);
     }
 }
-   
-int 
+
+int
 InitSegments(XParms xp, Parms p, int64_t reps)
 {
     GenerateSegments(xp, p, False);
     return reps;
 }
 
-int 
+int
 InitDashedSegments(XParms xp, Parms p, int64_t reps)
 {
     char dashes[2];
@@ -190,7 +190,7 @@ InitDashedSegments(XParms xp, Parms p, int64_t reps)
     return reps;
 }
 
-int 
+int
 InitDoubleDashedSegments(XParms xp, Parms p, int64_t reps)
 {
     char dashes[2];
@@ -208,7 +208,7 @@ InitDoubleDashedSegments(XParms xp, Parms p, int64_t reps)
     return reps;
 }
 
-int 
+int
 InitHorizSegments(XParms xp, Parms p, int64_t reps)
 {
     int     size;
@@ -264,7 +264,7 @@ InitHorizSegments(XParms xp, Parms p, int64_t reps)
     return reps;
 }
 
-int 
+int
 InitWideHorizSegments(XParms xp, Parms p, int64_t reps)
 {
     int size;
@@ -279,9 +279,9 @@ InitWideHorizSegments(XParms xp, Parms p, int64_t reps)
 
     return reps;
 }
- 
 
-int 
+
+int
 InitVertSegments(XParms xp, Parms p, int64_t reps)
 {
     int     size;
@@ -339,7 +339,7 @@ InitVertSegments(XParms xp, Parms p, int64_t reps)
     return reps;
 }
 
-int 
+int
 InitWideVertSegments(XParms xp, Parms p, int64_t reps)
 {
     int size;
@@ -354,9 +354,9 @@ InitWideVertSegments(XParms xp, Parms p, int64_t reps)
 
     return reps;
 }
- 
 
-void 
+
+void
 DoSegments(XParms xp, Parms p, int64_t reps)
 {
     int i;
@@ -375,7 +375,7 @@ DoSegments(XParms xp, Parms p, int64_t reps)
     }
 }
 
-void 
+void
 EndSegments(XParms xp, Parms p)
 {
     free(segments);
diff --git a/do_simple.c b/do_simple.c
index 29970a6..958dc10 100644
--- a/do_simple.c
+++ b/do_simple.c
@@ -3,13 +3,13 @@ Copyright 1988, 1989 by Digital Equipment Corporation, Maynard, Massachusetts.
 
                         All Rights Reserved
 
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
 provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
+both that copyright notice and this permission notice appear in
 supporting documentation, and that the name of Digital not be
 used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
+software without specific, written prior permission.
 
 DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
 ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
@@ -31,7 +31,7 @@ SOFTWARE.
 
 static Atom XA_PK_TEMP;
 
-void 
+void
 DoNoOp(XParms xp, Parms p, int64_t reps)
 {
     for (int i = 0; i != reps; i++) {
@@ -41,7 +41,7 @@ DoNoOp(XParms xp, Parms p, int64_t reps)
 }
 
 
-void 
+void
 DoGetAtom(XParms xp, Parms p, int64_t reps)
 {
     for (int i = 0; i != reps; i++) {
@@ -51,7 +51,7 @@ DoGetAtom(XParms xp, Parms p, int64_t reps)
     }
 }
 
-void 
+void
 DoQueryPointer(XParms xp, Parms p, int64_t reps)
 {
     for (int i = 0; i != reps; i++) {
@@ -64,7 +64,7 @@ DoQueryPointer(XParms xp, Parms p, int64_t reps)
     }
 }
 
-int 
+int
 InitGetProperty(XParms xp, Parms p, int64_t reps)
 {
     long foo[4];
@@ -80,7 +80,7 @@ InitGetProperty(XParms xp, Parms p, int64_t reps)
     return reps;
 }
 
-void 
+void
 DoGetProperty(XParms xp, Parms p, int64_t reps)
 {
     for (int i = 0; i != reps; i++) {
diff --git a/do_tests.c b/do_tests.c
index e6ff767..a1024e4 100644
--- a/do_tests.c
+++ b/do_tests.c
@@ -3,13 +3,13 @@ Copyright 1988, 1989 by Digital Equipment Corporation, Maynard, Massachusetts.
 
                         All Rights Reserved
 
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
 provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
+both that copyright notice and this permission notice appear in
 supporting documentation, and that the name of Digital not be
 used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
+software without specific, written prior permission.
 
 DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
 ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
@@ -941,30 +941,30 @@ Test test[] = {
   {"-f24text16",  "Char16 in 23-char line (k24)", NULL,
 		InitText16, DoText16, ClearTextWin, EndText16,
 		V1_3FEATURE, ROP, 0,
-		{23, False, 
+		{23, False,
 	      "-jis-fixed-medium-r-normal--24-230-75-75-c-240-jisx0208.1983-*",
 		NULL}},
   {"-tr10text", "Char in 80-char line (TR 10)", NULL,
 		InitText, DoText, ClearTextWin, EndText,
 		V1_2FEATURE, ROP, 0,
-		{80, False, 
-		"-adobe-times-medium-r-normal--10-100-75-75-p-54-iso8859-1", 
+		{80, False,
+		"-adobe-times-medium-r-normal--10-100-75-75-p-54-iso8859-1",
 		NULL}},
   {"-tr24text", "Char in 30-char line (TR 24)", NULL,
 		InitText, DoText, ClearTextWin, EndText,
 		V1_2FEATURE, ROP, 0,
-		{30, False, 
+		{30, False,
 		"-adobe-times-medium-r-normal--24-240-75-75-p-124-iso8859-1",
  		NULL}},
   {"-polytext", "Char in 20/40/20 line (6x13, TR 10)", NULL,
 		InitText, DoPolyText, ClearTextWin, EndText,
 		V1_2FEATURE, ROP, 0,
-		{80, True, "6x13", 
+		{80, True, "6x13",
 		"-adobe-times-medium-r-normal--10-100-75-75-p-54-iso8859-1"}},
   {"-polytext16", "Char16 in 7/14/7 line (k14, k24)", NULL,
 		InitText16, DoPolyText16, ClearTextWin, EndText16,
 		V1_3FEATURE, ROP, 0,
-		{28, True, 
+		{28, True,
 	     "-misc-fixed-medium-r-normal--14-130-75-75-c-140-jisx0208.1983-*",
              "-jis-fixed-medium-r-normal--24-230-75-75-c-240-jisx0208.1983-*"}},
   {"-fitext",   "Char in 80-char image line (6x13)", NULL,
@@ -988,19 +988,19 @@ Test test[] = {
   {"-f24itext16", "Char16 in 23-char image line (k24)", NULL,
 		InitText16, DoImageText16, ClearTextWin, EndText16,
 		V1_3FEATURE, PLANEMASK, 0,
-		{23, False, 
+		{23, False,
 	      "-jis-fixed-medium-r-normal--24-230-75-75-c-240-jisx0208.1983-*",
 		NULL}},
   {"-tr10itext", "Char in 80-char image line (TR 10)", NULL,
 		InitText, DoImageText, ClearTextWin, EndText,
 		V1_2FEATURE, PLANEMASK, 0,
-		{80, False, 
-		"-adobe-times-medium-r-normal--10-100-75-75-p-54-iso8859-1", 
+		{80, False,
+		"-adobe-times-medium-r-normal--10-100-75-75-p-54-iso8859-1",
 		NULL}},
   {"-tr24itext", "Char in 30-char image line (TR 24)", NULL,
 		InitText, DoImageText, ClearTextWin, EndText,
 		V1_2FEATURE, PLANEMASK, 0,
-		{30, False, 
+		{30, False,
 		"-adobe-times-medium-r-normal--24-240-75-75-p-124-iso8859-1",
  		NULL}},
 #ifdef XFT
@@ -1106,7 +1106,7 @@ Test test[] = {
 		V1_2FEATURE, ROP, 0,
 		{4, 10}},
   {"-copypixwin100", "Copy 100x100 from pixmap to window", NULL,
-		InitCopyPix, DoCopyPixWin, MidCopyPix, EndCopyPix, 
+		InitCopyPix, DoCopyPixWin, MidCopyPix, EndCopyPix,
 		V1_2FEATURE, ROP, 0,
 		{4, 100}},
   {"-copypixwin500", "Copy 500x500 from pixmap to window", NULL,
@@ -1118,7 +1118,7 @@ Test test[] = {
 		V1_2FEATURE, ROP, 0,
 		{4, 10}},
   {"-copywinpix100", "Copy 100x100 from window to pixmap", NULL,
-		InitCopyPix, DoCopyWinPix, MidScroll, EndCopyPix, 
+		InitCopyPix, DoCopyWinPix, MidScroll, EndCopyPix,
 		V1_2FEATURE, ROP, 0,
 		{4, 100}},
   {"-copywinpix500", "Copy 500x500 from window to pixmap", NULL,
@@ -1130,7 +1130,7 @@ Test test[] = {
 		V1_2FEATURE, ROP, 0,
 		{4, 10}},
   {"-copypixpix100", "Copy 100x100 from pixmap to pixmap", NULL,
-		InitCopyPix, DoCopyPixPix, NullProc, EndCopyPix, 
+		InitCopyPix, DoCopyPixPix, NullProc, EndCopyPix,
 		V1_2FEATURE, ROP, 0,
 		{4, 100}},
   {"-copypixpix500", "Copy 500x500 from pixmap to pixmap", NULL,
diff --git a/do_text.c b/do_text.c
index 34947b9..d09af5d 100644
--- a/do_text.c
+++ b/do_text.c
@@ -3,13 +3,13 @@ Copyright 1988, 1989 by Digital Equipment Corporation, Maynard, Massachusetts.
 
                         All Rights Reserved
 
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
 provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
+both that copyright notice and this permission notice appear in
 supporting documentation, and that the name of Digital not be
 used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
+software without specific, written prior permission.
 
 DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
 ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
@@ -34,7 +34,7 @@ static int charsPerLine, totalLines;
 #define SEGS 3
 
 
-int 
+int
 InitText(XParms xp, Parms p, int64_t reps)
 {
     XGCValues   gcv;
@@ -118,7 +118,7 @@ InitText(XParms xp, Parms p, int64_t reps)
              | pci->ascent | pci->descent | pci->attributes) == 0);     \
 } /* GetRealChar */
 
-int 
+int
 InitText16(XParms xp, Parms p, int64_t reps)
 {
     XGCValues   	gcv;
@@ -218,7 +218,7 @@ InitText16(XParms xp, Parms p, int64_t reps)
     return reps;
 }
 
-void 
+void
 DoText(XParms xp, Parms p, int64_t reps)
 {
     int     line, startLine;
@@ -240,7 +240,7 @@ DoText(XParms xp, Parms p, int64_t reps)
     }
 }
 
-void 
+void
 DoText16(XParms xp, Parms p, int64_t reps)
 {
     int     line, startLine;
@@ -262,7 +262,7 @@ DoText16(XParms xp, Parms p, int64_t reps)
     }
 }
 
-void 
+void
 DoPolyText(XParms xp, Parms p, int64_t reps)
 {
     int     line, startLine;
@@ -284,7 +284,7 @@ DoPolyText(XParms xp, Parms p, int64_t reps)
     }
 }
 
-void 
+void
 DoPolyText16(XParms xp, Parms p, int64_t reps)
 {
     int     line, startLine;
@@ -306,7 +306,7 @@ DoPolyText16(XParms xp, Parms p, int64_t reps)
     }
 }
 
-void 
+void
 DoImageText(XParms xp, Parms p, int64_t reps)
 {
     int     line, startLine;
@@ -328,7 +328,7 @@ DoImageText(XParms xp, Parms p, int64_t reps)
     }
 }
 
-void 
+void
 DoImageText16(XParms xp, Parms p, int64_t reps)
 {
     int     line, startLine;
@@ -350,13 +350,13 @@ DoImageText16(XParms xp, Parms p, int64_t reps)
     }
 }
 
-void 
+void
 ClearTextWin(XParms xp, Parms p)
 {
     XClearWindow(xp->d, xp->w);
 }
 
-void 
+void
 EndText(XParms xp, Parms p)
 {
     if(font==NULL)return;
@@ -370,7 +370,7 @@ EndText(XParms xp, Parms p)
 	XFreeFont(xp->d, bfont);
 }
 
-void 
+void
 EndText16(XParms xp, Parms p)
 {
     if(font==NULL)return;
@@ -401,26 +401,26 @@ static XftFont	*aafont;
 static XftDraw	*aadraw;
 static XftColor	aacolor;
 
-int 
+int
 InitAAText(XParms xp, Parms p, int64_t reps)
 {
     char		ch;
     XRenderColor	color;
 
     aafont = XftFontOpenName (xp->d, DefaultScreen (xp->d), p->font);
-    
-    if (aafont == NULL) 
+
+    if (aafont == NULL)
     {
-	printf("Could not load font '%s', benchmark omitted\n", 
+	printf("Could not load font '%s', benchmark omitted\n",
 	       p->font);
 	return 0;
     }
 
-    aadraw = XftDrawCreate (xp->d, xp->w, 
-			    xp->vinfo.visual, 
+    aadraw = XftDrawCreate (xp->d, xp->w,
+			    xp->vinfo.visual,
 			    xp->cmap);
 
-    if (!aadraw) 
+    if (!aadraw)
     {
 	printf ("Cannot create XftDraw object\n");
 	XftFontClose (xp->d, aafont);
@@ -431,7 +431,7 @@ InitAAText(XParms xp, Parms p, int64_t reps)
     color.blue = 0;
     color.alpha = 0xffff;
     if (!XftColorAllocValue (xp->d,
-			     xp->vinfo.visual, 
+			     xp->vinfo.visual,
 			     xp->cmap,
 			     &color, &aacolor))
     {
@@ -442,10 +442,10 @@ InitAAText(XParms xp, Parms p, int64_t reps)
 	aadraw = NULL;
 	return 0;
     }
-    
+
     ypos = XPOS;
     height = aafont->height;
-    
+
     charsPerLine = p->objects;
     charsPerLine = (charsPerLine + 3) & ~3;
     p->objects = charsPerLine;
@@ -466,7 +466,7 @@ InitAAText(XParms xp, Parms p, int64_t reps)
     return reps;
 }
 
-void 
+void
 DoAAText(XParms xp, Parms p, int64_t reps)
 {
     int     line, startLine;
@@ -474,7 +474,7 @@ DoAAText(XParms xp, Parms p, int64_t reps)
     startLine = 0;
     line = 0;
     for (int i = 0; i != reps; i++) {
-	XftDrawString8 (aadraw, &aacolor, aafont, 
+	XftDrawString8 (aadraw, &aacolor, aafont,
 		       XPOS, ypos, (unsigned char *) charBuf[line], charsPerLine);
 	ypos += height;
 	if (ypos > HEIGHT - height) {
@@ -488,7 +488,7 @@ DoAAText(XParms xp, Parms p, int64_t reps)
     }
 }
 
-void 
+void
 EndAAText(XParms xp, Parms p)
 {
     if(!aadraw)return;
@@ -498,7 +498,7 @@ EndAAText(XParms xp, Parms p)
     XftDrawDestroy (aadraw);
     XftFontClose (xp->d, aafont);
     XftColorFree (xp->d,
-		  xp->vinfo.visual, 
+		  xp->vinfo.visual,
 		  xp->cmap,
 		  &aacolor);
 }
diff --git a/do_traps.c b/do_traps.c
index 0f5d168..fe51f35 100644
--- a/do_traps.c
+++ b/do_traps.c
@@ -3,13 +3,13 @@ Copyright 1988, 1989 by Digital Equipment Corporation, Maynard, Massachusetts.
 
                         All Rights Reserved
 
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
 provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
+both that copyright notice and this permission notice appear in
 supporting documentation, and that the name of Digital not be
 used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
+software without specific, written prior permission.
 
 DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
 ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
@@ -28,7 +28,7 @@ SOFTWARE.
 static XPoint *points;
 static GC      pgc;
 
-int 
+int
 InitTrapezoids(XParms xp, Parms p, int64_t reps)
 {
     int     numPoints;
@@ -40,7 +40,7 @@ InitTrapezoids(XParms xp, Parms p, int64_t reps)
     pgc = xp->fggc;
 
     size = p->special;
-    numPoints = (p->objects) * NUM_POINTS;  
+    numPoints = (p->objects) * NUM_POINTS;
     points = malloc(numPoints * sizeof(XPoint));
     curPoint = points;
     x = size;
@@ -77,13 +77,13 @@ InitTrapezoids(XParms xp, Parms p, int64_t reps)
     return reps;
 }
 
-void 
+void
 DoTrapezoids(XParms xp, Parms p, int64_t reps)
 {
     for (int i = 0; i != reps; i++) {
         XPoint  *curPoint = points;
         for (int j = 0; j != p->objects; j++) {
-            XFillPolygon(xp->d, xp->w, pgc, curPoint, NUM_POINTS, Convex, 
+            XFillPolygon(xp->d, xp->w, pgc, curPoint, NUM_POINTS, Convex,
 			 CoordModeOrigin);
             curPoint += NUM_POINTS;
 	}
@@ -95,7 +95,7 @@ DoTrapezoids(XParms xp, Parms p, int64_t reps)
     }
 }
 
-void 
+void
 EndTrapezoids(XParms xp, Parms p)
 {
     free(points);
@@ -142,10 +142,10 @@ InitFixedTraps(XParms xp, Parms p, int64_t reps)
     y = 0;
     rows = 0;
     skew = size;
-    aadraw = XftDrawCreate (xp->d, xp->w, 
-			    xp->vinfo.visual, 
+    aadraw = XftDrawCreate (xp->d, xp->w,
+			    xp->vinfo.visual,
 			    xp->cmap);
-    
+
     depth = 0;
     width = 0;
     if (p->font)
@@ -167,17 +167,17 @@ InitFixedTraps(XParms xp, Parms p, int64_t reps)
     maskFormat = XRenderFindStandardFormat (xp->d, std_fmt);
     if (!maskFormat)
 	return 0;
-    
+
     maskPixmap = XCreatePixmap (xp->d, xp->w, WIDTH, HEIGHT, depth);
 
     mask = XRenderCreatePicture (xp->d, maskPixmap, maskFormat, 0, NULL);
-    
+
     color.red = 0;
     color.green = 0;
     color.blue = 0;
     color.alpha = 0xffff;
     if (!XftColorAllocValue (xp->d,
-			     xp->vinfo.visual, 
+			     xp->vinfo.visual,
 			     xp->cmap,
 			     &color, &aablack))
     {
@@ -190,7 +190,7 @@ InitFixedTraps(XParms xp, Parms p, int64_t reps)
     color.blue = 0xffff;
     color.alpha = 0xffff;
     if (!XftColorAllocValue (xp->d,
-			     xp->vinfo.visual, 
+			     xp->vinfo.visual,
 			     xp->cmap,
 			     &color, &aawhite))
     {
@@ -208,7 +208,7 @@ InitFixedTraps(XParms xp, Parms p, int64_t reps)
 	curTrap->bottom.y = XDoubleToFixed (y + size);
 	curTrap->bottom.left = XDoubleToFixed (x + skew - width);
 	curTrap->bottom.right = XDoubleToFixed (x + skew);
-	
+
 	skew--;
 	if (skew < 0) skew = size;
 
@@ -223,12 +223,12 @@ InitFixedTraps(XParms xp, Parms p, int64_t reps)
 	    }
 	}
     }
-    
+
     SetFillStyle(xp, p);
     return reps;
 }
 
-void 
+void
 DoFixedTraps(XParms xp, Parms p, int64_t reps)
 {
     Picture	white, black, src, dst;
@@ -281,8 +281,8 @@ InitFixedTrapezoids(XParms xp, Parms p, int64_t reps)
     y = 0;
     rows = 0;
     skew = size;
-    aadraw = XftDrawCreate (xp->d, xp->w, 
-			    xp->vinfo.visual, 
+    aadraw = XftDrawCreate (xp->d, xp->w,
+			    xp->vinfo.visual,
 			    xp->cmap);
     if (p->font && !strcmp (p->font, "add"))
     {
@@ -291,7 +291,7 @@ InitFixedTrapezoids(XParms xp, Parms p, int64_t reps)
 	templ.depth = 8;
 	templ.direct.alpha = 0;
 	templ.direct.alphaMask = 0xff;
-	maskFormat = XRenderFindFormat (xp->d, 
+	maskFormat = XRenderFindFormat (xp->d,
 					PictFormatType |
 					PictFormatDepth |
 					PictFormatAlpha |
@@ -306,7 +306,7 @@ InitFixedTrapezoids(XParms xp, Parms p, int64_t reps)
     color.blue = 0;
     color.alpha = 0xffff;
     if (!XftColorAllocValue (xp->d,
-			     xp->vinfo.visual, 
+			     xp->vinfo.visual,
 			     xp->cmap,
 			     &color, &aablack))
     {
@@ -319,7 +319,7 @@ InitFixedTrapezoids(XParms xp, Parms p, int64_t reps)
     color.blue = 0xffff;
     color.alpha = 0xffff;
     if (!XftColorAllocValue (xp->d,
-			     xp->vinfo.visual, 
+			     xp->vinfo.visual,
 			     xp->cmap,
 			     &color, &aawhite))
     {
@@ -335,12 +335,12 @@ InitFixedTrapezoids(XParms xp, Parms p, int64_t reps)
 	curTrap->left.p1.y = XDoubleToFixed (y);
 	curTrap->left.p2.x = XDoubleToFixed (x + skew - size);
 	curTrap->left.p2.y = XDoubleToFixed (y + size);
-	
+
 	curTrap->right.p1.x = XDoubleToFixed (x - skew + size);
 	curTrap->right.p1.y = XDoubleToFixed (y);
 	curTrap->right.p2.x = XDoubleToFixed (x + skew);
 	curTrap->right.p2.y = XDoubleToFixed (y + size);
-	
+
 	skew--;
 	if (skew < 0) skew = size;
 
@@ -356,12 +356,12 @@ InitFixedTrapezoids(XParms xp, Parms p, int64_t reps)
 	}
     }
 
-    
+
     SetFillStyle(xp, p);
     return reps;
 }
 
-void 
+void
 DoFixedTrapezoids(XParms xp, Parms p, int64_t reps)
 {
     Picture	white, black, src, dst;
diff --git a/do_tris.c b/do_tris.c
index 1e1d3b9..4f668cf 100644
--- a/do_tris.c
+++ b/do_tris.c
@@ -6,13 +6,13 @@ Copyright 1988, 1989 by Digital Equipment Corporation, Maynard, Massachusetts.
 
                         All Rights Reserved
 
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
 provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
+both that copyright notice and this permission notice appear in
 supporting documentation, and that the name of Digital not be
 used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
+software without specific, written prior permission.
 
 DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
 ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
@@ -43,7 +43,7 @@ static GC     pgc;
 #define PI  3.14159265357989
 #endif
 
-static double 
+static double
 Area(XPoint p1, XPoint p2, XPoint p3)
 {
     return
@@ -51,14 +51,14 @@ Area(XPoint p1, XPoint p2, XPoint p3)
 }
 
 /*
-static double 
+static double
 Distance(XPoint p1, XPoint p2)
 {
     return sqrt((float) ((p1.x-p2.x)*(p1.x-p2.x) + (p1.y-p2.y)*(p1.y-p2.y)));
 }
 */
-    
-int 
+
+int
 InitTriangles(XParms xp, Parms p, int64_t reps)
 {
     int     numPoints;
@@ -90,7 +90,7 @@ InitTriangles(XParms xp, Parms p, int64_t reps)
     }
     iradius = (int) (radius + 0.5);
 
-    numPoints = (p->objects) * NUM_POINTS;  
+    numPoints = (p->objects) * NUM_POINTS;
     points = malloc(numPoints * sizeof(XPoint));
     curPoint = points;
     x = iradius;
@@ -112,7 +112,7 @@ InitTriangles(XParms xp, Parms p, int64_t reps)
 	    Distance(curPoint[-1], curPoint[-3]),
 	    Distance(curPoint[-2], curPoint[-3]),
 	    area);
-*/	
+*/
 	phi += phiinc;
 	y += 2 * iradius;
 	rows++;
@@ -134,13 +134,13 @@ InitTriangles(XParms xp, Parms p, int64_t reps)
 
 #ifndef POLYTRIANGLE_HACK
 
-void 
+void
 DoTriangles(XParms xp, Parms p, int64_t reps)
 {
     for (int i = 0; i != reps; i++) {
         XPoint  *curPoint = points;
         for (int j = 0; j != p->objects; j++) {
-            XFillPolygon(xp->d, xp->w, pgc, curPoint, NUM_POINTS, Convex, 
+            XFillPolygon(xp->d, xp->w, pgc, curPoint, NUM_POINTS, Convex,
 			 CoordModeOrigin);
             curPoint += NUM_POINTS;
 	}
@@ -159,8 +159,8 @@ static xReq _dummy_request = {
 };
 
 static void
-XPolyTriangle(register Display *dpy, 
-	      Drawable d, GC gc, XPoint *points, 
+XPolyTriangle(register Display *dpy,
+	      Drawable d, GC gc, XPoint *points,
 	      int n_triangles, int shape, int mode)
 {
     register xFillPolyReq *req;
@@ -183,7 +183,7 @@ XPolyTriangle(register Display *dpy,
 	if ((n_this_time = max_triangles) > n_triangles)
 	    n_this_time = n_triangles;
 	n_triangles -= n_this_time;
-	GetReqExtra(FillPoly, 
+	GetReqExtra(FillPoly,
 	    (SIZEOF(xFillPolyReq) + 12) * n_this_time - SIZEOF(xFillPolyReq), req);
 	--dpy->request;
 
@@ -206,11 +206,11 @@ XPolyTriangle(register Display *dpy,
     SyncHandle();
 }
 
-void 
+void
 DoTriangles(XParms xp, Parms p, int64_t reps)
 {
     for (int i = 0; i != reps; i++) {
-        XPolyTriangle (xp->d, xp->w, pgc, points, p->objects, Convex, 
+        XPolyTriangle (xp->d, xp->w, pgc, points, p->objects, Convex,
 			 CoordModeOrigin);
         if (pgc == xp->bggc)
             pgc = xp->fggc;
@@ -221,7 +221,7 @@ DoTriangles(XParms xp, Parms p, int64_t reps)
 }
 #endif
 
-void 
+void
 EndTriangles(XParms xp, Parms p)
 {
     free(points);
diff --git a/do_valgc.c b/do_valgc.c
index 8edf764..b7394db 100644
--- a/do_valgc.c
+++ b/do_valgc.c
@@ -3,13 +3,13 @@ Copyright 1988, 1989 by Digital Equipment Corporation, Maynard, Massachusetts.
 
                         All Rights Reserved
 
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
 provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
+both that copyright notice and this permission notice appear in
 supporting documentation, and that the name of Digital not be
 used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
+software without specific, written prior permission.
 
 DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
 ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
@@ -30,7 +30,7 @@ SOFTWARE.
 
 static Window win[2];
 
-int 
+int
 InitGC(XParms xp, Parms p, int64_t reps)
 {
     win[0] = XCreateSimpleWindow(
@@ -41,7 +41,7 @@ InitGC(XParms xp, Parms p, int64_t reps)
     return reps;
 }
 
-void 
+void
 DoChangeGC(XParms xp, Parms p, int64_t reps)
 {
     XGCValues   gcv;
@@ -49,24 +49,24 @@ DoChangeGC(XParms xp, Parms p, int64_t reps)
     for (int i = 0; i != reps; i++) {
         gcv.foreground = xp->foreground;
         XChangeGC(xp->d, xp->fggc, GCForeground , &gcv);
-        XDrawPoint(xp->d, win[0], xp->fggc, 5, 5);       
+        XDrawPoint(xp->d, win[0], xp->fggc, 5, 5);
 
         gcv.foreground = xp->background;
         XChangeGC(xp->d, xp->fggc, GCForeground , &gcv);
-        XDrawPoint(xp->d, win[1], xp->fggc, 5, 5);       
+        XDrawPoint(xp->d, win[1], xp->fggc, 5, 5);
 
         gcv.foreground = xp->background;
         XChangeGC(xp->d, xp->fggc, GCForeground , &gcv);
-        XDrawPoint(xp->d, win[0], xp->fggc, 5, 5);       
+        XDrawPoint(xp->d, win[0], xp->fggc, 5, 5);
 
         gcv.foreground = xp->foreground;
         XChangeGC(xp->d, xp->fggc, GCForeground , &gcv);
-        XDrawPoint(xp->d, win[1], xp->fggc, 5, 5);       
+        XDrawPoint(xp->d, win[1], xp->fggc, 5, 5);
 	CheckAbort ();
     }
 }
 
-void 
+void
 EndGC(XParms xp, Parms p)
 {
     XDestroyWindow(xp->d, win[0]);
diff --git a/do_windows.c b/do_windows.c
index 490b290..52a682f 100644
--- a/do_windows.c
+++ b/do_windows.c
@@ -3,13 +3,13 @@ Copyright 1988, 1989 by Digital Equipment Corporation, Maynard, Massachusetts.
 
                         All Rights Reserved
 
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
 provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
+both that copyright notice and this permission notice appear in
 supporting documentation, and that the name of Digital not be
 used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
+software without specific, written prior permission.
 
 DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
 ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
@@ -30,7 +30,7 @@ static int parentrows, parentcolumns, parentwindows;
 static int parentwidth, parentheight;
 static Window popup;
 
-static void 
+static void
 ComputeSizes(XParms xp, Parms p)
 {
     childwindows = p->objects;
@@ -41,7 +41,7 @@ ComputeSizes(XParms xp, Parms p)
     parentheight = (CHILDSIZE+CHILDSPACE) * childrows;
 }
 
-int 
+int
 CreateParents(XParms xp, Parms p, int64_t reps)
 {
     ComputeSizes(xp, p);
@@ -81,7 +81,7 @@ CreateParents(XParms xp, Parms p, int64_t reps)
 } /* CreateParents */
 
 
-void 
+void
 MapParents(XParms xp, Parms p, int64_t reps)
 {
     for (int i = 0; i != parentwindows; i++) {
@@ -89,7 +89,7 @@ MapParents(XParms xp, Parms p, int64_t reps)
     }
 }
 
-void 
+void
 MapParentsCleanup(XParms xp, Parms p)
 {
     for (int i = 0; i != parentwindows; i++) {
@@ -98,7 +98,7 @@ MapParentsCleanup(XParms xp, Parms p)
 }
 
 
-int 
+int
 InitCreate(XParms xp, Parms p, int64_t reps)
 {
     reps = CreateParents(xp, p, reps);
@@ -106,7 +106,7 @@ InitCreate(XParms xp, Parms p, int64_t reps)
     return reps;
 }
 
-static void 
+static void
 CreateChildGroup(XParms xp, Parms p, Window parent)
 {
     for (int j = 0; j != childwindows; j++) {
@@ -120,7 +120,7 @@ CreateChildGroup(XParms xp, Parms p, Window parent)
 	XMapSubwindows (xp->d, parent);
 }
 
-void 
+void
 CreateChildren(XParms xp, Parms p, int64_t reps)
 {
     for (int i = 0; i != parentwindows; i++) {
@@ -128,7 +128,7 @@ CreateChildren(XParms xp, Parms p, int64_t reps)
     } /* end i */
 }
 
-void 
+void
 DestroyChildren(XParms xp, Parms p)
 {
     for (int i = 0; i != parentwindows; i++) {
@@ -136,7 +136,7 @@ DestroyChildren(XParms xp, Parms p)
     }
 }
 
-void 
+void
 EndCreate(XParms xp, Parms p)
 {
     XDestroySubwindows(xp->d, xp->w);
@@ -145,7 +145,7 @@ EndCreate(XParms xp, Parms p)
 }
 
 
-int 
+int
 InitMap(XParms xp, Parms p, int64_t reps)
 {
     reps = CreateParents(xp, p, reps);
@@ -153,7 +153,7 @@ InitMap(XParms xp, Parms p, int64_t reps)
     return reps;
 }
 
-void 
+void
 UnmapParents(XParms xp, Parms p, int64_t reps)
 {
     for (int i = 0; i != parentwindows; i++) {
@@ -161,7 +161,7 @@ UnmapParents(XParms xp, Parms p, int64_t reps)
     }
 }
 
-void 
+void
 UnmapParentsCleanup(XParms xp, Parms p)
 {
     for (int i = 0; i != parentwindows; i++) {
@@ -169,7 +169,7 @@ UnmapParentsCleanup(XParms xp, Parms p)
     }
 }
 
-int 
+int
 InitDestroy(XParms xp, Parms p, int64_t reps)
 {
     reps = CreateParents(xp, p, reps);
@@ -178,7 +178,7 @@ InitDestroy(XParms xp, Parms p, int64_t reps)
     return reps;
 }
 
-void 
+void
 DestroyParents(XParms xp, Parms p, int64_t reps)
 {
     for (int i = 0; i != parentwindows; i++) {
@@ -187,7 +187,7 @@ DestroyParents(XParms xp, Parms p, int64_t reps)
 }
 
 
-void 
+void
 RenewParents(XParms xp, Parms p)
 {
     for (int i = 0; i != parentwindows; i++) {
@@ -198,7 +198,7 @@ RenewParents(XParms xp, Parms p)
     MapParents(xp, p, parentwindows);
 }
 
-int 
+int
 InitPopups(XParms xp, Parms p, int64_t reps)
 {
 #ifdef CHILDROOT
@@ -215,11 +215,11 @@ InitPopups(XParms xp, Parms p, int64_t reps)
     (void) XGetWindowAttributes(xp->d, xp->w, &xwa);
     xswa.override_redirect = True;
     popup =  XCreateSimpleWindow (
-	    xp->d, DefaultRootWindow(xp->d), 
+	    xp->d, DefaultRootWindow(xp->d),
 	    xwa.x + xwa.border_width, xwa.y + xwa.border_width,
 	    parentwidth, parentheight,
 	    0, xp->foreground, xp->foreground);
-#else   
+#else
     isolate = XCreateSimpleWindow(
 	    xp->d, xp->w, 0, 0, WIDTH, HEIGHT,
 	    0, xp->background, xp->background);
@@ -239,7 +239,7 @@ InitPopups(XParms xp, Parms p, int64_t reps)
     return reps;
 }
 
-void 
+void
 DoPopUps(XParms xp, Parms p, int64_t reps)
 {
     for (int i = 0; i != reps; i++) {
@@ -249,7 +249,7 @@ DoPopUps(XParms xp, Parms p, int64_t reps)
     }
 }
 
-void 
+void
 EndPopups(XParms xp, Parms p)
 {
     XDestroySubwindows(xp->d, xp->w);
diff --git a/x11perf.c b/x11perf.c
index 5782923..a32fe55 100644
--- a/x11perf.c
+++ b/x11perf.c
@@ -3,13 +3,13 @@ Copyright 1988, 1989 by Digital Equipment Corporation, Maynard, Massachusetts.
 
                         All Rights Reserved
 
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
 provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
+both that copyright notice and this permission notice appear in
 supporting documentation, and that the name of Digital not be
 used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
+software without specific, written prior permission.
 
 DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
 ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
@@ -161,7 +161,7 @@ static int ssTimeout, ssInterval, ssPreferBlanking, ssAllowExposures;
 
 /* Static functions */
 static int GetWords(int argi, int argc, char **argv, char **wordsp, int *nump);
-static int GetNumbers(int argi, int argc, char **argv, unsigned long *intsp, 
+static int GetNumbers(int argi, int argc, char **argv, unsigned long *intsp,
 		      int *nump);
 static int GetRops(int argi, int argc, char **argv, int *ropsp, int *nump);
 static int GetPops(int argi, int argc, char **argv, int *popsp, int *nump);
@@ -221,7 +221,7 @@ int gettimeofday(tp)
 
 static struct  timeval start;
 
-static void 
+static void
 PrintTime(void)
 {
     Time_t t;
@@ -230,13 +230,13 @@ PrintTime(void)
     printf("%s\n", ctime(&t));
 }
 
-static void 
+static void
 InitTimes(void)
 {
     X_GETTIMEOFDAY(&start);
 }
 
-static double 
+static double
 ElapsedTime(double correction)
 {
     struct timeval stop;
@@ -250,7 +250,7 @@ ElapsedTime(double correction)
             (1000000.0 * (double)(stop.tv_sec - start.tv_sec)) - correction;
 }
 
-static double 
+static double
 RoundTo3Digits(double d)
 {
     /* It's kind of silly to print out things like ``193658.4/sec'' so just
@@ -286,7 +286,7 @@ RoundTo3Digits(double d)
 }
 
 
-static void 
+static void
 ReportTimes(double usecs, int64_t n, char *str, int average)
 {
     if(usecs != 0.0)
@@ -299,10 +299,10 @@ ReportTimes(double usecs, int64_t n, char *str, int average)
         objspersec =  RoundTo3Digits(objspersec);
 
         if (average) {
-	    printf("%11lld trep @ %8.4f msec (%8.1f/sec): %s\n", 
+	    printf("%11lld trep @ %8.4f msec (%8.1f/sec): %s\n",
                    (long long) n, msecsperobj, objspersec, str);
 	} else {
-	    printf("%11lld reps @ %8.4f msec (%8.1f/sec): %s\n", 
+	    printf("%11lld reps @ %8.4f msec (%8.1f/sec): %s\n",
                    (long long) n, msecsperobj, objspersec, str);
 	}
     } else {
@@ -360,7 +360,7 @@ Get_Display_Name(int *pargc, /* MODIFIED */
  * If found remove it from command line.  Don't go past a lone -.
  */
 
-static Version 
+static Version
 GetVersion(int *pargc, /* MODIFIED */
 	   char **argv)  /* MODIFIED */
 {
@@ -449,7 +449,7 @@ void
 AbortTest(void)
 {
     fflush(stdout);
-    
+
     XSetScreenSaver(xparms.d, ssTimeout, ssInterval, ssPreferBlanking,
 	ssAllowExposures);
     XFlush(xparms.d);
@@ -461,7 +461,7 @@ AbortTest(void)
 ************************************************/
 
 
-static void 
+static void
 usage(void)
 {
     int     i = 0;
@@ -506,7 +506,7 @@ usage(void)
         i++;
     }
     fprintf(stderr, "\n");
-    
+
     /* Print out original command line as the above usage message is so long */
     for (i = 0; i != saveargc; i++) {
 	fprintf(stderr, "%s ", saveargv[i]);
@@ -515,18 +515,18 @@ usage(void)
     exit (1);
 }
 
-void 
+void
 NullProc(XParms xp, Parms p)
 {
 }
 
-int 
+int
 NullInitProc(XParms xp, Parms p, int64_t reps)
 {
     return reps;
 }
 
-static void 
+static void
 HardwareSync(XParms xp)
 {
     /*
@@ -537,13 +537,13 @@ HardwareSync(XParms xp)
      */
     XImage *image;
 
-    image = XGetImage(xp->d, xp->p ? xp->p : xp->w, HSx, HSy, 
+    image = XGetImage(xp->d, xp->p ? xp->p : xp->w, HSx, HSy,
 		      1, 1, ~0, ZPixmap);
     if (image) XDestroyImage(image);
 }
 
-static void 
-DoHardwareSync(XParms xp, Parms p, int64_t reps)    
+static void
+DoHardwareSync(XParms xp, Parms p, int64_t reps)
 {
     for (int i = 0; i != reps; i++) {
 	HardwareSync(xp);
@@ -553,13 +553,13 @@ DoHardwareSync(XParms xp, Parms p, int64_t reps)
 
 static Test syncTest = {
     "syncTime", "Internal test for finding how long HardwareSync takes", NULL,
-    NullInitProc, DoHardwareSync, NullProc, NullProc, 
+    NullInitProc, DoHardwareSync, NullProc, NullProc,
     V1_2FEATURE, NONROP, 0,
     {1}
 };
 
 
-static Window 
+static Window
 CreatePerfWindow(XParms xp, int x, int y, int width, int height)
 {
     XSetWindowAttributes xswa;
@@ -584,14 +584,14 @@ CreatePerfWindow(XParms xp, int x, int y, int width, int height)
     xswa.save_under = xp->save_under;
     w = XCreateWindow(xp->d, DefaultRootWindow(xp->d), x, y, width, height, 1,
         xp->vinfo.depth, CopyFromParent, xp->vinfo.visual,
-	CWBackPixel | CWBorderPixel | CWColormap | CWOverrideRedirect 
+	CWBackPixel | CWBorderPixel | CWColormap | CWOverrideRedirect
 	| CWBackingStore | CWSaveUnder, &xswa);
     XMapWindow (xp->d, w);
     return w;
 }
 
 
-static void 
+static void
 CreateClipWindows(XParms xp, int clips)
 {
     XWindowAttributes    xwa;
@@ -605,7 +605,7 @@ CreateClipWindows(XParms xp, int clips)
 } /* CreateClipWindows */
 
 
-static void 
+static void
 DestroyClipWindows(XParms xp, int clips)
 {
     if (clips > MAXCLIP) clips = MAXCLIP;
@@ -615,7 +615,7 @@ DestroyClipWindows(XParms xp, int clips)
 } /* DestroyClipWindows */
 
 
-static double 
+static double
 DoTest(XParms xp, Test *test, int64_t reps)
 {
     double  time;
@@ -624,7 +624,7 @@ DoTest(XParms xp, Test *test, int64_t reps)
     /* Tell screen-saver to restart counting again.  See comments below for the
        XSetScreenSaver call. */
     XForceScreenSaver(xp->d, ScreenSaverReset);
-    HardwareSync (xp); 
+    HardwareSync (xp);
     InitTimes ();
     (*test->proc) (xp, &test->parms, reps);
     HardwareSync(xp);
@@ -685,9 +685,9 @@ CalibrateTest(XParms xp, Test *test, int seconds, double *usecperobj)
 	CheckAbort ();
 
 	if (didreps != reps) {
-	    /* The test can't do the number of reps as we asked for.  
+	    /* The test can't do the number of reps as we asked for.
 	       Give up */
-	    *usecperobj = 
+	    *usecperobj =
 		usecs / (double)(didreps * test->parms.objects);
 	    return didreps;
 	}
@@ -717,7 +717,7 @@ CalibrateTest(XParms xp, Test *test, int seconds, double *usecperobj)
     return reps;
 } /* CalibrateTest */
 
-static void 
+static void
 CreatePerfGCs(XParms xp, int func, unsigned long pm)
 {
     XGCValues gcvfg, gcvbg, gcvddbg,gcvddfg;
@@ -738,7 +738,7 @@ CreatePerfGCs(XParms xp, int func, unsigned long pm)
     gcvbg.function = func;
     gcvddfg.function = func;
     gcvddbg.function = func;
-    
+
     if (func == GXxor) {
 	/* Make test look good visually if possible */
 	gcvbg.foreground = gcvfg.foreground = bg ^ fg;
@@ -759,19 +759,19 @@ CreatePerfGCs(XParms xp, int func, unsigned long pm)
     xp->fggc = XCreateGC(xp->d, xp->w,
 	GCForeground | GCBackground | GCGraphicsExposures
       | GCFunction | GCPlaneMask, &gcvfg);
-    xp->bggc = XCreateGC(xp->d, xp->w, 
+    xp->bggc = XCreateGC(xp->d, xp->w,
 	GCForeground | GCBackground | GCGraphicsExposures
       | GCFunction | GCPlaneMask, &gcvbg);
     xp->ddfggc = XCreateGC(xp->d, xp->w,
 	GCForeground | GCBackground | GCGraphicsExposures
       | GCFunction | GCPlaneMask, &gcvddfg);
-    xp->ddbggc = XCreateGC(xp->d, xp->w, 
+    xp->ddbggc = XCreateGC(xp->d, xp->w,
 	GCForeground | GCBackground | GCGraphicsExposures
       | GCFunction | GCPlaneMask, &gcvddbg);
 }
 
 
-static void 
+static void
 DestroyPerfGCs(XParms xp)
 {
     XFreeGC(xp->d, xp->fggc);
@@ -780,7 +780,7 @@ DestroyPerfGCs(XParms xp)
     XFreeGC(xp->d, xp->ddbggc);
 }
 
-static unsigned long 
+static unsigned long
 AllocateColor(Display *display, const char *name, unsigned long pixel)
 {
     XColor      color;
@@ -805,7 +805,7 @@ AllocateColor(Display *display, const char *name, unsigned long pixel)
 } /* AllocateColor */
 
 
-static void 
+static void
 DisplayStatus(Display *d, const char *message, const char *test, int try)
 {
     char    s[500];
@@ -818,7 +818,7 @@ DisplayStatus(Display *d, const char *message, const char *test, int try)
 }
 
 
-static void 
+static void
 ProcessTest(XParms xp, Test *test, int func, unsigned long pm, char *label)
 {
     double  time, totalTime;
@@ -928,7 +928,7 @@ main(int argc, char *argv[])
 	} else if (strcmp(argv[i], "-range") == 0) {
 	    char *cp1;
 	    char *cp2;
-	    
+
 	    if (argc <= ++i)
 		usage();
 	    cp1 = argv[i];
@@ -1100,7 +1100,7 @@ main(int argc, char *argv[])
 	    }
 	    if(!found)
 		usage ();
-	LegalOption: 
+	LegalOption:
 		foundOne = True;
 	}
     }
@@ -1114,7 +1114,7 @@ main(int argc, char *argv[])
 		    case NONROP:
 			printf ("%s\n", LABELP(i));
 			break;
-    
+
 		    case ROP:
 			/* Run it through all specified rops and planemasks */
 			for (rop = 0; rop < numRops; rop++) {
@@ -1136,7 +1136,7 @@ main(int argc, char *argv[])
 			    } /* for pm */
 			} /* for rop */
 			break;
-		    
+
 		    case PLANEMASK:
 			/* Run it through all specified planemasks */
 			for (pm = 0; pm < numPlanemasks; pm++) {
@@ -1149,7 +1149,7 @@ main(int argc, char *argv[])
 			    }
 			} /* for pm */
 			break;
-		    
+
 		    case WINDOW:
 			for (int child = 0; child != numSubWindows; child++) {
 			    printf ("%s (%ld kids)\n",
@@ -1233,7 +1233,7 @@ main(int argc, char *argv[])
 	}
     }
     xparms.cmap = cmap;
-    
+
     printf("x11perf - X11 performance program, version %s\n",
 	   xparms.version & VERSION1_5 ? "1.5" :
 	   xparms.version & VERSION1_4 ? "1.4" :
@@ -1251,7 +1251,7 @@ main(int argc, char *argv[])
        saver off, but this causes problems on some servers.  We also reset
        the screen-saver timer each test, as 8 hours is about the maximum time
        we can use, and that isn't long enough for some X terminals using a
-       serial protocol to finish all the tests.  As long as the tests run to 
+       serial protocol to finish all the tests.  As long as the tests run to
        completion, the old screen-saver values are restored. */
     XForceScreenSaver(xparms.d, ScreenSaverReset);
     XGetScreenSaver(xparms.d, &ssTimeout, &ssInterval, &ssPreferBlanking,
@@ -1264,7 +1264,7 @@ main(int argc, char *argv[])
 #ifdef SIGHUP
     (void) signal(SIGHUP, Cleanup);
 #endif
-    XSetScreenSaver(xparms.d, 8 * 3600, ssInterval, ssPreferBlanking, 
+    XSetScreenSaver(xparms.d, 8 * 3600, ssInterval, ssPreferBlanking,
 	ssAllowExposures);
 
     if (drawToFakeServer) {
@@ -1293,12 +1293,12 @@ main(int argc, char *argv[])
     if (window_y + 1 + HEIGHT > DisplayHeight(xparms.d, screen))
 	HSy = DisplayHeight(xparms.d, screen) - (1 + window_y + 1);
     status = CreatePerfWindow(&xparms, window_x, HEIGHT+5, WIDTH, 20);
-    tgcv.foreground = 
+    tgcv.foreground =
 	AllocateColor(xparms.d, "black", BlackPixel(xparms.d, screen));
-    tgcv.background = 
+    tgcv.background =
 	AllocateColor(xparms.d, "white", WhitePixel(xparms.d, screen));
     tgc = XCreateGC(xparms.d, status, GCForeground | GCBackground, &tgcv);
-   
+
     xparms.p = (Pixmap)0;
 
     if (synchronous)
@@ -1306,7 +1306,7 @@ main(int argc, char *argv[])
 
     /* Get mouse pointer out of the way of the performance window.  On
        software cursor machines it will slow graphics performance.  On
-       all current MIT-derived servers it will slow window 
+       all current MIT-derived servers it will slow window
        creation/configuration performance. */
     XWarpPointer(xparms.d, None, status, 0, 0, 0, 0, WIDTH+32, 20+32);
 
@@ -1349,7 +1349,7 @@ main(int argc, char *argv[])
 			} /* for pm */
 		    } /* for rop */
 		    break;
-		
+
 		case PLANEMASK:
 		    /* Run it through all specified planemasks */
 		    for (pm = 0; pm < numPlanemasks; pm++) {
@@ -1364,7 +1364,7 @@ main(int argc, char *argv[])
 				    planemasks[pm], label);
 		    } /* for pm */
 		    break;
-		
+
 		case WINDOW:
 		    /* Loop through number of children array */
 		    for (int child = 0; child != numSubWindows; child++) {
diff --git a/x11perf.h b/x11perf.h
index 72f814c..396f6a0 100644
--- a/x11perf.h
+++ b/x11perf.h
@@ -3,13 +3,13 @@ Copyright 1988, 1989 by Digital Equipment Corporation, Maynard, Massachusetts.
 
                         All Rights Reserved
 
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
 provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
+both that copyright notice and this permission notice appear in
 supporting documentation, and that the name of Digital not be
 used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
+software without specific, written prior permission.
 
 DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
 ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL