Merging XORG-CURRENT into trunk

1188 files changed, 20614 insertions, 3558 deletions

diff --git a/XpConfig/C/print/models/SPSPARC2/model-config b/XpConfig/C/print/models/SPSPARC2/model-config
index 959e9ff7b..9f29b9992 100644
--- a/XpConfig/C/print/models/SPSPARC2/model-config
+++ b/XpConfig/C/print/models/SPSPARC2/model-config
@@ -1,13 +1,18 @@
-# $Xorg: model-config,v 1.3 2000/08/17 19:48:04 cpqbld Exp $
-SPSPARC2.printer-model: "SunPics SPARCprinter II"
-SPSPARC2.printer-resolutions-supported: 300
-SPSPARC2.content-orientations-supported: portrait landscape
-SPSPARC2.document-formats-supported: {PostScript 2}
-SPSPARC2.plexes-supported: simplex
-SPSPARC2.xp-ddx-identifier: XP-POSTSCRIPT
-SPSPARC2.xp-embedded-formats-supported: { PostScript 2 }
-*xp-setup-proviso: setup-optional
-SPSPARC2.medium-source-sizes-supported: \
+# $Xprint.org: SPSPARC2 model-config,v 1.4 2002/11/07 19:48:04 gisburn Exp $
+*content-orientations-supported: portrait landscape
+*descriptor: SunPics SPARCprinter II
+*document-formats-supported: {POSTSCRIPT 2}
+*input-trays-supported:
+*medium-source-sizes-supported: \
     { '' {na-letter FALSE {6.35 209.55 6.35 273.05}} \
 	 {na-legal  FALSE {6.35 209.55 6.35 349.25}} \
 	 {iso-a4    FALSE {6.35 203.65 6.35 290.65}}}
+*plexes-supported: simplex
+*printer-model: "SunPics SPARCprinter II"
+*printer-resolutions-supported: 300
+*xp-ddx-identifier: XP-POSTSCRIPT
+*xp-listfonts-modes-supported: xp-list-internal-printer-fonts xp-list-glyph-fonts
+*xp-embedded-formats-supported: {POSTSCRIPT 2}
+*xp-raw-formats-supported: {POSTSCRIPT 2}
+*xp-setup-proviso: setup-optional
+# EOF.
diff --git a/XpConfig/en_US/print/attributes/document b/XpConfig/en_US/print/attributes/document
new file mode 100644
index 000000000..253c46bce
--- /dev/null
+++ b/XpConfig/en_US/print/attributes/document
@@ -0,0 +1,13 @@
+# $Xorg: document,v 1.2 2002/11/30 22:10:03 gisburn Exp $
+# Document DPA-Object initial attribute values for en_US(-like) locales
+#
+# Note that the defaults (for all locales) are set in
+# ${XPCONFIGDIR}/C/print/attributes/document
+# Values in ${XPCONFIGDIR}/${LANG}/print/attributes/document are used to
+# set/override these defaults for a specific locale on demand
+
+# US and some other countries use US-Letter as default paper size
+# ("C"-locale default is "ISO-A4")
+*default-medium: na-letter
+
+# EOF.
diff --git a/Xprint/AttrValid.c b/Xprint/AttrValid.c
index 83d6b9674..86bfd14e5 100644
--- a/Xprint/AttrValid.c
+++ b/Xprint/AttrValid.c
@@ -30,8 +30,6 @@ not be used in advertising or otherwise to promote the sale, use or other
 dealings in this Software without prior written authorization from said
 copyright holders.
 */
-/* $XFree86: xc/programs/Xserver/Xprint/AttrValid.c,v 1.5 2001/12/21 21:02:04 dawes Exp $ */
-
 #include <scrnintstr.h>
 
 #include "attributes.h"
@@ -46,7 +44,7 @@ static XpOidMediumDiscreteSizeList DefaultMediumSizeList = {
     &DefaultMediumSize, 1
 };
 static XpOidMediumSourceSize DefaultMediumSourceSize = {
-    xpoid_unspecified, XpOidMediumSS_DISCRETE, { &DefaultMediumSizeList }
+    xpoid_unspecified, XpOidMediumSS_DISCRETE, &DefaultMediumSizeList
 };
 static XpOidMediumSS DefaultMediumSS = {
     &DefaultMediumSourceSize, 1
@@ -298,7 +296,7 @@ XpPutMediumSSAttr(XpContextPtr pContext,
 }
 
 const XpOidMediumSS*
-XpGetDefaultMediumSS(void)
+XpGetDefaultMediumSS()
 {
     return &DefaultMediumSS;
 }
diff --git a/Xprint/AttrValid.h b/Xprint/AttrValid.h
index 87ab48b69..8e27ae01a 100644
--- a/Xprint/AttrValid.h
+++ b/Xprint/AttrValid.h
@@ -30,7 +30,6 @@ not be used in advertising or otherwise to promote the sale, use or other
 dealings in this Software without prior written authorization from said
 copyright holders.
 */
-/* $XFree86: xc/programs/Xserver/Xprint/AttrValid.h,v 1.7 2001/12/21 21:02:04 dawes Exp $ */
 
 #ifndef _Xp_AttrValid_h
 #define _Xp_AttrValid_h
@@ -85,7 +84,7 @@ typedef struct
 #define XpPutStringAttr(pContext, pool, oid, value) \
     XpPutOneAttribute(pContext, pool, XpOidString(oid), value)
 
-#ifdef _XP_PRINT_SERVER_	/* needed for XpContextPtr in Printstr.h */
+#ifdef _XP_PRINT_SERVER_       /* needed for XpContextPtr in Printstr.h */
 
 /*
  * XpOid-valued attribute access
@@ -179,7 +178,7 @@ void XpPutMediumSSAttr(XpContextPtr pContext,
 		       XPAttributes pool,
 		       XpOid oid,
 		       const XpOidMediumSS* msss);
-const XpOidMediumSS* XpGetDefaultMediumSS(void);
+const XpOidMediumSS* XpGetDefaultMediumSS();
 
 /*
  * XpOidTrayMediumList-valued attribute access
@@ -193,15 +192,12 @@ void XpPutTrayMediumListAttr(XpContextPtr pContext,
 			     XPAttributes pool,
 			     XpOid oid,
 			     const XpOidTrayMediumList* tm);
-BOOL XpOidTrayMediumListHasTray(const XpOidTrayMediumList* list, XpOid tray);
-
 /*
  * Attribute pool validation
  */
 void XpValidateAttributePool(XpContextPtr pContext,
 			     XPAttributes pool,
 			     const XpValidatePoolsRec* vpr);
-void XpValidateNotificationProfile(XpContextPtr pContext);
 void XpValidatePrinterPool(XpContextPtr pContext,
 			   const XpValidatePoolsRec* vpr);
 void XpValidateJobPool(XpContextPtr pContext,
@@ -210,9 +206,6 @@ void XpValidateDocumentPool(XpContextPtr pContext,
 			    const XpValidatePoolsRec* vpr);
 void XpValidatePagePool(XpContextPtr pContext,
 			const XpValidatePoolsRec* vpr);
-void XpValidatePrinterMediaAttrs(XpContextPtr pContext,
-			    const XpOidList* valid_trays,
-			    const XpOidList* valid_sizes);
 
 #endif /* _XP_PRINT_SERVER_ */
 
diff --git a/Xprint/DiPrint.h b/Xprint/DiPrint.h
index 3830c20d2..0b781f2fc 100644
--- a/Xprint/DiPrint.h
+++ b/Xprint/DiPrint.h
@@ -30,8 +30,6 @@ not be used in advertising or otherwise to promote the sale, use or other
 dealings in this Software without prior written authorization from said
 copyright holders.
 */
-/* $XFree86: xc/programs/Xserver/Xprint/DiPrint.h,v 1.4 2001/01/17 22:36:28 dawes Exp $ */
-
 /*
  * The XpDiListEntry struct is the type of each element of the array
  * handed back to the extension code to handle a GetPrinterList request.
diff --git a/Xprint/Init.c b/Xprint/Init.c
index c936f4542..d773ccf62 100644
--- a/Xprint/Init.c
+++ b/Xprint/Init.c
@@ -50,7 +50,6 @@ copyright holders.
 **    *********************************************************
 ** 
 ********************************************************************/
-/* $XFree86: xc/programs/Xserver/Xprint/Init.c,v 1.15 2003/10/29 22:11:54 tsi Exp $ */
 
 #include <unistd.h>
 #include <stdlib.h>
@@ -91,6 +90,7 @@ typedef char *XPointer;
 #include "attributes.h"
 
 #include "os.h"
+#include "spooler.h"
 
 static void GenericScreenInit(
     int index,
@@ -116,57 +116,6 @@ static Bool InitPrintDrivers(
 #define MODELDIRNAME "/models"
 #define FONTDIRNAME "/fonts"
 
-/*
- * The string LIST_QUEUES is fed to a shell to generate an ordered
- * list of available printers on the system. These string definitions
- * are taken from the file PrintSubSys.C within the code for the 
- * dtprintinfo program.
- */
-#ifdef AIXV4
-const char *LIST_QUEUES = "lsallq | grep -v '^bsh$' | sort";
-#else
-#ifdef hpux
-const char *LIST_QUEUES = "LANG=C lpstat -v | "
-                            "awk '"
-                            " $2 == \"for\" "
-                            "   { "
-                            "      x = match($3, /:/); "
-                            "      print substr($3, 1, x-1)"
-                            "   }' | sort";
-#else
-#ifdef __osf__
-  const char *LIST_QUEUES = "LANG=C lpstat -v | "
-                            "nawk '"
-                            " $2 == \"for\"    "
-                            "   { print $4 }' "
-                            "   | sort";
-#else
-#ifdef __uxp__
-const char *LIST_QUEUES = "LANG=C lpstat -v | "
-                            "nawk '"
-                            " $4 == \"for\" "
-                            "   { "
-                            "      x = match($5, /:/); "
-                            "      print substr($5, 1, x-1)"
-                            "   }' | sort";
-#else
-#if defined(CSRG_BASED) || defined(linux) || defined(ISC) || defined(__GNUC__)
-const char *LIST_QUEUES = "LANG=C lpc status | grep -v '^\t' | "
-                            "sed -e /:/s/// | sort";
-#else
-const char *LIST_QUEUES = "LANG=C lpstat -v | "
-                            "nawk '"
-                            " $2 == \"for\" "
-                            "   { "
-                            "      x = match($3, /:/); "
-                            "      print substr($3, 1, x-1)"
-                            "   }' | sort";
-#endif
-#endif
-#endif
-#endif
-#endif
-
 #ifdef XPRASTERDDX
 
 static
@@ -183,9 +132,9 @@ PixmapFormatRec	RasterPixmapFormats[] = {
 
 static
 PixmapFormatRec	ColorPclPixmapFormats[] = {
-    { 1, 1, BITMAP_SCANLINE_PAD },
-    { 8, 8, BITMAP_SCANLINE_PAD },
-    { 24,32, BITMAP_SCANLINE_PAD }
+    {  1,  1, BITMAP_SCANLINE_PAD },
+    {  8,  8, BITMAP_SCANLINE_PAD },
+    { 24, 32, BITMAP_SCANLINE_PAD }
 };
 
 #define NUMCPCLFORMATS	(sizeof ColorPclPixmapFormats)/(sizeof ColorPclPixmapFormats[0])
@@ -211,9 +160,9 @@ PixmapFormatRec	MonoPclPixmapFormats[] = {
 
 static
 PixmapFormatRec	PSPixmapFormats[] = {
-    { 1, 1, BITMAP_SCANLINE_PAD },
-    { 8, 8, BITMAP_SCANLINE_PAD },
-    { 24,32, BITMAP_SCANLINE_PAD }
+    {  1,  1, BITMAP_SCANLINE_PAD },
+    {  8,  8, BITMAP_SCANLINE_PAD },
+    { 24, 32, BITMAP_SCANLINE_PAD }
 };
 
 #define NUMPSFORMATS	(sizeof PSPixmapFormats)/(sizeof PSPixmapFormats[0])
@@ -325,10 +274,64 @@ typedef struct _driverMapping {
     int screenNum;
 } DriverMapEntry, *DriverMapPtr;
 
+static const char configFilePath[] =
+"/etc/dt/config/print:/usr/dt/config/print";
+
+static const char printServerConfigDir[] = "XPSERVERCONFIGDIR";
+
+static int printScreenPrivIndex,
+	   printWindowPrivIndex,
+	   printGCPrivIndex;
+static unsigned long printGeneration = 0;
 static char *configFileName = (char *)NULL;
 static Bool freeDefaultFontPath = FALSE;
 static char *origFontPath = (char *)NULL;
 
+static Bool xprintInitGlobalsCalled = FALSE;
+/*
+ * This function is responsible for doing initalisation of any global
+ * variables at an very early point of server startup (even before
+ * |ProcessCommandLine()|. 
+ */
+void XprintInitGlobals(void)
+{
+    xprintInitGlobalsCalled = TRUE;
+
+#ifdef SMART_SCHEDULE
+    /* Somehow the XF86 "smart scheduler" completely kills the Xprint DDX 
+     * (see http://xprint.freedesktop.org/cgi-bin/bugzilla/show_bug.cgi?id=467
+     * ("Xfree86's "smart scheduler" breaks Xprt") */
+    SmartScheduleDisable = TRUE;
+#endif /* SMART_SCHEDULE */
+}
+
+/*
+ * XprintUseMsg() prints usage for the Xprint-specific options
+ */
+void XprintUseMsg()
+{
+    XpSpoolerTypePtr curr = xpstm;
+
+    /* Option '-XpFile' */
+    ErrorF("-XpFile file           specifies an alternate `Xprinters' file, rather\n");
+    ErrorF("                       than the default one (e.g.\n");
+    ErrorF("                       `${XPCONFIGDIR}/${LANG}/print/Xprinters') or\n");
+    ErrorF("                       `${XPCONFIGDIR}/C/print/Xprinters'.\n");
+    
+    /* Option '-XpSpoolerType' */
+    ErrorF("-XpSpoolerType string  specifies a spooler type.\n");
+    ErrorF("                       Supported values are:\n");
+  
+    while( curr->name != NULL )
+    {
+        ErrorF("                       - '%s'\n", curr->name);       
+        curr++;
+    }
+    ErrorF("                       (multiple values can be specified, seperated by ':',\n");
+    ErrorF("                       the first active spooler will be chosen).\n");
+    ErrorF("                       default is '%s'.\n", XPDEFAULTSPOOLERNAMELIST);
+}
+
 /*
  * XprintOptions checks argv[i] to see if it is our command line
  * option specifying a configuration file name.  It returns the index
@@ -340,6 +343,7 @@ XprintOptions(
     char **argv,
     int i)
 {
+    extern void ddxUseMsg();
     if(strcmp(argv[i], "-XpFile") == 0)
     {
 	if ((i + 1) >= argc) {
@@ -349,8 +353,19 @@ XprintOptions(
 	configFileName = argv[i + 1];
 	return i + 2;
     }
+    else if(strcmp(argv[i], "-XpSpoolerType") == 0)
+    {
+	if ((i + 1) >= argc) {
+	    ddxUseMsg ();
+	    return i + 2;
+	}
+        XpSetSpoolerTypeNameList(argv[i + 1]);
+	return i + 2;
+    }
     else
+    {
 	return i;
+    }
 }
 
 /************************************************************
@@ -417,7 +432,7 @@ FreePrinterDb(void)
 {
     PrinterDbPtr pCurEntry, pNextEntry;
 
-    for(pCurEntry = printerDb, pNextEntry = 0;
+    for(pCurEntry = printerDb, pNextEntry = (PrinterDbPtr)NULL; 
 	pCurEntry != (PrinterDbPtr)NULL; pCurEntry = pNextEntry)
     {
 	pNextEntry = pCurEntry->next;
@@ -429,7 +444,7 @@ FreePrinterDb(void)
 	 */
 	xfree(pCurEntry);
     }
-    printerDb = 0;
+    printerDb = (PrinterDbPtr)NULL;
 }
 
 /*
@@ -460,11 +475,12 @@ AddPrinterDbName(char *name)
     return TRUE;
 }
 
-static void
+static int
 AugmentPrinterDb(const char *command)
 {
     FILE *fp;
     char name[256];
+    int  num_printers = 0; /* Number of printers we found */
 
     fp = popen(command, "r");
     /* XXX is a 256 character limit overly restrictive for printer names? */
@@ -472,8 +488,10 @@ AugmentPrinterDb(const char *command)
     {
         name[strlen(name) - 1] = (char)'\0'; /* strip the \n */
         AddPrinterDbName(name);
+        num_printers++;
     }
     pclose(fp);
+    return num_printers;
 }
 
 /*
@@ -592,7 +610,7 @@ StoreDriverNames(void)
 							  "xp-ddx-identifier");
 	if(pEntry->driverName == (char *)NULL || 
 	   strlen(pEntry->driverName) == 0 ||
-	   GetInitFunc(pEntry->driverName) == 0)
+	   GetInitFunc(pEntry->driverName) == (Bool(*)())NULL)
 	{
 	    if (pEntry->driverName && (strlen(pEntry->driverName) != 0)) {
 	        ErrorF("Xp Extension: Can't load driver %s\n", 
@@ -650,7 +668,7 @@ GetConfigFileName(void)
     /*
      * Check for a LANG-specific file.
      */
-    if ((dirName = XpGetConfigDir(TRUE)) != 0)
+    if(dirName = XpGetConfigDir(TRUE))
     {
         filePath = (char *)xalloc(strlen(dirName) +
 				  strlen(XPRINTERSFILENAME) + 2);
@@ -669,7 +687,7 @@ GetConfigFileName(void)
 	xfree(filePath);
     }
 
-    if ((dirName = XpGetConfigDir(FALSE)) != 0)
+    if(dirName = XpGetConfigDir(FALSE))
     {
 	filePath = (char *)xalloc(strlen(dirName) +
 				  strlen(XPRINTERSFILENAME) + 2);
@@ -701,6 +719,7 @@ GetConfigFileName(void)
 static PrinterDbPtr
 BuildPrinterDb(void)
 {
+    char *printerList, *augmentCmd = (char *)NULL;
     Bool defaultAugment = TRUE, freeConfigFileName;
 
     if(configFileName && access(configFileName, R_OK) != 0)
@@ -727,7 +746,7 @@ BuildPrinterDb(void)
 		{
 		    while((tok = strtok((char *)NULL, " \t")) != (char *)NULL)
 		    {
-		        if ((ptr = MbStrchr(tok, '\012')) != 0)
+		        if(ptr = MbStrchr(tok, '\012'))
 		            *ptr = (char)'\0';
 			AddPrinterDbName(tok);
 		    }
@@ -768,7 +787,43 @@ BuildPrinterDb(void)
 
     if(defaultAugment == TRUE)
     {
-	AugmentPrinterDb(LIST_QUEUES);
+        XpSpoolerTypePtr curr_spooler_type;   /* spooler we are currently probing for queues */
+        int              num_printers_found;  /* number of printers found by |AugmentPrinterDb()| */
+        char            *tok_lasts;           /* strtok_r() position token */
+        char            *spnamelist;          /* list of spooler names, seperated by ":" */
+        char            *spname;              /* spooler name */
+        
+        spnamelist = strdup(XpGetSpoolerTypeNameList()); /* strtok_r() modifies string so dup' it first */
+        
+        for( spname = strtok_r(spnamelist, ":", &tok_lasts) ;
+             spname != NULL ;
+             spname = strtok_r(NULL, ":", &tok_lasts) )
+        {
+            curr_spooler_type = XpSpoolerNameToXpSpoolerType(spname);
+            if(!curr_spooler_type)
+            {
+                FatalError("BuildPrinterDb: No spooler type entry found for '%s'.\n", spname);
+            }
+            
+            if(curr_spooler_type->list_queues_command == NULL ||
+               strlen(curr_spooler_type->list_queues_command) == 0)
+            {
+                continue;
+            }
+        
+            num_printers_found = AugmentPrinterDb(curr_spooler_type->list_queues_command);
+            /* Did we found a spooler which works ? */
+            if(num_printers_found > 0)
+            {
+                spooler_type = curr_spooler_type;
+#ifdef DEBUG_gisburn
+                fprintf(stderr, "BuildPrinterDb: using '%s'.\n", spooler_type->name);
+#endif /* DEBUG_gisburn */
+                break;
+            }
+        }
+        
+        free(spnamelist);
     }
 
     MergeNameMap();
@@ -951,7 +1006,7 @@ FindFontDir(
         return (char *)NULL;
     
     configDir = XpGetConfigDir(TRUE);
-    if ((fontDir = ValidateFontDir(configDir, modelName)) != 0)
+    if(fontDir = ValidateFontDir(configDir, modelName))
     {
 	xfree(configDir);
 	return fontDir;
@@ -1013,8 +1068,8 @@ AddToFontPath(
 static void
 AugmentFontPath(void)
 {
-    char *modelID, **allIDs = (char **)NULL;
-    PrinterDbPtr pDbEntry;
+    char *newPath, *modelID, **allIDs = (char **)NULL;
+    PrinterDbPtr pDb, pDbEntry;
     int numModels, i;
 
     if(!origFontPath)
@@ -1072,7 +1127,7 @@ AugmentFontPath(void)
     for(i = 0; allIDs != (char **)NULL && allIDs[i] != (char *)NULL; i ++)
     {
 	char *fontDir;
-	if ((fontDir = FindFontDir(allIDs[i])) != 0)
+	if(fontDir = FindFontDir(allIDs[i]))
 	{
 	    AddToFontPath(fontDir);
 	    xfree(fontDir);
@@ -1162,7 +1217,7 @@ XpClientIsPrintClient(
      * fpe->name.
      */
     if(fpe->name_length < PATH_PREFIX_LEN || 
-       (strlen(fontDir) != (unsigned)(fpe->name_length - PATH_PREFIX_LEN)) ||
+       (strlen(fontDir) != (fpe->name_length - PATH_PREFIX_LEN)) ||
        strncmp(fontDir, fpe->name + PATH_PREFIX_LEN, 
 	       fpe->name_length - PATH_PREFIX_LEN))
     {
@@ -1235,6 +1290,18 @@ PrinterInitOutput(
     char **driverNames;
     char *configDir;
 
+    /* This should NEVER happen, but... */
+    if( !xprintInitGlobalsCalled )
+    {
+      FatalError("Internal error: XprintInitGlobals() not called.");
+    }
+#ifdef SMART_SCHEDULE
+    if( SmartScheduleDisable != TRUE )
+    {
+      FatalError("Internal error: XF86 smart scheduler incompatible to Xprint DDX.");
+    }
+#endif /* SMART_SCHEDULE */
+
     /* 
      * this little test is just a warning at startup to make sure
      * that the config directory exists.
@@ -1254,10 +1321,9 @@ PrinterInitOutput(
         xfree(configDir);
     }
     else {
-	ErrorF("Xp Extension: could not find config dir %s\n",
-	       configDir ? configDir : XPRINTDIR);
-
-	if (configDir) xfree(configDir);
+        /* Refuse to start when we do not have our config dir... */
+        FatalError("Xp Extension: could not find config dir %s\n",
+                   configDir ? configDir : XPRINTDIR);
     }
 
     if(printerDb != (PrinterDbPtr)NULL)
@@ -1414,7 +1480,7 @@ InitPrintDrivers(
 	    }
 	    if(callInit == TRUE)
 	    {
-	        pBFunc initFunc;
+	        Bool (*initFunc)();
 	        initFunc = GetInitFunc(pDb->driverName);
 	        if(initFunc(index, pScreen, argc, argv) == FALSE)
 	        {
@@ -1451,9 +1517,10 @@ GenericScreenInit(
      int argc,
      char **argv)
 {
+    int i;
     float fWidth, fHeight, maxWidth, maxHeight;
     unsigned short width, height;
-    PrinterDbPtr pDb;
+    PrinterDbPtr pDb, pDb2;
     int res, maxRes;
     
     /*
@@ -1477,6 +1544,7 @@ GenericScreenInit(
       {
 	if(pDb->screenNum == index)
 	{
+
 	    XpValidatePoolsRec *pValRec;
 	    pVFunc dimensionsFunc;
 
@@ -1506,6 +1574,57 @@ GenericScreenInit(
 }
 
 /*
+ * QualifyName - takes an unqualified file name such as X6printers and
+ * a colon-separated list of directory path names such as 
+ * /etc/opt/dt:/opt/dt/config.
+ * 
+ * Returns a fully qualified file path name such as /etc/opt/dt/X6printers.
+ * The returned value is malloc'd, and the caller is responsible for 
+ * freeing the associated memory.
+ */
+static char *
+QualifyName(fileName, searchPath)
+    char *fileName;
+    char *searchPath;
+{
+    char * curPath = searchPath;
+    char * nextPath;
+    char * chance;
+    FILE *pFile;
+
+    if (fileName == NULL || searchPath == NULL)
+      return NULL;
+
+    while (1) {
+      if ((nextPath = strchr(curPath, ':')) != NULL)
+        *nextPath = 0;
+  
+      chance = (char *)xalloc(strlen(curPath) + strlen(fileName) + 2);
+      sprintf(chance,"%s/%s",curPath,fileName);
+  
+      /* see if we can read from the file */
+      if((pFile = fopen(chance, "r")) != (FILE *)NULL)
+      {
+	fclose(pFile);
+        /* ... restore the colon, .... */
+        if (nextPath)
+	  *nextPath = ':';
+  
+        return chance;
+      }
+  
+      xfree(chance);
+
+      if (nextPath == NULL) /* End of path list? */
+        break;
+  
+      /* try the next path */
+      curPath = nextPath + 1;
+    }
+    return NULL;
+}
+
+/*
  * FillPrinterListEntry fills in a single XpDiListEntry element with data
  * derived from the supplied PrinterDbPtr element.
  *
@@ -1548,12 +1667,11 @@ GetPrinterListInfo(
     int localeLen,
     char *locale)
 {
-    PrinterDbPtr pDb;
+    PrinterDbPtr pDb, pDb2;
 
     for(pDb = printerDb; pDb != (PrinterDbPtr)NULL; pDb = pDb->next)
     {
-	if (strlen(pDb->name) == (unsigned)nameLen
-	&& !strncmp(pDb->name, name, nameLen))
+	if(strlen(pDb->name) == nameLen && !strncmp(pDb->name, name, nameLen))
 	{
 	    FillPrinterListEntry(pEntry, pDb, localeLen, locale);
 	    return TRUE;
@@ -1598,7 +1716,7 @@ XpDiGetPrinterList(
     if(!nameLen || name == (char *)NULL)
     {
 	int i;
-        PrinterDbPtr pDb;
+        PrinterDbPtr pDb, pDb2;
 
         for(pDb = printerDb, i = 0; pDb != (PrinterDbPtr)NULL; 
 	    pDb = pDb->next, i++)
@@ -1648,11 +1766,12 @@ WindowPtr
 XpDiValidatePrinter(char *printerName, int printerNameLen)
 {
     PrinterDbPtr pCurEntry;
+    WindowPtr pWin;
 
     for(pCurEntry = printerDb;
 	pCurEntry != (PrinterDbPtr)NULL; pCurEntry = pCurEntry->next)
     {
-        if(strlen(pCurEntry->name) == (unsigned)printerNameLen &&
+        if(strlen(pCurEntry->name) == printerNameLen &&
 	   !strncmp(pCurEntry->name, printerName, printerNameLen))
 	    return  WindowTable[pCurEntry->screenNum];
     }
@@ -1680,3 +1799,4 @@ XpDiGetDriverName(int index, char *printerName)
 
     return (char *)NULL; /* XXX Should we supply a default driverName? */
 }
+
diff --git a/Xprint/Oid.c b/Xprint/Oid.c
index 4c23a6e09..32be3efb1 100644
--- a/Xprint/Oid.c
+++ b/Xprint/Oid.c
@@ -30,7 +30,6 @@ not be used in advertising or otherwise to promote the sale, use or other
 dealings in this Software without prior written authorization from said
 copyright holders.
 */
-/* $XFree86: xc/programs/Xserver/Xprint/Oid.c,v 1.6 2003/10/29 22:11:54 tsi Exp $ */
 
 #include "attributes.h"
 
@@ -274,7 +273,7 @@ XpOidParse(const char* value_string,
      */
     if(ptr_return != (const char**)NULL)
 	*ptr_return = ptr+length;
-    return (XpOid)i;
+    return i;
 }
 
 /*
@@ -751,7 +750,7 @@ XpOidLinkedListFirstOid(XpOidLinkedList* me)
 XpOid
 XpOidLinkedListNextOid(XpOidLinkedList* me)
 {
-    if(me->current ? (me->current = me->current->next) != 0 : xFalse)
+    if(me->current ? me->current = me->current->next : xFalse)
 	return me->current->oid;
     else
 	return xpoid_none;
@@ -1652,6 +1651,8 @@ TrayMediumListValidate(XpOidTrayMediumList* me,
 		       const XpOidMediumSS* msss)
 {
     int i_mss, i_ds, i_itm;
+    XpOidMediumDiscreteSizeList* ds_list;
+    int tray_count;
     XpOid current_tray, current_medium;
     XpOidMediumDiscreteSizeList* unspecified_tray_ds;
     XpOidMediumDiscreteSizeList* tray_ds;
@@ -1711,7 +1712,6 @@ TrayMediumListValidate(XpOidTrayMediumList* me,
 	 * list
 	 */
 	if(tray_ds == (XpOidMediumDiscreteSizeList*)NULL)
-	{
 	    if(unspecified_tray_ds == (XpOidMediumDiscreteSizeList*)NULL)
 	    {
 		/*
@@ -1722,10 +1722,7 @@ TrayMediumListValidate(XpOidTrayMediumList* me,
 		continue;
 	    }
 	    else
-	    {
 		tray_ds = unspecified_tray_ds;
-	    }
-	}
 	/*
 	 * loop through the discrete sizes list, looking for a size that
 	 * matches the medium for the current input tray
@@ -2107,13 +2104,15 @@ const char* XpOidNotifyString(XpOidNotify notify)
 {
     switch(notify)
     {
-    default:
     case XPOID_NOTIFY_UNSUPPORTED:
 	return (const char*)NULL;
+	break;
     case XPOID_NOTIFY_NONE:
 	return NOTIFY_NONE_STR;
+	break;
     case XPOID_NOTIFY_EMAIL:
 	return NOTIFY_EMAIL_STR;
+	break;
     }
 }
 
@@ -2238,7 +2237,7 @@ XpOidDocFmtNext(XpOidDocFmt* doc_fmt,
     const char* first_nonws_ptr;
     const char* format;
     const char* variant;
-    const char* version = 0;
+    const char* version;
     int format_len;
     int variant_len;
     int version_len;
@@ -2551,12 +2550,10 @@ XpOidDocFmtListHasFmt(const XpOidDocFmtList* list,
 	     * variants must both be NULL or match
 	     */
 	    if(fmt->variant == (char*)NULL)
-	    {
 		if(list->list[i].variant == (char*)NULL)
 		    return xTrue;
 		else
 		    continue;
-	    }
 	    if(list->list[i].variant == (char*)NULL)
 		continue;
 	    if(strcmp(fmt->variant, list->list[i].variant) != 0)
@@ -2565,12 +2562,10 @@ XpOidDocFmtListHasFmt(const XpOidDocFmtList* list,
 	     * versions must both be NULL or match
 	     */
 	    if(fmt->version == (char*)NULL)
-	    {
 		if(list->list[i].version == (char*)NULL)
 		    return xTrue;
 		else
 		    continue;
-	    }
 	    if(list->list[i].version == (char*)NULL)
 		continue;
 	    if(strcmp(fmt->version, list->list[i].version) == 0)
diff --git a/Xprint/Oid.h b/Xprint/Oid.h
index c5574b06e..70bd8d3e5 100644
--- a/Xprint/Oid.h
+++ b/Xprint/Oid.h
@@ -30,7 +30,6 @@ not be used in advertising or otherwise to promote the sale, use or other
 dealings in this Software without prior written authorization from said
 copyright holders.
 */
-/* $XFree86: xc/programs/Xserver/Xprint/Oid.h,v 1.4 2001/01/17 22:36:28 dawes Exp $ */
 
 #ifndef _Xp_Oid_h
 #define _Xp_Oid_h
@@ -206,7 +205,7 @@ char* XpOidListString(const XpOidList*);
 /*
  * XpOidLinkedList public methods
  */
-XpOidLinkedList* XpOidLinkedListNew(void);
+XpOidLinkedList* XpOidLinkedListNew();
 void XpOidLinkedListDelete(XpOidLinkedList*);
 #define XpOidLinkedListCount(l) ((l) ? (l)->count : 0)
 XpOid XpOidLinkedListGetOid(XpOidLinkedList* list, int i);
diff --git a/Xprint/OidDefs.h b/Xprint/OidDefs.h
index 03e530cb2..55b6568f0 100644
--- a/Xprint/OidDefs.h
+++ b/Xprint/OidDefs.h
@@ -133,6 +133,14 @@ typedef enum {
     xpoid_val_medium_size_jis_b8,
     xpoid_val_medium_size_jis_b9,
     xpoid_val_medium_size_jis_b10,
+    xpoid_val_medium_size_hp_2x_postcard,
+    xpoid_val_medium_size_hp_european_edp,
+    xpoid_val_medium_size_hp_mini,
+    xpoid_val_medium_size_hp_postcard,
+    xpoid_val_medium_size_hp_tabloid,
+    xpoid_val_medium_size_hp_us_edp,
+    xpoid_val_medium_size_hp_us_government_legal,
+    xpoid_val_medium_size_hp_us_government_letter,
     xpoid_val_plex_simplex,
     xpoid_val_plex_duplex,
     xpoid_val_plex_tumble,
diff --git a/Xprint/OidStrs.h b/Xprint/OidStrs.h
index 3aab300dc..1792a6e16 100644
--- a/Xprint/OidStrs.h
+++ b/Xprint/OidStrs.h
@@ -30,140 +30,144 @@ not be used in advertising or otherwise to promote the sale, use or other
 dealings in this Software without prior written authorization from said
 copyright holders.
 */
-/* $XFree86: xc/programs/Xserver/Xprint/OidStrs.h,v 1.5 2001/12/21 21:02:05 dawes Exp $ */
+/* This is an automatically-generated file. Do not edit. */
 
 static int XpOidStringMapCount = 127;
 
-#define OIDATA(name) { name, sizeof(name)-1, 0, 0, 0 }
-
 static const XpOidStringMapEntry XpOidStringMap[] = {
-    OIDATA(""),
-    OIDATA(""),
-    OIDATA("descriptor"),
-    OIDATA("content-orientation"),
-    OIDATA("copy-count"),
-    OIDATA("default-printer-resolution"),
-    OIDATA("default-input-tray"),
-    OIDATA("default-medium"),
-    OIDATA("document-format"),
-    OIDATA("plex"),
-    OIDATA("xp-listfonts-modes"),
-    OIDATA("job-name"),
-    OIDATA("job-owner"),
-    OIDATA("notification-profile"),
-    OIDATA("xp-setup-state"),
-    OIDATA("xp-spooler-command-options"),
-    OIDATA("content-orientations-supported"),
-    OIDATA("document-formats-supported"),
-    OIDATA("dt-pdm-command"),
-    OIDATA("input-trays-medium"),
-    OIDATA("medium-source-sizes-supported"),
-    OIDATA("plexes-supported"),
-    OIDATA("printer-model"),
-    OIDATA("printer-name"),
-    OIDATA("printer-resolutions-supported"),
-    OIDATA("xp-embedded-formats-supported"),
-    OIDATA("xp-listfonts-modes-supported"),
-    OIDATA("xp-page-attributes-supported"),
-    OIDATA("xp-raw-formats-supported"),
-    OIDATA("xp-setup-proviso"),
-    OIDATA("document-attributes-supported"),
-    OIDATA("job-attributes-supported"),
-    OIDATA("locale"),
-    OIDATA("multiple-documents-supported"),
-    OIDATA("available-compression"),
-    OIDATA("available-compressions-supported"),
-    OIDATA("portrait"),
-    OIDATA("landscape"),
-    OIDATA("reverse-portrait"),
-    OIDATA("reverse-landscape"),
-    OIDATA("iso-a0"),
-    OIDATA("iso-a1"),
-    OIDATA("iso-a2"),
-    OIDATA("iso-a3"),
-    OIDATA("iso-a4"),
-    OIDATA("iso-a5"),
-    OIDATA("iso-a6"),
-    OIDATA("iso-a7"),
-    OIDATA("iso-a8"),
-    OIDATA("iso-a9"),
-    OIDATA("iso-a10"),
-    OIDATA("iso-b0"),
-    OIDATA("iso-b1"),
-    OIDATA("iso-b2"),
-    OIDATA("iso-b3"),
-    OIDATA("iso-b4"),
-    OIDATA("iso-b5"),
-    OIDATA("iso-b6"),
-    OIDATA("iso-b7"),
-    OIDATA("iso-b8"),
-    OIDATA("iso-b9"),
-    OIDATA("iso-b10"),
-    OIDATA("na-letter"),
-    OIDATA("na-legal"),
-    OIDATA("executive"),
-    OIDATA("folio"),
-    OIDATA("invoice"),
-    OIDATA("ledger"),
-    OIDATA("quarto"),
-    OIDATA("iso-c3"),
-    OIDATA("iso-c4"),
-    OIDATA("iso-c5"),
-    OIDATA("iso-c6"),
-    OIDATA("iso-designated-long"),
-    OIDATA("na-10x13-envelope"),
-    OIDATA("na-9x12-envelope"),
-    OIDATA("na-number-10-envelope"),
-    OIDATA("na-7x9-envelope"),
-    OIDATA("na-9x11-envelope"),
-    OIDATA("na-10x14-envelope"),
-    OIDATA("na-number-9-envelope"),
-    OIDATA("na-6x9-envelope"),
-    OIDATA("na-10x15-envelope"),
-    OIDATA("monarch-envelope"),
-    OIDATA("a"),
-    OIDATA("b"),
-    OIDATA("c"),
-    OIDATA("d"),
-    OIDATA("e"),
-    OIDATA("jis-b0"),
-    OIDATA("jis-b1"),
-    OIDATA("jis-b2"),
-    OIDATA("jis-b3"),
-    OIDATA("jis-b4"),
-    OIDATA("jis-b5"),
-    OIDATA("jis-b6"),
-    OIDATA("jis-b7"),
-    OIDATA("jis-b8"),
-    OIDATA("jis-b9"),
-    OIDATA("jis-b10"),
-    OIDATA("simplex"),
-    OIDATA("duplex"),
-    OIDATA("tumble"),
-    OIDATA("top"),
-    OIDATA("middle"),
-    OIDATA("bottom"),
-    OIDATA("envelope"),
-    OIDATA("manual"),
-    OIDATA("large-capacity"),
-    OIDATA("main"),
-    OIDATA("side"),
-    OIDATA("event-report-job-completed"),
-    OIDATA("electronic-mail"),
-    OIDATA("xp-setup-mandatory"),
-    OIDATA("xp-setup-optional"),
-    OIDATA("xp-setup-ok"),
-    OIDATA("xp-setup-incomplete"),
-    OIDATA("xp-list-glyph-fonts"),
-    OIDATA("xp-list-internal-printer-fonts"),
-    OIDATA("0"),
-    OIDATA("01"),
-    OIDATA("02"),
-    OIDATA("03"),
-    OIDATA("012"),
-    OIDATA("013"),
-    OIDATA("023"),
-    OIDATA("0123")
+    { "", 0 },
+    { "", 0 },
+    { "descriptor", 10 },
+    { "content-orientation", 19 },
+    { "copy-count", 10 },
+    { "default-printer-resolution", 26 },
+    { "default-input-tray", 18 },
+    { "default-medium", 14 },
+    { "document-format", 15 },
+    { "plex", 4 },
+    { "xp-listfonts-modes", 18 },
+    { "job-name", 8 },
+    { "job-owner", 9 },
+    { "notification-profile", 20 },
+    { "xp-setup-state", 14 },
+    { "xp-spooler-command-options", 26 },
+    { "content-orientations-supported", 30 },
+    { "document-formats-supported", 26 },
+    { "dt-pdm-command", 14 },
+    { "input-trays-medium", 18 },
+    { "medium-source-sizes-supported", 29 },
+    { "plexes-supported", 16 },
+    { "printer-model", 13 },
+    { "printer-name", 12 },
+    { "printer-resolutions-supported", 29 },
+    { "xp-embedded-formats-supported", 29 },
+    { "xp-listfonts-modes-supported", 28 },
+    { "xp-page-attributes-supported", 28 },
+    { "xp-raw-formats-supported", 24 },
+    { "xp-setup-proviso", 16 },
+    { "document-attributes-supported", 29 },
+    { "job-attributes-supported", 24 },
+    { "locale", 6 },
+    { "multiple-documents-supported", 28 },
+    { "available-compression", 21 },
+    { "available-compressions-supported", 32 },
+    { "portrait", 8 },
+    { "landscape", 9 },
+    { "reverse-portrait", 16 },
+    { "reverse-landscape", 17 },
+    { "iso-a0", 6 },
+    { "iso-a1", 6 },
+    { "iso-a2", 6 },
+    { "iso-a3", 6 },
+    { "iso-a4", 6 },
+    { "iso-a5", 6 },
+    { "iso-a6", 6 },
+    { "iso-a7", 6 },
+    { "iso-a8", 6 },
+    { "iso-a9", 6 },
+    { "iso-a10", 7 },
+    { "iso-b0", 6 },
+    { "iso-b1", 6 },
+    { "iso-b2", 6 },
+    { "iso-b3", 6 },
+    { "iso-b4", 6 },
+    { "iso-b5", 6 },
+    { "iso-b6", 6 },
+    { "iso-b7", 6 },
+    { "iso-b8", 6 },
+    { "iso-b9", 6 },
+    { "iso-b10", 7 },
+    { "na-letter", 9 },
+    { "na-legal", 8 },
+    { "executive", 9 },
+    { "folio", 5 },
+    { "invoice", 7 },
+    { "ledger", 6 },
+    { "quarto", 6 },
+    { "iso-c3", 6 },
+    { "iso-c4", 6 },
+    { "iso-c5", 6 },
+    { "iso-c6", 6 },
+    { "iso-designated-long", 19 },
+    { "na-10x13-envelope", 17 },
+    { "na-9x12-envelope", 16 },
+    { "na-number-10-envelope", 21 },
+    { "na-7x9-envelope", 15 },
+    { "na-9x11-envelope", 16 },
+    { "na-10x14-envelope", 17 },
+    { "na-number-9-envelope", 20 },
+    { "na-6x9-envelope", 15 },
+    { "na-10x15-envelope", 17 },
+    { "monarch-envelope", 16 },
+    { "a", 1 },
+    { "b", 1 },
+    { "c", 1 },
+    { "d", 1 },
+    { "e", 1 },
+    { "jis-b0", 6 },
+    { "jis-b1", 6 },
+    { "jis-b2", 6 },
+    { "jis-b3", 6 },
+    { "jis-b4", 6 },
+    { "jis-b5", 6 },
+    { "jis-b6", 6 },
+    { "jis-b7", 6 },
+    { "jis-b8", 6 },
+    { "jis-b9", 6 },
+    { "jis-b10", 7 },
+    { "hp-2x-postcard", 14 },
+    { "hp-european-edp", 15 },
+    { "hp-mini", 7 },
+    { "hp-postcard", 11 },
+    { "hp-tabloid", 10 },
+    { "hp-us-edp", 9 },
+    { "hp-us-government-legal", 22 },
+    { "hp-us-government-letter", 23 },
+    { "simplex", 7 },
+    { "duplex", 6 },
+    { "tumble", 6 },
+    { "top", 3 },
+    { "middle", 6 },
+    { "bottom", 6 },
+    { "envelope", 8 },
+    { "manual", 6 },
+    { "large-capacity", 14 },
+    { "main", 4 },
+    { "side", 4 },
+    { "event-report-job-completed", 26 },
+    { "electronic-mail", 15 },
+    { "xp-setup-mandatory", 18 },
+    { "xp-setup-optional", 17 },
+    { "xp-setup-ok", 11 },
+    { "xp-setup-incomplete", 19 },
+    { "xp-list-glyph-fonts", 19 },
+    { "xp-list-internal-printer-fonts", 30 },
+    { "0", 1 },
+    { "01", 2 },
+    { "02", 2 },
+    { "03", 2 },
+    { "012", 3 },
+    { "013", 3 },
+    { "023", 3 },
+    { "0123", 4 }
 };
-
-#undef OIDATA
diff --git a/Xprint/Util.c b/Xprint/Util.c
index 9e0bdf925..1f4a14666 100644
--- a/Xprint/Util.c
+++ b/Xprint/Util.c
@@ -30,7 +30,7 @@ not be used in advertising or otherwise to promote the sale, use or other
 dealings in this Software without prior written authorization from said
 copyright holders.
 */
-/* $XFree86: xc/programs/Xserver/Xprint/Util.c,v 1.13 2001/10/31 22:50:28 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/Xprint/Util.c,v 1.12 2001/08/01 00:44:45 tsi Exp $ */
 
 /* To get the tempnam() prototype in <stdio.h> */
 #if defined(linux) && defined(__STRICT_ANSI__)
diff --git a/Xprint/ValTree.c b/Xprint/ValTree.c
index 327cb468c..983e5c1c4 100644
--- a/Xprint/ValTree.c
+++ b/Xprint/ValTree.c
@@ -30,7 +30,7 @@ not be used in advertising or otherwise to promote the sale, use or other
 dealings in this Software without prior written authorization from said
 copyright holders.
 */
-/* $XFree86: xc/programs/Xserver/Xprint/ValTree.c,v 1.2 2003/11/10 18:21:44 tsi Exp $ */
+/* $XFree86$ */
 
 #include    "X.h"
 #include    "scrnintstr.h"
diff --git a/Xprint/attributes.c b/Xprint/attributes.c
index e1fce8cb3..d02c54e37 100644
--- a/Xprint/attributes.c
+++ b/Xprint/attributes.c
@@ -44,18 +44,15 @@ copyright holders.
 **    *********************************************************
 ** 
 ********************************************************************/
-/* $XFree86: xc/programs/Xserver/Xprint/attributes.c,v 1.21 2003/12/19 02:05:38 dawes Exp $ */
 
-#include <X11/Xproto.h>
+#include <Xproto.h>
 #include <string.h>
 #include <stdlib.h>
-#include <sys/types.h>
 #include <sys/wait.h>
 #include <pwd.h>
 #if (defined(sun) && defined(SVR4)) || (defined(SCO))
 #include <wchar.h>
 #endif
-
 #include "scrnintstr.h"
 
 #include <X11/extensions/Printstr.h>
@@ -66,11 +63,13 @@ copyright holders.
 #include "Xresource.h"
 #include "Xrm.c"
 
+#include "spooler.h"
+
 static XrmDatabase CopyDb(XrmDatabase inDb);
 
 extern XrmDatabase XpSpoolerGetServerAttributes(void);
 
-static unsigned long attrGeneration = 0;
+static int attrGeneration = 0;
 
 typedef struct {
     XrmDatabase *pDb;
@@ -137,6 +136,26 @@ static const char XPMODELDIR[] = "/models";
 static char NULL_STRING[] = "\0";
 
 /*
+ * XpGetConfigDirBase returns a string containing the path name of the base
+ * where the print server configuration directory is localed.
+ */
+static
+char *XpGetConfigDirBase()
+{
+    char **configDir;
+
+    /*
+     * If the XPCONFIGDIR environment variable is not set, then use the
+     * compile-time constant XPRINTDIR.  XPRINTDIR is passed in on the
+     * compile command line, and is defined in $(TOP)/config/cf/Project.tmpl.
+     */
+    if((configDir = getenv("XPCONFIGDIR")) == (char *)NULL)
+	configDir = XPRINTDIR;
+
+    return configDir;
+}
+
+/*
  * XpGetConfigDir returns a string containing the path name of the print
  * server configuration directory.  If the useLocale parameter is False
  * the it returns the path to the "/C" directory.  If the useLocale
@@ -164,13 +183,7 @@ XpGetConfigDir(Bool useLocale)
 	}
     }
     
-    /*
-     * If the XPCONFIGDIR environment variable is not set, then use the
-     * compile-time constant XPRINTDIR.  XPRINTDIR is passed in on the
-     * compile command line, and is defined in $(TOP)/config/cf/Project.tmpl.
-     */
-    if((configDir = getenv("XPCONFIGDIR")) == (char *)NULL)
-	configDir = XPRINTDIR;
+    configDir = XpGetConfigDirBase();
 
     dirName = (char *)xalloc(strlen(configDir) + strlen(XPDIR) + 
 			      strlen(langDir) + 1);
@@ -306,7 +319,7 @@ BuildPrinterAttrs(
 
     if(systemAttributes.printers != (XrmDatabase)NULL)
     {
-        char *fileName;
+        char *dirName, *fileName;
         XrmDatabase modelDB = (XrmDatabase)NULL;
         XrmName xrm_name[5], xrm_class[2];
         XrmRepresentation rep_type;
@@ -606,6 +619,7 @@ XpGetOneAttribute(
 {
     ContextAttrPtr pCtxtAttrs;
     XrmDatabase db = (XrmDatabase)NULL;
+    char *retVal;
     XrmName xrm_name[3];
     XrmRepresentation rep_type;
     XrmValue value;
@@ -669,10 +683,10 @@ XpGetOneAttribute(
  */
 void
 XpPutOneAttribute(
-	XpContextPtr pContext,
-	XPAttributes class,
-	const char* attributeName,
-	const char* value)
+       XpContextPtr pContext,
+       XPAttributes class,
+       const char* attributeName,
+       const char* value)
 {
     ContextAttrPtr pCtxtAttrs;
     XrmDatabase db;
@@ -797,7 +811,7 @@ AppendEntry(
     char *s, c;
 
     if (*type != XrmQString)
-	return False;
+	return;
 
     for (firstNameSeen = False; *quarks; bindings++, quarks++) {
         if (*bindings == XrmBindLoosely) {
@@ -856,6 +870,7 @@ XpGetAttributes(
 {
     ContextAttrPtr pCtxtAttrs;
     XrmDatabase db = (XrmDatabase)NULL;
+    char *retVal;
     StringDbStruct enumStruct;
     XrmQuark empty = NULLQUARK;
 
@@ -1064,6 +1079,34 @@ XpSpoolerGetServerAttributes(void)
 }
 
 /*
+ * ExecuteCommand takes two pointers - the command to execute,
+ * and the "argv" style NULL-terminated vector of arguments for the command.
+ * We wait for the command to terminate before continuing to ensure that
+ * we don't delete the job file before the spooler has made a copy.
+ */
+static void
+ExecCommand(pCommand, argVector)
+    char *pCommand;
+    char **argVector;
+{
+    pid_t childPid;
+    int status;
+
+    if((childPid = fork()) == 0)
+    {
+	/* return BadAlloc? */
+	if (execv(pCommand, argVector) == -1) {
+	    FatalError("unable to exec '%s'", pCommand);
+	}
+    }
+    else
+    {
+        (void) waitpid(childPid, &status, 0);
+    }
+    return;
+}
+
+/*
  * SendFileToCommand takes three character pointers - the file name,
  * the command to execute,
  * and the "argv" style NULL-terminated vector of arguments for the command.
@@ -1119,7 +1162,9 @@ SendFileToCommand(
 	 */
 	if(userName)
 	{
-	    if(geteuid() == (uid_t)0)
+	    uid_t myUid;
+
+	    if((myUid = geteuid()) == (uid_t)0)
 	    {
 	        struct passwd *pPasswd;
 
@@ -1136,6 +1181,8 @@ SendFileToCommand(
     }
     else
     {
+	int res;
+
 	(void) close(pipefd[0]);
 
  	outPipe = fdopen(pipefd[1], "w");
@@ -1155,6 +1202,7 @@ SendFileToCommand(
  * store for the supplied print context.  The ReplaceAnyString utility
  * routine is used to perform the actual replacements.
  */
+extern char *ReplaceAnyString(char *, char *, char *);
 
 static char *
 ReplaceAllKeywords(
@@ -1196,6 +1244,10 @@ ReplaceAllKeywords(
     else
         command = ReplaceAnyString(command, "%options%", "");
 
+    /* New in xprint.mozdev.org release 007 - replace "%xpconfigdir%" with
+     * location of $XPCONFIGDIR */
+    command = ReplaceAnyString(command, "%xpconfigdir%", XpGetConfigDirBase());
+
     return command;
 }
 
@@ -1366,43 +1418,58 @@ VectorizeCommand(
     char ***pVector,
     XpContextPtr pContext)
 {
-    char *cmdName;
+    char *cmdName, *curTok;
+    int i, numChars;
 
     if(command == (char *)NULL)
 	return (char *)NULL;
     
-    (void) GetToken(command, &cmdName);
+    numChars = GetToken(command, &cmdName);
 
     if(cmdName == (char *)NULL)
 	return (char *)NULL;
 
-    *pVector = BuildArgVector(command, pContext);
+    /* Mangle the command name, too... */
+    cmdName = ReplaceAllKeywords(pContext, cmdName);
 
+    if(cmdName == (char *)NULL)
+	return (char *)NULL;
+
+    *pVector = BuildArgVector(command, pContext);
+    
     return cmdName;
 }
 
-#ifdef hpux
-static char DEFAULT_SPOOL_COMMAND[] = "/usr/bin/lp -d %printer-name% -o raw -n %copy-count% -t %job-name% %options%";
-#else
-static char DEFAULT_SPOOL_COMMAND[] = "/usr/bin/lp -d %printer-name% -n %copy-count% -t %job-name% %options%";
-#endif
-
 int
-XpSubmitJob(
-     char *fileName,
-     XpContextPtr pContext)
+XpSubmitJob(fileName, pContext)
+     char *fileName;
+     XpContextPtr pContext;
 {
-    char **vector, *cmdNam, *command, *userName;
+    char **vector, *cmdNam, *cmdOpt, *command, *userName;
     int i;
 
     command = XpGetOneAttribute(pContext, XPPrinterAttr, "xp-spooler-command");
     if(command == (char *)NULL || strlen(command) == 0)
-	command = strdup(DEFAULT_SPOOL_COMMAND);
+    {
+        if( spooler_type )
+        {
+	    command = strdup(spooler_type->spool_command);
+        }
+        else
+        {
+            ErrorF("XpSubmitJob: No default spool command defined.\n");
+        }
+    }
     else
+    {
 	command = strdup(command);
+    }
     if(command == (char *)NULL)
+    {
+        ErrorF("XpSubmitJob: No spooler command found, cannot submit job.\n");
 	return BadAlloc;
-
+    }
+    
     cmdNam = VectorizeCommand(command, &vector, pContext);
     xfree(command);
 
@@ -1430,7 +1497,6 @@ XpSubmitJob(
 
     FreeVector(vector);
     xfree(cmdNam);
-    return Success;
 }
 
 /*
@@ -1503,6 +1569,7 @@ XpGetTrayMediumFromContext(XpContextPtr pCon,
 {
     char *defMedium, *defTray;
     char *t, *m;
+    char *pS, *pE, *pLast;
     
     defMedium = XpGetOneAttribute( pCon, XPPageAttr, 
 				  "default-medium" );
diff --git a/Xprint/attributes.h b/Xprint/attributes.h
index d9d551f32..c4e30d274 100644
--- a/Xprint/attributes.h
+++ b/Xprint/attributes.h
@@ -30,7 +30,6 @@ not be used in advertising or otherwise to promote the sale, use or other
 dealings in this Software without prior written authorization from said
 copyright holders.
 */
-/* $XFree86: xc/programs/Xserver/Xprint/attributes.h,v 1.6 2001/12/21 21:02:05 dawes Exp $ */
 
 #ifndef _Xp_attributes_h
 #define _Xp_attributes_h 1
@@ -49,11 +48,11 @@ typedef void (*pVFunc)(VFuncArgs);
  */
 void XpInitAttributes(XpContextPtr pContext);
 void XpBuildAttributeStore(char *printerName,
-			   char *qualifierName);
+                          char *qualifierName);
 void XpAddPrinterAttribute(char *printerName,
-			   char *printerQualifier,
-			   char *attributeName,
-			   char *attributeValue);
+                          char *printerQualifier,
+                          char *attributeName,
+                          char *attributeValue);
 void XpDestroyAttributes(XpContextPtr pContext);
 char *XpGetConfigDir(Bool useLocale);
 char *XpGetOneAttribute(XpContextPtr pContext,
@@ -98,33 +97,33 @@ void XpGetMediumDimensions(XpContextPtr pContext,
 void XpGetReproductionArea(XpContextPtr pContext,
 			   xRectangle *pRect);
 void XpGetMaxWidthHeightRes(const char *printer_name,
-			   const XpValidatePoolsRec* vpr,
-			   float *width,
-			   float *height,
-			   int* resolution);
+                          const XpValidatePoolsRec* vpr,
+                          float *width,
+                          float *height,
+                          int* resolution);
 
 /* Util.c */
-char * ReplaceAnyString(char *string, 
-			char *target, 
-			char *replacement);
-char * ReplaceFileString(char *string,
-			 char *inFileName,
-			 char *outFileName);
+char *ReplaceAnyString(char *string, 
+                       char *target, 
+                       char *replacement);
+char *ReplaceFileString(char *string,
+                        char *inFileName,
+                        char *outFileName);
 void ExecCommand(char *pCommand,
-		 char **argVector);
+                char **argVector);
 int TransferBytes(FILE *pSrcFile,
-		  FILE *pDstFile,
-		  int numBytes);
+                 FILE *pDstFile,
+                 int numBytes);
 Bool CopyContentsAndDelete(FILE **ppSrcFile,
-			   char **pSrcFileName,
-			   FILE *pDstFile);
+                          char **pSrcFileName,
+                          FILE *pDstFile);
 int XpSendDocumentData(ClientPtr client,
-		       FILE *fp,
-		       int fileLen,
-		       int maxBufSize);
+                      FILE *fp,
+                      int fileLen,
+                      int maxBufSize);
 int XpFinishDocData(ClientPtr client);
 Bool XpOpenTmpFile(char *mode,
-		   char **fname,
-		   FILE **stream);
+                  char **fname,
+                  FILE **stream);
 
 #endif /* _Xp_attributes_h */
diff --git a/Xprint/ddxInit.c b/Xprint/ddxInit.c
index 3d29fd1b1..55b73ea0b 100644
--- a/Xprint/ddxInit.c
+++ b/Xprint/ddxInit.c
@@ -30,13 +30,12 @@ not be used in advertising or otherwise to promote the sale, use or other
 dealings in this Software without prior written authorization from said
 copyright holders.
 */
-/* $XFree86: xc/programs/Xserver/Xprint/ddxInit.c,v 1.15 2003/06/23 17:35:44 eich Exp $ */
 
 #include "X.h"
+#include "Xos.h"
 #include "Xproto.h"
 #include "windowstr.h"
 #include "servermd.h"
-#include "Xos.h"
 #include "DiPrint.h"
 
 /*-
@@ -68,10 +67,13 @@ copyright holders.
 
 void 
 InitOutput(
-    ScreenInfo 	  *pScreenInfo,
-    int     	  argc,
-    char    	  **argv)
+    ScreenInfo   *pScreenInfo,
+    int          argc,
+    char         **argv)
+
 {
+    int i;
+
     pScreenInfo->imageByteOrder = IMAGE_BYTE_ORDER;
     pScreenInfo->bitmapScanlineUnit = BITMAP_SCANLINE_UNIT;
     pScreenInfo->bitmapScanlinePad = BITMAP_SCANLINE_PAD;
@@ -168,10 +170,10 @@ PointerProc(
 
 void
 InitInput(
-     int	argc,
+     int       argc,
      char **argv)
 {
-    DeviceIntPtr ptr, kbd;
+    DevicePtr ptr, kbd;
 
     ptr = AddInputDevice((DeviceProc)PointerProc, TRUE);
     kbd = AddInputDevice((DeviceProc)KeyboardProc, TRUE);
@@ -215,6 +217,7 @@ OsVendorFatalError(void)
 }
 #endif
 
+
 #ifdef DDXTIME
 CARD32
 GetTimeInMillis(void)
@@ -226,6 +229,12 @@ GetTimeInMillis(void)
 }
 #endif
 
+/* ddxInitGlobals - called by |InitGlobals| from os/util.c */
+void ddxInitGlobals(void)
+{
+    XprintInitGlobals();
+}
+
 /****************************************
 * ddxUseMsg()
 *
@@ -235,7 +244,11 @@ GetTimeInMillis(void)
 
 void ddxUseMsg(void)
 {
-	/* Right now, let's just do nothing */
+/* Enable |XprintUseMsg()| only if |XprintOptions()| is called
+ * by |ddxProcessArgument|, too (see below...) */
+#ifdef PRINT_ONLY_SERVER
+    XprintUseMsg();
+#endif /* PRINT_ONLY_SERVER */
 }
 
 void AbortDDX (void)
@@ -269,12 +282,12 @@ extern  int     BadDevice;
 
 int
 ChangePointerDevice (
-    DeviceIntPtr        old_dev,
-    DeviceIntPtr        new_dev,
-    unsigned char	x,
-    unsigned char	y)
+    DeviceIntPtr       old_dev,
+    DeviceIntPtr       new_dev,
+    unsigned char      x,
+    unsigned char      y)
 {
-    return (BadDevice);
+        return (BadDevice);
 }
 
 int
diff --git a/Xprint/etc/Xsession.d/cde_xsessiond_xprint.sh b/Xprint/etc/Xsession.d/cde_xsessiond_xprint.sh
new file mode 100644
index 000000000..3fb6bba7c
--- /dev/null
+++ b/Xprint/etc/Xsession.d/cde_xsessiond_xprint.sh
@@ -0,0 +1,30 @@
+#!/bin/sh 
+#####################################################################
+###  File:              0018.xprint
+###
+###  Default Location:  /usr/dt/config/Xsession.d/
+###
+###  Purpose:           Setup Xprint env vars
+###                     
+###  Description:       This script is invoked by means of the Xsession file
+###                     at user login. 
+###
+###  Invoked by:        /usr/dt/bin/Xsession
+###
+###  (c) Copyright 2003-2004 Roland Mainz <roland.mainz@nrubsig.org>
+###
+###  please send bugfixes or comments to http://xprint.mozdev.org/
+###
+#####################################################################
+
+
+#
+# Obtain list of Xprint servers
+#
+
+if [ -f "/etc/init.d/xprint" ] ; then
+  XPSERVERLIST="`/bin/sh /etc/init.d/xprint get_xpserverlist`"
+  export XPSERVERLIST
+fi
+
+##########################         eof       #####################
diff --git a/Xprint/etc/profile.d/xprint.csh b/Xprint/etc/profile.d/xprint.csh
new file mode 100644
index 000000000..7cc675840
--- /dev/null
+++ b/Xprint/etc/profile.d/xprint.csh
@@ -0,0 +1,16 @@
+#
+# /etc/profile.d/xprint.csh
+#
+# Copyright (c) 2002-2004 by Roland Mainz <roland.mainz@nrubsig.org>
+# please send bugfixes or comments to http://xprint.mozdev.org/
+
+
+#
+# Obtain list of Xprint servers
+#
+
+if ( -f /etc/init.d/xprint ) then
+  setenv XPSERVERLIST "`/bin/sh /etc/init.d/xprint get_xpserverlist`"
+endif
+
+# /etc/profile.d/xprint.csh ends here.
diff --git a/Xprint/etc/profile.d/xprint.sh b/Xprint/etc/profile.d/xprint.sh
new file mode 100644
index 000000000..b5b46c1e7
--- /dev/null
+++ b/Xprint/etc/profile.d/xprint.sh
@@ -0,0 +1,16 @@
+#
+# /etc/profile.d/xprint.sh
+#
+# Copyright (c) 2002-2004 by Roland Mainz <roland.mainz@nrubsig.org>
+# please send bugfixes or comments to http://xprint.mozdev.org/
+
+#
+# Obtain list of Xprint servers
+#
+
+if [ -f "/etc/init.d/xprint" ] ; then
+  XPSERVERLIST="`/bin/sh /etc/init.d/xprint get_xpserverlist`"
+  export XPSERVERLIST
+fi
+
+# /etc/profile.d/xprint.sh ends here.
diff --git a/Xprint/mediaSizes.c b/Xprint/mediaSizes.c
index 7bb08b412..12482b281 100644
--- a/Xprint/mediaSizes.c
+++ b/Xprint/mediaSizes.c
@@ -30,8 +30,6 @@ not be used in advertising or otherwise to promote the sale, use or other
 dealings in this Software without prior written authorization from said
 copyright holders.
 */
-/* $XFree86: xc/programs/Xserver/Xprint/mediaSizes.c,v 1.5 2001/12/21 21:02:05 dawes Exp $ */
-
 /*******************************************************************
 **
 **    *********************************************************
@@ -130,6 +128,14 @@ static PageDimensionsRec PageDimensions[] =
     {xpoid_val_medium_size_jis_b8,		64,		91},
     {xpoid_val_medium_size_jis_b9,		45,		64},
     {xpoid_val_medium_size_jis_b10,		32,		45},
+    {xpoid_val_medium_size_hp_2x_postcard,	148,		200},
+    {xpoid_val_medium_size_hp_european_edp,	304.8,		355.6},
+    {xpoid_val_medium_size_hp_mini,		139.7,		215.9},
+    {xpoid_val_medium_size_hp_postcard,		100,		148},
+    {xpoid_val_medium_size_hp_tabloid,		279.4,		431.8},
+    {xpoid_val_medium_size_hp_us_edp,		279.4,		355.6},
+    {xpoid_val_medium_size_hp_us_government_legal,	203.2,	330.2},
+    {xpoid_val_medium_size_hp_us_government_letter,	203.2,	254},
     {xpoid_val_medium_size_iso_c3,		324,		458},
     {xpoid_val_medium_size_iso_c4,		229,		324},
     {xpoid_val_medium_size_iso_c5,		162,		229},
@@ -145,7 +151,8 @@ static PageDimensionsRec PageDimensions[] =
  *       attributes pools have been validated.
  */
 int
-XpGetResolution(XpContextPtr pContext)
+XpGetResolution(
+		XpContextPtr pContext)
 {
     unsigned long resolution;
 
@@ -185,7 +192,8 @@ XpGetResolution(XpContextPtr pContext)
  *       attributes pools have been validated.
  */
 XpOid
-XpGetContentOrientation(XpContextPtr pContext)
+XpGetContentOrientation(
+			XpContextPtr pContext)
 {
     XpOid orientation;
 
@@ -415,7 +423,7 @@ XpGetMediumMillimeters(
 		       float *width,  /* return */
 		       float *height) /* return */
 {
-    unsigned i;
+    int i;
 
     *width = *height = 0;
     for(i = 0; i < XpNumber(PageDimensions); i++)
@@ -739,7 +747,9 @@ XpGetMaxWidthHeightRes(
 }
 
 FontResolutionPtr
-XpGetClientResolutions(ClientPtr client, int *num)
+XpGetClientResolutions(client, num)
+    ClientPtr client;
+    int *num;
 {
     static struct _FontResolution res;
     int resolution = XpGetResolution(XpContextOfClient(client)); 
@@ -755,13 +765,15 @@ XpGetClientResolutions(ClientPtr client, int *num)
 }
 
 
-void XpSetFontResFunc(ClientPtr client)
+void XpSetFontResFunc(client)
+    ClientPtr client;
 {
     client->fontResFunc = XpGetClientResolutions;
 }
 
 
-void XpUnsetFontResFunc(ClientPtr client)
+void XpUnsetFontResFunc(client)
+    ClientPtr client;
 {
     client->fontResFunc = NULL;
 }
diff --git a/Xprint/pcl/Pcl.h b/Xprint/pcl/Pcl.h
index 2af1b2c41..f11cc7a6c 100644
--- a/Xprint/pcl/Pcl.h
+++ b/Xprint/pcl/Pcl.h
@@ -44,7 +44,7 @@ not be used in advertising or otherwise to promote the sale, use or other
 dealings in this Software without prior written authorization from said
 copyright holders.
 */
-/* $XFree86: xc/programs/Xserver/Xprint/pcl/Pcl.h,v 1.13 2003/07/16 01:38:34 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xprint/pcl/Pcl.h,v 1.12 2001/12/21 21:02:05 dawes Exp $ */
 
 #ifndef _PCL_H_
 #define _PCL_H_
diff --git a/Xprint/pcl/PclArc.c b/Xprint/pcl/PclArc.c
index ca13b3a84..af32eb619 100644
--- a/Xprint/pcl/PclArc.c
+++ b/Xprint/pcl/PclArc.c
@@ -45,7 +45,7 @@ dealings in this Software without prior written authorization from said
 copyright holders.
 */
 
-/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclArc.c,v 1.5 2001/01/17 22:36:30 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclArc.c,v 1.4 1999/12/13 02:12:53 robin Exp $ */
 
 #include <stdio.h>
 #include <math.h>
diff --git a/Xprint/pcl/PclArea.c b/Xprint/pcl/PclArea.c
index 971506da6..00e6aff04 100644
--- a/Xprint/pcl/PclArea.c
+++ b/Xprint/pcl/PclArea.c
@@ -44,7 +44,7 @@ not be used in advertising or otherwise to promote the sale, use or other
 dealings in this Software without prior written authorization from said
 copyright holders.
 */
-/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclArea.c,v 1.9 2001/10/28 03:32:54 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclArea.c,v 1.8 2001/01/17 22:36:30 dawes Exp $ */
 
 #include <stdio.h>
 #include <sys/types.h>
diff --git a/Xprint/pcl/PclColor.c b/Xprint/pcl/PclColor.c
index c279c8024..d5d2e022b 100644
--- a/Xprint/pcl/PclColor.c
+++ b/Xprint/pcl/PclColor.c
@@ -45,7 +45,7 @@ not be used in advertising or otherwise to promote the sale, use or other
 dealings in this Software without prior written authorization from said
 copyright holders.
 */
-/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclColor.c,v 1.10 2003/10/29 22:11:00 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclColor.c,v 1.9tsi Exp $ */
 
 #include <stdio.h>
 #include <string.h>
diff --git a/Xprint/pcl/PclCursor.c b/Xprint/pcl/PclCursor.c
index 7e463d498..e7288c9ec 100644
--- a/Xprint/pcl/PclCursor.c
+++ b/Xprint/pcl/PclCursor.c
@@ -44,7 +44,7 @@ not be used in advertising or otherwise to promote the sale, use or other
 dealings in this Software without prior written authorization from said
 copyright holders.
 */
-/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclCursor.c,v 1.4 2001/01/17 22:36:30 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclCursor.c,v 1.3 1999/12/16 02:26:27 robin Exp $ */
 
 #include <stdio.h>
 
diff --git a/Xprint/pcl/PclFonts.c b/Xprint/pcl/PclFonts.c
index f2141f9ff..d5eff48c7 100644
--- a/Xprint/pcl/PclFonts.c
+++ b/Xprint/pcl/PclFonts.c
@@ -13,7 +13,7 @@
 **    *********************************************************
 ** 
 ********************************************************************/
-/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclFonts.c,v 1.2 2003/07/16 01:38:34 dawes Exp $ */
+/* $XFree86$ */
 /*
 (c) Copyright 1996 Hewlett-Packard Company
 (c) Copyright 1996 International Business Machines Corp.
diff --git a/Xprint/pcl/PclGC.c b/Xprint/pcl/PclGC.c
index e1fe772bd..67331a454 100644
--- a/Xprint/pcl/PclGC.c
+++ b/Xprint/pcl/PclGC.c
@@ -44,7 +44,7 @@ not be used in advertising or otherwise to promote the sale, use or other
 dealings in this Software without prior written authorization from said
 copyright holders.
 */
-/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclGC.c,v 1.10 2001/10/28 03:32:54 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclGC.c,v 1.9 2001/01/19 18:34:28 dawes Exp $ */
 
 #include "gcstruct.h"
 
diff --git a/Xprint/pcl/PclInit.c b/Xprint/pcl/PclInit.c
index 5ee49631e..460c11eb6 100644
--- a/Xprint/pcl/PclInit.c
+++ b/Xprint/pcl/PclInit.c
@@ -76,7 +76,7 @@ not be used in advertising or otherwise to promote the sale, use or other
 dealings in this Software without prior written authorization from said
 copyright holders.
 */
-/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclInit.c,v 1.12 2002/10/16 21:13:32 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclInit.c,v 1.11 2001/12/21 21:02:05 dawes Exp $ */
 
 #include <stdio.h>
 #include <string.h>
diff --git a/Xprint/pcl/PclLine.c b/Xprint/pcl/PclLine.c
index 3c10f97ca..aa72e8ff0 100644
--- a/Xprint/pcl/PclLine.c
+++ b/Xprint/pcl/PclLine.c
@@ -44,7 +44,7 @@ not be used in advertising or otherwise to promote the sale, use or other
 dealings in this Software without prior written authorization from said
 copyright holders.
 */
-/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclLine.c,v 1.7 2001/01/17 22:36:30 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclLine.c,v 1.6 1999/12/13 02:12:55 robin Exp $ */
 
 #include "Pcl.h"
 #include "gcstruct.h"
diff --git a/Xprint/pcl/PclMisc.c b/Xprint/pcl/PclMisc.c
index 5b0939df2..63caa0fe5 100644
--- a/Xprint/pcl/PclMisc.c
+++ b/Xprint/pcl/PclMisc.c
@@ -44,7 +44,7 @@ not be used in advertising or otherwise to promote the sale, use or other
 dealings in this Software without prior written authorization from said
 copyright holders.
 */
-/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclMisc.c,v 1.11 2003/10/29 22:11:00 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclMisc.c,v 1.10tsi Exp $ */
 
 #include <stdlib.h>
 #include <signal.h>
diff --git a/Xprint/pcl/PclPixel.c b/Xprint/pcl/PclPixel.c
index 238a159ab..372a54e9f 100644
--- a/Xprint/pcl/PclPixel.c
+++ b/Xprint/pcl/PclPixel.c
@@ -44,7 +44,7 @@ not be used in advertising or otherwise to promote the sale, use or other
 dealings in this Software without prior written authorization from said
 copyright holders.
 */
-/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclPixel.c,v 1.7 2003/10/29 22:11:00 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclPixel.c,v 1.6tsi Exp $ */
 
 #include <stdio.h>
 
diff --git a/Xprint/pcl/PclPixmap.c b/Xprint/pcl/PclPixmap.c
index ba91fc9ec..178289bc1 100644
--- a/Xprint/pcl/PclPixmap.c
+++ b/Xprint/pcl/PclPixmap.c
@@ -44,7 +44,7 @@ not be used in advertising or otherwise to promote the sale, use or other
 dealings in this Software without prior written authorization from said
 copyright holders.
 */
-/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclPixmap.c,v 1.4 2001/01/17 22:36:30 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclPixmap.c,v 1.3 1999/12/16 02:26:27 robin Exp $ */
 
 #include "Pcl.h"
 #include "cfb.h"
diff --git a/Xprint/pcl/PclPolygon.c b/Xprint/pcl/PclPolygon.c
index a5de77399..ddfd9ef8a 100644
--- a/Xprint/pcl/PclPolygon.c
+++ b/Xprint/pcl/PclPolygon.c
@@ -44,7 +44,7 @@ not be used in advertising or otherwise to promote the sale, use or other
 dealings in this Software without prior written authorization from said
 copyright holders.
 */
-/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclPolygon.c,v 1.7 2001/01/17 22:36:30 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclPolygon.c,v 1.6 1999/12/13 02:12:56 robin Exp $ */
 
 
 #include "Pcl.h"
diff --git a/Xprint/pcl/PclPrint.c b/Xprint/pcl/PclPrint.c
index aa2164c92..70c788eac 100644
--- a/Xprint/pcl/PclPrint.c
+++ b/Xprint/pcl/PclPrint.c
@@ -43,7 +43,7 @@ not be used in advertising or otherwise to promote the sale, use or other
 dealings in this Software without prior written authorization from said
 copyright holders.
 */
-/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclPrint.c,v 1.8 2003/10/29 22:11:00 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclPrint.c,v 1.7tsi Exp $ */
 
 #include <stdio.h>
 #include <string.h>
diff --git a/Xprint/pcl/PclSFonts.c b/Xprint/pcl/PclSFonts.c
index 3c7cf05af..121ed0077 100644
--- a/Xprint/pcl/PclSFonts.c
+++ b/Xprint/pcl/PclSFonts.c
@@ -45,7 +45,7 @@ not be used in advertising or otherwise to promote the sale, use or other
 dealings in this Software without prior written authorization from said
 copyright holders.
 */
-/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclSFonts.c,v 1.8 2003/12/22 17:48:05 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclSFonts.c,v 1.7tsi Exp $ */
 
 
 #include <stdio.h>
diff --git a/Xprint/pcl/PclSpans.c b/Xprint/pcl/PclSpans.c
index 98c17dcf9..92261c977 100644
--- a/Xprint/pcl/PclSpans.c
+++ b/Xprint/pcl/PclSpans.c
@@ -44,7 +44,7 @@ not be used in advertising or otherwise to promote the sale, use or other
 dealings in this Software without prior written authorization from said
 copyright holders.
 */
-/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclSpans.c,v 1.6 2001/01/17 22:36:30 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclSpans.c,v 1.5 1999/12/13 02:12:57 robin Exp $ */
 
 
 #include "Pcl.h"
diff --git a/Xprint/pcl/PclText.c b/Xprint/pcl/PclText.c
index 48b468427..9ef4c505f 100644
--- a/Xprint/pcl/PclText.c
+++ b/Xprint/pcl/PclText.c
@@ -44,7 +44,7 @@ not be used in advertising or otherwise to promote the sale, use or other
 dealings in this Software without prior written authorization from said
 copyright holders.
 */
-/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclText.c,v 1.11 2003/10/29 22:11:00 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclText.c,v 1.10tsi Exp $ */
 
 #ifdef DO_TWO_BYTE_PCL
 #include "iconv.h"
diff --git a/Xprint/pcl/PclWindow.c b/Xprint/pcl/PclWindow.c
index 27d8ea97d..42a6f6234 100644
--- a/Xprint/pcl/PclWindow.c
+++ b/Xprint/pcl/PclWindow.c
@@ -44,7 +44,7 @@ not be used in advertising or otherwise to promote the sale, use or other
 dealings in this Software without prior written authorization from said
 copyright holders.
 */
-/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclWindow.c,v 1.11 2003/10/29 22:11:00 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclWindow.c,v 1.10tsi Exp $ */
 
 
 #include <stdio.h>
diff --git a/Xprint/pcl/Pclmap.h b/Xprint/pcl/Pclmap.h
index 1386b0ab4..1a68faf1e 100644
--- a/Xprint/pcl/Pclmap.h
+++ b/Xprint/pcl/Pclmap.h
@@ -30,7 +30,7 @@ not be used in advertising or otherwise to promote the sale, use or other
 dealings in this Software without prior written authorization from said
 copyright holders.
 */
-/* $XFree86: xc/programs/Xserver/Xprint/pcl/Pclmap.h,v 1.6 2001/12/21 21:02:05 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xprint/pcl/Pclmap.h,v 1.5 2001/07/25 15:05:00 dawes Exp $ */
 
 #ifndef _PCLMAP_H_
 #define _PCLMAP_H_
diff --git a/Xprint/ps/Ps.h b/Xprint/ps/Ps.h
index 7b0aaeb39..e8fc615a6 100644
--- a/Xprint/ps/Ps.h
+++ b/Xprint/ps/Ps.h
@@ -7,6 +7,7 @@ Permission to use, copy, modify, distribute, and sell this software and its
 documentation for any purpose is hereby granted without fee, provided that
 the above copyright notice appear in all copies and that both that
 copyright notice and this permission notice appear in supporting
+documentation.
 
 The above copyright notice and this permission notice shall be included in
 all copies or substantial portions of the Software.
@@ -73,7 +74,6 @@ in this Software without prior written authorization from The Open Group.
 **    *********************************************************
 ** 
 ********************************************************************/
-/* $XFree86: xc/programs/Xserver/Xprint/ps/Ps.h,v 1.14 2003/07/16 01:38:34 dawes Exp $ */
 
 #ifndef _PS_H_
 #define _PS_H_
@@ -113,6 +113,7 @@ typedef char *XPointer;
 #include <X11/Xresource.h>
 #include "attributes.h"
 
+
 /*
  *  Public index variables from PsInit.c
  */
@@ -249,6 +250,63 @@ typedef struct
   Bool        (*DestroyWindow)(WindowPtr);
 } PsScreenPrivRec, *PsScreenPrivPtr;
 
+typedef struct PsFontTypeInfoRec PsFontTypeInfoRec;
+
+/* Structure to hold information about one font on disk
+ * Notes:
+ * - multiple XLFD names can refer to the same |PsFontTypeInfoRec| (if
+ *   they all use the same font on the disk)
+ * - the FreeType font download code uses multiple |PsFontTypeInfoRec|
+ *   records for one font on disk if they differ in the encoding being
+ *   used (this is an exception from the
+ *   'one-|PsFontTypeInfoRec|-per-font-on-disk'-design; maybe it it is better
+ *   to rework that in a later step and add a new per-encoding structure). 
+ */
+struct PsFontTypeInfoRec
+{
+  PsFontTypeInfoRec *next;                    /* Next record in list...         */
+  char              *adobe_ps_name;           /* PostScript font name (from the
+                                               * "_ADOBE_POSTSCRIPT_FONTNAME" atom) */
+  char              *download_ps_name;        /* PostScript font name used for font download */
+  char              *filename;                /* File name of font              */
+#ifdef XP_USE_FREETYPE
+  char              *ft_download_encoding;    /* encoding used for download     */
+  PsFTDownloadFontType ft_download_font_type; /* PS font type used for download (e.g. Type1/Type3/CID/etc.) */
+#endif /* XP_USE_FREETYPE */
+  int                is_iso_encoding;         /* Is this font encoded in ISO Latin 1 ? */
+  int                font_type;               /* See PSFTI_FONT_TYPE_* below... */
+  Bool               downloadableFont;        /* Font can be downloaded         */
+  Bool               alreadyDownloaded[256];  /* Font has been downloaded (for 256 8bit "sub"-font) */
+};
+
+#define PSFTI_FONT_TYPE_OTHER        (0)
+#define PSFTI_FONT_TYPE_PMF          (1)
+#define PSFTI_FONT_TYPE_PS_TYPE1_PFA (2)
+#define PSFTI_FONT_TYPE_PS_TYPE1_PFB (3)
+#define PSFTI_FONT_TYPE_TRUETYPE     (4)
+/* PSFTI_FONT_TYPE_FREETYPE is means the font is handled by the freetype engine */
+#define PSFTI_FONT_TYPE_FREETYPE     (5)
+
+typedef struct PsFontInfoRec PsFontInfoRec;
+
+/* Structure which represents our context info for a single XLFD font
+ * Note that multiple |PsFontInfoRec| records can share the same
+ * |PsFontTypeInfoRec| record - the |PsFontInfoRec| records represent
+ * different appearances of the same font on disk(=|PsFontTypeInfoRec|)).
+ */
+struct PsFontInfoRec
+{
+  PsFontInfoRec     *next;          /* Next record in list...             */
+  /* |font| and |font_fontPrivate| are used by |PsFindFontInfoRec()| to
+   * identify a font */
+  FontPtr            font;          /* The font this record is for        */
+  pointer            font_fontPrivate;
+  PsFontTypeInfoRec *ftir;          /* Record about the font file on disk */
+  const char        *dfl_name;      /* XLFD for this font                 */
+  int                size;          /* Font size. Use |mtx| if |size==0|  */
+  float              mtx[4];        /* Transformation matrix (see |size|) */
+};
+
 typedef struct
 {
   char              *jobFileName;
@@ -259,6 +317,8 @@ typedef struct
   ClientPtr          getDocClient;
   int                getDocBufSize;
   PsOutPtr           pPsOut;
+  PsFontTypeInfoRec *fontTypeInfoRecords;
+  PsFontInfoRec     *fontInfoRecords;
 } PsContextPrivRec, *PsContextPrivPtr;
 
 typedef struct
@@ -291,6 +351,7 @@ typedef struct
 
 extern Bool InitializePsDriver(int ndx, ScreenPtr pScreen, int argc,
     char **argv);
+static Bool         PsDestroyContext(XpContextPtr pCon);
 extern XpContextPtr PsGetContextFromWindow(WindowPtr win);
 
 /*
@@ -314,6 +375,10 @@ extern int PsGetDocumentData(XpContextPtr pCon, ClientPtr client,
  */
 
 extern Bool PsCreateGC(GCPtr pGC);
+static int  PsGetDrawablePrivateStuff(DrawablePtr pDrawable, GC *gc,
+                                      unsigned long *valid, PsOutPtr *psOut,
+                                      ColormapPtr *cMap);
+extern PsContextPrivPtr PsGetPsContextPriv( DrawablePtr pDrawable );
 extern int  PsUpdateDrawableGC(GCPtr pGC, DrawablePtr pDrawable,
                                PsOutPtr *psOut, ColormapPtr *cMap);
 extern void PsValidateGC(GCPtr pGC, unsigned long changes, DrawablePtr pDrawable);
@@ -366,9 +431,8 @@ extern void PsPutScaledImage(DrawablePtr pDrawable, GCPtr pGC, int depth,
 extern void PsPutImage(DrawablePtr pDrawable, GCPtr pGC, int depth,
                        int x, int y, int w, int h, int leftPad, int format,
                        char *pImage);
-extern void PsPutImageMask(DrawablePtr pDrawable, GCPtr pGC, int depth,
-                           int x, int y, int w, int h, int leftPad, int format,
-                           char *pImage);
+extern void PsPutImageMask(DrawablePtr pDrawable, GCPtr pGC, int depth, int x, int y,
+                           int w, int h, int leftPad, int format, char *pImage);
 extern RegionPtr PsCopyArea(DrawablePtr pSrc, DrawablePtr pDst, GCPtr pGC,
                             int srcx, int srcy, int width, int height,
                             int dstx, int dsty);
@@ -456,7 +520,19 @@ extern Bool PsUnrealizeFont(ScreenPtr pscr, FontPtr pFont);
 extern char *PsGetFontName(FontPtr pFont);
 extern int PsGetFontSize(FontPtr pFont, float *mtx);
 extern char *PsGetPSFontName(FontPtr pFont);
+extern char *PsGetPSFaceOrFontName(FontPtr pFont);
 extern int PsIsISOLatin1Encoding(FontPtr pFont);
+extern char *PsGetEncodingName(FontPtr pFont);
+extern PsFontInfoRec *PsGetFontInfoRec(DrawablePtr pDrawable, FontPtr pFont);
+extern void PsFreeFontInfoRecords(PsContextPrivPtr priv);
+extern PsFTDownloadFontType PsGetFTDownloadFontType(void);
+
+/*
+ *  Functions in PsFTFonts.c
+ */
+ 
+extern char *PsGetFTFontFileName(FontPtr pFont);
+extern Bool  PsIsFreeTypeFont(FontPtr pFont);
 
 /*
  *  Functions in PsAttr.c
@@ -503,14 +579,4 @@ extern PsElmPtr PsCreateFillElementList(PixmapPtr pix, int *nElms);
 extern PsElmPtr PsCloneFillElementList(int nElms, PsElmPtr elms);
 extern void PsDestroyFillElementList(int nElms, PsElmPtr elms);
 
-/*
- *  Functions in PsCache.c
- */
-
-#ifdef BM_CACHE
-extern int PsBmIsImageCached(int gWidth, int gHeight, char *pBuffer);
-extern int PsBmPutImageInCache(int gWidth, int gHeight, char *pBuffer);
-extern void PsBmClearImageCache(void);
-#endif
-
 #endif  /* _PS_H_ */
diff --git a/Xprint/ps/PsArea.c b/Xprint/ps/PsArea.c
index eed650ada..134686a87 100644
--- a/Xprint/ps/PsArea.c
+++ b/Xprint/ps/PsArea.c
@@ -228,7 +228,7 @@ error:
   return;
 }
 
-static void
+void
 PsPutScaledImageIM(DrawablePtr pDrawable, GCPtr pGC, int depth, int x, int y,
            int w, int h, int leftPad, int format, int imageRes, char *pImage)
 {
@@ -269,9 +269,9 @@ PsPutScaledImageIM(DrawablePtr pDrawable, GCPtr pGC, int depth, int x, int y,
     ColormapPtr  cMap;
     int          pageRes, sw, sh;
 #ifdef BM_CACHE
-    long   cache_id = 0;
+    long	 cache_id = 0;
 #endif
-    
+
     if( PsUpdateDrawableGC(pGC, pDrawable, &psOut, &cMap)==FALSE ) return;
     if (!imageRes) {
         sw = w;
@@ -296,100 +296,100 @@ PsPutScaledImageIM(DrawablePtr pDrawable, GCPtr pGC, int depth, int x, int y,
 
       PsOut_BeginImageCache(psOut, cache_id);
 #endif
-    if( depth==24 )
-    {
-      PsOut_BeginImageIM(psOut, 0, 0, x, y, w, h, sw, sh, 3);
-      if( format==XYPixmap )
+      if( depth==24 )
       {
-        int   rowsiz = PixmapBytePad(w, depth);
-        char *planes[3];
-        planes[0] = pImage;
-        planes[1] = &pImage[rowsiz*h];
-        planes[2] = &pImage[rowsiz*h*2];
-        for( r=0 ; r<h ; r++ )
+        PsOut_BeginImageIM(psOut, 0, 0, x, y, w, h, sw, sh, 3);
+        if( format==XYPixmap )
         {
-          char *pt[3];
-          for( i=0 ; i<3 ;  i++ ) pt[i] = &planes[i][rowsiz*r];
-          for( c=0 ; c<w ; c++ )
+          int   rowsiz = PixmapBytePad(w, depth);
+          char *planes[3];
+          planes[0] = pImage;
+          planes[1] = &pImage[rowsiz*h];
+          planes[2] = &pImage[rowsiz*h*2];
+          for( r=0 ; r<h ; r++ )
           {
-            for( i=0 ; i<3 ; i++ )
-              { PsOut_OutImageBytes(psOut, 1, &pt[i][c]); pt[i]++; }
+            char *pt[3];
+            for( i=0 ; i<3 ;  i++ ) pt[i] = &planes[i][rowsiz*r];
+            for( c=0 ; c<w ; c++ )
+            {
+              for( i=0 ; i<3 ; i++ )
+                { PsOut_OutImageBytes(psOut, 1, &pt[i][c]); pt[i]++; }
+            }
+          }
+        }
+        else if( format==ZPixmap )
+        {
+          int  rowsiz = PixmapBytePad(w, depth);
+          for( r=0 ; r<h ; r++ )
+          {
+            char *pt = &pImage[rowsiz*r];
+            for( c=0 ; c<w ; c++,pt+=4 )
+            {
+              if( swap )
+              {
+                char tmp[4];
+                tmp[0] = pt[3]; tmp[1] = pt[2]; tmp[2] = pt[1]; tmp[3] = pt[0];
+                PsOut_OutImageBytes(psOut, 3, &tmp[1]);
+              }
+              else
+                PsOut_OutImageBytes(psOut, 3, &pt[1]);
+            }
           }
         }
+        else goto error;
+        PsOut_EndImage(psOut);
       }
-      else if( format==ZPixmap )
+      else if( depth==8 )
       {
         int  rowsiz = PixmapBytePad(w, depth);
+        PsOut_BeginImageIM(psOut, 0, 0, x, y, w, h, sw, sh, 3);
         for( r=0 ; r<h ; r++ )
         {
           char *pt = &pImage[rowsiz*r];
-          for( c=0 ; c<w ; c++,pt+=4 )
+          for( c=0 ; c<w ; c++,pt++ )
           {
+            int   val = PsGetPixelColor(cMap, (int)(*pt)&0xFF);
+            char *ipt = (char *)&val;
             if( swap )
             {
               char tmp[4];
-              tmp[0] = pt[3]; tmp[1] = pt[2]; tmp[2] = pt[1]; tmp[3] = pt[0];
+              tmp[0] = ipt[3]; tmp[1] = ipt[2]; tmp[2] = ipt[1]; tmp[3] = ipt[0];
               PsOut_OutImageBytes(psOut, 3, &tmp[1]);
             }
             else
-              PsOut_OutImageBytes(psOut, 3, &pt[1]);
+              PsOut_OutImageBytes(psOut, 3, &ipt[1]);
           }
         }
+        PsOut_EndImage(psOut);
       }
-      else goto error;
-      PsOut_EndImage(psOut);
-    }
-    else if( depth==8 )
-    {
-      int  rowsiz = PixmapBytePad(w, depth);
-      PsOut_BeginImageIM(psOut, 0, 0, x, y, w, h, sw, sh, 3);
-      for( r=0 ; r<h ; r++ )
-      {
-        char *pt = &pImage[rowsiz*r];
-        for( c=0 ; c<w ; c++,pt++ )
-        {
-          int   val = PsGetPixelColor(cMap, (int)(*pt)&0xFF);
-          char *ipt = (char *)&val;
-          if( swap )
-          {
-            char tmp[4];
-            tmp[0] = ipt[3]; tmp[1] = ipt[2]; tmp[2] = ipt[1]; tmp[3] = ipt[0];
-            PsOut_OutImageBytes(psOut, 3, &tmp[1]);
-          }
-          else
-            PsOut_OutImageBytes(psOut, 3, &ipt[1]);
-        }
-      }
-      PsOut_EndImage(psOut);
-    }
-    else if( depth==1 )
-    {
+      else if( depth==1 )
       {
-        int  rowsiz = BitmapBytePad(w);
-        int  psrsiz = (w+7)/8;
-        PsOut_BeginImageIM(psOut, PsGetPixelColor(cMap, pGC->bgPixel),
-                         PsGetPixelColor(cMap, pGC->fgPixel),
-                         x, y, w, h, sw, sh, 1);
-        for( r=0 ; r<h ; r++ )
         {
-          char *pt = &pImage[rowsiz*r];
-          for( i=0 ; i<psrsiz ; i++ )
+          int  rowsiz = BitmapBytePad(w);
+          int  psrsiz = (w+7)/8;
+          PsOut_BeginImageIM(psOut, PsGetPixelColor(cMap, pGC->bgPixel),
+                           PsGetPixelColor(cMap, pGC->fgPixel),
+                           x, y, w, h, sw, sh, 1);
+          for( r=0 ; r<h ; r++ )
           {
-            int  iv_, iv = (int)pt[i]&0xFF;
-            char c;
-            if( swap )
-              { for( j=0,iv_=0 ; j<8 ; j++ ) iv_ |= (((iv>>j)&1)<<(7-j)); }
-            else
-              iv_ = iv;
-            c = iv_;
-            PsOut_OutImageBytes(psOut, 1, &c);
+            char *pt = &pImage[rowsiz*r];
+            for( i=0 ; i<psrsiz ; i++ )
+            {
+              int  iv_, iv = (int)pt[i]&0xFF;
+              char c;
+              if( swap )
+                { for( j=0,iv_=0 ; j<8 ; j++ ) iv_ |= (((iv>>j)&1)<<(7-j)); }
+              else
+                iv_ = iv;
+              c = iv_;
+              PsOut_OutImageBytes(psOut, 1, &c);
+            }
           }
+          PsOut_EndImage(psOut);
         }
-        PsOut_EndImage(psOut);
       }
-    }
 #ifdef BM_CACHE
-    PsOut_EndImageCache(psOut);
+      PsOut_EndImageCache(psOut);
     }
     PsOut_ImageCache(psOut, x, y, cache_id, PsGetPixelColor(cMap, pGC->bgPixel),
                            PsGetPixelColor(cMap, pGC->fgPixel));
diff --git a/Xprint/ps/PsAttVal.c b/Xprint/ps/PsAttVal.c
index a6a375487..5ebd0d3b9 100644
--- a/Xprint/ps/PsAttVal.c
+++ b/Xprint/ps/PsAttVal.c
@@ -32,7 +32,6 @@ not be used in advertising or otherwise to promote the sale, use or other
 dealings in this Software without prior written authorization from said
 copyright holders.
 */
-/* $XFree86: xc/programs/Xserver/Xprint/ps/PsAttVal.c,v 1.5 2001/12/19 21:28:44 dawes Exp $ */
 
 #include "Ps.h"
 #include "AttrValid.h"
@@ -73,7 +72,16 @@ static XpOidList DefaultPlexes = {
 };
 
 static unsigned long ValidPrinterResolutionsCards[] = {
+    75,
+    100,
+    120,
+    150,
+    180,
+    200,
+    240,
     300,
+    360,
+    400,
     600,
     720,
     940,
@@ -86,7 +94,20 @@ static XpOidCardList ValidPrinterResolutions = {
 };
 
 static unsigned long DefaultPrinterResolutionsCards[] = {
-    300
+     75,
+     100,
+     120,
+     150,
+     180,
+     200,
+     240,
+     300,
+     360,
+     400,
+     600,
+     720,
+     940,
+     1200
 };
 static XpOidCardList DefaultPrinterResolutions = {
     DefaultPrinterResolutionsCards, XpNumber(DefaultPrinterResolutionsCards)
@@ -143,13 +164,6 @@ static XpOidDocFmtList DefaultEmbeddedFormatsSupported = {
     DefaultEmbeddedFormatsSupportedFmts, XpNumber(DefaultEmbeddedFormatsSupportedFmts)
 };
 
-/*
-**	So filtered printers that accept other raw formats can be
-**	used with this driver.
-**
-**		Noah Roberts (jik-)
-*/
-#if 0
 static XpOidDocFmt ValidRawFormatsSupportedFmts[] = {
     { "Postscript", "2", NULL }
     
@@ -157,7 +171,6 @@ static XpOidDocFmt ValidRawFormatsSupportedFmts[] = {
 static XpOidDocFmtList ValidRawFormatsSupported = {
     ValidRawFormatsSupportedFmts, XpNumber(ValidRawFormatsSupportedFmts)
 };
-#endif
 
 static XpOidDocFmt DefaultRawFormatsSupportedFmts[] = {
     { "Postscript", "2", NULL }
@@ -178,12 +191,74 @@ static XpOidList ValidInputTrays = {
 };
 
 static XpOid ValidMediumSizesOids[] = {
+    xpoid_val_medium_size_iso_a0,
+    xpoid_val_medium_size_iso_a1,
+    xpoid_val_medium_size_iso_a2,
+    xpoid_val_medium_size_iso_a3,
     xpoid_val_medium_size_iso_a4,
+    xpoid_val_medium_size_iso_a5,
+    xpoid_val_medium_size_iso_a6,
+    xpoid_val_medium_size_iso_a7,
+    xpoid_val_medium_size_iso_a8,
+    xpoid_val_medium_size_iso_a9,
+    xpoid_val_medium_size_iso_a10,
+    xpoid_val_medium_size_iso_b0,
+    xpoid_val_medium_size_iso_b1,
+    xpoid_val_medium_size_iso_b2,
+    xpoid_val_medium_size_iso_b3,
+    xpoid_val_medium_size_iso_b4,
+    xpoid_val_medium_size_iso_b5,
+    xpoid_val_medium_size_iso_b6,
+    xpoid_val_medium_size_iso_b7,
+    xpoid_val_medium_size_iso_b8,
+    xpoid_val_medium_size_iso_b9,
+    xpoid_val_medium_size_iso_b10,
     xpoid_val_medium_size_na_letter,
     xpoid_val_medium_size_na_legal,
     xpoid_val_medium_size_executive,
+    xpoid_val_medium_size_folio,
+    xpoid_val_medium_size_invoice,
+    xpoid_val_medium_size_ledger,
+    xpoid_val_medium_size_quarto,
+    xpoid_val_medium_size_iso_c3,
+    xpoid_val_medium_size_iso_c4,
+    xpoid_val_medium_size_iso_c5,
+    xpoid_val_medium_size_iso_c6,
     xpoid_val_medium_size_iso_designated_long,
-    xpoid_val_medium_size_na_number_10_envelope
+    xpoid_val_medium_size_na_10x13_envelope,
+    xpoid_val_medium_size_na_9x12_envelope,
+    xpoid_val_medium_size_na_number_10_envelope,
+    xpoid_val_medium_size_na_7x9_envelope,
+    xpoid_val_medium_size_na_9x11_envelope,
+    xpoid_val_medium_size_na_10x14_envelope,
+    xpoid_val_medium_size_na_number_9_envelope,
+    xpoid_val_medium_size_na_6x9_envelope,
+    xpoid_val_medium_size_na_10x15_envelope,
+    xpoid_val_medium_size_monarch_envelope,
+    xpoid_val_medium_size_a,
+    xpoid_val_medium_size_b,
+    xpoid_val_medium_size_c,
+    xpoid_val_medium_size_d,
+    xpoid_val_medium_size_e,
+    xpoid_val_medium_size_jis_b0,
+    xpoid_val_medium_size_jis_b1,
+    xpoid_val_medium_size_jis_b2,
+    xpoid_val_medium_size_jis_b3,
+    xpoid_val_medium_size_jis_b4,
+    xpoid_val_medium_size_jis_b5,
+    xpoid_val_medium_size_jis_b6,
+    xpoid_val_medium_size_jis_b7,
+    xpoid_val_medium_size_jis_b8,
+    xpoid_val_medium_size_jis_b9,
+    xpoid_val_medium_size_jis_b10,
+    xpoid_val_medium_size_hp_2x_postcard,
+    xpoid_val_medium_size_hp_european_edp,
+    xpoid_val_medium_size_hp_mini,
+    xpoid_val_medium_size_hp_postcard,
+    xpoid_val_medium_size_hp_tabloid,
+    xpoid_val_medium_size_hp_us_edp,
+    xpoid_val_medium_size_hp_us_government_legal,
+    xpoid_val_medium_size_hp_us_government_letter,
 };
 static XpOidList ValidMediumSizes = {
     ValidMediumSizesOids, XpNumber(ValidMediumSizesOids)
@@ -205,7 +280,7 @@ XpValidatePoolsRec PsValidatePoolsRec = {
     &ValidPrinterResolutions, &DefaultPrinterResolutions,
     &ValidEmbeddedFormatsSupported, &DefaultEmbeddedFormatsSupported,
     &ValidListfontsModes, &DefaultListfontsModes,
-    NULL /* Any raw format specified (NR)*/, &DefaultRawFormatsSupported,
+    &ValidRawFormatsSupported, &DefaultRawFormatsSupported,
     &ValidSetupProviso,
     &DefaultDocumentFormat
 };
diff --git a/Xprint/ps/PsAttr.c b/Xprint/ps/PsAttr.c
index 13c4e1978..8a5bee9e3 100644
--- a/Xprint/ps/PsAttr.c
+++ b/Xprint/ps/PsAttr.c
@@ -57,7 +57,6 @@ in this Software without prior written authorization from The Open Group.
  * or other dealings in this Software without prior written authorization
  * from said copyright holders.
  */
-/* $XFree86: xc/programs/Xserver/Xprint/ps/PsAttr.c,v 1.5 2001/12/14 19:59:15 dawes Exp $ */
 
 /*******************************************************************
 **
@@ -76,6 +75,7 @@ in this Software without prior written authorization from The Open Group.
 ********************************************************************/
 
 #include "Ps.h"
+#include "attributes.h"
 
 char *
 PsGetAttributes(
diff --git a/Xprint/ps/PsCache.c b/Xprint/ps/PsCache.c
index b688fbba1..8c9f4a926 100644
--- a/Xprint/ps/PsCache.c
+++ b/Xprint/ps/PsCache.c
@@ -79,21 +79,21 @@ in this Software without prior written authorization from The Open Group.
 #include "fntfil.h"
 #include "fntfilst.h"
 
-#define  GET  0
-#define  RESET    1
+#define  GET	0
+#define  RESET	1
 
 struct bm_cache_list {
-  struct bm_cache_list *next;
-  struct bm_cache_list *prev;
+	struct bm_cache_list *next;
+	struct bm_cache_list *prev;
         int                   height;
-  long                  id;
+	long	              id;
         char                 *pBuffer;
 };
 
 struct bm_cache_head {
-  struct bm_cache_list *head;
-  int           width;
-  struct bm_cache_head *next;
+	struct bm_cache_list *head;
+	int		      width;
+	struct bm_cache_head *next;
         struct bm_cache_head *prev;
 };
 
@@ -106,14 +106,14 @@ PsBmUniqueId(int func)
 
     if(func == RESET)
     {
-  unique_id = 0;
-  return 0;
+	unique_id = 0;
+	return 0;
     }
     else
-  return ++unique_id;
+	return ++unique_id;
 }
 
-int
+int 
 PsBmIsImageCached(
     int gWidth,
     int gHeight,
@@ -126,28 +126,28 @@ PsBmIsImageCached(
     {
         if(pList->width == gWidth)
         {
-      struct bm_cache_list *pItem = pList->head;
-
-      while(pItem != NULL)
-      {
-          if(pItem->height == gHeight)
-          {
-          int length = 4*(gWidth/32+(gWidth%32!=0))*gHeight;
-
-              if(!memcmp(pItem->pBuffer, pBuffer, sizeof(char)*length))
-              {
-              return_val = pItem->id;
-              break;
-              }
-          }
-      else if(pItem->height > gHeight)
-          break;
-
-          pItem = pItem->next;
-      }
+	    struct bm_cache_list *pItem = pList->head;
+
+	    while(pItem != NULL)
+	    {
+	        if(pItem->height == gHeight)
+	        {
+		    int length = 4*(gWidth/32+(gWidth%32!=0))*gHeight;
+
+	            if(!memcmp(pItem->pBuffer, pBuffer, sizeof(char)*length))
+	            {
+		        return_val = pItem->id;
+		        break;
+	            }
+	        }
+		else if(pItem->height > gHeight)
+		    break;
+
+	        pItem = pItem->next;
+	    }
         }
-  else if(pList->width > gWidth)
-      break;
+	else if(pList->width > gWidth)
+	    break;
 
         pList = pList->next;
     }
@@ -180,39 +180,39 @@ PsBmPutImageInCache(
     while(pList != NULL)
     {
         if(pList->width == gWidth)
-  {
-      struct bm_cache_list *pItem = pList->head;
-
-      while(pItem != NULL)
-      {
-      if(pItem->height >= gHeight)
-      {
-          pNew->next = pItem;
-          pNew->prev = pItem->prev;
-          if(pItem->prev != NULL)
-             pItem->prev->next = pNew;
+	{
+	    struct bm_cache_list *pItem = pList->head;
+
+	    while(pItem != NULL)
+	    {
+		if(pItem->height >= gHeight)
+		{
+		    pNew->next = pItem;
+		    pNew->prev = pItem->prev;
+		    if(pItem->prev != NULL)
+		       pItem->prev->next = pNew;
                     else
-             pList->head = pNew;
+		       pList->head = pNew;
                     pItem->prev = pNew;
 
-          return_val = pNew->id;
+		    return_val = pNew->id;
 
-          break;
-      }
-      else if(pItem->next == NULL)
-      {
-          pNew->prev = pItem;
-          pItem->next = pNew;
+		    break;
+		}
+		else if(pItem->next == NULL)
+		{
+		    pNew->prev = pItem;
+		    pItem->next = pNew;
 
-          return_val = pNew->id;
+		    return_val = pNew->id;
 
-          break;
-      }
+		    break;
+		}
 
-      pItem = pItem->next;
-      }
+		pItem = pItem->next;
+	    }
 
-      break;
+	    break;
         }
 
         pList = pList->next;
@@ -223,50 +223,50 @@ PsBmPutImageInCache(
         struct bm_cache_head *pNewList;
 
         pNewList = (struct bm_cache_head *)malloc(sizeof(struct bm_cache_head));
-
+ 
         pNewList->next  = NULL;
         pNewList->prev  = NULL;
         pNewList->width = gWidth;
         pNewList->head  = pNew;
-
+ 
         if(bm_cache == NULL)
         {
-      bm_cache = pNewList;
-      return_val = pNew->id;
+	    bm_cache = pNewList;
+	    return_val = pNew->id;
         }
         else
         {
-      pList = bm_cache;
+ 	    pList = bm_cache;
 
-      while(pList != NULL)
-      {
-          if(pList->width > gWidth)
-      {
-          pNewList->next  = pList;
-          pNewList->prev  = pList->prev;
+	    while(pList != NULL)
+	    {
+	        if(pList->width > gWidth)
+		{
+		    pNewList->next  = pList;
+		    pNewList->prev  = pList->prev;
 
-          if(pList->prev != NULL)
-             pList->prev->next = pNewList;
+		    if(pList->prev != NULL)
+		       pList->prev->next = pNewList;
                     else
-             bm_cache = pNewList;
-          pList->prev = pNewList;
+		       bm_cache = pNewList;
+		    pList->prev = pNewList;
 
-          return_val = pNew->id;
+		    return_val = pNew->id;
 
-          break;
-      }
-      else if(pList->next == NULL)
+		    break;
+		}
+		else if(pList->next == NULL)
                 {
-          pNewList->prev  = pList;
-          pList->next = pNewList;
+		    pNewList->prev  = pList;
+		    pList->next = pNewList;
 
-          return_val = pNew->id;
+		    return_val = pNew->id;
 
-          break;
-      }
+		    break;
+		}
 
-      pList = pList->next;
-      }
+		pList = pList->next;
+	    }
         }
     }
 
@@ -280,35 +280,35 @@ PsBmClearImageCacheItem(
 {
     if(pItem != NULL)
     {
-  if(pItem->pBuffer != NULL)
-     free(pItem->pBuffer);
+	if(pItem->pBuffer != NULL)
+	   free(pItem->pBuffer);
         pItem->pBuffer = NULL;
 
-  if(pItem->next)
-     PsBmClearImageCacheItem(pItem->next);
+	if(pItem->next)
+	   PsBmClearImageCacheItem(pItem->next);
         pItem->next = NULL;
 
-  free(pItem);
-  pItem = NULL;
+	free(pItem);
+	pItem = NULL;
     }
 }
 
-static void
+static void 
 PsBmClearImageCacheList(
     struct bm_cache_head *pList)
 {
     if(pList != NULL)
     {
-  if(pList->head)
-      PsBmClearImageCacheItem(pList->head);
+	if(pList->head)
+	    PsBmClearImageCacheItem(pList->head);
         pList->head = NULL;
 
-  if(pList->next)
-      PsBmClearImageCacheList(pList->next);
+	if(pList->next)
+	    PsBmClearImageCacheList(pList->next);
         pList->next = NULL;
 
-  free(pList);
-  pList = NULL;
+	free(pList);
+	pList = NULL;
     }
 }
 
diff --git a/Xprint/ps/PsColor.c b/Xprint/ps/PsColor.c
index 92082226f..9c76904d6 100644
--- a/Xprint/ps/PsColor.c
+++ b/Xprint/ps/PsColor.c
@@ -73,7 +73,6 @@ in this Software without prior written authorization from The Open Group.
 **    *********************************************************
 ** 
 ********************************************************************/
-/* $XFree86: xc/programs/Xserver/Xprint/ps/PsColor.c,v 1.3 2001/12/14 19:59:15 dawes Exp $ */
 
 #include "Ps.h"
 #include "gcstruct.h"
@@ -86,6 +85,7 @@ PsCreateColormap(ColormapPtr pColor)
   int            i;
   unsigned short rgb;
   VisualPtr      pVisual = pColor->pVisual;
+  Pixel          pix;
 
   if( pVisual->class==TrueColor )
   {
diff --git a/Xprint/ps/PsFTFonts.c b/Xprint/ps/PsFTFonts.c
new file mode 100644
index 000000000..cfdee93d1
--- /dev/null
+++ b/Xprint/ps/PsFTFonts.c
@@ -0,0 +1,80 @@
+
+/*
+Copyright (c) 2003-2004 Roland Mainz <roland.mainz@nrubsig.org>
+
+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
+AUTHORS OR COPYRIGHT HOLDERS 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.
+*/
+
+#include <ctype.h>
+#include <limits.h>
+#include <sys/stat.h>
+
+#include "regionstr.h"
+#include "fontstruct.h"
+#include "dixfontstr.h"
+#include "scrnintstr.h"
+#include "fontxlfd.h"
+#include "fntfil.h"
+#include "fntfilst.h"
+
+#include "Ps.h"
+
+#include <ft2build.h>
+#include FT_FREETYPE_H
+
+#include "ft.h"
+#include "ftfuncs.h"
+
+char *
+PsGetFTFontFileName(FontPtr pFont)
+{
+  FTFontPtr tf = (FTFontPtr)pFont->fontPrivate;
+  return tf->instance->face->filename;
+}
+   
+Bool
+PsIsFreeTypeFont(FontPtr pFont)
+{
+  int         i;
+  int         nprops = pFont->info.nprops;
+  FontPropPtr props  = pFont->info.props;
+  /* "RASTERIZER_NAME" must match the rasterizer name set in
+   * xc/lib/font/FreeType/ftfuncs.c */
+  Atom        name   = MakeAtom("RASTERIZER_NAME", 15, True); 
+  Atom        value  = (Atom)0;
+  char       *rv;
+
+  for( i=0 ; i<nprops ; i++ )
+  {
+    if( props[i].name==name )
+      { value = props[i].value; break; }
+  }
+  if( !value )
+    return False; 
+
+  rv = NameForAtom(value);
+  if( !rv )
+    return False; 
+
+  if( memcmp(rv, "FreeType", 8) == 0 )
+    return  True;
+
+  return False;
+}
+
diff --git a/Xprint/ps/PsFonts.c b/Xprint/ps/PsFonts.c
index 9792dae4d..dde6e703e 100644
--- a/Xprint/ps/PsFonts.c
+++ b/Xprint/ps/PsFonts.c
@@ -57,7 +57,6 @@ in this Software without prior written authorization from The Open Group.
  * or other dealings in this Software without prior written authorization
  * from said copyright holders.
  */
-/* $XFree86: xc/programs/Xserver/Xprint/ps/PsFonts.c,v 1.7 2003/07/16 01:38:34 dawes Exp $ */
 
 /*******************************************************************
 **
@@ -80,9 +79,15 @@ in this Software without prior written authorization from The Open Group.
 #include "dixfontstr.h"
 #include "scrnintstr.h"
 #include "fontxlfd.h"
+#include "fntfil.h"
+#include "fntfilst.h"
 
 #include "Ps.h"
 
+#include <ctype.h>
+#include <limits.h>
+#include <sys/stat.h>
+
 Bool
 PsRealizeFont(
   ScreenPtr  pscr,
@@ -110,7 +115,7 @@ PsGetFontName(FontPtr pFont)
 
   for( i=0 ; i<nprops ; i++ )
   {
-    if( (Atom)props[i].name == name )
+    if( (Atom)props[i].name==name )
       { value = props[i].value; break; }
   }
   if( !value ) return (char *)0;
@@ -145,12 +150,14 @@ PsGetPSFontName(FontPtr pFont)
   int         i;
   int         nprops = pFont->info.nprops;
   FontPropPtr props  = pFont->info.props;
-  Atom        name   = MakeAtom("PRINTER_RESIDENT_FONT", 21, True);
+  /* "_ADOBE_POSTSCRIPT_FONTNAME" maps directly to a PMF OBJ_NAME attribute
+   * name - changing the name will break printer-builtin fonts. */
+  Atom        name   = MakeAtom("_ADOBE_POSTSCRIPT_FONTNAME", 26, True); 
   Atom        value  = (Atom)0;
 
   for( i=0 ; i<nprops ; i++ )
   {
-    if( (Atom)props[i].name == name )
+    if( (Atom)props[i].name==name )
       { value = props[i].value; break; }
   }
   if( !value ) return (char *)0; 
@@ -171,8 +178,8 @@ PsIsISOLatin1Encoding(FontPtr pFont)
 
   for( i=0 ; i<nprops ; i++ )
   {
-    if( (Atom)props[i].name == reg ) rv = props[i].value;
-    if( (Atom)props[i].name == enc ) ev = props[i].value;
+    if( (Atom)props[i].name==reg ) rv = props[i].value;
+    if( (Atom)props[i].name==enc ) ev = props[i].value;
   }
   if( rv ) rp = NameForAtom(rv);
   if( ev ) ep = NameForAtom(ev);
@@ -184,3 +191,680 @@ PsIsISOLatin1Encoding(FontPtr pFont)
       ep[0]!='1' ) return(0);
   return(1);
 }
+
+/* Return the encoding part of the XLFD (e.g. "*-iso8859-6.8x" etc.)*/
+char *PsGetEncodingName(FontPtr pFont)
+{
+  int          i;
+  int          nprops = pFont->info.nprops;
+  FontPropPtr  props  = pFont->info.props;
+  Atom         fnt = MakeAtom("FONT",              4, True);
+  Atom         reg = MakeAtom("CHARSET_REGISTRY", 16, True);
+  Atom         enc = MakeAtom("CHARSET_ENCODING", 16, True);
+  Atom         fv = 0, rv = 0, ev = 0;
+  char        *fp = 0;
+  char        *rp = 0;
+  char        *ep = 0;
+  char        *encname;
+
+  for( i=0 ; i<nprops ; i++ )
+  {
+    if( props[i].name==fnt ) fv = props[i].value;
+    if( props[i].name==reg ) rv = props[i].value;
+    if( props[i].name==enc ) ev = props[i].value;
+  }
+  if( fv ) fp = NameForAtom(fv);
+  if( rv ) rp = NameForAtom(rv);
+  if( ev ) ep = NameForAtom(ev);
+
+  if( (!rp) || (!ep) || (!fp))
+    return(0);
+  
+  encname  = fp;
+  encname += strlen(encname) - (strlen(rp) + strlen(ep) + 1);
+  
+  return encname;
+}
+
+/* strstr(), case-insensitive */
+static 
+char *str_case_str(const char *s, const char *find)
+{
+  size_t len;
+  char   c, 
+         sc;
+
+  if ((c = tolower(*find++)) != '\0')
+  {
+    len = strlen(find);
+    do 
+    {
+      do
+      {
+        if ((sc = tolower(*s++)) == '\0')
+          return NULL;
+      } while (sc != c);
+    } while (strncasecmp(s, find, len) != 0);
+    s--;
+  }
+  return ((char *)s);
+}
+
+/* Check if the font path element is a directory which can be examined
+ * (for example the font may be from a font server
+ * (e.g. pFont->fpe->name == "tcp/:7100"))
+ */
+static
+Bool IsFPEaReadableDir(FontPtr pFont)
+{
+  const char *fpe_name = pFont->fpe->name;
+  if (!fpe_name)
+    return False;
+
+#define MODEL_FONTPATH_PREFIX     "PRINTER:"
+#define MODEL_FONTPATH_PREFIX_LEN 8
+  /* Strip model-specific font path prefix if there is one... */
+  if (!strncmp(fpe_name, MODEL_FONTPATH_PREFIX, MODEL_FONTPATH_PREFIX_LEN))
+    fpe_name += MODEL_FONTPATH_PREFIX_LEN;
+    
+  if (access(fpe_name, F_OK) == 0)
+  {
+    return True;
+  }
+
+  return False;
+}
+
+static
+char *getFontFilename(FontPtr pFont)
+{
+  FontDirectoryPtr   dir;
+  const char        *dlfnam;
+  FILE              *file;
+  struct stat        statb;
+  int                count, i, status;
+  char               buf[512];
+  char              *front, *end, *fn;
+  char               font_dir_fname[PATH_MAX],  /* Full path of fonts.dir */
+                     font_file_fname[PATH_MAX]; /* Name of font file (excluding path) */
+
+#ifdef XP_USE_FREETYPE
+  if( PsIsFreeTypeFont(pFont) )
+  {
+    const char  *fontname = PsGetFTFontFileName(pFont);
+
+#ifdef DEBUG_gisburn
+    fprintf(stderr, "getFontFilename: freetype font, file='%s'\n", fontname?fontname:"<NULL>");
+#endif /* DEBUG_gisburn */  
+
+    if( !fontname )
+      return NULL;
+      
+    return strdup(fontname);
+  }
+#endif /* XP_USE_FREETYPE */
+
+  if (!IsFPEaReadableDir(pFont))
+  {
+#ifdef DEBUG_gisburn
+    fprintf(stderr, "getFontFilename: '%s' no valid font path on disk\n", pFont->fpe->name);
+#endif /* DEBUG_gisburn */  
+    return NULL;
+  }
+
+  dir = pFont->fpe->private;
+  sprintf(font_dir_fname, "%s%s", dir->directory, "fonts.dir");  
+  
+  if (!(dlfnam = PsGetFontName(pFont)))
+    return NULL;
+  
+  file = fopen(font_dir_fname, "r");
+  if (file)
+  {
+    if (fstat (fileno(file), &statb) == -1)
+      return NULL;
+
+    while( fgets(buf, sizeof(buf)-1, file) )
+    {             
+      if ((fn = strstr(buf, " -")))
+      {
+        strcpy(font_file_fname, buf);
+        font_file_fname[fn - buf] = '\0';
+        fn++;
+        if ((front = str_case_str(fn, "normal-")))
+        {
+          fn[front - fn] = '\0';
+          if (str_case_str(dlfnam, fn))        
+          {
+            char full_font_file_path[PATH_MAX];
+
+            fclose(file);
+            
+            sprintf(full_font_file_path, "%s%s", dir->directory, font_file_fname);
+
+#ifdef xDEBUG_gisburn
+            fprintf(stderr, "getFontFilename: returning '%s'\n", full_font_file_path);
+#endif /* DEBUG_gisburn */
+            return strdup(full_font_file_path); 
+          }
+        }
+      }
+    }
+  }
+  font_file_fname[0] = '\0';
+  fclose(file);
+
+#ifdef DEBUG_gisburn
+  fprintf(stderr, "getFontFilename: returning NULL\n");
+#endif /* DEBUG_gisburn */
+
+  return NULL;
+}
+
+static
+PsFontTypeInfoRec *PsFindFontTypeInfoRec(DrawablePtr pDrawable, FontPtr pFont)
+{
+  PsContextPrivRec  *cPriv = PsGetPsContextPriv(pDrawable);
+  PsFontTypeInfoRec *rec;
+  const char        *psname;
+  char              *font_filename;
+  char              *encname;
+#ifdef XP_USE_FREETYPE
+  Bool               is_freetypefont;
+#endif /* XP_USE_FREETYPE */
+  
+#ifdef XP_USE_FREETYPE
+  is_freetypefont = PsIsFreeTypeFont(pFont);
+#endif /* XP_USE_FREETYPE */
+  encname         = PsGetEncodingName(pFont);
+
+  /* First try: Search by PostScript font name */
+  psname = PsGetPSFontName(pFont);
+  if (psname)
+  {
+    for( rec = cPriv->fontTypeInfoRecords ; rec != NULL ; rec = rec->next )
+    {
+#ifdef XP_USE_FREETYPE
+      if (is_freetypefont)
+      {
+        if (rec->adobe_ps_name)
+        {
+          if ((rec->font_type == PSFTI_FONT_TYPE_FREETYPE) &&
+              (!strcmp(rec->adobe_ps_name, psname)) &&
+              (!strcmp(rec->ft_download_encoding, encname)))
+          {
+            return rec;
+          }
+        }
+      }
+      else
+#endif /* XP_USE_FREETYPE */
+      {
+        if (rec->adobe_ps_name)
+        {
+          if ((rec->font_type != PSFTI_FONT_TYPE_FREETYPE) &&
+              (!strcmp(rec->adobe_ps_name, psname)))
+          {
+            return rec;
+          }
+        }
+      }
+    }
+  }
+
+  /* Last attempt: Search by filename */
+  font_filename = getFontFilename(pFont);
+  if (font_filename)
+  {
+    for( rec = cPriv->fontTypeInfoRecords ; rec != NULL ; rec = rec->next )
+    {
+      if (rec->filename)
+      {
+#ifdef XP_USE_FREETYPE
+        if (is_freetypefont)
+        {
+          if ( (rec->font_type == PSFTI_FONT_TYPE_FREETYPE) &&
+               (!strcasecmp(rec->filename, font_filename)) && 
+               (!strcasecmp(rec->ft_download_encoding, encname)) )
+          {
+            free(font_filename);
+            return rec;
+          }
+        }
+        else
+#endif /* XP_USE_FREETYPE */
+        {
+          if ( (rec->font_type != PSFTI_FONT_TYPE_FREETYPE) &&
+               (!strcasecmp(rec->filename, font_filename)) )
+          {
+            free(font_filename);
+            return rec;
+          }
+        }
+      }
+    }
+    
+    free(font_filename);
+  }
+  
+  return NULL;
+}
+
+static
+void PsAddFontTypeInfoRec(DrawablePtr pDrawable, PsFontTypeInfoRec *add_rec)
+{ 
+  PsContextPrivRec *cPriv = PsGetPsContextPriv(pDrawable);
+
+  /* ToDO: Always move the last used entry to the top that the list get's
+   * sorted in an efficient order... :-) */
+  add_rec->next = cPriv->fontTypeInfoRecords;
+  cPriv->fontTypeInfoRecords = add_rec;
+}
+
+static
+Bool strcaseendswith(const char *str, const char *suffix)
+{
+  const char *s;
+
+  s = str + strlen(str) - strlen(suffix);
+
+  if (!strcasecmp(s, suffix))
+    return True;
+
+  return False;
+}
+
+
+static
+int getFontFileType( const char *filename )
+{
+  int type;
+
+  /* Is this a Adobe PostScript Type 1 binary font (PFB) ? */
+  if( strcaseendswith(filename, ".pfb") )
+  {
+    type = PSFTI_FONT_TYPE_PS_TYPE1_PFB;
+  }
+  /* Is this a Adobe PostScript ASCII font (PFA) ? */
+  else if( strcaseendswith(filename, ".pfa") )
+  {
+    type = PSFTI_FONT_TYPE_PS_TYPE1_PFA;
+  }
+  /* Is this a PMF(=Printer Metrics File) ? */
+  else if( strcaseendswith(filename, ".pmf") )
+  {
+    type = PSFTI_FONT_TYPE_PMF;
+  }
+  /* Is this a TrueType font file ? */
+  else if( strcaseendswith(filename, ".ttf") ||
+           strcaseendswith(filename, ".ttc") ||
+           strcaseendswith(filename, ".otf") ||
+           strcaseendswith(filename, ".otc") )
+  {
+    type = PSFTI_FONT_TYPE_TRUETYPE;
+  }
+  else
+  {
+    type = PSFTI_FONT_TYPE_OTHER;
+  }
+
+#ifdef XP_USE_FREETYPE
+  {
+    XpContextPtr  pCon;
+    char         *downloadfonts;
+    pCon = XpGetPrintContext(requestingClient);
+    downloadfonts = XpGetOneAttribute(pCon, XPPrinterAttr, "xp-psddx-download-fonts");
+    if( downloadfonts )
+    {
+      /* Should we download PS Type1 fonts as PS Type1||Type3 ? */
+      if( (type == PSFTI_FONT_TYPE_PS_TYPE1_PFA) &&
+          (strstr(downloadfonts, "pfa") != NULL) )
+      {
+        type = PSFTI_FONT_TYPE_FREETYPE;
+      }
+
+      if( (type == PSFTI_FONT_TYPE_PS_TYPE1_PFB) &&
+          (strstr(downloadfonts, "pfb") != NULL) )
+      {
+        type = PSFTI_FONT_TYPE_FREETYPE;
+      }
+
+      /* Should we download TrueType fonts as PS Type1||Type3 ? */
+      if( (type == PSFTI_FONT_TYPE_TRUETYPE) &&
+          ((strstr(downloadfonts, "ttf") != NULL) || 
+           (strstr(downloadfonts, "ttc") != NULL) || 
+           (strstr(downloadfonts, "otf") != NULL) || 
+           (strstr(downloadfonts, "otc") != NULL)) )
+      {
+        type = PSFTI_FONT_TYPE_FREETYPE;
+      }
+    }
+  }
+#endif /* XP_USE_FREETYPE */
+
+#ifdef DEBUG_gisburn
+  fprintf(stderr, "getFontFileType: '%s' is %d\n", filename, (int)type);
+#endif /* DEBUG_gisburn */
+  return type;
+}
+
+PsFTDownloadFontType PsGetFTDownloadFontType(void)
+{
+  PsFTDownloadFontType  downloadfonttype;
+  XpContextPtr          pCon;
+  char                 *psfonttype;
+
+  pCon       = XpGetPrintContext(requestingClient);
+  psfonttype = XpGetOneAttribute(pCon, XPPrinterAttr, "xp-psddx-download-font-type");
+
+  if( !psfonttype || !strlen(psfonttype) )
+  {
+    return PsFontType1; /* Default download font type is PS Type1 */
+  }
+
+  if( !strcmp(psfonttype, "bitmap") )
+  {
+    downloadfonttype = PsFontBitmap;
+  }
+  else if( !strcmp(psfonttype, "pstype3") )
+  {
+    downloadfonttype = PsFontType3;
+  }
+  else if( !strcmp(psfonttype, "pstype1") )
+  { 
+    downloadfonttype = PsFontType1;
+  }
+  else
+  {
+     FatalError("PS DDX: XPPrinterAttr/xp-psddx-download-freetype-font-type='%s' not implemented\n", psfonttype);
+     return 0; /* NO-OP, FatalError() will call |exit()| */
+  }
+  
+  return downloadfonttype;
+}
+
+static
+PsFontTypeInfoRec *PsCreateFontTypeInfoRec(DrawablePtr pDrawable, FontPtr pFont)
+{
+  char              *dlfnam;
+  PsFontTypeInfoRec *rec;
+  char              *psname;
+  
+  if (!(dlfnam = PsGetFontName(pFont)))
+    return NULL;
+
+  if (!(rec = (PsFontTypeInfoRec *)xalloc(sizeof(PsFontTypeInfoRec))))
+    return NULL;
+  memset(rec, 0, sizeof(PsFontTypeInfoRec));
+
+  rec->next              = NULL;
+
+  if (rec->filename = getFontFilename(pFont))
+  {
+    rec->font_type = getFontFileType(rec->filename);   
+  }
+  else
+  {
+    rec->filename  = NULL;
+    rec->font_type = PSFTI_FONT_TYPE_OTHER;
+  }
+
+  rec->adobe_ps_name         = PsGetPSFontName(pFont);
+  rec->ft_download_encoding  = PsGetEncodingName(pFont);
+  rec->ft_download_font_type = PsGetFTDownloadFontType();
+  rec->download_ps_name      = NULL;
+
+#define SET_FONT_DOWNLOAD_STATUS(rec, downloaded) { int i; for (i = 0 ; i < 256 ; i++) { (rec)->alreadyDownloaded[i]=(downloaded); } }
+
+  /* Set some flags based on the font type */
+  switch( rec->font_type )
+  {
+    case PSFTI_FONT_TYPE_PS_TYPE1_PFA:
+    case PSFTI_FONT_TYPE_PS_TYPE1_PFB:
+      rec->downloadableFont  = True;
+      SET_FONT_DOWNLOAD_STATUS(rec, False);
+      rec->is_iso_encoding = PsIsISOLatin1Encoding(pFont);
+      break;
+
+    case PSFTI_FONT_TYPE_PMF:
+      rec->downloadableFont  = True; /* This font is in printer's ROM */
+      SET_FONT_DOWNLOAD_STATUS(rec, True);
+      rec->is_iso_encoding = PsIsISOLatin1Encoding(pFont);
+      break;
+    
+    case PSFTI_FONT_TYPE_TRUETYPE:
+      /* Note: TrueType font download not implemented */
+      rec->downloadableFont  = False;
+      SET_FONT_DOWNLOAD_STATUS(rec, False);
+      rec->is_iso_encoding = PsIsISOLatin1Encoding(pFont);
+      break;
+
+#ifdef XP_USE_FREETYPE
+    case PSFTI_FONT_TYPE_FREETYPE:
+      if( rec->ft_download_font_type == PsFontType1 ||
+          rec->ft_download_font_type == PsFontType3 )
+      {
+        rec->downloadableFont = True;
+      }
+      else
+      {
+        rec->downloadableFont = False;
+      }
+
+      SET_FONT_DOWNLOAD_STATUS(rec, False);
+      rec->is_iso_encoding   = False; /* Freetype--->PS Type1/Type3 uses always non-iso PS encoding for now */
+      break;
+#endif /* XP_USE_FREETYPE */
+
+    case PSFTI_FONT_TYPE_OTHER:
+    default:
+      rec->downloadableFont  = False;
+      SET_FONT_DOWNLOAD_STATUS(rec, False);
+      rec->is_iso_encoding = PsIsISOLatin1Encoding(pFont);
+      break;
+  }
+  
+#ifdef XP_USE_FREETYPE
+  if( (rec->font_type == PSFTI_FONT_TYPE_FREETYPE) )
+  {
+    char *s;
+    register int c;
+
+    if( rec->adobe_ps_name )
+    {
+      rec->download_ps_name = malloc(strlen(rec->adobe_ps_name) + strlen(rec->ft_download_encoding) + 2);
+      sprintf(rec->download_ps_name, "%s_%s", rec->adobe_ps_name, rec->ft_download_encoding);
+    }
+    else
+    {
+      /* Unfortunately not all TTF fonts have a PostScript font name (like
+       * Solaris TTF fonts in /usr/openwin/lib/locale/ko.UTF-8/X11/fonts/TrueType,
+       * /usr/openwin/lib/locale/ko/X11/fonts/TrueType) - in this case we
+       * have to generate a font name
+       */
+      char        ftfontname[64];
+      static long myfontindex = 0L;
+      sprintf(ftfontname, "psfont_%lx", myfontindex++);
+      
+      rec->download_ps_name = malloc(strlen(ftfontname) + strlen(rec->ft_download_encoding) + 2);
+      sprintf(rec->download_ps_name, "%s_%s", ftfontname, rec->ft_download_encoding);
+      
+      fprintf(stderr, "PsCreateFontTypeInfoRec: Note: '%s' has no PS font name, using '%s' for now.\n", dlfnam, rec->download_ps_name);
+    }
+    
+    /* Make sure the font name we use for download is a valid PS font name */
+    for( s = rec->download_ps_name ; *s != '\0'; s++ )
+    {
+      c = *s;
+      
+      /* Check for allowed chars, invalid ones are replaced with a '_'
+       * (and check that the first char is not a digit) */
+      if( !(isalnum(c) || c == '.' || c == '_' || c == '-') || (s==rec->download_ps_name && isdigit(c)) )
+      {
+        *s = '_';
+      }
+    }
+  }
+  else
+#endif /* XP_USE_FREETYPE */
+  {
+    if( rec->adobe_ps_name )
+    {
+      rec->download_ps_name = strdup(rec->adobe_ps_name);
+    }
+    else
+    {
+      rec->download_ps_name = NULL;
+    }
+  }
+
+  /* Safeguard - only treat font as downloadable when we have a PS font name!! */
+  if (!rec->download_ps_name && rec->downloadableFont)
+  {
+    /* XXX: Log this message to the log when the logging service has been hook'ed up */
+    fprintf(stderr, "PsCreateFontTypeInfoRec: Safeguard: No PS font name for '%s'!\n", dlfnam);
+    rec->downloadableFont = False;
+  }
+
+#ifdef DEBUG_gisburn
+  fprintf(stderr, "PsCreateFontTypeInfoRec: Created PsFontTypeInfoRec '%s' ('%s'/'%s')\n",
+          ((rec->filename)        ?(rec->filename)     :("<null>")),
+          ((rec->adobe_ps_name)   ?(rec->adobe_ps_name):("<null>")),
+          ((rec->download_ps_name)?(rec->download_ps_name):("<null>")));
+#endif /* DEBUG_gisburn */
+
+  return rec;
+}
+
+static
+PsFontTypeInfoRec *PsGetFontTypeInfoRec(DrawablePtr pDrawable, FontPtr pFont)
+{
+  PsFontTypeInfoRec *rec;
+  char              *dlfnam;
+
+  if(!(dlfnam = PsGetFontName(pFont)))
+    return NULL;
+  
+  rec = PsFindFontTypeInfoRec(pDrawable, pFont);
+  if (rec)
+    return rec;
+    
+  rec = PsCreateFontTypeInfoRec(pDrawable, pFont);
+  if (!rec)
+    return NULL;
+  
+  PsAddFontTypeInfoRec(pDrawable, rec);
+
+  return rec;
+}
+
+static
+void PsFreeFontTypeInfoRecords( PsContextPrivPtr priv )
+{
+  PsFontTypeInfoRec *curr, *next;
+  curr = priv->fontTypeInfoRecords;
+  while( curr != NULL )
+  {
+    if (curr->filename)
+      free(curr->filename); /* Free memory allocated by |strdup()| */
+
+    if (curr->download_ps_name)
+      free(curr->download_ps_name);
+      
+    next = curr->next;
+    xfree(curr);
+    curr = next;
+  }
+}
+
+static
+PsFontInfoRec *PsFindFontInfoRec(DrawablePtr pDrawable, FontPtr pFont)
+{
+  PsContextPrivRec *cPriv = PsGetPsContextPriv(pDrawable);
+  PsFontInfoRec    *rec;
+
+  if (!pFont)
+    return NULL;
+
+  for( rec = cPriv->fontInfoRecords ; rec != NULL ; rec = rec->next )
+  {
+    if ((rec->font == pFont) && 
+        (rec->font_fontPrivate == pFont->fontPrivate))
+      return rec;
+  }
+  
+  return NULL;
+}
+
+static
+void PsAddFontInfoRec(DrawablePtr pDrawable, PsFontInfoRec *add_rec)
+{ 
+  PsContextPrivRec *cPriv = PsGetPsContextPriv(pDrawable);
+
+  /* ToDO: Always move the last used entry to the top that the list get's
+   * sorted in an efficient order... :-) */
+  add_rec->next = cPriv->fontInfoRecords;
+  cPriv->fontInfoRecords = add_rec;
+}
+
+static
+PsFontInfoRec *PsCreateFontInfoRec(DrawablePtr pDrawable, FontPtr pFont)
+{
+  PsFontInfoRec     *rec;
+  PsFontTypeInfoRec *ftir;
+  
+  if (!(ftir = PsGetFontTypeInfoRec(pDrawable, pFont)))
+    return NULL;
+
+  if (!(rec = (PsFontInfoRec *)xalloc(sizeof(PsFontInfoRec))))
+    return NULL;
+  memset(rec, 0, sizeof(PsFontInfoRec));
+
+  rec->font     = pFont;
+  rec->font_fontPrivate = pFont->fontPrivate;
+  rec->ftir     = ftir;
+  rec->next     = NULL;
+  rec->dfl_name = PsGetFontName(pFont);
+  rec->size     = PsGetFontSize(pFont, rec->mtx);
+
+#ifdef DEBUG_gisburn
+  fprintf(stderr, "PsCreateFontInfoRec: Created PsFontInfoRec '%s'\n",
+          ((rec->dfl_name)?(rec->dfl_name):("<null>")));
+#endif /* DEBUG_gisburn */
+
+  return rec;
+}
+
+PsFontInfoRec *PsGetFontInfoRec(DrawablePtr pDrawable, FontPtr pFont)
+{
+  PsFontInfoRec *rec;
+
+  rec = PsFindFontInfoRec(pDrawable, pFont);
+  if (rec)
+    return rec;
+    
+  rec = PsCreateFontInfoRec(pDrawable, pFont);
+  if (!rec)
+    return NULL;
+  
+  PsAddFontInfoRec(pDrawable, rec);
+
+  return rec;
+}
+
+void PsFreeFontInfoRecords( PsContextPrivPtr priv )
+{
+  PsFontInfoRec *curr, *next;
+  curr = priv->fontInfoRecords;
+  while( curr != NULL )
+  {  
+    next = curr->next;
+    xfree(curr);
+    curr = next;
+  }
+  
+  PsFreeFontTypeInfoRecords(priv);
+
+  priv->fontTypeInfoRecords = NULL;
+  priv->fontInfoRecords     = NULL;
+}
diff --git a/Xprint/ps/PsGC.c b/Xprint/ps/PsGC.c
index 1c2877231..28c1f718b 100644
--- a/Xprint/ps/PsGC.c
+++ b/Xprint/ps/PsGC.c
@@ -57,7 +57,6 @@ in this Software without prior written authorization from The Open Group.
  * or other dealings in this Software without prior written authorization
  * from said copyright holders.
  */
-/* $XFree86: xc/programs/Xserver/Xprint/ps/PsGC.c,v 1.7 2003/10/29 22:11:55 tsi Exp $ */
 
 /*******************************************************************
 **
@@ -171,6 +170,26 @@ PsGetDrawablePrivateStuff(
   }
 }
 
+PsContextPrivPtr
+PsGetPsContextPriv( DrawablePtr pDrawable )
+{
+  XpContextPtr     pCon;
+  PsContextPrivPtr cPriv;
+
+  switch(pDrawable->type)
+  {
+    case DRAWABLE_PIXMAP:
+      return FALSE;
+    case DRAWABLE_WINDOW:
+      pCon = PsGetContextFromWindow((WindowPtr)pDrawable);
+      if (pCon != NULL)
+      {
+        return pCon->devPrivates[PsContextPrivateIndex].ptr;
+      }
+  }
+  return NULL;
+}
+
 int
 PsUpdateDrawableGC(
   GCPtr        pGC,
@@ -181,6 +200,7 @@ PsUpdateDrawableGC(
   GC               dGC;
   unsigned long    valid;
   int              i;
+  PsContextPrivPtr cPriv;
   BoxPtr           boxes;
 
   if (!PsGetDrawablePrivateStuff(pDrawable, &dGC, &valid, psOut, cMap))
@@ -232,6 +252,8 @@ PsUpdateDrawableGC(
         PsOut_Offset(*psOut, pDrawable->x, pDrawable->y);
         PsOut_Clip(*psOut, pGC->clientClipType, (PsClipPtr)pGC->clientClip);
       }
+      cPriv = ( PsGetContextFromWindow( (WindowPtr)pDrawable ) )
+             ->devPrivates[PsContextPrivateIndex].ptr;
       break;
   }
   return TRUE;
diff --git a/Xprint/ps/PsInit.c b/Xprint/ps/PsInit.c
index 193fc0518..224d08335 100644
--- a/Xprint/ps/PsInit.c
+++ b/Xprint/ps/PsInit.c
@@ -71,9 +71,8 @@ in this Software without prior written authorization from The Open Group.
 **    *  Copyright:	Copyright 1996 The Open Group, Inc.
 **    *
 **    *********************************************************
-**
+** 
 ********************************************************************/
-/* $XFree86: xc/programs/Xserver/Xprint/ps/PsInit.c,v 1.14 2003/10/29 22:11:55 tsi Exp $ */
 
 #include <stdio.h>
 #include <string.h>
@@ -109,8 +108,12 @@ InitializePsDriver(ndx, pScreen, argc, argv)
   char      **argv;
 {
 #if 0
+  int               maxXres, maxYres, maxWidth, maxHeight;
+  int               maxRes, maxDim, numBytes;
   PsScreenPrivPtr   pPriv;
 #endif
+  char            **printerNames;
+  int               numPrinters;
   int               nVisuals;
   int               nDepths;
   VisualPtr         visuals;
@@ -188,7 +191,7 @@ InitializePsDriver(ndx, pScreen, argc, argv)
 
   visuals[1].vid             = FakeClientID(0);
   visuals[1].class           = PseudoColor;
-  visuals[1].bitsPerRGBValue = 0;
+  visuals[1].bitsPerRGBValue = 8;
   visuals[1].ColormapEntries = 256;
   visuals[1].nplanes         = 8;
   visuals[1].redMask         = 0x0;
@@ -209,7 +212,7 @@ InitializePsDriver(ndx, pScreen, argc, argv)
 /*  THE FOLLOWING CAUSES SERVER DEFAULT VISUAL TO BE 24 BIT  */
 /*  miScreenInit(pScreen, (pointer)0,
 	       pScreen->width, pScreen->height,
-	       pScreen->width / (pScreen->mmWidth / 25.40),
+	       pScreen->width / (pScreen->mmWidth / 25.40), 
 	       pScreen->height / (pScreen->mmHeight / 25.40),
 	       0, 24, nDepths,
                depths, visuals[1].vid, nVisuals, visuals); */
@@ -217,7 +220,7 @@ InitializePsDriver(ndx, pScreen, argc, argv)
 /*  THE FOLLOWING CAUSES SERVER DEFAULT VISUAL TO BE 8 BIT  */
   miScreenInit(pScreen, (pointer)0,
 	       pScreen->width, pScreen->height,
-	       (int) (pScreen->width / (pScreen->mmWidth / 25.40)),
+	       (int) (pScreen->width / (pScreen->mmWidth / 25.40)), 
 	       (int) (pScreen->height / (pScreen->mmHeight / 25.40)),
 	       0, 8, nDepths,
                depths, visuals[1].vid, nVisuals, visuals);
@@ -243,7 +246,7 @@ AllocatePsPrivates(ScreenPtr pScreen)
                           sizeof(PsWindowPrivRec));
 
     PsContextPrivateIndex = XpAllocateContextPrivateIndex();
-    XpAllocateContextPrivate(PsContextPrivateIndex,
+    XpAllocateContextPrivate(PsContextPrivateIndex, 
                              sizeof(PsContextPrivRec));
 
     PsPixmapPrivateIndex = AllocatePixmapPrivateIndex();
@@ -278,7 +281,7 @@ PsInitContext(pCon)
   XpDriverFuncsPtr pFuncs;
   PsContextPrivPtr pConPriv;
   char *server, *attrStr;
-
+    
   /*
    * Initialize the attribute store for this printer.
    */
@@ -304,18 +307,23 @@ PsInitContext(pCon)
   pFuncs->GetMediumDimensions = PsGetMediumDimensions;
   pFuncs->GetReproducibleArea = PsGetReproducibleArea;
   pFuncs->SetImageResolution = PsSetImageResolution;
-
+    
   /*
    * Set up the context privates
    */
   pConPriv =
       (PsContextPrivPtr)pCon->devPrivates[PsContextPrivateIndex].ptr;
 
-  pConPriv->jobFileName  = (char *)NULL;
-  pConPriv->pJobFile     = (FILE *)NULL;
-
-  pConPriv->getDocClient = (ClientPtr)NULL;
-  pConPriv->getDocBufSize = 0;
+  memset(pConPriv, 0, sizeof(PsContextPrivRec));
+  pConPriv->jobFileName         = (char *)NULL;
+  pConPriv->pJobFile            = (FILE *)NULL;
+  pConPriv->dash                = (unsigned char *)NULL;
+  pConPriv->validGC             = 0;
+  pConPriv->getDocClient        = (ClientPtr)NULL;
+  pConPriv->getDocBufSize       = 0;
+  pConPriv->pPsOut              = NULL;
+  pConPriv->fontInfoRecords     = NULL;
+  pConPriv->fontTypeInfoRecords = NULL;
 
   /*
    * document-attributes-supported
@@ -323,15 +331,15 @@ PsInitContext(pCon)
   server = XpGetOneAttribute( pCon, XPServerAttr, DOC_ATT_SUPP );
   if ((attrStr = (char *) xalloc(strlen(server) +
 				strlen(DOC_ATT_SUPP) + strlen(DOC_ATT_VAL)
-				+ strlen(PAGE_ATT_VAL) + 6)) == NULL)
+				+ strlen(PAGE_ATT_VAL) + 6)) == NULL) 
   {
       return BadAlloc;
   }
-  sprintf(attrStr, "*%s:\t%s %s %s",
+  sprintf(attrStr, "*%s:\t%s %s %s", 
 	  DOC_ATT_SUPP, server, DOC_ATT_VAL, PAGE_ATT_VAL);
   XpAugmentAttributes( pCon, XPPrinterAttr, attrStr);
   xfree(attrStr);
-
+    
   /*
    * job-attributes-supported
    */
@@ -344,7 +352,7 @@ PsInitContext(pCon)
   sprintf(attrStr, "*%s:\t%s %s", JOB_ATT_SUPP, server, JOB_ATT_VAL);
   XpAugmentAttributes(pCon, XPPrinterAttr, attrStr);
   xfree(attrStr);
-
+    
   /*
    * xp-page-attributes-supported
    */
@@ -375,7 +383,7 @@ PsDestroyContext(pCon)
 {
   PsContextPrivPtr pConPriv =
       (PsContextPrivPtr)pCon->devPrivates[PsContextPrivateIndex].ptr;
-
+    
   if( pConPriv->pJobFile!=(FILE *)NULL )
   {
     fclose(pConPriv->pJobFile);
@@ -388,6 +396,11 @@ PsDestroyContext(pCon)
     pConPriv->jobFileName = (char *)NULL;
   }
 
+  PsFreeFontInfoRecords(pConPriv);
+
+  /* Reset context to make sure we do not use any stale/invalid/obsolete data */
+  memset(pConPriv, 0, sizeof(PsContextPrivRec));
+
 /*### free up visuals/depths ###*/
 
   return Success;
diff --git a/Xprint/ps/PsLine.c b/Xprint/ps/PsLine.c
index ff4c6da80..23e105804 100644
--- a/Xprint/ps/PsLine.c
+++ b/Xprint/ps/PsLine.c
@@ -73,7 +73,6 @@ in this Software without prior written authorization from The Open Group.
 **    *********************************************************
 ** 
 ********************************************************************/
-/* $XFree86: xc/programs/Xserver/Xprint/ps/PsLine.c,v 1.6 2001/12/14 19:59:16 dawes Exp $ */
 
 #include "Ps.h"
 #include "gcstruct.h"
diff --git a/Xprint/ps/PsMisc.c b/Xprint/ps/PsMisc.c
index 75f692d56..86d862ce1 100644
--- a/Xprint/ps/PsMisc.c
+++ b/Xprint/ps/PsMisc.c
@@ -73,7 +73,6 @@ in this Software without prior written authorization from The Open Group.
 **    *********************************************************
 ** 
 ********************************************************************/
-/* $XFree86: xc/programs/Xserver/Xprint/ps/PsMisc.c,v 1.6 2001/12/14 19:59:16 dawes Exp $ */
 
 #include "Xos.h"	/* for SIGCLD on pre-POSIX systems */
 #include <stdio.h>
diff --git a/Xprint/ps/PsPixel.c b/Xprint/ps/PsPixel.c
index 09a89fa2d..c2c360d2e 100644
--- a/Xprint/ps/PsPixel.c
+++ b/Xprint/ps/PsPixel.c
@@ -73,7 +73,6 @@ in this Software without prior written authorization from The Open Group.
 **    *********************************************************
 ** 
 ********************************************************************/
-/* $XFree86: xc/programs/Xserver/Xprint/ps/PsPixel.c,v 1.6 2001/12/14 19:59:16 dawes Exp $ */
 
 #include <stdio.h>
 
diff --git a/Xprint/ps/PsPixmap.c b/Xprint/ps/PsPixmap.c
index 2e821aa1c..2c3e43245 100644
--- a/Xprint/ps/PsPixmap.c
+++ b/Xprint/ps/PsPixmap.c
@@ -57,7 +57,7 @@ in this Software without prior written authorization from The Open Group.
  * or other dealings in this Software without prior written authorization
  * from said copyright holders.
  */
-/* $XFree86: xc/programs/Xserver/Xprint/ps/PsPixmap.c,v 1.5 2001/12/14 19:59:16 dawes Exp $ */
+
 /*******************************************************************
 **
 **    *********************************************************
@@ -79,6 +79,10 @@ in this Software without prior written authorization from The Open Group.
 
 #include "Ps.h"
 
+#define BitsPerPixel(d) (\
+  (1 << PixmapWidthPaddingInfo[d].padBytesLog2) * 8 / \
+  (PixmapWidthPaddingInfo[d].padRoundUp+1))
+
 PixmapPtr
 PsCreatePixmap(
   ScreenPtr pScreen,
@@ -199,7 +203,7 @@ PsGetFreeDisplayBlock(PsPixmapPrivPtr priv)
   return(disp);
 }
 
-static void
+void
 PsReplay(DisplayElmPtr elm, DrawablePtr pDrawable)
 {
   switch(elm->type)
@@ -488,8 +492,6 @@ PsCreateFillElementList(PixmapPtr pix, int *nElms)
         case PolyFillArcCmd:
           *nElms += elm->c.arcs.nArcs;
           break;
-        default:
-          break;
       }
     }
   }
@@ -552,8 +554,6 @@ PsCreateFillElementList(PixmapPtr pix, int *nElms)
                 *nElms += 1;
               }
               break;
-            default:
-              break;
           }
         }
       }
diff --git a/Xprint/ps/PsPolygon.c b/Xprint/ps/PsPolygon.c
index 0cd826f43..a5b373775 100644
--- a/Xprint/ps/PsPolygon.c
+++ b/Xprint/ps/PsPolygon.c
@@ -73,7 +73,6 @@ in this Software without prior written authorization from The Open Group.
 **    *********************************************************
 ** 
 ********************************************************************/
-/* $XFree86: xc/programs/Xserver/Xprint/ps/PsPolygon.c,v 1.7 2001/12/14 19:59:17 dawes Exp $ */
 
 #include "Ps.h"
 #include "gcstruct.h"
@@ -176,7 +175,8 @@ PsFillPolygon(
     }
     else
     {
-      pts[0].x = pPoints[0].x; pts[0].y = pPoints[0].y;
+      i = 0;
+      pts[0].x = pPoints[i].x; pts[0].y = pPoints[i].y;
       for( i=1 ; i<nPoints ;  i++ )
       {
         pts[i].x = pts[i-1].x+pPoints[i].x;
diff --git a/Xprint/ps/PsPrint.c b/Xprint/ps/PsPrint.c
index 8a06205e5..f0356d705 100644
--- a/Xprint/ps/PsPrint.c
+++ b/Xprint/ps/PsPrint.c
@@ -73,7 +73,6 @@ in this Software without prior written authorization from The Open Group.
 **    *********************************************************
 ** 
 ********************************************************************/
-/* $XFree86: xc/programs/Xserver/Xprint/ps/PsPrint.c,v 1.11 2001/12/21 21:02:06 dawes Exp $ */
 
 #include <stdio.h>
 #include <string.h>
@@ -91,6 +90,7 @@ in this Software without prior written authorization from The Open Group.
 #include "Ps.h"
 
 #include "windowstr.h"
+#include "attributes.h"
 #include "Oid.h"
 
 /* static utility function to get document/page attributes */
@@ -206,6 +206,8 @@ PsEndJob(
     unlink(priv->jobFileName);
     xfree(priv->jobFileName);
     priv->jobFileName = (char *)NULL;
+    
+    PsFreeFontInfoRecords(priv);
 
     return Success;
   }
@@ -214,6 +216,7 @@ PsEndJob(
    * Append any trailing information here
    */
   PsOut_EndFile(priv->pPsOut, 0);
+  priv->pPsOut = NULL;
   
   /* this is where we find out if we're out of space */
   error = (fclose(priv->pJobFile) == EOF);
@@ -233,6 +236,8 @@ PsEndJob(
     xfree(priv->jobFileName);
     priv->jobFileName = (char *)NULL;
 
+    PsFreeFontInfoRecords(priv);
+
     return BadAlloc;
   }
     
@@ -265,10 +270,12 @@ PsEndJob(
   xfree(priv->jobFileName);
   priv->jobFileName = (char *)NULL;
 
+  PsFreeFontInfoRecords(priv);
+    
 #ifdef BM_CACHE
   PsBmClearImageCache();
 #endif
-        
+
   return r;
 }
 
@@ -281,10 +288,13 @@ PsStartPage(
 {
   int                iorient, iplex, icount, ires;
   unsigned short     iwd, iht;
+  register WindowPtr pChild;
   PsContextPrivPtr   pConPriv =
      (PsContextPrivPtr)pCon->devPrivates[PsContextPrivateIndex].ptr;
   PsWindowPrivPtr    pWinPriv =
      (PsWindowPrivPtr)pWin->devPrivates[PsWindowPrivateIndex].ptr;
+  char               s[80];
+  xEvent event;
 
 /*
  * Put a pointer to the context in the window private structure
@@ -298,9 +308,16 @@ PsStartPage(
    *  Start the page
    */
   if (pConPriv->pPsOut == NULL) {
-      pConPriv->pPsOut = PsOut_BeginFile(pConPriv->pJobFile,
-				   iorient, icount, iplex, ires,
-				   (int)iwd, (int)iht, False);
+    char *title;
+    
+    /* get job level attributes */ 
+    title = XpGetOneAttribute(pCon, XPJobAttr, "job-name");
+
+    pConPriv->pPsOut = PsOut_BeginFile(pConPriv->pJobFile,
+                                       title, iorient, icount, iplex, ires,
+                                       (int)iwd, (int)iht, False);
+    pConPriv->fontInfoRecords     = NULL;
+    pConPriv->fontTypeInfoRecords = NULL;
   }
   PsOut_BeginPage(pConPriv->pPsOut, iorient, icount, iplex, ires,
 		  (int)iwd, (int)iht);
@@ -348,15 +365,22 @@ PsStartDoc(XpContextPtr pCon, XPDocumentType type)
 {
   int                iorient, iplex, icount, ires;
   unsigned short     iwd, iht;
+  char              *title;
   PsContextPrivPtr   pConPriv = 
       (PsContextPrivPtr)pCon->devPrivates[PsContextPrivateIndex].ptr;
 
+  /* get job level attributes */ 
+  title = XpGetOneAttribute(pCon, XPJobAttr, "job-name");
+ 
   /* get document level attributes */
   S_GetPageAttributes(pCon,&iorient,&icount,&iplex,&ires,&iwd,&iht);
 
   pConPriv->pPsOut = PsOut_BeginFile(pConPriv->pJobFile,
-                                   iorient, icount, iplex, ires,
-                                   (int)iwd, (int)iht, (type == XPDocRaw));
+                                     title, iorient, icount, iplex, ires,
+                                     (int)iwd, (int)iht, (Bool)(type == XPDocRaw));
+
+  pConPriv->fontInfoRecords     = NULL;
+  pConPriv->fontTypeInfoRecords = NULL;
 
   return Success;
 }
@@ -391,8 +415,11 @@ PsDocumentData(
     PsContextPrivPtr cPriv;
     PsOutPtr psOut;
 
-    if (len_fmt != 12 || !strcmp(pFmt, "PostScript 2") || len_opt)
+    if (len_fmt != 12 ||
+        strncasecmp(pFmt, "PostScript 2", len_fmt) != 0 ||
+        len_opt)
 	return BadValue;
+
     cPriv = pCon->devPrivates[PsContextPrivateIndex].ptr;
     psOut = cPriv->pPsOut;
 
diff --git a/Xprint/ps/PsSpans.c b/Xprint/ps/PsSpans.c
index 32ca58d20..a7370866e 100644
--- a/Xprint/ps/PsSpans.c
+++ b/Xprint/ps/PsSpans.c
@@ -73,7 +73,7 @@ in this Software without prior written authorization from The Open Group.
 **    *********************************************************
 ** 
 ********************************************************************/
-/* $XFree86: xc/programs/Xserver/Xprint/ps/PsSpans.c,v 1.9 2001/12/14 19:59:17 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xprint/ps/PsSpans.c,v 1.8 2001/10/28 03:32:56 tsi Exp $ */
 
 #include "Ps.h"
 #include "gcstruct.h"
diff --git a/Xprint/ps/PsText.c b/Xprint/ps/PsText.c
index b04d910d5..8bb0b0fb2 100644
--- a/Xprint/ps/PsText.c
+++ b/Xprint/ps/PsText.c
@@ -73,49 +73,13 @@ in this Software without prior written authorization from The Open Group.
 **    *********************************************************
 ** 
 ********************************************************************/
-/* $XFree86: xc/programs/Xserver/Xprint/ps/PsText.c,v 1.13 2003/10/29 22:11:55 tsi Exp $ */
 
 #include "Ps.h"
 #include "gcstruct.h"
 #include "windowstr.h"
+#include "fntfil.h"
 #include "fntfilst.h"
-#include <sys/stat.h>
-
-static int readFontName(char *fileName, char *file_name, char *dlfnam)
-{
-    FILE        *file;
-    struct stat statb;
-    char        buf[256];
-    char 	*front, *fn;
-
-    file = fopen(fileName, "r");
-    if(file)
-    {
-        if (fstat (fileno(file), &statb) == -1)
-            return 0;
-	while(fgets(buf, 255, file))
-	{
-	    if((fn = strstr(buf, " -")))
-	    {
-		strcpy(file_name, buf);
-		file_name[fn - buf - 4] = '\0';
-	        fn++;
-	        if((front = strstr(fn, "normal-")))
-	        {
-		    fn[front - fn] = '\0';
-	 	    if(strstr(dlfnam, fn))	
-		    {
-		        fclose(file);
-		        return 1; 
-		    }
-	        }
-	    }
-	}
-    }
-    file_name[0] = '\0';
-    fclose(file);
-    return 0;
-}
+#include <limits.h>
 
 int
 PsPolyText8(
@@ -147,70 +111,97 @@ PsPolyText8(
     elm->c.text8.string = (char *)xalloc(count);
     memcpy(elm->c.text8.string, string, count);
     disp->nelms += 1;
+    
+    return x;
   }
   else
   {
-    char  *fnam, ffname[512], *dlfnam;
-    FontDirectoryPtr    dir;
-    char        file_name[MAXFONTNAMELEN];
-
-    dir = pGC->font->fpe->private;
-    sprintf(ffname, "%s%s", dir->directory, "fonts.dir"); 
-
-    fnam = PsGetPSFontName(pGC->font); 
-    if(!fnam){
-	if(!(dlfnam = PsGetFontName(pGC->font))) 
-	    return x;
-	/* If Type1 font, try to download to printer first */
-	if(strstr(ffname, "Type1") && readFontName(ffname, file_name, dlfnam)) 
-	{
-            int          siz;
-            float        mtx[4];
-            PsOutPtr     psOut;
-            ColormapPtr  cMap;
-
-	    if( PsUpdateDrawableGC(pGC, pDrawable, &psOut, &cMap)==FALSE ) 
-		return x; 
-	    sprintf(ffname, "%s%s%s", dir->directory, file_name, ".pfa");
-	    PsOut_DownloadType1(psOut, file_name, ffname);
-            PsOut_Offset(psOut, pDrawable->x, pDrawable->y);
-       	    PsOut_Color(psOut, PsGetPixelColor(cMap, pGC->fgPixel)); 
-       	    siz = PsGetFontSize(pGC->font, mtx);
-       	    if( !siz ) PsOut_TextAttrsMtx(psOut, file_name, mtx, 1); 
-            else PsOut_TextAttrs(psOut, file_name, siz, 1); 
-       	    PsOut_Text(psOut, x, y, string, count, -1);
-	    return x;
-	}
-	{
-	    unsigned long n, i;
-	    int w;
-	    CharInfoPtr charinfo[255];  
-
-	    GetGlyphs(pGC->font, (unsigned long)count, 
-		(unsigned char *)string, Linear8Bit,&n, charinfo);
-	    w = 0;
-	    for (i=0; i < n; i++) w += charinfo[i]->metrics.characterWidth;
-	    if (n != 0)
-	        PsPolyGlyphBlt(pDrawable, pGC, x, y, n, 
-			charinfo, FONTGLYPHS(pGC->font));
-	    x += w;
-	}  
-    }else{
-	int          iso;
-	int          siz;
-	float        mtx[4];
-	PsOutPtr     psOut;
-	ColormapPtr  cMap;
-
-	if( PsUpdateDrawableGC(pGC, pDrawable, &psOut, &cMap)==FALSE ) return x;
-	PsOut_Offset(psOut, pDrawable->x, pDrawable->y);
-	PsOut_Color(psOut, PsGetPixelColor(cMap, pGC->fgPixel));
-	siz = PsGetFontSize(pGC->font, mtx);
-	iso = PsIsISOLatin1Encoding(pGC->font);
-	if( !siz ) PsOut_TextAttrsMtx(psOut, fnam, mtx, iso);
-	else       PsOut_TextAttrs(psOut, fnam, siz, iso);
-	PsOut_Text(psOut, x, y, string, count, -1);
+    PsFontInfoRec *firec;
+
+    /* We need a context for rendering... */
+    if (PsGetPsContextPriv(pDrawable) == NULL)
+      return x;
+
+    firec = PsGetFontInfoRec(pDrawable, pGC->font);
+    if (!firec)
+        return x;
+
+#ifdef XP_USE_FREETYPE    
+    if (firec->ftir->downloadableFont && 
+        (firec->ftir->font_type == PSFTI_FONT_TYPE_FREETYPE))
+    {
+        PsOutPtr       psOut;
+        ColormapPtr    cMap;
+        
+	if( PsUpdateDrawableGC(pGC, pDrawable, &psOut, &cMap)==FALSE ) 
+	    return x; 
+
+        if (firec->ftir->alreadyDownloaded[0] == False)
+        {
+            PsOut_DownloadFreeType(psOut,
+                                   firec->ftir->ft_download_font_type,
+                                   firec->ftir->download_ps_name, pGC->font, 0);              
+            firec->ftir->alreadyDownloaded[0] = True;
+        }
+
+        PsOut_Offset(psOut, pDrawable->x, pDrawable->y);
+       	PsOut_Color(psOut, PsGetPixelColor(cMap, pGC->fgPixel)); 
+       	if (!firec->size)
+            PsOut_TextAttrsMtx(psOut, firec->ftir->download_ps_name, firec->mtx, firec->ftir->is_iso_encoding); 
+        else
+            PsOut_TextAttrs(psOut, firec->ftir->download_ps_name, firec->size, firec->ftir->is_iso_encoding); 
+        PsOut_FreeType_Text(pGC->font, psOut, x, y, string, count);
+
+	return x;	
     }
+    else
+#endif /* XP_USE_FREETYPE */
+         if (firec->ftir->downloadableFont && 
+             (firec->ftir->font_type != PSFTI_FONT_TYPE_FREETYPE))
+    {
+        PsOutPtr       psOut;
+        ColormapPtr    cMap;
+        
+	if( PsUpdateDrawableGC(pGC, pDrawable, &psOut, &cMap)==FALSE ) 
+	    return x; 
+
+        if (firec->ftir->alreadyDownloaded[0] == False)
+        {
+            PsOut_DownloadType1(psOut, "PsPolyText8",
+                                firec->ftir->download_ps_name, firec->ftir->filename);
+            firec->ftir->alreadyDownloaded[0] = True;
+        }
+
+        PsOut_Offset(psOut, pDrawable->x, pDrawable->y);
+       	PsOut_Color(psOut, PsGetPixelColor(cMap, pGC->fgPixel)); 
+       	if (!firec->size)
+            PsOut_TextAttrsMtx(psOut, firec->ftir->download_ps_name, firec->mtx, firec->ftir->is_iso_encoding); 
+        else
+            PsOut_TextAttrs(psOut, firec->ftir->download_ps_name, firec->size, firec->ftir->is_iso_encoding); 
+        PsOut_Text(psOut, x, y, string, count, -1);
+
+	return x;	
+    }    
+    
+    /* Render glyphs as bitmaps */
+    {
+        unsigned long n, i;
+        int w;
+        CharInfoPtr charinfo[255];  
+
+        GetGlyphs(pGC->font, (unsigned long)count, 
+            (unsigned char *)string, Linear8Bit, &n, charinfo);
+        w = 0;
+        for (i=0; i < n; i++)
+          w += charinfo[i]->metrics.characterWidth;
+
+        if (n != 0)
+            PsPolyGlyphBlt(pDrawable, pGC, x, y, n, 
+                    charinfo, FONTGLYPHS(pGC->font));
+        x += w;
+        
+        return x;
+    }  
   }
   return x;
 }
@@ -246,21 +237,136 @@ PsPolyText16(
       (unsigned short *)xalloc(count*sizeof(unsigned short));
     memcpy(elm->c.text16.string, string, count*sizeof(unsigned short));
     disp->nelms += 1;
+
+    return x;
   }
   else
   {
-    unsigned long n, i;
-    int w;
-    CharInfoPtr charinfo[255];  /* encoding only has 1 byte for count */
-
-    GetGlyphs(pGC->font, (unsigned long)count, (unsigned char *)string,
-              (FONTLASTROW(pGC->font) == 0) ? Linear16Bit : TwoD16Bit,
-              &n, charinfo);
-    w = 0;
-    for (i=0; i < n; i++) w += charinfo[i]->metrics.characterWidth;
-    if (n != 0)
-	PsPolyGlyphBlt(pDrawable, pGC, x, y, n, charinfo, FONTGLYPHS(pGC->font));
-    x += w;
+    PsFontInfoRec *firec;
+
+    /* We need a context for rendering... */
+    if (PsGetPsContextPriv(pDrawable) == NULL)
+      return x;
+
+    firec = PsGetFontInfoRec(pDrawable, pGC->font);
+    if (!firec)
+        return x;
+
+#ifdef XP_USE_FREETYPE    
+    if (firec->ftir->downloadableFont &&
+        (firec->ftir->font_type == PSFTI_FONT_TYPE_FREETYPE))
+    {
+        PsOutPtr       psOut;
+        ColormapPtr    cMap;
+        unsigned short c,
+                       c_hiByte,
+                       c_lowByte,
+                       fontPage;
+        int            i;
+        
+	if( PsUpdateDrawableGC(pGC, pDrawable, &psOut, &cMap)==FALSE ) 
+	    return x; 
+
+        /* Scan the string we want to render and download all neccesary parts
+         * of the font (one part(="font page") has 256 glyphs)
+         */
+        for( i = 0 ; i < count ; i++ )
+        {
+            c = string[i];
+#if IMAGE_BYTE_ORDER == LSBFirst
+            c_hiByte = c & 0x00FF;
+            c_lowByte = (c >> 8) & 0x00FF;
+#elif IMAGE_BYTE_ORDER == MSBFirst
+            c_hiByte  = (c >> 8) & 0x00FF;
+            c_lowByte = c & 0x00FF;
+#else
+#error Unsupported byte order
+#endif
+            fontPage  = c_hiByte;
+          
+            if (firec->ftir->alreadyDownloaded[fontPage] == False)
+            {
+                char        buffer[256];
+                const char *ps_name;
+
+                if (fontPage > 0)
+                {
+                    sprintf(buffer, "%s_%x", firec->ftir->download_ps_name, (int)fontPage);
+                    ps_name = buffer;
+                }
+                else
+                {
+                    ps_name = firec->ftir->download_ps_name;
+                }
+
+                PsOut_DownloadFreeType(psOut,
+                                       firec->ftir->ft_download_font_type,
+                                       ps_name, pGC->font, (fontPage * 0x100)); /* same as (fontPage << 8) */    
+                                 
+                firec->ftir->alreadyDownloaded[fontPage] = True;
+            }
+        }
+
+
+        PsOut_Offset(psOut, pDrawable->x, pDrawable->y);
+       	PsOut_Color(psOut, PsGetPixelColor(cMap, pGC->fgPixel)); 
+       	if (!firec->size)
+            PsOut_FreeType_TextAttrsMtx16(psOut, firec->ftir->download_ps_name, firec->mtx, firec->ftir->is_iso_encoding); 
+        else
+            PsOut_FreeType_TextAttrs16(psOut, firec->ftir->download_ps_name, firec->size, firec->ftir->is_iso_encoding); 
+        PsOut_FreeType_Text16(pGC->font, psOut, x, y, string, count);
+        
+	return x;	
+    }
+    else
+#endif /* XP_USE_FREETYPE */
+         if (firec->ftir->downloadableFont &&
+             (firec->ftir->font_type != PSFTI_FONT_TYPE_FREETYPE))
+    {
+        PsOutPtr       psOut;
+        ColormapPtr    cMap;
+        unsigned short c,
+                       c_hiByte,
+                       c_lowByte,
+                       fontPage;
+        int            i;
+        
+	if( PsUpdateDrawableGC(pGC, pDrawable, &psOut, &cMap)==FALSE ) 
+	    return x; 
+
+        PsOut_DownloadType1(psOut, "PsPolyText16",
+                            firec->ftir->download_ps_name, firec->ftir->filename);
+        firec->ftir->alreadyDownloaded[fontPage] = True;
+
+        PsOut_Offset(psOut, pDrawable->x, pDrawable->y);
+       	PsOut_Color(psOut, PsGetPixelColor(cMap, pGC->fgPixel)); 
+       	if (!firec->size)
+            PsOut_TextAttrsMtx(psOut, firec->ftir->download_ps_name, firec->mtx, firec->ftir->is_iso_encoding); 
+        else
+            PsOut_TextAttrs(psOut, firec->ftir->download_ps_name, firec->size, firec->ftir->is_iso_encoding); 
+        PsOut_Text16(psOut, x, y, string, count, -1);
+        
+	return x;	
+    }
+    
+    /* Render glyphs as bitmaps */
+    {
+        unsigned long n, i;
+        int w;
+        CharInfoPtr charinfo[255];  /* encoding only has 1 byte for count */
+
+        GetGlyphs(pGC->font, (unsigned long)count, (unsigned char *)string,
+                  (FONTLASTROW(pGC->font) == 0) ? Linear16Bit : TwoD16Bit,
+                  &n, charinfo);
+        w = 0;
+        for (i=0; i < n; i++)
+          w += charinfo[i]->metrics.characterWidth;
+        if (n != 0)
+	    PsPolyGlyphBlt(pDrawable, pGC, x, y, n, charinfo, FONTGLYPHS(pGC->font));
+        x += w;
+        
+        return x;
+    }  
   }
   return x;
 }
@@ -386,7 +492,7 @@ PsPolyGlyphBlt(
   pointer       pGlyphBase)
 {
     int width, height;
-    PixmapPtr pPixmap = NullPixmap;
+    PixmapPtr pPixmap;
     int nbyLine;                        /* bytes per line of padded pixmap */
     FontPtr pfont;
     GCPtr pGCtmp;
@@ -399,7 +505,7 @@ PsPolyGlyphBlt(
     int gWidth, gHeight;                /* width and height of glyph */
     register int nbyGlyphWidth;         /* bytes per scanline of glyph */
     int nbyPadGlyph;                    /* server padded line of glyph */
-    int w;
+    int w, tmpx;
     XID gcvals[3];
 
     pfont = pGC->font;
@@ -435,6 +541,7 @@ PsPolyGlyphBlt(
         PsDestroyPixmap(pPixmap);
         return;
     }
+    tmpx = 0;
     while(nGlyphs--)
     {
         pci = *pCharInfo++;
@@ -466,8 +573,9 @@ PsPolyGlyphBlt(
 		   1, x + pci->metrics.leftSideBearing, 
 		   y - pci->metrics.ascent, gWidth, gHeight,
                    0, XYBitmap, (char *)pb);
-	    x  += pci->metrics.characterWidth;
 	}
+        
+        x  += pci->metrics.characterWidth;
     }
     DEALLOCATE_LOCAL(pbits);
     FreeScratchGC(pGCtmp);
diff --git a/Xprint/ps/PsWindow.c b/Xprint/ps/PsWindow.c
index e39b602cb..3a9a7ed2a 100644
--- a/Xprint/ps/PsWindow.c
+++ b/Xprint/ps/PsWindow.c
@@ -73,11 +73,9 @@ in this Software without prior written authorization from The Open Group.
 **    *********************************************************
 ** 
 ********************************************************************/
-/* $XFree86: xc/programs/Xserver/Xprint/ps/PsWindow.c,v 1.13 2003/10/29 22:11:55 tsi Exp $ */
 
 #include <stdio.h>
 #include <string.h>
-#include <sys/types.h>
 #include <sys/wait.h>
 
 #include "mistruct.h"
@@ -87,7 +85,8 @@ in this Software without prior written authorization from The Open Group.
 
 #include "Ps.h"
 
-#if 0
+extern WindowPtr *WindowTable;
+
 /*
  * The following list of strings defines the properties which will be
  * placed on the screen's root window if the property was defined in
@@ -104,7 +103,7 @@ static char *propStrings[] = {
 	DT_PRINT_PAGE_COMMAND,
 	(char *)NULL
 };
-#endif
+
 
 /*
  * PsCreateWindow - watch for the creation of the root window.
@@ -219,6 +218,8 @@ PsPaintWindow(
   RegionPtr pRegion,
   int       what)
 {
+  int       status;
+  WindowPtr pRoot;
 
 #define FUNCTION        0
 #define FOREGROUND      1
@@ -298,6 +299,7 @@ PsPaintWindow(
   gcmask |= GCFunction | GCClipMask;
 
   i = pScreen->myNum;
+  pRoot = WindowTable[i];
 
   pBgWin = pWin;
   if (what == PW_BORDER)
@@ -375,14 +377,14 @@ PsPaintWindow(
         }
         break;
       case GCClipMask:
-        if( (pointer)(long)pGC->clientClipType!=(pointer)CT_NONE )
+        if( (pointer)pGC->clientClipType!=(pointer)CT_NONE )
         {
           gcmask |= index;
           gcval[i++] = (pointer)CT_NONE;
         }
         break;
       case GCSubwindowMode:
-        if( (pointer)(long)pGC->subWindowMode!=newValues[SUBWINDOW] )
+        if( (pointer)pGC->subWindowMode!=newValues[SUBWINDOW] )
         {
           gcmask |= index;
           gcval[i++] = newValues[SUBWINDOW];
@@ -396,7 +398,7 @@ PsPaintWindow(
         }
         break;
       case GCFillStyle:
-        if( (pointer)(long)pGC->fillStyle!=newValues[FILLSTYLE] )
+        if( (pointer)pGC->fillStyle!=newValues[FILLSTYLE] )
         {
           gcmask |= index;
           gcval[i++] = newValues[FILLSTYLE];
diff --git a/Xprint/ps/psout.c b/Xprint/ps/psout.c
index f1507d849..943320197 100644
--- a/Xprint/ps/psout.c
+++ b/Xprint/ps/psout.c
@@ -73,79 +73,17 @@ in this Software without prior written authorization from The Open Group.
 **    *********************************************************
 **
 ********************************************************************/
-/* $XFree86: xc/programs/Xserver/Xprint/ps/psout.c,v 1.12 2001/12/21 21:02:06 dawes Exp $ */
-
-/*      
- * For XFree86 3.3.3:  
- *      
- * As a *quick* way of preventing some buffers overflowing onto the stack,
- * they have been made static.  There are potential problems with
- * PsOutRec.Buf overflowing too which should be investigated as part of a
- * review of this code, but that is at least always allocated with malloc
- * and shouldn't pose an immediate stack trashing problem.
- *
- */
 
 #include <stdlib.h>
+#include <stdio.h>
 #include "os.h"
-#include "Ps.h"
+#define USE_PSOUT_PRIVATE 1
 #include "psout.h"
+/* For VENDOR_STRING and VENDOR_RELEASE */
+#include "site.h"
 
-typedef void *voidPtr;
-
-typedef struct PsPatRec_
-{
-  PsFillEnum type;
-  voidPtr    tag;
-} PsPatRec;
-
-typedef PsPatRec *PsPatPtr;
-
-typedef struct PsOutRec_
-{
-  FILE       *Fp;
-  char        Buf[256];
-  int         CurColor;
-  int         LineWidth;
-  PsCapEnum   LineCap;
-  PsJoinEnum  LineJoin;
-  int         NDashes;
-  int        *Dashes;
-  int         DashOffset;
-  int         LineBClr;
-  PsRuleEnum  FillRule;
-  char       *FontName;
-  int         FontSize;
-  float       FontMtx[4];
-  int         ImageFormat;
-  int         RevImage;
-  int         NPatterns;
-  int         MxPatterns;
-  PsPatPtr    Patterns;
-  int         ClipType;
-  PsClipRec   Clip;
-  int         InFrame;
-  int         XOff;
-  int         YOff;
-
-  PsFillEnum  InTile;
-  int         ImgSkip;
-  int         ImgBClr;
-  int         ImgFClr;
-  int         ImgX;
-  int         ImgY;
-  int         ImgW;
-  int         ImgH;
-  int         SclW;
-  int         SclH;
-
-  int         NDownloads;
-  int         MxDownloads;
-  char      **Downloads;
-  Bool        isRaw;
-
-  int         start_image;
-} PsOutRec;
+extern PsElmPtr PsCloneFillElementList(int nElms, PsElmPtr elms);
+extern void PsDestroyFillElementList(int nElms, PsElmPtr elms);
 
 /*
  *  Standard definitions
@@ -174,6 +112,7 @@ static char *S_StandardDefs = "\
 /ie{ifelse}bd\
 /len{length}bd\
 /m{moveto}bd\
+/rm{rmoveto}bd\
 /l{lineto}bd\
 /rl{rlineto}bd\
 /a{arc}bd\
@@ -236,7 +175,11 @@ static char *S_StandardDefs = "\
 /mp{makepattern}bd\
 /spt{setpattern}bd\
 /spd{setpagedevice}bd\
-";
+"
+#ifdef XP_USE_FREETYPE
+"/trmoveto{currentfont /FontMatrix get transform rm}d"
+#endif /* XP_USE_FREETYPE */
+;
 
 /*
  *  Composite definitions
@@ -341,7 +284,6 @@ static char *S_CompositeDefs = "\
 /mtx{scl t [3 i 0 0 5 i 0 0]}bd \
 ";
 
-int  pagenum = 0;
 char *pg_orient[] = {"Portrait","Landscape","Reverse Portrait","Reverse Landscape"};
 /*
  *  Setup definitions
@@ -360,7 +302,7 @@ static char *S_SetupDefs = "\
  *                       PRIVATE FUNCTIONS                         *
  *******************************************************************/
 
-static void
+void
 S_Flush(PsOutPtr self)
 {
   if( self->Buf[0] )
@@ -388,7 +330,7 @@ S_OutDefs(PsOutPtr self, char *defs)
 {
   int  i, k=0;
   S_Flush(self);
-  memset(self->Buf, 0, 256);
+  memset(self->Buf, 0, sizeof(self->Buf));
   for( i=0 ; defs[i]!='\0' ;)
   {
     if( k>70 && (i==0 || (i && defs[i-1]!='/')) &&
@@ -396,7 +338,7 @@ S_OutDefs(PsOutPtr self, char *defs)
     {
       S_Flush(self);
       k = 0;
-      memset(self->Buf, 0, 256);
+      memset(self->Buf, 0, sizeof(self->Buf));
     }
     if( k && self->Buf[k-1]==' ' && defs[i]==' ' ) { i++; continue; }
     self->Buf[k] = defs[i];
@@ -405,11 +347,11 @@ S_OutDefs(PsOutPtr self, char *defs)
   S_Flush(self);
 }
 
-static void
+void
 S_OutNum(PsOutPtr self, float num)
 {
   int  i;
-  static char buf[64];
+  char buf[64];
   sprintf(buf, "%.3f", num);
   for( i=strlen(buf)-1 ; buf[i]=='0' ; i-- ); buf[i+1] = '\0';
   if( buf[strlen(buf)-1]=='.' ) buf[strlen(buf)-1] = '\0';
@@ -422,7 +364,7 @@ static void
 S_OutStr(PsOutPtr self, char *txt, int txtl)
 {
   int  i, k;
-  static char buf[512];
+  char buf[1024];
   for( i=0,k=0 ; i<txtl ; i++ )
   {
     if( (txt[i]>=' ' && txt[i]<='~') &&
@@ -430,7 +372,9 @@ S_OutStr(PsOutPtr self, char *txt, int txtl)
       { buf[k] = txt[i]; k++; continue; }
     buf[k] = '\\'; k++;
     sprintf(&buf[k], "%03o", txt[i]&0xFF);
-    k += 3;
+    /* Skip to the end of the buffer */
+    while( buf[k] != '\0' )
+      k++;
   }
   strcat(self->Buf, "(");
   i = strlen(self->Buf);
@@ -440,7 +384,32 @@ S_OutStr(PsOutPtr self, char *txt, int txtl)
   if( strlen(self->Buf)>70 ) S_Flush(self);
 }
 
+/* Same as S_OutStr() but takes |short *| instead of |char *| */
 static void
+S_OutStr16(PsOutPtr self, unsigned short *txt, int txtl)
+{
+  int  i, k;
+  char buf[2048];
+  for( i=0,k=0 ; i<txtl ; i++ )
+  {
+    if( (txt[i]>=' ' && txt[i]<='~') &&
+        txt[i]!='(' && txt[i]!=')' && txt[i]!='\\' )
+      { buf[k] = txt[i]; k++; continue; }
+    buf[k] = '\\'; k++;
+    sprintf(&buf[k], "%03o", txt[i]&0xFFFF);
+    /* Skip to the end of the buffer */
+    while( buf[k] != '\0' )
+      k++;
+  }
+  strcat(self->Buf, "(");
+  i = strlen(self->Buf);
+  memcpy(&self->Buf[i], buf, k);
+  self->Buf[i+k] = '\0';
+  strcat(self->Buf, ")");
+  if( strlen(self->Buf)>70 ) S_Flush(self);
+}
+
+void
 S_OutTok(PsOutPtr self, char *tok, int cr)
 {
   if( self->Buf[0] ) strcat(self->Buf, " ");
@@ -471,6 +440,27 @@ S_SetPageDevice(PsOutPtr self, int orient, int count, int plex, int res,
     float fwd = ((float)wd/(float)res)*72.;
     float fht = ((float)ht/(float)res)*72.;
 
+#define USE_WORKAROUND_COPY_COUNT_BUG 1
+
+#ifdef USE_WORKAROUND_COPY_COUNT_BUG
+    /* Workaround (see http://xprint.mozdev.org/bugs/show_bug.cgi?id=1861 -
+     * 'Need workaround for bug 1378 ...') to avoid that we print n^2 copies
+     * instead of n copies.
+     * The problem is that we use both /NumCopies here but pass the
+     * %copy-count% to the spooler, too.
+     * But we only have to use _one_ way...
+     *
+     * The final fix for bug 1378 (http://xprint.mozdev.org/bugs/show_bug.cgi?id=1378 -
+     * "PS DDX creates n^2 copies of a job instead of n copies") will back this
+     * workaround out and replace it with a better solution.
+     * (see mozilla.org bug 140030
+     * (http://bugzilla.mozilla.org/show_bug.cgi?id=140030 - "Setting number
+     * of copies causes too many copies to print") for the initial report for
+     * this issue...)
+     */
+    count = 1;
+#endif /* USE_WORKAROUND_COPY_COUNT_BUG */
+
     S_OutTok(self, "/pWd", 0);
     S_OutNum(self, fwd);
     S_OutTok(self, "d /pHt", 0);
@@ -577,10 +567,11 @@ PsOut_ChangeFile(PsOutPtr self, FILE *fp)
 }
 
 PsOutPtr
-PsOut_BeginFile(FILE *fp, int orient, int count, int plex, int res,
+PsOut_BeginFile(FILE *fp, char *title, int orient, int count, int plex, int res,
                 int wd, int ht, Bool raw)
 {
   int  i;
+  char buffer[256+32]; /* enougth space for a title with 256 chars... */
 /*
  *  Get ready to output PostScript header
  */
@@ -589,15 +580,25 @@ PsOut_BeginFile(FILE *fp, int orient, int count, int plex, int res,
   memset(psout, 0, sizeof(PsOutRec));
   psout->Fp = fp;
   psout->isRaw = raw;
-  pagenum = 0;
+  psout->pagenum = 0;
 
   if (!raw) {
 /*
  *  Output PostScript header
  */
-      S_Comment(psout, "%!PS-Adobe-3.0 EPSF-3.0");
-      S_Comment(psout, "%%Creator: The Open Group PostScript Print Server");
-      /*### BoundingBox ###*/
+      /* GhostScript will rant about the missing BoundingBox if we use
+       * "%!PS-Adobe-3.0 EPSF-3.0" here... */
+      S_Comment(psout, "%!PS-Adobe-3.0");
+      sprintf(buffer, 
+              "%%%%Creator: The X Print Server's PostScript DDX (%s, release %d)",
+              VENDOR_STRING, VENDOR_RELEASE);
+      S_Comment(psout, buffer);
+
+      if (title)
+      {
+        sprintf(buffer, "%%%%Title: %.256s", title);
+        S_Comment(psout, buffer);
+      }
       S_Comment(psout, "%%EndComments");
       S_Comment(psout, "%%BeginProlog");
       S_Comment(psout, "%%BeginProcSet: XServer_PS_Functions");
@@ -634,10 +635,13 @@ PsOut_EndFile(PsOutPtr self, int closeFile)
 {
   char coms[50];
   int  i;
+  
+  if (!self)
+    return;
 
   if (!self->isRaw) {
       S_Comment(self,"%%Trailer");
-      sprintf(coms,"%%%%Pages: %d",pagenum);
+      sprintf(coms,"%%%%Pages: %d", self->pagenum);
       S_Comment(self, coms);
       S_Comment(self, "%%EOF");
   }
@@ -646,9 +650,6 @@ PsOut_EndFile(PsOutPtr self, int closeFile)
   if( self->Patterns ) xfree(self->Patterns);
   if( self->Clip.rects ) xfree(self->Clip.rects);
   if( closeFile ) fclose(self->Fp);
-  for( i=0 ; i<self->NDownloads ; i++ ) xfree(self->Downloads[i]);
-  if( self->Downloads ) xfree(self->Downloads);
-  pagenum = 0; /* reset page num back to 0 */
   xfree(self);
 }
 
@@ -661,8 +662,8 @@ PsOut_BeginPage(PsOutPtr self, int orient, int count, int plex, int res,
 /*** comment for pagenumbers *****/
 
   S_Comment(self,"%%PageHeader");
-  pagenum++;
-  sprintf(coms,"%%%%Page: %d %d",pagenum,pagenum);
+  self->pagenum++;
+  sprintf(coms,"%%%%Page: %d %d", self->pagenum, self->pagenum);
   S_Comment(self, coms);
   sprintf(coms,"%%%%PageOrientation: %s",pg_orient[orient]);
   S_Comment(self, coms);
@@ -959,7 +960,7 @@ void
 PsOut_TextAttrs(PsOutPtr self, char *fnam, int siz, int iso)
 {
   int       i;
-  static char      buf[256];
+  char      buf[256];
   if( self->FontName && strcmp(fnam, self->FontName)==0 &&
       siz==self->FontSize ) return;
   if( self->FontName ) xfree(self->FontName);
@@ -979,7 +980,7 @@ void
 PsOut_TextAttrsMtx(PsOutPtr self, char *fnam, float *mtx, int iso)
 {
   int       i;
-  static char      buf[256];
+  char      buf[256];
   if( self->FontName && strcmp(fnam, self->FontName)==0 &&
       mtx[0]==self->FontMtx[0] && mtx[1]==self->FontMtx[1] &&
       mtx[2]==self->FontMtx[2] && mtx[3]==self->FontMtx[3] ) return;
@@ -1171,6 +1172,30 @@ PsOut_Text(PsOutPtr self, int x, int y, char *text, int textl, int bclr)
   }
 }
 
+void
+PsOut_Text16(PsOutPtr self, int x, int y, unsigned short *text, int textl, int bclr)
+{
+  int  xo = self->XOff;
+  int  yo = self->YOff;
+
+  if( self->InFrame || self->InTile ) xo = yo = 0;
+  x += xo; y += yo;
+  S_OutStr16(self, text, textl);
+  S_OutNum(self, (float)x);
+  S_OutNum(self, (float)y);
+  if( bclr<0 ) S_OutTok(self, "T", 1);
+  else
+  {
+    int ir = bclr>>16;
+    int ig = (bclr>>8)&0xFF;
+    int ib = bclr&0xFF;
+    S_OutNum(self, (float)ir/255.);
+    S_OutNum(self, (float)ig/255.);
+    S_OutNum(self, (float)ib/255.);
+    S_OutTok(self, "Tb", 1);
+  }
+}
+
 #ifdef BM_CACHE
 void  /* new */
 PsOut_ImageCache(PsOutPtr self, int x, int y, long cache_id, int bclr, int fclr)
@@ -1181,7 +1206,7 @@ PsOut_ImageCache(PsOutPtr self, int x, int y, long cache_id, int bclr, int fclr)
 
   if( self->InFrame || self->InTile ) xo = yo = 0;
   x += xo; y += yo;
-  sprintf(cacheID, "c%ldi", cache_id);
+  sprintf(cacheID, "c%di", cache_id);
 
   S_OutNum(self, (float)x);
   S_OutNum(self, (float)y);
@@ -1214,7 +1239,7 @@ PsOut_BeginImageCache(PsOutPtr self, long cache_id)
 {
   char cacheID[10];
 
-  sprintf(cacheID, "/c%ldi {", cache_id);
+  sprintf(cacheID, "/c%di {", cache_id);
 
   S_OutTok(self, cacheID, 0);
 }     /* new */
@@ -1225,7 +1250,7 @@ PsOut_EndImageCache(PsOutPtr self)
   S_OutTok(self, "}bd", 1);
 }     /* new */
 #endif
-              
+
 void
 PsOut_BeginImage(PsOutPtr self, int bclr, int fclr, int x, int y,
                  int w, int h, int sw, int sh, int format)
@@ -1488,13 +1513,11 @@ PsOut_BeginPattern(PsOutPtr self, void *tag, int w, int h, PsFillEnum type,
   }
   self->Patterns[self->NPatterns].tag  = tag;
   self->Patterns[self->NPatterns].type = type;
-  sprintf(key, "/ %ld", (long)tag);
+  sprintf(key, "/ %d", (int)tag);
   switch(type) {
     case PsTile:   key[1] = 't'; break;
     case PsStip:   key[1] = 's'; break;
-    case PsOpStip: key[1] = 'o'; break;
-    default: break;
-  }
+    case PsOpStip: key[1] = 'o'; break; }
   S_OutTok(self, key, 0);
   S_OutTok(self, "db/PatternType 1 d/PaintType 1 d", 0);
   S_OutTok(self, "/TilingType 1 d/BBox[0 0", 0);
@@ -1535,13 +1558,11 @@ PsOut_SetPattern(PsOutPtr self, void *tag, PsFillEnum type)
   for( i=0 ; i<self->NPatterns ; i++ )
     { if( tag==self->Patterns[i].tag && type==self->Patterns[i].type ) break; }
   if( i>=self->NPatterns ) return;
-  sprintf(key, " %ld", (long)tag);
+  sprintf(key, " %d", (int)tag);
   switch(type) {
     case PsTile:   key[0] = 't'; break;
     case PsStip:   key[0] = 's'; break;
-    case PsOpStip: key[0] = 'o'; break;
-    default: break;
-  }
+    case PsOpStip: key[0] = 'o'; break; }
   S_OutTok(self, key, 0);
   S_OutTok(self, "spt", 1);
   self->CurColor = 0xFFFFFFFF;
@@ -1556,83 +1577,141 @@ PsOut_RawData(PsOutPtr self, char *data, int len)
     }
 }
 
-void
-PsOut_DownloadType1(PsOutPtr self, char *name, char *fname)
+typedef enum PsDownfontFontType_  
+{ 
+  PsDFT_Type1PFA=0,
+  PsDFT_Type1PFB,
+  PsDFT_TrueType /* not implemented yet */
+} PsDownfontFontType;
+
+/* Download a PS Type1 font */
+int
+PsOut_DownloadType1(PsOutPtr self, const char *auditmsg, const char *name, const char *fname)
 {
   int     i;
   int     stt;
-  static char    buf[256];
+  char    buf[256];
   FILE   *fp;
+  PsDownfontFontType type;
+
+  fp = fopen(fname, "r");
+  if( !fp )
+    return 0;
+
+#ifdef DEBUG_gisburn
+  /* This should be log-able! */
+  fprintf(stderr, "PsOut_DownloadType1: %s: Downloading '%s' from '%s'\n", auditmsg, name, fname);
+#endif /* DEBUG_gisburn */
 
-  for( i=0 ; i<self->NDownloads ; i++ )
-    { if( strcmp(name, self->Downloads[i])==0 ) break; }
-  if( i<self->NDownloads ) return;
+  fread(buf, 32, 1, fp);
+  fseek(fp, (long)0, 0);
 
-  if( (self->NDownloads+1)>self->MxDownloads )
+  /* Is this a Adobe PostScript Type 1 binary font (PFB) ? */
+  if( (buf[0]&0xFF)==0x80 && (buf[1]&0xFF)==0x01 )
   {
-    if( self->NDownloads )
-    {
-      self->MxDownloads *= 2;
-      self->Downloads = (char **)xrealloc(self->Downloads,
-                                self->MxDownloads*sizeof(char *));
-    }
-    else
-    {
-      self->MxDownloads = 32;
-      self->Downloads = (char **)xalloc(self->MxDownloads*sizeof(char *));
-    }
+    type = PsDFT_Type1PFB;
+  }  
+  /* Is this a Adobe PostScript ASCII font (PFA) ? */
+  else if (!strncmp(buf, "%!PS-AdobeFont", 14))
+  {
+    type = PsDFT_Type1PFA;
   }
-
-  self->Downloads[self->NDownloads] = (char *)xalloc(strlen(name)+1);
-  strcpy(self->Downloads[self->NDownloads], name);
-  self->NDownloads += 1;
+  else
+  {
+    /* This should be log-able! */
+    fprintf(stderr, "PsOut_DownloadType1: Unknown font type for '%s'\n", fname);
+    return 0;
+  }      
 
   S_Flush(self);
   sprintf(buf, "%%%%BeginFont: %s", name);
   S_Comment(self, buf);
-  fp = fopen(fname, "r");
-  if( !fp ) return;
-  fread(buf, 1, 1, fp);
-  fseek(fp, (long)0, 0);
-  if( (buf[0]&0xFF)==0x80 )
-  {
-    int  len;
 
-    for(;;)
+  if( type == PsDFT_Type1PFB )
+  {
+    char *buf, 
+         *pt;
+    int   len, 
+          ch,
+          stype;
+
+    ch = fgetc(fp);  
+    /* Strip out the binary headers and de-binary it */
+    while( (ch&0xFF) == 0x80 ) 
     {
-      stt = fread(buf, 1, 2, fp);
-      if( stt!=2 || (buf[0]&0xFF)!=0x80 ) break;
-      if( (int)buf[1]<1 || (int)buf[1]>2 ) break;
-      stt = fread(buf, 1, 4, fp);
-      if( stt!=4 ) break;
-      len = ((buf[3]&0xFF)<<24)|((buf[2]&0xFF)<<16)|
-            ((buf[1]&0xFF)<<8)|(buf[0]&0xFF);
-      for(; len ;)
+      stype = fgetc(fp);
+      if( stype==3 ) /* eof mark */
+        break;
+      len = fgetc(fp);
+      len |= fgetc(fp)<<8;
+      len |= fgetc(fp)<<16;
+      len |= fgetc(fp)<<24;
+      buf = (char *)xalloc(len+1);
+      if( stype==1 ) 
+      {
+        /* Process ASCII section */
+        len = fread(buf, 1, len, fp);
+        /* convert any lone CRs (ie Mac eol) to LFs */
+        for( pt = buf ; (pt = memchr(pt, '\r', len-(pt-buf))) != NULL ; pt++ ) 
+        {
+          if ( pt[1]!='\n' ) 
+            *pt = '\n';
+        }
+        fwrite(buf, 1, len, self->Fp);
+      } 
+      else if( stype==2 ) 
       {
-        i = len<256 ? len : 256;
-        stt = fread(buf, 1, i, fp);
-        if( stt<=0 ) break;
-        if (!ferror(self->Fp)) {
-	    (void) fwrite(buf, 1, stt, self->Fp);
-	}
-        if( stt<i ) break;
-        len -= i;
+        int i;
+        
+        /* Process binary section */
+        len = fread(buf, 1, len, fp);
+        for( i=0 ; i<len ; i++ ) 
+        {
+          ch = buf[i];
+          if( ((ch>>4)&0xf) <= 9 )
+            fputc('0'+((ch>>4)&0xf), self->Fp);
+          else
+            fputc('A'-10+((ch>>4)&0xf), self->Fp);
+          
+          if( (ch&0xf) <= 9 )
+            fputc('0'+(ch&0xf), self->Fp);
+          else
+            fputc('A'-10+(ch&0xf), self->Fp);
+          
+          if( (i&0x1f)==0x1f )
+              fputc('\n', self->Fp);
+        }
       }
+      xfree(buf);
+      
+      /* Next block... */
+      ch = fgetc(fp);
     }
   }
-  else
+  /* Is this a Adobe PostScript ASCII font (PFA) ? */
+  else if (type == PsDFT_Type1PFA)
   {
     for(;;)
     {
       stt = fread(buf, 1, 256, fp);
       if( stt<=0 ) break;
       if (!ferror(self->Fp)) {
-	  (void) fwrite(buf, 1, stt, self->Fp);
+        (void) fwrite(buf, 1, stt, self->Fp);
       }
-      if( stt<256 ) break;
+      if( stt<256 )
+        break;
     }
   }
   fclose(fp);
   S_Flush(self);
   S_Comment(self, "%%EndFont");
+  
+  /* Success... */
+  return 1;
 }
+
+
+
+
+
+
diff --git a/Xprint/ps/psout.h b/Xprint/ps/psout.h
index 2fe83ffc7..c592d7250 100644
--- a/Xprint/ps/psout.h
+++ b/Xprint/ps/psout.h
@@ -57,7 +57,6 @@ in this Software without prior written authorization from The Open Group.
  * or other dealings in this Software without prior written authorization
  * from said copyright holders.
  */
-/* $XFree86: xc/programs/Xserver/Xprint/ps/psout.h,v 1.5 2001/12/21 21:02:06 dawes Exp $ */
 
 /*******************************************************************
 **
@@ -147,10 +146,80 @@ typedef struct PsClipRec_
 
 typedef PsClipRec *PsClipPtr;
 
+typedef enum PsFTDownloadFontType_ 
+{ 
+  PsFontBitmap=0,
+  PsFontType1,
+  PsFontType3
+} PsFTDownloadFontType;
+
+#ifdef USE_PSOUT_PRIVATE
+typedef void *voidPtr;
+
+typedef struct PsPatRec_
+{
+  PsFillEnum type;
+  voidPtr    tag;
+} PsPatRec;
+
+typedef PsPatRec *PsPatPtr;
+
+typedef struct PsOutRec_
+{
+  FILE       *Fp;
+  char        Buf[16384];
+  int         CurColor;
+  int         LineWidth;
+  PsCapEnum   LineCap;
+  PsJoinEnum  LineJoin;
+  int         NDashes;
+  int        *Dashes;
+  int         DashOffset;
+  int         LineBClr;
+  PsRuleEnum  FillRule;
+  char       *FontName;
+  int         FontSize;
+  float       FontMtx[4];
+  int         ImageFormat;
+  int         RevImage;
+  int         NPatterns;
+  int         MxPatterns;
+  PsPatPtr    Patterns;
+  int         ClipType;
+  PsClipRec   Clip;
+  int         InFrame;
+  int         XOff;
+  int         YOff;
+
+  PsFillEnum  InTile;
+  int         ImgSkip;
+  int         ImgBClr;
+  int         ImgFClr;
+  int         ImgX;
+  int         ImgY;
+  int         ImgW;
+  int         ImgH;
+  int         SclW;
+  int         SclH;
+
+  Bool        isRaw;
+  
+  int         pagenum;
+
+  int         start_image;
+} PsOutRec;
+
 typedef struct PsOutRec_ *PsOutPtr;
 
-extern PsOutPtr PsOut_BeginFile(FILE *fp, int orient, int count, int plex,
-                              int res, int wd, int ht, Bool raw);
+extern void S_Flush(PsOutPtr self);
+extern void S_OutNum(PsOutPtr self, float num);
+extern void S_OutTok(PsOutPtr self, char *tok, int cr);
+#else
+typedef struct PsOutRec_ *PsOutPtr;
+#endif /* USE_PSOUT_PRIVATE */
+
+extern PsOutPtr PsOut_BeginFile(FILE *fp, char *title, int orient, int count, int plex,
+                                int res, int wd, int ht, Bool raw);
 extern void PsOut_EndFile(PsOutPtr self, int closeFile);
 extern void PsOut_BeginPage(PsOutPtr self, int orient, int count, int plex,
                             int res, int wd, int ht);
@@ -182,8 +251,9 @@ extern void PsOut_DrawArc(PsOutPtr self, int x, int y, int w, int h,
 
 extern void PsOut_Text(PsOutPtr self, int x, int y, char *text, int textl,
                        int bclr);
+extern void PsOut_Text16(PsOutPtr self, int x, int y, unsigned short *text, int textl, int bclr);
 
-extern void PsOut_BeginImage(PsOutPtr self, int bclr, int fclr, int x, int y,
+extern void PsOut_BeginImage(PsOutPtr self, int bclr, int  fclr, int x, int y,
                              int w, int h, int sw, int sh, int format);
 extern void PsOut_BeginImageIM(PsOutPtr self, int bclr, int fclr, int x, int y,
                                int w, int h, int sw, int sh, int format);
@@ -200,16 +270,17 @@ extern void PsOut_EndPattern(PsOutPtr self);
 extern void PsOut_SetPattern(PsOutPtr self, void *tag, PsFillEnum type);
 
 extern void PsOut_RawData(PsOutPtr self, char *data, int len);
-extern void PsOut_DownloadType1(PsOutPtr self, char *name, char *fname);
 
-#ifdef BM_CACHE
-extern void PsOut_BeginImageCache(PsOutPtr self, long cache_id);
-extern void PsOut_EndImageCache(PsOutPtr self);
-extern void PsOut_ImageCache(PsOutPtr self, int x, int y, long cache_id,
-			     int bclr, int fclr);
-#endif
+extern int  PsOut_DownloadType1(PsOutPtr self, const char *auditmsg, const char *name, const char *fname);
 
-extern FILE *PsOut_ChangeFile(PsOutPtr self, FILE *fp);
+extern int  PsOut_DownloadFreeType1(PsOutPtr self, const char *psfontname, FontPtr pFont, long block_offset);
+extern int  PsOut_DownloadFreeType3(PsOutPtr self, const char *psfontname, FontPtr pFont, long block_offset);
 
+extern int  PsOut_DownloadFreeType(PsOutPtr self, PsFTDownloadFontType downloadfonttype, const char *psfontname, FontPtr pFont, long block_offset);
+extern void PsOut_Get_FreeType_Glyph_Name( char *destbuf, FontPtr pFont, unsigned long x11fontindex);
+extern void PsOut_FreeType_Text(FontPtr pFont, PsOutPtr self, int x, int y, char *text, int textl);
+extern void PsOut_FreeType_Text16(FontPtr pFont, PsOutPtr self, int x, int y, unsigned short *text, int textl);
 
+extern void PsOut_FreeType_TextAttrs16(PsOutPtr self, char *fnam, int siz, int iso);
+extern void PsOut_FreeType_TextAttrsMtx16(PsOutPtr self, char *fnam, float *mtx, int iso);
 #endif
diff --git a/Xprint/ps/psout_ft.c b/Xprint/ps/psout_ft.c
new file mode 100644
index 000000000..914e2e57b
--- /dev/null
+++ b/Xprint/ps/psout_ft.c
@@ -0,0 +1,330 @@
+
+/*
+Copyright (c) 2003-2004 Roland Mainz <roland.mainz@nrubsig.org>
+
+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
+AUTHORS OR COPYRIGHT HOLDERS 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.
+*/
+
+#include <stdlib.h>
+#include <stdio.h>
+#include "os.h"
+#define USE_PSOUT_PRIVATE 1
+#include "psout.h"
+
+#include <ft2build.h>
+#include FT_FREETYPE_H
+#include FT_TYPE1_TABLES_H
+
+#include "Xproto.h"
+#include "font.h"
+#include "fontstruct.h"
+#include "fntfilst.h"
+#include "fontutil.h"
+#include "fontenc.h"
+#include "ft.h"
+#include "ftfuncs.h"
+#include "servermd.h" /* needed for endian test (IMAGE_BYTE_ORDER) */
+
+#define USE_FT_PS_NAMES 1
+
+#ifdef USE_FT_PS_NAMES
+void PsOut_Get_FreeType_Glyph_Name( char *destbuf, FontPtr pFont, unsigned long x11fontindex)
+{
+  FTFontPtr      tf     = (FTFontPtr)pFont->fontPrivate;
+  FT_Face        ttface = tf->instance->face->face;
+  FT_Error       error;
+  char           buf[256];
+  unsigned long  ftindex;
+
+  /* Remap X11 font index to FreeType font index */
+  ftindex = FTRemap(ttface, &tf->mapping, x11fontindex);
+
+  if( FT_Has_PS_Glyph_Names(ttface) )
+  {
+    error = FT_Get_Glyph_Name(ttface, ftindex, buf, 64);
+  }
+  else
+  {
+    error = 1;
+  }
+  
+  if( error )
+  {
+    /* Check for unicode mapping
+     * See Adobe document "Unicode and Glyph Names"
+     * (http://partners.adobe.com/asn/tech/type/unicodegn.jsp)
+     */
+    if( (tf->mapping.mapping->type == FONT_ENCODING_UNICODE) &&
+        (ftindex < 0xFFFE) )
+    {
+      sprintf(buf, "uni%04lx", ftindex);
+    }
+    else
+    {
+      sprintf(buf, "ch%02lx", ftindex);
+    }
+  }
+  
+  strcpy(destbuf, buf);
+}
+#endif /* USE_FT_PS_NAMES */
+
+int PsOut_DownloadFreeType(PsOutPtr self, PsFTDownloadFontType downloadfonttype, const char *psfontname, FontPtr pFont, long block_offset)
+{
+  switch(downloadfonttype)
+  {
+    case PsFontType3:
+        return PsOut_DownloadFreeType3(self, psfontname, pFont, block_offset);
+    case PsFontType1:
+        return PsOut_DownloadFreeType1(self, psfontname, pFont, block_offset);
+    default:
+        FatalError("PS DDX: PsOut_DownloadFreeType(downloadfonttype='%d' not implemented\n",
+                   (int)downloadfonttype);
+        return 0; /* NO-OP, FatalError() will call |exit()| */
+  }
+}
+
+/* cloned from |PsOut_TextAttrs16| */
+void
+PsOut_FreeType_TextAttrs16(PsOutPtr self, char *fnam, int siz, int iso)
+{
+  int i;
+  if( self->FontName && strcmp(fnam, self->FontName)==0 &&
+      siz==self->FontSize ) return;
+  if( self->FontName ) xfree(self->FontName);
+  self->FontName = (char *)xalloc(strlen(fnam)+1);
+  strcpy(self->FontName, fnam);
+  self->FontSize = siz;
+  for( i=0 ; i<4 ; i++ ) self->FontMtx[i] = -1.;
+}
+
+/* cloned from |PsOut_TextAttrsMtx16| */
+void
+PsOut_FreeType_TextAttrsMtx16(PsOutPtr self, char *fnam, float *mtx, int iso)
+{
+  int i;
+  if( self->FontName && strcmp(fnam, self->FontName)==0 &&
+      mtx[0]==self->FontMtx[0] && mtx[1]==self->FontMtx[1] &&
+      mtx[2]==self->FontMtx[2] && mtx[3]==self->FontMtx[3] ) return;
+  if( self->FontName ) xfree(self->FontName);
+  self->FontName = (char *)xalloc(strlen(fnam)+1);
+  strcpy(self->FontName, fnam);
+  for( i=0 ; i<4 ; i++ ) self->FontMtx[i] = mtx[i];
+  self->FontSize = -1;
+}
+
+static
+int FT_Get_CharcellMetricsCharacterHeight(FontPtr pFont)
+{
+  FTFontPtr ftfont = (FTFontPtr)pFont->fontPrivate;
+
+  return ftfont->instance->charcellMetrics->ascent + 
+         ftfont->instance->charcellMetrics->descent;
+}
+
+static
+int FT_Get_CharcellMetricsCharacterWidth(FontPtr pFont)
+{
+  FTFontPtr ftfont = (FTFontPtr)pFont->fontPrivate;
+
+  if( ftfont->instance->spacing != FT_PROPORTIONAL )
+  {
+    int width = ftfont->instance->charcellMetrics->characterWidth;
+    
+    /* If the font uses a matrix make sure we transform the |characterWidth|
+     * back to it's original value since we download the untransformed font
+     * and use a PostScript transformation matrix to transform the font when
+     * rendering the text
+     */
+    if( ftfont->instance->transformation.nonIdentity )
+    {
+      FT_Vector v;
+    
+      FT_Matrix m = ftfont->instance->transformation.matrix;
+      (void)FT_Matrix_Invert(&m); /* FixMe: We should check the return code */
+      v.x = width;
+      v.y = FT_Get_CharcellMetricsCharacterHeight(pFont);
+      FT_Vector_Transform(&v, &m);
+      width = v.x;
+    }
+    
+    return width;
+  }
+
+  return 0;
+}
+
+void
+PsOut_FreeType_Text(FontPtr pFont, PsOutPtr self, int x, int y, char *text, int textl)
+{
+  int i;
+  int xo = self->XOff,
+      yo = self->YOff;
+  char buf[256];
+  int  cwidth = FT_Get_CharcellMetricsCharacterWidth(pFont);
+
+  if( self->InFrame || self->InTile ) xo = yo = 0;
+  x += xo; y += yo;
+
+  S_OutNum(self, (float)x);
+  S_OutNum(self, (float)y);
+  S_OutTok(self, "moveto", 1);
+  
+  S_OutTok(self, "[ ", 0);
+  
+  for( i = 0 ; i < textl ; i++ )
+  {
+#ifdef USE_FT_PS_NAMES
+    char namebuf[256];
+    unsigned int  ch           = text[i]&0xFF;
+    unsigned long block_offset = 0;
+    PsOut_Get_FreeType_Glyph_Name(namebuf, pFont, ch+block_offset);
+
+    sprintf(buf, "/%s ", namebuf);
+#else
+    sprintf(buf, "/ch%02x ", text[i]&0xFF);
+#endif /* USE_FT_PS_NAMES */
+    S_OutTok(self, buf, 0);
+  }
+
+  /* Check whether we have any special spacing requirements (e.g. non-proportional fonts) ... */
+  if( cwidth != 0 )
+  {
+    /* If the we use a matrix to render the font (instead of using |self->FontSize|)
+     * we must apply the matrix to the "rmoveto" which is used to force the exact
+     * character width. The "trmoveto" macro will do that for us...
+     */
+    if( self->FontSize == -1 )
+    {  
+      sprintf(buf, "]{gs glyphshow gr %d 0 trmoveto}fa",  cwidth);
+    }
+    else
+    {
+      sprintf(buf, "]{gs glyphshow gr %d 0 rm}fa", cwidth);
+    }
+  }
+  else
+  {
+    sprintf(buf, "]{glyphshow}fa");
+  }
+  S_OutTok(self, buf, 0);
+}
+
+/* XXX: |PsOut_FreeType_Text16| should be rewritten - currently it uses lame,
+ * slow hacks and makes some risky assumtions about how |PsOut_Text16|
+ * allocates memory */
+void
+PsOut_FreeType_Text16(FontPtr pFont, PsOutPtr self, int x, int y, unsigned short *text, int textl)
+{
+  int i;
+  int xo = self->XOff,
+      yo = self->YOff;
+  unsigned short c,
+                 c_hiByte,
+                 c_lowByte,
+                 fontPage;
+  long           lastFontPage = -1;
+  char           baseFontName[256];
+  char           buf[256];
+
+  if( self->InFrame || self->InTile ) xo = yo = 0;
+  x += xo; y += yo;
+
+  strcpy(baseFontName, self->FontName);
+
+  S_OutNum(self, (float)x);
+  S_OutNum(self, (float)y);
+  S_OutTok(self, "moveto", 1);
+  
+  for( i = 0 ; i < textl ; i++ )
+  {
+    c = text[i];
+#if IMAGE_BYTE_ORDER == LSBFirst
+    c_hiByte = c & 0x00FF;
+    c_lowByte = (c >> 8) & 0x00FF;
+#elif IMAGE_BYTE_ORDER == MSBFirst
+    c_hiByte  = (c >> 8) & 0x00FF;
+    c_lowByte = c & 0x00FF;
+#else
+#error Unsupported byte order
+#endif
+    fontPage  = c_hiByte;
+
+    if( fontPage != lastFontPage )
+    {
+      if( fontPage > 0 )
+      {
+        sprintf(buf, "%s_%x", baseFontName, fontPage);
+      }
+      else
+      {
+        sprintf(buf, "%s", baseFontName);
+      }
+
+      if( self->FontSize == -1 )
+      {
+        PsOut_TextAttrsMtx(self, buf, self->FontMtx, FALSE);
+      }
+      else
+      {
+        PsOut_TextAttrs(self, buf, self->FontSize, FALSE);
+      }
+      lastFontPage = fontPage;
+    }
+
+#ifdef USE_FT_PS_NAMES
+    {
+      char namebuf[256];
+      unsigned int  ch           = c_lowByte;
+      unsigned long block_offset = c_hiByte * 0x100 /* same as c_hiByte << 8 */;
+      int           cwidth       = FT_Get_CharcellMetricsCharacterWidth(pFont);
+      PsOut_Get_FreeType_Glyph_Name(namebuf, pFont, ch+block_offset);
+      
+      /* Check whether we have any special spacing requirements (e.g. non-proportional fonts) ... */
+      if( cwidth != 0 )
+      {
+        /* If the we use a matrix to render the font (instead of using |self->FontSize|)
+         * we must apply the matrix to the "rmoveto" which is used to force the exact
+         * character width. The "trmoveto" macro will do that for us...
+         */
+        if( self->FontSize == -1 )
+        {
+          sprintf(buf, "gs /%s glyphshow gr %d 0 trmoveto", namebuf, cwidth);
+        }
+        else
+        {
+          sprintf(buf, "gs /%s glyphshow gr %d 0 rm",  namebuf, cwidth);
+        }
+      }
+      else
+      {
+        sprintf(buf, "/%s glyphshow", namebuf);
+      }
+    }
+#else
+    sprintf(buf, "/ch%02x glyphshow", c_lowByte);
+#endif /* USE_FT_PS_NAMES */    
+    S_OutTok(self, buf, 1); 
+  }
+
+  if( self->FontName ) xfree(self->FontName);
+  self->FontName = (char *)xalloc(strlen(baseFontName)+1);
+  strcpy(self->FontName, baseFontName);
+}
+
diff --git a/Xprint/ps/psout_ftpstype1.c b/Xprint/ps/psout_ftpstype1.c
new file mode 100644
index 000000000..a9b0cfe86
--- /dev/null
+++ b/Xprint/ps/psout_ftpstype1.c
@@ -0,0 +1,180 @@
+
+/*
+Copyright (c) 2003-2004 Roland Mainz <roland.mainz@nrubsig.org>
+
+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
+AUTHORS OR COPYRIGHT HOLDERS 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.
+*/
+
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <errno.h>
+#include <sys/wait.h>
+
+#include "os.h"
+#define USE_PSOUT_PRIVATE 1
+#include "psout.h"
+
+#include <ft2build.h>
+#include FT_FREETYPE_H
+
+#include "Xproto.h"
+#include "font.h"
+#include "fontstruct.h"
+#include "fntfilst.h"
+#include "fontutil.h"
+#include "fontenc.h"
+#include "ft.h"
+#include "ftfuncs.h"
+
+int do_debug_ft2pt1             = FALSE;
+int do_enable_ft2pt1_optimizer  = FALSE;
+
+/* Defined in ttf2pt1.c */
+int ft2pt1_main(int argc, char **argv,
+                FTFontPtr tf, const char *download_psfontname, unsigned long download_font_block_offset);
+
+/* Download FreeType outlines as PS Type1 font */
+int PsOut_DownloadFreeType1(PsOutPtr self, const char *psfontname, FontPtr pFont, long block_offset)
+{
+  FTFontPtr tf;
+  FT_Face   face;
+  int       ft2pt1_numargs = 0;
+  char     *ft2pt1_args[40];
+  char     *pstype1filename_prefix;
+  char      pstype1filename[PATH_MAX+1];
+  int       ft2pt1_main_retval;
+  pid_t     childpid;
+  
+  tf = (FTFontPtr)pFont->fontPrivate;
+  face = tf->instance->face->face;
+  
+  /* Set debugging flags */
+  do_debug_ft2pt1             = (getenv("XPRT_PSDDX_DO_DEBUG_FT2PT1") != NULL);
+  do_enable_ft2pt1_optimizer  = (getenv("XPRT_PSDDX_DO_ENABLE_FT2PT1_OPTIMIZER") != NULL);
+
+  if( do_debug_ft2pt1 )
+  {
+    fprintf(stderr, "# Converting FT2 font to PS Type1 filename='%s', ttface=%lx\n", tf->instance->face->filename, (long)face);
+  }
+
+  pstype1filename_prefix = tempnam(NULL, "Xprt_");
+
+  ft2pt1_args[ft2pt1_numargs] = "ft2pt1";                        ft2pt1_numargs++;
+  ft2pt1_args[ft2pt1_numargs] = "-Ob";                           ft2pt1_numargs++;
+  ft2pt1_args[ft2pt1_numargs] = "-e";                            ft2pt1_numargs++;
+  ft2pt1_args[ft2pt1_numargs] = "-a";                            ft2pt1_numargs++;
+  ft2pt1_args[ft2pt1_numargs] = "-Ga";                           ft2pt1_numargs++;
+  if( do_enable_ft2pt1_optimizer )
+  {
+    /* Scale fonts to a 1000x1000 matrix */
+    ft2pt1_args[ft2pt1_numargs] = "-Ot";                         ft2pt1_numargs++;
+  }
+  else
+  {
+    /* Disable the ttf2pt1 optimisations */
+    ft2pt1_args[ft2pt1_numargs] = "-Ou";                         ft2pt1_numargs++;
+    ft2pt1_args[ft2pt1_numargs] = "-Oo";                         ft2pt1_numargs++;
+    ft2pt1_args[ft2pt1_numargs] = "-Os";                         ft2pt1_numargs++;
+    ft2pt1_args[ft2pt1_numargs] = "-Oh";                         ft2pt1_numargs++;
+  }
+  
+  if( !do_debug_ft2pt1 )
+  {
+    ft2pt1_args[ft2pt1_numargs] = "-W 0";                        ft2pt1_numargs++;
+  }
+  ft2pt1_args[ft2pt1_numargs] = tf->instance->face->filename;    ft2pt1_numargs++;
+  ft2pt1_args[ft2pt1_numargs] = pstype1filename_prefix;          ft2pt1_numargs++;
+  ft2pt1_args[ft2pt1_numargs] = NULL;
+
+/* XXX: ttf2pt1 has lots of leaks and global vars which are not cleaned-up
+ * As long this problem exists we will simply fork() and call the converter
+ * from the child process (all resources are free'ed when the child process
+ * exists) as a workaround.
+ */
+#define FT2PT1_NEEDS_SEPERATE_PROCESS 1
+
+#ifdef FT2PT1_NEEDS_SEPERATE_PROCESS
+  /* Flush internal buffer and then the stdio stream before fork()! */
+  S_Flush(self);
+  fflush(self->Fp);
+
+  childpid = fork();
+  switch(childpid)
+  {
+    case -1:
+        FatalError("PS DDX internal error: Cannot fork() converter child process, errno=%d\n", (int)errno);
+        break;
+    case 0: /* child */
+        fclose(self->Fp);
+        self->Fp = NULL;
+            
+        ft2pt1_main_retval = ft2pt1_main(ft2pt1_numargs, ft2pt1_args, tf, psfontname, block_offset);
+        if( do_debug_ft2pt1 )
+        {
+          fprintf(stderr, "## ft2pt1_main returned %d (child)\n", ft2pt1_main_retval);
+        }
+        exit(ft2pt1_main_retval);
+        break;
+    default: /* parent */
+        waitpid(childpid, &ft2pt1_main_retval, 0);
+        break;
+  }
+
+  if( do_debug_ft2pt1 )
+  {
+    fprintf(stderr, "## ft2pt1_main returned %d (parent)\n", ft2pt1_main_retval);
+  }
+#else
+  S_Flush(self);
+
+  ft2pt1_main_retval = ft2pt1_main(ft2pt1_numargs, ft2pt1_args, tf, psfontname, block_offset);
+  if( do_debug_ft2pt1 )
+  {
+    fprintf(stderr, "## ft2pt1_main returned %d (child)\n", ft2pt1_main_retval);
+  }
+#endif /* FT2PT1_NEEDS_SEPERATE_PROCESS */
+
+  if( ft2pt1_main_retval != EXIT_SUCCESS )
+  {
+    FatalError("PS DDX internal error while converting FreeType font '%s' to PS Type1, error=%d\n",
+               tf->instance->face->filename, ft2pt1_main_retval);
+  }
+
+  sprintf(pstype1filename, "%s.pfa", pstype1filename_prefix);
+  if( do_debug_ft2pt1 )
+  {
+    fprintf(stderr, "# Downloading converted FT2/PS Type1 filename='%s'\n", pstype1filename);
+  }
+
+  PsOut_DownloadType1(self, "PsOut_DownloadFreeType1", psfontname, pstype1filename);
+  
+  if( !do_debug_ft2pt1 )
+  {
+    unlink(pstype1filename);
+  }
+  
+  free(pstype1filename_prefix);
+
+  S_Flush(self);
+
+  return 0;
+}
+
+
diff --git a/Xprint/ps/psout_ftpstype3.c b/Xprint/ps/psout_ftpstype3.c
new file mode 100644
index 000000000..bceb1d479
--- /dev/null
+++ b/Xprint/ps/psout_ftpstype3.c
@@ -0,0 +1,463 @@
+
+/*
+Copyright (c) 2003-2004 Roland Mainz <roland.mainz@nrubsig.org>
+
+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
+AUTHORS OR COPYRIGHT HOLDERS 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.
+*/
+
+#include <stdlib.h>
+#include <stdio.h>
+#include "os.h"
+#define USE_PSOUT_PRIVATE 1
+#include "psout.h"
+
+#include <ft2build.h>
+#include FT_FREETYPE_H
+#include FT_TRUETYPE_TABLES_H
+#include FT_BBOX_H
+#include FT_GLYPH_H
+
+#include FT_CONFIG_CONFIG_H
+#include FT_CONFIG_OPTIONS_H
+#include FT_ERRORS_H
+#include FT_SYSTEM_H
+#include FT_IMAGE_H
+#include FT_TYPES_H
+#include FT_OUTLINE_H
+#include FT_MODULE_H
+#include FT_RENDER_H
+#include FT_TYPE1_TABLES_H
+#include FT_TRUETYPE_IDS_H
+#include FT_TRUETYPE_TAGS_H
+#include FT_CACHE_H
+#include FT_CACHE_IMAGE_H
+#include FT_CACHE_SMALL_BITMAPS_H
+#include FT_MULTIPLE_MASTERS_H
+#include FT_SFNT_NAMES_H
+
+#define USE_FT_INTERNALS 1
+#ifdef USE_FT_INTERNALS
+#include FT_INTERNAL_TYPE1_TYPES_H
+#include "t42types.h"
+#include FT_INTERNAL_OBJECTS_H
+#endif /* USE_FT_INTERNALS */
+
+#include "Xproto.h"
+#include "font.h"
+#include "fontstruct.h"
+#include "fntfilst.h"
+#include "fontutil.h"
+#include "fontenc.h"
+#include "ft.h"
+#include "ftfuncs.h"
+
+struct ft2info
+{
+  FontPtr         pFont;
+  FTFontPtr       tf;
+  FT_Face         ttface;
+  struct
+  {
+    char *full_name;
+    char *copyright;
+    char *family;
+    char *subfamily;
+    char *version;
+  } nameid;
+  TT_Postscript  *ttpostscript;
+  TT_Header      *ttheader;
+};
+
+/* Local prototypes */
+static FT_Error PSType3_createOutlineGlyphs(FILE *out, struct ft2info *ti, unsigned long unicode, const char *psglyphname);
+static int      PSType3_generateOutlineFont(FILE *out, const char *psfontname, struct ft2info *ti, long block_offset);
+
+extern FT_Library ftypeLibrary; /* defined in xc/lib/font/FreeType/ftfuncs.c */
+
+#define USE_FT_PS_NAMES 1
+
+static
+FT_Error PSType3_createOutlineGlyphs( FILE *out, struct ft2info *ti, unsigned long x11fontindex, const char *psglyphname )
+{
+  unsigned long  ftindex;
+  FT_BBox        bbox;
+  FT_Error       error;
+  FT_Outline     outline;
+
+  /* Remap X11 font index to FreeType font index */
+  ftindex = FTRemap(ti->ttface, &ti->tf->mapping, x11fontindex);
+
+  error = FT_Load_Glyph(ti->ttface, ftindex, (FT_LOAD_NO_BITMAP | FT_LOAD_NO_SCALE | FT_LOAD_NO_HINTING));
+  if( error )
+  {
+    fprintf(stderr, "PSType3_createOutlineGlyphs: FT_Load_Glyph() failure, error=%d\n", (int)error);
+    return error;
+  }
+
+  outline = ti->ttface->glyph->outline;
+
+  FT_Outline_Get_CBox(&outline, &bbox);
+
+  fprintf(out, "/%s {\n", psglyphname);
+  fprintf(out, "%ld 0 %ld %ld %ld %ld setcachedevice\n",
+          (signed long)ti->ttface->glyph->metrics.horiAdvance,
+          (long)bbox.xMin,
+          (long)bbox.yMin,
+          (long)bbox.xMax,
+          (long)bbox.yMax);
+
+  if( outline.n_contours > 0 )
+  {
+    long            i,
+                    j,
+                    k, k1,
+                    cs, ce,
+                    nguide,
+                    contour_start,
+                    contour_end,
+                    last_point;
+    Bool            first;
+    FT_Vector      *vec;
+
+    contour_start = ce = 0;
+
+    vec        = outline.points;
+    last_point = outline.n_points;
+
+    i = j = k = 0;
+    first = TRUE;
+
+    while( i <= outline.contours[outline.n_contours - 1] )
+    {
+      contour_end = outline.contours[j];
+
+      if( first )
+      {
+        fprintf(out, "%ld %ld moveto\n", vec[i].x, vec[i].y);
+        contour_start = i;
+        first = FALSE;
+      }
+      else if( outline.tags[i] & FT_CURVE_TAG_ON )
+      {
+        fprintf(out, "%ld %ld lineto\n", vec[i].x, vec[i].y);
+      }
+      else
+      {
+        Bool finished = FALSE;
+
+        cs       = i-1;
+        nguide   = 0;
+        while( !finished )
+        {
+          if( i == contour_end+1 )
+          {
+            ce = contour_start;
+            finished = TRUE;
+          }
+          else if( outline.tags[i] & FT_CURVE_TAG_ON )
+          {
+            ce = i;
+            finished = TRUE;
+          }
+          else
+          {
+            i++;
+            nguide++;
+          }
+        }
+
+        switch( nguide )
+        {
+          case 0: 
+              fprintf(out, "%ld %ld lineto\n", vec[ce].x, vec[ce].y);
+              break;
+
+          case 1:
+              fprintf(out, "%ld %ld %ld %ld %ld %ld curveto\n",
+                      (vec[cs].x+2*vec[cs+1].x)/3,
+                      (vec[cs].y+2*vec[cs+1].y)/3,
+                      (2*vec[cs+1].x+vec[ce].x)/3,
+                      (2*vec[cs+1].y+vec[ce].y)/3,
+                      vec[ce].x, vec[ce].y);
+              break;
+
+          case 2:
+              fprintf(out, "%ld %ld %ld %ld %ld %ld curveto\n",
+                      (-vec[cs].x+4*vec[cs+1].x)/3,
+                      (-vec[cs].y+4*vec[cs+1].y)/3,
+                      (4*vec[cs+2].x-vec[ce].x)/3,
+                      (4*vec[cs+2].y-vec[ce].y)/3,
+                      vec[ce].x, vec[ce].y);
+              break;
+
+          case 3:
+              fprintf(out, "%ld %ld %ld %ld %ld %ld curveto\n",
+                      (vec[cs].x+2*vec[cs+1].x)/3,
+                      (vec[cs].y+2*vec[cs+1].y)/3,
+                      (5*vec[cs+1].x+vec[cs+2].x)/6,
+                      (5*vec[cs+1].y+vec[cs+2].y)/6,
+                      (vec[cs+1].x+vec[cs+2].x)/2,
+                      (vec[cs+1].y+vec[cs+2].y)/2);
+
+              fprintf(out, "%ld %ld %ld %ld %ld %ld curveto\n",
+                      (vec[cs+1].x+5*vec[cs+2].x)/6,
+                      (vec[cs+1].y+5*vec[cs+2].y)/6,
+                      (5*vec[cs+2].x+vec[cs+3].x)/6,
+                      (5*vec[cs+2].y+vec[cs+3].y)/6,
+                      (vec[cs+3].x+vec[cs+2].x)/2,
+                      (vec[cs+3].y+vec[cs+2].y)/2);
+
+              fprintf(out, "%ld %ld %ld %ld %ld %ld curveto\n",
+                      (vec[cs+2].x+5*vec[cs+3].x)/6,
+                      (vec[cs+2].y+5*vec[cs+3].y)/6,
+                      (2*vec[cs+3].x+vec[ce].x)/3,
+                      (2*vec[cs+3].y+vec[ce].y)/3,
+                      vec[ce].x, vec[ce].y);
+              break;
+
+          default: /* anything |nguide > 3| */
+              k1 = cs + nguide;
+
+              fprintf(out, "%ld %ld %ld %ld %ld %ld curveto\n",
+                      (vec[cs].x+2*vec[cs+1].x)/3,
+                      (vec[cs].y+2*vec[cs+1].y)/3,
+                      (5*vec[cs+1].x+vec[cs+2].x)/6,
+                      (5*vec[cs+1].y+vec[cs+2].y)/6,
+                      (vec[cs+1].x+vec[cs+2].x)/2,
+                      (vec[cs+1].y+vec[cs+2].y)/2);
+
+              for( k = cs+2 ; k <= k1-1 ; k++ )
+              {
+                fprintf(out, "%ld %ld %ld %ld %ld %ld curveto\n",
+                        (vec[k-1].x+5*vec[k].x)/6,
+                        (vec[k-1].y+5*vec[k].y)/6,
+                        (5*vec[k].x+vec[k+1].x)/6,
+                        (5*vec[k].y+vec[k+1].y)/6,
+                        (vec[k].x+vec[k+1].x)/2,
+                        (vec[k].y+vec[k+1].y)/2);
+              }
+
+              fprintf(out, "%ld %ld %ld %ld %ld %ld curveto\n",
+                      (vec[k1-1].x+5*vec[k1].x)/6,
+                      (vec[k1-1].y+5*vec[k1].y)/6,
+                      (2*vec[k1].x+vec[ce].x)/3,
+                      (2*vec[k1].y+vec[ce].y)/3,
+                      vec[ce].x, vec[ce].y);
+              break;
+        }
+      }
+
+      if( i >= contour_end )
+      {
+        fprintf(out, "closepath\n");
+        first = TRUE;
+        i = contour_end + 1;
+        j++;
+      }
+      else
+      {
+        i++;
+      }
+    }
+  }
+
+  fprintf(out, "fill } bind def\n");
+
+  return 0;
+}
+
+#ifdef USE_FT_INTERNALS
+static FT_BBox *
+FT_Get_PS_Font_BBox( FT_Face face )
+{
+  const char *driver_name;
+  FT_BBox    *font_bbox = NULL;
+
+  if ( face && face->driver && face->driver->root.clazz )
+  {
+    driver_name = face->driver->root.clazz->module_name;
+    if ( ft_strcmp( driver_name, "type1" ) == 0 )
+      font_bbox = &(((T1_Face)face)->type1.font_bbox);
+    else if ( ft_strcmp( driver_name, "t1cid" ) == 0 )
+      font_bbox = &(((CID_Face)face)->cid.font_bbox);
+    else if ( ft_strcmp( driver_name, "type42" ) == 0 )
+      font_bbox = &(((T42_Face)face)->type1.font_bbox);
+  }
+  
+  return font_bbox;
+}
+#endif /* USE_FT_INTERNALS */
+
+static
+int PSType3_generateOutlineFont(FILE *out, const char *psfontname, struct ft2info *ti, long block_offset)
+{
+        long   i;
+        double scaler;
+  const int    numchars = 256;
+#ifdef USE_FT_PS_NAMES
+        int    linewidth = 0;
+#endif /* USE_FT_PS_NAMES */
+
+  fprintf(out, "%%%%BeginFont: %s\n", psfontname);
+  fprintf(out, "22 dict begin\n");
+  fprintf(out, "/FontType 3 def\n");
+  fprintf(out, "/StrokeWidth 0 def\n");
+  fprintf(out, "/PaintType 0 def\n");
+  fprintf(out, "/FontName (%s) def\n",     psfontname);
+  fprintf(out, "/FontInfo 9 dict dup begin\n");
+  fprintf(out, "  /FullName (%s) def\n",   ti->nameid.full_name?ti->nameid.full_name:psfontname);
+  fprintf(out, "  /Notice (%s) def\n",     ti->nameid.copyright?ti->nameid.copyright:"nothing here");
+  fprintf(out, "  /FamilyName (%s) def\n", ti->nameid.family?ti->nameid.family:psfontname);
+  fprintf(out, "  /Weight (%s) def\n",     ti->nameid.subfamily?ti->nameid.subfamily:"Regular");
+  fprintf(out, "  /version (%s) def\n",    ti->nameid.version?ti->nameid.version:"0.1");
+
+  if( ti->ttpostscript )
+  {
+    fprintf(out, "  /italicAngle %.9g def\n",     (double)ti->ttpostscript->italicAngle);
+    fprintf(out, "  /underlineThickness %d def\n", (int)ti->ttpostscript->underlineThickness);
+    fprintf(out, "  /underlinePosition %d def\n",  (int)ti->ttpostscript->underlinePosition);
+    fprintf(out, "  /isFixedPitch %s def\n",       ((ti->ttpostscript->isFixedPitch)?("true"):("false")));
+  }
+  else
+  {
+    fprintf(out, "  /italicAngle %.9g def\n",      0.0);
+    fprintf(out, "  /underlineThickness %d def\n", 100);
+    fprintf(out, "  /underlinePosition %d def\n",  0);
+    fprintf(out, "  /isFixedPitch false def\n");
+  }
+
+  fprintf(out, "end def\n");
+
+  scaler = (1000.0 / (double)ti->ttface->units_per_EM) / 1000.0;
+  fprintf(out, "/FontMatrix [%.9g 0 0 %.9g 0 0] def\n", scaler, scaler);
+
+  if( ti->ttheader )
+  {
+    fprintf(out, "/FontBBox [%d %d %d %d] def\n",
+            (int)ti->ttheader->xMin,
+            (int)ti->ttheader->yMin,
+            (int)ti->ttheader->xMax,
+            (int)ti->ttheader->yMax);
+  }
+  else
+  {
+    FT_BBox *font_bbox = FT_Get_PS_Font_BBox(ti->ttface);
+    fprintf(out, "/FontBBox [%d %d %d %d] def\n",
+                 (int)font_bbox->xMin,
+                 (int)font_bbox->yMin,
+                 (int)font_bbox->xMax,
+                 (int)font_bbox->yMax);
+  }
+
+  fprintf(out, "/Encoding [\n");
+  for( i = 0 ; i < 256 ; i++ )
+  {
+#ifdef USE_FT_PS_NAMES
+    char namebuf[256];
+    PsOut_Get_FreeType_Glyph_Name(namebuf, ti->pFont, i+block_offset);
+    linewidth += strlen(namebuf) + 2;
+    fprintf(out, "/%s%s", namebuf, (linewidth > 70)?(linewidth = 0, "\n"):(" "));
+#else
+    fprintf(out, "/ch%02x%s", i, (((i % 10) == 9)?("\n"):(" ")));
+#endif /* USE_FT_PS_NAMES */
+  }
+  fprintf(out, "] def\n");
+
+  fprintf(out, "/CharProcs %d dict def CharProcs begin\n", (int)(numchars + 1));
+  fprintf(out, "/.notdef {\n"
+               "1000 0 0 0 0 0 setcachedevice\n"
+               "fill } bind def\n");
+  for( i = 0 ; i < numchars ; i++ )
+  {
+    char buf[32];
+#ifdef USE_FT_PS_NAMES
+    char namebuf[256];
+    PsOut_Get_FreeType_Glyph_Name(namebuf, ti->pFont, i+block_offset);
+    sprintf(buf, "%s ", namebuf);
+#else
+    sprintf(buf, "ch%02lx ", i);
+#endif /* USE_FT_PS_NAMES */
+    PSType3_createOutlineGlyphs(out, ti, i+block_offset, buf);
+  }
+  fprintf(out, "end\n"
+               "/BuildGlyph {\n"
+               "  exch /CharProcs get exch\n"
+               "  2 copy known not {pop /.notdef} if get exec } bind def\n"
+               "/BuildChar { 1 index /Encoding get exch get\n"
+               "  1 index /Encoding get exec } bind def\n");
+  fprintf(out, "currentdict end /%s exch definefont pop\n", psfontname);
+  fprintf(out, "%%EndFont\n");
+
+  return 0;
+}
+
+static
+char *FT_Get_TT_NAME_ID(FT_Face ttface, int index)
+{
+  FT_SfntName  name;
+  char        *s;
+
+  if( index >= FT_Get_Sfnt_Name_Count(ttface) )
+    return NULL;
+
+  FT_Get_Sfnt_Name(ttface, index, &name);
+  s = (char *)malloc(name.string_len+2);
+  if( !s )
+    return NULL;
+  memcpy(s, (char *)name.string, name.string_len);
+  s[name.string_len] = '\0';
+  return s;
+}
+
+int PsOut_DownloadFreeType3(PsOutPtr self, const char *psfontname, FontPtr pFont, long block_offset)
+{
+  struct ft2info  cft2info = { 0 };
+  struct ft2info *ti       = &cft2info;
+
+  S_Flush(self);
+
+  ti->tf     = (FTFontPtr)pFont->fontPrivate;
+  ti->ttface = ti->tf->instance->face->face;
+  ti->pFont  = pFont;
+#ifdef DEBUG_gisburn
+  fprintf(stderr, "# Downloading FT2 font filename='%s', ttface=%lx\n", ti->tf->instance->face->filename, (long)ti->ttface);
+#endif /* DEBUG_gisburn */
+
+  ti->nameid.full_name = FT_Get_TT_NAME_ID(ti->ttface, TT_NAME_ID_FULL_NAME);
+  ti->nameid.copyright = FT_Get_TT_NAME_ID(ti->ttface, TT_NAME_ID_COPYRIGHT);
+  ti->nameid.family    = FT_Get_TT_NAME_ID(ti->ttface, TT_NAME_ID_FONT_FAMILY);
+  ti->nameid.subfamily = FT_Get_TT_NAME_ID(ti->ttface, TT_NAME_ID_FONT_SUBFAMILY);
+  ti->nameid.version   = FT_Get_TT_NAME_ID(ti->ttface, TT_NAME_ID_VERSION_STRING);
+
+  ti->ttheader     =     (TT_Header *)FT_Get_Sfnt_Table(ti->ttface, ft_sfnt_head);
+  ti->ttpostscript = (TT_Postscript *)FT_Get_Sfnt_Table(ti->ttface, ft_sfnt_post);
+
+  PSType3_generateOutlineFont(self->Fp, psfontname, ti, block_offset);
+
+  free(ti->nameid.full_name);
+  free(ti->nameid.copyright);
+  free(ti->nameid.family);
+  free(ti->nameid.subfamily);
+  free(ti->nameid.version);
+
+  S_Flush(self);
+
+  return 0;
+}
+
diff --git a/Xprint/raster/Raster.c b/Xprint/raster/Raster.c
index d306dea21..c8dfad1e3 100644
--- a/Xprint/raster/Raster.c
+++ b/Xprint/raster/Raster.c
@@ -31,7 +31,7 @@ dealings in this Software without prior written authorization from said
 copyright holders.
 */
 
-/* $XFree86: xc/programs/Xserver/Xprint/raster/Raster.c,v 1.12 2003/10/29 22:11:55 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/Xprint/raster/Raster.c,v 1.11tsi Exp $ */
 
 /*******************************************************************
 **
diff --git a/Xprint/raster/Raster.h b/Xprint/raster/Raster.h
index 0533cd5b2..9b335743f 100644
--- a/Xprint/raster/Raster.h
+++ b/Xprint/raster/Raster.h
@@ -30,8 +30,6 @@ not be used in advertising or otherwise to promote the sale, use or other
 dealings in this Software without prior written authorization from said
 copyright holders.
 */
-/* $XFree86: xc/programs/Xserver/Xprint/raster/Raster.h,v 1.4 2001/12/21 21:02:06 dawes Exp $ */
-
 /*******************************************************************
 **
 **    *********************************************************
@@ -53,6 +51,7 @@ copyright holders.
  * Some sleazes to force the XrmDB stuff into the server
  */
 #ifndef HAVE_XPointer
+#define HAVE_XPointer 1
 typedef char *XPointer;
 #endif
 #define Status int
@@ -110,6 +109,6 @@ typedef struct {
 extern XpValidatePoolsRec RasterValidatePoolsRec;
 
 extern Bool InitializeRasterDriver(int ndx, ScreenPtr pScreen, int argc,
-				   char **argv);
+                                  char **argv);
 
 #endif  /* _RASTER_H_ */
diff --git a/Xprint/raster/RasterAttVal.c b/Xprint/raster/RasterAttVal.c
index 7cce3f22a..4527ba8db 100644
--- a/Xprint/raster/RasterAttVal.c
+++ b/Xprint/raster/RasterAttVal.c
@@ -30,7 +30,7 @@ not be used in advertising or otherwise to promote the sale, use or other
 dealings in this Software without prior written authorization from said
 copyright holders.
 */
-/* $XFree86: xc/programs/Xserver/Xprint/raster/RasterAttVal.c,v 1.4 2001/12/21 21:02:06 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xprint/raster/RasterAttVal.c,v 1.3 2001/10/31 22:50:29 tsi Exp $ */
 
 #include <stdio.h>
 #include "X.h"
diff --git a/Xprint/spooler.c b/Xprint/spooler.c
new file mode 100644
index 000000000..a9983fc17
--- /dev/null
+++ b/Xprint/spooler.c
@@ -0,0 +1,190 @@
+
+/* $Xorg: spooler.c,v 1.1 2003/09/14 1:19:56 gisburn Exp $ */
+/*
+Copyright (c) 2003-2004 Roland Mainz <roland.mainz@nrubsig.org>
+
+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 HOLDERS 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 names of the copyright holders shall
+not be used in advertising or otherwise to promote the sale, use or other
+dealings in this Software without prior written authorization from said
+copyright holders.
+*/
+
+#include <unistd.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <ctype.h>
+#include <signal.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <string.h>
+#ifdef __hpux
+#include <sys/sysmacros.h>
+#endif
+
+#include "spooler.h"
+
+/*
+ * The string LIST_QUEUES_* is fed to a shell to generate an ordered
+ * list of available printers on the system. These string definitions
+ * are taken from the file PrintSubSys.C within the code for the 
+ * dtprintinfo program.
+ */
+#define LIST_QUEUES_AIX4 \
+  "lsallq | grep -v '^bsh$' | sort | uniq"
+
+#define LIST_QUEUES_HPUX \
+  "LANG=C lpstat -v | " \
+  "awk '" \
+  " $2 == \"for\" " \
+  "   { " \
+  "      x = match($3, /:/); " \
+  "      print substr($3, 1, x-1)" \
+  "   }' | sort | uniq"
+
+#define LIST_QUEUES_OSF \
+  "LANG=C lpstat -v | " \
+  "nawk '" \
+  " $2 == \"for\"    " \
+  "   { print $4 }' " \
+  "   | sort | uniq"
+
+#define LIST_QUEUES_UXP \
+  "LANG=C lpstat -v |" \
+  "nawk '" \
+  " $4 == \"for\" " \
+  "   { " \
+  "      x = match($5, /:/); " \
+  "      print substr($5, 1, x-1)" \
+  "   }' | sort | uniq"
+
+/* Support both normal and LPRng output of "lpc status" */
+#define LIST_QUEUES_BSD \
+  "PATH=\"${PATH}:/usr/bin:/usr/sbin:/bin:/sbin\"\n" \
+  "export PATH\n" \
+  \
+  "which_tool()\n" \
+  "{\n" \
+  "  echo \"${PATH}\" | tr \":\" \"\n\" | while read i ; do ls -1ad \"${i}/${1}\" 2>/dev/null ; done\n" \
+  "}\n" \
+  \
+  "(\n" \
+  "WHICH_LPC=\"`which_tool lpc`\"\n" \
+  \
+  "if [ \"`which_tool nawk`\" != \"\" ] ; then\n" \
+  "    NAWK=\"nawk\"\n" \
+  "else\n" \
+  "    NAWK=\"awk\"\n" \
+  "fi\n" \
+  \
+  "[ \"${WHICH_LPC}\"    != \"\" ] && (LANG=C lpc status    | ${NAWK} '/^[^ ]*:$/    && !/@/   && !/ / { print $1 }' | sed -e /:/s///)\n" \
+  "[ \"${WHICH_LPC}\"    != \"\" ] && (LANG=C lpc -a status | ${NAWK} '/^[^ ]*@[^ ]/ && !/:$/          { split( $1, name, \"@\" ); print name[1]; }')\n" \
+  ") | egrep -v -i \" |^all$\" | sort | uniq"
+
+#define LIST_QUEUES_SYSV \
+  "PATH=\"${PATH}:/usr/bin:/usr/sbin:/bin:/sbin\"\n" \
+  "export PATH\n" \
+  \
+  "which_tool()\n" \
+  "{\n" \
+  "  echo \"${PATH}\" | tr \":\" \"\n\" | while read i ; do ls -1ad \"${i}/${1}\" 2>/dev/null ; done\n" \
+  "}\n" \
+  \
+  "(\n" \
+  "WHICH_LPSTAT=\"`which_tool lpstat`\"\n" \
+  \
+  "if [ \"`which_tool nawk`\" != \"\" ] ; then\n" \
+  "    NAWK=\"nawk\"\n" \
+  "else\n" \
+  "    NAWK=\"awk\"\n" \
+  "fi\n" \
+  \
+  "[ \"${WHICH_LPSTAT}\" != \"\" ] && (LANG=C lpstat -v     | ${NAWK} ' $2 == \"for\" { x = match($3, /:/); print substr($3, 1, x-1)   }')\n" \
+  ") | egrep -v -i \" |^all$\" | sort | uniq"
+  
+#define LIST_QUEUES_OTHER \
+  "LANG=C lpstat -v | " \
+  "nawk '" \
+  " $2 == \"for\" " \
+  "   { " \
+  "      x = match($3, /:/); " \
+  "      print substr($3, 1, x-1)" \
+  "   }' | sort | uniq"
+
+#define DEFAULT_SPOOL_COMMAND_HPUX  "/usr/bin/lp -d %printer-name% -o raw -n %copy-count% -t %job-name% %options%"
+#define DEFAULT_SPOOL_COMMAND_BSD   "/usr/bin/lpr -P %printer-name% -#%copy-count% -T %job-name% %options%"
+#define DEFAULT_SPOOL_COMMAND_SYSV  "/usr/bin/lp -d %printer-name% -n %copy-count% -t %job-name% %options%"
+#define DEFAULT_SPOOL_COMMAND_OTHER "/usr/bin/lp -d %printer-name% -n %copy-count% -t %job-name% %options%"
+
+
+/* List of spooler types and the commands used to enumerate
+ * print queues and submit print jobs */
+XpSpoolerType xpstm[] =
+{
+  /* OS-specific spoolers */
+  { "aix",      LIST_QUEUES_AIX4,   DEFAULT_SPOOL_COMMAND_OTHER   },
+  { "aix4",     LIST_QUEUES_AIX4,   DEFAULT_SPOOL_COMMAND_OTHER   },
+  { "bsd",      LIST_QUEUES_BSD,    DEFAULT_SPOOL_COMMAND_BSD     },
+  { "osf",      LIST_QUEUES_OSF,    DEFAULT_SPOOL_COMMAND_OTHER   },
+  { "solaris",  LIST_QUEUES_SYSV,   DEFAULT_SPOOL_COMMAND_SYSV    },
+  { "sysv",     LIST_QUEUES_SYSV,   DEFAULT_SPOOL_COMMAND_SYSV    },
+  { "uxp",      LIST_QUEUES_UXP,    DEFAULT_SPOOL_COMMAND_OTHER   },
+  /* crossplatform spoolers */
+  { "cups",     LIST_QUEUES_SYSV,   DEFAULT_SPOOL_COMMAND_SYSV    },
+  { "lprng",    LIST_QUEUES_BSD,    DEFAULT_SPOOL_COMMAND_BSD     },
+  /* misc */
+  { "other",    LIST_QUEUES_OTHER,  DEFAULT_SPOOL_COMMAND_OTHER   },
+  { "none",     NULL,               NULL                          },
+  { NULL,       NULL,               NULL                          }
+}; 
+
+/* Used by Init.c and attributes.c */
+XpSpoolerTypePtr spooler_type = NULL;
+
+XpSpoolerTypePtr XpSpoolerNameToXpSpoolerType(char *name)
+{
+  XpSpoolerTypePtr curr = xpstm;
+  
+  while( curr->name != NULL )
+  {
+    if( !strcasecmp(name, curr->name) )
+      return curr;
+      
+    curr++;
+  }
+  
+  return NULL;
+}
+
+static char *spooler_namelist = NULL;
+
+char *XpGetSpoolerTypeNameList(void)
+{
+  if( spooler_namelist )
+    return spooler_namelist;
+  
+  return XPDEFAULTSPOOLERNAMELIST;
+}
+
+void XpSetSpoolerTypeNameList(char *namelist)
+{
+  spooler_namelist = namelist;
+}
+
+
diff --git a/Xprint/spooler.h b/Xprint/spooler.h
new file mode 100644
index 000000000..ac1257c55
--- /dev/null
+++ b/Xprint/spooler.h
@@ -0,0 +1,72 @@
+
+#ifndef SPOOLER_H
+#define SPOOLER_H 1
+
+/* $Xorg: spooler.h,v 1.1 2003/09/14 1:19:56 gisburn Exp $ */
+/*
+Copyright (c) 2003-2004 Roland Mainz <roland.mainz@nrubsig.org>
+
+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 HOLDERS 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 names of the copyright holders shall
+not be used in advertising or otherwise to promote the sale, use or other
+dealings in this Software without prior written authorization from said
+copyright holders.
+*/
+
+/*
+ * Define platform-specific default spooler type
+ */
+#if defined(sun)
+#define XPDEFAULTSPOOLERNAMELIST "solaris"
+#elif defined(AIXV4)
+#define XPDEFAULTSPOOLERNAMELIST "aix4"
+#elif defined(hpux)
+#define XPDEFAULTSPOOLERNAMELIST "hpux"
+#elif defined(__osf__)
+#define XPDEFAULTSPOOLERNAMELIST "osf"
+#elif defined(__uxp__)
+#define XPDEFAULTSPOOLERNAMELIST "uxp"
+#elif defined(CSRG_BASED) || defined(linux)
+/* ToDo: This should be "cups:bsd" in the future, but for now
+ * the search order first-bsd-then-cups is better for backwards
+ * compatibility.
+ */
+#define XPDEFAULTSPOOLERNAMELIST "bsd:cups"
+#else
+#define XPDEFAULTSPOOLERNAMELIST "other"
+#endif
+
+typedef struct
+{
+  const char  *name;
+  const char  *list_queues_command;
+  const char  *spool_command;
+} XpSpoolerType, *XpSpoolerTypePtr;
+
+/* prototypes */
+extern XpSpoolerTypePtr  XpSpoolerNameToXpSpoolerType(char *name);
+extern void              XpSetSpoolerTypeNameList(char *namelist);
+extern char             *XpGetSpoolerTypeNameList(void);
+
+/* global vars */
+extern XpSpoolerTypePtr  spooler_type;
+extern XpSpoolerType     xpstm[];
+
+#endif /* !SPOOLER_H */
+
diff --git a/afb/afb.h b/afb/afb.h
index 1f6401782..708fe7643 100644
--- a/afb/afb.h
+++ b/afb/afb.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/afb/afb.h,v 3.11 2003/11/17 22:20:32 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/afb/afb.h,v 3.10 2003/10/29 22:15:19 tsi Exp $ */
 /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
 /***********************************************************
 
diff --git a/afb/afbbitblt.c b/afb/afbbitblt.c
index 7f04a7de0..b07216899 100644
--- a/afb/afbbitblt.c
+++ b/afb/afbbitblt.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/afb/afbbitblt.c,v 3.6 2003/11/10 18:21:44 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/afb/afbbitblt.c,v 3.5tsi Exp $ */
 /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
 /***********************************************************
 
diff --git a/afb/afbblt.c b/afb/afbblt.c
index c0b48130e..13a56e521 100644
--- a/afb/afbblt.c
+++ b/afb/afbblt.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/afb/afbblt.c,v 3.1 2001/10/28 03:32:57 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/afb/afbblt.c,v 3.0 1996/08/18 01:45:24 dawes Exp $ */
 /*
  * afb copy area
  */
diff --git a/afb/afbbres.c b/afb/afbbres.c
index 227f3bc1f..732ea65fa 100644
--- a/afb/afbbres.c
+++ b/afb/afbbres.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/afb/afbbres.c,v 3.0 1996/08/18 01:45:25 dawes Exp $ */
+/* $XFree86$ */
 /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
 /***********************************************************
 
diff --git a/afb/afbbresd.c b/afb/afbbresd.c
index 57309175e..581ecb84f 100644
--- a/afb/afbbresd.c
+++ b/afb/afbbresd.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/afb/afbbresd.c,v 3.0 1996/08/18 01:45:26 dawes Exp $ */
+/* $XFree86$ */
 /***********************************************************
 
 Copyright (c) 1987  X Consortium
diff --git a/afb/afbbstore.c b/afb/afbbstore.c
index 725f93d48..c3e844d57 100644
--- a/afb/afbbstore.c
+++ b/afb/afbbstore.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/afb/afbbstore.c,v 3.0 1996/08/18 01:45:28 dawes Exp $ */
+/* $XFree86$ */
 /* $XConsortium: afbbstore.c,v 5.7 94/04/17 20:28:18 dpw Exp $ */
 /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
 /*
diff --git a/afb/afbclip.c b/afb/afbclip.c
index 07eb3b816..0acf35b2a 100644
--- a/afb/afbclip.c
+++ b/afb/afbclip.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/afb/afbclip.c,v 3.3 2003/07/16 01:38:35 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/afb/afbclip.c,v 3.2 2001/10/28 03:32:57 tsi Exp $ */
 /***********************************************************
 
 Copyright (c) 1987  X Consortium
diff --git a/afb/afbcmap.c b/afb/afbcmap.c
index e56558972..cfa41aab3 100644
--- a/afb/afbcmap.c
+++ b/afb/afbcmap.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/afb/afbcmap.c,v 3.1 1998/11/22 10:36:58 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/afb/afbcmap.c,v 3.0 1996/08/18 01:45:30 dawes Exp $ */
 /* $XConsortium: afbcmap.c,v 4.19 94/04/17 20:28:46 dpw Exp $ */
 /************************************************************
 Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA.
diff --git a/afb/afbfillarc.c b/afb/afbfillarc.c
index 1db48b07c..e13c7948a 100644
--- a/afb/afbfillarc.c
+++ b/afb/afbfillarc.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/afb/afbfillarc.c,v 3.2 2003/07/16 01:38:35 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/afb/afbfillarc.c,v 3.1 1998/03/20 21:04:54 hohndel Exp $ */
 /************************************************************
 
 Copyright (c) 1989  X Consortium
diff --git a/afb/afbfillrct.c b/afb/afbfillrct.c
index 25ab5e56e..b5e6802d2 100644
--- a/afb/afbfillrct.c
+++ b/afb/afbfillrct.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/afb/afbfillrct.c,v 3.3 2003/10/29 22:15:19 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/afb/afbfillrct.c,v 3.2tsi Exp $ */
 /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
 /***********************************************************
 
diff --git a/afb/afbfillsp.c b/afb/afbfillsp.c
index 69985aebc..647641d7d 100644
--- a/afb/afbfillsp.c
+++ b/afb/afbfillsp.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/afb/afbfillsp.c,v 3.4 2001/10/28 03:32:58 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/afb/afbfillsp.c,v 3.3 2000/11/22 00:58:12 tsi Exp $ */
 /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
 /***********************************************************
 
diff --git a/afb/afbfont.c b/afb/afbfont.c
index 0ad8d9de3..5df6691c5 100644
--- a/afb/afbfont.c
+++ b/afb/afbfont.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/afb/afbfont.c,v 3.0 1996/08/18 01:45:35 dawes Exp $ */
+/* $XFree86$ */
 /*
 
 Copyright (c) 1987  X Consortium
diff --git a/afb/afbgc.c b/afb/afbgc.c
index fe88475a3..4ce893902 100644
--- a/afb/afbgc.c
+++ b/afb/afbgc.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/afb/afbgc.c,v 3.3 2001/10/28 03:32:58 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/afb/afbgc.c,v 3.2 1999/06/20 15:02:46 dawes Exp $ */
 /***********************************************************
 
 Copyright (c) 1987  X Consortium
diff --git a/afb/afbgetsp.c b/afb/afbgetsp.c
index 0fa825d21..26ed5ba60 100644
--- a/afb/afbgetsp.c
+++ b/afb/afbgetsp.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/afb/afbgetsp.c,v 3.1 2001/10/28 03:32:58 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/afb/afbgetsp.c,v 3.0 1996/08/18 01:45:37 dawes Exp $ */
 /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
 /***********************************************************
 
diff --git a/afb/afbhrzvert.c b/afb/afbhrzvert.c
index b50c357b4..7165afd51 100644
--- a/afb/afbhrzvert.c
+++ b/afb/afbhrzvert.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/afb/afbhrzvert.c,v 3.1 2001/08/01 00:44:47 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/afb/afbhrzvert.c,v 3.0 1996/08/18 01:45:38 dawes Exp $ */
 /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
 /***********************************************************
 
diff --git a/afb/afbimage.c b/afb/afbimage.c
index cfb230e36..52553f55a 100644
--- a/afb/afbimage.c
+++ b/afb/afbimage.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/afb/afbimage.c,v 3.3 2001/10/28 03:32:58 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/afb/afbimage.c,v 3.2 1998/03/20 21:04:55 hohndel Exp $ */
 
 #include "X.h"
 #include "windowstr.h"
diff --git a/afb/afbimggblt.c b/afb/afbimggblt.c
index 60d212ca0..8f7509df5 100644
--- a/afb/afbimggblt.c
+++ b/afb/afbimggblt.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/afb/afbimggblt.c,v 3.2 2003/10/29 22:15:19 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/afb/afbimggblt.c,v 3.1tsi Exp $ */
 /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
 /***********************************************************
 
diff --git a/afb/afbline.c b/afb/afbline.c
index 796ddffeb..221e2ddd7 100644
--- a/afb/afbline.c
+++ b/afb/afbline.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/afb/afbline.c,v 3.2 2001/10/28 03:32:58 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/afb/afbline.c,v 3.1 1998/03/20 21:04:55 hohndel Exp $ */
 /***********************************************************
 
 Copyright (c) 1987  X Consortium
diff --git a/afb/afbmisc.c b/afb/afbmisc.c
index c0ae1c545..4928a84d3 100644
--- a/afb/afbmisc.c
+++ b/afb/afbmisc.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/afb/afbmisc.c,v 3.0 1996/08/18 01:45:44 dawes Exp $ */
+/* $XFree86$ */
 /***********************************************************
 
 Copyright (c) 1987  X Consortium
diff --git a/afb/afbpixmap.c b/afb/afbpixmap.c
index fe0d8bc79..951ec9946 100644
--- a/afb/afbpixmap.c
+++ b/afb/afbpixmap.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/afb/afbpixmap.c,v 3.1 1997/06/03 14:11:07 hohndel Exp $ */
+/* $XFree86: xc/programs/Xserver/afb/afbpixmap.c,v 3.0 1996/08/18 01:45:45 dawes Exp $ */
 /***********************************************************
 
 Copyright (c) 1987  X Consortium
diff --git a/afb/afbply1rct.c b/afb/afbply1rct.c
index c0c2065f1..3156b0617 100644
--- a/afb/afbply1rct.c
+++ b/afb/afbply1rct.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/afb/afbply1rct.c,v 3.2 2001/10/28 03:32:58 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/afb/afbply1rct.c,v 3.1 1998/03/20 21:04:56 hohndel Exp $ */
 /*
  * $XConsortium: afbply1rct.c,v 1.9 94/04/17 20:28:28 dpw Exp $
  *
diff --git a/afb/afbplygblt.c b/afb/afbplygblt.c
index 3938433c3..26d87868a 100644
--- a/afb/afbplygblt.c
+++ b/afb/afbplygblt.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/afb/afbplygblt.c,v 3.3 2003/10/29 22:15:19 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/afb/afbplygblt.c,v 3.2tsi Exp $ */
 /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
 /***********************************************************
 
diff --git a/afb/afbpntarea.c b/afb/afbpntarea.c
index 239346ceb..c552b388a 100644
--- a/afb/afbpntarea.c
+++ b/afb/afbpntarea.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/afb/afbpntarea.c,v 3.1 2001/10/28 03:32:58 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/afb/afbpntarea.c,v 3.0 1996/08/18 01:45:49 dawes Exp $ */
 /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
 /***********************************************************
 
diff --git a/afb/afbpntwin.c b/afb/afbpntwin.c
index 17d924059..bb84e676a 100644
--- a/afb/afbpntwin.c
+++ b/afb/afbpntwin.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/afb/afbpntwin.c,v 3.0 1996/08/18 01:45:50 dawes Exp $ */
+/* $XFree86$ */
 /* $XConsortium: afbpntwin.c,v 5.12 94/04/17 20:28:30 dpw Exp $ */
 /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
 /***********************************************************
diff --git a/afb/afbpolypnt.c b/afb/afbpolypnt.c
index b09f3b037..23dca7416 100644
--- a/afb/afbpolypnt.c
+++ b/afb/afbpolypnt.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/afb/afbpolypnt.c,v 3.2 2003/07/16 01:38:35 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/afb/afbpolypnt.c,v 3.1 1998/03/20 21:04:56 hohndel Exp $ */
 /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
 /***********************************************************
 
diff --git a/afb/afbpushpxl.c b/afb/afbpushpxl.c
index d556acd8c..311becb8a 100644
--- a/afb/afbpushpxl.c
+++ b/afb/afbpushpxl.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/afb/afbpushpxl.c,v 3.2 2003/07/16 01:38:35 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/afb/afbpushpxl.c,v 3.1 1998/03/20 21:04:56 hohndel Exp $ */
 /***********************************************************
 
 Copyright (c) 1987  X Consortium
diff --git a/afb/afbscrinit.c b/afb/afbscrinit.c
index d2b3fd02b..d947825e2 100644
--- a/afb/afbscrinit.c
+++ b/afb/afbscrinit.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/afb/afbscrinit.c,v 3.5 1998/11/22 10:36:59 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/afb/afbscrinit.c,v 3.4 1998/07/25 08:50:27 dawes Exp $ */
 /***********************************************************
 
 Copyright (c) 1987  X Consortium
diff --git a/afb/afbsetsp.c b/afb/afbsetsp.c
index 93331b857..a4ea4d3ac 100644
--- a/afb/afbsetsp.c
+++ b/afb/afbsetsp.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/afb/afbsetsp.c,v 3.3 2001/10/28 03:32:58 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/afb/afbsetsp.c,v 3.2 2001/08/01 00:44:47 tsi Exp $ */
 /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
 /***********************************************************
 
diff --git a/afb/afbtegblt.c b/afb/afbtegblt.c
index b12eeb252..a4acf326f 100644
--- a/afb/afbtegblt.c
+++ b/afb/afbtegblt.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/afb/afbtegblt.c,v 3.2 2001/10/28 03:32:58 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/afb/afbtegblt.c,v 3.1 1998/03/20 21:04:57 hohndel Exp $ */
 /* $XConsortium: afbtegblt.c,v 5.14 94/04/17 20:28:35 dpw Exp $ */
 /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
 /***********************************************************
diff --git a/afb/afbtile.c b/afb/afbtile.c
index 3b861b822..b4376d18c 100644
--- a/afb/afbtile.c
+++ b/afb/afbtile.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/afb/afbtile.c,v 3.4 2003/10/29 22:15:19 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/afb/afbtile.c,v 3.3tsi Exp $ */
 /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
 /***********************************************************
 
diff --git a/afb/afbwindow.c b/afb/afbwindow.c
index 024fc04b6..b6037d8cb 100644
--- a/afb/afbwindow.c
+++ b/afb/afbwindow.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/afb/afbwindow.c,v 3.1 2003/09/13 21:33:04 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/afb/afbwindow.c,v 3.0 1996/08/18 01:45:58 dawes Exp $ */
 /* $XConsortium: afbwindow.c,v 5.14 94/04/17 20:28:36 dpw Exp $ */
 /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
 /***********************************************************
diff --git a/afb/afbzerarc.c b/afb/afbzerarc.c
index db1bd2bfd..ae9136f70 100644
--- a/afb/afbzerarc.c
+++ b/afb/afbzerarc.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/afb/afbzerarc.c,v 3.3 2003/07/16 01:38:36 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/afb/afbzerarc.c,v 3.2 2001/10/28 03:32:59 tsi Exp $ */
 /************************************************************
 
 Copyright (c) 1989  X Consortium
diff --git a/cfb/cfb.h b/cfb/cfb.h
index b7d027905..e5900dc15 100644
--- a/cfb/cfb.h
+++ b/cfb/cfb.h
@@ -27,7 +27,7 @@ OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
 THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/programs/Xserver/cfb/cfb.h,v 3.30 2003/07/19 13:22:27 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/cfb/cfb.h,v 3.29tsi Exp $ */
 
 #if !defined(__CFB_H__) || defined(CFB_PROTOTYPES_ONLY)
 
diff --git a/cfb/cfb8bit.c b/cfb/cfb8bit.c
index 1dd742c60..3309fb764 100644
--- a/cfb/cfb8bit.c
+++ b/cfb/cfb8bit.c
@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/programs/Xserver/cfb/cfb8bit.c,v 1.5 2001/12/14 19:59:20 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/cfb/cfb8bit.c,v 1.4 2001/01/17 22:36:34 dawes Exp $ */
 
 /*
  * cfb8bit.c
diff --git a/cfb/cfb8bit.h b/cfb/cfb8bit.h
index 0c6b51925..2bfdace35 100644
--- a/cfb/cfb8bit.h
+++ b/cfb/cfb8bit.h
@@ -7,7 +7,7 @@
  * are used for depths other than 8.  Perhaps the file should be
  * renamed.  dpw
  */
-/* $XFree86: xc/programs/Xserver/cfb/cfb8bit.h,v 3.8 2003/11/17 22:20:32 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/cfb/cfb8bit.h,v 3.7 2001/12/14 19:59:20 dawes Exp $ */
 
 /*
 
diff --git a/cfb/cfb8line.c b/cfb/cfb8line.c
index 01c412b97..6f8f896b8 100644
--- a/cfb/cfb8line.c
+++ b/cfb/cfb8line.c
@@ -25,7 +25,7 @@ in this Software without prior written authorization from The Open Group.
  *
  * Author:  Keith Packard, MIT X Consortium
  *
- * $XFree86: xc/programs/Xserver/cfb/cfb8line.c,v 3.19 2003/10/29 22:44:52 tsi Exp $
+ * $XFree86: xc/programs/Xserver/cfb/cfb8line.c,v 3.18tsi Exp $
  * Jeff Anton'x fixes: cfb8line.c   97/02/07
  */
 
diff --git a/cfb/cfballpriv.c b/cfb/cfballpriv.c
index 6c2fa30f3..8b2468992 100644
--- a/cfb/cfballpriv.c
+++ b/cfb/cfballpriv.c
@@ -25,7 +25,7 @@ in this Software without prior written authorization from The Open Group.
  *
  * Author:  Keith Packard, MIT X Consortium
  */
-/* $XFree86: xc/programs/Xserver/cfb/cfballpriv.c,v 1.12 2001/12/14 19:59:21 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/cfb/cfballpriv.c,v 1.11 2001/01/30 22:06:15 tsi Exp $ */
 
 #include "X.h"
 #include "Xmd.h"
diff --git a/cfb/cfbbitblt.c b/cfb/cfbbitblt.c
index 18f90f1fd..b8ef23301 100644
--- a/cfb/cfbbitblt.c
+++ b/cfb/cfbbitblt.c
@@ -2,7 +2,7 @@
  * cfb copy area
  */
 
-/* $XFree86: xc/programs/Xserver/cfb/cfbbitblt.c,v 1.20 2003/11/10 18:21:44 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/cfb/cfbbitblt.c,v 1.19tsi Exp $ */
 
 /*
 
diff --git a/cfb/cfbblt.c b/cfb/cfbblt.c
index 5d2e084fd..7f4e3e10f 100644
--- a/cfb/cfbblt.c
+++ b/cfb/cfbblt.c
@@ -1,7 +1,7 @@
 /*
  * cfb copy area
  */
-/* $XFree86: xc/programs/Xserver/cfb/cfbblt.c,v 3.14 2003/10/29 22:44:53 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/cfb/cfbblt.c,v 3.13tsi Exp $ */
 
 /*
 
diff --git a/cfb/cfbbres.c b/cfb/cfbbres.c
index 452259581..b306ee80b 100644
--- a/cfb/cfbbres.c
+++ b/cfb/cfbbres.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/cfb/cfbbres.c,v 3.5 2001/12/14 19:59:21 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/cfb/cfbbres.c,v 3.4 2001/01/17 22:36:34 dawes Exp $ */
 /***********************************************************
 
 Copyright 1987, 1998  The Open Group
diff --git a/cfb/cfbbresd.c b/cfb/cfbbresd.c
index 7fe71fa2f..4f6630ab3 100644
--- a/cfb/cfbbresd.c
+++ b/cfb/cfbbresd.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/cfb/cfbbresd.c,v 3.6 2001/12/14 19:59:22 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/cfb/cfbbresd.c,v 3.5 2001/01/17 22:36:34 dawes Exp $ */
 /***********************************************************
 
 Copyright 1987, 1998  The Open Group
diff --git a/cfb/cfbbstore.c b/cfb/cfbbstore.c
index 5e7b91471..19de06ad9 100644
--- a/cfb/cfbbstore.c
+++ b/cfb/cfbbstore.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/cfb/cfbbstore.c,v 1.5 2001/01/17 22:36:34 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/cfb/cfbbstore.c,v 1.4 1999/01/31 12:21:41 dawes Exp $ */
 /*-
  * cfbbstore.c --
  *	Functions required by the backing-store implementation in MI.
diff --git a/cfb/cfbcmap.c b/cfb/cfbcmap.c
index 1830ffa5e..1806916ff 100644
--- a/cfb/cfbcmap.c
+++ b/cfb/cfbcmap.c
@@ -27,7 +27,7 @@ OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
 THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/programs/Xserver/cfb/cfbcmap.c,v 3.13 2001/01/17 22:36:34 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/cfb/cfbcmap.c,v 3.12 2000/02/12 03:39:23 dawes Exp $ */
 
 
 #include "X.h"
diff --git a/cfb/cfbcppl.c b/cfb/cfbcppl.c
index ee4c18fdc..a2a51a452 100644
--- a/cfb/cfbcppl.c
+++ b/cfb/cfbcppl.c
@@ -25,7 +25,7 @@ in this Software without prior written authorization from The Open Group.
  *
  * Author:  Keith Packard, MIT X Consortium
  */
-/* $XFree86: xc/programs/Xserver/cfb/cfbcppl.c,v 1.7 2003/07/16 01:38:37 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/cfb/cfbcppl.c,v 1.6 2001/12/14 19:59:22 dawes Exp $ */
 
 #include "X.h"
 #include "Xmd.h"
diff --git a/cfb/cfbfillarc.c b/cfb/cfbfillarc.c
index 64ec508c8..01e4557d4 100644
--- a/cfb/cfbfillarc.c
+++ b/cfb/cfbfillarc.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/cfb/cfbfillarc.c,v 3.7 2003/10/29 22:44:53 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/cfb/cfbfillarc.c,v 3.6tsi Exp $ */
 /************************************************************
 
 Copyright 1989, 1998  The Open Group
diff --git a/cfb/cfbfillrct.c b/cfb/cfbfillrct.c
index c6a7270c2..86258ed4f 100644
--- a/cfb/cfbfillrct.c
+++ b/cfb/cfbfillrct.c
@@ -1,7 +1,7 @@
 /*
  * Fill rectangles.
  */
-/* $XFree86: xc/programs/Xserver/cfb/cfbfillrct.c,v 3.8 2001/12/14 19:59:22 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/cfb/cfbfillrct.c,v 3.7 2001/01/17 22:36:35 dawes Exp $ */
 
 /*
 
diff --git a/cfb/cfbfillsp.c b/cfb/cfbfillsp.c
index 14a6a9d52..6234694d6 100644
--- a/cfb/cfbfillsp.c
+++ b/cfb/cfbfillsp.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/cfb/cfbfillsp.c,v 3.8 2003/10/29 22:44:53 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/cfb/cfbfillsp.c,v 3.7tsi Exp $ */
 /************************************************************
 Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA.
 
diff --git a/cfb/cfbgc.c b/cfb/cfbgc.c
index c2e7a5965..b4a9cc484 100644
--- a/cfb/cfbgc.c
+++ b/cfb/cfbgc.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/cfb/cfbgc.c,v 1.6 2001/12/14 19:59:22 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/cfb/cfbgc.c,v 1.5 2001/01/17 22:36:35 dawes Exp $ */
 /***********************************************************
 
 Copyright 1987, 1998  The Open Group
diff --git a/cfb/cfbgetsp.c b/cfb/cfbgetsp.c
index 737f30237..003be6dcc 100644
--- a/cfb/cfbgetsp.c
+++ b/cfb/cfbgetsp.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/programs/Xserver/cfb/cfbgetsp.c,v 3.10 2003/10/29 22:44:53 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/cfb/cfbgetsp.c,v 3.9tsi Exp $ */
 
 #include "X.h"
 #include "Xmd.h"
diff --git a/cfb/cfbglblt8.c b/cfb/cfbglblt8.c
index 60a012c28..c0fb01c0e 100644
--- a/cfb/cfbglblt8.c
+++ b/cfb/cfbglblt8.c
@@ -23,7 +23,7 @@ Except as contained in this notice, the name of The Open Group 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 Open Group.
 */
-/* $XFree86: xc/programs/Xserver/cfb/cfbglblt8.c,v 3.8 2003/08/06 14:04:02 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/cfb/cfbglblt8.c,v 3.7 2003/07/16 01:38:37 dawes Exp $ */
 
 /*
  * Poly glyph blt.  Accepts an arbitrary font <= 32 bits wide, in Copy mode
diff --git a/cfb/cfbhrzvert.c b/cfb/cfbhrzvert.c
index 6f4f7abe6..88b1e740f 100644
--- a/cfb/cfbhrzvert.c
+++ b/cfb/cfbhrzvert.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/cfb/cfbhrzvert.c,v 3.8 2002/09/16 18:05:30 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/cfb/cfbhrzvert.c,v 3.6 2001/10/28 03:33:00 tsi Exp $ */
 /***********************************************************
 
 Copyright 1987,1998  The Open Group
diff --git a/cfb/cfbigblt8.c b/cfb/cfbigblt8.c
index aa1060240..a40e995be 100644
--- a/cfb/cfbigblt8.c
+++ b/cfb/cfbigblt8.c
@@ -26,7 +26,7 @@ in this Software without prior written authorization from The Open Group.
  * Author:  Keith Packard, MIT X Consortium
  */
 
-/* $XFree86: xc/programs/Xserver/cfb/cfbigblt8.c,v 1.6 2001/12/14 19:59:23 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/cfb/cfbigblt8.c,v 1.5 2001/10/28 03:33:01 tsi Exp $ */
 
 #include	"X.h"
 #include	"Xmd.h"
diff --git a/cfb/cfbimage.c b/cfb/cfbimage.c
index 1983ae48a..68b5cc68d 100644
--- a/cfb/cfbimage.c
+++ b/cfb/cfbimage.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/cfb/cfbimage.c,v 1.13 2001/12/14 19:59:23 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/cfb/cfbimage.c,v 1.12 2001/10/28 03:33:01 tsi Exp $ */
 /***********************************************************
 
 Copyright 1987, 1998  The Open Group
diff --git a/cfb/cfbline.c b/cfb/cfbline.c
index 432cb62d9..28b0cb8c5 100644
--- a/cfb/cfbline.c
+++ b/cfb/cfbline.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/cfb/cfbline.c,v 3.6 2001/12/14 19:59:23 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/cfb/cfbline.c,v 3.5 2001/10/28 03:33:01 tsi Exp $ */
 /***********************************************************
 
 Copyright 1987, 1998  The Open Group
diff --git a/cfb/cfbmap.h b/cfb/cfbmap.h
index 42056345a..60fa94df2 100644
--- a/cfb/cfbmap.h
+++ b/cfb/cfbmap.h
@@ -26,7 +26,7 @@ in this Software without prior written authorization from The Open Group.
  * Author:  Keith Packard, MIT X Consortium
  */
 
-/* $XFree86: xc/programs/Xserver/cfb/cfbmap.h,v 3.12 2003/07/19 13:22:27 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/cfb/cfbmap.h,v 3.11tsi Exp $ */
 
 /*
  * Map names around so that multiple depths can be supported simultaneously
diff --git a/cfb/cfbmskbits.c b/cfb/cfbmskbits.c
index cbf364770..5bc759d01 100644
--- a/cfb/cfbmskbits.c
+++ b/cfb/cfbmskbits.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/cfb/cfbmskbits.c,v 3.2 2001/01/17 22:36:35 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/cfb/cfbmskbits.c,v 3.1 1998/10/04 09:37:46 dawes Exp $ */
 /************************************************************
 Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA.
 
diff --git a/cfb/cfbmskbits.h b/cfb/cfbmskbits.h
index b7f9969dd..5d5764c09 100644
--- a/cfb/cfbmskbits.h
+++ b/cfb/cfbmskbits.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/cfb/cfbmskbits.h,v 3.14 2003/10/29 22:44:53 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/cfb/cfbmskbits.h,v 3.13tsi Exp $ */
 /************************************************************
 Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA.
 
diff --git a/cfb/cfbpixmap.c b/cfb/cfbpixmap.c
index bd2e1b6f1..3502e879c 100644
--- a/cfb/cfbpixmap.c
+++ b/cfb/cfbpixmap.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/programs/Xserver/cfb/cfbpixmap.c,v 1.5 2001/12/14 19:59:23 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/cfb/cfbpixmap.c,v 1.4 2001/01/17 22:36:36 dawes Exp $ */
 /* pixmap management
    written by drewry, september 1986
 
diff --git a/cfb/cfbply1rct.c b/cfb/cfbply1rct.c
index 0b14bc614..fa38f0cf4 100644
--- a/cfb/cfbply1rct.c
+++ b/cfb/cfbply1rct.c
@@ -25,7 +25,7 @@ in this Software without prior written authorization from The Open Group.
  *
  * Author:  Keith Packard, MIT X Consortium
  */
-/* $XFree86: xc/programs/Xserver/cfb/cfbply1rct.c,v 3.11 2003/10/30 14:53:39 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/cfb/cfbply1rct.c,v 3.10 2003/10/29 22:44:53 tsi Exp $ */
 
 #include "X.h"
 
diff --git a/cfb/cfbpntwin.c b/cfb/cfbpntwin.c
index c77d01961..9f6cc78d2 100644
--- a/cfb/cfbpntwin.c
+++ b/cfb/cfbpntwin.c
@@ -1,3 +1,4 @@
+/* $XdotOrg$ */
 /* $Xorg: cfbpntwin.c,v 1.4 2001/02/09 02:04:38 xorgcvs Exp $ */
 /***********************************************************
 
@@ -45,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/programs/Xserver/cfb/cfbpntwin.c,v 3.8 2003/10/29 22:44:53 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/cfb/cfbpntwin.c,v 3.7tsi Exp $ */
 
 #include "X.h"
 
diff --git a/cfb/cfbpolypnt.c b/cfb/cfbpolypnt.c
index d8b781397..a5886b6ec 100644
--- a/cfb/cfbpolypnt.c
+++ b/cfb/cfbpolypnt.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/cfb/cfbpolypnt.c,v 3.6 2001/12/14 19:59:24 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/cfb/cfbpolypnt.c,v 3.5 2001/10/28 03:33:01 tsi Exp $ */
 /************************************************************
 
 Copyright 1989, 1998  The Open Group
diff --git a/cfb/cfbpush8.c b/cfb/cfbpush8.c
index 0de172f03..3f313b0e3 100644
--- a/cfb/cfbpush8.c
+++ b/cfb/cfbpush8.c
@@ -2,7 +2,7 @@
  * Push Pixels for 8 bit displays.
  */
 
-/* $XFree86: xc/programs/Xserver/cfb/cfbpush8.c,v 1.6 2001/12/14 19:59:24 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/cfb/cfbpush8.c,v 1.5 2001/01/17 22:36:36 dawes Exp $ */
 
 /*
 
diff --git a/cfb/cfbrctstp8.c b/cfb/cfbrctstp8.c
index 7f6e93919..ba8dd89f2 100644
--- a/cfb/cfbrctstp8.c
+++ b/cfb/cfbrctstp8.c
@@ -1,7 +1,7 @@
 /*
  * Fill 32 bit stippled rectangles for 8 bit frame buffers
  */
-/* $XFree86: xc/programs/Xserver/cfb/cfbrctstp8.c,v 3.6 2001/12/14 19:59:24 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/cfb/cfbrctstp8.c,v 3.5 2001/10/28 03:33:01 tsi Exp $ */
 /*
 
 Copyright 1989, 1998  The Open Group
diff --git a/cfb/cfbrrop.c b/cfb/cfbrrop.c
index 1ee6771e0..3014b3a5a 100644
--- a/cfb/cfbrrop.c
+++ b/cfb/cfbrrop.c
@@ -25,7 +25,7 @@ in this Software without prior written authorization from The Open Group.
  *
  * Author:  Keith Packard, MIT X Consortium
  */
-/* $XFree86: xc/programs/Xserver/cfb/cfbrrop.c,v 1.6 2001/12/14 19:59:24 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/cfb/cfbrrop.c,v 1.5 2001/10/28 03:33:02 tsi Exp $ */
 
 /* cfb reduced rasterop computations */
 
diff --git a/cfb/cfbrrop.h b/cfb/cfbrrop.h
index d8dce082c..a43bf1978 100644
--- a/cfb/cfbrrop.h
+++ b/cfb/cfbrrop.h
@@ -26,7 +26,7 @@ in this Software without prior written authorization from The Open Group.
  * Author:  Keith Packard, MIT X Consortium
  */
 
-/* $XFree86: xc/programs/Xserver/cfb/cfbrrop.h,v 3.11 2003/10/29 22:44:53 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/cfb/cfbrrop.h,v 3.10tsi Exp $ */
 
 #ifndef GXcopy
 #include "X.h"
diff --git a/cfb/cfbscrinit.c b/cfb/cfbscrinit.c
index 7e0d15dd4..ffdf55b81 100644
--- a/cfb/cfbscrinit.c
+++ b/cfb/cfbscrinit.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/cfb/cfbscrinit.c,v 1.20 2003/07/16 01:38:37 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/cfb/cfbscrinit.c,v 1.19 2001/01/17 22:36:36 dawes Exp $ */
 /************************************************************
 Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA.
 
diff --git a/cfb/cfbsetsp.c b/cfb/cfbsetsp.c
index 4f7dfaee1..8385fe35a 100644
--- a/cfb/cfbsetsp.c
+++ b/cfb/cfbsetsp.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/programs/Xserver/cfb/cfbsetsp.c,v 3.6 2003/10/29 22:44:53 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/cfb/cfbsetsp.c,v 3.5tsi Exp $ */
 
 #include "X.h"
 #include "Xmd.h"
diff --git a/cfb/cfbsolid.c b/cfb/cfbsolid.c
index f0a3e361e..f4e7f3385 100644
--- a/cfb/cfbsolid.c
+++ b/cfb/cfbsolid.c
@@ -25,7 +25,7 @@ in this Software without prior written authorization from The Open Group.
  *
  * Author:  Keith Packard, MIT X Consortium
  */
-/* $XFree86: xc/programs/Xserver/cfb/cfbsolid.c,v 3.9 2003/10/29 22:44:53 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/cfb/cfbsolid.c,v 3.8tsi Exp $ */
 
 
 #include "X.h"
diff --git a/cfb/cfbtab.h b/cfb/cfbtab.h
index 5c4f1c445..c27f69312 100644
--- a/cfb/cfbtab.h
+++ b/cfb/cfbtab.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/cfb/cfbtab.h,v 1.1 2003/07/16 01:38:37 dawes Exp $ */
+/* $XFree86$ */
 
 #ifndef _CFBTAB_H_
 #define _CFBTAB_H_
diff --git a/cfb/cfbteblt8.c b/cfb/cfbteblt8.c
index 0cdbddc7a..9048ec375 100644
--- a/cfb/cfbteblt8.c
+++ b/cfb/cfbteblt8.c
@@ -3,7 +3,7 @@
  * 8 bit displays, in Copy mode with no clipping.
  */
 
-/* $XFree86: xc/programs/Xserver/cfb/cfbteblt8.c,v 1.6 2001/12/14 19:59:25 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/cfb/cfbteblt8.c,v 1.5 2001/10/28 03:33:02 tsi Exp $ */
 /*
 
 Copyright 1989, 1998  The Open Group
diff --git a/cfb/cfbtegblt.c b/cfb/cfbtegblt.c
index 7450c7829..ff7f3be57 100644
--- a/cfb/cfbtegblt.c
+++ b/cfb/cfbtegblt.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/programs/Xserver/cfb/cfbtegblt.c,v 3.7 2003/10/29 22:44:53 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/cfb/cfbtegblt.c,v 3.6tsi Exp $ */
 
 #include	"X.h"
 #include	"Xmd.h"
diff --git a/cfb/cfbtile32.c b/cfb/cfbtile32.c
index b202943e8..1ba4bb16d 100644
--- a/cfb/cfbtile32.c
+++ b/cfb/cfbtile32.c
@@ -2,7 +2,7 @@
  * Fill 32 bit tiled rectangles.  Used by both PolyFillRect and PaintWindow.
  * no depth dependencies.
  */
-/* $XFree86: xc/programs/Xserver/cfb/cfbtile32.c,v 3.7 2003/10/29 22:44:53 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/cfb/cfbtile32.c,v 3.6tsi Exp $ */
 
 /*
 
diff --git a/cfb/cfbtileodd.c b/cfb/cfbtileodd.c
index e372fe87d..bd6a0b82c 100644
--- a/cfb/cfbtileodd.c
+++ b/cfb/cfbtileodd.c
@@ -2,7 +2,7 @@
  * Fill odd tiled rectangles and spans.
  * no depth dependencies.
  */
-/* $XFree86: xc/programs/Xserver/cfb/cfbtileodd.c,v 3.7 2003/10/29 22:44:53 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/cfb/cfbtileodd.c,v 3.6tsi Exp $ */
 
 /*
 
diff --git a/cfb/cfbwindow.c b/cfb/cfbwindow.c
index cae13cf3c..13148728c 100644
--- a/cfb/cfbwindow.c
+++ b/cfb/cfbwindow.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/programs/Xserver/cfb/cfbwindow.c,v 1.6 2003/11/10 18:21:45 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/cfb/cfbwindow.c,v 1.5tsi Exp $ */
 
 #include "X.h"
 #include "scrnintstr.h"
diff --git a/cfb/cfbzerarc.c b/cfb/cfbzerarc.c
index 3703a5105..baa89f318 100644
--- a/cfb/cfbzerarc.c
+++ b/cfb/cfbzerarc.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/cfb/cfbzerarc.c,v 3.5 2003/10/29 22:44:53 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/cfb/cfbzerarc.c,v 3.4tsi Exp $ */
 /************************************************************
 
 Copyright 1989, 1998  The Open Group
diff --git a/cfb/stip68kgnu.h b/cfb/stip68kgnu.h
index 9a2bac720..01bb939e8 100644
--- a/cfb/stip68kgnu.h
+++ b/cfb/stip68kgnu.h
@@ -25,7 +25,7 @@ in this Software without prior written authorization from The Open Group.
  *
  * Author:  Keith Packard, MIT X Consortium
  */
-/* $XFree86: xc/programs/Xserver/cfb/stip68kgnu.h,v 3.4 2001/12/14 19:59:25 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/cfb/stip68kgnu.h,v 3.3 2001/01/17 22:36:37 dawes Exp $ */
 
 /*
  * Stipple stack macro for 68k GCC
diff --git a/cfb/stipsparc.s b/cfb/stipsparc.s
index 185795605..a6a40491f 100644
--- a/cfb/stipsparc.s
+++ b/cfb/stipsparc.s
@@ -25,7 +25,7 @@ in this Software without prior written authorization from The Open Group.
  *
  * Author:  Keith Packard, MIT X Consortium
  */
-/* $XFree86: xc/programs/Xserver/cfb/stipsparc.s,v 1.5 2001/12/14 19:59:26 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/cfb/stipsparc.s,v 1.4 2001/01/17 22:36:38 dawes Exp $ */
 
 /*
  * SPARC assembly code for optimized text rendering.
diff --git a/cfb/stipsprc32.s b/cfb/stipsprc32.s
index f878fbf80..5703c0f1b 100644
--- a/cfb/stipsprc32.s
+++ b/cfb/stipsprc32.s
@@ -25,7 +25,7 @@ in this Software without prior written authorization from The Open Group.
  *
  * Author:  Keith Packard, MIT X Consortium
  */
-/* $XFree86: xc/programs/Xserver/cfb/stipsprc32.s,v 1.5 2001/12/14 19:59:26 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/cfb/stipsprc32.s,v 1.4 2001/01/17 22:36:38 dawes Exp $ */
 
 /*
  * SPARC assembly code for optimized text rendering.
diff --git a/cfb24/cfbrrop24.h b/cfb24/cfbrrop24.h
index 0bb97ce5b..9f15d1a82 100644
--- a/cfb24/cfbrrop24.h
+++ b/cfb24/cfbrrop24.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/cfb24/cfbrrop24.h,v 3.2 2003/10/29 22:46:27 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/cfb24/cfbrrop24.h,v 3.1tsi Exp $ */
 
 #define RROP_DECLARE \
     unsigned long piQxelAnd[3], piQxelXor[3], spiQxelXor[8];
diff --git a/dbe/dbe.c b/dbe/dbe.c
index 6b92baac7..f6c729d8c 100644
--- a/dbe/dbe.c
+++ b/dbe/dbe.c
@@ -1,3 +1,4 @@
+/* $XdotOrg$ */
 /* $Xorg: dbe.c,v 1.3 2000/08/17 19:48:16 cpqbld Exp $ */
 /******************************************************************************
  * 
@@ -30,7 +31,7 @@
  *     DIX DBE code
  *
  *****************************************************************************/
-/* $XFree86: xc/programs/Xserver/dbe/dbe.c,v 3.11 2001/10/28 03:33:04 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/dbe/dbe.c,v 3.10 2001/08/23 14:19:24 alanh Exp $ */
 
 
 /* INCLUDES */
diff --git a/dbe/dbestruct.h b/dbe/dbestruct.h
index 3634fe7d7..f176c6fd1 100644
--- a/dbe/dbestruct.h
+++ b/dbe/dbestruct.h
@@ -30,7 +30,7 @@
  *     Header file for DIX-related DBE
  *
  *****************************************************************************/
-/* $XFree86: xc/programs/Xserver/dbe/dbestruct.h,v 3.2 2003/11/17 22:20:32 dawes Exp $ */
+/* $XFree86$ */
 
 
 #ifndef DBE_STRUCT_H
diff --git a/dbe/midbe.c b/dbe/midbe.c
index e7617e728..bdf46b8ae 100644
--- a/dbe/midbe.c
+++ b/dbe/midbe.c
@@ -30,7 +30,7 @@
  *     Machine-independent DBE code
  *
  *****************************************************************************/
-/* $XFree86: xc/programs/Xserver/dbe/midbe.c,v 3.5 2001/08/23 14:19:24 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/dbe/midbe.c,v 3.4 2001/03/06 17:31:34 dawes Exp $ */
 
 
 /* INCLUDES */
diff --git a/dbe/midbe.h b/dbe/midbe.h
index 7b1237633..3f9bb0090 100644
--- a/dbe/midbe.h
+++ b/dbe/midbe.h
@@ -30,7 +30,7 @@
  *     Header file for users of machine-independent DBE code
  *
  *****************************************************************************/
-/* $XFree86: xc/programs/Xserver/dbe/midbe.h,v 3.2 2003/11/17 22:20:32 dawes Exp $ */
+/* $XFree86$ */
 
 
 #ifndef MIDBE_H
diff --git a/dix/atom.c b/dix/atom.c
index 66c045583..7509f0a24 100644
--- a/dix/atom.c
+++ b/dix/atom.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/dix/atom.c,v 3.4 2002/02/19 11:09:21 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/dix/atom.c,v 3.3 2001/12/14 19:59:29 dawes Exp $ */
 /***********************************************************
 
 Copyright 1987, 1998  The Open Group
diff --git a/dix/colormap.c b/dix/colormap.c
index af959ed86..1d7772188 100644
--- a/dix/colormap.c
+++ b/dix/colormap.c
@@ -1,4 +1,5 @@
-/* $XFree86: xc/programs/Xserver/dix/colormap.c,v 3.12 2003/11/17 22:20:33 dawes Exp $ */
+/* $XdotOrg$ */
+/* $XFree86: xc/programs/Xserver/dix/colormap.c,v 3.11 2003/11/03 05:10:59 tsi Exp $ */
 /***********************************************************
 
 Copyright 1987, 1998  The Open Group
diff --git a/dix/cursor.c b/dix/cursor.c
index 2ef9e5e24..fc81a5197 100644
--- a/dix/cursor.c
+++ b/dix/cursor.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/dix/cursor.c,v 3.9 2003/11/17 22:20:33 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/dix/cursor.c,v 3.8 2003/01/12 02:44:26 dawes Exp $ */
 /***********************************************************
 
 Copyright 1987, 1998  The Open Group
diff --git a/dix/devices.c b/dix/devices.c
index 46af5eabc..d4e4be823 100644
--- a/dix/devices.c
+++ b/dix/devices.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/dix/devices.c,v 3.21 2003/11/17 22:20:33 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/dix/devices.c,v 3.20 2001/12/14 19:59:30 dawes Exp $ */
 /************************************************************
 
 Copyright 1987, 1998  The Open Group
diff --git a/dix/dispatch.c b/dix/dispatch.c
index cd1ce6790..d07b631e7 100644
--- a/dix/dispatch.c
+++ b/dix/dispatch.c
@@ -1,3 +1,4 @@
+/* $XdotOrg: xc/programs/Xserver/dix/dispatch.c,v 1.1.4.4.2.3.6.2 2004/04/20 03:27:08 gisburn Exp $ */
 /* $Xorg: dispatch.c,v 1.5 2001/02/09 02:04:40 xorgcvs Exp $ */
 /************************************************************
 
@@ -47,28 +48,35 @@ SOFTWARE.
 ********************************************************/
 
 /* The panoramix components contained the following notice */
-/****************************************************************
-*                                                               *
-*    Copyright (c) Digital Equipment Corporation, 1991, 1997    *
-*                                                               *
-*   All Rights Reserved.  Unpublished rights  reserved  under   *
-*   the copyright laws of the United States.                    *
-*                                                               *
-*   The software contained on this media  is  proprietary  to   *
-*   and  embodies  the  confidential  technology  of  Digital   *
-*   Equipment Corporation.  Possession, use,  duplication  or   *
-*   dissemination of the software and media is authorized only  *
-*   pursuant to a valid written license from Digital Equipment  *
-*   Corporation.                                                *
-*                                                               *
-*   RESTRICTED RIGHTS LEGEND   Use, duplication, or disclosure  *
-*   by the U.S. Government is subject to restrictions  as  set  *
-*   forth in Subparagraph (c)(1)(ii)  of  DFARS  252.227-7013,  *
-*   or  in  FAR 52.227-19, as applicable.                       *
-*                                                               *
-*****************************************************************/
-
-/* $XFree86: xc/programs/Xserver/dix/dispatch.c,v 3.33 2003/11/17 22:20:33 dawes Exp $ */
+/*****************************************************************
+
+Copyright (c) 1991, 1997 Digital Equipment Corporation, Maynard, Massachusetts.
+
+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.
+
+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
+DIGITAL EQUIPMENT CORPORATION BE LIABLE FOR ANY CLAIM, DAMAGES, INCLUDING,
+BUT NOT LIMITED TO CONSEQUENTIAL OR INCIDENTAL 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 Digital Equipment Corporation
+shall not be used in advertising or otherwise to promote the sale, use or other
+dealings in this Software without prior written authorization from Digital
+Equipment Corporation.
+
+******************************************************************/
+
+/* $XFree86: xc/programs/Xserver/dix/dispatch.c,v 3.32 2003/11/10 18:21:45 tsi Exp $ */
 
 #ifdef PANORAMIX_DEBUG
 #include <stdio.h>
@@ -245,7 +253,7 @@ FlushClientCaches(id)
 #define SMART_SCHEDULE_DEFAULT_INTERVAL	20	    /* ms */
 #define SMART_SCHEDULE_MAX_SLICE	200	    /* ms */
 
-Bool	    SmartScheduleDisable;
+Bool	    SmartScheduleDisable = FALSE;
 long	    SmartScheduleSlice = SMART_SCHEDULE_DEFAULT_INTERVAL;
 long	    SmartScheduleInterval = SMART_SCHEDULE_DEFAULT_INTERVAL;
 long	    SmartScheduleMaxSlice = SMART_SCHEDULE_MAX_SLICE;
diff --git a/dix/dispatch.h b/dix/dispatch.h
index d144c6c70..ba43bdca2 100644
--- a/dix/dispatch.h
+++ b/dix/dispatch.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/dix/dispatch.h,v 3.3 2002/02/19 11:09:21 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/dix/dispatch.h,v 3.2 2001/08/01 00:44:48 tsi Exp $ */
 /************************************************************
 
 Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
diff --git a/dix/dixfonts.c b/dix/dixfonts.c
index d971260c7..a09626f88 100644
--- a/dix/dixfonts.c
+++ b/dix/dixfonts.c
@@ -1,4 +1,5 @@
-/* $XFree86: xc/programs/Xserver/dix/dixfonts.c,v 3.29 2003/11/17 22:20:34 dawes Exp $ */
+/* $XdotOrg$ */
+/* $XFree86: xc/programs/Xserver/dix/dixfonts.c,v 3.28 2003/11/08 02:02:03 dawes Exp $ */
 /************************************************************************
 Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
 
@@ -21,7 +22,33 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ************************************************************************/
-
+/* The panoramix components contained the following notice */
+/*
+Copyright (c) 1991, 1997 Digital Equipment Corporation, Maynard, Massachusetts.
+
+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.
+
+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
+DIGITAL EQUIPMENT CORPORATION BE LIABLE FOR ANY CLAIM, DAMAGES, INCLUDING,
+BUT NOT LIMITED TO CONSEQUENTIAL OR INCIDENTAL 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 Digital Equipment Corporation
+shall not be used in advertising or otherwise to promote the sale, use or other
+dealings in this Software without prior written authorization from Digital
+Equipment Corporation.
+
+******************************************************************/
 /* $Xorg: dixfonts.c,v 1.4 2000/08/17 19:48:18 cpqbld Exp $ */
 
 #define NEED_REPLIES
diff --git a/dix/dixutils.c b/dix/dixutils.c
index 38cfd4e0d..40f80d348 100644
--- a/dix/dixutils.c
+++ b/dix/dixutils.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/dix/dixutils.c,v 3.14 2003/11/17 22:20:34 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/dix/dixutils.c,v 3.13 2003/01/12 02:44:26 dawes Exp $ */
 /***********************************************************
 
 Copyright 1987, 1998  The Open Group
diff --git a/dix/events.c b/dix/events.c
index 2853e1013..b27450409 100644
--- a/dix/events.c
+++ b/dix/events.c
@@ -1,4 +1,5 @@
-/* $XFree86: xc/programs/Xserver/dix/events.c,v 3.52 2004/01/23 07:23:34 herrb Exp $ */
+/* $XdotOrg$ */
+/* $XFree86: xc/programs/Xserver/dix/events.c,v 3.51 2004/01/12 17:04:52 tsi Exp $ */
 /************************************************************
 
 Copyright 1987, 1998  The Open Group
@@ -47,26 +48,33 @@ SOFTWARE.
 ********************************************************/
 
 /* The panoramix components contained the following notice */
-/****************************************************************
-*                                                               *
-*    Copyright (c) Digital Equipment Corporation, 1991, 1997    *
-*                                                               *
-*   All Rights Reserved.  Unpublished rights  reserved  under   *
-*   the copyright laws of the United States.                    *
-*                                                               *
-*   The software contained on this media  is  proprietary  to   *
-*   and  embodies  the  confidential  technology  of  Digital   *
-*   Equipment Corporation.  Possession, use,  duplication  or   *
-*   dissemination of the software and media is authorized only  *
-*   pursuant to a valid written license from Digital Equipment  *
-*   Corporation.                                                *
-*                                                               *
-*   RESTRICTED RIGHTS LEGEND   Use, duplication, or disclosure  *
-*   by the U.S. Government is subject to restrictions  as  set  *
-*   forth in Subparagraph (c)(1)(ii)  of  DFARS  252.227-7013,  *
-*   or  in  FAR 52.227-19, as applicable.                       *
-*                                                               *
-*****************************************************************/
+/*****************************************************************
+
+Copyright (c) 1991, 1997 Digital Equipment Corporation, Maynard, Massachusetts.
+
+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.
+
+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
+DIGITAL EQUIPMENT CORPORATION BE LIABLE FOR ANY CLAIM, DAMAGES, INCLUDING,
+BUT NOT LIMITED TO CONSEQUENTIAL OR INCIDENTAL 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 Digital Equipment Corporation
+shall not be used in advertising or otherwise to promote the sale, use or other
+dealings in this Software without prior written authorization from Digital
+Equipment Corporation.
+
+******************************************************************/
 
 /* $Xorg: events.c,v 1.4 2001/02/09 02:04:40 xorgcvs Exp $ */
 
diff --git a/dix/extension.c b/dix/extension.c
index 36f053f02..3fcf31b8e 100644
--- a/dix/extension.c
+++ b/dix/extension.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/dix/extension.c,v 3.12 2002/02/19 11:09:22 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/dix/extension.c,v 3.11 2001/12/14 19:59:31 dawes Exp $ */
 /***********************************************************
 
 Copyright 1987, 1998  The Open Group
diff --git a/dix/gc.c b/dix/gc.c
index 11f215c8d..ee787bca3 100644
--- a/dix/gc.c
+++ b/dix/gc.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/dix/gc.c,v 3.10 2003/11/17 22:20:34 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/dix/gc.c,v 3.9 2001/12/14 19:59:32 dawes Exp $ */
 /***********************************************************
 
 Copyright 1987, 1998  The Open Group
diff --git a/dix/globals.c b/dix/globals.c
index 29926308a..0682ed7c7 100644
--- a/dix/globals.c
+++ b/dix/globals.c
@@ -1,4 +1,5 @@
-/* $XFree86: xc/programs/Xserver/dix/globals.c,v 1.13 2003/12/03 17:11:29 tsi Exp $ */
+/* $XdotOrg: xc/programs/Xserver/dix/globals.c,v 1.13 2003/12/03 17:11:29 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/dix/globals.c,v 1.12tsi Exp $ */
 /************************************************************
 
 Copyright 1987, 1998  The Open Group
diff --git a/dix/grabs.c b/dix/grabs.c
index 7a9fbcdb5..6eba43d1f 100644
--- a/dix/grabs.c
+++ b/dix/grabs.c
@@ -46,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 */
-/* $XFree86: xc/programs/Xserver/dix/grabs.c,v 3.5 2003/11/17 22:20:34 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/dix/grabs.c,v 3.4 2002/02/19 11:09:22 alanh Exp $ */
 
 #include "X.h"
 #include "misc.h"
diff --git a/dix/main.c b/dix/main.c
index 37add2a62..a5814849d 100644
--- a/dix/main.c
+++ b/dix/main.c
@@ -1,4 +1,5 @@
-/* $XFree86: xc/programs/Xserver/dix/main.c,v 3.44 2003/11/17 22:20:34 dawes Exp $ */
+/* $XdotOrg: xc/programs/Xserver/dix/main.c,v 1.1.4.5.2.4.6.1 2004/04/20 03:27:08 gisburn Exp $ */
+/* $XFree86: xc/programs/Xserver/dix/main.c,v 3.43 2003/10/30 21:21:02 herrb Exp $ */
 /***********************************************************
 
 Copyright 1987, 1998  The Open Group
@@ -48,26 +49,33 @@ SOFTWARE.
 /* $Xorg: main.c,v 1.4 2001/02/09 02:04:40 xorgcvs Exp $ */
 
 /* The panoramix components contained the following notice */
-/****************************************************************
-*                                                               *
-*    Copyright (c) Digital Equipment Corporation, 1991, 1997    *
-*                                                               *
-*   All Rights Reserved.  Unpublished rights  reserved  under   *
-*   the copyright laws of the United States.                    *
-*                                                               *
-*   The software contained on this media  is  proprietary  to   *
-*   and  embodies  the  confidential  technology  of  Digital   *
-*   Equipment Corporation.  Possession, use,  duplication  or   *
-*   dissemination of the software and media is authorized only  *
-*   pursuant to a valid written license from Digital Equipment  *
-*   Corporation.                                                *
-*                                                               *
-*   RESTRICTED RIGHTS LEGEND   Use, duplication, or disclosure  *
-*   by the U.S. Government is subject to restrictions  as  set  *
-*   forth in Subparagraph (c)(1)(ii)  of  DFARS  252.227-7013,  *
-*   or  in  FAR 52.227-19, as applicable.                       *
-*                                                               *
-*****************************************************************/
+/*****************************************************************
+
+Copyright (c) 1991, 1997 Digital Equipment Corporation, Maynard, Massachusetts.
+
+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.
+
+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
+DIGITAL EQUIPMENT CORPORATION BE LIABLE FOR ANY CLAIM, DAMAGES, INCLUDING,
+BUT NOT LIMITED TO CONSEQUENTIAL OR INCIDENTAL 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 Digital Equipment Corporation
+shall not be used in advertising or otherwise to promote the sale, use or other
+dealings in this Software without prior written authorization from Digital
+Equipment Corporation.
+
+******************************************************************/
 
 /* $TOG: main.c /main/86 1998/02/09 14:20:03 kaleb $ */
 
@@ -243,6 +251,8 @@ main(int argc, char *argv[], char *envp[])
 
     display = "0";
 
+    InitGlobals();
+
     /* Quartz support on Mac OS X requires that the Cocoa event loop be in
      * the main thread. This allows the X server main to be called again
      * from another thread. */
diff --git a/dix/pixmap.c b/dix/pixmap.c
index fda07801c..2df5d7374 100644
--- a/dix/pixmap.c
+++ b/dix/pixmap.c
@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/programs/Xserver/dix/pixmap.c,v 3.5 2001/12/14 19:59:32 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/dix/pixmap.c,v 3.4 2001/01/17 22:36:44 dawes Exp $ */
 
 #include "X.h"
 #include "scrnintstr.h"
diff --git a/dix/privates.c b/dix/privates.c
index 2d0885846..64d705e24 100644
--- a/dix/privates.c
+++ b/dix/privates.c
@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/programs/Xserver/dix/privates.c,v 3.8 2001/12/14 19:59:32 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/dix/privates.c,v 3.7 2001/01/17 22:36:44 dawes Exp $ */
 
 #include "X.h"
 #include "scrnintstr.h"
diff --git a/dix/property.c b/dix/property.c
index 1af6156b5..f3d0edc9e 100644
--- a/dix/property.c
+++ b/dix/property.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/dix/property.c,v 3.13 2003/07/16 01:38:37 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/dix/property.c,v 3.12 2002/02/19 11:09:22 alanh Exp $ */
 /***********************************************************
 
 Copyright 1987, 1998  The Open Group
diff --git a/dix/resource.c b/dix/resource.c
index d885c03ef..b4a61cbf3 100644
--- a/dix/resource.c
+++ b/dix/resource.c
@@ -44,10 +44,37 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ********************************************************/
+/* The panoramix components contained the following notice */
+/*****************************************************************
 
-/* $Xorg: resource.c,v 1.5 2001/02/09 02:04:40 xorgcvs Exp $ */
+Copyright (c) 1991, 1997 Digital Equipment Corporation, Maynard, Massachusetts.
+
+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.
+
+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
+DIGITAL EQUIPMENT CORPORATION BE LIABLE FOR ANY CLAIM, DAMAGES, INCLUDING,
+BUT NOT LIMITED TO CONSEQUENTIAL OR INCIDENTAL 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 Digital Equipment Corporation
+shall not be used in advertising or otherwise to promote the sale, use or other
+dealings in this Software without prior written authorization from Digital
+Equipment Corporation.
 
+******************************************************************/
+
+/* $Xorg: resource.c,v 1.5 2001/02/09 02:04:40 xorgcvs Exp $ */
+/* $XdotOrg$ */
 /* $TOG: resource.c /main/41 1998/02/09 14:20:31 kaleb $ */
 
 /*	Routines to manage various kinds of resources:
@@ -72,7 +99,7 @@ SOFTWARE.
  *      1, and an otherwise arbitrary ID in the low 22 bits, we can create a
  *      resource "owned" by the client.
  */
-/* $XFree86: xc/programs/Xserver/dix/resource.c,v 3.14 2003/11/17 22:20:34 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/dix/resource.c,v 3.13 2003/09/24 02:43:13 dawes Exp $ */
 
 #define NEED_EVENTS
 #include "X.h"
diff --git a/dix/swaprep.c b/dix/swaprep.c
index 494471730..6bde83b96 100644
--- a/dix/swaprep.c
+++ b/dix/swaprep.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/dix/swaprep.c,v 3.8 2003/11/17 22:20:35 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/dix/swaprep.c,v 3.7 2001/12/14 19:59:33 dawes Exp $ */
 /************************************************************
 
 Copyright 1987, 1998  The Open Group
diff --git a/dix/swapreq.c b/dix/swapreq.c
index 358ec8139..d795a3dea 100644
--- a/dix/swapreq.c
+++ b/dix/swapreq.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/dix/swapreq.c,v 3.5 2002/02/19 11:09:22 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/dix/swapreq.c,v 3.4 2001/12/14 19:59:33 dawes Exp $ */
 /************************************************************
 
 Copyright 1987, 1998  The Open Group
diff --git a/dix/tables.c b/dix/tables.c
index a76bc7535..6037b1220 100644
--- a/dix/tables.c
+++ b/dix/tables.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/dix/tables.c,v 3.6 2003/11/17 22:20:35 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/dix/tables.c,v 3.5 2002/02/19 11:09:22 alanh Exp $ */
 /***********************************************************
 
 Copyright 1987, 1998  The Open Group
diff --git a/dix/window.c b/dix/window.c
index 0ed9cb083..4c20cd278 100644
--- a/dix/window.c
+++ b/dix/window.c
@@ -1,3 +1,4 @@
+/* $XdotOrg$ */
 /* $Xorg: window.c,v 1.4 2001/02/09 02:04:41 xorgcvs Exp $ */
 /*
 
@@ -49,28 +50,35 @@ SOFTWARE.
 */
 
 /* The panoramix components contained the following notice */
-/****************************************************************
-*                                                               *
-*    Copyright (c) Digital Equipment Corporation, 1991, 1997    *
-*                                                               *
-*   All Rights Reserved.  Unpublished rights  reserved  under   *
-*   the copyright laws of the United States.                    *
-*                                                               *
-*   The software contained on this media  is  proprietary  to   *
-*   and  embodies  the  confidential  technology  of  Digital   *
-*   Equipment Corporation.  Possession, use,  duplication  or   *
-*   dissemination of the software and media is authorized only  *
-*   pursuant to a valid written license from Digital Equipment  *
-*   Corporation.                                                *
-*                                                               *
-*   RESTRICTED RIGHTS LEGEND   Use, duplication, or disclosure  *
-*   by the U.S. Government is subject to restrictions  as  set  *
-*   forth in Subparagraph (c)(1)(ii)  of  DFARS  252.227-7013,  *
-*   or  in  FAR 52.227-19, as applicable.                       *
-*                                                               *
-*****************************************************************/
-
-/* $XFree86: xc/programs/Xserver/dix/window.c,v 3.37 2003/11/17 22:20:35 dawes Exp $ */
+/*****************************************************************
+
+Copyright (c) 1991, 1997 Digital Equipment Corporation, Maynard, Massachusetts.
+
+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.
+
+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
+DIGITAL EQUIPMENT CORPORATION BE LIABLE FOR ANY CLAIM, DAMAGES, INCLUDING,
+BUT NOT LIMITED TO CONSEQUENTIAL OR INCIDENTAL 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 Digital Equipment Corporation
+shall not be used in advertising or otherwise to promote the sale, use or other
+dealings in this Software without prior written authorization from Digital
+Equipment Corporation.
+
+******************************************************************/
+
+/* $XFree86: xc/programs/Xserver/dix/window.c,v 3.36 2003/11/14 23:52:50 torrey Exp $ */
 
 #include "misc.h"
 #include "scrnintstr.h"
diff --git a/dix/xpstubs.c b/dix/xpstubs.c
index a48a81402..dac3205fb 100644
--- a/dix/xpstubs.c
+++ b/dix/xpstubs.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/dix/xpstubs.c,v 1.4 2001/12/20 19:41:00 tsi Exp $ */
+/* $XFree86$ */
 /*
 Copyright 1996, 1998  The Open Group
 
@@ -31,24 +31,24 @@ from The Open Group.
 #include "font.h"
 
 Bool
-XpClientIsBitmapClient(client)
-    ClientPtr client;
+XpClientIsBitmapClient(
+    ClientPtr client)
 {
     return TRUE;
 }
 
 Bool
-XpClientIsPrintClient(client, fpe)
-    ClientPtr client;
-    FontPathElementPtr fpe;
+XpClientIsPrintClient(
+    ClientPtr client,
+    FontPathElementPtr fpe)
 {
     return FALSE;
 }
 int
-XprintOptions(argc, argv, i)
-    int argc;
-    char **argv;
-    int i;
+XprintOptions(
+    int argc,
+    char **argv,
+    int i)
 {
     return i;
 }
diff --git a/doc/smartsched b/doc/smartsched
index 3d5a84b9b..057a759fd 100644
--- a/doc/smartsched
+++ b/doc/smartsched
@@ -201,4 +201,4 @@ response and benchmark numbers at the same time.
 
 
 
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/smartsched,v 1.2 1999/11/19 14:59:16 hohndel Exp $
+$XFree86: $
diff --git a/fb/fb.h b/fb/fb.h
index c9633d248..f90a3499e 100644
--- a/fb/fb.h
+++ b/fb/fb.h
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/programs/Xserver/fb/fb.h,v 1.37 2003/11/03 05:11:00 tsi Exp $
+ * $XFree86: xc/programs/Xserver/fb/fb.h,v 1.36tsi Exp $
  *
  * Copyright © 1998 Keith Packard
  *
@@ -105,7 +105,7 @@ typedef unsigned __int64    FbBits;
       defined(ia64) || defined(__ia64__) || \
       defined(__sparc64__) || \
       defined(__s390x__) || \
-      defined(AMD64) || defined (__AMD64__) || \
+      defined(amd64) || defined (__amd64__) || \
       (defined(sgi) && (_MIPS_SZLONG == 64))
 typedef unsigned long	    FbBits;
 #  else
diff --git a/fb/fb24_32.c b/fb/fb24_32.c
index 1f9e843cf..08d681798 100644
--- a/fb/fb24_32.c
+++ b/fb/fb24_32.c
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/programs/Xserver/fb/fb24_32.c,v 1.5 2001/05/29 04:54:08 keithp Exp $
+ * $XFree86: xc/programs/Xserver/fb/fb24_32.c,v 1.4 2000/08/09 17:50:51 keithp Exp $
  *
  * Copyright © 2000 SuSE, Inc.
  *
diff --git a/fb/fb24_32.h b/fb/fb24_32.h
index d0a0acb97..80034aa25 100644
--- a/fb/fb24_32.h
+++ b/fb/fb24_32.h
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/programs/Xserver/fb/fb24_32.h,v 1.1 2000/04/04 19:24:49 dawes Exp $
+ * $XFree86$
  *
  * Copyright © 2000 SuSE, Inc.
  *
diff --git a/fb/fballpriv.c b/fb/fballpriv.c
index 687de493a..e7fcfd45b 100644
--- a/fb/fballpriv.c
+++ b/fb/fballpriv.c
@@ -21,7 +21,7 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
-/* $XFree86: xc/programs/Xserver/fb/fballpriv.c,v 1.4 2000/05/06 21:09:31 keithp Exp $ */
+/* $XFree86: xc/programs/Xserver/fb/fballpriv.c,v 1.3 2000/02/23 20:29:41 dawes Exp $ */
 
 #include "fb.h"
 
diff --git a/fb/fbarc.c b/fb/fbarc.c
index 9713ffb09..bba95a84e 100644
--- a/fb/fbarc.c
+++ b/fb/fbarc.c
@@ -21,7 +21,7 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
-/* $XFree86: xc/programs/Xserver/fb/fbarc.c,v 1.8 2002/11/09 04:59:29 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/fb/fbarc.c,v 1.7tsi Exp $ */
 
 #include "fb.h"
 #include "mizerarc.h"
diff --git a/fb/fbbits.c b/fb/fbbits.c
index b1c123d21..3cca2bbb2 100644
--- a/fb/fbbits.c
+++ b/fb/fbbits.c
@@ -21,7 +21,7 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
-/* $XFree86: xc/programs/Xserver/fb/fbbits.c,v 1.6 2000/02/23 20:29:41 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/fb/fbbits.c,v 1.5 2000/02/17 14:16:22 dawes Exp $ */
 
 #include "fb.h"
 #include "miline.h"
diff --git a/fb/fbbits.h b/fb/fbbits.h
index 80fbc4010..4f9d04e62 100644
--- a/fb/fbbits.h
+++ b/fb/fbbits.h
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/programs/Xserver/fb/fbbits.h,v 1.14 2003/11/03 05:11:00 tsi Exp $
+ * $XFree86$
  *
  * Copyright © 1998 Keith Packard
  *
diff --git a/fb/fbblt.c b/fb/fbblt.c
index b1fd5f5b0..c6e29f387 100644
--- a/fb/fbblt.c
+++ b/fb/fbblt.c
@@ -21,7 +21,7 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
-/* $XFree86: xc/programs/Xserver/fb/fbblt.c,v 1.8 2000/09/28 00:47:22 keithp Exp $ */
+/* $XFree86: xc/programs/Xserver/fb/fbblt.c,v 1.7 2000/09/22 05:58:01 keithp Exp $ */
 
 #include "fb.h"
 
diff --git a/fb/fbbltone.c b/fb/fbbltone.c
index e758794b8..762022551 100644
--- a/fb/fbbltone.c
+++ b/fb/fbbltone.c
@@ -21,7 +21,7 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
-/* $XFree86: xc/programs/Xserver/fb/fbbltone.c,v 1.13 2002/02/23 00:42:07 keithp Exp $ */
+/* $XFree86: xc/programs/Xserver/fb/fbbltone.c,v 1.11 2001/09/07 15:15:31 keithp Exp $ */
 
 #include "fb.h"
 
diff --git a/fb/fbbstore.c b/fb/fbbstore.c
index 07a6400a8..7b0863856 100644
--- a/fb/fbbstore.c
+++ b/fb/fbbstore.c
@@ -21,7 +21,7 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
-/* $XFree86: xc/programs/Xserver/fb/fbbstore.c,v 1.2 2000/02/23 20:29:42 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/fb/fbbstore.c,v 1.1 1999/11/19 13:53:42 hohndel Exp $ */
 
 #include "fb.h"
 
diff --git a/fb/fbcmap.c b/fb/fbcmap.c
index aeb53b1fb..001277a1d 100644
--- a/fb/fbcmap.c
+++ b/fb/fbcmap.c
@@ -1,5 +1,5 @@
 /* $XConsortium: fbcmap.c,v 4.19 94/04/17 20:28:46 dpw Exp $ */
-/* $XFree86: xc/programs/Xserver/fb/fbcmap.c,v 1.6 2001/10/28 03:33:08 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/fb/fbcmap.c,v 1.5 2000/09/20 00:09:13 keithp Exp $ */
 /************************************************************
 Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA.
 
diff --git a/fb/fbcompose.c b/fb/fbcompose.c
index 4938f89d0..f650c972a 100644
--- a/fb/fbcompose.c
+++ b/fb/fbcompose.c
@@ -1,5 +1,6 @@
 /*
- * $XFree86: xc/programs/Xserver/fb/fbcompose.c,v 1.18 2003/12/04 17:15:12 tsi Exp $
+ * $XdotOrg: xc/programs/Xserver/fb/fbcompose.c,v 1.18 2003/12/04 17:15:12 tsi Exp $
+ * $XFree86: xc/programs/Xserver/fb/fbcompose.c,v 1.17tsi Exp $
  *
  * Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc.
  *
diff --git a/fb/fbcopy.c b/fb/fbcopy.c
index 6dd48a786..2f2d2f12b 100644
--- a/fb/fbcopy.c
+++ b/fb/fbcopy.c
@@ -21,7 +21,7 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
-/* $XFree86: xc/programs/Xserver/fb/fbcopy.c,v 1.14 2003/12/28 17:22:25 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/fb/fbcopy.c,v 1.13 2003/11/10 18:21:47 tsi Exp $ */
 
 #include "fb.h"
 #ifdef IN_MODULE
diff --git a/fb/fbfill.c b/fb/fbfill.c
index 8ecb3cde6..d03bc6461 100644
--- a/fb/fbfill.c
+++ b/fb/fbfill.c
@@ -21,7 +21,7 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
-/* $XFree86: xc/programs/Xserver/fb/fbfill.c,v 1.6 2003/01/31 00:01:45 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/fb/fbfill.c,v 1.5 2003/01/29 00:43:33 torrey Exp $ */
 
 #include "fb.h"
 
diff --git a/fb/fbfillrect.c b/fb/fbfillrect.c
index d0468e041..c39b500fd 100644
--- a/fb/fbfillrect.c
+++ b/fb/fbfillrect.c
@@ -21,7 +21,7 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
-/* $XFree86: xc/programs/Xserver/fb/fbfillrect.c,v 1.2 2000/02/23 20:29:43 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/fb/fbfillrect.c,v 1.1 1999/11/19 13:53:43 hohndel Exp $ */
 
 #include "fb.h"
 
diff --git a/fb/fbfillsp.c b/fb/fbfillsp.c
index 29c3a36b0..dae05b0ed 100644
--- a/fb/fbfillsp.c
+++ b/fb/fbfillsp.c
@@ -21,7 +21,7 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
-/* $XFree86: xc/programs/Xserver/fb/fbfillsp.c,v 1.2 2000/02/23 20:29:43 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/fb/fbfillsp.c,v 1.1 1999/11/19 13:53:43 hohndel Exp $ */
 
 #include "fb.h"
 
diff --git a/fb/fbgc.c b/fb/fbgc.c
index 1e9eb5aa3..8cd08503d 100644
--- a/fb/fbgc.c
+++ b/fb/fbgc.c
@@ -21,7 +21,8 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
-/* $XFree86: xc/programs/Xserver/fb/fbgc.c,v 1.15 2003/12/18 15:25:41 alanh Exp $ */
+/* $XdotOrg: xc/programs/Xserver/fb/fbgc.c,v 1.15 2003/12/18 15:25:41 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/fb/fbgc.c,v 1.14 2003/12/18 15:22:32 alanh Exp $ */
 
 #include "fb.h"
 #ifdef IN_MODULE
diff --git a/fb/fbgetsp.c b/fb/fbgetsp.c
index db35f6d5c..3140377e5 100644
--- a/fb/fbgetsp.c
+++ b/fb/fbgetsp.c
@@ -21,7 +21,7 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
-/* $XFree86: xc/programs/Xserver/fb/fbgetsp.c,v 1.6 2001/05/29 04:54:09 keithp Exp $ */
+/* $XFree86: xc/programs/Xserver/fb/fbgetsp.c,v 1.5 2000/05/06 21:09:33 keithp Exp $ */
 
 #include "fb.h"
 
diff --git a/fb/fbglyph.c b/fb/fbglyph.c
index 3ad8d2507..b7eea5e77 100644
--- a/fb/fbglyph.c
+++ b/fb/fbglyph.c
@@ -1,5 +1,6 @@
 /*
- * $XFree86: xc/programs/Xserver/fb/fbglyph.c,v 1.13 2003/12/04 17:15:12 tsi Exp $
+ * $XdotOrg: xc/programs/Xserver/fb/fbglyph.c,v 1.13 2003/12/04 17:15:12 tsi Exp $
+ * $XFree86: xc/programs/Xserver/fb/fbglyph.c,v 1.12tsi Exp $
  *
  * Copyright © 1998 Keith Packard
  *
diff --git a/fb/fbimage.c b/fb/fbimage.c
index 7d0284c38..49356f627 100644
--- a/fb/fbimage.c
+++ b/fb/fbimage.c
@@ -21,7 +21,7 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
-/* $XFree86: xc/programs/Xserver/fb/fbimage.c,v 1.8 2001/09/07 15:15:31 keithp Exp $ */
+/* $XFree86: xc/programs/Xserver/fb/fbimage.c,v 1.7 2001/05/29 04:54:09 keithp Exp $ */
 
 #include "fb.h"
 #ifdef XFree86LOADER
diff --git a/fb/fbline.c b/fb/fbline.c
index 957222492..d48780100 100644
--- a/fb/fbline.c
+++ b/fb/fbline.c
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/programs/Xserver/fb/fbline.c,v 1.8 2003/11/03 05:11:00 tsi Exp $
+ * $XFree86$
  *
  * Copyright © 1998 Keith Packard
  *
diff --git a/fb/fboverlay.c b/fb/fboverlay.c
index 00521eef2..28068db83 100644
--- a/fb/fboverlay.c
+++ b/fb/fboverlay.c
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/programs/Xserver/fb/fboverlay.c,v 1.7 2003/11/10 18:21:47 tsi Exp $
+ * $XFree86: xc/programs/Xserver/fb/fboverlay.c,v 1.6tsi Exp $
  *
  * Copyright © 2000 SuSE, Inc.
  *
diff --git a/fb/fboverlay.h b/fb/fboverlay.h
index 3dca8a3a4..72891ece3 100644
--- a/fb/fboverlay.h
+++ b/fb/fboverlay.h
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/programs/Xserver/fb/fboverlay.h,v 1.5 2002/09/19 13:22:00 tsi Exp $
+ * $XFree86: xc/programs/Xserver/fb/fboverlay.h,v 1.4tsi Exp $
  *
  * Copyright © 2000 SuSE, Inc.
  *
diff --git a/fb/fbpict.c b/fb/fbpict.c
index 894d5cd62..533f08d01 100644
--- a/fb/fbpict.c
+++ b/fb/fbpict.c
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/programs/Xserver/fb/fbpict.c,v 1.16 2002/12/14 01:46:02 dawes Exp $
+ * $XFree86: xc/programs/Xserver/fb/fbpict.c,v 1.15 2002/09/26 02:56:48 keithp Exp $
  *
  * Copyright © 2000 SuSE, Inc.
  *
diff --git a/fb/fbpict.h b/fb/fbpict.h
index fd911b078..9ecc7a909 100644
--- a/fb/fbpict.h
+++ b/fb/fbpict.h
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/programs/Xserver/fb/fbpict.h,v 1.11 2002/09/26 02:56:48 keithp Exp $
+ * $XFree86: xc/programs/Xserver/fb/fbpict.h,v 1.7 2001/07/18 10:15:02 keithp Exp $
  *
  * Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc.
  *
diff --git a/fb/fbpixmap.c b/fb/fbpixmap.c
index 757406c21..e47999dbb 100644
--- a/fb/fbpixmap.c
+++ b/fb/fbpixmap.c
@@ -21,7 +21,7 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
-/* $XFree86: xc/programs/Xserver/fb/fbpixmap.c,v 1.11 2002/09/16 18:05:34 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/fb/fbpixmap.c,v 1.9 2001/05/29 04:54:09 keithp Exp $ */
 
 #include "fb.h"
 #ifdef IN_MODULE
diff --git a/fb/fbpoint.c b/fb/fbpoint.c
index 20426a9f1..255cfa05c 100644
--- a/fb/fbpoint.c
+++ b/fb/fbpoint.c
@@ -21,7 +21,7 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
-/* $XFree86: xc/programs/Xserver/fb/fbpoint.c,v 1.8 2001/05/29 04:54:09 keithp Exp $ */
+/* $XFree86: xc/programs/Xserver/fb/fbpoint.c,v 1.7 2000/09/22 05:58:01 keithp Exp $ */
 
 #include "fb.h"
 
diff --git a/fb/fbpush.c b/fb/fbpush.c
index 4ae60764c..ffb357ca3 100644
--- a/fb/fbpush.c
+++ b/fb/fbpush.c
@@ -21,7 +21,7 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
-/* $XFree86: xc/programs/Xserver/fb/fbpush.c,v 1.5 2001/05/29 04:54:09 keithp Exp $ */
+/* $XFree86: xc/programs/Xserver/fb/fbpush.c,v 1.3 2000/02/14 19:20:30 dawes Exp $ */
 
 #include "fb.h"
 
diff --git a/fb/fbrop.h b/fb/fbrop.h
index 9481be680..0b97be66f 100644
--- a/fb/fbrop.h
+++ b/fb/fbrop.h
@@ -21,7 +21,7 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
-/* $XFree86: xc/programs/Xserver/fb/fbrop.h,v 1.4 2000/02/23 20:29:46 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/fb/fbrop.h,v 1.3 2000/02/14 19:20:30 dawes Exp $ */
 
 #ifndef _FBROP_H_
 #define _FBROP_H_
diff --git a/fb/fbscreen.c b/fb/fbscreen.c
index bdcc9d139..2a46b00be 100644
--- a/fb/fbscreen.c
+++ b/fb/fbscreen.c
@@ -21,7 +21,7 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
-/* $XFree86: xc/programs/Xserver/fb/fbscreen.c,v 1.13 2001/05/29 04:54:09 keithp Exp $ */
+/* $XFree86: xc/programs/Xserver/fb/fbscreen.c,v 1.11 2000/09/03 05:09:47 keithp Exp $ */
 
 #include "fb.h"
 
diff --git a/fb/fbseg.c b/fb/fbseg.c
index 284f11fa9..993672b2c 100644
--- a/fb/fbseg.c
+++ b/fb/fbseg.c
@@ -21,7 +21,7 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
-/* $XFree86: xc/programs/Xserver/fb/fbseg.c,v 1.8 2001/05/29 04:54:09 keithp Exp $ */
+/* $XFree86: xc/programs/Xserver/fb/fbseg.c,v 1.7 2001/01/17 07:40:02 keithp Exp $ */
 
 #include "fb.h"
 #include "miline.h"
diff --git a/fb/fbsetsp.c b/fb/fbsetsp.c
index e207760c6..ea9f3b581 100644
--- a/fb/fbsetsp.c
+++ b/fb/fbsetsp.c
@@ -21,7 +21,7 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
-/* $XFree86: xc/programs/Xserver/fb/fbsetsp.c,v 1.5 2001/05/29 04:54:09 keithp Exp $ */
+/* $XFree86: xc/programs/Xserver/fb/fbsetsp.c,v 1.4 2000/05/06 21:09:34 keithp Exp $ */
 
 #include "fb.h"
 
diff --git a/fb/fbsolid.c b/fb/fbsolid.c
index 17b5bffe0..a325da0c2 100644
--- a/fb/fbsolid.c
+++ b/fb/fbsolid.c
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/programs/Xserver/fb/fbsolid.c,v 1.8 2001/10/28 03:33:08 tsi Exp $
+ * $XFree86$
  *
  * Copyright © 1998 Keith Packard
  *
diff --git a/fb/fbstipple.c b/fb/fbstipple.c
index 88f694bb8..46278c1ac 100644
--- a/fb/fbstipple.c
+++ b/fb/fbstipple.c
@@ -21,7 +21,7 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
-/* $XFree86: xc/programs/Xserver/fb/fbstipple.c,v 1.7 2001/10/28 03:33:08 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/fb/fbstipple.c,v 1.6 2000/02/23 20:29:47 dawes Exp $ */
 
 #include "fb.h"
 
diff --git a/fb/fbtile.c b/fb/fbtile.c
index ed447f8d3..27cd42372 100644
--- a/fb/fbtile.c
+++ b/fb/fbtile.c
@@ -21,7 +21,7 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
-/* $XFree86: xc/programs/Xserver/fb/fbtile.c,v 1.4 2000/02/23 20:29:48 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/fb/fbtile.c,v 1.3 2000/02/12 03:39:43 dawes Exp $ */
 
 #include "fb.h"
 
diff --git a/fb/fbtrap.c b/fb/fbtrap.c
index 3a44d53ef..8fcd2b5cc 100644
--- a/fb/fbtrap.c
+++ b/fb/fbtrap.c
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/programs/Xserver/fb/fbtrap.c,v 1.10 2002/09/27 00:31:24 keithp Exp $
+ * $XFree86: xc/programs/Xserver/fb/fbtrap.c,v 1.9 2002/09/26 02:56:48 keithp Exp $
  *
  * Copyright © 2000 University of Southern California
  *
diff --git a/fb/fbutil.c b/fb/fbutil.c
index 54b88ad7e..436bff72c 100644
--- a/fb/fbutil.c
+++ b/fb/fbutil.c
@@ -21,7 +21,7 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
-/* $XFree86: xc/programs/Xserver/fb/fbutil.c,v 1.5 2001/03/28 14:37:03 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/fb/fbutil.c,v 1.4 2000/02/23 20:29:48 dawes Exp $ */
 
 #include "fb.h"
 
diff --git a/fb/fbwindow.c b/fb/fbwindow.c
index 262716543..dd775cc0c 100644
--- a/fb/fbwindow.c
+++ b/fb/fbwindow.c
@@ -1,3 +1,4 @@
+/* $XdotOrg$ */
 /*
  * Id: fbwindow.c,v 1.1 1999/11/02 03:54:45 keithp Exp $
  *
@@ -21,7 +22,7 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
-/* $XFree86: xc/programs/Xserver/fb/fbwindow.c,v 1.11 2003/11/10 18:21:47 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/fb/fbwindow.c,v 1.10tsi Exp $ */
 
 #include "fb.h"
 #ifdef IN_MODULE
diff --git a/hw/darwin/XDarwin.man b/hw/darwin/XDarwin.man
index a718e41ce..eb1b9dcb8 100644
--- a/hw/darwin/XDarwin.man
+++ b/hw/darwin/XDarwin.man
@@ -1,4 +1,4 @@
-.\" $XFree86: xc/programs/Xserver/hw/darwin/XDarwin.man,v 1.4 2002/01/09 18:01:58 torrey Exp $
+.\" $XFree86: xc/programs/Xserver/hw/darwin/XDarwin.man,v 1.3 2001/09/23 23:02:37 torrey Exp $
 .\"
 .TH XDARWIN 1 __vendorversion__
 .SH NAME
@@ -10,7 +10,7 @@ XDarwin \- X window system server for Darwin operating system
 #ifdef DARWIN_WITH_QUARTZ
 .I XDarwin
 is the X window server for Mac OS X and the Darwin operating system
-provided by the XFree86 Project.
+provided by the X.Org Foundation.
 .I XDarwin
 can run in three different modes. On Mac OS X,
 .I XDarwin
@@ -51,7 +51,7 @@ handles the desktop background.
 #else
 .I XDarwin
 is the X window server for Mac OS X and the Darwin operating system
-provided by the XFree86 Project. This version of
+provided by the X.Org Foundation. This version of
 .I XDarwin
 can only be started from the Darwin text console. The Mac OS X Aqua GUI, if
 present, must be shut down.
@@ -147,7 +147,7 @@ Print out the server version and patchlevel.
 Same as \fB\-showconfig\fP.
 .SH "SEE ALSO"
 .PP
-X(__miscmansuffix__), XFree86(1), Xserver(1), xdm(1), xinit(1)
+X(__miscmansuffix__), Xorg(1), Xserver(1), xdm(1), xinit(1)
 .SH BUGS
 .I XDarwin
 and this man page still have many limitations. Some of the more obvious
diff --git a/hw/darwin/bundle/Dutch.lproj/Credits.rtf b/hw/darwin/bundle/Dutch.lproj/Credits.rtf
index 56038582a..5858e5933 100644
--- a/hw/darwin/bundle/Dutch.lproj/Credits.rtf
+++ b/hw/darwin/bundle/Dutch.lproj/Credits.rtf
@@ -5,10 +5,20 @@
 \vieww9000\viewh9000\viewkind0
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
 
-\f0\fs24 \cf0 This product  includes software developed by The XFree86 Project, Inc  (http://www.xfree86.org/) and its contributors. The following people contributed to Darwin/Mac OS X support.\
+\f0\fs24 \cf0 This product includes software developed by The XFree86 Project, Inc  (http://www.xfree86.org/) and its contributors. The following people contributed to Darwin/Mac OS X support.\
 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
 
+\f1\b \cf0 Contributors to Xorg Foundation Release:
+\f0\b0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
+\cf0 Kaleb KEITHLEY\
+     
+\f2\i Working left and right Ctrl, Alt (Option), Meta (Command) and Shift keys.
+\f0\i0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
+
+\f1\b \cf0 \
 \f1\b \cf0 Contributors to XFree86 4.4:
 \f0\b0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
diff --git a/hw/darwin/bundle/Dutch.lproj/MainMenu.nib/objects.nib b/hw/darwin/bundle/Dutch.lproj/MainMenu.nib/objects.nib
index 438e26b3b..8e9224cb6 100644
--- a/hw/darwin/bundle/Dutch.lproj/MainMenu.nib/objects.nib
+++ b/hw/darwin/bundle/Dutch.lproj/MainMenu.nib/objects.nib
diff --git a/hw/darwin/bundle/Dutch.lproj/XDarwinHelp.html.cpp b/hw/darwin/bundle/Dutch.lproj/XDarwinHelp.html.cpp
index e7ca52c2c..1113b8ae6 100644
--- a/hw/darwin/bundle/Dutch.lproj/XDarwinHelp.html.cpp
+++ b/hw/darwin/bundle/Dutch.lproj/XDarwinHelp.html.cpp
@@ -1 +1,103 @@
-<!-- $XFree86: xc/programs/Xserver/hw/darwin/bundle/Dutch.lproj/XDarwinHelp.html.cpp,v 1.2 2001/11/19 01:21:32 torrey Exp $ -->

#include "xf86Version.h"
#ifndef PRE_RELEASE
#define PRE_RELEASE XF86_VERSION_SNAP
#endif

<html>
<head>
<title>XFree86 voor Mac OS X</title>
</head>
<body>
<center>
    <h1>XFree86 voor Darwin en Mac OS X</h1>
    XFree86 XF86_VERSION<br>
    Release Date: XF86_REL_DATE
</center>
<h2>Inhoud</h2>
<ol>
    <li><A HREF="#notice">Belangrijke Informatie</A></li>
    <li><A HREF="#usage">Gebruik</A></li>
    <li><A HREF="#path">Instellen van het Path</A></li>
    <li><A HREF="#prefs">Voorkeursinstellingen</A></li>
    <li><A HREF="#license">Licentie</A></li>
</ol>
<center>
    <h2><a NAME="notice">Belangrijke Informatie</a></h2>
</center>
<blockquote>
#if PRE_RELEASE
Dit is een pre-release van XFree86, waarvoor geen ondersteuning beschikbaar is.  Rapporteren van bugs en aanleveren van patches kan op de <A HREF="http://sourceforge.net/projects/xonx/">XonX project pagina</A> bij SourceForge.  Kijk alvorens een bug te rapporteren in een pre-release eerst of een nieuwe versie beschikbaar is bij <A HREF="http://sourceforge.net/projects/xonx/">XonX</A> of in de <A HREF="http://www.XFree86.Org/cvs">XFree86 CVS repository</A>.
#else
Als de server ouder is dan 6-12 maanden, of als uw hardware nieuwer is dan de bovenstaande datum, kijk dan of een nieuwe versie beschikbaar is voor u een probleem aanmeldt.  Rapporteren van bugs en aanleveren van patches kan op de <A HREF="http://sourceforge.net/projects/xonx/">XonX project pagina</A> bij SourceForge.
#endif
</blockquote>
<blockquote>
Deze software is beschikbaar gesteld onder de voorwaarden van de <A HREF="#license">MIT X11 / X Consortium Licentie</A> en is beschikbaar 'AS IS',zonder enige garantie. Lees s.v.p. de <A HREF="#license">Licentie</A> voor gebruik.</blockquote>

<h2><a NAME="usage">Gebruik</a></h2>
<p>XFree86 is een open-source uitvoering van het <a HREF="http://www.x.org/">X Window Systeem</a>, verzorgd door <a HREF="http://www.XFree86.Org/">XFree86 Project, Inc.</a>, die vrij verspreid mag worden. De X window server voor Darwin en Mac OS X verzorgd door XFree86 heet XDarwin.  XDarwin werkt op Mac OS X in schermvullende of rootless modus.</p>
<p>Het X window systeem in schermvullende modus neemt het hele beeldscherm in beslag. U schakelt terug naar de Mac OS X desktop door de toesten Command-Option-A in te drukken. Deze toetsencombinatie kunt u veranderen in de Voorkeuren. Op de Mac OS X desktop klikt u op de XDarwin icoon in de Dock om weer naar het X window systeem te schakelen.  (In de Voorkeuren kunt er voor kiezen om een apart XDarwin schakelpaneel te gebruiken op de Mac OS X desktop.)</p>
<p>In rootless modus verschijnen het X window systeem en Aqua (de Mac OS X desktop) tegelijk op het scherm. Het achtergrondscherm van X11, waarbinnen alle X11 vensters vallen, is net zo groot als het gehele scherm, maar het achtergrondscherm zelf is onzichtbaar.</p>

<h3>Meerknopsmuis emulatie</h3>
<p>Voor veel X11 programma's hebt u een 3-knops muis nodig.  Met een 1-knops muis kunt u een 3-knops muis nabootsen door een toets in te drukken terwijl u klikt met de muis.  Het instellen hiervan kan bij Voorkeuren, "Meerknopsmuis emulatie" in "Algemeen".  Emulatie is standaard ingeschakeld: ingedrukt houden van de "command" toets terwijl u klikt emuleert knop 2, ingedrukt houden van "option" emuleert knop 3.  Deze toetsen kunt u dus wijzigen in de Voorkeuren.  Let op: als u xmodmap gebruikt om de indeling van het toetsenbord te wijzigen, moet u toch de oorspronkelijke toetsen op het toetsenbord gebruiken voor deze functie.</p>

<h2><a NAME="path">Instellen van het Path</a></h2>
<p>Het path is de lijst van directories waarin gezocht wordt naar commando's.  De X11 commando's staan in de directory <code>/usr/X11R6/bin</code>, die dus aan uw path moet worden toegevoegd.  XDarwin doet dit automatisch voor u en kan extra directories toevoegen waarin u commando's hebt ge&iuml;nstalleerd.</p>

<p>Ervaren gebruikers zullen het path al correct hebben ingesteld in de configuratiebestanden voor hun shell.  In dat geval kunt u XDarwin via de Voorkeuren vertellen het path niet te wijzigen.  XDarwin start de eerste X11 clients binnen de standaard login shell van de gebruiker (bij de Voorkeuren kunt u een afwijkende shell opgeven).  Het instellen van het path is afhankelijk van de shell.  Zie hiervoor de man pages voor de shell.</p>

<p>Het kan handig zijn de man pages voor XFree86 toe te voegen aan de lijst waarin gezocht wordt als u documentatie opvraagt.  De manualpages voor X11 staan in <code>/usr/X11R6/man</code> en de <code>MANPATH</code> environment variable bevat de lijst van directories waarin naar documentatie wordt gezocht.</p>

<h2><a NAME="prefs">Voorkeursinstellingen</a></h2>
<p>Een aantal instellingen kan worden gewijzigd door "Voorkeuren..." te kiezen in het "XDarwin" menu.  Wijzigingen van de instellingen genoemd onder "Start" gaan pas in als u XDarwin opnieuw hebt gestart.  Een wijziging van de overige instellingen is direct effectief.  Hier onder vindt u de verschillende mogelijkheden beschreven:</p>

<h3>Algemeen</h3>
<ul>
    <li><b>Gebruik systeempiep voor X11:</b> Als u dit inschakelt wordt het Mac OS X  waarschuwingssignaal ook gebruikt door X11, anders gebruikt X11 een simpele pieptoon (dit is de standaardinstelling).</li>
    <li><b>Wijzigen muis-versnelling door X11 mogelijk:</b> In een standaard X window systeem kan de window manager de muis-versnelling aanpassen.  Dit kan verwarrend zijn omdat de snelheid onder X11 dan verschillend kan zijn van de snelheid die u in Mac OS X bij Systeemvoorkeuren hebt ingesteld.  Om verwarring te voorkomen is de standaardinstelling dat X11 de versnelling niet kan wijzigen.</li>
    <li><b>Meerknopsmuis emulatie:</b> Dit is hierboven beschreven bij <a HREF="#usage">Gebruik</a>.  Als emulatie is ingeschakeld moet u de gekozen toetsen ingedrukt houden terwijl u met de muis klikt om de tweede en derde muisknop na te bootsen.</li>
</ul>

<h3>Start</h3>
<ul>
    <li><b>Standaard modus:</b> Hier kiest u de standaard scherm-modus: schermvullend of rootless (hierboven beschreven bij <a HREF="#usage">Gebruik</a>).  U kunt ook kiezen tijdens het starten van XDarwin, zie de optie hieronder.</li>
    <li><b>Kies scherm-modus tijdens start:</b> Dit is standaard ingeschakeld zodat u tijdens het starten van XDarwin kunt kiezen tussen schermvullend en rootless scherm-modus.  Als u dit uitschakelt start XDarwin in de standaard modus zonder u iets te vragen.</li>
    <li><b>X11 scherm nummer:</b> Met X11 kunnen meerdere schermen worden aangestuurd door verschillende X servers op dezelfde computer.  Als u meerdere X servers tegelijk wilt gebruiken stelt u hier het scherm nummer in dat door XDarwin wordt gebruikt.</li>
    <li><b>Xinerama multi-monitor ondersteuning mogelijk:</b> XDarwin ondersteunt het gebruik van meerdere monitoren met Xinerama, waarbij elke monitor wordt gezien als deel van &eacute;&eacute;n groot rechthoekig scherm.  U kunt Xinerama hier uitschakelen, maar XDarwin werkt op dit moment zonder Xinerama niet goed met meerdere monitoren.  Als u maar 1 monitor gebruikt is deze instelling automatisch uitgeschakeld.</li>
    <li><b>Toetsenbordindeling-bestand:</b> Een toetsenbordindeling-bestand wordt bij het starten geladen en omgezet naar een X11 toetsenbordindeling.  Voor verschillende talen vindt u toetsenbordindelingen in de directory <code>/System/Library/Keyboards</code>.</li>
    <li><b>Bij starten eerste X11 clients:</b> Als XDarwin start, wordt  <code>xinit</code> uitgevoerd om de X window manager en andere X clients te starten (zie "<code>man xinit</code>").  Voordat XDarwin <code>xinit</code> uitvoert voegt het de opgegeven directories toe aan het path.  Standaard wordt alleen <code>/usr/X11R6/bin</code> toegevoegd.  U kunt meerdere directories opgeven, gescheiden door een dubbelepunt.  X clients worden gestart met de standaard login shell van de gebruiker met gebruik van de configuratiebestanden voor die shell.  U kunt een afwijkende shell opgeven.</li>
</ul>

<h3>Schermvullend</h3>
<ul>
    <li><b>Toetscombinatie knop:</b> Klik op deze knop om de toetscombinatie te wijzigen waarmee u tussen de Mac OS X desktop en X11 schakelt.  Als toetscombinatie kunt u elke combinatie gebruiken van de shift, control, command en option toetsen samen met &eacute;&eacute;n normale toets.</li>
    <li><b>Klikken op icoon in Dock schakelt naar X11:</b> Hiermee is een klik op de XDarwin icoon in de Dock voldoende om naar X11 te schakelen.  In sommige versies van Mac OS X verdwijnt soms de cursor als u deze mogelijkheid gebruikt en daarna terugkeert naar de Mac OS X desktop.</li>
    <li><b>Toon help bij schermvullend starten:</b> Hiermee wordt een inleidend scherm getoond als XDarwin schermvullend start.</li>
    <li><b>Kleurdiepte:</b> In de schermvullende modus kan X11 een andere kleurdiepte gebruiken dan Aqua (en de Mac OS X desktop).  Als u "Huidig" kiest, neemt XDarwin bij het starten de kleurdiepte over van Aqua.  U kunt ook kiezen voor 8, 15 of 24 bits.</li>
</ul>

<h2><a NAME="license">Licentie</a></h2>
The XFree86 Project is committed to providing freely redistributable binary and source releases. The main license we use is one based on the traditional MIT X11 / X Consortium License, which does not impose any conditions on modification or redistribution of source code or binaries other than requiring that copyright/license notices are left intact. For more information and additional copyright/licensing notices covering some sections of the code, please see the <A HREF="http://www.xfree86.org/legal/licence.html">XFree86
License page</A>.
<H3><A NAME="3"></A>X Consortium License</H3>
<p>Copyright (C) 1996 X Consortium</p>
<p>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:</p>
<p>The above copyright notice and this permission notice shall be included
in all copies or substantial portions of the Software.</p>
<p>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 X CONSORTIUM 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.</p>
<p>Except as contained in this notice, the name of the X Consortium 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 X Consortium.</p>
<p>X Window System is a trademark of X Consortium, Inc.</p>
</body>
</html>

\ No newline at end of file
+<!-- $XFree86: xc/programs/Xserver/hw/darwin/bundle/English.lproj/XDarwinHelp.html.cpp,v 1.2 2001/11/04 07:02:28 torrey Exp $ -->
+
+<html>
+<head>
+<title>XDarwin Help</title>
+</head>
+<body>
+<center>
+    <h1>XDarwin X Server for Mac OS X</h1>
+    X_VENDOR_NAME X_VERSION<br>
+    Release Date: X_REL_DATE
+</center>
+<h2>Inhoud</h2>
+<ol>
+    <li><A HREF="#notice">Belangrijke Informatie</A></li>
+    <li><A HREF="#usage">Gebruik</A></li>
+    <li><A HREF="#path">Instellen van het Path</A></li>
+    <li><A HREF="#prefs">Voorkeursinstellingen</A></li>
+    <li><A HREF="#license">Licentie</A></li>
+</ol>
+<center>
+    <h2><a NAME="notice">Belangrijke Informatie</a></h2>
+</center>
+<blockquote>
+#if X_PRE_RELEASE
+Dit is een pre-release van XDarwin, waarvoor geen ondersteuning beschikbaar is.  Rapporteren van bugs en aanleveren van patches kan op de <A HREF="http://sourceforge.net/projects/xonx/">XonX project pagina</A> bij SourceForge.  Kijk alvorens een bug te rapporteren in een pre-release eerst of een nieuwe versie beschikbaar is bij <A HREF="http://sourceforge.net/projects/xonx/">XonX</A> of de X_VENDOR_LINK.
+#else
+Als de server ouder is dan 6-12 maanden, of als uw hardware nieuwer is dan de bovenstaande datum, kijk dan of een nieuwe versie beschikbaar is voor u een probleem aanmeldt.  Rapporteren van bugs en aanleveren van patches kan op de <A HREF="http://sourceforge.net/projects/xonx/">XonX project pagina</A> bij SourceForge.
+#endif
+</blockquote>
+<blockquote>
+Deze software is beschikbaar gesteld onder de voorwaarden van de <A HREF="#license">MIT X11 / X Consortium Licentie</A> en is beschikbaar 'AS IS',zonder enige garantie. Lees s.v.p. de <A HREF="#license">Licentie</A> voor gebruik.</blockquote>
+
+<h2><a NAME="usage">Gebruik</a></h2>
+<p>XDarwin is een open-source X server van het <a HREF="http://www.x.org/">X Window Systeem</a>. This version of XDarwin was produced by the X_VENDOR_LINK.  XDarwin werkt op Mac OS X in schermvullende of rootless modus.</p>
+<p>Het X window systeem in schermvullende modus neemt het hele beeldscherm in beslag. U schakelt terug naar de Mac OS X desktop door de toesten Command-Option-A in te drukken. Deze toetsencombinatie kunt u veranderen in de Voorkeuren. Op de Mac OS X desktop klikt u op de XDarwin icoon in de Dock om weer naar het X window systeem te schakelen.  (In de Voorkeuren kunt er voor kiezen om een apart XDarwin schakelpaneel te gebruiken op de Mac OS X desktop.)</p>
+<p>In rootless modus verschijnen het X window systeem en Aqua (de Mac OS X desktop) tegelijk op het scherm. Het achtergrondscherm van X11, waarbinnen alle X11 vensters vallen, is net zo groot als het gehele scherm, maar het achtergrondscherm zelf is onzichtbaar.</p>
+
+<h3>Meerknopsmuis emulatie</h3>
+<p>Voor veel X11 programma's hebt u een 3-knops muis nodig.  Met een 1-knops muis kunt u een 3-knops muis nabootsen door een toets in te drukken terwijl u klikt met de muis.  Het instellen hiervan kan bij Voorkeuren, "Meerknopsmuis emulatie" in "Algemeen".  Emulatie is standaard ingeschakeld: ingedrukt houden van de "command" toets terwijl u klikt emuleert knop 2, ingedrukt houden van "option" emuleert knop 3.  Deze toetsen kunt u dus wijzigen in de Voorkeuren.  Let op: als u xmodmap gebruikt om de indeling van het toetsenbord te wijzigen, moet u toch de oorspronkelijke toetsen op het toetsenbord gebruiken voor deze functie.</p>
+
+<h2><a NAME="path">Instellen van het Path</a></h2>
+<p>Het path is de lijst van directories waarin gezocht wordt naar commando's.  De X11 commando's staan in de directory <code>/usr/X11R6/bin</code>, die dus aan uw path moet worden toegevoegd.  XDarwin doet dit automatisch voor u en kan extra directories toevoegen waarin u commando's hebt ge&iuml;nstalleerd.</p>
+
+<p>Ervaren gebruikers zullen het path al correct hebben ingesteld in de configuratiebestanden voor hun shell.  In dat geval kunt u XDarwin via de Voorkeuren vertellen het path niet te wijzigen.  XDarwin start de eerste X11 clients binnen de standaard login shell van de gebruiker (bij de Voorkeuren kunt u een afwijkende shell opgeven).  Het instellen van het path is afhankelijk van de shell.  Zie hiervoor de man pages voor de shell.</p>
+
+<p>Het kan handig zijn de manualpages voor X11 toe te voegen aan de lijst waarin gezocht wordt als u documentatie opvraagt.  De manualpages voor X11 staan in <code>/usr/X11R6/man</code> en de <code>MANPATH</code> environment variable bevat de lijst van directories waarin naar documentatie wordt gezocht.</p>
+
+<h2><a NAME="prefs">Voorkeursinstellingen</a></h2>
+<p>Een aantal instellingen kan worden gewijzigd door "Voorkeuren..." te kiezen in het "XDarwin" menu.  Wijzigingen van de instellingen genoemd onder "Start" gaan pas in als u XDarwin opnieuw hebt gestart.  Een wijziging van de overige instellingen is direct effectief.  Hier onder vindt u de verschillende mogelijkheden beschreven:</p>
+
+<h3>Algemeen</h3>
+<ul>
+    <li><b>Gebruik systeempiep voor X11:</b> Als u dit inschakelt wordt het Mac OS X  waarschuwingssignaal ook gebruikt door X11, anders gebruikt X11 een simpele pieptoon (dit is de standaardinstelling).</li>
+    <li><b>Wijzigen muis-versnelling door X11 mogelijk:</b> In een standaard X window systeem kan de window manager de muis-versnelling aanpassen.  Dit kan verwarrend zijn omdat de snelheid onder X11 dan verschillend kan zijn van de snelheid die u in Mac OS X bij Systeemvoorkeuren hebt ingesteld.  Om verwarring te voorkomen is de standaardinstelling dat X11 de versnelling niet kan wijzigen.</li>
+    <li><b>Meerknopsmuis emulatie:</b> Dit is hierboven beschreven bij <a HREF="#usage">Gebruik</a>.  Als emulatie is ingeschakeld moet u de gekozen toetsen ingedrukt houden terwijl u met de muis klikt om de tweede en derde muisknop na te bootsen.</li>
+</ul>
+
+<h3>Start</h3>
+<ul>
+    <li><b>Standaard modus:</b> Hier kiest u de standaard scherm-modus: schermvullend of rootless (hierboven beschreven bij <a HREF="#usage">Gebruik</a>).  U kunt ook kiezen tijdens het starten van XDarwin, zie de optie hieronder.</li>
+    <li><b>Kies scherm-modus tijdens start:</b> Dit is standaard ingeschakeld zodat u tijdens het starten van XDarwin kunt kiezen tussen schermvullend en rootless scherm-modus.  Als u dit uitschakelt start XDarwin in de standaard modus zonder u iets te vragen.</li>
+    <li><b>X11 scherm nummer:</b> Met X11 kunnen meerdere schermen worden aangestuurd door verschillende X servers op dezelfde computer.  Als u meerdere X servers tegelijk wilt gebruiken stelt u hier het scherm nummer in dat door XDarwin wordt gebruikt.</li>
+    <li><b>Xinerama multi-monitor ondersteuning mogelijk:</b> XDarwin ondersteunt het gebruik van meerdere monitoren met Xinerama, waarbij elke monitor wordt gezien als deel van &eacute;&eacute;n groot rechthoekig scherm.  U kunt Xinerama hier uitschakelen, maar XDarwin werkt op dit moment zonder Xinerama niet goed met meerdere monitoren.  Als u maar 1 monitor gebruikt is deze instelling automatisch uitgeschakeld.</li>
+    <li><b>Toetsenbordindeling-bestand:</b> Een toetsenbordindeling-bestand wordt bij het starten geladen en omgezet naar een X11 toetsenbordindeling.  Voor verschillende talen vindt u toetsenbordindelingen in de directory <code>/System/Library/Keyboards</code>.</li>
+    <li><b>Bij starten eerste X11 clients:</b> Als XDarwin start, wordt  <code>xinit</code> uitgevoerd om de X window manager en andere X clients te starten (zie "<code>man xinit</code>").  Voordat XDarwin <code>xinit</code> uitvoert voegt het de opgegeven directories toe aan het path.  Standaard wordt alleen <code>/usr/X11R6/bin</code> toegevoegd.  U kunt meerdere directories opgeven, gescheiden door een dubbelepunt.  X clients worden gestart met de standaard login shell van de gebruiker met gebruik van de configuratiebestanden voor die shell.  U kunt een afwijkende shell opgeven.</li>
+</ul>
+
+<h3>Schermvullend</h3>
+<ul>
+    <li><b>Toetscombinatie knop:</b> Klik op deze knop om de toetscombinatie te wijzigen waarmee u tussen de Mac OS X desktop en X11 schakelt.  Als toetscombinatie kunt u elke combinatie gebruiken van de shift, control, command en option toetsen samen met &eacute;&eacute;n normale toets.</li>
+    <li><b>Klikken op icoon in Dock schakelt naar X11:</b> Hiermee is een klik op de XDarwin icoon in de Dock voldoende om naar X11 te schakelen.  In sommige versies van Mac OS X verdwijnt soms de cursor als u deze mogelijkheid gebruikt en daarna terugkeert naar de Mac OS X desktop.</li>
+    <li><b>Toon help bij schermvullend starten:</b> Hiermee wordt een inleidend scherm getoond als XDarwin schermvullend start.</li>
+    <li><b>Kleurdiepte:</b> In de schermvullende modus kan X11 een andere kleurdiepte gebruiken dan Aqua (en de Mac OS X desktop).  Als u "Huidig" kiest, neemt XDarwin bij het starten de kleurdiepte over van Aqua.  U kunt ook kiezen voor 8, 15 of 24 bits.</li>
+</ul>
+
+<h2><a NAME="license">Licentie</a></h2>
+The main license for XDarwin is one based on the traditional MIT X11 / X Consortium License, which does not impose any conditions on modification or redistribution of source code or binaries other than requiring that copyright/license notices are left intact. For more information and additional copyright/licensing notices covering some sections of the code, please refer to the source code.
+<H3><A NAME="3"></A>X Consortium License</H3>
+<p>Copyright (C) 1996 X Consortium</p>
+<p>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:</p>
+<p>The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.</p>
+<p>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 X CONSORTIUM 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.</p>
+<p>Except as contained in this notice, the name of the X Consortium 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 X Consortium.</p>
+<p>X Window System is a trademark of X Consortium, Inc.</p>
+</body>
+</html>
+
diff --git a/hw/darwin/bundle/English.lproj/Credits.rtf b/hw/darwin/bundle/English.lproj/Credits.rtf
index 2bf7a8eaf..34408e78c 100644
--- a/hw/darwin/bundle/English.lproj/Credits.rtf
+++ b/hw/darwin/bundle/English.lproj/Credits.rtf
@@ -5,10 +5,20 @@
 \vieww5160\viewh6300\viewkind0
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
 
-\f0\fs24 \cf0 This product  includes software developed by The XFree86 Project, Inc  (http://www.xfree86.org/) and its contributors. The following people contributed to Darwin/Mac OS X support.\
+\f0\fs24 \cf0 This product includes software developed by The XFree86 Project, Inc  (http://www.xfree86.org/) and its contributors. The following people contributed to Darwin/Mac OS X support.\
 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
 
+\f1\b \cf0 Contributors to Xorg Foundation Release:
+\f0\b0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
+\cf0 Kaleb KEITHLEY\
+     
+\f2\i Working left and right Ctrl, Alt (Option), Meta (Command) and Shift keys.
+\f0\i0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
+
+\f1\b \cf0 \
 \f1\b \cf0 Contributors to XFree86 4.4:
 \f0\b0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
diff --git a/hw/darwin/bundle/English.lproj/InfoPlist.strings.cpp b/hw/darwin/bundle/English.lproj/InfoPlist.strings.cpp
index 99211244e..aeb210342 100644
--- a/hw/darwin/bundle/English.lproj/InfoPlist.strings.cpp
+++ b/hw/darwin/bundle/English.lproj/InfoPlist.strings.cpp
@@ -1,5 +1,5 @@
 /* English versions of the Info.plist keys; used by most localizations. */
 /* Most of these are set in the target application settings. */
-/* $XFree86: xc/programs/Xserver/hw/darwin/bundle/English.lproj/InfoPlist.strings.cpp,v 1.4 2003/01/15 02:34:04 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/bundle/English.lproj/InfoPlist.strings.cpp,v 1.3 2002/07/17 01:24:55 torrey Exp $ */
 
-NSHumanReadableCopyright = __quote__XFree86 XF86_VERSION\nCopyright 2003 XFree86 Project, Inc.__quote__;
+NSHumanReadableCopyright = __quote__ X_VENDOR_NAME X_VERSION __quote__;
diff --git a/hw/darwin/bundle/English.lproj/Localizable.strings b/hw/darwin/bundle/English.lproj/Localizable.strings
index 241d1585b..2c25c1dc3 100644
--- a/hw/darwin/bundle/English.lproj/Localizable.strings
+++ b/hw/darwin/bundle/English.lproj/Localizable.strings
@@ -1,5 +1,5 @@
 /* English localized versions of strings used by the Mac OS X front end. */
-/* $XFree86: xc/programs/Xserver/hw/darwin/bundle/English.lproj/Localizable.strings,v 1.4 2003/11/04 22:48:14 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/bundle/English.lproj/Localizable.strings,v 1.3 2002/01/30 06:50:46 torrey Exp $ */
 
 /* Title of alert panel */
 "Quit X server?" = "Quit X server?";
diff --git a/hw/darwin/bundle/English.lproj/MainMenu.nib/objects.nib b/hw/darwin/bundle/English.lproj/MainMenu.nib/objects.nib
index c480ad63f..ebbfd8317 100644
--- a/hw/darwin/bundle/English.lproj/MainMenu.nib/objects.nib
+++ b/hw/darwin/bundle/English.lproj/MainMenu.nib/objects.nib
diff --git a/hw/darwin/bundle/English.lproj/XDarwinHelp.html.cpp b/hw/darwin/bundle/English.lproj/XDarwinHelp.html.cpp
index fc11e26d3..5996285ae 100644
--- a/hw/darwin/bundle/English.lproj/XDarwinHelp.html.cpp
+++ b/hw/darwin/bundle/English.lproj/XDarwinHelp.html.cpp
@@ -1,19 +1,14 @@
-<!-- $XFree86: xc/programs/Xserver/hw/darwin/bundle/English.lproj/XDarwinHelp.html.cpp,v 1.2 2001/11/04 07:02:28 torrey Exp $ -->
-
-#include "xf86Version.h"
-#ifndef PRE_RELEASE
-#define PRE_RELEASE XF86_VERSION_SNAP
-#endif
+<!-- $XFree86: xc/programs/Xserver/hw/darwin/bundle/English.lproj/XDarwinHelp.html.cpp,v 1.1 2001/05/21 01:42:17 torrey Exp $ -->
 
 <html>
 <head>
-<title>XFree86 for Mac OS X</title>
+<title>XDarwin Help</title>
 </head>
 <body>
 <center>
-    <h1>XFree86 on Darwin and Mac OS X</h1>
-    XFree86 XF86_VERSION<br>
-    Release Date: XF86_REL_DATE
+    <h1>XDarwin X Server for Mac OS X</h1>
+    X_VENDOR_NAME X_VERSION<br>
+    Release Date: X_REL_DATE
 </center>
 <h2>Contents</h2>
 <ol>
@@ -27,8 +22,8 @@
     <h2><a NAME="notice">Important Notice</a></h2>
 </center>
 <blockquote>
-#if PRE_RELEASE
-This is a pre-release version of XFree86, and is not supported in any way. Bugs may be reported and patches may be submitted to the <A HREF="http://sourceforge.net/projects/xonx/">XonX project page</A> at SourceForge.  Before reporting bugs in pre-release versions, please check the latest version from <A HREF="http://sourceforge.net/projects/xonx/">XonX</A> or in the <A HREF="http://www.XFree86.Org/cvs">XFree86 CVS repository</A>.
+#if X_PRE_RELEASE
+This is a pre-release version of XDarwin, and is not supported in any way. Bugs may be reported and patches may be submitted to the <A HREF="http://sourceforge.net/projects/xonx/">XonX project page</A> at SourceForge.  Before reporting bugs in pre-release versions, please check the latest version from <A HREF="http://sourceforge.net/projects/xonx/">XonX</A> or the X_VENDOR_LINK.
 #else
 If the server is older than 6-12 months, or if your hardware is newer than the above date, look for a newer version before reporting problems. Bugs may be reported and patches may be submitted to the <A HREF="http://sourceforge.net/projects/xonx/">XonX project page</A> at SourceForge.
 #endif
@@ -37,8 +32,7 @@ If the server is older than 6-12 months, or if your hardware is newer than the a
 This software is distributed under the terms of the <A HREF="#license">MIT X11 / X Consortium License</A> and is provided AS IS, with no warranty. Please read the <A HREF="#license">License</A> before using.</blockquote>
 
 <h2><a NAME="usage">Usage</a></h2>
-<p>XFree86 is a freely redistributable open-source implementation of the <a HREF
-="http://www.x.org/">X Window System</a> produced by the <a HREF="http://www.XFree86.Org/">XFree86 Project, Inc.</a> The X window server for Darwin and Mac OS X provided by XFree86 is called XDarwin. XDarwin runs on Mac OS X in full screen or rootless modes.</p>
+<p>XDarwin is a freely redistributable open-source X server for the <a HREF="http://www.x.org/">X Window System</a>. This version of XDarwin was produced by the X_VENDOR_LINK. XDarwin runs on Mac OS X in full screen or rootless modes.</p>
 <p>In full screen mode, when the X window system is active, it takes over the entire screen. You can switch back to the Mac OS X desktop by holding down Command-Option-A. This key combination can be changed in the user preferences. From the Mac OS X desktop, click on the XDarwin icon in the Dock to switch back to the X window system.  (You can change this behavior in the user preferences so that you must click the XDarwin icon in the floating switch window instead.)</p>
 <p>In rootless mode, the X window system and Aqua share your display. The root window of the X11 display is the size of the screen and contains all the other windows. The X11 root window is not displayed in rootless mode as Aqua handles the desktop background.</p>
 <h3>Multi-Button Mouse Emulation</h3>
@@ -47,7 +41,7 @@ This software is distributed under the terms of the <A HREF="#license">MIT X11 /
 <h2><a NAME="path">Setting Your Path</a></h2>
 <p>Your path is the list of directories to be searched for executable commands. The X11 commands are located in <code>/usr/X11R6/bin</code>, which needs to be added to your path. XDarwin does this for you by default and can also add additional directories where you have installed command line applications.</p>
 <p>More experienced users will have already set their path correctly using the initialization files for their shell. In this case, you can inform XDarwin not to modify your path in the preferences. XDarwin launches the initial X11 clients in the user's default login shell. (An alternate shell can also be specified in the preferences.) The way to set the path depends on the shell you are using. This is described in the man page documentation for the shell.</p>
-<p>In addition you may also want to add the man pages from XFree86 to the list of pages to be searched when you are looking for documentation. The X11 man pages are located in <code>/usr/X11R6/man</code> and the <code>MANPATH</code> environment variable contains the list of directories to search.</p>
+<p>In addition you may also want to add the X11 man pages to the list of pages to be searched when you are looking for documentation. The X11 man pages are located in <code>/usr/X11R6/man</code> and the <code>MANPATH</code> environment variable contains the list of directories to search.</p>
 
 <h2><a NAME="prefs">User Preferences</a></h2>
 <p>A number of options may be set from the user preferences, accessible from the "Preferences..." menu item in the "XDarwin" menu. The options listed as start up options will not take effect until you have restarted XDarwin. All other options take effect immediately. The various options are described below:</p>
@@ -75,8 +69,7 @@ This software is distributed under the terms of the <A HREF="#license">MIT X11 /
 </ul>
 
 <h2><a NAME="license">License</a></h2>
-The XFree86 Project is committed to providing freely redistributable binary and source releases. The main license we use is one based on the traditional MIT X11 / X Consortium License, which does not impose any conditions on modification or redistribution of source code or binaries other than requiring that copyright/license notices are left intact. For more information and additional copyright/licensing notices covering some sections of the code, please see the <A HREF="http://www.xfree86.org/legal/licence.html">XFree86
-License page</A>.
+The main license for XDarwin is based on the traditional MIT X11 / X Consortium License, which does not impose any conditions on modification or redistribution of source code or binaries other than requiring that copyright/license notices are left intact. For more information and additional copyright/licensing notices covering some sections of the code, please refer to the source code.
 <H3><A NAME="3"></A>X Consortium License</H3>
 <p>Copyright (C) 1996 X Consortium</p>
 <p>Permission is hereby granted, free of charge, to any person obtaining a 
diff --git a/hw/darwin/bundle/French.lproj/Credits.rtf b/hw/darwin/bundle/French.lproj/Credits.rtf
index 82f12ac44..17e0a0d70 100644
--- a/hw/darwin/bundle/French.lproj/Credits.rtf
+++ b/hw/darwin/bundle/French.lproj/Credits.rtf
@@ -5,10 +5,20 @@
 \vieww5160\viewh4480\viewkind0
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
 
-\f0\fs24 \cf0 This product  includes software developed by The XFree86 Project, Inc  (http://www.xfree86.org/) and its contributors. The following people contributed to Darwin/Mac OS X support.\
+\f0\fs24 \cf0 This product includes software developed by The XFree86 Project, Inc  (http://www.xfree86.org/) and its contributors. The following people contributed to Darwin/Mac OS X support.\
 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
 
+\f1\b \cf0 Contributors to Xorg Foundation Release:
+\f0\b0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
+\cf0 Kaleb KEITHLEY\
+     
+\f2\i Working left and right Ctrl, Alt (Option), Meta (Command) and Shift keys.
+\f0\i0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
+
+\f1\b \cf0 \
 \f1\b \cf0 Contributors to XFree86 4.4:
 \f0\b0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
diff --git a/hw/darwin/bundle/French.lproj/MainMenu.nib/objects.nib b/hw/darwin/bundle/French.lproj/MainMenu.nib/objects.nib
index cc6620bcb..109d5cc6f 100644
--- a/hw/darwin/bundle/French.lproj/MainMenu.nib/objects.nib
+++ b/hw/darwin/bundle/French.lproj/MainMenu.nib/objects.nib
diff --git a/hw/darwin/bundle/French.lproj/XDarwinHelp.html.cpp b/hw/darwin/bundle/French.lproj/XDarwinHelp.html.cpp
index 0fdfb01fb..2a14793db 100644
--- a/hw/darwin/bundle/French.lproj/XDarwinHelp.html.cpp
+++ b/hw/darwin/bundle/French.lproj/XDarwinHelp.html.cpp
@@ -1,19 +1,14 @@
-<!-- $XFree86: xc/programs/Xserver/hw/darwin/bundle/French.lproj/XDarwinHelp.html.cpp,v 1.2 2001/12/20 06:42:20 torrey Exp $ -->
-
-#include "xf86Version.h"
-#ifndef PRE_RELEASE
-#define PRE_RELEASE XF86_VERSION_SNAP
-#endif
+<!-- $XFree86: xc/programs/Xserver/hw/darwin/bundle/English.lproj/XDarwinHelp.html.cpp,v 1.2 2001/11/04 07:02:28 torrey Exp $ -->
 
 <html>
 <head><META HTTP-EQUIV="content-type" CONTENT="text/html; charset=iso-8859-1">
-<title>XFree86 pour Mac OS X</title>
+<title>XDarwin Help</title>
 </head>
 <body>
 <center>
-    <h1>XFree86 pour Darwin et Mac OS X</h1>
-    XFree86 XF86_VERSION<br>
-    Date : XF86_REL_DATE
+    <h1>XDarwin X Server pour Mac OS X</h1>
+    X_VENDOR_NAME X_VERSION<br>
+    Date : X_REL_DATE
 </center>
 <h2>Sommaire</h2>
 <ol>
@@ -28,8 +23,8 @@
 </center>
 <blockquote>
 #if PRE_RELEASE
-Ceci est une pré-version de XFree86 et ne fait par conséquent l'objet d'aucun support client. Les bogues peuvent être signalés et des patches peuvent être soumis sur la 
-<A HREF="http://sourceforge.net/projects/xonx/">page du projet XonX</A> chez SourceForge. Veuillez prendre connaissance de la dernière version sur <A HREF="http://sourceforge.net/projects/xonx/">XonX</A> ou sur le <A HREF="http://www.XFree86.Org/cvs">répertoire CVS de XFree86</A> avant de signaler un bogue d'une pré-version.
+Ceci est une pré-version de XDarwin et ne fait par conséquent l'objet d'aucun support client. Les bogues peuvent être signalés et des patches peuvent être soumis sur la 
+<A HREF="http://sourceforge.net/projects/xonx/">page du projet XonX</A> chez SourceForge. Veuillez prendre connaissance de la dernière version sur <A HREF="http://sourceforge.net/projects/xonx/">XonX</A> ou le X_VENDOR_LINK avant de signaler un bogue d'une pré-version.
 #else
 Si le serveur date de plus de 6-12 mois ou si votre matériel est plus récent que la date indiquée ci-dessus, veuillez vous procurer une version plus récente avant de signaler toute anomalie. Les bogues peuvent être signalés et des patches peuvent être soumis sur la <A HREF="http://sourceforge.net/projects/xonx/">page du projet XonX</A> chez SourceForge.
 #endif
@@ -39,8 +34,8 @@ Ce logiciel est distribué sous la
 <A HREF="#license">Licence du Consortium X/X11 du MIT</A> et est fourni TEL QUEL, sans garanties. Veuillez prendre connaissance de la <A HREF="#license">Licence</A> avant toute utilisation.</blockquote>
 
 <h2><a NAME="usage">Utilisation</a></h2>
-<p>XFree86 est une implémentation libre et distribuable sans contrainte du <a HREF
-="http://www.x.org/">X Window System</a> produit par <a HREF="http://www.XFree86.Org/">XFree86 Project, Inc.</a> Le serveur X window pour Darwin et Mac OS X fourni par XFree86 se nomme XDarwin. XDarwin fonctionne sous Mac OS X en mode « rootless » ou plein écran.</p>
+<p>XDarwin est une X server libre et distribuable sans contrainte du <a HREF
+="http://www.x.org/">X Window System</a>. This version of XDarwin was produced by the X_VENDOR_LINK. XDarwin fonctionne sous Mac OS X en mode « rootless » ou plein écran.</p>
 <p>Lorsque le système X window est actif en mode plein écran, il prend en charge la totalité de l'écran. Il est possible de revenir sur le bureau de Mac OS X en appuyant sur Commande-Option-A. Cette combinaison de touches peut être modifiée dans les préférences. Pour revenir dans X window, cliquer sur l'icône de XDarwin dans le Dock de Mac OS X.  (Un réglage des préférences permet d'effectuer cette opération en cliquant dans une fenêtre flottante au lieu de l'icône du Dock)</p>
 <p>En mode « rootless », X window system et Aqua utilisent le même affichage. La fenêtre-mère de l'affichage X11 est de la taille de l'écran et contient toutes les autre fenêtres. En mode « rootless » cette fenêtre-mère n'est pas affichée car Aqua gère le fond d'écran.</p>
 <h3>Émulation de souris à plusieurs boutons</h3>
@@ -49,7 +44,7 @@ Ce logiciel est distribué sous la
 <h2><a NAME="path">Réglage du chemin d'accès</a></h2>
 <p>Le chemin d'accès est une liste de répertoires utilisés pour la recherche d'exécutables. Les commandes X11 sont situées dans <code>/usr/X11R6/bin</code>, qui doit être ajouté à votre chemin d'accès. XDarwin fait cela par défaut, et peut également ajouter d'autres répertoires dans lesquels vous auriez installé d'autre commandes unix.</p>
 <p>Les utilisateurs plus expérimentés auront déjà réglé leur chemin d'accès correctement par le biais des fichiers d'initialisation de leur shell. Dans ce cas, il est possible de demander à XDarwin de ne pas modifier le chemin d'accès initial. XDarwin lance les premiers clients X11 dans le shell d'ouverture de session par défaut. (Un shell de remplacement peut être spécifié dans les préférences.) La façon de régler le chemin d'accès dépend du shell utilisé. Ceci est documenté dans les pages "man" du shell.</p>
-<p>De plus, il est possible d'ajouter les pages "man" de XFree86 à la liste des pages recherchées pour la documentation "man". Les pages "man" X11 se trouvent dans <code>/usr/X11R6/man</code>  et la variable d'environnement <code>MANPATH</code> contient la liste des répertoires dans lesquels chercher.</p>
+<p>De plus, il est possible d'ajouter les pages "man" de X11 à la liste des pages recherchées pour la documentation "man". Les pages "man" X11 se trouvent dans <code>/usr/X11R6/man</code>  et la variable d'environnement <code>MANPATH</code> contient la liste des répertoires dans lesquels chercher.</p>
 
 
 <h2><a NAME="prefs">Préférences</a></h2>
@@ -78,8 +73,7 @@ Ce logiciel est distribué sous la
 </ul>
 
 <h2><a NAME="license">Licence</a></h2>
-The XFree86 Project is committed to providing freely redistributable binary and source releases. The main license we use is one based on the traditional MIT X11 / X Consortium License, which does not impose any conditions on modification or redistribution of source code or binaries other than requiring that copyright/license notices are left intact. For more information and additional copyright/licensing notices covering some sections of the code, please see the <A HREF="http://www.xfree86.org/legal/licence.html">XFree86
-License page</A>.
+The main license for XDarwin is one based on the traditional MIT X11 / X Consortium License, which does not impose any conditions on modification or redistribution of source code or binaries other than requiring that copyright/license notices are left intact. For more information and additional copyright/licensing notices covering some sections of the code, please refer to the source code.
 <H3><A NAME="3"></A>X Consortium License</H3>
 <p>Copyright (C) 1996 X Consortium</p>
 <p>Permission is hereby granted, free of charge, to any person obtaining a 
diff --git a/hw/darwin/bundle/German.lproj/Credits.rtf b/hw/darwin/bundle/German.lproj/Credits.rtf
index 2bf7a8eaf..34408e78c 100644
--- a/hw/darwin/bundle/German.lproj/Credits.rtf
+++ b/hw/darwin/bundle/German.lproj/Credits.rtf
@@ -5,10 +5,20 @@
 \vieww5160\viewh6300\viewkind0
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
 
-\f0\fs24 \cf0 This product  includes software developed by The XFree86 Project, Inc  (http://www.xfree86.org/) and its contributors. The following people contributed to Darwin/Mac OS X support.\
+\f0\fs24 \cf0 This product includes software developed by The XFree86 Project, Inc  (http://www.xfree86.org/) and its contributors. The following people contributed to Darwin/Mac OS X support.\
 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
 
+\f1\b \cf0 Contributors to Xorg Foundation Release:
+\f0\b0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
+\cf0 Kaleb KEITHLEY\
+     
+\f2\i Working left and right Ctrl, Alt (Option), Meta (Command) and Shift keys.
+\f0\i0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
+
+\f1\b \cf0 \
 \f1\b \cf0 Contributors to XFree86 4.4:
 \f0\b0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
diff --git a/hw/darwin/bundle/German.lproj/MainMenu.nib/objects.nib b/hw/darwin/bundle/German.lproj/MainMenu.nib/objects.nib
index 7855fa3df..28fff8920 100644
--- a/hw/darwin/bundle/German.lproj/MainMenu.nib/objects.nib
+++ b/hw/darwin/bundle/German.lproj/MainMenu.nib/objects.nib
diff --git a/hw/darwin/bundle/German.lproj/XDarwinHelp.html.cpp b/hw/darwin/bundle/German.lproj/XDarwinHelp.html.cpp
index 6b1b91f5c..5996285ae 100644
--- a/hw/darwin/bundle/German.lproj/XDarwinHelp.html.cpp
+++ b/hw/darwin/bundle/German.lproj/XDarwinHelp.html.cpp
@@ -1,19 +1,14 @@
-<!-- $XFree86: xc/programs/Xserver/hw/darwin/bundle/German.lproj/XDarwinHelp.html.cpp,v 1.1 2001/11/03 00:25:34 torrey Exp $ -->
-
-#include "xf86Version.h"
-#ifndef PRE_RELEASE
-#define PRE_RELEASE XF86_VERSION_SNAP
-#endif
+<!-- $XFree86: xc/programs/Xserver/hw/darwin/bundle/English.lproj/XDarwinHelp.html.cpp,v 1.1 2001/05/21 01:42:17 torrey Exp $ -->
 
 <html>
 <head>
-<title>XFree86 for Mac OS X</title>
+<title>XDarwin Help</title>
 </head>
 <body>
 <center>
-    <h1>XFree86 on Darwin and Mac OS X</h1>
-    XFree86 XF86_VERSION<br>
-    Release Date: XF86_REL_DATE
+    <h1>XDarwin X Server for Mac OS X</h1>
+    X_VENDOR_NAME X_VERSION<br>
+    Release Date: X_REL_DATE
 </center>
 <h2>Contents</h2>
 <ol>
@@ -27,43 +22,54 @@
     <h2><a NAME="notice">Important Notice</a></h2>
 </center>
 <blockquote>
-#if PRE_RELEASE
-This is a pre-release version of XFree86, and is not supported in any way. Bugs may be reported and patches may be submitted to the <A HREF="http://sourceforge.net/projects/xonx/">XonX project page</A> at SourceForge.  Before reporting bugs in pre-release versions, please check the latest version from <A HREF="http://sourceforge.net/projects/xonx/">XonX</A> or in the <A HREF="http://www.XFree86.Org/cvs">XFree86 CVS repository</A>.
+#if X_PRE_RELEASE
+This is a pre-release version of XDarwin, and is not supported in any way. Bugs may be reported and patches may be submitted to the <A HREF="http://sourceforge.net/projects/xonx/">XonX project page</A> at SourceForge.  Before reporting bugs in pre-release versions, please check the latest version from <A HREF="http://sourceforge.net/projects/xonx/">XonX</A> or the X_VENDOR_LINK.
 #else
 If the server is older than 6-12 months, or if your hardware is newer than the above date, look for a newer version before reporting problems. Bugs may be reported and patches may be submitted to the <A HREF="http://sourceforge.net/projects/xonx/">XonX project page</A> at SourceForge.
 #endif
 </blockquote>
 <blockquote>
 This software is distributed under the terms of the <A HREF="#license">MIT X11 / X Consortium License</A> and is provided AS IS, with no warranty. Please read the <A HREF="#license">License</A> before using.</blockquote>
+
 <h2><a NAME="usage">Usage</a></h2>
-<p>XFree86 is a freely redistributable open-source implementation of the <a HREF
-="http://www.x.org/">X Window System</a> produced by the <a HREF="http://www.XFree86.Org/">XFree86 Project, Inc.</a> XFree86 runs on Mac OS X in full screen mode. When the X window system is active, it takes over the entire screen. You can switch back to the Mac OS X desktop by holding down Command-Option-A. This key combination can be changed in the user preferences. From the Mac OS X desktop, just click on the XDarwin icon in the floating switch window to switch back to the X window system. You can change this behavior in the user preferences so that clicking on the XDarwin icon in the Dock switches as well.</p>
+<p>XDarwin is a freely redistributable open-source X server for the <a HREF="http://www.x.org/">X Window System</a>. This version of XDarwin was produced by the X_VENDOR_LINK. XDarwin runs on Mac OS X in full screen or rootless modes.</p>
+<p>In full screen mode, when the X window system is active, it takes over the entire screen. You can switch back to the Mac OS X desktop by holding down Command-Option-A. This key combination can be changed in the user preferences. From the Mac OS X desktop, click on the XDarwin icon in the Dock to switch back to the X window system.  (You can change this behavior in the user preferences so that you must click the XDarwin icon in the floating switch window instead.)</p>
+<p>In rootless mode, the X window system and Aqua share your display. The root window of the X11 display is the size of the screen and contains all the other windows. The X11 root window is not displayed in rootless mode as Aqua handles the desktop background.</p>
 <h3>Multi-Button Mouse Emulation</h3>
-<p>Many X11 applications rely on the use of a 3-button mouse. To emulate a 3-button mouse with a single button, select "Enable emulation of multiple mouse buttons" in the Preferences. When emulating a 3-button mouse, holding down the left command key and clicking the mouse button will simulate clicking the second mouse button. Holding down the left option key and clicking will simulate the third button.</p>
-<p>Notes:</p>
-<ul>
-    <li>With most keyboards the left and right command and option keys are not differentiated so either will work.
-    <li>Even with command and/or option keys mapped to some other key with xmodmap, you still must use the original command and option keys for multibutton mouse emulation.
-    <li>The only way to simulate holding down the left command key and clicking the second mouse button is to map some other key to be the left command key. The same is true for simulating holding down the left option key and clicking the third mouse button.
-</ul>
+<p>Many X11 applications rely on the use of a 3-button mouse. You can emulate a 3-button mouse with a single button by holding down various modifier keys while you click the mouse button. This is controlled by settings in the "Multi-Button Mouse Emulation" section of the "General" preferences. By default, emulation is on and holding down the command key and clicking the mouse button will simulate clicking the second mouse button. Holding down the option key and clicking will simulate the third button. You can change to any combination of modifiers to emulate buttons two and three in the preferences. Note, even if the modifiers keys are mapped to some other key with xmodmap, you still must use the actual keys specified in the preferences for multi-button mouse emulation.</p>
+
 <h2><a NAME="path">Setting Your Path</a></h2>
-<p>The X11 binaries are located in /usr/X11R6/bin, which you may need to add to your path. Your path is the list of directories to be searched for executable commands. The way to do this depends on the shell you are using. The following directions are for tcsh, which is the default shell on Darwin and Mac OS X.</p>
-<p>You can check your path by typing "printenv PATH". You should see /usr/X11R6/bin listed as one of the directories. If not, you should add it to your default path. To do so, you can add the following line to the file ~/Library/init/tcsh/path: (You may need to create this file and directory path if it does not exist already.)</p>
-<blockquote>setenv PATH "${PATH}:/usr/X11R6/bin"</blockquote>
-<p>Note that if you have created a .cshrc or .tcshrc file, these files will override your settings in ~/Library/init/tcsh/ and you will need to change one of these files instead. These changes will not take effect until you open a new Terminal window. You may also want to add the man pages from XFree86 to the list of pages to be searched when you are looking for documentation. The X11 man pages are located in /usr/X11R6/man and the MANPATH environment variable contains the list of directories to search.</p>
+<p>Your path is the list of directories to be searched for executable commands. The X11 commands are located in <code>/usr/X11R6/bin</code>, which needs to be added to your path. XDarwin does this for you by default and can also add additional directories where you have installed command line applications.</p>
+<p>More experienced users will have already set their path correctly using the initialization files for their shell. In this case, you can inform XDarwin not to modify your path in the preferences. XDarwin launches the initial X11 clients in the user's default login shell. (An alternate shell can also be specified in the preferences.) The way to set the path depends on the shell you are using. This is described in the man page documentation for the shell.</p>
+<p>In addition you may also want to add the X11 man pages to the list of pages to be searched when you are looking for documentation. The X11 man pages are located in <code>/usr/X11R6/man</code> and the <code>MANPATH</code> environment variable contains the list of directories to search.</p>
+
 <h2><a NAME="prefs">User Preferences</a></h2>
-<p>A number of options may be set from the user preferences, accessible from the "Preferences..." menu item in the "XDarwin" menu. The options listed under Startup Options will not take effect until you have restarted XDarwin. All other options take effect immediately. The various options are described below:</p>
+<p>A number of options may be set from the user preferences, accessible from the "Preferences..." menu item in the "XDarwin" menu. The options listed as start up options will not take effect until you have restarted XDarwin. All other options take effect immediately. The various options are described below:</p>
+<h3>General</h3>
+<ul>
+    <li><b>Use System beep for X11:</b> When enabled the standard Mac OS X alert sound is used as the X11 bell. When disabled (default) a simple tone is used.</li>
+    <li><b>Allow X11 to change mouse acceleration:</b> In a standard X window system implementation, the window manager can change the mouse acceleration. This can lead to confusion as the mouse acceleration may be set to different values by the Mac OS X System Preferences and the X window manager. By default, X11 is not allowed to change the mouse acceleration to avoid this problem.</li>
+    <li><b>Multi-Button Mouse Emulation:</b> This is described above under <a HREF="#usage">Usage</a>. When emulation is enabled the selected modifiers must be held down when the mouse button is pushed to emulate the second or third mouse buttons.</li>
+</ul>
+<h3>Start Up</h3>
 <ul>
-    <li>Key combination button: Click this button and then press any number of modifiers followed by a standard key to change the key combination to switch between Aqua and X11.</li>
-    <li>Use System beep for X11: When enabled the standard Mac OS X alert sound is used as X11 bell. When disabled (default) a simple tone is used.</li>
-    <li>Click on icon in Dock switches to X11: Enable this to activate switching to X11 by clicking on the XDarwin icon in the Dock. On some versions of Mac OS X, switching by clicking in the Dock can cause the cursor to disappear on returning to Aqua.</li>
-    <li>Show help on startup: This will show the introductory splash screen when XDarwin is launched.</li>
-    <li>Display number: This sets what X display number XDarwin should assign to the display. Note that XDarwin always takes over the main display when showing X11.</li>
-    <li>Keymapping: By default, XDarwin loads the keymapping from the Darwin kernel on startup. On portables, this keymapping is sometimes empty so that the keyboard will appear to be dead in X11. If "Load from file" is selected, XDarwin will load the keymapping from the specified file instead.</li>
+    <li><b>Default Mode:</b> If the user does not indicate whether to run in full screen or rootless mode, the mode specified here will be used.</li>
+    <li><b>Show mode pick panel on startup:</b> By default, a panel is displayed when XDarwin is started to allow the user to choose between full screen or rootless mode. If this option is turned off, the default mode will be started automatically.</li>
+    <li><b>X11 Display number:</b> X11 allows there to be multiple displays managed by separate X servers on a single computer. The user may specify an integer display number for XDarwin to use if more than one X server is going to be run simultaneously.</li>
+    <li><b>Allow Xinerama multiple monitor support:</b> XDarwin supports multiple monitors with Xinerama, which treats all monitors as being part of one large rectangular screen. You can disable Xinerama with this option, but currently XDarwin does not handle multiple monitors correctly without it. If you only have a single monitor, Xinerama is automatically disabled.</li>
+    <li><b>Keymapping File:</b> A keymapping file is read at startup and translated to an X11 keymap. Keymapping files, available for a wide variety of languages, are found in <code>/System/Library/Keyboards</code>.</li>
+    <li><b>Starting First X11 Clients:</b> When XDarwin is started from the Finder, it will run <code>xinit</code> to launch the X window manager and other X clients. (See "<code>man xinit</code>" for more information.) Before XDarwin runs <code>xinit</code> it will add the specified directories to the user's path. By default only <code>/usr/X11R6/bin</code> is added. Additional directories may added, separated by a colon. The X clients are started in the user's default login shell so that the user's shell initialization files are read. If desired, an alternate shell may be specified.</li>
 </ul>
+<h3>Full Screen</h3>
+<ul>
+    <li><b>Key combination button:</b> Click this button and then press any number of modifiers followed by a standard key to change the key combination to switch between Aqua and X11.</li>
+    <li><b>Click on icon in Dock switches to X11:</b> Enable this to activate switching to X11 by clicking on the XDarwin icon in the Dock. On some versions of Mac OS X, switching by clicking in the Dock can cause the cursor to disappear on returning to Aqua.</li>
+    <li><b>Show help on startup:</b> This will show an introductory splash screen when XDarwin is started in full screen mode.</li>
+    <li><b>Color bit depth:</b> In full screen mode, the X11 display can use a different color bit depth than is used by Aqua. If "Current" is specified, the depth used by Aqua when XDarwin starts will be used. Otherwise 8, 15, or 24 bits may be specified.</li>
+</ul>
+
 <h2><a NAME="license">License</a></h2>
-The XFree86 Project is committed to providing freely redistributable binary and source releases. The main license we use is one based on the traditional MIT X11 / X Consortium License, which doesn't impose any conditions on modification or redistribution of source code or binaries other than requiring that copyright/license notices are left intact. For more information and additional copyright/licensing notices covering some sections of the code, please see the <A HREF="http://www.xfree86.org/legal/licence.html">XFree86
-License page</A>.
+The main license for XDarwin is based on the traditional MIT X11 / X Consortium License, which does not impose any conditions on modification or redistribution of source code or binaries other than requiring that copyright/license notices are left intact. For more information and additional copyright/licensing notices covering some sections of the code, please refer to the source code.
 <H3><A NAME="3"></A>X Consortium License</H3>
 <p>Copyright (C) 1996 X Consortium</p>
 <p>Permission is hereby granted, free of charge, to any person obtaining a 
diff --git a/hw/darwin/bundle/Japanese.lproj/Credits.rtf b/hw/darwin/bundle/Japanese.lproj/Credits.rtf
index 8278a4063..cf9eae207 100644
--- a/hw/darwin/bundle/Japanese.lproj/Credits.rtf
+++ b/hw/darwin/bundle/Japanese.lproj/Credits.rtf
@@ -1,175 +1,193 @@
-{\rtf1\mac\ansicpg10000\cocoartf102
-{\fonttbl\f0\fswiss\fcharset77 Helvetica;\f1\fswiss\fcharset77 Helvetica-Bold;\f2\fswiss\fcharset77 Helvetica-Oblique;
-\f3\fnil\fcharset78 HiraKakuPro-W3;}
+{\rtf1\mac\ansicpg10001\cocoartf102
+{\fonttbl\f0\fnil\fcharset78 HiraKakuPro-W3;\f1\fswiss\fcharset77 Helvetica;\f2\fswiss\fcharset77 Helvetica-Bold;
+\f3\fswiss\fcharset77 Helvetica-Oblique;}
 {\colortbl;\red255\green255\blue255;}
 \vieww13980\viewh11160\viewkind0
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
 
-\f0\fs24 \cf0 This product  includes software developed by The XFree86 Project, Inc  (http://www.xfree86.org/) and its contributors. The following people contributed to Darwin/Mac OS X support.\
+\f0\fs24 \cf0 \'82\'b1\'82\'cc\'90\'bb\'95\'69\'82\'cd 
+\f1 XFree86 
+\f0 \'83\'76\'83\'8d\'83\'57\'83\'46\'83\'4e\'83\'67
+\f1 (http://www.xfree86.org/)
+\f0 \'82\'a8\'82\'e6\'82\'d1\'82\'bb\'82\'cc\'8d\'76\'8c\'a3\'8e\'d2\'82\'c9\'82\'e6\'82\'c1\'82\'c4\'8a\'4a\'94\'ad\'82\'b3\'82\'ea\'82\'bd\'83\'5c\'83\'74\'83\'67\'83\'45\'83\'46\'83\'41\'82\'f0\'8a\'dc\'82\'f1\'82\'c5\'82\'a2\'82\'dc\'82\'b7\'81\'42\'8e\'9f\'82\'cc\'90\'6c\'81\'58\'82\'cd Darwin
+\f1 /Mac OS X 
+\f0 \'82\'cc\'83\'54\'83\'7c\'81\'5b\'83\'67\'82\'c9\'8d\'76\'8c\'a3\'82\'b5\'82\'dc\'82\'b5\'82\'bd\'81\'42
+\f1 \
 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
 
-\f1\b \cf0 Contributors to XFree86 4.4:
-\f0\b0 \
+\f2\b \cf0 Contributors to Xorg Foundation Release:
+\f1\b0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
+\cf0 Kaleb KEITHLEY\
+     
+\f0 \'8d\'b6\'89\'45\'82\'cc Ctrl,Alt(Option),Meta(Command) \'82\'a8\'82\'e6\'82\'d1 Shift \'83\'4c\'81\'5b\'82\'cc\'93\'ae\'8d\'ec
+\f1 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
+
+\f2\b \cf0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
+\cf0 Contributors to XFree86 4.4:
+\f1\b0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 \cf0 John Harper
-\f2\i \
+\f3\i \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 
-\f3\i0 \cf0    \'83\'8b\'81\'5b\'83\'67\'83\'8c\'83\'58 \'83\'41\'83\'4e\'83\'5a\'83\'89\'83\'8c\'81\'5b\'83\'56\'83\'87\'83\'93 \'82\'a8\'82\'e6\'82\'d1 Apple-WM \'8a\'67\'92\'a3
-\f0 \
+\f0\i0 \cf0    \'83\'8b\'81\'5b\'83\'67\'83\'8c\'83\'58 \'83\'41\'83\'4e\'83\'5a\'83\'89\'83\'8c\'81\'5b\'83\'56\'83\'87\'83\'93 \'82\'a8\'82\'e6\'82\'d1 Apple-WM \'8a\'67\'92\'a3
+\f1 \
 Torrey T. Lyons\
      
-\f3 \'83\'76\'83\'8d\'83\'57\'83\'46\'83\'4e\'83\'67 \'83\'8a\'81\'5b\'83\'5f\'81\'5b\
+\f0 \'83\'76\'83\'8d\'83\'57\'83\'46\'83\'4e\'83\'67 \'83\'8a\'81\'5b\'83\'5f\'81\'5b\
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 
-\f1\b \cf0 \
+\f2\b \cf0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
 \cf0 Additional XonX Contributors to XFree86 4.3:
-\f0\b0 \
+\f1\b0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 \cf0 Fabr\'92cio Luis de Castro\
      
-\f3 \'83\'7c\'83\'8b\'83\'67\'83\'4b\'83\'8b\'8c\'ea\'83\'8d\'81\'5b\'83\'4a\'83\'89\'83\'43\'83\'59
-\f0 \
+\f0 \'83\'7c\'83\'8b\'83\'67\'83\'4b\'83\'8b\'8c\'ea\'83\'8d\'81\'5b\'83\'4a\'83\'89\'83\'43\'83\'59
+\f1 \
 Michael Oland\
      
-\f3 \'90\'56\'82\'b5\'82\'a2
-\f0 XDarwin 
-\f3 \'83\'41\'83\'43\'83\'52\'83\'93
-\f0 \
+\f0 \'90\'56\'82\'b5\'82\'a2 
+\f1 XDarwin 
+\f0 \'83\'41\'83\'43\'83\'52\'83\'93
+\f1 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 
-\f1\b \cf0 \
+\f2\b \cf0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
 \cf0 XonX Contributors to XFree86 4.2:
-\f0\b0 \
+\f1\b0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 \cf0 Rob Braun\
      Darwin x86
-\f2\i  
-\f3\i0 \'83\'54\'83\'7c\'81\'5b\'83\'67
-\f0 \
+\f3\i  
+\f0\i0 \'83\'54\'83\'7c\'81\'5b\'83\'67
+\f1 \
 Pablo Di Noto\
 
-\f2\i      
-\f3\i0 \'83\'58\'83\'79\'83\'43\'83\'93\'8c\'ea\'83\'8d\'81\'5b\'83\'4a\'83\'89\'83\'43\'83\'59
-\f0 \
+\f3\i      
+\f0\i0 \'83\'58\'83\'79\'83\'43\'83\'93\'8c\'ea\'83\'8d\'81\'5b\'83\'4a\'83\'89\'83\'43\'83\'59
+\f1 \
 Paul Edens\
 
-\f2\i      
-\f3\i0 \'83\'49\'83\'89\'83\'93\'83\'5f\'8c\'ea\'83\'8d\'81\'5b\'83\'4a\'83\'89\'83\'43\'83\'59
-\f0 \
+\f3\i      
+\f0\i0 \'83\'49\'83\'89\'83\'93\'83\'5f\'8c\'ea\'83\'8d\'81\'5b\'83\'4a\'83\'89\'83\'43\'83\'59
+\f1 \
 Kyunghwan Kim\
 
-\f2\i      
-\f3\i0 \'8a\'d8\'8d\'91\'8c\'ea\'83\'8d\'81\'5b\'83\'4a\'83\'89\'83\'43\'83\'59
-\f0 \
+\f3\i      
+\f0\i0 \'8a\'d8\'8d\'91\'8c\'ea\'83\'8d\'81\'5b\'83\'4a\'83\'89\'83\'43\'83\'59
+\f1 \
 Mario Klebsch\
      
-\f3 \'94\'f1US\'83\'4c\'81\'5b\'83\'7b\'81\'5b\'83\'68 \'83\'54\'83\'7c\'81\'5b\'83\'67
-\f0 \
+\f0 \'94\'f1US\'83\'4c\'81\'5b\'83\'7b\'81\'5b\'83\'68 \'83\'54\'83\'7c\'81\'5b\'83\'67
+\f1 \
 Torrey T. Lyons\
      
-\f3 \'83\'76\'83\'8d\'83\'57\'83\'46\'83\'4e\'83\'67 \'83\'8a\'81\'5b\'83\'5f\'81\'5b
-\f0 \
+\f0 \'83\'76\'83\'8d\'83\'57\'83\'46\'83\'4e\'83\'67 \'83\'8a\'81\'5b\'83\'5f\'81\'5b
+\f1 \
 Andreas Monitzer\
      
-\f3 \'83\'68\'83\'43\'83\'63\'8c\'ea\'83\'8d\'81\'5b\'83\'4a\'83\'89\'83\'43\'83\'59
-\f0 \
+\f0 \'83\'68\'83\'43\'83\'63\'8c\'ea\'83\'8d\'81\'5b\'83\'4a\'83\'89\'83\'43\'83\'59
+\f1 \
 Patrik Montgomery\
 
-\f2\i      
-\f3\i0 \'83\'58\'83\'45\'83\'46\'81\'5b\'83\'66\'83\'93\'8c\'ea\'83\'8d\'81\'5b\'83\'4a\'83\'89\'83\'43\'83\'59
-\f0 \
+\f3\i      
+\f0\i0 \'83\'58\'83\'45\'83\'46\'81\'5b\'83\'66\'83\'93\'8c\'ea\'83\'8d\'81\'5b\'83\'4a\'83\'89\'83\'43\'83\'59
+\f1 \
 Greg Parker\
      
-\f3 \'83\'8b\'81\'5b\'83\'67\'83\'8c\'83\'58 \'83\'54\'83\'7c\'81\'5b\'83\'67
-\f0 \
+\f0 \'83\'8b\'81\'5b\'83\'67\'83\'8c\'83\'58 \'83\'54\'83\'7c\'81\'5b\'83\'67
+\f1 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 
-\f3 \cf0 \'93\'63\'92\'86 \'8f\'72\'8c\'f5
-\f0 \
+\f0 \cf0 \'93\'63\'92\'86 \'8f\'72\'8c\'f5
+\f1 \
      
-\f3 \'93\'fa\'96\'7b\'8c\'ea\'83\'8d\'81\'5b\'83\'4a\'83\'89\'83\'43\'83\'59
-\f0 \
+\f0 \'93\'fa\'96\'7b\'8c\'ea\'83\'8d\'81\'5b\'83\'4a\'83\'89\'83\'43\'83\'59
+\f1 \
 Olivier Verdier\
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 
-\f2\i \cf0      
-\f3\i0 \'83\'74\'83\'89\'83\'93\'83\'58\'8c\'ea\'83\'8d\'81\'5b\'83\'4a\'83\'89\'83\'43\'83\'59
-\f0 \
+\f3\i \cf0      
+\f0\i0 \'83\'74\'83\'89\'83\'93\'83\'58\'8c\'ea\'83\'8d\'81\'5b\'83\'4a\'83\'89\'83\'43\'83\'59
+\f1 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 
-\f1\b \cf0 \
+\f2\b \cf0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
 \cf0 Special Thanks:
-\f0\b0 \
+\f1\b0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 \cf0 Devin Poolman and Zero G Software, Inc.\
 
-\f2\i      
-\f3\i0 \'83\'43\'83\'93\'83\'58\'83\'67\'81\'5b\'83\'89
-\f0 \
+\f3\i      
+\f0\i0 \'83\'43\'83\'93\'83\'58\'83\'67\'81\'5b\'83\'89
+\f1 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 
-\f1\b \cf0 \
+\f2\b \cf0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
 \cf0 XonX Team Members\
 Contributing to XFree86 4.1:
-\f0\b0 \
+\f1\b0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 \cf0 Rob Braun\
      Darwin x86 
-\f3 \'83\'54\'83\'7c\'81\'5b\'83\'67
-\f0 \
+\f0 \'83\'54\'83\'7c\'81\'5b\'83\'67
+\f1 \
 Torrey T. Lyons\
      
-\f3 \'83\'76\'83\'8d\'83\'57\'83\'46\'83\'4e\'83\'67 \'83\'8a\'81\'5b\'83\'5f\'81\'5b
-\f0 \
+\f0 \'83\'76\'83\'8d\'83\'57\'83\'46\'83\'4e\'83\'67 \'83\'8a\'81\'5b\'83\'5f\'81\'5b
+\f1 \
 Andreas Monitzer\
      Cocoa 
-\f3 \'94\'c5 XDarwin \'83\'74\'83\'8d\'83\'93\'83\'67\'83\'47\'83\'93\'83\'68
-\f0 \
+\f0 \'94\'c5 XDarwin \'83\'74\'83\'8d\'83\'93\'83\'67\'83\'47\'83\'93\'83\'68
+\f1 \
 Greg Parker\
      
-\f3 \'8d\'c5\'8f\'89\'82\'cc Quartz \'83\'43\'83\'93\'83\'76\'83\'8a\'83\'81\'83\'93\'83\'67
-\f0 \
+\f0 \'8d\'c5\'8f\'89\'82\'cc Quartz \'83\'43\'83\'93\'83\'76\'83\'8a\'83\'81\'83\'93\'83\'67
+\f1 \
 Christoph Pfisterer\
      
-\f3 \'8b\'a4\'97\'4c\'83\'89\'83\'43\'83\'75\'83\'89\'83\'8a
-\f0 \
+\f0 \'8b\'a4\'97\'4c\'83\'89\'83\'43\'83\'75\'83\'89\'83\'8a
+\f1 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 
-\f3 \cf0 \'93\'63\'92\'86 \'8f\'72\'8c\'f5
-\f0 \
+\f0 \cf0 \'93\'63\'92\'86 \'8f\'72\'8c\'f5
+\f1 \
      
-\f3 \'93\'fa\'96\'7b\'8c\'ea\'83\'8d\'81\'5b\'83\'4a\'83\'89\'83\'43\'83\'59
-\f0 \
+\f0 \'93\'fa\'96\'7b\'8c\'ea\'83\'8d\'81\'5b\'83\'4a\'83\'89\'83\'43\'83\'59
+\f1 \
 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
 
-\f1\b \cf0 Special Thanks:
-\f0\b0 \
+\f2\b \cf0 Special Thanks:
+\f1\b0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 \cf0 Tiago Ribeiro\
      XDarwin 
-\f3 \'83\'41\'83\'43\'83\'52\'83\'93
-\f0 \
+\f0 \'83\'41\'83\'43\'83\'52\'83\'93
+\f1 \
 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
 
-\f1\b \cf0 History:
-\f0\b0 \
+\f2\b \cf0 History:
+\f1\b0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 \cf0 John Carmack\
      
-\f3 XFree86 \'82\'cc Mac OS X Server \'82\'d6\'82\'cc\'8d\'c5\'8f\'89\'82\'cc\'88\'da\'90\'41
-\f0 \
+\f0 XFree86 \'82\'cc Mac OS X Server \'82\'d6\'82\'cc\'8d\'c5\'8f\'89\'82\'cc\'88\'da\'90\'41
+\f1 \
 Dave Zarzycki\
      XFree86 4.0 
-\f3 \'82\'f0 Darwin 1.0 \'82\'c9\'88\'da\'90\'41
-\f0 \
+\f0 \'82\'f0 Darwin 1.0 \'82\'c9\'88\'da\'90\'41
+\f1 \
 Torrey T. Lyons\
      XFree86 4.0.2 
-\f3 \'83\'76\'83\'8d\'83\'57\'83\'46\'83\'4e\'83\'67\'82\'d6\'82\'cc\'93\'9d\'8d\'87}
\ No newline at end of file
+\f0 \'83\'76\'83\'8d\'83\'57\'83\'46\'83\'4e\'83\'67\'82\'d6\'82\'cc\'93\'9d\'8d\'87}
\ No newline at end of file
diff --git a/hw/darwin/bundle/Japanese.lproj/MainMenu.nib/objects.nib b/hw/darwin/bundle/Japanese.lproj/MainMenu.nib/objects.nib
index 7903eb622..357002706 100644
--- a/hw/darwin/bundle/Japanese.lproj/MainMenu.nib/objects.nib
+++ b/hw/darwin/bundle/Japanese.lproj/MainMenu.nib/objects.nib
diff --git a/hw/darwin/bundle/Japanese.lproj/XDarwinHelp.html.cpp b/hw/darwin/bundle/Japanese.lproj/XDarwinHelp.html.cpp
index 2065d43d4..6653f5bea 100644
--- a/hw/darwin/bundle/Japanese.lproj/XDarwinHelp.html.cpp
+++ b/hw/darwin/bundle/Japanese.lproj/XDarwinHelp.html.cpp
@@ -1,149 +1,141 @@
-<!-- $XFree86: xc/programs/Xserver/hw/darwin/bundle/Japanese.lproj/XDarwinHelp.html.cpp,v 1.5 2002/05/04 01:25:40 torrey Exp $ -->

-

-#include "xf86Version.h"

-#ifndef PRE_RELEASE

-#define PRE_RELEASE XF86_VERSION_SNAP

-#endif

-

-<html>

-<head>

-<META http-equiv="Content-Type" content="text/html; charset=EUC-JP">

-<title>

-XFree86 for Mac OS X</title></head>

-<body>

-<center>

-    <h1>XFree86 on Darwin and Mac OS X</h1>

-    XFree86 XF86_VERSION<br>

-    Release Date: XF86_REL_DATE

-</center>

-<h2>Ìܼ¡</h2>

-<ol>

-    <li><A HREF="#notice">Ãí°Õ»ö¹à</A></li>

-    <li><A HREF="#usage">»ÈÍÑË¡</A></li>

-    <li><A HREF="#path">¥Ñ¥¹¤ÎÀßÄê</A></li>

-    <li><A HREF="#prefs">´Ä¶­ÀßÄê</A></li>

-    <li><A HREF="#license">¥é¥¤¥»¥ó¥¹</A></li>

-</ol>

-<center>

-        <h2><a NAME="notice">Ãí°Õ»ö¹à</a></h2>

-</center>

-<blockquote>

-#if PRE_RELEASE

-¤³¤ì¤Ï¡¤XFree86 ¤Î¥×¥ì¥ê¥ê¡¼¥¹¥Ð¡¼¥¸¥ç¥ó¤Ç¤¢¤ê¡¤¤¤¤«¤Ê¤ë¾ì¹ç¤Ë¤ª¤¤¤Æ¤â¥µ¥Ý¡¼¥È¤µ¤ì¤Þ¤»¤ó¡£ 

-¥Ð¥°¤ÎÊó¹ð¤ä¥Ñ¥Ã¥Á¤¬ SourceForge ¤Î <A HREF="http://sourceforge.net/projects/xonx/">XonX ¥×¥í¥¸¥§¥¯¥È¥Ú¡¼¥¸</A>¤ËÄó½Ð¤µ¤ì¤Æ¤¤¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡£

-¥×¥ì¥ê¥ê¡¼¥¹¥Ð¡¼¥¸¥ç¥ó¤Î¥Ð¥°¤òÊó¹ð¤¹¤ëÁ°¤Ë¡¤<A HREF="http://sourceforge.net/projects/xonx/">XonX</A> ¥×¥í¥¸¥§¥¯¥È¥Ú¡¼¥¸¤Þ¤¿¤Ï <A HREF="http://www.XFree86.Org/cvs">XFree86 CVS ¥ê¥Ý¥¸¥È¥ê</A>¤ÇºÇ¿·ÈǤΥÁ¥§¥Ã¥¯¤ò¤·¤Æ²¼¤µ¤¤¡£

-#else

-¤â¤·¡¤¥µ¡¼¥Ð¡¼¤¬ 6 -12 ¥ö·î°Ê¾åÁ°¤Î¤â¤Î¤«¡¤¤Þ¤¿¤Ï¤¢¤Ê¤¿¤Î¥Ï¡¼¥É¥¦¥§¥¢¤¬¾åµ­¤ÎÆüÉÕ¤è¤ê¤â¿·¤·¤¤¤â¤Î¤Ê¤é¤Ð¡¤ÌäÂê¤òÊó¹ð¤¹¤ëÁ°¤Ë¤è¤ê¿·¤·¤¤¥Ð¡¼¥¸¥ç¥ó¤òõ¤·¤Æ¤ß¤Æ¤¯¤À¤µ¤¤¡£

-¥Ð¥°¤ÎÊó¹ð¤ä¥Ñ¥Ã¥Á¤¬ SourceForge ¤Î <A HREF="http://sourceforge.net/projects/xonx/">XonX ¥×¥í¥¸¥§¥¯¥È¥Ú¡¼¥¸</A>¤ËÄó½Ð¤µ¤ì¤Æ¤¤¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡£

-#endif

-</blockquote>

-<blockquote>

-ËÜ¥½¥Õ¥È¥¦¥§¥¢¤Ï¡¤<A HREF="#license">MIT X11/X Consortium License</A> ¤Î¾ò·ï¤Ë´ð¤Å¤­¡¤ÌµÊݾڤǡ¤¡Ö¤½¤Î¤Þ¤Þ¡×¤Î·Á¤Ç¶¡µë¤µ¤ì¤Þ¤¹¡£

-¤´»ÈÍѤˤʤëÁ°¤Ë¡¤<A HREF="#license">¥é¥¤¥»¥ó¥¹¾ò·ï</A>¤ò¤ªÆɤ߲¼¤µ¤¤¡£

-</blockquote>

-

-<h2><a NAME="usage">»ÈÍÑË¡</a></h2>

-<p>XFree86 ¤Ï¡¤<a HREF="http://www.XFree86.Org/">XFree86 Project, Inc.</a>¤Ë¤è¤Ã¤ÆºîÀ®¤µ¤ì¤¿¡¤ºÆÇÛÉÛ²Äǽ¤Ê¥ª¡¼¥×¥ó¥½¡¼¥¹¤Î <a HREF="http://www.x.org/">X Window System</a> ¤Î¼ÂÁõ¤Ç¤¹¡£

-XFree86 ¤Ë¤è¤Ã¤ÆÄ󶡤µ¤ì¤ë Darwin ¤È Mac OS X ¤Î¤¿¤á¤Î X Window ¥µ¡¼¥Ð¡¼¤ò XDarwin ¤È¸Æ¤Ó¤Þ¤¹¡£

-XDarwin ¤Ï¡¤Mac OS X ¾å¤Ç¥Õ¥ë¥¹¥¯¥ê¡¼¥ó¥â¡¼¥É¤Þ¤¿¤Ï¥ë¡¼¥È¥ì¥¹¥â¡¼¥É¤ÇÆ°ºî¤·¤Þ¤¹¡£</p>

-

-<p>¥Õ¥ë¥¹¥¯¥ê¡¼¥ó¥â¡¼¥É¤Ç¤Ï¡¤X Window System ¤¬¥¢¥¯¥Æ¥£¥Ö¤Ê»þ¡¤¤½¤ì¤ÏÁ´²èÌ̤òÀêÍ­¤·¤Þ¤¹¡£

-¤¢¤Ê¤¿¤Ï¡¤Command-Option-A ¥­¡¼¤ò²¡¤¹¤³¤È¤Ë¤è¤Ã¤Æ Mac OS X ¥Ç¥¹¥¯¥È¥Ã¥×¤ØÀÚ¤êÂؤ¨¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¤³¤Î¥­¡¼¤ÎÁȤ߹ç¤ï¤»¤Ï¡¤´Ä¶­ÀßÄê¤ÇÊѹ¹²Äǽ¤Ç¤¹¡£

-Mac OS X ¥Ç¥¹¥¯¥È¥Ã¥×¤«¤é X Window System ¤ØÀÚ¤êÂؤ¨¤ë¾ì¹ç¤Ï¡¤¥É¥Ã¥¯¤Ëɽ¼¨¤µ¤ì¤¿ XDarwin ¥¢¥¤¥³¥ó¤ò¥¯¥ê¥Ã¥¯¤·¤Æ²¼¤µ¤¤¡£

-¡Ê´Ä¶­ÀßÄê¤Ç¡¤¥Õ¥í¡¼¥Æ¥£¥ó¥°¡¦¥¦¥£¥ó¥É¥¦¤Ëɽ¼¨¤µ¤ì¤¿ XDarwin ¥¢¥¤¥³¥ó¤ò¥¯¥ê¥Ã¥¯¤¹¤ë¤è¤¦¤ËÊѹ¹¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¡Ë</p>

-

-<p>¥ë¡¼¥È¥ì¥¹¥â¡¼¥É¤Ç¤Ï¡¤X Window System ¤È Aqua ¤Ï²èÌ̤ò¶¦Í­¤·¤Þ¤¹¡£

-X11 ¤¬É½¼¨¤¹¤ë¥ë¡¼¥È¥¦¥£¥ó¥É¥¦¤Ï²èÌ̤Υµ¥¤¥º¤Ç¤¢¤ê¡¤Â¾¤ÎÁ´¤Æ¤Î¥¦¥£¥ó¥É¥¦¤ò´Þ¤ó¤Ç¤¤¤Þ¤¹¡£

-Aqua ¤¬¥Ç¥¹¥¯¥È¥Ã¥×¤ÎÇطʤòÀ©¸æ¤¹¤ë¤Î¤Ç¡¤X11 ¤Î¥ë¡¼¥È¥¦¥£¥ó¥É¥¦¤Ï¥ë¡¼¥È¥ì¥¹¥â¡¼¥É¤Ç¤Ïɽ¼¨¤µ¤ì¤Þ¤»¤ó¡£</p>

-

-<h3>Ê£¿ô¥Ü¥¿¥ó¥Þ¥¦¥¹¤Î¥¨¥ß¥å¥ì¡¼¥·¥ç¥ó</h3>

-<p>¿¤¯¤Î X11 ¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Ï¡¤3 ¥Ü¥¿¥ó¥Þ¥¦¥¹¤òɬÍפȤ·¤Þ¤¹¡£

-¤¢¤Ê¤¿¤Ï¥Þ¥¦¥¹¥Ü¥¿¥ó¤Î¥¯¥ê¥Ã¥¯¤ÈƱ»þ¤Ë¤¤¤¯¤Ä¤«¤Î½¤¾þ¥­¡¼¤ò²¡¤¹¤³¤È¤Ë¤è¤Ã¤Æ¡¤°ì¤Ä¤Î¥Ü¥¿¥ó¤Ç 3 ¥Ü¥¿¥ó¥Þ¥¦¥¹¤ò¥¨¥ß¥å¥ì¡¼¥·¥ç¥ó¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£

-¤³¤ì¤Ï¡¤´Ä¶­ÀßÄê¤Î¡Ö°ìÈÌÀßÄê¡×¤Î¡ÖÊ£¿ô¥Ü¥¿¥ó¥Þ¥¦¥¹¤Î¥¨¥ß¥å¥ì¡¼¥·¥ç¥ó¡×¥»¥¯¥·¥ç¥ó¤ÇÀßÄꤷ¤Þ¤¹¡£

-¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¡¤¥¨¥ß¥å¥ì¡¼¥·¥ç¥ó¤ÏÍ­¸ú¤Ç¡¤¥³¥Þ¥ó¥É¥­¡¼¤ò²¡¤·¤Ê¤¬¤é¥Þ¥¦¥¹¥Ü¥¿¥ó¤ò¥¯¥ê¥Ã¥¯¤¹¤ë¤³¤È¤ÏÂè 2 ¥Þ¥¦¥¹¥Ü¥¿¥ó¤Î¥¯¥ê¥Ã¥¯¤ËÁêÅö¤·¤Þ¤¹¡£

-¥ª¥×¥·¥ç¥ó¥­¡¼¤ò²¡¤·¤Ê¤¬¤é¥¯¥ê¥Ã¥¯¤¹¤ë¤³¤È¤ÏÂè 3 ¥Þ¥¦¥¹¥Ü¥¿¥ó¤Î¥¯¥ê¥Ã¥¯¤ËÁêÅö¤·¤Þ¤¹¡£

-¤¢¤Ê¤¿¤Ï¡¤´Ä¶­ÀßÄê¤Ç¥Ü¥¿¥ó 2 ¤È 3 ¤ò¥¨¥ß¥å¥ì¡¼¥È¤¹¤ë¤¿¤á¤Ë»ÈÍѤ¹¤ë½¤¾þ¥­¡¼¤ÎÁȹ礻¤òÊѹ¹¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£

-Ãí¡§½¤¾þ¥­¡¼¤ò xmodmap ¤Ç¾¤Î¥­¡¼¤Ë³ä¤êÅö¤Æ¤Æ¤¤¤ë¾ì¹ç¤Ç¤â¡¤Ê£¿ô¥Ü¥¿¥ó¥Þ¥¦¥¹¤Î¥¨¥ß¥å¥ì¡¼¥·¥ç¥ó¤Ç¤ÏËÜÍè¤Î¥³¥Þ¥ó¥É¥­¡¼¤ä¥ª¥×¥·¥ç¥ó¥­¡¼¤ò»È¤ï¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£</p>

-

-<h2><a NAME="path">¥Ñ¥¹¤ÎÀßÄê</a></h2>

-<p>¥Ñ¥¹¤Ï¡¤ ¼Â¹Ô²Äǽ¤Ê¥³¥Þ¥ó¥É¤ò¸¡º÷¤¹¤ë¥Ç¥£¥ì¥¯¥È¥ê¤Î¥ê¥¹¥È¤Ç¤¹¡£

-X11 ¥Ð¥¤¥Ê¥ê¤Ï¡¤<code>/usr/X11R6/bin</code> ¤ËÃÖ¤«¤ì¤Þ¤¹¡£¤¢¤Ê¤¿¤Ï¤½¤ì¤ò¥Ñ¥¹¤Ë²Ã¤¨¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£

-XDarwin ¤Ï¡¤¤³¤ì¤ò¥Ç¥Õ¥©¥ë¥È¤Ç¹Ô¤¤¤Þ¤¹¡£¤Þ¤¿¡¤¤¢¤Ê¤¿¤¬¥³¥Þ¥ó¥É¥é¥¤¥ó¡¦¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤¿ÄɲäΥǥ£¥ì¥¯¥È¥ê¤ò²Ã¤¨¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</p>

-

-<p>·Ð¸³Ë­¤«¤Ê¥æ¡¼¥¶¡¼¤Ï¡¤¤¹¤Ç¤Ë¼«¤é¤Î¥·¥§¥ë¤Î¤¿¤á¤Ë½é´ü²½¥Õ¥¡¥¤¥ë¤ò»ÈÍѤ·¤Æ¥Ñ¥¹¤òÀßÄꤷ¤Æ¤¤¤ë¤Ç¤·¤ç¤¦¡£

-¤³¤Î¾ì¹ç¡¤¤¢¤Ê¤¿¤Ï´Ä¶­ÀßÄê¤Ç XDarwin ¤¬¤¢¤Ê¤¿¤Î¥Ñ¥¹¤òÊѹ¹¤·¤Ê¤¤¤è¤¦¤ËÀßÄꤹ¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£

-XDarwin ¤Ï¡¤¥æ¡¼¥¶¡¼¤Î¥Ç¥Õ¥©¥ë¥È¤Î¥í¥°¥¤¥ó¥·¥§¥ë¤ÇºÇ½é¤Î X11 ¥¯¥é¥¤¥¢¥ó¥È¤ò³«»Ï¤·¤Þ¤¹¡£

-¡Ê´Ä¶­ÀßÄê¤ÇÂå¤ï¤ê¤Î¥·¥§¥ë¤ò»ØÄꤹ¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¡Ë

-¥Ñ¥¹¤òÀßÄꤹ¤ëÊýË¡¤Ï¡¤¤¢¤Ê¤¿¤¬»ÈÍѤ·¤Æ¤¤¤ë¥·¥§¥ë¤Ë°Í¸¤·¤Þ¤¹¡£

-¤³¤ì¤Ï¡¤¥·¥§¥ë¤Î¥Þ¥Ë¥å¥¢¥ë¥Ú¡¼¥¸¥É¥­¥å¥á¥ó¥È¤Ëµ­ºÜ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£

-

-<p>¤Þ¤¿¡¤¤¢¤Ê¤¿¤Ï¥É¥­¥å¥á¥ó¥È¤òõ¤·¤Æ¤¤¤ë»þ¡¤XFree86 ¤Î¥Þ¥Ë¥å¥¢¥ë¥Ú¡¼¥¸¤ò¸¡º÷¤µ¤ì¤ë¥Ú¡¼¥¸¤Î¥ê¥¹¥È¤ËÄɲä·¤¿¤¤¤È»×¤¦¤«¤â¤·¤ì¤Þ¤»¤ó¡£

-X11 ¤Î¥Þ¥Ë¥å¥¢¥ë¥Ú¡¼¥¸¤Ï <code>/usr/X11R6/man</code> ¤ËÃÖ¤«¤ì¤Þ¤¹¡£¤½¤·¤Æ <code>MANPATH</code> ´Ä¶­ÊÑ¿ô¤Ï¸¡º÷¤¹¤ë¥Ç¥£¥ì¥¯¥È¥ê¤Î¥ê¥¹¥È¤ò´Þ¤ó¤Ç¤¤¤Þ¤¹¡£</p>

-

-<h2><a NAME="prefs">´Ä¶­ÀßÄê</a></h2>

-<p>¡ÖXDarwin¡×¥á¥Ë¥å¡¼¤Î¡Ö´Ä¶­ÀßÄê...¡×¥á¥Ë¥å¡¼¹àÌܤ«¤é¥¢¥¯¥»¥¹¤Ç¤­¤ë´Ä¶­ÀßÄê¥Ñ¥Í¥ë¤Ç¡¤¤¤¤¯¤Ä¤«¤Î¥ª¥×¥·¥ç¥ó¤òÀßÄꤹ¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£

-¡Öµ¯Æ°¥ª¥×¥·¥ç¥ó¡×¤ÎÆâÍƤϡ¤XDarwin ¤òºÆµ¯Æ°¤¹¤ë¤Þ¤ÇÍ­¸ú¤È¤Ê¤ê¤Þ¤»¤ó¡£

-¾¤ÎÁ´¤Æ¤Î¥ª¥×¥·¥ç¥ó¤ÎÆâÍƤϡ¤Ä¾¤Á¤ËÍ­¸ú¤È¤Ê¤ê¤Þ¤¹¡£

-°Ê²¼¡¤¤½¤ì¤¾¤ì¤Î¥ª¥×¥·¥ç¥ó¤Ë¤Ä¤¤¤ÆÀâÌÀ¤·¤Þ¤¹:</p>

-

-<h3>°ìÈÌÀßÄê</h3>

-<ul>

-    <li><b>X11 ¤Ç¥·¥¹¥Æ¥à¤Î¥Ó¡¼¥×²»¤ò»ÈÍѤ¹¤ë:</b> ¥ª¥ó¤Î¾ì¹ç¡¤Mac OS X ¤Î¥Ó¡¼¥×²»¤¬ X11 ¤Î¥Ù¥ë¤È¤·¤Æ»ÈÍѤµ¤ì¤Þ¤¹¡£¥ª¥Õ¤Î¾ì¹ç¡Ê¥Ç¥Õ¥©¥ë¥È¡Ë¡¤¥·¥ó¥×¥ë ¥È¡¼¥ó¤¬»È¤ï¤ì¤Þ¤¹¡£</li>

-    <li><b>X11 ¤Î¥Þ¥¦¥¹¥¢¥¯¥»¥é¥ì¡¼¥·¥ç¥ó¤òÍ­¸ú¤Ë¤¹¤ë:</b> ɸ½àŪ¤Ê X Window System ¤Î¼ÂÁõ¤Ç¤Ï¡¤¥¦¥£¥ó¥É¥¦¥Þ¥Í¡¼¥¸¥ã¡¼¤Ï¥Þ¥¦¥¹¤Î²Ã®ÅÙ¤òÊѹ¹¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£

-    ¥Þ¥¦¥¹¤Î²Ã®ÅÙ¤Ë Mac OS X ¤Î¥·¥¹¥Æ¥à´Ä¶­ÀßÄê¤È X ¥¦¥£¥ó¥É¥¦¥Þ¥Í¡¼¥¸¥ã¡¼¤¬°Û¤Ê¤ëÃͤòÀßÄꤷ¤¿¾ì¹ç¡¤¤³¤ì¤Ïº®Íð¤ò¾·¤­¤Þ¤¹¡£

-    ¤³¤ÎÌäÂê¤òÈò¤±¤ë¤¿¤á¡¤¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï X11 ¤Î¥Þ¥¦¥¹¥¢¥¯¥»¥é¥ì¡¼¥·¥ç¥ó¤òÍ­¸ú¤È¤·¤Þ¤»¤ó¡£</li>

-    <li><b>Ê£¿ô¥Ü¥¿¥ó¥Þ¥¦¥¹¤Î¥¨¥ß¥å¥ì¡¼¥·¥ç¥ó:</b> <a HREF="#usage">»ÈÍÑË¡</a>¤ò»²¾È¤·¤Æ²¼¤µ¤¤¡£¥ª¥ó¤Î¾ì¹ç¡¤¥Þ¥¦¥¹¥Ü¥¿¥ó¤¬Âè 2 ¤Þ¤¿¤ÏÂè 3 ¤Î¥Þ¥¦¥¹¥Ü¥¿¥ó¤ò¥¨¥ß¥å¥ì¡¼¥È¤¹¤ë»þ¤Ë¡¤ÁªÂò¤·¤¿½¤¾þ¥­¡¼¤òƱ»þ¤Ë²¡¤·¤Þ¤¹¡£</li>

-</ul>

-

-<h3>µ¯Æ°¥ª¥×¥·¥ç¥ó</h3>

-<ul>

-    <li><b>²èÌ̥⡼¥É:</b> ¥æ¡¼¥¶¡¼¤¬¥Õ¥ë¥¹¥¯¥ê¡¼¥ó¥â¡¼¥É¤Þ¤¿¤Ï¥ë¡¼¥È¥ì¥¹¥â¡¼¥É¤Î¤É¤Á¤é¤ò»ÈÍѤ¹¤ë¤«¤ò»ØÄꤷ¤Ê¤¤¾ì¹ç¡¤¤³¤³¤Ç»ØÄꤵ¤ì¤¿¥â¡¼¥É¤¬»È¤ï¤ì¤Þ¤¹¡£</li>

-    <li><b>µ¯Æ°»þ¤Ë¥â¡¼¥ÉÁªÂò¥Ñ¥Í¥ë¤òɽ¼¨¤¹¤ë:</b> ¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¡¤XDarwin ¤Îµ¯Æ°»þ¤Ë¥æ¡¼¥¶¡¼¤¬¥Õ¥ë¥¹¥¯¥ê¡¼¥ó¥â¡¼¥É¤Þ¤¿¤Ï¥ë¡¼¥È¥ì¥¹¥â¡¼¥É¤Î¤É¤Á¤é¤ò»ÈÍѤ¹¤ë¤«¤òÁªÂò¤¹¤ë¥Ñ¥Í¥ë¤òɽ¼¨¤·¤Þ¤¹¡£¤³¤Î¥ª¥×¥·¥ç¥ó¤¬¥ª¥Õ¤Î¾ì¹ç¡¤²èÌ̥⡼¥É¤Ç»ØÄꤷ¤¿¥â¡¼¥É¤Çµ¯Æ°¤·¤Þ¤¹¡£</li>

-    <li><b>X11 ¥Ç¥£¥¹¥×¥ì¥¤ÈÖ¹æ:</b> X11¤Ï¡¤°ì¤Ä¤Î¥³¥ó¥Ô¥å¡¼¥¿¾å¤ÇÊÌ¡¹¤Î X ¥µ¡¼¥Ð¡¼¤¬´ÉÍý¤¹¤ëÊ£¿ô¤Î¥Ç¥£¥¹¥×¥ì¥¤¤¬Â¸ºß¤¹¤ë¤³¤È¤òµö¤·¤Þ¤¹¡£Ê£¿ô¤Î X ¥µ¡¼¥Ð¡¼¤¬Æ±»þ¤Ë¼Â¹Ô¤·¤Æ¤¤¤ë»þ¡¤XDarwin ¤¬»ÈÍѤ¹¤ë¥Ç¥£¥¹¥×¥ì¥¤¤ÎÈÖ¹æ¤ò»ØÄꤹ¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</li>

-    <li><b>Xinerama ¥Þ¥ë¥Á¥â¥Ë¥¿¥µ¥Ý¡¼¥È¤òÍ­¸ú¤Ë¤¹¤ë:</b> XDarwin ¤Ï¡¤Xinerama ¥Þ¥ë¥Á¥â¥Ë¥¿¤ò¥µ¥Ý¡¼¥È¤·¤Þ¤¹¡£¤½¤ì¤ÏÁ´¤Æ¤Î¥â¥Ë¥¿¤ò°ì¤Ä¤ÎÂ礭¤Ê²èÌ̤ΰìÉô¤È¤ß¤Ê¤·¤Þ¤¹¡£¤¢¤Ê¤¿¤Ï¤³¤Î¥ª¥×¥·¥ç¥ó¤Ç Xinerama ¤ò̵¸ú¤Ë¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¤¿¤À¤·¡¤¸½ºß XDarwin ¤Ï¤½¤ì̵¤·¤ÇÀµ¤·¤¯Ê£¿ô¤Î¥â¥Ë¥¿¤ò°·¤¦¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó¡£¤â¤·¡¤¤¢¤Ê¤¿¤¬°ì¤Ä¤Î¥â¥Ë¥¿¤ò»È¤¦¤À¤±¤Ê¤é¤Ð¡¤Xinerama ¤Ï¼«Æ°Åª¤Ë̵¸ú¤È¤Ê¤ê¤Þ¤¹¡£</li>

-    <li><b>¥­¡¼¥Þ¥Ã¥Ô¥ó¥°¥Õ¥¡¥¤¥ë:</b> ¥­¡¼¥Þ¥Ã¥Ô¥ó¥°¥Õ¥¡¥¤¥ë¤Ïµ¯Æ°»þ¤ËÆɤ߹þ¤Þ¤ì¡¤X11 ¥­¡¼¥Þ¥Ã¥×¤ËÊÑ´¹¤µ¤ì¤Þ¤¹¡£Â¾¸À¸ì¤ËÂбþ¤·¤¿¥­¡¼¥Þ¥Ã¥Ô¥ó¥°¥Õ¥¡¥¤¥ë¤Ï <code>/System/Library/Keyboards</code> ¤Ë¤¢¤ê¤Þ¤¹¡£¡ÊÌõÃí¡§¥­¡¼¥Þ¥Ã¥Ô¥ó¥°¤Ç Japanese ¤òÁªÂò¤¹¤ë¤È¡¤°ìÉô¤Î¥­¡¼¤¬¸ú¤«¤Ê¤¤Åù¤ÎÉÔ¶ñ¹ç¤¬È¯À¸¤¹¤ë¤³¤È¤¬¤¢¤ê¤Þ¤¹¡£¤³¤Î¾ì¹ç¤Ï USA ¤òÁªÂò¤·¤¿¾å¤Ç ~/.Xmodmap ¤òŬÍѤ·¤Æ²¼¤µ¤¤¡£¡Ë</li>

-    <li><b>ºÇ½é¤Î X11 ¥¯¥é¥¤¥¢¥ó¥È¤Îµ¯Æ°:</b> XDarwin ¤¬ Finder¤«¤éµ¯Æ°¤¹¤ë»þ¡¤X ¥¦¥£¥ó¥É¥¦¥Þ¥Í¡¼¥¸¥ã¡¼¤È X ¥¯¥é¥¤¥¢¥ó¥È¤Îµ¯Æ°¤Ï <code>xinit</code> ¤ò¼Â¹Ô¤·¤Þ¤¹¡£¡Ê¾ÜºÙ¤Ï "<code>man xinit</code>" ¤ò»²¾È¤·¤Æ²¼¤µ¤¤¡£¡ËXDarwin ¤Ï <code>xinit</code> ¤ò¼Â¹Ô¤¹¤ëÁ°¤Ë¡¤»ØÄꤵ¤ì¤¿¥Ç¥£¥ì¥¯¥È¥ê¤ò¥æ¡¼¥¶¡¼¤Î¥Ñ¥¹¤ËÄɲä·¤Þ¤¹¡£¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï <code>/usr/X11R6/bin</code> ¤À¤±¤òÄɲä·¤Þ¤¹¡£Â¾¤Î¥Ç¥£¥ì¥¯¥È¥ê¤òÄɲä·¤¿¤¤¾ì¹ç¤Ï¡¤¥³¥í¥ó¤Ç¶èÀڤäƻØÄꤷ¤Þ¤¹¡£¥æ¡¼¥¶¡¼¤Î¥·¥§¥ë½é´ü²½¥Õ¥¡¥¤¥ë¤òÆɤ߹þ¤à¤¿¤á¤Ë¡¤X ¥¯¥é¥¤¥¢¥ó¥È¤Ï¥æ¡¼¥¶¡¼¤Î¥Ç¥Õ¥©¥ë¥È¥í¥°¥¤¥ó¥·¥§¥ë¤Çµ¯Æ°¤µ¤ì¤Þ¤¹¡£É¬ÍפǤ¢¤ì¤Ð¡¤Âå¤ï¤ê¤Î¥·¥§¥ë¤ò»ØÄꤹ¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</li>

-</ul>

-

-<h3>¥Õ¥ë¥¹¥¯¥ê¡¼¥ó</h3>

-<ul>

-    <li><b>¥­¡¼ÀßÄê¥Ü¥¿¥ó:</b> X11 ¤È Aqua ¤òÀÚ¤êÂؤ¨¤ë¤¿¤á¤Ë»ÈÍѤ¹¤ë¥Ü¥¿¥ó¤ÎÁȤ߹ç¤ï¤»¤ò»ØÄꤷ¤Þ¤¹¡£

-    ¥Ü¥¿¥ó¤ò¥¯¥ê¥Ã¥¯¤·¤Æ¡¤Ç¤°Õ¤Î¿ô¤Î½¤¾þ¥­¡¼¤Ë³¤¤¤ÆÄ̾ï¤Î¥­¡¼¤ò²¡¤·¤Þ¤¹¡£</li>

-    <li><b>¥É¥Ã¥¯¤Î¥¢¥¤¥³¥ó¤Î¥¯¥ê¥Ã¥¯¤Ç X11 ¤ËÌá¤ë:</b> ¥ª¥ó¤Î¾ì¹ç¡¤¥É¥Ã¥¯¤Ëɽ¼¨¤µ¤ì¤¿ XDarwin ¥¢¥¤¥³¥ó¤Î¥¯¥ê¥Ã¥¯¤Ç X11 ¤Ø¤ÎÀڤ괹¤¨¤¬²Äǽ¤È¤Ê¤ê¤Þ¤¹¡£Mac OS X ¤Î¤¤¤¯¤Ä¤«¤Î¥Ð¡¼¥¸¥ç¥ó¤Ç¤Ï¡¤¥É¥Ã¥¯¤Î¥¢¥¤¥³¥ó¤Î¥¯¥ê¥Ã¥¯¤Ç Aqua ¤ËÌá¤Ã¤¿»þ¡¤¥«¡¼¥½¥ë¤¬¾Ã¼º¤¹¤ë¤³¤È¤¬¤¢¤ê¤Þ¤¹¡£</li>

-    <li><b>µ¯Æ°»þ¤Ë¥Ø¥ë¥×¤òɽ¼¨¤¹¤ë:</b> XDarwin ¤¬¥Õ¥ë¥¹¥¯¥ê¡¼¥ó¥â¡¼¥É¤Çµ¯Æ°¤¹¤ë»þ¡¤¥¹¥×¥é¥Ã¥·¥å¥¹¥¯¥ê¡¼¥ó¤òɽ¼¨¤·¤Þ¤¹¡£</li>

-    <li><b>¿§¿¼ÅÙ:</b> ¥Õ¥ë¥¹¥¯¥ê¡¼¥ó¥â¡¼¥É¤Ç¤Ï¡¤X11 ¥Ç¥£¥¹¥×¥ì¥¤¤¬ Aqua ¤È°Û¤Ê¤ë¿§¿¼ÅÙ¤ò»È¤¦¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¡ÖÊѹ¹¤Ê¤·¡×¤¬»ØÄꤵ¤ì¤¿¾ì¹ç¡¤XDarwin ¤Ï Aqua ¤Ë¤è¤Ã¤Æ»ÈÍѤµ¤ì¤ë¿§¿¼ÅÙ¤ò»È¤¤¤Þ¤¹¡£¤³¤ì°Ê³°¤Ë 8¡¤15 ¤Þ¤¿¤Ï24 ¥Ó¥Ã¥È¤ò»ØÄꤹ¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</li>

-</ul>

-

-<h2>

-<a NAME="license">¥é¥¤¥»¥ó¥¹</a>

-</h2>

-XFree86 Project ¤Ï¡¤¼«Í³¤ËºÆÇÛÉÛ²Äǽ¤Ê¥Ð¥¤¥Ê¥ê¤È¥½¡¼¥¹¥³¡¼¥É¤òÄ󶡤¹¤ë¤³¤È¤Ë¥³¥ß¥Ã¥È¤·¤Æ¤¤¤Þ¤¹¡£

-»ä¤¿¤Á¤¬»ÈÍѤ¹¤ë¼ç¤Ê¥é¥¤¥»¥ó¥¹¤Ï¡¤ÅÁÅýŪ¤Ê MIT X11/X Consortium License ¤Ë´ð¤Å¤¯¤â¤Î¤Ç¤¹¡£

-¤½¤·¤Æ¡¤¤½¤ì¤Ï½¤Àµ¤Þ¤¿¤ÏºÆÇÛÉÛ¤µ¤ì¤ë¥½¡¼¥¹¥³¡¼¥É¤Þ¤¿¤Ï¥Ð¥¤¥Ê¥ê¤Ë¡¤¤½¤Î Copyright/¥é¥¤¥»¥ó¥¹¹ð¼¨¤¬¤½¤Î¤Þ¤Þ»Ä¤µ¤ì¤ë¤³¤È¤òÍ׵᤹¤ë°Ê³°¤Î¾ò·ï¤ò¶¯À©¤·¤Þ¤»¤ó¡£

-¤è¤ê¿¤¯¤Î¾ðÊó¤È¡¤¥³¡¼¥É¤Î°ìÉô¤ò¥«¥Ð¡¼¤¹¤ëÄɲäΠCopyright/¥é¥¤¥»¥ó¥¹¹ð¼¨¤Î¤¿¤á¤Ë¡¤<A HREF="http://www.xfree86.org/legal/licence.html">XFree86 ¤Î License ¥Ú¡¼¥¸</A>¤ò»²¾È¤·¤Æ²¼¤µ¤¤¡£

-<H3>

-<A NAME="3"></A>

-X  Consortium License</H3>

-<p>Copyright (C) 1996 X Consortium</p>

-<p>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:</p>

-<p>The above copyright notice and this permission notice shall be included

-in all copies or substantial portions of the Software.</p>

-<p>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 X CONSORTIUM 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.</p>

-<p>Except as contained in this notice, the name of the X Consortium 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 X Consortium.</p>

-<p>X Window System is a trademark of X Consortium, Inc.</p>

-</body>

-</html>

+<!-- $XFree86: xc/programs/Xserver/hw/darwin/bundle/Japanese.lproj/XDarwinHelp.html.cpp,v 1.4 2001/11/27 07:27:46 torrey Exp $ -->
+
+<html>
+<head>
+<META http-equiv="Content-Type" content="text/html; charset=EUC-JP">
+<title>
+XDarwin Help</title></head>
+<body>
+<center>
+    <h1>XDarwin X Server for Mac OS X</h1>
+    X_VENDOR_NAME X_VERSION<br>
+    Release Date: X_REL_DATE
+</center>
+<h2>Ìܼ¡</h2>
+<ol>
+    <li><A HREF="#notice">Ãí°Õ»ö¹à</A></li>
+    <li><A HREF="#usage">»ÈÍÑË¡</A></li>
+    <li><A HREF="#path">¥Ñ¥¹¤ÎÀßÄê</A></li>
+    <li><A HREF="#prefs">´Ä¶­ÀßÄê</A></li>
+    <li><A HREF="#license">¥é¥¤¥»¥ó¥¹</A></li>
+</ol>
+<center>
+        <h2><a NAME="notice">Ãí°Õ»ö¹à</a></h2>
+</center>
+<blockquote>
+#if X_PRE_RELEASE
+¤³¤ì¤Ï¡¤XDarwin ¤Î¥×¥ì¥ê¥ê¡¼¥¹¥Ð¡¼¥¸¥ç¥ó¤Ç¤¢¤ê¡¤¤¤¤«¤Ê¤ë¾ì¹ç¤Ë¤ª¤¤¤Æ¤â¥µ¥Ý¡¼¥È¤µ¤ì¤Þ¤»¤ó¡£ 
+¥Ð¥°¤ÎÊó¹ð¤ä¥Ñ¥Ã¥Á¤¬ SourceForge ¤Î <A HREF="http://sourceforge.net/projects/xonx/">XonX ¥×¥í¥¸¥§¥¯¥È¥Ú¡¼¥¸</A>¤ËÄó½Ð¤µ¤ì¤Æ¤¤¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡£
+¥×¥ì¥ê¥ê¡¼¥¹¥Ð¡¼¥¸¥ç¥ó¤Î¥Ð¥°¤òÊó¹ð¤¹¤ëÁ°¤Ë¡¤<A HREF="http://sourceforge.net/projects/xonx/">XonX</A> ¥×¥í¥¸¥§¥¯¥È¥Ú¡¼¥¸¤Þ¤¿¤Ï X_VENDOR_LINK¤ÇºÇ¿·ÈǤΥÁ¥§¥Ã¥¯¤ò¤·¤Æ²¼¤µ¤¤¡£
+#else
+¤â¤·¡¤¥µ¡¼¥Ð¡¼¤¬ 6 -12 ¥ö·î°Ê¾åÁ°¤Î¤â¤Î¤«¡¤¤Þ¤¿¤Ï¤¢¤Ê¤¿¤Î¥Ï¡¼¥É¥¦¥§¥¢¤¬¾åµ­¤ÎÆüÉÕ¤è¤ê¤â¿·¤·¤¤¤â¤Î¤Ê¤é¤Ð¡¤ÌäÂê¤òÊó¹ð¤¹¤ëÁ°¤Ë¤è¤ê¿·¤·¤¤¥Ð¡¼¥¸¥ç¥ó¤òõ¤·¤Æ¤ß¤Æ¤¯¤À¤µ¤¤¡£
+¥Ð¥°¤ÎÊó¹ð¤ä¥Ñ¥Ã¥Á¤¬ SourceForge ¤Î <A HREF="http://sourceforge.net/projects/xonx/">XonX ¥×¥í¥¸¥§¥¯¥È¥Ú¡¼¥¸</A>¤ËÄó½Ð¤µ¤ì¤Æ¤¤¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡£
+#endif
+</blockquote>
+<blockquote>
+ËÜ¥½¥Õ¥È¥¦¥§¥¢¤Ï¡¤<A HREF="#license">MIT X11/X Consortium License</A> ¤Î¾ò·ï¤Ë´ð¤Å¤­¡¤ÌµÊݾڤǡ¤¡Ö¤½¤Î¤Þ¤Þ¡×¤Î·Á¤Ç¶¡µë¤µ¤ì¤Þ¤¹¡£
+¤´»ÈÍѤˤʤëÁ°¤Ë¡¤<A HREF="#license">¥é¥¤¥»¥ó¥¹¾ò·ï</A>¤ò¤ªÆɤ߲¼¤µ¤¤¡£
+</blockquote>
+
+<h2><a NAME="usage">»ÈÍÑË¡</a></h2>
+<p>XDarwin ¤Ï¡¤ºÆÇÛÉÛ²Äǽ¤Ê¥ª¡¼¥×¥ó¥½¡¼¥¹¤Î <a HREF="http://www.x.org/">X Window System</a> ¤Î¤¿¤á¤Î X ¥µ¡¼¥Ð¡¼¤Î¼ÂÁõ¤Ç¤¹¡£¤³¤Î¥Ð¡¼¥¸¥ç¥ó¤Î XDarwin ¤Ï X_VENDOR_LINK ¤Ë¤è¤Ã¤ÆºîÀ®¤µ¤ì¤Þ¤·¤¿¡£XDarwin ¤Ï¡¤Mac OS X ¾å¤Ç¥Õ¥ë¥¹¥¯¥ê¡¼¥ó¥â¡¼¥É¤Þ¤¿¤Ï¥ë¡¼¥È¥ì¥¹¥â¡¼¥É¤ÇÆ°ºî¤·¤Þ¤¹¡£</p>
+
+<p>¥Õ¥ë¥¹¥¯¥ê¡¼¥ó¥â¡¼¥É¤Ç¤Ï¡¤X Window System ¤¬¥¢¥¯¥Æ¥£¥Ö¤Ê»þ¡¤¤½¤ì¤ÏÁ´²èÌ̤òÀêÍ­¤·¤Þ¤¹¡£
+¤¢¤Ê¤¿¤Ï¡¤Command-Option-A ¥­¡¼¤ò²¡¤¹¤³¤È¤Ë¤è¤Ã¤Æ Mac OS X ¥Ç¥¹¥¯¥È¥Ã¥×¤ØÀÚ¤êÂؤ¨¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¤³¤Î¥­¡¼¤ÎÁȤ߹ç¤ï¤»¤Ï¡¤´Ä¶­ÀßÄê¤ÇÊѹ¹²Äǽ¤Ç¤¹¡£
+Mac OS X ¥Ç¥¹¥¯¥È¥Ã¥×¤«¤é X Window System ¤ØÀÚ¤êÂؤ¨¤ë¾ì¹ç¤Ï¡¤¥É¥Ã¥¯¤Ëɽ¼¨¤µ¤ì¤¿ XDarwin ¥¢¥¤¥³¥ó¤ò¥¯¥ê¥Ã¥¯¤·¤Æ²¼¤µ¤¤¡£
+¡Ê´Ä¶­ÀßÄê¤Ç¡¤¥Õ¥í¡¼¥Æ¥£¥ó¥°¡¦¥¦¥£¥ó¥É¥¦¤Ëɽ¼¨¤µ¤ì¤¿ XDarwin ¥¢¥¤¥³¥ó¤ò¥¯¥ê¥Ã¥¯¤¹¤ë¤è¤¦¤ËÊѹ¹¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¡Ë</p>
+
+<p>¥ë¡¼¥È¥ì¥¹¥â¡¼¥É¤Ç¤Ï¡¤X Window System ¤È Aqua ¤Ï²èÌ̤ò¶¦Í­¤·¤Þ¤¹¡£
+X11 ¤¬É½¼¨¤¹¤ë¥ë¡¼¥È¥¦¥£¥ó¥É¥¦¤Ï²èÌ̤Υµ¥¤¥º¤Ç¤¢¤ê¡¤Â¾¤ÎÁ´¤Æ¤Î¥¦¥£¥ó¥É¥¦¤ò´Þ¤ó¤Ç¤¤¤Þ¤¹¡£
+Aqua ¤¬¥Ç¥¹¥¯¥È¥Ã¥×¤ÎÇطʤòÀ©¸æ¤¹¤ë¤Î¤Ç¡¤X11 ¤Î¥ë¡¼¥È¥¦¥£¥ó¥É¥¦¤Ï¥ë¡¼¥È¥ì¥¹¥â¡¼¥É¤Ç¤Ïɽ¼¨¤µ¤ì¤Þ¤»¤ó¡£</p>
+
+<h3>Ê£¿ô¥Ü¥¿¥ó¥Þ¥¦¥¹¤Î¥¨¥ß¥å¥ì¡¼¥·¥ç¥ó</h3>
+<p>¿¤¯¤Î X11 ¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Ï¡¤3 ¥Ü¥¿¥ó¥Þ¥¦¥¹¤òɬÍפȤ·¤Þ¤¹¡£
+¤¢¤Ê¤¿¤Ï¥Þ¥¦¥¹¥Ü¥¿¥ó¤Î¥¯¥ê¥Ã¥¯¤ÈƱ»þ¤Ë¤¤¤¯¤Ä¤«¤Î½¤¾þ¥­¡¼¤ò²¡¤¹¤³¤È¤Ë¤è¤Ã¤Æ¡¤°ì¤Ä¤Î¥Ü¥¿¥ó¤Ç 3 ¥Ü¥¿¥ó¥Þ¥¦¥¹¤ò¥¨¥ß¥å¥ì¡¼¥·¥ç¥ó¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
+¤³¤ì¤Ï¡¤´Ä¶­ÀßÄê¤Î¡Ö°ìÈÌÀßÄê¡×¤Î¡ÖÊ£¿ô¥Ü¥¿¥ó¥Þ¥¦¥¹¤Î¥¨¥ß¥å¥ì¡¼¥·¥ç¥ó¡×¥»¥¯¥·¥ç¥ó¤ÇÀßÄꤷ¤Þ¤¹¡£
+¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¡¤¥¨¥ß¥å¥ì¡¼¥·¥ç¥ó¤ÏÍ­¸ú¤Ç¡¤¥³¥Þ¥ó¥É¥­¡¼¤ò²¡¤·¤Ê¤¬¤é¥Þ¥¦¥¹¥Ü¥¿¥ó¤ò¥¯¥ê¥Ã¥¯¤¹¤ë¤³¤È¤ÏÂè 2 ¥Þ¥¦¥¹¥Ü¥¿¥ó¤Î¥¯¥ê¥Ã¥¯¤ËÁêÅö¤·¤Þ¤¹¡£
+¥ª¥×¥·¥ç¥ó¥­¡¼¤ò²¡¤·¤Ê¤¬¤é¥¯¥ê¥Ã¥¯¤¹¤ë¤³¤È¤ÏÂè 3 ¥Þ¥¦¥¹¥Ü¥¿¥ó¤Î¥¯¥ê¥Ã¥¯¤ËÁêÅö¤·¤Þ¤¹¡£
+¤¢¤Ê¤¿¤Ï¡¤´Ä¶­ÀßÄê¤Ç¥Ü¥¿¥ó 2 ¤È 3 ¤ò¥¨¥ß¥å¥ì¡¼¥È¤¹¤ë¤¿¤á¤Ë»ÈÍѤ¹¤ë½¤¾þ¥­¡¼¤ÎÁȹ礻¤òÊѹ¹¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
+Ãí¡§½¤¾þ¥­¡¼¤ò xmodmap ¤Ç¾¤Î¥­¡¼¤Ë³ä¤êÅö¤Æ¤Æ¤¤¤ë¾ì¹ç¤Ç¤â¡¤Ê£¿ô¥Ü¥¿¥ó¥Þ¥¦¥¹¤Î¥¨¥ß¥å¥ì¡¼¥·¥ç¥ó¤Ç¤ÏËÜÍè¤Î¥³¥Þ¥ó¥É¥­¡¼¤ä¥ª¥×¥·¥ç¥ó¥­¡¼¤ò»È¤ï¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£</p>
+
+<h2><a NAME="path">¥Ñ¥¹¤ÎÀßÄê</a></h2>
+<p>¥Ñ¥¹¤Ï¡¤ ¼Â¹Ô²Äǽ¤Ê¥³¥Þ¥ó¥É¤ò¸¡º÷¤¹¤ë¥Ç¥£¥ì¥¯¥È¥ê¤Î¥ê¥¹¥È¤Ç¤¹¡£
+X11 ¥Ð¥¤¥Ê¥ê¤Ï¡¤<code>/usr/X11R6/bin</code> ¤ËÃÖ¤«¤ì¤Þ¤¹¡£¤¢¤Ê¤¿¤Ï¤½¤ì¤ò¥Ñ¥¹¤Ë²Ã¤¨¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
+XDarwin ¤Ï¡¤¤³¤ì¤ò¥Ç¥Õ¥©¥ë¥È¤Ç¹Ô¤¤¤Þ¤¹¡£¤Þ¤¿¡¤¤¢¤Ê¤¿¤¬¥³¥Þ¥ó¥É¥é¥¤¥ó¡¦¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤¿ÄɲäΥǥ£¥ì¥¯¥È¥ê¤ò²Ã¤¨¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</p>
+
+<p>·Ð¸³Ë­¤«¤Ê¥æ¡¼¥¶¡¼¤Ï¡¤¤¹¤Ç¤Ë¼«¤é¤Î¥·¥§¥ë¤Î¤¿¤á¤Ë½é´ü²½¥Õ¥¡¥¤¥ë¤ò»ÈÍѤ·¤Æ¥Ñ¥¹¤òÀßÄꤷ¤Æ¤¤¤ë¤Ç¤·¤ç¤¦¡£
+¤³¤Î¾ì¹ç¡¤¤¢¤Ê¤¿¤Ï´Ä¶­ÀßÄê¤Ç XDarwin ¤¬¤¢¤Ê¤¿¤Î¥Ñ¥¹¤òÊѹ¹¤·¤Ê¤¤¤è¤¦¤ËÀßÄꤹ¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
+XDarwin ¤Ï¡¤¥æ¡¼¥¶¡¼¤Î¥Ç¥Õ¥©¥ë¥È¤Î¥í¥°¥¤¥ó¥·¥§¥ë¤ÇºÇ½é¤Î X11 ¥¯¥é¥¤¥¢¥ó¥È¤ò³«»Ï¤·¤Þ¤¹¡£
+¡Ê´Ä¶­ÀßÄê¤ÇÂå¤ï¤ê¤Î¥·¥§¥ë¤ò»ØÄꤹ¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¡Ë
+¥Ñ¥¹¤òÀßÄꤹ¤ëÊýË¡¤Ï¡¤¤¢¤Ê¤¿¤¬»ÈÍѤ·¤Æ¤¤¤ë¥·¥§¥ë¤Ë°Í¸¤·¤Þ¤¹¡£
+¤³¤ì¤Ï¡¤¥·¥§¥ë¤Î¥Þ¥Ë¥å¥¢¥ë¥Ú¡¼¥¸¥É¥­¥å¥á¥ó¥È¤Ëµ­ºÜ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
+
+<p>¤Þ¤¿¡¤¤¢¤Ê¤¿¤Ï¥É¥­¥å¥á¥ó¥È¤òõ¤·¤Æ¤¤¤ë»þ¡¤X11 ¤Î¥Þ¥Ë¥å¥¢¥ë¥Ú¡¼¥¸¤ò¸¡º÷¤µ¤ì¤ë¥Ú¡¼¥¸¤Î¥ê¥¹¥È¤ËÄɲä·¤¿¤¤¤È»×¤¦¤«¤â¤·¤ì¤Þ¤»¤ó¡£
+X11 ¤Î¥Þ¥Ë¥å¥¢¥ë¥Ú¡¼¥¸¤Ï <code>/usr/X11R6/man</code> ¤ËÃÖ¤«¤ì¤Þ¤¹¡£¤½¤·¤Æ <code>MANPATH</code> ´Ä¶­ÊÑ¿ô¤Ï¸¡º÷¤¹¤ë¥Ç¥£¥ì¥¯¥È¥ê¤Î¥ê¥¹¥È¤ò´Þ¤ó¤Ç¤¤¤Þ¤¹¡£</p>
+
+<h2><a NAME="prefs">´Ä¶­ÀßÄê</a></h2>
+<p>¡ÖXDarwin¡×¥á¥Ë¥å¡¼¤Î¡Ö´Ä¶­ÀßÄê...¡×¥á¥Ë¥å¡¼¹àÌܤ«¤é¥¢¥¯¥»¥¹¤Ç¤­¤ë´Ä¶­ÀßÄê¥Ñ¥Í¥ë¤Ç¡¤¤¤¤¯¤Ä¤«¤Î¥ª¥×¥·¥ç¥ó¤òÀßÄꤹ¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
+¡Öµ¯Æ°¥ª¥×¥·¥ç¥ó¡×¤ÎÆâÍƤϡ¤XDarwin ¤òºÆµ¯Æ°¤¹¤ë¤Þ¤ÇÍ­¸ú¤È¤Ê¤ê¤Þ¤»¤ó¡£
+¾¤ÎÁ´¤Æ¤Î¥ª¥×¥·¥ç¥ó¤ÎÆâÍƤϡ¤Ä¾¤Á¤ËÍ­¸ú¤È¤Ê¤ê¤Þ¤¹¡£
+°Ê²¼¡¤¤½¤ì¤¾¤ì¤Î¥ª¥×¥·¥ç¥ó¤Ë¤Ä¤¤¤ÆÀâÌÀ¤·¤Þ¤¹:</p>
+
+<h3>°ìÈÌÀßÄê</h3>
+<ul>
+    <li><b>X11 ¤Ç¥·¥¹¥Æ¥à¤Î¥Ó¡¼¥×²»¤ò»ÈÍѤ¹¤ë:</b> ¥ª¥ó¤Î¾ì¹ç¡¤Mac OS X ¤Î¥Ó¡¼¥×²»¤¬ X11 ¤Î¥Ù¥ë¤È¤·¤Æ»ÈÍѤµ¤ì¤Þ¤¹¡£¥ª¥Õ¤Î¾ì¹ç¡Ê¥Ç¥Õ¥©¥ë¥È¡Ë¡¤¥·¥ó¥×¥ë ¥È¡¼¥ó¤¬»È¤ï¤ì¤Þ¤¹¡£</li>
+    <li><b>X11 ¤Î¥Þ¥¦¥¹¥¢¥¯¥»¥é¥ì¡¼¥·¥ç¥ó¤òÍ­¸ú¤Ë¤¹¤ë:</b> ɸ½àŪ¤Ê X Window System ¤Î¼ÂÁõ¤Ç¤Ï¡¤¥¦¥£¥ó¥É¥¦¥Þ¥Í¡¼¥¸¥ã¡¼¤Ï¥Þ¥¦¥¹¤Î²Ã®ÅÙ¤òÊѹ¹¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
+    ¥Þ¥¦¥¹¤Î²Ã®ÅÙ¤Ë Mac OS X ¤Î¥·¥¹¥Æ¥à´Ä¶­ÀßÄê¤È X ¥¦¥£¥ó¥É¥¦¥Þ¥Í¡¼¥¸¥ã¡¼¤¬°Û¤Ê¤ëÃͤòÀßÄꤷ¤¿¾ì¹ç¡¤¤³¤ì¤Ïº®Íð¤ò¾·¤­¤Þ¤¹¡£
+    ¤³¤ÎÌäÂê¤òÈò¤±¤ë¤¿¤á¡¤¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï X11 ¤Î¥Þ¥¦¥¹¥¢¥¯¥»¥é¥ì¡¼¥·¥ç¥ó¤òÍ­¸ú¤È¤·¤Þ¤»¤ó¡£</li>
+    <li><b>Ê£¿ô¥Ü¥¿¥ó¥Þ¥¦¥¹¤Î¥¨¥ß¥å¥ì¡¼¥·¥ç¥ó:</b> <a HREF="#usage">»ÈÍÑË¡</a>¤ò»²¾È¤·¤Æ²¼¤µ¤¤¡£¥ª¥ó¤Î¾ì¹ç¡¤¥Þ¥¦¥¹¥Ü¥¿¥ó¤¬Âè 2 ¤Þ¤¿¤ÏÂè 3 ¤Î¥Þ¥¦¥¹¥Ü¥¿¥ó¤ò¥¨¥ß¥å¥ì¡¼¥È¤¹¤ë»þ¤Ë¡¤ÁªÂò¤·¤¿½¤¾þ¥­¡¼¤òƱ»þ¤Ë²¡¤·¤Þ¤¹¡£</li>
+</ul>
+
+<h3>µ¯Æ°¥ª¥×¥·¥ç¥ó</h3>
+<ul>
+    <li><b>²èÌ̥⡼¥É:</b> ¥æ¡¼¥¶¡¼¤¬¥Õ¥ë¥¹¥¯¥ê¡¼¥ó¥â¡¼¥É¤Þ¤¿¤Ï¥ë¡¼¥È¥ì¥¹¥â¡¼¥É¤Î¤É¤Á¤é¤ò»ÈÍѤ¹¤ë¤«¤ò»ØÄꤷ¤Ê¤¤¾ì¹ç¡¤¤³¤³¤Ç»ØÄꤵ¤ì¤¿¥â¡¼¥É¤¬»È¤ï¤ì¤Þ¤¹¡£</li>
+    <li><b>µ¯Æ°»þ¤Ë¥â¡¼¥ÉÁªÂò¥Ñ¥Í¥ë¤òɽ¼¨¤¹¤ë:</b> ¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¡¤XDarwin ¤Îµ¯Æ°»þ¤Ë¥æ¡¼¥¶¡¼¤¬¥Õ¥ë¥¹¥¯¥ê¡¼¥ó¥â¡¼¥É¤Þ¤¿¤Ï¥ë¡¼¥È¥ì¥¹¥â¡¼¥É¤Î¤É¤Á¤é¤ò»ÈÍѤ¹¤ë¤«¤òÁªÂò¤¹¤ë¥Ñ¥Í¥ë¤òɽ¼¨¤·¤Þ¤¹¡£¤³¤Î¥ª¥×¥·¥ç¥ó¤¬¥ª¥Õ¤Î¾ì¹ç¡¤²èÌ̥⡼¥É¤Ç»ØÄꤷ¤¿¥â¡¼¥É¤Çµ¯Æ°¤·¤Þ¤¹¡£</li>
+    <li><b>X11 ¥Ç¥£¥¹¥×¥ì¥¤ÈÖ¹æ:</b> X11¤Ï¡¤°ì¤Ä¤Î¥³¥ó¥Ô¥å¡¼¥¿¾å¤ÇÊÌ¡¹¤Î X ¥µ¡¼¥Ð¡¼¤¬´ÉÍý¤¹¤ëÊ£¿ô¤Î¥Ç¥£¥¹¥×¥ì¥¤¤¬Â¸ºß¤¹¤ë¤³¤È¤òµö¤·¤Þ¤¹¡£Ê£¿ô¤Î X ¥µ¡¼¥Ð¡¼¤¬Æ±»þ¤Ë¼Â¹Ô¤·¤Æ¤¤¤ë»þ¡¤XDarwin ¤¬»ÈÍѤ¹¤ë¥Ç¥£¥¹¥×¥ì¥¤¤ÎÈÖ¹æ¤ò»ØÄꤹ¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</li>
+    <li><b>Xinerama ¥Þ¥ë¥Á¥â¥Ë¥¿¥µ¥Ý¡¼¥È¤òÍ­¸ú¤Ë¤¹¤ë:</b> XDarwin ¤Ï¡¤Xinerama ¥Þ¥ë¥Á¥â¥Ë¥¿¤ò¥µ¥Ý¡¼¥È¤·¤Þ¤¹¡£¤½¤ì¤ÏÁ´¤Æ¤Î¥â¥Ë¥¿¤ò°ì¤Ä¤ÎÂ礭¤Ê²èÌ̤ΰìÉô¤È¤ß¤Ê¤·¤Þ¤¹¡£¤¢¤Ê¤¿¤Ï¤³¤Î¥ª¥×¥·¥ç¥ó¤Ç Xinerama ¤ò̵¸ú¤Ë¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¤¿¤À¤·¡¤¸½ºß XDarwin ¤Ï¤½¤ì̵¤·¤ÇÀµ¤·¤¯Ê£¿ô¤Î¥â¥Ë¥¿¤ò°·¤¦¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó¡£¤â¤·¡¤¤¢¤Ê¤¿¤¬°ì¤Ä¤Î¥â¥Ë¥¿¤ò»È¤¦¤À¤±¤Ê¤é¤Ð¡¤Xinerama ¤Ï¼«Æ°Åª¤Ë̵¸ú¤È¤Ê¤ê¤Þ¤¹¡£</li>
+    <li><b>¥­¡¼¥Þ¥Ã¥Ô¥ó¥°¥Õ¥¡¥¤¥ë:</b> ¥­¡¼¥Þ¥Ã¥Ô¥ó¥°¥Õ¥¡¥¤¥ë¤Ïµ¯Æ°»þ¤ËÆɤ߹þ¤Þ¤ì¡¤X11 ¥­¡¼¥Þ¥Ã¥×¤ËÊÑ´¹¤µ¤ì¤Þ¤¹¡£Â¾¸À¸ì¤ËÂбþ¤·¤¿¥­¡¼¥Þ¥Ã¥Ô¥ó¥°¥Õ¥¡¥¤¥ë¤Ï <code>/System/Library/Keyboards</code> ¤Ë¤¢¤ê¤Þ¤¹¡£¡ÊÌõÃí¡§¥­¡¼¥Þ¥Ã¥Ô¥ó¥°¤Ç Japanese ¤òÁªÂò¤¹¤ë¤È¡¤°ìÉô¤Î¥­¡¼¤¬¸ú¤«¤Ê¤¤Åù¤ÎÉÔ¶ñ¹ç¤¬È¯À¸¤¹¤ë¤³¤È¤¬¤¢¤ê¤Þ¤¹¡£¤³¤Î¾ì¹ç¤Ï USA ¤òÁªÂò¤·¤¿¾å¤Ç ~/.Xmodmap ¤òŬÍѤ·¤Æ²¼¤µ¤¤¡£¡Ë</li>
+    <li><b>ºÇ½é¤Î X11 ¥¯¥é¥¤¥¢¥ó¥È¤Îµ¯Æ°:</b> XDarwin ¤¬ Finder¤«¤éµ¯Æ°¤¹¤ë»þ¡¤X ¥¦¥£¥ó¥É¥¦¥Þ¥Í¡¼¥¸¥ã¡¼¤È X ¥¯¥é¥¤¥¢¥ó¥È¤Îµ¯Æ°¤Ï <code>xinit</code> ¤ò¼Â¹Ô¤·¤Þ¤¹¡£¡Ê¾ÜºÙ¤Ï "<code>man xinit</code>" ¤ò»²¾È¤·¤Æ²¼¤µ¤¤¡£¡ËXDarwin ¤Ï <code>xinit</code> ¤ò¼Â¹Ô¤¹¤ëÁ°¤Ë¡¤»ØÄꤵ¤ì¤¿¥Ç¥£¥ì¥¯¥È¥ê¤ò¥æ¡¼¥¶¡¼¤Î¥Ñ¥¹¤ËÄɲä·¤Þ¤¹¡£¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï <code>/usr/X11R6/bin</code> ¤À¤±¤òÄɲä·¤Þ¤¹¡£Â¾¤Î¥Ç¥£¥ì¥¯¥È¥ê¤òÄɲä·¤¿¤¤¾ì¹ç¤Ï¡¤¥³¥í¥ó¤Ç¶èÀڤäƻØÄꤷ¤Þ¤¹¡£¥æ¡¼¥¶¡¼¤Î¥·¥§¥ë½é´ü²½¥Õ¥¡¥¤¥ë¤òÆɤ߹þ¤à¤¿¤á¤Ë¡¤X ¥¯¥é¥¤¥¢¥ó¥È¤Ï¥æ¡¼¥¶¡¼¤Î¥Ç¥Õ¥©¥ë¥È¥í¥°¥¤¥ó¥·¥§¥ë¤Çµ¯Æ°¤µ¤ì¤Þ¤¹¡£É¬ÍפǤ¢¤ì¤Ð¡¤Âå¤ï¤ê¤Î¥·¥§¥ë¤ò»ØÄꤹ¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</li>
+</ul>
+
+<h3>¥Õ¥ë¥¹¥¯¥ê¡¼¥ó</h3>
+<ul>
+    <li><b>¥­¡¼ÀßÄê¥Ü¥¿¥ó:</b> X11 ¤È Aqua ¤òÀÚ¤êÂؤ¨¤ë¤¿¤á¤Ë»ÈÍѤ¹¤ë¥Ü¥¿¥ó¤ÎÁȤ߹ç¤ï¤»¤ò»ØÄꤷ¤Þ¤¹¡£
+    ¥Ü¥¿¥ó¤ò¥¯¥ê¥Ã¥¯¤·¤Æ¡¤Ç¤°Õ¤Î¿ô¤Î½¤¾þ¥­¡¼¤Ë³¤¤¤ÆÄ̾ï¤Î¥­¡¼¤ò²¡¤·¤Þ¤¹¡£</li>
+    <li><b>¥É¥Ã¥¯¤Î¥¢¥¤¥³¥ó¤Î¥¯¥ê¥Ã¥¯¤Ç X11 ¤ËÌá¤ë:</b> ¥ª¥ó¤Î¾ì¹ç¡¤¥É¥Ã¥¯¤Ëɽ¼¨¤µ¤ì¤¿ XDarwin ¥¢¥¤¥³¥ó¤Î¥¯¥ê¥Ã¥¯¤Ç X11 ¤Ø¤ÎÀڤ괹¤¨¤¬²Äǽ¤È¤Ê¤ê¤Þ¤¹¡£Mac OS X ¤Î¤¤¤¯¤Ä¤«¤Î¥Ð¡¼¥¸¥ç¥ó¤Ç¤Ï¡¤¥É¥Ã¥¯¤Î¥¢¥¤¥³¥ó¤Î¥¯¥ê¥Ã¥¯¤Ç Aqua ¤ËÌá¤Ã¤¿»þ¡¤¥«¡¼¥½¥ë¤¬¾Ã¼º¤¹¤ë¤³¤È¤¬¤¢¤ê¤Þ¤¹¡£</li>
+    <li><b>µ¯Æ°»þ¤Ë¥Ø¥ë¥×¤òɽ¼¨¤¹¤ë:</b> XDarwin ¤¬¥Õ¥ë¥¹¥¯¥ê¡¼¥ó¥â¡¼¥É¤Çµ¯Æ°¤¹¤ë»þ¡¤¥¹¥×¥é¥Ã¥·¥å¥¹¥¯¥ê¡¼¥ó¤òɽ¼¨¤·¤Þ¤¹¡£</li>
+    <li><b>¿§¿¼ÅÙ:</b> ¥Õ¥ë¥¹¥¯¥ê¡¼¥ó¥â¡¼¥É¤Ç¤Ï¡¤X11 ¥Ç¥£¥¹¥×¥ì¥¤¤¬ Aqua ¤È°Û¤Ê¤ë¿§¿¼ÅÙ¤ò»È¤¦¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¡ÖÊѹ¹¤Ê¤·¡×¤¬»ØÄꤵ¤ì¤¿¾ì¹ç¡¤XDarwin ¤Ï Aqua ¤Ë¤è¤Ã¤Æ»ÈÍѤµ¤ì¤ë¿§¿¼ÅÙ¤ò»È¤¤¤Þ¤¹¡£¤³¤ì°Ê³°¤Ë 8¡¤15 ¤Þ¤¿¤Ï24 ¥Ó¥Ã¥È¤ò»ØÄꤹ¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</li>
+</ul>
+
+<h2>
+<a NAME="license">¥é¥¤¥»¥ó¥¹</a>
+</h2>
+XDarwin ¤Î¼çÍפʥ饤¥»¥ó¥¹¤ÏÅÁÅýŪ¤Ê MIT X11/X Consortium License ¤Ë´ð¤Å¤­¤Þ¤¹¡£
+¤½¤ì¤Ï½¤Àµ¤Þ¤¿¤ÏºÆÇÛÉÛ¤µ¤ì¤ë¥½¡¼¥¹¥³¡¼¥É¤Þ¤¿¤Ï¥Ð¥¤¥Ê¥ê¤Ë¡¤¤½¤ÎÃøºî¸¢/¥é¥¤¥»¥ó¥¹É½¼¨¤¬¤½¤Î¤Þ¤Þ»Ä¤µ¤ì¤ë¤³¤È¤òÍ׵᤹¤ë°Ê³°¤Î¾ò·ï¤ò¶¯À©¤·¤Þ¤»¤ó¡£
+¤è¤ê¿¤¯¤Î¾ðÊó¤È¡¤¥³¡¼¥É¤Î°ìÉô¤ò¥«¥Ð¡¼¤¹¤ëÄɲäÎÃøºî¸¢/¥é¥¤¥»¥ó¥¹É½¼¨¤Î¤¿¤á¤Ë¡¤¥½¡¼¥¹¥³¡¼¥É¤ò»²¾È¤·¤Æ²¼¤µ¤¤¡£
+<H3>
+<A NAME="3"></A>
+X  Consortium License</H3>
+<p>Copyright (C) 1996 X Consortium</p>
+<p>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:</p>
+<p>The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.</p>
+<p>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 X CONSORTIUM 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.</p>
+<p>Except as contained in this notice, the name of the X Consortium 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 X Consortium.</p>
+<p>X Window System is a trademark of X Consortium, Inc.</p>
+</body>
+</html>
diff --git a/hw/darwin/bundle/Portuguese.lproj/Credits.rtf b/hw/darwin/bundle/Portuguese.lproj/Credits.rtf
index 5cbac7433..8dcddc2f7 100644
--- a/hw/darwin/bundle/Portuguese.lproj/Credits.rtf
+++ b/hw/darwin/bundle/Portuguese.lproj/Credits.rtf
@@ -5,10 +5,20 @@
 \vieww5140\viewh4980\viewkind0
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
 
-\f0\fs24 \cf0 This product  includes software developed by The XFree86 Project, Inc  (http://www.xfree86.org/) and its contributors. The following people contributed to Darwin/Mac OS X support.\
+\f0\fs24 \cf0 This product includes software developed by The XFree86 Project, Inc  (http://www.xfree86.org/) and its contributors. The following people contributed to Darwin/Mac OS X support.\
 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
 
+\f1\b \cf0 Contributors to Xorg Foundation Release:
+\f0\b0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
+\cf0 Kaleb KEITHLEY\
+     
+\f2\i Working left and right Ctrl, Alt (Option), Meta (Command) and Shift keys.
+\f0\i0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
+
+\f1\b \cf0 \
 \f1\b \cf0 Contributors to XFree86 4.4:
 \f0\b0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
diff --git a/hw/darwin/bundle/Portuguese.lproj/MainMenu.nib/objects.nib b/hw/darwin/bundle/Portuguese.lproj/MainMenu.nib/objects.nib
index 6fc5aa2a3..9cb67cf89 100644
--- a/hw/darwin/bundle/Portuguese.lproj/MainMenu.nib/objects.nib
+++ b/hw/darwin/bundle/Portuguese.lproj/MainMenu.nib/objects.nib
diff --git a/hw/darwin/bundle/Portuguese.lproj/XDarwinHelp.html.cpp b/hw/darwin/bundle/Portuguese.lproj/XDarwinHelp.html.cpp
index 37502eac6..7ef1ba5d8 100644
--- a/hw/darwin/bundle/Portuguese.lproj/XDarwinHelp.html.cpp
+++ b/hw/darwin/bundle/Portuguese.lproj/XDarwinHelp.html.cpp
@@ -1,20 +1,14 @@
-<!-- $XFree86: xc/programs/Xserver/hw/darwin/bundle/Portuguese.lproj/XDarwinHelp.html.cpp,v 1.1 2002/01/25 06:46:46 torrey Exp $ --><html><body>
-
-#include "xf86Version.h"
-#ifndef PRE_RELEASE
-#define PRE_RELEASE XF86_VERSION_SNAP
-#endif
-
+<!-- $XFree86: xc/programs/Xserver/hw/darwin/bundle/English.lproj/XDarwinHelp.html.cpp,v 1.2 2001/11/04 07:02:28 torrey Exp $ --><html><body>
 
 <head>
-<title>XFree86 para Mac OS X</title>
+<title>XDarwin Help</title>
 </head>
 
 <center>
     
-  <h1>XFree86 para Darwin e Mac OS X</h1>
-    XFree86 XF86_VERSION<br>
-    Release Date: XF86_REL_DATE
+  <h1>XDarwin X Server para Mac OS X</h1>
+    X_VENDOR_NAME X_VERSION<br>
+    Release Date: X_REL_DATE
 </center>
 <h2>&Iacute;ndice</h2>
 <ol>
@@ -28,29 +22,32 @@
 <center>
     <h2><a NAME="notice">Notas importantes</a></h2>
 </center>
-<blockquote> #if PRE_RELEASE Essa &eacute; uma vers&atilde;o pr&eacute;-lancamento 
-  do XFree86, e ela n&atilde;o &eacute; suportada de nenhuma forma. Bugs podem 
+<blockquote>
+#if PRE_RELEASE
+  Essa &eacute; uma vers&atilde;o pr&eacute;-lancamento 
+  do XDarwin, e ela n&atilde;o &eacute; suportada de nenhuma forma. Bugs podem 
   ser reportados e corre&ccedil;&otilde;es podem ser enviadas para <A HREF="http://sourceforge.net/projects/xonx/">P&aacute;gina 
   do projeto XonX</A> no SourceForge. Antes de informar bugs em vers&otilde;es 
   pr&eacute;-lancamento, por favor verifique a þltima vers&atilde;o em <A HREF="http://sourceforge.net/projects/xonx/">XonX</A> 
-  or no <A HREF="http://www.XFree86.Org/cvs">Reposit&oacute;rio CVS do XFree86</A>. 
-  #else Se o servidor &eacute; mais velho que 6-12 semanas, ou seu hardware &eacute; 
+  or X_VENDOR_LINK. 
+#else
+Se o servidor &eacute; mais velho que 6-12 semanas, ou seu hardware &eacute; 
   mais novo que a data acima, procure por uma nova vers&atilde;o antes de informar 
   problemas. Bugs podem ser reportados e corre&ccedil;&otilde;es podem ser enviadas 
   para a <A HREF="http://sourceforge.net/projects/xonx/">P&aacute;gina do projeto 
-  XonX</A> na SourceForge. #endif </blockquote>
+  XonX</A> na SourceForge.
+#endif
+</blockquote>
 <blockquote> Este software &eacute; distribu&iacute;do sob os termos da <a href="#license">licen&ccedil;a 
   MIT X11 / X Consortium</a> e &eacute; provido, sem nenhuma garantia. Por favor 
   leia a <a href="#license">Licen&ccedil;a</a> antes de come&ccedil;ar a usar 
   o programa.</blockquote>
 
 <h2><a NAME="usage">Uso</a></h2>
-<p>O XFree86 &eacute; uma aplica&ccedil;&atilde;o &quot;open-source&quot; livremente 
+<p>O XDarwin &eacute; uma X server &quot;open-source&quot; livremente 
   redistribu&iacute;da do <a HREF
-="http://www.x.org/">Sistema X Window</a> produzido pelo <a HREF="http://www.XFree86.Org/">XFree86 
-  Project, Inc.</a> O servidor X window para o Darwin e Mac OS X provido pelo 
-  XFree86 &eacute; chamado XDarwin. XDarwin roda sobre Mac OS X no modo Tela Cheia 
-  ou no modo Compartilhado.</p>
+="http://www.x.org/">Sistema X Window</a>. This version of XDarwin was produced by the X_VENDOR_LINK.
+  XDarwin roda sobre Mac OS X no modo Tela Cheia ou no modo Compartilhado.</p>
 <p>No modo Tela Cheia, quando o sistema X window est&aacute; ativo, ele ocupa 
   a tela toda. Voc&ecirc; pode voltar ao desktop do Mac OS X clicando Command-Option-A. 
   Essa combina&ccedil;&atilde;o de teclas pode ser mudada nas prefer&ecirc;ncias. 
@@ -90,7 +87,7 @@
   do usu&aacute;rio corrente. (Um shell alternativo pode ser tamb&eacute;m expecificado 
   nas prefer&ecirc;ncias.) O modo para ajustar o path depende do shell que voc&ecirc; 
   est&aacute; usando. Isto &eacute; descrito na man page do seu shell.</p>
-<p>Voc&ecirc; pode tamb&eacute;m querer adicionar as man pages do XFree86 para 
+<p>Voc&ecirc; pode tamb&eacute;m querer adicionar as man pages do X11 para 
   a lista de p&aacute;ginas a serem procuradas quando voc&ecirc; est&aacute; procurando 
   por documenta&ccedil;&atilde;o. As man pages do X11 est&atilde;o localizadas 
   em <code>/usr/X11R6/man</code> e a vari&aacute;vel de ambiente <code>MANPATH</code> 
@@ -178,15 +175,13 @@
 </ul>
 
 <h2><a NAME="license">Licen&ccedil;a</a></h2>
-<p>O projeto XFree86 &eacute; designado a prover e a ser livremente redistribu&iacute;do 
-  as vers&otilde;es bin&aacute;rias e souce (c&oacute;digo-fonte). A licen&ccedil;a 
-  principal n&oacute;s usamos uma baseada na licen&ccedil;a tradicional MIT X11 
+<p>A licen&ccedil;a 
+  principal n&oacute;s por XDarwin baseada na licen&ccedil;a tradicional MIT X11 
   / X Consortium, que n&atilde;o imp&otilde;e nenhuma condi&ccedil;&atilde;o sobre 
   modifica&ccedil;&otilde;es ou redistribui&ccedil;&atilde;o do c&oacute;digo-fonte 
   ou dos bin&aacute;rios desde que o copyright/licen&ccedil;a sejam mantidos intactos. 
   Para mais informa&ccedil;&otilde;es e not&iacute;cias adicionais de copyright/licensing 
-  em algumas se&ccedil;&atilde;o do c&oacute;digo, por favor visite a <a href="http://www.xfree86.org/legal/licence.html">p&aacute;gina 
-  de licen&ccedil;as do XFree86</a>.</p>
+  em algumas se&ccedil;&atilde;o do c&oacute;digo, por favor refer to the source code.</p>
 <H3><A NAME="3"></A>Licen&ccedil;a do X Consortium</H3>
 <p>Copyright (C) 1996 X Consortium</p>
 <p>Permiss&otilde;es s&atilde;o em virtude garantidas, livre de mudan&ccedil;as, 
diff --git a/hw/darwin/bundle/Spanish.lproj/Credits.rtf b/hw/darwin/bundle/Spanish.lproj/Credits.rtf
index 2bf7a8eaf..34408e78c 100644
--- a/hw/darwin/bundle/Spanish.lproj/Credits.rtf
+++ b/hw/darwin/bundle/Spanish.lproj/Credits.rtf
@@ -5,10 +5,20 @@
 \vieww5160\viewh6300\viewkind0
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
 
-\f0\fs24 \cf0 This product  includes software developed by The XFree86 Project, Inc  (http://www.xfree86.org/) and its contributors. The following people contributed to Darwin/Mac OS X support.\
+\f0\fs24 \cf0 This product includes software developed by The XFree86 Project, Inc  (http://www.xfree86.org/) and its contributors. The following people contributed to Darwin/Mac OS X support.\
 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
 
+\f1\b \cf0 Contributors to Xorg Foundation Release:
+\f0\b0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
+\cf0 Kaleb KEITHLEY\
+     
+\f2\i Working left and right Ctrl, Alt (Option), Meta (Command) and Shift keys.
+\f0\i0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
+
+\f1\b \cf0 \
 \f1\b \cf0 Contributors to XFree86 4.4:
 \f0\b0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
diff --git a/hw/darwin/bundle/Spanish.lproj/MainMenu.nib/objects.nib b/hw/darwin/bundle/Spanish.lproj/MainMenu.nib/objects.nib
index 0a6953c69..2df75ee0c 100644
--- a/hw/darwin/bundle/Spanish.lproj/MainMenu.nib/objects.nib
+++ b/hw/darwin/bundle/Spanish.lproj/MainMenu.nib/objects.nib
diff --git a/hw/darwin/bundle/Spanish.lproj/XDarwinHelp.html.cpp b/hw/darwin/bundle/Spanish.lproj/XDarwinHelp.html.cpp
index 3e0710a2c..5cd27862d 100644
--- a/hw/darwin/bundle/Spanish.lproj/XDarwinHelp.html.cpp
+++ b/hw/darwin/bundle/Spanish.lproj/XDarwinHelp.html.cpp
@@ -1,19 +1,14 @@
-<!-- $XFree86: xc/programs/Xserver/hw/darwin/bundle/Spanish.lproj/XDarwinHelp.html.cpp,v 1.2 2001/12/30 03:52:27 torrey Exp $ -->
-
-#include "xf86Version.h"
-#ifndef PRE_RELEASE
-#define PRE_RELEASE XF86_VERSION_SNAP
-#endif
+<!-- $XFree86: xc/programs/Xserver/hw/darwin/bundle/English.lproj/XDarwinHelp.html.cpp,v 1.2 2001/11/04 07:02:28 torrey Exp $ -->
 
 <html>
 <head>
-<title>XFree86 para Mac OS X</title>
+<title>XDarwin Ayuda</title>
 </head>
 <body>
 <center>
-    <h1>XFree86 en Darwin y Mac OS X</h1>
-    XFree86 XF86_VERSION<br>
-    Fecha de release: XF86_REL_DATE
+    <h1>XDarwin X Server for Mac OS X</h1>
+    X_VENDOR_NAME X_VERSION<br>
+    Fecha de release: X_REL_DATE
 </center>
 <h2>Contenido</h2>
 <ol>
@@ -28,7 +23,7 @@
 </center>
 <blockquote>
 #if PRE_RELEASE
-Esta es una versi&oacuten pre-release de XFree86, y no tiene ning&uacuten soporte. Patches y reportes de error pueden ser enviados a la <A HREF="http://sourceforge.net/projects/xonx/">p&aacutegina del proyecto XonX</A> en SourceForge.  Antes de reportar errores en versiones pre-release, por favor verifique la ultima versi&oacuten en <A HREF="http://sourceforge.net/projects/xonx/">XonX</A> o bien en el <A HREF="http://www.XFree86.Org/cvs">repositorio CVS de XFree86</A>.
+Esta es una versi&oacuten pre-release de XDarwin, y no tiene ning&uacuten soporte. Patches y reportes de error pueden ser enviados a la <A HREF="http://sourceforge.net/projects/xonx/">p&aacutegina del proyecto XonX</A> en SourceForge.  Antes de reportar errores en versiones pre-release, por favor verifique la ultima versi&oacuten en <A HREF="http://sourceforge.net/projects/xonx/">XonX</A> o bien el X_VENDOR_LINK.
 #else
 Si el server el m&aacutes antiguo que 6 a 12 meses, o si su hardware es posterior a la fecha indicada m&aacutes arriba, por favor verifique la &uacuteltima versi&oacuten antes de reportar problemas. Patches y reportes de error pueden ser enviados a la <A HREF="http://sourceforge.net/projects/xonx/">p&aacutegina del proyecto XonX</A> en SourceForge.
 #endif
@@ -37,8 +32,8 @@ Si el server el m&aacutes antiguo que 6 a 12 meses, o si su hardware es posterio
 Este software es distribuido bajo los t&eacuterminos de la <A HREF="#license">Licencia MIT X11 / X Consortium</A> y es provisto sin garant&iacutea alguna y en el estado en que se encuentra. Por favor lea la <A HREF="#license">Licencia</A> antes de utilizarlo.</blockquote>
 
 <h2><a NAME="usage">Modo de uso</a></h2>
-<p>XFree86 es una implementaci&oacuten open-source de distribuci&oacuten libre del <a HREF
-="http://www.x.org/">X Window System</a> producido por <a HREF="http://www.XFree86.Org/">XFree86 Project, Inc.</a> El window server para Darwin y Mac OS X provisto por XFree86 se llama XDarwin. XDarwin funciona en Mac OS X en modo pantalla completa o en modo rootless (integrado al escritorio).</p>
+<p>XDarwin es una X server open-source de distribuci&oacuten libre del <a HREF
+="http://www.x.org/">X Window System</a>. This version of XDarwin was produced by the X_VENDOR_LINK. XDarwin funciona en Mac OS X en modo pantalla completa o en modo rootless (integrado al escritorio).</p>
 <p>En modo pantalla completa, el X window system toma control total de la pantalla mientras esta activo. Presionando Command-Option-A  puede regresar al Escritorio de Mac OS X. Esta combinaci&oacuten de teclas puede cambiarse en las Preferencias de Usuario. Desde el Escritorio de Mac OS X, haga click en &iacutecono de XDarwin en el Dock para volver al X window system.  (Puede cambiar esta comportamiento en las Preferencias de Usuario y configurar que XDarwin vuelva al X window system haciendo click en la ventana flotante con el logo X.)</p>
 <p>En modo rootless, el X window system comparte la pantalla con Aqua. La ventana root de X11 es del tama&ntildeo de la pantalla y contiene a todas las dem&aacutes ventanas. La ventana root de X11 no se muestra en este modo, ya que Aqua maneja el fondo de pantalla.</p>
 <h3>Emulaci&oacuten de mouse multi-bot&oacuten</h3>
@@ -47,7 +42,7 @@ Este software es distribuido bajo los t&eacuterminos de la <A HREF="#license">Li
 <h2><a NAME="path">Configurando su Path</a></h2>
 <p>El path es la lista de directorios donde se buscar&aacuten los comandos ejecutables. Los comandos de X11 se encuentran en  <code>/usr/X11R6/bin</code>, y &eacuteste necesita estar dentro de su path. XDarwin hace &eacutesto autom&aacuteticamente por defecto, y puede adem&aacutes agregar directorios adicionales donde tenga otros comandos de l&iacutenea.</p>
 <p>Usuarios experimentados pueden tener su path correctamente configurado mediante los archivos de inicio de su interprete de comandos.  En este caso, puede informarle a XDarwin en las Preferencias de Usuario para que no modifique su path. XDarwin arrancar&aacute los clientes X11 iniciales usando el int&eacuterprete de comandos del usuario, seg&uacuten su configuraci&oacuten de login. Un int&eacuterprete de comandos alternativo puede ser especificado en las Preferencias del Usuario. La manera de configurar el path de su int&eacuterprete de comandos depende de cual est&aacute usando, y es generalmente descripta en las p&aacuteginas man del mismo.</p>
-<p>Adem&aacutes, Ud. puede agregar las p&aacuteginas man de XFree86 a la lista de p&aacuteginas que son consultadas. Estas est&aacuten ubicadas en <code>/usr/X11R6/man</code> y <code>MANPATH</code> es la variable de entorno que contiene los directorios que son consultados.</p>
+<p>Adem&aacutes, Ud. puede agregar las p&aacuteginas man de X11 a la lista de p&aacuteginas que son consultadas. Estas est&aacuten ubicadas en <code>/usr/X11R6/man</code> y <code>MANPATH</code> es la variable de entorno que contiene los directorios que son consultados.</p>
 
 <h2><a NAME="prefs">Preferencias del Usuario</a></h2>
 <p>Ciertas opciones pueden definirse dentro de "Preferencias...", en el men&uacute de XDarwin. Las opciones dentro de de "Inicio" no surtir&aacuten efecto hasta que la aplicaci&oacuten se reinicie. Las restantes opciones surten efecto inmediatamente. Las diferentes opciones se describen a continuaci&oacuten:</p>
@@ -75,7 +70,7 @@ Este software es distribuido bajo los t&eacuterminos de la <A HREF="#license">Li
 </ul>
 
 <h2><a NAME="license">Licencia</a></h2>
-El XFree86 Project esta comprometido en proveer versiones binarias y en c&oacutedigo fuente de distribuci&oacuten libre. La licencia principal que utilizamos es una basada en la Licencia MIT X11 tradicional, que no impone condiciones a la modificaci&oacuten o redistribuci&oacuten del c&oacutedigo fuente o de archivos binarios m&aacutes all&aacute de requerir que los mensajes de Licencia y Copyright se mantengan intactos. Para mayor informaci&oacuten y para mensajes adicionales de Licencia y Copyright que cubren algunas secciones del c&oacutedigo fuente, por favor consulte la <A HREF="http://www.xfree86.org/legal/licence.html">P&aacutegina de Licencia de XFree86</A>.
+La licencia principal de XDarwin es basada en la Licencia MIT X11 tradicional, que no impone condiciones a la modificaci&oacuten o redistribuci&oacuten del c&oacutedigo fuente o de archivos binarios m&aacutes all&aacute de requerir que los mensajes de Licencia y Copyright se mantengan intactos. Para mayor informaci&oacuten y para mensajes adicionales de Licencia y Copyright que cubren algunas secciones del c&oacutedigo fuente, por favor consulte the source code.
 <H3><A NAME="3"></A>Licencia del X Consortium</H3>
 <p>Copyright (C) 1996 X Consortium</p>
 <p>Se otorga aqui permiso, libre de costo, a toda persona que obtenga una copia de este Software y los archivos de documentaci&oacuten asociados (el "Software"),
diff --git a/hw/darwin/bundle/Swedish.lproj/Credits.rtf b/hw/darwin/bundle/Swedish.lproj/Credits.rtf
index 2bf7a8eaf..34408e78c 100644
--- a/hw/darwin/bundle/Swedish.lproj/Credits.rtf
+++ b/hw/darwin/bundle/Swedish.lproj/Credits.rtf
@@ -5,10 +5,20 @@
 \vieww5160\viewh6300\viewkind0
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
 
-\f0\fs24 \cf0 This product  includes software developed by The XFree86 Project, Inc  (http://www.xfree86.org/) and its contributors. The following people contributed to Darwin/Mac OS X support.\
+\f0\fs24 \cf0 This product includes software developed by The XFree86 Project, Inc  (http://www.xfree86.org/) and its contributors. The following people contributed to Darwin/Mac OS X support.\
 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
 
+\f1\b \cf0 Contributors to Xorg Foundation Release:
+\f0\b0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
+\cf0 Kaleb KEITHLEY\
+     
+\f2\i Working left and right Ctrl, Alt (Option), Meta (Command) and Shift keys.
+\f0\i0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
+
+\f1\b \cf0 \
 \f1\b \cf0 Contributors to XFree86 4.4:
 \f0\b0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
diff --git a/hw/darwin/bundle/Swedish.lproj/MainMenu.nib/objects.nib b/hw/darwin/bundle/Swedish.lproj/MainMenu.nib/objects.nib
index 116e0b316..3157d72cb 100644
--- a/hw/darwin/bundle/Swedish.lproj/MainMenu.nib/objects.nib
+++ b/hw/darwin/bundle/Swedish.lproj/MainMenu.nib/objects.nib
diff --git a/hw/darwin/bundle/Swedish.lproj/XDarwinHelp.html.cpp b/hw/darwin/bundle/Swedish.lproj/XDarwinHelp.html.cpp
index ee099d1a0..4210878c0 100644
--- a/hw/darwin/bundle/Swedish.lproj/XDarwinHelp.html.cpp
+++ b/hw/darwin/bundle/Swedish.lproj/XDarwinHelp.html.cpp
@@ -1,19 +1,14 @@
-<!-- $XFree86: xc/programs/Xserver/hw/darwin/bundle/Swedish.lproj/XDarwinHelp.html.cpp,v 1.2 2001/11/07 22:43:27 torrey Exp $ -->
-
-#include "xf86Version.h"
-#ifndef PRE_RELEASE
-#define PRE_RELEASE XF86_VERSION_SNAP
-#endif
+<!-- $XFree86: xc/programs/Xserver/hw/darwin/bundle/English.lproj/XDarwinHelp.html.cpp,v 1.2 2001/11/04 07:02:28 torrey Exp $ -->
 
 <html>
 <head>
-<title>XFree86 f&ouml;r Mac OS X</title>
+<title>XDarwin Help</title>
 </head>
 <body>
 <center>
-    <h1>XFree86 f&ouml;r Darwin och Mac OS X</h1>
-    XFree86 XF86_VERSION<br>
-    F&auml;rdigst&auml;llt: XF86_REL_DATE
+    <h1>XDarwin X Server for Mac OS X</h1>
+    X_VENDOR_NAME X_VERSION<br>
+    F&auml;rdigst&auml;llt: X_REL_DATE
 </center>
 <h2>Inneh&aring;ll</h2>
 <ol>
@@ -28,7 +23,7 @@
 </center>
 <blockquote>
 #if PRE_RELEASE
-Detta &auml;r en testversion av XFree86, och du kan inte garranteras n&aring;gon som helst support f&ouml;r den. Buggar och fel kan rapporteras och f&ouml;rslag till fixar kan skickas till <A HREF="http://sourceforge.net/projects/xonx/">XonX-projektets sida</A> p&aring; SourceForge.  Innan du rapporterar buggar i testversioner, var god pr&ouml;va den senaste versionen fr&aring;n <A HREF="http://sourceforge.net/projects/xonx/">XonX</A> eller i <A HREF="http://www.XFree86.Org/cvs">XFree86 CVS-arkiv</A>.
+Detta &auml;r en testversion av XDarwin, och du kan inte garranteras n&aring;gon som helst support f&ouml;r den. Buggar och fel kan rapporteras och f&ouml;rslag till fixar kan skickas till <A HREF="http://sourceforge.net/projects/xonx/">XonX-projektets sida</A> p&aring; SourceForge.  Innan du rapporterar buggar i testversioner, var god pr&ouml;va den senaste versionen fr&aring;n <A HREF="http://sourceforge.net/projects/xonx/">XonX</A> eller i X_VENDOR_LINK.
 #else
 Om servern &auml;r &auml;ldre &auml;n 6-12 m&aring;nader, eller om din h&aring;rdvara &auml;r nyare &auml;n datumet ovan, leta efter en nyare version innan du rapporterar fel. Buggar och fel kan rapporteras och f&ouml;rslag till fixar kan skickas till <A HREF="http://sourceforge.net/projects/xonx/">XonX-projektets sida</A> p&aring; SourceForge.
 #endif
@@ -37,8 +32,8 @@ Om servern &auml;r &auml;ldre &auml;n 6-12 m&aring;nader, eller om din h&aring;r
 Denna programvara distrubueras i enlighet med <A HREF="#license">MIT X11 / X Consortium License</A> och tilhandh&aring;lls som den &auml;r, helt utan garantier. Var god l&auml;s igenom <A HREF="#license">licensdokumentet (engelska)</A> innan du anv&auml;nder programmet.</blockquote>
 
 <h2><a NAME="usage">Anv&auml;ndande</a></h2>
-<p>XFree86 &auml;r en fritt spridd implemenation av <a HREF
-="http://www.x.org/">X Window-systemet</a> producerad av <a HREF="http://www.XFree86.Org/">XFree86 Project, Inc</a>, med &ouml;ppen k&auml;llkod. Den X Window-server f&ouml;r Darwin och Mac OS X som tillhandah&aring;lls av XFree86 kallas XDarwin. XDarwin kan k&ouml;ras p&aring; Mac OS X i fullsk&auml;rmsl&auml;ge eller rotl&ouml;st l&auml;ge.</p>
+<p>XDarwin &auml;r en fritt spridd X server av <a HREF
+="http://www.x.org/">X Window-systemet</a>. This version of XDarwin was produced by the X_VENDOR_LINK. XDarwin kan k&ouml;ras p&aring; Mac OS X i fullsk&auml;rmsl&auml;ge eller rotl&ouml;st l&auml;ge.</p>
 <p>I fullsk&auml;rmsl&auml;ge kommer X window-systemet att ta &ouml;ver hela sk&auml;rmen n&auml;r det &auml;r aktivt. Du kan byta tillbaka till Mac OS Xs skrivbord genom att trycka Kommando-Alt-A. Denna tangentkombination kan &auml;ndra i inst&auml;llningarna. N&auml;r du &auml;r p&aring; Mac OS Xs skrivbord kan du klicka p&aring; XDarwin-ikonen i dockan f&ouml;r att byta tillbaka till X Window-systemet. (Du kan f&ouml;r&auml;ndra detta beteende i inst&auml;llningarna s&aring; att du ist&auml;llet m&aring;ste klicka i det fltande bytesf&ouml;nstret ist&auml;llet.)</p>
 <p>I rotl&ouml;stl&auml;ge delar X11 och Aqua p&aring; din sk&auml;rm. Rotf&ouml;nstret p&aring; X11-sk&auml;rmen &auml;r av samma storlek som hela sk&auml;rmen och inneh&aring;ller alla andra f&ouml;nster - det fungerar som bakgrund. I rotl&ouml;stl&auml;ge visas inte detta rotf&ouml;nster, eftersom Aqua hanterar skrvbordbakgrunden.</p>
 
@@ -49,7 +44,7 @@ Denna programvara distrubueras i enlighet med <A HREF="#license">MIT X11 / X Con
 <p>Din s&ouml;kv&auml;g &auml;r en lista av kataloger som s&ouml;ks igenom n&auml;r terminalen letar efter kommandon att exekvera. Kommandon som h&ouml;r till X11 ligger i <code>/usr/X11R6/bin</code>, en katalog som inte ligger i din s&ouml;kv&auml;g fr&aring;n b&ouml;rjan. XDarwin l&auml;gger till denna katalog &aring;t dig, och du kan ocks&aring; l&auml;gga till ytterligare kataloger i vilka du lagt program som skall k&ouml;ras fr&aring;n kommandoraden.</p>
 <p>Mer erfarna anv&auml;ndare har antagligen redan st&auml;llt in sin s&ouml;kv&auml;g i skalets inst&auml;llningsfiler. Om detta g&auml;ller dig  kan st&auml;lla in XDarwin s&aring; att din s&ouml;kv&auml;g inte modifieras. XDarwin startar de f&ouml;rsta X11-klienterna i anv&auml;ndarens inloggningsskal (Vill du anv&auml;nda ett alternativt skall, kan du specificera detta i inst&auml;llningarna). Hur du st&auml;ller in din s&ouml;kv&auml;g beror p&aring; vilket skal du anv&auml;nder. Exakt hur beskrivs i skalets man-sidor.</p>
 
-<p>Ut&ouml;ver detta kan du ocks&aring; vilja l&auml;gga till XFree86s man-sidor (dokumentation) till listan &auml;ver sidor som som skall s&ouml;kas n&auml;r du vill l&auml;sa efter dokumentationen. X11s man-sidor ligger i <code>/usr/X11R6/man</code> och listan &auml;ver kataloger att s&ouml;ka best&auml;mms av variabeln<code>MANPATH</code>.</p>
+<p>Ut&ouml;ver detta kan du ocks&aring; vilja l&auml;gga till X11s man-sidor (dokumentation) till listan &auml;ver sidor som som skall s&ouml;kas n&auml;r du vill l&auml;sa efter dokumentationen. X11s man-sidor ligger i <code>/usr/X11R6/man</code> och listan &auml;ver kataloger att s&ouml;ka best&auml;mms av variabeln<code>MANPATH</code>.</p>
 
 <h2><a NAME="prefs">Inst&auml;llningar</a></h2>
 <p>I inst&auml;llningarna finns ett antal alternativ d&auml;r du kan p&aring;verka hur XDarwin beter sig i vissa fall. Inst&auml;llningarna kommer du till genom att v&auml;lja "Inst&auml;llningar..." i menyn "XDarwin". De alternativ som finns under fliken "Starta" tr&auml;der inte i kraft f&ouml;rr&auml;n du startat om programmet. Alla andra alternativ tr&auml;der i kraft omedelbart. De olika alternativen beskrivs nedan:</p>
@@ -77,10 +72,10 @@ Denna programvara distrubueras i enlighet med <A HREF="#license">MIT X11 / X Con
 </ul>
 
 <h2><a NAME="license">Licens (svenska)</a></h2>
-<p>XFree86-projektet &aring;tar sig att tillhandah&aring;lla programvara och k&auml;llkod i format som fritt kan spridas vidare. Den huvudsakliga licens vi anv&auml;nder oss av &auml;r baserad p&aring; den traditionella MIT X11 / XConsortium-licensen, vilken inte p&aring; n&aring;got s&auml;tt begr&auml;nsar f&ouml;r&auml;ndringar eller vidarespridning av vare sig k&auml;llkod eller kompilerad programvara annat &auml;n genom att kr&auml;va att delarna som r&ouml;r copyright och licensiering l&auml;mnas intakta. F&ouml;r mer information och ytterligare copyright/licensieringsinfromation r&ouml;rande vissa speciella delar av koden, se <A HREF="http://www.xfree86.org/legal/licence.html">XFree86-licenssida</A> (engelska).</p>
+<p>Den huvudsakliga licens vi anv&auml;nder oss av &auml;r baserad p&aring; den traditionella MIT X11 / XConsortium-licensen, vilken inte p&aring; n&aring;got s&auml;tt begr&auml;nsar f&ouml;r&auml;ndringar eller vidarespridning av vare sig k&auml;llkod eller kompilerad programvara annat &auml;n genom att kr&auml;va att delarna som r&ouml;r copyright och licensiering l&auml;mnas intakta. F&ouml;r mer information och ytterligare copyright/licensieringsinfromation r&ouml;rande vissa speciella delar av koden, se the source code.</p>
 
 <h3>Licence (english)</h3>
-<p>The XFree86 Project is committed to providing freely redistributable binary and source releases. The main license we use is one based on the traditional MIT X11 / X Consortium License, which does not impose any conditions on modification or redistribution of source code or binaries other than requiring that copyright/license notices are left intact. For more information and additional copyright/licensing notices covering some sections of the code, please see the <A HREF="http://www.xfree86.org/legal/licence.html">XFree86 License page</A>.</p>
+<p>The main license for XDarwin is based on the traditional MIT X11 / X Consortium License, which does not impose any conditions on modification or redistribution of source code or binaries other than requiring that copyright/license notices are left intact. For more information and additional copyright/licensing notices covering some sections of the code, please refer to the source code.</p>
 
 <H3><A NAME="3"></A>X Consortium License</H3>
 <p>Copyright (C) 1996 X Consortium</p>
diff --git a/hw/darwin/bundle/XDarwin.icns b/hw/darwin/bundle/XDarwin.icns
index 31dc1bdf9..9c560846e 100644
--- a/hw/darwin/bundle/XDarwin.icns
+++ b/hw/darwin/bundle/XDarwin.icns
diff --git a/hw/darwin/bundle/ko.lproj/Credits.rtf b/hw/darwin/bundle/ko.lproj/Credits.rtf
index 2bf7a8eaf..34408e78c 100644
--- a/hw/darwin/bundle/ko.lproj/Credits.rtf
+++ b/hw/darwin/bundle/ko.lproj/Credits.rtf
@@ -5,10 +5,20 @@
 \vieww5160\viewh6300\viewkind0
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
 
-\f0\fs24 \cf0 This product  includes software developed by The XFree86 Project, Inc  (http://www.xfree86.org/) and its contributors. The following people contributed to Darwin/Mac OS X support.\
+\f0\fs24 \cf0 This product includes software developed by The XFree86 Project, Inc  (http://www.xfree86.org/) and its contributors. The following people contributed to Darwin/Mac OS X support.\
 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
 
+\f1\b \cf0 Contributors to Xorg Foundation Release:
+\f0\b0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
+\cf0 Kaleb KEITHLEY\
+     
+\f2\i Working left and right Ctrl, Alt (Option), Meta (Command) and Shift keys.
+\f0\i0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
+
+\f1\b \cf0 \
 \f1\b \cf0 Contributors to XFree86 4.4:
 \f0\b0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
diff --git a/hw/darwin/bundle/ko.lproj/MainMenu.nib/objects.nib b/hw/darwin/bundle/ko.lproj/MainMenu.nib/objects.nib
index ab141ba99..8f9b5e01c 100644
--- a/hw/darwin/bundle/ko.lproj/MainMenu.nib/objects.nib
+++ b/hw/darwin/bundle/ko.lproj/MainMenu.nib/objects.nib
diff --git a/hw/darwin/bundle/ko.lproj/XDarwinHelp.html.cpp b/hw/darwin/bundle/ko.lproj/XDarwinHelp.html.cpp
index 4c83fe278..5996285ae 100644
--- a/hw/darwin/bundle/ko.lproj/XDarwinHelp.html.cpp
+++ b/hw/darwin/bundle/ko.lproj/XDarwinHelp.html.cpp
@@ -1,19 +1,14 @@
-<!-- $XFree86: xc/programs/Xserver/hw/darwin/bundle/ko.lproj/XDarwinHelp.html.cpp,v 1.1 2001/12/04 03:36:39 torrey Exp $ -->
-
-#include "xf86Version.h"
-#ifndef PRE_RELEASE
-#define PRE_RELEASE XF86_VERSION_SNAP
-#endif
+<!-- $XFree86: xc/programs/Xserver/hw/darwin/bundle/English.lproj/XDarwinHelp.html.cpp,v 1.1 2001/05/21 01:42:17 torrey Exp $ -->
 
 <html>
 <head>
-<title>XFree86 for Mac OS X</title>
+<title>XDarwin Help</title>
 </head>
 <body>
 <center>
-    <h1>XFree86 on Darwin and Mac OS X</h1>
-    XFree86 XF86_VERSION<br>
-    Release Date: XF86_REL_DATE
+    <h1>XDarwin X Server for Mac OS X</h1>
+    X_VENDOR_NAME X_VERSION<br>
+    Release Date: X_REL_DATE
 </center>
 <h2>Contents</h2>
 <ol>
@@ -27,8 +22,8 @@
     <h2><a NAME="notice">Important Notice</a></h2>
 </center>
 <blockquote>
-#if PRE_RELEASE
-This is a pre-release version of XFree86, and is not supported in any way. Bugs may be reported and patches may be submitted to the <A HREF="http://sourceforge.net/projects/xonx/">XonX project page</A> at SourceForge.  Before reporting bugs in pre-release versions, please check the latest version from <A HREF="http://sourceforge.net/projects/xonx/">XonX</A> or in the <A HREF="http://www.XFree86.Org/cvs">XFree86 CVS repository</A>.
+#if X_PRE_RELEASE
+This is a pre-release version of XDarwin, and is not supported in any way. Bugs may be reported and patches may be submitted to the <A HREF="http://sourceforge.net/projects/xonx/">XonX project page</A> at SourceForge.  Before reporting bugs in pre-release versions, please check the latest version from <A HREF="http://sourceforge.net/projects/xonx/">XonX</A> or the X_VENDOR_LINK.
 #else
 If the server is older than 6-12 months, or if your hardware is newer than the above date, look for a newer version before reporting problems. Bugs may be reported and patches may be submitted to the <A HREF="http://sourceforge.net/projects/xonx/">XonX project page</A> at SourceForge.
 #endif
@@ -37,8 +32,7 @@ If the server is older than 6-12 months, or if your hardware is newer than the a
 This software is distributed under the terms of the <A HREF="#license">MIT X11 / X Consortium License</A> and is provided AS IS, with no warranty. Please read the <A HREF="#license">License</A> before using.</blockquote>
 
 <h2><a NAME="usage">Usage</a></h2>
-<p>XFree86 is a freely redistributable open-source implementation of the <a HREF
-="http://www.x.org/">X Window System</a> produced by the <a HREF="http://www.XFree86.Org/">XFree86 Project, Inc.</a> The X window server for Darwin and Mac OS X provided by XFree86 is called XDarwin. XDarwin runs on Mac OS X in full screen or rootless modes.</p>
+<p>XDarwin is a freely redistributable open-source X server for the <a HREF="http://www.x.org/">X Window System</a>. This version of XDarwin was produced by the X_VENDOR_LINK. XDarwin runs on Mac OS X in full screen or rootless modes.</p>
 <p>In full screen mode, when the X window system is active, it takes over the entire screen. You can switch back to the Mac OS X desktop by holding down Command-Option-A. This key combination can be changed in the user preferences. From the Mac OS X desktop, click on the XDarwin icon in the Dock to switch back to the X window system.  (You can change this behavior in the user preferences so that you must click the XDarwin icon in the floating switch window instead.)</p>
 <p>In rootless mode, the X window system and Aqua share your display. The root window of the X11 display is the size of the screen and contains all the other windows. The X11 root window is not displayed in rootless mode as Aqua handles the desktop background.</p>
 <h3>Multi-Button Mouse Emulation</h3>
@@ -47,7 +41,7 @@ This software is distributed under the terms of the <A HREF="#license">MIT X11 /
 <h2><a NAME="path">Setting Your Path</a></h2>
 <p>Your path is the list of directories to be searched for executable commands. The X11 commands are located in <code>/usr/X11R6/bin</code>, which needs to be added to your path. XDarwin does this for you by default and can also add additional directories where you have installed command line applications.</p>
 <p>More experienced users will have already set their path correctly using the initialization files for their shell. In this case, you can inform XDarwin not to modify your path in the preferences. XDarwin launches the initial X11 clients in the user's default login shell. (An alternate shell can also be specified in the preferences.) The way to set the path depends on the shell you are using. This is described in the man page documentation for the shell.</p>
-<p>In addition you may also want to add the man pages from XFree86 to the list of pages to be searched when you are looking for documentation. The X11 man pages are located in <code>/usr/X11R6/man</code> and the <code>MANPATH</code> environment variable contains the list of directories to search.</p>
+<p>In addition you may also want to add the X11 man pages to the list of pages to be searched when you are looking for documentation. The X11 man pages are located in <code>/usr/X11R6/man</code> and the <code>MANPATH</code> environment variable contains the list of directories to search.</p>
 
 <h2><a NAME="prefs">User Preferences</a></h2>
 <p>A number of options may be set from the user preferences, accessible from the "Preferences..." menu item in the "XDarwin" menu. The options listed as start up options will not take effect until you have restarted XDarwin. All other options take effect immediately. The various options are described below:</p>
@@ -75,8 +69,7 @@ This software is distributed under the terms of the <A HREF="#license">MIT X11 /
 </ul>
 
 <h2><a NAME="license">License</a></h2>
-The XFree86 Project is committed to providing freely redistributable binary and source releases. The main license we use is one based on the traditional MIT X11 / X Consortium License, which does not impose any conditions on modification or redistribution of source code or binaries other than requiring that copyright/license notices are left intact. For more information and additional copyright/licensing notices covering some sections of the code, please see the <A HREF="http://www.xfree86.org/legal/licence.html">XFree86
-License page</A>.
+The main license for XDarwin is based on the traditional MIT X11 / X Consortium License, which does not impose any conditions on modification or redistribution of source code or binaries other than requiring that copyright/license notices are left intact. For more information and additional copyright/licensing notices covering some sections of the code, please refer to the source code.
 <H3><A NAME="3"></A>X Consortium License</H3>
 <p>Copyright (C) 1996 X Consortium</p>
 <p>Permission is hereby granted, free of charge, to any person obtaining a 
diff --git a/hw/darwin/bundle/startXClients.cpp b/hw/darwin/bundle/startXClients.cpp
index b27ad46fe..51cdb5c9e 100644
--- a/hw/darwin/bundle/startXClients.cpp
+++ b/hw/darwin/bundle/startXClients.cpp
@@ -3,7 +3,7 @@ XCOMM!/bin/sh
 XCOMM This script is used by XDarwin to start X clients when XDarwin is
 XCOMM launched from the Finder.
 XCOMM
-XCOMM $XFree86: xc/programs/Xserver/hw/darwin/bundle/startXClients.cpp,v 1.1 2001/10/18 05:03:42 torrey Exp $
+XCOMM $XFree86: $
 
 userclientrc=$HOME/.xinitrc
 sysclientrc=XINITDIR/xinitrc
diff --git a/hw/darwin/darwin.c b/hw/darwin/darwin.c
index bf0975769..caf32c5df 100644
--- a/hw/darwin/darwin.c
+++ b/hw/darwin/darwin.c
@@ -5,7 +5,7 @@
  *
  **************************************************************/
 /*
- * Copyright (c) 2001-2003 Torrey T. Lyons. All Rights Reserved.
+ * Copyright (c) 2001-2004 Torrey T. Lyons. All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -29,7 +29,8 @@
  * holders shall not be used in advertising or otherwise to promote the sale,
  * use or other dealings in this Software without prior written authorization.
  */
-/* $XFree86: xc/programs/Xserver/hw/darwin/darwin.c,v 1.56 2003/11/24 05:39:01 torrey Exp $ */
+/* $XdotOrg: xc/programs/Xserver/hw/darwin/darwin.c,v 1.1.4.2.4.1.6.3 2004/04/20 03:27:08 gisburn Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/darwin.c,v 1.55 2003/11/15 00:07:09 torrey Exp $ */
 
 #include "X.h"
 #include "Xproto.h"
@@ -43,7 +44,7 @@
 #include "fb.h"			// fb framebuffer code
 #include "site.h"
 #include "globals.h"
-#include "xf86Version.h"
+#include "xorgVersion.h"
 #include "xf86Date.h"
 #include "dix.h"
 
@@ -54,6 +55,9 @@
 #include <fcntl.h>
 #include <unistd.h>
 
+#define HAS_UTSNAME 1
+#include <sys/utsname.h>
+
 #define NO_CFPLUGIN
 #include <IOKit/IOKitLib.h>
 #include <IOKit/hidsystem/IOHIDLib.h>
@@ -109,7 +113,7 @@ const int NUMFORMATS = sizeof(formats)/sizeof(formats[0]);
 #define OSVENDOR ""
 #endif
 #ifndef PRE_RELEASE
-#define PRE_RELEASE XF86_VERSION_SNAP
+#define PRE_RELEASE XORG_VERSION_SNAP
 #endif
 
 void
@@ -117,37 +121,74 @@ DarwinPrintBanner()
 {
 #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");
+    "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(" / X Window System\n");
-  ErrorF("(protocol Version %d, revision %d, vendor release %d)\n",
-         X_PROTOCOL, X_PROTOCOL_REVISION, VENDOR_RELEASE );
-  ErrorF("Release Date: %s\n", XF86_DATE);
-  ErrorF("\tIf the server is older than 6-12 months, or if your hardware is\n"
-         "\tnewer than the above date, look for a newer version before\n"
-         "\treporting problems.  (See http://www.XFree86.Org/FAQ)\n");
-  ErrorF("Operating System:%s%s\n", OSNAME, OSVENDOR);
+  ErrorF("\nRelease Date: %s\n", XF86_DATE);
+  ErrorF("X Protocol Version %d, Revision %d, %s\n",
+         X_PROTOCOL, X_PROTOCOL_REVISION, XORG_RELEASE );
+  ErrorF("Build Operating System:%s%s\n", OSNAME, OSVENDOR);
+#ifdef HAS_UTSNAME
+  {
+    struct utsname name;
+
+    if (uname(&name) == 0) {
+      ErrorF("Current Operating System: %s %s %s %s %s\n",
+	name.sysname, name.nodename, name.release, name.version, name.machine);
+    }
+  }
+#endif
+#if defined(BUILD_DATE) && (BUILD_DATE > 19000000)
+  {
+    struct tm t;
+    char buf[100];
+
+    bzero(&t, sizeof(t));
+    bzero(buf, sizeof(buf));
+    t.tm_mday = BUILD_DATE % 100;
+    t.tm_mon = (BUILD_DATE / 100) % 100 - 1;
+    t.tm_year = BUILD_DATE / 10000 - 1900;
+    if (strftime(buf, sizeof(buf), "%d %B %Y", &t))
+       ErrorF("Build Date: %s\n", buf);
+  }
+#endif
+#if defined(CLOG_DATE) && (CLOG_DATE > 19000000)
+  {
+    struct tm t;
+    char buf[100];
+
+    bzero(&t, sizeof(t));
+    bzero(buf, sizeof(buf));
+    t.tm_mday = CLOG_DATE % 100;
+    t.tm_mon = (CLOG_DATE / 100) % 100 - 1;
+    t.tm_year = CLOG_DATE / 10000 - 1900;
+    if (strftime(buf, sizeof(buf), "%d %B %Y", &t))
+       ErrorF("Changelog Date: %s\n", buf);
+  }
+#endif
 #if defined(BUILDERSTRING)
   ErrorF("%s \n",BUILDERSTRING);
 #endif
+  ErrorF("\tBefore reporting problems, check "__VENDORDWEBSUPPORT__"\n"
+	 "\tto make sure that you have the latest version.\n");
 }
 
 
@@ -656,6 +697,10 @@ void OsVendorInit(void)
     }
 }
 
+/* ddxInitGlobals - called by |InitGlobals| from os/util.c */
+void ddxInitGlobals(void)
+{
+}
 
 /*
  * ddxProcessArgument --
diff --git a/hw/darwin/darwin.h b/hw/darwin/darwin.h
index 79fa00ffc..e49c450ef 100644
--- a/hw/darwin/darwin.h
+++ b/hw/darwin/darwin.h
@@ -23,7 +23,7 @@
  * holders shall not be used in advertising or otherwise to promote the sale,
  * use or other dealings in this Software without prior written authorization.
  */
-/* $XFree86: xc/programs/Xserver/hw/darwin/darwin.h,v 1.20 2003/11/15 00:07:09 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/darwin.h,v 1.19 2003/10/16 23:50:08 torrey Exp $ */
 
 #ifndef _DARWIN_H
 #define _DARWIN_H
diff --git a/hw/darwin/darwinClut8.h b/hw/darwin/darwinClut8.h
index 68a7ad16f..06e7b71c5 100644
--- a/hw/darwin/darwinClut8.h
+++ b/hw/darwin/darwinClut8.h
@@ -1,7 +1,7 @@
 /*
  * Darwin default 8-bit Colormap for StaticColor
  */
-/* $XFree86: xc/programs/Xserver/hw/darwin/darwinClut8.h,v 1.2 2003/03/04 01:37:59 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/darwinClut8.h,v 1.1.8.1 2003/03/04 01:31:43 torrey Exp $ */
 
 #ifndef _DARWIN_CLUT8_
 #define _DARWIN_CLUT8_
diff --git a/hw/darwin/darwinEvents.c b/hw/darwin/darwinEvents.c
index ba1ec8fc2..49bb67a94 100644
--- a/hw/darwin/darwinEvents.c
+++ b/hw/darwin/darwinEvents.c
@@ -3,6 +3,7 @@
  */
 /*
 Copyright (c) 2002 Torrey T. Lyons. All Rights Reserved.
+Copyright 2004 Kaleb S. KEITHLEY. All Rights Reserved.
 
 This file is based on mieq.c by Keith Packard,
 which contains the following copyright:
@@ -28,7 +29,7 @@ Except as contained in this notice, the name of The Open Group 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 Open Group.
  */
-/* $XFree86: xc/programs/Xserver/hw/darwin/darwinEvents.c,v 1.5 2003/11/03 05:36:30 tsi Exp $ */
+/* $XFree86$ */
 
 #define NEED_EVENTS
 #include   "X.h"
@@ -93,6 +94,29 @@ static void DarwinPressModifierMask(
     }
 }
 
+#ifdef NX_DEVICELCTLKEYMASK
+#define CONTROL_MASK(flags) (flags & (NX_DEVICELCTLKEYMASK|NX_DEVICERCTLKEYMASK))
+#else
+#define CONTROL_MASK(flags) (NX_CONTROLMASK)
+#endif /* NX_DEVICELCTLKEYMASK */
+
+#ifdef NX_DEVICELSHIFTKEYMASK
+#define SHIFT_MASK(flags) (flags & (NX_DEVICELSHIFTKEYMASK|NX_DEVICERSHIFTKEYMASK))
+#else
+#define SHIFT_MASK(flags) (NX_SHIFTMASK)
+#endif /* NX_DEVICELSHIFTKEYMASK */
+
+#ifdef NX_DEVICELCMDKEYMASK
+#define COMMAND_MASK(flags) (flags & (NX_DEVICELCMDKEYMASK|NX_DEVICERCMDKEYMASK))
+#else
+#define COMMAND_MASK(flags) (NX_COMMANDMASK)
+#endif /* NX_DEVICELCMDKEYMASK */
+
+#ifdef NX_DEVICELALTKEYMASK
+#define ALTERNATE_MASK(flags) (flags & (NX_DEVICELALTKEYMASK|NX_DEVICERALTKEYMASK))
+#else
+#define ALTERNATE_MASK(flags) (NX_ALTERNATEMASK)
+#endif /* NX_DEVICELALTKEYMASK */
 
 /*
  * DarwinUpdateModifiers
@@ -108,16 +132,16 @@ static void DarwinUpdateModifiers(
         DarwinPressModifierMask(xe, NX_ALPHASHIFTMASK);
     }
     if (flags & NX_COMMANDMASK) {
-        DarwinPressModifierMask(xe, NX_COMMANDMASK);
+        DarwinPressModifierMask(xe, COMMAND_MASK(flags));
     }
     if (flags & NX_CONTROLMASK) {
-        DarwinPressModifierMask(xe, NX_CONTROLMASK);
+        DarwinPressModifierMask(xe, CONTROL_MASK(flags));
     }
     if (flags & NX_ALTERNATEMASK) {
-        DarwinPressModifierMask(xe, NX_ALTERNATEMASK);
+        DarwinPressModifierMask(xe, ALTERNATE_MASK(flags));
     }
     if (flags & NX_SHIFTMASK) {
-        DarwinPressModifierMask(xe, NX_SHIFTMASK);
+        DarwinPressModifierMask(xe, SHIFT_MASK(flags));
     }
     if (flags & NX_SECONDARYFNMASK) {
         DarwinPressModifierMask(xe, NX_SECONDARYFNMASK);
diff --git a/hw/darwin/darwinKeyboard.c b/hw/darwin/darwinKeyboard.c
index 57bf5fa3d..e60e7a3e1 100644
--- a/hw/darwin/darwinKeyboard.c
+++ b/hw/darwin/darwinKeyboard.c
@@ -2,6 +2,7 @@
 //
 // Keyboard support for the Darwin X Server
 //
+// Copyright 2004 Kaleb S. KEITHLEY. All Rights Reserved.
 // Copyright (c) 2001-2003 Torrey T. Lyons. All Rights Reserved.
 // Copyright (c) 2003 Apple Computer, Inc. All Rights Reserved.
 //
@@ -37,7 +38,7 @@
 //
 //=============================================================================
 
-/* $XFree86: xc/programs/Xserver/hw/darwin/darwinKeyboard.c,v 1.19 2003/11/01 08:13:08 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/darwinKeyboard.c,v 1.18 2003/05/14 05:27:55 torrey Exp $ */
 
 /*
 ===========================================================================
@@ -656,7 +657,6 @@ Bool DarwinParseNXKeyMapping(
     return TRUE;
 }
 
-
 /*
  * DarwinBuildModifierMaps
  *      Use the keyMap field of keyboard info structure to populate
@@ -684,7 +684,11 @@ DarwinBuildModifierMaps(
                 break;
 
             case XK_Shift_R:
-                info->modifierKeycodes[NX_MODIFIERKEY_SHIFT][1] = i;
+#ifdef NX_MODIFIERKEY_RSHIFT
+                info->modifierKeycodes[NX_MODIFIERKEY_RSHIFT][0] = i;
+#else
+                info->modifierKeycodes[NX_MODIFIERKEY_SHIFT][0] = i;
+#endif
                 info->modMap[MIN_KEYCODE + i] = ShiftMask;
                 break;
 
@@ -694,7 +698,11 @@ DarwinBuildModifierMaps(
                 break;
 
             case XK_Control_R:
-                info->modifierKeycodes[NX_MODIFIERKEY_CONTROL][1] = i;
+#ifdef NX_MODIFIERKEY_RCONTROL
+                info->modifierKeycodes[NX_MODIFIERKEY_RCONTROL][0] = i;
+#else
+                info->modifierKeycodes[NX_MODIFIERKEY_CONTROL][0] = i;
+#endif
                 info->modMap[MIN_KEYCODE + i] = ControlMask;
                 break;
 
@@ -709,7 +717,11 @@ DarwinBuildModifierMaps(
                 break;
 
             case XK_Alt_R:
-                info->modifierKeycodes[NX_MODIFIERKEY_ALTERNATE][1] = i;
+#ifdef NX_MODIFIERKEY_RALTERNATE
+                info->modifierKeycodes[NX_MODIFIERKEY_RALTERNATE][0] = i;
+#else
+                info->modifierKeycodes[NX_MODIFIERKEY_ALTERNATE][0] = i;
+#endif
                 info->modMap[MIN_KEYCODE + i] = Mod1Mask;
                 break;
 
@@ -723,7 +735,11 @@ DarwinBuildModifierMaps(
                 break;
 
             case XK_Meta_R:
-                info->modifierKeycodes[NX_MODIFIERKEY_COMMAND][1] = i;
+#ifdef NX_MODIFIERKEY_RCOMMAND
+                info->modifierKeycodes[NX_MODIFIERKEY_RCOMMAND][0] = i;
+#else
+                info->modifierKeycodes[NX_MODIFIERKEY_COMMAND][0] = i;
+#endif
                 info->modMap[MIN_KEYCODE + i] = Mod2Mask;
                 break;
 
@@ -750,11 +766,6 @@ DarwinBuildModifierMaps(
                 break;
 	    }
         }
-
-#if ALT_IS_MODE_SWITCH
-        if (k[0] == XK_Alt_L || k[0] == XK_Alt_R)
-	    k[0] = XK_Mode_switch;
-#endif
     }
 }
 
@@ -844,14 +855,30 @@ int DarwinModifierNXKeycodeToNXKey(unsigned char keycode, int *outSide)
 int DarwinModifierNXMaskToNXKey(int mask)
 {
     switch (mask) {
-        case NX_ALPHASHIFTMASK:  return NX_MODIFIERKEY_ALPHALOCK;
-        case NX_SHIFTMASK:       return NX_MODIFIERKEY_SHIFT;
-        case NX_CONTROLMASK:     return NX_MODIFIERKEY_CONTROL;
-        case NX_ALTERNATEMASK:   return NX_MODIFIERKEY_ALTERNATE;
-        case NX_COMMANDMASK:     return NX_MODIFIERKEY_COMMAND;
-        case NX_NUMERICPADMASK:  return NX_MODIFIERKEY_NUMERICPAD;
-        case NX_HELPMASK:        return NX_MODIFIERKEY_HELP;
-        case NX_SECONDARYFNMASK: return NX_MODIFIERKEY_SECONDARYFN;
+        case NX_ALPHASHIFTMASK:       return NX_MODIFIERKEY_ALPHALOCK;
+        case NX_SHIFTMASK:            return NX_MODIFIERKEY_SHIFT;
+#ifdef NX_DEVICELSHIFTKEYMASK
+        case NX_DEVICELSHIFTKEYMASK:  return NX_MODIFIERKEY_SHIFT;
+        case NX_DEVICERSHIFTKEYMASK:  return NX_MODIFIERKEY_RSHIFT;
+#endif
+        case NX_CONTROLMASK:          return NX_MODIFIERKEY_CONTROL;
+#ifdef NX_DEVICELCTLKEYMASK
+        case NX_DEVICELCTLKEYMASK:    return NX_MODIFIERKEY_CONTROL;
+        case NX_DEVICERCTLKEYMASK:    return NX_MODIFIERKEY_RCONTROL;
+#endif
+        case NX_ALTERNATEMASK:        return NX_MODIFIERKEY_ALTERNATE;
+#ifdef NX_DEVICELALTKEYMASK
+        case NX_DEVICELALTKEYMASK:    return NX_MODIFIERKEY_ALTERNATE;
+        case NX_DEVICERALTKEYMASK:    return NX_MODIFIERKEY_RALTERNATE;
+#endif
+        case NX_COMMANDMASK:          return NX_MODIFIERKEY_COMMAND;
+#ifdef NX_DEVICELCMDKEYMASK
+        case NX_DEVICELCMDKEYMASK:    return NX_MODIFIERKEY_COMMAND;
+        case NX_DEVICERCMDKEYMASK:    return NX_MODIFIERKEY_RCOMMAND;
+#endif
+        case NX_NUMERICPADMASK:       return NX_MODIFIERKEY_NUMERICPAD;
+        case NX_HELPMASK:             return NX_MODIFIERKEY_HELP;
+        case NX_SECONDARYFNMASK:      return NX_MODIFIERKEY_SECONDARYFN;
     }
     return -1;
 }
@@ -865,9 +892,21 @@ int DarwinModifierNXKeyToNXMask(int key)
     switch (key) {
         case NX_MODIFIERKEY_ALPHALOCK:   return NX_ALPHASHIFTMASK;
         case NX_MODIFIERKEY_SHIFT:       return NX_SHIFTMASK;
+#ifdef NX_MODIFIERKEY_RSHIFT
+        case NX_MODIFIERKEY_RSHIFT:      return NX_SHIFTMASK;
+#endif
         case NX_MODIFIERKEY_CONTROL:     return NX_CONTROLMASK;
+#ifdef NX_MODIFIERKEY_RCONTROL
+        case NX_MODIFIERKEY_RCONTROL:    return NX_CONTROLMASK;
+#endif
         case NX_MODIFIERKEY_ALTERNATE:   return NX_ALTERNATEMASK;
+#ifdef NX_MODIFIERKEY_RALTERNATE
+        case NX_MODIFIERKEY_RALTERNATE:  return NX_ALTERNATEMASK;
+#endif
         case NX_MODIFIERKEY_COMMAND:     return NX_COMMANDMASK;
+#ifdef NX_MODIFIERKEY_RCOMMAND
+        case NX_MODIFIERKEY_RCOMMAND:    return NX_COMMANDMASK;
+#endif
         case NX_MODIFIERKEY_NUMERICPAD:  return NX_NUMERICPADMASK;
         case NX_MODIFIERKEY_HELP:        return NX_HELPMASK;
         case NX_MODIFIERKEY_SECONDARYFN: return NX_SECONDARYFNMASK;
diff --git a/hw/darwin/darwinKeyboard.h b/hw/darwin/darwinKeyboard.h
index c71888990..405dcf9d1 100644
--- a/hw/darwin/darwinKeyboard.h
+++ b/hw/darwin/darwinKeyboard.h
@@ -23,7 +23,7 @@
  * holders shall not be used in advertising or otherwise to promote the sale,
  * use or other dealings in this Software without prior written authorization.
  */
-/* $XFree86: xc/programs/Xserver/hw/darwin/darwinKeyboard.h,v 1.1 2003/11/01 08:13:08 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/darwinKeyboard.c,v 1.18 2003/05/14 05:27:55 torrey Exp $ */
 
 #ifndef DARWIN_KEYBOARD_H
 #define DARWIN_KEYBOARD_H 1
diff --git a/hw/darwin/iokit/xfIOKit.c b/hw/darwin/iokit/xfIOKit.c
index a7f5f18ee..0c8104e67 100644
--- a/hw/darwin/iokit/xfIOKit.c
+++ b/hw/darwin/iokit/xfIOKit.c
@@ -33,7 +33,8 @@
  * holders shall not be used in advertising or otherwise to promote the sale,
  * use or other dealings in this Software without prior written authorization.
  */
-/* $XFree86: xc/programs/Xserver/hw/darwin/iokit/xfIOKit.c,v 1.3 2003/12/09 04:42:36 torrey Exp $ */
+/* $XdotOrg: xc/programs/Xserver/hw/darwin/iokit/xfIOKit.c,v 1.3 2003/12/09 04:42:36 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/iokit/xfIOKit.c,v 1.2 2003/10/16 23:50:09 torrey Exp $ */
 
 #include "X.h"
 #include "Xproto.h"
diff --git a/hw/darwin/iokit/xfIOKit.h b/hw/darwin/iokit/xfIOKit.h
index 413dfd7e8..1e03cdf80 100644
--- a/hw/darwin/iokit/xfIOKit.h
+++ b/hw/darwin/iokit/xfIOKit.h
@@ -28,7 +28,7 @@
  * holders shall not be used in advertising or otherwise to promote the sale,
  * use or other dealings in this Software without prior written authorization.
  */
-/* $XFree86: xc/programs/Xserver/hw/darwin/iokit/xfIOKit.h,v 1.1 2003/05/14 05:27:56 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/xfIOKit.h,v 1.10 2003/03/15 18:02:08 torrey Exp $ */
 
 #ifndef _XFIOKIT_H
 #define _XFIOKIT_H
diff --git a/hw/darwin/iokit/xfIOKitCursor.c b/hw/darwin/iokit/xfIOKitCursor.c
index f3c80145f..69eb41d2f 100644
--- a/hw/darwin/iokit/xfIOKitCursor.c
+++ b/hw/darwin/iokit/xfIOKitCursor.c
@@ -57,7 +57,7 @@
  * holders shall not be used in advertising or otherwise to promote the sale,
  * use or other dealings in this Software without prior written authorization.
  */
-/* $XFree86: xc/programs/Xserver/hw/darwin/iokit/xfIOKitCursor.c,v 1.1 2003/05/14 05:27:56 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/xfIOKitCursor.c,v 1.6 2002/12/10 00:00:39 torrey Exp $ */
 
 #include "scrnintstr.h"
 #include "cursorstr.h"
diff --git a/hw/darwin/iokit/xfIOKitStartup.c b/hw/darwin/iokit/xfIOKitStartup.c
index 9d25c69fe..80508775e 100644
--- a/hw/darwin/iokit/xfIOKitStartup.c
+++ b/hw/darwin/iokit/xfIOKitStartup.c
@@ -28,7 +28,7 @@
  * holders shall not be used in advertising or otherwise to promote the sale,
  * use or other dealings in this Software without prior written authorization.
  */
-/* $XFree86: xc/programs/Xserver/hw/darwin/iokit/xfIOKitStartup.c,v 1.2 2003/11/01 08:13:08 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/iokit/xfIOKitStartup.c,v 1.1 2003/05/14 05:27:56 torrey Exp $ */
 
 #include "darwin.h"
 #include "darwinKeyboard.h"
diff --git a/hw/darwin/quartz/Preferences.h b/hw/darwin/quartz/Preferences.h
index 22a2f1441..feecf24d6 100644
--- a/hw/darwin/quartz/Preferences.h
+++ b/hw/darwin/quartz/Preferences.h
@@ -25,7 +25,7 @@
  * sale, use or other dealings in this Software without prior written
  * authorization.
  */
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/Preferences.h,v 1.3 2003/09/16 00:36:12 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/Preferences.h,v 1.2 2003/01/15 02:34:05 torrey Exp $ */
 
 #import <Cocoa/Cocoa.h>
 
diff --git a/hw/darwin/quartz/Preferences.m b/hw/darwin/quartz/Preferences.m
index 4120b6360..cca2f695d 100644
--- a/hw/darwin/quartz/Preferences.m
+++ b/hw/darwin/quartz/Preferences.m
@@ -30,7 +30,7 @@
  * sale, use or other dealings in this Software without prior written
  * authorization.
  */
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/Preferences.m,v 1.4 2003/09/16 00:36:12 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/Preferences.m,v 1.3 2003/05/14 05:27:56 torrey Exp $ */
 
 #import "quartzCommon.h"
 
diff --git a/hw/darwin/quartz/XApplication.h b/hw/darwin/quartz/XApplication.h
index 3d3e96dab..a2622e060 100644
--- a/hw/darwin/quartz/XApplication.h
+++ b/hw/darwin/quartz/XApplication.h
@@ -30,7 +30,7 @@
  * sale, use or other dealings in this Software without prior written
  * authorization.
  */
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/XApplication.h,v 1.2 2002/10/12 00:32:45 torrey Exp $ */
+/* $XFree86: $ */
 
 #import <Cocoa/Cocoa.h>
 
diff --git a/hw/darwin/quartz/XApplication.m b/hw/darwin/quartz/XApplication.m
index 9b81bbee0..e0ee8d9c6 100644
--- a/hw/darwin/quartz/XApplication.m
+++ b/hw/darwin/quartz/XApplication.m
@@ -30,7 +30,7 @@
  * sale, use or other dealings in this Software without prior written
  * authorization.
  */
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/XApplication.m,v 1.2 2002/10/12 00:32:45 torrey Exp $ */
+/* $XFree86: $ */
 
 #import "XApplication.h"
 
diff --git a/hw/darwin/quartz/XDarwin.pbproj/project.pbxproj b/hw/darwin/quartz/XDarwin.pbproj/project.pbxproj
index 54b1d7180..9dc2bb92c 100644
--- a/hw/darwin/quartz/XDarwin.pbproj/project.pbxproj
+++ b/hw/darwin/quartz/XDarwin.pbproj/project.pbxproj
@@ -334,7 +334,7 @@
 	<key>CFBundleExecutable</key>
 	<string>XDarwin</string>
 	<key>CFBundleGetInfoString</key>
-	<string>XDarwin 1.3.0, ©2001-2003 XFree86 Project, Inc.</string>
+	<string>XDarwin 1.3.0, X.Org Foundation</string>
 	<key>CFBundleIconFile</key>
 	<string>XDarwin.icns</string>
 	<key>CFBundleIdentifier</key>
diff --git a/hw/darwin/quartz/XDarwinStartup.c b/hw/darwin/quartz/XDarwinStartup.c
index 7b2c89f38..0adb4c212 100644
--- a/hw/darwin/quartz/XDarwinStartup.c
+++ b/hw/darwin/quartz/XDarwinStartup.c
@@ -38,7 +38,7 @@
  * dealings in this Software without prior written authorization from
  * Torrey T. Lyons.
  */
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/XDarwinStartup.c,v 1.2 2003/05/14 05:15:56 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/XDarwinStartup.c,v 1.1 2002/03/28 02:21:18 torrey Exp $ */
 
 #include <unistd.h>
 #include <stdio.h>
diff --git a/hw/darwin/quartz/XDarwinStartup.man b/hw/darwin/quartz/XDarwinStartup.man
index 312f4b88b..28efd1edf 100644
--- a/hw/darwin/quartz/XDarwinStartup.man
+++ b/hw/darwin/quartz/XDarwinStartup.man
@@ -1,4 +1,4 @@
-.\" $XFree86: xc/programs/Xserver/hw/darwin/quartz/XDarwinStartup.man,v 1.1 2002/03/28 02:21:18 torrey Exp $
+.\" $XFree86: xc/programs/Xserver/hw/darwin/bundle/XDarwinStartup.man,v 1.1 2002/02/05 19:16:14 torrey Exp $
 .TH XDarwinStartup 1
 .SH NAME
 XDarwinStartup - Startup program for the XDarwin X window server
diff --git a/hw/darwin/quartz/XServer.h b/hw/darwin/quartz/XServer.h
index 01b8ec55e..695086bfe 100644
--- a/hw/darwin/quartz/XServer.h
+++ b/hw/darwin/quartz/XServer.h
@@ -29,7 +29,8 @@
  * sale, use or other dealings in this Software without prior written
  * authorization.
  */
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/XServer.h,v 1.17 2003/11/24 05:39:01 torrey Exp $ */
+/* $XdotOrg: xc/programs/Xserver/hw/darwin/quartz/XServer.h,v 1.17 2003/11/24 05:39:01 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/XServer.h,v 1.16 2003/11/23 06:04:01 torrey Exp $ */
 
 #define BOOL xBOOL
 #include "Xproto.h"
diff --git a/hw/darwin/quartz/XServer.m b/hw/darwin/quartz/XServer.m
index 56e672204..3fad95c97 100644
--- a/hw/darwin/quartz/XServer.m
+++ b/hw/darwin/quartz/XServer.m
@@ -34,7 +34,8 @@
  * sale, use or other dealings in this Software without prior written
  * authorization.
  */
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/XServer.m,v 1.20 2003/11/27 01:59:53 torrey Exp $ */
+/* $XdotOrg: xc/programs/Xserver/hw/darwin/quartz/XServer.m,v 1.20 2003/11/27 01:59:53 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/XServer.m,v 1.19 2003/11/24 05:39:01 torrey Exp $ */
 
 #include "quartzCommon.h"
 
diff --git a/hw/darwin/quartz/applewm.c b/hw/darwin/quartz/applewm.c
index d3e302727..9b62915c8 100644
--- a/hw/darwin/quartz/applewm.c
+++ b/hw/darwin/quartz/applewm.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/applewm.c,v 1.3 2003/11/11 23:48:41 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/applewm.c,v 1.2 2003/09/16 00:36:13 torrey Exp $ */
 /**************************************************************************
 
 Copyright (c) 2002 Apple Computer, Inc. All Rights Reserved.
diff --git a/hw/darwin/quartz/applewmExt.h b/hw/darwin/quartz/applewmExt.h
index 650173941..63e2bea9f 100644
--- a/hw/darwin/quartz/applewmExt.h
+++ b/hw/darwin/quartz/applewmExt.h
@@ -27,7 +27,7 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 **************************************************************************/
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/applewmExt.h,v 1.3 2003/11/17 22:20:35 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/applewmExt.h,v 1.2 2003/11/11 23:48:41 torrey Exp $ */
 
 #ifndef _APPLEWMEXT_H_
 #define _APPLEWMEXT_H_
diff --git a/hw/darwin/quartz/cr/XView.h b/hw/darwin/quartz/cr/XView.h
index 666061dc1..01f5b04b4 100644
--- a/hw/darwin/quartz/cr/XView.h
+++ b/hw/darwin/quartz/cr/XView.h
@@ -25,7 +25,7 @@
  * holders shall not be used in advertising or otherwise to promote the sale,
  * use or other dealings in this Software without prior written authorization.
  */
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/cr/XView.h,v 1.1 2003/06/07 05:49:07 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/XView.h,v 1.2 2002/07/15 19:58:31 torrey Exp $ */
 
 #import <Cocoa/Cocoa.h>
 
diff --git a/hw/darwin/quartz/cr/XView.m b/hw/darwin/quartz/cr/XView.m
index 2bf689ede..5feac6b42 100644
--- a/hw/darwin/quartz/cr/XView.m
+++ b/hw/darwin/quartz/cr/XView.m
@@ -29,7 +29,7 @@
  * holders shall not be used in advertising or otherwise to promote the sale,
  * use or other dealings in this Software without prior written authorization.
  */
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/cr/XView.m,v 1.2 2003/10/16 23:50:16 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/cr/XView.m,v 1.1 2003/06/07 05:49:07 torrey Exp $ */
 
 #import "XView.h"
 
diff --git a/hw/darwin/quartz/cr/cr.h b/hw/darwin/quartz/cr/cr.h
index 74752f768..94133e4af 100644
--- a/hw/darwin/quartz/cr/cr.h
+++ b/hw/darwin/quartz/cr/cr.h
@@ -26,7 +26,7 @@
  * holders shall not be used in advertising or otherwise to promote the sale,
  * use or other dealings in this Software without prior written authorization.
  */
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/cr/cr.h,v 1.3 2003/11/03 05:36:31 tsi Exp $ */
+/* $XFree86$ */
 
 #ifndef _CR_H
 #define _CR_H
diff --git a/hw/darwin/quartz/cr/crAppleWM.m b/hw/darwin/quartz/cr/crAppleWM.m
index 66e832b66..a2e97ff81 100644
--- a/hw/darwin/quartz/cr/crAppleWM.m
+++ b/hw/darwin/quartz/cr/crAppleWM.m
@@ -26,7 +26,7 @@
  * holders shall not be used in advertising or otherwise to promote the sale,
  * use or other dealings in this Software without prior written authorization.
  */
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/cr/crAppleWM.m,v 1.1 2003/09/16 00:36:14 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/xprFrame.c,v 1.2 2003/06/30 01:45:13 torrey Exp $ */
 
 #include "quartzCommon.h"
 #include "cr.h"
diff --git a/hw/darwin/quartz/cr/crFrame.m b/hw/darwin/quartz/cr/crFrame.m
index b308dec74..2fade0c80 100644
--- a/hw/darwin/quartz/cr/crFrame.m
+++ b/hw/darwin/quartz/cr/crFrame.m
@@ -27,7 +27,8 @@
  * holders shall not be used in advertising or otherwise to promote the sale,
  * use or other dealings in this Software without prior written authorization.
  */
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/cr/crFrame.m,v 1.8 2003/12/05 07:00:10 torrey Exp $ */
+/* $XdotOrg$ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/cr/crFrame.m,v 1.9 2004/03/19 02:05:29 torrey Exp $ */
 
 #include "quartzCommon.h"
 #include "cr.h"
@@ -35,6 +36,7 @@
 #undef BOOL
 #define BOOL xBOOL
 #include "rootless.h"
+#include "windowstr.h"
 #undef BOOL
 
 WindowPtr nextWindowToFrame = NULL;
@@ -78,7 +80,12 @@ CRCreateFrame(RootlessWindowPtr pFrame, ScreenPtr pScreen,
     theWindow = [[NSWindow alloc] initWithContentRect:bounds
                                   styleMask:theStyleMask
                                   backing:NSBackingStoreBuffered
+#ifdef DEFER_NSWINDOW
+                                  defer:YES];
+#else
                                   defer:NO];
+#endif
+
     if (!theWindow) return FALSE;
 
     [theWindow setBackgroundColor:[NSColor clearColor]];  // erase transparent
@@ -95,6 +102,21 @@ CRCreateFrame(RootlessWindowPtr pFrame, ScreenPtr pScreen,
     [theWindow setContentView:theView];
     [theWindow setInitialFirstResponder:theView];
 
+#ifdef DEFER_NSWINDOW
+    // We need the NSWindow to actually be created now.
+    // If we had to defer creating it, we have to order it
+    // onto the screen to force it to be created.
+
+    if (pFrame->win->prevSib) {
+        CRWindowPtr crWinPtr = (CRWindowPtr) RootlessFrameForWindow(
+                                                pFrame->win->prevSib, FALSE);
+        int upperNum = [crWinPtr->window windowNumber];
+        [theWindow orderWindow:NSWindowBelow relativeTo:upperNum];
+    } else {
+        [theWindow orderFront:nil];
+    }
+#endif
+
     [theWindow setAcceptsMouseMovedEvents:YES];
 
     crWinPtr->window = theWindow;
diff --git a/hw/darwin/quartz/cr/crScreen.m b/hw/darwin/quartz/cr/crScreen.m
index ab27e8eb8..f0b7db297 100644
--- a/hw/darwin/quartz/cr/crScreen.m
+++ b/hw/darwin/quartz/cr/crScreen.m
@@ -1,3 +1,4 @@
+/* $XdotOrg$ */
 /*
  * Cocoa rootless implementation initialization
  */
@@ -27,7 +28,7 @@
  * holders shall not be used in advertising or otherwise to promote the sale,
  * use or other dealings in this Software without prior written authorization.
  */
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/cr/crScreen.m,v 1.6 2003/11/27 01:59:53 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/cr/crScreen.m,v 1.5 2003/11/12 20:21:52 torrey Exp $ */
 
 #include "quartzCommon.h"
 #include "cr.h"
diff --git a/hw/darwin/quartz/fullscreen/fullscreen.c b/hw/darwin/quartz/fullscreen/fullscreen.c
index 470528943..d0702a082 100644
--- a/hw/darwin/quartz/fullscreen/fullscreen.c
+++ b/hw/darwin/quartz/fullscreen/fullscreen.c
@@ -25,7 +25,8 @@
  * holders shall not be used in advertising or otherwise to promote the sale,
  * use or other dealings in this Software without prior written authorization.
  */
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/fullscreen/fullscreen.c,v 1.4 2003/12/09 04:41:27 torrey Exp $ */
+/* $XdotOrg: xc/programs/Xserver/hw/darwin/quartz/fullscreen/fullscreen.c,v 1.1.4.1 2003/12/06 13:24:23 kaleb Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/fullscreen/fullscreen.c,v 1.3 2003/11/27 01:59:53 torrey Exp $ */
 
 #include "quartzCommon.h"
 #include "darwin.h"
diff --git a/hw/darwin/quartz/fullscreen/quartzCursor.c b/hw/darwin/quartz/fullscreen/quartzCursor.c
index 72ad5ed8e..8abce2318 100644
--- a/hw/darwin/quartz/fullscreen/quartzCursor.c
+++ b/hw/darwin/quartz/fullscreen/quartzCursor.c
@@ -29,7 +29,7 @@
  * holders shall not be used in advertising or otherwise to promote the sale,
  * use or other dealings in this Software without prior written authorization.
  */
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/fullscreen/quartzCursor.c,v 1.1 2003/09/16 00:36:15 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartzCursor.c,v 1.5 2003/01/23 00:34:26 torrey Exp $ */
 
 #include "quartzCommon.h"
 #include "quartzCursor.h"
diff --git a/hw/darwin/quartz/fullscreen/quartzCursor.h b/hw/darwin/quartz/fullscreen/quartzCursor.h
index d822c3e86..efcc4435e 100644
--- a/hw/darwin/quartz/fullscreen/quartzCursor.h
+++ b/hw/darwin/quartz/fullscreen/quartzCursor.h
@@ -29,7 +29,7 @@
  * holders shall not be used in advertising or otherwise to promote the sale,
  * use or other dealings in this Software without prior written authorization.
  */
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/fullscreen/quartzCursor.h,v 1.1 2003/09/16 00:36:15 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartzCursor.h,v 1.1 2002/03/28 02:21:19 torrey Exp $ */
 
 #ifndef QUARTZCURSOR_H
 #define QUARTZCURSOR_H
diff --git a/hw/darwin/quartz/keysym2ucs.c b/hw/darwin/quartz/keysym2ucs.c
index 420830965..98b8b6fee 100644
--- a/hw/darwin/quartz/keysym2ucs.c
+++ b/hw/darwin/quartz/keysym2ucs.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/keysym2ucs.c,v 1.1 2003/11/01 08:13:08 torrey Exp $
+/* $XFree86: $
  *
  * This module converts keysym values into the corresponding ISO 10646
  * (UCS, Unicode) values.
diff --git a/hw/darwin/quartz/keysym2ucs.h b/hw/darwin/quartz/keysym2ucs.h
index 1d9183448..c7ff6f3b3 100644
--- a/hw/darwin/quartz/keysym2ucs.h
+++ b/hw/darwin/quartz/keysym2ucs.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/keysym2ucs.h,v 1.1 2003/11/01 08:13:08 torrey Exp $
+/* $XFree86: $
  *
  * This module converts keysym values into the corresponding ISO 10646
  * (UCS, Unicode) values.
diff --git a/hw/darwin/quartz/pseudoramiX.c b/hw/darwin/quartz/pseudoramiX.c
index 2dd7c3ae5..dad735e1d 100644
--- a/hw/darwin/quartz/pseudoramiX.c
+++ b/hw/darwin/quartz/pseudoramiX.c
@@ -32,7 +32,7 @@ shall not be used in advertising or otherwise to promote the sale, use or other
 dealings in this Software without prior written authorization from Digital
 Equipment Corporation.
 ******************************************************************/
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/pseudoramiX.c,v 1.3 2003/04/30 23:15:39 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/pseudoramiX.c,v 1.2 2002/10/16 21:13:33 dawes Exp $ */
 
 #include "pseudoramiX.h"
 
diff --git a/hw/darwin/quartz/pseudoramiX.h b/hw/darwin/quartz/pseudoramiX.h
index 23738cfb3..3dcae622a 100644
--- a/hw/darwin/quartz/pseudoramiX.h
+++ b/hw/darwin/quartz/pseudoramiX.h
@@ -1,7 +1,7 @@
 /*
  * Minimal implementation of PanoramiX/Xinerama
  */
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/pseudoramiX.h,v 1.2 2003/04/30 23:15:39 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/pseudoramiX.h,v 1.1 2002/03/28 02:21:18 torrey Exp $ */
 
 extern int noPseudoramiXExtension;
 
diff --git a/hw/darwin/quartz/quartz.c b/hw/darwin/quartz/quartz.c
index 91ca9fa28..093b88a10 100644
--- a/hw/darwin/quartz/quartz.c
+++ b/hw/darwin/quartz/quartz.c
@@ -1,3 +1,4 @@
+/* $XdotOrg$ */
 /**************************************************************
  *
  * Quartz-specific support for the Darwin X Server
@@ -29,7 +30,7 @@
  * holders shall not be used in advertising or otherwise to promote the sale,
  * use or other dealings in this Software without prior written authorization.
  */
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartz.c,v 1.14 2003/11/24 05:39:02 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartz.c,v 1.13 2003/11/12 20:21:51 torrey Exp $ */
 
 #include "quartzCommon.h"
 #include "quartz.h"
diff --git a/hw/darwin/quartz/quartz.h b/hw/darwin/quartz/quartz.h
index 2cec61d66..18f88d1f8 100644
--- a/hw/darwin/quartz/quartz.h
+++ b/hw/darwin/quartz/quartz.h
@@ -30,7 +30,8 @@
  * holders shall not be used in advertising or otherwise to promote the sale,
  * use or other dealings in this Software without prior written authorization.
  */
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartz.h,v 1.8 2003/11/27 01:59:53 torrey Exp $ */
+/* $XdotOrg: xc/programs/Xserver/hw/darwin/quartz/quartz.h,v 1.8 2003/11/27 01:59:53 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartz.h,v 1.7 2003/11/12 20:21:51 torrey Exp $ */
 
 #ifndef _QUARTZ_H
 #define _QUARTZ_H
diff --git a/hw/darwin/quartz/quartzAudio.c b/hw/darwin/quartz/quartzAudio.c
index a3e6af127..64a4f33cc 100644
--- a/hw/darwin/quartz/quartzAudio.c
+++ b/hw/darwin/quartz/quartzAudio.c
@@ -35,7 +35,7 @@
  * holders shall not be used in advertising or otherwise to promote the sale,
  * use or other dealings in this Software without prior written authorization.
  */
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartzAudio.c,v 1.2 2003/05/14 05:27:56 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartzAudio.c,v 1.1 2002/03/28 02:21:18 torrey Exp $ */
 
 #include "quartzCommon.h"
 #include "quartzAudio.h"
diff --git a/hw/darwin/quartz/quartzAudio.h b/hw/darwin/quartz/quartzAudio.h
index 1d213e36a..e20c21ad2 100644
--- a/hw/darwin/quartz/quartzAudio.h
+++ b/hw/darwin/quartz/quartzAudio.h
@@ -28,7 +28,7 @@
  * holders shall not be used in advertising or otherwise to promote the sale,
  * use or other dealings in this Software without prior written authorization.
  */
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartzAudio.h,v 1.1 2002/03/28 02:21:19 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/bundle/quartzAudio.h,v 1.2 2001/04/01 20:45:43 tsi Exp $ */
 
 #ifndef _QUARTZAUDIO_H
 #define _QUARTZAUDIO_H
diff --git a/hw/darwin/quartz/quartzCocoa.m b/hw/darwin/quartz/quartzCocoa.m
index bba71c041..0c671890f 100644
--- a/hw/darwin/quartz/quartzCocoa.m
+++ b/hw/darwin/quartz/quartzCocoa.m
@@ -1,3 +1,4 @@
+/* $XdotOrg$ */
 /**************************************************************
  *
  * Quartz-specific support for the Darwin X Server
@@ -33,7 +34,7 @@
  * holders shall not be used in advertising or otherwise to promote the sale,
  * use or other dealings in this Software without prior written authorization.
  */
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartzCocoa.m,v 1.4 2003/05/14 05:27:56 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartzCocoa.m,v 1.3 2003/01/19 06:52:54 torrey Exp $ */
 
 #include "quartzCommon.h"
 
diff --git a/hw/darwin/quartz/quartzCommon.h b/hw/darwin/quartz/quartzCommon.h
index e3ae4b850..16f654a5d 100644
--- a/hw/darwin/quartz/quartzCommon.h
+++ b/hw/darwin/quartz/quartzCommon.h
@@ -1,3 +1,4 @@
+/* $XdotOrg$ */
 /*
  * quartzCommon.h
  *
@@ -31,7 +32,7 @@
  * holders shall not be used in advertising or otherwise to promote the sale,
  * use or other dealings in this Software without prior written authorization.
  */
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartzCommon.h,v 1.14 2003/11/12 20:21:51 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartzCommon.h,v 1.13 2003/10/16 23:50:10 torrey Exp $ */
 
 #ifndef _QUARTZCOMMON_H
 #define _QUARTZCOMMON_H
diff --git a/hw/darwin/quartz/quartzCursor.c b/hw/darwin/quartz/quartzCursor.c
index 8abce2318..711ce64f0 100644
--- a/hw/darwin/quartz/quartzCursor.c
+++ b/hw/darwin/quartz/quartzCursor.c
@@ -29,7 +29,7 @@
  * holders shall not be used in advertising or otherwise to promote the sale,
  * use or other dealings in this Software without prior written authorization.
  */
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartzCursor.c,v 1.5 2003/01/23 00:34:26 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartzCursor.c,v 1.4 2002/11/19 23:01:30 torrey Exp $ */
 
 #include "quartzCommon.h"
 #include "quartzCursor.h"
diff --git a/hw/darwin/quartz/quartzCursor.h b/hw/darwin/quartz/quartzCursor.h
index 9710d4be2..4db5531fa 100644
--- a/hw/darwin/quartz/quartzCursor.h
+++ b/hw/darwin/quartz/quartzCursor.h
@@ -29,7 +29,7 @@
  * holders shall not be used in advertising or otherwise to promote the sale,
  * use or other dealings in this Software without prior written authorization.
  */
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartzCursor.h,v 1.1 2002/03/28 02:21:19 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/bundle/quartzCursor.h,v 1.2 2001/09/23 04:04:49 torrey Exp $ */
 
 #ifndef QUARTZCURSOR_H
 #define QUARTZCURSOR_H
diff --git a/hw/darwin/quartz/quartzKeyboard.c b/hw/darwin/quartz/quartzKeyboard.c
index eab86e27e..d6a79b578 100644
--- a/hw/darwin/quartz/quartzKeyboard.c
+++ b/hw/darwin/quartz/quartzKeyboard.c
@@ -32,7 +32,7 @@
    promote the sale, use or other dealings in this Software without
    prior written authorization.
 */
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartzKeyboard.c,v 1.2 2004/01/19 01:22:47 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartzKeyboard.c,v 1.1 2003/11/01 08:13:08 torrey Exp $ */
 
 #include "quartzCommon.h"
 
@@ -69,9 +69,11 @@ const static struct {
     {57,  XK_Caps_Lock},
     {58,  XK_Alt_L},
     {59,  XK_Control_L},
+
     {60,  XK_Shift_R},
     {61,  XK_Alt_R},
     {62,  XK_Control_R},
+    {63,  XK_Meta_R},
 
     {122, XK_F1},
     {120, XK_F2},
diff --git a/hw/darwin/quartz/quartzPasteboard.c b/hw/darwin/quartz/quartzPasteboard.c
index 658832aa1..e9f9d6698 100644
--- a/hw/darwin/quartz/quartzPasteboard.c
+++ b/hw/darwin/quartz/quartzPasteboard.c
@@ -29,7 +29,7 @@
  * holders shall not be used in advertising or otherwise to promote the sale,
  * use or other dealings in this Software without prior written authorization.
  */
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartzPasteboard.c,v 1.1 2002/03/28 02:21:19 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/bundle/quartzPasteboard.c,v 1.3 2001/09/23 04:04:49 torrey Exp $ */
 
 #include "quartzPasteboard.h"
 
diff --git a/hw/darwin/quartz/quartzPasteboard.h b/hw/darwin/quartz/quartzPasteboard.h
index fef375493..296c52c17 100644
--- a/hw/darwin/quartz/quartzPasteboard.h
+++ b/hw/darwin/quartz/quartzPasteboard.h
@@ -29,7 +29,7 @@
  * holders shall not be used in advertising or otherwise to promote the sale,
  * use or other dealings in this Software without prior written authorization.
  */
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartzPasteboard.h,v 1.1 2002/03/28 02:21:19 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/bundle/quartzPasteboard.h,v 1.1 2001/03/15 22:24:27 torrey Exp $ */
 
 #ifndef _QUARTZPASTEBOARD_H
 #define _QUARTZPASTEBOARD_H
diff --git a/hw/darwin/quartz/quartzStartup.c b/hw/darwin/quartz/quartzStartup.c
index bb7c7d214..5a11d5321 100644
--- a/hw/darwin/quartz/quartzStartup.c
+++ b/hw/darwin/quartz/quartzStartup.c
@@ -28,7 +28,7 @@
  * holders shall not be used in advertising or otherwise to promote the sale,
  * use or other dealings in this Software without prior written authorization.
  */
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartzStartup.c,v 1.9 2003/11/15 00:07:09 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartzStartup.c,v 1.8 2003/11/05 00:15:00 torrey Exp $ */
 
 #include <fcntl.h>
 #include <unistd.h>
diff --git a/hw/darwin/quartz/xpr/Xplugin.h b/hw/darwin/quartz/xpr/Xplugin.h
index 8985f7b11..e2e97b4c8 100644
--- a/hw/darwin/quartz/xpr/Xplugin.h
+++ b/hw/darwin/quartz/xpr/Xplugin.h
@@ -30,7 +30,7 @@
 
    Note that these interfaces are provided solely for the use of the
    X11 server. Any other uses are unsupported and strongly discouraged. */
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/Xplugin.h,v 1.3 2003/06/27 20:21:42 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/Xplugin.h,v 1.2 2003/05/02 00:08:49 torrey Exp $ */
 
 #ifndef XPLUGIN_H
 #define XPLUGIN_H 1
diff --git a/hw/darwin/quartz/xpr/appledri.c b/hw/darwin/quartz/xpr/appledri.c
index 3062d964a..0eba61cb2 100644
--- a/hw/darwin/quartz/xpr/appledri.c
+++ b/hw/darwin/quartz/xpr/appledri.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/appledri.c,v 1.1 2003/06/30 01:45:13 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/GL/dri/xf86dri.c,v 1.10 2000/12/07 20:26:14 dawes Exp $ */
 /**************************************************************************
 
 Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
diff --git a/hw/darwin/quartz/xpr/dri.c b/hw/darwin/quartz/xpr/dri.c
index aa595af85..17f9e91a0 100644
--- a/hw/darwin/quartz/xpr/dri.c
+++ b/hw/darwin/quartz/xpr/dri.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/dri.c,v 1.1 2003/06/30 01:45:13 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/GL/dri/dri.c,v 1.34 2001/12/10 19:07:19 dawes Exp $ */
 /**************************************************************************
 
 Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
diff --git a/hw/darwin/quartz/xpr/dri.h b/hw/darwin/quartz/xpr/dri.h
index 350f61b56..5d0b1fec8 100644
--- a/hw/darwin/quartz/xpr/dri.h
+++ b/hw/darwin/quartz/xpr/dri.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/dri.h,v 1.1 2003/06/30 01:45:13 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/GL/dri/dri.h,v 1.18 2001/03/21 16:21:40 dawes Exp $ */
 /**************************************************************************
 
 Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
diff --git a/hw/darwin/quartz/xpr/dristruct.h b/hw/darwin/quartz/xpr/dristruct.h
index 1a2949b18..ae1b99db5 100644
--- a/hw/darwin/quartz/xpr/dristruct.h
+++ b/hw/darwin/quartz/xpr/dristruct.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/dristruct.h,v 1.1 2003/06/30 01:45:13 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/GL/dri/dristruct.h,v 1.10 2001/03/21 16:21:40 dawes Exp $ */
 /**************************************************************************
 
 Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
diff --git a/hw/darwin/quartz/xpr/x-hash.c b/hw/darwin/quartz/xpr/x-hash.c
index ad36204c5..632ffdb33 100644
--- a/hw/darwin/quartz/xpr/x-hash.c
+++ b/hw/darwin/quartz/xpr/x-hash.c
@@ -27,7 +27,7 @@
    copyright holders shall not be used in advertising or otherwise to
    promote the sale, use or other dealings in this Software without
    prior written authorization. */
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/x-hash.c,v 1.2 2003/06/30 01:45:13 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/x-hash.c,v 1.1 2003/04/30 23:15:42 torrey Exp $ */
 
 #include "x-hash.h"
 #include "x-list.h"
diff --git a/hw/darwin/quartz/xpr/x-hash.h b/hw/darwin/quartz/xpr/x-hash.h
index 2abb08cd7..97d4cc40c 100644
--- a/hw/darwin/quartz/xpr/x-hash.h
+++ b/hw/darwin/quartz/xpr/x-hash.h
@@ -27,7 +27,7 @@
    copyright holders shall not be used in advertising or otherwise to
    promote the sale, use or other dealings in this Software without
    prior written authorization. */
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/x-hash.h,v 1.2 2003/06/30 01:45:13 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/x-hash.h,v 1.1 2003/04/30 23:15:42 torrey Exp $ */
 
 #ifndef X_HASH_H
 #define X_HASH_H 1
diff --git a/hw/darwin/quartz/xpr/x-hook.c b/hw/darwin/quartz/xpr/x-hook.c
index 3414e1543..dcd34fdc5 100644
--- a/hw/darwin/quartz/xpr/x-hook.c
+++ b/hw/darwin/quartz/xpr/x-hook.c
@@ -27,7 +27,7 @@
    copyright holders shall not be used in advertising or otherwise to
    promote the sale, use or other dealings in this Software without
    prior written authorization. */
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/x-hook.c,v 1.1 2003/06/30 01:45:13 torrey Exp $ */
+/* $XFree86: $ */
 
 #include "x-hook.h"
 #include <stdlib.h>
diff --git a/hw/darwin/quartz/xpr/x-hook.h b/hw/darwin/quartz/xpr/x-hook.h
index 14e8ca1f5..0b5e038fe 100644
--- a/hw/darwin/quartz/xpr/x-hook.h
+++ b/hw/darwin/quartz/xpr/x-hook.h
@@ -27,7 +27,7 @@
    copyright holders shall not be used in advertising or otherwise to
    promote the sale, use or other dealings in this Software without
    prior written authorization. */
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/x-hook.h,v 1.1 2003/06/30 01:45:13 torrey Exp $ */
+/* $XFree86: $ */
 
 #ifndef X_HOOK_H
 #define X_HOOK_H 1
diff --git a/hw/darwin/quartz/xpr/x-list.c b/hw/darwin/quartz/xpr/x-list.c
index 859a5163d..17843362a 100644
--- a/hw/darwin/quartz/xpr/x-list.c
+++ b/hw/darwin/quartz/xpr/x-list.c
@@ -27,7 +27,7 @@
    copyright holders shall not be used in advertising or otherwise to
    promote the sale, use or other dealings in this Software without
    prior written authorization. */
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/x-list.c,v 1.2 2003/06/30 01:45:13 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/x-list.c,v 1.1 2003/04/30 23:15:42 torrey Exp $ */
 
 #include "x-list.h"
 #include <stdlib.h>
diff --git a/hw/darwin/quartz/xpr/x-list.h b/hw/darwin/quartz/xpr/x-list.h
index a65cfcb7c..991e2b1f6 100644
--- a/hw/darwin/quartz/xpr/x-list.h
+++ b/hw/darwin/quartz/xpr/x-list.h
@@ -27,7 +27,7 @@
    copyright holders shall not be used in advertising or otherwise to
    promote the sale, use or other dealings in this Software without
    prior written authorization. */
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/x-list.h,v 1.2 2003/06/30 01:45:13 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/x-list.h,v 1.1 2003/04/30 23:15:42 torrey Exp $ */
 
 #ifndef X_LIST_H
 #define X_LIST_H 1
diff --git a/hw/darwin/quartz/xpr/xpr.h b/hw/darwin/quartz/xpr/xpr.h
index b3091f8e1..d82aef62b 100644
--- a/hw/darwin/quartz/xpr/xpr.h
+++ b/hw/darwin/quartz/xpr/xpr.h
@@ -26,7 +26,8 @@
  * holders shall not be used in advertising or otherwise to promote the sale,
  * use or other dealings in this Software without prior written authorization.
  */
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/xpr.h,v 1.5 2003/11/27 01:59:53 torrey Exp $ */
+/* $XdotOrg: xc/programs/Xserver/hw/darwin/quartz/xpr/xpr.h,v 1.5 2003/11/27 01:59:53 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/xpr.h,v 1.4 2003/11/12 20:21:52 torrey Exp $ */
 
 #ifndef XPR_H
 #define XPR_H
diff --git a/hw/darwin/quartz/xpr/xprAppleWM.c b/hw/darwin/quartz/xpr/xprAppleWM.c
index eca0de334..a5186d5f6 100644
--- a/hw/darwin/quartz/xpr/xprAppleWM.c
+++ b/hw/darwin/quartz/xpr/xprAppleWM.c
@@ -27,7 +27,7 @@
  * holders shall not be used in advertising or otherwise to promote the sale,
  * use or other dealings in this Software without prior written authorization.
  */
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/xprAppleWM.c,v 1.1 2003/09/16 00:36:15 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/xprFrame.c,v 1.2 2003/06/30 01:45:13 torrey Exp $ */
 
 #include "xpr.h"
 #include "applewmExt.h"
diff --git a/hw/darwin/quartz/xpr/xprCursor.c b/hw/darwin/quartz/xpr/xprCursor.c
index a3dea69e2..ee06043df 100644
--- a/hw/darwin/quartz/xpr/xprCursor.c
+++ b/hw/darwin/quartz/xpr/xprCursor.c
@@ -30,7 +30,7 @@
  * holders shall not be used in advertising or otherwise to promote the sale,
  * use or other dealings in this Software without prior written authorization.
  */
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/xprCursor.c,v 1.2 2003/09/16 00:36:15 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/xprCursor.c,v 1.1 2003/04/30 23:15:42 torrey Exp $ */
 
 #include "quartzCommon.h"
 #include "xpr.h"
diff --git a/hw/darwin/quartz/xpr/xprFrame.c b/hw/darwin/quartz/xpr/xprFrame.c
index 552153852..15a52a52c 100644
--- a/hw/darwin/quartz/xpr/xprFrame.c
+++ b/hw/darwin/quartz/xpr/xprFrame.c
@@ -27,7 +27,8 @@
  * holders shall not be used in advertising or otherwise to promote the sale,
  * use or other dealings in this Software without prior written authorization.
  */
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/xprFrame.c,v 1.5 2003/11/27 01:59:53 torrey Exp $ */
+/* $XdotOrg: xc/programs/Xserver/hw/darwin/quartz/xpr/xprFrame.c,v 1.5 2003/11/27 01:59:53 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/xprFrame.c,v 1.4 2003/11/12 20:21:52 torrey Exp $ */
 
 #include "xpr.h"
 #include "rootlessCommon.h"
diff --git a/hw/darwin/quartz/xpr/xprScreen.c b/hw/darwin/quartz/xpr/xprScreen.c
index 771b7c9f4..e1d3cf972 100644
--- a/hw/darwin/quartz/xpr/xprScreen.c
+++ b/hw/darwin/quartz/xpr/xprScreen.c
@@ -1,3 +1,4 @@
+/* $XdotOrg$ */
 /*
  * Xplugin rootless implementation screen functions
  */
@@ -27,7 +28,7 @@
  * holders shall not be used in advertising or otherwise to promote the sale,
  * use or other dealings in this Software without prior written authorization.
  */
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/xprScreen.c,v 1.9 2003/11/27 01:59:53 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/xprScreen.c,v 1.8 2003/11/12 20:21:52 torrey Exp $ */
 
 #include "quartzCommon.h"
 #include "quartz.h"
diff --git a/hw/darwin/utils/README.txt b/hw/darwin/utils/README.txt
index 94d61b1f0..fb6d4399e 100644
--- a/hw/darwin/utils/README.txt
+++ b/hw/darwin/utils/README.txt
@@ -108,4 +108,4 @@ of the NeXT .keymapping file.
 
 
 
-$XFree86: xc/programs/Xserver/hw/darwin/utils/README.txt,v 1.2 2000/12/05 21:18:34 dawes Exp $
+$XFree86: xc/programs/Xserver/hw/darwin/utils/README.txt,v 1.1 2000/12/01 19:47:39 dawes Exp $
diff --git a/hw/darwin/utils/dumpkeymap.c b/hw/darwin/utils/dumpkeymap.c
index a264cbc10..8f3340b15 100644
--- a/hw/darwin/utils/dumpkeymap.c
+++ b/hw/darwin/utils/dumpkeymap.c
@@ -1,4 +1,4 @@
-// $XFree86: xc/programs/Xserver/hw/darwin/utils/dumpkeymap.c,v 1.4 2003/04/13 14:52:51 herrb Exp $
+// $XFree86: dumpkeymap.c,v 1.3 2000/12/05 21:18:34 dawes Exp $
 //=============================================================================
 //
 // Copyright (C) 1999,2000 by Eric Sunshine <sunshine@sunshineco.com>
diff --git a/hw/darwin/utils/dumpkeymap.man b/hw/darwin/utils/dumpkeymap.man
index 2ad6d54d2..12983bada 100644
--- a/hw/darwin/utils/dumpkeymap.man
+++ b/hw/darwin/utils/dumpkeymap.man
@@ -30,7 +30,7 @@
 //
 //=============================================================================
 //
-// $XFree86: xc/programs/Xserver/hw/darwin/utils/dumpkeymap.man,v 1.2 2000/12/05 21:18:34 dawes Exp $
+// $XFree86$
 //
 ..
 .ig
diff --git a/hw/vfb/InitInput.c b/hw/vfb/InitInput.c
index 345526d19..fdece85d7 100644
--- a/hw/vfb/InitInput.c
+++ b/hw/vfb/InitInput.c
@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/programs/Xserver/hw/vfb/InitInput.c,v 3.10 2003/11/16 03:16:59 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/vfb/InitInput.c,v 3.9 2001/12/14 19:59:45 dawes Exp $ */
 
 #include "X11/X.h"
 #define NEED_EVENTS
diff --git a/hw/vfb/InitOutput.c b/hw/vfb/InitOutput.c
index 1e751a51d..562dd611e 100644
--- a/hw/vfb/InitOutput.c
+++ b/hw/vfb/InitOutput.c
@@ -26,17 +26,7 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-
-/*
- * The screen origin code is:
- *
- * Copyright (c) 2004 by The XFree86 Project, Inc
- * Rights as per the XFree86 1.1 licence
- * (http://www.xfree86.org/legal/licenses.html).
- *
- */
-
-/* $XFree86: xc/programs/Xserver/hw/vfb/InitOutput.c,v 3.27 2004/03/05 03:20:48 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/vfb/InitOutput.c,v 3.25 2003/11/15 04:01:56 dawes Exp $ */
 
 #if defined(WIN32)
 #include <X11/Xwinsock.h>
@@ -90,9 +80,7 @@ typedef struct
     int width;
     int paddedBytesWidth;
     int paddedWidth;
-    int xOrigin;
     int height;
-    int yOrigin;
     int depth;
     int bitsPerPixel;
     int sizeInBytes;
@@ -266,7 +254,7 @@ OsVendorFatalError()
 void
 ddxUseMsg()
 {
-    ErrorF("-screen n WxHxD[@x,y]  set screen's width, height, depth, origin\n");
+    ErrorF("-screen scrn WxHxD     set screen's width, height, depth\n");
     ErrorF("-pixdepths list-of-int support given pixmap depths\n");
 #ifdef RENDER
     ErrorF("+/-render		   turn on/of RENDER extension support"
@@ -285,6 +273,11 @@ ddxUseMsg()
 #endif
 }
 
+/* ddxInitGlobals - called by |InitGlobals| from os/util.c */
+void ddxInitGlobals(void)
+{
+}
+
 int
 ddxProcessArgument(int argc, char *argv[], int i)
 {
@@ -300,7 +293,6 @@ ddxProcessArgument(int argc, char *argv[], int i)
     if (strcmp (argv[i], "-screen") == 0)	/* -screen n WxHxD */
     {
 	int screenNum;
- 	char *s;
 	if (i + 2 >= argc) UseMsg();
 	screenNum = atoi(argv[i+1]);
 	if (screenNum < 0 || screenNum >= MAXSCREENS)
@@ -308,31 +300,14 @@ ddxProcessArgument(int argc, char *argv[], int i)
 	    ErrorF("Invalid screen number %d\n", screenNum);
 	    UseMsg();
 	}
-	s = strtok(argv[i+2], "@");
-	if (3 != sscanf(s, "%dx%dx%d",
+	if (3 != sscanf(argv[i+2], "%dx%dx%d",
 			&vfbScreens[screenNum].width,
 			&vfbScreens[screenNum].height,
 			&vfbScreens[screenNum].depth))
 	{
-	    ErrorF("Invalid screen configuration %s\n", s);
+	    ErrorF("Invalid screen configuration %s\n", argv[i+2]);
 	    UseMsg();
 	}
-	s = strtok(NULL, "@");
-	if (s)
-	{
-	    if (2 != sscanf(s, "%d,%d",
-			    &vfbScreens[screenNum].xOrigin,
-			    &vfbScreens[screenNum].yOrigin))
-	    {
-		ErrorF("Invalid screen position %s\n", s);
-		UseMsg();
-	    }
-	}
-	else
-	{
-	    vfbScreens[screenNum].xOrigin = -1;
-	    vfbScreens[screenNum].yOrigin = -1;
-	}
 
 	if (screenNum >= vfbNumScreens)
 	    vfbNumScreens = screenNum + 1;
@@ -1063,35 +1038,6 @@ InitOutput(ScreenInfo *screenInfo, int argc, char **argv)
 	}
     }
 
-    /*
-     * Setup the Xinerama Layout.  If the screen origins are not specified
-     * explicitly, assume that screen n is to the right of screen n - 1.
-     * It is safe to set this up even when Xinerama is not used.
-     */
-
-    for (i = 0; i < vfbNumScreens; i++)
-    {
-	if (vfbScreens[i].xOrigin < 0 || vfbScreens[i].yOrigin < 0)
-	{
-	    if (i == 0)
-	    {
-		dixScreenOrigins[i].x = 0;
-		dixScreenOrigins[i].y = 0;
-	    }
-	    else
-	    {
-		dixScreenOrigins[i].x = dixScreenOrigins[i - 1].x +
-						vfbScreens[i - 1].width;
-		dixScreenOrigins[i].y = dixScreenOrigins[i - 1].y;
-	    }
-	}
-	else
-	{
-	    dixScreenOrigins[i].x = vfbScreens[i].xOrigin;
-	    dixScreenOrigins[i].y = vfbScreens[i].yOrigin;
-	}
-    }
-
 } /* end InitOutput */
 
 /* this is just to get the server to link on AIX */
diff --git a/hw/vfb/Xvfb.man.pre b/hw/vfb/Xvfb.man.pre
index 5e7168a1c..51bffe320 100644
--- a/hw/vfb/Xvfb.man.pre
+++ b/hw/vfb/Xvfb.man.pre
@@ -1,3 +1,4 @@
+.\" $XdotOrg: Xvfb.man,v 1.4 2001/02/09 02:04:45 xorgcvs Exp $
 .\" $Xorg: Xvfb.man,v 1.4 2001/02/09 02:04:45 xorgcvs Exp $
 .\" Copyright 1993, 1998  The Open Group
 .\" 
@@ -23,7 +24,7 @@
 .\" other dealings in this Software without prior written authorization
 .\" from The Open Group.
 .\"
-.\" $XFree86: xc/programs/Xserver/hw/vfb/Xvfb.man,v 1.11 2004/03/05 03:20:48 dawes Exp $
+.\" $XFree86: xc/programs/Xserver/hw/vfb/Xvfb.man,v 1.9 2001/12/14 19:59:45 dawes Exp $
 .\"
 .TH XVFB 1 __xorgversion__
 .SH NAME
@@ -58,32 +59,30 @@ To build \fIXvfb\fP, put the following in your host.def and remake.
 In addition to the normal server options described in the \fIXserver(1)\fP
 manual page, \fIXvfb\fP accepts the following command line switches:
 .TP 4
-.B "\-screen \fIscreennum\fP \fIW\fPx\fIH\fPx\fID\fP\fR[\fP@\fIx\fP,\fIy\fP\fR]\fP"
+.B "\-screen \fIscreennum\fP \fIWxHxD\fP"
 This option creates screen \fIscreennum\fP and sets its width, height,
-and depth to W, H, and D respectively, and optionally the screen origin
-(for Xinerama purposes) to (x,y).  By default, only screen 0 exists and
-has the dimensions 1280x1024x8.  If a screen origin is not specified
-when using Xinerama, the default is for screen
-.I N
-to be positioned to the right of screen
-.IR N\-1 .
+and depth to W, H, and D respectively.  By default, only screen 0 exists
+and has the dimensions 1280x1024x8.
 .TP 4
 .B "\-pixdepths \fIlist-of-depths\fP"
 This option specifies a list of pixmap depths that the server should
 support in addition to the depths implied by the supported screens.
-\fIlist-of-depths\fP is a space-separated list of integers that can have
-values from 1 to 32.
+\fIlist-of-depths\fP is a space-separated list of integers that can
+have values from 1 to 32.
 .TP 4
 .B "\-fbdir \fIframebuffer-directory\fP"
 This option specifies the directory in which the memory mapped files
-containing the framebuffer memory should be created.  See FILES.  This
-option only exists on machines that have the mmap and msync system calls.
+containing the framebuffer memory should be created.
+See FILES. 
+This option only exists on machines that have the mmap and msync system
+calls.
 .TP 4
 .B "\-shmem"
-This option specifies that the framebuffer should be put in shared
-memory.  The shared memory ID for each screen will be printed by the
-server.  The shared memory is in xwd format.  This option only exists
-on machines that support the System V shared memory interface.
+This option specifies that the framebuffer should be put in shared memory.
+The shared memory ID for each screen will be printed by the server.
+The shared memory is in xwd format.
+This option only exists on machines that support the System V shared memory
+interface.
 .PP
 If neither \fB\-shmem\fP nor \fB\-fbdir\fP is specified,
 the framebuffer memory will be allocated with malloc().
diff --git a/hw/xfree86/common/compiler.h b/hw/xfree86/common/compiler.h
index 2b66ddbdc..c101c41cd 100644
--- a/hw/xfree86/common/compiler.h
+++ b/hw/xfree86/common/compiler.h
@@ -116,6 +116,10 @@ extern int ffs(unsigned long);
         ;
 # endif
 
+# if defined(__SUNPRO_C)
+#  define DO_PROTOTYPES
+# endif
+
 # if defined(NO_INLINE) || defined(DO_PROTOTYPES)
 
 #  if !defined(__sparc__) && !defined(__arm32__) \
@@ -493,7 +497,7 @@ __ustw (unsigned long r5, unsigned short * r11)
 #    define outw(a,b)	_outw(b,a)
 #    define outl(a,b)	_outl(b,a) 
 
-#   elif defined(linux) && defined(__AMD64__) 
+#   elif defined(linux) && defined(__amd64__) 
  
 #    include <inttypes.h>
 
@@ -1728,7 +1732,7 @@ static __inline__ void ppc_flush_icache(char *addr)
 		: : "r"(addr) : "memory");
 }
 
-# elif defined(__sparc__)
+# elif defined(__sparc__) || defined(sparc)
  /*
   * Like powerpc, we provide byteswapping and no byteswapping functions
   * here with byteswapping as default, drivers that don't need byteswapping
diff --git a/hw/xfree86/common/extramodes b/hw/xfree86/common/extramodes
index f7dc01216..1d72861e4 100644
--- a/hw/xfree86/common/extramodes
+++ b/hw/xfree86/common/extramodes
@@ -1,7 +1,7 @@
 //
 // Extra modes to include as default modes in the X server.
 //
-// $XFree86: xc/programs/Xserver/hw/xfree86/etc/extramodes,v 1.6 2002/11/11 04:21:46 dawes Exp $
+// $XFree86: xc/programs/Xserver/hw/xfree86/etc/extramodes,v 1.5 2002/06/05 19:43:05 dawes Exp $
 //
 
 # 832x624 @ 75Hz (74.55Hz) (fix if the official/Apple spec is different) hsync: 49.725kHz
diff --git a/hw/xfree86/common/modeline2c.pl b/hw/xfree86/common/modeline2c.pl
index e31fe28e1..abe995550 100644
--- a/hw/xfree86/common/modeline2c.pl
+++ b/hw/xfree86/common/modeline2c.pl
@@ -34,7 +34,7 @@
 # the sale, use or other dealings in this Software without prior written
 # authorization from the copyright holder(s) and author(s).
 #
-# $XFree86: xc/programs/Xserver/hw/xfree86/common/modeline2c.pl,v 1.11 2003/11/03 05:11:01 tsi Exp $
+# $XFree86: xc/programs/Xserver/hw/xfree86/common/modeline2c.pl,v 1.10tsi Exp $
 
 #my %flagshash;
 $flagshash{""} = "0";
diff --git a/hw/xfree86/common/vesamodes b/hw/xfree86/common/vesamodes
index d2df5931a..851643fa6 100644
--- a/hw/xfree86/common/vesamodes
+++ b/hw/xfree86/common/vesamodes
@@ -3,7 +3,7 @@
 //      "VESA and Industry Standards and Guide for Computer Display Monitor
 //       Timing", version 1.0, revision 0.8, adopted September 17, 1998.
 //  
-//  $XFree86: xc/programs/Xserver/hw/xfree86/etc/vesamodes,v 1.4 1999/11/18 16:52:17 tsi Exp $
+//  $XFree86: xc/programs/Xserver/hw/xfree86/etc/vesamodes,v 1.3 1999/11/16 03:28:03 tsi Exp $
 
 
 # 640x350 @ 85Hz (VESA) hsync: 37.9kHz
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 8f6dd2803..fd5de965a 100644
--- a/hw/xfree86/common/xf86Config.c
+++ b/hw/xfree86/common/xf86Config.c
@@ -1,4 +1,5 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Config.c,v 3.277 2003/10/15 22:51:48 dawes Exp $ */
+/* $XdotOrg$ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Config.c,v 3.276 2003/10/08 14:58:26 dawes Exp $ */
 
 
 /*
@@ -1101,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 3dde4ba7d..3061aab33 100644
--- a/hw/xfree86/common/xf86Configure.c
+++ b/hw/xfree86/common/xf86Configure.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Configure.c,v 3.81 2003/10/29 04:17:21 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Configure.c,v 3.80 2003/10/08 14:58:27 dawes Exp $ */
 /*
  * Copyright 2000-2002 by Alan Hourihane, Flint Mountain, North Wales.
  *
@@ -499,7 +499,7 @@ configureLayoutSection (void)
     int scrnum = 0;
     parsePrologue (XF86ConfLayoutPtr, XF86ConfLayoutRec)
 
-    ptr->lay_identifier = "XFree86 Configured";
+    ptr->lay_identifier = "X.org Configured";
 
     {
 	XF86ConfInputrefPtr iptr;
@@ -632,8 +632,8 @@ configureModuleSection (void)
             /* Add only those font backends which are referenced by fontpath */
             /* 'strstr(dFP,"/dir")' is meant as 'dFP =~ m(/dir\W)' */
     	    if (defaultFontPath && (
-		(strcmp(*el, "xtt")  == 0 &&
-		 strstr(defaultFontPath, "/TrueType")) ||
+		(strcmp(*el, "freetype")  == 0 &&
+		 strstr(defaultFontPath, "/TTF")) ||
     	        (strcmp(*el, "type1")  == 0 &&
 		 strstr(defaultFontPath, "/Type1")) ||
     	        (strcmp(*el, "speedo") == 0 &&
@@ -741,6 +741,16 @@ configureDDCMonitorSection (int screennum)
 	    case DS_ASCII_STR:
 	    case DS_SERIAL:
 	    case DS_RANGES:
+		ptr->mon_hsync[ptr->mon_n_hsync].lo =
+		    ConfiguredMonitor->det_mon[i].section.ranges.min_h;
+		ptr->mon_hsync[ptr->mon_n_hsync].hi =
+		    ConfiguredMonitor->det_mon[i].section.ranges.max_h;
+		ptr->mon_n_vrefresh = 1;
+		ptr->mon_vrefresh[ptr->mon_n_hsync].lo =
+		    ConfiguredMonitor->det_mon[i].section.ranges.min_v;
+		ptr->mon_vrefresh[ptr->mon_n_hsync].hi =
+		ptr->mon_n_hsync++;
+		ConfiguredMonitor->det_mon[i].section.ranges.max_v;
 	    default:
 		break;
 	}
@@ -967,29 +977,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/xf86DGA.c b/hw/xfree86/common/xf86DGA.c
index 5e4bc29b6..bb63cca0e 100644
--- a/hw/xfree86/common/xf86DGA.c
+++ b/hw/xfree86/common/xf86DGA.c
@@ -1,4 +1,5 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86DGA.c,v 1.47 2003/08/24 17:36:51 dawes Exp $ */
+/* $XdotOrg$ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86DGA.c,v 1.46 2002/12/03 18:17:40 tsi Exp $ */
 /*
  * Copyright (c) 1998-2002 by The XFree86 Project, Inc.
  *
diff --git a/hw/xfree86/common/xf86Date.h b/hw/xfree86/common/xf86Date.h
index a9f9a2021..b3e645723 100644
--- a/hw/xfree86/common/xf86Date.h
+++ b/hw/xfree86/common/xf86Date.h
@@ -1,3 +1,4 @@
+/* $XdotOrg: xc/programs/Xserver/hw/xfree86/xf86Date.h,v 1.1.4.2 2003/12/06 13:24:23 kaleb Exp $ */
 /* $XFree86: xc/programs/Xserver/hw/xfree86/xf86Date.h,v 1.54 2003/12/19 04:52:10 dawes Exp $ */
 /*
  * Copyright (c) 2003 by The XFree86 Project, Inc.
diff --git a/hw/xfree86/common/xf86DefModes.c b/hw/xfree86/common/xf86DefModes.c
index 7257b204b..1d6d332ec 100644
--- a/hw/xfree86/common/xf86DefModes.c
+++ b/hw/xfree86/common/xf86DefModes.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86DefModes.c,v 1.10 2003/11/03 05:11:02 tsi Exp $ */
+/* $XFree86$ */
 
 /* THIS FILE IS AUTOMATICALLY GENERATED -- DO NOT EDIT -- LOOK at
  * modeline2c.pl */
diff --git a/hw/xfree86/common/xf86Events.c b/hw/xfree86/common/xf86Events.c
index 07dd88741..3a721a33f 100644
--- a/hw/xfree86/common/xf86Events.c
+++ b/hw/xfree86/common/xf86Events.c
@@ -49,6 +49,7 @@
  */
 
 /* $XConsortium: xf86Events.c /main/46 1996/10/25 11:36:30 kaleb $ */
+/* $XdotOrg: xc/programs/Xserver/hw/xfree86/common/xf86Events.c,v 1.1.4.3 2003/12/06 13:24:24 kaleb Exp $ */
 
 /* [JCH-96/01/21] Extended std reverse map to four buttons. */
 
@@ -402,7 +403,7 @@ xf86ProcessActionEvent(ActionEvent action, void *arg)
 	    /*                                                        */
 	    /* otherwise fallback to sending a key event message to   */
 	    /* the current screen's driver:                           */
-	    if (*pScr->HandleMessage) {
+	    if (*pScr->HandleMessage != NULL) {
 		(void) (*pScr->HandleMessage)(pScr->scrnIndex,
 			"KeyEventMessage", message, &retstr);
 	    }
diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
index 979b655ee..d3e36e02c 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
@@ -1339,15 +1344,15 @@ ddxProcessArgument(int argc, char **argv, int i)
       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;
@@ -1636,6 +1641,11 @@ ddxProcessArgument(int argc, char **argv, int i)
   return xf86ProcessArgument(argc, argv, i);
 }
 
+/* ddxInitGlobals - called by |InitGlobals| from os/util.c */
+void ddxInitGlobals(void)
+{
+}
+
 /*
  * ddxUseMsg --
  *	Print out correct use of device dependent commandline options.
@@ -1650,15 +1660,14 @@ ddxUseMsg()
   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 +1715,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 +1723,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 +1789,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/xf86KbdMach.c b/hw/xfree86/common/xf86KbdMach.c
index fbbafd8af..3b7551fc5 100644
--- a/hw/xfree86/common/xf86KbdMach.c
+++ b/hw/xfree86/common/xf86KbdMach.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86KbdMach.c,v 3.8 1998/07/25 16:55:09 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86KbdMach.c,v 3.7.4.2 1998/06/04 17:35:20 dawes Exp $ */
 /*
  *****************************************************************************
  * HISTORY
diff --git a/hw/xfree86/common/xf86Mode.c b/hw/xfree86/common/xf86Mode.c
index fd2ff4a22..470fb7c95 100644
--- a/hw/xfree86/common/xf86Mode.c
+++ b/hw/xfree86/common/xf86Mode.c
@@ -1,3 +1,4 @@
+/* $XdotOrg$ */
 /* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Mode.c,v 1.69 2003/10/08 14:58:28 dawes Exp $ */
 /*
  * Copyright (c) 1997-2003 by The XFree86 Project, Inc.
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/xf86RandR.c b/hw/xfree86/common/xf86RandR.c
index 546c909ff..44574d5fb 100644
--- a/hw/xfree86/common/xf86RandR.c
+++ b/hw/xfree86/common/xf86RandR.c
@@ -1,5 +1,6 @@
+/* $XdotOrg$ */
 /*
- * $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86RandR.c,v 1.8 2003/11/10 16:42:13 tsi Exp $
+ * $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86RandR.c,v 1.7tsi Exp $
  *
  * Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc.
  *
diff --git a/hw/xfree86/common/xf86Version.h b/hw/xfree86/common/xf86Version.h
index 2eed84783..d40fcdaed 100644
--- a/hw/xfree86/common/xf86Version.h
+++ b/hw/xfree86/common/xf86Version.h
@@ -1,3 +1,4 @@
+/* $XdotOrg: xc/programs/Xserver/hw/xfree86/xf86Version.h,v 1.1.4.3 2003/12/06 13:24:23 kaleb Exp $ */
 /* $XFree86: xc/programs/Xserver/hw/xfree86/xf86Version.h,v 3.566 2003/12/19 04:52:11 dawes Exp $ */
 
 /*
@@ -58,3 +59,4 @@
 #endif
 
 /* $XConsortium: xf86Version.h /main/78 1996/10/28 05:42:10 kaleb $ */
+/* $XdotOrg: xc/programs/Xserver/hw/xfree86/xf86Version.h,v 1.1.4.3 2003/12/06 13:24:23 kaleb Exp $ */
diff --git a/hw/xfree86/common/xf86cmap.c b/hw/xfree86/common/xf86cmap.c
index f7cb065a4..52ab57f4a 100644
--- a/hw/xfree86/common/xf86cmap.c
+++ b/hw/xfree86/common/xf86cmap.c
@@ -1,3 +1,4 @@
+/* $XdotOrg$ */
 /* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86cmap.c,v 1.25 2003/10/17 20:02:12 alanh Exp $ */
 /*
  * Copyright (c) 1998-2001 by The XFree86 Project, Inc.
@@ -26,7 +27,8 @@
  * authorization from the copyright holder(s) and author(s).
  */
 
-#if defined(_XOPEN_SOURCE) || defined(__QNXNTO__)
+#if defined(_XOPEN_SOURCE) || defined(__QNXNTO__) \
+	|| (defined(sun) && defined(__SVR4))
 #include <math.h>
 #else
 #define _XOPEN_SOURCE   /* to get prototype for pow on some systems */
diff --git a/hw/xfree86/common/xf86pciBus.c b/hw/xfree86/common/xf86pciBus.c
index 641d1c919..790bf7409 100644
--- a/hw/xfree86/common/xf86pciBus.c
+++ b/hw/xfree86/common/xf86pciBus.c
@@ -310,7 +310,7 @@ FindPCIVideoInfo(void)
 			    (memType)PCIGETMEMORY64HIGH(pcrp->pci_base1) << 32;
 #else
 			if (pcrp->pci_base1)
-			  info->memBase[0] = 0;
+			    info->memBase[0] = 0;
 #endif
 		    } 
 		}
@@ -910,10 +910,15 @@ removeOverlapsWithBridges(int busIndex, resPtr target)
 {
     PciBusPtr pbp;
     resPtr tmp,bridgeRes = NULL;
-    resRange range = target->val;
+    resRange range;
 
+    if (!target)
+	return;
+    
     if (!ResCanOverlap(&target->val))
 	return;
+
+    range = target->val;
     
     for (pbp=xf86PciBus; pbp; pbp = pbp->next) {
 	if (pbp->primary == busIndex) {
diff --git a/hw/xfree86/common/xf86sbusBus.c b/hw/xfree86/common/xf86sbusBus.c
index 87042cb14..801f2bafe 100644
--- a/hw/xfree86/common/xf86sbusBus.c
+++ b/hw/xfree86/common/xf86sbusBus.c
@@ -20,7 +20,7 @@
  * 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.
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86sbusBus.c,v 3.7 2001/10/28 03:33:19 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86sbusBus.c,v 3.6 2001/03/03 22:16:35 tsi Exp $ */
 
 #include <ctype.h>
 #include <stdio.h>
diff --git a/hw/xfree86/common/xf86sbusBus.h b/hw/xfree86/common/xf86sbusBus.h
index 0816c63a1..81c1b84ac 100644
--- a/hw/xfree86/common/xf86sbusBus.h
+++ b/hw/xfree86/common/xf86sbusBus.h
@@ -20,7 +20,7 @@
  * 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.
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86sbusBus.h,v 3.5 2002/12/10 02:42:35 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86sbusBus.h,v 3.4 2001/10/28 03:33:19 tsi Exp $ */
 
 #ifndef _XF86_SBUSBUS_H
 #define _XF86_SBUSBUS_H
diff --git a/hw/xfree86/common/xf86xv.c b/hw/xfree86/common/xf86xv.c
index eedf47b8b..db19e1442 100644
--- a/hw/xfree86/common/xf86xv.c
+++ b/hw/xfree86/common/xf86xv.c
@@ -28,7 +28,7 @@
  * authorization from the copyright holder(s) and author(s).
  */
 
-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86xv.c,v 1.38 2004/02/19 22:38:12 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86xv.c,v 1.37 2003/11/10 18:22:15 tsi Exp $ */
 
 #include "misc.h"
 #include "xf86.h"
diff --git a/hw/xfree86/common/xisb.c b/hw/xfree86/common/xisb.c
index facc27842..33fedeb0f 100644
--- a/hw/xfree86/common/xisb.c
+++ b/hw/xfree86/common/xisb.c
@@ -24,7 +24,7 @@
  * in this Software without prior written authorization from Metro Link.
  *
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xisb.c,v 1.6 2003/03/25 04:18:21 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xisb.c,v 1.5 2000/11/06 19:24:07 dawes Exp $ */
 
 /*
 	X Input Serial Buffer routines for use in any XInput driver that accesses
diff --git a/hw/xfree86/common/xisb.h b/hw/xfree86/common/xisb.h
index 7b5e26a23..39ae2ee11 100644
--- a/hw/xfree86/common/xisb.h
+++ b/hw/xfree86/common/xisb.h
@@ -24,7 +24,7 @@
  * in this Software without prior written authorization from Metro Link.
  *
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xisb.h,v 1.1 1998/12/05 14:40:10 dawes Exp $ */
+/* $XFree86$ */
 
 #ifndef	_xisb_H_
 #define _xisb_H_
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..f40a452e6
--- /dev/null
+++ b/hw/xfree86/common/xorgVersion.h
@@ -0,0 +1,51 @@
+/* $XdotOrg$ */
+
+/*
+ * 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$ */
diff --git a/hw/xfree86/ddc/DDC.HOWTO b/hw/xfree86/ddc/DDC.HOWTO
index 2f2c95b7f..833a7ab54 100644
--- a/hw/xfree86/ddc/DDC.HOWTO
+++ b/hw/xfree86/ddc/DDC.HOWTO
@@ -94,4 +94,4 @@
 
 
 
-$XFree86: xc/programs/Xserver/hw/xfree86/ddc/DDC.HOWTO,v 1.3 1999/09/25 14:37:16 dawes Exp $
+$XFree86: xc/programs/Xserver/hw/xfree86/ddc/DDC.HOWTO,v 1.2 1998/12/06 13:30:39 dawes Exp $
diff --git a/hw/xfree86/ddc/ddcProperty.c b/hw/xfree86/ddc/ddcProperty.c
index 666dfc632..9b68b81bb 100644
--- a/hw/xfree86/ddc/ddcProperty.c
+++ b/hw/xfree86/ddc/ddcProperty.c
@@ -3,7 +3,7 @@
  * 
  * Copyright 1999 by Andrew C Aitchison <A.C.Aitchison@dpmms.cam.ac.uk>
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/ddcProperty.c,v 1.10 2003/11/03 05:11:04 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/ddcProperty.c,v 1.9tsi Exp $ */
 
 #include "misc.h"
 #include "xf86.h"
diff --git a/hw/xfree86/ddc/edid.c b/hw/xfree86/ddc/edid.c
index a61940cfa..58616d308 100644
--- a/hw/xfree86/ddc/edid.c
+++ b/hw/xfree86/ddc/edid.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/edid.c,v 1.4 2003/02/17 16:08:27 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/edid.c,v 1.3 2000/11/03 18:46:08 eich Exp $ */
 
 /* edid.c:  retrieve EDID record from raw DDC1 data stream: data 
  * is contained in an array of unsigned int each unsigned int 
diff --git a/hw/xfree86/ddc/edid.h b/hw/xfree86/ddc/edid.h
index 7a2f30cb4..ccf9d9280 100644
--- a/hw/xfree86/ddc/edid.h
+++ b/hw/xfree86/ddc/edid.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/edid.h,v 1.7 2000/04/20 21:28:26 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/edid.h,v 1.6 2000/04/17 16:29:55 eich Exp $ */
 
 /* edid.h: defines to parse an EDID block 
  *
diff --git a/hw/xfree86/ddc/interpret_edid.c b/hw/xfree86/ddc/interpret_edid.c
index c0092aed9..bf2509c95 100644
--- a/hw/xfree86/ddc/interpret_edid.c
+++ b/hw/xfree86/ddc/interpret_edid.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/interpret_edid.c,v 1.8 2000/07/13 21:31:37 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/interpret_edid.c,v 1.7 2000/04/17 16:29:55 eich Exp $ */
 
 /* interpret_edid.c: interpret a primary EDID block
  * 
diff --git a/hw/xfree86/ddc/interpret_vdif.c b/hw/xfree86/ddc/interpret_vdif.c
index acd931e70..ac479d326 100644
--- a/hw/xfree86/ddc/interpret_vdif.c
+++ b/hw/xfree86/ddc/interpret_vdif.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/interpret_vdif.c,v 1.6 2000/01/21 02:30:00 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/interpret_vdif.c,v 1.5 1999/12/03 19:17:26 eich Exp $ */
 
 #include "Xarch.h"
 #include "xf86DDC.h"
diff --git a/hw/xfree86/ddc/print_edid.c b/hw/xfree86/ddc/print_edid.c
index 064533800..29f418398 100644
--- a/hw/xfree86/ddc/print_edid.c
+++ b/hw/xfree86/ddc/print_edid.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/print_edid.c,v 1.16 2003/09/24 02:43:17 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/print_edid.c,v 1.15 2001/05/22 17:01:23 tsi Exp $ */
 
 /* print_edid.c: print out all information retrieved from display device 
  * 
diff --git a/hw/xfree86/ddc/print_vdif.c b/hw/xfree86/ddc/print_vdif.c
index fbb540e1d..caea5caa1 100644
--- a/hw/xfree86/ddc/print_vdif.c
+++ b/hw/xfree86/ddc/print_vdif.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/print_vdif.c,v 1.5 2003/11/06 18:37:58 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/print_vdif.c,v 1.4tsi Exp $ */
 
 #include "vdif.h"
 #include "misc.h"
diff --git a/hw/xfree86/ddc/vdif.h b/hw/xfree86/ddc/vdif.h
index 8d358613e..7a647031a 100644
--- a/hw/xfree86/ddc/vdif.h
+++ b/hw/xfree86/ddc/vdif.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/vdif.h,v 1.5 2003/11/06 18:37:58 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/vdif.h,v 1.4tsi Exp $ */
 
 #ifndef _VDIF_H
 #define _VDIF_H
diff --git a/hw/xfree86/ddc/xf86DDC.c b/hw/xfree86/ddc/xf86DDC.c
index 496f3573f..cac425c27 100644
--- a/hw/xfree86/ddc/xf86DDC.c
+++ b/hw/xfree86/ddc/xf86DDC.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/xf86DDC.c,v 1.27 2003/10/30 17:48:19 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/xf86DDC.c,v 1.26 2003/08/22 17:56:24 dawes Exp $ */
 
 /* xf86DDC.c 
  * 
@@ -34,7 +34,7 @@ static XF86ModuleVersionInfo ddcVersRec =
     MODULEVENDORSTRING,
     MODINFOSTRING1,
     MODINFOSTRING2,
-    XF86_VERSION_CURRENT,
+    XORG_VERSION_CURRENT,
     1, 0, 0,
     ABI_CLASS_VIDEODRV,		/* needs the video driver ABI */
     ABI_VIDEODRV_VERSION,
diff --git a/hw/xfree86/ddc/xf86DDC.h b/hw/xfree86/ddc/xf86DDC.h
index b4252ef6b..ae2e26641 100644
--- a/hw/xfree86/ddc/xf86DDC.h
+++ b/hw/xfree86/ddc/xf86DDC.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/xf86DDC.h,v 1.11 2003/02/17 16:08:27 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/xf86DDC.h,v 1.10 2000/06/07 22:03:09 tsi Exp $ */
 
 /* xf86DDC.h
  *
diff --git a/hw/xfree86/dixmods/afbmodule.c b/hw/xfree86/dixmods/afbmodule.c
index 19f196ad8..ac7049c10 100644
--- a/hw/xfree86/dixmods/afbmodule.c
+++ b/hw/xfree86/dixmods/afbmodule.c
@@ -36,7 +36,7 @@ static XF86ModuleVersionInfo VersRec =
 	MODULEVENDORSTRING,
 	MODINFOSTRING1,
 	MODINFOSTRING2,
-	XF86_VERSION_CURRENT,
+	XORG_VERSION_CURRENT,
 	1, 0, 0,
 	ABI_CLASS_ANSIC,		/* Only need the ansic layer */
 	ABI_ANSIC_VERSION,
diff --git a/hw/xfree86/dixmods/cfb16module.c b/hw/xfree86/dixmods/cfb16module.c
index c8c79b545..ef5c79459 100644
--- a/hw/xfree86/dixmods/cfb16module.c
+++ b/hw/xfree86/dixmods/cfb16module.c
@@ -38,7 +38,7 @@ static XF86ModuleVersionInfo VersRec =
 	MODULEVENDORSTRING,
 	MODINFOSTRING1,
 	MODINFOSTRING2,
-	XF86_VERSION_CURRENT,
+	XORG_VERSION_CURRENT,
 	1, 0, 0,
 	ABI_CLASS_ANSIC,		/* Only need the ansic layer */
 	ABI_ANSIC_VERSION,
diff --git a/hw/xfree86/dixmods/cfb24module.c b/hw/xfree86/dixmods/cfb24module.c
index cf363f3c7..e7e683ae0 100644
--- a/hw/xfree86/dixmods/cfb24module.c
+++ b/hw/xfree86/dixmods/cfb24module.c
@@ -38,7 +38,7 @@ static XF86ModuleVersionInfo VersRec =
 	MODULEVENDORSTRING,
 	MODINFOSTRING1,
 	MODINFOSTRING2,
-	XF86_VERSION_CURRENT,
+	XORG_VERSION_CURRENT,
 	1, 0, 0,
 	ABI_CLASS_ANSIC,		/* Only need the ansic layer */
 	ABI_ANSIC_VERSION,
diff --git a/hw/xfree86/dixmods/cfb32module.c b/hw/xfree86/dixmods/cfb32module.c
index 791b64285..2d75763b0 100644
--- a/hw/xfree86/dixmods/cfb32module.c
+++ b/hw/xfree86/dixmods/cfb32module.c
@@ -38,7 +38,7 @@ static XF86ModuleVersionInfo VersRec =
 	MODULEVENDORSTRING,
 	MODINFOSTRING1,
 	MODINFOSTRING2,
-	XF86_VERSION_CURRENT,
+	XORG_VERSION_CURRENT,
 	1, 0, 0,
 	ABI_CLASS_ANSIC,		/* Only need the ansic layer */
 	ABI_ANSIC_VERSION,
diff --git a/hw/xfree86/dixmods/cfbmodule.c b/hw/xfree86/dixmods/cfbmodule.c
index 87af699db..142442adb 100644
--- a/hw/xfree86/dixmods/cfbmodule.c
+++ b/hw/xfree86/dixmods/cfbmodule.c
@@ -38,7 +38,7 @@ static XF86ModuleVersionInfo VersRec =
 	MODULEVENDORSTRING,
 	MODINFOSTRING1,
 	MODINFOSTRING2,
-	XF86_VERSION_CURRENT,
+	XORG_VERSION_CURRENT,
 	1, 0, 0,
 	ABI_CLASS_ANSIC,		/* Only need the ansic layer */
 	ABI_ANSIC_VERSION,
diff --git a/hw/xfree86/dixmods/dbemodule.c b/hw/xfree86/dixmods/dbemodule.c
index f9dcc8477..ff2b7ffbc 100644
--- a/hw/xfree86/dixmods/dbemodule.c
+++ b/hw/xfree86/dixmods/dbemodule.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/dbe/dbemodule.c,v 1.7 2000/01/25 18:37:37 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/dbe/dbemodule.c,v 1.6 1999/01/26 05:53:50 dawes Exp $ */
 
 #include "xf86Module.h"
 
@@ -20,7 +20,7 @@ static XF86ModuleVersionInfo VersRec =
 	MODULEVENDORSTRING,
 	MODINFOSTRING1,
 	MODINFOSTRING2,
-	XF86_VERSION_CURRENT,
+	XORG_VERSION_CURRENT,
 	1, 0, 0,
 	ABI_CLASS_EXTENSION,
 	ABI_EXTENSION_VERSION,
diff --git a/hw/xfree86/dixmods/fbmodule.c b/hw/xfree86/dixmods/fbmodule.c
index 2b9c50408..1b9b665dd 100644
--- a/hw/xfree86/dixmods/fbmodule.c
+++ b/hw/xfree86/dixmods/fbmodule.c
@@ -36,7 +36,7 @@ static XF86ModuleVersionInfo VersRec =
 	MODULEVENDORSTRING,
 	MODINFOSTRING1,
 	MODINFOSTRING2,
-	XF86_VERSION_CURRENT,
+	XORG_VERSION_CURRENT,
 	1, 0, 0,
 	ABI_CLASS_ANSIC,		/* Only need the ansic layer */
 	ABI_ANSIC_VERSION,
diff --git a/hw/xfree86/dixmods/laymodule.c b/hw/xfree86/dixmods/laymodule.c
index 60b6bcfa0..6d7c4e280 100644
--- a/hw/xfree86/dixmods/laymodule.c
+++ b/hw/xfree86/dixmods/laymodule.c
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/programs/Xserver/miext/layer/laymodule.c,v 1.1 2002/11/08 22:19:55 keithp Exp $
+ * $XFree86$
  *
  * Copyright © 2000 Keith Packard
  *
@@ -43,7 +43,7 @@ static XF86ModuleVersionInfo VersRec =
 	MODULEVENDORSTRING,
 	MODINFOSTRING1,
 	MODINFOSTRING2,
-	XF86_VERSION_CURRENT,
+	XORG_VERSION_CURRENT,
 	1, 0, 0,
 	ABI_CLASS_ANSIC,		/* Only need the ansic layer */
 	ABI_ANSIC_VERSION,
diff --git a/hw/xfree86/dixmods/mfbmodule.c b/hw/xfree86/dixmods/mfbmodule.c
index 0617226d0..40d884c9e 100644
--- a/hw/xfree86/dixmods/mfbmodule.c
+++ b/hw/xfree86/dixmods/mfbmodule.c
@@ -35,7 +35,7 @@ static XF86ModuleVersionInfo VersRec =
 	MODULEVENDORSTRING,
 	MODINFOSTRING1,
 	MODINFOSTRING2,
-	XF86_VERSION_CURRENT,
+	XORG_VERSION_CURRENT,
 	1, 0, 0,
 	ABI_CLASS_ANSIC,		/* Only need the ansic layer */
 	ABI_ANSIC_VERSION,
diff --git a/hw/xfree86/dixmods/recordmod.c b/hw/xfree86/dixmods/recordmod.c
index acafc456d..4eebf0ee6 100644
--- a/hw/xfree86/dixmods/recordmod.c
+++ b/hw/xfree86/dixmods/recordmod.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/record/recordmod.c,v 1.6 2000/01/25 18:37:50 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/record/recordmod.c,v 1.5 1999/01/26 05:54:21 dawes Exp $ */
 
 #include "xf86Module.h"
 
@@ -21,7 +21,7 @@ static XF86ModuleVersionInfo VersRec = {
 	MODULEVENDORSTRING,
 	MODINFOSTRING1,
 	MODINFOSTRING2,
-	XF86_VERSION_CURRENT,
+	XORG_VERSION_CURRENT,
 	1, 13, 0,
 	ABI_CLASS_EXTENSION,
 	ABI_EXTENSION_VERSION,
diff --git a/hw/xfree86/dixmods/shmodule.c b/hw/xfree86/dixmods/shmodule.c
index 44aef65ce..f47b03aa9 100644
--- a/hw/xfree86/dixmods/shmodule.c
+++ b/hw/xfree86/dixmods/shmodule.c
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/programs/Xserver/miext/shadow/shmodule.c,v 1.1 2000/09/03 05:07:24 keithp Exp $
+ * $XFree86$
  *
  * Copyright © 2000 Keith Packard
  *
@@ -43,7 +43,7 @@ static XF86ModuleVersionInfo VersRec =
 	MODULEVENDORSTRING,
 	MODINFOSTRING1,
 	MODINFOSTRING2,
-	XF86_VERSION_CURRENT,
+	XORG_VERSION_CURRENT,
 	1, 0, 0,
 	ABI_CLASS_ANSIC,		/* Only need the ansic layer */
 	ABI_ANSIC_VERSION,
diff --git a/hw/xfree86/doc/README.DRI b/hw/xfree86/doc/README.DRI
index e663f2928..7fc52eb32 100644
--- a/hw/xfree86/doc/README.DRI
+++ b/hw/xfree86/doc/README.DRI
@@ -8,7 +8,7 @@
 
 1.1  Copyright
 
-Copyright © 2000-2001 by VA Linux Systems, Inc.  All Rights Reserved.
+Copyright 2000-2001 by VA Linux Systems, Inc.  All Rights Reserved.
 
 Permission is granted to make and distribute verbatim copies of this document
 provided the copyright notice and this permission notice are preserved on all
@@ -1251,7 +1251,6 @@ demo programs is available from http://dri.sourceforge.net/res.phtml
    o In the future there may be IHV and Linux vendor support resources for
      the DRI.
 
-     Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/DRI.sgml,v 1.29 dawes Exp $
+     Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/DRI.sgml,v 1.28 dawes Exp $
 
 
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/README.DRI,v 1.22 2003/07/15 02:28:28 dawes Exp $
diff --git a/hw/xfree86/doc/README.fonts b/hw/xfree86/doc/README.fonts
index 2fe8dfaac..601d11ccb 100644
--- a/hw/xfree86/doc/README.fonts
+++ b/hw/xfree86/doc/README.fonts
@@ -1,14 +1,15 @@
-                              Fonts in XFree86
+                              Fonts in X11R6.7
 
-                    Juliusz Chroboczek, <jch@xfree86.org>
+                  Juliusz Chroboczek, <jch@pps.jussieu.fr>
 
-                              17 November 2003
+                                25 March 2004
 
 1.  Introduction
 
-This document describes the support for fonts in XFree86.  Installing fonts
+This document describes the support for fonts in X11R6.7.  Installing fonts
 (section 2., page 1) is aimed at the casual user wishing to install fonts in
-XFree86; the rest of the document describes the font support in more detail.
+X11R6.7 or XFree86; the rest of the document describes the font support in
+more detail.
 
 We assume some familiarity with digital fonts.  If anything is not clear to
 you, please consult Appendix: Background (section 5., page 1) at the end of
@@ -16,10 +17,10 @@ this document for background information.
 
 1.1  Two font systems
 
-XFree86 includes two font systems: the core X11 fonts system, which is
-present in all implementations of X11, and the Xft fonts system, which is not
-currently distributed with implementations of X11 that are not based on
-XFree86 but will hopefully be included by them in the future
+X includes two font systems: the original core X11 fonts system, which is
+present in all implementations of X11, and the Xft fonts system, which may
+not be distributed with implementations of X11 that are not based on X116.7.0
+but will hopefully be included by them in the future
 
 The core X11 fonts system is directly derived from the fonts system included
 with X11R1 in 1987, which could only use monochrome bitmap fonts.  Over the
@@ -36,7 +37,7 @@ ments with embedded fonts.
 
 Xft is not compatible with the core fonts system: usage of Xft requires mak-
 ing fairly extensive changes to toolkits (user-interface libraries).  While
-XFree86 will continue to maintain the core fonts system, toolkit authors are
+X.org will continue to maintain the core fonts system, toolkit authors are
 encouraged to switch to Xft as soon as possible.
 
 2.  Installing fonts
@@ -48,13 +49,13 @@ access newly-installed fonts.
 
 Xft has no configuration mechanism itself, rather it relies upon the fontcon-
 fig library to configure and customize fonts.  That library is not specific
-to XFree86 or indeed on any particular font output mechanism.  This discus-
+to X11R6.7.0 or indeed on any particular font output mechanism.  This discus-
 sion describes how fontconfig, rather than Xft, works.
 
 2.1.1  Installing fonts in Xft
 
 Fontconfig looks for fonts in a set of well-known directories that include
-all of XFree86's standard font directories (`/usr/X11R6/lib/X11/lib/fonts/*')
+all of X11R6.7's standard font directories (`/usr/X11R6/lib/X11/lib/fonts/*')
 by default) as well as a directory called `.fonts/' in the user's home direc-
 tory.  Installing a font for use by Xft applications is as simple as copying
 a font file into one of these directories.
@@ -114,9 +115,9 @@ Anti-aliasing can be disabled for all fonts by the following incantation:
          </edit>
      </match>
 
-Xft supports sub-pixel rasterisation on LCD displays.  XFree86 should auto-
-matically enable this feature on laptops and when using an LCD monitor con-
-nected with a DVI cable; you can check whether this was done by typing
+Xft supports sub-pixel rasterisation on LCD displays.  X11R67 should automat-
+ically enable this feature on laptops and when using an LCD monitor connected
+with a DVI cable; you can check whether this was done by typing
 
      $ xdpyinfo -ext RENDER | grep sub-pixel
 
@@ -167,10 +168,10 @@ disabled by your Xft configuration file.
 2.1.4  Troubleshooting
 
 If some Xft-based applications don't seem to notice the changes you are mak-
-ing to your configuration files, they may be linked against the XFree86 4.2
-version of Xft.  In order to fix the problem, you should relink them against
-a current version of Xft; on most systems, it is enough to install the cur-
-rent version of the Xft and Fontconfig libraries.
+ing to your configuration files, they may be linked against an old version of
+Xft.  In order to fix the problem, you should relink them against a current
+version of Xft; on most systems, it is enough to install the current version
+of the Xft and Fontconfig libraries.
 
 If, for some reason, you cannot upgrade the shared libraries, please check
 the Xft(3) manual page included with XFree86 4.2 for the configuration mecha-
@@ -185,8 +186,8 @@ of this new directory by including it in the font path.
 
 2.2.1  Installing bitmap fonts
 
-The XFree86 server can use bitmap fonts in both the cross-platform BDF format
-and the somewhat more efficient binary PCF format.  (XFree86 also supports
+The X11R6.7 server can use bitmap fonts in both the cross-platform BDF format
+and the somewhat more efficient binary PCF format.  (X11R6.7 also supports
 the obsolete SNF format.)
 
 Bitmap fonts are normally distributed in the BDF format.  Before installing
@@ -215,7 +216,7 @@ directory; see Setting the server font path (section 2.2.4, page 1) below.
 
 2.2.2  Installing scalable fonts
 
-The XFree86 server supports scalable fonts in four formats: Type 1, Speedo,
+The X11R6.7 server supports scalable fonts in four formats: Type 1, Speedo,
 TrueType and CIDFont.  This section only applies to the former three; for
 information on CIDFonts, please see Installing CIDFonts (section 2.2.3, page
 1) later in this document.
@@ -251,7 +252,7 @@ CMap `UniKS-UCS2-H' is called
 
      Munhwa-Regular--UniKS-UCS2-H
 
-The CIDFont code in XFree86 requires a very rigid directory structure.  The
+The CIDFont code in X11R6.7 requires a very rigid directory structure.  The
 main directory must be called `CID' (its location defaults to
 `/usr/X11R6/lib/X11/fonts/CID' but it may be located anywhere), and it should
 contain a subdirectory for every CID collection.  Every subdirectory must
@@ -310,7 +311,7 @@ For best results, scalable fonts should appear in the font path before the
 bitmap fonts; this way, the server will prefer bitmap fonts to scalable fonts
 when an exact match is possible, but will avoid scaling bitmap fonts when a
 scalable font can be used.  (The `:unscaled' hack, while still supported,
-should no longer be necessary in XFree86 4.0 and later.)
+should no longer be necessary in X11R6.7.0.)
 
 You may check the font path of the running server by typing the command
 
@@ -334,15 +335,15 @@ For more information, please consult the xset(1) manual page.
 2.2.4.2  Permanent modification of the font path
 
 The default font path (the one used just after server startup or after `xset
-fp default') is specified in the X server's `XF86Config' file.  It is com-
-puted by appending all the directories mentioned in the `FontPath' entries of
-the `Files' section in the order in which they appear.
+fp default') is specified in the X server's `xorg.conf' file.  It is computed
+by appending all the directories mentioned in the `FontPath' entries of the
+`Files' section in the order in which they appear.
 
      FontPath "/usr/local/fonts/Type1"
      ...
      FontPath "/usr/local/fonts/bitmap"
 
-For more information, please consult the XF86Config(5) manual page.
+For more information, please consult the xorg.conf(5) manual page.
 
 2.2.5  Troubleshooting
 
@@ -353,19 +354,19 @@ mounted font directories).  If this doesn't help, it is quite possible that
 you are trying to use a font in a format that is not supported by your
 server.
 
-XFree86 supports the BDF, PCF, SNF, Type 1, Speedo, TrueType, OpenType and
-CIDFont font formats.  However, not all XFree86 servers come with all the
-font backends configured in.
+X11R6.7 supports the BDF, PCF, SNF, Type 1, Speedo, TrueType, OpenType and
+CIDFont font formats.  However, not all X11R6.7 or XFree86 servers come with
+all the font backends configured in.
 
-On most platforms, the XFree86 servers are modular: the font backends are
+On most platforms, the X11R6.7 servers are modular: the font backends are
 included in modules that are loaded at runtime.  The modules to be loaded are
-specified in the `XF86Config' file using the `Load' directive:
+specified in the `xorg.conf' file using the `Load' directive:
 
      Load "type1"
 
 If you have trouble installing fonts in a specific format, you may want to
 check the server's log file in order to see whether the relevant modules are
-properly loaded.  The list of font modules distributed with XFree86 is as
+properly loaded.  The list of font modules distributed with X11R6.7 is as
 follows:
 
    o  "bitmap": bitmap fonts (`*.bdf', `*.pcf' and `*.snf');
@@ -382,7 +383,7 @@ follows:
 
 Please note that the argument of the `Load' directive is case-sensitive.
 
-3.  Fonts included with XFree86
+3.  Fonts included with X11R6.7
 
 3.1  Standard bitmap fonts
 
@@ -391,7 +392,7 @@ fonts, including the `fixed' family, and bitmap versions of Courier, Times,
 Helvetica and some members of the Lucida family.  In the SI, these fonts are
 provided in the ISO 8859-1 encoding (ISO Latin Western-European).
 
-In XFree86, a number of these fonts are provided in Unicode-encoded font
+In X11R6.7, a number of these fonts are provided in Unicode-encoded font
 files instead.  At build time, these fonts are split into font files encoded
 according to legacy encodings, a process which allows us to provide the stan-
 dard fonts in a number of regional encodings with no duplication of work.
@@ -469,7 +470,7 @@ for improved presentation of text.
 
 3.3  Standard scalable fonts
 
-XFree86 includes all the scalable fonts distributed with X11R6.
+X11R6.7 includes all the scalable fonts distributed with X11R6.
 
 3.3.1  Standard Type 1 fonts
 
@@ -491,7 +492,7 @@ and reside in the font files
 
      /usr/X11R6/lib/X11/fonts/Type1/UT*.pfa
 
-Finally, XFree86 also comes with Type 1 versions of Bitstream Courier and
+Finally, X11R6.7 also comes with Type 1 versions of Bitstream Courier and
 Charter.  These fonts have XLFD
 
      -bitstream-courier-*-*-normal--0-0-0-0-m-0-iso8859-1
@@ -503,7 +504,7 @@ and reside in the font files
 
 3.3.2  Standard Speedo fonts
 
-XFree86 includes Speedo versions of the Bitstream Courier and Charter fonts.
+X11R6.7 includes Speedo versions of the Bitstream Courier and Charter fonts.
 In order to use these fonts, you should ensure that your X server is loading
 the `Speedo' font backend; see Troubleshooting (section 2.2.5, page 1).
 
@@ -519,7 +520,7 @@ and reside in the font files
 
 3.4  The Bigelow & Holmes Luxi family
 
-XFree86 includes the Luxi family of scalable fonts, in both TrueType and
+X11R6.7 includes the Luxi family of scalable fonts, in both TrueType and
 Type 1 format.  This family consists of the fonts Luxi Serif, with XLFD
 
      -b&h-luxi serif-medium-*-normal--*-*-*-*-p-*-*-*
@@ -565,11 +566,11 @@ For more information, please contact <design@bigelowandholmes.com> or
 
 An earlier version of the Luxi fonts was made available under the name
 Lucidux.  This name should no longer be used due to trademark uncertainties,
-and all traces of the Lucidux name have been removed from XFree86.
+and all traces of the Lucidux name have been removed from X11R6.7.
 
 4.  More about core fonts
 
-This section describes XFree86-specific enhancements to the core X11 fonts
+This section describes X11R6.7-specific enhancements to the core X11 fonts
 system.
 
 4.1  Core fonts and internationalisation
@@ -655,7 +656,7 @@ option followed by the name of a directory containing encoding files, can be
 used to automatically build `encodings.dir' files.  Please see the mkfont-
 dir(1) manual page for more details.
 
-A number of encoding files for common encodings are included with XFree86.
+A number of encoding files for common encodings are included with X11R6.7.
 Information on writing new encoding files can be found in Format of encodings
 directory files (section 4.1.3, page 1) and Format of encoding files (section
 4.1.4, page 1) later in this document.
@@ -991,7 +992,7 @@ ings, but instead uses its own database of encodings.
 
 Since the functionalities for CJKV support introduced by X-TT have been
 merged into the new FreeType backend, the X-TT backend will be removed from
-XFree86's tree near the future.  Therefore, the use of FreeType backend is
+X11R6.7's tree near the future.  Therefore, the use of FreeType backend is
 preferred over the X-TT backend.
 
 General information on X-TrueType may be found at the After X-TT Project page
@@ -1138,16 +1139,16 @@ last two fields of their XLFD set to `iso10646-1'.
 
 6.  References
 
-XFree86 comes with extensive documentation in the form of manual pages and
+X11R6.7 comes with extensive documentation in the form of manual pages and
 typeset documents.  Before installing fonts, you really should read the font-
 config(3) and mkfontdir(1) manual pages; other manual pages of interest
 include X(7), Xserver(1), xset(1), Xft(3), xlsfonts(1) and showfont(1).  In
 addition, you may want to read the X Logical Font Description document, by
 Jim Flowers, which is provided in the file `xc/doc/xlfd.PS.Z'.
 
-The latest released version of the XFree86 documentation (including this doc-
-ument and all manual pages) is available as current XFree86 documentation
-<URL:http://www.xfree86.org/current/>.
+The latest released version of the X11R6.7 documentation (including this doc-
+ument and all manual pages) can be found from current X11R6.7 documentation
+<URL:http://wiki.x.org/>.
 
 The comp.fonts FAQ <URL:http://www.netmeg.net/faq/computers/fonts/>, which is
 unfortunately no longer being maintained, contains a wealth of information
@@ -1181,7 +1182,6 @@ The IANA RFC documents, available from a number of sites throughout the
 world, often provide interesting information about character set issues; see
 for example RFC 373.
 
-     Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/fonts.sgml,v 1.24 dawes Exp $
+     Generated from Id: fonts.sgml,v 1.1.4.3.2.2 eich Exp $
 
 
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/README.fonts,v 1.28 2003/12/20 19:47:28 dawes Exp $
diff --git a/hw/xfree86/doc/README.rapidaccess b/hw/xfree86/doc/README.rapidaccess
index a78dfb9bc..d19eb81c6 100644
--- a/hw/xfree86/doc/README.rapidaccess
+++ b/hw/xfree86/doc/README.rapidaccess
@@ -45,4 +45,4 @@ Dennis Björklund <db@zigo.dhs.org>
 
 
 
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/README.rapidaccess,v 1.1 2001/05/18 23:35:32 dawes Exp $
+$XFree86$
diff --git a/hw/xfree86/doc/changelogs/CHANGELOG b/hw/xfree86/doc/changelogs/CHANGELOG
index d9b4eb16b..8c1954452 100644
--- a/hw/xfree86/doc/changelogs/CHANGELOG
+++ b/hw/xfree86/doc/changelogs/CHANGELOG
@@ -1,41 +1,3 @@
-XFree86 4.4.99.2 (xx March 2004)
-
-XFree86 4.4.99.1 (12 March 2004)
-  18. IRIX allows for a relatively low number of command arguments, so break up
-      font clean rules accordingly (Marc La France).
-  17. Change radeon driver to save/restore colour lookup tables
-      (Marc La France).
-  16. Fix ix86 pre-Solaris8 mmap() problems by deleting obsolete code
-      (Marc La France).
-  15. Fix build glitch on SunOS SPARC (Marc La France).
-  14. Clean up constype utility used on SPARC's (Marc La France).
-  13. Experimental changes to recognise parameterised macros in makedepend
-      (From #6003, Alexander Stohr).
-  12. Change scanpci utility to optionally display PCI bus linkages
-      (Marc La France).
-  11. Fixes for building on Solaris/sparc with Sun's compiler (Mark Kandianis).
-  10. Add support for specifying the screen origins for Xvfb, which is
-      useful when Xinerama is enabled (David Dawes).
-   9. Fix X-Resource extension server crash when the client and server hosts
-      have different endianness (Bugzilla #1242, Alan Coopersmith).
-   8. Fix an off-by-one error that can lead to malloc problems (Bugzilla #512,
-      Kyle Bateman).
-   7. Xterm patch #185 (Thomas Dickey).
-   6. Do the Linux KDKBDREP ioctl on the correct fd.  This prevents the
-      fallback that tries to directly program the keyboard repeat rate,
-      and the related warning messages that recent Linux kernels generate
-      (David Dawes).
-   5. Turn off the DAC for Radeon DPMS modes.  Without this some monitors
-      can be badly affected. (Bugzilla #1221, Hui Yu@ATI, reported by
-      Paul Shupak).
-   4. VeraIt.ttf wasn't getting installed (Bugzilla #1226, Matthieu Herrb).
-   3. Fix an attempted free of an invalid pointer in ScreenSaverSetAttributes()
-      (Bugzilla #1224, Matthieu Herrb, David Dawes).
-   2. Fix a build problem when build server side GL libraries on a system
-      with no installed X headers (Alan Hourihane).
-   1. Fix HTML man page index generation to handle recent rman changes
-      (David Dawes).
-
 XFree86 4.4.0 (29 February 2004)
  821. Fix Radeon secondary head register initialization (Hui Yu@ATI,
       Benjamin Herrenschmidt).
@@ -18721,7 +18683,7 @@ XFree86 3.0a (28 April 1994)
 XFree86 3.0 (26 April 1994)
 
 
-$XFree86: xc/programs/Xserver/hw/xfree86/CHANGELOG,v 3.3173 2004/03/12 12:09:11 dawes Exp $
+$XFree86: xc/programs/Xserver/hw/xfree86/CHANGELOG,v 3.3156 2004/02/29 04:25:24 martin Exp $
 
 
 
diff --git a/hw/xfree86/doc/changelogs/CHANGELOG.ND b/hw/xfree86/doc/changelogs/CHANGELOG.ND
index 3c9e1e1f6..5f0d87780 100644
--- a/hw/xfree86/doc/changelogs/CHANGELOG.ND
+++ b/hw/xfree86/doc/changelogs/CHANGELOG.ND
@@ -415,4 +415,4 @@ XFree86 3.9j (12 July 1997)
 
 
 
-$XFree86: xc/programs/Xserver/hw/xfree86/CHANGELOG.ND,v 1.3 1998/08/02 05:16:54 dawes Exp $
+$XFree86: xc/programs/Xserver/hw/xfree86/CHANGELOG.ND,v 1.2 1998/07/31 10:41:14 dawes Exp $
diff --git a/hw/xfree86/doc/devel/Domain.note b/hw/xfree86/doc/devel/Domain.note
index 3db2aefae..ce0812b22 100644
--- a/hw/xfree86/doc/devel/Domain.note
+++ b/hw/xfree86/doc/devel/Domain.note
@@ -156,4 +156,4 @@ Most drivers currently used on ix86 need(ed) source code changes.
   multi-domain architectures, and support for Mach64 variants as
   non-primary heads is not yet available.
 
-$XFree86: xc/programs/Xserver/hw/xfree86/Domain.note,v 1.2 2002/01/25 21:55:49 tsi Exp $
+$XFree86$
diff --git a/hw/xfree86/doc/devel/README.DRIcomp b/hw/xfree86/doc/devel/README.DRIcomp
index 0f1bd1b69..89f40a759 100644
--- a/hw/xfree86/doc/devel/README.DRIcomp
+++ b/hw/xfree86/doc/devel/README.DRIcomp
@@ -8,7 +8,7 @@
 
 1.1  Copyright
 
-Copyright © 2000-2001 by VA Linux Systems, Inc.  All Rights Reserved.
+Copyright 2000-2001 by VA Linux Systems, Inc.  All Rights Reserved.
 
 Permission is granted to make and distribute verbatim copies of this document
 provided the copyright notice and this permission notice are preserved on all
@@ -551,7 +551,6 @@ At this point your X server should be up and running with hardware-acceler-
 ated direct rendering.  Please read the DRI User Guide for information about
 trouble shooting and how to use the DRI-enabled X server for 3D applications.
 
-     Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/DRIcomp.sgml,v 1.20 dawes Exp $
+     Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/DRIcomp.sgml,v 1.19 dawes Exp $
 
 
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/README.DRIcomp,v 3.17 2003/07/15 02:28:28 dawes Exp $
diff --git a/hw/xfree86/doc/devel/Registry b/hw/xfree86/doc/devel/Registry
index 9c4111348..d76622157 100644
--- a/hw/xfree86/doc/devel/Registry
+++ b/hw/xfree86/doc/devel/Registry
@@ -407,4 +407,4 @@ and underscores removed.
 
 
 
-$XFree86: xc/programs/Xserver/hw/xfree86/Registry,v 1.19 2003/02/20 04:05:12 dawes Exp $
+$XFree86: xc/programs/Xserver/hw/xfree86/Registry,v 1.18 2002/04/06 18:31:09 tsi Exp $
diff --git a/hw/xfree86/doc/man/Xorg.man.pre b/hw/xfree86/doc/man/Xorg.man.pre
new file mode 100644
index 000000000..df13a5b9b
--- /dev/null
+++ b/hw/xfree86/doc/man/Xorg.man.pre
@@ -0,0 +1,691 @@
+.\" $XdotOrg$
+.TH __xservername__ __appmansuffix__ __vendorversion__
+.SH NAME
+__xservername__ - X11R6 X server
+.SH SYNOPSIS
+.B __xservername__
+.RI [\fB:\fP display ]
+.RI [ option
+.IR ... ]
+.SH DESCRIPTION
+.B __xservername__
+is a full featured X server that was originally designed for UNIX and
+UNIX-like operating systems running on Intel x86 hardware.  It now runs
+on a wider range of hardware and OS platforms.
+.PP
+This work was derived from
+.I "XFree86\ 4.4rc2"
+by the X.Org Foundation.
+The XFree86 4.4rc2 release was originally derived from
+.I "X386\ 1.2"
+by Thomas Roell which was contributed to X11R5 by Snitily Graphics
+Consulting Service.  The
+.B __xservername__
+server architecture includes
+among many other things a loadable module system derived from code
+donated by Metro Link, Inc.  The current __xservername__ release is compatible
+with X11R6.6.
+.SH PLATFORMS
+.PP
+.B __xservername__
+operates under a wide range of operating systems and hardware platforms.
+The Intel x86 (IA32) architecture is the most widely supported hardware
+platform.  Other hardware platforms include Compaq Alpha, Intel IA64,
+SPARC and PowerPC.  The most widely supported operating systems are the
+free/OpenSource UNIX-like systems such as Linux, FreeBSD, NetBSD and
+OpenBSD.  Commercial UNIX operating systems such as Solaris (x86) and
+UnixWare are also supported.  Other supported operating systems include
+LynxOS, and GNU Hurd.  Darwin and Mac OS X are supported with the
+XDarwin(1) X server.  Win32/Cygwin is supported with the XWin X server.
+.PP
+.SH "NETWORK CONNECTIONS"
+.B __xservername__
+supports connections made using the following reliable
+byte-streams:
+.TP 4
+.I "Local"
+On most platforms, the "Local" connection type is a UNIX-domain socket.
+On some System V platforms, the "local" connection types also include
+STREAMS pipes, named pipes, and some other mechanisms.
+.TP 4
+.I TCP\/IP
+.B __xservername__
+listens on port
+.RI 6000+ n ,
+where
+.I n
+is the display number.  This connection type can be disabled with the
+.B \-nolisten
+option (see the Xserver(1) man page for details).
+.SH "ENVIRONMENT VARIABLES"
+For operating systems that support local connections other than Unix
+Domain sockets (SVR3 and SVR4), there is a compiled-in list specifying
+the order in which local connections should be attempted.  This list
+can be overridden by the
+.I XLOCAL
+environment variable described below.  If the display name indicates a
+best-choice connection should be made (e.g.
+.BR :0.0 ),
+each connection mechanism is tried until a connection succeeds or no
+more mechanisms are available.  Note: for these OSs, the Unix Domain
+socket connection is treated differently from the other local connection
+types.  To use it the connection must be made to
+.BR unix:0.0 .
+.PP
+The
+.I XLOCAL
+environment variable should contain a list of one more
+more of the following:
+.PP
+.RS 8
+.nf
+NAMED
+PTS
+SCO
+ISC
+.fi
+.RE
+.PP
+which represent SVR4 Named Streams pipe, Old-style USL Streams pipe,
+SCO XSight Streams pipe, and ISC Streams pipe, respectively.  You can
+select a single mechanism (e.g.
+.IR XLOCAL=NAMED ),
+or an ordered list (e.g. \fIXLOCAL="NAMED:PTS:SCO"\fP).
+his variable overrides the compiled-in defaults.  For SVR4 it is
+recommended that
+.I NAMED
+be the first preference connection.  The default setting is
+.IR PTS:NAMED:ISC:SCO .
+.PP
+To globally override the compiled-in defaults, you should define (and
+export if using
+.B sh
+or
+.BR ksh )
+.I XLOCAL
+globally.  If you use startx(1) or xinit(1), the definition should be
+at the top of your
+.I .xinitrc
+file.  If you use xdm(1), the definitions should be early on in the
+.I __projectroot__/lib/X11/xdm/Xsession
+script.
+.SH OPTIONS
+.B __xservername__
+supports several mechanisms for supplying/obtaining configuration and
+run-time parameters: command line options, environment variables, the
+__xconfigfile__(__filemansuffix__) configuration file, auto-detection, and
+fallback defaults.  When the same information is supplied in more than
+one way, the highest precedence mechanism is used.  The list of mechanisms
+is ordered from highest precedence to lowest.  Note that not all parameters
+can be supplied via all methods.  The available command line options
+and environment variables (and some defaults) are described here and in
+the Xserver(1) manual page.  Most configuration file parameters, with
+their defaults, are described in the __xconfigfile__(__filemansuffix__) manual
+page.  Driver and module specific configuration parameters are described
+in the relevant driver or module manual page.
+.PP
+In addition to the normal server options described in the Xserver(1)
+manual page,
+.B __xservername__
+accepts the following command line switches:
+.TP 8
+.BI vt XX
+.I XX
+specifies the Virtual Terminal device number which
+.B __xservername__
+will use.  Without this option,
+.B __xservername__
+will pick the first available Virtual Terminal that it can locate.  This
+option applies only to platforms such as Linux, BSD, SVR3 and SVR4, that
+have virtual terminal support.
+.TP
+.B \-allowMouseOpenFail
+Allow the server to start up even if the mouse device can't be opened
+or initialised.  This is equivalent to the
+.B AllowMouseOpenFail
+__xconfigfile__(__filemansuffix__) file option.
+.TP 8
+.B \-allowNonLocalModInDev
+Allow changes to keyboard and mouse settings from non-local clients.
+By default, connections from non-local clients are not allowed to do
+this.  This is equivalent to the
+.B AllowNonLocalModInDev
+__xconfigfile__(__filemansuffix__) file option.
+.TP 8
+.B \-allowNonLocalXvidtune
+Make the VidMode extension available to remote clients.  This allows
+the xvidtune client to connect from another host.  This is equivalent
+to the
+.B AllowNonLocalXvidtune
+__xconfigfile__(__filemansuffix__) file option.  By default non-local
+connections are not allowed.
+.TP 8
+.BI \-bgamma " value"
+Set the blue gamma correction.
+.I value
+must be between 0.1 and 10.
+The default is 1.0.  Not all drivers support this.  See also the
+.BR \-gamma ,
+.BR \-rgamma ,
+and
+.B \-ggamma
+options.
+.TP 8
+.BI \-bpp " n"
+No longer supported.  Use
+.B \-depth
+to set the color depth, and use
+.B \-fbbpp
+if you really need to force a non-default framebuffer (hardware) pixel
+format.
+.TP
+.B \-configure
+When this option is specified, the
+.B __xservername__
+server loads all video driver modules, probes for available hardware,
+and writes out an initial __xconfigfile__(__filemansuffix__) file based on
+what was detected.  This option currently has some problems on some
+platforms, but in most cases it is a good way to bootstrap the
+configuration process.  This option is only available when the server
+is run as root (i.e, with real-uid 0).
+.TP 8
+.BI "\-crt /dev/tty" XX
+SCO only.  This is the same as the
+.B vt
+option, and is provided for compatibility with the native SCO X server.
+.TP 8
+.BI \-depth " n"
+Sets the default color depth.  Legal values are 1, 4, 8, 15, 16, and
+24.  Not all drivers support all values.
+.TP 8
+.B \-disableModInDev
+Disable dynamic modification of input device settings.  This is equivalent
+to the
+.B DisableModInDev
+__xconfigfile__(__filemansuffix__) file option.
+.TP 8
+.B \-disableVidMode
+Disable the the parts of the VidMode extension (used by the xvidtune
+client) that can be used to change the video modes.  This is equivalent
+to the
+.B DisableVidModeExtension
+__xconfigfile__(__filemansuffix__) file option.
+.TP 8
+.B \-fbbpp \fIn\fP
+Sets the number of framebuffer bits per pixel.  You should only set this
+if you're sure it's necessary; normally the server can deduce the correct
+value from
+.B \-depth
+above.  Useful if you want to run a depth 24 configuration with a 24
+bpp framebuffer rather than the (possibly default) 32 bpp framebuffer
+(or vice versa).  Legal values are 1, 8, 16, 24, 32.  Not all drivers
+support all values.
+.TP 8
+.B \-flipPixels
+Swap the default values for the black and white pixels.
+.TP 8
+.BI \-gamma " value"
+Set the gamma correction.
+.I value
+must be between 0.1 and 10.  The default is 1.0.  This value is applied
+equally to the R, G and B values.  Those values can be set independently
+with the
+.BR \-rgamma ,
+.BR \-bgamma ,
+and
+.B \-ggamma
+options.  Not all drivers support this.
+.TP 8
+.BI \-ggamma " value"
+Set the green gamma correction.
+.I value
+must be between 0.1 and 10.  The default is 1.0.  Not all drivers support
+this.  See also the
+.BR \-gamma ,
+.BR \-rgamma ,
+and
+.B \-bgamma
+options.
+.TP 8
+.B \-ignoreABI
+The
+.B __xservername__
+server checks the ABI revision levels of each module that it loads.  It
+will normally refuse to load modules with ABI revisions that are newer
+than the server's.  This is because such modules might use interfaces
+that the server does not have.  When this option is specified, mismatches
+like this are downgraded from fatal errors to warnings.  This option
+should be used with care.
+.TP 8
+.B \-keeptty
+Prevent the server from detaching its initial controlling terminal.
+This option is only useful when debugging the server.  Not all platforms
+support (or can use) this option.
+.TP 8
+.BI \-keyboard " keyboard-name"
+Use the __xconfigfile__(__filemansuffix__) file
+.B InputDevice
+section called
+.I keyboard-name
+as the core keyboard.  This option is ignored when the
+.B Layout
+section specifies a core keyboard.  In the absence of both a Layout
+section and this option, the first relevant
+.B InputDevice
+section is used for the core keyboard.
+.TP 8
+.BI \-layout " layout-name"
+Use the __xconfigfile__(__filemansuffix__) file
+.B Layout
+section called
+.IR layout-name .
+By default the first
+.B Layout
+section is used.
+.TP 8
+.BI \-logfile " filename"
+Use the file called
+.I filename
+as the
+.B __xservername__
+server log file.  The default log file is
+.BI __logdir__/__xservername__. n .log
+on most platforms, where
+.I n
+is the display number of the
+.B __xservername__
+server.  The default may be in a different directory on some platforms.
+This option is only available when the server is run as root (i.e, with
+real-uid 0).
+.TP 8
+.BR \-logverbose " [\fIn\fP]"
+Sets the verbosity level for information printed to the
+.B __xservername__
+server log file.  If the
+.I n
+value isn't supplied, each occurrence of this option increments the log
+file verbosity level.  When the
+.I n
+value is supplied, the log file verbosity level is set to that value.
+The default log file verbosity level is 3.
+.TP 8
+.BI \-modulepath " searchpath"
+Set the module search path to
+.IR searchpath .
+.I searchpath
+is a comma separated list of directories to search for
+.B __xservername__
+server modules.  This option is only available when the server is run
+as root (i.e, with real-uid 0).
+.TP 8
+.B \-nosilk
+Disable Silken Mouse support.
+.TP 8
+.B \-pixmap24
+Set the internal pixmap format for depth 24 pixmaps to 24 bits per pixel.
+The default is usually 32 bits per pixel.  There is normally little
+reason to use this option.  Some client applications don't like this
+pixmap format, even though it is a perfectly legal format.  This is
+equivalent to the
+.B Pixmap
+__xconfigfile__(__filemansuffix__) file option.
+.TP 8
+.B \-pixmap32
+Set the internal pixmap format for depth 24 pixmaps to 32 bits per pixel.
+This is usually the default.  This is equivalent to the
+.B Pixmap
+__xconfigfile__(__filemansuffix__) file option.
+.TP 8
+.BI \-pointer " pointer-name"
+Use the __xconfigfile__(__filemansuffix__) file
+.B InputDevice
+section called
+.I pointer-name
+as the core pointer.  This option is ignored when the
+.B Layout
+section specifies a core pointer.  In the absence of both a Layout
+section and this option, the first relevant
+.B InputDevice
+section is used for the core pointer.
+.TP 8
+.B \-probeonly
+Causes the server to exit after the device probing stage.  The
+__xconfigfile__(__filemansuffix__) file is still used when this option is
+given, so information that can be auto-detected should be commented out.
+.TP 8
+.B \-quiet
+Suppress most informational messages at startup.  The verbosity level
+is set to zero.
+.TP 8
+.BI \-rgamma " value"
+Set the red gamma correction.
+.I value
+must be between 0.1 and 10.  The default is 1.0.  Not all drivers support
+this.  See also the
+.BR \-gamma ,
+.BR \-bgamma ,
+and
+.B \-ggamma
+options.
+.TP 8
+.B \-scanpci
+When this option is specified, the
+.B __xservername__
+server scans the PCI bus, and prints out some information about each
+device that was detected.  See also scanpci(1) and pcitweak(1).
+.TP 8
+.BI \-screen " screen-name"
+Use the __xconfigfile__(__filemansuffix__) file
+.B Screen
+section called
+.IR screen-name .
+By default the screens referenced by the default
+.B Layout
+section are used, or the first
+.B Screen
+section when there are no
+.B Layout
+sections.
+.TP 8
+.B \-showconfig
+This is the same as the
+.B \-version
+option, and is included for compatibility reasons.  It may be removed
+in a future release, so the
+.B \-version
+option should be used instead.
+.TP 8
+.BI \-weight " nnn"
+Set RGB weighting at 16 bpp.  The default is 565.  This applies only to
+those drivers which support 16 bpp.
+.TP 8
+.BR \-verbose " [\fIn\fP]"
+Sets the verbosity level for information printed on stderr.  If the
+.I n
+value isn't supplied, each occurrence of this option increments the
+verbosity level.  When the
+.I n
+value is supplied, the verbosity level is set to that value.  The default
+verbosity level is 0.
+.TP 8
+.B \-version
+Print out the server version, patchlevel, release date, the operating
+system/platform it was built on, and whether it includes module loader
+support.
+.TP 8
+.BI \-config " file"
+Read the server configuration from
+.IR file .
+This option will work for any file when the server is run as root (i.e,
+with real-uid 0), or for files relative to a directory in the config
+search path for all other users.
+.SH "KEYBOARD"
+.PP
+The
+.B __xservername__
+server is normally configured to recognize various special combinations
+of key presses that instruct the server to perform some action, rather
+than just sending the key press event to a client application.  The
+default XKEYBOARD keymap defines the key combinations listed below.
+The server also has these key combinations builtin to its event handler
+for cases where the XKEYBOARD extension is not being used.  When using
+the XKEYBOARD extension, which key combinations perform which actions
+is completely configurable.
+.PP
+For more information about when the builtin event handler
+is used to recognize the special key combinations, see
+the documentation on the
+.B HandleSpecialKeys
+option in the __xconfigfile__(__filemansuffix__) man page.
+.PP
+The special combinations of key presses recognized directly
+by
+.B __xservername__
+are:
+.TP 8
+.B Ctrl+Alt+Backspace
+Immediately kills the server -- no questions asked.  This can be disabled
+with the
+.B DontZap
+__xconfigfile__(__filemansuffix__) file option.
+.TP 8
+.B Ctrl+Alt+Keypad-Plus
+Change video mode to next one specified in the configuration file.
+This can be disabled with the
+.B DontZoom
+__xconfigfile__(__filemansuffix__) file option.
+.TP 8
+.B Ctrl+Alt+Keypad-Minus
+Change video mode to previous one specified in the configuration file.
+This can be disabled with the
+.B DontZoom
+__xconfigfile__(__filemansuffix__) file option.
+.TP 8
+.B Ctrl+Alt+Keypad-Multiply
+Not treated specially by default.  If the
+.B AllowClosedownGrabs
+__xconfigfile__(__filemansuffix__) file option is specified, this key sequence
+kills clients with an active keyboard or mouse grab as well as killing any
+application that may have locked the server, normally using the
+XGrabServer(__libmansuffix__) Xlib function.
+.TP 8
+.B Ctrl+Alt+Keypad-Divide
+Not treated specially by default.  If the
+.B AllowDeactivateGrabs
+__xconfigfile__(__filemansuffix__) file option is specified, this key sequence
+deactivates any active keyboard and mouse grabs.
+.TP 8
+.B Ctrl+Alt+F1...F12
+For BSD and Linux systems with virtual terminal support, these keystroke
+combinations are used to switch to virtual terminals 1 through 12,
+respectively.  This can be disabled with the
+.B DontVTSwitch
+__xconfigfile__(__filemansuffix__) file option.
+.SH CONFIGURATION
+.B __xservername__
+typically uses a configuration file called
+.B __xconfigfile__
+for its initial setup.
+Refer to the __xconfigfile__(__filemansuffix__) manual page for information
+about the format of this file.
+.PP
+Starting with version 4.4,
+.B __xservername__
+has a mechanism for automatically generating a built-in configuration
+at run-time when no
+.B __xconfigfile__
+file is present.  The current version of this automatic configuration
+mechanism works in three ways.
+.PP
+The first is via enhancements that have made many components of the
+.B __xconfigfile__
+file optional.  This means that information that can be probed or
+reasonably deduced doesn't need to be specified explicitly, greatly
+reducing the amount of built-in configuration information that needs to
+be generated at run-time.
+.PP
+The second is to use an external utility called getconfig(1), when
+available, to use meta-configuration information to generate a suitable
+configuration for the primary video device.  The meta-configuration
+information can be updated to allow an existing installation to get the
+best out of new hardware or to work around bugs that are found
+post-release.
+.PP
+The third is to have "safe" fallbacks for most configuration information.
+This maximises the likelihood that the
+.B __xservername__
+server will start up in some usable configuration even when information
+about the specific hardware is not available.
+.PP
+The automatic configuration support for __xservername__ is work in progress.
+It is currently aimed at the most popular hardware and software platforms
+supported by __xservername__.  Enhancements are planned for future releases.
+.SH FILES
+The
+.B __xservername__
+server config file can be found in a range of locations.  These are
+documented fully in the __xconfigfile__(__filemansuffix__) manual page.  The
+most commonly used locations are shown here.
+.TP 30
+.B /etc/X11/__xconfigfile__
+Server configuration file.
+.TP 30
+.B /etc/X11/__xconfigfile__-4
+Server configuration file.
+.TP 30
+.B /etc/__xconfigfile__
+Server configuration file.
+.TP 30
+.B __projectroot__/etc/__xconfigfile__
+Server configuration file.
+.TP 30
+.B __projectroot__/lib/X11/__xconfigfile__
+Server configuration file.
+.TP 30
+.BI __logdir__/__xservername__. n .log
+Server log file for display
+.IR n .
+.TP 30
+.B __projectroot__/bin/\(**
+Client binaries.
+.TP 30
+.B __projectroot__/include/\(**
+Header files.
+.TP 30
+.B __projectroot__/lib/\(**
+Libraries.
+.TP 30
+.B __projectroot__/lib/X11/fonts/\(**
+Fonts.
+.TP 30
+.B __projectroot__/lib/X11/rgb.txt
+Color names to RGB mapping.
+.TP 30
+.B __projectroot__/lib/X11/XErrorDB
+Client error message database.
+.TP 30
+.B __projectroot__/lib/X11/app-defaults/\(**
+Client resource specifications.
+.TP 30
+.B __projectroot__/man/man?/\(**
+Manual pages.
+.TP 30
+.BI /etc/X n .hosts
+Initial access control list for display
+.IR n .
+.SH "SEE ALSO"
+X(__miscmansuffix__), Xserver(__appmansuffix__), xdm(__appmansuffix__), xinit(__appmansuffix__),
+__xconfigfile__(__filemansuffix__), xorgconfig(__appmansuffix__), xorgcfg(__appmansuffix__), xvidtune(__appmansuffix__),
+apm(__drivermansuffix__),
+ati(__drivermansuffix__),
+chips(__drivermansuffix__),
+cirrus(__drivermansuffix__),
+cyrix(__drivermansuffix__),
+fbdev(__drivermansuffix__),
+glide(__drivermansuffix__),
+glint(__drivermansuffix__),
+i128(__drivermansuffix__),
+i740(__drivermansuffix__),
+i810(__drivermansuffix__),
+imstt(__drivermansuffix__),
+mga(__drivermansuffix__),
+neomagic(__drivermansuffix__),
+nsc(__drivermansuffix__),
+nv(__drivermansuffix__),
+r128(__drivermansuffix__),
+rendition(__drivermansuffix__),
+s3virge(__drivermansuffix__),
+siliconmotion(__drivermansuffix__),
+sis(__drivermansuffix__),
+sunbw2(__drivermansuffix__),
+suncg14(__drivermansuffix__),
+suncg3(__drivermansuffix__),
+suncg6(__drivermansuffix__),
+sunffb(__drivermansuffix__),
+sunleo(__drivermansuffix__),
+suntcx(__drivermansuffix__),
+tdfx(__drivermansuffix__),
+tga(__drivermansuffix__),
+trident(__drivermansuffix__),
+tseng(__drivermansuffix__),
+v4l(__drivermansuffix__),
+vesa(__drivermansuffix__),
+vga(__drivermansuffix__),
+vmware(__drivermansuffix__),
+.br
+Web site
+.IR <http://www.x.org> .
+
+.SH AUTHORS
+__xservername__ has many contributors world wide.  The names of most of them
+can be found in the documentation, CHANGELOG files in the source tree,
+and in the actual source code.
+.PP
+__xservername__ was originally based on XFree86 4.4rc2.
+That was originally based on \fIX386 1.2\fP by Thomas Roell, which
+was contributed to the then X Consortium's X11R5 distribution by SGCS.
+.PP
+__xservername__ is released by the X.org Foundation.
+.PP
+The project that became XFree86 was originally founded in 1992 by
+David Dawes, Glenn Lai, Jim Tsillas and David Wexelblat.
+.PP
+XFree86 was later integrated in the then X Consortium's X11R6 release
+by a group of dedicated XFree86 developers, including the following:
+.PP
+.RS 4
+.nf
+Stuart Anderson    \fIanderson@metrolink.com\fP
+Doug Anson         \fIdanson@lgc.com\fP
+Gertjan Akkerman   \fIakkerman@dutiba.twi.tudelft.nl\fP
+Mike Bernson       \fImike@mbsun.mlb.org\fP
+Robin Cutshaw      \fIrobin@XFree86.org\fP
+David Dawes        \fIdawes@XFree86.org\fP
+Marc Evans         \fImarc@XFree86.org\fP
+Pascal Haible      \fIhaible@izfm.uni-stuttgart.de\fP
+Matthieu Herrb     \fIMatthieu.Herrb@laas.fr\fP
+Dirk Hohndel       \fIhohndel@XFree86.org\fP
+David Holland      \fIdavidh@use.com\fP
+Alan Hourihane     \fIalanh@fairlite.demon.co.uk\fP
+Jeffrey Hsu        \fIhsu@soda.berkeley.edu\fP
+Glenn Lai          \fIglenn@cs.utexas.edu\fP
+Ted Lemon          \fImellon@ncd.com\fP
+Rich Murphey       \fIrich@XFree86.org\fP
+Hans Nasten        \fInasten@everyware.se\fP
+Mark Snitily       \fImark@sgcs.com\fP
+Randy Terbush      \fIrandyt@cse.unl.edu\fP
+Jon Tombs          \fItombs@XFree86.org\fP
+Kees Verstoep      \fIversto@cs.vu.nl\fP
+Paul Vixie         \fIpaul@vix.com\fP
+Mark Weaver        \fIMark_Weaver@brown.edu\fP
+David Wexelblat    \fIdwex@XFree86.org\fP
+Philip Wheatley    \fIPhilip.Wheatley@ColumbiaSC.NCR.COM\fP
+Thomas Wolfram     \fIwolf@prz.tu-berlin.de\fP
+Orest Zborowski    \fIorestz@eskimo.com\fP
+.fi
+.RE
+.PP
+__xservername__ source is available from the FTP server
+\fI<ftp://ftp.x.org/>\fP, and from the X.org
+server \fI<http://www.freedesktop.org/cvs/>\fP.  Documentation and other
+information can be found from the X.org web site
+\fI<http://www.x.org/>\fP.
+
+.SH LEGAL
+.PP
+.B __xservername__
+is copyright software, provided under licenses that permit modification
+and redistribution in source and binary form without fee.  
+.B __xservername__ is copyright by numerous authors and
+contributors from around the world.  Licensing information can be found
+at
+.IR <http://www.x.org> .
+Refer to the source code for specific copyright notices.
+.PP
+.B XFree86(TM)
+is a trademark of The XFree86 Project, Inc.
+.PP
+.B X11(TM)
+and 
+.B X Window System(TM)
+are trademarks of The Open Group.
diff --git a/hw/xfree86/doc/man/xorg.conf.man.pre b/hw/xfree86/doc/man/xorg.conf.man.pre
new file mode 100644
index 000000000..ddf9456fc
--- /dev/null
+++ b/hw/xfree86/doc/man/xorg.conf.man.pre
@@ -0,0 +1,1872 @@
+.\" $XdotOrg$
+.\" shorthand for double quote that works everywhere.
+.ds q \N'34'
+.TH __xconfigfile__ __filemansuffix__ __vendorversion__
+.SH NAME
+__xconfigfile__ - Configuration File for __xservername__
+.SH INTRODUCTION
+.B __xservername__
+supports several mechanisms for supplying/obtaining configuration and
+run-time parameters: command line options, environment variables, the
+__xconfigfile__ configuration file, auto-detection, and fallback defaults.
+When the same information is supplied in more than one way, the highest
+precedence mechanism is used.  The list of mechanisms is ordered from
+highest precedence to lowest.  Note that not all parameters can be
+supplied via all methods.  The available command line options and
+environment variables (and some defaults) are described in the Xserver(__appmansuffix__)
+and __xservername__(__appmansuffix__) manual pages.  Most configuration file parameters, with
+their defaults, are described below.  Driver and module specific
+configuration parameters are described in the relevant driver or module
+manual page.
+.SH DESCRIPTION
+.B __xservername__
+uses a configuration file called
+.B __xconfigfile__
+for its initial setup.  This configuration file is searched for in the
+following places when the server is started as a normal user:
+.PP
+.RS 4
+.nf
+.IR /etc/X11/ <cmdline>
+.IR __projectroot__/etc/X11/ <cmdline>
+.IB /etc/X11/ $XORGCONFIG
+.IB __projectroot__/etc/X11/ $XORGCONFIG
+.I /etc/X11/__xconfigfile__-4
+.I /etc/X11/__xconfigfile__
+.I /etc/__xconfigfile__
+.IR __projectroot__/etc/X11/__xconfigfile__. <hostname>
+.I __projectroot__/etc/X11/__xconfigfile__-4
+.I __projectroot__/etc/X11/__xconfigfile__
+.IR __projectroot__/lib/X11/__xconfigfile__. <hostname>
+.I __projectroot__/lib/X11/__xconfigfile__-4
+.I __projectroot__/lib/X11/__xconfigfile__
+.fi
+.RE
+.PP
+where
+.I <cmdline>
+is a relative path (with no ".." components) specified with the
+.B \-config
+command line option,
+.B $XORGCONFIG
+is the relative path (with no ".." components) specified by that
+environment variable, and
+.I <hostname>
+is the machine's hostname as reported by gethostname(3).
+.PP
+When the __xservername__ server is started by the "root" user, the config file
+search locations are as follows:
+.PP
+.RS 4
+.nf
+<cmdline>
+.IR /etc/X11/ <cmdline>
+.IR __projectroot__/etc/X11/ <cmdline>
+.B $XORGCONFIG
+.IB /etc/X11/ $XORGCONFIG
+.IB __projectroot__/etc/X11/ $XORGCONFIG
+.BI $HOME /__xconfigfile__
+.I /etc/X11/__xconfigfile__-4
+.I /etc/X11/__xconfigfile__
+.I /etc/__xconfigfile__
+.IR __projectroot__/etc/X11/__xconfigfile__. <hostname>
+.I __projectroot__/etc/X11/__xconfigfile__-4
+.I __projectroot__/etc/X11/__xconfigfile__
+.IR __projectroot__/lib/X11/__xconfigfile__. <hostname>
+.I __projectroot__/lib/X11/__xconfigfile__-4
+.I __projectroot__/lib/X11/__xconfigfile__
+.fi
+.RE
+.PP
+where
+.I <cmdline>
+is the path specified with the
+.B \-config
+command line option (which may be absolute or relative),
+.B $XORGCONFIG
+is the path specified by that
+environment variable (absolute or relative),
+.B $HOME
+is the path specified by that environment variable (usually the home
+directory), and
+.I <hostname>
+is the machine's hostname as reported by gethostname(3).
+.PP
+The
+.B __xconfigfile__
+file is composed of a number of sections which may be present in any
+order.  Each section has
+the form:
+.PP
+.RS 4
+.nf
+.BI "Section  \*q" SectionName \*q
+.RI "    " SectionEntry
+    ...
+.B EndSection
+.fi
+.RE
+.PP
+The section names are:
+.PP
+.RS 4
+.nf
+.BR "Files          " "File pathnames"
+.BR "ServerFlags    " "Server flags"
+.BR "Module         " "Dynamic module loading"
+.BR "InputDevice    " "Input device description"
+.BR "Device         " "Graphics device description"
+.BR "VideoAdaptor   " "Xv video adaptor description"
+.BR "Monitor        " "Monitor description"
+.BR "Modes          " "Video modes descriptions"
+.BR "Screen         " "Screen configuration"
+.BR "ServerLayout   " "Overall layout"
+.BR "DRI            " "DRI-specific configuration"
+.BR "Vendor         " "Vendor-specific configuration"
+.fi
+.RE
+.PP
+The following obsolete section names are still recognised for compatibility
+purposes.  In new config files, the
+.B InputDevice
+section should be used instead.
+.PP
+.RS 4
+.nf
+.BR "Keyboard       " "Keyboard configuration"
+.BR "Pointer        " "Pointer/mouse configuration"
+.fi
+.RE
+.PP
+The old
+.B XInput
+section is no longer recognised.
+.PP
+The
+.B ServerLayout
+sections are at the highest level.  They bind together the input and
+output devices that will be used in a session.  The input devices
+are described in the
+.B InputDevice
+sections.  Output devices usually consist of multiple independent
+components (e.g., and graphics board and a monitor).  These multiple
+components are bound together in the
+.B Screen
+sections, and it is these that are referenced by the
+.B ServerLayout
+section.  Each
+.B Screen
+section binds together a graphics board and a monitor.  The graphics
+boards are described in the
+.B Device
+sections, and the monitors are described in the
+.B Monitor
+sections.
+.PP
+Config file keywords are case-insensitive, and "_" characters are
+ignored.  Most strings (including
+.B Option
+names) are also case-insensitive, and insensitive to white space and
+"_" characters.
+.PP
+Each config file entry usually takes up a single line in the file.
+They consist of a keyword, which is possibly followed by one or
+more arguments, with the number and types of the arguments depending
+on the keyword.  The argument types are:
+.PP
+.RS 4
+.nf
+.BR "Integer     " "an integer number in decimal, hex or octal"
+.BR "Real        " "a floating point number"
+.BR "String      " "a string enclosed in double quote marks (\*q)"
+.fi
+.RE
+.PP
+Note: hex integer values must be prefixed with "0x", and octal values
+with "0".
+.PP
+A special keyword called
+.B Option
+may be used to provide free-form data to various components of the server.
+The
+.B Option
+keyword takes either one or two string arguments.  The first is the option
+name, and the optional second argument is the option value.  Some commonly
+used option value types include:
+.PP
+.RS 4
+.nf
+.BR "Integer     " "an integer number in decimal, hex or octal"
+.BR "Real        " "a floating point number"
+.BR "String      " "a sequence of characters"
+.BR "Boolean     " "a boolean value (see below)"
+.BR "Frequency   " "a frequency value (see below)"
+.fi
+.RE
+.PP
+Note that
+.I all
+.B Option
+values, not just strings, must be enclosed in quotes.
+.PP
+Boolean options may optionally have a value specified.  When no value
+is specified, the option's value is
+.BR TRUE .
+The following boolean option values are recognised as
+.BR TRUE :
+.PP
+.RS 4
+.BR 1 ,
+.BR on ,
+.BR true ,
+.B yes
+.RE
+.PP
+and the following boolean option values are recognised as
+.BR FALSE :
+.PP
+.RS 4
+.BR 0 ,
+.BR off ,
+.BR false ,
+.B no
+.RE
+.PP
+If an option name is prefixed with
+.RB \*q No \*q,
+then the option value is negated.
+.PP
+Example: the following option entries are equivalent:
+.PP
+.RS 4
+.nf
+.B "Option \*qAccel\*q   \*qOff\*q"
+.B "Option \*qNoAccel\*q"
+.B "Option \*qNoAccel\*q \*qOn\*q"
+.B "Option \*qAccel\*q   \*qfalse\*q"
+.B "Option \*qAccel\*q   \*qno\*q"
+.fi
+.RE
+.PP
+Frequency option values consist of a real number that is optionally
+followed by one of the following frequency units:
+.PP
+.RS 4
+.BR Hz ,
+.BR k ,
+.BR kHz ,
+.BR M ,
+.B MHz
+.RE
+.PP
+When the unit name is omitted, the correct units will be determined from
+the value and the expectations of the appropriate range of the value.
+It is recommended that the units always be specified when using frequency
+option values to avoid any errors in determining the value.
+.SH FILES SECTION
+The
+.B Files
+section is used to specify some path names required by the server.
+Some of these paths can also be set from the command line (see Xserver(__appmansuffix__)
+and __xservername__(__appmansuffix__)).  The command line settings override the values specified
+in the config file.  The
+.B Files
+section is optional, as are all of the entries that may appear in it.
+.PP
+The entries that can appear in this section are:
+.TP 7
+.BI "FontPath \*q" path \*q
+sets the search path for fonts.  This path is a comma separated list of
+font path elements which the __xservername__ server searches for font databases.
+Multiple
+.B FontPath
+entries may be specified, and they will be concatenated to build up the
+fontpath used by the server.  Font path elements may be either absolute
+directory paths, or a font server identifier.  Font server identifiers
+have the form:
+.PP
+.RS 11
+.IR <trans> / <hostname> : <port-number>
+.RE
+.PP
+.RS 7
+where
+.I <trans>
+is the transport type to use to connect to the font server (e.g.,
+.B unix
+for UNIX-domain sockets or
+.B tcp
+for a TCP/IP connection),
+.I <hostname>
+is the hostname of the machine running the font server, and
+.I <port-number>
+is the port number that the font server is listening on (usually 7100).
+.PP
+When this entry is not specified in the config file, the server falls back
+to the compiled-in default font path, which contains the following
+font path elements:
+.PP
+.RS 4
+.nf
+.I __projectroot__/lib/X11/fonts/misc/
+.I __projectroot__/lib/X11/fonts/Speedo/
+.I __projectroot__/lib/X11/fonts/Type1/
+.I __projectroot__/lib/X11/fonts/CID/
+.I __projectroot__/lib/X11/fonts/75dpi/
+.I __projectroot__/lib/X11/fonts/100dpi/
+.fi
+.RE
+.PP
+The recommended font path contains the following font path elements:
+.PP
+.RS 4
+.nf
+.I __projectroot__/lib/X11/fonts/local/
+.I __projectroot__/lib/X11/fonts/misc/
+.I __projectroot__/lib/X11/fonts/75dpi/:unscaled
+.I __projectroot__/lib/X11/fonts/100dpi/:unscaled
+.I __projectroot__/lib/X11/fonts/Type1/
+.I __projectroot__/lib/X11/fonts/CID/
+.I __projectroot__/lib/X11/fonts/Speedo/
+.I __projectroot__/lib/X11/fonts/75dpi/
+.I __projectroot__/lib/X11/fonts/100dpi/
+.fi
+.RE
+.PP
+Font path elements that are found to be invalid are removed from the
+font path when the server starts up.
+.RE
+.TP 7
+.BI "RGBPath \*q" path \*q
+sets the path name for the RGB color database.
+When this entry is not specified in the config file, the server falls back
+to the compiled-in default RGB path, which is:
+.PP
+.RS 11
+.I __projectroot__/lib/X11/rgb
+.RE
+.PP
+Note that an implicit
+.I .txt
+is added to this path if the server was compiled to use text rather than
+binary format RGB color databases.
+.TP 7
+.BI "ModulePath \*q" path \*q
+sets the search path for loadable __xservername__ server modules.  This path is
+a comma separated list of directories which the __xservername__ server searches
+for loadable modules loading in the order specified.  Multiple
+.B ModulePath
+entries may be specified, and they will be concatenated to build the
+module search path used by the server.
+.\" The LogFile keyword is not currently implemented
+.ig
+.TP 7
+.BI "LogFile \*q" path \*q
+sets the name of the __xservername__ server log file.  The default log file name
+is
+.PP
+.RS 11
+.RI __logdir__/__xservername__. <n> .log
+.RE
+.PP
+.RS 7
+where
+.I <n>
+is the display number for the __xservername__ server.
+..
+.SH SERVERFLAGS SECTION
+The
+.B ServerFlags
+section is used to specify some global
+__xservername__ server options.  All of the entries in this section are
+.BR Options ,
+although for compatibility purposes some of the old style entries are
+still recognised.  Those old style entries are not documented here, and
+using them is discouraged.  The
+.B ServerFlags
+section is optional, as are the entries that may be specified in it.
+.PP
+.B Options
+specified in this section (with the exception of the
+.B \*qDefaultServerLayout\*q
+.BR Option )
+may be overridden by
+.B Options
+specified in the active
+.B ServerLayout
+section.  Options with command line equivalents are overridden when their
+command line equivalent is used.  The options recognised by this section
+are:
+.TP 7
+.BI "Option \*qDefaultServerLayout\*q  \*q" layout-id \*q
+This specifies the default
+.B ServerLayout
+section to use in the absence of the
+.B \-layout
+command line option.
+.TP 7
+.BI "Option \*qNoTrapSignals\*q  \*q" boolean \*q
+This prevents the __xservername__ server from trapping a range of unexpected
+fatal signals and exiting cleanly.  Instead, the __xservername__ server will die
+and drop core where the fault occurred.  The default behaviour is
+for the __xservername__ server to exit cleanly, but still drop a core file.  In
+general you never want to use this option unless you are debugging
+an __xservername__ server problem and know how to deal with the consequences.
+.TP 7
+.BI "Option \*qDontVTSwitch\*q  \*q" boolean \*q
+This disallows the use of the
+.BI Ctrl+Alt+F n
+sequence (where
+.RI F n
+refers to one of the numbered function keys).  That sequence is normally
+used to switch to another \*qvirtual terminal\*q on operating systems
+that have this feature.  When this option is enabled, that key sequence has
+no special meaning and is passed to clients.  Default: off.
+.TP 7
+.BI "Option \*qDontZap\*q  \*q" boolean \*q
+This disallows the use of the
+.B Ctrl+Alt+Backspace
+sequence.  That sequence is normally used to terminate the __xservername__ server.
+When this option is enabled, that key sequence has no special meaning
+and is passed to clients.  Default: off.
+.TP 7
+.BI "Option \*qDontZoom\*q  \*q" boolean \*q
+This disallows the use of the
+.B Ctrl+Alt+Keypad-Plus
+and
+.B Ctrl+Alt+Keypad-Minus
+sequences.  These sequences allows you to switch between video modes.
+When this option is enabled, those key sequences have no special meaning
+and are passed to clients.  Default: off.
+.TP 7
+.BI "Option \*qDisableVidModeExtension\*q  \*q" boolean \*q
+This disables the parts of the VidMode extension used by the xvidtune client
+that can be used to change the video modes.  Default: the VidMode extension
+is enabled.
+.TP 7
+.BI "Option \*qAllowNonLocalXvidtune\*q  \*q" boolean \*q
+This allows the xvidtune client (and other clients that use the VidMode
+extension) to connect from another host.  Default: off.
+.TP 7
+.BI "Option \*qDisableModInDev\*q  \*q" boolean \*q
+This disables the parts of the __xservername__-Misc extension that can be used to
+modify the input device settings dynamically.  Default: that functionality
+is enabled.
+.TP 7
+.BI "Option \*qAllowNonLocalModInDev\*q  \*q" boolean \*q
+This allows a client to connect from another host and change keyboard
+and mouse settings in the running server.  Default: off.
+.TP 7
+.BI "Option \*qAllowMouseOpenFail\*q  \*q" boolean \*q
+This allows the server to start up even if the mouse device can't be
+opened/initialised.  Default: false.
+.TP 7
+.BI "Option \*qVTInit\*q  \*q" command \*q
+Runs
+.I command
+after the VT used by the server has been opened.
+The command string is passed to "/bin/sh -c", and is run with the
+real user's id with stdin and stdout set to the VT.  The purpose
+of this option is to allow system dependent VT initialisation
+commands to be run.  This option should rarely be needed.  Default: not set.
+.TP 7
+.BI "Option \*qVTSysReq\*q  \*q" boolean \*q
+enables the SYSV-style VT switch sequence for non-SYSV systems
+which support VT switching.  This sequence is
+.B Alt-SysRq
+followed
+by a function key
+.RB ( Fn ).
+This prevents the __xservername__ server trapping the
+keys used for the default VT switch sequence, which means that clients can
+access them.  Default: off.
+.TP 7
+.BI "Option \*qXkbDisable\*q \*q" boolean \*q
+disable/enable the XKEYBOARD extension.  The \-kb command line
+option overrides this config file option.  Default: XKB is enabled.
+.\" The following four options are "undocumented".
+.ig
+.TP 7
+.BI "Option \*qPciProbe1\*q"
+Use PCI probe method 1.  Default: set.
+.TP 7
+.BI "Option \*qPciProbe2\*q"
+Use PCI probe method 2.  Default: not set.
+.TP 7
+.BI "Option \*qPciForceConfig1\*q"
+Force the use PCI config type 1.  Default: not set.
+.TP 7
+.BI "Option \*qPciForceConfig2\*q"
+Force the use PCI config type 2.  Default: not set.
+..
+.TP 7
+.BI "Option \*qBlankTime\*q  \*q" time \*q
+sets the inactivity timeout for the blanking phase of the screensaver.
+.I time
+is in minutes.  This is equivalent to the __xservername__ server's `-s' flag,
+and the value can be changed at run-time with xset(__appmansuffix__).  Default: 10
+minutes.
+.TP 7
+.BI "Option \*qStandbyTime\*q  \*q" time \*q
+sets the inactivity timeout for the "standby" phase of DPMS mode.
+.I time
+is in minutes, and the value can be changed at run-time with xset(__appmansuffix__).
+Default: 20 minutes.  This is only suitable for VESA DPMS compatible
+monitors, and may not be supported by all video drivers.  It is only
+enabled for screens that have the
+.B \*qDPMS\*q
+option set (see the MONITOR section below).
+.TP 7
+.BI "Option \*qSuspendTime\*q  \*q" time \*q
+sets the inactivity timeout for the "suspend" phase of DPMS mode.
+.I time
+is in minutes, and the value can be changed at run-time with xset(__appmansuffix__).
+Default: 30 minutes.  This is only suitable for VESA DPMS compatible
+monitors, and may not be supported by all video drivers.  It is only
+enabled for screens that have the
+.B \*qDPMS\*q
+option set (see the MONITOR section below).
+.TP 7
+.BI "Option \*qOffTime\*q  \*q" time \*q
+sets the inactivity timeout for the "off" phase of DPMS mode.
+.I time
+is in minutes, and the value can be changed at run-time with xset(__appmansuffix__).
+Default: 40 minutes.  This is only suitable for VESA DPMS compatible
+monitors, and may not be supported by all video drivers.  It is only
+enabled for screens that have the
+.B \*qDPMS\*q
+option set (see the MONITOR section below).
+.TP 7
+.BI "Option \*qPixmap\*q  \*q" bpp \*q
+This sets the pixmap format to use for depth 24.  Allowed values for
+.I bpp
+are 24 and 32.  Default: 32 unless driver constraints don't allow this
+(which is rare).  Note: some clients don't behave well when this value
+is set to 24.
+.TP 7
+.BI "Option \*qPC98\*q  \*q" boolean \*q
+Specify that the machine is a Japanese PC-98 machine.  This should not
+be enabled for anything other than the Japanese-specific PC-98
+architecture.  Default: auto-detected.
+.\" Doubt this should be documented.
+.ig
+.TP 7
+.BI "Option \*qEstimateSizesAggressively\*q  \*q" value \*q
+This option affects the way that bus resource sizes are estimated.
+Default: 0.
+..
+.TP 7
+.BI "Option \*qNoPM\*q  \*q" boolean \*q
+Disables something to do with power management events.  Default: PM
+enabled on platforms that support it.
+.TP 7
+.BI "Option \*qXinerama\*q  \*q" boolean \*q
+enable or disable XINERAMA extension. Default is disabled.
+.TP 7
+.BI "Option \*qAllowDeactivateGrabs\*q \*q" boolean \*q
+This option enables the use of the
+.B Ctrl+Alt+Keypad-Divide
+key sequence to deactivate any active keyboard and mouse grabs.  Default:
+off.
+.TP 7
+.BI "Option \*qAllowClosedownGrabs\*q \*q" boolean \*q
+This option enables the use of the
+.B Ctrl+Alt+Keypad-Multiply
+key sequence to kill clients with an active keyboard or mouse grab as
+well as killing any application that may have locked the server, normally
+using the XGrabServer(__libmansuffix__) Xlib function.  Default: off.
+.br
+Note that the options
+.BI AllowDeactivateGrabs
+and
+.BI AllowClosedownGrabs
+will allow users to remove the grab used by screen saver/locker programs.
+An API was written to such cases. If you enable this option, make sure
+your screen saver/locker is updated.
+.TP 7
+.BI "Option \*qHandleSpecialKeys\*q \*q" when \*q
+This option controls when the server uses the builtin handler to process
+special key combinations (such as
+.BR Ctrl+Alt+Backspace ).
+Normally the XKEYBOARD extension keymaps will provide mappings for each
+of the special key combinations, so the builtin handler is not needed
+unless the XKEYBOARD extension is disabled.  The value of
+.I when
+can be
+.BR Always ,
+.BR Never ,
+or
+.BR WhenNeeded .
+Default: Use the builtin handler only if needed.  The server will scan
+the keymap for a mapping to the
+.B Terminate
+action and, if found, use XKEYBOARD for processing actions, otherwise
+the builtin handler will be used.
+.SH MODULE SECTION
+The
+.B Module
+section is used to specify which __xservername__ server modules should be loaded.
+This section is ignored when the __xservername__ server is built in static form.
+The types of modules normally loaded in this section are __xservername__ server
+extension modules, and font rasteriser modules.  Most other module types
+are loaded automatically when they are needed via other mechanisms.
+The
+.B Module
+section is optional, as are all of the entries that may be specified in
+it.
+.PP
+Entries in this section may be in two forms.   The first and most commonly
+used form is an entry that uses the
+.B Load
+keyword, as described here:
+.TP 7
+.BI "Load  \*q" modulename \*q
+This instructs the server to load the module called
+.IR modulename .
+The module name given should be the module's standard name, not the
+module file name.  The standard name is case-sensitive, and does not
+include the "lib" prefix, or the ".a", ".o", or ".so" suffixes.
+.PP
+.RS 7
+Example: the Type 1 font rasteriser can be loaded with the following entry:
+.PP
+.RS 4
+.B "Load \*qtype1\*q"
+.RE
+.RE
+.PP
+The second form of entry is a
+.BR SubSection,
+with the subsection name being the module name, and the contents of the
+.B SubSection
+being
+.B Options
+that are passed to the module when it is loaded.
+.PP
+Example: the extmod module (which contains a miscellaneous group of
+server extensions) can be loaded, with the __xservername__-DGA extension
+disabled by using the following entry:
+.PP
+.RS 4
+.nf
+.B "SubSection \*qextmod\*q"
+.B "   Option  \*qomit XFree86-DGA\*q"
+.B EndSubSection
+.fi
+.RE
+.PP
+Modules are searched for in each directory specified in the
+.B ModulePath
+search path, and in the drivers, input, extensions, fonts, and
+internal subdirectories of each of those directories.
+In addition to this, operating system specific subdirectories of all
+the above are searched first if they exist.
+.PP
+To see what font and extension modules are available, check the contents
+of the following directories:
+.PP
+.RS 4
+.nf
+__projectroot__/lib/modules/fonts
+__projectroot__/lib/modules/extensions
+.fi
+.RE
+.PP
+The "bitmap" font modules is loaded automatically.  It is recommended
+that at very least the "extmod" extension module be loaded.  If it isn't
+some commonly used server extensions (like the SHAPE extension) will not be
+available.
+.SH INPUTDEVICE SECTION
+The config file may have multiple
+.B InputDevice
+sections.  There will normally be at least two: one for the core (primary)
+keyboard, and one of the core pointer.  If either of these two is missing,
+a default configuration for the missing ones will be used.  Currently the
+default configuration may not work as expected on all platforms.
+.PP
+.B InputDevice
+sections have the following format:
+.PP
+.RS 4
+.nf
+.B  "Section \*qInputDevice\*q"
+.BI "    Identifier \*q" name \*q
+.BI "    Driver     \*q" inputdriver \*q
+.I  "    options"
+.I  "    ..."
+.B  "EndSection"
+.fi
+.RE
+.PP
+The
+.B Identifier
+and
+.B Driver
+entries are required in all
+.B InputDevice
+sections.  All other entries are optional.
+.PP
+The
+.B Identifier
+entry specifies the unique name for this input device.  The
+.B Driver
+entry specifies the name of the driver to use for this input device.
+When using the loadable server, the input driver module
+.RI \*q inputdriver \*q
+will be loaded for each active
+.B InputDevice
+section.  An
+.B InputDevice
+section is considered active if it is referenced by an active
+.B ServerLayout
+section, if it is referenced by the
+.B \-keyboard
+or
+.B \-pointer
+command line options, or if it is selected implicitly as the core pointer
+or keyboard device in the absence of such explicit references.
+The most commonly used input drivers are "keyboard" and "mouse".
+.PP
+In the absence of an explicitly specified core input device, the first
+.B InputDevice
+marked as
+.B CorePointer
+(or
+.BR CoreKeyboard )
+is used.  If there is no match there, the first
+.B InputDevice
+that uses the "mouse" (or "keyboard" or "kbd") driver is used.  The final
+fallback is to use built-in default configurations.
+.PP
+.B InputDevice
+sections recognise some driver-independent
+.BR Options ,
+which are described here.  See the individual input driver manual pages
+for a description of the device-specific options.
+.TP 7
+.BI "Option \*qCorePointer\*q"
+When this is set, the input device is installed as the core (primary)
+pointer device.  There must be exactly one core pointer.  If this option
+is not set here, or in the
+.B ServerLayout
+section, or from the
+.B \-pointer
+command line option, then the first input device that is capable of
+being used as a core pointer will be selected as the core pointer.
+This option is implicitly set when the obsolete
+.B Pointer
+section is used.
+.TP 7
+.BI "Option \*qCoreKeyboard\*q"
+When this is set, the input device is to be installed as the core
+(primary) keyboard device.  There must be exactly one core keyboard.  If
+this option is not set here, in the
+.B ServerLayout
+section, or from the
+.B \-keyboard
+command line option, then the first input device that is capable of
+being used as a core keyboard will be selected as the core keyboard.
+This option is implicitly set when the obsolete
+.B Keyboard
+section is used.
+.TP 7
+.BI "Option \*qAlwaysCore\*q  \*q" boolean \*q
+.TP 7
+.BI "Option \*qSendCoreEvents\*q  \*q" boolean \*q
+Both of these options are equivalent, and when enabled cause the
+input device to always report core events.  This can be used, for
+example, to allow an additional pointer device to generate core
+pointer events (like moving the cursor, etc).
+.TP 4
+.BI "Option \*qHistorySize\*q  \*q" number \*q
+Sets the motion history size.  Default: 0.
+.TP 7
+.BI "Option \*qSendDragEvents\*q  \*q" boolean \*q
+???
+.SH DEVICE SECTION
+The config file may have multiple
+.B Device
+sections.  There must be at least one, for the video card being used.
+.PP
+.B Device
+sections have the following format:
+.PP
+.RS 4
+.nf
+.B  "Section \*qDevice\*q"
+.BI "    Identifier \*q" name \*q
+.BI "    Driver     \*q" driver \*q
+.I  "    entries"
+.I  "    ..."
+.B  "EndSection"
+.fi
+.RE
+.PP
+The
+.B Identifier
+and
+.B Driver
+entries are required in all
+.B Device
+sections.  All other entries are optional.
+.PP
+The
+.B Identifier
+entry specifies the unique name for this graphics device.  The
+.B Driver
+entry specifies the name of the driver to use for this graphics device.
+When using the loadable server, the driver module
+.RI \*q driver \*q
+will be loaded for each active
+.B Device
+section.  A
+.B Device
+section is considered active if it is referenced by an active
+.B Screen
+section.
+.PP
+.B Device
+sections recognise some driver-independent entries and
+.BR Options ,
+which are described here.  Not all drivers make use of these
+driver-independent entries, and many of those that do don't require them
+to be specified because the information is auto-detected.  See the
+individual graphics driver manual pages for further information about
+this, and for a description of the device-specific options.
+Note that most of the
+.B Options
+listed here (but not the other entries) may be specified in the
+.B Screen
+section instead of here in the
+.B Device
+section.
+.TP 7
+.BI "BusID  \*q" bus-id \*q
+This specifies the bus location of the graphics card.  For PCI/AGP cards,
+the
+.I bus-id
+string has the form
+.BI PCI: bus : device : function
+(e.g., "PCI:1:0:0" might be appropriate for an AGP card).
+This field is usually optional in single-head configurations when using
+the primary graphics card.  In multi-head configurations, or when using
+a secondary graphics card in a single-head configuration, this entry is
+mandatory.  Its main purpose is to make an unambiguous connection between
+the device section and the hardware it is representing.  This information
+can usually be found by running the __xservername__ server with the
+.B \-scanpci
+command line option.
+.TP 7
+.BI "Screen  " number
+This option is mandatory for cards where a single PCI entity can drive more
+than one display (i.e., multiple CRTCs sharing a single graphics accelerator
+and video memory).  One
+.B Device
+section is required for each head, and this
+parameter determines which head each of the
+.B Device
+sections applies to.  The legal values of
+.I number
+range from 0 to one less than the total number of heads per entity.
+Most drivers require that the primary screen (0) be present.
+.TP 7
+.BI "Chipset  \*q" chipset \*q
+This usually optional entry specifies the chipset used on the graphics
+board.  In most cases this entry is not required because the drivers
+will probe the hardware to determine the chipset type.  Don't
+specify it unless the driver-specific documentation recommends that you
+do.
+.TP 7
+.BI "Ramdac  \*q" ramdac-type \*q
+This optional entry specifies the type of RAMDAC used on the graphics
+board.  This is only used by a few of the drivers, and in most cases it
+is not required because the drivers will probe the hardware to determine
+the RAMDAC type where possible.  Don't specify it unless the
+driver-specific documentation recommends that you do.
+.TP 7
+.BI "DacSpeed  " speed
+.TP 7
+.BI "DacSpeed  " "speed-8 speed-16 speed-24 speed-32"
+This optional entry specifies the RAMDAC speed rating (which is usually
+printed on the RAMDAC chip).  The speed is in MHz.  When one value is
+given, it applies to all framebuffer pixel sizes.  When multiple values
+are give, they apply to the framebuffer pixel sizes 8, 16, 24 and 32
+respectively.  This is not used by many drivers, and only needs to be
+specified when the speed rating of the RAMDAC is different from the
+defaults built in to driver, or when the driver can't auto-detect the
+correct defaults.  Don't specify it unless the driver-specific
+documentation recommends that you do.
+.TP 7
+.BI "Clocks  " "clock ..."
+specifies the pixel that are on your graphics board.  The clocks are in
+MHz, and may be specified as a floating point number.  The value is
+stored internally to the nearest kHz.  The ordering of the clocks is
+important.  It must match the order in which they are selected on the
+graphics board.  Multiple
+.B Clocks
+lines may be specified, and each is concatenated to form the list.  Most
+drivers do not use this entry, and it is only required for some older
+boards with non-programmable clocks.  Don't specify this entry unless
+the driver-specific documentation explicitly recommends that you do.
+.TP
+.BI "ClockChip  \*q" clockchip-type \*q
+This optional entry is used to specify the clock chip type on graphics
+boards which have a programmable clock generator.  Only a few __xservername__
+drivers support programmable clock chips.  For details, see the appropriate
+driver manual page.
+.TP 7
+.BI "VideoRam  " "mem"
+This optional entry specifies the amount of video ram that is installed
+on the graphics board. This is measured in kBytes.  In most cases this
+is not required because the __xservername__ server probes the graphics board to
+determine this quantity.  The driver-specific documentation should
+indicate when it might be needed.
+.TP 7
+.BI "BiosBase  " "baseaddress"
+This optional entry specifies the base address of the video BIOS for
+the VGA board.  This address is normally auto-detected, and should only
+be specified if the driver-specific documentation recommends it.
+.TP 7
+.BI "MemBase  " "baseaddress"
+This optional entry specifies the memory base address of a graphics
+board's linear frame buffer.  This entry is not used by many drivers,
+and it should only be specified if the driver-specific documentation
+recommends it.
+.TP 7
+.BI "IOBase  " "baseaddress"
+This optional entry specifies the IO base address.  This entry is not
+used by many drivers, and it should only be specified if the
+driver-specific documentation recommends it.
+.TP 7
+.BI "ChipID  " "id"
+This optional entry specifies a numerical ID representing the chip type.
+For PCI cards, it is usually the device ID.  This can be used to override
+the auto-detection, but that should only be done when the driver-specific
+documentation recommends it.
+.TP 7
+.BI "ChipRev  " "rev"
+This optional entry specifies the chip revision number.  This can be
+used to override the auto-detection, but that should only be done when
+the driver-specific documentation recommends it.
+.TP 7
+.BI "TextClockFreq  " "freq"
+This optional entry specifies the pixel clock frequency that is used
+for the regular text mode.  The frequency is specified in MHz.  This is
+rarely used.
+.ig
+.TP 7
+This optional entry allows an IRQ number to be specified.
+..
+.TP 7
+.B Options
+Option flags may be specified in the
+.B Device
+sections.  These include driver-specific options and driver-independent
+options.  The former are described in the driver-specific documentation.
+Some of the latter are described below in the section about the
+.B Screen
+section, and they may also be included here.
+
+.SH VIDEOADAPTOR SECTION
+Nobody wants to say how this works.  Maybe nobody knows ...
+
+.SH MONITOR SECTION
+The config file may have multiple
+.B Monitor
+sections.  There should normally be at least one, for the monitor being used,
+but a default configuration will be created when one isn't specified.
+.PP
+.B Monitor
+sections have the following format:
+.PP
+.RS 4
+.nf
+.B  "Section \*qMonitor\*q"
+.BI "    Identifier \*q" name \*q
+.I  "    entries"
+.I  "    ..."
+.B  "EndSection"
+.fi
+.RE
+.PP
+The only mandatory entry in a
+.B Monitor
+section is the
+.B Identifier
+entry.
+.PP
+The
+.B Identifier
+entry specifies the unique name for this monitor.  The
+.B Monitor
+section provides information about the specifications of the monitor,
+monitor-specific
+.BR Options ,
+and information about the video modes to use with the monitor.  Specifying
+video modes is optional because the server now has a built-in list of
+VESA standard modes.  When modes are specified explicitly in the
+.B Monitor
+section (with the
+.BR Modes ,
+.BR ModeLine ,
+or
+.B UseModes
+keywords), built-in modes with the same names are not included.  Built-in
+modes with different names are, however, still implicitly included.
+.PP
+The entries that may be used in
+.B Monitor
+sections are described below.
+.TP 7
+.BI "VendorName  \*q" vendor \*q
+This optional entry specifies the monitor's manufacturer.
+.TP 7
+.BI "ModelName  \*q" model \*q
+This optional entry specifies the monitor's model.
+.TP 7
+.BI "HorizSync  " "horizsync-range"
+gives the range(s) of horizontal sync frequencies supported by the
+monitor.
+.I horizsync-range
+may be a comma separated list of either discrete values or ranges of
+values.  A range of values is two values separated by a dash.  By default
+the values are in units of kHz.  They may be specified in MHz or Hz if
+.B MHz
+or
+.B Hz
+is added to the end of the line.  The data given here is used by the
+__xservername__ server to determine if video modes are within the specifications
+of the monitor.  This information should be available in the monitor's
+handbook.  If this entry is omitted, a default range of 28\-33kHz is
+used.
+.TP 7
+.BI "VertRefresh  " "vertrefresh-range"
+gives the range(s) of vertical refresh frequencies supported by the
+monitor.
+.I vertrefresh-range
+may be a comma separated list of either discrete values or ranges of
+values.  A range of values is two values separated by a dash.  By default
+the values are in units of Hz.  They may be specified in MHz or kHz if
+.B MHz
+or
+.B kHz
+is added to the end of the line.  The data given here is used by the
+__xservername__ server to determine if video modes are within the specifications
+of the monitor.  This information should be available in the monitor's
+handbook.  If this entry is omitted, a default range of 43-72Hz is used.
+.TP 7
+.BI "DisplaySize  " "width height"
+This optional entry gives the width and height, in millimetres, of the
+picture area of the monitor. If given this is used to calculate the
+horizontal and vertical pitch (DPI) of the screen.
+.TP 7
+.BI "Gamma  " "gamma-value"
+.TP 7
+.BI "Gamma  " "red-gamma green-gamma blue-gamma"
+This is an optional entry that can be used to specify the gamma correction
+for the monitor.  It may be specified as either a single value or as
+three separate RGB values.  The values should be in the range 0.1 to
+10.0, and the default is 1.0.  Not all drivers are capable of using this
+information.
+.TP 7
+.BI "UseModes  \*q" modesection-id \*q
+Include the set of modes listed in the
+.B Modes
+section called
+.IR modesection-id.
+This make all of the modes defined in that section available for use by
+this monitor.
+.TP 7
+.BI "Mode  \*q" name \*q
+This is an optional multi-line entry that can be used to provide
+definitions for video modes for the monitor.  In most cases this isn't
+necessary because the built-in set of VESA standard modes will be
+sufficient.  The
+.B Mode
+keyword indicates the start of a multi-line video mode description.
+The mode description is terminated with the
+.B EndMode
+keyword.  The mode description consists of the following entries:
+.RS 7
+.TP 4
+.BI "DotClock  " clock
+is the dot (pixel) clock rate to be used for the mode.
+.TP 4
+.BI "HTimings  " "hdisp hsyncstart hsyncend htotal"
+specifies the horizontal timings for the mode.
+.TP 4
+.BI "VTimings  " "vdisp vsyncstart vsyncend vtotal"
+specifies the vertical timings for the mode.
+.TP 4
+.BI "Flags  \*q" flag \*q " ..."
+specifies an optional set of mode flags, each of which is a separate
+string in double quotes.
+.B \*qInterlace\*q
+indicates that the mode is interlaced.
+.B \*qDoubleScan\*q
+indicates a mode where each scanline is doubled.
+.B \*q+HSync\*q
+and
+.B \*q\-HSync\*q
+can be used to select the polarity of the HSync signal.
+.B \*q+VSync\*q
+and
+.B \*q\-VSync\*q
+can be used to select the polarity of the VSync signal.
+.B \*qComposite\*q
+can be used to specify composite sync on hardware where this is supported.
+Additionally, on some hardware,
+.B \*q+CSync\*q
+and
+.B \*q\-CSync\*q
+may be used to select the composite sync polarity.
+.TP 4
+.BI "HSkew  " hskew
+specifies the number of pixels (towards the right edge of the screen)
+by which the display enable signal is to be skewed.  Not all drivers
+use this information.  This option might become necessary to override
+the default value supplied by the server (if any).  "Roving" horizontal
+lines indicate this value needs to be increased.  If the last few pixels
+on a scan line appear on the left of the screen, this value should be
+decreased.
+.TP 4
+.BI "VScan  " vscan
+specifies the number of times each scanline is painted on the screen.
+Not all drivers use this information.  Values less than 1 are treated
+as 1, which is the default.  Generally, the
+.B \*qDoubleScan\*q
+.B Flag
+mentioned above doubles this value.
+.RE
+.TP 7
+.BI "ModeLine  \*q" name \*q " mode-description"
+This entry is a more compact version of the
+.B Mode
+entry, and it also can be used to specify video modes for the monitor.
+is a single line format for specifying video modes.  In most cases this
+isn't necessary because the built-in set of VESA standard modes will be
+sufficient.
+.PP
+.RS 7
+The
+.I mode-description
+is in four sections, the first three of which are mandatory.  The first
+is the dot (pixel) clock.  This is a single number specifying the pixel
+clock rate for the mode in MHz.  The second section is a list of four
+numbers specifying the horizontal timings.  These numbers are the
+.IR hdisp ,
+.IR hsyncstart ,
+.IR hsyncend ,
+and
+.I htotal
+values.  The third section is a list of four numbers specifying the
+vertical timings.  These numbers are the
+.IR vdisp ,
+.IR vsyncstart ,
+.IR vsyncend ,
+and
+.I vtotal
+values.  The final section is a list of flags specifying other
+characteristics of the mode.
+.B Interlace
+indicates that the mode is interlaced.
+.B DoubleScan
+indicates a mode where each scanline is doubled.
+.B +HSync
+and
+.B \-HSync
+can be used to select the polarity of the HSync signal.
+.B +VSync
+and
+.B \-VSync
+can be used to select the polarity of the VSync signal.
+.B Composite
+can be used to specify composite sync on hardware where this is supported.
+Additionally, on some hardware,
+.B +CSync
+and
+.B \-CSync
+may be used to select the composite sync polarity.  The
+.B HSkew
+and
+.B VScan
+options mentioned above in the
+.B Modes
+entry description can also be used here.
+.RE
+.TP 7
+.B Options
+Some
+.B Option
+flags that may be useful to include in
+.B Monitor
+sections (when needed) include
+.BR \*qDPMS\*q ,
+and
+.BR \*qSyncOnGreen\*q .
+
+.SH MODES SECTION
+The config file may have multiple
+.B Modes
+sections, or none.  These sections provide a way of defining sets of
+video modes independently of the
+.B Monitor
+sections.
+.B Monitor
+sections may include the definitions provided in these sections by
+using the
+.B UseModes
+keyword.  In most cases the
+.B Modes
+sections are not necessary because the built-in set of VESA standard modes
+will be sufficient.
+.PP
+.B Modes
+sections have the following format:
+.PP
+.RS 4
+.nf
+.B  "Section \*qModes\*q"
+.BI "    Identifier \*q" name \*q
+.I  "    entries"
+.I  "    ..."
+.B  "EndSection"
+.fi
+.RE
+.PP
+The
+.B Identifier
+entry specifies the unique name for this set of mode descriptions.
+The other entries permitted in
+.B Modes
+sections are the
+.B Mode
+and
+.B ModeLine
+entries that are described above in the
+.B Monitor
+section.
+.SH SCREEN SECTION
+The config file may have multiple
+.B Screen
+sections.  There must be at least one, for the "screen" being used.
+A "screen" represents the binding of a graphics device
+.RB ( Device
+section) and a monitor
+.RB ( Monitor
+section).  A
+.B Screen
+section is considered "active" if it is referenced by an active
+.B ServerLayout
+section or by the
+.B \-screen
+command line option.  If neither of those is present, the first
+.B Screen
+section found in the config file is considered the active one.
+.PP
+.B Screen
+sections have the following format:
+.PP
+.RS 4
+.nf
+.B  "Section \*qScreen\*q"
+.BI "    Identifier \*q" name \*q
+.BI "    Device     \*q" devid \*q
+.BI "    Monitor    \*q" monid \*q
+.I  "    entries"
+.I  "    ..."
+.BI "    SubSection \*qDisplay\*q"
+.I  "       entries"
+.I  "       ...
+.B  "    EndSubSection"
+.I  "    ..."
+.B  "EndSection"
+.fi
+.RE
+.PP
+The
+.B Identifier
+and
+.B Device
+entries are mandatory.  All others are optional.
+.PP
+The
+.B Identifier
+entry specifies the unique name for this screen.  The
+.B Screen
+section provides information specific to the whole screen, including
+screen-specific
+.BR Options .
+In multi-head configurations, there will be multiple active
+.B Screen
+sections, one for each head.
+The entries available
+for this section are:
+.TP 7
+.BI "Device  \*q" device-id \*q
+This mandatory entry specifies the
+.B Device
+section to be used for this screen.  This is what ties a specific
+graphics card to a screen.  The
+.I device-id
+must match the
+.B Identifier
+of a
+.B Device
+section in the config file.
+.TP 7
+.BI "Monitor  \*q" monitor-id \*q
+specifies which monitor description is to be used for this screen.
+If a
+.B Monitor
+name is not specified, a default configuration is used.  Currently the default
+configuration may not function as expected on all platforms.
+.TP 7
+.BI "VideoAdaptor  \*q" xv-id \*q
+specifies an optional Xv video adaptor description to be used with this
+screen.
+.TP 7
+.BI "DefaultDepth  " depth
+specifies which color depth the server should use by default.  The
+.B \-depth
+command line option can be used to override this.  If neither is specified,
+the default depth is driver-specific, but in most cases is 8.
+.TP 7
+.BI "DefaultFbBpp  " bpp
+specifies which framebuffer layout to use by default.  The
+.B \-fbbpp
+command line option can be used to override this.  In most cases the
+driver will chose the best default value for this.  The only case where
+there is even a choice in this value is for depth 24, where some hardware
+supports both a packed 24 bit framebuffer layout and a sparse 32 bit
+framebuffer layout.
+.TP 7
+.B Options
+Various
+.B Option
+flags may be specified in the
+.B Screen
+section.  Some are driver-specific and are described in the driver
+documentation.  Others are driver-independent, and will eventually be
+described here.
+.\" XXX These should really be in an xaa man page.
+.TP 7
+.BI "Option \*qAccel\*q"
+Enables XAA (X Acceleration Architecture), a mechanism that makes video
+cards' 2D hardware acceleration available to the 
+__xservername__ server.  This
+option is on by default, but it may be necessary to turn it off if there
+are bugs in the driver.  There are many options to disable specific
+accelerated operations, listed below.  Note that disabling an operation
+will have no effect if the operation is not accelerated (whether due to
+lack of support in the hardware or in the driver).
+.TP 7
+.BI "Option \*qBiosLocation\*q \*q" address \*q
+Set the location of the BIOS for the Int10 module. One may select a BIOS
+of another card for posting or the legacy V_BIOS range located at 0xc0000
+or an alternative address (BUS_ISA).  This is only useful under very
+special circumstances and should be used with extreme care.
+.TP 7
+.BI "Option \*qInitPrimary\*q \*q" boolean \*q
+Use the Int10 module to initialize the primary graphics card. Normally,
+only secondary cards are soft-booted using the Int10 module, as the
+primary card has already been initialized by the BIOS at boot time.
+Default: false.
+.TP 7
+.BI "Option \*qNoInt10\*q \*q" boolean \*q
+Disables the Int10 module, a module that uses the int10 call to the BIOS
+of the graphics card to initialize it. Default: false.
+.TP 7
+.BI "Option \*qNoMTRR\*q"
+Disables MTRR (Memory Type Range Register) support, a feature of modern
+processors which can improve video performance by a factor of up to 2.5.
+Some hardware has buggy MTRR support, and some video drivers have been
+known to exhibit problems when MTRR's are used.
+.TP 7
+.BI "Option \*qXaaNoCPUToScreenColorExpandFill\*q"
+Disables accelerated rectangular expansion blits from source patterns
+stored in system memory (using a memory-mapped aperture).
+.TP 7
+.BI "Option \*qXaaNoColor8x8PatternFillRect\*q"
+Disables accelerated fills of a rectangular region with a full-color
+pattern.
+.TP 7
+.BI "Option \*qXaaNoColor8x8PatternFillTrap\*q"
+Disables accelerated fills of a trapezoidal region with a full-color
+pattern.
+.TP 7
+.BI "Option \*qXaaNoDashedBresenhamLine\*q"
+Disables accelerated dashed Bresenham line draws.
+.TP 7
+.BI "Option \*qXaaNoDashedTwoPointLine\*q"
+Disables accelerated dashed line draws between two arbitrary points.
+.TP 7
+.BI "Option \*qXaaNoImageWriteRect\*q"
+Disables accelerated transfers of full-color rectangular patterns from
+system memory to video memory (using a memory-mapped aperture).
+.TP 7
+.BI "Option \*qXaaNoMono8x8PatternFillRect\*q"
+Disables accelerated fills of a rectangular region with a monochrome
+pattern.
+.TP 7
+.BI "Option \*qXaaNoMono8x8PatternFillTrap\*q"
+Disables accelerated fills of a trapezoidal region with a monochrome
+pattern.
+.TP 7
+.BI "Option \*qXaaNoOffscreenPixmaps\*q"
+Disables accelerated draws into pixmaps stored in offscreen video memory.
+.TP 7
+.BI "Option \*qXaaNoPixmapCache\*q"
+Disables caching of patterns in offscreen video memory.
+.TP 7
+.BI "Option \*qXaaNoScanlineCPUToScreenColorExpandFill\*q"
+Disables accelerated rectangular expansion blits from source patterns
+stored in system memory (one scan line at a time).
+.TP 7
+.BI "Option \*qXaaNoScanlineImageWriteRect\*q"
+Disables accelerated transfers of full-color rectangular patterns from
+system memory to video memory (one scan line at a time).
+.TP 7
+.BI "Option \*qXaaNoScreenToScreenColorExpandFill\*q"
+Disables accelerated rectangular expansion blits from source patterns
+stored in offscreen video memory.
+.TP 7
+.BI "Option \*qXaaNoScreenToScreenCopy\*q"
+Disables accelerated copies of rectangular regions from one part of
+video memory to another part of video memory.
+.TP 7
+.BI "Option \*qXaaNoSolidBresenhamLine\*q"
+Disables accelerated solid Bresenham line draws.
+.TP 7
+.BI "Option \*qXaaNoSolidFillRect\*q"
+Disables accelerated solid-color fills of rectangles.
+.TP 7
+.BI "Option \*qXaaNoSolidFillTrap\*q"
+Disables accelerated solid-color fills of Bresenham trapezoids.
+.TP 7
+.BI "Option \*qXaaNoSolidHorVertLine\*q"
+Disables accelerated solid horizontal and vertical line draws.
+.TP 7
+.BI "Option \*qXaaNoSolidTwoPointLine\*q"
+Disables accelerated solid line draws between two arbitrary points.
+.PP
+Each
+.B Screen
+section may optionally contain one or more
+.B Display
+subsections.  Those subsections provide depth/fbbpp specific configuration
+information, and the one chosen depends on the depth and/or fbbpp that
+is being used for the screen.  The
+.B Display
+subsection format is described in the section below.
+
+.SH DISPLAY SUBSECTION
+Each
+.B Screen
+section may have multiple
+.B Display
+subsections.  
+The "active"
+.B Display
+subsection is the first that matches the depth and/or fbbpp values being
+used, or failing that, the first that has neither a depth or fbbpp value
+specified.  The
+.B Display
+subsections are optional.  When there isn't one that matches the depth
+and/or fbbpp values being used, all the parameters that can be specified
+here fall back to their defaults.
+.PP
+.B Display
+subsections have the following format:
+.PP
+.RS 4
+.nf
+.B  "    SubSection \*qDisplay\*q"
+.BI "        Depth  " depth
+.I  "        entries"
+.I  "        ..."
+.B  "    EndSubSection"
+.fi
+.RE
+.PP
+.TP 7
+.BI "Depth  " depth
+This entry specifies what colour depth the
+.B Display
+subsection is to be used for.  This entry is usually specified,
+but it may be omitted to create a match-all
+.B Display
+subsection or when wishing to match only against the
+.B FbBpp
+parameter.  The range of
+.I depth
+values that are allowed depends on the driver.  Most driver support
+8, 15, 16 and 24.  Some also support 1 and/or 4, and some may support
+other values (like 30).  Note:
+.I depth
+means the number of bits in a pixel that are actually used to determine
+the pixel colour.  32 is not a valid
+.I depth
+value.  Most hardware that uses 32 bits per pixel only uses 24 of them
+to hold the colour information, which means that the colour depth is
+24, not 32.
+.TP 7
+.BI "FbBpp  " bpp
+This entry specifies the framebuffer format this
+.B Display
+subsection is to be used for.  This entry is only needed when providing
+depth 24 configurations that allow a choice between a 24 bpp packed
+framebuffer format and a 32bpp sparse framebuffer format.  In most cases
+this entry should not be used.
+.TP 7
+.BI "Weight  " "red-weight green-weight blue-weight"
+This optional entry specifies the relative RGB weighting to be used
+for a screen is being used at depth 16 for drivers that allow multiple
+formats.  This may also be specified from the command line with the
+.B \-weight
+option (see __xservername__(__appmansuffix__)).
+.TP 7
+.BI "Virtual  " "xdim ydim"
+This optional entry specifies the virtual screen resolution to be used.
+.I xdim
+must be a multiple of either 8 or 16 for most drivers, and a multiple
+of 32 when running in monochrome mode.  The given value will be rounded
+down if this is not the case.  Video modes which are too large for the
+specified virtual size will be rejected.  If this entry is not present,
+the virtual screen resolution will be set to accommodate all the valid
+video modes given in the
+.B Modes
+entry.  Some drivers/hardware combinations do not support virtual screens.
+Refer to the appropriate driver-specific documentation for details.
+.TP 7
+.BI "ViewPort  " "x0 y0"
+This optional entry sets the upper left corner of the initial display.
+This is only relevant when the virtual screen resolution is different
+from the resolution of the initial video mode.  If this entry is not
+given, then the initial display will be centered in the virtual display
+area.
+.TP 7
+.BI "Modes  \*q" mode-name \*q " ..."
+This optional entry specifies the list of video modes to use.  Each
+.I mode-name
+specified must be in double quotes.  They must correspond to those
+specified or referenced in the appropriate
+.B Monitor
+section (including implicitly referenced built-in VESA standard modes).
+The server will delete modes from this list which don't satisfy various
+requirements.  The first valid mode in this list will be the default
+display mode for startup.  The list of valid modes is converted internally
+into a circular list.  It is possible to switch to the next mode with
+.B Ctrl+Alt+Keypad-Plus
+and to the previous mode with
+.BR Ctrl+Alt+Keypad-Minus .
+When this entry is omitted, the valid modes referenced by the appropriate
+.B Monitor
+section will be used.  If the
+.B Monitor
+section contains no modes, then the selection will be taken from the
+built-in VESA standard modes.
+.TP 7
+.BI "Visual  \*q" visual-name \*q
+This optional entry sets the default root visual type.  This may also
+be specified from the command line (see the Xserver(__appmansuffix__) man page).  The
+visual types available for depth 8 are (default is
+.BR PseudoColor ):
+.PP
+.RS 11
+.nf
+.B StaticGray
+.B GrayScale
+.B StaticColor
+.B PseudoColor
+.B TrueColor
+.B DirectColor
+.fi
+.RE
+.PP
+.RS 7
+The visual type available for the depths 15, 16 and 24 are (default is
+.BR TrueColor ):
+.PP
+.RS 4
+.nf
+.B TrueColor
+.B DirectColor
+.fi
+.RE
+.PP
+Not all drivers support
+.B DirectColor
+at these depths.
+.PP
+The visual types available for the depth 4 are (default is
+.BR StaticColor ):
+.PP
+.RS 4
+.nf
+.B StaticGray
+.B GrayScale
+.B StaticColor
+.B PseudoColor
+.fi
+.RE
+.PP
+The visual type available for the depth 1 (monochrome) is
+.BR StaticGray .
+.RE
+.TP 7
+.BI "Black  " "red green blue"
+This optional entry allows the "black" colour to be specified.  This
+is only supported at depth 1.  The default is black.
+.TP 7
+.BI "White  " "red green blue"
+This optional entry allows the "white" colour to be specified.  This
+is only supported at depth 1.  The default is white.
+.TP 7
+.B Options
+Option flags may be specified in the
+.B Display
+subsections.  These may include driver-specific options and
+driver-independent options.  The former are described in the
+driver-specific documentation.  Some of the latter are described above
+in the section about the
+.B Screen
+section, and they may also be included here.
+.SH SERVERLAYOUT SECTION
+The config file may have multiple
+.B ServerLayout
+sections.  
+A "server layout" represents the binding of one or more screens
+.RB ( Screen
+sections) and one or more input devices
+.RB ( InputDevice
+sections) to form a complete configuration.  In multi-head configurations,
+it also specifies the relative layout of the heads.  A
+.B ServerLayout
+section is considered "active" if it is referenced by the
+.B \-layout
+command line option or by an
+.B "Option \*qDefaultServerLayout\*q"
+entry in the
+.B ServerFlags
+section (the former takes precedence over the latter).  If those options are
+not used, the first
+.B ServerLayout
+section found in the config file is considered the active one.  If no
+.B ServerLayout
+sections are present, the single active screen and two active (core)
+input devices are selected as described in the relevant sections above.
+.PP
+.B ServerLayout
+sections have the following format:
+.PP
+.RS 4
+.nf
+.B  "Section \*qServerLayout\*q"
+.BI "    Identifier   \*q" name \*q
+.BI "    Screen       \*q" screen-id \*q
+.I  "    ..."
+.BI "    InputDevice  \*q" idev-id \*q
+.I  "    ..."
+.I  "    options"
+.I  "    ..."
+.B  "EndSection"
+.fi
+.RE
+.PP
+Each
+.B ServerLayout
+section must have an
+.B Identifier
+entry and at least one
+.B Screen
+entry.
+.PP
+The
+.B Identifier
+entry specifies the unique name for this server layout.  The
+.B ServerLayout
+section provides information specific to the whole session, including
+session-specific
+.BR Options .
+The
+.B ServerFlags
+options (described above) may be specified here, and ones given here
+override those given in the
+.B ServerFlags
+section.
+.PP
+The entries that may be used in this section are described here.
+.TP 7
+.BI "Screen  " "screen-num" " \*qscreen-id\*q " "position-information"
+One of these entries must be given for each screen being used in
+a session.  The
+.I screen-id
+field is mandatory, and specifies the
+.B Screen
+section being referenced.  The
+.I screen-num
+field is optional, and may be used to specify the screen number
+in multi-head configurations.  When this field is omitted, the
+screens will be numbered in the order that they are listed in.
+The numbering starts from 0, and must be consecutive.  The
+.I position-information
+field describes the way multiple screens are positioned.  There are
+a number of different ways that this information can be provided:
+.RS 7
+.TP 4
+.I  "x y"
+.TP 4
+.BI "Absolute  " "x y"
+These both specify that the upper left corner's coordinates are
+.RI ( x , y ).
+The
+.B Absolute
+keyword is optional.  Some older versions of __xservername__ (4.2 and earlier) don't
+recognise the
+.B Absolute
+keyword, so it's safest to just specify the coordinates without it.
+.TP 4
+.BI "RightOf   \*q" screen-id \*q
+.TP 4
+.BI "LeftOf    \*q" screen-id \*q
+.TP 4
+.BI "Above     \*q" screen-id \*q
+.TP 4
+.BI "Below     \*q" screen-id \*q
+.TP 4
+.BI "Relative  \*q" screen-id \*q " x y"
+These give the screen's location relative to another screen.  The first four
+position the screen immediately to the right, left, above or below the
+other screen.  When positioning to the right or left, the top edges are
+aligned.  When positioning above or below, the left edges are aligned.
+The
+.B Relative
+form specifies the offset of the screen's origin (upper left corner)
+relative to the origin of another screen.
+.RE
+.TP 7
+.BI "InputDevice  \*q" idev-id "\*q \*q" option \*q " ..."
+One of these entries should be given for each input device being used in
+a session.  Normally at least two are required, one each for the core
+pointer and keyboard devices.  If either of those is missing, suitable
+.B InputDevice
+entries are searched for using the method described above in the
+.B INPUTDEVICE
+section.  The
+.I idev-id
+field is mandatory, and specifies the name of the
+.B InputDevice
+section being referenced.  Multiple
+.I option
+fields may be specified, each in double quotes.  The options permitted
+here are any that may also be given in the
+.B InputDevice
+sections.  Normally only session-specific input device options would be
+used here.  The most commonly used options are:
+.PP
+.RS 11
+.nf
+.B \*qCorePointer\*q
+.B \*qCoreKeyboard\*q
+.B \*qSendCoreEvents\*q
+.fi
+.RE
+.PP
+.RS 7
+and the first two should normally be used to indicate the core pointer
+and core keyboard devices respectively.
+.RE
+.TP 7
+.B Options
+Any option permitted in the
+.B ServerFlags
+section may also be specified here.  When the same option appears in both
+places, the value given here overrides the one given in the
+.B ServerFlags
+section.
+.PP
+Here is an example of a
+.B ServerLayout
+section for a dual headed configuration with two mice:
+.PP
+.RS 4
+.nf
+.B "Section \*qServerLayout\*q"
+.B "    Identifier  \*qLayout 1\*q"
+.B "    Screen      \*qMGA 1\*q"
+.B "    Screen      \*qMGA 2\*q RightOf \*qMGA 1\*q"
+.B "    InputDevice \*qKeyboard 1\*q \*qCoreKeyboard\*q"
+.B "    InputDevice \*qMouse 1\*q    \*qCorePointer\*q"
+.B "    InputDevice \*qMouse 2\*q    \*qSendCoreEvents\*q"
+.B "    Option      \*qBlankTime\*q  \*q5\*q"
+.B "EndSection"
+.fi
+.RE
+.SH DRI SECTION
+This optional section is used to provide some information for the
+Direct Rendering Infrastructure.  Details about the format of this section
+can be found in the README.DRI document, which is also available on-line
+at
+.IR <http://www.x.org> .
+.SH VENDOR SECTION
+The optional
+.B Vendor
+section may be used to provide vendor-specific configuration information.
+Multiple
+.B Vendor
+sections may be present, and they may contain an
+.B Identifier
+entry and multiple
+.B Option
+flags.  The data therein is not used in this release.
+.PP
+.SH FILES
+For an example of an __xconfigfile__ file, see the file installed as
+__projectroot__/lib/X11/__xconfigfile__.eg.
+.fi
+.SH "SEE ALSO"
+X(__miscmansuffix__),
+Xserver(__appmansuffix__),
+__xservername__(__appmansuffix__),
+apm(__drivermansuffix__),
+.\" .IR ati(__drivermansuffix__),
+chips(__drivermansuffix__),
+cirrus(__drivermansuffix__),
+cyrix(__drivermansuffix__),
+fbdev(__drivermansuffix__),
+glide(__drivermansuffix__),
+glint(__drivermansuffix__),
+i128(__drivermansuffix__),
+i740(__drivermansuffix__),
+i810(__drivermansuffix__),
+imstt(__drivermansuffix__),
+mga(__drivermansuffix__),
+neomagic(__drivermansuffix__),
+nv(__drivermansuffix__),
+r128(__drivermansuffix__),
+rendition(__drivermansuffix__),
+savage(__drivermansuffix__),
+s3virge(__drivermansuffix__),
+.\" .IR shadowfb(__drivermansuffix__),
+siliconmotion(__drivermansuffix__),
+sis(__drivermansuffix__),
+sunbw2(__drivermansuffix__),
+suncg14(__drivermansuffix__),
+suncg3(__drivermansuffix__),
+suncg6(__drivermansuffix__),
+sunffb(__drivermansuffix__),
+sunleo(__drivermansuffix__),
+suntcx(__drivermansuffix__),
+tdfx(__drivermansuffix__),
+tga(__drivermansuffix__),
+trident(__drivermansuffix__),
+tseng(__drivermansuffix__),
+v4l(__drivermansuffix__),
+vesa(__drivermansuffix__),
+vga(__drivermansuffix__),
+vmware(__drivermansuffix__),
+.br
+.SH AUTHORS
+This manual page was largely rewritten by David Dawes
+.IR <dawes@xfree86.org> .
diff --git a/hw/xfree86/doc/sgml/DESIGN.sgml b/hw/xfree86/doc/sgml/DESIGN.sgml
index 864b5c249..84e4fad21 100644
--- a/hw/xfree86/doc/sgml/DESIGN.sgml
+++ b/hw/xfree86/doc/sgml/DESIGN.sgml
@@ -1,4 +1,5 @@
-<!DOCTYPE linuxdoc PUBLIC "-//XFree86//DTD linuxdoc//EN" [
+<!DOCTYPE linuxdoc PUBLIC "-//Xorg//DTD linuxdoc//EN" [
+ <!ENTITY % defs SYSTEM "defs.ent"> %defs;
  <!-- config file keyword markup -->
  <!ENTITY s.key STARTTAG "bf">
  <!ENTITY e.key ENDTAG "bf">
@@ -27,6 +28,7 @@
 
 <title>XFree86 server 4.x Design (DRAFT)
 <author>The XFree86 Project, Inc
+<and>Updates for X11R&relvers; by Jim Gettys
 <date>19 December 2003
 
 
@@ -36,7 +38,7 @@
 
 
 <ident>
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/DESIGN.sgml,v 1.54 2003/12/19 20:38:57 dawes Exp $
+$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/DESIGN.sgml,v 1.53 2003/08/23 14:10:14 dawes Exp $
 </ident>
 
 
@@ -79,10 +81,10 @@ The broad design principles are:
 Unless we find major deficiencies in the DIX layer, we should avoid
 making changes there.
 
-<sect>The XF86Config File
+<sect>The xorg.conf File
 <p>
 
-The XF86Config file format is similar to the old format, with the following
+The xorg.conf file format is similar to the old format, with the following
 changes:
 
 <sect1>&k.device; section
@@ -315,7 +317,7 @@ the XFree86 common layer:
 
    <tag>PreInit</tag>
 
-     Process information from the XF86Config file, determine the
+     Process information from the xorg.conf file, determine the
      full characteristics of the hardware, and determine if a valid
      configuration is present.
    </descrip>
@@ -426,12 +428,12 @@ control.  &s.code;InitOutput()&e.code; is expected to fill in the global
 &s.code;screenInfo.screen[]&e.code; entry for each screen present.  Here
 is what &s.code;InitOutput()&e.code; does:
 
-<sect1>Parse the XF86Config file
+<sect1>Parse the xorg.conf file
 <p>
 
     This is done at the start of the first server generation only.
 
-    The XF86Config file is read in full, and the resulting information
+    The xorg.conf file is read in full, and the resulting information
     stored in data structures.  None of the parsed information is
     processed at this point.  The parser data structures are opaque to
     the video drivers and to most of the common layer code.
@@ -595,7 +597,7 @@ is what &s.code;InitOutput()&e.code; does:
       &s.code;PROBE_DETECT&e.code; is used if "-configure" or "-probe"
       command line arguments are given and indicates to the
       &s.code;Probe()&e.code; function that it should not configure the
-      bus entities and that no XF86Config information is available.
+      bus entities and that no xorg.conf information is available.
 
       The probe must find the active device sections that match the
       driver by calling &s.code;xf86MatchDevice()&e.code;.  The number
@@ -746,7 +748,7 @@ is what &s.code;InitOutput()&e.code; does:
 
     After the Probe phase is finished, there will be some number of
     &s.code;ScrnInfoRecs&e.code;.  These are then matched with the active
-    &k.screen; sections in the XF86Config, and those not having an active
+    &k.screen; sections in the xorg.conf, and those not having an active
     &k.screen; section are deleted.  If the number of remaining screens
     is 0, &s.code;InitOutput()&e.code; sets
     &s.code;screenInfo.numScreens&e.code; to &s.code;0&e.code; and
@@ -1294,10 +1296,10 @@ The function should not modify any other mode field, unless it wants to modify
 the mode timings reported to the user by &s.code;xf86PrintModes()&e.code;.
 
 <p>
-The function is called once for every mode in the XF86Config Monitor section
+The function is called once for every mode in the xorg.conf Monitor section
 assigned to the screen, with &s.code;flags&e.code; set to
 &s.code;MODECHECK_INITIAL&e.code;.  It is subsequently called for every mode
-in the XF86Config Display subsection assigned to the screen, with
+in the xorg.conf Display subsection assigned to the screen, with
 &s.code;flags&e.code; set to &s.code;MODECHECK_FINAL&e.code;.  In the second
 case, the mode will have successfully passed all other tests.  In addition,
 the &s.code;ScrnInfoRec&e.code;'s &s.code;virtualX&e.code;,
@@ -1866,7 +1868,7 @@ creates an entity record for each of them, registers non-relocatable
 resources and allocates screens and adds the resources to screens.
 
 Two helper functions are provided for matching device sections in the
-XF86Config file to the devices:
+xorg.conf file to the devices:
 
     <quote><p>
     &s.code;int xf86MatchPciInstances(const char *driverName, int vendorID,
@@ -5271,7 +5273,7 @@ be catered for the by the helpers.
 		<quote>Allow halved clocks</quote>
 		&s.code;LOOKUP_OPTIONAL_TOLERANCES&e.code;
 		<quote>Allow missing horizontal sync and/or vertical refresh
-		ranges in the XF86Config Monitor section</quote>
+		ranges in the xorg.conf Monitor section</quote>
 
 		&s.code;LOOKUP_OPTIONAL_TOLERANCES&e.code; should only be
 		specified when the driver can ensure all modes it generates
@@ -5291,7 +5293,7 @@ be catered for the by the helpers.
         &s.code;progClock&e.code;
 	<quote>Whether the clock is programmable or not</quote>
         &s.code;monitor&e.code;
-	<quote>Pointer to the applicable XF86Config monitor section</quote>
+	<quote>Pointer to the applicable xorg.conf monitor section</quote>
         &s.code;fdFormat&e.code;
 	<quote>Format of the screen buffer</quote>
         &s.code;videoRam&e.code;
@@ -6731,7 +6733,7 @@ ZZZProbe(DriverPtr drv, int flags)
 
     Define the &s.code;AvailableOptions()&e.code; function. The purpose
     of this is to return the available driver options back to the
-    -configure option, so that an XF86Config file can be built and the
+    -configure option, so that an xorg.conf file can be built and the
     user can see which options are available for them to use.
 
 <sect2>PreInit
diff --git a/hw/xfree86/dummylib/README b/hw/xfree86/dummylib/README
index 8e5b539a6..4e270307a 100644
--- a/hw/xfree86/dummylib/README
+++ b/hw/xfree86/dummylib/README
@@ -4,4 +4,4 @@ There is one symbol per source/object so that each can be overriden
 individually by whatever uses this library.
 
 
-$XFree86: xc/programs/Xserver/hw/xfree86/dummylib/README,v 1.1 2000/02/13 03:06:38 dawes Exp $
+$XFree86$
diff --git a/hw/xfree86/dummylib/dummylib.h b/hw/xfree86/dummylib/dummylib.h
index d8a0d285a..5835446bf 100644
--- a/hw/xfree86/dummylib/dummylib.h
+++ b/hw/xfree86/dummylib/dummylib.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/dummylib.h,v 1.2 2003/09/09 03:20:38 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/dummylib.h,v 1.1 2000/02/13 03:06:38 dawes Exp $ */
 
 #ifndef _DUMMY_LIB_H
 #define _DUMMY_LIB_H
diff --git a/hw/xfree86/dummylib/fatalerror.c b/hw/xfree86/dummylib/fatalerror.c
index 3c482b480..ec437d8df 100644
--- a/hw/xfree86/dummylib/fatalerror.c
+++ b/hw/xfree86/dummylib/fatalerror.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/fatalerror.c,v 1.1 2000/02/13 03:06:38 dawes Exp $ */
+/* $XFree86$ */
 
 #include "X.h"
 #include "os.h"
diff --git a/hw/xfree86/dummylib/getvalidbios.c b/hw/xfree86/dummylib/getvalidbios.c
index a16126842..c1b0fa988 100644
--- a/hw/xfree86/dummylib/getvalidbios.c
+++ b/hw/xfree86/dummylib/getvalidbios.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/getvalidbios.c,v 1.3 2001/05/15 10:19:41 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/getvalidbios.c,v 1.1 2000/02/13 03:06:38 dawes Exp $ */
 
 #include "X.h"
 #include "os.h"
diff --git a/hw/xfree86/dummylib/logvwrite.c b/hw/xfree86/dummylib/logvwrite.c
index 75634d7f3..6b910d5b3 100644
--- a/hw/xfree86/dummylib/logvwrite.c
+++ b/hw/xfree86/dummylib/logvwrite.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/logvwrite.c,v 1.1 2003/09/09 03:20:38 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/verrorfverb.c,v 1.2 2003/08/25 04:13:05 dawes Exp $ */
 
 #include "X.h"
 #include "os.h"
diff --git a/hw/xfree86/dummylib/pcitestmulti.c b/hw/xfree86/dummylib/pcitestmulti.c
index 4259f678e..d6e5c65a1 100644
--- a/hw/xfree86/dummylib/pcitestmulti.c
+++ b/hw/xfree86/dummylib/pcitestmulti.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/pcitestmulti.c,v 1.1 2000/02/13 03:06:39 dawes Exp $ */
+/* $XFree86$ */
 
 #include "X.h"
 #include "os.h"
diff --git a/hw/xfree86/dummylib/verrorf.c b/hw/xfree86/dummylib/verrorf.c
index e36a590e7..30bc93e71 100644
--- a/hw/xfree86/dummylib/verrorf.c
+++ b/hw/xfree86/dummylib/verrorf.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/verrorf.c,v 1.1 2000/02/13 03:06:39 dawes Exp $ */
+/* $XFree86$ */
 
 #include "X.h"
 #include "os.h"
diff --git a/hw/xfree86/dummylib/xalloc.c b/hw/xfree86/dummylib/xalloc.c
index 63d3ff8c7..4b7226e17 100644
--- a/hw/xfree86/dummylib/xalloc.c
+++ b/hw/xfree86/dummylib/xalloc.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xalloc.c,v 1.2 2002/11/09 09:00:13 herrb Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xalloc.c,v 1.1 2000/02/13 03:06:39 dawes Exp $ */
 
 #include "X.h"
 #include "os.h"
diff --git a/hw/xfree86/dummylib/xf86addrestolist.c b/hw/xfree86/dummylib/xf86addrestolist.c
index ea24fc1dc..006a6382a 100644
--- a/hw/xfree86/dummylib/xf86addrestolist.c
+++ b/hw/xfree86/dummylib/xf86addrestolist.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86addrestolist.c,v 1.3 2002/12/24 15:50:43 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86addrestolist.c,v 1.2tsi Exp $ */
 
 #include "xf86.h"
 
diff --git a/hw/xfree86/dummylib/xf86allocscripi.c b/hw/xfree86/dummylib/xf86allocscripi.c
index 1f61eda4d..f0cb2e127 100644
--- a/hw/xfree86/dummylib/xf86allocscripi.c
+++ b/hw/xfree86/dummylib/xf86allocscripi.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86allocscripi.c,v 1.1 2000/02/13 03:06:40 dawes Exp $ */
+/* $XFree86$ */
 
 #include "X.h"
 #include "os.h"
diff --git a/hw/xfree86/dummylib/xf86drvmsg.c b/hw/xfree86/dummylib/xf86drvmsg.c
index 5780d9c13..c6f8e523f 100644
--- a/hw/xfree86/dummylib/xf86drvmsg.c
+++ b/hw/xfree86/dummylib/xf86drvmsg.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86drvmsg.c,v 1.2 2003/09/09 03:20:38 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86drvmsg.c,v 1.1 2000/02/13 03:06:40 dawes Exp $ */
 
 #include "X.h"
 #include "os.h"
diff --git a/hw/xfree86/dummylib/xf86drvmsgverb.c b/hw/xfree86/dummylib/xf86drvmsgverb.c
index b7c0ddb53..f6164a8da 100644
--- a/hw/xfree86/dummylib/xf86drvmsgverb.c
+++ b/hw/xfree86/dummylib/xf86drvmsgverb.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86drvmsgverb.c,v 1.2 2003/09/09 03:20:38 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86drvmsgverb.c,v 1.1 2000/02/13 03:06:40 dawes Exp $ */
 
 #include "X.h"
 #include "os.h"
diff --git a/hw/xfree86/dummylib/xf86errorf.c b/hw/xfree86/dummylib/xf86errorf.c
index 122f46d43..33f05ec9c 100644
--- a/hw/xfree86/dummylib/xf86errorf.c
+++ b/hw/xfree86/dummylib/xf86errorf.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86errorf.c,v 1.3 2003/09/09 03:20:38 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86errorf.c,v 1.2 2000/05/31 07:15:05 eich Exp $ */
 
 #include "X.h"
 #include "os.h"
diff --git a/hw/xfree86/dummylib/xf86errorfverb.c b/hw/xfree86/dummylib/xf86errorfverb.c
index 61c3e02a2..4ad5a1a51 100644
--- a/hw/xfree86/dummylib/xf86errorfverb.c
+++ b/hw/xfree86/dummylib/xf86errorfverb.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86errorfverb.c,v 1.2 2003/09/09 03:20:38 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86errorfverb.c,v 1.1 2000/02/13 03:06:41 dawes Exp $ */
 
 #include "X.h"
 #include "os.h"
diff --git a/hw/xfree86/dummylib/xf86getpagesize.c b/hw/xfree86/dummylib/xf86getpagesize.c
index 51b785a73..50701741f 100644
--- a/hw/xfree86/dummylib/xf86getpagesize.c
+++ b/hw/xfree86/dummylib/xf86getpagesize.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86getpagesize.c,v 1.1 2000/02/13 03:06:41 dawes Exp $ */
+/* $XFree86$ */
 
 #include "X.h"
 #include "os.h"
diff --git a/hw/xfree86/dummylib/xf86getverb.c b/hw/xfree86/dummylib/xf86getverb.c
index a4255698f..410d7b645 100644
--- a/hw/xfree86/dummylib/xf86getverb.c
+++ b/hw/xfree86/dummylib/xf86getverb.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86getverb.c,v 1.1 2000/02/13 03:06:41 dawes Exp $ */
+/* $XFree86$ */
 
 #include "X.h"
 #include "os.h"
diff --git a/hw/xfree86/dummylib/xf86info.c b/hw/xfree86/dummylib/xf86info.c
index d7b95b430..d488d3615 100644
--- a/hw/xfree86/dummylib/xf86info.c
+++ b/hw/xfree86/dummylib/xf86info.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86info.c,v 1.1 2000/02/13 03:06:41 dawes Exp $ */
+/* $XFree86$ */
 
 #include "X.h"
 #include "os.h"
diff --git a/hw/xfree86/dummylib/xf86msg.c b/hw/xfree86/dummylib/xf86msg.c
index 2d36bea97..e002948a2 100644
--- a/hw/xfree86/dummylib/xf86msg.c
+++ b/hw/xfree86/dummylib/xf86msg.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86msg.c,v 1.2 2003/09/09 03:20:38 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86msg.c,v 1.1 2000/02/13 03:06:42 dawes Exp $ */
 
 #include "X.h"
 #include "os.h"
diff --git a/hw/xfree86/dummylib/xf86msgverb.c b/hw/xfree86/dummylib/xf86msgverb.c
index f460b6b9f..308f6230d 100644
--- a/hw/xfree86/dummylib/xf86msgverb.c
+++ b/hw/xfree86/dummylib/xf86msgverb.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86msgverb.c,v 1.2 2003/09/09 03:20:38 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86msgverb.c,v 1.1 2000/02/13 03:06:42 dawes Exp $ */
 
 #include "X.h"
 #include "os.h"
diff --git a/hw/xfree86/dummylib/xf86opt.c b/hw/xfree86/dummylib/xf86opt.c
index dd00635b0..b660d45b3 100644
--- a/hw/xfree86/dummylib/xf86opt.c
+++ b/hw/xfree86/dummylib/xf86opt.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86opt.c,v 1.2 2001/05/04 19:05:50 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86opt.c,v 1.1 2000/02/13 03:06:42 dawes Exp $ */
 
 #include "X.h"
 #include "os.h"
diff --git a/hw/xfree86/dummylib/xf86screens.c b/hw/xfree86/dummylib/xf86screens.c
index 031b6e55a..8d9591442 100644
--- a/hw/xfree86/dummylib/xf86screens.c
+++ b/hw/xfree86/dummylib/xf86screens.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86screens.c,v 1.1 2000/02/13 03:06:42 dawes Exp $ */
+/* $XFree86$ */
 
 #include "X.h"
 #include "os.h"
diff --git a/hw/xfree86/dummylib/xf86servisinit.c b/hw/xfree86/dummylib/xf86servisinit.c
index 8339c658b..2f959a95c 100644
--- a/hw/xfree86/dummylib/xf86servisinit.c
+++ b/hw/xfree86/dummylib/xf86servisinit.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86servisinit.c,v 1.1 2000/02/13 03:06:43 dawes Exp $ */
+/* $XFree86$ */
 
 #include "X.h"
 #include "os.h"
diff --git a/hw/xfree86/dummylib/xf86verbose.c b/hw/xfree86/dummylib/xf86verbose.c
index 877bd6fd7..1f4614ba3 100644
--- a/hw/xfree86/dummylib/xf86verbose.c
+++ b/hw/xfree86/dummylib/xf86verbose.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86verbose.c,v 1.1 2000/02/13 03:06:43 dawes Exp $ */
+/* $XFree86$ */
 
 #include "X.h"
 #include "os.h"
diff --git a/hw/xfree86/fbdevhw/fbdevhw.c b/hw/xfree86/fbdevhw/fbdevhw.c
index 752cdb044..bff0571ad 100644
--- a/hw/xfree86/fbdevhw/fbdevhw.c
+++ b/hw/xfree86/fbdevhw/fbdevhw.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/fbdevhw/fbdevhw.c,v 1.33 2003/10/30 17:37:16 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/fbdevhw/fbdevhw.c,v 1.32 2003/08/26 10:57:03 daenzer Exp $ */
 
 /* all driver need this */
 #include "xf86.h"
@@ -40,7 +40,7 @@ static XF86ModuleVersionInfo fbdevHWVersRec =
 	MODULEVENDORSTRING,
 	MODINFOSTRING1,
 	MODINFOSTRING2,
-	XF86_VERSION_CURRENT,
+	XORG_VERSION_CURRENT,
 	0, 0, 2,
 	ABI_CLASS_VIDEODRV,
 	ABI_VIDEODRV_VERSION,
diff --git a/hw/xfree86/fbdevhw/fbdevhw.h b/hw/xfree86/fbdevhw/fbdevhw.h
index cfc47f905..219ca07d3 100644
--- a/hw/xfree86/fbdevhw/fbdevhw.h
+++ b/hw/xfree86/fbdevhw/fbdevhw.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/fbdevhw/fbdevhw.h,v 1.12 2003/10/30 17:37:16 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/fbdevhw/fbdevhw.h,v 1.11 2001/10/01 13:44:12 eich Exp $ */
 
 #ifndef _FBDEVHW_H_
 #define _FBDEVHW_H_
diff --git a/hw/xfree86/fbdevhw/fbdevhw.man.pre b/hw/xfree86/fbdevhw/fbdevhw.man.pre
index dadc1f9a3..deeced860 100644
--- a/hw/xfree86/fbdevhw/fbdevhw.man.pre
+++ b/hw/xfree86/fbdevhw/fbdevhw.man.pre
@@ -1,4 +1,4 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/fbdevhw/fbdevhw.man,v 1.2 2001/01/27 18:20:56 dawes Exp $ 
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/fbdevhw/fbdevhw.man,v 1.1 2001/01/24 00:06:34 dawes Exp $ 
 .TH FBDEVHW __drivermansuffix__ __vendorversion__
 .SH NAME
 fbdevhw \- os-specific submodule for framebuffer device access
@@ -14,7 +14,8 @@ fbdev(__drivermansuffix__) is a non-accelerated driver which runs on top of the
 fbdevhw module.  fbdevhw can be used by other drivers too, this
 is usually activated with `Option "UseFBDev"' in the device section.
 .SH "SEE ALSO"
-XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__),
+__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), 
+xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__),
 fbdev(__drivermansuffix__)
 .SH AUTHORS
 Authors include: Gerd Knorr, based on the XF68_FBDev Server code
diff --git a/hw/xfree86/fbdevhw/fbdevhwstub.c b/hw/xfree86/fbdevhw/fbdevhwstub.c
index b262be90f..dc1169362 100644
--- a/hw/xfree86/fbdevhw/fbdevhwstub.c
+++ b/hw/xfree86/fbdevhw/fbdevhwstub.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/fbdevhw/fbdevhwstub.c,v 1.13 2003/10/30 17:37:16 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/fbdevhw/fbdevhwstub.c,v 1.12 2001/10/28 03:33:55 tsi Exp $ */
 
 #include "xf86.h"
 #include "xf86cmap.h"
diff --git a/hw/xfree86/fbdevhw/fbpriv.h b/hw/xfree86/fbdevhw/fbpriv.h
index d651e5129..f4017fb2a 100644
--- a/hw/xfree86/fbdevhw/fbpriv.h
+++ b/hw/xfree86/fbdevhw/fbpriv.h
@@ -2,7 +2,7 @@
  * copyed from from linux kernel 2.2.4
  * removed internal stuff (#ifdef __KERNEL__)
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/fbdevhw/fbpriv.h,v 1.3 2000/08/11 17:27:14 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/fbdevhw/fbpriv.h,v 1.2 2000/01/21 02:30:02 dawes Exp $ */
 
 #ifndef _LINUX_FB_H
 #define _LINUX_FB_H
diff --git a/hw/xfree86/getconfig/cfg.man.pre b/hw/xfree86/getconfig/cfg.man.pre
index fcf1a6161..45301e707 100644
--- a/hw/xfree86/getconfig/cfg.man.pre
+++ b/hw/xfree86/getconfig/cfg.man.pre
@@ -1,4 +1,3 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/getconfig/cfg.man,v 1.1 2003/11/12 04:52:15 dawes Exp $
 .TH getconfig __filemansuffix__  __vendorversion__
 .SH NAME
 getconfig - meta configuration files for getconfig(1)
@@ -7,10 +6,10 @@ getconfig - meta configuration files for getconfig(1)
 .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 @@ the file format version number.  The signature string is
 .PP
 .RS 4
 .nf
-"XFree86 Project getconfig rules file.\ \ Version: "
+"Xorg getconfig rules file.\ \ Version: "
 .fi
 .RE
 .PP
@@ -44,10 +43,10 @@ continuation convention ('\e' at the end of the line).  The first logical
 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 @@ They include:
 .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 @@ rule that evaluates to true.
 .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 @@ server is:
 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 @@ appear in rules files.
 
 .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.
diff --git a/hw/xfree86/getconfig/cfg.sample b/hw/xfree86/getconfig/cfg.sample
index acf262d1a..93c98e4e2 100644
--- a/hw/xfree86/getconfig/cfg.sample
+++ b/hw/xfree86/getconfig/cfg.sample
@@ -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.2 2003/11/12 04:52:15 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 @@ $weight = 1000
 #   $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 @@ $device == $nodevice
 	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 @@ $vendor == $novendor
 
 $weight = 100
 
-$vendor == $novendor && $XFree86Version eq v4.3.2.1
+$vendor == $novendor && $XorgVersion eq v4.3.2.1
 	nodriver3
 
 $weight = 600
diff --git a/hw/xfree86/getconfig/getconfig b/hw/xfree86/getconfig/getconfig
index d2acc9bb8..a9e2b3ef2 100644
--- a/hw/xfree86/getconfig/getconfig
+++ b/hw/xfree86/getconfig/getconfig
@@ -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@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.
 
diff --git a/hw/xfree86/getconfig/getconfig.man.pre b/hw/xfree86/getconfig/getconfig.man.pre
index 16c472fc5..8d80e9208 100644
--- a/hw/xfree86/getconfig/getconfig.man.pre
+++ b/hw/xfree86/getconfig/getconfig.man.pre
@@ -1,7 +1,6 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/getconfig/getconfig.man,v 1.1 2003/11/12 04:52:15 dawes Exp $
 .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 @@ getconfig - get configuration information for the XFree86 server
 .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 @@ is written in perl.  It processes a prioritized and ordered list of
 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 @@ Enable debugging output.
 .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 @@ Specify the PCI vendor ID of the video device.
 .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 @@ server is:
 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.
diff --git a/hw/xfree86/getconfig/getconfig.pl b/hw/xfree86/getconfig/getconfig.pl
index fcfd7d057..85caf81f5 100644
--- a/hw/xfree86/getconfig/getconfig.pl
+++ b/hw/xfree86/getconfig/getconfig.pl
@@ -33,7 +33,6 @@
 # Author: David Dawes <dawes@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 @@ $debug = 0;
 $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 @@ while (@ARGV[0] =~ /^-[A-Za-z]$/) {
 	    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 @@ while (@ARGV[0] =~ /^-[A-Za-z]$/) {
 
 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;
 }
   
 
diff --git a/hw/xfree86/getconfig/xorg.cfg b/hw/xfree86/getconfig/xorg.cfg
new file mode 100644
index 000000000..848d5eb90
--- /dev/null
+++ b/hw/xfree86/getconfig/xorg.cfg
@@ -0,0 +1,50 @@
+# $XdotOrg$
+
+# 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
+#   
+
diff --git a/hw/xfree86/i2c/xf86i2c.c b/hw/xfree86/i2c/xf86i2c.c
index a7f5adf1a..55a6cb059 100644
--- a/hw/xfree86/i2c/xf86i2c.c
+++ b/hw/xfree86/i2c/xf86i2c.c
@@ -6,7 +6,7 @@
  *      (c) 1998 Gerd Knorr <kraxel@cs.tu-berlin.de>
  */
 
-/* $XFree86: xc/programs/Xserver/hw/xfree86/i2c/xf86i2c.c,v 1.15 2003/08/29 21:08:06 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/i2c/xf86i2c.c,v 1.14 2003/05/05 21:18:41 tsi Exp $ */
 
 #if 1
 #include "misc.h"
diff --git a/hw/xfree86/i2c/xf86i2c.h b/hw/xfree86/i2c/xf86i2c.h
index e7423155a..b6ef41feb 100644
--- a/hw/xfree86/i2c/xf86i2c.h
+++ b/hw/xfree86/i2c/xf86i2c.h
@@ -2,7 +2,7 @@
  *  Copyright (C) 1998 Itai Nahshon, Michael Schimek
  */
 
-/* $XFree86: xc/programs/Xserver/hw/xfree86/i2c/xf86i2c.h,v 1.11 2003/08/29 21:08:06 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/i2c/xf86i2c.h,v 1.10 2003/07/16 01:38:47 dawes Exp $ */
 #ifndef _XF86I2C_H
 #define _XF86I2C_H
 
diff --git a/hw/xfree86/i2c/xf86i2cmodule.c b/hw/xfree86/i2c/xf86i2cmodule.c
index de923b2f0..0058795f0 100644
--- a/hw/xfree86/i2c/xf86i2cmodule.c
+++ b/hw/xfree86/i2c/xf86i2cmodule.c
@@ -5,7 +5,7 @@
  *      (c) 1998 Gerd Knorr <kraxel@cs.tu-berlin.de>
  */
 
-/* $XFree86: xc/programs/Xserver/hw/xfree86/i2c/xf86i2cmodule.c,v 1.7 1999/04/11 13:11:02 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/i2c/xf86i2cmodule.c,v 1.6 1999/01/26 05:54:10 dawes Exp $ */
 
 #include "xf86Module.h"
 
@@ -17,7 +17,7 @@ static XF86ModuleVersionInfo i2cVersRec =
         MODULEVENDORSTRING,
         MODINFOSTRING1,
         MODINFOSTRING2,
-        XF86_VERSION_CURRENT,
+        XORG_VERSION_CURRENT,
         1, 2, 0,
         ABI_CLASS_VIDEODRV,		/* This needs the video driver ABI */
         ABI_VIDEODRV_VERSION,
diff --git a/hw/xfree86/int10/INT10.HOWTO b/hw/xfree86/int10/INT10.HOWTO
index bba0c774f..e2154c1c3 100644
--- a/hw/xfree86/int10/INT10.HOWTO
+++ b/hw/xfree86/int10/INT10.HOWTO
@@ -341,4 +341,4 @@ XF86_AL,XF86_BL,XF86_CL,XF86_DL  to  access  the  lower  byte  of  the
 AX,BX,CX and DX register.
 
 
-$XFree86: xc/programs/Xserver/hw/xfree86/int10/INT10.HOWTO,v 1.3 2001/04/30 14:34:57 tsi Exp $
+$XFree86: xc/programs/Xserver/hw/xfree86/int10/INT10.HOWTO,v 1.2 2000/02/08 13:13:22 eich Exp $
diff --git a/hw/xfree86/int10/generic.c b/hw/xfree86/int10/generic.c
index 845c8a177..01bb4c30a 100644
--- a/hw/xfree86/int10/generic.c
+++ b/hw/xfree86/int10/generic.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/int10/generic.c,v 1.29 2003/09/24 02:43:33 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/int10/generic.c,v 1.28 2003/09/08 14:25:30 eich Exp $ */
 /*
  *                   XFree86 int10 module
  *   execute BIOS int 10h calls in x86 real mode environment
diff --git a/hw/xfree86/int10/helper_exec.c b/hw/xfree86/int10/helper_exec.c
index 181ebb157..76c2a1e3d 100644
--- a/hw/xfree86/int10/helper_exec.c
+++ b/hw/xfree86/int10/helper_exec.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/int10/helper_exec.c,v 1.27 2003/12/23 22:32:38 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/int10/helper_exec.c,v 1.26 2003/11/06 18:38:12 tsi Exp $ */
 /*
  *                   XFree86 int10 module
  *   execute BIOS int 10h calls in x86 real mode environment
diff --git a/hw/xfree86/int10/helper_mem.c b/hw/xfree86/int10/helper_mem.c
index 6de89c5d9..c0433773d 100644
--- a/hw/xfree86/int10/helper_mem.c
+++ b/hw/xfree86/int10/helper_mem.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/int10/helper_mem.c,v 1.26 2002/11/25 14:05:01 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/int10/helper_mem.c,v 1.25 2002/09/16 18:06:08 eich Exp $ */
 /*
  *                   XFree86 int10 module
  *   execute BIOS int 10h calls in x86 real mode environment
diff --git a/hw/xfree86/int10/pci.c b/hw/xfree86/int10/pci.c
index debd842e7..7c95171d4 100644
--- a/hw/xfree86/int10/pci.c
+++ b/hw/xfree86/int10/pci.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/int10/pci.c,v 1.12 2002/04/04 14:05:51 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/int10/pci.c,v 1.11 2001/10/01 13:44:13 eich Exp $ */
 
 /*
  *                   XFree86 int10 module
diff --git a/hw/xfree86/int10/stub.c b/hw/xfree86/int10/stub.c
index f6b38580c..c54de2461 100644
--- a/hw/xfree86/int10/stub.c
+++ b/hw/xfree86/int10/stub.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/int10/stub.c,v 1.4 2002/04/04 14:05:51 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/int10/stub.c,v 1.2 2000/02/12 03:39:57 dawes Exp $ */
 /*
  *                   XFree86 int10 module
  *   execute BIOS int 10h calls in x86 real mode environment
diff --git a/hw/xfree86/int10/xf86int10.c b/hw/xfree86/int10/xf86int10.c
index a74bbeacd..e88c6500d 100644
--- a/hw/xfree86/int10/xf86int10.c
+++ b/hw/xfree86/int10/xf86int10.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/int10/xf86int10.c,v 1.11 2003/03/21 22:26:11 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/int10/xf86int10.c,v 1.10tsi Exp $ */
 /*
  *                   XFree86 int10 module
  *   execute BIOS int 10h calls in x86 real mode environment
diff --git a/hw/xfree86/int10/xf86int10.h b/hw/xfree86/int10/xf86int10.h
index 843902c5e..c17e95d16 100644
--- a/hw/xfree86/int10/xf86int10.h
+++ b/hw/xfree86/int10/xf86int10.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/int10/xf86int10.h,v 1.24 2002/07/23 14:22:46 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/int10/xf86int10.h,v 1.23 2002/04/04 14:05:51 eich Exp $ */
 
 /*
  *                   XFree86 int10 module
diff --git a/hw/xfree86/int10/xf86int10module.c b/hw/xfree86/int10/xf86int10module.c
index 9e679ca6a..2bb49cb0c 100644
--- a/hw/xfree86/int10/xf86int10module.c
+++ b/hw/xfree86/int10/xf86int10module.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/int10/xf86int10module.c,v 1.2 2002/09/16 18:06:09 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/int10/xf86int10module.c,v 1.3 1999/12/03 19:17:41 eich Exp $ */
 /*
  *                   XFree86 int10 module
  *   execute BIOS int 10h calls in x86 real mode environment
@@ -31,7 +31,7 @@ static XF86ModuleVersionInfo NAME(VersRec) =
     MODULEVENDORSTRING,
     MODINFOSTRING1,
     MODINFOSTRING2,
-    XF86_VERSION_CURRENT,
+    XORG_VERSION_CURRENT,
     1, 0, 0,
     ABI_CLASS_VIDEODRV,		/* needs the video driver ABI */
     ABI_VIDEODRV_VERSION,
diff --git a/hw/xfree86/int10/xf86x86emu.c b/hw/xfree86/int10/xf86x86emu.c
index 6998a0880..ffee4fb9a 100644
--- a/hw/xfree86/int10/xf86x86emu.c
+++ b/hw/xfree86/int10/xf86x86emu.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/int10/xf86x86emu.c,v 1.13 2002/09/16 18:06:09 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/int10/xf86x86emu.c,v 1.11 2001/04/30 14:34:58 tsi Exp $ */
 /*
  *                   XFree86 int10 module
  *   execute BIOS int 10h calls in x86 real mode environment
diff --git a/hw/xfree86/int10/xf86x86emu.h b/hw/xfree86/int10/xf86x86emu.h
index 67c37d5f4..27ff6fc14 100644
--- a/hw/xfree86/int10/xf86x86emu.h
+++ b/hw/xfree86/int10/xf86x86emu.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/int10/xf86x86emu.h,v 1.2 2001/01/06 20:19:13 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/int10/xf86x86emu.h,v 1.1 2000/01/23 04:44:35 dawes Exp $ */
 /*
  *                   XFree86 int10 module
  *   execute BIOS int 10h calls in x86 real mode environment
diff --git a/hw/xfree86/loader/SparcMulDiv.S b/hw/xfree86/loader/SparcMulDiv.S
index e7281593c..11139d192 100644
--- a/hw/xfree86/loader/SparcMulDiv.S
+++ b/hw/xfree86/loader/SparcMulDiv.S
@@ -22,7 +22,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
  * IN THE SOFTWARE.
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/SparcMulDiv.S,v 1.1 2000/11/02 19:10:54 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/misc/SparcMulDiv.S,v 1.1 1999/07/10 07:24:51 dawes Exp $ */
 
 	.globl	urem_sparcv89, umul_sparcv89, udiv_sparcv89
 	.globl	rem_sparcv89, mul_sparcv89, div_sparcv89
diff --git a/hw/xfree86/loader/aout.h b/hw/xfree86/loader/aout.h
index cd7807531..0fe454e97 100644
--- a/hw/xfree86/loader/aout.h
+++ b/hw/xfree86/loader/aout.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/aout.h,v 1.8 2003/10/15 16:29:02 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/aout.h,v 1.7 2002/05/31 18:46:00 dawes Exp $ */
 
 /*
  * Borrowed from NetBSD's exec_aout.h
diff --git a/hw/xfree86/loader/aoutloader.c b/hw/xfree86/loader/aoutloader.c
index f77b3d73c..0a4877977 100644
--- a/hw/xfree86/loader/aoutloader.c
+++ b/hw/xfree86/loader/aoutloader.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/aoutloader.c,v 1.20 2003/10/15 17:46:00 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/aoutloader.c,v 1.19 2003/10/15 16:58:34 dawes Exp $ */
 
 /*
  *
diff --git a/hw/xfree86/loader/aoutloader.h b/hw/xfree86/loader/aoutloader.h
index b0e156319..7aeaf41fe 100644
--- a/hw/xfree86/loader/aoutloader.h
+++ b/hw/xfree86/loader/aoutloader.h
@@ -19,7 +19,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/aoutloader.h,v 1.4 2003/10/15 16:29:02 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/aoutloader.h,v 1.3 1998/09/20 14:41:03 dawes Exp $ */
 
 #ifndef _AOUTLOADER_H
 #define _AOUTLOADER_H
diff --git a/hw/xfree86/loader/ar.h b/hw/xfree86/loader/ar.h
index 956b810a0..3129d1c72 100644
--- a/hw/xfree86/loader/ar.h
+++ b/hw/xfree86/loader/ar.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/ar.h,v 1.4 2003/10/15 16:29:02 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/ar.h,v 1.3 1998/07/25 16:56:12 dawes Exp $ */
 
 #ifndef _AR_H
 #define _AR_H
diff --git a/hw/xfree86/loader/coff.h b/hw/xfree86/loader/coff.h
index 52553278e..54a8cb57f 100644
--- a/hw/xfree86/loader/coff.h
+++ b/hw/xfree86/loader/coff.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/coff.h,v 1.6 2003/10/15 16:29:02 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/coff.h,v 1.5 1998/07/25 16:56:12 dawes Exp $ */
 
 /* This file was implemented from the information in the book
    Understanding and Using COFF
diff --git a/hw/xfree86/loader/coffloader.c b/hw/xfree86/loader/coffloader.c
index 1ba45dd67..164c7d167 100644
--- a/hw/xfree86/loader/coffloader.c
+++ b/hw/xfree86/loader/coffloader.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/coffloader.c,v 1.22 2003/12/22 17:48:11 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/coffloader.c,v 1.21tsi Exp $ */
 
 /*
  *
diff --git a/hw/xfree86/loader/coffloader.h b/hw/xfree86/loader/coffloader.h
index 217474671..3d6728481 100644
--- a/hw/xfree86/loader/coffloader.h
+++ b/hw/xfree86/loader/coffloader.h
@@ -21,7 +21,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/coffloader.h,v 1.4 2003/10/15 16:29:02 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/coffloader.h,v 1.3 1998/09/20 14:41:04 dawes Exp $ */
 
 #ifndef _COFFLOADER_H
 #define _COFFLOADER_H
diff --git a/hw/xfree86/loader/dixsym.c b/hw/xfree86/loader/dixsym.c
index 7ad14f87d..e002fa544 100644
--- a/hw/xfree86/loader/dixsym.c
+++ b/hw/xfree86/loader/dixsym.c
@@ -1,4 +1,6 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/dixsym.c,v 1.63 2003/12/03 17:11:29 tsi Exp $ */
+/* $XdotOrg$ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/dixsym.c,v 1.63 2003/12/03
+ * 17:11:29 tsi Exp $ */
 
 /*
  * Copyright 1995-1998 by Metro Link, Inc.
@@ -343,6 +345,7 @@ LOOKUP dixLookupTab[] = {
     SYMFUNC(TimerFree)
     SYMFUNC(TimerSet)
     SYMFUNC(TimerCancel)
+    SYMFUNC(SetDPMSTimers)
     /* io.c */
     SYMFUNC(WriteToClient)
     SYMFUNC(SetCriticalOutputPending)
diff --git a/hw/xfree86/loader/dlloader.h b/hw/xfree86/loader/dlloader.h
index e9468e97b..51f0520e6 100644
--- a/hw/xfree86/loader/dlloader.h
+++ b/hw/xfree86/loader/dlloader.h
@@ -19,7 +19,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/dlloader.h,v 1.3 1998/09/20 14:41:04 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/dlloader.h,v 1.2 1998/07/25 16:56:14 dawes Exp $ */
 
 #ifndef _DLLOADER_H
 #define _DLLOADER_H
diff --git a/hw/xfree86/loader/elf.h b/hw/xfree86/loader/elf.h
index 91130e63d..a523eac84 100644
--- a/hw/xfree86/loader/elf.h
+++ b/hw/xfree86/loader/elf.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/elf.h,v 1.17 2003/10/15 16:29:02 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/elf.h,v 1.16 2003/06/12 14:12:34 eich Exp $ */
 
 typedef unsigned int Elf32_Addr;
 typedef unsigned short Elf32_Half;
diff --git a/hw/xfree86/loader/elfloader.c b/hw/xfree86/loader/elfloader.c
index 5ab8af62d..4d2a050f7 100644
--- a/hw/xfree86/loader/elfloader.c
+++ b/hw/xfree86/loader/elfloader.c
@@ -1,4 +1,5 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/elfloader.c,v 1.62 2003/11/06 18:38:13 tsi Exp $ */
+/* $XdotOrg$ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/elfloader.c,v 1.61tsi Exp $ */
 
 /*
  *
@@ -137,7 +138,7 @@
 # if !defined(linux)
 #  error    No MAP_ANON?
 # endif
-# if !defined (__AMD64__) || !defined(__linux__)
+# if !defined (__amd64__) || !defined(__linux__)
 # define MMAP_FLAGS     (MAP_PRIVATE | MAP_ANON)
 # else
 # define MMAP_FLAGS     (MAP_PRIVATE | MAP_ANON | MAP_32BIT)
@@ -155,7 +156,7 @@
 
 #if defined (__alpha__) || \
     defined (__ia64__) || \
-    defined (__AMD64__) || \
+    defined (__amd64__) || \
     (defined (__sparc__) && \
      (defined (__arch64__) || \
       defined (__sparcv9)))
@@ -247,7 +248,7 @@ typedef Elf32_Word Elf_Word;
     defined(__alpha__) || \
     defined(__sparc__) || \
     defined(__ia64__) || \
-    defined(__AMD64__)
+    defined(__amd64__)
 typedef Elf_Rela Elf_Rel_t;
 #else
 typedef Elf_Rel Elf_Rel_t;
@@ -441,7 +442,7 @@ ElfDelayRelocation(ELFModulePtr elffile, Elf_Word secn, Elf_Rel_t *rel)
     defined(__alpha__) || \
     defined(__sparc__) || \
     defined(__ia64__) || \
-    defined(__AMD64__)
+    defined(__amd64__)
     ELFDEBUG(", r_addend 0x%lx", rel->r_addend);
 # endif
     ELFDEBUG("\n");
@@ -476,7 +477,7 @@ ElfCOMMONSize(void)
 	size += common->sym->st_size;
 #if defined(__alpha__) || \
     defined(__ia64__) || \
-    defined(__AMD64__) || \
+    defined(__amd64__) || \
     (defined(__sparc__) && \
      (defined(__arch64__) || \
       defined(__sparcv9)))
@@ -500,7 +501,7 @@ ElfCreateCOMMON(ELFModulePtr elffile, LOOKUP *pLookup)
 	size += common->sym->st_size;
 #if defined(__alpha__) || \
     defined(__ia64__) || \
-    defined(__AMD64__) || \
+    defined(__amd64__) || \
     (defined(__sparc__) && \
      (defined(__arch64__) || \
       defined(__sparcv9)))
@@ -555,7 +556,7 @@ ElfCreateCOMMON(ELFModulePtr elffile, LOOKUP *pLookup)
 	offset += common->sym->st_size;
 #if defined(__alpha__) || \
     defined(__ia64__) || \
-    defined(__AMD64__) || \
+    defined(__amd64__) || \
     (defined(__sparc__) && \
      (defined(__arch64__) || \
       defined(__sparcv9)))
@@ -921,7 +922,7 @@ ELFCreateGOT(ELFModulePtr elffile, int maxalign)
 	    ErrorF("ELFCreateGOT() Unable to reallocate memory!!!!\n");
 	    return FALSE;
 	}
-#   if defined(linux) && defined(__ia64__) || defined(__OpenBSD__)
+#   if defined(linux) || defined(__OpenBSD__)
 	{
 	    unsigned long page_size = getpagesize();
 	    unsigned long round;
@@ -1096,6 +1097,18 @@ ELFCreatePLT(ELFModulePtr elffile)
 	ErrorF("ELFCreatePLT() Unable to allocate memory!!!!\n");
 	return;
     }
+#   if defined(linux) || defined(__OpenBSD__)
+    {
+	unsigned long page_size = getpagesize();
+	unsigned long round;
+
+	round = (unsigned long)elffile->plt & (page_size - 1);
+	mprotect(elffile->plt - round,
+		 (elffile->pltsize + round + page_size - 1) & ~(page_size - 1),
+		 PROT_READ | PROT_WRITE | PROT_EXEC);
+    }
+#   endif
+									      
     elffile->sections[elffile->pltndx].sh_size = elffile->pltsize;
 # ifdef ELFDEBUG
     ELFDEBUG("ELFCreatePLT: PLT address %lx\n", elffile->plt);
@@ -1216,7 +1229,7 @@ Elf_RelocateEntry(ELFModulePtr elffile, Elf_Word secn, Elf_Rel_t *rel,
     unsigned long *dest64;
     unsigned short *dest16;
 #endif
-#if  defined(__AMD64__)
+#if  defined(__amd64__)
     unsigned long *dest64;
     int *dest32s;
 #endif
@@ -1234,7 +1247,7 @@ Elf_RelocateEntry(ELFModulePtr elffile, Elf_Word secn, Elf_Rel_t *rel,
     defined(__alpha__) || \
     defined(__sparc__) || \
     defined(__ia64__) || \
-    defined(__AMD64__)
+    defined(__amd64__)
     ELFDEBUG("%lx", rel->r_addend);
 # endif
     ELFDEBUG("\n");
@@ -1293,7 +1306,7 @@ Elf_RelocateEntry(ELFModulePtr elffile, Elf_Word secn, Elf_Rel_t *rel,
 
 	break;
 #endif /* i386 */
-#if defined(__AMD64__)
+#if defined(__amd64__)
     case R_X86_64_32:
 	dest32 = (unsigned int *)(secp + rel->r_offset);
 # ifdef ELFDEBUG
@@ -1350,7 +1363,7 @@ Elf_RelocateEntry(ELFModulePtr elffile, Elf_Word secn, Elf_Rel_t *rel,
 	ELFDEBUG("*dest64=%8.8lx\n", *dest64);
 # endif
 	break;
-#endif /* __AMD64__ */
+#endif /* __amd64__ */
 #if defined(__alpha__)
     case R_ALPHA_NONE:
     case R_ALPHA_LITUSE:
@@ -2696,6 +2709,8 @@ ELFCollectSections(ELFModulePtr elffile, int pass, int *totalsize,
 		continue;
 	    if (!strcmp(name, ".stabstr"))	/* ignore debug info */
 		continue;
+	    if (!strcmp(name, ".stab.indexstr")) /* ignore more debug info */
+		continue;
 	case SHT_SYMTAB:
 	    if (pass)
 		continue;
@@ -2760,10 +2775,16 @@ ELFCollectSections(ELFModulePtr elffile, int pass, int *totalsize,
 	elffile->lsection[j].size = SecSize(i);
 	elffile->lsection[j].flags = flags;
 	switch (SecType(i)) {
-#ifdef __OpenBSD__
+#if defined(linux) || defined(__OpenBSD__)
 	case SHT_PROGBITS:
-	    mprotect(elffile->lsection[j].saddr, SecSize(i),
-		     PROT_READ | PROT_WRITE | PROT_EXEC);
+	    {
+		unsigned long page_size = getpagesize();
+		unsigned long round;
+
+		round = (unsigned long)elffile->lsection[j].saddr & (page_size -1);
+		mprotect( (char *)elffile->lsection[j].saddr - round,
+			 SecSize(i) + round, PROT_READ | PROT_WRITE | PROT_EXEC);
+	    }
 	    break;
 #endif
 	case SHT_SYMTAB:
@@ -2958,7 +2979,7 @@ ELFLoadModule(loaderPtr modrec, int elffd, LOOKUP **ppLookup)
 	ErrorF("Unable to allocate ELF sections\n");
 	return NULL;
     }
-#  if defined(linux) && defined(__ia64__) || defined(__OpenBSD__)
+#  if defined(linux) || defined(__OpenBSD__)
     {
 	unsigned long page_size = getpagesize();
 	unsigned long round;
diff --git a/hw/xfree86/loader/elfloader.h b/hw/xfree86/loader/elfloader.h
index e4693411b..0a42d7060 100644
--- a/hw/xfree86/loader/elfloader.h
+++ b/hw/xfree86/loader/elfloader.h
@@ -21,7 +21,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/elfloader.h,v 1.4 2003/10/15 16:29:03 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/elfloader.h,v 1.3 1998/09/20 14:41:05 dawes Exp $ */
 
 #ifndef _ELFLOADER_H
 #define _ELFLOADER_H
diff --git a/hw/xfree86/loader/extsym.c b/hw/xfree86/loader/extsym.c
index 8da5089bc..5a5b2d291 100644
--- a/hw/xfree86/loader/extsym.c
+++ b/hw/xfree86/loader/extsym.c
@@ -1,3 +1,4 @@
+/* $XdotOrg$ */
 /* $XFree86: xc/programs/Xserver/hw/xfree86/loader/extsym.c,v 1.9 2003/10/15 16:29:03 dawes Exp $ */
 
 /*
diff --git a/hw/xfree86/loader/hash.c b/hw/xfree86/loader/hash.c
index 03f415c22..6626dae6a 100644
--- a/hw/xfree86/loader/hash.c
+++ b/hw/xfree86/loader/hash.c
@@ -1,4 +1,5 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/hash.c,v 1.25 2003/11/23 00:57:56 dawes Exp $ */
+/* $XdotOrg: xc/programs/Xserver/hw/xfree86/loader/hash.c,v 1.25 2003/11/23 00:57:56 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/hash.c,v 1.24 2003/11/17 22:20:40 dawes Exp $ */
 
 /*
  *
diff --git a/hw/xfree86/loader/hash.h b/hw/xfree86/loader/hash.h
index 96cd41c02..88b525669 100644
--- a/hw/xfree86/loader/hash.h
+++ b/hw/xfree86/loader/hash.h
@@ -21,7 +21,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/hash.h,v 1.3 1998/07/25 16:56:16 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/hash.h,v 1.2.2.2 1998/07/04 13:32:45 dawes Exp $ */
 
 #ifndef _HASH_H
 #define _HASH_H
diff --git a/hw/xfree86/loader/loader.c b/hw/xfree86/loader/loader.c
index 39ba510a1..efa60f20a 100644
--- a/hw/xfree86/loader/loader.c
+++ b/hw/xfree86/loader/loader.c
@@ -61,7 +61,7 @@
 #include <string.h>
 #if defined(linux) && \
     (defined(__alpha__) || defined(__powerpc__) || defined(__ia64__) \
-    || defined(__AMD64__))
+    || defined(__amd64__))
 #include <malloc.h>
 #endif
 #include <stdarg.h>
@@ -368,7 +368,7 @@ LoaderInit(void)
 
 #if defined(linux) && \
     (defined(__alpha__) || defined(__powerpc__) || defined(__ia64__) \
-     || ( defined __AMD64__ && ! defined UseMMAP && ! defined DoMMAPedMerge))
+     || ( defined __amd64__ && ! defined UseMMAP && ! defined DoMMAPedMerge))
     /*
      * The glibc malloc uses mmap for large allocations anyway. This breaks
      * some relocation types because the offset overflow. See loader.h for more
@@ -487,7 +487,7 @@ _LoaderFileToMem(int fd, unsigned long offset, int size, char *label)
     if ((new_off_bias + size) > new_size)
 	new_size += pagesize;
     ret = (unsigned long)mmap(0, new_size, MMAP_PROT, MAP_PRIVATE
-#  ifdef __AMD64__
+#  ifdef __amd64__
 			      | MAP_32BIT
 #  endif
 			      , fd, new_off);
@@ -496,7 +496,7 @@ _LoaderFileToMem(int fd, unsigned long offset, int size, char *label)
     return (void *)(ret + new_off_bias);
 # else
     ret = (unsigned long)mmap(0, size, MMAP_PROT, MAP_PRIVATE
-#  ifdef __AMD64__
+#  ifdef __amd64__
 			      | MAP_32BIT
 #  endif
 			      , fd, offset + offsetbias);
diff --git a/hw/xfree86/loader/loadmod.c b/hw/xfree86/loader/loadmod.c
index 733f6feb1..4bf36a38a 100644
--- a/hw/xfree86/loader/loadmod.c
+++ b/hw/xfree86/loader/loadmod.c
@@ -86,7 +86,7 @@ static char *LoaderGetCanonicalName(const char *, PatternPtr);
 static void RemoveChild(ModuleDescPtr);
 
 ModuleVersions LoaderVersionInfo = {
-    XF86_VERSION_CURRENT,
+    XORG_VERSION_CURRENT,
     ABI_ANSIC_VERSION,
     ABI_VIDEODRV_VERSION,
     ABI_XINPUT_VERSION,
diff --git a/hw/xfree86/loader/misym.c b/hw/xfree86/loader/misym.c
index c2bf47587..8f77f74bb 100644
--- a/hw/xfree86/loader/misym.c
+++ b/hw/xfree86/loader/misym.c
@@ -1,3 +1,4 @@
+/* $XdotOrg$ */
 /* $XFree86: xc/programs/Xserver/hw/xfree86/loader/misym.c,v 1.38 2003/10/15 16:29:04 dawes Exp $ */
 
 /*
diff --git a/hw/xfree86/loader/sym.h b/hw/xfree86/loader/sym.h
index e937b9f08..0e18959c3 100644
--- a/hw/xfree86/loader/sym.h
+++ b/hw/xfree86/loader/sym.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/sym.h,v 1.7 2003/10/15 16:29:04 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/sym.h,v 1.6 2000/10/24 00:06:55 anderson Exp $ */
 
 /*
  *
diff --git a/hw/xfree86/os-support/README.OS-lib b/hw/xfree86/os-support/README.OS-lib
index 27af6b3f2..43312e4e8 100644
--- a/hw/xfree86/os-support/README.OS-lib
+++ b/hw/xfree86/os-support/README.OS-lib
@@ -497,7 +497,7 @@ xf86cos(double x)
 
 
 
-$XFree86: xc/programs/Xserver/hw/xfree86/os-support/README.OS-lib,v 3.10 2001/12/17 20:00:45 dawes Exp $
+$XFree86: xc/programs/Xserver/hw/xfree86/os-support/README.OS-lib,v 3.9 2001/07/23 13:15:48 dawes Exp $
 
 
 
diff --git a/hw/xfree86/os-support/bsd/alpha_video.c b/hw/xfree86/os-support/bsd/alpha_video.c
index 5a7b52117..bab184e7c 100644
--- a/hw/xfree86/os-support/bsd/alpha_video.c
+++ b/hw/xfree86/os-support/bsd/alpha_video.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/alpha_video.c,v 1.7 2004/02/17 21:33:08 herrb Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/alpha_video.c,v 1.6 2003/12/30 15:18:30 herrb Exp $ */
 /*
  * Copyright 1992 by Rich Murphey <Rich@Rice.edu>
  * Copyright 1993 by David Wexelblat <dwex@goblin.org>
diff --git a/hw/xfree86/os-support/bsd/arm_video.c b/hw/xfree86/os-support/bsd/arm_video.c
index 36943add1..cfea02602 100644
--- a/hw/xfree86/os-support/bsd/arm_video.c
+++ b/hw/xfree86/os-support/bsd/arm_video.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/arm_video.c,v 1.2 2003/03/14 13:46:03 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/arm_video.c,v 1.1tsi Exp $ */
 /*
  * Copyright 1992 by Rich Murphey <Rich@Rice.edu>
  * Copyright 1993 by David Wexelblat <dwex@goblin.org>
diff --git a/hw/xfree86/os-support/bsd/bsdResource.c b/hw/xfree86/os-support/bsd/bsdResource.c
index 6c675b5da..9702ff0c7 100644
--- a/hw/xfree86/os-support/bsd/bsdResource.c
+++ b/hw/xfree86/os-support/bsd/bsdResource.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsdResource.c,v 1.9 2003/10/02 13:30:06 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsdResource.c,v 1.6 2001/02/16 14:45:10 tsi Exp $ */
 
 /* Resource information code */
 
diff --git a/hw/xfree86/os-support/bsd/bsd_KbdMap.c b/hw/xfree86/os-support/bsd/bsd_KbdMap.c
index a47dc2384..c0a8f8890 100644
--- a/hw/xfree86/os-support/bsd/bsd_KbdMap.c
+++ b/hw/xfree86/os-support/bsd/bsd_KbdMap.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_KbdMap.c,v 1.1 2002/10/11 01:40:34 dawes Exp $ */
+/* $XFree86$ */
 
 /*
  * Slightly modified xf86KbdBSD.c which is
diff --git a/hw/xfree86/os-support/bsd/bsd_VTsw.c b/hw/xfree86/os-support/bsd/bsd_VTsw.c
index adb101dc5..ea3271629 100644
--- a/hw/xfree86/os-support/bsd/bsd_VTsw.c
+++ b/hw/xfree86/os-support/bsd/bsd_VTsw.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_VTsw.c,v 3.6 1998/07/25 16:56:33 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_VTsw.c,v 3.5.4.3 1998/06/05 16:23:03 dawes Exp $ */
 /*
  * Derived from VTsw_usl.c which is
  * Copyright 1993 by David Wexelblat <dwex@goblin.org>
diff --git a/hw/xfree86/os-support/bsd/bsd_apm.c b/hw/xfree86/os-support/bsd/bsd_apm.c
index 250e5cb55..6ed48d89b 100644
--- a/hw/xfree86/os-support/bsd/bsd_apm.c
+++ b/hw/xfree86/os-support/bsd/bsd_apm.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_apm.c,v 1.1 2000/02/29 03:09:25 dawes Exp $ */
+/* $XFree86$ */
 
 #include "X.h"
 #include "os.h"
diff --git a/hw/xfree86/os-support/bsd/bsd_axp.c b/hw/xfree86/os-support/bsd/bsd_axp.c
index 91367078e..0f392a8a0 100644
--- a/hw/xfree86/os-support/bsd/bsd_axp.c
+++ b/hw/xfree86/os-support/bsd/bsd_axp.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_axp.c,v 1.3 2003/10/07 22:33:37 herrb Exp $ */
+/* $XFree86: bsd_axp.c,v 1.2 2002/10/29 23:19:13 herrb Exp $ */
 
 #include "X.h"
 #include "os.h"
diff --git a/hw/xfree86/os-support/bsd/bsd_ev56.c b/hw/xfree86/os-support/bsd/bsd_ev56.c
index ec95306e8..2952e9401 100644
--- a/hw/xfree86/os-support/bsd/bsd_ev56.c
+++ b/hw/xfree86/os-support/bsd/bsd_ev56.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_ev56.c,v 1.2 2001/02/27 23:05:00 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_ev56.c,v 1.1 2000/03/05 16:59:17 dawes Exp $ */
 
 #include "X.h"
 #include "input.h"
diff --git a/hw/xfree86/os-support/bsd/bsd_init.c b/hw/xfree86/os-support/bsd/bsd_init.c
index e4927d91a..c76c9f748 100644
--- a/hw/xfree86/os-support/bsd/bsd_init.c
+++ b/hw/xfree86/os-support/bsd/bsd_init.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_init.c,v 3.22 2003/10/07 23:14:55 herrb Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_init.c,v 3.21 2003/09/24 02:43:34 dawes Exp $ */
 /*
  * Copyright 1992 by Rich Murphey <Rich@Rice.edu>
  * Copyright 1993 by David Wexelblat <dwex@goblin.org>
diff --git a/hw/xfree86/os-support/bsd/bsd_io.c b/hw/xfree86/os-support/bsd/bsd_io.c
index 0f40ba707..d4689ce21 100644
--- a/hw/xfree86/os-support/bsd/bsd_io.c
+++ b/hw/xfree86/os-support/bsd/bsd_io.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_io.c,v 3.23 2002/10/21 20:38:04 herrb Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_io.c,v 3.22 2002/05/18 21:15:16 herrb Exp $ */
 /*
  * Copyright 1992 by Rich Murphey <Rich@Rice.edu>
  * Copyright 1993 by David Dawes <dawes@xfree86.org>
diff --git a/hw/xfree86/os-support/bsd/bsd_jstk.c b/hw/xfree86/os-support/bsd/bsd_jstk.c
index 7f24124dc..93626b6f8 100644
--- a/hw/xfree86/os-support/bsd/bsd_jstk.c
+++ b/hw/xfree86/os-support/bsd/bsd_jstk.c
@@ -23,7 +23,7 @@
 
 /* Modified for FreeBSD by David Dawes <dawes@XFree86.org> */
 
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_jstk.c,v 3.8 2002/08/06 13:20:47 herrb Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_jstk.c,v 3.7 1998/07/25 16:56:34 dawes Exp $ */
 
 #include <sys/types.h>
 #include <unistd.h>
diff --git a/hw/xfree86/os-support/bsd/bsd_kbd.c b/hw/xfree86/os-support/bsd/bsd_kbd.c
index 3c22eeb4d..871bd2411 100644
--- a/hw/xfree86/os-support/bsd/bsd_kbd.c
+++ b/hw/xfree86/os-support/bsd/bsd_kbd.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_kbd.c,v 1.9 2004/01/07 17:05:28 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_kbd.c,v 1.8 2003/11/04 03:16:58 tsi Exp $ */
 
 /*
  * Copyright (c) 2002 by The XFree86 Project, Inc.
diff --git a/hw/xfree86/os-support/bsd/bsd_kbd.h b/hw/xfree86/os-support/bsd/bsd_kbd.h
index c042d88bf..7b9cd434e 100644
--- a/hw/xfree86/os-support/bsd/bsd_kbd.h
+++ b/hw/xfree86/os-support/bsd/bsd_kbd.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_kbd.h,v 1.1 2002/10/11 01:40:34 dawes Exp $ */
+/* $XFree86$ */
 
 extern void KbdGetMapping(InputInfoPtr pInfo, KeySymsPtr pKeySyms,
 				CARD8 *pModMap);
diff --git a/hw/xfree86/os-support/bsd/bsd_kmod.c b/hw/xfree86/os-support/bsd/bsd_kmod.c
index 74345654b..37139e8dd 100644
--- a/hw/xfree86/os-support/bsd/bsd_kmod.c
+++ b/hw/xfree86/os-support/bsd/bsd_kmod.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_kmod.c,v 3.2 2002/11/29 17:47:24 tsi Exp $ */
+/* $XFree86$ */
 
 #include <errno.h>
 #include <fcntl.h>
diff --git a/hw/xfree86/os-support/bsd/i386_video.c b/hw/xfree86/os-support/bsd/i386_video.c
index 75c8f8200..3c55ee72f 100644
--- a/hw/xfree86/os-support/bsd/i386_video.c
+++ b/hw/xfree86/os-support/bsd/i386_video.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/i386_video.c,v 1.5 2003/10/07 23:14:55 herrb Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/i386_video.c,v 1.4 2003/09/24 02:43:34 dawes Exp $ */
 /*
  * Copyright 1992 by Rich Murphey <Rich@Rice.edu>
  * Copyright 1993 by David Wexelblat <dwex@goblin.org>
diff --git a/hw/xfree86/os-support/bsd/libusb/data.c b/hw/xfree86/os-support/bsd/libusb/data.c
index bb84e5566..3d88b075f 100644
--- a/hw/xfree86/os-support/bsd/libusb/data.c
+++ b/hw/xfree86/os-support/bsd/libusb/data.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/libusb/data.c,v 1.1 2000/02/11 18:06:49 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/libusb/data.c,v 1.1.2.2 1999/12/03 10:12:41 hohndel Exp $ */
 
 #include <assert.h>
 #include <stdlib.h>
diff --git a/hw/xfree86/os-support/bsd/libusb/descr.c b/hw/xfree86/os-support/bsd/libusb/descr.c
index f75418964..a3bc237dc 100644
--- a/hw/xfree86/os-support/bsd/libusb/descr.c
+++ b/hw/xfree86/os-support/bsd/libusb/descr.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/libusb/descr.c,v 1.1 2000/02/11 18:06:50 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/libusb/descr.c,v 1.1.2.2 1999/12/03 10:12:42 hohndel Exp $ */
 
 #include <sys/types.h>
 
diff --git a/hw/xfree86/os-support/bsd/libusb/parse.c b/hw/xfree86/os-support/bsd/libusb/parse.c
index 8c1a8b8a2..8e1c802c9 100644
--- a/hw/xfree86/os-support/bsd/libusb/parse.c
+++ b/hw/xfree86/os-support/bsd/libusb/parse.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/libusb/parse.c,v 1.1 2000/02/11 18:06:50 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/libusb/parse.c,v 1.1.2.2 1999/12/03 10:12:42 hohndel Exp $ */
 
 #include <assert.h>
 #include <stdlib.h>
diff --git a/hw/xfree86/os-support/bsd/libusb/usage.c b/hw/xfree86/os-support/bsd/libusb/usage.c
index 9338e61d4..eb51a2fcc 100644
--- a/hw/xfree86/os-support/bsd/libusb/usage.c
+++ b/hw/xfree86/os-support/bsd/libusb/usage.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/libusb/usage.c,v 1.1 2000/02/11 18:06:50 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/libusb/usage.c,v 1.1.2.2 1999/12/03 10:12:42 hohndel Exp $ */
 
 #include <ctype.h>
 #include <err.h>
diff --git a/hw/xfree86/os-support/bsd/libusb/usb.3 b/hw/xfree86/os-support/bsd/libusb/usb.3
index f88a28cd6..db0b1b08f 100644
--- a/hw/xfree86/os-support/bsd/libusb/usb.3
+++ b/hw/xfree86/os-support/bsd/libusb/usb.3
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/libusb/usb.3,v 1.1 2000/02/11 18:06:50 dawes Exp $ 
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/os-support/libusb/usb.3,v 1.1.2.2 1999/12/03 10:12:42 hohndel Exp $ 
 .\"
 .Dd May 11, 1999
 .Dt USB 3
diff --git a/hw/xfree86/os-support/bsd/libusb/usb.h b/hw/xfree86/os-support/bsd/libusb/usb.h
index 69ef79a62..445428118 100644
--- a/hw/xfree86/os-support/bsd/libusb/usb.h
+++ b/hw/xfree86/os-support/bsd/libusb/usb.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/libusb/usb.h,v 1.1 2000/02/11 18:06:51 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/libusb/usb.h,v 1.1.2.2 1999/12/03 10:12:43 hohndel Exp $ */
 
 #define _DIAGASSERT(e) assert(e)
 
diff --git a/hw/xfree86/os-support/bsd/libusb/usb_hid_usages b/hw/xfree86/os-support/bsd/libusb/usb_hid_usages
index 711ba206a..48c7b1351 100644
--- a/hw/xfree86/os-support/bsd/libusb/usb_hid_usages
+++ b/hw/xfree86/os-support/bsd/libusb/usb_hid_usages
@@ -9,7 +9,7 @@
 #    If the number is * then the line matches all usages and the name
 #    is a printf formatting string that will be given the usage number.
 #
-# $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/libusb/usb_hid_usages,v 1.1 2000/02/11 18:06:51 dawes Exp $ 
+# $XFree86: xc/programs/Xserver/hw/xfree86/os-support/libusb/usb_hid_usages,v 1.1.2.2 1999/12/03 10:12:43 hohndel Exp $ 
 #
 1	Generic Desktop
 	0x00	Undefined
diff --git a/hw/xfree86/os-support/bsd/libusb/usbvar.h b/hw/xfree86/os-support/bsd/libusb/usbvar.h
index cb0bf33ec..60883dd47 100644
--- a/hw/xfree86/os-support/bsd/libusb/usbvar.h
+++ b/hw/xfree86/os-support/bsd/libusb/usbvar.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/libusb/usbvar.h,v 1.1 2000/02/11 18:06:51 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/libusb/usbvar.h,v 1.1.2.2 1999/12/03 10:12:43 hohndel Exp $ */
 
 struct report_desc {
 	unsigned int size;
diff --git a/hw/xfree86/os-support/bsd/memrange.h b/hw/xfree86/os-support/bsd/memrange.h
index 99be9ea2f..f1d22f4fa 100644
--- a/hw/xfree86/os-support/bsd/memrange.h
+++ b/hw/xfree86/os-support/bsd/memrange.h
@@ -3,7 +3,7 @@
  *
  * $FreeBSD: src/sys/sys/memrange.h,v 1.4 1999/12/29 04:24:44 peter Exp $
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/memrange.h,v 1.1 2002/08/06 13:25:36 herrb Exp $ */
+/* $XFree86$ */
 
 #ifndef _MEMRANGE_H
 #define _MEMRANGE_H
diff --git a/hw/xfree86/os-support/bsd/ppc_video.c b/hw/xfree86/os-support/bsd/ppc_video.c
index 3e4ff9ee7..af2867f90 100644
--- a/hw/xfree86/os-support/bsd/ppc_video.c
+++ b/hw/xfree86/os-support/bsd/ppc_video.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/ppc_video.c,v 1.6 2003/10/07 23:14:55 herrb Exp $ */
+/* $XFree86: ppc_video.c,v 1.5 2003/03/14 13:46:04 tsi Exp $ */
 /*
  * Copyright 1992 by Rich Murphey <Rich@Rice.edu>
  * Copyright 1993 by David Wexelblat <dwex@goblin.org>
diff --git a/hw/xfree86/os-support/bsd/sparc64_video.c b/hw/xfree86/os-support/bsd/sparc64_video.c
index fe301acf5..760bf78b3 100644
--- a/hw/xfree86/os-support/bsd/sparc64_video.c
+++ b/hw/xfree86/os-support/bsd/sparc64_video.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/sparc64_video.c,v 1.3 2003/10/07 23:14:55 herrb Exp $ */
+/* $XFree86: sparc64_video.c,v 1.2 2003/03/14 13:46:04 tsi Exp $ */
 /*
  * Copyright 1992 by Rich Murphey <Rich@Rice.edu>
  * Copyright 1993 by David Wexelblat <dwex@goblin.org>
diff --git a/hw/xfree86/os-support/bus/Pci.c b/hw/xfree86/os-support/bus/Pci.c
index ab10485ee..6b36fdaf2 100644
--- a/hw/xfree86/os-support/bus/Pci.c
+++ b/hw/xfree86/os-support/bus/Pci.c
@@ -453,9 +453,9 @@ pciHostAddrToBusAddr(PCITAG tag, PciAddrType type, ADDRESS addr)
  * to the base address register to get an accurate result.  Otherwise it
  * makes a conservative guess based on the alignment of the already allocated
  * address.  If the result is accurate (ie, not an over-estimate), this is
- * indicated by setting *min to TRUE (when min is non-NULL).  This currently
- * only happens when the destructive flag is set, but in future it may be
- * possible to get the information from the OS when supported.
+ * indicated by setting *min to TRUE (when min is non-NULL).  This happens
+ * when either the destructive flag is set, the information is supplied by
+ * the OS if the OS supports this.
  */
 
 int
@@ -575,7 +575,7 @@ Bool
 pciMfDev(int busnum, int devnum)
 {
     PCITAG tag0, tag1;
-    unsigned long id0, id1, val;
+    CARD32 id0, id1, val;
 
     /* Detect a multi-function device that complies to the PCI 2.0 spec */
 
diff --git a/hw/xfree86/os-support/bus/Pci.h b/hw/xfree86/os-support/bus/Pci.h
index 1c819a8c8..36b4a477e 100644
--- a/hw/xfree86/os-support/bus/Pci.h
+++ b/hw/xfree86/os-support/bus/Pci.h
@@ -312,7 +312,7 @@
 #  define INCLUDE_XF86_MAP_PCI_MEM
 #  define INCLUDE_XF86_NO_DOMAIN
 # endif
-#elif defined(__sparc__)
+#elif defined(__sparc__) || defined(sparc)
 # if defined(linux)
 #  define ARCH_PCI_INIT linuxPciInit
 #  define INCLUDE_XF86_MAP_PCI_MEM
@@ -327,7 +327,7 @@
 # if !defined(__FreeBSD__)
 #  define ARCH_PCI_PCI_BRIDGE sparcPciPciBridge
 # endif
-#elif defined(__AMD64__)
+#elif defined(__amd64__)
 # if defined(__FreeBSD__)
 #  define ARCH_PCI_INIT freebsdPciInit
 # else
diff --git a/hw/xfree86/os-support/bus/Sbus.c b/hw/xfree86/os-support/bus/Sbus.c
index 57262efa2..f81112474 100644
--- a/hw/xfree86/os-support/bus/Sbus.c
+++ b/hw/xfree86/os-support/bus/Sbus.c
@@ -20,7 +20,7 @@
  * 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.
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/Sbus.c,v 1.4 2003/10/02 13:30:06 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/Sbus.c,v 1.2tsi Exp $ */
 
 #include <fcntl.h>
 #include <stdio.h>
diff --git a/hw/xfree86/os-support/bus/axpPci.c b/hw/xfree86/os-support/bus/axpPci.c
index 04ff8b956..d218a0d2f 100644
--- a/hw/xfree86/os-support/bus/axpPci.c
+++ b/hw/xfree86/os-support/bus/axpPci.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/axpPci.c,v 1.15 2002/12/12 04:12:02 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/axpPci.c,v 1.14 2002/12/11 02:44:28 dawes Exp $ */
 /*
  * Copyright 1998 by Concurrent Computer Corporation
  *
diff --git a/hw/xfree86/os-support/bus/freebsdPci.c b/hw/xfree86/os-support/bus/freebsdPci.c
index 06baa69ea..3b2bf5a9b 100644
--- a/hw/xfree86/os-support/bus/freebsdPci.c
+++ b/hw/xfree86/os-support/bus/freebsdPci.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/freebsdPci.c,v 1.6 2003/10/02 13:30:07 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/freebsdPci.c,v 1.4 2002/07/24 19:06:52 tsi Exp $ */
 /*
  * Copyright 1998 by Concurrent Computer Corporation
  *
diff --git a/hw/xfree86/os-support/bus/linuxPci.c b/hw/xfree86/os-support/bus/linuxPci.c
index 76194802f..4846ee0ed 100644
--- a/hw/xfree86/os-support/bus/linuxPci.c
+++ b/hw/xfree86/os-support/bus/linuxPci.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/linuxPci.c,v 1.10 2002/11/17 18:42:01 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/linuxPci.c,v 1.9 2002/09/24 16:14:16 tsi Exp $ */
 /*
  * Copyright 1998 by Concurrent Computer Corporation
  *
diff --git a/hw/xfree86/os-support/bus/ppcPci.c b/hw/xfree86/os-support/bus/ppcPci.c
index 2aa98355b..7b00acb6b 100644
--- a/hw/xfree86/os-support/bus/ppcPci.c
+++ b/hw/xfree86/os-support/bus/ppcPci.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/ppcPci.c,v 1.9 2002/08/27 22:07:07 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/ppcPci.c,v 1.8 2002/07/24 19:06:52 tsi Exp $ */
 /*
  * ppcPci.c - PowerPC PCI access functions
  *
diff --git a/hw/xfree86/os-support/bus/xf86Sbus.h b/hw/xfree86/os-support/bus/xf86Sbus.h
index 28ab90491..dbd17810f 100644
--- a/hw/xfree86/os-support/bus/xf86Sbus.h
+++ b/hw/xfree86/os-support/bus/xf86Sbus.h
@@ -20,7 +20,7 @@
  * 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.
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/xf86Sbus.h,v 1.7 2004/03/08 15:37:12 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/xf86Sbus.h,v 1.3 2001/04/20 17:02:43 tsi Exp $ */
 
 #ifndef _XF86_SBUS_H
 #define _XF86_SBUS_H
@@ -47,22 +47,19 @@
 #endif
 
 #ifndef FBTYPE_SUNGP3
-#define FBTYPE_SUNGP3 17
+#define FBTYPE_SUNGP3 -1
 #endif
-#ifndef FBTYPE_SUNGT
-#define FBTYPE_SUNGT 18
+#ifndef FBTYPE_MDICOLOR
+#define FBTYPE_MDICOLOR -1
 #endif
 #ifndef FBTYPE_SUNLEO
-#define FBTYPE_SUNLEO 19
-#endif
-#ifndef FBTYPE_MDICOLOR
-#define FBTYPE_MDICOLOR 20
+#define FBTYPE_SUNLEO -1
 #endif
 #ifndef FBTYPE_TCXCOLOR
-#define FBTYPE_TCXCOLOR 21
+#define FBTYPE_TCXCOLOR -1
 #endif
 #ifndef FBTYPE_CREATOR
-#define FBTYPE_CREATOR 22
+#define FBTYPE_CREATOR -1
 #endif
 
 #endif /* _XF86_SBUS_H */
diff --git a/hw/xfree86/os-support/drm/drmmodule.c b/hw/xfree86/os-support/drm/drmmodule.c
index 8be822445..2fb082c36 100644
--- a/hw/xfree86/os-support/drm/drmmodule.c
+++ b/hw/xfree86/os-support/drm/drmmodule.c
@@ -25,7 +25,7 @@
  * 
  * Authors: Rickard E. (Rik) Faith <faith@valinux.com>
  *
- * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/drmmodule.c,v 1.3 2000/06/17 00:03:34 martin Exp $
+ * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/drmmodule.c,v 1.2 2000/02/23 04:47:22 martin Exp $
  * 
  */
 
@@ -39,7 +39,7 @@ static XF86ModuleVersionInfo VersRec =
         MODULEVENDORSTRING,
         MODINFOSTRING1,
         MODINFOSTRING2,
-        XF86_VERSION_CURRENT,
+        XORG_VERSION_CURRENT,
         1, 0, 0,
         ABI_CLASS_EXTENSION,
         ABI_EXTENSION_VERSION,
diff --git a/hw/xfree86/os-support/linux/int10/linux.c b/hw/xfree86/os-support/linux/int10/linux.c
index f2a5d2053..984c79122 100644
--- a/hw/xfree86/os-support/linux/int10/linux.c
+++ b/hw/xfree86/os-support/linux/int10/linux.c
@@ -1,7 +1,7 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/int10/linux.c,v 1.33 2004/02/25 12:53:15 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/int10/linux.c,v 1.32 2004/02/05 18:24:59 eich Exp $ */
 /*
  * linux specific part of the int10 module
- * Copyright 1999 Egbert Eich
+ * Copyright 1999, 2000, 2001, 2002, 2003, 2004 Egbert Eich
  */
 #include "xf86.h"
 #include "xf86_OSproc.h"
diff --git a/hw/xfree86/os-support/linux/int10/vm86/linux_vm86.c b/hw/xfree86/os-support/linux/int10/vm86/linux_vm86.c
index dc737ac47..e9cb6125a 100644
--- a/hw/xfree86/os-support/linux/int10/vm86/linux_vm86.c
+++ b/hw/xfree86/os-support/linux/int10/vm86/linux_vm86.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/int10/vm86/linux_vm86.c,v 1.3 2003/11/03 05:36:33 tsi Exp $ */
+/* $XFree86$ */
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
diff --git a/hw/xfree86/os-support/linux/lnx.h b/hw/xfree86/os-support/linux/lnx.h
index f2dd16267..b2adcd514 100644
--- a/hw/xfree86/os-support/linux/lnx.h
+++ b/hw/xfree86/os-support/linux/lnx.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx.h,v 3.3 2002/11/25 14:05:04 eich Exp $ */
+/* $XFree86: Exp $ */
 
 #ifndef LNX_H_
 # ifdef __alpha__
diff --git a/hw/xfree86/os-support/linux/lnxResource.c b/hw/xfree86/os-support/linux/lnxResource.c
index bd038351f..25ef8cc91 100644
--- a/hw/xfree86/os-support/linux/lnxResource.c
+++ b/hw/xfree86/os-support/linux/lnxResource.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnxResource.c,v 3.19 2004/02/04 16:30:50 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnxResource.c,v 3.18 2002/01/25 21:56:19 tsi Exp $ */
 
 /* Resource information code */
 
diff --git a/hw/xfree86/os-support/linux/lnx_KbdMap.c b/hw/xfree86/os-support/linux/lnx_KbdMap.c
index 25639d72d..993679d81 100644
--- a/hw/xfree86/os-support/linux/lnx_KbdMap.c
+++ b/hw/xfree86/os-support/linux/lnx_KbdMap.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_KbdMap.c,v 1.1 2002/10/11 01:40:35 dawes Exp $ */
+/* $XFree86$ */
 
 /*
  * Slightly modified xf86KbdLnx.c which is
diff --git a/hw/xfree86/os-support/linux/lnx_agp.c b/hw/xfree86/os-support/linux/lnx_agp.c
index acac20bce..58f1062da 100644
--- a/hw/xfree86/os-support/linux/lnx_agp.c
+++ b/hw/xfree86/os-support/linux/lnx_agp.c
@@ -7,7 +7,7 @@
  * Copyright © 2001 The XFree86 Project, Inc.
  */
 
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_agp.c,v 3.12 2003/09/24 02:43:35 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_agp.c,v 3.11 2003/04/03 22:47:42 dawes Exp $ */
 
 #include "X.h"
 #include "xf86.h"
diff --git a/hw/xfree86/os-support/linux/lnx_apm.c b/hw/xfree86/os-support/linux/lnx_apm.c
index f2f326959..1f9142a6b 100644
--- a/hw/xfree86/os-support/linux/lnx_apm.c
+++ b/hw/xfree86/os-support/linux/lnx_apm.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_apm.c,v 3.13 2002/10/16 01:24:28 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_apm.c,v 3.12 2001/12/24 22:54:31 dawes Exp $ */
 
 #include "X.h"
 #include "os.h"
diff --git a/hw/xfree86/os-support/linux/lnx_axp.c b/hw/xfree86/os-support/linux/lnx_axp.c
index 5813ef4e9..106aa2804 100644
--- a/hw/xfree86/os-support/linux/lnx_axp.c
+++ b/hw/xfree86/os-support/linux/lnx_axp.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_axp.c,v 1.5 2002/11/25 14:05:04 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_axp.c,v 1.3 2001/02/15 11:03:56 alanh Exp $ */
 
 #include <stdio.h>
 #include "X.h"
diff --git a/hw/xfree86/os-support/linux/lnx_ev56.c b/hw/xfree86/os-support/linux/lnx_ev56.c
index bfcb0d70f..8381fec27 100644
--- a/hw/xfree86/os-support/linux/lnx_ev56.c
+++ b/hw/xfree86/os-support/linux/lnx_ev56.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_ev56.c,v 3.7 2002/11/25 14:05:04 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_ev56.c,v 3.5 2000/02/17 13:45:49 dawes Exp $ */
 
 #include "X.h"
 #include "input.h"
diff --git a/hw/xfree86/os-support/linux/lnx_init.c b/hw/xfree86/os-support/linux/lnx_init.c
index cbc926bc0..ea305e38d 100644
--- a/hw/xfree86/os-support/linux/lnx_init.c
+++ b/hw/xfree86/os-support/linux/lnx_init.c
@@ -1,4 +1,5 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_init.c,v 3.15 2003/12/02 20:45:13 dawes Exp $ */
+/* $XdotOrg: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_init.c,v 3.15 2003/12/02 20:45:13 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_init.c,v 3.14 2001/10/31 22:50:30 tsi Exp $ */
 /*
  * Copyright 1992 by Orest Zborowski <obz@Kodak.com>
  * Copyright 1993 by David Wexelblat <dwex@goblin.org>
diff --git a/hw/xfree86/os-support/linux/lnx_io.c b/hw/xfree86/os-support/linux/lnx_io.c
index 8fa27aa08..dda1ff8ef 100644
--- a/hw/xfree86/os-support/linux/lnx_io.c
+++ b/hw/xfree86/os-support/linux/lnx_io.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c,v 3.27 2004/03/03 18:53:41 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c,v 3.25 2003/08/19 17:32:34 tsi Exp $ */
 /*
  * Copyright 1992 by Orest Zborowski <obz@Kodak.com>
  * Copyright 1993 by David Dawes <dawes@xfree86.org>
@@ -81,7 +81,7 @@ xf86GetKbdLeds()
 #endif
 
 static int
-KDKBDREP_ioctl_ok(int fd, int rate, int delay) {
+KDKBDREP_ioctl_ok(int rate, int delay) {
 #if defined(KDKBDREP) && !defined(__sparc__)
      /* This ioctl is defined in <linux/kd.h> but is not
 	implemented anywhere - must be in some m68k patches. */
@@ -90,10 +90,9 @@ KDKBDREP_ioctl_ok(int fd, int rate, int delay) {
    /* don't change, just test */
    kbdrep_s.rate = -1;
    kbdrep_s.delay = -1;
-   if (ioctl( fd, KDKBDREP, &kbdrep_s )) {
+   if (ioctl( xf86Info.consoleFd, KDKBDREP, &kbdrep_s )) {
        return 0;
    }
-
    /* do the change */
    if (rate == 0)				/* switch repeat off */
      kbdrep_s.rate = 0;
@@ -105,7 +104,7 @@ KDKBDREP_ioctl_ok(int fd, int rate, int delay) {
    if (kbdrep_s.delay < 1)
      kbdrep_s.delay = 1;
    
-   if (ioctl( fd, KDKBDREP, &kbdrep_s )) {
+   if (ioctl( xf86Info.consoleFd, KDKBDREP, &kbdrep_s )) {
      return 0;
    }
 
@@ -130,8 +129,9 @@ KIOCSRATE_ioctl_ok(int rate, int delay) {
    if (kbdrate_s.rate > 50)
      kbdrate_s.rate = 50;
 
-   if (ioctl( fd, KIOCSRATE, &kbdrate_s ))
-     return 0;
+   if (ioctl( fd, KIOCSRATE, &kbdrate_s )) {
+       return 0;
+   }
 
    close( fd );
 
@@ -173,8 +173,7 @@ void xf86SetKbdRepeat(char rad)
   if (xf86Info.kbdDelay >= 0)
     delay = xf86Info.kbdDelay;
 
-
-  if(KDKBDREP_ioctl_ok(xf86Info.consoleFd, rate, delay)) 	/* m68k? */
+  if(KDKBDREP_ioctl_ok(rate, delay)) 	/* m68k? */
     return;
 
   if(KIOCSRATE_ioctl_ok(rate, delay))	/* sparc? */
diff --git a/hw/xfree86/os-support/linux/lnx_jstk.c b/hw/xfree86/os-support/linux/lnx_jstk.c
index 2423bd45e..90a8bc106 100644
--- a/hw/xfree86/os-support/linux/lnx_jstk.c
+++ b/hw/xfree86/os-support/linux/lnx_jstk.c
@@ -23,7 +23,7 @@
  *
  */
 
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_jstk.c,v 3.13 1998/07/25 16:56:43 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_jstk.c,v 3.8.2.1 1998/06/05 16:23:12 dawes Exp $ */
 
 static const char rcs_id[] = "Id: lnx_jstk.c,v 1.1 1995/12/20 14:06:09 lepied Exp";
 
diff --git a/hw/xfree86/os-support/linux/lnx_kbd.c b/hw/xfree86/os-support/linux/lnx_kbd.c
index c0ebc86b6..68f3af38b 100644
--- a/hw/xfree86/os-support/linux/lnx_kbd.c
+++ b/hw/xfree86/os-support/linux/lnx_kbd.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.c,v 1.6 2004/03/03 18:53:41 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.c,v 1.4 2003/11/03 05:11:52 tsi Exp $ */
 
 /*
  * Copyright (c) 2002 by The XFree86 Project, Inc.
@@ -108,7 +108,7 @@ GetKbdLeds(InputInfoPtr pInfo)
 #endif
 
 static int
-KDKBDREP_ioctl_ok(int fd, int rate, int delay) {
+KDKBDREP_ioctl_ok(int rate, int delay) {
 #if defined(KDKBDREP) && !defined(__sparc__)
      /* This ioctl is defined in <linux/kd.h> but is not
 	implemented anywhere - must be in some m68k patches. */
@@ -117,7 +117,7 @@ KDKBDREP_ioctl_ok(int fd, int rate, int delay) {
    /* don't change, just test */
    kbdrep_s.rate = -1;
    kbdrep_s.delay = -1;
-   if (ioctl( fd, KDKBDREP, &kbdrep_s )) {
+   if (ioctl( xf86Info.consoleFd, KDKBDREP, &kbdrep_s )) {
        return 0;
    }
 
@@ -132,8 +132,8 @@ KDKBDREP_ioctl_ok(int fd, int rate, int delay) {
    if (kbdrep_s.delay < 1)
      kbdrep_s.delay = 1;
    
-   if (ioctl( fd, KDKBDREP, &kbdrep_s )) {
-     return 0;
+   if (ioctl( xf86Info.consoleFd, KDKBDREP, &kbdrep_s )) {
+       return 0;
    }
 
    return 1;			/* success! */
@@ -157,8 +157,9 @@ KIOCSRATE_ioctl_ok(int rate, int delay) {
    if (kbdrate_s.rate > 50)
      kbdrate_s.rate = 50;
 
-   if (ioctl( fd, KIOCSRATE, &kbdrate_s ))
-     return 0;
+   if (ioctl( fd, KIOCSRATE, &kbdrate_s )) {
+       return 0;
+   }
 
    close( fd );
 
@@ -200,7 +201,7 @@ SetKbdRepeat(InputInfoPtr pInfo, char rad)
   if (pKbd->delay >= 0)
     delay = pKbd->delay;
 
-  if(KDKBDREP_ioctl_ok(pInfo->fd, rate, delay)) 	/* m68k? */
+  if(KDKBDREP_ioctl_ok(rate, delay)) 	/* m68k? */
     return;
 
   if(KIOCSRATE_ioctl_ok(rate, delay))	/* sparc? */
diff --git a/hw/xfree86/os-support/linux/lnx_kbd.h b/hw/xfree86/os-support/linux/lnx_kbd.h
index ac783bfbc..7b9cd434e 100644
--- a/hw/xfree86/os-support/linux/lnx_kbd.h
+++ b/hw/xfree86/os-support/linux/lnx_kbd.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.h,v 1.1 2002/10/11 01:40:35 dawes Exp $ */
+/* $XFree86$ */
 
 extern void KbdGetMapping(InputInfoPtr pInfo, KeySymsPtr pKeySyms,
 				CARD8 *pModMap);
diff --git a/hw/xfree86/os-support/linux/lnx_kmod.c b/hw/xfree86/os-support/linux/lnx_kmod.c
index 0cb69b209..cf18bcab6 100644
--- a/hw/xfree86/os-support/linux/lnx_kmod.c
+++ b/hw/xfree86/os-support/linux/lnx_kmod.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_kmod.c,v 3.6 2001/10/31 22:50:30 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_kmod.c,v 3.5 2001/10/01 13:44:14 eich Exp $ */
 
 #include <errno.h>
 #include <fcntl.h>
diff --git a/hw/xfree86/os-support/linux/lnx_pci.c b/hw/xfree86/os-support/linux/lnx_pci.c
index 5477b9130..41f76fd16 100644
--- a/hw/xfree86/os-support/linux/lnx_pci.c
+++ b/hw/xfree86/os-support/linux/lnx_pci.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_pci.c,v 3.9 2003/02/17 15:29:22 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_pci.c,v 3.8 2002/04/09 15:59:37 tsi Exp $ */
 
 #include <stdio.h>
 #include "X.h"
diff --git a/hw/xfree86/os-support/linux/lnx_video.c b/hw/xfree86/os-support/linux/lnx_video.c
index ad3a17fa2..5144cdf3e 100644
--- a/hw/xfree86/os-support/linux/lnx_video.c
+++ b/hw/xfree86/os-support/linux/lnx_video.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_video.c,v 3.68 2003/09/24 02:43:35 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_video.c,v 3.67 2003/06/25 18:27:07 eich Exp $ */
 /*
  * Copyright 1992 by Orest Zborowski <obz@Kodak.com>
  * Copyright 1993 by David Wexelblat <dwex@goblin.org>
diff --git a/hw/xfree86/os-support/lynxos/lynx_init.c b/hw/xfree86/os-support/lynxos/lynx_init.c
index 8565dcc5c..1787a7c8c 100644
--- a/hw/xfree86/os-support/lynxos/lynx_init.c
+++ b/hw/xfree86/os-support/lynxos/lynx_init.c
@@ -22,7 +22,7 @@
  */
 
 
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/lynxos/lynx_init.c,v 3.3 1998/08/29 05:43:58 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/lynxos/lynx_init.c,v 3.2 1998/07/25 16:56:45 dawes Exp $ */
 
 #include "X.h"
 #include "Xmd.h"
diff --git a/hw/xfree86/os-support/lynxos/lynx_io.c b/hw/xfree86/os-support/lynxos/lynx_io.c
index e61ce76b7..3ace8f447 100644
--- a/hw/xfree86/os-support/lynxos/lynx_io.c
+++ b/hw/xfree86/os-support/lynxos/lynx_io.c
@@ -21,7 +21,7 @@
  *
  */
 
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/lynxos/lynx_io.c,v 3.10 2003/02/17 15:11:57 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/lynxos/lynx_io.c,v 3.9 2002/10/11 01:40:35 dawes Exp $ */
 
 #include "X.h"
 
diff --git a/hw/xfree86/os-support/lynxos/lynx_mmap.c b/hw/xfree86/os-support/lynxos/lynx_mmap.c
index dcf734965..fd45ba4ec 100644
--- a/hw/xfree86/os-support/lynxos/lynx_mmap.c
+++ b/hw/xfree86/os-support/lynxos/lynx_mmap.c
@@ -21,7 +21,7 @@
  *
  */
 
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/lynxos/lynx_mmap.c,v 3.6 2000/02/11 22:36:02 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/lynxos/lynx_mmap.c,v 3.5 1998/08/29 05:43:58 dawes Exp $ */
 
 #include "X.h"
 
diff --git a/hw/xfree86/os-support/lynxos/lynx_noinline.c b/hw/xfree86/os-support/lynxos/lynx_noinline.c
index 858b0eb65..7d6bedec9 100644
--- a/hw/xfree86/os-support/lynxos/lynx_noinline.c
+++ b/hw/xfree86/os-support/lynxos/lynx_noinline.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/lynxos/lynx_noinline.c,v 3.6 2002/01/25 21:56:20 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/lynxos/lynx_noinline.c,v 3.5 2000/07/31 23:25:18 tsi Exp $ */
 /*
  * Copyright 1998 by Metro Link Incorporated
  *
diff --git a/hw/xfree86/os-support/lynxos/lynx_ppc.c b/hw/xfree86/os-support/lynxos/lynx_ppc.c
index e587b7ee0..12fa3bcae 100644
--- a/hw/xfree86/os-support/lynxos/lynx_ppc.c
+++ b/hw/xfree86/os-support/lynxos/lynx_ppc.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/lynxos/lynx_ppc.c,v 1.1 2002/12/14 04:41:14 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/lynxos/lynx_ppc.S,v 1.1 1999/07/10 07:24:49 dawes Exp $ */
 /*
  * Copyright 1998 by Metro Link Incorporated
  *
diff --git a/hw/xfree86/os-support/lynxos/lynx_video.c b/hw/xfree86/os-support/lynxos/lynx_video.c
index c667994b3..297d93bdf 100644
--- a/hw/xfree86/os-support/lynxos/lynx_video.c
+++ b/hw/xfree86/os-support/lynxos/lynx_video.c
@@ -21,7 +21,7 @@
  *
  */
 
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/lynxos/lynx_video.c,v 3.18 2002/12/14 04:41:14 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/lynxos/lynx_video.c,v 3.17 2000/10/28 01:42:27 mvojkovi Exp $ */
 
 #include "X.h"
 #include "input.h"
diff --git a/hw/xfree86/os-support/misc/BUSmemcpy.S b/hw/xfree86/os-support/misc/BUSmemcpy.S
index e4ff36c62..83dab6f67 100644
--- a/hw/xfree86/os-support/misc/BUSmemcpy.S
+++ b/hw/xfree86/os-support/misc/BUSmemcpy.S
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/misc/BUSmemcpy.S,v 1.1 1999/07/10 07:24:49 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/misc/BUSmemcpy.s,v 1.2 1998/07/25 16:56:49 dawes Exp $ */
 /******************************************************************************
                         Copyright 1993 by Glenn G. Lai
 
diff --git a/hw/xfree86/os-support/misc/BUSmemcpy.c b/hw/xfree86/os-support/misc/BUSmemcpy.c
index acef268a1..27d53fa8f 100644
--- a/hw/xfree86/os-support/misc/BUSmemcpy.c
+++ b/hw/xfree86/os-support/misc/BUSmemcpy.c
@@ -12,7 +12,7 @@ Thanks to Linus Torvalds for contributing this code.
 
 ****************************************************************************/
 
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/misc/BUSmemcpy.c,v 1.4 2000/02/12 20:45:44 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/misc/BUSmemcpy.c,v 1.3 1999/12/03 19:17:44 eich Exp $ */
 
 #include "X.h"
 #include "xf86.h"
diff --git a/hw/xfree86/os-support/misc/Delay.c b/hw/xfree86/os-support/misc/Delay.c
index b5de1d899..ce99e792a 100644
--- a/hw/xfree86/os-support/misc/Delay.c
+++ b/hw/xfree86/os-support/misc/Delay.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/misc/Delay.c,v 3.4 2003/03/25 04:18:23 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/misc/Delay.c,v 3.3 2000/12/08 20:13:38 eich Exp $ */
  
 #ifdef __UNIXOS2__
 #define I_NEED_OS2_H
diff --git a/hw/xfree86/os-support/misc/IODelay.S b/hw/xfree86/os-support/misc/IODelay.S
index 4c6e32f3f..685584653 100644
--- a/hw/xfree86/os-support/misc/IODelay.S
+++ b/hw/xfree86/os-support/misc/IODelay.S
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/misc/IODelay.S,v 1.1 1999/07/10 07:24:50 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/misc/IODelay.s,v 1.2 1998/07/25 16:56:49 dawes Exp $ */
 /*******************************************************************************
                         Copyright 1994 by Glenn G. Lai
 
diff --git a/hw/xfree86/os-support/misc/IODelay.c b/hw/xfree86/os-support/misc/IODelay.c
index 57176c5d5..e14a86f91 100644
--- a/hw/xfree86/os-support/misc/IODelay.c
+++ b/hw/xfree86/os-support/misc/IODelay.c
@@ -4,7 +4,7 @@
   Stub for Alpha Linux
 *******************************************************************************/
 
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/misc/IODelay.c,v 1.3 2000/08/04 16:13:41 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/misc/IODelay.c,v 1.1.2.1 1998/06/04 17:35:59 dawes Exp $ */
  
 #include "X.h"
 #include "xf86.h"
diff --git a/hw/xfree86/os-support/misc/PortIO.S b/hw/xfree86/os-support/misc/PortIO.S
index e919c05e7..75db31156 100644
--- a/hw/xfree86/os-support/misc/PortIO.S
+++ b/hw/xfree86/os-support/misc/PortIO.S
@@ -1,9 +1,7 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/misc/PortIO.S,v 1.2 2004/03/05 04:02:14 dawes Exp $ */
+/* $XFree86$ */
 
 /* Port I/O functions for platforms with no inlining. */
 
-#if defined(i386)
-
 #include "assyntax.h"
 
 	FILE("PortIO.s")
@@ -57,61 +55,3 @@ GLNAME(inl):
 	IN_L
 	RET
 
-#elif defined(sparc)
-
-#ifndef ASI_PL
-#define ASI_PL	136
-#endif
-
-	.file "PortIO.s"
-
-	.global outb
-	.global outw
-	.global outl
-	.global inb
-	.global inw
-	.global inl
-
-	.section	".text"
-
-	.align 4
-outb:
-	stba %o1, [%o0] ASI_PL
-	membar 10
-	retl
-	nop
-
-	.align 4
-outw:
-	stha %o1, [%o0] ASI_PL
-	membar 10
-	retl
-	nop
-
-	.align 4
-outl:
-	sta %o1, [%o0] ASI_PL
-	membar 10
-	retl
-	nop
-
-	.align 4
-inb:
-	lduba [%o0] ASI_PL, %o0
-	retl
-	nop
-
-	.align 4
-inw:
-	lduha [%o0] ASI_PL, %o0
-	retl
-	nop
-
-	.align 4
-inl:
-	lda [%o0] ASI_PL, %o0
-	retl
-	nop
-
-#endif
-
diff --git a/hw/xfree86/os-support/misc/SlowBcopy.S b/hw/xfree86/os-support/misc/SlowBcopy.S
index 9b6af1d69..9fd73a0f9 100644
--- a/hw/xfree86/os-support/misc/SlowBcopy.S
+++ b/hw/xfree86/os-support/misc/SlowBcopy.S
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/misc/SlowBcopy.S,v 1.1 1999/07/10 07:24:51 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/misc/SlowBcopy.s,v 1.2 1998/07/25 16:56:50 dawes Exp $ */
 /*******************************************************************************
                         Copyright 1994 by Glenn G. Lai
 
diff --git a/hw/xfree86/os-support/misc/SlowBcopy.c b/hw/xfree86/os-support/misc/SlowBcopy.c
index a9a8beae7..727ec6598 100644
--- a/hw/xfree86/os-support/misc/SlowBcopy.c
+++ b/hw/xfree86/os-support/misc/SlowBcopy.c
@@ -4,7 +4,7 @@
   for Alpha Linux
 *******************************************************************************/
 
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/misc/SlowBcopy.c,v 1.7 2004/02/11 22:06:21 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/misc/SlowBcopy.c,v 1.6tsi Exp $ */
  
 /* 
  *   Create a dependency that should be immune from the effect of register
diff --git a/hw/xfree86/os-support/misc/xf86_IlHack.c b/hw/xfree86/os-support/misc/xf86_IlHack.c
index 019156357..4172d3d39 100644
--- a/hw/xfree86/os-support/misc/xf86_IlHack.c
+++ b/hw/xfree86/os-support/misc/xf86_IlHack.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/misc/xf86_IlHack.c,v 3.5 1998/07/25 16:56:51 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/misc/xf86_IlHack.c,v 3.4.4.1 1998/06/04 17:36:01 dawes Exp $ */
 /*
  * This file is an incredible crock to get the normally-inline functions
  * built into the server so that things can be debugged properly.
diff --git a/hw/xfree86/os-support/misc/xf86_Util.c b/hw/xfree86/os-support/misc/xf86_Util.c
index 7889617e3..1b73dc654 100644
--- a/hw/xfree86/os-support/misc/xf86_Util.c
+++ b/hw/xfree86/os-support/misc/xf86_Util.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/misc/xf86_Util.c,v 3.8 2001/10/28 03:34:02 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/misc/xf86_Util.c,v 3.7 1999/01/14 13:05:05 dawes Exp $ */
 /*
  * Copyright 1993 by David Wexelblat <dwex@goblin.org>
  *
diff --git a/hw/xfree86/os-support/sco/VTsw_sco.c b/hw/xfree86/os-support/sco/VTsw_sco.c
index 899c3820b..d4ae2852f 100644
--- a/hw/xfree86/os-support/sco/VTsw_sco.c
+++ b/hw/xfree86/os-support/sco/VTsw_sco.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sco/VTsw_sco.c,v 1.4 2003/07/07 15:34:27 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sco/VTsw_sco.c,v 1.2 1998/07/25 16:56:57 dawes Exp $ */
 /*
  * Copyright 1993 by David Wexelblat <dwex@goblin.org>
  * Copyright 1993 by David McCullough <davidm@stallion.oz.au>
diff --git a/hw/xfree86/os-support/sco/sco_init.c b/hw/xfree86/os-support/sco/sco_init.c
index 389664647..2b8a05be5 100644
--- a/hw/xfree86/os-support/sco/sco_init.c
+++ b/hw/xfree86/os-support/sco/sco_init.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sco/sco_init.c,v 3.14 2002/11/20 23:00:44 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sco/sco_init.c,v 3.13 2002/06/03 21:22:10 dawes Exp $ */
 /*
  * Copyright 2001 by J. Kean Johnston <jkj@sco.com>
  *
diff --git a/hw/xfree86/os-support/sco/sco_io.c b/hw/xfree86/os-support/sco/sco_io.c
index a018e3434..c9b7219cd 100644
--- a/hw/xfree86/os-support/sco/sco_io.c
+++ b/hw/xfree86/os-support/sco/sco_io.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sco/sco_io.c,v 3.10 2003/02/17 15:11:59 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sco/sco_io.c,v 3.9 2002/10/11 01:40:36 dawes Exp $ */
 /*
  * Copyright 2001 by J. Kean Johnston <jkj@sco.com>
  *
diff --git a/hw/xfree86/os-support/sco/sco_iop.c b/hw/xfree86/os-support/sco/sco_iop.c
index 85b4bbd41..913884385 100644
--- a/hw/xfree86/os-support/sco/sco_iop.c
+++ b/hw/xfree86/os-support/sco/sco_iop.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sco/sco_iop.c,v 1.1 2002/06/03 21:22:10 dawes Exp $ */
+/* $XFree86$ */
 /*
  * Copyright 2001 by J. Kean Johnston <jkj@caldera.com>
  *
diff --git a/hw/xfree86/os-support/sco/sco_mouse.c b/hw/xfree86/os-support/sco/sco_mouse.c
index 37b9eb5a8..445afe822 100644
--- a/hw/xfree86/os-support/sco/sco_mouse.c
+++ b/hw/xfree86/os-support/sco/sco_mouse.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sco/sco_mouse.c,v 3.13 2002/11/20 23:07:50 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sco/sco_mouse.c,v 3.12 2001/06/30 22:41:49 tsi Exp $ */
 /*
  * Copyright 2001 by J. Kean Johnston <jkj@sco.com>
  *
diff --git a/hw/xfree86/os-support/sco/sco_video.c b/hw/xfree86/os-support/sco/sco_video.c
index 3c00f5564..a11d957e1 100644
--- a/hw/xfree86/os-support/sco/sco_video.c
+++ b/hw/xfree86/os-support/sco/sco_video.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sco/sco_video.c,v 3.9 2003/03/14 13:46:07 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sco/sco_video.c,v 3.8tsi Exp $ */
 /*
  * Copyright 2001 by J. Kean Johnston <jkj@sco.com>
  *
diff --git a/hw/xfree86/os-support/shared/VTsw_noop.c b/hw/xfree86/os-support/shared/VTsw_noop.c
index 265a45f91..6267da9a7 100644
--- a/hw/xfree86/os-support/shared/VTsw_noop.c
+++ b/hw/xfree86/os-support/shared/VTsw_noop.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/VTsw_noop.c,v 3.2 1998/07/25 16:56:59 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/VTsw_noop.c,v 3.1.4.1 1998/06/05 16:23:20 dawes Exp $ */
 /*
  * Copyright 1993 by David Wexelblat <dwex@XFree86.org>
  *
diff --git a/hw/xfree86/os-support/shared/VTsw_usl.c b/hw/xfree86/os-support/shared/VTsw_usl.c
index 81aac54de..4ddb84450 100644
--- a/hw/xfree86/os-support/shared/VTsw_usl.c
+++ b/hw/xfree86/os-support/shared/VTsw_usl.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/VTsw_usl.c,v 3.4 2002/09/16 18:06:14 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/VTsw_usl.c,v 3.1.4.1 1998/06/05 16:23:21 dawes Exp $ */
 /*
  * Copyright 1993 by David Wexelblat <dwex@XFree86.org>
  *
diff --git a/hw/xfree86/os-support/shared/bios_devmem.c b/hw/xfree86/os-support/shared/bios_devmem.c
index 5c24b9751..c295c2146 100644
--- a/hw/xfree86/os-support/shared/bios_devmem.c
+++ b/hw/xfree86/os-support/shared/bios_devmem.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/bios_devmem.c,v 3.7 2000/09/19 12:46:22 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/bios_devmem.c,v 3.5 1998/09/13 00:51:32 dawes Exp $ */
 /*
  * Copyright 1993 by David Wexelblat <dwex@goblin.org>
  *
diff --git a/hw/xfree86/os-support/shared/bios_mmap.c b/hw/xfree86/os-support/shared/bios_mmap.c
index ee7584222..8f341e5e4 100644
--- a/hw/xfree86/os-support/shared/bios_mmap.c
+++ b/hw/xfree86/os-support/shared/bios_mmap.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/bios_mmap.c,v 1.9 2001/05/23 14:46:05 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/bios_mmap.c,v 1.8 2000/11/19 16:38:06 tsi Exp $ */
 /*
  * Copyright 1993 by David Wexelblat <dwex@goblin.org>
  *
diff --git a/hw/xfree86/os-support/shared/inout.S b/hw/xfree86/os-support/shared/inout.S
index 80c47c419..73a2cbbb6 100644
--- a/hw/xfree86/os-support/shared/inout.S
+++ b/hw/xfree86/os-support/shared/inout.S
@@ -4,7 +4,7 @@
 
 
 
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/inout.S,v 1.1 1999/07/10 07:24:52 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/inout.s,v 3.5 1996/12/23 06:50:58 dawes Exp $ */
 
 #include "assyntax.h"
 
diff --git a/hw/xfree86/os-support/shared/ioperm_noop.c b/hw/xfree86/os-support/shared/ioperm_noop.c
index c24f4f1b2..fc1e83255 100644
--- a/hw/xfree86/os-support/shared/ioperm_noop.c
+++ b/hw/xfree86/os-support/shared/ioperm_noop.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/ioperm_noop.c,v 3.4 2001/07/23 13:15:48 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/ioperm_noop.c,v 3.3 1998/07/25 16:57:00 dawes Exp $ */
 /*
  * Copyright 1993 by David Wexelblat <dwex@XFree86.org>
  *
diff --git a/hw/xfree86/os-support/shared/libc_wrapper.c b/hw/xfree86/os-support/shared/libc_wrapper.c
index b6aa8fb29..34f375f6c 100644
--- a/hw/xfree86/os-support/shared/libc_wrapper.c
+++ b/hw/xfree86/os-support/shared/libc_wrapper.c
@@ -496,7 +496,7 @@ xf86mmap(void *start, xf86size_t length, int prot,
     if (flags & XF86_MAP_FIXED)		f |= MAP_FIXED;
     if (flags & XF86_MAP_SHARED)	f |= MAP_SHARED;
     if (flags & XF86_MAP_PRIVATE)	f |= MAP_PRIVATE;
-#if defined(__AMD64__) && defined(linux)
+#if defined(__amd64__) && defined(linux)
     if (flags & XF86_MAP_32BIT)	        f |= MAP_32BIT;
 #endif
     if (prot  & XF86_PROT_EXEC)		p |= PROT_EXEC;
diff --git a/hw/xfree86/os-support/shared/std_kbdEv.c b/hw/xfree86/os-support/shared/std_kbdEv.c
index 329346910..934ebbdba 100644
--- a/hw/xfree86/os-support/shared/std_kbdEv.c
+++ b/hw/xfree86/os-support/shared/std_kbdEv.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/std_kbdEv.c,v 3.3 1999/05/07 02:56:23 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/std_kbdEv.c,v 3.2 1998/07/25 16:57:01 dawes Exp $ */
 /*
  * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany
  * Copyright 1993 by David Dawes <dawes@xfree86.org>
diff --git a/hw/xfree86/os-support/shared/sysv_kbd.c b/hw/xfree86/os-support/shared/sysv_kbd.c
index 1bb2da386..8e118938e 100644
--- a/hw/xfree86/os-support/shared/sysv_kbd.c
+++ b/hw/xfree86/os-support/shared/sysv_kbd.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/sysv_kbd.c,v 3.4 1999/01/14 13:05:11 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/sysv_kbd.c,v 3.3 1998/07/25 16:57:02 dawes Exp $ */
 /*
  * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany
  * Copyright 1993 by David Dawes <dawes@XFree86.org>
diff --git a/hw/xfree86/os-support/shared/xf86Axp.h b/hw/xfree86/os-support/shared/xf86Axp.h
index e63619e3a..5afef810c 100644
--- a/hw/xfree86/os-support/shared/xf86Axp.h
+++ b/hw/xfree86/os-support/shared/xf86Axp.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/xf86Axp.h,v 1.3 2001/02/15 19:46:03 eich Exp $ */
+/* $XFree86$ */
 
 #ifndef _XF86_AXP_H_
 #define _XF86_AXP_H_
diff --git a/hw/xfree86/os-support/solaris/apSolaris.shar b/hw/xfree86/os-support/solaris/apSolaris.shar
index 33cecdc4d..c8e2cfa49 100644
--- a/hw/xfree86/os-support/solaris/apSolaris.shar
+++ b/hw/xfree86/os-support/solaris/apSolaris.shar
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $XFree86: xc/programs/Xserver/hw/xfree86/etc/apSolaris.shar,v 1.3 2002/10/04 19:45:33 tsi Exp $
+# $XFree86$
 # This is a shell archive (produced by GNU sharutils 4.2c).
 # To extract the files from this archive, save it to some FILE, remove
 # everything before the `!/bin/sh' line above, then type `sh FILE'.
diff --git a/hw/xfree86/os-support/solaris/solaris-ia32.S b/hw/xfree86/os-support/solaris/solaris-ia32.S
new file mode 100644
index 000000000..e2d9cf60a
--- /dev/null
+++ b/hw/xfree86/os-support/solaris/solaris-ia32.S
@@ -0,0 +1,73 @@
+/ Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+/ 
+/ 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, and/or sell copies of the Software, and to permit persons
+/ to whom the Software is furnished to do so, provided that the above
+/ copyright notice(s) and this permission notice appear in all copies of
+/ the Software and that both the above copyright notice(s) and this
+/ permission notice appear in supporting documentation.
+/ 
+/ 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
+/ OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+/ HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+/ INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+/ FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+/ NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+/ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+/ 
+/ Except as contained in this notice, the name of a copyright holder
+/ shall not be used in advertising or otherwise to promote the sale, use
+/ or other dealings in this Software without prior written authorization
+/ of the copyright holder.
+
+#ifdef INLINE_ASM
+#define FUNCTION_START(f,n)	.inline f,n
+#define FUNCTION_END(f)		.end
+#else
+#define _ASM
+#include <sys/asm_linkage.h>
+#define FUNCTION_START(f,n)	ENTRY(f)
+#define FUNCTION_END(f)		SET_SIZE(f)
+#endif
+
+	FUNCTION_START(inb,4)
+	movl	(%esp), %edx
+	xorl    %eax, %eax
+	inb	(%dx)
+	FUNCTION_END(inb)
+
+	FUNCTION_START(inw,4)
+	movl	(%esp), %edx
+	xorl    %eax, %eax
+	inw	(%dx)
+	FUNCTION_END(inw)
+
+	FUNCTION_START(inl,4)
+	movl	(%esp), %edx
+	xorl    %eax, %eax
+	inl	(%dx)
+	FUNCTION_END(inl)
+
+	FUNCTION_START(outb,8)
+	movl	(%esp), %edx
+	movl    4(%esp), %eax
+	outb	(%dx)
+	FUNCTION_END(outb)
+
+	FUNCTION_START(outw,8)
+	movl	(%esp), %edx
+	movl    4(%esp), %eax
+	outw	(%dx)
+	FUNCTION_END(outw)
+
+	FUNCTION_START(outl,8)
+	movl	(%esp), %edx
+	movl    4(%esp), %eax
+	outl	(%dx)
+	FUNCTION_END(outl)
+
diff --git a/hw/xfree86/os-support/solaris/sun_bios.c b/hw/xfree86/os-support/solaris/sun_bios.c
index bef97c802..dc984bd4b 100644
--- a/hw/xfree86/os-support/solaris/sun_bios.c
+++ b/hw/xfree86/os-support/solaris/sun_bios.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sunos/sun_bios.c,v 1.4 2004/03/08 15:37:12 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sunos/sun_bios.c,v 1.2tsi Exp $ */
 /*
  * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany
  * Copyright 1993 by David Wexelblat <dwex@goblin.org>
@@ -45,31 +45,49 @@ xf86ReadBIOS(unsigned long Base, unsigned long Offset, unsigned char *Buf,
 {
 	int fd;
 	unsigned char *ptr;
+	char solx86_vtname[20];
 	int psize;
 	int mlen;
 
+	/*
+	 * Solaris 2.1 x86 SVR4 (10/27/93)
+	 *	The server must treat the virtual terminal device file
+	 *	as the standard SVR4 /dev/pmem. By default, then used VT
+	 *	is considered the "default" file to open.
+	 *
+	 * Solaris 2.8 x86 (7/26/99) - DWH
+	 *
+	 *	Use /dev/xsvc for everything.
+	 */
 	psize = xf86getpagesize();
 	Offset += Base & (psize - 1);
 	Base &= ~(psize - 1);
 	mlen = (Offset + Len + psize - 1) & ~(psize - 1);
+#if defined(i386) && !defined(__SOL8__)
+	if (Base >= 0xA0000 && Base + mlen < 0xFFFFF && xf86Info.vtno >= 0)
+		sprintf(solx86_vtname, "/dev/vt%02d", xf86Info.vtno);
+	else
+#endif
+	{
+		if (!xf86LinearVidMem())
+			FatalError("xf86ReadBIOS: Could not mmap BIOS"
+				   " [a=%lx]\n", Base);
+		sprintf(solx86_vtname, apertureDevName);
+	}
 
-	if (!xf86LinearVidMem())
-		FatalError("xf86ReadBIOS: Could not mmap BIOS [a=%lx]\n", Base);
-
-	if ((fd = open(apertureDevName, O_RDONLY)) < 0)
+	if ((fd = open(solx86_vtname, O_RDONLY)) < 0)
 	{
 		xf86Msg(X_WARNING, "xf86ReadBIOS: Failed to open %s (%s)\n",
-			apertureDevName, strerror(errno));
+			solx86_vtname, strerror(errno));
 		return(-1);
 	}
-
 	ptr = (unsigned char *)mmap((caddr_t)0, mlen, PROT_READ,
 					MAP_SHARED, fd, (off_t)Base);
 	if (ptr == MAP_FAILED)
 	{
 		xf86Msg(X_WARNING, "xf86ReadBIOS: %s mmap failed "
 			"[0x%08lx, 0x%04x]\n",
-			apertureDevName, Base, mlen);
+			solx86_vtname, Base, mlen);
 		close(fd);
 		return -1;
 	}
diff --git a/hw/xfree86/os-support/solaris/sun_init.c b/hw/xfree86/os-support/solaris/sun_init.c
index b08529a00..c7382e0e1 100644
--- a/hw/xfree86/os-support/solaris/sun_init.c
+++ b/hw/xfree86/os-support/solaris/sun_init.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sunos/sun_init.c,v 1.6 2002/06/06 13:49:34 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sunos/sun_init.c,v 1.5 2001/11/25 13:51:24 tsi Exp $ */
 /*
  * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany
  * Copyright 1993 by David Wexelblat <dwex@goblin.org>
@@ -26,6 +26,9 @@
 #include "xf86.h"
 #include "xf86Priv.h"
 #include "xf86_OSlib.h"
+#ifdef __i386
+# include <sys/kd.h>
+#endif
 
 static Bool KeepTty = FALSE;
 static Bool Protect0 = FALSE;
@@ -34,7 +37,11 @@ static int VTnum = -1;
 static int xf86StartVT = -1;
 #endif
 
+#if defined(__SOL8__) || !defined(__i386)
+static char fb_dev[PATH_MAX] = "/dev/fb";
+#else
 static char fb_dev[PATH_MAX] = "/dev/console";
+#endif
 
 void
 xf86OpenConsole(void)
@@ -162,12 +169,15 @@ xf86OpenConsole(void)
 
 	if (ioctl(xf86Info.consoleFd, VT_SETMODE, &VT) < 0)
 	    FatalError("xf86OpenConsole: VT_SETMODE VT_PROCESS failed\n");
-
+#endif
+#ifdef __i386
 	if (ioctl(xf86Info.consoleFd, KDSETMODE, KD_GRAPHICS) < 0)
 	    FatalError("xf86OpenConsole: KDSETMODE KD_GRAPHICS failed\n");
+#endif
     }
     else /* serverGeneration != 1 */
     {
+#ifdef HAS_USL_VTS
 	/*
 	 * Now re-get the VT
 	 */
@@ -245,6 +255,11 @@ xf86CloseConsole(void)
 
 #endif
 
+#ifdef __i386
+    /* Reset the display back to text mode */
+    ioctl(xf86Info.consoleFd, KDSETMODE, KD_TEXT);
+#endif
+
 #ifdef HAS_USL_VTS
 
     /*
@@ -261,8 +276,6 @@ xf86CloseConsole(void)
      * Did the whole thing similarly to the way linux does it
      */
 
-    /* Reset the display back to text mode */
-    ioctl(xf86Info.consoleFd, KDSETMODE, KD_TEXT);
     if (ioctl(xf86Info.consoleFd, VT_GETMODE, &VT) != -1)
     {
 	VT.mode = VT_AUTO;		/* Set default vt handling */
diff --git a/hw/xfree86/os-support/solaris/sun_inout.s b/hw/xfree86/os-support/solaris/sun_inout.s
index e8f03d0e8..5c0b23ef6 100644
--- a/hw/xfree86/os-support/solaris/sun_inout.s
+++ b/hw/xfree86/os-support/solaris/sun_inout.s
@@ -1,4 +1,4 @@
-/ $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sunos/sun_inout.s,v 1.1 2001/05/28 02:42:31 tsi Exp $
+/ $XFree86$
 /
 / Copyright 1994-2001 The XFree86 Project, Inc.  All Rights Reserved.
 /
diff --git a/hw/xfree86/os-support/solaris/sun_io.c b/hw/xfree86/os-support/solaris/sun_io.c
index 27996d312..9f3a235e5 100644
--- a/hw/xfree86/os-support/solaris/sun_io.c
+++ b/hw/xfree86/os-support/solaris/sun_io.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sunos/sun_io.c,v 1.3 2003/02/17 15:12:00 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sunos/sun_io.c,v 1.2 2002/10/11 01:40:37 dawes Exp $ */
 /*
  * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany
  * Copyright 1993 by David Dawes <dawes@xfree86.org>
diff --git a/hw/xfree86/os-support/solaris/sun_kbd.c b/hw/xfree86/os-support/solaris/sun_kbd.c
index 058f1109a..0213a0732 100644
--- a/hw/xfree86/os-support/solaris/sun_kbd.c
+++ b/hw/xfree86/os-support/solaris/sun_kbd.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sunos/sun_kbd.c,v 1.2 2003/10/09 11:44:00 pascal Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sunos/sun_kbd.c,v 1.1 2001/05/28 02:42:31 tsi Exp $ */
 /*
  * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany
  * Copyright 1993 by David Dawes <dawes@XFree86.org>
diff --git a/hw/xfree86/os-support/solaris/sun_kbdEv.c b/hw/xfree86/os-support/solaris/sun_kbdEv.c
index f6481af29..30cf288ca 100644
--- a/hw/xfree86/os-support/solaris/sun_kbdEv.c
+++ b/hw/xfree86/os-support/solaris/sun_kbdEv.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sunos/sun_kbdEv.c,v 1.6 2003/10/09 11:44:00 pascal Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sunos/sun_kbdEv.c,v 1.5 2003/08/26 19:00:36 tsi Exp $ */
 /*
  * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
  * Copyright 1993 by David Dawes <dawes@xfree86.org>
diff --git a/hw/xfree86/os-support/solaris/sun_mouse.c b/hw/xfree86/os-support/solaris/sun_mouse.c
index 2e9cee2b1..09f73c410 100644
--- a/hw/xfree86/os-support/solaris/sun_mouse.c
+++ b/hw/xfree86/os-support/solaris/sun_mouse.c
@@ -1,4 +1,5 @@
 /* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sunos/sun_mouse.c,v 1.4 2002/01/25 21:56:21 tsi Exp $ */
+/* $XdotOrg$ */
 /*
  * Copyright 1999-2001 The XFree86 Project, Inc.  All Rights Reserved.
  *
@@ -24,16 +25,53 @@
  * dealings in this Software without prior written authorization from the
  * XFree86 Project.
  */
+/* Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+ *
+ * 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, and/or sell copies of the Software, and to permit persons
+ * to whom the Software is furnished to do so, provided that the above
+ * copyright notice(s) and this permission notice appear in all copies of
+ * the Software and that both the above copyright notice(s) and this
+ * permission notice appear in supporting documentation.
+ * 
+ * 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
+ * OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+ * HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+ * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+ * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+ * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ * 
+ * Except as contained in this notice, the name of a copyright holder
+ * shall not be used in advertising or otherwise to promote the sale, use
+ * or other dealings in this Software without prior written authorization
+ * of the copyright holder.
+ */
 
 #include "xf86.h"
 #include "xf86_OSlib.h"
 #include "xf86OSmouse.h"
 
-#if defined(__SOL8__) || !defined(i386)
+#if defined(__SOL8__) || !defined(__i386)
 
 #include "xisb.h"
 #include "mipointer.h"
+#include <sys/stropts.h>
 #include <sys/vuid_event.h>
+#include <sys/msio.h>
+
+/* Wheel mouse support in VUID drivers in Solaris 9 updates & Solaris 10 */
+#ifdef WHEEL_DEVID /* Defined in vuid_event.h if VUID wheel support present */
+# define HAVE_VUID_WHEEL
+#endif
+#ifdef HAVE_VUID_WHEEL
+# include <sys/vuid_wheel.h>
+#endif
 
 /* Names of protocols that are handled internally here. */
 
@@ -42,21 +80,71 @@ static const char *internalNames[] = {
 	NULL
 };
 
+static const char *solarisMouseDevs[] = {
+    /* Device file:	Protocol: 			*/
+    "/dev/mouse",	"VUID",		/* USB or SPARC */
+#ifdef __i386
+    "/dev/kdmouse",	"PS/2",		/* PS/2 */
+#endif
+    NULL
+};
+
 typedef struct _VuidMseRec {
     Firm_event event;
     unsigned char *buffer;
+    char *strmod;
 } VuidMseRec, *VuidMsePtr;
 
 
 static int  vuidMouseProc(DeviceIntPtr pPointer, int what);
 static void vuidReadInput(InputInfoPtr pInfo);
 
+/*
+ * Initialize and enable the mouse wheel, if present.
+ *
+ * Returns 1 if mouse wheel was successfully enabled.
+ * Returns 0 if an error occurred or if there is no mouse wheel.
+ */
+static int
+vuidMouseWheelInit(InputInfoPtr pInfo)
+{
+#ifdef HAVE_VUID_WHEEL
+    wheel_state wstate;
+    int nwheel = -1;
+
+    wstate.vers = VUID_WHEEL_STATE_VERS;
+    wstate.id = 0;
+    wstate.stateflags = -1;
+
+    if (ioctl(pInfo->fd, VUIDGWHEELCOUNT, &nwheel) != 0)
+	return (0);
+
+    if (ioctl(pInfo->fd, VUIDGWHEELSTATE, &wstate) != 0) {
+	xf86Msg(X_WARNING, "%s: couldn't get wheel state\n", pInfo->name);
+	return (0);
+    }
+
+    wstate.stateflags |= VUID_WHEEL_STATE_ENABLED;
+
+    if (ioctl(pInfo->fd, VUIDSWHEELSTATE, &wstate) != 0) {
+	xf86Msg(X_WARNING, "%s: couldn't enable wheel\n", pInfo->name);
+	return (0);
+    }
+
+    return (1);
+#else
+    return (0);
+#endif
+}
+
+
 /* This function is called when the protocol is "VUID". */
 static Bool
 vuidPreInit(InputInfoPtr pInfo, const char *protocol, int flags)
 {
     MouseDevPtr pMse = pInfo->private;
     VuidMsePtr pVuidMse;
+    int buttons;
 
     pVuidMse = xalloc(sizeof(VuidMseRec));
     if (pVuidMse == NULL) {
@@ -84,7 +172,40 @@ vuidPreInit(InputInfoPtr pInfo, const char *protocol, int flags)
 	    return FALSE;
 	}
     }
+
     pVuidMse->buffer = (unsigned char *)&pVuidMse->event;
+
+    pVuidMse->strmod = xf86SetStrOption(pInfo->options, "StreamsModule", NULL);
+    if (pVuidMse->strmod && 
+      	(ioctl(pInfo->fd, I_PUSH, pVuidMse->strmod) == -1)) {
+	xf86Msg(X_ERROR,
+	  "%s: cannot push module '%s' onto mouse device: %s\n",
+	  pInfo->name, pVuidMse->strmod, strerror(errno));
+	xf86CloseSerial(pInfo->fd);
+	pInfo->fd = -1;
+	xfree(pVuidMse);
+	xfree(pMse);
+	return FALSE;
+    }
+
+    buttons = xf86SetIntOption(pInfo->options, "Buttons", 0);
+    if (buttons == 0) {
+	if(ioctl(pInfo->fd, MSIOBUTTONS, &buttons) == 0) {
+	    pInfo->conf_idev->commonOptions =
+	      xf86ReplaceIntOption(pInfo->conf_idev->commonOptions, 
+		"Buttons", buttons);
+	    xf86Msg(X_INFO, "%s: Setting Buttons option to \"%d\"\n",
+	      pInfo->name, buttons);
+	}
+    }
+
+    if (pVuidMse->strmod && 
+      (ioctl(pInfo->fd, I_POP, pVuidMse->strmod) == -1)) {
+	xf86Msg(X_WARNING,
+	  "%s: cannot pop module '%s' off mouse device: %s\n",
+	  pInfo->name, pVuidMse->strmod, strerror(errno));
+    }
+
     xf86CloseSerial(pInfo->fd);
     pInfo->fd = -1;
 
@@ -112,6 +233,7 @@ vuidReadInput(InputInfoPtr pInfo)
     unsigned int n;
     int c; 
     unsigned char *pBuf;
+    int wmask;
 
     pMse = pInfo->private;
     pVuidMse = pMse->mousePriv;
@@ -154,7 +276,15 @@ vuidReadInput(InputInfoPtr pInfo)
 		dy -= delta;
 		break;
 	    }
+	} 
+#ifdef HAVE_VUID_WHEEL
+	else if (vuid_in_range(VUID_WHEEL, pVuidMse->event.id)) {
+	    if (vuid_id_offset(pVuidMse->event.id) == 0)
+		dz -= VUID_WHEEL_GETDELTA(pVuidMse->event.value);
+	    else
+		dw -= VUID_WHEEL_GETDELTA(pVuidMse->event.value);
 	}
+#endif
 
 	n = 0;
 	if ((c = XisbRead(pMse->buffer)) >= 0) {
@@ -219,9 +349,20 @@ vuidMouseProc(DeviceIntPtr pPointer, int what)
 		pInfo->fd = -1;
 	    } else {
 	        int fmt = VUID_FIRM_EVENT;
-		ioctl(pInfo->fd, VUIDSFORMAT, &fmt);
-		xf86FlushInput(pInfo->fd);
-		AddEnabledDevice(pInfo->fd);
+
+		if (pVuidMse->strmod && 
+		    (ioctl(pInfo->fd, I_PUSH, pVuidMse->strmod) == -1)) {
+		    xf86Msg(X_ERROR,
+		      "%s: cannot push module '%s' onto mouse device: %s\n",
+		      pInfo->name, pVuidMse->strmod, strerror(errno));
+		    xf86CloseSerial(pInfo->fd);
+		    pInfo->fd = -1;
+		} else {
+		    ioctl(pInfo->fd, VUIDSFORMAT, &fmt);
+		    vuidMouseWheelInit(pInfo);
+		    xf86FlushInput(pInfo->fd);
+		    AddEnabledDevice(pInfo->fd);
+		}
 	    }
 	}
 	pMse->lastButtons = 0;
@@ -237,6 +378,12 @@ vuidMouseProc(DeviceIntPtr pPointer, int what)
 		XisbFree(pMse->buffer);
 		pMse->buffer = NULL;
 	    }
+	    if (pVuidMse->strmod && 
+		(ioctl(pInfo->fd, I_POP, pVuidMse->strmod) == -1)) {
+		xf86Msg(X_WARNING,
+		      "%s: cannot pop module '%s' off mouse device: %s\n",
+		      pInfo->name, pVuidMse->strmod, strerror(errno));
+	    }
 	    xf86CloseSerial(pInfo->fd);
 	    pInfo->fd = -1;
 	}
@@ -278,21 +425,98 @@ CheckProtocol(const char *protocol)
 static const char *
 DefaultProtocol(void)
 {
-    return "VUID";
+    return "Auto";
+}
+
+static Bool
+solarisMouseAutoProbe(InputInfoPtr pInfo, const char **protocol, 
+	const char **device)
+{
+    const char **pdev, **pproto, *dev = NULL;
+    int fd = -1;
+    Bool found;
+
+    for (pdev = solarisMouseDevs; *pdev; pdev += 2) {
+	pproto = pdev + 1;
+	if ((*protocol != NULL) && (strcmp(*protocol, "Auto") != 0) &&
+	  (*pproto != NULL) && (strcmp(*pproto, *protocol) != 0)) {
+	    continue;
+	}
+	if ((*device != NULL) && (strcmp(*device, *pdev) != 0)) {
+	    continue;
+	}
+        SYSCALL (fd = open(*pdev, O_RDWR | O_NONBLOCK));
+	if (fd == -1) {
+#ifdef DEBUG
+	    ErrorF("Cannot open %s (%s)\n", pdev, strerror(errno));
+#endif
+	} else {
+	    found = TRUE;
+	    if ((*pproto != NULL) && (strcmp(*pproto, "VUID") == 0)) {
+		int i;
+		if (ioctl(fd, VUIDGFORMAT, &i) < 0) {
+		    found = FALSE;
+		}
+	    }
+	    close(fd);
+	    if (found == TRUE) {
+		if (*pproto != NULL) {
+		    *protocol = *pproto;
+		}
+		*device = *pdev;
+		return TRUE;
+	    }
+	}
+    }
+    return FALSE;
 }
 
 static const char *
 SetupAuto(InputInfoPtr pInfo, int *protoPara)
 {
-    return DefaultProtocol();
+    const char *pdev = NULL;
+    const char *pproto = NULL;
+    MouseDevPtr pMse = pInfo->private;
+
+    if (pInfo->fd == -1) {
+	/* probe to find device/protocol to use */
+	if (solarisMouseAutoProbe(pInfo, &pproto, &pdev) != FALSE) {
+	    /* Set the Device option. */
+	    pInfo->conf_idev->commonOptions =
+	     xf86AddNewOption(pInfo->conf_idev->commonOptions, "Device", pdev);
+	    xf86Msg(X_INFO, "%s: Setting Device option to \"%s\"\n",
+	      pInfo->name, pdev);
+	}
+    } else if (pMse->protocolID == PROT_AUTO) {
+	pdev = xf86CheckStrOption(pInfo->conf_idev->commonOptions, 
+		"Device", NULL);
+	solarisMouseAutoProbe(pInfo, &pproto, &pdev);
+    }
+    return pproto;
+}
+
+static const char *
+FindDevice(InputInfoPtr pInfo, const char *protocol, int flags)
+{
+    const char *pdev = NULL;
+    const char *pproto = protocol;
+
+    if (solarisMouseAutoProbe(pInfo, &pproto, &pdev) != FALSE) {
+	/* Set the Device option. */
+	pInfo->conf_idev->commonOptions =
+	  xf86AddNewOption(pInfo->conf_idev->commonOptions, "Device", pdev);
+	xf86Msg(X_INFO, "%s: Setting Device option to \"%s\"\n",
+	  pInfo->name, pdev);
+    }
+    return pdev;
 }
 
-#else /* __SOL8__ || !i386 */
+#else /* __SOL8__ || !__i386 */
 
 #undef MSE_MISC
 #define MSE_MISC 0
 
-#endif /* !__SOL8__ && i386 */
+#endif /* !__SOL8__ && __i386 */
 
 static int
 SupportedInterfaces(void)
@@ -310,12 +534,13 @@ xf86OSMouseInit(int flags)
     if (!p)
 	return NULL;
     p->SupportedInterfaces = SupportedInterfaces;
-#if defined(__SOL8__) || !defined(i386)
+#if defined(__SOL8__) || !defined(__i386)
     p->BuiltinNames = BuiltinNames;
     p->CheckProtocol = CheckProtocol;
     p->PreInit = sunMousePreInit;
     p->DefaultProtocol = DefaultProtocol;
     p->SetupAuto = SetupAuto;
+    p->FindDevice = FindDevice;
 #endif
     return p;
 }
diff --git a/hw/xfree86/os-support/solaris/sun_vid.c b/hw/xfree86/os-support/solaris/sun_vid.c
index bedc8a62b..02883f054 100644
--- a/hw/xfree86/os-support/solaris/sun_vid.c
+++ b/hw/xfree86/os-support/solaris/sun_vid.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sunos/sun_vid.c,v 1.4 2004/03/08 15:37:12 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sunos/sun_vid.c,v 1.2 2001/10/28 03:34:03 tsi Exp $ */
 /*
  * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany
  * Copyright 1993 by David Wexelblat <dwex@goblin.org>
@@ -75,15 +75,50 @@ xf86MapVidMem(int ScreenNum, int Flags, unsigned long Base, unsigned long Size)
 {
 	pointer base;
 	int fd;
+	char vtname[20];
+
+	/*
+	 * Solaris 2.1 x86 SVR4 (10/27/93)
+	 * The server must treat the virtual terminal device file as the
+	 * standard SVR4 /dev/pmem.
+	 *
+	 * Using the /dev/vtXX device as /dev/pmem only works for the
+	 * A0000-FFFFF region - If we wish you mmap the linear aperture
+	 * it requires a device driver.
+	 *
+	 * So what we'll do is use /dev/vtXX for the A0000-FFFFF stuff, and
+	 * try to use the /dev/fbs/aperture or /dev/xsvc driver if the server
+	 * tries to mmap anything > FFFFF.  Its very very unlikely that the
+	 * server will try to mmap anything below FFFFF that can't be handled
+	 * by /dev/vtXX.
+	 *
+	 * DWH - 2/23/94
+	 * DWH - 1/31/99 (Gee has it really been 5 years?)
+	 *
+	 * Solaris 2.8 7/26/99
+	 * Use /dev/xsvc for everything
+	 *
+	 * DWH - 7/26/99 - Solaris8/dev/xsvc changes
+	 *
+	 * TSI - 2001.09 - SPARC changes
+	 */
+
+#if defined(i386) && !defined(__SOL8__)
+	if(Base < 0xFFFFF)
+		sprintf(vtname, "/dev/vt%02d", xf86Info.vtno);
+	else
+#endif
+	{
+		if (!xf86LinearVidMem())
+			FatalError("xf86MapVidMem:  no aperture device\n");
 
-	if (!xf86LinearVidMem())
-		FatalError("xf86MapVidMem:  no aperture device\n");
+		strcpy(vtname, apertureDevName);
+	}
 
-	fd = open(apertureDevName,
-		  (Flags & VIDMEM_READONLY) ? O_RDONLY : O_RDWR);
+	fd = open(vtname, (Flags & VIDMEM_READONLY) ? O_RDONLY : O_RDWR);
 	if (fd < 0)
 		FatalError("xf86MapVidMem: failed to open %s (%s)\n",
-			   apertureDevName, strerror(errno));
+			   vtname, strerror(errno));
 
 	base = mmap(NULL, Size,
 		    (Flags & VIDMEM_READONLY) ?
diff --git a/hw/xfree86/os-support/sysv/sysv_init.c b/hw/xfree86/os-support/sysv/sysv_init.c
index 1e9166712..d8dea0f16 100644
--- a/hw/xfree86/os-support/sysv/sysv_init.c
+++ b/hw/xfree86/os-support/sysv/sysv_init.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sysv/sysv_init.c,v 3.5 1998/07/25 16:57:08 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sysv/sysv_init.c,v 3.4.4.3 1998/07/18 17:53:57 dawes Exp $ */
 /*
  * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany
  * Copyright 1993 by David Wexelblat <dwex@goblin.org>
diff --git a/hw/xfree86/os-support/sysv/sysv_io.c b/hw/xfree86/os-support/sysv/sysv_io.c
index d48efd76e..c110f452e 100644
--- a/hw/xfree86/os-support/sysv/sysv_io.c
+++ b/hw/xfree86/os-support/sysv/sysv_io.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sysv/sysv_io.c,v 3.11 2003/02/17 15:12:00 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sysv/sysv_io.c,v 3.10 2002/10/11 01:40:37 dawes Exp $ */
 /*
  * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany
  * Copyright 1993 by David Dawes <dawes@xfree86.org>
diff --git a/hw/xfree86/os-support/sysv/sysv_video.c b/hw/xfree86/os-support/sysv/sysv_video.c
index c0460f524..2f7e4e723 100644
--- a/hw/xfree86/os-support/sysv/sysv_video.c
+++ b/hw/xfree86/os-support/sysv/sysv_video.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sysv/sysv_video.c,v 3.21 2003/03/14 13:46:08 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sysv/sysv_video.c,v 3.20tsi Exp $ */
 /*
  * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany
  * Copyright 1993 by David Wexelblat <dwex@goblin.org>
diff --git a/hw/xfree86/os-support/sysv/xqueue.c b/hw/xfree86/os-support/sysv/xqueue.c
index 0478ee65e..b8d8a9086 100644
--- a/hw/xfree86/os-support/sysv/xqueue.c
+++ b/hw/xfree86/os-support/sysv/xqueue.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sysv/xqueue.c,v 3.20 2001/03/06 18:20:31 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sysv/xqueue.c,v 3.19 2000/02/10 22:33:45 dawes Exp $ */
 /*
  * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany
  * Copyright 1993-1999 by The XFree86 Project, Inc.
diff --git a/hw/xfree86/os-support/sysv/xqueue.h b/hw/xfree86/os-support/sysv/xqueue.h
index 2085a3e70..45df28275 100644
--- a/hw/xfree86/os-support/sysv/xqueue.h
+++ b/hw/xfree86/os-support/sysv/xqueue.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sysv/xqueue.h,v 1.1 1999/05/22 08:40:18 dawes Exp $ */
+/* $XFree86$ */
 
 #ifndef _XF86_XQUEUE_H_
 #define _XF86_XQUEUE_H_
diff --git a/hw/xfree86/os-support/xf86OSKbd.h b/hw/xfree86/os-support/xf86OSKbd.h
index 917b11526..344f7e901 100644
--- a/hw/xfree86/os-support/xf86OSKbd.h
+++ b/hw/xfree86/os-support/xf86OSKbd.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/xf86OSKbd.h,v 1.6 2003/11/03 05:11:51 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/xf86OSKbd.h,v 1.5tsi Exp $ */
 /*
  * Copyright (c) 2002-2003 by The XFree86 Project, Inc.
  *
diff --git a/hw/xfree86/os-support/xf86_OSlib.h b/hw/xfree86/os-support/xf86_OSlib.h
index 4d3205eb4..4df2d502a 100644
--- a/hw/xfree86/os-support/xf86_OSlib.h
+++ b/hw/xfree86/os-support/xf86_OSlib.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/xf86_OSlib.h,v 3.95 2003/11/17 22:20:40 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/xf86_OSlib.h,v 3.94 2003/11/03 05:11:51 tsi Exp $ */
 /*
  * Copyright 1990, 1991 by Thomas Roell, Dinkelscherben, Germany
  * Copyright 1992 by David Dawes <dawes@XFree86.org>
diff --git a/hw/xfree86/os-support/xf86_OSproc.h b/hw/xfree86/os-support/xf86_OSproc.h
index 09d3f2861..b73270236 100644
--- a/hw/xfree86/os-support/xf86_OSproc.h
+++ b/hw/xfree86/os-support/xf86_OSproc.h
@@ -64,7 +64,7 @@
  *
  */
 
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/xf86_OSproc.h,v 3.57 2003/10/07 23:14:54 herrb Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/xf86_OSproc.h,v 3.56 2003/08/24 17:37:03 dawes Exp $ */
 
 #ifndef _XF86_OSPROC_H
 #define _XF86_OSPROC_H
diff --git a/hw/xfree86/os-support/xf86_libc.h b/hw/xfree86/os-support/xf86_libc.h
index 35e0ca8c7..6eb4573f4 100644
--- a/hw/xfree86/os-support/xf86_libc.h
+++ b/hw/xfree86/os-support/xf86_libc.h
@@ -1,3 +1,4 @@
+/* $XdotOrg: xc/programs/Xserver/hw/xfree86/os-support/xf86_libc.h,v 1.1.4.2 2003/12/06 13:24:26 kaleb Exp $ */
 /* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/xf86_libc.h,v 3.63 2003/12/08 21:46:55 alanh Exp $ */
 /*
  * Copyright (c) 1997-2003 by The XFree86 Project, Inc.
diff --git a/hw/xfree86/parser/DRI.c b/hw/xfree86/parser/DRI.c
index fa22e220d..695c16505 100644
--- a/hw/xfree86/parser/DRI.c
+++ b/hw/xfree86/parser/DRI.c
@@ -24,7 +24,7 @@
  * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  * 
- * $XFree86: xc/programs/Xserver/hw/xfree86/parser/DRI.c,v 1.14 2003/01/04 20:20:22 paulo Exp $
+ * $XFree86: xc/programs/Xserver/hw/xfree86/parser/DRI.c,v 1.13 2003/01/01 19:22:20 paulo Exp $
  * 
  */
 
diff --git a/hw/xfree86/parser/Monitor.c b/hw/xfree86/parser/Monitor.c
index 942b199d2..faafa1a7f 100644
--- a/hw/xfree86/parser/Monitor.c
+++ b/hw/xfree86/parser/Monitor.c
@@ -671,15 +671,17 @@ xf86printMonitorSection (FILE * cf, XF86ConfMonitorPtr ptr)
 			fprintf (cf, "\tDisplaySize  %d\t%d\n",
 					 ptr->mon_width,
 					 ptr->mon_height);
+		if ( ptr->mon_n_hsync || ptr->mon_n_vrefresh )
+		    fprintf(cf," ### Uncomment if you don't want to default to DDC:\n");
 		for (i = 0; i < ptr->mon_n_hsync; i++)
 		{
-			fprintf (cf, "\tHorizSync    %2.1f - %2.1f\n",
+			fprintf (cf, "#\tHorizSync    %2.1f - %2.1f\n",
 					 ptr->mon_hsync[i].lo,
 					 ptr->mon_hsync[i].hi);
 		}
 		for (i = 0; i < ptr->mon_n_vrefresh; i++)
 		{
-			fprintf (cf, "\tVertRefresh  %2.1f - %2.1f\n",
+			fprintf (cf, "#\tVertRefresh  %2.1f - %2.1f\n",
 					 ptr->mon_vrefresh[i].lo,
 					 ptr->mon_vrefresh[i].hi);
 		}
diff --git a/hw/xfree86/parser/cpconfig.c b/hw/xfree86/parser/cpconfig.c
index 3cd3749ed..e2dbb3e91 100644
--- a/hw/xfree86/parser/cpconfig.c
+++ b/hw/xfree86/parser/cpconfig.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/parser/cpconfig.c,v 1.7 2003/02/17 16:08:29 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/parser/cpconfig.c,v 1.6 2000/10/20 14:59:03 alanh Exp $ */
 /* 
  * 
  * Copyright (c) 1997  Metro Link Incorporated
diff --git a/hw/xfree86/parser/scan.c b/hw/xfree86/parser/scan.c
index 4dc2e0dd1..d97954d2e 100644
--- a/hw/xfree86/parser/scan.c
+++ b/hw/xfree86/parser/scan.c
@@ -440,11 +440,11 @@ xf86pathIsSafe(const char *path)
  *    %A    cmdline argument as an absolute path (must be absolute to match)
  *    %R    cmdline argument as a relative path
  *    %S    cmdline argument as a "safe" path (relative, and no ".." elements)
- *    %X    default config file name ("XF86Config")
+ *    %X    default config file name ("xorg.conf")
  *    %H    hostname
- *    %E    config file environment ($XF86CONFIG) as an absolute path
- *    %F    config file environment ($XF86CONFIG) as a relative path
- *    %G    config file environment ($XF86CONFIG) as a safe path
+ *    %E    config file environment ($XORGCONFIG) as an absolute path
+ *    %F    config file environment ($XORGCONFIG) as a relative path
+ *    %G    config file environment ($XORGCONFIG) as a safe path
  *    %D    $HOME
  *    %P    projroot
  *    %M    major version number
@@ -453,14 +453,15 @@ xf86pathIsSafe(const char *path)
  */
 
 #ifndef XCONFIGFILE
-#define XCONFIGFILE	"XF86Config"
+#define XCONFIGFILE	"xorg.conf"
 #endif
 #ifndef PROJECTROOT
 #define PROJECTROOT	"/usr/X11R6"
 #endif
 #ifndef XCONFENV
-#define XCONFENV	"XF86CONFIG"
+#define XCONFENV	"XORGCONFIG"
 #endif
+#define XFREE86CFGFILE "XF86Config"
 #ifndef XF86_VERSION_MAJOR
 #ifdef XVERSION
 #if XVERSION > 40000000
@@ -495,7 +496,7 @@ xf86pathIsSafe(const char *path)
 
 static char *
 DoSubstitution(const char *template, const char *cmdline, const char *projroot,
-				int *cmdlineUsed, int *envUsed)
+				int *cmdlineUsed, int *envUsed, char *XConfigFile)
 {
 	char *result;
 	int i, l;
@@ -547,7 +548,7 @@ DoSubstitution(const char *template, const char *cmdline, const char *projroot,
 					BAIL_OUT;
 				break;
 			case 'X':
-				APPEND_STR(XCONFIGFILE);
+				APPEND_STR(XConfigFile);
 				break;
 			case 'H':
 				if (!hostname) {
@@ -701,7 +702,8 @@ xf86openConfigFile(const char *path, const char *cmdline, const char *projroot)
 	/* First, search for a config file. */
 	while (template && !configFile) {
 		if ((configPath = DoSubstitution(template, cmdline, projroot,
-										 &cmdlineUsed, NULL))) {
+						 &cmdlineUsed, NULL,
+						 XCONFIGFILE))) {
 			if ((configFile = fopen(configPath, "r")) != 0) {
 				if (cmdline && !cmdlineUsed) {
 					fclose(configFile);
@@ -715,6 +717,31 @@ xf86openConfigFile(const char *path, const char *cmdline, const char *projroot)
 		}
 		template = strtok(NULL, ",");
 	}
+	
+	/* Then search for fallback */
+	if (!configFile) {
+	    strcpy(pathcopy, path);
+	    template = strtok(pathcopy, ",");
+
+	    while (template && !configFile) {
+		if ((configPath = DoSubstitution(template, cmdline, projroot,
+						 &cmdlineUsed, NULL,
+						 XFREE86CFGFILE))) {
+		    if ((configFile = fopen(configPath, "r")) != 0) {
+			if (cmdline && !cmdlineUsed) {
+			    fclose(configFile);
+			    configFile = NULL;
+			}
+		    }
+		}
+		if (configPath && !configFile) {
+		    xf86conffree(configPath);
+		    configPath = NULL;
+		}
+		template = strtok(NULL, ",");
+	    }
+	}
+	
 	xf86conffree(pathcopy);
 	if (!configFile) {
 
diff --git a/hw/xfree86/rac/xf86RAC.c b/hw/xfree86/rac/xf86RAC.c
index d8d5332f9..2b8cf7171 100644
--- a/hw/xfree86/rac/xf86RAC.c
+++ b/hw/xfree86/rac/xf86RAC.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/rac/xf86RAC.c,v 1.7 2002/09/16 18:06:18 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/rac/xf86RAC.c,v 1.5 1999/06/12 17:30:21 dawes Exp $ */
 
 #include "misc.h"
 #include "xf86.h"
diff --git a/hw/xfree86/rac/xf86RAC.h b/hw/xfree86/rac/xf86RAC.h
index c704bd75e..783d79b93 100644
--- a/hw/xfree86/rac/xf86RAC.h
+++ b/hw/xfree86/rac/xf86RAC.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/rac/xf86RAC.h,v 1.3 1999/06/12 07:19:05 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/rac/xf86RAC.h,v 1.2 1999/05/15 12:10:33 dawes Exp $ */
 
 #ifndef __XF86RAC_H
 #define __XF86RAC_H 1
diff --git a/hw/xfree86/rac/xf86RACmodule.c b/hw/xfree86/rac/xf86RACmodule.c
index f0a960a66..83c60e3fd 100644
--- a/hw/xfree86/rac/xf86RACmodule.c
+++ b/hw/xfree86/rac/xf86RACmodule.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/rac/xf86RACmodule.c,v 1.4 1999/01/26 05:54:14 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/rac/xf86RACmodule.c,v 1.3 1999/01/17 10:54:12 dawes Exp $ */
 
 #include "xf86Module.h"
 
@@ -8,7 +8,7 @@ static XF86ModuleVersionInfo racVersRec =
     MODULEVENDORSTRING,
     MODINFOSTRING1,
     MODINFOSTRING2,
-    XF86_VERSION_CURRENT,
+    XORG_VERSION_CURRENT,
     1, 0, 0,
     ABI_CLASS_VIDEODRV,		/* requires the video driver ABI */
     ABI_VIDEODRV_VERSION,
diff --git a/hw/xfree86/ramdac/BT.c b/hw/xfree86/ramdac/BT.c
index 3b42ecb13..440b0021b 100644
--- a/hw/xfree86/ramdac/BT.c
+++ b/hw/xfree86/ramdac/BT.c
@@ -23,7 +23,7 @@
  *
  * BT RAMDAC routines.
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/BT.c,v 1.8 2003/09/24 02:43:35 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/BT.c,v 1.7 2000/10/20 12:57:27 alanh Exp $ */
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
diff --git a/hw/xfree86/ramdac/BT.h b/hw/xfree86/ramdac/BT.h
index ea1180285..c52b5a745 100644
--- a/hw/xfree86/ramdac/BT.h
+++ b/hw/xfree86/ramdac/BT.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/BT.h,v 1.3 1998/08/20 08:56:03 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/BT.h,v 1.2 1998/07/25 16:57:17 dawes Exp $ */
 
 #include "xf86RamDac.h"
 
diff --git a/hw/xfree86/ramdac/BTPriv.h b/hw/xfree86/ramdac/BTPriv.h
index bea623b78..67469d2ed 100644
--- a/hw/xfree86/ramdac/BTPriv.h
+++ b/hw/xfree86/ramdac/BTPriv.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/BTPriv.h,v 1.2 1998/07/25 16:57:18 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/BTPriv.h,v 1.1.2.1 1998/07/18 17:54:00 dawes Exp $ */
 
 #include "BT.h"
 
diff --git a/hw/xfree86/ramdac/CURSOR.NOTES b/hw/xfree86/ramdac/CURSOR.NOTES
index 3e901e380..726e2edc1 100644
--- a/hw/xfree86/ramdac/CURSOR.NOTES
+++ b/hw/xfree86/ramdac/CURSOR.NOTES
@@ -188,4 +188,4 @@ Flags
 
 
 
-$XFree86: xc/programs/Xserver/hw/xfree86/ramdac/CURSOR.NOTES,v 1.5 2003/02/13 20:28:41 tsi Exp $
+$XFree86: xc/programs/Xserver/hw/xfree86/ramdac/CURSOR.NOTES,v 1.4tsi Exp $
diff --git a/hw/xfree86/ramdac/IBM.c b/hw/xfree86/ramdac/IBM.c
index 34562e297..69207c2e2 100644
--- a/hw/xfree86/ramdac/IBM.c
+++ b/hw/xfree86/ramdac/IBM.c
@@ -23,7 +23,7 @@
  *
  * IBM RAMDAC routines.
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/IBM.c,v 1.13 2003/09/24 02:43:35 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/IBM.c,v 1.12 2003/02/17 16:08:29 dawes Exp $ */
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
diff --git a/hw/xfree86/ramdac/IBM.h b/hw/xfree86/ramdac/IBM.h
index 546296630..00d039031 100644
--- a/hw/xfree86/ramdac/IBM.h
+++ b/hw/xfree86/ramdac/IBM.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/IBM.h,v 1.8 2001/10/28 03:34:03 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/IBM.h,v 1.7 1999/02/12 22:52:11 hohndel Exp $ */
 
 #include <xf86RamDac.h>
 
diff --git a/hw/xfree86/ramdac/IBMPriv.h b/hw/xfree86/ramdac/IBMPriv.h
index 6fecb7705..1a2bf2065 100644
--- a/hw/xfree86/ramdac/IBMPriv.h
+++ b/hw/xfree86/ramdac/IBMPriv.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/IBMPriv.h,v 1.2 1998/07/25 16:57:19 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/IBMPriv.h,v 1.1.2.2 1998/07/18 17:54:01 dawes Exp $ */
 
 #include "IBM.h"
 
diff --git a/hw/xfree86/ramdac/TI.c b/hw/xfree86/ramdac/TI.c
index 5e466b707..ce6dd9a04 100644
--- a/hw/xfree86/ramdac/TI.c
+++ b/hw/xfree86/ramdac/TI.c
@@ -24,7 +24,7 @@
  * Modified from IBM.c to support TI RAMDAC routines 
  *   by Jens Owen, <jens@tungstengraphics.com>.
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/TI.c,v 1.8 2003/09/24 02:43:35 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/TI.c,v 1.7 2003/02/17 16:08:29 dawes Exp $ */
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
diff --git a/hw/xfree86/ramdac/TI.h b/hw/xfree86/ramdac/TI.h
index 9451f814c..f87ebd13f 100644
--- a/hw/xfree86/ramdac/TI.h
+++ b/hw/xfree86/ramdac/TI.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/TI.h,v 1.5 2003/02/17 16:08:29 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/TI.h,v 1.4 2000/05/02 21:04:46 alanh Exp $ */
 
 #include <xf86RamDac.h>
 
diff --git a/hw/xfree86/ramdac/TIPriv.h b/hw/xfree86/ramdac/TIPriv.h
index d81552764..81fe844a1 100644
--- a/hw/xfree86/ramdac/TIPriv.h
+++ b/hw/xfree86/ramdac/TIPriv.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/TIPriv.h,v 1.2 2000/03/21 21:15:28 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/TIPriv.h,v 1.2 1998/07/25 16:57:19 dawes Exp $ */
 
 #include "TI.h"
 
diff --git a/hw/xfree86/ramdac/xf86Cursor.c b/hw/xfree86/ramdac/xf86Cursor.c
index 49379e934..eedb00377 100644
--- a/hw/xfree86/ramdac/xf86Cursor.c
+++ b/hw/xfree86/ramdac/xf86Cursor.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/xf86Cursor.c,v 1.20 2003/02/24 20:43:54 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/xf86Cursor.c,v 1.19tsi Exp $ */
 
 #include "xf86.h"
 #include "xf86_ansic.h"
diff --git a/hw/xfree86/ramdac/xf86Cursor.h b/hw/xfree86/ramdac/xf86Cursor.h
index 5e5df46f3..ac88f4e5f 100644
--- a/hw/xfree86/ramdac/xf86Cursor.h
+++ b/hw/xfree86/ramdac/xf86Cursor.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/xf86Cursor.h,v 1.11 2003/02/15 03:14:47 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/xf86Cursor.h,v 1.10tsi Exp $ */
 
 #ifndef _XF86CURSOR_H
 #define _XF86CURSOR_H
diff --git a/hw/xfree86/ramdac/xf86CursorPriv.h b/hw/xfree86/ramdac/xf86CursorPriv.h
index 5a6ab118a..603f8ecd0 100644
--- a/hw/xfree86/ramdac/xf86CursorPriv.h
+++ b/hw/xfree86/ramdac/xf86CursorPriv.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/xf86CursorPriv.h,v 1.5 2003/02/15 03:14:47 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/xf86CursorPriv.h,v 1.4tsi Exp $ */
 
 #ifndef _XF86CURSORPRIV_H
 #define _XF86CURSORPRIV_H
diff --git a/hw/xfree86/ramdac/xf86HWCurs.c b/hw/xfree86/ramdac/xf86HWCurs.c
index 41b623a6a..ad9977d67 100644
--- a/hw/xfree86/ramdac/xf86HWCurs.c
+++ b/hw/xfree86/ramdac/xf86HWCurs.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/xf86HWCurs.c,v 1.13 2003/03/04 21:21:15 mvojkovi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/xf86HWCurs.c,v 1.12 2003/02/13 20:28:41 tsi Exp $ */
 
 #include "misc.h"
 #include "xf86.h"
diff --git a/hw/xfree86/ramdac/xf86RamDac.c b/hw/xfree86/ramdac/xf86RamDac.c
index b45be814d..7821e591c 100644
--- a/hw/xfree86/ramdac/xf86RamDac.c
+++ b/hw/xfree86/ramdac/xf86RamDac.c
@@ -23,7 +23,7 @@
  *
  * Generic RAMDAC access routines.
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/xf86RamDac.c,v 1.7 2003/11/03 05:11:53 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/xf86RamDac.c,v 1.6tsi Exp $ */
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
diff --git a/hw/xfree86/ramdac/xf86RamDac.h b/hw/xfree86/ramdac/xf86RamDac.h
index 626a8b2b9..319a7b577 100644
--- a/hw/xfree86/ramdac/xf86RamDac.h
+++ b/hw/xfree86/ramdac/xf86RamDac.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/xf86RamDac.h,v 1.11 2000/03/21 21:15:28 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/xf86RamDac.h,v 1.9 1999/03/28 15:33:02 dawes Exp $ */
 
 #ifndef _XF86RAMDAC_H
 #define _XF86RAMDAC_H 1
diff --git a/hw/xfree86/ramdac/xf86RamDacCmap.c b/hw/xfree86/ramdac/xf86RamDacCmap.c
index 3b01081df..14cda093d 100644
--- a/hw/xfree86/ramdac/xf86RamDacCmap.c
+++ b/hw/xfree86/ramdac/xf86RamDacCmap.c
@@ -23,7 +23,7 @@
  *
  * Generic RAMDAC access to colormaps.
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/xf86RamDacCmap.c,v 1.7 2000/07/26 01:52:24 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/xf86RamDacCmap.c,v 1.6 2000/03/21 21:15:28 alanh Exp $ */
 
 #include "X.h"
 #include "Xproto.h"
diff --git a/hw/xfree86/ramdac/xf86RamDacMod.c b/hw/xfree86/ramdac/xf86RamDacMod.c
index 754949606..0fe5ce6aa 100644
--- a/hw/xfree86/ramdac/xf86RamDacMod.c
+++ b/hw/xfree86/ramdac/xf86RamDacMod.c
@@ -23,7 +23,7 @@
  *
  * Generic RAMDAC module.
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/xf86RamDacMod.c,v 1.6 1999/01/26 05:54:18 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/xf86RamDacMod.c,v 1.5 1999/01/17 10:54:13 dawes Exp $ */
 
 #include "xf86Module.h"
 
@@ -33,7 +33,7 @@ static XF86ModuleVersionInfo VersRec = {
 	MODULEVENDORSTRING,
 	MODINFOSTRING1,
 	MODINFOSTRING2,
-	XF86_VERSION_CURRENT,
+	XORG_VERSION_CURRENT,
 	0, 1, 0,
 	ABI_CLASS_VIDEODRV,
 	ABI_VIDEODRV_VERSION,
diff --git a/hw/xfree86/ramdac/xf86RamDacPriv.h b/hw/xfree86/ramdac/xf86RamDacPriv.h
index f1eeb3a7d..45680a05b 100644
--- a/hw/xfree86/ramdac/xf86RamDacPriv.h
+++ b/hw/xfree86/ramdac/xf86RamDacPriv.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/xf86RamDacPriv.h,v 1.4 1999/07/18 03:27:02 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/xf86RamDacPriv.h,v 1.3 1998/12/06 06:08:37 dawes Exp $ */
 
 #include "xf86RamDac.h"
 #include "xf86cmap.h"
diff --git a/hw/xfree86/scanpci/extrapci.ids b/hw/xfree86/scanpci/extrapci.ids
index 2f346978b..bfde79503 100644
--- a/hw/xfree86/scanpci/extrapci.ids
+++ b/hw/xfree86/scanpci/extrapci.ids
@@ -14,7 +14,8 @@
 #	changes/additions that aren't XFree86-specific to the pciids
 #	project (http://pciids.sf.net/).
 #
-#	$XFree86: xc/programs/Xserver/hw/xfree86/etc/extrapci.ids,v 1.12 2003/12/18 16:29:18 dawes Exp $
+#	$XdotOrg: xc/programs/Xserver/hw/xfree86/etc/extrapci.ids,v 1.12 2003/12/18 16:29:18 dawes Exp $
+#	$XFree86: xc/programs/Xserver/hw/xfree86/etc/extrapci.ids,v 1.11 2003/12/18 16:22:27 dawes Exp $
 #
 
 # Vendors, devices and subsystems. Please keep sorted.
diff --git a/hw/xfree86/scanpci/pciid2c.pl b/hw/xfree86/scanpci/pciid2c.pl
index 71586d421..638c49953 100644
--- a/hw/xfree86/scanpci/pciid2c.pl
+++ b/hw/xfree86/scanpci/pciid2c.pl
@@ -5,7 +5,7 @@
 #
 # It should be run as:
 #
-#   perl pciid2c.pl ../common/xf86PciInfo.h < pci.ids > xf86PciIds.h
+#   perl pciid2c.pl ../common/xf86PciInfo.h < pci.ids > xf86PciStdIds.h
 #
 #
 # Copyright © 2002 by The XFree86 Project, Inc.
diff --git a/hw/xfree86/scanpci/xf86PciStdIds.h b/hw/xfree86/scanpci/xf86PciStdIds.h
index 48f1cbc1d..51c942059 100644
--- a/hw/xfree86/scanpci/xf86PciStdIds.h
+++ b/hw/xfree86/scanpci/xf86PciStdIds.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/scanpci/xf86PciStdIds.h,v 1.15 2003/12/18 16:32:45 dawes Exp $ */
+/* $XFree86$ */
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED -- DO NOT EDIT
@@ -39,11 +39,19 @@ static const char pci_vendor_0059[] = "Tiger Jet Network Inc. (Wrong ID)";
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const char pci_vendor_0070[] = "Hauppauge computer works Inc.";
+static const char pci_device_0070_4000[] = "WinTV PVR-350";
+static const char pci_device_0070_4001[] = "WinTV PVR-250 (v1)";
+static const char pci_device_0070_4009[] = "WinTV PVR-250";
+static const char pci_device_0070_4801[] = "WinTV PVR-250 MCE";
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const char pci_vendor_0100[] = "Ncipher Corp Ltd";
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+static const char pci_vendor_021b[] = "Compaq Computer Corporation";
+static const char pci_device_021b_8139[] = "HNE-300 (RealTek RTL8139c) [iPaq Networking]";
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 static const char pci_vendor_0675[] = "Dynalink";
 static const char pci_device_0675_1700[] = "IS64PH ISDN Adapter";
 static const char pci_device_0675_1702[] = "IS64PH ISDN Adapter";
@@ -61,8 +69,31 @@ static const char pci_vendor_0a89[] = "BREA Technologies Inc";
 static const char pci_vendor_0e11[] = "Compaq Computer Corporation";
 static const char pci_device_0e11_0001[] = "PCI to EISA Bridge";
 static const char pci_device_0e11_0002[] = "PCI to ISA Bridge";
+static const char pci_device_0e11_0046[] = "Smart Array 64xx";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_0e11_0046_0e11_409a[] = "Smart Array 641";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_0e11_0046_0e11_409b[] = "Smart Array 642";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_0e11_0046_0e11_409c[] = "Smart Array 6400";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_0e11_0046_0e11_409d[] = "Smart Array 6400 EM";
+#endif
 static const char pci_device_0e11_0049[] = "NC7132 Gigabit Upgrade Module";
 static const char pci_device_0e11_004a[] = "NC6136 Gigabit Server Adapter";
+static const char pci_device_0e11_007c[] = "NC7770 1000BaseTX";
+static const char pci_device_0e11_007d[] = "NC6770 1000BaseTX";
+static const char pci_device_0e11_0085[] = "NC7780 1000BaseTX";
+static const char pci_device_0e11_00bb[] = "NC7760";
+static const char pci_device_0e11_00ca[] = "NC7771";
+static const char pci_device_0e11_00cb[] = "NC7781";
+static const char pci_device_0e11_00cf[] = "NC7772";
+static const char pci_device_0e11_00d0[] = "NC7782";
+static const char pci_device_0e11_00d1[] = "NC7783";
+static const char pci_device_0e11_00e3[] = "NC7761";
 static const char pci_device_0e11_0508[] = "Netelligent 4/16 Token Ring";
 static const char pci_device_0e11_1000[] = "Triflex/Pentium Bridge, Model 1000";
 static const char pci_device_0e11_2000[] = "Triflex/Pentium Bridge, Model 2000";
@@ -83,7 +114,7 @@ static const char pci_subsys_0e11_a0f7_8086_002a[] = "PCI Hotplug Controller A";
 static const char pci_subsys_0e11_a0f7_8086_002b[] = "PCI Hotplug Controller B";
 #endif
 static const char pci_device_0e11_a0f8[] = "ZFMicro Chipset USB";
-static const char pci_device_0e11_a0fc[] = "Fibre Channel Host Controller";
+static const char pci_device_0e11_a0fc[] = "FibreChannel HBA Tachyon";
 static const char pci_device_0e11_ae10[] = "Smart-2/P RAID Controller";
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_0e11_ae10_0e11_4030[] = "Smart-2/P Array Controller";
@@ -101,21 +132,21 @@ static const char pci_device_0e11_ae29[] = "MIS-L";
 static const char pci_device_0e11_ae2a[] = "MPC";
 static const char pci_device_0e11_ae2b[] = "MIS-E";
 static const char pci_device_0e11_ae31[] = "System Management Controller";
-static const char pci_device_0e11_ae32[] = "Netelligent 10/100";
+static const char pci_device_0e11_ae32[] = "Netelligent 10/100 TX PCI UTP";
 static const char pci_device_0e11_ae33[] = "Triflex Dual EIDE Controller";
-static const char pci_device_0e11_ae34[] = "Netelligent 10";
+static const char pci_device_0e11_ae34[] = "Netelligent 10 T PCI UTP";
 static const char pci_device_0e11_ae35[] = "Integrated NetFlex-3/P";
-static const char pci_device_0e11_ae40[] = "Netelligent 10/100 Dual";
-static const char pci_device_0e11_ae43[] = "ProLiant Integrated Netelligent 10/100";
+static const char pci_device_0e11_ae40[] = "Netelligent Dual 10/100 TX PCI UTP";
+static const char pci_device_0e11_ae43[] = "Netelligent Integrated 10/100 TX UTP";
 static const char pci_device_0e11_ae69[] = "CETUS-L";
 static const char pci_device_0e11_ae6c[] = "Northstar";
 static const char pci_device_0e11_ae6d[] = "NorthStar CPU to PCI Bridge";
-static const char pci_device_0e11_b011[] = "Integrated Netelligent 10/100";
-static const char pci_device_0e11_b012[] = "Netelligent 10 T/2";
+static const char pci_device_0e11_b011[] = "Netelligent 10/100 TX Embedded UTP";
+static const char pci_device_0e11_b012[] = "Netelligent 10 T/2 PCI UTP/Coax";
 static const char pci_device_0e11_b01e[] = "NC3120 Fast Ethernet NIC";
 static const char pci_device_0e11_b01f[] = "NC3122 Fast Ethernet NIC";
 static const char pci_device_0e11_b02f[] = "NC1120 Ethernet NIC";
-static const char pci_device_0e11_b030[] = "Netelligent WS 5100";
+static const char pci_device_0e11_b030[] = "Netelligent 10/100 TX UTP";
 static const char pci_device_0e11_b04a[] = "10/100 TX PCI Intel WOL UTP Controller";
 static const char pci_device_0e11_b060[] = "Smart Array 5300 Controller";
 static const char pci_device_0e11_b0c6[] = "NC3161 Fast Ethernet NIC";
@@ -133,6 +164,15 @@ static const char pci_device_0e11_b144[] = "NC3123 Fast Ethernet NIC";
 static const char pci_device_0e11_b163[] = "NC3134 Fast Ethernet NIC";
 static const char pci_device_0e11_b164[] = "NC3165 Fast Ethernet Upgrade Module";
 static const char pci_device_0e11_b178[] = "Smart Array 5i/532";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_0e11_b178_0e11_4080[] = "Smart Array 5i";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_0e11_b178_0e11_4082[] = "Smart Array 532";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_0e11_b178_0e11_4083[] = "Smart Array 5312";
+#endif
 static const char pci_device_0e11_b1a4[] = "NC7131 Gigabit Server Adapter";
 static const char pci_device_0e11_f130[] = "NetFlex-3/P ThunderLAN 1.0";
 static const char pci_device_0e11_f150[] = "NetFlex-3/P ThunderLAN 2.3";
@@ -207,10 +247,30 @@ static const char pci_subsys_1000_0021_4c53_1310[] = "P017 mezzanine (64-bit PMC
 static const char pci_device_1000_0030[] = "53c1030 PCI-X Fusion-MPT Dual Ultra320 SCSI";
 #endif
 #ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1000_0030_1028_0123[] = "PowerEdge 2600";
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1000_0030_1028_014a[] = "PowerEdge 1750";
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
+#endif
+#ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_1000_0030_1028_1010[] = "LSI U320 SCSI Controller";
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
-static const char pci_device_1000_0040[] = "53c1035";
+static const char pci_device_1000_0031[] = "53c1030ZC PCI-X Fusion-MPT Dual Ultra320 SCSI";
+static const char pci_device_1000_0032[] = "53c1035 PCI-X Fusion-MPT Dual Ultra320 SCSI";
+static const char pci_device_1000_0033[] = "1030ZC_53c1035 PCI-X Fusion-MPT Dual Ultra320 SCSI";
+static const char pci_device_1000_0040[] = "53c1035 PCI-X Fusion-MPT Dual Ultra320 SCSI";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1000_0040_1000_0033[] = "MegaRAID SCSI 320-2XR";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1000_0040_1000_0066[] = "MegaRAID SCSI 320-2XRWS";
+#endif
+static const char pci_device_1000_0041[] = "53C1035ZC PCI-X Fusion-MPT Dual Ultra320 SCSI";
 static const char pci_device_1000_008f[] = "53c875J";
 #endif
 #ifdef INIT_SUBSYS_INFO
@@ -222,14 +282,40 @@ static const char pci_subsys_1000_008f_1092_8000[] = "FirePort 40 SCSI Controlle
 static const char pci_subsys_1000_008f_1092_8760[] = "FirePort 40 Dual SCSI Host Adapter";
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
-static const char pci_device_1000_0621[] = "FC909";
-static const char pci_device_1000_0622[] = "FC929";
+static const char pci_device_1000_0407[] = "MegaRAID";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1000_0407_1000_0530[] = "MegaRAID 530 SCSI 320-0X RAID Controller";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1000_0407_1000_0531[] = "MegaRAID 531 SCSI 320-4X RAID Controller";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1000_0407_1000_0532[] = "MegaRAID 532 SCSI 320-2X RAID Controller";
+#endif
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1000_0407_1028_0533[] = "PowerEgde Expandable RAID Controller 4/QC";
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1000_0407_8086_0532[] = "Storage RAID Controller SRCU42X";
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
+static const char pci_device_1000_0621[] = "FC909 Fibre Channel Adapter";
+static const char pci_device_1000_0622[] = "FC929 Fibre Channel Adapter";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1000_0622_1000_1020[] = "44929 O Dual Fibre Channel card";
+#endif
 static const char pci_device_1000_0623[] = "FC929 LAN";
-static const char pci_device_1000_0624[] = "FC919";
+static const char pci_device_1000_0624[] = "FC919 Fibre Channel Adapter";
 static const char pci_device_1000_0625[] = "FC919 LAN";
-static const char pci_device_1000_0626[] = "FC929X";
+static const char pci_device_1000_0626[] = "FC929X Fibre Channel Adapter";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1000_0626_1000_1010[] = "7202-XP-LC Dual Fibre Channel card";
+#endif
 static const char pci_device_1000_0627[] = "FC929X LAN";
-static const char pci_device_1000_0628[] = "FC919X";
+static const char pci_device_1000_0628[] = "FC919X Fibre Channel Adapter";
 static const char pci_device_1000_0629[] = "FC919X LAN";
 static const char pci_device_1000_0701[] = "83C885 NT50 DigitalScape Fast Ethernet";
 static const char pci_device_1000_0702[] = "Yellowfin G-NIC gigabit ethernet";
@@ -238,15 +324,33 @@ static const char pci_subsys_1000_0702_1318_0000[] = "PEI100X";
 #endif
 static const char pci_device_1000_0901[] = "61C102";
 static const char pci_device_1000_1000[] = "63C815";
-static const char pci_device_1000_1960[] = "PowerEdge Expandable RAID Controller 4";
+static const char pci_device_1000_1960[] = "MegaRAID";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1000_1960_1000_0518[] = "MegaRAID 518 SCSI 320-2 Controller";
 #endif
 #ifdef INIT_SUBSYS_INFO
-static const char pci_subsys_1000_1960_1028_0518[] = "PowerEdge Expandable RAID Controller 4/DC";
+static const char pci_subsys_1000_1960_1000_0520[] = "MegaRAID 520 SCSI 320-1 Controller";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1000_1960_1000_0522[] = "MegaRAID 522 i4133 RAID Controller";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1000_1960_1000_0523[] = "MegaRAID SATA 150-6 RAID Controller";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1000_1960_1000_4523[] = "MegaRAID SATA 150-4 RAID Controller";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1000_1960_1000_a520[] = "MegaRAID ZCR SCSI 320-0 Controller";
+#endif
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1000_1960_1028_0518[] = "MegaRAID 518 DELL PERC 4/DC RAID Controller";
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
 #endif
 #ifdef INIT_SUBSYS_INFO
-static const char pci_subsys_1000_1960_1028_0520[] = "PowerEdge Expandable RAID Controller 4/SC";
+static const char pci_subsys_1000_1960_1028_0520[] = "MegaRAID 520 DELL PERC 4/SC RAID Controller";
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
 #endif
@@ -269,18 +373,62 @@ static const char pci_device_1001_9100[] = "INI-9100/9100W SCSI Host";
 #endif
 static const char pci_vendor_1002[] = "ATI Technologies Inc";
 static const char pci_device_1002_4136[] = "Radeon IGP 320 M";
-static const char pci_device_1002_4144[] = "Radeon R300 AD [Radeon 9500 Pro]";
-static const char pci_device_1002_4145[] = "Radeon R300 AE [Radeon 9500 Pro]";
-static const char pci_device_1002_4146[] = "Radeon R300 AF [Radeon 9500 Pro]";
-static const char pci_device_1002_4147[] = "Radeon R300 AG [FireGL Z1/X1]";
+static const char pci_device_1002_4144[] = "R300 AD [Radeon 9500 Pro]";
+static const char pci_device_1002_4145[] = "R300 AE [Radeon 9700 Pro]";
+static const char pci_device_1002_4146[] = "R300 AF [Radeon 9700 Pro]";
+static const char pci_device_1002_4147[] = "R300 AG [FireGL Z1/X1]";
+static const char pci_device_1002_4148[] = "R350 AH [Radeon 9800]";
+static const char pci_device_1002_4149[] = "R350 AI [Radeon 9800]";
+static const char pci_device_1002_4150[] = "RV350 AP [Radeon 9600]";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1002_4150_1458_4024[] = "Giga-Byte GV-R96128D Primary";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1002_4150_148c_2064[] = "PowerColor R96A-C3N";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1002_4150_148c_2066[] = "PowerColor R96A-C3N";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1002_4150_174b_7c29[] = "GC-R9600PRO Primary [Sapphire]";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1002_4150_18bc_0101[] = "GC-R9600PRO Primary";
+#endif
+static const char pci_device_1002_4151[] = "RV350 AQ [Radeon 9600]";
+static const char pci_device_1002_4152[] = "RV350 AR [Radeon 9600]";
+static const char pci_device_1002_4154[] = "RV350 AT [Fire GL T2]";
+static const char pci_device_1002_4155[] = "RV350 AU [Fire GL T2]";
+static const char pci_device_1002_4156[] = "RV350 AV [Fire GL T2]";
+static const char pci_device_1002_4157[] = "RV350 AW [Fire GL T2]";
 static const char pci_device_1002_4158[] = "68800AX [Mach32]";
-static const char pci_device_1002_4164[] = "Radeon R300 Secondary (DVI) output";
-static const char pci_device_1002_4242[] = "Radeon R200 BB [Radeon All in Wonder 8500DV]";
+static const char pci_device_1002_4164[] = "R300 AD [Radeon 9500 Pro] (Secondary)";
+static const char pci_device_1002_4165[] = "R300 AE [Radeon 9700 Pro] (Secondary)";
+static const char pci_device_1002_4166[] = "R300 AF [Radeon 9700 Pro] (Secondary)";
+static const char pci_device_1002_4168[] = "Radeon R350 [Radeon 9800] (Secondary)";
+static const char pci_device_1002_4170[] = "RV350 AP [Radeon 9600] (Secondary)";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1002_4170_1458_4025[] = "Giga-Byte GV-R96128D Secondary";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1002_4170_148c_2067[] = "PowerColor R96A-C3N (Secondary)";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1002_4170_174b_7c28[] = "GC-R9600PRO Secondary [Sapphire]";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1002_4170_18bc_0100[] = "GC-R9600PRO Secondary";
+#endif
+static const char pci_device_1002_4171[] = "RV350 AQ [Radeon 9600] (Secondary)";
+static const char pci_device_1002_4172[] = "RV350 AR [Radeon 9600] (Secondary)";
+static const char pci_device_1002_4242[] = "R200 BB [Radeon All in Wonder 8500DV]";
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_1002_4242_1002_02aa[] = "Radeon 8500 AIW DV Edition";
 #endif
 static const char pci_device_1002_4336[] = "Radeon Mobility U1";
 static const char pci_device_1002_4337[] = "Radeon IGP 340M";
+static const char pci_device_1002_4341[] = "SoundMAX Integrated Digital Audio";
+static const char pci_device_1002_4353[] = "ATI SMBus";
 static const char pci_device_1002_4354[] = "215CT [Mach64 CT]";
 static const char pci_device_1002_4358[] = "210888CX [Mach64 CX]";
 static const char pci_device_1002_4554[] = "210888ET [Mach64 ET]";
@@ -442,35 +590,35 @@ static const char pci_subsys_1002_475a_1002_0087[] = "Rage 3D IIC";
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_1002_475a_1002_475a[] = "Rage IIC AGP";
 #endif
-static const char pci_device_1002_4964[] = "Radeon R250 Id [Radeon 9000]";
-static const char pci_device_1002_4965[] = "Radeon R250 Ie [Radeon 9000]";
-static const char pci_device_1002_4966[] = "Radeon R250 If [Radeon 9000]";
+static const char pci_device_1002_4964[] = "Radeon RV250 Id [Radeon 9000]";
+static const char pci_device_1002_4965[] = "Radeon RV250 Ie [Radeon 9000]";
+static const char pci_device_1002_4966[] = "Radeon RV250 If [Radeon 9000]";
 #ifdef INIT_SUBSYS_INFO
-static const char pci_subsys_1002_4966_10f1_0002[] = "R250 If [Tachyon G9000 PRO]";
+static const char pci_subsys_1002_4966_10f1_0002[] = "RV250 If [Tachyon G9000 PRO]";
 #endif
 #ifdef INIT_SUBSYS_INFO
-static const char pci_subsys_1002_4966_148c_2039[] = "R250 If [Radeon 9000 Pro Evil Commando]";
+static const char pci_subsys_1002_4966_148c_2039[] = "RV250 If [Radeon 9000 Pro Evil Commando]";
 #endif
 #ifdef INIT_SUBSYS_INFO
-static const char pci_subsys_1002_4966_1509_9a00[] = "R250 If [Radeon 9000 AT009]";
+static const char pci_subsys_1002_4966_1509_9a00[] = "RV250 If [Radeon 9000 AT009]";
 #endif
 #ifdef INIT_SUBSYS_INFO
-static const char pci_subsys_1002_4966_1681_0040[] = "R250 If [3D prophet 9000]";
+static const char pci_subsys_1002_4966_1681_0040[] = "RV250 If [3D prophet 9000]";
 #endif
 #ifdef INIT_SUBSYS_INFO
-static const char pci_subsys_1002_4966_174b_7176[] = "R250 If [Sapphire Radeon 9000 Pro]";
+static const char pci_subsys_1002_4966_174b_7176[] = "RV250 If [Sapphire Radeon 9000 Pro]";
 #endif
 #ifdef INIT_SUBSYS_INFO
-static const char pci_subsys_1002_4966_174b_7192[] = "R250 If [Radeon 9000 Atlantis]";
+static const char pci_subsys_1002_4966_174b_7192[] = "RV250 If [Radeon 9000 Atlantis]";
 #endif
 #ifdef INIT_SUBSYS_INFO
-static const char pci_subsys_1002_4966_17af_2005[] = "R250 If [Excalibur Radeon 9000 Pro]";
+static const char pci_subsys_1002_4966_17af_2005[] = "RV250 If [Excalibur Radeon 9000 Pro]";
 #endif
 #ifdef INIT_SUBSYS_INFO
-static const char pci_subsys_1002_4966_17af_2006[] = "R250 If [Excalibur Radeon 9000]";
+static const char pci_subsys_1002_4966_17af_2006[] = "RV250 If [Excalibur Radeon 9000]";
 #endif
-static const char pci_device_1002_4967[] = "Radeon R250 Ig [Radeon 9000]";
-static const char pci_device_1002_496e[] = "Radeon R250 [Radeon 9000] (Secondary)";
+static const char pci_device_1002_4967[] = "Radeon RV250 Ig [Radeon 9000]";
+static const char pci_device_1002_496e[] = "Radeon RV250 [Radeon 9000] (Secondary)";
 static const char pci_device_1002_4c42[] = "3D Rage LT Pro AGP-133";
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_1002_4c42_0e11_b0e8[] = "Rage 3D LT Pro";
@@ -551,7 +699,7 @@ static const char pci_subsys_1002_4c57_144d_c006[] = "Radeon Mobility M7 LW in v
 static const char pci_device_1002_4c58[] = "Radeon RV200 LX [Mobility FireGL 7800 M7]";
 static const char pci_device_1002_4c59[] = "Radeon Mobility M6 LY";
 #ifdef INIT_SUBSYS_INFO
-static const char pci_subsys_1002_4c59_1014_0235[] = "ThinkPad A30p (2653-64G)";
+static const char pci_subsys_1002_4c59_1014_0235[] = "ThinkPad A30/A30p (2652/2653)";
 #endif
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_1002_4c59_1014_0239[] = "ThinkPad X22/X23/X24";
@@ -572,17 +720,25 @@ static const char pci_device_1002_4e45[] = "Radeon R300 NE [Radeon 9500 Pro]";
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_1002_4e45_1002_0002[] = "Radeon R300 NE [Radeon 9500 Pro]";
 #endif
-static const char pci_device_1002_4e46[] = "Radeon R300 NF [Radeon 9700]";
+static const char pci_device_1002_4e46[] = "RV350 NF [Radeon 9600]";
 static const char pci_device_1002_4e47[] = "Radeon R300 NG [FireGL X1]";
 static const char pci_device_1002_4e48[] = "Radeon R350 [Radeon 9800]";
+static const char pci_device_1002_4e49[] = "Radeon R350 [Radeon 9800]";
+static const char pci_device_1002_4e4a[] = "RV350 NJ [Radeon 9800 XT]";
+static const char pci_device_1002_4e4b[] = "R350 NK [Fire GL X2]";
+static const char pci_device_1002_4e50[] = "RV350 [Mobility Radeon 9600 M10]";
+static const char pci_device_1002_4e52[] = "RV350 [Mobility Radeon 9600 M10]";
+static const char pci_device_1002_4e54[] = "M10 NT [FireGL Mobility T2]";
 static const char pci_device_1002_4e64[] = "Radeon R300 [Radeon 9700 Pro] (Secondary)";
 static const char pci_device_1002_4e65[] = "Radeon R300 [Radeon 9500 Pro] (Secondary)";
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_1002_4e65_1002_0003[] = "Radeon R300 NE [Radeon 9500 Pro]";
 #endif
-static const char pci_device_1002_4e66[] = "Radeon R300 [Radeon 9700] (Secondary)";
+static const char pci_device_1002_4e66[] = "RV350 NF [Radeon 9600] (Secondary)";
 static const char pci_device_1002_4e67[] = "Radeon R300 [FireGL X1] (Secondary)";
 static const char pci_device_1002_4e68[] = "Radeon R350 [Radeon 9800] (Secondary)";
+static const char pci_device_1002_4e69[] = "Radeon R350 [Radeon 9800] (Secondary)";
+static const char pci_device_1002_4e6a[] = "RV350 NJ [Radeon 9800 XT] (Secondary)";
 static const char pci_device_1002_5041[] = "Rage 128 PA/PRO";
 static const char pci_device_1002_5042[] = "Rage 128 PB/PRO AGP 2x";
 static const char pci_device_1002_5043[] = "Rage 128 PC/PRO AGP 4x";
@@ -718,6 +874,8 @@ static const char pci_subsys_1002_514c_174b_7149[] = "Radeon R200 QL [Sapphire R
 static const char pci_device_1002_514d[] = "Radeon R200 QM [Radeon 9100]";
 static const char pci_device_1002_514e[] = "Radeon R200 QN [Radeon 8500LE]";
 static const char pci_device_1002_514f[] = "Radeon R200 QO [Radeon 8500LE]";
+static const char pci_device_1002_5154[] = "R200 QT [Radeon 8500]";
+static const char pci_device_1002_5155[] = "R200 QU [Radeon 9100]";
 static const char pci_device_1002_5157[] = "Radeon RV200 QW [Radeon 7500]";
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_1002_5157_1002_013a[] = "Radeon 7500";
@@ -888,7 +1046,28 @@ static const char pci_subsys_1002_5654_1002_5654[] = "Mach64VT Reference";
 #endif
 static const char pci_device_1002_5655[] = "264VT3 [Mach64 VT3]";
 static const char pci_device_1002_5656[] = "264VT4 [Mach64 VT4]";
-static const char pci_device_1002_5961[] = "Radeon RV280 [Radeon 9200]";
+static const char pci_device_1002_5941[] = "RV280 [Radeon 9200] (Secondary)";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1002_5941_17af_200d[] = "Excalibur Radeon 9200";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1002_5941_18bc_0050[] = "GeXcube GC-R9200-C3 (Secondary)";
+#endif
+static const char pci_device_1002_5960[] = "RV280 [Radeon 9200 PRO]";
+static const char pci_device_1002_5961[] = "RV280 [Radeon 9200]";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1002_5961_17af_200c[] = "Excalibur Radeon 9200";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1002_5961_18bc_0051[] = "GeXcube GC-R9200-C3";
+#endif
+static const char pci_device_1002_5964[] = "RV280 [Radeon 9200 SE]";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1002_5964_148c_2073[] = "CN-AG92E";
+#endif
+static const char pci_device_1002_5c61[] = "RV250 5c61 [Radeon Mobility 9200 M9+]";
+static const char pci_device_1002_5c63[] = "RV250 5c63 [Radeon Mobility 9200 M9+]";
+static const char pci_device_1002_5d44[] = "RV280 [Radeon 9200 SE] (Secondary)";
 static const char pci_device_1002_700f[] = "PCI Bridge [IGP 320M]";
 static const char pci_device_1002_7010[] = "PCI Bridge [IGP 340M]";
 static const char pci_device_1002_cab0[] = "AGP Bridge [IGP 320M]";
@@ -1144,6 +1323,9 @@ static const char pci_subsys_1011_0019_1186_1101[] = "DFE-500TX Fast Ethernet";
 static const char pci_subsys_1011_0019_1186_1102[] = "DFE-500TX Fast Ethernet";
 #endif
 #ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1011_0019_1186_1112[] = "DFE-570TX Quad Fast Ethernet";
+#endif
+#ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_1011_0019_1259_2800[] = "AT-2800Tx Fast Ethernet";
 #endif
 #ifdef INIT_SUBSYS_INFO
@@ -1176,7 +1358,7 @@ static const char pci_subsys_1011_0019_13d1_ab01[] = "EtherFast 10/100 Cardbus (
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_1011_0019_8086_0001[] = "EtherExpress PRO/100 Mobile CardBus 32";
 #endif
-static const char pci_device_1011_001a[] = "Farallon PN9000SX";
+static const char pci_device_1011_001a[] = "Farallon PN9000SX Gigabit Ethernet";
 static const char pci_device_1011_0021[] = "DECchip 21052";
 static const char pci_device_1011_0022[] = "DECchip 21150";
 static const char pci_device_1011_0023[] = "DECchip 21150";
@@ -1211,7 +1393,10 @@ static const char pci_subsys_1011_0046_4c53_1050[] = "CT7 mainboard";
 static const char pci_subsys_1011_0046_4c53_1051[] = "CE7 mainboard";
 #endif
 #ifdef INIT_SUBSYS_INFO
-static const char pci_subsys_1011_0046_9005_0365[] = "Adaptec 5400S";
+static const char pci_subsys_1011_0046_9005_0364[] = "5400S (Mustang)";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1011_0046_9005_0365[] = "5400S (Mustang)";
 #endif
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_1011_0046_9005_1364[] = "Dell PowerEdge RAID Controller 2";
@@ -1510,11 +1695,26 @@ static const char pci_device_101e_1960[] = "MegaRAID";
 static const char pci_subsys_101e_1960_101e_0471[] = "MegaRAID 471 Enterprise 1600 RAID Controller";
 #endif
 #ifdef INIT_SUBSYS_INFO
-static const char pci_subsys_101e_1960_101e_0475[] = "MegaRAID 475 Express 500 RAID Controller";
+static const char pci_subsys_101e_1960_101e_0475[] = "MegaRAID 475 Express 500/500LC RAID Controller";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_101e_1960_101e_0477[] = "MegaRAID 477 Elite 3100 RAID Controller";
 #endif
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_101e_1960_101e_0493[] = "MegaRAID 493 Elite 1600 RAID Controller";
 #endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_101e_1960_101e_0494[] = "MegaRAID 494 Elite 1650 RAID Controller";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_101e_1960_101e_0503[] = "MegaRAID 503 Enterprise 1650 RAID Controller";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_101e_1960_101e_0511[] = "MegaRAID 511 i4 IDE RAID Controller";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_101e_1960_101e_0522[] = "MegaRAID 522 i4133 RAID Controller";
+#endif
 #endif
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_101e_1960_1028_0471[] = "PowerEdge RAID Controller 3/QC";
@@ -1677,6 +1877,7 @@ static const char pci_vendor_1023[] = "Trident Microsystems";
 static const char pci_device_1023_0194[] = "82C194";
 static const char pci_device_1023_2000[] = "4DWave DX";
 static const char pci_device_1023_2001[] = "4DWave NX";
+static const char pci_device_1023_2100[] = "CyberBlade XP4m32";
 static const char pci_device_1023_8400[] = "CyberBlade/i7";
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_1023_8400_1023_8400[] = "CyberBlade i7 AGP";
@@ -1835,7 +2036,6 @@ static const char pci_device_1028_0004[] = "PowerEdge Expandable RAID Controller
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_1028_0004_1028_00d0[] = "PowerEdge Expandable RAID Controller 3/Si";
 #endif
-static const char pci_device_1028_0005[] = "PowerEdge Expandable RAID Controller 3/Di";
 static const char pci_device_1028_0006[] = "PowerEdge Expandable RAID Controller 3/Di";
 static const char pci_device_1028_0007[] = "Remote Access Controller:DRAC III";
 static const char pci_device_1028_0008[] = "Remote Access Controller";
@@ -1852,8 +2052,23 @@ static const char pci_subsys_1028_000a_1028_0121[] = "PowerEdge Expandable RAID
 #endif
 static const char pci_device_1028_000c[] = "Remote Access Controller:ERA or ERA/O";
 static const char pci_device_1028_000d[] = "BMC/SMIC device";
-static const char pci_device_1028_000e[] = "PowerEdge Expandable RAID Controller";
-static const char pci_device_1028_000f[] = "PowerEdge Expandable RAID Controller 4/Di";
+static const char pci_device_1028_000e[] = "PowerEdge Expandable RAID controller 4";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1028_000e_1028_0123[] = "PowerEdge Expandable RAID Controller 4/Di";
+#endif
+static const char pci_device_1028_000f[] = "PowerEdge Expandable RAID controller 4";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1028_000f_1028_013b[] = "MegaRAID DELL PERC 4/Di RAID On Motherboard";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1028_000f_1028_014a[] = "PowerEdge Expandable RAID Controller 4/Di";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1028_000f_1028_014c[] = "MegaRAID DELL PERC 4/Di RAID On Motherboard";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_1028_000f_1028_014d[] = "MegaRAID DELL PERC 4/Di RAID On Motherboard";
+#endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const char pci_vendor_1029[] = "Siemens Nixdorf IS";
 #endif
@@ -1861,6 +2076,32 @@ static const char pci_vendor_1029[] = "Siemens Nixdorf IS";
 static const char pci_vendor_102a[] = "LSI Logic";
 static const char pci_device_102a_0000[] = "HYDRA";
 static const char pci_device_102a_0010[] = "ASPEN";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_102a_0010_9005_000f[] = "2940U2W SCSI Controller";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_102a_0010_9005_0106[] = "2940U2W SCSI Controller";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_102a_0010_9005_a180[] = "2940U2W SCSI Controller";
+#endif
+static const char pci_device_102a_00c5[] = "AIC-7899 U160/m SCSI Controller";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_102a_00c5_1028_00c5[] = "PowerEdge 2550/2650/4600";
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
+static const char pci_device_102a_00cf[] = "AIC-7899P U160/m";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_102a_00cf_1028_0106[] = "PowerEdge 4600";
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_102a_00cf_1028_0121[] = "PowerEdge 2650";
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 #endif
 static const char pci_vendor_102b[] = "Matrox Graphics, Inc.";
 static const char pci_device_102b_0010[] = "MGA-I [Impression?]";
@@ -2263,6 +2504,10 @@ static const char pci_device_102f_0020[] = "ATM Meteor 155";
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_102f_0020_102f_00f8[] = "ATM Meteor 155";
 #endif
+static const char pci_device_102f_0105[] = "TC86C001 [goku-s] IDE";
+static const char pci_device_102f_0106[] = "TC86C001 [goku-s] USB 1.1 Host";
+static const char pci_device_102f_0107[] = "TC86C001 [goku-s] USB Device Controller";
+static const char pci_device_102f_0108[] = "TC86C001 [goku-s] I2C/SIO/GPIO Controller";
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const char pci_vendor_1030[] = "TMC Research";
@@ -2369,10 +2614,10 @@ static const char pci_vendor_1037[] = "Hitachi Micro Systems";
 static const char pci_vendor_1038[] = "AMP, Inc";
 #endif
 static const char pci_vendor_1039[] = "Silicon Integrated Systems [SiS]";
-static const char pci_device_1039_0001[] = "SiS 530 Virtual PCI-to-PCI bridge (AGP)";
+static const char pci_device_1039_0001[] = "Virtual PCI-to-PCI bridge (AGP)";
 static const char pci_device_1039_0002[] = "SG86C202";
 static const char pci_device_1039_0006[] = "85C501/2/3";
-static const char pci_device_1039_0008[] = "85C503/5513";
+static const char pci_device_1039_0008[] = "SiS85C503/5513 (LPC Bridge)";
 static const char pci_device_1039_0009[] = "ACPI";
 static const char pci_device_1039_0018[] = "SiS85C503/5513 (LPC Bridge)";
 static const char pci_device_1039_0200[] = "5597/5598/6326 VGA";
@@ -2381,18 +2626,19 @@ static const char pci_subsys_1039_0200_1039_0000[] = "SiS5597 SVGA (Shared RAM)"
 #endif
 static const char pci_device_1039_0204[] = "82C204";
 static const char pci_device_1039_0205[] = "SG86C205";
-static const char pci_device_1039_0300[] = "SiS300/305 PCI/AGP VGA Display Adapter";
+static const char pci_device_1039_0300[] = "300/305 PCI/AGP VGA Display Adapter";
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_1039_0300_107d_2720[] = "Leadtek WinFast VR300";
 #endif
-static const char pci_device_1039_0310[] = "SiS315H PCI/AGP VGA Display Adapter";
-static const char pci_device_1039_0315[] = "SiS315 PCI/AGP VGA Display Adapter";
-static const char pci_device_1039_0325[] = "SiS315PRO PCI/AGP VGA Display Adapter";
-static const char pci_device_1039_0330[] = "SiS330 [Xabre] PCI/AGP VGA Display Adapter";
+static const char pci_device_1039_0310[] = "315H PCI/AGP VGA Display Adapter";
+static const char pci_device_1039_0315[] = "315 PCI/AGP VGA Display Adapter";
+static const char pci_device_1039_0325[] = "315PRO PCI/AGP VGA Display Adapter";
+static const char pci_device_1039_0330[] = "330 [Xabre] PCI/AGP VGA Display Adapter";
 static const char pci_device_1039_0406[] = "85C501/2";
 static const char pci_device_1039_0496[] = "85C496";
 static const char pci_device_1039_0530[] = "530 Host";
 static const char pci_device_1039_0540[] = "540 Host";
+static const char pci_device_1039_0550[] = "550 Host";
 static const char pci_device_1039_0597[] = "5513C";
 static const char pci_device_1039_0601[] = "85C601";
 static const char pci_device_1039_0620[] = "620 Host";
@@ -2402,16 +2648,21 @@ static const char pci_device_1039_0635[] = "635 Host";
 static const char pci_device_1039_0645[] = "SiS645 Host & Memory & AGP Controller";
 static const char pci_device_1039_0646[] = "SiS645DX Host & Memory & AGP Controller";
 static const char pci_device_1039_0648[] = "SiS 645xx";
-static const char pci_device_1039_0650[] = "650 Host";
-static const char pci_device_1039_0651[] = "SiS651 Host";
+static const char pci_device_1039_0650[] = "650/M650 Host";
+static const char pci_device_1039_0651[] = "651 Host";
+static const char pci_device_1039_0655[] = "655 Host";
+static const char pci_device_1039_0660[] = "660 Host";
+static const char pci_device_1039_0661[] = "661FX/M661FX/M661MX Host";
 static const char pci_device_1039_0730[] = "730 Host";
 static const char pci_device_1039_0733[] = "733 Host";
 static const char pci_device_1039_0735[] = "735 Host";
 static const char pci_device_1039_0740[] = "740 Host";
+static const char pci_device_1039_0741[] = "741/741GX/M741 Host";
 static const char pci_device_1039_0745[] = "745 Host";
 static const char pci_device_1039_0746[] = "746 Host";
-static const char pci_device_1039_0755[] = "SiS 755 Host Bridge";
-static const char pci_device_1039_0900[] = "SiS900 10/100 Ethernet";
+static const char pci_device_1039_0755[] = "755 Host";
+static const char pci_device_1039_0760[] = "760/M760 Host";
+static const char pci_device_1039_0900[] = "SiS900 PCI Fast Ethernet";
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_1039_0900_1039_0900[] = "SiS900 10/100 Ethernet Adapter";
 #endif
@@ -2420,10 +2671,13 @@ static const char pci_subsys_1039_0900_1043_8035[] = "CUSI-FX motherboard";
 #endif
 static const char pci_device_1039_0961[] = "SiS961 [MuTIOL Media IO]";
 static const char pci_device_1039_0962[] = "SiS962 [MuTIOL Media IO]";
+static const char pci_device_1039_0963[] = "SiS963 [MuTIOL Media IO]";
+static const char pci_device_1039_0964[] = "SiS964 [MuTIOL Media IO]";
+static const char pci_device_1039_0965[] = "SiS965 [MuTIOL Media IO]";
 static const char pci_device_1039_3602[] = "83C602";
 static const char pci_device_1039_5107[] = "5107";
 static const char pci_device_1039_5300[] = "SiS540 PCI Display Adapter";
-static const char pci_device_1039_5315[] = "SiS550 AGP/VGA VGA Display Adapter";
+static const char pci_device_1039_5315[] = "550 PCI/AGP VGA Display Adapter";
 static const char pci_device_1039_5401[] = "486 PCI Chipset";
 static const char pci_device_1039_5511[] = "5511/5512";
 static const char pci_device_1039_5513[] = "5513 [IDE]";
@@ -2447,18 +2701,18 @@ static const char pci_device_1039_5600[] = "5600 Host";
 static const char pci_device_1039_6204[] = "Video decoder & MPEG interface";
 static const char pci_device_1039_6205[] = "VGA Controller";
 static const char pci_device_1039_6236[] = "6236 3D-AGP";
-static const char pci_device_1039_6300[] = "SiS630 GUI Accelerator+3D";
+static const char pci_device_1039_6300[] = "630/730 PCI/AGP VGA Display Adapter";
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_1039_6300_1019_0970[] = "P6STP-FL motherboard";
 #endif
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_1039_6300_1043_8035[] = "CUSI-FX motherboard";
 #endif
-static const char pci_device_1039_6306[] = "SiS530 3D PCI/AGP";
+static const char pci_device_1039_6306[] = "530/620 PCI/AGP VGA Display Adapter";
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_1039_6306_1039_6306[] = "SiS530,620 GUI Accelerator+3D";
 #endif
-static const char pci_device_1039_6325[] = "SiS650/651/M650/740 PCI/AGP VGA Display Adapter";
+static const char pci_device_1039_6325[] = "65x/M650/740 PCI/AGP VGA Display Adapter";
 static const char pci_device_1039_6326[] = "86C326 5598/6326";
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_1039_6326_1039_6326[] = "SiS6326 GUI Accelerator";
@@ -2478,6 +2732,7 @@ static const char pci_subsys_1039_6326_1092_4920[] = "SpeedStar A70";
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_1039_6326_1569_6326[] = "SiS6326 GUI Accelerator";
 #endif
+static const char pci_device_1039_6330[] = "661FX/M661FX/M661MX/741/M741/760/M760 PCI/AGP VGA Display Adapter";
 static const char pci_device_1039_7001[] = "USB 1.0 Controller";
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_1039_7001_1039_7000[] = "Onboard USB Controller";
@@ -2488,8 +2743,8 @@ static const char pci_subsys_1039_7002_1509_7002[] = "Onboard USB Controller";
 #endif
 static const char pci_device_1039_7007[] = "FireWire Controller";
 static const char pci_device_1039_7012[] = "Sound Controller";
-static const char pci_device_1039_7013[] = "Intel 537 [56k Winmodem]";
-static const char pci_device_1039_7016[] = "10/100 Ethernet Adapter";
+static const char pci_device_1039_7013[] = "AC'97 Modem Controller";
+static const char pci_device_1039_7016[] = "SiS7016 PCI Fast Ethernet Adapter";
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_1039_7016_1039_7016[] = "SiS7016 10/100 Ethernet Adapter";
 #endif
@@ -2629,6 +2884,7 @@ static const char pci_subsys_103c_1048_103c_1227[] = "Powerbar SP2";
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_103c_1048_103c_1282[] = "Everest SP2";
 #endif
+static const char pci_device_103c_1054[] = "PCI Local Bus Adapter";
 static const char pci_device_103c_1064[] = "79C970 PCnet Ethernet Controller";
 static const char pci_device_103c_108b[] = "Visualize FXe";
 static const char pci_device_103c_10c1[] = "NetServer Smart IRQ Router";
@@ -2641,8 +2897,8 @@ static const char pci_device_103c_121c[] = "NetServer PCI COM Port Decoder";
 static const char pci_device_103c_1229[] = "zx1 System Bus Adapter";
 static const char pci_device_103c_122a[] = "zx1 I/O Controller";
 static const char pci_device_103c_122e[] = "zx1 Local Bus Adapter";
+static const char pci_device_103c_127c[] = "sx1000 I/O Controller";
 static const char pci_device_103c_1290[] = "Auxiliary Diva Serial Port";
-static const char pci_device_103c_12b4[] = "zx1 QuickSilver AGP8x LBA";
 static const char pci_device_103c_2910[] = "E2910A PCIBus Exerciser";
 static const char pci_device_103c_2925[] = "E2925A 32 Bit, 33 MHzPCI Exerciser & Analyzer";
 #ifdef VENDOR_INCLUDE_NONVIDEO
@@ -2835,9 +3091,9 @@ static const char pci_device_104a_021a[] = "STPC Consumer S Southbridge";
 static const char pci_device_104a_021b[] = "STPC Consumer IIA Southbridge";
 static const char pci_device_104a_0500[] = "ST70137 [Unicorn] ADSL DMT Transceiver";
 static const char pci_device_104a_0564[] = "STPC Client Northbridge";
-static const char pci_device_104a_0981[] = "DEC-Tulip compatible 10/100 Ethernet";
+static const char pci_device_104a_0981[] = "21x4x DEC-Tulip compatible 10/100 Ethernet";
 static const char pci_device_104a_1746[] = "STG 1764X";
-static const char pci_device_104a_2774[] = "DEC-Tulip compatible 10/100 Ethernet";
+static const char pci_device_104a_2774[] = "21x4x DEC-Tulip compatible 10/100 Ethernet";
 static const char pci_device_104a_3520[] = "MPEG-II decoder card";
 static const char pci_device_104a_55cc[] = "STPC Client Southbridge";
 #ifdef VENDOR_INCLUDE_NONVIDEO
@@ -2958,10 +3214,17 @@ static const char pci_device_104c_8029[] = "PCI4510 IEEE-1394 Controller";
 static const char pci_device_104c_8400[] = "ACX 100 22Mbps Wireless Interface";
 static const char pci_device_104c_8401[] = "ACX 100 22Mbps Wireless Interface";
 static const char pci_device_104c_9000[] = "Wireless Interface (of unknown type)";
+static const char pci_device_104c_9066[] = "ACX 111 54Mbps Wireless Interface";
 static const char pci_device_104c_a001[] = "TDC1570";
 static const char pci_device_104c_a100[] = "TDC1561";
 static const char pci_device_104c_a102[] = "TNETA1575 HyperSAR Plus w/PCI Host i/f & UTOPIA i/f";
-static const char pci_device_104c_a106[] = "TMS320C6205";
+static const char pci_device_104c_a106[] = "TMS320C6205 Fixed Point DSP";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_104c_a106_175c_5000[] = "ASI50xx Audio Adapter";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_104c_a106_175c_8700[] = "ASI87xx Radio Tuner card";
+#endif
 static const char pci_device_104c_ac10[] = "PCI1050";
 static const char pci_device_104c_ac11[] = "PCI1053";
 static const char pci_device_104c_ac12[] = "PCI1130";
@@ -2980,6 +3243,9 @@ static const char pci_device_104c_ac1c[] = "PCI1225";
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_104c_ac1c_0e11_b121[] = "Armada E500";
 #endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_104c_ac1c_1028_0088[] = "Dell  Computer Corporation  Latitude CPi A400XT";
+#endif
 static const char pci_device_104c_ac1d[] = "PCI1251A";
 static const char pci_device_104c_ac1e[] = "PCI1211";
 static const char pci_device_104c_ac1f[] = "PCI1251B";
@@ -2996,6 +3262,7 @@ static const char pci_device_104c_ac42[] = "PCI4451 PC card Cardbus Controller";
 static const char pci_subsys_104c_ac42_1028_00e6[] = "PCI4451 PC card CardBus Controller (Dell Inspiron 8100)";
 #endif
 static const char pci_device_104c_ac44[] = "PCI4510 PC card Cardbus Controller";
+static const char pci_device_104c_ac46[] = "PCI4520 PC card Cardbus Controller";
 static const char pci_device_104c_ac50[] = "PCI1410 PC card Cardbus Controller";
 static const char pci_device_104c_ac51[] = "PCI1420";
 #ifdef INIT_SUBSYS_INFO
@@ -3014,10 +3281,19 @@ static const char pci_device_104c_ac52[] = "PCI1451 PC card Cardbus Controller";
 static const char pci_device_104c_ac53[] = "PCI1421 PC card Cardbus Controller";
 static const char pci_device_104c_ac55[] = "PCI1250 PC card Cardbus Controller";
 #ifdef INIT_SUBSYS_INFO
-static const char pci_subsys_104c_ac55_1014_0512[] = "ThinkPad T30";
+static const char pci_subsys_104c_ac55_1014_0512[] = "ThinkPad T30/T40";
 #endif
 static const char pci_device_104c_ac56[] = "PCI1510 PC card Cardbus Controller";
 static const char pci_device_104c_ac60[] = "PCI2040 PCI to DSP Bridge Controller";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_104c_ac60_175c_5100[] = "ASI51xx Audio Adapter";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_104c_ac60_175c_6100[] = "ASI61xx Audio Adapter";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_104c_ac60_175c_6200[] = "ASI62xx Audio Adapter";
+#endif
 static const char pci_device_104c_fe00[] = "FireWire Host Controller";
 static const char pci_device_104c_fe03[] = "12C01A FireWire Host Controller";
 static const char pci_vendor_104d[] = "Sony Corporation";
@@ -5444,29 +5720,12 @@ static const char pci_device_10de_0308[] = "NV30GL [Quadro FX 2000]";
 static const char pci_device_10de_0309[] = "NV30GL [Quadro FX 1000]";
 static const char pci_device_10de_0311[] = "NV31 [GeForce FX 5600 Ultra]";
 static const char pci_device_10de_0312[] = "NV31 [GeForce FX 5600]";
-static const char pci_device_10de_0314[] = "GeForce FX 5600SE";
-static const char pci_device_10de_031a[] = "GeForce FX Go5600";
-static const char pci_device_10de_031b[] = "GeForce FX Go5650";
-static const char pci_device_10de_031c[] = "Quadro FX Go700";
 static const char pci_device_10de_0321[] = "NV34 [GeForce FX 5200 Ultra]";
 static const char pci_device_10de_0322[] = "NV34 [GeForce FX 5200]";
-static const char pci_device_10de_0323[] = "GeForce FX 5200SE";
-static const char pci_device_10de_0324[] = "GeForce FX Go5200";
-static const char pci_device_10de_0325[] = "GeForce FX Go5250";
-static const char pci_device_10de_0328[] = "GeForce FX Go5200 32M/64M";
-static const char pci_device_10de_0329[] = "GeForce FX 5200 (Mac)";
-static const char pci_device_10de_032a[] = "Quadro NVS 280 PCI";
 static const char pci_device_10de_032b[] = "NV34GL [Quadro FX 500]";
-static const char pci_device_10de_032c[] = "GeForce FX Go5300";
-static const char pci_device_10de_032d[] = "GeForce FX Go5100";
 static const char pci_device_10de_0330[] = "NV35 [GeForce FX 5900 Ultra]";
 static const char pci_device_10de_0331[] = "NV35 [GeForce FX 5900]";
-static const char pci_device_10de_0332[] = "GeForce FX 5900XT";
-static const char pci_device_10de_0333[] = "GeForce FX 5950 Ultra";
 static const char pci_device_10de_0338[] = "NV35GL [Quadro FX 3000]";
-static const char pci_device_10de_0341[] = "GeForce FX 5700 Ultra";
-static const char pci_device_10de_0342[] = "GeForce FX 5700";
-static const char pci_device_10de_034e[] = "Quadro FX 1100";
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const char pci_vendor_10df[] = "Emulex Corporation";
 static const char pci_device_10df_1ae5[] = "LP6000 Fibre Channel Host Adapter";
@@ -5860,7 +6119,7 @@ static const char pci_device_1106_0391[] = "VT8371 [KX133]";
 static const char pci_device_1106_0501[] = "VT8501 [Apollo MVP4]";
 static const char pci_device_1106_0505[] = "VT82C505";
 static const char pci_device_1106_0561[] = "VT82C576MV";
-static const char pci_device_1106_0571[] = "VT82C586A/B/VT82C686/A/B/VT8233/A/C/VT8235 PIPC Bus Master IDE";
+static const char pci_device_1106_0571[] = "VT82C586A/B/VT82C686/A/B/VT823x/A/C/VT8235 PIPC Bus Master IDE";
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_1106_0571_1019_0985[] = "P6VXA Motherboard";
 #endif
@@ -5952,7 +6211,7 @@ static const char pci_device_1106_1000[] = "VT82C570MV";
 static const char pci_device_1106_1106[] = "VT82C570MV";
 static const char pci_device_1106_1571[] = "VT82C576M/VT82C586";
 static const char pci_device_1106_1595[] = "VT82C595/97 [Apollo VP2/97]";
-static const char pci_device_1106_3038[] = "USB";
+static const char pci_device_1106_3038[] = "VT6202 [USB 2.0 controller]";
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_1106_3038_0925_1234[] = "USB Controller";
 #endif
@@ -5982,6 +6241,7 @@ static const char pci_subsys_1106_3043_1186_1400[] = "DFE-530TX rev A";
 static const char pci_device_1106_3044[] = "IEEE 1394 Host Controller";
 static const char pci_device_1106_3050[] = "VT82C596 Power Management";
 static const char pci_device_1106_3051[] = "VT82C596 Power Management";
+static const char pci_device_1106_3053[] = "VT6105M [Rhine-III]";
 static const char pci_device_1106_3057[] = "VT82C686 [Apollo Super ACPI]";
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_1106_3057_1019_0985[] = "P6VXA Motherboard";
@@ -6022,7 +6282,7 @@ static const char pci_subsys_1106_3058_1462_3091[] = "MS-6309 Onboard Audio";
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_1106_3058_15dd_7609[] = "Onboard Audio";
 #endif
-static const char pci_device_1106_3059[] = "VT8233/A/8235 AC97 Audio Controller";
+static const char pci_device_1106_3059[] = "VT8233/A/8235/8237 AC97 Audio Controller";
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_1106_3059_1043_8095[] = "A7V8X Motherboard (Realtek ALC650 codec)";
 #endif
@@ -6085,6 +6345,7 @@ static const char pci_device_1106_3133[] = "VT3133 Host Bridge";
 static const char pci_device_1106_3147[] = "VT8233A ISA Bridge";
 static const char pci_device_1106_3148[] = "P4M266 Host Bridge";
 static const char pci_device_1106_3156[] = "P/KN266 Host Bridge";
+static const char pci_device_1106_3164[] = "VT6410 ATA133 RAID controller";
 static const char pci_device_1106_3168[] = "VT8374 P4X400 Host Controller/AGP Bridge";
 static const char pci_device_1106_3177[] = "VT8235 ISA Bridge";
 #ifdef INIT_SUBSYS_INFO
@@ -6096,15 +6357,19 @@ static const char pci_subsys_1106_3177_1297_f641[] = "FX41 motherboard";
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_1106_3177_1458_5001[] = "GA-7VAX Mainboard";
 #endif
-static const char pci_device_1106_3189[] = "VT8377 [KT400 AGP] Host Bridge";
+static const char pci_device_1106_3188[] = "VT8385 [K8T800 AGP] Host Bridge";
+static const char pci_device_1106_3189[] = "VT8377 [KT400/KT600 AGP] Host Bridge";
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_1106_3189_1043_807f[] = "A7V8X motherboard";
 #endif
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_1106_3189_1458_5000[] = "GA-7VAX Mainboard";
 #endif
+static const char pci_device_1106_3205[] = "VT8378 [KM400] Chipset Host Bridge";
+static const char pci_device_1106_3227[] = "VT8237 ISA bridge [K8T800 South]";
 static const char pci_device_1106_5030[] = "VT82C596 ACPI [Apollo PRO]";
 static const char pci_device_1106_6100[] = "VT85C100A [Rhine II]";
+static const char pci_device_1106_7205[] = "VT8378 [S3 UniChrome] Integrated Video";
 static const char pci_device_1106_8231[] = "VT8231 [PCI-to-ISA Bridge]";
 static const char pci_device_1106_8235[] = "VT8235 ACPI";
 static const char pci_device_1106_8305[] = "VT8363/8365 [KT133/KM133 AGP]";
@@ -6127,7 +6392,9 @@ static const char pci_device_1106_b102[] = "VT8362 AGP Bridge";
 static const char pci_device_1106_b103[] = "VT8615 AGP Bridge";
 static const char pci_device_1106_b112[] = "VT8361 [KLE133] AGP Bridge";
 static const char pci_device_1106_b168[] = "VT8235 PCI Bridge";
+static const char pci_device_1106_b188[] = "VT8237 PCI bridge [K8T800 South]";
 static const char pci_device_1106_b198[] = "VT8237 PCI Bridge";
+static const char pci_device_1106_d104[] = "VT8237 Integrated Fast Ethernet Controller";
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const char pci_vendor_1107[] = "Stratus Computers";
@@ -6459,7 +6726,7 @@ static const char pci_subsys_1131_7146_11bd_000a[] = "DV500 Overlay";
 static const char pci_vendor_1132[] = "Mitel Corp.";
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
-static const char pci_vendor_1133[] = "Eicon Technology Corporation";
+static const char pci_vendor_1133[] = "Eicon Networks Corporation";
 static const char pci_device_1133_7901[] = "EiconCard S90";
 static const char pci_device_1133_7902[] = "EiconCard S90";
 static const char pci_device_1133_7911[] = "EiconCard S91";
@@ -7386,11 +7653,19 @@ static const char pci_device_11a9_4240[] = "AMCC S933Q Intelligent Serial Card";
 static const char pci_vendor_11aa[] = "Actel";
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
-static const char pci_vendor_11ab[] = "Galileo Technology Ltd.";
+static const char pci_vendor_11ab[] = "Marvell";
 static const char pci_device_11ab_0146[] = "GT-64010/64010A System Controller";
+static const char pci_device_11ab_4320[] = "Yukon Gigabit Ethernet 10/100/1000Base-T Adapter";
 static const char pci_device_11ab_4611[] = "GT-64115 System Controller";
 static const char pci_device_11ab_4620[] = "GT-64120/64120A/64121A System Controller";
 static const char pci_device_11ab_4801[] = "GT-48001";
+static const char pci_device_11ab_5040[] = "MV88SX5040 4-port SATA I PCI-X Controller";
+static const char pci_device_11ab_5041[] = "MV88SX5041 4-port SATA I PCI-X Controller";
+static const char pci_device_11ab_5080[] = "MV88SX5080 8-port SATA I PCI-X Controller";
+static const char pci_device_11ab_5081[] = "MV88SX5081 8-port SATA I PCI-X Controller";
+static const char pci_device_11ab_6041[] = "MV88SX6041 4-port SATA II PCI-X Controller";
+static const char pci_device_11ab_6081[] = "MV88SX6081 8-port SATA II PCI-X Controller";
+static const char pci_device_11ab_6460[] = "MV64360/64361/64362 System Controller";
 static const char pci_device_11ab_f003[] = "GT-64010 Primary Image Piranha Image Generator";
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
@@ -12890,6 +13165,7 @@ static const char pci_vendor_15ab[] = "Bluesteel Networks Inc";
 static const char pci_vendor_15ac[] = "North Atlantic Instruments";
 #endif
 static const char pci_vendor_15ad[] = "VMWare Inc";
+static const char pci_device_15ad_0405[] = "[VMWare SVGA II] PCI Display Adapter";
 static const char pci_device_15ad_0710[] = "Virtual SVGA";
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const char pci_vendor_15ae[] = "Amersham Pharmacia Biotech";
@@ -13210,6 +13486,25 @@ static const char pci_vendor_1668[] = "Actiontec Electronics Inc";
 static const char pci_vendor_1681[] = "Hercules";
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+static const char pci_vendor_168c[] = "Atheros Communications, Inc.";
+static const char pci_device_168c_0011[] = "AR5210 802.11a NIC";
+static const char pci_device_168c_0012[] = "AR5211 802.11ab NIC";
+static const char pci_device_168c_0013[] = "AR5212 802.11abg NIC";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_168c_0013_1186_3203[] = "DWL-G520 Wireless PCI Adapter";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_168c_0013_1186_3a94[] = "C54C Wireless 801.11g cardbus";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_168c_0013_168c_0013[] = "WG511T Wireless CardBus Adapter";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_168c_0013_168c_1025[] = "DWL-G650B2 Wireless CardBus Adapter";
+#endif
+static const char pci_device_168c_1014[] = "AR5212 802.11abg NIC";
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 static const char pci_vendor_16ab[] = "Global Sun Technology Inc";
 static const char pci_device_16ab_1102[] = "PCMCIA-to-PCI Wireless Network Bridge";
 #endif
@@ -13221,6 +13516,12 @@ static const char pci_vendor_16ca[] = "CENATEK Inc";
 static const char pci_device_16ca_0001[] = "Rocket Drive DL";
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+static const char pci_vendor_16cd[] = "Densitron Technologies";
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
+static const char pci_vendor_16df[] = "PIKA Technologies Inc.";
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 static const char pci_vendor_16ec[] = "U.S. Robotics";
 static const char pci_device_16ec_3685[] = "Wireless Access PCI Adapter Model 022415";
 #endif
@@ -13228,10 +13529,13 @@ static const char pci_device_16ec_3685[] = "Wireless Access PCI Adapter Model 02
 static const char pci_vendor_16f6[] = "VideoTele.com, Inc.";
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+static const char pci_vendor_1702[] = "Internet Machines Corporation (IMC)";
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 static const char pci_vendor_1705[] = "Digital First, Inc.";
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
-static const char pci_vendor_170b[] = "NetOctave Inc";
+static const char pci_vendor_170b[] = "NetOctave";
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const char pci_vendor_170c[] = "YottaYotta Inc.";
@@ -13255,9 +13559,18 @@ static const char pci_vendor_1743[] = "Peppercon AG";
 static const char pci_device_1743_8139[] = "ROL/F-100 Fast Ethernet Adapter with ROL";
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+static const char pci_vendor_1749[] = "RLX Technologies";
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 static const char pci_vendor_174b[] = "PC Partner Limited";
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+static const char pci_vendor_174d[] = "WellX Telecom SA";
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
+static const char pci_vendor_175c[] = "AudioScience Inc";
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 static const char pci_vendor_175e[] = "Sanera Systems, Inc.";
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
@@ -13279,10 +13592,16 @@ static const char pci_vendor_1799[] = "Belkin";
 static const char pci_vendor_17af[] = "Hightech Information System Ltd.";
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+static const char pci_vendor_17c2[] = "Newisys, Inc.";
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 static const char pci_vendor_17cc[] = "NetChip Technology, Inc";
 static const char pci_device_17cc_2280[] = "USB 2.0";
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+static const char pci_vendor_17d5[] = "S2io Inc.";
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 static const char pci_vendor_1813[] = "Ambient Technologies Inc";
 static const char pci_device_1813_4000[] = "HaM controllerless modem";
 #ifdef INIT_SUBSYS_INFO
@@ -13294,12 +13613,25 @@ static const char pci_subsys_1813_4100_16be_0002[] = "V9x HAM 1394";
 #endif
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+static const char pci_vendor_1814[] = "RaLink";
+static const char pci_device_1814_0101[] = "Wireless PCI Adpator RT2400 / RT2460";
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
+static const char pci_vendor_1830[] = "Credence Systems Corporation";
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 static const char pci_vendor_1851[] = "Microtune, Inc.";
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const char pci_vendor_1852[] = "Anritsu Corp.";
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+static const char pci_vendor_1867[] = "Topspin Communications";
+static const char pci_device_1867_5a44[] = "MT23108 PCI-X HCA";
+static const char pci_device_1867_5a45[] = "MT23108 PCI-X HCA flash recovery";
+static const char pci_device_1867_5a46[] = "MT23108 PCI-X HCA bridge";
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 static const char pci_vendor_1888[] = "Varisys Ltd";
 static const char pci_device_1888_0301[] = "VMFX1 FPGA PMC module";
 static const char pci_device_1888_0601[] = "VSM2 dual PMC carrier";
@@ -13307,6 +13639,12 @@ static const char pci_device_1888_0710[] = "VS14x series PowerPC PCI board";
 static const char pci_device_1888_0720[] = "VS24x series PowerPC PCI board";
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+static const char pci_vendor_1894[] = "KNC One";
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
+static const char pci_vendor_18fb[] = "Resilience Corporation";
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 static const char pci_vendor_1a08[] = "Sierra semiconductor";
 static const char pci_device_1a08_0000[] = "SC15064";
 #endif
@@ -13385,8 +13723,15 @@ static const char pci_subsys_3388_0021_4c53_1050[] = "CT7 mainboard";
 static const char pci_subsys_3388_0021_4c53_1080[] = "CT8 mainboard";
 #endif
 #ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_3388_0021_4c53_10a0[] = "CA3/CR3 mainboard";
+#endif
+#ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_3388_0021_4c53_3010[] = "PPCI mezzanine (32-bit PMC)";
 #endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_3388_0021_4c53_3011[] = "PPCI mezzanine (64-bit PMC)";
+#endif
+static const char pci_device_3388_0026[] = "HB2 PCI-PCI Bridge";
 static const char pci_device_3388_101a[] = "E.Band [AudioTrak Inca88]";
 static const char pci_device_3388_101b[] = "E.Band [AudioTrak Inca88]";
 static const char pci_device_3388_8011[] = "VXPro II Chipset";
@@ -13456,7 +13801,16 @@ static const char pci_device_3d3d_000c[] = "GLINT R3 [Oxygen VX1]";
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_3d3d_000c_3d3d_0144[] = "Oxygen VX1-4X AGP [Permedia 4]";
 #endif
+static const char pci_device_3d3d_000d[] = "GLint R4 rev A";
+static const char pci_device_3d3d_0011[] = "GLint R4 rev B";
+static const char pci_device_3d3d_0012[] = "GLint R5 rev A";
+static const char pci_device_3d3d_0013[] = "GLint R5 rev B";
+static const char pci_device_3d3d_0020[] = "VP10 visual processor";
+static const char pci_device_3d3d_0022[] = "VP10 visual processor";
+static const char pci_device_3d3d_0024[] = "VP9 visual processor";
 static const char pci_device_3d3d_0100[] = "Permedia II 2D+3D";
+static const char pci_device_3d3d_07a1[] = "Wildcat III 6210";
+static const char pci_device_3d3d_07a3[] = "Wildcat IV 7210";
 static const char pci_device_3d3d_1004[] = "Permedia";
 static const char pci_device_3d3d_3d04[] = "Permedia";
 static const char pci_device_3d3d_ffff[] = "Glint VGA";
@@ -13486,13 +13840,26 @@ static const char pci_device_4033_1360[] = "RTL8139 Ethernet";
 static const char pci_vendor_4143[] = "Digital Equipment Corp";
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+static const char pci_vendor_4144[] = "Alpha Data";
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 static const char pci_vendor_416c[] = "Aladdin Knowledge Systems";
 static const char pci_device_416c_0100[] = "AladdinCARD";
 static const char pci_device_416c_0200[] = "CPC";
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const char pci_vendor_4444[] = "Internext Compression Inc";
+static const char pci_device_4444_0016[] = "iTVC16 (CX23416) MPEG-2 Encoder";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_4444_0016_0070_4009[] = "WinTV PVR 250";
+#endif
 static const char pci_device_4444_0803[] = "iTVC15 MPEG-2 Encoder";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_4444_0803_0070_4000[] = "WinTV PVR-350";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_4444_0803_0070_4001[] = "WinTV PVR-250";
+#endif
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const char pci_vendor_4468[] = "Bridgeport machines";
@@ -13532,6 +13899,17 @@ static const char pci_vendor_4c48[] = "LUNG HWA Electronics";
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const char pci_vendor_4c53[] = "SBS Technologies";
+static const char pci_device_4c53_0000[] = "PLUSTEST device";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_4c53_0000_4c53_3000[] = "PLUSTEST card (PC104+)";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_4c53_0000_4c53_3001[] = "PLUSTEST card (PMC)";
+#endif
+static const char pci_device_4c53_0001[] = "PLUSTEST-MM device";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_4c53_0001_4c53_3002[] = "PLUSTEST-MM card (PMC)";
+#endif
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const char pci_vendor_4ca1[] = "Seanix Technology Inc";
@@ -13851,6 +14229,9 @@ static const char pci_vendor_5654[] = "VoiceTronix Pty Ltd";
 static const char pci_vendor_5700[] = "Netpower";
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+static const char pci_vendor_5851[] = "Exacq Technologies";
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 static const char pci_vendor_6356[] = "UltraStor";
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
@@ -13882,8 +14263,16 @@ static const char pci_device_8008_0011[] = "PWDOG2 [PCI-Watchdog 2]";
 static const char pci_vendor_8086[] = "Intel Corp.";
 static const char pci_device_8086_0007[] = "82379AB";
 static const char pci_device_8086_0008[] = "Extended Express System Support Controller";
-static const char pci_device_8086_0039[] = "21145";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_0008_0008_1000[] = "WorldMark 4300 INCA ASIC";
+#endif
+static const char pci_device_8086_0039[] = "21145 Fast Ethernet";
 static const char pci_device_8086_0122[] = "82437FX";
+static const char pci_device_8086_0326[] = "PCI Bridge Hub I/OxAPIC Interrupt Controller A";
+static const char pci_device_8086_0327[] = "PCI Bridge Hub I/OxAPIC Interrupt Controller B";
+static const char pci_device_8086_0329[] = "PCI Bridge Hub A";
+static const char pci_device_8086_032a[] = "PCI Bridge Hub B";
+static const char pci_device_8086_032c[] = "PCI Bridge Hub";
 static const char pci_device_8086_0482[] = "82375EB";
 static const char pci_device_8086_0483[] = "82424ZX [Saturn]";
 static const char pci_device_8086_0484[] = "82378IB [SIO ISA Bridge]";
@@ -13948,6 +14337,12 @@ static const char pci_subsys_8086_1004_8086_2004[] = "PRO/1000 T Server Adapter"
 #endif
 static const char pci_device_8086_1008[] = "82544EI Gigabit Ethernet Controller (Copper)";
 #ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_1008_1014_0269[] = "iSeries 1000/100/10 Ethernet Adapter";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_1008_1028_011c[] = "PRO/1000 XT Network Connection";
+#endif
+#ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_1008_8086_1107[] = "PRO/1000 XT Server Adapter";
 #endif
 #ifdef INIT_SUBSYS_INFO
@@ -13956,8 +14351,14 @@ static const char pci_subsys_8086_1008_8086_2107[] = "PRO/1000 XT Server Adapter
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_1008_8086_2110[] = "PRO/1000 XT Server Adapter";
 #endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_1008_8086_3108[] = "PRO/1000 XT Network Connection";
+#endif
 static const char pci_device_8086_1009[] = "82544EI Gigabit Ethernet Controller (Fiber)";
 #ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_1009_1014_0268[] = "iSeries Gigabit Ethernet Adapter";
+#endif
+#ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_1009_8086_1109[] = "PRO/1000 XF Server Adapter";
 #endif
 #ifdef INIT_SUBSYS_INFO
@@ -13971,8 +14372,32 @@ static const char pci_subsys_8086_100c_8086_1112[] = "PRO/1000 T Desktop Adapter
 static const char pci_subsys_8086_100c_8086_2112[] = "PRO/1000 T Desktop Adapter";
 #endif
 static const char pci_device_8086_100d[] = "82544GC Gigabit Ethernet Controller (LOM)";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_100d_1028_0123[] = "PRO/1000 XT Network Connection";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_100d_1079_891f[] = "82544GC Based Network Connection";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_100d_4c53_1080[] = "CT8 mainboard";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_100d_8086_110d[] = "82544GC Based Network Connection";
+#endif
 static const char pci_device_8086_100e[] = "82540EM Gigabit Ethernet Controller";
 #ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_100e_1014_0265[] = "PRO/1000 MT Network Connection";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_100e_1014_0267[] = "PRO/1000 MT Network Connection";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_100e_1014_026a[] = "PRO/1000 MT Network Connection";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_100e_107b_8920[] = "PRO/1000 MT Desktop Adapter";
+#endif
+#ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_100e_8086_001e[] = "PRO/1000 MT Desktop Adapter";
 #endif
 #ifdef INIT_SUBSYS_INFO
@@ -13980,21 +14405,125 @@ static const char pci_subsys_8086_100e_8086_002e[] = "PRO/1000 MT Desktop Adapte
 #endif
 static const char pci_device_8086_100f[] = "82545EM Gigabit Ethernet Controller (Copper)";
 #ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_100f_1014_0269[] = "iSeries 1000/100/10 Ethernet Adapter";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_100f_1014_028e[] = "PRO/1000 MT Network Connection";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_100f_8086_1000[] = "PRO/1000 MT Network Connection";
+#endif
+#ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_100f_8086_1001[] = "PRO/1000 MT Server Adapter";
 #endif
 static const char pci_device_8086_1010[] = "82546EB Gigabit Ethernet Controller (Copper)";
 #ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_1010_1014_027c[] = "PRO/1000 MT Dual Port Network Adapter";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_1010_18fb_7872[] = "RESlink-X";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_1010_4c53_1080[] = "CT8 mainboard";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_1010_4c53_10a0[] = "CA3/CR3 mainboard";
+#endif
+#ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_1010_8086_1011[] = "PRO/1000 MT Dual Port Server Adapter";
 #endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_1010_8086_101a[] = "PRO/1000 MT Dual Port Network Adapter";
+#endif
 static const char pci_device_8086_1011[] = "82545EM Gigabit Ethernet Controller (Fiber)";
 #ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_1011_1014_0268[] = "iSeries Gigabit Ethernet Adapter";
+#endif
+#ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_1011_8086_1002[] = "PRO/1000 MF Server Adapter";
 #endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_1011_8086_1003[] = "PRO/1000 MF Server Adapter (LX)";
+#endif
 static const char pci_device_8086_1012[] = "82546EB Gigabit Ethernet Controller (Fiber)";
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_1012_8086_1012[] = "PRO/1000 MF Dual Port Server Adapter";
 #endif
+static const char pci_device_8086_1013[] = "82541EI Gigabit Ethernet Controller (Copper)";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_1013_8086_0013[] = "PRO/1000 MT Network Connection";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_1013_8086_1113[] = "PRO/1000 MT Desktop Adapter";
+#endif
+static const char pci_device_8086_1014[] = "82541ER Gigabit Ethernet Controller";
 static const char pci_device_8086_1015[] = "82540EM Gigabit Ethernet Controller (LOM)";
+static const char pci_device_8086_1016[] = "82540EP Gigabit Ethernet Controller (LOM)";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_1016_1014_052c[] = "PRO/1000 MT Mobile Connection";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_1016_1179_0001[] = "PRO/1000 MT Mobile Connection";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_1016_8086_1016[] = "PRO/1000 MT Mobile Connection";
+#endif
+static const char pci_device_8086_1017[] = "82540EP Gigabit Ethernet Controller (LOM)";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_1017_8086_1017[] = "PR0/1000 MT Desktop Connection";
+#endif
+static const char pci_device_8086_1018[] = "82541EI Gigabit Ethernet Controller";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_1018_8086_1018[] = "PRO/1000 MT Desktop Adapter";
+#endif
+static const char pci_device_8086_1019[] = "82547EI Gigabit Ethernet Controller (LOM)";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_1019_8086_1019[] = "PRO/1000 CT Desktop Connection";
+#endif
+static const char pci_device_8086_101d[] = "82546EB Gigabit Ethernet Controller";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_101d_8086_1000[] = "PRO/1000 MT Quad Port Server Adapter";
+#endif
+static const char pci_device_8086_101e[] = "82540EP Gigabit Ethernet Controller (Mobile)";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_101e_1014_0549[] = "PRO/1000 MT Mobile Connection";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_101e_1179_0001[] = "PRO/1000 MT Mobile Connection";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_101e_8086_101e[] = "PRO/1000 MT Mobile Connection";
+#endif
+static const char pci_device_8086_1026[] = "82545GM Gigabit Ethernet Controller";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_1026_8086_1000[] = "PRO/1000 MT Server Connection";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_1026_8086_1001[] = "PRO/1000 MT Server Adapter";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_1026_8086_1002[] = "PRO/1000 MT Server Adapter";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_1026_8086_1026[] = "PRO/1000 MT Server Connection";
+#endif
+static const char pci_device_8086_1027[] = "82545GM Gigabit Ethernet Controller";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_1027_8086_1001[] = "PRO/1000 MF Server Adapter(LX)";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_1027_8086_1002[] = "PRO/1000 MF Server Adapter(LX)";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_1027_8086_1003[] = "PRO/1000 MF Server Adapter(LX)";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_1027_8086_1027[] = "PRO/1000 MF Server Adapter";
+#endif
+static const char pci_device_8086_1028[] = "82545GM Gigabit Ethernet Controller";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_1028_8086_1028[] = "PRO/1000 MB Server Adapter";
+#endif
 static const char pci_device_8086_1029[] = "82559 Ethernet Controller";
 static const char pci_device_8086_1030[] = "82559 InBusiness 10/100";
 static const char pci_device_8086_1031[] = "82801CAM (ICH3) PRO/100 VE (LOM) Ethernet Controller";
@@ -14030,6 +14559,9 @@ static const char pci_device_8086_1036[] = "82801CAM (ICH3) 82562EH Ethernet Con
 static const char pci_device_8086_1037[] = "82801CAM (ICH3) Chipset Ethernet Controller";
 static const char pci_device_8086_1038[] = "82801CAM (ICH3) PRO/100 VM (KM) Ethernet Controller";
 static const char pci_device_8086_1039[] = "82801BD PRO/100 VE (LOM) Ethernet Controller";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_1039_1014_0267[] = "NetVista A30p";
+#endif
 static const char pci_device_8086_103a[] = "82801BD PRO/100 VE (CNR) Ethernet Controller";
 static const char pci_device_8086_103b[] = "82801BD PRO/100 VM (LOM) Ethernet Controller";
 static const char pci_device_8086_103c[] = "82801BD PRO/100 VM (CNR) Ethernet Controller";
@@ -14040,7 +14572,89 @@ static const char pci_device_8086_1040[] = "536EP Data Fax Modem";
 static const char pci_subsys_8086_1040_16be_1040[] = "V.9X DSP Data Fax Modem";
 #endif
 static const char pci_device_8086_1043[] = "PRO/Wireless LAN 2100 3B Mini PCI Adapter";
+static const char pci_device_8086_1048[] = "Intel(R) PRO/10GbE LR Server Adapter";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_1048_8086_a01f[] = "PRO/10GbE LR Server Adapter";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_1048_8086_a11f[] = "PRO/10GbE LR Server Adapter";
+#endif
+static const char pci_device_8086_1050[] = "82562EZ 10/100 Ethernet Controller";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_1050_1462_728c[] = "865PE Neo2 (MS-6728)";
+#endif
+static const char pci_device_8086_1051[] = "82801EB/ER (ICH5/ICH5R) integrated LAN Controller";
 static const char pci_device_8086_1059[] = "82551QM Ethernet Controller";
+static const char pci_device_8086_1075[] = "82547GI Gigabit Ethernet Controller";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_1075_8086_0075[] = "PRO/1000 CT Network Connection";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_1075_8086_1075[] = "PRO/1000 CT Network Connection";
+#endif
+static const char pci_device_8086_1076[] = "82541GI/PI Gigabit Ethernet Controller";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_1076_8086_0076[] = "PRO/1000 MT Network Connection";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_1076_8086_1076[] = "PRO/1000 MT Network Connection";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_1076_8086_1176[] = "PRO/1000 MT Desktop Adapter";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_1076_8086_1276[] = "PRO/1000 MT Desktop Adapter";
+#endif
+static const char pci_device_8086_1077[] = "82541GI Gigabit Ethernet Controller";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_1077_1179_0001[] = "PRO/1000 MT Mobile Connection";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_1077_8086_0077[] = "PRO/1000 MT Mobile Connection";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_1077_8086_1077[] = "PRO/1000 MT Mobile Connection";
+#endif
+static const char pci_device_8086_1078[] = "82541EI Gigabit Ethernet Controller";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_1078_8086_1078[] = "PRO/1000 MT Network Connection";
+#endif
+static const char pci_device_8086_1079[] = "82546GB Gigabit Ethernet Controller";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_1079_103c_12a6[] = "HP dual port 10/100/1000BT";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_1079_103c_12cf[] = "HP rx4640 core dual port 10/100/1000BT";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_1079_4c53_1090[] = "Cx9 / Vx9 mainboard";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_1079_8086_0079[] = "PRO/1000 MT Dual Port Network Connection";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_1079_8086_1079[] = "PRO/1000 MT Dual Port Network Connection";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_1079_8086_1179[] = "PRO/1000 MT Dual Port Network Connection";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_1079_8086_117a[] = "PRO/1000 MT Dual Port Server Adapter";
+#endif
+static const char pci_device_8086_107a[] = "82546GB Gigabit Ethernet Controller";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_107a_8086_107a[] = "PRO/1000 MF Dual Port Server Adapter";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_107a_8086_127a[] = "PRO/1000 MF Dual Port Server Adapter";
+#endif
+static const char pci_device_8086_107b[] = "82546GB Gigabit Ethernet Controller";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_107b_8086_007b[] = "PRO/1000 MB Dual Port Server Connection";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_107b_8086_107b[] = "PRO/1000 MB Dual Port Server Connection";
+#endif
 static const char pci_device_8086_1130[] = "82815 815 Chipset Host Bridge and Memory Controller Hub";
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_1130_1025_1016[] = "Travelmate 612 TX";
@@ -14081,6 +14695,15 @@ static const char pci_device_8086_1200[] = "Intel IXP1200 Network Processor";
 static const char pci_subsys_8086_1200_172a_0000[] = "AEP SSL Accelerator";
 #endif
 static const char pci_device_8086_1209[] = "82559ER";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_1209_4c53_1050[] = "CT7 mainboard";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_1209_4c53_1051[] = "CE7 mainboard";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_1209_4c53_1070[] = "PC6 mainboard";
+#endif
 static const char pci_device_8086_1221[] = "82092AA_0";
 static const char pci_device_8086_1222[] = "82092AA_1";
 static const char pci_device_8086_1223[] = "SAA7116";
@@ -14207,6 +14830,9 @@ static const char pci_subsys_8086_1229_1014_805c[] = "10/100 Netfinity 10/100 Et
 static const char pci_subsys_8086_1229_1028_009b[] = "PowerEdge 2550";
 #endif
 #ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_1229_1028_00ce[] = "PowerEdge 1400";
+#endif
+#ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_1229_1033_8000[] = "PC-9821X-B06";
 #endif
 #ifdef INIT_SUBSYS_INFO
@@ -14282,6 +14908,9 @@ static const char pci_subsys_8086_1229_144d_2502[] = "SEM-2100IL MiniPCI LAN Ada
 static const char pci_subsys_8086_1229_1668_1100[] = "EtherExpress PRO/100B (TX) (MiniPCI Ethernet+Modem)";
 #endif
 #ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_1229_4c53_1080[] = "CT8 mainboard";
+#endif
+#ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_1229_8086_0001[] = "EtherExpress PRO/100B (TX)";
 #endif
 #ifdef INIT_SUBSYS_INFO
@@ -14561,6 +15190,9 @@ static const char pci_device_8086_1461[] = "82870P2 P64H2 I/OxAPIC";
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_1461_15d9_3480[] = "P4DP6";
 #endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_1461_4c53_1090[] = "Cx9 / Vx9 mainboard";
+#endif
 static const char pci_device_8086_1462[] = "82870P2 P64H2 Hot Plug Controller";
 static const char pci_device_8086_1960[] = "80960RP [i960RP Microprocessor]";
 #ifdef INIT_SUBSYS_INFO
@@ -14623,6 +15255,18 @@ static const char pci_subsys_8086_1960_1111_1112[] = "PowerEdge Expandable RAID
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_1960_113c_03a2[] = "MegaRAID";
 #endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_1960_e4bf_1010[] = "CG1-RADIO";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_1960_e4bf_1020[] = "CU2-QUARTET";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_1960_e4bf_1040[] = "CU1-CHORUS";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_1960_e4bf_3100[] = "CX1-BAND";
+#endif
 static const char pci_device_8086_1962[] = "80960RM [i960RM Microprocessor]";
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_1962_105a_0000[] = "SuperTrak SX6000 I2O CPU";
@@ -14861,7 +15505,10 @@ static const char pci_subsys_8086_244b_8086_4532[] = "D815EEA2 mainboard";
 static const char pci_subsys_8086_244b_8086_4557[] = "D815EGEW Mainboard";
 #endif
 static const char pci_device_8086_244c[] = "82801BAM ISA Bridge (LPC)";
-static const char pci_device_8086_244e[] = "82801BA/CA/DB/EB PCI Bridge";
+static const char pci_device_8086_244e[] = "82801BA/CA/DB/EB/ER Hub interface to PCI Bridge";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_244e_1014_0267[] = "NetVista A30p";
+#endif
 static const char pci_device_8086_2450[] = "82801E ISA Bridge (LPC)";
 static const char pci_device_8086_2452[] = "82801E USB";
 static const char pci_device_8086_2453[] = "82801E SMBus";
@@ -14911,7 +15558,7 @@ static const char pci_subsys_8086_2484_8086_1958[] = "vpr Matrix 170B4";
 #endif
 static const char pci_device_8086_2485[] = "82801CA/CAM AC'97 Audio Controller";
 #ifdef INIT_SUBSYS_INFO
-static const char pci_subsys_8086_2485_1014_0222[] = "ThinkPad T23 (2647-4MG) or A30p (2653-64G)";
+static const char pci_subsys_8086_2485_1014_0222[] = "ThinkPad T23 (2647-4MG) or A30/A30p (2652/2653)";
 #endif
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_2485_1014_0508[] = "ThinkPad T30";
@@ -14936,6 +15583,9 @@ static const char pci_subsys_8086_2486_1014_0503[] = "ThinkPad R31 2656BBG";
 static const char pci_subsys_8086_2486_1014_051a[] = "ThinkPad A/T/X Series";
 #endif
 #ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_2486_101f_1025[] = "Acer 620 Series";
+#endif
+#ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_2486_104d_80e7[] = "VAIO PCG-GR214EP/GR214MP/GR215MP/GR314MP/GR315MP";
 #endif
 #ifdef INIT_SUBSYS_INFO
@@ -14978,53 +15628,171 @@ static const char pci_device_8086_248b[] = "82801CA Ultra ATA Storage Controller
 static const char pci_subsys_8086_248b_15d9_3480[] = "P4DP6";
 #endif
 static const char pci_device_8086_248c[] = "82801CAM ISA Bridge (LPC)";
-static const char pci_device_8086_24c0[] = "82801DB LPC Interface Controller";
+static const char pci_device_8086_24c0[] = "82801DB (ICH4) LPC Bridge";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_24c0_1014_0267[] = "NetVista A30p";
+#endif
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_24c0_1462_5800[] = "845PE Max (MS-6580)";
 #endif
-static const char pci_device_8086_24c2[] = "82801DB USB (Hub #1)";
+static const char pci_device_8086_24c2[] = "82801DB (ICH4) USB UHCI #1";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_24c2_1014_0267[] = "NetVista A30p";
+#endif
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_24c2_1462_5800[] = "845PE Max (MS-6580)";
 #endif
-static const char pci_device_8086_24c3[] = "82801DB/DBM SMBus Controller";
+static const char pci_device_8086_24c3[] = "82801DB/DBM (ICH4) SMBus Controller";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_24c3_1014_0267[] = "NetVista A30p";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_24c3_1458_24c2[] = "GA-8PE667 Ultra";
+#endif
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_24c3_1462_5800[] = "845PE Max (MS-6580)";
 #endif
-static const char pci_device_8086_24c4[] = "82801DB USB (Hub #2)";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_24c3_4c53_1090[] = "Cx9 / Vx9 mainboard";
+#endif
+static const char pci_device_8086_24c4[] = "82801DB (ICH4) USB UHCI #2";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_24c4_1014_0267[] = "NetVista A30p";
+#endif
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_24c4_1462_5800[] = "845PE Max (MS-6580)";
 #endif
-static const char pci_device_8086_24c5[] = "82801DB AC'97 Audio Controller";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_24c4_4c53_1090[] = "Cx9 / Vx9 mainboard";
+#endif
+static const char pci_device_8086_24c5[] = "82801DB (ICH4) AC'97 Audio Controller";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_24c5_1014_0267[] = "NetVista A30p";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_24c5_1458_a002[] = "GA-8PE667 Ultra";
+#endif
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_24c5_1462_5800[] = "845PE Max (MS-6580)";
 #endif
-static const char pci_device_8086_24c6[] = "82801DB AC'97 Modem Controller";
-static const char pci_device_8086_24c7[] = "82801DB USB (Hub #3)";
+static const char pci_device_8086_24c6[] = "82801DB (ICH4) AC'97 Modem Controller";
+static const char pci_device_8086_24c7[] = "82801DB (ICH4) USB UHCI #3";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_24c7_1014_0267[] = "NetVista A30p";
+#endif
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_24c7_1462_5800[] = "845PE Max (MS-6580)";
 #endif
-static const char pci_device_8086_24ca[] = "82801DBM Ultra ATA Storage Controller";
-static const char pci_device_8086_24cb[] = "82801DB Ultra ATA Storage Controller";
+static const char pci_device_8086_24ca[] = "82801DBM (ICH4) Ultra ATA Storage Controller";
+static const char pci_device_8086_24cb[] = "82801DB (ICH4) Ultra ATA 100 Storage Controller";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_24cb_1014_0267[] = "NetVista A30p";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_24cb_1458_24c2[] = "GA-8PE667 Ultra";
+#endif
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_24cb_1462_5800[] = "845PE Max (MS-6580)";
 #endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_24cb_4c53_1090[] = "Cx9 / Vx9 mainboard";
+#endif
 static const char pci_device_8086_24cc[] = "82801DBM LPC Interface Controller";
-static const char pci_device_8086_24cd[] = "82801DB USB2";
-#ifdef INIT_SUBSYS_INFO
-static const char pci_subsys_8086_24cd_1462_3981[] = "845PE Max (MS-6580) Onboard USB EHCI Controller";
-#endif
-static const char pci_device_8086_24d0[] = "82801EB LPC Interface Controller";
-static const char pci_device_8086_24d1[] = "82801EB Ultra ATA Storage Controller";
-static const char pci_device_8086_24d2[] = "82801EB USB";
-static const char pci_device_8086_24d3[] = "82801EB SMBus Controller";
-static const char pci_device_8086_24d4[] = "82801EB USB";
-static const char pci_device_8086_24d5[] = "82801EB AC'97 Audio Controller";
-static const char pci_device_8086_24d6[] = "82801EB AC'97 Modem Controller";
-static const char pci_device_8086_24d7[] = "82801EB USB";
-static const char pci_device_8086_24db[] = "82801EB Ultra ATA Storage Controller";
+static const char pci_device_8086_24cd[] = "82801DB (ICH4) USB2 EHCI Controller";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_24cd_1014_0267[] = "NetVista A30p";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_24cd_1462_3981[] = "845PE Max (MS-6580)";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_24cd_4c53_1090[] = "Cx9 / Vx9 mainboard";
+#endif
+static const char pci_device_8086_24d0[] = "82801EB/ER (ICH5/ICH5R) LPC Bridge";
+static const char pci_device_8086_24d1[] = "82801EB (ICH5) Serial ATA 150 Storage Controller";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_24d1_103c_12bc[] = "d530 CMT (DG746A)";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_24d1_1462_7280[] = "865PE Neo2 (MS-6728)";
+#endif
+static const char pci_device_8086_24d2[] = "82801EB/ER (ICH5/ICH5R) USB UHCI #1";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_24d2_103c_12bc[] = "d530 CMT (DG746A)";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_24d2_1043_80a6[] = "P4P800 Mainboard";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_24d2_1462_7280[] = "865PE Neo2 (MS-6728)";
+#endif
+static const char pci_device_8086_24d3[] = "82801EB/ER (ICH5/ICH5R) SMBus Controller";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_24d3_1043_80a6[] = "P4P800 Mainboard";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_24d3_1462_7280[] = "865PE Neo2 (MS-6728)";
+#endif
+static const char pci_device_8086_24d4[] = "82801EB/ER (ICH5/ICH5R) USB UHCI #2";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_24d4_103c_12bc[] = "d530 CMT (DG746A)";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_24d4_1043_80a6[] = "P4P800 Mainboard";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_24d4_1462_7280[] = "865PE Neo2 (MS-6728)";
+#endif
+static const char pci_device_8086_24d5[] = "82801EB/ER (ICH5/ICH5R) AC'97 Audio Controller";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_24d5_1043_80f3[] = "P4P800 Mainboard";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_24d5_1462_7280[] = "865PE Neo2 (MS-6728)";
+#endif
+static const char pci_device_8086_24d6[] = "82801EB/ER (ICH5/ICH5R) AC'97 Modem Controller";
+static const char pci_device_8086_24d7[] = "82801EB/ER (ICH5/ICH5R) USB UHCI #3";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_24d7_103c_12bc[] = "d530 CMT (DG746A)";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_24d7_1043_80a6[] = "P4P800 Mainboard";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_24d7_1462_7280[] = "865PE Neo2 (MS-6728)";
+#endif
+static const char pci_device_8086_24db[] = "82801EB/ER (ICH5/ICH5R) Ultra ATA 100 Storage Controller";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_24db_103c_12bc[] = "d530 CMT (DG746A)";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_24db_1043_80a6[] = "P4P800 Mainboard";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_24db_1462_7280[] = "865PE Neo2 (MS-6728)";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_24db_1462_7580[] = "MSI 875P";
+#endif
 static const char pci_device_8086_24dc[] = "82801EB LPC Interface Controller";
-static const char pci_device_8086_24dd[] = "82801EB USB2";
-static const char pci_device_8086_24de[] = "82801EB USB";
+static const char pci_device_8086_24dd[] = "82801EB/ER (ICH5/ICH5R) USB2 EHCI Controller";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_24dd_103c_12bc[] = "d530 CMT (DG746A)";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_24dd_1043_80a6[] = "P4P800 Mainboard";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_24dd_1462_7280[] = "865PE Neo2 (MS-6728)";
+#endif
+static const char pci_device_8086_24de[] = "82801EB/ER (ICH5/ICH5R) USB UHCI #4";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_24de_1043_80a6[] = "P4P800 Mainboard";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_24de_1462_7280[] = "865PE Neo2 (MS-6728)";
+#endif
+static const char pci_device_8086_24df[] = "82801EB (ICH5R) SATA (cc=RAID)";
 static const char pci_device_8086_2500[] = "82820 820 (Camino) Chipset Host Bridge (MCH)";
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_2500_1028_0095[] = "Precision Workstation 220 Chipset";
@@ -15056,35 +15824,94 @@ static const char pci_device_8086_2541[] = "E7000 Series Host RASUM Controller";
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_2541_15d9_3480[] = "P4DP6";
 #endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_2541_4c53_1090[] = "Cx9 / Vx9 mainboard";
+#endif
 static const char pci_device_8086_2543[] = "E7000 Series Hub Interface B PCI-to-PCI Bridge";
 static const char pci_device_8086_2544[] = "E7000 Series Hub Interface B RASUM Controller";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_2544_4c53_1090[] = "Cx9 / Vx9 mainboard";
+#endif
 static const char pci_device_8086_2545[] = "E7000 Series Hub Interface C PCI-to-PCI Bridge";
 static const char pci_device_8086_2546[] = "E7000 Series Hub Interface C RASUM Controller";
 static const char pci_device_8086_2547[] = "E7000 Series Hub Interface D PCI-to-PCI Bridge";
 static const char pci_device_8086_2548[] = "E7000 Series Hub Interface D RASUM Controller";
 static const char pci_device_8086_254c[] = "E7501 Memory Controller Hub";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_254c_4c53_1090[] = "Cx9 / Vx9 mainboard";
+#endif
 static const char pci_device_8086_2550[] = "E7505 Memory Controller Hub";
 static const char pci_device_8086_2551[] = "E7000 Series RAS Controller";
 static const char pci_device_8086_2552[] = "E7000 Series Processor to AGP Controller";
 static const char pci_device_8086_2553[] = "E7000 Series Hub Interface B PCI-to-PCI Bridge";
 static const char pci_device_8086_2554[] = "E7000 Series Hub Interface B PCI-to-PCI Bridge RAS Controller";
 static const char pci_device_8086_255d[] = "E7205 Memory Controller Hub";
-static const char pci_device_8086_2560[] = "82845G/GL [Brookdale-G] Chipset Host Bridge";
+static const char pci_device_8086_2560[] = "82845G/GL[Brookdale-G]/GE/PE DRAM Controller/Host-Hub Interface";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_2560_1458_2560[] = "GA-8PE667 Ultra";
+#endif
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_2560_1462_5800[] = "845PE Max (MS-6580)";
 #endif
-static const char pci_device_8086_2561[] = "82845G/GL [Brookdale-G] Chipset AGP Bridge";
-static const char pci_device_8086_2562[] = "82845G/GL [Brookdale-G] Chipset Integrated Graphics Device";
-static const char pci_device_8086_2570[] = "82865G/PE/P Processor to I/O Controller";
-static const char pci_device_8086_2571[] = "82865G/PE/P Processor to AGP Controller";
+static const char pci_device_8086_2561[] = "82845G/GL[Brookdale-G]/GE/PE Host-to-AGP Bridge";
+static const char pci_device_8086_2562[] = "82845G/GL[Brookdale-G]/GE Chipset Integrated Graphics Device";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_2562_1014_0267[] = "NetVista A30p";
+#endif
+static const char pci_device_8086_2570[] = "82865G/PE/P DRAM Controller/Host-Hub Interface";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_2570_1043_80f2[] = "P4P800 Mainboard";
+#endif
+static const char pci_device_8086_2571[] = "82865G/PE/P PCI to AGP Controller";
 static const char pci_device_8086_2572[] = "82865G Integrated Graphics Device";
-static const char pci_device_8086_2573[] = "82865G/PE/P Processor to PCI to CSA Bridge";
-static const char pci_device_8086_2576[] = "82864G/PE/P Processor to I/O Memory Interface";
+static const char pci_device_8086_2573[] = "82865G/PE/P PCI to CSA Bridge";
+static const char pci_device_8086_2576[] = "82865G/PE/P Processor to I/O Memory Interface";
 static const char pci_device_8086_2578[] = "82875P Memory Controller Hub";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_2578_1462_7580[] = "MS-6758 (875P Neo)";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_2578_15d9_4580[] = "Super Micro Computer Inc. P4SCE";
+#endif
 static const char pci_device_8086_2579[] = "82875P Processor to AGP Controller";
 static const char pci_device_8086_257b[] = "82875P Processor to PCI to CSA Bridge";
 static const char pci_device_8086_257e[] = "82875P Processor to I/O Memory Interface";
+static const char pci_device_8086_2584[] = "Workstation Memory Controller Hub";
+static const char pci_device_8086_2585[] = "Workstation Memory Controller Hub PCI Express Port";
+static const char pci_device_8086_2588[] = "Server Memory Controller Hub";
+static const char pci_device_8086_2589[] = "Server Memory Controller Hub PCI Express Port";
+static const char pci_device_8086_258a[] = "Graphics Controller";
+static const char pci_device_8086_25a1[] = "Enterprise Southbridge ISA Bridge";
+static const char pci_device_8086_25a2[] = "Enterprise Southbridge PATA";
+static const char pci_device_8086_25a3[] = "Enterprise Southbridge SATA cc=IDE";
+static const char pci_device_8086_25a4[] = "Enterprise Southbridge SMBUS";
+static const char pci_device_8086_25a6[] = "Enterprise Southbridge AC'97 Audio";
+static const char pci_device_8086_25a7[] = "Enterprise Southbridge AC'97 Modem";
+static const char pci_device_8086_25a9[] = "Enterprise Southbridge USB 1.1 UHCI";
+static const char pci_device_8086_25aa[] = "Enterprise Southbridge USB 1.1 UHCI";
+static const char pci_device_8086_25ab[] = "Enterprise Southbridge Watchdog Timer";
+static const char pci_device_8086_25ac[] = "Enterprise Southbridge IOxAPIC";
+static const char pci_device_8086_25ad[] = "Enterprise Southbridge USB 2.0 EHCI";
+static const char pci_device_8086_25ae[] = "Enterprise Southbridge Hublink PCI-X Bridge";
+static const char pci_device_8086_25b0[] = "Enterprise Southbridge SATA cc=RAID";
+static const char pci_device_8086_2640[] = "I/O Controller Hub LPC";
+static const char pci_device_8086_2651[] = "I/O Controller Hub SATA cc=ide";
+static const char pci_device_8086_2652[] = "I/O Controller Hub SATA cc=raid";
+static const char pci_device_8086_2658[] = "I/O Controller Hub USB";
+static const char pci_device_8086_2659[] = "I/O Controller Hub USB";
+static const char pci_device_8086_265a[] = "I/O Controller Hub USB";
+static const char pci_device_8086_265b[] = "I/O Controller Hub USB";
+static const char pci_device_8086_265c[] = "I/O Controller Hub USB2";
+static const char pci_device_8086_2660[] = "I/O Controller Hub PCI Express Port 0";
+static const char pci_device_8086_2662[] = "I/O Controller Hub PCI Express Port 1";
+static const char pci_device_8086_2664[] = "I/O Controller Hub PCI Express Port 2";
+static const char pci_device_8086_2666[] = "I/O Controller Hub PCI Express Port 3";
+static const char pci_device_8086_266a[] = "I/O Controller Hub SMBus";
+static const char pci_device_8086_266d[] = "I/O Controller Hub Modem";
+static const char pci_device_8086_266e[] = "I/O Controller Hub Audio";
+static const char pci_device_8086_266f[] = "I/O Controller Hub PATA";
 static const char pci_device_8086_3092[] = "Integrated RAID";
+static const char pci_device_8086_3200[] = "GD31244 PCI-X SATA HBA";
 static const char pci_device_8086_3340[] = "82855PM Processor to I/O Controller";
 static const char pci_device_8086_3341[] = "82855PM Processor to AGP Controller";
 static const char pci_device_8086_3575[] = "82830 830 Chipset Host Bridge";
@@ -15101,7 +15928,23 @@ static const char pci_subsys_8086_3577_1014_0513[] = "ThinkPad A/T/X Series";
 #endif
 static const char pci_device_8086_3578[] = "82830 830 Chipset Host Bridge";
 static const char pci_device_8086_3580[] = "82852/855GM Host Bridge";
+static const char pci_device_8086_3581[] = "855GME GMCH Host-to-AGP Bridge (Virtual PCI-to-PCI)";
 static const char pci_device_8086_3582[] = "82852/855GM Integrated Graphics Device";
+static const char pci_device_8086_3584[] = "855GM/GME GMCH Memory I/O Control Registers";
+static const char pci_device_8086_3585[] = "855GM/GME GMCH Configuration Process Registers";
+static const char pci_device_8086_3590[] = "Server Memory Controller Hub";
+static const char pci_device_8086_3591[] = "Memory Controller Hub Error Reporting Register";
+static const char pci_device_8086_3592[] = "Server Memory Controller Hub";
+static const char pci_device_8086_3593[] = "Memory Controller Hub Error Reporting Register";
+static const char pci_device_8086_3594[] = "Memory Controller Hub DMA Controller";
+static const char pci_device_8086_3595[] = "Memory Controller Hub PCI Express Port A0";
+static const char pci_device_8086_3596[] = "Memory Controller Hub PCI Express Port A1";
+static const char pci_device_8086_3597[] = "Memory Controller Hub PCI Express Port B0";
+static const char pci_device_8086_3598[] = "Memory Controller Hub PCI Express Port B1";
+static const char pci_device_8086_3599[] = "Memory Controller Hub PCI Express Port C0";
+static const char pci_device_8086_359a[] = "Memory Controller Hub PCI Express Port C1";
+static const char pci_device_8086_359b[] = "Memory Controller Hub Extended Configuration Registers";
+static const char pci_device_8086_359e[] = "Workstation Memory Controller Hub";
 static const char pci_device_8086_5200[] = "EtherExpress PRO/100 Intelligent Server";
 static const char pci_device_8086_5201[] = "EtherExpress PRO/100 Intelligent Server";
 #ifdef INIT_SUBSYS_INFO
@@ -15112,14 +15955,27 @@ static const char pci_device_8086_7000[] = "82371SB PIIX3 ISA [Natoma/Triton II]
 static const char pci_device_8086_7010[] = "82371SB PIIX3 IDE [Natoma/Triton II]";
 static const char pci_device_8086_7020[] = "82371SB PIIX3 USB [Natoma/Triton II]";
 static const char pci_device_8086_7030[] = "430VX - 82437VX TVX [Triton VX]";
+static const char pci_device_8086_7050[] = "Intel Intercast Video Capture Card";
 static const char pci_device_8086_7100[] = "430TX - 82439TX MTXC";
 static const char pci_device_8086_7110[] = "82371AB/EB/MB PIIX4 ISA";
 static const char pci_device_8086_7111[] = "82371AB/EB/MB PIIX4 IDE";
 static const char pci_device_8086_7112[] = "82371AB/EB/MB PIIX4 USB";
 static const char pci_device_8086_7113[] = "82371AB/EB/MB PIIX4 ACPI";
 static const char pci_device_8086_7120[] = "82810 GMCH [Graphics Memory Controller Hub]";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_7120_4c53_1040[] = "CL7 mainboard";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_7120_4c53_1060[] = "PC7 mainboard";
+#endif
 static const char pci_device_8086_7121[] = "82810 CGC [Chipset Graphics Controller]";
 #ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_7121_4c53_1040[] = "CL7 mainboard";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_7121_4c53_1060[] = "PC7 mainboard";
+#endif
+#ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_7121_8086_4341[] = "Cayman (CA810) Mainboard";
 #endif
 static const char pci_device_8086_7122[] = "82810 DC-100 GMCH [Graphics Memory Controller Hub]";
@@ -15136,17 +15992,32 @@ static const char pci_device_8086_7190[] = "440BX/ZX/DX - 82443BX/ZX/DX Host bri
 static const char pci_subsys_8086_7190_0e11_0500[] = "Armada 1750 Laptop System Chipset";
 #endif
 #ifdef INIT_SUBSYS_INFO
-static const char pci_subsys_8086_7190_0e11_b110[] = "Armada M700";
+static const char pci_subsys_8086_7190_0e11_b110[] = "Armada M700/E500";
 #endif
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_7190_1179_0001[] = "Toshiba Tecra 8100 Laptop System Chipset";
 #endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_7190_4c53_1050[] = "CT7 mainboard";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_7190_4c53_1051[] = "CE7 mainboard";
+#endif
 static const char pci_device_8086_7191[] = "440BX/ZX/DX - 82443BX/ZX/DX AGP bridge";
 static const char pci_device_8086_7192[] = "440BX/ZX/DX - 82443BX/ZX/DX Host bridge (AGP disabled)";
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_7192_0e11_0460[] = "Armada 1700 Laptop System Chipset";
 #endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_7192_4c53_1000[] = "CC7/CR7/CP7/VC7/VP7/VR7 mainboard";
+#endif
 static const char pci_device_8086_7194[] = "82440MX Host Bridge";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_7194_1033_0000[] = "Versa Note Vxi";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_7194_4c53_10a0[] = "CA3/CR3 mainboard";
+#endif
 static const char pci_device_8086_7195[] = "82440MX AC'97 Audio Controller";
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_7195_10cf_1099[] = "QSound_SigmaTel Stac97 PCI Audio";
@@ -15163,8 +16034,17 @@ static const char pci_device_8086_7199[] = "82440MX EIDE Controller";
 static const char pci_device_8086_719a[] = "82440MX USB Universal Host Controller";
 static const char pci_device_8086_719b[] = "82440MX Power Management Controller";
 static const char pci_device_8086_71a0[] = "440GX - 82443GX Host bridge";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_71a0_4c53_1050[] = "CT7 mainboard";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_71a0_4c53_1051[] = "CE7 mainboard";
+#endif
 static const char pci_device_8086_71a1[] = "440GX - 82443GX AGP bridge";
 static const char pci_device_8086_71a2[] = "440GX - 82443GX Host bridge (AGP disabled)";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_71a2_4c53_1000[] = "CC7/CR7/CP7/VC7/VP7/VR7 mainboard";
+#endif
 static const char pci_device_8086_7600[] = "82372FB PIIX5 ISA";
 static const char pci_device_8086_7601[] = "82372FB PIIX5 IDE";
 static const char pci_device_8086_7602[] = "82372FB PIIX5 USB";
@@ -15202,6 +16082,8 @@ static const char pci_device_8086_84e3[] = "460GX - 84460GX Memory Address Contr
 static const char pci_device_8086_84e4[] = "460GX - 84460GX Memory Data Controller (MDC)";
 static const char pci_device_8086_84e6[] = "460GX - 82466GX Wide and fast PCI eXpander Bridge (WXB)";
 static const char pci_device_8086_84ea[] = "460GX - 84460GX AGP Bridge (GXB function 1)";
+static const char pci_device_8086_8500[] = "IXP4XX - Intel Network Processor family. IXP420, IXP421, IXP422, IXP425 and IXC1100";
+static const char pci_device_8086_9000[] = "Intel IXP2000 Familly Network Processor";
 static const char pci_device_8086_9621[] = "Integrated RAID";
 static const char pci_device_8086_9622[] = "Integrated RAID";
 static const char pci_device_8086_9641[] = "Integrated RAID";
@@ -15210,6 +16092,12 @@ static const char pci_device_8086_b152[] = "21152 PCI-to-PCI Bridge";
 static const char pci_device_8086_b154[] = "21154 PCI-to-PCI Bridge";
 static const char pci_device_8086_b555[] = "21555 Non transparent PCI-to-PCI Bridge";
 #ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_b555_4c53_1050[] = "CT7 mainboard";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_8086_b555_4c53_1051[] = "CE7 mainboard";
+#endif
+#ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_8086_b555_e4bf_1000[] = "CC8-1-BLUES";
 #endif
 static const char pci_device_8086_ffff[] = "450NX/GX [Orion] - 82453KX/GX Memory controller [BUG]";
@@ -15232,6 +16120,7 @@ static const char pci_device_8e2e_3000[] = "ET32P2";
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const char pci_vendor_9004[] = "Adaptec";
+static const char pci_device_9004_0078[] = "AHA-2940U_CN";
 static const char pci_device_9004_1078[] = "AIC-7810";
 static const char pci_device_9004_1160[] = "AIC-1160 [Family Fibre Channel Adapter]";
 static const char pci_device_9004_2178[] = "AIC-7821";
@@ -15252,6 +16141,13 @@ static const char pci_device_9004_5475[] = "AIC-755x";
 static const char pci_device_9004_5478[] = "AIC-7850";
 static const char pci_device_9004_5575[] = "AVA-2930";
 static const char pci_device_9004_5578[] = "AIC-7855";
+static const char pci_device_9004_5647[] = "ANA-7711 TCP Offload Engine";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_9004_5647_9004_7710[] = "ANA-7711F TCP Offload Engine - Optical";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_9004_5647_9004_7711[] = "ANA-7711LP TCP Offload Engine - Copper";
+#endif
 static const char pci_device_9004_5675[] = "AIC-755x";
 static const char pci_device_9004_5678[] = "AIC-7856";
 static const char pci_device_9004_5775[] = "AIC-755x";
@@ -15408,6 +16304,9 @@ static const char pci_subsys_9005_0010_9005_2180[] = "AHA-2940U2 SCSI Controller
 static const char pci_subsys_9005_0010_9005_8100[] = "AHA-2940U2B SCSI Controller";
 #endif
 #ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_9005_0010_9005_a100[] = "AHA-2940U2B SCSI Controller";
+#endif
+#ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_9005_0010_9005_a180[] = "AHA-2940U2W SCSI Controller";
 #endif
 #ifdef INIT_SUBSYS_INFO
@@ -15418,6 +16317,9 @@ static const char pci_device_9005_0013[] = "78902";
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_9005_0013_9005_0003[] = "AAA-131U2 Array1000 1 Channel RAID Controller";
 #endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_9005_0013_9005_000f[] = "AIC7890_ARO";
+#endif
 static const char pci_device_9005_001f[] = "AHA-2940U2/U2W / 7890/7891";
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_9005_001f_9005_000f[] = "2940U2W SCSI Controller";
@@ -15433,6 +16335,9 @@ static const char pci_device_9005_0050[] = "AHA-3940U2x/395U2x";
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_9005_0050_9005_f500[] = "AHA-3950U2B";
 #endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_9005_0050_9005_ffff[] = "AHA-3950U2B";
+#endif
 static const char pci_device_9005_0051[] = "AHA-3950U2D";
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_9005_0051_9005_b500[] = "AHA-3950U2D";
@@ -15449,6 +16354,9 @@ static const char pci_subsys_9005_0080_0e11_e2a0[] = "Compaq 64-Bit/66MHz Wide U
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
 #ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_9005_0080_9005_6220[] = "AHA-29160C";
+#endif
+#ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_9005_0080_9005_62a0[] = "29160N Ultra160 SCSI Controller";
 #endif
 #ifdef INIT_SUBSYS_INFO
@@ -15489,6 +16397,11 @@ static const char pci_subsys_9005_00c5_1028_00c5[] = "PowerEdge 2550";
 static const char pci_device_9005_00cf[] = "AIC-7899P U160/m";
 #endif
 #ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_9005_00cf_1028_00ce[] = "PowerEdge 1400";
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
+#endif
+#ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_9005_00cf_1028_00d1[] = "PowerEdge 2550";
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
@@ -15505,19 +16418,80 @@ static const char pci_subsys_9005_0250_1014_0279[] = "ServeRAID-xx";
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_9005_0250_1014_028c[] = "ServeRAID-xx";
 #endif
+static const char pci_device_9005_0283[] = "AAC-RAID";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_9005_0283_9005_0283[] = "Catapult";
+#endif
+static const char pci_device_9005_0284[] = "AAC-RAID";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_9005_0284_9005_0284[] = "Tomcat";
+#endif
 static const char pci_device_9005_0285[] = "AAC-RAID";
 #endif
 #ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_9005_0285_0e11_0295[] = "SATA 6Ch (Bearcat)";
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
+#endif
+#ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_9005_0285_1028_0287[] = "PowerEdge Expandable RAID Controller 320/DC";
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_9005_0285_1028_0291[] = "CERC SATA RAID 2 PCI SATA 6ch (DellCorsair)";
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_9005_0285_17aa_0286[] = "Legend S220 (Legend Crusader)";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_9005_0285_17aa_0287[] = "Legend S230 (Legend Vulcan)";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_9005_0285_9005_0285[] = "2200S (Vulcan)";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_9005_0285_9005_0286[] = "2120S (Crusader)";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_9005_0285_9005_0287[] = "2200S (Vulcan-2m)";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_9005_0285_9005_0288[] = "3230S (Harrier)";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_9005_0285_9005_0289[] = "3240S (Tornado)";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_9005_0285_9005_028a[] = "ASR-2020S PCI-X ZCR (Skyhawk)";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_9005_0285_9005_028b[] = "ASR-2020S SO-DIMM PCI-X ZCR (Terminator)";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_9005_0285_9005_0290[] = "AAR-2410SA PCI SATA 4ch (Jaguar II)";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_9005_0285_9005_0292[] = "AAR-2810SA PCI SATA 8ch (Corsair-8)";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_9005_0285_9005_0293[] = "AAR-21610SA PCI SATA 16ch (Corsair-16)";
+#endif
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_9005_0285_9005_0294[] = "ESD SO-DIMM PCI-X SATA ZCR (Prowler)";
+#endif
+static const char pci_device_9005_0286[] = "AAC-RAID (Rocket)";
+#ifdef INIT_SUBSYS_INFO
+static const char pci_subsys_9005_0286_9005_028c[] = "ASR-2230S + ASR-2230SLP PCI-X (Lancer)";
+#endif
 static const char pci_device_9005_8000[] = "ASC-29320A U320";
 static const char pci_device_9005_800f[] = "AIC-7901 U320";
 static const char pci_device_9005_8010[] = "ASC-39320 U320";
 static const char pci_device_9005_8011[] = "ASC-32320D U320";
 #endif
 #ifdef INIT_SUBSYS_INFO
-static const char pci_subsys_9005_8011_0e11_00ac[] = "U320";
+static const char pci_subsys_9005_8011_0e11_00ac[] = "ASC-39320D U320";
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
 #ifdef INIT_SUBSYS_INFO
@@ -15526,6 +16500,11 @@ static const char pci_subsys_9005_8011_9005_0041[] = "ASC-39320D U320";
 static const char pci_device_9005_8012[] = "ASC-29320 U320";
 static const char pci_device_9005_8013[] = "ASC-29320B U320";
 static const char pci_device_9005_8014[] = "ASC-29320LP U320";
+static const char pci_device_9005_8015[] = "ASC-39320B U320";
+static const char pci_device_9005_8016[] = "ASC-39320A U320";
+static const char pci_device_9005_8017[] = "ASC-29320ALP U320";
+static const char pci_device_9005_801c[] = "ASC-39320D U320";
+static const char pci_device_9005_801d[] = "AIC-7902B U320";
 static const char pci_device_9005_801e[] = "AIC-7901A U320";
 static const char pci_device_9005_801f[] = "AIC-7902 U320";
 static const char pci_device_9005_8080[] = "ASC-29320A U320 w/HostRAID";
@@ -15562,6 +16541,13 @@ static const char pci_device_9699_6565[] = "6565";
 static const char pci_vendor_9710[] = "NetMos Technology";
 static const char pci_device_9710_9815[] = "VScom 021H-EP2 2 port parallel adaptor";
 static const char pci_device_9710_9835[] = "222N-2 I/O Card (2S+1P)";
+static const char pci_device_9710_9845[] = "6 port 16550a serial card";
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
+static const char pci_vendor_9902[] = "Stargen Inc.";
+static const char pci_device_9902_0001[] = "SG2010 PCI over Starfabric Bridge";
+static const char pci_device_9902_0002[] = "SG2010 PCI to Starfabric Gateway";
+static const char pci_device_9902_0003[] = "SG1010 Starfabric Switch and PCI Bridge";
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const char pci_vendor_a0a0[] = "AOPEN Inc.";
@@ -15640,7 +16626,7 @@ static const char pci_vendor_e000[] = "Winbond";
 static const char pci_device_e000_e000[] = "W89C940";
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
-static const char pci_vendor_e159[] = "Tiger Jet Network Inc.";
+static const char pci_vendor_e159[] = "Individual Computers - Jens Schoenfeld";
 static const char pci_device_e159_0001[] = "Intel 537";
 #ifdef INIT_SUBSYS_INFO
 static const char pci_subsys_e159_0001_0059_0001[] = "128k ISDN-S/T Adapter";
@@ -15654,6 +16640,9 @@ static const char pci_device_e159_0002[] = "Tiger100APC ISDN chipset";
 static const char pci_vendor_e4bf[] = "EKF Elektronik GmbH";
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+static const char pci_vendor_e55e[] = "Essence Technology, Inc.";
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 static const char pci_vendor_ea01[] = "Eagle Technology";
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
@@ -15716,13 +16705,33 @@ static const char pci_device_feda_a0fa[] = "BCM4210 iLine10 HomePNA 2.0";
 static const char pci_device_feda_a10e[] = "BCM4230 iLine10 HomePNA 2.0";
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+static const char pci_vendor_fede[] = "Fedetec Inc.";
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 static const char pci_vendor_fffe[] = "VMWare Inc";
+static const char pci_device_fffe_0405[] = "Virtual SVGA 4.0";
 static const char pci_device_fffe_0710[] = "Virtual SVGA";
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const char pci_vendor_ffff[] = "Illegal Vendor ID";
 #endif
 #ifdef INIT_SUBSYS_INFO
+static const pciSubsystemInfo pci_ss_info_0e11_0046_0e11_409a =
+	{0x0e11, 0x409a, pci_subsys_0e11_0046_0e11_409a, 0};
+#undef pci_ss_info_0e11_409a
+#define pci_ss_info_0e11_409a pci_ss_info_0e11_0046_0e11_409a
+static const pciSubsystemInfo pci_ss_info_0e11_0046_0e11_409b =
+	{0x0e11, 0x409b, pci_subsys_0e11_0046_0e11_409b, 0};
+#undef pci_ss_info_0e11_409b
+#define pci_ss_info_0e11_409b pci_ss_info_0e11_0046_0e11_409b
+static const pciSubsystemInfo pci_ss_info_0e11_0046_0e11_409c =
+	{0x0e11, 0x409c, pci_subsys_0e11_0046_0e11_409c, 0};
+#undef pci_ss_info_0e11_409c
+#define pci_ss_info_0e11_409c pci_ss_info_0e11_0046_0e11_409c
+static const pciSubsystemInfo pci_ss_info_0e11_0046_0e11_409d =
+	{0x0e11, 0x409d, pci_subsys_0e11_0046_0e11_409d, 0};
+#undef pci_ss_info_0e11_409d
+#define pci_ss_info_0e11_409d pci_ss_info_0e11_0046_0e11_409d
 static const pciSubsystemInfo pci_ss_info_0e11_a0f7_8086_002a =
 	{0x8086, 0x002a, pci_subsys_0e11_a0f7_8086_002a, 0};
 #undef pci_ss_info_8086_002a
@@ -15747,6 +16756,18 @@ static const pciSubsystemInfo pci_ss_info_0e11_ae10_0e11_4033 =
 	{0x0e11, 0x4033, pci_subsys_0e11_ae10_0e11_4033, 0};
 #undef pci_ss_info_0e11_4033
 #define pci_ss_info_0e11_4033 pci_ss_info_0e11_ae10_0e11_4033
+static const pciSubsystemInfo pci_ss_info_0e11_b178_0e11_4080 =
+	{0x0e11, 0x4080, pci_subsys_0e11_b178_0e11_4080, 0};
+#undef pci_ss_info_0e11_4080
+#define pci_ss_info_0e11_4080 pci_ss_info_0e11_b178_0e11_4080
+static const pciSubsystemInfo pci_ss_info_0e11_b178_0e11_4082 =
+	{0x0e11, 0x4082, pci_subsys_0e11_b178_0e11_4082, 0};
+#undef pci_ss_info_0e11_4082
+#define pci_ss_info_0e11_4082 pci_ss_info_0e11_b178_0e11_4082
+static const pciSubsystemInfo pci_ss_info_0e11_b178_0e11_4083 =
+	{0x0e11, 0x4083, pci_subsys_0e11_b178_0e11_4083, 0};
+#undef pci_ss_info_0e11_4083
+#define pci_ss_info_0e11_4083 pci_ss_info_0e11_b178_0e11_4083
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciSubsystemInfo pci_ss_info_1000_0001_1000_1000 =
 	{0x1000, 0x1000, pci_subsys_1000_0001_1000_1000, 0};
@@ -15809,11 +16830,31 @@ static const pciSubsystemInfo pci_ss_info_1000_0021_4c53_1310 =
 #undef pci_ss_info_4c53_1310
 #define pci_ss_info_4c53_1310 pci_ss_info_1000_0021_4c53_1310
 #endif
+static const pciSubsystemInfo pci_ss_info_1000_0030_1028_0123 =
+	{0x1028, 0x0123, pci_subsys_1000_0030_1028_0123, 0};
+#undef pci_ss_info_1028_0123
+#define pci_ss_info_1028_0123 pci_ss_info_1000_0030_1028_0123
+#ifdef VENDOR_INCLUDE_NONVIDEO
+#endif
+static const pciSubsystemInfo pci_ss_info_1000_0030_1028_014a =
+	{0x1028, 0x014a, pci_subsys_1000_0030_1028_014a, 0};
+#undef pci_ss_info_1028_014a
+#define pci_ss_info_1028_014a pci_ss_info_1000_0030_1028_014a
+#ifdef VENDOR_INCLUDE_NONVIDEO
+#endif
 static const pciSubsystemInfo pci_ss_info_1000_0030_1028_1010 =
 	{0x1028, 0x1010, pci_subsys_1000_0030_1028_1010, 0};
 #undef pci_ss_info_1028_1010
 #define pci_ss_info_1028_1010 pci_ss_info_1000_0030_1028_1010
 #ifdef VENDOR_INCLUDE_NONVIDEO
+static const pciSubsystemInfo pci_ss_info_1000_0040_1000_0033 =
+	{0x1000, 0x0033, pci_subsys_1000_0040_1000_0033, 0};
+#undef pci_ss_info_1000_0033
+#define pci_ss_info_1000_0033 pci_ss_info_1000_0040_1000_0033
+static const pciSubsystemInfo pci_ss_info_1000_0040_1000_0066 =
+	{0x1000, 0x0066, pci_subsys_1000_0040_1000_0066, 0};
+#undef pci_ss_info_1000_0066
+#define pci_ss_info_1000_0066 pci_ss_info_1000_0040_1000_0066
 #endif
 static const pciSubsystemInfo pci_ss_info_1000_008f_1092_8000 =
 	{0x1092, 0x8000, pci_subsys_1000_008f_1092_8000, 0};
@@ -15826,10 +16867,66 @@ static const pciSubsystemInfo pci_ss_info_1000_008f_1092_8760 =
 #undef pci_ss_info_1092_8760
 #define pci_ss_info_1092_8760 pci_ss_info_1000_008f_1092_8760
 #ifdef VENDOR_INCLUDE_NONVIDEO
+static const pciSubsystemInfo pci_ss_info_1000_0407_1000_0530 =
+	{0x1000, 0x0530, pci_subsys_1000_0407_1000_0530, 0};
+#undef pci_ss_info_1000_0530
+#define pci_ss_info_1000_0530 pci_ss_info_1000_0407_1000_0530
+static const pciSubsystemInfo pci_ss_info_1000_0407_1000_0531 =
+	{0x1000, 0x0531, pci_subsys_1000_0407_1000_0531, 0};
+#undef pci_ss_info_1000_0531
+#define pci_ss_info_1000_0531 pci_ss_info_1000_0407_1000_0531
+static const pciSubsystemInfo pci_ss_info_1000_0407_1000_0532 =
+	{0x1000, 0x0532, pci_subsys_1000_0407_1000_0532, 0};
+#undef pci_ss_info_1000_0532
+#define pci_ss_info_1000_0532 pci_ss_info_1000_0407_1000_0532
+#endif
+static const pciSubsystemInfo pci_ss_info_1000_0407_1028_0533 =
+	{0x1028, 0x0533, pci_subsys_1000_0407_1028_0533, 0};
+#undef pci_ss_info_1028_0533
+#define pci_ss_info_1028_0533 pci_ss_info_1000_0407_1028_0533
+#ifdef VENDOR_INCLUDE_NONVIDEO
+#endif
+static const pciSubsystemInfo pci_ss_info_1000_0407_8086_0532 =
+	{0x8086, 0x0532, pci_subsys_1000_0407_8086_0532, 0};
+#undef pci_ss_info_8086_0532
+#define pci_ss_info_8086_0532 pci_ss_info_1000_0407_8086_0532
+#ifdef VENDOR_INCLUDE_NONVIDEO
+static const pciSubsystemInfo pci_ss_info_1000_0622_1000_1020 =
+	{0x1000, 0x1020, pci_subsys_1000_0622_1000_1020, 0};
+#undef pci_ss_info_1000_1020
+#define pci_ss_info_1000_1020 pci_ss_info_1000_0622_1000_1020
+static const pciSubsystemInfo pci_ss_info_1000_0626_1000_1010 =
+	{0x1000, 0x1010, pci_subsys_1000_0626_1000_1010, 0};
+#undef pci_ss_info_1000_1010
+#define pci_ss_info_1000_1010 pci_ss_info_1000_0626_1000_1010
 static const pciSubsystemInfo pci_ss_info_1000_0702_1318_0000 =
 	{0x1318, 0x0000, pci_subsys_1000_0702_1318_0000, 0};
 #undef pci_ss_info_1318_0000
 #define pci_ss_info_1318_0000 pci_ss_info_1000_0702_1318_0000
+static const pciSubsystemInfo pci_ss_info_1000_1960_1000_0518 =
+	{0x1000, 0x0518, pci_subsys_1000_1960_1000_0518, 0};
+#undef pci_ss_info_1000_0518
+#define pci_ss_info_1000_0518 pci_ss_info_1000_1960_1000_0518
+static const pciSubsystemInfo pci_ss_info_1000_1960_1000_0520 =
+	{0x1000, 0x0520, pci_subsys_1000_1960_1000_0520, 0};
+#undef pci_ss_info_1000_0520
+#define pci_ss_info_1000_0520 pci_ss_info_1000_1960_1000_0520
+static const pciSubsystemInfo pci_ss_info_1000_1960_1000_0522 =
+	{0x1000, 0x0522, pci_subsys_1000_1960_1000_0522, 0};
+#undef pci_ss_info_1000_0522
+#define pci_ss_info_1000_0522 pci_ss_info_1000_1960_1000_0522
+static const pciSubsystemInfo pci_ss_info_1000_1960_1000_0523 =
+	{0x1000, 0x0523, pci_subsys_1000_1960_1000_0523, 0};
+#undef pci_ss_info_1000_0523
+#define pci_ss_info_1000_0523 pci_ss_info_1000_1960_1000_0523
+static const pciSubsystemInfo pci_ss_info_1000_1960_1000_4523 =
+	{0x1000, 0x4523, pci_subsys_1000_1960_1000_4523, 0};
+#undef pci_ss_info_1000_4523
+#define pci_ss_info_1000_4523 pci_ss_info_1000_1960_1000_4523
+static const pciSubsystemInfo pci_ss_info_1000_1960_1000_a520 =
+	{0x1000, 0xa520, pci_subsys_1000_1960_1000_a520, 0};
+#undef pci_ss_info_1000_a520
+#define pci_ss_info_1000_a520 pci_ss_info_1000_1960_1000_a520
 #endif
 static const pciSubsystemInfo pci_ss_info_1000_1960_1028_0518 =
 	{0x1028, 0x0518, pci_subsys_1000_1960_1028_0518, 0};
@@ -15849,6 +16946,42 @@ static const pciSubsystemInfo pci_ss_info_1000_1960_1028_0531 =
 #define pci_ss_info_1028_0531 pci_ss_info_1000_1960_1028_0531
 #ifdef VENDOR_INCLUDE_NONVIDEO
 #endif
+static const pciSubsystemInfo pci_ss_info_1002_4150_1458_4024 =
+	{0x1458, 0x4024, pci_subsys_1002_4150_1458_4024, 0};
+#undef pci_ss_info_1458_4024
+#define pci_ss_info_1458_4024 pci_ss_info_1002_4150_1458_4024
+static const pciSubsystemInfo pci_ss_info_1002_4150_148c_2064 =
+	{0x148c, 0x2064, pci_subsys_1002_4150_148c_2064, 0};
+#undef pci_ss_info_148c_2064
+#define pci_ss_info_148c_2064 pci_ss_info_1002_4150_148c_2064
+static const pciSubsystemInfo pci_ss_info_1002_4150_148c_2066 =
+	{0x148c, 0x2066, pci_subsys_1002_4150_148c_2066, 0};
+#undef pci_ss_info_148c_2066
+#define pci_ss_info_148c_2066 pci_ss_info_1002_4150_148c_2066
+static const pciSubsystemInfo pci_ss_info_1002_4150_174b_7c29 =
+	{0x174b, 0x7c29, pci_subsys_1002_4150_174b_7c29, 0};
+#undef pci_ss_info_174b_7c29
+#define pci_ss_info_174b_7c29 pci_ss_info_1002_4150_174b_7c29
+static const pciSubsystemInfo pci_ss_info_1002_4150_18bc_0101 =
+	{0x18bc, 0x0101, pci_subsys_1002_4150_18bc_0101, 0};
+#undef pci_ss_info_18bc_0101
+#define pci_ss_info_18bc_0101 pci_ss_info_1002_4150_18bc_0101
+static const pciSubsystemInfo pci_ss_info_1002_4170_1458_4025 =
+	{0x1458, 0x4025, pci_subsys_1002_4170_1458_4025, 0};
+#undef pci_ss_info_1458_4025
+#define pci_ss_info_1458_4025 pci_ss_info_1002_4170_1458_4025
+static const pciSubsystemInfo pci_ss_info_1002_4170_148c_2067 =
+	{0x148c, 0x2067, pci_subsys_1002_4170_148c_2067, 0};
+#undef pci_ss_info_148c_2067
+#define pci_ss_info_148c_2067 pci_ss_info_1002_4170_148c_2067
+static const pciSubsystemInfo pci_ss_info_1002_4170_174b_7c28 =
+	{0x174b, 0x7c28, pci_subsys_1002_4170_174b_7c28, 0};
+#undef pci_ss_info_174b_7c28
+#define pci_ss_info_174b_7c28 pci_ss_info_1002_4170_174b_7c28
+static const pciSubsystemInfo pci_ss_info_1002_4170_18bc_0100 =
+	{0x18bc, 0x0100, pci_subsys_1002_4170_18bc_0100, 0};
+#undef pci_ss_info_18bc_0100
+#define pci_ss_info_18bc_0100 pci_ss_info_1002_4170_18bc_0100
 static const pciSubsystemInfo pci_ss_info_1002_4242_1002_02aa =
 	{0x1002, 0x02aa, pci_subsys_1002_4242_1002_02aa, 0};
 #undef pci_ss_info_1002_02aa
@@ -16489,6 +17622,26 @@ static const pciSubsystemInfo pci_ss_info_1002_5654_1002_5654 =
 	{0x1002, 0x5654, pci_subsys_1002_5654_1002_5654, 0};
 #undef pci_ss_info_1002_5654
 #define pci_ss_info_1002_5654 pci_ss_info_1002_5654_1002_5654
+static const pciSubsystemInfo pci_ss_info_1002_5941_17af_200d =
+	{0x17af, 0x200d, pci_subsys_1002_5941_17af_200d, 0};
+#undef pci_ss_info_17af_200d
+#define pci_ss_info_17af_200d pci_ss_info_1002_5941_17af_200d
+static const pciSubsystemInfo pci_ss_info_1002_5941_18bc_0050 =
+	{0x18bc, 0x0050, pci_subsys_1002_5941_18bc_0050, 0};
+#undef pci_ss_info_18bc_0050
+#define pci_ss_info_18bc_0050 pci_ss_info_1002_5941_18bc_0050
+static const pciSubsystemInfo pci_ss_info_1002_5961_17af_200c =
+	{0x17af, 0x200c, pci_subsys_1002_5961_17af_200c, 0};
+#undef pci_ss_info_17af_200c
+#define pci_ss_info_17af_200c pci_ss_info_1002_5961_17af_200c
+static const pciSubsystemInfo pci_ss_info_1002_5961_18bc_0051 =
+	{0x18bc, 0x0051, pci_subsys_1002_5961_18bc_0051, 0};
+#undef pci_ss_info_18bc_0051
+#define pci_ss_info_18bc_0051 pci_ss_info_1002_5961_18bc_0051
+static const pciSubsystemInfo pci_ss_info_1002_5964_148c_2073 =
+	{0x148c, 0x2073, pci_subsys_1002_5964_148c_2073, 0};
+#undef pci_ss_info_148c_2073
+#define pci_ss_info_148c_2073 pci_ss_info_1002_5964_148c_2073
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciSubsystemInfo pci_ss_info_1004_0304_1004_0304 =
 	{0x1004, 0x0304, pci_subsys_1004_0304_1004_0304, 0};
@@ -16691,6 +17844,10 @@ static const pciSubsystemInfo pci_ss_info_1011_0019_1186_1102 =
 	{0x1186, 0x1102, pci_subsys_1011_0019_1186_1102, 0};
 #undef pci_ss_info_1186_1102
 #define pci_ss_info_1186_1102 pci_ss_info_1011_0019_1186_1102
+static const pciSubsystemInfo pci_ss_info_1011_0019_1186_1112 =
+	{0x1186, 0x1112, pci_subsys_1011_0019_1186_1112, 0};
+#undef pci_ss_info_1186_1112
+#define pci_ss_info_1186_1112 pci_ss_info_1011_0019_1186_1112
 static const pciSubsystemInfo pci_ss_info_1011_0019_1259_2800 =
 	{0x1259, 0x2800, pci_subsys_1011_0019_1259_2800, 0};
 #undef pci_ss_info_1259_2800
@@ -16767,6 +17924,10 @@ static const pciSubsystemInfo pci_ss_info_1011_0046_4c53_1051 =
 	{0x4c53, 0x1051, pci_subsys_1011_0046_4c53_1051, 0};
 #undef pci_ss_info_4c53_1051
 #define pci_ss_info_4c53_1051 pci_ss_info_1011_0046_4c53_1051
+static const pciSubsystemInfo pci_ss_info_1011_0046_9005_0364 =
+	{0x9005, 0x0364, pci_subsys_1011_0046_9005_0364, 0};
+#undef pci_ss_info_9005_0364
+#define pci_ss_info_9005_0364 pci_ss_info_1011_0046_9005_0364
 static const pciSubsystemInfo pci_ss_info_1011_0046_9005_0365 =
 	{0x9005, 0x0365, pci_subsys_1011_0046_9005_0365, 0};
 #undef pci_ss_info_9005_0365
@@ -16974,10 +18135,30 @@ static const pciSubsystemInfo pci_ss_info_101e_1960_101e_0475 =
 	{0x101e, 0x0475, pci_subsys_101e_1960_101e_0475, 0};
 #undef pci_ss_info_101e_0475
 #define pci_ss_info_101e_0475 pci_ss_info_101e_1960_101e_0475
+static const pciSubsystemInfo pci_ss_info_101e_1960_101e_0477 =
+	{0x101e, 0x0477, pci_subsys_101e_1960_101e_0477, 0};
+#undef pci_ss_info_101e_0477
+#define pci_ss_info_101e_0477 pci_ss_info_101e_1960_101e_0477
 static const pciSubsystemInfo pci_ss_info_101e_1960_101e_0493 =
 	{0x101e, 0x0493, pci_subsys_101e_1960_101e_0493, 0};
 #undef pci_ss_info_101e_0493
 #define pci_ss_info_101e_0493 pci_ss_info_101e_1960_101e_0493
+static const pciSubsystemInfo pci_ss_info_101e_1960_101e_0494 =
+	{0x101e, 0x0494, pci_subsys_101e_1960_101e_0494, 0};
+#undef pci_ss_info_101e_0494
+#define pci_ss_info_101e_0494 pci_ss_info_101e_1960_101e_0494
+static const pciSubsystemInfo pci_ss_info_101e_1960_101e_0503 =
+	{0x101e, 0x0503, pci_subsys_101e_1960_101e_0503, 0};
+#undef pci_ss_info_101e_0503
+#define pci_ss_info_101e_0503 pci_ss_info_101e_1960_101e_0503
+static const pciSubsystemInfo pci_ss_info_101e_1960_101e_0511 =
+	{0x101e, 0x0511, pci_subsys_101e_1960_101e_0511, 0};
+#undef pci_ss_info_101e_0511
+#define pci_ss_info_101e_0511 pci_ss_info_101e_1960_101e_0511
+static const pciSubsystemInfo pci_ss_info_101e_1960_101e_0522 =
+	{0x101e, 0x0522, pci_subsys_101e_1960_101e_0522, 0};
+#undef pci_ss_info_101e_0522
+#define pci_ss_info_101e_0522 pci_ss_info_101e_1960_101e_0522
 #endif
 static const pciSubsystemInfo pci_ss_info_101e_1960_1028_0471 =
 	{0x1028, 0x0471, pci_subsys_101e_1960_1028_0471, 0};
@@ -17187,6 +18368,58 @@ static const pciSubsystemInfo pci_ss_info_1028_000a_1028_0121 =
 	{0x1028, 0x0121, pci_subsys_1028_000a_1028_0121, 0};
 #undef pci_ss_info_1028_0121
 #define pci_ss_info_1028_0121 pci_ss_info_1028_000a_1028_0121
+static const pciSubsystemInfo pci_ss_info_1028_000e_1028_0123 =
+	{0x1028, 0x0123, pci_subsys_1028_000e_1028_0123, 0};
+#undef pci_ss_info_1028_0123
+#define pci_ss_info_1028_0123 pci_ss_info_1028_000e_1028_0123
+static const pciSubsystemInfo pci_ss_info_1028_000f_1028_013b =
+	{0x1028, 0x013b, pci_subsys_1028_000f_1028_013b, 0};
+#undef pci_ss_info_1028_013b
+#define pci_ss_info_1028_013b pci_ss_info_1028_000f_1028_013b
+static const pciSubsystemInfo pci_ss_info_1028_000f_1028_014a =
+	{0x1028, 0x014a, pci_subsys_1028_000f_1028_014a, 0};
+#undef pci_ss_info_1028_014a
+#define pci_ss_info_1028_014a pci_ss_info_1028_000f_1028_014a
+static const pciSubsystemInfo pci_ss_info_1028_000f_1028_014c =
+	{0x1028, 0x014c, pci_subsys_1028_000f_1028_014c, 0};
+#undef pci_ss_info_1028_014c
+#define pci_ss_info_1028_014c pci_ss_info_1028_000f_1028_014c
+static const pciSubsystemInfo pci_ss_info_1028_000f_1028_014d =
+	{0x1028, 0x014d, pci_subsys_1028_000f_1028_014d, 0};
+#undef pci_ss_info_1028_014d
+#define pci_ss_info_1028_014d pci_ss_info_1028_000f_1028_014d
+#ifdef VENDOR_INCLUDE_NONVIDEO
+static const pciSubsystemInfo pci_ss_info_102a_0010_9005_000f =
+	{0x9005, 0x000f, pci_subsys_102a_0010_9005_000f, 0};
+#undef pci_ss_info_9005_000f
+#define pci_ss_info_9005_000f pci_ss_info_102a_0010_9005_000f
+static const pciSubsystemInfo pci_ss_info_102a_0010_9005_0106 =
+	{0x9005, 0x0106, pci_subsys_102a_0010_9005_0106, 0};
+#undef pci_ss_info_9005_0106
+#define pci_ss_info_9005_0106 pci_ss_info_102a_0010_9005_0106
+static const pciSubsystemInfo pci_ss_info_102a_0010_9005_a180 =
+	{0x9005, 0xa180, pci_subsys_102a_0010_9005_a180, 0};
+#undef pci_ss_info_9005_a180
+#define pci_ss_info_9005_a180 pci_ss_info_102a_0010_9005_a180
+#endif
+static const pciSubsystemInfo pci_ss_info_102a_00c5_1028_00c5 =
+	{0x1028, 0x00c5, pci_subsys_102a_00c5_1028_00c5, 0};
+#undef pci_ss_info_1028_00c5
+#define pci_ss_info_1028_00c5 pci_ss_info_102a_00c5_1028_00c5
+#ifdef VENDOR_INCLUDE_NONVIDEO
+#endif
+static const pciSubsystemInfo pci_ss_info_102a_00cf_1028_0106 =
+	{0x1028, 0x0106, pci_subsys_102a_00cf_1028_0106, 0};
+#undef pci_ss_info_1028_0106
+#define pci_ss_info_1028_0106 pci_ss_info_102a_00cf_1028_0106
+#ifdef VENDOR_INCLUDE_NONVIDEO
+#endif
+static const pciSubsystemInfo pci_ss_info_102a_00cf_1028_0121 =
+	{0x1028, 0x0121, pci_subsys_102a_00cf_1028_0121, 0};
+#undef pci_ss_info_1028_0121
+#define pci_ss_info_1028_0121 pci_ss_info_102a_00cf_1028_0121
+#ifdef VENDOR_INCLUDE_NONVIDEO
+#endif
 static const pciSubsystemInfo pci_ss_info_102b_051a_102b_0100 =
 	{0x102b, 0x0100, pci_subsys_102b_051a_102b_0100, 0};
 #undef pci_ss_info_102b_0100
@@ -18215,6 +19448,14 @@ static const pciSubsystemInfo pci_ss_info_104c_8027_1028_00e6 =
 	{0x1028, 0x00e6, pci_subsys_104c_8027_1028_00e6, 0};
 #undef pci_ss_info_1028_00e6
 #define pci_ss_info_1028_00e6 pci_ss_info_104c_8027_1028_00e6
+static const pciSubsystemInfo pci_ss_info_104c_a106_175c_5000 =
+	{0x175c, 0x5000, pci_subsys_104c_a106_175c_5000, 0};
+#undef pci_ss_info_175c_5000
+#define pci_ss_info_175c_5000 pci_ss_info_104c_a106_175c_5000
+static const pciSubsystemInfo pci_ss_info_104c_a106_175c_8700 =
+	{0x175c, 0x8700, pci_subsys_104c_a106_175c_8700, 0};
+#undef pci_ss_info_175c_8700
+#define pci_ss_info_175c_8700 pci_ss_info_104c_a106_175c_8700
 static const pciSubsystemInfo pci_ss_info_104c_ac1b_0e11_b113 =
 	{0x0e11, 0xb113, pci_subsys_104c_ac1b_0e11_b113, 0};
 #undef pci_ss_info_0e11_b113
@@ -18223,6 +19464,10 @@ static const pciSubsystemInfo pci_ss_info_104c_ac1c_0e11_b121 =
 	{0x0e11, 0xb121, pci_subsys_104c_ac1c_0e11_b121, 0};
 #undef pci_ss_info_0e11_b121
 #define pci_ss_info_0e11_b121 pci_ss_info_104c_ac1c_0e11_b121
+static const pciSubsystemInfo pci_ss_info_104c_ac1c_1028_0088 =
+	{0x1028, 0x0088, pci_subsys_104c_ac1c_1028_0088, 0};
+#undef pci_ss_info_1028_0088
+#define pci_ss_info_1028_0088 pci_ss_info_104c_ac1c_1028_0088
 static const pciSubsystemInfo pci_ss_info_104c_ac42_1028_00e6 =
 	{0x1028, 0x00e6, pci_subsys_104c_ac42_1028_00e6, 0};
 #undef pci_ss_info_1028_00e6
@@ -18247,6 +19492,18 @@ static const pciSubsystemInfo pci_ss_info_104c_ac55_1014_0512 =
 	{0x1014, 0x0512, pci_subsys_104c_ac55_1014_0512, 0};
 #undef pci_ss_info_1014_0512
 #define pci_ss_info_1014_0512 pci_ss_info_104c_ac55_1014_0512
+static const pciSubsystemInfo pci_ss_info_104c_ac60_175c_5100 =
+	{0x175c, 0x5100, pci_subsys_104c_ac60_175c_5100, 0};
+#undef pci_ss_info_175c_5100
+#define pci_ss_info_175c_5100 pci_ss_info_104c_ac60_175c_5100
+static const pciSubsystemInfo pci_ss_info_104c_ac60_175c_6100 =
+	{0x175c, 0x6100, pci_subsys_104c_ac60_175c_6100, 0};
+#undef pci_ss_info_175c_6100
+#define pci_ss_info_175c_6100 pci_ss_info_104c_ac60_175c_6100
+static const pciSubsystemInfo pci_ss_info_104c_ac60_175c_6200 =
+	{0x175c, 0x6200, pci_subsys_104c_ac60_175c_6200, 0};
+#undef pci_ss_info_175c_6200
+#define pci_ss_info_175c_6200 pci_ss_info_104c_ac60_175c_6200
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciSubsystemInfo pci_ss_info_1050_0840_1050_0001 =
 	{0x1050, 0x0001, pci_subsys_1050_0840_1050_0001, 0};
@@ -23562,6 +24819,24 @@ static const pciSubsystemInfo pci_ss_info_1522_0100_1522_0800 =
 #define pci_ss_info_1522_0800 pci_ss_info_1522_0100_1522_0800
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+static const pciSubsystemInfo pci_ss_info_168c_0013_1186_3203 =
+	{0x1186, 0x3203, pci_subsys_168c_0013_1186_3203, 0};
+#undef pci_ss_info_1186_3203
+#define pci_ss_info_1186_3203 pci_ss_info_168c_0013_1186_3203
+static const pciSubsystemInfo pci_ss_info_168c_0013_1186_3a94 =
+	{0x1186, 0x3a94, pci_subsys_168c_0013_1186_3a94, 0};
+#undef pci_ss_info_1186_3a94
+#define pci_ss_info_1186_3a94 pci_ss_info_168c_0013_1186_3a94
+static const pciSubsystemInfo pci_ss_info_168c_0013_168c_0013 =
+	{0x168c, 0x0013, pci_subsys_168c_0013_168c_0013, 0};
+#undef pci_ss_info_168c_0013
+#define pci_ss_info_168c_0013 pci_ss_info_168c_0013_168c_0013
+static const pciSubsystemInfo pci_ss_info_168c_0013_168c_1025 =
+	{0x168c, 0x1025, pci_subsys_168c_0013_168c_1025, 0};
+#undef pci_ss_info_168c_1025
+#define pci_ss_info_168c_1025 pci_ss_info_168c_0013_168c_1025
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciSubsystemInfo pci_ss_info_173b_03ea_173b_0001 =
 	{0x173b, 0x0001, pci_subsys_173b_03ea_173b_0001, 0};
 #undef pci_ss_info_173b_0001
@@ -23586,10 +24861,18 @@ static const pciSubsystemInfo pci_ss_info_3388_0021_4c53_1080 =
 	{0x4c53, 0x1080, pci_subsys_3388_0021_4c53_1080, 0};
 #undef pci_ss_info_4c53_1080
 #define pci_ss_info_4c53_1080 pci_ss_info_3388_0021_4c53_1080
+static const pciSubsystemInfo pci_ss_info_3388_0021_4c53_10a0 =
+	{0x4c53, 0x10a0, pci_subsys_3388_0021_4c53_10a0, 0};
+#undef pci_ss_info_4c53_10a0
+#define pci_ss_info_4c53_10a0 pci_ss_info_3388_0021_4c53_10a0
 static const pciSubsystemInfo pci_ss_info_3388_0021_4c53_3010 =
 	{0x4c53, 0x3010, pci_subsys_3388_0021_4c53_3010, 0};
 #undef pci_ss_info_4c53_3010
 #define pci_ss_info_4c53_3010 pci_ss_info_3388_0021_4c53_3010
+static const pciSubsystemInfo pci_ss_info_3388_0021_4c53_3011 =
+	{0x4c53, 0x3011, pci_subsys_3388_0021_4c53_3011, 0};
+#undef pci_ss_info_4c53_3011
+#define pci_ss_info_4c53_3011 pci_ss_info_3388_0021_4c53_3011
 static const pciSubsystemInfo pci_ss_info_3388_8011_3388_8011 =
 	{0x3388, 0x8011, pci_subsys_3388_8011_3388_8011, 0};
 #undef pci_ss_info_3388_8011
@@ -23652,11 +24935,39 @@ static const pciSubsystemInfo pci_ss_info_4005_4000_4005_4000 =
 #undef pci_ss_info_4005_4000
 #define pci_ss_info_4005_4000 pci_ss_info_4005_4000_4005_4000
 #ifdef VENDOR_INCLUDE_NONVIDEO
+static const pciSubsystemInfo pci_ss_info_4444_0016_0070_4009 =
+	{0x0070, 0x4009, pci_subsys_4444_0016_0070_4009, 0};
+#undef pci_ss_info_0070_4009
+#define pci_ss_info_0070_4009 pci_ss_info_4444_0016_0070_4009
+static const pciSubsystemInfo pci_ss_info_4444_0803_0070_4000 =
+	{0x0070, 0x4000, pci_subsys_4444_0803_0070_4000, 0};
+#undef pci_ss_info_0070_4000
+#define pci_ss_info_0070_4000 pci_ss_info_4444_0803_0070_4000
+static const pciSubsystemInfo pci_ss_info_4444_0803_0070_4001 =
+	{0x0070, 0x4001, pci_subsys_4444_0803_0070_4001, 0};
+#undef pci_ss_info_0070_4001
+#define pci_ss_info_0070_4001 pci_ss_info_4444_0803_0070_4001
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciSubsystemInfo pci_ss_info_4a14_5000_4a14_5000 =
 	{0x4a14, 0x5000, pci_subsys_4a14_5000_4a14_5000, 0};
 #undef pci_ss_info_4a14_5000
 #define pci_ss_info_4a14_5000 pci_ss_info_4a14_5000_4a14_5000
 #endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
+static const pciSubsystemInfo pci_ss_info_4c53_0000_4c53_3000 =
+	{0x4c53, 0x3000, pci_subsys_4c53_0000_4c53_3000, 0};
+#undef pci_ss_info_4c53_3000
+#define pci_ss_info_4c53_3000 pci_ss_info_4c53_0000_4c53_3000
+static const pciSubsystemInfo pci_ss_info_4c53_0000_4c53_3001 =
+	{0x4c53, 0x3001, pci_subsys_4c53_0000_4c53_3001, 0};
+#undef pci_ss_info_4c53_3001
+#define pci_ss_info_4c53_3001 pci_ss_info_4c53_0000_4c53_3001
+static const pciSubsystemInfo pci_ss_info_4c53_0001_4c53_3002 =
+	{0x4c53, 0x3002, pci_subsys_4c53_0001_4c53_3002, 0};
+#undef pci_ss_info_4c53_3002
+#define pci_ss_info_4c53_3002 pci_ss_info_4c53_0001_4c53_3002
+#endif
 static const pciSubsystemInfo pci_ss_info_5333_8900_5333_8900 =
 	{0x5333, 0x8900, pci_subsys_5333_8900_5333_8900, 0};
 #undef pci_ss_info_5333_8900
@@ -23865,6 +25176,10 @@ static const pciSubsystemInfo pci_ss_info_5333_9102_1092_5a57 =
 	{0x1092, 0x5a57, pci_subsys_5333_9102_1092_5a57, 0};
 #undef pci_ss_info_1092_5a57
 #define pci_ss_info_1092_5a57 pci_ss_info_5333_9102_1092_5a57
+static const pciSubsystemInfo pci_ss_info_8086_0008_0008_1000 =
+	{0x0008, 0x1000, pci_subsys_8086_0008_0008_1000, 0};
+#undef pci_ss_info_0008_1000
+#define pci_ss_info_0008_1000 pci_ss_info_8086_0008_0008_1000
 static const pciSubsystemInfo pci_ss_info_8086_1000_0e11_b0df =
 	{0x0e11, 0xb0df, pci_subsys_8086_1000_0e11_b0df, 0};
 #undef pci_ss_info_0e11_b0df
@@ -23929,6 +25244,14 @@ static const pciSubsystemInfo pci_ss_info_8086_1004_8086_2004 =
 	{0x8086, 0x2004, pci_subsys_8086_1004_8086_2004, 0};
 #undef pci_ss_info_8086_2004
 #define pci_ss_info_8086_2004 pci_ss_info_8086_1004_8086_2004
+static const pciSubsystemInfo pci_ss_info_8086_1008_1014_0269 =
+	{0x1014, 0x0269, pci_subsys_8086_1008_1014_0269, 0};
+#undef pci_ss_info_1014_0269
+#define pci_ss_info_1014_0269 pci_ss_info_8086_1008_1014_0269
+static const pciSubsystemInfo pci_ss_info_8086_1008_1028_011c =
+	{0x1028, 0x011c, pci_subsys_8086_1008_1028_011c, 0};
+#undef pci_ss_info_1028_011c
+#define pci_ss_info_1028_011c pci_ss_info_8086_1008_1028_011c
 static const pciSubsystemInfo pci_ss_info_8086_1008_8086_1107 =
 	{0x8086, 0x1107, pci_subsys_8086_1008_8086_1107, 0};
 #undef pci_ss_info_8086_1107
@@ -23941,6 +25264,14 @@ static const pciSubsystemInfo pci_ss_info_8086_1008_8086_2110 =
 	{0x8086, 0x2110, pci_subsys_8086_1008_8086_2110, 0};
 #undef pci_ss_info_8086_2110
 #define pci_ss_info_8086_2110 pci_ss_info_8086_1008_8086_2110
+static const pciSubsystemInfo pci_ss_info_8086_1008_8086_3108 =
+	{0x8086, 0x3108, pci_subsys_8086_1008_8086_3108, 0};
+#undef pci_ss_info_8086_3108
+#define pci_ss_info_8086_3108 pci_ss_info_8086_1008_8086_3108
+static const pciSubsystemInfo pci_ss_info_8086_1009_1014_0268 =
+	{0x1014, 0x0268, pci_subsys_8086_1009_1014_0268, 0};
+#undef pci_ss_info_1014_0268
+#define pci_ss_info_1014_0268 pci_ss_info_8086_1009_1014_0268
 static const pciSubsystemInfo pci_ss_info_8086_1009_8086_1109 =
 	{0x8086, 0x1109, pci_subsys_8086_1009_8086_1109, 0};
 #undef pci_ss_info_8086_1109
@@ -23957,6 +25288,38 @@ static const pciSubsystemInfo pci_ss_info_8086_100c_8086_2112 =
 	{0x8086, 0x2112, pci_subsys_8086_100c_8086_2112, 0};
 #undef pci_ss_info_8086_2112
 #define pci_ss_info_8086_2112 pci_ss_info_8086_100c_8086_2112
+static const pciSubsystemInfo pci_ss_info_8086_100d_1028_0123 =
+	{0x1028, 0x0123, pci_subsys_8086_100d_1028_0123, 0};
+#undef pci_ss_info_1028_0123
+#define pci_ss_info_1028_0123 pci_ss_info_8086_100d_1028_0123
+static const pciSubsystemInfo pci_ss_info_8086_100d_1079_891f =
+	{0x1079, 0x891f, pci_subsys_8086_100d_1079_891f, 0};
+#undef pci_ss_info_1079_891f
+#define pci_ss_info_1079_891f pci_ss_info_8086_100d_1079_891f
+static const pciSubsystemInfo pci_ss_info_8086_100d_4c53_1080 =
+	{0x4c53, 0x1080, pci_subsys_8086_100d_4c53_1080, 0};
+#undef pci_ss_info_4c53_1080
+#define pci_ss_info_4c53_1080 pci_ss_info_8086_100d_4c53_1080
+static const pciSubsystemInfo pci_ss_info_8086_100d_8086_110d =
+	{0x8086, 0x110d, pci_subsys_8086_100d_8086_110d, 0};
+#undef pci_ss_info_8086_110d
+#define pci_ss_info_8086_110d pci_ss_info_8086_100d_8086_110d
+static const pciSubsystemInfo pci_ss_info_8086_100e_1014_0265 =
+	{0x1014, 0x0265, pci_subsys_8086_100e_1014_0265, 0};
+#undef pci_ss_info_1014_0265
+#define pci_ss_info_1014_0265 pci_ss_info_8086_100e_1014_0265
+static const pciSubsystemInfo pci_ss_info_8086_100e_1014_0267 =
+	{0x1014, 0x0267, pci_subsys_8086_100e_1014_0267, 0};
+#undef pci_ss_info_1014_0267
+#define pci_ss_info_1014_0267 pci_ss_info_8086_100e_1014_0267
+static const pciSubsystemInfo pci_ss_info_8086_100e_1014_026a =
+	{0x1014, 0x026a, pci_subsys_8086_100e_1014_026a, 0};
+#undef pci_ss_info_1014_026a
+#define pci_ss_info_1014_026a pci_ss_info_8086_100e_1014_026a
+static const pciSubsystemInfo pci_ss_info_8086_100e_107b_8920 =
+	{0x107b, 0x8920, pci_subsys_8086_100e_107b_8920, 0};
+#undef pci_ss_info_107b_8920
+#define pci_ss_info_107b_8920 pci_ss_info_8086_100e_107b_8920
 static const pciSubsystemInfo pci_ss_info_8086_100e_8086_001e =
 	{0x8086, 0x001e, pci_subsys_8086_100e_8086_001e, 0};
 #undef pci_ss_info_8086_001e
@@ -23965,22 +25328,146 @@ static const pciSubsystemInfo pci_ss_info_8086_100e_8086_002e =
 	{0x8086, 0x002e, pci_subsys_8086_100e_8086_002e, 0};
 #undef pci_ss_info_8086_002e
 #define pci_ss_info_8086_002e pci_ss_info_8086_100e_8086_002e
+static const pciSubsystemInfo pci_ss_info_8086_100f_1014_0269 =
+	{0x1014, 0x0269, pci_subsys_8086_100f_1014_0269, 0};
+#undef pci_ss_info_1014_0269
+#define pci_ss_info_1014_0269 pci_ss_info_8086_100f_1014_0269
+static const pciSubsystemInfo pci_ss_info_8086_100f_1014_028e =
+	{0x1014, 0x028e, pci_subsys_8086_100f_1014_028e, 0};
+#undef pci_ss_info_1014_028e
+#define pci_ss_info_1014_028e pci_ss_info_8086_100f_1014_028e
+static const pciSubsystemInfo pci_ss_info_8086_100f_8086_1000 =
+	{0x8086, 0x1000, pci_subsys_8086_100f_8086_1000, 0};
+#undef pci_ss_info_8086_1000
+#define pci_ss_info_8086_1000 pci_ss_info_8086_100f_8086_1000
 static const pciSubsystemInfo pci_ss_info_8086_100f_8086_1001 =
 	{0x8086, 0x1001, pci_subsys_8086_100f_8086_1001, 0};
 #undef pci_ss_info_8086_1001
 #define pci_ss_info_8086_1001 pci_ss_info_8086_100f_8086_1001
+static const pciSubsystemInfo pci_ss_info_8086_1010_1014_027c =
+	{0x1014, 0x027c, pci_subsys_8086_1010_1014_027c, 0};
+#undef pci_ss_info_1014_027c
+#define pci_ss_info_1014_027c pci_ss_info_8086_1010_1014_027c
+static const pciSubsystemInfo pci_ss_info_8086_1010_18fb_7872 =
+	{0x18fb, 0x7872, pci_subsys_8086_1010_18fb_7872, 0};
+#undef pci_ss_info_18fb_7872
+#define pci_ss_info_18fb_7872 pci_ss_info_8086_1010_18fb_7872
+static const pciSubsystemInfo pci_ss_info_8086_1010_4c53_1080 =
+	{0x4c53, 0x1080, pci_subsys_8086_1010_4c53_1080, 0};
+#undef pci_ss_info_4c53_1080
+#define pci_ss_info_4c53_1080 pci_ss_info_8086_1010_4c53_1080
+static const pciSubsystemInfo pci_ss_info_8086_1010_4c53_10a0 =
+	{0x4c53, 0x10a0, pci_subsys_8086_1010_4c53_10a0, 0};
+#undef pci_ss_info_4c53_10a0
+#define pci_ss_info_4c53_10a0 pci_ss_info_8086_1010_4c53_10a0
 static const pciSubsystemInfo pci_ss_info_8086_1010_8086_1011 =
 	{0x8086, 0x1011, pci_subsys_8086_1010_8086_1011, 0};
 #undef pci_ss_info_8086_1011
 #define pci_ss_info_8086_1011 pci_ss_info_8086_1010_8086_1011
+static const pciSubsystemInfo pci_ss_info_8086_1010_8086_101a =
+	{0x8086, 0x101a, pci_subsys_8086_1010_8086_101a, 0};
+#undef pci_ss_info_8086_101a
+#define pci_ss_info_8086_101a pci_ss_info_8086_1010_8086_101a
+static const pciSubsystemInfo pci_ss_info_8086_1011_1014_0268 =
+	{0x1014, 0x0268, pci_subsys_8086_1011_1014_0268, 0};
+#undef pci_ss_info_1014_0268
+#define pci_ss_info_1014_0268 pci_ss_info_8086_1011_1014_0268
 static const pciSubsystemInfo pci_ss_info_8086_1011_8086_1002 =
 	{0x8086, 0x1002, pci_subsys_8086_1011_8086_1002, 0};
 #undef pci_ss_info_8086_1002
 #define pci_ss_info_8086_1002 pci_ss_info_8086_1011_8086_1002
+static const pciSubsystemInfo pci_ss_info_8086_1011_8086_1003 =
+	{0x8086, 0x1003, pci_subsys_8086_1011_8086_1003, 0};
+#undef pci_ss_info_8086_1003
+#define pci_ss_info_8086_1003 pci_ss_info_8086_1011_8086_1003
 static const pciSubsystemInfo pci_ss_info_8086_1012_8086_1012 =
 	{0x8086, 0x1012, pci_subsys_8086_1012_8086_1012, 0};
 #undef pci_ss_info_8086_1012
 #define pci_ss_info_8086_1012 pci_ss_info_8086_1012_8086_1012
+static const pciSubsystemInfo pci_ss_info_8086_1013_8086_0013 =
+	{0x8086, 0x0013, pci_subsys_8086_1013_8086_0013, 0};
+#undef pci_ss_info_8086_0013
+#define pci_ss_info_8086_0013 pci_ss_info_8086_1013_8086_0013
+static const pciSubsystemInfo pci_ss_info_8086_1013_8086_1113 =
+	{0x8086, 0x1113, pci_subsys_8086_1013_8086_1113, 0};
+#undef pci_ss_info_8086_1113
+#define pci_ss_info_8086_1113 pci_ss_info_8086_1013_8086_1113
+static const pciSubsystemInfo pci_ss_info_8086_1016_1014_052c =
+	{0x1014, 0x052c, pci_subsys_8086_1016_1014_052c, 0};
+#undef pci_ss_info_1014_052c
+#define pci_ss_info_1014_052c pci_ss_info_8086_1016_1014_052c
+static const pciSubsystemInfo pci_ss_info_8086_1016_1179_0001 =
+	{0x1179, 0x0001, pci_subsys_8086_1016_1179_0001, 0};
+#undef pci_ss_info_1179_0001
+#define pci_ss_info_1179_0001 pci_ss_info_8086_1016_1179_0001
+static const pciSubsystemInfo pci_ss_info_8086_1016_8086_1016 =
+	{0x8086, 0x1016, pci_subsys_8086_1016_8086_1016, 0};
+#undef pci_ss_info_8086_1016
+#define pci_ss_info_8086_1016 pci_ss_info_8086_1016_8086_1016
+static const pciSubsystemInfo pci_ss_info_8086_1017_8086_1017 =
+	{0x8086, 0x1017, pci_subsys_8086_1017_8086_1017, 0};
+#undef pci_ss_info_8086_1017
+#define pci_ss_info_8086_1017 pci_ss_info_8086_1017_8086_1017
+static const pciSubsystemInfo pci_ss_info_8086_1018_8086_1018 =
+	{0x8086, 0x1018, pci_subsys_8086_1018_8086_1018, 0};
+#undef pci_ss_info_8086_1018
+#define pci_ss_info_8086_1018 pci_ss_info_8086_1018_8086_1018
+static const pciSubsystemInfo pci_ss_info_8086_1019_8086_1019 =
+	{0x8086, 0x1019, pci_subsys_8086_1019_8086_1019, 0};
+#undef pci_ss_info_8086_1019
+#define pci_ss_info_8086_1019 pci_ss_info_8086_1019_8086_1019
+static const pciSubsystemInfo pci_ss_info_8086_101d_8086_1000 =
+	{0x8086, 0x1000, pci_subsys_8086_101d_8086_1000, 0};
+#undef pci_ss_info_8086_1000
+#define pci_ss_info_8086_1000 pci_ss_info_8086_101d_8086_1000
+static const pciSubsystemInfo pci_ss_info_8086_101e_1014_0549 =
+	{0x1014, 0x0549, pci_subsys_8086_101e_1014_0549, 0};
+#undef pci_ss_info_1014_0549
+#define pci_ss_info_1014_0549 pci_ss_info_8086_101e_1014_0549
+static const pciSubsystemInfo pci_ss_info_8086_101e_1179_0001 =
+	{0x1179, 0x0001, pci_subsys_8086_101e_1179_0001, 0};
+#undef pci_ss_info_1179_0001
+#define pci_ss_info_1179_0001 pci_ss_info_8086_101e_1179_0001
+static const pciSubsystemInfo pci_ss_info_8086_101e_8086_101e =
+	{0x8086, 0x101e, pci_subsys_8086_101e_8086_101e, 0};
+#undef pci_ss_info_8086_101e
+#define pci_ss_info_8086_101e pci_ss_info_8086_101e_8086_101e
+static const pciSubsystemInfo pci_ss_info_8086_1026_8086_1000 =
+	{0x8086, 0x1000, pci_subsys_8086_1026_8086_1000, 0};
+#undef pci_ss_info_8086_1000
+#define pci_ss_info_8086_1000 pci_ss_info_8086_1026_8086_1000
+static const pciSubsystemInfo pci_ss_info_8086_1026_8086_1001 =
+	{0x8086, 0x1001, pci_subsys_8086_1026_8086_1001, 0};
+#undef pci_ss_info_8086_1001
+#define pci_ss_info_8086_1001 pci_ss_info_8086_1026_8086_1001
+static const pciSubsystemInfo pci_ss_info_8086_1026_8086_1002 =
+	{0x8086, 0x1002, pci_subsys_8086_1026_8086_1002, 0};
+#undef pci_ss_info_8086_1002
+#define pci_ss_info_8086_1002 pci_ss_info_8086_1026_8086_1002
+static const pciSubsystemInfo pci_ss_info_8086_1026_8086_1026 =
+	{0x8086, 0x1026, pci_subsys_8086_1026_8086_1026, 0};
+#undef pci_ss_info_8086_1026
+#define pci_ss_info_8086_1026 pci_ss_info_8086_1026_8086_1026
+static const pciSubsystemInfo pci_ss_info_8086_1027_8086_1001 =
+	{0x8086, 0x1001, pci_subsys_8086_1027_8086_1001, 0};
+#undef pci_ss_info_8086_1001
+#define pci_ss_info_8086_1001 pci_ss_info_8086_1027_8086_1001
+static const pciSubsystemInfo pci_ss_info_8086_1027_8086_1002 =
+	{0x8086, 0x1002, pci_subsys_8086_1027_8086_1002, 0};
+#undef pci_ss_info_8086_1002
+#define pci_ss_info_8086_1002 pci_ss_info_8086_1027_8086_1002
+static const pciSubsystemInfo pci_ss_info_8086_1027_8086_1003 =
+	{0x8086, 0x1003, pci_subsys_8086_1027_8086_1003, 0};
+#undef pci_ss_info_8086_1003
+#define pci_ss_info_8086_1003 pci_ss_info_8086_1027_8086_1003
+static const pciSubsystemInfo pci_ss_info_8086_1027_8086_1027 =
+	{0x8086, 0x1027, pci_subsys_8086_1027_8086_1027, 0};
+#undef pci_ss_info_8086_1027
+#define pci_ss_info_8086_1027 pci_ss_info_8086_1027_8086_1027
+static const pciSubsystemInfo pci_ss_info_8086_1028_8086_1028 =
+	{0x8086, 0x1028, pci_subsys_8086_1028_8086_1028, 0};
+#undef pci_ss_info_8086_1028
+#define pci_ss_info_8086_1028 pci_ss_info_8086_1028_8086_1028
 static const pciSubsystemInfo pci_ss_info_8086_1031_1014_0209 =
 	{0x1014, 0x0209, pci_subsys_8086_1031_1014_0209, 0};
 #undef pci_ss_info_1014_0209
@@ -24013,10 +25500,110 @@ static const pciSubsystemInfo pci_ss_info_8086_1031_144d_c006 =
 	{0x144d, 0xc006, pci_subsys_8086_1031_144d_c006, 0};
 #undef pci_ss_info_144d_c006
 #define pci_ss_info_144d_c006 pci_ss_info_8086_1031_144d_c006
+static const pciSubsystemInfo pci_ss_info_8086_1039_1014_0267 =
+	{0x1014, 0x0267, pci_subsys_8086_1039_1014_0267, 0};
+#undef pci_ss_info_1014_0267
+#define pci_ss_info_1014_0267 pci_ss_info_8086_1039_1014_0267
 static const pciSubsystemInfo pci_ss_info_8086_1040_16be_1040 =
 	{0x16be, 0x1040, pci_subsys_8086_1040_16be_1040, 0};
 #undef pci_ss_info_16be_1040
 #define pci_ss_info_16be_1040 pci_ss_info_8086_1040_16be_1040
+static const pciSubsystemInfo pci_ss_info_8086_1048_8086_a01f =
+	{0x8086, 0xa01f, pci_subsys_8086_1048_8086_a01f, 0};
+#undef pci_ss_info_8086_a01f
+#define pci_ss_info_8086_a01f pci_ss_info_8086_1048_8086_a01f
+static const pciSubsystemInfo pci_ss_info_8086_1048_8086_a11f =
+	{0x8086, 0xa11f, pci_subsys_8086_1048_8086_a11f, 0};
+#undef pci_ss_info_8086_a11f
+#define pci_ss_info_8086_a11f pci_ss_info_8086_1048_8086_a11f
+static const pciSubsystemInfo pci_ss_info_8086_1050_1462_728c =
+	{0x1462, 0x728c, pci_subsys_8086_1050_1462_728c, 0};
+#undef pci_ss_info_1462_728c
+#define pci_ss_info_1462_728c pci_ss_info_8086_1050_1462_728c
+static const pciSubsystemInfo pci_ss_info_8086_1075_8086_0075 =
+	{0x8086, 0x0075, pci_subsys_8086_1075_8086_0075, 0};
+#undef pci_ss_info_8086_0075
+#define pci_ss_info_8086_0075 pci_ss_info_8086_1075_8086_0075
+static const pciSubsystemInfo pci_ss_info_8086_1075_8086_1075 =
+	{0x8086, 0x1075, pci_subsys_8086_1075_8086_1075, 0};
+#undef pci_ss_info_8086_1075
+#define pci_ss_info_8086_1075 pci_ss_info_8086_1075_8086_1075
+static const pciSubsystemInfo pci_ss_info_8086_1076_8086_0076 =
+	{0x8086, 0x0076, pci_subsys_8086_1076_8086_0076, 0};
+#undef pci_ss_info_8086_0076
+#define pci_ss_info_8086_0076 pci_ss_info_8086_1076_8086_0076
+static const pciSubsystemInfo pci_ss_info_8086_1076_8086_1076 =
+	{0x8086, 0x1076, pci_subsys_8086_1076_8086_1076, 0};
+#undef pci_ss_info_8086_1076
+#define pci_ss_info_8086_1076 pci_ss_info_8086_1076_8086_1076
+static const pciSubsystemInfo pci_ss_info_8086_1076_8086_1176 =
+	{0x8086, 0x1176, pci_subsys_8086_1076_8086_1176, 0};
+#undef pci_ss_info_8086_1176
+#define pci_ss_info_8086_1176 pci_ss_info_8086_1076_8086_1176
+static const pciSubsystemInfo pci_ss_info_8086_1076_8086_1276 =
+	{0x8086, 0x1276, pci_subsys_8086_1076_8086_1276, 0};
+#undef pci_ss_info_8086_1276
+#define pci_ss_info_8086_1276 pci_ss_info_8086_1076_8086_1276
+static const pciSubsystemInfo pci_ss_info_8086_1077_1179_0001 =
+	{0x1179, 0x0001, pci_subsys_8086_1077_1179_0001, 0};
+#undef pci_ss_info_1179_0001
+#define pci_ss_info_1179_0001 pci_ss_info_8086_1077_1179_0001
+static const pciSubsystemInfo pci_ss_info_8086_1077_8086_0077 =
+	{0x8086, 0x0077, pci_subsys_8086_1077_8086_0077, 0};
+#undef pci_ss_info_8086_0077
+#define pci_ss_info_8086_0077 pci_ss_info_8086_1077_8086_0077
+static const pciSubsystemInfo pci_ss_info_8086_1077_8086_1077 =
+	{0x8086, 0x1077, pci_subsys_8086_1077_8086_1077, 0};
+#undef pci_ss_info_8086_1077
+#define pci_ss_info_8086_1077 pci_ss_info_8086_1077_8086_1077
+static const pciSubsystemInfo pci_ss_info_8086_1078_8086_1078 =
+	{0x8086, 0x1078, pci_subsys_8086_1078_8086_1078, 0};
+#undef pci_ss_info_8086_1078
+#define pci_ss_info_8086_1078 pci_ss_info_8086_1078_8086_1078
+static const pciSubsystemInfo pci_ss_info_8086_1079_103c_12a6 =
+	{0x103c, 0x12a6, pci_subsys_8086_1079_103c_12a6, 0};
+#undef pci_ss_info_103c_12a6
+#define pci_ss_info_103c_12a6 pci_ss_info_8086_1079_103c_12a6
+static const pciSubsystemInfo pci_ss_info_8086_1079_103c_12cf =
+	{0x103c, 0x12cf, pci_subsys_8086_1079_103c_12cf, 0};
+#undef pci_ss_info_103c_12cf
+#define pci_ss_info_103c_12cf pci_ss_info_8086_1079_103c_12cf
+static const pciSubsystemInfo pci_ss_info_8086_1079_4c53_1090 =
+	{0x4c53, 0x1090, pci_subsys_8086_1079_4c53_1090, 0};
+#undef pci_ss_info_4c53_1090
+#define pci_ss_info_4c53_1090 pci_ss_info_8086_1079_4c53_1090
+static const pciSubsystemInfo pci_ss_info_8086_1079_8086_0079 =
+	{0x8086, 0x0079, pci_subsys_8086_1079_8086_0079, 0};
+#undef pci_ss_info_8086_0079
+#define pci_ss_info_8086_0079 pci_ss_info_8086_1079_8086_0079
+static const pciSubsystemInfo pci_ss_info_8086_1079_8086_1079 =
+	{0x8086, 0x1079, pci_subsys_8086_1079_8086_1079, 0};
+#undef pci_ss_info_8086_1079
+#define pci_ss_info_8086_1079 pci_ss_info_8086_1079_8086_1079
+static const pciSubsystemInfo pci_ss_info_8086_1079_8086_1179 =
+	{0x8086, 0x1179, pci_subsys_8086_1079_8086_1179, 0};
+#undef pci_ss_info_8086_1179
+#define pci_ss_info_8086_1179 pci_ss_info_8086_1079_8086_1179
+static const pciSubsystemInfo pci_ss_info_8086_1079_8086_117a =
+	{0x8086, 0x117a, pci_subsys_8086_1079_8086_117a, 0};
+#undef pci_ss_info_8086_117a
+#define pci_ss_info_8086_117a pci_ss_info_8086_1079_8086_117a
+static const pciSubsystemInfo pci_ss_info_8086_107a_8086_107a =
+	{0x8086, 0x107a, pci_subsys_8086_107a_8086_107a, 0};
+#undef pci_ss_info_8086_107a
+#define pci_ss_info_8086_107a pci_ss_info_8086_107a_8086_107a
+static const pciSubsystemInfo pci_ss_info_8086_107a_8086_127a =
+	{0x8086, 0x127a, pci_subsys_8086_107a_8086_127a, 0};
+#undef pci_ss_info_8086_127a
+#define pci_ss_info_8086_127a pci_ss_info_8086_107a_8086_127a
+static const pciSubsystemInfo pci_ss_info_8086_107b_8086_007b =
+	{0x8086, 0x007b, pci_subsys_8086_107b_8086_007b, 0};
+#undef pci_ss_info_8086_007b
+#define pci_ss_info_8086_007b pci_ss_info_8086_107b_8086_007b
+static const pciSubsystemInfo pci_ss_info_8086_107b_8086_107b =
+	{0x8086, 0x107b, pci_subsys_8086_107b_8086_107b, 0};
+#undef pci_ss_info_8086_107b
+#define pci_ss_info_8086_107b pci_ss_info_8086_107b_8086_107b
 static const pciSubsystemInfo pci_ss_info_8086_1130_1025_1016 =
 	{0x1025, 0x1016, pci_subsys_8086_1130_1025_1016, 0};
 #undef pci_ss_info_1025_1016
@@ -24061,6 +25648,18 @@ static const pciSubsystemInfo pci_ss_info_8086_1200_172a_0000 =
 	{0x172a, 0x0000, pci_subsys_8086_1200_172a_0000, 0};
 #undef pci_ss_info_172a_0000
 #define pci_ss_info_172a_0000 pci_ss_info_8086_1200_172a_0000
+static const pciSubsystemInfo pci_ss_info_8086_1209_4c53_1050 =
+	{0x4c53, 0x1050, pci_subsys_8086_1209_4c53_1050, 0};
+#undef pci_ss_info_4c53_1050
+#define pci_ss_info_4c53_1050 pci_ss_info_8086_1209_4c53_1050
+static const pciSubsystemInfo pci_ss_info_8086_1209_4c53_1051 =
+	{0x4c53, 0x1051, pci_subsys_8086_1209_4c53_1051, 0};
+#undef pci_ss_info_4c53_1051
+#define pci_ss_info_4c53_1051 pci_ss_info_8086_1209_4c53_1051
+static const pciSubsystemInfo pci_ss_info_8086_1209_4c53_1070 =
+	{0x4c53, 0x1070, pci_subsys_8086_1209_4c53_1070, 0};
+#undef pci_ss_info_4c53_1070
+#define pci_ss_info_4c53_1070 pci_ss_info_8086_1209_4c53_1070
 static const pciSubsystemInfo pci_ss_info_8086_1229_0e11_3001 =
 	{0x0e11, 0x3001, pci_subsys_8086_1229_0e11_3001, 0};
 #undef pci_ss_info_0e11_3001
@@ -24217,6 +25816,10 @@ static const pciSubsystemInfo pci_ss_info_8086_1229_1028_009b =
 	{0x1028, 0x009b, pci_subsys_8086_1229_1028_009b, 0};
 #undef pci_ss_info_1028_009b
 #define pci_ss_info_1028_009b pci_ss_info_8086_1229_1028_009b
+static const pciSubsystemInfo pci_ss_info_8086_1229_1028_00ce =
+	{0x1028, 0x00ce, pci_subsys_8086_1229_1028_00ce, 0};
+#undef pci_ss_info_1028_00ce
+#define pci_ss_info_1028_00ce pci_ss_info_8086_1229_1028_00ce
 static const pciSubsystemInfo pci_ss_info_8086_1229_1033_8000 =
 	{0x1033, 0x8000, pci_subsys_8086_1229_1033_8000, 0};
 #undef pci_ss_info_1033_8000
@@ -24317,6 +25920,10 @@ static const pciSubsystemInfo pci_ss_info_8086_1229_1668_1100 =
 	{0x1668, 0x1100, pci_subsys_8086_1229_1668_1100, 0};
 #undef pci_ss_info_1668_1100
 #define pci_ss_info_1668_1100 pci_ss_info_8086_1229_1668_1100
+static const pciSubsystemInfo pci_ss_info_8086_1229_4c53_1080 =
+	{0x4c53, 0x1080, pci_subsys_8086_1229_4c53_1080, 0};
+#undef pci_ss_info_4c53_1080
+#define pci_ss_info_4c53_1080 pci_ss_info_8086_1229_4c53_1080
 static const pciSubsystemInfo pci_ss_info_8086_1229_8086_0001 =
 	{0x8086, 0x0001, pci_subsys_8086_1229_8086_0001, 0};
 #undef pci_ss_info_8086_0001
@@ -24665,6 +26272,10 @@ static const pciSubsystemInfo pci_ss_info_8086_1461_15d9_3480 =
 	{0x15d9, 0x3480, pci_subsys_8086_1461_15d9_3480, 0};
 #undef pci_ss_info_15d9_3480
 #define pci_ss_info_15d9_3480 pci_ss_info_8086_1461_15d9_3480
+static const pciSubsystemInfo pci_ss_info_8086_1461_4c53_1090 =
+	{0x4c53, 0x1090, pci_subsys_8086_1461_4c53_1090, 0};
+#undef pci_ss_info_4c53_1090
+#define pci_ss_info_4c53_1090 pci_ss_info_8086_1461_4c53_1090
 static const pciSubsystemInfo pci_ss_info_8086_1960_101e_0431 =
 	{0x101e, 0x0431, pci_subsys_8086_1960_101e_0431, 0};
 #undef pci_ss_info_101e_0431
@@ -24745,6 +26356,22 @@ static const pciSubsystemInfo pci_ss_info_8086_1960_113c_03a2 =
 	{0x113c, 0x03a2, pci_subsys_8086_1960_113c_03a2, 0};
 #undef pci_ss_info_113c_03a2
 #define pci_ss_info_113c_03a2 pci_ss_info_8086_1960_113c_03a2
+static const pciSubsystemInfo pci_ss_info_8086_1960_e4bf_1010 =
+	{0xe4bf, 0x1010, pci_subsys_8086_1960_e4bf_1010, 0};
+#undef pci_ss_info_e4bf_1010
+#define pci_ss_info_e4bf_1010 pci_ss_info_8086_1960_e4bf_1010
+static const pciSubsystemInfo pci_ss_info_8086_1960_e4bf_1020 =
+	{0xe4bf, 0x1020, pci_subsys_8086_1960_e4bf_1020, 0};
+#undef pci_ss_info_e4bf_1020
+#define pci_ss_info_e4bf_1020 pci_ss_info_8086_1960_e4bf_1020
+static const pciSubsystemInfo pci_ss_info_8086_1960_e4bf_1040 =
+	{0xe4bf, 0x1040, pci_subsys_8086_1960_e4bf_1040, 0};
+#undef pci_ss_info_e4bf_1040
+#define pci_ss_info_e4bf_1040 pci_ss_info_8086_1960_e4bf_1040
+static const pciSubsystemInfo pci_ss_info_8086_1960_e4bf_3100 =
+	{0xe4bf, 0x3100, pci_subsys_8086_1960_e4bf_3100, 0};
+#undef pci_ss_info_e4bf_3100
+#define pci_ss_info_e4bf_3100 pci_ss_info_8086_1960_e4bf_3100
 static const pciSubsystemInfo pci_ss_info_8086_1962_105a_0000 =
 	{0x105a, 0x0000, pci_subsys_8086_1962_105a_0000, 0};
 #undef pci_ss_info_105a_0000
@@ -25021,6 +26648,10 @@ static const pciSubsystemInfo pci_ss_info_8086_244b_8086_4557 =
 	{0x8086, 0x4557, pci_subsys_8086_244b_8086_4557, 0};
 #undef pci_ss_info_8086_4557
 #define pci_ss_info_8086_4557 pci_ss_info_8086_244b_8086_4557
+static const pciSubsystemInfo pci_ss_info_8086_244e_1014_0267 =
+	{0x1014, 0x0267, pci_subsys_8086_244e_1014_0267, 0};
+#undef pci_ss_info_1014_0267
+#define pci_ss_info_1014_0267 pci_ss_info_8086_244e_1014_0267
 static const pciSubsystemInfo pci_ss_info_8086_2482_1014_0220 =
 	{0x1014, 0x0220, pci_subsys_8086_2482_1014_0220, 0};
 #undef pci_ss_info_1014_0220
@@ -25101,6 +26732,10 @@ static const pciSubsystemInfo pci_ss_info_8086_2486_1014_051a =
 	{0x1014, 0x051a, pci_subsys_8086_2486_1014_051a, 0};
 #undef pci_ss_info_1014_051a
 #define pci_ss_info_1014_051a pci_ss_info_8086_2486_1014_051a
+static const pciSubsystemInfo pci_ss_info_8086_2486_101f_1025 =
+	{0x101f, 0x1025, pci_subsys_8086_2486_101f_1025, 0};
+#undef pci_ss_info_101f_1025
+#define pci_ss_info_101f_1025 pci_ss_info_8086_2486_101f_1025
 static const pciSubsystemInfo pci_ss_info_8086_2486_104d_80e7 =
 	{0x104d, 0x80e7, pci_subsys_8086_2486_104d_80e7, 0};
 #undef pci_ss_info_104d_80e7
@@ -25153,38 +26788,194 @@ static const pciSubsystemInfo pci_ss_info_8086_248b_15d9_3480 =
 	{0x15d9, 0x3480, pci_subsys_8086_248b_15d9_3480, 0};
 #undef pci_ss_info_15d9_3480
 #define pci_ss_info_15d9_3480 pci_ss_info_8086_248b_15d9_3480
+static const pciSubsystemInfo pci_ss_info_8086_24c0_1014_0267 =
+	{0x1014, 0x0267, pci_subsys_8086_24c0_1014_0267, 0};
+#undef pci_ss_info_1014_0267
+#define pci_ss_info_1014_0267 pci_ss_info_8086_24c0_1014_0267
 static const pciSubsystemInfo pci_ss_info_8086_24c0_1462_5800 =
 	{0x1462, 0x5800, pci_subsys_8086_24c0_1462_5800, 0};
 #undef pci_ss_info_1462_5800
 #define pci_ss_info_1462_5800 pci_ss_info_8086_24c0_1462_5800
+static const pciSubsystemInfo pci_ss_info_8086_24c2_1014_0267 =
+	{0x1014, 0x0267, pci_subsys_8086_24c2_1014_0267, 0};
+#undef pci_ss_info_1014_0267
+#define pci_ss_info_1014_0267 pci_ss_info_8086_24c2_1014_0267
 static const pciSubsystemInfo pci_ss_info_8086_24c2_1462_5800 =
 	{0x1462, 0x5800, pci_subsys_8086_24c2_1462_5800, 0};
 #undef pci_ss_info_1462_5800
 #define pci_ss_info_1462_5800 pci_ss_info_8086_24c2_1462_5800
+static const pciSubsystemInfo pci_ss_info_8086_24c3_1014_0267 =
+	{0x1014, 0x0267, pci_subsys_8086_24c3_1014_0267, 0};
+#undef pci_ss_info_1014_0267
+#define pci_ss_info_1014_0267 pci_ss_info_8086_24c3_1014_0267
+static const pciSubsystemInfo pci_ss_info_8086_24c3_1458_24c2 =
+	{0x1458, 0x24c2, pci_subsys_8086_24c3_1458_24c2, 0};
+#undef pci_ss_info_1458_24c2
+#define pci_ss_info_1458_24c2 pci_ss_info_8086_24c3_1458_24c2
 static const pciSubsystemInfo pci_ss_info_8086_24c3_1462_5800 =
 	{0x1462, 0x5800, pci_subsys_8086_24c3_1462_5800, 0};
 #undef pci_ss_info_1462_5800
 #define pci_ss_info_1462_5800 pci_ss_info_8086_24c3_1462_5800
+static const pciSubsystemInfo pci_ss_info_8086_24c3_4c53_1090 =
+	{0x4c53, 0x1090, pci_subsys_8086_24c3_4c53_1090, 0};
+#undef pci_ss_info_4c53_1090
+#define pci_ss_info_4c53_1090 pci_ss_info_8086_24c3_4c53_1090
+static const pciSubsystemInfo pci_ss_info_8086_24c4_1014_0267 =
+	{0x1014, 0x0267, pci_subsys_8086_24c4_1014_0267, 0};
+#undef pci_ss_info_1014_0267
+#define pci_ss_info_1014_0267 pci_ss_info_8086_24c4_1014_0267
 static const pciSubsystemInfo pci_ss_info_8086_24c4_1462_5800 =
 	{0x1462, 0x5800, pci_subsys_8086_24c4_1462_5800, 0};
 #undef pci_ss_info_1462_5800
 #define pci_ss_info_1462_5800 pci_ss_info_8086_24c4_1462_5800
+static const pciSubsystemInfo pci_ss_info_8086_24c4_4c53_1090 =
+	{0x4c53, 0x1090, pci_subsys_8086_24c4_4c53_1090, 0};
+#undef pci_ss_info_4c53_1090
+#define pci_ss_info_4c53_1090 pci_ss_info_8086_24c4_4c53_1090
+static const pciSubsystemInfo pci_ss_info_8086_24c5_1014_0267 =
+	{0x1014, 0x0267, pci_subsys_8086_24c5_1014_0267, 0};
+#undef pci_ss_info_1014_0267
+#define pci_ss_info_1014_0267 pci_ss_info_8086_24c5_1014_0267
+static const pciSubsystemInfo pci_ss_info_8086_24c5_1458_a002 =
+	{0x1458, 0xa002, pci_subsys_8086_24c5_1458_a002, 0};
+#undef pci_ss_info_1458_a002
+#define pci_ss_info_1458_a002 pci_ss_info_8086_24c5_1458_a002
 static const pciSubsystemInfo pci_ss_info_8086_24c5_1462_5800 =
 	{0x1462, 0x5800, pci_subsys_8086_24c5_1462_5800, 0};
 #undef pci_ss_info_1462_5800
 #define pci_ss_info_1462_5800 pci_ss_info_8086_24c5_1462_5800
+static const pciSubsystemInfo pci_ss_info_8086_24c7_1014_0267 =
+	{0x1014, 0x0267, pci_subsys_8086_24c7_1014_0267, 0};
+#undef pci_ss_info_1014_0267
+#define pci_ss_info_1014_0267 pci_ss_info_8086_24c7_1014_0267
 static const pciSubsystemInfo pci_ss_info_8086_24c7_1462_5800 =
 	{0x1462, 0x5800, pci_subsys_8086_24c7_1462_5800, 0};
 #undef pci_ss_info_1462_5800
 #define pci_ss_info_1462_5800 pci_ss_info_8086_24c7_1462_5800
+static const pciSubsystemInfo pci_ss_info_8086_24cb_1014_0267 =
+	{0x1014, 0x0267, pci_subsys_8086_24cb_1014_0267, 0};
+#undef pci_ss_info_1014_0267
+#define pci_ss_info_1014_0267 pci_ss_info_8086_24cb_1014_0267
+static const pciSubsystemInfo pci_ss_info_8086_24cb_1458_24c2 =
+	{0x1458, 0x24c2, pci_subsys_8086_24cb_1458_24c2, 0};
+#undef pci_ss_info_1458_24c2
+#define pci_ss_info_1458_24c2 pci_ss_info_8086_24cb_1458_24c2
 static const pciSubsystemInfo pci_ss_info_8086_24cb_1462_5800 =
 	{0x1462, 0x5800, pci_subsys_8086_24cb_1462_5800, 0};
 #undef pci_ss_info_1462_5800
 #define pci_ss_info_1462_5800 pci_ss_info_8086_24cb_1462_5800
+static const pciSubsystemInfo pci_ss_info_8086_24cb_4c53_1090 =
+	{0x4c53, 0x1090, pci_subsys_8086_24cb_4c53_1090, 0};
+#undef pci_ss_info_4c53_1090
+#define pci_ss_info_4c53_1090 pci_ss_info_8086_24cb_4c53_1090
+static const pciSubsystemInfo pci_ss_info_8086_24cd_1014_0267 =
+	{0x1014, 0x0267, pci_subsys_8086_24cd_1014_0267, 0};
+#undef pci_ss_info_1014_0267
+#define pci_ss_info_1014_0267 pci_ss_info_8086_24cd_1014_0267
 static const pciSubsystemInfo pci_ss_info_8086_24cd_1462_3981 =
 	{0x1462, 0x3981, pci_subsys_8086_24cd_1462_3981, 0};
 #undef pci_ss_info_1462_3981
 #define pci_ss_info_1462_3981 pci_ss_info_8086_24cd_1462_3981
+static const pciSubsystemInfo pci_ss_info_8086_24cd_4c53_1090 =
+	{0x4c53, 0x1090, pci_subsys_8086_24cd_4c53_1090, 0};
+#undef pci_ss_info_4c53_1090
+#define pci_ss_info_4c53_1090 pci_ss_info_8086_24cd_4c53_1090
+static const pciSubsystemInfo pci_ss_info_8086_24d1_103c_12bc =
+	{0x103c, 0x12bc, pci_subsys_8086_24d1_103c_12bc, 0};
+#undef pci_ss_info_103c_12bc
+#define pci_ss_info_103c_12bc pci_ss_info_8086_24d1_103c_12bc
+static const pciSubsystemInfo pci_ss_info_8086_24d1_1462_7280 =
+	{0x1462, 0x7280, pci_subsys_8086_24d1_1462_7280, 0};
+#undef pci_ss_info_1462_7280
+#define pci_ss_info_1462_7280 pci_ss_info_8086_24d1_1462_7280
+static const pciSubsystemInfo pci_ss_info_8086_24d2_103c_12bc =
+	{0x103c, 0x12bc, pci_subsys_8086_24d2_103c_12bc, 0};
+#undef pci_ss_info_103c_12bc
+#define pci_ss_info_103c_12bc pci_ss_info_8086_24d2_103c_12bc
+static const pciSubsystemInfo pci_ss_info_8086_24d2_1043_80a6 =
+	{0x1043, 0x80a6, pci_subsys_8086_24d2_1043_80a6, 0};
+#undef pci_ss_info_1043_80a6
+#define pci_ss_info_1043_80a6 pci_ss_info_8086_24d2_1043_80a6
+static const pciSubsystemInfo pci_ss_info_8086_24d2_1462_7280 =
+	{0x1462, 0x7280, pci_subsys_8086_24d2_1462_7280, 0};
+#undef pci_ss_info_1462_7280
+#define pci_ss_info_1462_7280 pci_ss_info_8086_24d2_1462_7280
+static const pciSubsystemInfo pci_ss_info_8086_24d3_1043_80a6 =
+	{0x1043, 0x80a6, pci_subsys_8086_24d3_1043_80a6, 0};
+#undef pci_ss_info_1043_80a6
+#define pci_ss_info_1043_80a6 pci_ss_info_8086_24d3_1043_80a6
+static const pciSubsystemInfo pci_ss_info_8086_24d3_1462_7280 =
+	{0x1462, 0x7280, pci_subsys_8086_24d3_1462_7280, 0};
+#undef pci_ss_info_1462_7280
+#define pci_ss_info_1462_7280 pci_ss_info_8086_24d3_1462_7280
+static const pciSubsystemInfo pci_ss_info_8086_24d4_103c_12bc =
+	{0x103c, 0x12bc, pci_subsys_8086_24d4_103c_12bc, 0};
+#undef pci_ss_info_103c_12bc
+#define pci_ss_info_103c_12bc pci_ss_info_8086_24d4_103c_12bc
+static const pciSubsystemInfo pci_ss_info_8086_24d4_1043_80a6 =
+	{0x1043, 0x80a6, pci_subsys_8086_24d4_1043_80a6, 0};
+#undef pci_ss_info_1043_80a6
+#define pci_ss_info_1043_80a6 pci_ss_info_8086_24d4_1043_80a6
+static const pciSubsystemInfo pci_ss_info_8086_24d4_1462_7280 =
+	{0x1462, 0x7280, pci_subsys_8086_24d4_1462_7280, 0};
+#undef pci_ss_info_1462_7280
+#define pci_ss_info_1462_7280 pci_ss_info_8086_24d4_1462_7280
+static const pciSubsystemInfo pci_ss_info_8086_24d5_1043_80f3 =
+	{0x1043, 0x80f3, pci_subsys_8086_24d5_1043_80f3, 0};
+#undef pci_ss_info_1043_80f3
+#define pci_ss_info_1043_80f3 pci_ss_info_8086_24d5_1043_80f3
+static const pciSubsystemInfo pci_ss_info_8086_24d5_1462_7280 =
+	{0x1462, 0x7280, pci_subsys_8086_24d5_1462_7280, 0};
+#undef pci_ss_info_1462_7280
+#define pci_ss_info_1462_7280 pci_ss_info_8086_24d5_1462_7280
+static const pciSubsystemInfo pci_ss_info_8086_24d7_103c_12bc =
+	{0x103c, 0x12bc, pci_subsys_8086_24d7_103c_12bc, 0};
+#undef pci_ss_info_103c_12bc
+#define pci_ss_info_103c_12bc pci_ss_info_8086_24d7_103c_12bc
+static const pciSubsystemInfo pci_ss_info_8086_24d7_1043_80a6 =
+	{0x1043, 0x80a6, pci_subsys_8086_24d7_1043_80a6, 0};
+#undef pci_ss_info_1043_80a6
+#define pci_ss_info_1043_80a6 pci_ss_info_8086_24d7_1043_80a6
+static const pciSubsystemInfo pci_ss_info_8086_24d7_1462_7280 =
+	{0x1462, 0x7280, pci_subsys_8086_24d7_1462_7280, 0};
+#undef pci_ss_info_1462_7280
+#define pci_ss_info_1462_7280 pci_ss_info_8086_24d7_1462_7280
+static const pciSubsystemInfo pci_ss_info_8086_24db_103c_12bc =
+	{0x103c, 0x12bc, pci_subsys_8086_24db_103c_12bc, 0};
+#undef pci_ss_info_103c_12bc
+#define pci_ss_info_103c_12bc pci_ss_info_8086_24db_103c_12bc
+static const pciSubsystemInfo pci_ss_info_8086_24db_1043_80a6 =
+	{0x1043, 0x80a6, pci_subsys_8086_24db_1043_80a6, 0};
+#undef pci_ss_info_1043_80a6
+#define pci_ss_info_1043_80a6 pci_ss_info_8086_24db_1043_80a6
+static const pciSubsystemInfo pci_ss_info_8086_24db_1462_7280 =
+	{0x1462, 0x7280, pci_subsys_8086_24db_1462_7280, 0};
+#undef pci_ss_info_1462_7280
+#define pci_ss_info_1462_7280 pci_ss_info_8086_24db_1462_7280
+static const pciSubsystemInfo pci_ss_info_8086_24db_1462_7580 =
+	{0x1462, 0x7580, pci_subsys_8086_24db_1462_7580, 0};
+#undef pci_ss_info_1462_7580
+#define pci_ss_info_1462_7580 pci_ss_info_8086_24db_1462_7580
+static const pciSubsystemInfo pci_ss_info_8086_24dd_103c_12bc =
+	{0x103c, 0x12bc, pci_subsys_8086_24dd_103c_12bc, 0};
+#undef pci_ss_info_103c_12bc
+#define pci_ss_info_103c_12bc pci_ss_info_8086_24dd_103c_12bc
+static const pciSubsystemInfo pci_ss_info_8086_24dd_1043_80a6 =
+	{0x1043, 0x80a6, pci_subsys_8086_24dd_1043_80a6, 0};
+#undef pci_ss_info_1043_80a6
+#define pci_ss_info_1043_80a6 pci_ss_info_8086_24dd_1043_80a6
+static const pciSubsystemInfo pci_ss_info_8086_24dd_1462_7280 =
+	{0x1462, 0x7280, pci_subsys_8086_24dd_1462_7280, 0};
+#undef pci_ss_info_1462_7280
+#define pci_ss_info_1462_7280 pci_ss_info_8086_24dd_1462_7280
+static const pciSubsystemInfo pci_ss_info_8086_24de_1043_80a6 =
+	{0x1043, 0x80a6, pci_subsys_8086_24de_1043_80a6, 0};
+#undef pci_ss_info_1043_80a6
+#define pci_ss_info_1043_80a6 pci_ss_info_8086_24de_1043_80a6
+static const pciSubsystemInfo pci_ss_info_8086_24de_1462_7280 =
+	{0x1462, 0x7280, pci_subsys_8086_24de_1462_7280, 0};
+#undef pci_ss_info_1462_7280
+#define pci_ss_info_1462_7280 pci_ss_info_8086_24de_1462_7280
 static const pciSubsystemInfo pci_ss_info_8086_2500_1028_0095 =
 	{0x1028, 0x0095, pci_subsys_8086_2500_1028_0095, 0};
 #undef pci_ss_info_1028_0095
@@ -25209,10 +27000,42 @@ static const pciSubsystemInfo pci_ss_info_8086_2541_15d9_3480 =
 	{0x15d9, 0x3480, pci_subsys_8086_2541_15d9_3480, 0};
 #undef pci_ss_info_15d9_3480
 #define pci_ss_info_15d9_3480 pci_ss_info_8086_2541_15d9_3480
+static const pciSubsystemInfo pci_ss_info_8086_2541_4c53_1090 =
+	{0x4c53, 0x1090, pci_subsys_8086_2541_4c53_1090, 0};
+#undef pci_ss_info_4c53_1090
+#define pci_ss_info_4c53_1090 pci_ss_info_8086_2541_4c53_1090
+static const pciSubsystemInfo pci_ss_info_8086_2544_4c53_1090 =
+	{0x4c53, 0x1090, pci_subsys_8086_2544_4c53_1090, 0};
+#undef pci_ss_info_4c53_1090
+#define pci_ss_info_4c53_1090 pci_ss_info_8086_2544_4c53_1090
+static const pciSubsystemInfo pci_ss_info_8086_254c_4c53_1090 =
+	{0x4c53, 0x1090, pci_subsys_8086_254c_4c53_1090, 0};
+#undef pci_ss_info_4c53_1090
+#define pci_ss_info_4c53_1090 pci_ss_info_8086_254c_4c53_1090
+static const pciSubsystemInfo pci_ss_info_8086_2560_1458_2560 =
+	{0x1458, 0x2560, pci_subsys_8086_2560_1458_2560, 0};
+#undef pci_ss_info_1458_2560
+#define pci_ss_info_1458_2560 pci_ss_info_8086_2560_1458_2560
 static const pciSubsystemInfo pci_ss_info_8086_2560_1462_5800 =
 	{0x1462, 0x5800, pci_subsys_8086_2560_1462_5800, 0};
 #undef pci_ss_info_1462_5800
 #define pci_ss_info_1462_5800 pci_ss_info_8086_2560_1462_5800
+static const pciSubsystemInfo pci_ss_info_8086_2562_1014_0267 =
+	{0x1014, 0x0267, pci_subsys_8086_2562_1014_0267, 0};
+#undef pci_ss_info_1014_0267
+#define pci_ss_info_1014_0267 pci_ss_info_8086_2562_1014_0267
+static const pciSubsystemInfo pci_ss_info_8086_2570_1043_80f2 =
+	{0x1043, 0x80f2, pci_subsys_8086_2570_1043_80f2, 0};
+#undef pci_ss_info_1043_80f2
+#define pci_ss_info_1043_80f2 pci_ss_info_8086_2570_1043_80f2
+static const pciSubsystemInfo pci_ss_info_8086_2578_1462_7580 =
+	{0x1462, 0x7580, pci_subsys_8086_2578_1462_7580, 0};
+#undef pci_ss_info_1462_7580
+#define pci_ss_info_1462_7580 pci_ss_info_8086_2578_1462_7580
+static const pciSubsystemInfo pci_ss_info_8086_2578_15d9_4580 =
+	{0x15d9, 0x4580, pci_subsys_8086_2578_15d9_4580, 0};
+#undef pci_ss_info_15d9_4580
+#define pci_ss_info_15d9_4580 pci_ss_info_8086_2578_15d9_4580
 static const pciSubsystemInfo pci_ss_info_8086_3575_1014_021d =
 	{0x1014, 0x021d, pci_subsys_8086_3575_1014_021d, 0};
 #undef pci_ss_info_1014_021d
@@ -25229,6 +27052,22 @@ static const pciSubsystemInfo pci_ss_info_8086_5201_8086_0001 =
 	{0x8086, 0x0001, pci_subsys_8086_5201_8086_0001, 0};
 #undef pci_ss_info_8086_0001
 #define pci_ss_info_8086_0001 pci_ss_info_8086_5201_8086_0001
+static const pciSubsystemInfo pci_ss_info_8086_7120_4c53_1040 =
+	{0x4c53, 0x1040, pci_subsys_8086_7120_4c53_1040, 0};
+#undef pci_ss_info_4c53_1040
+#define pci_ss_info_4c53_1040 pci_ss_info_8086_7120_4c53_1040
+static const pciSubsystemInfo pci_ss_info_8086_7120_4c53_1060 =
+	{0x4c53, 0x1060, pci_subsys_8086_7120_4c53_1060, 0};
+#undef pci_ss_info_4c53_1060
+#define pci_ss_info_4c53_1060 pci_ss_info_8086_7120_4c53_1060
+static const pciSubsystemInfo pci_ss_info_8086_7121_4c53_1040 =
+	{0x4c53, 0x1040, pci_subsys_8086_7121_4c53_1040, 0};
+#undef pci_ss_info_4c53_1040
+#define pci_ss_info_4c53_1040 pci_ss_info_8086_7121_4c53_1040
+static const pciSubsystemInfo pci_ss_info_8086_7121_4c53_1060 =
+	{0x4c53, 0x1060, pci_subsys_8086_7121_4c53_1060, 0};
+#undef pci_ss_info_4c53_1060
+#define pci_ss_info_4c53_1060 pci_ss_info_8086_7121_4c53_1060
 static const pciSubsystemInfo pci_ss_info_8086_7121_8086_4341 =
 	{0x8086, 0x4341, pci_subsys_8086_7121_8086_4341, 0};
 #undef pci_ss_info_8086_4341
@@ -25245,10 +27084,30 @@ static const pciSubsystemInfo pci_ss_info_8086_7190_1179_0001 =
 	{0x1179, 0x0001, pci_subsys_8086_7190_1179_0001, 0};
 #undef pci_ss_info_1179_0001
 #define pci_ss_info_1179_0001 pci_ss_info_8086_7190_1179_0001
+static const pciSubsystemInfo pci_ss_info_8086_7190_4c53_1050 =
+	{0x4c53, 0x1050, pci_subsys_8086_7190_4c53_1050, 0};
+#undef pci_ss_info_4c53_1050
+#define pci_ss_info_4c53_1050 pci_ss_info_8086_7190_4c53_1050
+static const pciSubsystemInfo pci_ss_info_8086_7190_4c53_1051 =
+	{0x4c53, 0x1051, pci_subsys_8086_7190_4c53_1051, 0};
+#undef pci_ss_info_4c53_1051
+#define pci_ss_info_4c53_1051 pci_ss_info_8086_7190_4c53_1051
 static const pciSubsystemInfo pci_ss_info_8086_7192_0e11_0460 =
 	{0x0e11, 0x0460, pci_subsys_8086_7192_0e11_0460, 0};
 #undef pci_ss_info_0e11_0460
 #define pci_ss_info_0e11_0460 pci_ss_info_8086_7192_0e11_0460
+static const pciSubsystemInfo pci_ss_info_8086_7192_4c53_1000 =
+	{0x4c53, 0x1000, pci_subsys_8086_7192_4c53_1000, 0};
+#undef pci_ss_info_4c53_1000
+#define pci_ss_info_4c53_1000 pci_ss_info_8086_7192_4c53_1000
+static const pciSubsystemInfo pci_ss_info_8086_7194_1033_0000 =
+	{0x1033, 0x0000, pci_subsys_8086_7194_1033_0000, 0};
+#undef pci_ss_info_1033_0000
+#define pci_ss_info_1033_0000 pci_ss_info_8086_7194_1033_0000
+static const pciSubsystemInfo pci_ss_info_8086_7194_4c53_10a0 =
+	{0x4c53, 0x10a0, pci_subsys_8086_7194_4c53_10a0, 0};
+#undef pci_ss_info_4c53_10a0
+#define pci_ss_info_4c53_10a0 pci_ss_info_8086_7194_4c53_10a0
 static const pciSubsystemInfo pci_ss_info_8086_7195_10cf_1099 =
 	{0x10cf, 0x1099, pci_subsys_8086_7195_10cf_1099, 0};
 #undef pci_ss_info_10cf_1099
@@ -25261,6 +27120,18 @@ static const pciSubsystemInfo pci_ss_info_8086_7195_11d4_0048 =
 	{0x11d4, 0x0048, pci_subsys_8086_7195_11d4_0048, 0};
 #undef pci_ss_info_11d4_0048
 #define pci_ss_info_11d4_0048 pci_ss_info_8086_7195_11d4_0048
+static const pciSubsystemInfo pci_ss_info_8086_71a0_4c53_1050 =
+	{0x4c53, 0x1050, pci_subsys_8086_71a0_4c53_1050, 0};
+#undef pci_ss_info_4c53_1050
+#define pci_ss_info_4c53_1050 pci_ss_info_8086_71a0_4c53_1050
+static const pciSubsystemInfo pci_ss_info_8086_71a0_4c53_1051 =
+	{0x4c53, 0x1051, pci_subsys_8086_71a0_4c53_1051, 0};
+#undef pci_ss_info_4c53_1051
+#define pci_ss_info_4c53_1051 pci_ss_info_8086_71a0_4c53_1051
+static const pciSubsystemInfo pci_ss_info_8086_71a2_4c53_1000 =
+	{0x4c53, 0x1000, pci_subsys_8086_71a2_4c53_1000, 0};
+#undef pci_ss_info_4c53_1000
+#define pci_ss_info_4c53_1000 pci_ss_info_8086_71a2_4c53_1000
 static const pciSubsystemInfo pci_ss_info_8086_7800_003d_0008 =
 	{0x003d, 0x0008, pci_subsys_8086_7800_003d_0008, 0};
 #undef pci_ss_info_003d_0008
@@ -25289,6 +27160,14 @@ static const pciSubsystemInfo pci_ss_info_8086_7800_8086_0100 =
 	{0x8086, 0x0100, pci_subsys_8086_7800_8086_0100, 0};
 #undef pci_ss_info_8086_0100
 #define pci_ss_info_8086_0100 pci_ss_info_8086_7800_8086_0100
+static const pciSubsystemInfo pci_ss_info_8086_b555_4c53_1050 =
+	{0x4c53, 0x1050, pci_subsys_8086_b555_4c53_1050, 0};
+#undef pci_ss_info_4c53_1050
+#define pci_ss_info_4c53_1050 pci_ss_info_8086_b555_4c53_1050
+static const pciSubsystemInfo pci_ss_info_8086_b555_4c53_1051 =
+	{0x4c53, 0x1051, pci_subsys_8086_b555_4c53_1051, 0};
+#undef pci_ss_info_4c53_1051
+#define pci_ss_info_4c53_1051 pci_ss_info_8086_b555_4c53_1051
 static const pciSubsystemInfo pci_ss_info_8086_b555_e4bf_1000 =
 	{0xe4bf, 0x1000, pci_subsys_8086_b555_e4bf_1000, 0};
 #undef pci_ss_info_e4bf_1000
@@ -25298,6 +27177,14 @@ static const pciSubsystemInfo pci_ss_info_9004_5078_9004_7850 =
 	{0x9004, 0x7850, pci_subsys_9004_5078_9004_7850, 0};
 #undef pci_ss_info_9004_7850
 #define pci_ss_info_9004_7850 pci_ss_info_9004_5078_9004_7850
+static const pciSubsystemInfo pci_ss_info_9004_5647_9004_7710 =
+	{0x9004, 0x7710, pci_subsys_9004_5647_9004_7710, 0};
+#undef pci_ss_info_9004_7710
+#define pci_ss_info_9004_7710 pci_ss_info_9004_5647_9004_7710
+static const pciSubsystemInfo pci_ss_info_9004_5647_9004_7711 =
+	{0x9004, 0x7711, pci_subsys_9004_5647_9004_7711, 0};
+#undef pci_ss_info_9004_7711
+#define pci_ss_info_9004_7711 pci_ss_info_9004_5647_9004_7711
 static const pciSubsystemInfo pci_ss_info_9004_6075_9004_7560 =
 	{0x9004, 0x7560, pci_subsys_9004_6075_9004_7560, 0};
 #undef pci_ss_info_9004_7560
@@ -25424,6 +27311,10 @@ static const pciSubsystemInfo pci_ss_info_9005_0010_9005_8100 =
 	{0x9005, 0x8100, pci_subsys_9005_0010_9005_8100, 0};
 #undef pci_ss_info_9005_8100
 #define pci_ss_info_9005_8100 pci_ss_info_9005_0010_9005_8100
+static const pciSubsystemInfo pci_ss_info_9005_0010_9005_a100 =
+	{0x9005, 0xa100, pci_subsys_9005_0010_9005_a100, 0};
+#undef pci_ss_info_9005_a100
+#define pci_ss_info_9005_a100 pci_ss_info_9005_0010_9005_a100
 static const pciSubsystemInfo pci_ss_info_9005_0010_9005_a180 =
 	{0x9005, 0xa180, pci_subsys_9005_0010_9005_a180, 0};
 #undef pci_ss_info_9005_a180
@@ -25436,6 +27327,10 @@ static const pciSubsystemInfo pci_ss_info_9005_0013_9005_0003 =
 	{0x9005, 0x0003, pci_subsys_9005_0013_9005_0003, 0};
 #undef pci_ss_info_9005_0003
 #define pci_ss_info_9005_0003 pci_ss_info_9005_0013_9005_0003
+static const pciSubsystemInfo pci_ss_info_9005_0013_9005_000f =
+	{0x9005, 0x000f, pci_subsys_9005_0013_9005_000f, 0};
+#undef pci_ss_info_9005_000f
+#define pci_ss_info_9005_000f pci_ss_info_9005_0013_9005_000f
 static const pciSubsystemInfo pci_ss_info_9005_001f_9005_000f =
 	{0x9005, 0x000f, pci_subsys_9005_001f_9005_000f, 0};
 #undef pci_ss_info_9005_000f
@@ -25448,6 +27343,10 @@ static const pciSubsystemInfo pci_ss_info_9005_0050_9005_f500 =
 	{0x9005, 0xf500, pci_subsys_9005_0050_9005_f500, 0};
 #undef pci_ss_info_9005_f500
 #define pci_ss_info_9005_f500 pci_ss_info_9005_0050_9005_f500
+static const pciSubsystemInfo pci_ss_info_9005_0050_9005_ffff =
+	{0x9005, 0xffff, pci_subsys_9005_0050_9005_ffff, 0};
+#undef pci_ss_info_9005_ffff
+#define pci_ss_info_9005_ffff pci_ss_info_9005_0050_9005_ffff
 static const pciSubsystemInfo pci_ss_info_9005_0051_9005_b500 =
 	{0x9005, 0xb500, pci_subsys_9005_0051_9005_b500, 0};
 #undef pci_ss_info_9005_b500
@@ -25462,6 +27361,10 @@ static const pciSubsystemInfo pci_ss_info_9005_0080_0e11_e2a0 =
 #undef pci_ss_info_0e11_e2a0
 #define pci_ss_info_0e11_e2a0 pci_ss_info_9005_0080_0e11_e2a0
 #ifdef VENDOR_INCLUDE_NONVIDEO
+static const pciSubsystemInfo pci_ss_info_9005_0080_9005_6220 =
+	{0x9005, 0x6220, pci_subsys_9005_0080_9005_6220, 0};
+#undef pci_ss_info_9005_6220
+#define pci_ss_info_9005_6220 pci_ss_info_9005_0080_9005_6220
 static const pciSubsystemInfo pci_ss_info_9005_0080_9005_62a0 =
 	{0x9005, 0x62a0, pci_subsys_9005_0080_9005_62a0, 0};
 #undef pci_ss_info_9005_62a0
@@ -25503,6 +27406,12 @@ static const pciSubsystemInfo pci_ss_info_9005_00c5_1028_00c5 =
 #define pci_ss_info_1028_00c5 pci_ss_info_9005_00c5_1028_00c5
 #ifdef VENDOR_INCLUDE_NONVIDEO
 #endif
+static const pciSubsystemInfo pci_ss_info_9005_00cf_1028_00ce =
+	{0x1028, 0x00ce, pci_subsys_9005_00cf_1028_00ce, 0};
+#undef pci_ss_info_1028_00ce
+#define pci_ss_info_1028_00ce pci_ss_info_9005_00cf_1028_00ce
+#ifdef VENDOR_INCLUDE_NONVIDEO
+#endif
 static const pciSubsystemInfo pci_ss_info_9005_00cf_1028_00d1 =
 	{0x1028, 0x00d1, pci_subsys_9005_00cf_1028_00d1, 0};
 #undef pci_ss_info_1028_00d1
@@ -25524,6 +27433,20 @@ static const pciSubsystemInfo pci_ss_info_9005_0250_1014_028c =
 	{0x1014, 0x028c, pci_subsys_9005_0250_1014_028c, 0};
 #undef pci_ss_info_1014_028c
 #define pci_ss_info_1014_028c pci_ss_info_9005_0250_1014_028c
+static const pciSubsystemInfo pci_ss_info_9005_0283_9005_0283 =
+	{0x9005, 0x0283, pci_subsys_9005_0283_9005_0283, 0};
+#undef pci_ss_info_9005_0283
+#define pci_ss_info_9005_0283 pci_ss_info_9005_0283_9005_0283
+static const pciSubsystemInfo pci_ss_info_9005_0284_9005_0284 =
+	{0x9005, 0x0284, pci_subsys_9005_0284_9005_0284, 0};
+#undef pci_ss_info_9005_0284
+#define pci_ss_info_9005_0284 pci_ss_info_9005_0284_9005_0284
+#endif
+static const pciSubsystemInfo pci_ss_info_9005_0285_0e11_0295 =
+	{0x0e11, 0x0295, pci_subsys_9005_0285_0e11_0295, 0};
+#undef pci_ss_info_0e11_0295
+#define pci_ss_info_0e11_0295 pci_ss_info_9005_0285_0e11_0295
+#ifdef VENDOR_INCLUDE_NONVIDEO
 #endif
 static const pciSubsystemInfo pci_ss_info_9005_0285_1028_0287 =
 	{0x1028, 0x0287, pci_subsys_9005_0285_1028_0287, 0};
@@ -25531,6 +27454,68 @@ static const pciSubsystemInfo pci_ss_info_9005_0285_1028_0287 =
 #define pci_ss_info_1028_0287 pci_ss_info_9005_0285_1028_0287
 #ifdef VENDOR_INCLUDE_NONVIDEO
 #endif
+static const pciSubsystemInfo pci_ss_info_9005_0285_1028_0291 =
+	{0x1028, 0x0291, pci_subsys_9005_0285_1028_0291, 0};
+#undef pci_ss_info_1028_0291
+#define pci_ss_info_1028_0291 pci_ss_info_9005_0285_1028_0291
+#ifdef VENDOR_INCLUDE_NONVIDEO
+static const pciSubsystemInfo pci_ss_info_9005_0285_17aa_0286 =
+	{0x17aa, 0x0286, pci_subsys_9005_0285_17aa_0286, 0};
+#undef pci_ss_info_17aa_0286
+#define pci_ss_info_17aa_0286 pci_ss_info_9005_0285_17aa_0286
+static const pciSubsystemInfo pci_ss_info_9005_0285_17aa_0287 =
+	{0x17aa, 0x0287, pci_subsys_9005_0285_17aa_0287, 0};
+#undef pci_ss_info_17aa_0287
+#define pci_ss_info_17aa_0287 pci_ss_info_9005_0285_17aa_0287
+static const pciSubsystemInfo pci_ss_info_9005_0285_9005_0285 =
+	{0x9005, 0x0285, pci_subsys_9005_0285_9005_0285, 0};
+#undef pci_ss_info_9005_0285
+#define pci_ss_info_9005_0285 pci_ss_info_9005_0285_9005_0285
+static const pciSubsystemInfo pci_ss_info_9005_0285_9005_0286 =
+	{0x9005, 0x0286, pci_subsys_9005_0285_9005_0286, 0};
+#undef pci_ss_info_9005_0286
+#define pci_ss_info_9005_0286 pci_ss_info_9005_0285_9005_0286
+static const pciSubsystemInfo pci_ss_info_9005_0285_9005_0287 =
+	{0x9005, 0x0287, pci_subsys_9005_0285_9005_0287, 0};
+#undef pci_ss_info_9005_0287
+#define pci_ss_info_9005_0287 pci_ss_info_9005_0285_9005_0287
+static const pciSubsystemInfo pci_ss_info_9005_0285_9005_0288 =
+	{0x9005, 0x0288, pci_subsys_9005_0285_9005_0288, 0};
+#undef pci_ss_info_9005_0288
+#define pci_ss_info_9005_0288 pci_ss_info_9005_0285_9005_0288
+static const pciSubsystemInfo pci_ss_info_9005_0285_9005_0289 =
+	{0x9005, 0x0289, pci_subsys_9005_0285_9005_0289, 0};
+#undef pci_ss_info_9005_0289
+#define pci_ss_info_9005_0289 pci_ss_info_9005_0285_9005_0289
+static const pciSubsystemInfo pci_ss_info_9005_0285_9005_028a =
+	{0x9005, 0x028a, pci_subsys_9005_0285_9005_028a, 0};
+#undef pci_ss_info_9005_028a
+#define pci_ss_info_9005_028a pci_ss_info_9005_0285_9005_028a
+static const pciSubsystemInfo pci_ss_info_9005_0285_9005_028b =
+	{0x9005, 0x028b, pci_subsys_9005_0285_9005_028b, 0};
+#undef pci_ss_info_9005_028b
+#define pci_ss_info_9005_028b pci_ss_info_9005_0285_9005_028b
+static const pciSubsystemInfo pci_ss_info_9005_0285_9005_0290 =
+	{0x9005, 0x0290, pci_subsys_9005_0285_9005_0290, 0};
+#undef pci_ss_info_9005_0290
+#define pci_ss_info_9005_0290 pci_ss_info_9005_0285_9005_0290
+static const pciSubsystemInfo pci_ss_info_9005_0285_9005_0292 =
+	{0x9005, 0x0292, pci_subsys_9005_0285_9005_0292, 0};
+#undef pci_ss_info_9005_0292
+#define pci_ss_info_9005_0292 pci_ss_info_9005_0285_9005_0292
+static const pciSubsystemInfo pci_ss_info_9005_0285_9005_0293 =
+	{0x9005, 0x0293, pci_subsys_9005_0285_9005_0293, 0};
+#undef pci_ss_info_9005_0293
+#define pci_ss_info_9005_0293 pci_ss_info_9005_0285_9005_0293
+static const pciSubsystemInfo pci_ss_info_9005_0285_9005_0294 =
+	{0x9005, 0x0294, pci_subsys_9005_0285_9005_0294, 0};
+#undef pci_ss_info_9005_0294
+#define pci_ss_info_9005_0294 pci_ss_info_9005_0285_9005_0294
+static const pciSubsystemInfo pci_ss_info_9005_0286_9005_028c =
+	{0x9005, 0x028c, pci_subsys_9005_0286_9005_028c, 0};
+#undef pci_ss_info_9005_028c
+#define pci_ss_info_9005_028c pci_ss_info_9005_0286_9005_028c
+#endif
 static const pciSubsystemInfo pci_ss_info_9005_8011_0e11_00ac =
 	{0x0e11, 0x00ac, pci_subsys_9005_8011_0e11_00ac, 0};
 #undef pci_ss_info_0e11_00ac
@@ -25551,13 +27536,35 @@ static const pciSubsystemInfo pci_ss_info_e159_0001_0059_0003 =
 #undef pci_ss_info_0059_0003
 #define pci_ss_info_0059_0003 pci_ss_info_e159_0001_0059_0003
 #endif
+#define pci_ss_list_0070_4000 NULL
+#define pci_ss_list_0070_4001 NULL
+#define pci_ss_list_0070_4009 NULL
+#define pci_ss_list_0070_4801 NULL
+#define pci_ss_list_021b_8139 NULL
 #define pci_ss_list_0675_1700 NULL
 #define pci_ss_list_0675_1702 NULL
 #define pci_ss_list_09c1_0704 NULL
 #define pci_ss_list_0e11_0001 NULL
 #define pci_ss_list_0e11_0002 NULL
+static const pciSubsystemInfo *pci_ss_list_0e11_0046[] = {
+	&pci_ss_info_0e11_0046_0e11_409a,
+	&pci_ss_info_0e11_0046_0e11_409b,
+	&pci_ss_info_0e11_0046_0e11_409c,
+	&pci_ss_info_0e11_0046_0e11_409d,
+	NULL
+};
 #define pci_ss_list_0e11_0049 NULL
 #define pci_ss_list_0e11_004a NULL
+#define pci_ss_list_0e11_007c NULL
+#define pci_ss_list_0e11_007d NULL
+#define pci_ss_list_0e11_0085 NULL
+#define pci_ss_list_0e11_00bb NULL
+#define pci_ss_list_0e11_00ca NULL
+#define pci_ss_list_0e11_00cb NULL
+#define pci_ss_list_0e11_00cf NULL
+#define pci_ss_list_0e11_00d0 NULL
+#define pci_ss_list_0e11_00d1 NULL
+#define pci_ss_list_0e11_00e3 NULL
 #define pci_ss_list_0e11_0508 NULL
 #define pci_ss_list_0e11_1000 NULL
 #define pci_ss_list_0e11_2000 NULL
@@ -25619,7 +27626,12 @@ static const pciSubsystemInfo *pci_ss_list_0e11_ae10[] = {
 #define pci_ss_list_0e11_b144 NULL
 #define pci_ss_list_0e11_b163 NULL
 #define pci_ss_list_0e11_b164 NULL
-#define pci_ss_list_0e11_b178 NULL
+static const pciSubsystemInfo *pci_ss_list_0e11_b178[] = {
+	&pci_ss_info_0e11_b178_0e11_4080,
+	&pci_ss_info_0e11_b178_0e11_4082,
+	&pci_ss_info_0e11_b178_0e11_4083,
+	NULL
+};
 #define pci_ss_list_0e11_b1a4 NULL
 #define pci_ss_list_0e11_f130 NULL
 #define pci_ss_list_0e11_f150 NULL
@@ -25666,21 +27678,45 @@ static const pciSubsystemInfo *pci_ss_list_1000_0021[] = {
 	NULL
 };
 static const pciSubsystemInfo *pci_ss_list_1000_0030[] = {
+	&pci_ss_info_1000_0030_1028_0123,
+	&pci_ss_info_1000_0030_1028_014a,
 	&pci_ss_info_1000_0030_1028_1010,
 	NULL
 };
-#define pci_ss_list_1000_0040 NULL
+#define pci_ss_list_1000_0031 NULL
+#define pci_ss_list_1000_0032 NULL
+#define pci_ss_list_1000_0033 NULL
+static const pciSubsystemInfo *pci_ss_list_1000_0040[] = {
+	&pci_ss_info_1000_0040_1000_0033,
+	&pci_ss_info_1000_0040_1000_0066,
+	NULL
+};
+#define pci_ss_list_1000_0041 NULL
 static const pciSubsystemInfo *pci_ss_list_1000_008f[] = {
 	&pci_ss_info_1000_008f_1092_8000,
 	&pci_ss_info_1000_008f_1092_8760,
 	NULL
 };
+static const pciSubsystemInfo *pci_ss_list_1000_0407[] = {
+	&pci_ss_info_1000_0407_1000_0530,
+	&pci_ss_info_1000_0407_1000_0531,
+	&pci_ss_info_1000_0407_1000_0532,
+	&pci_ss_info_1000_0407_1028_0533,
+	&pci_ss_info_1000_0407_8086_0532,
+	NULL
+};
 #define pci_ss_list_1000_0621 NULL
-#define pci_ss_list_1000_0622 NULL
+static const pciSubsystemInfo *pci_ss_list_1000_0622[] = {
+	&pci_ss_info_1000_0622_1000_1020,
+	NULL
+};
 #define pci_ss_list_1000_0623 NULL
 #define pci_ss_list_1000_0624 NULL
 #define pci_ss_list_1000_0625 NULL
-#define pci_ss_list_1000_0626 NULL
+static const pciSubsystemInfo *pci_ss_list_1000_0626[] = {
+	&pci_ss_info_1000_0626_1000_1010,
+	NULL
+};
 #define pci_ss_list_1000_0627 NULL
 #define pci_ss_list_1000_0628 NULL
 #define pci_ss_list_1000_0629 NULL
@@ -25692,6 +27728,12 @@ static const pciSubsystemInfo *pci_ss_list_1000_0702[] = {
 #define pci_ss_list_1000_0901 NULL
 #define pci_ss_list_1000_1000 NULL
 static const pciSubsystemInfo *pci_ss_list_1000_1960[] = {
+	&pci_ss_info_1000_1960_1000_0518,
+	&pci_ss_info_1000_1960_1000_0520,
+	&pci_ss_info_1000_1960_1000_0522,
+	&pci_ss_info_1000_1960_1000_0523,
+	&pci_ss_info_1000_1960_1000_4523,
+	&pci_ss_info_1000_1960_1000_a520,
 	&pci_ss_info_1000_1960_1028_0518,
 	&pci_ss_info_1000_1960_1028_0520,
 	&pci_ss_info_1000_1960_1028_0531,
@@ -25712,14 +27754,44 @@ static const pciSubsystemInfo *pci_ss_list_1000_1960[] = {
 #define pci_ss_list_1002_4145 NULL
 #define pci_ss_list_1002_4146 NULL
 #define pci_ss_list_1002_4147 NULL
+#define pci_ss_list_1002_4148 NULL
+#define pci_ss_list_1002_4149 NULL
+static const pciSubsystemInfo *pci_ss_list_1002_4150[] = {
+	&pci_ss_info_1002_4150_1458_4024,
+	&pci_ss_info_1002_4150_148c_2064,
+	&pci_ss_info_1002_4150_148c_2066,
+	&pci_ss_info_1002_4150_174b_7c29,
+	&pci_ss_info_1002_4150_18bc_0101,
+	NULL
+};
+#define pci_ss_list_1002_4151 NULL
+#define pci_ss_list_1002_4152 NULL
+#define pci_ss_list_1002_4154 NULL
+#define pci_ss_list_1002_4155 NULL
+#define pci_ss_list_1002_4156 NULL
+#define pci_ss_list_1002_4157 NULL
 #define pci_ss_list_1002_4158 NULL
 #define pci_ss_list_1002_4164 NULL
+#define pci_ss_list_1002_4165 NULL
+#define pci_ss_list_1002_4166 NULL
+#define pci_ss_list_1002_4168 NULL
+static const pciSubsystemInfo *pci_ss_list_1002_4170[] = {
+	&pci_ss_info_1002_4170_1458_4025,
+	&pci_ss_info_1002_4170_148c_2067,
+	&pci_ss_info_1002_4170_174b_7c28,
+	&pci_ss_info_1002_4170_18bc_0100,
+	NULL
+};
+#define pci_ss_list_1002_4171 NULL
+#define pci_ss_list_1002_4172 NULL
 static const pciSubsystemInfo *pci_ss_list_1002_4242[] = {
 	&pci_ss_info_1002_4242_1002_02aa,
 	NULL
 };
 #define pci_ss_list_1002_4336 NULL
 #define pci_ss_list_1002_4337 NULL
+#define pci_ss_list_1002_4341 NULL
+#define pci_ss_list_1002_4353 NULL
 #define pci_ss_list_1002_4354 NULL
 #define pci_ss_list_1002_4358 NULL
 #define pci_ss_list_1002_4554 NULL
@@ -25898,6 +27970,12 @@ static const pciSubsystemInfo *pci_ss_list_1002_4e45[] = {
 #define pci_ss_list_1002_4e46 NULL
 #define pci_ss_list_1002_4e47 NULL
 #define pci_ss_list_1002_4e48 NULL
+#define pci_ss_list_1002_4e49 NULL
+#define pci_ss_list_1002_4e4a NULL
+#define pci_ss_list_1002_4e4b NULL
+#define pci_ss_list_1002_4e50 NULL
+#define pci_ss_list_1002_4e52 NULL
+#define pci_ss_list_1002_4e54 NULL
 #define pci_ss_list_1002_4e64 NULL
 static const pciSubsystemInfo *pci_ss_list_1002_4e65[] = {
 	&pci_ss_info_1002_4e65_1002_0003,
@@ -25906,6 +27984,8 @@ static const pciSubsystemInfo *pci_ss_list_1002_4e65[] = {
 #define pci_ss_list_1002_4e66 NULL
 #define pci_ss_list_1002_4e67 NULL
 #define pci_ss_list_1002_4e68 NULL
+#define pci_ss_list_1002_4e69 NULL
+#define pci_ss_list_1002_4e6a NULL
 #define pci_ss_list_1002_5041 NULL
 #define pci_ss_list_1002_5042 NULL
 #define pci_ss_list_1002_5043 NULL
@@ -25987,6 +28067,8 @@ static const pciSubsystemInfo *pci_ss_list_1002_514c[] = {
 #define pci_ss_list_1002_514d NULL
 #define pci_ss_list_1002_514e NULL
 #define pci_ss_list_1002_514f NULL
+#define pci_ss_list_1002_5154 NULL
+#define pci_ss_list_1002_5155 NULL
 static const pciSubsystemInfo *pci_ss_list_1002_5157[] = {
 	&pci_ss_info_1002_5157_1002_013a,
 	&pci_ss_info_1002_5157_1458_4000,
@@ -26087,7 +28169,24 @@ static const pciSubsystemInfo *pci_ss_list_1002_5654[] = {
 };
 #define pci_ss_list_1002_5655 NULL
 #define pci_ss_list_1002_5656 NULL
-#define pci_ss_list_1002_5961 NULL
+static const pciSubsystemInfo *pci_ss_list_1002_5941[] = {
+	&pci_ss_info_1002_5941_17af_200d,
+	&pci_ss_info_1002_5941_18bc_0050,
+	NULL
+};
+#define pci_ss_list_1002_5960 NULL
+static const pciSubsystemInfo *pci_ss_list_1002_5961[] = {
+	&pci_ss_info_1002_5961_17af_200c,
+	&pci_ss_info_1002_5961_18bc_0051,
+	NULL
+};
+static const pciSubsystemInfo *pci_ss_list_1002_5964[] = {
+	&pci_ss_info_1002_5964_148c_2073,
+	NULL
+};
+#define pci_ss_list_1002_5c61 NULL
+#define pci_ss_list_1002_5c63 NULL
+#define pci_ss_list_1002_5d44 NULL
 #define pci_ss_list_1002_700f NULL
 #define pci_ss_list_1002_7010 NULL
 #define pci_ss_list_1002_cab0 NULL
@@ -26229,6 +28328,7 @@ static const pciSubsystemInfo *pci_ss_list_1011_0019[] = {
 	&pci_ss_info_1011_0019_1186_1100,
 	&pci_ss_info_1011_0019_1186_1101,
 	&pci_ss_info_1011_0019_1186_1102,
+	&pci_ss_info_1011_0019_1186_1112,
 	&pci_ss_info_1011_0019_1259_2800,
 	&pci_ss_info_1011_0019_1266_0004,
 	&pci_ss_info_1011_0019_12af_0019,
@@ -26262,6 +28362,7 @@ static const pciSubsystemInfo *pci_ss_list_1011_0046[] = {
 	&pci_ss_info_1011_0046_12d9_000a,
 	&pci_ss_info_1011_0046_4c53_1050,
 	&pci_ss_info_1011_0046_4c53_1051,
+	&pci_ss_info_1011_0046_9005_0364,
 	&pci_ss_info_1011_0046_9005_0365,
 	&pci_ss_info_1011_0046_9005_1364,
 	&pci_ss_info_1011_0046_9005_1365,
@@ -26464,7 +28565,12 @@ static const pciSubsystemInfo *pci_ss_list_1014_0219[] = {
 static const pciSubsystemInfo *pci_ss_list_101e_1960[] = {
 	&pci_ss_info_101e_1960_101e_0471,
 	&pci_ss_info_101e_1960_101e_0475,
+	&pci_ss_info_101e_1960_101e_0477,
 	&pci_ss_info_101e_1960_101e_0493,
+	&pci_ss_info_101e_1960_101e_0494,
+	&pci_ss_info_101e_1960_101e_0503,
+	&pci_ss_info_101e_1960_101e_0511,
+	&pci_ss_info_101e_1960_101e_0522,
 	&pci_ss_info_101e_1960_1028_0471,
 	&pci_ss_info_101e_1960_1028_0475,
 	&pci_ss_info_101e_1960_1028_0493,
@@ -26566,6 +28672,7 @@ static const pciSubsystemInfo *pci_ss_list_1022_7443[] = {
 #define pci_ss_list_1023_0194 NULL
 #define pci_ss_list_1023_2000 NULL
 #define pci_ss_list_1023_2001 NULL
+#define pci_ss_list_1023_2100 NULL
 static const pciSubsystemInfo *pci_ss_list_1023_8400[] = {
 	&pci_ss_info_1023_8400_1023_8400,
 	NULL
@@ -26711,7 +28818,6 @@ static const pciSubsystemInfo *pci_ss_list_1028_0004[] = {
 	&pci_ss_info_1028_0004_1028_00d0,
 	NULL
 };
-#define pci_ss_list_1028_0005 NULL
 #define pci_ss_list_1028_0006 NULL
 #define pci_ss_list_1028_0007 NULL
 #define pci_ss_list_1028_0008 NULL
@@ -26724,10 +28830,35 @@ static const pciSubsystemInfo *pci_ss_list_1028_000a[] = {
 };
 #define pci_ss_list_1028_000c NULL
 #define pci_ss_list_1028_000d NULL
-#define pci_ss_list_1028_000e NULL
-#define pci_ss_list_1028_000f NULL
+static const pciSubsystemInfo *pci_ss_list_1028_000e[] = {
+	&pci_ss_info_1028_000e_1028_0123,
+	NULL
+};
+static const pciSubsystemInfo *pci_ss_list_1028_000f[] = {
+	&pci_ss_info_1028_000f_1028_013b,
+	&pci_ss_info_1028_000f_1028_014a,
+	&pci_ss_info_1028_000f_1028_014c,
+	&pci_ss_info_1028_000f_1028_014d,
+	NULL
+};
 #define pci_ss_list_102a_0000 NULL
-#define pci_ss_list_102a_0010 NULL
+#ifdef VENDOR_INCLUDE_NONVIDEO
+static const pciSubsystemInfo *pci_ss_list_102a_0010[] = {
+	&pci_ss_info_102a_0010_9005_000f,
+	&pci_ss_info_102a_0010_9005_0106,
+	&pci_ss_info_102a_0010_9005_a180,
+	NULL
+};
+static const pciSubsystemInfo *pci_ss_list_102a_00c5[] = {
+	&pci_ss_info_102a_00c5_1028_00c5,
+	NULL
+};
+static const pciSubsystemInfo *pci_ss_list_102a_00cf[] = {
+	&pci_ss_info_102a_00cf_1028_0106,
+	&pci_ss_info_102a_00cf_1028_0121,
+	NULL
+};
+#endif
 #define pci_ss_list_102b_0010 NULL
 #define pci_ss_list_102b_0100 NULL
 #define pci_ss_list_102b_0518 NULL
@@ -26908,6 +29039,10 @@ static const pciSubsystemInfo *pci_ss_list_102f_0020[] = {
 	&pci_ss_info_102f_0020_102f_00f8,
 	NULL
 };
+#define pci_ss_list_102f_0105 NULL
+#define pci_ss_list_102f_0106 NULL
+#define pci_ss_list_102f_0107 NULL
+#define pci_ss_list_102f_0108 NULL
 #endif
 #define pci_ss_list_1031_5601 NULL
 #define pci_ss_list_1031_5607 NULL
@@ -26994,6 +29129,7 @@ static const pciSubsystemInfo *pci_ss_list_1039_0300[] = {
 #define pci_ss_list_1039_0496 NULL
 #define pci_ss_list_1039_0530 NULL
 #define pci_ss_list_1039_0540 NULL
+#define pci_ss_list_1039_0550 NULL
 #define pci_ss_list_1039_0597 NULL
 #define pci_ss_list_1039_0601 NULL
 #define pci_ss_list_1039_0620 NULL
@@ -27005,13 +29141,18 @@ static const pciSubsystemInfo *pci_ss_list_1039_0300[] = {
 #define pci_ss_list_1039_0648 NULL
 #define pci_ss_list_1039_0650 NULL
 #define pci_ss_list_1039_0651 NULL
+#define pci_ss_list_1039_0655 NULL
+#define pci_ss_list_1039_0660 NULL
+#define pci_ss_list_1039_0661 NULL
 #define pci_ss_list_1039_0730 NULL
 #define pci_ss_list_1039_0733 NULL
 #define pci_ss_list_1039_0735 NULL
 #define pci_ss_list_1039_0740 NULL
+#define pci_ss_list_1039_0741 NULL
 #define pci_ss_list_1039_0745 NULL
 #define pci_ss_list_1039_0746 NULL
 #define pci_ss_list_1039_0755 NULL
+#define pci_ss_list_1039_0760 NULL
 static const pciSubsystemInfo *pci_ss_list_1039_0900[] = {
 	&pci_ss_info_1039_0900_1039_0900,
 	&pci_ss_info_1039_0900_1043_8035,
@@ -27019,6 +29160,9 @@ static const pciSubsystemInfo *pci_ss_list_1039_0900[] = {
 };
 #define pci_ss_list_1039_0961 NULL
 #define pci_ss_list_1039_0962 NULL
+#define pci_ss_list_1039_0963 NULL
+#define pci_ss_list_1039_0964 NULL
+#define pci_ss_list_1039_0965 NULL
 #define pci_ss_list_1039_3602 NULL
 #define pci_ss_list_1039_5107 NULL
 #define pci_ss_list_1039_5300 NULL
@@ -27061,6 +29205,7 @@ static const pciSubsystemInfo *pci_ss_list_1039_6326[] = {
 	&pci_ss_info_1039_6326_1569_6326,
 	NULL
 };
+#define pci_ss_list_1039_6330 NULL
 static const pciSubsystemInfo *pci_ss_list_1039_7001[] = {
 	&pci_ss_info_1039_7001_1039_7000,
 	NULL
@@ -27139,6 +29284,7 @@ static const pciSubsystemInfo *pci_ss_list_103c_1048[] = {
 	&pci_ss_info_103c_1048_103c_1282,
 	NULL
 };
+#define pci_ss_list_103c_1054 NULL
 #define pci_ss_list_103c_1064 NULL
 #define pci_ss_list_103c_108b NULL
 #define pci_ss_list_103c_10c1 NULL
@@ -27151,8 +29297,8 @@ static const pciSubsystemInfo *pci_ss_list_103c_1048[] = {
 #define pci_ss_list_103c_1229 NULL
 #define pci_ss_list_103c_122a NULL
 #define pci_ss_list_103c_122e NULL
+#define pci_ss_list_103c_127c NULL
 #define pci_ss_list_103c_1290 NULL
-#define pci_ss_list_103c_12b4 NULL
 #define pci_ss_list_103c_2910 NULL
 #define pci_ss_list_103c_2925 NULL
 #define pci_ss_list_1042_1000 NULL
@@ -27313,10 +29459,15 @@ static const pciSubsystemInfo *pci_ss_list_104c_8027[] = {
 #define pci_ss_list_104c_8400 NULL
 #define pci_ss_list_104c_8401 NULL
 #define pci_ss_list_104c_9000 NULL
+#define pci_ss_list_104c_9066 NULL
 #define pci_ss_list_104c_a001 NULL
 #define pci_ss_list_104c_a100 NULL
 #define pci_ss_list_104c_a102 NULL
-#define pci_ss_list_104c_a106 NULL
+static const pciSubsystemInfo *pci_ss_list_104c_a106[] = {
+	&pci_ss_info_104c_a106_175c_5000,
+	&pci_ss_info_104c_a106_175c_8700,
+	NULL
+};
 #define pci_ss_list_104c_ac10 NULL
 #define pci_ss_list_104c_ac11 NULL
 #define pci_ss_list_104c_ac12 NULL
@@ -27333,6 +29484,7 @@ static const pciSubsystemInfo *pci_ss_list_104c_ac1b[] = {
 };
 static const pciSubsystemInfo *pci_ss_list_104c_ac1c[] = {
 	&pci_ss_info_104c_ac1c_0e11_b121,
+	&pci_ss_info_104c_ac1c_1028_0088,
 	NULL
 };
 #define pci_ss_list_104c_ac1d NULL
@@ -27351,6 +29503,7 @@ static const pciSubsystemInfo *pci_ss_list_104c_ac42[] = {
 	NULL
 };
 #define pci_ss_list_104c_ac44 NULL
+#define pci_ss_list_104c_ac46 NULL
 #define pci_ss_list_104c_ac50 NULL
 static const pciSubsystemInfo *pci_ss_list_104c_ac51[] = {
 	&pci_ss_info_104c_ac51_1014_023b,
@@ -27366,7 +29519,12 @@ static const pciSubsystemInfo *pci_ss_list_104c_ac55[] = {
 	NULL
 };
 #define pci_ss_list_104c_ac56 NULL
-#define pci_ss_list_104c_ac60 NULL
+static const pciSubsystemInfo *pci_ss_list_104c_ac60[] = {
+	&pci_ss_info_104c_ac60_175c_5100,
+	&pci_ss_info_104c_ac60_175c_6100,
+	&pci_ss_info_104c_ac60_175c_6200,
+	NULL
+};
 #define pci_ss_list_104c_fe00 NULL
 #define pci_ss_list_104c_fe03 NULL
 #define pci_ss_list_104d_8009 NULL
@@ -28703,29 +30861,12 @@ static const pciSubsystemInfo *pci_ss_list_10de_0253[] = {
 #define pci_ss_list_10de_0309 NULL
 #define pci_ss_list_10de_0311 NULL
 #define pci_ss_list_10de_0312 NULL
-#define pci_ss_list_10de_0314 NULL
-#define pci_ss_list_10de_031a NULL
-#define pci_ss_list_10de_031b NULL
-#define pci_ss_list_10de_031c NULL
 #define pci_ss_list_10de_0321 NULL
 #define pci_ss_list_10de_0322 NULL
-#define pci_ss_list_10de_0323 NULL
-#define pci_ss_list_10de_0324 NULL
-#define pci_ss_list_10de_0325 NULL
-#define pci_ss_list_10de_0328 NULL
-#define pci_ss_list_10de_0329 NULL
-#define pci_ss_list_10de_032a NULL
 #define pci_ss_list_10de_032b NULL
-#define pci_ss_list_10de_032c NULL
-#define pci_ss_list_10de_032d NULL
 #define pci_ss_list_10de_0330 NULL
 #define pci_ss_list_10de_0331 NULL
-#define pci_ss_list_10de_0332 NULL
-#define pci_ss_list_10de_0333 NULL
 #define pci_ss_list_10de_0338 NULL
-#define pci_ss_list_10de_0341 NULL
-#define pci_ss_list_10de_0342 NULL
-#define pci_ss_list_10de_034e NULL
 #define pci_ss_list_10df_1ae5 NULL
 #define pci_ss_list_10df_f085 NULL
 #define pci_ss_list_10df_f095 NULL
@@ -28991,6 +31132,7 @@ static const pciSubsystemInfo *pci_ss_list_1106_3043[] = {
 #define pci_ss_list_1106_3044 NULL
 #define pci_ss_list_1106_3050 NULL
 #define pci_ss_list_1106_3051 NULL
+#define pci_ss_list_1106_3053 NULL
 static const pciSubsystemInfo *pci_ss_list_1106_3057[] = {
 	&pci_ss_info_1106_3057_1019_0985,
 	&pci_ss_info_1106_3057_1043_8033,
@@ -29056,6 +31198,7 @@ static const pciSubsystemInfo *pci_ss_list_1106_3116[] = {
 #define pci_ss_list_1106_3147 NULL
 #define pci_ss_list_1106_3148 NULL
 #define pci_ss_list_1106_3156 NULL
+#define pci_ss_list_1106_3164 NULL
 #define pci_ss_list_1106_3168 NULL
 static const pciSubsystemInfo *pci_ss_list_1106_3177[] = {
 	&pci_ss_info_1106_3177_1043_808c,
@@ -29063,13 +31206,17 @@ static const pciSubsystemInfo *pci_ss_list_1106_3177[] = {
 	&pci_ss_info_1106_3177_1458_5001,
 	NULL
 };
+#define pci_ss_list_1106_3188 NULL
 static const pciSubsystemInfo *pci_ss_list_1106_3189[] = {
 	&pci_ss_info_1106_3189_1043_807f,
 	&pci_ss_info_1106_3189_1458_5000,
 	NULL
 };
+#define pci_ss_list_1106_3205 NULL
+#define pci_ss_list_1106_3227 NULL
 #define pci_ss_list_1106_5030 NULL
 #define pci_ss_list_1106_6100 NULL
+#define pci_ss_list_1106_7205 NULL
 #define pci_ss_list_1106_8231 NULL
 #define pci_ss_list_1106_8235 NULL
 #define pci_ss_list_1106_8305 NULL
@@ -29092,7 +31239,9 @@ static const pciSubsystemInfo *pci_ss_list_1106_8598[] = {
 #define pci_ss_list_1106_b103 NULL
 #define pci_ss_list_1106_b112 NULL
 #define pci_ss_list_1106_b168 NULL
+#define pci_ss_list_1106_b188 NULL
 #define pci_ss_list_1106_b198 NULL
+#define pci_ss_list_1106_d104 NULL
 #endif
 #define pci_ss_list_1107_0576 NULL
 #define pci_ss_list_1108_0100 NULL
@@ -29707,9 +31856,17 @@ static const pciSubsystemInfo *pci_ss_list_1186_1300[] = {
 #define pci_ss_list_119e_0003 NULL
 #define pci_ss_list_11a9_4240 NULL
 #define pci_ss_list_11ab_0146 NULL
+#define pci_ss_list_11ab_4320 NULL
 #define pci_ss_list_11ab_4611 NULL
 #define pci_ss_list_11ab_4620 NULL
 #define pci_ss_list_11ab_4801 NULL
+#define pci_ss_list_11ab_5040 NULL
+#define pci_ss_list_11ab_5041 NULL
+#define pci_ss_list_11ab_5080 NULL
+#define pci_ss_list_11ab_5081 NULL
+#define pci_ss_list_11ab_6041 NULL
+#define pci_ss_list_11ab_6081 NULL
+#define pci_ss_list_11ab_6460 NULL
 #define pci_ss_list_11ab_f003 NULL
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciSubsystemInfo *pci_ss_list_11ad_0002[] = {
@@ -31229,6 +33386,7 @@ static const pciSubsystemInfo *pci_ss_list_1522_0100[] = {
 #define pci_ss_list_1592_0788 NULL
 #define pci_ss_list_1592_078a NULL
 #define pci_ss_list_15a2_0001 NULL
+#define pci_ss_list_15ad_0405 NULL
 #define pci_ss_list_15ad_0710 NULL
 #define pci_ss_list_15b3_5274 NULL
 #define pci_ss_list_15bc_2929 NULL
@@ -31245,6 +33403,18 @@ static const pciSubsystemInfo *pci_ss_list_1522_0100[] = {
 #define pci_ss_list_165a_c100 NULL
 #define pci_ss_list_165a_d200 NULL
 #define pci_ss_list_165a_d300 NULL
+#define pci_ss_list_168c_0011 NULL
+#define pci_ss_list_168c_0012 NULL
+#ifdef VENDOR_INCLUDE_NONVIDEO
+static const pciSubsystemInfo *pci_ss_list_168c_0013[] = {
+	&pci_ss_info_168c_0013_1186_3203,
+	&pci_ss_info_168c_0013_1186_3a94,
+	&pci_ss_info_168c_0013_168c_0013,
+	&pci_ss_info_168c_0013_168c_1025,
+	NULL
+};
+#define pci_ss_list_168c_1014 NULL
+#endif
 #define pci_ss_list_16ab_1102 NULL
 #define pci_ss_list_16ca_0001 NULL
 #define pci_ss_list_16ec_3685 NULL
@@ -31273,6 +33443,10 @@ static const pciSubsystemInfo *pci_ss_list_1813_4100[] = {
 	NULL
 };
 #endif
+#define pci_ss_list_1814_0101 NULL
+#define pci_ss_list_1867_5a44 NULL
+#define pci_ss_list_1867_5a45 NULL
+#define pci_ss_list_1867_5a46 NULL
 #define pci_ss_list_1888_0301 NULL
 #define pci_ss_list_1888_0601 NULL
 #define pci_ss_list_1888_0710 NULL
@@ -31293,9 +33467,12 @@ static const pciSubsystemInfo *pci_ss_list_1813_4100[] = {
 static const pciSubsystemInfo *pci_ss_list_3388_0021[] = {
 	&pci_ss_info_3388_0021_4c53_1050,
 	&pci_ss_info_3388_0021_4c53_1080,
+	&pci_ss_info_3388_0021_4c53_10a0,
 	&pci_ss_info_3388_0021_4c53_3010,
+	&pci_ss_info_3388_0021_4c53_3011,
 	NULL
 };
+#define pci_ss_list_3388_0026 NULL
 #define pci_ss_list_3388_101a NULL
 #define pci_ss_list_3388_101b NULL
 static const pciSubsystemInfo *pci_ss_list_3388_8011[] = {
@@ -31339,7 +33516,16 @@ static const pciSubsystemInfo *pci_ss_list_3d3d_000c[] = {
 	&pci_ss_info_3d3d_000c_3d3d_0144,
 	NULL
 };
+#define pci_ss_list_3d3d_000d NULL
+#define pci_ss_list_3d3d_0011 NULL
+#define pci_ss_list_3d3d_0012 NULL
+#define pci_ss_list_3d3d_0013 NULL
+#define pci_ss_list_3d3d_0020 NULL
+#define pci_ss_list_3d3d_0022 NULL
+#define pci_ss_list_3d3d_0024 NULL
 #define pci_ss_list_3d3d_0100 NULL
+#define pci_ss_list_3d3d_07a1 NULL
+#define pci_ss_list_3d3d_07a3 NULL
 #define pci_ss_list_3d3d_1004 NULL
 #define pci_ss_list_3d3d_3d04 NULL
 #define pci_ss_list_3d3d_ffff NULL
@@ -31363,7 +33549,17 @@ static const pciSubsystemInfo *pci_ss_list_4005_4000[] = {
 #define pci_ss_list_4033_1360 NULL
 #define pci_ss_list_416c_0100 NULL
 #define pci_ss_list_416c_0200 NULL
-#define pci_ss_list_4444_0803 NULL
+#ifdef VENDOR_INCLUDE_NONVIDEO
+static const pciSubsystemInfo *pci_ss_list_4444_0016[] = {
+	&pci_ss_info_4444_0016_0070_4009,
+	NULL
+};
+static const pciSubsystemInfo *pci_ss_list_4444_0803[] = {
+	&pci_ss_info_4444_0803_0070_4000,
+	&pci_ss_info_4444_0803_0070_4001,
+	NULL
+};
+#endif
 #define pci_ss_list_4916_1960 NULL
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciSubsystemInfo *pci_ss_list_4a14_5000[] = {
@@ -31371,6 +33567,17 @@ static const pciSubsystemInfo *pci_ss_list_4a14_5000[] = {
 	NULL
 };
 #endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
+static const pciSubsystemInfo *pci_ss_list_4c53_0000[] = {
+	&pci_ss_info_4c53_0000_4c53_3000,
+	&pci_ss_info_4c53_0000_4c53_3001,
+	NULL
+};
+static const pciSubsystemInfo *pci_ss_list_4c53_0001[] = {
+	&pci_ss_info_4c53_0001_4c53_3002,
+	NULL
+};
+#endif
 #define pci_ss_list_4d51_0200 NULL
 #define pci_ss_list_4ddc_0100 NULL
 #define pci_ss_list_4ddc_0801 NULL
@@ -31563,9 +33770,17 @@ static const pciSubsystemInfo *pci_ss_list_5333_9102[] = {
 #define pci_ss_list_8008_0010 NULL
 #define pci_ss_list_8008_0011 NULL
 #define pci_ss_list_8086_0007 NULL
-#define pci_ss_list_8086_0008 NULL
+static const pciSubsystemInfo *pci_ss_list_8086_0008[] = {
+	&pci_ss_info_8086_0008_0008_1000,
+	NULL
+};
 #define pci_ss_list_8086_0039 NULL
 #define pci_ss_list_8086_0122 NULL
+#define pci_ss_list_8086_0326 NULL
+#define pci_ss_list_8086_0327 NULL
+#define pci_ss_list_8086_0329 NULL
+#define pci_ss_list_8086_032a NULL
+#define pci_ss_list_8086_032c NULL
 #define pci_ss_list_8086_0482 NULL
 #define pci_ss_list_8086_0483 NULL
 #define pci_ss_list_8086_0484 NULL
@@ -31605,12 +33820,16 @@ static const pciSubsystemInfo *pci_ss_list_8086_1004[] = {
 	NULL
 };
 static const pciSubsystemInfo *pci_ss_list_8086_1008[] = {
+	&pci_ss_info_8086_1008_1014_0269,
+	&pci_ss_info_8086_1008_1028_011c,
 	&pci_ss_info_8086_1008_8086_1107,
 	&pci_ss_info_8086_1008_8086_2107,
 	&pci_ss_info_8086_1008_8086_2110,
+	&pci_ss_info_8086_1008_8086_3108,
 	NULL
 };
 static const pciSubsystemInfo *pci_ss_list_8086_1009[] = {
+	&pci_ss_info_8086_1009_1014_0268,
 	&pci_ss_info_8086_1009_8086_1109,
 	&pci_ss_info_8086_1009_8086_2109,
 	NULL
@@ -31620,29 +33839,101 @@ static const pciSubsystemInfo *pci_ss_list_8086_100c[] = {
 	&pci_ss_info_8086_100c_8086_2112,
 	NULL
 };
-#define pci_ss_list_8086_100d NULL
+static const pciSubsystemInfo *pci_ss_list_8086_100d[] = {
+	&pci_ss_info_8086_100d_1028_0123,
+	&pci_ss_info_8086_100d_1079_891f,
+	&pci_ss_info_8086_100d_4c53_1080,
+	&pci_ss_info_8086_100d_8086_110d,
+	NULL
+};
 static const pciSubsystemInfo *pci_ss_list_8086_100e[] = {
+	&pci_ss_info_8086_100e_1014_0265,
+	&pci_ss_info_8086_100e_1014_0267,
+	&pci_ss_info_8086_100e_1014_026a,
+	&pci_ss_info_8086_100e_107b_8920,
 	&pci_ss_info_8086_100e_8086_001e,
 	&pci_ss_info_8086_100e_8086_002e,
 	NULL
 };
 static const pciSubsystemInfo *pci_ss_list_8086_100f[] = {
+	&pci_ss_info_8086_100f_1014_0269,
+	&pci_ss_info_8086_100f_1014_028e,
+	&pci_ss_info_8086_100f_8086_1000,
 	&pci_ss_info_8086_100f_8086_1001,
 	NULL
 };
 static const pciSubsystemInfo *pci_ss_list_8086_1010[] = {
+	&pci_ss_info_8086_1010_1014_027c,
+	&pci_ss_info_8086_1010_18fb_7872,
+	&pci_ss_info_8086_1010_4c53_1080,
+	&pci_ss_info_8086_1010_4c53_10a0,
 	&pci_ss_info_8086_1010_8086_1011,
+	&pci_ss_info_8086_1010_8086_101a,
 	NULL
 };
 static const pciSubsystemInfo *pci_ss_list_8086_1011[] = {
+	&pci_ss_info_8086_1011_1014_0268,
 	&pci_ss_info_8086_1011_8086_1002,
+	&pci_ss_info_8086_1011_8086_1003,
 	NULL
 };
 static const pciSubsystemInfo *pci_ss_list_8086_1012[] = {
 	&pci_ss_info_8086_1012_8086_1012,
 	NULL
 };
+static const pciSubsystemInfo *pci_ss_list_8086_1013[] = {
+	&pci_ss_info_8086_1013_8086_0013,
+	&pci_ss_info_8086_1013_8086_1113,
+	NULL
+};
+#define pci_ss_list_8086_1014 NULL
 #define pci_ss_list_8086_1015 NULL
+static const pciSubsystemInfo *pci_ss_list_8086_1016[] = {
+	&pci_ss_info_8086_1016_1014_052c,
+	&pci_ss_info_8086_1016_1179_0001,
+	&pci_ss_info_8086_1016_8086_1016,
+	NULL
+};
+static const pciSubsystemInfo *pci_ss_list_8086_1017[] = {
+	&pci_ss_info_8086_1017_8086_1017,
+	NULL
+};
+static const pciSubsystemInfo *pci_ss_list_8086_1018[] = {
+	&pci_ss_info_8086_1018_8086_1018,
+	NULL
+};
+static const pciSubsystemInfo *pci_ss_list_8086_1019[] = {
+	&pci_ss_info_8086_1019_8086_1019,
+	NULL
+};
+static const pciSubsystemInfo *pci_ss_list_8086_101d[] = {
+	&pci_ss_info_8086_101d_8086_1000,
+	NULL
+};
+static const pciSubsystemInfo *pci_ss_list_8086_101e[] = {
+	&pci_ss_info_8086_101e_1014_0549,
+	&pci_ss_info_8086_101e_1179_0001,
+	&pci_ss_info_8086_101e_8086_101e,
+	NULL
+};
+static const pciSubsystemInfo *pci_ss_list_8086_1026[] = {
+	&pci_ss_info_8086_1026_8086_1000,
+	&pci_ss_info_8086_1026_8086_1001,
+	&pci_ss_info_8086_1026_8086_1002,
+	&pci_ss_info_8086_1026_8086_1026,
+	NULL
+};
+static const pciSubsystemInfo *pci_ss_list_8086_1027[] = {
+	&pci_ss_info_8086_1027_8086_1001,
+	&pci_ss_info_8086_1027_8086_1002,
+	&pci_ss_info_8086_1027_8086_1003,
+	&pci_ss_info_8086_1027_8086_1027,
+	NULL
+};
+static const pciSubsystemInfo *pci_ss_list_8086_1028[] = {
+	&pci_ss_info_8086_1028_8086_1028,
+	NULL
+};
 #define pci_ss_list_8086_1029 NULL
 #define pci_ss_list_8086_1030 NULL
 static const pciSubsystemInfo *pci_ss_list_8086_1031[] = {
@@ -31663,7 +33954,10 @@ static const pciSubsystemInfo *pci_ss_list_8086_1031[] = {
 #define pci_ss_list_8086_1036 NULL
 #define pci_ss_list_8086_1037 NULL
 #define pci_ss_list_8086_1038 NULL
-#define pci_ss_list_8086_1039 NULL
+static const pciSubsystemInfo *pci_ss_list_8086_1039[] = {
+	&pci_ss_info_8086_1039_1014_0267,
+	NULL
+};
 #define pci_ss_list_8086_103a NULL
 #define pci_ss_list_8086_103b NULL
 #define pci_ss_list_8086_103c NULL
@@ -31674,7 +33968,59 @@ static const pciSubsystemInfo *pci_ss_list_8086_1040[] = {
 	NULL
 };
 #define pci_ss_list_8086_1043 NULL
+static const pciSubsystemInfo *pci_ss_list_8086_1048[] = {
+	&pci_ss_info_8086_1048_8086_a01f,
+	&pci_ss_info_8086_1048_8086_a11f,
+	NULL
+};
+static const pciSubsystemInfo *pci_ss_list_8086_1050[] = {
+	&pci_ss_info_8086_1050_1462_728c,
+	NULL
+};
+#define pci_ss_list_8086_1051 NULL
 #define pci_ss_list_8086_1059 NULL
+static const pciSubsystemInfo *pci_ss_list_8086_1075[] = {
+	&pci_ss_info_8086_1075_8086_0075,
+	&pci_ss_info_8086_1075_8086_1075,
+	NULL
+};
+static const pciSubsystemInfo *pci_ss_list_8086_1076[] = {
+	&pci_ss_info_8086_1076_8086_0076,
+	&pci_ss_info_8086_1076_8086_1076,
+	&pci_ss_info_8086_1076_8086_1176,
+	&pci_ss_info_8086_1076_8086_1276,
+	NULL
+};
+static const pciSubsystemInfo *pci_ss_list_8086_1077[] = {
+	&pci_ss_info_8086_1077_1179_0001,
+	&pci_ss_info_8086_1077_8086_0077,
+	&pci_ss_info_8086_1077_8086_1077,
+	NULL
+};
+static const pciSubsystemInfo *pci_ss_list_8086_1078[] = {
+	&pci_ss_info_8086_1078_8086_1078,
+	NULL
+};
+static const pciSubsystemInfo *pci_ss_list_8086_1079[] = {
+	&pci_ss_info_8086_1079_103c_12a6,
+	&pci_ss_info_8086_1079_103c_12cf,
+	&pci_ss_info_8086_1079_4c53_1090,
+	&pci_ss_info_8086_1079_8086_0079,
+	&pci_ss_info_8086_1079_8086_1079,
+	&pci_ss_info_8086_1079_8086_1179,
+	&pci_ss_info_8086_1079_8086_117a,
+	NULL
+};
+static const pciSubsystemInfo *pci_ss_list_8086_107a[] = {
+	&pci_ss_info_8086_107a_8086_107a,
+	&pci_ss_info_8086_107a_8086_127a,
+	NULL
+};
+static const pciSubsystemInfo *pci_ss_list_8086_107b[] = {
+	&pci_ss_info_8086_107b_8086_007b,
+	&pci_ss_info_8086_107b_8086_107b,
+	NULL
+};
 static const pciSubsystemInfo *pci_ss_list_8086_1130[] = {
 	&pci_ss_info_8086_1130_1025_1016,
 	&pci_ss_info_8086_1130_1043_8027,
@@ -31700,7 +34046,12 @@ static const pciSubsystemInfo *pci_ss_list_8086_1200[] = {
 	&pci_ss_info_8086_1200_172a_0000,
 	NULL
 };
-#define pci_ss_list_8086_1209 NULL
+static const pciSubsystemInfo *pci_ss_list_8086_1209[] = {
+	&pci_ss_info_8086_1209_4c53_1050,
+	&pci_ss_info_8086_1209_4c53_1051,
+	&pci_ss_info_8086_1209_4c53_1070,
+	NULL
+};
 #define pci_ss_list_8086_1221 NULL
 #define pci_ss_list_8086_1222 NULL
 #define pci_ss_list_8086_1223 NULL
@@ -31748,6 +34099,7 @@ static const pciSubsystemInfo *pci_ss_list_8086_1229[] = {
 	&pci_ss_info_8086_1229_1014_705c,
 	&pci_ss_info_8086_1229_1014_805c,
 	&pci_ss_info_8086_1229_1028_009b,
+	&pci_ss_info_8086_1229_1028_00ce,
 	&pci_ss_info_8086_1229_1033_8000,
 	&pci_ss_info_8086_1229_1033_8016,
 	&pci_ss_info_8086_1229_1033_801f,
@@ -31773,6 +34125,7 @@ static const pciSubsystemInfo *pci_ss_list_8086_1229[] = {
 	&pci_ss_info_8086_1229_144d_2501,
 	&pci_ss_info_8086_1229_144d_2502,
 	&pci_ss_info_8086_1229_1668_1100,
+	&pci_ss_info_8086_1229_4c53_1080,
 	&pci_ss_info_8086_1229_8086_0001,
 	&pci_ss_info_8086_1229_8086_0002,
 	&pci_ss_info_8086_1229_8086_0003,
@@ -31883,6 +34236,7 @@ static const pciSubsystemInfo *pci_ss_list_8086_1361[] = {
 #define pci_ss_list_8086_1460 NULL
 static const pciSubsystemInfo *pci_ss_list_8086_1461[] = {
 	&pci_ss_info_8086_1461_15d9_3480,
+	&pci_ss_info_8086_1461_4c53_1090,
 	NULL
 };
 #define pci_ss_list_8086_1462 NULL
@@ -31907,6 +34261,10 @@ static const pciSubsystemInfo *pci_ss_list_8086_1960[] = {
 	&pci_ss_info_8086_1960_1111_1111,
 	&pci_ss_info_8086_1960_1111_1112,
 	&pci_ss_info_8086_1960_113c_03a2,
+	&pci_ss_info_8086_1960_e4bf_1010,
+	&pci_ss_info_8086_1960_e4bf_1020,
+	&pci_ss_info_8086_1960_e4bf_1040,
+	&pci_ss_info_8086_1960_e4bf_3100,
 	NULL
 };
 static const pciSubsystemInfo *pci_ss_list_8086_1962[] = {
@@ -32031,7 +34389,10 @@ static const pciSubsystemInfo *pci_ss_list_8086_244b[] = {
 	NULL
 };
 #define pci_ss_list_8086_244c NULL
-#define pci_ss_list_8086_244e NULL
+static const pciSubsystemInfo *pci_ss_list_8086_244e[] = {
+	&pci_ss_info_8086_244e_1014_0267,
+	NULL
+};
 #define pci_ss_list_8086_2450 NULL
 #define pci_ss_list_8086_2452 NULL
 #define pci_ss_list_8086_2453 NULL
@@ -32073,6 +34434,7 @@ static const pciSubsystemInfo *pci_ss_list_8086_2486[] = {
 	&pci_ss_info_8086_2486_1014_0223,
 	&pci_ss_info_8086_2486_1014_0503,
 	&pci_ss_info_8086_2486_1014_051a,
+	&pci_ss_info_8086_2486_101f_1025,
 	&pci_ss_info_8086_2486_104d_80e7,
 	&pci_ss_info_8086_2486_1179_0001,
 	&pci_ss_info_8086_2486_134d_4c21,
@@ -32099,52 +34461,110 @@ static const pciSubsystemInfo *pci_ss_list_8086_248b[] = {
 };
 #define pci_ss_list_8086_248c NULL
 static const pciSubsystemInfo *pci_ss_list_8086_24c0[] = {
+	&pci_ss_info_8086_24c0_1014_0267,
 	&pci_ss_info_8086_24c0_1462_5800,
 	NULL
 };
 static const pciSubsystemInfo *pci_ss_list_8086_24c2[] = {
+	&pci_ss_info_8086_24c2_1014_0267,
 	&pci_ss_info_8086_24c2_1462_5800,
 	NULL
 };
 static const pciSubsystemInfo *pci_ss_list_8086_24c3[] = {
+	&pci_ss_info_8086_24c3_1014_0267,
+	&pci_ss_info_8086_24c3_1458_24c2,
 	&pci_ss_info_8086_24c3_1462_5800,
+	&pci_ss_info_8086_24c3_4c53_1090,
 	NULL
 };
 static const pciSubsystemInfo *pci_ss_list_8086_24c4[] = {
+	&pci_ss_info_8086_24c4_1014_0267,
 	&pci_ss_info_8086_24c4_1462_5800,
+	&pci_ss_info_8086_24c4_4c53_1090,
 	NULL
 };
 static const pciSubsystemInfo *pci_ss_list_8086_24c5[] = {
+	&pci_ss_info_8086_24c5_1014_0267,
+	&pci_ss_info_8086_24c5_1458_a002,
 	&pci_ss_info_8086_24c5_1462_5800,
 	NULL
 };
 #define pci_ss_list_8086_24c6 NULL
 static const pciSubsystemInfo *pci_ss_list_8086_24c7[] = {
+	&pci_ss_info_8086_24c7_1014_0267,
 	&pci_ss_info_8086_24c7_1462_5800,
 	NULL
 };
 #define pci_ss_list_8086_24ca NULL
 static const pciSubsystemInfo *pci_ss_list_8086_24cb[] = {
+	&pci_ss_info_8086_24cb_1014_0267,
+	&pci_ss_info_8086_24cb_1458_24c2,
 	&pci_ss_info_8086_24cb_1462_5800,
+	&pci_ss_info_8086_24cb_4c53_1090,
 	NULL
 };
 #define pci_ss_list_8086_24cc NULL
 static const pciSubsystemInfo *pci_ss_list_8086_24cd[] = {
+	&pci_ss_info_8086_24cd_1014_0267,
 	&pci_ss_info_8086_24cd_1462_3981,
+	&pci_ss_info_8086_24cd_4c53_1090,
 	NULL
 };
 #define pci_ss_list_8086_24d0 NULL
-#define pci_ss_list_8086_24d1 NULL
-#define pci_ss_list_8086_24d2 NULL
-#define pci_ss_list_8086_24d3 NULL
-#define pci_ss_list_8086_24d4 NULL
-#define pci_ss_list_8086_24d5 NULL
+static const pciSubsystemInfo *pci_ss_list_8086_24d1[] = {
+	&pci_ss_info_8086_24d1_103c_12bc,
+	&pci_ss_info_8086_24d1_1462_7280,
+	NULL
+};
+static const pciSubsystemInfo *pci_ss_list_8086_24d2[] = {
+	&pci_ss_info_8086_24d2_103c_12bc,
+	&pci_ss_info_8086_24d2_1043_80a6,
+	&pci_ss_info_8086_24d2_1462_7280,
+	NULL
+};
+static const pciSubsystemInfo *pci_ss_list_8086_24d3[] = {
+	&pci_ss_info_8086_24d3_1043_80a6,
+	&pci_ss_info_8086_24d3_1462_7280,
+	NULL
+};
+static const pciSubsystemInfo *pci_ss_list_8086_24d4[] = {
+	&pci_ss_info_8086_24d4_103c_12bc,
+	&pci_ss_info_8086_24d4_1043_80a6,
+	&pci_ss_info_8086_24d4_1462_7280,
+	NULL
+};
+static const pciSubsystemInfo *pci_ss_list_8086_24d5[] = {
+	&pci_ss_info_8086_24d5_1043_80f3,
+	&pci_ss_info_8086_24d5_1462_7280,
+	NULL
+};
 #define pci_ss_list_8086_24d6 NULL
-#define pci_ss_list_8086_24d7 NULL
-#define pci_ss_list_8086_24db NULL
+static const pciSubsystemInfo *pci_ss_list_8086_24d7[] = {
+	&pci_ss_info_8086_24d7_103c_12bc,
+	&pci_ss_info_8086_24d7_1043_80a6,
+	&pci_ss_info_8086_24d7_1462_7280,
+	NULL
+};
+static const pciSubsystemInfo *pci_ss_list_8086_24db[] = {
+	&pci_ss_info_8086_24db_103c_12bc,
+	&pci_ss_info_8086_24db_1043_80a6,
+	&pci_ss_info_8086_24db_1462_7280,
+	&pci_ss_info_8086_24db_1462_7580,
+	NULL
+};
 #define pci_ss_list_8086_24dc NULL
-#define pci_ss_list_8086_24dd NULL
-#define pci_ss_list_8086_24de NULL
+static const pciSubsystemInfo *pci_ss_list_8086_24dd[] = {
+	&pci_ss_info_8086_24dd_103c_12bc,
+	&pci_ss_info_8086_24dd_1043_80a6,
+	&pci_ss_info_8086_24dd_1462_7280,
+	NULL
+};
+static const pciSubsystemInfo *pci_ss_list_8086_24de[] = {
+	&pci_ss_info_8086_24de_1043_80a6,
+	&pci_ss_info_8086_24de_1462_7280,
+	NULL
+};
+#define pci_ss_list_8086_24df NULL
 static const pciSubsystemInfo *pci_ss_list_8086_2500[] = {
 	&pci_ss_info_8086_2500_1028_0095,
 	&pci_ss_info_8086_2500_1043_801c,
@@ -32172,15 +34592,22 @@ static const pciSubsystemInfo *pci_ss_list_8086_2540[] = {
 };
 static const pciSubsystemInfo *pci_ss_list_8086_2541[] = {
 	&pci_ss_info_8086_2541_15d9_3480,
+	&pci_ss_info_8086_2541_4c53_1090,
 	NULL
 };
 #define pci_ss_list_8086_2543 NULL
-#define pci_ss_list_8086_2544 NULL
+static const pciSubsystemInfo *pci_ss_list_8086_2544[] = {
+	&pci_ss_info_8086_2544_4c53_1090,
+	NULL
+};
 #define pci_ss_list_8086_2545 NULL
 #define pci_ss_list_8086_2546 NULL
 #define pci_ss_list_8086_2547 NULL
 #define pci_ss_list_8086_2548 NULL
-#define pci_ss_list_8086_254c NULL
+static const pciSubsystemInfo *pci_ss_list_8086_254c[] = {
+	&pci_ss_info_8086_254c_4c53_1090,
+	NULL
+};
 #define pci_ss_list_8086_2550 NULL
 #define pci_ss_list_8086_2551 NULL
 #define pci_ss_list_8086_2552 NULL
@@ -32188,21 +34615,67 @@ static const pciSubsystemInfo *pci_ss_list_8086_2541[] = {
 #define pci_ss_list_8086_2554 NULL
 #define pci_ss_list_8086_255d NULL
 static const pciSubsystemInfo *pci_ss_list_8086_2560[] = {
+	&pci_ss_info_8086_2560_1458_2560,
 	&pci_ss_info_8086_2560_1462_5800,
 	NULL
 };
 #define pci_ss_list_8086_2561 NULL
-#define pci_ss_list_8086_2562 NULL
-#define pci_ss_list_8086_2570 NULL
+static const pciSubsystemInfo *pci_ss_list_8086_2562[] = {
+	&pci_ss_info_8086_2562_1014_0267,
+	NULL
+};
+static const pciSubsystemInfo *pci_ss_list_8086_2570[] = {
+	&pci_ss_info_8086_2570_1043_80f2,
+	NULL
+};
 #define pci_ss_list_8086_2571 NULL
 #define pci_ss_list_8086_2572 NULL
 #define pci_ss_list_8086_2573 NULL
 #define pci_ss_list_8086_2576 NULL
-#define pci_ss_list_8086_2578 NULL
+static const pciSubsystemInfo *pci_ss_list_8086_2578[] = {
+	&pci_ss_info_8086_2578_1462_7580,
+	&pci_ss_info_8086_2578_15d9_4580,
+	NULL
+};
 #define pci_ss_list_8086_2579 NULL
 #define pci_ss_list_8086_257b NULL
 #define pci_ss_list_8086_257e NULL
+#define pci_ss_list_8086_2584 NULL
+#define pci_ss_list_8086_2585 NULL
+#define pci_ss_list_8086_2588 NULL
+#define pci_ss_list_8086_2589 NULL
+#define pci_ss_list_8086_258a NULL
+#define pci_ss_list_8086_25a1 NULL
+#define pci_ss_list_8086_25a2 NULL
+#define pci_ss_list_8086_25a3 NULL
+#define pci_ss_list_8086_25a4 NULL
+#define pci_ss_list_8086_25a6 NULL
+#define pci_ss_list_8086_25a7 NULL
+#define pci_ss_list_8086_25a9 NULL
+#define pci_ss_list_8086_25aa NULL
+#define pci_ss_list_8086_25ab NULL
+#define pci_ss_list_8086_25ac NULL
+#define pci_ss_list_8086_25ad NULL
+#define pci_ss_list_8086_25ae NULL
+#define pci_ss_list_8086_25b0 NULL
+#define pci_ss_list_8086_2640 NULL
+#define pci_ss_list_8086_2651 NULL
+#define pci_ss_list_8086_2652 NULL
+#define pci_ss_list_8086_2658 NULL
+#define pci_ss_list_8086_2659 NULL
+#define pci_ss_list_8086_265a NULL
+#define pci_ss_list_8086_265b NULL
+#define pci_ss_list_8086_265c NULL
+#define pci_ss_list_8086_2660 NULL
+#define pci_ss_list_8086_2662 NULL
+#define pci_ss_list_8086_2664 NULL
+#define pci_ss_list_8086_2666 NULL
+#define pci_ss_list_8086_266a NULL
+#define pci_ss_list_8086_266d NULL
+#define pci_ss_list_8086_266e NULL
+#define pci_ss_list_8086_266f NULL
 #define pci_ss_list_8086_3092 NULL
+#define pci_ss_list_8086_3200 NULL
 #define pci_ss_list_8086_3340 NULL
 #define pci_ss_list_8086_3341 NULL
 static const pciSubsystemInfo *pci_ss_list_8086_3575[] = {
@@ -32217,7 +34690,23 @@ static const pciSubsystemInfo *pci_ss_list_8086_3577[] = {
 };
 #define pci_ss_list_8086_3578 NULL
 #define pci_ss_list_8086_3580 NULL
+#define pci_ss_list_8086_3581 NULL
 #define pci_ss_list_8086_3582 NULL
+#define pci_ss_list_8086_3584 NULL
+#define pci_ss_list_8086_3585 NULL
+#define pci_ss_list_8086_3590 NULL
+#define pci_ss_list_8086_3591 NULL
+#define pci_ss_list_8086_3592 NULL
+#define pci_ss_list_8086_3593 NULL
+#define pci_ss_list_8086_3594 NULL
+#define pci_ss_list_8086_3595 NULL
+#define pci_ss_list_8086_3596 NULL
+#define pci_ss_list_8086_3597 NULL
+#define pci_ss_list_8086_3598 NULL
+#define pci_ss_list_8086_3599 NULL
+#define pci_ss_list_8086_359a NULL
+#define pci_ss_list_8086_359b NULL
+#define pci_ss_list_8086_359e NULL
 #define pci_ss_list_8086_5200 NULL
 static const pciSubsystemInfo *pci_ss_list_8086_5201[] = {
 	&pci_ss_info_8086_5201_8086_0001,
@@ -32228,13 +34717,20 @@ static const pciSubsystemInfo *pci_ss_list_8086_5201[] = {
 #define pci_ss_list_8086_7010 NULL
 #define pci_ss_list_8086_7020 NULL
 #define pci_ss_list_8086_7030 NULL
+#define pci_ss_list_8086_7050 NULL
 #define pci_ss_list_8086_7100 NULL
 #define pci_ss_list_8086_7110 NULL
 #define pci_ss_list_8086_7111 NULL
 #define pci_ss_list_8086_7112 NULL
 #define pci_ss_list_8086_7113 NULL
-#define pci_ss_list_8086_7120 NULL
+static const pciSubsystemInfo *pci_ss_list_8086_7120[] = {
+	&pci_ss_info_8086_7120_4c53_1040,
+	&pci_ss_info_8086_7120_4c53_1060,
+	NULL
+};
 static const pciSubsystemInfo *pci_ss_list_8086_7121[] = {
+	&pci_ss_info_8086_7121_4c53_1040,
+	&pci_ss_info_8086_7121_4c53_1060,
 	&pci_ss_info_8086_7121_8086_4341,
 	NULL
 };
@@ -32251,14 +34747,21 @@ static const pciSubsystemInfo *pci_ss_list_8086_7190[] = {
 	&pci_ss_info_8086_7190_0e11_0500,
 	&pci_ss_info_8086_7190_0e11_b110,
 	&pci_ss_info_8086_7190_1179_0001,
+	&pci_ss_info_8086_7190_4c53_1050,
+	&pci_ss_info_8086_7190_4c53_1051,
 	NULL
 };
 #define pci_ss_list_8086_7191 NULL
 static const pciSubsystemInfo *pci_ss_list_8086_7192[] = {
 	&pci_ss_info_8086_7192_0e11_0460,
+	&pci_ss_info_8086_7192_4c53_1000,
+	NULL
+};
+static const pciSubsystemInfo *pci_ss_list_8086_7194[] = {
+	&pci_ss_info_8086_7194_1033_0000,
+	&pci_ss_info_8086_7194_4c53_10a0,
 	NULL
 };
-#define pci_ss_list_8086_7194 NULL
 static const pciSubsystemInfo *pci_ss_list_8086_7195[] = {
 	&pci_ss_info_8086_7195_10cf_1099,
 	&pci_ss_info_8086_7195_11d4_0040,
@@ -32270,9 +34773,16 @@ static const pciSubsystemInfo *pci_ss_list_8086_7195[] = {
 #define pci_ss_list_8086_7199 NULL
 #define pci_ss_list_8086_719a NULL
 #define pci_ss_list_8086_719b NULL
-#define pci_ss_list_8086_71a0 NULL
+static const pciSubsystemInfo *pci_ss_list_8086_71a0[] = {
+	&pci_ss_info_8086_71a0_4c53_1050,
+	&pci_ss_info_8086_71a0_4c53_1051,
+	NULL
+};
 #define pci_ss_list_8086_71a1 NULL
-#define pci_ss_list_8086_71a2 NULL
+static const pciSubsystemInfo *pci_ss_list_8086_71a2[] = {
+	&pci_ss_info_8086_71a2_4c53_1000,
+	NULL
+};
 #define pci_ss_list_8086_7600 NULL
 #define pci_ss_list_8086_7601 NULL
 #define pci_ss_list_8086_7602 NULL
@@ -32298,6 +34808,8 @@ static const pciSubsystemInfo *pci_ss_list_8086_7800[] = {
 #define pci_ss_list_8086_84e4 NULL
 #define pci_ss_list_8086_84e6 NULL
 #define pci_ss_list_8086_84ea NULL
+#define pci_ss_list_8086_8500 NULL
+#define pci_ss_list_8086_9000 NULL
 #define pci_ss_list_8086_9621 NULL
 #define pci_ss_list_8086_9622 NULL
 #define pci_ss_list_8086_9641 NULL
@@ -32305,12 +34817,15 @@ static const pciSubsystemInfo *pci_ss_list_8086_7800[] = {
 #define pci_ss_list_8086_b152 NULL
 #define pci_ss_list_8086_b154 NULL
 static const pciSubsystemInfo *pci_ss_list_8086_b555[] = {
+	&pci_ss_info_8086_b555_4c53_1050,
+	&pci_ss_info_8086_b555_4c53_1051,
 	&pci_ss_info_8086_b555_e4bf_1000,
 	NULL
 };
 #define pci_ss_list_8086_ffff NULL
 #define pci_ss_list_8800_2008 NULL
 #define pci_ss_list_8e2e_3000 NULL
+#define pci_ss_list_9004_0078 NULL
 #define pci_ss_list_9004_1078 NULL
 #define pci_ss_list_9004_1160 NULL
 #define pci_ss_list_9004_2178 NULL
@@ -32332,6 +34847,11 @@ static const pciSubsystemInfo *pci_ss_list_9004_5078[] = {
 #define pci_ss_list_9004_5478 NULL
 #define pci_ss_list_9004_5575 NULL
 #define pci_ss_list_9004_5578 NULL
+static const pciSubsystemInfo *pci_ss_list_9004_5647[] = {
+	&pci_ss_info_9004_5647_9004_7710,
+	&pci_ss_info_9004_5647_9004_7711,
+	NULL
+};
 #define pci_ss_list_9004_5675 NULL
 #define pci_ss_list_9004_5678 NULL
 #define pci_ss_list_9004_5775 NULL
@@ -32442,6 +34962,7 @@ static const pciSubsystemInfo *pci_ss_list_9004_8878[] = {
 static const pciSubsystemInfo *pci_ss_list_9005_0010[] = {
 	&pci_ss_info_9005_0010_9005_2180,
 	&pci_ss_info_9005_0010_9005_8100,
+	&pci_ss_info_9005_0010_9005_a100,
 	&pci_ss_info_9005_0010_9005_a180,
 	&pci_ss_info_9005_0010_9005_e100,
 	NULL
@@ -32449,6 +34970,7 @@ static const pciSubsystemInfo *pci_ss_list_9005_0010[] = {
 #define pci_ss_list_9005_0011 NULL
 static const pciSubsystemInfo *pci_ss_list_9005_0013[] = {
 	&pci_ss_info_9005_0013_9005_0003,
+	&pci_ss_info_9005_0013_9005_000f,
 	NULL
 };
 static const pciSubsystemInfo *pci_ss_list_9005_001f[] = {
@@ -32462,6 +34984,7 @@ static const pciSubsystemInfo *pci_ss_list_9005_001f[] = {
 #define pci_ss_list_9005_003f NULL
 static const pciSubsystemInfo *pci_ss_list_9005_0050[] = {
 	&pci_ss_info_9005_0050_9005_f500,
+	&pci_ss_info_9005_0050_9005_ffff,
 	NULL
 };
 static const pciSubsystemInfo *pci_ss_list_9005_0051[] = {
@@ -32475,6 +34998,7 @@ static const pciSubsystemInfo *pci_ss_list_9005_0053[] = {
 #define pci_ss_list_9005_005f NULL
 static const pciSubsystemInfo *pci_ss_list_9005_0080[] = {
 	&pci_ss_info_9005_0080_0e11_e2a0,
+	&pci_ss_info_9005_0080_9005_6220,
 	&pci_ss_info_9005_0080_9005_62a0,
 	&pci_ss_info_9005_0080_9005_e220,
 	&pci_ss_info_9005_0080_9005_e2a0,
@@ -32502,6 +35026,7 @@ static const pciSubsystemInfo *pci_ss_list_9005_00c5[] = {
 	NULL
 };
 static const pciSubsystemInfo *pci_ss_list_9005_00cf[] = {
+	&pci_ss_info_9005_00cf_1028_00ce,
 	&pci_ss_info_9005_00cf_1028_00d1,
 	&pci_ss_info_9005_00cf_10f1_2462,
 	&pci_ss_info_9005_00cf_15d9_9005,
@@ -32512,8 +35037,35 @@ static const pciSubsystemInfo *pci_ss_list_9005_0250[] = {
 	&pci_ss_info_9005_0250_1014_028c,
 	NULL
 };
+static const pciSubsystemInfo *pci_ss_list_9005_0283[] = {
+	&pci_ss_info_9005_0283_9005_0283,
+	NULL
+};
+static const pciSubsystemInfo *pci_ss_list_9005_0284[] = {
+	&pci_ss_info_9005_0284_9005_0284,
+	NULL
+};
 static const pciSubsystemInfo *pci_ss_list_9005_0285[] = {
+	&pci_ss_info_9005_0285_0e11_0295,
 	&pci_ss_info_9005_0285_1028_0287,
+	&pci_ss_info_9005_0285_1028_0291,
+	&pci_ss_info_9005_0285_17aa_0286,
+	&pci_ss_info_9005_0285_17aa_0287,
+	&pci_ss_info_9005_0285_9005_0285,
+	&pci_ss_info_9005_0285_9005_0286,
+	&pci_ss_info_9005_0285_9005_0287,
+	&pci_ss_info_9005_0285_9005_0288,
+	&pci_ss_info_9005_0285_9005_0289,
+	&pci_ss_info_9005_0285_9005_028a,
+	&pci_ss_info_9005_0285_9005_028b,
+	&pci_ss_info_9005_0285_9005_0290,
+	&pci_ss_info_9005_0285_9005_0292,
+	&pci_ss_info_9005_0285_9005_0293,
+	&pci_ss_info_9005_0285_9005_0294,
+	NULL
+};
+static const pciSubsystemInfo *pci_ss_list_9005_0286[] = {
+	&pci_ss_info_9005_0286_9005_028c,
 	NULL
 };
 #define pci_ss_list_9005_8000 NULL
@@ -32527,6 +35079,11 @@ static const pciSubsystemInfo *pci_ss_list_9005_8011[] = {
 #define pci_ss_list_9005_8012 NULL
 #define pci_ss_list_9005_8013 NULL
 #define pci_ss_list_9005_8014 NULL
+#define pci_ss_list_9005_8015 NULL
+#define pci_ss_list_9005_8016 NULL
+#define pci_ss_list_9005_8017 NULL
+#define pci_ss_list_9005_801c NULL
+#define pci_ss_list_9005_801d NULL
 #define pci_ss_list_9005_801e NULL
 #define pci_ss_list_9005_801f NULL
 #define pci_ss_list_9005_8080 NULL
@@ -32549,6 +35106,10 @@ static const pciSubsystemInfo *pci_ss_list_9005_8011[] = {
 #define pci_ss_list_9699_6565 NULL
 #define pci_ss_list_9710_9815 NULL
 #define pci_ss_list_9710_9835 NULL
+#define pci_ss_list_9710_9845 NULL
+#define pci_ss_list_9902_0001 NULL
+#define pci_ss_list_9902_0002 NULL
+#define pci_ss_list_9902_0003 NULL
 #define pci_ss_list_cddd_0101 NULL
 #define pci_ss_list_cddd_0200 NULL
 #define pci_ss_list_d4d4_0601 NULL
@@ -32592,6 +35153,7 @@ static const pciSubsystemInfo *pci_ss_list_e159_0001[] = {
 #define pci_ss_list_f1d0_facd NULL
 #define pci_ss_list_feda_a0fa NULL
 #define pci_ss_list_feda_a10e NULL
+#define pci_ss_list_fffe_0405 NULL
 #define pci_ss_list_fffe_0710 NULL
 #ifdef INIT_VENDOR_SUBSYS_INFO
 #define pci_ss_list_0000 NULL
@@ -32612,11 +35174,15 @@ static const pciSubsystemInfo *pci_ss_list_0059[] = {
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciSubsystemInfo *pci_ss_list_0070[] = {
 	&pci_ss_info_0070_13eb,
+	&pci_ss_info_0070_4000,
+	&pci_ss_info_0070_4001,
+	&pci_ss_info_0070_4009,
 	&pci_ss_info_0070_ff01,
 	NULL
 };
 #endif
 #define pci_ss_list_0100 NULL
+#define pci_ss_list_021b NULL
 #define pci_ss_list_0675 NULL
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciSubsystemInfo *pci_ss_list_0925[] = {
@@ -32651,6 +35217,7 @@ static const pciSubsystemInfo *pci_ss_list_0e11[] = {
 	&pci_ss_info_0e11_00cf,
 	&pci_ss_info_0e11_00d0,
 	&pci_ss_info_0e11_00d1,
+	&pci_ss_info_0e11_0295,
 	&pci_ss_info_0e11_0460,
 	&pci_ss_info_0e11_0500,
 	&pci_ss_info_0e11_3001,
@@ -32669,6 +35236,13 @@ static const pciSubsystemInfo *pci_ss_list_0e11[] = {
 	&pci_ss_info_0e11_4050,
 	&pci_ss_info_0e11_4051,
 	&pci_ss_info_0e11_4058,
+	&pci_ss_info_0e11_4080,
+	&pci_ss_info_0e11_4082,
+	&pci_ss_info_0e11_4083,
+	&pci_ss_info_0e11_409a,
+	&pci_ss_info_0e11_409b,
+	&pci_ss_info_0e11_409c,
+	&pci_ss_info_0e11_409d,
 	&pci_ss_info_0e11_7004,
 	&pci_ss_info_0e11_b01e,
 	&pci_ss_info_0e11_b01f,
@@ -32725,7 +35299,20 @@ static const pciSubsystemInfo *pci_ss_list_0e11[] = {
 #define pci_ss_list_0e55 NULL
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciSubsystemInfo *pci_ss_list_1000[] = {
+	&pci_ss_info_1000_0033,
+	&pci_ss_info_1000_0066,
+	&pci_ss_info_1000_0518,
+	&pci_ss_info_1000_0520,
+	&pci_ss_info_1000_0522,
+	&pci_ss_info_1000_0523,
+	&pci_ss_info_1000_0530,
+	&pci_ss_info_1000_0531,
+	&pci_ss_info_1000_0532,
 	&pci_ss_info_1000_1000,
+	&pci_ss_info_1000_1010,
+	&pci_ss_info_1000_1020,
+	&pci_ss_info_1000_4523,
+	&pci_ss_info_1000_a520,
 	NULL
 };
 #endif
@@ -32912,10 +35499,14 @@ static const pciSubsystemInfo *pci_ss_list_1014[] = {
 	&pci_ss_info_1014_0264,
 	&pci_ss_info_1014_0265,
 	&pci_ss_info_1014_0267,
+	&pci_ss_info_1014_0268,
+	&pci_ss_info_1014_0269,
 	&pci_ss_info_1014_026a,
 	&pci_ss_info_1014_0277,
 	&pci_ss_info_1014_0279,
+	&pci_ss_info_1014_027c,
 	&pci_ss_info_1014_028c,
+	&pci_ss_info_1014_028e,
 	&pci_ss_info_1014_0502,
 	&pci_ss_info_1014_0503,
 	&pci_ss_info_1014_0506,
@@ -32926,6 +35517,8 @@ static const pciSubsystemInfo *pci_ss_list_1014[] = {
 	&pci_ss_info_1014_0517,
 	&pci_ss_info_1014_051a,
 	&pci_ss_info_1014_051c,
+	&pci_ss_info_1014_052c,
+	&pci_ss_info_1014_0549,
 	&pci_ss_info_1014_1010,
 	&pci_ss_info_1014_105c,
 	&pci_ss_info_1014_10f2,
@@ -32969,8 +35562,13 @@ static const pciSubsystemInfo *pci_ss_list_101e[] = {
 	&pci_ss_info_101e_0467,
 	&pci_ss_info_101e_0471,
 	&pci_ss_info_101e_0475,
+	&pci_ss_info_101e_0477,
 	&pci_ss_info_101e_0490,
 	&pci_ss_info_101e_0493,
+	&pci_ss_info_101e_0494,
+	&pci_ss_info_101e_0503,
+	&pci_ss_info_101e_0511,
+	&pci_ss_info_101e_0522,
 	&pci_ss_info_101e_0649,
 	&pci_ss_info_101e_0762,
 	&pci_ss_info_101e_0767,
@@ -32980,7 +35578,12 @@ static const pciSubsystemInfo *pci_ss_list_101e[] = {
 	NULL
 };
 #endif
-#define pci_ss_list_101f NULL
+#ifdef VENDOR_INCLUDE_NONVIDEO
+static const pciSubsystemInfo *pci_ss_list_101f[] = {
+	&pci_ss_info_101f_1025,
+	NULL
+};
+#endif
 #define pci_ss_list_1020 NULL
 #define pci_ss_list_1021 NULL
 #define pci_ss_list_1022 NULL
@@ -33047,9 +35650,16 @@ static const pciSubsystemInfo *pci_ss_list_1028[] = {
 	&pci_ss_info_1028_0109,
 	&pci_ss_info_1028_010a,
 	&pci_ss_info_1028_011b,
+	&pci_ss_info_1028_011c,
 	&pci_ss_info_1028_0121,
+	&pci_ss_info_1028_0123,
 	&pci_ss_info_1028_0126,
+	&pci_ss_info_1028_013b,
+	&pci_ss_info_1028_014a,
+	&pci_ss_info_1028_014c,
+	&pci_ss_info_1028_014d,
 	&pci_ss_info_1028_0287,
+	&pci_ss_info_1028_0291,
 	&pci_ss_info_1028_0467,
 	&pci_ss_info_1028_0471,
 	&pci_ss_info_1028_0475,
@@ -33058,6 +35668,7 @@ static const pciSubsystemInfo *pci_ss_list_1028[] = {
 	&pci_ss_info_1028_0518,
 	&pci_ss_info_1028_0520,
 	&pci_ss_info_1028_0531,
+	&pci_ss_info_1028_0533,
 	&pci_ss_info_1028_1010,
 	&pci_ss_info_1028_1111,
 	&pci_ss_info_1028_4082,
@@ -33171,6 +35782,7 @@ static const pciSubsystemInfo *pci_ss_list_1031[] = {
 };
 #define pci_ss_list_1032 NULL
 static const pciSubsystemInfo *pci_ss_list_1033[] = {
+	&pci_ss_info_1033_0000,
 	&pci_ss_info_1033_8000,
 	&pci_ss_info_1033_800c,
 	&pci_ss_info_1033_800d,
@@ -33256,6 +35868,9 @@ static const pciSubsystemInfo *pci_ss_list_103c[] = {
 	&pci_ss_info_103c_1227,
 	&pci_ss_info_103c_1279,
 	&pci_ss_info_103c_1282,
+	&pci_ss_info_103c_12a6,
+	&pci_ss_info_103c_12bc,
+	&pci_ss_info_103c_12cf,
 	NULL
 };
 #define pci_ss_list_103e NULL
@@ -33311,9 +35926,12 @@ static const pciSubsystemInfo *pci_ss_list_1043[] = {
 	&pci_ss_info_1043_808c,
 	&pci_ss_info_1043_8095,
 	&pci_ss_info_1043_809e,
+	&pci_ss_info_1043_80a6,
 	&pci_ss_info_1043_80a8,
 	&pci_ss_info_1043_80ad,
 	&pci_ss_info_1043_80e2,
+	&pci_ss_info_1043_80f2,
+	&pci_ss_info_1043_80f3,
 	NULL
 };
 #endif
@@ -33529,7 +36147,12 @@ static const pciSubsystemInfo *pci_ss_list_1077[] = {
 };
 #endif
 #define pci_ss_list_1078 NULL
-#define pci_ss_list_1079 NULL
+#ifdef VENDOR_INCLUDE_NONVIDEO
+static const pciSubsystemInfo *pci_ss_list_1079[] = {
+	&pci_ss_info_1079_891f,
+	NULL
+};
+#endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciSubsystemInfo *pci_ss_list_107a[] = {
 	&pci_ss_info_107a_000c,
@@ -33541,6 +36164,7 @@ static const pciSubsystemInfo *pci_ss_list_107b[] = {
 	&pci_ss_info_107b_5350,
 	&pci_ss_info_107b_8030,
 	&pci_ss_info_107b_8054,
+	&pci_ss_info_107b_8920,
 	NULL
 };
 #endif
@@ -34397,7 +37021,9 @@ static const pciSubsystemInfo *pci_ss_list_1186[] = {
 	&pci_ss_info_1186_1320,
 	&pci_ss_info_1186_1400,
 	&pci_ss_info_1186_1401,
+	&pci_ss_info_1186_3203,
 	&pci_ss_info_1186_3501,
+	&pci_ss_info_1186_3a94,
 	&pci_ss_info_1186_7801,
 	&pci_ss_info_1186_8139,
 	NULL
@@ -35692,8 +38318,12 @@ static const pciSubsystemInfo *pci_ss_list_1458[] = {
 	&pci_ss_info_1458_0400,
 	&pci_ss_info_1458_0596,
 	&pci_ss_info_1458_0691,
+	&pci_ss_info_1458_24c2,
+	&pci_ss_info_1458_2560,
 	&pci_ss_info_1458_4000,
 	&pci_ss_info_1458_4002,
+	&pci_ss_info_1458_4024,
+	&pci_ss_info_1458_4025,
 	&pci_ss_info_1458_5000,
 	&pci_ss_info_1458_5001,
 	&pci_ss_info_1458_5002,
@@ -35741,6 +38371,9 @@ static const pciSubsystemInfo *pci_ss_list_1462[] = {
 	&pci_ss_info_1462_6930,
 	&pci_ss_info_1462_6990,
 	&pci_ss_info_1462_6991,
+	&pci_ss_info_1462_7280,
+	&pci_ss_info_1462_728c,
+	&pci_ss_info_1462_7580,
 	&pci_ss_info_1462_8661,
 	&pci_ss_info_1462_8730,
 	&pci_ss_info_1462_8808,
@@ -35841,6 +38474,10 @@ static const pciSubsystemInfo *pci_ss_list_148c[] = {
 	&pci_ss_info_148c_2026,
 	&pci_ss_info_148c_2036,
 	&pci_ss_info_148c_2039,
+	&pci_ss_info_148c_2064,
+	&pci_ss_info_148c_2066,
+	&pci_ss_info_148c_2067,
+	&pci_ss_info_148c_2073,
 	NULL
 };
 #endif
@@ -36363,6 +39000,7 @@ static const pciSubsystemInfo *pci_ss_list_15c5[] = {
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciSubsystemInfo *pci_ss_list_15d9[] = {
 	&pci_ss_info_15d9_3480,
+	&pci_ss_info_15d9_4580,
 	&pci_ss_info_15d9_9005,
 	NULL
 };
@@ -36460,6 +39098,13 @@ static const pciSubsystemInfo *pci_ss_list_1681[] = {
 	NULL
 };
 #endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
+static const pciSubsystemInfo *pci_ss_list_168c[] = {
+	&pci_ss_info_168c_0013,
+	&pci_ss_info_168c_1025,
+	NULL
+};
+#endif
 #define pci_ss_list_16ab NULL
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciSubsystemInfo *pci_ss_list_16be[] = {
@@ -36470,8 +39115,11 @@ static const pciSubsystemInfo *pci_ss_list_16be[] = {
 };
 #endif
 #define pci_ss_list_16ca NULL
+#define pci_ss_list_16cd NULL
+#define pci_ss_list_16df NULL
 #define pci_ss_list_16ec NULL
 #define pci_ss_list_16f6 NULL
+#define pci_ss_list_1702 NULL
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciSubsystemInfo *pci_ss_list_1705[] = {
 	&pci_ss_info_1705_0001,
@@ -36503,6 +39151,7 @@ static const pciSubsystemInfo *pci_ss_list_173b[] = {
 };
 #endif
 #define pci_ss_list_1743 NULL
+#define pci_ss_list_1749 NULL
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciSubsystemInfo *pci_ss_list_174b[] = {
 	&pci_ss_info_174b_7112,
@@ -36511,6 +39160,19 @@ static const pciSubsystemInfo *pci_ss_list_174b[] = {
 	&pci_ss_info_174b_7161,
 	&pci_ss_info_174b_7176,
 	&pci_ss_info_174b_7192,
+	&pci_ss_info_174b_7c28,
+	&pci_ss_info_174b_7c29,
+	NULL
+};
+#endif
+#define pci_ss_list_174d NULL
+#ifdef VENDOR_INCLUDE_NONVIDEO
+static const pciSubsystemInfo *pci_ss_list_175c[] = {
+	&pci_ss_info_175c_5000,
+	&pci_ss_info_175c_5100,
+	&pci_ss_info_175c_6100,
+	&pci_ss_info_175c_6200,
+	&pci_ss_info_175c_8700,
 	NULL
 };
 #endif
@@ -36534,11 +39196,17 @@ static const pciSubsystemInfo *pci_ss_list_17af[] = {
 	&pci_ss_info_17af_0202,
 	&pci_ss_info_17af_2005,
 	&pci_ss_info_17af_2006,
+	&pci_ss_info_17af_200c,
+	&pci_ss_info_17af_200d,
 	NULL
 };
 #endif
+#define pci_ss_list_17c2 NULL
 #define pci_ss_list_17cc NULL
+#define pci_ss_list_17d5 NULL
 #define pci_ss_list_1813 NULL
+#define pci_ss_list_1814 NULL
+#define pci_ss_list_1830 NULL
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciSubsystemInfo *pci_ss_list_1851[] = {
 	&pci_ss_info_1851_1850,
@@ -36552,7 +39220,15 @@ static const pciSubsystemInfo *pci_ss_list_1852[] = {
 	NULL
 };
 #endif
+#define pci_ss_list_1867 NULL
 #define pci_ss_list_1888 NULL
+#define pci_ss_list_1894 NULL
+#ifdef VENDOR_INCLUDE_NONVIDEO
+static const pciSubsystemInfo *pci_ss_list_18fb[] = {
+	&pci_ss_info_18fb_7872,
+	NULL
+};
+#endif
 #define pci_ss_list_1a08 NULL
 #define pci_ss_list_1b13 NULL
 #define pci_ss_list_1c1c NULL
@@ -36631,6 +39307,7 @@ static const pciSubsystemInfo *pci_ss_list_4005[] = {
 };
 #define pci_ss_list_4033 NULL
 #define pci_ss_list_4143 NULL
+#define pci_ss_list_4144 NULL
 #define pci_ss_list_416c NULL
 #define pci_ss_list_4444 NULL
 #define pci_ss_list_4468 NULL
@@ -36659,10 +39336,17 @@ static const pciSubsystemInfo *pci_ss_list_4c53[] = {
 	&pci_ss_info_4c53_1050,
 	&pci_ss_info_4c53_1051,
 	&pci_ss_info_4c53_1060,
+	&pci_ss_info_4c53_1070,
 	&pci_ss_info_4c53_1080,
+	&pci_ss_info_4c53_1090,
+	&pci_ss_info_4c53_10a0,
 	&pci_ss_info_4c53_1300,
 	&pci_ss_info_4c53_1310,
+	&pci_ss_info_4c53_3000,
+	&pci_ss_info_4c53_3001,
+	&pci_ss_info_4c53_3002,
 	&pci_ss_info_4c53_3010,
+	&pci_ss_info_4c53_3011,
 	NULL
 };
 #endif
@@ -36718,6 +39402,7 @@ static const pciSubsystemInfo *pci_ss_list_5654[] = {
 };
 #endif
 #define pci_ss_list_5700 NULL
+#define pci_ss_list_5851 NULL
 #define pci_ss_list_6356 NULL
 #define pci_ss_list_6374 NULL
 #define pci_ss_list_6409 NULL
@@ -36757,7 +39442,13 @@ static const pciSubsystemInfo *pci_ss_list_8086[] = {
 	&pci_ss_info_8086_0041,
 	&pci_ss_info_8086_0042,
 	&pci_ss_info_8086_0050,
+	&pci_ss_info_8086_0075,
+	&pci_ss_info_8086_0076,
+	&pci_ss_info_8086_0077,
+	&pci_ss_info_8086_0079,
+	&pci_ss_info_8086_007b,
 	&pci_ss_info_8086_0100,
+	&pci_ss_info_8086_0532,
 	&pci_ss_info_8086_1000,
 	&pci_ss_info_8086_1001,
 	&pci_ss_info_8086_1002,
@@ -36769,7 +39460,15 @@ static const pciSubsystemInfo *pci_ss_list_8086[] = {
 	&pci_ss_info_8086_1012,
 	&pci_ss_info_8086_1013,
 	&pci_ss_info_8086_1015,
+	&pci_ss_info_8086_1016,
 	&pci_ss_info_8086_1017,
+	&pci_ss_info_8086_1018,
+	&pci_ss_info_8086_1019,
+	&pci_ss_info_8086_101a,
+	&pci_ss_info_8086_101e,
+	&pci_ss_info_8086_1026,
+	&pci_ss_info_8086_1027,
+	&pci_ss_info_8086_1028,
 	&pci_ss_info_8086_1030,
 	&pci_ss_info_8086_1040,
 	&pci_ss_info_8086_1041,
@@ -36777,11 +39476,25 @@ static const pciSubsystemInfo *pci_ss_list_8086[] = {
 	&pci_ss_info_8086_1050,
 	&pci_ss_info_8086_1051,
 	&pci_ss_info_8086_1052,
+	&pci_ss_info_8086_1075,
+	&pci_ss_info_8086_1076,
+	&pci_ss_info_8086_1077,
+	&pci_ss_info_8086_1078,
+	&pci_ss_info_8086_1079,
+	&pci_ss_info_8086_107a,
+	&pci_ss_info_8086_107b,
 	&pci_ss_info_8086_10f0,
 	&pci_ss_info_8086_1107,
 	&pci_ss_info_8086_1109,
+	&pci_ss_info_8086_110d,
 	&pci_ss_info_8086_1112,
+	&pci_ss_info_8086_1113,
 	&pci_ss_info_8086_1161,
+	&pci_ss_info_8086_1176,
+	&pci_ss_info_8086_1179,
+	&pci_ss_info_8086_117a,
+	&pci_ss_info_8086_1276,
+	&pci_ss_info_8086_127a,
 	&pci_ss_info_8086_1361,
 	&pci_ss_info_8086_1958,
 	&pci_ss_info_8086_2004,
@@ -36840,6 +39553,7 @@ static const pciSubsystemInfo *pci_ss_list_8086[] = {
 	&pci_ss_info_8086_3016,
 	&pci_ss_info_8086_3017,
 	&pci_ss_info_8086_3018,
+	&pci_ss_info_8086_3108,
 	&pci_ss_info_8086_4152,
 	&pci_ss_info_8086_4249,
 	&pci_ss_info_8086_424c,
@@ -36859,6 +39573,8 @@ static const pciSubsystemInfo *pci_ss_list_8086[] = {
 	&pci_ss_info_8086_8000,
 	&pci_ss_info_8086_8181,
 	&pci_ss_info_8086_9181,
+	&pci_ss_info_8086_a01f,
+	&pci_ss_info_8086_a11f,
 	NULL
 };
 #define pci_ss_list_8800 NULL
@@ -36882,6 +39598,8 @@ static const pciSubsystemInfo *pci_ss_list_9004[] = {
 	&pci_ss_info_9004_0020,
 	&pci_ss_info_9004_0028,
 	&pci_ss_info_9004_7560,
+	&pci_ss_info_9004_7710,
+	&pci_ss_info_9004_7711,
 	&pci_ss_info_9004_7815,
 	&pci_ss_info_9004_7840,
 	&pci_ss_info_9004_7850,
@@ -36916,13 +39634,31 @@ static const pciSubsystemInfo *pci_ss_list_9005[] = {
 	&pci_ss_info_9005_0003,
 	&pci_ss_info_9005_000f,
 	&pci_ss_info_9005_0041,
+	&pci_ss_info_9005_0106,
+	&pci_ss_info_9005_0283,
+	&pci_ss_info_9005_0284,
+	&pci_ss_info_9005_0285,
+	&pci_ss_info_9005_0286,
+	&pci_ss_info_9005_0287,
+	&pci_ss_info_9005_0288,
+	&pci_ss_info_9005_0289,
+	&pci_ss_info_9005_028a,
+	&pci_ss_info_9005_028b,
+	&pci_ss_info_9005_028c,
+	&pci_ss_info_9005_0290,
+	&pci_ss_info_9005_0292,
+	&pci_ss_info_9005_0293,
+	&pci_ss_info_9005_0294,
+	&pci_ss_info_9005_0364,
 	&pci_ss_info_9005_0365,
 	&pci_ss_info_9005_1364,
 	&pci_ss_info_9005_1365,
 	&pci_ss_info_9005_2180,
+	&pci_ss_info_9005_6220,
 	&pci_ss_info_9005_62a0,
 	&pci_ss_info_9005_62a1,
 	&pci_ss_info_9005_8100,
+	&pci_ss_info_9005_a100,
 	&pci_ss_info_9005_a180,
 	&pci_ss_info_9005_b500,
 	&pci_ss_info_9005_e100,
@@ -36939,6 +39675,7 @@ static const pciSubsystemInfo *pci_ss_list_9005[] = {
 #define pci_ss_list_9412 NULL
 #define pci_ss_list_9699 NULL
 #define pci_ss_list_9710 NULL
+#define pci_ss_list_9902 NULL
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciSubsystemInfo *pci_ss_list_a0a0[] = {
 	&pci_ss_info_a0a0_0007,
@@ -37011,9 +39748,12 @@ static const pciSubsystemInfo *pci_ss_list_e4bf[] = {
 	&pci_ss_info_e4bf_1000,
 	&pci_ss_info_e4bf_1010,
 	&pci_ss_info_e4bf_1020,
+	&pci_ss_info_e4bf_1040,
+	&pci_ss_info_e4bf_3100,
 	NULL
 };
 #endif
+#define pci_ss_list_e55e NULL
 #define pci_ss_list_ea01 NULL
 #define pci_ss_list_ea60 NULL
 #define pci_ss_list_eabb NULL
@@ -37030,11 +39770,61 @@ static const pciSubsystemInfo *pci_ss_list_ecc0[] = {
 #define pci_ss_list_fa57 NULL
 #define pci_ss_list_febd NULL
 #define pci_ss_list_feda NULL
+#define pci_ss_list_fede NULL
 #define pci_ss_list_fffe NULL
 #define pci_ss_list_ffff NULL
 #endif /* INIT_VENDOR_SUBSYS_INFO */
 #endif /* INIT_SUBSYS_INFO */
 #ifdef VENDOR_INCLUDE_NONVIDEO
+static const pciDeviceInfo pci_dev_info_0070_4000 = {
+	0x4000, pci_device_0070_4000,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_0070_4000,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_0070_4001 = {
+	0x4001, pci_device_0070_4001,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_0070_4001,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_0070_4009 = {
+	0x4009, pci_device_0070_4009,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_0070_4009,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_0070_4801 = {
+	0x4801, pci_device_0070_4801,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_0070_4801,
+#else
+	NULL,
+#endif
+	0
+};
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
+static const pciDeviceInfo pci_dev_info_021b_8139 = {
+	0x8139, pci_device_021b_8139,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_021b_8139,
+#else
+	NULL,
+#endif
+	0
+};
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciDeviceInfo pci_dev_info_0675_1700 = {
 	0x1700, pci_device_0675_1700,
 #ifdef INIT_SUBSYS_INFO
@@ -37083,6 +39873,15 @@ static const pciDeviceInfo pci_dev_info_0e11_0002 = {
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_0e11_0046 = {
+	0x0046, pci_device_0e11_0046,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_0e11_0046,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_0e11_0049 = {
 	0x0049, pci_device_0e11_0049,
 #ifdef INIT_SUBSYS_INFO
@@ -37101,6 +39900,96 @@ static const pciDeviceInfo pci_dev_info_0e11_004a = {
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_0e11_007c = {
+	0x007c, pci_device_0e11_007c,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_0e11_007c,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_0e11_007d = {
+	0x007d, pci_device_0e11_007d,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_0e11_007d,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_0e11_0085 = {
+	0x0085, pci_device_0e11_0085,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_0e11_0085,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_0e11_00bb = {
+	0x00bb, pci_device_0e11_00bb,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_0e11_00bb,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_0e11_00ca = {
+	0x00ca, pci_device_0e11_00ca,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_0e11_00ca,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_0e11_00cb = {
+	0x00cb, pci_device_0e11_00cb,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_0e11_00cb,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_0e11_00cf = {
+	0x00cf, pci_device_0e11_00cf,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_0e11_00cf,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_0e11_00d0 = {
+	0x00d0, pci_device_0e11_00d0,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_0e11_00d0,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_0e11_00d1 = {
+	0x00d1, pci_device_0e11_00d1,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_0e11_00d1,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_0e11_00e3 = {
+	0x00e3, pci_device_0e11_00e3,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_0e11_00e3,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_0e11_0508 = {
 	0x0508, pci_device_0e11_0508,
 #ifdef INIT_SUBSYS_INFO
@@ -37750,6 +40639,33 @@ static const pciDeviceInfo pci_dev_info_1000_0030 = {
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_1000_0031 = {
+	0x0031, pci_device_1000_0031,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1000_0031,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_1000_0032 = {
+	0x0032, pci_device_1000_0032,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1000_0032,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_1000_0033 = {
+	0x0033, pci_device_1000_0033,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1000_0033,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_1000_0040 = {
 	0x0040, pci_device_1000_0040,
 #ifdef INIT_SUBSYS_INFO
@@ -37759,6 +40675,15 @@ static const pciDeviceInfo pci_dev_info_1000_0040 = {
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_1000_0041 = {
+	0x0041, pci_device_1000_0041,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1000_0041,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_1000_008f = {
 	0x008f, pci_device_1000_008f,
 #ifdef INIT_SUBSYS_INFO
@@ -37768,6 +40693,15 @@ static const pciDeviceInfo pci_dev_info_1000_008f = {
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_1000_0407 = {
+	0x0407, pci_device_1000_0407,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1000_0407,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_1000_0621 = {
 	0x0621, pci_device_1000_0621,
 #ifdef INIT_SUBSYS_INFO
@@ -38023,6 +40957,87 @@ static const pciDeviceInfo pci_dev_info_1002_4147 = {
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_1002_4148 = {
+	0x4148, pci_device_1002_4148,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1002_4148,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_1002_4149 = {
+	0x4149, pci_device_1002_4149,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1002_4149,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_1002_4150 = {
+	0x4150, pci_device_1002_4150,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1002_4150,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_1002_4151 = {
+	0x4151, pci_device_1002_4151,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1002_4151,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_1002_4152 = {
+	0x4152, pci_device_1002_4152,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1002_4152,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_1002_4154 = {
+	0x4154, pci_device_1002_4154,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1002_4154,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_1002_4155 = {
+	0x4155, pci_device_1002_4155,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1002_4155,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_1002_4156 = {
+	0x4156, pci_device_1002_4156,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1002_4156,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_1002_4157 = {
+	0x4157, pci_device_1002_4157,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1002_4157,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_1002_4158 = {
 	0x4158, pci_device_1002_4158,
 #ifdef INIT_SUBSYS_INFO
@@ -38041,6 +41056,60 @@ static const pciDeviceInfo pci_dev_info_1002_4164 = {
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_1002_4165 = {
+	0x4165, pci_device_1002_4165,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1002_4165,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_1002_4166 = {
+	0x4166, pci_device_1002_4166,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1002_4166,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_1002_4168 = {
+	0x4168, pci_device_1002_4168,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1002_4168,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_1002_4170 = {
+	0x4170, pci_device_1002_4170,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1002_4170,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_1002_4171 = {
+	0x4171, pci_device_1002_4171,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1002_4171,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_1002_4172 = {
+	0x4172, pci_device_1002_4172,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1002_4172,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_1002_4242 = {
 	0x4242, pci_device_1002_4242,
 #ifdef INIT_SUBSYS_INFO
@@ -38068,6 +41137,24 @@ static const pciDeviceInfo pci_dev_info_1002_4337 = {
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_1002_4341 = {
+	0x4341, pci_device_1002_4341,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1002_4341,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_1002_4353 = {
+	0x4353, pci_device_1002_4353,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1002_4353,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_1002_4354 = {
 	0x4354, pci_device_1002_4354,
 #ifdef INIT_SUBSYS_INFO
@@ -38581,6 +41668,60 @@ static const pciDeviceInfo pci_dev_info_1002_4e48 = {
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_1002_4e49 = {
+	0x4e49, pci_device_1002_4e49,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1002_4e49,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_1002_4e4a = {
+	0x4e4a, pci_device_1002_4e4a,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1002_4e4a,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_1002_4e4b = {
+	0x4e4b, pci_device_1002_4e4b,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1002_4e4b,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_1002_4e50 = {
+	0x4e50, pci_device_1002_4e50,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1002_4e50,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_1002_4e52 = {
+	0x4e52, pci_device_1002_4e52,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1002_4e52,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_1002_4e54 = {
+	0x4e54, pci_device_1002_4e54,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1002_4e54,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_1002_4e64 = {
 	0x4e64, pci_device_1002_4e64,
 #ifdef INIT_SUBSYS_INFO
@@ -38626,6 +41767,24 @@ static const pciDeviceInfo pci_dev_info_1002_4e68 = {
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_1002_4e69 = {
+	0x4e69, pci_device_1002_4e69,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1002_4e69,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_1002_4e6a = {
+	0x4e6a, pci_device_1002_4e6a,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1002_4e6a,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_1002_5041 = {
 	0x5041, pci_device_1002_5041,
 #ifdef INIT_SUBSYS_INFO
@@ -38950,6 +42109,24 @@ static const pciDeviceInfo pci_dev_info_1002_514f = {
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_1002_5154 = {
+	0x5154, pci_device_1002_5154,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1002_5154,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_1002_5155 = {
+	0x5155, pci_device_1002_5155,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1002_5155,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_1002_5157 = {
 	0x5157, pci_device_1002_5157,
 #ifdef INIT_SUBSYS_INFO
@@ -39238,6 +42415,24 @@ static const pciDeviceInfo pci_dev_info_1002_5656 = {
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_1002_5941 = {
+	0x5941, pci_device_1002_5941,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1002_5941,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_1002_5960 = {
+	0x5960, pci_device_1002_5960,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1002_5960,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_1002_5961 = {
 	0x5961, pci_device_1002_5961,
 #ifdef INIT_SUBSYS_INFO
@@ -39247,6 +42442,42 @@ static const pciDeviceInfo pci_dev_info_1002_5961 = {
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_1002_5964 = {
+	0x5964, pci_device_1002_5964,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1002_5964,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_1002_5c61 = {
+	0x5c61, pci_device_1002_5c61,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1002_5c61,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_1002_5c63 = {
+	0x5c63, pci_device_1002_5c63,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1002_5c63,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_1002_5d44 = {
+	0x5d44, pci_device_1002_5d44,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1002_5d44,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_1002_700f = {
 	0x700f, pci_device_1002_700f,
 #ifdef INIT_SUBSYS_INFO
@@ -41637,6 +44868,15 @@ static const pciDeviceInfo pci_dev_info_1023_2001 = {
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_1023_2100 = {
+	0x2100, pci_device_1023_2100,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1023_2100,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_1023_8400 = {
 	0x8400, pci_device_1023_8400,
 #ifdef INIT_SUBSYS_INFO
@@ -42474,15 +45714,6 @@ static const pciDeviceInfo pci_dev_info_1028_0004 = {
 #endif
 	0
 };
-static const pciDeviceInfo pci_dev_info_1028_0005 = {
-	0x0005, pci_device_1028_0005,
-#ifdef INIT_SUBSYS_INFO
-	pci_ss_list_1028_0005,
-#else
-	NULL,
-#endif
-	0
-};
 static const pciDeviceInfo pci_dev_info_1028_0006 = {
 	0x0006, pci_device_1028_0006,
 #ifdef INIT_SUBSYS_INFO
@@ -42583,6 +45814,24 @@ static const pciDeviceInfo pci_dev_info_102a_0010 = {
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_102a_00c5 = {
+	0x00c5, pci_device_102a_00c5,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_102a_00c5,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_102a_00cf = {
+	0x00cf, pci_device_102a_00cf,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_102a_00cf,
+#else
+	NULL,
+#endif
+	0
+};
 #endif
 static const pciDeviceInfo pci_dev_info_102b_0010 = {
 	0x0010, pci_device_102b_0010,
@@ -42893,6 +46142,42 @@ static const pciDeviceInfo pci_dev_info_102f_0020 = {
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_102f_0105 = {
+	0x0105, pci_device_102f_0105,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_102f_0105,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_102f_0106 = {
+	0x0106, pci_device_102f_0106,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_102f_0106,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_102f_0107 = {
+	0x0107, pci_device_102f_0107,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_102f_0107,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_102f_0108 = {
+	0x0108, pci_device_102f_0108,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_102f_0108,
+#else
+	NULL,
+#endif
+	0
+};
 #endif
 static const pciDeviceInfo pci_dev_info_1031_5601 = {
 	0x5601, pci_device_1031_5601,
@@ -43382,6 +46667,15 @@ static const pciDeviceInfo pci_dev_info_1039_0540 = {
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_1039_0550 = {
+	0x0550, pci_device_1039_0550,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1039_0550,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_1039_0597 = {
 	0x0597, pci_device_1039_0597,
 #ifdef INIT_SUBSYS_INFO
@@ -43481,6 +46775,33 @@ static const pciDeviceInfo pci_dev_info_1039_0651 = {
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_1039_0655 = {
+	0x0655, pci_device_1039_0655,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1039_0655,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_1039_0660 = {
+	0x0660, pci_device_1039_0660,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1039_0660,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_1039_0661 = {
+	0x0661, pci_device_1039_0661,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1039_0661,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_1039_0730 = {
 	0x0730, pci_device_1039_0730,
 #ifdef INIT_SUBSYS_INFO
@@ -43517,6 +46838,15 @@ static const pciDeviceInfo pci_dev_info_1039_0740 = {
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_1039_0741 = {
+	0x0741, pci_device_1039_0741,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1039_0741,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_1039_0745 = {
 	0x0745, pci_device_1039_0745,
 #ifdef INIT_SUBSYS_INFO
@@ -43544,6 +46874,15 @@ static const pciDeviceInfo pci_dev_info_1039_0755 = {
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_1039_0760 = {
+	0x0760, pci_device_1039_0760,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1039_0760,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_1039_0900 = {
 	0x0900, pci_device_1039_0900,
 #ifdef INIT_SUBSYS_INFO
@@ -43571,6 +46910,33 @@ static const pciDeviceInfo pci_dev_info_1039_0962 = {
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_1039_0963 = {
+	0x0963, pci_device_1039_0963,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1039_0963,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_1039_0964 = {
+	0x0964, pci_device_1039_0964,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1039_0964,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_1039_0965 = {
+	0x0965, pci_device_1039_0965,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1039_0965,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_1039_3602 = {
 	0x3602, pci_device_1039_3602,
 #ifdef INIT_SUBSYS_INFO
@@ -43769,6 +47135,15 @@ static const pciDeviceInfo pci_dev_info_1039_6326 = {
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_1039_6330 = {
+	0x6330, pci_device_1039_6330,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1039_6330,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_1039_7001 = {
 	0x7001, pci_device_1039_7001,
 #ifdef INIT_SUBSYS_INFO
@@ -43958,6 +47333,15 @@ static const pciDeviceInfo pci_dev_info_103c_1048 = {
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_103c_1054 = {
+	0x1054, pci_device_103c_1054,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_103c_1054,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_103c_1064 = {
 	0x1064, pci_device_103c_1064,
 #ifdef INIT_SUBSYS_INFO
@@ -44066,19 +47450,19 @@ static const pciDeviceInfo pci_dev_info_103c_122e = {
 #endif
 	0
 };
-static const pciDeviceInfo pci_dev_info_103c_1290 = {
-	0x1290, pci_device_103c_1290,
+static const pciDeviceInfo pci_dev_info_103c_127c = {
+	0x127c, pci_device_103c_127c,
 #ifdef INIT_SUBSYS_INFO
-	pci_ss_list_103c_1290,
+	pci_ss_list_103c_127c,
 #else
 	NULL,
 #endif
 	0
 };
-static const pciDeviceInfo pci_dev_info_103c_12b4 = {
-	0x12b4, pci_device_103c_12b4,
+static const pciDeviceInfo pci_dev_info_103c_1290 = {
+	0x1290, pci_device_103c_1290,
 #ifdef INIT_SUBSYS_INFO
-	pci_ss_list_103c_12b4,
+	pci_ss_list_103c_1290,
 #else
 	NULL,
 #endif
@@ -44807,6 +48191,15 @@ static const pciDeviceInfo pci_dev_info_104c_9000 = {
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_104c_9066 = {
+	0x9066, pci_device_104c_9066,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_104c_9066,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_104c_a001 = {
 	0xa001, pci_device_104c_a001,
 #ifdef INIT_SUBSYS_INFO
@@ -45068,6 +48461,15 @@ static const pciDeviceInfo pci_dev_info_104c_ac44 = {
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_104c_ac46 = {
+	0xac46, pci_device_104c_ac46,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_104c_ac46,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_104c_ac50 = {
 	0xac50, pci_device_104c_ac50,
 #ifdef INIT_SUBSYS_INFO
@@ -51019,42 +54421,6 @@ static const pciDeviceInfo pci_dev_info_10de_0312 = {
 #endif
 	0
 };
-static const pciDeviceInfo pci_dev_info_10de_0314 = {
-	0x0314, pci_device_10de_0314,
-#ifdef INIT_SUBSYS_INFO
-	pci_ss_list_10de_0314,
-#else
-	NULL,
-#endif
-	0
-};
-static const pciDeviceInfo pci_dev_info_10de_031a = {
-	0x031a, pci_device_10de_031a,
-#ifdef INIT_SUBSYS_INFO
-	pci_ss_list_10de_031a,
-#else
-	NULL,
-#endif
-	0
-};
-static const pciDeviceInfo pci_dev_info_10de_031b = {
-	0x031b, pci_device_10de_031b,
-#ifdef INIT_SUBSYS_INFO
-	pci_ss_list_10de_031b,
-#else
-	NULL,
-#endif
-	0
-};
-static const pciDeviceInfo pci_dev_info_10de_031c = {
-	0x031c, pci_device_10de_031c,
-#ifdef INIT_SUBSYS_INFO
-	pci_ss_list_10de_031c,
-#else
-	NULL,
-#endif
-	0
-};
 static const pciDeviceInfo pci_dev_info_10de_0321 = {
 	0x0321, pci_device_10de_0321,
 #ifdef INIT_SUBSYS_INFO
@@ -51073,60 +54439,6 @@ static const pciDeviceInfo pci_dev_info_10de_0322 = {
 #endif
 	0
 };
-static const pciDeviceInfo pci_dev_info_10de_0323 = {
-	0x0323, pci_device_10de_0323,
-#ifdef INIT_SUBSYS_INFO
-	pci_ss_list_10de_0323,
-#else
-	NULL,
-#endif
-	0
-};
-static const pciDeviceInfo pci_dev_info_10de_0324 = {
-	0x0324, pci_device_10de_0324,
-#ifdef INIT_SUBSYS_INFO
-	pci_ss_list_10de_0324,
-#else
-	NULL,
-#endif
-	0
-};
-static const pciDeviceInfo pci_dev_info_10de_0325 = {
-	0x0325, pci_device_10de_0325,
-#ifdef INIT_SUBSYS_INFO
-	pci_ss_list_10de_0325,
-#else
-	NULL,
-#endif
-	0
-};
-static const pciDeviceInfo pci_dev_info_10de_0328 = {
-	0x0328, pci_device_10de_0328,
-#ifdef INIT_SUBSYS_INFO
-	pci_ss_list_10de_0328,
-#else
-	NULL,
-#endif
-	0
-};
-static const pciDeviceInfo pci_dev_info_10de_0329 = {
-	0x0329, pci_device_10de_0329,
-#ifdef INIT_SUBSYS_INFO
-	pci_ss_list_10de_0329,
-#else
-	NULL,
-#endif
-	0
-};
-static const pciDeviceInfo pci_dev_info_10de_032a = {
-	0x032a, pci_device_10de_032a,
-#ifdef INIT_SUBSYS_INFO
-	pci_ss_list_10de_032a,
-#else
-	NULL,
-#endif
-	0
-};
 static const pciDeviceInfo pci_dev_info_10de_032b = {
 	0x032b, pci_device_10de_032b,
 #ifdef INIT_SUBSYS_INFO
@@ -51136,24 +54448,6 @@ static const pciDeviceInfo pci_dev_info_10de_032b = {
 #endif
 	0
 };
-static const pciDeviceInfo pci_dev_info_10de_032c = {
-	0x032c, pci_device_10de_032c,
-#ifdef INIT_SUBSYS_INFO
-	pci_ss_list_10de_032c,
-#else
-	NULL,
-#endif
-	0
-};
-static const pciDeviceInfo pci_dev_info_10de_032d = {
-	0x032d, pci_device_10de_032d,
-#ifdef INIT_SUBSYS_INFO
-	pci_ss_list_10de_032d,
-#else
-	NULL,
-#endif
-	0
-};
 static const pciDeviceInfo pci_dev_info_10de_0330 = {
 	0x0330, pci_device_10de_0330,
 #ifdef INIT_SUBSYS_INFO
@@ -51172,24 +54466,6 @@ static const pciDeviceInfo pci_dev_info_10de_0331 = {
 #endif
 	0
 };
-static const pciDeviceInfo pci_dev_info_10de_0332 = {
-	0x0332, pci_device_10de_0332,
-#ifdef INIT_SUBSYS_INFO
-	pci_ss_list_10de_0332,
-#else
-	NULL,
-#endif
-	0
-};
-static const pciDeviceInfo pci_dev_info_10de_0333 = {
-	0x0333, pci_device_10de_0333,
-#ifdef INIT_SUBSYS_INFO
-	pci_ss_list_10de_0333,
-#else
-	NULL,
-#endif
-	0
-};
 static const pciDeviceInfo pci_dev_info_10de_0338 = {
 	0x0338, pci_device_10de_0338,
 #ifdef INIT_SUBSYS_INFO
@@ -51199,33 +54475,6 @@ static const pciDeviceInfo pci_dev_info_10de_0338 = {
 #endif
 	0
 };
-static const pciDeviceInfo pci_dev_info_10de_0341 = {
-	0x0341, pci_device_10de_0341,
-#ifdef INIT_SUBSYS_INFO
-	pci_ss_list_10de_0341,
-#else
-	NULL,
-#endif
-	0
-};
-static const pciDeviceInfo pci_dev_info_10de_0342 = {
-	0x0342, pci_device_10de_0342,
-#ifdef INIT_SUBSYS_INFO
-	pci_ss_list_10de_0342,
-#else
-	NULL,
-#endif
-	0
-};
-static const pciDeviceInfo pci_dev_info_10de_034e = {
-	0x034e, pci_device_10de_034e,
-#ifdef INIT_SUBSYS_INFO
-	pci_ss_list_10de_034e,
-#else
-	NULL,
-#endif
-	0
-};
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciDeviceInfo pci_dev_info_10df_1ae5 = {
 	0x1ae5, pci_device_10df_1ae5,
@@ -51901,7 +55150,7 @@ static const pciDeviceInfo pci_dev_info_1102_0002 = {
 #else
 	NULL,
 #endif
-	0x0401
+	0
 };
 static const pciDeviceInfo pci_dev_info_1102_0004 = {
 	0x0004, pci_device_1102_0004,
@@ -52368,6 +55617,15 @@ static const pciDeviceInfo pci_dev_info_1106_3051 = {
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_1106_3053 = {
+	0x3053, pci_device_1106_3053,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1106_3053,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_1106_3057 = {
 	0x3057, pci_device_1106_3057,
 #ifdef INIT_SUBSYS_INFO
@@ -52575,6 +55833,15 @@ static const pciDeviceInfo pci_dev_info_1106_3156 = {
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_1106_3164 = {
+	0x3164, pci_device_1106_3164,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1106_3164,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_1106_3168 = {
 	0x3168, pci_device_1106_3168,
 #ifdef INIT_SUBSYS_INFO
@@ -52593,6 +55860,15 @@ static const pciDeviceInfo pci_dev_info_1106_3177 = {
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_1106_3188 = {
+	0x3188, pci_device_1106_3188,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1106_3188,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_1106_3189 = {
 	0x3189, pci_device_1106_3189,
 #ifdef INIT_SUBSYS_INFO
@@ -52602,6 +55878,24 @@ static const pciDeviceInfo pci_dev_info_1106_3189 = {
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_1106_3205 = {
+	0x3205, pci_device_1106_3205,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1106_3205,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_1106_3227 = {
+	0x3227, pci_device_1106_3227,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1106_3227,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_1106_5030 = {
 	0x5030, pci_device_1106_5030,
 #ifdef INIT_SUBSYS_INFO
@@ -52620,6 +55914,15 @@ static const pciDeviceInfo pci_dev_info_1106_6100 = {
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_1106_7205 = {
+	0x7205, pci_device_1106_7205,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1106_7205,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_1106_8231 = {
 	0x8231, pci_device_1106_8231,
 #ifdef INIT_SUBSYS_INFO
@@ -52791,6 +56094,15 @@ static const pciDeviceInfo pci_dev_info_1106_b168 = {
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_1106_b188 = {
+	0xb188, pci_device_1106_b188,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1106_b188,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_1106_b198 = {
 	0xb198, pci_device_1106_b198,
 #ifdef INIT_SUBSYS_INFO
@@ -52800,6 +56112,15 @@ static const pciDeviceInfo pci_dev_info_1106_b198 = {
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_1106_d104 = {
+	0xd104, pci_device_1106_d104,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1106_d104,
+#else
+	NULL,
+#endif
+	0
+};
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciDeviceInfo pci_dev_info_1107_0576 = {
@@ -56165,6 +59486,15 @@ static const pciDeviceInfo pci_dev_info_11ab_0146 = {
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_11ab_4320 = {
+	0x4320, pci_device_11ab_4320,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_11ab_4320,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_11ab_4611 = {
 	0x4611, pci_device_11ab_4611,
 #ifdef INIT_SUBSYS_INFO
@@ -56192,6 +59522,69 @@ static const pciDeviceInfo pci_dev_info_11ab_4801 = {
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_11ab_5040 = {
+	0x5040, pci_device_11ab_5040,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_11ab_5040,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_11ab_5041 = {
+	0x5041, pci_device_11ab_5041,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_11ab_5041,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_11ab_5080 = {
+	0x5080, pci_device_11ab_5080,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_11ab_5080,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_11ab_5081 = {
+	0x5081, pci_device_11ab_5081,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_11ab_5081,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_11ab_6041 = {
+	0x6041, pci_device_11ab_6041,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_11ab_6041,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_11ab_6081 = {
+	0x6081, pci_device_11ab_6081,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_11ab_6081,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_11ab_6460 = {
+	0x6460, pci_device_11ab_6460,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_11ab_6460,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_11ab_f003 = {
 	0xf003, pci_device_11ab_f003,
 #ifdef INIT_SUBSYS_INFO
@@ -62831,6 +66224,15 @@ static const pciDeviceInfo pci_dev_info_15a2_0001 = {
 	0
 };
 #endif
+static const pciDeviceInfo pci_dev_info_15ad_0405 = {
+	0x0405, pci_device_15ad_0405,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_15ad_0405,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_15ad_0710 = {
 	0x0710, pci_device_15ad_0710,
 #ifdef INIT_SUBSYS_INFO
@@ -62996,6 +66398,44 @@ static const pciDeviceInfo pci_dev_info_165a_d300 = {
 };
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+static const pciDeviceInfo pci_dev_info_168c_0011 = {
+	0x0011, pci_device_168c_0011,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_168c_0011,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_168c_0012 = {
+	0x0012, pci_device_168c_0012,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_168c_0012,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_168c_0013 = {
+	0x0013, pci_device_168c_0013,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_168c_0013,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_168c_1014 = {
+	0x1014, pci_device_168c_1014,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_168c_1014,
+#else
+	NULL,
+#endif
+	0
+};
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciDeviceInfo pci_dev_info_16ab_1102 = {
 	0x1102, pci_device_16ab_1102,
 #ifdef INIT_SUBSYS_INFO
@@ -63147,6 +66587,46 @@ static const pciDeviceInfo pci_dev_info_1813_4100 = {
 };
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+static const pciDeviceInfo pci_dev_info_1814_0101 = {
+	0x0101, pci_device_1814_0101,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1814_0101,
+#else
+	NULL,
+#endif
+	0
+};
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
+static const pciDeviceInfo pci_dev_info_1867_5a44 = {
+	0x5a44, pci_device_1867_5a44,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1867_5a44,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_1867_5a45 = {
+	0x5a45, pci_device_1867_5a45,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1867_5a45,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_1867_5a46 = {
+	0x5a46, pci_device_1867_5a46,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_1867_5a46,
+#else
+	NULL,
+#endif
+	0
+};
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciDeviceInfo pci_dev_info_1888_0301 = {
 	0x0301, pci_device_1888_0301,
 #ifdef INIT_SUBSYS_INFO
@@ -63314,6 +66794,15 @@ static const pciDeviceInfo pci_dev_info_3388_0021 = {
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_3388_0026 = {
+	0x0026, pci_device_3388_0026,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_3388_0026,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_3388_101a = {
 	0x101a, pci_device_3388_101a,
 #ifdef INIT_SUBSYS_INFO
@@ -63459,6 +66948,69 @@ static const pciDeviceInfo pci_dev_info_3d3d_000c = {
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_3d3d_000d = {
+	0x000d, pci_device_3d3d_000d,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_3d3d_000d,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_3d3d_0011 = {
+	0x0011, pci_device_3d3d_0011,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_3d3d_0011,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_3d3d_0012 = {
+	0x0012, pci_device_3d3d_0012,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_3d3d_0012,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_3d3d_0013 = {
+	0x0013, pci_device_3d3d_0013,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_3d3d_0013,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_3d3d_0020 = {
+	0x0020, pci_device_3d3d_0020,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_3d3d_0020,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_3d3d_0022 = {
+	0x0022, pci_device_3d3d_0022,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_3d3d_0022,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_3d3d_0024 = {
+	0x0024, pci_device_3d3d_0024,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_3d3d_0024,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_3d3d_0100 = {
 	0x0100, pci_device_3d3d_0100,
 #ifdef INIT_SUBSYS_INFO
@@ -63468,6 +67020,24 @@ static const pciDeviceInfo pci_dev_info_3d3d_0100 = {
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_3d3d_07a1 = {
+	0x07a1, pci_device_3d3d_07a1,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_3d3d_07a1,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_3d3d_07a3 = {
+	0x07a3, pci_device_3d3d_07a3,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_3d3d_07a3,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_3d3d_1004 = {
 	0x1004, pci_device_3d3d_1004,
 #ifdef INIT_SUBSYS_INFO
@@ -63653,6 +67223,15 @@ static const pciDeviceInfo pci_dev_info_416c_0200 = {
 };
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+static const pciDeviceInfo pci_dev_info_4444_0016 = {
+	0x0016, pci_device_4444_0016,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_4444_0016,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_4444_0803 = {
 	0x0803, pci_device_4444_0803,
 #ifdef INIT_SUBSYS_INFO
@@ -63686,6 +67265,26 @@ static const pciDeviceInfo pci_dev_info_4a14_5000 = {
 };
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+static const pciDeviceInfo pci_dev_info_4c53_0000 = {
+	0x0000, pci_device_4c53_0000,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_4c53_0000,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_4c53_0001 = {
+	0x0001, pci_device_4c53_0001,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_4c53_0001,
+#else
+	NULL,
+#endif
+	0
+};
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciDeviceInfo pci_dev_info_4d51_0200 = {
 	0x0200, pci_device_4d51_0200,
 #ifdef INIT_SUBSYS_INFO
@@ -64746,6 +68345,51 @@ static const pciDeviceInfo pci_dev_info_8086_0122 = {
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_8086_0326 = {
+	0x0326, pci_device_8086_0326,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_8086_0326,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_8086_0327 = {
+	0x0327, pci_device_8086_0327,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_8086_0327,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_8086_0329 = {
+	0x0329, pci_device_8086_0329,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_8086_0329,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_8086_032a = {
+	0x032a, pci_device_8086_032a,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_8086_032a,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_8086_032c = {
+	0x032c, pci_device_8086_032c,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_8086_032c,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_8086_0482 = {
 	0x0482, pci_device_8086_0482,
 #ifdef INIT_SUBSYS_INFO
@@ -64953,6 +68597,24 @@ static const pciDeviceInfo pci_dev_info_8086_1012 = {
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_8086_1013 = {
+	0x1013, pci_device_8086_1013,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_8086_1013,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_8086_1014 = {
+	0x1014, pci_device_8086_1014,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_8086_1014,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_8086_1015 = {
 	0x1015, pci_device_8086_1015,
 #ifdef INIT_SUBSYS_INFO
@@ -64962,6 +68624,87 @@ static const pciDeviceInfo pci_dev_info_8086_1015 = {
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_8086_1016 = {
+	0x1016, pci_device_8086_1016,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_8086_1016,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_8086_1017 = {
+	0x1017, pci_device_8086_1017,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_8086_1017,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_8086_1018 = {
+	0x1018, pci_device_8086_1018,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_8086_1018,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_8086_1019 = {
+	0x1019, pci_device_8086_1019,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_8086_1019,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_8086_101d = {
+	0x101d, pci_device_8086_101d,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_8086_101d,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_8086_101e = {
+	0x101e, pci_device_8086_101e,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_8086_101e,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_8086_1026 = {
+	0x1026, pci_device_8086_1026,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_8086_1026,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_8086_1027 = {
+	0x1027, pci_device_8086_1027,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_8086_1027,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_8086_1028 = {
+	0x1028, pci_device_8086_1028,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_8086_1028,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_8086_1029 = {
 	0x1029, pci_device_8086_1029,
 #ifdef INIT_SUBSYS_INFO
@@ -65124,6 +68867,33 @@ static const pciDeviceInfo pci_dev_info_8086_1043 = {
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_8086_1048 = {
+	0x1048, pci_device_8086_1048,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_8086_1048,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_8086_1050 = {
+	0x1050, pci_device_8086_1050,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_8086_1050,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_8086_1051 = {
+	0x1051, pci_device_8086_1051,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_8086_1051,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_8086_1059 = {
 	0x1059, pci_device_8086_1059,
 #ifdef INIT_SUBSYS_INFO
@@ -65133,6 +68903,69 @@ static const pciDeviceInfo pci_dev_info_8086_1059 = {
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_8086_1075 = {
+	0x1075, pci_device_8086_1075,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_8086_1075,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_8086_1076 = {
+	0x1076, pci_device_8086_1076,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_8086_1076,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_8086_1077 = {
+	0x1077, pci_device_8086_1077,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_8086_1077,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_8086_1078 = {
+	0x1078, pci_device_8086_1078,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_8086_1078,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_8086_1079 = {
+	0x1079, pci_device_8086_1079,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_8086_1079,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_8086_107a = {
+	0x107a, pci_device_8086_107a,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_8086_107a,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_8086_107b = {
+	0x107b, pci_device_8086_107b,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_8086_107b,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_8086_1130 = {
 	0x1130, pci_device_8086_1130,
 #ifdef INIT_SUBSYS_INFO
@@ -66105,6 +69938,15 @@ static const pciDeviceInfo pci_dev_info_8086_24de = {
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_8086_24df = {
+	0x24df, pci_device_8086_24df,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_8086_24df,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_8086_2500 = {
 	0x2500, pci_device_8086_2500,
 #ifdef INIT_SUBSYS_INFO
@@ -66447,6 +70289,312 @@ static const pciDeviceInfo pci_dev_info_8086_257e = {
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_8086_2584 = {
+	0x2584, pci_device_8086_2584,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_8086_2584,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_8086_2585 = {
+	0x2585, pci_device_8086_2585,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_8086_2585,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_8086_2588 = {
+	0x2588, pci_device_8086_2588,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_8086_2588,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_8086_2589 = {
+	0x2589, pci_device_8086_2589,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_8086_2589,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_8086_258a = {
+	0x258a, pci_device_8086_258a,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_8086_258a,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_8086_25a1 = {
+	0x25a1, pci_device_8086_25a1,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_8086_25a1,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_8086_25a2 = {
+	0x25a2, pci_device_8086_25a2,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_8086_25a2,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_8086_25a3 = {
+	0x25a3, pci_device_8086_25a3,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_8086_25a3,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_8086_25a4 = {
+	0x25a4, pci_device_8086_25a4,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_8086_25a4,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_8086_25a6 = {
+	0x25a6, pci_device_8086_25a6,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_8086_25a6,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_8086_25a7 = {
+	0x25a7, pci_device_8086_25a7,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_8086_25a7,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_8086_25a9 = {
+	0x25a9, pci_device_8086_25a9,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_8086_25a9,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_8086_25aa = {
+	0x25aa, pci_device_8086_25aa,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_8086_25aa,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_8086_25ab = {
+	0x25ab, pci_device_8086_25ab,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_8086_25ab,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_8086_25ac = {
+	0x25ac, pci_device_8086_25ac,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_8086_25ac,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_8086_25ad = {
+	0x25ad, pci_device_8086_25ad,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_8086_25ad,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_8086_25ae = {
+	0x25ae, pci_device_8086_25ae,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_8086_25ae,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_8086_25b0 = {
+	0x25b0, pci_device_8086_25b0,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_8086_25b0,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_8086_2640 = {
+	0x2640, pci_device_8086_2640,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_8086_2640,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_8086_2651 = {
+	0x2651, pci_device_8086_2651,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_8086_2651,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_8086_2652 = {
+	0x2652, pci_device_8086_2652,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_8086_2652,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_8086_2658 = {
+	0x2658, pci_device_8086_2658,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_8086_2658,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_8086_2659 = {
+	0x2659, pci_device_8086_2659,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_8086_2659,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_8086_265a = {
+	0x265a, pci_device_8086_265a,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_8086_265a,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_8086_265b = {
+	0x265b, pci_device_8086_265b,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_8086_265b,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_8086_265c = {
+	0x265c, pci_device_8086_265c,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_8086_265c,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_8086_2660 = {
+	0x2660, pci_device_8086_2660,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_8086_2660,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_8086_2662 = {
+	0x2662, pci_device_8086_2662,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_8086_2662,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_8086_2664 = {
+	0x2664, pci_device_8086_2664,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_8086_2664,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_8086_2666 = {
+	0x2666, pci_device_8086_2666,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_8086_2666,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_8086_266a = {
+	0x266a, pci_device_8086_266a,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_8086_266a,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_8086_266d = {
+	0x266d, pci_device_8086_266d,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_8086_266d,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_8086_266e = {
+	0x266e, pci_device_8086_266e,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_8086_266e,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_8086_266f = {
+	0x266f, pci_device_8086_266f,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_8086_266f,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_8086_3092 = {
 	0x3092, pci_device_8086_3092,
 #ifdef INIT_SUBSYS_INFO
@@ -66456,6 +70604,15 @@ static const pciDeviceInfo pci_dev_info_8086_3092 = {
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_8086_3200 = {
+	0x3200, pci_device_8086_3200,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_8086_3200,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_8086_3340 = {
 	0x3340, pci_device_8086_3340,
 #ifdef INIT_SUBSYS_INFO
@@ -66519,6 +70676,15 @@ static const pciDeviceInfo pci_dev_info_8086_3580 = {
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_8086_3581 = {
+	0x3581, pci_device_8086_3581,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_8086_3581,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_8086_3582 = {
 	0x3582, pci_device_8086_3582,
 #ifdef INIT_SUBSYS_INFO
@@ -66528,6 +70694,141 @@ static const pciDeviceInfo pci_dev_info_8086_3582 = {
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_8086_3584 = {
+	0x3584, pci_device_8086_3584,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_8086_3584,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_8086_3585 = {
+	0x3585, pci_device_8086_3585,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_8086_3585,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_8086_3590 = {
+	0x3590, pci_device_8086_3590,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_8086_3590,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_8086_3591 = {
+	0x3591, pci_device_8086_3591,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_8086_3591,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_8086_3592 = {
+	0x3592, pci_device_8086_3592,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_8086_3592,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_8086_3593 = {
+	0x3593, pci_device_8086_3593,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_8086_3593,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_8086_3594 = {
+	0x3594, pci_device_8086_3594,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_8086_3594,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_8086_3595 = {
+	0x3595, pci_device_8086_3595,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_8086_3595,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_8086_3596 = {
+	0x3596, pci_device_8086_3596,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_8086_3596,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_8086_3597 = {
+	0x3597, pci_device_8086_3597,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_8086_3597,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_8086_3598 = {
+	0x3598, pci_device_8086_3598,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_8086_3598,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_8086_3599 = {
+	0x3599, pci_device_8086_3599,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_8086_3599,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_8086_359a = {
+	0x359a, pci_device_8086_359a,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_8086_359a,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_8086_359b = {
+	0x359b, pci_device_8086_359b,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_8086_359b,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_8086_359e = {
+	0x359e, pci_device_8086_359e,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_8086_359e,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_8086_5200 = {
 	0x5200, pci_device_8086_5200,
 #ifdef INIT_SUBSYS_INFO
@@ -66591,6 +70892,15 @@ static const pciDeviceInfo pci_dev_info_8086_7030 = {
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_8086_7050 = {
+	0x7050, pci_device_8086_7050,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_8086_7050,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_8086_7100 = {
 	0x7100, pci_device_8086_7100,
 #ifdef INIT_SUBSYS_INFO
@@ -66996,6 +71306,24 @@ static const pciDeviceInfo pci_dev_info_8086_84ea = {
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_8086_8500 = {
+	0x8500, pci_device_8086_8500,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_8086_8500,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_8086_9000 = {
+	0x9000, pci_device_8086_9000,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_8086_9000,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_8086_9621 = {
 	0x9621, pci_device_8086_9621,
 #ifdef INIT_SUBSYS_INFO
@@ -67091,6 +71419,15 @@ static const pciDeviceInfo pci_dev_info_8e2e_3000 = {
 };
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+static const pciDeviceInfo pci_dev_info_9004_0078 = {
+	0x0078, pci_device_9004_0078,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_9004_0078,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_9004_1078 = {
 	0x1078, pci_device_9004_1078,
 #ifdef INIT_SUBSYS_INFO
@@ -67244,6 +71581,15 @@ static const pciDeviceInfo pci_dev_info_9004_5578 = {
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_9004_5647 = {
+	0x5647, pci_device_9004_5647,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_9004_5647,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_9004_5675 = {
 	0x5675, pci_device_9004_5675,
 #ifdef INIT_SUBSYS_INFO
@@ -67966,6 +72312,24 @@ static const pciDeviceInfo pci_dev_info_9005_0250 = {
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_9005_0283 = {
+	0x0283, pci_device_9005_0283,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_9005_0283,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_9005_0284 = {
+	0x0284, pci_device_9005_0284,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_9005_0284,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_9005_0285 = {
 	0x0285, pci_device_9005_0285,
 #ifdef INIT_SUBSYS_INFO
@@ -67975,6 +72339,15 @@ static const pciDeviceInfo pci_dev_info_9005_0285 = {
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_9005_0286 = {
+	0x0286, pci_device_9005_0286,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_9005_0286,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_9005_8000 = {
 	0x8000, pci_device_9005_8000,
 #ifdef INIT_SUBSYS_INFO
@@ -68038,6 +72411,51 @@ static const pciDeviceInfo pci_dev_info_9005_8014 = {
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_9005_8015 = {
+	0x8015, pci_device_9005_8015,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_9005_8015,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_9005_8016 = {
+	0x8016, pci_device_9005_8016,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_9005_8016,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_9005_8017 = {
+	0x8017, pci_device_9005_8017,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_9005_8017,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_9005_801c = {
+	0x801c, pci_device_9005_801c,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_9005_801c,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_9005_801d = {
+	0x801d, pci_device_9005_801d,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_9005_801d,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_9005_801e = {
 	0x801e, pci_device_9005_801e,
 #ifdef INIT_SUBSYS_INFO
@@ -68235,6 +72653,44 @@ static const pciDeviceInfo pci_dev_info_9710_9835 = {
 #endif
 	0
 };
+static const pciDeviceInfo pci_dev_info_9710_9845 = {
+	0x9845, pci_device_9710_9845,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_9710_9845,
+#else
+	NULL,
+#endif
+	0
+};
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
+static const pciDeviceInfo pci_dev_info_9902_0001 = {
+	0x0001, pci_device_9902_0001,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_9902_0001,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_9902_0002 = {
+	0x0002, pci_device_9902_0002,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_9902_0002,
+#else
+	NULL,
+#endif
+	0
+};
+static const pciDeviceInfo pci_dev_info_9902_0003 = {
+	0x0003, pci_device_9902_0003,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_9902_0003,
+#else
+	NULL,
+#endif
+	0
+};
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciDeviceInfo pci_dev_info_cddd_0101 = {
@@ -68590,6 +73046,15 @@ static const pciDeviceInfo pci_dev_info_feda_a10e = {
 };
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+static const pciDeviceInfo pci_dev_info_fffe_0405 = {
+	0x0405, pci_device_fffe_0405,
+#ifdef INIT_SUBSYS_INFO
+	pci_ss_list_fffe_0405,
+#else
+	NULL,
+#endif
+	0
+};
 static const pciDeviceInfo pci_dev_info_fffe_0710 = {
 	0x0710, pci_device_fffe_0710,
 #ifdef INIT_SUBSYS_INFO
@@ -68605,9 +73070,23 @@ static const pciDeviceInfo pci_dev_info_fffe_0710 = {
 #define pci_dev_list_0033 NULL
 #define pci_dev_list_003d NULL
 #define pci_dev_list_0059 NULL
-#define pci_dev_list_0070 NULL
+#ifdef VENDOR_INCLUDE_NONVIDEO
+static const pciDeviceInfo *pci_dev_list_0070[] = {
+	&pci_dev_info_0070_4000,
+	&pci_dev_info_0070_4001,
+	&pci_dev_info_0070_4009,
+	&pci_dev_info_0070_4801,
+	NULL
+};
+#endif
 #define pci_dev_list_0100 NULL
 #ifdef VENDOR_INCLUDE_NONVIDEO
+static const pciDeviceInfo *pci_dev_list_021b[] = {
+	&pci_dev_info_021b_8139,
+	NULL
+};
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciDeviceInfo *pci_dev_list_0675[] = {
 	&pci_dev_info_0675_1700,
 	&pci_dev_info_0675_1702,
@@ -68625,8 +73104,19 @@ static const pciDeviceInfo *pci_dev_list_09c1[] = {
 static const pciDeviceInfo *pci_dev_list_0e11[] = {
 	&pci_dev_info_0e11_0001,
 	&pci_dev_info_0e11_0002,
+	&pci_dev_info_0e11_0046,
 	&pci_dev_info_0e11_0049,
 	&pci_dev_info_0e11_004a,
+	&pci_dev_info_0e11_007c,
+	&pci_dev_info_0e11_007d,
+	&pci_dev_info_0e11_0085,
+	&pci_dev_info_0e11_00bb,
+	&pci_dev_info_0e11_00ca,
+	&pci_dev_info_0e11_00cb,
+	&pci_dev_info_0e11_00cf,
+	&pci_dev_info_0e11_00d0,
+	&pci_dev_info_0e11_00d1,
+	&pci_dev_info_0e11_00e3,
 	&pci_dev_info_0e11_0508,
 	&pci_dev_info_0e11_1000,
 	&pci_dev_info_0e11_2000,
@@ -68704,8 +73194,13 @@ static const pciDeviceInfo *pci_dev_list_1000[] = {
 	&pci_dev_info_1000_0020,
 	&pci_dev_info_1000_0021,
 	&pci_dev_info_1000_0030,
+	&pci_dev_info_1000_0031,
+	&pci_dev_info_1000_0032,
+	&pci_dev_info_1000_0033,
 	&pci_dev_info_1000_0040,
+	&pci_dev_info_1000_0041,
 	&pci_dev_info_1000_008f,
+	&pci_dev_info_1000_0407,
 	&pci_dev_info_1000_0621,
 	&pci_dev_info_1000_0622,
 	&pci_dev_info_1000_0623,
@@ -68743,11 +73238,28 @@ static const pciDeviceInfo *pci_dev_list_1002[] = {
 	&pci_dev_info_1002_4145,
 	&pci_dev_info_1002_4146,
 	&pci_dev_info_1002_4147,
+	&pci_dev_info_1002_4148,
+	&pci_dev_info_1002_4149,
+	&pci_dev_info_1002_4150,
+	&pci_dev_info_1002_4151,
+	&pci_dev_info_1002_4152,
+	&pci_dev_info_1002_4154,
+	&pci_dev_info_1002_4155,
+	&pci_dev_info_1002_4156,
+	&pci_dev_info_1002_4157,
 	&pci_dev_info_1002_4158,
 	&pci_dev_info_1002_4164,
+	&pci_dev_info_1002_4165,
+	&pci_dev_info_1002_4166,
+	&pci_dev_info_1002_4168,
+	&pci_dev_info_1002_4170,
+	&pci_dev_info_1002_4171,
+	&pci_dev_info_1002_4172,
 	&pci_dev_info_1002_4242,
 	&pci_dev_info_1002_4336,
 	&pci_dev_info_1002_4337,
+	&pci_dev_info_1002_4341,
+	&pci_dev_info_1002_4353,
 	&pci_dev_info_1002_4354,
 	&pci_dev_info_1002_4358,
 	&pci_dev_info_1002_4554,
@@ -68805,11 +73317,19 @@ static const pciDeviceInfo *pci_dev_list_1002[] = {
 	&pci_dev_info_1002_4e46,
 	&pci_dev_info_1002_4e47,
 	&pci_dev_info_1002_4e48,
+	&pci_dev_info_1002_4e49,
+	&pci_dev_info_1002_4e4a,
+	&pci_dev_info_1002_4e4b,
+	&pci_dev_info_1002_4e50,
+	&pci_dev_info_1002_4e52,
+	&pci_dev_info_1002_4e54,
 	&pci_dev_info_1002_4e64,
 	&pci_dev_info_1002_4e65,
 	&pci_dev_info_1002_4e66,
 	&pci_dev_info_1002_4e67,
 	&pci_dev_info_1002_4e68,
+	&pci_dev_info_1002_4e69,
+	&pci_dev_info_1002_4e6a,
 	&pci_dev_info_1002_5041,
 	&pci_dev_info_1002_5042,
 	&pci_dev_info_1002_5043,
@@ -68846,6 +73366,8 @@ static const pciDeviceInfo *pci_dev_list_1002[] = {
 	&pci_dev_info_1002_514d,
 	&pci_dev_info_1002_514e,
 	&pci_dev_info_1002_514f,
+	&pci_dev_info_1002_5154,
+	&pci_dev_info_1002_5155,
 	&pci_dev_info_1002_5157,
 	&pci_dev_info_1002_5158,
 	&pci_dev_info_1002_5159,
@@ -68878,7 +73400,13 @@ static const pciDeviceInfo *pci_dev_list_1002[] = {
 	&pci_dev_info_1002_5654,
 	&pci_dev_info_1002_5655,
 	&pci_dev_info_1002_5656,
+	&pci_dev_info_1002_5941,
+	&pci_dev_info_1002_5960,
 	&pci_dev_info_1002_5961,
+	&pci_dev_info_1002_5964,
+	&pci_dev_info_1002_5c61,
+	&pci_dev_info_1002_5c63,
+	&pci_dev_info_1002_5d44,
 	&pci_dev_info_1002_700f,
 	&pci_dev_info_1002_7010,
 	&pci_dev_info_1002_cab0,
@@ -69217,6 +73745,7 @@ static const pciDeviceInfo *pci_dev_list_1023[] = {
 	&pci_dev_info_1023_0194,
 	&pci_dev_info_1023_2000,
 	&pci_dev_info_1023_2001,
+	&pci_dev_info_1023_2100,
 	&pci_dev_info_1023_8400,
 	&pci_dev_info_1023_8420,
 	&pci_dev_info_1023_8500,
@@ -69317,7 +73846,6 @@ static const pciDeviceInfo *pci_dev_list_1028[] = {
 	&pci_dev_info_1028_0002,
 	&pci_dev_info_1028_0003,
 	&pci_dev_info_1028_0004,
-	&pci_dev_info_1028_0005,
 	&pci_dev_info_1028_0006,
 	&pci_dev_info_1028_0007,
 	&pci_dev_info_1028_0008,
@@ -69334,6 +73862,8 @@ static const pciDeviceInfo *pci_dev_list_1028[] = {
 static const pciDeviceInfo *pci_dev_list_102a[] = {
 	&pci_dev_info_102a_0000,
 	&pci_dev_info_102a_0010,
+	&pci_dev_info_102a_00c5,
+	&pci_dev_info_102a_00cf,
 	NULL
 };
 #endif
@@ -69385,6 +73915,10 @@ static const pciDeviceInfo *pci_dev_list_102d[] = {
 static const pciDeviceInfo *pci_dev_list_102f[] = {
 	&pci_dev_info_102f_0009,
 	&pci_dev_info_102f_0020,
+	&pci_dev_info_102f_0105,
+	&pci_dev_info_102f_0106,
+	&pci_dev_info_102f_0107,
+	&pci_dev_info_102f_0108,
 	NULL
 };
 #endif
@@ -69460,6 +73994,7 @@ static const pciDeviceInfo *pci_dev_list_1039[] = {
 	&pci_dev_info_1039_0496,
 	&pci_dev_info_1039_0530,
 	&pci_dev_info_1039_0540,
+	&pci_dev_info_1039_0550,
 	&pci_dev_info_1039_0597,
 	&pci_dev_info_1039_0601,
 	&pci_dev_info_1039_0620,
@@ -69471,16 +74006,24 @@ static const pciDeviceInfo *pci_dev_list_1039[] = {
 	&pci_dev_info_1039_0648,
 	&pci_dev_info_1039_0650,
 	&pci_dev_info_1039_0651,
+	&pci_dev_info_1039_0655,
+	&pci_dev_info_1039_0660,
+	&pci_dev_info_1039_0661,
 	&pci_dev_info_1039_0730,
 	&pci_dev_info_1039_0733,
 	&pci_dev_info_1039_0735,
 	&pci_dev_info_1039_0740,
+	&pci_dev_info_1039_0741,
 	&pci_dev_info_1039_0745,
 	&pci_dev_info_1039_0746,
 	&pci_dev_info_1039_0755,
+	&pci_dev_info_1039_0760,
 	&pci_dev_info_1039_0900,
 	&pci_dev_info_1039_0961,
 	&pci_dev_info_1039_0962,
+	&pci_dev_info_1039_0963,
+	&pci_dev_info_1039_0964,
+	&pci_dev_info_1039_0965,
 	&pci_dev_info_1039_3602,
 	&pci_dev_info_1039_5107,
 	&pci_dev_info_1039_5300,
@@ -69503,6 +74046,7 @@ static const pciDeviceInfo *pci_dev_list_1039[] = {
 	&pci_dev_info_1039_6306,
 	&pci_dev_info_1039_6325,
 	&pci_dev_info_1039_6326,
+	&pci_dev_info_1039_6330,
 	&pci_dev_info_1039_7001,
 	&pci_dev_info_1039_7002,
 	&pci_dev_info_1039_7007,
@@ -69529,6 +74073,7 @@ static const pciDeviceInfo *pci_dev_list_103c[] = {
 	&pci_dev_info_103c_1041,
 	&pci_dev_info_103c_1042,
 	&pci_dev_info_103c_1048,
+	&pci_dev_info_103c_1054,
 	&pci_dev_info_103c_1064,
 	&pci_dev_info_103c_108b,
 	&pci_dev_info_103c_10c1,
@@ -69541,8 +74086,8 @@ static const pciDeviceInfo *pci_dev_list_103c[] = {
 	&pci_dev_info_103c_1229,
 	&pci_dev_info_103c_122a,
 	&pci_dev_info_103c_122e,
+	&pci_dev_info_103c_127c,
 	&pci_dev_info_103c_1290,
-	&pci_dev_info_103c_12b4,
 	&pci_dev_info_103c_2910,
 	&pci_dev_info_103c_2925,
 	NULL
@@ -69665,6 +74210,7 @@ static const pciDeviceInfo *pci_dev_list_104c[] = {
 	&pci_dev_info_104c_8400,
 	&pci_dev_info_104c_8401,
 	&pci_dev_info_104c_9000,
+	&pci_dev_info_104c_9066,
 	&pci_dev_info_104c_a001,
 	&pci_dev_info_104c_a100,
 	&pci_dev_info_104c_a102,
@@ -69694,6 +74240,7 @@ static const pciDeviceInfo *pci_dev_list_104c[] = {
 	&pci_dev_info_104c_ac41,
 	&pci_dev_info_104c_ac42,
 	&pci_dev_info_104c_ac44,
+	&pci_dev_info_104c_ac46,
 	&pci_dev_info_104c_ac50,
 	&pci_dev_info_104c_ac51,
 	&pci_dev_info_104c_ac52,
@@ -70693,29 +75240,12 @@ static const pciDeviceInfo *pci_dev_list_10de[] = {
 	&pci_dev_info_10de_0309,
 	&pci_dev_info_10de_0311,
 	&pci_dev_info_10de_0312,
-	&pci_dev_info_10de_0314,
-	&pci_dev_info_10de_031a,
-	&pci_dev_info_10de_031b,
-	&pci_dev_info_10de_031c,
 	&pci_dev_info_10de_0321,
 	&pci_dev_info_10de_0322,
-	&pci_dev_info_10de_0323,
-	&pci_dev_info_10de_0324,
-	&pci_dev_info_10de_0325,
-	&pci_dev_info_10de_0328,
-	&pci_dev_info_10de_0329,
-	&pci_dev_info_10de_032a,
 	&pci_dev_info_10de_032b,
-	&pci_dev_info_10de_032c,
-	&pci_dev_info_10de_032d,
 	&pci_dev_info_10de_0330,
 	&pci_dev_info_10de_0331,
-	&pci_dev_info_10de_0332,
-	&pci_dev_info_10de_0333,
 	&pci_dev_info_10de_0338,
-	&pci_dev_info_10de_0341,
-	&pci_dev_info_10de_0342,
-	&pci_dev_info_10de_034e,
 	NULL
 };
 #ifdef VENDOR_INCLUDE_NONVIDEO
@@ -70954,6 +75484,7 @@ static const pciDeviceInfo *pci_dev_list_1106[] = {
 	&pci_dev_info_1106_3044,
 	&pci_dev_info_1106_3050,
 	&pci_dev_info_1106_3051,
+	&pci_dev_info_1106_3053,
 	&pci_dev_info_1106_3057,
 	&pci_dev_info_1106_3058,
 	&pci_dev_info_1106_3059,
@@ -70977,11 +75508,16 @@ static const pciDeviceInfo *pci_dev_list_1106[] = {
 	&pci_dev_info_1106_3147,
 	&pci_dev_info_1106_3148,
 	&pci_dev_info_1106_3156,
+	&pci_dev_info_1106_3164,
 	&pci_dev_info_1106_3168,
 	&pci_dev_info_1106_3177,
+	&pci_dev_info_1106_3188,
 	&pci_dev_info_1106_3189,
+	&pci_dev_info_1106_3205,
+	&pci_dev_info_1106_3227,
 	&pci_dev_info_1106_5030,
 	&pci_dev_info_1106_6100,
+	&pci_dev_info_1106_7205,
 	&pci_dev_info_1106_8231,
 	&pci_dev_info_1106_8235,
 	&pci_dev_info_1106_8305,
@@ -71001,7 +75537,9 @@ static const pciDeviceInfo *pci_dev_list_1106[] = {
 	&pci_dev_info_1106_b103,
 	&pci_dev_info_1106_b112,
 	&pci_dev_info_1106_b168,
+	&pci_dev_info_1106_b188,
 	&pci_dev_info_1106_b198,
+	&pci_dev_info_1106_d104,
 	NULL
 };
 #endif
@@ -71728,9 +76266,17 @@ static const pciDeviceInfo *pci_dev_list_11a9[] = {
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciDeviceInfo *pci_dev_list_11ab[] = {
 	&pci_dev_info_11ab_0146,
+	&pci_dev_info_11ab_4320,
 	&pci_dev_info_11ab_4611,
 	&pci_dev_info_11ab_4620,
 	&pci_dev_info_11ab_4801,
+	&pci_dev_info_11ab_5040,
+	&pci_dev_info_11ab_5041,
+	&pci_dev_info_11ab_5080,
+	&pci_dev_info_11ab_5081,
+	&pci_dev_info_11ab_6041,
+	&pci_dev_info_11ab_6081,
+	&pci_dev_info_11ab_6460,
 	&pci_dev_info_11ab_f003,
 	NULL
 };
@@ -73979,6 +78525,7 @@ static const pciDeviceInfo *pci_dev_list_15a2[] = {
 #define pci_dev_list_15ab NULL
 #define pci_dev_list_15ac NULL
 static const pciDeviceInfo *pci_dev_list_15ad[] = {
+	&pci_dev_info_15ad_0405,
 	&pci_dev_info_15ad_0710,
 	NULL
 };
@@ -74139,6 +78686,15 @@ static const pciDeviceInfo *pci_dev_list_165a[] = {
 #define pci_dev_list_1668 NULL
 #define pci_dev_list_1681 NULL
 #ifdef VENDOR_INCLUDE_NONVIDEO
+static const pciDeviceInfo *pci_dev_list_168c[] = {
+	&pci_dev_info_168c_0011,
+	&pci_dev_info_168c_0012,
+	&pci_dev_info_168c_0013,
+	&pci_dev_info_168c_1014,
+	NULL
+};
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciDeviceInfo *pci_dev_list_16ab[] = {
 	&pci_dev_info_16ab_1102,
 	NULL
@@ -74151,6 +78707,8 @@ static const pciDeviceInfo *pci_dev_list_16ca[] = {
 	NULL
 };
 #endif
+#define pci_dev_list_16cd NULL
+#define pci_dev_list_16df NULL
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciDeviceInfo *pci_dev_list_16ec[] = {
 	&pci_dev_info_16ec_3685,
@@ -74158,6 +78716,7 @@ static const pciDeviceInfo *pci_dev_list_16ec[] = {
 };
 #endif
 #define pci_dev_list_16f6 NULL
+#define pci_dev_list_1702 NULL
 #define pci_dev_list_1705 NULL
 #define pci_dev_list_170b NULL
 #define pci_dev_list_170c NULL
@@ -74176,7 +78735,10 @@ static const pciDeviceInfo *pci_dev_list_1743[] = {
 	NULL
 };
 #endif
+#define pci_dev_list_1749 NULL
 #define pci_dev_list_174b NULL
+#define pci_dev_list_174d NULL
+#define pci_dev_list_175c NULL
 #define pci_dev_list_175e NULL
 #define pci_dev_list_1787 NULL
 #ifdef VENDOR_INCLUDE_NONVIDEO
@@ -74192,12 +78754,14 @@ static const pciDeviceInfo *pci_dev_list_1796[] = {
 #endif
 #define pci_dev_list_1799 NULL
 #define pci_dev_list_17af NULL
+#define pci_dev_list_17c2 NULL
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciDeviceInfo *pci_dev_list_17cc[] = {
 	&pci_dev_info_17cc_2280,
 	NULL
 };
 #endif
+#define pci_dev_list_17d5 NULL
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciDeviceInfo *pci_dev_list_1813[] = {
 	&pci_dev_info_1813_4000,
@@ -74205,9 +78769,24 @@ static const pciDeviceInfo *pci_dev_list_1813[] = {
 	NULL
 };
 #endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
+static const pciDeviceInfo *pci_dev_list_1814[] = {
+	&pci_dev_info_1814_0101,
+	NULL
+};
+#endif
+#define pci_dev_list_1830 NULL
 #define pci_dev_list_1851 NULL
 #define pci_dev_list_1852 NULL
 #ifdef VENDOR_INCLUDE_NONVIDEO
+static const pciDeviceInfo *pci_dev_list_1867[] = {
+	&pci_dev_info_1867_5a44,
+	&pci_dev_info_1867_5a45,
+	&pci_dev_info_1867_5a46,
+	NULL
+};
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciDeviceInfo *pci_dev_list_1888[] = {
 	&pci_dev_info_1888_0301,
 	&pci_dev_info_1888_0601,
@@ -74216,6 +78795,8 @@ static const pciDeviceInfo *pci_dev_list_1888[] = {
 	NULL
 };
 #endif
+#define pci_dev_list_1894 NULL
+#define pci_dev_list_18fb NULL
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciDeviceInfo *pci_dev_list_1a08[] = {
 	&pci_dev_info_1a08_0000,
@@ -74274,6 +78855,7 @@ static const pciDeviceInfo *pci_dev_list_3388[] = {
 	&pci_dev_info_3388_0014,
 	&pci_dev_info_3388_0020,
 	&pci_dev_info_3388_0021,
+	&pci_dev_info_3388_0026,
 	&pci_dev_info_3388_101a,
 	&pci_dev_info_3388_101b,
 	&pci_dev_info_3388_8011,
@@ -74297,7 +78879,16 @@ static const pciDeviceInfo *pci_dev_list_3d3d[] = {
 	&pci_dev_info_3d3d_0009,
 	&pci_dev_info_3d3d_000a,
 	&pci_dev_info_3d3d_000c,
+	&pci_dev_info_3d3d_000d,
+	&pci_dev_info_3d3d_0011,
+	&pci_dev_info_3d3d_0012,
+	&pci_dev_info_3d3d_0013,
+	&pci_dev_info_3d3d_0020,
+	&pci_dev_info_3d3d_0022,
+	&pci_dev_info_3d3d_0024,
 	&pci_dev_info_3d3d_0100,
+	&pci_dev_info_3d3d_07a1,
+	&pci_dev_info_3d3d_07a3,
 	&pci_dev_info_3d3d_1004,
 	&pci_dev_info_3d3d_3d04,
 	&pci_dev_info_3d3d_ffff,
@@ -74327,6 +78918,7 @@ static const pciDeviceInfo *pci_dev_list_4033[] = {
 };
 #endif
 #define pci_dev_list_4143 NULL
+#define pci_dev_list_4144 NULL
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciDeviceInfo *pci_dev_list_416c[] = {
 	&pci_dev_info_416c_0100,
@@ -74336,6 +78928,7 @@ static const pciDeviceInfo *pci_dev_list_416c[] = {
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciDeviceInfo *pci_dev_list_4444[] = {
+	&pci_dev_info_4444_0016,
 	&pci_dev_info_4444_0803,
 	NULL
 };
@@ -74361,7 +78954,13 @@ static const pciDeviceInfo *pci_dev_list_4a14[] = {
 #endif
 #define pci_dev_list_4b10 NULL
 #define pci_dev_list_4c48 NULL
-#define pci_dev_list_4c53 NULL
+#ifdef VENDOR_INCLUDE_NONVIDEO
+static const pciDeviceInfo *pci_dev_list_4c53[] = {
+	&pci_dev_info_4c53_0000,
+	&pci_dev_info_4c53_0001,
+	NULL
+};
+#endif
 #define pci_dev_list_4ca1 NULL
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciDeviceInfo *pci_dev_list_4d51[] = {
@@ -74529,6 +79128,7 @@ static const pciDeviceInfo *pci_dev_list_5555[] = {
 #endif
 #define pci_dev_list_5654 NULL
 #define pci_dev_list_5700 NULL
+#define pci_dev_list_5851 NULL
 #define pci_dev_list_6356 NULL
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciDeviceInfo *pci_dev_list_6374[] = {
@@ -74559,6 +79159,11 @@ static const pciDeviceInfo *pci_dev_list_8086[] = {
 	&pci_dev_info_8086_0008,
 	&pci_dev_info_8086_0039,
 	&pci_dev_info_8086_0122,
+	&pci_dev_info_8086_0326,
+	&pci_dev_info_8086_0327,
+	&pci_dev_info_8086_0329,
+	&pci_dev_info_8086_032a,
+	&pci_dev_info_8086_032c,
 	&pci_dev_info_8086_0482,
 	&pci_dev_info_8086_0483,
 	&pci_dev_info_8086_0484,
@@ -74582,7 +79187,18 @@ static const pciDeviceInfo *pci_dev_list_8086[] = {
 	&pci_dev_info_8086_1010,
 	&pci_dev_info_8086_1011,
 	&pci_dev_info_8086_1012,
+	&pci_dev_info_8086_1013,
+	&pci_dev_info_8086_1014,
 	&pci_dev_info_8086_1015,
+	&pci_dev_info_8086_1016,
+	&pci_dev_info_8086_1017,
+	&pci_dev_info_8086_1018,
+	&pci_dev_info_8086_1019,
+	&pci_dev_info_8086_101d,
+	&pci_dev_info_8086_101e,
+	&pci_dev_info_8086_1026,
+	&pci_dev_info_8086_1027,
+	&pci_dev_info_8086_1028,
 	&pci_dev_info_8086_1029,
 	&pci_dev_info_8086_1030,
 	&pci_dev_info_8086_1031,
@@ -74601,7 +79217,17 @@ static const pciDeviceInfo *pci_dev_list_8086[] = {
 	&pci_dev_info_8086_103e,
 	&pci_dev_info_8086_1040,
 	&pci_dev_info_8086_1043,
+	&pci_dev_info_8086_1048,
+	&pci_dev_info_8086_1050,
+	&pci_dev_info_8086_1051,
 	&pci_dev_info_8086_1059,
+	&pci_dev_info_8086_1075,
+	&pci_dev_info_8086_1076,
+	&pci_dev_info_8086_1077,
+	&pci_dev_info_8086_1078,
+	&pci_dev_info_8086_1079,
+	&pci_dev_info_8086_107a,
+	&pci_dev_info_8086_107b,
 	&pci_dev_info_8086_1130,
 	&pci_dev_info_8086_1131,
 	&pci_dev_info_8086_1132,
@@ -74710,6 +79336,7 @@ static const pciDeviceInfo *pci_dev_list_8086[] = {
 	&pci_dev_info_8086_24dc,
 	&pci_dev_info_8086_24dd,
 	&pci_dev_info_8086_24de,
+	&pci_dev_info_8086_24df,
 	&pci_dev_info_8086_2500,
 	&pci_dev_info_8086_2501,
 	&pci_dev_info_8086_250b,
@@ -74748,7 +79375,42 @@ static const pciDeviceInfo *pci_dev_list_8086[] = {
 	&pci_dev_info_8086_2579,
 	&pci_dev_info_8086_257b,
 	&pci_dev_info_8086_257e,
+	&pci_dev_info_8086_2584,
+	&pci_dev_info_8086_2585,
+	&pci_dev_info_8086_2588,
+	&pci_dev_info_8086_2589,
+	&pci_dev_info_8086_258a,
+	&pci_dev_info_8086_25a1,
+	&pci_dev_info_8086_25a2,
+	&pci_dev_info_8086_25a3,
+	&pci_dev_info_8086_25a4,
+	&pci_dev_info_8086_25a6,
+	&pci_dev_info_8086_25a7,
+	&pci_dev_info_8086_25a9,
+	&pci_dev_info_8086_25aa,
+	&pci_dev_info_8086_25ab,
+	&pci_dev_info_8086_25ac,
+	&pci_dev_info_8086_25ad,
+	&pci_dev_info_8086_25ae,
+	&pci_dev_info_8086_25b0,
+	&pci_dev_info_8086_2640,
+	&pci_dev_info_8086_2651,
+	&pci_dev_info_8086_2652,
+	&pci_dev_info_8086_2658,
+	&pci_dev_info_8086_2659,
+	&pci_dev_info_8086_265a,
+	&pci_dev_info_8086_265b,
+	&pci_dev_info_8086_265c,
+	&pci_dev_info_8086_2660,
+	&pci_dev_info_8086_2662,
+	&pci_dev_info_8086_2664,
+	&pci_dev_info_8086_2666,
+	&pci_dev_info_8086_266a,
+	&pci_dev_info_8086_266d,
+	&pci_dev_info_8086_266e,
+	&pci_dev_info_8086_266f,
 	&pci_dev_info_8086_3092,
+	&pci_dev_info_8086_3200,
 	&pci_dev_info_8086_3340,
 	&pci_dev_info_8086_3341,
 	&pci_dev_info_8086_3575,
@@ -74756,7 +79418,23 @@ static const pciDeviceInfo *pci_dev_list_8086[] = {
 	&pci_dev_info_8086_3577,
 	&pci_dev_info_8086_3578,
 	&pci_dev_info_8086_3580,
+	&pci_dev_info_8086_3581,
 	&pci_dev_info_8086_3582,
+	&pci_dev_info_8086_3584,
+	&pci_dev_info_8086_3585,
+	&pci_dev_info_8086_3590,
+	&pci_dev_info_8086_3591,
+	&pci_dev_info_8086_3592,
+	&pci_dev_info_8086_3593,
+	&pci_dev_info_8086_3594,
+	&pci_dev_info_8086_3595,
+	&pci_dev_info_8086_3596,
+	&pci_dev_info_8086_3597,
+	&pci_dev_info_8086_3598,
+	&pci_dev_info_8086_3599,
+	&pci_dev_info_8086_359a,
+	&pci_dev_info_8086_359b,
+	&pci_dev_info_8086_359e,
 	&pci_dev_info_8086_5200,
 	&pci_dev_info_8086_5201,
 	&pci_dev_info_8086_530d,
@@ -74764,6 +79442,7 @@ static const pciDeviceInfo *pci_dev_list_8086[] = {
 	&pci_dev_info_8086_7010,
 	&pci_dev_info_8086_7020,
 	&pci_dev_info_8086_7030,
+	&pci_dev_info_8086_7050,
 	&pci_dev_info_8086_7100,
 	&pci_dev_info_8086_7110,
 	&pci_dev_info_8086_7111,
@@ -74809,6 +79488,8 @@ static const pciDeviceInfo *pci_dev_list_8086[] = {
 	&pci_dev_info_8086_84e4,
 	&pci_dev_info_8086_84e6,
 	&pci_dev_info_8086_84ea,
+	&pci_dev_info_8086_8500,
+	&pci_dev_info_8086_9000,
 	&pci_dev_info_8086_9621,
 	&pci_dev_info_8086_9622,
 	&pci_dev_info_8086_9641,
@@ -74836,6 +79517,7 @@ static const pciDeviceInfo *pci_dev_list_8e2e[] = {
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciDeviceInfo *pci_dev_list_9004[] = {
+	&pci_dev_info_9004_0078,
 	&pci_dev_info_9004_1078,
 	&pci_dev_info_9004_1160,
 	&pci_dev_info_9004_2178,
@@ -74853,6 +79535,7 @@ static const pciDeviceInfo *pci_dev_list_9004[] = {
 	&pci_dev_info_9004_5478,
 	&pci_dev_info_9004_5575,
 	&pci_dev_info_9004_5578,
+	&pci_dev_info_9004_5647,
 	&pci_dev_info_9004_5675,
 	&pci_dev_info_9004_5678,
 	&pci_dev_info_9004_5775,
@@ -74938,7 +79621,10 @@ static const pciDeviceInfo *pci_dev_list_9005[] = {
 	&pci_dev_info_9005_00c5,
 	&pci_dev_info_9005_00cf,
 	&pci_dev_info_9005_0250,
+	&pci_dev_info_9005_0283,
+	&pci_dev_info_9005_0284,
 	&pci_dev_info_9005_0285,
+	&pci_dev_info_9005_0286,
 	&pci_dev_info_9005_8000,
 	&pci_dev_info_9005_800f,
 	&pci_dev_info_9005_8010,
@@ -74946,6 +79632,11 @@ static const pciDeviceInfo *pci_dev_list_9005[] = {
 	&pci_dev_info_9005_8012,
 	&pci_dev_info_9005_8013,
 	&pci_dev_info_9005_8014,
+	&pci_dev_info_9005_8015,
+	&pci_dev_info_9005_8016,
+	&pci_dev_info_9005_8017,
+	&pci_dev_info_9005_801c,
+	&pci_dev_info_9005_801d,
 	&pci_dev_info_9005_801e,
 	&pci_dev_info_9005_801f,
 	&pci_dev_info_9005_8080,
@@ -74988,6 +79679,15 @@ static const pciDeviceInfo *pci_dev_list_9699[] = {
 static const pciDeviceInfo *pci_dev_list_9710[] = {
 	&pci_dev_info_9710_9815,
 	&pci_dev_info_9710_9835,
+	&pci_dev_info_9710_9845,
+	NULL
+};
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
+static const pciDeviceInfo *pci_dev_list_9902[] = {
+	&pci_dev_info_9902_0001,
+	&pci_dev_info_9902_0002,
+	&pci_dev_info_9902_0003,
 	NULL
 };
 #endif
@@ -75039,6 +79739,7 @@ static const pciDeviceInfo *pci_dev_list_e159[] = {
 };
 #endif
 #define pci_dev_list_e4bf NULL
+#define pci_dev_list_e55e NULL
 #define pci_dev_list_ea01 NULL
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciDeviceInfo *pci_dev_list_ea60[] = {
@@ -75107,8 +79808,10 @@ static const pciDeviceInfo *pci_dev_list_feda[] = {
 	NULL
 };
 #endif
+#define pci_dev_list_fede NULL
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const pciDeviceInfo *pci_dev_list_fffe[] = {
+	&pci_dev_info_fffe_0405,
 	&pci_dev_info_fffe_0710,
 	NULL
 };
@@ -75136,6 +79839,9 @@ static const pciVendorInfo pciVendorInfoList[] = {
 	{0x0100, pci_vendor_0100, pci_dev_list_0100},
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+	{0x021b, pci_vendor_021b, pci_dev_list_021b},
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 	{0x0675, pci_vendor_0675, pci_dev_list_0675},
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
@@ -79628,6 +84334,9 @@ static const pciVendorInfo pciVendorInfoList[] = {
 	{0x1681, pci_vendor_1681, pci_dev_list_1681},
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+	{0x168c, pci_vendor_168c, pci_dev_list_168c},
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 	{0x16ab, pci_vendor_16ab, pci_dev_list_16ab},
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
@@ -79637,12 +84346,21 @@ static const pciVendorInfo pciVendorInfoList[] = {
 	{0x16ca, pci_vendor_16ca, pci_dev_list_16ca},
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+	{0x16cd, pci_vendor_16cd, pci_dev_list_16cd},
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
+	{0x16df, pci_vendor_16df, pci_dev_list_16df},
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 	{0x16ec, pci_vendor_16ec, pci_dev_list_16ec},
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
 	{0x16f6, pci_vendor_16f6, pci_dev_list_16f6},
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+	{0x1702, pci_vendor_1702, pci_dev_list_1702},
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 	{0x1705, pci_vendor_1705, pci_dev_list_1705},
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
@@ -79664,9 +84382,18 @@ static const pciVendorInfo pciVendorInfoList[] = {
 	{0x1743, pci_vendor_1743, pci_dev_list_1743},
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+	{0x1749, pci_vendor_1749, pci_dev_list_1749},
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 	{0x174b, pci_vendor_174b, pci_dev_list_174b},
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+	{0x174d, pci_vendor_174d, pci_dev_list_174d},
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
+	{0x175c, pci_vendor_175c, pci_dev_list_175c},
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 	{0x175e, pci_vendor_175e, pci_dev_list_175e},
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
@@ -79682,21 +84409,42 @@ static const pciVendorInfo pciVendorInfoList[] = {
 	{0x17af, pci_vendor_17af, pci_dev_list_17af},
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+	{0x17c2, pci_vendor_17c2, pci_dev_list_17c2},
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 	{0x17cc, pci_vendor_17cc, pci_dev_list_17cc},
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+	{0x17d5, pci_vendor_17d5, pci_dev_list_17d5},
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 	{0x1813, pci_vendor_1813, pci_dev_list_1813},
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+	{0x1814, pci_vendor_1814, pci_dev_list_1814},
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
+	{0x1830, pci_vendor_1830, pci_dev_list_1830},
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 	{0x1851, pci_vendor_1851, pci_dev_list_1851},
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
 	{0x1852, pci_vendor_1852, pci_dev_list_1852},
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+	{0x1867, pci_vendor_1867, pci_dev_list_1867},
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 	{0x1888, pci_vendor_1888, pci_dev_list_1888},
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+	{0x1894, pci_vendor_1894, pci_dev_list_1894},
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
+	{0x18fb, pci_vendor_18fb, pci_dev_list_18fb},
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 	{0x1a08, pci_vendor_1a08, pci_dev_list_1a08},
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
@@ -79774,6 +84522,9 @@ static const pciVendorInfo pciVendorInfoList[] = {
 	{0x4143, pci_vendor_4143, pci_dev_list_4143},
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+	{0x4144, pci_vendor_4144, pci_dev_list_4144},
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 	{0x416c, pci_vendor_416c, pci_dev_list_416c},
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
@@ -79869,6 +84620,9 @@ static const pciVendorInfo pciVendorInfoList[] = {
 	{0x5700, pci_vendor_5700, pci_dev_list_5700},
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+	{0x5851, pci_vendor_5851, pci_dev_list_5851},
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 	{0x6356, pci_vendor_6356, pci_dev_list_6356},
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
@@ -79930,6 +84684,9 @@ static const pciVendorInfo pciVendorInfoList[] = {
 	{0x9710, pci_vendor_9710, pci_dev_list_9710},
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+	{0x9902, pci_vendor_9902, pci_dev_list_9902},
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 	{0xa0a0, pci_vendor_a0a0, pci_dev_list_a0a0},
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
@@ -80008,6 +84765,9 @@ static const pciVendorInfo pciVendorInfoList[] = {
 	{0xe4bf, pci_vendor_e4bf, pci_dev_list_e4bf},
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+	{0xe55e, pci_vendor_e55e, pci_dev_list_e55e},
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 	{0xea01, pci_vendor_ea01, pci_dev_list_ea01},
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
@@ -80039,6 +84799,9 @@ static const pciVendorInfo pciVendorInfoList[] = {
 	{0xfeda, pci_vendor_feda, pci_dev_list_feda},
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+	{0xfede, pci_vendor_fede, pci_dev_list_fede},
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 	{0xfffe, pci_vendor_fffe, pci_dev_list_fffe},
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
@@ -80069,6 +84832,9 @@ static const pciVendorSubsysInfo pciVendorSubsysInfoList[] = {
 	{0x0100, pci_vendor_0100, pci_ss_list_0100},
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+	{0x021b, pci_vendor_021b, pci_ss_list_021b},
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 	{0x0675, pci_vendor_0675, pci_ss_list_0675},
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
@@ -84561,6 +89327,9 @@ static const pciVendorSubsysInfo pciVendorSubsysInfoList[] = {
 	{0x1681, pci_vendor_1681, pci_ss_list_1681},
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+	{0x168c, pci_vendor_168c, pci_ss_list_168c},
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 	{0x16ab, pci_vendor_16ab, pci_ss_list_16ab},
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
@@ -84570,12 +89339,21 @@ static const pciVendorSubsysInfo pciVendorSubsysInfoList[] = {
 	{0x16ca, pci_vendor_16ca, pci_ss_list_16ca},
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+	{0x16cd, pci_vendor_16cd, pci_ss_list_16cd},
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
+	{0x16df, pci_vendor_16df, pci_ss_list_16df},
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 	{0x16ec, pci_vendor_16ec, pci_ss_list_16ec},
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
 	{0x16f6, pci_vendor_16f6, pci_ss_list_16f6},
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+	{0x1702, pci_vendor_1702, pci_ss_list_1702},
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 	{0x1705, pci_vendor_1705, pci_ss_list_1705},
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
@@ -84597,9 +89375,18 @@ static const pciVendorSubsysInfo pciVendorSubsysInfoList[] = {
 	{0x1743, pci_vendor_1743, pci_ss_list_1743},
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+	{0x1749, pci_vendor_1749, pci_ss_list_1749},
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 	{0x174b, pci_vendor_174b, pci_ss_list_174b},
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+	{0x174d, pci_vendor_174d, pci_ss_list_174d},
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
+	{0x175c, pci_vendor_175c, pci_ss_list_175c},
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 	{0x175e, pci_vendor_175e, pci_ss_list_175e},
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
@@ -84615,21 +89402,42 @@ static const pciVendorSubsysInfo pciVendorSubsysInfoList[] = {
 	{0x17af, pci_vendor_17af, pci_ss_list_17af},
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+	{0x17c2, pci_vendor_17c2, pci_ss_list_17c2},
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 	{0x17cc, pci_vendor_17cc, pci_ss_list_17cc},
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+	{0x17d5, pci_vendor_17d5, pci_ss_list_17d5},
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 	{0x1813, pci_vendor_1813, pci_ss_list_1813},
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+	{0x1814, pci_vendor_1814, pci_ss_list_1814},
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
+	{0x1830, pci_vendor_1830, pci_ss_list_1830},
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 	{0x1851, pci_vendor_1851, pci_ss_list_1851},
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
 	{0x1852, pci_vendor_1852, pci_ss_list_1852},
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+	{0x1867, pci_vendor_1867, pci_ss_list_1867},
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 	{0x1888, pci_vendor_1888, pci_ss_list_1888},
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+	{0x1894, pci_vendor_1894, pci_ss_list_1894},
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
+	{0x18fb, pci_vendor_18fb, pci_ss_list_18fb},
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 	{0x1a08, pci_vendor_1a08, pci_ss_list_1a08},
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
@@ -84707,6 +89515,9 @@ static const pciVendorSubsysInfo pciVendorSubsysInfoList[] = {
 	{0x4143, pci_vendor_4143, pci_ss_list_4143},
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+	{0x4144, pci_vendor_4144, pci_ss_list_4144},
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 	{0x416c, pci_vendor_416c, pci_ss_list_416c},
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
@@ -84802,6 +89613,9 @@ static const pciVendorSubsysInfo pciVendorSubsysInfoList[] = {
 	{0x5700, pci_vendor_5700, pci_ss_list_5700},
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+	{0x5851, pci_vendor_5851, pci_ss_list_5851},
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 	{0x6356, pci_vendor_6356, pci_ss_list_6356},
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
@@ -84863,6 +89677,9 @@ static const pciVendorSubsysInfo pciVendorSubsysInfoList[] = {
 	{0x9710, pci_vendor_9710, pci_ss_list_9710},
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+	{0x9902, pci_vendor_9902, pci_ss_list_9902},
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 	{0xa0a0, pci_vendor_a0a0, pci_ss_list_a0a0},
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
@@ -84941,6 +89758,9 @@ static const pciVendorSubsysInfo pciVendorSubsysInfoList[] = {
 	{0xe4bf, pci_vendor_e4bf, pci_ss_list_e4bf},
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+	{0xe55e, pci_vendor_e55e, pci_ss_list_e55e},
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 	{0xea01, pci_vendor_ea01, pci_ss_list_ea01},
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
@@ -84972,6 +89792,9 @@ static const pciVendorSubsysInfo pciVendorSubsysInfoList[] = {
 	{0xfeda, pci_vendor_feda, pci_ss_list_feda},
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+	{0xfede, pci_vendor_fede, pci_ss_list_fede},
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 	{0xfffe, pci_vendor_fffe, pci_ss_list_fffe},
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
diff --git a/hw/xfree86/scanpci/xf86ScanPci.c b/hw/xfree86/scanpci/xf86ScanPci.c
index 534c8973f..8231ea05a 100644
--- a/hw/xfree86/scanpci/xf86ScanPci.c
+++ b/hw/xfree86/scanpci/xf86ScanPci.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/scanpci/xf86ScanPci.c,v 1.14 2003/09/23 05:21:46 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/scanpci/xf86ScanPci.c,v 1.13 2003/08/24 17:37:10 dawes Exp $ */
 /*
  * Display the Subsystem Vendor Id and Subsystem Id in order to identify
  * the cards installed in this computer
@@ -96,7 +96,7 @@ static XF86ModuleVersionInfo pciDataVersRec = {
 	MODULEVENDORSTRING,
 	MODINFOSTRING1,
 	MODINFOSTRING2,
-	XF86_VERSION_CURRENT,
+	XORG_VERSION_CURRENT,
 	1, 0, 0,
 	ABI_CLASS_VIDEODRV,
 	ABI_VIDEODRV_VERSION,
@@ -113,7 +113,7 @@ static XF86ModuleVersionInfo scanPciVersRec = {
 	MODULEVENDORSTRING,
 	MODINFOSTRING1,
 	MODINFOSTRING2,
-	XF86_VERSION_CURRENT,
+	XORG_VERSION_CURRENT,
 	1, 0, 0,
 	ABI_CLASS_VIDEODRV,
 	ABI_VIDEODRV_VERSION,
diff --git a/hw/xfree86/shadowfb/sfbmodule.c b/hw/xfree86/shadowfb/sfbmodule.c
index 3bb14b0a9..6793c8f95 100644
--- a/hw/xfree86/shadowfb/sfbmodule.c
+++ b/hw/xfree86/shadowfb/sfbmodule.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/shadowfb/sfbmodule.c,v 1.2 1999/02/01 12:08:45 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/shadowfb/sfbmodule.c,v 1.1 1999/01/31 12:38:06 dawes Exp $ */
 
 
 #ifdef XFree86LOADER
@@ -11,7 +11,7 @@ static XF86ModuleVersionInfo VersRec =
         MODULEVENDORSTRING,
         MODINFOSTRING1,
         MODINFOSTRING2,
-        XF86_VERSION_CURRENT,
+        XORG_VERSION_CURRENT,
         1, 0, 0,
         ABI_CLASS_ANSIC,                /* Only need the ansic layer */
         ABI_ANSIC_VERSION,
diff --git a/hw/xfree86/shadowfb/shadow.c b/hw/xfree86/shadowfb/shadow.c
index 093f35b30..fe69c6210 100644
--- a/hw/xfree86/shadowfb/shadow.c
+++ b/hw/xfree86/shadowfb/shadow.c
@@ -6,7 +6,7 @@
    Pre-fb-write callbacks and RENDER support - Nolan Leake (nolan@vmware.com)
 */
 
-/* $XFree86: xc/programs/Xserver/hw/xfree86/shadowfb/shadow.c,v 1.21 2003/11/10 18:22:38 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/shadowfb/shadow.c,v 1.20tsi Exp $ */
 
 #include "X.h"
 #include "Xproto.h"
diff --git a/hw/xfree86/shadowfb/shadowfb.h b/hw/xfree86/shadowfb/shadowfb.h
index d028980bd..e42822600 100644
--- a/hw/xfree86/shadowfb/shadowfb.h
+++ b/hw/xfree86/shadowfb/shadowfb.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/shadowfb/shadowfb.h,v 1.4 2003/02/18 19:10:35 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/shadowfb/shadowfb.h,v 1.3 2002/10/16 22:12:54 alanh Exp $ */
 
 #ifndef _SHADOWFB_H
 #define _SHADOWFB_H
diff --git a/hw/xfree86/utils/gtf/gtf.c b/hw/xfree86/utils/gtf/gtf.c
index b0d9de058..28495013f 100644
--- a/hw/xfree86/utils/gtf/gtf.c
+++ b/hw/xfree86/utils/gtf/gtf.c
@@ -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.3 2002/12/21 02:35:20 dawes 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 __mode
 typedef struct __options
 {
     int x, y;
-    int xf86mode, fbmode;
+    int xorgmode, fbmode;
     float v_freq;
 } options;
 
@@ -180,7 +181,7 @@ void print_value(int n, char *name, float val)
 
 
 
-/* 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 @@ void print_fb_mode (mode *m)
  * 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 @@ options *parse_command_line (int argc, char *argv[])
                    (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 @@ options *parse_command_line (int argc, char *argv[])
         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 @@ options *parse_command_line (int argc, char *argv[])
 
     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 @@ options *parse_command_line (int argc, char *argv[])
              "(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 @@ int main (int argc, char *argv[])
     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)
diff --git a/hw/xfree86/utils/gtf/gtf.man.pre b/hw/xfree86/utils/gtf/gtf.man.pre
index f2d2ae9ec..fd0c406d3 100644
--- a/hw/xfree86/utils/gtf/gtf.man.pre
+++ b/hw/xfree86/utils/gtf/gtf.man.pre
@@ -1,4 +1,4 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/etc/gtf.man,v 1.1 2002/11/12 01:31:23 dawes Exp $ 
+.\" $XFree86$
 .TH GTF 1 __vendorversion__
 .SH NAME
 gtf - calculate VESA GTF mode lines
@@ -9,14 +9,14 @@ gtf - calculate VESA GTF mode lines
 .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 +27,15 @@ utility.
 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
diff --git a/hw/xfree86/utils/ioport/ioport.c b/hw/xfree86/utils/ioport/ioport.c
index b977936d3..bd42f637f 100644
--- a/hw/xfree86/utils/ioport/ioport.c
+++ b/hw/xfree86/utils/ioport/ioport.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/etc/ioport.c,v 1.5 2004/01/05 16:42:10 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/etc/ioport.c,v 1.4 2003/01/01 19:16:41 tsi Exp $ */
 /*
  * Copyright 2002 through 2004 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org
  *
diff --git a/hw/xfree86/utils/kbd_mode/bsd-kbd_mode.c b/hw/xfree86/utils/kbd_mode/bsd-kbd_mode.c
index f7d07eb79..3c3c535ac 100644
--- a/hw/xfree86/utils/kbd_mode/bsd-kbd_mode.c
+++ b/hw/xfree86/utils/kbd_mode/bsd-kbd_mode.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/etc/kbd_mode.c,v 3.6 1998/07/26 09:56:17 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/etc/kbd_mode.c,v 3.5 1996/12/23 06:47:13 dawes Exp $ */
 
 
 /* Keyboard mode control program for 386BSD */
diff --git a/hw/xfree86/utils/kbd_mode/bsd-kbd_mode.man.pre b/hw/xfree86/utils/kbd_mode/bsd-kbd_mode.man.pre
index 677663d7e..3f7842cfd 100644
--- a/hw/xfree86/utils/kbd_mode/bsd-kbd_mode.man.pre
+++ b/hw/xfree86/utils/kbd_mode/bsd-kbd_mode.man.pre
@@ -1,4 +1,4 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/etc/kbd_mode.man,v 3.5 2001/01/27 18:20:56 dawes Exp $
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/etc/kbd_mode.man,v 3.4 1998/04/05 02:28:42 dawes Exp $
 .TH KBD_MODE 1 __vendorversion__
 .SH NAME
 kbd_mode \- recover the PC console keyboard
diff --git a/hw/xfree86/utils/kbd_mode/sun-kbd_mode.c b/hw/xfree86/utils/kbd_mode/sun-kbd_mode.c
index e70fb2db7..1b5c08563 100644
--- a/hw/xfree86/utils/kbd_mode/sun-kbd_mode.c
+++ b/hw/xfree86/utils/kbd_mode/sun-kbd_mode.c
@@ -27,7 +27,7 @@ OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
 THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/programs/Xserver/hw/sun/kbd_mode.c,v 3.12 2003/10/07 21:39:43 herrb Exp $ */
+/* $XFree86: kbd_mode.c,v 3.11 2002/10/23 16:23:36 tsi Exp $ */
 
 /*
 static  char sccsid[] = "@(#)kbd_mode.c 7.1 87/04/13";
diff --git a/hw/xfree86/utils/kbd_mode/sun-kbd_mode.man.pre b/hw/xfree86/utils/kbd_mode/sun-kbd_mode.man.pre
index 528ed12f0..367b4fc9a 100644
--- a/hw/xfree86/utils/kbd_mode/sun-kbd_mode.man.pre
+++ b/hw/xfree86/utils/kbd_mode/sun-kbd_mode.man.pre
@@ -24,7 +24,7 @@
 .\" other dealings in this Software without prior written authorization
 .\" from The Open Group.
 .\"
-.\" $XFree86: xc/programs/Xserver/hw/sun/kbd_mode.man,v 1.7 2001/12/14 19:59:42 dawes Exp $
+.\" $XFree86: xc/programs/Xserver/hw/sun/kbd_mode.man,v 1.6 2001/01/27 18:20:41 dawes Exp $
 .\"
 .TH KBD_MODE 1 __xorgversion__
 .SH NAME
diff --git a/hw/xfree86/utils/pcitweak/pcitweak.man.pre b/hw/xfree86/utils/pcitweak/pcitweak.man.pre
index 14cfa885f..3549d9740 100644
--- a/hw/xfree86/utils/pcitweak/pcitweak.man.pre
+++ b/hw/xfree86/utils/pcitweak/pcitweak.man.pre
@@ -1,4 +1,4 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/etc/pcitweak.man,v 3.4 2003/05/29 21:48:09 herrb Exp $ 
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/etc/pcitweak.man,v 3.3 2001/01/27 18:20:56 dawes Exp $ 
 .TH PCITWEAK 1 __vendorversion__
 .SH NAME
 pcitweak - read/write PCI config space
diff --git a/hw/xfree86/utils/scanpci/scanpci.c b/hw/xfree86/utils/scanpci/scanpci.c
index 670f2b442..5746269f5 100644
--- a/hw/xfree86/utils/scanpci/scanpci.c
+++ b/hw/xfree86/utils/scanpci/scanpci.c
@@ -23,14 +23,14 @@
  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/etc/scanpci.c,v 3.93 2004/03/05 16:03:04 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/etc/scanpci.c,v 3.91tsi Exp $ */
 
 #include "X.h"
 #include "os.h"
 #include "xf86.h"
 #include "xf86Priv.h"
 #include "xf86_OSproc.h"
-#include "Pci.h"
+#include "xf86Pci.h"
 #include "xf86PciInfo.h"
 #include "xf86ScanPci.h"
 #include "dummylib.h"
@@ -148,7 +148,7 @@ usage(void)
 int
 main(int argc, char *argv[])
 {
-    pciConfigPtr pPCI, *pcrpp = NULL;
+    pciConfigPtr *pcrpp = NULL;
     int Verbose = 0;
     int i = 0;
     int force = 0;
@@ -159,7 +159,7 @@ main(int argc, char *argv[])
     while ((c = getopt(argc, argv, "?v12OfV:")) != -1)
 	switch(c) {
 	case 'v':
-	    Verbose++;
+	    Verbose = 1;
 	    break;
 	case '1':
 	    xf86Info.pciFlags = PCIProbe1;
@@ -204,25 +204,8 @@ main(int argc, char *argv[])
 	exit (1);
     }
 
-    while ((pPCI = pcrpp[i++]))
-	identify_card(pPCI, Verbose);
-
-    if (Verbose > 1) {
-	printf("\nPCI bus linkages:\n\n");
-
-	for (i = 0;  i < MAX_PCI_BUSES;  i++) {
-	    pciBusInfo_t *pBusInfo;
-
-	    if (!(pBusInfo = pciBusInfo[i]))
-		continue;
-
-	    if ((pPCI = pBusInfo->bridge))
-		printf("PCI bus 0x%04x has parent bridge 0x%04x:0x%02x:0x%1x\n",
-		       i, pPCI->busnum, pPCI->devnum, pPCI->funcnum);
-	    else
-		printf("PCI bus 0x%04x has no parent\n", i);
-	}
-    }
+    while (pcrpp[i])
+	identify_card(pcrpp[i++],Verbose);
 
     xf86DisableIO();
     exit(0);
diff --git a/hw/xfree86/utils/scanpci/scanpci.man.pre b/hw/xfree86/utils/scanpci/scanpci.man.pre
index baf231603..2c9bcc964 100644
--- a/hw/xfree86/utils/scanpci/scanpci.man.pre
+++ b/hw/xfree86/utils/scanpci/scanpci.man.pre
@@ -1,4 +1,4 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/etc/scanpci.man,v 3.3 2001/01/27 18:20:56 dawes Exp $ 
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/etc/scanpci.man,v 3.2 2000/12/11 20:18:45 dawes Exp $ 
 .TH SCANPCI 1 __vendorversion__
 .SH NAME
 scanpci - scan/probe PCI buses
diff --git a/hw/xfree86/utils/xorgcfg/TODO b/hw/xfree86/utils/xorgcfg/TODO
index 75fe91b95..d8d1cd5ee 100644
--- a/hw/xfree86/utils/xorgcfg/TODO
+++ b/hw/xfree86/utils/xorgcfg/TODO
@@ -1,11 +1,11 @@
-$XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/TODO,v 1.1 2001/07/04 16:09:14 paulo Exp $
+$XFree86$
 
 o Have code to fetch the SymTabRec chipset list from a video driver.
   This is mostly useful for the testing tool/interface, so that the
   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 @@ o Rewrite mouse driver to use the same code as video drivers, so that
   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 a "wizard" mode, as several users find the graphical interface
 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.
diff --git a/hw/xfree86/utils/xorgcfg/XOrgCfg.pre b/hw/xfree86/utils/xorgcfg/XOrgCfg.pre
new file mode 100644
index 000000000..580998cb3
--- /dev/null
+++ b/hw/xfree86/utils/xorgcfg/XOrgCfg.pre
@@ -0,0 +1,1851 @@
+!!
+!! 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@conectiva.com.br>
+!!
+!! $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/XF86Cfg.ad,v 1.13 2001/05/15 18:22:23 paulo Exp $
+!!
+
+*Form.background:			gray85
+*Label.background:			gray85
+!! keyboard
+*Core.background:			gray85
+*Label.foreground:			gray20
+*Command.background:			gray80
+*Command.foreground:			gray20
+*Command.borderWidth:			0
+*Command.displayList:\
+foreground	gray60;\
+lines		1,-1,-1,-1,-1,1;\
+foreground	gray90;\
+lines		-1,0,0,0,0,-1
+
+*Text.?.foreground:			gray20
+*Text.borderWidth:			0
+*Text.background:			gray96
+*Text.?.cursorColor:			rgb:d/5/5
+*Text.displayList:\
+foreground	white;\
+lines		1,-1,-1,-1,-1,1;\
+foreground	gray40;\
+lines		-1,0,0,0,0,-1
+
+*baseTranslations: #override \
+<Key>Escape:	vidmode-restore()
+
+*List.background:			gray96
+*List.foreground:			gray20
+*Viewport.borderColor:			gray40
+*List.borderColor:			gray40
+
+*MenuButton.background:			gray80
+*MenuButton.foreground:			gray20
+*MenuButton.borderWidth:		0
+*MenuButton.displayList:\
+line-style	solid;\
+foreground	gray40;\
+lines		1,-1,-1,-1,-1,1;\
+foreground	gray90;\
+lines		-1,0,0,0,0,-1;\
+line-style	onoffdash;\
+foreground	gray80;\
+draw-rect	1,1,-2,-2
+
+*SimpleMenu.background:			gray80
+*SimpleMenu.?.foreground:		gray20
+*SimpleMenu.borderWidth:		0
+*SimpleMenu.displayList:\
+foreground	gray40;\
+lines		1,-1,-1,-1,-1,1;\
+foreground	gray90;\
+lines		-1,0,0,0,0,-1
+
+*Dialog.displayList:\
+foreground	gray40;\
+lines		1,-1,-1,-1,-1,1;\
+foreground	gray90;\
+lines		-1,0,0,0,0,-1
+
+*Toggle.background:			gray80
+*Toggle.foreground:			gray20
+*Toggle.borderWidth:			0
+*Toggle.displayList:\
+foreground	gray90;\
+lines		1,-1,-1,-1,-1,1;\
+foreground	gray40;\
+lines		-1,0,0,0,0,-1
+
+*mouse.bitmap:				mouse.xbm
+*keyboard.bitmap:			keyboard.xbm
+*card.bitmap:				card.xbm
+*monitor.bitmap:			monitor.xbm
+
+*Label.borderWidth:			0
+*Viewport.forceBars:			True
+*Viewport.allowVert:			True
+*Viewport.useRight:			True
+
+.xf86cfg.geometry:			320x400
+.xf86cfg.minWidth:			320
+.xf86cfg.minHeight:			400
+.xf86cfg.maxWidth:			320
+.xf86cfg.maxHeight:			400
+
+.xf86cfg.config.geometry:		320x369
+.xf86cfg.config.minWidth:		320
+.xf86cfg.config.maxWidth:		320
+.xf86cfg.config.minHeight:		369
+.xf86cfg.config.maxHeight:		369
+
+*work.width:				320
+*work.height:				240
+
+*error.label.label:\
+Not all required fields\n\
+were filled, or the specified\n\
+identifier is duplicated.
+*error.label.vertDistance:		30
+*error.label.borderWidth:		0
+*error.label.leftBitmap:		Excl
+*error.command.fromVert:		label
+*error.command.label:			Ok
+*error.command.vertDistance:		20
+
+*Scrollbar.translations:\
+<BtnDown>:	StartScroll(Continuous) MoveThumb() NotifyThumb()\n\
+<BtnMotion>:	MoveThumb() NotifyThumb()\n\
+<BtnUp>:	NotifyScroll(Proportional) EndScroll()
+
+*Scrollbar.background:		gray80
+*Scrollbar.foreground:		rgb:a/5/5
+*Scrollbar.borderWidth:		0
+*Scrollbar.thumb:		vlines2
+*Scrollbar.displayList:\
+foreground	gray90;\
+lines		1,-1,-1,-1,-1,1;\
+foreground	gray40;\
+lines		-1,0,0,0,0,-1
+
+*Text.Translations: #override \
+<Enter>:	no-op()\n\
+<Leave>:	no-op()\n\
+<Btn1Down>:	set-keyboard-focus() select-start()
+
+*top.identifier.Translations: #override \
+<Enter>:	no-op()\n\
+<Leave>:	no-op()\n\
+<Key>Return:	no-op()\n\
+<Btn1Down>:	set-keyboard-focus() select-start()
+
+*List.showCurrent:		True
+*Tip.timeout:			100
+*Tip.background:		rgb:f/f/8
+*Tip.foreground:		gray20
+*Tip.borderWidth:		0
+*Tip.displayList:\
+foreground	rgb:8/8/4;\
+lines		1,-1,-1,-1,-1,1;\
+foreground	rgb:f/f/c;\
+lines		-1,0,0,0,0,-1
+
+*Toggle.internalHeight:		2
+*Toggle.internalWidth:		2
+*mouse.label:			Mouse
+*keyboard.label:		Keyboard
+*card.label:			Card
+*monitor.label:			Monitor
+
+*commands.borderWidth:		0
+*commands.defaultDistance:	2
+*commands.?.bottom:		chainTop
+*commands.height:		50
+
+*commands.keyboard.fromHoriz:	mouse
+*card.fromHoriz:		keyboard
+*monitor.fromHoriz:		card
+
+*commands.mouse*new.label:	Add new mouse
+*commands.keyboard*new.label:	Add new keyboard
+*commands.card*new.label:	Add new video card
+*commands.monitor*new.label:	Add new monitor
+*commands.mouse*configure.label:	Configure mouse(s)
+*commands.keyboard*configure.label:	Configure keyboard(s)
+*commands.card*configure.label:		Configure video card(s)
+*commands.monitor*configure.label:	Configure monitor(s)
+*commands.mouse*SimpleMenu*newMouse.label:	New mouse
+*commands.keyboard*SimpleMenu*newKeyboard.label:New keyboard
+*commands.card*SimpleMenu*newcard.label:	New card
+*commands.monitor*SimpleMenu*newMonitor.label:	New monitor
+
+*commands.MenuButton.translations: \
+<Enter>:	highlight()\n\
+<Leave>:	reset()\n\
+Any<BtnDown>:	highlight() set() PopupMenu()
+
+*hpane.showGrip:		False
+*hpane.expert.label:		Expert Mode
+*topM.min:			200
+*topM.max:			200
+*topM.justify:			left
+*topM.label:			Configure Layout
+*topM*layout.label:		Configure Layout
+*topM*screen.label:		Configure Screen
+*topM*modeline.label:		Configure Modeline
+*topM*accessx.label:		Configure AccessX
+*topM.showGrip:			False
+*work.showGrip:			False
+
+*MenuButton.leftBitmap:		menu10
+*SmeBSB.HorizontalMargins:	18
+
+*back.label:			<< Back
+*next.label:			Next >>
+*ok.label:			Ok
+*cancel.label:			Cancel
+*yes.label:			Yes
+*no.label:			No
+
+*help.label:			Help
+*quit.label:			Quit
+*next.fromHoriz:		back
+*config*ok.fromHoriz:		next
+*bottom*cancel.fromHoriz:	ok
+*top.displayList:\
+foreground	gray60;\
+lines		1,-1,-1,-1,-1,1;\
+foreground	white;\
+lines		-1,0,0,0,0,-1
+*bottom.displayList:\
+foreground	gray60;\
+lines		1,-1,-1,-1,-1,1;\
+foreground	white;\
+lines		-1,0,0,0,0,-1
+*work.displayList:\
+foreground	gray60;\
+lines		1,-1,-1,-1,-1,1;\
+foreground	white;\
+lines		-1,0,0,0,0,-1
+*options.pane.Form.displayList:\
+foreground	gray60;\
+lines		1,-1,-1,-1,-1,1;\
+foreground	white;\
+lines		-1,0,0,0,0,-1
+
+*top.label.label:		Identifier:
+*top.label.borderWidth:		0
+*top.identifier.fromHoriz:	label
+*top.label.internalHeight:	3
+*top.label.justify:		left
+*top.label.left:		chainLeft
+*top.label.right:		chainLeft
+*top.identifier.left:		chainLeft
+*top.identifier.right:		chainRight
+
+*bottom.layout.translations:	#override \
+<Key>Return:	rename-layout()
+*bottom.layout.label:		New server layout
+*bottom.layout.tip:		Type a text and press Return to rename this layout
+*bottom.Command.height:		19
+*bottom.Text.height:		19
+*bottom.MenuButton.height:	19
+*bottom*new.label:		New server layout
+*layout.fromHoriz:		select
+*help.fromHoriz:		layout
+*bottom.layout.justify:		left
+*bottom.select.label:		Layout
+*bottom.select.left:		chainLeft
+*bottom.select.right:		chainLeft
+*bottom.layout.left:		chainLeft
+*quit.fromHoriz:		help
+*bottom.?.left:			chainRight
+*bottom.?.right:		chainRight
+*bottom.?.top:			chainBottom
+*bottom.?.bottom:		chainBottom
+
+*pane.bottom.min:		30
+*pane.bottom.max:		30
+*pane.bottom.showGrip:		False
+*pane.bottom.defaultDistance:	5
+
+!! Wellcome message
+*work.wellcome.borderWidth:	0
+*work.wellcome.label:		Welcome to __VENDORNAME__ 4.0 setup program
+*work.?.borderWidth:		0
+!*work.?.width:			310
+*work.?.height:			290
+
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! mouseDP widget
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+*mouseDP*Label.internalHeight:		0
+*mouseDP*Label.borderWidth:		0
+*mouseDP.labelD.vertDistance:		0
+*mouseDP.labelD.label:			Select mouse device
+*mouseDP.device.fromVert:		labelD
+*mouseDP.viewportD.fromVert:		device
+*mouseDP.device.width:			302
+*mouseDP.viewportD.vertDistance:	2
+*mouseDP.viewportD.listD.longest:	135
+*mouseDP.viewportD.width:		302
+*mouseDP.viewportD.height:		87
+*mouseDP.labelP.label:			Select mouse protocol
+*mouseDP.labelP.vertDistance:		10
+*mouseDP.labelP.fromVert:		viewportD
+*mouseDP.viewportP.fromVert:		labelP
+*mouseDP.viewportP.forceBars:		True
+*mouseDP.viewportP.allowVert:		True
+*mouseDP.viewportP.useRight:		True
+*mouseDP.viewportP.listP.longest:	135
+*mouseDP.viewportP.width:		302
+*mouseDP.viewportP.height:		110
+*mouseDP.viewportP.vertDistance:	6
+*mouseDP*List.verticalList:		True
+*mouseDP.emulate3.fromVert:		viewportP
+*mouseDP.emulate3.width:		180
+*mouseDP.apply.label:			Apply changes
+*mouseDP.apply.fromVert:		viewportP
+*mouseDP.apply.fromHoriz:		emulate3
+*mouseDP.apply.width:			116
+*mouseDP.emulate3.vertDistance:		10
+*mouseDP.apply.vertDistance:		10
+*mouseDP.emulate3.label:		Emulate 3 buttons
+*mouseDP.emulate3.tip:			Select if your mouse has only two buttons
+
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! keyboardML widget
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+*keyboardML.Label.vertDistance:		8
+*keyboardML.MenuButton.vertDistance:	8
+*keyboardML.keyboard.vertDistance:	10
+*keyboardML.Label.borderWidth:		0
+*keyboardML.Label.width:		115
+*keyboardML.MenuButton.width:		185
+*keyboardML.MenuButton.justify:		left
+*keyboardML.Label.internalWidth:	0
+*keyboardML.Label.justify:		right
+*keyboardML.labelR.label:		Xkb rules:
+*keyboardML.rules.left:			chainRight
+*keyboardML.rules.right:		chainRight
+*keyboardML.rules.fromHoriz:		labelR
+*keyboardML.model.fromVert:		rules
+*keyboardML.labelM.fromVert:		rules
+*keyboardML.model.left:			chainRight
+*keyboardML.model.right:		chainRight
+*keyboardML.model.fromHoriz:		labelM
+*keyboardML.labelM.label:		Keyboard model:
+*keyboardML.layout.left:		chainRight
+*keyboardML.layout.right:		chainRight
+*keyboardML.layout.fromVert:		model
+*keyboardML.labelL.fromVert:		model
+*keyboardML.layout.fromHoriz:		labelL
+*keyboardML.labelL.label:		Keyboard layout:
+*keyboardML.variant.fromVert:		labelL
+*keyboardML.variant.fromHoriz:		labelV
+*keyboardML.labelV.fromVert:		labelL
+*keyboardML.labelV.label:		Xkb variant:
+*keyboardML.options.fromVert:		labelV
+*keyboardML.options.fromHoriz:		labelO
+*keyboardML.labelO.fromVert:		labelV
+*keyboardML.labelO.label:		Xkb options:
+*keyboardML.keyboard.fromVert:		labelO
+*keyboardML.keyboard.borderWidth:	0
+*keyboardML.keyboard.width:		305
+*keyboardML.keyboard.height:		121
+*keyboardML.apply.vertDistance:		16
+*keyboardML.apply.fromVert:		keyboard
+*keyboardML.apply.label:		Apply changes
+
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! cardModel widget
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+*cardModel.label.internalHeight:	0
+*cardModel.keyboard.borderWidth:	0
+*cardModel.label.label:			Card model filter
+*cardModel.label.internalHeight:	2
+*cardModel.label.borderWidth:		0
+*cardModel.viewport.vertDistance:	2
+*cardModel.viewport.fromVert:		filter
+*cardModel.filter.fromHoriz:		label
+*cardModel.filter.width:		171
+*cardModel.viewport.width:		302
+*cardModel.viewport.height:		212
+*cardModel.driver.justify:		left
+*cardModel.driverL.label:		Driver
+*cardModel.driverL.fromVert:		viewport
+*cardModel.driverL.width:		50
+*cardModel.driverL.justify:		right
+*cardModel.driver.fromVert:		viewport
+*cardModel.driver.fromHoriz:		driverL
+*cardModel.driver.width:		250
+*cardModel.driver.left:			chainRight
+*cardModel.driver.right:		chainRight
+*cardModel.busidL.label:		BusID
+*cardModel.busidL.fromVert:		driver
+*cardModel.busidL.width:		50
+*cardModel.busidL.justify:		right
+*cardModel.busid.fromVert:		driver
+*cardModel.busid.fromHoriz:		busidL
+*cardModel.busid.width:			250
+*cardModel.busid.left:			chainRight
+*cardModel.busid.right:			chainRight
+*cardModel.viewport.forceBars:		True
+*cardModel.viewport.allowVert:		True
+*cardModel.viewport.useRight:		True
+*cardModel.viewport.list.longest:	277
+*cardModel.filter.tip:			Type name or vendor of your card and press enter
+*cardModel.filter.translations:	#override \
+<Key>Return:	filter-card()
+
+
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! main widget
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+*work.cpu.backgroundPixmap:		computer.xpm
+*work.mouse.backgroundPixmap:		mouse.xpm
+*work.keyboard.backgroundPixmap:	keyboard.xpm
+*work.card.backgroundPixmap:		card.xpm
+*work.monitor.backgroundPixmap:		monitor.xpm
+
+*work.cpu.x:				130
+*work.cpu.y:				160
+*work.cpu.width:			30
+*work.cpu.height:			50
+*work.mouse.width:			26
+*work.mouse.height:			35
+*work.keyboard.width:			60
+*work.keyboard.height:			28
+*work.card.width:			41
+*work.card.height:			40
+*work.monitor.width:			47
+*work.monitor.height:			40
+
+.xf86cfg.pane.work.Simple.borderWidth:	1
+.xf86cfg.pane.work.Simple.translations:\
+Any<Btn1Down>:	select-device()\n\
+Any<Btn1Motion>:	move-device()\n\
+Any<Btn1Up>:	unselect-device()\n\
+Any<Btn3Down>:	device-popup()\n\
+Any<Btn3Up>:	device-popdown()
+
+.xf86cfg.pane.work.screen.translations:\
+Any<Btn1Down>:	select-device()\n\
+Any<Btn1Motion>:	move-device()\n\
+Any<Btn1Up>:	unselect-device()\n\
+Any<Btn3Down>:	device-popup()\n\
+Any<Btn3Up>:	device-popdown()
+
+XF86Cfg.translations:	#override \
+<Message>WM_PROTOCOLS:	quit()
+.xf86cfg.config.translations:	#override \
+<Message>WM_PROTOCOLS:	config-cancel()
+.xf86cfg.options.translations:	#override \
+<Message>WM_PROTOCOLS:	options-cancel()
+.xf86cfg.quit.translations:	#override \
+<Message>WM_PROTOCOLS:	quit-cancel()
+.xf86cfg.error.translations:	#override \
+<Message>WM_PROTOCOLS:	error-cancel()
+.xf86cfg.force.translations:	#override \
+<Message>WM_PROTOCOLS:	addmode-cancel()
+.xf86cfg.addMode.translations:	#override \
+<Message>WM_PROTOCOLS:	addmode-cancel()
+.xf86cfg.accessx.translations:	#override \
+<Message>WM_PROTOCOLS:	accessx-close()
+.xf86cfg.test.translations:	#override \
+<Message>WM_PROTOCOLS:	testmode-cancel()
+.xf86cfg.Expert.translations:	#override \
+<Message>WM_PROTOCOLS:	expert-close()
+.xf86cfg.options.moduleOptions.translations:	#override \
+<Message>WM_PROTOCOLS:	module-options-close()
+
+
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! Options
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+.xf86cfg.options.geometry:		400x176
+.xf86cfg.options.minWidth:		400
+.xf86cfg.options.maxWidth:		400
+.xf86cfg.options.minHeight:		176
+.xf86cfg.options.maxHeight:		176
+
+*options*commands.remove.fromHoriz:	add
+*options*commands.update.fromHoriz:	remove
+*options*commands.help.fromHoriz:	update
+*options*commands.min:			30
+*options*commands.max:			30
+*options*commands.showGrip:		False
+*options*commands.defaultDistance:	4
+*options*commands.?.width:		100
+*options*commands.?.height:		20
+
+*options*name.fromHoriz:		label1
+*options*label2.fromHoriz:		name
+*options*value.fromHoriz:		label2
+*options*label3.fromHoriz:		value
+*options*viewport.fromVert:		name
+*options*Label.borderWidth:		0
+*options.pane.form.Label.internalWidth:	0
+*options.pane.form.Label.height:	21
+*options.pane.form.Text.height:		19
+*options.pane.form.Label.top:		chainTop
+*options.pane.form.Text.top:		chainTop
+*options.pane.form.Label.bottom:	chainTop
+*options.pane.form.Text.bottom:		chainTop
+*options.pane.form.Label.horizDistance:	0
+*options.pane.form.Text.horizDistance:	0
+*options.pane.form.Label.vertDistance:	8
+*options.pane.form.Text.vertDistance:	8
+*options.pane.form.Text.width:		147
+*options*viewport.width:		390
+*options*viewport.height:		50
+
+*options*viewport.horizDistance:	7
+*options*label1.horizDistance:		5
+*options*viewport.left:			chainLeft
+*options*viewport.right:		chainRight
+*options*list.longest:			376
+
+*options*driverOpts.label:		Options for module\ 
+*options*driverOpts.justify:		left
+*options*driverOpts.width:		278
+*options*popdown.label:			Popdown dialog
+*options*driverOpts.tip:		This menu shows:\n\
+ o option name\n\
+ o option type
+
+.xf86cfg*options.moduleOptions.geometry:			360x245
+.xf86cfg*options.moduleOptions.minWidth:			360
+.xf86cfg*options.moduleOptions.maxWidth:			360
+.xf86cfg*options.moduleOptions.minHeight:			245
+.xf86cfg*options.moduleOptions.maxHeight:			245
+*options.moduleOptions*descriptions*labelType.label:		Select option
+*options.moduleOptions*descriptions*labelType.width:		348
+*options.moduleOptions*descriptions*module.fromVert:		labelType
+*options.moduleOptions*descriptions*module.label:		Module
+*options.moduleOptions*descriptions*Label.horizDistance:	8
+*options.moduleOptions*descriptions*option.fromVert:		labelType
+*options.moduleOptions*descriptions*option.label:		Option
+*options.moduleOptions*descriptions*option.fromHoriz:		viewM
+*options.moduleOptions*descriptions*viewM.fromVert:		module
+*options.moduleOptions*descriptions*viewM.width:		120
+*options.moduleOptions*descriptions*viewM.height:		94
+*options.moduleOptions*descriptions*modL.longest:		100
+*options.moduleOptions*descriptions*viewO.fromHoriz:		viewM
+*options.moduleOptions*descriptions*viewO.fromVert:		option
+*options.moduleOptions*descriptions*viewO.width:		220
+*options.moduleOptions*descriptions*viewO.height:		94
+*options.moduleOptions*descriptions*optL.longest:		220
+*options.moduleOptions*descriptions*desc.horizDistance:		4
+*options.moduleOptions*descriptions*desc.fromVert:		viewM
+*options.moduleOptions*descriptions*desc.width:			348
+*options.moduleOptions*descriptions*desc.height:		62
+*options.moduleOptions*descriptions*desc.wrap:			word
+*options.moduleOptions*descriptions*desc.scrollVertical:	Always
+*options.moduleOptions*descriptions*desc.Scrollbar.foreground:	rgb:a/5/5
+*options.moduleOptions*descriptions*desc.Scrollbar.borderWidth:	1
+*options.moduleOptions*descriptions*desc.Scrollbar.borderColor:	gray60
+*options.moduleOptions*descriptions.showGrip:			False
+*options.moduleOptions*popdown.label:				Popdown dialog
+
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! monitor
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+*monitorl*Viewport.width:		302
+*monitorl*Text.width:			160
+*monitorl*Text.tip:\
+Select standard value from the list\n\
+below, or enter specific value here.
+
+*monitorl*hlabel.justify:		right
+*monitorl*hlabel.width:			138
+*monitorl*hlabel.label:			Horizontal sync
+*monitorl*hsync.fromHoriz:		hlabel
+*monitorl*hviewport.fromVert:		hsync
+*monitorl*hviewport.height:		156
+*monitorl*hlist.longest:		288
+
+*monitorl*vlabel.justify:		right
+*monitorl*vlabel.width:			138
+*monitorl*vlabel.vertDistance:		12
+*monitorl*vsync.vertDistance:		12
+*monitorl*vlabel.fromVert:		hviewport
+*monitorl*vsync.fromVert:		hviewport
+*monitorl*vlabel.label:			Vertical sync
+*monitorl*vsync.fromHoriz:		vlabel
+*monitorl*vviewport.fromVert:		vsync
+*monitorl*vviewport.height:		20
+*monitorl*vlist.longest:		64
+
+*monitorl*clabel.vertDistance:		12
+*monitorl*clabel.fromVert:		vviewport
+*monitorl*clabel.label:			Select card connected to monitor
+*monitorl*cmenu.fromVert:		clabel
+*monitorl*cmenu.width:			302
+*monitorl*cmenu.justify:		left
+*monitorl*none.label:			None
+
+!! vidtune
+*vidtune.Repeater.borderWidth:		1
+*vidtune.Repeater.borderColor:		gray90
+*vidtune.Repeater.shapeStyle:		ellipse
+*vidtune.Repeater.foreground:		gray30
+*vidtune.Repeater.background:		gray80
+*vidtune.Repeater.width:		31
+*vidtune.Repeater.height:		29
+*vidtune.Repeater.repeatDelay:		200
+*vidtune.Repeater.decay:		0
+*vidtune.Repeater.displayList:\
+line-width	2;\
+foreground	gray65;\
+draw-arc	0,0,-0,-0,230,180;\
+foreground	gray95;\
+draw-arc	0,0,-0,-0,40,180;\
+foreground	gray80;\
+draw-arc	0,0,-0,-0,220,10;\
+draw-arc	0,0,-0,-0,40,10
+*vidtune.Repeater.translations:\
+<Enter>:	set-values(1, borderColor, gray50)\n\
+<Leave>:	set-values(1, borderColor, gray90)\n\
+<Btn1Down>:	set-values(1, borderColor, gray90) set() start()\n\
+<Btn1Up>:	stop() unset()
+*vidtune.left.bitmap:			left.xbm
+*vidtune.right.bitmap:			right.xbm
+*vidtune.up.bitmap:			up.xbm
+*vidtune.down.bitmap:			down.xbm
+*vidtune.wider.bitmap:			wider.xbm
+*vidtune.narrower.bitmap:		narrower.xbm
+*vidtune.shorter.bitmap:		shorter.xbm
+*vidtune.taller.bitmap:			taller.xbm
+
+*vidtune.vesaB.label:			Add standard VESA mode to current screen
+*vidtune.vesaB.width:			312
+
+*vidtune.screenB.fromVert:		mode
+*vidtune.screenB.width:			160
+*vidtune.screenB.horizDistance:		80
+*vidtune.prev.fromVert:			vesaB
+*vidtune.mode.fromVert:			vesaB
+*vidtune.next.fromVert:			vesaB
+*vidtune.prev.horizDistance:		54
+*vidtune.prev.label:			<<
+*vidtune.mode.fromHoriz:		prev
+*vidtune.mode.width:			160
+*vidtune.next.label:			>>
+*vidtune.next.fromHoriz:		mode
+
+*vidtune.up.fromVert:			screenB
+*vidtune.up.horizDistance:		143
+*vidtune.left.horizDistance:		98
+*vidtune.left.vertDistance:		16
+*vidtune.left.fromVert:			up
+*vidtune.monitor.fromVert:		up
+*vidtune.monitor.vertDistance:		0
+*vidtune.monitor.fromHoriz:		left
+*vidtune.right.vertDistance:		16
+*vidtune.right.fromVert:		up
+*vidtune.right.fromHoriz:		monitor
+*vidtune.down.horizDistance:		143
+*vidtune.down.fromVert:			monitor
+*vidtune.wider.fromVert:		left
+*vidtune.wider.horizDistance:		91
+*vidtune.narrower.fromVert:		down
+*vidtune.narrower.fromHoriz:		wider
+*vidtune.shorter.fromVert:		down
+*vidtune.shorter.fromHoriz:		narrower
+*vidtune.taller.fromVert:		right
+*vidtune.taller.fromHoriz:		shorter
+*vidtune.monitor.width:			47
+*vidtune.monitor.height:		40
+*vidtune.monitor.backgroundPixmap:	monitor.xpm
+*vidtune.narrower.horizDistance:	0
+*vidtune.shorter.horizDistance:		2
+*vidtune.taller.horizDistance:		0
+*vidtune.wider.vertDistance:		20
+*vidtune.taller.vertDistance:		20
+*vidtune.narrower.vertDistance:		0
+*vidtune.shorter.vertDistance:		0
+*vidtune.down.vertDistance:		0
+
+*vidtune.monitor.tip:\
+\                  WARNING\n\
+\  Using the  controls here  may damage your\n\
+monitor.  You can safely skip  this section\n\
+of the configuration process.\n\
+\n\
+Press ESC if your monitor goes out of sync.
+
+*vidtune.background:			white
+*vidtune.form.borderWidth:		0
+*vidtune.form.background:		white
+*vidtune.form.defaultDistance:		0
+*vidtune.form.vertDistance:		3
+*vidtune.form.horizDistance:		4
+*vidtune.form.Label.foreground:		gray20
+*vidtune.form.Label.background:		white
+*vidtune.form.Label.font:		-*-fixed-*-*-*-*-10-*-*-*-*-*-*-1
+*vidtune.form.Label.vertDistance:	0
+*vidtune*Label.justify:			right
+
+*vidtune.form.fromVert:			auto
+*vidtune*hsyncstart.label:		HSyncStart:
+*vidtune*hsyncstart.width:		95
+*vidtune*v-hsyncstart.width:		40
+*vidtune*v-hsyncstart.fromHoriz:	hsyncstart
+*vidtune*vsyncstart.fromHoriz:		v-hsyncstart
+*vidtune*v-vsyncstart.fromHoriz:	vsyncstart
+*vidtune*vsyncstart.label:		VSyncStart:
+*vidtune*vsyncstart.width:		95
+*vidtune*v-vsyncstart.width:		40
+*vidtune*hsyncend.label:		HSyncEnd:
+*vidtune*hsyncend.width:		95
+*vidtune*v-hsyncend.width:		40
+*vidtune*v-hsyncend.fromHoriz:		hsyncend
+*vidtune*hsyncend.fromVert:		hsyncstart
+*vidtune*v-hsyncend.fromVert:		v-hsyncstart
+*vidtune*vsyncend.label:		VSyncEnd:
+*vidtune*vsyncend.width:		95
+*vidtune*v-vsyncend.width:		40
+*vidtune*vsyncend.fromHoriz:		v-hsyncend
+*vidtune*v-vsyncend.fromHoriz:		vsyncend
+*vidtune*vsyncend.fromVert:		hsyncstart
+*vidtune*v-vsyncend.fromVert:		v-vsyncstart
+*vidtune*htotal.label:			HTotal:
+*vidtune*htotal.width:			95
+*vidtune*v-htotal.width:		40
+*vidtune*v-htotal.fromHoriz:		htotal
+*vidtune*htotal.fromVert:		hsyncend
+*vidtune*v-htotal.fromVert:		v-hsyncend
+*vidtune*vtotal.label:			VTotal:
+*vidtune*vtotal.width:			95
+*vidtune*v-vtotal.width:		40
+*vidtune*vtotal.fromHoriz:		v-htotal
+*vidtune*v-vtotal.fromHoriz:		vtotal
+*vidtune*vtotal.fromVert:		vsyncend
+*vidtune*v-vtotal.fromVert:		v-vsyncend
+*vidtune*flags.label:			Flags:
+*vidtune*flags.width:			142
+*vidtune*v-flags.width:			156
+*vidtune*v-flags.justify:		left
+*vidtune*v-flags.fromHoriz:		flags
+*vidtune*flags.fromVert:		vtotal
+*vidtune*v-flags.fromVert:		v-vtotal
+*vidtune*clock.label:			Pixel Clock (MHz):
+*vidtune*clock.width:			142
+*vidtune*v-clock.width:			48
+*vidtune*v-clock.fromHoriz:		clock
+*vidtune*clock.fromVert:		flags
+*vidtune*v-clock.fromVert:		v-flags
+*vidtune*hsync.label:			Horizontal Sync (kHz):
+*vidtune*hsync.width:			142
+*vidtune*v-hsync.width:			48
+*vidtune*v-hsync.fromHoriz:		hsync
+*vidtune*hsync.fromVert:		clock
+*vidtune*v-hsync.fromVert:		v-clock
+*vidtune*vsync.label:			Vertical Sync (Hz):
+*vidtune*vsync.width:			142
+*vidtune*v-vsync.width:			48
+*vidtune*v-vsync.fromHoriz:		vsync
+*vidtune*vsync.fromVert:		hsync
+*vidtune*v-vsync.fromVert:		v-hsync
+
+*vidtune.auto.horizDistance:		43
+*vidtune.auto.fromVert:			narrower
+*vidtune.auto.label:			Auto
+!*vidtune.auto.state:			True
+*vidtune.apply.fromVert:		narrower
+*vidtune.apply.fromHoriz:		auto
+*vidtune.apply.label:			Apply
+*vidtune.restore.fromHoriz:		apply
+*vidtune.restore.horizDistance:		4
+*vidtune.restore.fromVert:		narrower
+*vidtune.restore.label:			Restore
+*vidtune.update.fromVert:		narrower
+*vidtune.update.fromHoriz:		restore
+*vidtune.update.label:			Update
+*vidtune.test.fromVert:			narrower
+*vidtune.test.fromHoriz:		update
+*vidtune.test.label:			Test
+
+*vidtune.Label.background:		white
+*vidtune.addto.vertDistance:		4
+*vidtune.addto.fromHoriz:		add
+*vidtune.addto.fromVert:		form
+*vidtune.addto.label:			mode to
+*vidtune.addto.horizDistance:		0
+*vidtune.ident.vertDistance:		4
+*vidtune.ident.horizDistance:		0
+*vidtune.ident.fromVert:		form
+*vidtune.ident.fromHoriz:		addto
+*vidtune.ident.width:			98
+*vidtune.ident.justify:			left
+*vidtune.as.vertDistance:		4
+*vidtune.as.horizDistance:		0
+*vidtune.as.fromVert:			form
+*vidtune.as.fromHoriz:			ident
+*vidtune.as.label:			as:
+*vidtune.text.vertDistance:		4
+*vidtune.text.horizDistance:		0
+*vidtune.text.fromVert:			form
+*vidtune.text.fromHoriz:		as
+*vidtune.text.width:			98
+*vidtune.add.vertDistance:		4
+*vidtune.add.fromVert:			form
+*vidtune.add.label:			Add
+.xf86cfg.force.geometry:		268x58
+.xf86cfg.force.minWidth:		268
+.xf86cfg.force.maxWidth:		268
+.xf86cfg.force.minHeight:		58
+.xf86cfg.force.maxHeight:		58
+.xf86cfg.force.?.label:			There is already a modeline with the\n\
+specified identifier. Add anyway?
+
+.xf86cfg.addMode.geometry:		350x80
+.xf86cfg.addMode.minWidth:		350
+.xf86cfg.addMode.maxWidth:		350
+.xf86cfg.addMode.minHeight:		80
+.xf86cfg.addMode.maxHeight:		80
+.xf86cfg.addMode.?.label:		XF86VidModeAddModeLine returned True,\n\
+but no modeline was added to the current Screen.\n\
+Do you want to add it to the Monitor section?
+
+.xf86cfg.test.?.label:			\        Testing modeline...\n\n\
+Press ESC or stop button to quit.
+.xf86cfg.test.geometry:			250x72
+.xf86cfg.test.minWidth:			250
+.xf86cfg.test.maxWidth:			250
+.xf86cfg.test.minHeight:		72
+.xf86cfg.test.maxHeight:		72
+
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! screen
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+*screenD*depthL.label:			Default color depth:
+*screenD*depthL.height:			20
+*screenD*1.fromHoriz:			depthL
+*screenD*4.fromHoriz:			1
+*screenD*8.fromHoriz:			4
+*screenD*16.fromHoriz:			8
+*screenD*24.fromHoriz:			16
+*screenD*1.width:			24
+*screenD*4.width:			24
+*screenD*8.width:			24
+*screenD*16.width:			24
+*screenD*24.width:			24
+*screenD*1.horizDistance:		5
+*screenD*4.horizDistance:		5
+*screenD*8.horizDistance:		5
+*screenD*16.horizDistance:		5
+*screenD*24.horizDistance:		5
+*screenD*modeL.fromVert:		depthL
+*screenD*modeL.vertDistance:		14
+*screenD*modeL.label:			Select resolution(s):
+*screenD*viewL.fromVert:		modeL
+*screenD*select.fromHoriz:		viewL
+*screenD*unselect.fromHoriz:		viewL
+*screenD*select.fromVert:		modeL
+*screenD*unselect.fromVert:		select
+*screenD*up.fromHoriz:			viewL
+*screenD*down.fromHoriz:		viewL
+*screenD*up.fromVert:			unselect
+*screenD*down.fromVert:			up
+*screenD*viewR.fromHoriz:		select
+*screenD*viewR.fromVert:		modeL
+*screenD*select.bitmap:			right.xbm
+*screenD*unselect.bitmap:		left.xbm
+*screenD*up.bitmap:			up.xbm
+*screenD*down.bitmap:			down.xbm
+*screenD*viewL.width:			133
+*screenD*viewR.width:			133
+*screenD*viewL.height:			184
+*screenD*viewR.height:			184
+*screenD*listLeft.longest:		128
+*screenD*listRight.longest:		128
+*screenD*rotate.tip:			Don't select any option if\n\
+your monitor is not rotated.
+*screenD*rotate.vertDistance:		14
+*screenD*rotate.fromVert:		viewL
+*screenD*rotate.label:			Rotate screen:
+*screenD*CW.tip:			Clock wise
+*screenD*CW.vertDistance:		14
+*screenD*CW.fromVert:			viewL
+*screenD*CW.fromHoriz:			rotate
+*screenD*CW.label:			CW
+*screenD*CW.width:			40
+*screenD*CCW.tip:			Counter-clock wise
+*screenD*CCW.vertDistance:		14
+*screenD*CCW.fromVert:			viewL
+*screenD*CCW.fromHoriz:			CW
+*screenD*CCW.label:			CCW
+*screenD*CCW.width:			40
+
+*work.screen.width:			100
+*work.screen.height:			80
+
+
+*Dialog.background:			gray85
+*quit.ask.label:			Write configuration to
+*quit.ask.value.translations:	#override \
+<Key>Return:	write-config()
+*quit.ask.label.justify:		left
+*quit.ask.value.width:			222
+*quit.ask.icon:				Excl
+.xf86cfg.quit.geometry:			230x92
+.xf86cfg.quit.minWidth:			230
+.xf86cfg.quit.maxWidth:			230
+.xf86cfg.quit.minHeight:		92
+.xf86cfg.quit.maxHeight:		92
+
+*error.notice.label:			Failed to write configuration file.
+.xf86cfg.error.geometry:		280x50
+.xf86cfg.error.minWidth:		260
+.xf86cfg.error.maxWidth:		260
+.xf86cfg.error.minHeight:		50
+.xf86cfg.error.maxHeight:		50
+
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! accessx
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+*Accessx*Label.font:			-*-fixed-medium-r-*-*-13-*-*-*-*-*-iso8859-1
+*Accessx.Form.Toggle.font:		-*-fixed-medium-r-*-*-13-*-*-*-*-*-iso8859-1
+*Accessx*Label.background:		white
+*Accessx*Label.justify:			left
+*Accessx*Label.internalHeight:		0
+*Accessx*Label.internalWidth:		0
+*Accessx*Label.foreground:		gray35
+*Accessx*Toggle.internalHeight:		0
+*Accessx.Toggle.internalWidth:		18
+*Accessx.Toggle.justify:		left
+*Accessx.Toggle.foreground:		gray30
+*Accessx.Toggle.background:		white
+*Accessx*Toggle.highlightThickness:	0
+*Accessx.Toggle.foreground:		rgb:f/7/7
+*Accessx.Toggle.displayList:\
+foreground	white;\
+points		0,0,-1,0;\
+foreground	rgb:f/7/7;\
+fill-poly	0,2,0,-3,8,6
+*Accessx.Toggle.translations: \
+<Btn1Down>,<Btn1Up>: toggle() notify()\n\
+<Enter>: set-values(1, displayList, "foreground white;points 0,0,-1,0;fill-poly 0,1,10,6,0,-2;foreground rgb:7/7/f;fill-poly 0,2,0,-3,8,6")\n\
+<Leave>: set-values(1, displayList, "foreground white;points 0,0,-1,0;foreground rgb:f/7/7;fill-poly 0,2,0,-3,8,6")
+*Accessx.Form.borderWidth:		1
+*Accessx.Form.borderColor:		rgb:f/a/a
+*Accessx.Form.vertDistance:		0
+*Accessx.Form.defaultDistance:		2
+*Accessx.borderWidth:			0
+*accessxForm.background:		white
+*Accessx*Form.background:		white
+*Accessx.background:			white
+*accessxForm.enable.label:		Enable AccessX
+*accessxForm.enable.width:		208
+*accessxForm.apply.fromHoriz:		enable
+*accessxForm.apply.label:		Apply changes
+*accessxForm.Accessx.fromVert:		enable
+*Accessx.timeoutToggle.background:	white
+*Accessx.timeoutToggle.foreground:	rgb:7/7/f
+*Accessx.timeoutToggle.displayList:\
+foreground	rgb:a/a/f;\
+lines		1,-1,-1,-1,-1,1;\
+foreground	rgb:2/2/a;\
+lines		-1,0,0,0,0,-1
+
+*Accessx.Form.Toggle.background:	white
+*Accessx.Form.Toggle.foreground:	rgb:7/7/f
+*Accessx.Form.Toggle.displayList:\
+foreground	rgb:a/a/f;\
+lines		1,-1,-1,-1,-1,1;\
+foreground	rgb:2/2/a;\
+lines		-1,0,0,0,0,-1
+*Accessx.Form.Toggle.translations: \
+<Btn1Down>,<Btn1Up>: toggle() notify()\n\
+<Enter>: set-values(1, displayList, "foreground rgb:a/a/f;lines 1,-1,-1,-1,-1,1;foreground rgb:2/2/a;lines -1,0,0,0,0,-1;foreground rgb:f/7/7;draw-rect 1,1,-2,-2")\n\
+<Leave>: set-values(1, displayList, "foreground rgb:a/a/f;lines 1,-1,-1,-1,-1,1;foreground rgb:2/2/a;lines -1,0,0,0,0,-1")
+
+*Accessx.timeoutToggle.internalWidth:	4
+*Accessx.timeoutToggle.translations:\
+<Btn1Down>,<Btn1Up>:	toggle() notify()
+*Accessx.timeoutToggle.internalWidth:	4
+*Accessx.timeoutToggle.internalHeight:	1
+*Accessx.timeoutToggle.vertDistance:	6
+*Accessx.timeoutToggle.label:		Time Out
+*Accessx.timeoutLabel.fromHoriz:	timeoutToggle
+*Accessx.timeoutLabel.vertDistance:	7
+*Accessx.timeoutLabel.label:		Time (min)
+*Accessx.Label.background:		white
+*Accessx.timeoutNumber.vertDistance:	1
+*Accessx.timeoutNumber.fromHoriz:	timeoutLabel
+*Accessx.timeoutNumber.font:		6x9
+*Accessx.timeoutNumber.label:		??
+*Accessx.timeoutScroller.fromVert:	timeoutNumber
+*Accessx.timeoutScroller.fromHoriz:	timeoutLabel
+*Accessx.timeoutScroller.width:		133
+*Accessx.timeoutScroller.horizDistance:	31
+*Accessx*Scrollbar.vertDistance:	0
+*Accessx*Scrollbar.orientation:		horizontal
+*Accessx*Scrollbar.thumb:		black
+*Accessx*Scrollbar.height:		8
+*Accessx*Scrollbar.minimumThumb:	5
+*Accessx*Scrollbar.borderWidth:		1
+*Accessx*Scrollbar.borderColor:		white
+*Accessx*Scrollbar.foreground:		rgb:f/7/7
+*Accessx*Scrollbar.background:		gray95
+*Accessx*Scrollbar.displayList:\
+foreground	gray80;\
+lines		1,-1,-1,-1,-1,1;\
+foreground	gray90;\
+lines		-1,0,0,0,0,-1
+*Accessx.sticky.fromVert:		timeoutToggle
+*Accessx.sticky.vertDistance:		6
+*Accessx.sticky.label:			Enable StickyKeys
+*Accessx.sticky.width:			304
+*Accessx.stickyForm.fromVert:		sticky
+*Accessx.stickyForm.Toggle.width:	148
+*Accessx.stickyForm.Toggle.internalHeight:	1
+*Accessx.stickyForm.auto.label:		Auto off
+*Accessx.stickyForm.beep.fromHoriz:	auto
+*Accessx.stickyForm.beep.label:		Modifiers beep
+*Accessx.mouseKeys.fromVert:		stickyForm
+*Accessx.mouseKeys.width:		304
+*Accessx.mouseKeys.vertDistance:	6
+*Accessx.mouseKeys.label:		Enable MouseKeys
+*Accessx.mouseForm.fromVert:		mouseKeys
+*Accessx.mouseForm.speedLabel.vertDistance:	7
+*Accessx.mouseForm.speedLabel.label:	Peak speed (pixels/sec)
+*Accessx.mouseForm.speedNumber.fromHoriz:	speedLabel
+*Accessx.mouseForm.speedNumber.font:	6x9
+*Accessx.mouseForm.speedNumber.label:		???
+*Accessx.mouseForm.speedScroller.fromHoriz:	speedLabel
+*Accessx.mouseForm.speedScroller.fromVert:	speedNumber
+*Accessx.mouseForm.speedScroller.width:		133
+*Accessx.mouseForm.timeLabel.fromVert:	speedScroller
+*Accessx.mouseForm.timeLabel.label:	Time to peak (sec)
+*Accessx.mouseForm.timeLabel.vertDistance:	7
+*Accessx.mouseForm.timeNumber.label:	???
+*Accessx.mouseForm.timeNumber.fromVert:	speedScroller
+*Accessx.mouseForm.timeNumber.fromHoriz:	timeLabel
+*Accessx.mouseForm.timeNumber.font:	6x9
+*Accessx.mouseForm.timeScroller.fromHoriz:	timeLabel
+*Accessx.mouseForm.timeScroller.fromVert:	timeNumber
+*Accessx.mouseForm.timeScroller.width:	133
+*Accessx.mouseForm.timeScroller.horizDistance:	37
+*Accessx.mouseForm.delayLabel.fromVert:	timeScroller
+*Accessx.mouseForm.delayLabel.label:	Motion delay (sec)
+*Accessx.mouseForm.delayLabel.tip:\
+Time between the initial key press\n\
+and the first repeated motion event
+*Accessx.mouseForm.delayLabel.vertDistance:	7
+*Accessx.mouseForm.delayNumber.label:	???
+*Accessx.mouseForm.delayNumber.fromVert:	timeScroller
+*Accessx.mouseForm.delayNumber.fromHoriz:	delayLabel
+*Accessx.mouseForm.delayNumber.font:	6x9
+*Accessx.mouseForm.delayScroller.fromHoriz:	delayLabel
+*Accessx.mouseForm.delayScroller.fromVert:	delayNumber
+*Accessx.mouseForm.delayScroller.width:	133
+*Accessx.mouseForm.delayScroller.horizDistance:	37
+*Accessx.repeatKeys.fromVert:		mouseForm
+*Accessx.repeatKeys.width:		304
+*Accessx.repeatKeys.vertDistance:	6
+*Accessx.repeatKeys.label:		Enable RepeatKeys
+*Accessx.repeatForm.fromVert:		repeatKeys
+*Accessx.repeatForm.rateLabel.vertDistance:	7
+*Accessx.repeatForm.rateLabel.label:	Repeat rate (sec/key)
+*Accessx.repeatForm.rateNumber.fromHoriz:	rateLabel
+*Accessx.repeatForm.rateNumber.font:	6x9
+*Accessx.repeatForm.rateNumber.label:	????
+*Accessx.repeatForm.rateScroller.fromHoriz:	rateLabel
+*Accessx.repeatForm.rateScroller.fromVert:	rateNumber
+*Accessx.repeatForm.rateScroller.width:	133
+*Accessx.repeatForm.rateScroller.horizDistance:	16
+*Accessx.repeatForm.delayLabel.fromVert:	rateScroller
+*Accessx.repeatForm.delayLabel.label:	Repeat delay (sec)
+*Accessx.repeatForm.delayLabel.vertDistance:	7
+*Accessx.repeatForm.delayNumber.label:	????
+*Accessx.repeatForm.delayNumber.fromVert:	rateScroller
+*Accessx.repeatForm.delayNumber.fromHoriz:	delayLabel
+*Accessx.repeatForm.delayNumber.font:	6x9
+*Accessx.repeatForm.delayScroller.fromHoriz:	delayLabel
+*Accessx.repeatForm.delayScroller.fromVert:	delayNumber
+*Accessx.repeatForm.delayScroller.width:	133
+*Accessx.repeatForm.delayScroller.horizDistance:	37
+*Accessx.slow.fromVert:			repeatForm
+*Accessx.slow.vertDistance:		6
+*Accessx.slow.label:			Enable SlowKeys
+*Accessx.slow.width:			304
+*Accessx.slowForm.fromVert:		slow
+*Accessx.slowForm.Toggle.horizDistance:	4
+*Accessx.slowForm.Toggle.internalWidth:	4
+*Accessx.slowForm.Toggle.internalHeight:	1
+*Accessx.slowForm.beep.label:		Beep when key is
+*Accessx.slowForm.beep.vertDistance:	3
+*Accessx.slowForm.pressed.fromHoriz:	beep
+*Accessx.slowForm.pressed.label:	pressed
+*Accessx.slowForm.accepted.fromHoriz:	pressed
+*Accessx.slowForm.accepted.label:	accepted
+*Accessx.slowForm.slowLabel.fromVert:	accepted
+*Accessx.slowForm.slowLabel.label:	Key delay (sec)
+*Accessx.slowForm.slowLabel.vertDistance:	7
+*Accessx.slowForm.slowNumber.label:	???
+*Accessx.slowForm.slowNumber.fromVert:	accepted
+*Accessx.slowForm.slowNumber.fromHoriz:	slowLabel
+*Accessx.slowForm.slowNumber.font:	6x9
+*Accessx.slowForm.slowScroller.fromHoriz:	slowLabel
+*Accessx.slowForm.slowScroller.fromVert:	slowNumber
+*Accessx.slowForm.slowScroller.width:	133
+*Accessx.slowForm.slowScroller.horizDistance:	58
+*Accessx.bounce.fromVert:		slowForm
+*Accessx.bounce.vertDistance:		6
+*Accessx.bounce.label:			Enable BounceKeys
+*Accessx.bounce.width:			304
+*Accessx.bounceForm.fromVert:		bounce
+*Accessx.bounceForm.bounceLabel.label:	Debounce time (sec)
+*Accessx.bounceForm.bounceLabel.vertDistance:	7
+*Accessx.bounceForm.bounceNumber.label:	???
+*Accessx.bounceForm.bounceNumber.fromHoriz:	bounceLabel
+*Accessx.bounceForm.bounceNumber.font:	6x9
+*Accessx.bounceForm.bounceScroller.fromHoriz:	bounceLabel
+*Accessx.bounceForm.bounceScroller.fromVert:	bounceNumber
+*Accessx.bounceForm.bounceScroller.width:	133
+*Accessx.bounceForm.bounceScroller.horizDistance:	30
+
+*accessx.geometry:			220x253
+*accessx.minWidth:			220
+*accessx.maxWidth:			220
+*accessx.minHeight:			253
+*accessx.maxHeight:			253
+*accessx*lock.fromVert:			label
+*accessx*div.fromVert:			label
+*accessx*div.fromHoriz:			lock
+*accessx*mul.fromVert:			label
+*accessx*mul.fromHoriz:			div
+*accessx*minus.fromVert:		label
+*accessx*minus.fromHoriz:		mul
+*accessx*7.fromVert:			lock
+*accessx*8.fromVert:			div
+*accessx*8.fromHoriz:			7
+*accessx*9.fromVert:			mul
+*accessx*9.fromHoriz:			8
+*accessx*plus.fromVert:			minus
+*accessx*plus.fromHoriz:		9
+*accessx*4.fromVert:			7
+*accessx*5.fromVert:			8
+*accessx*5.fromHoriz:			4
+*accessx*6.fromVert:			9
+*accessx*6.fromHoriz:			5
+*accessx*1.fromVert:			4
+*accessx*2.fromVert:			5
+*accessx*2.fromHoriz:			1
+*accessx*3.fromVert:			6
+*accessx*3.fromHoriz:			2
+*accessx*enter.fromVert:		plus
+*accessx*enter.fromHoriz:		3
+*accessx*0.fromVert:			2
+*accessx*del.fromVert:			3
+*accessx*del.fromHoriz:			0
+*accessx.form.background:		gray80
+*accessx*Label.displayList:\
+foreground	gray20;\
+lines		+1,-1,-1,-1,-1,+1;\
+foreground	white;\
+lines		-1,0,0,0,0,-1
+*accessx*label.font:			fixed
+*accessx*Label.font:			-*-helvetica-bold-o-*-*-10-*-*-*-*-*-*-1
+*accessx*Label.width:			50
+*accessx*Label.height:			35
+*accessx*label.width:			212
+*accessx*label.height:			50
+*accessx*plus.height:			74
+*accessx*enter.height:			74
+*accessx*0.width:			104
+*accessx*lock.label:			Num\nLock
+*accessx*div.label:			/\n\ 
+*accessx*mul.label:			*\n\ 
+*accessx*minus.label:			-\n\ 
+*accessx*7.label:			7\n\ 
+*accessx*8.label:			8\n\ 
+*accessx*9.label:			9\n\ 
+*accessx*plus.label:			+\n\ \n\ \n\ \n\ 
+*accessx*4.label:			4\n\ 
+*accessx*5.label:			5\n\ 
+*accessx*6.label:			6\n\ 
+*accessx*1.label:			1\n\ 
+*accessx*2.label:			2\n\ 
+*accessx*3.label:			3\n\ 
+*accessx*enter.label:			Enter\n\ \n\ \n\ \n\ 
+*accessx*0.label:			0\n\ 
+*accessx*del.label:			.\n\ \n\ 
+*accessx*label.displayList:\
+foreground	white;\
+lines		+1,-1,-1,-1,-1,+1;\
+foreground	gray20;\
+lines		-1,0,0,0,0,-1
+*accessx*label.label:\
+If your mouse does not work, use\n\
+the  numeric  keypad,  following\n\
+the diagram bellow.
+*accessx*div.displayList:\
+foreground	gray20;\
+lines		+1,-1,-1,-1,-1,+1;\
+foreground	white;\
+lines		-1,0,0,0,0,-1;\
+foreground	red;\
+font		-*-helvetica-bold-o-*-*-10-*-*-*-*-*-*-1;\
+draw-string	4,30, "Button 1"
+*accessx*mul.displayList:\
+foreground	gray20;\
+lines		+1,-1,-1,-1,-1,+1;\
+foreground	white;\
+lines		-1,0,0,0,0,-1;\
+foreground	red;\
+font		-*-helvetica-bold-o-*-*-10-*-*-*-*-*-*-1;\
+draw-string	4,30, "Button 2"
+*accessx*minus.displayList:\
+foreground	gray20;\
+lines		+1,-1,-1,-1,-1,+1;\
+foreground	white;\
+lines		-1,0,0,0,0,-1;\
+foreground	red;\
+font		-*-helvetica-bold-o-*-*-10-*-*-*-*-*-*-1;\
+draw-string	4,30, "Button 3"
+*accessx*7.displayList:\
+foreground	gray20;\
+lines		+1,-1,-1,-1,-1,+1;\
+foreground	white;\
+lines		-1,0,0,0,0,-1;\
+foreground	red;\
+fill-poly	20,20,20,30,30,20
+*accessx*8.displayList:\
+foreground	gray20;\
+lines		+1,-1,-1,-1,-1,+1;\
+foreground	white;\
+lines		-1,0,0,0,0,-1;\
+foreground	red;\
+fill-poly	30,20,20,30,40,30
+*accessx*9.displayList:\
+foreground	gray20;\
+lines		+1,-1,-1,-1,-1,+1;\
+foreground	white;\
+lines		-1,0,0,0,0,-1;\
+foreground	red;\
+fill-poly	20,20,30,30,30,20
+*accessx*plus.displayList:\
+foreground	gray20;\
+lines		+1,-1,-1,-1,-1,+1;\
+foreground	white;\
+lines		-1,0,0,0,0,-1;\
+foreground	red;\
+font		-*-helvetica-bold-o-*-*-10-*-*-*-*-*-*-1;\
+draw-string	9,46, "Double";\
+draw-string	14,60, "Click"
+*accessx*4.displayList:\
+foreground	gray20;\
+lines		+1,-1,-1,-1,-1,+1;\
+foreground	white;\
+lines		-1,0,0,0,0,-1;\
+foreground	red;\
+fill-poly	22,22,30,30,30,14
+*accessx*5.displayList:\
+foreground	gray20;\
+lines		+1,-1,-1,-1,-1,+1;\
+foreground	white;\
+lines		-1,0,0,0,0,-1;\
+foreground	red;\
+font		-*-helvetica-bold-o-*-*-10*-*-*-*-*-*-1;\
+draw-string	14,30, "Click"
+*accessx*6.displayList:\
+foreground	gray20;\
+lines		+1,-1,-1,-1,-1,+1;\
+foreground	white;\
+lines		-1,0,0,0,0,-1;\
+foreground	red;\
+fill-poly	30,22,22,30,22,14
+*accessx*1.displayList:\
+foreground	gray20;\
+lines		+1,-1,-1,-1,-1,+1;\
+foreground	white;\
+lines		-1,0,0,0,0,-1;\
+foreground	red;\
+fill-poly	20,20,20,30,30,30
+*accessx*2.displayList:\
+foreground	gray20;\
+lines		+1,-1,-1,-1,-1,+1;\
+foreground	white;\
+lines		-1,0,0,0,0,-1;\
+foreground	red;\
+fill-poly	28,30,20,22,36,22
+*accessx*3.displayList:\
+foreground	gray20;\
+lines		+1,-1,-1,-1,-1,+1;\
+foreground	white;\
+lines		-1,0,0,0,0,-1;\
+foreground	red;\
+fill-poly	20,30,30,30,30,20
+*accessx*enter.displayList:\
+foreground	gray20;\
+lines		+1,-1,-1,-1,-1,+1;\
+foreground	white;\
+lines		-1,0,0,0,0,-1;\
+foreground	red;\
+font		-*-helvetica-bold-o-*-*-10-*-*-*-*-*-*-1;\
+draw-string	9,46, "Toggle";\
+draw-string	10,60, "Speed"
+*accessx*0.displayList:\
+foreground	gray20;\
+lines		+1,-1,-1,-1,-1,+1;\
+foreground	white;\
+lines		-1,0,0,0,0,-1;\
+foreground	red;\
+font		-*-helvetica-bold-o-*-*-10-*-*-*-*-*-*-1;\
+draw-string	26,30, "Button Lock"
+*accessx*del.displayList:\
+foreground	gray20;\
+lines		+1,-1,-1,-1,-1,+1;\
+foreground	white;\
+lines		-1,0,0,0,0,-1;\
+foreground	red;\
+font		-*-helvetica-bold-o-*-*-8-*-*-*-*-*-*-1;\
+draw-string	12,21, "Button";\
+draw-string	9,30, "Release"
+
+*panner.width:		100
+*panner.height:		100
+
+*help*text.properties:\
+default?family=Times&weight=Medium&slant=R&pixelsize=12&registry=ISO8859&encoding=1,\
+b?weight=Bold,\
+strong?weight=Bold,\
+i?slant=I,\
+em?slant=I,\
+address?slant=I,\
+h1?pixelsize=24&weight=Bold,\
+h2?pixelsize=20&weight=Bold,\
+h3?pixelsize=17&weight=Bold,\
+h4?pixelsize=14&weight=Bold,\
+h5?pixelsize=12&weight=Bold,\
+h6?pixelsize=10&weight=Bold,\
+pre?family=Courier&pixelsize=10,\
+kbd?family=Courier&pixelsize=10,\
+code?family=Courier&pixelsize=10,\
+samp?family=Courier&pixelsize=10,\
+tt?family=Courier&pixelsize=10
+*help*commands.min:	22
+*help*commands.max:	22
+*help*commands.showGrip:False
+*help*wrap:		word
+*help*commands.close.label:	Close
+.xf86cfg.help.geometry:		320x369
+.xf86cfg.help.minWidth:		320
+.xf86cfg.help.maxWidth:		320
+.xf86cfg.help.minHeight:	369
+.xf86cfg.help.maxHeight:	369
+.xf86cfg.help.translations:	#override \
+<Message>WM_PROTOCOLS:	help-close()
+*help*text.translations:\
+<Key>Up:	scroll-one-line-down()\n\
+<Key>Down:	scroll-one-line-up()\n\
+<Key>Next:	next-page()\n\
+<Key>Prior:	previous-page()\n\
+<Key>space:	next-page()\n\
+<Key>BackSpace:	previous-page()\n\
+<Key>Home:	beginning-of-file()\n\
+<Key>End:	end-of-file()
+*help*text*displayCaret:	False
+*help*text.leftMargin:		10
+*help*text.rightMargin:		10
+
+*help.helpDevices:\
+<h2>Configuring devices</h2>\
+You can arrange the icons pressing the <i>left mouse button</i> \
+and dragging them.\
+<p>\
+To configure a device, press the <i>right mouse button</i> and choose the \
+<tt>configure</tt> option.\
+
+*help.helpScreen:\
+<h2>Configuring screens</h2>\
+You can drag the monitors to set the screen layout form <b>Xinerama</b> \
+pressing the <i>left mouse button</i> and moving them.\
+<p>\
+Press the <i>right mouse button</i> to set configure or set options for \
+the given screen.
+
+*help.helpModeline:\
+<h2>Configuring modelines</h2>\
+<b><font size=+1 color=red>The controls here may damage your \
+monitor.</font></b> \
+<p>\
+You can safelly skip this stage of the configuration process.\
+<p>\
+When not running in <b>Xinerama</b> mode, you can configure modelines \
+for every configured monitor. Set the <b>Auto</b> toggle to see the changes \
+while the <i>control buttons</i> are pressed.\
+<p>\
+Note that the <i>arrow</i> buttons are repeaters. Press they only once \
+and they will show the changes in the <i>text labels</i>.\
+<p>\
+<font color=forestgreen>Press <b>ESC</b> if the monitor goes out of sync.</font>
+
+*help.helpAccessX:\
+<h2>Configuring accessx</h2>\
+This interface is expected to allow customizing most of the <b>accessx</b> \
+options.\
+<p>\
+Press in the <b>Enable ???</b> label to set specific options.\
+<p>\
+<font color=red>Note</font>: currently, if you press the \
+<tt><b>Apply changes</b></tt> button there is no way to undo your changes.</font>
+
+
+*Expert.geometry:				640x460
+*Expert*vpane.min:				64
+*Expert*vpane.max:				64
+*Expert*vpane.showGrip:				False
+*Expert*vpane.close.showGrip:			False
+*Expert*vpane.close.min:			26
+*Expert*vpane.close.max:			26
+*panner.internalSpace:				1
+*panner.shadowThickness:			0
+*panner.shadowColor:				gray60
+*panner.backgroundStipple:			black
+*panner.borderColor:				gray40
+
+*expert*tree.hSpace:				12
+*expert*tree*Box.hSpace:			4
+*expert*tree*vSpace:				4
+*expert*tree*LogFile.Text.width:		192
+*expert*tree*RgbPath.Text.width:		192
+*expert*tree*ModulePath.Text.width:		192
+
+*expert*tree*Form.defaultDistance:		4
+
+*expert*tree.backgroundPixmap:			xlogo64?foreground=gray90&background=gray92
+*expert*tree.foreground:			gray45
+
+*expert*tree*Label.backgroundPixmap:		ParentRelative
+
+*expert*tree*Box.backgroundPixmap:		gradient:vertical?dimension=3&start=gray85&end=gray95
+*expert*tree*Box.borderWidth:			0
+*expert*tree*Box.background:			gray85
+*expert*Box.displayList:\
+foreground	gray40;\
+lines		1,-1,-1,-1,-1,1;\
+foreground	white;\
+lines		-1,0,0,0,0,-1
+
+*expert*tree*Form.backgroundPixmap:		gradient:vertical?dimension=3&start=gray85&end=gray95
+*expert*tree*Form.borderWidth:			0
+*expert*tree*Form.background:			gray85
+*expert*Form.displayList:\
+foreground	gray40;\
+lines		1,-1,-1,-1,-1,1;\
+foreground	white;\
+lines		-1,0,0,0,0,-1
+
+*expert*tree*Text.width:			160
+
+*expert*tree*fontpath.Text.width:		228
+*expert*tree*fontpath.up.fromHoriz:		remove
+*expert*tree*fontpath.down.fromHoriz:		up
+*expert*tree*fontpath.value.fromVert:		remove
+*expert*tree*fontpath.valueNew.fromVert:	new
+
+*expert*tree*modulepath.Text.width:		228
+*expert*tree*modulepath.value.fromVert:		remove
+*expert*tree*modulepath.valueNew.fromVert:	new
+
+*expert*tree*module.options.fromHoriz:		remove
+*expert*tree*module.label.fromVert:		remove
+*expert*tree*module.value.fromHoriz:		new
+*expert*tree*module.value.width:		78
+
+*expert*tree*video*Label.justify:		left
+*expert*tree*video.options.fromHoriz:		remove
+*expert*tree*video.adaptor.fromHoriz:		options
+*expert*tree*video.vendorL.width:		78
+*expert*tree*video.vendorL.label:		VendorName
+*expert*tree*video.vendorL.fromVert:		remove
+*expert*tree*video.vendor.fromVert:		remove
+*expert*tree*video.vendor.fromHoriz:		vendorL
+*expert*tree*video.boardL.width:		78
+*expert*tree*video.boardL.label:		BoardName
+*expert*tree*video.boardL.fromVert:		vendor
+*expert*tree*video.board.fromVert:		vendor
+*expert*tree*video.board.fromHoriz:		boardL
+*expert*tree*video.busidL.width:		78
+*expert*tree*video.busidL.label:		BusID
+*expert*tree*video.busidL.fromVert:		board
+*expert*tree*video.busid.fromVert:		board
+*expert*tree*video.busid.fromHoriz:		busidL
+*expert*tree*video.driverL.width:		78
+*expert*tree*video.driverL.label:		Driver
+*expert*tree*video.driverL.fromVert:		busid
+*expert*tree*video.driver.fromVert:		busid
+*expert*tree*video.driver.fromHoriz:		driverL
+*expert*tree*video.value.fromHoriz:		new
+*expert*tree*video.value.width:			78
+*expert*tree*VideoPort.fromVert:		driver
+*expert*tree*VideoPort.horizDistance:		120
+*expert*tree*video.value.width:			149
+
+*expert*tree*port.value.fromHoriz:		new
+*expert*tree*port.options.fromHoriz:		remove
+*expert*tree*port.label.fromVert:		remove
+*expert*tree*port.value.width:			78
+
+*expert*tree*modes.mode.fromHoriz:		remove
+*expert*tree*modes.value.fromHoriz:		new
+*expert*tree*modes.value.width:			78
+
+*expert*tree*modeline.label.fromHoriz:		remove
+*expert*tree*modeline.modeline.fromVert:	remove
+*expert*tree*modeline.modeline.width:		480
+*expert*tree*modeline.value.fromHoriz:		new
+*expert*tree*modeline.value.width:		120
+*expert*tree*modeline.modelineNew.fromVert:	value
+*expert*tree*modeline.modelineNew.width:	480
+
+*expert*tree*monitor.options.fromHoriz:		remove
+*expert*tree*monitor.label.fromHoriz:		options
+
+*expert*tree*monitor.Label.justify:		left
+*expert*tree*monitor.Text.width:		120
+*expert*tree*monitor.vendorL.width:		100
+*expert*tree*monitor.vendorL.label:		VendorName
+*expert*tree*monitor.vendorL.fromVert:		remove
+*expert*tree*monitor.vendor.fromVert:		remove
+*expert*tree*monitor.vendor.fromHoriz:		vendorL
+*expert*tree*monitor.modelnameL.width:		100
+*expert*tree*monitor.modelnameL.label:		ModelName
+*expert*tree*monitor.modelnameL.fromVert:	vendor
+*expert*tree*monitor.modelname.fromVert:	vendor
+*expert*tree*monitor.modelname.fromHoriz:	modelnameL
+*expert*tree*monitor.widthL.width:		100
+*expert*tree*monitor.widthL.label:		Width (mm)
+*expert*tree*monitor.widthL.fromVert:		modelname
+*expert*tree*monitor.width.fromVert:		modelname
+*expert*tree*monitor.width.fromHoriz:		widthL
+*expert*tree*monitor.heightL.width:		100
+*expert*tree*monitor.heightL.label:		Height (mm)
+*expert*tree*monitor.heightL.fromVert:		width
+*expert*tree*monitor.height.fromVert:		width
+*expert*tree*monitor.height.fromHoriz:		heightL
+*expert*tree*monitor.hsyncL.width:		100
+*expert*tree*monitor.hsyncL.label:		Hsync
+*expert*tree*monitor.hsyncL.fromVert:		heightL
+*expert*tree*monitor.hsync.fromVert:		height
+*expert*tree*monitor.hsync.fromHoriz:		hsyncL
+*expert*tree*monitor.vrefreshL.width:		100
+*expert*tree*monitor.vrefreshL.label:		Vrefresh
+*expert*tree*monitor.vrefreshL.fromVert:	hsync
+*expert*tree*monitor.vrefresh.fromVert:		hsync
+*expert*tree*monitor.vrefresh.fromHoriz:	vrefreshL
+*expert*tree*monitor.gammaRedL.width:		100
+*expert*tree*monitor.gammaRedL.label:		Gamma (red)
+*expert*tree*monitor.gammaRedL.fromVert:	vrefresh
+*expert*tree*monitor.gammaRed.fromVert:		vrefresh
+*expert*tree*monitor.gammaRed.fromHoriz:	gammaRedL
+*expert*tree*monitor.gammaGreenL.width:		100
+*expert*tree*monitor.gammaGreenL.label:		Gamma (green)
+*expert*tree*monitor.gammaGreenL.fromVert:	gammaRed
+*expert*tree*monitor.gammaGreen.fromVert:	gammaRed
+*expert*tree*monitor.gammaGreen.fromHoriz:	gammaGreenL
+*expert*tree*monitor.gammaBlueL.width:		100
+*expert*tree*monitor.gammaBlueL.label:		Gamma (blue)
+*expert*tree*monitor.gammaBlueL.fromVert:	gammaGreen
+*expert*tree*monitor.gammaBlue.fromVert:	gammaGreen
+*expert*tree*monitor.gammaBlue.fromHoriz:	gammaBlueL
+*expert*tree*monitor.value.width:		191
+*expert*tree*monitor.value.fromHoriz:		new
+
+*expert*tree*device.Label.justify:		left
+*expert*tree*device.options.fromHoriz:		remove
+*expert*tree*device.label.fromHoriz:		options
+*expert*tree*device.vendorL.label:		VendorName
+*expert*tree*device.vendorL.width:		100
+*expert*tree*device.vendorL.fromVert:		remove
+*expert*tree*device.vendor.fromVert:		remove
+*expert*tree*device.vendor.fromHoriz:		vendorL
+*expert*tree*device.boardL.label:		BoardName
+*expert*tree*device.boardL.width:		100
+*expert*tree*device.boardL.fromVert:		vendor
+*expert*tree*device.board.fromVert:		vendor
+*expert*tree*device.board.fromHoriz:		boardL
+*expert*tree*device.chipsetL.label:		Chipset
+*expert*tree*device.chipsetL.width:		100
+*expert*tree*device.chipsetL.fromVert:		board
+*expert*tree*device.chipset.fromVert:		board
+*expert*tree*device.chipset.fromHoriz:		chipsetL
+*expert*tree*device.busidL.label:		BusID
+*expert*tree*device.busidL.width:		100
+*expert*tree*device.busidL.fromVert:		chipset
+*expert*tree*device.busid.fromVert:		chipset
+*expert*tree*device.busid.fromHoriz:		chipsetL
+*expert*tree*device.cardL.label:		Card
+*expert*tree*device.cardL.width:		100
+*expert*tree*device.cardL.fromVert:		busid
+*expert*tree*device.card.fromVert:		busid
+*expert*tree*device.card.fromHoriz:		cardL
+*expert*tree*device.driverL.label:		Driver
+*expert*tree*device.driverL.width:		100
+*expert*tree*device.driverL.fromVert:		card
+*expert*tree*device.driver.fromVert:		card
+*expert*tree*device.driver.fromHoriz:		driverL
+*expert*tree*device.ramdacL.label:		Ramdac
+*expert*tree*device.ramdacL.width:		100
+*expert*tree*device.ramdacL.fromVert:		driverL
+*expert*tree*device.ramdac.fromVert:		driver
+*expert*tree*device.ramdac.fromHoriz:		ramdacL
+*expert*tree*device.dacSpeedL.label:		DacSpeed
+*expert*tree*device.dacSpeedL.width:		100
+*expert*tree*device.dacSpeedL.fromVert:		ramdac
+*expert*tree*device.dacSpeed.fromVert:		ramdac
+*expert*tree*device.dacSpeed.fromHoriz:		dacSpeedL
+*expert*tree*device.videoRamL.label:		VideoRam
+*expert*tree*device.videoRamL.width:		100
+*expert*tree*device.videoRamL.fromVert:		dacSpeed
+*expert*tree*device.videoRam.fromVert:		dacSpeed
+*expert*tree*device.videoRam.fromHoriz:		videoRamL
+*expert*tree*device.textClockFreqL.label:	TextClockFreq
+*expert*tree*device.textClockFreqL.width:	100
+*expert*tree*device.textClockFreqL.fromVert:	videoRam
+*expert*tree*device.textClockFreq.fromVert:	videoRam
+*expert*tree*device.textClockFreq.fromHoriz:	textClockFreqL
+*expert*tree*device.biosBaseL.label:		BiosBase
+*expert*tree*device.biosBaseL.width:		100
+*expert*tree*device.biosBaseL.fromVert:		textClockFreq
+*expert*tree*device.biosBase.fromVert:		textClockFreq
+*expert*tree*device.biosBase.fromHoriz:		biosBaseL
+*expert*tree*device.memBaseL.label:		MemBase
+*expert*tree*device.memBaseL.width:		100
+*expert*tree*device.memBaseL.fromVert:		biosBase
+*expert*tree*device.memBase.fromVert:		biosBase
+*expert*tree*device.memBase.fromHoriz:		memBaseL
+*expert*tree*device.ioBaseL.label:		IOBase
+*expert*tree*device.ioBaseL.width:		100
+*expert*tree*device.ioBaseL.fromVert:		memBase
+*expert*tree*device.ioBase.fromVert:		memBase
+*expert*tree*device.ioBase.fromHoriz:		ioBaseL
+*expert*tree*device.clockChipL.label:		ClockChip
+*expert*tree*device.clockChipL.width:		100
+*expert*tree*device.clockChipL.fromVert:	ioBase
+*expert*tree*device.clockChip.fromVert:		ioBase
+*expert*tree*device.clockChip.fromHoriz:	clockChipL
+*expert*tree*device.devClockL.label:		Clocks
+*expert*tree*device.devClockL.width:		100
+*expert*tree*device.devClockL.fromVert:		clockChip
+*expert*tree*device.devClock.fromVert:		clockChip
+*expert*tree*device.devClock.fromHoriz:		devClockL
+*expert*tree*device.chipIdL.label:		ChipId
+*expert*tree*device.chipIdL.width:		100
+*expert*tree*device.chipIdL.fromVert:		devClock
+*expert*tree*device.chipId.fromVert:		devClock
+*expert*tree*device.chipId.fromHoriz:		chipIdL
+*expert*tree*device.chipRevL.label:		ChipRev
+*expert*tree*device.chipRevL.width:		100
+*expert*tree*device.chipRevL.fromVert:		chipId
+*expert*tree*device.chipRev.fromVert:		chipId
+*expert*tree*device.chipRev.fromHoriz:		chipRevL
+*expert*tree*device.irqL.label:			IRQ
+*expert*tree*device.irqL.width:			100
+*expert*tree*device.irqL.fromVert:		chipRev
+*expert*tree*device.irq.fromVert:		chipRev
+*expert*tree*device.irq.fromHoriz:		irqL
+*expert*tree*device.screenL.label:		Screen
+*expert*tree*device.screenL.width:		100
+*expert*tree*device.screenL.fromVert:		irq
+*expert*tree*device.screen.fromVert:		irq
+*expert*tree*device.screen.fromHoriz:		screenL
+*expert*tree*device.value.fromHoriz:		new
+
+*expert*tree*screen.Label.justify:		left
+*expert*tree*screen.options.fromHoriz:		remove
+*expert*tree*screen.label.fromHoriz:		options
+*expert*tree*screen.defaultDepthL.label:	DefaultDepth
+*expert*tree*screen.defaultDepthL.width:	92
+*expert*tree*screen.defaultDepthL.fromVert:	remove
+*expert*tree*screen.defaultDepth.fromVert:	remove
+*expert*tree*screen.defaultDepth.fromHoriz:	defaultDepthL
+*expert*tree*screen.defaultBppL.label:		DefaultBpp
+*expert*tree*screen.defaultBppL.width:		92
+*expert*tree*screen.defaultBppL.fromVert:	defaultDepth
+*expert*tree*screen.defaultBpp.fromVert:	defaultDepth
+*expert*tree*screen.defaultBpp.fromHoriz:	defaultBppL
+*expert*tree*screen.defaultFbBppL.label:	DefaultFbBpp
+*expert*tree*screen.defaultFbBppL.width:	92
+*expert*tree*screen.defaultFbBppL.fromVert:	defaultBpp
+*expert*tree*screen.defaultFbBpp.fromVert:	defaultBpp
+*expert*tree*screen.defaultFbBpp.fromHoriz:	defaultFbBppL
+*expert*tree*screen.monitorL.label:		Monitor
+*expert*tree*screen.monitorL.width:		92
+*expert*tree*screen.monitorL.fromVert:		defaultFbBpp
+*expert*tree*screen.monitor.fromVert:		defaultFbBpp
+*expert*tree*screen.monitor.fromHoriz:		monitorL
+*expert*tree*screen.deviceL.label:		Device
+*expert*tree*screen.deviceL.width:		92
+*expert*tree*screen.deviceL.fromVert:		monitor
+*expert*tree*screen.device.fromVert:		monitor
+*expert*tree*screen.device.fromHoriz:		deviceL
+*expert*tree*screen.value.fromHoriz:		new
+
+*expert*tree*adaptor.label.fromHoriz:		remove
+
+*expert*tree*display.Label.width:		64
+*expert*tree*display.Label.justify:		left
+*expert*tree*display.options.fromHoriz:		remove
+*expert*tree*display.viewportL.label:		Viewport
+*expert*tree*display.viewportL.fromVert:	remove
+*expert*tree*display.viewport.fromVert:		remove
+*expert*tree*display.viewport.fromHoriz:	viewportL
+*expert*tree*display.virtualL.label:		Virtual
+*expert*tree*display.virtualL.fromVert:		viewport
+*expert*tree*display.virtual.fromVert:		viewport
+*expert*tree*display.virtual.fromHoriz:		virtualL
+*expert*tree*display.depthL.label:		Depth
+*expert*tree*display.depthL.fromVert:		virtual
+*expert*tree*display.depth.fromVert:		virtual
+*expert*tree*display.depth.fromHoriz:		depthL
+*expert*tree*display.bppL.label:		FbBPP
+*expert*tree*display.bppL.fromVert:		depth
+*expert*tree*display.bpp.fromVert:		depth
+*expert*tree*display.bpp.fromHoriz:		bppL
+*expert*tree*display.visualL.label:		Visual
+*expert*tree*display.visualL.fromVert:		bpp
+*expert*tree*display.visual.fromVert:		bpp
+*expert*tree*display.visual.fromHoriz:		visualL
+*expert*tree*display.weightL.label:		Weight
+*expert*tree*display.weightL.fromVert:		visual
+*expert*tree*display.weight.fromVert:		visual
+*expert*tree*display.weight.fromHoriz:		weightL
+*expert*tree*display.blackL.label:		Black
+*expert*tree*display.blackL.fromVert:		weight
+*expert*tree*display.black.fromVert:		weight
+*expert*tree*display.black.fromHoriz:		blackL
+*expert*tree*display.whiteL.label:		White
+*expert*tree*display.whiteL.fromVert:		black
+*expert*tree*display.white.fromVert:		black
+*expert*tree*display.white.fromHoriz:		whiteL
+
+*expert*tree*mode.label.fromHoriz:		remove
+*expert*tree*mode.value.fromHoriz:		new
+*expert*tree*mode.value.width:			100
+
+*expert*tree*input.options.fromHoriz:		remove
+*expert*tree*input.label.fromHoriz:		options
+*expert*tree*input.driverL.label:		Driver
+*expert*tree*input.driverL.fromVert:		remove
+*expert*tree*input.driver.fromVert:		remove
+*expert*tree*input.driver.fromHoriz:		driverL
+*expert*tree*input.value.fromHoriz:		new
+
+*expert*tree*layout.options.fromHoriz:		remove
+*expert*tree*layout.label.fromHoriz:		options
+*expert*tree*layout.value.fromHoriz:		new
+
+*expert*tree*adjacency.Text.width:		46
+*expert*tree*adjacency.MenuButton.width:	122
+*expert*tree*adjacency.label.fromHoriz:		remove
+*expert*tree*adjacency.scrnumL.label:		Screen number
+*expert*tree*adjacency.scrnumL.horizDistance:	50
+*expert*tree*adjacency.scrnum.width:		32
+*expert*tree*adjacency.scrnumL.fromVert:	remove
+*expert*tree*adjacency.scrnum.fromVert:		remove
+*expert*tree*adjacency.scrnum.fromHoriz:	scrnumL
+*expert*tree*adjacency.above.label:		Above
+*expert*tree*adjacency.above.fromVert:		scrnumL
+*expert*tree*adjacency.above.vertDistance:	20
+*expert*tree*adjacency.above.horizDistance:	96
+*expert*tree*adjacency.below.label:		Below
+*expert*tree*adjacency.below.horizDistance:	96
+*expert*tree*adjacency.leftOf.label:		LeftOf
+*expert*tree*adjacency.leftOf.fromVert:		above
+*expert*tree*adjacency.screen.fromVert:		above
+*expert*tree*adjacency.screen.fromHoriz:	leftOf
+*expert*tree*adjacency.rightOf.label:		RightOf
+*expert*tree*adjacency.rightOf.fromVert:	above
+*expert*tree*adjacency.rightOf.fromHoriz:	screen
+*expert*tree*adjacency.below.fromVert:		screen
+*expert*tree*adjacency.relative.label:		Relative
+*expert*tree*adjacency.relative.horizDistance:	53
+*expert*tree*adjacency.relative.fromVert:	below
+*expert*tree*adjacency.absolute.fromVert:	below
+*expert*tree*adjacency*absolute.label:		Absolute
+*expert*tree*adjacency*absolute.fromHoriz:	relative
+*expert*tree*adjacency*adjxL.label:		X
+*expert*tree*adjacency*adjxL.horizDistance:	42
+*expert*tree*adjacency*adjxL.fromVert:		absolute
+*expert*tree*adjacency*adjx.fromVert:		absolute
+*expert*tree*adjacency*adjx.fromHoriz:		adjxL
+*expert*tree*adjacency*adjyL.label:		Y
+*expert*tree*adjacency*adjyL.horizDistance:	12
+*expert*tree*adjacency*adjyL.fromVert:		absolute
+*expert*tree*adjacency*adjyL.fromHoriz:		adjx
+*expert*tree*adjacency*adjy.fromVert:		absolute
+*expert*tree*adjacency*adjy.fromHoriz:		adjyL
+
+*expert*tree*inputref.options.fromHoriz:	remove
+*expert*tree*inputref.label.fromHoriz:		options
+
+*expert*tree*vendor.Text.width:			100
+*expert*tree*vendor.options.fromHoriz:		remove
+*expert*tree*vendor.label.fromHoriz:		options
+*expert*tree*vendor.value.fromHoriz:		new
+
+*expert*tree*vendorSub.Text.width:		140
+*expert*tree*vendorSub.options.fromHoriz:	remove
+*expert*tree*vendorSub.label.fromHoriz:		options
+*expert*tree*vendorSub.nameL.label:		Name
+*expert*tree*vendorSub.nameL.fromVert:		remove
+*expert*tree*vendorSub.name.fromVert:		remove
+*expert*tree*vendorSub.name.fromHoriz:		nameL
+*expert*tree*vendorSub.value.fromHoriz:		new
+
+*expert*tree*dri.Text.width:			100
+*expert*tree*dri.Label.width:			78
+*expert*tree*dri.Label.justify:			left
+*expert*tree*dri.nameL.label:			Group name
+*expert*tree*dri.name.fromHoriz:		nameL
+*expert*tree*dri.groupL.label:			Group
+*expert*tree*dri.groupL.fromVert:		name
+*expert*tree*dri.group.fromVert:		name
+*expert*tree*dri.group.fromHoriz:		groupL
+*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
diff --git a/hw/xfree86/utils/xorgcfg/accessx.c b/hw/xfree86/utils/xorgcfg/accessx.c
index 40727ff62..53163e070 100644
--- a/hw/xfree86/utils/xorgcfg/accessx.c
+++ b/hw/xfree86/utils/xorgcfg/accessx.c
@@ -26,7 +26,7 @@
  *
  * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
  *
- * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/accessx.c,v 1.10 2002/12/05 19:31:18 paulo Exp $
+ * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/accessx.c,v 1.8 2001/01/26 21:17:40 paulo Exp $
  */
 
 #include "config.h"
diff --git a/hw/xfree86/utils/xorgcfg/card-cfg.c b/hw/xfree86/utils/xorgcfg/card-cfg.c
index 5299025f1..7db0e2f85 100644
--- a/hw/xfree86/utils/xorgcfg/card-cfg.c
+++ b/hw/xfree86/utils/xorgcfg/card-cfg.c
@@ -26,7 +26,7 @@
  *
  * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
  *
- * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/card-cfg.c,v 1.12 2003/11/03 05:11:58 tsi Exp $
+ * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/card-cfg.c,v 1.11tsi Exp $
  */
 
 #include "xf86config.h"
diff --git a/hw/xfree86/utils/xorgcfg/card-cfg.h b/hw/xfree86/utils/xorgcfg/card-cfg.h
index 14411440d..156da456f 100644
--- a/hw/xfree86/utils/xorgcfg/card-cfg.h
+++ b/hw/xfree86/utils/xorgcfg/card-cfg.h
@@ -26,7 +26,7 @@
  *
  * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
  *
- * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/card-cfg.h,v 1.1 2000/04/04 22:36:57 dawes Exp $
+ * $XFree86$
  */
 
 #include "config.h"
diff --git a/hw/xfree86/utils/xorgcfg/card.xbm b/hw/xfree86/utils/xorgcfg/card.xbm
index b3cbba322..231adcaae 100644
--- a/hw/xfree86/utils/xorgcfg/card.xbm
+++ b/hw/xfree86/utils/xorgcfg/card.xbm
@@ -26,7 +26,7 @@
  *
  * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
  *
- * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/card.xbm,v 1.1 2000/04/04 22:36:57 dawes Exp $
+ * $XFree86$
  */
 #define card_width 50
 #define card_height 44
diff --git a/hw/xfree86/utils/xorgcfg/card.xpm b/hw/xfree86/utils/xorgcfg/card.xpm
index d68257469..32bccb689 100644
--- a/hw/xfree86/utils/xorgcfg/card.xpm
+++ b/hw/xfree86/utils/xorgcfg/card.xpm
@@ -27,7 +27,7 @@
  *
  * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
  *
- * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/card.xpm,v 1.1 2000/04/04 22:36:57 dawes Exp $
+ * $XFree86$
  */
 static char * card_xpm[] = {
 "41 40 8 1",
diff --git a/hw/xfree86/utils/xorgcfg/cards.c b/hw/xfree86/utils/xorgcfg/cards.c
index d5805fa98..b63fb3393 100644
--- a/hw/xfree86/utils/xorgcfg/cards.c
+++ b/hw/xfree86/utils/xorgcfg/cards.c
@@ -26,7 +26,7 @@
  *
  * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
  *
- * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/cards.c,v 1.15 2003/02/15 05:37:58 paulo Exp $
+ * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/cards.c,v 1.14 2002/09/12 15:19:07 tsi Exp $
  */
 
 #define CARDS_PRIVATE
diff --git a/hw/xfree86/utils/xorgcfg/cards.h b/hw/xfree86/utils/xorgcfg/cards.h
index 0e5ee328f..a6637a664 100644
--- a/hw/xfree86/utils/xorgcfg/cards.h
+++ b/hw/xfree86/utils/xorgcfg/cards.h
@@ -26,7 +26,7 @@
  *
  * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
  *
- * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/cards.h,v 1.3 2002/07/15 20:46:04 dawes Exp $
+ * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/cards.h,v 1.2 2001/07/06 02:04:10 paulo Exp $
  */
 
 #include <stdio.h>
diff --git a/hw/xfree86/utils/xorgcfg/computer.xpm b/hw/xfree86/utils/xorgcfg/computer.xpm
index 75fc85b26..9167e3eaf 100644
--- a/hw/xfree86/utils/xorgcfg/computer.xpm
+++ b/hw/xfree86/utils/xorgcfg/computer.xpm
@@ -27,7 +27,7 @@
  *
  * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
  *
- * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/computer.xpm,v 1.1 2000/04/04 22:36:58 dawes Exp $
+ * $XFree86$
  */
 static char * computer_xpm[] = {
 "30 50 8 1",
diff --git a/hw/xfree86/utils/xorgcfg/config.c b/hw/xfree86/utils/xorgcfg/config.c
index 8c2da3d9b..e241b2e14 100644
--- a/hw/xfree86/utils/xorgcfg/config.c
+++ b/hw/xfree86/utils/xorgcfg/config.c
@@ -26,7 +26,7 @@
  *
  * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
  *
- * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/config.c,v 1.9 2003/11/03 05:11:58 tsi Exp $
+ * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/config.c,v 1.8tsi Exp $
  */
 
 #include "config.h"
diff --git a/hw/xfree86/utils/xorgcfg/config.h b/hw/xfree86/utils/xorgcfg/config.h
index aa38d520f..990f7d01d 100644
--- a/hw/xfree86/utils/xorgcfg/config.h
+++ b/hw/xfree86/utils/xorgcfg/config.h
@@ -26,7 +26,7 @@
  *
  * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
  *
- * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/config.h,v 1.22 2004/02/14 17:53:49 dawes Exp $
+ * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/config.h,v 1.21 2004/02/13 23:58:52 dawes Exp $
  */
 
 #include <X11/IntrinsicP.h>
diff --git a/hw/xfree86/utils/xorgcfg/expert.c b/hw/xfree86/utils/xorgcfg/expert.c
index a3dfcbe2d..3bb3a34cc 100644
--- a/hw/xfree86/utils/xorgcfg/expert.c
+++ b/hw/xfree86/utils/xorgcfg/expert.c
@@ -26,7 +26,7 @@
  *
  * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
  *
- * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/expert.c,v 1.15 2003/11/03 05:11:58 tsi Exp $
+ * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/expert.c,v 1.14tsi Exp $
  */
 
 #include "config.h"
@@ -4742,7 +4742,7 @@ ExpertInitialize(void)
     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);
 
diff --git a/hw/xfree86/utils/xorgcfg/help.c b/hw/xfree86/utils/xorgcfg/help.c
index 2ae68a082..92283cd22 100644
--- a/hw/xfree86/utils/xorgcfg/help.c
+++ b/hw/xfree86/utils/xorgcfg/help.c
@@ -26,7 +26,7 @@
  *
  * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
  *
- * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/help.c,v 1.8 2003/11/03 05:11:58 tsi Exp $
+ * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/help.c,v 1.7tsi Exp $
  */
 
 #include <X11/IntrinsicP.h>
diff --git a/hw/xfree86/utils/xorgcfg/help.h b/hw/xfree86/utils/xorgcfg/help.h
index f03e01b14..ba97da009 100644
--- a/hw/xfree86/utils/xorgcfg/help.h
+++ b/hw/xfree86/utils/xorgcfg/help.h
@@ -26,7 +26,7 @@
  *
  * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
  *
- * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/help.h,v 1.1 2000/06/13 23:15:51 dawes Exp $
+ * $XFree86$
  */
 
 /* help string definitions */
diff --git a/hw/xfree86/utils/xorgcfg/interface.c b/hw/xfree86/utils/xorgcfg/interface.c
index 68a1873ed..2595fd376 100644
--- a/hw/xfree86/utils/xorgcfg/interface.c
+++ b/hw/xfree86/utils/xorgcfg/interface.c
@@ -26,7 +26,7 @@
  *
  * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
  *
- * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/interface.c,v 1.37 2002/10/21 04:18:36 paulo Exp $
+ * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/interface.c,v 1.36 2002/10/19 20:04:21 herrb Exp $
  */
 
 #include <X11/IntrinsicP.h>
@@ -193,8 +193,8 @@ static char *device_names[] = {
 
 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 @@ Usage(void)
 {
     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 @@ Usage(void)
 "   -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 @@ main(int argc, char *argv[])
     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 @@ main(int argc, char *argv[])
     
     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 @@ main(int argc, char *argv[])
 # 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
     }
diff --git a/hw/xfree86/utils/xorgcfg/keyboard-cfg.c b/hw/xfree86/utils/xorgcfg/keyboard-cfg.c
index 87989fdc2..997fce5bd 100644
--- a/hw/xfree86/utils/xorgcfg/keyboard-cfg.c
+++ b/hw/xfree86/utils/xorgcfg/keyboard-cfg.c
@@ -26,7 +26,7 @@
  *
  * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
  *
- * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/keyboard-cfg.c,v 1.22 2003/01/01 19:22:24 paulo Exp $
+ * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/keyboard-cfg.c,v 1.21 2002/12/05 20:24:21 paulo Exp $
  */
 
 #include "xf86config.h"
@@ -73,7 +73,7 @@ static char *XkbRulesDir = "lib/X11/xkb/rules/";
 #ifdef XFREE98_XKB
 static char *XkbRulesFile = "xfree98";
 #else
-static char *XkbRulesFile = "xfree86";
+static char *XkbRulesFile = __XKBDEFRULES__;
 #endif
 static XF86ConfInputPtr current_input;
 
diff --git a/hw/xfree86/utils/xorgcfg/keyboard-cfg.h b/hw/xfree86/utils/xorgcfg/keyboard-cfg.h
index 6ff63c002..9de55e65e 100644
--- a/hw/xfree86/utils/xorgcfg/keyboard-cfg.h
+++ b/hw/xfree86/utils/xorgcfg/keyboard-cfg.h
@@ -26,7 +26,7 @@
  *
  * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
  *
- * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/keyboard-cfg.h,v 1.3 2001/03/02 22:39:27 paulo Exp $
+ * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/keyboard-cfg.h,v 1.2 2000/06/13 23:15:51 dawes Exp $
  */
 
 #include "config.h"
diff --git a/hw/xfree86/utils/xorgcfg/keyboard.xbm b/hw/xfree86/utils/xorgcfg/keyboard.xbm
index 69d4aac42..5114bee3e 100644
--- a/hw/xfree86/utils/xorgcfg/keyboard.xbm
+++ b/hw/xfree86/utils/xorgcfg/keyboard.xbm
@@ -26,7 +26,7 @@
  *
  * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
  *
- * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/keyboard.xbm,v 1.1 2000/04/04 22:36:59 dawes Exp $
+ * $XFree86$
  */
 #define keyboard_width 50
 #define keyboard_height 44
diff --git a/hw/xfree86/utils/xorgcfg/keyboard.xpm b/hw/xfree86/utils/xorgcfg/keyboard.xpm
index 5ef7b605d..200ba7f42 100644
--- a/hw/xfree86/utils/xorgcfg/keyboard.xpm
+++ b/hw/xfree86/utils/xorgcfg/keyboard.xpm
@@ -27,7 +27,7 @@
  *
  * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
  *
- * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/keyboard.xpm,v 1.1 2000/04/04 22:36:59 dawes Exp $
+ * $XFree86$
  */
 static char * card_xpm[] = {
 "60 28 5 1",
diff --git a/hw/xfree86/utils/xorgcfg/loader.c b/hw/xfree86/utils/xorgcfg/loader.c
index fb3d3f5fc..1b615e2e5 100644
--- a/hw/xfree86/utils/xorgcfg/loader.c
+++ b/hw/xfree86/utils/xorgcfg/loader.c
@@ -26,7 +26,8 @@
  *
  * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
  *
- * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/loader.c,v 1.20 2003/12/17 17:45:33 dawes Exp $
+ * $XdotOrg$
+ * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/loader.c,v 1.19 2002/06/06 21:03:32 paulo Exp $
  */
 
 #include "config.h"
@@ -187,8 +188,7 @@ LoaderInitializeOptions(void)
 	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"
@@ -206,7 +206,7 @@ LoaderInitializeOptions(void)
 	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"
diff --git a/hw/xfree86/utils/xorgcfg/loader.h b/hw/xfree86/utils/xorgcfg/loader.h
index 1a4702020..3ba5b937a 100644
--- a/hw/xfree86/utils/xorgcfg/loader.h
+++ b/hw/xfree86/utils/xorgcfg/loader.h
@@ -26,7 +26,7 @@
  *
  * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
  *
- * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/loader.h,v 1.8 2004/03/05 16:04:59 tsi Exp $
+ * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/loader.h,v 1.6 2001/07/07 01:43:58 paulo Exp $
  */
 
 #ifdef USE_MODULES
@@ -75,7 +75,7 @@ typedef union {
     unsigned long       num;
     char *              str;
     double              realnum;
-    Bool		flag;
+    Bool		bool;
     OptFrequency	freq;
 } ValueUnion;
 
diff --git a/hw/xfree86/utils/xorgcfg/loadmod.c b/hw/xfree86/utils/xorgcfg/loadmod.c
index e3f4e9f47..5dfbe442b 100644
--- a/hw/xfree86/utils/xorgcfg/loadmod.c
+++ b/hw/xfree86/utils/xorgcfg/loadmod.c
@@ -26,7 +26,7 @@
  *
  * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
  *
- * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/loadmod.c,v 1.18 2003/06/12 14:12:38 eich Exp $
+ * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/loadmod.c,v 1.16 2003/03/12 16:40:28 tsi Exp $
  */
 
 #ifdef USE_MODULES
@@ -182,7 +182,7 @@ LOOKUP xfree86LookupTab[] = {
    SYMFUNC(xf86memchr)
    SYMFUNC(xf86memcmp)
    SYMFUNC(xf86memcpy)
-#if (defined(__powerpc__) && (defined(Lynx) || defined(linux))) || defined(__sparc__) || defined(__ia64__) || defined (__AMD64__)
+#if (defined(__powerpc__) && (defined(Lynx) || defined(linux))) || defined(__sparc__) || defined(__ia64__) || defined (__amd64__)
    /*
     * Some PPC, SPARC, and IA64 compilers generate calls to memcpy to handle
     * structure copies.  This causes a problem both here and in shared
diff --git a/hw/xfree86/utils/xorgcfg/monitor-cfg.c b/hw/xfree86/utils/xorgcfg/monitor-cfg.c
index 6ed095416..04def80e2 100644
--- a/hw/xfree86/utils/xorgcfg/monitor-cfg.c
+++ b/hw/xfree86/utils/xorgcfg/monitor-cfg.c
@@ -26,7 +26,7 @@
  *
  * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
  *
- * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/monitor-cfg.c,v 1.8 2003/09/11 10:08:38 eich Exp $
+ * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/monitor-cfg.c,v 1.6 2001/02/21 23:37:03 paulo Exp $
  */
 
 #include "xf86config.h"
diff --git a/hw/xfree86/utils/xorgcfg/monitor-cfg.h b/hw/xfree86/utils/xorgcfg/monitor-cfg.h
index 03ca18a41..b7b16e15b 100644
--- a/hw/xfree86/utils/xorgcfg/monitor-cfg.h
+++ b/hw/xfree86/utils/xorgcfg/monitor-cfg.h
@@ -26,7 +26,7 @@
  *
  * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
  *
- * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/monitor-cfg.h,v 1.3 2000/11/30 20:55:18 paulo Exp $
+ * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/monitor-cfg.h,v 1.1 2000/04/04 22:37:00 dawes Exp $
  */
 
 #include "config.h"
diff --git a/hw/xfree86/utils/xorgcfg/monitor.xbm b/hw/xfree86/utils/xorgcfg/monitor.xbm
index c4b01eb74..972388a92 100644
--- a/hw/xfree86/utils/xorgcfg/monitor.xbm
+++ b/hw/xfree86/utils/xorgcfg/monitor.xbm
@@ -26,7 +26,7 @@
  *
  * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
  *
- * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/monitor.xbm,v 1.1 2000/04/04 22:37:00 dawes Exp $
+ * $XFree86$
  */
 #define monitor_width 50
 #define monitor_height 44
diff --git a/hw/xfree86/utils/xorgcfg/monitor.xpm b/hw/xfree86/utils/xorgcfg/monitor.xpm
index c694edf2e..e647e3cc1 100644
--- a/hw/xfree86/utils/xorgcfg/monitor.xpm
+++ b/hw/xfree86/utils/xorgcfg/monitor.xpm
@@ -27,7 +27,7 @@
  *
  * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
  *
- * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/monitor.xpm,v 1.1 2000/04/04 22:37:00 dawes Exp $
+ * $XFree86$
  */
 static char * monitor_xpm[] = {
 "47 40 6 1",
diff --git a/hw/xfree86/utils/xorgcfg/mouse-cfg.c b/hw/xfree86/utils/xorgcfg/mouse-cfg.c
index 17a1c0caf..779f21130 100644
--- a/hw/xfree86/utils/xorgcfg/mouse-cfg.c
+++ b/hw/xfree86/utils/xorgcfg/mouse-cfg.c
@@ -26,7 +26,7 @@
  *
  * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
  *
- * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/mouse-cfg.c,v 1.12 2003/11/03 05:11:58 tsi Exp $
+ * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/mouse-cfg.c,v 1.11tsi Exp $
  */
 
 #include "xf86config.h"
diff --git a/hw/xfree86/utils/xorgcfg/mouse-cfg.h b/hw/xfree86/utils/xorgcfg/mouse-cfg.h
index 249f50840..6c67d9d5e 100644
--- a/hw/xfree86/utils/xorgcfg/mouse-cfg.h
+++ b/hw/xfree86/utils/xorgcfg/mouse-cfg.h
@@ -26,7 +26,7 @@
  *
  * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
  *
- * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/mouse-cfg.h,v 1.1 2000/04/04 22:37:00 dawes Exp $
+ * $XFree86$
  */
 
 #include "config.h"
diff --git a/hw/xfree86/utils/xorgcfg/mouse.xbm b/hw/xfree86/utils/xorgcfg/mouse.xbm
index 8577137e6..3f6bce72f 100644
--- a/hw/xfree86/utils/xorgcfg/mouse.xbm
+++ b/hw/xfree86/utils/xorgcfg/mouse.xbm
@@ -26,7 +26,7 @@
  *
  * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
  *
- * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/mouse.xbm,v 1.1 2000/04/04 22:37:01 dawes Exp $
+ * $XFree86$
  */
 #define mouse_width 50
 #define mouse_height 44
diff --git a/hw/xfree86/utils/xorgcfg/mouse.xpm b/hw/xfree86/utils/xorgcfg/mouse.xpm
index 7ad21fb8f..ea157c266 100644
--- a/hw/xfree86/utils/xorgcfg/mouse.xpm
+++ b/hw/xfree86/utils/xorgcfg/mouse.xpm
@@ -27,7 +27,7 @@
  *
  * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
  *
- * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/mouse.xpm,v 1.1 2000/04/04 22:37:01 dawes Exp $
+ * $XFree86$
  */
 static char * mouse_xpm[] = {
 "26 35 8 1",
diff --git a/hw/xfree86/utils/xorgcfg/options.c b/hw/xfree86/utils/xorgcfg/options.c
index 10828a94a..8aa9a09a8 100644
--- a/hw/xfree86/utils/xorgcfg/options.c
+++ b/hw/xfree86/utils/xorgcfg/options.c
@@ -26,7 +26,7 @@
  *
  * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
  *
- * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/options.c,v 1.12 2001/11/03 20:32:31 paulo Exp $
+ * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/options.c,v 1.11 2001/10/28 03:34:08 tsi Exp $
  */
 
 #include "options.h"
diff --git a/hw/xfree86/utils/xorgcfg/options.h b/hw/xfree86/utils/xorgcfg/options.h
index a90072607..4194593d1 100644
--- a/hw/xfree86/utils/xorgcfg/options.h
+++ b/hw/xfree86/utils/xorgcfg/options.h
@@ -26,7 +26,7 @@
  *
  * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
  *
- * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/options.h,v 1.7 2001/07/06 02:04:10 paulo Exp $
+ * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/options.h,v 1.6 2001/06/01 18:43:50 tsi Exp $
  */
 
 #include "config.h"
diff --git a/hw/xfree86/utils/xorgcfg/screen-cfg.c b/hw/xfree86/utils/xorgcfg/screen-cfg.c
index 9390afc6d..26e675a8f 100644
--- a/hw/xfree86/utils/xorgcfg/screen-cfg.c
+++ b/hw/xfree86/utils/xorgcfg/screen-cfg.c
@@ -26,7 +26,7 @@
  *
  * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
  *
- * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/screen-cfg.c,v 1.14 2003/11/03 05:11:58 tsi Exp $
+ * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/screen-cfg.c,v 1.13tsi Exp $
  */
 
 #include "xf86config.h"
diff --git a/hw/xfree86/utils/xorgcfg/screen-cfg.h b/hw/xfree86/utils/xorgcfg/screen-cfg.h
index a152f6188..c7174b626 100644
--- a/hw/xfree86/utils/xorgcfg/screen-cfg.h
+++ b/hw/xfree86/utils/xorgcfg/screen-cfg.h
@@ -26,7 +26,7 @@
  *
  * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
  *
- * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/screen-cfg.h,v 1.2 2000/05/18 16:29:59 dawes Exp $
+ * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/screen-cfg.h,v 1.1 2000/04/04 22:37:02 dawes Exp $
  */
 
 #include "config.h"
diff --git a/hw/xfree86/utils/xorgcfg/screen.c b/hw/xfree86/utils/xorgcfg/screen.c
index 25fd5f290..80f4235af 100644
--- a/hw/xfree86/utils/xorgcfg/screen.c
+++ b/hw/xfree86/utils/xorgcfg/screen.c
@@ -26,7 +26,7 @@
  *
  * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
  *
- * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/screen.c,v 1.9 2002/06/06 21:03:32 paulo Exp $
+ * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/screen.c,v 1.8 2001/10/28 03:34:08 tsi Exp $
  */
 
 #include <X11/IntrinsicP.h>
diff --git a/hw/xfree86/utils/xorgcfg/screen.h b/hw/xfree86/utils/xorgcfg/screen.h
index 7c3e2c75f..624d87b96 100644
--- a/hw/xfree86/utils/xorgcfg/screen.h
+++ b/hw/xfree86/utils/xorgcfg/screen.h
@@ -26,7 +26,7 @@
  *
  * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
  *
- * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/screen.h,v 1.3 2000/12/01 18:31:07 paulo Exp $
+ * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/screen.h,v 1.1 2000/04/04 22:37:02 dawes Exp $
  */
 
 #include "xf86config.h"
diff --git a/hw/xfree86/utils/xorgcfg/startx.c b/hw/xfree86/utils/xorgcfg/startx.c
index 23b0ecf5a..9b70b70fd 100644
--- a/hw/xfree86/utils/xorgcfg/startx.c
+++ b/hw/xfree86/utils/xorgcfg/startx.c
@@ -26,7 +26,7 @@
  *
  * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
  *
- * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/startx.c,v 1.8 2002/10/19 20:04:21 herrb Exp $
+ * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/startx.c,v 1.7 2002/01/07 20:38:29 dawes Exp $
  */
 
 #include "config.h"
@@ -64,10 +64,10 @@ startx(void)
 	 */
 	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 @@ startx(void)
 	    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 @@ startx(void)
 	    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);
diff --git a/hw/xfree86/utils/xorgcfg/stubs.c b/hw/xfree86/utils/xorgcfg/stubs.c
index 6496bc868..702851077 100644
--- a/hw/xfree86/utils/xorgcfg/stubs.c
+++ b/hw/xfree86/utils/xorgcfg/stubs.c
@@ -26,7 +26,7 @@
  *
  * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
  *
- * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/stubs.c,v 1.4 2003/03/25 04:18:25 dawes Exp $
+ * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/stubs.c,v 1.3 2002/11/09 11:12:53 herrb Exp $
  */
 
 #include <stdio.h>
diff --git a/hw/xfree86/utils/xorgcfg/stubs.h b/hw/xfree86/utils/xorgcfg/stubs.h
index d554ac17a..e9cfbe2e0 100644
--- a/hw/xfree86/utils/xorgcfg/stubs.h
+++ b/hw/xfree86/utils/xorgcfg/stubs.h
@@ -26,7 +26,7 @@
  *
  * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
  *
- * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/stubs.h,v 1.3 2001/08/01 00:44:57 tsi Exp $
+ * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/stubs.h,v 1.2 2000/10/23 21:16:52 tsi Exp $
  */
 
 #ifndef _xf86cfg_stubs_h
diff --git a/hw/xfree86/utils/xorgcfg/text-mode.c b/hw/xfree86/utils/xorgcfg/text-mode.c
index 2011d1abd..73d9a2248 100644
--- a/hw/xfree86/utils/xorgcfg/text-mode.c
+++ b/hw/xfree86/utils/xorgcfg/text-mode.c
@@ -26,7 +26,7 @@
  *
  * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
  *
- * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/text-mode.c,v 1.26 2003/11/14 02:40:22 dawes Exp $
+ * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/text-mode.c,v 1.25 2003/11/12 00:10:30 dawes Exp $
  */
 
 #include <stdio.h>
@@ -124,7 +124,7 @@ static char *main_menu[] = {
 #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 @@ TextMode(void)
 
 	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 @@ WriteXF86Config(void)
 
     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 @@ KeyboardConfig(void)
 #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) {
diff --git a/hw/xfree86/utils/xorgcfg/vidmode.c b/hw/xfree86/utils/xorgcfg/vidmode.c
index 3a51310d9..595abf419 100644
--- a/hw/xfree86/utils/xorgcfg/vidmode.c
+++ b/hw/xfree86/utils/xorgcfg/vidmode.c
@@ -26,7 +26,7 @@
  *
  * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
  *
- * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/vidmode.c,v 1.8 2003/11/03 05:11:58 tsi Exp $
+ * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/vidmode.c,v 1.7tsi Exp $
  */
 
 /*
diff --git a/hw/xfree86/utils/xorgcfg/vidmode.h b/hw/xfree86/utils/xorgcfg/vidmode.h
index e445517cd..8cdc4dc92 100644
--- a/hw/xfree86/utils/xorgcfg/vidmode.h
+++ b/hw/xfree86/utils/xorgcfg/vidmode.h
@@ -26,7 +26,7 @@
  *
  * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
  *
- * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/vidmode.h,v 1.3 2001/07/07 23:00:43 paulo Exp $
+ * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/vidmode.h,v 1.1 2000/05/18 16:30:00 dawes Exp $
  */
 
 #ifndef _xf86cfg_vidmode_h
diff --git a/hw/xfree86/utils/xorgcfg/xf86config.c b/hw/xfree86/utils/xorgcfg/xf86config.c
index cb4054a5e..6d93afe34 100644
--- a/hw/xfree86/utils/xorgcfg/xf86config.c
+++ b/hw/xfree86/utils/xorgcfg/xf86config.c
@@ -24,9 +24,9 @@
  * dealings in this Software without prior written authorization from
  * Conectiva Linux.
  *
- * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
+ * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
  *
- * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/xf86config.c,v 1.6 2003/11/03 05:11:59 tsi Exp $
+ * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/xf86config.c,v 1.5tsi Exp $
  */
 
 #include "xf86config.h"
diff --git a/hw/xfree86/utils/xorgcfg/xf86config.h b/hw/xfree86/utils/xorgcfg/xf86config.h
index 575c3c9d0..1095246b7 100644
--- a/hw/xfree86/utils/xorgcfg/xf86config.h
+++ b/hw/xfree86/utils/xorgcfg/xf86config.h
@@ -26,7 +26,7 @@
  *
  * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
  *
- * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/xf86config.h,v 1.4 2000/11/30 20:55:18 paulo Exp $
+ * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/xf86config.h,v 1.2 2000/05/18 16:30:01 dawes Exp $
  */
 
 #include "config.h"
diff --git a/hw/xfree86/utils/xorgcfg/xorgcfg.man.pre b/hw/xfree86/utils/xorgcfg/xorgcfg.man.pre
new file mode 100644
index 000000000..bade75d42
--- /dev/null
+++ b/hw/xfree86/utils/xorgcfg/xorgcfg.man.pre
@@ -0,0 +1,152 @@
+.\"
+.\" 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@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@conectiva.com.br>\fP
+originally for The XFree86 Project.
+
+.SH BUGS
+Probably.
diff --git a/hw/xfree86/utils/xorgconfig/Cards b/hw/xfree86/utils/xorgconfig/Cards
index 83d8840ea..f6ce99cf5 100644
--- a/hw/xfree86/utils/xorgconfig/Cards
+++ b/hw/xfree86/utils/xorgconfig/Cards
@@ -18,7 +18,7 @@
 # The majority of entries are just a binding of a model name to a
 # chipset/server and untested.
 #
-# $XFree86: xc/programs/Xserver/hw/xfree86/xf86config/Cards,v 3.80 2002/11/18 05:24:19 paulo Exp $
+# $XFree86: xc/programs/Xserver/hw/xfree86/xf86config/Cards,v 3.79 2002/10/16 01:31:05 dawes Exp $
 
 # VGA
 
@@ -2979,7 +2979,7 @@ NOCLOCKPROBE
 
 NAME Appian Jeronimo 2000
 CHIPSET PERMEDIA 3
-SERVER XFree86
+SERVER 3DLabs
 DRIVER glint
 NOCLOCKPROBE
 
diff --git a/hw/xfree86/utils/xorgconfig/Cards98 b/hw/xfree86/utils/xorgconfig/Cards98
index cfd96dc16..ef14a0345 100644
--- a/hw/xfree86/utils/xorgconfig/Cards98
+++ b/hw/xfree86/utils/xorgconfig/Cards98
@@ -1,4 +1,4 @@
-# $XFree86: xc/programs/Xserver/hw/xfree86/xf86config/Cards98,v 1.1 1999/07/11 10:50:41 dawes Exp $
+# $XFree86: xc/programs/Xserver/hw/xfree98/xf86config/Cards98,v 1.7 1998/06/04 16:43:45 hohndel Exp $
 #
 #
 #
diff --git a/hw/xfree86/utils/xorgconfig/cards.c b/hw/xfree86/utils/xorgconfig/cards.c
index 8aac06606..d5f405f4a 100644
--- a/hw/xfree86/utils/xorgconfig/cards.c
+++ b/hw/xfree86/utils/xorgconfig/cards.c
@@ -4,7 +4,7 @@
 
 
 
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf86config/cards.c,v 3.17 2002/05/31 18:46:04 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xf86config/cards.c,v 3.16 2001/07/25 15:05:09 dawes Exp $ */
 
 /*
  *  Functions to manipulate card database.
diff --git a/hw/xfree86/utils/xorgconfig/cards.h b/hw/xfree86/utils/xorgconfig/cards.h
index c5299e899..1d9892491 100644
--- a/hw/xfree86/utils/xorgconfig/cards.h
+++ b/hw/xfree86/utils/xorgconfig/cards.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf86config/cards.h,v 3.5 1999/07/05 12:12:06 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xf86config/cards.h,v 3.4 1999/03/28 15:33:07 dawes Exp $ */
 
 
 
diff --git a/hw/xfree86/utils/xorgconfig/xorgconfig.c b/hw/xfree86/utils/xorgconfig/xorgconfig.c
new file mode 100644
index 000000000..7f4c18d6a
--- /dev/null
+++ b/hw/xfree86/utils/xorgconfig/xorgconfig.c
@@ -0,0 +1,2906 @@
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xf86config/xf86config.c,v 3.69 2003/02/20 04:05:15 dawes Exp $ */
+
+/*
+ * This is a configuration program that will create a base XF86Config
+ * file based on menu choices. Its main feature is that clueless users
+ * may be less inclined to select crazy sync rates way over monitor spec,
+ * by presenting a menu with standard monitor types. Also some people
+ * don't read docs unless an executable that they can run tells them to.
+ *
+ * It assumes a 24-line or bigger text console.
+ *
+ * Revision history:
+ * 25Sep94 Initial version.
+ * 27Sep94 Fix hsync range of monitor types to match with best possible mode.
+ *         Remove 'const'.
+ *         Tweak descriptions.
+ * 28Sep94 Fixes from J"org Wunsch:
+ *           Don't use gets().
+ *           Add mouse device prompt.
+ *           Fix lines overrun for 24-line console.
+ *         Increase buffer size for probeonly output.
+ * 29Sep94 Fix bad bug with old XF86Config preserving during probeonly run.
+ *         Add note about vertical refresh in interlaced modes.
+ *         Name gets() replacement getstring().
+ *         Add warning about binary paths.
+ *         Fixes from David Dawes:
+ *           Don't use 'ln -sf'.
+ *           Omit man path reference in comment.
+ *           Generate only a generic 320x200 SVGA section for accel cards.
+ *	     Only allow writing to /usr/X11R6/lib/X11 if root, and use
+ *	       -xf86config for the -probeonly phase (root only).
+ *         Fix bug that forces screen type to accel in some cases.
+ * 30Sep94 Continue after clocks probe fails.
+ *         Note about programmable clocks.
+ *         Rename to 'xf86config'. Not to be confused with XF86Config
+ *           or the -xf86config option.
+ * 07Oct94 Correct hsync in standard mode timings comments, and include
+ *           the proper +/-h/vsync flags.
+ * 11Oct94 Skip 'numclocks:' and 'pixel clocks:' lines when probing for
+ * 	     clocks.
+ * 18Oct94 Add check for existence of /usr/X11R6.
+ *	   Add note about ctrl-alt-backspace.
+ * 06Nov94 Add comment above standard mode timings in XF86Config.
+ * 24Dec94 Add low-resolution modes using doublescan.
+ * 29Dec94 Add note in horizontal sync range selection.
+ *	   Ask about ClearDTR/RTS option for Mouse Systems mice.
+ *	   Ask about writing to /etc/XF86Config.
+ *	   Allow link to be set in /var/X11R6/bin.
+ *	   Note about X -probeonly crashing.
+ *	   Add keyboard Alt binding option for non-ASCII characters.
+ *	   Add card database selection.
+ *	   Write temporary XF86Config for clock probing in /tmp instead
+ *	     of /usr/X11R6/lib/X11.
+ *	   Add RAMDAC and Clockchip menu.
+ * 27Mar99 Modified for XFree86 4.0 config file format
+ * 06Sep02 Write comment block about 'DontVTSwitch'.
+ *
+ * Possible enhancements:
+ * - Add more standard mode timings (also applies to README.Config). Missing
+ *   are 1024x768 @ 72 Hz, 1152x900 modes, and 1280x1024 @ ~70 Hz.
+ *   I suspect there is a VESA standard for 1024x768 @ 72 Hz with 77 MHz dot
+ *   clock, and 1024x768 @ 75 Hz with 78.7 MHz dot clock. New types of
+ *   monitors probably work better with VESA 75 Hz timings.
+ * - Add option for creation of clear, minimal XF86Config.
+ * - The card database doesn't include most of the entries in previous
+ *   databases.
+ *
+ * Send comments to H.Hanemaayer@inter.nl.net.
+ *
+ * Things to keep up-to-date:
+ * - Accelerated server names.
+ * - Ramdac and Clockchip settings.
+ * - The card database.
+ *
+ */
+/*  Oct2000
+ *  New 'Configuration of XKB' section.
+ *  Author: Ivan Pascal      The XFree86 Project.
+ */
+/*
+ *  Nov2002
+ *  Some enhancements:
+ *  - Add new PS/2 mouse protocol.
+ *    "IMPS/2","ExplorerPS/2","ThinkingMousePS/2","MouseManPlusPS/2",
+ *    "GlidePointPS/2","NetMousePS/2" and "NetScrollPS/2".
+ *  - Add mouse-speed setting for PS/2 mouse.
+ *  - Fix seg.fault problem on Solaris.
+ *  - Add modestring "1400x1050"(for ATI Mobile-Rage).
+ *  - Add videomemory 8192, 16384, 32768, 65536, 131072 and 262144.
+ *  - Load "speedo" module.
+ *  - Ready to DRI.
+ *  - Load xtt module instead of freetype module.
+ *  - Add font path "/fonts/TrueType/" and "/fonts/freefont/".
+ *  Chisato Yamauchi(cyamauch@phyas.aichi-edu.ac.jp)
+ */
+/* $XConsortium: xf86config.c /main/21 1996/10/28 05:43:57 kaleb $ */
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <ctype.h>
+#include <string.h>
+#include <unistd.h>
+#include <errno.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+
+/* hv: fix a few EMX problems, will disappear with real UnixOS/2 */
+#ifdef __UNIXOS2__
+#define sync() /*nothing*/
+static int getuid() { return 0; }
+#endif
+
+
+#include <X11/Xlib.h>
+#include <X11/extensions/XKBstr.h>
+#include <X11/extensions/XKBrules.h>
+#define MAX_XKBOPTIONS	5
+
+#include "cards.h"
+
+
+/*
+ * Define the following to 310 to remove references to XFree86 features that
+ * have been added since XFree86 3.1 (e.g. DoubleScan modes).
+ * or to 311 to remove certain new modelines
+ */
+#define XFREE86_VERSION 400
+
+/*
+ * This is the filename of the temporary XF86Config file that is written
+ * when the program is told to probe clocks (which can only happen for
+ * root).
+ */
+#define TEMPORARY_XF86CONFIG_DIR_PREFIX "/tmp/.xf86config"
+#define TEMPORARY_XF86CONFIG_FILENAME "XF86Config.tmp"
+
+/*
+ * Define this to have /etc/X11/XF86Config prompted for as the default
+ * location to write the XF86Config file to.
+ */
+#define PREFER_XF86CONFIG_IN_ETC
+
+/*
+ * Define this to force the user to go through XKB configuration section.
+ *
+ */
+#define FORCE_XKB_DIALOG
+
+/*
+ * Configuration variables.
+ */
+
+#define MAX_CLOCKS_LINES 16
+
+#define DUMBCONFIG2 "dumbconfig.2"
+#define DUMBCONFIG3 "dumbconfig.3"
+#ifndef __UNIXOS2__
+#define XSERVERNAME_FOR_PROBE "X"
+#else
+#define XSERVERNAME_FOR_PROBE "/usr/X11R6/bin/"__XSERVERNAME__
+#endif
+
+/* some more vars to make path names in texts more flexible. OS/2 users
+ * may be more irritated than Unix users
+ */
+#ifndef PROJECTROOT
+#define PROJECTROOT		"/usr/X11R6"
+#endif
+#define TREEROOT		PROJECTROOT
+#define TREEROOTLX		TREEROOT "/lib/X11"
+#define TREEROOTCFG		TREEROOT "/etc/X11"
+#define MODULEPATH		TREEROOT "/lib/modules"
+
+#ifndef XCONFIGFILE
+#define XCONFIGFILE		"XF86Config"
+#endif
+#define CONFIGNAME		XCONFIGFILE
+
+#ifndef XF86_VERSION_MAJOR
+#ifdef XVERSION
+#if XVERSION > 40000000
+#define XF86_VERSION_MAJOR	(XVERSION / 10000000)
+#else
+#define XF86_VERSION_MAJOR	(XVERSION / 1000)
+#endif
+#else
+#define XF86_VERSION_MAJOR	4
+#endif
+#endif
+
+
+int config_mousetype;		/* Mouse. */
+int config_emulate3buttons;
+int config_chordmiddle;
+int config_cleardtrrts;
+char *config_pointerdevice;
+int config_altmeta;		/* Keyboard. */
+int config_monitortype;		/* Monitor. */
+char *config_hsyncrange;
+char *config_vsyncrange;
+char *config_monitoridentifier;
+int config_videomemory;		/* Video card. */
+int config_screentype;		/* mono, vga16, svga, accel */
+char *config_deviceidentifier;
+int config_numberofclockslines;
+char *config_clocksline[MAX_CLOCKS_LINES];
+char *config_modesline8bpp;
+char *config_modesline16bpp;
+char *config_modesline24bpp;
+int config_virtual;		/* 1 (yes) or 0 (no) */
+int config_virtualx8bpp, config_virtualy8bpp;
+int config_virtualx16bpp, config_virtualy16bpp;
+int config_virtualx24bpp, config_virtualy24bpp;
+char *config_ramdac;
+char *config_dacspeed;
+char *config_clockchip;
+#if defined(__OpenBSD__) && defined(WSCONS_SUPPORT) && !defined(PCVT_SUPPORT)
+char *config_keyboard_dev = "/dev/wskbd0";
+#endif
+int config_xkbdisable = 0;
+char *config_xkbrules;
+char *config_xkbmodel = "pc101";
+char *config_xkblayout = "us";
+char *config_xkbvariant = (char *) 0;
+char *config_xkboptions = (char *) 0;
+char *config_depth;
+
+char *temp_dir = "";
+
+/*
+ * These are from the selected card definition. Parameters from the
+ * definition are offered during the questioning about the video card.
+ */
+
+int card_selected;	/* Card selected from database. */
+
+
+static void write_XF86Config(char *filename);
+
+
+/*
+ * This is the initial intro text that appears when the program is started.
+ */
+
+static char *intro_text =
+"\n"
+"This program will create a basic " CONFIGNAME " file, based on menu selections you\n"
+"make.\n"
+"\n"
+"The " CONFIGNAME " file usually resides in " TREEROOTCFG " or /etc/X11. A sample\n"
+CONFIGNAME " file is supplied with "__XSERVERNAME__"; it is configured for a standard\n"
+"VGA card and monitor with 640x480 resolution. This program will ask for a\n"
+"pathname when it is ready to write the file.\n"
+"\n"
+"You can either take the sample " CONFIGNAME " as a base and edit it for your\n"
+"configuration, or let this program produce a base " CONFIGNAME " file for your\n"
+"configuration and fine-tune it.\n"
+#if 0
+" Refer to " TREEROOTLX "/doc/README.Config\n"
+"for a detailed overview of the configuration process.\n"
+"\n"
+"(what should we change this section to?)\n"
+"For accelerated servers (including accelerated drivers in the SVGA server),\n"
+"there are many chipset and card-specific options and settings. This program\n"
+"does not know about these. On some configurations some of these settings must\n"
+"be specified. Refer to the server man pages and chipset-specific READMEs.\n"
+#endif
+"\n"
+"Before continuing with this program, make sure you know what video card\n"
+"you have, and preferably also the chipset it uses and the amount of video\n"
+"memory on your video card. SuperProbe may be able to help with this.\n"
+"\n"
+;
+
+static char *finalcomment_text =
+"File has been written. Take a look at it before running 'startx'. Note that\n"
+"the " CONFIGNAME " file must be in one of the directories searched by the server\n"
+"(e.g. /etc/X11) in order to be used. Within the server press\n"
+"ctrl, alt and '+' simultaneously to cycle video resolutions. Pressing ctrl,\n"
+"alt and backspace simultaneously immediately exits the server (use if\n"
+"the monitor doesn't sync for a particular mode).\n"
+"\n"
+"For further configuration, refer to the " XCONFIGFILE "(5) manual page.\n"
+"\n";
+
+static void *
+Malloc(int i) {
+       void *p;
+
+       p = malloc(i);
+       if (p == NULL) {
+               printf("Fatal malloc error\n");
+               exit(-1);
+       }
+       return p;
+}
+
+static char *
+Strdup(const char *s){
+	char *d;
+
+	d = Malloc(strlen(s) + 1);
+	strcpy(d, s);
+	return d;
+}
+
+static void 
+createtmpdir(void) {
+       /* length of prefix + 20 (digits in 2**64) + 1 (slash) + 1 */
+       temp_dir = Malloc(strlen(TEMPORARY_XF86CONFIG_DIR_PREFIX) + 22);
+       sprintf(temp_dir, "%s%ld", TEMPORARY_XF86CONFIG_DIR_PREFIX,
+	       (long)getpid());
+       if (mkdir(temp_dir, 0700) != 0) {
+               printf("Cannot create directory %s\n", temp_dir);
+               exit(-1);
+       }
+       /* append a slash */
+       strcat(temp_dir, "/");
+}
+
+
+void 
+keypress(void) {
+	printf("Press enter to continue, or ctrl-c to abort.");
+	getchar();
+	printf("\n");
+}
+
+static void 
+emptylines(void) {
+	int i;
+	for (i = 0; i < 50; i++)
+		printf("\n");
+}
+
+static int 
+answerisyes(char *s)
+{
+	if (s[0] == '\'')	/* For fools that type the ' literally. */
+		return tolower(s[1]) == 'y';
+	return tolower(s[0]) == 'y';
+}
+
+/*
+ * This is a replacement for gets(). Limit is 80 chars.
+ * The 386BSD descendants scream about using gets(), for good reason.
+ */
+
+static void 
+getstring(char *s)
+{
+	char *cp;
+	if (fgets(s, 80, stdin) == NULL)
+		exit(1);
+	cp = strchr(s, '\n');
+	if (cp)
+		*cp=0;
+}
+
+/*
+ * Mouse configuration.
+ *
+ * (hv) OS/2 (__UNIXOS2__) only has an OS supported mouse, so user has no options
+ * the server will enable a third button automatically if there is one
+ * We also do the same for QNX4, since we use the OS mouse drivers.
+ */
+
+int	M_OSMOUSE,	M_WSMOUSE,		M_AUTO,
+	M_SYSMOUSE,	M_MOUSESYSTEMS, 	M_PS2,
+	M_MICROSOFT,	M_BUSMOUSE,		M_IMPS2,
+	M_EXPLORER_PS2, M_GLIDEPOINT_PS2,	M_MOUSEMANPLUS_PS2,
+	M_NETMOUSE_PS2, M_NETSCROLL_PS2,	M_THINKINGMOUSE_PS2,
+	M_ACECAD,	M_GLIDEPOINT,		M_INTELLIMOUSE,
+	M_LOGITECH,	M_MMHITTAB,		M_MMSERIES,
+	M_MOUSEMAN,	M_THINKINGMOUSE;
+
+struct {
+	char *name;
+	int *ident;
+	char *desc;
+} mouse_info[] = {
+#if defined(__UNIXOS2__) || defined(QNX4)
+#define DEF_PROTO_STRING	"OSMOUSE"
+	{"OSMOUSE",		&M_OSMOUSE,
+	 "OSMOUSE"
+	},
+#endif
+#ifdef WSCONS_SUPPORT
+#define WS_MOUSE_STRING		"wsmouse"
+#define DEF_PROTO_STRING	WS_MOUSE_STRING
+	{WS_MOUSE_STRING,	&M_WSMOUSE,
+	 "wsmouse protocol"
+	},
+#endif
+#ifndef DEF_PROTO_STRING
+#define DEF_PROTO_STRING	"Auto"
+#endif
+	{"Auto",		&M_AUTO,
+	 "Auto detect"
+	},
+	{"SysMouse",		&M_SYSMOUSE,
+	 "SysMouse"
+	},
+#define M_MOUSESYSTEMS_STRING	"MouseSystems"
+	{M_MOUSESYSTEMS_STRING,	&M_MOUSESYSTEMS,
+	 "Mouse Systems (3-button protocol)"
+	},
+	{"PS/2",		&M_PS2,
+	 "PS/2 Mouse"
+	},
+#define M_MICROSOFT_STRING	"Microsoft"
+	{M_MICROSOFT_STRING,	&M_MICROSOFT,
+	 "Microsoft compatible (2-button protocol)"
+	},
+	{"Busmouse",		&M_BUSMOUSE,
+	 "Bus Mouse"
+	},
+#ifndef __FreeBSD__
+	{"IMPS/2",		&M_IMPS2,
+	 "IntelliMouse PS/2"
+	},
+	{"ExplorerPS/2",	&M_EXPLORER_PS2,
+	 "Explorer PS/2"
+	},
+	{"GlidePointPS/2",	&M_GLIDEPOINT_PS2,
+	 "GlidePoint PS/2"
+	},
+	{"MouseManPlusPS/2",	&M_MOUSEMANPLUS_PS2,
+	 "MouseManPlus PS/2"
+	},
+	{"NetMousePS/2",	&M_NETMOUSE_PS2,
+	 "NetMouse PS/2"
+	},
+	{"NetScrollPS/2",	&M_NETSCROLL_PS2,
+	 "NetScroll PS/2"
+	},
+	{"ThinkingMousePS/2",	&M_THINKINGMOUSE_PS2,
+	 "ThinkingMouse PS/2"
+	},
+#endif
+	{"AceCad",		&M_ACECAD,
+	 "AceCad"
+	},
+	{"GlidePoint",		&M_GLIDEPOINT,
+	 "GlidePoint"
+	},
+	{"IntelliMouse",	&M_INTELLIMOUSE,
+	 "Microsoft IntelliMouse"
+	},
+	{"Logitech",		&M_LOGITECH,
+	 "Logitech Mouse (serial, old type, Logitech protocol)"
+	},
+	{"MMHitTab",		&M_MMHITTAB,
+	 "MM HitTablet"
+	},
+	{"MMSeries",		&M_MMSERIES,
+	 "MM Series"	/* XXXX These descriptions should be improved. */
+	},
+	{"MouseMan",		&M_MOUSEMAN,
+	 "Logitech MouseMan (Microsoft compatible)"
+	},
+	{"ThinkingMouse",	&M_THINKINGMOUSE,
+	 "ThinkingMouse"
+	},
+};
+
+#ifndef __UNIXOS2__
+static char *mouseintro_text =
+"First specify a mouse protocol type. Choose one from the following list:\n"
+"\n";
+
+static char *mousedev_text =
+"Now give the full device name that the mouse is connected to, for example\n"
+"/dev/tty00. Just pressing enter will use the default, /dev/mouse.\n"
+#ifdef WSCONS_SUPPORT
+"On systems with wscons, the default is /dev/wsmouse.\n"
+#endif
+#ifdef __FreeBSD__
+"On FreeBSD, the default is /dev/sysmouse.\n"
+#endif
+"\n";
+
+static char *mousecomment_text =
+"The recommended protocol is " DEF_PROTO_STRING ". If you have a very old mouse\n"
+"or don't want OS support or auto detection, and you have a two-button\n"
+"or three-button serial mouse, it is most likely of type " M_MICROSOFT_STRING ".\n"
+#ifdef WSCONS_SUPPORT
+"\n"
+"If your system uses the wscons console driver, with a PS/2 type mouse,\n"
+"select " WS_MOUSE_STRING ".\n"
+#endif
+"\n";
+
+static char *twobuttonmousecomment_text =
+"You have selected a two-button mouse protocol. It is recommended that you\n"
+"enable Emulate3Buttons.\n";
+
+static char *threebuttonmousecomment_text =
+"You have selected a three-button mouse protocol. It is recommended that you\n"
+"do not enable Emulate3Buttons, unless the third button doesn't work.\n";
+
+static char *unknownbuttonsmousecomment_text =
+"If your mouse has only two buttons, it is recommended that you enable\n"
+"Emulate3Buttons.\n";
+
+static char *microsoftmousecomment_text =
+"You have selected a Microsoft protocol mouse. If your mouse was made by\n"
+"Logitech, you might want to enable ChordMiddle which could cause the\n"
+"third button to work.\n";
+
+static char *mousesystemscomment_text =
+"You have selected a Mouse Systems protocol mouse. If your mouse is normally\n"
+"in Microsoft-compatible mode, enabling the ClearDTR and ClearRTS options\n"
+"may cause it to switch to Mouse Systems mode when the server starts.\n";
+
+static char *logitechmousecomment_text =
+"You have selected a Logitech protocol mouse. This is only valid for old\n"
+"Logitech mice.\n";
+
+static char *mousemancomment_text =
+"You have selected a Logitech MouseMan type mouse. You might want to enable\n"
+"ChordMiddle which could cause the third button to work.\n";
+
+#endif /* !__UNIXOS2__ */
+
+static void 
+mouse_configuration(void) {
+
+#if !defined(__UNIXOS2__) && !defined(QNX4)
+	int i, j;
+	char s[80];
+
+#define MOUSETYPE_COUNT sizeof(mouse_info)/sizeof(mouse_info[0])
+	for (i = 0; i < MOUSETYPE_COUNT; i++)
+		*(mouse_info[i].ident) = i;
+
+	for (i=0;;) {
+		emptylines();
+		printf("%s", mouseintro_text);
+		for (j = i; j < i + 14 && j < MOUSETYPE_COUNT; j++)
+			printf("%2d.  %s\n", j + 1, mouse_info[j].name);
+		printf("\n");
+		printf("%s", mousecomment_text);
+		printf("Enter a protocol number: ");
+		getstring(s);
+		if (strlen(s) == 0) {
+			i += 14;
+			if (i >= MOUSETYPE_COUNT)
+				i = 0;
+			continue;
+		}
+		config_mousetype = atoi(s) - 1;
+		if (config_mousetype >= 0 && config_mousetype < MOUSETYPE_COUNT)
+			break;
+	}
+	printf("\n");
+
+	if (config_mousetype == M_LOGITECH) {
+		/* Logitech. */
+		printf("%s", logitechmousecomment_text);
+		printf("\n");
+		printf("Please answer the following question with either 'y' or 'n'.\n");
+		printf("Are you sure it's really not a Microsoft compatible one? ");
+		getstring(s);
+		if (!answerisyes(s))
+			config_mousetype = M_MICROSOFT;
+		printf("\n");
+	}
+
+	config_chordmiddle = 0;
+	if (config_mousetype == M_MICROSOFT || config_mousetype == M_MOUSEMAN) {
+		/* Microsoft or MouseMan. */
+		if (config_mousetype == M_MICROSOFT)
+			printf("%s", microsoftmousecomment_text);
+		else
+			printf("%s", mousemancomment_text);
+		printf("\n");
+		printf("Please answer the following question with either 'y' or 'n'.\n");
+		printf("Do you want to enable ChordMiddle? ");
+		getstring(s);
+		if (answerisyes(s))
+			config_chordmiddle = 1;
+		printf("\n");
+	}
+
+	config_cleardtrrts = 0;
+	if (config_mousetype == M_MOUSESYSTEMS) {
+		/* Mouse Systems. */
+		printf("%s", mousesystemscomment_text);
+		printf("\n");
+		printf("Please answer the following question with either 'y' or 'n'.\n");
+		printf("Do you want to enable ClearDTR and ClearRTS? ");
+		getstring(s);
+		if (answerisyes(s))
+			config_cleardtrrts = 1;
+		printf("\n");
+	}
+
+	if (config_mousetype == M_MICROSOFT) {
+		if (config_chordmiddle)
+			printf("%s", threebuttonmousecomment_text);
+		else
+			printf("%s", twobuttonmousecomment_text);
+	}
+	else if (config_mousetype == M_MOUSESYSTEMS ||
+		 config_mousetype == M_INTELLIMOUSE) {
+		printf("%s", threebuttonmousecomment_text);
+	}
+	else {
+		printf("%s", unknownbuttonsmousecomment_text);
+	}
+
+	printf("\n");
+
+	printf("Please answer the following question with either 'y' or 'n'.\n");
+	printf("Do you want to enable Emulate3Buttons? ");
+	getstring(s);
+	if (answerisyes(s))
+		config_emulate3buttons = 1;
+	else
+		config_emulate3buttons = 0;
+	printf("\n");
+
+	printf("%s", mousedev_text);
+	printf("Mouse device: ");
+	getstring(s);
+	if (strlen(s) == 0)
+#ifdef WSCONS_SUPPORT
+		config_pointerdevice = "/dev/wsmouse";
+#elif defined(__FreeBSD__)
+		config_pointerdevice = "/dev/sysmouse";
+#else
+		config_pointerdevice = "/dev/mouse";
+#endif
+	else {
+		config_pointerdevice = Malloc(strlen(s) + 1);
+		strcpy(config_pointerdevice, s);
+       }
+       printf("\n");
+
+#else /* __UNIXOS2__ */
+       	/* set some reasonable defaults for OS/2 */
+       	config_mousetype = M_OSMOUSE;
+	config_chordmiddle = 0;       
+	config_cleardtrrts = 0;
+	config_emulate3buttons = 0;
+#if !defined(QNX4)
+	config_pointerdevice = "OS2MOUSE";
+#else
+	config_pointerdevice = "QNXMOUSE";
+#endif
+#endif /* __UNIXOS2__ */
+}
+
+
+/*
+ * Keyboard configuration.
+ */
+
+/*
+ * Configuration of XKB 
+ */
+static char *xkbmodeltext = 
+"Please select one of the following keyboard types that is the better\n"
+"description of your keyboard. If nothing really matches,\n"
+"choose 1 (Generic 101-key PC)\n\n";
+
+static char *xkblayouttext = 
+"Please select the layout corresponding to your keyboard\n";
+
+static char *xkbvarianttext =
+"Please enter a variant name for '%s' layout. Or just press enter\n"
+"for default variant\n\n";
+
+static char *xkboptionstext = 
+"Please answer the following question with either 'y' or 'n'.\n"
+"Do you want to select additional XKB options (group switcher,\n"
+"group indicator, etc.)? ";
+
+#if defined(__OpenBSD__) && defined(WSCONS_SUPPORT) && !defined(PCVT_SUPPORT)
+static char *kbdevtext =
+"Please enter the device name for your keyboard or just press enter\n"
+"for the default of wskbd0\n\n";
+#endif
+
+static void 
+keyboard_configuration(void)
+{
+	int i, j;
+	char s[80];
+        char *rulesfile;
+	int number, options[MAX_XKBOPTIONS], num_options;
+        XkbRF_RulesPtr rules;
+
+#if defined(__OpenBSD__) && defined(WSCONS_SUPPORT) && !defined(PCVT_SUPPORT)
+	printf(kbdevtext);
+	getstring(s);
+	if (strlen(s) != 0) {
+	    config_keyboard_dev = Malloc(strlen(s) + 1);
+	    strcpy(config_keyboard_dev, s);
+	}
+#endif
+
+#ifdef XFREE98_XKB
+	config_xkbrules = "xfree98";	/* static */
+        rulesfile = XKB_RULES_DIR "/xfree98";
+#else
+	config_xkbrules = __XKBDEFRULES__;	/* static */
+        rulesfile = XKB_RULES_DIR "/";
+#endif
+
+        rules = XkbRF_Load(rulesfile, "", True, False);
+	emptylines();
+
+        if (!rules) {
+            printf("XKB rules file '%s' not found\n", rulesfile);
+            printf("Keyboard XKB options will be set to default values.\n");
+            keypress();
+            return;
+        }
+
+	number = -1;
+	for (i=0;;) {
+		emptylines();
+		printf(xkbmodeltext);
+		for (j = i; j < i + 16 && j < rules->models.num_desc; j++)
+		    printf("%3d  %-50s\n", j+1, rules->models.desc[j].desc);
+		printf("\nEnter a number to choose the keyboard.\n\n");
+		if (rules->models.num_desc >= 16)
+			printf("Press enter for the next page\n");
+		getstring(s);
+		if (strlen(s) == 0) {
+			i += 16;
+			if (i > rules->models.num_desc)
+				i = 0;
+			continue;
+		}
+		number = atoi(s) - 1;
+		if (number >= 0 && number < rules->models.num_desc)
+			break;
+	}
+
+	i = strlen(rules->models.desc[number].name) + 1;
+	config_xkbmodel = Malloc(i);
+	sprintf(config_xkbmodel,"%s", rules->models.desc[number].name);
+
+	emptylines();
+	printf(xkblayouttext);
+
+	number = -1;
+	for (i=0;;) {
+	    	emptylines();
+		for (j = i; j < i + 18 && j < rules->layouts.num_desc; j++)
+			printf("%3d  %-50s\n", j+1,
+				rules->layouts.desc[j].desc);
+		printf("\n");
+		printf("Enter a number to choose the country.\n");
+		if (rules->layouts.num_desc >= 18)
+			printf("Press enter for the next page\n");
+		printf("\n");
+		getstring(s);
+		if (strlen(s) == 0) {
+			i += 18;
+			if (i > rules->layouts.num_desc)
+				i = 0;
+			continue;
+		}
+		number = atoi(s) - 1;
+		if (number >= 0 && number < rules->layouts.num_desc)
+			break;
+	}
+	config_xkblayout = Malloc(strlen(rules->layouts.desc[number].name)+1);
+	sprintf(config_xkblayout,"%s", rules->layouts.desc[number].name);
+
+	emptylines();
+	printf(xkbvarianttext, config_xkblayout);
+	getstring(s);
+	if (strlen(s) != 0) {
+	    config_xkbvariant = Malloc(strlen(s) + 1);
+	    strcpy(config_xkbvariant, s);
+        }
+
+	emptylines();
+	printf(xkboptionstext);
+	getstring(s);
+	if (!answerisyes(s))
+            return;
+
+        num_options = 0;
+        for (j=0,i=0;;) {
+            if (!strchr(rules->options.desc[i].name, ':')) {
+	        emptylines();
+                printf("   %s\n\n", rules->options.desc[i].desc);
+                j = i;
+            } else {
+                printf("%3d  %-50s\n", i - j, rules->options.desc[i].desc);
+            }
+            i++;
+            if ( i == rules->options.num_desc ||
+                 !strchr(rules->options.desc[i].name, ':')) {
+                printf("\nPlease select the option or just press enter if none\n");
+	        getstring(s);
+	        if (strlen(s) != 0) {
+	            number = atoi(s);
+                    if (number && (num_options < MAX_XKBOPTIONS)) {
+                        options[num_options++] = number + j;
+                    }
+                }    
+            }
+            if (i == rules->options.num_desc)
+                break;
+        }
+
+        if (!num_options)
+            return;
+
+        for (j=0,i=0; i<num_options; i++) {
+            j += strlen(rules->options.desc[options[i]].name);
+        }
+	config_xkboptions = Malloc(j + num_options);
+        for (j=0,i=0; i<num_options; i++) {
+	    j += sprintf(config_xkboptions+j,"%s%s",
+                    i == 0 ? "": "," ,rules->options.desc[options[i]].name);
+        }
+	return;
+}
+
+
+
+/*
+ * Monitor configuration.
+ */
+
+static char *monitorintro_text =
+"Now we want to set the specifications of the monitor. The two critical\n"
+"parameters are the vertical refresh rate, which is the rate at which the\n"
+"the whole screen is refreshed, and most importantly the horizontal sync rate,\n"
+"which is the rate at which scanlines are displayed.\n"
+"\n"
+"The valid range for horizontal sync and vertical sync should be documented\n"
+"in the manual of your monitor. If in doubt, check the monitor database\n"
+TREEROOTLX "/doc/Monitors to see if your monitor is there.\n"
+"\n";
+
+static char *hsyncintro_text =
+"You must indicate the horizontal sync range of your monitor. You can either\n"
+"select one of the predefined ranges below that correspond to industry-\n"
+"standard monitor types, or give a specific range.\n"
+"\n"
+"It is VERY IMPORTANT that you do not specify a monitor type with a horizontal\n"
+"sync range that is beyond the capabilities of your monitor. If in doubt,\n"
+"choose a conservative setting.\n"
+"\n";
+
+static char *customhsync_text =
+"Please enter the horizontal sync range of your monitor, in the format used\n"
+"in the table of monitor types above. You can either specify one or more\n"
+"continuous ranges (e.g. 15-25, 30-50), or one or more fixed sync frequencies.\n"
+"\n";
+
+static char *vsyncintro_text =
+"You must indicate the vertical sync range of your monitor. You can either\n"
+"select one of the predefined ranges below that correspond to industry-\n"
+"standard monitor types, or give a specific range. For interlaced modes,\n"
+"the number that counts is the high one (e.g. 87 Hz rather than 43 Hz).\n"
+"\n"
+" 1  50-70\n"
+" 2  50-90\n"
+" 3  50-100\n"
+" 4  40-150\n"
+" 5  Enter your own vertical sync range\n";
+
+static char *monitordescintro_text =
+"You must now enter a few identification/description strings, namely an\n"
+"identifier, a vendor name, and a model name. Just pressing enter will fill\n"
+"in default names.\n"
+"\n";
+
+#define NU_MONITORTYPES 10
+
+static char *monitortype_range[NU_MONITORTYPES] = {
+	"31.5",
+	"31.5 - 35.1",
+	"31.5, 35.5",
+	"31.5, 35.15, 35.5",
+	"31.5 - 37.9",
+	"31.5 - 48.5",
+	"31.5 - 57.0",
+	"31.5 - 64.3",
+	"31.5 - 79.0",
+	"31.5 - 82.0"
+};
+
+static char *monitortype_name[NU_MONITORTYPES] = {
+	"Standard VGA, 640x480 @ 60 Hz",
+	"Super VGA, 800x600 @ 56 Hz",
+	"8514 Compatible, 1024x768 @ 87 Hz interlaced (no 800x600)",
+	"Super VGA, 1024x768 @ 87 Hz interlaced, 800x600 @ 56 Hz",
+	"Extended Super VGA, 800x600 @ 60 Hz, 640x480 @ 72 Hz",
+	"Non-Interlaced SVGA, 1024x768 @ 60 Hz, 800x600 @ 72 Hz",
+	"High Frequency SVGA, 1024x768 @ 70 Hz",
+	"Monitor that can do 1280x1024 @ 60 Hz",
+	"Monitor that can do 1280x1024 @ 74 Hz",
+	"Monitor that can do 1280x1024 @ 76 Hz"
+};
+
+static void 
+monitor_configuration(void) {
+	int i;
+	char s[80];
+	printf("%s", monitorintro_text);
+
+	keypress();
+	emptylines();
+
+	printf("%s", hsyncintro_text);
+
+	printf("    hsync in kHz; monitor type with characteristic modes\n");
+	for (i = 0; i < NU_MONITORTYPES; i++)
+		printf("%2d  %s; %s\n", i + 1, monitortype_range[i],
+			monitortype_name[i]);
+
+	printf("%2d  Enter your own horizontal sync range\n",
+		NU_MONITORTYPES + 1);
+	printf("\n");
+
+	printf("Enter your choice (1-%d): ", NU_MONITORTYPES + 1);
+	getstring(s);
+	config_monitortype = atoi(s) - 1;
+	if (config_monitortype < 0)
+		config_monitortype = 0;
+
+	printf("\n");
+
+	if (config_monitortype < NU_MONITORTYPES)
+		config_hsyncrange = monitortype_range[config_monitortype];
+	else {
+		/* Custom hsync range option selected. */
+		printf("%s", customhsync_text);
+		printf("Horizontal sync range: ");
+		getstring(s);
+		config_hsyncrange = Malloc(strlen(s) + 1);
+		strcpy(config_hsyncrange, s);
+		printf("\n");
+	}
+
+	printf("%s", vsyncintro_text);
+	printf("\n");
+
+	printf("Enter your choice: ");
+	getstring(s);
+	printf("\n");
+	switch (atoi(s)) {
+	case 0 :
+	case 1 :
+		config_vsyncrange = "50-70";
+		break;
+	case 2 :
+		config_vsyncrange = "50-90";
+		break;
+	case 3 :
+		config_vsyncrange = "50-100";
+		break;
+	case 4 :
+		config_vsyncrange = "40-150";
+		break;
+	case 5 :
+		/* Custom vsync range option selected. */
+		printf("Vertical sync range: ");
+		getstring(s);
+		config_vsyncrange = Malloc(strlen(s) + 1);
+		strcpy(config_vsyncrange, s);
+		printf("\n");
+		break;
+	}
+	printf("%s", monitordescintro_text);
+	printf("The strings are free-form, spaces are allowed.\n");
+	printf("Enter an identifier for your monitor definition: ");
+	getstring(s);
+	if (strlen(s) == 0)
+		config_monitoridentifier = "My Monitor";
+	else {
+		config_monitoridentifier = Malloc(strlen(s) + 1);
+		strcpy(config_monitoridentifier, s);
+	}
+}
+
+
+/*
+ * Card database.
+ */
+
+static char *cardintro_text =
+"Now we must configure video card specific settings. At this point you can\n"
+"choose to make a selection out of a database of video card definitions.\n"
+"Because there can be variation in Ramdacs and clock generators even\n"
+"between cards of the same model, it is not sensible to blindly copy\n"
+"the settings (e.g. a Device section). For this reason, after you make a\n"
+"selection, you will still be asked about the components of the card, with\n"
+"the settings from the chosen database entry presented as a strong hint.\n"
+"\n"
+"The database entries include information about the chipset, what driver to\n"
+"run, the Ramdac and ClockChip, and comments that will be included in the\n"
+"Device section. However, a lot of definitions only hint about what driver\n"
+"to run (based on the chipset the card uses) and are untested.\n"
+"\n"
+"If you can't find your card in the database, there's nothing to worry about.\n"
+"You should only choose a database entry that is exactly the same model as\n"
+"your card; choosing one that looks similar is just a bad idea (e.g. a\n"
+"GemStone Snail 64 may be as different from a GemStone Snail 64+ in terms of\n"
+"hardware as can be).\n"
+"\n";
+
+static char *cardunsupported_text =
+"This card is basically UNSUPPORTED. It may only work as a generic\n"
+"VGA-compatible card. If you have an "__XSERVERNAME__" version more recent than what\n"
+"this card definition was based on, there's a chance that it is now\n"
+"supported.\n";
+
+static void 
+carddb_configuration(void) {
+	int i;
+	char s[80];
+	card_selected = -1;
+	printf("%s", cardintro_text);
+	printf("Do you want to look at the card database? ");
+	getstring(s);
+	printf("\n");
+	if (!answerisyes(s))
+		return;
+
+	/*
+	 * Choose a database entry.
+	 */
+	if (parse_database()) {
+		printf("Couldn't read card database file %s.\n",
+			CARD_DATABASE_FILE);
+		keypress();
+		return;
+	}
+
+	i = 0;
+	for (;;) {
+		int j;
+		emptylines();
+		for (j = i; j < i + 18 && j <= lastcard; j++) {
+			char *name = card[j].name,
+			     *chipset = card[j].chipset;
+
+			printf("%3d  %-50s%s\n", j,
+				name ? name : "-",
+				chipset ? chipset : "-");
+		}
+		printf("\n");
+		printf("Enter a number to choose the corresponding card definition.\n");
+		printf("Press enter for the next page, q to continue configuration.\n");
+		printf("\n");
+		getstring(s);
+		if (s[0] == 'q')
+			break;
+		if (strlen(s) == 0) {
+			i += 18;
+			if (i > lastcard)
+				i = 0;
+			continue;
+		}
+		card_selected = atoi(s);
+		if (card_selected >= 0 && card_selected <= lastcard)
+			break;
+	}
+
+	/*
+	 * Look at the selected card.
+	 */
+	if (card_selected != -1) {
+		char *name = card[card_selected].name,
+		     *chipset = card[card_selected].chipset;
+
+		printf("\nYour selected card definition:\n\n");
+		printf("Identifier: %s\n", name ? name : "-");
+		printf("Chipset:    %s\n", chipset ? chipset : "-");
+		if (!card[card_selected].driver)
+			card[card_selected].driver = "unknown";
+		printf("Driver:     %s\n", card[card_selected].driver);
+
+		if (card[card_selected].ramdac != NULL)
+			printf("Ramdac:     %s\n", card[card_selected].ramdac);
+		if (card[card_selected].dacspeed != NULL)
+			printf("DacSpeed:     %s\n", card[card_selected].dacspeed);
+		if (card[card_selected].clockchip != NULL)
+			printf("Clockchip:  %s\n", card[card_selected].clockchip);
+		if (card[card_selected].flags & NOCLOCKPROBE)
+			printf("Do NOT probe clocks or use any Clocks line.\n");
+		if (card[card_selected].flags & UNSUPPORTED)
+			printf("%s", cardunsupported_text);
+#if 0	/* Might be confusing. */
+		if (strlen(card[card_selected].lines) > 0)
+			printf("Device section text:\n%s",
+				card[card_selected].lines);
+#endif
+		printf("\n");
+		keypress();
+	}
+}
+
+
+/*
+ * Screen/video card configuration.
+ */
+
+static char *deviceintro_text =
+"Now you must give information about your video card. This will be used for\n"
+"the \"Device\" section of your video card in " CONFIGNAME ".\n"
+"\n";
+
+static char *videomemoryintro_text =
+"It is probably a good idea to use the same approximate amount as that detected\n"
+"by the server you intend to use. If you encounter problems that are due to the\n"
+"used server not supporting the amount memory you have, specify the maximum\n"
+"amount supported by the server.\n"
+"\n"
+"How much video memory do you have on your video card:\n"
+"\n";
+
+static char *carddescintro_text =
+"You must now enter a few identification/description strings, namely an\n"
+"identifier, a vendor name, and a model name. Just pressing enter will fill\n"
+"in default names (possibly from a card definition).\n"
+"\n";
+
+#if 0
+static char *devicesettingscomment_text =
+"Especially for accelerated drivers, Ramdac, Dacspeed and ClockChip settings\n"
+"or special options may be required in the Device section.\n"
+"\n";
+
+static char *ramdaccomment_text =
+"The RAMDAC setting only applies to some drivers. Some RAMDAC's are\n"
+"auto-detected by the server. The detection of a RAMDAC is forced by using a\n"
+"Ramdac \"identifier\" line in the Device section. The identifiers are shown\n"
+"at the right of the following table of RAMDAC types:\n"
+"\n";
+
+#define NU_RAMDACS 24
+
+static char *ramdac_name[NU_RAMDACS] = {
+	"AT&T 20C490 (S3 and AGX servers, ARK driver)",
+	"AT&T 20C498/21C498/22C498 (S3, autodetected)",
+	"AT&T 20C409/20C499 (S3, autodetected)",
+	"AT&T 20C505 (S3)",
+	"BrookTree BT481 (AGX)",
+	"BrookTree BT482 (AGX)",
+	"BrookTree BT485/9485 (S3)",
+	"Sierra SC15025 (S3, AGX)",
+#if XFREE86_VERSION >= 311	
+	"S3 GenDAC (86C708) (autodetected)",
+	"S3 SDAC (86C716) (autodetected)",
+#else
+	"S3 GenDAC (86C708)",
+	"S3 SDAC (86C716)",
+#endif
+	"STG-1700 (S3, autodetected)",
+	"STG-1703 (S3, autodetected)",
+	"TI 3020 (S3, autodetected)",
+	"TI 3025 (S3, autodetected)",
+	"TI 3026 (S3, autodetected)",
+	"IBM RGB 514 (S3, autodetected)",
+	"IBM RGB 524 (S3, autodetected)",
+	"IBM RGB 525 (S3, autodetected)",
+	"IBM RGB 526 (S3)",
+	"IBM RGB 528 (S3, autodetected)",
+	"ICS5342 (S3, ARK)",
+	"ICS5341 (W32)",
+	"IC Works w30C516 ZoomDac (ARK)",
+	"Normal DAC"
+};
+
+static char *ramdac_id[NU_RAMDACS] = {
+	"att20c490", "att20c498", "att20c409", "att20c505", "bt481", "bt482",
+	"bt485", "sc15025", "s3gendac", "s3_sdac", "stg1700","stg1703",
+	"ti3020", "ti3025", "ti3026", "ibm_rgb514", "ibm_rgb524",
+	"ibm_rgb525", "ibm_rgb526", "ibm_rgb528", "ics5342", "ics5341",
+	"zoomdac", "normal"
+};
+
+static char *clockchipcomment_text =
+"A Clockchip line in the Device section forces the detection of a\n"
+"programmable clock device. With a clockchip enabled, any required\n"
+"clock can be programmed without requiring probing of clocks or a\n"
+"Clocks line. Most cards don't have a programmable clock chip.\n"
+"Choose from the following list:\n"
+"\n";
+
+#define NU_CLOCKCHIPS 12
+
+static char *clockchip_name[] = {
+	"Chrontel 8391",
+	"ICD2061A and compatibles (ICS9161A, DCS2824)",
+	"ICS2595",
+	"ICS5342 (similar to SDAC, but not completely compatible)",
+	"ICS5341",
+	"S3 GenDAC (86C708) and ICS5300 (autodetected)",
+	"S3 SDAC (86C716)",
+	"STG 1703 (autodetected)",
+	"Sierra SC11412",
+	"TI 3025 (autodetected)",
+	"TI 3026 (autodetected)",
+	"IBM RGB 51x/52x (autodetected)",
+};
+
+static char *clockchip_id[] = {
+	"ch8391", "icd2061a", "ics2595", "ics5342", "ics5341",
+	"s3gendac", "s3_sdac",
+	"stg1703", "sc11412", "ti3025", "ti3026", "ibm_rgb5xx",
+};
+
+static char *deviceclockscomment_text =
+"For most modern configurations, a Clocks line is neither required or\n"
+"desirable.  However for some older hardware it can be useful since it\n"
+"prevents the slow and nasty sounding clock probing at server start-up.\n"
+"Probed clocks are displayed at server startup, along with other server\n"
+"and hardware configuration info. You can save this information in a file\n"
+"by running 'X -probeonly 2>output_file'. Be warned that clock probing is\n"
+"inherently imprecise; some clocks may be slightly too high (varies per run).\n"
+"\n";
+
+static char *deviceclocksquestion_text =
+"At this point I can run X -probeonly, and try to extract the clock information\n"
+"from the output. It is recommended that you do this yourself and if a set of\n"
+"clocks is shown then you add a clocks line (note that the list of clocks may\n"
+"be split over multiple Clocks lines) to your Device section afterwards. Be\n"
+"aware that a clocks line is not appropriate for most modern hardware that\n"
+"has programmable clocks.\n"
+"\n"
+"You must be root to be able to run X -probeonly now.\n"
+"\n";
+
+static char *probeonlywarning_text =
+"It is possible that the hardware detection routines in the server will somehow\n"
+"cause the system to crash and the screen to remain blank. If this is the\n"
+"case, do not choose this option the next time. The server may need a\n"
+"Ramdac, ClockChip or special option (e.g. \"nolinear\" for S3) to probe\n"
+"and start-up correctly.\n"
+"\n";
+#endif
+
+static char *modesorderintro_text =
+"For each depth, a list of modes (resolutions) is defined. The default\n"
+"resolution that the server will start-up with will be the first listed\n"
+"mode that can be supported by the monitor and card.\n"
+"Currently it is set to:\n"
+"\n";
+
+static char *modesorder_text2 =
+"Modes that cannot be supported due to monitor or clock constraints will\n"
+"be automatically skipped by the server.\n"
+"\n"
+" 1  Change the modes for 8-bit (256 colors)\n"
+" 2  Change the modes for 16-bit (32K/64K colors)\n"
+" 3  Change the modes for 24-bit (24-bit color)\n"
+" 4  The modes are OK, continue.\n"
+"\n";
+
+static char *modeslist_text =
+"Please type the digits corresponding to the modes that you want to select.\n"
+"For example, 432 selects \"1024x768\" \"800x600\" \"640x480\", with a\n"
+"default mode of 1024x768.\n"
+"\n";
+
+static char *virtual_text =
+"You can have a virtual screen (desktop), which is screen area that is larger\n"
+"than the physical screen and which is panned by moving the mouse to the edge\n"
+"of the screen. If you don't want virtual desktop at a certain resolution,\n"
+"you cannot have modes listed that are larger. Each color depth can have a\n"
+"differently-sized virtual screen\n"
+"\n";
+
+static int videomemory[] = {
+	256, 512, 1024, 2048, 4096, 8192, 16384, 32768, 65536, 131072, 262144
+};
+
+/* Is this required? */
+#if XFREE86_VERSION >= 400
+#define NU_MODESTRINGS 13
+#else
+#if XFREE86_VERSION >= 330
+#define NU_MODESTRINGS 12
+#else
+#if XFREE86_VERSION >= 311
+#define NU_MODESTRINGS 8
+#else
+#define NU_MODESTRINGS 5
+#endif
+#endif
+#endif
+
+static char *modestring[NU_MODESTRINGS] = {
+	"\"640x400\"",
+	"\"640x480\"",
+	"\"800x600\"",
+	"\"1024x768\"",
+	"\"1280x1024\"",
+#if XFREE86_VERSION >= 311
+	"\"320x200\"",
+	"\"320x240\"",
+	"\"400x300\""
+#endif
+#if XFREE86_VERSION >= 330
+	,"\"1152x864\"",
+	"\"1600x1200\"",
+	"\"1800x1400\"",
+	"\"512x384\""
+#endif
+#if XFREE86_VERSION >= 400
+	,"\"1400x1050\""
+#endif
+};
+
+#ifdef __EMX__
+/* yet another instance of this code, sigh! */
+char *
+__XOS2RedirRoot(char *path, char sep)
+{
+	static char pn[300];
+	char *root;
+	int i,l;
+	if ((isalpha(path[0]) && path[1]==':') || path[0] != '/')
+		return path;
+
+	root = getenv("X11ROOT");
+	if (!root) root = "";
+	sprintf(pn,"%s%s",root,path);
+	if (sep=='\\') {
+		l = strlen(pn);
+		for (i=0; i<l; i++) 
+			if (pn[i]=='/') pn[i]='\\';
+	}
+	return pn;
+}
+#endif
+
+/* (hv) to avoid the UNIXISM to try to open a dir to check for existance */
+static int exists_dir(char *name) {
+	struct stat sbuf;
+
+#ifdef __EMX__
+	name = __XOS2RedirRoot(name,'/');
+#endif
+	/* is it there ? */
+	if (stat(name,&sbuf) == -1)
+		return 0;
+
+	/* is there, but is it a dir? */
+	return S_ISDIR(sbuf.st_mode) ? 1 : 0;
+}
+
+static void 
+screen_configuration(void) {
+	int i, c/*, np*/;
+	char s[80];
+
+	/*
+	 * Configure the "Device" section for the video card.
+	 */
+
+	printf("%s", deviceintro_text);
+
+	printf("%s", videomemoryintro_text);
+
+	for (i = 0; i < sizeof(videomemory) / sizeof(videomemory[0]); i++)
+		printf("%2d  %dK\n", i + 1, videomemory[i]);
+	printf("%2d  Other\n\n", i + 1);
+
+	printf("Enter your choice: ");
+	getstring(s);
+	printf("\n");
+
+	c = atoi(s) - 1;
+	if (c >= 0 && c < sizeof(videomemory) / sizeof(videomemory[0]))
+		config_videomemory = videomemory[c];
+	else {
+		printf("Amount of video memory in Kbytes: ");
+		getstring(s);
+		config_videomemory = atoi(s);
+		printf("\n");
+	}
+
+	printf("%s", carddescintro_text);
+	if (card_selected != -1)
+		printf("Your card definition is %s.\n\n",
+			card[card_selected].name);
+	printf("The strings are free-form, spaces are allowed.\n");
+	printf("Enter an identifier for your video card definition: ");
+	getstring(s);
+	if (strlen(s) == 0)
+		if (card_selected != -1)
+			config_deviceidentifier = card[card_selected].name;
+		else
+			config_deviceidentifier = "My Video Card";
+	else {
+		config_deviceidentifier = Malloc(strlen(s) + 1);
+		strcpy(config_deviceidentifier, s);
+	}
+	printf("\n");
+
+	emptylines();
+
+	/*
+	 * Initialize screen mode variables for svga and accel
+	 * to default values.
+	 * XXXX Doesn't leave room for off-screen caching in 16/32bpp modes
+	 *      for the accelerated servers in some situations.
+	 */
+	config_modesline8bpp =
+	config_modesline16bpp =
+	config_modesline24bpp = "\"640x480\"";
+	config_virtualx8bpp = config_virtualx16bpp = config_virtualx24bpp =
+	config_virtualy8bpp = config_virtualy16bpp = config_virtualy24bpp = 0;
+	if (config_videomemory >= 4096) {
+		config_virtualx8bpp = 1600;
+		config_virtualy8bpp = 1280;
+		if (card_selected != -1 && !(card[card_selected].flags & UNSUPPORTED)) {
+			/*
+			 * Allow room for font/pixmap cache for accel
+			 * servers.
+			 */
+			config_virtualx16bpp = 1280;
+			config_virtualy16bpp = 1024;
+		}
+		else {
+			config_virtualx16bpp = 1600;
+			config_virtualy16bpp = 1280;
+		}
+		if (card_selected != -1 && !(card[card_selected].flags & UNSUPPORTED)) {
+			config_virtualx24bpp = 1152;
+			config_virtualy24bpp = 900;
+		}
+		else {
+			config_virtualx24bpp = 1280;
+			config_virtualy24bpp = 1024;
+		}
+		/* Add 1600x1280 */
+		config_modesline8bpp = "\"1280x1024\" \"1024x768\" \"800x600\" \"640x480\"";
+		config_modesline16bpp = "\"1280x1024\" \"1024x768\" \"800x600\" \"640x480\"";
+		config_modesline24bpp = "\"1280x1024\" \"1024x768\" \"800x600\" \"640x480\"";
+
+	}
+	else
+	if (config_videomemory >= 2048) {
+		if (card_selected != -1 && !(card[card_selected].flags & UNSUPPORTED)) {
+			/*
+			 * Allow room for font/pixmap cache for accel
+			 * servers.
+			 * Also the mach32 is has a limited width.
+			 */
+			config_virtualx8bpp = 1280;
+			config_virtualy8bpp = 1024;
+		}
+		else {
+			config_virtualx8bpp = 1600;
+			config_virtualy8bpp = 1200;
+		}
+		if (card_selected != -1 && !(card[card_selected].flags & UNSUPPORTED)) {
+			config_virtualx16bpp = 1024;
+			config_virtualy16bpp = 768;
+		}
+		else {
+			config_virtualx16bpp = 1152;
+			config_virtualy16bpp = 900;
+		}
+		config_virtualx24bpp = 800;
+		config_virtualy24bpp = 600;
+		if (config_videomemory >= 2048 + 256) {
+			config_virtualx24bpp = 1024;
+			config_virtualy24bpp = 768;
+		}
+		config_modesline8bpp = "\"1280x1024\" \"1024x768\" \"800x600\" \"640x480\"";
+		config_modesline16bpp = "\"1024x768\" \"800x600\" \"640x480\"";
+		if (config_videomemory >= 2048 + 256)
+			config_modesline24bpp = "\"1024x768\" \"800x600\" \"640x480\"";
+		else
+			config_modesline24bpp = "\"800x600\" \"640x480\"";
+	}
+	else
+	if (config_videomemory >= 1024) {
+		if (card_selected != -1 && !(card[card_selected].flags & UNSUPPORTED)) {
+			/*
+			 * Allow room for font/pixmap cache for accel
+			 * servers.
+			 */
+			config_virtualx8bpp = 1024;
+			config_virtualy8bpp = 768;
+		}
+		else {
+			config_virtualx8bpp = 1152;
+			config_virtualy8bpp = 900;
+		}
+		config_virtualx16bpp = 800; /* Forget about cache space;  */
+		config_virtualy16bpp = 600; /* it's small enough as it is. */
+		config_virtualx24bpp = 640;
+		config_virtualy24bpp = 480;
+		config_modesline8bpp = "\"1024x768\" \"800x600\" \"640x480\"";
+		config_modesline16bpp = "\"800x600\" \"640x480\"";
+		config_modesline24bpp = "\"640x480\"";
+	}
+	else
+	if (config_videomemory >= 512) {
+		config_virtualx8bpp = 800;
+		config_virtualy8bpp = 600;
+		config_modesline8bpp = "\"800x600\" \"640x480\"";
+		config_modesline16bpp = "\"640x400\"";
+	}
+	else
+	if (config_videomemory >= 256) {
+		config_modesline8bpp = "\"640x400\"";
+		config_virtualx8bpp = 640;
+		config_virtualy8bpp = 400;
+	}
+	else {
+		printf("Fatal error: Invalid amount of video memory.\n");
+		exit(-1);
+	}
+
+#if 0
+	/*
+	 * Handle the Ramdac/Clockchip setting.
+	 */
+
+	printf("%s", devicesettingscomment_text);
+
+	if (card_selected == -1 || (card[card_selected].flags & UNSUPPORTED))
+		goto skipramdacselection;
+
+	printf("%s", ramdaccomment_text);
+
+	/* meanwhile there are so many RAMDACs that they do no longer fit on
+	 * on page
+	 */
+	for (np=12, i=0 ;;) {
+		int j;
+		for (j = i; j < i + np && j < NU_RAMDACS; j++)
+			printf("%3d  %-60s%s\n", j+1,
+				ramdac_name[j],
+				ramdac_id[j]);
+
+		printf("\n");
+		if (card_selected != -1)
+			if (card[card_selected].ramdac != NULL)
+				printf("The card definition has Ramdac \"%s\".\n\n",
+					card[card_selected].ramdac);
+		printf("\n");
+		printf("Enter a number to choose the corresponding RAMDAC.\n");
+		printf("Press enter for the next page, q to quit without selection of a RAMDAC.\n");
+		printf("\n");
+		getstring(s);
+
+		config_ramdac = NULL;
+		if (s[0] == 'q')
+			break;
+
+		if (strlen(s) > 0) {
+			c = atoi(s)-1;
+			if (c >= 0 && c < NU_RAMDACS) {
+				config_ramdac = ramdac_id[atoi(s)-1];
+				break;
+			}
+		}
+		
+		i += np;
+		if (np==12) np = 18; /* account intro lines only displayed 1st time */
+		if (i >= NU_RAMDACS)
+			i = 0;
+		emptylines();
+	}
+
+skipramdacselection:
+	emptylines();
+	printf("%s", clockchipcomment_text);
+
+	for (i = 0; i < NU_CLOCKCHIPS; i++)
+		printf("%2d  %-60s%s\n",
+			i + 1, clockchip_name[i], clockchip_id[i]);
+
+	printf("\n");
+
+	if (card_selected != -1)
+		if (card[card_selected].clockchip != NULL)
+			printf("The card definition has Clockchip \"%s\"\n\n",
+				card[card_selected].clockchip);
+
+	printf("Just press enter if you don't want a Clockchip setting.\n");
+	printf("What Clockchip setting do you want (1-%d)? ", NU_CLOCKCHIPS);
+
+	getstring(s);
+	config_clockchip = NULL;
+	if (strlen(s) > 0)
+		config_clockchip = clockchip_id[atoi(s) - 1];
+
+	emptylines();
+
+	/*
+	 * Optionally run X -probeonly to figure out the clocks.
+	 */
+
+	config_numberofclockslines = 0;
+
+	printf("%s", deviceclockscomment_text);
+
+	printf("%s", deviceclocksquestion_text);
+#endif
+
+#if 0
+	/*
+	 * XXX Change this to check for a CLOCKPROBE flag rather than an
+	 * NOCLOCKPROBE.
+	 */
+	if (card_selected != -1)
+		if (card[card_selected].flags & NOCLOCKPROBE)
+			printf("The card definition says to NOT probe clocks.\n");
+
+	if (config_clockchip != NULL) {
+		printf("Because you have enabled a Clockchip line, there's no need for clock\n"
+			"probing.\n");
+		keypress();
+		goto skipclockprobing;
+	}
+
+	printf("Do you want me to run 'X -probeonly' now? ");
+	getstring(s);
+	printf("\n");
+	if (answerisyes(s)) {
+		/*
+		 * Write temporary XF86Config and run X -probeonly.
+		 * Only allow when root.
+		 */
+		FILE *f;
+		char *buf;
+		char syscmdline[2*256+100]; /* enough */
+                char *fname = NULL;
+                char *d2name = NULL;
+                char *d3name = NULL;
+
+		if (getuid() != 0) {
+			printf("Sorry, you must be root to do this.\n\n");
+			goto endofprobeonly;
+		}
+		printf("%s", probeonlywarning_text);
+		keypress();
+		fname = Malloc(strlen(temp_dir) +
+                               strlen(TEMPORARY_XF86CONFIG_FILENAME) + 1);
+		sprintf(fname, "%s%s", temp_dir,
+                       TEMPORARY_XF86CONFIG_FILENAME);
+		d2name = Malloc(strlen(temp_dir) + strlen(DUMBCONFIG2) + 1);
+		sprintf(d2name, "%s%s", temp_dir, DUMBCONFIG2);
+		d3name = Malloc(strlen(temp_dir) + strlen(DUMBCONFIG3) + 1);
+		sprintf(d3name, "%s%s", temp_dir, DUMBCONFIG3);
+		printf("Running X -probeonly -pn -xf86config %s.\n", fname);
+		write_XF86Config(fname);
+#ifndef __EMX__
+		sync();
+#endif
+		/* compose a line with the real path */
+#ifndef __EMX__
+                sprintf(syscmdline, "X -probeonly -pn -xf86config %s 2> %s",
+                        fname, d2name);
+#else
+		/* OS/2 does not have symlinks, so "X" does not exist,
+		 * call the real X server
+		 */
+		sprintf(syscmdline,"%s/"__XSERVERNAME__" -probeonly -pn -xf86config "
+		       TEMPORARY_XF86CONFIG_FILENAME " 2>" DUMBCONFIG2,
+		       __XOS2RedirRoot("/"__XSERVERNAME__"/bin",'\\'),
+		       card[card_selected].server);
+#endif
+
+		if (system(syscmdline)) {
+			printf("X -probeonly call failed.\n");
+			printf("No Clocks line inserted.\n");
+			goto clocksprobefailed;
+		}
+		/* Look for 'clocks:' (case sensitive). */		
+                sprintf(syscmdline, "grep clocks\\: %s > %s", d2name, d3name);
+                if (system(syscmdline)) {
+			printf("grep failed.\n");
+			printf("Cannot find clocks in server output.\n");
+			goto clocksprobefailed;
+		}
+                f = fopen(d3name, "r");
+		buf = Malloc(8192);
+		/* Parse lines. */
+		while (fgets(buf, 8192, f) != NULL) {
+			char *clks;
+			clks = strstr(buf, "clocks: ") + 8;
+			if (clks >= buf + 3 && strcmp(clks - 11, "num") == 0)
+				/* Reject lines with 'numclocks:'. */
+				continue;
+			if (clks >= buf + 8 && strcpy(clks - 14, "pixel ") == 0)
+				/* Reject lines with 'pixel clocks:'. */
+				continue;
+			clks[strlen(clks) - 1] = '\0';	/* Remove '\n'. */
+			config_clocksline[config_numberofclockslines] =
+				Malloc(strlen(clks) + 1);
+			strcpy(config_clocksline[config_numberofclockslines],
+				clks);
+			printf("Clocks %s\n", clks);
+			config_numberofclockslines++;
+		}
+		fclose(f);
+clocksprobefailed:
+                unlink(d3name);
+                unlink(d2name);
+                unlink(fname);
+		printf("\n");
+
+endofprobeonly:
+		keypress();
+	}
+skipclockprobing:
+#endif
+
+	/*
+	 * For vga driver, no further configuration is required.
+	 */
+	if (card_selected == -1 || (card[card_selected].flags & UNSUPPORTED))
+		return;
+	
+	/*
+	 * Configure the modes order.
+	 */
+	config_virtual = 0;
+	for (;;) {
+	 	char modes[128];
+
+		emptylines();
+
+		printf("%s", modesorderintro_text);
+		printf("%s for 8-bit\n", config_modesline8bpp);
+		printf("%s for 16-bit\n", config_modesline16bpp);
+		printf("%s for 24-bit\n", config_modesline24bpp);
+		printf("\n");
+		printf("%s", modesorder_text2);
+
+		printf("Enter your choice: ");
+		getstring(s);
+		printf("\n");
+
+		c = atoi(s) - 1;
+		if (c < 0 || c >= 3)
+			break;
+
+		printf("Select modes from the following list:\n\n");
+
+		for (i = 0; i < NU_MODESTRINGS; i++)
+                        printf(" %c  %s\n", i < 9 ? '1' + i :
+                                                    'a' + i - 9, 
+                                            modestring[i]);
+		printf("\n");
+
+		printf("%s", modeslist_text);
+
+		printf("Which modes? ");
+		getstring(s);
+		printf("\n");
+
+		modes[0] = '\0';
+		for (i = 0; i < strlen(s); i++) {
+                        if ( NU_MODESTRINGS > 9 ) {
+                          if ((s[i] < '1' || s[i] > '9') &&
+                              (s[i] < 'a' || s[i] > 'a' + NU_MODESTRINGS - 10)) {
+                                printf("Invalid mode skipped.\n");
+                                continue;
+                            }
+                        }
+                        else {
+                          if (s[i] < '1' || s[i] > '0' + NU_MODESTRINGS) {
+				printf("Invalid mode skipped.\n");
+				continue;
+			  }
+			}
+			if (i > 0)
+				strcat(modes, " ");
+                        strcat(modes, modestring[s[i] <= '9' ? s[i] - '1' :
+                                                               s[i] - 'a' + 9]);
+		}
+		switch (c) {
+		case 0 :
+			config_modesline8bpp = Malloc(strlen(modes) + 1);
+			strcpy(config_modesline8bpp, modes);
+			break;
+		case 1 :
+			config_modesline16bpp = Malloc(strlen(modes) + 1);
+			strcpy(config_modesline16bpp, modes);
+			break;
+		case 2 :
+			config_modesline24bpp = Malloc(strlen(modes) + 1);
+			strcpy(config_modesline24bpp, modes);
+			break;
+		}
+
+		printf("%s", virtual_text);
+
+		printf("Please answer the following question with either 'y' or 'n'.\n");
+		printf("Do you want a virtual screen that is larger than the physical screen?");
+		getstring(s);
+		if (answerisyes(s))
+			config_virtual = 1;
+	}
+}
+
+static char *defaultdepthtext = 
+"Please specify which color depth you want to use by default:\n"
+"\n";
+
+static struct depth_str {
+    char *name;
+    char *desc;
+} depth_list[] = {
+    { "1", "1 bit (monochrome)" },
+    { "4", "4 bits (16 colors)" },
+    { "8", "8 bits (256 colors)" },
+    { "16", "16 bits (65536 colors)" },
+    { "24", "24 bits (16 million colors)" }
+};
+
+static int ndepths = sizeof(depth_list)/sizeof(struct depth_str);
+
+static void
+depth_configuration(void)
+{
+	int i;
+	char s[80];
+	int depth;
+
+	printf(defaultdepthtext);
+	for (i=0; i<ndepths; i++) {
+	    printf("%3d  %-50s\n",i+1,depth_list[i].desc);
+	}
+	
+	printf("\nEnter a number to choose the default depth.\n\n");
+	getstring(s);
+	if (strlen(s) == 0)
+	    depth = 0;
+	else {
+	    i = atoi(s)-1;
+	    depth = (i < 0 || i > ndepths) ? 0 : i;
+	}
+	config_depth = depth_list[depth].name;
+}
+
+/*
+ * Create the XF86Config file.
+ */
+
+static char *XF86Config_firstchunk_text =
+"# File generated by xf86config.\n"
+"\n"
+"#\n"
+"# Copyright (c) 2004, by the "XVENDORNAMESHORT"\n"
+"#\n"
+"# Permission is hereby granted, free of charge, to any person obtaining a\n"
+"# copy of this software and associated documentation files (the \"Software\"),\n"
+"# to deal in the Software without restriction, including without limitation\n"
+"# the rights to use, copy, modify, merge, publish, distribute, sublicense,\n"
+"# and/or sell copies of the Software, and to permit persons to whom the\n"
+"# Software is furnished to do so, subject to the following conditions:\n"
+"# \n"
+"# The above copyright notice and this permission notice shall be included in\n"
+"# all copies or substantial portions of the Software.\n"
+"# \n"
+"# THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\n"
+"# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\n"
+"# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL\n"
+"# THE XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,\n"
+"# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF\n"
+"# OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\n"
+"# SOFTWARE.\n"
+"# \n"
+"# Except as contained in this notice, the name of "XVENDORNAMESHORT" shall\n"
+"# not be used in advertising or otherwise to promote the sale, use or other\n"
+"# dealings in this Software without prior written authorization from the\n"
+"# "XVENDORNAMESHORT".\n"
+"#\n"
+"\n"
+"# **********************************************************************\n"
+"# Refer to the XF86Config(4/5) man page for details about the format of \n"
+"# this file.\n"
+"# **********************************************************************\n"
+"\n"
+"# **********************************************************************\n"
+"# Module section -- this  section  is used to specify\n"
+"# which dynamically loadable modules to load.\n"
+"# **********************************************************************\n"
+"#\n"
+"Section \"Module\"\n"
+"\n"
+"# This loads the DBE extension module.\n"
+"\n"
+"    Load        \"dbe\"  	# Double buffer extension\n"
+"\n"
+"# This loads the miscellaneous extensions module, and disables\n"
+"# initialisation of the XFree86-DGA extension within that module.\n"
+"    SubSection  \"extmod\"\n"
+"      Option    \"omit xfree86-dga\"   # don't initialise the DGA extension\n"
+"    EndSubSection\n"
+"\n"
+"# This loads the Type1 and FreeType font modules\n"
+"    Load        \"type1\"\n"
+"    Load        \"speedo\"\n"
+"    Load        \"freetype\"\n"
+"#    Load        \"xtt\"\n"
+"\n"
+"# This loads the GLX module\n"
+"#    Load       \"glx\"\n"
+"# This loads the DRI module\n"
+"#    Load       \"dri\"\n"
+"\n"
+"EndSection\n"
+"\n"
+"# **********************************************************************\n"
+"# Files section.  This allows default font and rgb paths to be set\n"
+"# **********************************************************************\n"
+"\n"
+"Section \"Files\"\n"
+"\n"
+"# The location of the RGB database.  Note, this is the name of the\n"
+"# file minus the extension (like \".txt\" or \".db\").  There is normally\n"
+"# no need to change the default.\n"
+"\n"
+"    RgbPath	\"" TREEROOTLX "/rgb\"\n"
+"\n"
+"# Multiple FontPath entries are allowed (which are concatenated together),\n"
+"# as well as specifying multiple comma-separated entries in one FontPath\n"
+"# command (or a combination of both methods)\n"
+"# \n"
+"# If you don't have a floating point coprocessor and emacs, Mosaic or other\n"
+"# programs take long to start up, try moving the Type1 and Speedo directory\n"
+"# to the end of this list (or comment them out).\n"
+"# \n"
+"\n";
+
+static char *XF86Config_fontpaths[] = 
+{
+/*	"    FontPath	\"" TREEROOTLX "/fonts/75dpi/\"\n"*/
+    "/fonts/local/",
+	"/fonts/misc/",
+	"/fonts/75dpi/:unscaled",
+	"/fonts/100dpi/:unscaled",
+	"/fonts/Speedo/",
+	"/fonts/Type1/",
+	"/fonts/TrueType/",
+	"/fonts/freefont/",
+	"/fonts/75dpi/",
+	"/fonts/100dpi/",
+	0 /* end of fontpaths */
+};
+
+static char *XF86Config_fontpathchunk_text =
+
+"\n"
+"# The module search path.  The default path is shown here.\n"
+"\n"
+"#    ModulePath \"" MODULEPATH "\"\n"
+"\n"
+"EndSection\n"
+"\n"
+"# **********************************************************************\n"
+"# Server flags section.\n"
+"# **********************************************************************\n"
+"\n"
+"Section \"ServerFlags\"\n"
+"\n"
+"# Uncomment this to cause a core dump at the spot where a signal is \n"
+"# received.  This may leave the console in an unusable state, but may\n"
+"# provide a better stack trace in the core dump to aid in debugging\n"
+"\n"
+"#    Option \"NoTrapSignals\"\n"
+"\n"
+"# Uncomment this to disable the <Crtl><Alt><Fn> VT switch sequence\n"
+"# (where n is 1 through 12).  This allows clients to receive these key\n"
+"# events.\n"
+"\n"
+"#    Option \"DontVTSwitch\"\n"
+"\n"
+"# Uncomment this to disable the <Crtl><Alt><BS> server abort sequence\n"
+"# This allows clients to receive this key event.\n"
+"\n"
+"#    Option \"DontZap\"\n"
+"\n"
+"# Uncomment this to disable the <Crtl><Alt><KP_+>/<KP_-> mode switching\n"
+"# sequences.  This allows clients to receive these key events.\n"
+"\n"
+"#    Option \"Dont Zoom\"\n"
+"\n"
+"# Uncomment this to disable tuning with the xvidtune client. With\n"
+"# it the client can still run and fetch card and monitor attributes,\n"
+"# but it will not be allowed to change them. If it tries it will\n"
+"# receive a protocol error.\n"
+"\n"
+"#    Option \"DisableVidModeExtension\"\n"
+"\n"
+"# Uncomment this to enable the use of a non-local xvidtune client. \n"
+"\n"
+"#    Option \"AllowNonLocalXvidtune\"\n"
+"\n"
+"# Uncomment this to disable dynamically modifying the input device\n"
+"# (mouse and keyboard) settings. \n"
+"\n"
+"#    Option \"DisableModInDev\"\n"
+"\n"
+"# Uncomment this to enable the use of a non-local client to\n"
+"# change the keyboard or mouse settings (currently only xset).\n"
+"\n"
+"#    Option \"AllowNonLocalModInDev\"\n"
+"\n"
+"EndSection\n"
+"\n"
+"# **********************************************************************\n"
+"# Input devices\n"
+"# **********************************************************************\n"
+"\n"
+"# **********************************************************************\n"
+"# Core keyboard's InputDevice section\n"
+"# **********************************************************************\n"
+"\n"
+"Section \"InputDevice\"\n"
+"\n"
+"    Identifier	\"Keyboard1\"\n"
+"    Driver	\"Keyboard\"\n"
+"\n"
+"# For most OSs the protocol can be omitted (it defaults to \"Standard\").\n"
+"# When using XQUEUE (only for SVR3 and SVR4, but not Solaris),\n"
+"# uncomment the following line.\n"
+"\n"
+"#    Option     \"Protocol\"      \"Xqueue\"\n"
+"\n"
+"    Option \"AutoRepeat\" \"500 30\"\n"
+"\n"
+"# Specify which keyboard LEDs can be user-controlled (eg, with xset(1))\n"
+"#    Option	\"Xleds\"      \"1 2 3\"\n"
+"\n";
+
+static char *keyboardchunk2_text =
+"\n";
+
+static char *keyboardchunk3_text =
+"# To customise the XKB settings to suit your keyboard, modify the\n"
+"# lines below (which are the defaults).  For example, for a non-U.S.\n"
+"# keyboard, you will probably want to use:\n"
+"#    Option \"XkbModel\"    \"pc102\"\n"
+"# If you have a US Microsoft Natural keyboard, you can use:\n"
+"#    Option \"XkbModel\"    \"microsoft\"\n"
+"#\n"
+"# Then to change the language, change the Layout setting.\n"
+"# For example, a german layout can be obtained with:\n"
+"#    Option \"XkbLayout\"   \"de\"\n"
+"# or:\n"
+"#    Option \"XkbLayout\"   \"de\"\n"
+"#    Option \"XkbVariant\"  \"nodeadkeys\"\n"
+"#\n"
+"# If you'd like to switch the positions of your capslock and\n"
+"# control keys, use:\n"
+"#    Option \"XkbOptions\"  \"ctrl:swapcaps\"\n"
+"\n"
+"# These are the default XKB settings for "XVENDORNAMESHORT"\n"
+"#    Option \"XkbRules\"    \"__XKBDEFRULES__\"\n"
+"#    Option \"XkbModel\"    \"pc101\"\n"
+"#    Option \"XkbLayout\"   \"us\"\n"
+"#    Option \"XkbVariant\"  \"\"\n"
+"#    Option \"XkbOptions\"  \"\"\n"
+"\n";
+
+static char *keyboardlastchunk_text =
+"\n"
+"EndSection\n"
+"\n"
+"\n";
+
+static char *pointersection_text1 = 
+"# **********************************************************************\n"
+"# Core Pointer's InputDevice section\n"
+"# **********************************************************************\n"
+"\n"
+"Section \"InputDevice\"\n"
+"\n"
+"# Identifier and driver\n"
+"\n"
+"    Identifier	\"Mouse1\"\n"
+"    Driver	\"mouse\"\n"
+;
+
+static char *pointersection_text2 =
+"\n"
+"# Mouse-speed setting for PS/2 mouse.\n"
+"\n"
+"#    Option \"Resolution\"	\"256\"\n"
+"\n"
+"# When using XQUEUE, comment out the above two lines, and uncomment\n"
+"# the following line.\n"
+"\n"
+"#    Option \"Protocol\"	\"Xqueue\"\n"
+"\n"
+"# Baudrate and SampleRate are only for some Logitech mice. In\n"
+"# almost every case these lines should be omitted.\n"
+"\n"
+"#    Option \"BaudRate\"	\"9600\"\n"
+"#    Option \"SampleRate\"	\"150\"\n"
+"\n"
+"# Emulate3Buttons is an option for 2-button Microsoft mice\n"
+"# Emulate3Timeout is the timeout in milliseconds (default is 50ms)\n"
+"\n";
+
+static char *xinputsection_text =
+"# **********************************************************************\n"
+"# Other input device sections \n"
+"# this is optional and is required only if you\n"
+"# are using extended input devices.  This is for example only.  Refer\n"
+"# to the XF86Config man page for a description of the options.\n"
+"# **********************************************************************\n"
+"#\n"
+"# Section \"InputDevice\" \n"
+"#    Identifier  \"Mouse2\"\n"
+"#    Driver      \"mouse\"\n"
+"#    Option      \"Protocol\"      \"MouseMan\"\n"
+"#    Option      \"Device\"        \"/dev/mouse2\"\n"
+"# EndSection\n"
+"#\n"
+"# Section \"InputDevice\"\n"
+"#    Identifier \"spaceball\"\n"
+"#    Driver     \"magellan\"\n"
+"#    Option     \"Device\"        \"/dev/cua0\"\n"
+"# EndSection\n"
+"#\n"
+"# Section \"InputDevice\"\n"
+"#    Identifier \"spaceball2\"\n"
+"#    Driver     \"spaceorb\"\n"
+"#    Option     \"Device\"        \"/dev/cua0\"\n"
+"# EndSection\n"
+"#\n"
+"# Section \"InputDevice\"\n"
+"#    Identifier \"touchscreen0\"\n"
+"#    Driver     \"microtouch\"\n"
+"#    Option     \"Device\"        \"/dev/ttyS0\"\n"
+"#    Option     \"MinX\"          \"1412\"\n"
+"#    Option     \"MaxX\"          \"15184\"\n"
+"#    Option     \"MinY\"          \"15372\"\n"
+"#    Option     \"MaxY\"          \"1230\"\n"
+"#    Option     \"ScreenNumber\"  \"0\"\n"
+"#    Option     \"ReportingMode\" \"Scaled\"\n"
+"#    Option     \"ButtonNumber\"  \"1\"\n"
+"#    Option     \"SendCoreEvents\"\n"
+"# EndSection\n"
+"#\n"
+"# Section \"InputDevice\"\n"
+"#    Identifier \"touchscreen1\"\n"
+"#    Driver     \"elo2300\"\n"
+"#    Option     \"Device\"        \"/dev/ttyS0\"\n"
+"#    Option     \"MinX\"          \"231\"\n"
+"#    Option     \"MaxX\"          \"3868\"\n"
+"#    Option     \"MinY\"          \"3858\"\n"
+"#    Option     \"MaxY\"          \"272\"\n"
+"#    Option     \"ScreenNumber\"  \"0\"\n"
+"#    Option     \"ReportingMode\" \"Scaled\"\n"
+"#    Option     \"ButtonThreshold\"       \"17\"\n"
+"#    Option     \"ButtonNumber\"  \"1\"\n"
+"#    Option     \"SendCoreEvents\"\n"
+"# EndSection\n"
+"\n";
+
+static char *monitorsection_text1 =
+"# **********************************************************************\n"
+"# Monitor section\n"
+"# **********************************************************************\n"
+"\n"
+"# Any number of monitor sections may be present\n"
+"\n"
+"Section \"Monitor\"\n"
+"\n";
+
+static char *monitorsection_text2 =
+"# HorizSync is in kHz unless units are specified.\n"
+"# HorizSync may be a comma separated list of discrete values, or a\n"
+"# comma separated list of ranges of values.\n"
+"# NOTE: THE VALUES HERE ARE EXAMPLES ONLY.  REFER TO YOUR MONITOR\'S\n"
+"# USER MANUAL FOR THE CORRECT NUMBERS.\n"
+"\n";
+
+static char *monitorsection_text3 =
+"#    HorizSync	30-64         # multisync\n"
+"#    HorizSync	31.5, 35.2    # multiple fixed sync frequencies\n"
+"#    HorizSync	15-25, 30-50  # multiple ranges of sync frequencies\n"
+"\n"
+"# VertRefresh is in Hz unless units are specified.\n"
+"# VertRefresh may be a comma separated list of discrete values, or a\n"
+"# comma separated list of ranges of values.\n"
+"# NOTE: THE VALUES HERE ARE EXAMPLES ONLY.  REFER TO YOUR MONITOR\'S\n"
+"# USER MANUAL FOR THE CORRECT NUMBERS.\n"
+"\n";
+
+#if 0
+static char *monitorsection_text4 =
+"# Modes can be specified in two formats.  A compact one-line format, or\n"
+"# a multi-line format.\n"
+"\n"
+"# These two are equivalent\n"
+"\n"
+"#    ModeLine \"1024x768i\" 45 1024 1048 1208 1264 768 776 784 817 Interlace\n"
+"\n"
+"#    Mode \"1024x768i\"\n"
+"#        DotClock	45\n"
+"#        HTimings	1024 1048 1208 1264\n"
+"#        VTimings	768 776 784 817\n"
+"#        Flags		\"Interlace\"\n"
+"#    EndMode\n"
+"\n";
+
+static char *modelines_text =
+"# This is a set of standard mode timings. Modes that are out of monitor spec\n"
+"# are automatically deleted by the server (provided the HorizSync and\n"
+"# VertRefresh lines are correct), so there's no immediate need to\n"
+"# delete mode timings (unless particular mode timings don't work on your\n"
+"# monitor). With these modes, the best standard mode that your monitor\n"
+"# and video card can support for a given resolution is automatically\n"
+"# used.\n"
+"\n"
+"# 640x400 @ 70 Hz, 31.5 kHz hsync\n"
+"Modeline \"640x400\"     25.175 640  664  760  800   400  409  411  450\n"
+"# 640x480 @ 60 Hz, 31.5 kHz hsync\n"
+"Modeline \"640x480\"     25.175 640  664  760  800   480  491  493  525\n"
+"# 800x600 @ 56 Hz, 35.15 kHz hsync\n"
+"ModeLine \"800x600\"     36     800  824  896 1024   600  601  603  625\n"
+"# 1024x768 @ 87 Hz interlaced, 35.5 kHz hsync\n"
+"Modeline \"1024x768\"    44.9  1024 1048 1208 1264   768  776  784  817 Interlace\n"
+"\n"
+"# 640x400 @ 85 Hz, 37.86 kHz hsync\n"
+"Modeline \"640x400\"     31.5   640  672 736   832   400  401  404  445 -HSync +VSync\n"
+"# 640x480 @ 72 Hz, 36.5 kHz hsync\n"
+"Modeline \"640x480\"     31.5   640  680  720  864   480  488  491  521\n"
+"# 640x480 @ 75 Hz, 37.50 kHz hsync\n"
+"ModeLine  \"640x480\"    31.5   640  656  720  840   480  481  484  500 -HSync -VSync\n"
+"# 800x600 @ 60 Hz, 37.8 kHz hsync\n"
+"Modeline \"800x600\"     40     800  840  968 1056   600  601  605  628 +hsync +vsync\n"
+"\n"
+"# 640x480 @ 85 Hz, 43.27 kHz hsync\n"
+"Modeline \"640x480\"     36     640  696  752  832   480  481  484  509 -HSync -VSync\n"
+"# 1152x864 @ 89 Hz interlaced, 44 kHz hsync\n"
+"ModeLine \"1152x864\"    65    1152 1168 1384 1480   864  865  875  985 Interlace\n"
+"\n"
+"# 800x600 @ 72 Hz, 48.0 kHz hsync\n"
+"Modeline \"800x600\"     50     800  856  976 1040   600  637  643  666 +hsync +vsync\n"
+"# 1024x768 @ 60 Hz, 48.4 kHz hsync\n"
+"Modeline \"1024x768\"    65    1024 1032 1176 1344   768  771  777  806 -hsync -vsync\n"
+"\n"
+"# 640x480 @ 100 Hz, 53.01 kHz hsync\n"
+"Modeline \"640x480\"     45.8   640  672  768  864   480  488  494  530 -HSync -VSync\n"
+"# 1152x864 @ 60 Hz, 53.5 kHz hsync\n"
+"Modeline  \"1152x864\"   89.9  1152 1216 1472 1680   864  868  876  892 -HSync -VSync\n"
+"# 800x600 @ 85 Hz, 55.84 kHz hsync\n"
+"Modeline  \"800x600\"    60.75  800  864  928 1088   600  616  621  657 -HSync -VSync\n"
+"\n"
+"# 1024x768 @ 70 Hz, 56.5 kHz hsync\n"
+"Modeline \"1024x768\"    75    1024 1048 1184 1328   768  771  777  806 -hsync -vsync\n"
+"# 1280x1024 @ 87 Hz interlaced, 51 kHz hsync\n"
+"Modeline \"1280x1024\"   80    1280 1296 1512 1568  1024 1025 1037 1165 Interlace\n"
+"\n"
+"# 800x600 @ 100 Hz, 64.02 kHz hsync\n"
+"Modeline  \"800x600\"    69.65  800  864  928 1088   600  604  610  640 -HSync -VSync\n"
+"# 1024x768 @ 76 Hz, 62.5 kHz hsync\n"
+"Modeline \"1024x768\"    85    1024 1032 1152 1360   768  784  787  823\n"
+"# 1152x864 @ 70 Hz, 62.4 kHz hsync\n"
+"Modeline  \"1152x864\"   92    1152 1208 1368 1474   864  865  875  895\n"
+"# 1280x1024 @ 61 Hz, 64.2 kHz hsync\n"
+"Modeline \"1280x1024\"  110    1280 1328 1512 1712  1024 1025 1028 1054\n"
+"\n"
+"# 1024x768 @ 85 Hz, 70.24 kHz hsync\n"
+"Modeline \"1024x768\"   98.9  1024 1056 1216 1408   768 782 788 822 -HSync -VSync\n"
+"# 1152x864 @ 78 Hz, 70.8 kHz hsync\n"
+"Modeline \"1152x864\"   110   1152 1240 1324 1552   864  864  876  908\n"
+"\n"
+"# 1280x1024 @ 70 Hz, 74.59 kHz hsync\n"
+"Modeline \"1280x1024\"  126.5 1280 1312 1472 1696  1024 1032 1040 1068 -HSync -VSync\n"
+"# 1600x1200 @ 60Hz, 75.00 kHz hsync\n"
+"Modeline \"1600x1200\"  162   1600 1664 1856 2160  1200 1201 1204 1250 +HSync +VSync\n"
+"# 1152x864 @ 84 Hz, 76.0 kHz hsync\n"
+"Modeline \"1152x864\"   135    1152 1464 1592 1776   864  864  876  908\n"
+"\n"
+"# 1280x1024 @ 74 Hz, 78.85 kHz hsync\n"
+"Modeline \"1280x1024\"  135    1280 1312 1456 1712  1024 1027 1030 1064\n"
+"\n"
+"# 1024x768 @ 100Hz, 80.21 kHz hsync\n"
+"Modeline \"1024x768\"   115.5  1024 1056 1248 1440  768  771  781  802 -HSync -VSync\n"
+"# 1280x1024 @ 76 Hz, 81.13 kHz hsync\n"
+"Modeline \"1280x1024\"  135    1280 1312 1416 1664  1024 1027 1030 1064\n"
+"\n"
+"# 1600x1200 @ 70 Hz, 87.50 kHz hsync\n"
+"Modeline \"1600x1200\"  189    1600 1664 1856 2160  1200 1201 1204 1250 -HSync -VSync\n"
+"# 1152x864 @ 100 Hz, 89.62 kHz hsync\n"
+"Modeline \"1152x864\"   137.65 1152 1184 1312 1536   864  866  885  902 -HSync -VSync\n"
+"# 1280x1024 @ 85 Hz, 91.15 kHz hsync\n"
+"Modeline \"1280x1024\"  157.5  1280 1344 1504 1728  1024 1025 1028 1072 +HSync +VSync\n"
+"# 1600x1200 @ 75 Hz, 93.75 kHz hsync\n"
+"Modeline \"1600x1200\"  202.5  1600 1664 1856 2160  1200 1201 1204 1250 +HSync +VSync\n"
+"# 1600x1200 @ 85 Hz, 105.77 kHz hsync\n"
+"Modeline \"1600x1200\"  220    1600 1616 1808 2080  1200 1204 1207 1244 +HSync +VSync\n"
+"# 1280x1024 @ 100 Hz, 107.16 kHz hsync\n"
+"Modeline \"1280x1024\"  181.75 1280 1312 1440 1696  1024 1031 1046 1072 -HSync -VSync\n"
+"\n"
+"# 1800x1440 @ 64Hz, 96.15 kHz hsync \n"
+"ModeLine \"1800X1440\"  230    1800 1896 2088 2392 1440 1441 1444 1490 +HSync +VSync\n"
+"# 1800x1440 @ 70Hz, 104.52 kHz hsync \n"
+"ModeLine \"1800X1440\"  250    1800 1896 2088 2392 1440 1441 1444 1490 +HSync +VSync\n"
+"\n"
+"# 512x384 @ 78 Hz, 31.50 kHz hsync\n"
+"Modeline \"512x384\"    20.160 512  528  592  640   384  385  388  404 -HSync -VSync\n"
+"# 512x384 @ 85 Hz, 34.38 kHz hsync\n"
+"Modeline \"512x384\"    22     512  528  592  640   384  385  388  404 -HSync -VSync\n"
+"\n"
+#if XFREE86_VERSION >= 311
+"# Low-res Doublescan modes\n"
+"# If your chipset does not support doublescan, you get a 'squashed'\n"
+"# resolution like 320x400.\n"
+"\n"
+"# 320x200 @ 70 Hz, 31.5 kHz hsync, 8:5 aspect ratio\n"
+"Modeline \"320x200\"     12.588 320  336  384  400   200  204  205  225 Doublescan\n"
+"# 320x240 @ 60 Hz, 31.5 kHz hsync, 4:3 aspect ratio\n"
+"Modeline \"320x240\"     12.588 320  336  384  400   240  245  246  262 Doublescan\n"
+"# 320x240 @ 72 Hz, 36.5 kHz hsync\n"
+"Modeline \"320x240\"     15.750 320  336  384  400   240  244  246  262 Doublescan\n"
+"# 400x300 @ 56 Hz, 35.2 kHz hsync, 4:3 aspect ratio\n"
+"ModeLine \"400x300\"     18     400  416  448  512   300  301  302  312 Doublescan\n"
+"# 400x300 @ 60 Hz, 37.8 kHz hsync\n"
+"Modeline \"400x300\"     20     400  416  480  528   300  301  303  314 Doublescan\n"
+"# 400x300 @ 72 Hz, 48.0 kHz hsync\n"
+"Modeline \"400x300\"     25     400  424  488  520   300  319  322  333 Doublescan\n"
+"# 480x300 @ 56 Hz, 35.2 kHz hsync, 8:5 aspect ratio\n"
+"ModeLine \"480x300\"     21.656 480  496  536  616   300  301  302  312 Doublescan\n"
+"# 480x300 @ 60 Hz, 37.8 kHz hsync\n"
+"Modeline \"480x300\"     23.890 480  496  576  632   300  301  303  314 Doublescan\n"
+"# 480x300 @ 63 Hz, 39.6 kHz hsync\n"
+"Modeline \"480x300\"     25     480  496  576  632   300  301  303  314 Doublescan\n"
+"# 480x300 @ 72 Hz, 48.0 kHz hsync\n"
+"Modeline \"480x300\"     29.952 480  504  584  624   300  319  322  333 Doublescan\n"
+"\n"
+#endif
+;
+#endif
+
+static char *devicesection_text =
+"# **********************************************************************\n"
+"# Graphics device section\n"
+"# **********************************************************************\n"
+"\n"
+"# Any number of graphics device sections may be present\n"
+"\n"
+"# Standard VGA Device:\n"
+"\n"
+"Section \"Device\"\n"
+"    Identifier	\"Standard VGA\"\n"
+"    VendorName	\"Unknown\"\n"
+"    BoardName	\"Unknown\"\n"
+"\n"
+"# The chipset line is optional in most cases.  It can be used to override\n"
+"# the driver's chipset detection, and should not normally be specified.\n"
+"\n"
+"#    Chipset	\"generic\"\n"
+"\n"
+"# The Driver line must be present.  When using run-time loadable driver\n"
+"# modules, this line instructs the server to load the specified driver\n"
+"# module.  Even when not using loadable driver modules, this line\n"
+"# indicates which driver should interpret the information in this section.\n"
+"\n"
+"    Driver     \"vga\"\n"
+"# The BusID line is used to specify which of possibly multiple devices\n"
+"# this section is intended for.  When this line isn't present, a device\n"
+"# section can only match up with the primary video device.  For PCI\n"
+"# devices a line like the following could be used.  This line should not\n"
+"# normally be included unless there is more than one video device\n"
+"# intalled.\n"
+"\n"
+"#    BusID      \"PCI:0:10:0\"\n"
+"\n"
+"#    VideoRam	256\n"
+"\n"
+"#    Clocks	25.2 28.3\n"
+"\n"
+"EndSection\n"
+"\n"
+"# Device configured by xf86config:\n"
+"\n";
+
+static char *screensection_text1 =
+"# **********************************************************************\n"
+"# Screen sections\n"
+"# **********************************************************************\n"
+"\n"
+"# Any number of screen sections may be present.  Each describes\n"
+"# the configuration of a single screen.  A single specific screen section\n"
+"# may be specified from the X server command line with the \"-screen\"\n"
+"# option.\n";
+
+static char *serverlayout_section_text1 = 
+"# **********************************************************************\n"
+"# ServerLayout sections.\n"
+"# **********************************************************************\n"
+"\n"
+"# Any number of ServerLayout sections may be present.  Each describes\n"
+"# the way multiple screens are organised.  A specific ServerLayout\n"
+"# section may be specified from the X server command line with the\n"
+"# \"-layout\" option.  In the absence of this, the first section is used.\n"
+"# When now ServerLayout section is present, the first Screen section\n"
+"# is used alone.\n"
+"\n"
+"Section \"ServerLayout\"\n"
+"\n"
+"# The Identifier line must be present\n"
+"    Identifier  \"Simple Layout\"\n"
+"\n"
+"# Each Screen line specifies a Screen section name, and optionally\n"
+"# the relative position of other screens.  The four names after\n"
+"# primary screen name are the screens to the top, bottom, left and right\n"
+"# of the primary screen.  In this example, screen 2 is located to the\n"
+"# right of screen 1.\n"
+"\n";
+
+static char *serverlayout_section_text2 =
+"\n"
+"# Each InputDevice line specifies an InputDevice section name and\n"
+"# optionally some options to specify the way the device is to be\n"
+"# used.  Those options include \"CorePointer\", \"CoreKeyboard\" and\n"
+"# \"SendCoreEvents\".\n"
+"\n"
+"    InputDevice \"Mouse1\" \"CorePointer\"\n"
+"    InputDevice \"Keyboard1\" \"CoreKeyboard\"\n"
+"\n"
+"EndSection\n"
+"\n"
+"# Section \"DRI\"\n"
+"#    Mode 0666\n"
+"# EndSection\n"
+"\n";
+
+static void 
+write_fontpath_section(FILE *f)
+{
+	/* this will create the Fontpath lines, but only after checking,
+	 * that the corresponding dir exists (was THE absolute problem
+	 * users had with XFree86/OS2 3.1.2D !)
+	 */
+	int i;
+	char cur[256+20],*colon, *hash;
+
+	for (i=0; XF86Config_fontpaths[i]; i++) {
+		strcpy(cur,TREEROOTLX);
+		strcat(cur,XF86Config_fontpaths[i]);
+		/* remove a ':' */
+		colon = strchr(cur+2,':'); /* OS/2: C:/...:scaled */
+		if (colon) *colon = 0;
+		hash = exists_dir(cur) ? "" : "#";
+		fprintf(f,"%s    FontPath   \"%s%s\"\n",
+			hash,
+			TREEROOTLX,
+			XF86Config_fontpaths[i]);
+	}
+}
+
+static void 
+write_XF86Config(char *filename)
+{
+	FILE *f;
+
+	/*
+	 * Write the file.
+	 */
+
+	f = fopen(filename, "w");
+	if (f == NULL) {
+		printf("Failed to open filename for writing.\n");
+#ifndef __EMX__
+		if (getuid() != 0)
+			printf("Maybe you need to be root to write to the specified directory?\n");
+#endif
+		exit(-1);
+	}
+
+	fprintf(f, "%s", XF86Config_firstchunk_text);
+	write_fontpath_section(f);
+	fprintf(f, "%s", XF86Config_fontpathchunk_text);
+
+	/*
+	 * Write keyboard section.
+	 */
+	if (config_altmeta) {
+		fprintf(f, "    Option \"LeftAlt\"     \"Meta\"\n");
+		fprintf(f, "    Option \"RightAlt\"    \"ModeShift\"\n");
+	}
+	else {
+		fprintf(f, "#    Option \"LeftAlt\"     \"Meta\"\n");
+		fprintf(f, "#    Option \"RightAlt\"    \"ModeShift\"\n");
+	}
+#if defined(__OpenBSD__) && defined(WSCONS_SUPPORT) && !defined(PCVT_SUPPORT)
+	/* wscons keyoards need a protocol line */
+	fprintf(f, "    Option \"Protocol\" \"wskbd\"\n");
+	fprintf(f, "    Option \"Device\" \"%s\"\n", config_keyboard_dev);
+	fprintf(f, "    Option \"XkbKeycodes\" \"wscons(ppc)\"\n");
+#endif
+	fprintf(f, "%s", keyboardchunk2_text);
+
+	fprintf(f, "%s", keyboardchunk3_text);
+	if (config_xkbdisable) {
+		fprintf(f, "    Option \"XkbDisable\"\n\n");
+	} else {
+		fprintf(f, "#    Option \"XkbDisable\"\n\n");
+	}
+	fprintf(f, "    Option \"XkbRules\"	\"%s\"\n",
+		config_xkbrules);
+	fprintf(f, "    Option \"XkbModel\"	\"%s\"\n",
+		config_xkbmodel);
+	fprintf(f, "    Option \"XkbLayout\"	\"%s\"\n",
+		config_xkblayout);
+        if (config_xkbvariant)
+	    fprintf(f, "    Option \"XkbVariant\"	\"%s\"\n",
+		    config_xkbvariant);
+        if (config_xkboptions)
+	    fprintf(f, "    Option \"XkbOptions\"	\"%s\"\n",
+		    config_xkboptions);
+
+	fprintf(f, "%s",keyboardlastchunk_text);
+
+	/*
+	 * Write pointer section.
+	 */
+	fprintf(f, "%s", pointersection_text1);
+	fprintf(f, "    Option \"Protocol\"    \"%s\"\n",
+		mouse_info[config_mousetype].name);
+#if !defined(__UNIXOS2__) && !defined(QNX4)
+	fprintf(f, "    Option \"Device\"      \"%s\"\n", config_pointerdevice);
+#endif
+	fprintf(f, "%s", pointersection_text2);
+	if (!config_emulate3buttons)
+		fprintf(f, "#");
+	fprintf(f, "    Option \"Emulate3Buttons\"\n");
+	fprintf(f, "#    Option \"Emulate3Timeout\"    \"50\"\n\n");
+	fprintf(f, "# ChordMiddle is an option for some 3-button Logitech mice\n\n");
+	if (!config_chordmiddle)
+		fprintf(f, "#");
+	fprintf(f, "    Option \"ChordMiddle\"\n\n");
+	if (config_cleardtrrts) {
+		fprintf(f, "    Option \"ClearDTR\"\n");
+		fprintf(f, "    Option \"ClearRTS\"\n\n");
+	}
+	fprintf(f, "EndSection\n\n\n");
+
+	/*
+	 * Write XInput sample section
+	 */
+	fprintf(f, "%s", xinputsection_text);
+
+	/*
+	 * Write monitor section.
+	 */
+	fprintf(f, "%s", monitorsection_text1);
+	fprintf(f, "    Identifier  \"%s\"\n", config_monitoridentifier);
+	fprintf(f, "\n");
+	fprintf(f, "%s", monitorsection_text2);
+	fprintf(f, "    HorizSync   %s\n", config_hsyncrange);
+	fprintf(f, "\n");
+	fprintf(f, "%s", monitorsection_text3);
+	fprintf(f, "    VertRefresh %s\n", config_vsyncrange);
+	fprintf(f, "\n");
+#if 0
+	fprintf(f, "%s", monitorsection_text4);
+	fprintf(f, "%s", modelines_text);
+#endif
+	fprintf(f, "EndSection\n\n\n");
+
+	/*
+	 * Write Device section.
+	 */
+
+	fprintf(f, "%s", devicesection_text);
+	fprintf(f, "Section \"Device\"\n");
+	fprintf(f, "    Identifier  \"%s\"\n", config_deviceidentifier);
+   	if (card_selected != -1) {
+	        fprintf(f, "    Driver      \"%s\"\n", card[card_selected].driver);
+	        if (card[card_selected].flags & UNSUPPORTED) {
+			fprintf(f, "	# unsupported card\n");
+		}
+	} else {
+	        fprintf(f, "    Driver      \"vga\"\n"
+			"	# unsupported card\n");
+	}
+	/* Rely on server to detect video memory. */
+	fprintf(f, "    #VideoRam    %d\n", config_videomemory);
+	if (card_selected != -1)
+		/* Add comment lines from card definition. */
+		fprintf(f, card[card_selected].lines);
+	if (config_ramdac != NULL)
+		fprintf(f, "    Ramdac      \"%s\"\n", config_ramdac);
+	if (card_selected != -1)
+		if (card[card_selected].dacspeed != NULL)
+			fprintf(f, "    Dacspeed    %s\n",
+				card[card_selected].dacspeed);
+	if (config_clockchip != NULL)
+		fprintf(f, "    Clockchip   \"%s\"\n", config_clockchip);
+	else
+	if (config_numberofclockslines == 0)
+		fprintf(f, "    # Insert Clocks lines here if appropriate\n");
+	else {
+		int i;
+		for (i = 0; i < config_numberofclockslines; i++)
+			fprintf(f, "    Clocks %s\n", config_clocksline[i]);
+	}
+	fprintf(f, "EndSection\n\n\n");	
+
+	/*
+	 * Write Screen sections.
+	 */
+
+	fprintf(f, "%s", screensection_text1);
+
+	fprintf(f, 
+		"Section \"Screen\"\n"
+		"    Identifier  \"Screen 1\"\n"
+		"    Device      \"%s\"\n"
+		"    Monitor     \"%s\"\n"
+		"    DefaultDepth %s\n"
+		"\n"
+		"    Subsection \"Display\"\n"
+		"        Depth       8\n"
+		"        Modes       %s\n"
+		"        ViewPort    0 0\n",
+		config_deviceidentifier,
+		config_monitoridentifier,
+		config_depth,
+		config_modesline8bpp);
+	if (config_virtual)
+		fprintf(f, "        Virtual     %d %d\n",
+			config_virtualx8bpp, config_virtualy8bpp);
+	fprintf(f, 
+		"    EndSubsection\n"
+		"    Subsection \"Display\"\n"
+		"        Depth       16\n"
+		"        Modes       %s\n"
+		"        ViewPort    0 0\n",
+		config_modesline16bpp);
+	if (config_virtual)
+		fprintf(f, "        Virtual     %d %d\n",
+			config_virtualx16bpp, config_virtualy16bpp);
+	fprintf(f, 
+		"    EndSubsection\n"
+		"    Subsection \"Display\"\n"
+		"        Depth       24\n"
+		"        Modes       %s\n"
+		"        ViewPort    0 0\n",
+		config_modesline24bpp);
+	if (config_virtual)
+		fprintf(f, "        Virtual     %d %d\n",
+			config_virtualx24bpp, config_virtualy24bpp);
+	fprintf(f, 
+		"    EndSubsection\n"
+		"EndSection\n"
+		"\n");
+
+        /*
+	 * ServerLayout section
+	 */
+   
+        fprintf(f, serverlayout_section_text1);
+	/* replace with  screen config */
+	fprintf(f, "    Screen \"Screen 1\"\n");
+
+	fprintf(f, serverlayout_section_text2);
+
+        fclose(f);
+}
+
+static char *
+append_version(char *name)
+{
+#ifdef APPEND_VERSION_TO_CONFIG_NAME
+	char *ret = NULL;
+
+	if (XF86_VERSION_MAJOR > 9 || XF86_VERSION_MAJOR < 0)
+		return name;
+
+	ret = Malloc(strlen(name) + 2 + 1);
+	sprintf(ret, "%s-%d", name, XF86_VERSION_MAJOR);
+	free(name);
+	return ret;
+#else
+	return name;
+#endif
+}
+
+/*
+ * Ask where to write XF86Config to. Returns filename.
+ */
+
+static char *
+ask_XF86Config_location(void) {
+	char s[80];
+	char *filename = NULL;
+
+	printf(
+"I am going to write the XF86Config file now. Make sure you don't accidently\n"
+"overwrite a previously configured one.\n\n");
+
+#ifndef __EMX__
+	if (getuid() == 0) {
+#ifdef PREFER_XF86CONFIG_IN_ETC
+		filename = Strdup("/etc/X11/" XCONFIGFILE);
+		filename = append_version(filename);
+		printf("Shall I write it to %s? ", filename);
+		getstring(s);
+		printf("\n");
+		if (answerisyes(s))
+			return filename;
+#endif
+
+		if (filename)
+			free(filename);
+		filename = Strdup(TREEROOTCFG "/" XCONFIGFILE);
+		filename = append_version(filename);
+		printf("Please answer the following question with either 'y' or 'n'.\n");
+		printf("Shall I write it to the default location, %s? ", filename);
+		getstring(s);
+		printf("\n");
+		if (answerisyes(s))
+			return filename;
+
+#ifndef PREFER_XF86CONFIG_IN_ETC
+		if (filename)
+			free(filename);
+		filename = Strdup("/etc/X11/" XCONFIGFILE);
+		filename = append_version(filename);
+		printf("Shall I write it to %s? ", filename);
+		getstring(s);
+		printf("\n");
+		if (answerisyes(s))
+			return filename;
+#endif
+#else /* __EMX__ */
+	{
+		printf("Please answer the following question with either 'y' or 'n'.\n");
+		printf("Shall I write it to the default location, drive:/"__XSERVERNAME__"/lib/X11/XConfig? ");
+		getstring(s);
+		printf("\n");
+		if (answerisyes(s)) {
+			return __XOS2RedirRoot("/"__XSERVERNAME__"/lib/X11/XConfig",'/');
+		}
+#endif /* __EMX__ */
+	}
+
+	if (filename)
+		free(filename);
+	filename = Strdup(XCONFIGFILE);
+	filename = append_version(filename);
+	printf("Do you want it written to the current directory as '%s'? ", filename);
+	getstring(s);
+	printf("\n");
+	if (answerisyes(s)) {
+		return filename;
+	}
+
+	printf("Please give a filename to write to: ");
+	getstring(s);
+	printf("\n");
+	if (filename)
+		free(filename);
+	filename = Strdup(s);
+	return filename;
+}
+
+
+/*
+ * Check if an earlier version of XFree86 is installed; warn about proper
+ * search path order in that case.
+ */
+
+static char *notinstalled_text =
+"The directory " TREEROOT " does not exist. This probably means that you have\n"
+"not yet installed an X11R6-based version of "__XSERVERNAME__". Please install\n"
+"XFree86 3.1+ before running this program, following the instructions in\n"
+"the INSTALL or README that comes with the "__XSERVERNAME__" distribution for your OS.\n"
+"For a minimal installation it is sufficient to only install base binaries,\n"
+"libraries, configuration files and a server that you want to use.\n"
+"\n";
+
+#ifndef __UNIXOS2__
+static char *oldxfree86_text =
+"The directory '/usr/X386/bin' exists. You probably have an old version of\n"
+"__XSERVERNAME__ installed (XFree86 3.1 installs in '" TREEROOT "' instead of\n"
+"'/usr/X386').\n"
+"\n"
+"It is important that the directory '" TREEROOT "' is present in your\n"
+"search path, *before* any occurrence of '/usr/X386/bin'. If you have installed\n"
+"X program binaries that are not in the base __XSERVERNAME__ distribution in\n"
+"'/usr/X386/bin', you can keep the directory in your path as long as it is\n"
+"after '" TREEROOT "'.\n"
+"\n";
+
+static char *pathnote_text =	
+"Note that the X binary directory in your path may be a symbolic link.\n"
+"In that case you could modify the symbolic link to point to the new binaries.\n"
+"Example: 'rm -f /usr/bin/X11; ln -s /usr/X11R6/bin /usr/bin/X11', if the\n"
+"link is '/usr/bin/X11'.\n"
+"\n"
+"Make sure the path is OK before continuing.\n";
+#endif
+
+static void 
+path_check(void) {
+	char s[80];
+	int ok;
+
+	ok = exists_dir(TREEROOT);
+	if (!ok) {
+		printf("%s", notinstalled_text);
+		printf("Do you want to continue? ");
+		getstring(s);
+		if (!answerisyes(s))
+			exit(-1);
+		printf("\n");
+	}
+
+#ifndef __UNIXOS2__
+	ok = exists_dir("/usr/X386/bin");
+	if (!ok)
+		return;
+
+	printf("%s", oldxfree86_text);
+	printf("Your PATH is currently set as follows:\n%s\n\n",
+		getenv("PATH"));
+	printf("%s", pathnote_text);
+	keypress();
+#endif
+}
+
+
+static void
+configdir_check(void)
+{
+	/* /etc/X11 may not exist on some systems */
+	if (getuid() == 0) {
+		struct stat buf;
+		if (stat("/etc/X11", &buf) == -1 && errno == ENOENT)
+			mkdir("/etc/X11", 0777);
+		if (stat(TREEROOTCFG, &buf) == -1 && errno == ENOENT)
+			mkdir(TREEROOTCFG, 0777);
+	}
+}
+
+
+/*
+ * Program entry point.
+ */
+
+int 
+main(int argc, char *argv[]) {
+    
+	createtmpdir();
+
+	emptylines();
+
+	printf("%s", intro_text);
+
+	keypress();
+	emptylines();
+
+	path_check();
+
+	emptylines();
+
+	configdir_check();
+
+	emptylines();
+
+	mouse_configuration();
+
+	emptylines();
+
+	keyboard_configuration();
+
+	emptylines();
+
+	monitor_configuration();
+
+	emptylines();
+
+	carddb_configuration();
+
+	emptylines();
+
+ 	screen_configuration();
+
+	emptylines();
+
+	depth_configuration();
+
+	emptylines();
+
+	write_XF86Config(ask_XF86Config_location());
+
+	printf("%s", finalcomment_text);
+
+	exit(0);
+}
diff --git a/hw/xfree86/utils/xorgconfig/xorgconfig.man.pre b/hw/xfree86/utils/xorgconfig/xorgconfig.man.pre
new file mode 100644
index 000000000..63e55f349
--- /dev/null
+++ b/hw/xfree86/utils/xorgconfig/xorgconfig.man.pre
@@ -0,0 +1,22 @@
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/xf86config/xorgconfig.man,v 1.5 2001/11/01 23:35:34 dawes Exp $
+.TH xorgconfig 1 __vendorversion__
+.SH NAME
+xorgconfig \- generate an __XCONFIGFILE__ file
+.SH SYNOPSIS
+.B xorgconfig
+.SH DESCRIPTION
+\fIxorgconfig\fP is an interactive program for generating an __XCONFIGFILE__ file
+for use with __XSERVERNAME__ X servers.
+.PP
+Note that the default name used by \fIxorgconfig\fP for the __XCONFIGFILE__ file
+is system-dependent.  For instance, on some systems, __XCONFIGFILE__-4 is used,
+and on OS/2, XConfig is used.
+.SH FILES
+.TP
+.I __projectroot__/lib/X11/Cards
+Video cards database
+.SH "SEE ALSO"
+__XSERVERNAME__(1), __XCONFIGFILE__(__filemansuffix__), reconfig(1)
+.SH AUTHOR
+Harm Hanemaayer.
+.\" $TOG: xf86conf.man /main/9 1997/07/19 10:53:08 kaleb $
diff --git a/hw/xfree86/vbe/vbe.c b/hw/xfree86/vbe/vbe.c
index 07659d943..9cc8be74d 100644
--- a/hw/xfree86/vbe/vbe.c
+++ b/hw/xfree86/vbe/vbe.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/vbe/vbe.c,v 1.3 2003/11/03 05:11:53 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/vbe/vbe.c,v 1.2tsi Exp $ */
 
 /*
  *                   XFree86 vbe module
diff --git a/hw/xfree86/vbe/vbe.h b/hw/xfree86/vbe/vbe.h
index 3a1b48749..2f49ffd9b 100644
--- a/hw/xfree86/vbe/vbe.h
+++ b/hw/xfree86/vbe/vbe.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/vbe/vbe.h,v 1.5 2004/02/02 03:55:32 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/vbe/vbe.h,v 1.4 2004/01/07 04:28:06 dawes Exp $ */
 
 /*
  *                   XFree86 vbe module
diff --git a/hw/xfree86/vbe/vbeModes.c b/hw/xfree86/vbe/vbeModes.c
index ae16d7b75..b3951f8f9 100644
--- a/hw/xfree86/vbe/vbeModes.c
+++ b/hw/xfree86/vbe/vbeModes.c
@@ -27,7 +27,7 @@
  *
  * Authors: David Dawes <dawes@xfree86.org>
  *
- * $XFree86: xc/programs/Xserver/hw/xfree86/vbe/vbeModes.c,v 1.4 2003/11/06 18:38:14 tsi Exp $
+ * $XFree86: xc/programs/Xserver/hw/xfree86/vbe/vbeModes.c,v 1.3tsi Exp $
  */
 
 #include "xf86.h"
diff --git a/hw/xfree86/vbe/vbeModes.h b/hw/xfree86/vbe/vbeModes.h
index b3c57b917..c37cbd8bf 100644
--- a/hw/xfree86/vbe/vbeModes.h
+++ b/hw/xfree86/vbe/vbeModes.h
@@ -26,7 +26,7 @@
  *
  * Authors: David Dawes <dawes@xfree86.org>
  *
- * $XFree86: xc/programs/Xserver/hw/xfree86/vbe/vbeModes.h,v 1.1 2003/02/17 17:06:46 dawes Exp $
+ * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/vbe/vbeModes.h,v 1.1 2002/08/06 13:46:28 dawes Exp $
  */
 
 #ifndef _VBE_MODES_H
diff --git a/hw/xfree86/vbe/vbe_module.c b/hw/xfree86/vbe/vbe_module.c
index 65b161a2c..d6f49a5c8 100644
--- a/hw/xfree86/vbe/vbe_module.c
+++ b/hw/xfree86/vbe/vbe_module.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/vbe/vbe_module.c,v 1.1 2003/02/17 17:06:46 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/vbe/vbe_module.c,v 1.4 2002/09/16 18:06:15 eich Exp $ */
 
 #include "xf86.h"
 #include "xf86str.h"
@@ -16,7 +16,7 @@ static XF86ModuleVersionInfo vbeVersRec =
     MODULEVENDORSTRING,
     MODINFOSTRING1,
     MODINFOSTRING2,
-    XF86_VERSION_CURRENT,
+    XORG_VERSION_CURRENT,
     1, 1, 0,
     ABI_CLASS_VIDEODRV,		/* needs the video driver ABI */
     ABI_VIDEODRV_VERSION,
diff --git a/hw/xfree86/vgahw/vgaCmap.c b/hw/xfree86/vgahw/vgaCmap.c
index a70f572b5..28f8b6fc7 100644
--- a/hw/xfree86/vgahw/vgaCmap.c
+++ b/hw/xfree86/vgahw/vgaCmap.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/vgahw/vgaCmap.c,v 1.7 2001/02/15 18:31:22 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/vgahw/vgaCmap.c,v 1.5 1998/11/22 10:37:38 dawes Exp $ */
 /*
  * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
  *
diff --git a/hw/xfree86/vgahw/vgaHWmodule.c b/hw/xfree86/vgahw/vgaHWmodule.c
index 409e7b511..d6044bbb7 100644
--- a/hw/xfree86/vgahw/vgaHWmodule.c
+++ b/hw/xfree86/vgahw/vgaHWmodule.c
@@ -14,7 +14,7 @@ static XF86ModuleVersionInfo VersRec = {
 	MODULEVENDORSTRING,
 	MODINFOSTRING1,
 	MODINFOSTRING2,
-	XF86_VERSION_CURRENT,
+	XORG_VERSION_CURRENT,
 	0, 1, 0,
 	ABI_CLASS_VIDEODRV,
 	ABI_VIDEODRV_VERSION,
diff --git a/hw/xfree86/xaa/XAA.HOWTO b/hw/xfree86/xaa/XAA.HOWTO
index 95d9d6100..cbd71c138 100644
--- a/hw/xfree86/xaa/XAA.HOWTO
+++ b/hw/xfree86/xaa/XAA.HOWTO
@@ -1424,4 +1424,4 @@ void DisableClipping (ScrnInfoPtr pScrn)
      pixmap with a particular dimension is allowed, then your driver will be
      expected to render primitives as large as that pixmap.  
 
-$XFree86: xc/programs/Xserver/hw/xfree86/xaa/XAA.HOWTO,v 1.13 2001/05/22 18:51:09 mvojkovi Exp $
+$XFree86: xc/programs/Xserver/hw/xfree86/xaa/XAA.HOWTO,v 1.12 2000/04/12 14:44:42 tsi Exp $
diff --git a/hw/xfree86/xaa/xaa.h b/hw/xfree86/xaa/xaa.h
index f183f8f02..98db3cf50 100644
--- a/hw/xfree86/xaa/xaa.h
+++ b/hw/xfree86/xaa/xaa.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaa.h,v 1.39 2002/10/30 12:52:43 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaa.h,v 1.38 2002/10/21 01:54:04 mvojkovi Exp $ */
 
 #ifndef _XAA_H
 #define _XAA_H
diff --git a/hw/xfree86/xaa/xaaBitBlt.c b/hw/xfree86/xaa/xaaBitBlt.c
index 83850767a..5bde21cbe 100644
--- a/hw/xfree86/xaa/xaaBitBlt.c
+++ b/hw/xfree86/xaa/xaaBitBlt.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaBitBlt.c,v 1.4 2003/11/10 18:22:39 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaBitBlt.c,v 1.3tsi Exp $ */
 
 /* 
    This is a lighter version of cfbBitBlt.  We calculate the boxes
diff --git a/hw/xfree86/xaa/xaaBitOrder.c b/hw/xfree86/xaa/xaaBitOrder.c
index d7f3ba2a3..ce19a853e 100644
--- a/hw/xfree86/xaa/xaaBitOrder.c
+++ b/hw/xfree86/xaa/xaaBitOrder.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaBitOrder.c,v 1.8 2003/02/17 16:08:29 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaBitOrder.c,v 1.7 2001/05/18 20:22:31 tsi Exp $ */
 
 #include "Xmd.h"
 CARD32 XAAReverseBitOrder(CARD32 v);
diff --git a/hw/xfree86/xaa/xaaBitmap.c b/hw/xfree86/xaa/xaaBitmap.c
index 9a8749dbf..272b9fb42 100644
--- a/hw/xfree86/xaa/xaaBitmap.c
+++ b/hw/xfree86/xaa/xaaBitmap.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaBitmap.c,v 1.10 2000/09/01 05:49:45 mvojkovi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaBitmap.c,v 1.9 2000/06/29 10:55:41 alanh Exp $ */
 
 
 #include "xaa.h"
diff --git a/hw/xfree86/xaa/xaaCpyArea.c b/hw/xfree86/xaa/xaaCpyArea.c
index 497c3e7a1..7a036937b 100644
--- a/hw/xfree86/xaa/xaaCpyArea.c
+++ b/hw/xfree86/xaa/xaaCpyArea.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaCpyArea.c,v 1.13 2001/02/19 22:19:49 mvojkovi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaCpyArea.c,v 1.12 2000/09/28 20:47:59 mvojkovi Exp $ */
 
 #include "misc.h"
 #include "xf86.h"
diff --git a/hw/xfree86/xaa/xaaCpyPlane.c b/hw/xfree86/xaa/xaaCpyPlane.c
index d3d1c8a5c..9e17a187f 100644
--- a/hw/xfree86/xaa/xaaCpyPlane.c
+++ b/hw/xfree86/xaa/xaaCpyPlane.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaCpyPlane.c,v 1.14 2003/11/10 18:22:40 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaCpyPlane.c,v 1.13tsi Exp $ */
 
 /*
    A CopyPlane function that handles bitmap->screen copies and
diff --git a/hw/xfree86/xaa/xaaCpyWin.c b/hw/xfree86/xaa/xaaCpyWin.c
index b77be1ad6..e4439c447 100644
--- a/hw/xfree86/xaa/xaaCpyWin.c
+++ b/hw/xfree86/xaa/xaaCpyWin.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaCpyWin.c,v 1.4 2003/11/10 18:22:40 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaCpyWin.c,v 1.3tsi Exp $ */
 
 #include "misc.h"
 #include "xf86.h"
diff --git a/hw/xfree86/xaa/xaaDashLine.c b/hw/xfree86/xaa/xaaDashLine.c
index 212116ae4..e5eba7819 100644
--- a/hw/xfree86/xaa/xaaDashLine.c
+++ b/hw/xfree86/xaa/xaaDashLine.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaDashLine.c,v 1.5 2002/09/18 18:14:59 martin Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaDashLine.c,v 1.4 2001/10/28 03:34:04 tsi Exp $ */
 
 #include "X.h"
 #include "misc.h"
diff --git a/hw/xfree86/xaa/xaaFallback.c b/hw/xfree86/xaa/xaaFallback.c
index 01b4bb408..6bc7bfed3 100644
--- a/hw/xfree86/xaa/xaaFallback.c
+++ b/hw/xfree86/xaa/xaaFallback.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaFallback.c,v 1.5 1999/05/30 03:03:31 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaFallback.c,v 1.4 1999/03/14 11:18:09 dawes Exp $ */
 
 #include "misc.h"
 #include "xf86.h"
diff --git a/hw/xfree86/xaa/xaaFillArc.c b/hw/xfree86/xaa/xaaFillArc.c
index 352d8e084..95ecf257b 100644
--- a/hw/xfree86/xaa/xaaFillArc.c
+++ b/hw/xfree86/xaa/xaaFillArc.c
@@ -21,7 +21,7 @@
  * 
  * Written by Harm Hanemaayer (H.Hanemaayer@inter.nl.net).
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaFillArc.c,v 1.4 1999/05/30 03:03:31 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaFillArc.c,v 1.3 1998/10/25 07:12:12 dawes Exp $ */
  
 /*
  * Filled solid arcs, based on cfbfillarc.c.
diff --git a/hw/xfree86/xaa/xaaFillPoly.c b/hw/xfree86/xaa/xaaFillPoly.c
index 5566f51e6..4ba1cd853 100644
--- a/hw/xfree86/xaa/xaaFillPoly.c
+++ b/hw/xfree86/xaa/xaaFillPoly.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaFillPoly.c,v 1.16 2003/03/23 03:41:44 mvojkovi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaFillPoly.c,v 1.15 2001/10/28 03:34:04 tsi Exp $ */
 
 /*
  * Copyright 1996  The XFree86 Project
diff --git a/hw/xfree86/xaa/xaaFillRect.c b/hw/xfree86/xaa/xaaFillRect.c
index cda56e327..7571ce3ca 100644
--- a/hw/xfree86/xaa/xaaFillRect.c
+++ b/hw/xfree86/xaa/xaaFillRect.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaFillRect.c,v 1.16 2003/11/10 18:22:40 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaFillRect.c,v 1.15tsi Exp $ */
 
 #include "misc.h"
 #include "xf86.h"
diff --git a/hw/xfree86/xaa/xaaGC.c b/hw/xfree86/xaa/xaaGC.c
index c9ef93a1b..b7a177521 100644
--- a/hw/xfree86/xaa/xaaGC.c
+++ b/hw/xfree86/xaa/xaaGC.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaGC.c,v 1.19 2001/02/19 22:19:50 mvojkovi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaGC.c,v 1.18 2000/09/28 20:48:00 mvojkovi Exp $ */
 
 #include "misc.h"
 #include "xf86.h"
diff --git a/hw/xfree86/xaa/xaaGCmisc.c b/hw/xfree86/xaa/xaaGCmisc.c
index ab6cb9a24..3eab6d46a 100644
--- a/hw/xfree86/xaa/xaaGCmisc.c
+++ b/hw/xfree86/xaa/xaaGCmisc.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaGCmisc.c,v 1.15 2000/09/25 23:56:14 mvojkovi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaGCmisc.c,v 1.14 2000/05/03 00:44:23 tsi Exp $ */
 
 #include "misc.h"
 #include "xf86.h"
diff --git a/hw/xfree86/xaa/xaaImage.c b/hw/xfree86/xaa/xaaImage.c
index c3db7ff57..b7ee997e3 100644
--- a/hw/xfree86/xaa/xaaImage.c
+++ b/hw/xfree86/xaa/xaaImage.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaImage.c,v 1.21 2003/11/10 18:22:41 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaImage.c,v 1.20tsi Exp $ */
 
 #include "misc.h"
 #include "xf86.h"
diff --git a/hw/xfree86/xaa/xaaInit.c b/hw/xfree86/xaa/xaaInit.c
index 5237e8b2c..186711e3f 100644
--- a/hw/xfree86/xaa/xaaInit.c
+++ b/hw/xfree86/xaa/xaaInit.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaInit.c,v 1.35 2001/07/19 18:50:16 mvojkovi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaInit.c,v 1.34 2001/07/19 14:19:42 tsi Exp $ */
 
 #include "misc.h"
 #include "xf86.h"
diff --git a/hw/xfree86/xaa/xaaInitAccel.c b/hw/xfree86/xaa/xaaInitAccel.c
index 1b1bc1830..02e5fb6fc 100644
--- a/hw/xfree86/xaa/xaaInitAccel.c
+++ b/hw/xfree86/xaa/xaaInitAccel.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaInitAccel.c,v 1.36 2003/01/12 03:55:51 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaInitAccel.c,v 1.35tsi Exp $ */
 
 #include "misc.h"
 #include "xf86.h"
@@ -101,7 +101,7 @@ static XF86ModuleVersionInfo xaaVersRec =
 	MODULEVENDORSTRING,
 	MODINFOSTRING1,
 	MODINFOSTRING2,
-	XF86_VERSION_CURRENT,
+	XORG_VERSION_CURRENT,
 	1, 1, 0,
 	ABI_CLASS_VIDEODRV,		/* requires the video driver ABI */
 	ABI_VIDEODRV_VERSION,
diff --git a/hw/xfree86/xaa/xaaLine.c b/hw/xfree86/xaa/xaaLine.c
index 2084e8d61..3149acf5c 100644
--- a/hw/xfree86/xaa/xaaLine.c
+++ b/hw/xfree86/xaa/xaaLine.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaLine.c,v 1.6 2002/09/18 18:15:00 martin Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaLine.c,v 1.5 2001/10/28 03:34:04 tsi Exp $ */
 
 #include "X.h"
 #include "misc.h"
diff --git a/hw/xfree86/xaa/xaaLineMisc.c b/hw/xfree86/xaa/xaaLineMisc.c
index 370921002..8afd479b7 100644
--- a/hw/xfree86/xaa/xaaLineMisc.c
+++ b/hw/xfree86/xaa/xaaLineMisc.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaLineMisc.c,v 1.5 1999/01/14 13:05:27 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaLineMisc.c,v 1.4 1998/09/27 04:43:45 dawes Exp $ */
 
 #include "misc.h"
 #include "xf86.h"
diff --git a/hw/xfree86/xaa/xaaNonTEGlyph.c b/hw/xfree86/xaa/xaaNonTEGlyph.c
index 234d242c4..514a8cf42 100644
--- a/hw/xfree86/xaa/xaaNonTEGlyph.c
+++ b/hw/xfree86/xaa/xaaNonTEGlyph.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaNonTEGlyph.c,v 1.6 1999/11/06 23:14:46 mvojkovi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaNonTEGlyph.c,v 1.4 1998/09/13 05:23:55 dawes Exp $ */
 
 
 #include "xaa.h"
diff --git a/hw/xfree86/xaa/xaaNonTEText.c b/hw/xfree86/xaa/xaaNonTEText.c
index e1c57588a..914631b58 100644
--- a/hw/xfree86/xaa/xaaNonTEText.c
+++ b/hw/xfree86/xaa/xaaNonTEText.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaNonTEText.c,v 1.14 2003/11/14 21:54:51 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaNonTEText.c,v 1.12 2000/04/07 19:11:10 mvojkovi Exp $ */
 
 /********************************************************************
 
diff --git a/hw/xfree86/xaa/xaaOffscreen.c b/hw/xfree86/xaa/xaaOffscreen.c
index 0fb1db365..b50b31bb0 100644
--- a/hw/xfree86/xaa/xaaOffscreen.c
+++ b/hw/xfree86/xaa/xaaOffscreen.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaOffscreen.c,v 1.6 2001/07/19 18:50:16 mvojkovi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaOffscreen.c,v 1.5 1999/07/04 06:39:17 dawes Exp $ */
 
 /*
    Copyright (c) 1999 -  The XFree86 Project Inc.
diff --git a/hw/xfree86/xaa/xaaOverlay.c b/hw/xfree86/xaa/xaaOverlay.c
index d527b7c15..78c89784e 100644
--- a/hw/xfree86/xaa/xaaOverlay.c
+++ b/hw/xfree86/xaa/xaaOverlay.c
@@ -1,4 +1,5 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaOverlay.c,v 1.15 2003/11/10 18:22:41 tsi Exp $ */
+/* $XdotOrg$ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaOverlay.c,v 1.14tsi Exp $ */
 
 #include "misc.h"
 #include "xf86.h"
diff --git a/hw/xfree86/xaa/xaaOverlayDF.c b/hw/xfree86/xaa/xaaOverlayDF.c
index 5cce3e7ed..eb20ea8dd 100644
--- a/hw/xfree86/xaa/xaaOverlayDF.c
+++ b/hw/xfree86/xaa/xaaOverlayDF.c
@@ -3,7 +3,7 @@
 
    Written by Mark Vojkovich
 */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaOverlayDF.c,v 1.2 2003/11/10 18:22:41 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaOverlayDF.c,v 1.1tsi Exp $ */
 
 
 #include "misc.h"
diff --git a/hw/xfree86/xaa/xaaPCache.c b/hw/xfree86/xaa/xaaPCache.c
index c7756ba93..25f8bd486 100644
--- a/hw/xfree86/xaa/xaaPCache.c
+++ b/hw/xfree86/xaa/xaaPCache.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaPCache.c,v 1.33 2003/11/03 05:11:54 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaPCache.c,v 1.32tsi Exp $ */
 
 #include "misc.h"
 #include "xf86.h"
diff --git a/hw/xfree86/xaa/xaaPaintWin.c b/hw/xfree86/xaa/xaaPaintWin.c
index 2adf42466..9c1cc715f 100644
--- a/hw/xfree86/xaa/xaaPaintWin.c
+++ b/hw/xfree86/xaa/xaaPaintWin.c
@@ -1,4 +1,5 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaPaintWin.c,v 1.11 2003/02/17 16:08:29 dawes Exp $ */
+/* $XdotOrg$ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaPaintWin.c,v 1.10 2001/10/28 03:34:04 tsi Exp $ */
 
 #include "misc.h"
 #include "xf86.h"
diff --git a/hw/xfree86/xaa/xaaPict.c b/hw/xfree86/xaa/xaaPict.c
index ce72d742c..af3380231 100644
--- a/hw/xfree86/xaa/xaaPict.c
+++ b/hw/xfree86/xaa/xaaPict.c
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaPict.c,v 1.19 2004/01/26 18:54:55 mvojkovi Exp $
+ * $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaPict.c,v 1.18 2003/04/23 18:35:34 eich Exp $
  *
  * Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc.
  *
diff --git a/hw/xfree86/xaa/xaaROP.c b/hw/xfree86/xaa/xaaROP.c
index 4075bab6a..70a7b1d7d 100644
--- a/hw/xfree86/xaa/xaaROP.c
+++ b/hw/xfree86/xaa/xaaROP.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaROP.c,v 1.2 2000/09/28 20:48:01 mvojkovi Exp $ */
+/* $XFree86$ */
 
 #include "X.h"
 #include "misc.h"
diff --git a/hw/xfree86/xaa/xaaRect.c b/hw/xfree86/xaa/xaaRect.c
index fe8d70de2..999d7177d 100644
--- a/hw/xfree86/xaa/xaaRect.c
+++ b/hw/xfree86/xaa/xaaRect.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaRect.c,v 1.3 1999/05/30 03:03:33 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaRect.c,v 1.2 1998/07/25 16:58:51 dawes Exp $ */
 
 #include "misc.h"
 #include "xf86.h"
diff --git a/hw/xfree86/xaa/xaaSpans.c b/hw/xfree86/xaa/xaaSpans.c
index 522225665..356774c29 100644
--- a/hw/xfree86/xaa/xaaSpans.c
+++ b/hw/xfree86/xaa/xaaSpans.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaSpans.c,v 1.15 2001/10/28 03:34:04 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaSpans.c,v 1.14 2000/03/28 01:21:05 mvojkovi Exp $ */
 
 #include "misc.h"
 #include "xf86.h"
diff --git a/hw/xfree86/xaa/xaaStateChange.c b/hw/xfree86/xaa/xaaStateChange.c
index b27a54e81..56cd9e3c4 100644
--- a/hw/xfree86/xaa/xaaStateChange.c
+++ b/hw/xfree86/xaa/xaaStateChange.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaStateChange.c,v 3.3 2003/08/22 19:27:31 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaStateChange.c,v 3.1 2000/06/20 05:08:49 dawes Exp $ */
 
 #include "misc.h"
 #include "xf86.h"
diff --git a/hw/xfree86/xaa/xaaStipple.c b/hw/xfree86/xaa/xaaStipple.c
index 862f50ba0..8b111d1cf 100644
--- a/hw/xfree86/xaa/xaaStipple.c
+++ b/hw/xfree86/xaa/xaaStipple.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaStipple.c,v 1.12 2003/08/04 22:18:31 mvojkovi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaStipple.c,v 1.11 2001/10/28 03:34:04 tsi Exp $ */
 
 #include "xaa.h"
 #include "xaalocal.h"
diff --git a/hw/xfree86/xaa/xaaTEGlyph.c b/hw/xfree86/xaa/xaaTEGlyph.c
index 845dccd4e..0fd572617 100644
--- a/hw/xfree86/xaa/xaaTEGlyph.c
+++ b/hw/xfree86/xaa/xaaTEGlyph.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaTEGlyph.c,v 1.9 2000/09/01 05:49:45 mvojkovi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaTEGlyph.c,v 1.7 1999/11/06 23:14:46 mvojkovi Exp $ */
 
 
 #include "xaa.h"
diff --git a/hw/xfree86/xaa/xaaTEGlyphBlt.S b/hw/xfree86/xaa/xaaTEGlyphBlt.S
index f5c580760..5f3137f45 100644
--- a/hw/xfree86/xaa/xaaTEGlyphBlt.S
+++ b/hw/xfree86/xaa/xaaTEGlyphBlt.S
@@ -21,7 +21,7 @@
  * 
  * Written by Harm Hanemaayer (H.Hanemaayer@inter.nl.net).
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaTEGlyphBlt.S,v 1.2 1999/12/27 00:39:52 robin Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaTEGlyphBlt.S,v 1.1 1999/07/10 07:24:54 dawes Exp $ */
 
 
 /*
diff --git a/hw/xfree86/xaa/xaaTEText.c b/hw/xfree86/xaa/xaaTEText.c
index 82fa28674..49089afb3 100644
--- a/hw/xfree86/xaa/xaaTEText.c
+++ b/hw/xfree86/xaa/xaaTEText.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaTEText.c,v 1.7 1999/05/30 03:03:33 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaTEText.c,v 1.6 1998/12/20 11:57:52 dawes Exp $ */
 
 /********************************************************************
 
diff --git a/hw/xfree86/xaa/xaaTables.c b/hw/xfree86/xaa/xaaTables.c
index 0d2ce760a..6c16f11d3 100644
--- a/hw/xfree86/xaa/xaaTables.c
+++ b/hw/xfree86/xaa/xaaTables.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaTables.c,v 1.2 1998/07/25 16:58:53 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaTables.c,v 1.1.2.1 1998/07/12 09:43:04 dawes Exp $ */
 
 /*
  * This is a table of 24-bit values, indexed with an 8-bit byte value, then
diff --git a/hw/xfree86/xaa/xaaWideLine.c b/hw/xfree86/xaa/xaaWideLine.c
index f999b425f..fedd8f44d 100644
--- a/hw/xfree86/xaa/xaaWideLine.c
+++ b/hw/xfree86/xaa/xaaWideLine.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaWideLine.c,v 1.11 2003/07/16 01:38:48 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaWideLine.c,v 1.10 2001/11/16 16:47:56 dawes Exp $ */
 
 /*
 
diff --git a/hw/xfree86/xaa/xaacexp.h b/hw/xfree86/xaa/xaacexp.h
index 276f01672..933d8f733 100644
--- a/hw/xfree86/xaa/xaacexp.h
+++ b/hw/xfree86/xaa/xaacexp.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaacexp.h,v 1.5 2000/06/13 02:51:25 mvojkovi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaacexp.h,v 1.3 2000/01/21 02:30:06 dawes Exp $ */
 
 
 #include "Xarch.h"
diff --git a/hw/xfree86/xaa/xaalocal.h b/hw/xfree86/xaa/xaalocal.h
index 4504deffd..04d8d154a 100644
--- a/hw/xfree86/xaa/xaalocal.h
+++ b/hw/xfree86/xaa/xaalocal.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaalocal.h,v 1.37 2003/11/10 18:22:41 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaalocal.h,v 1.36tsi Exp $ */
 
 #ifndef _XAALOCAL_H
 #define _XAALOCAL_H
diff --git a/hw/xfree86/xaa/xaarop.h b/hw/xfree86/xaa/xaarop.h
index 8fee07533..048ed00fc 100644
--- a/hw/xfree86/xaa/xaarop.h
+++ b/hw/xfree86/xaa/xaarop.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaarop.h,v 1.1 1999/03/21 07:35:31 dawes Exp $ */
+/* $XFree86$ */
 
 /*
 
diff --git a/hw/xfree86/xaa/xaawrap.h b/hw/xfree86/xaa/xaawrap.h
index e6963c325..59f0a2cc7 100644
--- a/hw/xfree86/xaa/xaawrap.h
+++ b/hw/xfree86/xaa/xaawrap.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaawrap.h,v 1.5 2000/09/20 02:05:42 keithp Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaawrap.h,v 1.3 1998/10/25 07:12:14 dawes Exp $ */
 
 #define XAA_SCREEN_PROLOGUE(pScreen, field)\
   ((pScreen)->field = \
diff --git a/hw/xfree86/xf1bpp/mfbmap.h b/hw/xfree86/xf1bpp/mfbmap.h
index e72fa4316..a29332497 100644
--- a/hw/xfree86/xf1bpp/mfbmap.h
+++ b/hw/xfree86/xf1bpp/mfbmap.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf1bpp/mfbmap.h,v 1.2 1998/07/25 16:59:24 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xf1bpp/mfbmap.h,v 1.1.2.2 1998/06/08 15:13:15 dawes Exp $ */
 
 #ifndef _MFBMAP_H
 #define _MFBMAP_H
diff --git a/hw/xfree86/xf1bpp/mfbmap.sh b/hw/xfree86/xf1bpp/mfbmap.sh
index a8f43eceb..514040776 100644
--- a/hw/xfree86/xf1bpp/mfbmap.sh
+++ b/hw/xfree86/xf1bpp/mfbmap.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# $XFree86: xc/programs/Xserver/hw/xfree86/xf1bpp/mfbmap.sh,v 1.2 1998/07/25 16:59:24 dawes Exp $
+# $XFree86: xc/programs/Xserver/hw/xfree86/xf1bpp/mfbmap.sh,v 1.1.2.3 1998/06/27 14:48:23 dawes Exp $
 #
 # This script recreates the mapping list that maps the mfb external
 #  symbols * to xf1bpp* (without "mfb")
diff --git a/hw/xfree86/xf1bpp/mfbmodule.c b/hw/xfree86/xf1bpp/mfbmodule.c
index 4fb795152..81baf5d7e 100644
--- a/hw/xfree86/xf1bpp/mfbmodule.c
+++ b/hw/xfree86/xf1bpp/mfbmodule.c
@@ -35,7 +35,7 @@ static XF86ModuleVersionInfo VersRec =
         MODULEVENDORSTRING,
         MODINFOSTRING1,
         MODINFOSTRING2,
-        XF86_VERSION_CURRENT,
+        XORG_VERSION_CURRENT,
         1, 0, 0,
         ABI_CLASS_ANSIC,        /* Only need ansic layer */
         ABI_ANSIC_VERSION,
diff --git a/hw/xfree86/xf1bpp/mfbunmap.h b/hw/xfree86/xf1bpp/mfbunmap.h
index 94c029856..0134872e0 100644
--- a/hw/xfree86/xf1bpp/mfbunmap.h
+++ b/hw/xfree86/xf1bpp/mfbunmap.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf1bpp/mfbunmap.h,v 1.2 1998/07/25 16:59:25 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xf1bpp/mfbunmap.h,v 1.1.2.1 1998/06/27 14:48:24 dawes Exp $ */
 
 #ifdef _MFBMAP_H
 #undef _MFBMAP_H
diff --git a/hw/xfree86/xf1bpp/mfbunmap.sh b/hw/xfree86/xf1bpp/mfbunmap.sh
index 6b244e68e..44dc781fc 100644
--- a/hw/xfree86/xf1bpp/mfbunmap.sh
+++ b/hw/xfree86/xf1bpp/mfbunmap.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# $XFree86: xc/programs/Xserver/hw/xfree86/xf1bpp/mfbunmap.sh,v 1.2 1998/07/25 16:59:25 dawes Exp $
+# $XFree86: xc/programs/Xserver/hw/xfree86/xf1bpp/mfbunmap.sh,v 1.1.2.1 1998/06/27 14:48:24 dawes Exp $
 #
 # This script recreates a header that undoes the effect of mfbmap.h
 # This should only be rerun if there have been changes in the mfb code
diff --git a/hw/xfree86/xf4bpp/NOTES b/hw/xfree86/xf4bpp/NOTES
index f9ccc95c1..e3b77dcfd 100644
--- a/hw/xfree86/xf4bpp/NOTES
+++ b/hw/xfree86/xf4bpp/NOTES
@@ -191,4 +191,4 @@ MORE NOTES:
 
 
 
-$XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/NOTES,v 1.2 1998/07/25 16:59:26 dawes Exp $
+$XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/NOTES,v 1.1.2.2 1998/06/27 15:15:45 dawes Exp $
diff --git a/hw/xfree86/xf4bpp/OScompiler.h b/hw/xfree86/xf4bpp/OScompiler.h
index 3891f1e21..9b5ea57ea 100644
--- a/hw/xfree86/xf4bpp/OScompiler.h
+++ b/hw/xfree86/xf4bpp/OScompiler.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/OScompiler.h,v 1.4 2000/07/26 01:52:26 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/OScompiler.h,v 1.3 1999/01/31 12:22:15 dawes Exp $ */
 /*
  * Copyright IBM Corporation 1987,1988,1989
  *
diff --git a/hw/xfree86/xf4bpp/emulOpStip.c b/hw/xfree86/xf4bpp/emulOpStip.c
index e9ac98dc9..4a347b5d1 100644
--- a/hw/xfree86/xf4bpp/emulOpStip.c
+++ b/hw/xfree86/xf4bpp/emulOpStip.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/emulOpStip.c,v 1.3 1999/06/06 08:48:54 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/emulOpStip.c,v 1.2 1998/07/25 16:59:27 dawes Exp $ */
 /*
  * Copyright IBM Corporation 1987,1988,1989
  *
diff --git a/hw/xfree86/xf4bpp/emulRepAre.c b/hw/xfree86/xf4bpp/emulRepAre.c
index 42f118aac..a7f115682 100644
--- a/hw/xfree86/xf4bpp/emulRepAre.c
+++ b/hw/xfree86/xf4bpp/emulRepAre.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/emulRepAre.c,v 1.3 1999/06/06 08:48:54 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/emulRepAre.c,v 1.2 1998/07/25 16:59:27 dawes Exp $ */
 /*
  * Copyright IBM Corporation 1987,1988,1989
  *
diff --git a/hw/xfree86/xf4bpp/emulTile.c b/hw/xfree86/xf4bpp/emulTile.c
index 650c448b8..1e2d095ee 100644
--- a/hw/xfree86/xf4bpp/emulTile.c
+++ b/hw/xfree86/xf4bpp/emulTile.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/emulTile.c,v 1.4 2003/11/03 05:11:56 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/emulTile.c,v 1.3tsi Exp $ */
 /*
  * Copyright IBM Corporation 1987,1988,1989
  *
diff --git a/hw/xfree86/xf4bpp/ibmTrace.h b/hw/xfree86/xf4bpp/ibmTrace.h
index f99ce33e0..15231a653 100644
--- a/hw/xfree86/xf4bpp/ibmTrace.h
+++ b/hw/xfree86/xf4bpp/ibmTrace.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ibmTrace.h,v 1.2 1998/07/25 16:59:28 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ibmTrace.h,v 1.1.2.1 1998/06/27 14:48:30 dawes Exp $ */
 
 
 
diff --git a/hw/xfree86/xf4bpp/mfbbres.c b/hw/xfree86/xf4bpp/mfbbres.c
index 300256021..82b17e59e 100644
--- a/hw/xfree86/xf4bpp/mfbbres.c
+++ b/hw/xfree86/xf4bpp/mfbbres.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/mfbbres.c,v 1.3 1999/06/06 08:48:54 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/mfbbres.c,v 1.2 1998/07/25 16:59:28 dawes Exp $ */
 /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
 /***********************************************************
 
diff --git a/hw/xfree86/xf4bpp/mfbbresd.c b/hw/xfree86/xf4bpp/mfbbresd.c
index 560995957..29b816a3a 100644
--- a/hw/xfree86/xf4bpp/mfbbresd.c
+++ b/hw/xfree86/xf4bpp/mfbbresd.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/mfbbresd.c,v 1.4 2002/01/25 21:56:22 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/mfbbresd.c,v 1.3 1999/06/06 08:48:55 dawes Exp $ */
 /***********************************************************
 
 Copyright (c) 1987  X Consortium
diff --git a/hw/xfree86/xf4bpp/mfbfillarc.c b/hw/xfree86/xf4bpp/mfbfillarc.c
index 4c4d8eab6..5d677174d 100644
--- a/hw/xfree86/xf4bpp/mfbfillarc.c
+++ b/hw/xfree86/xf4bpp/mfbfillarc.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/mfbfillarc.c,v 1.6 2003/11/03 05:11:56 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/mfbfillarc.c,v 1.5tsi Exp $ */
 /************************************************************
 
 Copyright (c) 1989  X Consortium
diff --git a/hw/xfree86/xf4bpp/mfbhrzvert.c b/hw/xfree86/xf4bpp/mfbhrzvert.c
index 3d6c3df52..c53edd19d 100644
--- a/hw/xfree86/xf4bpp/mfbhrzvert.c
+++ b/hw/xfree86/xf4bpp/mfbhrzvert.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/mfbhrzvert.c,v 1.3 1999/06/06 08:48:55 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/mfbhrzvert.c,v 1.2 1998/07/25 16:59:29 dawes Exp $ */
 /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
 /***********************************************************
 
diff --git a/hw/xfree86/xf4bpp/mfbimggblt.c b/hw/xfree86/xf4bpp/mfbimggblt.c
index a5d5b5b37..b4f5bd014 100644
--- a/hw/xfree86/xf4bpp/mfbimggblt.c
+++ b/hw/xfree86/xf4bpp/mfbimggblt.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/mfbimggblt.c,v 1.9 2003/11/17 22:20:42 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/mfbimggblt.c,v 1.8 2003/11/03 05:11:56 tsi Exp $ */
 
 /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
 /***********************************************************
diff --git a/hw/xfree86/xf4bpp/mfbline.c b/hw/xfree86/xf4bpp/mfbline.c
index c2717599f..b200a611e 100644
--- a/hw/xfree86/xf4bpp/mfbline.c
+++ b/hw/xfree86/xf4bpp/mfbline.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/mfbline.c,v 1.6 2003/11/17 22:20:42 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/mfbline.c,v 1.5 2003/11/03 05:11:56 tsi Exp $ */
 /***********************************************************
 
 Copyright (c) 1987  X Consortium
diff --git a/hw/xfree86/xf4bpp/mfbzerarc.c b/hw/xfree86/xf4bpp/mfbzerarc.c
index 7ca32d903..106fc6ae5 100644
--- a/hw/xfree86/xf4bpp/mfbzerarc.c
+++ b/hw/xfree86/xf4bpp/mfbzerarc.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/mfbzerarc.c,v 1.5 2003/02/18 21:29:59 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/mfbzerarc.c,v 1.4tsi Exp $ */
 
 /************************************************************
 
diff --git a/hw/xfree86/xf4bpp/offscreen.c b/hw/xfree86/xf4bpp/offscreen.c
index 1d118863f..e684bf118 100644
--- a/hw/xfree86/xf4bpp/offscreen.c
+++ b/hw/xfree86/xf4bpp/offscreen.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/offscreen.c,v 1.5 2001/08/01 00:44:56 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/offscreen.c,v 1.4 1999/10/13 20:04:26 alanh Exp $ */
 /*
  * Copyright 1993 Gerrit Jan Akkerman 
  *
diff --git a/hw/xfree86/xf4bpp/ppcArea.c b/hw/xfree86/xf4bpp/ppcArea.c
index 40e9d5b32..0d1a2075b 100644
--- a/hw/xfree86/xf4bpp/ppcArea.c
+++ b/hw/xfree86/xf4bpp/ppcArea.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcArea.c,v 1.4 2003/02/18 21:29:59 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcArea.c,v 1.3tsi Exp $ */
 /*
  * Copyright IBM Corporation 1987,1988,1989
  *
diff --git a/hw/xfree86/xf4bpp/ppcBStore.c b/hw/xfree86/xf4bpp/ppcBStore.c
index a1f49a486..295f52159 100644
--- a/hw/xfree86/xf4bpp/ppcBStore.c
+++ b/hw/xfree86/xf4bpp/ppcBStore.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcBStore.c,v 1.3 1999/06/06 08:48:57 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcBStore.c,v 1.2 1998/07/25 16:59:32 dawes Exp $ */
 /*
 
 Copyright (c) 1987  X Consortium
diff --git a/hw/xfree86/xf4bpp/ppcCReduce.c b/hw/xfree86/xf4bpp/ppcCReduce.c
index a68f5faff..aef3c2dd5 100644
--- a/hw/xfree86/xf4bpp/ppcCReduce.c
+++ b/hw/xfree86/xf4bpp/ppcCReduce.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcCReduce.c,v 1.3 1999/06/06 08:48:58 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcCReduce.c,v 1.2 1998/07/25 16:59:32 dawes Exp $ */
 /*
  * Copyright IBM Corporation 1987,1988,1989
  *
diff --git a/hw/xfree86/xf4bpp/ppcClip.c b/hw/xfree86/xf4bpp/ppcClip.c
index cd307fe94..87b387176 100644
--- a/hw/xfree86/xf4bpp/ppcClip.c
+++ b/hw/xfree86/xf4bpp/ppcClip.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcClip.c,v 1.5 1999/09/25 14:38:16 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcClip.c,v 1.4 1999/06/06 08:48:58 dawes Exp $ */
 /*
 
 Copyright (c) 1987  X Consortium
diff --git a/hw/xfree86/xf4bpp/ppcCpArea.c b/hw/xfree86/xf4bpp/ppcCpArea.c
index 86b7d6f6c..c6df4ef41 100644
--- a/hw/xfree86/xf4bpp/ppcCpArea.c
+++ b/hw/xfree86/xf4bpp/ppcCpArea.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcCpArea.c,v 1.7 2003/11/10 18:22:42 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcCpArea.c,v 1.6tsi Exp $ */
 /*
  * Copyright IBM Corporation 1987,1988,1989
  *
diff --git a/hw/xfree86/xf4bpp/ppcDepth.c b/hw/xfree86/xf4bpp/ppcDepth.c
index 919fa0133..5c3aff6f6 100644
--- a/hw/xfree86/xf4bpp/ppcDepth.c
+++ b/hw/xfree86/xf4bpp/ppcDepth.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcDepth.c,v 1.3 1999/06/06 08:48:58 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcDepth.c,v 1.2 1998/07/25 16:59:33 dawes Exp $ */
 /*
  * Copyright IBM Corporation 1987,1988,1989
  *
diff --git a/hw/xfree86/xf4bpp/ppcFillRct.c b/hw/xfree86/xf4bpp/ppcFillRct.c
index af1ecb95e..ec9032e57 100644
--- a/hw/xfree86/xf4bpp/ppcFillRct.c
+++ b/hw/xfree86/xf4bpp/ppcFillRct.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcFillRct.c,v 1.6 2003/11/03 05:11:57 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcFillRct.c,v 1.5tsi Exp $ */
 /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
 /***********************************************************
 
diff --git a/hw/xfree86/xf4bpp/ppcGC.c b/hw/xfree86/xf4bpp/ppcGC.c
index df8ae335f..bbc64c97c 100644
--- a/hw/xfree86/xf4bpp/ppcGC.c
+++ b/hw/xfree86/xf4bpp/ppcGC.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcGC.c,v 1.8 2003/02/18 21:29:59 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcGC.c,v 1.7tsi Exp $ */
 /*
 
 Copyright (c) 1987  X Consortium
diff --git a/hw/xfree86/xf4bpp/ppcGCstr.h b/hw/xfree86/xf4bpp/ppcGCstr.h
index 341e17534..78273ca23 100644
--- a/hw/xfree86/xf4bpp/ppcGCstr.h
+++ b/hw/xfree86/xf4bpp/ppcGCstr.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcGCstr.h,v 1.4 2003/11/17 22:20:42 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcGCstr.h,v 1.3 2003/02/18 21:29:59 tsi Exp $ */
 /*
  * Copyright IBM Corporation 1987,1988,1989
  *
diff --git a/hw/xfree86/xf4bpp/ppcGetSp.c b/hw/xfree86/xf4bpp/ppcGetSp.c
index b6c404e80..00cd985a7 100644
--- a/hw/xfree86/xf4bpp/ppcGetSp.c
+++ b/hw/xfree86/xf4bpp/ppcGetSp.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcGetSp.c,v 1.3 1999/06/06 08:48:59 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcGetSp.c,v 1.2 1998/07/25 16:59:34 dawes Exp $ */
 /*
  * Copyright IBM Corporation 1987,1988,1989
  *
diff --git a/hw/xfree86/xf4bpp/ppcIO.c b/hw/xfree86/xf4bpp/ppcIO.c
index f6999c561..02019b19a 100644
--- a/hw/xfree86/xf4bpp/ppcIO.c
+++ b/hw/xfree86/xf4bpp/ppcIO.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcIO.c,v 1.6 2003/11/03 05:11:57 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcIO.c,v 1.5tsi Exp $ */
 /*
 
 Copyright (c) 1990  X Consortium
diff --git a/hw/xfree86/xf4bpp/ppcImg.c b/hw/xfree86/xf4bpp/ppcImg.c
index 275db433a..948359a30 100644
--- a/hw/xfree86/xf4bpp/ppcImg.c
+++ b/hw/xfree86/xf4bpp/ppcImg.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcImg.c,v 1.5 2003/02/18 21:29:59 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcImg.c,v 1.4tsi Exp $ */
 /*
  * Copyright IBM Corporation 1987,1988,1989
  *
diff --git a/hw/xfree86/xf4bpp/ppcPixFS.c b/hw/xfree86/xf4bpp/ppcPixFS.c
index c009d696e..66b547e59 100644
--- a/hw/xfree86/xf4bpp/ppcPixFS.c
+++ b/hw/xfree86/xf4bpp/ppcPixFS.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcPixFS.c,v 1.5 2003/11/03 05:11:57 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcPixFS.c,v 1.4tsi Exp $ */
 /*
  * Copyright IBM Corporation 1987,1988,1989
  *
diff --git a/hw/xfree86/xf4bpp/ppcPixmap.c b/hw/xfree86/xf4bpp/ppcPixmap.c
index 2317fbdfa..c3085bc4b 100644
--- a/hw/xfree86/xf4bpp/ppcPixmap.c
+++ b/hw/xfree86/xf4bpp/ppcPixmap.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcPixmap.c,v 1.5 2000/04/27 16:26:49 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcPixmap.c,v 1.3 1999/01/14 13:05:34 dawes Exp $ */
 /*
  * Copyright IBM Corporation 1987,1988,1989
  *
diff --git a/hw/xfree86/xf4bpp/ppcPntWin.c b/hw/xfree86/xf4bpp/ppcPntWin.c
index f52343fc9..65ff055d2 100644
--- a/hw/xfree86/xf4bpp/ppcPntWin.c
+++ b/hw/xfree86/xf4bpp/ppcPntWin.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcPntWin.c,v 1.4 2003/11/17 22:20:42 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcPntWin.c,v 1.3 1999/06/06 08:49:01 dawes Exp $ */
 /*
  * Copyright IBM Corporation 1987,1988,1989
  *
diff --git a/hw/xfree86/xf4bpp/ppcPolyPnt.c b/hw/xfree86/xf4bpp/ppcPolyPnt.c
index d080a623f..736d128c6 100644
--- a/hw/xfree86/xf4bpp/ppcPolyPnt.c
+++ b/hw/xfree86/xf4bpp/ppcPolyPnt.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcPolyPnt.c,v 1.4 1999/09/25 14:38:17 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcPolyPnt.c,v 1.3 1999/06/06 08:49:01 dawes Exp $ */
 /*
 
 Copyright (c) 1987  X Consortium
diff --git a/hw/xfree86/xf4bpp/ppcPolyRec.c b/hw/xfree86/xf4bpp/ppcPolyRec.c
index 754eb3732..8bb43eea4 100644
--- a/hw/xfree86/xf4bpp/ppcPolyRec.c
+++ b/hw/xfree86/xf4bpp/ppcPolyRec.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcPolyRec.c,v 1.3 1999/06/06 08:49:01 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcPolyRec.c,v 1.2 1998/07/25 16:59:36 dawes Exp $ */
 /*
  * Copyright IBM Corporation 1987,1988,1989
  *
diff --git a/hw/xfree86/xf4bpp/ppcQuery.c b/hw/xfree86/xf4bpp/ppcQuery.c
index 57d5fcff8..267eef0ef 100644
--- a/hw/xfree86/xf4bpp/ppcQuery.c
+++ b/hw/xfree86/xf4bpp/ppcQuery.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcQuery.c,v 1.3 1999/06/06 08:49:01 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcQuery.c,v 1.2 1998/07/25 16:59:37 dawes Exp $ */
 /*
  * Copyright IBM Corporation 1987,1988,1989
  *
diff --git a/hw/xfree86/xf4bpp/ppcRslvC.c b/hw/xfree86/xf4bpp/ppcRslvC.c
index 5d33bc3c9..47e427755 100644
--- a/hw/xfree86/xf4bpp/ppcRslvC.c
+++ b/hw/xfree86/xf4bpp/ppcRslvC.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcRslvC.c,v 1.5 2001/12/17 20:00:46 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcRslvC.c,v 1.4 1999/06/06 08:49:01 dawes Exp $ */
 /************************************************************
 Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA.
 
diff --git a/hw/xfree86/xf4bpp/ppcSetSp.c b/hw/xfree86/xf4bpp/ppcSetSp.c
index 81294b2cc..9c3464de1 100644
--- a/hw/xfree86/xf4bpp/ppcSetSp.c
+++ b/hw/xfree86/xf4bpp/ppcSetSp.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcSetSp.c,v 1.3 1999/06/06 08:49:02 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcSetSp.c,v 1.2 1998/07/25 16:59:41 dawes Exp $ */
 /*
  * Copyright IBM Corporation 1987,1988,1989
  *
diff --git a/hw/xfree86/xf4bpp/ppcSpMcro.h b/hw/xfree86/xf4bpp/ppcSpMcro.h
index 7ea244f66..bc56ca1fc 100644
--- a/hw/xfree86/xf4bpp/ppcSpMcro.h
+++ b/hw/xfree86/xf4bpp/ppcSpMcro.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcSpMcro.h,v 1.2 1998/07/25 16:59:42 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcSpMcro.h,v 1.1.2.1 1998/06/27 14:48:49 dawes Exp $ */
 /*
  * Copyright IBM Corporation 1987,1988,1989
  *
diff --git a/hw/xfree86/xf4bpp/ppcWinFS.c b/hw/xfree86/xf4bpp/ppcWinFS.c
index fc38cdcfe..ff59fccff 100644
--- a/hw/xfree86/xf4bpp/ppcWinFS.c
+++ b/hw/xfree86/xf4bpp/ppcWinFS.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcWinFS.c,v 1.4 2003/11/03 05:11:57 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcWinFS.c,v 1.3tsi Exp $ */
 /*
  * Copyright IBM Corporation 1987,1988,1989
  *
diff --git a/hw/xfree86/xf4bpp/ppcWindow.c b/hw/xfree86/xf4bpp/ppcWindow.c
index 1de8d68ee..a1c7afd9d 100644
--- a/hw/xfree86/xf4bpp/ppcWindow.c
+++ b/hw/xfree86/xf4bpp/ppcWindow.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcWindow.c,v 1.4 1999/09/25 14:38:17 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcWindow.c,v 1.3 1999/06/06 08:49:06 dawes Exp $ */
 /*
 
 Copyright (c) 1987  X Consortium
diff --git a/hw/xfree86/xf4bpp/vgaBitBlt.c b/hw/xfree86/xf4bpp/vgaBitBlt.c
index 660cc356b..dc7b7965a 100644
--- a/hw/xfree86/xf4bpp/vgaBitBlt.c
+++ b/hw/xfree86/xf4bpp/vgaBitBlt.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/vgaBitBlt.c,v 1.6 2003/11/17 22:20:42 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/vgaBitBlt.c,v 1.5 2003/11/03 05:11:57 tsi Exp $ */
 /* GJA -- span move routines */
 
 
diff --git a/hw/xfree86/xf4bpp/vgaGC.c b/hw/xfree86/xf4bpp/vgaGC.c
index 867e2c50e..39597d268 100644
--- a/hw/xfree86/xf4bpp/vgaGC.c
+++ b/hw/xfree86/xf4bpp/vgaGC.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/vgaGC.c,v 1.4 2003/02/18 21:29:59 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/vgaGC.c,v 1.3tsi Exp $ */
 /*
 
 Copyright (c) 1987  X Consortium
diff --git a/hw/xfree86/xf4bpp/vgaImages.c b/hw/xfree86/xf4bpp/vgaImages.c
index 4357e4d8a..a03f21d2b 100644
--- a/hw/xfree86/xf4bpp/vgaImages.c
+++ b/hw/xfree86/xf4bpp/vgaImages.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/vgaImages.c,v 1.5 2003/11/03 05:11:57 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/vgaImages.c,v 1.4tsi Exp $ */
 /*
  * Copyright IBM Corporation 1987,1988,1989
  *
diff --git a/hw/xfree86/xf4bpp/vgaReg.h b/hw/xfree86/xf4bpp/vgaReg.h
index 43f59d938..a3596e6a3 100644
--- a/hw/xfree86/xf4bpp/vgaReg.h
+++ b/hw/xfree86/xf4bpp/vgaReg.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/vgaReg.h,v 1.4 2002/01/25 21:56:22 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/vgaReg.h,v 1.3 1999/06/06 08:49:07 dawes Exp $ */
 /*
  * Copyright IBM Corporation 1987,1988,1989
  *
diff --git a/hw/xfree86/xf4bpp/vgaSolid.c b/hw/xfree86/xf4bpp/vgaSolid.c
index b3711f852..6cd15e9f5 100644
--- a/hw/xfree86/xf4bpp/vgaSolid.c
+++ b/hw/xfree86/xf4bpp/vgaSolid.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/vgaSolid.c,v 1.6 2003/11/03 05:11:57 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/vgaSolid.c,v 1.5tsi Exp $ */
 /*
  * Copyright IBM Corporation 1987,1988,1989
  *
diff --git a/hw/xfree86/xf4bpp/vgaStipple.c b/hw/xfree86/xf4bpp/vgaStipple.c
index f5ace74d0..316b4a49b 100644
--- a/hw/xfree86/xf4bpp/vgaStipple.c
+++ b/hw/xfree86/xf4bpp/vgaStipple.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/vgaStipple.c,v 1.6 2003/11/03 05:11:57 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/vgaStipple.c,v 1.5tsi Exp $ */
 /*
  * Copyright IBM Corporation 1987,1988,1989
  *
diff --git a/hw/xfree86/xf4bpp/vgaVideo.h b/hw/xfree86/xf4bpp/vgaVideo.h
index ecc2fa738..345492c59 100644
--- a/hw/xfree86/xf4bpp/vgaVideo.h
+++ b/hw/xfree86/xf4bpp/vgaVideo.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/vgaVideo.h,v 1.2 1998/07/25 16:59:45 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/vgaVideo.h,v 1.1.2.1 1998/06/27 14:48:54 dawes Exp $ */
 /*
  * Copyright IBM Corporation 1987,1988,1989
  *
diff --git a/hw/xfree86/xf4bpp/vgamodule.c b/hw/xfree86/xf4bpp/vgamodule.c
index c7cf1b7d3..828989dd5 100644
--- a/hw/xfree86/xf4bpp/vgamodule.c
+++ b/hw/xfree86/xf4bpp/vgamodule.c
@@ -36,7 +36,7 @@ static XF86ModuleVersionInfo VersRec =
         MODULEVENDORSTRING,
         MODINFOSTRING1,
         MODINFOSTRING2,
-        XF86_VERSION_CURRENT,
+        XORG_VERSION_CURRENT,
         1, 0, 0,
         ABI_CLASS_ANSIC,	/* Only need ansic layer */
         ABI_ANSIC_VERSION,
diff --git a/hw/xfree86/xf4bpp/wm3.c b/hw/xfree86/xf4bpp/wm3.c
index 3509ce77f..f3acf8123 100644
--- a/hw/xfree86/xf4bpp/wm3.c
+++ b/hw/xfree86/xf4bpp/wm3.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/wm3.c,v 1.4 2002/01/25 21:56:23 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/wm3.c,v 1.3 1999/06/06 08:49:08 dawes Exp $ */
 
 
 
diff --git a/hw/xfree86/xf4bpp/wm3.h b/hw/xfree86/xf4bpp/wm3.h
index 5fd303d7d..1c7261eb9 100644
--- a/hw/xfree86/xf4bpp/wm3.h
+++ b/hw/xfree86/xf4bpp/wm3.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/wm3.h,v 1.3 2000/09/26 15:57:21 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/wm3.h,v 1.2 1998/07/25 16:59:46 dawes Exp $ */
 
 
 
diff --git a/hw/xfree86/xf4bpp/xf4bpp.h b/hw/xfree86/xf4bpp/xf4bpp.h
index 59458a258..976f27e32 100644
--- a/hw/xfree86/xf4bpp/xf4bpp.h
+++ b/hw/xfree86/xf4bpp/xf4bpp.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/xf4bpp.h,v 1.10 2003/11/17 22:20:42 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/xf4bpp.h,v 1.9 2003/11/03 05:11:57 tsi Exp $ */
 
 
 #ifndef __XF4BPP_H__
diff --git a/hw/xfree86/xf8_16bpp/cfb8_16.h b/hw/xfree86/xf8_16bpp/cfb8_16.h
index b7fa9fd00..a4a3bda22 100644
--- a/hw/xfree86/xf8_16bpp/cfb8_16.h
+++ b/hw/xfree86/xf8_16bpp/cfb8_16.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_16bpp/cfb8_16.h,v 1.2 1999/03/28 15:33:09 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_16bpp/cfb8_16.h,v 1.1 1999/01/31 12:22:16 dawes Exp $ */
 
 #ifndef _CFB8_16_H
 #define _CFB8_16_H
diff --git a/hw/xfree86/xf8_16bpp/cfb8_16module.c b/hw/xfree86/xf8_16bpp/cfb8_16module.c
index d0d1974e7..1a034980a 100644
--- a/hw/xfree86/xf8_16bpp/cfb8_16module.c
+++ b/hw/xfree86/xf8_16bpp/cfb8_16module.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_16bpp/cfb8_16module.c,v 1.1 1999/01/31 12:22:16 dawes Exp $ */
+/* $XFree86$ */
 
 #ifdef XFree86LOADER
 
@@ -12,7 +12,7 @@ static XF86ModuleVersionInfo VersRec =
         MODULEVENDORSTRING,
         MODINFOSTRING1,
         MODINFOSTRING2,
-        XF86_VERSION_CURRENT,
+        XORG_VERSION_CURRENT,
         1, 0, 0,
         ABI_CLASS_ANSIC,                /* Only need the ansic layer */
         ABI_ANSIC_VERSION,
diff --git a/hw/xfree86/xf8_16bpp/cfbscrinit.c b/hw/xfree86/xf8_16bpp/cfbscrinit.c
index 5e19fb7a2..cb4b8d726 100644
--- a/hw/xfree86/xf8_16bpp/cfbscrinit.c
+++ b/hw/xfree86/xf8_16bpp/cfbscrinit.c
@@ -4,7 +4,7 @@
    Written by Mark Vojkovich (mvojkovi@ucsd.edu)
 */
 
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_16bpp/cfbscrinit.c,v 1.8 2003/02/17 16:08:30 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_16bpp/cfbscrinit.c,v 1.7 2000/01/21 01:12:24 dawes Exp $ */
 
 #include "X.h"
 #include "Xmd.h"
diff --git a/hw/xfree86/xf8_16bpp/cfbwindow.c b/hw/xfree86/xf8_16bpp/cfbwindow.c
index 757b0dc49..277abafc8 100644
--- a/hw/xfree86/xf8_16bpp/cfbwindow.c
+++ b/hw/xfree86/xf8_16bpp/cfbwindow.c
@@ -4,7 +4,7 @@
    Written by Mark Vojkovich (mvojkovi@ucsd.edu)
 */
 
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_16bpp/cfbwindow.c,v 1.5 2003/11/10 18:22:42 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_16bpp/cfbwindow.c,v 1.4tsi Exp $ */
 
 #include "X.h"
 #include "scrnintstr.h"
diff --git a/hw/xfree86/xf8_32bpp/cfb8_32.h b/hw/xfree86/xf8_32bpp/cfb8_32.h
index 30bc1a0fa..98a50f810 100644
--- a/hw/xfree86/xf8_32bpp/cfb8_32.h
+++ b/hw/xfree86/xf8_32bpp/cfb8_32.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfb8_32.h,v 1.6 2003/07/16 01:38:50 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfb8_32.h,v 1.5 2000/03/02 02:32:52 mvojkovi Exp $ */
 
 #ifndef _CFB8_32_H
 #define _CFB8_32_H
diff --git a/hw/xfree86/xf8_32bpp/cfb8_32module.c b/hw/xfree86/xf8_32bpp/cfb8_32module.c
index 9ed6b2018..7b27e498a 100644
--- a/hw/xfree86/xf8_32bpp/cfb8_32module.c
+++ b/hw/xfree86/xf8_32bpp/cfb8_32module.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfb8_32module.c,v 1.6 1999/01/26 05:54:20 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfb8_32module.c,v 1.5 1999/01/24 13:32:42 dawes Exp $ */
 
 
 #ifdef XFree86LOADER
@@ -13,7 +13,7 @@ static XF86ModuleVersionInfo VersRec =
         MODULEVENDORSTRING,
         MODINFOSTRING1,
         MODINFOSTRING2,
-        XF86_VERSION_CURRENT,
+        XORG_VERSION_CURRENT,
         1, 0, 0,
         ABI_CLASS_ANSIC,                /* Only need the ansic layer */
         ABI_ANSIC_VERSION,
diff --git a/hw/xfree86/xf8_32bpp/cfbbstore.c b/hw/xfree86/xf8_32bpp/cfbbstore.c
index 581efb4f6..3ebddd2d2 100644
--- a/hw/xfree86/xf8_32bpp/cfbbstore.c
+++ b/hw/xfree86/xf8_32bpp/cfbbstore.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbbstore.c,v 1.3 2003/07/16 01:38:50 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbbstore.c,v 1.2 1999/01/31 12:22:17 dawes Exp $ */
 
 #define PSZ 8
 #include "cfb.h"
diff --git a/hw/xfree86/xf8_32bpp/cfbcpyarea.c b/hw/xfree86/xf8_32bpp/cfbcpyarea.c
index 53af8f7d8..2bfda9f6f 100644
--- a/hw/xfree86/xf8_32bpp/cfbcpyarea.c
+++ b/hw/xfree86/xf8_32bpp/cfbcpyarea.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbcpyarea.c,v 1.6 2003/07/16 01:38:50 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbcpyarea.c,v 1.5 2000/02/29 00:17:16 mvojkovi Exp $ */
 
 #include "X.h"
 #include "Xmd.h"
diff --git a/hw/xfree86/xf8_32bpp/cfbcpyplane.c b/hw/xfree86/xf8_32bpp/cfbcpyplane.c
index 248ca0869..b08288f19 100644
--- a/hw/xfree86/xf8_32bpp/cfbcpyplane.c
+++ b/hw/xfree86/xf8_32bpp/cfbcpyplane.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbcpyplane.c,v 1.1 1999/01/03 03:58:55 dawes Exp $ */
+/* $XFree86$ */
 
 #include "X.h"
 #include "Xmd.h"
diff --git a/hw/xfree86/xf8_32bpp/cfbgc.c b/hw/xfree86/xf8_32bpp/cfbgc.c
index 6c13ca721..f55aeb86c 100644
--- a/hw/xfree86/xf8_32bpp/cfbgc.c
+++ b/hw/xfree86/xf8_32bpp/cfbgc.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbgc.c,v 1.4 2001/12/14 19:59:52 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbgc.c,v 1.3 2000/02/11 06:33:46 mvojkovi Exp $ */
 /***********************************************************
 
 Copyright 1987, 1998  The Open Group
diff --git a/hw/xfree86/xf8_32bpp/cfbgcmisc.c b/hw/xfree86/xf8_32bpp/cfbgcmisc.c
index d8a6f4608..635861bb5 100644
--- a/hw/xfree86/xf8_32bpp/cfbgcmisc.c
+++ b/hw/xfree86/xf8_32bpp/cfbgcmisc.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbgcmisc.c,v 1.3 2000/02/29 00:17:16 mvojkovi Exp $ */
+/* $XFree86$ */
 
 #include "X.h"
 #include "Xmd.h"
diff --git a/hw/xfree86/xf8_32bpp/cfbgcunder.c b/hw/xfree86/xf8_32bpp/cfbgcunder.c
index d01b2b5cb..19f9055e3 100644
--- a/hw/xfree86/xf8_32bpp/cfbgcunder.c
+++ b/hw/xfree86/xf8_32bpp/cfbgcunder.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbgcunder.c,v 1.6 2003/07/16 01:38:50 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbgcunder.c,v 1.5 2001/12/14 19:59:52 dawes Exp $ */
 /***********************************************************
 
 Copyright 1987, 1998  The Open Group
diff --git a/hw/xfree86/xf8_32bpp/cfbimage.c b/hw/xfree86/xf8_32bpp/cfbimage.c
index e737e025e..0510ae3c5 100644
--- a/hw/xfree86/xf8_32bpp/cfbimage.c
+++ b/hw/xfree86/xf8_32bpp/cfbimage.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbimage.c,v 1.3 2003/07/16 01:38:50 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbimage.c,v 1.2 2000/02/25 00:21:40 mvojkovi Exp $ */
 
 #include "X.h"
 #include "windowstr.h"
diff --git a/hw/xfree86/xf8_32bpp/cfbpntwin.c b/hw/xfree86/xf8_32bpp/cfbpntwin.c
index 516decd6c..107536fd4 100644
--- a/hw/xfree86/xf8_32bpp/cfbpntwin.c
+++ b/hw/xfree86/xf8_32bpp/cfbpntwin.c
@@ -1,4 +1,5 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbpntwin.c,v 1.5 2001/10/01 13:44:15 eich Exp $ */
+/* $XdotOrg$ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbpntwin.c,v 1.1 1999/01/03 03:58:56 dawes Exp $ */
 
 #include "X.h"
 
diff --git a/hw/xfree86/xf8_32bpp/cfbscrinit.c b/hw/xfree86/xf8_32bpp/cfbscrinit.c
index 7f123d36a..93323d487 100644
--- a/hw/xfree86/xf8_32bpp/cfbscrinit.c
+++ b/hw/xfree86/xf8_32bpp/cfbscrinit.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbscrinit.c,v 1.12 2003/07/16 01:38:50 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbscrinit.c,v 1.11 2001/04/14 21:17:49 mvojkovi Exp $ */
 
 
 #include "X.h"
diff --git a/hw/xfree86/xf8_32bpp/cfbwindow.c b/hw/xfree86/xf8_32bpp/cfbwindow.c
index c18b54399..3576a41c3 100644
--- a/hw/xfree86/xf8_32bpp/cfbwindow.c
+++ b/hw/xfree86/xf8_32bpp/cfbwindow.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbwindow.c,v 1.9 2003/11/10 18:22:43 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbwindow.c,v 1.8tsi Exp $ */
 
 
 #include "X.h"
diff --git a/hw/xfree86/xf8_32bpp/xf86overlay.c b/hw/xfree86/xf8_32bpp/xf86overlay.c
index 998503c21..226835249 100644
--- a/hw/xfree86/xf8_32bpp/xf86overlay.c
+++ b/hw/xfree86/xf8_32bpp/xf86overlay.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/xf86overlay.c,v 1.9 2002/02/11 00:07:25 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/xf86overlay.c,v 1.8 2000/03/25 20:14:43 mvojkovi Exp $ */
 
 /*
    Copyright (C) 1998.  The XFree86 Project Inc.
diff --git a/hw/xfree86/xf8_32wid/cfb8_32wid.h b/hw/xfree86/xf8_32wid/cfb8_32wid.h
index 9913c2a6c..2168054d9 100644
--- a/hw/xfree86/xf8_32wid/cfb8_32wid.h
+++ b/hw/xfree86/xf8_32wid/cfb8_32wid.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32wid/cfb8_32wid.h,v 1.1 2000/05/21 01:02:43 mvojkovi Exp $ */
+/* $XFree86$ */
 
 #ifndef _CFB8_32WID_H
 #define _CFB8_32WID_H
diff --git a/hw/xfree86/xf8_32wid/cfb8_32widmodule.c b/hw/xfree86/xf8_32wid/cfb8_32widmodule.c
index 5a47b9ff5..95f8c9d02 100644
--- a/hw/xfree86/xf8_32wid/cfb8_32widmodule.c
+++ b/hw/xfree86/xf8_32wid/cfb8_32widmodule.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32wid/cfb8_32widmodule.c,v 1.1 2000/05/21 01:02:43 mvojkovi Exp $ */
+/* $XFree86$ */
 
 #ifdef XFree86LOADER
 
@@ -12,7 +12,7 @@ static XF86ModuleVersionInfo VersRec =
         MODULEVENDORSTRING,
         MODINFOSTRING1,
         MODINFOSTRING2,
-        XF86_VERSION_CURRENT,
+        XORG_VERSION_CURRENT,
         1, 0, 0,
         ABI_CLASS_ANSIC,                /* Only need the ansic layer */
         ABI_ANSIC_VERSION,
diff --git a/hw/xfree86/xf8_32wid/cfbscrinit.c b/hw/xfree86/xf8_32wid/cfbscrinit.c
index 93c15371d..8f307034f 100644
--- a/hw/xfree86/xf8_32wid/cfbscrinit.c
+++ b/hw/xfree86/xf8_32wid/cfbscrinit.c
@@ -7,7 +7,7 @@
    Mark Vojkovich's work.
 */
 
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32wid/cfbscrinit.c,v 1.1 2000/05/21 01:02:43 mvojkovi Exp $ */
+/* $XFree86$ */
 
 #include "X.h"
 #include "Xmd.h"
diff --git a/hw/xfree86/xf8_32wid/cfbwid.c b/hw/xfree86/xf8_32wid/cfbwid.c
index 0aa894176..b16266e93 100644
--- a/hw/xfree86/xf8_32wid/cfbwid.c
+++ b/hw/xfree86/xf8_32wid/cfbwid.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32wid/cfbwid.c,v 1.1 2000/05/21 01:02:44 mvojkovi Exp $ */
+/* $XFree86$ */
 
 #include "X.h"
 #include "Xmd.h"
diff --git a/hw/xfree86/xf8_32wid/cfbwindow.c b/hw/xfree86/xf8_32wid/cfbwindow.c
index b7ac739b3..b11f05f1d 100644
--- a/hw/xfree86/xf8_32wid/cfbwindow.c
+++ b/hw/xfree86/xf8_32wid/cfbwindow.c
@@ -7,7 +7,7 @@
    Mark Vojkovich's work.
 */
 
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32wid/cfbwindow.c,v 1.3 2003/11/10 18:22:43 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32wid/cfbwindow.c,v 1.2tsi Exp $ */
 
 #include "X.h"
 #include "scrnintstr.h"
diff --git a/hw/xfree86/xorgconf.cpp b/hw/xfree86/xorgconf.cpp
new file mode 100644
index 000000000..c94c1e5a4
--- /dev/null
+++ b/hw/xfree86/xorgconf.cpp
@@ -0,0 +1,626 @@
+XCOMM $XdotOrg$
+XCOMM
+XCOMM Copyright (c) 1994-1998 by The XFree86 Project, Inc.
+XCOMM
+XCOMM Permission is hereby granted, free of charge, to any person obtaining a
+XCOMM copy of this software and associated documentation files (the "Software"),
+XCOMM to deal in the Software without restriction, including without limitation
+XCOMM the rights to use, copy, modify, merge, publish, distribute, sublicense,
+XCOMM and/or sell copies of the Software, and to permit persons to whom the
+XCOMM Software is furnished to do so, subject to the following conditions:
+XCOMM 
+XCOMM The above copyright notice and this permission notice shall be included in
+XCOMM all copies or substantial portions of the Software.
+XCOMM 
+XCOMM THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+XCOMM IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+XCOMM FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+XCOMM THE XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+XCOMM WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
+XCOMM OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+XCOMM SOFTWARE.
+XCOMM 
+XCOMM Except as contained in this notice, the name of the XFree86 Project shall
+XCOMM not be used in advertising or otherwise to promote the sale, use or other
+XCOMM dealings in this Software without prior written authorization from the
+XCOMM XFree86 Project.
+XCOMM
+XCOMM $XConsortium: XF86Conf.cpp /main/22 1996/10/23 11:43:51 kaleb $
+
+XCOMM **********************************************************************
+XCOMM This is a sample configuration file only, intended to illustrate
+XCOMM what a config file might look like.  Refer to the XF86Config(4/5)
+XCOMM man page for details about the format of this file. This man page
+XCOMM is installed as MANPAGE 
+XCOMM **********************************************************************
+
+XCOMM The ordering of sections is not important in version 4.0 and later.
+
+XCOMM **********************************************************************
+XCOMM Files section.  This allows default font and rgb paths to be set
+XCOMM **********************************************************************
+
+Section "Files"
+
+XCOMM The location of the RGB database.  Note, this is the name of the
+XCOMM file minus the extension (like ".txt" or ".db").  There is normally
+XCOMM no need to change the default.
+
+    RgbPath	RGBPATH
+
+XCOMM Multiple FontPath entries are allowed (which are concatenated together),
+XCOMM as well as specifying multiple comma-separated entries in one FontPath
+XCOMM command (or a combination of both methods)
+
+    FontPath	LOCALFONTPATH
+    FontPath	MISCFONTPATH
+    FontPath	DPI75USFONTPATH
+    FontPath	DPI100USFONTPATH
+    FontPath	T1FONTPATH
+    FontPath    TRUETYPEFONTPATH
+    FontPath	CIDFONTPATH
+    FontPath	SPFONTPATH
+    FontPath	DPI75FONTPATH
+    FontPath	DPI100FONTPATH
+
+XCOMM ModulePath can be used to set a search path for the X server modules.
+XCOMM The default path is shown here.
+
+XCOMM    ModulePath	MODULEPATH
+
+EndSection
+
+XCOMM **********************************************************************
+XCOMM Module section -- this is an optional section which is used to specify
+XCOMM which run-time loadable modules to load when the X server starts up.
+XCOMM **********************************************************************
+
+Section "Module"
+
+XCOMM This loads the DBE extension module.
+
+    Load	"dbe"
+
+XCOMM This loads the miscellaneous extensions module, and disables
+XCOMM initialisation of the XFree86-DGA extension within that module.
+
+    SubSection	"extmod"
+	Option	"omit xfree86-dga"
+    EndSubSection
+
+XCOMM This loads the Type1 and FreeType font modules
+
+    Load	"type1"
+    Load	"freetype"
+
+EndSection
+
+
+XCOMM **********************************************************************
+XCOMM Server flags section.  This contains various server-wide Options.
+XCOMM **********************************************************************
+
+Section "ServerFlags"
+
+XCOMM Uncomment this to cause a core dump at the spot where a signal is 
+XCOMM received.  This may leave the console in an unusable state, but may
+XCOMM provide a better stack trace in the core dump to aid in debugging
+
+XCOMM    Option	"NoTrapSignals"
+
+XCOMM Uncomment this to disable the <Crtl><Alt><Fn> VT switch sequence
+XCOMM (where n is 1 through 12).  This allows clients to receive these key
+XCOMM events.
+
+XCOMM    Option	"DontVTSwitch"
+
+XCOMM Uncomment this to disable the <Crtl><Alt><BS> server abort sequence
+XCOMM This allows clients to receive this key event.
+
+XCOMM    Option	"DontZap"
+
+XCOMM Uncomment this to disable the <Crtl><Alt><KP_+>/<KP_-> mode switching
+XCOMM sequences.  This allows clients to receive these key events.
+
+XCOMM    Option	"DontZoom"
+
+XCOMM Uncomment this to disable tuning with the xvidtune client. With
+XCOMM it the client can still run and fetch card and monitor attributes,
+XCOMM but it will not be allowed to change them. If it tries it will
+XCOMM receive a protocol error.
+
+XCOMM    Option	"DisableVidModeExtension"
+
+XCOMM Uncomment this to enable the use of a non-local xvidtune client.
+
+XCOMM    Option	"AllowNonLocalXvidtune"
+
+XCOMM Uncomment this to disable dynamically modifying the input device
+XCOMM (mouse and keyboard) settings.
+
+XCOMM    Option	"DisableModInDev"
+
+XCOMM Uncomment this to enable the use of a non-local client to
+XCOMM change the keyboard or mouse settings (currently only xset).
+
+XCOMM    Option	"AllowNonLocalModInDev"
+
+XCOMM Set the basic blanking screen saver timeout.
+
+    Option	"blank time"	"10"	# 10 minutes
+
+XCOMM Set the DPMS timeouts.  These are set here because they are global
+XCOMM rather than screen-specific.  These settings alone don't enable DPMS.
+XCOMM It is enabled per-screen (or per-monitor), and even then only when
+XCOMM the driver supports it.
+
+    Option	"standby time"	"20"
+    Option	"suspend time"	"30"
+    Option	"off time"	"60"
+
+XCOMM On some platform the server needs to estimate the sizes of PCI
+XCOMM memory and pio ranges. This is done by assuming that PCI ranges
+XCOMM don't overlap. Some broken BIOSes tend to set ranges of inactive
+XCOMM devices wrong. Here one can adjust how aggressive the assumptions
+XCOMM should be. Default is 0.
+
+XCOMM Option   "EstimateSizesAggresively" "0"
+
+EndSection
+
+XCOMM **********************************************************************
+XCOMM Input devices
+XCOMM **********************************************************************
+
+XCOMM **********************************************************************
+XCOMM Core keyboard's InputDevice section
+XCOMM **********************************************************************
+
+Section "InputDevice"
+
+    Identifier	"Keyboard1"
+    Driver	"keyboard"
+
+XCOMM For most OSs the protocol can be omitted (it defaults to "Standard").
+XCOMM When using XQUEUE (only for SVR3 and SVR4, but not Solaris), comment
+XCOMM out the above line, and uncomment the following line.
+
+XCOMM    Option	"Protocol"	"Xqueue"
+
+XCOMM Set the keyboard auto repeat parameters.  Not all platforms implement
+XCOMM this.
+
+    Option	"AutoRepeat"	"500 5"
+
+XCOMM Specifiy which keyboard LEDs can be user-controlled (eg, with xset(1)).
+
+XCOMM    Option	"Xleds"	"1 2 3"
+
+XCOMM To disable the XKEYBOARD extension, uncomment XkbDisable.
+
+XCOMM    Option	"XkbDisable"
+
+XCOMM To customise the XKB settings to suit your keyboard, modify the
+XCOMM lines below (which are the defaults).  For example, for a European
+XCOMM keyboard, you will probably want to use one of:
+XCOMM
+XCOMM    Option	"XkbModel"	"pc102"
+XCOMM    Option	"XkbModel"	"pc105"
+XCOMM
+XCOMM If you have a Microsoft Natural keyboard, you can use:
+XCOMM
+XCOMM    Option	"XkbModel"	"microsoft"
+XCOMM
+XCOMM If you have a US "windows" keyboard you will want:
+XCOMM
+XCOMM    Option	"XkbModel"	"pc104"
+XCOMM
+XCOMM Then to change the language, change the Layout setting.
+XCOMM For example, a german layout can be obtained with:
+XCOMM
+XCOMM    Option	"XkbLayout"	"de"
+XCOMM
+XCOMM or:
+XCOMM
+XCOMM    Option	"XkbLayout"	"de"
+XCOMM    Option	"XkbVariant"	"nodeadkeys"
+XCOMM
+XCOMM If you'd like to switch the positions of your capslock and
+XCOMM control keys, use:
+XCOMM
+XCOMM    Option	"XkbOptions"	"ctrl:swapcaps"
+
+
+XCOMM These are the default XKB settings for xorg
+XCOMM
+XCOMM    Option	"XkbRules"	"xorg"
+XCOMM    Option	"XkbModel"	"pc101"
+XCOMM    Option	"XkbLayout"	"us"
+XCOMM    Option	"XkbVariant"	""
+XCOMM    Option	"XkbOptions"	""
+
+EndSection
+
+
+XCOMM **********************************************************************
+XCOMM Core Pointer's InputDevice section
+XCOMM **********************************************************************
+
+Section "InputDevice"
+
+XCOMM Identifier and driver
+
+    Identifier	"Mouse1"
+    Driver	"mouse"
+
+XCOMM The mouse protocol and device.  The device is normally set to /dev/mouse,
+XCOMM which is usually a symbolic link to the real device.
+
+    Option	"Protocol"	"Microsoft"
+    Option	"Device"	"/dev/mouse"
+
+XCOMM On platforms where PnP mouse detection is supported the following
+XCOMM protocol setting can be used when using a newer PnP mouse:
+
+XCOMM    Option	"Protocol"	"Auto"
+
+XCOMM When using mouse connected to a PS/2 port (aka "MousePort"), set the
+XCOMM the protocol as follows.  On some platforms some other settings may
+XCOMM be available.
+
+XCOMM    Option "Protocol"	"PS/2"
+
+XCOMM When using XQUEUE (only for SVR3 and SVR4, but not Solaris), use
+XCOMM the following instead of any of the lines above.  The Device line
+XCOMM is not required in this case.
+
+XCOMM    Option	"Protocol"	"Xqueue"
+
+XCOMM Baudrate and SampleRate are only for some older Logitech mice.  In
+XCOMM almost every case these lines should be omitted.
+
+XCOMM    Option	"BaudRate"	"9600"
+XCOMM    Option	"SampleRate"	"150"
+
+XCOMM Emulate3Buttons is an option for 2-button mice
+XCOMM Emulate3Timeout is the timeout in milliseconds (default is 50ms)
+
+XCOMM    Option	"Emulate3Buttons"
+XCOMM    Option	"Emulate3Timeout"	"50"
+
+XCOMM ChordMiddle is an option for some 3-button Logitech mice, or any
+XCOMM 3-button mouse where the middle button generates left+right button
+XCOMM events.
+
+XCOMM    Option	"ChordMiddle"
+
+EndSection
+
+Section "InputDevice"
+    Identifier	"Mouse2"
+    Driver	"mouse"
+    Option	"Protocol"	"MouseMan"
+    Option	"Device"	"/dev/mouse2"
+EndSection
+
+XCOMM Some examples of extended input devices
+
+XCOMM Section "InputDevice"
+XCOMM    Identifier	"spaceball"
+XCOMM    Driver	"magellan"
+XCOMM    Option	"Device"	"/dev/cua0"
+XCOMM EndSection
+XCOMM
+XCOMM Section "InputDevice"
+XCOMM    Identifier	"spaceball2"
+XCOMM    Driver	"spaceorb"
+XCOMM    Option	"Device"	"/dev/cua0"
+XCOMM EndSection
+XCOMM
+XCOMM Section "InputDevice"
+XCOMM    Identifier	"touchscreen0"
+XCOMM    Driver	"microtouch"
+XCOMM    Option	"Device"	"/dev/ttyS0"
+XCOMM    Option	"MinX"		"1412"
+XCOMM    Option	"MaxX"		"15184"
+XCOMM    Option	"MinY"		"15372"
+XCOMM    Option	"MaxY"		"1230"
+XCOMM    Option	"ScreenNumber"	"0"
+XCOMM    Option	"ReportingMode"	"Scaled"
+XCOMM    Option	"ButtonNumber"	"1"
+XCOMM    Option	"SendCoreEvents"
+XCOMM EndSection
+XCOMM
+XCOMM Section "InputDevice"
+XCOMM    Identifier	"touchscreen1"
+XCOMM    Driver	"elo2300"
+XCOMM    Option	"Device"	"/dev/ttyS0"
+XCOMM    Option	"MinX"		"231"
+XCOMM    Option	"MaxX"		"3868"
+XCOMM    Option	"MinY"		"3858"
+XCOMM    Option	"MaxY"		"272"
+XCOMM    Option	"ScreenNumber"	"0"
+XCOMM    Option	"ReportingMode"	"Scaled"
+XCOMM    Option	"ButtonThreshold"	"17"
+XCOMM    Option	"ButtonNumber"	"1"
+XCOMM    Option	"SendCoreEvents"
+XCOMM EndSection
+
+XCOMM **********************************************************************
+XCOMM Monitor section
+XCOMM **********************************************************************
+
+XCOMM Any number of monitor sections may be present
+
+Section "Monitor"
+
+XCOMM The identifier line must be present.
+
+    Identifier	"Generic Monitor"
+
+XCOMM HorizSync is in kHz unless units are specified.
+XCOMM HorizSync may be a comma separated list of discrete values, or a
+XCOMM comma separated list of ranges of values.
+XCOMM NOTE: THE VALUES HERE ARE EXAMPLES ONLY.  REFER TO YOUR MONITOR'S
+XCOMM USER MANUAL FOR THE CORRECT NUMBERS.
+
+XCOMM    HorizSync	31.5  # typical for a single frequency fixed-sync monitor
+XCOMM    HorizSync	30-64         # multisync
+XCOMM    HorizSync	31.5, 35.2    # multiple fixed sync frequencies
+XCOMM    HorizSync	15-25, 30-50  # multiple ranges of sync frequencies
+
+XCOMM VertRefresh is in Hz unless units are specified.
+XCOMM VertRefresh may be a comma separated list of discrete values, or a
+XCOMM comma separated list of ranges of values.
+XCOMM NOTE: THE VALUES HERE ARE EXAMPLES ONLY.  REFER TO YOUR MONITOR'S
+XCOMM USER MANUAL FOR THE CORRECT NUMBERS.
+
+XCOMM    VertRefresh	60  # typical for a single frequency fixed-sync monitor
+
+XCOMM    VertRefresh	50-100        # multisync
+XCOMM    VertRefresh	60, 65        # multiple fixed sync frequencies
+XCOMM    VertRefresh	40-50, 80-100 # multiple ranges of sync frequencies
+
+XCOMM Modes can be specified in two formats.  A compact one-line format, or
+XCOMM a multi-line format.
+
+XCOMM A generic VGA 640x480 mode (hsync = 31.5kHz, refresh = 60Hz)
+XCOMM These two are equivalent
+
+XCOMM    ModeLine "640x480" 25.175 640 664 760 800 480 491 493 525
+
+    Mode "640x480"
+        DotClock	25.175
+        HTimings	640 664 760 800
+        VTimings	480 491 493 525
+    EndMode
+
+XCOMM These two are equivalent
+
+XCOMM    ModeLine "1024x768i" 45 1024 1048 1208 1264 768 776 784 817 Interlace
+
+XCOMM    Mode "1024x768i"
+XCOMM        DotClock	45
+XCOMM        HTimings	1024 1048 1208 1264
+XCOMM        VTimings	768 776 784 817
+XCOMM        Flags		"Interlace"
+XCOMM    EndMode
+
+XCOMM If a monitor has DPMS support, that can be indicated here.  This will
+XCOMM enable DPMS when the monitor is used with drivers that support it.
+
+XCOMM    Option	"dpms"
+
+XCOMM If a monitor requires that the sync signals be superimposed on the
+XCOMM green signal, the following option will enable this when used with
+XCOMM drivers that support it.  Only a relatively small range of hardware
+XCOMM (and drivers) actually support this.
+
+XCOMM    Option	"sync on green"
+
+EndSection
+
+XCOMM **********************************************************************
+XCOMM Graphics device section
+XCOMM **********************************************************************
+
+XCOMM Any number of graphics device sections may be present
+
+Section "Device"
+
+XCOMM The Identifier must be present.
+
+    Identifier	"Generic VGA"
+
+XCOMM The Driver line must be present.  When using run-time loadable driver
+XCOMM modules, this line instructs the server to load the specified driver
+XCOMM module.  Even when not using loadable driver modules, this line
+XCOMM indicates which driver should interpret the information in this section.
+
+    Driver	"vga"
+
+XCOMM The chipset line is optional in most cases.  It can be used to override
+XCOMM the driver's chipset detection, and should not normally be specified.
+
+XCOMM    Chipset	"generic"
+
+XCOMM Various other lines can be specified to override the driver's automatic
+XCOMM detection code.  In most cases they are not needed.
+
+XCOMM    VideoRam	256
+XCOMM    Clocks	25.2 28.3
+
+XCOMM The BusID line is used to specify which of possibly multiple devices
+XCOMM this section is intended for.  When this line isn't present, a device
+XCOMM section can only match up with the primary video device.  For PCI
+XCOMM devices a line like the following could be used.  This line should not
+XCOMM normally be included unless there is more than one video device
+XCOMM intalled.
+
+XCOMM    BusID	"PCI:0:10:0"
+
+XCOMM Various option lines can be added here as required.  Some options
+XCOMM are more appropriate in Screen sections, Display subsections or even
+XCOMM Monitor sections.
+
+XCOMM    Option	"hw cursor" "off"
+
+EndSection
+
+Section "Device"
+    Identifier	"any supported Trident chip"
+    Driver	"trident"
+EndSection
+
+Section "Device"
+    Identifier	"MGA Millennium I"
+    Driver	"mga"
+    Option	"hw cursor" "off"
+    BusID	"PCI:0:10:0"
+EndSection
+
+Section "Device"
+    Identifier	"MGA G200 AGP"
+    Driver	"mga"
+    BusID	"PCI:1:0:0"
+    Option	"pci retry"
+EndSection
+
+
+XCOMM **********************************************************************
+XCOMM Screen sections.
+XCOMM **********************************************************************
+
+XCOMM Any number of screen sections may be present.  Each describes
+XCOMM the configuration of a single screen.  A single specific screen section
+XCOMM may be specified from the X server command line with the "-screen"
+XCOMM option.
+
+Section "Screen"
+
+XCOMM The Identifier, Device and Monitor lines must be present
+
+    Identifier	"Screen 1"
+    Device	"Generic VGA"
+    Monitor	"Generic Monitor"
+
+XCOMM The favoured Depth and/or Bpp may be specified here
+
+    DefaultDepth 8
+
+    SubSection "Display"
+        Depth		8
+        Modes		"640x480"
+        ViewPort	0 0
+        Virtual 	800 600
+    EndSubsection
+
+    SubSection "Display"
+	Depth		4
+        Modes		"640x480"
+    EndSubSection
+
+    SubSection "Display"
+	Depth		1
+        Modes		"640x480"
+    EndSubSection
+
+EndSection
+
+
+Section "Screen"
+    Identifier		"Screen MGA1"
+    Device		"MGA Millennium I"
+    Monitor		"Generic Monitor"
+    Option		"no accel"
+    DefaultDepth	16
+XCOMM    DefaultDepth	24
+
+    SubSection "Display"
+	Depth		8
+	Modes		"1280x1024"
+	Option		"rgb bits" "8"
+	Visual		"StaticColor"
+    EndSubSection
+    SubSection "Display"
+	Depth		16
+	Modes		"1280x1024"
+    EndSubSection
+    SubSection "Display"
+	Depth		24
+	Modes		"1280x1024"
+    EndSubSection
+EndSection
+
+
+Section "Screen"
+    Identifier		"Screen MGA2"
+    Device		"MGA G200 AGP"
+    Monitor		"Generic Monitor"
+    DefaultDepth	8
+
+    SubSection "Display"
+	Depth		8
+	Modes		"1280x1024"
+	Option		"rgb bits" "8"
+	Visual		"StaticColor"
+    EndSubSection
+EndSection
+
+
+XCOMM **********************************************************************
+XCOMM ServerLayout sections.
+XCOMM **********************************************************************
+
+XCOMM Any number of ServerLayout sections may be present.  Each describes
+XCOMM the way multiple screens are organised.  A specific ServerLayout
+XCOMM section may be specified from the X server command line with the
+XCOMM "-layout" option.  In the absence of this, the first section is used.
+XCOMM When now ServerLayout section is present, the first Screen section
+XCOMM is used alone.
+
+Section "ServerLayout"
+
+XCOMM The Identifier line must be present
+
+    Identifier	"Main Layout"
+
+XCOMM Each Screen line specifies a Screen section name, and optionally
+XCOMM the relative position of other screens.  The four names after
+XCOMM primary screen name are the screens to the top, bottom, left and right
+XCOMM of the primary screen.  In this example, screen 2 is located to the
+XCOMM right of screen 1.
+
+    Screen	"Screen MGA 1"	""	""	""	"Screen MGA 2"
+    Screen	"Screen MGA 2"	""	""	"Screen MGA 1"	""
+
+XCOMM Each InputDevice line specifies an InputDevice section name and
+XCOMM optionally some options to specify the way the device is to be
+XCOMM used.  Those options include "CorePointer", "CoreKeyboard" and
+XCOMM "SendCoreEvents".  In this example, "Mouse1" is the core pointer,
+XCOMM and "Mouse2" is an extended input device that also generates core
+XCOMM pointer events (i.e., both mice will move the standard pointer).
+
+    InputDevice	"Mouse1" "CorePointer"
+    InputDevice	"Mouse2" "SendCoreEvents"
+    InputDevice "Keyboard1" "CoreKeyboard"
+
+EndSection
+
+
+Section "ServerLayout"
+    Identifier	"another layout"
+    Screen	"Screen 1"
+    Screen	"Screen MGA 1"
+    InputDevice	"Mouse1" "CorePointer"
+    InputDevice "Keyboard1" "CoreKeyboard"
+EndSection
+
+
+Section "ServerLayout"
+    Identifier	"simple layout"
+    Screen	"Screen 1"
+    InputDevice	"Mouse1" "CorePointer"
+    InputDevice "Keyboard1" "CoreKeyboard"
+EndSection
+
diff --git a/hw/xnest/Args.c b/hw/xnest/Args.c
index 488179d01..cc9a2707f 100644
--- a/hw/xnest/Args.c
+++ b/hw/xnest/Args.c
@@ -12,7 +12,7 @@ the suitability of this software for any purpose.  It is provided "as
 is" without express or implied warranty.
 
 */
-/* $XFree86: xc/programs/Xserver/hw/xnest/Args.c,v 1.2 2003/11/16 05:05:20 dawes Exp $ */
+/* $XFree86$ */
 
 #include "X.h"
 #include "Xproto.h"
@@ -47,6 +47,11 @@ int xnestNumScreens = 0;
 Bool xnestDoDirectColormaps = False;
 Window xnestParentWindow = 0;
 
+/* ddxInitGlobals - called by |InitGlobals| from os/util.c */
+void ddxInitGlobals(void)
+{
+}
+
 int
 ddxProcessArgument (int argc, char *argv[], int i)
 {
diff --git a/hw/xnest/Args.h b/hw/xnest/Args.h
index dc2ac9de0..a0c586bcb 100644
--- a/hw/xnest/Args.h
+++ b/hw/xnest/Args.h
@@ -12,7 +12,7 @@ the suitability of this software for any purpose.  It is provided "as
 is" without express or implied warranty.
 
 */
-/* $XFree86: xc/programs/Xserver/hw/xnest/Args.h,v 1.2 2003/11/16 05:05:20 dawes Exp $ */
+/* $XFree86$ */
 
 #ifndef XNESTARGC_H
 #define XNESTARGS_H
diff --git a/hw/xnest/Color.c b/hw/xnest/Color.c
index ae5ded5e3..bcebc10cd 100644
--- a/hw/xnest/Color.c
+++ b/hw/xnest/Color.c
@@ -12,7 +12,7 @@ the suitability of this software for any purpose.  It is provided "as
 is" without express or implied warranty.
 
 */
-/* $XFree86: xc/programs/Xserver/hw/xnest/Color.c,v 1.4 2003/11/16 05:05:20 dawes Exp $ */
+/* $XFree86$ */
 
 #include "X.h"
 #include "Xproto.h"
diff --git a/hw/xnest/Color.h b/hw/xnest/Color.h
index 0b3c22581..9ce72a946 100644
--- a/hw/xnest/Color.h
+++ b/hw/xnest/Color.h
@@ -12,7 +12,7 @@ the suitability of this software for any purpose.  It is provided "as
 is" without express or implied warranty.
 
 */
-/* $XFree86: xc/programs/Xserver/hw/xnest/Color.h,v 1.2 2003/11/16 05:05:20 dawes Exp $ */
+/* $XFree86$ */
 
 #ifndef XNESTCOLOR_H
 #define XNESTCOLOR_H
diff --git a/hw/xnest/Cursor.c b/hw/xnest/Cursor.c
index 52ba867cf..146e7ebd0 100644
--- a/hw/xnest/Cursor.c
+++ b/hw/xnest/Cursor.c
@@ -12,7 +12,7 @@ the suitability of this software for any purpose.  It is provided "as
 is" without express or implied warranty.
 
 */
-/* $XFree86: xc/programs/Xserver/hw/xnest/Cursor.c,v 1.4 2003/11/16 05:05:20 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xnest/Cursor.c,v 1.3 2002/11/23 19:27:50 tsi Exp $ */
 
 #include "X.h"
 #include "Xproto.h"
diff --git a/hw/xnest/Display.c b/hw/xnest/Display.c
index 1a8703063..301ab139a 100644
--- a/hw/xnest/Display.c
+++ b/hw/xnest/Display.c
@@ -12,7 +12,7 @@ the suitability of this software for any purpose.  It is provided "as
 is" without express or implied warranty.
 
 */
-/* $XFree86: xc/programs/Xserver/hw/xnest/Display.c,v 3.5 2003/11/16 05:05:20 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xnest/Display.c,v 3.4 2001/10/28 03:34:10 tsi Exp $ */
 
 
 #include <X11/X.h>
diff --git a/hw/xnest/Display.h b/hw/xnest/Display.h
index 044f8f131..78df26969 100644
--- a/hw/xnest/Display.h
+++ b/hw/xnest/Display.h
@@ -12,7 +12,7 @@ the suitability of this software for any purpose.  It is provided "as
 is" without express or implied warranty.
 
 */
-/* $XFree86: xc/programs/Xserver/hw/xnest/Display.h,v 1.7 2003/11/16 05:05:20 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xnest/Display.h,v 1.6 2001/01/17 22:36:55 dawes Exp $ */
 
 #ifndef XNESTCOMMON_H
 #define XNESTCOMMON_H
diff --git a/hw/xnest/Drawable.h b/hw/xnest/Drawable.h
index 6f52b286b..7b96bdfee 100644
--- a/hw/xnest/Drawable.h
+++ b/hw/xnest/Drawable.h
@@ -12,7 +12,7 @@ the suitability of this software for any purpose.  It is provided "as
 is" without express or implied warranty.
 
 */
-/* $XFree86: xc/programs/Xserver/hw/xnest/Drawable.h,v 1.3 2002/11/23 19:27:50 tsi Exp $ */
+/* $XFree86$ */
 
 #ifndef XNESTDRAWABLE_H
 #define XNESTDRAWABLE_H
diff --git a/hw/xnest/Events.c b/hw/xnest/Events.c
index 1b7b3935f..a36e0d8e8 100644
--- a/hw/xnest/Events.c
+++ b/hw/xnest/Events.c
@@ -12,7 +12,7 @@ the suitability of this software for any purpose.  It is provided "as
 is" without express or implied warranty.
 
 */
-/* $XFree86: xc/programs/Xserver/hw/xnest/Events.c,v 1.3 2003/11/16 05:05:20 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xnest/Events.c,v 1.2 2001/08/01 00:44:57 tsi Exp $ */
 
 #include "X.h"
 #define NEED_EVENTS
diff --git a/hw/xnest/Events.h b/hw/xnest/Events.h
index ed0fbb830..9ed211cb8 100644
--- a/hw/xnest/Events.h
+++ b/hw/xnest/Events.h
@@ -12,7 +12,7 @@ the suitability of this software for any purpose.  It is provided "as
 is" without express or implied warranty.
 
 */
-/* $XFree86: xc/programs/Xserver/hw/xnest/Events.h,v 1.2 2003/11/16 05:05:20 dawes Exp $ */
+/* $XFree86$ */
 
 #ifndef XNESTEVENTS_H
 #define XNESTEVENTS_H
diff --git a/hw/xnest/Font.c b/hw/xnest/Font.c
index f70848854..a0256c313 100644
--- a/hw/xnest/Font.c
+++ b/hw/xnest/Font.c
@@ -12,7 +12,7 @@ the suitability of this software for any purpose.  It is provided "as
 is" without express or implied warranty.
 
 */
-/* $XFree86: xc/programs/Xserver/hw/xnest/Font.c,v 3.7 2003/11/16 05:05:20 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xnest/Font.c,v 3.6 2003/07/16 01:38:51 dawes Exp $ */
 
 #include "X.h"
 #include "Xatom.h"
diff --git a/hw/xnest/GC.c b/hw/xnest/GC.c
index 972849d9a..7141e9cb9 100644
--- a/hw/xnest/GC.c
+++ b/hw/xnest/GC.c
@@ -12,7 +12,7 @@ the suitability of this software for any purpose.  It is provided "as
 is" without express or implied warranty.
 
 */
-/* $XFree86: xc/programs/Xserver/hw/xnest/GC.c,v 3.7 2003/11/16 05:05:20 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xnest/GC.c,v 3.6 2001/10/28 03:34:11 tsi Exp $ */
 
 #include "X.h"
 #include "Xproto.h"
diff --git a/hw/xnest/GCOps.c b/hw/xnest/GCOps.c
index b43695c96..042a29f6e 100644
--- a/hw/xnest/GCOps.c
+++ b/hw/xnest/GCOps.c
@@ -12,7 +12,7 @@ the suitability of this software for any purpose.  It is provided "as
 is" without express or implied warranty.
 
 */
-/* $XFree86: xc/programs/Xserver/hw/xnest/GCOps.c,v 3.6 2003/11/16 05:05:20 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xnest/GCOps.c,v 3.5 2003/07/16 01:38:51 dawes Exp $ */
 
 #include "X.h"
 #include "Xproto.h"
diff --git a/hw/xnest/GCOps.h b/hw/xnest/GCOps.h
index 722dde470..ccdc40ebe 100644
--- a/hw/xnest/GCOps.h
+++ b/hw/xnest/GCOps.h
@@ -12,7 +12,7 @@ the suitability of this software for any purpose.  It is provided "as
 is" without express or implied warranty.
 
 */
-/* $XFree86: xc/programs/Xserver/hw/xnest/GCOps.h,v 1.2 2003/11/16 05:05:20 dawes Exp $ */
+/* $XFree86$ */
 
 #ifndef XNESTGCOPS_H
 #define XNESTGCOPS_H
diff --git a/hw/xnest/GetTime.c b/hw/xnest/GetTime.c
index 3db9b8596..1ffc54764 100644
--- a/hw/xnest/GetTime.c
+++ b/hw/xnest/GetTime.c
@@ -28,7 +28,7 @@ other dealings in this Software without prior written authorization
 from the X Consortium.
 
 */
-/* $XFree86: xc/programs/Xserver/hw/xnest/GetTime.c,v 1.2 2003/11/16 05:05:20 dawes Exp $ */
+/* $XFree86$ */
 
 
 #include "Xos.h"
diff --git a/hw/xnest/Handlers.c b/hw/xnest/Handlers.c
index 693c7296b..5344e4e50 100644
--- a/hw/xnest/Handlers.c
+++ b/hw/xnest/Handlers.c
@@ -12,7 +12,7 @@ the suitability of this software for any purpose.  It is provided "as
 is" without express or implied warranty.
 
 */
-/* $XFree86: xc/programs/Xserver/hw/xnest/Handlers.c,v 1.3 2003/11/16 05:05:20 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xnest/Handlers.c,v 1.2 2001/08/01 00:44:57 tsi Exp $ */
 
 #include "X.h"
 #include "Xproto.h"
diff --git a/hw/xnest/Handlers.h b/hw/xnest/Handlers.h
index ae92352d1..9a1e809cc 100644
--- a/hw/xnest/Handlers.h
+++ b/hw/xnest/Handlers.h
@@ -12,7 +12,7 @@ the suitability of this software for any purpose.  It is provided "as
 is" without express or implied warranty.
 
 */
-/* $XFree86: xc/programs/Xserver/hw/xnest/Handlers.h,v 1.2 2003/11/16 05:05:20 dawes Exp $ */
+/* $XFree86$ */
 
 #ifndef XNESTHANDLERS_H
 #define XNESTHANDLERS_H
diff --git a/hw/xnest/Init.c b/hw/xnest/Init.c
index 6b3c4f19f..7a43b62b4 100644
--- a/hw/xnest/Init.c
+++ b/hw/xnest/Init.c
@@ -12,7 +12,7 @@ the suitability of this software for any purpose.  It is provided "as
 is" without express or implied warranty.
 
 */
-/* $XFree86: xc/programs/Xserver/hw/xnest/Init.c,v 3.25 2003/11/16 05:05:20 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xnest/Init.c,v 3.24 2003/01/15 02:34:14 torrey Exp $ */
 
 #include "X.h"
 #include "Xproto.h"
diff --git a/hw/xnest/Keyboard.c b/hw/xnest/Keyboard.c
index eb9291878..d63faca52 100644
--- a/hw/xnest/Keyboard.c
+++ b/hw/xnest/Keyboard.c
@@ -1,4 +1,5 @@
 /* $Xorg: Keyboard.c,v 1.3 2000/08/17 19:53:28 cpqbld Exp $ */
+/* $XdotOrg$ */
 /*
 
 Copyright 1993 by Davor Matic
@@ -12,7 +13,7 @@ the suitability of this software for any purpose.  It is provided "as
 is" without express or implied warranty.
 
 */
-/* $XFree86: xc/programs/Xserver/hw/xnest/Keyboard.c,v 1.10 2003/11/16 05:05:20 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xnest/Keyboard.c,v 1.9 2003/09/13 21:33:09 dawes Exp $ */
 
 #define NEED_EVENTS
 #include "X.h"
@@ -65,7 +66,7 @@ extern	Status	XkbGetControls(
 #define	XKB_CONFIG_FILE		"X0-config.keyboard"
 #endif
 #ifndef XKB_DFLT_RULES_FILE
-#define	XKB_DFLT_RULES_FILE	"xfree86"
+#define	XKB_DFLT_RULES_FILE	__XKBDEFRULES__
 #endif
 #ifndef XKB_DFLT_KB_LAYOUT
 #define	XKB_DFLT_KB_LAYOUT	"us"
diff --git a/hw/xnest/Keyboard.h b/hw/xnest/Keyboard.h
index 5f8dc3cb4..480231860 100644
--- a/hw/xnest/Keyboard.h
+++ b/hw/xnest/Keyboard.h
@@ -12,7 +12,7 @@ the suitability of this software for any purpose.  It is provided "as
 is" without express or implied warranty.
 
 */
-/* $XFree86: xc/programs/Xserver/hw/xnest/Keyboard.h,v 1.2 2003/11/16 05:05:20 dawes Exp $ */
+/* $XFree86$ */
 
 #ifndef XNESTKEYBOARD_H
 #define XNESTKEYBOARD_H
diff --git a/hw/xnest/Pixmap.c b/hw/xnest/Pixmap.c
index b82dfa49b..5a92dc271 100644
--- a/hw/xnest/Pixmap.c
+++ b/hw/xnest/Pixmap.c
@@ -12,7 +12,7 @@ the suitability of this software for any purpose.  It is provided "as
 is" without express or implied warranty.
 
 */
-/* $XFree86: xc/programs/Xserver/hw/xnest/Pixmap.c,v 3.8 2003/11/16 05:05:20 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xnest/Pixmap.c,v 3.7 2003/07/16 01:38:51 dawes Exp $ */
 
 #include "X.h"
 #include "Xproto.h"
diff --git a/hw/xnest/Pointer.c b/hw/xnest/Pointer.c
index 1af5f02ec..853a48955 100644
--- a/hw/xnest/Pointer.c
+++ b/hw/xnest/Pointer.c
@@ -12,7 +12,7 @@ the suitability of this software for any purpose.  It is provided "as
 is" without express or implied warranty.
 
 */
-/* $XFree86: xc/programs/Xserver/hw/xnest/Pointer.c,v 1.2 2003/11/16 05:05:20 dawes Exp $ */
+/* $XFree86$ */
 
 #include "X.h"
 #include "Xproto.h"
diff --git a/hw/xnest/Pointer.h b/hw/xnest/Pointer.h
index 0b06e5021..27a2011b8 100644
--- a/hw/xnest/Pointer.h
+++ b/hw/xnest/Pointer.h
@@ -12,7 +12,7 @@ the suitability of this software for any purpose.  It is provided "as
 is" without express or implied warranty.
 
 */
-/* $XFree86: xc/programs/Xserver/hw/xnest/Pointer.h,v 1.2 2003/11/16 05:05:20 dawes Exp $ */
+/* $XFree86$ */
 
 #ifndef XNESTPOINTER_H
 #define XNESTPOINTER_H
diff --git a/hw/xnest/Screen.c b/hw/xnest/Screen.c
index 686884555..3412edfb8 100644
--- a/hw/xnest/Screen.c
+++ b/hw/xnest/Screen.c
@@ -12,7 +12,7 @@ the suitability of this software for any purpose.  It is provided "as
 is" without express or implied warranty.
 
 */
-/* $XFree86: xc/programs/Xserver/hw/xnest/Screen.c,v 3.13 2003/11/16 05:05:20 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xnest/Screen.c,v 3.12 2003/11/14 22:25:59 dawes Exp $ */
 
 #include "X.h"
 #include "Xproto.h"
diff --git a/hw/xnest/Screen.h b/hw/xnest/Screen.h
index 96260435b..f35a2872d 100644
--- a/hw/xnest/Screen.h
+++ b/hw/xnest/Screen.h
@@ -12,7 +12,7 @@ the suitability of this software for any purpose.  It is provided "as
 is" without express or implied warranty.
 
 */
-/* $XFree86: xc/programs/Xserver/hw/xnest/Screen.h,v 1.2 2003/11/16 05:05:20 dawes Exp $ */
+/* $XFree86$ */
 
 #ifndef XNESTSCREEN_H
 #define XNESTSCREEN_H
diff --git a/hw/xnest/TestExt.c b/hw/xnest/TestExt.c
index f153b5b2c..d7006207a 100644
--- a/hw/xnest/TestExt.c
+++ b/hw/xnest/TestExt.c
@@ -12,7 +12,7 @@ the suitability of this software for any purpose.  It is provided "as
 is" without express or implied warranty.
 
 */
-/* $XFree86: xc/programs/Xserver/hw/xnest/TestExt.c,v 3.6 2003/11/16 05:05:20 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xnest/TestExt.c,v 3.5 2001/08/27 17:41:00 dawes Exp $ */
 
 #include <X11/X.h>
 #include <X11/Xproto.h>
diff --git a/hw/xnest/Visual.c b/hw/xnest/Visual.c
index bcf7881eb..f88e587b9 100644
--- a/hw/xnest/Visual.c
+++ b/hw/xnest/Visual.c
@@ -12,7 +12,7 @@ the suitability of this software for any purpose.  It is provided "as
 is" without express or implied warranty.
 
 */
-/* $XFree86: xc/programs/Xserver/hw/xnest/Visual.c,v 1.2 2003/11/16 05:05:20 dawes Exp $ */
+/* $XFree86$ */
 
 #include "X.h"
 #include "Xproto.h"
diff --git a/hw/xnest/Visual.h b/hw/xnest/Visual.h
index 14e0085dc..dfa74dbdc 100644
--- a/hw/xnest/Visual.h
+++ b/hw/xnest/Visual.h
@@ -12,7 +12,7 @@ the suitability of this software for any purpose.  It is provided "as
 is" without express or implied warranty.
 
 */
-/* $XFree86: xc/programs/Xserver/hw/xnest/Visual.h,v 1.2 2003/11/16 05:05:20 dawes Exp $ */
+/* $XFree86$ */
 
 #ifndef XNESTVISUAL_H
 #define XNESTVISUAL_H
diff --git a/hw/xnest/Window.c b/hw/xnest/Window.c
index 14ddac082..f7e04844e 100644
--- a/hw/xnest/Window.c
+++ b/hw/xnest/Window.c
@@ -12,7 +12,7 @@ the suitability of this software for any purpose.  It is provided "as
 is" without express or implied warranty.
 
 */
-/* $XFree86: xc/programs/Xserver/hw/xnest/Window.c,v 3.8 2003/11/16 05:05:20 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xnest/Window.c,v 3.7 2001/10/28 03:34:11 tsi Exp $ */
 
 #include "X.h"
 #include "Xproto.h"
diff --git a/hw/xnest/XNCursor.h b/hw/xnest/XNCursor.h
index 7d9426d72..b396c80b5 100644
--- a/hw/xnest/XNCursor.h
+++ b/hw/xnest/XNCursor.h
@@ -12,7 +12,7 @@ the suitability of this software for any purpose.  It is provided "as
 is" without express or implied warranty.
 
 */
-/* $XFree86: xc/programs/Xserver/hw/xnest/XNCursor.h,v 1.3 2003/11/16 05:05:20 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xnest/XNCursor.h,v 1.2 2002/11/23 19:27:50 tsi Exp $ */
 
 #ifndef XNESTCURSOR_H
 #define XNESTCURSOR_H
diff --git a/hw/xnest/XNFont.h b/hw/xnest/XNFont.h
index 34d236f3b..7fb4017bd 100644
--- a/hw/xnest/XNFont.h
+++ b/hw/xnest/XNFont.h
@@ -12,7 +12,7 @@ the suitability of this software for any purpose.  It is provided "as
 is" without express or implied warranty.
 
 */
-/* $XFree86: xc/programs/Xserver/hw/xnest/XNFont.h,v 1.2 2003/11/16 05:05:20 dawes Exp $ */
+/* $XFree86$ */
 
 
 #ifndef XNESTFONT_H
diff --git a/hw/xnest/XNGC.h b/hw/xnest/XNGC.h
index bbec67120..56939cceb 100644
--- a/hw/xnest/XNGC.h
+++ b/hw/xnest/XNGC.h
@@ -12,7 +12,7 @@ the suitability of this software for any purpose.  It is provided "as
 is" without express or implied warranty.
 
 */
-/* $XFree86: xc/programs/Xserver/hw/xnest/XNGC.h,v 1.2 2003/11/16 05:05:20 dawes Exp $ */
+/* $XFree86$ */
 
 #ifndef XNESTGC_H
 #define XNESTGC_H
diff --git a/hw/xnest/XNPixmap.h b/hw/xnest/XNPixmap.h
index 4e4d9c40c..fab1843d1 100644
--- a/hw/xnest/XNPixmap.h
+++ b/hw/xnest/XNPixmap.h
@@ -12,7 +12,7 @@ the suitability of this software for any purpose.  It is provided "as
 is" without express or implied warranty.
 
 */
-/* $XFree86: xc/programs/Xserver/hw/xnest/XNPixmap.h,v 1.4 2003/11/16 05:05:20 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xnest/XNPixmap.h,v 1.3 2003/01/10 13:29:40 eich Exp $ */
 
 #ifndef XNESTPIXMAP_H
 #define XNESTPIXMAP_H
diff --git a/hw/xnest/XNWindow.h b/hw/xnest/XNWindow.h
index 8b5f39115..cc49b2343 100644
--- a/hw/xnest/XNWindow.h
+++ b/hw/xnest/XNWindow.h
@@ -12,7 +12,7 @@ the suitability of this software for any purpose.  It is provided "as
 is" without express or implied warranty.
 
 */
-/* $XFree86: xc/programs/Xserver/hw/xnest/XNWindow.h,v 1.4 2003/11/16 05:05:20 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xnest/XNWindow.h,v 1.3 2003/11/03 05:36:34 tsi Exp $ */
 
 #ifndef XNESTWINDOW_H
 #define XNESTWINDOW_H
diff --git a/hw/xnest/Xnest.h b/hw/xnest/Xnest.h
index 64b09de7e..ade73833f 100644
--- a/hw/xnest/Xnest.h
+++ b/hw/xnest/Xnest.h
@@ -28,7 +28,7 @@ other dealings in this Software without prior written authorization
 from the X Consortium.
 
 */
-/* $XFree86: xc/programs/Xserver/hw/xnest/Xnest.h,v 1.3 2001/08/28 16:48:08 tsi Exp $ */
+/* $XFree86$ */
 
 /* 
 ** Machines with a 64 bit library interface and a 32 bit server require
diff --git a/hw/xnest/Xnest.man.pre b/hw/xnest/Xnest.man.pre
index 488489189..131c224f2 100644
--- a/hw/xnest/Xnest.man.pre
+++ b/hw/xnest/Xnest.man.pre
@@ -25,7 +25,7 @@
 .\" other dealings in this Software without prior written authorization
 .\" from the X Consortium.
 .\"
-.\" $XFree86: xc/programs/Xserver/hw/xnest/Xnest.man,v 1.7 2003/10/24 17:22:33 dawes Exp $
+.\" $XFree86: xc/programs/Xserver/hw/xnest/Xnest.man,v 1.6 2001/01/27 18:21:00 dawes Exp $
 .\"
 .TH XNEST 1 __xorgversion__
 .SH NAME
diff --git a/hw/xnest/os2Stub.c b/hw/xnest/os2Stub.c
index 15282d206..2e3b7b399 100644
--- a/hw/xnest/os2Stub.c
+++ b/hw/xnest/os2Stub.c
@@ -26,7 +26,7 @@
  *
  */
 
-/* $XFree86: xc/programs/Xserver/hw/xnest/os2Stub.c,v 3.2 2003/11/06 03:25:46 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xnest/os2Stub.c,v 3.1 2002/05/31 18:46:04 dawes Exp $ */
 
 /* This below implements select() for calls in xnest. It has been         */
 /* somewhat optimized for improved performance, but assumes a few */
diff --git a/hw/xwin/InitInput.c b/hw/xwin/InitInput.c
index de84a7aee..92fb5c3e5 100644
--- a/hw/xwin/InitInput.c
+++ b/hw/xwin/InitInput.c
@@ -26,7 +26,7 @@
   from The Open Group.
 
 */
-/* $XFree86: xc/programs/Xserver/hw/xwin/InitInput.c,v 1.13 2003/07/29 21:25:15 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xwin/InitInput.c,v 1.11 2002/07/05 09:19:25 alanh Exp $ */
 
 #include "win.h"
 #include "../../Xext/xf86miscproc.h"
diff --git a/hw/xwin/InitOutput.c b/hw/xwin/InitOutput.c
index 3202ae8d9..68910be1a 100644
--- a/hw/xwin/InitOutput.c
+++ b/hw/xwin/InitOutput.c
@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/programs/Xserver/hw/xwin/InitOutput.c,v 1.35 2003/10/08 11:13:02 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xwin/InitOutput.c,v 1.34 2003/10/02 13:30:09 eich Exp $ */
 
 #include "win.h"
 #include "winconfig.h"
@@ -312,7 +312,7 @@ ddxUseMsg (void)
 
   ErrorF ("-lesspointer\n"
 	  "\tHide the windows mouse pointer when it is over an inactive\n"
-          "\tXFree86 window.  This prevents ghost cursors appearing where\n"
+          "\tX window.  This prevents ghost cursors appearing where\n"
 	  "\tthe Windows cursor is drawn overtop of the X cursor\n");
 
   ErrorF ("-nodecoration\n"
@@ -361,7 +361,7 @@ ddxUseMsg (void)
   ErrorF ("-[no]winkill\n"
           "\tAlt+F4 exits the X Server.\n");
 
-  ErrorF ("-xf86config\n"
+  ErrorF ("-config\n"
           "\tSpecify a configuration file.\n");
 
   ErrorF ("-keyboard\n"
@@ -394,6 +394,11 @@ ddxUseMsg (void)
 /* Compare the current option with the string. */ 
 #define IS_OPTION(name) (strcmp (argv[i], name) == 0)
 
+/* ddxInitGlobals - called by |InitGlobals| from os/util.c */
+void ddxInitGlobals(void)
+{
+}
+
 int
 ddxProcessArgument (int argc, char *argv[], int i)
 {
@@ -1201,9 +1206,9 @@ ddxProcessArgument (int argc, char *argv[], int i)
     }
 
   /*
-   * Look for the '-xf86config' argument
+   * Look for the '-config' argument.  Accept -xf86config as an alias
    */
-  if (IS_OPTION ("-xf86config"))
+  if (IS_OPTION ("-config") || IS_OPTION ("-xf86config"))
     {
       CHECK_ARGS (1);
       g_cmdline.configFile = argv[++i];
@@ -1270,7 +1275,7 @@ InitOutput (ScreenInfo *screenInfo, int argc, char *argv[])
   ErrorF ("InitOutput\n");
 #endif
 
-  /* Try to read the XF86Config-style configuration file */
+  /* Try to read the xorg.conf-style configuration file */
   if (!winReadConfigfile ())
     ErrorF ("InitOutput - Error reading config file\n");
 
diff --git a/hw/xwin/XWin.man b/hw/xwin/XWin.man
index fe78047c4..3fb3f2814 100644
--- a/hw/xwin/XWin.man
+++ b/hw/xwin/XWin.man
@@ -1,4 +1,4 @@
-.\" $XFree86: xc/programs/Xserver/hw/xwin/XWin.man,v 1.7 2003/10/02 13:30:09 eich Exp $
+.\" $XFree86: xc/programs/Xserver/hw/xwin/XWin.man,v 1.5 2002/07/05 09:19:25 alanh Exp $
 .TH XWIN 1 __vendorversion__
 .SH NAME
 XWin \- X Server for the Cygwin environment on Microsoft Windows
@@ -48,13 +48,13 @@ Sets the display resolution for the X server to use on screen
 .I screen_number.
 .TP 8
 .B \-nodecoration
-Draw the Cygwin/XFree86 window without a border or title bar.
+Draw the Cygwin/X window without a border or title bar.
 .TP 8
 .B \-rootless
-EXPERIMENTAL: Run Cygwin/XFree86 in pseduo-rootless mode.
+EXPERIMENTAL: Run Cygwin/X in pseduo-rootless mode.
 .TP 8
 .B \-lesspointer
-Hide the Windows mouse pointer when over an inactive XFree86 window
+Hide the Windows mouse pointer when over an inactive X window
 .TP 8
 .B \-scrollbars
 In windowed mode, allow screens bigger than the Windows desktop.
@@ -96,14 +96,14 @@ ones are:
 - The display mode can not be changed once the X server has started.
 .PP
 .SH AUTHORS
-XFree86 was originally ported to Cygwin by Dakshinamurthy Karra,
+X was originally ported to Cygwin by Dakshinamurthy Karra,
 Dr. Peter Busch, John Fortin, and Suhaib Siddiqi.
 .I XWin
-is maintained by the Cygwin/XFree86 project, with hosting services
-provided by RedHat.
+is maintained by the Cygwin/X project, with hosting services
+provided by freedesktop.org.
 .PP
 The following members, in alphabetical order by last name, of the
-Cygwin/XFree86 Team contributed to the XFree86 4.1.0 release:
+Cygwin/X Team contributed to the X.Org Foundation 6.7 release:
 .PP
 Robert Collins - Cygwin developer, miscellaneous
 .br
@@ -112,7 +112,7 @@ programming guru
 .br
 Alexander Gottwald - AltGr handling for non-U.S. keyboards
 .br
-Alan Hourihane - XFree86 developer, patch reviewer, general programming guru
+Alan Hourihane - X developer, patch reviewer, general programming guru
 .br
 Pierre A Humblet - Debugging of socket-related crashes, developer
 .br
diff --git a/hw/xwin/XWin.rc b/hw/xwin/XWin.rc
index 7b5708af2..2e6cceb47 100644
--- a/hw/xwin/XWin.rc
+++ b/hw/xwin/XWin.rc
@@ -27,7 +27,7 @@
  *
  * Authors:	Harold L Hunt II
  */
-/* $XFree86: xc/programs/Xserver/hw/xwin/XWin.rc,v 1.2 2003/07/29 21:25:15 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xwin/XWin.rc,v 1.1 2002/10/17 08:18:21 alanh Exp $ */
 
 #include "resource.h"
 
@@ -41,12 +41,12 @@
 DEPTH_CHANGE_BOX DIALOG DISCARDABLE	32, 32, 180, 100
 STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE | DS_CENTER
 FONT 8, "MS Sans Serif"
-CAPTION "Cygwin/XFree86"
+CAPTION "Cygwin/X"
 BEGIN
   DEFPUSHBUTTON		"Dismiss", IDOK, 66, 80, 50, 14
-  CTEXT			"Cygwin/XFree86", IDC_STATIC, 40, 12, 100, 8
+  CTEXT			"Cygwin/X", IDC_STATIC, 40, 12, 100, 8
   CTEXT			"Disruptive screen configuration change.", IDC_STATIC, 7, 40, 166, 8
-  CTEXT			"Restore previous resolution to use Cygwin/XFree86.", IDC_STATIC, 7, 52, 166, 8
+  CTEXT			"Restore previous resolution to use Cygwin/X.", IDC_STATIC, 7, 52, 166, 8
 END
 
 
@@ -55,7 +55,7 @@ END
 EXIT_DIALOG DIALOG DISCARDABLE	32, 32, 180, 70
 STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE | WS_TABSTOP | DS_CENTER
 FONT 8, "MS Sans Serif"
-CAPTION "Cygwin/XFree86 - Exit?"
+CAPTION "Cygwin/X - Exit?"
 BEGIN
   PUSHBUTTON "E&xit", IDOK, 55, 48, 30, 14
   DEFPUSHBUTTON "&Cancel", IDCANCEL, 95, 48, 30, 14
diff --git a/hw/xwin/ddraw.h b/hw/xwin/ddraw.h
index b67a556b5..fbbf2b8eb 100644
--- a/hw/xwin/ddraw.h
+++ b/hw/xwin/ddraw.h
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xwin/ddraw.h,v 1.4 2001/07/29 22:08:15 tsi Exp $ */
 
 #ifndef __WINE_DDRAW_H
 #define __WINE_DDRAW_H
diff --git a/hw/xwin/win.h b/hw/xwin/win.h
index 6ecf5ada0..53d0880ea 100644
--- a/hw/xwin/win.h
+++ b/hw/xwin/win.h
@@ -31,7 +31,7 @@
  *		Harold L Hunt II
  *		Kensuke Matsuzaki
  */
-/* $XFree86: xc/programs/Xserver/hw/xwin/win.h,v 1.38 2003/10/08 11:13:02 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xwin/win.h,v 1.37 2003/10/02 13:30:09 eich Exp $ */
 
 #ifndef _WIN_H_
 #define _WIN_H_
diff --git a/hw/xwin/winallpriv.c b/hw/xwin/winallpriv.c
index a27309598..0da136541 100644
--- a/hw/xwin/winallpriv.c
+++ b/hw/xwin/winallpriv.c
@@ -28,7 +28,7 @@
  * Authors:	Keith Packard, MIT X Consortium
  *		Harold L Hunt II
  */
-/* $XFree86: xc/programs/Xserver/hw/xwin/winallpriv.c,v 1.12 2002/10/31 23:04:39 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xwin/winallpriv.c,v 1.11 2002/10/17 08:18:21 alanh Exp $ */
 
 #include "win.h"
 
diff --git a/hw/xwin/winblock.c b/hw/xwin/winblock.c
index cc057eed6..35463493b 100644
--- a/hw/xwin/winblock.c
+++ b/hw/xwin/winblock.c
@@ -27,7 +27,7 @@
  *
  * Authors:	Harold L Hunt II
  */
-/* $XFree86: xc/programs/Xserver/hw/xwin/winblock.c,v 1.7 2003/07/29 21:25:16 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xwin/winblock.c,v 1.5 2002/10/17 08:18:22 alanh Exp $ */
 
 #include "win.h"
 
diff --git a/hw/xwin/winclip.c b/hw/xwin/winclip.c
index a829e8eb9..b8d10365d 100644
--- a/hw/xwin/winclip.c
+++ b/hw/xwin/winclip.c
@@ -27,7 +27,7 @@
  *
  * Authors:	Harold L Hunt II
  */
-/* $XFree86: xc/programs/Xserver/hw/xwin/winclip.c,v 1.2 2001/06/04 13:04:41 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xwin/winclip.c,v 1.1 2001/04/05 20:13:49 dawes Exp $ */
 
 #include "win.h"
 
diff --git a/hw/xwin/winclipboard.h b/hw/xwin/winclipboard.h
index 8f9bae789..3e7c22fa0 100644
--- a/hw/xwin/winclipboard.h
+++ b/hw/xwin/winclipboard.h
@@ -27,7 +27,7 @@
  *
  * Authors:	Harold Hunt
  */
-/* $XFree86: xc/programs/Xserver/hw/xwin/winclipboard.h,v 1.3 2003/10/02 13:30:10 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xwin/winwindow.c,v 1.5 2002/11/07 10:31:32 alanh Exp $ */
 
 
 #ifndef _WINCLIPBOARD_H_
diff --git a/hw/xwin/winclipboardinit.c b/hw/xwin/winclipboardinit.c
index a1f7b0b6d..0a1977759 100644
--- a/hw/xwin/winclipboardinit.c
+++ b/hw/xwin/winclipboardinit.c
@@ -27,7 +27,7 @@
  *
  * Authors:	Harold L Hunt II
  */
-/* $XFree86: xc/programs/Xserver/hw/xwin/winclipboardinit.c,v 1.2 2003/07/29 21:25:16 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xwin/winclip.c,v 1.2 2001/06/04 13:04:41 alanh Exp $ */
 
 #include "winclipboard.h"
 
diff --git a/hw/xwin/winclipboardtextconv.c b/hw/xwin/winclipboardtextconv.c
index 09ef40076..2f11b9241 100644
--- a/hw/xwin/winclipboardtextconv.c
+++ b/hw/xwin/winclipboardtextconv.c
@@ -27,7 +27,7 @@
  *
  * Authors:	Harold L Hunt II
  */
-/* $XFree86: xc/programs/Xserver/hw/xwin/winclipboardtextconv.c,v 1.2 2003/07/29 21:25:16 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xwin/winclip.c,v 1.2 2001/06/04 13:04:41 alanh Exp $ */
 
 #include "win.h"
 #include <stdio.h>
diff --git a/hw/xwin/winclipboardthread.c b/hw/xwin/winclipboardthread.c
index 06a985533..7a746a0b3 100644
--- a/hw/xwin/winclipboardthread.c
+++ b/hw/xwin/winclipboardthread.c
@@ -27,7 +27,7 @@
  *
  * Authors:	Harold L Hunt II
  */
-/* $XFree86: xc/programs/Xserver/hw/xwin/winclipboardthread.c,v 1.3 2003/10/02 13:30:10 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xwin/winclip.c,v 1.2 2001/06/04 13:04:41 alanh Exp $ */
 
 #include "winclipboard.h"
 
diff --git a/hw/xwin/winclipboardunicode.c b/hw/xwin/winclipboardunicode.c
index 9eb2b0d87..bda09b79f 100644
--- a/hw/xwin/winclipboardunicode.c
+++ b/hw/xwin/winclipboardunicode.c
@@ -27,7 +27,7 @@
  *
  * Authors:	Harold L Hunt II
  */
-/* $XFree86: xc/programs/Xserver/hw/xwin/winclipboardunicode.c,v 1.2 2003/07/29 21:25:16 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xwin/winclip.c,v 1.2 2001/06/04 13:04:41 alanh Exp $ */
 
 #include "win.h"
 
diff --git a/hw/xwin/winclipboardwndproc.c b/hw/xwin/winclipboardwndproc.c
index c577d060e..f8e52a0ef 100644
--- a/hw/xwin/winclipboardwndproc.c
+++ b/hw/xwin/winclipboardwndproc.c
@@ -27,7 +27,7 @@
  *
  * Authors:	Harold L Hunt II
  */
-/* $XFree86: xc/programs/Xserver/hw/xwin/winclipboardwndproc.c,v 1.2 2003/07/29 21:25:16 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xwin/winclip.c,v 1.2 2001/06/04 13:04:41 alanh Exp $ */
 
 #include "winclipboard.h"
 
diff --git a/hw/xwin/winclipboardxevents.c b/hw/xwin/winclipboardxevents.c
index 8b3a56489..d2cfb2e55 100644
--- a/hw/xwin/winclipboardxevents.c
+++ b/hw/xwin/winclipboardxevents.c
@@ -27,7 +27,7 @@
  *
  * Authors:	Harold L Hunt II
  */
-/* $XFree86: xc/programs/Xserver/hw/xwin/winclipboardxevents.c,v 1.3 2003/10/02 13:30:10 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xwin/winclip.c,v 1.2 2001/06/04 13:04:41 alanh Exp $ */
 
 #include "winclipboard.h"
 
diff --git a/hw/xwin/wincmap.c b/hw/xwin/wincmap.c
index 4fb89a2fd..f89c26cf0 100644
--- a/hw/xwin/wincmap.c
+++ b/hw/xwin/wincmap.c
@@ -30,7 +30,7 @@
  *		Peter Busch
  *		Harold L Hunt II
  */
-/* $XFree86: xc/programs/Xserver/hw/xwin/wincmap.c,v 1.10 2002/10/17 08:18:22 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xwin/wincmap.c,v 1.9 2002/07/05 09:19:26 alanh Exp $ */
 
 #include "win.h"
 
diff --git a/hw/xwin/winconfig.c b/hw/xwin/winconfig.c
index b42b1d6bf..d62fb18d9 100644
--- a/hw/xwin/winconfig.c
+++ b/hw/xwin/winconfig.c
@@ -27,7 +27,7 @@
  *
  * Authors: Alexander Gottwald	
  */
-/* $XFree86: xc/programs/Xserver/hw/xwin/winconfig.c,v 1.4 2003/10/08 11:13:02 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xwin/winconfig.c,v 1.3 2003/10/02 13:30:10 eich Exp $ */
 
 #include "win.h"
 #include "winconfig.h"
@@ -126,6 +126,11 @@ winReadConfigfile ()
   /* Parse config file into data structure */
 
   filename = xf86openConfigFile (CONFIGPATH, xf86ConfigFile, PROJECTROOT);
+    
+  /* Hack for backward compatibility */
+  if (!filename && from == X_DEFAULT)
+    filename = xf86openConfigFile (CONFIGPATH, "XF86Config", PROJECTROOT);
+
   if (filename)
     {
       winMsg (from, "Using config file: \"%s\"\n", filename);
@@ -258,7 +263,7 @@ winConfigKeyboard (DeviceIntPtr pDevice)
   g_winInfo.xkb.variant = NULL;
   g_winInfo.xkb.options = NULL;
 # else
-  g_winInfo.xkb.rules = "xfree86";
+  g_winInfo.xkb.rules = "xorg";
   g_winInfo.xkb.model = "pc101";
   g_winInfo.xkb.layout = "us";
   g_winInfo.xkb.variant = NULL;
diff --git a/hw/xwin/winconfig.h b/hw/xwin/winconfig.h
index d3099b373..6f07ea9bc 100644
--- a/hw/xwin/winconfig.h
+++ b/hw/xwin/winconfig.h
@@ -27,7 +27,6 @@
  *
  * Authors: Alexander Gottwald	
  */
-/* $XFree86: xc/programs/Xserver/hw/xwin/winconfig.h,v 1.1 2002/10/17 08:18:22 alanh Exp $ */
 #ifndef __WIN_CONFIG_H__
 #define __WIN_CONFIG_H__
 
diff --git a/hw/xwin/wincreatewnd.c b/hw/xwin/wincreatewnd.c
index 336131c8a..10d2273cd 100644
--- a/hw/xwin/wincreatewnd.c
+++ b/hw/xwin/wincreatewnd.c
@@ -27,7 +27,7 @@
  *
  * Authors:	Harold L Hunt II
  */
-/* $XFree86: xc/programs/Xserver/hw/xwin/wincreatewnd.c,v 1.7 2003/10/08 11:13:03 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xwin/wincreatewnd.c,v 1.4 2002/10/17 08:18:22 alanh Exp $ */
 
 #include "win.h"
 #include "shellapi.h"
diff --git a/hw/xwin/wincursor.c b/hw/xwin/wincursor.c
index e7c3ba7e7..9e053a7d2 100644
--- a/hw/xwin/wincursor.c
+++ b/hw/xwin/wincursor.c
@@ -30,7 +30,7 @@
  *		Peter Busch
  *		Harold L Hunt II
  */
-/* $XFree86: xc/programs/Xserver/hw/xwin/wincursor.c,v 1.6 2003/07/29 21:25:17 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xwin/wincursor.c,v 1.5 2002/07/05 09:19:26 alanh Exp $ */
 
 #include "win.h"
 
diff --git a/hw/xwin/windialogs.c b/hw/xwin/windialogs.c
index d905ad81c..07db55075 100755
--- a/hw/xwin/windialogs.c
+++ b/hw/xwin/windialogs.c
@@ -27,7 +27,7 @@
  *
  * Authors:	Harold L Hunt II
  */
-/* $XFree86: xc/programs/Xserver/hw/xwin/windialogs.c,v 1.1 2003/07/29 21:25:17 dawes Exp $ */
+/* $XFree86: $ */
 
 #include "win.h"
 
diff --git a/hw/xwin/winengine.c b/hw/xwin/winengine.c
index d76e58628..c8c2ef40f 100644
--- a/hw/xwin/winengine.c
+++ b/hw/xwin/winengine.c
@@ -27,7 +27,7 @@
  *
  * Authors:	Harold L Hunt II
  */
-/* $XFree86: xc/programs/Xserver/hw/xwin/winengine.c,v 1.5 2003/07/29 21:25:17 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xwin/winengine.c,v 1.3 2002/07/05 09:19:26 alanh Exp $ */
 
 #include "win.h"
 
diff --git a/hw/xwin/winerror.c b/hw/xwin/winerror.c
index 8a1e0df85..fa6687c1b 100644
--- a/hw/xwin/winerror.c
+++ b/hw/xwin/winerror.c
@@ -27,7 +27,7 @@
  *
  * Authors:	Harold L Hunt II
  */
-/* $XFree86: xc/programs/Xserver/hw/xwin/winerror.c,v 1.6 2003/10/02 13:30:10 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xwin/winerror.c,v 1.3 2001/10/23 22:22:47 alanh Exp $ */
 
 #include "win.h"
 
diff --git a/hw/xwin/winfillsp.c b/hw/xwin/winfillsp.c
index 9ac536274..556fde718 100644
--- a/hw/xwin/winfillsp.c
+++ b/hw/xwin/winfillsp.c
@@ -28,7 +28,7 @@
  * Authors:	Harold L Hunt II
  * 		Alan Hourihane <alanh@fairlite.demon.co.uk>
  */
-/* $XFree86: xc/programs/Xserver/hw/xwin/winfillsp.c,v 1.10 2003/08/07 23:47:58 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xwin/winfillsp.c,v 1.9 2001/11/01 12:19:40 alanh Exp $ */
 
 #include "win.h"
 
diff --git a/hw/xwin/winfont.c b/hw/xwin/winfont.c
index 97bd7967b..a6ff2f7da 100644
--- a/hw/xwin/winfont.c
+++ b/hw/xwin/winfont.c
@@ -27,7 +27,7 @@
  *
  * Authors:	Harold L Hunt II
  */
-/* $XFree86: xc/programs/Xserver/hw/xwin/winfont.c,v 1.3 2003/08/07 23:47:58 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xwin/winfont.c,v 1.2 2001/06/04 13:04:41 alanh Exp $ */
 
 #include "win.h"
 
diff --git a/hw/xwin/wingc.c b/hw/xwin/wingc.c
index a4e2a53cb..ce0ef6584 100644
--- a/hw/xwin/wingc.c
+++ b/hw/xwin/wingc.c
@@ -27,7 +27,7 @@
  *
  * Authors:	Harold L Hunt II
  */
-/* $XFree86: xc/programs/Xserver/hw/xwin/wingc.c,v 1.11 2003/08/07 23:47:58 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xwin/wingc.c,v 1.10 2001/10/30 15:39:09 alanh Exp $ */
 
 #include "win.h"
 void
diff --git a/hw/xwin/wingetsp.c b/hw/xwin/wingetsp.c
index 49ba7f2fb..79dc5eb53 100644
--- a/hw/xwin/wingetsp.c
+++ b/hw/xwin/wingetsp.c
@@ -28,7 +28,7 @@
  * Authors:	Harold L Hunt II
  * 		Alan Hourihane <alanh@fairlite.demon.co.uk>
  */
-/* $XFree86: xc/programs/Xserver/hw/xwin/wingetsp.c,v 1.8 2003/08/07 23:47:58 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xwin/wingetsp.c,v 1.7 2001/11/01 12:19:40 alanh Exp $ */
 
 #include "win.h"
 
diff --git a/hw/xwin/winkeybd.c b/hw/xwin/winkeybd.c
index 95f245e57..4228ad422 100644
--- a/hw/xwin/winkeybd.c
+++ b/hw/xwin/winkeybd.c
@@ -30,7 +30,7 @@
  *		Peter Busch
  *		Harold L Hunt II
  */
-/* $XFree86: xc/programs/Xserver/hw/xwin/winkeybd.c,v 1.13 2003/07/29 21:25:17 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xwin/winkeybd.c,v 1.12 2002/10/17 08:18:22 alanh Exp $ */
 
 
 #include "win.h"
diff --git a/hw/xwin/winkeybd.h b/hw/xwin/winkeybd.h
index 0822b0e5f..375245f80 100644
--- a/hw/xwin/winkeybd.h
+++ b/hw/xwin/winkeybd.h
@@ -27,7 +27,7 @@
  *
  * Authors:	Harold L Hunt II
  */
-/* $XFree86: xc/programs/Xserver/hw/xwin/winkeybd.h,v 1.3 2002/07/05 09:19:26 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xwin/winkeybd.h,v 1.1 2001/09/26 13:00:34 alanh Exp $ */
 
 /*
  * We need symbols for the scan codes of keys.
@@ -36,7 +36,7 @@
 
 
 /*
- * Include the standard XFree86 ASCII keymap.
+ * Include the standard ASCII keymap.
  *
  * This header declares a static KeySym array called 'map'.
  */
diff --git a/hw/xwin/winmisc.c b/hw/xwin/winmisc.c
index ea8303ea9..e93d1fd93 100644
--- a/hw/xwin/winmisc.c
+++ b/hw/xwin/winmisc.c
@@ -27,7 +27,7 @@
  *
  * Authors:	Harold L Hunt II
  */
-/* $XFree86: xc/programs/Xserver/hw/xwin/winmisc.c,v 1.6 2002/07/05 09:19:26 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xwin/winmisc.c,v 1.5 2001/11/11 22:45:57 alanh Exp $ */
 
 #include "win.h"
 
diff --git a/hw/xwin/winmouse.c b/hw/xwin/winmouse.c
index 8c9439bfd..ef3a2eb92 100644
--- a/hw/xwin/winmouse.c
+++ b/hw/xwin/winmouse.c
@@ -30,7 +30,7 @@
  *		Peter Busch
  *		Harold L Hunt II
  */
-/* $XFree86: xc/programs/Xserver/hw/xwin/winmouse.c,v 1.4 2001/10/29 21:10:24 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xwin/winmouse.c,v 1.3 2001/05/08 08:14:09 alanh Exp $ */
 
 #include "win.h"
 
diff --git a/hw/xwin/winms.h b/hw/xwin/winms.h
index 17454487d..ad20348b6 100644
--- a/hw/xwin/winms.h
+++ b/hw/xwin/winms.h
@@ -27,7 +27,7 @@
  *
  * Authors:	Harold L Hunt II
  */
-/* $XFree86: xc/programs/Xserver/hw/xwin/winms.h,v 1.2 2001/04/18 17:14:06 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xwin/winms.h,v 1.1 2001/04/05 20:13:50 dawes Exp $ */
 
 #ifndef _WINMS_H_
 #define _WINMS_H_
diff --git a/hw/xwin/winmsg.c b/hw/xwin/winmsg.c
index ce8ac4199..8d42d95a0 100644
--- a/hw/xwin/winmsg.c
+++ b/hw/xwin/winmsg.c
@@ -27,7 +27,7 @@
  *
  * Authors: Alexander Gottwald	
  */
-/* $XFree86: xc/programs/Xserver/hw/xwin/winmsg.c,v 1.2 2003/10/02 13:30:10 eich Exp $ */
+/* $XFree86$ */
 
 #include "win.h"
 #include "winmsg.h"
diff --git a/hw/xwin/winmsg.h b/hw/xwin/winmsg.h
index 16ec536b0..136cdc3a8 100644
--- a/hw/xwin/winmsg.h
+++ b/hw/xwin/winmsg.h
@@ -27,7 +27,7 @@
  *
  * Authors: Alexander Gottwald	
  */
-/* $XFree86: xc/programs/Xserver/hw/xwin/winmsg.h,v 1.2 2003/10/02 13:30:10 eich Exp $ */
+/* $XFree86$ */
 
 #ifndef __WIN_MSG_H__
 #define __WIN_MSG_H__
diff --git a/hw/xwin/winmultiwindowclass.c b/hw/xwin/winmultiwindowclass.c
index 21be64977..be65bd153 100755
--- a/hw/xwin/winmultiwindowclass.c
+++ b/hw/xwin/winmultiwindowclass.c
@@ -27,7 +27,7 @@
  *
  * Authors:     Earle F. Philhower, III
  */
-/* $XFree86: xc/programs/Xserver/hw/xwin/winmultiwindowclass.c,v 1.2 2003/10/02 13:30:10 eich Exp $ */
+/* $XFree86$ */
 
 #include <Xatom.h>
 #include "propertyst.h"
diff --git a/hw/xwin/winmultiwindowclass.h b/hw/xwin/winmultiwindowclass.h
index b6ad55d8b..f9cfee30f 100755
--- a/hw/xwin/winmultiwindowclass.h
+++ b/hw/xwin/winmultiwindowclass.h
@@ -27,7 +27,7 @@
  *
  * Authors:     Earle F. Philhower, III
  */
-/* $XFree86: xc/programs/Xserver/hw/xwin/winmultiwindowclass.h,v 1.2 2003/10/02 13:30:10 eich Exp $ */
+/* $XFree86$ */
 
 
 /*
diff --git a/hw/xwin/winmultiwindowicons.c b/hw/xwin/winmultiwindowicons.c
index dd56db6d6..33b9391a8 100755
--- a/hw/xwin/winmultiwindowicons.c
+++ b/hw/xwin/winmultiwindowicons.c
@@ -27,7 +27,7 @@
  *
  * Authors:	Earle F. Philhower, III
  */
-/* $XFree86: xc/programs/Xserver/hw/xwin/winmultiwindowicons.c,v 1.2 2003/10/02 13:30:10 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xwin/winwindow.c,v 1.5 2002/11/07 10:31:32 alanh Exp $ */
 
 #include "win.h"
 #include "dixevents.h"
diff --git a/hw/xwin/winmultiwindowshape.c b/hw/xwin/winmultiwindowshape.c
index 2d6a6f2cc..a21bbe9f3 100755
--- a/hw/xwin/winmultiwindowshape.c
+++ b/hw/xwin/winmultiwindowshape.c
@@ -28,7 +28,7 @@
  * Authors:	Kensuke Matsuzaki
  *		Harold L Hunt II
  */
-/* $XFree86: xc/programs/Xserver/hw/xwin/winmultiwindowshape.c,v 1.3 2003/12/22 01:34:20 dickey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xwin/winmultiwindowshape.c,v 1.2 2003/11/10 18:22:44 tsi Exp $ */
 
 #ifdef SHAPE
 
diff --git a/hw/xwin/winmultiwindowwindow.c b/hw/xwin/winmultiwindowwindow.c
index 15e508659..1430b7d88 100644
--- a/hw/xwin/winmultiwindowwindow.c
+++ b/hw/xwin/winmultiwindowwindow.c
@@ -29,7 +29,7 @@
  *		Earle F. Philhower, III
  *		Harold L Hunt II
  */
-/* $XFree86: xc/programs/Xserver/hw/xwin/winmultiwindowwindow.c,v 1.3 2003/10/02 13:30:10 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xwin/winwindow.c,v 1.5 2002/11/07 10:31:32 alanh Exp $ */
 
 #include "win.h"
 #include "dixevents.h"
diff --git a/hw/xwin/winmultiwindowwm.c b/hw/xwin/winmultiwindowwm.c
index a60d36135..f77a40476 100644
--- a/hw/xwin/winmultiwindowwm.c
+++ b/hw/xwin/winmultiwindowwm.c
@@ -27,7 +27,7 @@
  *
  * Authors:	Kensuke Matsuzaki
  */
-/* $XFree86: xc/programs/Xserver/hw/xwin/winmultiwindowwm.c,v 1.3 2003/10/02 13:30:11 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xwin/winwindow.c,v 1.5 2002/11/07 10:31:32 alanh Exp $ */
 
 /* X headers */
 #include <stdio.h>
diff --git a/hw/xwin/winmultiwindowwndproc.c b/hw/xwin/winmultiwindowwndproc.c
index d90abb61f..83f3b02f6 100755
--- a/hw/xwin/winmultiwindowwndproc.c
+++ b/hw/xwin/winmultiwindowwndproc.c
@@ -29,7 +29,7 @@
  *		Earle F. Philhower, III
  *		Harold L Hunt II
  */
-/* $XFree86: xc/programs/Xserver/hw/xwin/winmultiwindowwndproc.c,v 1.3 2003/10/08 11:13:03 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xwin/winmultiwindowwndproc.c,v 1.2 2003/10/02 13:30:11 eich Exp $ */
 
 #include "win.h"
 #include "dixevents.h"
diff --git a/hw/xwin/winnativegdi.c b/hw/xwin/winnativegdi.c
index f7d8a4a1a..b2ac9f14e 100644
--- a/hw/xwin/winnativegdi.c
+++ b/hw/xwin/winnativegdi.c
@@ -27,7 +27,7 @@
  *
  * Authors:	Harold L Hunt II
  */
-/* $XFree86: xc/programs/Xserver/hw/xwin/winnativegdi.c,v 1.15 2003/08/07 23:47:58 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xwin/winnativegdi.c,v 1.14 2003/07/29 21:25:18 dawes Exp $ */
 
 #include "win.h"
 
diff --git a/hw/xwin/winpfbdd.c b/hw/xwin/winpfbdd.c
index 7cbdb5e53..33cb42eb1 100644
--- a/hw/xwin/winpfbdd.c
+++ b/hw/xwin/winpfbdd.c
@@ -30,7 +30,7 @@
  *		Peter Busch
  *		Harold L Hunt II
  */
-/* $XFree86: xc/programs/Xserver/hw/xwin/winpfbdd.c,v 1.18 2003/07/29 21:25:18 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xwin/winpfbdd.c,v 1.17 2002/10/17 08:18:22 alanh Exp $ */
 
 #include "win.h"
 
diff --git a/hw/xwin/winpixmap.c b/hw/xwin/winpixmap.c
index 43ade059b..24e49719a 100644
--- a/hw/xwin/winpixmap.c
+++ b/hw/xwin/winpixmap.c
@@ -28,7 +28,7 @@
  * Authors:	drewry, september 1986
  *		Harold L Hunt II
  */
-/* $XFree86: xc/programs/Xserver/hw/xwin/winpixmap.c,v 1.11 2003/08/07 23:47:58 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xwin/winpixmap.c,v 1.10 2002/10/17 08:18:24 alanh Exp $ */
 
 #include "win.h"
 
diff --git a/hw/xwin/winpntwin.c b/hw/xwin/winpntwin.c
index d28929d67..46d738209 100644
--- a/hw/xwin/winpntwin.c
+++ b/hw/xwin/winpntwin.c
@@ -27,7 +27,7 @@
  *
  * Authors:	Harold L Hunt II
  */
-/* $XFree86: xc/programs/Xserver/hw/xwin/winpntwin.c,v 1.2 2001/06/04 13:04:41 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xwin/winpntwin.c,v 1.1 2001/04/05 20:13:50 dawes Exp $ */
 
 #include "win.h"
 
diff --git a/hw/xwin/winpolyline.c b/hw/xwin/winpolyline.c
index 948c34428..baafd8c39 100644
--- a/hw/xwin/winpolyline.c
+++ b/hw/xwin/winpolyline.c
@@ -27,7 +27,7 @@
  *
  * Authors:	Harold L Hunt II
  */
-/* $XFree86: xc/programs/Xserver/hw/xwin/winpolyline.c,v 1.4 2003/08/07 23:47:58 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xwin/winpolyline.c,v 1.3 2001/09/13 08:25:45 alanh Exp $ */
 
 #include "win.h"
 
diff --git a/hw/xwin/winprefs.c b/hw/xwin/winprefs.c
index 3bea60d3d..b0a5d49ee 100644
--- a/hw/xwin/winprefs.c
+++ b/hw/xwin/winprefs.c
@@ -27,7 +27,7 @@
  *
  * Authors:     Earle F. Philhower, III
  */
-/* $XFree86: xc/programs/Xserver/hw/xwin/winprefs.c,v 1.1 2003/10/02 13:30:11 eich Exp $ */
+/* $XFree86: $ */
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/hw/xwin/winprefs.h b/hw/xwin/winprefs.h
index ae1cb07d8..4ae01c081 100644
--- a/hw/xwin/winprefs.h
+++ b/hw/xwin/winprefs.h
@@ -27,7 +27,7 @@
  *
  * Authors:     Earle F. Philhower, III
  */
-/* $XFree86: xc/programs/Xserver/hw/xwin/winprefs.h,v 1.1 2003/10/02 13:30:11 eich Exp $ */
+/* $XFree86: $ */
 
 /* Need to know how long paths can be... */
 #include <limits.h>
diff --git a/hw/xwin/winprefslex.l b/hw/xwin/winprefslex.l
index 8eda8e6c2..960183498 100644
--- a/hw/xwin/winprefslex.l
+++ b/hw/xwin/winprefslex.l
@@ -28,7 +28,7 @@
  *
  * Authors:     Earle F. Philhower, III
  */
-/* $XFree86: xc/programs/Xserver/hw/xwin/winprefslex.l,v 1.1 2003/10/02 13:30:11 eich Exp $ */
+/* $XFree86: $ */
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/hw/xwin/winprefsyacc.y b/hw/xwin/winprefsyacc.y
index a6ffc7207..5ae33b67e 100644
--- a/hw/xwin/winprefsyacc.y
+++ b/hw/xwin/winprefsyacc.y
@@ -28,7 +28,7 @@
  *
  * Authors:     Earle F. Philhower, III
  */
-/* $XFree86: xc/programs/Xserver/hw/xwin/winprefsyacc.y,v 1.1 2003/10/02 13:30:11 eich Exp $ */
+/* $XFree86: $ */
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/hw/xwin/winpushpxl.c b/hw/xwin/winpushpxl.c
index deb9629d7..2ae0e6557 100644
--- a/hw/xwin/winpushpxl.c
+++ b/hw/xwin/winpushpxl.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xwin/winpushpxl.c,v 1.1 2003/08/07 23:47:58 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/mi/mipushpxl.c,v 3.11 2001/01/17 22:37:07 dawes Exp $ */
 /***********************************************************
 
 Copyright 1987, 1998  The Open Group
diff --git a/hw/xwin/winregistry.c b/hw/xwin/winregistry.c
index b31fcf641..7d4a473ab 100644
--- a/hw/xwin/winregistry.c
+++ b/hw/xwin/winregistry.c
@@ -27,7 +27,7 @@
  *
  * Authors:	Harold L Hunt II
  */
-/* $XFree86: xc/programs/Xserver/hw/xwin/winregistry.c,v 1.1 2002/07/05 09:19:26 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xwin/winmisc.c,v 1.5 2001/11/11 22:45:57 alanh Exp $ */
 
 #include "win.h"
 
diff --git a/hw/xwin/winrop.c b/hw/xwin/winrop.c
index c5ec45de5..76a997aaa 100644
--- a/hw/xwin/winrop.c
+++ b/hw/xwin/winrop.c
@@ -27,7 +27,7 @@
  *
  * 	Authors:	Alan Hourihane <alanh@fairlite.demon.co.uk>
  */
-/* $XFree86: xc/programs/Xserver/hw/xwin/winrop.c,v 1.1 2003/08/07 23:47:58 alanh Exp $ */
+/* $XFree86$ */
 
 /*
  * Raster operations used by Windows translated to X's 16 rop codes...
diff --git a/hw/xwin/winscrinit.c b/hw/xwin/winscrinit.c
index 79e985c6b..595f3da7e 100644
--- a/hw/xwin/winscrinit.c
+++ b/hw/xwin/winscrinit.c
@@ -31,7 +31,7 @@
  *		Harold L Hunt II
  *		Kensuke Matsuzaki
  */
-/* $XFree86: xc/programs/Xserver/hw/xwin/winscrinit.c,v 1.28 2003/08/07 23:47:58 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xwin/winscrinit.c,v 1.27 2003/07/29 21:25:18 dawes Exp $ */
 
 #include "win.h"
 
diff --git a/hw/xwin/winsetsp.c b/hw/xwin/winsetsp.c
index c0340e47b..87a16fc31 100644
--- a/hw/xwin/winsetsp.c
+++ b/hw/xwin/winsetsp.c
@@ -28,7 +28,7 @@
  * Authors:	Harold L Hunt II
  * 		Alan Hourihane <alanh@fairlite.demon.co.uk>
  */
-/* $XFree86: xc/programs/Xserver/hw/xwin/winsetsp.c,v 1.8 2003/08/07 23:47:58 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xwin/winsetsp.c,v 1.7 2001/11/01 12:19:42 alanh Exp $ */
 
 #include "win.h"
 
diff --git a/hw/xwin/winshaddd.c b/hw/xwin/winshaddd.c
index a409c27c6..239c0f5ab 100644
--- a/hw/xwin/winshaddd.c
+++ b/hw/xwin/winshaddd.c
@@ -30,7 +30,7 @@
  *		Peter Busch
  *		Harold L Hunt II
  */
-/* $XFree86: xc/programs/Xserver/hw/xwin/winshaddd.c,v 1.24 2003/07/29 21:25:18 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xwin/winshaddd.c,v 1.22 2002/10/17 08:18:24 alanh Exp $ */
 
 #include "win.h"
 
@@ -573,7 +573,7 @@ winShadowUpdateDD (ScreenPtr pScreen,
       ErrorF ("winShadowUpdateProcDD - Memory location of the shadow "
 	      "surface has changed, trying to update the root window "
 	      "pixmap header to point to the new address.  If you get "
-	      "this message and Cygwin/XFree86 freezes or crashes "
+	      "this message and Cygwin/X freezes or crashes "
 	      "after this message then send a problem report and your "
 	      "/tmp/XWin.log file to cygwin-xfree@cygwin.com\n");
 
diff --git a/hw/xwin/winshadddnl.c b/hw/xwin/winshadddnl.c
index e902f31b0..a5e09421e 100644
--- a/hw/xwin/winshadddnl.c
+++ b/hw/xwin/winshadddnl.c
@@ -30,7 +30,7 @@
  *		Peter Busch
  *		Harold L Hunt II
  */
-/* $XFree86: xc/programs/Xserver/hw/xwin/winshadddnl.c,v 1.26 2003/10/02 13:30:11 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xwin/winshadddnl.c,v 1.23 2002/10/17 08:18:25 alanh Exp $ */
 
 #include "win.h"
 
diff --git a/hw/xwin/winshadgdi.c b/hw/xwin/winshadgdi.c
index 16b1969d7..29ce6761b 100644
--- a/hw/xwin/winshadgdi.c
+++ b/hw/xwin/winshadgdi.c
@@ -27,7 +27,7 @@
  *
  * Authors:	Harold L Hunt II
  */
-/* $XFree86: xc/programs/Xserver/hw/xwin/winshadgdi.c,v 1.23 2003/07/29 21:25:18 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xwin/winshadgdi.c,v 1.21 2002/10/17 08:18:25 alanh Exp $ */
 
 #include "win.h"
 
diff --git a/hw/xwin/wintrayicon.c b/hw/xwin/wintrayicon.c
index 90c77b1c8..9ba507ad2 100755
--- a/hw/xwin/wintrayicon.c
+++ b/hw/xwin/wintrayicon.c
@@ -28,7 +28,7 @@
  * Authors:	Early Ehlinger
  *		Harold L Hunt II
  */
-/* $XFree86: xc/programs/Xserver/hw/xwin/wintrayicon.c,v 1.2 2003/10/02 13:30:11 eich Exp $ */
+/* $XFree86: $ */
 
 #include "win.h"
 #include <shellapi.h>
@@ -62,7 +62,7 @@ winInitNotifyIcon (winPrivScreenPtr pScreenPriv)
   /* Set display and screen-specific tooltip text */
   snprintf (nid.szTip,
 	    sizeof (nid.szTip),
-	    "Cygwin/XFree86 Server - %s:%d",
+	    "Cygwin/X Server - %s:%d",
 	    display, 
 	    (int) pScreenInfo->dwScreen);
 
diff --git a/hw/xwin/winvideo.c b/hw/xwin/winvideo.c
index 8bf12cd66..d4a856fcf 100755
--- a/hw/xwin/winvideo.c
+++ b/hw/xwin/winvideo.c
@@ -27,7 +27,7 @@
  *
  * Authors:	Harold L Hunt II
  */
-/* $XFree86: xc/programs/Xserver/hw/xwin/winvideo.c,v 1.2 2003/11/10 18:22:44 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xwin/winvideo.c,v 1.1tsi Exp $ */
 
 #include "win.h"
 #include "Xv.h"
@@ -144,7 +144,7 @@ winSetupImageVideo (ScreenPtr pScreen)
 
     adapt->type = XvWindowMask | XvInputMask | XvImageMask;
     adapt->flags = VIDEO_OVERLAID_IMAGES | VIDEO_CLIP_TO_VIEWPORT;
-    adapt->name = "Cygwin/XFree86 Video Overlay";
+    adapt->name = "Cygwin/X Video Overlay";
     adapt->nEncodings = 1;
     adapt->pEncodings = DummyEncoding;
     adapt->nFormats = NUM_FORMATS;
diff --git a/hw/xwin/winwakeup.c b/hw/xwin/winwakeup.c
index f311d0dc9..55658ecac 100644
--- a/hw/xwin/winwakeup.c
+++ b/hw/xwin/winwakeup.c
@@ -30,7 +30,7 @@
  *		Peter Busch
  *		Harold L Hunt II
  */
-/* $XFree86: xc/programs/Xserver/hw/xwin/winwakeup.c,v 1.7 2003/07/29 21:25:18 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xwin/winwakeup.c,v 1.6 2002/10/17 08:18:25 alanh Exp $ */
 
 #include "win.h"
 
diff --git a/hw/xwin/winwindow.c b/hw/xwin/winwindow.c
index 76dfc5d89..378465bc4 100644
--- a/hw/xwin/winwindow.c
+++ b/hw/xwin/winwindow.c
@@ -28,7 +28,7 @@
  * Authors:	Harold L Hunt II
  *		Kensuke Matsuzaki
  */
-/* $XFree86: xc/programs/Xserver/hw/xwin/winwindow.c,v 1.10 2003/12/22 01:34:20 dickey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xwin/winwindow.c,v 1.9 2003/11/10 18:22:44 tsi Exp $ */
 
 #include "win.h"
 
diff --git a/hw/xwin/winwindow.h b/hw/xwin/winwindow.h
index 8153b5600..b8e164c2b 100644
--- a/hw/xwin/winwindow.h
+++ b/hw/xwin/winwindow.h
@@ -27,7 +27,7 @@
  *
  * Authors:	Kensuke Matsuzaki
  */
-/* $XFree86: xc/programs/Xserver/hw/xwin/winwindow.h,v 1.4 2003/10/08 11:13:03 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xwin/winwindow.h,v 1.3 2003/10/02 13:30:11 eich Exp $ */
 
 
 #ifndef _WINWINDOW_H_
@@ -41,12 +41,12 @@
 #endif
 
 /* Constant strings */
-#define WINDOW_CLASS		"cygwin/xfree86"
-#define WINDOW_TITLE		"Cygwin/XFree86 - %s:%d"
-#define WINDOW_TITLE_XDMCP	"Cygwin/XFree86 - %s"
+#define WINDOW_CLASS		"cygwin/x"
+#define WINDOW_TITLE		"Cygwin/X - %s:%d"
+#define WINDOW_TITLE_XDMCP	"Cygwin/X - %s"
 #define WIN_SCR_PROP		"cyg_screen_prop rl"
-#define WINDOW_CLASS_X		"cygwin/xfree86 X rl"
-#define WINDOW_TITLE_X		"Cygwin/XFree86 X"
+#define WINDOW_CLASS_X		"cygwin/x X rl"
+#define WINDOW_TITLE_X		"Cygwin/X X"
 #define WIN_WINDOW_PROP		"cyg_window_prop_rl"
 #define WIN_MSG_QUEUE_FNAME	"/dev/windows"
 #define WIN_LOG_FNAME		"/tmp/XWin.log"
diff --git a/hw/xwin/winwndproc.c b/hw/xwin/winwndproc.c
index 5b47a212a..535882753 100644
--- a/hw/xwin/winwndproc.c
+++ b/hw/xwin/winwndproc.c
@@ -31,7 +31,7 @@
  *		Harold L Hunt II
  *		MATSUZAKI Kensuke
  */
-/* $XFree86: xc/programs/Xserver/hw/xwin/winwndproc.c,v 1.26 2003/10/02 13:30:11 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xwin/winwndproc.c,v 1.23 2002/10/17 08:18:25 alanh Exp $ */
 
 #include "win.h"
 #include <commctrl.h>
diff --git a/ilbm/ilbm.h b/ilbm/ilbm.h
index cb4ee6be4..7e015ebc4 100644
--- a/ilbm/ilbm.h
+++ b/ilbm/ilbm.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/ilbm/ilbm.h,v 3.3 2003/11/17 22:20:43 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/ilbm/ilbm.h,v 3.2 1998/04/05 16:42:23 robin Exp $ */
 /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
 /***********************************************************
 
diff --git a/ilbm/ilbmbitblt.c b/ilbm/ilbmbitblt.c
index b148bc00c..f861b93e9 100644
--- a/ilbm/ilbmbitblt.c
+++ b/ilbm/ilbmbitblt.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/ilbm/ilbmbitblt.c,v 3.3 2003/11/10 18:22:44 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/ilbm/ilbmbitblt.c,v 3.2tsi Exp $ */
 /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
 /***********************************************************
 
diff --git a/ilbm/ilbmblt.c b/ilbm/ilbmblt.c
index 455c07cb5..286a82474 100644
--- a/ilbm/ilbmblt.c
+++ b/ilbm/ilbmblt.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/ilbm/ilbmblt.c,v 3.0 1996/08/18 01:53:39 dawes Exp $ */
+/* $XFree86$ */
 /*
  * ilbm copy area
  */
diff --git a/ilbm/ilbmbres.c b/ilbm/ilbmbres.c
index 4204c61b5..931da54fd 100644
--- a/ilbm/ilbmbres.c
+++ b/ilbm/ilbmbres.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/ilbm/ilbmbres.c,v 3.0 1996/08/18 01:53:40 dawes Exp $ */
+/* $XFree86$ */
 /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
 /***********************************************************
 
diff --git a/ilbm/ilbmbresd.c b/ilbm/ilbmbresd.c
index 75391e96b..1cd456bb1 100644
--- a/ilbm/ilbmbresd.c
+++ b/ilbm/ilbmbresd.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/ilbm/ilbmbresd.c,v 3.0 1996/08/18 01:53:41 dawes Exp $ */
+/* $XFree86$ */
 /***********************************************************
 
 Copyright (c) 1987  X Consortium
diff --git a/ilbm/ilbmbstore.c b/ilbm/ilbmbstore.c
index 8309e2600..2a12a39bc 100644
--- a/ilbm/ilbmbstore.c
+++ b/ilbm/ilbmbstore.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/ilbm/ilbmbstore.c,v 3.0 1996/08/18 01:53:43 dawes Exp $ */
+/* $XFree86$ */
 /* $XConsortium: ilbmbstore.c,v 5.7 94/04/17 20:28:18 dpw Exp $ */
 /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
 /*
diff --git a/ilbm/ilbmclip.c b/ilbm/ilbmclip.c
index 4628e61d0..72d143e18 100644
--- a/ilbm/ilbmclip.c
+++ b/ilbm/ilbmclip.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/ilbm/ilbmclip.c,v 3.0 1996/08/18 01:53:44 dawes Exp $ */
+/* $XFree86$ */
 /***********************************************************
 
 Copyright (c) 1987  X Consortium
diff --git a/ilbm/ilbmcmap.c b/ilbm/ilbmcmap.c
index 10dadd968..06da361e2 100644
--- a/ilbm/ilbmcmap.c
+++ b/ilbm/ilbmcmap.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/ilbm/ilbmcmap.c,v 3.1 1998/11/22 10:37:40 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/ilbm/ilbmcmap.c,v 3.0 1996/08/18 01:53:46 dawes Exp $ */
 /* $XConsortium: ilbmcmap.c,v 4.19 94/04/17 20:28:46 dpw Exp $ */
 /************************************************************
 Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA.
diff --git a/ilbm/ilbmfillarc.c b/ilbm/ilbmfillarc.c
index f107e4692..28f2df91d 100644
--- a/ilbm/ilbmfillarc.c
+++ b/ilbm/ilbmfillarc.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/ilbm/ilbmfillarc.c,v 3.1 1998/03/20 21:08:01 hohndel Exp $ */
+/* $XFree86: xc/programs/Xserver/ilbm/ilbmfillarc.c,v 3.0 1996/08/18 01:53:48 dawes Exp $ */
 /************************************************************
 
 Copyright (c) 1989  X Consortium
diff --git a/ilbm/ilbmfillrct.c b/ilbm/ilbmfillrct.c
index 642a95f40..4c2507487 100644
--- a/ilbm/ilbmfillrct.c
+++ b/ilbm/ilbmfillrct.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/ilbm/ilbmfillrct.c,v 3.1 1998/03/20 21:08:01 hohndel Exp $ */
+/* $XFree86: xc/programs/Xserver/ilbm/ilbmfillrct.c,v 3.0 1996/08/18 01:53:49 dawes Exp $ */
 /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
 /***********************************************************
 
diff --git a/ilbm/ilbmfillsp.c b/ilbm/ilbmfillsp.c
index 5564e5142..f7fe90743 100644
--- a/ilbm/ilbmfillsp.c
+++ b/ilbm/ilbmfillsp.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/ilbm/ilbmfillsp.c,v 3.1 1998/03/20 21:08:01 hohndel Exp $ */
+/* $XFree86: xc/programs/Xserver/ilbm/ilbmfillsp.c,v 3.0 1996/08/18 01:53:50 dawes Exp $ */
 /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
 /***********************************************************
 
diff --git a/ilbm/ilbmfont.c b/ilbm/ilbmfont.c
index 50cf56773..05e89bd8d 100644
--- a/ilbm/ilbmfont.c
+++ b/ilbm/ilbmfont.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/ilbm/ilbmfont.c,v 3.0 1996/08/18 01:53:51 dawes Exp $ */
+/* $XFree86$ */
 /*
 
 Copyright (c) 1987  X Consortium
diff --git a/ilbm/ilbmgc.c b/ilbm/ilbmgc.c
index 8253d9cd4..259935c46 100644
--- a/ilbm/ilbmgc.c
+++ b/ilbm/ilbmgc.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/ilbm/ilbmgc.c,v 3.1 1998/03/20 21:08:02 hohndel Exp $ */
+/* $XFree86: xc/programs/Xserver/ilbm/ilbmgc.c,v 3.0 1996/08/18 01:53:52 dawes Exp $ */
 /***********************************************************
 
 Copyright (c) 1987  X Consortium
diff --git a/ilbm/ilbmgetsp.c b/ilbm/ilbmgetsp.c
index 727bafd39..e6adbae4a 100644
--- a/ilbm/ilbmgetsp.c
+++ b/ilbm/ilbmgetsp.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/ilbm/ilbmgetsp.c,v 3.0 1996/08/18 01:53:54 dawes Exp $ */
+/* $XFree86$ */
 /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
 /***********************************************************
 
diff --git a/ilbm/ilbmhrzvert.c b/ilbm/ilbmhrzvert.c
index fe2638167..277ac722a 100644
--- a/ilbm/ilbmhrzvert.c
+++ b/ilbm/ilbmhrzvert.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/ilbm/ilbmhrzvert.c,v 3.0 1996/08/18 01:53:55 dawes Exp $ */
+/* $XFree86$ */
 /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
 /***********************************************************
 
diff --git a/ilbm/ilbmimage.c b/ilbm/ilbmimage.c
index d2f7a4df9..348d593a3 100644
--- a/ilbm/ilbmimage.c
+++ b/ilbm/ilbmimage.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/ilbm/ilbmimage.c,v 3.1 1998/03/20 21:08:02 hohndel Exp $ */
+/* $XFree86: xc/programs/Xserver/ilbm/ilbmimage.c,v 3.0 1996/08/18 01:53:56 dawes Exp $ */
 #include <stdio.h>
 
 /* Modified jun 95 by Geert Uytterhoeven (Geert.Uytterhoeven@cs.kuleuven.ac.be)
diff --git a/ilbm/ilbmimggblt.c b/ilbm/ilbmimggblt.c
index 1bd6f02f9..24143fba3 100644
--- a/ilbm/ilbmimggblt.c
+++ b/ilbm/ilbmimggblt.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/ilbm/ilbmimggblt.c,v 3.1 1998/03/20 21:08:02 hohndel Exp $ */
+/* $XFree86: xc/programs/Xserver/ilbm/ilbmimggblt.c,v 3.0 1996/08/18 01:53:57 dawes Exp $ */
 /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
 /***********************************************************
 
diff --git a/ilbm/ilbmline.c b/ilbm/ilbmline.c
index d831489c5..49dd7da46 100644
--- a/ilbm/ilbmline.c
+++ b/ilbm/ilbmline.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/ilbm/ilbmline.c,v 3.1 1998/03/20 21:08:02 hohndel Exp $ */
+/* $XFree86: xc/programs/Xserver/ilbm/ilbmline.c,v 3.0 1996/08/18 01:53:58 dawes Exp $ */
 /***********************************************************
 
 Copyright (c) 1987  X Consortium
diff --git a/ilbm/ilbmmisc.c b/ilbm/ilbmmisc.c
index d85346aca..9717aceca 100644
--- a/ilbm/ilbmmisc.c
+++ b/ilbm/ilbmmisc.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/ilbm/ilbmmisc.c,v 3.0 1996/08/18 01:53:59 dawes Exp $ */
+/* $XFree86$ */
 /***********************************************************
 
 Copyright (c) 1987  X Consortium
diff --git a/ilbm/ilbmpixmap.c b/ilbm/ilbmpixmap.c
index ab5a33f2a..01b991892 100644
--- a/ilbm/ilbmpixmap.c
+++ b/ilbm/ilbmpixmap.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/ilbm/ilbmpixmap.c,v 3.0 1996/08/18 01:54:01 dawes Exp $ */
+/* $XFree86$ */
 /***********************************************************
 
 Copyright (c) 1987  X Consortium
diff --git a/ilbm/ilbmply1rct.c b/ilbm/ilbmply1rct.c
index b76a29892..41d4545e4 100644
--- a/ilbm/ilbmply1rct.c
+++ b/ilbm/ilbmply1rct.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/ilbm/ilbmply1rct.c,v 3.1 1998/03/20 21:08:03 hohndel Exp $ */
+/* $XFree86: xc/programs/Xserver/ilbm/ilbmply1rct.c,v 3.0 1996/08/18 01:54:02 dawes Exp $ */
 /*
  * $XConsortium: ilbmply1rct.c,v 1.9 94/04/17 20:28:28 dpw Exp $
  *
diff --git a/ilbm/ilbmplygblt.c b/ilbm/ilbmplygblt.c
index a7dca5756..fdd0a071f 100644
--- a/ilbm/ilbmplygblt.c
+++ b/ilbm/ilbmplygblt.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/ilbm/ilbmplygblt.c,v 3.1 1998/03/20 21:08:03 hohndel Exp $ */
+/* $XFree86: xc/programs/Xserver/ilbm/ilbmplygblt.c,v 3.0 1996/08/18 01:54:03 dawes Exp $ */
 /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
 /***********************************************************
 
diff --git a/ilbm/ilbmpntarea.c b/ilbm/ilbmpntarea.c
index 0199b0bc6..497eb50ee 100644
--- a/ilbm/ilbmpntarea.c
+++ b/ilbm/ilbmpntarea.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/ilbm/ilbmpntarea.c,v 3.0 1996/08/18 01:54:04 dawes Exp $ */
+/* $XFree86$ */
 /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
 /***********************************************************
 
diff --git a/ilbm/ilbmpntwin.c b/ilbm/ilbmpntwin.c
index 5cc29e331..787955a87 100644
--- a/ilbm/ilbmpntwin.c
+++ b/ilbm/ilbmpntwin.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/ilbm/ilbmpntwin.c,v 3.0 1996/08/18 01:54:05 dawes Exp $ */
+/* $XFree86$ */
 /* $XConsortium: ilbmpntwin.c,v 5.12 94/04/17 20:28:30 dpw Exp $ */
 /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
 /***********************************************************
diff --git a/ilbm/ilbmpolypnt.c b/ilbm/ilbmpolypnt.c
index f313dc8d1..e35b85416 100644
--- a/ilbm/ilbmpolypnt.c
+++ b/ilbm/ilbmpolypnt.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/ilbm/ilbmpolypnt.c,v 3.1 1998/03/20 21:08:03 hohndel Exp $ */
+/* $XFree86: xc/programs/Xserver/ilbm/ilbmpolypnt.c,v 3.0 1996/08/18 01:54:07 dawes Exp $ */
 /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
 /***********************************************************
 
diff --git a/ilbm/ilbmpushpxl.c b/ilbm/ilbmpushpxl.c
index 6a045d242..5bedef851 100644
--- a/ilbm/ilbmpushpxl.c
+++ b/ilbm/ilbmpushpxl.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/ilbm/ilbmpushpxl.c,v 3.1 1998/03/20 21:08:03 hohndel Exp $ */
+/* $XFree86: xc/programs/Xserver/ilbm/ilbmpushpxl.c,v 3.0 1996/08/18 01:54:08 dawes Exp $ */
 /***********************************************************
 
 Copyright (c) 1987  X Consortium
diff --git a/ilbm/ilbmscrinit.c b/ilbm/ilbmscrinit.c
index 5a6fa71a0..f8b4eb52d 100644
--- a/ilbm/ilbmscrinit.c
+++ b/ilbm/ilbmscrinit.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/ilbm/ilbmscrinit.c,v 3.5 1998/11/22 10:37:40 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/ilbm/ilbmscrinit.c,v 3.4 1998/07/26 01:53:45 dawes Exp $ */
 /***********************************************************
 
 Copyright (c) 1987  X Consortium
diff --git a/ilbm/ilbmsetsp.c b/ilbm/ilbmsetsp.c
index a18cf53f8..55073817d 100644
--- a/ilbm/ilbmsetsp.c
+++ b/ilbm/ilbmsetsp.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/ilbm/ilbmsetsp.c,v 3.1 1998/03/20 21:08:04 hohndel Exp $ */
+/* $XFree86: xc/programs/Xserver/ilbm/ilbmsetsp.c,v 3.0 1996/08/18 01:54:10 dawes Exp $ */
 /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
 /***********************************************************
 
diff --git a/ilbm/ilbmtegblt.c b/ilbm/ilbmtegblt.c
index dc42baee9..2c39ef7a9 100644
--- a/ilbm/ilbmtegblt.c
+++ b/ilbm/ilbmtegblt.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/ilbm/ilbmtegblt.c,v 3.1 1998/03/20 21:08:04 hohndel Exp $ */
+/* $XFree86: xc/programs/Xserver/ilbm/ilbmtegblt.c,v 3.0 1996/08/18 01:54:11 dawes Exp $ */
 /* $XConsortium: ilbmtegblt.c,v 5.14 94/04/17 20:28:35 dpw Exp $ */
 /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
 /***********************************************************
diff --git a/ilbm/ilbmtile.c b/ilbm/ilbmtile.c
index e289144ef..d6e815405 100644
--- a/ilbm/ilbmtile.c
+++ b/ilbm/ilbmtile.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/ilbm/ilbmtile.c,v 3.0 1996/08/18 01:54:12 dawes Exp $ */
+/* $XFree86$ */
 /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
 /***********************************************************
 
diff --git a/ilbm/ilbmwindow.c b/ilbm/ilbmwindow.c
index 524972944..fbf543de4 100644
--- a/ilbm/ilbmwindow.c
+++ b/ilbm/ilbmwindow.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/ilbm/ilbmwindow.c,v 3.0 1996/08/18 01:54:14 dawes Exp $ */
+/* $XFree86$ */
 /* $XConsortium: ilbmwindow.c,v 5.14 94/04/17 20:28:36 dpw Exp $ */
 /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
 /***********************************************************
diff --git a/ilbm/ilbmzerarc.c b/ilbm/ilbmzerarc.c
index 9bdf22155..9ac30e267 100644
--- a/ilbm/ilbmzerarc.c
+++ b/ilbm/ilbmzerarc.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/ilbm/ilbmzerarc.c,v 3.1 1998/03/20 21:08:04 hohndel Exp $ */
+/* $XFree86: xc/programs/Xserver/ilbm/ilbmzerarc.c,v 3.0 1996/08/18 01:54:15 dawes Exp $ */
 /************************************************************
 
 Copyright (c) 1989  X Consortium
diff --git a/include/XIstubs.h b/include/XIstubs.h
index ad36bc716..e005493c4 100644
--- a/include/XIstubs.h
+++ b/include/XIstubs.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/include/XIstubs.h,v 3.2 2003/04/27 21:31:04 herrb Exp $ */
+/* $XFree86: xc/programs/Xserver/include/XIstubs.h,v 3.1 1996/04/15 11:34:22 dawes Exp $ */
 /************************************************************
 
 Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
diff --git a/include/bstore.h b/include/bstore.h
index c3a6a9f38..098abcd86 100644
--- a/include/bstore.h
+++ b/include/bstore.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/include/bstore.h,v 1.2 2001/01/06 20:58:12 tsi Exp $*/
+/* $XFree86: xc/programs/Xserver/include/bstore.h,v 1.1 1998/04/05 16:44:25 robin Exp $*/
 /*
  * Copyright (c) 1987 by the Regents of the University of California
  *
diff --git a/include/bstorestr.h b/include/bstorestr.h
index 694841ed0..8f21855c4 100644
--- a/include/bstorestr.h
+++ b/include/bstorestr.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/include/bstorestr.h,v 1.3 2003/04/27 21:31:04 herrb Exp $*/
+/* $XFree86: xc/programs/Xserver/include/bstorestr.h,v 1.2 2001/01/06 20:58:12 tsi Exp $*/
 /*
  * Copyright (c) 1987 by the Regents of the University of California
  *
diff --git a/include/closestr.h b/include/closestr.h
index 34d5931f2..fcd64ed45 100644
--- a/include/closestr.h
+++ b/include/closestr.h
@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/programs/Xserver/include/closestr.h,v 3.5 2003/11/17 22:20:43 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/include/closestr.h,v 3.4 2001/12/14 19:59:53 dawes Exp $ */
 
 
 #ifndef CLOSESTR_H
diff --git a/include/colormap.h b/include/colormap.h
index f249f4f03..e8b235529 100644
--- a/include/colormap.h
+++ b/include/colormap.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/include/colormap.h,v 1.6 2003/04/27 21:31:04 herrb Exp $ */
+/* $XFree86: xc/programs/Xserver/include/colormap.h,v 1.5 2001/12/14 19:59:53 dawes Exp $ */
 /*
 
 Copyright 1987, 1998  The Open Group
diff --git a/include/cursor.h b/include/cursor.h
index 7509a94af..512133eb3 100644
--- a/include/cursor.h
+++ b/include/cursor.h
@@ -1,4 +1,5 @@
-/* $XFree86: xc/programs/Xserver/include/cursor.h,v 1.7 2003/04/27 21:31:04 herrb Exp $ */
+/* $XdotOrg$ */
+/* $XFree86: xc/programs/Xserver/include/cursor.h,v 1.6 2002/09/17 01:15:14 dawes Exp $ */
 /***********************************************************
 
 Copyright 1987, 1998  The Open Group
diff --git a/include/cursorstr.h b/include/cursorstr.h
index 0e2f04a6d..3984245ad 100644
--- a/include/cursorstr.h
+++ b/include/cursorstr.h
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/programs/Xserver/include/cursorstr.h,v 1.9 2003/01/12 02:44:27 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/include/cursorstr.h,v 1.8 2002/11/30 06:21:51 keithp Exp $ */
 
 #ifndef CURSORSTRUCT_H
 #define CURSORSTRUCT_H 
diff --git a/include/dix.h b/include/dix.h
index a47bfd8cc..0ca157ad4 100644
--- a/include/dix.h
+++ b/include/dix.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/include/dix.h,v 3.27 2003/04/27 21:31:04 herrb Exp $ */
+/* $XFree86: xc/programs/Xserver/include/dix.h,v 3.26 2003/01/12 02:44:27 dawes Exp $ */
 /***********************************************************
 
 Copyright 1987, 1998  The Open Group
diff --git a/include/dixevents.h b/include/dixevents.h
index f80f3ab0b..46a5faef0 100644
--- a/include/dixevents.h
+++ b/include/dixevents.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/include/dixevents.h,v 3.5 2003/04/27 21:31:04 herrb Exp $ */
+/* $XFree86: xc/programs/Xserver/include/dixevents.h,v 3.4 2001/09/04 14:03:27 dawes Exp $ */
 /************************************************************
 
 Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
diff --git a/include/dixfont.h b/include/dixfont.h
index 2a6877de2..d3bb69b0a 100644
--- a/include/dixfont.h
+++ b/include/dixfont.h
@@ -21,7 +21,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/programs/Xserver/include/dixfont.h,v 3.8 2001/04/05 17:42:35 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/include/dixfont.h,v 3.7 2001/02/02 21:39:02 herrb Exp $ */
 
 #ifndef DIXFONT_H
 #define DIXFONT_H 1
diff --git a/include/dixgrabs.h b/include/dixgrabs.h
index 21992e786..042e063db 100644
--- a/include/dixgrabs.h
+++ b/include/dixgrabs.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/include/dixgrabs.h,v 3.1 2003/04/27 21:31:04 herrb Exp $ */
+/* $XFree86: xc/programs/Xserver/include/dixgrabs.h,v 3.0 1996/04/15 11:34:27 dawes Exp $ */
 /************************************************************
 
 Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
diff --git a/include/dixstruct.h b/include/dixstruct.h
index 43920540f..9c39a8aec 100644
--- a/include/dixstruct.h
+++ b/include/dixstruct.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/include/dixstruct.h,v 3.20 2003/11/03 05:11:59 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/include/dixstruct.h,v 3.19tsi Exp $ */
 /***********************************************************
 Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
 
diff --git a/include/exevents.h b/include/exevents.h
index ea3804bd3..91c7acb6b 100644
--- a/include/exevents.h
+++ b/include/exevents.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/include/exevents.h,v 3.2 2003/04/27 21:31:04 herrb Exp $ */
+/* $XFree86: xc/programs/Xserver/include/exevents.h,v 3.1 1996/04/15 11:34:29 dawes Exp $ */
 /************************************************************
 
 Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
diff --git a/include/extension.h b/include/extension.h
index 6b674f07f..34750173b 100644
--- a/include/extension.h
+++ b/include/extension.h
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/programs/Xserver/include/extension.h,v 1.6 2003/04/27 21:31:04 herrb Exp $ */
+/* $XFree86: xc/programs/Xserver/include/extension.h,v 1.5 2001/12/14 19:59:54 dawes Exp $ */
 
 #ifndef EXTENSION_H
 #define EXTENSION_H 
diff --git a/include/extinit.h b/include/extinit.h
index 107eee891..37fa9a245 100644
--- a/include/extinit.h
+++ b/include/extinit.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/include/extinit.h,v 3.3 2003/11/17 22:20:43 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/include/extinit.h,v 3.2 2001/08/01 00:44:58 tsi Exp $ */
 /************************************************************
 
 Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
diff --git a/include/extnsionst.h b/include/extnsionst.h
index 0d7debe0b..daf37bf43 100644
--- a/include/extnsionst.h
+++ b/include/extnsionst.h
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/programs/Xserver/include/extnsionst.h,v 3.9 2003/07/16 01:38:52 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/include/extnsionst.h,v 3.8 2003/04/27 21:31:04 herrb Exp $ */
 
 #ifndef EXTENSIONSTRUCT_H
 #define EXTENSIONSTRUCT_H 
diff --git a/include/gc.h b/include/gc.h
index a886d77b8..2288e8491 100644
--- a/include/gc.h
+++ b/include/gc.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/include/gc.h,v 1.6 2003/04/27 21:31:04 herrb Exp $ */
+/* $XFree86: xc/programs/Xserver/include/gc.h,v 1.5 2001/12/14 19:59:54 dawes Exp $ */
 /***********************************************************
 
 Copyright 1987, 1998  The Open Group
diff --git a/include/gcstruct.h b/include/gcstruct.h
index 43cc679b4..6feff51f5 100644
--- a/include/gcstruct.h
+++ b/include/gcstruct.h
@@ -47,7 +47,7 @@ SOFTWARE.
 ******************************************************************/
 
 
-/* $XFree86: xc/programs/Xserver/include/gcstruct.h,v 1.8 2003/07/16 01:38:52 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/include/gcstruct.h,v 1.7 2003/04/27 21:31:04 herrb Exp $ */
 
 #ifndef GCSTRUCT_H
 #define GCSTRUCT_H
diff --git a/include/globals.h b/include/globals.h
index 3b1b6ba0b..359f2eee2 100644
--- a/include/globals.h
+++ b/include/globals.h
@@ -1,4 +1,5 @@
-/* $XFree86: xc/programs/Xserver/include/globals.h,v 1.4 2000/06/28 18:21:22 tsi Exp $ */
+/* $XdotOrg$ */
+/* $XFree86: xc/programs/Xserver/include/globals.h,v 1.3 1999/09/25 14:38:21 dawes Exp $ */
 
 #ifndef _XSERV_GLOBAL_H_
 #define _XSERV_GLOBAL_H_
diff --git a/include/input.h b/include/input.h
index acf3bca1a..fa88febda 100644
--- a/include/input.h
+++ b/include/input.h
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/programs/Xserver/include/input.h,v 3.8 2003/04/27 21:31:04 herrb Exp $ */
+/* $XFree86: xc/programs/Xserver/include/input.h,v 3.7 2001/12/14 19:59:54 dawes Exp $ */
 
 #ifndef INPUT_H
 #define INPUT_H
diff --git a/include/inputstr.h b/include/inputstr.h
index a8a834807..70627629b 100644
--- a/include/inputstr.h
+++ b/include/inputstr.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/include/inputstr.h,v 1.6 2003/04/27 21:31:04 herrb Exp $ */
+/* $XFree86: xc/programs/Xserver/include/inputstr.h,v 1.5 2001/12/14 19:59:54 dawes Exp $ */
 /************************************************************
 
 Copyright 1987, 1998  The Open Group
diff --git a/include/misc.h b/include/misc.h
index ffa65b31e..5944a427f 100644
--- a/include/misc.h
+++ b/include/misc.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/include/misc.h,v 3.29 2003/04/27 21:31:04 herrb Exp $ */
+/* $XFree86: xc/programs/Xserver/include/misc.h,v 3.28 2001/12/14 19:59:55 dawes Exp $ */
 /***********************************************************
 
 Copyright 1987, 1998  The Open Group
diff --git a/include/miscstruct.h b/include/miscstruct.h
index 86f114792..f0ff25b28 100644
--- a/include/miscstruct.h
+++ b/include/miscstruct.h
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/programs/Xserver/include/miscstruct.h,v 3.5 2003/07/16 01:38:52 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/include/miscstruct.h,v 3.4 2003/04/27 21:31:04 herrb Exp $ */
 
 #ifndef MISCSTRUCT_H
 #define MISCSTRUCT_H 1
diff --git a/include/opaque.h b/include/opaque.h
index b5a55a60b..09a3570f9 100644
--- a/include/opaque.h
+++ b/include/opaque.h
@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/programs/Xserver/include/opaque.h,v 1.14 2003/09/09 03:20:41 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/include/opaque.h,v 1.13 2003/07/24 13:50:25 eich Exp $ */
 
 #ifndef OPAQUE_H
 #define OPAQUE_H
diff --git a/include/os.h b/include/os.h
index e9328c8fa..b553e06e1 100644
--- a/include/os.h
+++ b/include/os.h
@@ -231,6 +231,8 @@ extern SIGVAL GiveUp(int /*sig*/);
 
 extern void UseMsg(void);
 
+extern void InitGlobals(void);
+
 extern void ProcessCommandLine(int /*argc*/, char* /*argv*/[]);
 
 extern int set_font_authorizations(
@@ -333,7 +335,7 @@ extern int GetHosts(
 
 typedef struct sockaddr * sockaddrPtr;
 
-extern int InvalidHost(sockaddrPtr /*saddr*/, int /*len*/);
+extern int InvalidHost(sockaddrPtr /*saddr*/, int /*len*/, ClientPtr client);
 
 extern int LocalClient(ClientPtr /* client */);
 
@@ -412,6 +414,8 @@ extern XID GenerateAuthorization(
 extern void ExpandCommandLine(int * /*pargc*/, char *** /*pargv*/);
 #endif
 
+extern void ddxInitGlobals(void);
+
 extern int ddxProcessArgument(int /*argc*/, char * /*argv*/ [], int /*i*/);
 
 extern void ddxUseMsg(void);
diff --git a/include/pixmap.h b/include/pixmap.h
index 56bb675ae..6cea329ec 100644
--- a/include/pixmap.h
+++ b/include/pixmap.h
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/programs/Xserver/include/pixmap.h,v 1.4 2003/11/03 05:36:35 tsi Exp $ */
+/* $XFree86$ */
 
 #ifndef PIXMAP_H
 #define PIXMAP_H
diff --git a/include/pixmapstr.h b/include/pixmapstr.h
index d5bc21273..1b0df9fd3 100644
--- a/include/pixmapstr.h
+++ b/include/pixmapstr.h
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/programs/Xserver/include/pixmapstr.h,v 1.3 2003/07/16 01:38:52 dawes Exp $ */
+/* $XFree86$ */
 
 #ifndef PIXMAPSTRUCT_H
 #define PIXMAPSTRUCT_H
diff --git a/include/property.h b/include/property.h
index 66103bc8e..21a38d51c 100644
--- a/include/property.h
+++ b/include/property.h
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/programs/Xserver/include/property.h,v 1.4 2003/04/27 21:31:04 herrb Exp $ */
+/* $XFree86: xc/programs/Xserver/include/property.h,v 1.3 2001/12/14 19:59:55 dawes Exp $ */
 
 #ifndef PROPERTY_H
 #define PROPERTY_H 
diff --git a/include/propertyst.h b/include/propertyst.h
index 5c335d038..177fca171 100644
--- a/include/propertyst.h
+++ b/include/propertyst.h
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/programs/Xserver/include/propertyst.h,v 3.3 2001/12/14 19:59:55 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/include/propertyst.h,v 3.2 2001/01/17 22:36:57 dawes Exp $ */
 
 #ifndef PROPERTYSTRUCT_H
 #define PROPERTYSTRUCT_H 
diff --git a/include/regionstr.h b/include/regionstr.h
index 29fcfbac4..192983dab 100644
--- a/include/regionstr.h
+++ b/include/regionstr.h
@@ -1,3 +1,4 @@
+/* $XdotOrg: xc/programs/Xserver/include/regionstr.h,v 1.1.4.6 2003/12/06 13:24:29 kaleb Exp $ */
 /* $Xorg: regionstr.h,v 1.4 2001/02/09 02:05:15 xorgcvs Exp $ */
 /***********************************************************
 
@@ -45,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/programs/Xserver/include/regionstr.h,v 1.13 2003/12/03 17:11:29 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/include/regionstr.h,v 1.12tsi Exp $ */
 
 #ifndef REGIONSTRUCT_H
 #define REGIONSTRUCT_H
diff --git a/include/resource.h b/include/resource.h
index 6517ab212..49c189869 100644
--- a/include/resource.h
+++ b/include/resource.h
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/programs/Xserver/include/resource.h,v 1.12 2003/04/27 21:31:05 herrb Exp $ */
+/* $XFree86: xc/programs/Xserver/include/resource.h,v 1.11 2002/03/06 21:14:04 mvojkovi Exp $ */
 
 #ifndef RESOURCE_H
 #define RESOURCE_H 1
diff --git a/include/screenint.h b/include/screenint.h
index 988a7416c..b3e76c4c2 100644
--- a/include/screenint.h
+++ b/include/screenint.h
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/programs/Xserver/include/screenint.h,v 1.6 2003/04/27 21:31:05 herrb Exp $ */
+/* $XFree86: xc/programs/Xserver/include/screenint.h,v 1.5 2001/12/14 19:59:56 dawes Exp $ */
 #ifndef SCREENINT_H
 #define SCREENINT_H
 
diff --git a/include/scrnintstr.h b/include/scrnintstr.h
index 0f1813c00..edd14c12f 100644
--- a/include/scrnintstr.h
+++ b/include/scrnintstr.h
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/programs/Xserver/include/scrnintstr.h,v 1.13 2003/07/16 01:38:53 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/include/scrnintstr.h,v 1.12 2003/04/27 21:31:05 herrb Exp $ */
 
 #ifndef SCREENINTSTRUCT_H
 #define SCREENINTSTRUCT_H
diff --git a/include/servermd.h b/include/servermd.h
index 654e1411b..994f5c087 100644
--- a/include/servermd.h
+++ b/include/servermd.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/include/servermd.h,v 3.57 2003/11/03 05:11:59 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/include/servermd.h,v 3.56tsi Exp $ */
 /***********************************************************
 
 Copyright 1987, 1998  The Open Group
@@ -389,7 +389,7 @@ SOFTWARE.
 
 #endif /* ia64 */
 
-#if defined(__AMD64__) || defined(AMD64)
+#if defined(__amd64__) || defined(amd64)
 # define IMAGE_BYTE_ORDER	LSBFirst
 
 # if defined(XF86MONOVGA) || defined(XF86VGA16) || defined(XF86MONO)
diff --git a/include/site.h b/include/site.h
index 1c272fc3f..be8c003da 100644
--- a/include/site.h
+++ b/include/site.h
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/programs/Xserver/include/site.h,v 1.9 2003/09/09 03:20:41 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/include/site.h,v 1.8 2001/12/19 21:37:35 dawes Exp $ */
 
 #ifndef SITE_H
 #define SITE_H
diff --git a/include/swaprep.h b/include/swaprep.h
index b6671e7d9..2c026c659 100644
--- a/include/swaprep.h
+++ b/include/swaprep.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/include/swaprep.h,v 3.1 2003/04/27 21:31:05 herrb Exp $ */
+/* $XFree86: xc/programs/Xserver/include/swaprep.h,v 3.0 1996/04/15 11:34:34 dawes Exp $ */
 /************************************************************
 
 Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
diff --git a/include/swapreq.h b/include/swapreq.h
index 59ba8c5be..9c59bbf84 100644
--- a/include/swapreq.h
+++ b/include/swapreq.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/include/swapreq.h,v 1.4 2003/11/17 22:20:43 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/include/swapreq.h,v 1.3 2003/04/27 21:31:05 herrb Exp $ */
 /************************************************************
 
 Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
diff --git a/include/validate.h b/include/validate.h
index 2a13962a7..467533d22 100644
--- a/include/validate.h
+++ b/include/validate.h
@@ -24,7 +24,7 @@ Except as contained in this notice, the name of The Open Group 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 Open Group.
 */
-/* $XFree86: xc/programs/Xserver/include/validate.h,v 1.5 2001/12/14 19:59:56 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/include/validate.h,v 1.4 2001/01/17 22:36:58 dawes Exp $ */
 
 #ifndef VALIDATE_H
 #define VALIDATE_H
diff --git a/include/window.h b/include/window.h
index 0c886559e..5056512b8 100644
--- a/include/window.h
+++ b/include/window.h
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/programs/Xserver/include/window.h,v 1.6 2003/11/03 05:36:35 tsi Exp $ */
+/* $XFree86$ */
 
 #ifndef WINDOW_H
 #define WINDOW_H
diff --git a/include/windowstr.h b/include/windowstr.h
index 2dce443d3..8e8d2542a 100644
--- a/include/windowstr.h
+++ b/include/windowstr.h
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/programs/Xserver/include/windowstr.h,v 1.7 2003/04/27 21:31:05 herrb Exp $ */
+/* $XFree86: xc/programs/Xserver/include/windowstr.h,v 1.6 2001/12/14 19:59:57 dawes Exp $ */
 
 #ifndef WINDOWSTRUCT_H
 #define WINDOWSTRUCT_H
diff --git a/iplan2p4/ipl.h b/iplan2p4/ipl.h
index bdc1682f5..cc4e519ce 100644
--- a/iplan2p4/ipl.h
+++ b/iplan2p4/ipl.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/iplan2p4/ipl.h,v 3.6 2003/11/17 22:20:43 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/iplan2p4/ipl.h,v 3.5 2001/01/30 22:06:21 tsi Exp $ */
 /* $XConsortium: ipl.h,v 5.37 94/04/17 20:28:38 dpw Exp $ */
 /************************************************************
 Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA.
diff --git a/iplan2p4/iplallpriv.c b/iplan2p4/iplallpriv.c
index 57b8fce57..11e358944 100644
--- a/iplan2p4/iplallpriv.c
+++ b/iplan2p4/iplallpriv.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/iplan2p4/iplallpriv.c,v 3.0 1996/08/18 01:54:33 dawes Exp $ */
+/* $XFree86$ */
 /*
  * $XConsortium: iplallpriv.c,v 1.5 94/04/17 20:28:42 dpw Exp $
  *
diff --git a/iplan2p4/iplbitblt.c b/iplan2p4/iplbitblt.c
index 27470382b..9105faa48 100644
--- a/iplan2p4/iplbitblt.c
+++ b/iplan2p4/iplbitblt.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/iplan2p4/iplbitblt.c,v 3.2 2003/11/10 18:22:45 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/iplan2p4/iplbitblt.c,v 3.1tsi Exp $ */
 /*
  * ipl copy area
  */
diff --git a/iplan2p4/iplblt.c b/iplan2p4/iplblt.c
index 8a48bd9da..f303859cd 100644
--- a/iplan2p4/iplblt.c
+++ b/iplan2p4/iplblt.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/iplan2p4/iplblt.c,v 3.0 1996/08/18 01:54:35 dawes Exp $ */
+/* $XFree86$ */
 /*
  * ipl copy area
  */
diff --git a/iplan2p4/iplbres.c b/iplan2p4/iplbres.c
index 9d2b571db..47b895ea4 100644
--- a/iplan2p4/iplbres.c
+++ b/iplan2p4/iplbres.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/iplan2p4/iplbres.c,v 3.0 1996/08/18 01:54:36 dawes Exp $ */
+/* $XFree86$ */
 /***********************************************************
 
 Copyright (c) 1987  X Consortium
diff --git a/iplan2p4/iplbresd.c b/iplan2p4/iplbresd.c
index 7cc93e90c..dd096dfbd 100644
--- a/iplan2p4/iplbresd.c
+++ b/iplan2p4/iplbresd.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/iplan2p4/iplbresd.c,v 3.0 1996/08/18 01:54:38 dawes Exp $ */
+/* $XFree86$ */
 /***********************************************************
 
 Copyright (c) 1987  X Consortium
diff --git a/iplan2p4/iplbstore.c b/iplan2p4/iplbstore.c
index 5719ca308..422d10291 100644
--- a/iplan2p4/iplbstore.c
+++ b/iplan2p4/iplbstore.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/iplan2p4/iplbstore.c,v 3.0 1996/08/18 01:54:39 dawes Exp $ */
+/* $XFree86$ */
 
 /*-
  * iplbstore.c --
diff --git a/iplan2p4/iplcmap.c b/iplan2p4/iplcmap.c
index 21abfdbb3..3b73b1481 100644
--- a/iplan2p4/iplcmap.c
+++ b/iplan2p4/iplcmap.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/iplan2p4/iplcmap.c,v 3.1 1998/11/22 10:37:41 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/iplan2p4/iplcmap.c,v 3.0 1996/08/18 01:54:40 dawes Exp $ */
 /* $XConsortium: iplcmap.c,v 4.19 94/04/17 20:28:46 dpw Exp $ */
 /************************************************************
 Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA.
diff --git a/iplan2p4/iplfillarc.c b/iplan2p4/iplfillarc.c
index c77db6b63..50e4a81ab 100644
--- a/iplan2p4/iplfillarc.c
+++ b/iplan2p4/iplfillarc.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/iplan2p4/iplfillarc.c,v 3.0 1996/08/18 01:54:41 dawes Exp $ */
+/* $XFree86$ */
 /************************************************************
 
 Copyright (c) 1989  X Consortium
diff --git a/iplan2p4/iplfillrct.c b/iplan2p4/iplfillrct.c
index 512c48048..7af2fa4fa 100644
--- a/iplan2p4/iplfillrct.c
+++ b/iplan2p4/iplfillrct.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/iplan2p4/iplfillrct.c,v 3.1 1998/03/20 21:08:08 hohndel Exp $ */
+/* $XFree86: xc/programs/Xserver/iplan2p4/iplfillrct.c,v 3.0 1996/08/18 01:54:42 dawes Exp $ */
 /*
  * Fill rectangles.
  */
diff --git a/iplan2p4/iplfillsp.c b/iplan2p4/iplfillsp.c
index 010f911f6..767db30cb 100644
--- a/iplan2p4/iplfillsp.c
+++ b/iplan2p4/iplfillsp.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/iplan2p4/iplfillsp.c,v 3.0 1996/08/18 01:54:43 dawes Exp $ */
+/* $XFree86$ */
 /************************************************************
 Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA.
 
diff --git a/iplan2p4/iplgc.c b/iplan2p4/iplgc.c
index 794a62609..8a69cb7c8 100644
--- a/iplan2p4/iplgc.c
+++ b/iplan2p4/iplgc.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/iplan2p4/iplgc.c,v 3.1 1998/03/20 21:08:08 hohndel Exp $ */
+/* $XFree86: xc/programs/Xserver/iplan2p4/iplgc.c,v 3.0 1996/08/18 01:54:45 dawes Exp $ */
 /***********************************************************
 
 Copyright (c) 1987  X Consortium
diff --git a/iplan2p4/iplgetsp.c b/iplan2p4/iplgetsp.c
index 271656bda..8ae61b6cc 100644
--- a/iplan2p4/iplgetsp.c
+++ b/iplan2p4/iplgetsp.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/iplan2p4/iplgetsp.c,v 3.0 1996/08/18 01:54:47 dawes Exp $ */
+/* $XFree86$ */
 /* $XConsortium: iplgetsp.c,v 5.14 94/04/17 20:28:50 dpw Exp $ */
 /***********************************************************
 
diff --git a/iplan2p4/iplhrzvert.c b/iplan2p4/iplhrzvert.c
index 6374e4d19..1bcb57d57 100644
--- a/iplan2p4/iplhrzvert.c
+++ b/iplan2p4/iplhrzvert.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/iplan2p4/iplhrzvert.c,v 3.0 1996/08/18 01:54:48 dawes Exp $ */
+/* $XFree86$ */
 /***********************************************************
 
 Copyright (c) 1987  X Consortium
diff --git a/iplan2p4/iplimage.c b/iplan2p4/iplimage.c
index 0522309b4..6c8e9ab73 100644
--- a/iplan2p4/iplimage.c
+++ b/iplan2p4/iplimage.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/iplan2p4/iplimage.c,v 3.0 1996/08/18 01:54:49 dawes Exp $ */
+/* $XFree86$ */
 /***********************************************************
 
 Copyright (c) 1987  X Consortium
diff --git a/iplan2p4/iplline.c b/iplan2p4/iplline.c
index 479bfb00a..f59638693 100644
--- a/iplan2p4/iplline.c
+++ b/iplan2p4/iplline.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/iplan2p4/iplline.c,v 3.1 1998/03/20 21:08:08 hohndel Exp $ */
+/* $XFree86: xc/programs/Xserver/iplan2p4/iplline.c,v 3.0 1996/08/18 01:54:50 dawes Exp $ */
 /***********************************************************
 
 Copyright (c) 1987  X Consortium
diff --git a/iplan2p4/iplmap.h b/iplan2p4/iplmap.h
index 2e0a2b3cc..b188ec3ec 100644
--- a/iplan2p4/iplmap.h
+++ b/iplan2p4/iplmap.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/iplan2p4/iplmap.h,v 3.2 2001/07/25 15:05:09 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/iplan2p4/iplmap.h,v 3.1 1998/04/05 16:42:26 robin Exp $ */
 /*
  * $XConsortium: iplmap.h,v 1.9 94/04/17 20:28:54 dpw Exp $
  *
diff --git a/iplan2p4/iplmergerop.h b/iplan2p4/iplmergerop.h
index fa537d3a7..22f3b4d5f 100644
--- a/iplan2p4/iplmergerop.h
+++ b/iplan2p4/iplmergerop.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/iplan2p4/iplmergerop.h,v 3.1 2001/07/25 15:05:09 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/iplan2p4/iplmergerop.h,v 3.0 1996/08/18 01:54:53 dawes Exp $ */
 #ifndef _IPLANMERGEROP_H_
 #define _IPLANMERGEROP_H_
 
diff --git a/iplan2p4/iplmskbits.c b/iplan2p4/iplmskbits.c
index 9f1d37dfb..d408b804e 100644
--- a/iplan2p4/iplmskbits.c
+++ b/iplan2p4/iplmskbits.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/iplan2p4/iplmskbits.c,v 3.0 1996/08/18 01:54:54 dawes Exp $ */
+/* $XFree86$ */
 /* Modified nov 94 by Martin Schaller (Martin_Schaller@maus.r.de) for use with
 interleaved planes */
 #include "iplmap.h"
diff --git a/iplan2p4/iplmskbits.h b/iplan2p4/iplmskbits.h
index 4fb3fe066..51bb26393 100644
--- a/iplan2p4/iplmskbits.h
+++ b/iplan2p4/iplmskbits.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/iplan2p4/iplmskbits.h,v 3.0 1996/08/18 01:54:55 dawes Exp $ */
+/* $XFree86$ */
 /* Modified nov 94 by Martin Schaller (Martin_Schaller@maus.r.de) for use with
 interleaved planes */
 
diff --git a/iplan2p4/iplpack.c b/iplan2p4/iplpack.c
index 96072895c..a6ca6f12b 100644
--- a/iplan2p4/iplpack.c
+++ b/iplan2p4/iplpack.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/iplan2p4/iplpack.c,v 3.0 1996/08/18 01:54:56 dawes Exp $ */
+/* $XFree86$ */
 /* Modified nov 94 by Martin Schaller (Martin_Schaller@maus.r.de) for use with
 interleaved planes */
 
diff --git a/iplan2p4/iplpack.h b/iplan2p4/iplpack.h
index 9545c75ec..53c2c988f 100644
--- a/iplan2p4/iplpack.h
+++ b/iplan2p4/iplpack.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/iplan2p4/iplpack.h,v 3.0 1996/08/18 01:54:57 dawes Exp $ */
+/* $XFree86$ */
 /* Modified nov 94 by Martin Schaller (Martin_Schaller@maus.r.de) for use with
 interleaved planes */
 
diff --git a/iplan2p4/iplpixmap.c b/iplan2p4/iplpixmap.c
index 212f94979..7800e8d96 100644
--- a/iplan2p4/iplpixmap.c
+++ b/iplan2p4/iplpixmap.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/iplan2p4/iplpixmap.c,v 3.1 2001/12/17 20:00:46 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/iplan2p4/iplpixmap.c,v 3.0 1996/08/18 01:54:59 dawes Exp $ */
 /* $XConsortium: iplpixmap.c,v 5.14 94/04/17 20:28:56 dpw Exp $ */
 /***********************************************************
 
diff --git a/iplan2p4/iplply1rct.c b/iplan2p4/iplply1rct.c
index f73bc8864..fc73f2065 100644
--- a/iplan2p4/iplply1rct.c
+++ b/iplan2p4/iplply1rct.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/iplan2p4/iplply1rct.c,v 3.1 1998/03/20 21:08:09 hohndel Exp $ */
+/* $XFree86: xc/programs/Xserver/iplan2p4/iplply1rct.c,v 3.0 1996/08/18 01:55:00 dawes Exp $ */
 /*
  * $XConsortium: iplply1rct.c,v 1.14 94/04/17 20:28:56 dpw Exp $
  *
diff --git a/iplan2p4/iplpntwin.c b/iplan2p4/iplpntwin.c
index a5a61194a..88dbad6bf 100644
--- a/iplan2p4/iplpntwin.c
+++ b/iplan2p4/iplpntwin.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/iplan2p4/iplpntwin.c,v 3.0 1996/08/18 01:55:01 dawes Exp $ */
+/* $XFree86$ */
 /* $XConsortium: iplpntwin.c,v 5.18 94/04/17 20:28:57 dpw Exp $ */
 /***********************************************************
 
diff --git a/iplan2p4/iplpolypnt.c b/iplan2p4/iplpolypnt.c
index 3d90edea4..763733a04 100644
--- a/iplan2p4/iplpolypnt.c
+++ b/iplan2p4/iplpolypnt.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/iplan2p4/iplpolypnt.c,v 3.1 1998/03/20 21:08:09 hohndel Exp $ */
+/* $XFree86: xc/programs/Xserver/iplan2p4/iplpolypnt.c,v 3.0 1996/08/18 01:55:02 dawes Exp $ */
 /************************************************************
 
 Copyright (c) 1989  X Consortium
diff --git a/iplan2p4/iplrrop.c b/iplan2p4/iplrrop.c
index cfc43c130..75ec557ee 100644
--- a/iplan2p4/iplrrop.c
+++ b/iplan2p4/iplrrop.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/iplan2p4/iplrrop.c,v 3.0 1996/08/18 01:55:03 dawes Exp $ */
+/* $XFree86$ */
 /*
  * $XConsortium: iplrrop.c,v 1.8 94/04/17 20:28:59 dpw Exp $
  *
diff --git a/iplan2p4/iplrrop.h b/iplan2p4/iplrrop.h
index d14d1a54b..31e7b79b1 100644
--- a/iplan2p4/iplrrop.h
+++ b/iplan2p4/iplrrop.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/iplan2p4/iplrrop.h,v 3.1 2001/07/25 15:05:09 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/iplan2p4/iplrrop.h,v 3.0 1996/08/18 01:55:04 dawes Exp $ */
 /* Modified nov 94 by Martin Schaller (Martin_Schaller@maus.r.de) for use with
 interleaved planes */
 
diff --git a/iplan2p4/iplscrinit.c b/iplan2p4/iplscrinit.c
index 1d7915776..00dbef074 100644
--- a/iplan2p4/iplscrinit.c
+++ b/iplan2p4/iplscrinit.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/iplan2p4/iplscrinit.c,v 3.3 1998/11/22 10:37:41 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/iplan2p4/iplscrinit.c,v 3.2 1998/06/27 12:55:03 hohndel Exp $ */
 /************************************************************
 Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA.
 
diff --git a/iplan2p4/iplsetsp.c b/iplan2p4/iplsetsp.c
index 0533eed71..52eefc31d 100644
--- a/iplan2p4/iplsetsp.c
+++ b/iplan2p4/iplsetsp.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/iplan2p4/iplsetsp.c,v 3.0 1996/08/18 01:55:07 dawes Exp $ */
+/* $XFree86$ */
 /* $XConsortium: iplsetsp.c,v 5.10 94/04/17 20:29:01 dpw Exp $ */
 /***********************************************************
 
diff --git a/iplan2p4/iplsolid.c b/iplan2p4/iplsolid.c
index 2f741ed7f..447193b27 100644
--- a/iplan2p4/iplsolid.c
+++ b/iplan2p4/iplsolid.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/iplan2p4/iplsolid.c,v 3.1 1998/03/20 21:08:09 hohndel Exp $ */
+/* $XFree86: xc/programs/Xserver/iplan2p4/iplsolid.c,v 3.0 1996/08/18 01:55:08 dawes Exp $ */
 /*
  * $XConsortium: iplsolid.c,v 1.9 94/04/17 20:29:02 dpw Exp $
  *
diff --git a/iplan2p4/ipltegblt.c b/iplan2p4/ipltegblt.c
index 4d82a655a..8414bc7b2 100644
--- a/iplan2p4/ipltegblt.c
+++ b/iplan2p4/ipltegblt.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/iplan2p4/ipltegblt.c,v 3.0 1996/08/18 01:55:09 dawes Exp $ */
+/* $XFree86$ */
 /* $XConsortium: ipltegblt.c,v 5.9 94/04/17 20:29:03 dpw Exp $ */
 /***********************************************************
 
diff --git a/iplan2p4/ipltile32.c b/iplan2p4/ipltile32.c
index ea608effb..6774de834 100644
--- a/iplan2p4/ipltile32.c
+++ b/iplan2p4/ipltile32.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/iplan2p4/ipltile32.c,v 3.1 1998/03/20 21:08:09 hohndel Exp $ */
+/* $XFree86: xc/programs/Xserver/iplan2p4/ipltile32.c,v 3.0 1996/08/18 01:55:10 dawes Exp $ */
 /*
  * Fill 32 bit tiled rectangles.  Used by both PolyFillRect and PaintWindow.
  * no depth dependencies.
diff --git a/iplan2p4/ipltileodd.c b/iplan2p4/ipltileodd.c
index a63ce5da6..abd4a3021 100644
--- a/iplan2p4/ipltileodd.c
+++ b/iplan2p4/ipltileodd.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/iplan2p4/ipltileodd.c,v 3.0 1996/08/18 01:55:11 dawes Exp $ */
+/* $XFree86$ */
 /*
  * Fill odd tiled rectangles and spans.
  * no depth dependencies.
diff --git a/iplan2p4/iplwindow.c b/iplan2p4/iplwindow.c
index 39d1eff9b..8d95e284b 100644
--- a/iplan2p4/iplwindow.c
+++ b/iplan2p4/iplwindow.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/iplan2p4/iplwindow.c,v 3.1 2003/11/10 18:22:45 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/iplan2p4/iplwindow.c,v 3.0tsi Exp $ */
 /* $XConsortium: iplwindow.c,v 5.22 94/04/17 20:29:07 dpw Exp $ */
 /***********************************************************
 
diff --git a/lbx/lbxcmap.c b/lbx/lbxcmap.c
index 25ef34426..b1366aa3f 100644
--- a/lbx/lbxcmap.c
+++ b/lbx/lbxcmap.c
@@ -25,7 +25,7 @@ not be used in advertising or otherwise to promote the sale, use or
 other dealings in this Software without prior written authorization
 from The Open Group.
 */
-/* $XFree86: xc/programs/Xserver/lbx/lbxcmap.c,v 1.10 2001/12/14 19:59:59 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/lbx/lbxcmap.c,v 1.9 2001/08/23 14:46:57 alanh Exp $ */
 
 #include <sys/types.h>
 #define NEED_REPLIES
diff --git a/lbx/lbxdix.c b/lbx/lbxdix.c
index 5a40614f6..c392e6415 100644
--- a/lbx/lbxdix.c
+++ b/lbx/lbxdix.c
@@ -46,7 +46,7 @@ in this Software without prior written authorization from The Open Group.
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
  */
-/* $XFree86: xc/programs/Xserver/lbx/lbxdix.c,v 1.8 2001/12/14 19:59:59 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/lbx/lbxdix.c,v 1.7 2001/08/23 14:46:57 alanh Exp $ */
 
 /* various bits of DIX-level mangling */
 
diff --git a/lbx/lbxexts.c b/lbx/lbxexts.c
index d611a7f2c..7ae70ebde 100644
--- a/lbx/lbxexts.c
+++ b/lbx/lbxexts.c
@@ -21,7 +21,7 @@
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
  */
-/* $XFree86: xc/programs/Xserver/lbx/lbxexts.c,v 1.4 2001/02/16 13:24:10 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/lbx/lbxexts.c,v 1.2 2000/05/18 23:46:24 dawes Exp $ */
 
 #include "X.h"
 #include "Xproto.h"
diff --git a/lbx/lbxgfx.c b/lbx/lbxgfx.c
index 6eb7af197..5a468ecbf 100644
--- a/lbx/lbxgfx.c
+++ b/lbx/lbxgfx.c
@@ -21,7 +21,7 @@
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
  */
-/* $XFree86: xc/programs/Xserver/lbx/lbxgfx.c,v 1.4 2001/08/23 14:46:57 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/lbx/lbxgfx.c,v 1.3 2001/01/17 22:36:59 dawes Exp $ */
 
 /* various bits of DIX-level mangling */
 
diff --git a/lbx/lbxmain.c b/lbx/lbxmain.c
index 1a82ce3b3..443bb0414 100644
--- a/lbx/lbxmain.c
+++ b/lbx/lbxmain.c
@@ -45,7 +45,7 @@ in this Software without prior written authorization from The Open Group.
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
  */
-/* $XFree86: xc/programs/Xserver/lbx/lbxmain.c,v 1.13 2001/12/14 20:00:00 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/lbx/lbxmain.c,v 1.12 2001/10/28 03:34:12 tsi Exp $ */
  
 #include <sys/types.h>
 #define NEED_REPLIES
diff --git a/lbx/lbxopts.c b/lbx/lbxopts.c
index 461f0d778..fdef2db7c 100644
--- a/lbx/lbxopts.c
+++ b/lbx/lbxopts.c
@@ -21,7 +21,7 @@
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
  */
-/* $XFree86: xc/programs/Xserver/lbx/lbxopts.c,v 1.6 2001/10/28 03:34:12 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/lbx/lbxopts.c,v 1.5 2001/01/17 22:37:00 dawes Exp $ */
 
 #ifdef OPTDEBUG
 #include <stdio.h>
diff --git a/lbx/lbxprop.c b/lbx/lbxprop.c
index e9a6d8a8e..9082250d6 100644
--- a/lbx/lbxprop.c
+++ b/lbx/lbxprop.c
@@ -46,7 +46,7 @@ in this Software without prior written authorization from The Open Group.
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
  */
-/* $XFree86: xc/programs/Xserver/lbx/lbxprop.c,v 1.5 2001/12/14 20:00:00 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/lbx/lbxprop.c,v 1.4 2001/05/15 10:19:43 eich Exp $ */
 
 /* various bits of DIX-level mangling */
 
diff --git a/lbx/lbxserve.h b/lbx/lbxserve.h
index 40a2ff0ae..eeff64804 100644
--- a/lbx/lbxserve.h
+++ b/lbx/lbxserve.h
@@ -45,7 +45,7 @@ in this Software without prior written authorization from The Open Group.
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
  */
-/* $XFree86: xc/programs/Xserver/lbx/lbxserve.h,v 1.5 2001/12/14 20:00:00 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/lbx/lbxserve.h,v 1.4 2001/08/01 00:44:58 tsi Exp $ */
 
 #ifndef _LBXSERVE_H_
 
diff --git a/lbx/lbxsquish.c b/lbx/lbxsquish.c
index d71647091..f3dc13163 100644
--- a/lbx/lbxsquish.c
+++ b/lbx/lbxsquish.c
@@ -46,7 +46,7 @@ in this Software without prior written authorization from The Open Group.
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
  */
-/* $XFree86: xc/programs/Xserver/lbx/lbxsquish.c,v 1.4 2001/12/14 20:00:01 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/lbx/lbxsquish.c,v 1.3 2001/01/17 22:37:00 dawes Exp $ */
 #define NEED_REPLIES
 #define NEED_EVENTS
 #include "X.h"
diff --git a/lbx/lbxsrvopts.h b/lbx/lbxsrvopts.h
index eeb94f266..ea7f2420e 100644
--- a/lbx/lbxsrvopts.h
+++ b/lbx/lbxsrvopts.h
@@ -21,7 +21,7 @@
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
  */
-/* $XFree86: xc/programs/Xserver/lbx/lbxsrvopts.h,v 1.3 2001/01/17 22:37:00 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/lbx/lbxsrvopts.h,v 1.2 2000/05/18 23:46:24 dawes Exp $ */
 
 #ifndef _LBX_SRVOPTS_H_
 #define _LBX_SRVOPTS_H_
diff --git a/lbx/lbxswap.c b/lbx/lbxswap.c
index edfc0bea7..23fdd30f7 100644
--- a/lbx/lbxswap.c
+++ b/lbx/lbxswap.c
@@ -45,7 +45,7 @@ in this Software without prior written authorization from The Open Group.
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
  */
-/* $XFree86: xc/programs/Xserver/lbx/lbxswap.c,v 1.4 2001/12/14 20:00:01 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/lbx/lbxswap.c,v 1.3 2001/01/17 22:37:00 dawes Exp $ */
 
 #include <sys/types.h>
 #define NEED_REPLIES
diff --git a/lbx/lbxtables.c b/lbx/lbxtables.c
index e071846e3..26a635f6f 100644
--- a/lbx/lbxtables.c
+++ b/lbx/lbxtables.c
@@ -21,7 +21,7 @@
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
  */
-/* $XFree86: xc/programs/Xserver/lbx/lbxtables.c,v 1.3 2001/01/17 22:37:00 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/lbx/lbxtables.c,v 1.2 2000/05/18 23:46:24 dawes Exp $ */
 #include "dix.h"
 
 extern int ProcInitialConnection(ClientPtr client);
diff --git a/lbx/lbxtags.c b/lbx/lbxtags.c
index 5b1d65a4a..6fdc4d5a2 100644
--- a/lbx/lbxtags.c
+++ b/lbx/lbxtags.c
@@ -46,7 +46,7 @@ in this Software without prior written authorization from The Open Group.
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
  */
-/* $XFree86: xc/programs/Xserver/lbx/lbxtags.c,v 1.4 2001/12/14 20:00:01 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/lbx/lbxtags.c,v 1.3 2001/01/17 22:37:00 dawes Exp $ */
 
 #include "X.h"
 #include "misc.h"
diff --git a/lbx/lbxtags.h b/lbx/lbxtags.h
index e451ad091..376a4cc27 100644
--- a/lbx/lbxtags.h
+++ b/lbx/lbxtags.h
@@ -46,7 +46,7 @@ in this Software without prior written authorization from The Open Group.
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
  */
-/* $XFree86: xc/programs/Xserver/lbx/lbxtags.h,v 1.4 2001/12/14 20:00:01 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/lbx/lbxtags.h,v 1.3 2001/01/17 22:37:00 dawes Exp $ */
 
 #ifndef _LBXTAGS_H_
 #define _LBXTAGS_H_
diff --git a/lbx/lbxzerorep.c b/lbx/lbxzerorep.c
index 50b424708..20d58b37b 100644
--- a/lbx/lbxzerorep.c
+++ b/lbx/lbxzerorep.c
@@ -27,7 +27,7 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/programs/Xserver/lbx/lbxzerorep.c,v 1.4 2001/12/14 20:00:02 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/lbx/lbxzerorep.c,v 1.3 2001/01/17 22:37:00 dawes Exp $ */
 
 /*
  * This module handles zeroing out unused pad bytes in core X replies.
diff --git a/mfb/fastblt.h b/mfb/fastblt.h
index f647eb6ba..f25541f55 100644
--- a/mfb/fastblt.h
+++ b/mfb/fastblt.h
@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/programs/Xserver/mfb/fastblt.h,v 1.5 2001/12/14 20:00:03 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/mfb/fastblt.h,v 1.4 2001/01/17 22:37:01 dawes Exp $ */
 
 /*
  * Fast bitblt macros for certain hardware.  If your machine has an addressing
diff --git a/mfb/maskbits.c b/mfb/maskbits.c
index 4f3e0087b..09f593ec2 100644
--- a/mfb/maskbits.c
+++ b/mfb/maskbits.c
@@ -48,7 +48,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 */
-/* $XFree86: xc/programs/Xserver/mfb/maskbits.c,v 1.6 2001/12/14 20:00:03 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/mfb/maskbits.c,v 1.5 2001/01/17 22:37:01 dawes Exp $ */
 
 #include "maskbits.h"
 #include "servermd.h"
diff --git a/mfb/maskbits.h b/mfb/maskbits.h
index 711731660..4cd30be39 100644
--- a/mfb/maskbits.h
+++ b/mfb/maskbits.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/mfb/maskbits.h,v 3.9 2003/02/18 21:30:00 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/mfb/maskbits.h,v 3.8tsi Exp $ */
 /* Combined Purdue/PurduePlus patches, level 2.1, 1/24/89 */
 /***********************************************************
 Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
diff --git a/mfb/mergerop.h b/mfb/mergerop.h
index ee3a33fe9..e54e1f906 100644
--- a/mfb/mergerop.h
+++ b/mfb/mergerop.h
@@ -25,7 +25,7 @@ in this Software without prior written authorization from The Open Group.
  *
  * Author:  Keith Packard, MIT X Consortium
  */
-/* $XFree86: xc/programs/Xserver/mfb/mergerop.h,v 3.14 2001/12/14 20:00:03 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/mfb/mergerop.h,v 3.13 2001/10/28 03:34:13 tsi Exp $ */
 
 #ifndef _MERGEROP_H_
 #define _MERGEROP_H_
diff --git a/mfb/mfb.h b/mfb/mfb.h
index 01e09f195..267ebc4ea 100644
--- a/mfb/mfb.h
+++ b/mfb/mfb.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/mfb/mfb.h,v 1.22 2003/11/17 22:20:44 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/mfb/mfb.h,v 1.21 2003/07/16 03:35:16 dawes Exp $ */
 /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
 /***********************************************************
 
diff --git a/mfb/mfbbitblt.c b/mfb/mfbbitblt.c
index 310d492f8..6e950e837 100644
--- a/mfb/mfbbitblt.c
+++ b/mfb/mfbbitblt.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/mfb/mfbbitblt.c,v 1.8 2003/11/10 18:22:45 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/mfb/mfbbitblt.c,v 1.7tsi Exp $ */
 /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
 /***********************************************************
 
diff --git a/mfb/mfbblt.c b/mfb/mfbblt.c
index 59968110b..ca240ba99 100644
--- a/mfb/mfbblt.c
+++ b/mfb/mfbblt.c
@@ -1,7 +1,7 @@
 /*
  * mfb copy area
  */
-/* $XFree86: xc/programs/Xserver/mfb/mfbblt.c,v 3.4 2001/12/14 20:00:04 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/mfb/mfbblt.c,v 3.3 2001/10/28 03:34:14 tsi Exp $ */
 
 /*
 
diff --git a/mfb/mfbbres.c b/mfb/mfbbres.c
index d43bd2e00..b1fad2192 100644
--- a/mfb/mfbbres.c
+++ b/mfb/mfbbres.c
@@ -1,5 +1,5 @@
 /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
-/* $XFree86: xc/programs/Xserver/mfb/mfbbres.c,v 1.5 2001/12/14 20:00:05 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/mfb/mfbbres.c,v 1.4 2001/01/17 22:37:02 dawes Exp $ */
 /***********************************************************
 
 Copyright 1987, 1998  The Open Group
diff --git a/mfb/mfbbresd.c b/mfb/mfbbresd.c
index 182744d6e..a7ffdc36c 100644
--- a/mfb/mfbbresd.c
+++ b/mfb/mfbbresd.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/mfb/mfbbresd.c,v 1.5 2001/12/14 20:00:05 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/mfb/mfbbresd.c,v 1.4 2001/01/17 22:37:02 dawes Exp $ */
 /***********************************************************
 
 Copyright 1987, 1998  The Open Group
diff --git a/mfb/mfbclip.c b/mfb/mfbclip.c
index d23071cd3..3b36819ef 100644
--- a/mfb/mfbclip.c
+++ b/mfb/mfbclip.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/mfb/mfbclip.c,v 1.6 2003/07/16 01:38:55 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/mfb/mfbclip.c,v 1.5 2001/12/14 20:00:05 dawes Exp $ */
 /***********************************************************
 
 Copyright 1987, 1998  The Open Group
diff --git a/mfb/mfbcmap.c b/mfb/mfbcmap.c
index d5dfbf47f..253399df4 100644
--- a/mfb/mfbcmap.c
+++ b/mfb/mfbcmap.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/mfb/mfbcmap.c,v 1.8 2003/02/18 21:30:01 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/mfb/mfbcmap.c,v 1.7tsi Exp $ */
 /***********************************************************
 
 Copyright 1987, 1998  The Open Group
diff --git a/mfb/mfbfillarc.c b/mfb/mfbfillarc.c
index 886c2852a..9e65d8340 100644
--- a/mfb/mfbfillarc.c
+++ b/mfb/mfbfillarc.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/mfb/mfbfillarc.c,v 1.6 2003/07/16 01:38:55 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/mfb/mfbfillarc.c,v 1.5 2001/12/14 20:00:06 dawes Exp $ */
 /************************************************************
 
 Copyright 1989, 1998  The Open Group
diff --git a/mfb/mfbfillrct.c b/mfb/mfbfillrct.c
index cd1b66845..aa90f411b 100644
--- a/mfb/mfbfillrct.c
+++ b/mfb/mfbfillrct.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/mfb/mfbfillrct.c,v 1.6 2003/02/18 21:30:01 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/mfb/mfbfillrct.c,v 1.5tsi Exp $ */
 /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
 /***********************************************************
 
diff --git a/mfb/mfbfillsp.c b/mfb/mfbfillsp.c
index 5a095757f..8fd4c0f29 100644
--- a/mfb/mfbfillsp.c
+++ b/mfb/mfbfillsp.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/mfb/mfbfillsp.c,v 1.9 2001/12/14 20:00:06 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/mfb/mfbfillsp.c,v 1.8 2001/01/17 22:37:02 dawes Exp $ */
 /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
 /***********************************************************
 
diff --git a/mfb/mfbgc.c b/mfb/mfbgc.c
index 1119f66f9..aec4c2e7f 100644
--- a/mfb/mfbgc.c
+++ b/mfb/mfbgc.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/mfb/mfbgc.c,v 1.10 2003/07/16 03:35:16 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/mfb/mfbgc.c,v 1.9 2003/07/16 01:38:55 dawes Exp $ */
 /***********************************************************
 
 Copyright 1987, 1998  The Open Group
diff --git a/mfb/mfbgetsp.c b/mfb/mfbgetsp.c
index 59bd7e538..b63a184f8 100644
--- a/mfb/mfbgetsp.c
+++ b/mfb/mfbgetsp.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/mfb/mfbgetsp.c,v 1.4 2003/02/18 21:30:01 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/mfb/mfbgetsp.c,v 1.3tsi Exp $ */
 /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
 /***********************************************************
 
diff --git a/mfb/mfbhrzvert.c b/mfb/mfbhrzvert.c
index 237e337f5..626ef67fb 100644
--- a/mfb/mfbhrzvert.c
+++ b/mfb/mfbhrzvert.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/mfb/mfbhrzvert.c,v 1.5 2001/12/14 20:00:08 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/mfb/mfbhrzvert.c,v 1.4 2001/01/17 22:37:03 dawes Exp $ */
 /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
 /***********************************************************
 
diff --git a/mfb/mfbimage.c b/mfb/mfbimage.c
index 4d616ed8b..1fb40db5a 100644
--- a/mfb/mfbimage.c
+++ b/mfb/mfbimage.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/mfb/mfbimage.c,v 1.6 2001/12/14 20:00:08 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/mfb/mfbimage.c,v 1.5 2001/01/17 22:37:03 dawes Exp $ */
 /***********************************************************
 
 Copyright 1987, 1998  The Open Group
diff --git a/mfb/mfbimggblt.c b/mfb/mfbimggblt.c
index 066ca3ce7..aa948a34e 100644
--- a/mfb/mfbimggblt.c
+++ b/mfb/mfbimggblt.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/mfb/mfbimggblt.c,v 3.6 2003/11/03 05:11:59 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/mfb/mfbimggblt.c,v 3.5tsi Exp $ */
 /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
 /***********************************************************
 
diff --git a/mfb/mfbline.c b/mfb/mfbline.c
index e7e678983..b8e1d3648 100644
--- a/mfb/mfbline.c
+++ b/mfb/mfbline.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/mfb/mfbline.c,v 1.7 2001/12/14 20:00:09 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/mfb/mfbline.c,v 1.6 2001/01/17 22:37:03 dawes Exp $ */
 /***********************************************************
 
 Copyright 1987, 1998  The Open Group
diff --git a/mfb/mfbply1rct.c b/mfb/mfbply1rct.c
index 980e57246..f3f8decc7 100644
--- a/mfb/mfbply1rct.c
+++ b/mfb/mfbply1rct.c
@@ -26,7 +26,7 @@ in this Software without prior written authorization from The Open Group.
  * Author:  Keith Packard, MIT X Consortium
  */
 
-/* $XFree86: xc/programs/Xserver/mfb/mfbply1rct.c,v 1.8 2002/12/09 04:10:57 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/mfb/mfbply1rct.c,v 1.7tsi Exp $ */
 
 #include "X.h"
 
diff --git a/mfb/mfbplygblt.c b/mfb/mfbplygblt.c
index 61a7297f0..5e4a619be 100644
--- a/mfb/mfbplygblt.c
+++ b/mfb/mfbplygblt.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/mfb/mfbplygblt.c,v 3.5 2003/11/03 05:12:00 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/mfb/mfbplygblt.c,v 3.4tsi Exp $ */
 /***********************************************************
 
 Copyright 1987, 1998  The Open Group
diff --git a/mfb/mfbpolypnt.c b/mfb/mfbpolypnt.c
index 38cd4aee8..5c99d03de 100644
--- a/mfb/mfbpolypnt.c
+++ b/mfb/mfbpolypnt.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/mfb/mfbpolypnt.c,v 1.5 2001/12/14 20:00:11 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/mfb/mfbpolypnt.c,v 1.4 2001/01/17 22:37:03 dawes Exp $ */
 /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
 /***********************************************************
 
diff --git a/mfb/mfbpushpxl.c b/mfb/mfbpushpxl.c
index f10e39046..0410af192 100644
--- a/mfb/mfbpushpxl.c
+++ b/mfb/mfbpushpxl.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/mfb/mfbpushpxl.c,v 1.7 2003/02/18 21:30:01 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/mfb/mfbpushpxl.c,v 1.6tsi Exp $ */
 /***********************************************************
 
 Copyright 1987, 1998  The Open Group
diff --git a/mfb/mfbscrclse.c b/mfb/mfbscrclse.c
index 28b0c24c3..12ccf6079 100644
--- a/mfb/mfbscrclse.c
+++ b/mfb/mfbscrclse.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/programs/Xserver/mfb/mfbscrclse.c,v 1.4 2003/02/18 21:30:01 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/mfb/mfbscrclse.c,v 1.3tsi Exp $ */
 
 #include "mfb.h"
 #include "scrnintstr.h"
diff --git a/mfb/mfbscrinit.c b/mfb/mfbscrinit.c
index d07aadb80..c85d4e36b 100644
--- a/mfb/mfbscrinit.c
+++ b/mfb/mfbscrinit.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/mfb/mfbscrinit.c,v 3.9 2003/02/18 21:30:01 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/mfb/mfbscrinit.c,v 3.8tsi Exp $ */
 /***********************************************************
 
 Copyright 1987, 1998  The Open Group
diff --git a/mfb/mfbsetsp.c b/mfb/mfbsetsp.c
index a56935dbe..66da37d1d 100644
--- a/mfb/mfbsetsp.c
+++ b/mfb/mfbsetsp.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/mfb/mfbsetsp.c,v 1.7 2003/02/18 21:30:01 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/mfb/mfbsetsp.c,v 1.6tsi Exp $ */
 /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
 /***********************************************************
 
diff --git a/mfb/mfbtegblt.c b/mfb/mfbtegblt.c
index 1e0da0f02..b0e02850c 100644
--- a/mfb/mfbtegblt.c
+++ b/mfb/mfbtegblt.c
@@ -47,7 +47,7 @@ SOFTWARE.
 
 ******************************************************************/
 
-/* $XFree86: xc/programs/Xserver/mfb/mfbtegblt.c,v 1.8 2001/12/14 20:00:12 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/mfb/mfbtegblt.c,v 1.7 2001/01/17 22:37:03 dawes Exp $ */
 
 #include	"X.h"
 #include	"Xmd.h"
diff --git a/mfb/mfbtile.c b/mfb/mfbtile.c
index e672f38c9..50b261114 100644
--- a/mfb/mfbtile.c
+++ b/mfb/mfbtile.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/mfb/mfbtile.c,v 1.4 2003/07/16 01:38:55 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/mfb/mfbtile.c,v 1.3 2003/02/18 21:30:01 tsi Exp $ */
 /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
 /***********************************************************
 
diff --git a/mfb/mfbwindow.c b/mfb/mfbwindow.c
index f7ff963c4..294083f78 100644
--- a/mfb/mfbwindow.c
+++ b/mfb/mfbwindow.c
@@ -46,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/programs/Xserver/mfb/mfbwindow.c,v 1.4 2003/11/03 05:36:35 tsi Exp $ */
+/* $XFree86$ */
 
 #include "X.h"
 #include "scrnintstr.h"
diff --git a/mfb/mfbzerarc.c b/mfb/mfbzerarc.c
index 1ef9f1f56..ad46732ab 100644
--- a/mfb/mfbzerarc.c
+++ b/mfb/mfbzerarc.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/mfb/mfbzerarc.c,v 3.8 2003/07/16 01:38:55 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/mfb/mfbzerarc.c,v 3.7 2002/09/27 01:57:47 dawes Exp $ */
 /************************************************************
 
 Copyright 1989, 1998  The Open Group
diff --git a/mi/cbrt.c b/mi/cbrt.c
index 44c836e43..cfc8d84da 100644
--- a/mi/cbrt.c
+++ b/mi/cbrt.c
@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/programs/Xserver/mi/cbrt.c,v 3.4 2001/12/14 20:00:19 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/mi/cbrt.c,v 3.3 2001/05/29 22:24:06 dawes Exp $ */
 
 /* simple cbrt, in case your math library doesn't have a good one */
 
diff --git a/mi/mi.h b/mi/mi.h
index fba57567d..388a90b27 100644
--- a/mi/mi.h
+++ b/mi/mi.h
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/programs/Xserver/mi/mi.h,v 3.10 2001/12/14 20:00:19 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/mi/mi.h,v 3.9 2001/08/06 20:51:16 dawes Exp $ */
 
 #ifndef MI_H
 #define MI_H
diff --git a/mi/miarc.c b/mi/miarc.c
index 160119563..1c37551e3 100644
--- a/mi/miarc.c
+++ b/mi/miarc.c
@@ -1,4 +1,5 @@
-/* $XFree86: xc/programs/Xserver/mi/miarc.c,v 3.15 2003/12/06 18:46:28 dawes Exp $ */
+/* $XdotOrg: xc/programs/Xserver/mi/miarc.c,v 1.1.4.3 2003/12/20 00:28:31 kaleb Exp $ */
+/* $XFree86: xc/programs/Xserver/mi/miarc.c,v 3.14 2003/10/29 22:57:48 tsi Exp $ */
 /***********************************************************
 
 Copyright 1987, 1998  The Open Group
@@ -49,7 +50,8 @@ SOFTWARE.
 /* Author: Keith Packard and Bob Scheifler */
 /* Warning: this code is toxic, do not dally very long here. */
 
-#if defined(_XOPEN_SOURCE) || defined(__QNXNTO__)
+#if defined(_XOPEN_SOURCE) || defined(__QNXNTO__) \
+	|| (defined(sun) && defined(__SVR4))
 #include <math.h>
 #else
 #define _XOPEN_SOURCE	/* to get prototype for hypot on some systems */
diff --git a/mi/mibank.c b/mi/mibank.c
index 11708434c..1f1087b88 100644
--- a/mi/mibank.c
+++ b/mi/mibank.c
@@ -44,7 +44,7 @@
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $XFree86: xc/programs/Xserver/mi/mibank.c,v 1.16 2004/01/05 16:42:10 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/mi/mibank.c,v 1.15 2003/11/10 18:39:16 tsi Exp $ */
 
 /*
  * This thing originated from an idea of Edwin Goei and his bank switching
diff --git a/mi/mibank.h b/mi/mibank.h
index eac53db20..cf27d1fae 100644
--- a/mi/mibank.h
+++ b/mi/mibank.h
@@ -20,7 +20,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $XFree86: xc/programs/Xserver/mi/mibank.h,v 1.11 2004/01/05 16:42:10 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/mi/mibank.h,v 1.10 2003/01/01 19:16:42 tsi Exp $ */
 
 #ifndef __MIBANK_H__
 #define __MIBANK_H__ 1
diff --git a/mi/mibitblt.c b/mi/mibitblt.c
index f0228212c..82e34cdbe 100644
--- a/mi/mibitblt.c
+++ b/mi/mibitblt.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/mi/mibitblt.c,v 3.11 2001/12/14 20:00:20 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/mi/mibitblt.c,v 3.10 2001/08/06 20:51:17 dawes Exp $ */
 /***********************************************************
 
 Copyright 1987, 1998  The Open Group
diff --git a/mi/mibstore.c b/mi/mibstore.c
index e04e5410c..1cd35c4dd 100644
--- a/mi/mibstore.c
+++ b/mi/mibstore.c
@@ -42,7 +42,7 @@ implied warranty.
 
 ******************************************************************/
 
-/* $XFree86: xc/programs/Xserver/mi/mibstore.c,v 1.11 2003/11/10 18:22:47 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/mi/mibstore.c,v 1.10tsi Exp $ */
 
 #define NEED_EVENTS
 #include "X.h"
diff --git a/mi/mibstore.h b/mi/mibstore.h
index e8f197dbc..fb58975c6 100644
--- a/mi/mibstore.h
+++ b/mi/mibstore.h
@@ -16,7 +16,7 @@
  */
 
 
-/* $XFree86: xc/programs/Xserver/mi/mibstore.h,v 1.5 2001/08/06 20:51:18 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/mi/mibstore.h,v 1.4 2001/01/17 22:37:06 dawes Exp $ */
 
 #ifndef _MIBSTORE_H
 #define _MIBSTORE_H
diff --git a/mi/mibstorest.h b/mi/mibstorest.h
index 249b4d4d3..fec3c9712 100644
--- a/mi/mibstorest.h
+++ b/mi/mibstorest.h
@@ -31,7 +31,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 */
 
-/* $XFree86: xc/programs/Xserver/mi/mibstorest.h,v 1.5 2001/12/14 20:00:21 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/mi/mibstorest.h,v 1.4 2001/01/17 22:37:06 dawes Exp $ */
 
 #include "mibstore.h"
 #include "regionstr.h"
diff --git a/mi/miclipn.c b/mi/miclipn.c
index 95272c176..456ad08c4 100644
--- a/mi/miclipn.c
+++ b/mi/miclipn.c
@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/programs/Xserver/mi/miclipn.c,v 1.4 2001/12/14 20:00:21 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/mi/miclipn.c,v 1.3 2001/08/06 21:46:04 dawes Exp $ */
 
 #include "X.h"
 #include "windowstr.h"
diff --git a/mi/micmap.c b/mi/micmap.c
index b3e925a09..018244a2a 100644
--- a/mi/micmap.c
+++ b/mi/micmap.c
@@ -27,7 +27,7 @@ OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
 THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/programs/Xserver/mi/micmap.c,v 1.11 2001/05/29 22:24:06 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/mi/micmap.c,v 1.10 2000/09/20 00:09:14 keithp Exp $ */
 
 /*
  * This is based on cfbcmap.c.  The functions here are useful independently
diff --git a/mi/micmap.h b/mi/micmap.h
index 557ae63d5..ca2a417be 100644
--- a/mi/micmap.h
+++ b/mi/micmap.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/mi/micmap.h,v 1.7 2000/09/20 00:09:15 keithp Exp $ */
+/* $XFree86: xc/programs/Xserver/mi/micmap.h,v 1.5 1999/06/14 07:32:11 dawes Exp $ */
 
 #include "colormapst.h"
 
diff --git a/mi/micoord.h b/mi/micoord.h
index ffe2e1e53..420766916 100644
--- a/mi/micoord.h
+++ b/mi/micoord.h
@@ -50,7 +50,7 @@
     defined(__i386__) || defined(i386) || \
     defined(__ia64__) || defined(ia64) || \
     defined(__s390x__) || defined(__s390__) || \
-    defined(__AMD64__) || defined(AMD64)
+    defined(__amd64__) || defined(amd64)
 #define GetHighWord(x) (((int) (x)) >> 16)
 #else
 #define GetHighWord(x) (((int) (x)) / 65536)
diff --git a/mi/micursor.c b/mi/micursor.c
index 4c95d2f49..5da44c351 100644
--- a/mi/micursor.c
+++ b/mi/micursor.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/mi/micursor.c,v 1.3 2001/12/14 20:00:21 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/mi/micursor.c,v 1.2 2001/05/29 22:24:06 dawes Exp $ */
 /***********************************************************
 
 Copyright 1987, 1998  The Open Group
diff --git a/mi/midash.c b/mi/midash.c
index bc33b0c20..0152db7ca 100644
--- a/mi/midash.c
+++ b/mi/midash.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/mi/midash.c,v 1.5 2003/07/16 01:38:56 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/mi/midash.c,v 1.4 2001/12/14 20:00:21 dawes Exp $ */
 /***********************************************************
 
 Copyright 1987, 1998  The Open Group
diff --git a/mi/midispcur.c b/mi/midispcur.c
index ca85fc3d1..08c9f9216 100644
--- a/mi/midispcur.c
+++ b/mi/midispcur.c
@@ -30,7 +30,7 @@ Except as contained in this notice, the name of The Open Group 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 Open Group.
 */
-/* $XFree86: xc/programs/Xserver/mi/midispcur.c,v 1.10 2003/03/06 05:52:58 mvojkovi Exp $ */
+/* $XFree86: xc/programs/Xserver/mi/midispcur.c,v 1.9 2002/12/09 04:10:57 tsi Exp $ */
 
 #define NEED_EVENTS
 # include   "X.h"
diff --git a/mi/mieq.c b/mi/mieq.c
index 699d4130c..a0ed3fdce 100644
--- a/mi/mieq.c
+++ b/mi/mieq.c
@@ -25,7 +25,7 @@ in this Software without prior written authorization from The Open Group.
  *
  * Author:  Keith Packard, MIT X Consortium
  */
-/* $XFree86: xc/programs/Xserver/mi/mieq.c,v 1.3 2001/12/14 20:00:22 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/mi/mieq.c,v 1.2 2001/05/25 18:41:01 dawes Exp $ */
 
 /*
  * mieq.c
diff --git a/mi/miexpose.c b/mi/miexpose.c
index 07efa754c..897c680b3 100644
--- a/mi/miexpose.c
+++ b/mi/miexpose.c
@@ -1,4 +1,5 @@
-/* $XFree86: xc/programs/Xserver/mi/miexpose.c,v 3.10 2003/11/10 18:22:49 tsi Exp $ */
+/* $XdotOrg$ */
+/* $XFree86: xc/programs/Xserver/mi/miexpose.c,v 3.9tsi Exp $ */
 /***********************************************************
 
 Copyright 1987, 1998  The Open Group
@@ -45,6 +46,33 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
+/*****************************************************************
+
+Copyright (c) 1991, 1997 Digital Equipment Corporation, Maynard, Massachusetts.
+
+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.
+
+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
+DIGITAL EQUIPMENT CORPORATION BE LIABLE FOR ANY CLAIM, DAMAGES, INCLUDING,
+BUT NOT LIMITED TO CONSEQUENTIAL OR INCIDENTAL 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 Digital Equipment Corporation
+shall not be used in advertising or otherwise to promote the sale, use or other
+dealings in this Software without prior written authorization from Digital
+Equipment Corporation.
+
+******************************************************************/
 
 /* $Xorg: miexpose.c,v 1.4 2001/02/09 02:05:20 xorgcvs Exp $ */
 
diff --git a/mi/mifillarc.c b/mi/mifillarc.c
index fa37d45be..c8b901c85 100644
--- a/mi/mifillarc.c
+++ b/mi/mifillarc.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/mi/mifillarc.c,v 3.8 2003/07/16 01:38:56 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/mi/mifillarc.c,v 3.7 2001/12/14 20:00:22 dawes Exp $ */
 /************************************************************
 
 Copyright 1989, 1998  The Open Group
diff --git a/mi/mifillarc.h b/mi/mifillarc.h
index ed8503f15..ff39bac1d 100644
--- a/mi/mifillarc.h
+++ b/mi/mifillarc.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/mi/mifillarc.h,v 3.7 2001/12/14 20:00:22 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/mi/mifillarc.h,v 3.6 2001/10/25 12:03:47 alanh Exp $ */
 /************************************************************
 
 Copyright 1989, 1998  The Open Group
diff --git a/mi/mifillrct.c b/mi/mifillrct.c
index be2c58dfe..31219869e 100644
--- a/mi/mifillrct.c
+++ b/mi/mifillrct.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/mi/mifillrct.c,v 1.3 2001/12/14 20:00:22 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/mi/mifillrct.c,v 1.2 2001/05/29 22:24:06 dawes Exp $ */
 /***********************************************************
 
 Copyright 1987, 1998  The Open Group
diff --git a/mi/mifpoly.h b/mi/mifpoly.h
index 837cf7b20..79f606b4d 100644
--- a/mi/mifpoly.h
+++ b/mi/mifpoly.h
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/programs/Xserver/mi/mifpoly.h,v 1.4 2001/12/14 20:00:22 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/mi/mifpoly.h,v 1.3 2001/10/25 12:03:47 alanh Exp $ */
 
 #ifndef __MIFPOLY_H__
 #define __MIFPOLY_H__
diff --git a/mi/mifpolycon.c b/mi/mifpolycon.c
index 93999ea7d..ae41cf6f6 100644
--- a/mi/mifpolycon.c
+++ b/mi/mifpolycon.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/mi/mifpolycon.c,v 1.3 2001/12/14 20:00:23 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/mi/mifpolycon.c,v 1.2 2001/08/06 20:51:18 dawes Exp $ */
 /***********************************************************
 
 Copyright 1987, 1998  The Open Group
diff --git a/mi/migc.c b/mi/migc.c
index 29eec9749..b5b33852a 100644
--- a/mi/migc.c
+++ b/mi/migc.c
@@ -27,7 +27,7 @@ from The Open Group.
 
 */
 
-/* $XFree86: xc/programs/Xserver/mi/migc.c,v 1.9 2001/12/14 20:00:23 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/mi/migc.c,v 1.8 2001/08/06 20:51:18 dawes Exp $ */
 
 #include "scrnintstr.h"
 #include "gcstruct.h"
diff --git a/mi/migc.h b/mi/migc.h
index 8cb5a56c9..d906c6334 100644
--- a/mi/migc.h
+++ b/mi/migc.h
@@ -27,7 +27,7 @@ from The Open Group.
 
 */
 
-/* $XFree86: xc/programs/Xserver/mi/migc.h,v 1.8 2001/12/14 20:00:23 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/mi/migc.h,v 1.7 2001/08/06 20:51:18 dawes Exp $ */
 
 extern void miChangeGC(
     GCPtr  /*pGC*/,
diff --git a/mi/miglblt.c b/mi/miglblt.c
index 3e7e5da1b..f2a748db6 100644
--- a/mi/miglblt.c
+++ b/mi/miglblt.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/mi/miglblt.c,v 1.6 2001/12/14 20:00:23 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/mi/miglblt.c,v 1.5 2001/05/29 22:24:07 dawes Exp $ */
 /***********************************************************
 
 Copyright 1987, 1998  The Open Group
diff --git a/mi/miinitext.c b/mi/miinitext.c
index ee63aa41b..ab452e10f 100644
--- a/mi/miinitext.c
+++ b/mi/miinitext.c
@@ -1,4 +1,5 @@
-/* $XFree86: xc/programs/Xserver/mi/miinitext.c,v 3.68 2003/01/15 02:34:14 torrey Exp $ */
+/* $XdotOrg: xc/programs/Xserver/mi/miinitext.c,v 1.1.4.7 2004/04/15 10:17:22 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/mi/miinitext.c,v 3.67 2003/01/12 02:44:27 dawes Exp $ */
 /***********************************************************
 
 Copyright 1987, 1998  The Open Group
@@ -61,6 +62,30 @@ SOFTWARE.
 #undef GLXEXT
 #endif
 
+/* Make sure Xprt only announces extensions it supports */
+#ifdef PRINT_ONLY_SERVER
+#undef MITSHM /* this is incompatible to the vector-based Xprint DDX */
+#undef XKB
+#undef PANORAMIX
+#undef RES
+#undef XIE
+#undef GLXEXT /* not yet */
+#undef XINPUT
+#undef XV
+#undef SCREENSAVER
+#undef XIDLE
+#undef XRECORD
+#undef DBE
+#undef XF86VIDMODE
+#undef XF86MISC
+#undef XFreeXDGA
+#undef XF86DRI
+#undef DPMSExtension
+#undef DPSEXT
+#undef FONTCACHE
+#undef RENDER /* not yet */
+#endif /* PRINT_ONLY_SERVER */
+
 #ifdef PANORAMIX
 extern Bool noPanoramiXExtension;
 #endif
diff --git a/mi/miline.h b/mi/miline.h
index 8977550b3..f52a51ebd 100644
--- a/mi/miline.h
+++ b/mi/miline.h
@@ -25,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/programs/Xserver/mi/miline.h,v 1.7 2001/12/14 20:00:24 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/mi/miline.h,v 1.6 2001/08/06 20:51:19 dawes Exp $ */
 
 #ifndef MILINE_H
 
diff --git a/mi/mioverlay.c b/mi/mioverlay.c
index cdb2058b1..74cd18022 100644
--- a/mi/mioverlay.c
+++ b/mi/mioverlay.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/mi/mioverlay.c,v 3.16 2003/11/10 18:22:49 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/mi/mioverlay.c,v 3.15tsi Exp $ */
 
 #include "X.h"
 #include "scrnintstr.h"
diff --git a/mi/mioverlay.h b/mi/mioverlay.h
index 6098f9c39..64045f45c 100644
--- a/mi/mioverlay.h
+++ b/mi/mioverlay.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/mi/mioverlay.h,v 3.4 2001/04/14 21:15:26 mvojkovi Exp $ */
+/* $XFree86: xc/programs/Xserver/mi/mioverlay.h,v 3.3 2000/02/29 00:16:03 mvojkovi Exp $ */
 
 #ifndef __MIOVERLAY_H
 #define __MIOVERLAY_H
diff --git a/mi/mipointer.c b/mi/mipointer.c
index 58d93b80b..2e4ee607b 100644
--- a/mi/mipointer.c
+++ b/mi/mipointer.c
@@ -28,7 +28,7 @@ Except as contained in this notice, the name of The Open Group 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 Open Group.
 */
-/* $XFree86: xc/programs/Xserver/mi/mipointer.c,v 3.10 2001/12/14 20:00:24 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/mi/mipointer.c,v 3.9 2001/09/04 14:03:28 dawes Exp $ */
 
 # define NEED_EVENTS
 # include   "X.h"
diff --git a/mi/mipointer.h b/mi/mipointer.h
index 0486fc5a3..f8e7fd084 100644
--- a/mi/mipointer.h
+++ b/mi/mipointer.h
@@ -29,7 +29,7 @@ Except as contained in this notice, the name of The Open Group 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 Open Group.
 */
-/* $XFree86: xc/programs/Xserver/mi/mipointer.h,v 3.9 2001/12/14 20:00:24 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/mi/mipointer.h,v 3.8 2001/08/06 20:51:19 dawes Exp $ */
 
 #ifndef MIPOINTER_H
 #define MIPOINTER_H
diff --git a/mi/mipointrst.h b/mi/mipointrst.h
index ab5372229..682f8ac88 100644
--- a/mi/mipointrst.h
+++ b/mi/mipointrst.h
@@ -29,7 +29,7 @@ Except as contained in this notice, the name of The Open Group 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 Open Group.
 */
-/* $XFree86: xc/programs/Xserver/mi/mipointrst.h,v 1.4 2001/12/14 20:00:25 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/mi/mipointrst.h,v 1.3 2001/04/19 14:14:07 tsi Exp $ */
 
 #include "mipointer.h"
 #include "scrnintstr.h"
diff --git a/mi/mipoly.c b/mi/mipoly.c
index ad69d7062..2c420b250 100644
--- a/mi/mipoly.c
+++ b/mi/mipoly.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/mi/mipoly.c,v 1.3 2003/07/16 01:38:56 dawes Exp $ */
+/* $XFree86$ */
 /***********************************************************
 
 Copyright 1987, 1998  The Open Group
diff --git a/mi/mipoly.h b/mi/mipoly.h
index 42d973477..88a1782de 100644
--- a/mi/mipoly.h
+++ b/mi/mipoly.h
@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/programs/Xserver/mi/mipoly.h,v 1.3 2001/12/14 20:00:25 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/mi/mipoly.h,v 1.2 2001/08/06 20:51:19 dawes Exp $ */
 
 
 /*
diff --git a/mi/mipolycon.c b/mi/mipolycon.c
index d99ed83d7..de33045ef 100644
--- a/mi/mipolycon.c
+++ b/mi/mipolycon.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/mi/mipolycon.c,v 1.4 2001/12/14 20:00:25 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/mi/mipolycon.c,v 1.3 2001/08/06 21:46:04 dawes Exp $ */
 /***********************************************************
 
 Copyright 1987, 1998  The Open Group
diff --git a/mi/mipolygen.c b/mi/mipolygen.c
index bbeb05dc3..484a29798 100644
--- a/mi/mipolygen.c
+++ b/mi/mipolygen.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/mi/mipolygen.c,v 1.3 2001/12/14 20:00:25 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/mi/mipolygen.c,v 1.2 2001/05/29 22:24:07 dawes Exp $ */
 /***********************************************************
 
 Copyright 1987, 1998  The Open Group
diff --git a/mi/mipolypnt.c b/mi/mipolypnt.c
index ed19f5f68..f88545cfd 100644
--- a/mi/mipolypnt.c
+++ b/mi/mipolypnt.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/mi/mipolypnt.c,v 1.3 2001/12/14 20:00:25 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/mi/mipolypnt.c,v 1.2 2001/05/29 22:24:07 dawes Exp $ */
 /***********************************************************
 
 Copyright 1987, 1998  The Open Group
diff --git a/mi/mipolyrect.c b/mi/mipolyrect.c
index 298ba2385..07964cf82 100644
--- a/mi/mipolyrect.c
+++ b/mi/mipolyrect.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/mi/mipolyrect.c,v 1.4 2003/07/16 01:38:57 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/mi/mipolyrect.c,v 1.3 2001/12/14 20:00:25 dawes Exp $ */
 /***********************************************************
 
 Copyright 1987, 1998  The Open Group
diff --git a/mi/mipolyseg.c b/mi/mipolyseg.c
index cb6bb7550..fe4993914 100644
--- a/mi/mipolyseg.c
+++ b/mi/mipolyseg.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/mi/mipolyseg.c,v 1.4 2003/07/16 01:38:57 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/mi/mipolyseg.c,v 1.3 2001/12/14 20:00:26 dawes Exp $ */
 /***********************************************************
 
 Copyright 1987, 1998  The Open Group
diff --git a/mi/mipolytext.c b/mi/mipolytext.c
index 9084fe180..a3f64a086 100644
--- a/mi/mipolytext.c
+++ b/mi/mipolytext.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/mi/mipolytext.c,v 1.3 2001/12/14 20:00:26 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/mi/mipolytext.c,v 1.2 2001/08/06 20:51:19 dawes Exp $ */
 /*******************************************************************
 
 Copyright 1987, 1998  The Open Group
diff --git a/mi/mipolyutil.c b/mi/mipolyutil.c
index 7ffeadd86..9a7422223 100644
--- a/mi/mipolyutil.c
+++ b/mi/mipolyutil.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/mi/mipolyutil.c,v 1.10 2003/07/16 01:38:57 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/mi/mipolyutil.c,v 1.9 2001/12/14 20:00:26 dawes Exp $ */
 /***********************************************************
 
 Copyright 1987, 1998  The Open Group
diff --git a/mi/mipushpxl.c b/mi/mipushpxl.c
index 0c8d32ae6..019ba437e 100644
--- a/mi/mipushpxl.c
+++ b/mi/mipushpxl.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/mi/mipushpxl.c,v 3.13 2003/07/16 01:38:57 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/mi/mipushpxl.c,v 3.12 2001/12/14 20:00:26 dawes Exp $ */
 /***********************************************************
 
 Copyright 1987, 1998  The Open Group
diff --git a/mi/miregion.c b/mi/miregion.c
index ef666c321..2057deb62 100644
--- a/mi/miregion.c
+++ b/mi/miregion.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/mi/miregion.c,v 1.10 2003/07/16 01:38:57 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/mi/miregion.c,v 1.9 2003/04/23 21:51:53 tsi Exp $ */
 /***********************************************************
 
 Copyright 1987, 1988, 1989, 1998  The Open Group
@@ -49,26 +49,33 @@ SOFTWARE.
 /* $Xorg: miregion.c,v 1.4 2001/02/09 02:05:21 xorgcvs Exp $ */
 
 /* The panoramix components contained the following notice */
-/****************************************************************
-*                                                               *
-*    Copyright (c) Digital Equipment Corporation, 1991, 1997    *
-*                                                               *
-*   All Rights Reserved.  Unpublished rights  reserved  under   *
-*   the copyright laws of the United States.                    *
-*                                                               *
-*   The software contained on this media  is  proprietary  to   *
-*   and  embodies  the  confidential  technology  of  Digital   *
-*   Equipment Corporation.  Possession, use,  duplication  or   *
-*   dissemination of the software and media is authorized only  *
-*   pursuant to a valid written license from Digital Equipment  *
-*   Corporation.                                                *
-*                                                               *
-*   RESTRICTED RIGHTS LEGEND   Use, duplication, or disclosure  *
-*   by the U.S. Government is subject to restrictions  as  set  *
-*   forth in Subparagraph (c)(1)(ii)  of  DFARS  252.227-7013,  *
-*   or  in  FAR 52.227-19, as applicable.                       *
-*                                                               *
-*****************************************************************/
+/*****************************************************************
+
+Copyright (c) 1991, 1997 Digital Equipment Corporation, Maynard, Massachusetts.
+
+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.
+
+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
+DIGITAL EQUIPMENT CORPORATION BE LIABLE FOR ANY CLAIM, DAMAGES, INCLUDING,
+BUT NOT LIMITED TO CONSEQUENTIAL OR INCIDENTAL 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 Digital Equipment Corporation
+shall not be used in advertising or otherwise to promote the sale, use or other
+dealings in this Software without prior written authorization from Digital
+Equipment Corporation.
+
+******************************************************************/
 
 #include "regionstr.h"
 #include "Xprotostr.h"
diff --git a/mi/miscrinit.c b/mi/miscrinit.c
index edb5f7d78..7f8ee48ad 100644
--- a/mi/miscrinit.c
+++ b/mi/miscrinit.c
@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/programs/Xserver/mi/miscrinit.c,v 3.16 2003/04/23 21:51:53 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/mi/miscrinit.c,v 3.15tsi Exp $ */
 
 #include "X.h"
 #include "servermd.h"
diff --git a/mi/mispans.c b/mi/mispans.c
index 81fa45da7..84a737525 100644
--- a/mi/mispans.c
+++ b/mi/mispans.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/mi/mispans.c,v 3.4 2001/12/14 20:00:26 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/mi/mispans.c,v 3.3 2001/08/06 20:51:20 dawes Exp $ */
 /***********************************************************
 
 Copyright 1989, 1998  The Open Group
diff --git a/mi/mispans.h b/mi/mispans.h
index 5ae2d014a..b6e97e2b4 100644
--- a/mi/mispans.h
+++ b/mi/mispans.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/mi/mispans.h,v 1.3 2001/12/14 20:00:26 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/mi/mispans.h,v 1.2 2001/08/06 20:51:20 dawes Exp $ */
 /***********************************************************
 
 Copyright 1989, 1998  The Open Group
diff --git a/mi/misprite.c b/mi/misprite.c
index d323f1168..260a4dac0 100644
--- a/mi/misprite.c
+++ b/mi/misprite.c
@@ -30,7 +30,7 @@ Except as contained in this notice, the name of The Open Group 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 Open Group.
 */
-/* $XFree86: xc/programs/Xserver/mi/misprite.c,v 3.11 2002/12/09 04:10:58 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/mi/misprite.c,v 3.10tsi Exp $ */
 
 # include   "X.h"
 # include   "Xproto.h"
diff --git a/mi/misprite.h b/mi/misprite.h
index a7e19f7cb..b4cc84ecf 100644
--- a/mi/misprite.h
+++ b/mi/misprite.h
@@ -32,7 +32,7 @@ Except as contained in this notice, the name of The Open Group 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 Open Group.
 */
-/* $XFree86: xc/programs/Xserver/mi/misprite.h,v 1.3 2001/12/14 20:00:27 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/mi/misprite.h,v 1.2 2001/08/06 20:51:20 dawes Exp $ */
 
 typedef struct {
     Bool	(*RealizeCursor)(
diff --git a/mi/mispritest.h b/mi/mispritest.h
index eddc16c2d..e438dd7d2 100644
--- a/mi/mispritest.h
+++ b/mi/mispritest.h
@@ -30,7 +30,7 @@ Except as contained in this notice, the name of The Open Group 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 Open Group.
 */
-/* $XFree86: xc/programs/Xserver/mi/mispritest.h,v 1.5 2001/12/14 20:00:27 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/mi/mispritest.h,v 1.4 2001/01/17 22:37:07 dawes Exp $ */
 
 # include   "misprite.h"
 #ifdef RENDER
diff --git a/mi/mistruct.h b/mi/mistruct.h
index 0744b2593..98879b72d 100644
--- a/mi/mistruct.h
+++ b/mi/mistruct.h
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/programs/Xserver/mi/mistruct.h,v 1.3 2003/07/16 01:38:57 dawes Exp $ */
+/* $XFree86$ */
 
 #ifndef MISTRUCT_H
 #define MISTRUCT_H
diff --git a/mi/mivalidate.h b/mi/mivalidate.h
index c1ef15bb1..c25e5d5bc 100644
--- a/mi/mivalidate.h
+++ b/mi/mivalidate.h
@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/programs/Xserver/mi/mivalidate.h,v 1.3 2003/07/16 01:38:57 dawes Exp $ */
+/* $XFree86$ */
 
 
 #ifndef MIVALIDATE_H
diff --git a/mi/mivaltree.c b/mi/mivaltree.c
index 90ba5d98e..1bbbc20fc 100644
--- a/mi/mivaltree.c
+++ b/mi/mivaltree.c
@@ -1,4 +1,5 @@
 /* $Xorg: mivaltree.c,v 1.4 2001/02/09 02:05:22 xorgcvs Exp $ */
+/* $XdotOrg$ */
 /*
  * mivaltree.c --
  *	Functions for recalculating window clip lists. Main function
@@ -52,28 +53,35 @@ in this Software without prior written authorization from The Open Group.
  ******************************************************************/
 
 /* The panoramix components contained the following notice */
-/****************************************************************
-*                                                               *
-*    Copyright (c) Digital Equipment Corporation, 1991, 1997    *
-*                                                               *
-*   All Rights Reserved.  Unpublished rights  reserved  under   *
-*   the copyright laws of the United States.                    *
-*                                                               *
-*   The software contained on this media  is  proprietary  to   *
-*   and  embodies  the  confidential  technology  of  Digital   *
-*   Equipment Corporation.  Possession, use,  duplication  or   *
-*   dissemination of the software and media is authorized only  *
-*   pursuant to a valid written license from Digital Equipment  *
-*   Corporation.                                                *
-*                                                               *
-*   RESTRICTED RIGHTS LEGEND   Use, duplication, or disclosure  *
-*   by the U.S. Government is subject to restrictions  as  set  *
-*   forth in Subparagraph (c)(1)(ii)  of  DFARS  252.227-7013,  *
-*   or  in  FAR 52.227-19, as applicable.                       *
-*                                                               *
-*****************************************************************/
-
-/* $XFree86: xc/programs/Xserver/mi/mivaltree.c,v 1.10 2003/11/10 18:22:49 tsi Exp $ */
+/*****************************************************************
+
+Copyright (c) 1991, 1997 Digital Equipment Corporation, Maynard, Massachusetts.
+
+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.
+
+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
+DIGITAL EQUIPMENT CORPORATION BE LIABLE FOR ANY CLAIM, DAMAGES, INCLUDING,
+BUT NOT LIMITED TO CONSEQUENTIAL OR INCIDENTAL 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 Digital Equipment Corporation
+shall not be used in advertising or otherwise to promote the sale, use or other
+dealings in this Software without prior written authorization from Digital
+Equipment Corporation.
+
+******************************************************************/
+
+/* $XFree86: xc/programs/Xserver/mi/mivaltree.c,v 1.9tsi Exp $ */
 
  /* 
   * Aug '86: Susan Angebranndt -- original code
diff --git a/mi/miwideline.c b/mi/miwideline.c
index 84b4346f2..8888ca8bd 100644
--- a/mi/miwideline.c
+++ b/mi/miwideline.c
@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/programs/Xserver/mi/miwideline.c,v 1.13 2003/07/16 01:38:57 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/mi/miwideline.c,v 1.12 2001/12/14 20:00:28 dawes Exp $ */
 
 /* Author:  Keith Packard, MIT X Consortium */
 
diff --git a/mi/miwideline.h b/mi/miwideline.h
index f32a1e8fe..96d6aae86 100644
--- a/mi/miwideline.h
+++ b/mi/miwideline.h
@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/programs/Xserver/mi/miwideline.h,v 1.12 2001/12/14 20:00:28 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/mi/miwideline.h,v 1.11 2001/10/25 12:03:47 alanh Exp $ */
 
 /* Author:  Keith Packard, MIT X Consortium */
 
diff --git a/mi/miwindow.c b/mi/miwindow.c
index 9c962ee4e..4eac9226c 100644
--- a/mi/miwindow.c
+++ b/mi/miwindow.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/mi/miwindow.c,v 1.10 2003/11/10 18:22:49 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/mi/miwindow.c,v 1.9tsi Exp $ */
 /***********************************************************
 
 Copyright 1987, 1998  The Open Group
diff --git a/mi/mizerarc.c b/mi/mizerarc.c
index e2233e78e..e36b2f3f0 100644
--- a/mi/mizerarc.c
+++ b/mi/mizerarc.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/mi/mizerarc.c,v 1.7 2003/07/16 01:38:59 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/mi/mizerarc.c,v 1.6 2001/12/14 20:00:28 dawes Exp $ */
 /************************************************************
 
 Copyright 1989, 1998  The Open Group
diff --git a/mi/mizerarc.h b/mi/mizerarc.h
index 4a52efa29..99062d192 100644
--- a/mi/mizerarc.h
+++ b/mi/mizerarc.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/mi/mizerarc.h,v 1.3 2001/12/14 20:00:28 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/mi/mizerarc.h,v 1.2 2001/08/06 20:51:20 dawes Exp $ */
 /************************************************************
 
 Copyright 1989, 1998  The Open Group
diff --git a/mi/mizerclip.c b/mi/mizerclip.c
index fa1863b54..304f525ae 100644
--- a/mi/mizerclip.c
+++ b/mi/mizerclip.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/mi/mizerclip.c,v 1.3 2001/12/14 20:00:29 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/mi/mizerclip.c,v 1.2 2001/08/06 20:51:20 dawes Exp $ */
 /***********************************************************
 
 Copyright 1987, 1998  The Open Group
diff --git a/mi/mizerline.c b/mi/mizerline.c
index d1fbf631e..4672f6bd3 100644
--- a/mi/mizerline.c
+++ b/mi/mizerline.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/mi/mizerline.c,v 3.7 2001/12/14 20:00:29 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/mi/mizerline.c,v 3.6 2001/08/06 20:51:20 dawes Exp $ */
 /***********************************************************
 
 Copyright 1987, 1998  The Open Group
diff --git a/miext/layer/layer.h b/miext/layer/layer.h
index 630438057..09ab43540 100644
--- a/miext/layer/layer.h
+++ b/miext/layer/layer.h
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/programs/Xserver/miext/layer/layer.h,v 1.5 2002/10/03 22:50:21 keithp Exp $
+ * $XFree86: xc/programs/Xserver/miext/layer/layer.h,v 1.4 2001/08/01 00:44:58 tsi Exp $
  *
  * Copyright © 2001 Keith Packard, member of The XFree86 Project, Inc.
  *
diff --git a/miext/layer/layergc.c b/miext/layer/layergc.c
index 52490d286..d01787b10 100644
--- a/miext/layer/layergc.c
+++ b/miext/layer/layergc.c
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/programs/Xserver/miext/layer/layergc.c,v 1.5 2001/10/28 03:34:15 tsi Exp $
+ * $XFree86: xc/programs/Xserver/miext/layer/layergc.c,v 1.4 2001/08/27 03:55:46 keithp Exp $
  *
  * Copyright © 2001 Keith Packard, member of The XFree86 Project, Inc.
  *
diff --git a/miext/layer/layerinit.c b/miext/layer/layerinit.c
index 6cbca7150..4e49c9b15 100644
--- a/miext/layer/layerinit.c
+++ b/miext/layer/layerinit.c
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/programs/Xserver/miext/layer/layerinit.c,v 1.7 2003/11/10 18:22:49 tsi Exp $
+ * $XFree86: xc/programs/Xserver/miext/layer/layerinit.c,v 1.6tsi Exp $
  *
  * Copyright © 2001 Keith Packard, member of The XFree86 Project, Inc.
  *
diff --git a/miext/layer/layerpict.c b/miext/layer/layerpict.c
index ef412a2c5..eb3fec897 100644
--- a/miext/layer/layerpict.c
+++ b/miext/layer/layerpict.c
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/programs/Xserver/miext/layer/layerpict.c,v 1.2 2003/08/22 19:27:32 eich Exp $
+ * $XFree86$
  *
  * Copyright © 2001 Keith Packard, member of The XFree86 Project, Inc.
  *
diff --git a/miext/layer/layerstr.h b/miext/layer/layerstr.h
index 401dfd96f..8dcba062d 100644
--- a/miext/layer/layerstr.h
+++ b/miext/layer/layerstr.h
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/programs/Xserver/miext/layer/layerstr.h,v 1.4 2003/08/22 19:27:32 eich Exp $
+ * $XFree86: xc/programs/Xserver/miext/layer/layerstr.h,v 1.2 2001/06/04 09:45:41 keithp Exp $
  *
  * Copyright © 2001 Keith Packard, member of The XFree86 Project, Inc.
  *
diff --git a/miext/layer/layerwin.c b/miext/layer/layerwin.c
index 44a5df24c..177df4e35 100644
--- a/miext/layer/layerwin.c
+++ b/miext/layer/layerwin.c
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/programs/Xserver/miext/layer/layerwin.c,v 1.8 2003/11/10 18:22:49 tsi Exp $
+ * $XFree86: xc/programs/Xserver/miext/layer/layerwin.c,v 1.7tsi Exp $
  *
  * Copyright © 2001 Keith Packard, member of The XFree86 Project, Inc.
  *
diff --git a/miext/rootless/accel/rlAccel.h b/miext/rootless/accel/rlAccel.h
index 56afd7331..dab0c6f46 100644
--- a/miext/rootless/accel/rlAccel.h
+++ b/miext/rootless/accel/rlAccel.h
@@ -26,7 +26,7 @@
  * holders shall not be used in advertising or otherwise to promote the sale,
  * use or other dealings in this Software without prior written authorization.
  */
-/* $XFree86: xc/programs/Xserver/miext/rootless/accel/rlAccel.h,v 1.1 2003/10/24 00:33:15 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/miext/rootless/rootlessCommon.c,v 1.4 2003/10/18 00:00:34 torrey Exp $ */
 
 /*
  * rlBlt.c
diff --git a/miext/rootless/accel/rlBlt.c b/miext/rootless/accel/rlBlt.c
index ba6fdf227..6711c500e 100644
--- a/miext/rootless/accel/rlBlt.c
+++ b/miext/rootless/accel/rlBlt.c
@@ -26,7 +26,7 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
-/* $XFree86: xc/programs/Xserver/miext/rootless/accel/rlBlt.c,v 1.1 2003/10/24 00:33:15 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/fb/fbblt.c,v 1.8 2000/09/28 00:47:22 keithp Exp $ */
 
 #include "fb.h"
 #include "rootlessCommon.h"
diff --git a/miext/rootless/accel/rlCopy.c b/miext/rootless/accel/rlCopy.c
index cbd58b4cf..8e063a347 100644
--- a/miext/rootless/accel/rlCopy.c
+++ b/miext/rootless/accel/rlCopy.c
@@ -22,7 +22,7 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
-/* $XFree86: xc/programs/Xserver/miext/rootless/accel/rlCopy.c,v 1.1 2003/10/24 00:33:15 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/fb/fbcopy.c,v 1.12 2001/07/16 05:04:05 keithp Exp $ */
 
 #include "fb.h"
 #include "rlAccel.h"
diff --git a/miext/rootless/accel/rlFill.c b/miext/rootless/accel/rlFill.c
index 7fd7adfa8..e33b40d45 100644
--- a/miext/rootless/accel/rlFill.c
+++ b/miext/rootless/accel/rlFill.c
@@ -22,7 +22,7 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
-/* $XFree86: xc/programs/Xserver/miext/rootless/accel/rlFill.c,v 1.1 2003/10/24 00:33:15 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/fb/fbfill.c,v 1.6 2003/01/31 00:01:45 torrey Exp $ */
 
 #include "fb.h"
 #include "rlAccel.h"
diff --git a/miext/rootless/accel/rlFillRect.c b/miext/rootless/accel/rlFillRect.c
index 2ce9eae2b..ca3985298 100644
--- a/miext/rootless/accel/rlFillRect.c
+++ b/miext/rootless/accel/rlFillRect.c
@@ -22,7 +22,7 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
-/* $XFree86: xc/programs/Xserver/miext/rootless/accel/rlFillRect.c,v 1.1 2003/10/24 00:33:15 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/fb/fbfillrect.c,v 1.2 2000/02/23 20:29:43 dawes Exp $ */
 
 #include "fb.h"
 #include "rlAccel.h"
diff --git a/miext/rootless/accel/rlFillSpans.c b/miext/rootless/accel/rlFillSpans.c
index fd5ee35f5..b91f734c1 100644
--- a/miext/rootless/accel/rlFillSpans.c
+++ b/miext/rootless/accel/rlFillSpans.c
@@ -22,7 +22,7 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
-/* $XFree86: xc/programs/Xserver/miext/rootless/accel/rlFillSpans.c,v 1.1 2003/10/24 00:33:15 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/fb/fbfillsp.c,v 1.2 2000/02/23 20:29:43 dawes Exp $ */
 
 #include "fb.h"
 #include "rlAccel.h"
diff --git a/miext/rootless/accel/rlGlyph.c b/miext/rootless/accel/rlGlyph.c
index 2bf2da64b..da28204eb 100644
--- a/miext/rootless/accel/rlGlyph.c
+++ b/miext/rootless/accel/rlGlyph.c
@@ -22,7 +22,7 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
-/* $XFree86: xc/programs/Xserver/miext/rootless/accel/rlGlyph.c,v 1.1 2003/10/24 00:33:15 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/fb/fbglyph.c,v 1.12 2001/09/07 15:16:00 keithp Exp $ */
 
 #include "fb.h"
 #include "fontstruct.h"
diff --git a/miext/rootless/accel/rlSolid.c b/miext/rootless/accel/rlSolid.c
index e2249569b..4ff4798c1 100644
--- a/miext/rootless/accel/rlSolid.c
+++ b/miext/rootless/accel/rlSolid.c
@@ -26,7 +26,7 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
-/* $XFree86: xc/programs/Xserver/miext/rootless/accel/rlSolid.c,v 1.1 2003/10/24 00:33:15 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/fb/fbsolid.c,v 1.8 2001/10/28 03:33:08 tsi Exp $ */
 
 #include "fb.h"
 #include "rootlessCommon.h"
diff --git a/miext/rootless/rootless.h b/miext/rootless/rootless.h
index 2b375706f..aefefcab2 100644
--- a/miext/rootless/rootless.h
+++ b/miext/rootless/rootless.h
@@ -27,7 +27,7 @@
  * holders shall not be used in advertising or otherwise to promote the sale,
  * use or other dealings in this Software without prior written authorization.
  */
-/* $XFree86: xc/programs/Xserver/miext/rootless/rootless.h,v 1.6 2003/10/24 00:33:14 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/miext/rootless/rootless.h,v 1.5 2003/10/18 00:00:34 torrey Exp $ */
 
 #ifndef _ROOTLESS_H
 #define _ROOTLESS_H
diff --git a/miext/rootless/rootlessCommon.c b/miext/rootless/rootlessCommon.c
index bc6259ea6..85655a9e1 100644
--- a/miext/rootless/rootlessCommon.c
+++ b/miext/rootless/rootlessCommon.c
@@ -28,7 +28,7 @@
  * holders shall not be used in advertising or otherwise to promote the sale,
  * use or other dealings in this Software without prior written authorization.
  */
-/* $XFree86: xc/programs/Xserver/miext/rootless/rootlessCommon.c,v 1.5 2003/11/10 18:22:50 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/miext/rootless/rootlessCommon.c,v 1.4tsi Exp $ */
 
 #include "rootlessCommon.h"
 
diff --git a/miext/rootless/rootlessCommon.h b/miext/rootless/rootlessCommon.h
index 973ec6291..c75c45a2e 100644
--- a/miext/rootless/rootlessCommon.h
+++ b/miext/rootless/rootlessCommon.h
@@ -27,7 +27,7 @@
  * holders shall not be used in advertising or otherwise to promote the sale,
  * use or other dealings in this Software without prior written authorization.
  */
-/* $XFree86: xc/programs/Xserver/miext/rootless/rootlessCommon.h,v 1.4 2003/09/16 00:36:20 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/miext/rootless/rootlessCommon.h,v 1.3 2003/06/30 01:45:13 torrey Exp $ */
 
 #ifndef _ROOTLESSCOMMON_H
 #define _ROOTLESSCOMMON_H
diff --git a/miext/rootless/rootlessConfig.h b/miext/rootless/rootlessConfig.h
index 1a1a48a4a..93e987fe7 100644
--- a/miext/rootless/rootlessConfig.h
+++ b/miext/rootless/rootlessConfig.h
@@ -26,7 +26,7 @@
  * holders shall not be used in advertising or otherwise to promote the sale,
  * use or other dealings in this Software without prior written authorization.
  */
-/* $XFree86: xc/programs/Xserver/miext/rootless/rootlessConfig.h,v 1.2 2003/10/24 00:33:14 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/miext/rootless/rootlessConfig.h,v 1.1 2003/04/15 01:05:44 torrey Exp $ */
 
 #ifndef _ROOTLESSCONFIG_H
 #define _ROOTLESSCONFIG_H
diff --git a/miext/rootless/rootlessGC.c b/miext/rootless/rootlessGC.c
index 8c70135a1..b370d2beb 100644
--- a/miext/rootless/rootlessGC.c
+++ b/miext/rootless/rootlessGC.c
@@ -28,7 +28,7 @@
  * holders shall not be used in advertising or otherwise to promote the sale,
  * use or other dealings in this Software without prior written authorization.
  */
-/* $XFree86: xc/programs/Xserver/miext/rootless/rootlessGC.c,v 1.2 2003/10/24 00:33:14 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/miext/rootless/rootlessGC.c,v 1.1 2003/04/15 01:05:44 torrey Exp $ */
 
 #include "mi.h"
 #include "scrnintstr.h"
diff --git a/miext/rootless/rootlessScreen.c b/miext/rootless/rootlessScreen.c
index beb737df1..21c62c4ef 100644
--- a/miext/rootless/rootlessScreen.c
+++ b/miext/rootless/rootlessScreen.c
@@ -28,7 +28,7 @@
  * holders shall not be used in advertising or otherwise to promote the sale,
  * use or other dealings in this Software without prior written authorization.
  */
-/* $XFree86: xc/programs/Xserver/miext/rootless/rootlessScreen.c,v 1.3 2003/06/30 01:45:13 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/miext/rootless/rootlessScreen.c,v 1.2 2003/04/30 23:15:35 torrey Exp $ */
 
 
 #include "mi.h"
diff --git a/miext/rootless/rootlessValTree.c b/miext/rootless/rootlessValTree.c
index a95917939..9e61603b5 100644
--- a/miext/rootless/rootlessValTree.c
+++ b/miext/rootless/rootlessValTree.c
@@ -3,7 +3,7 @@
  *
  * This file is very closely based on mivaltree.c.
  */
-/* $XFree86: xc/programs/Xserver/miext/rootless/rootlessValTree.c,v 1.2 2003/11/10 18:22:50 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/miext/rootless/rootlessValTree.c,v 1.1tsi Exp $ */
 
 /*
  * mivaltree.c --
@@ -54,27 +54,33 @@ in this Software without prior written authorization from The Open Group.
  ******************************************************************/
 
 /* The panoramix components contained the following notice */
-/****************************************************************
-*                                                               *
-*    Copyright (c) Digital Equipment Corporation, 1991, 1997    *
-*                                                               *
-*   All Rights Reserved.  Unpublished rights  reserved  under   *
-*   the copyright laws of the United States.                    *
-*                                                               *
-*   The software contained on this media  is  proprietary  to   *
-*   and  embodies  the  confidential  technology  of  Digital   *
-*   Equipment Corporation.  Possession, use,  duplication  or   *
-*   dissemination of the software and media is authorized only  *
-*   pursuant to a valid written license from Digital Equipment  *
-*   Corporation.                                                *
-*                                                               *
-*   RESTRICTED RIGHTS LEGEND   Use, duplication, or disclosure  *
-*   by the U.S. Government is subject to restrictions  as  set  *
-*   forth in Subparagraph (c)(1)(ii)  of  DFARS  252.227-7013,  *
-*   or  in  FAR 52.227-19, as applicable.                       *
-*                                                               *
-*****************************************************************/
+/*****************************************************************
 
+Copyright (c) 1991, 1997 Digital Equipment Corporation, Maynard, Massachusetts.
+
+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.
+
+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
+DIGITAL EQUIPMENT CORPORATION BE LIABLE FOR ANY CLAIM, DAMAGES, INCLUDING,
+BUT NOT LIMITED TO CONSEQUENTIAL OR INCIDENTAL 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 Digital Equipment Corporation
+shall not be used in advertising or otherwise to promote the sale, use or other
+dealings in this Software without prior written authorization from Digital
+Equipment Corporation.
+
+******************************************************************/
  /* 
   * Aug '86: Susan Angebranndt -- original code
   * July '87: Adam de Boor -- substantially modified and commented
diff --git a/miext/rootless/rootlessWindow.c b/miext/rootless/rootlessWindow.c
index b970399c7..165665917 100644
--- a/miext/rootless/rootlessWindow.c
+++ b/miext/rootless/rootlessWindow.c
@@ -1,3 +1,4 @@
+/* $XdotOrg$ */
 /*
  * Rootless window management
  */
@@ -28,7 +29,7 @@
  * holders shall not be used in advertising or otherwise to promote the sale,
  * use or other dealings in this Software without prior written authorization.
  */
-/* $XFree86: xc/programs/Xserver/miext/rootless/rootlessWindow.c,v 1.11 2003/11/27 01:53:39 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/miext/rootless/rootlessWindow.c,v 1.10 2003/11/13 20:26:31 torrey Exp $ */
 
 #include "rootlessCommon.h"
 #include "rootlessWindow.h"
diff --git a/miext/rootless/rootlessWindow.h b/miext/rootless/rootlessWindow.h
index f6736f544..6c26bace3 100644
--- a/miext/rootless/rootlessWindow.h
+++ b/miext/rootless/rootlessWindow.h
@@ -26,7 +26,7 @@
  * holders shall not be used in advertising or otherwise to promote the sale,
  * use or other dealings in this Software without prior written authorization.
  */
-/* $XFree86: xc/programs/Xserver/miext/rootless/rootlessWindow.h,v 1.2 2003/06/30 01:45:13 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/miext/rootless/rootlessWindow.h,v 1.1 2003/04/15 01:05:44 torrey Exp $ */
 
 #ifndef _ROOTLESSWINDOW_H
 #define _ROOTLESSWINDOW_H
diff --git a/miext/rootless/safeAlpha/safeAlpha.h b/miext/rootless/safeAlpha/safeAlpha.h
index 90efec5c8..63922aeec 100644
--- a/miext/rootless/safeAlpha/safeAlpha.h
+++ b/miext/rootless/safeAlpha/safeAlpha.h
@@ -26,7 +26,7 @@
  * holders shall not be used in advertising or otherwise to promote the sale,
  * use or other dealings in this Software without prior written authorization.
  */
-/* $XFree86: xc/programs/Xserver/miext/rootless/safeAlpha/safeAlpha.h,v 1.3 2004/01/19 01:22:48 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/miext/rootless/safeAlpha/safeAlpha.h,v 1.2 2003/10/18 00:00:34 torrey Exp $ */
 
 #ifndef _SAFEALPHA_H
 #define _SAFEALPHA_H
diff --git a/miext/rootless/safeAlpha/safeAlphaPicture.c b/miext/rootless/safeAlpha/safeAlphaPicture.c
index 3c9d39628..a10e7456c 100644
--- a/miext/rootless/safeAlpha/safeAlphaPicture.c
+++ b/miext/rootless/safeAlpha/safeAlphaPicture.c
@@ -32,7 +32,7 @@
  *
  * Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc.
  */
- /* $XFree86: xc/programs/Xserver/miext/rootless/safeAlpha/safeAlphaPicture.c,v 1.4 2004/01/19 01:22:48 torrey Exp $ */
+ /* $XFree86: xc/programs/Xserver/miext/rootless/safeAlpha/safeAlphaPicture.c,v 1.3 2003/10/24 00:33:15 torrey Exp $ */
 
 #ifdef RENDER
 
diff --git a/miext/rootless/safeAlpha/safeAlphaWindow.c b/miext/rootless/safeAlpha/safeAlphaWindow.c
index 51acb01c5..f7f83a371 100644
--- a/miext/rootless/safeAlpha/safeAlphaWindow.c
+++ b/miext/rootless/safeAlpha/safeAlphaWindow.c
@@ -1,3 +1,4 @@
+/* $XdotOrg$ */
 /*
  * Specialized window functions to protect the alpha channel
  */
@@ -31,7 +32,7 @@
  *
  * Copyright © 1998 Keith Packard
  */
-/* $XFree86: xc/programs/Xserver/miext/rootless/safeAlpha/safeAlphaWindow.c,v 1.2 2004/01/19 01:22:48 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/miext/rootless/safeAlpha/safeAlphaWindow.c,v 1.1 2003/09/16 00:36:20 torrey Exp $ */
 
 #include "fb.h"
 #include "safeAlpha.h"
diff --git a/miext/shadow/shadow.c b/miext/shadow/shadow.c
index 38a92953f..260c840a5 100644
--- a/miext/shadow/shadow.c
+++ b/miext/shadow/shadow.c
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/programs/Xserver/miext/shadow/shadow.c,v 1.15 2003/11/10 18:22:51 tsi Exp $
+ * $XFree86: xc/programs/Xserver/miext/shadow/shadow.c,v 1.14tsi Exp $
  *
  * Copyright © 2000 Keith Packard
  *
diff --git a/miext/shadow/shadow.h b/miext/shadow/shadow.h
index d8ade93dc..d343a171f 100644
--- a/miext/shadow/shadow.h
+++ b/miext/shadow/shadow.h
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/programs/Xserver/miext/shadow/shadow.h,v 1.7 2002/12/02 20:37:24 tsi Exp $
+ * $XFree86: xc/programs/Xserver/miext/shadow/shadow.h,v 1.6tsi Exp $
  *
  * Copyright © 2000 Keith Packard
  *
diff --git a/miext/shadow/shalloc.c b/miext/shadow/shalloc.c
index 028ec26a5..9edd8338e 100644
--- a/miext/shadow/shalloc.c
+++ b/miext/shadow/shalloc.c
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/programs/Xserver/miext/shadow/shalloc.c,v 1.1 2000/09/07 23:12:15 keithp Exp $
+ * $XFree86$
  *
  * Copyright © 2000 Keith Packard
  *
diff --git a/miext/shadow/shpacked.c b/miext/shadow/shpacked.c
index 818a37a8e..441409776 100644
--- a/miext/shadow/shpacked.c
+++ b/miext/shadow/shpacked.c
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/programs/Xserver/miext/shadow/shpacked.c,v 1.5 2001/10/28 03:34:16 tsi Exp $
+ * $XFree86: xc/programs/Xserver/miext/shadow/shpacked.c,v 1.4 2001/05/29 04:54:13 keithp Exp $
  *
  * Copyright © 2000 Keith Packard
  *
diff --git a/miext/shadow/shplanar.c b/miext/shadow/shplanar.c
index 148782956..aaa6d58eb 100644
--- a/miext/shadow/shplanar.c
+++ b/miext/shadow/shplanar.c
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/programs/Xserver/miext/shadow/shplanar.c,v 1.4 2001/10/28 03:34:16 tsi Exp $
+ * $XFree86: xc/programs/Xserver/miext/shadow/shplanar.c,v 1.3 2001/05/29 04:54:13 keithp Exp $
  *
  * Copyright © 2000 Keith Packard
  *
diff --git a/miext/shadow/shplanar8.c b/miext/shadow/shplanar8.c
index c82b5f931..3d4a3724d 100644
--- a/miext/shadow/shplanar8.c
+++ b/miext/shadow/shplanar8.c
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/programs/Xserver/miext/shadow/shplanar8.c,v 1.4 2001/10/28 03:34:16 tsi Exp $
+ * $XFree86: xc/programs/Xserver/miext/shadow/shplanar8.c,v 1.3 2001/05/29 04:54:13 keithp Exp $
  *
  * Copyright © 2000 Keith Packard
  *
diff --git a/miext/shadow/shrot16pack.c b/miext/shadow/shrot16pack.c
index a1ff273de..16b146352 100644
--- a/miext/shadow/shrot16pack.c
+++ b/miext/shadow/shrot16pack.c
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/programs/Xserver/miext/shadow/shrot16pack.c,v 1.1 2000/09/08 21:46:45 keithp Exp $
+ * $XFree86$
  *
  * Copyright © 2000 Keith Packard
  *
diff --git a/miext/shadow/shrot16pack_180.c b/miext/shadow/shrot16pack_180.c
index 7ba41833e..3786444d4 100644
--- a/miext/shadow/shrot16pack_180.c
+++ b/miext/shadow/shrot16pack_180.c
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/programs/Xserver/miext/shadow/shrot16pack_180.c,v 1.1 2001/05/29 04:54:13 keithp Exp $
+ * $XFree86$
  *
  * Copyright © 2000 Keith Packard
  *
diff --git a/miext/shadow/shrot16pack_270.c b/miext/shadow/shrot16pack_270.c
index 0b3c4e0ac..d2c9271f4 100644
--- a/miext/shadow/shrot16pack_270.c
+++ b/miext/shadow/shrot16pack_270.c
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/programs/Xserver/miext/shadow/shrot16pack_270.c,v 1.1 2001/05/29 04:54:13 keithp Exp $
+ * $XFree86$
  *
  * Copyright © 2000 Keith Packard
  *
diff --git a/miext/shadow/shrot16pack_90.c b/miext/shadow/shrot16pack_90.c
index 574b3a157..36cf94489 100644
--- a/miext/shadow/shrot16pack_90.c
+++ b/miext/shadow/shrot16pack_90.c
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/programs/Xserver/miext/shadow/shrot16pack_90.c,v 1.1 2001/05/29 04:54:13 keithp Exp $
+ * $XFree86$
  *
  * Copyright © 2000 Keith Packard
  *
diff --git a/miext/shadow/shrot32pack.c b/miext/shadow/shrot32pack.c
index 327636efb..3ef791608 100644
--- a/miext/shadow/shrot32pack.c
+++ b/miext/shadow/shrot32pack.c
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/programs/Xserver/miext/shadow/shrot32pack.c,v 1.1 2000/09/08 21:46:45 keithp Exp $
+ * $XFree86$
  *
  * Copyright © 2000 Keith Packard
  *
diff --git a/miext/shadow/shrot32pack_180.c b/miext/shadow/shrot32pack_180.c
index 838622267..943d6485e 100644
--- a/miext/shadow/shrot32pack_180.c
+++ b/miext/shadow/shrot32pack_180.c
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/programs/Xserver/miext/shadow/shrot32pack_180.c,v 1.1 2001/05/29 04:54:13 keithp Exp $
+ * $XFree86$
  *
  * Copyright © 2000 Keith Packard
  *
diff --git a/miext/shadow/shrot32pack_270.c b/miext/shadow/shrot32pack_270.c
index b0dd28316..0038c624c 100644
--- a/miext/shadow/shrot32pack_270.c
+++ b/miext/shadow/shrot32pack_270.c
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/programs/Xserver/miext/shadow/shrot32pack_270.c,v 1.1 2001/05/29 04:54:13 keithp Exp $
+ * $XFree86$
  *
  * Copyright © 2000 Keith Packard
  *
diff --git a/miext/shadow/shrot32pack_90.c b/miext/shadow/shrot32pack_90.c
index 9bdb18e25..1183ba65a 100644
--- a/miext/shadow/shrot32pack_90.c
+++ b/miext/shadow/shrot32pack_90.c
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/programs/Xserver/miext/shadow/shrot32pack_90.c,v 1.1 2001/05/29 04:54:13 keithp Exp $
+ * $XFree86$
  *
  * Copyright © 2000 Keith Packard
  *
diff --git a/miext/shadow/shrot8pack.c b/miext/shadow/shrot8pack.c
index 7af181f19..885c5e9a2 100644
--- a/miext/shadow/shrot8pack.c
+++ b/miext/shadow/shrot8pack.c
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/programs/Xserver/miext/shadow/shrot8pack.c,v 1.1 2000/09/08 21:46:46 keithp Exp $
+ * $XFree86$
  *
  * Copyright © 2000 Keith Packard
  *
diff --git a/miext/shadow/shrot8pack_180.c b/miext/shadow/shrot8pack_180.c
index 316c0c690..7bdb2a932 100644
--- a/miext/shadow/shrot8pack_180.c
+++ b/miext/shadow/shrot8pack_180.c
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/programs/Xserver/miext/shadow/shrot8pack_180.c,v 1.1 2001/05/29 04:54:13 keithp Exp $
+ * $XFree86$
  *
  * Copyright © 2000 Keith Packard
  *
diff --git a/miext/shadow/shrot8pack_270.c b/miext/shadow/shrot8pack_270.c
index bed542f6d..483f05f79 100644
--- a/miext/shadow/shrot8pack_270.c
+++ b/miext/shadow/shrot8pack_270.c
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/programs/Xserver/miext/shadow/shrot8pack_270.c,v 1.1 2001/05/29 04:54:13 keithp Exp $
+ * $XFree86$
  *
  * Copyright © 2000 Keith Packard
  *
diff --git a/miext/shadow/shrot8pack_90.c b/miext/shadow/shrot8pack_90.c
index f2618fc47..8c93d21ed 100644
--- a/miext/shadow/shrot8pack_90.c
+++ b/miext/shadow/shrot8pack_90.c
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/programs/Xserver/miext/shadow/shrot8pack_90.c,v 1.1 2001/05/29 04:54:13 keithp Exp $
+ * $XFree86$
  *
  * Copyright © 2000 Keith Packard
  *
diff --git a/miext/shadow/shrotate.c b/miext/shadow/shrotate.c
index 1277c2ee1..a0f5b6e06 100644
--- a/miext/shadow/shrotate.c
+++ b/miext/shadow/shrotate.c
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/programs/Xserver/miext/shadow/shrotate.c,v 1.5 2002/10/09 17:00:11 tsi Exp $
+ * $XFree86: xc/programs/Xserver/miext/shadow/shrotate.c,v 1.4tsi Exp $
  *
  * Copyright © 2001 Keith Packard, member of The XFree86 Project, Inc.
  *
diff --git a/miext/shadow/shrotpack.h b/miext/shadow/shrotpack.h
index ce9b4c561..507cabb56 100644
--- a/miext/shadow/shrotpack.h
+++ b/miext/shadow/shrotpack.h
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/programs/Xserver/miext/shadow/shrotpack.h,v 1.4 2001/10/28 03:34:16 tsi Exp $
+ * $XFree86: xc/programs/Xserver/miext/shadow/shrotpack.h,v 1.3 2001/05/29 04:54:13 keithp Exp $
  *
  * Copyright © 2000 Keith Packard
  *
diff --git a/os/WaitFor.c b/os/WaitFor.c
index 615392d64..3283dd5cf 100644
--- a/os/WaitFor.c
+++ b/os/WaitFor.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/os/WaitFor.c,v 3.44 2004/02/17 15:30:26 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/os/WaitFor.c,v 3.42 2003/10/16 01:33:35 dawes Exp $ */
 /***********************************************************
 
 Copyright 1987, 1998  The Open Group
diff --git a/os/access.c b/os/access.c
index 14b61839c..2877373c7 100644
--- a/os/access.c
+++ b/os/access.c
@@ -1,28 +1,38 @@
 /* $Xorg: access.c,v 1.5 2001/02/09 02:05:23 xorgcvs Exp $ */
+/* $XdotOrg: xc/programs/Xserver/os/access.c,v 1.1.4.3.2.3 2004/03/22 11:57:11 ago Exp $ */
 /***********************************************************
 
 Copyright 1987, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-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
-OPEN GROUP 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 Open Group 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 Open Group.
-
+Copyright 2004 Sun Microsystems, Inc.
+
+All rights reserved.
+
+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, and/or sell copies of the Software, and to permit persons
+to whom the Software is furnished to do so, provided that the above
+copyright notice(s) and this permission notice appear in all copies of
+the Software and that both the above copyright notice(s) and this
+permission notice appear in supporting documentation.
+
+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
+OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale, use
+or other dealings in this Software without prior written authorization
+of the copyright holder.
+
+X Window System is a trademark of The Open Group.
 
 Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
 
@@ -45,7 +55,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/programs/Xserver/os/access.c,v 3.54 2004/01/03 17:38:39 herrb Exp $ */
+/* $XFree86: xc/programs/Xserver/os/access.c,v 3.53 2004/01/02 18:23:19 tsi Exp $ */
 
 #ifdef WIN32
 #include <X11/Xwinsock.h>
@@ -78,6 +88,9 @@ SOFTWARE.
 #include <netdnet/dnetdb.h>
 #endif
 
+#ifdef HAS_GETPEERUCRED
+# include <ucred.h>
+#endif
 
 #if defined(DGUX)
 #include <sys/ioctl.h>
@@ -242,6 +255,11 @@ static int LocalHostEnabled = FALSE;
 static int LocalHostRequested = FALSE;
 static int UsingXdmcp = FALSE;
 
+/* FamilyServerInterpreted implementation */
+static Bool siAddrMatch(int family, pointer addr, int len, HOST *host, 
+	ClientPtr client);
+static int  siCheckAddr(const char *addrString, int length);
+static void siTypesInitialize(void);
 
 /*
  * called when authorization is not enabled to add the
@@ -641,7 +659,7 @@ DefineLocalHost:
 #endif
 #endif
 
-#ifdef DEF_SELF_DEBUG
+#if defined(DEF_SELF_DEBUG) || (defined(IPv6) && defined(AF_INET6))
 #include <arpa/inet.h>
 #endif
 
@@ -1100,6 +1118,7 @@ ResetHosts (char *display)
     pointer		addr;
     int 		len;
 
+    siTypesInitialize();
     AccessEnabled = defeatAccessControl ? FALSE : DEFAULT_ACCESS_CONTROL;
     LocalHostEnabled = FALSE;
     while ((host = validhosts) != 0)
@@ -1107,6 +1126,7 @@ ResetHosts (char *display)
         validhosts = host->next;
         FreeHost (host);
     }
+
 #define ETC_HOST_PREFIX "/etc/X"
 #define ETC_HOST_SUFFIX ".hosts"
     fnamelen = strlen(ETC_HOST_PREFIX) + strlen(ETC_HOST_SUFFIX) +
@@ -1176,10 +1196,26 @@ ResetHosts (char *display)
 	    hostname = ohostname + 4;
 	}
 #endif
+	else if (!strncmp("si:", lhostname, 3))
+	{
+	    family = FamilyServerInterpreted;
+	    hostname = ohostname + 3;
+	    hostlen -= 3;
+	}
+
+
+	if (family == FamilyServerInterpreted) 
+	{
+	    len = siCheckAddr(hostname, hostlen);
+	    if (len >= 0) {
+		NewHost(family, hostname, len, FALSE);
+	    }
+	}
+	else
 #ifdef DNETCONN
-    	if ((family == FamilyDECnet) ||
+    	if ((family == FamilyDECnet) || ((family == FamilyWild) &&
 	    (ptr = strchr(hostname, ':')) && (*(ptr + 1) == ':') &&
-	    !(*ptr = '\0'))	/* bash trailing colons if necessary */
+	    !(*ptr = '\0')))	/* bash trailing colons if necessary */
 	{
     	    /* node name (DECnet names end in "::") */
 	    dnaddrp = dnet_addr(hostname);
@@ -1332,12 +1368,14 @@ Bool LocalClient(ClientPtr client)
 int
 LocalClientCred(ClientPtr client, int *pUid, int *pGid)
 {
-#if defined(HAS_GETPEEREID) || defined(SO_PEERCRED)
+#if defined(HAS_GETPEEREID) || defined(HAS_GETPEERUCRED) || defined(SO_PEERCRED)
     int fd;
     XtransConnInfo ci;
 #ifdef HAS_GETPEEREID
     uid_t uid;
     gid_t gid;
+#elif defined(HAS_GETPEERUCRED)
+    ucred_t *peercred = NULL;
 #elif defined(SO_PEERCRED)
     struct ucred peercred;
     socklen_t so_len = sizeof(peercred);
@@ -1346,10 +1384,15 @@ LocalClientCred(ClientPtr client, int *pUid, int *pGid)
     if (client == NULL)
 	return -1;
     ci = ((OsCommPtr)client->osPrivate)->trans_conn;
-    /* We can only determine peer credentials for Unix domain sockets */
+#if !(defined(sun) && defined(HAS_GETPEERUCRED))
+    /* Most implementations can only determine peer credentials for Unix 
+     * domain sockets - Solaris getpeerucred can work with a bit more, so 
+     * we just let it tell us if the connection type is supported or not
+     */
     if (!_XSERVTransIsLocal(ci)) {
 	return -1;
     }
+#endif
     fd = _XSERVTransGetConnectionNumber(ci);
 #ifdef HAS_GETPEEREID
     if (getpeereid(fd, &uid, &gid) == -1) 
@@ -1359,6 +1402,15 @@ LocalClientCred(ClientPtr client, int *pUid, int *pGid)
     if (pGid != NULL)
 	    *pGid = gid;
     return 0;
+#elif defined(HAS_GETPEERUCRED)
+    if (getpeerucred(fd, &peercred) < 0)
+    	return -1;
+    if (pUid != NULL)
+	*pUid = ucred_geteuid(peercred);
+    if (pGid != NULL)
+	*pGid = ucred_getegid(peercred);
+    ucred_free(peercred);
+    return 0;
 #elif defined(SO_PEERCRED)
     if (getsockopt(fd, SOL_SOCKET, SO_PEERCRED, &peercred, &so_len) == -1) 
 	    return -1;
@@ -1417,6 +1469,7 @@ AddHost (ClientPtr	client,
 #endif
     case FamilyDECnet:
     case FamilyChaos:
+    case FamilyServerInterpreted:
 	if ((len = CheckAddr (family, pAddr, length)) < 0)
 	{
 	    client->errorValue = length;
@@ -1518,6 +1571,7 @@ RemoveHost (
 #endif
     case FamilyDECnet:
     case FamilyChaos:
+    case FamilyServerInterpreted:
     	if ((len = CheckAddr (family, pAddr, length)) < 0)
     	{
 	    client->errorValue = length;
@@ -1629,6 +1683,9 @@ CheckAddr (
 	}
         break;
 #endif
+      case FamilyServerInterpreted:
+	len = siCheckAddr(pAddr, length);
+	break;
       default:
         len = -1;
     }
@@ -1641,7 +1698,8 @@ CheckAddr (
 int
 InvalidHost (
     register struct sockaddr	*saddr,
-    int				len)
+    int				len,
+    ClientPtr			client)
 {
     int 			family;
     pointer			addr;
@@ -1675,8 +1733,15 @@ InvalidHost (
     }
     for (host = validhosts; host; host = host->next)
     {
-        if (addrEqual (family, addr, len, host))
-    	    return (0);
+	if ((host->family == FamilyServerInterpreted)) {
+	    if (siAddrMatch (family, addr, len, host, client)) {
+		return (0);
+	    }
+	} else {
+	    if (addrEqual (family, addr, len, host))
+		return (0);
+	}
+
     }
     return (1);
 }
@@ -1755,3 +1820,381 @@ GetAccessControl(void)
 {
     return AccessEnabled;
 }
+
+/*****************************************************************************
+ * FamilyServerInterpreted host entry implementation
+ *
+ * Supports an extensible system of host types which the server can interpret
+ * See the IPv6 extensions to the X11 protocol spec for the definition.
+ *
+ * Currently supported schemes:
+ *
+ * hostname	- hostname as defined in IETF RFC 2396
+ * ipv6		- IPv6 literal address as defined in IETF RFC's 3513 and <TBD>
+ *
+ * See xc/doc/specs/SIAddresses for formal definitions of each type.
+ */
+
+/* These definitions and the siTypeAdd function could be exported in the 
+ * future to enable loading additional host types, but that was not done for
+ * the initial implementation.
+ */
+typedef Bool (*siAddrMatchFunc)(int family, pointer addr, int len, 
+  const char *siAddr, int siAddrlen, ClientPtr client, void *siTypePriv);
+typedef int  (*siCheckAddrFunc)(const char *addrString, int length, 
+  void *siTypePriv);
+
+struct siType {
+    struct siType *	next;
+    const char *	typeName;
+    siAddrMatchFunc	addrMatch;
+    siCheckAddrFunc	checkAddr;
+    void *		typePriv;	/* Private data for type routines */
+};
+
+static struct siType *siTypeList;
+
+static int
+siTypeAdd(const char *typeName, siAddrMatchFunc addrMatch,
+  siCheckAddrFunc checkAddr, void *typePriv)
+{
+    struct siType *s, *p;
+
+    if ((typeName == NULL) || (addrMatch == NULL) || (checkAddr == NULL))
+	return BadValue;
+
+    for (s = siTypeList, p = NULL; s != NULL ; p = s, s = s->next) {
+	if (strcmp(typeName, s->typeName) == 0) {
+	    s->addrMatch = addrMatch;
+	    s->checkAddr = checkAddr;
+	    s->typePriv = typePriv;
+	    return Success;
+	}
+    }
+
+    s = (struct siType *) xalloc(sizeof(struct siType));
+    if (s == NULL)
+	return BadAlloc;
+
+    if (p == NULL)
+	siTypeList = s;
+    else
+	p->next = s;
+
+    s->next = NULL;
+    s->typeName = typeName;
+    s->addrMatch = addrMatch;
+    s->checkAddr = checkAddr;
+    s->typePriv = typePriv;
+    return Success;
+}
+
+/* Checks to see if a host matches a server-interpreted host entry */
+static Bool 
+siAddrMatch(int family, pointer addr, int len, HOST *host, ClientPtr client)
+{
+    Bool matches = FALSE;
+    struct siType *s;
+    const char *valueString;
+    int addrlen;
+
+    valueString = (const char *) memchr(host->addr, '\0', host->len);
+    if (valueString != NULL) {
+	for (s = siTypeList; s != NULL ; s = s->next) {
+	    if (strcmp((char *) host->addr, s->typeName) == 0) {
+		addrlen = host->len - (strlen((char *)host->addr) + 1);
+		matches = s->addrMatch(family, addr, len, 
+		  valueString + 1, addrlen, client, s->typePriv);
+		break;
+	    }
+	}
+#ifdef FAMILY_SI_DEBUG
+	ErrorF(
+	    "Xserver: siAddrMatch(): type = %s, value = %*.*s -- %s\n",
+	      host->addr, addrlen, addrlen, valueString + 1,
+	      (matches) ? "accepted" : "rejected");
+#endif
+    }
+    return matches;
+}
+
+static int
+siCheckAddr(const char *addrString, int length)
+{
+    const char *valueString;
+    int addrlen, typelen;
+    int len = -1;
+    struct siType *s;
+
+    /* Make sure there is a \0 byte inside the specified length
+       to separate the address type from the address value. */
+    valueString = (const char *) memchr(addrString, '\0', length);
+    if (valueString != NULL) {
+	/* Make sure the first string is a recognized address type,
+	 * and the second string is a valid address of that type. 
+	 */
+	typelen = strlen(addrString) + 1;
+	addrlen = length - typelen;
+
+	for (s = siTypeList; s != NULL ; s = s->next) {
+	    if (strcmp(addrString, s->typeName) == 0) {
+		len = s->checkAddr(valueString + 1, addrlen, s->typePriv);
+		if (len >= 0) {
+		    len += typelen;
+		}
+		break;
+	    }
+	}
+#ifdef FAMILY_SI_DEBUG
+	{
+	    const char *resultMsg;
+
+	    if (s == NULL) {
+		resultMsg = "type not registered";
+	    } else {
+		if (len == -1) 
+		    resultMsg = "rejected";
+		else
+		    resultMsg = "accepted";
+	    }
+
+	    ErrorF("Xserver: siCheckAddr(): type = %s, value = %*.*s, len = %d -- %s\n",
+	      addrString, addrlen, addrlen, valueString + 1, len, resultMsg);
+	}
+#endif
+    }
+    return len;
+}
+
+
+/***
+ * Hostname server-interpreted host type
+ *
+ * Stored as hostname string, explicitly defined to be resolved ONLY
+ * at access check time, to allow for hosts with dynamic addresses
+ * but static hostnames, such as found in some DHCP & mobile setups.
+ *
+ * Hostname must conform to IETF RFC 2396 sec. 3.2.2, which defines it as:
+ * 	hostname     = *( domainlabel "." ) toplabel [ "." ]
+ *	domainlabel  = alphanum | alphanum *( alphanum | "-" ) alphanum
+ *	toplabel     = alpha | alpha *( alphanum | "-" ) alphanum
+ */
+
+#ifdef NI_MAXHOST
+# define SI_HOSTNAME_MAXLEN NI_MAXHOST
+#else
+# ifdef MAXHOSTNAMELEN
+#  define SI_HOSTNAME_MAXLEN MAXHOSTNAMELEN
+# else
+#  define SI_HOSTNAME_MAXLEN 256
+# endif
+#endif
+
+static Bool 
+siHostnameAddrMatch(int family, pointer addr, int len,
+  const char *siAddr, int siAddrLen, ClientPtr client, void *typePriv)
+{
+    Bool res = FALSE;
+
+/* Currently only supports checking against IPv4 & IPv6 connections, but 
+ * support for other address families, such as DECnet, could be added if 
+ * desired.
+ */
+#if defined(IPv6) && defined(AF_INET6)
+    if ((family == FamilyInternet) || (family == FamilyInternet6)) {
+	char hostname[SI_HOSTNAME_MAXLEN];
+	struct addrinfo *addresses;
+	struct addrinfo *a;
+	int f, hostaddrlen;
+	pointer hostaddr;
+
+	if (siAddrLen >= sizeof(hostname)) 
+	    return FALSE;
+
+	strncpy(hostname, siAddr, siAddrLen);
+	hostname[siAddrLen] = '\0';
+
+	if (getaddrinfo(hostname, NULL, NULL, &addresses) == 0) {
+	    for (a = addresses ; a != NULL ; a = a->ai_next) {
+		hostaddrlen = a->ai_addrlen;
+		f = ConvertAddr(a->ai_addr,&hostaddrlen,&hostaddr);
+		if ((f == family) && (len == hostaddrlen) &&
+		  (acmp (addr, hostaddr, len) == 0) ) {
+		    res = TRUE;
+		    break;
+		}
+	    }
+	    freeaddrinfo(addresses);
+	}
+    }
+#else /* IPv6 not supported, use gethostbyname instead for IPv4 */
+    if (family == FamilyInternet) {
+	register struct hostent *hp;
+#ifdef XTHREADS_NEEDS_BYNAMEPARAMS
+	_Xgethostbynameparams hparams;
+#endif
+	char hostname[SI_HOSTNAME_MAXLEN];
+	int f, hostaddrlen;
+	pointer hostaddr;
+	const char **addrlist;
+
+	if (siAddrLen >= sizeof(hostname)) 
+	    return FALSE;
+
+	strncpy(hostname, siAddr, siAddrLen);
+	hostname[siAddrLen] = '\0';
+
+	if ((hp = _XGethostbyname(hostname, hparams)) != NULL) {
+#ifdef h_addr				/* new 4.3bsd version of gethostent */
+	    /* iterate over the addresses */
+	    for (addrlist = hp->h_addr_list; *addrlist; addrlist++)
+#else
+	    addrlist = &hp->h_addr;
+#endif
+	    {
+		struct  sockaddr_in  sin;
+
+    		sin.sin_family = hp->h_addrtype;
+		acopy ( *addrlist, &(sin.sin_addr), hp->h_length);
+		hostaddrlen = sizeof(sin);
+    		f = ConvertAddr ((struct sockaddr *)&sin, 
+		  &hostaddrlen, &hostaddr);
+		if ((f == family) && (len == hostaddrlen) &&
+		  (acmp (addr, hostaddr, len) == 0) ) {
+		    res = TRUE;
+		    break;
+		}
+    	    }
+        }
+    }
+#endif
+    return res;
+}
+
+
+static int
+siHostnameCheckAddr(const char *valueString, int length, void *typePriv)
+{
+    /* Check conformance of hostname to RFC 2396 sec. 3.2.2 definition.
+     * We do not use ctype functions here to avoid locale-specific
+     * character sets.  Hostnames must be pure ASCII.  
+     */
+    int len = length;
+    int i;
+    Bool dotAllowed = FALSE;
+    Bool dashAllowed = FALSE;
+		    
+    if ((length <= 0) || (length >= SI_HOSTNAME_MAXLEN)) {
+	len = -1;
+    } else {
+	for (i = 0; i < length; i++) {
+	    char c = valueString[i];
+
+	    if (c == 0x2E) { /* '.' */
+		if (dotAllowed == FALSE) {
+		    len = -1;
+		    break;
+		} else {
+		    dotAllowed = FALSE;
+		    dashAllowed = FALSE;
+		}
+	    } else if (c == 0x2D) { /* '-' */
+		if (dashAllowed == FALSE) {
+		    len = -1;
+		    break;
+		} else {
+		    dotAllowed = FALSE;
+		}
+	    } else if (((c >= 0x30) && (c <= 0x3A)) /* 0-9 */ ||
+		       ((c >= 0x61) && (c <= 0x7A)) /* a-z */ ||
+		       ((c >= 0x41) && (c <= 0x5A)) /* A-Z */) {
+		dotAllowed = TRUE;
+		dashAllowed = TRUE;
+	    } else { /* Invalid character */
+		len = -1;
+		break;
+	    }
+	}
+    }
+    return len;
+}
+
+#if defined(IPv6) && defined(AF_INET6)
+/***
+ * "ipv6" server interpreted type
+ *
+ * Currently supports only IPv6 literal address as specified in IETF RFC 3513
+ *
+ * Once draft-ietf-ipv6-scoping-arch-00.txt becomes an RFC, support will be 
+ * added for the scoped address format it specifies.
+ */
+
+/* Maximum length of an IPv6 address string - increase when adding support 
+ * for scoped address qualifiers.  Includes room for trailing NUL byte. 
+ */
+#define SI_IPv6_MAXLEN INET6_ADDRSTRLEN
+
+static Bool 
+siIPv6AddrMatch(int family, pointer addr, int len,
+  const char *siAddr, int siAddrlen, ClientPtr client, void *typePriv)
+{
+    struct in6_addr addr6;
+    char addrbuf[SI_IPv6_MAXLEN];
+
+    if ((family != FamilyInternet6) || (len != sizeof(addr6)))
+	return FALSE;
+
+    memcpy(addrbuf, siAddr, siAddrlen);
+    addrbuf[siAddrlen] = '\0';
+
+    if (inet_pton(AF_INET6, addrbuf, &addr6) != 1) {
+	perror("inet_pton");
+	return FALSE;
+    }
+
+    if (memcmp(addr, &addr6, len) == 0) {
+	return TRUE;
+    } else {
+	return FALSE;
+    }
+}
+
+static int
+siIPv6CheckAddr(const char *addrString, int length, void *typePriv)
+{
+    int len;
+
+    /* Minimum length is 3 (smallest legal address is "::1") */
+    if (length < 3) {
+	/* Address is too short! */
+	len = -1;
+    } else if (length >= SI_IPv6_MAXLEN) {
+	/* Address is too long! */
+	len = -1;
+    } else {
+	/* Assume inet_pton is sufficient validation */
+	struct in6_addr addr6;
+	char addrbuf[SI_IPv6_MAXLEN];
+
+	memcpy(addrbuf, addrString, length);
+	addrbuf[length] = '\0';
+
+	if (inet_pton(AF_INET6, addrbuf, &addr6) != 1) {
+	    perror("inet_pton");
+	    len = -1;
+	} else {
+	    len = length;
+	}
+    }
+    return len;
+}
+#endif /* IPv6 */
+
+static void
+siTypesInitialize(void)
+{
+    siTypeAdd("hostname", siHostnameAddrMatch, siHostnameCheckAddr, NULL);
+#if defined(IPv6) && defined(AF_INET6)
+    siTypeAdd("ipv6", siIPv6AddrMatch, siIPv6CheckAddr, NULL);
+#endif
+}
diff --git a/os/auth.c b/os/auth.c
index a1cbc8c1f..40f34ffff 100644
--- a/os/auth.c
+++ b/os/auth.c
@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/programs/Xserver/os/auth.c,v 1.14 2003/08/27 19:57:21 herrb Exp $ */
+/* $XFree86: auth.c,v 1.13 2003/04/27 21:31:08 herrb Exp $ */
 
 /*
  * authorization hooks for the server
diff --git a/os/connection.c b/os/connection.c
index 7465e7eff..930d38528 100644
--- a/os/connection.c
+++ b/os/connection.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/programs/Xserver/os/connection.c,v 3.65 2003/10/30 21:21:10 herrb Exp $ */
+/* $XFree86: xc/programs/Xserver/os/connection.c,v 3.64 2003/10/07 22:50:42 herrb Exp $ */
 /*****************************************************************
  *  Stuff to create connections --- OS dependent
  *
@@ -661,7 +661,7 @@ ClientAuthorized(ClientPtr client,
 #ifdef LBX
 		!trans_conn ||
 #endif
-		InvalidHost ((struct sockaddr *) from, fromlen))
+		InvalidHost ((struct sockaddr *) from, fromlen, client))
 		AuthAudit(client, FALSE, (struct sockaddr *) from,
 			  fromlen, proto_n, auth_proto, auth_id);
 	    else
diff --git a/os/io.c b/os/io.c
index cf8a0343e..956a53300 100644
--- a/os/io.c
+++ b/os/io.c
@@ -53,7 +53,7 @@ SOFTWARE.
  *   InsertFakeRequest, ResetCurrentRequest
  *
  *****************************************************************/
-/* $XFree86: xc/programs/Xserver/os/io.c,v 3.35 2003/04/27 21:31:08 herrb Exp $ */
+/* $XFree86: xc/programs/Xserver/os/io.c,v 3.34 2002/05/31 18:46:05 dawes Exp $ */
 
 #if 0
 #define DEBUG_COMMUNICATION
diff --git a/os/k5auth.c b/os/k5auth.c
index 8c59fe8ab..3726df6ba 100644
--- a/os/k5auth.c
+++ b/os/k5auth.c
@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/programs/Xserver/os/k5auth.c,v 3.5 2001/12/14 20:00:34 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/os/k5auth.c,v 3.4 2001/01/17 22:37:10 dawes Exp $ */
 
 /*
  * Kerberos V5 authentication scheme
diff --git a/os/lbxio.c b/os/lbxio.c
index ae4d4355f..ba79040b5 100644
--- a/os/lbxio.c
+++ b/os/lbxio.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/os/lbxio.c,v 3.18 2003/04/27 21:31:09 herrb Exp $ */
+/* $XFree86: xc/programs/Xserver/os/lbxio.c,v 3.17 2002/05/31 18:46:06 dawes Exp $ */
 /*
 
 Copyright 1996, 1998  The Open Group
diff --git a/os/mitauth.c b/os/mitauth.c
index bddbdf1d6..97f88b232 100644
--- a/os/mitauth.c
+++ b/os/mitauth.c
@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/programs/Xserver/os/mitauth.c,v 1.5 2001/12/14 20:00:34 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/os/mitauth.c,v 1.4 2001/01/17 22:37:11 dawes Exp $ */
 
 /*
  * MIT-MAGIC-COOKIE-1 authorization scheme
diff --git a/os/oscolor.c b/os/oscolor.c
index f6e941fb8..557d539bb 100644
--- a/os/oscolor.c
+++ b/os/oscolor.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/os/oscolor.c,v 3.11 2003/09/24 02:43:36 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/os/oscolor.c,v 3.10 2003/07/16 01:39:03 dawes Exp $ */
 /***********************************************************
 
 Copyright 1987, 1998  The Open Group
diff --git a/os/osdep.h b/os/osdep.h
index a5392ffc3..2b9eb5674 100644
--- a/os/osdep.h
+++ b/os/osdep.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/os/osdep.h,v 3.18 2003/04/27 21:31:09 herrb Exp $ */
+/* $XFree86: xc/programs/Xserver/os/osdep.h,v 3.17 2002/05/31 18:46:06 dawes Exp $ */
 /***********************************************************
 
 Copyright 1987, 1998  The Open Group
diff --git a/os/osinit.c b/os/osinit.c
index 1c56d0af7..1a5ff0501 100644
--- a/os/osinit.c
+++ b/os/osinit.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/os/osinit.c,v 3.30 2003/10/29 04:17:22 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/os/osinit.c,v 3.29 2003/09/09 03:20:41 dawes Exp $ */
 /***********************************************************
 
 Copyright 1987, 1998  The Open Group
diff --git a/os/rpcauth.c b/os/rpcauth.c
index 512b3ecb5..f0693f599 100644
--- a/os/rpcauth.c
+++ b/os/rpcauth.c
@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/programs/Xserver/os/rpcauth.c,v 3.8 2003/04/27 21:31:09 herrb Exp $ */
+/* $XFree86: xc/programs/Xserver/os/rpcauth.c,v 3.7 2001/12/14 20:00:35 dawes Exp $ */
 
 /*
  * SUN-DES-1 authentication mechanism
diff --git a/os/secauth.c b/os/secauth.c
index 4f90fe9a9..8c30eaafb 100644
--- a/os/secauth.c
+++ b/os/secauth.c
@@ -24,7 +24,7 @@ not be used in advertising or otherwise to promote the sale, use or
 other dealings in this Software without prior written authorization
 from The Open Group.
 */
-/* $XFree86: xc/programs/Xserver/os/secauth.c,v 1.11 2001/12/14 20:00:35 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/os/secauth.c,v 1.10 2001/08/01 00:44:59 tsi Exp $ */
 
 #include "X.h"
 #include "os.h"
diff --git a/os/utils.c b/os/utils.c
index 924d97471..51931ae4c 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -1,3 +1,4 @@
+/* $XdotOrg: xc/programs/Xserver/os/utils.c,v 1.1.4.6.2.4.6.3 2004/04/20 03:27:09 gisburn Exp $ */
 /* $Xorg: utils.c,v 1.5 2001/02/09 02:05:24 xorgcvs Exp $ */
 /*
 
@@ -49,7 +50,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE
 OR PERFORMANCE OF THIS SOFTWARE.
 
 */
-/* $XFree86: xc/programs/Xserver/os/utils.c,v 3.97 2004/01/09 00:35:06 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/os/utils.c,v 3.96 2004/01/07 04:16:37 dawes Exp $ */
 
 #ifdef __CYGWIN__
 #include <stdlib.h>
@@ -167,7 +168,7 @@ int userdefinedfontpath = 0;
 
 char *dev_tty_from_init = NULL;		/* since we need to parse it anyway */
 
-extern int dispatchExceptionAtReset;
+extern char dispatchExceptionAtReset;
 
 OsSigHandlerPtr
 OsSignal(sig, handler)
@@ -575,6 +576,17 @@ VerifyDisplayName(const char *d)
 }
 
 /*
+ * This function is responsible for doing initalisation of any global
+ * variables at an very early point of server startup (even before
+ * |ProcessCommandLine()|. 
+ */
+void InitGlobals(void)
+{
+    ddxInitGlobals();
+}
+
+
+/*
  * This function parses the command line. Handles device-independent fields
  * and allows ddx to handle additional fields.  It is not allowed to modify
  * argc or any of the strings pointed to by argv.
@@ -607,7 +619,7 @@ ProcessCommandLine(int argc, char *argv[])
             if( ! VerifyDisplayName( display ) ) {
                 ErrorF("Bad display name: %s\n", display);
                 UseMsg();
-                exit(1);
+		FatalError("Bad display name, exiting: %s\n", display);
             }
 	}
 	else if ( strcmp( argv[i], "-a") == 0)
@@ -985,7 +997,7 @@ ProcessCommandLine(int argc, char *argv[])
  	{
 	    ErrorF("Unrecognized option: %s\n", argv[i]);
 	    UseMsg();
-	    exit (1);
+	    FatalError("Unrecognized option: %s\n", argv[i]);
         }
     }
 }
@@ -1848,13 +1860,13 @@ enum BadCode {
 #define ARGMSG \
     "\nIf the arguments used are valid, and have been rejected incorrectly\n" \
       "please send details of the arguments and why they are valid to\n" \
-      "XFree86@XFree86.org.  In the meantime, you can start the Xserver as\n" \
+      "&&&&&@X.org.  In the meantime, you can start the Xserver as\n" \
       "the \"super user\" (root).\n"   
 
 #define ENVMSG \
     "\nIf the environment is valid, and have been rejected incorrectly\n" \
       "please send details of the environment and why it is valid to\n" \
-      "XFree86@XFree86.org.  In the meantime, you can start the Xserver as\n" \
+      "&&&&&@X.org.  In the meantime, you can start the Xserver as\n" \
       "the \"super user\" (root).\n"
 
 void
diff --git a/os/xalloc.c b/os/xalloc.c
index 8bb46e2c9..5677896dc 100644
--- a/os/xalloc.c
+++ b/os/xalloc.c
@@ -26,7 +26,7 @@ dealings in this Software without prior written authorization from
 Pascal Haible.
 */
 
-/* $XFree86: xc/programs/Xserver/os/xalloc.c,v 3.36 2003/11/03 05:12:00 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/os/xalloc.c,v 3.35tsi Exp $ */
 
 /* Only used if INTERNAL_MALLOC is defined
  * - otherwise xalloc() in utils.c is used
@@ -184,7 +184,7 @@ extern Bool Must_have_memory;
     defined(__ia64__) || defined(ia64) || \
     defined(__sparc64__) || \
     defined(__s390x__) || \
-    defined(__AMD64__) || defined(AMD64) || \
+    defined(__amd64__) || defined(amd64) || \
     (defined(sgi) && _MIPS_SZLONG == 64))
 #define MAGIC			0x1404196414071968
 #define MAGIC_FREE              0x1506196615061966
diff --git a/os/xdmauth.c b/os/xdmauth.c
index 13695c13c..4ec7265dd 100644
--- a/os/xdmauth.c
+++ b/os/xdmauth.c
@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/programs/Xserver/os/xdmauth.c,v 1.9 2003/06/24 15:44:48 eich Exp $ */
+/* $XFree86: xdmauth.c,v 1.7 2002/11/05 05:50:34 keithp Exp $ */
 
 /*
  * XDM-AUTHENTICATION-1 (XDMCP authentication) and
diff --git a/os/xdmcp.c b/os/xdmcp.c
index cbd43f45b..9489afc44 100644
--- a/os/xdmcp.c
+++ b/os/xdmcp.c
@@ -1,3 +1,4 @@
+/* $XdotOrg: xc/programs/Xserver/os/xdmcp.c,v 1.1.4.5 2004/02/23 21:37:27 kaleb Exp $ */
 /* $Xorg: xdmcp.c,v 1.4 2001/01/31 13:37:19 pookie Exp $ */
 /*
  * Copyright 1989 Network Computing Devices, Inc., Mountain View, California.
@@ -13,7 +14,7 @@
  * without express or implied warranty.
  *
  */
-/* $XFree86: xc/programs/Xserver/os/xdmcp.c,v 3.32 2004/01/01 17:09:29 herrb Exp $ */
+/* $XFree86: xc/programs/Xserver/os/xdmcp.c,v 3.31 2003/12/30 21:24:32 herrb Exp $ */
 
 #ifdef WIN32
 /* avoid conflicting definitions */
@@ -279,8 +280,7 @@ XdmcpOptions(int argc, char **argv, int i)
     }
     if (strcmp(argv[i], "-port") == 0) {
         if (++i == argc)  {
-	    ErrorF("Xserver: missing port number in command line\n");
-	    exit(1);
+	    FatalError("Xserver: missing port number in command line\n");
 	}
 	xdm_udp_port = (unsigned short) atoi(argv[i]);
 	return (i + 1);
@@ -295,8 +295,7 @@ XdmcpOptions(int argc, char **argv, int i)
     }
     if (strcmp(argv[i], "-class") == 0) {
         if (++i == argc)  {
-	    ErrorF("Xserver: missing class name in command line\n");
-	    exit(1);
+	    FatalError("Xserver: missing class name in command line\n");
 	}
 	defaultDisplayClass = argv[i];
 	return (i + 1);
@@ -304,8 +303,7 @@ XdmcpOptions(int argc, char **argv, int i)
 #ifdef HASXDMAUTH
     if (strcmp(argv[i], "-cookie") == 0) {
         if (++i == argc)  {
-	    ErrorF("Xserver: missing cookie data in command line\n");
-	    exit(1);
+	    FatalError("Xserver: missing cookie data in command line\n");
 	}
 	xdmAuthCookie = argv[i];
 	return (i + 1);
@@ -313,8 +311,7 @@ XdmcpOptions(int argc, char **argv, int i)
 #endif
     if (strcmp(argv[i], "-displayID") == 0) {
         if (++i == argc)  {
-	    ErrorF("Xserver: missing displayID in command line\n");
-	    exit(1);
+	    FatalError("Xserver: missing displayID in command line\n");
 	}
 	XdmcpRegisterManufacturerDisplayID (argv[i], strlen (argv[i]));
 	return (i + 1);
@@ -1061,8 +1058,7 @@ get_xdmcp_sock(void)
     if (xdmcpSocket >= 0 && xdm_from != NULL) {
 	if (bind(xdmcpSocket, (struct sockaddr *)&FromAddress, 
 		 FromAddressLen) < 0) {
-	    ErrorF("Xserver: failed to bind to -from address: %s\n", xdm_from);
-	    exit(1);
+	    FatalError("Xserver: failed to bind to -from address: %s\n", xdm_from);
 	}
     }
 #endif /* STREAMSCONN */
@@ -1523,8 +1519,7 @@ get_addr_by_name(
     } else if (port > 0 && port < 65535) {
 	sprintf(portstr, "%d", port);
     } else {
-	ErrorF("Xserver: port out of range: %d\n", port);
-	exit(1);
+	FatalError("Xserver: port out of range: %d\n", port);
     }
 
     if (*aifirstp != NULL) {
@@ -1538,17 +1533,15 @@ get_addr_by_name(
 		break;
 	}
 	if ((ai == NULL) || (ai->ai_addrlen > sizeof(SOCKADDR_TYPE))) {
-	    ErrorF ("Xserver: %s host %s not on supported network type\n", 
+	    FatalError ("Xserver: %s host %s not on supported network type\n", 
 	      argtype, namestr);
-	    exit (1);
 	} else {
 	    *aip = ai;
 	    *addrlen = ai->ai_addrlen;
 	    memcpy(addr, ai->ai_addr, ai->ai_addrlen);
 	}
     } else {
-	ErrorF("Xserver: %s: %s %s\n", gai_strerror(gaierr), argtype, namestr);
-	exit(1);
+	FatalError("Xserver: %s: %s %s\n", gai_strerror(gaierr), argtype, namestr);
     }    
 #else
     struct hostent *hep;
@@ -1558,8 +1551,7 @@ get_addr_by_name(
 
     if (!(hep = _XGethostbyname(namestr, hparams)))
     {
-	ErrorF("Xserver: %s unknown host: %s\n", argtype, namestr);
-	exit(1);
+	FatalError("Xserver: %s unknown host: %s\n", argtype, namestr);
     }
     if (hep->h_length == sizeof (struct in_addr))
     {
@@ -1570,8 +1562,7 @@ get_addr_by_name(
     }
     else
     {
-	ErrorF ("Xserver: %s host on strange network %s\n", argtype, namestr);
-	exit (1);
+	FatalError("Xserver: %s host on strange network %s\n", argtype, namestr);
     }
 #endif
 }
@@ -1585,8 +1576,7 @@ get_manager_by_name(
 
     if ((i + 1) == argc)
     {
-	ErrorF("Xserver: missing %s host name in command line\n", argv[i]);
-	exit(1);
+	FatalError("Xserver: missing %s host name in command line\n", argv[i]);
     }
 
     get_addr_by_name(argv[i], argv[i+1], xdm_udp_port, SOCK_DGRAM, 
@@ -1610,8 +1600,7 @@ get_fromaddr_by_name(
 #endif
     if (i == argc)
     {
-	ErrorF("Xserver: missing -from host name in command line\n");
-	exit(1);
+	FatalError("Xserver: missing -from host name in command line\n");
     }
     get_addr_by_name("-from", argv[i], 0, 0, &FromAddress, &FromAddressLen
 #if defined(IPv6) && defined(AF_INET6)
@@ -1640,9 +1629,8 @@ get_mcast_options(argc, argv, i)
 	if ((i < argc) && (argv[i][0] != '-') && (argv[i][0] != '+')) {
 	    hopcount = strtol(argv[i++], NULL, 10);
 	    if ((hopcount < 1) || (hopcount > 255)) {
-		ErrorF("Xserver: multicast hop count out of range: %d\n",
+		FatalError("Xserver: multicast hop count out of range: %d\n",
 		  hopcount);
-		exit(1);
 	    }
 	}
     }
@@ -1650,8 +1638,7 @@ get_mcast_options(argc, argv, i)
     if (xdm_udp_port > 0 && xdm_udp_port < 65535) {
 	sprintf(portstr, "%d", xdm_udp_port);
     } else {
-	ErrorF("Xserver: port out of range: %d\n", xdm_udp_port);
-	exit(1);
+	FatalError("Xserver: port out of range: %d\n", xdm_udp_port);
     }
     bzero(&hints, sizeof(hints));
     hints.ai_socktype = SOCK_DGRAM;
@@ -1667,9 +1654,8 @@ get_mcast_options(argc, argv, i)
 		break;
 	}
 	if (ai == NULL) {
-	    ErrorF ("Xserver: address not supported multicast type %s\n", 
+	    FatalError ("Xserver: address not supported multicast type %s\n", 
 	      address);
-	    exit (1);
 	} else {
 	    struct multicastinfo	*mcastinfo, *mcl;
 	    
@@ -1688,8 +1674,7 @@ get_mcast_options(argc, argv, i)
 	    }
 	}
     } else {
-	ErrorF("Xserver: %s: %s\n", gai_strerror(gaierr), address);
-	exit(1);
+	FatalError("Xserver: %s: %s\n", gai_strerror(gaierr), address);
     }    
     return i;
 }
diff --git a/randr/mirandr.c b/randr/mirandr.c
index b45a1f9a8..1dc173a96 100644
--- a/randr/mirandr.c
+++ b/randr/mirandr.c
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/programs/Xserver/randr/mirandr.c,v 1.7 2002/10/14 18:01:42 keithp Exp $
+ * $XFree86: xc/programs/Xserver/randr/mirandr.c,v 1.5 2001/06/04 09:45:40 keithp Exp $
  *
  * Copyright © 2000, Compaq Computer Corporation, 
  * Copyright © 2002, Hewlett Packard, Inc.
diff --git a/randr/randr.c b/randr/randr.c
index c0a8c4bf8..b253ddbab 100644
--- a/randr/randr.c
+++ b/randr/randr.c
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/programs/Xserver/randr/randr.c,v 1.22 2003/11/06 18:38:15 tsi Exp $
+ * $XFree86: xc/programs/Xserver/randr/randr.c,v 1.21tsi Exp $
  *
  * Copyright © 2000, Compaq Computer Corporation, 
  * Copyright © 2002, Hewlett Packard, Inc.
diff --git a/randr/randrstr.h b/randr/randrstr.h
index d966cd5b7..48213185c 100644
--- a/randr/randrstr.h
+++ b/randr/randrstr.h
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/programs/Xserver/randr/randrstr.h,v 1.7 2002/10/14 18:01:42 keithp Exp $
+ * $XFree86: xc/programs/Xserver/randr/randrstr.h,v 1.5 2002/09/29 23:39:45 keithp Exp $
  *
  * Copyright © 2000 Compaq Computer Corporation
  *
diff --git a/record/record.c b/record/record.c
index 3657ef42b..e4d4dc5d8 100644
--- a/record/record.c
+++ b/record/record.c
@@ -1,3 +1,4 @@
+/* $XdotOrg$ */
 /* $Xorg: record.c,v 1.4 2001/02/09 02:05:27 xorgcvs Exp $ */
 
 /*
@@ -32,7 +33,7 @@ This work benefited from earlier work done by Martha Zimet of NCD
 and Jim Haggerty of Metheus.
 
 */
-/* $XFree86: xc/programs/Xserver/record/record.c,v 1.12 2003/11/17 22:20:44 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/record/record.c,v 1.11 2003/11/03 05:12:01 tsi Exp $ */
 
 #define NEED_EVENTS
 #include "dixstruct.h"
diff --git a/record/set.c b/record/set.c
index 847a1b28d..341516664 100644
--- a/record/set.c
+++ b/record/set.c
@@ -27,7 +27,7 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/programs/Xserver/record/set.c,v 1.8 2003/11/17 22:20:44 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/record/set.c,v 1.7 2001/12/14 20:00:37 dawes Exp $ */
 
 /*
 
diff --git a/record/set.h b/record/set.h
index 169077720..6f0b872a1 100644
--- a/record/set.h
+++ b/record/set.h
@@ -27,7 +27,7 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/programs/Xserver/record/set.h,v 1.3 2003/11/17 22:20:44 dawes Exp $ */
+/* $XFree86$ */
 
 /*
 	  A Set Abstract Data Type (ADT) for the RECORD Extension
diff --git a/render/animcur.c b/render/animcur.c
index fcf6a25a7..b00cdf682 100644
--- a/render/animcur.c
+++ b/render/animcur.c
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/programs/Xserver/render/animcur.c,v 1.6 2003/11/03 05:12:01 tsi Exp $
+ * $XFree86: xc/programs/Xserver/render/animcur.c,v 1.5tsi Exp $
  *
  * Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc.
  *
diff --git a/render/filter.c b/render/filter.c
index a2f7563cb..4435197e2 100644
--- a/render/filter.c
+++ b/render/filter.c
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/programs/Xserver/render/filter.c,v 1.1 2002/09/26 02:56:52 keithp Exp $
+ * $XFree86$
  *
  * Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc.
  *
diff --git a/render/glyph.c b/render/glyph.c
index b4f08c223..5dd700581 100644
--- a/render/glyph.c
+++ b/render/glyph.c
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/programs/Xserver/render/glyph.c,v 1.6 2001/10/28 03:34:19 tsi Exp $
+ * $XFree86: xc/programs/Xserver/render/glyph.c,v 1.5 2001/01/30 07:01:22 keithp Exp $
  *
  * Copyright © 2000 SuSE, Inc.
  *
diff --git a/render/glyphstr.h b/render/glyphstr.h
index 99f55e3eb..68d6f2085 100644
--- a/render/glyphstr.h
+++ b/render/glyphstr.h
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/programs/Xserver/render/glyphstr.h,v 1.4 2001/01/21 21:19:39 tsi Exp $
+ * $XFree86: xc/programs/Xserver/render/glyphstr.h,v 1.3 2000/11/20 07:13:13 keithp Exp $
  *
  * Copyright © 2000 SuSE, Inc.
  *
diff --git a/render/miglyph.c b/render/miglyph.c
index 00b6764d6..8d0c2079b 100644
--- a/render/miglyph.c
+++ b/render/miglyph.c
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/programs/Xserver/render/miglyph.c,v 1.6 2000/12/05 03:13:31 keithp Exp $
+ * $XFree86: xc/programs/Xserver/render/miglyph.c,v 1.4 2000/11/20 07:13:13 keithp Exp $
  *
  * Copyright © 2000 SuSE, Inc.
  *
diff --git a/render/miindex.c b/render/miindex.c
index 739348273..aff610940 100644
--- a/render/miindex.c
+++ b/render/miindex.c
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/programs/Xserver/render/miindex.c,v 1.8 2002/11/06 22:45:36 keithp Exp $
+ * $XFree86: xc/programs/Xserver/render/miindex.c,v 1.7 2002/11/05 06:05:04 keithp Exp $
  *
  * Copyright © 2001 Keith Packard, member of The XFree86 Project, Inc.
  *
diff --git a/render/mipict.c b/render/mipict.c
index 0f0cf6c8b..ed97acc7b 100644
--- a/render/mipict.c
+++ b/render/mipict.c
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/programs/Xserver/render/mipict.c,v 1.16 2003/11/10 18:22:52 tsi Exp $
+ * $XFree86: xc/programs/Xserver/render/mipict.c,v 1.15tsi Exp $
  *
  * Copyright © 1999 Keith Packard
  *
diff --git a/render/mipict.h b/render/mipict.h
index 0154fb5f0..4af4c56be 100644
--- a/render/mipict.h
+++ b/render/mipict.h
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/programs/Xserver/render/mipict.h,v 1.13 2002/11/06 22:45:36 keithp Exp $
+ * $XFree86: xc/programs/Xserver/render/mipict.h,v 1.12 2002/11/05 05:34:40 keithp Exp $
  *
  * Copyright © 2000 SuSE, Inc.
  *
diff --git a/render/mirect.c b/render/mirect.c
index 33c7a9f14..63e9c7cc4 100644
--- a/render/mirect.c
+++ b/render/mirect.c
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/programs/Xserver/render/mirect.c,v 1.4 2001/06/08 19:36:34 keithp Exp $
+ * $XFree86: xc/programs/Xserver/render/mirect.c,v 1.3 2000/12/08 07:52:05 keithp Exp $
  *
  * Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc.
  *
diff --git a/render/mitrap.c b/render/mitrap.c
index 7f592ccd4..05db36ec8 100644
--- a/render/mitrap.c
+++ b/render/mitrap.c
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/programs/Xserver/render/mitrap.c,v 1.9 2002/11/05 23:39:16 keithp Exp $
+ * $XFree86: xc/programs/Xserver/render/mitrap.c,v 1.8 2002/09/03 19:28:28 keithp Exp $
  *
  * Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc.
  *
diff --git a/render/mitri.c b/render/mitri.c
index fc706f117..b0526256d 100644
--- a/render/mitri.c
+++ b/render/mitri.c
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/programs/Xserver/render/mitri.c,v 1.6 2002/08/12 04:03:21 keithp Exp $
+ * $XFree86: xc/programs/Xserver/render/mitri.c,v 1.5 2002/05/31 16:48:52 keithp Exp $
  *
  * Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc.
  *
diff --git a/render/picture.c b/render/picture.c
index b2ef69bdf..ad746b277 100644
--- a/render/picture.c
+++ b/render/picture.c
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/programs/Xserver/render/picture.c,v 1.30 2003/01/26 16:40:43 eich Exp $
+ * $XFree86: xc/programs/Xserver/render/picture.c,v 1.29 2002/11/23 02:38:15 keithp Exp $
  *
  * Copyright © 2000 SuSE, Inc.
  *
diff --git a/render/picture.h b/render/picture.h
index c47d51941..b4e3bd27c 100644
--- a/render/picture.h
+++ b/render/picture.h
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/programs/Xserver/render/picture.h,v 1.21 2003/11/03 05:12:01 tsi Exp $
+ * $XFree86: xc/programs/Xserver/render/picture.h,v 1.20tsi Exp $
  *
  * Copyright © 2000 SuSE, Inc.
  *
@@ -170,7 +170,7 @@ typedef __int64		xFixed_32_32;
       defined(ia64) || defined(__ia64__) || \
       defined(__sparc64__) || \
       defined(__s390x__) || \
-      defined(AMD64) || defined (__AMD64__) || \
+      defined(amd64) || defined (__amd64__) || \
       (defined(sgi) && (_MIPS_SZLONG == 64))
 typedef long		xFixed_32_32;
 # else
diff --git a/render/picturestr.h b/render/picturestr.h
index cb5ea0ac9..04b6a3d78 100644
--- a/render/picturestr.h
+++ b/render/picturestr.h
@@ -1,5 +1,6 @@
+/* $XdotOrg$ */
 /*
- * $XFree86: xc/programs/Xserver/render/picturestr.h,v 1.22 2002/11/23 02:38:15 keithp Exp $
+ * $XFree86: xc/programs/Xserver/render/picturestr.h,v 1.21 2002/11/06 22:45:36 keithp Exp $
  *
  * Copyright © 2000 SuSE, Inc.
  *
diff --git a/render/render.c b/render/render.c
index 0d89885c3..e35c52542 100644
--- a/render/render.c
+++ b/render/render.c
@@ -1,5 +1,6 @@
+/* $XdotOrg$ */
 /*
- * $XFree86: xc/programs/Xserver/render/render.c,v 1.28 2003/11/03 05:12:02 tsi Exp $
+ * $XFree86: xc/programs/Xserver/render/render.c,v 1.27tsi Exp $
  *
  * Copyright © 2000 SuSE, Inc.
  *
@@ -1122,8 +1123,10 @@ ProcRenderAddGlyphs (ClientPtr client)
 	goto bail;
     }
     glyphs = glyphsBase;
-    while (nglyphs--)
+    while (nglyphs--) {
 	AddGlyph (glyphSet, glyphs->glyph, glyphs->id);
+	glyphs++;
+    }
 
     if (glyphsBase != glyphsLocal)
 	DEALLOCATE_LOCAL (glyphsBase);
diff --git a/xkb/ddxBeep.c b/xkb/ddxBeep.c
index bb02619f3..6eee7e097 100644
--- a/xkb/ddxBeep.c
+++ b/xkb/ddxBeep.c
@@ -24,7 +24,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
 THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/programs/Xserver/xkb/ddxBeep.c,v 3.10 2003/11/17 22:20:44 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/xkb/ddxBeep.c,v 3.9 2002/12/05 21:59:00 paulo Exp $ */
 
 #include <stdio.h>
 #define	NEED_EVENTS 1
diff --git a/xkb/ddxConfig.c b/xkb/ddxConfig.c
index 2485488d2..c4a6ec7a0 100644
--- a/xkb/ddxConfig.c
+++ b/xkb/ddxConfig.c
@@ -24,7 +24,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
 THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/programs/Xserver/xkb/ddxConfig.c,v 3.9 2003/11/17 22:20:45 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/xkb/ddxConfig.c,v 3.8 2002/12/20 20:18:35 paulo Exp $ */
 
 #include <stdio.h>
 #define	NEED_EVENTS 1
diff --git a/xkb/ddxCtrls.c b/xkb/ddxCtrls.c
index c7c8f18b8..16c9f15b9 100644
--- a/xkb/ddxCtrls.c
+++ b/xkb/ddxCtrls.c
@@ -24,7 +24,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
 THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/programs/Xserver/xkb/ddxCtrls.c,v 1.4 2003/11/17 22:20:45 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/xkb/ddxCtrls.c,v 1.3 2001/01/17 22:37:14 dawes Exp $ */
 
 #include <stdio.h>
 #define	NEED_EVENTS 1
diff --git a/xkb/ddxDevBtn.c b/xkb/ddxDevBtn.c
index 5f5ebc9b4..0ce401adb 100644
--- a/xkb/ddxDevBtn.c
+++ b/xkb/ddxDevBtn.c
@@ -24,7 +24,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
 THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/programs/Xserver/xkb/ddxDevBtn.c,v 3.4 2003/11/17 22:20:45 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/xkb/ddxDevBtn.c,v 3.3 2001/08/23 21:49:51 tsi Exp $ */
 
 #include <stdio.h>
 #define	NEED_EVENTS 1
diff --git a/xkb/ddxFakeBtn.c b/xkb/ddxFakeBtn.c
index 9f54cae6f..033aa18ea 100644
--- a/xkb/ddxFakeBtn.c
+++ b/xkb/ddxFakeBtn.c
@@ -24,7 +24,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
 THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/programs/Xserver/xkb/ddxFakeBtn.c,v 1.2 2003/11/17 22:20:45 dawes Exp $ */
+/* $XFree86$ */
 
 #include <stdio.h>
 #define	NEED_EVENTS 1
diff --git a/xkb/ddxFakeMtn.c b/xkb/ddxFakeMtn.c
index 289fa3bfb..70f37d130 100644
--- a/xkb/ddxFakeMtn.c
+++ b/xkb/ddxFakeMtn.c
@@ -1,3 +1,4 @@
+/* $XdotOrg$ */
 /* $Xorg: ddxFakeMtn.c,v 1.3 2000/08/17 19:53:45 cpqbld Exp $ */
 /************************************************************
 Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc.
@@ -24,7 +25,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
 THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/programs/Xserver/xkb/ddxFakeMtn.c,v 1.6 2003/11/17 22:20:45 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/xkb/ddxFakeMtn.c,v 1.5 2003/09/13 16:39:01 dawes Exp $ */
 
 #include <stdio.h>
 #define	NEED_EVENTS 1
diff --git a/xkb/ddxInit.c b/xkb/ddxInit.c
index a8c436ea2..dea4ce607 100644
--- a/xkb/ddxInit.c
+++ b/xkb/ddxInit.c
@@ -24,7 +24,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
 THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/programs/Xserver/xkb/ddxInit.c,v 1.2 2003/11/17 22:20:45 dawes Exp $ */
+/* $XFree86$ */
 
 #include <stdio.h>
 #define	NEED_EVENTS 1
diff --git a/xkb/ddxKeyClick.c b/xkb/ddxKeyClick.c
index afd028fcd..c0b2b8018 100644
--- a/xkb/ddxKeyClick.c
+++ b/xkb/ddxKeyClick.c
@@ -24,7 +24,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
 THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/programs/Xserver/xkb/ddxKeyClick.c,v 1.2 2003/11/17 22:20:45 dawes Exp $ */
+/* $XFree86$ */
 
 #include <stdio.h>
 #define	NEED_EVENTS 1
diff --git a/xkb/ddxKillSrv.c b/xkb/ddxKillSrv.c
index 9ac7d3300..98744ed97 100644
--- a/xkb/ddxKillSrv.c
+++ b/xkb/ddxKillSrv.c
@@ -24,7 +24,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
 THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/programs/Xserver/xkb/ddxKillSrv.c,v 1.4 2003/11/17 22:20:45 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/xkb/ddxKillSrv.c,v 1.3 2002/11/23 19:27:50 tsi Exp $ */
 
 #include <stdio.h>
 #define	NEED_EVENTS 1
diff --git a/xkb/ddxLEDs.c b/xkb/ddxLEDs.c
index ab757c6fc..e7c484cab 100644
--- a/xkb/ddxLEDs.c
+++ b/xkb/ddxLEDs.c
@@ -24,7 +24,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
 THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/programs/Xserver/xkb/ddxLEDs.c,v 1.2 2003/11/17 22:20:45 dawes Exp $ */
+/* $XFree86$ */
 
 #include <stdio.h>
 #define	NEED_EVENTS 1
diff --git a/xkb/ddxList.c b/xkb/ddxList.c
index 5101de53b..30510ffaa 100644
--- a/xkb/ddxList.c
+++ b/xkb/ddxList.c
@@ -24,7 +24,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
 THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/programs/Xserver/xkb/ddxList.c,v 3.9 2003/11/17 22:20:45 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/xkb/ddxList.c,v 3.8 2003/07/16 01:39:05 dawes Exp $ */
 
 #include <stdio.h>
 #include <ctype.h>
diff --git a/xkb/ddxLoad.c b/xkb/ddxLoad.c
index 9f7704c5a..ed61becb0 100644
--- a/xkb/ddxLoad.c
+++ b/xkb/ddxLoad.c
@@ -24,7 +24,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
 THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/programs/Xserver/xkb/ddxLoad.c,v 3.36 2003/11/17 22:20:45 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/xkb/ddxLoad.c,v 3.35 2003/10/02 13:30:12 eich Exp $ */
 
 #include <stdio.h>
 #include <ctype.h>
diff --git a/xkb/ddxPrivate.c b/xkb/ddxPrivate.c
index dd7ef4630..852e2386f 100644
--- a/xkb/ddxPrivate.c
+++ b/xkb/ddxPrivate.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/xkb/ddxPrivate.c,v 1.3 2003/11/17 22:20:45 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/xkb/ddxPrivate.c,v 1.2 2003/04/03 16:20:22 dawes Exp $ */
 
 #include <stdio.h>
 #define NEED_EVENTS 1
diff --git a/xkb/ddxVT.c b/xkb/ddxVT.c
index ec43f79db..bbd0d1ac1 100644
--- a/xkb/ddxVT.c
+++ b/xkb/ddxVT.c
@@ -24,7 +24,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
 THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/programs/Xserver/xkb/ddxVT.c,v 1.4 2003/11/17 22:20:45 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/xkb/ddxVT.c,v 1.3 2002/11/23 19:27:50 tsi Exp $ */
 
 #include <stdio.h>
 #define	NEED_EVENTS 1
diff --git a/xkb/xkb.c b/xkb/xkb.c
index f43fb285f..fcc156d35 100644
--- a/xkb/xkb.c
+++ b/xkb/xkb.c
@@ -24,7 +24,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
 THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/programs/Xserver/xkb/xkb.c,v 3.23 2003/12/22 17:48:11 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/xkb/xkb.c,v 3.22tsi Exp $ */
 
 #include <stdio.h>
 #include "X.h"
diff --git a/xkb/xkb.h b/xkb/xkb.h
index 4eeb781db..704cd49c0 100644
--- a/xkb/xkb.h
+++ b/xkb/xkb.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/xkb/xkb.h,v 1.1 2003/07/16 01:39:08 dawes Exp $ */
+/* $XFree86$ */
 
 /* #include "XKBfile.h" */
 
diff --git a/xkb/xkbAccessX.c b/xkb/xkbAccessX.c
index 096ebe2e4..5794e34ba 100644
--- a/xkb/xkbAccessX.c
+++ b/xkb/xkbAccessX.c
@@ -24,7 +24,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
 THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/programs/Xserver/xkb/xkbAccessX.c,v 1.10 2003/11/17 22:20:46 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/xkb/xkbAccessX.c,v 1.9 2001/08/23 14:33:25 alanh Exp $ */
 
 #include <stdio.h>
 #include <math.h>
diff --git a/xkb/xkbActions.c b/xkb/xkbActions.c
index 403c2fb89..0239c678a 100644
--- a/xkb/xkbActions.c
+++ b/xkb/xkbActions.c
@@ -24,7 +24,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
 THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/programs/Xserver/xkb/xkbActions.c,v 3.14 2003/11/17 22:20:46 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/xkb/xkbActions.c,v 3.13 2003/07/16 01:39:08 dawes Exp $ */
 
 #include <stdio.h>
 #include <math.h>
diff --git a/xkb/xkbDflts.h b/xkb/xkbDflts.h
index 910616e60..7ea30bde2 100644
--- a/xkb/xkbDflts.h
+++ b/xkb/xkbDflts.h
@@ -1,5 +1,5 @@
 /* $Xorg: xkbDflts.h,v 1.3 2000/08/17 19:53:47 cpqbld Exp $ */
-/* $XFree86: xc/programs/Xserver/xkb/xkbDflts.h,v 1.3 2003/11/17 22:20:46 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/xkb/xkbDflts.h,v 1.2 2001/10/28 03:34:20 tsi Exp $ */
 /* This file generated automatically by xkbcomp */
 /* DO  NOT EDIT */
 #ifndef DEFAULT_H
diff --git a/xkb/xkbEvents.c b/xkb/xkbEvents.c
index 0cd1becac..7d2421a87 100644
--- a/xkb/xkbEvents.c
+++ b/xkb/xkbEvents.c
@@ -24,7 +24,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
 THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/programs/Xserver/xkb/xkbEvents.c,v 3.12 2003/11/17 22:20:46 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/xkb/xkbEvents.c,v 3.11 2003/07/16 01:39:10 dawes Exp $ */
 
 #include <stdio.h>
 #define NEED_EVENTS 1
diff --git a/xkb/xkbInit.c b/xkb/xkbInit.c
index 6ed146494..260446eb8 100644
--- a/xkb/xkbInit.c
+++ b/xkb/xkbInit.c
@@ -1,4 +1,5 @@
 /* $Xorg: xkbInit.c,v 1.3 2000/08/17 19:53:47 cpqbld Exp $ */
+/* $XdotOrg$ */
 /************************************************************
 Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc.
 
@@ -24,7 +25,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
 THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/programs/Xserver/xkb/xkbInit.c,v 3.33 2003/12/22 17:48:12 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/xkb/xkbInit.c,v 3.32tsi Exp $ */
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -188,6 +189,9 @@ char *			pval;
     if (XkbRulesFile) {
 	strcpy(&pval[out],XkbRulesFile);
 	out+= strlen(XkbRulesFile);
+    } else {
+	strcpy(&pval[out],XKB_DFLT_RULES_FILE);
+	out+= strlen(XKB_DFLT_RULES_FILE);
     }
     pval[out++]= '\0';
     if (XkbModelUsed) {
diff --git a/xkb/xkbLEDs.c b/xkb/xkbLEDs.c
index f75db6918..26e6d87d3 100644
--- a/xkb/xkbLEDs.c
+++ b/xkb/xkbLEDs.c
@@ -24,7 +24,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
 THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/programs/Xserver/xkb/xkbLEDs.c,v 3.8 2003/11/17 22:20:46 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/xkb/xkbLEDs.c,v 3.7 2003/07/16 01:39:10 dawes Exp $ */
 
 #include <stdio.h>
 #include <ctype.h>
diff --git a/xkb/xkbPrKeyEv.c b/xkb/xkbPrKeyEv.c
index 3a9fc11f8..43288d3e9 100644
--- a/xkb/xkbPrKeyEv.c
+++ b/xkb/xkbPrKeyEv.c
@@ -24,7 +24,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
 THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/programs/Xserver/xkb/xkbPrKeyEv.c,v 3.9 2003/11/17 22:20:46 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/xkb/xkbPrKeyEv.c,v 3.8 2001/01/17 22:37:15 dawes Exp $ */
 
 #include <stdio.h>
 #include <math.h>
diff --git a/xkb/xkbPrOtherEv.c b/xkb/xkbPrOtherEv.c
index 0a077f4c1..ec155645f 100644
--- a/xkb/xkbPrOtherEv.c
+++ b/xkb/xkbPrOtherEv.c
@@ -24,7 +24,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
 THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/programs/Xserver/xkb/xkbPrOtherEv.c,v 1.2 2003/11/17 22:20:46 dawes Exp $ */
+/* $XFree86$ */
 
 #include <stdio.h>
 #include <math.h>
diff --git a/xkb/xkbSwap.c b/xkb/xkbSwap.c
index 6f4ffe8a9..4b6ba4ccc 100644
--- a/xkb/xkbSwap.c
+++ b/xkb/xkbSwap.c
@@ -24,7 +24,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
 THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/programs/Xserver/xkb/xkbSwap.c,v 3.5 2003/11/17 22:20:46 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/xkb/xkbSwap.c,v 3.4 2003/09/13 16:39:01 dawes Exp $ */
 
 #include "stdio.h"
 #include "X.h"
diff --git a/xkb/xkbUtils.c b/xkb/xkbUtils.c
index f3ba6bc17..8b439c2a5 100644
--- a/xkb/xkbUtils.c
+++ b/xkb/xkbUtils.c
@@ -24,7 +24,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
 THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/programs/Xserver/xkb/xkbUtils.c,v 3.17 2003/11/17 22:20:46 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/xkb/xkbUtils.c,v 3.16 2003/11/03 05:12:02 tsi Exp $ */
 
 #include <stdio.h>
 #include <ctype.h>