aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/hw/xfree86
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-02-14 21:52:51 +0000
committermarha <marha@users.sourceforge.net>2010-02-14 21:52:51 +0000
commit00e6751183c1e854ea3eba746b101449b32201a4 (patch)
tree3494085d6728e086582f30c8a68846d81840303d /xorg-server/hw/xfree86
parentac637a8cd15f3977f44b701c7ac71a561763c1d8 (diff)
parent8d38172d866775594af3185ae3fbd8d750677650 (diff)
downloadvcxsrv-00e6751183c1e854ea3eba746b101449b32201a4.tar.gz
vcxsrv-00e6751183c1e854ea3eba746b101449b32201a4.tar.bz2
vcxsrv-00e6751183c1e854ea3eba746b101449b32201a4.zip
svn merge ^/branches/released
Diffstat (limited to 'xorg-server/hw/xfree86')
-rw-r--r--xorg-server/hw/xfree86/Makefile.in14
-rw-r--r--xorg-server/hw/xfree86/common/Makefile.in6
-rw-r--r--xorg-server/hw/xfree86/common/xf86Xinput.c101
-rw-r--r--xorg-server/hw/xfree86/ddc/Makefile.in6
-rw-r--r--xorg-server/hw/xfree86/dixmods/Makefile.in10
-rw-r--r--xorg-server/hw/xfree86/dixmods/extmod/Makefile.in6
-rw-r--r--xorg-server/hw/xfree86/doc/Makefile.in10
-rw-r--r--xorg-server/hw/xfree86/doc/README.modes474
-rw-r--r--xorg-server/hw/xfree86/doc/devel/Makefile.in6
-rw-r--r--xorg-server/hw/xfree86/doc/man/Makefile.in10
-rw-r--r--xorg-server/hw/xfree86/doc/man/xorg.conf.man.pre33
-rw-r--r--xorg-server/hw/xfree86/doc/sgml/Makefile.in6
-rw-r--r--xorg-server/hw/xfree86/dri/Makefile.in6
-rw-r--r--xorg-server/hw/xfree86/dri2/Makefile.in6
-rw-r--r--xorg-server/hw/xfree86/exa/Makefile.in10
-rw-r--r--xorg-server/hw/xfree86/fbdevhw/Makefile.in10
-rw-r--r--xorg-server/hw/xfree86/i2c/Makefile.in6
-rw-r--r--xorg-server/hw/xfree86/int10/Makefile.in6
-rw-r--r--xorg-server/hw/xfree86/libxorg.c0
-rw-r--r--xorg-server/hw/xfree86/loader/Makefile.in6
-rw-r--r--xorg-server/hw/xfree86/loader/sdksyms.c2350
-rw-r--r--xorg-server/hw/xfree86/modes/Makefile.in6
-rw-r--r--xorg-server/hw/xfree86/os-support/Makefile.in10
-rw-r--r--xorg-server/hw/xfree86/os-support/bsd/Makefile.in6
-rw-r--r--xorg-server/hw/xfree86/os-support/bus/Makefile.in6
-rw-r--r--xorg-server/hw/xfree86/os-support/hurd/Makefile.in6
-rw-r--r--xorg-server/hw/xfree86/os-support/linux/Makefile.in6
-rw-r--r--xorg-server/hw/xfree86/os-support/misc/Makefile.in6
-rw-r--r--xorg-server/hw/xfree86/os-support/sco/Makefile.in6
-rw-r--r--xorg-server/hw/xfree86/os-support/solaris/Makefile.in6
-rw-r--r--xorg-server/hw/xfree86/os-support/sysv/Makefile.in6
-rw-r--r--xorg-server/hw/xfree86/os-support/xorgos.c0
-rw-r--r--xorg-server/hw/xfree86/parser/InputClass.c80
-rw-r--r--xorg-server/hw/xfree86/parser/Makefile.in32
-rw-r--r--xorg-server/hw/xfree86/parser/scan.c26
-rw-r--r--xorg-server/hw/xfree86/parser/xf86Parser.h7
-rw-r--r--xorg-server/hw/xfree86/parser/xf86tokens.h1
-rw-r--r--xorg-server/hw/xfree86/ramdac/Makefile.in6
-rw-r--r--xorg-server/hw/xfree86/ramdac/xf86BitOrder.c2
-rw-r--r--xorg-server/hw/xfree86/shadowfb/Makefile.in6
-rw-r--r--xorg-server/hw/xfree86/utils/Makefile.in10
-rw-r--r--xorg-server/hw/xfree86/utils/cvt/Makefile.in10
-rw-r--r--xorg-server/hw/xfree86/utils/gtf/Makefile.in10
-rw-r--r--xorg-server/hw/xfree86/vbe/Makefile.in6
-rw-r--r--xorg-server/hw/xfree86/vgahw/Makefile.in6
-rw-r--r--xorg-server/hw/xfree86/x86emu/Makefile.in8
-rw-r--r--xorg-server/hw/xfree86/xaa/Makefile.in6
-rw-r--r--xorg-server/hw/xfree86/xaa/l-xaaBitmap.c2
-rw-r--r--xorg-server/hw/xfree86/xaa/l-xaaStipple.c2
-rw-r--r--xorg-server/hw/xfree86/xaa/l-xaaTEGlyph.c2
-rw-r--r--xorg-server/hw/xfree86/xaa/l3-xaaBitmap.c3
-rw-r--r--xorg-server/hw/xfree86/xaa/l3-xaaStipple.c3
-rw-r--r--xorg-server/hw/xfree86/xaa/lf-xaaBitmap.c3
-rw-r--r--xorg-server/hw/xfree86/xaa/lf-xaaStipple.c3
-rw-r--r--xorg-server/hw/xfree86/xaa/lf-xaaTEGlyph.c3
-rw-r--r--xorg-server/hw/xfree86/xaa/lf3-xaaBitmap.c4
-rw-r--r--xorg-server/hw/xfree86/xaa/lf3-xaaStipple.c4
-rw-r--r--xorg-server/hw/xfree86/xaa/m-xaaBitmap.c2
-rw-r--r--xorg-server/hw/xfree86/xaa/m-xaaStipple.c2
-rw-r--r--xorg-server/hw/xfree86/xaa/m-xaaTEGlyph.c2
-rw-r--r--xorg-server/hw/xfree86/xaa/m3-xaaBitmap.c3
-rw-r--r--xorg-server/hw/xfree86/xaa/m3-xaaStipple.c3
-rw-r--r--xorg-server/hw/xfree86/xaa/mf-xaaBitmap.c3
-rw-r--r--xorg-server/hw/xfree86/xaa/mf-xaaStipple.c3
-rw-r--r--xorg-server/hw/xfree86/xaa/mf-xaaTEGlyph.c3
-rw-r--r--xorg-server/hw/xfree86/xaa/mf3-xaaBitmap.c4
-rw-r--r--xorg-server/hw/xfree86/xaa/mf3-xaaStipple.c4
-rw-r--r--xorg-server/hw/xfree86/xaa/s-xaaDashLine.c2
-rw-r--r--xorg-server/hw/xfree86/xaa/s-xaaLine.c2
-rw-r--r--xorg-server/hw/xfree86/xf8_16bpp/Makefile.in6
-rw-r--r--xorg-server/hw/xfree86/xorg.c0
71 files changed, 2857 insertions, 573 deletions
diff --git a/xorg-server/hw/xfree86/Makefile.in b/xorg-server/hw/xfree86/Makefile.in
index 95d94357c..f403408f3 100644
--- a/xorg-server/hw/xfree86/Makefile.in
+++ b/xorg-server/hw/xfree86/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -323,8 +323,11 @@ SHELL = @SHELL@
SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@
SOLARIS_INOUT_ARCH = @SOLARIS_INOUT_ARCH@
STRIP = @STRIP@
+SYSCONFDIR = @SYSCONFDIR@
TSLIB_CFLAGS = @TSLIB_CFLAGS@
TSLIB_LIBS = @TSLIB_LIBS@
+UDEV_CFLAGS = @UDEV_CFLAGS@
+UDEV_LIBS = @UDEV_LIBS@
UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
VERSION = @VERSION@
@@ -384,6 +387,7 @@ XWIN_SERVER_NAME = @XWIN_SERVER_NAME@
XWIN_SYS_LIBS = @XWIN_SYS_LIBS@
YACC = @YACC@
YFLAGS = @YFLAGS@
+__XCONFIGDIR__ = @__XCONFIGDIR__@
__XCONFIGFILE__ = @__XCONFIGFILE__@
abi_ansic = @abi_ansic@
abi_extension = @abi_extension@
@@ -478,7 +482,9 @@ MANDEFS = \
-D__adminmansuffix__=$(ADMIN_MAN_SUFFIX) \
-D__mandir__=$(mandir) \
-D__projectroot__=$(prefix) \
- -D__xconfigfile__=$(__XCONFIGFILE__) -D__xconfigdir__=$(XCONFIGDIR) \
+ -D__datadir__=$(datadir) \
+ -D__xconfigfile__=$(__XCONFIGFILE__) \
+ -D__xconfigdir__=$(__XCONFIGDIR__) \
-D__xkbdir__=$(XKB_BASE_DIRECTORY) \
-D__modulepath__="$(DEFAULT_MODULE_PATH)" \
-D__xlogfile__=$(XLOGFILE) -D__xservername__=$(XSERVERNAME)
@@ -675,7 +681,7 @@ clean-libtool:
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
- @failcom='exit 1'; \
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
@@ -700,7 +706,7 @@ $(RECURSIVE_TARGETS):
fi; test -z "$$fail"
$(RECURSIVE_CLEAN_TARGETS):
- @failcom='exit 1'; \
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
diff --git a/xorg-server/hw/xfree86/common/Makefile.in b/xorg-server/hw/xfree86/common/Makefile.in
index 3d95ac325..12341f396 100644
--- a/xorg-server/hw/xfree86/common/Makefile.in
+++ b/xorg-server/hw/xfree86/common/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -315,8 +315,11 @@ SHELL = @SHELL@
SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@
SOLARIS_INOUT_ARCH = @SOLARIS_INOUT_ARCH@
STRIP = @STRIP@
+SYSCONFDIR = @SYSCONFDIR@
TSLIB_CFLAGS = @TSLIB_CFLAGS@
TSLIB_LIBS = @TSLIB_LIBS@
+UDEV_CFLAGS = @UDEV_CFLAGS@
+UDEV_LIBS = @UDEV_LIBS@
UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
VERSION = @VERSION@
@@ -376,6 +379,7 @@ XWIN_SERVER_NAME = @XWIN_SERVER_NAME@
XWIN_SYS_LIBS = @XWIN_SYS_LIBS@
YACC = @YACC@
YFLAGS = @YFLAGS@
+__XCONFIGDIR__ = @__XCONFIGDIR__@
__XCONFIGFILE__ = @__XCONFIGFILE__@
abi_ansic = @abi_ansic@
abi_extension = @abi_extension@
diff --git a/xorg-server/hw/xfree86/common/xf86Xinput.c b/xorg-server/hw/xfree86/common/xf86Xinput.c
index fb0ee9c3f..c2d9f49de 100644
--- a/xorg-server/hw/xfree86/common/xf86Xinput.c
+++ b/xorg-server/hw/xfree86/common/xf86Xinput.c
@@ -502,20 +502,67 @@ AddOtherInputDevices(void)
static Bool
InputClassMatches(XF86ConfInputClassPtr iclass, InputAttributes *attrs)
{
- if (iclass->match_product &&
- (!attrs->product || !strstr(attrs->product, iclass->match_product)))
- return FALSE;
- if (iclass->match_vendor &&
- (!attrs->vendor || !strstr(attrs->vendor, iclass->match_vendor)))
- return FALSE;
- if (iclass->match_device &&
+ char **cur;
+ Bool match;
+
+ if (iclass->match_product) {
+ if (!attrs->product)
+ return FALSE;
+ /* see if any of the values match */
+ for (cur = iclass->match_product, match = FALSE; *cur; cur++)
+ if (strstr(attrs->product, *cur)) {
+ match = TRUE;
+ break;
+ }
+ if (!match)
+ return FALSE;
+ }
+ if (iclass->match_vendor) {
+ if (!attrs->vendor)
+ return FALSE;
+ /* see if any of the values match */
+ for (cur = iclass->match_vendor, match = FALSE; *cur; cur++)
+ if (strstr(attrs->vendor, *cur)) {
+ match = TRUE;
+ break;
+ }
+ if (!match)
+ return FALSE;
+ }
+ if (iclass->match_device) {
+ if (!attrs->device)
+ return FALSE;
+ /* see if any of the values match */
+ for (cur = iclass->match_device, match = FALSE; *cur; cur++)
#ifdef HAVE_FNMATCH_H
- (!attrs->device ||
- fnmatch(iclass->match_device, attrs->device, 0) != 0))
+ if (fnmatch(*cur, attrs->device, FNM_PATHNAME) == 0) {
#else
- (!attrs->device || !strstr(attrs->device, iclass->match_device)))
+ if (strstr(attrs->device, *cur)) {
#endif
- return FALSE;
+ match = TRUE;
+ break;
+ }
+ if (!match)
+ return FALSE;
+ }
+ if (iclass->match_tag) {
+ if (!attrs->tags)
+ return FALSE;
+
+ for (cur = iclass->match_tag, match = FALSE; *cur && !match; cur++) {
+ const char *tag;
+ for(tag = *attrs->tags; *tag; tag++) {
+ if (!strcmp(tag, *cur)) {
+ match = TRUE;
+ break;
+ }
+ }
+ }
+
+ if (!match)
+ return FALSE;
+ }
+
if (iclass->is_keyboard.set &&
iclass->is_keyboard.val != !!(attrs->flags & ATTR_KEYBOARD))
return FALSE;
@@ -538,9 +585,9 @@ InputClassMatches(XF86ConfInputClassPtr iclass, InputAttributes *attrs)
}
/*
- * Merge in any InputClass configurations. Each InputClass section can
- * add to the original device configuration as well as any previous
- * InputClass sections.
+ * Merge in any InputClass configurations. Options in each InputClass
+ * section have less priority than the original device configuration as
+ * well as any previous InputClass sections.
*/
static int
MergeInputClasses(IDevPtr idev, InputAttributes *attrs)
@@ -574,6 +621,27 @@ MergeInputClasses(IDevPtr idev, InputAttributes *attrs)
return Success;
}
+static Bool
+IgnoreInputClass(IDevPtr idev, InputAttributes *attrs)
+{
+ XF86ConfInputClassPtr cl;
+ Bool ignore;
+
+ for (cl = xf86configptr->conf_inputclass_lst; cl; cl = cl->list.next) {
+ if (!InputClassMatches(cl, attrs))
+ continue;
+ if (xf86findOption(cl->option_lst, "Ignore")) {
+ ignore = xf86CheckBoolOption(cl->option_lst, "Ignore", FALSE);
+ if (ignore)
+ xf86Msg(X_CONFIG,
+ "%s: Ignoring device from InputClass \"%s\"\n",
+ idev->identifier, cl->identifier);
+ return ignore;
+ }
+ }
+ return FALSE;
+}
+
/**
* Create a new input device, activate and enable it.
*
@@ -736,6 +804,11 @@ NewInputDeviceRequest (InputOption *options, InputAttributes *attrs,
/* Apply InputClass settings */
if (attrs) {
+ if (IgnoreInputClass(idev, attrs)) {
+ rval = BadIDChoice;
+ goto unwind;
+ }
+
rval = MergeInputClasses(idev, attrs);
if (rval != Success)
goto unwind;
diff --git a/xorg-server/hw/xfree86/ddc/Makefile.in b/xorg-server/hw/xfree86/ddc/Makefile.in
index 25423ead9..4db870280 100644
--- a/xorg-server/hw/xfree86/ddc/Makefile.in
+++ b/xorg-server/hw/xfree86/ddc/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -289,8 +289,11 @@ SHELL = @SHELL@
SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@
SOLARIS_INOUT_ARCH = @SOLARIS_INOUT_ARCH@
STRIP = @STRIP@
+SYSCONFDIR = @SYSCONFDIR@
TSLIB_CFLAGS = @TSLIB_CFLAGS@
TSLIB_LIBS = @TSLIB_LIBS@
+UDEV_CFLAGS = @UDEV_CFLAGS@
+UDEV_LIBS = @UDEV_LIBS@
UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
VERSION = @VERSION@
@@ -350,6 +353,7 @@ XWIN_SERVER_NAME = @XWIN_SERVER_NAME@
XWIN_SYS_LIBS = @XWIN_SYS_LIBS@
YACC = @YACC@
YFLAGS = @YFLAGS@
+__XCONFIGDIR__ = @__XCONFIGDIR__@
__XCONFIGFILE__ = @__XCONFIGFILE__@
abi_ansic = @abi_ansic@
abi_extension = @abi_extension@
diff --git a/xorg-server/hw/xfree86/dixmods/Makefile.in b/xorg-server/hw/xfree86/dixmods/Makefile.in
index 2367215ab..5b0de7102 100644
--- a/xorg-server/hw/xfree86/dixmods/Makefile.in
+++ b/xorg-server/hw/xfree86/dixmods/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -377,8 +377,11 @@ SHELL = @SHELL@
SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@
SOLARIS_INOUT_ARCH = @SOLARIS_INOUT_ARCH@
STRIP = @STRIP@
+SYSCONFDIR = @SYSCONFDIR@
TSLIB_CFLAGS = @TSLIB_CFLAGS@
TSLIB_LIBS = @TSLIB_LIBS@
+UDEV_CFLAGS = @UDEV_CFLAGS@
+UDEV_LIBS = @UDEV_LIBS@
UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
VERSION = @VERSION@
@@ -438,6 +441,7 @@ XWIN_SERVER_NAME = @XWIN_SERVER_NAME@
XWIN_SYS_LIBS = @XWIN_SYS_LIBS@
YACC = @YACC@
YFLAGS = @YFLAGS@
+__XCONFIGDIR__ = @__XCONFIGDIR__@
__XCONFIGFILE__ = @__XCONFIGFILE__@
abi_ansic = @abi_ansic@
abi_extension = @abi_extension@
@@ -768,7 +772,7 @@ clean-libtool:
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
- @failcom='exit 1'; \
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
@@ -793,7 +797,7 @@ $(RECURSIVE_TARGETS):
fi; test -z "$$fail"
$(RECURSIVE_CLEAN_TARGETS):
- @failcom='exit 1'; \
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
diff --git a/xorg-server/hw/xfree86/dixmods/extmod/Makefile.in b/xorg-server/hw/xfree86/dixmods/extmod/Makefile.in
index af288069d..7ebcb66c5 100644
--- a/xorg-server/hw/xfree86/dixmods/extmod/Makefile.in
+++ b/xorg-server/hw/xfree86/dixmods/extmod/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -297,8 +297,11 @@ SHELL = @SHELL@
SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@
SOLARIS_INOUT_ARCH = @SOLARIS_INOUT_ARCH@
STRIP = @STRIP@
+SYSCONFDIR = @SYSCONFDIR@
TSLIB_CFLAGS = @TSLIB_CFLAGS@
TSLIB_LIBS = @TSLIB_LIBS@
+UDEV_CFLAGS = @UDEV_CFLAGS@
+UDEV_LIBS = @UDEV_LIBS@
UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
VERSION = @VERSION@
@@ -358,6 +361,7 @@ XWIN_SERVER_NAME = @XWIN_SERVER_NAME@
XWIN_SYS_LIBS = @XWIN_SYS_LIBS@
YACC = @YACC@
YFLAGS = @YFLAGS@
+__XCONFIGDIR__ = @__XCONFIGDIR__@
__XCONFIGFILE__ = @__XCONFIGFILE__@
abi_ansic = @abi_ansic@
abi_extension = @abi_extension@
diff --git a/xorg-server/hw/xfree86/doc/Makefile.in b/xorg-server/hw/xfree86/doc/Makefile.in
index 6e5c3ecaa..fba837fca 100644
--- a/xorg-server/hw/xfree86/doc/Makefile.in
+++ b/xorg-server/hw/xfree86/doc/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -277,8 +277,11 @@ SHELL = @SHELL@
SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@
SOLARIS_INOUT_ARCH = @SOLARIS_INOUT_ARCH@
STRIP = @STRIP@
+SYSCONFDIR = @SYSCONFDIR@
TSLIB_CFLAGS = @TSLIB_CFLAGS@
TSLIB_LIBS = @TSLIB_LIBS@
+UDEV_CFLAGS = @UDEV_CFLAGS@
+UDEV_LIBS = @UDEV_LIBS@
UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
VERSION = @VERSION@
@@ -338,6 +341,7 @@ XWIN_SERVER_NAME = @XWIN_SERVER_NAME@
XWIN_SYS_LIBS = @XWIN_SYS_LIBS@
YACC = @YACC@
YFLAGS = @YFLAGS@
+__XCONFIGDIR__ = @__XCONFIGDIR__@
__XCONFIGFILE__ = @__XCONFIGFILE__@
abi_ansic = @abi_ansic@
abi_extension = @abi_extension@
@@ -454,7 +458,7 @@ clean-libtool:
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
- @failcom='exit 1'; \
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
@@ -479,7 +483,7 @@ $(RECURSIVE_TARGETS):
fi; test -z "$$fail"
$(RECURSIVE_CLEAN_TARGETS):
- @failcom='exit 1'; \
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
diff --git a/xorg-server/hw/xfree86/doc/README.modes b/xorg-server/hw/xfree86/doc/README.modes
deleted file mode 100644
index 894e21313..000000000
--- a/xorg-server/hw/xfree86/doc/README.modes
+++ /dev/null
@@ -1,474 +0,0 @@
- Multi-monitor Mode Setting APIs
- Keith Packard, <keithp@keithp.com
- 6 March 2007
-
-1. Introduction
-
-This document describes a set of mode setting APIs added in X server version
-1.3 that support multiple monitors per card. These interfaces expose the
-underlying hardware CRTC and output concepts to the xf86 DDX layer so that
-the implementation of initial server setup and mode changes through
-extensions can be shared across drivers. In addition, these new interfaces
-support a new configuration mechanism as well which allows each monitor to
-be customized separately providing a consistent cross-driver configuration
-mechanism that supports the full range of output features.
-
-All of the code implementing this interface can be found in hw/xfree86/modes
-in the X server sources.
-
-2. Overview
-
-This document describes both the driver API and the configuration data
-placed in xorg.conf; these are entirely separate as the driver has no
-interaction with the configuration information at all. Much of the structure
-here is cloned from the RandR extension version 1.2 additions which deal
-with the same kinds of information.
-
-2.1 API overview
-
-The mode setting API is expressed through two new driver-visible objects,
-the 'CRTC' (xf86CrtcRec) and the 'Output' (xf86OutputRec). A CRTC refers to
-hardware within the video system that can scan a subset of the framebuffer
-and generate a video signal. An Output receives that signal and transmits it
-to a monitor, projector or other device.
-
-The xf86CrtcRec and xf86OutputRec contain a small amount of state data
-related to the object along with a pointer to a set of functions provided by
-the driver that manipulate the object in fairly simple ways.
-
-To emulate older behaviour, one of the outputs is picked as the 'compat'
-output; this output changes over time as outputs are detected and used, the
-goal is to always have one 'special' output which is used for operations
-which need a single defined monitor (like XFree86-VidModeExtension mode
-setting, RandR 1.1 mode setting, DDC property setting, etc.).
-
-2.1.1 Output overview
-
-As outputs are connected to monitors, they hold a list of modes supported by
-the monitor. If the monitor and output support DDC, then the list of modes
-generally comes from the EDID data in the monitor. Otherwise, the server
-uses the standard VESA modes, pruned by monitor timing. If the configuration
-file doesn't contain monitor timing data, the server uses default timing
-information which supports 640x480, 800x600 and 1024x768 all with a 60Hz
-refresh rate.
-
-As hardware often limits possible configuration combinations, each output
-knows the set of CRTCs that it can be connected to as well as the set of
-other outputs which can be simutaneously connected to a CRTC.
-
-2.1.2 CRTC overview
-
-CRTCs serve only to stream frame buffer data to outputs using a mode line.
-Ideally, they would not be presented to the user at all, and in fact the
-configuration file doesn't expose them. The RandR 1.2 protocol does, but the
-hope there is that client-side applications will hide them carefully away.
-
-Each crtc has an associated cursor, along with the current configuration.
-All of the data needed to determine valid configurations is contained within
-the Outputs.
-
-2.2 Configuration overview
-
-As outputs drive monitors, the "Monitor" section has been repurposed to
-define their configuration. This provides for a bit more syntax than
-the large list of driver-specific options that were used in the past for
-similar configuration.
-
-However, the existing "Monitor" section referenced by the active "Screen"
-section no longer has any use at all; some sensible meaning for this
-parameter is needed now that a Screen can have multiple Monitors.
-
-3. Public Functions
-
-3.1 PreInit functions
-
-These functions should be used during the driver PreInit phase, they are
-arranged in the order they should be invoked.
-
- void
- xf86CrtcConfigInit (ScrnInfoPtr scrn
- const xf86CrtcConfigFuncsRec *funcs)
-
-This function allocates and initializes structures needed to track CRTC and
-Output state.
-
- void
- xf86CrtcSetSizeRange (ScrnInfoPtr scrn,
- int minWidth, int minHeight,
- int maxWidth, int maxHeight)
-
-This sets the range of screen sizes supported by the driver.
-
- xf86CrtcPtr
- xf86CrtcCreate (ScrnInfoPtr scrn,
- const xf86CrtcFuncsRec *funcs)
-
-Create one CRTC object. See the discussion below for a description of the
-contents of the xf86CrtcFuncsRec. Note that this is done in PreInit, so it
-should not be re-invoked at each server generation. Create one of these for
-each CRTC present in the hardware.
-
- xf86OutputPtr
- xf86OutputCreate (ScrnInfoPtr scrn,
- const xf86OutputFuncsRec *funcs,
- const char *name)
-
-Create one Output object. See the discussion below for a description of the
-contents of the xf86OutputFuncsRec. This is also called from PreInit and
-need not be re-invoked at each ScreenInit time. An Output should be created
-for every Output present in the hardware, not just for outputs which have
-detected monitors.
-
- Bool
- xf86OutputRename (xf86OutputPtr output, const char *name)
-
-If necessary, the name of an output can be changed after it is created using
-this function.
-
- Bool
- xf86InitialConfiguration (ScrnInfoPtr scrn, Bool canGrow)
-
-Using the resources provided, and the configuration specified by the user,
-this function computes an initial configuration for the server. It tries to
-enable as much hardware as possible using some fairly simple heuristics.
-
-The 'canGrow' parameter indicates that the frame buffer does not have a fixed
-size (fixed size frame buffers are required by XAA). When the frame buffer
-has a fixed size, the configuration selects a 'reasonablely large' frame
-buffer so that common reconfiguration options are possible. For resizable
-frame buffers, the frame buffer is set to the smallest size that encloses
-the desired configuration.
-
-3.2 ScreenInit functions
-
-These functions should be used during the driver ScreenInit phase.
-
- Bool
- xf86DiDGAInit (ScreenPtr screen, unsigned long dga_address)
-
-This function provides driver-independent accelerated DGA support for some
-of the DGA operations; using this, the driver can avoid needing to implement
-any of the rest of DGA.
-
- Bool
- xf86SaveScreen(ScreenPtr pScreen, int mode)
-
-Stick this in pScreen->SaveScreen and the core X screen saver will be
-implemented by disabling outputs and crtcs using their dpms functions.
-
- void
- xf86DPMSSet(ScrnInfoPtr scrn, int mode, int flags)
-
-Pass this function to xf86DPMSInit and all DPMS mode switching will be
-managed by using the dpms functions provided by the Outputs and CRTCs.
-
- Bool
- xf86CrtcScreenInit (ScreenPtr screen)
-
-This function completes the screen initialization process for the crtc and
-output objects. Call it near the end of the ScreenInit function, after the
-frame buffer and acceleration layers have been added.
-
-3.3 EnterVT functions
-
-Functions used during EnterVT, or whenever the current configuration needs
-to be applied to the hardware.
-
- Bool
- xf86SetDesiredModes (ScrnInfoPtr scrn)
-
-xf86InitialConfiguration selects the desired configuration at PreInit time;
-when the server finally hits ScreenInit, xf86SetDesiredModes is used by the
-driver to take that configuration and apply it to the hardware. In addition,
-successful mode selection at other times updates the configuration that will
-be used by this function, so LeaveVT/EnterVT pairs can simply invoke this
-and return to the previous configuration.
-
-3.4 SwitchMode functions
-
-Functions called from the pScrn->SwitchMode hook, which is used by the
-XFree86-VidModeExtension and the keypad mode switch commands.
-
- Bool
- xf86SetSingleMode (ScrnInfoPtr scrn,
- DisplayModePtr desired,
- Rotation rotation)
-
-This function applies the specified mode to all active outputs. Which is to
-say, it picks reasonable modes for all active outputs, attempting to get the
-screen to the specified size while not breaking anything that is currently
-working.
-
-3.7 get_modes functions
-
-Functions called during output->get_modes to help build lists of modes
-
- xf86MonPtr
- xf86OutputGetEDID (xf86OutputPtr output, I2CBusPtr pDDCBus)
-
-This returns the EDID data structure for the 'output' using the I2C bus
-'pDDCBus'. This has no effect on 'output' itself.
-
- void
- xf86OutputSetEDID (xf86OutputPtr output, xf86MonPtr edid_mon)
-
-Once the EDID data has been fetched, this call applies the EDID data to the
-output object, setting the physical size and also various properties, like
-the DDC root window property (when output is the 'compat' output), and the
-RandR 1.2 EDID output properties.
-
- DisplayModePtr
- xf86OutputGetEDIDModes (xf86OutputPtr output)
-
-Given an EDID data structure, this function computes a list of suitable
-modes. This function also applies a sequence of 'quirks' during this process
-so that the returned modes may not actually match the mode data present in
-the EDID data.
-
-3.6 Other functions
-
-These remaining functions in the API can be used by the driver as needed.
-
- Bool
- xf86CrtcSetMode (xf86CrtcPtr crtc, DisplayModePtr mode, Rotation rotation,
- int x, int y)
-
-Applies a mode to a CRTC. All of the outputs which are currently using the
-specified CRTC are included in the mode setting process. 'x' and 'y' are the
-offset within the frame buffer that the crtc is placed at. No checking is
-done in this function to ensure that the mode is usable by the active
-outputs.
-
- void
- xf86ProbeOutputModes (ScrnInfoPtr pScrn, int maxX, int maxY)
-
-This discards the mode lists for all outputs, re-detects monitor presence
-and then acquires new mode lists for all monitors which are not disconnected.
-Monitor configuration data is used to modify the mode lists returned by the
-outputs. 'maxX' and 'maxY' limit the maximum size modes that will be
-returned.
-
- void
- xf86SetScrnInfoModes (ScrnInfoPtr pScrn)
-
-This copies the 'compat' output mode list into the pScrn modes list which is
-used by the XFree86-VidModeExtension and the keypad mode switching
-operations. The current 'desired' mode for the CRTC associated with the
-'compat' output is placed first in this list to indicate the current mode.
-Usually, the driver won't need to call this function as
-xf86InitialConfiguration will do so automatically, as well as any RandR
-functions which reprobe for modes. However, if the driver reprobes for modes
-at other times using xf86ProbeOutputModes, this function needs to be called.
-
- Bool
- xf86DiDGAReInit (ScreenPtr pScreen)
-
-This is similar to xf86SetScrnInfoModes, but it applies the 'compat' output
-mode list to the set of modes advertised by the DGA extension; it needs to
-be called whenever xf86ProbeOutputModes is invoked.
-
- void
- xf86DisableUnusedFunctions(ScrnInfoPtr pScrn)
-
-After any sequence of calls using xf86CrtcSetMode, this function cleans up
-any leftover Output and CRTC objects by disabling them, saving power. It is
-safe to call this whenever the server is running as it only disables objects
-which are not currently in use.
-
-4. CRTC operations
-
-4.1 CRTC functions
-
-These functions provide an abstract interface for the CRTC object; most
-manipulation of the CRTC object is done through these functions.
-
- void
- crtc->funcs->dpms (xf86CrtcPtr crtc, int mode)
-
-Where 'mode' is one of DPMSModeOff, DPMSModeSuspend, DPMSModeStandby or
-DPMSModeOn. This requests that the crtc go to the specified power state.
-When changing power states, the output dpms functions are invoked before the
-crtc dpms functions.
-
- void
- crtc->funcs->save (xf86CrtcPtr crtc)
-
- void
- crtc->funcs->restore (xf86CrtcPtr crtc)
-
-Preserve/restore any register contents related to the CRTC. These are
-strictly a convenience for the driver writer; if the existing driver has
-fully operation save/restore functions, you need not place any additional
-code here. In particular, the server itself never uses this function.
-
- Bool
- crtc->funcs->lock (xf86CrtcPtr crtc)
-
- void
- crtc->funcs->unlock (xf86CrtcPtr crtc)
-
-These functions are invoked around mode setting operations; the intent is
-that DRI locking be done here to prevent DRI applications from manipulating
-the hardware while the server is busy changing the output configuration. If
-the lock function returns FALSE, the unlock function will not be invoked.
-
- Bool
- crtc->funcs->mode_fixup (xf86CrtcPtr crtc,
- DisplayModePtr mode,
- DisplayModePtr adjusted_mode)
-
-This call gives the CRTC a chance to see what mode will be set and to
-comment on the mode by changing 'adjusted_mode' as needed. This function
-shall not modify the state of the crtc hardware at all. If the CRTC cannot
-accept this mode, this function may return FALSE.
-
- void
- crtc->funcs->prepare (xf86CrtcPtr crtc)
-
-This call is made just before the mode is set to make the hardware ready for
-the operation. A usual function to perform here is to disable the crtc so
-that mode setting can occur with clocks turned off and outputs deactivated.
-
- void
- crtc->funcs->mode_set (xf86CrtcPtr crtc,
- DisplayModePtr mode,
- DisplayModePtr adjusted_mode)
-
-This function applies the specified mode (possibly adjusted by the CRTC
-and/or Outputs).
-
- void
- crtc->funcs->commit (xf86CrtcPtr crtc)
-
-Once the mode has been applied to the CRTC and Outputs, this function is
-invoked to let the hardware turn things back on.
-
- void
- crtc->funcs->gamma_set (xf86CrtcPtr crtc, CARD16 *red,
- CARD16 *green, CARD16 *blue, int size)
-
-This function adjusts the gamma ramps for the specified crtc.
-
- void *
- crtc->funcs->shadow_allocate (xf86CrtcPtr crtc, int width, int height)
-
-This function allocates frame buffer space for a shadow frame buffer. When
-allocated, the crtc must scan from the shadow instead of the main frame
-buffer. This is used for rotation. The address returned is passed to the
-shadow_create function. This function should return NULL on failure.
-
- PixmapPtr
- crtc->funcs->shadow_create (xf86CrtcPtr crtc, void *data,
- int width, int height)
-
-This function creates a pixmap object that will be used as a shadow of the
-main frame buffer for CRTCs which are rotated or reflected. 'data' is the
-value returned by shadow_allocate.
-
- void
- crtc->funcs->shadow_destroy (xf86CrtcPtr crtc, PixmapPtr pPixmap,
- void *data)
-
-Destroys any associated shadow objects. If pPixmap is NULL, then a pixmap
-was not created, but 'data' may still be non-NULL indicating that the shadow
-had been allocated.
-
- void
- crtc->funcs->destroy (xf86CrtcPtr crtc)
-
-When a CRTC is destroyed (which only happens in error cases), this function
-can clean up any driver-specific data.
-
-4.2 CRTC fields
-
-The CRTC object is not opaque; there are several fields of interest to the
-driver writer.
-
- struct _xf86Crtc {
- /**
- * Associated ScrnInfo
- */
- ScrnInfoPtr scrn;
-
- /**
- * Active state of this CRTC
- *
- * Set when this CRTC is driving one or more outputs
- */
- Bool enabled;
-
- /** Track whether cursor is within CRTC range */
- Bool cursorInRange;
-
- /** Track state of cursor associated with this CRTC */
- Bool cursorShown;
-
- /**
- * Active mode
- *
- * This reflects the mode as set in the CRTC currently
- * It will be cleared when the VT is not active or
- * during server startup
- */
- DisplayModeRec mode;
- Rotation rotation;
- PixmapPtr rotatedPixmap;
- void *rotatedData;
-
- /**
- * Position on screen
- *
- * Locates this CRTC within the frame buffer
- */
- int x, y;
-
- /**
- * Desired mode
- *
- * This is set to the requested mode, independent of
- * whether the VT is active. In particular, it receives
- * the startup configured mode and saves the active mode
- * on VT switch.
- */
- DisplayModeRec desiredMode;
- Rotation desiredRotation;
- int desiredX, desiredY;
-
- /** crtc-specific functions */
- const xf86CrtcFuncsRec *funcs;
-
- /**
- * Driver private
- *
- * Holds driver-private information
- */
- void *driver_private;
- #ifdef RANDR_12_INTERFACE
- /**
- * RandR crtc
- *
- * When RandR 1.2 is available, this
- * points at the associated crtc object
- */
- RRCrtcPtr randr_crtc;
- #else
- void *randr_crtc;
- #endif
- };
-
-
-5. Output functions.
-
-6. Configuration
-
-Because the configuration file syntax is fixed,
-this was done by creating new "Driver" section options that hook specific
-outputs to specific "Monitor" sections in the file. The option:
-section of the form:
-
- Option "monitor-VGA" "My VGA Monitor"
-
-connects the VGA output of this driver to the "Monitor" section with
-Identifier "My VGA Monitor". All of the usual monitor options can now be
-placed in that "Monitor" section and will be applied to the VGA output
-configuration.
diff --git a/xorg-server/hw/xfree86/doc/devel/Makefile.in b/xorg-server/hw/xfree86/doc/devel/Makefile.in
index c3776b573..754c3f2d5 100644
--- a/xorg-server/hw/xfree86/doc/devel/Makefile.in
+++ b/xorg-server/hw/xfree86/doc/devel/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -240,8 +240,11 @@ SHELL = @SHELL@
SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@
SOLARIS_INOUT_ARCH = @SOLARIS_INOUT_ARCH@
STRIP = @STRIP@
+SYSCONFDIR = @SYSCONFDIR@
TSLIB_CFLAGS = @TSLIB_CFLAGS@
TSLIB_LIBS = @TSLIB_LIBS@
+UDEV_CFLAGS = @UDEV_CFLAGS@
+UDEV_LIBS = @UDEV_LIBS@
UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
VERSION = @VERSION@
@@ -301,6 +304,7 @@ XWIN_SERVER_NAME = @XWIN_SERVER_NAME@
XWIN_SYS_LIBS = @XWIN_SYS_LIBS@
YACC = @YACC@
YFLAGS = @YFLAGS@
+__XCONFIGDIR__ = @__XCONFIGDIR__@
__XCONFIGFILE__ = @__XCONFIGFILE__@
abi_ansic = @abi_ansic@
abi_extension = @abi_extension@
diff --git a/xorg-server/hw/xfree86/doc/man/Makefile.in b/xorg-server/hw/xfree86/doc/man/Makefile.in
index 992f16cc3..61bb2cc5a 100644
--- a/xorg-server/hw/xfree86/doc/man/Makefile.in
+++ b/xorg-server/hw/xfree86/doc/man/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -266,8 +266,11 @@ SHELL = @SHELL@
SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@
SOLARIS_INOUT_ARCH = @SOLARIS_INOUT_ARCH@
STRIP = @STRIP@
+SYSCONFDIR = @SYSCONFDIR@
TSLIB_CFLAGS = @TSLIB_CFLAGS@
TSLIB_LIBS = @TSLIB_LIBS@
+UDEV_CFLAGS = @UDEV_CFLAGS@
+UDEV_LIBS = @UDEV_LIBS@
UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
VERSION = @VERSION@
@@ -327,6 +330,7 @@ XWIN_SERVER_NAME = @XWIN_SERVER_NAME@
XWIN_SYS_LIBS = @XWIN_SYS_LIBS@
YACC = @YACC@
YFLAGS = @YFLAGS@
+__XCONFIGDIR__ = @__XCONFIGDIR__@
__XCONFIGFILE__ = @__XCONFIGFILE__@
abi_ansic = @abi_ansic@
abi_extension = @abi_extension@
@@ -428,7 +432,9 @@ MANDEFS = \
-D__adminmansuffix__=$(ADMIN_MAN_SUFFIX) \
-D__mandir__=$(mandir) \
-D__projectroot__=$(prefix) \
- -D__xconfigfile__=$(__XCONFIGFILE__) -D__xconfigdir__=$(XCONFIGDIR) \
+ -D__datadir__=$(datadir) \
+ -D__xconfigfile__=$(__XCONFIGFILE__) \
+ -D__xconfigdir__=$(__XCONFIGDIR__) \
-D__xkbdir__=$(XKB_BASE_DIRECTORY) \
-D__modulepath__="$(DEFAULT_MODULE_PATH)" \
-D__xlogfile__=$(XLOGFILE) -D__xservername__=$(XSERVERNAME)
diff --git a/xorg-server/hw/xfree86/doc/man/xorg.conf.man.pre b/xorg-server/hw/xfree86/doc/man/xorg.conf.man.pre
index 222530b41..c8a3c3ac2 100644
--- a/xorg-server/hw/xfree86/doc/man/xorg.conf.man.pre
+++ b/xorg-server/hw/xfree86/doc/man/xorg.conf.man.pre
@@ -1021,7 +1021,7 @@ The
entry specifies the name of the driver to use for this input device.
After all classes have been examined, the
.RI \*q inputdriver \*q
-module from the final
+module from the first
.B Driver
entry will be enabled when using the loadable server.
.PP
@@ -1039,17 +1039,29 @@ The allowed matching entries are shown below.
.BI "MatchProduct \*q" matchproduct \*q
This entry can be used to check if the substring
.RI \*q matchproduct \*q
-occurs in the device's product name.
+occurs in the device's product name. Multiple substrings can be matched by
+separating arguments with a '|' character.
.TP 7
.BI "MatchVendor \*q" matchvendor \*q
This entry can be used to check if the substring
.RI \*q matchvendor \*q
-occurs in the device's vendor name.
+occurs in the device's vendor name. Multiple substrings can be matched by
+separating arguments with a '|' character.
.TP 7
.BI "MatchDevicePath \*q" matchdevice \*q
This entry can be used to check if the device file matches the
.RI \*q matchdevice \*q
-pathname pattern.
+pathname pattern. Multiple patterns can be matched by separating arguments
+with a '|' character.
+.TP 7
+.BI "MatchTag \*q" matchtag \*q
+This entry can be used to check if tags assigned by the config backend
+matches the
+.RI \*q matchtag \*q
+pattern. Multiple patterns can be matched by separating arguments
+with a '|' character. A match is found if at least one of the tags given in
+.RI \*q matchtag \*q
+matches at least one of the tags assigned by the backend.
.TP 7
.BI "MatchIsKeyboard \*q" bool \*q
.TP 7
@@ -1070,11 +1082,20 @@ When an input device has been matched to the
.B InputClass
section, any
.B Option
-entries are applied to the device. See the
+entries are applied to the device. One
+.B InputClass
+specific
+.B Option
+is recognized. See the
.B InputDevice
-section above for a description of the various
+section above for a description of the remaining
.B Option
entries.
+.TP 7
+.BI "Option \*qIgnore\*q \*q" boolean \*q
+This optional entry specifies that the device should be ignored entirely,
+and not added to the server. This can be useful when the device is handled
+by another program and no X events should be generated.
.SH "DEVICE SECTION"
The config file may have multiple
.B Device
diff --git a/xorg-server/hw/xfree86/doc/sgml/Makefile.in b/xorg-server/hw/xfree86/doc/sgml/Makefile.in
index 0fb1a10ce..8f2b24e3f 100644
--- a/xorg-server/hw/xfree86/doc/sgml/Makefile.in
+++ b/xorg-server/hw/xfree86/doc/sgml/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -260,8 +260,11 @@ SHELL = @SHELL@
SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@
SOLARIS_INOUT_ARCH = @SOLARIS_INOUT_ARCH@
STRIP = @STRIP@
+SYSCONFDIR = @SYSCONFDIR@
TSLIB_CFLAGS = @TSLIB_CFLAGS@
TSLIB_LIBS = @TSLIB_LIBS@
+UDEV_CFLAGS = @UDEV_CFLAGS@
+UDEV_LIBS = @UDEV_LIBS@
UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
VERSION = @VERSION@
@@ -321,6 +324,7 @@ XWIN_SERVER_NAME = @XWIN_SERVER_NAME@
XWIN_SYS_LIBS = @XWIN_SYS_LIBS@
YACC = @YACC@
YFLAGS = @YFLAGS@
+__XCONFIGDIR__ = @__XCONFIGDIR__@
__XCONFIGFILE__ = @__XCONFIGFILE__@
abi_ansic = @abi_ansic@
abi_extension = @abi_extension@
diff --git a/xorg-server/hw/xfree86/dri/Makefile.in b/xorg-server/hw/xfree86/dri/Makefile.in
index 812401a3d..592bb760c 100644
--- a/xorg-server/hw/xfree86/dri/Makefile.in
+++ b/xorg-server/hw/xfree86/dri/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -292,8 +292,11 @@ SHELL = @SHELL@
SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@
SOLARIS_INOUT_ARCH = @SOLARIS_INOUT_ARCH@
STRIP = @STRIP@
+SYSCONFDIR = @SYSCONFDIR@
TSLIB_CFLAGS = @TSLIB_CFLAGS@
TSLIB_LIBS = @TSLIB_LIBS@
+UDEV_CFLAGS = @UDEV_CFLAGS@
+UDEV_LIBS = @UDEV_LIBS@
UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
VERSION = @VERSION@
@@ -353,6 +356,7 @@ XWIN_SERVER_NAME = @XWIN_SERVER_NAME@
XWIN_SYS_LIBS = @XWIN_SYS_LIBS@
YACC = @YACC@
YFLAGS = @YFLAGS@
+__XCONFIGDIR__ = @__XCONFIGDIR__@
__XCONFIGFILE__ = @__XCONFIGFILE__@
abi_ansic = @abi_ansic@
abi_extension = @abi_extension@
diff --git a/xorg-server/hw/xfree86/dri2/Makefile.in b/xorg-server/hw/xfree86/dri2/Makefile.in
index bde6c1aa0..ea77660c5 100644
--- a/xorg-server/hw/xfree86/dri2/Makefile.in
+++ b/xorg-server/hw/xfree86/dri2/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -291,8 +291,11 @@ SHELL = @SHELL@
SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@
SOLARIS_INOUT_ARCH = @SOLARIS_INOUT_ARCH@
STRIP = @STRIP@
+SYSCONFDIR = @SYSCONFDIR@
TSLIB_CFLAGS = @TSLIB_CFLAGS@
TSLIB_LIBS = @TSLIB_LIBS@
+UDEV_CFLAGS = @UDEV_CFLAGS@
+UDEV_LIBS = @UDEV_LIBS@
UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
VERSION = @VERSION@
@@ -352,6 +355,7 @@ XWIN_SERVER_NAME = @XWIN_SERVER_NAME@
XWIN_SYS_LIBS = @XWIN_SYS_LIBS@
YACC = @YACC@
YFLAGS = @YFLAGS@
+__XCONFIGDIR__ = @__XCONFIGDIR__@
__XCONFIGFILE__ = @__XCONFIGFILE__@
abi_ansic = @abi_ansic@
abi_extension = @abi_extension@
diff --git a/xorg-server/hw/xfree86/exa/Makefile.in b/xorg-server/hw/xfree86/exa/Makefile.in
index 9a5088fe0..b3eb780d4 100644
--- a/xorg-server/hw/xfree86/exa/Makefile.in
+++ b/xorg-server/hw/xfree86/exa/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -295,8 +295,11 @@ SHELL = @SHELL@
SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@
SOLARIS_INOUT_ARCH = @SOLARIS_INOUT_ARCH@
STRIP = @STRIP@
+SYSCONFDIR = @SYSCONFDIR@
TSLIB_CFLAGS = @TSLIB_CFLAGS@
TSLIB_LIBS = @TSLIB_LIBS@
+UDEV_CFLAGS = @UDEV_CFLAGS@
+UDEV_LIBS = @UDEV_LIBS@
UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
VERSION = @VERSION@
@@ -356,6 +359,7 @@ XWIN_SERVER_NAME = @XWIN_SERVER_NAME@
XWIN_SYS_LIBS = @XWIN_SYS_LIBS@
YACC = @YACC@
YFLAGS = @YFLAGS@
+__XCONFIGDIR__ = @__XCONFIGDIR__@
__XCONFIGFILE__ = @__XCONFIGFILE__@
abi_ansic = @abi_ansic@
abi_extension = @abi_extension@
@@ -464,7 +468,9 @@ MANDEFS = \
-D__adminmansuffix__=$(ADMIN_MAN_SUFFIX) \
-D__mandir__=$(mandir) \
-D__projectroot__=$(prefix) \
- -D__xconfigfile__=$(__XCONFIGFILE__) -D__xconfigdir__=$(XCONFIGDIR) \
+ -D__datadir__=$(datadir) \
+ -D__xconfigfile__=$(__XCONFIGFILE__) \
+ -D__xconfigdir__=$(__XCONFIGDIR__) \
-D__xkbdir__=$(XKB_BASE_DIRECTORY) \
-D__modulepath__="$(DEFAULT_MODULE_PATH)" \
-D__xlogfile__=$(XLOGFILE) -D__xservername__=$(XSERVERNAME)
diff --git a/xorg-server/hw/xfree86/fbdevhw/Makefile.in b/xorg-server/hw/xfree86/fbdevhw/Makefile.in
index 77c4af998..3ededbb5c 100644
--- a/xorg-server/hw/xfree86/fbdevhw/Makefile.in
+++ b/xorg-server/hw/xfree86/fbdevhw/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -300,8 +300,11 @@ SHELL = @SHELL@
SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@
SOLARIS_INOUT_ARCH = @SOLARIS_INOUT_ARCH@
STRIP = @STRIP@
+SYSCONFDIR = @SYSCONFDIR@
TSLIB_CFLAGS = @TSLIB_CFLAGS@
TSLIB_LIBS = @TSLIB_LIBS@
+UDEV_CFLAGS = @UDEV_CFLAGS@
+UDEV_LIBS = @UDEV_LIBS@
UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
VERSION = @VERSION@
@@ -361,6 +364,7 @@ XWIN_SERVER_NAME = @XWIN_SERVER_NAME@
XWIN_SYS_LIBS = @XWIN_SYS_LIBS@
YACC = @YACC@
YFLAGS = @YFLAGS@
+__XCONFIGDIR__ = @__XCONFIGDIR__@
__XCONFIGFILE__ = @__XCONFIGFILE__@
abi_ansic = @abi_ansic@
abi_extension = @abi_extension@
@@ -463,7 +467,9 @@ MANDEFS = \
-D__adminmansuffix__=$(ADMIN_MAN_SUFFIX) \
-D__mandir__=$(mandir) \
-D__projectroot__=$(prefix) \
- -D__xconfigfile__=$(__XCONFIGFILE__) -D__xconfigdir__=$(XCONFIGDIR) \
+ -D__datadir__=$(datadir) \
+ -D__xconfigfile__=$(__XCONFIGFILE__) \
+ -D__xconfigdir__=$(__XCONFIGDIR__) \
-D__xkbdir__=$(XKB_BASE_DIRECTORY) \
-D__modulepath__="$(DEFAULT_MODULE_PATH)" \
-D__xlogfile__=$(XLOGFILE) -D__xservername__=$(XSERVERNAME)
diff --git a/xorg-server/hw/xfree86/i2c/Makefile.in b/xorg-server/hw/xfree86/i2c/Makefile.in
index 8941f8ff5..9b93a76e2 100644
--- a/xorg-server/hw/xfree86/i2c/Makefile.in
+++ b/xorg-server/hw/xfree86/i2c/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -341,8 +341,11 @@ SHELL = @SHELL@
SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@
SOLARIS_INOUT_ARCH = @SOLARIS_INOUT_ARCH@
STRIP = @STRIP@
+SYSCONFDIR = @SYSCONFDIR@
TSLIB_CFLAGS = @TSLIB_CFLAGS@
TSLIB_LIBS = @TSLIB_LIBS@
+UDEV_CFLAGS = @UDEV_CFLAGS@
+UDEV_LIBS = @UDEV_LIBS@
UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
VERSION = @VERSION@
@@ -402,6 +405,7 @@ XWIN_SERVER_NAME = @XWIN_SERVER_NAME@
XWIN_SYS_LIBS = @XWIN_SYS_LIBS@
YACC = @YACC@
YFLAGS = @YFLAGS@
+__XCONFIGDIR__ = @__XCONFIGDIR__@
__XCONFIGFILE__ = @__XCONFIGFILE__@
abi_ansic = @abi_ansic@
abi_extension = @abi_extension@
diff --git a/xorg-server/hw/xfree86/int10/Makefile.in b/xorg-server/hw/xfree86/int10/Makefile.in
index ad75886fc..51c81e1e1 100644
--- a/xorg-server/hw/xfree86/int10/Makefile.in
+++ b/xorg-server/hw/xfree86/int10/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -305,8 +305,11 @@ SHELL = @SHELL@
SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@
SOLARIS_INOUT_ARCH = @SOLARIS_INOUT_ARCH@
STRIP = @STRIP@
+SYSCONFDIR = @SYSCONFDIR@
TSLIB_CFLAGS = @TSLIB_CFLAGS@
TSLIB_LIBS = @TSLIB_LIBS@
+UDEV_CFLAGS = @UDEV_CFLAGS@
+UDEV_LIBS = @UDEV_LIBS@
UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
VERSION = @VERSION@
@@ -366,6 +369,7 @@ XWIN_SERVER_NAME = @XWIN_SERVER_NAME@
XWIN_SYS_LIBS = @XWIN_SYS_LIBS@
YACC = @YACC@
YFLAGS = @YFLAGS@
+__XCONFIGDIR__ = @__XCONFIGDIR__@
__XCONFIGFILE__ = @__XCONFIGFILE__@
abi_ansic = @abi_ansic@
abi_extension = @abi_extension@
diff --git a/xorg-server/hw/xfree86/libxorg.c b/xorg-server/hw/xfree86/libxorg.c
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/xorg-server/hw/xfree86/libxorg.c
diff --git a/xorg-server/hw/xfree86/loader/Makefile.in b/xorg-server/hw/xfree86/loader/Makefile.in
index d17b92392..807676bf4 100644
--- a/xorg-server/hw/xfree86/loader/Makefile.in
+++ b/xorg-server/hw/xfree86/loader/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -265,8 +265,11 @@ SHELL = @SHELL@
SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@
SOLARIS_INOUT_ARCH = @SOLARIS_INOUT_ARCH@
STRIP = @STRIP@
+SYSCONFDIR = @SYSCONFDIR@
TSLIB_CFLAGS = @TSLIB_CFLAGS@
TSLIB_LIBS = @TSLIB_LIBS@
+UDEV_CFLAGS = @UDEV_CFLAGS@
+UDEV_LIBS = @UDEV_LIBS@
UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
VERSION = @VERSION@
@@ -326,6 +329,7 @@ XWIN_SERVER_NAME = @XWIN_SERVER_NAME@
XWIN_SYS_LIBS = @XWIN_SYS_LIBS@
YACC = @YACC@
YFLAGS = @YFLAGS@
+__XCONFIGDIR__ = @__XCONFIGDIR__@
__XCONFIGFILE__ = @__XCONFIGFILE__@
abi_ansic = @abi_ansic@
abi_extension = @abi_extension@
diff --git a/xorg-server/hw/xfree86/loader/sdksyms.c b/xorg-server/hw/xfree86/loader/sdksyms.c
new file mode 100644
index 000000000..66eb840cf
--- /dev/null
+++ b/xorg-server/hw/xfree86/loader/sdksyms.c
@@ -0,0 +1,2350 @@
+/* This file is automatically generated by sdksyms.sh. */
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
+
+/* These must be included first */
+#include "misc.h"
+#include "miscstruct.h"
+
+
+/* render/Makefile.am */
+#include "picture.h"
+#include "mipict.h"
+#include "glyphstr.h"
+#include "picturestr.h"
+#include "renderedge.h"
+
+
+/* fb/Makefile.am -- module */
+/*
+#include "fb.h"
+#include "fbrop.h"
+#include "fboverlay.h"
+#include "wfbrename.h"
+#include "fbpict.h"
+ */
+
+
+/* miext/shadow/Makefile.am -- module */
+/*
+#include "shadow.h"
+ */
+
+
+/* miext/damage/Makefile.am */
+#include "damage.h"
+#include "damagestr.h"
+
+
+/* Xext/Makefile.am -- half is module, half is builtin */
+/*
+#include "xvdix.h"
+#include "xvmcext.h"
+ */
+#include "geext.h"
+#include "geint.h"
+#include "shmint.h"
+#if XINERAMA
+# include "panoramiXsrv.h"
+# include "panoramiX.h"
+#endif
+
+
+/* hw/xfree86/int10/Makefile.am -- module */
+/*
+#include "xf86int10.h"
+ */
+
+
+/* hw/xfree86/i2c/Makefile.am -- "mostly" modules */
+#include "xf86i2c.h"
+/*
+#include "bt829.h"
+#include "fi1236.h"
+#include "msp3430.h"
+#include "tda8425.h"
+#include "tda9850.h"
+#include "tda9885.h"
+#include "uda1380.h"
+#include "i2c_def.h"
+ */
+
+
+/* hw/xfree86/modes/Makefile.am */
+#include "xf86Crtc.h"
+#include "xf86Modes.h"
+#include "xf86RandR12.h"
+/* #include "xf86Rename.h" */
+
+
+/* hw/xfree86/ddc/Makefile.am */
+#include "edid.h"
+#include "xf86DDC.h"
+
+
+/* hw/xfree86/dri2/Makefile.am -- module */
+/*
+#if DRI2
+# include "dri2.h"
+#endif
+ */
+
+
+/* hw/xfree86/vgahw/Makefile.am -- module */
+/*
+#include "vgaHW.h"
+ */
+
+
+/* hw/xfree86/fbdevhw/Makefile.am -- module */
+/*
+#include "fbdevhw.h"
+ */
+
+
+/* hw/xfree86/common/Makefile.am */
+#include "compiler.h"
+#include "fourcc.h"
+#include "xf86.h"
+#include "xf86Module.h"
+#include "xf86Opt.h"
+#include "xf86PciInfo.h"
+#include "xf86Priv.h"
+#include "xf86Privstr.h"
+#include "xf86cmap.h"
+#include "xf86fbman.h"
+#include "xf86str.h"
+#include "xf86Xinput.h"
+#include "xf86VGAarbiter.h"
+#include "xisb.h"
+#if XV
+# include "xf86xv.h"
+# include "xf86xvmc.h"
+# include "xf86xvpriv.h"
+#endif
+/* XF86VidMode code is in libextmod module */
+/*
+#if XF86VIDMODE
+# include "vidmodeproc.h"
+#endif
+ */
+#include "xorgVersion.h"
+#if defined(__sparc__) || defined(__sparc)
+# include "xf86sbusBus.h"
+#endif
+
+
+/* hw/xfree86/ramdac/Makefile.am */
+#include "BT.h"
+#include "IBM.h"
+#include "TI.h"
+#include "xf86Cursor.h"
+#include "xf86RamDac.h"
+
+
+/* hw/xfree86/shadowfb/Makefile.am -- module */
+/*
+#include "shadowfb.h"
+ */
+
+
+/* hw/xfree86/os-support/solaris/Makefile.am */
+#if defined(sun386)
+# include "agpgart.h"
+#endif
+
+
+/* hw/xfree86/os-support/Makefile.am */
+#include "xf86_OSproc.h"
+#include "xf86_OSlib.h"
+
+
+/* hw/xfree86/os-support/bus/Makefile.am */
+#include "xf86Pci.h"
+#if defined(__sparc__) || defined(__sparc)
+# include "xf86Sbus.h"
+#endif
+
+
+/* hw/xfree86/xaa/Makefile.am -- module */
+/*
+#include "xaa.h"
+#include "xaalocal.h"
+#include "xaarop.h"
+#include "xaaWrapper.h"
+ */
+
+
+/* hw/xfree86/dixmods/extmod/Makefile.am -- module */
+/*
+#include "dgaproc.h"
+ */
+
+
+/* hw/xfree86/parser/Makefile.am */
+#include "xf86Parser.h"
+#include "xf86Optrec.h"
+
+
+/* hw/xfree86/vbe/Makefile.am -- module */
+/*
+#include "vbe.h"
+#include "vbeModes.h"
+ */
+
+
+/* hw/xfree86/dri/Makefile.am -- module */
+/*
+#if XF86DRI
+# include "dri.h"
+# include "sarea.h"
+# include "dristruct.h"
+#endif
+ */
+
+
+/* hw/xfree86/xf8_16bpp/Makefile.am -- module */
+/*
+#include "cfb8_16.h"
+ */
+
+
+/* mi/Makefile.am */
+#include "mibank.h"
+#include "micmap.h"
+#include "miline.h"
+#include "mipointer.h"
+#include "mi.h"
+#include "mibstore.h"
+#include "migc.h"
+#include "mipointrst.h"
+#include "mizerarc.h"
+#include "micoord.h"
+#include "mifillarc.h"
+#include "mispans.h"
+#include "miwideline.h"
+#include "mistruct.h"
+#include "mifpoly.h"
+#include "mioverlay.h"
+
+
+/* randr/Makefile.am */
+#include "randrstr.h"
+#include "rrtransform.h"
+
+
+/* dbe/Makefile.am -- module */
+/*
+#include "dbestruct.h"
+ */
+
+
+/* exa/Makefile.am -- module */
+/*
+#include "exa.h"
+ */
+
+
+/* xfixes/Makefile.am */
+#include "xfixes.h"
+
+
+/* include/Makefile.am */
+#include "XIstubs.h"
+#include "bstore.h"
+#include "bstorestr.h"
+#include "closestr.h"
+#include "closure.h"
+#include "colormap.h"
+#include "colormapst.h"
+#include "hotplug.h"
+#include "cursor.h"
+#include "cursorstr.h"
+#include "dix.h"
+#include "dixaccess.h"
+#include "dixevents.h"
+#include "dixfont.h"
+#include "dixfontstr.h"
+#include "dixgrabs.h"
+#include "dixstruct.h"
+#include "exevents.h"
+#include "extension.h"
+#include "extinit.h"
+#include "extnsionst.h"
+#include "gc.h"
+#include "gcstruct.h"
+#include "globals.h"
+#include "input.h"
+#include "inputstr.h"
+/* already included */
+/*
+#include "misc.h"
+#include "miscstruct.h"
+ */
+#include "opaque.h"
+#include "os.h"
+#include "pixmap.h"
+#include "pixmapstr.h"
+#include "privates.h"
+#include "property.h"
+#include "propertyst.h"
+#include "ptrveloc.h"
+#include "region.h"
+#include "regionstr.h"
+#include "registry.h"
+#include "resource.h"
+#include "rgb.h"
+#include "screenint.h"
+#include "scrnintstr.h"
+#include "selection.h"
+#include "servermd.h"
+#include "site.h"
+#include "swaprep.h"
+#include "swapreq.h"
+#include "validate.h"
+#include "window.h"
+#include "windowstr.h"
+#include "xace.h"
+#include "xkbfile.h"
+#include "xkbsrv.h"
+#include "xkbstr.h"
+#include "xkbrules.h"
+#include "xserver-properties.h"
+
+/*
+ * These symbols are referenced to ensure they
+ * will be available in the X Server binary.
+ */
+/* topdir=../../.. */
+_X_HIDDEN void *xorg_symbols[] = {
+ (void *) &WaitForSomething,
+ (void *) &ReadRequestFromClient,
+ (void *) &InsertFakeRequest,
+ (void *) &ResetCurrentRequest,
+ (void *) &FlushAllOutput,
+ (void *) &FlushIfCriticalOutputPending,
+ (void *) &SetCriticalOutputPending,
+ (void *) &WriteToClient,
+ (void *) &ResetOsBuffers,
+ (void *) &InitConnectionLimits,
+ (void *) &NotifyParentProcess,
+ (void *) &CreateWellKnownSockets,
+ (void *) &ResetWellKnownSockets,
+ (void *) &CloseWellKnownConnections,
+ (void *) &AuthorizationIDOfClient,
+ (void *) &ClientAuthorized,
+ (void *) &EstablishNewConnections,
+ (void *) &CheckConnections,
+ (void *) &CloseDownConnection,
+ (void *) &AddGeneralSocket,
+ (void *) &RemoveGeneralSocket,
+ (void *) &AddEnabledDevice,
+ (void *) &RemoveEnabledDevice,
+ (void *) &OnlyListenToOneClient,
+ (void *) &ListenToAllClients,
+ (void *) &IgnoreClient,
+ (void *) &AttendClient,
+ (void *) &MakeClientGrabImpervious,
+ (void *) &MakeClientGrabPervious,
+ (void *) &GetTimeInMillis,
+ (void *) &AdjustWaitForDelay,
+ (void *) &TimerInit,
+ (void *) &TimerForce,
+ (void *) &TimerSet,
+ (void *) &TimerCheck,
+ (void *) &TimerCancel,
+ (void *) &TimerFree,
+ (void *) &SetScreenSaverTimer,
+ (void *) &FreeScreenSaverTimer,
+ (void *) &AutoResetServer,
+ (void *) &GiveUp,
+ (void *) &UseMsg,
+ (void *) &ProcessCommandLine,
+ (void *) &set_font_authorizations,
+ (void *) &Xalloc,
+ (void *) &Xcalloc,
+ (void *) &Xrealloc,
+ (void *) &Xfree,
+ (void *) &XNFalloc,
+ (void *) &XNFcalloc,
+ (void *) &XNFrealloc,
+ (void *) &Xstrdup,
+ (void *) &XNFstrdup,
+ (void *) &Xprintf,
+ (void *) &Xvprintf,
+ (void *) &XNFprintf,
+ (void *) &XNFvprintf,
+ (void *) &OsSignal,
+ (void *) &OsRegisterSigWrapper,
+ (void *) &auditTrailLevel,
+ (void *) &LockServer,
+ (void *) &UnlockServer,
+ (void *) &OsLookupColor,
+ (void *) &OsInit,
+ (void *) &OsCleanup,
+ (void *) &OsVendorFatalError,
+ (void *) &OsVendorInit,
+ (void *) &OsBlockSignals,
+ (void *) &OsReleaseSignals,
+ (void *) &System,
+ (void *) &Popen,
+ (void *) &Pclose,
+ (void *) &Fopen,
+ (void *) &Fclose,
+ (void *) &CheckUserParameters,
+ (void *) &CheckUserAuthorization,
+ (void *) &AddHost,
+ (void *) &ForEachHostInFamily,
+ (void *) &RemoveHost,
+ (void *) &GetHosts,
+ (void *) &InvalidHost,
+ (void *) &LocalClient,
+ (void *) &LocalClientCred,
+ (void *) &GetLocalClientCreds,
+ (void *) &FreeLocalClientCreds,
+ (void *) &ChangeAccessControl,
+ (void *) &GetAccessControl,
+ (void *) &AddLocalHosts,
+ (void *) &ResetHosts,
+ (void *) &EnableLocalHost,
+ (void *) &DisableLocalHost,
+ (void *) &AccessUsingXdmcp,
+ (void *) &DefineSelf,
+ (void *) &AugmentSelf,
+ (void *) &RegisterAuthorizations,
+ (void *) &InitAuthorization,
+ (void *) &AuthorizationFromID,
+ (void *) &CheckAuthorization,
+ (void *) &ResetAuthorization,
+ (void *) &RemoveAuthorization,
+ (void *) &AddAuthorization,
+ (void *) &ddxProcessArgument,
+ (void *) &ddxUseMsg,
+ (void *) &ReplyCallback,
+ (void *) &FlushCallback,
+ (void *) &AbortDDX,
+ (void *) &ddxGiveUp,
+ (void *) &TimeSinceLastInputEvent,
+ (void *) &strlcpy,
+ (void *) &strlcat,
+ (void *) &LogInit,
+ (void *) &LogClose,
+ (void *) &LogSetParameter,
+ (void *) &LogVWrite,
+ (void *) &LogWrite,
+ (void *) &LogVMessageVerb,
+ (void *) &LogMessageVerb,
+ (void *) &LogMessage,
+ (void *) &FreeAuditTimer,
+ (void *) &AuditF,
+ (void *) &VAuditF,
+ (void *) &FatalError,
+ (void *) &VErrorF,
+ (void *) &ErrorF,
+ (void *) &Error,
+ (void *) &LogPrintMarkers,
+ (void *) &xorg_backtrace,
+ (void *) &xstrtokenize,
+ (void *) &SwapLongs,
+ (void *) &SwapShorts,
+ (void *) &MakePredeclaredAtoms,
+ (void *) &Ones,
+ (void *) &globalSerialNumber,
+ (void *) &serverGeneration,
+ (void *) &AddScreen,
+ (void *) &GetScratchPixmapHeader,
+ (void *) &FreeScratchPixmapHeader,
+ (void *) &CreateScratchPixmapsForScreen,
+ (void *) &FreeScratchPixmapsForScreen,
+ (void *) &AllocatePixmap,
+ (void *) &ValidateGC,
+ (void *) &ChangeGC,
+ (void *) &DoChangeGC,
+ (void *) &dixChangeGC,
+ (void *) &CreateGC,
+ (void *) &CopyGC,
+ (void *) &FreeGC,
+ (void *) &CreateScratchGC,
+ (void *) &FreeGCperDepth,
+ (void *) &CreateGCperDepth,
+ (void *) &CreateDefaultStipple,
+ (void *) &FreeDefaultStipple,
+ (void *) &SetDashes,
+ (void *) &VerifyRectOrder,
+ (void *) &SetClipRects,
+ (void *) &GetScratchGC,
+ (void *) &FreeScratchGC,
+ (void *) &miEmptyBox,
+ (void *) &miEmptyData,
+ (void *) &miBrokenData,
+ (void *) &InitRegions,
+ (void *) &miRegionCreate,
+ (void *) &miRegionInit,
+ (void *) &miRegionDestroy,
+ (void *) &miRegionUninit,
+ (void *) &miRegionCopy,
+ (void *) &miIntersect,
+ (void *) &miUnion,
+ (void *) &miRegionAppend,
+ (void *) &miRegionValidate,
+ (void *) &miRectsToRegion,
+ (void *) &miSubtract,
+ (void *) &miInverse,
+ (void *) &miRectIn,
+ (void *) &miTranslateRegion,
+ (void *) &miRegionReset,
+ (void *) &miRegionBreak,
+ (void *) &miPointInRegion,
+ (void *) &miRegionEqual,
+ (void *) &miRegionNotEmpty,
+ (void *) &miRegionEmpty,
+ (void *) &miRegionExtents,
+ (void *) &miPrintRegion,
+ (void *) &TraverseTree,
+ (void *) &WalkTree,
+ (void *) &CreateRootWindow,
+ (void *) &InitRootWindow,
+ (void *) &RegisterRealChildHeadProc,
+ (void *) &RealChildHead,
+ (void *) &CreateWindow,
+ (void *) &DeleteWindow,
+ (void *) &DestroySubwindows,
+ (void *) &ChangeWindowAttributes,
+ (void *) &ChangeWindowDeviceCursor,
+ (void *) &WindowGetDeviceCursor,
+ (void *) &GetWindowAttributes,
+ (void *) &GravityTranslate,
+ (void *) &ConfigureWindow,
+ (void *) &CirculateWindow,
+ (void *) &ReparentWindow,
+ (void *) &MapWindow,
+ (void *) &MapSubwindows,
+ (void *) &UnmapWindow,
+ (void *) &UnmapSubwindows,
+ (void *) &HandleSaveSet,
+ (void *) &PointInWindowIsVisible,
+ (void *) &NotClippedByChildren,
+ (void *) &SendVisibilityNotify,
+ (void *) &dixSaveScreens,
+ (void *) &SaveScreens,
+ (void *) &FindWindowWithOptional,
+ (void *) &CheckWindowOptionalNeed,
+ (void *) &MakeWindowOptional,
+ (void *) &MoveWindowInStack,
+ (void *) &SetWinSize,
+ (void *) &SetBorderSize,
+ (void *) &ResizeChildrenWinSize,
+ (void *) &ShapeExtensionInit,
+ (void *) &SendShapeNotify,
+ (void *) &CreateBoundingShape,
+ (void *) &CreateClipShape,
+ (void *) &DisableMapUnmapEvents,
+ (void *) &EnableMapUnmapEvents,
+ (void *) &XkbRF_GetComponents,
+ (void *) &XkbRF_LoadRules,
+ (void *) &XkbRF_LoadRulesByName,
+ (void *) &XkbRF_Create,
+ (void *) &XkbRF_Free,
+ (void *) &InputEventList,
+ (void *) &InputEventListLen,
+ (void *) &defaultKeyboardControl,
+ (void *) &defaultPointerControl,
+ (void *) &set_key_down,
+ (void *) &set_key_up,
+ (void *) &key_is_down,
+ (void *) &InitCoreDevices,
+ (void *) &InitXTestDevices,
+ (void *) &AddInputDevice,
+ (void *) &EnableDevice,
+ (void *) &ActivateDevice,
+ (void *) &DisableDevice,
+ (void *) &InitAndStartDevices,
+ (void *) &CloseDownDevices,
+ (void *) &UndisplayDevices,
+ (void *) &RemoveDevice,
+ (void *) &NumMotionEvents,
+ (void *) &RegisterPointerDevice,
+ (void *) &RegisterKeyboardDevice,
+ (void *) &dixLookupDevice,
+ (void *) &QueryMinMaxKeyCodes,
+ (void *) &SetKeySymsMap,
+ (void *) &InitButtonClassDeviceStruct,
+ (void *) &InitValuatorClassDeviceStruct,
+ (void *) &InitPointerAccelerationScheme,
+ (void *) &InitAbsoluteClassDeviceStruct,
+ (void *) &InitFocusClassDeviceStruct,
+ (void *) &InitPtrFeedbackClassDeviceStruct,
+ (void *) &InitStringFeedbackClassDeviceStruct,
+ (void *) &InitBellFeedbackClassDeviceStruct,
+ (void *) &InitLedFeedbackClassDeviceStruct,
+ (void *) &InitIntegerFeedbackClassDeviceStruct,
+ (void *) &InitPointerDeviceStruct,
+ (void *) &InitKeyboardDeviceStruct,
+ (void *) &ApplyPointerMapping,
+ (void *) &BadDeviceMap,
+ (void *) &NoteLedState,
+ (void *) &MaybeStopHint,
+ (void *) &ProcessPointerEvent,
+ (void *) &ProcessKeyboardEvent,
+ (void *) &LegalModifier,
+ (void *) &ProcessInputEvents,
+ (void *) &InitInput,
+ (void *) &GetMaximumEventsNum,
+ (void *) &GetEventList,
+ (void *) &InitEventList,
+ (void *) &FreeEventList,
+ (void *) &CreateClassesChangedEvent,
+ (void *) &GetPointerEvents,
+ (void *) &GetKeyboardEvents,
+ (void *) &GetKeyboardValuatorEvents,
+ (void *) &GetProximityEvents,
+ (void *) &PostSyntheticMotion,
+ (void *) &GetMotionHistorySize,
+ (void *) &AllocateMotionHistory,
+ (void *) &GetMotionHistory,
+ (void *) &AttachDevice,
+ (void *) &GetPairedDevice,
+ (void *) &GetMaster,
+ (void *) &AllocDevicePair,
+ (void *) &DeepCopyDeviceClasses,
+ (void *) &generate_modkeymap,
+ (void *) &change_modmap,
+ (void *) &AllocXTestDevice,
+ (void *) &IsXTestDevice,
+ (void *) &GetXTestDevice,
+ (void *) &SendDevicePresenceEvent,
+ (void *) &GetEventFilter,
+ (void *) &GetWindowXI2Mask,
+ (void *) &NewInputDeviceRequest,
+ (void *) &DeleteInputDeviceRequest,
+ (void *) &DDXRingBell,
+ (void *) &EnableCursor,
+ (void *) &cursorScreenDevPriv,
+ (void *) &rootCursor,
+ (void *) &FreeCursor,
+ (void *) &AllocARGBCursor,
+ (void *) &AllocGlyphCursor,
+ (void *) &CreateRootCursor,
+ (void *) &ServerBitsFromGlyph,
+ (void *) &CursorMetricsFromGlyph,
+ (void *) &CheckCursorConfinement,
+ (void *) &NewCurrentScreen,
+ (void *) &PointerConfinedToScreen,
+ (void *) &GetSpritePosition,
+ (void *) &XineramaGetCursorScreen,
+ (void *) &GEExtensions,
+ (void *) &GERegisterExtension,
+ (void *) &GEInitEvent,
+ (void *) &GEExtensionInit,
+ (void *) &clients,
+ (void *) &serverClient,
+ (void *) &currentMaxClients,
+ (void *) &dispatchExceptionAtReset,
+ (void *) &checkForInput,
+ (void *) &SetInputCheck,
+ (void *) &CloseDownClient,
+ (void *) &UpdateCurrentTime,
+ (void *) &UpdateCurrentTimeIf,
+ (void *) &dixDestroyPixmap,
+ (void *) &InitClient,
+ (void *) &NextAvailableClient,
+ (void *) &SendErrorToClient,
+ (void *) &MarkClientException,
+ (void *) &CreateConnectionBlock,
+ (void *) &CompareISOLatin1Lowered,
+ (void *) &dixLookupWindow,
+ (void *) &dixLookupDrawable,
+ (void *) &dixLookupGC,
+ (void *) &dixLookupClient,
+ (void *) &NoopDDA,
+ (void *) &AlterSaveSetForClient,
+ (void *) &DeleteWindowFromAnySaveSet,
+ (void *) &BlockHandler,
+ (void *) &WakeupHandler,
+ (void *) &RegisterBlockAndWakeupHandlers,
+ (void *) &RemoveBlockAndWakeupHandlers,
+ (void *) &InitBlockAndWakeupHandlers,
+ (void *) &ProcessWorkQueue,
+ (void *) &ProcessWorkQueueZombies,
+ (void *) &QueueWorkProc,
+ (void *) &ClientSleep,
+ (void *) &ClientSignal,
+ (void *) &ClientWakeup,
+ (void *) &ClientIsAsleep,
+ (void *) &MakeAtom,
+ (void *) &ValidAtom,
+ (void *) &NameForAtom,
+ (void *) &AtomError,
+ (void *) &FreeAllAtoms,
+ (void *) &InitAtoms,
+ (void *) &SetVendorRelease,
+ (void *) &SetVendorString,
+ (void *) &SetMaskForEvent,
+ (void *) &ConfineToShape,
+ (void *) &IsParent,
+ (void *) &GetCurrentRootWindow,
+ (void *) &GetSpriteWindow,
+ (void *) &NoticeEventTime,
+ (void *) &EnqueueEvent,
+ (void *) &ActivatePointerGrab,
+ (void *) &DeactivatePointerGrab,
+ (void *) &ActivateKeyboardGrab,
+ (void *) &DeactivateKeyboardGrab,
+ (void *) &ActivateFocusInGrab,
+ (void *) &AllowSome,
+ (void *) &ReleaseActiveGrabs,
+ (void *) &DeliverEventsToWindow,
+ (void *) &DeliverDeviceEvents,
+ (void *) &InitializeSprite,
+ (void *) &UpdateSpriteForScreen,
+ (void *) &WindowHasNewCursor,
+ (void *) &CheckDeviceGrabs,
+ (void *) &DeliverFocusedEvent,
+ (void *) &DeliverGrabbedEvent,
+ (void *) &FixKeyState,
+ (void *) &RecalculateDeliverableEvents,
+ (void *) &OtherClientGone,
+ (void *) &DoFocusEvents,
+ (void *) &SetInputFocus,
+ (void *) &GrabDevice,
+ (void *) &InitEvents,
+ (void *) &CloseDownEvents,
+ (void *) &DeleteWindowFromAnyEvents,
+ (void *) &EventMaskForClient,
+ (void *) &DeliverEvents,
+ (void *) &CheckMotion,
+ (void *) &WriteEventsToClient,
+ (void *) &TryClientEvents,
+ (void *) &WindowsRestructured,
+ (void *) &SetClientPointer,
+ (void *) &PickPointer,
+ (void *) &PickKeyboard,
+ (void *) &IsInterferingGrab,
+ (void *) &ReinitializeRootWindow,
+ (void *) &ScreenRestructured,
+ (void *) &ffs,
+ (void *) &AddCallback,
+ (void *) &DeleteCallback,
+ (void *) &CallCallbacks,
+ (void *) &DeleteCallbackList,
+ (void *) &InitCallbackManager,
+ (void *) &ServerGrabCallback,
+ (void *) &EventCallback,
+ (void *) &DeviceEventCallback,
+ (void *) &XItoCoreType,
+ (void *) &DevHasCursor,
+ (void *) &IsPointerDevice,
+ (void *) &IsKeyboardDevice,
+ (void *) &IsPointerEvent,
+ (void *) &IsMaster,
+ (void *) &CopyKeyClass,
+ (void *) &CorePointerProc,
+ (void *) &CoreKeyboardProc,
+ (void *) &SecurityLookupWindow,
+ (void *) &LookupWindow,
+ (void *) &SecurityLookupDrawable,
+ (void *) &LookupDrawable,
+ (void *) &LookupClient,
+ (void *) &ResourceStateCallback,
+ (void *) &CreateNewResourceType,
+ (void *) &CreateNewResourceClass,
+ (void *) &InitClientResources,
+ (void *) &FakeClientID,
+ (void *) &AddResource,
+ (void *) &FreeResource,
+ (void *) &FreeResourceByType,
+ (void *) &ChangeResourceValue,
+ (void *) &FindClientResourcesByType,
+ (void *) &FindAllClientResources,
+ (void *) &FreeClientNeverRetainResources,
+ (void *) &FreeClientResources,
+ (void *) &FreeAllResources,
+ (void *) &LegalNewID,
+ (void *) &LookupClientResourceComplex,
+ (void *) &dixLookupResourceByType,
+ (void *) &dixLookupResourceByClass,
+ (void *) &GetXIDRange,
+ (void *) &GetXIDList,
+ (void *) &lastResourceType,
+ (void *) &TypeMask,
+ (void *) &SecurityLookupIDByType,
+ (void *) &SecurityLookupIDByClass,
+ (void *) &LookupIDByType,
+ (void *) &LookupIDByClass,
+ (void *) &dixRequestPrivate,
+ (void *) &dixAllocatePrivate,
+ (void *) &dixLookupPrivate,
+ (void *) &dixLookupPrivateAddr,
+ (void *) &dixSetPrivate,
+ (void *) &dixRegisterPrivateInitFunc,
+ (void *) &dixRegisterPrivateDeleteFunc,
+ (void *) &dixFreePrivates,
+ (void *) &dixResetPrivates,
+ (void *) &dixLookupPrivateOffset,
+ (void *) &dixRegisterPrivateOffset,
+ (void *) &PictureCmapPolicy,
+ (void *) &PictureParseCmapPolicy,
+ (void *) &RenderErrBase,
+ (void *) &RenderClientPrivateKey,
+ (void *) &CreateColormap,
+ (void *) &FreeColormap,
+ (void *) &TellLostMap,
+ (void *) &TellGainedMap,
+ (void *) &CopyColormapAndFree,
+ (void *) &AllocColor,
+ (void *) &FakeAllocColor,
+ (void *) &FakeFreeColor,
+ (void *) &FindColor,
+ (void *) &QueryColors,
+ (void *) &FreeClientPixels,
+ (void *) &AllocColorCells,
+ (void *) &AllocColorPlanes,
+ (void *) &FreeColors,
+ (void *) &StoreColors,
+ (void *) &IsMapInstalled,
+ (void *) &ResizeVisualArray,
+ (void *) &screenInfo,
+ (void *) &InitOutput,
+ (void *) &FindGlyphHashSet,
+ (void *) &GlyphUninit,
+ (void *) &FindGlyphHashSet,
+ (void *) &FindGlyphRef,
+ (void *) &FindGlyphByHash,
+ (void *) &HashGlyph,
+ (void *) &FreeGlyph,
+ (void *) &AddGlyph,
+ (void *) &DeleteGlyph,
+ (void *) &FindGlyph,
+ (void *) &AllocateGlyph,
+ (void *) &AllocateGlyphHash,
+ (void *) &ResizeGlyphHash,
+ (void *) &ResizeGlyphSet,
+ (void *) &AllocateGlyphSet,
+ (void *) &FreeGlyphSet,
+ (void *) &PictureScreenPrivateKey,
+ (void *) &PictureWindowPrivateKey,
+ (void *) &PictureType,
+ (void *) &PictFormatType,
+ (void *) &GlyphSetType,
+ (void *) &PictureDestroyWindow,
+ (void *) &PictureCloseScreen,
+ (void *) &PictureStoreColors,
+ (void *) &PictureInitIndexedFormat,
+ (void *) &PictureSetSubpixelOrder,
+ (void *) &PictureGetSubpixelOrder,
+ (void *) &PictureCreateDefaultFormats,
+ (void *) &PictureMatchVisual,
+ (void *) &PictureMatchFormat,
+ (void *) &PictureInit,
+ (void *) &PictureGetFilterId,
+ (void *) &PictureGetFilterName,
+ (void *) &PictureAddFilter,
+ (void *) &PictureSetFilterAlias,
+ (void *) &PictureSetDefaultFilters,
+ (void *) &PictureResetFilters,
+ (void *) &PictureFindFilter,
+ (void *) &SetPicturePictFilter,
+ (void *) &SetPictureFilter,
+ (void *) &PictureFinishInit,
+ (void *) &SetPictureToDefaults,
+ (void *) &CreatePicture,
+ (void *) &ChangePicture,
+ (void *) &SetPictureClipRects,
+ (void *) &SetPictureClipRegion,
+ (void *) &SetPictureTransform,
+ (void *) &CopyPicture,
+ (void *) &ValidatePicture,
+ (void *) &FreePicture,
+ (void *) &FreePictFormat,
+ (void *) &CompositePicture,
+ (void *) &CompositeGlyphs,
+ (void *) &CompositeRects,
+ (void *) &CompositeTrapezoids,
+ (void *) &CompositeTriangles,
+ (void *) &CompositeTriStrip,
+ (void *) &CompositeTriFan,
+ (void *) &PictureGradientColor,
+ (void *) &RenderExtensionInit,
+ (void *) &AddTraps,
+ (void *) &CreateSolidPicture,
+ (void *) &CreateLinearGradientPicture,
+ (void *) &CreateRadialGradientPicture,
+ (void *) &CreateConicalGradientPicture,
+ (void *) &PanoramiXRenderInit,
+ (void *) &PanoramiXRenderReset,
+ (void *) &PictTransform_from_xRenderTransform,
+ (void *) &xRenderTransform_from_PictTransform,
+ (void *) &PictureTransformPoint,
+ (void *) &PictureTransformPoint3d,
+ (void *) &miCreatePicture,
+ (void *) &miDestroyPicture,
+ (void *) &miDestroyPictureClip,
+ (void *) &miChangePictureClip,
+ (void *) &miChangePicture,
+ (void *) &miValidatePicture,
+ (void *) &miChangePictureTransform,
+ (void *) &miChangePictureFilter,
+ (void *) &miCompositeSourceValidate,
+ (void *) &miComputeCompositeRegion,
+ (void *) &miPictureInit,
+ (void *) &miRealizeGlyph,
+ (void *) &miUnrealizeGlyph,
+ (void *) &miGlyphs,
+ (void *) &miRenderColorToPixel,
+ (void *) &miRenderPixelToColor,
+ (void *) &miIsSolidAlpha,
+ (void *) &miCompositeRects,
+ (void *) &miTrapezoidBounds,
+ (void *) &miTrapezoids,
+ (void *) &miPointFixedBounds,
+ (void *) &miTriangleBounds,
+ (void *) &miTriangles,
+ (void *) &miTriStrip,
+ (void *) &miTriFan,
+ (void *) &miCreateAlphaPicture,
+ (void *) &miInitIndexed,
+ (void *) &miCloseIndexed,
+ (void *) &miUpdateIndexed,
+ (void *) &RenderSampleCeilY,
+ (void *) &RenderSampleFloorY,
+ (void *) &RenderEdgeStep,
+ (void *) &RenderEdgeInit,
+ (void *) &RenderLineFixedEdgeInit,
+ (void *) &miDamageCreate,
+ (void *) &miDamageRegister,
+ (void *) &miDamageUnregister,
+ (void *) &miDamageDestroy,
+ (void *) &DamageSetup,
+ (void *) &DamageCreate,
+ (void *) &DamageDrawInternal,
+ (void *) &DamageRegister,
+ (void *) &DamageUnregister,
+ (void *) &DamageDestroy,
+ (void *) &DamageSubtract,
+ (void *) &DamageEmpty,
+ (void *) &DamageRegion,
+ (void *) &DamagePendingRegion,
+ (void *) &DamageRegionAppend,
+ (void *) &DamageRegionProcessPending,
+ (void *) &DamageRegionRendered,
+ (void *) &DamageDamageRegion,
+ (void *) &DamageSetReportAfterOp,
+ (void *) &DamageSetPostRenderingFunctions,
+ (void *) &DamageGetScreenFuncs,
+ (void *) &ClientStateCallback,
+ (void *) &ReplyNotSwappd,
+ (void *) &SmartScheduleTime,
+ (void *) &SmartScheduleInterval,
+ (void *) &SmartScheduleSlice,
+ (void *) &SmartScheduleMaxSlice,
+ (void *) &SmartScheduleDisable,
+ (void *) &SmartScheduleStartTimer,
+ (void *) &SmartScheduleStopTimer,
+ (void *) &SmartScheduleInit,
+ (void *) &currentTime,
+ (void *) &lastDeviceEventTime,
+ (void *) &CompareTimeStamps,
+ (void *) &ClientTimeToServerTime,
+ (void *) &InitialVector,
+ (void *) &ProcVector,
+ (void *) &SwappedProcVector,
+ (void *) &ReplySwapVector,
+ (void *) &ProcBadRequest,
+ (void *) &StandardMinorOpcode,
+ (void *) &MinorOpcodeOfRequest,
+ (void *) &EnableDisableExtension,
+ (void *) &EnableDisableExtensionError,
+ (void *) &InitExtensions,
+ (void *) &CloseDownExtensions,
+ (void *) &EventSwapVector,
+ (void *) &NotImplemented,
+ (void *) &AddExtension,
+ (void *) &AddExtensionAlias,
+ (void *) &CheckExtension,
+ (void *) &GetExtensionEntry,
+ (void *) &GEEventType,
+ (void *) &GEEventBase,
+ (void *) &GEErrorBase,
+ (void *) &GEClientPrivateKey,
+ (void *) &ProcGEVector,
+ (void *) &SProcGEVector,
+ (void *) &ShmRegisterFuncs,
+ (void *) &ShmRegisterFbFuncs,
+ (void *) &ShmSegType,
+ (void *) &ShmCompletionCode,
+ (void *) &BadShmSegCode,
+ (void *) &PanoramiXNumScreens,
+ (void *) &panoramiXdataPtr,
+ (void *) &PanoramiXPixWidth,
+ (void *) &PanoramiXPixHeight,
+ (void *) &PanoramiXTranslateVisualID,
+ (void *) &PanoramiXConsolidate,
+ (void *) &PanoramiXCreateConnectionBlock,
+ (void *) &PanoramiXFindIDByScrnum,
+ (void *) &XineramaRegisterConnectionBlockCallback,
+ (void *) &XineramaDeleteResource,
+ (void *) &XineramaReinitData,
+ (void *) &XineramaScreenRegions,
+ (void *) &XRC_DRAWABLE,
+ (void *) &XRT_WINDOW,
+ (void *) &XRT_PIXMAP,
+ (void *) &XRT_GC,
+ (void *) &XRT_COLORMAP,
+ (void *) &XineramaVisualsEqualPtr,
+ (void *) &XineramaGetImageData,
+ (void *) &xf86CreateI2CBusRec,
+ (void *) &xf86DestroyI2CBusRec,
+ (void *) &xf86I2CBusInit,
+ (void *) &xf86I2CFindBus,
+ (void *) &xf86I2CGetScreenBuses,
+ (void *) &xf86CreateI2CDevRec,
+ (void *) &xf86DestroyI2CDevRec,
+ (void *) &xf86I2CDevInit,
+ (void *) &xf86I2CFindDev,
+ (void *) &xf86I2CProbeAddress,
+ (void *) &xf86I2CWriteRead,
+ (void *) &xf86I2CReadStatus,
+ (void *) &xf86I2CReadByte,
+ (void *) &xf86I2CReadBytes,
+ (void *) &xf86I2CReadWord,
+ (void *) &xf86I2CWriteByte,
+ (void *) &xf86I2CWriteBytes,
+ (void *) &xf86I2CWriteWord,
+ (void *) &xf86I2CWriteVec,
+ (void *) &ConfiguredMonitor,
+ (void *) &dixLookupProperty,
+ (void *) &dixChangeWindowProperty,
+ (void *) &ChangeWindowProperty,
+ (void *) &DeleteProperty,
+ (void *) &DeleteAllWindowProperties,
+ (void *) &defaultScreenSaverTime,
+ (void *) &defaultScreenSaverInterval,
+ (void *) &ScreenSaverTime,
+ (void *) &ScreenSaverInterval,
+ (void *) &screenSaverSuspended,
+ (void *) &defaultFontPath,
+ (void *) &monitorResolution,
+ (void *) &defaultColorVisualClass,
+ (void *) &WindowTable,
+ (void *) &GrabInProgress,
+ (void *) &noTestExtensions,
+ (void *) &dixScreenOrigins,
+ (void *) &ConnectionInfo,
+ (void *) &DPMSStandbyTime,
+ (void *) &DPMSSuspendTime,
+ (void *) &DPMSOffTime,
+ (void *) &DPMSPowerLevel,
+ (void *) &DPMSEnabled,
+ (void *) &DPMSDisabledSwitch,
+ (void *) &DPMSCapableFlag,
+ (void *) &PanoramiXExtensionDisabledHack,
+ (void *) &noCompositeExtension,
+ (void *) &noDamageExtension,
+ (void *) &noDbeExtension,
+ (void *) &noDPMSExtension,
+ (void *) &noGlxExtension,
+ (void *) &noScreenSaverExtension,
+ (void *) &noMITShmExtension,
+ (void *) &noRRExtension,
+ (void *) &noRenderExtension,
+ (void *) &noResExtension,
+ (void *) &noXFree86DGAExtension,
+ (void *) &noXFree86DRIExtension,
+ (void *) &noXFixesExtension,
+ (void *) &noPanoramiXExtension,
+ (void *) &noXvExtension,
+ (void *) &noDRI2Extension,
+ (void *) &defaultTextFont,
+ (void *) &defaultCursorFont,
+ (void *) &MaxClients,
+ (void *) &isItTimeToYield,
+ (void *) &dispatchException,
+ (void *) &TimeOutValue,
+ (void *) &ScreenSaverBlanking,
+ (void *) &ScreenSaverAllowExposures,
+ (void *) &defaultScreenSaverBlanking,
+ (void *) &defaultScreenSaverAllowExposures,
+ (void *) &display,
+ (void *) &defaultBackingStore,
+ (void *) &disableBackingStore,
+ (void *) &enableBackingStore,
+ (void *) &PartialNetwork,
+ (void *) &logoScreenSaver,
+ (void *) &defeatAccessControl,
+ (void *) &maxBigRequestSize,
+ (void *) &party_like_its_1989,
+ (void *) &whiteRoot,
+ (void *) &CoreDump,
+ (void *) &DontPropagateMasks,
+ (void *) &screenIsSaved,
+ (void *) &savedScreenInfo,
+ (void *) &PixmapWidthPaddingInfo,
+ (void *) &RRTransformInit,
+ (void *) &RRTransformFini,
+ (void *) &RRTransformEqual,
+ (void *) &RRTransformSetFilter,
+ (void *) &RRTransformCopy,
+ (void *) &RRTransformCompute,
+ (void *) &RREventBase,
+ (void *) &ProcRandrVector,
+ (void *) &SProcRandrVector,
+ (void *) &rrPrivKey,
+ (void *) &RRClientType,
+ (void *) &RRClientPrivateKey,
+ (void *) &RRCrtcType,
+ (void *) &RRExtensionInit,
+ (void *) &RRScreenSetSizeRange,
+ (void *) &RRScreenSizeNotify,
+ (void *) &RRScreenSizeSet,
+ (void *) &RRSendConfigNotify,
+ (void *) &ProcRRGetScreenSizeRange,
+ (void *) &ProcRRSetScreenSize,
+ (void *) &ProcRRGetScreenResources,
+ (void *) &ProcRRGetScreenResourcesCurrent,
+ (void *) &ProcRRSetScreenConfig,
+ (void *) &ProcRRGetScreenInfo,
+ (void *) &RRDeliverScreenEvent,
+ (void *) &miRandRInit,
+ (void *) &miRRGetInfo,
+ (void *) &miRRCrtcSet,
+ (void *) &miRROutputSetProperty,
+ (void *) &miRROutputGetProperty,
+ (void *) &miRROutputValidateMode,
+ (void *) &miRRModeDestroy,
+ (void *) &RRTellChanged,
+ (void *) &RRGetInfo,
+ (void *) &RRInit,
+ (void *) &RRScreenInit,
+ (void *) &RRFirstOutput,
+ (void *) &RRGetRotation,
+ (void *) &RRVerticalRefresh,
+ (void *) &RRRegisterSize,
+ (void *) &RRRegisterRate,
+ (void *) &RRSetCurrentConfig,
+ (void *) &RRScreenInit,
+ (void *) &RRGetRotation,
+ (void *) &RRCrtcChanged,
+ (void *) &RRCrtcCreate,
+ (void *) &RRCrtcSetRotations,
+ (void *) &RRCrtcSetTransformSupport,
+ (void *) &RRCrtcNotify,
+ (void *) &RRDeliverCrtcEvent,
+ (void *) &RRCrtcSet,
+ (void *) &RRCrtcGammaSet,
+ (void *) &RRCrtcGammaGet,
+ (void *) &RRCrtcGammaNotify,
+ (void *) &RRCrtcGammaSetSize,
+ (void *) &RRCrtcGetScanoutSize,
+ (void *) &RRTransformCompute,
+ (void *) &RRCrtcGetTransform,
+ (void *) &RRCrtcPendingTransform,
+ (void *) &RRCrtcDestroy,
+ (void *) &RRCrtcTransformSet,
+ (void *) &RRCrtcInit,
+ (void *) &ProcRRGetCrtcInfo,
+ (void *) &ProcRRSetCrtcConfig,
+ (void *) &ProcRRGetCrtcGammaSize,
+ (void *) &ProcRRGetCrtcGamma,
+ (void *) &ProcRRSetCrtcGamma,
+ (void *) &ProcRRSetCrtcTransform,
+ (void *) &ProcRRGetCrtcTransform,
+ (void *) &RRClientKnowsRates,
+ (void *) &RRModeGet,
+ (void *) &RRModeDestroy,
+ (void *) &RRModesForScreen,
+ (void *) &RRModeInit,
+ (void *) &ProcRRCreateMode,
+ (void *) &ProcRRDestroyMode,
+ (void *) &ProcRRAddOutputMode,
+ (void *) &ProcRRDeleteOutputMode,
+ (void *) &RROutputChanged,
+ (void *) &RROutputCreate,
+ (void *) &RROutputSetClones,
+ (void *) &RROutputSetModes,
+ (void *) &RROutputAddUserMode,
+ (void *) &RROutputDeleteUserMode,
+ (void *) &RROutputSetCrtcs,
+ (void *) &RROutputSetConnection,
+ (void *) &RROutputSetSubpixelOrder,
+ (void *) &RROutputSetPhysicalSize,
+ (void *) &RRDeliverOutputEvent,
+ (void *) &RROutputDestroy,
+ (void *) &ProcRRGetOutputInfo,
+ (void *) &ProcRRSetOutputPrimary,
+ (void *) &ProcRRGetOutputPrimary,
+ (void *) &RROutputInit,
+ (void *) &RRPointerMoved,
+ (void *) &RRPointerScreenConfigured,
+ (void *) &RRDeleteAllOutputProperties,
+ (void *) &RRGetOutputProperty,
+ (void *) &RRQueryOutputProperty,
+ (void *) &RRDeleteOutputProperty,
+ (void *) &RRPostPendingProperties,
+ (void *) &RRChangeOutputProperty,
+ (void *) &RRConfigureOutputProperty,
+ (void *) &ProcRRChangeOutputProperty,
+ (void *) &ProcRRGetOutputProperty,
+ (void *) &ProcRRListOutputProperties,
+ (void *) &ProcRRQueryOutputProperty,
+ (void *) &ProcRRConfigureOutputProperty,
+ (void *) &ProcRRDeleteOutputProperty,
+ (void *) &RRXineramaExtensionInit,
+ (void *) &ExtensionModuleList,
+ (void *) &LoadSubModule,
+ (void *) &UnloadSubModule,
+ (void *) &UnloadModule,
+ (void *) &LoaderSymbol,
+ (void *) &LoaderListDirs,
+ (void *) &LoaderFreeDirList,
+ (void *) &LoaderErrorMsg,
+ (void *) &LoadExtension,
+ (void *) &LoaderGetOS,
+ (void *) &LoaderShouldIgnoreABI,
+ (void *) &LoaderGetABIVersion,
+ (void *) &xf86SetIntOption,
+ (void *) &xf86SetRealOption,
+ (void *) &xf86SetStrOption,
+ (void *) &xf86SetBoolOption,
+ (void *) &xf86CheckIntOption,
+ (void *) &xf86CheckRealOption,
+ (void *) &xf86CheckStrOption,
+ (void *) &xf86CheckBoolOption,
+ (void *) &xf86AddNewOption,
+ (void *) &xf86NewOption,
+ (void *) &xf86NextOption,
+ (void *) &xf86OptionListCreate,
+ (void *) &xf86OptionListMerge,
+ (void *) &xf86OptionListFree,
+ (void *) &xf86OptionName,
+ (void *) &xf86OptionValue,
+ (void *) &xf86OptionListReport,
+ (void *) &xf86FindOption,
+ (void *) &xf86FindOptionValue,
+ (void *) &xf86MarkOptionUsed,
+ (void *) &xf86MarkOptionUsedByName,
+ (void *) &xf86CheckIfOptionUsed,
+ (void *) &xf86CheckIfOptionUsedByName,
+ (void *) &xf86ShowUnusedOptions,
+ (void *) &xf86ProcessOptions,
+ (void *) &xf86TokenToOptinfo,
+ (void *) &xf86TokenToOptName,
+ (void *) &xf86IsOptionSet,
+ (void *) &xf86GetOptValString,
+ (void *) &xf86GetOptValInteger,
+ (void *) &xf86GetOptValULong,
+ (void *) &xf86GetOptValReal,
+ (void *) &xf86GetOptValFreq,
+ (void *) &xf86GetOptValBool,
+ (void *) &xf86ReturnOptValBool,
+ (void *) &xf86NameCmp,
+ (void *) &xf86NormalizeName,
+ (void *) &xf86ReplaceIntOption,
+ (void *) &xf86ReplaceRealOption,
+ (void *) &xf86ReplaceBoolOption,
+ (void *) &xf86ReplaceStrOption,
+ (void *) &pciTag,
+ (void *) &xf86scanpci,
+ (void *) &xf86MapDomainMemory,
+ (void *) &xf86MapLegacyIO,
+ (void *) &xf86DoConfigure,
+ (void *) &xf86DoShowOptions,
+ (void *) &xf86DoConfigurePass1,
+ (void *) &xf86ScreenKey,
+ (void *) &xf86CreateRootWindowKey,
+ (void *) &xf86PixmapKey,
+ (void *) &xf86Screens,
+ (void *) &byte_reversed,
+ (void *) &pciSlotClaimed,
+ (void *) &fbSlotClaimed,
+ (void *) &xf86ConfigDRI,
+ (void *) &xf86inSuspend,
+ (void *) &xf86DRI2Enabled,
+ (void *) &VTSwitchEnabled,
+ (void *) &xf86CheckPciSlot,
+ (void *) &xf86ClaimPciSlot,
+ (void *) &xf86UnclaimPciSlot,
+ (void *) &xf86ParsePciBusString,
+ (void *) &xf86ComparePciBusString,
+ (void *) &xf86FormatPciBusNumber,
+ (void *) &xf86GetFbInfoForScreen,
+ (void *) &xf86ClaimFbSlot,
+ (void *) &xf86ClaimNoSlot,
+ (void *) &xf86EnableAccess,
+ (void *) &xf86IsPrimaryPci,
+ (void *) &xf86DriverHasEntities,
+ (void *) &xf86AddEntityToScreen,
+ (void *) &xf86SetEntityInstanceForScreen,
+ (void *) &xf86GetNumEntityInstances,
+ (void *) &xf86GetDevFromEntity,
+ (void *) &xf86RemoveEntityFromScreen,
+ (void *) &xf86GetEntityInfo,
+ (void *) &xf86GetPciInfoForEntity,
+ (void *) &xf86SetEntityFuncs,
+ (void *) &xf86CheckPciMemBase,
+ (void *) &xf86IsEntityPrimary,
+ (void *) &xf86EnterServerState,
+ (void *) &xf86FindScreenForEntity,
+ (void *) &xf86GetLastScrnFlag,
+ (void *) &xf86SetLastScrnFlag,
+ (void *) &xf86IsEntityShared,
+ (void *) &xf86SetEntityShared,
+ (void *) &xf86IsEntitySharable,
+ (void *) &xf86SetEntitySharable,
+ (void *) &xf86IsPrimInitDone,
+ (void *) &xf86SetPrimInitDone,
+ (void *) &xf86ClearPrimInitDone,
+ (void *) &xf86AllocateEntityPrivateIndex,
+ (void *) &xf86GetEntityPrivate,
+ (void *) &xf86AddBusDeviceToConfigure,
+ (void *) &xf86LockZoom,
+ (void *) &xf86InitViewport,
+ (void *) &xf86SetViewport,
+ (void *) &xf86ZoomViewport,
+ (void *) &xf86SwitchMode,
+ (void *) &xf86GetPointerScreenFuncs,
+ (void *) &xf86InitOrigins,
+ (void *) &xf86ReconfigureLayout,
+ (void *) &xf86CVTMode,
+ (void *) &xf86DPMSInit,
+ (void *) &DPMSSet,
+ (void *) &DPMSSupported,
+ (void *) &DGAInit,
+ (void *) &DGAReInitModes,
+ (void *) &xf86SetDGAMode,
+ (void *) &SetTimeSinceLastInputEvent,
+ (void *) &xf86AddInputHandler,
+ (void *) &xf86RemoveInputHandler,
+ (void *) &xf86DisableInputHandler,
+ (void *) &xf86EnableInputHandler,
+ (void *) &xf86AddGeneralHandler,
+ (void *) &xf86RemoveGeneralHandler,
+ (void *) &xf86DisableGeneralHandler,
+ (void *) &xf86EnableGeneralHandler,
+ (void *) &xf86InterceptSignals,
+ (void *) &xf86InterceptSigIll,
+ (void *) &xf86EnableVTSwitch,
+ (void *) &xf86ProcessActionEvent,
+ (void *) &xf86PrintBacktrace,
+ (void *) &xf86AddDriver,
+ (void *) &xf86DeleteDriver,
+ (void *) &xf86AllocateScreen,
+ (void *) &xf86DeleteScreen,
+ (void *) &xf86AllocateScrnInfoPrivateIndex,
+ (void *) &xf86AddPixFormat,
+ (void *) &xf86SetDepthBpp,
+ (void *) &xf86PrintDepthBpp,
+ (void *) &xf86SetWeight,
+ (void *) &xf86SetDefaultVisual,
+ (void *) &xf86SetGamma,
+ (void *) &xf86SetDpi,
+ (void *) &xf86SetBlackWhitePixels,
+ (void *) &xf86EnableDisableFBAccess,
+ (void *) &xf86VDrvMsgVerb,
+ (void *) &xf86DrvMsgVerb,
+ (void *) &xf86DrvMsg,
+ (void *) &xf86MsgVerb,
+ (void *) &xf86Msg,
+ (void *) &xf86ErrorFVerb,
+ (void *) &xf86ErrorF,
+ (void *) &xf86TokenToString,
+ (void *) &xf86StringToToken,
+ (void *) &xf86ShowClocks,
+ (void *) &xf86PrintChipsets,
+ (void *) &xf86MatchDevice,
+ (void *) &xf86MatchPciInstances,
+ (void *) &xf86GetClocks,
+ (void *) &xf86GetVisualName,
+ (void *) &xf86GetVerbosity,
+ (void *) &xf86GetPix24,
+ (void *) &xf86GetDepth,
+ (void *) &xf86GetWeight,
+ (void *) &xf86GetGamma,
+ (void *) &xf86GetFlipPixels,
+ (void *) &xf86GetServerName,
+ (void *) &xf86ServerIsExiting,
+ (void *) &xf86ServerIsResetting,
+ (void *) &xf86ServerIsInitialising,
+ (void *) &xf86ServerIsOnlyDetecting,
+ (void *) &xf86CaughtSignal,
+ (void *) &xf86GetVidModeAllowNonLocal,
+ (void *) &xf86GetVidModeEnabled,
+ (void *) &xf86GetModInDevAllowNonLocal,
+ (void *) &xf86GetModInDevEnabled,
+ (void *) &xf86GetAllowMouseOpenFail,
+ (void *) &xf86IsPc98,
+ (void *) &xf86DisableRandR,
+ (void *) &xorgGetVersion,
+ (void *) &xf86GetModuleVersion,
+ (void *) &xf86LoadDrvSubModule,
+ (void *) &xf86LoadSubModule,
+ (void *) &xf86LoadOneModule,
+ (void *) &xf86UnloadSubModule,
+ (void *) &xf86LoaderCheckSymbol,
+ (void *) &xf86SetBackingStore,
+ (void *) &xf86SetSilkenMouse,
+ (void *) &xf86FindXvOptions,
+ (void *) &xf86GetOS,
+ (void *) &xf86ConfigPciEntity,
+ (void *) &xf86ConfigFbEntity,
+ (void *) &xf86ConfigActivePciEntity,
+ (void *) &xf86IsScreenPrimary,
+ (void *) &xf86RegisterRootWindowProperty,
+ (void *) &xf86IsUnblank,
+ (void *) &xf86GetPixFormat,
+ (void *) &xf86GetBppFromDepth,
+ (void *) &xf86GetNearestClock,
+ (void *) &xf86ModeStatusToString,
+ (void *) &xf86LookupMode,
+ (void *) &xf86CheckModeForMonitor,
+ (void *) &xf86InitialCheckModeForDriver,
+ (void *) &xf86CheckModeForDriver,
+ (void *) &xf86ValidateModes,
+ (void *) &xf86DeleteMode,
+ (void *) &xf86PruneDriverModes,
+ (void *) &xf86SetCrtcForModes,
+ (void *) &xf86PrintModes,
+ (void *) &xf86ShowClockRanges,
+ (void *) &xf86ModeHSync,
+ (void *) &xf86ModeVRefresh,
+ (void *) &xf86SetModeDefaultName,
+ (void *) &xf86SetModeCrtc,
+ (void *) &xf86DuplicateMode,
+ (void *) &xf86DuplicateModes,
+ (void *) &xf86ModesEqual,
+ (void *) &xf86PrintModeline,
+ (void *) &xf86ModesAdd,
+ (void *) &xf86CollectOptions,
+ (void *) &xf86RandRInit,
+ (void *) &xf86GetRotation,
+ (void *) &xf86RandRSetNewVirtualAndDimensions,
+ (void *) &VidModeExtensionInit,
+ (void *) &xf86addNewOption,
+ (void *) &xf86optionListDup,
+ (void *) &xf86optionListFree,
+ (void *) &xf86optionName,
+ (void *) &xf86optionValue,
+ (void *) &xf86newOption,
+ (void *) &xf86nextOption,
+ (void *) &xf86findOption,
+ (void *) &xf86findOptionValue,
+ (void *) &xf86optionListCreate,
+ (void *) &xf86optionListMerge,
+ (void *) &xf86nameCompare,
+ (void *) &xf86uLongToString,
+ (void *) &xf86parseOption,
+ (void *) &xf86printOptionList,
+ (void *) &xf86initConfigFiles,
+ (void *) &xf86openConfigFile,
+ (void *) &xf86openConfigDirFiles,
+ (void *) &xf86setBuiltinConfig,
+ (void *) &xf86readConfigFile,
+ (void *) &xf86closeConfigFile,
+ (void *) &xf86freeConfig,
+ (void *) &xf86writeConfigFile,
+ (void *) &xf86findDevice,
+ (void *) &xf86findLayout,
+ (void *) &xf86findMonitor,
+ (void *) &xf86findModes,
+ (void *) &xf86findModeLine,
+ (void *) &xf86findScreen,
+ (void *) &xf86findInput,
+ (void *) &xf86findInputByDriver,
+ (void *) &xf86findVideoAdaptor,
+ (void *) &xf86layoutAddInputDevices,
+ (void *) &xf86addListItem,
+ (void *) &xf86itemNotSublist,
+ (void *) &xf86pathIsAbsolute,
+ (void *) &xf86pathIsSafe,
+ (void *) &xf86addComment,
+ (void *) &xf86getBoolValue,
+ (void *) &xf86ModeHSync,
+ (void *) &xf86ModeVRefresh,
+ (void *) &xf86ModeBandwidth,
+ (void *) &xf86ModeWidth,
+ (void *) &xf86ModeHeight,
+ (void *) &xf86DuplicateMode,
+ (void *) &xf86DuplicateModes,
+ (void *) &xf86SetModeDefaultName,
+ (void *) &xf86SetModeCrtc,
+ (void *) &xf86ModesEqual,
+ (void *) &xf86PrintModeline,
+ (void *) &xf86ModesAdd,
+ (void *) &xf86DDCGetModes,
+ (void *) &xf86CVTMode,
+ (void *) &xf86GTFMode,
+ (void *) &xf86ModeIsReduced,
+ (void *) &xf86ValidateModesFlags,
+ (void *) &xf86ValidateModesClocks,
+ (void *) &xf86ValidateModesSize,
+ (void *) &xf86ValidateModesSync,
+ (void *) &xf86ValidateModesBandwidth,
+ (void *) &xf86ValidateModesReducedBlanking,
+ (void *) &xf86PruneInvalidModes,
+ (void *) &xf86PruneDuplicateModes,
+ (void *) &xf86ValidateModesFlags,
+ (void *) &xf86ValidateModesUserConfig,
+ (void *) &xf86GetMonitorModes,
+ (void *) &xf86GetDefaultModes,
+ (void *) &xf86DDCApplyQuirks,
+ (void *) &miDCInitialize,
+ (void *) &miPointerInitialize,
+ (void *) &miPointerWarpCursor,
+ (void *) &miPointerCurrentScreen,
+ (void *) &miPointerGetScreen,
+ (void *) &miPointerSetScreen,
+ (void *) &miPointerGetPosition,
+ (void *) &miPointerSetPosition,
+ (void *) &miPointerUpdateSprite,
+ (void *) &miPointerScreenKey,
+ (void *) &xf86InitCursor,
+ (void *) &xf86CreateCursorInfoRec,
+ (void *) &xf86DestroyCursorInfoRec,
+ (void *) &xf86ForceHWCursor,
+ (void *) &xf86CrtcConfigPrivateIndex,
+ (void *) &xf86CrtcConfigInit,
+ (void *) &xf86CrtcSetSizeRange,
+ (void *) &xf86CrtcCreate,
+ (void *) &xf86CrtcDestroy,
+ (void *) &xf86CrtcSetModeTransform,
+ (void *) &xf86CrtcSetMode,
+ (void *) &xf86CrtcSetOrigin,
+ (void *) &xf86CrtcRotate,
+ (void *) &xf86RotateDestroy,
+ (void *) &xf86RotateFreeShadow,
+ (void *) &xf86RotateCloseScreen,
+ (void *) &xf86CrtcInUse,
+ (void *) &xf86OutputCreate,
+ (void *) &xf86OutputUseScreenMonitor,
+ (void *) &xf86OutputRename,
+ (void *) &xf86OutputDestroy,
+ (void *) &xf86ProbeOutputModes,
+ (void *) &xf86SetScrnInfoModes,
+ (void *) &xf86CrtcScreenInit,
+ (void *) &xf86InitialConfiguration,
+ (void *) &xf86DPMSSet,
+ (void *) &xf86SaveScreen,
+ (void *) &xf86DisableUnusedFunctions,
+ (void *) &xf86OutputFindClosestMode,
+ (void *) &xf86SetSingleMode,
+ (void *) &xf86OutputSetEDID,
+ (void *) &xf86OutputGetEDIDModes,
+ (void *) &xf86OutputGetEDID,
+ (void *) &xf86DiDGAInit,
+ (void *) &xf86DiDGAReInit,
+ (void *) &xf86CrtcSetScreenSubpixelOrder,
+ (void *) &xf86ConnectorGetName,
+ (void *) &xf86SetDesiredModes,
+ (void *) &xf86_cursors_init,
+ (void *) &xf86_reload_cursors,
+ (void *) &xf86_show_cursors,
+ (void *) &xf86_hide_cursors,
+ (void *) &xf86_cursors_fini,
+ (void *) &xf86_crtc_clip_video_helper,
+ (void *) &xf86_wrap_crtc_notify,
+ (void *) &xf86_unwrap_crtc_notify,
+ (void *) &xf86_crtc_notify,
+ (void *) &xf86_crtc_supports_gamma,
+ (void *) &xf86RandR12CreateScreenResources,
+ (void *) &xf86RandR12Init,
+ (void *) &xf86RandR12SetRotations,
+ (void *) &xf86RandR12SetTransformSupport,
+ (void *) &xf86RandR12SetConfig,
+ (void *) &xf86RandR12GetRotation,
+ (void *) &xf86RandR12GetOriginalVirtualSize,
+ (void *) &xf86RandR12PreInit,
+ (void *) &xf86RandR12TellChanged,
+ (void *) &xf86DoEDID_DDC1,
+ (void *) &xf86DoEDID_DDC2,
+ (void *) &xf86DoEEDID,
+ (void *) &xf86PrintEDID,
+ (void *) &xf86InterpretEDID,
+ (void *) &xf86InterpretEEDID,
+ (void *) &xf86EdidMonitorSet,
+ (void *) &xf86SetDDCproperties,
+ (void *) &xf86DDCGetModes,
+ (void *) &xf86MonitorIsHDMI,
+ (void *) &xf86DoDisplayID,
+ (void *) &xf86DisplayIDMonitorSet,
+ (void *) &FindDMTMode,
+ (void *) &DMTModes,
+ (void *) &xf86MonitorIsHDMI,
+ (void *) &xf86ConfigFile,
+ (void *) &xf86ConfigDir,
+ (void *) &xf86AllowMouseOpenFail,
+ (void *) &xf86fpFlag,
+ (void *) &xf86sFlag,
+ (void *) &xf86bsEnableFlag,
+ (void *) &xf86bsDisableFlag,
+ (void *) &xf86silkenMouseDisableFlag,
+ (void *) &xf86xkbdirFlag,
+ (void *) &xf86LayoutName,
+ (void *) &xf86ScreenName,
+ (void *) &xf86PointerName,
+ (void *) &xf86KeyboardName,
+ (void *) &xf86FbBpp,
+ (void *) &xf86Depth,
+ (void *) &xf86Pix24,
+ (void *) &xf86Weight,
+ (void *) &xf86FlipPixels,
+ (void *) &xf86Gamma,
+ (void *) &xf86ServerName,
+ (void *) &xf86IsolateDevice,
+ (void *) &xf86Info,
+ (void *) &xf86ModulePath,
+ (void *) &xf86ModPathFrom,
+ (void *) &xf86LogFile,
+ (void *) &xf86LogFileFrom,
+ (void *) &xf86LogFileWasOpened,
+ (void *) &xf86ConfigLayout,
+ (void *) &xf86DriverList,
+ (void *) &xf86NumDrivers,
+ (void *) &xf86Resetting,
+ (void *) &xf86Initialising,
+ (void *) &xf86NumScreens,
+ (void *) &xf86VisualNames,
+ (void *) &xf86Verbose,
+ (void *) &xf86LogVerbose,
+ (void *) &xorgHWAccess,
+ (void *) &xf86RegisteredPropertiesTable,
+ (void *) &xf86BusProbe,
+ (void *) &xf86AccessInit,
+ (void *) &xf86AccessEnter,
+ (void *) &xf86AccessLeave,
+ (void *) &xf86EntityInit,
+ (void *) &xf86FindPrimaryDevice,
+ (void *) &xf86PostProbe,
+ (void *) &xf86ClearEntityListForScreen,
+ (void *) &xf86AddDevToEntity,
+ (void *) &xf86PostScreenInit,
+ (void *) &xf86PathIsSafe,
+ (void *) &xf86DefaultModes,
+ (void *) &xf86NumDefaultModes,
+ (void *) &DoConfigure,
+ (void *) &DoShowOptions,
+ (void *) &xf86Wakeup,
+ (void *) &xf86SigWrapper,
+ (void *) &xf86HandlePMEvents,
+ (void *) &xf86PMGetEventFromOs,
+ (void *) &xf86PMConfirmEventToOs,
+ (void *) &xf86LogInit,
+ (void *) &xf86CloseLog,
+ (void *) &xf86LoadModules,
+ (void *) &xf86SetVerbosity,
+ (void *) &xf86SetLogVerbosity,
+ (void *) &xf86CallDriverProbe,
+ (void *) &xf86Events,
+ (void *) &xf86HandleColormaps,
+ (void *) &xf86ChangeGamma,
+ (void *) &xf86ChangeGammaRamp,
+ (void *) &xf86GetGammaRampSize,
+ (void *) &xf86GetGammaRamp,
+ (void *) &xf86RegisterOffscreenManager,
+ (void *) &xf86InitFBManagerRegion,
+ (void *) &xf86InitFBManagerArea,
+ (void *) &xf86InitFBManager,
+ (void *) &xf86InitFBManagerLinear,
+ (void *) &xf86FBManagerRunning,
+ (void *) &xf86AllocateOffscreenArea,
+ (void *) &xf86AllocateLinearOffscreenArea,
+ (void *) &xf86AllocateOffscreenLinear,
+ (void *) &xf86FreeOffscreenArea,
+ (void *) &xf86FreeOffscreenLinear,
+ (void *) &xf86ResizeOffscreenArea,
+ (void *) &xf86ResizeOffscreenLinear,
+ (void *) &xf86RegisterFreeBoxCallback,
+ (void *) &xf86PurgeUnlockedOffscreenAreas,
+ (void *) &xf86QueryLargestOffscreenArea,
+ (void *) &xf86QueryLargestOffscreenLinear,
+ (void *) &inputInfo,
+ (void *) &CloseInputDevice,
+ (void *) &AddOtherInputDevices,
+ (void *) &OpenInputDevice,
+ (void *) &SetDeviceMode,
+ (void *) &SetDeviceValuators,
+ (void *) &ChangeDeviceControl,
+ (void *) &xf86InputDevs,
+ (void *) &xf86PostMotionEvent,
+ (void *) &xf86PostMotionEventP,
+ (void *) &xf86PostProximityEvent,
+ (void *) &xf86PostProximityEventP,
+ (void *) &xf86PostButtonEvent,
+ (void *) &xf86PostButtonEventP,
+ (void *) &xf86PostKeyEvent,
+ (void *) &xf86PostKeyEventP,
+ (void *) &xf86PostKeyboardEvent,
+ (void *) &xf86ActivateDevice,
+ (void *) &xf86FirstLocalDevice,
+ (void *) &xf86ScaleAxis,
+ (void *) &xf86XInputSetScreen,
+ (void *) &xf86ProcessCommonOptions,
+ (void *) &xf86InitValuatorAxisStruct,
+ (void *) &xf86InitValuatorDefaults,
+ (void *) &xf86AddEnabledDevice,
+ (void *) &xf86RemoveEnabledDevice,
+ (void *) &xf86DisableDevice,
+ (void *) &xf86EnableDevice,
+ (void *) &xf86AddInputDriver,
+ (void *) &xf86DeleteInputDriver,
+ (void *) &xf86AllocateInput,
+ (void *) &xf86LookupInputDriver,
+ (void *) &xf86LookupInput,
+ (void *) &xf86DeleteInput,
+ (void *) &xf86MotionHistoryAllocate,
+ (void *) &xf86CollectInputOptions,
+ (void *) &xf86VGAarbiterInit,
+ (void *) &xf86VGAarbiterFini,
+ (void *) &xf86VGAarbiterWrapFunctions,
+ (void *) &xf86VGAarbiterLock,
+ (void *) &xf86VGAarbiterUnlock,
+ (void *) &xf86VGAarbiterDeviceDecodes,
+ (void *) &xf86VGAarbiterAllowDRI,
+ (void *) &XisbNew,
+ (void *) &XisbFree,
+ (void *) &XisbRead,
+ (void *) &XisbWrite,
+ (void *) &XisbTrace,
+ (void *) &XisbBlockDuration,
+ (void *) &xf86XVScreenInit,
+ (void *) &xf86XVRegisterGenericAdaptorDriver,
+ (void *) &xf86XVListGenericAdaptors,
+ (void *) &xf86XVRegisterOffscreenImages,
+ (void *) &xf86XVQueryOffscreenImages,
+ (void *) &xf86XVAllocateVideoAdaptorRec,
+ (void *) &xf86XVFreeVideoAdaptorRec,
+ (void *) &xf86XVFillKeyHelper,
+ (void *) &xf86XVFillKeyHelperDrawable,
+ (void *) &xf86XVClipVideoHelper,
+ (void *) &xf86XVCopyYUV12ToPacked,
+ (void *) &xf86XVCopyPacked,
+ (void *) &XvGetScreenKeyProc,
+ (void *) &XvGetRTPortProc,
+ (void *) &XvScreenInitProc,
+ (void *) &xf86XvMCScreenInit,
+ (void *) &xf86XvMCCreateAdaptorRec,
+ (void *) &xf86XvMCDestroyAdaptorRec,
+ (void *) &XvMCScreenInitProc,
+ (void *) &XF86XvScreenKey,
+ (void *) &RamDacHWPrivateIndex,
+ (void *) &RamDacScreenPrivateIndex,
+ (void *) &RamDacCreateInfoRec,
+ (void *) &RamDacHelperCreateInfoRec,
+ (void *) &RamDacDestroyInfoRec,
+ (void *) &RamDacHelperDestroyInfoRec,
+ (void *) &RamDacInit,
+ (void *) &RamDacHandleColormaps,
+ (void *) &RamDacFreeRec,
+ (void *) &RamDacGetHWIndex,
+ (void *) &BTramdacProbe,
+ (void *) &BTramdacSave,
+ (void *) &BTramdacRestore,
+ (void *) &BTramdacSetBpp,
+ (void *) &IBMramdacProbe,
+ (void *) &IBMramdacSave,
+ (void *) &IBMramdacRestore,
+ (void *) &IBMramdac526SetBpp,
+ (void *) &IBMramdac640SetBpp,
+ (void *) &IBMramdac526CalculateMNPCForClock,
+ (void *) &IBMramdac640CalculateMNPCForClock,
+ (void *) &IBMramdac526HWCursorInit,
+ (void *) &IBMramdac640HWCursorInit,
+ (void *) &IBMramdac526SetBppWeak,
+ (void *) &TIramdacCalculateMNPForClock,
+ (void *) &TIramdacProbe,
+ (void *) &TIramdacSave,
+ (void *) &TIramdacRestore,
+ (void *) &TIramdac3026SetBpp,
+ (void *) &TIramdac3030SetBpp,
+ (void *) &TIramdacHWCursorInit,
+ (void *) &TIramdacLoadPalette,
+ (void *) &TIramdacLoadPaletteWeak,
+ (void *) &xf86LinearVidMem,
+ (void *) &xf86CheckMTRR,
+ (void *) &xf86MapVidMem,
+ (void *) &xf86UnMapVidMem,
+ (void *) &xf86MapReadSideEffects,
+ (void *) &xf86ReadBIOS,
+ (void *) &xf86EnableIO,
+ (void *) &xf86DisableIO,
+ (void *) &xf86OSRingBell,
+ (void *) &xf86SetReallySlowBcopy,
+ (void *) &xf86SlowBcopy,
+ (void *) &xf86OpenSerial,
+ (void *) &xf86SetSerial,
+ (void *) &xf86SetSerialSpeed,
+ (void *) &xf86ReadSerial,
+ (void *) &xf86WriteSerial,
+ (void *) &xf86CloseSerial,
+ (void *) &xf86FlushInput,
+ (void *) &xf86WaitForInput,
+ (void *) &xf86SerialSendBreak,
+ (void *) &xf86SetSerialModemState,
+ (void *) &xf86GetSerialModemState,
+ (void *) &xf86SerialModemSetBits,
+ (void *) &xf86SerialModemClearBits,
+ (void *) &xf86LoadKernelModule,
+ (void *) &xf86AgpGARTSupported,
+ (void *) &xf86GetAGPInfo,
+ (void *) &xf86AcquireGART,
+ (void *) &xf86ReleaseGART,
+ (void *) &xf86AllocateGARTMemory,
+ (void *) &xf86DeallocateGARTMemory,
+ (void *) &xf86BindGARTMemory,
+ (void *) &xf86UnbindGARTMemory,
+ (void *) &xf86EnableAGP,
+ (void *) &xf86GARTCloseScreen,
+ (void *) &xf86InstallSIGIOHandler,
+ (void *) &xf86RemoveSIGIOHandler,
+ (void *) &xf86BlockSIGIO,
+ (void *) &xf86UnblockSIGIO,
+ (void *) &xf86AssertBlockedSIGIO,
+ (void *) &xf86SIGIOSupported,
+ (void *) &miInitializeBanking,
+ (void *) &miScanLineWidth,
+ (void *) &miInstalledMaps,
+ (void *) &miListInstalledColormaps,
+ (void *) &miInstallColormap,
+ (void *) &miUninstallColormap,
+ (void *) &miResolveColor,
+ (void *) &miInitializeColormap,
+ (void *) &miExpandDirectColors,
+ (void *) &miCreateDefColormap,
+ (void *) &miClearVisualTypes,
+ (void *) &miSetVisualTypes,
+ (void *) &miSetPixmapDepths,
+ (void *) &miSetVisualTypesAndMasks,
+ (void *) &miGetDefaultVisualMask,
+ (void *) &miInitVisuals,
+ (void *) &miSetZeroLineBias,
+ (void *) &miZeroLineScreenKey,
+ (void *) &miZeroClipLine,
+ (void *) &miPolyArc,
+ (void *) &miCopyArea,
+ (void *) &miCopyPlane,
+ (void *) &miGetImage,
+ (void *) &miPutImage,
+ (void *) &miCopyRegion,
+ (void *) &miDoCopy,
+ (void *) &miRecolorCursor,
+ (void *) &miStepDash,
+ (void *) &mieqInit,
+ (void *) &mieqFini,
+ (void *) &mieqEnqueue,
+ (void *) &mieqSwitchScreen,
+ (void *) &mieqProcessDeviceEvent,
+ (void *) &mieqProcessInputEvents,
+ (void *) &CopyGetMasterEvent,
+ (void *) &miHandleExposures,
+ (void *) &miSendGraphicsExpose,
+ (void *) &miSendExposures,
+ (void *) &miWindowExposures,
+ (void *) &miPaintWindow,
+ (void *) &miClearDrawable,
+ (void *) &miPolyFillRect,
+ (void *) &miPolyGlyphBlt,
+ (void *) &miImageGlyphBlt,
+ (void *) &miFillPolygon,
+ (void *) &miFillConvexPoly,
+ (void *) &miFillGeneralPoly,
+ (void *) &miPolyPoint,
+ (void *) &miPolyRectangle,
+ (void *) &miPolySegment,
+ (void *) &miPolyText8,
+ (void *) &miPolyText16,
+ (void *) &miImageText8,
+ (void *) &miImageText16,
+ (void *) &miPushPixels,
+ (void *) &miRectAlloc,
+ (void *) &miRegionBroken,
+ (void *) &miModifyPixmapHeader,
+ (void *) &miCreateScreenResources,
+ (void *) &miScreenDevPrivateInit,
+ (void *) &miScreenInit,
+ (void *) &miAllocateGCPrivateIndex,
+ (void *) &miShapedWindowIn,
+ (void *) &miRegisterRedirectBorderClipProc,
+ (void *) &miValidateTree,
+ (void *) &miWideLine,
+ (void *) &miWideDash,
+ (void *) &miClearToBackground,
+ (void *) &miMarkWindow,
+ (void *) &miMarkOverlappedWindows,
+ (void *) &miHandleValidateExposures,
+ (void *) &miMoveWindow,
+ (void *) &miSlideAndSizeWindow,
+ (void *) &miGetLayerWindow,
+ (void *) &miSetShape,
+ (void *) &miChangeBorderWidth,
+ (void *) &miMarkUnrealizedWindow,
+ (void *) &miSegregateChildren,
+ (void *) &miZeroPolyArc,
+ (void *) &miZeroLine,
+ (void *) &miZeroDashLine,
+ (void *) &miPolyFillArc,
+ (void *) &miInitializeBackingStore,
+ (void *) &miChangeGC,
+ (void *) &miDestroyGC,
+ (void *) &miDestroyClip,
+ (void *) &miChangeClip,
+ (void *) &miCopyClip,
+ (void *) &miCopyGC,
+ (void *) &miComputeCompositeClip,
+ (void *) &miZeroArcSetup,
+ (void *) &miFillArcSetup,
+ (void *) &miFillArcSliceSetup,
+ (void *) &miInitSpanGroup,
+ (void *) &miAppendSpans,
+ (void *) &miFillUniqueSpanGroup,
+ (void *) &miFreeSpanGroup,
+ (void *) &miClipSpans,
+ (void *) &miFillSppPoly,
+ (void *) &miRoundJoinClip,
+ (void *) &miRoundCapClip,
+ (void *) &miPolyBuildEdge,
+ (void *) &miPolyBuildPoly,
+ (void *) &miInitOverlay,
+ (void *) &miOverlayGetPrivateClips,
+ (void *) &miOverlayCollectUnderlayRegions,
+ (void *) &miOverlayComputeCompositeClip,
+ (void *) &miOverlayCopyUnderlay,
+ (void *) &miOverlaySetTransFunction,
+ (void *) &miOverlaySetRootClip,
+ (void *) &RegionResType,
+ (void *) &XFixesErrorBase,
+ (void *) &XFixesRegionCopy,
+ (void *) &config_init,
+ (void *) &config_fini,
+ (void *) &SetCriticalEvent,
+ (void *) &GetSpriteCursor,
+ (void *) &ProcAllowEvents,
+ (void *) &MaybeDeliverEventsToClient,
+ (void *) &ProcWarpPointer,
+ (void *) &EventSelectForWindow,
+ (void *) &EventSuppressForWindow,
+ (void *) &ProcSetInputFocus,
+ (void *) &ProcGetInputFocus,
+ (void *) &ProcGrabPointer,
+ (void *) &ProcChangeActivePointerGrab,
+ (void *) &ProcUngrabPointer,
+ (void *) &ProcGrabKeyboard,
+ (void *) &ProcUngrabKeyboard,
+ (void *) &ProcQueryPointer,
+ (void *) &ProcSendEvent,
+ (void *) &ProcUngrabKey,
+ (void *) &ProcGrabKey,
+ (void *) &ProcGrabButton,
+ (void *) &ProcUngrabButton,
+ (void *) &ProcRecolorCursor,
+ (void *) &PostSyntheticMotion,
+ (void *) &SetDefaultFont,
+ (void *) &QueueFontWakeup,
+ (void *) &RemoveFontWakeup,
+ (void *) &FontWakeup,
+ (void *) &OpenFont,
+ (void *) &CloseFont,
+ (void *) &QueryFont,
+ (void *) &ListFonts,
+ (void *) &doListFontsWithInfo,
+ (void *) &doPolyText,
+ (void *) &PolyText,
+ (void *) &doImageText,
+ (void *) &ImageText,
+ (void *) &SetFontPath,
+ (void *) &SetDefaultFontPath,
+ (void *) &GetFontPath,
+ (void *) &DeleteClientFontStuff,
+ (void *) &InitFonts,
+ (void *) &FreeFonts,
+ (void *) &find_old_font,
+ (void *) &GetGlyphs,
+ (void *) &QueryGlyphExtents,
+ (void *) &QueryTextExtents,
+ (void *) &ParseGlyphCachingMode,
+ (void *) &InitGlyphCaching,
+ (void *) &SetGlyphCachingMode,
+ (void *) &BuiltinRegisterFpeFunctions,
+ (void *) &client_auth_generation,
+ (void *) &DeleteFontClientID,
+ (void *) &GetClientResolutions,
+ (void *) &GetDefaultPointSize,
+ (void *) &GetNewFontClientID,
+ (void *) &init_fs_handlers,
+ (void *) &RegisterFPEFunctions,
+ (void *) &remove_fs_handlers,
+ (void *) &StoreFontClientFont,
+ (void *) &CreateGrab,
+ (void *) &DeletePassiveGrab,
+ (void *) &GrabMatchesSecond,
+ (void *) &AddPassiveGrabToList,
+ (void *) &DeletePassiveGrabFromList,
+ (void *) &InitProximityClassDeviceStruct,
+ (void *) &InitValuatorAxisStruct,
+ (void *) &XIDeleteAllDeviceProperties,
+ (void *) &XIDeleteDeviceProperty,
+ (void *) &XIChangeDeviceProperty,
+ (void *) &XIGetDeviceProperty,
+ (void *) &XISetDevicePropertyDeletable,
+ (void *) &XIRegisterPropertyHandler,
+ (void *) &XIUnregisterPropertyHandler,
+ (void *) &XIGetKnownProperty,
+ (void *) &XIGetDevice,
+ (void *) &XIPropToInt,
+ (void *) &XIPropToFloat,
+ (void *) &RegisterOtherDevice,
+ (void *) &UpdateDeviceState,
+ (void *) &ProcessOtherEvent,
+ (void *) &DeviceFocusEvent,
+ (void *) &CheckGrabValues,
+ (void *) &GrabButton,
+ (void *) &GrabKey,
+ (void *) &GrabWindow,
+ (void *) &SelectForWindow,
+ (void *) &AddExtensionClient,
+ (void *) &RecalculateDeviceDeliverableEvents,
+ (void *) &InputClientGone,
+ (void *) &SendEvent,
+ (void *) &SetButtonMapping,
+ (void *) &ChangeKeyMapping,
+ (void *) &DeleteWindowFromAnyExtEvents,
+ (void *) &MaybeSendDeviceMotionNotifyHint,
+ (void *) &CheckDeviceGrabAndHintWindow,
+ (void *) &MaybeStopDeviceHint,
+ (void *) &DeviceEventSuppressForWindow,
+ (void *) &SendEventToAllWindows,
+ (void *) &XI2EventSwap,
+ (void *) &XIShouldNotify,
+ (void *) &XISendDeviceChangedEvent,
+ (void *) &XISetEventMask,
+ (void *) &XICheckInvalidMaskBits,
+ (void *) &XInputExtensionInit,
+ (void *) &AssignTypeAndName,
+ (void *) &InitVelocityData,
+ (void *) &InitTrackers,
+ (void *) &ProcessVelocityData2D,
+ (void *) &BasicComputeAcceleration,
+ (void *) &FreeVelocityData,
+ (void *) &InitializePredictableAccelerationProperties,
+ (void *) &DeletePredictableAccelerationProperties,
+ (void *) &SetAccelerationProfile,
+ (void *) &GetDevicePredictableAccelData,
+ (void *) &SetDeviceSpecificAccelerationProfile,
+ (void *) &AccelerationDefaultCleanup,
+ (void *) &acceleratePointerPredictable,
+ (void *) &acceleratePointerLightweight,
+ (void *) &RegisterResourceName,
+ (void *) &RegisterExtensionNames,
+ (void *) &LookupMajorName,
+ (void *) &LookupRequestName,
+ (void *) &LookupEventName,
+ (void *) &LookupErrorName,
+ (void *) &LookupResourceName,
+ (void *) &dixResetRegistry,
+ (void *) &dixLookupSelection,
+ (void *) &CurrentSelections,
+ (void *) &SelectionCallback,
+ (void *) &InitSelections,
+ (void *) &DeleteWindowFromAnySelections,
+ (void *) &DeleteClientFromAnySelections,
+ (void *) &Swap32Write,
+ (void *) &CopySwap32Write,
+ (void *) &CopySwap16Write,
+ (void *) &SGenericReply,
+ (void *) &SGetWindowAttributesReply,
+ (void *) &SGetGeometryReply,
+ (void *) &SQueryTreeReply,
+ (void *) &SInternAtomReply,
+ (void *) &SGetAtomNameReply,
+ (void *) &SGetPropertyReply,
+ (void *) &SListPropertiesReply,
+ (void *) &SGetSelectionOwnerReply,
+ (void *) &SQueryPointerReply,
+ (void *) &SwapTimeCoordWrite,
+ (void *) &SGetMotionEventsReply,
+ (void *) &STranslateCoordsReply,
+ (void *) &SGetInputFocusReply,
+ (void *) &SQueryKeymapReply,
+ (void *) &SQueryFontReply,
+ (void *) &SQueryTextExtentsReply,
+ (void *) &SListFontsReply,
+ (void *) &SListFontsWithInfoReply,
+ (void *) &SGetFontPathReply,
+ (void *) &SGetImageReply,
+ (void *) &SListInstalledColormapsReply,
+ (void *) &SAllocColorReply,
+ (void *) &SAllocNamedColorReply,
+ (void *) &SAllocColorCellsReply,
+ (void *) &SAllocColorPlanesReply,
+ (void *) &SQColorsExtend,
+ (void *) &SQueryColorsReply,
+ (void *) &SLookupColorReply,
+ (void *) &SQueryBestSizeReply,
+ (void *) &SListExtensionsReply,
+ (void *) &SGetKeyboardMappingReply,
+ (void *) &SGetPointerMappingReply,
+ (void *) &SGetModifierMappingReply,
+ (void *) &SGetKeyboardControlReply,
+ (void *) &SGetPointerControlReply,
+ (void *) &SGetScreenSaverReply,
+ (void *) &SLHostsExtend,
+ (void *) &SListHostsReply,
+ (void *) &SErrorEvent,
+ (void *) &SwapConnSetupInfo,
+ (void *) &WriteSConnectionInfo,
+ (void *) &SwapConnSetupPrefix,
+ (void *) &WriteSConnSetupPrefix,
+ (void *) &SCirculateEvent,
+ (void *) &SClientMessageEvent,
+ (void *) &SColormapEvent,
+ (void *) &SConfigureNotifyEvent,
+ (void *) &SConfigureRequestEvent,
+ (void *) &SCreateNotifyEvent,
+ (void *) &SDestroyNotifyEvent,
+ (void *) &SEnterLeaveEvent,
+ (void *) &SExposeEvent,
+ (void *) &SFocusEvent,
+ (void *) &SGraphicsExposureEvent,
+ (void *) &SGravityEvent,
+ (void *) &SKeyButtonPtrEvent,
+ (void *) &SKeymapNotifyEvent,
+ (void *) &SMapNotifyEvent,
+ (void *) &SMapRequestEvent,
+ (void *) &SMappingEvent,
+ (void *) &SNoExposureEvent,
+ (void *) &SPropertyEvent,
+ (void *) &SReparentEvent,
+ (void *) &SResizeRequestEvent,
+ (void *) &SSelectionClearEvent,
+ (void *) &SSelectionNotifyEvent,
+ (void *) &SSelectionRequestEvent,
+ (void *) &SUnmapNotifyEvent,
+ (void *) &SVisibilityEvent,
+ (void *) &SwapColorItem,
+ (void *) &SwapConnClientPrefix,
+ (void *) &SProcAllocColor,
+ (void *) &SProcAllocColorCells,
+ (void *) &SProcAllocColorPlanes,
+ (void *) &SProcAllocNamedColor,
+ (void *) &SProcChangeActivePointerGrab,
+ (void *) &SProcChangeGC,
+ (void *) &SProcChangeHosts,
+ (void *) &SProcChangeKeyboardControl,
+ (void *) &SProcChangeKeyboardMapping,
+ (void *) &SProcChangePointerControl,
+ (void *) &SProcChangeProperty,
+ (void *) &SProcChangeWindowAttributes,
+ (void *) &SProcClearToBackground,
+ (void *) &SProcConfigureWindow,
+ (void *) &SProcConvertSelection,
+ (void *) &SProcCopyArea,
+ (void *) &SProcCopyColormapAndFree,
+ (void *) &SProcCopyGC,
+ (void *) &SProcCopyPlane,
+ (void *) &SProcCreateColormap,
+ (void *) &SProcCreateCursor,
+ (void *) &SProcCreateGC,
+ (void *) &SProcCreateGlyphCursor,
+ (void *) &SProcCreatePixmap,
+ (void *) &SProcCreateWindow,
+ (void *) &SProcDeleteProperty,
+ (void *) &SProcFillPoly,
+ (void *) &SProcFreeColors,
+ (void *) &SProcGetImage,
+ (void *) &SProcGetMotionEvents,
+ (void *) &SProcGetProperty,
+ (void *) &SProcGrabButton,
+ (void *) &SProcGrabKey,
+ (void *) &SProcGrabKeyboard,
+ (void *) &SProcGrabPointer,
+ (void *) &SProcImageText,
+ (void *) &SProcInternAtom,
+ (void *) &SProcListFonts,
+ (void *) &SProcListFontsWithInfo,
+ (void *) &SProcLookupColor,
+ (void *) &SProcNoOperation,
+ (void *) &SProcOpenFont,
+ (void *) &SProcPoly,
+ (void *) &SProcPolyText,
+ (void *) &SProcPutImage,
+ (void *) &SProcQueryBestSize,
+ (void *) &SProcQueryColors,
+ (void *) &SProcQueryExtension,
+ (void *) &SProcRecolorCursor,
+ (void *) &SProcReparentWindow,
+ (void *) &SProcResourceReq,
+ (void *) &SProcRotateProperties,
+ (void *) &SProcSendEvent,
+ (void *) &SProcSetClipRectangles,
+ (void *) &SProcSetDashes,
+ (void *) &SProcSetFontPath,
+ (void *) &SProcSetInputFocus,
+ (void *) &SProcSetScreenSaver,
+ (void *) &SProcSetSelectionOwner,
+ (void *) &SProcSimpleReq,
+ (void *) &SProcStoreColors,
+ (void *) &SProcStoreNamedColor,
+ (void *) &SProcTranslateCoords,
+ (void *) &SProcUngrabButton,
+ (void *) &SProcUngrabKey,
+ (void *) &SProcWarpPointer,
+ (void *) &XaceHooks,
+ (void *) &XaceHook,
+ (void *) &XaceHookDispatch,
+ (void *) &XaceHookPropertyAccess,
+ (void *) &XaceHookSelectionAccess,
+ (void *) &XaceHookAuditEnd,
+ (void *) &XaceGetConnectionNumber,
+ (void *) &XaceIsLocal,
+ (void *) &XaceCensorImage,
+ (void *) &XkbIndentText,
+ (void *) &XkbAtomText,
+ (void *) &XkbKeysymText,
+ (void *) &XkbStringText,
+ (void *) &XkbKeyNameText,
+ (void *) &XkbModIndexText,
+ (void *) &XkbModMaskText,
+ (void *) &XkbVModIndexText,
+ (void *) &XkbVModMaskText,
+ (void *) &XkbConfigText,
+ (void *) &XkbSIMatchText,
+ (void *) &XkbIMWhichStateMaskText,
+ (void *) &XkbControlsMaskText,
+ (void *) &XkbGeomFPText,
+ (void *) &XkbDoodadTypeText,
+ (void *) &XkbActionTypeText,
+ (void *) &XkbActionText,
+ (void *) &XkbBehaviorText,
+ (void *) &_XkbKSCheckCase,
+ (void *) &XkbFindKeycodeByName,
+ (void *) &XkbInternAtom,
+ (void *) &XkbConvertGetByNameComponents,
+ (void *) &XkbNameMatchesPattern,
+ (void *) &XkbWriteXKBKeycodes,
+ (void *) &XkbWriteXKBKeyTypes,
+ (void *) &XkbWriteXKBCompatMap,
+ (void *) &XkbWriteXKBSymbols,
+ (void *) &XkbWriteXKBGeometry,
+ (void *) &XkbWriteXKBKeymapForNames,
+ (void *) &XkmProbe,
+ (void *) &XkmReadFile,
+ (void *) &xkbDevicePrivateKey,
+ (void *) &xkbUnwrapProc,
+ (void *) &XkbReqCode,
+ (void *) &XkbEventBase,
+ (void *) &XkbKeyboardErrorCode,
+ (void *) &XkbBaseDirectory,
+ (void *) &XkbBinDirectory,
+ (void *) &xkbDebugFlags,
+ (void *) &DeviceKeyPress,
+ (void *) &DeviceButtonPress,
+ (void *) &XkbUseMsg,
+ (void *) &XkbProcessArguments,
+ (void *) &XkbSetExtension,
+ (void *) &SrvXkbFreeCompatMap,
+ (void *) &SrvXkbFreeNames,
+ (void *) &_XkbLookupAnyDevice,
+ (void *) &_XkbLookupKeyboard,
+ (void *) &_XkbLookupBellDevice,
+ (void *) &_XkbLookupLedDevice,
+ (void *) &_XkbLookupButtonDevice,
+ (void *) &SrvXkbAllocKeyboard,
+ (void *) &SrvXkbAllocClientMap,
+ (void *) &SrvXkbAllocServerMap,
+ (void *) &SrvXkbFreeClientMap,
+ (void *) &SrvXkbFreeServerMap,
+ (void *) &SrvXkbAllocIndicatorMaps,
+ (void *) &SrvXkbAllocCompatMap,
+ (void *) &SrvXkbAllocNames,
+ (void *) &SrvXkbAllocControls,
+ (void *) &SrvXkbCopyKeyTypes,
+ (void *) &SrvXkbResizeKeyType,
+ (void *) &SrvXkbFreeKeyboard,
+ (void *) &XkbSetActionKeyMods,
+ (void *) &XkbMaskForVMask,
+ (void *) &SrvXkbVirtualModsToReal,
+ (void *) &XkbAdjustGroup,
+ (void *) &SrvXkbResizeKeySyms,
+ (void *) &SrvXkbResizeKeyActions,
+ (void *) &XkbUpdateKeyTypesFromCore,
+ (void *) &XkbUpdateDescActions,
+ (void *) &XkbUpdateActions,
+ (void *) &XkbGetCoreMap,
+ (void *) &XkbApplyMappingChange,
+ (void *) &XkbSetIndicators,
+ (void *) &XkbUpdateIndicators,
+ (void *) &XkbAllocSrvLedInfo,
+ (void *) &XkbCopySrvLedInfo,
+ (void *) &XkbFindSrvLedInfo,
+ (void *) &XkbApplyLedNameChanges,
+ (void *) &XkbApplyLedMapChanges,
+ (void *) &XkbApplyLedStateChanges,
+ (void *) &XkbFlushLedEvents,
+ (void *) &XkbIndicatorsToUpdate,
+ (void *) &XkbComputeDerivedState,
+ (void *) &XkbCheckSecondaryEffects,
+ (void *) &XkbCheckIndicatorMaps,
+ (void *) &XkbStateChangedFlags,
+ (void *) &XkbSendStateNotify,
+ (void *) &XkbSendMapNotify,
+ (void *) &XkbComputeControlsNotify,
+ (void *) &XkbSendControlsNotify,
+ (void *) &XkbSendCompatMapNotify,
+ (void *) &XkbHandleBell,
+ (void *) &XkbSendAccessXNotify,
+ (void *) &XkbSendNamesNotify,
+ (void *) &XkbSendActionMessage,
+ (void *) &XkbSendExtensionDeviceNotify,
+ (void *) &XkbSendNotification,
+ (void *) &XkbProcessKeyboardEvent,
+ (void *) &XkbHandleActions,
+ (void *) &XkbEnableDisableControls,
+ (void *) &AccessXInit,
+ (void *) &AccessXFilterPressEvent,
+ (void *) &AccessXFilterReleaseEvent,
+ (void *) &AccessXCancelRepeatKey,
+ (void *) &AccessXComputeCurveFactor,
+ (void *) &XkbFindClientResource,
+ (void *) &XkbAddClientResource,
+ (void *) &XkbRemoveResourceClient,
+ (void *) &XkbDDXAccessXBeep,
+ (void *) &XkbDDXUsesSoftRepeat,
+ (void *) &XkbDDXKeybdCtrlProc,
+ (void *) &XkbDDXChangeControls,
+ (void *) &XkbDDXUpdateDeviceIndicators,
+ (void *) &XkbDDXFakePointerMotion,
+ (void *) &XkbDDXFakeDeviceButton,
+ (void *) &XkbDDXTerminateServer,
+ (void *) &XkbDDXSwitchScreen,
+ (void *) &XkbDDXPrivate,
+ (void *) &XkbDisableComputedAutoRepeats,
+ (void *) &XkbSetRepeatKeys,
+ (void *) &SrvXkbLatchModifiers,
+ (void *) &SrvXkbLatchGroup,
+ (void *) &XkbClearAllLatchesAndLocks,
+ (void *) &XkbGetRulesDflts,
+ (void *) &XkbFreeRMLVOSet,
+ (void *) &XkbSetRulesDflts,
+ (void *) &XkbDeleteRulesDflts,
+ (void *) &SProcXkbDispatch,
+ (void *) &XkbLookupNamedGeometry,
+ (void *) &_XkbDupString,
+ (void *) &XkbConvertCase,
+ (void *) &SrvXkbChangeKeycodeRange,
+ (void *) &XkbFreeSrvLedInfo,
+ (void *) &XkbFreeInfo,
+ (void *) &SrvXkbChangeTypesOfKey,
+ (void *) &SrvXkbKeyTypesForCoreSymbols,
+ (void *) &SrvXkbApplyCompatMapToKey,
+ (void *) &SrvXkbApplyVirtualModChanges,
+ (void *) &XkbSendNewKeyboardNotify,
+ (void *) &XkbCopyKeymap,
+ (void *) &XkbCopyDeviceKeymap,
+ (void *) &XkbFilterEvents,
+ (void *) &XkbGetEffectiveGroup,
+ (void *) &XkbDDXList,
+ (void *) &XkbDDXLoadKeymapByNames,
+ (void *) &XkbDDXNamesFromRules,
+ (void *) &XkbCompileKeymap,
+};
diff --git a/xorg-server/hw/xfree86/modes/Makefile.in b/xorg-server/hw/xfree86/modes/Makefile.in
index 6eaf6d112..62ce86e1c 100644
--- a/xorg-server/hw/xfree86/modes/Makefile.in
+++ b/xorg-server/hw/xfree86/modes/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -295,8 +295,11 @@ SHELL = @SHELL@
SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@
SOLARIS_INOUT_ARCH = @SOLARIS_INOUT_ARCH@
STRIP = @STRIP@
+SYSCONFDIR = @SYSCONFDIR@
TSLIB_CFLAGS = @TSLIB_CFLAGS@
TSLIB_LIBS = @TSLIB_LIBS@
+UDEV_CFLAGS = @UDEV_CFLAGS@
+UDEV_LIBS = @UDEV_LIBS@
UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
VERSION = @VERSION@
@@ -356,6 +359,7 @@ XWIN_SERVER_NAME = @XWIN_SERVER_NAME@
XWIN_SYS_LIBS = @XWIN_SYS_LIBS@
YACC = @YACC@
YFLAGS = @YFLAGS@
+__XCONFIGDIR__ = @__XCONFIGDIR__@
__XCONFIGFILE__ = @__XCONFIGFILE__@
abi_ansic = @abi_ansic@
abi_extension = @abi_extension@
diff --git a/xorg-server/hw/xfree86/os-support/Makefile.in b/xorg-server/hw/xfree86/os-support/Makefile.in
index 47a66b364..fa650625b 100644
--- a/xorg-server/hw/xfree86/os-support/Makefile.in
+++ b/xorg-server/hw/xfree86/os-support/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -326,8 +326,11 @@ SHELL = @SHELL@
SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@
SOLARIS_INOUT_ARCH = @SOLARIS_INOUT_ARCH@
STRIP = @STRIP@
+SYSCONFDIR = @SYSCONFDIR@
TSLIB_CFLAGS = @TSLIB_CFLAGS@
TSLIB_LIBS = @TSLIB_LIBS@
+UDEV_CFLAGS = @UDEV_CFLAGS@
+UDEV_LIBS = @UDEV_LIBS@
UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
VERSION = @VERSION@
@@ -387,6 +390,7 @@ XWIN_SERVER_NAME = @XWIN_SERVER_NAME@
XWIN_SYS_LIBS = @XWIN_SYS_LIBS@
YACC = @YACC@
YFLAGS = @YFLAGS@
+__XCONFIGDIR__ = @__XCONFIGDIR__@
__XCONFIGFILE__ = @__XCONFIGFILE__@
abi_ansic = @abi_ansic@
abi_extension = @abi_extension@
@@ -579,7 +583,7 @@ uninstall-sdkHEADERS:
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
- @failcom='exit 1'; \
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
@@ -604,7 +608,7 @@ $(RECURSIVE_TARGETS):
fi; test -z "$$fail"
$(RECURSIVE_CLEAN_TARGETS):
- @failcom='exit 1'; \
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
diff --git a/xorg-server/hw/xfree86/os-support/bsd/Makefile.in b/xorg-server/hw/xfree86/os-support/bsd/Makefile.in
index 669bc331e..74bf6456c 100644
--- a/xorg-server/hw/xfree86/os-support/bsd/Makefile.in
+++ b/xorg-server/hw/xfree86/os-support/bsd/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -289,8 +289,11 @@ SHELL = @SHELL@
SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@
SOLARIS_INOUT_ARCH = @SOLARIS_INOUT_ARCH@
STRIP = @STRIP@
+SYSCONFDIR = @SYSCONFDIR@
TSLIB_CFLAGS = @TSLIB_CFLAGS@
TSLIB_LIBS = @TSLIB_LIBS@
+UDEV_CFLAGS = @UDEV_CFLAGS@
+UDEV_LIBS = @UDEV_LIBS@
UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
VERSION = @VERSION@
@@ -350,6 +353,7 @@ XWIN_SERVER_NAME = @XWIN_SERVER_NAME@
XWIN_SYS_LIBS = @XWIN_SYS_LIBS@
YACC = @YACC@
YFLAGS = @YFLAGS@
+__XCONFIGDIR__ = @__XCONFIGDIR__@
__XCONFIGFILE__ = @__XCONFIGFILE__@
abi_ansic = @abi_ansic@
abi_extension = @abi_extension@
diff --git a/xorg-server/hw/xfree86/os-support/bus/Makefile.in b/xorg-server/hw/xfree86/os-support/bus/Makefile.in
index 2878abab3..baad9df02 100644
--- a/xorg-server/hw/xfree86/os-support/bus/Makefile.in
+++ b/xorg-server/hw/xfree86/os-support/bus/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -297,8 +297,11 @@ SHELL = @SHELL@
SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@
SOLARIS_INOUT_ARCH = @SOLARIS_INOUT_ARCH@
STRIP = @STRIP@
+SYSCONFDIR = @SYSCONFDIR@
TSLIB_CFLAGS = @TSLIB_CFLAGS@
TSLIB_LIBS = @TSLIB_LIBS@
+UDEV_CFLAGS = @UDEV_CFLAGS@
+UDEV_LIBS = @UDEV_LIBS@
UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
VERSION = @VERSION@
@@ -358,6 +361,7 @@ XWIN_SERVER_NAME = @XWIN_SERVER_NAME@
XWIN_SYS_LIBS = @XWIN_SYS_LIBS@
YACC = @YACC@
YFLAGS = @YFLAGS@
+__XCONFIGDIR__ = @__XCONFIGDIR__@
__XCONFIGFILE__ = @__XCONFIGFILE__@
abi_ansic = @abi_ansic@
abi_extension = @abi_extension@
diff --git a/xorg-server/hw/xfree86/os-support/hurd/Makefile.in b/xorg-server/hw/xfree86/os-support/hurd/Makefile.in
index a6f7737f2..06d32f0ab 100644
--- a/xorg-server/hw/xfree86/os-support/hurd/Makefile.in
+++ b/xorg-server/hw/xfree86/os-support/hurd/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -265,8 +265,11 @@ SHELL = @SHELL@
SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@
SOLARIS_INOUT_ARCH = @SOLARIS_INOUT_ARCH@
STRIP = @STRIP@
+SYSCONFDIR = @SYSCONFDIR@
TSLIB_CFLAGS = @TSLIB_CFLAGS@
TSLIB_LIBS = @TSLIB_LIBS@
+UDEV_CFLAGS = @UDEV_CFLAGS@
+UDEV_LIBS = @UDEV_LIBS@
UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
VERSION = @VERSION@
@@ -326,6 +329,7 @@ XWIN_SERVER_NAME = @XWIN_SERVER_NAME@
XWIN_SYS_LIBS = @XWIN_SYS_LIBS@
YACC = @YACC@
YFLAGS = @YFLAGS@
+__XCONFIGDIR__ = @__XCONFIGDIR__@
__XCONFIGFILE__ = @__XCONFIGFILE__@
abi_ansic = @abi_ansic@
abi_extension = @abi_extension@
diff --git a/xorg-server/hw/xfree86/os-support/linux/Makefile.in b/xorg-server/hw/xfree86/os-support/linux/Makefile.in
index ebb05ccc9..8758a6eea 100644
--- a/xorg-server/hw/xfree86/os-support/linux/Makefile.in
+++ b/xorg-server/hw/xfree86/os-support/linux/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -290,8 +290,11 @@ SHELL = @SHELL@
SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@
SOLARIS_INOUT_ARCH = @SOLARIS_INOUT_ARCH@
STRIP = @STRIP@
+SYSCONFDIR = @SYSCONFDIR@
TSLIB_CFLAGS = @TSLIB_CFLAGS@
TSLIB_LIBS = @TSLIB_LIBS@
+UDEV_CFLAGS = @UDEV_CFLAGS@
+UDEV_LIBS = @UDEV_LIBS@
UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
VERSION = @VERSION@
@@ -351,6 +354,7 @@ XWIN_SERVER_NAME = @XWIN_SERVER_NAME@
XWIN_SYS_LIBS = @XWIN_SYS_LIBS@
YACC = @YACC@
YFLAGS = @YFLAGS@
+__XCONFIGDIR__ = @__XCONFIGDIR__@
__XCONFIGFILE__ = @__XCONFIGFILE__@
abi_ansic = @abi_ansic@
abi_extension = @abi_extension@
diff --git a/xorg-server/hw/xfree86/os-support/misc/Makefile.in b/xorg-server/hw/xfree86/os-support/misc/Makefile.in
index c8357f212..31c246b36 100644
--- a/xorg-server/hw/xfree86/os-support/misc/Makefile.in
+++ b/xorg-server/hw/xfree86/os-support/misc/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -263,8 +263,11 @@ SHELL = @SHELL@
SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@
SOLARIS_INOUT_ARCH = @SOLARIS_INOUT_ARCH@
STRIP = @STRIP@
+SYSCONFDIR = @SYSCONFDIR@
TSLIB_CFLAGS = @TSLIB_CFLAGS@
TSLIB_LIBS = @TSLIB_LIBS@
+UDEV_CFLAGS = @UDEV_CFLAGS@
+UDEV_LIBS = @UDEV_LIBS@
UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
VERSION = @VERSION@
@@ -324,6 +327,7 @@ XWIN_SERVER_NAME = @XWIN_SERVER_NAME@
XWIN_SYS_LIBS = @XWIN_SYS_LIBS@
YACC = @YACC@
YFLAGS = @YFLAGS@
+__XCONFIGDIR__ = @__XCONFIGDIR__@
__XCONFIGFILE__ = @__XCONFIGFILE__@
abi_ansic = @abi_ansic@
abi_extension = @abi_extension@
diff --git a/xorg-server/hw/xfree86/os-support/sco/Makefile.in b/xorg-server/hw/xfree86/os-support/sco/Makefile.in
index c48b61641..ef97c1e13 100644
--- a/xorg-server/hw/xfree86/os-support/sco/Makefile.in
+++ b/xorg-server/hw/xfree86/os-support/sco/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -237,8 +237,11 @@ SHELL = @SHELL@
SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@
SOLARIS_INOUT_ARCH = @SOLARIS_INOUT_ARCH@
STRIP = @STRIP@
+SYSCONFDIR = @SYSCONFDIR@
TSLIB_CFLAGS = @TSLIB_CFLAGS@
TSLIB_LIBS = @TSLIB_LIBS@
+UDEV_CFLAGS = @UDEV_CFLAGS@
+UDEV_LIBS = @UDEV_LIBS@
UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
VERSION = @VERSION@
@@ -298,6 +301,7 @@ XWIN_SERVER_NAME = @XWIN_SERVER_NAME@
XWIN_SYS_LIBS = @XWIN_SYS_LIBS@
YACC = @YACC@
YFLAGS = @YFLAGS@
+__XCONFIGDIR__ = @__XCONFIGDIR__@
__XCONFIGFILE__ = @__XCONFIGFILE__@
abi_ansic = @abi_ansic@
abi_extension = @abi_extension@
diff --git a/xorg-server/hw/xfree86/os-support/solaris/Makefile.in b/xorg-server/hw/xfree86/os-support/solaris/Makefile.in
index fa734a054..03946bcb1 100644
--- a/xorg-server/hw/xfree86/os-support/solaris/Makefile.in
+++ b/xorg-server/hw/xfree86/os-support/solaris/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -312,8 +312,11 @@ SHELL = @SHELL@
SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@
SOLARIS_INOUT_ARCH = @SOLARIS_INOUT_ARCH@
STRIP = @STRIP@
+SYSCONFDIR = @SYSCONFDIR@
TSLIB_CFLAGS = @TSLIB_CFLAGS@
TSLIB_LIBS = @TSLIB_LIBS@
+UDEV_CFLAGS = @UDEV_CFLAGS@
+UDEV_LIBS = @UDEV_LIBS@
UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
VERSION = @VERSION@
@@ -373,6 +376,7 @@ XWIN_SERVER_NAME = @XWIN_SERVER_NAME@
XWIN_SYS_LIBS = @XWIN_SYS_LIBS@
YACC = @YACC@
YFLAGS = @YFLAGS@
+__XCONFIGDIR__ = @__XCONFIGDIR__@
__XCONFIGFILE__ = @__XCONFIGFILE__@
abi_ansic = @abi_ansic@
abi_extension = @abi_extension@
diff --git a/xorg-server/hw/xfree86/os-support/sysv/Makefile.in b/xorg-server/hw/xfree86/os-support/sysv/Makefile.in
index 735890fe7..a5e8a1bf9 100644
--- a/xorg-server/hw/xfree86/os-support/sysv/Makefile.in
+++ b/xorg-server/hw/xfree86/os-support/sysv/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -237,8 +237,11 @@ SHELL = @SHELL@
SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@
SOLARIS_INOUT_ARCH = @SOLARIS_INOUT_ARCH@
STRIP = @STRIP@
+SYSCONFDIR = @SYSCONFDIR@
TSLIB_CFLAGS = @TSLIB_CFLAGS@
TSLIB_LIBS = @TSLIB_LIBS@
+UDEV_CFLAGS = @UDEV_CFLAGS@
+UDEV_LIBS = @UDEV_LIBS@
UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
VERSION = @VERSION@
@@ -298,6 +301,7 @@ XWIN_SERVER_NAME = @XWIN_SERVER_NAME@
XWIN_SYS_LIBS = @XWIN_SYS_LIBS@
YACC = @YACC@
YFLAGS = @YFLAGS@
+__XCONFIGDIR__ = @__XCONFIGDIR__@
__XCONFIGFILE__ = @__XCONFIGFILE__@
abi_ansic = @abi_ansic@
abi_extension = @abi_extension@
diff --git a/xorg-server/hw/xfree86/os-support/xorgos.c b/xorg-server/hw/xfree86/os-support/xorgos.c
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/xorg-server/hw/xfree86/os-support/xorgos.c
diff --git a/xorg-server/hw/xfree86/parser/InputClass.c b/xorg-server/hw/xfree86/parser/InputClass.c
index 1c9816012..7fb2866cd 100644
--- a/xorg-server/hw/xfree86/parser/InputClass.c
+++ b/xorg-server/hw/xfree86/parser/InputClass.c
@@ -29,6 +29,8 @@
#include <xorg-config.h>
#endif
+#include <string.h>
+#include "os.h"
#include "xf86Parser.h"
#include "xf86tokens.h"
#include "Configint.h"
@@ -45,6 +47,7 @@ xf86ConfigSymTabRec InputClassTab[] =
{MATCH_PRODUCT, "matchproduct"},
{MATCH_VENDOR, "matchvendor"},
{MATCH_DEVICE_PATH, "matchdevicepath"},
+ {MATCH_TAG, "matchtag"},
{MATCH_IS_KEYBOARD, "matchiskeyboard"},
{MATCH_IS_POINTER, "matchispointer"},
{MATCH_IS_JOYSTICK, "matchisjoystick"},
@@ -56,6 +59,8 @@ xf86ConfigSymTabRec InputClassTab[] =
#define CLEANUP xf86freeInputClassList
+#define TOKEN_SEP "|"
+
XF86ConfInputClassPtr
xf86parseInputClassSection(void)
{
@@ -91,17 +96,22 @@ xf86parseInputClassSection(void)
case MATCH_PRODUCT:
if (xf86getSubToken(&(ptr->comment)) != STRING)
Error(QUOTE_MSG, "MatchProduct");
- ptr->match_product = val.str;
+ ptr->match_product = xstrtokenize(val.str, TOKEN_SEP);
break;
case MATCH_VENDOR:
if (xf86getSubToken(&(ptr->comment)) != STRING)
Error(QUOTE_MSG, "MatchVendor");
- ptr->match_vendor = val.str;
+ ptr->match_vendor = xstrtokenize(val.str, TOKEN_SEP);
break;
case MATCH_DEVICE_PATH:
if (xf86getSubToken(&(ptr->comment)) != STRING)
Error(QUOTE_MSG, "MatchDevicePath");
- ptr->match_device = val.str;
+ ptr->match_device = xstrtokenize(val.str, TOKEN_SEP);
+ break;
+ case MATCH_TAG:
+ if (xf86getSubToken(&(ptr->comment)) != STRING)
+ Error(QUOTE_MSG, "MatchTag");
+ ptr->match_tag = xstrtokenize(val.str, TOKEN_SEP);
break;
case MATCH_IS_KEYBOARD:
if (xf86getSubToken(&(ptr->comment)) != STRING)
@@ -173,6 +183,8 @@ xf86parseInputClassSection(void)
void
xf86printInputClassSection (FILE * cf, XF86ConfInputClassPtr ptr)
{
+ char **list;
+
while (ptr) {
fprintf(cf, "Section \"InputClass\"\n");
if (ptr->comment)
@@ -181,12 +193,38 @@ xf86printInputClassSection (FILE * cf, XF86ConfInputClassPtr ptr)
fprintf(cf, "\tIdentifier \"%s\"\n", ptr->identifier);
if (ptr->driver)
fprintf(cf, "\tDriver \"%s\"\n", ptr->driver);
- if (ptr->match_product)
- fprintf(cf, "\tMatchProduct \"%s\"\n", ptr->match_product);
- if (ptr->match_vendor)
- fprintf(cf, "\tMatchVendor \"%s\"\n", ptr->match_vendor);
- if (ptr->match_device)
- fprintf(cf, "\tMatchDevicePath \"%s\"\n", ptr->match_device);
+ if (ptr->match_product) {
+ fprintf(cf, "\tMatchProduct \"");
+ for (list = ptr->match_product; *list; list++)
+ fprintf(cf, "%s%s",
+ list == ptr->match_product ? "" : TOKEN_SEP,
+ *list);
+ fprintf(cf, "\"\n");
+ }
+ if (ptr->match_vendor) {
+ fprintf(cf, "\tMatchVendor \"");
+ for (list = ptr->match_vendor; *list; list++)
+ fprintf(cf, "%s%s",
+ list == ptr->match_vendor ? "" : TOKEN_SEP,
+ *list);
+ fprintf(cf, "\"\n");
+ }
+ if (ptr->match_device) {
+ fprintf(cf, "\tMatchDevicePath \"");
+ for (list = ptr->match_device; *list; list++)
+ fprintf(cf, "%s%s",
+ list == ptr->match_device ? "" : TOKEN_SEP,
+ *list);
+ fprintf(cf, "\"\n");
+ }
+ if (ptr->match_tag) {
+ fprintf(cf, "\tMatchTag \"");
+ for (list = ptr->match_tag; *list; list++)
+ fprintf(cf, "%s%s",
+ list == ptr->match_tag ? "" : TOKEN_SEP,
+ *list);
+ fprintf(cf, "\"\n");
+ }
if (ptr->is_keyboard.set)
fprintf(cf, "\tIsKeyboard \"%s\"\n",
ptr->is_keyboard.val ? "yes" : "no");
@@ -215,13 +253,31 @@ void
xf86freeInputClassList (XF86ConfInputClassPtr ptr)
{
XF86ConfInputClassPtr prev;
+ char **list;
while (ptr) {
TestFree(ptr->identifier);
TestFree(ptr->driver);
- TestFree(ptr->match_product);
- TestFree(ptr->match_vendor);
- TestFree(ptr->match_device);
+ if (ptr->match_product) {
+ for (list = ptr->match_product; *list; list++)
+ free(*list);
+ free(ptr->match_product);
+ }
+ if (ptr->match_vendor) {
+ for (list = ptr->match_vendor; *list; list++)
+ free(*list);
+ free(ptr->match_vendor);
+ }
+ if (ptr->match_device) {
+ for (list = ptr->match_device; *list; list++)
+ free(*list);
+ free(ptr->match_device);
+ }
+ if (ptr->match_tag) {
+ for (list = ptr->match_tag; *list; list++)
+ free(*list);
+ free(ptr->match_tag);
+ }
TestFree(ptr->comment);
xf86optionListFree(ptr->option_lst);
diff --git a/xorg-server/hw/xfree86/parser/Makefile.in b/xorg-server/hw/xfree86/parser/Makefile.in
index 863513cd9..1b31c622d 100644
--- a/xorg-server/hw/xfree86/parser/Makefile.in
+++ b/xorg-server/hw/xfree86/parser/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -94,6 +94,7 @@ am__objects_1 = libxf86config_a-Device.$(OBJEXT) \
libxf86config_a-Files.$(OBJEXT) \
libxf86config_a-Flags.$(OBJEXT) \
libxf86config_a-Input.$(OBJEXT) \
+ libxf86config_a-InputClass.$(OBJEXT) \
libxf86config_a-Layout.$(OBJEXT) \
libxf86config_a-Module.$(OBJEXT) \
libxf86config_a-Video.$(OBJEXT) \
@@ -108,9 +109,9 @@ am_libxf86config_a_OBJECTS = $(am__objects_1)
libxf86config_a_OBJECTS = $(am_libxf86config_a_OBJECTS)
LTLIBRARIES = $(noinst_LTLIBRARIES)
libxf86config_internal_la_LIBADD =
-am__objects_2 = Device.lo Files.lo Flags.lo Input.lo Layout.lo \
- Module.lo Video.lo Monitor.lo Pointer.lo Screen.lo Vendor.lo \
- read.lo scan.lo write.lo DRI.lo Extensions.lo
+am__objects_2 = Device.lo Files.lo Flags.lo Input.lo InputClass.lo \
+ Layout.lo Module.lo Video.lo Monitor.lo Pointer.lo Screen.lo \
+ Vendor.lo read.lo scan.lo write.lo DRI.lo Extensions.lo
am_libxf86config_internal_la_OBJECTS = $(am__objects_2)
libxf86config_internal_la_OBJECTS = \
$(am_libxf86config_internal_la_OBJECTS)
@@ -320,8 +321,11 @@ SHELL = @SHELL@
SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@
SOLARIS_INOUT_ARCH = @SOLARIS_INOUT_ARCH@
STRIP = @STRIP@
+SYSCONFDIR = @SYSCONFDIR@
TSLIB_CFLAGS = @TSLIB_CFLAGS@
TSLIB_LIBS = @TSLIB_LIBS@
+UDEV_CFLAGS = @UDEV_CFLAGS@
+UDEV_LIBS = @UDEV_LIBS@
UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
VERSION = @VERSION@
@@ -381,6 +385,7 @@ XWIN_SERVER_NAME = @XWIN_SERVER_NAME@
XWIN_SYS_LIBS = @XWIN_SYS_LIBS@
YACC = @YACC@
YFLAGS = @YFLAGS@
+__XCONFIGDIR__ = @__XCONFIGDIR__@
__XCONFIGFILE__ = @__XCONFIGFILE__@
abi_ansic = @abi_ansic@
abi_extension = @abi_extension@
@@ -456,6 +461,7 @@ INTERNAL_SOURCES = \
Files.c \
Flags.c \
Input.c \
+ InputClass.c \
Layout.c \
Module.c \
Video.c \
@@ -582,6 +588,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Files.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Flags.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Input.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/InputClass.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Layout.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Module.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Monitor.Plo@am__quote@
@@ -595,6 +602,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxf86config_a-Files.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxf86config_a-Flags.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxf86config_a-Input.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxf86config_a-InputClass.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxf86config_a-Layout.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxf86config_a-Module.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxf86config_a-Monitor.Po@am__quote@
@@ -697,6 +705,22 @@ libxf86config_a-Input.obj: Input.c
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxf86config_a_CFLAGS) $(CFLAGS) -c -o libxf86config_a-Input.obj `if test -f 'Input.c'; then $(CYGPATH_W) 'Input.c'; else $(CYGPATH_W) '$(srcdir)/Input.c'; fi`
+libxf86config_a-InputClass.o: InputClass.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxf86config_a_CFLAGS) $(CFLAGS) -MT libxf86config_a-InputClass.o -MD -MP -MF $(DEPDIR)/libxf86config_a-InputClass.Tpo -c -o libxf86config_a-InputClass.o `test -f 'InputClass.c' || echo '$(srcdir)/'`InputClass.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libxf86config_a-InputClass.Tpo $(DEPDIR)/libxf86config_a-InputClass.Po
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='InputClass.c' object='libxf86config_a-InputClass.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxf86config_a_CFLAGS) $(CFLAGS) -c -o libxf86config_a-InputClass.o `test -f 'InputClass.c' || echo '$(srcdir)/'`InputClass.c
+
+libxf86config_a-InputClass.obj: InputClass.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxf86config_a_CFLAGS) $(CFLAGS) -MT libxf86config_a-InputClass.obj -MD -MP -MF $(DEPDIR)/libxf86config_a-InputClass.Tpo -c -o libxf86config_a-InputClass.obj `if test -f 'InputClass.c'; then $(CYGPATH_W) 'InputClass.c'; else $(CYGPATH_W) '$(srcdir)/InputClass.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libxf86config_a-InputClass.Tpo $(DEPDIR)/libxf86config_a-InputClass.Po
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='InputClass.c' object='libxf86config_a-InputClass.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxf86config_a_CFLAGS) $(CFLAGS) -c -o libxf86config_a-InputClass.obj `if test -f 'InputClass.c'; then $(CYGPATH_W) 'InputClass.c'; else $(CYGPATH_W) '$(srcdir)/InputClass.c'; fi`
+
libxf86config_a-Layout.o: Layout.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxf86config_a_CFLAGS) $(CFLAGS) -MT libxf86config_a-Layout.o -MD -MP -MF $(DEPDIR)/libxf86config_a-Layout.Tpo -c -o libxf86config_a-Layout.o `test -f 'Layout.c' || echo '$(srcdir)/'`Layout.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libxf86config_a-Layout.Tpo $(DEPDIR)/libxf86config_a-Layout.Po
diff --git a/xorg-server/hw/xfree86/parser/scan.c b/xorg-server/hw/xfree86/parser/scan.c
index b80fbfb8f..03cbc8a44 100644
--- a/xorg-server/hw/xfree86/parser/scan.c
+++ b/xorg-server/hw/xfree86/parser/scan.c
@@ -227,13 +227,15 @@ xf86getNextLine(void)
configFiles[curFileIndex].file);
if (!ret) {
- /* stop if there are no more files */
- if (++curFileIndex >= numFiles) {
- curFileIndex = 0;
+ /*
+ * if the file doesn't end in a newline, add one
+ * and trigger another read
+ */
+ if (pos != 0) {
+ strcpy(&configBuf[pos], "\n");
+ ret = configBuf;
+ } else
break;
- }
- configLineNo = 0;
- continue;
}
/* search for EOL in the new block of chars */
@@ -338,7 +340,17 @@ again:
}
if (ret == NULL)
{
- return (pushToken = EOF_TOKEN);
+ /*
+ * if necessary, move to the next file and
+ * read the first line
+ */
+ if (curFileIndex + 1 < numFiles) {
+ curFileIndex++;
+ configLineNo = 0;
+ goto again;
+ }
+ else
+ return (pushToken = EOF_TOKEN);
}
configLineNo++;
configPos = 0;
diff --git a/xorg-server/hw/xfree86/parser/xf86Parser.h b/xorg-server/hw/xfree86/parser/xf86Parser.h
index 5e8351fc4..d79544a20 100644
--- a/xorg-server/hw/xfree86/parser/xf86Parser.h
+++ b/xorg-server/hw/xfree86/parser/xf86Parser.h
@@ -343,9 +343,10 @@ typedef struct
GenericListRec list;
char *identifier;
char *driver;
- char *match_product;
- char *match_vendor;
- char *match_device;
+ char **match_product;
+ char **match_vendor;
+ char **match_device;
+ char **match_tag;
xf86TriState is_keyboard;
xf86TriState is_pointer;
xf86TriState is_joystick;
diff --git a/xorg-server/hw/xfree86/parser/xf86tokens.h b/xorg-server/hw/xfree86/parser/xf86tokens.h
index e3a9d716b..cb600704b 100644
--- a/xorg-server/hw/xfree86/parser/xf86tokens.h
+++ b/xorg-server/hw/xfree86/parser/xf86tokens.h
@@ -279,6 +279,7 @@ typedef enum {
MATCH_PRODUCT,
MATCH_VENDOR,
MATCH_DEVICE_PATH,
+ MATCH_TAG,
MATCH_IS_KEYBOARD,
MATCH_IS_POINTER,
MATCH_IS_JOYSTICK,
diff --git a/xorg-server/hw/xfree86/ramdac/Makefile.in b/xorg-server/hw/xfree86/ramdac/Makefile.in
index e0cb15999..a1b5a3c37 100644
--- a/xorg-server/hw/xfree86/ramdac/Makefile.in
+++ b/xorg-server/hw/xfree86/ramdac/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -289,8 +289,11 @@ SHELL = @SHELL@
SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@
SOLARIS_INOUT_ARCH = @SOLARIS_INOUT_ARCH@
STRIP = @STRIP@
+SYSCONFDIR = @SYSCONFDIR@
TSLIB_CFLAGS = @TSLIB_CFLAGS@
TSLIB_LIBS = @TSLIB_LIBS@
+UDEV_CFLAGS = @UDEV_CFLAGS@
+UDEV_LIBS = @UDEV_LIBS@
UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
VERSION = @VERSION@
@@ -350,6 +353,7 @@ XWIN_SERVER_NAME = @XWIN_SERVER_NAME@
XWIN_SYS_LIBS = @XWIN_SYS_LIBS@
YACC = @YACC@
YFLAGS = @YFLAGS@
+__XCONFIGDIR__ = @__XCONFIGDIR__@
__XCONFIGFILE__ = @__XCONFIGFILE__@
abi_ansic = @abi_ansic@
abi_extension = @abi_extension@
diff --git a/xorg-server/hw/xfree86/ramdac/xf86BitOrder.c b/xorg-server/hw/xfree86/ramdac/xf86BitOrder.c
new file mode 100644
index 000000000..713934d3b
--- /dev/null
+++ b/xorg-server/hw/xfree86/ramdac/xf86BitOrder.c
@@ -0,0 +1,2 @@
+#define XAAReverseBitOrder xf86ReverseBitOrder
+#include "./../xaa/xaaBitOrder.c"
diff --git a/xorg-server/hw/xfree86/shadowfb/Makefile.in b/xorg-server/hw/xfree86/shadowfb/Makefile.in
index 98a8b2bf7..1bdd31c55 100644
--- a/xorg-server/hw/xfree86/shadowfb/Makefile.in
+++ b/xorg-server/hw/xfree86/shadowfb/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -292,8 +292,11 @@ SHELL = @SHELL@
SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@
SOLARIS_INOUT_ARCH = @SOLARIS_INOUT_ARCH@
STRIP = @STRIP@
+SYSCONFDIR = @SYSCONFDIR@
TSLIB_CFLAGS = @TSLIB_CFLAGS@
TSLIB_LIBS = @TSLIB_LIBS@
+UDEV_CFLAGS = @UDEV_CFLAGS@
+UDEV_LIBS = @UDEV_LIBS@
UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
VERSION = @VERSION@
@@ -353,6 +356,7 @@ XWIN_SERVER_NAME = @XWIN_SERVER_NAME@
XWIN_SYS_LIBS = @XWIN_SYS_LIBS@
YACC = @YACC@
YFLAGS = @YFLAGS@
+__XCONFIGDIR__ = @__XCONFIGDIR__@
__XCONFIGFILE__ = @__XCONFIGFILE__@
abi_ansic = @abi_ansic@
abi_extension = @abi_extension@
diff --git a/xorg-server/hw/xfree86/utils/Makefile.in b/xorg-server/hw/xfree86/utils/Makefile.in
index bb05c69d1..d882aed24 100644
--- a/xorg-server/hw/xfree86/utils/Makefile.in
+++ b/xorg-server/hw/xfree86/utils/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -277,8 +277,11 @@ SHELL = @SHELL@
SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@
SOLARIS_INOUT_ARCH = @SOLARIS_INOUT_ARCH@
STRIP = @STRIP@
+SYSCONFDIR = @SYSCONFDIR@
TSLIB_CFLAGS = @TSLIB_CFLAGS@
TSLIB_LIBS = @TSLIB_LIBS@
+UDEV_CFLAGS = @UDEV_CFLAGS@
+UDEV_LIBS = @UDEV_LIBS@
UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
VERSION = @VERSION@
@@ -338,6 +341,7 @@ XWIN_SERVER_NAME = @XWIN_SERVER_NAME@
XWIN_SYS_LIBS = @XWIN_SYS_LIBS@
YACC = @YACC@
YFLAGS = @YFLAGS@
+__XCONFIGDIR__ = @__XCONFIGDIR__@
__XCONFIGFILE__ = @__XCONFIGFILE__@
abi_ansic = @abi_ansic@
abi_extension = @abi_extension@
@@ -452,7 +456,7 @@ clean-libtool:
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
- @failcom='exit 1'; \
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
@@ -477,7 +481,7 @@ $(RECURSIVE_TARGETS):
fi; test -z "$$fail"
$(RECURSIVE_CLEAN_TARGETS):
- @failcom='exit 1'; \
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
diff --git a/xorg-server/hw/xfree86/utils/cvt/Makefile.in b/xorg-server/hw/xfree86/utils/cvt/Makefile.in
index db1561a1d..8a865b245 100644
--- a/xorg-server/hw/xfree86/utils/cvt/Makefile.in
+++ b/xorg-server/hw/xfree86/utils/cvt/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -319,8 +319,11 @@ SHELL = @SHELL@
SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@
SOLARIS_INOUT_ARCH = @SOLARIS_INOUT_ARCH@
STRIP = @STRIP@
+SYSCONFDIR = @SYSCONFDIR@
TSLIB_CFLAGS = @TSLIB_CFLAGS@
TSLIB_LIBS = @TSLIB_LIBS@
+UDEV_CFLAGS = @UDEV_CFLAGS@
+UDEV_LIBS = @UDEV_LIBS@
UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
VERSION = @VERSION@
@@ -380,6 +383,7 @@ XWIN_SERVER_NAME = @XWIN_SERVER_NAME@
XWIN_SYS_LIBS = @XWIN_SYS_LIBS@
YACC = @YACC@
YFLAGS = @YFLAGS@
+__XCONFIGDIR__ = @__XCONFIGDIR__@
__XCONFIGFILE__ = @__XCONFIGFILE__@
abi_ansic = @abi_ansic@
abi_extension = @abi_extension@
@@ -484,7 +488,9 @@ MANDEFS = \
-D__adminmansuffix__=$(ADMIN_MAN_SUFFIX) \
-D__mandir__=$(mandir) \
-D__projectroot__=$(prefix) \
- -D__xconfigfile__=$(__XCONFIGFILE__) -D__xconfigdir__=$(XCONFIGDIR) \
+ -D__datadir__=$(datadir) \
+ -D__xconfigfile__=$(__XCONFIGFILE__) \
+ -D__xconfigdir__=$(__XCONFIGDIR__) \
-D__xkbdir__=$(XKB_BASE_DIRECTORY) \
-D__modulepath__="$(DEFAULT_MODULE_PATH)" \
-D__xlogfile__=$(XLOGFILE) -D__xservername__=$(XSERVERNAME)
diff --git a/xorg-server/hw/xfree86/utils/gtf/Makefile.in b/xorg-server/hw/xfree86/utils/gtf/Makefile.in
index c00987ae4..24fba799b 100644
--- a/xorg-server/hw/xfree86/utils/gtf/Makefile.in
+++ b/xorg-server/hw/xfree86/utils/gtf/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -318,8 +318,11 @@ SHELL = @SHELL@
SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@
SOLARIS_INOUT_ARCH = @SOLARIS_INOUT_ARCH@
STRIP = @STRIP@
+SYSCONFDIR = @SYSCONFDIR@
TSLIB_CFLAGS = @TSLIB_CFLAGS@
TSLIB_LIBS = @TSLIB_LIBS@
+UDEV_CFLAGS = @UDEV_CFLAGS@
+UDEV_LIBS = @UDEV_LIBS@
UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
VERSION = @VERSION@
@@ -379,6 +382,7 @@ XWIN_SERVER_NAME = @XWIN_SERVER_NAME@
XWIN_SYS_LIBS = @XWIN_SYS_LIBS@
YACC = @YACC@
YFLAGS = @YFLAGS@
+__XCONFIGDIR__ = @__XCONFIGDIR__@
__XCONFIGFILE__ = @__XCONFIGFILE__@
abi_ansic = @abi_ansic@
abi_extension = @abi_extension@
@@ -479,7 +483,9 @@ MANDEFS = \
-D__adminmansuffix__=$(ADMIN_MAN_SUFFIX) \
-D__mandir__=$(mandir) \
-D__projectroot__=$(prefix) \
- -D__xconfigfile__=$(__XCONFIGFILE__) -D__xconfigdir__=$(XCONFIGDIR) \
+ -D__datadir__=$(datadir) \
+ -D__xconfigfile__=$(__XCONFIGFILE__) \
+ -D__xconfigdir__=$(__XCONFIGDIR__) \
-D__xkbdir__=$(XKB_BASE_DIRECTORY) \
-D__modulepath__="$(DEFAULT_MODULE_PATH)" \
-D__xlogfile__=$(XLOGFILE) -D__xservername__=$(XSERVERNAME)
diff --git a/xorg-server/hw/xfree86/vbe/Makefile.in b/xorg-server/hw/xfree86/vbe/Makefile.in
index edc3da7f6..74c500562 100644
--- a/xorg-server/hw/xfree86/vbe/Makefile.in
+++ b/xorg-server/hw/xfree86/vbe/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -291,8 +291,11 @@ SHELL = @SHELL@
SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@
SOLARIS_INOUT_ARCH = @SOLARIS_INOUT_ARCH@
STRIP = @STRIP@
+SYSCONFDIR = @SYSCONFDIR@
TSLIB_CFLAGS = @TSLIB_CFLAGS@
TSLIB_LIBS = @TSLIB_LIBS@
+UDEV_CFLAGS = @UDEV_CFLAGS@
+UDEV_LIBS = @UDEV_LIBS@
UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
VERSION = @VERSION@
@@ -352,6 +355,7 @@ XWIN_SERVER_NAME = @XWIN_SERVER_NAME@
XWIN_SYS_LIBS = @XWIN_SYS_LIBS@
YACC = @YACC@
YFLAGS = @YFLAGS@
+__XCONFIGDIR__ = @__XCONFIGDIR__@
__XCONFIGFILE__ = @__XCONFIGFILE__@
abi_ansic = @abi_ansic@
abi_extension = @abi_extension@
diff --git a/xorg-server/hw/xfree86/vgahw/Makefile.in b/xorg-server/hw/xfree86/vgahw/Makefile.in
index 017820a80..e6d74eb33 100644
--- a/xorg-server/hw/xfree86/vgahw/Makefile.in
+++ b/xorg-server/hw/xfree86/vgahw/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -291,8 +291,11 @@ SHELL = @SHELL@
SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@
SOLARIS_INOUT_ARCH = @SOLARIS_INOUT_ARCH@
STRIP = @STRIP@
+SYSCONFDIR = @SYSCONFDIR@
TSLIB_CFLAGS = @TSLIB_CFLAGS@
TSLIB_LIBS = @TSLIB_LIBS@
+UDEV_CFLAGS = @UDEV_CFLAGS@
+UDEV_LIBS = @UDEV_LIBS@
UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
VERSION = @VERSION@
@@ -352,6 +355,7 @@ XWIN_SERVER_NAME = @XWIN_SERVER_NAME@
XWIN_SYS_LIBS = @XWIN_SYS_LIBS@
YACC = @YACC@
YFLAGS = @YFLAGS@
+__XCONFIGDIR__ = @__XCONFIGDIR__@
__XCONFIGFILE__ = @__XCONFIGFILE__@
abi_ansic = @abi_ansic@
abi_extension = @abi_extension@
diff --git a/xorg-server/hw/xfree86/x86emu/Makefile.in b/xorg-server/hw/xfree86/x86emu/Makefile.in
index 922746884..b05b1539e 100644
--- a/xorg-server/hw/xfree86/x86emu/Makefile.in
+++ b/xorg-server/hw/xfree86/x86emu/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -265,8 +265,11 @@ SHELL = @SHELL@
SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@
SOLARIS_INOUT_ARCH = @SOLARIS_INOUT_ARCH@
STRIP = @STRIP@
+SYSCONFDIR = @SYSCONFDIR@
TSLIB_CFLAGS = @TSLIB_CFLAGS@
TSLIB_LIBS = @TSLIB_LIBS@
+UDEV_CFLAGS = @UDEV_CFLAGS@
+UDEV_LIBS = @UDEV_LIBS@
UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
VERSION = @VERSION@
@@ -326,6 +329,7 @@ XWIN_SERVER_NAME = @XWIN_SERVER_NAME@
XWIN_SYS_LIBS = @XWIN_SYS_LIBS@
YACC = @YACC@
YFLAGS = @YFLAGS@
+__XCONFIGDIR__ = @__XCONFIGDIR__@
__XCONFIGFILE__ = @__XCONFIGFILE__@
abi_ansic = @abi_ansic@
abi_extension = @abi_extension@
@@ -399,7 +403,7 @@ libx86emu_la_SOURCES = debug.c \
sys.c \
x86emu.h
-INCLUDES = $(XORG_INCS)
+INCLUDES =
AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS)
EXTRA_DIST = validate.c \
x86emu/debug.h \
diff --git a/xorg-server/hw/xfree86/xaa/Makefile.in b/xorg-server/hw/xfree86/xaa/Makefile.in
index 0bc83c6e6..3f628e5dc 100644
--- a/xorg-server/hw/xfree86/xaa/Makefile.in
+++ b/xorg-server/hw/xfree86/xaa/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -311,8 +311,11 @@ SHELL = @SHELL@
SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@
SOLARIS_INOUT_ARCH = @SOLARIS_INOUT_ARCH@
STRIP = @STRIP@
+SYSCONFDIR = @SYSCONFDIR@
TSLIB_CFLAGS = @TSLIB_CFLAGS@
TSLIB_LIBS = @TSLIB_LIBS@
+UDEV_CFLAGS = @UDEV_CFLAGS@
+UDEV_LIBS = @UDEV_LIBS@
UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
VERSION = @VERSION@
@@ -372,6 +375,7 @@ XWIN_SERVER_NAME = @XWIN_SERVER_NAME@
XWIN_SYS_LIBS = @XWIN_SYS_LIBS@
YACC = @YACC@
YFLAGS = @YFLAGS@
+__XCONFIGDIR__ = @__XCONFIGDIR__@
__XCONFIGFILE__ = @__XCONFIGFILE__@
abi_ansic = @abi_ansic@
abi_extension = @abi_extension@
diff --git a/xorg-server/hw/xfree86/xaa/l-xaaBitmap.c b/xorg-server/hw/xfree86/xaa/l-xaaBitmap.c
new file mode 100644
index 000000000..4b20dee13
--- /dev/null
+++ b/xorg-server/hw/xfree86/xaa/l-xaaBitmap.c
@@ -0,0 +1,2 @@
+#define LSBFIRST
+#include "./xaaBitmap.c"
diff --git a/xorg-server/hw/xfree86/xaa/l-xaaStipple.c b/xorg-server/hw/xfree86/xaa/l-xaaStipple.c
new file mode 100644
index 000000000..91c52c778
--- /dev/null
+++ b/xorg-server/hw/xfree86/xaa/l-xaaStipple.c
@@ -0,0 +1,2 @@
+#define LSBFIRST
+#include "./xaaStipple.c"
diff --git a/xorg-server/hw/xfree86/xaa/l-xaaTEGlyph.c b/xorg-server/hw/xfree86/xaa/l-xaaTEGlyph.c
new file mode 100644
index 000000000..e58359cd2
--- /dev/null
+++ b/xorg-server/hw/xfree86/xaa/l-xaaTEGlyph.c
@@ -0,0 +1,2 @@
+#define LSBFIRST
+#include "./xaaTEGlyph.c"
diff --git a/xorg-server/hw/xfree86/xaa/l3-xaaBitmap.c b/xorg-server/hw/xfree86/xaa/l3-xaaBitmap.c
new file mode 100644
index 000000000..0c1fd552d
--- /dev/null
+++ b/xorg-server/hw/xfree86/xaa/l3-xaaBitmap.c
@@ -0,0 +1,3 @@
+#define LSBFIRST
+#define TRIPLE_BITS
+#include "./xaaBitmap.c"
diff --git a/xorg-server/hw/xfree86/xaa/l3-xaaStipple.c b/xorg-server/hw/xfree86/xaa/l3-xaaStipple.c
new file mode 100644
index 000000000..9a182c695
--- /dev/null
+++ b/xorg-server/hw/xfree86/xaa/l3-xaaStipple.c
@@ -0,0 +1,3 @@
+#define LSBFIRST
+#define TRIPLE_BITS
+#include "./xaaStipple.c"
diff --git a/xorg-server/hw/xfree86/xaa/lf-xaaBitmap.c b/xorg-server/hw/xfree86/xaa/lf-xaaBitmap.c
new file mode 100644
index 000000000..031407b9c
--- /dev/null
+++ b/xorg-server/hw/xfree86/xaa/lf-xaaBitmap.c
@@ -0,0 +1,3 @@
+#define LSBFIRST
+#define FIXEDBASE
+#include "./xaaBitmap.c"
diff --git a/xorg-server/hw/xfree86/xaa/lf-xaaStipple.c b/xorg-server/hw/xfree86/xaa/lf-xaaStipple.c
new file mode 100644
index 000000000..d91265890
--- /dev/null
+++ b/xorg-server/hw/xfree86/xaa/lf-xaaStipple.c
@@ -0,0 +1,3 @@
+#define LSBFIRST
+#define FIXEDBASE
+#include "./xaaStipple.c"
diff --git a/xorg-server/hw/xfree86/xaa/lf-xaaTEGlyph.c b/xorg-server/hw/xfree86/xaa/lf-xaaTEGlyph.c
new file mode 100644
index 000000000..c578603f3
--- /dev/null
+++ b/xorg-server/hw/xfree86/xaa/lf-xaaTEGlyph.c
@@ -0,0 +1,3 @@
+#define LSBFIRST
+#define FIXEDBASE
+#include "./xaaTEGlyph.c"
diff --git a/xorg-server/hw/xfree86/xaa/lf3-xaaBitmap.c b/xorg-server/hw/xfree86/xaa/lf3-xaaBitmap.c
new file mode 100644
index 000000000..0607a7390
--- /dev/null
+++ b/xorg-server/hw/xfree86/xaa/lf3-xaaBitmap.c
@@ -0,0 +1,4 @@
+#define LSBFIRST
+#define TRIPLE_BITS
+#define FIXEDBASE
+#include "./xaaBitmap.c"
diff --git a/xorg-server/hw/xfree86/xaa/lf3-xaaStipple.c b/xorg-server/hw/xfree86/xaa/lf3-xaaStipple.c
new file mode 100644
index 000000000..af1698b99
--- /dev/null
+++ b/xorg-server/hw/xfree86/xaa/lf3-xaaStipple.c
@@ -0,0 +1,4 @@
+#define LSBFIRST
+#define TRIPLE_BITS
+#define FIXEDBASE
+#include "./xaaStipple.c"
diff --git a/xorg-server/hw/xfree86/xaa/m-xaaBitmap.c b/xorg-server/hw/xfree86/xaa/m-xaaBitmap.c
new file mode 100644
index 000000000..d0e3cb33d
--- /dev/null
+++ b/xorg-server/hw/xfree86/xaa/m-xaaBitmap.c
@@ -0,0 +1,2 @@
+#define MSBFIRST
+#include "./xaaBitmap.c"
diff --git a/xorg-server/hw/xfree86/xaa/m-xaaStipple.c b/xorg-server/hw/xfree86/xaa/m-xaaStipple.c
new file mode 100644
index 000000000..1ba789918
--- /dev/null
+++ b/xorg-server/hw/xfree86/xaa/m-xaaStipple.c
@@ -0,0 +1,2 @@
+#define MSBFIRST
+#include "./xaaStipple.c"
diff --git a/xorg-server/hw/xfree86/xaa/m-xaaTEGlyph.c b/xorg-server/hw/xfree86/xaa/m-xaaTEGlyph.c
new file mode 100644
index 000000000..521390c32
--- /dev/null
+++ b/xorg-server/hw/xfree86/xaa/m-xaaTEGlyph.c
@@ -0,0 +1,2 @@
+#define MSBFIRST
+#include "./xaaTEGlyph.c"
diff --git a/xorg-server/hw/xfree86/xaa/m3-xaaBitmap.c b/xorg-server/hw/xfree86/xaa/m3-xaaBitmap.c
new file mode 100644
index 000000000..7b4ce814d
--- /dev/null
+++ b/xorg-server/hw/xfree86/xaa/m3-xaaBitmap.c
@@ -0,0 +1,3 @@
+#define MSBFIRST
+#define TRIPLE_BITS
+#include "./xaaBitmap.c"
diff --git a/xorg-server/hw/xfree86/xaa/m3-xaaStipple.c b/xorg-server/hw/xfree86/xaa/m3-xaaStipple.c
new file mode 100644
index 000000000..eb2c83e8d
--- /dev/null
+++ b/xorg-server/hw/xfree86/xaa/m3-xaaStipple.c
@@ -0,0 +1,3 @@
+#define MSBFIRST
+#define TRIPLE_BITS
+#include "./xaaStipple.c"
diff --git a/xorg-server/hw/xfree86/xaa/mf-xaaBitmap.c b/xorg-server/hw/xfree86/xaa/mf-xaaBitmap.c
new file mode 100644
index 000000000..36075e65d
--- /dev/null
+++ b/xorg-server/hw/xfree86/xaa/mf-xaaBitmap.c
@@ -0,0 +1,3 @@
+#define MSBFIRST
+#define FIXEDBASE
+#include "./xaaBitmap.c"
diff --git a/xorg-server/hw/xfree86/xaa/mf-xaaStipple.c b/xorg-server/hw/xfree86/xaa/mf-xaaStipple.c
new file mode 100644
index 000000000..41b469c71
--- /dev/null
+++ b/xorg-server/hw/xfree86/xaa/mf-xaaStipple.c
@@ -0,0 +1,3 @@
+#define MSBFIRST
+#define FIXEDBASE
+#include "./xaaStipple.c"
diff --git a/xorg-server/hw/xfree86/xaa/mf-xaaTEGlyph.c b/xorg-server/hw/xfree86/xaa/mf-xaaTEGlyph.c
new file mode 100644
index 000000000..3fd657b4b
--- /dev/null
+++ b/xorg-server/hw/xfree86/xaa/mf-xaaTEGlyph.c
@@ -0,0 +1,3 @@
+#define MSBFIRST
+#define FIXEDBASE
+#include "./xaaTEGlyph.c"
diff --git a/xorg-server/hw/xfree86/xaa/mf3-xaaBitmap.c b/xorg-server/hw/xfree86/xaa/mf3-xaaBitmap.c
new file mode 100644
index 000000000..630775c52
--- /dev/null
+++ b/xorg-server/hw/xfree86/xaa/mf3-xaaBitmap.c
@@ -0,0 +1,4 @@
+#define MSBFIRST
+#define TRIPLE_BITS
+#define FIXEDBASE
+#include "./xaaBitmap.c"
diff --git a/xorg-server/hw/xfree86/xaa/mf3-xaaStipple.c b/xorg-server/hw/xfree86/xaa/mf3-xaaStipple.c
new file mode 100644
index 000000000..c9a86d008
--- /dev/null
+++ b/xorg-server/hw/xfree86/xaa/mf3-xaaStipple.c
@@ -0,0 +1,4 @@
+#define MSBFIRST
+#define TRIPLE_BITS
+#define FIXEDBASE
+#include "./xaaStipple.c"
diff --git a/xorg-server/hw/xfree86/xaa/s-xaaDashLine.c b/xorg-server/hw/xfree86/xaa/s-xaaDashLine.c
new file mode 100644
index 000000000..5ad3deb92
--- /dev/null
+++ b/xorg-server/hw/xfree86/xaa/s-xaaDashLine.c
@@ -0,0 +1,2 @@
+#define POLYSEGMENT
+#include "./xaaDashLine.c"
diff --git a/xorg-server/hw/xfree86/xaa/s-xaaLine.c b/xorg-server/hw/xfree86/xaa/s-xaaLine.c
new file mode 100644
index 000000000..12a37f419
--- /dev/null
+++ b/xorg-server/hw/xfree86/xaa/s-xaaLine.c
@@ -0,0 +1,2 @@
+#define POLYSEGMENT
+#include "./xaaLine.c"
diff --git a/xorg-server/hw/xfree86/xf8_16bpp/Makefile.in b/xorg-server/hw/xfree86/xf8_16bpp/Makefile.in
index 6e819377a..237259c90 100644
--- a/xorg-server/hw/xfree86/xf8_16bpp/Makefile.in
+++ b/xorg-server/hw/xfree86/xf8_16bpp/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -292,8 +292,11 @@ SHELL = @SHELL@
SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@
SOLARIS_INOUT_ARCH = @SOLARIS_INOUT_ARCH@
STRIP = @STRIP@
+SYSCONFDIR = @SYSCONFDIR@
TSLIB_CFLAGS = @TSLIB_CFLAGS@
TSLIB_LIBS = @TSLIB_LIBS@
+UDEV_CFLAGS = @UDEV_CFLAGS@
+UDEV_LIBS = @UDEV_LIBS@
UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
VERSION = @VERSION@
@@ -353,6 +356,7 @@ XWIN_SERVER_NAME = @XWIN_SERVER_NAME@
XWIN_SYS_LIBS = @XWIN_SYS_LIBS@
YACC = @YACC@
YFLAGS = @YFLAGS@
+__XCONFIGDIR__ = @__XCONFIGDIR__@
__XCONFIGFILE__ = @__XCONFIGFILE__@
abi_ansic = @abi_ansic@
abi_extension = @abi_extension@
diff --git a/xorg-server/hw/xfree86/xorg.c b/xorg-server/hw/xfree86/xorg.c
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/xorg-server/hw/xfree86/xorg.c