Strip trailing whitespace

Performed with: find * -type f | xargs perl -i -p -e 's{[ \t]+$}{}'
git diff -w & git diff -b show no diffs from this change

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

6 files changed, 98 insertions, 98 deletions

diff --git a/Makefile.am b/Makefile.am
index 2152b78..5052217 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/configure.ac b/configure.ac
index 1eefc8d..d26c9f7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 
 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
@@ -10,7 +10,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
diff --git a/grid.c b/grid.c
index 4976221..e1f134d 100644
--- a/grid.c
+++ b/grid.c
@@ -2,7 +2,7 @@
  * $XdotOrg: grid.c,v 1.4 2001/02/09 02:05:41 xorgcvs Exp $
  * $Xorg: grid.c,v 1.4 2001/02/09 02:05:41 xorgcvs Exp $
  *
- * 
+ *
 Copyright 1989, 1998  The Open Group
 
 Permission to use, copy, modify, distribute, and sell this software and its
@@ -52,18 +52,18 @@ in this Software without prior written authorization from The Open Group.
 
 static GC get_gc(FontGridWidget fgw, Pixel fore);
 static void ClassInitialize(void);
-static void Initialize(Widget request, Widget new, ArgList args, 
+static void Initialize(Widget request, Widget new, ArgList args,
 		       Cardinal *num_args);
-static void Realize(Widget gw, Mask *valueMask, 
+static void Realize(Widget gw, Mask *valueMask,
 		    XSetWindowAttributes *attributes);
 static void Destroy(Widget gw);
 static void Resize(Widget gw);
 static void Redisplay(Widget gw, XEvent *event, Region region);
-static void paint_grid(FontGridWidget fgw, int col, int row, 
+static void paint_grid(FontGridWidget fgw, int col, int row,
 		       int ncols, int nrows);
-static Boolean SetValues(Widget current, Widget request, Widget new, 
+static Boolean SetValues(Widget current, Widget request, Widget new,
 			 ArgList args, Cardinal *num_args);
-static void Notify(Widget gw, XEvent *event, String *params, 
+static void Notify(Widget gw, XEvent *event, String *params,
 		   Cardinal *nparams);
 
 #define Offset(field) XtOffsetOf(FontGridRec, fontgrid.field)
@@ -107,7 +107,7 @@ static XtResource resources[] = {
 
 #undef Offset
 
-static char defaultTranslations[] = 
+static char defaultTranslations[] =
   "<ButtonPress>:  notify()";
 
 static XtActionsRec actions_list[] = {
@@ -262,7 +262,7 @@ GridLastChar (Widget w)
 }
 
 /*
- * CI_GET_CHAR_INFO_2D - return the charinfo struct for the indicated row and 
+ * CI_GET_CHAR_INFO_2D - return the charinfo struct for the indicated row and
  * column.  This is used for fonts that have more than row zero.
  */
 #define CI_GET_CHAR_INFO_2D(fs,row,col,cs) \
@@ -298,7 +298,7 @@ GridHasChar (Widget w, long ch)
     {
 	XFontStruct	*fs = fgw->fontgrid.text_font;
 	XCharStruct	*cs;
-	
+
 	if (!fs)
 	    return False;
 	if (fs->max_byte1 == 0)
@@ -319,8 +319,8 @@ GridHasChar (Widget w, long ch)
  * public routines
  */
 
-void 
-GetFontGridCellDimensions(Widget w, long *startp, 
+void
+GetFontGridCellDimensions(Widget w, long *startp,
 			  int *ncolsp, int *nrowsp)
 {
     FontGridWidget fgw = (FontGridWidget) w;
@@ -330,7 +330,7 @@ GetFontGridCellDimensions(Widget w, long *startp,
 }
 
 
-void 
+void
 GetPrevNextStates(Widget w, Bool *prevvalidp, Bool *nextvalidp,
 		  Bool *prev16validp, Bool *next16validp)
 {
@@ -355,7 +355,7 @@ GetPrevNextStates(Widget w, Bool *prevvalidp, Bool *nextvalidp,
  */
 
 
-static GC 
+static GC
 get_gc(FontGridWidget fgw, Pixel fore)
 {
     XtGCMask mask;
@@ -374,7 +374,7 @@ get_gc(FontGridWidget fgw, Pixel fore)
     mask |= GCCapStyle;
     if (fgw->fontgrid.grid_width > 0) {
 	mask |= GCLineWidth;
-	gcv.line_width = ((fgw->fontgrid.grid_width < 2) ? 0 : 
+	gcv.line_width = ((fgw->fontgrid.grid_width < 2) ? 0 :
 			  fgw->fontgrid.grid_width);
     }
     return (XtGetGC ((Widget) fgw, mask, &gcv));
@@ -416,7 +416,7 @@ XmuFreeXftColor (XtAppContext app, XrmValuePtr toVal, XtPointer closure,
     Screen	*screen;
     Colormap	colormap;
     XftColor	*color;
-    
+
     if (*num_args != 2)
     {
 	XtAppErrorMsg (app,
@@ -435,7 +435,7 @@ XmuFreeXftColor (XtAppContext app, XrmValuePtr toVal, XtPointer closure,
 				 XScreenNumberOfScreen (screen)),
 		  colormap, color);
 }
-    
+
 static Boolean
 XmuCvtStringToXftColor(Display *dpy,
 		       XrmValue *args, Cardinal *num_args,
@@ -447,7 +447,7 @@ XmuCvtStringToXftColor(Display *dpy,
     XftColor	    xftColor;
     Screen	    *screen;
     Colormap	    colormap;
-    
+
     if (*num_args != 2)
     {
 	XtAppErrorMsg (XtDisplayToApplicationContext (dpy),
@@ -478,14 +478,14 @@ XmuCvtStringToXftColor(Display *dpy,
     }
     else if (!XRenderParseColor (dpy, spec, &renderColor))
 	return False;
-    if (!XftColorAllocValue (dpy, 
+    if (!XftColorAllocValue (dpy,
 			     DefaultVisual (dpy,
 					    XScreenNumberOfScreen (screen)),
 			     colormap,
 			     &renderColor,
 			     &xftColor))
 	return False;
-    
+
     donestr (XftColor, xftColor, XtRXftColor);
 }
 
@@ -495,7 +495,7 @@ XmuFreeXftFont (XtAppContext app, XrmValuePtr toVal, XtPointer closure,
 {
     Screen  *screen;
     XftFont *font;
-    
+
     if (*num_args != 1)
     {
 	XtAppErrorMsg (app,
@@ -521,7 +521,7 @@ XmuCvtStringToXftFont(Display *dpy,
     char    *name;
     XftFont *font;
     Screen  *screen;
-    
+
     if (*num_args != 1)
     {
 	XtAppErrorMsg (XtDisplayToApplicationContext (dpy),
@@ -557,13 +557,13 @@ static XtConvertArgRec xftFontConvertArgs[] = {
 
 #endif
 
-static void 
+static void
 ClassInitialize(void)
 {
     XtAddConverter (XtRString, XtRLong, XmuCvtStringToLong, NULL, 0);
 #ifdef XRENDER
-    XtSetTypeConverter (XtRString, XtRXftColor, 
-			XmuCvtStringToXftColor, 
+    XtSetTypeConverter (XtRString, XtRXftColor,
+			XmuCvtStringToXftColor,
 			xftColorConvertArgs, XtNumber(xftColorConvertArgs),
 			XtCacheByDisplay, XmuFreeXftColor);
     XtSetTypeConverter (XtRString, XtRXftFont,
@@ -574,7 +574,7 @@ ClassInitialize(void)
 }
 
 
-static void 
+static void
 Initialize(Widget request, Widget new, ArgList args, Cardinal *num_args)
 {
     FontGridWidget reqfg = (FontGridWidget) request;
@@ -595,7 +595,7 @@ Initialize(Widget request, Widget new, ArgList args, Cardinal *num_args)
 	else
 #endif
 	if (fs && fs->max_byte1 == 0) {
-	    newfg->fontgrid.cell_rows = (fs->max_char_or_byte2 / 
+	    newfg->fontgrid.cell_rows = (fs->max_char_or_byte2 /
 					 newfg->fontgrid.cell_cols) + 1;
 	    if (newfg->fontgrid.cell_rows > 16)
 	      newfg->fontgrid.cell_rows = 16;
@@ -615,8 +615,8 @@ Initialize(Widget request, Widget new, ArgList args, Cardinal *num_args)
 			   newfg->fontgrid.grid_width *
 			   (newfg->fontgrid.cell_cols + 1));
 
-    if (newfg->core.height == 0) 
-      newfg->core.height = (newfg->fontgrid.cell_height * 
+    if (newfg->core.height == 0)
+      newfg->core.height = (newfg->fontgrid.cell_height *
 			    newfg->fontgrid.cell_rows +
 			    newfg->fontgrid.grid_width *
 			    (newfg->fontgrid.cell_rows + 1));
@@ -628,13 +628,13 @@ Initialize(Widget request, Widget new, ArgList args, Cardinal *num_args)
     if (newfg->fontgrid.start_char == 0xffffffff)
 	newfg->fontgrid.start_char = GridFirstChar(new) & ~0xff;
     maxn = GridLastChar (new);
-    if (newfg->fontgrid.start_char > maxn) 
-	newfg->fontgrid.start_char = (maxn + 1 - 
-				      (newfg->fontgrid.cell_cols * 
+    if (newfg->fontgrid.start_char > maxn)
+	newfg->fontgrid.start_char = (maxn + 1 -
+				      (newfg->fontgrid.cell_cols *
 				       newfg->fontgrid.cell_rows));
 }
 
-static void 
+static void
 Realize(Widget gw, Mask *valueMask, XSetWindowAttributes *attributes)
 {
     FontGridWidget fgw = (FontGridWidget) gw;
@@ -656,7 +656,7 @@ Realize(Widget gw, Mask *valueMask, XSetWindowAttributes *attributes)
 
 
 
-static void 
+static void
 Destroy(Widget gw)
 {
     FontGridWidget fgw = (FontGridWidget) gw;
@@ -666,7 +666,7 @@ Destroy(Widget gw)
 }
 
 
-static void 
+static void
 Resize(Widget gw)
 {
     FontGridWidget fgw = (FontGridWidget) gw;
@@ -687,7 +687,7 @@ Resize(Widget gw)
 
 
 /* ARGSUSED */
-static void 
+static void
 Redisplay(Widget gw, XEvent *event, Region region)
 {
     FontGridWidget fgw = (FontGridWidget) gw;
@@ -718,10 +718,10 @@ Redisplay(Widget gw, XEvent *event, Region region)
 }
 
 
-static void 
-paint_grid(FontGridWidget fgw, 		/* widget in which to draw */ 
-	   int col, int row, 		/* where to start */          
-	   int ncols, int nrows)	/* number of cells */         
+static void
+paint_grid(FontGridWidget fgw, 		/* widget in which to draw */
+	   int col, int row, 		/* where to start */
+	   int ncols, int nrows)	/* number of cells */
 {
     FontGridPart *p = &fgw->fontgrid;
     int i, j;
@@ -747,7 +747,7 @@ paint_grid(FontGridWidget fgw, 		/* widget in which to draw */
     }
 
     /*
-     * paint the grid lines for the indicated rows 
+     * paint the grid lines for the indicated rows
      */
     if (p->grid_width > 0) {
 	int half_grid_width = p->grid_width >> 1;
@@ -764,7 +764,7 @@ paint_grid(FontGridWidget fgw, 		/* widget in which to draw */
     }
     /*
      * Draw a character in every box; treat all fonts as if they were 16bit
-     * fonts.  Store the high eight bits in byte1 and the low eight bits in 
+     * fonts.  Store the high eight bits in byte1 and the low eight bits in
      * byte2.
      */
     prevn = p->start_char + col + row * tcols;
@@ -791,12 +791,12 @@ paint_grid(FontGridWidget fgw, 		/* widget in which to draw */
 		}
 		if (extents.width && extents.height)
 		{
-		    XClearArea (dpy, wind, x + xoff - extents.x, 
+		    XClearArea (dpy, wind, x + xoff - extents.x,
 				y + yoff - extents.y,
 				extents.width, extents.height, False);
 		    if (p->box_chars)
 			XDrawRectangle (dpy, wind, p->box_gc,
-					x + xoff - extents.x, 
+					x + xoff - extents.x,
 					y + yoff - extents.y,
 					extents.width - 1,
 					extents.height - 1);
@@ -821,21 +821,21 @@ paint_grid(FontGridWidget fgw, 		/* widget in which to draw */
 		if (p->center_chars) {
 		    /*
 		     * We want to move the origin by enough to center the ink
-		     * within the cell.  The left edge will then be at 
+		     * within the cell.  The left edge will then be at
 		     * (cell_width - (rbearing - lbearing)) / 2; so we subtract
 		     * the lbearing to find the origin.  Ditto for vertical.
 		     */
 		    xoff = (((p->cell_width -
 			      (metrics.rbearing - metrics.lbearing)) / 2) -
 			    p->internal_pad - metrics.lbearing);
-		    yoff = (((p->cell_height - 
+		    yoff = (((p->cell_height -
 			      (metrics.descent + metrics.ascent)) / 2) -
 			    p->internal_pad -
 			    p->text_font->ascent + metrics.ascent);
 		}
 		if (p->box_chars) {
 		    XDrawRectangle (dpy, wind, p->box_gc,
-				    x + xoff, y + yoff - p->text_font->ascent, 
+				    x + xoff, y + yoff - p->text_font->ascent,
 				    metrics.width - 1,
 				    fontascent + fontdescent - 1);
 		}
@@ -850,7 +850,7 @@ paint_grid(FontGridWidget fgw, 		/* widget in which to draw */
 
   done:
     /*
-     * paint the grid lines for the indicated rows 
+     * paint the grid lines for the indicated rows
      */
     if (p->grid_width > 0) {
 	int half_grid_width = p->grid_width >> 1;
@@ -866,7 +866,7 @@ paint_grid(FontGridWidget fgw, 		/* widget in which to draw */
 	}
     }
 
-	
+
     return;
 }
 
@@ -883,8 +883,8 @@ PageBlank (Widget w, long first, long last)
 }
 
 /*ARGSUSED*/
-static Boolean 
-SetValues(Widget current, Widget request, Widget new, 
+static Boolean
+SetValues(Widget current, Widget request, Widget new,
 	  ArgList args, Cardinal *num_args)
 {
     FontGridWidget curfg = (FontGridWidget) current;
@@ -925,9 +925,9 @@ SetValues(Widget current, Widget request, Widget new,
 
 	if (start < 0)
 	    start = 0;
-	if (start > maxn) 
+	if (start > maxn)
 	  start = (maxn / page) * page;
-	
+
 	while (PageBlank (new, start, start + page - 1))
 	{
 	    long    next = start + dir;
@@ -946,7 +946,7 @@ SetValues(Widget current, Widget request, Widget new,
 
 
 /* ARGSUSED */
-static void 
+static void
 Notify(Widget gw, XEvent *event, String *params, Cardinal *nparams)
 {
     FontGridWidget fgw = (FontGridWidget) gw;
@@ -989,7 +989,7 @@ Notify(Widget gw, XEvent *event, String *params, Cardinal *nparams)
 	    return;
 	}
 
-	n= (fgw->fontgrid.start_char + 
+	n= (fgw->fontgrid.start_char +
 	    ((y / ch) * fgw->fontgrid.cell_cols) + (x / cw));
 
 	rec.thefont = fgw->fontgrid.text_font;
diff --git a/grid.h b/grid.h
index 2000d0f..c38bb56 100644
--- a/grid.h
+++ b/grid.h
@@ -101,5 +101,5 @@ GridFirstChar (Widget w);
 long
 GridLastChar (Widget w);
 
-    
+
 #endif /* _FontGrid_h_ */
diff --git a/gridP.h b/gridP.h
index 9e23145..affcb2d 100644
--- a/gridP.h
+++ b/gridP.h
@@ -89,16 +89,16 @@ typedef struct _FontGridRec {
 			     (g)->fontgrid.text_font ? \
 			     (g)->fontgrid.text_font->max_bounds.width : 1)
 #define GridForeground(g)   ((g)->fontgrid.fg_color.pixel)
-			     
+
 #else /* XRENDER */
-			     
+
 #define GridFontHeight(g)   ((g)->fontgrid.text_font->ascent + \
 			     (g)->fontgrid.text_font->descent)
 #define GridFontAscent(g)   ((g)->fontgrid.text_font ? \
 			     (g)->fontgrid.text_font->ascent: 1)
 #define GridFontWidth(g)    ((g)->fontgrid.text_font->max_bounds.width)
 #define GridForeground(g)   ((g)->fontgrid.foreground_pixel)
-			     
+
 #endif /* else XRENDER */
 
 #define DefaultCellWidth(fgw) (GridFontWidth(fgw) \
diff --git a/xfd.c b/xfd.c
index c49ba31..a866398 100644
--- a/xfd.c
+++ b/xfd.c
@@ -1,7 +1,7 @@
 /*
  * $Xorg: xfd.c,v 1.4 2001/02/09 02:05:42 xorgcvs Exp $
  *
- * 
+ *
 Copyright 1989, 1998  The Open Group
 
 Permission to use, copy, modify, distribute, and sell this software and its
@@ -73,21 +73,21 @@ static XrmOptionDescRec xfd_options[] = {
 
 static void usage(void);
 static void SelectChar(Widget w, XtPointer closure, XtPointer data);
-static void do_quit(Widget w, XEvent *event, String *params, 
+static void do_quit(Widget w, XEvent *event, String *params,
 		    Cardinal *num_params);
 static void change_page(int page);
 static void set_button_state(void);
-static void do_prev(Widget w, XEvent *event, String *params, 
+static void do_prev(Widget w, XEvent *event, String *params,
 		    Cardinal *num_params);
-static void do_next(Widget w, XEvent *event, String *params, 
+static void do_next(Widget w, XEvent *event, String *params,
 		    Cardinal *num_params);
-static void do_prev16(Widget w, XEvent *event, String *params, 
+static void do_prev16(Widget w, XEvent *event, String *params,
 		      Cardinal *num_params);
-static void do_next16(Widget w, XEvent *event, String *params, 
+static void do_next16(Widget w, XEvent *event, String *params,
 		      Cardinal *num_params);
 static char *get_font_name(Display *dpy, XFontStruct *fs);
-static void CatchFontConversionWarning(String name, String type, String class, 
-				       String defaultp, String *params, 
+static void CatchFontConversionWarning(String name, String type, String class,
+				       String defaultp, String *params,
 				       Cardinal *np);
 
 static XtActionsRec xfd_actions[] = {
@@ -120,15 +120,15 @@ static struct _xfd_resources {
 #define Offset(field) XtOffsetOf(struct _xfd_resources, field)
 
 static XtResource Resources[] = {
-  { "selectFormat", "SelectFormat", XtRString, sizeof(char *), 
+  { "selectFormat", "SelectFormat", XtRString, sizeof(char *),
       Offset(select_format), XtRString, DEF_SELECT_FORMAT },
-  { "metricsFormat", "MetricsFormat", XtRString, sizeof(char *), 
+  { "metricsFormat", "MetricsFormat", XtRString, sizeof(char *),
       Offset(metrics_format), XtRString, DEF_METRICS_FORMAT },
-  { "rangeFormat", "RangeFormat", XtRString, sizeof(char *), 
+  { "rangeFormat", "RangeFormat", XtRString, sizeof(char *),
       Offset(range_format), XtRString, DEF_RANGE_FORMAT },
-  { "startFormat", "StartFormat", XtRString, sizeof(char *), 
+  { "startFormat", "StartFormat", XtRString, sizeof(char *),
       Offset(start_format), XtRString, DEF_START_FORMAT },
-  { "nocharFormat", "NocharFormat", XtRString, sizeof(char *), 
+  { "nocharFormat", "NocharFormat", XtRString, sizeof(char *),
       Offset(nochar_format), XtRString, DEF_NOCHAR_FORMAT },
 };
 
@@ -172,7 +172,7 @@ static Boolean fontConversionFailed = False;
 static XtErrorMsgHandler oldWarningHandler;
 
 int
-main(int argc, char *argv[]) 
+main(int argc, char *argv[])
 {
     XtAppContext xtcontext;
     Widget toplevel, pane, toplabel, box, form;
@@ -226,7 +226,7 @@ main(int argc, char *argv[])
 				  NULL, ZERO);
 
     /* font name */
-    toplabel = XtCreateManagedWidget ("fontname", labelWidgetClass, pane, 
+    toplabel = XtCreateManagedWidget ("fontname", labelWidgetClass, pane,
 				      NULL, ZERO);
 
     /* button box */
@@ -250,15 +250,15 @@ main(int argc, char *argv[])
     metricsLabel = XtCreateManagedWidget ("metrics", labelWidgetClass,
 					  pane, NULL, ZERO);
 
-    rangeLabel = XtCreateManagedWidget ("range", labelWidgetClass, pane, 
+    rangeLabel = XtCreateManagedWidget ("range", labelWidgetClass, pane,
 					NULL, ZERO);
 
-    startLabel = XtCreateManagedWidget ("start", labelWidgetClass, pane, 
+    startLabel = XtCreateManagedWidget ("start", labelWidgetClass, pane,
 					NULL, ZERO);
 
     /* form in which to draw */
     form = XtCreateManagedWidget ("form", formWidgetClass, pane, NULL, ZERO);
-    
+
     i = 0;
     XtSetArg (av[i], XtNtop, XtChainTop); i++;
     XtSetArg (av[i], XtNbottom, XtChainBottom); i++;
@@ -266,7 +266,7 @@ main(int argc, char *argv[])
     XtSetArg (av[i], XtNright, XtChainRight); i++;
     XtSetArg (av[i], XtNcallback, cb); i++;
 
-    oldWarningHandler = XtAppSetWarningMsgHandler(xtcontext, 
+    oldWarningHandler = XtAppSetWarningMsgHandler(xtcontext,
 						  CatchFontConversionWarning);
 
     fontGrid = XtCreateManagedWidget ("grid", fontgridWidgetClass, form,
@@ -318,12 +318,12 @@ main(int argc, char *argv[])
 
     minn = GridFirstChar (fontGrid);
     maxn = GridLastChar (fontGrid);
-    sprintf (buf, xfd_resources.range_format, 
+    sprintf (buf, xfd_resources.range_format,
 	     minn >> 8, minn & 0xff,
 	     minn >> 8, minn & 0xff,
 	     maxn >> 8, maxn & 0xff,
 	     maxn >> 8, maxn & 0xff);
-    
+
     i = 0;
     XtSetArg (av[i], XtNlabel, buf); i++;
     XtSetValues (rangeLabel, av, i);
@@ -341,7 +341,7 @@ main(int argc, char *argv[])
 }
 
 /*ARGSUSED*/
-static void 
+static void
 SelectChar(Widget w, XtPointer closure, XtPointer data)
 {
     FontGridCharRec *p = (FontGridCharRec *) data;
@@ -367,7 +367,7 @@ SelectChar(Widget w, XtPointer closure, XtPointer data)
 	    XGlyphInfo	extents;
 	    XftTextExtents32 (XtDisplay (w), xft, &c, 1, &extents);
 	    sprintf (buf, xfd_resources.metrics_format,
-		     extents.xOff, - extents.x, 
+		     extents.xOff, - extents.x,
 		     extents.xOff - extents.width + extents.x,
 		     extents.y, extents.height - extents.y,
 		     xft->ascent, xft->descent);
@@ -380,7 +380,7 @@ SelectChar(Widget w, XtPointer closure, XtPointer data)
 	    (n < fs->min_char_or_byte2 || n > fs->max_char_or_byte2) :
 	    (n >> 8 < fs->min_byte1 || n >> 8 > fs->max_byte1 ||
 	     (n & 0xff)  < fs->min_char_or_byte2 ||
-	     (n & 0xff) > fs->max_char_or_byte2)) 
+	     (n & 0xff) > fs->max_char_or_byte2))
 	{
 	    has_char = 0;
 	}
@@ -400,7 +400,7 @@ SelectChar(Widget w, XtPointer closure, XtPointer data)
 
     if (has_char)
     {
-	sprintf (buf, xfd_resources.select_format, 
+	sprintf (buf, xfd_resources.select_format,
 		 n >> 8, n & 0xff,
 		 n >> 8, n & 0xff,
 		 n >> 8, n & 0xff);
@@ -419,13 +419,13 @@ SelectChar(Widget w, XtPointer closure, XtPointer data)
 
 
 /*ARGSUSED*/
-static void 
+static void
 do_quit (Widget w, XEvent *event, String *params, Cardinal *num_params)
 {
     exit (0);
 }
 
-static void 
+static void
 change_page(int page)
 {
     long oldstart, newstart;
@@ -437,7 +437,7 @@ change_page(int page)
     GetFontGridCellDimensions (fontGrid, &oldstart, &ncols, &nrows);
 
     if (page) {
-	long start = (oldstart + 
+	long start = (oldstart +
 			   ((long) ncols) * ((long) nrows) * ((long) page));
 
 	arg.value = (XtArgVal) start;
@@ -464,7 +464,7 @@ change_page(int page)
 }
 
 
-static void 
+static void
 set_button_state(void)
 {
     Bool prevvalid, nextvalid, prev16valid, next16valid;
@@ -485,14 +485,14 @@ set_button_state(void)
 
 
 /* ARGSUSED */
-static void 
+static void
 do_prev16(Widget w, XEvent *event, String *params, Cardinal *num_params)
 {
     change_page (-16);
 }
 
 
-static void 
+static void
 do_prev(Widget w, XEvent *event, String *params, Cardinal *num_params)
 {
     change_page (-1);
@@ -500,14 +500,14 @@ do_prev(Widget w, XEvent *event, String *params, Cardinal *num_params)
 
 
 /* ARGSUSED */
-static void 
+static void
 do_next(Widget w, XEvent *event, String *params, Cardinal *num_params)
 {
     change_page (1);
 }
 
 /* ARGSUSED */
-static void 
+static void
 do_next16(Widget w, XEvent *event, String *params, Cardinal *num_params)
 {
     change_page (16);
@@ -530,8 +530,8 @@ get_font_name(Display *dpy, XFontStruct *fs)
 }
 
 
-static void 
-CatchFontConversionWarning(String name, String type, String class, 
+static void
+CatchFontConversionWarning(String name, String type, String class,
 			   String defaultp, String *params, Cardinal *np)
 {
     if (np && *np > 1 &&