merge latest (4.3.99.16) from XFree86 (vendor) branchXORG-RELEASE-1-BASEXEVIE-MERGEXEVIE-BASEXINERAMA_2XEVIE

1 files changed, 14 insertions, 10 deletions

diff --git a/xlsfonts.c b/xlsfonts.c
index 52aced8..fa22341 100644
--- a/xlsfonts.c
+++ b/xlsfonts.c
@@ -24,7 +24,7 @@ Except as contained in this notice, the name of The Open Group shall not be
 used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
  * */
-/* $XFree86: xc/programs/xlsfonts/xlsfonts.c,v 1.8 2001/12/14 20:02:10 dawes Exp $ */
+/* $XFree86: xc/programs/xlsfonts/xlsfonts.c,v 1.10 2003/09/13 21:33:11 dawes Exp $ */
 
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
@@ -57,13 +57,10 @@ typedef struct {
 FontList	*font_list;
 
 
-#if NeedFunctionPrototypes
-extern void usage(void);
-extern int main(int, char **);
-extern void get_list(char *);
-extern void show_fonts(void);
-extern void copy_number(char **, char **, int, int);
-extern void do_query_font(Display *, char *);
+static void get_list(char *);
+static void show_fonts(void);
+static void copy_number(char **, char **, int, int);
+static void do_query_font(Display *, char *);
 static int compare(const void *, const void *);
 #ifndef max
 static int max(int, int);
@@ -72,7 +69,6 @@ static int IgnoreError(Display *, XErrorEvent *);
 static void PrintProperty(XFontProp *);
 static void ComputeFontType(XFontStruct *);
 static void print_character_metrics(register XFontStruct *);
-#endif
 
 
 void
@@ -477,6 +473,9 @@ static char* stringValued [] = { /* values are atoms */
     "RASTERIZER_NAME",
     "RASTERIZER_VERSION",
 
+    /* other registered font properties (see the X.org Registry, sec. 15) */
+    "_ADOBE_POSTSCRIPT_FONTNAME",
+
     /* unregistered font properties */
     "CHARSET_COLLECTIONS",
     "CLASSIFICATION",
@@ -504,7 +503,12 @@ static void PrintProperty (prop)
 	(void)sprintf (atom, "No such atom = %ld", prop->name);
     }
     printf ("      %s", atom);
-    for (i = strlen(atom); i < 22; i++) printf (" ");
+
+    /* Pad out to a column width of 22, but ensure there is always at
+       least one space between property name & value. */
+    for (i = strlen(atom); i < 21; i++) putchar (' ');
+    putchar(' ');
+
     for (i = 0; ; i++) {
 	if (stringValued[i] == NULL) {
 	    printf ("%ld\n", prop->card32);