XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folksxf86-4_3_99_16

13 files changed, 144 insertions, 60 deletions

diff --git a/hw/xfree86/utils/xorgcfg/card-cfg.c b/hw/xfree86/utils/xorgcfg/card-cfg.c
index a96797f1c..5299025f1 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.11 2001/11/01 19:08:58 paulo Exp $
+ * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/card-cfg.c,v 1.12 2003/11/03 05:11:58 tsi Exp $
  */
 
 #include "xf86config.h"
@@ -368,7 +368,7 @@ CardModel(XF86SetupInfo *info)
     static Widget model;
 
     if (first) {
-	Widget label, viewport;
+	Widget viewport;
 
 	first = 0;
 
@@ -376,7 +376,7 @@ CardModel(XF86SetupInfo *info)
 
 	model = XtCreateWidget("cardModel", formWidgetClass,
 			       configp, NULL, 0);
-	label = XtCreateManagedWidget("label", labelWidgetClass,
+	(void) XtCreateManagedWidget("label", labelWidgetClass,
 				      model, NULL, 0);
 	filter = XtVaCreateManagedWidget("filter", asciiTextWidgetClass,
 					 model,
diff --git a/hw/xfree86/utils/xorgcfg/config.c b/hw/xfree86/utils/xorgcfg/config.c
index 929999f9e..8c2da3d9b 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.8 2002/10/21 04:18:36 paulo Exp $
+ * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/config.c,v 1.9 2003/11/03 05:11:58 tsi Exp $
  */
 
 #include "config.h"
@@ -106,7 +106,7 @@ void
 StartConfig(void)
 {
     static int first = 1;
-    Widget pane, top, label, bottom, cancel;
+    Widget pane, top, bottom, cancel;
     const char *filename;
 
     if (!first)
@@ -144,7 +144,7 @@ StartConfig(void)
 				 shell, NULL, 0);
     top = XtCreateManagedWidget("top", formWidgetClass,
 				pane, NULL, 0);
-    label = XtCreateManagedWidget("label", labelWidgetClass,
+    (void) XtCreateManagedWidget("label", labelWidgetClass,
 				  top, NULL, 0);
     ident_widget = XtVaCreateManagedWidget("identifier", asciiTextWidgetClass,
 					   top,
@@ -199,11 +199,11 @@ ConfigError(void)
     static int first = 1;
 
     if (first) {
-	Widget label, command;
+	Widget command;
 
 	errcurrent = XtCreateWidget("error", formWidgetClass,
 			 	     configp, NULL, 0);
-	label = XtCreateManagedWidget("label", labelWidgetClass,
+	(void) XtCreateManagedWidget("label", labelWidgetClass,
 				      errcurrent, NULL, 0);
 	command = XtCreateManagedWidget("command", commandWidgetClass,
 					errcurrent, NULL, 0);
diff --git a/hw/xfree86/utils/xorgcfg/config.h b/hw/xfree86/utils/xorgcfg/config.h
index 34b8d7e52..6d1193a3d 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.16 2002/05/31 18:46:03 dawes Exp $
+ * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/config.h,v 1.17 2003/06/10 17:03:55 dawes Exp $
  */
 
 #include <X11/IntrinsicP.h>
@@ -97,6 +97,7 @@
 #define CONFIG_ACCESSX	3
 extern int config_mode;
 
+#ifndef __UNIXOS2__
 #define CONFPATH	"%A," "%R," \
 			"/etc/X11/%R," "%P/etc/X11/%R," \
 			"%E," "%F," \
@@ -113,6 +114,26 @@ extern int config_mode;
 			"%P/etc/X11/%X," \
 			"%P/lib/X11/%X.%H," "%P/lib/X11/%X-%M," \
 			"%P/lib/X11/%X"
+#else
+#define CONFPATH	"%&"XF86CONFIGDIR"/%R," "%&"XF86CONFIGDIR"/%X," \
+			"%A," "%R," \
+			"/etc/X11/%R," "%P/etc/X11/%R," \
+			"%E," "%F," \
+			"/etc/X11/%F," "%P/etc/X11/%F," \
+			"%D/%X," \
+			"/etc/X11/%X-%M," "/etc/X11/%X," "/etc/%X," \
+			"%P/etc/X11/%X.%H," "%P/etc/X11/%X-%M," \
+			"%P/etc/X11/%X," \
+			"%P/lib/X11/%X.%H," "%P/lib/X11/%X-%M," \
+			"%P/lib/X11/%X"
+#define USER_CONFPATH	"%&"XF86CONFIGDIR"/%X," "%&"XF86CONFIGDIR"/%X," \
+			"/etc/X11/%S," "%P/etc/X11/%S," \
+                        "/etc/X11/%G," "%P/etc/X11/%G," \
+			"%P/etc/X11/%X.%H," "%P/etc/X11/%X-%M," \
+			"%P/etc/X11/%X," \
+			"%P/lib/X11/%X.%H," "%P/lib/X11/%X-%M," \
+			"%P/lib/X11/%X"
+#endif
 
 /*
  * Types
diff --git a/hw/xfree86/utils/xorgcfg/expert.c b/hw/xfree86/utils/xorgcfg/expert.c
index b9890b32b..a3dfcbe2d 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.14 2003/02/07 05:46:53 paulo Exp $
+ * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/expert.c,v 1.15 2003/11/03 05:11:58 tsi Exp $
  */
 
 #include "config.h"
@@ -498,12 +498,12 @@ CreateFiles(TreeNode *files)
 static void
 CreateFilesField(TreeNode *node, char *name, char *value)
 {
-    Widget box, label, text;
+    Widget box, text;
 
     box = XtVaCreateManagedWidget(name, boxWidgetClass, tree,
 				  XtNtreeParent, node->node, NULL, 0);
     node->node = box;
-    label = XtVaCreateManagedWidget("label", labelWidgetClass, box,
+    (void) XtVaCreateManagedWidget("label", labelWidgetClass, box,
 				    XtNlabel, name, NULL, 0);
     text = XtVaCreateManagedWidget("value", asciiTextWidgetClass, box,
 				   XtNeditType, XawtextEdit, XtNstring, value,
@@ -542,7 +542,6 @@ static void
 CreateFontPath(TreeNode *fontpath, char *path)
 {
     TreeNode *prev = NULL, *node;
-    Widget w;
 
     if (path == NULL) {
 	if (XF86Font_path) {
@@ -568,7 +567,7 @@ CreateFontPath(TreeNode *fontpath, char *path)
 	for (s = strtok(path, ","); s != NULL; s = strtok(NULL, ",")) {
 	    node = NewNode(fontpath, NULL, NULL, fontpath->node, NULL);
 	    node->destroy = FontPathChanged;
-	    w = CreateFontPathField(node, s, False);
+	    (void) CreateFontPathField(node, s, False);
 	    if (fontpath->child == NULL)
 		fontpath->child = node;
 	    else
@@ -579,7 +578,7 @@ CreateFontPath(TreeNode *fontpath, char *path)
     }
 
     node = NewNode(fontpath, NULL, NULL, fontpath->node, NULL);
-    w = CreateFontPathField(node, "", True);
+    (void) CreateFontPathField(node, "", True);
     if (fontpath->child == NULL)
 	fontpath->child = node;
     else
@@ -719,7 +718,6 @@ static void
 CreateModulePath(TreeNode *modulepath, char *path)
 {
     TreeNode *prev = NULL, *node;
-    Widget w;
 
     if (path == NULL) {
 	if (XF86Module_path) {
@@ -745,7 +743,7 @@ CreateModulePath(TreeNode *modulepath, char *path)
 	for (s = strtok(path, ","); s != NULL; s = strtok(NULL, ",")) {
 	    node = NewNode(modulepath, NULL, NULL, modulepath->node, NULL);
 	    node->destroy = ModulePathChanged;
-	    w = CreateModulePathField(node, s, False);
+	    (void) CreateModulePathField(node, s, False);
 	    if (modulepath->child == NULL)
 		modulepath->child = node;
 	    else
@@ -756,7 +754,7 @@ CreateModulePath(TreeNode *modulepath, char *path)
     }
 
     node = NewNode(modulepath, NULL, NULL, modulepath->node, NULL);
-    w = CreateModulePathField(node, "", True);
+    (void) CreateModulePathField(node, "", True);
     if (modulepath->child == NULL)
 	modulepath->child = node;
     else
@@ -2130,7 +2128,7 @@ CreateMonitorModes(TreeNode *parent, XF86ConfModesLinkPtr lnk)
 static void
 CreateMonitorModesField(TreeNode *node, Bool addnew)
 {
-    Widget box, command, label;
+    Widget box, command;
 
     box = XtVaCreateWidget("modes", formWidgetClass, tree,
 			   XtNtreeParent, node->treeParent, NULL, 0);
@@ -2142,7 +2140,7 @@ CreateMonitorModesField(TreeNode *node, Bool addnew)
 	command = XtCreateManagedWidget("remove", commandWidgetClass, box,
 					NULL, 0);
 	XtAddCallback(command, XtNcallback, DestroyCallback, (XtPointer)node);
-	label = XtVaCreateManagedWidget("mode", labelWidgetClass, box,
+	(void) XtVaCreateManagedWidget("mode", labelWidgetClass, box,
 					XtNlabel, lnk->ml_modes_str, NULL, 0);
     }
     else {
@@ -2983,7 +2981,7 @@ CreateScreenAdaptor(TreeNode *parent, XF86ConfAdaptorLinkPtr lnk)
 static void
 CreateScreenAdaptorField(TreeNode *node, Bool addnew)
 {
-    Widget box, command, label;
+    Widget box, command;
 
     box = XtVaCreateWidget("adaptor", formWidgetClass, tree,
 			   XtNtreeParent, node->treeParent, NULL, 0);
@@ -2995,7 +2993,7 @@ CreateScreenAdaptorField(TreeNode *node, Bool addnew)
 	command = XtCreateManagedWidget("remove", commandWidgetClass, box,
 					NULL, 0);
 	XtAddCallback(command, XtNcallback, DestroyCallback, (XtPointer)node);
-	label = XtVaCreateManagedWidget("label", labelWidgetClass, box,
+	(void) XtVaCreateManagedWidget("label", labelWidgetClass, box,
 					XtNlabel, lnk->al_adaptor_str, NULL, 0);
     }
     else {
@@ -3756,7 +3754,7 @@ CreateAdjacency(TreeNode *parent, XF86ConfAdjacencyPtr adj)
 static void
 CreateAdjacencyField(TreeNode *node, Bool addnew)
 {
-    Widget box, command, label, sme;
+    Widget box, command, sme;
     XF86ConfScreenPtr ptr = XF86Config->conf_screen_lst;
 
     box = XtVaCreateWidget("adjacency", formWidgetClass, tree,
@@ -3786,7 +3784,7 @@ CreateAdjacencyField(TreeNode *node, Bool addnew)
 	command = XtCreateManagedWidget("remove", commandWidgetClass, box,
 					NULL, 0);
 	XtAddCallback(command, XtNcallback, DestroyCallback, (XtPointer)node);
-	label = XtVaCreateManagedWidget("label", labelWidgetClass, box,
+	(void) XtVaCreateManagedWidget("label", labelWidgetClass, box,
 					XtNlabel, adj->adj_screen->scrn_identifier,
 					NULL, 0);
 
diff --git a/hw/xfree86/utils/xorgcfg/help.c b/hw/xfree86/utils/xorgcfg/help.c
index 2b25e8ede..2ae68a082 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.7 2002/06/06 21:03:32 paulo Exp $
+ * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/help.c,v 1.8 2003/11/03 05:11:58 tsi Exp $
  */
 
 #include <X11/IntrinsicP.h>
@@ -205,11 +205,11 @@ typedef struct _Html_Item Html_Item;
 
 typedef struct _Html_TagInfo {
     char *name;
-    int entity	: 1;	/* it changes the type of the text */
-    int nest	: 1;	/* does not close tags automatically */
-    int end	: 1;	/* need a close markup */
-    int adnl	: 1;	/* add newline before/after tag contents */
-    int para	: 1;	/* changes the paragraph formatting */
+    unsigned int entity	: 1;	/* it changes the type of the text */
+    unsigned int nest	: 1;	/* does not close tags automatically */
+    unsigned int end	: 1;	/* need a close markup */
+    unsigned int adnl	: 1;	/* add newline before/after tag contents */
+    unsigned int para	: 1;	/* changes the paragraph formatting */
     unsigned long mask;	/* enforce use of attributes of this tag-info */
     unsigned long xlfd_mask;
     void (*parse_args)(Html_Parser*, Html_Item*);
diff --git a/hw/xfree86/utils/xorgcfg/loadmod.c b/hw/xfree86/utils/xorgcfg/loadmod.c
index a53bffa01..e3f4e9f47 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.14.2.1 2003/03/13 04:10:50 tsi Exp $
+ * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/loadmod.c,v 1.18 2003/06/12 14:12:38 eich Exp $
  */
 
 #ifdef USE_MODULES
@@ -67,6 +67,7 @@ Bool xf86LoaderCheckSymbol(const char*);
 void xf86LoaderRefSymLists(const char **, ...);
 void xf86LoaderReqSymLists(const char **, ...);
 void xf86Msg(int, const char*, ...);
+void xf86MsgVerb(int, int, const char*, ...);
 void xf86PrintChipsets(const char*, const char*, SymTabPtr);
 void xf86ErrorFVerb(int verb, const char *format, ...);
 pciVideoPtr *xf86GetPciVideoInfo(void);
@@ -77,6 +78,7 @@ void *xf86LoadDrvSubModule(DriverPtr drv, const char*);
 void xf86DrvMsg(int, int, const char*, ...);
 pciConfigPtr *xf86GetPciConfigInfo(void);
 Bool xf86IsPrimaryPci(pcVideoPtr*);
+Bool xf86CheckPciSlot(int bus, int device, int func);
 #endif
 
 extern char *loaderPath, **loaderList, **ploaderList;
@@ -180,7 +182,7 @@ LOOKUP xfree86LookupTab[] = {
    SYMFUNC(xf86memchr)
    SYMFUNC(xf86memcmp)
    SYMFUNC(xf86memcpy)
-#if (defined(__powerpc__) && (defined(Lynx) || defined(linux))) || defined(__sparc__) || defined(__ia64__) || defined (__x86_64__)
+#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
@@ -301,6 +303,7 @@ LOOKUP xfree86LookupTab[] = {
     SYMFUNC(xf86LoaderRefSymLists)
     SYMFUNC(xf86LoaderReqSymLists)
     SYMFUNC(xf86Msg)
+    SYMFUNC(xf86MsgVerb)
     SYMFUNC(ErrorF)
     SYMFUNC(xf86PrintChipsets)
     SYMFUNC(xf86ErrorFVerb)
@@ -313,6 +316,10 @@ LOOKUP xfree86LookupTab[] = {
     SYMFUNC(xf86DrvMsg)
     SYMFUNC(xf86GetPciConfigInfo)
     SYMFUNC(xf86IsPrimaryPci)
+    SYMFUNC(xf86CheckPciSlot)
+    SYMFUNC(XNFalloc)
+    SYMFUNC(XNFrealloc)
+    SYMFUNC(XNFcalloc)
     {0,0}
 };
 
@@ -502,9 +509,20 @@ xf86cfgCheckModule(void)
     numFontModules = 0;
     fonts = FontModuleList;
     if (fonts) {
+	Bool dup = FALSE;
 	while (fonts->name) {
-	    if (strcmp(fonts->name, *ploaderList) == 0)
+	    if (strcasecmp(fonts->name, *ploaderList) == 0) {
 		pfont_module = fonts;
+		/* HACK:
+		 * fonts->names points into modules.
+		 * Duplicate string of all remaining names to survive
+		 * unloading. Since new fonts are appended to list
+		 * this will only happen once per renderer.
+		 */
+		dup = TRUE;
+	    }
+	    if (dup)
+		fonts->name = strdup(fonts->name);
 	    ++numFontModules;
 	    ++fonts;
 	}
@@ -655,4 +673,10 @@ xf86IsPrimaryPci(pciVideoPtr pPci)
 {
     return (True);
 }
+
+Bool 
+xf86CheckPciSlot(int bus, int device, int func)
+{
+    return (False);
+}
 #endif
diff --git a/hw/xfree86/utils/xorgcfg/monitor-cfg.c b/hw/xfree86/utils/xorgcfg/monitor-cfg.c
index 430833381..6ed095416 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.7 2001/03/24 01:17:20 paulo Exp $
+ * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/monitor-cfg.c,v 1.8 2003/09/11 10:08:38 eich Exp $
  */
 
 #include "xf86config.h"
@@ -69,6 +69,10 @@ static char *hmodes[] = {
     "Monitor that can do 1280x1024 @ 60 Hz",
     "Monitor that can do 1280x1024 @ 74 Hz",
     "Monitor that can do 1280x1024 @ 76 Hz",
+    "Monitor that can do 1280x1024 @ 85 Hz",
+    "Monitor that can do 1600x1200 @ 85 Hz",
+    "Monitor that can do 1920x1440 @ 85 Hz",
+    "Monitor that can do 2048x1536 @ 85 Hz"
 };
 
 static char *hmodes_trans[] = {
@@ -82,6 +86,10 @@ static char *hmodes_trans[] = {
     "31.5 - 64.3",
     "31.5 - 79.0",
     "31.5 - 82.0",
+    "31.5 - 92.0",
+    "31.5 - 108.0",
+    "31.5 - 128.5",
+    "31.5 - 137.0"
 };
 
 static char *vmodes [] = { "50 - 70", "50 - 90", "50 - 100", "40 - 150", };
diff --git a/hw/xfree86/utils/xorgcfg/mouse-cfg.c b/hw/xfree86/utils/xorgcfg/mouse-cfg.c
index 761da248a..17a1c0caf 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.10 2003/02/15 05:37:58 paulo Exp $
+ * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/mouse-cfg.c,v 1.12 2003/11/03 05:11:58 tsi Exp $
  */
 
 #include "xf86config.h"
@@ -55,6 +55,9 @@ static struct MouseProtocol {
     char *name;
     int type;
 } protocols[] = {
+#ifdef __UNIXOS2__
+    {"OS2Mouse",		MTYPE_AUTOMOUSE},
+#endif
 #ifdef SCO
     {"OsMouse",			MTYPE_AUTOMOUSE},
 #endif
@@ -322,7 +325,7 @@ MouseDeviceAndProtocol(XF86SetupInfo *info)
     int i;
 
     if (first) {
-	Widget label, viewport;
+	Widget viewport;
 	struct dirent *ent;
 	DIR *dir;
 	char **list;
@@ -359,7 +362,7 @@ MouseDeviceAndProtocol(XF86SetupInfo *info)
 	    }
 	}
 
-	label = XtCreateManagedWidget("labelD", labelWidgetClass,
+	(void) XtCreateManagedWidget("labelD", labelWidgetClass,
 				      mouse_dp, NULL, 0);
 	text = XtVaCreateManagedWidget("device", asciiTextWidgetClass,
 				       mouse_dp,
@@ -376,7 +379,7 @@ MouseDeviceAndProtocol(XF86SetupInfo *info)
 	XtAddCallback(listD, XtNcallback, MouseDeviceCallback, (XtPointer)text);
 
 	/* PROTOCOL */
-	label = XtCreateManagedWidget("labelP", labelWidgetClass,
+	(void) XtCreateManagedWidget("labelP", labelWidgetClass,
 				      mouse_dp, NULL, 0);
 	viewport = XtCreateManagedWidget("viewportP", viewportWidgetClass,
 					 mouse_dp, NULL, 0);
diff --git a/hw/xfree86/utils/xorgcfg/screen-cfg.c b/hw/xfree86/utils/xorgcfg/screen-cfg.c
index 5aa71188a..9390afc6d 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.12 2002/11/18 05:24:18 paulo Exp $
+ * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/screen-cfg.c,v 1.14 2003/11/03 05:11:58 tsi Exp $
  */
 
 #include "xf86config.h"
@@ -73,6 +73,8 @@ static char *standard_modes[] = {
     "1800x1400",
     "512x384",
     "1400x1050",
+    "2048x1536",
+    "1920x1440",
 };
 
 static char **modes;
@@ -519,6 +521,8 @@ ScreenDialog(XF86SetupInfo *info)
 	    XtMapWidget(ccw);
 	}
     }
+#else
+    (void)labelRotate;
 #endif
     if (rotate == CW) {
 	XtVaSetValues(cw, XtNstate, True, NULL, 0);
diff --git a/hw/xfree86/utils/xorgcfg/stubs.c b/hw/xfree86/utils/xorgcfg/stubs.c
index 5962908d1..6496bc868 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.3 2002/11/09 11:12:53 herrb Exp $
+ * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/stubs.c,v 1.4 2003/03/25 04:18:25 dawes Exp $
  */
 
 #include <stdio.h>
@@ -36,6 +36,11 @@
 /*
  * Implementation
  */
+
+#ifdef __UNIXOS2__
+static char dummy;
+#endif
+
 #if !defined(USE_MODULES)
 /* these are defined in libdummy.a */
 int
diff --git a/hw/xfree86/utils/xorgcfg/text-mode.c b/hw/xfree86/utils/xorgcfg/text-mode.c
index ef4da2877..2011d1abd 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.22 2003/02/16 05:23:45 paulo Exp $
+ * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/text-mode.c,v 1.26 2003/11/14 02:40:22 dawes Exp $
  */
 
 #include <stdio.h>
@@ -46,7 +46,15 @@
 #include "xf86config.h"
 #include "loader.h"
 
-#define XKB_RULES_DIR "/usr/X11R6/lib/X11/xkb/rules"
+#ifndef PROJECT_ROOT
+#define PROJECT_ROOT "/usr/X11R6"
+#endif
+
+#ifndef __UNIXOS2__
+#define XKB_RULES_DIR PROJECT_ROOT "/lib/X11/xkb/rules"
+#else
+#define XKB_RULES_DIR XF86CONFIGDIR "/xkb/rules"
+#endif
 
 #define CONTROL_A	1
 #define CONTROL_D	4
@@ -196,7 +204,11 @@ TextMode(void)
 		   "This program will create the XF86Config file, based on "
 		   "menu selections you make.\n"
 		   "\n"
+#ifndef __UNIXOS2__
 		   "The XF86Config file usually resides in /usr/X11R6/etc/X11 "
+#else
+		   "The XF86Config 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 "
 		   "monitor with 640x480 resolution. This program will ask for "
@@ -285,7 +297,11 @@ WriteXF86Config(void)
     refresh();
     xf86config = DialogInput("Write XF86Config", "Write configuration to file:",
 			     10, 60, XF86Config_path ? XF86Config_path :
+#ifndef __UNIXOS2__
 			     "/etc/X11/XF86Config", "  Ok  ", " Cancel ", 0);
+#else
+			     XF86CONFIGDIR"/XF86Config", "  Ok  ", " Cancel ", 0);
+#endif
 
     if (xf86config == NULL)
 	return (-1);
@@ -301,7 +317,7 @@ WriteXF86Config(void)
 		XtCalloc(1, sizeof(XF86ConfModuleRec));
 
 	    XF86Config->conf_modules->mod_comment =
-		XtNewString("\t# Load \"freetype\"\n"
+		XtNewString("\tLoad \"freetype\"\n"
 			    "\t# Load \"xtt\"\n");
 
 	    for (i = 0; i < sizeof(modules) / sizeof(modules[0]); i++) {
@@ -330,6 +346,9 @@ WriteXF86Config(void)
 }
 
 static char *protocols[] = {
+#ifdef __UNIXOS2__
+    "OS2Mouse",
+#endif
 #ifdef SCO
     "OsMouse",
 #endif
@@ -521,6 +540,8 @@ MouseConfig(void)
 	str = "/dev/wsmouse";
 #elif defined(__FreeBSD__)
 	str = "/dev/sysmouse";
+#elif defined(__UNIXOS2__)
+	str = "mouse$";
 #else
 	str = "/dev/mouse";
 #endif
@@ -805,6 +826,10 @@ static char *hsync[] = {
     "31.5 - 64.3; Monitor that can do 1280x1024 @ 60 Hz",
     "31.5 - 79.0; Monitor that can do 1280x1024 @ 74 Hz",
     "31.5 - 82.0; Monitor that can do 1280x1024 @ 76 Hz",
+    "31.5 - 92.0; Monitor that can do 1280x1024 @ 85 Hz",
+    "31.5 - 108.0; Monitor that can do 1600x1200 @ 85 Hz",
+    "31.5 - 128.5; Monitor that can do 1920x1440 @ 85 Hz",
+    "31.5 - 137.0; Monitor that can do 2048x1536 @ 85 Hz"
 };
 
 static char *vrefresh[] = {
@@ -1358,6 +1383,9 @@ static char *depths[] = {
 };
 
 static char *modes[] = {
+    "2048x1536",
+    "1920x1440",
+    "1800x1400",
     "1600x1200",
     "1400x1050",
     "1280x1024",
diff --git a/hw/xfree86/utils/xorgcfg/vidmode.c b/hw/xfree86/utils/xorgcfg/vidmode.c
index d28ac0899..3a51310d9 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.7 2001/07/07 23:00:43 paulo Exp $
+ * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/vidmode.c,v 1.8 2003/11/03 05:11:58 tsi Exp $
  */
 
 /*
@@ -130,11 +130,10 @@ static Bool autoflag;
 static xf86cfgVidmode *vidtune;
 static XF86VidModeModeLine modeline, orig_modeline;
 static int dot_clock, hsync_rate, vsync_rate, hitError;
-static Bool S3Specials;
-static int invert_vclk, blank1, blank2, early_sc, screenno;
+static int screenno;
 static int (*XtErrorFunc)(Display*, XErrorEvent*);
-static Widget labels[VSYNC + 1], values[VSYNC + 1], repeater, monitor,
-	      monitorb, add, text, vesab, vesap, forceshell, testshell, addshell;
+static Widget values[VSYNC + 1], repeater, monitor,
+	      monitorb, add, text, vesap, forceshell, testshell, addshell;
 static int MajorVersion, MinorVersion, EventBase, ErrorBase;
 static XtIntervalId timeout;
 
@@ -449,7 +448,7 @@ VideoModeInitialize(void)
     vtune = XtCreateWidget("vidtune", formWidgetClass,
 			   work, NULL, 0);
 
-    vesab = XtVaCreateManagedWidget("vesaB", menuButtonWidgetClass, vtune,
+    (void) XtVaCreateManagedWidget("vesaB", menuButtonWidgetClass, vtune,
 				    XtNmenuName, "vesaP", NULL, 0);
     vesap = XtCreatePopupShell("vesaP", simpleMenuWidgetClass, vtune, NULL, 0);
     for (i = 0; i < sizeof(vesamodes) / sizeof(vesamodes[0]); i++) {
@@ -556,7 +555,7 @@ VideoModeInitialize(void)
 
     form = XtCreateManagedWidget("form", formWidgetClass, vtune, NULL, 0);
     for (i = 2; i < VSYNC + 1; i++) {
-	labels[i] = XtCreateManagedWidget(names[i], labelWidgetClass,
+	(void) XtCreateManagedWidget(names[i], labelWidgetClass,
 					  form, NULL, 0);
 	values[i] = XtCreateManagedWidget(vnames[i], labelWidgetClass,
 					  form, NULL, 0);
@@ -888,15 +887,6 @@ GetModeLine(Bool save)
 	if (save)
 	    memcpy(&orig_modeline, &modeline, sizeof(XF86VidModeModeLine));
 	UpdateSyncRates(False);
-	if (modeline.privsize != 0 && modeline.private != NULL) {
-	    S3Specials = True;
-	    invert_vclk = modeline.private[1];
-	    blank1 = modeline.private[2] & 7;
-	    blank2 = (modeline.private[2] >> 4) & 7;
-	    early_sc = modeline.private[3];
-	}
-	else
-	    S3Specials = False;
 	return (True);
     }
 
diff --git a/hw/xfree86/utils/xorgcfg/xf86config.c b/hw/xfree86/utils/xorgcfg/xf86config.c
index b2b0b871c..cb4054a5e 100644
--- a/hw/xfree86/utils/xorgcfg/xf86config.c
+++ b/hw/xfree86/utils/xorgcfg/xf86config.c
@@ -26,7 +26,7 @@
  *
  * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
  *
- * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/xf86config.c,v 1.5 2001/03/27 20:25:30 paulo Exp $
+ * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/xf86config.c,v 1.6 2003/11/03 05:11:59 tsi Exp $
  */
 
 #include "xf86config.h"
@@ -206,7 +206,10 @@ xf86removeMonitor(XF86ConfigPtr config, XF86ConfMonitorPtr monitor)
     while (scr != NULL) {
 	if (scr->scrn_monitor == monitor) {
 	    xf86removeScreen(config, scr);
+	    if (scr == psc)
 	    scr = psc = config->conf_screen_lst;
+	    else
+		scr = psc;
 	    continue;
 	}
 	psc = scr;