Update all prefixes in config tools, so they mostly work again. Also, make

    RgbPath commented out when using xorgconfig. Start using
    /dev/input/mice as the default mouse location on Linux.

8 files changed, 34 insertions, 14 deletions

diff --git a/ChangeLog b/ChangeLog
index e6c67279e..a263050ae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2006-04-18  Donnie Berkholz  <spyderous@gentoo.org>
+
+	reviewed by: Alan Coopersmith
+
+	* hw/xfree86/utils/xorgcfg/interface.c:
+	* hw/xfree86/utils/xorgcfg/keyboard-cfg.c:
+	* hw/xfree86/utils/xorgcfg/keyboard-cfg.h:
+	* hw/xfree86/utils/xorgcfg/loader.c:
+	* hw/xfree86/utils/xorgcfg/text-mode.c:
+	* hw/xfree86/utils/xorgconfig/cards.c:
+	* hw/xfree86/utils/xorgconfig/xorgconfig.c:
+	Update all prefixes in config tools, so they mostly work again. Also, make
+	RgbPath commented out when using xorgconfig. Start using /dev/input/mice as
+	the default mouse location on Linux.
+
 2006-04-17  Donnie Berkholz  <spyderous@gentoo.org>
 
 	* exa/Makefile.am:
diff --git a/hw/xfree86/utils/xorgcfg/interface.c b/hw/xfree86/utils/xorgcfg/interface.c
index e329d909f..b6ac82a06 100644
--- a/hw/xfree86/utils/xorgcfg/interface.c
+++ b/hw/xfree86/utils/xorgcfg/interface.c
@@ -1,4 +1,4 @@
-/* $XdotOrg: $ */
+/* $XdotOrg: xserver/xorg/hw/xfree86/utils/xorgcfg/interface.c,v 1.8 2005/11/08 06:33:30 jkj Exp $ */
 /*
  * Copyright (c) 2000 by Conectiva S.A. (http://www.conectiva.com)
  * 
@@ -65,7 +65,7 @@
 #ifdef PROJECT_ROOT
 #define DefaultXFree86Dir	PROJECT_ROOT
 #else
-#define DefaultXFree86Dir	"/usr/X11R6"
+#define DefaultXFree86Dir	"/usr"
 #endif
 
 #define IS_KBDDRIV(S) ((strcasecmp((S),"kbd") == 0) || \
diff --git a/hw/xfree86/utils/xorgcfg/keyboard-cfg.c b/hw/xfree86/utils/xorgcfg/keyboard-cfg.c
index 05b1aeb09..2e82323be 100644
--- a/hw/xfree86/utils/xorgcfg/keyboard-cfg.c
+++ b/hw/xfree86/utils/xorgcfg/keyboard-cfg.c
@@ -72,7 +72,7 @@ static void UpdateRulesPopups(void);
  */
 static XF86XkbRulesDescInfo **xkb_desc, *xkb_rules;
 static int num_xkb_desc;
-static char *XkbRulesDir = "lib/X11/xkb/rules/";
+static char *XkbRulesDir = "share/X11/xkb/rules/";
 #ifdef XFREE98_XKB
 static char *XkbRulesFile = "xfree98";
 #else
diff --git a/hw/xfree86/utils/xorgcfg/keyboard-cfg.h b/hw/xfree86/utils/xorgcfg/keyboard-cfg.h
index 915bb0b40..64438bd71 100644
--- a/hw/xfree86/utils/xorgcfg/keyboard-cfg.h
+++ b/hw/xfree86/utils/xorgcfg/keyboard-cfg.h
@@ -38,7 +38,7 @@
 /*
  * All file names are from XProjectRoot or XWINHOME environment variable.
  */
-#define	XkbConfigDir		"lib/X11/xkb/"
+#define	XkbConfigDir		"share/X11/xkb/"
 #define	XkbConfigFile		"X0-config.keyboard"
 
 /*
diff --git a/hw/xfree86/utils/xorgcfg/loader.c b/hw/xfree86/utils/xorgcfg/loader.c
index 98a661d89..37378701e 100644
--- a/hw/xfree86/utils/xorgcfg/loader.c
+++ b/hw/xfree86/utils/xorgcfg/loader.c
@@ -26,7 +26,7 @@
  *
  * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
  *
- * $XdotOrg: xc/programs/Xserver/hw/xfree86/xf86cfg/loader.c,v 1.3 2004/12/04 00:43:11 kuhn Exp $
+ * $XdotOrg: xserver/xorg/hw/xfree86/utils/xorgcfg/loader.c,v 1.5 2005/12/08 17:54:40 kem Exp $
  * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/loader.c,v 1.19 2002/06/06 21:03:32 paulo Exp $
  */
 
@@ -55,7 +55,7 @@
 #include <stdarg.h>
 
 #ifndef OPTIONSPATH
-#define OPTIONSPATH "/usr/X11R6/lib/X11"
+#define OPTIONSPATH "/usr/lib/X11"
 #endif
 
 #ifndef SIGNALRETURNSINT
diff --git a/hw/xfree86/utils/xorgcfg/text-mode.c b/hw/xfree86/utils/xorgcfg/text-mode.c
index 3c6acce6e..bb61eae1e 100644
--- a/hw/xfree86/utils/xorgcfg/text-mode.c
+++ b/hw/xfree86/utils/xorgcfg/text-mode.c
@@ -1,4 +1,4 @@
-/* $XdotOrg: $ */
+/* $XdotOrg: xserver/xorg/hw/xfree86/utils/xorgcfg/text-mode.c,v 1.6 2005/12/08 17:54:40 kem Exp $ */
 /*
  * Copyright (c) 2000 by Conectiva S.A. (http://www.conectiva.com)
  * 
@@ -52,12 +52,12 @@
 	(strcmp((X), "keyboard") == 0))
 
 #ifndef PROJECT_ROOT
-#define PROJECT_ROOT "/usr/X11R6"
+#define PROJECT_ROOT "/usr"
 #endif
 
 #ifndef XKB_RULES_DIR
 #ifndef __UNIXOS2__
-#define XKB_RULES_DIR PROJECT_ROOT "/lib/X11/xkb/rules"
+#define XKB_RULES_DIR PROJECT_ROOT "/share/X11/xkb/rules"
 #else
 #define XKB_RULES_DIR XF86CONFIGDIR "/xkb/rules"
 #endif
@@ -557,6 +557,8 @@ MouseConfig(void)
 	str = "/dev/sysmouse";
 #elif defined(__UNIXOS2__)
 	str = "mouse$";
+#elif defined(__linux__)
+	str = "/dev/input/mice";
 #else
 	str = "/dev/mouse";
 #endif
diff --git a/hw/xfree86/utils/xorgconfig/cards.c b/hw/xfree86/utils/xorgconfig/cards.c
index 29c1c0e2b..b5f23a00f 100644
--- a/hw/xfree86/utils/xorgconfig/cards.c
+++ b/hw/xfree86/utils/xorgconfig/cards.c
@@ -1,4 +1,4 @@
-/* $XdotOrg: xc/programs/Xserver/hw/xfree86/xf86config/cards.c,v 1.3 2004/08/13 23:57:38 alanc Exp $ */
+/* $XdotOrg: xserver/xorg/hw/xfree86/utils/xorgconfig/cards.c,v 1.4 2005/07/01 22:43:35 daniels Exp $ */
 /* $XConsortium: cards.c /main/9 1996/10/19 18:15:32 kaleb $ */
 
 
@@ -19,7 +19,7 @@
 
 /* Some vars to make path names in texts more flexible. */
 #ifndef PROJECTROOT
-# define PROJECTROOT		"/usr/X11R6"
+# define PROJECTROOT		"/usr"
 #endif
 #define TREEROOT		PROJECTROOT
 #define TREEROOTLX		TREEROOT "/lib/X11"
diff --git a/hw/xfree86/utils/xorgconfig/xorgconfig.c b/hw/xfree86/utils/xorgconfig/xorgconfig.c
index 227803c29..4570e081a 100644
--- a/hw/xfree86/utils/xorgconfig/xorgconfig.c
+++ b/hw/xfree86/utils/xorgconfig/xorgconfig.c
@@ -94,7 +94,7 @@
  *  Chisato Yamauchi(cyamauch@phyas.aichi-edu.ac.jp)
  */
 /* $XConsortium: xf86config.c /main/21 1996/10/28 05:43:57 kaleb $ */
-/* $XdotOrg: xc/programs/Xserver/hw/xfree86/xf86config/xorgconfig.c,v 1.14 2005/05/28 00:08:03 alanc Exp $ */
+/* $XdotOrg: xserver/xorg/hw/xfree86/utils/xorgconfig/xorgconfig.c,v 1.19 2005/11/08 06:33:30 jkj Exp $ */
 
 #ifdef HAVE_CONFIG_H
 # include "xorg-server.h"
@@ -157,11 +157,12 @@ static int getuid() { return 0; }
  * may be more irritated than Unix users
  */
 #ifndef PROJECTROOT
-#define PROJECTROOT		"/usr/X11R6"
+#define PROJECTROOT		"/usr"
 #endif
 #define TREEROOT		PROJECTROOT
 #define TREEROOTLX		TREEROOT "/lib/X11"
 #define TREEROOTCFG		TREEROOT "/etc/X11"
+#define TREEROOTSHARE		TREEROOT "/share/X11"
 #ifdef XDOCDIR
 # define TREEROOTDOC		XDOCDIR
 #else
@@ -494,6 +495,8 @@ struct {
 # define DEF_MOUSEDEV "/dev/wsmouse";
 #elif defined(__FreeBSD__)
 # define DEF_MOUSEDEV "/dev/sysmouse";
+#elif defined(__linux__)
+# define DEF_MOUSEDEV "/dev/input/mice";
 #else
 # define DEF_MOUSEDEV "/dev/mouse";
 #endif
@@ -1970,7 +1973,7 @@ static char *XF86Config_firstchunk_text =
 "# file minus the extension (like \".txt\" or \".db\").  There is normally\n"
 "# no need to change the default.\n"
 "\n"
-"    RgbPath	\"" TREEROOTLX "/rgb\"\n"
+"#    RgbPath	\"" TREEROOTSHARE "/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"