summaryrefslogtreecommitdiff
path: root/hw/xfree86/common
diff options
context:
space:
mode:
Diffstat (limited to 'hw/xfree86/common')
-rw-r--r--hw/xfree86/common/xf86AutoConfig.c2
-rw-r--r--hw/xfree86/common/xf86Config.c2
-rw-r--r--hw/xfree86/common/xf86Configure.c22
-rw-r--r--hw/xfree86/common/xf86Init.c50
-rw-r--r--hw/xfree86/common/xf86Module.h22
-rw-r--r--hw/xfree86/common/xorgHelper.c20
-rw-r--r--hw/xfree86/common/xorgVersion.h51
7 files changed, 125 insertions, 44 deletions
diff --git a/hw/xfree86/common/xf86AutoConfig.c b/hw/xfree86/common/xf86AutoConfig.c
index 7c773fee6..5f4886724 100644
--- a/hw/xfree86/common/xf86AutoConfig.c
+++ b/hw/xfree86/common/xf86AutoConfig.c
@@ -265,7 +265,7 @@ xf86AutoConfig(void)
" -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,
diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
index 36285b1ba..d396366a2 100644
--- a/hw/xfree86/common/xf86Config.c
+++ b/hw/xfree86/common/xf86Config.c
@@ -1102,7 +1102,7 @@ configInputKbd(IDevPtr inputp)
#endif
#ifdef XKB
if (!xf86IsPc98()) {
- xf86Info.xkbrules = "xfree86";
+ xf86Info.xkbrules = __XKBDEFRULES__;
xf86Info.xkbmodel = "pc105";
xf86Info.xkblayout = "us";
xf86Info.xkbvariant = NULL;
diff --git a/hw/xfree86/common/xf86Configure.c b/hw/xfree86/common/xf86Configure.c
index 81ce26eec..e7292fe57 100644
--- a/hw/xfree86/common/xf86Configure.c
+++ b/hw/xfree86/common/xf86Configure.c
@@ -500,7 +500,7 @@ configureLayoutSection (void)
int scrnum = 0;
parsePrologue (XF86ConfLayoutPtr, XF86ConfLayoutRec)
- ptr->lay_identifier = "XFree86 Configured";
+ ptr->lay_identifier = "X.org Configured";
{
XF86ConfInputrefPtr iptr;
@@ -978,29 +978,33 @@ DoConfigure()
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);
diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
index 979b655ee..c1918c6ef 100644
--- a/hw/xfree86/common/xf86Init.c
+++ b/hw/xfree86/common/xf86Init.c
@@ -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 @@ AbortDDX()
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
@@ -1706,7 +1711,7 @@ ddxUseMsg()
#define OSVENDOR ""
#endif
#ifndef PRE_RELEASE
-#define PRE_RELEASE XF86_VERSION_SNAP
+#define PRE_RELEASE XORG_VERSION_SNAP
#endif
static void
@@ -1714,24 +1719,25 @@ xf86PrintBanner()
{
#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@XFree86.Org and patches submitted\n"
- "to fixes@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");
-#endif
- ErrorF("\nXFree86 Version %d.%d.%d", XF86_VERSION_MAJOR, XF86_VERSION_MINOR,
- XF86_VERSION_PATCH);
-#if XF86_VERSION_SNAP > 0
+ "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
+#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 +1785,7 @@ xf86PrintBanner()
#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");
diff --git a/hw/xfree86/common/xf86Module.h b/hw/xfree86/common/xf86Module.h
index bd18e895f..f0ac3bd59 100644
--- a/hw/xfree86/common/xf86Module.h
+++ b/hw/xfree86/common/xf86Module.h
@@ -63,11 +63,11 @@ typedef enum {
/* 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 @@ typedef enum {
#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 @@ typedef enum {
* 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 {
diff --git a/hw/xfree86/common/xorgHelper.c b/hw/xfree86/common/xorgHelper.c
new file mode 100644
index 000000000..c6364f19e
--- /dev/null
+++ b/hw/xfree86/common/xorgHelper.c
@@ -0,0 +1,20 @@
+/* $XdotOrg$ */
+
+#include "X.h"
+#include "os.h"
+#include "servermd.h"
+#include "pixmapstr.h"
+#include "windowstr.h"
+#include "propertyst.h"
+#include "gcstruct.h"
+#include "loaderProcs.h"
+#include "xf86.h"
+#include "xf86Priv.h"
+#include "xorgVersion.h"
+
+
+CARD32
+xorgGetVersion()
+{
+ return XORG_VERSION_CURRENT;
+}
diff --git a/hw/xfree86/common/xorgVersion.h b/hw/xfree86/common/xorgVersion.h
new file mode 100644
index 000000000..bfc66a59c
--- /dev/null
+++ b/hw/xfree86/common/xorgVersion.h
@@ -0,0 +1,51 @@
+/* $XdotOrg: xc/programs/Xserver/hw/xfree86/xf86Version.h,v 1.1.4.3 2003/12/06 13:24:23 kaleb Exp $ */
+
+/*
+ * Copyright (c) 2004, X.Org Foundation
+ *
+ * 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
+ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) 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 the copyright holder(s)
+ * and author(s) shall not be used in advertising or otherwise to promote
+ * the sale, use or other dealings in this Software without prior written
+ * authorization from the copyright holder(s) and author(s).
+ */
+
+#ifndef XORG_VERSION_H
+# define XORG_VERSION_H
+
+# ifndef XORG_VERSION_CURRENT
+# error
+# endif
+
+# define XORG_VERSION_NUMERIC(major,minor,patch,snap,dummy) \
+ (((major) * 10000000) + ((minor) * 100000) + ((patch) * 1000) + snap)
+
+# define XORG_GET_MAJOR_VERSION(vers) ((vers) / 10000000)
+# define XORG_GET_MINOR_VERSION(vers) (((vers) % 10000000) / 100000)
+# define XORG_GET_PATCH_VERSION(vers) (((vers) % 100000) / 1000)
+# define XORG_GET_SNAP_VERSION(vers) ((vers) % 1000)
+
+# define XORG_VERSION_MAJOR XORG_GET_MAJOR_VERSION(XORG_VERSION_CURRENT)
+# define XORG_VERSION_MINOR XORG_GET_MINOR_VERSION(XORG_VERSION_CURRENT)
+# define XORG_VERSION_PATCH XORG_GET_PATCH_VERSION(XORG_VERSION_CURRENT)
+# define XORG_VERSION_SNAP XORG_GET_PATCH_VERSION(XORG_VERSION_CURRENT)
+
+#endif
+/* $XdotOrg: xc/programs/Xserver/hw/xfree86/xf86Version.h,v 1.1.4.3 2003/12/06 13:24:23 kaleb Exp $ */
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-22 04:14:40 +0000