[xorg-commit-diffs] xc/programs/Xserver/hw/xfree86/etc Imakefile, 1.1.4.2.6.1.4.1, 1.1.4.2.6.1.4.2 gtf.c, 1.1.10.1.4.1, 1.1.10.1.4.2 gtf.man, 1.1.10.1.4.1, 1.1.10.1.4.2

[Keith Packard]

Committed by: keithp


Index: Imakefile
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/etc/Imakefile,v
retrieving revision 1.1.4.2.6.1.4.1
retrieving revision 1.1.4.2.6.1.4.2
diff -u -d -r1.1.4.2.6.1.4.1 -r1.1.4.2.6.1.4.2
--- a/Imakefile	19 Mar 2004 17:09:00 -0000	1.1.4.2.6.1.4.1
+++ b/Imakefile	27 Mar 2004 16:56:43 -0000	1.1.4.2.6.1.4.2
@@ -179,7 +179,6 @@
 
 NormalProgramTarget(gtf,gtf.o,NullParameter,MathLibrary,NullParameter)
 InstallProgram(gtf,$(BINDIR))
-EXTRAMANDEFS = -D__XCONFIGFILE__=$(XCONFIGFILE) -D__XSERVERNAME__=$(XSERVERNAME)
 InstallManPage(gtf,$(MANDIR))
 
         SRCS = $(SRCS1) $(SRCS2) $(SRCS3) $(SRCS4) $(SRCS5) $(SRCS6) $(SRCS7) \

Index: gtf.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/etc/gtf.c,v
retrieving revision 1.1.10.1.4.1
retrieving revision 1.1.10.1.4.2
diff -u -d -r1.1.10.1.4.1 -r1.1.10.1.4.2
--- a/gtf.c	19 Mar 2004 17:09:00 -0000	1.1.10.1.4.1
+++ b/gtf.c	27 Mar 2004 16:56:43 -0000	1.1.10.1.4.2
@@ -146,7 +146,7 @@
 typedef struct __options
 {
     int x, y;
-    int xf86mode, fbmode;
+    int xorgmode, fbmode;
     float v_freq;
 } options;
 
@@ -675,8 +675,9 @@
                    (strcmp (argv[n], "--fbmode") == 0)) {
             o->fbmode = 1;
         } else if ((strcmp (argv[n], "-x") == 0) ||
+		   (strcmp (argv[n], "--xorgmode") == 0) ||
                    (strcmp (argv[n], "--xf86mode") == 0)) {
-            o->xf86mode = 1;
+            o->xorgmode = 1;
         } else {
             goto bad_option;
         }
@@ -684,10 +685,10 @@
         n++;
     }
 
-    /* if neither xf86mode nor fbmode were requested, default to
-       xf86mode */
+    /* if neither xorgmode nor fbmode were requested, default to
+       xorgmode */
 
-    if (!o->fbmode && !o->xf86mode) o->xf86mode = 1;
+    if (!o->fbmode && !o->xorgmode) o->xorgmode = 1;
     
     return (o);
     
@@ -695,7 +696,7 @@
 
     fprintf (stderr, "\n");
     fprintf (stderr, "usage: %s x y refresh [-v|--verbose] "
-             "[-f|--fbmode] [-x|-xf86mode]\n", argv[0]);
+             "[-f|--fbmode] [-x|--xorgmode]\n", argv[0]);
 
     fprintf (stderr, "\n");
     
@@ -709,7 +710,7 @@
              "(traces each step of the computation)\n");
     fprintf (stderr, "  -f|--fbmode : output an fbset(8)-style mode "
              "description\n");
-    fprintf (stderr, " -x|-xf86mode : output an "__XSERVERNAME__"-style mode "
+    fprintf (stderr, " -x|--xorgmode : output an "__XSERVERNAME__"-style mode "
              "description (this is the default\n"
              "                if no mode description is requested)\n");
     
@@ -733,7 +734,7 @@
     m = vert_refresh (o->x, o->y, o->v_freq, 0, 0);
     if (!m) exit (1);
 
-    if (o->xf86mode)
+    if (o->xorgmode)
         print_xf86_mode(m);
     
     if (o->fbmode)

Index: gtf.man
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/etc/gtf.man,v
retrieving revision 1.1.10.1.4.1
retrieving revision 1.1.10.1.4.2
diff -u -d -r1.1.10.1.4.1 -r1.1.10.1.4.2
--- a/gtf.man	19 Mar 2004 17:09:00 -0000	1.1.10.1.4.1
+++ b/gtf.man	27 Mar 2004 16:56:43 -0000	1.1.10.1.4.2
@@ -10,14 +10,14 @@
 .I refresh
 .RB [ \-v | \-\-verbose ]
 .RB [ \-f | \-\-fbmode ]
-.RB [ \-x | \-\-xf86mode ]
+.RB [ \-x | \-\-xorgmode ]
 .SH DESCRIPTION
 .I Gtf
 is a utility for calculating VESA GTF modes.  Given the desired
 horizontal and vertical resolutions and refresh rate (in Hz), the parameters
 for a matching VESA GTF mode are printed out.  Two output formats are
-supported: mode lines suitable for the __XSERVERNAME__
-.B __XCONFIGFILE__(__filemansuffix__)
+supported: mode lines suitable for the __xservername__
+.B __xconfigfile__(__filemansuffix__)
 file, and mode parameters suitable for the Linux
 .B fbset(8)
 utility.
@@ -29,14 +29,14 @@
 computation.
 .TP 8
 .BR \-x | \-\-xf86mode
-Print the mode parameters as __XSERVERNAME__-style mode lines.  This is the
+Print the mode parameters as __xservername__-style mode lines.  This is the
 default format.
 .TP 8
 .BR \-f | \-\-fbset
 Print the mode parameters in a format suitable for
 .BR fbset(8) .
 .SH "SEE ALSO"
-__XCONFIGFILE__(__filemansuffix__)
+__xconfigfile__(__filemansuffix__)
 .SH AUTHOR
 Andy Ritger.
 .PP