[xorg-commit-diffs] xc/programs/Xserver/hw/xfree86/etc Imakefile, 1.1.4.2.6.1, 1.1.4.2.6.1.6.1 gtf.c, 1.1.10.1, 1.1.10.1.6.1 gtf.man, 1.1.10.1, 1.1.10.1.6.1

[Roland Mainz]

Committed by: gisburn

Update of /cvs/xorg/xc/programs/Xserver/hw/xfree86/etc
In directory pdx:/tmp/cvs-serv7662/xc/programs/Xserver/hw/xfree86/etc

Modified Files:
      Tag: XPRINT
	Imakefile gtf.c gtf.man 
Log Message:
Resync to 2004-04-10 XORG-RELEASE-1 branch

Index: Imakefile
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/etc/Imakefile,v
retrieving revision 1.1.4.2.6.1
retrieving revision 1.1.4.2.6.1.6.1
diff -u -d -r1.1.4.2.6.1 -r1.1.4.2.6.1.6.1
--- a/Imakefile	4 Mar 2004 17:48:00 -0000	1.1.4.2.6.1
+++ b/Imakefile	10 Apr 2004 09:05:01 -0000	1.1.4.2.6.1.6.1
@@ -174,6 +174,7 @@
 
        SRCS9 = gtf.c
 
+DEFINES = ConfigDefines
 AllTarget(ProgramTargetName(gtf))
 
 NormalProgramTarget(gtf,gtf.o,NullParameter,MathLibrary,NullParameter)

Index: gtf.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/etc/gtf.c,v
retrieving revision 1.1.10.1
retrieving revision 1.1.10.1.6.1
diff -u -d -r1.1.10.1 -r1.1.10.1.6.1
--- a/gtf.c	4 Mar 2004 17:48:00 -0000	1.1.10.1
+++ b/gtf.c	10 Apr 2004 09:05:01 -0000	1.1.10.1.6.1
@@ -1,3 +1,4 @@
+/* $XdotOrg$ */
 /* gtf.c  Generate mode timings using the GTF Timing Standard
  *
  * gcc gtf.c -o gtf -lm -Wall
@@ -63,7 +64,7 @@
  *
  * This program takes a desired resolution and vertical refresh rate,
  * and computes mode timings according to the GTF Timing Standard.
- * These mode timings can then be formatted as an XFree86 modeline
+ * These mode timings can then be formatted as an XServer modeline
  * or a mode description for use by fbset(8).
  *
  *
@@ -74,7 +75,7 @@
  * surrounding the addressable video); on most non-overscan type
  * systems, the margin period is zero.  I've implemented the margin
  * computations but not enabled it because 1) I don't really have
- * any experience with this, and 2) neither XFree86 modelines nor
+ * any experience with this, and 2) neither XServer modelines nor
  * fbset fb.modes provide an obvious way for margin timings to be
  * included in their mode descriptions (needs more investigation).
  * 
@@ -102,7 +103,7 @@
  * o Error checking.
  *
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/etc/gtf.c,v 1.2 2002/11/15 17:01:53 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/etc/gtf.c,v 1.2 2002/11/15 17:01:53tsi Exp $ */
 
 
 #include <stdio.h>
@@ -145,7 +146,7 @@
 typedef struct __options
 {
     int x, y;
-    int xf86mode, fbmode;
+    int xorgmode, fbmode;
     float v_freq;
 } options;
 
@@ -180,7 +181,7 @@
 
 
 
-/* print_xf86_mode() - print the XFree86 modeline, given mode timings. */
+/* print_xf86_mode() - print the XServer modeline, given mode timings. */
 
 void print_xf86_mode (mode *m)
 {
@@ -282,7 +283,7 @@
  * feel like testing it right now.
  *
  * XXX margin computations are implemented but not tested (nor used by
- * XFree86 of fbset mode descriptions, from what I can tell).
+ * XServer of fbset mode descriptions, from what I can tell).
  */
 
 mode *vert_refresh (int h_pixels, int v_lines, float freq,
@@ -674,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;
         }
@@ -683,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);
     
@@ -694,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");
     
@@ -708,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 XFree86-style mode "
+    fprintf (stderr, " -x|--xorgmode : output an "__XSERVERNAME__"-style mode "
              "description (this is the default\n"
              "                if no mode description is requested)\n");
     
@@ -732,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
retrieving revision 1.1.10.1.6.1
diff -u -d -r1.1.10.1 -r1.1.10.1.6.1
--- a/gtf.man	4 Mar 2004 17:48:00 -0000	1.1.10.1
+++ b/gtf.man	10 Apr 2004 09:05:01 -0000	1.1.10.1.6.1
@@ -1,4 +1,5 @@
-.\" $XFree86$ 
+.\" $XFree86$
+.\" $XdotOrg$ 
 .TH GTF 1 __vendorversion__
 .SH NAME
 gtf - calculate VESA GTF mode lines
@@ -9,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 XFree86
-.B XF86Config(__filemansuffix__)
+supported: mode lines suitable for the __xservername__
+.B __xconfigfile__(__filemansuffix__)
 file, and mode parameters suitable for the Linux
 .B fbset(8)
 utility.
@@ -27,15 +28,15 @@
 Enable verbose printouts  This shows a trace for each step of the
 computation.
 .TP 8
-.BR \-x | \-\-xf86mode
-Print the mode parameters as XFree86-style mode lines.  This is the
+.BR \-x | \-\-xorgmode
+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"
-XF86Config(__filemansuffix__)
+__xconfigfile__(__filemansuffix__)
 .SH AUTHOR
 Andy Ritger.
 .PP