[xorg-commit-diffs] xc/programs/Xserver/hw/xfree86/getconfig
xorg.cfg, NONE, 1.1.10.1 Imakefile, 1.1.4.1, 1.1.4.2 cfg.man,
1.1.4.1, 1.1.4.2 cfg.sample, 1.1.4.1, 1.1.4.2 getconfig.man,
1.1.4.1, 1.1.4.2 getconfig.pl, 1.1.4.2, 1.1.4.3 getconfig.sh,
1.1.4.2, 1.1.4.3 xfree86.cfg, 1.1.4.1, NONE
Egbert Eich
xorg-commit at pdx.freedesktop.org
Thu Apr 15 03:16:54 PDT 2004
- Previous message: [xorg-commit-diffs] xc/programs/Xserver/hw/xfree86/fbdevhw
fbdevhw.c, 1.1.4.2, 1.1.4.3 fbdevhw.man, 1.1.4.1, 1.1.4.2
- Next message: [xorg-commit-diffs]
xc/programs/Xserver/hw/xfree86/etc/bindist/OpenBSD-aout-ix86
bin-excl, 1.1, 1.1.4.1 bin-list, 1.1, 1.1.4.1 prog-excl, 1.1,
1.1.4.1 prog-list, 1.1, 1.1.4.1 xserv-list, 1.1, 1.1.4.1
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Committed by: eich
Update of /cvs/xorg/xc/programs/Xserver/hw/xfree86/getconfig
In directory pdx:/home/eich/tstbuild/xc/programs/Xserver/hw/xfree86/getconfig
Modified Files:
Tag: XORG-CURRENT
Imakefile cfg.man cfg.sample getconfig.man getconfig.pl
getconfig.sh
Added Files:
Tag: XORG-CURRENT
xorg.cfg
Removed Files:
Tag: XORG-CURRENT
xfree86.cfg
Log Message:
2004-04-15 Egbert Eich <eich at freedesktop.org>
Merged changes from RELEASE-1 branch
--- NEW FILE: xorg.cfg ---
# $XdotOrg: xc/programs/Xserver/hw/xfree86/getconfig/xorg.cfg,v 1.1.10.1 2004/04/15 10:16:49 eich Exp $
# Base Xorg getconfig rules file.
#
# The line below is the getconfig rules file signature, and must be the
# first non-blank, non-comment line.
#
Xorg Project getconfig rules file. Version: 1.0
#
# Set the weight for the following rules. This should be set, otherwise
# the previously set weight will get used, and you have no idea of knowing
# what that might be.
#
$weight = 1000
#
# Rules. Rules consist of a condition (in perl code) followed by
# a driver name and optionally some additional strings. The start of a
# rule is indicated by a line with no leading white space. subsequent
# lines making up a rule must be indented. Logical lines may be split
# over multiple physical lines by using the usual continuation '\'.
#
# Rules that are not followed by a driver name may be used to do other
# things, like setting the weight as above.
#
#
# Pre-defined variables include:
#
# $vendor PCI vendor ID
# $device PCI device ID
# $revision PCI revision ID
# $subsys PCI subsystem ID
# $subsysVendor PCI subsystem vendor ID
# $class PCI class
# $XorgVersion Xorg version, as a 'v' string.
#
# The Xorg version information is also available as the following:
#
# $XorgVersionNumeric
# $XorgVersionMajor
# $XorgVersionMinor
# $XorgVersionPatch
# $XorgVersionSnap
#
Index: Imakefile
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/getconfig/Imakefile,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- a/Imakefile 5 Mar 2004 13:40:47 -0000 1.1.4.1
+++ b/Imakefile 15 Apr 2004 10:16:49 -0000 1.1.4.2
@@ -1,13 +1,14 @@
XCOMM $DHD: xc/programs/Xserver/hw/xfree86/getconfig/Imakefile,v 1.4 2003/10/03 21:32:46 dawes Exp $
XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/getconfig/Imakefile,v 1.2 2003/10/30 16:58:19 tsi Exp $
+#include <Server.tmpl>
/*
* Link these to the BuildModule directory. This is useful for in-tree
* testing.
*/
-AllTarget(xfree86.cfg)
- LinkBuildModule(xfree86.cfg,.)
+AllTarget(xorg.cfg)
+ LinkBuildModule(xorg.cfg,.)
AllTarget(getconfig)
LinkBuildModule(getconfig,.)
@@ -26,7 +27,7 @@
InstallNamedProg(getconfig.sh,getconfig,$(BINDIR))
InstallNamedProg(getconfig.pl,getconfig.pl,$(BINDIR))
-InstallNonExecFile(xfree86.cfg,$(LIBDIR)/getconfig)
+InstallNonExecFile(xorg.cfg,$(LIBDIR)/getconfig)
InstallNonExecFile(cfg.sample,$(LIBDIR)/getconfig)
InstallManPage(getconfig,$(MANDIR))
Index: cfg.man
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/getconfig/cfg.man,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- a/cfg.man 5 Mar 2004 13:40:47 -0000 1.1.4.1
+++ b/cfg.man 15 Apr 2004 10:16:49 -0000 1.1.4.2
@@ -1,4 +1,3 @@
-.\" $XFree86$
.TH getconfig __filemansuffix__ __vendorversion__
.SH NAME
getconfig - meta configuration files for getconfig(1)
@@ -7,10 +6,10 @@
.SH DESCRIPTION
.B getconfig
is a programatic interface that is used by the
-.B XFree86
+.B __xservername__
server to get configuration information about video hardware when
operating without an
-.B XF86Config
+.B __xconfigfile__
file.
.PP
This implementation of
@@ -29,7 +28,7 @@
.PP
.RS 4
.nf
-"XFree86 Project getconfig rules file.\ \ Version: "
+"Xorg getconfig rules file.\ \ Version: "
.fi
.RE
.PP
@@ -44,10 +43,10 @@
line of each rule is a perl expression. It may be any valid perl
expression whose evaluated (with 'eval') result may be used as the
argument to a perl 'if' statement. The second logical line should be
-the name of the XFree86 video driver to use when the rule is true, and
+the name of the __xservername__ video driver to use when the rule is true, and
subsequent logical lines of each rule, if present, are additional
configuration output for the video device's
-.B XF86Config
+.B __xconfigfile__
.B Device
section. The driver name and additional lines of configuration information
are written to standard output when the rule is chosen as the successful
@@ -70,12 +69,12 @@
.BR "$subsys " "PCI subsystem ID"
.BR "$subsysVendor " "PCI subsystem vendor ID"
.BR "$class " "PCI class"
-.BR "$XFree86Version " "XFree86 version, as a 'v' string"
-.BR "$XFree86VersionNumeric " "XFree86 numeric version"
-.BR "$XFree86VersionMajor " "XFree86 major version"
-.BR "$XFree86VersionMinor " "XFree86 minor version"
-.BR "$XFree86VersionPatch " "XFree86 patch version"
-.BR "$XFree86VersionSnap " "XFree86 snap version"
+.BR "$XorgVersion " "Xorg version, as a 'v' string"
+.BR "$XorgVersionNumeric " "Xorg numeric version"
+.BR "$XorgVersionMajor " "Xorg major version"
+.BR "$XorgVersionMinor " "Xorg minor version"
+.BR "$XorgVersionPatch " "Xorg patch version"
+.BR "$XorgVersionSnap " "Xorg snap version"
.BR "$weight " "current rule weight"
.fi
.RE
@@ -99,7 +98,7 @@
.I .cfg
files located in the search path. The search path typically specified
by the
-.B XFree86
+.B __xservername__
server is:
.PP
.RS 4
@@ -114,11 +113,11 @@
where
.I <modulepath>
is the
-.B XFree86
+.B __xservername__
server's module search path.
.PP
.TP 30
-.I __projectroot__/lib/X11/getconfig/xfree86.cfg
+.I __projectroot__/lib/X11/getconfig/xorg.cfg
Default rules file that gets installed. This file doesn't contain any
rules by default.
.TP 30
@@ -128,11 +127,11 @@
.SH "SEE ALSO"
getconfig(1),
-XFree86(1),
-XF86Config(__filemansuffix__).
+__xservername__(__appmansuffix__),
+__xconfigfile__(__filemansuffix__).
.SH AUTHORS
-The XFree86 automatic configuration support and the
+The __xservername__ automatic configuration support and the
.B getconfig
interface was written by David H. Dawes, with the support of X-Oz
-Technologies.
+Technologies for XFree86.
Index: cfg.sample
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/getconfig/cfg.sample,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- a/cfg.sample 5 Mar 2004 13:40:47 -0000 1.1.4.1
+++ b/cfg.sample 15 Apr 2004 10:16:49 -0000 1.1.4.2
@@ -1,14 +1,13 @@
# $DHD: xc/programs/Xserver/hw/xfree86/getconfig/cfg.sample,v 1.2 2003/09/23 05:12:07 dawes Exp $
-# $XFree86: xc/programs/Xserver/hw/xfree86/getconfig/cfg.sample,v 1.1 2003/10/08 14:58:29 dawes Exp $
-# Some sample XFree86 getconfig rules file.
+# Some sample Xorg getconfig rules file.
#
# The line below is the getconfig rules file signature, and must be the
# first non-blank, non-comment line.
#
-XFree86 Project getconfig rules file. Version: 1.0
+Xorg Project getconfig rules file. Version: 1.0
#
# Set the weight for the following rules. This should be set, otherwise
@@ -38,15 +37,15 @@
# $subsys PCI subsystem ID
# $subsysVendor PCI subsystem vendor ID
# $class PCI class
-# $XFree86Version XFree86 version, as a 'v' string.
+# $XorgVersion Xorg version, as a 'v' string.
#
-# The XFree86 version information is also available as the following:
+# The Xorg version information is also available as the following:
#
-# $XFree86VersionNumeric
-# $XFree86VersionMajor
-# $XFree86VersionMinor
-# $XFree86VersionPatch
-# $XFree86VersionSnap
+# $XorgVersionNumeric
+# $XorgVersionMajor
+# $XorgVersionMinor
+# $XorgVersionPatch
+# $XorgVersionSnap
#
# Define a fake vendor ID for some sample rules.
@@ -67,10 +66,10 @@
Option \
"yy"
-# Increase the weight of the following rules if the XFree86 version is 4.3 or
+# Increase the weight of the following rules if the Xorg version is 4.3 or
# higher.
-$weight++ if ($XFree86Version ge v4.3)
+$weight++ if ($XorgVersion ge v4.3)
$vendor == $novendor
nodriver
@@ -83,7 +82,7 @@
$weight = 100
-$vendor == $novendor && $XFree86Version eq v4.3.2.1
+$vendor == $novendor && $XorgVersion eq v4.3.2.1
nodriver3
$weight = 600
Index: getconfig.man
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/getconfig/getconfig.man,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- a/getconfig.man 5 Mar 2004 13:40:47 -0000 1.1.4.1
+++ b/getconfig.man 15 Apr 2004 10:16:49 -0000 1.1.4.2
@@ -1,7 +1,6 @@
-.\" $XFree86$
.TH getconfig 1 __vendorversion__
.SH NAME
-getconfig - get configuration information for the XFree86 server
+getconfig - get configuration information for the __xservername__ server
.SH SYNOPSIS
.B getconfig
.RI [ option
@@ -9,10 +8,10 @@
.SH DESCRIPTION
.B getconfig
is a programatic interface that is used by the
-.B XFree86
+.B __xservername__
server to get configuration information about video hardware when
operating without an
-.B XF86Config
+.B __xconfigfile__
file.
.PP
This implementation of
@@ -21,7 +20,7 @@
rules supplied internally and from meta-configuration files. The rules
are in the form of perl expressions.
.B getconfig
-writes to standard output the XF86Config-style configuration data
+writes to standard output the __xconfigfile__-style configuration data
specified by the last highest priority rule that evaluates to true.
Information about the format of the meta-configuration files can be
found in the getconfig(__filemansuffix__) manual page.
@@ -44,8 +43,9 @@
.B \-V
Print out the version information and exit.
.TP 8
-.BI \-X " XFree86-version"
-Specify the XFree86 version in numeric (integer) form.
+.BI \-X
+.BI __xservername__-version
+Specify the __xservername__ version in numeric (integer) form.
.TP 8
.BI \-b " subsys-id"
Specify the PCI subsystem ID of the video device.
@@ -68,7 +68,7 @@
.I .cfg
files located in the search path. The search path typically specified
by the
-.B XFree86
+.B __xservername__
server is:
.PP
.RS 4
@@ -83,16 +83,16 @@
where
.I <modulepath>
is the
-.B XFree86
+.B __xservername__
server's module search path.
.SH "SEE ALSO"
getconfig(__filemansuffix__),
-XFree86(1),
-XF86Config(__filemansuffix__).
+__xservername__(__appmansuffix__),
+__xconfigfile__(__filemansuffix__).
.SH AUTHORS
-The XFree86 automatic configuration support and the
+The __xservername__ automatic configuration support and the
.B getconfig
interface was written by David H. Dawes, with the support of X-Oz
-Technologies.
+Technologies for XFree86.
Index: getconfig.pl
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/getconfig/getconfig.pl,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -d -r1.1.4.2 -r1.1.4.3
--- a/getconfig.pl 8 Feb 2004 00:12:27 -0000 1.1.4.2
+++ b/getconfig.pl 15 Apr 2004 10:16:49 -0000 1.1.4.3
@@ -33,7 +33,6 @@
# Author: David Dawes <dawes at XFree86.Org>.
#
-# $XFree86: xc/programs/Xserver/hw/xfree86/getconfig/getconfig.pl,v 1.1 2003/10/08 14:58:29 dawes Exp $
#
# This script takes PCI id information, compares it against an ordered list
@@ -52,7 +51,7 @@
$myname = $0;
$myname =~ s/.*\///;
-$signature = "XFree86 Project getconfig rules file. Version: ";
+$signature = "Xorg Foundation getconfig rules file. Version: ";
while (@ARGV[0] =~ /^-[A-Za-z]$/) {
$f = shift;
@@ -70,9 +69,9 @@
exit 0;
}
if ($f eq "-X") {
- $XFree86VersionNumeric = shift;
- if (!defined($XFree86VersionNumeric)) {
- print STDERR "$myname: -X requires the XFree86 version.\n";
+ $XorgVersionNumeric = shift;
+ if (!defined($XorgVersionNumeric)) {
+ print STDERR "$myname: -X requires the Xorg version.\n";
exit 1;
}
}
@@ -129,21 +128,21 @@
printf STDERR "$myname: Version %vd.\n", $GetconfigVersion;
-if (defined($XFree86VersionNumeric)) {
- $XFree86VersionMajor = $XFree86VersionNumeric / 10000000;
- $XFree86VersionMinor = ($XFree86VersionNumeric % 10000000) / 100000;
- $XFree86VersionPatch = ($XFree86VersionNumeric % 100000) / 1000;
- $XFree86VersionSnapshot = $XFree86VersionNumeric % 1000;
- $XFree86Version = chr($XFree86VersionMajor) . chr($XFree86VersionMinor) .
- chr($XFree86VersionPatch) . chr($XFree86VersionSnapshot);
+if (defined($XorgVersionNumeric)) {
+ $XorgVersionMajor = $XorgVersionNumeric / 10000000;
+ $XorgVersionMinor = ($XorgVersionNumeric % 10000000) / 100000;
+ $XorgVersionPatch = ($XorgVersionNumeric % 100000) / 1000;
+ $XorgVersionSnapshot = $XorgVersionNumeric % 1000;
+ $XorgVersion = chr($XorgVersionMajor) . chr($XorgVersionMinor) .
+ chr($XorgVersionPatch) . chr($XorgVersionSnapshot);
}
if ($debug) {
- printf STDERR "$myname: XFree86 Version: %d, %d.%d.%d.%d, %vd.\n",
- $XFree86VersionNumeric, $XFree86VersionMajor, $XFree86VersionMinor,
- $XFree86VersionPatch, $XFree86VersionSnapshot, $XFree86Version;
+ printf STDERR "$myname: Xorg Version: %d, %d.%d.%d.%d, %vd.\n",
+ $XorgVersionNumeric, $XorgVersionMajor, $XorgVersionMinor,
+ $XorgVersionPatch, $XorgVersionSnapshot, $XorgVersion;
} else {
- printf STDERR "$myname: XFree86 Version: %vd.\n", $XFree86Version;
+ printf STDERR "$myname: Xorg Version: %vd.\n", $XorgVersion;
}
Index: getconfig.sh
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/getconfig/getconfig.sh,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -d -r1.1.4.2 -r1.1.4.3
--- a/getconfig.sh 8 Feb 2004 00:12:27 -0000 1.1.4.2
+++ b/getconfig.sh 15 Apr 2004 10:16:49 -0000 1.1.4.3
@@ -1,6 +1,6 @@
#!/bin/sh
-# $DHD: xc/programs/Xserver/hw/xfree86/getconfig/getconfig.sh,v 1.2 2003/09/20 01:45:57 dawes Exp $
+# $XdotOrg$
#
# Copyright 2003 by David H. Dawes.
@@ -33,8 +33,6 @@
# Author: David Dawes <dawes at XFree86.Org>.
#
-# $XFree86: xc/programs/Xserver/hw/xfree86/getconfig/getconfig.sh,v 1.1 2003/10/08 14:58:29 dawes Exp $
-
# A simple wrapper to execute the real getconfig program. So long as perl
# is in $PATH, we don't need to know where it is this way.
--- xfree86.cfg DELETED ---
- Previous message: [xorg-commit-diffs] xc/programs/Xserver/hw/xfree86/fbdevhw
fbdevhw.c, 1.1.4.2, 1.1.4.3 fbdevhw.man, 1.1.4.1, 1.1.4.2
- Next message: [xorg-commit-diffs]
xc/programs/Xserver/hw/xfree86/etc/bindist/OpenBSD-aout-ix86
bin-excl, 1.1, 1.1.4.1 bin-list, 1.1, 1.1.4.1 prog-excl, 1.1,
1.1.4.1 prog-list, 1.1, 1.1.4.1 xserv-list, 1.1, 1.1.4.1
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the xorg-commit-diffs
mailing list