[xorg-commit-diffs]
xc/programs/Xserver/hw/xfree86/common Imakefile, 1.1.4.3.2.1,
1.1.4.3.2.1.6.1 xf86AutoConfig.c, 1.1.4.2,
1.1.4.2.12.1 xf86Config.c, 1.1.4.4.2.3,
1.1.4.4.2.3.6.1 xf86Configure.c, 1.1.4.1.6.3,
1.1.4.1.6.3.2.1 xf86Init.c, 1.1.4.5.2.1,
1.1.4.5.2.1.4.1 xf86Module.h, 1.1.4.1, 1.1.4.1.16.1
Roland Mainz
xorg-commit at pdx.freedesktop.org
Sat Apr 10 02:04:40 PDT 2004
Committed by: gisburn
Update of /cvs/xorg/xc/programs/Xserver/hw/xfree86/common
In directory pdx:/tmp/cvs-serv7662/xc/programs/Xserver/hw/xfree86/common
Modified Files:
Tag: XPRINT
Imakefile xf86AutoConfig.c xf86Config.c xf86Configure.c
xf86Init.c xf86Module.h
Log Message:
Resync to 2004-04-10 XORG-RELEASE-1 branch
Index: Imakefile
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/common/Imakefile,v
retrieving revision 1.1.4.3.2.1
retrieving revision 1.1.4.3.2.1.6.1
diff -u -d -r1.1.4.3.2.1 -r1.1.4.3.2.1.6.1
--- a/Imakefile 4 Mar 2004 17:47:34 -0000 1.1.4.3.2.1
+++ b/Imakefile 10 Apr 2004 09:04:36 -0000 1.1.4.3.2.1.6.1
@@ -67,11 +67,11 @@
MDEBUGDEFS = -DMEMDEBUG
#endif
-#ifndef XF86ExpireServer
-#define XF86ExpireServer NO
+#ifndef XorgExpireServer
+#define XorgExpireServer NO
#endif
-#if XF86ExpireServer
+#if XorgExpireServer
BETASRC = xf86Beta.c
BETAOBJ = xf86Beta.o
BETADEFS = -DDO_CHECK_BETA
@@ -84,7 +84,7 @@
#define NeedXF86Beta NO
#endif
-#if XF86ExpireServer
+#if XorgExpireServer
EXP_FORCE_DEFINES = -DSHOW_BETA_MESSAGE -DEXPIRE_SERVER
#endif
@@ -119,6 +119,7 @@
xf86cmap.c\
xf86PM.c \
xf86Versions.c \
+ xorgHelper.c \
$(DEBUGSRC) \
$(KBD).c \
$(SBUSSRC) \
@@ -158,6 +159,7 @@
xf86cmap.o\
xf86PM.o \
xf86Versions.o \
+ xorgHelper.o \
$(DEBUGOBJ) \
$(SBUSOBJ) \
$(XF86_XINPUT_OBJ) \
@@ -193,10 +195,10 @@
BUILDERMSG = -DBUILDERSTRING='$(BUILDERSTRING)'
#endif
XORGREL = XOrgReleaseString
- XORGREL_DEF = -DXORG_RELEASE='"$(XORGREL)"'
+ XORGREL_DEF = -DXORG_RELEASE="\"$(XORGREL)\""
CONSDEFINES = XFree86ConsoleDefines
-EXP_DEFINES = -DEXPIRY_TIME=XF86ServerExpiry $(EXP_FORCE_DEFINES)
+EXP_DEFINES = -DEXPIRY_TIME=XorgServerExpiry $(EXP_FORCE_DEFINES)
DRIVERS = XF86CardDrivers
IDRIVERS = XInputDrivers
XCONFIGDEFINES = -DPROJECTROOT='"$(PROJECTROOT)"' \
@@ -206,7 +208,7 @@
XF86CONFIGFILE = XConfigFile
XCONFIGUREDEFINES = -DXF86CONFIGFILE='"$(XF86CONFIGFILE)"'
- DEFINES = $(CONSDEFINES) $(KBDDEFINES) $(EXT_DEFINES) $(OS_DEFINES)
+ DEFINES = $(CONSDEFINES) $(KBDDEFINES) $(EXT_DEFINES) $(OS_DEFINES) $(CONFIG_DEFINES) $(XKBDEFRULESDEFS) $(VENDORSUPPORTDEFS)
AllTarget($(OFILES))
Index: xf86AutoConfig.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/common/xf86AutoConfig.c,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.2.12.1
diff -u -d -r1.1.4.2 -r1.1.4.2.12.1
--- a/xf86AutoConfig.c 8 Feb 2004 00:17:31 -0000 1.1.4.2
+++ b/xf86AutoConfig.c 10 Apr 2004 09:04:36 -0000 1.1.4.2.12.1
@@ -265,7 +265,7 @@
" -v 0x%04x -d 0x%04x -r 0x%02x -s 0x%04x"
" -b 0x%04x -c 0x%04x",
path,
- (unsigned int)xf86GetVersion(),
+ (unsigned int)xorgGetVersion(),
searchPath,
info->vendor, info->chipType, info->chipRev,
info->subsysVendor, info->subsysCard,
Index: xf86Config.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/common/xf86Config.c,v
retrieving revision 1.1.4.4.2.3
retrieving revision 1.1.4.4.2.3.6.1
diff -u -d -r1.1.4.4.2.3 -r1.1.4.4.2.3.6.1
--- a/xf86Config.c 4 Mar 2004 20:16:17 -0000 1.1.4.4.2.3
+++ b/xf86Config.c 10 Apr 2004 09:04:36 -0000 1.1.4.4.2.3.6.1
@@ -1102,7 +1102,7 @@
#endif
#ifdef XKB
if (!xf86IsPc98()) {
- xf86Info.xkbrules = "xfree86";
+ xf86Info.xkbrules = __XKBDEFRULES__;
xf86Info.xkbmodel = "pc105";
xf86Info.xkblayout = "us";
xf86Info.xkbvariant = NULL;
Index: xf86Configure.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/common/xf86Configure.c,v
retrieving revision 1.1.4.1.6.3
retrieving revision 1.1.4.1.6.3.2.1
diff -u -d -r1.1.4.1.6.3 -r1.1.4.1.6.3.2.1
--- a/xf86Configure.c 17 Mar 2004 19:22:12 -0000 1.1.4.1.6.3
+++ b/xf86Configure.c 10 Apr 2004 09:04:36 -0000 1.1.4.1.6.3.2.1
@@ -500,7 +500,7 @@
int scrnum = 0;
parsePrologue (XF86ConfLayoutPtr, XF86ConfLayoutRec)
- ptr->lay_identifier = "XFree86 Configured";
+ ptr->lay_identifier = "X.org Configured";
{
XF86ConfInputrefPtr iptr;
@@ -978,29 +978,33 @@
ErrorF("\n");
#ifdef SCO
- ErrorF("\nXFree86 is using the kernel event driver to access the mouse.\n"
- "If you wish to use the internal XFree86 mouse drivers, please\n"
+ ErrorF("\n"__XSERVERNAME__
+ " is using the kernel event driver to access the mouse.\n"
+ "If you wish to use the internal "__XSERVERNAME__
+ "mouse drivers, please\n"
"edit the file and correct the Device.\n");
#else /* !SCO */
if (!foundMouse) {
- ErrorF("\nXFree86 is not able to detect your mouse.\n"
+ ErrorF("\n"__XSERVERNAME__" is not able to detect your mouse.\n"
"Edit the file and correct the Device.\n");
} else {
#ifndef __UNIXOS2__ /* OS/2 definitely has a mouse */
- ErrorF("\nXFree86 detected your mouse at device %s.\n"
+ ErrorF("\n"__XSERVERNAME__" detected your mouse at device %s.\n"
"Please check your config if the mouse is still not\n"
- "operational, as by default XFree86 tries to autodetect\n"
+ "operational, as by default "__XSERVERNAME__
+ " tries to autodetect\n"
"the protocol.\n",DFLT_MOUSE_DEV);
#endif
}
#endif /* !SCO */
if (xf86NumScreens > 1) {
- ErrorF("\nXFree86 has configured a multihead system, please check your config.\n");
+ ErrorF("\n"__XSERVERNAME__
+ " has configured a multihead system, please check your config.\n");
}
- ErrorF("\nYour XF86Config file is %s\n\n", filename);
- ErrorF("To test the server, run 'XFree86 -xf86config %s'\n\n", filename);
+ ErrorF("\nYour %s file is %s\n\n", XF86CONFIGFILE ,filename);
+ ErrorF("To test the server, run 'X -xf86config %s'\n\n", filename);
bail:
OsCleanup(TRUE);
Index: xf86Init.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/common/xf86Init.c,v
retrieving revision 1.1.4.5.2.1
retrieving revision 1.1.4.5.2.1.4.1
diff -u -d -r1.1.4.5.2.1 -r1.1.4.5.2.1.4.1
--- a/xf86Init.c 15 Mar 2004 16:02:03 -0000 1.1.4.5.2.1
+++ b/xf86Init.c 10 Apr 2004 09:04:36 -0000 1.1.4.5.2.1.4.1
@@ -69,7 +69,7 @@
#include "xf86Priv.h"
#include "xf86Config.h"
#include "xf86_OSlib.h"
-#include "xf86Version.h"
+#include "xorgVersion.h"
#include "xf86Date.h"
#include "xf86Build.h"
#include "mipointer.h"
@@ -1262,12 +1262,17 @@
void
OsVendorFatalError()
{
- ErrorF("\nWhen reporting a problem related to a server crash, please send\n"
- "the full server output, not just the last messages.\n");
- if (xf86LogFile && xf86LogFileWasOpened)
- ErrorF("This can be found in the log file \"%s\".\n", xf86LogFile);
- ErrorF("Please report problems to %s.\n", BUILDERADDR);
- ErrorF("\n");
+#ifdef VENDORSUPPORT
+ ErrorF("\nPlease refer to your Operating System Vendor support pages\n"
+ "at %s for support on this crash.\n",VENDORSUPPORT);
+#else
+ ErrorF("\nPlease consult the "XVENDORNAME" support \n"
+ "\t at "__VENDORDWEBSUPPORT__"\n for help. \n");
+#endif
+ if (xf86LogFile && xf86LogFileWasOpened)
+ ErrorF("Please also check the log file at \"%s\" for additional "
+ "information.\n", xf86LogFile);
+ ErrorF("\n");
}
int
@@ -1339,15 +1344,15 @@
return 2;
}
}
- if (!strcmp(argv[i], "-xf86config"))
+ if (!strcmp(argv[i], "-config") || !strcmp(argv[i], "-xf86config"))
{
if (!argv[i + 1])
return 0;
if (getuid() != 0 && !xf86PathIsSafe(argv[i + 1])) {
- FatalError("\nInvalid argument for -xf86config\n"
- "\tFor non-root users, the file specified with -xf86config must be\n"
+ FatalError("\nInvalid argument for -config\n"
+ "\tFor non-root users, the file specified with -config must be\n"
"\ta relative path and must not contain any \"..\" elements.\n"
- "\tUsing default XF86Config search path.\n\n");
+ "\tUsing default "__XCONFIGFILE__" search path.\n\n");
}
xf86ConfigFile = argv[i + 1];
return 2;
@@ -1650,15 +1655,14 @@
ErrorF("Device Dependent Usage\n");
if (getuid() == 0)
{
- ErrorF("-xf86config file specify a configuration file\n");
ErrorF("-modulepath paths specify the module search path\n");
ErrorF("-logfile file specify a log file name\n");
- ErrorF("-configure probe for devices and write an XF86Config\n");
+ ErrorF("-configure probe for devices and write an "__XCONFIGFILE__"\n");
}
else
{
- ErrorF("-xf86config file specify a configuration file, relative to the\n");
- ErrorF(" XF86Config search path, only root can use absolute\n");
+ ErrorF("-config file specify a configuration file, relative to the\n");
+ ErrorF(" "__XCONFIGFILE__" search path, only root can use absolute\n");
}
ErrorF("-probeonly probe for devices, then exit\n");
ErrorF("-scanpci execute the scanpci module and exit\n");
@@ -1706,7 +1710,7 @@
#define OSVENDOR ""
#endif
#ifndef PRE_RELEASE
-#define PRE_RELEASE XF86_VERSION_SNAP
+#define PRE_RELEASE XORG_VERSION_SNAP
#endif
static void
@@ -1714,24 +1718,25 @@
{
#if PRE_RELEASE
ErrorF("\n"
- "This is a pre-release version of XFree86, and is not supported in any\n"
- "way. Bugs may be reported to XFree86 at XFree86.Org and patches submitted\n"
- "to fixes at XFree86.Org. Before reporting bugs in pre-release versions,\n"
- "please check the latest version in the XFree86 CVS repository\n"
- "(http://www.XFree86.Org/cvs).\n");
+ "This is a pre-release version of the " XVENDORNAME " X11.\n"
+ "Portions of this release are based on XFree86 4.4RC2 and selected\n"
+ "files from XFree86 4.4RC3. It is not supported in any way.\n"
+ "Bugs may be filed in the bugzilla at http://bugs.freedesktop.org/.\n"
+ "Select the \"xorg\" product for bugs you find in this release.\n"
+ "Before reporting bugs in pre-release versions please check the\n"
+ "latest version in the " XVENDORNAME " \"monolithic tree\" CVS\n"
+ "repository hosted at http://www.freedesktop.org/Software/xorg/");
#endif
- ErrorF("\nXFree86 Version %d.%d.%d", XF86_VERSION_MAJOR, XF86_VERSION_MINOR,
- XF86_VERSION_PATCH);
-#if XF86_VERSION_SNAP > 0
+#if XORG_VERSION_SNAP > 0
ErrorF(".%d", XF86_VERSION_SNAP);
#endif
-#if XF86_VERSION_SNAP >= 900
- ErrorF(" (%d.%d.0 RC %d)", XF86_VERSION_MAJOR, XF86_VERSION_MINOR + 1,
- XF86_VERSION_SNAP - 900);
+#if XORG_VERSION_SNAP >= 900
+ ErrorF(" (%d.%d.0 RC %d)", XORG_VERSION_MAJOR, XORG_VERSION_MINOR + 1,
+ XORG_VERSION_SNAP - 900);
#endif
-#ifdef XF86_CUSTOM_VERSION
+#ifdef XORG_CUSTOM_VERSION
ErrorF(" (%s)", XF86_CUSTOM_VERSION);
#endif
ErrorF("\nRelease Date: %s\n", XF86_DATE);
@@ -1779,7 +1784,7 @@
#if defined(BUILDERSTRING)
ErrorF("%s \n",BUILDERSTRING);
#endif
- ErrorF("\tBefore reporting problems, check http://www.XFree86.Org/\n"
+ ErrorF("\tBefore reporting problems, check "__VENDORDWEBSUPPORT__"\n"
"\tto make sure that you have the latest version.\n");
#ifdef XFree86LOADER
ErrorF("Module Loader present\n");
Index: xf86Module.h
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/common/xf86Module.h,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.1.16.1
diff -u -d -r1.1.4.1 -r1.1.4.1.16.1
--- a/xf86Module.h 26 Nov 2003 22:48:58 -0000 1.1.4.1
+++ b/xf86Module.h 10 Apr 2004 09:04:37 -0000 1.1.4.1.16.1
@@ -63,11 +63,11 @@
/* Built-in ABI classes. These definitions must not be changed. */
#define ABI_CLASS_NONE NULL
-#define ABI_CLASS_ANSIC "XFree86 ANSI C Emulation"
-#define ABI_CLASS_VIDEODRV "XFree86 Video Driver"
-#define ABI_CLASS_XINPUT "XFree86 XInput driver"
-#define ABI_CLASS_EXTENSION "XFree86 Server Extension"
-#define ABI_CLASS_FONT "XFree86 Font Renderer"
+#define ABI_CLASS_ANSIC "X.Org ANSI C Emulation"
+#define ABI_CLASS_VIDEODRV "X.Org Video Driver"
+#define ABI_CLASS_XINPUT "X.Org XInput driver"
+#define ABI_CLASS_EXTENSION "X.Org Server Extension"
+#define ABI_CLASS_FONT "X.Org Font Renderer"
#define ABI_MINOR_MASK 0x0000FFFF
#define ABI_MAJOR_MASK 0xFFFF0000
@@ -95,9 +95,9 @@
#ifndef MODULEVENDORSTRING
#ifndef __OS2ELF__
-#define MODULEVENDORSTRING "The XFree86 Project"
+#define MODULEVENDORSTRING "X.Org Foundation"
#else
-#define MODULEVENDORSTRING "The XFree86 Project - XFree86/OS2"
+#define MODULEVENDORSTRING "X.Org Foundation - OS2"
#endif
#endif
@@ -129,10 +129,10 @@
* the video driver ABI are themselves video drivers.
*/
#define MOD_CLASS_NONE NULL
-#define MOD_CLASS_VIDEODRV "XFree86 Video Driver"
-#define MOD_CLASS_XINPUT "XFree86 XInput Driver"
-#define MOD_CLASS_FONT "XFree86 Font Renderer"
-#define MOD_CLASS_EXTENSION "XFree86 Server Extension"
+#define MOD_CLASS_VIDEODRV "X.Org Video Driver"
+#define MOD_CLASS_XINPUT "X.Org XInput Driver"
+#define MOD_CLASS_FONT "X.Org Font Renderer"
+#define MOD_CLASS_EXTENSION "X.Org Server Extension"
/* This structure is expected to be returned by the initfunc */
typedef struct {
More information about the xorg-commit-diffs
mailing list