[xorg-commit-diffs] xc/programs/Xserver/hw/xfree86/xf86cfg XOrgCfg.cpp, NONE, 1.1.10.1 xorgcfg.man, NONE, 1.1.10.1 Imakefile, 1.1.4.3, 1.1.4.4 TODO, 1.1.4.1, 1.1.4.2 expert.c, 1.1.4.2, 1.1.4.3 interface.c, 1.1.4.1, 1.1.4.2 keyboard-cfg.c, 1.1.4.1, 1.1.4.2 loader.c, 1.1.4.2, 1.1.4.3 startx.c, 1.1.4.1, 1.1.4.2 text-mode.c, 1.1.4.2, 1.1.4.3 xf86config.c, 1.1.4.2, 1.1.4.3 XF86Cfg.ad, 1.1.4.1, NONE xf86cfg.man, 1.1.4.2, NONE

Egbert Eich xorg-commit at pdx.freedesktop.org
Thu Apr 15 03:17:20 PDT 2004 

Committed by: eich

Update of /cvs/xorg/xc/programs/Xserver/hw/xfree86/xf86cfg
In directory pdx:/home/eich/tstbuild/xc/programs/Xserver/hw/xfree86/xf86cfg

Modified Files:
      Tag: XORG-CURRENT
	Imakefile TODO expert.c interface.c keyboard-cfg.c loader.c 
	startx.c text-mode.c xf86config.c 
Added Files:
      Tag: XORG-CURRENT
	XOrgCfg.cpp xorgcfg.man 
Removed Files:
      Tag: XORG-CURRENT
	XF86Cfg.ad xf86cfg.man 
Log Message:
2004-04-15  Egbert Eich  <eich at freedesktop.org>
        Merged changes from RELEASE-1 branch
	


--- NEW FILE: XOrgCfg.cpp ---
!!
!! Copyright (c) 2000 by Conectiva S.A. (http://www.conectiva.com)
!! 
!! Permission is hereby granted, free of charge, to any person obtaining a
!! copy of this software and associated documentation files (the "Software"),
!! to deal in the Software without restriction, including without limitation
!! the rights to use, copy, modify, merge, publish, distribute, sublicense,
!! and/or sell copies of the Software, and to permit persons to whom the
!! Software is furnished to do so, subject to the following conditions:
!! 
!! The above copyright notice and this permission notice shall be included in
!! all copies or substantial portions of the Software.
!!  
!! THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
!! IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
!! FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
!! CONECTIVA LINUX BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
!! WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
!! OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
[...1812 lines suppressed...]
*expert*tree*dri.modeL.label:			Mode
*expert*tree*dri.modeL.fromVert:		group
*expert*tree*dri.mode.fromVert:			group
*expert*tree*dri.mode.fromHoriz:		modeL

*expert*tree*buffers.Label.width:		50
*expert*tree*buffers.Text.width:		100
*expert*tree*buffers.countL.label:		Count
*expert*tree*buffers.countL.fromVert:		remove
*expert*tree*buffers.count.fromVert:		remove
*expert*tree*buffers.count.fromHoriz:		countL
*expert*tree*buffers.sizeL.label:		Size
*expert*tree*buffers.sizeL.fromVert:		count
*expert*tree*buffers.size.fromVert:		count
*expert*tree*buffers.size.fromHoriz:		sizeL
*expert*tree*buffers.flagsL.label:		Flags
*expert*tree*buffers.flagsL.fromVert:		size
*expert*tree*buffers.flags.fromVert:		size
*expert*tree*buffers.flags.fromHoriz:		flagsL
*Expert*close.label:				Close

--- NEW FILE: xorgcfg.man ---
.\"
.\" Copyright (c) 2000 by Conectiva S.A. (http://www.conectiva.com)
.\"
.\" Permission is hereby granted, free of charge, to any person obtaining a
.\" copy of this software and associated documentation files (the "Software"),
.\" to deal in the Software without restriction, including without limitation
.\" the rights to use, copy, modify, merge, publish, distribute, sublicense,
.\" and/or sell copies of the Software, and to permit persons to whom the
.\" Software is furnished to do so, subject to the following conditions:
.\"
.\" The above copyright notice and this permission notice shall be included in
.\" all copies or substantial portions of the Software.
.\"
.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
.\" IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
.\" FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
.\" CONECTIVA LINUX BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
.\" WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
.\" OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
.\" SOFTWARE.
.\"
.\" Except as contained in this notice, the name of Conectiva Linux shall
.\" not be used in advertising or otherwise to promote the sale, use or other
.\" dealings in this Software without prior written authorization from
.\" Conectiva Linux.
.\"
.\" Author: Paulo César Pereira de Andrade <pcpa at conectiva.com.br>
.\"
.\" $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/xf86cfg.man,v 1.9 2002/12/30 14:34:02 herrb Exp $
.\"
.TH xorgcfg __appmansuffix__ __vendorversion__
.SH NAME
xorgcfg - Graphical configuration tool for __xservername__
.SH SYNOPSIS
.B xorgcfg
[-config\fI __xconfigfile__\fP] [-modulepath \fImoduledir\fP] 
[-fontpath \fIfontsdir\fP] [-toolkitoption ...]
.SH DESCRIPTION
.I Xorgcfg
is a tool to configure\fI __xservername__\fP, and can be used to either write the
initial configuration file or make customizations to the current configuration.
.PP
When the \fBDISPLAY\fP environment variable is not set, xorgcfg will run
the command\fI __xservername__ -configure\fP to allow the xserver detect the
hardware in the computer, and write an initial\fI __xconfigfile__\fP file
in the user's home directory. Then, it will start 
__xservername__ and allow customizations.
.br
If the \fBDISPLAY\fP environment variable is set, xorgcfg will read the
default\fI __xconfigfile__\fP, that may not be the same being used by the current
server, and allow customizations.
.PP
To use an alternative location for modules or fonts the respective search
paths may be specified.
.PP
Unless there is an \fBApply\fP button in the current xorgcfg dialog, the
changes made will take place the next time\fI __xservername__\fP is started.

.PP
Xorgcfg allows addition and configuration of new devices, such as video cards,
monitors, keyboards and mouses.
.PP
Screen layout configuration for xinerama or traditional multi-head is also
available.
.PP
Modelines can be configured or optimized.
.PP
AccessX basic configurations can be made in the xorgcfg's accessx section.

.SH OPTIONS
.TP 8
.I -config
Specifies an alternate __xconfigfile__ file for configuration.
.TP 8
.I -modulepath
Specifies where xorgcfg, and the server it may start, should look for
__xservername__ modules.
.TP 8
.I -serverpath
Specifies the complete path, not including the binary name, of the
__xservername__ binary.
.TP 8
.I -fontpath
Specifies the path to the fonts that should be used by the server started
by xorgcfg.
.TP 8
.I -rgbpath
Specifies the path to the rgb.txt file that should be used by the server
started by xorgcfg, if any.
.TP 8
.I -textmode
If xorgcfg was compiled with support to ncurses, this option makes xorgcfg
enters a text mode interface.
.TP 8
.I -nomodules
When built with support for loading modules, this options changes xorgcfg
behaviour, so that it will not load any modules, and thus start quicker.

.SH ENVIRONMENT
.TP 8
.I DISPLAY
Default host and display number
.TP 8
.I XWINHOME
Directory where __xservername__ was installed, defaults to /usr/X11R6.
.TP 8
.I XENVIRONMENT
Name of a resource file that overrides the global resources
stored in the RESOURCE_MANAGER property

.SH FILES
.TP 8
.I /etc/__xconfigfile__
Server configuration file
.TP 8
.I /etc/X11/__xconfigfile__
Server configuration file
.TP 8
.I /usr/X11R6/etc/__xconfigfile__
Server configuration file
.TP 8
.IR __projectroot__/lib/X11/__xconfigfile__. hostname
Server configuration file
.TP 8
.I __projectroot__/lib/X11/__xconfigfile__
Server configuration file
.TP 8
.I __projectroot__/lib/X11/app-default/XOrgCfg
Specifies xorgcfg resources
.TP 8
.I __projectroot__/lib/X11/xkb/X0-config.keyboard
Keyboard specific configuration

.SH "SEE ALSO"
.IR __xservername__ (__appmansuffix__)
.IR __xconfigfile__ (__filemansuffix__)

.SH COPYRIGHT
.TP 8
Copyright 2000, Conectiva Linux S.A.
\fIhttp://www.conectiva.com\fP
.TP 8
Copyright 2000, The XFree86 Project
\fIhttp://www.XFree86.org\fP

.SH AUTHORS
.TP 8
Paulo C\'esar Pereira de Andrade \fI<pcpa at conectiva.com.br>\fP
originally for The XFree86 Project.

.SH BUGS
Probably.

Index: Imakefile
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/xf86cfg/Imakefile,v
retrieving revision 1.1.4.3
retrieving revision 1.1.4.4
diff -u -d -r1.1.4.3 -r1.1.4.4
--- a/Imakefile	5 Mar 2004 13:41:01 -0000	1.1.4.3
+++ b/Imakefile	15 Apr 2004 10:17:15 -0000	1.1.4.4
@@ -1,6 +1,8 @@
 XCOMM $XdotOrg$
 XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/Imakefile,v 1.25 2003/10/31 15:02:55 tsi Exp $
 
+#include <Server.tmpl>
+
 XCOMM CDEBUGFLAGS=-g -Wall -ansi -pedantic
 
 #if DoLoadableServer
@@ -69,7 +71,7 @@
 	vidmode.o\
 	xf86config.o
 
-PROG	= xf86cfg
+PROG	= xorgcfg
 
 XBMPICS =\
 	card.xbm\
@@ -118,7 +120,8 @@
 DEFINES        = -DXF86CONFIG=\"$(XF86CONFIGFILE)\" $(MODULEDEFINES) \
 		 $(CURSESDEFINES) \
 		 -DPROJECT_ROOT=\"$(PROJECTROOT)\" \
-		 -DXF86CONFIGDIR=\"$(XF86CONFIGDIR)\" $(XF86CONSOLEDEFS)
+		 -DXF86CONFIGDIR=\"$(XF86CONFIGDIR)\" $(XF86CONSOLEDEFS) \
+		 $(CONFIG_DEFINES) $(XKBDEFRULESDEFS)
 
 #if HasDlopen
 DLLIB = DlLibrary
@@ -133,9 +136,10 @@
 InstallProgramWithFlags($(PROG),$(BINDIR),NullParameter)
 InstallMultipleFlags($(XBMPICS),$(INCDIR)/X11/bitmaps,$(INSTINCFLAGS))
 InstallMultipleFlags($(XPMPICS),$(INCDIR)/X11/pixmaps,$(INSTINCFLAGS))
-InstallAppDefaults(XF86Cfg)
+CppRawFileTarget(XOrgCfg.ad,XOrgCfg.cpp,-D__VENDORNAME__="$(VENDORNAMESHORT)",NullParameter)
+InstallAppDefaults(XOrgCfg)
 
-InstallManPage(xf86cfg,$(MANDIR))
+InstallManPage(xorgcfg,$(MANDIR))
 
 NormalLibraryObjectRule()
 

Index: TODO
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/xf86cfg/TODO,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/TODO	5 Mar 2004 13:41:01 -0000	1.1.4.1
+++ b/TODO	15 Apr 2004 10:17:15 -0000	1.1.4.2
@@ -5,7 +5,7 @@
   Cards file "uptodate" state can also be verified.
 	Probably it is better to forgot about the Cards file, and
 	either parse the output of scanpci, or link libscanpci.a
-	(and whatever else be required) in xf86cfg.
+	(and whatever else be required) in xorgcfg.
 
 o Check if a module is "certified", there was some talk about a
   certification process in the past.
@@ -15,7 +15,7 @@
   This would also require rewriting all existing input device modules.
   (Probably most of this can be made with cpp macros).
 
-o Create a protocol to allow 3rd part xf86cfg modules.
+o Create a protocol to allow 3rd part xorgcfg modules.
 
 o Write an interface for testing extensions/accel, maybe a frontend to
   xdpyinfo, x11perf, glxinfo, etc.
@@ -26,8 +26,8 @@
 o Write code to use a Monitors database, either update the old Monitors
   file or use RedHat MonitorsDB.
 	Chris Morgan is writting code to use MonitorsDB.
-  If xf86cfg could be changed to ddcprobe (in all supported platforms),
+  If xorgcfg could be changed to ddcprobe (in all supported platforms),
   it would be even be a better solution than using a database.
 
 o Add interface to allow changing comments without the need of editing
-  XF86Config with a text editor.
+  config file with a text editor.

Index: expert.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/xf86cfg/expert.c,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/expert.c	5 Mar 2004 13:41:01 -0000	1.1.4.2
+++ b/expert.c	15 Apr 2004 10:17:16 -0000	1.1.4.3
@@ -4742,7 +4742,7 @@
     XtAddCallback(panner, XtNreportCallback, PannerCallback, NULL);
     tree = XtCreateManagedWidget("tree", treeWidgetClass, expert, NULL, 0);
 
-    config = XtVaCreateManagedWidget("XF86Config", toggleWidgetClass, tree,
+    config = XtVaCreateManagedWidget(__XCONFIGFILE__, toggleWidgetClass, tree,
 				     XtNstate, True, NULL, 0);
     mainNode = NewNode(NULL, config, config, NULL, NULL);
 

Index: interface.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/xf86cfg/interface.c,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/interface.c	5 Mar 2004 13:41:01 -0000	1.1.4.1
+++ b/interface.c	15 Apr 2004 10:17:16 -0000	1.1.4.2
@@ -193,8 +193,8 @@
 
 static XtResource appResources[] = {
 #if 0
-    {"xf86config",  "XF86Config",  XtRString, sizeof(char*),
-      0, XtRString, "/etc/X11/XF86Config"},
+    {"config",  __XCONFIGFILE__,  XtRString, sizeof(char*),
+      0, XtRString, "/etc/X11/"__XCONFIGFILE__},
 #endif
     {"menuBitmap",  "MenuBitmap",  XtRString, sizeof(char*),
       0, XtRString, "menu10"},
@@ -205,11 +205,11 @@
 {
     fprintf(stderr,
 "Usage:\n"
-"   xf86cfg [-option ...]\n"
+"   xorgcfg [-option ...]\n"
 "\n"
 "Options:\n"
-"   -xf86config <XF86Config>   Alternate configuration file.\n"
-"   -modulepath <module-path>  XFree86 modules location.\n"
+"   -config <"__XCONFIGFILE__">   Alternate configuration file.\n"
+"   -modulepath <module-path>  "__XSERVERNAME__" modules location.\n"
 "   -serverpath <server-path>  X server to start (if $DISPLAY is not defined).\n"
 "   -fontpath   <font-path>    Font path for fonts.\n"
 "   -rgbpath    <rgb-path>     Where the rgb.txt file is located.\n"
@@ -217,7 +217,7 @@
 "   -textmode                  Use this option for the text only interface.\n"
 #endif
 #ifdef USE_MODULES
-"   -nomodules                 Use this option if xf86cfg is slow to start.\n"
+"   -nomodules                 Use this option if xorgcfg is slow to start.\n"
 "   -verbose <number>          Verbosity used in the loader (default 1).\n"
 #endif
 "   -verify                    Verify modules/options integrity.\n"
@@ -253,7 +253,9 @@
     noverify = True;
 
     for (i = 1; i < argc; i++) {
-	if (strcmp(argv[i], "-xf86config") == 0) {
+	if (strcmp(argv[i], "-config") == 0 ||
+	    strcmp(argv[i], "-xorgconfig") == 0 ||
+	    strcmp(argv[i], "-xf86config") == 0) {
 	    if (i + 1 < argc) {
 		XF86Config_path = argv[++i];
 		config_set = True;
@@ -298,13 +300,13 @@
     
     startedx = startx();
     if (XF86Config_path == NULL)
-	XF86Config_path = XtNewString("XF86Config-4");
+	XF86Config_path = XtNewString(__XCONFIGFILE__"-4");
     if (XkbConfig_path == NULL) {
 	XmuSnprintf(XkbConfig_path_static, sizeof(XkbConfig_path_static),
 		    "%s/%s%s", XFree86Dir, XkbConfigDir, XkbConfigFile);
 	XkbConfig_path = XkbConfig_path_static;
     }
-    toplevel = XtAppInitialize(&appcon, "XF86Cfg",
+    toplevel = XtAppInitialize(&appcon, "XOrgCfg",
 		    	       NULL, 0,
 			       &argc, argv,
 			       NULL, NULL, 0);
@@ -534,9 +536,9 @@
 # endif
 #else
 # ifdef XF86CONFIGDIR
-	XF86Config_path = XtNewString(XF86CONFIGDIR "/XF86Config-4");
+	XF86Config_path = XtNewString(XF86CONFIGDIR "/"__XCONFIGFILE__"-4");
 # else
-	XF86Config_path = XtNewString("/etc/X11/XF86Config-4");
+	XF86Config_path = XtNewString("/etc/X11/"__XCONFIGFILE__"-4");
 # endif
 #endif
     }

Index: keyboard-cfg.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/xf86cfg/keyboard-cfg.c,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/keyboard-cfg.c	5 Mar 2004 13:41:01 -0000	1.1.4.1
+++ b/keyboard-cfg.c	15 Apr 2004 10:17:16 -0000	1.1.4.2
@@ -73,7 +73,7 @@
 #ifdef XFREE98_XKB
 static char *XkbRulesFile = "xfree98";
 #else
-static char *XkbRulesFile = "xfree86";
+static char *XkbRulesFile = __XKBDEFRULES__;
 #endif
 static XF86ConfInputPtr current_input;
 

Index: loader.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/xf86cfg/loader.c,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/loader.c	5 Mar 2004 13:41:01 -0000	1.1.4.2
+++ b/loader.c	15 Apr 2004 10:17:16 -0000	1.1.4.3
@@ -188,8 +188,7 @@
 	first = 0;
 
 	checkerLegend[CHECKER_OPTIONS_FILE_MISSING] =
-	"The Options file, normally /usr/X11R6/lib/X11/Options was not found.\n"
-	"In the sources, it is at xc/programs/Xserver/hw/xfree86/Options.";
+	"The Options file, normally /usr/X11R6/lib/X11/Options was not found.\n";
 	checkerLegend[CHECKER_OPTION_DESCRIPTION_MISSING] =
 	"No description for the module option. The description should be in\n"
 	"in the Options file, and using the sintax:\n"
@@ -207,7 +206,7 @@
 	checkerLegend[CHECKER_NO_OPTIONS_AVAILABLE] =
 	"The driver does not have an AvailableOptions function, or that\n"
 	"function is returning NULL. If the driver is returning NULL, and\n"
-	"really does not need any options from XF86Config, than the message\n"
+	"really does not need any options from "__XCONFIGFILE__", than the message\n"
 	"can be ignored.";
 	checkerLegend[CHECKER_NO_VENDOR_CHIPSET] =
 	"The checker could not fetch the PCI chipset/vendor information from\n"

Index: startx.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/xf86cfg/startx.c,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/startx.c	5 Mar 2004 13:41:01 -0000	1.1.4.1
+++ b/startx.c	15 Apr 2004 10:17:16 -0000	1.1.4.2
@@ -64,10 +64,10 @@
 	 */
 	if (XFree86_path)
 	    c_pos = XmuSnprintf(commandline, sizeof(commandline),
-				"%s/XFree86 :8 -configure ",XFree86_path);
+				"%s/"__XSERVERNAME__" :8 -configure ",XFree86_path);
 	else
 	    c_pos = XmuSnprintf(commandline, sizeof(commandline), 
-				"%s/bin/XFree86 :8 -configure ", XFree86Dir);
+				"%s/bin/"__XSERVERNAME__" :8 -configure ", XFree86Dir);
 	if (XF86Module_path && ((len = sizeof(commandline) - c_pos) > 0))
 	    c_pos += XmuSnprintf(commandline + c_pos,len,
 				 " -modulepath %s",XF86Module_path);
@@ -87,9 +87,9 @@
 	    home = "/";
 
 #ifndef QNX4
-	XmuSnprintf(filename, sizeof(filename), "%s/XF86Config.new", home);
+	XmuSnprintf(filename, sizeof(filename), "%s/"__XCONFIGFILE__".new", home);
 #else
-	XmuSnprintf(filename, sizeof(filename), "//%d%s/XF86Config.new",
+	XmuSnprintf(filename, sizeof(filename), "//%d%s/"__XCONFIGFILE__".new",
 		    getnid(), home);
 #endif
 
@@ -106,9 +106,9 @@
 	    char path[PATH_MAX];
 	    /* Don't change to X! see above */
 	    if (XFree86_path)
-	        XmuSnprintf(path, sizeof(path), "%s/XFree86", XFree86_path);
+	        XmuSnprintf(path, sizeof(path), "%s/"__XSERVERNAME__, XFree86_path);
 	    else
-	        XmuSnprintf(path, sizeof(path), "%s/bin/XFree86", XFree86Dir);
+	        XmuSnprintf(path, sizeof(path), "%s/bin/"__XSERVERNAME__, XFree86Dir);
 	    execl(path, "X", ":8", /*"+xinerama",*/ "+accessx","-allowMouseOpenFail",
 		  "-xf86config", XF86Config_path, (void *)NULL);
 	    exit(-127);

Index: text-mode.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/xf86cfg/text-mode.c,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/text-mode.c	5 Mar 2004 13:41:01 -0000	1.1.4.2
+++ b/text-mode.c	15 Apr 2004 10:17:16 -0000	1.1.4.3
@@ -124,7 +124,7 @@
 #define	CONF_LAYOUT	5
     "Configure layout",
 #define	CONF_FINISH	6
-    "Write XF86Config and quit",
+    "Write "__XCONFIGFILE__" and quit",
 #define	CONF_QUIT	7
     "Quit",
 };
@@ -200,23 +200,23 @@
 
 	ClearScreen();
 	refresh();
-	if (Dialog("XFree86 Configuration",
-		   "This program will create the XF86Config file, based on "
+	if (Dialog( __XSERVERNAME__"Configuration",
+		   "This program will create the "__XCONFIGFILE__" file, based on "
 		   "menu selections you make.\n"
 		   "\n"
 #ifndef __UNIXOS2__
-		   "The XF86Config file usually resides in /usr/X11R6/etc/X11 "
+		   "The "__XCONFIGFILE__" file usually resides in /usr/X11R6/etc/X11 "
 #else
-		   "The XF86Config file usually resides in "XF86CONFIGDIR" "
+		   "The "__XCONFIGFILE__" file usually resides in "XF86CONFIGDIR" "
 #endif
-		   "or /etc/X11. A sample XF86Config file is supplied with "
-		   "XFree86; it is configured for a standard VGA card and "
+		   "or /etc/X11. A sample "__XCONFIGFILE__" file is supplied with "
+		   __XSERVERNAME__"; it is configured for a standard VGA card and "
 		   "monitor with 640x480 resolution. This program will ask for "
 		   "a pathname when it is ready to write the file.\n"
 		   "\n"
-		   "You can either take the sample XF86Config as a base and "
+		   "You can either take the sample "__XCONFIGFILE__" as a base and "
 		   "edit it for your configuration, or let this program "
-		   "produce a base XF86Config file for your configuration and "
+		   "produce a base "__XCONFIGFILE__" file for your configuration and "
 		   "fine-tune it.",
 		   20, 60, "   Ok   ", " Cancel ", 0) != 0)
 	    break;
@@ -295,12 +295,12 @@
 
     ClearScreen();
     refresh();
-    xf86config = DialogInput("Write XF86Config", "Write configuration to file:",
+    xf86config = DialogInput("Write "__XCONFIGFILE__, "Write configuration to file:",
 			     10, 60, XF86Config_path ? XF86Config_path :
 #ifndef __UNIXOS2__
-			     "/etc/X11/XF86Config", "  Ok  ", " Cancel ", 0);
+			     "/etc/X11/"__XCONFIGFILE__, "  Ok  ", " Cancel ", 0);
 #else
-			     XF86CONFIGDIR"/XF86Config", "  Ok  ", " Cancel ", 0);
+			     XF86CONFIGDIR"/"__XCONFIGFILE__, "  Ok  ", " Cancel ", 0);
 #endif
 
     if (xf86config == NULL)
@@ -711,7 +711,7 @@
 #ifdef XFREE98_XKB
 	rulesfile = XKB_RULES_DIR "/xfree98";
 #else
-	rulesfile = XKB_RULES_DIR "/xfree86";
+	rulesfile = XKB_RULES_DIR "/"__XKBDEFRULES__;
 #endif
 	rules = XkbRF_Load(rulesfile, "", True, False);
 	if (rules == NULL) {

Index: xf86config.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/xf86cfg/xf86config.c,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/xf86config.c	5 Mar 2004 13:41:01 -0000	1.1.4.2
+++ b/xf86config.c	15 Apr 2004 10:17:16 -0000	1.1.4.3
@@ -24,7 +24,7 @@
  * dealings in this Software without prior written authorization from
  * Conectiva Linux.
  *
- * Author: Paulo César Pereira de Andrade <pcpa at conectiva.com.br>
+ * Author: Paulo César Pereira de Andrade <pcpa at conectiva.com.br>
  *
  * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/xf86config.c,v 1.5tsi Exp $
  */

--- XF86Cfg.ad DELETED ---

--- xf86cfg.man DELETED ---

More information about the xorg-commit-diffs mailing list