xserver libXdmcp git update 16-12-2010

22 files changed, 10325 insertions, 10585 deletions

diff --git a/libXdmcp/Makefile.am b/libXdmcp/Makefile.am
index 118368ee6..3da33e5b8 100644
--- a/libXdmcp/Makefile.am
+++ b/libXdmcp/Makefile.am
@@ -1,66 +1,66 @@
-SUBDIRS=doc

-

-lib_LTLIBRARIES = libXdmcp.la

-

-AM_CPPFLAGS = -I${top_srcdir}/include

-AM_CFLAGS = \

-	$(XDMCP_CFLAGS) \

-	$(CWARNFLAGS)

-

-libXdmcp_la_LDFLAGS = -version-number 6:0:0 -no-undefined

-libXdmcp_la_LIBADD = $(XDMCP_LIBS)

-libXdmcp_la_SOURCES = \

-	Array.c \

-	Fill.c \

-	Flush.c \

-	Key.c \

-	Read.c \

-	Unwrap.c \

-	Wrap.c \

-	Wrap.h \

-	Write.c

-

-if HASXDMAUTH

-nodist_libXdmcp_la_SOURCES = Wraphelp.c

-endif HASXDMAUTH

-

-xdmcpincludedir=$(includedir)/X11

-

-xdmcpinclude_HEADERS = \

-	include/X11/Xdmcp.h

-

-pkgconfigdir = $(libdir)/pkgconfig

-pkgconfig_DATA = xdmcp.pc

-

-MAINTAINERCLEANFILES = ChangeLog INSTALL

-EXTRA_DIST = autogen.sh Wraphelp.c Wraphelp.README.crypto

-

-if LINT

-ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \

-		$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS)

-

-lint:

-	$(LINT) $(ALL_LINT_FLAGS) $(libXdmcp_la_SOURCES) $(nodist_libXdmcp_la_SOURCES) $(LIBS) $(XDMCP_LIBS)

-endif LINT

-

-if MAKE_LINT_LIB

-lintlibdir = $(libdir)

-

-lintlib_DATA = $(LINTLIB)

-

-$(LINTLIB): $(libXdmcp_la_SOURCES) $(nodist_libXdmcp_la_SOURCES)

-	$(LINT) -y -oXdmcp -x $(ALL_LINT_FLAGS) $(libXdmcp_la_SOURCES) $(nodist_libXdmcp_la_SOURCES)

-endif MAKE_LINT_LIB

-

-

-.PHONY: ChangeLog INSTALL

-

-INSTALL:

-	$(INSTALL_CMD)

-

-ChangeLog:

-	$(CHANGELOG_CMD)

-

-dist-hook: ChangeLog INSTALL

-

-CLEANFILES=$(lintlib_DATA)

+SUBDIRS=doc
+
+lib_LTLIBRARIES = libXdmcp.la
+
+AM_CPPFLAGS = -I${top_srcdir}/include
+AM_CFLAGS = \
+	$(XDMCP_CFLAGS) \
+	$(CWARNFLAGS)
+
+libXdmcp_la_LDFLAGS = -export-symbols-regex '^Xdmcp.*' -version-number 6:0:0 -no-undefined
+libXdmcp_la_LIBADD = $(XDMCP_LIBS)
+libXdmcp_la_SOURCES = \
+	Array.c \
+	Fill.c \
+	Flush.c \
+	Key.c \
+	Read.c \
+	Unwrap.c \
+	Wrap.c \
+	Wrap.h \
+	Write.c
+
+if HASXDMAUTH
+nodist_libXdmcp_la_SOURCES = Wraphelp.c
+endif HASXDMAUTH
+
+xdmcpincludedir=$(includedir)/X11
+
+xdmcpinclude_HEADERS = \
+	include/X11/Xdmcp.h
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = xdmcp.pc
+
+MAINTAINERCLEANFILES = ChangeLog INSTALL
+EXTRA_DIST = autogen.sh Wraphelp.c Wraphelp.README.crypto
+
+if LINT
+ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+		$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS)
+
+lint:
+	$(LINT) $(ALL_LINT_FLAGS) $(libXdmcp_la_SOURCES) $(nodist_libXdmcp_la_SOURCES) $(LIBS) $(XDMCP_LIBS)
+endif LINT
+
+if MAKE_LINT_LIB
+lintlibdir = $(libdir)
+
+lintlib_DATA = $(LINTLIB)
+
+$(LINTLIB): $(libXdmcp_la_SOURCES) $(nodist_libXdmcp_la_SOURCES)
+	$(LINT) -y -oXdmcp -x $(ALL_LINT_FLAGS) $(libXdmcp_la_SOURCES) $(nodist_libXdmcp_la_SOURCES)
+endif MAKE_LINT_LIB
+
+
+.PHONY: ChangeLog INSTALL
+
+INSTALL:
+	$(INSTALL_CMD)
+
+ChangeLog:
+	$(CHANGELOG_CMD)
+
+dist-hook: ChangeLog INSTALL
+
+CLEANFILES=$(lintlib_DATA)
diff --git a/xorg-server/configure.ac b/xorg-server/configure.ac
index 1e0820479..a5967ad03 100644
--- a/xorg-server/configure.ac
+++ b/xorg-server/configure.ac
@@ -1,2270 +1,2265 @@
-dnl Copyright © 2003-2007 Keith Packard, Daniel Stone

-dnl

-dnl Permission is hereby granted, free of charge, to any person obtaining a

-dnl copy of this software and associated documentation files (the "Software"),

-dnl to deal in the Software without restriction, including without limitation

-dnl the rights to use, copy, modify, merge, publish, distribute, sublicense,

-dnl and/or sell copies of the Software, and to permit persons to whom the

-dnl Software is furnished to do so, subject to the following conditions:

-dnl

-dnl The above copyright notice and this permission notice (including the next

-dnl paragraph) shall be included in all copies or substantial portions of the

-dnl Software.

-dnl

-dnl THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

-dnl IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

-dnl FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

-dnl THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

-dnl LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING

-dnl FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER

-dnl DEALINGS IN THE SOFTWARE.

-dnl

-dnl Authors: Keith Packard <keithp@keithp.com>

-dnl          Daniel Stone <daniel@fooishbar.org>

-dnl          an unwitting cast of miscellaneous others

-dnl

-dnl Process this file with autoconf to create configure.

-

-AC_PREREQ(2.57)

-AC_INIT([xorg-server], 1.9.99.901, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)

-RELEASE_DATE="2010-12-06"

-AC_CONFIG_SRCDIR([Makefile.am])

-AM_INIT_AUTOMAKE([foreign dist-bzip2])

-AM_MAINTAINER_MODE

-

-# Require xorg-macros minimum of 1.10 for XORG_CHECK_SGML_DOCTOOLS

-m4_ifndef([XORG_MACROS_VERSION],

-          [m4_fatal([must install xorg-macros 1.10 or later before running autoconf/autogen])])

-XORG_MACROS_VERSION(1.10)

-XORG_DEFAULT_OPTIONS

-XORG_WITH_DOXYGEN(1.6.1)

-XORG_CHECK_SGML_DOCTOOLS(1.5)

-

-m4_ifndef([XORG_FONT_MACROS_VERSION], [m4_fatal([must install fontutil 1.1 or later before running autoconf/autogen])])

-XORG_FONT_MACROS_VERSION(1.1)

-

-dnl this gets generated by autoheader, and thus contains all the defines.  we

-dnl don't ever actually use it, internally.

-AC_CONFIG_HEADERS(include/do-not-use-config.h)

-dnl xorg-server.h is an external header, designed to be included by loadable

-dnl drivers.

-AC_CONFIG_HEADERS(include/xorg-server.h)

-dnl dix-config.h covers most of the DIX (i.e. everything but the DDX, not just

-dnl dix/).

-AC_CONFIG_HEADERS(include/dix-config.h)

-dnl xorg-config.h covers the Xorg DDX.

-AC_CONFIG_HEADERS(include/xorg-config.h)

-dnl xkb-config.h covers XKB for the Xorg and Xnest DDXs.

-AC_CONFIG_HEADERS(include/xkb-config.h)

-dnl xwin-config.h covers the XWin DDX.

-AC_CONFIG_HEADERS(include/xwin-config.h)

-dnl kdrive-config.h covers the kdrive DDX

-AC_CONFIG_HEADERS(include/kdrive-config.h)

-dnl version-config.h covers the version numbers so they can be bumped without

-dnl forcing an entire recompile.x

-AC_CONFIG_HEADERS(include/version-config.h)

-

-AM_PROG_AS

-AC_PROG_LN_S

-AC_LIBTOOL_WIN32_DLL

-AC_DISABLE_STATIC

-AC_PROG_LIBTOOL

-AC_PROG_MAKE_SET

-PKG_PROG_PKG_CONFIG

-AC_PROG_LEX

-AC_PROG_YACC

-AC_SYS_LARGEFILE

-XORG_PROG_RAWCPP

-

-# Quoted so that make will expand $(CWARNFLAGS) in makefiles to allow

-# easier overrides at build time.

-XSERVER_CFLAGS='$(CWARNFLAGS)'

-

-dnl Check for dtrace program (needed to build Xserver dtrace probes)

-dnl Also checks for <sys/sdt.h>, since some Linux distros have an 

-dnl ISDN trace program named dtrace

-AC_ARG_WITH(dtrace, AS_HELP_STRING([--with-dtrace=PATH],

-	     [Enable dtrace probes (default: enabled if dtrace found)]),

-	     [WDTRACE=$withval], [WDTRACE=auto])

-if test "x$WDTRACE" = "xyes" -o "x$WDTRACE" = "xauto" ; then

-	AC_PATH_PROG(DTRACE, [dtrace], [not_found], [$PATH:/usr/sbin])

-	if test "x$DTRACE" = "xnot_found" ; then

-		if test "x$WDTRACE" = "xyes" ; then

-			AC_MSG_FAILURE([dtrace requested but not found])

-		fi

-		WDTRACE="no"

-	else

-		AC_CHECK_HEADER(sys/sdt.h, [HAS_SDT_H="yes"], [HAS_SDT_H="no"])

-		if test "x$WDTRACE" = "xauto" -a "x$HAS_SDT_H" = "xno" ; then

-			WDTRACE="no"

-		fi

-	fi

-fi

-if test "x$WDTRACE" != "xno" ; then

-  AC_DEFINE(XSERVER_DTRACE, 1, 

-      [Define to 1 if the DTrace Xserver provider probes should be built in.])

-

-# Solaris/OpenSolaris require dtrace -G to build dtrace probe information into

-# object files, and require linking with those as relocatable objects, not .a

-# archives. MacOS X handles all this in the normal compiler toolchain, and on

-# some releases (like Tiger), will error out on dtrace -G.  For now, other

-# platforms with Dtrace ports are assumed to support -G (the FreeBSD and Linux

-# ports appear to, based on my web searches, but have not yet been tested).

-	case $host_os in

-		darwin*)	SPECIAL_DTRACE_OBJECTS=no ;;

-		*)		SPECIAL_DTRACE_OBJECTS=yes ;;

-	esac

-fi

-AM_CONDITIONAL(XSERVER_DTRACE, [test "x$WDTRACE" != "xno"])

-AM_CONDITIONAL(SPECIAL_DTRACE_OBJECTS, [test "x$SPECIAL_DTRACE_OBJECTS" = "xyes"])

-

-AC_HEADER_DIRENT

-AC_HEADER_STDC

-AC_CHECK_HEADERS([fcntl.h stdlib.h string.h unistd.h dlfcn.h stropts.h fnmatch.h sys/utsname.h])

-

-dnl Checks for typedefs, structures, and compiler characteristics.

-AC_C_CONST

-AC_C_BIGENDIAN([ENDIAN="X_BIG_ENDIAN"], [ENDIAN="X_LITTLE_ENDIAN"])

-

-AC_CHECK_SIZEOF([unsigned long])

-if test "$ac_cv_sizeof_unsigned_long" = 8; then

-	AC_DEFINE(_XSERVER64, 1, [Define to 1 if unsigned long is 64 bits.])

-fi

-

-AC_TYPE_PID_T

-

-# Checks for headers/macros for byte swapping

-# Known variants:

-#	<byteswap.h> bswap_16, bswap_32, bswap_64  (glibc)

-#	<sys/endian.h> __swap16, __swap32, __swap64 (OpenBSD)

-#	<sys/endian.h> bswap16, bswap32, bswap64 (other BSD's)

-#	and a fallback to local macros if none of the above are found

-

-# if <byteswap.h> is found, assume it's the correct version

-AC_CHECK_HEADERS([byteswap.h])

-

-# if <sys/endian.h> is found, have to check which version

-AC_CHECK_HEADER([sys/endian.h], [HAVE_SYS_ENDIAN_H="yes"], [HAVE_SYS_ENDIAN_H="no"])

-

-if test "x$HAVE_SYS_ENDIAN_H" = "xyes" ; then

-	AC_MSG_CHECKING([for __swap16 variant of <sys/endian.h> byteswapping macros])

-	AC_LINK_IFELSE([AC_LANG_PROGRAM([

-#include <sys/types.h>

-#include <sys/endian.h>

- ], [

-int a = 1, b;

-b = __swap16(a);

- ])

-], [SYS_ENDIAN__SWAP='yes'], [SYS_ENDIAN__SWAP='no'])

-	AC_MSG_RESULT([$SYS_ENDIAN__SWAP])

-

-	AC_MSG_CHECKING([for bswap16 variant of <sys/endian.h> byteswapping macros])

-	AC_LINK_IFELSE([AC_LANG_PROGRAM([

-#include <sys/types.h>

-#include <sys/endian.h>

- ], [

-int a = 1, b;

-b = bswap16(a);

- ])

-], [SYS_ENDIAN_BSWAP='yes'], [SYS_ENDIAN_BSWAP='no'])

-	AC_MSG_RESULT([$SYS_ENDIAN_BSWAP])

-

-    	if test "$SYS_ENDIAN_BSWAP" = "yes" ; then

-		USE_SYS_ENDIAN_H=yes

-		BSWAP=bswap

-	else	

-	    	if test "$SYS_ENDIAN__SWAP" = "yes" ; then

-			USE_SYS_ENDIAN_H=yes

-			BSWAP=__swap

-		else

-			USE_SYS_ENDIAN_H=no

-		fi

-	fi

-

-	if test "$USE_SYS_ENDIAN_H" = "yes" ; then

-	    AC_DEFINE([USE_SYS_ENDIAN_H], 1, 

-		[Define to use byteswap macros from <sys/endian.h>])

-	    AC_DEFINE_UNQUOTED([bswap_16], ${BSWAP}16, 

-			[Define to 16-bit byteswap macro])

-	    AC_DEFINE_UNQUOTED([bswap_32], ${BSWAP}32, 

-			[Define to 32-bit byteswap macro])

-	    AC_DEFINE_UNQUOTED([bswap_64], ${BSWAP}64, 

-			[Define to 64-bit byteswap macro])

-	fi

-fi

-

-dnl Check to see if dlopen is in default libraries (like Solaris, which

-dnl has it in libc), or if libdl is needed to get it.

-AC_CHECK_FUNC([dlopen], [],

-	AC_CHECK_LIB([dl], [dlopen], DLOPEN_LIBS="-ldl"))

-AC_SUBST(DLOPEN_LIBS)

-

-dnl Checks for library functions.

-AC_FUNC_VPRINTF

-AC_CHECK_FUNCS([geteuid getuid link memmove memset mkstemp strchr strrchr \

-		strtol getopt getopt_long vsnprintf walkcontext backtrace \

-		getisax getzoneid shmctl64 strcasestr ffs vasprintf])

-AC_FUNC_ALLOCA

-dnl Old HAS_* names used in os/*.c.

-AC_CHECK_FUNC([getdtablesize],

-	AC_DEFINE(HAS_GETDTABLESIZE, 1, [Have the 'getdtablesize' function.]))

-AC_CHECK_FUNC([getifaddrs],

-	AC_DEFINE(HAS_GETIFADDRS, 1, [Have the 'getifaddrs' function.]))

-AC_CHECK_FUNC([getpeereid],

-	AC_DEFINE(HAS_GETPEEREID, 1, [Have the 'getpeereid' function.]))

-AC_CHECK_FUNC([getpeerucred],

-	AC_DEFINE(HAS_GETPEERUCRED, 1, [Have the 'getpeerucred' function.]))

-AC_CHECK_FUNC([strlcat], HAVE_STRLCAT=yes, HAVE_STRLCAT=no)

-AM_CONDITIONAL(NEED_STRLCAT, [test x$HAVE_STRLCAT = xno])	

-AC_CHECK_FUNC([strlcpy], AC_DEFINE(HAS_STRLCPY, 1, [Have the 'strlcpy' function]))

-

-AM_CONDITIONAL(NEED_VSNPRINTF, [test x$HAVE_VSNPRINTF = xno])

-

-dnl Check for mmap support for Xvfb

-AC_CHECK_FUNC([mmap], AC_DEFINE(HAS_MMAP, 1, [Have the 'mmap' function.]))

-

-dnl Find the math libary

-AC_CHECK_LIB(m, sqrt)

-AC_CHECK_LIB(m, cbrt, AC_DEFINE(HAVE_CBRT, 1, [Have the 'cbrt' function]))

-

-AC_CHECK_HEADERS([ndbm.h dbm.h rpcsvc/dbm.h])

-

-dnl AGPGART headers

-AC_CHECK_HEADERS([linux/agpgart.h sys/agpio.h sys/agpgart.h], AGP=yes)

-AM_CONDITIONAL(AGP, [test "x$AGP" = xyes])

-

-dnl APM header

-AC_CHECK_HEADERS([linux/apm_bios.h], LNXAPM=yes)

-AM_CONDITIONAL(LNXAPM, [test "x$LNXAPM" = xyes])

-

-dnl fbdev header

-AC_CHECK_HEADERS([linux/fb.h], FBDEV=yes)

-AM_CONDITIONAL(FBDEVHW, [test "x$FBDEV" = xyes])

-

-dnl MTRR header

-AC_CHECK_HEADERS([asm/mtrr.h], ac_cv_asm_mtrr_h=yes)

-if test "x$ac_cv_asm_mtrr_h" = xyes; then

-	HAVE_MTRR=yes

-fi

-

-dnl BSD MTRR header

-AC_CHECK_HEADERS([sys/memrange.h], ac_cv_memrange_h=yes)

-if test "x$ac_cv_memrange_h" = xyes; then

-	HAVE_MTRR=yes

-fi

-

-if test "x$HAVE_MTRR" = xyes; then

-	AC_DEFINE(HAS_MTRR_SUPPORT, 1, [MTRR support available])

-fi

-

-dnl A NetBSD MTRR header

-AC_CHECK_HEADERS([machine/mtrr.h], ac_cv_machine_mtrr_h=yes)

-if test "x$ac_cv_machine_mtrr_h" = xyes; then

-	AC_DEFINE(HAS_MTRR_BUILTIN, 1, [Define to 1 if NetBSD built-in MTRR

-		support is available])

-fi

-

-dnl FreeBSD kldload support (sys/linker.h)

-AC_CHECK_HEADERS([sys/linker.h],

-	[ac_cv_sys_linker_h=yes],

-	[ac_cv_sys_linker_h=no],

-	[#include <sys/param.h>])

-AM_CONDITIONAL(FREEBSD_KLDLOAD, [test "x$ac_cv_sys_linker_h" = xyes])

-

-AC_CACHE_CHECK([for SYSV IPC],

-		ac_cv_sysv_ipc,

-		[AC_TRY_LINK([

-#include <sys/types.h>

-#include <sys/ipc.h>

-#include <sys/shm.h>

-],[

-{ 

-    int id;

-    id = shmget(IPC_PRIVATE, 512, SHM_W | SHM_R);

-    if (id < 0) return -1;

-    return shmctl(id, IPC_RMID, 0);

-}],

-	[ac_cv_sysv_ipc=yes],

-	[ac_cv_sysv_ipc=no])])

-if test "x$ac_cv_sysv_ipc" = xyes; then

-	AC_DEFINE(HAVE_SYSV_IPC, 1, [Define to 1 if SYSV IPC is available])

-fi

-

-dnl OpenBSD /dev/xf86 aperture driver 

-if test -c /dev/xf86 ; then

-	AC_DEFINE(HAS_APERTURE_DRV, 1, [System has /dev/xf86 aperture driver])

-fi

-

-dnl BSD APM support 

-AC_CHECK_HEADER([machine/apmvar.h],[

-	AC_CHECK_HEADER([sys/event.h],

-		ac_cv_BSD_KQUEUE_APM=yes,

-		ac_cv_BSD_APM=yes)])

-

-AM_CONDITIONAL(BSD_APM, [test "x$ac_cv_BSD_APM" = xyes])

-AM_CONDITIONAL(BSD_KQUEUE_APM, [test "x$ac_cv_BSD_KQUEUE_APM" = xyes])

-	

-dnl glibc backtrace support check (hw/xfree86/common/xf86Events.c)

-AC_CHECK_HEADER([execinfo.h],[

-    AC_CHECK_LIB(c, backtrace, [

-        AC_DEFINE(HAVE_BACKTRACE, 1, [Has backtrace support])

-        AC_DEFINE(HAVE_EXECINFO_H, 1, [Have execinfo.h])

-    ])]

-)

-

-dnl ARM needs additional compiler flags for proper backtraces if GCC is

-dnl used. Compile a dummy program with the -mapcs-frame option. If it

-dnl succeeds, we know that we are building for ARM with GCC.

-old_CFLAGS="$CFLAGS"

-CFLAGS="-mapcs-frame"

-AC_COMPILE_IFELSE(

-        AC_LANG_PROGRAM([[ ]]),

-        ARM_BACKTRACE_CFLAGS="$CFLAGS",

-        ARM_BACKTRACE_CFLAGS=""

-)

-CFLAGS="$old_CFLAGS"

-AC_SUBST(ARM_BACKTRACE_CFLAGS)

-

-dnl ---------------------------------------------------------------------------

-dnl Bus options and CPU capabilities.  Replaces logic in

-dnl hw/xfree86/os-support/bus/Makefile.am, among others.

-dnl ---------------------------------------------------------------------------

-DEFAULT_INT10="x86emu"

-

-dnl Override defaults as needed for specific platforms:

-

-case $host_cpu in

-  alpha*)

-	ALPHA_VIDEO=yes

-	case $host_os in

-	        *freebsd*)	SYS_LIBS=-lio ;;

-		*netbsd*)	AC_DEFINE(USE_ALPHA_PIO, 1, [NetBSD PIO alpha IO]) ;;

-	esac

-	GLX_ARCH_DEFINES="-D__GLX_ALIGN64 -mieee"

-	;;

-  arm*)

-	ARM_VIDEO=yes

-	;;

-  i*86)

-	I386_VIDEO=yes

-	case $host_os in

-		*freebsd*)	AC_DEFINE(USE_DEV_IO) ;;

-		*dragonfly*)	AC_DEFINE(USE_DEV_IO) ;;

-		*netbsd*)	AC_DEFINE(USE_I386_IOPL)

-				SYS_LIBS=-li386

-				;;

-		*openbsd*)	AC_DEFINE(USE_I386_IOPL) 

-				SYS_LIBS=-li386

-				;;

-	esac

-        ;;

-  powerpc*)

-	PPC_VIDEO=yes

-	case $host_os in

-		*freebsd*)	DEFAULT_INT10=stub ;;

-	esac

-	;;

-  sparc*)

-	SPARC64_VIDEO=yes

-	BSD_ARCH_SOURCES="sparc64_video.c ioperm_noop.c"

-	GLX_ARCH_DEFINES="-D__GLX_ALIGN64"

-	;;

-  x86_64*|amd64*)

-	I386_VIDEO=yes

-	case $host_os in

-		*freebsd*)	AC_DEFINE(USE_DEV_IO, 1, [BSD /dev/io]) ;;

-		*dragonfly*)	AC_DEFINE(USE_DEV_IO, 1, [BSD /dev/io]) ;;

-		*netbsd*)	AC_DEFINE(USE_I386_IOPL, 1, [BSD i386 iopl])

-				SYS_LIBS=-lx86_64

-				;;

-		*openbsd*)	AC_DEFINE(USE_AMD64_IOPL, 1, [BSD AMD64 iopl])

-				SYS_LIBS=-lamd64

-				;;

-	esac

-	GLX_ARCH_DEFINES="-D__GLX_ALIGN64"

-	;;

-  ia64*)

-  	GLX_ARCH_DEFINES="-D__GLX_ALIGN64"

-	;;

-  s390*)

-  	GLX_ARCH_DEFINES="-D__GLX_ALIGN64"

-	;;

-esac

-AC_SUBST(GLX_ARCH_DEFINES)

-

-dnl BSD *_video.c selection

-AM_CONDITIONAL(ALPHA_VIDEO, [test "x$ALPHA_VIDEO" = xyes])

-AM_CONDITIONAL(ARM_VIDEO, [test "x$ARM_VIDEO" = xyes])

-AM_CONDITIONAL(I386_VIDEO, [test "x$I386_VIDEO" = xyes])

-AM_CONDITIONAL(PPC_VIDEO, [test "x$PPC_VIDEO" = xyes])

-AM_CONDITIONAL(SPARC64_VIDEO, [test "x$SPARC64_VIDEO" = xyes])

-

-DRI=no

-USE_SIGIO_BY_DEFAULT="yes"

-dnl it would be nice to autodetect these *CONS_SUPPORTs

-case $host_os in

-  *freebsd* | *dragonfly*)

-	case $host_os in

-		kfreebsd*-gnu) ;;

-		*) AC_DEFINE(CSRG_BASED, 1, [System is BSD-like]) ;;

-	esac

-	AC_DEFINE(PCCONS_SUPPORT, 1, [System has PC console])

-	AC_DEFINE(PCVT_SUPPORT, 1, [System has PCVT console])

-	AC_DEFINE(SYSCONS_SUPPORT, 1, [System has syscons console])

-	DRI=yes

-	;;

-  *netbsd*)

-	AC_DEFINE(CSRG_BASED, 1, [System is BSD-like])

-	AC_DEFINE(PCCONS_SUPPORT, 1, [System has PC console])

-	AC_DEFINE(PCVT_SUPPORT, 1, [System has PCVT console])

-	AC_DEFINE(WSCONS_SUPPORT, 1, [System has wscons console])

-	DRI=yes

-	;;

-  *openbsd*)

-	AC_DEFINE(CSRG_BASED, 1, [System is BSD-like])

-	AC_DEFINE(PCVT_SUPPORT, 1, [System has PC console])

-	AC_DEFINE(WSCONS_SUPPORT, 1, [System has wscons console])

-	;;

-  *linux*)

-	DRI=yes

-	;;

-  *solaris*)

-	PKG_CHECK_EXISTS(libdrm, DRI=yes, DRI=no)

-	# Disable use of SIGIO by default until some system bugs are

-	# fixed - see Sun/OpenSolaris bug id 6879897

-	USE_SIGIO_BY_DEFAULT="no"

-	;;

-  darwin*)

-	AC_DEFINE(CSRG_BASED, 1, [System is BSD-like])

-	;;

-  cygwin*)

-	CFLAGS="$CFLAGS -DFD_SETSIZE=256"

-	;;

-esac

-

-dnl augment XORG_RELEASE_VERSION for our snapshot number and to expose the

-dnl major number

-PVMAJOR=`echo $PACKAGE_VERSION | cut -d . -f 1`

-PVS=`echo $PACKAGE_VERSION | cut -d . -f 4 | cut -d - -f 1`

-if test "x$PVS" = "x"; then

-	PVS="0"

-fi

-

-VENDOR_RELEASE="((($PVMAJOR) * 10000000) + (($PVM) * 100000) + (($PVP) * 1000) + $PVS)"

-VENDOR_MAN_VERSION="Version ${PACKAGE_VERSION}"

-

-VENDOR_NAME="The X.Org Foundation"

-VENDOR_NAME_SHORT="X.Org"

-VENDOR_WEB="http://wiki.x.org"

-

-m4_ifdef([AS_HELP_STRING], , [m4_define([AS_HELP_STRING], m4_defn([AC_HELP_STRING]))])

-

-dnl Build options.

-AC_ARG_ENABLE(werror,        AS_HELP_STRING([--enable-werror],

-		  [Obsolete - use --enable-strict-compilation instead]),

-  AC_MSG_ERROR([--enable-werror has been replaced by --enable-strict-compilation]))

-

-AC_ARG_ENABLE(debug,         AS_HELP_STRING([--enable-debug],

-				  [Enable debugging (default: disabled)]),

-			        [DEBUGGING=$enableval], [DEBUGGING=no])

-AC_ARG_ENABLE(unit-tests,    AS_HELP_STRING([--enable-unit-tests],

-                                  [Enable unit-tests (default: auto)]),

-                                [UNITTESTS=$enableval], [UNITTESTS=auto])

-AC_ARG_ENABLE(use-sigio-by-default, AS_HELP_STRING([--enable-use-sigio-by-default]

-  [Enable SIGIO input handlers by default (default: $USE_SIGIO_BY_DEFAULT)]),

-                                [USE_SIGIO_BY_DEFAULT=$enableval], [])

-AC_ARG_WITH(int10,           AS_HELP_STRING([--with-int10=BACKEND], [int10 backend: vm86, x86emu or stub]),

-				[INT10="$withval"],

-				[INT10="$DEFAULT_INT10"])

-AC_ARG_WITH(vendor-name,     AS_HELP_STRING([--with-vendor-name=VENDOR],

-				  [Vendor string reported by the server]),

-				[ VENDOR_NAME="$withval" ], [])

-AC_ARG_WITH(vendor-name-short, AS_HELP_STRING([--with-vendor-name-short=VENDOR],

-				  [Short version of vendor string reported by the server]),

-				[ VENDOR_NAME_SHORT="$withval" ], [])

-AC_ARG_WITH(vendor-web,      AS_HELP_STRING([--with-vendor-web=URL],

-				  [Vendor web address reported by the server]),

-				[ VENDOR_WEB="$withval" ], [])

-AC_ARG_WITH(module-dir,      AS_HELP_STRING([--with-module-dir=DIR],

-				  [Directory where modules are installed (default: $libdir/xorg/modules)]),

-				[ moduledir="$withval" ],

-				[ moduledir="${libdir}/xorg/modules" ])

-AC_ARG_WITH(log-dir,         AS_HELP_STRING([--with-log-dir=DIR],

-				  [Directory where log files are kept (default: $localstatedir/log)]),

-				[ logdir="$withval" ],

-				[ logdir="$localstatedir/log" ])

-AC_ARG_WITH(builder-addr,    AS_HELP_STRING([--with-builder-addr=ADDRESS],

-				  [Builder address (default: xorg@lists.freedesktop.org)]),

-				[ BUILDERADDR="$withval" ],

-				[ BUILDERADDR="xorg@lists.freedesktop.org" ])

-AC_ARG_WITH(os-name,         AS_HELP_STRING([--with-os-name=OSNAME], [Name of OS (default: output of "uname -srm")]),

-				[ OSNAME="$withval" ],

-				[ OSNAME=`uname -srm` ])

-AC_ARG_WITH(os-vendor,       AS_HELP_STRING([--with-os-vendor=OSVENDOR], [Name of OS vendor]),

-				[ OSVENDOR="$withval" ],

-				[ OSVENDOR="" ])

-AC_ARG_WITH(builderstring,   AS_HELP_STRING([--with-builderstring=BUILDERSTRING], [Additional builder string]),

-				[ BUILDERSTRING="$withval" ]

-				[ ])

-

-dnl Determine font path

-XORG_FONTROOTDIR

-XORG_FONTSUBDIR(FONTMISCDIR, fontmiscdir, misc)

-XORG_FONTSUBDIR(FONTOTFDIR, fontotfdir, OTF)

-XORG_FONTSUBDIR(FONTTTFDIR, fontttfdir, TTF)

-XORG_FONTSUBDIR(FONTTYPE1DIR, fonttype1dir, Type1)

-XORG_FONTSUBDIR(FONT75DPIDIR, font75dpidir, 75dpi)

-XORG_FONTSUBDIR(FONT100DPIDIR, font100dpidir, 100dpi)

-

-dnl Uses --default-font-path if set, otherwise checks for /etc/X11/fontpath.d,

-dnl otherwise uses standard subdirectories of FONTROOTDIR. When cross

-dnl compiling, assume default font path uses standard FONTROOTDIR directories.

-DEFAULT_FONT_PATH="${FONTMISCDIR}/,${FONTTTFDIR}/,${FONTOTFDIR}/,${FONTTYPE1DIR}/,${FONT100DPIDIR}/,${FONT75DPIDIR}/"

-if test "$cross_compiling" != yes; then

-	AC_CHECK_FILE([${sysconfdir}/X11/fontpath.d],

-		[DEFAULT_FONT_PATH='catalogue:${sysconfdir}/X11/fontpath.d'],

-		[case $host_os in

-			darwin*) DEFAULT_FONT_PATH="${DEFAULT_FONT_PATH},/Library/Fonts,/System/Library/Fonts" ;;

-		esac])

-fi

-AC_ARG_WITH(default-font-path, AS_HELP_STRING([--with-default-font-path=PATH], [Comma separated list of font dirs]),

-				[ FONTPATH="$withval" ],

-				[ FONTPATH="${DEFAULT_FONT_PATH}" ])

-

-AC_MSG_CHECKING([for default font path])

-AC_MSG_RESULT([$FONTPATH])

-

-AC_ARG_WITH(xkb-path,         AS_HELP_STRING([--with-xkb-path=PATH], [Path to XKB base dir (default: ${datadir}/X11/xkb)]),

-				[ XKBPATH="$withval" ],

-				[ XKBPATH="${datadir}/X11/xkb" ])

-AC_ARG_WITH(xkb-output,       AS_HELP_STRING([--with-xkb-output=PATH], [Path to XKB output dir (default: ${datadir}/X11/xkb/compiled)]),

-				[ XKBOUTPUT="$withval" ],

-				[ XKBOUTPUT="compiled" ])

-AC_ARG_WITH(default-xkb-rules, AS_HELP_STRING([--with-default-xkb-rules=RULES],

-                                   [Keyboard ruleset (default: base/evdev)]),

-                                [ XKB_DFLT_RULES="$withval" ],

-                                [ XKB_DFLT_RULES="" ])

-AC_ARG_WITH(default-xkb-model, AS_HELP_STRING([--with-default-xkb-model=MODEL],

-                                   [Keyboard model (default: pc105)]),

-                                [ XKB_DFLT_MODEL="$withval" ],

-                                [ XKB_DFLT_MODEL="pc105" ])

-AC_ARG_WITH(default-xkb-layout, AS_HELP_STRING([--with-default-xkb-layout=LAYOUT],

-                                   [Keyboard layout (default: us)]),

-                                [ XKB_DFLT_LAYOUT="$withval" ],

-                                [ XKB_DFLT_LAYOUT="us" ])

-AC_ARG_WITH(default-xkb-variant, AS_HELP_STRING([--with-default-xkb-variant=VARIANT],

-                                   [Keyboard variant (default: (none))]),

-                                [ XKB_DFLT_VARIANT="$withval" ],

-                                [ XKB_DFLT_VARIANT="" ])

-AC_ARG_WITH(default-xkb-options, AS_HELP_STRING([--with-default-xkb-options=OPTIONS],

-                                   [Keyboard layout options (default: (none))]),

-                                [ XKB_DFLT_OPTIONS="$withval" ],

-                                [ XKB_DFLT_OPTIONS="" ])

-AC_ARG_WITH(serverconfig-path, AS_HELP_STRING([--with-serverconfig-path=PATH],

-				   [Directory where ancillary server config files are installed (default: ${libdir}/xorg)]),

-				[ SERVERCONFIG="$withval" ],

-				[ SERVERCONFIG="${libdir}/xorg" ])

-AC_ARG_WITH(apple-applications-dir,AS_HELP_STRING([--with-apple-applications-dir=PATH], [Path to the Applications directory (default: /Applications/Utilities)]),

-				[ APPLE_APPLICATIONS_DIR="${withval}" ],

-				[ APPLE_APPLICATIONS_DIR="/Applications/Utilities" ])

-AC_SUBST([APPLE_APPLICATIONS_DIR])

-AC_ARG_WITH(apple-application-name,AS_HELP_STRING([--with-apple-application-name=NAME], [Name for the .app (default: X11)]),

-				[ APPLE_APPLICATION_NAME="${withval}" ],

-				[ APPLE_APPLICATION_NAME="X11" ])

-AC_SUBST([APPLE_APPLICATION_NAME])

-AC_ARG_WITH(launchd-id-prefix,  AS_HELP_STRING([--with-launchd-id-prefix=PATH], [Prefix to use for launchd identifiers (default: org.x)]),

-                                [ LAUNCHD_ID_PREFIX="${withval}" ],

-                                [ LAUNCHD_ID_PREFIX="org.x" ])

-AC_SUBST([LAUNCHD_ID_PREFIX])

-AC_DEFINE_UNQUOTED(LAUNCHD_ID_PREFIX, "$LAUNCHD_ID_PREFIX", [Prefix to use for launchd identifiers])

-AC_ARG_ENABLE(sparkle,AS_HELP_STRING([--enable-sparkle], [Enable updating of X11.app using the Sparkle Framework (default: disabled)]),

-				[ XQUARTZ_SPARKLE="${enableval}" ],

-				[ XQUARTZ_SPARKLE="no" ])

-AC_SUBST([XQUARTZ_SPARKLE])

-AC_ARG_ENABLE(builddocs,      AS_HELP_STRING([--enable-builddocs], [Build docs (default: disabled)]),

-                                [BUILDDOCS=$enableval],

-                                [BUILDDOCS=no])

-AC_ARG_ENABLE(install-libxf86config,

-				AS_HELP_STRING([--enable-install-libxf86config],

-				[Install libxf86config (default: disabled)]),

-				[INSTALL_LIBXF86CONFIG=$enableval],

-				[INSTALL_LIBXF86CONFIG=no])

-AC_ARG_ENABLE(visibility,     AC_HELP_STRING([--enable-visibility], [Enable symbol visibility (default: auto)]),

-				[SYMBOL_VISIBILITY=$enableval],

-				[SYMBOL_VISIBILITY=auto])

-AC_ARG_ENABLE(pc98,     	AC_HELP_STRING([--enable-pc98], [Enable PC98 support in Xorg (default: auto)]),

-				[SUPPORT_PC98=$enableval],

-				[SUPPORT_PC98=auto])

-

-dnl GLX build options

-AC_ARG_ENABLE(aiglx,          AS_HELP_STRING([--enable-aiglx], [Build accelerated indirect GLX (default: enabled)]),

-                                [AIGLX=$enableval],

-                                [AIGLX=yes])

-AC_ARG_ENABLE(glx-tls,        AS_HELP_STRING([--enable-glx-tls], [Build GLX with TLS support (default: disabled)]),

-                                [GLX_USE_TLS=$enableval],

-                                [GLX_USE_TLS=no])

-

-dnl Extensions.

-AC_ARG_ENABLE(registry,       AS_HELP_STRING([--disable-registry], [Build string registry module (default: enabled)]), [XREGISTRY=$enableval], [XREGISTRY=yes])

-AC_ARG_ENABLE(composite,      AS_HELP_STRING([--disable-composite], [Build Composite extension (default: enabled)]), [COMPOSITE=$enableval], [COMPOSITE=yes])

-AC_ARG_ENABLE(mitshm,         AS_HELP_STRING([--disable-shm], [Build SHM extension (default: enabled)]), [MITSHM=$enableval], [MITSHM=yes])

-AC_ARG_ENABLE(xres,           AS_HELP_STRING([--disable-xres], [Build XRes extension (default: enabled)]), [RES=$enableval], [RES=yes])

-AC_ARG_ENABLE(record,         AS_HELP_STRING([--disable-record], [Build Record extension (default: enabled)]), [RECORD=$enableval], [RECORD=yes])

-AC_ARG_ENABLE(xv,             AS_HELP_STRING([--disable-xv], [Build Xv extension (default: enabled)]), [XV=$enableval], [XV=yes])

-AC_ARG_ENABLE(xvmc,           AS_HELP_STRING([--disable-xvmc], [Build XvMC extension (default: enabled)]), [XVMC=$enableval], [XVMC=yes])

-AC_ARG_ENABLE(dga,            AS_HELP_STRING([--disable-dga], [Build DGA extension (default: auto)]), [DGA=$enableval], [DGA=auto])

-AC_ARG_ENABLE(screensaver,    AS_HELP_STRING([--disable-screensaver], [Build ScreenSaver extension (default: enabled)]), [SCREENSAVER=$enableval], [SCREENSAVER=yes])

-AC_ARG_ENABLE(xdmcp,          AS_HELP_STRING([--disable-xdmcp], [Build XDMCP extension (default: auto)]), [XDMCP=$enableval], [XDMCP=auto])

-AC_ARG_ENABLE(xdm-auth-1,     AS_HELP_STRING([--disable-xdm-auth-1], [Build XDM-Auth-1 extension (default: auto)]), [XDMAUTH=$enableval], [XDMAUTH=auto])

-AC_ARG_ENABLE(glx,            AS_HELP_STRING([--disable-glx], [Build GLX extension (default: enabled)]), [GLX=$enableval], [GLX=yes])

-AC_ARG_ENABLE(dri,            AS_HELP_STRING([--enable-dri], [Build DRI extension (default: auto)]), [DRI=$enableval])

-AC_ARG_ENABLE(dri2,           AS_HELP_STRING([--enable-dri2], [Build DRI2 extension (default: auto)]), [DRI2=$enableval], [DRI2=auto])

-AC_ARG_ENABLE(xinerama,	      AS_HELP_STRING([--disable-xinerama], [Build Xinerama extension (default: enabled)]), [XINERAMA=$enableval], [XINERAMA=yes])

-AC_ARG_ENABLE(xf86vidmode,    AS_HELP_STRING([--disable-xf86vidmode], [Build XF86VidMode extension (default: auto)]), [XF86VIDMODE=$enableval], [XF86VIDMODE=auto])

-AC_ARG_ENABLE(xace,           AS_HELP_STRING([--disable-xace], [Build X-ACE extension (default: enabled)]), [XACE=$enableval], [XACE=yes])

-AC_ARG_ENABLE(xselinux,       AS_HELP_STRING([--enable-xselinux], [Build SELinux extension (default: disabled)]), [XSELINUX=$enableval], [XSELINUX=no])

-AC_ARG_ENABLE(xcsecurity,     AS_HELP_STRING([--enable-xcsecurity], [Build Security extension (default: disabled)]), [XCSECURITY=$enableval], [XCSECURITY=no])

-AC_ARG_ENABLE(xcalibrate,     AS_HELP_STRING([--enable-xcalibrate], [Build XCalibrate extension (default: disabled)]), [XCALIBRATE=$enableval], [XCALIBRATE=no])

-AC_ARG_ENABLE(tslib,          AS_HELP_STRING([--enable-tslib], [Build kdrive tslib touchscreen support (default: disabled)]), [TSLIB=$enableval], [TSLIB=no])

-AC_ARG_ENABLE(dbe,            AS_HELP_STRING([--disable-dbe], [Build DBE extension (default: enabled)]), [DBE=$enableval], [DBE=yes])

-AC_ARG_ENABLE(xf86bigfont,    AS_HELP_STRING([--enable-xf86bigfont], [Build XF86 Big Font extension (default: disabled)]), [XF86BIGFONT=$enableval], [XF86BIGFONT=no])

-AC_ARG_ENABLE(dpms,           AS_HELP_STRING([--disable-dpms], [Build DPMS extension (default: enabled)]), [DPMSExtension=$enableval], [DPMSExtension=yes])

-AC_ARG_ENABLE(config-udev,    AS_HELP_STRING([--enable-config-udev], [Build udev support (default: auto)]), [CONFIG_UDEV=$enableval], [CONFIG_UDEV=auto])

-AC_ARG_ENABLE(config-dbus,    AS_HELP_STRING([--enable-config-dbus], [Build D-BUS API support (default: no)]), [CONFIG_DBUS_API=$enableval], [CONFIG_DBUS_API=no])

-AC_ARG_ENABLE(config-hal,     AS_HELP_STRING([--disable-config-hal], [Build HAL support (default: auto)]), [CONFIG_HAL=$enableval], [CONFIG_HAL=auto])

-AC_ARG_ENABLE(xfree86-utils,     AS_HELP_STRING([--enable-xfree86-utils], [Build xfree86 DDX utilities (default: enabled)]), [XF86UTILS=$enableval], [XF86UTILS=yes])

-AC_ARG_ENABLE(xaa,               AS_HELP_STRING([--enable-xaa], [Build XAA (default: enabled)]), [XAA=$enableval], [XAA=yes])

-AC_ARG_ENABLE(vgahw,          AS_HELP_STRING([--enable-vgahw], [Build Xorg with vga access (default: enabled)]), [VGAHW=$enableval], [VGAHW=yes])

-AC_ARG_ENABLE(vbe,            AS_HELP_STRING([--enable-vbe], [Build Xorg with VBE module (default: enabled)]), [VBE=$enableval], [VBE=yes])

-AC_ARG_ENABLE(int10-module,     AS_HELP_STRING([--enable-int10-module], [Build Xorg with int10 module (default: enabled)]), [INT10MODULE=$enableval], [INT10MODULE=yes])

-AC_ARG_ENABLE(windowswm,      AS_HELP_STRING([--enable-windowswm], [Build XWin with WindowsWM extension (default: no)]), [WINDOWSWM=$enableval], [WINDOWSWM=no])

-AC_ARG_ENABLE(libdrm,         AS_HELP_STRING([--enable-libdrm], [Build Xorg with libdrm support (default: enabled)]), [DRM=$enableval],[DRM=yes])

-

-dnl DDXes.

-AC_ARG_ENABLE(xorg,    	      AS_HELP_STRING([--enable-xorg], [Build Xorg server (default: auto)]), [XORG=$enableval], [XORG=auto])

-AC_ARG_ENABLE(dmx,    	      AS_HELP_STRING([--enable-dmx], [Build DMX server (default: auto)]), [DMX=$enableval], [DMX=auto])

-AC_ARG_ENABLE(xvfb,    	      AS_HELP_STRING([--enable-xvfb], [Build Xvfb server (default: yes)]), [XVFB=$enableval], [XVFB=yes])

-AC_ARG_ENABLE(xnest,   	      AS_HELP_STRING([--enable-xnest], [Build Xnest server (default: auto)]), [XNEST=$enableval], [XNEST=auto])

-AC_ARG_ENABLE(xquartz,        AS_HELP_STRING([--enable-xquartz], [Build Xquartz server for OS-X (default: auto)]), [XQUARTZ=$enableval], [XQUARTZ=auto])

-AC_ARG_ENABLE(standalone-xpbproxy, AS_HELP_STRING([--enable-standalone-xpbproxy], [Build a standalone xpbproxy (in addition to the one integrated into Xquartz as a separate thread) (default: no)]), [STANDALONE_XPBPROXY=$enableval], [STANDALONE_XPBPROXY=no])

-AC_ARG_ENABLE(xwin,    	      AS_HELP_STRING([--enable-xwin], [Build XWin server (default: auto)]), [XWIN=$enableval], [XWIN=auto])

-dnl kdrive and its subsystems

-AC_ARG_ENABLE(kdrive,         AS_HELP_STRING([--enable-kdrive], [Build kdrive servers (default: no)]), [KDRIVE=$enableval], [KDRIVE=no])

-AC_ARG_ENABLE(xephyr,         AS_HELP_STRING([--enable-xephyr], [Build the kdrive Xephyr server (default: auto)]), [XEPHYR=$enableval], [XEPHYR=auto])

-AC_ARG_ENABLE(xfake,          AS_HELP_STRING([--enable-xfake], [Build the kdrive 'fake' server (default: auto)]), [XFAKE=$enableval], [XFAKE=auto])

-AC_ARG_ENABLE(xfbdev,         AS_HELP_STRING([--enable-xfbdev], [Build the kdrive framebuffer device server (default: auto)]), [XFBDEV=$enableval], [XFBDEV=auto])

-dnl kdrive options

-AC_ARG_ENABLE(kdrive-kbd,     AS_HELP_STRING([--enable-kdrive-kbd], [Build kbd driver for kdrive (default: auto)]), [KDRIVE_KBD=$enableval], [KDRIVE_KBD=auto])

-AC_ARG_ENABLE(kdrive-mouse,   AC_HELP_STRING([--enable-kdrive-mouse], [Build mouse driver for kdrive (default: auto)]), [KDRIVE_MOUSE=$enableval], [KDRIVE_MOUSE=auto])

-AC_ARG_ENABLE(kdrive-evdev,   AC_HELP_STRING([--enable-kdrive-evdev], [Build evdev driver for kdrive (default: auto)]), [KDRIVE_EVDEV=$enableval], [KDRIVE_EVDEV=auto])

-

-

-dnl chown/chmod to be setuid root as part of build

-dnl Replaces InstallXserverSetUID in imake

-AC_ARG_ENABLE(install-setuid, 

-    AS_HELP_STRING([--enable-install-setuid],

-       [Install Xorg server as owned by root with setuid bit (default: auto)]),

-    [SETUID=$enableval], [SETUID=auto])

-AC_MSG_CHECKING([to see if we can install the Xorg server as root])

-if test "x$SETUID" = "xauto" ; then

-	case $host_os in

-	    cygwin*)		SETUID="no"  ;;

-	    darwin*)		SETUID="no"  ;;

-	    *)

-	   	case $host_cpu in

-		    sparc)	SETUID="no"  ;;

-		    *)		SETUID="yes" ;;

-		esac

-	esac

-	if test "x$SETUID" = xyes; then

-		touch testfile

-		chown root testfile > /dev/null 2>&1 || SETUID="no"

-		rm -f testfile

-	fi

-fi

-AC_MSG_RESULT([$SETUID])

-AM_CONDITIONAL(INSTALL_SETUID, [test "x$SETUID" = "xyes"])

-

-dnl Issue an error if xtrans.m4 was not found and XTRANS_CONNECTION_FLAGS macro

-dnl was not expanded, since xorg-server with no transport types is rather useless.

-dnl

-dnl If you're seeing an error here, be sure you installed the lib/xtrans module

-dnl first and if it's not in the default location, that you set the ACLOCAL

-dnl environment variable to find it, such as:

-dnl	ACLOCAL="aclocal -I ${PREFIX}/share/aclocal"

-m4_pattern_forbid([^XTRANS_CONNECTION_FLAGS$])

-

-# Transport selection macro from xtrans.m4

-XTRANS_CONNECTION_FLAGS

-

-# Secure RPC detection macro from xtrans.m4

-XTRANS_SECURE_RPC_FLAGS

-AM_CONDITIONAL(SECURE_RPC, [test "x$SECURE_RPC" = xyes])

-

-AM_CONDITIONAL(INT10_VM86, [test "x$INT10" = xvm86])

-AM_CONDITIONAL(INT10_X86EMU, [test "x$INT10" = xx86emu])

-AM_CONDITIONAL(INT10_STUB, [test "x$INT10" = xstub])

-if test "x$INT10" = xyes; then

-	dnl VM86 headers

-	AC_CHECK_HEADERS([sys/vm86.h sys/io.h])

-fi

-

-dnl Handle building documentation

-AM_CONDITIONAL(BUILDDOCS, test "x$BUILDDOCS" = xyes)

-XORG_ENABLE_DOCS

-XORG_ENABLE_DEVEL_DOCS

-XORG_WITH_XMLTO(0.0.20)

-XORG_WITH_FOP

-

-dnl Handle installing libxf86config

-AM_CONDITIONAL(INSTALL_LIBXF86CONFIG, [test "x$INSTALL_LIBXF86CONFIG" = xyes])

-

-dnl DDX Detection... Yes, it's ugly to have it here... but we need to

-dnl handle this early on so that we don't require unsupported extensions

-case $host_os in

-	cygwin*)

-		DGA=no

-		DRI2=no

-		XF86VIDMODE=no

-		XSELINUX=no

-		XV=no

-		;;

-	darwin*)

-		DRI2=no

-

-		if test x$XQUARTZ = xauto; then

-			AC_CACHE_CHECK([whether to build Xquartz],xorg_cv_Carbon_framework,[

-		 		save_LDFLAGS=$LDFLAGS

-				LDFLAGS="$LDFLAGS -framework Carbon"

-				AC_LINK_IFELSE([char FSFindFolder(); int main() { FSFindFolder(); return 0;}],

-				[xorg_cv_Carbon_framework=yes],

-				[xorg_cv_Carbon_framework=no])

-			LDFLAGS=$save_LDFLAGS])

-                

-			if test "X$xorg_cv_Carbon_framework" = Xyes; then

-				XQUARTZ=yes

-			else

-				XQUARTZ=no

-			fi

-		fi

-

-		if test "x$XQUARTZ" = xyes ; then

-			XQUARTZ=yes

-			XVFB=no

-			XNEST=no

-

-			COMPOSITE=no

-			DGA=no

-			DPMSExtension=no

-			XF86VIDMODE=no

-		fi

-		;;

-	*) XQUARTZ=no ;;

-esac

-

-dnl ---------------------------------------------------------------------------

-dnl Extension section

-dnl ---------------------------------------------------------------------------

-XEXT_INC='-I$(top_srcdir)/Xext'

-XEXT_LIB='$(top_builddir)/Xext/libXext.la'

-XEXTXORG_LIB='$(top_builddir)/Xext/libXextbuiltin.la'

-

-dnl Optional modules

-VIDEOPROTO="videoproto"

-COMPOSITEPROTO="compositeproto >= 0.4"

-RECORDPROTO="recordproto >= 1.13.99.1"

-SCRNSAVERPROTO="scrnsaverproto >= 1.1"

-RESOURCEPROTO="resourceproto"

-DRIPROTO="xf86driproto >= 2.1.0"

-DRI2PROTO="dri2proto >= 2.3"

-XINERAMAPROTO="xineramaproto"

-BIGFONTPROTO="xf86bigfontproto >= 1.2.0"

-XCALIBRATEPROTO="xcalibrateproto"

-DGAPROTO="xf86dgaproto >= 2.0.99.1"

-GLPROTO="glproto >= 1.4.10"

-DMXPROTO="dmxproto >= 2.2.99.1"

-VIDMODEPROTO="xf86vidmodeproto >= 2.2.99.1"

-WINDOWSWMPROTO="windowswmproto"

-APPLEWMPROTO="applewmproto >= 1.4"

-

-dnl Core modules for most extensions, et al.

-SDK_REQUIRED_MODULES="[xproto >= 7.0.17] [randrproto >= 1.4] [renderproto >= 0.11] [xextproto >= 7.1.99] [inputproto >= 1.9.99.902] [kbproto >= 1.0.3] fontsproto"

-# Make SDK_REQUIRED_MODULES available for inclusion in xorg-server.pc

-AC_SUBST(SDK_REQUIRED_MODULES)

-

-dnl List of libraries that require a specific version

-LIBAPPLEWM="applewm >= 1.4"

-LIBDMX="dmx >= 1.0.99.1"

-LIBDRI="dri >= 7.8.0"

-LIBDRM="libdrm >= 2.3.0"

-LIBGL="gl >= 7.1.0"

-LIBXEXT="xext >= 1.0.99.4"

-LIBXFONT="xfont >= 1.4.2"

-LIBXI="xi >= 1.2.99.1"

-LIBXTST="xtst >= 1.0.99.2"

-LIBPCIACCESS="pciaccess >= 0.8.0"

-LIBGLIB="glib-2.0 >= 2.16"

-LIBUDEV="libudev >= 143"

-LIBSELINUX="libselinux >= 2.0.86"

-LIBDBUS="dbus-1 >= 1.0"

-LIBPIXMAN="pixman-1 >= 0.15.20"

-

-dnl Pixman is always required, but we separate it out so we can link

-dnl specific modules against it

-PKG_CHECK_MODULES(PIXMAN, $LIBPIXMAN)

-REQUIRED_LIBS="$REQUIRED_LIBS $LIBPIXMAN $LIBXFONT xau"

-

-REQUIRED_MODULES="[fixesproto >= 4.1] [damageproto >= 1.1] [xcmiscproto >= 1.2.0] [xtrans >= 1.2.2] [bigreqsproto >= 1.1.0] $SDK_REQUIRED_MODULES"

-

-if test "x$CONFIG_UDEV" = xyes &&

- { test "x$CONFIG_DBUS_API" = xyes || test "x$CONFIG_HAL" = xyes; }; then

-	AC_MSG_ERROR([Hotplugging through both libudev and dbus/hal not allowed])

-fi

-

-PKG_CHECK_MODULES(UDEV, $LIBUDEV, [HAVE_LIBUDEV=yes], [HAVE_LIBUDEV=no])

-if test "x$CONFIG_UDEV" = xauto; then

-	CONFIG_UDEV="$HAVE_LIBUDEV"

-fi

-AM_CONDITIONAL(CONFIG_UDEV, [test "x$CONFIG_UDEV" = xyes])

-if test "x$CONFIG_UDEV" = xyes; then

-	CONFIG_DBUS_API=no

-	CONFIG_HAL=no

-	if ! test "x$HAVE_LIBUDEV" = xyes; then

-		AC_MSG_ERROR([udev configuration API requested, but libudev is not installed])

-	fi

-	AC_DEFINE(CONFIG_UDEV, 1, [Use libudev for input hotplug])

-fi

-

-dnl HAVE_DBUS is true if we actually have the D-Bus library, whereas

-dnl CONFIG_DBUS_API is true if we want to enable the D-Bus config

-dnl API.

-PKG_CHECK_MODULES(DBUS, $LIBDBUS, [HAVE_DBUS=yes], [HAVE_DBUS=no])

-if test "x$HAVE_DBUS" = xyes; then

-	AC_DEFINE(HAVE_DBUS, 1, [Have D-Bus support])

-fi

-AM_CONDITIONAL(HAVE_DBUS, [test "x$HAVE_DBUS" = xyes])

-

-if test "x$CONFIG_DBUS_API" = xauto; then

-	CONFIG_DBUS_API="$HAVE_DBUS"

-fi

-if test "x$CONFIG_DBUS_API" = xyes; then

-	if ! test "x$HAVE_DBUS" = xyes; then

-		AC_MSG_ERROR([D-Bus configuration API requested, but D-Bus is not installed.])

-	fi

-

-	AC_DEFINE(CONFIG_DBUS_API, 1, [Use the D-Bus input configuration API])

-	CONFIG_NEED_DBUS="yes"

-fi

-AM_CONDITIONAL(CONFIG_DBUS_API, [test "x$CONFIG_DBUS_API" = xyes])

-

-PKG_CHECK_MODULES(HAL, hal, [HAVE_HAL=yes], [HAVE_HAL=no])

-if test "x$CONFIG_HAL" = xauto; then

-	CONFIG_HAL="$HAVE_HAL"

-fi

-if test "x$CONFIG_HAL" = xyes; then

-	if ! test "x$HAVE_HAL" = xyes; then

-		AC_MSG_ERROR([HAL hotplug API requested, but HAL is not installed.])

-	fi

-

-	AC_DEFINE(CONFIG_HAL, 1, [Use the HAL hotplug API])

-	CONFIG_NEED_DBUS="yes"

-fi

-AM_CONDITIONAL(CONFIG_HAL, [test "x$CONFIG_HAL" = xyes])

-

-if test "x$CONFIG_NEED_DBUS" = xyes; then

-        AC_DEFINE(CONFIG_NEED_DBUS, 1, [Use D-Bus for input hotplug])

-fi

-AM_CONDITIONAL(CONFIG_NEED_DBUS, [test "x$CONFIG_NEED_DBUS" = xyes])

-

-if test "x$USE_SIGIO_BY_DEFAULT" = xyes; then

-	USE_SIGIO_BY_DEFAULT_VALUE=TRUE

-else

-	USE_SIGIO_BY_DEFAULT_VALUE=FALSE

-fi

-AC_DEFINE_UNQUOTED([USE_SIGIO_BY_DEFAULT], [$USE_SIGIO_BY_DEFAULT_VALUE],

-		   [Use SIGIO handlers for input device events by default])

-

-AC_MSG_CHECKING([for glibc...])

-AC_PREPROC_IFELSE([

-#include <features.h>

-#ifndef __GLIBC__

-#error

-#endif

-], glibc=yes, glibc=no)

-AC_MSG_RESULT([$glibc])

-

-AC_CHECK_FUNCS([clock_gettime], [have_clock_gettime=yes],

-               [AC_CHECK_LIB([rt], [clock_gettime], [have_clock_gettime=-lrt],

-                             [have_clock_gettime=no])])

-

-AC_MSG_CHECKING([for a useful monotonic clock ...])

-

-if ! test "x$have_clock_gettime" = xno; then

-    if ! test "x$have_clock_gettime" = xyes; then

-        CLOCK_LIBS="$have_clock_gettime"

-    else

-        CLOCK_LIBS=""

-    fi

-

-    LIBS_SAVE="$LIBS"

-    LIBS="$CLOCK_LIBS"

-    CPPFLAGS_SAVE="$CPPFLAGS"

-

-    if test x"$glibc" = xyes; then

-        CPPFLAGS="$CPPFLAGS -D_POSIX_C_SOURCE=200112L"

-    fi

-

-    AC_RUN_IFELSE([

-#include <time.h>

-

-int main(int argc, char *argv[[]]) {

-    struct timespec tp;

-

-    if (clock_gettime(CLOCK_MONOTONIC, &tp) == 0)

-        return 0;

-    else

-        return 1;

-}

-    ], [MONOTONIC_CLOCK=yes], [MONOTONIC_CLOCK=no],

-       [MONOTONIC_CLOCK="cross compiling"])

-

-    LIBS="$LIBS_SAVE"

-    CPPFLAGS="$CPPFLAGS_SAVE"

-else

-    MONOTONIC_CLOCK=no

-fi

-

-AC_MSG_RESULT([$MONOTONIC_CLOCK])

-

-if test "x$MONOTONIC_CLOCK" = xyes; then

-    AC_DEFINE(MONOTONIC_CLOCK, 1, [Have monotonic clock from clock_gettime()])

-    LIBS="$LIBS $CLOCK_LIBS"

-fi

-

-AM_CONDITIONAL(XV, [test "x$XV" = xyes])

-if test "x$XV" = xyes; then

-	AC_DEFINE(XV, 1, [Support Xv extension])

-	AC_DEFINE(XvExtension, 1, [Build Xv extension])

-	REQUIRED_MODULES="$REQUIRED_MODULES $VIDEOPROTO"

-	SDK_REQUIRED_MODULES="$SDK_REQUIRED_MODULES $VIDEOPROTO"

-else

-	XVMC=no

-fi

-

-AM_CONDITIONAL(XVMC, [test "x$XVMC" = xyes])

-if test "x$XVMC" = xyes; then

-	AC_DEFINE(XvMCExtension, 1, [Build XvMC extension])

-fi

-

-AM_CONDITIONAL(XREGISTRY, [test "x$XREGISTRY" = xyes])

-if test "x$XREGISTRY" = xyes; then

-	AC_DEFINE(XREGISTRY, 1, [Build registry module])

-fi

-

-AM_CONDITIONAL(COMPOSITE, [test "x$COMPOSITE" = xyes])

-if test "x$COMPOSITE" = xyes; then

-	AC_DEFINE(COMPOSITE, 1, [Support Composite Extension])

-	REQUIRED_MODULES="$REQUIRED_MODULES $COMPOSITEPROTO"

-	COMPOSITE_LIB='$(top_builddir)/composite/libcomposite.la'

-	COMPOSITE_INC='-I$(top_srcdir)/composite'

-fi

-

-AM_CONDITIONAL(MITSHM, [test "x$MITSHM" = xyes])

-if test "x$MITSHM" = xyes; then

-	AC_DEFINE(MITSHM, 1, [Support MIT-SHM extension])

-	AC_DEFINE(HAS_SHM, 1, [Support SHM])

-fi

-

-AM_CONDITIONAL(RECORD, [test "x$RECORD" = xyes])

-if test "x$RECORD" = xyes; then

-	AC_DEFINE(XRECORD, 1, [Support Record extension])

-	REQUIRED_MODULES="$REQUIRED_MODULES $RECORDPROTO"

-	RECORD_LIB='$(top_builddir)/record/librecord.la'

-fi

-

-AM_CONDITIONAL(SCREENSAVER, [test "x$SCREENSAVER" = xyes])

-if test "x$SCREENSAVER" = xyes; then

-	AC_DEFINE(SCREENSAVER, 1, [Support MIT-SCREEN-SAVER extension])

-	REQUIRED_MODULES="$REQUIRED_MODULES $SCRNSAVERPROTO"

-fi

-

-AM_CONDITIONAL(RES, [test "x$RES" = xyes])

-if test "x$RES" = xyes; then

-	AC_DEFINE(RES, 1, [Support X resource extension])

-	REQUIRED_MODULES="$REQUIRED_MODULES $RESOURCEPROTO"

-fi

-

-if test "x$GLX" = xyes; then

-	PKG_CHECK_MODULES([XLIB], [x11])

-	PKG_CHECK_MODULES([GL], $GLPROTO $LIBGL)

-	AC_SUBST(XLIB_CFLAGS)

-	AC_DEFINE(GLXEXT, 1, [Build GLX extension])

-	GLX_LIBS='$(top_builddir)/glx/libglx.la'

-	GLX_SYS_LIBS="$GLX_SYS_LIBS"

-else

-        GLX=no

-fi

-AM_CONDITIONAL(GLX, test "x$GLX" = xyes)

-

-if test "x$AIGLX" = xyes -a "x$GLX" = xyes -a "x$DRI" = xyes; then

-	AC_DEFINE(AIGLX, 1, [Build AIGLX loader])

-else

-	AIGLX=no

-fi

-AM_CONDITIONAL(AIGLX, test "x$AIGLX" = xyes)

-

-if test "x$GLX_USE_TLS" = xyes -a "x$AIGLX" = xyes; then

-	GLX_DEFINES="-DGLX_USE_TLS -DPTHREADS"

-	GLX_SYS_LIBS="$GLX_SYS_LIBS -lpthread"

-fi

-AC_SUBST([GLX_DEFINES])

-

-AM_CONDITIONAL(DRI, test "x$DRI" = xyes)

-if test "x$DRI" = xyes; then

-	AC_DEFINE(XF86DRI, 1, [Build DRI extension])

-	PKG_CHECK_MODULES([DRIPROTO], [$DRIPROTO])

-	PKG_CHECK_MODULES([DRI], $GLPROTO $LIBDRI)

-	AC_SUBST(DRIPROTO_CFLAGS)

-fi

-

-PKG_CHECK_MODULES([DRI2PROTO], $DRI2PROTO,

-                  [HAVE_DRI2PROTO=yes], [HAVE_DRI2PROTO=no])

-case "$DRI2,$HAVE_DRI2PROTO" in

-	yes,no)

-		AC_MSG_ERROR([DRI2 requested, but dri2proto not found.])

-		;;

-	yes,yes | auto,yes)

-		AC_DEFINE(DRI2, 1, [Build DRI2 extension])

-		DRI2=yes

-		SDK_REQUIRED_MODULES="$SDK_REQUIRED_MODULES $DRI2PROTO"

-		;;

-esac

-AM_CONDITIONAL(DRI2, test "x$DRI2" = xyes)

-

-if test "x$DRI" = xyes || test "x$DRI2" = xyes; then

-	if test "x$DRM" = xyes; then

-		AC_DEFINE(WITH_LIBDRM, 1, [Building with libdrm support])

-		PKG_CHECK_MODULES([LIBDRM], $LIBDRM)

-	fi

-fi

-

-if test "x$DRI2" = xyes; then

-	save_CFLAGS=$CFLAGS

-	CFLAGS="$GL_CFLAGS $LIBDRM_CFLAGS"

-	AC_COMPILE_IFELSE([AC_LANG_SOURCE([[#include <GL/gl.h>

-#include <GL/internal/dri_interface.h>

-#ifndef __DRI_DRI2

-#error DRI2 extension not available.

-#endif]])],

-			  [HAVE_DRI2EXTENSION=yes],

-			  [HAVE_DRI2EXTENSION=no])

-	CFLAGS=$save_CFLAGS

-	if test "x$HAVE_DRI2EXTENSION" = xyes; then

-		AC_DEFINE(DRI2_AIGLX, 1, [Build DRI2 AIGLX loader])

-		DRI2_AIGLX=yes

-	else

-		AC_MSG_NOTICE([DRI2 AIGLX disabled, __DRI_DRI2 not defined in dri_interface.h.])

-		DRI2_AIGLX=no

-	fi

-fi

-AM_CONDITIONAL(DRI2_AIGLX, test "x$DRI2_AIGLX" = xyes)

-

-

-AM_CONDITIONAL(XINERAMA, [test "x$XINERAMA" = xyes])

-if test "x$XINERAMA" = xyes; then

-	AC_DEFINE(XINERAMA, 1, [Support Xinerama extension])

-	AC_DEFINE(PANORAMIX, 1, [Internal define for Xinerama])

-	REQUIRED_MODULES="$REQUIRED_MODULES $XINERAMAPROTO"

-	SDK_REQUIRED_MODULES="$SDK_REQUIRED_MODULES $XINERAMAPROTO"

-fi

-

-AM_CONDITIONAL(XACE, [test "x$XACE" = xyes])

-if test "x$XACE" = xyes; then

-	AC_DEFINE(XACE, 1, [Build X-ACE extension])

-fi

-

-AM_CONDITIONAL(XSELINUX, [test "x$XSELINUX" = xyes])

-if test "x$XSELINUX" = xyes; then

-	if test "x$XACE" != xyes; then

-		AC_MSG_ERROR([cannot build SELinux extension without X-ACE])

-	fi

-	AC_CHECK_HEADERS([libaudit.h], [], AC_MSG_ERROR([SELinux extension requires audit system headers]))

-	AC_CHECK_LIB(audit, audit_open, [], AC_MSG_ERROR([SELinux extension requires audit system library]))

-	PKG_CHECK_MODULES([SELINUX], $LIBSELINUX)

-	SELINUX_LIBS="$SELINUX_LIBS -laudit"

-	AC_DEFINE(XSELINUX, 1, [Build SELinux extension])

-fi

-

-AM_CONDITIONAL(XCSECURITY, [test "x$XCSECURITY" = xyes])

-if test "x$XCSECURITY" = xyes; then

-	if test "x$XACE" != xyes; then

-		AC_MSG_ERROR([cannot build Security extension without X-ACE])

-	fi

-	AC_DEFINE(XCSECURITY, 1, [Build Security extension])

-fi

-

-AM_CONDITIONAL(DBE, [test "x$DBE" = xyes])

-if test "x$DBE" = xyes; then

-	AC_DEFINE(DBE, 1, [Support DBE extension])

-	DBE_LIB='$(top_builddir)/dbe/libdbe.la'

-fi

-

-AM_CONDITIONAL(XF86BIGFONT, [test "x$XF86BIGFONT" = xyes])

-if test "x$XF86BIGFONT" = xyes; then

-	AC_DEFINE(XF86BIGFONT, 1, [Support XF86 Big font extension])

-	REQUIRED_MODULES="$REQUIRED_MODULES $BIGFONTPROTO"

-fi

-

-AM_CONDITIONAL(DPMSExtension, [test "x$DPMSExtension" = xyes])

-if test "x$DPMSExtension" = xyes; then

-	AC_DEFINE(DPMSExtension, 1, [Support DPMS extension])

-fi

-

-if test "x$XCALIBRATE" = xyes && test "$KDRIVE" = yes; then

-   AC_DEFINE(XCALIBRATE, 1, [Build XCalibrate extension])

-   REQUIRED_MODULES="$REQUIRED_MODULES $XCALIBRATEPROTO"

-else

-   XCALIBRATE=no

-fi

-AM_CONDITIONAL(XCALIBRATE, [test "x$XCALIBRATE" = xyes])

-

-AC_DEFINE(RENDER, 1, [Support RENDER extension])

-RENDER_LIB='$(top_builddir)/render/librender.la'

-RENDER_INC='-I$(top_srcdir)/render'

-

-AC_DEFINE(RANDR, 1, [Support RANDR extension])

-RANDR_LIB='$(top_builddir)/randr/librandr.la'

-RANDR_INC='-I$(top_srcdir)/randr'

-

-AC_DEFINE(XFIXES,1,[Support XFixes extension])

-FIXES_LIB='$(top_builddir)/xfixes/libxfixes.la'

-FIXES_INC='-I$(top_srcdir)/xfixes'

-

-AC_DEFINE(DAMAGE,1,[Support Damage extension])

-DAMAGE_LIB='$(top_builddir)/damageext/libdamageext.la'

-DAMAGE_INC='-I$(top_srcdir)/damageext'

-MIEXT_DAMAGE_LIB='$(top_builddir)/miext/damage/libdamage.la'

-MIEXT_DAMAGE_INC='-I$(top_srcdir)/miext/damage'

-

-# XINPUT extension is integral part of the server

-AC_DEFINE(XINPUT, 1, [Support X Input extension])

-XI_LIB='$(top_builddir)/Xi/libXi.la'

-XI_INC='-I$(top_srcdir)/Xi'

-

-AM_CONDITIONAL(XF86UTILS, test "x$XF86UTILS" = xyes)

-AM_CONDITIONAL(XAA, test "x$XAA" = xyes)

-AM_CONDITIONAL(VGAHW, test "x$VGAHW" = xyes)

-AM_CONDITIONAL(VBE, test "x$VBE" = xyes)

-AM_CONDITIONAL(INT10MODULE, test "x$INT10MODULE" = xyes)

-

-AC_DEFINE(SHAPE, 1, [Support SHAPE extension])

-

-AC_DEFINE_DIR(XKB_BASE_DIRECTORY, XKBPATH, [Path to XKB data])

-AC_ARG_WITH(xkb-bin-directory,

-				AS_HELP_STRING([--with-xkb-bin-directory=DIR], [Directory containing xkbcomp program]),

-				[XKB_BIN_DIRECTORY="$withval"],

-				[XKB_BIN_DIRECTORY="$bindir"])

-

-AC_DEFINE_DIR(XKB_BIN_DIRECTORY, XKB_BIN_DIRECTORY, [Path to XKB bin dir])

-

-dnl Make sure XKM_OUTPUT_DIR is an absolute path

-XKBOUTPUT_FIRSTCHAR=`echo $XKBOUTPUT | cut -b 1`

-if [[ x$XKBOUTPUT_FIRSTCHAR != x/ -a x$XKBOUTPUT_FIRSTCHAR != 'x$' ]] ; then

-   XKBOUTPUT="$XKB_BASE_DIRECTORY/$XKBOUTPUT"

-fi

-

-dnl XKM_OUTPUT_DIR (used in code) must end in / or file names get hosed

-dnl XKB_COMPILED_DIR (used in Makefiles) must not or install-sh gets confused

-

-XKBOUTPUT=`echo $XKBOUTPUT/ | $SED 's|/*$|/|'`

-XKB_COMPILED_DIR=`echo $XKBOUTPUT | $SED 's|/*$||'`

-AC_DEFINE_DIR(XKM_OUTPUT_DIR, XKBOUTPUT, [Path to XKB output dir])

-AC_SUBST(XKB_COMPILED_DIR)

-

-if test "x$XKB_DFLT_RULES" = x; then

-    case $host_os in

-    linux*)

-        dnl doesn't take AutoAddDevices into account, but whatever.

-        if test "x$CONFIG_HAL" = xyes; then

-            XKB_DFLT_RULES="evdev"

-        else

-            XKB_DFLT_RULES="base"

-        fi

-        ;;

-    *)

-        XKB_DFLT_RULES="base"

-        ;;

-    esac

-fi

-AC_DEFINE_UNQUOTED(XKB_DFLT_RULES, ["$XKB_DFLT_RULES"], [Default XKB ruleset])

-AC_DEFINE_UNQUOTED(XKB_DFLT_MODEL, ["$XKB_DFLT_MODEL"], [Default XKB model])

-AC_DEFINE_UNQUOTED(XKB_DFLT_LAYOUT, ["$XKB_DFLT_LAYOUT"], [Default XKB layout])

-AC_DEFINE_UNQUOTED(XKB_DFLT_VARIANT, ["$XKB_DFLT_VARIANT"], [Default XKB variant])

-AC_DEFINE_UNQUOTED(XKB_DFLT_OPTIONS, ["$XKB_DFLT_OPTIONS"], [Default XKB options])

-

-XKB_LIB='$(top_builddir)/xkb/libxkb.la'

-XKB_STUB_LIB='$(top_builddir)/xkb/libxkbstubs.la'

-REQUIRED_MODULES="$REQUIRED_MODULES xkbfile"

-

-AC_CHECK_FUNC(strcasecmp, [], AC_DEFINE([NEED_STRCASECMP], 1,

-                                        [Do not have 'strcasecmp'.]))

-AC_CHECK_FUNC(strncasecmp, [], AC_DEFINE([NEED_STRNCASECMP], 1,

-                                        [Do not have 'strncasecmp'.]))

-AC_CHECK_FUNC(strcasestr, [], AC_DEFINE([NEED_STRCASESTR], 1,

-                                       [Do not have 'strcasestr'.]))

-

-PKG_CHECK_MODULES([XDMCP], [xdmcp], [have_libxdmcp="yes"], [have_libxdmcp="no"])

-if test "x$have_libxdmcp" = xyes; then

-	AC_CHECK_LIB(Xdmcp, XdmcpWrap, [have_xdmcpwrap="yes"], [have_xdmcpwrap="no"], [$XDMCP_LIBS])

-fi

-if test "x$XDMCP" = xauto; then

-	if test "x$have_libxdmcp" = xyes; then

-		XDMCP=yes

-	else

-		XDMCP=no

-	fi

-fi

-if test "x$XDMAUTH" = xauto; then

-	if test "x$have_libxdmcp" = xyes && test "x$have_xdmcpwrap" = xyes; then

-		XDMAUTH=yes

-	else

-		XDMAUTH=no

-	fi

-fi

-

-AM_CONDITIONAL(XDMCP, [test "x$XDMCP" = xyes])

-if test "x$XDMCP" = xyes; then

-	AC_DEFINE(XDMCP, 1, [Support XDM Control Protocol])

-	REQUIRED_LIBS="$REQUIRED_LIBS xdmcp"

-	XDMCP_MODULES="xdmcp"

-fi

-

-AM_CONDITIONAL(XDMAUTH, [test "x$XDMAUTH" = xyes])

-if test "x$XDMAUTH" = xyes; then

-	AC_DEFINE(HASXDMAUTH,1,[Support XDM-AUTH*-1])

-	if ! test "x$XDMCP" = xyes; then

-		REQUIRED_LIBS="$REQUIRED_LIBS xdmcp"

-		XDMCP_MODULES="xdmcp"

-	fi

-fi

-

-AC_DEFINE_DIR(COMPILEDDEFAULTFONTPATH, FONTPATH, [Default font path])

-AC_DEFINE_DIR(PCI_TXT_IDS_PATH, PCI_TXT_IDS_DIR, [Default PCI text file ID path])

-AC_DEFINE_DIR(SERVER_MISC_CONFIG_PATH, SERVERCONFIG, [Server miscellaneous config path])

-AC_DEFINE_DIR(BASE_FONT_PATH, FONTROOTDIR, [Default base font path])

-dridriverdir=`$PKG_CONFIG --variable=dridriverdir dri`

-AC_DEFINE_DIR(DRI_DRIVER_PATH, dridriverdir, [Default DRI driver path])

-AC_DEFINE_UNQUOTED(XVENDORNAME, ["$VENDOR_NAME"], [Vendor name])

-AC_DEFINE_UNQUOTED(XVENDORNAMESHORT, ["$VENDOR_NAME_SHORT"], [Short vendor name])

-AC_DEFINE_UNQUOTED(XORG_DATE, ["$RELEASE_DATE"], [Vendor release])

-AC_DEFINE_UNQUOTED(XORG_MAN_VERSION, ["$VENDOR_MAN_VERSION"], [Vendor man version])

-AC_DEFINE_UNQUOTED(BUILDERADDR, ["$BUILDERADDR"], [Builder address])

-

-if test -z "$OSNAME"; then

-    OSNAME="UNKNOWN"

-fi

-

-AC_DEFINE_UNQUOTED(OSNAME, ["$OSNAME"], [Operating System Name])

-AC_DEFINE_UNQUOTED(OSVENDOR, ["$OSVENDOR"], [Operating System Vendor])

-AC_DEFINE_UNQUOTED(BUILDERSTRING, ["$BUILDERSTRING"], [Builder string])

-

-AC_SUBST([VENDOR_NAME_SHORT])

-AC_DEFINE_UNQUOTED(VENDOR_NAME, ["$VENDOR_NAME"], [Vendor name])

-AC_DEFINE_UNQUOTED(VENDOR_NAME_SHORT, ["$VENDOR_NAME_SHORT"], [Vendor name])

-AC_DEFINE_UNQUOTED(VENDOR_RELEASE, [$VENDOR_RELEASE], [Vendor release])

-AC_DEFINE_UNQUOTED(VENDOR_MAN_VERSION, ["$VENDOR_MAN_VERSION"], [Vendor man version])

-

-AC_DEFINE(NO_LIBCWRAPPER, 1, [Define to 1 if modules should avoid the libcwrapper])

-

-if test "x$DEBUGGING" = xyes; then

-       AC_DEFINE(DEBUG, 1, [Enable debugging code])

-fi

-AM_CONDITIONAL(DEBUG, [test "x$DEBUGGING" = xyes])

-

-# If unittests aren't explicitly disabled, check for required support

-if test "x$UNITTESTS" != xno ; then

-       PKG_CHECK_MODULES([GLIB], $LIBGLIB,

-                         [HAVE_GLIB=yes], [HAVE_GLIB=no])

-

-       # Check if linker supports -wrap, passed via compiler flags

-       # When cross-compiling, reports no, since unit tests run from

-       # "make check", so would be running on build machine,  not target

-       AC_MSG_CHECKING([whether the linker supports -wrap])

-       save_LDFLAGS="$LDFLAGS"

-       LDFLAGS="$LDFLAGS -Wl,-wrap,exit"

-       AC_RUN_IFELSE([AC_LANG_PROGRAM([[

-	void __wrap_exit (int s)

-	{

-	    __real_exit (0);

-	}]],

-	[[exit (1);]])],

-                     [linker_can_wrap="yes"],

-                     [linker_can_wrap="no"],

-                     [linker_can_wrap="no"])

-       AC_MSG_RESULT([$linker_can_wrap])

-       LDFLAGS="$save_LDFLAGS"

-fi

-

-if test "x$UNITTESTS" = xauto; then

-       if test "x$HAVE_GLIB" = xyes && test "x$linker_can_wrap" = xyes; then

-           UNITTESTS=yes

-       else

-           UNITTESTS=no

-       fi

-fi

-if test "x$UNITTESTS" = xyes; then

-       if test "x$HAVE_GLIB" = xno; then

-           AC_MSG_ERROR([glib required to build unit tests])

-       fi

-       if test "x$linker_can_wrap" = xno; then

-           AC_MSG_ERROR([ld -wrap support required to build unit tests])

-       fi

-       AC_DEFINE(UNITTESTS, 1, [Enable unit tests])

-       AC_SUBST([GLIB_LIBS])

-       AC_SUBST([GLIB_CFLAGS])

-fi

-AM_CONDITIONAL(UNITTESTS, [test "x$UNITTESTS" = xyes])

-

-AC_DEFINE(XTEST, 1, [Support XTest extension])

-AC_DEFINE(XSYNC, 1, [Support XSync extension])

-AC_DEFINE(XCMISC, 1, [Support XCMisc extension])

-AC_DEFINE(BIGREQS, 1, [Support BigRequests extension])

-

-if test "x$SPECIAL_DTRACE_OBJECTS" = "xyes" ; then

-  DIX_LIB='$(top_builddir)/dix/dix.O'

-  OS_LIB='$(top_builddir)/os/os.O $(SHA1_LIBS) $(DLOPEN_LIBS)'

-else

-  DIX_LIB='$(top_builddir)/dix/libdix.la'

-  OS_LIB='$(top_builddir)/os/libos.la'

-fi

-AC_SUBST([DIX_LIB])

-AC_SUBST([OS_LIB])

-

-MAIN_LIB='$(top_builddir)/dix/libmain.la'

-AC_SUBST([MAIN_LIB])

-

-MI_LIB='$(top_builddir)/mi/libmi.la'

-MI_EXT_LIB='$(top_builddir)/mi/libmiext.la'

-MI_INC='-I$(top_srcdir)/mi'

-FB_LIB='$(top_builddir)/fb/libfb.la'

-FB_INC='-I$(top_srcdir)/fb'

-MIEXT_SHADOW_INC='-I$(top_srcdir)/miext/shadow'

-MIEXT_SHADOW_LIB='$(top_builddir)/miext/shadow/libshadow.la'

-MIEXT_SYNC_INC='-I$(top_srcdir)/miext/sync'

-MIEXT_SYNC_LIB='$(top_builddir)/miext/sync/libsync.la'

-CORE_INCS='-I$(top_srcdir)/include -I$(top_builddir)/include'

-

-# SHA1 hashing

-AC_ARG_WITH([sha1],

-            [AS_HELP_STRING([--with-sha1=libc|libmd|libgcrypt|libcrypto|libsha1|CommonCrypto],

-                            [choose SHA1 implementation])])

-AC_CHECK_FUNC([SHA1Init], [HAVE_SHA1_IN_LIBC=yes])

-if test "x$with_sha1" = x && test "x$HAVE_SHA1_IN_LIBC" = xyes; then

-	with_sha1=libc

-fi

-if test "x$with_sha1" = xlibc && test "x$HAVE_SHA1_IN_LIBC" != xyes; then

-	AC_MSG_ERROR([libc requested but not found])

-fi

-if test "x$with_sha1" = xlibc; then

-	AC_DEFINE([HAVE_SHA1_IN_LIBC], [1],

-		[Use libc SHA1 functions])

-	SHA1_LIBS=""

-fi

-AC_CHECK_FUNC([CC_SHA1_Init], [HAVE_SHA1_IN_COMMONCRYPTO=yes])

-if test "x$with_sha1" = x && test "x$HAVE_SHA1_IN_COMMONCRYPTO" = xyes; then

-	with_sha1=CommonCrypto

-fi

-if test "x$with_sha1" = xCommonCrypto && test "x$HAVE_SHA1_IN_COMMONCRYPTO" != xyes; then

-	AC_MSG_ERROR([CommonCrypto requested but not found])

-fi

-if test "x$with_sha1" = xCommonCrypto; then

-	AC_DEFINE([HAVE_SHA1_IN_COMMONCRYPTO], [1],

-		[Use CommonCrypto SHA1 functions])

-	SHA1_LIBS=""

-fi

-AC_CHECK_LIB([md], [SHA1Init], [HAVE_LIBMD=yes])

-if test "x$with_sha1" = x && test "x$HAVE_LIBMD" = xyes; then

-	with_sha1=libmd

-fi

-if test "x$with_sha1" = xlibmd && test "x$HAVE_LIBMD" != xyes; then

-	AC_MSG_ERROR([libmd requested but not found])

-fi

-if test "x$with_sha1" = xlibmd; then

-	AC_DEFINE([HAVE_SHA1_IN_LIBMD], [1],

-	          [Use libmd SHA1 functions])

-	SHA1_LIBS=-lmd

-fi

-PKG_CHECK_MODULES([LIBSHA1], [libsha1], [HAVE_LIBSHA1=yes], [HAVE_LIBSHA1=no])

-if test "x$with_sha1" = x && test "x$HAVE_LIBSHA1" = xyes; then

-   with_sha1=libsha1

-fi

-if test "x$with_sha1" = xlibsha1 && test "x$HAVE_LIBSHA1" != xyes; then

-	AC_MSG_ERROR([libsha1 requested but not found])

-fi

-if test "x$with_sha1" = xlibsha1; then

-	AC_DEFINE([HAVE_SHA1_IN_LIBSHA1], [1],

-	          [Use libsha1 for SHA1])

-	SHA1_LIBS=-lsha1

-fi

-AC_CHECK_LIB([gcrypt], [gcry_md_open], [HAVE_LIBGCRYPT=yes])

-if test "x$with_sha1" = x && test "x$HAVE_LIBGCRYPT" = xyes; then

-	with_sha1=libgcrypt

-fi

-if test "x$with_sha1" = xlibgcrypt && test "x$HAVE_LIBGCRYPT" != xyes; then

-	AC_MSG_ERROR([libgcrypt requested but not found])

-fi

-if test "x$with_sha1" = xlibgcrypt; then

-	AC_DEFINE([HAVE_SHA1_IN_LIBGCRYPT], [1],

-	          [Use libgcrypt SHA1 functions])

-	SHA1_LIBS=-lgcrypt

-fi

-# We don't need all of the OpenSSL libraries, just libcrypto

-AC_CHECK_LIB([crypto], [SHA1_Init], [HAVE_LIBCRYPTO=yes])

-PKG_CHECK_MODULES([OPENSSL], [openssl], [HAVE_OPENSSL_PKC=yes],

-                  [HAVE_OPENSSL_PKC=no])

-if test "x$HAVE_LIBCRYPTO" = xyes || test "x$HAVE_OPENSSL_PKC" = xyes; then

-	if test "x$with_sha1" = x; then

-		with_sha1=libcrypto

-	fi

-else

-	if test "x$with_sha1" = xlibcrypto; then

-		AC_MSG_ERROR([OpenSSL libcrypto requested but not found])

-	fi

-fi

-if test "x$with_sha1" = xlibcrypto; then

-	if test "x$HAVE_LIBCRYPTO" = xyes; then

-		SHA1_LIBS=-lcrypto

-	else

-		SHA1_LIBS="$OPENSSL_LIBS"

-		SHA1_CFLAGS="$OPENSSL_CFLAGS"

-	fi

-fi

-AC_MSG_CHECKING([for SHA1 implementation])

-if test "x$with_sha1" = x; then

-	AC_MSG_ERROR([No suitable SHA1 implementation found])

-fi

-AC_MSG_RESULT([$with_sha1])

-AC_SUBST(SHA1_LIBS)

-AC_SUBST(SHA1_CFLAGS)

-

-PKG_CHECK_MODULES([XSERVERCFLAGS], [$REQUIRED_MODULES $REQUIRED_LIBS])

-PKG_CHECK_MODULES([XSERVERLIBS], [$REQUIRED_LIBS])

-

-# Autotools has some unfortunate issues with library handling.  In order to

-# get a server to rebuild when a dependency in the tree is changed, it must

-# be listed in SERVERNAME_DEPENDENCIES.  However, no system libraries may be

-# listed there, or some versions of autotools will break (especially if a -L

-# is required to find the library).  So, we keep two sets of libraries

-# detected: NAMESPACE_LIBS for in-tree libraries to be linked against, which

-# will go into the _DEPENDENCIES and _LDADD of the server, and

-# NAMESPACE_SYS_LIBS which will go into only the _LDADD.  The

-# NAMESPACEMODULES_LIBS detected from pkgconfig should always go in

-# NAMESPACE_SYS_LIBS.

-#

-# XSERVER_LIBS is the set of in-tree libraries which all servers require.

-# XSERVER_SYS_LIBS is the set of out-of-tree libraries which all servers

-# require.

-#

-XSERVER_CFLAGS="${XSERVER_CFLAGS} ${XSERVERCFLAGS_CFLAGS}"

-XSERVER_LIBS="$DIX_LIB $MI_LIB $OS_LIB"

-XSERVER_SYS_LIBS="${XSERVERLIBS_LIBS} ${SYS_LIBS} ${LIBS}"

-AC_SUBST([XSERVER_LIBS])

-AC_SUBST([XSERVER_SYS_LIBS])

-

-UTILS_SYS_LIBS="${SYS_LIBS}"

-AC_SUBST([UTILS_SYS_LIBS])

-

-# The Xorg binary needs to export symbols so that they can be used from modules

-# Some platforms require extra flags to do this.   libtool should set the

-# necessary flags for each platform when -export-dynamic is passed to it.

-LD_EXPORT_SYMBOLS_FLAG="-export-dynamic"

-AC_SUBST([LD_EXPORT_SYMBOLS_FLAG])

-

-dnl Imake defines SVR4 on SVR4 systems, and many files check for it, so

-dnl we need to replicate that here until those can all be fixed

-AC_MSG_CHECKING([if SVR4 needs to be defined])

-AC_EGREP_CPP([I_AM_SVR4],[

-#if defined(SVR4) || defined(__svr4__) || defined(__SVR4)

- I_AM_SVR4

-#endif

-],[

-AC_DEFINE([SVR4],1,[Define to 1 on systems derived from System V Release 4])

-AC_MSG_RESULT([yes])], AC_MSG_RESULT([no]))

-

-XSERVER_CFLAGS="$XSERVER_CFLAGS $CORE_INCS $XEXT_INC $COMPOSITE_INC $DAMAGE_INC $FIXES_INC $XI_INC $MI_INC $MIEXT_SYNC_INC $MIEXT_SHADOW_INC $MIEXT_LAYER_INC $MIEXT_DAMAGE_INC $RENDER_INC $RANDR_INC $FB_INC"

-

-dnl ---------------------------------------------------------------------------

-dnl DDX section.

-dnl ---------------------------------------------------------------------------

-

-dnl Xvfb DDX

-

-AC_MSG_CHECKING([whether to build Xvfb DDX])

-AC_MSG_RESULT([$XVFB])

-AM_CONDITIONAL(XVFB, [test "x$XVFB" = xyes])

-

-if test "x$XVFB" = xyes; then

-	XVFB_LIBS="$FB_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB"

-	XVFB_SYS_LIBS="$XVFBMODULES_LIBS $GLX_SYS_LIBS"

-	AC_SUBST([XVFB_LIBS])

-	AC_SUBST([XVFB_SYS_LIBS])

-fi

-

-

-dnl Xnest DDX

-

-PKG_CHECK_MODULES(XNESTMODULES, [$LIBXEXT x11 xau $XDMCP_MODULES], [have_xnest=yes], [have_xnest=no])

-AC_MSG_CHECKING([whether to build Xnest DDX])

-if test "x$XNEST" = xauto; then

-	XNEST="$have_xnest"

-fi

-AC_MSG_RESULT([$XNEST])

-AM_CONDITIONAL(XNEST, [test "x$XNEST" = xyes])

-

-if test "x$XNEST" = xyes; then

-	if test "x$have_xnest" = xno; then

-		AC_MSG_ERROR([Xnest build explicitly requested, but required modules not found.])

-	fi

-	XNEST_LIBS="$FB_LIB $FIXES_LIB $MI_LIB $XEXT_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $DIX_LIB $MAIN_LIB $OS_LIB"

-	XNEST_SYS_LIBS="$XNESTMODULES_LIBS $GLX_SYS_LIBS"

-	AC_SUBST([XNEST_LIBS])

-	AC_SUBST([XNEST_SYS_LIBS])

-fi

-

-

-dnl Xorg DDX

-

-AC_MSG_CHECKING([whether to build Xorg DDX])

-if test "x$XORG" = xauto; then

-	XORG="yes"

-	case $host_os in

-		cygwin*) XORG="no" ;;

-		darwin*) XORG="no" ;;

-	esac

-fi

-AC_MSG_RESULT([$XORG])

-

-xorg_bus_linuxpci=no

-xorg_bus_bsdpci=no

-xorg_bus_sparc=no

-

-if test "x$XORG" = xyes; then

-	XORG_DDXINCS='-I$(top_srcdir)/hw/xfree86 -I$(top_srcdir)/hw/xfree86/include -I$(top_srcdir)/hw/xfree86/common'

-	XORG_OSINCS='-I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir)/hw/xfree86/os-support/bus -I$(top_srcdir)/os'

-	XORG_INCS="$XORG_DDXINCS $XORG_OSINCS"

-	XORG_CFLAGS="$XORGSERVER_CFLAGS -DHAVE_XORG_CONFIG_H"

-	XORG_LIBS="$COMPOSITE_LIB $FIXES_LIB $XEXTXORG_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB"

-

-	dnl ==================================================================

-	dnl symbol visibility

-	symbol_visibility=

-	have_visibility=disabled

-	if test x$SYMBOL_VISIBILITY != xno; then

-	    AC_MSG_CHECKING(for symbol visibility support)

-	    if test x$GCC = xyes; then

-		VISIBILITY_CFLAGS="-fvisibility=hidden"

-	    else

-		AC_CHECK_DECL([__SUNPRO_C], [SUNCC="yes"], [SUNCC="no"])

-		if test x$SUNCC = xyes; then

-		    VISIBILITY_CFLAGS="-xldscope=hidden"

-		else

-		    have_visibility=no

-		fi

-	    fi

-	    if test x$have_visibility != xno; then

-		save_CFLAGS="$CFLAGS"

-		CFLAGS="$CFLAGS $VISIBILITY_CFLAGS"

-		AC_TRY_COMPILE(

-		    [#include <X11/Xfuncproto.h>

-		     extern _X_HIDDEN int hidden_int;

-		     extern _X_EXPORT int public_int;

-		     extern _X_HIDDEN int hidden_int_func(void);

-		     extern _X_EXPORT int public_int_func(void);],

-		    [],

-		    have_visibility=yes,

-		    have_visibility=no)

-		CFLAGS=$save_CFLAGS

-	    fi

-	    AC_MSG_RESULT([$have_visibility])

-	    if test x$have_visibility != xno; then

-		symbol_visibility=$VISIBILITY_CFLAGS

-		XORG_CFLAGS="$XORG_CFLAGS $VISIBILITY_CFLAGS"

-		XSERVER_CFLAGS="$XSERVER_CFLAGS $VISIBILITY_CFLAGS"

-	    fi

-	fi

-	dnl added to xorg-server.pc

-	AC_SUBST([symbol_visibility])

-	dnl ===================================================================

-

-	PKG_CHECK_MODULES([PCIACCESS], $LIBPCIACCESS)

-	SAVE_LIBS=$LIBS

-	SAVE_CFLAGS=$CFLAGS

-	CFLAGS=$PCIACCESS_CFLAGS

-	LIBS=$PCIACCESS_LIBS

-	AC_CHECK_FUNCS([pci_system_init_dev_mem])

-	AC_CHECK_FUNCS([pci_device_enable])

-	AC_CHECK_FUNCS([pci_device_is_boot_vga])

-	AC_CHECK_FUNCS([pci_device_vgaarb_init])

-	LIBS=$SAVE_LIBS

-	CFLAGS=$SAVE_CFLAGS

-	XORG_SYS_LIBS="$XORG_SYS_LIBS $PCIACCESS_LIBS $GLX_SYS_LIBS"

-	XORG_CFLAGS="$XORG_CFLAGS $PCIACCESS_CFLAGS"

-

-	case $host_os in

-	  linux*)

-		if test "x$LNXAPM" = xyes; then

-			XORG_CFLAGS="$XORG_CFLAGS -DXF86PM"

-		fi

-	  	XORG_OS="linux"

-		XORG_OS_SUBDIR="linux"

-		xorg_bus_linuxpci="yes"

-		linux_acpi="no"

-		case $host_cpu in

-		  ia64*)

-			linux_ia64=yes

-			linux_acpi="yes"

-			;;

-		  alpha*)

-		  	linux_alpha=yes

-			;;

-		  i*86|amd64*|x86_64*)

-			linux_acpi="yes"

-			;;

-		  *)

-			;;

-		esac

-		;;

-	  freebsd* | kfreebsd*-gnu | dragonfly*)

-	  	XORG_OS="freebsd"

-		XORG_OS_SUBDIR="bsd"

-		xorg_bus_bsdpci="yes"

-		;;

-	  netbsd*)

-	  	XORG_OS="netbsd"

-		XORG_OS_SUBDIR="bsd"

-		xorg_bus_bsdpci="yes"

-		;;

-	  openbsd*)

-		if test "x$ac_cv_BSD_APM" = xyes \

-			-o "x$ac_cv_BSD_KQUEUE_APM" = xyes; then

-			XORG_CFLAGS="$XORG_CFLAGS -DXF86PM"

-		fi

-	  	XORG_OS="openbsd"

-		XORG_OS_SUBDIR="bsd"

-		xorg_bus_bsdpci="yes"

-		;;

-	  solaris*)

-	  	XORG_OS="solaris"

-		XORG_OS_SUBDIR="solaris"

-		XORG_CFLAGS="$XORG_CFLAGS -DXF86PM"

-		# Use the same stubs as BSD for old functions, since we now

-		# use libpciaccess for PCI

-		xorg_bus_bsdpci="yes"

-		AC_CHECK_HEADERS([sys/kd.h])

-		AC_CHECK_HEADERS([sys/vt.h], [solaris_vt=yes], [solaris_vt=no])

-		# Check for minimum supported release

-		AC_MSG_CHECKING([Solaris version])

-	        OS_MINOR=`echo ${host_os}|$SED -e 's/^.*solaris2\.//' -e s'/\..*$//'`

-		if test "${OS_MINOR}" -ge 7 ; then

-	        	AC_MSG_RESULT(Solaris ${OS_MINOR})

-		else

-			AC_MSG_RESULT(Solaris `echo ${host_os}|$SED -e 's/^.*solaris//`)

-		fi

-		if test "${OS_MINOR}" -lt 8 ; then

-			AC_MSG_ERROR([This release no longer supports Solaris versions older than Solaris 8.])

-		fi

-		AC_CHECK_DECL([__SUNPRO_C], [SUNCC="yes"], [SUNCC="no"])

-		if test "x$SUNCC" = "xyes"; then

-			solaris_asm_inline="yes"

-		fi

-		AC_CHECK_DECL([_LP64], [SOLARIS_64="yes"], [SOLARIS_64="no"])

-			

-		case $host_cpu in

-		  sparc*)	

-			SOLARIS_INOUT_ARCH="sparcv8plus"

-			;;

-		  i*86)	

-			if test x$SOLARIS_64 = xyes ; then

-				SOLARIS_INOUT_ARCH="amd64"

-			else

-				SOLARIS_INOUT_ARCH="ia32"

-			fi

-			;;

-		  *)

-			AC_MSG_ERROR([Unsupported Solaris platform. Only SPARC & x86 \

-			are supported on Solaris in this release.   If you are \

-			interested in porting Xorg to your platform, please email \

-			xorg@lists.freedesktop.org.]) ;;

-		esac

-		AC_SUBST([SOLARIS_INOUT_ARCH])

-		if test x$solaris_asm_inline = xyes ; then

-			SOLARIS_ASM_CFLAGS='$(top_srcdir)/hw/xfree86/os-support/solaris/solaris-$(SOLARIS_INOUT_ARCH).il'

-			XORG_CFLAGS="${XORG_CFLAGS} "'$(SOLARIS_ASM_CFLAGS)'

-		fi

-		AC_SUBST([SOLARIS_ASM_CFLAGS])

-		if test "x$SUPPORT_PC98" = xauto; then

-			SUPPORT_PC98="no"

-		fi

-		;;

-	  gnu*)

-	  	XORG_OS="gnu"

-		XORG_OS_SUBDIR="hurd"

-		# Use the same stubs as BSD for old functions, since we now

-		# use libpciaccess for PCI

-		xorg_bus_bsdpci="yes"

-		;;

-	  *)

-	  	XORG_OS="unknown"

-		XORG_OS_SUBDIR="unknown"

-		AC_MSG_ERROR([m4_text_wrap(m4_join([ ],

-		[Your OS is unknown. Xorg currently only supports Linux,],

-		[Free/Open/Net/DragonFlyBSD, Solaris/OpenSolaris, & GNU Hurd.],

-		[If you are interested in porting Xorg to your platform,],

-		[please email xorg@lists.freedesktop.org.]))])

-		;;

-	esac

-

-	case $host_cpu in

-	  sparc*)

-		xorg_bus_sparc="yes"

-		;;

-	  i*86)

-		if test "x$SUPPORT_PC98" = xauto; then

-			SUPPORT_PC98="yes"

-		fi

-		;;

-	esac

-

-	if test "x$SUPPORT_PC98" = xauto; then

-		SUPPORT_PC98="no"

-	fi

-	if test "x$SUPPORT_PC98" = xyes; then

-		AC_DEFINE(SUPPORT_PC98, 1, [Support PC98])

-	fi

-	if test "x$XORG_OS_PCI" = x ; then

-		XORG_OS_PCI=$XORG_OS

-	fi

-	if test "x$DGA" = xauto; then

-		PKG_CHECK_MODULES(DGA, $DGAPROTO, [DGA=yes], [DGA=no])

-	fi

-	if test "x$DGA" = xyes; then

-		XORG_MODULES="$XORG_MODULES $DGAPROTO"

-		PKG_CHECK_MODULES(DGA, $DGAPROTO)

-		AC_DEFINE(DGA, 1, [Support DGA extension])

-		AC_DEFINE(XFreeXDGA, 1, [Build XDGA support])

-	fi

-

-	if test "x$XF86VIDMODE" = xauto; then

-		PKG_CHECK_MODULES(XF86VIDMODE, $VIDMODEPROTO, [XF86VIDMODE=yes], [XF86VIDMODE=no])

-	fi

-	if test "x$XF86VIDMODE" = xyes; then

-		XORG_MODULES="$XORG_MODULES $VIDMODEPROTO"

-		PKG_CHECK_MODULES(XF86VIDMODE, $VIDMODEPROTO)

-		AC_DEFINE(XF86VIDMODE, 1, [Support XFree86 Video Mode extension])

-	fi

-

-	if test -n "$XORG_MODULES"; then

-	        PKG_CHECK_MODULES(XORG_MODULES, [$XORG_MODULES])

-	        XORG_CFLAGS="$XORG_CFLAGS $XORG_MODULES_CFLAGS"

-	        XORG_SYS_LIBS="$XORG_SYS_LIBS $XORG_MODULES_LIBS"

-	fi

-

-	AC_SUBST([XORG_LIBS])

-	AC_SUBST([XORG_SYS_LIBS])

-	AC_SUBST([XORG_INCS])

-	AC_SUBST([XORG_OS])

-	AC_SUBST([XORG_OS_SUBDIR])

-

-	AC_PATH_PROG(PERL, perl, no)

-	dnl unlikely as this may be ...

-	if test "x$PERL" = xno; then

-		AC_MSG_ERROR([Perl is required to build the XFree86/Xorg DDX.])

-	fi

-	AC_SUBST(PERL)

-

-	AC_SUBST([XORG_CFLAGS])

-

-	dnl these only go in xorg-config.h

-	XF86CONFIGFILE="xorg.conf"

-	XF86CONFIGDIR="xorg.conf.d"

-	AC_SUBST(XF86CONFIGDIR)

-	CONFIGFILE="$sysconfdir/$XF86CONFIGFILE"

-	LOGPREFIX="$logdir/Xorg."

-	AC_DEFINE(XORG_SERVER, 1, [Building Xorg server])

-	AC_DEFINE(XORGSERVER, 1, [Building Xorg server])

-	AC_DEFINE(XFree86Server, 1, [Building XFree86 server])

-	AC_DEFINE(XFree86LOADER, 1, [Building loadable XFree86 server])

-	AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version])

-	AC_DEFINE(NEED_XF86_TYPES, 1, [Need XFree86 typedefs])

-	AC_DEFINE(NEED_XF86_PROTOTYPES, 1, [Need XFree86 helper functions])

-	AC_DEFINE(__XSERVERNAME__, "Xorg", [Name of X server])

-	AC_DEFINE_DIR(__XCONFIGFILE__, XF86CONFIGFILE, [Name of configuration file])

-	AC_DEFINE_DIR(XF86CONFIGFILE, XF86CONFIGFILE, [Name of configuration file])

-	AC_DEFINE_DIR(__XCONFIGDIR__, XF86CONFIGDIR, [Name of configuration directory])

-	AC_DEFINE_DIR(DEFAULT_MODULE_PATH, moduledir, [Default module search path])

-	AC_DEFINE_DIR(DEFAULT_LIBRARY_PATH, libdir, [Default library install path])

-	AC_DEFINE_DIR(DEFAULT_LOGPREFIX, LOGPREFIX, [Default log location])

-	AC_DEFINE_UNQUOTED(__VENDORDWEBSUPPORT__, ["$VENDOR_WEB"], [Vendor web address for support])

-	AC_DEFINE(XSERVER_LIBPCIACCESS, 1, [Use libpciaccess for all pci manipulation])

-	if test "x$VGAHW" = xyes; then

-		AC_DEFINE(WITH_VGAHW, 1, [Building vgahw module])

-	fi

-

-	driverdir="$moduledir/drivers"

-	AC_SUBST([moduledir])

-	AC_SUBST([driverdir])

-	sdkdir="$includedir/xorg"

-	extdir="$includedir/X11/extensions"

-	sysconfigdir="$datadir/X11/$XF86CONFIGDIR"

-	AC_SUBST([sdkdir])

-	AC_SUBST([extdir])

-	AC_SUBST([sysconfigdir])

-	AC_SUBST([logdir])

-

-	# stuff the ABI versions into the pc file too

-	extract_abi() {

-	    grep ^.define.*${1}_VERSION ${srcdir}/hw/xfree86/common/xf86Module.h | tr '(),' '  .' | awk '{ print $4$5 }'

-	}

-	abi_ansic=`extract_abi ANSIC`

-	abi_videodrv=`extract_abi VIDEODRV`

-	abi_xinput=`extract_abi XINPUT`

-	abi_extension=`extract_abi EXTENSION`

-	AC_SUBST([abi_ansic])

-	AC_SUBST([abi_videodrv])

-	AC_SUBST([abi_xinput])

-	AC_SUBST([abi_extension])

-fi

-AM_CONDITIONAL([XORG], [test "x$XORG" = xyes])

-AM_CONDITIONAL([XORG_BUS_LINUXPCI], [test "x$xorg_bus_linuxpci" = xyes])

-AM_CONDITIONAL([XORG_BUS_BSDPCI], [test "x$xorg_bus_bsdpci" = xyes])

-AM_CONDITIONAL([XORG_BUS_SPARC], [test "x$xorg_bus_sparc" = xyes])

-AM_CONDITIONAL([LINUX_IA64], [test "x$linux_ia64" = xyes])

-AM_CONDITIONAL([LINUX_ALPHA], [test "x$linux_alpha" = xyes])

-AM_CONDITIONAL([LNXACPI], [test "x$linux_acpi" = xyes])

-AM_CONDITIONAL([SOLARIS_ASM_INLINE], [test "x$solaris_asm_inline" = xyes])

-AM_CONDITIONAL([SOLARIS_VT], [test "x$solaris_vt" = xyes])

-AM_CONDITIONAL([DGA], [test "x$DGA" = xyes])

-AM_CONDITIONAL([XF86VIDMODE], [test "x$XF86VIDMODE" = xyes])

-

-dnl XWin DDX

-

-AC_MSG_CHECKING([whether to build XWin DDX])

-if test "x$XWIN" = xauto; then

-	case $host_os in

-		cygwin*) XWIN="yes" ;;

-		mingw*) XWIN="yes" ;;

-		*) XWIN="no" ;;

-	esac

-fi

-AC_MSG_RESULT([$XWIN])

-

-if test "x$XWIN" = xyes; then

-	AC_DEFINE_DIR(SYSCONFDIR, sysconfdir, [Location of system.XWinrc])

-	AC_DEFINE_DIR(DEFAULT_LOGDIR, logdir, [Default log location])

-	AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version])

-	AC_DEFINE_UNQUOTED(__VENDORDWEBSUPPORT__, ["$VENDOR_WEB"], [Vendor web address for support])

-	AC_CHECK_TOOL(WINDRES, windres)

-

-	PKG_CHECK_MODULES([XWINMODULES],[x11 xdmcp xau])

-

-	if test "x$WINDOWSWM" = xauto; then

-		PKG_CHECK_EXISTS($WINDOWSWMPROTO, [WINDOWSWM=yes], [WINDOWSWM=no])

-	fi

-	if test "x$WINDOWSWM" = xyes ; then

-		PKG_CHECK_MODULES(WINDOWSWM, $WINDOWSWMPROTO)

-		XWINMODULES_CFLAGS="$XWINMODULES_CFLAGS $WINDOWSWM_CFLAGS"

-		AC_DEFINE(ROOTLESS,1,[Build Rootless code])

-	fi

-

-	case $host_os in

-		cygwin*)

-			XWIN_SERVER_NAME=XWin

-			AC_DEFINE(HAS_DEVWINDOWS,1,[Cygwin has /dev/windows for signaling new win32 messages])

-			;;

-		mingw*)

-			XWIN_SERVER_NAME=Xming

-			AC_DEFINE(RELOCATE_PROJECTROOT,1,[Make PROJECT_ROOT relative to the xserver location])

-			AC_DEFINE(HAS_WINSOCK,1,[Use Windows sockets])

-			XWIN_SYS_LIBS=-lwinsock2

-			;;

-	esac

-	XWIN_LIBS="$FB_LIB $MI_LIB $FIXES_LIB $XEXT_LIB $RANDR_LIB $RENDER_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $DAMAGE_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $OS_LIB"

-	XWIN_SYS_LIBS="$XWIN_SYS_LIBS $XWINMODULES_LIBS"

-	AC_SUBST(XWIN_LIBS)

-	AC_SUBST(XWIN_SERVER_NAME)

-	AC_SUBST(XWIN_SYS_LIBS)

-

-	if test "x$DEBUGGING" = xyes; then

-		AC_DEFINE(CYGDEBUG, 1, [Simple debug messages])

-		AC_DEFINE(CYGWINDOWING_DEBUG, 1, [Debug messages for window handling])

-		AC_DEFINE(CYGMULTIWINDOW_DEBUG, 1, [Debug window manager])

-	fi

-

-	AC_DEFINE(DDXOSVERRORF, 1, [Use OsVendorVErrorF])

-	AC_DEFINE(DDXBEFORERESET, 1, [Use ddxBeforeReset ])

-fi

-AM_CONDITIONAL(XWIN, [test "x$XWIN" = xyes])

-AM_CONDITIONAL(XWIN_MULTIWINDOW, [test "x$XWIN" = xyes])

-AM_CONDITIONAL(XWIN_MULTIWINDOWEXTWM, [test "x$XWIN" = xyes && test "x$WINDOWSWM" = xyes])

-AM_CONDITIONAL(XWIN_CLIPBOARD, [test "x$XWIN" = xyes])

-AM_CONDITIONAL(XWIN_GLX_WINDOWS, [test "x$XWIN" = xyes && false])

-AM_CONDITIONAL(XWIN_NATIVEGDI, [test "x$XWIN" = xyes && false])

-AM_CONDITIONAL(XWIN_PRIMARYFB, [test "x$XWIN" = xyes && false])

-AM_CONDITIONAL(XWIN_RANDR, [test "x$XWIN" = xyes])

-AM_CONDITIONAL(XWIN_XV, [test "x$XWIN" = xyes && test "x$XV" = xyes])

-

-dnl Darwin / OS X DDX

-if test "x$XQUARTZ" = xyes; then

-	AC_DEFINE(XQUARTZ,1,[Have Quartz])

-	AC_DEFINE(ROOTLESS,1,[Build Rootless code])

-

-	DARWIN_LIBS="$MI_LIB $OS_LIB $DIX_LIB $MAIN_LIB $FB_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $RECORD_LIB $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $XPSTUBS_LIB"

-	AC_SUBST([DARWIN_LIBS])

-

-	AC_CHECK_LIB([Xplugin],[xp_init],[:])

-

-	CFLAGS="${CFLAGS} -DROOTLESS_SAFEALPHA -DNO_ALLOCA"

-

-	PKG_CHECK_MODULES(XPBPROXY, $APPLEWMPROTO $LIBAPPLEWM xfixes x11)

-

-        if test "x$XQUARTZ_SPARKLE" = xyes ; then

-                AC_DEFINE(XQUARTZ_SPARKLE,1,[Support application updating through sparkle.])

-        fi

-

-	if test "x$STANDALONE_XPBPROXY" = xyes ; then

-		AC_DEFINE(STANDALONE_XPBPROXY,1,[Build a standalone xpbproxy])

-	fi

-fi

-

-# Support for objc in autotools is minimal and not documented.

-OBJC='$(CC)'

-OBJCLD='$(CCLD)'

-OBJCLINK='$(LINK)'

-OBJCFLAGS='$(CFLAGS)'

-AC_SUBST([OBJC])

-AC_SUBST([OBJCCLD])

-AC_SUBST([OBJCLINK])

-AC_SUBST([OBJCFLAGS])

-# internal, undocumented automake func follows :(

-_AM_DEPENDENCIES([OBJC])

-AM_CONDITIONAL(XQUARTZ, [test "x$XQUARTZ" = xyes])

-AM_CONDITIONAL(XQUARTZ_SPARKLE, [test "x$XQUARTZ_SPARKLE" != "xno"])

-AM_CONDITIONAL(STANDALONE_XPBPROXY, [test "x$STANDALONE_XPBPROXY" = xyes])

-

-dnl DMX DDX

-PKG_CHECK_MODULES(

-	[DMXMODULES],

-	[xmuu $LIBXEXT x11 xrender xfixes $LIBXI $DMXPROTO xau $XDMCP_MODULES],

-	[PKG_CHECK_MODULES(

-		[XDMXCONFIG_DEP],

-		[xaw7 xmu xt xpm x11],

-		[have_dmx=yes],

-		[have_dmx=no])],

-	[have_dmx=no])

-AC_MSG_CHECKING([whether to build Xdmx DDX])

-if test "x$DMX" = xauto; then

-	DMX="$have_dmx"

-	case $host_os in

-		cygwin*) DMX="no" ;;

-		darwin*) DMX="no" ;;

-	esac

-fi

-AC_MSG_RESULT([$DMX])

-AM_CONDITIONAL(DMX, [test "x$DMX" = xyes])

-

-if test "x$DMX" = xyes; then

-	if test "x$have_dmx" = xno; then

-		AC_MSG_ERROR([Xdmx build explicitly requested, but required

-		              modules not found.])

-	fi

-	DMX_INCLUDES="$XEXT_INC $RENDER_INC $RECORD_INC"

-	XDMX_CFLAGS="$DMXMODULES_CFLAGS"

-	XDMX_LIBS="$FB_LIB $MI_LIB $XEXT_LIB $RENDER_LIB $RECORD_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $MIEXT_SYNC_LIB $MIEXT_SHADOW_LIB $MIEXT_DAMAGE_LIB $COMPOSITE_LIB $DAMAGE_LIB $MAIN_LIB $DIX_LIB $CONFIG_LIB $OS_LIB $FIXES_LIB"

-	XDMX_SYS_LIBS="$DMXMODULES_LIBS"

-	AC_SUBST([XDMX_CFLAGS])

-	AC_SUBST([XDMX_LIBS])

-	AC_SUBST([XDMX_SYS_LIBS])

-

-dnl USB sources in DMX require <linux/input.h>

-	AC_CHECK_HEADER([linux/input.h], DMX_BUILD_USB="yes",

-			DMX_BUILD_USB="no")

-dnl Linux sources in DMX require <linux/keyboard.h>

-	AC_CHECK_HEADER([linux/keyboard.h], DMX_BUILD_LNX="yes",

-			DMX_BUILD_LNX="no")

-	AC_SUBST(XDMXCONFIG_DEP_CFLAGS)

-	AC_SUBST(XDMXCONFIG_DEP_LIBS)

-	PKG_CHECK_MODULES([DMXEXAMPLES_DEP], [$LIBDMX $LIBXEXT x11])

-	AC_SUBST(DMXEXAMPLES_DEP_LIBS)

-	PKG_CHECK_MODULES([DMXXMUEXAMPLES_DEP], [$LIBDMX xmu $LIBXEXT x11])

-	AC_SUBST(DMXXMUEXAMPLES_DEP_LIBS)

-	PKG_CHECK_MODULES([DMXXIEXAMPLES_DEP], [$LIBDMX $LIBXI $LIBXEXT x11])

-	AC_SUBST(DMXXIEXAMPLES_DEP_LIBS)

-	PKG_CHECK_MODULES([XTSTEXAMPLES_DEP], [$LIBXTST $LIBXEXT x11])

-	AC_SUBST(XTSTEXAMPLES_DEP_LIBS)

-	PKG_CHECK_MODULES([XRESEXAMPLES_DEP], [xres $LIBXEXT x11])

-	AC_SUBST(XRESEXAMPLES_DEP_LIBS)

-	PKG_CHECK_MODULES([X11EXAMPLES_DEP], [$LIBXEXT x11])

-	AC_SUBST(X11EXAMPLES_DEP_LIBS)

-

-fi

-AM_CONDITIONAL([DMX_BUILD_LNX], [test "x$DMX_BUILD_LNX" = xyes])

-AM_CONDITIONAL([DMX_BUILD_USB], [test "x$DMX_BUILD_USB" = xyes])

-

-dnl kdrive DDX

-

-XEPHYR_LIBS=

-XEPHYR_INCS=

-

-AM_CONDITIONAL(KDRIVE, [test x$KDRIVE = xyes])

-

-if test "$KDRIVE" = yes; then

-    AC_DEFINE(KDRIVESERVER,1,[Build Kdrive X server])

-    AC_DEFINE(KDRIVEDDXACTIONS,,[Build kdrive ddx])

-

-    AC_CHECK_HEADERS([linux/fb.h])

-    if test "$ac_cv_header_linux_fb_h" = yes && test "x$XFBDEV" = xauto; then

-        XFBDEV=yes

-    fi

-

-    if test "x$XFBDEV" = xyes; then

-        KDRIVEFBDEVLIB=yes

-        AC_DEFINE(KDRIVEFBDEV, 1, [Build fbdev-based kdrive server])

-    fi

-

-

-    PKG_CHECK_MODULES([TSLIB], [tslib-0.0], [HAVE_TSLIB="yes"], [HAVE_TSLIB="no"])

-    if test "x$HAVE_TSLIB" = xno; then

-        AC_CHECK_LIB(ts, ts_open, [

-			HAVE_TSLIB="yes"

-			TSLIB_LIBS="-lts"

-		])

-    fi

-

-    if test "xTSLIB" = xauto; then

-        TSLIB="$HAVE_TSLIB"

-    fi

-

-    if test "x$TSLIB" = xyes; then

-        if ! test "x$HAVE_TSLIB" = xyes; then

-            AC_MSG_ERROR([tslib must be installed to build the tslib driver. See http://tslib.berlios.de/])

-        else

-            AC_DEFINE(TSLIB, 1, [Have tslib support])

-        fi

-    fi

-

-    if test "x$KDRIVE_KBD" = xyes; then

-       AC_DEFINE(KDRIVE_KBD, 1, [Enable KDrive kbd driver])

-    fi

-    if test "x$KDRIVE_EVDEV" = xyes; then

-       AC_DEFINE(KDRIVE_EVDEV, 1, [Enable KDrive evdev driver])

-    fi

-    if test "x$KDRIVE_MOUSE" = xyes; then

-       AC_DEFINE(KDRIVE_MOUSE, 1, [Enable KDrive mouse driver])

-    fi

-

-    XEPHYR_REQUIRED_LIBS="x11 $LIBXEXT xau xdmcp"

-    if test "x$XV" = xyes; then

-        XEPHYR_REQUIRED_LIBS="$XEPHYR_REQUIRED_LIBS xv"

-    fi

-    if test "x$DRI" = xyes && test "x$GLX" = xyes; then

-        XEPHYR_REQUIRED_LIBS="$XEPHYR_REQUIRED_LIBS $LIBGL libdrm"

-    fi

-

-    PKG_CHECK_MODULES(XEPHYR, $XEPHYR_REQUIRED_LIBS, [xephyr="yes"], [xephyr="no"])

-    if test "x$XEPHYR" = xauto; then

-        XEPHYR=$xephyr

-    fi

-    if test "x$XEPHYR" = xyes && test "x$xephyr" = xno; then	

-        AC_MSG_ERROR([Xephyr dependencies missing])

-    fi

-

-    # Xephyr needs nanosleep() which is in librt on Solaris

-    AC_CHECK_FUNC([nanosleep], [],

-        AC_CHECK_LIB([rt], [nanosleep], XEPHYR_LIBS="$XEPHYR_LIBS -lrt"))

-    

-    # damage shadow extension glx (NOTYET) fb mi

-    KDRIVE_INC='-I$(top_srcdir)/hw/kdrive/src'

-    KDRIVE_PURE_INCS="$KDRIVE_INC $MIEXT_SYNC_INC $MIEXT_DAMAGE_INC $MIEXT_SHADOW_INC $XEXT_INC $FB_INC $MI_INC"

-    KDRIVE_OS_INC='-I$(top_srcdir)/hw/kdrive/linux'

-    KDRIVE_INCS="$KDRIVE_PURE_INCS $KDRIVE_OS_INC"

-    

-    KDRIVE_CFLAGS="$XSERVER_CFLAGS -DHAVE_KDRIVE_CONFIG_H $TSLIB_CFLAGS"

-

-    KDRIVE_PURE_LIBS="$FB_LIB $MI_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $OS_LIB"

-    KDRIVE_LIB='$(top_builddir)/hw/kdrive/src/libkdrive.la'

-    case $host_os in

-	*linux*)

-	    KDRIVE_OS_LIB='$(top_builddir)/hw/kdrive/linux/liblinux.la'

-            KDRIVELINUX=yes

-	    if test "x$KDRIVE_EVDEV" = xauto; then

-		KDRIVE_EVDEV=yes

-	    fi

-	    if test "x$KDRIVE_KBD" = xauto; then

-		KDRIVE_KBD=yes

-	    fi

-	    if test "x$KDRIVE_MOUSE" = xauto; then

-		KDRIVE_MOUSE=yes

-	    fi

-	    ;;

-	*)

-	    if test "x$KDRIVE_EVDEV" = xauto; then

-		KDRIVE_EVDEV=no

-	    fi

-	    if test "x$KDRIVE_KBD" = xauto; then

-		KDRIVE_KBD=no

-	    fi

-	    if test "x$KDRIVE_MOUSE" = xauto; then

-		KDRIVE_MOUSE=no

-	    fi

-	    ;;

-    esac

-    KDRIVE_STUB_LIB='$(top_builddir)/hw/kdrive/src/libkdrivestubs.la'

-    KDRIVE_LOCAL_LIBS="$MAIN_LIB $DIX_LIB $KDRIVE_LIB $KDRIVE_STUB_LIB"

-    KDRIVE_LOCAL_LIBS="$KDRIVE_LOCAL_LIBS $FB_LIB $MI_LIB $KDRIVE_PURE_LIBS"

-    KDRIVE_LOCAL_LIBS="$KDRIVE_LOCAL_LIBS $KDRIVE_OS_LIB"

-    KDRIVE_LIBS="$KDRIVE_LOCAL_LIBS $XSERVER_SYS_LIBS $GLX_SYS_LIBS $DLOPEN_LIBS $TSLIB_LIBS"

-

-    AC_SUBST([XEPHYR_LIBS])

-    AC_SUBST([XEPHYR_INCS])

-fi

-AC_SUBST([KDRIVE_INCS])

-AC_SUBST([KDRIVE_PURE_INCS])

-AC_SUBST([KDRIVE_CFLAGS])

-AC_SUBST([KDRIVE_PURE_LIBS])

-AC_SUBST([KDRIVE_LOCAL_LIBS])

-AC_SUBST([KDRIVE_LIBS])

-AM_CONDITIONAL(KDRIVELINUX, [test "x$KDRIVELINUX" = xyes])

-AM_CONDITIONAL(KDRIVE_EVDEV, [test "x$KDRIVE_EVDEV" = xyes])

-AM_CONDITIONAL(KDRIVE_KBD,   [test "x$KDRIVE_KBD" = xyes])

-AM_CONDITIONAL(KDRIVE_MOUSE, [test "x$KDRIVE_MOUSE" = xyes])

-AM_CONDITIONAL(TSLIB, [test "x$HAVE_TSLIB" = xyes])

-AM_CONDITIONAL(KDRIVEFBDEV, [test "x$XFBDEV" = xyes])

-AM_CONDITIONAL(XEPHYR, [test "x$KDRIVE" = xyes && test "x$XEPHYR" = xyes])

-AM_CONDITIONAL(BUILD_KDRIVEFBDEVLIB, [test "x$KDRIVE" = xyes && test "x$KDRIVEFBDEVLIB" = xyes])

-AM_CONDITIONAL(XFAKESERVER, [test "x$KDRIVE" = xyes && test "x$XFAKE" = xyes])

-

-dnl and the rest of these are generic, so they're in config.h

-dnl 

-dnl though, thanks to the passing of some significant amount of time, the

-dnl above is probably a complete fallacy, and you should not rely on it.

-dnl but this is still actually better than imake, honest. -daniels

-

-AC_TRY_COMPILE([

-#include <features.h>

-#ifndef __GLIBC__

-#error not glibc

-#endif

-], [], [AC_DEFINE(_GNU_SOURCE, 1,

-	[ Enable GNU and other extensions to the C environment for glibc])])

-

-AC_DEFINE_DIR(PROJECTROOT, prefix, [Overall prefix])

-

-AC_SUBST([RELEASE_DATE])

-BUILD_DATE="`date +'%Y%m%d'`"

-AC_SUBST([BUILD_DATE])

-BUILD_TIME="`date +'1%H%M%S'`"

-AC_SUBST([BUILD_TIME])

-

-DIX_CFLAGS="-DHAVE_DIX_CONFIG_H $XSERVER_CFLAGS"

-

-AC_SUBST([DIX_CFLAGS])

-

-AC_SUBST([libdir])

-AC_SUBST([exec_prefix])

-AC_SUBST([prefix])

-

-AC_OUTPUT([

-Makefile

-glx/Makefile

-include/Makefile

-composite/Makefile

-damageext/Makefile

-dbe/Makefile

-dix/Makefile

-doc/Makefile

-doc/man/Makefile

-doc/xml/Makefile

-doc/xml/dtrace/Makefile

-doc/xml/xserver.ent

-fb/Makefile

-record/Makefile

-config/Makefile

-mi/Makefile

-miext/Makefile

-miext/sync/Makefile

-miext/damage/Makefile

-miext/shadow/Makefile

-miext/cw/Makefile

-miext/rootless/Makefile

-os/Makefile

-randr/Makefile

-render/Makefile

-xkb/Makefile

-Xext/Makefile

-Xi/Makefile

-xfixes/Makefile

-exa/Makefile

-hw/Makefile

-hw/xfree86/Makefile

-hw/xfree86/common/Makefile

-hw/xfree86/common/xf86Build.h

-hw/xfree86/ddc/Makefile

-hw/xfree86/dixmods/Makefile

-hw/xfree86/dixmods/extmod/Makefile

-hw/xfree86/doc/Makefile

-hw/xfree86/doc/devel/Makefile

-hw/xfree86/doc/man/Makefile

-hw/xfree86/doc/sgml/Makefile

-hw/xfree86/dri/Makefile

-hw/xfree86/dri2/Makefile

-hw/xfree86/exa/Makefile

-hw/xfree86/fbdevhw/Makefile

-hw/xfree86/i2c/Makefile

-hw/xfree86/int10/Makefile

-hw/xfree86/loader/Makefile

-hw/xfree86/modes/Makefile

-hw/xfree86/os-support/Makefile

-hw/xfree86/os-support/bsd/Makefile

-hw/xfree86/os-support/bus/Makefile

-hw/xfree86/os-support/hurd/Makefile

-hw/xfree86/os-support/misc/Makefile

-hw/xfree86/os-support/linux/Makefile

-hw/xfree86/os-support/sco/Makefile

-hw/xfree86/os-support/solaris/Makefile

-hw/xfree86/parser/Makefile

-hw/xfree86/ramdac/Makefile

-hw/xfree86/shadowfb/Makefile

-hw/xfree86/vbe/Makefile

-hw/xfree86/vgahw/Makefile

-hw/xfree86/x86emu/Makefile

-hw/xfree86/xaa/Makefile

-hw/xfree86/utils/Makefile

-hw/xfree86/utils/cvt/Makefile

-hw/xfree86/utils/gtf/Makefile

-hw/dmx/config/Makefile

-hw/dmx/doc/Makefile

-hw/dmx/examples/Makefile

-hw/dmx/input/Makefile

-hw/dmx/glxProxy/Makefile

-hw/dmx/Makefile

-hw/vfb/Makefile

-hw/xnest/Makefile

-hw/xwin/Makefile

-hw/xwin/glx/Makefile

-hw/xquartz/Makefile

-hw/xquartz/GL/Makefile

-hw/xquartz/bundle/Makefile

-hw/xquartz/doc/Makefile

-hw/xquartz/mach-startup/Makefile

-hw/xquartz/pbproxy/Makefile

-hw/xquartz/xpr/Makefile

-hw/kdrive/Makefile

-hw/kdrive/ephyr/Makefile

-hw/kdrive/fake/Makefile

-hw/kdrive/fbdev/Makefile

-hw/kdrive/linux/Makefile

-hw/kdrive/src/Makefile

-test/Makefile

-test/xi2/Makefile

-xorg-server.pc

-])

+dnl Copyright © 2003-2007 Keith Packard, Daniel Stone
+dnl
+dnl Permission is hereby granted, free of charge, to any person obtaining a
+dnl copy of this software and associated documentation files (the "Software"),
+dnl to deal in the Software without restriction, including without limitation
+dnl the rights to use, copy, modify, merge, publish, distribute, sublicense,
+dnl and/or sell copies of the Software, and to permit persons to whom the
+dnl Software is furnished to do so, subject to the following conditions:
+dnl
+dnl The above copyright notice and this permission notice (including the next
+dnl paragraph) shall be included in all copies or substantial portions of the
+dnl Software.
+dnl
+dnl THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+dnl IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+dnl FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+dnl THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+dnl LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+dnl FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+dnl DEALINGS IN THE SOFTWARE.
+dnl
+dnl Authors: Keith Packard <keithp@keithp.com>
+dnl          Daniel Stone <daniel@fooishbar.org>
+dnl          an unwitting cast of miscellaneous others
+dnl
+dnl Process this file with autoconf to create configure.
+
+AC_PREREQ(2.57)
+AC_INIT([xorg-server], 1.9.99.901, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+RELEASE_DATE="2010-12-06"
+AC_CONFIG_SRCDIR([Makefile.am])
+AM_INIT_AUTOMAKE([foreign dist-bzip2])
+AM_MAINTAINER_MODE
+
+# Require xorg-macros minimum of 1.10 for XORG_CHECK_SGML_DOCTOOLS
+m4_ifndef([XORG_MACROS_VERSION],
+          [m4_fatal([must install xorg-macros 1.10 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.10)
+XORG_DEFAULT_OPTIONS
+XORG_WITH_DOXYGEN(1.6.1)
+XORG_CHECK_SGML_DOCTOOLS(1.5)
+
+m4_ifndef([XORG_FONT_MACROS_VERSION], [m4_fatal([must install fontutil 1.1 or later before running autoconf/autogen])])
+XORG_FONT_MACROS_VERSION(1.1)
+
+dnl this gets generated by autoheader, and thus contains all the defines.  we
+dnl don't ever actually use it, internally.
+AC_CONFIG_HEADERS(include/do-not-use-config.h)
+dnl xorg-server.h is an external header, designed to be included by loadable
+dnl drivers.
+AC_CONFIG_HEADERS(include/xorg-server.h)
+dnl dix-config.h covers most of the DIX (i.e. everything but the DDX, not just
+dnl dix/).
+AC_CONFIG_HEADERS(include/dix-config.h)
+dnl xorg-config.h covers the Xorg DDX.
+AC_CONFIG_HEADERS(include/xorg-config.h)
+dnl xkb-config.h covers XKB for the Xorg and Xnest DDXs.
+AC_CONFIG_HEADERS(include/xkb-config.h)
+dnl xwin-config.h covers the XWin DDX.
+AC_CONFIG_HEADERS(include/xwin-config.h)
+dnl kdrive-config.h covers the kdrive DDX
+AC_CONFIG_HEADERS(include/kdrive-config.h)
+dnl version-config.h covers the version numbers so they can be bumped without
+dnl forcing an entire recompile.x
+AC_CONFIG_HEADERS(include/version-config.h)
+
+AM_PROG_AS
+AC_PROG_LN_S
+AC_LIBTOOL_WIN32_DLL
+AC_DISABLE_STATIC
+AC_PROG_LIBTOOL
+AC_PROG_MAKE_SET
+PKG_PROG_PKG_CONFIG
+AC_PROG_LEX
+AC_PROG_YACC
+AC_SYS_LARGEFILE
+XORG_PROG_RAWCPP
+
+# Quoted so that make will expand $(CWARNFLAGS) in makefiles to allow
+# easier overrides at build time.
+XSERVER_CFLAGS='$(CWARNFLAGS)'
+
+dnl Check for dtrace program (needed to build Xserver dtrace probes)
+dnl Also checks for <sys/sdt.h>, since some Linux distros have an 
+dnl ISDN trace program named dtrace
+AC_ARG_WITH(dtrace, AS_HELP_STRING([--with-dtrace=PATH],
+	     [Enable dtrace probes (default: enabled if dtrace found)]),
+	     [WDTRACE=$withval], [WDTRACE=auto])
+if test "x$WDTRACE" = "xyes" -o "x$WDTRACE" = "xauto" ; then
+	AC_PATH_PROG(DTRACE, [dtrace], [not_found], [$PATH:/usr/sbin])
+	if test "x$DTRACE" = "xnot_found" ; then
+		if test "x$WDTRACE" = "xyes" ; then
+			AC_MSG_FAILURE([dtrace requested but not found])
+		fi
+		WDTRACE="no"
+	else
+		AC_CHECK_HEADER(sys/sdt.h, [HAS_SDT_H="yes"], [HAS_SDT_H="no"])
+		if test "x$WDTRACE" = "xauto" -a "x$HAS_SDT_H" = "xno" ; then
+			WDTRACE="no"
+		fi
+	fi
+fi
+if test "x$WDTRACE" != "xno" ; then
+  AC_DEFINE(XSERVER_DTRACE, 1, 
+      [Define to 1 if the DTrace Xserver provider probes should be built in.])
+
+# Solaris/OpenSolaris require dtrace -G to build dtrace probe information into
+# object files, and require linking with those as relocatable objects, not .a
+# archives. MacOS X handles all this in the normal compiler toolchain, and on
+# some releases (like Tiger), will error out on dtrace -G.  For now, other
+# platforms with Dtrace ports are assumed to support -G (the FreeBSD and Linux
+# ports appear to, based on my web searches, but have not yet been tested).
+	case $host_os in
+		darwin*)	SPECIAL_DTRACE_OBJECTS=no ;;
+		*)		SPECIAL_DTRACE_OBJECTS=yes ;;
+	esac
+fi
+AM_CONDITIONAL(XSERVER_DTRACE, [test "x$WDTRACE" != "xno"])
+AM_CONDITIONAL(SPECIAL_DTRACE_OBJECTS, [test "x$SPECIAL_DTRACE_OBJECTS" = "xyes"])
+
+AC_HEADER_DIRENT
+AC_HEADER_STDC
+AC_CHECK_HEADERS([fcntl.h stdlib.h string.h unistd.h dlfcn.h stropts.h fnmatch.h sys/utsname.h])
+
+dnl Checks for typedefs, structures, and compiler characteristics.
+AC_C_CONST
+AC_C_BIGENDIAN([ENDIAN="X_BIG_ENDIAN"], [ENDIAN="X_LITTLE_ENDIAN"])
+
+AC_CHECK_SIZEOF([unsigned long])
+if test "$ac_cv_sizeof_unsigned_long" = 8; then
+	AC_DEFINE(_XSERVER64, 1, [Define to 1 if unsigned long is 64 bits.])
+fi
+
+AC_TYPE_PID_T
+
+# Checks for headers/macros for byte swapping
+# Known variants:
+#	<byteswap.h> bswap_16, bswap_32, bswap_64  (glibc)
+#	<sys/endian.h> __swap16, __swap32, __swap64 (OpenBSD)
+#	<sys/endian.h> bswap16, bswap32, bswap64 (other BSD's)
+#	and a fallback to local macros if none of the above are found
+
+# if <byteswap.h> is found, assume it's the correct version
+AC_CHECK_HEADERS([byteswap.h])
+
+# if <sys/endian.h> is found, have to check which version
+AC_CHECK_HEADER([sys/endian.h], [HAVE_SYS_ENDIAN_H="yes"], [HAVE_SYS_ENDIAN_H="no"])
+
+if test "x$HAVE_SYS_ENDIAN_H" = "xyes" ; then
+	AC_MSG_CHECKING([for __swap16 variant of <sys/endian.h> byteswapping macros])
+	AC_LINK_IFELSE([AC_LANG_PROGRAM([
+#include <sys/types.h>
+#include <sys/endian.h>
+ ], [
+int a = 1, b;
+b = __swap16(a);
+ ])
+], [SYS_ENDIAN__SWAP='yes'], [SYS_ENDIAN__SWAP='no'])
+	AC_MSG_RESULT([$SYS_ENDIAN__SWAP])
+
+	AC_MSG_CHECKING([for bswap16 variant of <sys/endian.h> byteswapping macros])
+	AC_LINK_IFELSE([AC_LANG_PROGRAM([
+#include <sys/types.h>
+#include <sys/endian.h>
+ ], [
+int a = 1, b;
+b = bswap16(a);
+ ])
+], [SYS_ENDIAN_BSWAP='yes'], [SYS_ENDIAN_BSWAP='no'])
+	AC_MSG_RESULT([$SYS_ENDIAN_BSWAP])
+
+    	if test "$SYS_ENDIAN_BSWAP" = "yes" ; then
+		USE_SYS_ENDIAN_H=yes
+		BSWAP=bswap
+	else	
+	    	if test "$SYS_ENDIAN__SWAP" = "yes" ; then
+			USE_SYS_ENDIAN_H=yes
+			BSWAP=__swap
+		else
+			USE_SYS_ENDIAN_H=no
+		fi
+	fi
+
+	if test "$USE_SYS_ENDIAN_H" = "yes" ; then
+	    AC_DEFINE([USE_SYS_ENDIAN_H], 1, 
+		[Define to use byteswap macros from <sys/endian.h>])
+	    AC_DEFINE_UNQUOTED([bswap_16], ${BSWAP}16, 
+			[Define to 16-bit byteswap macro])
+	    AC_DEFINE_UNQUOTED([bswap_32], ${BSWAP}32, 
+			[Define to 32-bit byteswap macro])
+	    AC_DEFINE_UNQUOTED([bswap_64], ${BSWAP}64, 
+			[Define to 64-bit byteswap macro])
+	fi
+fi
+
+dnl Check to see if dlopen is in default libraries (like Solaris, which
+dnl has it in libc), or if libdl is needed to get it.
+AC_CHECK_FUNC([dlopen], [],
+	AC_CHECK_LIB([dl], [dlopen], DLOPEN_LIBS="-ldl"))
+AC_SUBST(DLOPEN_LIBS)
+
+dnl Checks for library functions.
+AC_FUNC_VPRINTF
+AC_CHECK_FUNCS([geteuid getuid link memmove memset mkstemp strchr strrchr \
+		strtol getopt getopt_long vsnprintf walkcontext backtrace \
+		getisax getzoneid shmctl64 strcasestr ffs vasprintf])
+AC_FUNC_ALLOCA
+dnl Old HAS_* names used in os/*.c.
+AC_CHECK_FUNC([getdtablesize],
+	AC_DEFINE(HAS_GETDTABLESIZE, 1, [Have the 'getdtablesize' function.]))
+AC_CHECK_FUNC([getifaddrs],
+	AC_DEFINE(HAS_GETIFADDRS, 1, [Have the 'getifaddrs' function.]))
+AC_CHECK_FUNC([getpeereid],
+	AC_DEFINE(HAS_GETPEEREID, 1, [Have the 'getpeereid' function.]))
+AC_CHECK_FUNC([getpeerucred],
+	AC_DEFINE(HAS_GETPEERUCRED, 1, [Have the 'getpeerucred' function.]))
+AC_CHECK_FUNC([strlcat], HAVE_STRLCAT=yes, HAVE_STRLCAT=no)
+AM_CONDITIONAL(NEED_STRLCAT, [test x$HAVE_STRLCAT = xno])	
+AC_CHECK_FUNC([strlcpy], AC_DEFINE(HAS_STRLCPY, 1, [Have the 'strlcpy' function]))
+
+AM_CONDITIONAL(NEED_VSNPRINTF, [test x$HAVE_VSNPRINTF = xno])
+
+dnl Check for mmap support for Xvfb
+AC_CHECK_FUNC([mmap], AC_DEFINE(HAS_MMAP, 1, [Have the 'mmap' function.]))
+
+dnl Find the math libary
+AC_CHECK_LIB(m, sqrt)
+AC_CHECK_LIB(m, cbrt, AC_DEFINE(HAVE_CBRT, 1, [Have the 'cbrt' function]))
+
+AC_CHECK_HEADERS([ndbm.h dbm.h rpcsvc/dbm.h])
+
+dnl AGPGART headers
+AC_CHECK_HEADERS([linux/agpgart.h sys/agpio.h sys/agpgart.h], AGP=yes)
+AM_CONDITIONAL(AGP, [test "x$AGP" = xyes])
+
+dnl APM header
+AC_CHECK_HEADERS([linux/apm_bios.h], LNXAPM=yes)
+AM_CONDITIONAL(LNXAPM, [test "x$LNXAPM" = xyes])
+
+dnl fbdev header
+AC_CHECK_HEADERS([linux/fb.h], FBDEV=yes)
+AM_CONDITIONAL(FBDEVHW, [test "x$FBDEV" = xyes])
+
+dnl MTRR header
+AC_CHECK_HEADERS([asm/mtrr.h], ac_cv_asm_mtrr_h=yes)
+if test "x$ac_cv_asm_mtrr_h" = xyes; then
+	HAVE_MTRR=yes
+fi
+
+dnl BSD MTRR header
+AC_CHECK_HEADERS([sys/memrange.h], ac_cv_memrange_h=yes)
+if test "x$ac_cv_memrange_h" = xyes; then
+	HAVE_MTRR=yes
+fi
+
+if test "x$HAVE_MTRR" = xyes; then
+	AC_DEFINE(HAS_MTRR_SUPPORT, 1, [MTRR support available])
+fi
+
+dnl A NetBSD MTRR header
+AC_CHECK_HEADERS([machine/mtrr.h], ac_cv_machine_mtrr_h=yes)
+if test "x$ac_cv_machine_mtrr_h" = xyes; then
+	AC_DEFINE(HAS_MTRR_BUILTIN, 1, [Define to 1 if NetBSD built-in MTRR
+		support is available])
+fi
+
+dnl FreeBSD kldload support (sys/linker.h)
+AC_CHECK_HEADERS([sys/linker.h],
+	[ac_cv_sys_linker_h=yes],
+	[ac_cv_sys_linker_h=no],
+	[#include <sys/param.h>])
+AM_CONDITIONAL(FREEBSD_KLDLOAD, [test "x$ac_cv_sys_linker_h" = xyes])
+
+AC_CACHE_CHECK([for SYSV IPC],
+		ac_cv_sysv_ipc,
+		[AC_TRY_LINK([
+#include <sys/types.h>
+#include <sys/ipc.h>
+#include <sys/shm.h>
+],[
+{ 
+    int id;
+    id = shmget(IPC_PRIVATE, 512, SHM_W | SHM_R);
+    if (id < 0) return -1;
+    return shmctl(id, IPC_RMID, 0);
+}],
+	[ac_cv_sysv_ipc=yes],
+	[ac_cv_sysv_ipc=no])])
+if test "x$ac_cv_sysv_ipc" = xyes; then
+	AC_DEFINE(HAVE_SYSV_IPC, 1, [Define to 1 if SYSV IPC is available])
+fi
+
+dnl OpenBSD /dev/xf86 aperture driver 
+if test -c /dev/xf86 ; then
+	AC_DEFINE(HAS_APERTURE_DRV, 1, [System has /dev/xf86 aperture driver])
+fi
+
+dnl BSD APM support 
+AC_CHECK_HEADER([machine/apmvar.h],[
+	AC_CHECK_HEADER([sys/event.h],
+		ac_cv_BSD_KQUEUE_APM=yes,
+		ac_cv_BSD_APM=yes)])
+
+AM_CONDITIONAL(BSD_APM, [test "x$ac_cv_BSD_APM" = xyes])
+AM_CONDITIONAL(BSD_KQUEUE_APM, [test "x$ac_cv_BSD_KQUEUE_APM" = xyes])
+	
+dnl glibc backtrace support check (hw/xfree86/common/xf86Events.c)
+AC_CHECK_HEADER([execinfo.h],[
+    AC_CHECK_LIB(c, backtrace, [
+        AC_DEFINE(HAVE_BACKTRACE, 1, [Has backtrace support])
+        AC_DEFINE(HAVE_EXECINFO_H, 1, [Have execinfo.h])
+    ])]
+)
+
+dnl ARM needs additional compiler flags for proper backtraces if GCC is
+dnl used. Compile a dummy program with the -mapcs-frame option. If it
+dnl succeeds, we know that we are building for ARM with GCC.
+old_CFLAGS="$CFLAGS"
+CFLAGS="-mapcs-frame"
+AC_COMPILE_IFELSE(
+        AC_LANG_PROGRAM([[ ]]),
+        ARM_BACKTRACE_CFLAGS="$CFLAGS",
+        ARM_BACKTRACE_CFLAGS=""
+)
+CFLAGS="$old_CFLAGS"
+AC_SUBST(ARM_BACKTRACE_CFLAGS)
+
+dnl ---------------------------------------------------------------------------
+dnl Bus options and CPU capabilities.  Replaces logic in
+dnl hw/xfree86/os-support/bus/Makefile.am, among others.
+dnl ---------------------------------------------------------------------------
+DEFAULT_INT10="x86emu"
+
+dnl Override defaults as needed for specific platforms:
+
+case $host_cpu in
+  alpha*)
+	ALPHA_VIDEO=yes
+	case $host_os in
+	        *freebsd*)	SYS_LIBS=-lio ;;
+		*netbsd*)	AC_DEFINE(USE_ALPHA_PIO, 1, [NetBSD PIO alpha IO]) ;;
+	esac
+	GLX_ARCH_DEFINES="-D__GLX_ALIGN64 -mieee"
+	;;
+  arm*)
+	ARM_VIDEO=yes
+	;;
+  i*86)
+	I386_VIDEO=yes
+	case $host_os in
+		*freebsd*)	AC_DEFINE(USE_DEV_IO) ;;
+		*dragonfly*)	AC_DEFINE(USE_DEV_IO) ;;
+		*netbsd*)	AC_DEFINE(USE_I386_IOPL)
+				SYS_LIBS=-li386
+				;;
+		*openbsd*)	AC_DEFINE(USE_I386_IOPL) 
+				SYS_LIBS=-li386
+				;;
+	esac
+        ;;
+  powerpc*)
+	PPC_VIDEO=yes
+	case $host_os in
+		*freebsd*)	DEFAULT_INT10=stub ;;
+	esac
+	;;
+  sparc*)
+	SPARC64_VIDEO=yes
+	BSD_ARCH_SOURCES="sparc64_video.c ioperm_noop.c"
+	GLX_ARCH_DEFINES="-D__GLX_ALIGN64"
+	;;
+  x86_64*|amd64*)
+	I386_VIDEO=yes
+	case $host_os in
+		*freebsd*)	AC_DEFINE(USE_DEV_IO, 1, [BSD /dev/io]) ;;
+		*dragonfly*)	AC_DEFINE(USE_DEV_IO, 1, [BSD /dev/io]) ;;
+		*netbsd*)	AC_DEFINE(USE_I386_IOPL, 1, [BSD i386 iopl])
+				SYS_LIBS=-lx86_64
+				;;
+		*openbsd*)	AC_DEFINE(USE_AMD64_IOPL, 1, [BSD AMD64 iopl])
+				SYS_LIBS=-lamd64
+				;;
+	esac
+	GLX_ARCH_DEFINES="-D__GLX_ALIGN64"
+	;;
+  ia64*)
+  	GLX_ARCH_DEFINES="-D__GLX_ALIGN64"
+	;;
+  s390*)
+  	GLX_ARCH_DEFINES="-D__GLX_ALIGN64"
+	;;
+esac
+AC_SUBST(GLX_ARCH_DEFINES)
+
+dnl BSD *_video.c selection
+AM_CONDITIONAL(ALPHA_VIDEO, [test "x$ALPHA_VIDEO" = xyes])
+AM_CONDITIONAL(ARM_VIDEO, [test "x$ARM_VIDEO" = xyes])
+AM_CONDITIONAL(I386_VIDEO, [test "x$I386_VIDEO" = xyes])
+AM_CONDITIONAL(PPC_VIDEO, [test "x$PPC_VIDEO" = xyes])
+AM_CONDITIONAL(SPARC64_VIDEO, [test "x$SPARC64_VIDEO" = xyes])
+
+DRI=no
+USE_SIGIO_BY_DEFAULT="yes"
+dnl it would be nice to autodetect these *CONS_SUPPORTs
+case $host_os in
+  *freebsd* | *dragonfly*)
+	case $host_os in
+		kfreebsd*-gnu) ;;
+		*) AC_DEFINE(CSRG_BASED, 1, [System is BSD-like]) ;;
+	esac
+	AC_DEFINE(PCCONS_SUPPORT, 1, [System has PC console])
+	AC_DEFINE(PCVT_SUPPORT, 1, [System has PCVT console])
+	AC_DEFINE(SYSCONS_SUPPORT, 1, [System has syscons console])
+	DRI=yes
+	;;
+  *netbsd*)
+	AC_DEFINE(CSRG_BASED, 1, [System is BSD-like])
+	AC_DEFINE(PCCONS_SUPPORT, 1, [System has PC console])
+	AC_DEFINE(PCVT_SUPPORT, 1, [System has PCVT console])
+	AC_DEFINE(WSCONS_SUPPORT, 1, [System has wscons console])
+	DRI=yes
+	;;
+  *openbsd*)
+	AC_DEFINE(CSRG_BASED, 1, [System is BSD-like])
+	AC_DEFINE(PCVT_SUPPORT, 1, [System has PC console])
+	AC_DEFINE(WSCONS_SUPPORT, 1, [System has wscons console])
+	;;
+  *linux*)
+	DRI=yes
+	;;
+  *solaris*)
+	PKG_CHECK_EXISTS(libdrm, DRI=yes, DRI=no)
+	# Disable use of SIGIO by default until some system bugs are
+	# fixed - see Sun/OpenSolaris bug id 6879897
+	USE_SIGIO_BY_DEFAULT="no"
+	;;
+  darwin*)
+	AC_DEFINE(CSRG_BASED, 1, [System is BSD-like])
+	;;
+  cygwin*)
+	CFLAGS="$CFLAGS -DFD_SETSIZE=256"
+	;;
+esac
+
+dnl augment XORG_RELEASE_VERSION for our snapshot number and to expose the
+dnl major number
+PVMAJOR=`echo $PACKAGE_VERSION | cut -d . -f 1`
+PVS=`echo $PACKAGE_VERSION | cut -d . -f 4 | cut -d - -f 1`
+if test "x$PVS" = "x"; then
+	PVS="0"
+fi
+
+VENDOR_RELEASE="((($PVMAJOR) * 10000000) + (($PVM) * 100000) + (($PVP) * 1000) + $PVS)"
+VENDOR_MAN_VERSION="Version ${PACKAGE_VERSION}"
+
+VENDOR_NAME="The X.Org Foundation"
+VENDOR_NAME_SHORT="X.Org"
+VENDOR_WEB="http://wiki.x.org"
+
+m4_ifdef([AS_HELP_STRING], , [m4_define([AS_HELP_STRING], m4_defn([AC_HELP_STRING]))])
+
+dnl Build options.
+AC_ARG_ENABLE(werror,        AS_HELP_STRING([--enable-werror],
+		  [Obsolete - use --enable-strict-compilation instead]),
+  AC_MSG_ERROR([--enable-werror has been replaced by --enable-strict-compilation]))
+
+AC_ARG_ENABLE(debug,         AS_HELP_STRING([--enable-debug],
+				  [Enable debugging (default: disabled)]),
+			        [DEBUGGING=$enableval], [DEBUGGING=no])
+AC_ARG_ENABLE(unit-tests,    AS_HELP_STRING([--enable-unit-tests],
+                                  [Enable unit-tests (default: auto)]),
+                                [UNITTESTS=$enableval], [UNITTESTS=auto])
+AC_ARG_ENABLE(use-sigio-by-default, AS_HELP_STRING([--enable-use-sigio-by-default]
+  [Enable SIGIO input handlers by default (default: $USE_SIGIO_BY_DEFAULT)]),
+                                [USE_SIGIO_BY_DEFAULT=$enableval], [])
+AC_ARG_WITH(int10,           AS_HELP_STRING([--with-int10=BACKEND], [int10 backend: vm86, x86emu or stub]),
+				[INT10="$withval"],
+				[INT10="$DEFAULT_INT10"])
+AC_ARG_WITH(vendor-name,     AS_HELP_STRING([--with-vendor-name=VENDOR],
+				  [Vendor string reported by the server]),
+				[ VENDOR_NAME="$withval" ], [])
+AC_ARG_WITH(vendor-name-short, AS_HELP_STRING([--with-vendor-name-short=VENDOR],
+				  [Short version of vendor string reported by the server]),
+				[ VENDOR_NAME_SHORT="$withval" ], [])
+AC_ARG_WITH(vendor-web,      AS_HELP_STRING([--with-vendor-web=URL],
+				  [Vendor web address reported by the server]),
+				[ VENDOR_WEB="$withval" ], [])
+AC_ARG_WITH(module-dir,      AS_HELP_STRING([--with-module-dir=DIR],
+				  [Directory where modules are installed (default: $libdir/xorg/modules)]),
+				[ moduledir="$withval" ],
+				[ moduledir="${libdir}/xorg/modules" ])
+AC_ARG_WITH(log-dir,         AS_HELP_STRING([--with-log-dir=DIR],
+				  [Directory where log files are kept (default: $localstatedir/log)]),
+				[ logdir="$withval" ],
+				[ logdir="$localstatedir/log" ])
+AC_ARG_WITH(builder-addr,    AS_HELP_STRING([--with-builder-addr=ADDRESS],
+				  [Builder address (default: xorg@lists.freedesktop.org)]),
+				[ BUILDERADDR="$withval" ],
+				[ BUILDERADDR="xorg@lists.freedesktop.org" ])
+AC_ARG_WITH(os-name,         AS_HELP_STRING([--with-os-name=OSNAME], [Name of OS (default: output of "uname -srm")]),
+				[ OSNAME="$withval" ],
+				[ OSNAME=`uname -srm` ])
+AC_ARG_WITH(os-vendor,       AS_HELP_STRING([--with-os-vendor=OSVENDOR], [Name of OS vendor]),
+				[ OSVENDOR="$withval" ],
+				[ OSVENDOR="" ])
+AC_ARG_WITH(builderstring,   AS_HELP_STRING([--with-builderstring=BUILDERSTRING], [Additional builder string]),
+				[ BUILDERSTRING="$withval" ]
+				[ ])
+
+dnl Determine font path
+XORG_FONTROOTDIR
+XORG_FONTSUBDIR(FONTMISCDIR, fontmiscdir, misc)
+XORG_FONTSUBDIR(FONTOTFDIR, fontotfdir, OTF)
+XORG_FONTSUBDIR(FONTTTFDIR, fontttfdir, TTF)
+XORG_FONTSUBDIR(FONTTYPE1DIR, fonttype1dir, Type1)
+XORG_FONTSUBDIR(FONT75DPIDIR, font75dpidir, 75dpi)
+XORG_FONTSUBDIR(FONT100DPIDIR, font100dpidir, 100dpi)
+
+dnl Uses --default-font-path if set, otherwise checks for /etc/X11/fontpath.d,
+dnl otherwise uses standard subdirectories of FONTROOTDIR. When cross
+dnl compiling, assume default font path uses standard FONTROOTDIR directories.
+DEFAULT_FONT_PATH="${FONTMISCDIR}/,${FONTTTFDIR}/,${FONTOTFDIR}/,${FONTTYPE1DIR}/,${FONT100DPIDIR}/,${FONT75DPIDIR}/"
+if test "$cross_compiling" != yes; then
+	AC_CHECK_FILE([${sysconfdir}/X11/fontpath.d],
+		[DEFAULT_FONT_PATH='catalogue:${sysconfdir}/X11/fontpath.d'],
+		[case $host_os in
+			darwin*) DEFAULT_FONT_PATH="${DEFAULT_FONT_PATH},/Library/Fonts,/System/Library/Fonts" ;;
+		esac])
+fi
+AC_ARG_WITH(default-font-path, AS_HELP_STRING([--with-default-font-path=PATH], [Comma separated list of font dirs]),
+				[ FONTPATH="$withval" ],
+				[ FONTPATH="${DEFAULT_FONT_PATH}" ])
+
+AC_MSG_CHECKING([for default font path])
+AC_MSG_RESULT([$FONTPATH])
+
+AC_ARG_WITH(xkb-path,         AS_HELP_STRING([--with-xkb-path=PATH], [Path to XKB base dir (default: ${datadir}/X11/xkb)]),
+				[ XKBPATH="$withval" ],
+				[ XKBPATH="${datadir}/X11/xkb" ])
+AC_ARG_WITH(xkb-output,       AS_HELP_STRING([--with-xkb-output=PATH], [Path to XKB output dir (default: ${datadir}/X11/xkb/compiled)]),
+				[ XKBOUTPUT="$withval" ],
+				[ XKBOUTPUT="compiled" ])
+AC_ARG_WITH(default-xkb-rules, AS_HELP_STRING([--with-default-xkb-rules=RULES],
+                                   [Keyboard ruleset (default: base/evdev)]),
+                                [ XKB_DFLT_RULES="$withval" ],
+                                [ XKB_DFLT_RULES="" ])
+AC_ARG_WITH(default-xkb-model, AS_HELP_STRING([--with-default-xkb-model=MODEL],
+                                   [Keyboard model (default: pc105)]),
+                                [ XKB_DFLT_MODEL="$withval" ],
+                                [ XKB_DFLT_MODEL="pc105" ])
+AC_ARG_WITH(default-xkb-layout, AS_HELP_STRING([--with-default-xkb-layout=LAYOUT],
+                                   [Keyboard layout (default: us)]),
+                                [ XKB_DFLT_LAYOUT="$withval" ],
+                                [ XKB_DFLT_LAYOUT="us" ])
+AC_ARG_WITH(default-xkb-variant, AS_HELP_STRING([--with-default-xkb-variant=VARIANT],
+                                   [Keyboard variant (default: (none))]),
+                                [ XKB_DFLT_VARIANT="$withval" ],
+                                [ XKB_DFLT_VARIANT="" ])
+AC_ARG_WITH(default-xkb-options, AS_HELP_STRING([--with-default-xkb-options=OPTIONS],
+                                   [Keyboard layout options (default: (none))]),
+                                [ XKB_DFLT_OPTIONS="$withval" ],
+                                [ XKB_DFLT_OPTIONS="" ])
+AC_ARG_WITH(serverconfig-path, AS_HELP_STRING([--with-serverconfig-path=PATH],
+				   [Directory where ancillary server config files are installed (default: ${libdir}/xorg)]),
+				[ SERVERCONFIG="$withval" ],
+				[ SERVERCONFIG="${libdir}/xorg" ])
+AC_ARG_WITH(apple-applications-dir,AS_HELP_STRING([--with-apple-applications-dir=PATH], [Path to the Applications directory (default: /Applications/Utilities)]),
+				[ APPLE_APPLICATIONS_DIR="${withval}" ],
+				[ APPLE_APPLICATIONS_DIR="/Applications/Utilities" ])
+AC_SUBST([APPLE_APPLICATIONS_DIR])
+AC_ARG_WITH(apple-application-name,AS_HELP_STRING([--with-apple-application-name=NAME], [Name for the .app (default: X11)]),
+				[ APPLE_APPLICATION_NAME="${withval}" ],
+				[ APPLE_APPLICATION_NAME="X11" ])
+AC_SUBST([APPLE_APPLICATION_NAME])
+AC_ARG_WITH(launchd-id-prefix,  AS_HELP_STRING([--with-launchd-id-prefix=PATH], [Prefix to use for launchd identifiers (default: org.x)]),
+                                [ LAUNCHD_ID_PREFIX="${withval}" ],
+                                [ LAUNCHD_ID_PREFIX="org.x" ])
+AC_SUBST([LAUNCHD_ID_PREFIX])
+AC_DEFINE_UNQUOTED(LAUNCHD_ID_PREFIX, "$LAUNCHD_ID_PREFIX", [Prefix to use for launchd identifiers])
+AC_ARG_ENABLE(sparkle,AS_HELP_STRING([--enable-sparkle], [Enable updating of X11.app using the Sparkle Framework (default: disabled)]),
+				[ XQUARTZ_SPARKLE="${enableval}" ],
+				[ XQUARTZ_SPARKLE="no" ])
+AC_SUBST([XQUARTZ_SPARKLE])
+AC_ARG_ENABLE(install-libxf86config,
+				AS_HELP_STRING([--enable-install-libxf86config],
+				[Install libxf86config (default: disabled)]),
+				[INSTALL_LIBXF86CONFIG=$enableval],
+				[INSTALL_LIBXF86CONFIG=no])
+AC_ARG_ENABLE(visibility,     AC_HELP_STRING([--enable-visibility], [Enable symbol visibility (default: auto)]),
+				[SYMBOL_VISIBILITY=$enableval],
+				[SYMBOL_VISIBILITY=auto])
+AC_ARG_ENABLE(pc98,     	AC_HELP_STRING([--enable-pc98], [Enable PC98 support in Xorg (default: auto)]),
+				[SUPPORT_PC98=$enableval],
+				[SUPPORT_PC98=auto])
+
+dnl GLX build options
+AC_ARG_ENABLE(aiglx,          AS_HELP_STRING([--enable-aiglx], [Build accelerated indirect GLX (default: enabled)]),
+                                [AIGLX=$enableval],
+                                [AIGLX=yes])
+AC_ARG_ENABLE(glx-tls,        AS_HELP_STRING([--enable-glx-tls], [Build GLX with TLS support (default: disabled)]),
+                                [GLX_USE_TLS=$enableval],
+                                [GLX_USE_TLS=no])
+
+dnl Extensions.
+AC_ARG_ENABLE(registry,       AS_HELP_STRING([--disable-registry], [Build string registry module (default: enabled)]), [XREGISTRY=$enableval], [XREGISTRY=yes])
+AC_ARG_ENABLE(composite,      AS_HELP_STRING([--disable-composite], [Build Composite extension (default: enabled)]), [COMPOSITE=$enableval], [COMPOSITE=yes])
+AC_ARG_ENABLE(mitshm,         AS_HELP_STRING([--disable-shm], [Build SHM extension (default: enabled)]), [MITSHM=$enableval], [MITSHM=yes])
+AC_ARG_ENABLE(xres,           AS_HELP_STRING([--disable-xres], [Build XRes extension (default: enabled)]), [RES=$enableval], [RES=yes])
+AC_ARG_ENABLE(record,         AS_HELP_STRING([--disable-record], [Build Record extension (default: enabled)]), [RECORD=$enableval], [RECORD=yes])
+AC_ARG_ENABLE(xv,             AS_HELP_STRING([--disable-xv], [Build Xv extension (default: enabled)]), [XV=$enableval], [XV=yes])
+AC_ARG_ENABLE(xvmc,           AS_HELP_STRING([--disable-xvmc], [Build XvMC extension (default: enabled)]), [XVMC=$enableval], [XVMC=yes])
+AC_ARG_ENABLE(dga,            AS_HELP_STRING([--disable-dga], [Build DGA extension (default: auto)]), [DGA=$enableval], [DGA=auto])
+AC_ARG_ENABLE(screensaver,    AS_HELP_STRING([--disable-screensaver], [Build ScreenSaver extension (default: enabled)]), [SCREENSAVER=$enableval], [SCREENSAVER=yes])
+AC_ARG_ENABLE(xdmcp,          AS_HELP_STRING([--disable-xdmcp], [Build XDMCP extension (default: auto)]), [XDMCP=$enableval], [XDMCP=auto])
+AC_ARG_ENABLE(xdm-auth-1,     AS_HELP_STRING([--disable-xdm-auth-1], [Build XDM-Auth-1 extension (default: auto)]), [XDMAUTH=$enableval], [XDMAUTH=auto])
+AC_ARG_ENABLE(glx,            AS_HELP_STRING([--disable-glx], [Build GLX extension (default: enabled)]), [GLX=$enableval], [GLX=yes])
+AC_ARG_ENABLE(dri,            AS_HELP_STRING([--enable-dri], [Build DRI extension (default: auto)]), [DRI=$enableval])
+AC_ARG_ENABLE(dri2,           AS_HELP_STRING([--enable-dri2], [Build DRI2 extension (default: auto)]), [DRI2=$enableval], [DRI2=auto])
+AC_ARG_ENABLE(xinerama,	      AS_HELP_STRING([--disable-xinerama], [Build Xinerama extension (default: enabled)]), [XINERAMA=$enableval], [XINERAMA=yes])
+AC_ARG_ENABLE(xf86vidmode,    AS_HELP_STRING([--disable-xf86vidmode], [Build XF86VidMode extension (default: auto)]), [XF86VIDMODE=$enableval], [XF86VIDMODE=auto])
+AC_ARG_ENABLE(xace,           AS_HELP_STRING([--disable-xace], [Build X-ACE extension (default: enabled)]), [XACE=$enableval], [XACE=yes])
+AC_ARG_ENABLE(xselinux,       AS_HELP_STRING([--enable-xselinux], [Build SELinux extension (default: disabled)]), [XSELINUX=$enableval], [XSELINUX=no])
+AC_ARG_ENABLE(xcsecurity,     AS_HELP_STRING([--enable-xcsecurity], [Build Security extension (default: disabled)]), [XCSECURITY=$enableval], [XCSECURITY=no])
+AC_ARG_ENABLE(xcalibrate,     AS_HELP_STRING([--enable-xcalibrate], [Build XCalibrate extension (default: disabled)]), [XCALIBRATE=$enableval], [XCALIBRATE=no])
+AC_ARG_ENABLE(tslib,          AS_HELP_STRING([--enable-tslib], [Build kdrive tslib touchscreen support (default: disabled)]), [TSLIB=$enableval], [TSLIB=no])
+AC_ARG_ENABLE(dbe,            AS_HELP_STRING([--disable-dbe], [Build DBE extension (default: enabled)]), [DBE=$enableval], [DBE=yes])
+AC_ARG_ENABLE(xf86bigfont,    AS_HELP_STRING([--enable-xf86bigfont], [Build XF86 Big Font extension (default: disabled)]), [XF86BIGFONT=$enableval], [XF86BIGFONT=no])
+AC_ARG_ENABLE(dpms,           AS_HELP_STRING([--disable-dpms], [Build DPMS extension (default: enabled)]), [DPMSExtension=$enableval], [DPMSExtension=yes])
+AC_ARG_ENABLE(config-udev,    AS_HELP_STRING([--enable-config-udev], [Build udev support (default: auto)]), [CONFIG_UDEV=$enableval], [CONFIG_UDEV=auto])
+AC_ARG_ENABLE(config-dbus,    AS_HELP_STRING([--enable-config-dbus], [Build D-BUS API support (default: no)]), [CONFIG_DBUS_API=$enableval], [CONFIG_DBUS_API=no])
+AC_ARG_ENABLE(config-hal,     AS_HELP_STRING([--disable-config-hal], [Build HAL support (default: auto)]), [CONFIG_HAL=$enableval], [CONFIG_HAL=auto])
+AC_ARG_ENABLE(xfree86-utils,     AS_HELP_STRING([--enable-xfree86-utils], [Build xfree86 DDX utilities (default: enabled)]), [XF86UTILS=$enableval], [XF86UTILS=yes])
+AC_ARG_ENABLE(xaa,               AS_HELP_STRING([--enable-xaa], [Build XAA (default: enabled)]), [XAA=$enableval], [XAA=yes])
+AC_ARG_ENABLE(vgahw,          AS_HELP_STRING([--enable-vgahw], [Build Xorg with vga access (default: enabled)]), [VGAHW=$enableval], [VGAHW=yes])
+AC_ARG_ENABLE(vbe,            AS_HELP_STRING([--enable-vbe], [Build Xorg with VBE module (default: enabled)]), [VBE=$enableval], [VBE=yes])
+AC_ARG_ENABLE(int10-module,     AS_HELP_STRING([--enable-int10-module], [Build Xorg with int10 module (default: enabled)]), [INT10MODULE=$enableval], [INT10MODULE=yes])
+AC_ARG_ENABLE(windowswm,      AS_HELP_STRING([--enable-windowswm], [Build XWin with WindowsWM extension (default: no)]), [WINDOWSWM=$enableval], [WINDOWSWM=no])
+AC_ARG_ENABLE(libdrm,         AS_HELP_STRING([--enable-libdrm], [Build Xorg with libdrm support (default: enabled)]), [DRM=$enableval],[DRM=yes])
+
+dnl DDXes.
+AC_ARG_ENABLE(xorg,    	      AS_HELP_STRING([--enable-xorg], [Build Xorg server (default: auto)]), [XORG=$enableval], [XORG=auto])
+AC_ARG_ENABLE(dmx,    	      AS_HELP_STRING([--enable-dmx], [Build DMX server (default: auto)]), [DMX=$enableval], [DMX=auto])
+AC_ARG_ENABLE(xvfb,    	      AS_HELP_STRING([--enable-xvfb], [Build Xvfb server (default: yes)]), [XVFB=$enableval], [XVFB=yes])
+AC_ARG_ENABLE(xnest,   	      AS_HELP_STRING([--enable-xnest], [Build Xnest server (default: auto)]), [XNEST=$enableval], [XNEST=auto])
+AC_ARG_ENABLE(xquartz,        AS_HELP_STRING([--enable-xquartz], [Build Xquartz server for OS-X (default: auto)]), [XQUARTZ=$enableval], [XQUARTZ=auto])
+AC_ARG_ENABLE(standalone-xpbproxy, AS_HELP_STRING([--enable-standalone-xpbproxy], [Build a standalone xpbproxy (in addition to the one integrated into Xquartz as a separate thread) (default: no)]), [STANDALONE_XPBPROXY=$enableval], [STANDALONE_XPBPROXY=no])
+AC_ARG_ENABLE(xwin,    	      AS_HELP_STRING([--enable-xwin], [Build XWin server (default: auto)]), [XWIN=$enableval], [XWIN=auto])
+dnl kdrive and its subsystems
+AC_ARG_ENABLE(kdrive,         AS_HELP_STRING([--enable-kdrive], [Build kdrive servers (default: no)]), [KDRIVE=$enableval], [KDRIVE=no])
+AC_ARG_ENABLE(xephyr,         AS_HELP_STRING([--enable-xephyr], [Build the kdrive Xephyr server (default: auto)]), [XEPHYR=$enableval], [XEPHYR=auto])
+AC_ARG_ENABLE(xfake,          AS_HELP_STRING([--enable-xfake], [Build the kdrive 'fake' server (default: auto)]), [XFAKE=$enableval], [XFAKE=auto])
+AC_ARG_ENABLE(xfbdev,         AS_HELP_STRING([--enable-xfbdev], [Build the kdrive framebuffer device server (default: auto)]), [XFBDEV=$enableval], [XFBDEV=auto])
+dnl kdrive options
+AC_ARG_ENABLE(kdrive-kbd,     AS_HELP_STRING([--enable-kdrive-kbd], [Build kbd driver for kdrive (default: auto)]), [KDRIVE_KBD=$enableval], [KDRIVE_KBD=auto])
+AC_ARG_ENABLE(kdrive-mouse,   AC_HELP_STRING([--enable-kdrive-mouse], [Build mouse driver for kdrive (default: auto)]), [KDRIVE_MOUSE=$enableval], [KDRIVE_MOUSE=auto])
+AC_ARG_ENABLE(kdrive-evdev,   AC_HELP_STRING([--enable-kdrive-evdev], [Build evdev driver for kdrive (default: auto)]), [KDRIVE_EVDEV=$enableval], [KDRIVE_EVDEV=auto])
+
+
+dnl chown/chmod to be setuid root as part of build
+dnl Replaces InstallXserverSetUID in imake
+AC_ARG_ENABLE(install-setuid, 
+    AS_HELP_STRING([--enable-install-setuid],
+       [Install Xorg server as owned by root with setuid bit (default: auto)]),
+    [SETUID=$enableval], [SETUID=auto])
+AC_MSG_CHECKING([to see if we can install the Xorg server as root])
+if test "x$SETUID" = "xauto" ; then
+	case $host_os in
+	    cygwin*)		SETUID="no"  ;;
+	    darwin*)		SETUID="no"  ;;
+	    *)
+	   	case $host_cpu in
+		    sparc)	SETUID="no"  ;;
+		    *)		SETUID="yes" ;;
+		esac
+	esac
+	if test "x$SETUID" = xyes; then
+		touch testfile
+		chown root testfile > /dev/null 2>&1 || SETUID="no"
+		rm -f testfile
+	fi
+fi
+AC_MSG_RESULT([$SETUID])
+AM_CONDITIONAL(INSTALL_SETUID, [test "x$SETUID" = "xyes"])
+
+dnl Issue an error if xtrans.m4 was not found and XTRANS_CONNECTION_FLAGS macro
+dnl was not expanded, since xorg-server with no transport types is rather useless.
+dnl
+dnl If you're seeing an error here, be sure you installed the lib/xtrans module
+dnl first and if it's not in the default location, that you set the ACLOCAL
+dnl environment variable to find it, such as:
+dnl	ACLOCAL="aclocal -I ${PREFIX}/share/aclocal"
+m4_pattern_forbid([^XTRANS_CONNECTION_FLAGS$])
+
+# Transport selection macro from xtrans.m4
+XTRANS_CONNECTION_FLAGS
+
+# Secure RPC detection macro from xtrans.m4
+XTRANS_SECURE_RPC_FLAGS
+AM_CONDITIONAL(SECURE_RPC, [test "x$SECURE_RPC" = xyes])
+
+AM_CONDITIONAL(INT10_VM86, [test "x$INT10" = xvm86])
+AM_CONDITIONAL(INT10_X86EMU, [test "x$INT10" = xx86emu])
+AM_CONDITIONAL(INT10_STUB, [test "x$INT10" = xstub])
+if test "x$INT10" = xyes; then
+	dnl VM86 headers
+	AC_CHECK_HEADERS([sys/vm86.h sys/io.h])
+fi
+
+XORG_ENABLE_DOCS
+XORG_ENABLE_DEVEL_DOCS
+XORG_WITH_XMLTO(0.0.20)
+XORG_WITH_FOP
+
+dnl Handle installing libxf86config
+AM_CONDITIONAL(INSTALL_LIBXF86CONFIG, [test "x$INSTALL_LIBXF86CONFIG" = xyes])
+
+dnl DDX Detection... Yes, it's ugly to have it here... but we need to
+dnl handle this early on so that we don't require unsupported extensions
+case $host_os in
+	cygwin*)
+		DGA=no
+		DRI2=no
+		XF86VIDMODE=no
+		XSELINUX=no
+		XV=no
+		;;
+	darwin*)
+		DRI2=no
+
+		if test x$XQUARTZ = xauto; then
+			AC_CACHE_CHECK([whether to build Xquartz],xorg_cv_Carbon_framework,[
+		 		save_LDFLAGS=$LDFLAGS
+				LDFLAGS="$LDFLAGS -framework Carbon"
+				AC_LINK_IFELSE([char FSFindFolder(); int main() { FSFindFolder(); return 0;}],
+				[xorg_cv_Carbon_framework=yes],
+				[xorg_cv_Carbon_framework=no])
+			LDFLAGS=$save_LDFLAGS])
+                
+			if test "X$xorg_cv_Carbon_framework" = Xyes; then
+				XQUARTZ=yes
+			else
+				XQUARTZ=no
+			fi
+		fi
+
+		if test "x$XQUARTZ" = xyes ; then
+			XQUARTZ=yes
+			XVFB=no
+			XNEST=no
+
+			COMPOSITE=no
+			DGA=no
+			DPMSExtension=no
+			XF86VIDMODE=no
+		fi
+		;;
+	*) XQUARTZ=no ;;
+esac
+
+dnl ---------------------------------------------------------------------------
+dnl Extension section
+dnl ---------------------------------------------------------------------------
+XEXT_INC='-I$(top_srcdir)/Xext'
+XEXT_LIB='$(top_builddir)/Xext/libXext.la'
+XEXTXORG_LIB='$(top_builddir)/Xext/libXextbuiltin.la'
+
+dnl Optional modules
+VIDEOPROTO="videoproto"
+COMPOSITEPROTO="compositeproto >= 0.4"
+RECORDPROTO="recordproto >= 1.13.99.1"
+SCRNSAVERPROTO="scrnsaverproto >= 1.1"
+RESOURCEPROTO="resourceproto"
+DRIPROTO="xf86driproto >= 2.1.0"
+DRI2PROTO="dri2proto >= 2.3"
+XINERAMAPROTO="xineramaproto"
+BIGFONTPROTO="xf86bigfontproto >= 1.2.0"
+XCALIBRATEPROTO="xcalibrateproto"
+DGAPROTO="xf86dgaproto >= 2.0.99.1"
+GLPROTO="glproto >= 1.4.10"
+DMXPROTO="dmxproto >= 2.2.99.1"
+VIDMODEPROTO="xf86vidmodeproto >= 2.2.99.1"
+WINDOWSWMPROTO="windowswmproto"
+APPLEWMPROTO="applewmproto >= 1.4"
+
+dnl Core modules for most extensions, et al.
+SDK_REQUIRED_MODULES="[xproto >= 7.0.17] [randrproto >= 1.4] [renderproto >= 0.11] [xextproto >= 7.1.99] [inputproto >= 1.9.99.902] [kbproto >= 1.0.3] fontsproto"
+# Make SDK_REQUIRED_MODULES available for inclusion in xorg-server.pc
+AC_SUBST(SDK_REQUIRED_MODULES)
+
+dnl List of libraries that require a specific version
+LIBAPPLEWM="applewm >= 1.4"
+LIBDMX="dmx >= 1.0.99.1"
+LIBDRI="dri >= 7.8.0"
+LIBDRM="libdrm >= 2.3.0"
+LIBGL="gl >= 7.1.0"
+LIBXEXT="xext >= 1.0.99.4"
+LIBXFONT="xfont >= 1.4.2"
+LIBXI="xi >= 1.2.99.1"
+LIBXTST="xtst >= 1.0.99.2"
+LIBPCIACCESS="pciaccess >= 0.8.0"
+LIBGLIB="glib-2.0 >= 2.16"
+LIBUDEV="libudev >= 143"
+LIBSELINUX="libselinux >= 2.0.86"
+LIBDBUS="dbus-1 >= 1.0"
+LIBPIXMAN="pixman-1 >= 0.15.20"
+
+dnl Pixman is always required, but we separate it out so we can link
+dnl specific modules against it
+PKG_CHECK_MODULES(PIXMAN, $LIBPIXMAN)
+REQUIRED_LIBS="$REQUIRED_LIBS $LIBPIXMAN $LIBXFONT xau"
+
+REQUIRED_MODULES="[fixesproto >= 4.1] [damageproto >= 1.1] [xcmiscproto >= 1.2.0] [xtrans >= 1.2.2] [bigreqsproto >= 1.1.0] $SDK_REQUIRED_MODULES"
+
+if test "x$CONFIG_UDEV" = xyes &&
+ { test "x$CONFIG_DBUS_API" = xyes || test "x$CONFIG_HAL" = xyes; }; then
+	AC_MSG_ERROR([Hotplugging through both libudev and dbus/hal not allowed])
+fi
+
+PKG_CHECK_MODULES(UDEV, $LIBUDEV, [HAVE_LIBUDEV=yes], [HAVE_LIBUDEV=no])
+if test "x$CONFIG_UDEV" = xauto; then
+	CONFIG_UDEV="$HAVE_LIBUDEV"
+fi
+AM_CONDITIONAL(CONFIG_UDEV, [test "x$CONFIG_UDEV" = xyes])
+if test "x$CONFIG_UDEV" = xyes; then
+	CONFIG_DBUS_API=no
+	CONFIG_HAL=no
+	if ! test "x$HAVE_LIBUDEV" = xyes; then
+		AC_MSG_ERROR([udev configuration API requested, but libudev is not installed])
+	fi
+	AC_DEFINE(CONFIG_UDEV, 1, [Use libudev for input hotplug])
+fi
+
+dnl HAVE_DBUS is true if we actually have the D-Bus library, whereas
+dnl CONFIG_DBUS_API is true if we want to enable the D-Bus config
+dnl API.
+PKG_CHECK_MODULES(DBUS, $LIBDBUS, [HAVE_DBUS=yes], [HAVE_DBUS=no])
+if test "x$HAVE_DBUS" = xyes; then
+	AC_DEFINE(HAVE_DBUS, 1, [Have D-Bus support])
+fi
+AM_CONDITIONAL(HAVE_DBUS, [test "x$HAVE_DBUS" = xyes])
+
+if test "x$CONFIG_DBUS_API" = xauto; then
+	CONFIG_DBUS_API="$HAVE_DBUS"
+fi
+if test "x$CONFIG_DBUS_API" = xyes; then
+	if ! test "x$HAVE_DBUS" = xyes; then
+		AC_MSG_ERROR([D-Bus configuration API requested, but D-Bus is not installed.])
+	fi
+
+	AC_DEFINE(CONFIG_DBUS_API, 1, [Use the D-Bus input configuration API])
+	CONFIG_NEED_DBUS="yes"
+fi
+AM_CONDITIONAL(CONFIG_DBUS_API, [test "x$CONFIG_DBUS_API" = xyes])
+
+PKG_CHECK_MODULES(HAL, hal, [HAVE_HAL=yes], [HAVE_HAL=no])
+if test "x$CONFIG_HAL" = xauto; then
+	CONFIG_HAL="$HAVE_HAL"
+fi
+if test "x$CONFIG_HAL" = xyes; then
+	if ! test "x$HAVE_HAL" = xyes; then
+		AC_MSG_ERROR([HAL hotplug API requested, but HAL is not installed.])
+	fi
+
+	AC_DEFINE(CONFIG_HAL, 1, [Use the HAL hotplug API])
+	CONFIG_NEED_DBUS="yes"
+fi
+AM_CONDITIONAL(CONFIG_HAL, [test "x$CONFIG_HAL" = xyes])
+
+if test "x$CONFIG_NEED_DBUS" = xyes; then
+        AC_DEFINE(CONFIG_NEED_DBUS, 1, [Use D-Bus for input hotplug])
+fi
+AM_CONDITIONAL(CONFIG_NEED_DBUS, [test "x$CONFIG_NEED_DBUS" = xyes])
+
+if test "x$USE_SIGIO_BY_DEFAULT" = xyes; then
+	USE_SIGIO_BY_DEFAULT_VALUE=TRUE
+else
+	USE_SIGIO_BY_DEFAULT_VALUE=FALSE
+fi
+AC_DEFINE_UNQUOTED([USE_SIGIO_BY_DEFAULT], [$USE_SIGIO_BY_DEFAULT_VALUE],
+		   [Use SIGIO handlers for input device events by default])
+
+AC_MSG_CHECKING([for glibc...])
+AC_PREPROC_IFELSE([
+#include <features.h>
+#ifndef __GLIBC__
+#error
+#endif
+], glibc=yes, glibc=no)
+AC_MSG_RESULT([$glibc])
+
+AC_CHECK_FUNCS([clock_gettime], [have_clock_gettime=yes],
+               [AC_CHECK_LIB([rt], [clock_gettime], [have_clock_gettime=-lrt],
+                             [have_clock_gettime=no])])
+
+AC_MSG_CHECKING([for a useful monotonic clock ...])
+
+if ! test "x$have_clock_gettime" = xno; then
+    if ! test "x$have_clock_gettime" = xyes; then
+        CLOCK_LIBS="$have_clock_gettime"
+    else
+        CLOCK_LIBS=""
+    fi
+
+    LIBS_SAVE="$LIBS"
+    LIBS="$CLOCK_LIBS"
+    CPPFLAGS_SAVE="$CPPFLAGS"
+
+    if test x"$glibc" = xyes; then
+        CPPFLAGS="$CPPFLAGS -D_POSIX_C_SOURCE=200112L"
+    fi
+
+    AC_RUN_IFELSE([
+#include <time.h>
+
+int main(int argc, char *argv[[]]) {
+    struct timespec tp;
+
+    if (clock_gettime(CLOCK_MONOTONIC, &tp) == 0)
+        return 0;
+    else
+        return 1;
+}
+    ], [MONOTONIC_CLOCK=yes], [MONOTONIC_CLOCK=no],
+       [MONOTONIC_CLOCK="cross compiling"])
+
+    LIBS="$LIBS_SAVE"
+    CPPFLAGS="$CPPFLAGS_SAVE"
+else
+    MONOTONIC_CLOCK=no
+fi
+
+AC_MSG_RESULT([$MONOTONIC_CLOCK])
+
+if test "x$MONOTONIC_CLOCK" = xyes; then
+    AC_DEFINE(MONOTONIC_CLOCK, 1, [Have monotonic clock from clock_gettime()])
+    LIBS="$LIBS $CLOCK_LIBS"
+fi
+
+AM_CONDITIONAL(XV, [test "x$XV" = xyes])
+if test "x$XV" = xyes; then
+	AC_DEFINE(XV, 1, [Support Xv extension])
+	AC_DEFINE(XvExtension, 1, [Build Xv extension])
+	REQUIRED_MODULES="$REQUIRED_MODULES $VIDEOPROTO"
+	SDK_REQUIRED_MODULES="$SDK_REQUIRED_MODULES $VIDEOPROTO"
+else
+	XVMC=no
+fi
+
+AM_CONDITIONAL(XVMC, [test "x$XVMC" = xyes])
+if test "x$XVMC" = xyes; then
+	AC_DEFINE(XvMCExtension, 1, [Build XvMC extension])
+fi
+
+AM_CONDITIONAL(XREGISTRY, [test "x$XREGISTRY" = xyes])
+if test "x$XREGISTRY" = xyes; then
+	AC_DEFINE(XREGISTRY, 1, [Build registry module])
+fi
+
+AM_CONDITIONAL(COMPOSITE, [test "x$COMPOSITE" = xyes])
+if test "x$COMPOSITE" = xyes; then
+	AC_DEFINE(COMPOSITE, 1, [Support Composite Extension])
+	REQUIRED_MODULES="$REQUIRED_MODULES $COMPOSITEPROTO"
+	COMPOSITE_LIB='$(top_builddir)/composite/libcomposite.la'
+	COMPOSITE_INC='-I$(top_srcdir)/composite'
+fi
+
+AM_CONDITIONAL(MITSHM, [test "x$MITSHM" = xyes])
+if test "x$MITSHM" = xyes; then
+	AC_DEFINE(MITSHM, 1, [Support MIT-SHM extension])
+	AC_DEFINE(HAS_SHM, 1, [Support SHM])
+fi
+
+AM_CONDITIONAL(RECORD, [test "x$RECORD" = xyes])
+if test "x$RECORD" = xyes; then
+	AC_DEFINE(XRECORD, 1, [Support Record extension])
+	REQUIRED_MODULES="$REQUIRED_MODULES $RECORDPROTO"
+	RECORD_LIB='$(top_builddir)/record/librecord.la'
+fi
+
+AM_CONDITIONAL(SCREENSAVER, [test "x$SCREENSAVER" = xyes])
+if test "x$SCREENSAVER" = xyes; then
+	AC_DEFINE(SCREENSAVER, 1, [Support MIT-SCREEN-SAVER extension])
+	REQUIRED_MODULES="$REQUIRED_MODULES $SCRNSAVERPROTO"
+fi
+
+AM_CONDITIONAL(RES, [test "x$RES" = xyes])
+if test "x$RES" = xyes; then
+	AC_DEFINE(RES, 1, [Support X resource extension])
+	REQUIRED_MODULES="$REQUIRED_MODULES $RESOURCEPROTO"
+fi
+
+if test "x$GLX" = xyes; then
+	PKG_CHECK_MODULES([XLIB], [x11])
+	PKG_CHECK_MODULES([GL], $GLPROTO $LIBGL)
+	AC_SUBST(XLIB_CFLAGS)
+	AC_DEFINE(GLXEXT, 1, [Build GLX extension])
+	GLX_LIBS='$(top_builddir)/glx/libglx.la'
+	GLX_SYS_LIBS="$GLX_SYS_LIBS"
+else
+        GLX=no
+fi
+AM_CONDITIONAL(GLX, test "x$GLX" = xyes)
+
+if test "x$AIGLX" = xyes -a "x$GLX" = xyes -a "x$DRI" = xyes; then
+	AC_DEFINE(AIGLX, 1, [Build AIGLX loader])
+else
+	AIGLX=no
+fi
+AM_CONDITIONAL(AIGLX, test "x$AIGLX" = xyes)
+
+if test "x$GLX_USE_TLS" = xyes -a "x$AIGLX" = xyes; then
+	GLX_DEFINES="-DGLX_USE_TLS -DPTHREADS"
+	GLX_SYS_LIBS="$GLX_SYS_LIBS -lpthread"
+fi
+AC_SUBST([GLX_DEFINES])
+
+AM_CONDITIONAL(DRI, test "x$DRI" = xyes)
+if test "x$DRI" = xyes; then
+	AC_DEFINE(XF86DRI, 1, [Build DRI extension])
+	PKG_CHECK_MODULES([DRIPROTO], [$DRIPROTO])
+	PKG_CHECK_MODULES([DRI], $GLPROTO $LIBDRI)
+	AC_SUBST(DRIPROTO_CFLAGS)
+fi
+
+PKG_CHECK_MODULES([DRI2PROTO], $DRI2PROTO,
+                  [HAVE_DRI2PROTO=yes], [HAVE_DRI2PROTO=no])
+case "$DRI2,$HAVE_DRI2PROTO" in
+	yes,no)
+		AC_MSG_ERROR([DRI2 requested, but dri2proto not found.])
+		;;
+	yes,yes | auto,yes)
+		AC_DEFINE(DRI2, 1, [Build DRI2 extension])
+		DRI2=yes
+		SDK_REQUIRED_MODULES="$SDK_REQUIRED_MODULES $DRI2PROTO"
+		;;
+esac
+AM_CONDITIONAL(DRI2, test "x$DRI2" = xyes)
+
+if test "x$DRI" = xyes || test "x$DRI2" = xyes; then
+	if test "x$DRM" = xyes; then
+		AC_DEFINE(WITH_LIBDRM, 1, [Building with libdrm support])
+		PKG_CHECK_MODULES([LIBDRM], $LIBDRM)
+	fi
+fi
+
+if test "x$DRI2" = xyes; then
+	save_CFLAGS=$CFLAGS
+	CFLAGS="$GL_CFLAGS $LIBDRM_CFLAGS"
+	AC_COMPILE_IFELSE([AC_LANG_SOURCE([[#include <GL/gl.h>
+#include <GL/internal/dri_interface.h>
+#ifndef __DRI_DRI2
+#error DRI2 extension not available.
+#endif]])],
+			  [HAVE_DRI2EXTENSION=yes],
+			  [HAVE_DRI2EXTENSION=no])
+	CFLAGS=$save_CFLAGS
+	if test "x$HAVE_DRI2EXTENSION" = xyes; then
+		AC_DEFINE(DRI2_AIGLX, 1, [Build DRI2 AIGLX loader])
+		DRI2_AIGLX=yes
+	else
+		AC_MSG_NOTICE([DRI2 AIGLX disabled, __DRI_DRI2 not defined in dri_interface.h.])
+		DRI2_AIGLX=no
+	fi
+fi
+AM_CONDITIONAL(DRI2_AIGLX, test "x$DRI2_AIGLX" = xyes)
+
+
+AM_CONDITIONAL(XINERAMA, [test "x$XINERAMA" = xyes])
+if test "x$XINERAMA" = xyes; then
+	AC_DEFINE(XINERAMA, 1, [Support Xinerama extension])
+	AC_DEFINE(PANORAMIX, 1, [Internal define for Xinerama])
+	REQUIRED_MODULES="$REQUIRED_MODULES $XINERAMAPROTO"
+	SDK_REQUIRED_MODULES="$SDK_REQUIRED_MODULES $XINERAMAPROTO"
+fi
+
+AM_CONDITIONAL(XACE, [test "x$XACE" = xyes])
+if test "x$XACE" = xyes; then
+	AC_DEFINE(XACE, 1, [Build X-ACE extension])
+fi
+
+AM_CONDITIONAL(XSELINUX, [test "x$XSELINUX" = xyes])
+if test "x$XSELINUX" = xyes; then
+	if test "x$XACE" != xyes; then
+		AC_MSG_ERROR([cannot build SELinux extension without X-ACE])
+	fi
+	AC_CHECK_HEADERS([libaudit.h], [], AC_MSG_ERROR([SELinux extension requires audit system headers]))
+	AC_CHECK_LIB(audit, audit_open, [], AC_MSG_ERROR([SELinux extension requires audit system library]))
+	PKG_CHECK_MODULES([SELINUX], $LIBSELINUX)
+	SELINUX_LIBS="$SELINUX_LIBS -laudit"
+	AC_DEFINE(XSELINUX, 1, [Build SELinux extension])
+fi
+
+AM_CONDITIONAL(XCSECURITY, [test "x$XCSECURITY" = xyes])
+if test "x$XCSECURITY" = xyes; then
+	if test "x$XACE" != xyes; then
+		AC_MSG_ERROR([cannot build Security extension without X-ACE])
+	fi
+	AC_DEFINE(XCSECURITY, 1, [Build Security extension])
+fi
+
+AM_CONDITIONAL(DBE, [test "x$DBE" = xyes])
+if test "x$DBE" = xyes; then
+	AC_DEFINE(DBE, 1, [Support DBE extension])
+	DBE_LIB='$(top_builddir)/dbe/libdbe.la'
+fi
+
+AM_CONDITIONAL(XF86BIGFONT, [test "x$XF86BIGFONT" = xyes])
+if test "x$XF86BIGFONT" = xyes; then
+	AC_DEFINE(XF86BIGFONT, 1, [Support XF86 Big font extension])
+	REQUIRED_MODULES="$REQUIRED_MODULES $BIGFONTPROTO"
+fi
+
+AM_CONDITIONAL(DPMSExtension, [test "x$DPMSExtension" = xyes])
+if test "x$DPMSExtension" = xyes; then
+	AC_DEFINE(DPMSExtension, 1, [Support DPMS extension])
+fi
+
+if test "x$XCALIBRATE" = xyes && test "$KDRIVE" = yes; then
+   AC_DEFINE(XCALIBRATE, 1, [Build XCalibrate extension])
+   REQUIRED_MODULES="$REQUIRED_MODULES $XCALIBRATEPROTO"
+else
+   XCALIBRATE=no
+fi
+AM_CONDITIONAL(XCALIBRATE, [test "x$XCALIBRATE" = xyes])
+
+AC_DEFINE(RENDER, 1, [Support RENDER extension])
+RENDER_LIB='$(top_builddir)/render/librender.la'
+RENDER_INC='-I$(top_srcdir)/render'
+
+AC_DEFINE(RANDR, 1, [Support RANDR extension])
+RANDR_LIB='$(top_builddir)/randr/librandr.la'
+RANDR_INC='-I$(top_srcdir)/randr'
+
+AC_DEFINE(XFIXES,1,[Support XFixes extension])
+FIXES_LIB='$(top_builddir)/xfixes/libxfixes.la'
+FIXES_INC='-I$(top_srcdir)/xfixes'
+
+AC_DEFINE(DAMAGE,1,[Support Damage extension])
+DAMAGE_LIB='$(top_builddir)/damageext/libdamageext.la'
+DAMAGE_INC='-I$(top_srcdir)/damageext'
+MIEXT_DAMAGE_LIB='$(top_builddir)/miext/damage/libdamage.la'
+MIEXT_DAMAGE_INC='-I$(top_srcdir)/miext/damage'
+
+# XINPUT extension is integral part of the server
+AC_DEFINE(XINPUT, 1, [Support X Input extension])
+XI_LIB='$(top_builddir)/Xi/libXi.la'
+XI_INC='-I$(top_srcdir)/Xi'
+
+AM_CONDITIONAL(XF86UTILS, test "x$XF86UTILS" = xyes)
+AM_CONDITIONAL(XAA, test "x$XAA" = xyes)
+AM_CONDITIONAL(VGAHW, test "x$VGAHW" = xyes)
+AM_CONDITIONAL(VBE, test "x$VBE" = xyes)
+AM_CONDITIONAL(INT10MODULE, test "x$INT10MODULE" = xyes)
+
+AC_DEFINE(SHAPE, 1, [Support SHAPE extension])
+
+AC_DEFINE_DIR(XKB_BASE_DIRECTORY, XKBPATH, [Path to XKB data])
+AC_ARG_WITH(xkb-bin-directory,
+				AS_HELP_STRING([--with-xkb-bin-directory=DIR], [Directory containing xkbcomp program]),
+				[XKB_BIN_DIRECTORY="$withval"],
+				[XKB_BIN_DIRECTORY="$bindir"])
+
+AC_DEFINE_DIR(XKB_BIN_DIRECTORY, XKB_BIN_DIRECTORY, [Path to XKB bin dir])
+
+dnl Make sure XKM_OUTPUT_DIR is an absolute path
+XKBOUTPUT_FIRSTCHAR=`echo $XKBOUTPUT | cut -b 1`
+if [[ x$XKBOUTPUT_FIRSTCHAR != x/ -a x$XKBOUTPUT_FIRSTCHAR != 'x$' ]] ; then
+   XKBOUTPUT="$XKB_BASE_DIRECTORY/$XKBOUTPUT"
+fi
+
+dnl XKM_OUTPUT_DIR (used in code) must end in / or file names get hosed
+dnl XKB_COMPILED_DIR (used in Makefiles) must not or install-sh gets confused
+
+XKBOUTPUT=`echo $XKBOUTPUT/ | $SED 's|/*$|/|'`
+XKB_COMPILED_DIR=`echo $XKBOUTPUT | $SED 's|/*$||'`
+AC_DEFINE_DIR(XKM_OUTPUT_DIR, XKBOUTPUT, [Path to XKB output dir])
+AC_SUBST(XKB_COMPILED_DIR)
+
+if test "x$XKB_DFLT_RULES" = x; then
+    case $host_os in
+    linux*)
+        dnl doesn't take AutoAddDevices into account, but whatever.
+        if test "x$CONFIG_HAL" = xyes; then
+            XKB_DFLT_RULES="evdev"
+        else
+            XKB_DFLT_RULES="base"
+        fi
+        ;;
+    *)
+        XKB_DFLT_RULES="base"
+        ;;
+    esac
+fi
+AC_DEFINE_UNQUOTED(XKB_DFLT_RULES, ["$XKB_DFLT_RULES"], [Default XKB ruleset])
+AC_DEFINE_UNQUOTED(XKB_DFLT_MODEL, ["$XKB_DFLT_MODEL"], [Default XKB model])
+AC_DEFINE_UNQUOTED(XKB_DFLT_LAYOUT, ["$XKB_DFLT_LAYOUT"], [Default XKB layout])
+AC_DEFINE_UNQUOTED(XKB_DFLT_VARIANT, ["$XKB_DFLT_VARIANT"], [Default XKB variant])
+AC_DEFINE_UNQUOTED(XKB_DFLT_OPTIONS, ["$XKB_DFLT_OPTIONS"], [Default XKB options])
+
+XKB_LIB='$(top_builddir)/xkb/libxkb.la'
+XKB_STUB_LIB='$(top_builddir)/xkb/libxkbstubs.la'
+REQUIRED_MODULES="$REQUIRED_MODULES xkbfile"
+
+AC_CHECK_FUNC(strcasecmp, [], AC_DEFINE([NEED_STRCASECMP], 1,
+                                        [Do not have 'strcasecmp'.]))
+AC_CHECK_FUNC(strncasecmp, [], AC_DEFINE([NEED_STRNCASECMP], 1,
+                                        [Do not have 'strncasecmp'.]))
+AC_CHECK_FUNC(strcasestr, [], AC_DEFINE([NEED_STRCASESTR], 1,
+                                       [Do not have 'strcasestr'.]))
+
+PKG_CHECK_MODULES([XDMCP], [xdmcp], [have_libxdmcp="yes"], [have_libxdmcp="no"])
+if test "x$have_libxdmcp" = xyes; then
+	AC_CHECK_LIB(Xdmcp, XdmcpWrap, [have_xdmcpwrap="yes"], [have_xdmcpwrap="no"], [$XDMCP_LIBS])
+fi
+if test "x$XDMCP" = xauto; then
+	if test "x$have_libxdmcp" = xyes; then
+		XDMCP=yes
+	else
+		XDMCP=no
+	fi
+fi
+if test "x$XDMAUTH" = xauto; then
+	if test "x$have_libxdmcp" = xyes && test "x$have_xdmcpwrap" = xyes; then
+		XDMAUTH=yes
+	else
+		XDMAUTH=no
+	fi
+fi
+
+AM_CONDITIONAL(XDMCP, [test "x$XDMCP" = xyes])
+if test "x$XDMCP" = xyes; then
+	AC_DEFINE(XDMCP, 1, [Support XDM Control Protocol])
+	REQUIRED_LIBS="$REQUIRED_LIBS xdmcp"
+	XDMCP_MODULES="xdmcp"
+fi
+
+AM_CONDITIONAL(XDMAUTH, [test "x$XDMAUTH" = xyes])
+if test "x$XDMAUTH" = xyes; then
+	AC_DEFINE(HASXDMAUTH,1,[Support XDM-AUTH*-1])
+	if ! test "x$XDMCP" = xyes; then
+		REQUIRED_LIBS="$REQUIRED_LIBS xdmcp"
+		XDMCP_MODULES="xdmcp"
+	fi
+fi
+
+AC_DEFINE_DIR(COMPILEDDEFAULTFONTPATH, FONTPATH, [Default font path])
+AC_DEFINE_DIR(PCI_TXT_IDS_PATH, PCI_TXT_IDS_DIR, [Default PCI text file ID path])
+AC_DEFINE_DIR(SERVER_MISC_CONFIG_PATH, SERVERCONFIG, [Server miscellaneous config path])
+AC_DEFINE_DIR(BASE_FONT_PATH, FONTROOTDIR, [Default base font path])
+dridriverdir=`$PKG_CONFIG --variable=dridriverdir dri`
+AC_DEFINE_DIR(DRI_DRIVER_PATH, dridriverdir, [Default DRI driver path])
+AC_DEFINE_UNQUOTED(XVENDORNAME, ["$VENDOR_NAME"], [Vendor name])
+AC_DEFINE_UNQUOTED(XVENDORNAMESHORT, ["$VENDOR_NAME_SHORT"], [Short vendor name])
+AC_DEFINE_UNQUOTED(XORG_DATE, ["$RELEASE_DATE"], [Vendor release])
+AC_DEFINE_UNQUOTED(XORG_MAN_VERSION, ["$VENDOR_MAN_VERSION"], [Vendor man version])
+AC_DEFINE_UNQUOTED(BUILDERADDR, ["$BUILDERADDR"], [Builder address])
+
+if test -z "$OSNAME"; then
+    OSNAME="UNKNOWN"
+fi
+
+AC_DEFINE_UNQUOTED(OSNAME, ["$OSNAME"], [Operating System Name])
+AC_DEFINE_UNQUOTED(OSVENDOR, ["$OSVENDOR"], [Operating System Vendor])
+AC_DEFINE_UNQUOTED(BUILDERSTRING, ["$BUILDERSTRING"], [Builder string])
+
+AC_SUBST([VENDOR_NAME_SHORT])
+AC_DEFINE_UNQUOTED(VENDOR_NAME, ["$VENDOR_NAME"], [Vendor name])
+AC_DEFINE_UNQUOTED(VENDOR_NAME_SHORT, ["$VENDOR_NAME_SHORT"], [Vendor name])
+AC_DEFINE_UNQUOTED(VENDOR_RELEASE, [$VENDOR_RELEASE], [Vendor release])
+AC_DEFINE_UNQUOTED(VENDOR_MAN_VERSION, ["$VENDOR_MAN_VERSION"], [Vendor man version])
+
+AC_DEFINE(NO_LIBCWRAPPER, 1, [Define to 1 if modules should avoid the libcwrapper])
+
+if test "x$DEBUGGING" = xyes; then
+       AC_DEFINE(DEBUG, 1, [Enable debugging code])
+fi
+AM_CONDITIONAL(DEBUG, [test "x$DEBUGGING" = xyes])
+
+# If unittests aren't explicitly disabled, check for required support
+if test "x$UNITTESTS" != xno ; then
+       PKG_CHECK_MODULES([GLIB], $LIBGLIB,
+                         [HAVE_GLIB=yes], [HAVE_GLIB=no])
+
+       # Check if linker supports -wrap, passed via compiler flags
+       # When cross-compiling, reports no, since unit tests run from
+       # "make check", so would be running on build machine,  not target
+       AC_MSG_CHECKING([whether the linker supports -wrap])
+       save_LDFLAGS="$LDFLAGS"
+       LDFLAGS="$LDFLAGS -Wl,-wrap,exit"
+       AC_RUN_IFELSE([AC_LANG_PROGRAM([[
+	void __wrap_exit (int s)
+	{
+	    __real_exit (0);
+	}]],
+	[[exit (1);]])],
+                     [linker_can_wrap="yes"],
+                     [linker_can_wrap="no"],
+                     [linker_can_wrap="no"])
+       AC_MSG_RESULT([$linker_can_wrap])
+       LDFLAGS="$save_LDFLAGS"
+fi
+
+if test "x$UNITTESTS" = xauto; then
+       if test "x$HAVE_GLIB" = xyes && test "x$linker_can_wrap" = xyes; then
+           UNITTESTS=yes
+       else
+           UNITTESTS=no
+       fi
+fi
+if test "x$UNITTESTS" = xyes; then
+       if test "x$HAVE_GLIB" = xno; then
+           AC_MSG_ERROR([glib required to build unit tests])
+       fi
+       if test "x$linker_can_wrap" = xno; then
+           AC_MSG_ERROR([ld -wrap support required to build unit tests])
+       fi
+       AC_DEFINE(UNITTESTS, 1, [Enable unit tests])
+       AC_SUBST([GLIB_LIBS])
+       AC_SUBST([GLIB_CFLAGS])
+fi
+AM_CONDITIONAL(UNITTESTS, [test "x$UNITTESTS" = xyes])
+
+AC_DEFINE(XTEST, 1, [Support XTest extension])
+AC_DEFINE(XSYNC, 1, [Support XSync extension])
+AC_DEFINE(XCMISC, 1, [Support XCMisc extension])
+AC_DEFINE(BIGREQS, 1, [Support BigRequests extension])
+
+if test "x$SPECIAL_DTRACE_OBJECTS" = "xyes" ; then
+  DIX_LIB='$(top_builddir)/dix/dix.O'
+  OS_LIB='$(top_builddir)/os/os.O $(SHA1_LIBS) $(DLOPEN_LIBS)'
+else
+  DIX_LIB='$(top_builddir)/dix/libdix.la'
+  OS_LIB='$(top_builddir)/os/libos.la'
+fi
+AC_SUBST([DIX_LIB])
+AC_SUBST([OS_LIB])
+
+MAIN_LIB='$(top_builddir)/dix/libmain.la'
+AC_SUBST([MAIN_LIB])
+
+MI_LIB='$(top_builddir)/mi/libmi.la'
+MI_EXT_LIB='$(top_builddir)/mi/libmiext.la'
+MI_INC='-I$(top_srcdir)/mi'
+FB_LIB='$(top_builddir)/fb/libfb.la'
+FB_INC='-I$(top_srcdir)/fb'
+MIEXT_SHADOW_INC='-I$(top_srcdir)/miext/shadow'
+MIEXT_SHADOW_LIB='$(top_builddir)/miext/shadow/libshadow.la'
+MIEXT_SYNC_INC='-I$(top_srcdir)/miext/sync'
+MIEXT_SYNC_LIB='$(top_builddir)/miext/sync/libsync.la'
+CORE_INCS='-I$(top_srcdir)/include -I$(top_builddir)/include'
+
+# SHA1 hashing
+AC_ARG_WITH([sha1],
+            [AS_HELP_STRING([--with-sha1=libc|libmd|libgcrypt|libcrypto|libsha1|CommonCrypto],
+                            [choose SHA1 implementation])])
+AC_CHECK_FUNC([SHA1Init], [HAVE_SHA1_IN_LIBC=yes])
+if test "x$with_sha1" = x && test "x$HAVE_SHA1_IN_LIBC" = xyes; then
+	with_sha1=libc
+fi
+if test "x$with_sha1" = xlibc && test "x$HAVE_SHA1_IN_LIBC" != xyes; then
+	AC_MSG_ERROR([libc requested but not found])
+fi
+if test "x$with_sha1" = xlibc; then
+	AC_DEFINE([HAVE_SHA1_IN_LIBC], [1],
+		[Use libc SHA1 functions])
+	SHA1_LIBS=""
+fi
+AC_CHECK_FUNC([CC_SHA1_Init], [HAVE_SHA1_IN_COMMONCRYPTO=yes])
+if test "x$with_sha1" = x && test "x$HAVE_SHA1_IN_COMMONCRYPTO" = xyes; then
+	with_sha1=CommonCrypto
+fi
+if test "x$with_sha1" = xCommonCrypto && test "x$HAVE_SHA1_IN_COMMONCRYPTO" != xyes; then
+	AC_MSG_ERROR([CommonCrypto requested but not found])
+fi
+if test "x$with_sha1" = xCommonCrypto; then
+	AC_DEFINE([HAVE_SHA1_IN_COMMONCRYPTO], [1],
+		[Use CommonCrypto SHA1 functions])
+	SHA1_LIBS=""
+fi
+AC_CHECK_LIB([md], [SHA1Init], [HAVE_LIBMD=yes])
+if test "x$with_sha1" = x && test "x$HAVE_LIBMD" = xyes; then
+	with_sha1=libmd
+fi
+if test "x$with_sha1" = xlibmd && test "x$HAVE_LIBMD" != xyes; then
+	AC_MSG_ERROR([libmd requested but not found])
+fi
+if test "x$with_sha1" = xlibmd; then
+	AC_DEFINE([HAVE_SHA1_IN_LIBMD], [1],
+	          [Use libmd SHA1 functions])
+	SHA1_LIBS=-lmd
+fi
+PKG_CHECK_MODULES([LIBSHA1], [libsha1], [HAVE_LIBSHA1=yes], [HAVE_LIBSHA1=no])
+if test "x$with_sha1" = x && test "x$HAVE_LIBSHA1" = xyes; then
+   with_sha1=libsha1
+fi
+if test "x$with_sha1" = xlibsha1 && test "x$HAVE_LIBSHA1" != xyes; then
+	AC_MSG_ERROR([libsha1 requested but not found])
+fi
+if test "x$with_sha1" = xlibsha1; then
+	AC_DEFINE([HAVE_SHA1_IN_LIBSHA1], [1],
+	          [Use libsha1 for SHA1])
+	SHA1_LIBS=-lsha1
+fi
+AC_CHECK_LIB([gcrypt], [gcry_md_open], [HAVE_LIBGCRYPT=yes])
+if test "x$with_sha1" = x && test "x$HAVE_LIBGCRYPT" = xyes; then
+	with_sha1=libgcrypt
+fi
+if test "x$with_sha1" = xlibgcrypt && test "x$HAVE_LIBGCRYPT" != xyes; then
+	AC_MSG_ERROR([libgcrypt requested but not found])
+fi
+if test "x$with_sha1" = xlibgcrypt; then
+	AC_DEFINE([HAVE_SHA1_IN_LIBGCRYPT], [1],
+	          [Use libgcrypt SHA1 functions])
+	SHA1_LIBS=-lgcrypt
+fi
+# We don't need all of the OpenSSL libraries, just libcrypto
+AC_CHECK_LIB([crypto], [SHA1_Init], [HAVE_LIBCRYPTO=yes])
+PKG_CHECK_MODULES([OPENSSL], [openssl], [HAVE_OPENSSL_PKC=yes],
+                  [HAVE_OPENSSL_PKC=no])
+if test "x$HAVE_LIBCRYPTO" = xyes || test "x$HAVE_OPENSSL_PKC" = xyes; then
+	if test "x$with_sha1" = x; then
+		with_sha1=libcrypto
+	fi
+else
+	if test "x$with_sha1" = xlibcrypto; then
+		AC_MSG_ERROR([OpenSSL libcrypto requested but not found])
+	fi
+fi
+if test "x$with_sha1" = xlibcrypto; then
+	if test "x$HAVE_LIBCRYPTO" = xyes; then
+		SHA1_LIBS=-lcrypto
+	else
+		SHA1_LIBS="$OPENSSL_LIBS"
+		SHA1_CFLAGS="$OPENSSL_CFLAGS"
+	fi
+fi
+AC_MSG_CHECKING([for SHA1 implementation])
+if test "x$with_sha1" = x; then
+	AC_MSG_ERROR([No suitable SHA1 implementation found])
+fi
+AC_MSG_RESULT([$with_sha1])
+AC_SUBST(SHA1_LIBS)
+AC_SUBST(SHA1_CFLAGS)
+
+PKG_CHECK_MODULES([XSERVERCFLAGS], [$REQUIRED_MODULES $REQUIRED_LIBS])
+PKG_CHECK_MODULES([XSERVERLIBS], [$REQUIRED_LIBS])
+
+# Autotools has some unfortunate issues with library handling.  In order to
+# get a server to rebuild when a dependency in the tree is changed, it must
+# be listed in SERVERNAME_DEPENDENCIES.  However, no system libraries may be
+# listed there, or some versions of autotools will break (especially if a -L
+# is required to find the library).  So, we keep two sets of libraries
+# detected: NAMESPACE_LIBS for in-tree libraries to be linked against, which
+# will go into the _DEPENDENCIES and _LDADD of the server, and
+# NAMESPACE_SYS_LIBS which will go into only the _LDADD.  The
+# NAMESPACEMODULES_LIBS detected from pkgconfig should always go in
+# NAMESPACE_SYS_LIBS.
+#
+# XSERVER_LIBS is the set of in-tree libraries which all servers require.
+# XSERVER_SYS_LIBS is the set of out-of-tree libraries which all servers
+# require.
+#
+XSERVER_CFLAGS="${XSERVER_CFLAGS} ${XSERVERCFLAGS_CFLAGS}"
+XSERVER_LIBS="$DIX_LIB $MI_LIB $OS_LIB"
+XSERVER_SYS_LIBS="${XSERVERLIBS_LIBS} ${SYS_LIBS} ${LIBS}"
+AC_SUBST([XSERVER_LIBS])
+AC_SUBST([XSERVER_SYS_LIBS])
+
+UTILS_SYS_LIBS="${SYS_LIBS}"
+AC_SUBST([UTILS_SYS_LIBS])
+
+# The Xorg binary needs to export symbols so that they can be used from modules
+# Some platforms require extra flags to do this.   libtool should set the
+# necessary flags for each platform when -export-dynamic is passed to it.
+LD_EXPORT_SYMBOLS_FLAG="-export-dynamic"
+AC_SUBST([LD_EXPORT_SYMBOLS_FLAG])
+
+dnl Imake defines SVR4 on SVR4 systems, and many files check for it, so
+dnl we need to replicate that here until those can all be fixed
+AC_MSG_CHECKING([if SVR4 needs to be defined])
+AC_EGREP_CPP([I_AM_SVR4],[
+#if defined(SVR4) || defined(__svr4__) || defined(__SVR4)
+ I_AM_SVR4
+#endif
+],[
+AC_DEFINE([SVR4],1,[Define to 1 on systems derived from System V Release 4])
+AC_MSG_RESULT([yes])], AC_MSG_RESULT([no]))
+
+XSERVER_CFLAGS="$XSERVER_CFLAGS $CORE_INCS $XEXT_INC $COMPOSITE_INC $DAMAGE_INC $FIXES_INC $XI_INC $MI_INC $MIEXT_SYNC_INC $MIEXT_SHADOW_INC $MIEXT_LAYER_INC $MIEXT_DAMAGE_INC $RENDER_INC $RANDR_INC $FB_INC"
+
+dnl ---------------------------------------------------------------------------
+dnl DDX section.
+dnl ---------------------------------------------------------------------------
+
+dnl Xvfb DDX
+
+AC_MSG_CHECKING([whether to build Xvfb DDX])
+AC_MSG_RESULT([$XVFB])
+AM_CONDITIONAL(XVFB, [test "x$XVFB" = xyes])
+
+if test "x$XVFB" = xyes; then
+	XVFB_LIBS="$FB_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB"
+	XVFB_SYS_LIBS="$XVFBMODULES_LIBS $GLX_SYS_LIBS"
+	AC_SUBST([XVFB_LIBS])
+	AC_SUBST([XVFB_SYS_LIBS])
+fi
+
+
+dnl Xnest DDX
+
+PKG_CHECK_MODULES(XNESTMODULES, [$LIBXEXT x11 xau $XDMCP_MODULES], [have_xnest=yes], [have_xnest=no])
+AC_MSG_CHECKING([whether to build Xnest DDX])
+if test "x$XNEST" = xauto; then
+	XNEST="$have_xnest"
+fi
+AC_MSG_RESULT([$XNEST])
+AM_CONDITIONAL(XNEST, [test "x$XNEST" = xyes])
+
+if test "x$XNEST" = xyes; then
+	if test "x$have_xnest" = xno; then
+		AC_MSG_ERROR([Xnest build explicitly requested, but required modules not found.])
+	fi
+	XNEST_LIBS="$FB_LIB $FIXES_LIB $MI_LIB $XEXT_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $DIX_LIB $MAIN_LIB $OS_LIB"
+	XNEST_SYS_LIBS="$XNESTMODULES_LIBS $GLX_SYS_LIBS"
+	AC_SUBST([XNEST_LIBS])
+	AC_SUBST([XNEST_SYS_LIBS])
+fi
+
+
+dnl Xorg DDX
+
+AC_MSG_CHECKING([whether to build Xorg DDX])
+if test "x$XORG" = xauto; then
+	XORG="yes"
+	case $host_os in
+		cygwin*) XORG="no" ;;
+		darwin*) XORG="no" ;;
+	esac
+fi
+AC_MSG_RESULT([$XORG])
+
+xorg_bus_linuxpci=no
+xorg_bus_bsdpci=no
+xorg_bus_sparc=no
+
+if test "x$XORG" = xyes; then
+	XORG_DDXINCS='-I$(top_srcdir)/hw/xfree86 -I$(top_srcdir)/hw/xfree86/include -I$(top_srcdir)/hw/xfree86/common'
+	XORG_OSINCS='-I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir)/hw/xfree86/os-support/bus -I$(top_srcdir)/os'
+	XORG_INCS="$XORG_DDXINCS $XORG_OSINCS"
+	XORG_CFLAGS="$XORGSERVER_CFLAGS -DHAVE_XORG_CONFIG_H"
+	XORG_LIBS="$COMPOSITE_LIB $FIXES_LIB $XEXTXORG_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB"
+
+	dnl ==================================================================
+	dnl symbol visibility
+	symbol_visibility=
+	have_visibility=disabled
+	if test x$SYMBOL_VISIBILITY != xno; then
+	    AC_MSG_CHECKING(for symbol visibility support)
+	    if test x$GCC = xyes; then
+		VISIBILITY_CFLAGS="-fvisibility=hidden"
+	    else
+		AC_CHECK_DECL([__SUNPRO_C], [SUNCC="yes"], [SUNCC="no"])
+		if test x$SUNCC = xyes; then
+		    VISIBILITY_CFLAGS="-xldscope=hidden"
+		else
+		    have_visibility=no
+		fi
+	    fi
+	    if test x$have_visibility != xno; then
+		save_CFLAGS="$CFLAGS"
+		CFLAGS="$CFLAGS $VISIBILITY_CFLAGS"
+		AC_TRY_COMPILE(
+		    [#include <X11/Xfuncproto.h>
+		     extern _X_HIDDEN int hidden_int;
+		     extern _X_EXPORT int public_int;
+		     extern _X_HIDDEN int hidden_int_func(void);
+		     extern _X_EXPORT int public_int_func(void);],
+		    [],
+		    have_visibility=yes,
+		    have_visibility=no)
+		CFLAGS=$save_CFLAGS
+	    fi
+	    AC_MSG_RESULT([$have_visibility])
+	    if test x$have_visibility != xno; then
+		symbol_visibility=$VISIBILITY_CFLAGS
+		XORG_CFLAGS="$XORG_CFLAGS $VISIBILITY_CFLAGS"
+		XSERVER_CFLAGS="$XSERVER_CFLAGS $VISIBILITY_CFLAGS"
+	    fi
+	fi
+	dnl added to xorg-server.pc
+	AC_SUBST([symbol_visibility])
+	dnl ===================================================================
+
+	PKG_CHECK_MODULES([PCIACCESS], $LIBPCIACCESS)
+	SAVE_LIBS=$LIBS
+	SAVE_CFLAGS=$CFLAGS
+	CFLAGS=$PCIACCESS_CFLAGS
+	LIBS=$PCIACCESS_LIBS
+	AC_CHECK_FUNCS([pci_system_init_dev_mem])
+	AC_CHECK_FUNCS([pci_device_enable])
+	AC_CHECK_FUNCS([pci_device_is_boot_vga])
+	AC_CHECK_FUNCS([pci_device_vgaarb_init])
+	LIBS=$SAVE_LIBS
+	CFLAGS=$SAVE_CFLAGS
+	XORG_SYS_LIBS="$XORG_SYS_LIBS $PCIACCESS_LIBS $GLX_SYS_LIBS"
+	XORG_CFLAGS="$XORG_CFLAGS $PCIACCESS_CFLAGS"
+
+	case $host_os in
+	  linux*)
+		if test "x$LNXAPM" = xyes; then
+			XORG_CFLAGS="$XORG_CFLAGS -DXF86PM"
+		fi
+	  	XORG_OS="linux"
+		XORG_OS_SUBDIR="linux"
+		xorg_bus_linuxpci="yes"
+		linux_acpi="no"
+		case $host_cpu in
+		  ia64*)
+			linux_ia64=yes
+			linux_acpi="yes"
+			;;
+		  alpha*)
+		  	linux_alpha=yes
+			;;
+		  i*86|amd64*|x86_64*)
+			linux_acpi="yes"
+			;;
+		  *)
+			;;
+		esac
+		;;
+	  freebsd* | kfreebsd*-gnu | dragonfly*)
+	  	XORG_OS="freebsd"
+		XORG_OS_SUBDIR="bsd"
+		xorg_bus_bsdpci="yes"
+		;;
+	  netbsd*)
+	  	XORG_OS="netbsd"
+		XORG_OS_SUBDIR="bsd"
+		xorg_bus_bsdpci="yes"
+		;;
+	  openbsd*)
+		if test "x$ac_cv_BSD_APM" = xyes \
+			-o "x$ac_cv_BSD_KQUEUE_APM" = xyes; then
+			XORG_CFLAGS="$XORG_CFLAGS -DXF86PM"
+		fi
+	  	XORG_OS="openbsd"
+		XORG_OS_SUBDIR="bsd"
+		xorg_bus_bsdpci="yes"
+		;;
+	  solaris*)
+	  	XORG_OS="solaris"
+		XORG_OS_SUBDIR="solaris"
+		XORG_CFLAGS="$XORG_CFLAGS -DXF86PM"
+		# Use the same stubs as BSD for old functions, since we now
+		# use libpciaccess for PCI
+		xorg_bus_bsdpci="yes"
+		AC_CHECK_HEADERS([sys/kd.h])
+		AC_CHECK_HEADERS([sys/vt.h], [solaris_vt=yes], [solaris_vt=no])
+		# Check for minimum supported release
+		AC_MSG_CHECKING([Solaris version])
+	        OS_MINOR=`echo ${host_os}|$SED -e 's/^.*solaris2\.//' -e s'/\..*$//'`
+		if test "${OS_MINOR}" -ge 7 ; then
+	        	AC_MSG_RESULT(Solaris ${OS_MINOR})
+		else
+			AC_MSG_RESULT(Solaris `echo ${host_os}|$SED -e 's/^.*solaris//`)
+		fi
+		if test "${OS_MINOR}" -lt 8 ; then
+			AC_MSG_ERROR([This release no longer supports Solaris versions older than Solaris 8.])
+		fi
+		AC_CHECK_DECL([__SUNPRO_C], [SUNCC="yes"], [SUNCC="no"])
+		if test "x$SUNCC" = "xyes"; then
+			solaris_asm_inline="yes"
+		fi
+		AC_CHECK_DECL([_LP64], [SOLARIS_64="yes"], [SOLARIS_64="no"])
+			
+		case $host_cpu in
+		  sparc*)	
+			SOLARIS_INOUT_ARCH="sparcv8plus"
+			;;
+		  i*86)	
+			if test x$SOLARIS_64 = xyes ; then
+				SOLARIS_INOUT_ARCH="amd64"
+			else
+				SOLARIS_INOUT_ARCH="ia32"
+			fi
+			;;
+		  *)
+			AC_MSG_ERROR([Unsupported Solaris platform. Only SPARC & x86 \
+			are supported on Solaris in this release.   If you are \
+			interested in porting Xorg to your platform, please email \
+			xorg@lists.freedesktop.org.]) ;;
+		esac
+		AC_SUBST([SOLARIS_INOUT_ARCH])
+		if test x$solaris_asm_inline = xyes ; then
+			SOLARIS_ASM_CFLAGS='$(top_srcdir)/hw/xfree86/os-support/solaris/solaris-$(SOLARIS_INOUT_ARCH).il'
+			XORG_CFLAGS="${XORG_CFLAGS} "'$(SOLARIS_ASM_CFLAGS)'
+		fi
+		AC_SUBST([SOLARIS_ASM_CFLAGS])
+		if test "x$SUPPORT_PC98" = xauto; then
+			SUPPORT_PC98="no"
+		fi
+		;;
+	  gnu*)
+	  	XORG_OS="gnu"
+		XORG_OS_SUBDIR="hurd"
+		# Use the same stubs as BSD for old functions, since we now
+		# use libpciaccess for PCI
+		xorg_bus_bsdpci="yes"
+		;;
+	  *)
+	  	XORG_OS="unknown"
+		XORG_OS_SUBDIR="unknown"
+		AC_MSG_ERROR([m4_text_wrap(m4_join([ ],
+		[Your OS is unknown. Xorg currently only supports Linux,],
+		[Free/Open/Net/DragonFlyBSD, Solaris/OpenSolaris, & GNU Hurd.],
+		[If you are interested in porting Xorg to your platform,],
+		[please email xorg@lists.freedesktop.org.]))])
+		;;
+	esac
+
+	case $host_cpu in
+	  sparc*)
+		xorg_bus_sparc="yes"
+		;;
+	  i*86)
+		if test "x$SUPPORT_PC98" = xauto; then
+			SUPPORT_PC98="yes"
+		fi
+		;;
+	esac
+
+	if test "x$SUPPORT_PC98" = xauto; then
+		SUPPORT_PC98="no"
+	fi
+	if test "x$SUPPORT_PC98" = xyes; then
+		AC_DEFINE(SUPPORT_PC98, 1, [Support PC98])
+	fi
+	if test "x$XORG_OS_PCI" = x ; then
+		XORG_OS_PCI=$XORG_OS
+	fi
+	if test "x$DGA" = xauto; then
+		PKG_CHECK_MODULES(DGA, $DGAPROTO, [DGA=yes], [DGA=no])
+	fi
+	if test "x$DGA" = xyes; then
+		XORG_MODULES="$XORG_MODULES $DGAPROTO"
+		PKG_CHECK_MODULES(DGA, $DGAPROTO)
+		AC_DEFINE(DGA, 1, [Support DGA extension])
+		AC_DEFINE(XFreeXDGA, 1, [Build XDGA support])
+	fi
+
+	if test "x$XF86VIDMODE" = xauto; then
+		PKG_CHECK_MODULES(XF86VIDMODE, $VIDMODEPROTO, [XF86VIDMODE=yes], [XF86VIDMODE=no])
+	fi
+	if test "x$XF86VIDMODE" = xyes; then
+		XORG_MODULES="$XORG_MODULES $VIDMODEPROTO"
+		PKG_CHECK_MODULES(XF86VIDMODE, $VIDMODEPROTO)
+		AC_DEFINE(XF86VIDMODE, 1, [Support XFree86 Video Mode extension])
+	fi
+
+	if test -n "$XORG_MODULES"; then
+	        PKG_CHECK_MODULES(XORG_MODULES, [$XORG_MODULES])
+	        XORG_CFLAGS="$XORG_CFLAGS $XORG_MODULES_CFLAGS"
+	        XORG_SYS_LIBS="$XORG_SYS_LIBS $XORG_MODULES_LIBS"
+	fi
+
+	AC_SUBST([XORG_LIBS])
+	AC_SUBST([XORG_SYS_LIBS])
+	AC_SUBST([XORG_INCS])
+	AC_SUBST([XORG_OS])
+	AC_SUBST([XORG_OS_SUBDIR])
+
+	AC_PATH_PROG(PERL, perl, no)
+	dnl unlikely as this may be ...
+	if test "x$PERL" = xno; then
+		AC_MSG_ERROR([Perl is required to build the XFree86/Xorg DDX.])
+	fi
+	AC_SUBST(PERL)
+
+	AC_SUBST([XORG_CFLAGS])
+
+	dnl these only go in xorg-config.h
+	XF86CONFIGFILE="xorg.conf"
+	XF86CONFIGDIR="xorg.conf.d"
+	AC_SUBST(XF86CONFIGDIR)
+	CONFIGFILE="$sysconfdir/$XF86CONFIGFILE"
+	LOGPREFIX="$logdir/Xorg."
+	AC_DEFINE(XORG_SERVER, 1, [Building Xorg server])
+	AC_DEFINE(XORGSERVER, 1, [Building Xorg server])
+	AC_DEFINE(XFree86Server, 1, [Building XFree86 server])
+	AC_DEFINE(XFree86LOADER, 1, [Building loadable XFree86 server])
+	AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version])
+	AC_DEFINE(NEED_XF86_TYPES, 1, [Need XFree86 typedefs])
+	AC_DEFINE(NEED_XF86_PROTOTYPES, 1, [Need XFree86 helper functions])
+	AC_DEFINE(__XSERVERNAME__, "Xorg", [Name of X server])
+	AC_DEFINE_DIR(__XCONFIGFILE__, XF86CONFIGFILE, [Name of configuration file])
+	AC_DEFINE_DIR(XF86CONFIGFILE, XF86CONFIGFILE, [Name of configuration file])
+	AC_DEFINE_DIR(__XCONFIGDIR__, XF86CONFIGDIR, [Name of configuration directory])
+	AC_DEFINE_DIR(DEFAULT_MODULE_PATH, moduledir, [Default module search path])
+	AC_DEFINE_DIR(DEFAULT_LIBRARY_PATH, libdir, [Default library install path])
+	AC_DEFINE_DIR(DEFAULT_LOGPREFIX, LOGPREFIX, [Default log location])
+	AC_DEFINE_UNQUOTED(__VENDORDWEBSUPPORT__, ["$VENDOR_WEB"], [Vendor web address for support])
+	AC_DEFINE(XSERVER_LIBPCIACCESS, 1, [Use libpciaccess for all pci manipulation])
+	if test "x$VGAHW" = xyes; then
+		AC_DEFINE(WITH_VGAHW, 1, [Building vgahw module])
+	fi
+
+	driverdir="$moduledir/drivers"
+	AC_SUBST([moduledir])
+	AC_SUBST([driverdir])
+	sdkdir="$includedir/xorg"
+	extdir="$includedir/X11/extensions"
+	sysconfigdir="$datadir/X11/$XF86CONFIGDIR"
+	AC_SUBST([sdkdir])
+	AC_SUBST([extdir])
+	AC_SUBST([sysconfigdir])
+	AC_SUBST([logdir])
+
+	# stuff the ABI versions into the pc file too
+	extract_abi() {
+	    grep ^.define.*${1}_VERSION ${srcdir}/hw/xfree86/common/xf86Module.h | tr '(),' '  .' | awk '{ print $4$5 }'
+	}
+	abi_ansic=`extract_abi ANSIC`
+	abi_videodrv=`extract_abi VIDEODRV`
+	abi_xinput=`extract_abi XINPUT`
+	abi_extension=`extract_abi EXTENSION`
+	AC_SUBST([abi_ansic])
+	AC_SUBST([abi_videodrv])
+	AC_SUBST([abi_xinput])
+	AC_SUBST([abi_extension])
+fi
+AM_CONDITIONAL([XORG], [test "x$XORG" = xyes])
+AM_CONDITIONAL([XORG_BUS_LINUXPCI], [test "x$xorg_bus_linuxpci" = xyes])
+AM_CONDITIONAL([XORG_BUS_BSDPCI], [test "x$xorg_bus_bsdpci" = xyes])
+AM_CONDITIONAL([XORG_BUS_SPARC], [test "x$xorg_bus_sparc" = xyes])
+AM_CONDITIONAL([LINUX_IA64], [test "x$linux_ia64" = xyes])
+AM_CONDITIONAL([LINUX_ALPHA], [test "x$linux_alpha" = xyes])
+AM_CONDITIONAL([LNXACPI], [test "x$linux_acpi" = xyes])
+AM_CONDITIONAL([SOLARIS_ASM_INLINE], [test "x$solaris_asm_inline" = xyes])
+AM_CONDITIONAL([SOLARIS_VT], [test "x$solaris_vt" = xyes])
+AM_CONDITIONAL([DGA], [test "x$DGA" = xyes])
+AM_CONDITIONAL([XF86VIDMODE], [test "x$XF86VIDMODE" = xyes])
+
+dnl XWin DDX
+
+AC_MSG_CHECKING([whether to build XWin DDX])
+if test "x$XWIN" = xauto; then
+	case $host_os in
+		cygwin*) XWIN="yes" ;;
+		mingw*) XWIN="yes" ;;
+		*) XWIN="no" ;;
+	esac
+fi
+AC_MSG_RESULT([$XWIN])
+
+if test "x$XWIN" = xyes; then
+	AC_DEFINE_DIR(SYSCONFDIR, sysconfdir, [Location of system.XWinrc])
+	AC_DEFINE_DIR(DEFAULT_LOGDIR, logdir, [Default log location])
+	AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version])
+	AC_DEFINE_UNQUOTED(__VENDORDWEBSUPPORT__, ["$VENDOR_WEB"], [Vendor web address for support])
+	AC_CHECK_TOOL(WINDRES, windres)
+
+	PKG_CHECK_MODULES([XWINMODULES],[x11 xdmcp xau])
+
+	if test "x$WINDOWSWM" = xauto; then
+		PKG_CHECK_EXISTS($WINDOWSWMPROTO, [WINDOWSWM=yes], [WINDOWSWM=no])
+	fi
+	if test "x$WINDOWSWM" = xyes ; then
+		PKG_CHECK_MODULES(WINDOWSWM, $WINDOWSWMPROTO)
+		XWINMODULES_CFLAGS="$XWINMODULES_CFLAGS $WINDOWSWM_CFLAGS"
+		AC_DEFINE(ROOTLESS,1,[Build Rootless code])
+	fi
+
+	case $host_os in
+		cygwin*)
+			XWIN_SERVER_NAME=XWin
+			AC_DEFINE(HAS_DEVWINDOWS,1,[Cygwin has /dev/windows for signaling new win32 messages])
+			;;
+		mingw*)
+			XWIN_SERVER_NAME=Xming
+			AC_DEFINE(RELOCATE_PROJECTROOT,1,[Make PROJECT_ROOT relative to the xserver location])
+			AC_DEFINE(HAS_WINSOCK,1,[Use Windows sockets])
+			XWIN_SYS_LIBS=-lwinsock2
+			;;
+	esac
+	XWIN_LIBS="$FB_LIB $MI_LIB $FIXES_LIB $XEXT_LIB $RANDR_LIB $RENDER_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $DAMAGE_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $OS_LIB"
+	XWIN_SYS_LIBS="$XWIN_SYS_LIBS $XWINMODULES_LIBS"
+	AC_SUBST(XWIN_LIBS)
+	AC_SUBST(XWIN_SERVER_NAME)
+	AC_SUBST(XWIN_SYS_LIBS)
+
+	if test "x$DEBUGGING" = xyes; then
+		AC_DEFINE(CYGDEBUG, 1, [Simple debug messages])
+		AC_DEFINE(CYGWINDOWING_DEBUG, 1, [Debug messages for window handling])
+		AC_DEFINE(CYGMULTIWINDOW_DEBUG, 1, [Debug window manager])
+	fi
+
+	AC_DEFINE(DDXOSVERRORF, 1, [Use OsVendorVErrorF])
+	AC_DEFINE(DDXBEFORERESET, 1, [Use ddxBeforeReset ])
+fi
+AM_CONDITIONAL(XWIN, [test "x$XWIN" = xyes])
+AM_CONDITIONAL(XWIN_MULTIWINDOW, [test "x$XWIN" = xyes])
+AM_CONDITIONAL(XWIN_MULTIWINDOWEXTWM, [test "x$XWIN" = xyes && test "x$WINDOWSWM" = xyes])
+AM_CONDITIONAL(XWIN_CLIPBOARD, [test "x$XWIN" = xyes])
+AM_CONDITIONAL(XWIN_GLX_WINDOWS, [test "x$XWIN" = xyes && false])
+AM_CONDITIONAL(XWIN_NATIVEGDI, [test "x$XWIN" = xyes && false])
+AM_CONDITIONAL(XWIN_PRIMARYFB, [test "x$XWIN" = xyes && false])
+AM_CONDITIONAL(XWIN_RANDR, [test "x$XWIN" = xyes])
+AM_CONDITIONAL(XWIN_XV, [test "x$XWIN" = xyes && test "x$XV" = xyes])
+
+dnl Darwin / OS X DDX
+if test "x$XQUARTZ" = xyes; then
+	AC_DEFINE(XQUARTZ,1,[Have Quartz])
+	AC_DEFINE(ROOTLESS,1,[Build Rootless code])
+
+	DARWIN_LIBS="$MI_LIB $OS_LIB $DIX_LIB $MAIN_LIB $FB_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $RECORD_LIB $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $XPSTUBS_LIB"
+	AC_SUBST([DARWIN_LIBS])
+
+	AC_CHECK_LIB([Xplugin],[xp_init],[:])
+
+	CFLAGS="${CFLAGS} -DROOTLESS_SAFEALPHA -DNO_ALLOCA"
+
+	PKG_CHECK_MODULES(XPBPROXY, $APPLEWMPROTO $LIBAPPLEWM xfixes x11)
+
+        if test "x$XQUARTZ_SPARKLE" = xyes ; then
+                AC_DEFINE(XQUARTZ_SPARKLE,1,[Support application updating through sparkle.])
+        fi
+
+	if test "x$STANDALONE_XPBPROXY" = xyes ; then
+		AC_DEFINE(STANDALONE_XPBPROXY,1,[Build a standalone xpbproxy])
+	fi
+fi
+
+# Support for objc in autotools is minimal and not documented.
+OBJC='$(CC)'
+OBJCLD='$(CCLD)'
+OBJCLINK='$(LINK)'
+OBJCFLAGS='$(CFLAGS)'
+AC_SUBST([OBJC])
+AC_SUBST([OBJCCLD])
+AC_SUBST([OBJCLINK])
+AC_SUBST([OBJCFLAGS])
+# internal, undocumented automake func follows :(
+_AM_DEPENDENCIES([OBJC])
+AM_CONDITIONAL(XQUARTZ, [test "x$XQUARTZ" = xyes])
+AM_CONDITIONAL(XQUARTZ_SPARKLE, [test "x$XQUARTZ_SPARKLE" != "xno"])
+AM_CONDITIONAL(STANDALONE_XPBPROXY, [test "x$STANDALONE_XPBPROXY" = xyes])
+
+dnl DMX DDX
+PKG_CHECK_MODULES(
+	[DMXMODULES],
+	[xmuu $LIBXEXT x11 xrender xfixes $LIBXI $DMXPROTO xau $XDMCP_MODULES],
+	[PKG_CHECK_MODULES(
+		[XDMXCONFIG_DEP],
+		[xaw7 xmu xt xpm x11],
+		[have_dmx=yes],
+		[have_dmx=no])],
+	[have_dmx=no])
+AC_MSG_CHECKING([whether to build Xdmx DDX])
+if test "x$DMX" = xauto; then
+	DMX="$have_dmx"
+	case $host_os in
+		cygwin*) DMX="no" ;;
+		darwin*) DMX="no" ;;
+	esac
+fi
+AC_MSG_RESULT([$DMX])
+AM_CONDITIONAL(DMX, [test "x$DMX" = xyes])
+
+if test "x$DMX" = xyes; then
+	if test "x$have_dmx" = xno; then
+		AC_MSG_ERROR([Xdmx build explicitly requested, but required
+		              modules not found.])
+	fi
+	DMX_INCLUDES="$XEXT_INC $RENDER_INC $RECORD_INC"
+	XDMX_CFLAGS="$DMXMODULES_CFLAGS"
+	XDMX_LIBS="$FB_LIB $MI_LIB $XEXT_LIB $RENDER_LIB $RECORD_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $MIEXT_SYNC_LIB $MIEXT_SHADOW_LIB $MIEXT_DAMAGE_LIB $COMPOSITE_LIB $DAMAGE_LIB $MAIN_LIB $DIX_LIB $CONFIG_LIB $OS_LIB $FIXES_LIB"
+	XDMX_SYS_LIBS="$DMXMODULES_LIBS"
+	AC_SUBST([XDMX_CFLAGS])
+	AC_SUBST([XDMX_LIBS])
+	AC_SUBST([XDMX_SYS_LIBS])
+
+dnl USB sources in DMX require <linux/input.h>
+	AC_CHECK_HEADER([linux/input.h], DMX_BUILD_USB="yes",
+			DMX_BUILD_USB="no")
+dnl Linux sources in DMX require <linux/keyboard.h>
+	AC_CHECK_HEADER([linux/keyboard.h], DMX_BUILD_LNX="yes",
+			DMX_BUILD_LNX="no")
+	AC_SUBST(XDMXCONFIG_DEP_CFLAGS)
+	AC_SUBST(XDMXCONFIG_DEP_LIBS)
+	PKG_CHECK_MODULES([DMXEXAMPLES_DEP], [$LIBDMX $LIBXEXT x11])
+	AC_SUBST(DMXEXAMPLES_DEP_LIBS)
+	PKG_CHECK_MODULES([DMXXMUEXAMPLES_DEP], [$LIBDMX xmu $LIBXEXT x11])
+	AC_SUBST(DMXXMUEXAMPLES_DEP_LIBS)
+	PKG_CHECK_MODULES([DMXXIEXAMPLES_DEP], [$LIBDMX $LIBXI $LIBXEXT x11])
+	AC_SUBST(DMXXIEXAMPLES_DEP_LIBS)
+	PKG_CHECK_MODULES([XTSTEXAMPLES_DEP], [$LIBXTST $LIBXEXT x11])
+	AC_SUBST(XTSTEXAMPLES_DEP_LIBS)
+	PKG_CHECK_MODULES([XRESEXAMPLES_DEP], [xres $LIBXEXT x11])
+	AC_SUBST(XRESEXAMPLES_DEP_LIBS)
+	PKG_CHECK_MODULES([X11EXAMPLES_DEP], [$LIBXEXT x11])
+	AC_SUBST(X11EXAMPLES_DEP_LIBS)
+
+fi
+AM_CONDITIONAL([DMX_BUILD_LNX], [test "x$DMX_BUILD_LNX" = xyes])
+AM_CONDITIONAL([DMX_BUILD_USB], [test "x$DMX_BUILD_USB" = xyes])
+
+dnl kdrive DDX
+
+XEPHYR_LIBS=
+XEPHYR_INCS=
+
+AM_CONDITIONAL(KDRIVE, [test x$KDRIVE = xyes])
+
+if test "$KDRIVE" = yes; then
+    AC_DEFINE(KDRIVESERVER,1,[Build Kdrive X server])
+    AC_DEFINE(KDRIVEDDXACTIONS,,[Build kdrive ddx])
+
+    AC_CHECK_HEADERS([linux/fb.h])
+    if test "$ac_cv_header_linux_fb_h" = yes && test "x$XFBDEV" = xauto; then
+        XFBDEV=yes
+    fi
+
+    if test "x$XFBDEV" = xyes; then
+        KDRIVEFBDEVLIB=yes
+        AC_DEFINE(KDRIVEFBDEV, 1, [Build fbdev-based kdrive server])
+    fi
+
+
+    PKG_CHECK_MODULES([TSLIB], [tslib-0.0], [HAVE_TSLIB="yes"], [HAVE_TSLIB="no"])
+    if test "x$HAVE_TSLIB" = xno; then
+        AC_CHECK_LIB(ts, ts_open, [
+			HAVE_TSLIB="yes"
+			TSLIB_LIBS="-lts"
+		])
+    fi
+
+    if test "xTSLIB" = xauto; then
+        TSLIB="$HAVE_TSLIB"
+    fi
+
+    if test "x$TSLIB" = xyes; then
+        if ! test "x$HAVE_TSLIB" = xyes; then
+            AC_MSG_ERROR([tslib must be installed to build the tslib driver. See http://tslib.berlios.de/])
+        else
+            AC_DEFINE(TSLIB, 1, [Have tslib support])
+        fi
+    fi
+
+    if test "x$KDRIVE_KBD" = xyes; then
+       AC_DEFINE(KDRIVE_KBD, 1, [Enable KDrive kbd driver])
+    fi
+    if test "x$KDRIVE_EVDEV" = xyes; then
+       AC_DEFINE(KDRIVE_EVDEV, 1, [Enable KDrive evdev driver])
+    fi
+    if test "x$KDRIVE_MOUSE" = xyes; then
+       AC_DEFINE(KDRIVE_MOUSE, 1, [Enable KDrive mouse driver])
+    fi
+
+    XEPHYR_REQUIRED_LIBS="x11 $LIBXEXT xau xdmcp"
+    if test "x$XV" = xyes; then
+        XEPHYR_REQUIRED_LIBS="$XEPHYR_REQUIRED_LIBS xv"
+    fi
+    if test "x$DRI" = xyes && test "x$GLX" = xyes; then
+        XEPHYR_REQUIRED_LIBS="$XEPHYR_REQUIRED_LIBS $LIBGL libdrm"
+    fi
+
+    PKG_CHECK_MODULES(XEPHYR, $XEPHYR_REQUIRED_LIBS, [xephyr="yes"], [xephyr="no"])
+    if test "x$XEPHYR" = xauto; then
+        XEPHYR=$xephyr
+    fi
+    if test "x$XEPHYR" = xyes && test "x$xephyr" = xno; then	
+        AC_MSG_ERROR([Xephyr dependencies missing])
+    fi
+
+    # Xephyr needs nanosleep() which is in librt on Solaris
+    AC_CHECK_FUNC([nanosleep], [],
+        AC_CHECK_LIB([rt], [nanosleep], XEPHYR_LIBS="$XEPHYR_LIBS -lrt"))
+    
+    # damage shadow extension glx (NOTYET) fb mi
+    KDRIVE_INC='-I$(top_srcdir)/hw/kdrive/src'
+    KDRIVE_PURE_INCS="$KDRIVE_INC $MIEXT_SYNC_INC $MIEXT_DAMAGE_INC $MIEXT_SHADOW_INC $XEXT_INC $FB_INC $MI_INC"
+    KDRIVE_OS_INC='-I$(top_srcdir)/hw/kdrive/linux'
+    KDRIVE_INCS="$KDRIVE_PURE_INCS $KDRIVE_OS_INC"
+    
+    KDRIVE_CFLAGS="$XSERVER_CFLAGS -DHAVE_KDRIVE_CONFIG_H $TSLIB_CFLAGS"
+
+    KDRIVE_PURE_LIBS="$FB_LIB $MI_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $OS_LIB"
+    KDRIVE_LIB='$(top_builddir)/hw/kdrive/src/libkdrive.la'
+    case $host_os in
+	*linux*)
+	    KDRIVE_OS_LIB='$(top_builddir)/hw/kdrive/linux/liblinux.la'
+            KDRIVELINUX=yes
+	    if test "x$KDRIVE_EVDEV" = xauto; then
+		KDRIVE_EVDEV=yes
+	    fi
+	    if test "x$KDRIVE_KBD" = xauto; then
+		KDRIVE_KBD=yes
+	    fi
+	    if test "x$KDRIVE_MOUSE" = xauto; then
+		KDRIVE_MOUSE=yes
+	    fi
+	    ;;
+	*)
+	    if test "x$KDRIVE_EVDEV" = xauto; then
+		KDRIVE_EVDEV=no
+	    fi
+	    if test "x$KDRIVE_KBD" = xauto; then
+		KDRIVE_KBD=no
+	    fi
+	    if test "x$KDRIVE_MOUSE" = xauto; then
+		KDRIVE_MOUSE=no
+	    fi
+	    ;;
+    esac
+    KDRIVE_STUB_LIB='$(top_builddir)/hw/kdrive/src/libkdrivestubs.la'
+    KDRIVE_LOCAL_LIBS="$MAIN_LIB $DIX_LIB $KDRIVE_LIB $KDRIVE_STUB_LIB"
+    KDRIVE_LOCAL_LIBS="$KDRIVE_LOCAL_LIBS $FB_LIB $MI_LIB $KDRIVE_PURE_LIBS"
+    KDRIVE_LOCAL_LIBS="$KDRIVE_LOCAL_LIBS $KDRIVE_OS_LIB"
+    KDRIVE_LIBS="$KDRIVE_LOCAL_LIBS $XSERVER_SYS_LIBS $GLX_SYS_LIBS $DLOPEN_LIBS $TSLIB_LIBS"
+
+    AC_SUBST([XEPHYR_LIBS])
+    AC_SUBST([XEPHYR_INCS])
+fi
+AC_SUBST([KDRIVE_INCS])
+AC_SUBST([KDRIVE_PURE_INCS])
+AC_SUBST([KDRIVE_CFLAGS])
+AC_SUBST([KDRIVE_PURE_LIBS])
+AC_SUBST([KDRIVE_LOCAL_LIBS])
+AC_SUBST([KDRIVE_LIBS])
+AM_CONDITIONAL(KDRIVELINUX, [test "x$KDRIVELINUX" = xyes])
+AM_CONDITIONAL(KDRIVE_EVDEV, [test "x$KDRIVE_EVDEV" = xyes])
+AM_CONDITIONAL(KDRIVE_KBD,   [test "x$KDRIVE_KBD" = xyes])
+AM_CONDITIONAL(KDRIVE_MOUSE, [test "x$KDRIVE_MOUSE" = xyes])
+AM_CONDITIONAL(TSLIB, [test "x$HAVE_TSLIB" = xyes])
+AM_CONDITIONAL(KDRIVEFBDEV, [test "x$XFBDEV" = xyes])
+AM_CONDITIONAL(XEPHYR, [test "x$KDRIVE" = xyes && test "x$XEPHYR" = xyes])
+AM_CONDITIONAL(BUILD_KDRIVEFBDEVLIB, [test "x$KDRIVE" = xyes && test "x$KDRIVEFBDEVLIB" = xyes])
+AM_CONDITIONAL(XFAKESERVER, [test "x$KDRIVE" = xyes && test "x$XFAKE" = xyes])
+
+dnl and the rest of these are generic, so they're in config.h
+dnl 
+dnl though, thanks to the passing of some significant amount of time, the
+dnl above is probably a complete fallacy, and you should not rely on it.
+dnl but this is still actually better than imake, honest. -daniels
+
+AC_TRY_COMPILE([
+#include <features.h>
+#ifndef __GLIBC__
+#error not glibc
+#endif
+], [], [AC_DEFINE(_GNU_SOURCE, 1,
+	[ Enable GNU and other extensions to the C environment for glibc])])
+
+AC_DEFINE_DIR(PROJECTROOT, prefix, [Overall prefix])
+
+AC_SUBST([RELEASE_DATE])
+BUILD_DATE="`date +'%Y%m%d'`"
+AC_SUBST([BUILD_DATE])
+BUILD_TIME="`date +'1%H%M%S'`"
+AC_SUBST([BUILD_TIME])
+
+DIX_CFLAGS="-DHAVE_DIX_CONFIG_H $XSERVER_CFLAGS"
+
+AC_SUBST([DIX_CFLAGS])
+
+AC_SUBST([libdir])
+AC_SUBST([exec_prefix])
+AC_SUBST([prefix])
+
+AC_OUTPUT([
+Makefile
+glx/Makefile
+include/Makefile
+composite/Makefile
+damageext/Makefile
+dbe/Makefile
+dix/Makefile
+doc/Makefile
+doc/man/Makefile
+doc/xml/Makefile
+doc/xml/dtrace/Makefile
+doc/xml/xserver.ent
+fb/Makefile
+record/Makefile
+config/Makefile
+mi/Makefile
+miext/Makefile
+miext/sync/Makefile
+miext/damage/Makefile
+miext/shadow/Makefile
+miext/cw/Makefile
+miext/rootless/Makefile
+os/Makefile
+randr/Makefile
+render/Makefile
+xkb/Makefile
+Xext/Makefile
+Xi/Makefile
+xfixes/Makefile
+exa/Makefile
+hw/Makefile
+hw/xfree86/Makefile
+hw/xfree86/common/Makefile
+hw/xfree86/common/xf86Build.h
+hw/xfree86/ddc/Makefile
+hw/xfree86/dixmods/Makefile
+hw/xfree86/dixmods/extmod/Makefile
+hw/xfree86/doc/Makefile
+hw/xfree86/doc/devel/Makefile
+hw/xfree86/doc/man/Makefile
+hw/xfree86/doc/sgml/Makefile
+hw/xfree86/dri/Makefile
+hw/xfree86/dri2/Makefile
+hw/xfree86/exa/Makefile
+hw/xfree86/fbdevhw/Makefile
+hw/xfree86/i2c/Makefile
+hw/xfree86/int10/Makefile
+hw/xfree86/loader/Makefile
+hw/xfree86/modes/Makefile
+hw/xfree86/os-support/Makefile
+hw/xfree86/os-support/bsd/Makefile
+hw/xfree86/os-support/bus/Makefile
+hw/xfree86/os-support/hurd/Makefile
+hw/xfree86/os-support/misc/Makefile
+hw/xfree86/os-support/linux/Makefile
+hw/xfree86/os-support/sco/Makefile
+hw/xfree86/os-support/solaris/Makefile
+hw/xfree86/parser/Makefile
+hw/xfree86/ramdac/Makefile
+hw/xfree86/shadowfb/Makefile
+hw/xfree86/vbe/Makefile
+hw/xfree86/vgahw/Makefile
+hw/xfree86/x86emu/Makefile
+hw/xfree86/xaa/Makefile
+hw/xfree86/utils/Makefile
+hw/xfree86/utils/cvt/Makefile
+hw/xfree86/utils/gtf/Makefile
+hw/dmx/config/Makefile
+hw/dmx/doc/Makefile
+hw/dmx/examples/Makefile
+hw/dmx/input/Makefile
+hw/dmx/glxProxy/Makefile
+hw/dmx/Makefile
+hw/vfb/Makefile
+hw/xnest/Makefile
+hw/xwin/Makefile
+hw/xwin/glx/Makefile
+hw/xquartz/Makefile
+hw/xquartz/GL/Makefile
+hw/xquartz/bundle/Makefile
+hw/xquartz/doc/Makefile
+hw/xquartz/mach-startup/Makefile
+hw/xquartz/pbproxy/Makefile
+hw/xquartz/xpr/Makefile
+hw/kdrive/Makefile
+hw/kdrive/ephyr/Makefile
+hw/kdrive/fake/Makefile
+hw/kdrive/fbdev/Makefile
+hw/kdrive/linux/Makefile
+hw/kdrive/src/Makefile
+test/Makefile
+test/xi2/Makefile
+xorg-server.pc
+])
diff --git a/xorg-server/dix/getevents.c b/xorg-server/dix/getevents.c
index 96b5ce29c..794df420b 100644
--- a/xorg-server/dix/getevents.c
+++ b/xorg-server/dix/getevents.c
@@ -1,1309 +1,1323 @@
-/*

- * Copyright © 2006 Nokia Corporation

- * Copyright © 2006-2007 Daniel Stone

- * Copyright © 2008 Red Hat, Inc.

- *

- * Permission is hereby granted, free of charge, to any person obtaining a

- * copy of this software and associated documentation files (the "Software"),

- * to deal in the Software without restriction, including without limitation

- * the rights to use, copy, modify, merge, publish, distribute, sublicense,

- * and/or sell copies of the Software, and to permit persons to whom the

- * Software is furnished to do so, subject to the following conditions:

- *

- * The above copyright notice and this permission notice (including the next

- * paragraph) shall be included in all copies or substantial portions of the

- * Software.

- *

- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING

- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER

- * DEALINGS IN THE SOFTWARE.

- *

- * Authors: Daniel Stone <daniel@fooishbar.org>

- *          Peter Hutterer <peter.hutterer@who-t.net>

- */

-

-#ifdef HAVE_DIX_CONFIG_H

-#include <dix-config.h>

-#endif

-

-#include <X11/X.h>

-#include <X11/keysym.h>

-#include <X11/Xproto.h>

-#include <math.h>

-

-#include "misc.h"

-#include "resource.h"

-#include "inputstr.h"

-#include "scrnintstr.h"

-#include "cursorstr.h"

-#include "dixstruct.h"

-#include "globals.h"

-#include "dixevents.h"

-#include "mipointer.h"

-#include "eventstr.h"

-#include "eventconvert.h"

-#include "inpututils.h"

-

-#include <X11/extensions/XKBproto.h>

-#include "xkbsrv.h"

-

-#ifdef PANORAMIX

-#include "panoramiX.h"

-#include "panoramiXsrv.h"

-#endif

-

-#include <X11/extensions/XI.h>

-#include <X11/extensions/XIproto.h>

-#include <pixman.h>

-#include "exglobals.h"

-#include "exevents.h"

-#include "exglobals.h"

-#include "extnsionst.h"

-#include "listdev.h" /* for sizing up DeviceClassesChangedEvent */

-

-/* Number of motion history events to store. */

-#define MOTION_HISTORY_SIZE 256

-

-/* InputEventList is the container list for all input events generated by the

- * DDX. The DDX is expected to call GetEventList() and then pass the list into

- * Get{Pointer|Keyboard}Events.

- */

-EventListPtr InputEventList = NULL;

-int InputEventListLen = 0;

-

-int

-GetEventList(EventListPtr* list)

-{

-    *list = InputEventList;

-    return InputEventListLen;

-}

-

-/**

- * Pick some arbitrary size for Xi motion history.

- */

-int

-GetMotionHistorySize(void)

-{

-    return MOTION_HISTORY_SIZE;

-}

-

-void

-set_button_down(DeviceIntPtr pDev, int button, int type)

-{

-    if (type == BUTTON_PROCESSED)

-        SetBit(pDev->button->down, button);

-    else

-        SetBit(pDev->button->postdown, button);

-}

-

-void

-set_button_up(DeviceIntPtr pDev, int button, int type)

-{

-    if (type == BUTTON_PROCESSED)

-        ClearBit(pDev->button->down, button);

-    else

-        ClearBit(pDev->button->postdown, button);

-}

-

-Bool

-button_is_down(DeviceIntPtr pDev, int button, int type)

-{

-    Bool ret = FALSE;

-

-    if (type & BUTTON_PROCESSED)

-        ret = ret || BitIsOn(pDev->button->down, button);

-    if (type & BUTTON_POSTED)

-        ret = ret || BitIsOn(pDev->button->postdown, button);

-

-    return ret;

-}

-

-void

-set_key_down(DeviceIntPtr pDev, int key_code, int type)

-{

-    if (type == KEY_PROCESSED)

-        SetBit(pDev->key->down, key_code);

-    else

-        SetBit(pDev->key->postdown, key_code);

-}

-

-void

-set_key_up(DeviceIntPtr pDev, int key_code, int type)

-{

-    if (type == KEY_PROCESSED)

-        ClearBit(pDev->key->down, key_code);

-    else

-        ClearBit(pDev->key->postdown, key_code);

-}

-

-Bool

-key_is_down(DeviceIntPtr pDev, int key_code, int type)

-{

-    Bool ret = FALSE;

-

-    if (type & KEY_PROCESSED)

-        ret = ret || BitIsOn(pDev->key->down, key_code);

-    if (type & KEY_POSTED)

-        ret = ret || BitIsOn(pDev->key->postdown, key_code);

-

-    return ret;

-}

-

-static Bool

-key_autorepeats(DeviceIntPtr pDev, int key_code)

-{

-    return !!(pDev->kbdfeed->ctrl.autoRepeats[key_code >> 3] &

-              (1 << (key_code & 7)));

-}

-

-static void

-init_event(DeviceIntPtr dev, DeviceEvent* event, Time ms)

-{

-    memset(event, 0, sizeof(DeviceEvent));

-    event->header = ET_Internal;

-    event->length = sizeof(DeviceEvent);

-    event->time = ms;

-    event->deviceid = dev->id;

-    event->sourceid = dev->id;

-}

-

-static void

-init_raw(DeviceIntPtr dev, RawDeviceEvent *event, Time ms, int type, int detail)

-{

-    memset(event, 0, sizeof(RawDeviceEvent));

-    event->header = ET_Internal;

-    event->length = sizeof(RawDeviceEvent);

-    event->type = ET_RawKeyPress - ET_KeyPress + type;

-    event->time = ms;

-    event->deviceid = dev->id;

-    event->sourceid = dev->id;

-    event->detail.button = detail;

-}

-

-static void

-set_raw_valuators(RawDeviceEvent *event, ValuatorMask *mask, int32_t* data)

-{

-    int i;

-

-    for (i = 0; i < valuator_mask_size(mask); i++)

-    {

-        if (valuator_mask_isset(mask, i))

-        {

-            SetBit(event->valuators.mask, i);

-            data[i] = valuator_mask_get(mask, i);

-        }

-    }

-}

-

-

-static void

-set_valuators(DeviceIntPtr dev, DeviceEvent* event, ValuatorMask *mask)

-{

-    int i;

-

-    for (i = 0; i < valuator_mask_size(mask); i++)

-    {

-        if (valuator_mask_isset(mask, i))

-        {

-            SetBit(event->valuators.mask, i);

-            if (valuator_get_mode(dev, i) == Absolute)

-                SetBit(event->valuators.mode, i);

-            event->valuators.data[i] = valuator_mask_get(mask, i);

-            event->valuators.data_frac[i] =

-                dev->last.remainder[i] * (1 << 16) * (1 << 16);

-        }

-    }

-}

-

-void

-CreateClassesChangedEvent(EventList* event,

-                          DeviceIntPtr master,

-                          DeviceIntPtr slave,

-                          int type)

-{

-    int i;

-    DeviceChangedEvent *dce;

-    CARD32 ms = GetTimeInMillis();

-

-    dce = (DeviceChangedEvent*)event->event;

-    memset(dce, 0, sizeof(DeviceChangedEvent));

-    dce->deviceid = slave->id;

-    dce->masterid = master->id;

-    dce->header = ET_Internal;

-    dce->length = sizeof(DeviceChangedEvent);

-    dce->type = ET_DeviceChanged;

-    dce->time = ms;

-    dce->flags = type;

-    dce->flags |= DEVCHANGE_SLAVE_SWITCH;

-    dce->sourceid = slave->id;

-

-    if (slave->button)

-    {

-        dce->buttons.num_buttons = slave->button->numButtons;

-        for (i = 0; i < dce->buttons.num_buttons; i++)

-            dce->buttons.names[i] = slave->button->labels[i];

-    }

-    if (slave->valuator)

-    {

-        dce->num_valuators = slave->valuator->numAxes;

-        for (i = 0; i < dce->num_valuators; i++)

-        {

-            dce->valuators[i].min = slave->valuator->axes[i].min_value;

-            dce->valuators[i].max = slave->valuator->axes[i].max_value;

-            dce->valuators[i].resolution = slave->valuator->axes[i].resolution;

-            dce->valuators[i].mode = slave->valuator->axes[i].mode;

-            dce->valuators[i].name = slave->valuator->axes[i].label;

-        }

-    }

-    if (slave->key)

-    {

-        dce->keys.min_keycode = slave->key->xkbInfo->desc->min_key_code;

-        dce->keys.max_keycode = slave->key->xkbInfo->desc->max_key_code;

-    }

-}

-

-/**

- * Rescale the coord between the two axis ranges.

- */

-static int

-rescaleValuatorAxis(int coord, float remainder, float *remainder_return, AxisInfoPtr from, AxisInfoPtr to,

-                    int defmax)

-{

-    int fmin = 0, tmin = 0, fmax = defmax, tmax = defmax, coord_return;

-    float value;

-

-    if(from && from->min_value < from->max_value) {

-        fmin = from->min_value;

-        fmax = from->max_value;

-    }

-    if(to && to->min_value < to->max_value) {

-        tmin = to->min_value;

-        tmax = to->max_value;

-    }

-

-    if(fmin == tmin && fmax == tmax) {

-        if (remainder_return)

-            *remainder_return = remainder;

-        return coord;

-    }

-

-    if(fmax == fmin) { /* avoid division by 0 */

-        if (remainder_return)

-            *remainder_return = 0.0;

-        return 0;

-    }

-

-    value = (coord + remainder - fmin) * (tmax - tmin) / (fmax - fmin) + tmin;

-    coord_return = lroundf(value);

-    if (remainder_return)

-        *remainder_return = value - coord_return;

-    return coord_return;

-}

-

-/**

- * Update all coordinates when changing to a different SD

- * to ensure that relative reporting will work as expected

- * without loss of precision.

- *

- * pDev->last.valuators will be in absolute device coordinates after this

- * function.

- */

-static void

-updateSlaveDeviceCoords(DeviceIntPtr master, DeviceIntPtr pDev)

-{

-    ScreenPtr scr = miPointerGetScreen(pDev);

-    int i;

-    DeviceIntPtr lastSlave;

-

-    /* master->last.valuators[0]/[1] is in screen coords and the actual

-     * position of the pointer */

-    pDev->last.valuators[0] = master->last.valuators[0];

-    pDev->last.valuators[1] = master->last.valuators[1];

-

-    if (!pDev->valuator)

-        return;

-

-    /* scale back to device coordinates */

-    if(pDev->valuator->numAxes > 0)

-        pDev->last.valuators[0] = rescaleValuatorAxis(pDev->last.valuators[0], pDev->last.remainder[0],

-                        &pDev->last.remainder[0], NULL, pDev->valuator->axes + 0, scr->width);

-    if(pDev->valuator->numAxes > 1)

-        pDev->last.valuators[1] = rescaleValuatorAxis(pDev->last.valuators[1], pDev->last.remainder[1],

-                        &pDev->last.remainder[1], NULL, pDev->valuator->axes + 1, scr->height);

-

-    /* calculate the other axis as well based on info from the old

-     * slave-device. If the old slave had less axes than this one,

-     * last.valuators is reset to 0.

-     */

-    if ((lastSlave = master->last.slave) && lastSlave->valuator) {

-        for (i = 2; i < pDev->valuator->numAxes; i++) {

-            if (i >= lastSlave->valuator->numAxes)

-                pDev->last.valuators[i] = 0;

-            else

-                pDev->last.valuators[i] =

-                    rescaleValuatorAxis(pDev->last.valuators[i],

-                            pDev->last.remainder[i],

-                            &pDev->last.remainder[i],

-                            lastSlave->valuator->axes + i,

-                            pDev->valuator->axes + i, 0);

-        }

-    }

-

-}

-

-/**

- * Allocate the motion history buffer.

- */

-void

-AllocateMotionHistory(DeviceIntPtr pDev)

-{

-    int size;

-    free(pDev->valuator->motion);

-

-    if (pDev->valuator->numMotionEvents < 1)

-        return;

-

-    /* An MD must have a motion history size large enough to keep all

-     * potential valuators, plus the respective range of the valuators.

-     * 3 * INT32 for (min_val, max_val, curr_val))

-     */

-    if (IsMaster(pDev))

-        size = sizeof(INT32) * 3 * MAX_VALUATORS;

-    else {

-        ValuatorClassPtr v = pDev->valuator;

-        int numAxes;

-        /* XI1 doesn't understand mixed mode devices */

-        for (numAxes = 0; numAxes < v->numAxes; numAxes++)

-            if (valuator_get_mode(pDev, numAxes) != valuator_get_mode(pDev, 0))

-                break;

-        size = sizeof(INT32) * numAxes;

-    }

-

-    size += sizeof(Time);

-

-    pDev->valuator->motion = calloc(pDev->valuator->numMotionEvents, size);

-    pDev->valuator->first_motion = 0;

-    pDev->valuator->last_motion = 0;

-    if (!pDev->valuator->motion)

-        ErrorF("[dix] %s: Failed to alloc motion history (%d bytes).\n",

-                pDev->name, size * pDev->valuator->numMotionEvents);

-}

-

-/**

- * Dump the motion history between start and stop into the supplied buffer.

- * Only records the event for a given screen in theory, but in practice, we

- * sort of ignore this.

- *

- * If core is set, we only generate x/y, in INT16, scaled to screen coords.

- */

-int

-GetMotionHistory(DeviceIntPtr pDev, xTimecoord **buff, unsigned long start,

-                 unsigned long stop, ScreenPtr pScreen, BOOL core)

-{

-    char *ibuff = NULL, *obuff;

-    int i = 0, ret = 0;

-    int j, coord;

-    Time current;

-    /* The size of a single motion event. */

-    int size;

-    int dflt;

-    AxisInfo from, *to; /* for scaling */

-    INT32 *ocbuf, *icbuf; /* pointer to coordinates for copying */

-    INT16 *corebuf;

-    AxisInfo core_axis = {0};

-

-    if (!pDev->valuator || !pDev->valuator->numMotionEvents)

-        return 0;

-

-    if (core && !pScreen)

-        return 0;

-

-    if (IsMaster(pDev))

-        size = (sizeof(INT32) * 3 * MAX_VALUATORS) + sizeof(Time);

-    else

-        size = (sizeof(INT32) * pDev->valuator->numAxes) + sizeof(Time);

-

-    *buff = malloc(size * pDev->valuator->numMotionEvents);

-    if (!(*buff))

-        return 0;

-    obuff = (char *)*buff;

-

-    for (i = pDev->valuator->first_motion;

-         i != pDev->valuator->last_motion;

-         i = (i + 1) % pDev->valuator->numMotionEvents) {

-        /* We index the input buffer by which element we're accessing, which

-         * is not monotonic, and the output buffer by how many events we've

-         * written so far. */

-        ibuff = (char *) pDev->valuator->motion + (i * size);

-        memcpy(&current, ibuff, sizeof(Time));

-

-        if (current > stop) {

-            return ret;

-        }

-        else if (current >= start) {

-            if (core)

-            {

-                memcpy(obuff, ibuff, sizeof(Time)); /* copy timestamp */

-

-                icbuf = (INT32*)(ibuff + sizeof(Time));

-                corebuf = (INT16*)(obuff + sizeof(Time));

-

-                /* fetch x coordinate + range */

-                memcpy(&from.min_value, icbuf++, sizeof(INT32));

-                memcpy(&from.max_value, icbuf++, sizeof(INT32));

-                memcpy(&coord, icbuf++, sizeof(INT32));

-

-                /* scale to screen coords */

-                to = &core_axis;

-                to->max_value = pScreen->width;

-                coord = rescaleValuatorAxis(coord, 0.0, NULL, &from, to, pScreen->width);

-

-                memcpy(corebuf, &coord, sizeof(INT16));

-                corebuf++;

-

-                /* fetch y coordinate + range */

-                memcpy(&from.min_value, icbuf++, sizeof(INT32));

-                memcpy(&from.max_value, icbuf++, sizeof(INT32));

-                memcpy(&coord, icbuf++, sizeof(INT32));

-

-                to->max_value = pScreen->height;

-                coord = rescaleValuatorAxis(coord, 0.0, NULL, &from, to, pScreen->height);

-                memcpy(corebuf, &coord, sizeof(INT16));

-

-            } else if (IsMaster(pDev))

-            {

-                memcpy(obuff, ibuff, sizeof(Time)); /* copy timestamp */

-

-                ocbuf = (INT32*)(obuff + sizeof(Time));

-                icbuf = (INT32*)(ibuff + sizeof(Time));

-                for (j = 0; j < MAX_VALUATORS; j++)

-                {

-                    if (j >= pDev->valuator->numAxes)

-                        break;

-

-                    /* fetch min/max/coordinate */

-                    memcpy(&from.min_value, icbuf++, sizeof(INT32));

-                    memcpy(&from.max_value, icbuf++, sizeof(INT32));

-                    memcpy(&coord, icbuf++, sizeof(INT32));

-

-                    to = (j < pDev->valuator->numAxes) ? &pDev->valuator->axes[j] : NULL;

-

-                    /* x/y scaled to screen if no range is present */

-                    if (j == 0 && (from.max_value < from.min_value))

-                        from.max_value = pScreen->width;

-                    else if (j == 1 && (from.max_value < from.min_value))

-                        from.max_value = pScreen->height;

-

-                    if (j == 0 && (to->max_value < to->min_value))

-                        dflt = pScreen->width;

-                    else if (j == 1 && (to->max_value < to->min_value))

-                        dflt = pScreen->height;

-                    else

-                        dflt = 0;

-

-                    /* scale from stored range into current range */

-                    coord = rescaleValuatorAxis(coord, 0.0, NULL, &from, to, 0);

-                    memcpy(ocbuf, &coord, sizeof(INT32));

-                    ocbuf++;

-                }

-            } else

-                memcpy(obuff, ibuff, size);

-

-            /* don't advance by size here. size may be different to the

-             * actually written size if the MD has less valuators than MAX */

-            if (core)

-                obuff += sizeof(INT32) + sizeof(Time);

-            else

-                obuff += (sizeof(INT32) * pDev->valuator->numAxes) + sizeof(Time);

-            ret++;

-        }

-    }

-

-    return ret;

-}

-

-

-/**

- * Update the motion history for a specific device, with the list of

- * valuators.

- *

- * Layout of the history buffer:

- *   for SDs: [time] [val0] [val1] ... [valn]

- *   for MDs: [time] [min_val0] [max_val0] [val0] [min_val1] ... [valn]

- *

- * For events that have some valuators unset:

- *      min_val == max_val == val == 0.

- */

-static void

-updateMotionHistory(DeviceIntPtr pDev, CARD32 ms, ValuatorMask *mask,

-                    int *valuators)

-{

-    char *buff = (char *) pDev->valuator->motion;

-    ValuatorClassPtr v;

-    int i;

-

-    if (!pDev->valuator->numMotionEvents)

-        return;

-

-    v = pDev->valuator;

-    if (IsMaster(pDev))

-    {

-        buff += ((sizeof(INT32) * 3 * MAX_VALUATORS) + sizeof(CARD32)) *

-                v->last_motion;

-

-        memcpy(buff, &ms, sizeof(Time));

-        buff += sizeof(Time);

-

-        memset(buff, 0, sizeof(INT32) * 3 * MAX_VALUATORS);

-

-        for (i = 0; i < v->numAxes; i++)

-        {

-            /* XI1 doesn't support mixed mode devices */

-            if (valuator_get_mode(pDev, i) != valuator_get_mode(pDev, 0))

-                break;

-            if (valuator_mask_size(mask) <= i || !valuator_mask_isset(mask, i))

-            {

-                buff += 3 * sizeof(INT32);

-                continue;

-            }

-            memcpy(buff, &v->axes[i].min_value, sizeof(INT32));

-            buff += sizeof(INT32);

-            memcpy(buff, &v->axes[i].max_value, sizeof(INT32));

-            buff += sizeof(INT32);

-            memcpy(buff, &valuators[i], sizeof(INT32));

-            buff += sizeof(INT32);

-        }

-    } else

-    {

-

-        buff += ((sizeof(INT32) * pDev->valuator->numAxes) + sizeof(CARD32)) *

-            pDev->valuator->last_motion;

-

-        memcpy(buff, &ms, sizeof(Time));

-        buff += sizeof(Time);

-

-        memset(buff, 0, sizeof(INT32) * pDev->valuator->numAxes);

-

-        for (i = 0; i < MAX_VALUATORS; i++)

-        {

-            if (valuator_mask_size(mask) <= i || !valuator_mask_isset(mask, i))

-            {

-                buff += sizeof(INT32);

-                continue;

-            }

-            memcpy(buff, &valuators[i], sizeof(INT32));

-            buff += sizeof(INT32);

-        }

-    }

-

-    pDev->valuator->last_motion = (pDev->valuator->last_motion + 1) %

-        pDev->valuator->numMotionEvents;

-    /* If we're wrapping around, just keep the circular buffer going. */

-    if (pDev->valuator->first_motion == pDev->valuator->last_motion)

-        pDev->valuator->first_motion = (pDev->valuator->first_motion + 1) %

-                                       pDev->valuator->numMotionEvents;

-

-    return;

-}

-

-

-/**

- * Returns the maximum number of events GetKeyboardEvents,

- * GetKeyboardValuatorEvents, and GetPointerEvents will ever return.

- *

- * This MUST be absolutely constant, from init until exit.

- */

-int

-GetMaximumEventsNum(void) {

-    /* One raw event

-     * One device event

-     * One possible device changed event

-     */

-    return 3;

-}

-

-

-/**

- * Clip an axis to its bounds, which are declared in the call to

- * InitValuatorAxisClassStruct.

- */

-static void

-clipAxis(DeviceIntPtr pDev, int axisNum, int *val)

-{

-    AxisInfoPtr axis;

-

-    if (axisNum >= pDev->valuator->numAxes)

-        return;

-

-    axis = pDev->valuator->axes + axisNum;

-

-    /* If a value range is defined, clip. If not, do nothing */

-    if (axis->max_value <= axis->min_value)

-        return;

-

-    if (*val < axis->min_value)

-        *val = axis->min_value;

-    if (*val > axis->max_value)

-        *val = axis->max_value;

-}

-

-/**

- * Clip every axis in the list of valuators to its bounds.

- */

-static void

-clipValuators(DeviceIntPtr pDev, ValuatorMask *mask)

-{

-    int i;

-

-    for (i = 0; i < valuator_mask_size(mask); i++)

-        if (valuator_mask_isset(mask, i))

-        {

-            int val = valuator_mask_get(mask, i);

-            clipAxis(pDev, i, &val);

-            valuator_mask_set(mask, i, val);

-        }

-}

-

-/**

- * Create the DCCE event (does not update the master's device state yet, this

- * is done in the event processing).

- * Pull in the coordinates from the MD if necessary.

- *

- * @param events Pointer to a pre-allocated event list.

- * @param dev The slave device that generated an event.

- * @param type Either DEVCHANGE_POINTER_EVENT and/or DEVCHANGE_KEYBOARD_EVENT

- * @param num_events The current number of events, returns the number of

- *        events if a DCCE was generated.

- * @return The updated @events pointer.

- */

-EventListPtr

-UpdateFromMaster(EventListPtr events, DeviceIntPtr dev, int type, int *num_events)

-{

-    DeviceIntPtr master;

-

-    master = GetMaster(dev, (type & DEVCHANGE_POINTER_EVENT) ?  MASTER_POINTER : MASTER_KEYBOARD);

-

-    if (master && master->last.slave != dev)

-    {

-        CreateClassesChangedEvent(events, master, dev, type);

-        if (IsPointerDevice(master))

-        {

-            updateSlaveDeviceCoords(master, dev);

-            master->last.numValuators = dev->last.numValuators;

-        }

-        master->last.slave = dev;

-        (*num_events)++;

-        events++;

-    }

-    return events;

-}

-

-/**

- * Move the device's pointer to the position given in the valuators.

- *

- * @param dev The device which's pointer is to be moved.

- * @param x Returns the x position of the pointer after the move.

- * @param y Returns the y position of the pointer after the move.

- * @param mask Bit mask of valid valuators.

- * @param valuators Valuator data for each axis between @first and

- *        @first+@num.

- */

-static void

-moveAbsolute(DeviceIntPtr dev, int *x, int *y, ValuatorMask *mask)

-{

-    int i;

-

-    if (valuator_mask_isset(mask, 0))

-        *x = valuator_mask_get(mask, 0);

-    else

-        *x = dev->last.valuators[0];

-

-    if (valuator_mask_isset(mask, 1))

-        *y = valuator_mask_get(mask, 1);

-    else

-        *y = dev->last.valuators[1];

-

-    clipAxis(dev, 0, x);

-    clipAxis(dev, 1, y);

-

-    for (i = 2; i < valuator_mask_size(mask); i++)

-    {

-        if (valuator_mask_isset(mask, i))

-        {

-            dev->last.valuators[i] = valuator_mask_get(mask, i);

-            clipAxis(dev, i, &dev->last.valuators[i]);

-        }

-    }

-}

-

-/**

- * Move the device's pointer by the values given in @valuators.

- *

- * @param dev The device which's pointer is to be moved.

- * @param x Returns the x position of the pointer after the move.

- * @param y Returns the y position of the pointer after the move.

- * @param mask Bit mask of valid valuators.

- * @param valuators Valuator data for each axis between @first and

- *        @first+@num.

- */

-static void

-moveRelative(DeviceIntPtr dev, int *x, int *y, ValuatorMask *mask)

-{

-    int i;

-

-    *x = dev->last.valuators[0];

-    *y = dev->last.valuators[1];

-

-    if (valuator_mask_isset(mask, 0))

-        *x += valuator_mask_get(mask, 0);

-

-    if (valuator_mask_isset(mask, 1))

-        *y += valuator_mask_get(mask, 1);

-

-    /* if attached, clip both x and y to the defined limits (usually

-     * co-ord space limit). If it is attached, we need x/y to go over the

-     * limits to be able to change screens. */

-    if(dev->u.master) {

-        if (valuator_get_mode(dev, 0) == Absolute)

-            clipAxis(dev, 0, x);

-        if (valuator_get_mode(dev, 1) == Absolute)

-            clipAxis(dev, 1, y);

-    }

-

-    /* calc other axes, clip, drop back into valuators */

-    for (i = 2; i < valuator_mask_size(mask); i++)

-    {

-        if (valuator_mask_isset(mask, i))

-        {

-            dev->last.valuators[i] += valuator_mask_get(mask, i);

-            if (valuator_get_mode(dev, i) == Absolute)

-                clipAxis(dev, i, &dev->last.valuators[i]);

-            valuator_mask_set(mask, i, dev->last.valuators[i]);

-        }

-    }

-}

-

-/**

- * Accelerate the data in valuators based on the device's acceleration scheme.

- *

- * @param dev The device which's pointer is to be moved.

- * @param first The first valuator in @valuators

- * @param num Total number of valuators in @valuators.

- * @param valuators Valuator data for each axis between @first and

- *        @first+@num.

- * @param ms Current time.

- */

-static void

-accelPointer(DeviceIntPtr dev, int first, int num, int *valuators, CARD32 ms)

-{

-    if (dev->valuator->accelScheme.AccelSchemeProc)

-        dev->valuator->accelScheme.AccelSchemeProc(dev, first, num, valuators, ms);

-}

-

-/**

- * If we have HW cursors, this actually moves the visible sprite. If not, we

- * just do all the screen crossing, etc.

- *

- * We scale from device to screen coordinates here, call

- * miPointerSetPosition() and then scale back into device coordinates (if

- * needed). miPSP will change x/y if the screen was crossed.

- *

- * @param dev The device to be moved.

- * @param x Pointer to current x-axis value, may be modified.

- * @param y Pointer to current y-axis value, may be modified.

- * @param x_frac Fractional part of current x-axis value, may be modified.

- * @param y_frac Fractional part of current y-axis value, may be modified.

- * @param scr Screen the device's sprite is currently on.

- * @param screenx Screen x coordinate the sprite is on after the update.

- * @param screeny Screen y coordinate the sprite is on after the update.

- * @param screenx_frac Fractional part of screen x coordinate, as above.

- * @param screeny_frac Fractional part of screen y coordinate, as above.

- */

-static void

-positionSprite(DeviceIntPtr dev, int *x, int *y, float x_frac, float y_frac,

-               ScreenPtr scr, int *screenx, int *screeny, float *screenx_frac, float *screeny_frac)

-{

-    int old_screenx, old_screeny;

-

-    /* scale x&y to screen */

-    if (dev->valuator->numAxes > 0) {

-        *screenx = rescaleValuatorAxis(*x, x_frac, screenx_frac,

-                dev->valuator->axes + 0, NULL, scr->width);

-    } else {

-        *screenx = dev->last.valuators[0];

-        *screenx_frac = dev->last.remainder[0];

-    }

-

-    if (dev->valuator->numAxes > 1) {

-        *screeny = rescaleValuatorAxis(*y, y_frac, screeny_frac,

-                dev->valuator->axes + 1, NULL, scr->height);

-    } else {

-        *screeny = dev->last.valuators[1];

-        *screeny_frac = dev->last.remainder[1];

-    }

-

-    /* Hit the left screen edge? */

-    if (*screenx <= 0 && *screenx_frac < 0.0f)

-    {

-        *screenx_frac = 0.0f;

-        x_frac = 0.0f;

-    }

-    if (*screeny <= 0 && *screeny_frac < 0.0f)

-    {

-        *screeny_frac = 0.0f;

-        y_frac = 0.0f;

-    }

-

-

-    old_screenx = *screenx;

-    old_screeny = *screeny;

-    /* This takes care of crossing screens for us, as well as clipping

-     * to the current screen. */

-    miPointerSetPosition(dev, screenx, screeny);

-

-    if (dev->u.master) {

-        dev->u.master->last.valuators[0] = *screenx;

-        dev->u.master->last.valuators[1] = *screeny;

-        dev->u.master->last.remainder[0] = *screenx_frac;

-        dev->u.master->last.remainder[1] = *screeny_frac;

-    }

-

-    /* Crossed screen? Scale back to device coordiantes */

-    if(*screenx != old_screenx)

-    {

-        scr = miPointerGetScreen(dev);

-        *x = rescaleValuatorAxis(*screenx, *screenx_frac, &x_frac, NULL,

-                                dev->valuator->axes + 0, scr->width);

-    }

-    if(*screeny != old_screeny)

-    {

-        scr = miPointerGetScreen(dev);

-        *y = rescaleValuatorAxis(*screeny, *screeny_frac, &y_frac, NULL,

-                                 dev->valuator->axes + 1, scr->height);

-    }

-

-    /* dropy x/y (device coordinates) back into valuators for next event */

-    dev->last.valuators[0] = *x;

-    dev->last.valuators[1] = *y;

-    dev->last.remainder[0] = x_frac;

-    dev->last.remainder[1] = y_frac;

-}

-

-/**

- * Update the motion history for the device and (if appropriate) for its

- * master device.

- * @param dev Slave device to update.

- * @param mask Bit mask of valid valuators to append to history.

- * @param num Total number of valuators to append to history.

- * @param ms Current time

- */

-static void

-updateHistory(DeviceIntPtr dev, ValuatorMask *mask, CARD32 ms)

-{

-    updateMotionHistory(dev, ms, mask, dev->last.valuators);

-    if (dev->u.master)

-    {

-        DeviceIntPtr master = GetMaster(dev, MASTER_POINTER);

-        updateMotionHistory(master, ms, mask, dev->last.valuators);

-    }

-}

-

-/**

- * Convenience wrapper around GetKeyboardValuatorEvents, that takes no

- * valuators.

- */

-int

-GetKeyboardEvents(EventList *events, DeviceIntPtr pDev, int type, int key_code) {

-    ValuatorMask mask;

-

-    valuator_mask_zero(&mask);

-    return GetKeyboardValuatorEvents(events, pDev, type, key_code, &mask);

-}

-

-

-/**

- * Returns a set of InternalEvents for KeyPress/KeyRelease, optionally

- * also with valuator events.

- *

- * events is not NULL-terminated; the return value is the number of events.

- * The DDX is responsible for allocating the event structure in the first

- * place via GetMaximumEventsNum(), and for freeing it.

- */

-int

-GetKeyboardValuatorEvents(EventList *events, DeviceIntPtr pDev, int type,

-                          int key_code, const ValuatorMask *mask_in) {

-    int num_events = 0;

-    CARD32 ms = 0;

-    DeviceEvent *event;

-    RawDeviceEvent *raw;

-    ValuatorMask mask;

-

-    /* refuse events from disabled devices */

-    if (!pDev->enabled)

-        return 0;

-

-    if (!events ||!pDev->key || !pDev->focus || !pDev->kbdfeed ||

-       (type != KeyPress && type != KeyRelease) ||

-       (key_code < 8 || key_code > 255))

-        return 0;

-

-    num_events = 1;

-

-    events = UpdateFromMaster(events, pDev, DEVCHANGE_KEYBOARD_EVENT, &num_events);

-

-    /* Handle core repeating, via press/release/press/release. */

-    if (type == KeyPress && key_is_down(pDev, key_code, KEY_POSTED)) {

-        /* If autorepeating is disabled either globally or just for that key,

-         * or we have a modifier, don't generate a repeat event. */

-        if (!pDev->kbdfeed->ctrl.autoRepeat ||

-            !key_autorepeats(pDev, key_code) ||

-            pDev->key->xkbInfo->desc->map->modmap[key_code])

-            return 0;

-    }

-

-    ms = GetTimeInMillis();

-

-    raw = (RawDeviceEvent*)events->event;

-    events++;

-    num_events++;

-

-    valuator_mask_copy(&mask, mask_in);

-

-    init_raw(pDev, raw, ms, type, key_code);

-    set_raw_valuators(raw, &mask, raw->valuators.data_raw);

-

-    clipValuators(pDev, &mask);

-

-    set_raw_valuators(raw, &mask, raw->valuators.data);

-

-    event = (DeviceEvent*) events->event;

-    init_event(pDev, event, ms);

-    event->detail.key = key_code;

-

-    if (type == KeyPress) {

-        event->type = ET_KeyPress;

-	set_key_down(pDev, key_code, KEY_POSTED);

-    }

-    else if (type == KeyRelease) {

-        event->type = ET_KeyRelease;

-	set_key_up(pDev, key_code, KEY_POSTED);

-    }

-

-    clipValuators(pDev, &mask);

-

-    set_valuators(pDev, event, &mask);

-

-    return num_events;

-}

-

-/**

- * Initialize an event list and fill with 32 byte sized events.

- * This event list is to be passed into GetPointerEvents() and

- * GetKeyboardEvents().

- *

- * @param num_events Number of elements in list.

- */

-EventListPtr

-InitEventList(int num_events)

-{

-    EventListPtr events;

-    int i;

-

-    events = (EventListPtr)calloc(num_events, sizeof(EventList));

-    if (!events)

-        return NULL;

-

-    for (i = 0; i < num_events; i++)

-    {

-        events[i].evlen = sizeof(InternalEvent);

-        events[i].event = calloc(1, sizeof(InternalEvent));

-        if (!events[i].event)

-        {

-            /* rollback */

-            while(i--)

-                free(events[i].event);

-            free(events);

-            events = NULL;

-            break;

-        }

-    }

-

-    return events;

-}

-

-/**

- * Free an event list.

- *

- * @param list The list to be freed.

- * @param num_events Number of elements in list.

- */

-void

-FreeEventList(EventListPtr list, int num_events)

-{

-    if (!list)

-        return;

-    while(num_events--)

-        free(list[num_events].event);

-    free(list);

-}

-

-static void

-transformAbsolute(DeviceIntPtr dev, ValuatorMask *mask)

-{

-    struct pixman_f_vector p;

-

-    /* p' = M * p in homogeneous coordinates */

-    p.v[0] = (valuator_mask_isset(mask, 0) ? valuator_mask_get(mask, 0) :

-              dev->last.valuators[0]);

-    p.v[1] = (valuator_mask_isset(mask, 1) ? valuator_mask_get(mask, 1) :

-              dev->last.valuators[1]);

-    p.v[2] = 1.0;

-

-    pixman_f_transform_point(&dev->transform, &p);

-

-    if (lround(p.v[0]) != dev->last.valuators[0])

-        valuator_mask_set(mask, 0, lround(p.v[0]));

-    if (lround(p.v[1]) != dev->last.valuators[1])

-        valuator_mask_set(mask, 1, lround(p.v[1]));

-}

-

-/**

- * Generate a series of InternalEvents (filled into the EventList)

- * representing pointer motion, or button presses.

- *

- * events is not NULL-terminated; the return value is the number of events.

- * The DDX is responsible for allocating the event structure in the first

- * place via InitEventList() and GetMaximumEventsNum(), and for freeing it.

- *

- * In the generated events rootX/Y will be in absolute screen coords and

- * the valuator information in the absolute or relative device coords.

- *

- * last.valuators[x] of the device is always in absolute device coords.

- * last.valuators[x] of the master device is in absolute screen coords.

- *

- * master->last.valuators[x] for x > 2 is undefined.

- */

-int

-GetPointerEvents(EventList *events, DeviceIntPtr pDev, int type, int buttons,

-                 int flags, const ValuatorMask *mask_in) {

-    int num_events = 1;

-    CARD32 ms;

-    DeviceEvent *event;

-    RawDeviceEvent    *raw;

-    int x = 0, y = 0, /* device coords */

-        cx, cy; /* only screen coordinates */

-    float x_frac = 0.0, y_frac = 0.0, cx_frac, cy_frac;

-    ScreenPtr scr = miPointerGetScreen(pDev);

-    ValuatorMask mask;

-

-    /* refuse events from disabled devices */

-    if (!pDev->enabled)

-        return 0;

-

-    ms = GetTimeInMillis(); /* before pointer update to help precision */

-

-    if (!scr || !pDev->valuator ||

-        (type != MotionNotify && type != ButtonPress && type != ButtonRelease) ||

-        (type != MotionNotify && !pDev->button) ||

-        ((type == ButtonPress || type == ButtonRelease) && !buttons))

-        return 0;

-

-    if (type == MotionNotify &&

-        (!mask_in || valuator_mask_num_valuators(mask_in) <= 0))

-        return 0;

-

-    events = UpdateFromMaster(events, pDev, DEVCHANGE_POINTER_EVENT, &num_events);

-

-    raw = (RawDeviceEvent*)events->event;

-    events++;

-    num_events++;

-

-    valuator_mask_copy(&mask, mask_in);

-

-    init_raw(pDev, raw, ms, type, buttons);

-    set_raw_valuators(raw, &mask, raw->valuators.data_raw);

-

-    if (flags & POINTER_ABSOLUTE)

-    {

-        if (flags & POINTER_SCREEN) /* valuators are in screen coords */

-        {

-            int scaled;

-

-            if (valuator_mask_isset(&mask, 0))

-            {

-                scaled = rescaleValuatorAxis(valuator_mask_get(&mask, 0),

-                                             0.0, &x_frac, NULL,

-                                             pDev->valuator->axes + 0,

-                                             scr->width);

-                valuator_mask_set(&mask, 0, scaled);

-            }

-            if (valuator_mask_isset(&mask, 1))

-            {

-                scaled = rescaleValuatorAxis(valuator_mask_get(&mask, 1),

-                                             0.0, &y_frac, NULL,

-                                             pDev->valuator->axes + 1,

-                                             scr->height);

-                valuator_mask_set(&mask, 1, scaled);

-            }

-        }

-

-        transformAbsolute(pDev, &mask);

-        moveAbsolute(pDev, &x, &y, &mask);

-    } else {

-        if (flags & POINTER_ACCELERATE) {

-            /* FIXME: Pointer acceleration only requires X and Y values. This

-             * should be converted to masked valuators. */

-            int vals[2];

-            vals[0] = valuator_mask_isset(&mask, 0) ?

-                      valuator_mask_get(&mask, 0) : 0;

-            vals[1] = valuator_mask_isset(&mask, 1) ?

-                      valuator_mask_get(&mask, 1) : 0;

-            accelPointer(pDev, 0, 2, vals, ms);

-

-            if (valuator_mask_isset(&mask, 0))

-                valuator_mask_set(&mask, 0, vals[0]);

-            if (valuator_mask_isset(&mask, 1))

-                valuator_mask_set(&mask, 1, vals[1]);

-

-            /* The pointer acceleration code modifies the fractional part

-             * in-place, so we need to extract this information first */

-            x_frac = pDev->last.remainder[0];

-            y_frac = pDev->last.remainder[1];

-        }

-        moveRelative(pDev, &x, &y, &mask);

-    }

-

-    set_raw_valuators(raw, &mask, raw->valuators.data);

-

-    positionSprite(pDev, &x, &y, x_frac, y_frac, scr, &cx, &cy, &cx_frac, &cy_frac);

-    updateHistory(pDev, &mask, ms);

-

-    /* Update the valuators with the true value sent to the client*/

-    if (valuator_mask_isset(&mask, 0))

-        valuator_mask_set(&mask, 0, x);

-    if (valuator_mask_isset(&mask, 1))

-        valuator_mask_set(&mask, 1, y);

-

-    clipValuators(pDev, &mask);

-

-    event = (DeviceEvent*) events->event;

-    init_event(pDev, event, ms);

-

-    if (type == MotionNotify) {

-        event->type = ET_Motion;

-        event->detail.button = 0;

-    }

-    else {

-        if (type == ButtonPress) {

-            event->type = ET_ButtonPress;

-            set_button_down(pDev, buttons, BUTTON_POSTED);

-        }

-        else if (type == ButtonRelease) {

-            event->type = ET_ButtonRelease;

-            set_button_up(pDev, buttons, BUTTON_POSTED);

-        }

-        event->detail.button = buttons;

-    }

-

-    event->root_x = cx; /* root_x/y always in screen coords */

-    event->root_y = cy;

-    event->root_x_frac = cx_frac;

-    event->root_y_frac = cy_frac;

-

-    set_valuators(pDev, event, &mask);

-

-    return num_events;

-}

-

-

-/**

- * Generate ProximityIn/ProximityOut InternalEvents, accompanied by

- * valuators.

- *

- * events is not NULL-terminated; the return value is the number of events.

- * The DDX is responsible for allocating the event structure in the first

- * place via GetMaximumEventsNum(), and for freeing it.

- */

-int

-GetProximityEvents(EventList *events, DeviceIntPtr pDev, int type, const ValuatorMask *mask_in)

-{

-    int num_events = 1, i;

-    DeviceEvent *event;

-    ValuatorMask mask;

-

-    /* refuse events from disabled devices */

-    if (!pDev->enabled)

-        return 0;

-

-    /* Sanity checks. */

-    if ((type != ProximityIn && type != ProximityOut) || !mask_in)

-        return 0;

-    if (!pDev->valuator)

-        return 0;

-

-    valuator_mask_copy(&mask, mask_in);

-

-    /* ignore relative axes for proximity. */

-    for (i = 0; i < valuator_mask_size(&mask); i++)

-    {

-        if (valuator_mask_isset(&mask, i) &&

-            valuator_get_mode(pDev, i) == Relative)

-            valuator_mask_unset(&mask, i);

-    }

-

-    /* FIXME: posting proximity events with relative valuators only results

-     * in an empty event, EventToXI() will fail to convert → no event sent

-     * to client. */

-

-    events = UpdateFromMaster(events, pDev, DEVCHANGE_POINTER_EVENT, &num_events);

-

-    event = (DeviceEvent *) events->event;

-    init_event(pDev, event, GetTimeInMillis());

-    event->type = (type == ProximityIn) ? ET_ProximityIn : ET_ProximityOut;

-

-    clipValuators(pDev, &mask);

-

-    set_valuators(pDev, event, &mask);

-

-    return num_events;

-}

-

-/**

- * Synthesize a single motion event for the core pointer.

- *

- * Used in cursor functions, e.g. when cursor confinement changes, and we need

- * to shift the pointer to get it inside the new bounds.

- */

-void

-PostSyntheticMotion(DeviceIntPtr pDev,

-                    int x,

-                    int y,

-                    int screen,

-                    unsigned long time)

-{

-    DeviceEvent ev;

-

-#ifdef PANORAMIX

-    /* Translate back to the sprite screen since processInputProc

-       will translate from sprite screen to screen 0 upon reentry

-       to the DIX layer. */

-    if (!noPanoramiXExtension) {

-        x += screenInfo.screens[0]->x - screenInfo.screens[screen]->x;

-        y += screenInfo.screens[0]->y - screenInfo.screens[screen]->y;

-    }

-#endif

-

-    memset(&ev, 0, sizeof(DeviceEvent));

-    init_event(pDev, &ev, time);

-    ev.root_x = x;

-    ev.root_y = y;

-    ev.type = ET_Motion;

-    ev.time = time;

-

-    /* FIXME: MD/SD considerations? */

-    (*pDev->public.processInputProc)((InternalEvent*)&ev, pDev);

-}

+/*
+ * Copyright © 2006 Nokia Corporation
+ * Copyright © 2006-2007 Daniel Stone
+ * Copyright © 2008 Red Hat, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Authors: Daniel Stone <daniel@fooishbar.org>
+ *          Peter Hutterer <peter.hutterer@who-t.net>
+ */
+
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
+#include <X11/X.h>
+#include <X11/keysym.h>
+#include <X11/Xproto.h>
+#include <math.h>
+
+#include "misc.h"
+#include "resource.h"
+#include "inputstr.h"
+#include "scrnintstr.h"
+#include "cursorstr.h"
+#include "dixstruct.h"
+#include "globals.h"
+#include "dixevents.h"
+#include "mipointer.h"
+#include "eventstr.h"
+#include "eventconvert.h"
+#include "inpututils.h"
+
+#include <X11/extensions/XKBproto.h>
+#include "xkbsrv.h"
+
+#ifdef PANORAMIX
+#include "panoramiX.h"
+#include "panoramiXsrv.h"
+#endif
+
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XIproto.h>
+#include <pixman.h>
+#include "exglobals.h"
+#include "exevents.h"
+#include "exglobals.h"
+#include "extnsionst.h"
+#include "listdev.h" /* for sizing up DeviceClassesChangedEvent */
+
+/* Number of motion history events to store. */
+#define MOTION_HISTORY_SIZE 256
+
+/* InputEventList is the container list for all input events generated by the
+ * DDX. The DDX is expected to call GetEventList() and then pass the list into
+ * Get{Pointer|Keyboard}Events.
+ */
+EventListPtr InputEventList = NULL;
+int InputEventListLen = 0;
+
+int
+GetEventList(EventListPtr* list)
+{
+    *list = InputEventList;
+    return InputEventListLen;
+}
+
+/**
+ * Pick some arbitrary size for Xi motion history.
+ */
+int
+GetMotionHistorySize(void)
+{
+    return MOTION_HISTORY_SIZE;
+}
+
+void
+set_button_down(DeviceIntPtr pDev, int button, int type)
+{
+    if (type == BUTTON_PROCESSED)
+        SetBit(pDev->button->down, button);
+    else
+        SetBit(pDev->button->postdown, button);
+}
+
+void
+set_button_up(DeviceIntPtr pDev, int button, int type)
+{
+    if (type == BUTTON_PROCESSED)
+        ClearBit(pDev->button->down, button);
+    else
+        ClearBit(pDev->button->postdown, button);
+}
+
+Bool
+button_is_down(DeviceIntPtr pDev, int button, int type)
+{
+    Bool ret = FALSE;
+
+    if (type & BUTTON_PROCESSED)
+        ret = ret || BitIsOn(pDev->button->down, button);
+    if (type & BUTTON_POSTED)
+        ret = ret || BitIsOn(pDev->button->postdown, button);
+
+    return ret;
+}
+
+void
+set_key_down(DeviceIntPtr pDev, int key_code, int type)
+{
+    if (type == KEY_PROCESSED)
+        SetBit(pDev->key->down, key_code);
+    else
+        SetBit(pDev->key->postdown, key_code);
+}
+
+void
+set_key_up(DeviceIntPtr pDev, int key_code, int type)
+{
+    if (type == KEY_PROCESSED)
+        ClearBit(pDev->key->down, key_code);
+    else
+        ClearBit(pDev->key->postdown, key_code);
+}
+
+Bool
+key_is_down(DeviceIntPtr pDev, int key_code, int type)
+{
+    Bool ret = FALSE;
+
+    if (type & KEY_PROCESSED)
+        ret = ret || BitIsOn(pDev->key->down, key_code);
+    if (type & KEY_POSTED)
+        ret = ret || BitIsOn(pDev->key->postdown, key_code);
+
+    return ret;
+}
+
+static Bool
+key_autorepeats(DeviceIntPtr pDev, int key_code)
+{
+    return !!(pDev->kbdfeed->ctrl.autoRepeats[key_code >> 3] &
+              (1 << (key_code & 7)));
+}
+
+static void
+init_event(DeviceIntPtr dev, DeviceEvent* event, Time ms)
+{
+    memset(event, 0, sizeof(DeviceEvent));
+    event->header = ET_Internal;
+    event->length = sizeof(DeviceEvent);
+    event->time = ms;
+    event->deviceid = dev->id;
+    event->sourceid = dev->id;
+}
+
+static void
+init_raw(DeviceIntPtr dev, RawDeviceEvent *event, Time ms, int type, int detail)
+{
+    memset(event, 0, sizeof(RawDeviceEvent));
+    event->header = ET_Internal;
+    event->length = sizeof(RawDeviceEvent);
+    event->type = ET_RawKeyPress - ET_KeyPress + type;
+    event->time = ms;
+    event->deviceid = dev->id;
+    event->sourceid = dev->id;
+    event->detail.button = detail;
+}
+
+static void
+set_raw_valuators(RawDeviceEvent *event, ValuatorMask *mask, int32_t* data)
+{
+    int i;
+
+    for (i = 0; i < valuator_mask_size(mask); i++)
+    {
+        if (valuator_mask_isset(mask, i))
+        {
+            SetBit(event->valuators.mask, i);
+            data[i] = valuator_mask_get(mask, i);
+        }
+    }
+}
+
+
+static void
+set_valuators(DeviceIntPtr dev, DeviceEvent* event, ValuatorMask *mask)
+{
+    int i;
+
+    for (i = 0; i < valuator_mask_size(mask); i++)
+    {
+        if (valuator_mask_isset(mask, i))
+        {
+            SetBit(event->valuators.mask, i);
+            if (valuator_get_mode(dev, i) == Absolute)
+                SetBit(event->valuators.mode, i);
+            event->valuators.data[i] = valuator_mask_get(mask, i);
+            event->valuators.data_frac[i] =
+                dev->last.remainder[i] * (1 << 16) * (1 << 16);
+        }
+    }
+}
+
+void
+CreateClassesChangedEvent(EventList* event,
+                          DeviceIntPtr master,
+                          DeviceIntPtr slave,
+                          int type)
+{
+    int i;
+    DeviceChangedEvent *dce;
+    CARD32 ms = GetTimeInMillis();
+
+    dce = (DeviceChangedEvent*)event->event;
+    memset(dce, 0, sizeof(DeviceChangedEvent));
+    dce->deviceid = slave->id;
+    dce->masterid = master->id;
+    dce->header = ET_Internal;
+    dce->length = sizeof(DeviceChangedEvent);
+    dce->type = ET_DeviceChanged;
+    dce->time = ms;
+    dce->flags = type;
+    dce->flags |= DEVCHANGE_SLAVE_SWITCH;
+    dce->sourceid = slave->id;
+
+    if (slave->button)
+    {
+        dce->buttons.num_buttons = slave->button->numButtons;
+        for (i = 0; i < dce->buttons.num_buttons; i++)
+            dce->buttons.names[i] = slave->button->labels[i];
+    }
+    if (slave->valuator)
+    {
+        dce->num_valuators = slave->valuator->numAxes;
+        for (i = 0; i < dce->num_valuators; i++)
+        {
+            dce->valuators[i].min = slave->valuator->axes[i].min_value;
+            dce->valuators[i].max = slave->valuator->axes[i].max_value;
+            dce->valuators[i].resolution = slave->valuator->axes[i].resolution;
+            dce->valuators[i].mode = slave->valuator->axes[i].mode;
+            dce->valuators[i].name = slave->valuator->axes[i].label;
+        }
+    }
+    if (slave->key)
+    {
+        dce->keys.min_keycode = slave->key->xkbInfo->desc->min_key_code;
+        dce->keys.max_keycode = slave->key->xkbInfo->desc->max_key_code;
+    }
+}
+
+/**
+ * Rescale the coord between the two axis ranges.
+ */
+static int
+rescaleValuatorAxis(int coord, float remainder, float *remainder_return, AxisInfoPtr from, AxisInfoPtr to,
+                    int defmax)
+{
+    int fmin = 0, tmin = 0, fmax = defmax, tmax = defmax, coord_return;
+    float value;
+
+    if(from && from->min_value < from->max_value) {
+        fmin = from->min_value;
+        fmax = from->max_value;
+    }
+    if(to && to->min_value < to->max_value) {
+        tmin = to->min_value;
+        tmax = to->max_value;
+    }
+
+    if(fmin == tmin && fmax == tmax) {
+        if (remainder_return)
+            *remainder_return = remainder;
+        return coord;
+    }
+
+    if(fmax == fmin) { /* avoid division by 0 */
+        if (remainder_return)
+            *remainder_return = 0.0;
+        return 0;
+    }
+
+    value = (coord + remainder - fmin) * (tmax - tmin) / (fmax - fmin) + tmin;
+    coord_return = lroundf(value);
+    if (remainder_return)
+        *remainder_return = value - coord_return;
+    return coord_return;
+}
+
+/**
+ * Update all coordinates when changing to a different SD
+ * to ensure that relative reporting will work as expected
+ * without loss of precision.
+ *
+ * pDev->last.valuators will be in absolute device coordinates after this
+ * function.
+ */
+static void
+updateSlaveDeviceCoords(DeviceIntPtr master, DeviceIntPtr pDev)
+{
+    ScreenPtr scr = miPointerGetScreen(pDev);
+    int i;
+    DeviceIntPtr lastSlave;
+
+    /* master->last.valuators[0]/[1] is in screen coords and the actual
+     * position of the pointer */
+    pDev->last.valuators[0] = master->last.valuators[0];
+    pDev->last.valuators[1] = master->last.valuators[1];
+
+    if (!pDev->valuator)
+        return;
+
+    /* scale back to device coordinates */
+    if(pDev->valuator->numAxes > 0)
+        pDev->last.valuators[0] = rescaleValuatorAxis(pDev->last.valuators[0], pDev->last.remainder[0],
+                        &pDev->last.remainder[0], NULL, pDev->valuator->axes + 0, scr->width);
+    if(pDev->valuator->numAxes > 1)
+        pDev->last.valuators[1] = rescaleValuatorAxis(pDev->last.valuators[1], pDev->last.remainder[1],
+                        &pDev->last.remainder[1], NULL, pDev->valuator->axes + 1, scr->height);
+
+    /* calculate the other axis as well based on info from the old
+     * slave-device. If the old slave had less axes than this one,
+     * last.valuators is reset to 0.
+     */
+    if ((lastSlave = master->last.slave) && lastSlave->valuator) {
+        for (i = 2; i < pDev->valuator->numAxes; i++) {
+            if (i >= lastSlave->valuator->numAxes)
+                pDev->last.valuators[i] = 0;
+            else
+                pDev->last.valuators[i] =
+                    rescaleValuatorAxis(pDev->last.valuators[i],
+                            pDev->last.remainder[i],
+                            &pDev->last.remainder[i],
+                            lastSlave->valuator->axes + i,
+                            pDev->valuator->axes + i, 0);
+        }
+    }
+
+}
+
+/**
+ * Allocate the motion history buffer.
+ */
+void
+AllocateMotionHistory(DeviceIntPtr pDev)
+{
+    int size;
+    free(pDev->valuator->motion);
+
+    if (pDev->valuator->numMotionEvents < 1)
+        return;
+
+    /* An MD must have a motion history size large enough to keep all
+     * potential valuators, plus the respective range of the valuators.
+     * 3 * INT32 for (min_val, max_val, curr_val))
+     */
+    if (IsMaster(pDev))
+        size = sizeof(INT32) * 3 * MAX_VALUATORS;
+    else {
+        ValuatorClassPtr v = pDev->valuator;
+        int numAxes;
+        /* XI1 doesn't understand mixed mode devices */
+        for (numAxes = 0; numAxes < v->numAxes; numAxes++)
+            if (valuator_get_mode(pDev, numAxes) != valuator_get_mode(pDev, 0))
+                break;
+        size = sizeof(INT32) * numAxes;
+    }
+
+    size += sizeof(Time);
+
+    pDev->valuator->motion = calloc(pDev->valuator->numMotionEvents, size);
+    pDev->valuator->first_motion = 0;
+    pDev->valuator->last_motion = 0;
+    if (!pDev->valuator->motion)
+        ErrorF("[dix] %s: Failed to alloc motion history (%d bytes).\n",
+                pDev->name, size * pDev->valuator->numMotionEvents);
+}
+
+/**
+ * Dump the motion history between start and stop into the supplied buffer.
+ * Only records the event for a given screen in theory, but in practice, we
+ * sort of ignore this.
+ *
+ * If core is set, we only generate x/y, in INT16, scaled to screen coords.
+ */
+int
+GetMotionHistory(DeviceIntPtr pDev, xTimecoord **buff, unsigned long start,
+                 unsigned long stop, ScreenPtr pScreen, BOOL core)
+{
+    char *ibuff = NULL, *obuff;
+    int i = 0, ret = 0;
+    int j, coord;
+    Time current;
+    /* The size of a single motion event. */
+    int size;
+    int dflt;
+    AxisInfo from, *to; /* for scaling */
+    INT32 *ocbuf, *icbuf; /* pointer to coordinates for copying */
+    INT16 *corebuf;
+    AxisInfo core_axis = {0};
+
+    if (!pDev->valuator || !pDev->valuator->numMotionEvents)
+        return 0;
+
+    if (core && !pScreen)
+        return 0;
+
+    if (IsMaster(pDev))
+        size = (sizeof(INT32) * 3 * MAX_VALUATORS) + sizeof(Time);
+    else
+        size = (sizeof(INT32) * pDev->valuator->numAxes) + sizeof(Time);
+
+    *buff = malloc(size * pDev->valuator->numMotionEvents);
+    if (!(*buff))
+        return 0;
+    obuff = (char *)*buff;
+
+    for (i = pDev->valuator->first_motion;
+         i != pDev->valuator->last_motion;
+         i = (i + 1) % pDev->valuator->numMotionEvents) {
+        /* We index the input buffer by which element we're accessing, which
+         * is not monotonic, and the output buffer by how many events we've
+         * written so far. */
+        ibuff = (char *) pDev->valuator->motion + (i * size);
+        memcpy(&current, ibuff, sizeof(Time));
+
+        if (current > stop) {
+            return ret;
+        }
+        else if (current >= start) {
+            if (core)
+            {
+                memcpy(obuff, ibuff, sizeof(Time)); /* copy timestamp */
+
+                icbuf = (INT32*)(ibuff + sizeof(Time));
+                corebuf = (INT16*)(obuff + sizeof(Time));
+
+                /* fetch x coordinate + range */
+                memcpy(&from.min_value, icbuf++, sizeof(INT32));
+                memcpy(&from.max_value, icbuf++, sizeof(INT32));
+                memcpy(&coord, icbuf++, sizeof(INT32));
+
+                /* scale to screen coords */
+                to = &core_axis;
+                to->max_value = pScreen->width;
+                coord = rescaleValuatorAxis(coord, 0.0, NULL, &from, to, pScreen->width);
+
+                memcpy(corebuf, &coord, sizeof(INT16));
+                corebuf++;
+
+                /* fetch y coordinate + range */
+                memcpy(&from.min_value, icbuf++, sizeof(INT32));
+                memcpy(&from.max_value, icbuf++, sizeof(INT32));
+                memcpy(&coord, icbuf++, sizeof(INT32));
+
+                to->max_value = pScreen->height;
+                coord = rescaleValuatorAxis(coord, 0.0, NULL, &from, to, pScreen->height);
+                memcpy(corebuf, &coord, sizeof(INT16));
+
+            } else if (IsMaster(pDev))
+            {
+                memcpy(obuff, ibuff, sizeof(Time)); /* copy timestamp */
+
+                ocbuf = (INT32*)(obuff + sizeof(Time));
+                icbuf = (INT32*)(ibuff + sizeof(Time));
+                for (j = 0; j < MAX_VALUATORS; j++)
+                {
+                    if (j >= pDev->valuator->numAxes)
+                        break;
+
+                    /* fetch min/max/coordinate */
+                    memcpy(&from.min_value, icbuf++, sizeof(INT32));
+                    memcpy(&from.max_value, icbuf++, sizeof(INT32));
+                    memcpy(&coord, icbuf++, sizeof(INT32));
+
+                    to = (j < pDev->valuator->numAxes) ? &pDev->valuator->axes[j] : NULL;
+
+                    /* x/y scaled to screen if no range is present */
+                    if (j == 0 && (from.max_value < from.min_value))
+                        from.max_value = pScreen->width;
+                    else if (j == 1 && (from.max_value < from.min_value))
+                        from.max_value = pScreen->height;
+
+                    if (j == 0 && (to->max_value < to->min_value))
+                        dflt = pScreen->width;
+                    else if (j == 1 && (to->max_value < to->min_value))
+                        dflt = pScreen->height;
+                    else
+                        dflt = 0;
+
+                    /* scale from stored range into current range */
+                    coord = rescaleValuatorAxis(coord, 0.0, NULL, &from, to, 0);
+                    memcpy(ocbuf, &coord, sizeof(INT32));
+                    ocbuf++;
+                }
+            } else
+                memcpy(obuff, ibuff, size);
+
+            /* don't advance by size here. size may be different to the
+             * actually written size if the MD has less valuators than MAX */
+            if (core)
+                obuff += sizeof(INT32) + sizeof(Time);
+            else
+                obuff += (sizeof(INT32) * pDev->valuator->numAxes) + sizeof(Time);
+            ret++;
+        }
+    }
+
+    return ret;
+}
+
+
+/**
+ * Update the motion history for a specific device, with the list of
+ * valuators.
+ *
+ * Layout of the history buffer:
+ *   for SDs: [time] [val0] [val1] ... [valn]
+ *   for MDs: [time] [min_val0] [max_val0] [val0] [min_val1] ... [valn]
+ *
+ * For events that have some valuators unset:
+ *      min_val == max_val == val == 0.
+ */
+static void
+updateMotionHistory(DeviceIntPtr pDev, CARD32 ms, ValuatorMask *mask,
+                    int *valuators)
+{
+    char *buff = (char *) pDev->valuator->motion;
+    ValuatorClassPtr v;
+    int i;
+
+    if (!pDev->valuator->numMotionEvents)
+        return;
+
+    v = pDev->valuator;
+    if (IsMaster(pDev))
+    {
+        buff += ((sizeof(INT32) * 3 * MAX_VALUATORS) + sizeof(CARD32)) *
+                v->last_motion;
+
+        memcpy(buff, &ms, sizeof(Time));
+        buff += sizeof(Time);
+
+        memset(buff, 0, sizeof(INT32) * 3 * MAX_VALUATORS);
+
+        for (i = 0; i < v->numAxes; i++)
+        {
+            /* XI1 doesn't support mixed mode devices */
+            if (valuator_get_mode(pDev, i) != valuator_get_mode(pDev, 0))
+                break;
+            if (valuator_mask_size(mask) <= i || !valuator_mask_isset(mask, i))
+            {
+                buff += 3 * sizeof(INT32);
+                continue;
+            }
+            memcpy(buff, &v->axes[i].min_value, sizeof(INT32));
+            buff += sizeof(INT32);
+            memcpy(buff, &v->axes[i].max_value, sizeof(INT32));
+            buff += sizeof(INT32);
+            memcpy(buff, &valuators[i], sizeof(INT32));
+            buff += sizeof(INT32);
+        }
+    } else
+    {
+
+        buff += ((sizeof(INT32) * pDev->valuator->numAxes) + sizeof(CARD32)) *
+            pDev->valuator->last_motion;
+
+        memcpy(buff, &ms, sizeof(Time));
+        buff += sizeof(Time);
+
+        memset(buff, 0, sizeof(INT32) * pDev->valuator->numAxes);
+
+        for (i = 0; i < MAX_VALUATORS; i++)
+        {
+            if (valuator_mask_size(mask) <= i || !valuator_mask_isset(mask, i))
+            {
+                buff += sizeof(INT32);
+                continue;
+            }
+            memcpy(buff, &valuators[i], sizeof(INT32));
+            buff += sizeof(INT32);
+        }
+    }
+
+    pDev->valuator->last_motion = (pDev->valuator->last_motion + 1) %
+        pDev->valuator->numMotionEvents;
+    /* If we're wrapping around, just keep the circular buffer going. */
+    if (pDev->valuator->first_motion == pDev->valuator->last_motion)
+        pDev->valuator->first_motion = (pDev->valuator->first_motion + 1) %
+                                       pDev->valuator->numMotionEvents;
+
+    return;
+}
+
+
+/**
+ * Returns the maximum number of events GetKeyboardEvents,
+ * GetKeyboardValuatorEvents, and GetPointerEvents will ever return.
+ *
+ * This MUST be absolutely constant, from init until exit.
+ */
+int
+GetMaximumEventsNum(void) {
+    /* One raw event
+     * One device event
+     * One possible device changed event
+     */
+    return 3;
+}
+
+
+/**
+ * Clip an axis to its bounds, which are declared in the call to
+ * InitValuatorAxisClassStruct.
+ */
+static void
+clipAxis(DeviceIntPtr pDev, int axisNum, int *val)
+{
+    AxisInfoPtr axis;
+
+    if (axisNum >= pDev->valuator->numAxes)
+        return;
+
+    axis = pDev->valuator->axes + axisNum;
+
+    /* If a value range is defined, clip. If not, do nothing */
+    if (axis->max_value <= axis->min_value)
+        return;
+
+    if (*val < axis->min_value)
+        *val = axis->min_value;
+    if (*val > axis->max_value)
+        *val = axis->max_value;
+}
+
+/**
+ * Clip every axis in the list of valuators to its bounds.
+ */
+static void
+clipValuators(DeviceIntPtr pDev, ValuatorMask *mask)
+{
+    int i;
+
+    for (i = 0; i < valuator_mask_size(mask); i++)
+        if (valuator_mask_isset(mask, i))
+        {
+            int val = valuator_mask_get(mask, i);
+            clipAxis(pDev, i, &val);
+            valuator_mask_set(mask, i, val);
+        }
+}
+
+/**
+ * Create the DCCE event (does not update the master's device state yet, this
+ * is done in the event processing).
+ * Pull in the coordinates from the MD if necessary.
+ *
+ * @param events Pointer to a pre-allocated event list.
+ * @param dev The slave device that generated an event.
+ * @param type Either DEVCHANGE_POINTER_EVENT and/or DEVCHANGE_KEYBOARD_EVENT
+ * @param num_events The current number of events, returns the number of
+ *        events if a DCCE was generated.
+ * @return The updated @events pointer.
+ */
+EventListPtr
+UpdateFromMaster(EventListPtr events, DeviceIntPtr dev, int type, int *num_events)
+{
+    DeviceIntPtr master;
+
+    master = GetMaster(dev, (type & DEVCHANGE_POINTER_EVENT) ?  MASTER_POINTER : MASTER_KEYBOARD);
+
+    if (master && master->last.slave != dev)
+    {
+        CreateClassesChangedEvent(events, master, dev, type);
+        if (IsPointerDevice(master))
+        {
+            updateSlaveDeviceCoords(master, dev);
+            master->last.numValuators = dev->last.numValuators;
+        }
+        master->last.slave = dev;
+        (*num_events)++;
+        events++;
+    }
+    return events;
+}
+
+/**
+ * Move the device's pointer to the position given in the valuators.
+ *
+ * @param dev The device which's pointer is to be moved.
+ * @param x Returns the x position of the pointer after the move.
+ * @param y Returns the y position of the pointer after the move.
+ * @param mask Bit mask of valid valuators.
+ * @param valuators Valuator data for each axis between @first and
+ *        @first+@num.
+ */
+static void
+moveAbsolute(DeviceIntPtr dev, int *x, int *y, ValuatorMask *mask)
+{
+    int i;
+
+    if (valuator_mask_isset(mask, 0))
+        *x = valuator_mask_get(mask, 0);
+    else
+        *x = dev->last.valuators[0];
+
+    if (valuator_mask_isset(mask, 1))
+        *y = valuator_mask_get(mask, 1);
+    else
+        *y = dev->last.valuators[1];
+
+    clipAxis(dev, 0, x);
+    clipAxis(dev, 1, y);
+
+    for (i = 2; i < valuator_mask_size(mask); i++)
+    {
+        if (valuator_mask_isset(mask, i))
+        {
+            dev->last.valuators[i] = valuator_mask_get(mask, i);
+            clipAxis(dev, i, &dev->last.valuators[i]);
+        }
+    }
+}
+
+/**
+ * Move the device's pointer by the values given in @valuators.
+ *
+ * @param dev The device which's pointer is to be moved.
+ * @param x Returns the x position of the pointer after the move.
+ * @param y Returns the y position of the pointer after the move.
+ * @param mask Bit mask of valid valuators.
+ * @param valuators Valuator data for each axis between @first and
+ *        @first+@num.
+ */
+static void
+moveRelative(DeviceIntPtr dev, int *x, int *y, ValuatorMask *mask)
+{
+    int i;
+
+    *x = dev->last.valuators[0];
+    *y = dev->last.valuators[1];
+
+    if (valuator_mask_isset(mask, 0))
+        *x += valuator_mask_get(mask, 0);
+
+    if (valuator_mask_isset(mask, 1))
+        *y += valuator_mask_get(mask, 1);
+
+    /* if attached, clip both x and y to the defined limits (usually
+     * co-ord space limit). If it is attached, we need x/y to go over the
+     * limits to be able to change screens. */
+    if(dev->u.master && dev->valuator) {
+        if (valuator_get_mode(dev, 0) == Absolute)
+            clipAxis(dev, 0, x);
+        if (valuator_get_mode(dev, 1) == Absolute)
+            clipAxis(dev, 1, y);
+    }
+
+    /* calc other axes, clip, drop back into valuators */
+    for (i = 2; i < valuator_mask_size(mask); i++)
+    {
+        if (valuator_mask_isset(mask, i))
+        {
+            dev->last.valuators[i] += valuator_mask_get(mask, i);
+            if (valuator_get_mode(dev, i) == Absolute)
+                clipAxis(dev, i, &dev->last.valuators[i]);
+            valuator_mask_set(mask, i, dev->last.valuators[i]);
+        }
+    }
+}
+
+/**
+ * Accelerate the data in valuators based on the device's acceleration scheme.
+ *
+ * @param dev The device which's pointer is to be moved.
+ * @param first The first valuator in @valuators
+ * @param num Total number of valuators in @valuators.
+ * @param valuators Valuator data for each axis between @first and
+ *        @first+@num.
+ * @param ms Current time.
+ */
+static void
+accelPointer(DeviceIntPtr dev, int first, int num, int *valuators, CARD32 ms)
+{
+    if (dev->valuator->accelScheme.AccelSchemeProc)
+        dev->valuator->accelScheme.AccelSchemeProc(dev, first, num, valuators, ms);
+}
+
+/**
+ * If we have HW cursors, this actually moves the visible sprite. If not, we
+ * just do all the screen crossing, etc.
+ *
+ * We scale from device to screen coordinates here, call
+ * miPointerSetPosition() and then scale back into device coordinates (if
+ * needed). miPSP will change x/y if the screen was crossed.
+ *
+ * @param dev The device to be moved.
+ * @param x Pointer to current x-axis value, may be modified.
+ * @param y Pointer to current y-axis value, may be modified.
+ * @param x_frac Fractional part of current x-axis value, may be modified.
+ * @param y_frac Fractional part of current y-axis value, may be modified.
+ * @param scr Screen the device's sprite is currently on.
+ * @param screenx Screen x coordinate the sprite is on after the update.
+ * @param screeny Screen y coordinate the sprite is on after the update.
+ * @param screenx_frac Fractional part of screen x coordinate, as above.
+ * @param screeny_frac Fractional part of screen y coordinate, as above.
+ */
+static void
+positionSprite(DeviceIntPtr dev, int *x, int *y, float x_frac, float y_frac,
+               ScreenPtr scr, int *screenx, int *screeny, float *screenx_frac, float *screeny_frac)
+{
+    int old_screenx, old_screeny;
+
+    /* scale x&y to screen */
+    if (dev->valuator && dev->valuator->numAxes > 0) {
+        *screenx = rescaleValuatorAxis(*x, x_frac, screenx_frac,
+                dev->valuator->axes + 0, NULL, scr->width);
+    } else {
+        *screenx = dev->last.valuators[0];
+        *screenx_frac = dev->last.remainder[0];
+    }
+
+    if (dev->valuator && dev->valuator->numAxes > 1) {
+        *screeny = rescaleValuatorAxis(*y, y_frac, screeny_frac,
+                dev->valuator->axes + 1, NULL, scr->height);
+    } else {
+        *screeny = dev->last.valuators[1];
+        *screeny_frac = dev->last.remainder[1];
+    }
+
+    /* Hit the left screen edge? */
+    if (*screenx <= 0 && *screenx_frac < 0.0f)
+    {
+        *screenx_frac = 0.0f;
+        x_frac = 0.0f;
+    }
+    if (*screeny <= 0 && *screeny_frac < 0.0f)
+    {
+        *screeny_frac = 0.0f;
+        y_frac = 0.0f;
+    }
+
+
+    old_screenx = *screenx;
+    old_screeny = *screeny;
+    /* This takes care of crossing screens for us, as well as clipping
+     * to the current screen. */
+    miPointerSetPosition(dev, screenx, screeny);
+
+    if (dev->u.master) {
+        dev->u.master->last.valuators[0] = *screenx;
+        dev->u.master->last.valuators[1] = *screeny;
+        dev->u.master->last.remainder[0] = *screenx_frac;
+        dev->u.master->last.remainder[1] = *screeny_frac;
+    }
+
+    if (dev->valuator)
+    {
+        /* Crossed screen? Scale back to device coordiantes */
+        if(*screenx != old_screenx)
+        {
+            scr = miPointerGetScreen(dev);
+            *x = rescaleValuatorAxis(*screenx, *screenx_frac, &x_frac, NULL,
+                                    dev->valuator->axes + 0, scr->width);
+        }
+        if(*screeny != old_screeny)
+        {
+            scr = miPointerGetScreen(dev);
+            *y = rescaleValuatorAxis(*screeny, *screeny_frac, &y_frac, NULL,
+                                     dev->valuator->axes + 1, scr->height);
+        }
+    }
+
+    /* dropy x/y (device coordinates) back into valuators for next event */
+    dev->last.valuators[0] = *x;
+    dev->last.valuators[1] = *y;
+    dev->last.remainder[0] = x_frac;
+    dev->last.remainder[1] = y_frac;
+}
+
+/**
+ * Update the motion history for the device and (if appropriate) for its
+ * master device.
+ * @param dev Slave device to update.
+ * @param mask Bit mask of valid valuators to append to history.
+ * @param num Total number of valuators to append to history.
+ * @param ms Current time
+ */
+static void
+updateHistory(DeviceIntPtr dev, ValuatorMask *mask, CARD32 ms)
+{
+    if (!dev->valuator)
+        return;
+
+    updateMotionHistory(dev, ms, mask, dev->last.valuators);
+    if (dev->u.master)
+    {
+        DeviceIntPtr master = GetMaster(dev, MASTER_POINTER);
+        updateMotionHistory(master, ms, mask, dev->last.valuators);
+    }
+}
+
+/**
+ * Convenience wrapper around GetKeyboardValuatorEvents, that takes no
+ * valuators.
+ */
+int
+GetKeyboardEvents(EventList *events, DeviceIntPtr pDev, int type, int key_code) {
+    ValuatorMask mask;
+
+    valuator_mask_zero(&mask);
+    return GetKeyboardValuatorEvents(events, pDev, type, key_code, &mask);
+}
+
+
+/**
+ * Returns a set of InternalEvents for KeyPress/KeyRelease, optionally
+ * also with valuator events.
+ *
+ * events is not NULL-terminated; the return value is the number of events.
+ * The DDX is responsible for allocating the event structure in the first
+ * place via GetMaximumEventsNum(), and for freeing it.
+ */
+int
+GetKeyboardValuatorEvents(EventList *events, DeviceIntPtr pDev, int type,
+                          int key_code, const ValuatorMask *mask_in) {
+    int num_events = 0;
+    CARD32 ms = 0;
+    DeviceEvent *event;
+    RawDeviceEvent *raw;
+    ValuatorMask mask;
+
+    /* refuse events from disabled devices */
+    if (!pDev->enabled)
+        return 0;
+
+    if (!events ||!pDev->key || !pDev->focus || !pDev->kbdfeed ||
+       (type != KeyPress && type != KeyRelease) ||
+       (key_code < 8 || key_code > 255))
+        return 0;
+
+    num_events = 1;
+
+    events = UpdateFromMaster(events, pDev, DEVCHANGE_KEYBOARD_EVENT, &num_events);
+
+    /* Handle core repeating, via press/release/press/release. */
+    if (type == KeyPress && key_is_down(pDev, key_code, KEY_POSTED)) {
+        /* If autorepeating is disabled either globally or just for that key,
+         * or we have a modifier, don't generate a repeat event. */
+        if (!pDev->kbdfeed->ctrl.autoRepeat ||
+            !key_autorepeats(pDev, key_code) ||
+            pDev->key->xkbInfo->desc->map->modmap[key_code])
+            return 0;
+    }
+
+    ms = GetTimeInMillis();
+
+    raw = (RawDeviceEvent*)events->event;
+    events++;
+    num_events++;
+
+    valuator_mask_copy(&mask, mask_in);
+
+    init_raw(pDev, raw, ms, type, key_code);
+    set_raw_valuators(raw, &mask, raw->valuators.data_raw);
+
+    clipValuators(pDev, &mask);
+
+    set_raw_valuators(raw, &mask, raw->valuators.data);
+
+    event = (DeviceEvent*) events->event;
+    init_event(pDev, event, ms);
+    event->detail.key = key_code;
+
+    if (type == KeyPress) {
+        event->type = ET_KeyPress;
+	set_key_down(pDev, key_code, KEY_POSTED);
+    }
+    else if (type == KeyRelease) {
+        event->type = ET_KeyRelease;
+	set_key_up(pDev, key_code, KEY_POSTED);
+    }
+
+    clipValuators(pDev, &mask);
+
+    set_valuators(pDev, event, &mask);
+
+    return num_events;
+}
+
+/**
+ * Initialize an event list and fill with 32 byte sized events.
+ * This event list is to be passed into GetPointerEvents() and
+ * GetKeyboardEvents().
+ *
+ * @param num_events Number of elements in list.
+ */
+EventListPtr
+InitEventList(int num_events)
+{
+    EventListPtr events;
+    int i;
+
+    events = (EventListPtr)calloc(num_events, sizeof(EventList));
+    if (!events)
+        return NULL;
+
+    for (i = 0; i < num_events; i++)
+    {
+        events[i].evlen = sizeof(InternalEvent);
+        events[i].event = calloc(1, sizeof(InternalEvent));
+        if (!events[i].event)
+        {
+            /* rollback */
+            while(i--)
+                free(events[i].event);
+            free(events);
+            events = NULL;
+            break;
+        }
+    }
+
+    return events;
+}
+
+/**
+ * Free an event list.
+ *
+ * @param list The list to be freed.
+ * @param num_events Number of elements in list.
+ */
+void
+FreeEventList(EventListPtr list, int num_events)
+{
+    if (!list)
+        return;
+    while(num_events--)
+        free(list[num_events].event);
+    free(list);
+}
+
+static void
+transformAbsolute(DeviceIntPtr dev, ValuatorMask *mask)
+{
+    struct pixman_f_vector p;
+
+    /* p' = M * p in homogeneous coordinates */
+    p.v[0] = (valuator_mask_isset(mask, 0) ? valuator_mask_get(mask, 0) :
+              dev->last.valuators[0]);
+    p.v[1] = (valuator_mask_isset(mask, 1) ? valuator_mask_get(mask, 1) :
+              dev->last.valuators[1]);
+    p.v[2] = 1.0;
+
+    pixman_f_transform_point(&dev->transform, &p);
+
+    if (lround(p.v[0]) != dev->last.valuators[0])
+        valuator_mask_set(mask, 0, lround(p.v[0]));
+    if (lround(p.v[1]) != dev->last.valuators[1])
+        valuator_mask_set(mask, 1, lround(p.v[1]));
+}
+
+/**
+ * Generate a series of InternalEvents (filled into the EventList)
+ * representing pointer motion, or button presses.
+ *
+ * events is not NULL-terminated; the return value is the number of events.
+ * The DDX is responsible for allocating the event structure in the first
+ * place via InitEventList() and GetMaximumEventsNum(), and for freeing it.
+ *
+ * In the generated events rootX/Y will be in absolute screen coords and
+ * the valuator information in the absolute or relative device coords.
+ *
+ * last.valuators[x] of the device is always in absolute device coords.
+ * last.valuators[x] of the master device is in absolute screen coords.
+ *
+ * master->last.valuators[x] for x > 2 is undefined.
+ */
+int
+GetPointerEvents(EventList *events, DeviceIntPtr pDev, int type, int buttons,
+                 int flags, const ValuatorMask *mask_in) {
+    int num_events = 1;
+    CARD32 ms;
+    DeviceEvent *event;
+    RawDeviceEvent    *raw;
+    int x = 0, y = 0, /* device coords */
+        cx, cy; /* only screen coordinates */
+    float x_frac = 0.0, y_frac = 0.0, cx_frac, cy_frac;
+    ScreenPtr scr = miPointerGetScreen(pDev);
+    ValuatorMask mask;
+
+    /* refuse events from disabled devices */
+    if (!pDev->enabled)
+        return 0;
+
+    if (!scr)
+        return 0;
+
+    switch (type)
+    {
+        case MotionNotify:
+            if (!mask_in || valuator_mask_num_valuators(mask_in) <= 0)
+                return 0;
+            break;
+        case ButtonPress:
+        case ButtonRelease:
+            if (!pDev->button || !buttons)
+                return 0;
+            break;
+        default:
+            return 0;
+    }
+
+    ms = GetTimeInMillis(); /* before pointer update to help precision */
+
+    events = UpdateFromMaster(events, pDev, DEVCHANGE_POINTER_EVENT, &num_events);
+
+    raw = (RawDeviceEvent*)events->event;
+    events++;
+    num_events++;
+
+    valuator_mask_copy(&mask, mask_in);
+
+    init_raw(pDev, raw, ms, type, buttons);
+    set_raw_valuators(raw, &mask, raw->valuators.data_raw);
+
+    if (flags & POINTER_ABSOLUTE)
+    {
+        if (flags & POINTER_SCREEN) /* valuators are in screen coords */
+        {
+            int scaled;
+
+            if (valuator_mask_isset(&mask, 0))
+            {
+                scaled = rescaleValuatorAxis(valuator_mask_get(&mask, 0),
+                                             0.0, &x_frac, NULL,
+                                             pDev->valuator->axes + 0,
+                                             scr->width);
+                valuator_mask_set(&mask, 0, scaled);
+            }
+            if (valuator_mask_isset(&mask, 1))
+            {
+                scaled = rescaleValuatorAxis(valuator_mask_get(&mask, 1),
+                                             0.0, &y_frac, NULL,
+                                             pDev->valuator->axes + 1,
+                                             scr->height);
+                valuator_mask_set(&mask, 1, scaled);
+            }
+        }
+
+        transformAbsolute(pDev, &mask);
+        moveAbsolute(pDev, &x, &y, &mask);
+    } else {
+        if (flags & POINTER_ACCELERATE) {
+            /* FIXME: Pointer acceleration only requires X and Y values. This
+             * should be converted to masked valuators. */
+            int vals[2];
+            vals[0] = valuator_mask_isset(&mask, 0) ?
+                      valuator_mask_get(&mask, 0) : 0;
+            vals[1] = valuator_mask_isset(&mask, 1) ?
+                      valuator_mask_get(&mask, 1) : 0;
+            accelPointer(pDev, 0, 2, vals, ms);
+
+            if (valuator_mask_isset(&mask, 0))
+                valuator_mask_set(&mask, 0, vals[0]);
+            if (valuator_mask_isset(&mask, 1))
+                valuator_mask_set(&mask, 1, vals[1]);
+
+            /* The pointer acceleration code modifies the fractional part
+             * in-place, so we need to extract this information first */
+            x_frac = pDev->last.remainder[0];
+            y_frac = pDev->last.remainder[1];
+        }
+        moveRelative(pDev, &x, &y, &mask);
+    }
+
+    set_raw_valuators(raw, &mask, raw->valuators.data);
+
+    positionSprite(pDev, &x, &y, x_frac, y_frac, scr, &cx, &cy, &cx_frac, &cy_frac);
+    updateHistory(pDev, &mask, ms);
+
+    /* Update the valuators with the true value sent to the client*/
+    if (valuator_mask_isset(&mask, 0))
+        valuator_mask_set(&mask, 0, x);
+    if (valuator_mask_isset(&mask, 1))
+        valuator_mask_set(&mask, 1, y);
+
+    clipValuators(pDev, &mask);
+
+    event = (DeviceEvent*) events->event;
+    init_event(pDev, event, ms);
+
+    if (type == MotionNotify) {
+        event->type = ET_Motion;
+        event->detail.button = 0;
+    }
+    else {
+        if (type == ButtonPress) {
+            event->type = ET_ButtonPress;
+            set_button_down(pDev, buttons, BUTTON_POSTED);
+        }
+        else if (type == ButtonRelease) {
+            event->type = ET_ButtonRelease;
+            set_button_up(pDev, buttons, BUTTON_POSTED);
+        }
+        event->detail.button = buttons;
+    }
+
+    event->root_x = cx; /* root_x/y always in screen coords */
+    event->root_y = cy;
+    event->root_x_frac = cx_frac;
+    event->root_y_frac = cy_frac;
+
+    set_valuators(pDev, event, &mask);
+
+    return num_events;
+}
+
+
+/**
+ * Generate ProximityIn/ProximityOut InternalEvents, accompanied by
+ * valuators.
+ *
+ * events is not NULL-terminated; the return value is the number of events.
+ * The DDX is responsible for allocating the event structure in the first
+ * place via GetMaximumEventsNum(), and for freeing it.
+ */
+int
+GetProximityEvents(EventList *events, DeviceIntPtr pDev, int type, const ValuatorMask *mask_in)
+{
+    int num_events = 1, i;
+    DeviceEvent *event;
+    ValuatorMask mask;
+
+    /* refuse events from disabled devices */
+    if (!pDev->enabled)
+        return 0;
+
+    /* Sanity checks. */
+    if ((type != ProximityIn && type != ProximityOut) || !mask_in)
+        return 0;
+    if (!pDev->valuator)
+        return 0;
+
+    valuator_mask_copy(&mask, mask_in);
+
+    /* ignore relative axes for proximity. */
+    for (i = 0; i < valuator_mask_size(&mask); i++)
+    {
+        if (valuator_mask_isset(&mask, i) &&
+            valuator_get_mode(pDev, i) == Relative)
+            valuator_mask_unset(&mask, i);
+    }
+
+    /* FIXME: posting proximity events with relative valuators only results
+     * in an empty event, EventToXI() will fail to convert → no event sent
+     * to client. */
+
+    events = UpdateFromMaster(events, pDev, DEVCHANGE_POINTER_EVENT, &num_events);
+
+    event = (DeviceEvent *) events->event;
+    init_event(pDev, event, GetTimeInMillis());
+    event->type = (type == ProximityIn) ? ET_ProximityIn : ET_ProximityOut;
+
+    clipValuators(pDev, &mask);
+
+    set_valuators(pDev, event, &mask);
+
+    return num_events;
+}
+
+/**
+ * Synthesize a single motion event for the core pointer.
+ *
+ * Used in cursor functions, e.g. when cursor confinement changes, and we need
+ * to shift the pointer to get it inside the new bounds.
+ */
+void
+PostSyntheticMotion(DeviceIntPtr pDev,
+                    int x,
+                    int y,
+                    int screen,
+                    unsigned long time)
+{
+    DeviceEvent ev;
+
+#ifdef PANORAMIX
+    /* Translate back to the sprite screen since processInputProc
+       will translate from sprite screen to screen 0 upon reentry
+       to the DIX layer. */
+    if (!noPanoramiXExtension) {
+        x += screenInfo.screens[0]->x - screenInfo.screens[screen]->x;
+        y += screenInfo.screens[0]->y - screenInfo.screens[screen]->y;
+    }
+#endif
+
+    memset(&ev, 0, sizeof(DeviceEvent));
+    init_event(pDev, &ev, time);
+    ev.root_x = x;
+    ev.root_y = y;
+    ev.type = ET_Motion;
+    ev.time = time;
+
+    /* FIXME: MD/SD considerations? */
+    (*pDev->public.processInputProc)((InternalEvent*)&ev, pDev);
+}
diff --git a/xorg-server/hw/dmx/Makefile.am b/xorg-server/hw/dmx/Makefile.am
index 939e8ec31..2a87c3966 100644
--- a/xorg-server/hw/dmx/Makefile.am
+++ b/xorg-server/hw/dmx/Makefile.am
@@ -1,117 +1,112 @@
-DIST_SUBDIRS = input config glxProxy examples doc

-

-SUBDIRS = input config examples

-bin_PROGRAMS = Xdmx

-

-if XINERAMA

-PANORAMIX_SRCS = $(top_srcdir)/Xext/panoramiX.c

-endif

-

-if GLX

-SUBDIRS += glxProxy

-GLX_LIBS = glxProxy/libglxproxy.a

-GLX_SRCS = $(PANORAMIX_SRCS) dmx_glxvisuals.c dmx_glxvisuals.h

-GLX_INCS = -I$(top_srcdir)/hw/xfree86/dixmods/extmod

-GLX_DEFS = @GL_CFLAGS@

-endif

-

-if BUILDDOCS

-SUBDIRS += doc

-endif

-

-AM_CFLAGS = \

-      -DHAVE_DMX_CONFIG_H \

-      $(DIX_CFLAGS) \

-      $(GLX_INCS) \

-      $(GLX_DEFS) \

-      $(DMX_CFLAGS) \

-      @DMXMODULES_CFLAGS@

-

-Xdmx_SOURCES = dmx.c \

-               dmxcb.c \

-               dmxcb.h \

-               dmxclient.h \

-               dmxcmap.c \

-               dmxcmap.h \

-               dmx-config.h \

-               dmxcursor.c \

-               dmxcursor.h \

-               dmxdpms.c \

-               dmxdpms.h \

-               dmxextension.c \

-               dmxextension.h \

-               dmxfont.c \

-               dmxfont.h \

-               dmxgc.c \

-               dmxgc.h \

-               dmxgcops.c \

-               dmxgcops.h \

-               dmx.h \

-               dmxinit.c \

-               dmxinit.h \

-               dmxinput.c \

-               dmxinput.h \

-               dmxlog.c \

-               dmxlog.h \

-               dmxpict.c \

-               dmxpict.h \

-               dmxpixmap.c \

-               dmxpixmap.h \

-               dmxprop.c \

-               dmxprop.h \

-               dmxscrinit.c \

-               dmxscrinit.h \

-               dmxshadow.c \

-               dmxshadow.h \

-               dmxstat.c \

-               dmxstat.h \

-               dmxsync.c \

-               dmxsync.h \

-               dmxvisual.c \

-               dmxvisual.h \

-               dmxwindow.c \

-               dmxwindow.h \

-               $(top_srcdir)/mi/miinitext.c \

-               $(top_srcdir)/fb/fbcmap_mi.c \

-               $(GLX_SRCS) 

-

-

-#if COMPOSITE

-#Xdmx_SOURCES += fakecw.c

-#endif

-

-XDMX_LIBS = \

-	$(GLX_LIBS) \

-	@XDMX_LIBS@ \

-        input/libdmxinput.a \

-        config/libdmxconfig.a

-

-Xdmx_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG)

-Xdmx_DEPENDENCIES= $(XDMX_LIBS)

-Xdmx_LDADD = $(XDMX_LIBS) $(XDMX_SYS_LIBS) $(XSERVER_SYS_LIBS)

-

-# Man page

-appmandir = $(APP_MAN_DIR)

-

-appman_PRE = Xdmx.man

-appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)

-

-CLEANFILES = $(appman_DATA)

-

-# Strings to replace in man pages

-XORGRELSTRING = @PACKAGE_STRING@

-  XORGMANNAME = X Version 11

-

-MAN_SUBSTS = \

-	-e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \

-	-e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g'

-

-SUFFIXES = .$(APP_MAN_SUFFIX) .man

-

-.man.$(APP_MAN_SUFFIX):

-	$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@

-

-EXTRA_DIST = $(appman_PRE)

-

-relink:

-	$(AM_V_at)rm -f Xdmx$(EXEEXT) && $(MAKE) Xdmx$(EXEEXT)

+
+SUBDIRS = input config examples doc
+bin_PROGRAMS = Xdmx
+
+if XINERAMA
+PANORAMIX_SRCS = $(top_srcdir)/Xext/panoramiX.c
+endif
+
+if GLX
+SUBDIRS += glxProxy
+GLX_LIBS = glxProxy/libglxproxy.a
+GLX_SRCS = $(PANORAMIX_SRCS) dmx_glxvisuals.c dmx_glxvisuals.h
+GLX_INCS = -I$(top_srcdir)/hw/xfree86/dixmods/extmod
+GLX_DEFS = @GL_CFLAGS@
+endif
+
+AM_CFLAGS = \
+      -DHAVE_DMX_CONFIG_H \
+      $(DIX_CFLAGS) \
+      $(GLX_INCS) \
+      $(GLX_DEFS) \
+      $(DMX_CFLAGS) \
+      @DMXMODULES_CFLAGS@
+
+Xdmx_SOURCES = dmx.c \
+               dmxcb.c \
+               dmxcb.h \
+               dmxclient.h \
+               dmxcmap.c \
+               dmxcmap.h \
+               dmx-config.h \
+               dmxcursor.c \
+               dmxcursor.h \
+               dmxdpms.c \
+               dmxdpms.h \
+               dmxextension.c \
+               dmxextension.h \
+               dmxfont.c \
+               dmxfont.h \
+               dmxgc.c \
+               dmxgc.h \
+               dmxgcops.c \
+               dmxgcops.h \
+               dmx.h \
+               dmxinit.c \
+               dmxinit.h \
+               dmxinput.c \
+               dmxinput.h \
+               dmxlog.c \
+               dmxlog.h \
+               dmxpict.c \
+               dmxpict.h \
+               dmxpixmap.c \
+               dmxpixmap.h \
+               dmxprop.c \
+               dmxprop.h \
+               dmxscrinit.c \
+               dmxscrinit.h \
+               dmxshadow.c \
+               dmxshadow.h \
+               dmxstat.c \
+               dmxstat.h \
+               dmxsync.c \
+               dmxsync.h \
+               dmxvisual.c \
+               dmxvisual.h \
+               dmxwindow.c \
+               dmxwindow.h \
+               $(top_srcdir)/mi/miinitext.c \
+               $(top_srcdir)/fb/fbcmap_mi.c \
+               $(GLX_SRCS) 
+
+
+#if COMPOSITE
+#Xdmx_SOURCES += fakecw.c
+#endif
+
+XDMX_LIBS = \
+	$(GLX_LIBS) \
+	@XDMX_LIBS@ \
+        input/libdmxinput.a \
+        config/libdmxconfig.a
+
+Xdmx_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG)
+Xdmx_DEPENDENCIES= $(XDMX_LIBS)
+Xdmx_LDADD = $(XDMX_LIBS) $(XDMX_SYS_LIBS) $(XSERVER_SYS_LIBS)
+
+# Man page
+appmandir = $(APP_MAN_DIR)
+
+appman_PRE = Xdmx.man
+appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
+
+CLEANFILES = $(appman_DATA)
+
+# Strings to replace in man pages
+XORGRELSTRING = @PACKAGE_STRING@
+  XORGMANNAME = X Version 11
+
+MAN_SUBSTS = \
+	-e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
+	-e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g'
+
+SUFFIXES = .$(APP_MAN_SUFFIX) .man
+
+.man.$(APP_MAN_SUFFIX):
+	$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
+
+EXTRA_DIST = $(appman_PRE)
+
+relink:
+	$(AM_V_at)rm -f Xdmx$(EXEEXT) && $(MAKE) Xdmx$(EXEEXT)
diff --git a/xorg-server/hw/dmx/doc/Makefile.am b/xorg-server/hw/dmx/doc/Makefile.am
index 5f845763e..4bbc8bf88 100644
--- a/xorg-server/hw/dmx/doc/Makefile.am
+++ b/xorg-server/hw/dmx/doc/Makefile.am
@@ -1,265 +1,265 @@
-#  Copyright 2005 Red Hat, Inc.

-#

-#  Permission to use, copy, modify, distribute, and sell this software

-#  and its documentation for any purpose is hereby granted without

-#  fee, provided that the above copyright notice appear in all copies

-#  and that both that copyright notice and this permission notice

-#  appear in supporting documentation, and that the name of Red Hat

-#  not be used in advertising or publicity pertaining to distribution

-#  of the software without specific, written prior permission.  Red

-#  Hat makes no representations about the suitability of this software

-#  for any purpose.  It is provided "as is" without express or implied

-#  warranty.

-#

-#  RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

-#  INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN

-#  NO EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR

-#  CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS

-#  OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,

-#  NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN

-#  CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

-

-doc_sources = dmx.xml scaled.xml

-

-# Developer's documentation is not installed

-if ENABLE_DEVEL_DOCS

-include $(top_srcdir)/doc/xml/xmlrules-noinst.in

-endif

-

-if HAVE_DOXYGEN

-

-DOXYGEN_SRC=doxygen.head doxygen.foot doxygen.css doxygen.conf

-

-all-local: html/annotated.html

-

-dist-local: html/annotated.html

-

-html/annotated.html: $(DOXYGEN_SRC)

-	$(DOXYGEN) $(srcdir)/doxygen.conf

-

-maintainer-clean-local:

-	rm -rf html/

-endif

-

-EXTRA_DIST = \

-	$(XML_FILES) \

-	DMXSpec.txt \

-	DMXSpec-v1.txt \

-	dmx.txt \

-	doxygen.conf \

-	doxygen.css \

-	doxygen.foot \

-	doxygen.head \

-	scaled.txt \

-	html/annotated.html \

-	html/ChkNotMaskEv_8c.html \

-	html/ChkNotMaskEv_8h.html \

-	html/ChkNotMaskEv_8h_source.html \

-	html/classes.html \

-	html/dmx_8h.html \

-	html/dmx_8h_source.html \

-	html/dmxarg_8c.html \

-	html/dmxarg_8h.html \

-	html/dmxarg_8h_source.html \

-	html/dmxbackend_8c.html \

-	html/dmxbackend_8h.html \

-	html/dmxbackend_8h_source.html \

-	html/dmxcb_8c.html \

-	html/dmxcb_8h.html \

-	html/dmxcb_8h_source.html \

-	html/dmxclient_8h.html \

-	html/dmxclient_8h_source.html \

-	html/dmxcmap_8c.html \

-	html/dmxcmap_8h.html \

-	html/dmxcmap_8h_source.html \

-	html/dmxcommon_8c.html \

-	html/dmxcommon_8h.html \

-	html/dmxcommon_8h_source.html \

-	html/dmxcompat_8c.html \

-	html/dmxcompat_8h.html \

-	html/dmxcompat_8h_source.html \

-	html/dmxconfig_8c.html \

-	html/dmxconfig_8h.html \

-	html/dmxconfig_8h_source.html \

-	html/dmxconsole_8c.html \

-	html/dmxconsole_8h.html \

-	html/dmxconsole_8h_source.html \

-	html/dmxcursor_8c.html \

-	html/dmxcursor_8h.html \

-	html/dmxcursor_8h_source.html \

-	html/dmxdetach_8c.html \

-	html/dmxdpms_8c.html \

-	html/dmxdpms_8h.html \

-	html/dmxdpms_8h_source.html \

-	html/dmxdummy_8c.html \

-	html/dmxdummy_8h.html \

-	html/dmxdummy_8h_source.html \

-	html/dmxevents_8c.html \

-	html/dmxevents_8h.html \

-	html/dmxevents_8h_source.html \

-	html/dmxextension_8c.html \

-	html/dmxextension_8h.html \

-	html/dmxextension_8h_source.html \

-	html/dmxfont_8c.html \

-	html/dmxfont_8h.html \

-	html/dmxfont_8h_source.html \

-	html/dmxgc_8c.html \

-	html/dmxgc_8h.html \

-	html/dmxgc_8h_source.html \

-	html/dmxgcops_8c.html \

-	html/dmxgcops_8h.html \

-	html/dmxgcops_8h_source.html \

-	html/dmx__glxvisuals_8h_source.html \

-	html/dmxinit_8c.html \

-	html/dmxinit_8h.html \

-	html/dmxinit_8h_source.html \

-	html/dmxinput_8c.html \

-	html/dmxinput_8h.html \

-	html/dmxinput_8h_source.html \

-	html/dmxinputinit_8c.html \

-	html/dmxinputinit_8h.html \

-	html/dmxinputinit_8h_source.html \

-	html/dmxlog_8c.html \

-	html/dmxlog_8h.html \

-	html/dmxlog_8h_source.html \

-	html/dmxmap_8c.html \

-	html/dmxmap_8h.html \

-	html/dmxmap_8h_source.html \

-	html/dmxmotion_8c.html \

-	html/dmxmotion_8h.html \

-	html/dmxmotion_8h_source.html \

-	html/dmxparse_8c.html \

-	html/dmxparse_8h.html \

-	html/dmxparse_8h_source.html \

-	html/dmxpict_8c.html \

-	html/dmxpict_8h.html \

-	html/dmxpict_8h_source.html \

-	html/dmxpixmap_8c.html \

-	html/dmxpixmap_8h.html \

-	html/dmxpixmap_8h_source.html \

-	html/dmxprint_8c.html \

-	html/dmxprint_8h.html \

-	html/dmxprint_8h_source.html \

-	html/dmxprop_8c.html \

-	html/dmxprop_8h.html \

-	html/dmxprop_8h_source.html \

-	html/dmxscrinit_8c.html \

-	html/dmxscrinit_8h.html \

-	html/dmxscrinit_8h_source.html \

-	html/dmxshadow_8c.html \

-	html/dmxshadow_8h.html \

-	html/dmxshadow_8h_source.html \

-	html/dmxsigio_8c.html \

-	html/dmxsigio_8h.html \

-	html/dmxsigio_8h_source.html \

-	html/dmxstat_8c.html \

-	html/dmxstat_8h.html \

-	html/dmxstat_8h_source.html \

-	html/dmxsync_8c.html \

-	html/dmxsync_8h.html \

-	html/dmxsync_8h_source.html \

-	html/dmxvisual_8c.html \

-	html/dmxvisual_8h.html \

-	html/dmxvisual_8h_source.html \

-	html/dmxwindow_8c.html \

-	html/dmxwindow_8h.html \

-	html/dmxwindow_8h_source.html \

-	html/dmxxinput_8c.html \

-	html/doxygen.css \

-	html/doxygen.png \

-	html/files.html \

-	html/ftv2blank.png \

-	html/ftv2doc.png \

-	html/ftv2folderclosed.png \

-	html/ftv2folderopen.png \

-	html/ftv2lastnode.png \

-	html/ftv2link.png \

-	html/ftv2mlastnode.png \

-	html/ftv2mnode.png \

-	html/ftv2node.png \

-	html/ftv2plastnode.png \

-	html/ftv2pnode.png \

-	html/ftv2vertline.png \

-	html/functions.html \

-	html/functions_vars.html \

-	html/globals_defs.html \

-	html/globals_enum.html \

-	html/globals_eval.html \

-	html/globals_func.html \

-	html/globals.html \

-	html/globals_type.html \

-	html/globals_vars.html \

-	html/index.html \

-	html/lnx-keyboard_8c.html \

-	html/lnx-keyboard_8h.html \

-	html/lnx-keyboard_8h_source.html \

-	html/lnx-ms_8c.html \

-	html/lnx-ms_8h.html \

-	html/lnx-ms_8h_source.html \

-	html/lnx-ps2_8c.html \

-	html/lnx-ps2_8h.html \

-	html/lnx-ps2_8h_source.html \

-	html/main.html \

-	html/struct__dmxArg.html \

-	html/struct__dmxColormapPriv.html \

-	html/structDMXConfigCmdStruct.html \

-	html/struct__DMXConfigComment.html \

-	html/struct__DMXConfigDisplay.html \

-	html/struct__DMXConfigEntry.html \

-	html/struct__DMXConfigFullDim.html \

-	html/structDMXConfigListStruct.html \

-	html/struct__DMXConfigNumber.html \

-	html/struct__DMXConfigOption.html \

-	html/struct__DMXConfigPair.html \

-	html/struct__DMXConfigParam.html \

-	html/struct__DMXConfigPartDim.html \

-	html/struct__DMXConfigString.html \

-	html/struct__DMXConfigSub.html \

-	html/struct__DMXConfigToken.html \

-	html/struct__DMXConfigVirtual.html \

-	html/struct__DMXConfigWall.html \

-	html/struct__dmxCursorPriv.html \

-	html/structDMXDesktopAttributesRec.html \

-	html/struct__DMXEventMap.html \

-	html/struct__dmxFontPriv.html \

-	html/struct__dmxGCPriv.html \

-	html/structdmxGlxVisualPrivate.html \

-	html/struct__dmxGlyphPriv.html \

-	html/structDMXInputAttributesRec.html \

-	html/struct__DMXInputInfo.html \

-	html/struct__DMXLocalInitInfo.html \

-	html/struct__DMXLocalInputInfo.html \

-	html/struct__dmxPictPriv.html \

-	html/struct__dmxPixPriv.html \

-	html/structDMXScreenAttributesRec.html \

-	html/struct__DMXScreenInfo.html \

-	html/struct__DMXStatAvg.html \

-	html/struct__DMXStatInfo.html \

-	html/structDMXWindowAttributesRec.html \

-	html/struct__dmxWinPriv.html \

-	html/struct__myPrivate.html \

-	html/tree.html \

-	html/usb-common_8c.html \

-	html/usb-common_8h.html \

-	html/usb-common_8h_source.html \

-	html/usb-keyboard_8c.html \

-	html/usb-keyboard_8h.html \

-	html/usb-keyboard_8h_source.html \

-	html/usb-mouse_8c.html \

-	html/usb-mouse_8h.html \

-	html/usb-mouse_8h_source.html \

-	html/usb-other_8c.html \

-	html/usb-other_8h.html \

-	html/usb-other_8h_source.html \

-	html/usb-private_8h.html \

-	html/usb-private_8h_source.html

-

-$(builddir)/doxygen.head:

-	$(LN_S) $(srcdir)/doxygen.head $@

-

-$(builddir)/doxygen.foot:

-	$(LN_S) $(srcdir)/doxygen.foot $@

-

-$(builddir)doxygen.css:

-	$(LN_S) $(srcdir)/doxygen.css $@

-

+#  Copyright 2005 Red Hat, Inc.
+#
+#  Permission to use, copy, modify, distribute, and sell this software
+#  and its documentation for any purpose is hereby granted without
+#  fee, provided that the above copyright notice appear in all copies
+#  and that both that copyright notice and this permission notice
+#  appear in supporting documentation, and that the name of Red Hat
+#  not be used in advertising or publicity pertaining to distribution
+#  of the software without specific, written prior permission.  Red
+#  Hat makes no representations about the suitability of this software
+#  for any purpose.  It is provided "as is" without express or implied
+#  warranty.
+#
+#  RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+#  INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
+#  NO EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+#  CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
+#  OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+#  NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+#  CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+doc_sources = dmx.xml scaled.xml
+
+# Developer's documentation is not installed
+if ENABLE_DEVEL_DOCS
+include $(top_srcdir)/doc/xml/xmlrules-noinst.in
+
+if HAVE_DOXYGEN
+
+DOXYGEN_SRC=doxygen.head doxygen.foot doxygen.css doxygen.conf
+
+all-local: html/annotated.html
+
+dist-local: html/annotated.html
+
+html/annotated.html: $(DOXYGEN_SRC)
+	$(DOXYGEN) $(srcdir)/doxygen.conf
+
+maintainer-clean-local:
+	rm -rf html/
+endif
+endif ENABLE_DEVEL_DOCS
+
+EXTRA_DIST = \
+	$(XML_FILES) \
+	DMXSpec.txt \
+	DMXSpec-v1.txt \
+	dmx.txt \
+	doxygen.conf \
+	doxygen.css \
+	doxygen.foot \
+	doxygen.head \
+	scaled.txt \
+	html/annotated.html \
+	html/ChkNotMaskEv_8c.html \
+	html/ChkNotMaskEv_8h.html \
+	html/ChkNotMaskEv_8h_source.html \
+	html/classes.html \
+	html/dmx_8h.html \
+	html/dmx_8h_source.html \
+	html/dmxarg_8c.html \
+	html/dmxarg_8h.html \
+	html/dmxarg_8h_source.html \
+	html/dmxbackend_8c.html \
+	html/dmxbackend_8h.html \
+	html/dmxbackend_8h_source.html \
+	html/dmxcb_8c.html \
+	html/dmxcb_8h.html \
+	html/dmxcb_8h_source.html \
+	html/dmxclient_8h.html \
+	html/dmxclient_8h_source.html \
+	html/dmxcmap_8c.html \
+	html/dmxcmap_8h.html \
+	html/dmxcmap_8h_source.html \
+	html/dmxcommon_8c.html \
+	html/dmxcommon_8h.html \
+	html/dmxcommon_8h_source.html \
+	html/dmxcompat_8c.html \
+	html/dmxcompat_8h.html \
+	html/dmxcompat_8h_source.html \
+	html/dmxconfig_8c.html \
+	html/dmxconfig_8h.html \
+	html/dmxconfig_8h_source.html \
+	html/dmxconsole_8c.html \
+	html/dmxconsole_8h.html \
+	html/dmxconsole_8h_source.html \
+	html/dmxcursor_8c.html \
+	html/dmxcursor_8h.html \
+	html/dmxcursor_8h_source.html \
+	html/dmxdetach_8c.html \
+	html/dmxdpms_8c.html \
+	html/dmxdpms_8h.html \
+	html/dmxdpms_8h_source.html \
+	html/dmxdummy_8c.html \
+	html/dmxdummy_8h.html \
+	html/dmxdummy_8h_source.html \
+	html/dmxevents_8c.html \
+	html/dmxevents_8h.html \
+	html/dmxevents_8h_source.html \
+	html/dmxextension_8c.html \
+	html/dmxextension_8h.html \
+	html/dmxextension_8h_source.html \
+	html/dmxfont_8c.html \
+	html/dmxfont_8h.html \
+	html/dmxfont_8h_source.html \
+	html/dmxgc_8c.html \
+	html/dmxgc_8h.html \
+	html/dmxgc_8h_source.html \
+	html/dmxgcops_8c.html \
+	html/dmxgcops_8h.html \
+	html/dmxgcops_8h_source.html \
+	html/dmx__glxvisuals_8h_source.html \
+	html/dmxinit_8c.html \
+	html/dmxinit_8h.html \
+	html/dmxinit_8h_source.html \
+	html/dmxinput_8c.html \
+	html/dmxinput_8h.html \
+	html/dmxinput_8h_source.html \
+	html/dmxinputinit_8c.html \
+	html/dmxinputinit_8h.html \
+	html/dmxinputinit_8h_source.html \
+	html/dmxlog_8c.html \
+	html/dmxlog_8h.html \
+	html/dmxlog_8h_source.html \
+	html/dmxmap_8c.html \
+	html/dmxmap_8h.html \
+	html/dmxmap_8h_source.html \
+	html/dmxmotion_8c.html \
+	html/dmxmotion_8h.html \
+	html/dmxmotion_8h_source.html \
+	html/dmxparse_8c.html \
+	html/dmxparse_8h.html \
+	html/dmxparse_8h_source.html \
+	html/dmxpict_8c.html \
+	html/dmxpict_8h.html \
+	html/dmxpict_8h_source.html \
+	html/dmxpixmap_8c.html \
+	html/dmxpixmap_8h.html \
+	html/dmxpixmap_8h_source.html \
+	html/dmxprint_8c.html \
+	html/dmxprint_8h.html \
+	html/dmxprint_8h_source.html \
+	html/dmxprop_8c.html \
+	html/dmxprop_8h.html \
+	html/dmxprop_8h_source.html \
+	html/dmxscrinit_8c.html \
+	html/dmxscrinit_8h.html \
+	html/dmxscrinit_8h_source.html \
+	html/dmxshadow_8c.html \
+	html/dmxshadow_8h.html \
+	html/dmxshadow_8h_source.html \
+	html/dmxsigio_8c.html \
+	html/dmxsigio_8h.html \
+	html/dmxsigio_8h_source.html \
+	html/dmxstat_8c.html \
+	html/dmxstat_8h.html \
+	html/dmxstat_8h_source.html \
+	html/dmxsync_8c.html \
+	html/dmxsync_8h.html \
+	html/dmxsync_8h_source.html \
+	html/dmxvisual_8c.html \
+	html/dmxvisual_8h.html \
+	html/dmxvisual_8h_source.html \
+	html/dmxwindow_8c.html \
+	html/dmxwindow_8h.html \
+	html/dmxwindow_8h_source.html \
+	html/dmxxinput_8c.html \
+	html/doxygen.css \
+	html/doxygen.png \
+	html/files.html \
+	html/ftv2blank.png \
+	html/ftv2doc.png \
+	html/ftv2folderclosed.png \
+	html/ftv2folderopen.png \
+	html/ftv2lastnode.png \
+	html/ftv2link.png \
+	html/ftv2mlastnode.png \
+	html/ftv2mnode.png \
+	html/ftv2node.png \
+	html/ftv2plastnode.png \
+	html/ftv2pnode.png \
+	html/ftv2vertline.png \
+	html/functions.html \
+	html/functions_vars.html \
+	html/globals_defs.html \
+	html/globals_enum.html \
+	html/globals_eval.html \
+	html/globals_func.html \
+	html/globals.html \
+	html/globals_type.html \
+	html/globals_vars.html \
+	html/index.html \
+	html/lnx-keyboard_8c.html \
+	html/lnx-keyboard_8h.html \
+	html/lnx-keyboard_8h_source.html \
+	html/lnx-ms_8c.html \
+	html/lnx-ms_8h.html \
+	html/lnx-ms_8h_source.html \
+	html/lnx-ps2_8c.html \
+	html/lnx-ps2_8h.html \
+	html/lnx-ps2_8h_source.html \
+	html/main.html \
+	html/struct__dmxArg.html \
+	html/struct__dmxColormapPriv.html \
+	html/structDMXConfigCmdStruct.html \
+	html/struct__DMXConfigComment.html \
+	html/struct__DMXConfigDisplay.html \
+	html/struct__DMXConfigEntry.html \
+	html/struct__DMXConfigFullDim.html \
+	html/structDMXConfigListStruct.html \
+	html/struct__DMXConfigNumber.html \
+	html/struct__DMXConfigOption.html \
+	html/struct__DMXConfigPair.html \
+	html/struct__DMXConfigParam.html \
+	html/struct__DMXConfigPartDim.html \
+	html/struct__DMXConfigString.html \
+	html/struct__DMXConfigSub.html \
+	html/struct__DMXConfigToken.html \
+	html/struct__DMXConfigVirtual.html \
+	html/struct__DMXConfigWall.html \
+	html/struct__dmxCursorPriv.html \
+	html/structDMXDesktopAttributesRec.html \
+	html/struct__DMXEventMap.html \
+	html/struct__dmxFontPriv.html \
+	html/struct__dmxGCPriv.html \
+	html/structdmxGlxVisualPrivate.html \
+	html/struct__dmxGlyphPriv.html \
+	html/structDMXInputAttributesRec.html \
+	html/struct__DMXInputInfo.html \
+	html/struct__DMXLocalInitInfo.html \
+	html/struct__DMXLocalInputInfo.html \
+	html/struct__dmxPictPriv.html \
+	html/struct__dmxPixPriv.html \
+	html/structDMXScreenAttributesRec.html \
+	html/struct__DMXScreenInfo.html \
+	html/struct__DMXStatAvg.html \
+	html/struct__DMXStatInfo.html \
+	html/structDMXWindowAttributesRec.html \
+	html/struct__dmxWinPriv.html \
+	html/struct__myPrivate.html \
+	html/tree.html \
+	html/usb-common_8c.html \
+	html/usb-common_8h.html \
+	html/usb-common_8h_source.html \
+	html/usb-keyboard_8c.html \
+	html/usb-keyboard_8h.html \
+	html/usb-keyboard_8h_source.html \
+	html/usb-mouse_8c.html \
+	html/usb-mouse_8h.html \
+	html/usb-mouse_8h_source.html \
+	html/usb-other_8c.html \
+	html/usb-other_8h.html \
+	html/usb-other_8h_source.html \
+	html/usb-private_8h.html \
+	html/usb-private_8h_source.html
+
+$(builddir)/doxygen.head:
+	$(LN_S) $(srcdir)/doxygen.head $@
+
+$(builddir)/doxygen.foot:
+	$(LN_S) $(srcdir)/doxygen.foot $@
+
+$(builddir)doxygen.css:
+	$(LN_S) $(srcdir)/doxygen.css $@
+
diff --git a/xorg-server/hw/xfree86/common/xf86Option.c b/xorg-server/hw/xfree86/common/xf86Option.c
index d7b294a86..16c27e5ee 100644
--- a/xorg-server/hw/xfree86/common/xf86Option.c
+++ b/xorg-server/hw/xfree86/common/xf86Option.c
@@ -1,895 +1,895 @@
-/*

- * Copyright (c) 1998-2003 by The XFree86 Project, Inc.

- *

- * Permission is hereby granted, free of charge, to any person obtaining a

- * copy of this software and associated documentation files (the "Software"),

- * to deal in the Software without restriction, including without limitation

- * the rights to use, copy, modify, merge, publish, distribute, sublicense,

- * and/or sell copies of the Software, and to permit persons to whom the

- * Software is furnished to do so, subject to the following conditions:

- *

- * The above copyright notice and this permission notice shall be included in

- * all copies or substantial portions of the Software.

- *

- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

- * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR

- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,

- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

- * OTHER DEALINGS IN THE SOFTWARE.

- *

- * Except as contained in this notice, the name of the copyright holder(s)

- * and author(s) shall not be used in advertising or otherwise to promote

- * the sale, use or other dealings in this Software without prior written

- * authorization from the copyright holder(s) and author(s).

- */

-

-/*

- * Author: David Dawes <dawes@xfree86.org>

- *

- * This file includes public option handling functions.

- */

-

-#ifdef HAVE_XORG_CONFIG_H

-#include <xorg-config.h>

-#endif

-

-#include <stdlib.h>

-#include <ctype.h>

-#include <X11/X.h>

-#include "os.h"

-#include "xf86.h"

-#include "xf86Xinput.h"

-#include "xf86Optrec.h"

-#include "xf86Parser.h"

-

-static Bool ParseOptionValue(int scrnIndex, pointer options, OptionInfoPtr p,

-			     Bool markUsed);

-

-/*

- * xf86CollectOptions collects the options from each of the config file

- * sections used by the screen and puts the combined list in pScrn->options.

- * This function requires that the following have been initialised:

- *

- *	pScrn->confScreen

- *	pScrn->Entities[i]->device

- *	pScrn->display

- *	pScrn->monitor

- *

- * The extraOpts parameter may optionally contain a list of additional options

- * to include.

- *

- * The order of precedence for options is:

- *

- *   extraOpts, display, confScreen, monitor, device

- */

-

-void

-xf86CollectOptions(ScrnInfoPtr pScrn, pointer extraOpts)

-{

-    XF86OptionPtr tmp;

-    XF86OptionPtr extras = (XF86OptionPtr)extraOpts;

-    GDevPtr device;

-    

-    int i;

-

-    pScrn->options = NULL;

-

-    for (i=pScrn->numEntities - 1; i >= 0; i--) {

-	device = xf86GetDevFromEntity(pScrn->entityList[i],

-					pScrn->entityInstanceList[i]);

-	if (device && device->options) {

-	    tmp = xf86optionListDup(device->options);

-	    if (pScrn->options)

-		xf86optionListMerge(pScrn->options,tmp);

-	    else

-		pScrn->options = tmp;

-	}

-    }

-    if (pScrn->monitor->options) {

-	tmp = xf86optionListDup(pScrn->monitor->options);

-	if (pScrn->options)

-	    pScrn->options = xf86optionListMerge(pScrn->options, tmp);

-	else

-	    pScrn->options = tmp;

-    }

-    if (pScrn->confScreen->options) {

-	tmp = xf86optionListDup(pScrn->confScreen->options);

-	if (pScrn->options)

-	    pScrn->options = xf86optionListMerge(pScrn->options, tmp);

-	else

-	    pScrn->options = tmp;

-    }

-    if (pScrn->display->options) {

-	tmp = xf86optionListDup(pScrn->display->options);

-	if (pScrn->options)

-	    pScrn->options = xf86optionListMerge(pScrn->options, tmp);

-	else

-	    pScrn->options = tmp;

-    }

-    if (extras) {

-	tmp = xf86optionListDup(extras);

-	if (pScrn->options)

-	    pScrn->options = xf86optionListMerge(pScrn->options, tmp);

-	else

-	    pScrn->options = tmp;

-    }

-}

-

-/*

- * xf86CollectInputOptions collects extra options for an InputDevice (other

- * than those added by the config backend).

- * The options are merged into the existing ones and thus take precedence

- * over the others.

- */

-

-void

-xf86CollectInputOptions(InputInfoPtr pInfo, const char **defaultOpts)

-{

-    if (defaultOpts) {

-	XF86OptionPtr tmp =xf86optionListCreate(defaultOpts, -1, 0);

-	if (pInfo->options)

-	    pInfo->options = xf86optionListMerge(pInfo->options, tmp);

-	else

-	    pInfo->options = tmp;

-    }

-}

-

-/**

- * Duplicate the option list passed in. The returned pointer will be a newly

- * allocated option list and must be freed by the caller.

- */

-pointer

-xf86OptionListDuplicate(pointer options)

-{

-    pointer o = NULL;

-

-    while (options)

-    {

-        o = xf86AddNewOption(o, xf86OptionName(options), xf86OptionValue(options));

-        options = xf86nextOption(options);

-    }

-

-    return o;

-}

-

-

-/* Created for new XInput stuff -- essentially extensions to the parser	*/

-

-static int

-LookupIntOption(pointer optlist, const char *name, int deflt, Bool markUsed)

-{

-    OptionInfoRec o;

-

-    o.name = name;

-    o.type = OPTV_INTEGER;

-    if (ParseOptionValue(-1, optlist, &o, markUsed))

-	deflt = o.value.num;

-    return deflt;

-}

-

-

-static double

-LookupRealOption(pointer optlist, const char *name, double deflt,

-		 Bool markUsed)

-{

-    OptionInfoRec o;

-

-    o.name = name;

-    o.type = OPTV_REAL;

-    if (ParseOptionValue(-1, optlist, &o, markUsed))

-	deflt = o.value.realnum;

-    return deflt;

-}

-

-

-static char *

-LookupStrOption(pointer optlist, const char *name, char *deflt, Bool markUsed)

-{

-    OptionInfoRec o;

-

-    o.name = name;

-    o.type = OPTV_STRING;

-    if (ParseOptionValue(-1, optlist, &o, markUsed))

-        deflt = o.value.str;

-    if (deflt)

-	return strdup(deflt);

-    else

-	return NULL;

-}

-

-

-static int

-LookupBoolOption(pointer optlist, const char *name, int deflt, Bool markUsed)

-{

-    OptionInfoRec o;

-

-    o.name = name;

-    o.type = OPTV_BOOLEAN;

-    if (ParseOptionValue(-1, optlist, &o, markUsed))

-	deflt = o.value.bool;

-    return deflt;

-}

-

-static int

-LookupPercentOption(pointer optlist, const char *name, double deflt, Bool markUsed)

-{

-    OptionInfoRec o;

-

-    o.name = name;

-    o.type = OPTV_PERCENT;

-    if (ParseOptionValue(-1, optlist, &o, markUsed))

-	deflt = o.value.realnum;

-    return deflt;

-}

-

-/* These xf86Set* functions are intended for use by non-screen specific code */

-

-int

-xf86SetIntOption(pointer optlist, const char *name, int deflt)

-{

-    return LookupIntOption(optlist, name, deflt, TRUE);

-}

-

-

-double

-xf86SetRealOption(pointer optlist, const char *name, double deflt)

-{

-    return LookupRealOption(optlist, name, deflt, TRUE);

-}

-

-

-char *

-xf86SetStrOption(pointer optlist, const char *name, char *deflt)

-{

-    return LookupStrOption(optlist, name, deflt, TRUE);

-}

-

-

-int

-xf86SetBoolOption(pointer optlist, const char *name, int deflt)

-{

-    return LookupBoolOption(optlist, name, deflt, TRUE);

-}

-

-double

-xf86SetPercentOption(pointer optlist, const char *name, double deflt)

-{

-    return LookupPercentOption(optlist, name, deflt, TRUE);

-}

-

-/*

- * These are like the Set*Option functions, but they don't mark the options

- * as used.

- */

-int

-xf86CheckIntOption(pointer optlist, const char *name, int deflt)

-{

-    return LookupIntOption(optlist, name, deflt, FALSE);

-}

-

-

-double

-xf86CheckRealOption(pointer optlist, const char *name, double deflt)

-{

-    return LookupRealOption(optlist, name, deflt, FALSE);

-}

-

-

-char *

-xf86CheckStrOption(pointer optlist, const char *name, char *deflt)

-{

-    return LookupStrOption(optlist, name, deflt, FALSE);

-}

-

-

-int

-xf86CheckBoolOption(pointer optlist, const char *name, int deflt)

-{

-    return LookupBoolOption(optlist, name, deflt, FALSE);

-}

-

-

-double

-xf86CheckPercentOption(pointer optlist, const char *name, double deflt)

-{

-    return LookupPercentOption(optlist, name, deflt, FALSE);

-}

-/*

- * addNewOption() has the required property of replacing the option value

- * if the option is already present.

- */

-pointer

-xf86ReplaceIntOption(pointer optlist, const char *name, const int val)

-{

-    char tmp[16];

-    sprintf(tmp,"%i",val);

-    return xf86AddNewOption(optlist,name,tmp);

-}

-

-pointer

-xf86ReplaceRealOption(pointer optlist, const char *name, const double val)

-{

-    char tmp[32];

-    snprintf(tmp,32,"%f",val);

-    return xf86AddNewOption(optlist,name,tmp);

-}

-

-pointer

-xf86ReplaceBoolOption(pointer optlist, const char *name, const Bool val)

-{

-    return xf86AddNewOption(optlist,name,val?"True":"False");

-}

-

-pointer

-xf86ReplacePercentOption(pointer optlist, const char *name, const double val)

-{

-    char tmp[16];

-    sprintf(tmp, "%lf%%", val);

-    return xf86AddNewOption(optlist,name,tmp);

-}

-

-pointer

-xf86ReplaceStrOption(pointer optlist, const char *name, const char* val)

-{

-      return xf86AddNewOption(optlist,name,val);

-}

-

-pointer

-xf86AddNewOption(pointer head, const char *name, const char *val)

-{

-    /* XXX These should actually be allocated in the parser library. */

-    char *tmp = strdup(val);

-    char *tmp_name = strdup(name);

-

-    return xf86addNewOption(head, tmp_name, tmp);

-}

-

-

-pointer

-xf86NewOption(char *name, char *value)

-{

-    return xf86newOption(name, value);

-}

-

-

-pointer

-xf86NextOption(pointer list)

-{

-    return xf86nextOption(list);

-}

-

-pointer

-xf86OptionListCreate(const char **options, int count, int used)

-{

-	return xf86optionListCreate(options, count, used);

-}

-

-pointer

-xf86OptionListMerge(pointer head, pointer tail)

-{

-	return xf86optionListMerge(head, tail);

-}

-

-void

-xf86OptionListFree(pointer opt)

-{

-	xf86optionListFree(opt);

-}

-

-char *

-xf86OptionName(pointer opt)

-{

-	return xf86optionName(opt);

-}

-

-char *

-xf86OptionValue(pointer opt)

-{

-	return xf86optionValue(opt);

-}

-

-void

-xf86OptionListReport(pointer parm)

-{

-    XF86OptionPtr opts = parm;

-

-    while(opts) {

-	if (xf86optionValue(opts))

-	    xf86ErrorFVerb(5, "\tOption \"%s\" \"%s\"\n",

-			    xf86optionName(opts), xf86optionValue(opts));

-	else

-	    xf86ErrorFVerb( 5, "\tOption \"%s\"\n", xf86optionName(opts));

-	opts = xf86nextOption(opts);

-    }

-}

-

-/* End of XInput-caused section	*/

-

-pointer

-xf86FindOption(pointer options, const char *name)

-{

-    return xf86findOption(options, name);

-}

-

-

-char *

-xf86FindOptionValue(pointer options, const char *name)

-{

-    return xf86findOptionValue(options, name);

-}

-

-

-void

-xf86MarkOptionUsed(pointer option)

-{

-    if (option != NULL)

-	((XF86OptionPtr)option)->opt_used = TRUE;

-}

-

-

-void

-xf86MarkOptionUsedByName(pointer options, const char *name)

-{

-    XF86OptionPtr opt;

-

-    opt = xf86findOption(options, name);

-    if (opt != NULL)

-	opt->opt_used = TRUE;

-}

-

-Bool

-xf86CheckIfOptionUsed(pointer option)

-{

-    if (option != NULL)

-	return ((XF86OptionPtr)option)->opt_used;

-    else

-	return FALSE;

-}

-

-Bool

-xf86CheckIfOptionUsedByName(pointer options, const char *name)

-{

-    XF86OptionPtr opt;

-

-    opt = xf86findOption(options, name);

-    if (opt != NULL)

-	return opt->opt_used;

-    else

-	return FALSE;

-}

-

-void

-xf86ShowUnusedOptions(int scrnIndex, pointer options)

-{

-    XF86OptionPtr opt = options;

-

-    while (opt) {

-	if (opt->opt_name && !opt->opt_used) {

-	    xf86DrvMsg(scrnIndex, X_WARNING, "Option \"%s\" is not used\n",

-			opt->opt_name);

-	}

-	opt = opt->list.next;

-    }

-}

-

-

-static Bool

-GetBoolValue(OptionInfoPtr p, const char *s)

-{

-    return xf86getBoolValue(&p->value.bool, s);

-}

-

-static Bool

-ParseOptionValue(int scrnIndex, pointer options, OptionInfoPtr p,

-		 Bool markUsed)

-{

-    char *s, *end;

-    Bool wasUsed = FALSE;

-

-    if ((s = xf86findOptionValue(options, p->name)) != NULL) {

-	if (markUsed) {

-	    wasUsed = xf86CheckIfOptionUsedByName(options, p->name);

-	    xf86MarkOptionUsedByName(options, p->name);

-	}

-	switch (p->type) {

-	case OPTV_INTEGER:

-	    if (*s == '\0') {

-		xf86DrvMsg(scrnIndex, X_WARNING,

-			   "Option \"%s\" requires an integer value\n",

-			   p->name);

-		p->found = FALSE;

-	    } else {

-		p->value.num = strtoul(s, &end, 0);

-		if (*end == '\0') {

-		    p->found = TRUE;

-		} else {

-		    xf86DrvMsg(scrnIndex, X_WARNING,

-			       "Option \"%s\" requires an integer value\n",

-			        p->name);

-		    p->found = FALSE;

-		}

-	    }

-	    break;

-	case OPTV_STRING:

-	    if (*s == '\0') {

-		xf86DrvMsg(scrnIndex, X_WARNING,

-			   "Option \"%s\" requires an string value\n",

-			   p->name);

-		p->found = FALSE;

-	    } else {

-		p->value.str = s;

-		p->found = TRUE;

-	    }

-	    break;

-	case OPTV_ANYSTR:

-	    p->value.str = s;

-	    p->found = TRUE;

-	    break;

-	case OPTV_REAL:	

-	    if (*s == '\0') {

-		xf86DrvMsg(scrnIndex, X_WARNING,

-			   "Option \"%s\" requires a floating point value\n",

-			   p->name);

-		p->found = FALSE;

-	    } else {

-		p->value.realnum = strtod(s, &end);

-		if (*end == '\0') {

-		    p->found = TRUE;

-		} else {

-		    xf86DrvMsg(scrnIndex, X_WARNING,

-			    "Option \"%s\" requires a floating point value\n",

-			    p->name);

-		    p->found = FALSE;

-		}

-	    }

-	    break;

-	case OPTV_BOOLEAN:

-	    if (GetBoolValue(p, s)) {

-		p->found = TRUE;

-	    } else {

-		xf86DrvMsg(scrnIndex, X_WARNING,

-			   "Option \"%s\" requires a boolean value\n", p->name);

-		p->found = FALSE;

-	    }

-	    break;

-	case OPTV_PERCENT:

-	    {

-		char tmp = 0;

-		/* awkward match, but %% doesn't increase the match counter,

-		 * hence 100 looks the same as 100% to the caller of sccanf

-		 */

-		if (sscanf(s, "%lf%c", &p->value.realnum, &tmp) != 2 || tmp != '%') {

-		    xf86DrvMsg(scrnIndex, X_WARNING,

-			       "Option \"%s\" requires a percent value\n", p->name);

-		    p->found = FALSE;

-		} else {

-		    p->found = TRUE;

-		}

-	    }

-	    break;

-	case OPTV_FREQ:	

-	    if (*s == '\0') {

-		xf86DrvMsg(scrnIndex, X_WARNING,

-			   "Option \"%s\" requires a frequency value\n",

-			   p->name);

-		p->found = FALSE;

-	    } else {

-		double freq = strtod(s, &end);

-		int    units = 0;

-

-		if (end != s) {

-		    p->found = TRUE;

-		    if (!xf86NameCmp(end, "Hz"))

-			units = 1;

-		    else if (!xf86NameCmp(end, "kHz") ||

-			     !xf86NameCmp(end, "k"))

-			units = 1000;

-		    else if (!xf86NameCmp(end, "MHz") ||

-			     !xf86NameCmp(end, "M"))

-			units = 1000000;

-		    else {

-			xf86DrvMsg(scrnIndex, X_WARNING,

-			    "Option \"%s\" requires a frequency value\n",

-			    p->name);

-			p->found = FALSE;

-		    }

-		    if (p->found)

-			freq *= (double)units;

-		} else {

-		    xf86DrvMsg(scrnIndex, X_WARNING,

-			    "Option \"%s\" requires a frequency value\n",

-			    p->name);

-		    p->found = FALSE;

-		}

-		if (p->found) {

-		    p->value.freq.freq = freq;

-		    p->value.freq.units = units;

-		}

-	    }

-	    break;

-	case OPTV_NONE:

-	    /* Should never get here */

-	    p->found = FALSE;

-	    break;

-	}

-	if (p->found && markUsed) {

-	    int verb = 2;

-	    if (wasUsed)

-		verb = 4;

-	    xf86DrvMsgVerb(scrnIndex, X_CONFIG, verb, "Option \"%s\"", p->name);

-	    if (!(p->type == OPTV_BOOLEAN && *s == 0)) {

-		xf86ErrorFVerb(verb, " \"%s\"", s);

-	    }

-	    xf86ErrorFVerb(verb, "\n");

-	}

-    } else if (p->type == OPTV_BOOLEAN) {

-	/* Look for matches with options with or without a "No" prefix. */

-	char *n, *newn;

-	OptionInfoRec opt;

-

-	n = xf86NormalizeName(p->name);

-	if (!n) {

-	    p->found = FALSE;

-	    return FALSE;

-	}

-	if (strncmp(n, "no", 2) == 0) {

-	    newn = n + 2;

-	} else {

-	    free(n);

-	    if (asprintf(&n, "No%s", p->name) == -1) {

-		p->found = FALSE;

-		return FALSE;

-	    }

-	    newn = n;

-	}

-	if ((s = xf86findOptionValue(options, newn)) != NULL) {

-	    if (markUsed)

-		xf86MarkOptionUsedByName(options, newn);

-	    if (GetBoolValue(&opt, s)) {

-		p->value.bool = !opt.value.bool;

-		p->found = TRUE;

-	    } else {

-		xf86DrvMsg(scrnIndex, X_WARNING,

-			   "Option \"%s\" requires a boolean value\n", newn);

-		p->found = FALSE;

-	    }

-	} else {

-	    p->found = FALSE;

-	}

-	if (p->found && markUsed) {

-	    xf86DrvMsgVerb(scrnIndex, X_CONFIG, 2, "Option \"%s\"", newn);

-	    if (*s != 0) {

-		xf86ErrorFVerb(2, " \"%s\"", s);

-	    }

-	    xf86ErrorFVerb(2, "\n");

-	}

-	free(n);

-    } else {

-	p->found = FALSE;

-    }

-    return p->found;

-}

-

-

-void

-xf86ProcessOptions(int scrnIndex, pointer options, OptionInfoPtr optinfo)

-{

-    OptionInfoPtr p;

-

-    for (p = optinfo; p->name != NULL; p++) {

-	ParseOptionValue(scrnIndex, options, p, TRUE);

-    }

-}

-

-

-OptionInfoPtr

-xf86TokenToOptinfo(const OptionInfoRec *table, int token)

-{

-    const OptionInfoRec *p, *match = NULL, *set = NULL;

-

-    if (!table) {

-	ErrorF("xf86TokenToOptinfo: table is NULL\n");

-	return NULL;

-    }

-

-    for (p = table; p->token >= 0; p++) {

-	if (p->token == token) {

-	    match = p;

-	    if (p->found)

-		set = p;

-	}

-    }

-

-    if (set)

-	return (OptionInfoPtr)set;

-    else if (match)

-	return (OptionInfoPtr)match;

-    else

-	return NULL;

-}

-

-

-const char *

-xf86TokenToOptName(const OptionInfoRec *table, int token)

-{

-    const OptionInfoRec *p;

-

-    p = xf86TokenToOptinfo(table, token);

-    return p->name;

-}

-

-

-Bool

-xf86IsOptionSet(const OptionInfoRec *table, int token)

-{

-    OptionInfoPtr p;

-

-    p = xf86TokenToOptinfo(table, token);

-    return p && p->found;

-}

-

-

-char *

-xf86GetOptValString(const OptionInfoRec *table, int token)

-{

-    OptionInfoPtr p;

-

-    p = xf86TokenToOptinfo(table, token);

-    if (p && p->found)

-	return p->value.str;

-    else

-	return NULL;

-}

-

-

-Bool

-xf86GetOptValInteger(const OptionInfoRec *table, int token, int *value)

-{

-    OptionInfoPtr p;

-

-    p = xf86TokenToOptinfo(table, token);

-    if (p && p->found) {

-	*value = p->value.num;

-	return TRUE;

-    } else

-	return FALSE;

-}

-

-

-Bool

-xf86GetOptValULong(const OptionInfoRec *table, int token, unsigned long *value)

-{

-    OptionInfoPtr p;

-

-    p = xf86TokenToOptinfo(table, token);

-    if (p && p->found) {

-	*value = p->value.num;

-	return TRUE;

-    } else

-	return FALSE;

-}

-

-

-Bool

-xf86GetOptValReal(const OptionInfoRec *table, int token, double *value)

-{

-    OptionInfoPtr p;

-

-    p = xf86TokenToOptinfo(table, token);

-    if (p && p->found) {

-	*value = p->value.realnum;

-	return TRUE;

-    } else

-	return FALSE;

-}

-

-

-Bool

-xf86GetOptValFreq(const OptionInfoRec *table, int token,

-		  OptFreqUnits expectedUnits, double *value)

-{

-    OptionInfoPtr p;

-

-    p = xf86TokenToOptinfo(table, token);

-    if (p && p->found) {

-	if (p->value.freq.units > 0) {

-	    /* Units give, so the scaling is known. */

-	    switch (expectedUnits) {

-	    case OPTUNITS_HZ:

-		*value = p->value.freq.freq;

-		break;

-	    case OPTUNITS_KHZ:

-		*value = p->value.freq.freq / 1000.0;

-		break;

-	    case OPTUNITS_MHZ:

-		*value = p->value.freq.freq / 1000000.0;

-		break;

-	    }

-	} else {

-	    /* No units given, so try to guess the scaling. */

-	    switch (expectedUnits) {

-	    case OPTUNITS_HZ:

-		*value = p->value.freq.freq;

-		break;

-	    case OPTUNITS_KHZ:

-		if (p->value.freq.freq > 1000.0)

-		    *value = p->value.freq.freq / 1000.0;

-		else

-		    *value = p->value.freq.freq;

-		break;

-	    case OPTUNITS_MHZ:

-		if (p->value.freq.freq > 1000000.0)

-		    *value = p->value.freq.freq / 1000000.0;

-		else if (p->value.freq.freq > 1000.0)

-		    *value = p->value.freq.freq / 1000.0;

-		else

-		    *value = p->value.freq.freq;

-	    }

-	}

-	return TRUE;

-    } else

-	return FALSE;

-}

-

-

-Bool

-xf86GetOptValBool(const OptionInfoRec *table, int token, Bool *value)

-{

-    OptionInfoPtr p;

-

-    p = xf86TokenToOptinfo(table, token);

-    if (p && p->found) {

-	*value = p->value.bool;

-	return TRUE;

-    } else

-	return FALSE;

-}

-

-

-Bool

-xf86ReturnOptValBool(const OptionInfoRec *table, int token, Bool def)

-{

-    OptionInfoPtr p;

-

-    p = xf86TokenToOptinfo(table, token);

-    if (p && p->found) {

-	return p->value.bool;

-    } else

-	return def;

-}

-

-

-int

-xf86NameCmp(const char *s1, const char *s2)

-{

-    return xf86nameCompare(s1, s2);

-}

-

-char *

-xf86NormalizeName(const char *s)

-{

-    char *ret, *q;

-    const char *p;

-

-    if (s == NULL)

-	return NULL;

-

-    ret = malloc(strlen(s) + 1);

-    for (p = s, q = ret; *p != 0; p++) {

-	switch (*p) {

-	case '_':

-	case ' ':

-	case '\t':

-	    continue;

-	default:

-	    if (isupper(*p))

-		*q++ = tolower(*p);

-	    else

-		*q++ = *p;

-	}

-    }

-    *q = '\0';

-    return ret;

-}

+/*
+ * Copyright (c) 1998-2003 by The XFree86 Project, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Except as contained in this notice, the name of the copyright holder(s)
+ * and author(s) shall not be used in advertising or otherwise to promote
+ * the sale, use or other dealings in this Software without prior written
+ * authorization from the copyright holder(s) and author(s).
+ */
+
+/*
+ * Author: David Dawes <dawes@xfree86.org>
+ *
+ * This file includes public option handling functions.
+ */
+
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
+#include <stdlib.h>
+#include <ctype.h>
+#include <X11/X.h>
+#include "os.h"
+#include "xf86.h"
+#include "xf86Xinput.h"
+#include "xf86Optrec.h"
+#include "xf86Parser.h"
+
+static Bool ParseOptionValue(int scrnIndex, pointer options, OptionInfoPtr p,
+			     Bool markUsed);
+
+/*
+ * xf86CollectOptions collects the options from each of the config file
+ * sections used by the screen and puts the combined list in pScrn->options.
+ * This function requires that the following have been initialised:
+ *
+ *	pScrn->confScreen
+ *	pScrn->Entities[i]->device
+ *	pScrn->display
+ *	pScrn->monitor
+ *
+ * The extraOpts parameter may optionally contain a list of additional options
+ * to include.
+ *
+ * The order of precedence for options is:
+ *
+ *   extraOpts, display, confScreen, monitor, device
+ */
+
+void
+xf86CollectOptions(ScrnInfoPtr pScrn, pointer extraOpts)
+{
+    XF86OptionPtr tmp;
+    XF86OptionPtr extras = (XF86OptionPtr)extraOpts;
+    GDevPtr device;
+    
+    int i;
+
+    pScrn->options = NULL;
+
+    for (i=pScrn->numEntities - 1; i >= 0; i--) {
+	device = xf86GetDevFromEntity(pScrn->entityList[i],
+					pScrn->entityInstanceList[i]);
+	if (device && device->options) {
+	    tmp = xf86optionListDup(device->options);
+	    if (pScrn->options)
+		xf86optionListMerge(pScrn->options,tmp);
+	    else
+		pScrn->options = tmp;
+	}
+    }
+    if (pScrn->monitor->options) {
+	tmp = xf86optionListDup(pScrn->monitor->options);
+	if (pScrn->options)
+	    pScrn->options = xf86optionListMerge(pScrn->options, tmp);
+	else
+	    pScrn->options = tmp;
+    }
+    if (pScrn->confScreen->options) {
+	tmp = xf86optionListDup(pScrn->confScreen->options);
+	if (pScrn->options)
+	    pScrn->options = xf86optionListMerge(pScrn->options, tmp);
+	else
+	    pScrn->options = tmp;
+    }
+    if (pScrn->display->options) {
+	tmp = xf86optionListDup(pScrn->display->options);
+	if (pScrn->options)
+	    pScrn->options = xf86optionListMerge(pScrn->options, tmp);
+	else
+	    pScrn->options = tmp;
+    }
+    if (extras) {
+	tmp = xf86optionListDup(extras);
+	if (pScrn->options)
+	    pScrn->options = xf86optionListMerge(pScrn->options, tmp);
+	else
+	    pScrn->options = tmp;
+    }
+}
+
+/*
+ * xf86CollectInputOptions collects extra options for an InputDevice (other
+ * than those added by the config backend).
+ * The options are merged into the existing ones and thus take precedence
+ * over the others.
+ */
+
+void
+xf86CollectInputOptions(InputInfoPtr pInfo, const char **defaultOpts)
+{
+    if (defaultOpts) {
+	XF86OptionPtr tmp =xf86optionListCreate(defaultOpts, -1, 0);
+	if (pInfo->options)
+	    pInfo->options = xf86optionListMerge(tmp, pInfo->options);
+	else
+	    pInfo->options = tmp;
+    }
+}
+
+/**
+ * Duplicate the option list passed in. The returned pointer will be a newly
+ * allocated option list and must be freed by the caller.
+ */
+pointer
+xf86OptionListDuplicate(pointer options)
+{
+    pointer o = NULL;
+
+    while (options)
+    {
+        o = xf86AddNewOption(o, xf86OptionName(options), xf86OptionValue(options));
+        options = xf86nextOption(options);
+    }
+
+    return o;
+}
+
+
+/* Created for new XInput stuff -- essentially extensions to the parser	*/
+
+static int
+LookupIntOption(pointer optlist, const char *name, int deflt, Bool markUsed)
+{
+    OptionInfoRec o;
+
+    o.name = name;
+    o.type = OPTV_INTEGER;
+    if (ParseOptionValue(-1, optlist, &o, markUsed))
+	deflt = o.value.num;
+    return deflt;
+}
+
+
+static double
+LookupRealOption(pointer optlist, const char *name, double deflt,
+		 Bool markUsed)
+{
+    OptionInfoRec o;
+
+    o.name = name;
+    o.type = OPTV_REAL;
+    if (ParseOptionValue(-1, optlist, &o, markUsed))
+	deflt = o.value.realnum;
+    return deflt;
+}
+
+
+static char *
+LookupStrOption(pointer optlist, const char *name, char *deflt, Bool markUsed)
+{
+    OptionInfoRec o;
+
+    o.name = name;
+    o.type = OPTV_STRING;
+    if (ParseOptionValue(-1, optlist, &o, markUsed))
+        deflt = o.value.str;
+    if (deflt)
+	return strdup(deflt);
+    else
+	return NULL;
+}
+
+
+static int
+LookupBoolOption(pointer optlist, const char *name, int deflt, Bool markUsed)
+{
+    OptionInfoRec o;
+
+    o.name = name;
+    o.type = OPTV_BOOLEAN;
+    if (ParseOptionValue(-1, optlist, &o, markUsed))
+	deflt = o.value.bool;
+    return deflt;
+}
+
+static int
+LookupPercentOption(pointer optlist, const char *name, double deflt, Bool markUsed)
+{
+    OptionInfoRec o;
+
+    o.name = name;
+    o.type = OPTV_PERCENT;
+    if (ParseOptionValue(-1, optlist, &o, markUsed))
+	deflt = o.value.realnum;
+    return deflt;
+}
+
+/* These xf86Set* functions are intended for use by non-screen specific code */
+
+int
+xf86SetIntOption(pointer optlist, const char *name, int deflt)
+{
+    return LookupIntOption(optlist, name, deflt, TRUE);
+}
+
+
+double
+xf86SetRealOption(pointer optlist, const char *name, double deflt)
+{
+    return LookupRealOption(optlist, name, deflt, TRUE);
+}
+
+
+char *
+xf86SetStrOption(pointer optlist, const char *name, char *deflt)
+{
+    return LookupStrOption(optlist, name, deflt, TRUE);
+}
+
+
+int
+xf86SetBoolOption(pointer optlist, const char *name, int deflt)
+{
+    return LookupBoolOption(optlist, name, deflt, TRUE);
+}
+
+double
+xf86SetPercentOption(pointer optlist, const char *name, double deflt)
+{
+    return LookupPercentOption(optlist, name, deflt, TRUE);
+}
+
+/*
+ * These are like the Set*Option functions, but they don't mark the options
+ * as used.
+ */
+int
+xf86CheckIntOption(pointer optlist, const char *name, int deflt)
+{
+    return LookupIntOption(optlist, name, deflt, FALSE);
+}
+
+
+double
+xf86CheckRealOption(pointer optlist, const char *name, double deflt)
+{
+    return LookupRealOption(optlist, name, deflt, FALSE);
+}
+
+
+char *
+xf86CheckStrOption(pointer optlist, const char *name, char *deflt)
+{
+    return LookupStrOption(optlist, name, deflt, FALSE);
+}
+
+
+int
+xf86CheckBoolOption(pointer optlist, const char *name, int deflt)
+{
+    return LookupBoolOption(optlist, name, deflt, FALSE);
+}
+
+
+double
+xf86CheckPercentOption(pointer optlist, const char *name, double deflt)
+{
+    return LookupPercentOption(optlist, name, deflt, FALSE);
+}
+/*
+ * addNewOption() has the required property of replacing the option value
+ * if the option is already present.
+ */
+pointer
+xf86ReplaceIntOption(pointer optlist, const char *name, const int val)
+{
+    char tmp[16];
+    sprintf(tmp,"%i",val);
+    return xf86AddNewOption(optlist,name,tmp);
+}
+
+pointer
+xf86ReplaceRealOption(pointer optlist, const char *name, const double val)
+{
+    char tmp[32];
+    snprintf(tmp,32,"%f",val);
+    return xf86AddNewOption(optlist,name,tmp);
+}
+
+pointer
+xf86ReplaceBoolOption(pointer optlist, const char *name, const Bool val)
+{
+    return xf86AddNewOption(optlist,name,val?"True":"False");
+}
+
+pointer
+xf86ReplacePercentOption(pointer optlist, const char *name, const double val)
+{
+    char tmp[16];
+    sprintf(tmp, "%lf%%", val);
+    return xf86AddNewOption(optlist,name,tmp);
+}
+
+pointer
+xf86ReplaceStrOption(pointer optlist, const char *name, const char* val)
+{
+      return xf86AddNewOption(optlist,name,val);
+}
+
+pointer
+xf86AddNewOption(pointer head, const char *name, const char *val)
+{
+    /* XXX These should actually be allocated in the parser library. */
+    char *tmp = strdup(val);
+    char *tmp_name = strdup(name);
+
+    return xf86addNewOption(head, tmp_name, tmp);
+}
+
+
+pointer
+xf86NewOption(char *name, char *value)
+{
+    return xf86newOption(name, value);
+}
+
+
+pointer
+xf86NextOption(pointer list)
+{
+    return xf86nextOption(list);
+}
+
+pointer
+xf86OptionListCreate(const char **options, int count, int used)
+{
+	return xf86optionListCreate(options, count, used);
+}
+
+pointer
+xf86OptionListMerge(pointer head, pointer tail)
+{
+	return xf86optionListMerge(head, tail);
+}
+
+void
+xf86OptionListFree(pointer opt)
+{
+	xf86optionListFree(opt);
+}
+
+char *
+xf86OptionName(pointer opt)
+{
+	return xf86optionName(opt);
+}
+
+char *
+xf86OptionValue(pointer opt)
+{
+	return xf86optionValue(opt);
+}
+
+void
+xf86OptionListReport(pointer parm)
+{
+    XF86OptionPtr opts = parm;
+
+    while(opts) {
+	if (xf86optionValue(opts))
+	    xf86ErrorFVerb(5, "\tOption \"%s\" \"%s\"\n",
+			    xf86optionName(opts), xf86optionValue(opts));
+	else
+	    xf86ErrorFVerb( 5, "\tOption \"%s\"\n", xf86optionName(opts));
+	opts = xf86nextOption(opts);
+    }
+}
+
+/* End of XInput-caused section	*/
+
+pointer
+xf86FindOption(pointer options, const char *name)
+{
+    return xf86findOption(options, name);
+}
+
+
+char *
+xf86FindOptionValue(pointer options, const char *name)
+{
+    return xf86findOptionValue(options, name);
+}
+
+
+void
+xf86MarkOptionUsed(pointer option)
+{
+    if (option != NULL)
+	((XF86OptionPtr)option)->opt_used = TRUE;
+}
+
+
+void
+xf86MarkOptionUsedByName(pointer options, const char *name)
+{
+    XF86OptionPtr opt;
+
+    opt = xf86findOption(options, name);
+    if (opt != NULL)
+	opt->opt_used = TRUE;
+}
+
+Bool
+xf86CheckIfOptionUsed(pointer option)
+{
+    if (option != NULL)
+	return ((XF86OptionPtr)option)->opt_used;
+    else
+	return FALSE;
+}
+
+Bool
+xf86CheckIfOptionUsedByName(pointer options, const char *name)
+{
+    XF86OptionPtr opt;
+
+    opt = xf86findOption(options, name);
+    if (opt != NULL)
+	return opt->opt_used;
+    else
+	return FALSE;
+}
+
+void
+xf86ShowUnusedOptions(int scrnIndex, pointer options)
+{
+    XF86OptionPtr opt = options;
+
+    while (opt) {
+	if (opt->opt_name && !opt->opt_used) {
+	    xf86DrvMsg(scrnIndex, X_WARNING, "Option \"%s\" is not used\n",
+			opt->opt_name);
+	}
+	opt = opt->list.next;
+    }
+}
+
+
+static Bool
+GetBoolValue(OptionInfoPtr p, const char *s)
+{
+    return xf86getBoolValue(&p->value.bool, s);
+}
+
+static Bool
+ParseOptionValue(int scrnIndex, pointer options, OptionInfoPtr p,
+		 Bool markUsed)
+{
+    char *s, *end;
+    Bool wasUsed = FALSE;
+
+    if ((s = xf86findOptionValue(options, p->name)) != NULL) {
+	if (markUsed) {
+	    wasUsed = xf86CheckIfOptionUsedByName(options, p->name);
+	    xf86MarkOptionUsedByName(options, p->name);
+	}
+	switch (p->type) {
+	case OPTV_INTEGER:
+	    if (*s == '\0') {
+		xf86DrvMsg(scrnIndex, X_WARNING,
+			   "Option \"%s\" requires an integer value\n",
+			   p->name);
+		p->found = FALSE;
+	    } else {
+		p->value.num = strtoul(s, &end, 0);
+		if (*end == '\0') {
+		    p->found = TRUE;
+		} else {
+		    xf86DrvMsg(scrnIndex, X_WARNING,
+			       "Option \"%s\" requires an integer value\n",
+			        p->name);
+		    p->found = FALSE;
+		}
+	    }
+	    break;
+	case OPTV_STRING:
+	    if (*s == '\0') {
+		xf86DrvMsg(scrnIndex, X_WARNING,
+			   "Option \"%s\" requires an string value\n",
+			   p->name);
+		p->found = FALSE;
+	    } else {
+		p->value.str = s;
+		p->found = TRUE;
+	    }
+	    break;
+	case OPTV_ANYSTR:
+	    p->value.str = s;
+	    p->found = TRUE;
+	    break;
+	case OPTV_REAL:	
+	    if (*s == '\0') {
+		xf86DrvMsg(scrnIndex, X_WARNING,
+			   "Option \"%s\" requires a floating point value\n",
+			   p->name);
+		p->found = FALSE;
+	    } else {
+		p->value.realnum = strtod(s, &end);
+		if (*end == '\0') {
+		    p->found = TRUE;
+		} else {
+		    xf86DrvMsg(scrnIndex, X_WARNING,
+			    "Option \"%s\" requires a floating point value\n",
+			    p->name);
+		    p->found = FALSE;
+		}
+	    }
+	    break;
+	case OPTV_BOOLEAN:
+	    if (GetBoolValue(p, s)) {
+		p->found = TRUE;
+	    } else {
+		xf86DrvMsg(scrnIndex, X_WARNING,
+			   "Option \"%s\" requires a boolean value\n", p->name);
+		p->found = FALSE;
+	    }
+	    break;
+	case OPTV_PERCENT:
+	    {
+		char tmp = 0;
+		/* awkward match, but %% doesn't increase the match counter,
+		 * hence 100 looks the same as 100% to the caller of sccanf
+		 */
+		if (sscanf(s, "%lf%c", &p->value.realnum, &tmp) != 2 || tmp != '%') {
+		    xf86DrvMsg(scrnIndex, X_WARNING,
+			       "Option \"%s\" requires a percent value\n", p->name);
+		    p->found = FALSE;
+		} else {
+		    p->found = TRUE;
+		}
+	    }
+	    break;
+	case OPTV_FREQ:	
+	    if (*s == '\0') {
+		xf86DrvMsg(scrnIndex, X_WARNING,
+			   "Option \"%s\" requires a frequency value\n",
+			   p->name);
+		p->found = FALSE;
+	    } else {
+		double freq = strtod(s, &end);
+		int    units = 0;
+
+		if (end != s) {
+		    p->found = TRUE;
+		    if (!xf86NameCmp(end, "Hz"))
+			units = 1;
+		    else if (!xf86NameCmp(end, "kHz") ||
+			     !xf86NameCmp(end, "k"))
+			units = 1000;
+		    else if (!xf86NameCmp(end, "MHz") ||
+			     !xf86NameCmp(end, "M"))
+			units = 1000000;
+		    else {
+			xf86DrvMsg(scrnIndex, X_WARNING,
+			    "Option \"%s\" requires a frequency value\n",
+			    p->name);
+			p->found = FALSE;
+		    }
+		    if (p->found)
+			freq *= (double)units;
+		} else {
+		    xf86DrvMsg(scrnIndex, X_WARNING,
+			    "Option \"%s\" requires a frequency value\n",
+			    p->name);
+		    p->found = FALSE;
+		}
+		if (p->found) {
+		    p->value.freq.freq = freq;
+		    p->value.freq.units = units;
+		}
+	    }
+	    break;
+	case OPTV_NONE:
+	    /* Should never get here */
+	    p->found = FALSE;
+	    break;
+	}
+	if (p->found && markUsed) {
+	    int verb = 2;
+	    if (wasUsed)
+		verb = 4;
+	    xf86DrvMsgVerb(scrnIndex, X_CONFIG, verb, "Option \"%s\"", p->name);
+	    if (!(p->type == OPTV_BOOLEAN && *s == 0)) {
+		xf86ErrorFVerb(verb, " \"%s\"", s);
+	    }
+	    xf86ErrorFVerb(verb, "\n");
+	}
+    } else if (p->type == OPTV_BOOLEAN) {
+	/* Look for matches with options with or without a "No" prefix. */
+	char *n, *newn;
+	OptionInfoRec opt;
+
+	n = xf86NormalizeName(p->name);
+	if (!n) {
+	    p->found = FALSE;
+	    return FALSE;
+	}
+	if (strncmp(n, "no", 2) == 0) {
+	    newn = n + 2;
+	} else {
+	    free(n);
+	    if (asprintf(&n, "No%s", p->name) == -1) {
+		p->found = FALSE;
+		return FALSE;
+	    }
+	    newn = n;
+	}
+	if ((s = xf86findOptionValue(options, newn)) != NULL) {
+	    if (markUsed)
+		xf86MarkOptionUsedByName(options, newn);
+	    if (GetBoolValue(&opt, s)) {
+		p->value.bool = !opt.value.bool;
+		p->found = TRUE;
+	    } else {
+		xf86DrvMsg(scrnIndex, X_WARNING,
+			   "Option \"%s\" requires a boolean value\n", newn);
+		p->found = FALSE;
+	    }
+	} else {
+	    p->found = FALSE;
+	}
+	if (p->found && markUsed) {
+	    xf86DrvMsgVerb(scrnIndex, X_CONFIG, 2, "Option \"%s\"", newn);
+	    if (*s != 0) {
+		xf86ErrorFVerb(2, " \"%s\"", s);
+	    }
+	    xf86ErrorFVerb(2, "\n");
+	}
+	free(n);
+    } else {
+	p->found = FALSE;
+    }
+    return p->found;
+}
+
+
+void
+xf86ProcessOptions(int scrnIndex, pointer options, OptionInfoPtr optinfo)
+{
+    OptionInfoPtr p;
+
+    for (p = optinfo; p->name != NULL; p++) {
+	ParseOptionValue(scrnIndex, options, p, TRUE);
+    }
+}
+
+
+OptionInfoPtr
+xf86TokenToOptinfo(const OptionInfoRec *table, int token)
+{
+    const OptionInfoRec *p, *match = NULL, *set = NULL;
+
+    if (!table) {
+	ErrorF("xf86TokenToOptinfo: table is NULL\n");
+	return NULL;
+    }
+
+    for (p = table; p->token >= 0; p++) {
+	if (p->token == token) {
+	    match = p;
+	    if (p->found)
+		set = p;
+	}
+    }
+
+    if (set)
+	return (OptionInfoPtr)set;
+    else if (match)
+	return (OptionInfoPtr)match;
+    else
+	return NULL;
+}
+
+
+const char *
+xf86TokenToOptName(const OptionInfoRec *table, int token)
+{
+    const OptionInfoRec *p;
+
+    p = xf86TokenToOptinfo(table, token);
+    return p->name;
+}
+
+
+Bool
+xf86IsOptionSet(const OptionInfoRec *table, int token)
+{
+    OptionInfoPtr p;
+
+    p = xf86TokenToOptinfo(table, token);
+    return p && p->found;
+}
+
+
+char *
+xf86GetOptValString(const OptionInfoRec *table, int token)
+{
+    OptionInfoPtr p;
+
+    p = xf86TokenToOptinfo(table, token);
+    if (p && p->found)
+	return p->value.str;
+    else
+	return NULL;
+}
+
+
+Bool
+xf86GetOptValInteger(const OptionInfoRec *table, int token, int *value)
+{
+    OptionInfoPtr p;
+
+    p = xf86TokenToOptinfo(table, token);
+    if (p && p->found) {
+	*value = p->value.num;
+	return TRUE;
+    } else
+	return FALSE;
+}
+
+
+Bool
+xf86GetOptValULong(const OptionInfoRec *table, int token, unsigned long *value)
+{
+    OptionInfoPtr p;
+
+    p = xf86TokenToOptinfo(table, token);
+    if (p && p->found) {
+	*value = p->value.num;
+	return TRUE;
+    } else
+	return FALSE;
+}
+
+
+Bool
+xf86GetOptValReal(const OptionInfoRec *table, int token, double *value)
+{
+    OptionInfoPtr p;
+
+    p = xf86TokenToOptinfo(table, token);
+    if (p && p->found) {
+	*value = p->value.realnum;
+	return TRUE;
+    } else
+	return FALSE;
+}
+
+
+Bool
+xf86GetOptValFreq(const OptionInfoRec *table, int token,
+		  OptFreqUnits expectedUnits, double *value)
+{
+    OptionInfoPtr p;
+
+    p = xf86TokenToOptinfo(table, token);
+    if (p && p->found) {
+	if (p->value.freq.units > 0) {
+	    /* Units give, so the scaling is known. */
+	    switch (expectedUnits) {
+	    case OPTUNITS_HZ:
+		*value = p->value.freq.freq;
+		break;
+	    case OPTUNITS_KHZ:
+		*value = p->value.freq.freq / 1000.0;
+		break;
+	    case OPTUNITS_MHZ:
+		*value = p->value.freq.freq / 1000000.0;
+		break;
+	    }
+	} else {
+	    /* No units given, so try to guess the scaling. */
+	    switch (expectedUnits) {
+	    case OPTUNITS_HZ:
+		*value = p->value.freq.freq;
+		break;
+	    case OPTUNITS_KHZ:
+		if (p->value.freq.freq > 1000.0)
+		    *value = p->value.freq.freq / 1000.0;
+		else
+		    *value = p->value.freq.freq;
+		break;
+	    case OPTUNITS_MHZ:
+		if (p->value.freq.freq > 1000000.0)
+		    *value = p->value.freq.freq / 1000000.0;
+		else if (p->value.freq.freq > 1000.0)
+		    *value = p->value.freq.freq / 1000.0;
+		else
+		    *value = p->value.freq.freq;
+	    }
+	}
+	return TRUE;
+    } else
+	return FALSE;
+}
+
+
+Bool
+xf86GetOptValBool(const OptionInfoRec *table, int token, Bool *value)
+{
+    OptionInfoPtr p;
+
+    p = xf86TokenToOptinfo(table, token);
+    if (p && p->found) {
+	*value = p->value.bool;
+	return TRUE;
+    } else
+	return FALSE;
+}
+
+
+Bool
+xf86ReturnOptValBool(const OptionInfoRec *table, int token, Bool def)
+{
+    OptionInfoPtr p;
+
+    p = xf86TokenToOptinfo(table, token);
+    if (p && p->found) {
+	return p->value.bool;
+    } else
+	return def;
+}
+
+
+int
+xf86NameCmp(const char *s1, const char *s2)
+{
+    return xf86nameCompare(s1, s2);
+}
+
+char *
+xf86NormalizeName(const char *s)
+{
+    char *ret, *q;
+    const char *p;
+
+    if (s == NULL)
+	return NULL;
+
+    ret = malloc(strlen(s) + 1);
+    for (p = s, q = ret; *p != 0; p++) {
+	switch (*p) {
+	case '_':
+	case ' ':
+	case '\t':
+	    continue;
+	default:
+	    if (isupper(*p))
+		*q++ = tolower(*p);
+	    else
+		*q++ = *p;
+	}
+    }
+    *q = '\0';
+    return ret;
+}
diff --git a/xorg-server/hw/xfree86/common/xf86Xinput.c b/xorg-server/hw/xfree86/common/xf86Xinput.c
index dad993ec1..b9006ab07 100644
--- a/xorg-server/hw/xfree86/common/xf86Xinput.c
+++ b/xorg-server/hw/xfree86/common/xf86Xinput.c
@@ -1,1392 +1,1399 @@
-/*

- * Copyright 1995-1999 by Frederic Lepied, France. <Lepied@XFree86.org>

- *                                                                            

- * Permission to use, copy, modify, distribute, and sell this software and its

- * documentation for any purpose is  hereby granted without fee, provided that

- * the  above copyright   notice appear  in   all  copies and  that both  that

- * copyright  notice   and   this  permission   notice  appear  in  supporting

- * documentation, and that   the  name of  Frederic   Lepied not  be  used  in

- * advertising or publicity pertaining to distribution of the software without

- * specific,  written      prior  permission.     Frederic  Lepied   makes  no

- * representations about the suitability of this software for any purpose.  It

- * is provided "as is" without express or implied warranty.                   

- *                                                                            

- * FREDERIC  LEPIED DISCLAIMS ALL   WARRANTIES WITH REGARD  TO  THIS SOFTWARE,

- * INCLUDING ALL IMPLIED   WARRANTIES OF MERCHANTABILITY  AND   FITNESS, IN NO

- * EVENT  SHALL FREDERIC  LEPIED BE   LIABLE   FOR ANY  SPECIAL, INDIRECT   OR

- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,

- * DATA  OR PROFITS, WHETHER  IN  AN ACTION OF  CONTRACT,  NEGLIGENCE OR OTHER

- * TORTIOUS  ACTION, ARISING    OUT OF OR   IN  CONNECTION  WITH THE USE    OR

- * PERFORMANCE OF THIS SOFTWARE.

- *

- */

-/*

- * Copyright (c) 2000-2002 by The XFree86 Project, Inc.

- *

- * Permission is hereby granted, free of charge, to any person obtaining a

- * copy of this software and associated documentation files (the "Software"),

- * to deal in the Software without restriction, including without limitation

- * the rights to use, copy, modify, merge, publish, distribute, sublicense,

- * and/or sell copies of the Software, and to permit persons to whom the

- * Software is furnished to do so, subject to the following conditions:

- *

- * The above copyright notice and this permission notice shall be included in

- * all copies or substantial portions of the Software.

- *

- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

- * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR

- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,

- * OTHER DEALINGS IN THE SOFTWARE.

- *

- * Except as contained in this notice, the name of the copyright holder(s)

- * and author(s) shall not be used in advertising or otherwise to promote

- * the sale, use or other dealings in this Software without prior written

- * authorization from the copyright holder(s) and author(s).

- */

-

-#ifdef HAVE_XORG_CONFIG_H

-#include <xorg-config.h>

-#endif

-

-#include <X11/Xfuncproto.h>

-#include <X11/Xmd.h>

-#include <X11/extensions/XI.h>

-#include <X11/extensions/XIproto.h>

-#include <X11/Xatom.h>

-#include "xf86.h"

-#include "xf86Priv.h"

-#include "xf86Config.h"

-#include "xf86Xinput.h"

-#include "xf86Optrec.h"

-#include "mipointer.h"

-#include "extinit.h"

-#include "loaderProcs.h"

-

-#include "exevents.h"	/* AddInputDevice */

-#include "exglobals.h"

-#include "eventstr.h"

-#include "inpututils.h"

-

-#include <string.h>     /* InputClassMatches */

-#ifdef HAVE_FNMATCH_H

-#include <fnmatch.h>

-#endif

-#ifdef HAVE_SYS_UTSNAME_H

-#include <sys/utsname.h>

-#endif

-

-#include <stdarg.h>

-#include <stdint.h>          /* for int64_t */

-

-#include "mi.h"

-

-#include <ptrveloc.h>          /* dix pointer acceleration */

-#include <xserver-properties.h>

-

-#ifdef XFreeXDGA

-#include "dgaproc.h"

-#endif

-

-#include "xkbsrv.h"

-

-/* Valuator verification macro */

-#define XI_VERIFY_VALUATORS(num_valuators)					\

-	if (num_valuators > MAX_VALUATORS) {					\

-		xf86Msg(X_ERROR, "%s: num_valuator %d is greater than"		\

-			" MAX_VALUATORS\n", __FUNCTION__, num_valuators);	\

-		return;								\

-	}

-

-EventListPtr xf86Events = NULL;

-

-static int

-xf86InputDevicePostInit(DeviceIntPtr dev);

-

-/**

- * Eval config and modify DeviceVelocityRec accordingly

- */

-static void

-ProcessVelocityConfiguration(DeviceIntPtr pDev, char* devname, pointer list,

-                             DeviceVelocityPtr s)

-{

-    int tempi;

-    float tempf;

-    Atom float_prop = XIGetKnownProperty(XATOM_FLOAT);

-    Atom prop;

-

-    if(!s)

-        return;

-

-    /* common settings (available via device properties) */

-    tempf = xf86SetRealOption(list, "ConstantDeceleration", 1.0);

-    if (tempf > 1.0) {

-        xf86Msg(X_CONFIG, "%s: (accel) constant deceleration by %.1f\n",

-                devname, tempf);

-        prop = XIGetKnownProperty(ACCEL_PROP_CONSTANT_DECELERATION);

-        XIChangeDeviceProperty(pDev, prop, float_prop, 32,

-                               PropModeReplace, 1, &tempf, FALSE);

-    }

-

-    tempf = xf86SetRealOption(list, "AdaptiveDeceleration", 1.0);

-    if (tempf > 1.0) {

-        xf86Msg(X_CONFIG, "%s: (accel) adaptive deceleration by %.1f\n",

-                devname, tempf);

-        prop = XIGetKnownProperty(ACCEL_PROP_ADAPTIVE_DECELERATION);

-        XIChangeDeviceProperty(pDev, prop, float_prop, 32,

-                               PropModeReplace, 1, &tempf, FALSE);

-    }

-

-    /* select profile by number */

-    tempi = xf86SetIntOption(list, "AccelerationProfile",

-            s->statistics.profile_number);

-

-    prop = XIGetKnownProperty(ACCEL_PROP_PROFILE_NUMBER);

-    if (XIChangeDeviceProperty(pDev, prop, XA_INTEGER, 32,

-                               PropModeReplace, 1, &tempi, FALSE) == Success) {

-        xf86Msg(X_CONFIG, "%s: (accel) acceleration profile %i\n", devname,

-                tempi);

-    } else {

-        xf86Msg(X_CONFIG, "%s: (accel) acceleration profile %i is unknown\n",

-                devname, tempi);

-    }

-

-    /* set scaling */

-    tempf = xf86SetRealOption(list, "ExpectedRate", 0);

-    prop = XIGetKnownProperty(ACCEL_PROP_VELOCITY_SCALING);

-    if (tempf > 0) {

-        tempf = 1000.0 / tempf;

-        XIChangeDeviceProperty(pDev, prop, float_prop, 32,

-                               PropModeReplace, 1, &tempf, FALSE);

-    } else {

-        tempf = xf86SetRealOption(list, "VelocityScale", s->corr_mul);

-        XIChangeDeviceProperty(pDev, prop, float_prop, 32,

-                               PropModeReplace, 1, &tempf, FALSE);

-    }

-

-    tempi = xf86SetIntOption(list, "VelocityTrackerCount", -1);

-    if (tempi > 1)

-	InitTrackers(s, tempi);

-

-    s->initial_range = xf86SetIntOption(list, "VelocityInitialRange",

-                                        s->initial_range);

-

-    s->max_diff = xf86SetRealOption(list, "VelocityAbsDiff", s->max_diff);

-

-    tempf = xf86SetRealOption(list, "VelocityRelDiff", -1);

-    if (tempf >= 0) {

-	xf86Msg(X_CONFIG, "%s: (accel) max rel. velocity difference: %.1f%%\n",

-	        devname, tempf*100.0);

-	s->max_rel_diff = tempf;

-    }

-

-    /*  Configure softening. If const deceleration is used, this is expected

-     *  to provide better subpixel information so we enable

-     *  softening by default only if ConstantDeceleration is not used

-     */

-    s->use_softening = xf86SetBoolOption(list, "Softening",

-                                         s->const_acceleration == 1.0);

-

-    s->average_accel = xf86SetBoolOption(list, "AccelerationProfileAveraging",

-                                         s->average_accel);

-

-    s->reset_time = xf86SetIntOption(list, "VelocityReset", s->reset_time);

-}

-

-static void

-ApplyAccelerationSettings(DeviceIntPtr dev){

-    int scheme, i;

-    DeviceVelocityPtr pVel;

-    InputInfoPtr pInfo = (InputInfoPtr)dev->public.devicePrivate;

-    char* schemeStr;

-

-    if (dev->valuator && dev->ptrfeed) {

-	schemeStr = xf86SetStrOption(pInfo->options, "AccelerationScheme", "");

-

-	scheme = dev->valuator->accelScheme.number;

-

-	if (!xf86NameCmp(schemeStr, "predictable"))

-	    scheme = PtrAccelPredictable;

-

-	if (!xf86NameCmp(schemeStr, "lightweight"))

-	    scheme = PtrAccelLightweight;

-

-	if (!xf86NameCmp(schemeStr, "none"))

-	    scheme = PtrAccelNoOp;

-

-        /* reinit scheme if needed */

-        if (dev->valuator->accelScheme.number != scheme) {

-            if (dev->valuator->accelScheme.AccelCleanupProc) {

-                dev->valuator->accelScheme.AccelCleanupProc(dev);

-            }

-

-            if (InitPointerAccelerationScheme(dev, scheme)) {

-		xf86Msg(X_CONFIG, "%s: (accel) selected scheme %s/%i\n",

-		        pInfo->name, schemeStr, scheme);

-	    } else {

-        	xf86Msg(X_CONFIG, "%s: (accel) could not init scheme %s\n",

-		        pInfo->name, schemeStr);

-        	scheme = dev->valuator->accelScheme.number;

-            }

-        } else {

-            xf86Msg(X_CONFIG, "%s: (accel) keeping acceleration scheme %i\n",

-                    pInfo->name, scheme);

-        }

-

-        free(schemeStr);

-

-        /* process special configuration */

-        switch (scheme) {

-            case PtrAccelPredictable:

-                pVel = GetDevicePredictableAccelData(dev);

-                ProcessVelocityConfiguration (dev, pInfo->name, pInfo->options,

-                                              pVel);

-                break;

-        }

-

-        i = xf86SetIntOption(pInfo->options, "AccelerationNumerator",

-                             dev->ptrfeed->ctrl.num);

-        if (i >= 0)

-            dev->ptrfeed->ctrl.num = i;

-

-        i = xf86SetIntOption(pInfo->options, "AccelerationDenominator",

-                             dev->ptrfeed->ctrl.den);

-        if (i > 0)

-            dev->ptrfeed->ctrl.den = i;

-

-        i = xf86SetIntOption(pInfo->options, "AccelerationThreshold",

-                             dev->ptrfeed->ctrl.threshold);

-        if (i >= 0)

-            dev->ptrfeed->ctrl.threshold = i;

-

-        xf86Msg(X_CONFIG, "%s: (accel) acceleration factor: %.3f\n",

-                            pInfo->name, ((float)dev->ptrfeed->ctrl.num)/

-                                         ((float)dev->ptrfeed->ctrl.den));

-        xf86Msg(X_CONFIG, "%s: (accel) acceleration threshold: %i\n",

-                pInfo->name, dev->ptrfeed->ctrl.threshold);

-    }

-}

-

-/***********************************************************************

- *

- * xf86ProcessCommonOptions --

- * 

- *	Process global options.

- *

- ***********************************************************************

- */

-void

-xf86ProcessCommonOptions(InputInfoPtr pInfo,

-                         pointer	list)

-{

-    if (xf86SetBoolOption(list, "Floating", 0) ||

-        !xf86SetBoolOption(list, "AlwaysCore", 1) ||

-        !xf86SetBoolOption(list, "SendCoreEvents", 1) ||

-        !xf86SetBoolOption(list, "CorePointer", 1) ||

-        !xf86SetBoolOption(list, "CoreKeyboard", 1)) {

-        xf86Msg(X_CONFIG, "%s: doesn't report core events\n", pInfo->name);

-    } else {

-        pInfo->flags |= XI86_ALWAYS_CORE;

-        xf86Msg(X_CONFIG, "%s: always reports core events\n", pInfo->name);

-    }

-}

-

-/***********************************************************************

- *

- * xf86ActivateDevice --

- *

- *	Initialize an input device.

- *

- * Returns TRUE on success, or FALSE otherwise.

- ***********************************************************************

- */

-static DeviceIntPtr

-xf86ActivateDevice(InputInfoPtr pInfo)

-{

-    DeviceIntPtr	dev;

-    Atom		atom;

-

-    dev = AddInputDevice(serverClient, pInfo->device_control, TRUE);

-

-    if (dev == NULL)

-    {

-        xf86Msg(X_ERROR, "Too many input devices. Ignoring %s\n",

-                pInfo->name);

-        pInfo->dev = NULL;

-        return NULL;

-    }

-

-    atom = MakeAtom(pInfo->type_name, strlen(pInfo->type_name), TRUE);

-    AssignTypeAndName(dev, atom, pInfo->name);

-    dev->public.devicePrivate = pInfo;

-    pInfo->dev = dev;

-

-    dev->coreEvents = pInfo->flags & XI86_ALWAYS_CORE;

-    dev->type = SLAVE;

-    dev->spriteInfo->spriteOwner = FALSE;

-

-    dev->config_info = xf86SetStrOption(pInfo->options, "config_info", NULL);

-

-    if (serverGeneration == 1)

-        xf86Msg(X_INFO, "XINPUT: Adding extended input device \"%s\" (type: %s)\n",

-                pInfo->name, pInfo->type_name);

-

-    return dev;

-}

-

-/****************************************************************************

- *

- * Caller:	ProcXSetDeviceMode

- *

- * Change the mode of an extension device.

- * This function is used to change the mode of a device from reporting

- * relative motion to reporting absolute positional information, and

- * vice versa.

- * The default implementation below is that no such devices are supported.

- *

- ***********************************************************************

- */

-

-int

-SetDeviceMode (ClientPtr client, DeviceIntPtr dev, int mode)

-{

-  InputInfoPtr        pInfo = (InputInfoPtr)dev->public.devicePrivate;

-

-  if (pInfo->switch_mode) {

-    return (*pInfo->switch_mode)(client, dev, mode);

-  }

-  else

-    return BadMatch;

-}

-

-

-/***********************************************************************

- *

- * Caller:	ProcXSetDeviceValuators

- *

- * Set the value of valuators on an extension input device.

- * This function is used to set the initial value of valuators on

- * those input devices that are capable of reporting either relative

- * motion or an absolute position, and allow an initial position to be set.

- * The default implementation below is that no such devices are supported.

- *

- ***********************************************************************

- */

-

-int

-SetDeviceValuators (ClientPtr client, DeviceIntPtr dev, int *valuators,

-                    int first_valuator, int num_valuators)

-{

-    InputInfoPtr pInfo = (InputInfoPtr) dev->public.devicePrivate;

-

-    if (pInfo->set_device_valuators)

-	return (*pInfo->set_device_valuators)(pInfo, valuators, first_valuator,

-					      num_valuators);

-

-    return BadMatch;

-}

-

-

-/***********************************************************************

- *

- * Caller:	ProcXChangeDeviceControl

- *

- * Change the specified device controls on an extension input device.

- *

- ***********************************************************************

- */

-

-int

-ChangeDeviceControl (ClientPtr client, DeviceIntPtr dev, xDeviceCtl *control)

-{

-  InputInfoPtr        pInfo = (InputInfoPtr)dev->public.devicePrivate;

-

-  if (!pInfo->control_proc) {

-      switch (control->control) {

-      case DEVICE_CORE:

-          return BadMatch;

-      case DEVICE_RESOLUTION:

-      case DEVICE_ABS_CALIB:

-      case DEVICE_ABS_AREA:

-      case DEVICE_ENABLE:

-        return Success;

-      default:

-        return BadMatch;

-      }

-  }

-  else {

-      return (*pInfo->control_proc)(pInfo, control);

-  }

-}

-

-/*

- * Get the operating system name from uname and store it statically to avoid

- * repeating the system call each time MatchOS is checked.

- */

-static const char *

-HostOS(void)

-{

-#ifdef HAVE_SYS_UTSNAME_H

-    struct utsname name;

-    static char host_os[sizeof(name.sysname)] = "";

-

-    if (*host_os == '\0') {

-        if (uname(&name) >= 0)

-            strcpy(host_os, name.sysname);

-        else {

-            strncpy(host_os, "unknown", sizeof(host_os));

-            host_os[sizeof(host_os)-1] = '\0';

-        }

-    }

-    return host_os;

-#else

-    return "";

-#endif

-}

-

-static int

-match_substring(const char *attr, const char *pattern)

-{

-    return (strstr(attr, pattern)) ? 0 : -1;

-}

-

-#ifdef HAVE_FNMATCH_H

-static int

-match_pattern(const char *attr, const char *pattern)

-{

-    return fnmatch(pattern, attr, 0);

-}

-#else

-#define match_pattern match_substring

-#endif

-

-#ifdef HAVE_FNMATCH_H

-static int

-match_path_pattern(const char *attr, const char *pattern)

-{

-    return fnmatch(pattern, attr, FNM_PATHNAME);

-}

-#else

-#define match_path_pattern match_substring

-#endif

-

-/*

- * Match an attribute against a list of NULL terminated arrays of patterns.

- * If a pattern in each list entry is matched, return TRUE.

- */

-static Bool

-MatchAttrToken(const char *attr, struct list *patterns,

-               int (*compare)(const char *attr, const char *pattern))

-{

-    const xf86MatchGroup *group;

-

-    /* If there are no patterns, accept the match */

-    if (list_is_empty(patterns))

-        return TRUE;

-

-    /* If there are patterns but no attribute, reject the match */

-    if (!attr)

-        return FALSE;

-

-    /*

-     * Otherwise, iterate the list of patterns ensuring each entry has a

-     * match. Each list entry is a separate Match line of the same type.

-     */

-    list_for_each_entry(group, patterns, entry) {

-        char * const *cur;

-        Bool match = FALSE;

-

-        for (cur = group->values; *cur; cur++)

-            if ((*compare)(attr, *cur) == 0) {

-                match = TRUE;

-                break;

-            }

-        if (!match)

-            return FALSE;

-    }

-

-    /* All the entries in the list matched the attribute */

-    return TRUE;

-}

-

-/*

- * Classes without any Match statements match all devices. Otherwise, all

- * statements must match.

- */

-static Bool

-InputClassMatches(const XF86ConfInputClassPtr iclass, const InputInfoPtr idev,

-                  const InputAttributes *attrs)

-{

-    /* MatchProduct substring */

-    if (!MatchAttrToken(attrs->product, &iclass->match_product, match_substring))

-        return FALSE;

-

-    /* MatchVendor substring */

-    if (!MatchAttrToken(attrs->vendor, &iclass->match_vendor, match_substring))

-        return FALSE;

-

-    /* MatchDevicePath pattern */

-    if (!MatchAttrToken(attrs->device, &iclass->match_device, match_path_pattern))

-        return FALSE;

-

-    /* MatchOS case-insensitive string */

-    if (!MatchAttrToken(HostOS(), &iclass->match_os, strcasecmp))

-        return FALSE;

-

-    /* MatchPnPID pattern */

-    if (!MatchAttrToken(attrs->pnp_id, &iclass->match_pnpid, match_pattern))

-        return FALSE;

-

-    /* MatchUSBID pattern */

-    if (!MatchAttrToken(attrs->usb_id, &iclass->match_usbid, match_pattern))

-        return FALSE;

-

-    /* MatchDriver string */

-    if (!MatchAttrToken(idev->driver, &iclass->match_driver, strcmp))

-        return FALSE;

-

-    /*

-     * MatchTag string

-     * See if any of the device's tags match any of the MatchTag tokens.

-     */

-    if (!list_is_empty(&iclass->match_tag)) {

-        char * const *tag;

-        Bool match;

-

-        if (!attrs->tags)

-            return FALSE;

-        for (tag = attrs->tags, match = FALSE; *tag; tag++) {

-            if (MatchAttrToken(*tag, &iclass->match_tag, strcmp)) {

-                match = TRUE;

-                break;

-            }

-        }

-        if (!match)

-            return FALSE;

-    }

-

-    /* MatchIs* booleans */

-    if (iclass->is_keyboard.set &&

-        iclass->is_keyboard.val != !!(attrs->flags & ATTR_KEYBOARD))

-        return FALSE;

-    if (iclass->is_pointer.set &&

-        iclass->is_pointer.val != !!(attrs->flags & ATTR_POINTER))

-        return FALSE;

-    if (iclass->is_joystick.set &&

-        iclass->is_joystick.val != !!(attrs->flags & ATTR_JOYSTICK))

-        return FALSE;

-    if (iclass->is_tablet.set &&

-        iclass->is_tablet.val != !!(attrs->flags & ATTR_TABLET))

-        return FALSE;

-    if (iclass->is_touchpad.set &&

-        iclass->is_touchpad.val != !!(attrs->flags & ATTR_TOUCHPAD))

-        return FALSE;

-    if (iclass->is_touchscreen.set &&

-        iclass->is_touchscreen.val != !!(attrs->flags & ATTR_TOUCHSCREEN))

-        return FALSE;

-

-    return TRUE;

-}

-

-/*

- * Merge in any InputClass configurations. Options in each InputClass

- * section have more priority than the original device configuration as

- * well as any previous InputClass sections.

- */

-static int

-MergeInputClasses(const InputInfoPtr idev, const InputAttributes *attrs)

-{

-    XF86ConfInputClassPtr cl;

-    XF86OptionPtr classopts;

-

-    for (cl = xf86configptr->conf_inputclass_lst; cl; cl = cl->list.next) {

-        if (!InputClassMatches(cl, idev, attrs))

-            continue;

-

-        /* Collect class options and driver settings */

-        classopts = xf86optionListDup(cl->option_lst);

-        if (cl->driver) {

-            free(idev->driver);

-            idev->driver = xstrdup(cl->driver);

-            if (!idev->driver) {

-                xf86Msg(X_ERROR, "Failed to allocate memory while merging "

-                        "InputClass configuration");

-                return BadAlloc;

-            }

-            classopts = xf86ReplaceStrOption(classopts, "driver",

-                                             idev->driver);

-        }

-

-        /* Apply options to device with InputClass settings preferred. */

-        xf86Msg(X_CONFIG, "%s: Applying InputClass \"%s\"\n",

-                idev->name, cl->identifier);

-        idev->options = xf86optionListMerge(idev->options, classopts);

-    }

-

-    return Success;

-}

-

-/*

- * Iterate the list of classes and look for Option "Ignore". Return the

- * value of the last matching class and holler when returning TRUE.

- */

-static Bool

-IgnoreInputClass(const InputInfoPtr idev, const InputAttributes *attrs)

-{

-    XF86ConfInputClassPtr cl;

-    Bool ignore = FALSE;

-    const char *ignore_class;

-

-    for (cl = xf86configptr->conf_inputclass_lst; cl; cl = cl->list.next) {

-        if (!InputClassMatches(cl, idev, attrs))

-            continue;

-        if (xf86findOption(cl->option_lst, "Ignore")) {

-            ignore = xf86CheckBoolOption(cl->option_lst, "Ignore", FALSE);

-            ignore_class = cl->identifier;

-        }

-    }

-

-    if (ignore)

-        xf86Msg(X_CONFIG, "%s: Ignoring device from InputClass \"%s\"\n",

-                idev->name, ignore_class);

-    return ignore;

-}

-

-InputInfoPtr

-xf86AllocateInput(void)

-{

-    InputInfoPtr pInfo;

-

-    pInfo = calloc(sizeof(*pInfo), 1);

-    if (!pInfo)

-        return NULL;

-

-    pInfo->fd = -1;

-    pInfo->type_name = "UNKNOWN";

-

-    return pInfo;

-}

-

-/* Append InputInfoRec to the tail of xf86InputDevs. */

-static void

-xf86AddInput(InputDriverPtr drv, InputInfoPtr pInfo)

-{

-    InputInfoPtr *prev = NULL;

-

-    pInfo->drv = drv;

-    pInfo->module = DuplicateModule(drv->module, NULL);

-

-    for (prev = &xf86InputDevs; *prev; prev = &(*prev)->next)

-        ;

-

-    *prev = pInfo;

-    pInfo->next = NULL;

-

-    xf86CollectInputOptions(pInfo, (const char**)drv->default_options);

-    xf86ProcessCommonOptions(pInfo, pInfo->options);

-}

-

-/*

- * Remove an entry from xf86InputDevs and free all the device's information.

- */

-void

-xf86DeleteInput(InputInfoPtr pInp, int flags)

-{

-    /* First check if the inputdev is valid. */

-    if (pInp == NULL)

-	return;

-

-    if (pInp->module)

-	UnloadModule(pInp->module);

-

-    /* This should *really* be handled in drv->UnInit(dev) call instead, but

-     * if the driver forgets about it make sure we free it or at least crash

-     * with flying colors */

-    free(pInp->private);

-

-    FreeInputAttributes(pInp->attrs);

-

-    /* Remove the entry from the list. */

-    if (pInp == xf86InputDevs)

-	xf86InputDevs = pInp->next;

-    else {

-	InputInfoPtr p = xf86InputDevs;

-	while (p && p->next != pInp)

-	    p = p->next;

-	if (p)

-	    p->next = pInp->next;

-	/* Else the entry wasn't in the xf86InputDevs list (ignore this). */

-    }

-

-    free(pInp->driver);

-    free(pInp->name);

-    xf86optionListFree(pInp->options);

-    free(pInp);

-}

-

-/*

- * Apply backend-specific initialization. Invoked after ActiveteDevice(),

- * i.e. after the driver successfully completed DEVICE_INIT and the device

- * is advertised.

- * @param dev the device

- * @return Success or an error code

- */

-static int

-xf86InputDevicePostInit(DeviceIntPtr dev) {

-    ApplyAccelerationSettings(dev);

-    return Success;

-}

-

-/**

- * Create a new input device, activate and enable it.

- *

- * Possible return codes:

- *    BadName .. a bad driver name was supplied.

- *    BadImplementation ... The driver does not have a PreInit function. This

- *                          is a driver bug.

- *    BadMatch .. device initialization failed.

- *    BadAlloc .. too many input devices

- *

- * @param idev The device, already set up with identifier, driver, and the

- * options.

- * @param pdev Pointer to the new device, if Success was reported.

- * @param enable Enable the device after activating it.

- *

- * @return Success or an error code

- */

-_X_INTERNAL int

-xf86NewInputDevice(InputInfoPtr pInfo, DeviceIntPtr *pdev, BOOL enable)

-{

-    InputDriverPtr drv = NULL;

-    DeviceIntPtr dev = NULL;

-    int rval;

-

-    /* Memory leak for every attached device if we don't

-     * test if the module is already loaded first */

-    drv = xf86LookupInputDriver(pInfo->driver);

-    if (!drv)

-        if (xf86LoadOneModule(pInfo->driver, NULL))

-            drv = xf86LookupInputDriver(pInfo->driver);

-    if (!drv) {

-        xf86Msg(X_ERROR, "No input driver matching `%s'\n", pInfo->driver);

-        rval = BadName;

-        goto unwind;

-    }

-

-    if (!drv->PreInit) {

-        xf86Msg(X_ERROR,

-                "Input driver `%s' has no PreInit function (ignoring)\n",

-                drv->driverName);

-        rval = BadImplementation;

-        goto unwind;

-    }

-

-    xf86AddInput(drv, pInfo);

-

-    rval = drv->PreInit(drv, pInfo, 0);

-

-    if (rval != Success) {

-        xf86Msg(X_ERROR, "PreInit returned %d for \"%s\"\n", rval, pInfo->name);

-        goto unwind;

-    }

-

-    if (!(dev = xf86ActivateDevice(pInfo)))

-    {

-        rval = BadAlloc;

-        goto unwind;

-    }

-

-    rval = ActivateDevice(dev, TRUE);

-    if (rval != Success)

-    {

-        xf86Msg(X_ERROR, "Couldn't init device \"%s\"\n", pInfo->name);

-        RemoveDevice(dev, TRUE);

-        goto unwind;

-    }

-

-    rval = xf86InputDevicePostInit(dev);

-    if (rval != Success)

-    {

-	xf86Msg(X_ERROR, "Couldn't post-init device \"%s\"\n", pInfo->name);

-	RemoveDevice(dev, TRUE);

-	goto unwind;

-    }

-

-    /* Enable it if it's properly initialised and we're currently in the VT */

-    if (enable && dev->inited && dev->startup && xf86Screens[0]->vtSema)

-    {

-        EnableDevice(dev, TRUE);

-        if (!dev->enabled)

-        {

-            xf86Msg(X_ERROR, "Couldn't init device \"%s\"\n", pInfo->name);

-            rval = BadMatch;

-            goto unwind;

-        }

-        /* send enter/leave event, update sprite window */

-        CheckMotion(NULL, dev);

-    }

-

-    *pdev = dev;

-    return Success;

-

-unwind:

-    if(pInfo) {

-        if(drv && drv->UnInit)

-            drv->UnInit(drv, pInfo, 0);

-        else

-            xf86DeleteInput(pInfo, 0);

-    }

-    return rval;

-}

-

-int

-NewInputDeviceRequest (InputOption *options, InputAttributes *attrs,

-                       DeviceIntPtr *pdev)

-{

-    InputInfoPtr pInfo = NULL;

-    InputOption *option = NULL;

-    int rval = Success;

-    int is_auto = 0;

-

-    pInfo = xf86AllocateInput();

-    if (!pInfo)

-        return BadAlloc;

-

-    for (option = options; option; option = option->next) {

-        if (strcasecmp(option->key, "driver") == 0) {

-            if (pInfo->driver) {

-                rval = BadRequest;

-                goto unwind;

-            }

-            pInfo->driver = xstrdup(option->value);

-            if (!pInfo->driver) {

-                rval = BadAlloc;

-                goto unwind;

-            }

-        }

-

-        if (strcasecmp(option->key, "name") == 0 ||

-            strcasecmp(option->key, "identifier") == 0) {

-            if (pInfo->name) {

-                rval = BadRequest;

-                goto unwind;

-            }

-            pInfo->name = xstrdup(option->value);

-            if (!pInfo->name) {

-                rval = BadAlloc;

-                goto unwind;

-            }

-        }

-

-        if (strcmp(option->key, "_source") == 0 &&

-            (strcmp(option->value, "server/hal") == 0 ||

-             strcmp(option->value, "server/udev") == 0)) {

-            is_auto = 1;

-            if (!xf86Info.autoAddDevices) {

-                rval = BadMatch;

-                goto unwind;

-            }

-        }

-    }

-

-    for (option = options; option; option = option->next) {

-        /* Steal option key/value strings from the provided list.

-         * We need those strings, the InputOption list doesn't. */

-        pInfo->options = xf86addNewOption(pInfo->options,

-                                               option->key, option->value);

-        option->key = NULL;

-        option->value = NULL;

-    }

-

-    /* Apply InputClass settings */

-    if (attrs) {

-        if (IgnoreInputClass(pInfo, attrs)) {

-            rval = BadIDChoice;

-            goto unwind;

-        }

-

-        rval = MergeInputClasses(pInfo, attrs);

-        if (rval != Success)

-            goto unwind;

-

-        pInfo->attrs = DuplicateInputAttributes(attrs);

-    }

-

-    if (!pInfo->driver || !pInfo->name) {

-        xf86Msg(X_INFO, "No input driver/identifier specified (ignoring)\n");

-        rval = BadRequest;

-        goto unwind;

-    }

-

-    if (!pInfo->name) {

-        xf86Msg(X_ERROR, "No device identifier specified (ignoring)\n");

-        rval = BadMatch;

-        goto unwind;

-    }

-

-    rval = xf86NewInputDevice(pInfo, pdev,

-                (!is_auto || (is_auto && xf86Info.autoEnableDevices)));

-

-    return rval;

-

-unwind:

-    if (is_auto && !xf86Info.autoAddDevices)

-        xf86Msg(X_INFO, "AutoAddDevices is off - not adding device.\n");

-    xf86DeleteInput(pInfo, 0);

-    return rval;

-}

-

-void

-DeleteInputDeviceRequest(DeviceIntPtr pDev)

-{

-    InputInfoPtr pInfo = (InputInfoPtr) pDev->public.devicePrivate;

-    InputDriverPtr drv = NULL;

-    Bool isMaster = IsMaster(pDev);

-

-    if (pInfo) /* need to get these before RemoveDevice */

-        drv = pInfo->drv;

-

-    OsBlockSignals();

-    RemoveDevice(pDev, TRUE);

-

-    if (!isMaster && pInfo != NULL)

-    {

-        if(drv->UnInit)

-            drv->UnInit(drv, pInfo, 0);

-        else

-            xf86DeleteInput(pInfo, 0);

-    }

-    OsReleaseSignals();

-}

-

-/* 

- * convenient functions to post events

- */

-

-void

-xf86PostMotionEvent(DeviceIntPtr	device,

-                    int			is_absolute,

-                    int			first_valuator,

-                    int			num_valuators,

-                    ...)

-{

-    va_list var;

-    int i = 0;

-    ValuatorMask mask;

-

-    XI_VERIFY_VALUATORS(num_valuators);

-

-    valuator_mask_zero(&mask);

-    va_start(var, num_valuators);

-    for (i = 0; i < num_valuators; i++)

-        valuator_mask_set(&mask, first_valuator + i, va_arg(var, int));

-    va_end(var);

-

-    xf86PostMotionEventM(device, is_absolute, &mask);

-}

-

-void

-xf86PostMotionEventP(DeviceIntPtr	device,

-                    int			is_absolute,

-                    int			first_valuator,

-                    int			num_valuators,

-                    const int		*valuators)

-{

-    ValuatorMask mask;

-

-    XI_VERIFY_VALUATORS(num_valuators);

-

-    valuator_mask_set_range(&mask, first_valuator, num_valuators, valuators);

-    xf86PostMotionEventM(device, is_absolute, &mask);

-}

-

-void

-xf86PostMotionEventM(DeviceIntPtr	device,

-                     int		is_absolute,

-                     const ValuatorMask	*mask)

-{

-    int i = 0, nevents = 0;

-    DeviceEvent *event;

-    int flags = 0;

-

-#if XFreeXDGA

-    int index;

-    int dx = 0, dy = 0;

-#endif

-

-    if (is_absolute)

-        flags = POINTER_ABSOLUTE;

-    else

-        flags = POINTER_RELATIVE | POINTER_ACCELERATE;

-

-#if XFreeXDGA

-    /* The evdev driver may not always send all axes across. */

-    if (valuator_mask_isset(mask, 0) ||

-        valuator_mask_isset(mask, 1))

-        if (miPointerGetScreen(device)) {

-            index = miPointerGetScreen(device)->myNum;

-            if (valuator_mask_isset(mask, 0))

-            {

-                dx = valuator_mask_get(mask, 0);

-                if (is_absolute)

-                    dx -= device->last.valuators[0];

-            }

-

-            if (valuator_mask_isset(mask, 1))

-            {

-                dy = valuator_mask_get(mask, 1);

-                if (is_absolute)

-                    dy -= device->last.valuators[1];

-            }

-

-            if (DGAStealMotionEvent(device, index, dx, dy))

-                return;

-        }

-#endif

-

-    nevents = GetPointerEvents(xf86Events, device, MotionNotify, 0, flags, mask);

-

-    for (i = 0; i < nevents; i++) {

-        event = (DeviceEvent*)((xf86Events + i)->event);

-        mieqEnqueue(device, (InternalEvent*)((xf86Events + i)->event));

-    }

-}

-

-void

-xf86PostProximityEvent(DeviceIntPtr	device,

-                       int		is_in,

-                       int		first_valuator,

-                       int		num_valuators,

-                       ...)

-{

-    va_list var;

-    int i;

-    ValuatorMask mask;

-

-    XI_VERIFY_VALUATORS(num_valuators);

-

-    valuator_mask_zero(&mask);

-    va_start(var, num_valuators);

-    for (i = 0; i < num_valuators; i++)

-        valuator_mask_set(&mask, first_valuator + i, va_arg(var, int));

-    va_end(var);

-

-    xf86PostProximityEventM(device, is_in, &mask);

-}

-

-void

-xf86PostProximityEventP(DeviceIntPtr	device,

-                        int		is_in,

-                        int		first_valuator,

-                        int		num_valuators,

-                        const int	*valuators)

-{

-    ValuatorMask mask;

-

-    XI_VERIFY_VALUATORS(num_valuators);

-

-    valuator_mask_set_range(&mask, first_valuator, num_valuators, valuators);

-    xf86PostProximityEventM(device, is_in, &mask);

-}

-

-void

-xf86PostProximityEventM(DeviceIntPtr	device,

-                        int		is_in,

-                        const ValuatorMask *mask)

-{

-    int i, nevents;

-

-    nevents = GetProximityEvents(xf86Events, device,

-                                 is_in ? ProximityIn : ProximityOut, mask);

-    for (i = 0; i < nevents; i++)

-        mieqEnqueue(device, (InternalEvent*)((xf86Events + i)->event));

-

-}

-

-void

-xf86PostButtonEvent(DeviceIntPtr	device,

-                    int			is_absolute,

-                    int			button,

-                    int			is_down,

-                    int			first_valuator,

-                    int			num_valuators,

-                    ...)

-{

-    va_list var;

-    ValuatorMask mask;

-    int i = 0;

-

-    XI_VERIFY_VALUATORS(num_valuators);

-

-    valuator_mask_zero(&mask);

-

-    va_start(var, num_valuators);

-    for (i = 0; i < num_valuators; i++)

-        valuator_mask_set(&mask, first_valuator + i, va_arg(var, int));

-    va_end(var);

-

-    xf86PostButtonEventM(device, is_absolute, button, is_down, &mask);

-}

-

-void

-xf86PostButtonEventP(DeviceIntPtr	device,

-                     int		is_absolute,

-                     int		button,

-                     int		is_down,

-                     int		first_valuator,

-                     int		num_valuators,

-                     const int		*valuators)

-{

-    ValuatorMask mask;

-

-    XI_VERIFY_VALUATORS(num_valuators);

-

-    valuator_mask_set_range(&mask, first_valuator, num_valuators, valuators);

-    xf86PostButtonEventM(device, is_absolute, button, is_down, &mask);

-}

-

-void

-xf86PostButtonEventM(DeviceIntPtr	device,

-                     int		is_absolute,

-                     int		button,

-                     int		is_down,

-                     const ValuatorMask	*mask)

-{

-    int i = 0, nevents = 0;

-    int flags = 0;

-

-#if XFreeXDGA

-    int index;

-#endif

-

-    if (is_absolute)

-        flags = POINTER_ABSOLUTE;

-    else

-        flags = POINTER_RELATIVE | POINTER_ACCELERATE;

-

-#if XFreeXDGA

-    if (miPointerGetScreen(device)) {

-        index = miPointerGetScreen(device)->myNum;

-        if (DGAStealButtonEvent(device, index, button, is_down))

-            return;

-    }

-#endif

-

-    nevents = GetPointerEvents(xf86Events, device,

-                               is_down ? ButtonPress : ButtonRelease, button,

-                               flags, mask);

-

-    for (i = 0; i < nevents; i++)

-        mieqEnqueue(device, (InternalEvent*)((xf86Events + i)->event));

-

-}

-

-void

-xf86PostKeyEvent(DeviceIntPtr	device,

-                 unsigned int	key_code,

-                 int		is_down,

-                 int		is_absolute,

-                 int		first_valuator,

-                 int		num_valuators,

-                 ...)

-{

-    va_list var;

-    int i = 0;

-    ValuatorMask mask;

-

-    XI_VERIFY_VALUATORS(num_valuators);

-

-    valuator_mask_zero(&mask);

-

-    va_start(var, num_valuators);

-    for (i = 0; i < num_valuators; i++)

-        valuator_mask_set(&mask, first_valuator + i, va_arg(var, int));

-    va_end(var);

-

-    xf86PostKeyEventM(device, key_code, is_down, is_absolute, &mask);

-}

-

-void

-xf86PostKeyEventP(DeviceIntPtr	device,

-                  unsigned int	key_code,

-                  int		is_down,

-                  int		is_absolute,

-                  int		first_valuator,

-                  int		num_valuators,

-                  const int	*valuators)

-{

-    ValuatorMask mask;

-

-    XI_VERIFY_VALUATORS(num_valuators);

-

-    valuator_mask_set_range(&mask, first_valuator, num_valuators, valuators);

-    xf86PostKeyEventM(device, key_code, is_down, is_absolute, &mask);

-}

-

-void

-xf86PostKeyEventM(DeviceIntPtr	device,

-                  unsigned int	key_code,

-                  int		is_down,

-                  int		is_absolute,

-                  const ValuatorMask *mask)

-{

-    int i = 0, nevents = 0;

-

-    if (is_absolute) {

-        nevents = GetKeyboardValuatorEvents(xf86Events, device,

-                                            is_down ? KeyPress : KeyRelease,

-                                            key_code, mask);

-    }

-    else {

-        nevents = GetKeyboardEvents(xf86Events, device,

-                                    is_down ? KeyPress : KeyRelease,

-                                    key_code);

-    }

-

-    for (i = 0; i < nevents; i++)

-        mieqEnqueue(device, (InternalEvent*)((xf86Events + i)->event));

-}

-

-void

-xf86PostKeyboardEvent(DeviceIntPtr      device,

-                      unsigned int      key_code,

-                      int               is_down)

-{

-    ValuatorMask mask;

-

-    valuator_mask_zero(&mask);

-    xf86PostKeyEventM(device, key_code, is_down, 0, &mask);

-}

-

-InputInfoPtr

-xf86FirstLocalDevice(void)

-{

-    return xf86InputDevs;

-}

-

-/* 

- * Cx     - raw data from touch screen

- * to_max - scaled highest dimension

- *          (remember, this is of rows - 1 because of 0 origin)

- * to_min  - scaled lowest dimension

- * from_max - highest raw value from touch screen calibration

- * from_min  - lowest raw value from touch screen calibration

- *

- * This function is the same for X or Y coordinates.

- * You may have to reverse the high and low values to compensate for

- * different orgins on the touch screen vs X.

- *

- * e.g. to scale from device coordinates into screen coordinates, call

- * xf86ScaleAxis(x, 0, screen_width, dev_min, dev_max);

- */

-

-int

-xf86ScaleAxis(int	Cx,

-              int	to_max,

-              int	to_min,

-              int	from_max,

-              int	from_min )

-{

-    int X;

-    int64_t to_width = to_max - to_min;

-    int64_t from_width = from_max - from_min;

-

-    if (from_width) {

-	X = (int)(((to_width * (Cx - from_min)) / from_width) + to_min);

-    }

-    else {

-	X = 0;

-	ErrorF ("Divide by Zero in xf86ScaleAxis\n");

-    }

-    

-    if (X > to_max)

-	X = to_max;

-    if (X < to_min)

-	X = to_min;

-    

-    return X;

-}

-

-/*

- * This function checks the given screen against the current screen and

- * makes changes if appropriate. It should be called from an XInput driver's

- * ReadInput function before any events are posted, if the device is screen

- * specific like a touch screen.

- */

-void

-xf86XInputSetScreen(InputInfoPtr	pInfo,

-		    int			screen_number,

-		    int			x,

-		    int			y)

-{

-    if (miPointerGetScreen(pInfo->dev) !=

-          screenInfo.screens[screen_number]) {

-	miPointerSetScreen(pInfo->dev, screen_number, x, y);

-    }

-}

-

-

-void

-xf86InitValuatorAxisStruct(DeviceIntPtr dev, int axnum, Atom label, int minval, int maxval,

-			   int resolution, int min_res, int max_res, int mode)

-{

-    if (!dev || !dev->valuator)

-        return;

-

-    InitValuatorAxisStruct(dev, axnum, label, minval, maxval, resolution, min_res,

-			   max_res, mode);

-}

-

-/*

- * Set the valuator values to be in synch with dix/event.c

- * DefineInitialRootWindow().

- */

-void

-xf86InitValuatorDefaults(DeviceIntPtr dev, int axnum)

-{

-    if (axnum == 0) {

-	dev->valuator->axisVal[0] = screenInfo.screens[0]->width / 2;

-        dev->last.valuators[0] = dev->valuator->axisVal[0];

-    }

-    else if (axnum == 1) {

-	dev->valuator->axisVal[1] = screenInfo.screens[0]->height / 2;

-        dev->last.valuators[1] = dev->valuator->axisVal[1];

-    }

-}

-

-

-/**

- * Deactivate a device. Call this function from the driver if you receive a

- * read error or something else that spoils your day.

- * Device will be moved to the off_devices list, but it will still be there

- * until you really clean up after it.

- * Notifies the client about an inactive device.

- * 

- * @param panic True if device is unrecoverable and needs to be removed.

- */

-void

-xf86DisableDevice(DeviceIntPtr dev, Bool panic)

-{

-    if(!panic)

-    {

-        DisableDevice(dev, TRUE);

-    } else

-    {

-        SendDevicePresenceEvent(dev->id, DeviceUnrecoverable);

-        DeleteInputDeviceRequest(dev);

-    }

-}

-

-/**

- * Reactivate a device. Call this function from the driver if you just found

- * out that the read error wasn't quite that bad after all.

- * Device will be re-activated, and an event sent to the client. 

- */

-void

-xf86EnableDevice(DeviceIntPtr dev)

-{

-    EnableDevice(dev, TRUE);

-}

-

-/* end of xf86Xinput.c */

+/*
+ * Copyright 1995-1999 by Frederic Lepied, France. <Lepied@XFree86.org>
+ *                                                                            
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is  hereby granted without fee, provided that
+ * the  above copyright   notice appear  in   all  copies and  that both  that
+ * copyright  notice   and   this  permission   notice  appear  in  supporting
+ * documentation, and that   the  name of  Frederic   Lepied not  be  used  in
+ * advertising or publicity pertaining to distribution of the software without
+ * specific,  written      prior  permission.     Frederic  Lepied   makes  no
+ * representations about the suitability of this software for any purpose.  It
+ * is provided "as is" without express or implied warranty.                   
+ *                                                                            
+ * FREDERIC  LEPIED DISCLAIMS ALL   WARRANTIES WITH REGARD  TO  THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED   WARRANTIES OF MERCHANTABILITY  AND   FITNESS, IN NO
+ * EVENT  SHALL FREDERIC  LEPIED BE   LIABLE   FOR ANY  SPECIAL, INDIRECT   OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA  OR PROFITS, WHETHER  IN  AN ACTION OF  CONTRACT,  NEGLIGENCE OR OTHER
+ * TORTIOUS  ACTION, ARISING    OUT OF OR   IN  CONNECTION  WITH THE USE    OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ *
+ */
+/*
+ * Copyright (c) 2000-2002 by The XFree86 Project, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Except as contained in this notice, the name of the copyright holder(s)
+ * and author(s) shall not be used in advertising or otherwise to promote
+ * the sale, use or other dealings in this Software without prior written
+ * authorization from the copyright holder(s) and author(s).
+ */
+
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
+#include <X11/Xfuncproto.h>
+#include <X11/Xmd.h>
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XIproto.h>
+#include <X11/Xatom.h>
+#include "xf86.h"
+#include "xf86Priv.h"
+#include "xf86Config.h"
+#include "xf86Xinput.h"
+#include "xf86Optrec.h"
+#include "mipointer.h"
+#include "extinit.h"
+#include "loaderProcs.h"
+
+#include "exevents.h"	/* AddInputDevice */
+#include "exglobals.h"
+#include "eventstr.h"
+#include "inpututils.h"
+
+#include <string.h>     /* InputClassMatches */
+#ifdef HAVE_FNMATCH_H
+#include <fnmatch.h>
+#endif
+#ifdef HAVE_SYS_UTSNAME_H
+#include <sys/utsname.h>
+#endif
+
+#include <stdarg.h>
+#include <stdint.h>          /* for int64_t */
+
+#include "mi.h"
+
+#include <ptrveloc.h>          /* dix pointer acceleration */
+#include <xserver-properties.h>
+
+#ifdef XFreeXDGA
+#include "dgaproc.h"
+#endif
+
+#include "xkbsrv.h"
+
+/* Valuator verification macro */
+#define XI_VERIFY_VALUATORS(num_valuators)					\
+	if (num_valuators > MAX_VALUATORS) {					\
+		xf86Msg(X_ERROR, "%s: num_valuator %d is greater than"		\
+			" MAX_VALUATORS\n", __FUNCTION__, num_valuators);	\
+		return;								\
+	}
+
+EventListPtr xf86Events = NULL;
+
+static int
+xf86InputDevicePostInit(DeviceIntPtr dev);
+
+/**
+ * Eval config and modify DeviceVelocityRec accordingly
+ */
+static void
+ProcessVelocityConfiguration(DeviceIntPtr pDev, char* devname, pointer list,
+                             DeviceVelocityPtr s)
+{
+    int tempi;
+    float tempf;
+    Atom float_prop = XIGetKnownProperty(XATOM_FLOAT);
+    Atom prop;
+
+    if(!s)
+        return;
+
+    /* common settings (available via device properties) */
+    tempf = xf86SetRealOption(list, "ConstantDeceleration", 1.0);
+    if (tempf > 1.0) {
+        xf86Msg(X_CONFIG, "%s: (accel) constant deceleration by %.1f\n",
+                devname, tempf);
+        prop = XIGetKnownProperty(ACCEL_PROP_CONSTANT_DECELERATION);
+        XIChangeDeviceProperty(pDev, prop, float_prop, 32,
+                               PropModeReplace, 1, &tempf, FALSE);
+    }
+
+    tempf = xf86SetRealOption(list, "AdaptiveDeceleration", 1.0);
+    if (tempf > 1.0) {
+        xf86Msg(X_CONFIG, "%s: (accel) adaptive deceleration by %.1f\n",
+                devname, tempf);
+        prop = XIGetKnownProperty(ACCEL_PROP_ADAPTIVE_DECELERATION);
+        XIChangeDeviceProperty(pDev, prop, float_prop, 32,
+                               PropModeReplace, 1, &tempf, FALSE);
+    }
+
+    /* select profile by number */
+    tempi = xf86SetIntOption(list, "AccelerationProfile",
+            s->statistics.profile_number);
+
+    prop = XIGetKnownProperty(ACCEL_PROP_PROFILE_NUMBER);
+    if (XIChangeDeviceProperty(pDev, prop, XA_INTEGER, 32,
+                               PropModeReplace, 1, &tempi, FALSE) == Success) {
+        xf86Msg(X_CONFIG, "%s: (accel) acceleration profile %i\n", devname,
+                tempi);
+    } else {
+        xf86Msg(X_CONFIG, "%s: (accel) acceleration profile %i is unknown\n",
+                devname, tempi);
+    }
+
+    /* set scaling */
+    tempf = xf86SetRealOption(list, "ExpectedRate", 0);
+    prop = XIGetKnownProperty(ACCEL_PROP_VELOCITY_SCALING);
+    if (tempf > 0) {
+        tempf = 1000.0 / tempf;
+        XIChangeDeviceProperty(pDev, prop, float_prop, 32,
+                               PropModeReplace, 1, &tempf, FALSE);
+    } else {
+        tempf = xf86SetRealOption(list, "VelocityScale", s->corr_mul);
+        XIChangeDeviceProperty(pDev, prop, float_prop, 32,
+                               PropModeReplace, 1, &tempf, FALSE);
+    }
+
+    tempi = xf86SetIntOption(list, "VelocityTrackerCount", -1);
+    if (tempi > 1)
+	InitTrackers(s, tempi);
+
+    s->initial_range = xf86SetIntOption(list, "VelocityInitialRange",
+                                        s->initial_range);
+
+    s->max_diff = xf86SetRealOption(list, "VelocityAbsDiff", s->max_diff);
+
+    tempf = xf86SetRealOption(list, "VelocityRelDiff", -1);
+    if (tempf >= 0) {
+	xf86Msg(X_CONFIG, "%s: (accel) max rel. velocity difference: %.1f%%\n",
+	        devname, tempf*100.0);
+	s->max_rel_diff = tempf;
+    }
+
+    /*  Configure softening. If const deceleration is used, this is expected
+     *  to provide better subpixel information so we enable
+     *  softening by default only if ConstantDeceleration is not used
+     */
+    s->use_softening = xf86SetBoolOption(list, "Softening",
+                                         s->const_acceleration == 1.0);
+
+    s->average_accel = xf86SetBoolOption(list, "AccelerationProfileAveraging",
+                                         s->average_accel);
+
+    s->reset_time = xf86SetIntOption(list, "VelocityReset", s->reset_time);
+}
+
+static void
+ApplyAccelerationSettings(DeviceIntPtr dev){
+    int scheme, i;
+    DeviceVelocityPtr pVel;
+    InputInfoPtr pInfo = (InputInfoPtr)dev->public.devicePrivate;
+    char* schemeStr;
+
+    if (dev->valuator && dev->ptrfeed) {
+	schemeStr = xf86SetStrOption(pInfo->options, "AccelerationScheme", "");
+
+	scheme = dev->valuator->accelScheme.number;
+
+	if (!xf86NameCmp(schemeStr, "predictable"))
+	    scheme = PtrAccelPredictable;
+
+	if (!xf86NameCmp(schemeStr, "lightweight"))
+	    scheme = PtrAccelLightweight;
+
+	if (!xf86NameCmp(schemeStr, "none"))
+	    scheme = PtrAccelNoOp;
+
+        /* reinit scheme if needed */
+        if (dev->valuator->accelScheme.number != scheme) {
+            if (dev->valuator->accelScheme.AccelCleanupProc) {
+                dev->valuator->accelScheme.AccelCleanupProc(dev);
+            }
+
+            if (InitPointerAccelerationScheme(dev, scheme)) {
+		xf86Msg(X_CONFIG, "%s: (accel) selected scheme %s/%i\n",
+		        pInfo->name, schemeStr, scheme);
+	    } else {
+        	xf86Msg(X_CONFIG, "%s: (accel) could not init scheme %s\n",
+		        pInfo->name, schemeStr);
+        	scheme = dev->valuator->accelScheme.number;
+            }
+        } else {
+            xf86Msg(X_CONFIG, "%s: (accel) keeping acceleration scheme %i\n",
+                    pInfo->name, scheme);
+        }
+
+        free(schemeStr);
+
+        /* process special configuration */
+        switch (scheme) {
+            case PtrAccelPredictable:
+                pVel = GetDevicePredictableAccelData(dev);
+                ProcessVelocityConfiguration (dev, pInfo->name, pInfo->options,
+                                              pVel);
+                break;
+        }
+
+        i = xf86SetIntOption(pInfo->options, "AccelerationNumerator",
+                             dev->ptrfeed->ctrl.num);
+        if (i >= 0)
+            dev->ptrfeed->ctrl.num = i;
+
+        i = xf86SetIntOption(pInfo->options, "AccelerationDenominator",
+                             dev->ptrfeed->ctrl.den);
+        if (i > 0)
+            dev->ptrfeed->ctrl.den = i;
+
+        i = xf86SetIntOption(pInfo->options, "AccelerationThreshold",
+                             dev->ptrfeed->ctrl.threshold);
+        if (i >= 0)
+            dev->ptrfeed->ctrl.threshold = i;
+
+        xf86Msg(X_CONFIG, "%s: (accel) acceleration factor: %.3f\n",
+                            pInfo->name, ((float)dev->ptrfeed->ctrl.num)/
+                                         ((float)dev->ptrfeed->ctrl.den));
+        xf86Msg(X_CONFIG, "%s: (accel) acceleration threshold: %i\n",
+                pInfo->name, dev->ptrfeed->ctrl.threshold);
+    }
+}
+
+/***********************************************************************
+ *
+ * xf86ProcessCommonOptions --
+ * 
+ *	Process global options.
+ *
+ ***********************************************************************
+ */
+void
+xf86ProcessCommonOptions(InputInfoPtr pInfo,
+                         pointer	list)
+{
+    if (xf86SetBoolOption(list, "Floating", 0) ||
+        !xf86SetBoolOption(list, "AlwaysCore", 1) ||
+        !xf86SetBoolOption(list, "SendCoreEvents", 1) ||
+        !xf86SetBoolOption(list, "CorePointer", 1) ||
+        !xf86SetBoolOption(list, "CoreKeyboard", 1)) {
+        xf86Msg(X_CONFIG, "%s: doesn't report core events\n", pInfo->name);
+    } else {
+        pInfo->flags |= XI86_ALWAYS_CORE;
+        xf86Msg(X_CONFIG, "%s: always reports core events\n", pInfo->name);
+    }
+}
+
+/***********************************************************************
+ *
+ * xf86ActivateDevice --
+ *
+ *	Initialize an input device.
+ *
+ * Returns TRUE on success, or FALSE otherwise.
+ ***********************************************************************
+ */
+static DeviceIntPtr
+xf86ActivateDevice(InputInfoPtr pInfo)
+{
+    DeviceIntPtr	dev;
+    Atom		atom;
+
+    dev = AddInputDevice(serverClient, pInfo->device_control, TRUE);
+
+    if (dev == NULL)
+    {
+        xf86Msg(X_ERROR, "Too many input devices. Ignoring %s\n",
+                pInfo->name);
+        pInfo->dev = NULL;
+        return NULL;
+    }
+
+    atom = MakeAtom(pInfo->type_name, strlen(pInfo->type_name), TRUE);
+    AssignTypeAndName(dev, atom, pInfo->name);
+    dev->public.devicePrivate = pInfo;
+    pInfo->dev = dev;
+
+    dev->coreEvents = pInfo->flags & XI86_ALWAYS_CORE;
+    dev->type = SLAVE;
+    dev->spriteInfo->spriteOwner = FALSE;
+
+    dev->config_info = xf86SetStrOption(pInfo->options, "config_info", NULL);
+
+    if (serverGeneration == 1)
+        xf86Msg(X_INFO, "XINPUT: Adding extended input device \"%s\" (type: %s)\n",
+                pInfo->name, pInfo->type_name);
+
+    return dev;
+}
+
+/****************************************************************************
+ *
+ * Caller:	ProcXSetDeviceMode
+ *
+ * Change the mode of an extension device.
+ * This function is used to change the mode of a device from reporting
+ * relative motion to reporting absolute positional information, and
+ * vice versa.
+ * The default implementation below is that no such devices are supported.
+ *
+ ***********************************************************************
+ */
+
+int
+SetDeviceMode (ClientPtr client, DeviceIntPtr dev, int mode)
+{
+  InputInfoPtr        pInfo = (InputInfoPtr)dev->public.devicePrivate;
+
+  if (pInfo->switch_mode) {
+    return (*pInfo->switch_mode)(client, dev, mode);
+  }
+  else
+    return BadMatch;
+}
+
+
+/***********************************************************************
+ *
+ * Caller:	ProcXSetDeviceValuators
+ *
+ * Set the value of valuators on an extension input device.
+ * This function is used to set the initial value of valuators on
+ * those input devices that are capable of reporting either relative
+ * motion or an absolute position, and allow an initial position to be set.
+ * The default implementation below is that no such devices are supported.
+ *
+ ***********************************************************************
+ */
+
+int
+SetDeviceValuators (ClientPtr client, DeviceIntPtr dev, int *valuators,
+                    int first_valuator, int num_valuators)
+{
+    InputInfoPtr pInfo = (InputInfoPtr) dev->public.devicePrivate;
+
+    if (pInfo->set_device_valuators)
+	return (*pInfo->set_device_valuators)(pInfo, valuators, first_valuator,
+					      num_valuators);
+
+    return BadMatch;
+}
+
+
+/***********************************************************************
+ *
+ * Caller:	ProcXChangeDeviceControl
+ *
+ * Change the specified device controls on an extension input device.
+ *
+ ***********************************************************************
+ */
+
+int
+ChangeDeviceControl (ClientPtr client, DeviceIntPtr dev, xDeviceCtl *control)
+{
+  InputInfoPtr        pInfo = (InputInfoPtr)dev->public.devicePrivate;
+
+  if (!pInfo->control_proc) {
+      switch (control->control) {
+      case DEVICE_CORE:
+          return BadMatch;
+      case DEVICE_RESOLUTION:
+      case DEVICE_ABS_CALIB:
+      case DEVICE_ABS_AREA:
+      case DEVICE_ENABLE:
+        return Success;
+      default:
+        return BadMatch;
+      }
+  }
+  else {
+      return (*pInfo->control_proc)(pInfo, control);
+  }
+}
+
+/*
+ * Get the operating system name from uname and store it statically to avoid
+ * repeating the system call each time MatchOS is checked.
+ */
+static const char *
+HostOS(void)
+{
+#ifdef HAVE_SYS_UTSNAME_H
+    struct utsname name;
+    static char host_os[sizeof(name.sysname)] = "";
+
+    if (*host_os == '\0') {
+        if (uname(&name) >= 0)
+            strcpy(host_os, name.sysname);
+        else {
+            strncpy(host_os, "unknown", sizeof(host_os));
+            host_os[sizeof(host_os)-1] = '\0';
+        }
+    }
+    return host_os;
+#else
+    return "";
+#endif
+}
+
+static int
+match_substring(const char *attr, const char *pattern)
+{
+    return (strstr(attr, pattern)) ? 0 : -1;
+}
+
+#ifdef HAVE_FNMATCH_H
+static int
+match_pattern(const char *attr, const char *pattern)
+{
+    return fnmatch(pattern, attr, 0);
+}
+#else
+#define match_pattern match_substring
+#endif
+
+#ifdef HAVE_FNMATCH_H
+static int
+match_path_pattern(const char *attr, const char *pattern)
+{
+    return fnmatch(pattern, attr, FNM_PATHNAME);
+}
+#else
+#define match_path_pattern match_substring
+#endif
+
+/*
+ * Match an attribute against a list of NULL terminated arrays of patterns.
+ * If a pattern in each list entry is matched, return TRUE.
+ */
+static Bool
+MatchAttrToken(const char *attr, struct list *patterns,
+               int (*compare)(const char *attr, const char *pattern))
+{
+    const xf86MatchGroup *group;
+
+    /* If there are no patterns, accept the match */
+    if (list_is_empty(patterns))
+        return TRUE;
+
+    /* If there are patterns but no attribute, reject the match */
+    if (!attr)
+        return FALSE;
+
+    /*
+     * Otherwise, iterate the list of patterns ensuring each entry has a
+     * match. Each list entry is a separate Match line of the same type.
+     */
+    list_for_each_entry(group, patterns, entry) {
+        char * const *cur;
+        Bool match = FALSE;
+
+        for (cur = group->values; *cur; cur++)
+            if ((*compare)(attr, *cur) == 0) {
+                match = TRUE;
+                break;
+            }
+        if (!match)
+            return FALSE;
+    }
+
+    /* All the entries in the list matched the attribute */
+    return TRUE;
+}
+
+/*
+ * Classes without any Match statements match all devices. Otherwise, all
+ * statements must match.
+ */
+static Bool
+InputClassMatches(const XF86ConfInputClassPtr iclass, const InputInfoPtr idev,
+                  const InputAttributes *attrs)
+{
+    /* MatchProduct substring */
+    if (!MatchAttrToken(attrs->product, &iclass->match_product, match_substring))
+        return FALSE;
+
+    /* MatchVendor substring */
+    if (!MatchAttrToken(attrs->vendor, &iclass->match_vendor, match_substring))
+        return FALSE;
+
+    /* MatchDevicePath pattern */
+    if (!MatchAttrToken(attrs->device, &iclass->match_device, match_path_pattern))
+        return FALSE;
+
+    /* MatchOS case-insensitive string */
+    if (!MatchAttrToken(HostOS(), &iclass->match_os, strcasecmp))
+        return FALSE;
+
+    /* MatchPnPID pattern */
+    if (!MatchAttrToken(attrs->pnp_id, &iclass->match_pnpid, match_pattern))
+        return FALSE;
+
+    /* MatchUSBID pattern */
+    if (!MatchAttrToken(attrs->usb_id, &iclass->match_usbid, match_pattern))
+        return FALSE;
+
+    /* MatchDriver string */
+    if (!MatchAttrToken(idev->driver, &iclass->match_driver, strcmp))
+        return FALSE;
+
+    /*
+     * MatchTag string
+     * See if any of the device's tags match any of the MatchTag tokens.
+     */
+    if (!list_is_empty(&iclass->match_tag)) {
+        char * const *tag;
+        Bool match;
+
+        if (!attrs->tags)
+            return FALSE;
+        for (tag = attrs->tags, match = FALSE; *tag; tag++) {
+            if (MatchAttrToken(*tag, &iclass->match_tag, strcmp)) {
+                match = TRUE;
+                break;
+            }
+        }
+        if (!match)
+            return FALSE;
+    }
+
+    /* MatchIs* booleans */
+    if (iclass->is_keyboard.set &&
+        iclass->is_keyboard.val != !!(attrs->flags & ATTR_KEYBOARD))
+        return FALSE;
+    if (iclass->is_pointer.set &&
+        iclass->is_pointer.val != !!(attrs->flags & ATTR_POINTER))
+        return FALSE;
+    if (iclass->is_joystick.set &&
+        iclass->is_joystick.val != !!(attrs->flags & ATTR_JOYSTICK))
+        return FALSE;
+    if (iclass->is_tablet.set &&
+        iclass->is_tablet.val != !!(attrs->flags & ATTR_TABLET))
+        return FALSE;
+    if (iclass->is_touchpad.set &&
+        iclass->is_touchpad.val != !!(attrs->flags & ATTR_TOUCHPAD))
+        return FALSE;
+    if (iclass->is_touchscreen.set &&
+        iclass->is_touchscreen.val != !!(attrs->flags & ATTR_TOUCHSCREEN))
+        return FALSE;
+
+    return TRUE;
+}
+
+/*
+ * Merge in any InputClass configurations. Options in each InputClass
+ * section have more priority than the original device configuration as
+ * well as any previous InputClass sections.
+ */
+static int
+MergeInputClasses(const InputInfoPtr idev, const InputAttributes *attrs)
+{
+    XF86ConfInputClassPtr cl;
+    XF86OptionPtr classopts;
+
+    for (cl = xf86configptr->conf_inputclass_lst; cl; cl = cl->list.next) {
+        if (!InputClassMatches(cl, idev, attrs))
+            continue;
+
+        /* Collect class options and driver settings */
+        classopts = xf86optionListDup(cl->option_lst);
+        if (cl->driver) {
+            free(idev->driver);
+            idev->driver = xstrdup(cl->driver);
+            if (!idev->driver) {
+                xf86Msg(X_ERROR, "Failed to allocate memory while merging "
+                        "InputClass configuration");
+                return BadAlloc;
+            }
+            classopts = xf86ReplaceStrOption(classopts, "driver",
+                                             idev->driver);
+        }
+
+        /* Apply options to device with InputClass settings preferred. */
+        xf86Msg(X_CONFIG, "%s: Applying InputClass \"%s\"\n",
+                idev->name, cl->identifier);
+        idev->options = xf86optionListMerge(idev->options, classopts);
+    }
+
+    return Success;
+}
+
+/*
+ * Iterate the list of classes and look for Option "Ignore". Return the
+ * value of the last matching class and holler when returning TRUE.
+ */
+static Bool
+IgnoreInputClass(const InputInfoPtr idev, const InputAttributes *attrs)
+{
+    XF86ConfInputClassPtr cl;
+    Bool ignore = FALSE;
+    const char *ignore_class;
+
+    for (cl = xf86configptr->conf_inputclass_lst; cl; cl = cl->list.next) {
+        if (!InputClassMatches(cl, idev, attrs))
+            continue;
+        if (xf86findOption(cl->option_lst, "Ignore")) {
+            ignore = xf86CheckBoolOption(cl->option_lst, "Ignore", FALSE);
+            ignore_class = cl->identifier;
+        }
+    }
+
+    if (ignore)
+        xf86Msg(X_CONFIG, "%s: Ignoring device from InputClass \"%s\"\n",
+                idev->name, ignore_class);
+    return ignore;
+}
+
+InputInfoPtr
+xf86AllocateInput(void)
+{
+    InputInfoPtr pInfo;
+
+    pInfo = calloc(sizeof(*pInfo), 1);
+    if (!pInfo)
+        return NULL;
+
+    pInfo->fd = -1;
+    pInfo->type_name = "UNKNOWN";
+
+    return pInfo;
+}
+
+/* Append InputInfoRec to the tail of xf86InputDevs. */
+static void
+xf86AddInput(InputDriverPtr drv, InputInfoPtr pInfo)
+{
+    InputInfoPtr *prev = NULL;
+
+    pInfo->drv = drv;
+    pInfo->module = DuplicateModule(drv->module, NULL);
+
+    for (prev = &xf86InputDevs; *prev; prev = &(*prev)->next)
+        ;
+
+    *prev = pInfo;
+    pInfo->next = NULL;
+
+    xf86CollectInputOptions(pInfo, (const char**)drv->default_options);
+    xf86OptionListReport(pInfo->options);
+    xf86ProcessCommonOptions(pInfo, pInfo->options);
+}
+
+/*
+ * Remove an entry from xf86InputDevs and free all the device's information.
+ */
+void
+xf86DeleteInput(InputInfoPtr pInp, int flags)
+{
+    /* First check if the inputdev is valid. */
+    if (pInp == NULL)
+	return;
+
+    if (pInp->module)
+	UnloadModule(pInp->module);
+
+    /* This should *really* be handled in drv->UnInit(dev) call instead, but
+     * if the driver forgets about it make sure we free it or at least crash
+     * with flying colors */
+    free(pInp->private);
+
+    FreeInputAttributes(pInp->attrs);
+
+    /* Remove the entry from the list. */
+    if (pInp == xf86InputDevs)
+	xf86InputDevs = pInp->next;
+    else {
+	InputInfoPtr p = xf86InputDevs;
+	while (p && p->next != pInp)
+	    p = p->next;
+	if (p)
+	    p->next = pInp->next;
+	/* Else the entry wasn't in the xf86InputDevs list (ignore this). */
+    }
+
+    free(pInp->driver);
+    free(pInp->name);
+    xf86optionListFree(pInp->options);
+    free(pInp);
+}
+
+/*
+ * Apply backend-specific initialization. Invoked after ActiveteDevice(),
+ * i.e. after the driver successfully completed DEVICE_INIT and the device
+ * is advertised.
+ * @param dev the device
+ * @return Success or an error code
+ */
+static int
+xf86InputDevicePostInit(DeviceIntPtr dev) {
+    ApplyAccelerationSettings(dev);
+    return Success;
+}
+
+/**
+ * Create a new input device, activate and enable it.
+ *
+ * Possible return codes:
+ *    BadName .. a bad driver name was supplied.
+ *    BadImplementation ... The driver does not have a PreInit function. This
+ *                          is a driver bug.
+ *    BadMatch .. device initialization failed.
+ *    BadAlloc .. too many input devices
+ *
+ * @param idev The device, already set up with identifier, driver, and the
+ * options.
+ * @param pdev Pointer to the new device, if Success was reported.
+ * @param enable Enable the device after activating it.
+ *
+ * @return Success or an error code
+ */
+_X_INTERNAL int
+xf86NewInputDevice(InputInfoPtr pInfo, DeviceIntPtr *pdev, BOOL enable)
+{
+    InputDriverPtr drv = NULL;
+    DeviceIntPtr dev = NULL;
+    int rval;
+
+    /* Memory leak for every attached device if we don't
+     * test if the module is already loaded first */
+    drv = xf86LookupInputDriver(pInfo->driver);
+    if (!drv)
+        if (xf86LoadOneModule(pInfo->driver, NULL))
+            drv = xf86LookupInputDriver(pInfo->driver);
+    if (!drv) {
+        xf86Msg(X_ERROR, "No input driver matching `%s'\n", pInfo->driver);
+        rval = BadName;
+        goto unwind;
+    }
+
+    if (!drv->PreInit) {
+        xf86Msg(X_ERROR,
+                "Input driver `%s' has no PreInit function (ignoring)\n",
+                drv->driverName);
+        rval = BadImplementation;
+        goto unwind;
+    }
+
+    xf86AddInput(drv, pInfo);
+
+    rval = drv->PreInit(drv, pInfo, 0);
+
+    if (rval != Success) {
+        xf86Msg(X_ERROR, "PreInit returned %d for \"%s\"\n", rval, pInfo->name);
+        goto unwind;
+    }
+
+    if (!(dev = xf86ActivateDevice(pInfo)))
+    {
+        rval = BadAlloc;
+        goto unwind;
+    }
+
+    rval = ActivateDevice(dev, TRUE);
+    if (rval != Success)
+    {
+        xf86Msg(X_ERROR, "Couldn't init device \"%s\"\n", pInfo->name);
+        RemoveDevice(dev, TRUE);
+        goto unwind;
+    }
+
+    rval = xf86InputDevicePostInit(dev);
+    if (rval != Success)
+    {
+	xf86Msg(X_ERROR, "Couldn't post-init device \"%s\"\n", pInfo->name);
+	RemoveDevice(dev, TRUE);
+	goto unwind;
+    }
+
+    /* Enable it if it's properly initialised and we're currently in the VT */
+    if (enable && dev->inited && dev->startup && xf86Screens[0]->vtSema)
+    {
+        EnableDevice(dev, TRUE);
+        if (!dev->enabled)
+        {
+            xf86Msg(X_ERROR, "Couldn't init device \"%s\"\n", pInfo->name);
+            rval = BadMatch;
+            goto unwind;
+        }
+        /* send enter/leave event, update sprite window */
+        CheckMotion(NULL, dev);
+    }
+
+    *pdev = dev;
+    return Success;
+
+unwind:
+    if(pInfo) {
+        if(drv && drv->UnInit)
+            drv->UnInit(drv, pInfo, 0);
+        else
+            xf86DeleteInput(pInfo, 0);
+    }
+    return rval;
+}
+
+int
+NewInputDeviceRequest (InputOption *options, InputAttributes *attrs,
+                       DeviceIntPtr *pdev)
+{
+    InputInfoPtr pInfo = NULL;
+    InputOption *option = NULL;
+    int rval = Success;
+    int is_auto = 0;
+
+    pInfo = xf86AllocateInput();
+    if (!pInfo)
+        return BadAlloc;
+
+    for (option = options; option; option = option->next) {
+        if (strcasecmp(option->key, "driver") == 0) {
+            if (pInfo->driver) {
+                rval = BadRequest;
+                goto unwind;
+            }
+            pInfo->driver = xstrdup(option->value);
+            if (!pInfo->driver) {
+                rval = BadAlloc;
+                goto unwind;
+            }
+        }
+
+        if (strcasecmp(option->key, "name") == 0 ||
+            strcasecmp(option->key, "identifier") == 0) {
+            if (pInfo->name) {
+                rval = BadRequest;
+                goto unwind;
+            }
+            pInfo->name = xstrdup(option->value);
+            if (!pInfo->name) {
+                rval = BadAlloc;
+                goto unwind;
+            }
+        }
+
+        if (strcmp(option->key, "_source") == 0 &&
+            (strcmp(option->value, "server/hal") == 0 ||
+             strcmp(option->value, "server/udev") == 0)) {
+            is_auto = 1;
+            if (!xf86Info.autoAddDevices) {
+                rval = BadMatch;
+                goto unwind;
+            }
+        }
+    }
+
+    for (option = options; option; option = option->next) {
+        /* Steal option key/value strings from the provided list.
+         * We need those strings, the InputOption list doesn't. */
+        pInfo->options = xf86addNewOption(pInfo->options,
+                                               option->key, option->value);
+        option->key = NULL;
+        option->value = NULL;
+    }
+
+    /* Apply InputClass settings */
+    if (attrs) {
+        if (IgnoreInputClass(pInfo, attrs)) {
+            rval = BadIDChoice;
+            goto unwind;
+        }
+
+        rval = MergeInputClasses(pInfo, attrs);
+        if (rval != Success)
+            goto unwind;
+
+        pInfo->attrs = DuplicateInputAttributes(attrs);
+    }
+
+    if (!pInfo->driver || !pInfo->name) {
+        xf86Msg(X_INFO, "No input driver/identifier specified (ignoring)\n");
+        rval = BadRequest;
+        goto unwind;
+    }
+
+    if (!pInfo->name) {
+        xf86Msg(X_ERROR, "No device identifier specified (ignoring)\n");
+        rval = BadMatch;
+        goto unwind;
+    }
+
+    rval = xf86NewInputDevice(pInfo, pdev,
+                (!is_auto || (is_auto && xf86Info.autoEnableDevices)));
+
+    return rval;
+
+unwind:
+    if (is_auto && !xf86Info.autoAddDevices)
+        xf86Msg(X_INFO, "AutoAddDevices is off - not adding device.\n");
+    xf86DeleteInput(pInfo, 0);
+    return rval;
+}
+
+void
+DeleteInputDeviceRequest(DeviceIntPtr pDev)
+{
+    InputInfoPtr pInfo = (InputInfoPtr) pDev->public.devicePrivate;
+    InputDriverPtr drv = NULL;
+    Bool isMaster = IsMaster(pDev);
+
+    if (pInfo) /* need to get these before RemoveDevice */
+        drv = pInfo->drv;
+
+    OsBlockSignals();
+    RemoveDevice(pDev, TRUE);
+
+    if (!isMaster && pInfo != NULL)
+    {
+        if(drv->UnInit)
+            drv->UnInit(drv, pInfo, 0);
+        else
+            xf86DeleteInput(pInfo, 0);
+    }
+    OsReleaseSignals();
+}
+
+/* 
+ * convenient functions to post events
+ */
+
+void
+xf86PostMotionEvent(DeviceIntPtr	device,
+                    int			is_absolute,
+                    int			first_valuator,
+                    int			num_valuators,
+                    ...)
+{
+    va_list var;
+    int i = 0;
+    ValuatorMask mask;
+
+    XI_VERIFY_VALUATORS(num_valuators);
+
+    valuator_mask_zero(&mask);
+    va_start(var, num_valuators);
+    for (i = 0; i < num_valuators; i++)
+        valuator_mask_set(&mask, first_valuator + i, va_arg(var, int));
+    va_end(var);
+
+    xf86PostMotionEventM(device, is_absolute, &mask);
+}
+
+void
+xf86PostMotionEventP(DeviceIntPtr	device,
+                    int			is_absolute,
+                    int			first_valuator,
+                    int			num_valuators,
+                    const int		*valuators)
+{
+    ValuatorMask mask;
+
+    XI_VERIFY_VALUATORS(num_valuators);
+
+    valuator_mask_set_range(&mask, first_valuator, num_valuators, valuators);
+    xf86PostMotionEventM(device, is_absolute, &mask);
+}
+
+void
+xf86PostMotionEventM(DeviceIntPtr	device,
+                     int		is_absolute,
+                     const ValuatorMask	*mask)
+{
+    int i = 0, nevents = 0;
+    DeviceEvent *event;
+    int flags = 0;
+
+#if XFreeXDGA
+    int index;
+    int dx = 0, dy = 0;
+#endif
+
+    if (valuator_mask_num_valuators(mask) > 0)
+    {
+        if (is_absolute)
+            flags = POINTER_ABSOLUTE;
+        else
+            flags = POINTER_RELATIVE | POINTER_ACCELERATE;
+    }
+
+#if XFreeXDGA
+    /* The evdev driver may not always send all axes across. */
+    if (valuator_mask_isset(mask, 0) ||
+        valuator_mask_isset(mask, 1))
+        if (miPointerGetScreen(device)) {
+            index = miPointerGetScreen(device)->myNum;
+            if (valuator_mask_isset(mask, 0))
+            {
+                dx = valuator_mask_get(mask, 0);
+                if (is_absolute)
+                    dx -= device->last.valuators[0];
+            }
+
+            if (valuator_mask_isset(mask, 1))
+            {
+                dy = valuator_mask_get(mask, 1);
+                if (is_absolute)
+                    dy -= device->last.valuators[1];
+            }
+
+            if (DGAStealMotionEvent(device, index, dx, dy))
+                return;
+        }
+#endif
+
+    nevents = GetPointerEvents(xf86Events, device, MotionNotify, 0, flags, mask);
+
+    for (i = 0; i < nevents; i++) {
+        event = (DeviceEvent*)((xf86Events + i)->event);
+        mieqEnqueue(device, (InternalEvent*)((xf86Events + i)->event));
+    }
+}
+
+void
+xf86PostProximityEvent(DeviceIntPtr	device,
+                       int		is_in,
+                       int		first_valuator,
+                       int		num_valuators,
+                       ...)
+{
+    va_list var;
+    int i;
+    ValuatorMask mask;
+
+    XI_VERIFY_VALUATORS(num_valuators);
+
+    valuator_mask_zero(&mask);
+    va_start(var, num_valuators);
+    for (i = 0; i < num_valuators; i++)
+        valuator_mask_set(&mask, first_valuator + i, va_arg(var, int));
+    va_end(var);
+
+    xf86PostProximityEventM(device, is_in, &mask);
+}
+
+void
+xf86PostProximityEventP(DeviceIntPtr	device,
+                        int		is_in,
+                        int		first_valuator,
+                        int		num_valuators,
+                        const int	*valuators)
+{
+    ValuatorMask mask;
+
+    XI_VERIFY_VALUATORS(num_valuators);
+
+    valuator_mask_set_range(&mask, first_valuator, num_valuators, valuators);
+    xf86PostProximityEventM(device, is_in, &mask);
+}
+
+void
+xf86PostProximityEventM(DeviceIntPtr	device,
+                        int		is_in,
+                        const ValuatorMask *mask)
+{
+    int i, nevents;
+
+    nevents = GetProximityEvents(xf86Events, device,
+                                 is_in ? ProximityIn : ProximityOut, mask);
+    for (i = 0; i < nevents; i++)
+        mieqEnqueue(device, (InternalEvent*)((xf86Events + i)->event));
+
+}
+
+void
+xf86PostButtonEvent(DeviceIntPtr	device,
+                    int			is_absolute,
+                    int			button,
+                    int			is_down,
+                    int			first_valuator,
+                    int			num_valuators,
+                    ...)
+{
+    va_list var;
+    ValuatorMask mask;
+    int i = 0;
+
+    XI_VERIFY_VALUATORS(num_valuators);
+
+    valuator_mask_zero(&mask);
+
+    va_start(var, num_valuators);
+    for (i = 0; i < num_valuators; i++)
+        valuator_mask_set(&mask, first_valuator + i, va_arg(var, int));
+    va_end(var);
+
+    xf86PostButtonEventM(device, is_absolute, button, is_down, &mask);
+}
+
+void
+xf86PostButtonEventP(DeviceIntPtr	device,
+                     int		is_absolute,
+                     int		button,
+                     int		is_down,
+                     int		first_valuator,
+                     int		num_valuators,
+                     const int		*valuators)
+{
+    ValuatorMask mask;
+
+    XI_VERIFY_VALUATORS(num_valuators);
+
+    valuator_mask_set_range(&mask, first_valuator, num_valuators, valuators);
+    xf86PostButtonEventM(device, is_absolute, button, is_down, &mask);
+}
+
+void
+xf86PostButtonEventM(DeviceIntPtr	device,
+                     int		is_absolute,
+                     int		button,
+                     int		is_down,
+                     const ValuatorMask	*mask)
+{
+    int i = 0, nevents = 0;
+    int flags = 0;
+
+#if XFreeXDGA
+    int index;
+#endif
+
+    if (valuator_mask_num_valuators(mask) > 0)
+    {
+        if (is_absolute)
+            flags = POINTER_ABSOLUTE;
+        else
+            flags = POINTER_RELATIVE | POINTER_ACCELERATE;
+    }
+
+#if XFreeXDGA
+    if (miPointerGetScreen(device)) {
+        index = miPointerGetScreen(device)->myNum;
+        if (DGAStealButtonEvent(device, index, button, is_down))
+            return;
+    }
+#endif
+
+    nevents = GetPointerEvents(xf86Events, device,
+                               is_down ? ButtonPress : ButtonRelease, button,
+                               flags, mask);
+
+    for (i = 0; i < nevents; i++)
+        mieqEnqueue(device, (InternalEvent*)((xf86Events + i)->event));
+
+}
+
+void
+xf86PostKeyEvent(DeviceIntPtr	device,
+                 unsigned int	key_code,
+                 int		is_down,
+                 int		is_absolute,
+                 int		first_valuator,
+                 int		num_valuators,
+                 ...)
+{
+    va_list var;
+    int i = 0;
+    ValuatorMask mask;
+
+    XI_VERIFY_VALUATORS(num_valuators);
+
+    valuator_mask_zero(&mask);
+
+    va_start(var, num_valuators);
+    for (i = 0; i < num_valuators; i++)
+        valuator_mask_set(&mask, first_valuator + i, va_arg(var, int));
+    va_end(var);
+
+    xf86PostKeyEventM(device, key_code, is_down, is_absolute, &mask);
+}
+
+void
+xf86PostKeyEventP(DeviceIntPtr	device,
+                  unsigned int	key_code,
+                  int		is_down,
+                  int		is_absolute,
+                  int		first_valuator,
+                  int		num_valuators,
+                  const int	*valuators)
+{
+    ValuatorMask mask;
+
+    XI_VERIFY_VALUATORS(num_valuators);
+
+    valuator_mask_set_range(&mask, first_valuator, num_valuators, valuators);
+    xf86PostKeyEventM(device, key_code, is_down, is_absolute, &mask);
+}
+
+void
+xf86PostKeyEventM(DeviceIntPtr	device,
+                  unsigned int	key_code,
+                  int		is_down,
+                  int		is_absolute,
+                  const ValuatorMask *mask)
+{
+    int i = 0, nevents = 0;
+
+    if (is_absolute) {
+        nevents = GetKeyboardValuatorEvents(xf86Events, device,
+                                            is_down ? KeyPress : KeyRelease,
+                                            key_code, mask);
+    }
+    else {
+        nevents = GetKeyboardEvents(xf86Events, device,
+                                    is_down ? KeyPress : KeyRelease,
+                                    key_code);
+    }
+
+    for (i = 0; i < nevents; i++)
+        mieqEnqueue(device, (InternalEvent*)((xf86Events + i)->event));
+}
+
+void
+xf86PostKeyboardEvent(DeviceIntPtr      device,
+                      unsigned int      key_code,
+                      int               is_down)
+{
+    ValuatorMask mask;
+
+    valuator_mask_zero(&mask);
+    xf86PostKeyEventM(device, key_code, is_down, 0, &mask);
+}
+
+InputInfoPtr
+xf86FirstLocalDevice(void)
+{
+    return xf86InputDevs;
+}
+
+/* 
+ * Cx     - raw data from touch screen
+ * to_max - scaled highest dimension
+ *          (remember, this is of rows - 1 because of 0 origin)
+ * to_min  - scaled lowest dimension
+ * from_max - highest raw value from touch screen calibration
+ * from_min  - lowest raw value from touch screen calibration
+ *
+ * This function is the same for X or Y coordinates.
+ * You may have to reverse the high and low values to compensate for
+ * different orgins on the touch screen vs X.
+ *
+ * e.g. to scale from device coordinates into screen coordinates, call
+ * xf86ScaleAxis(x, 0, screen_width, dev_min, dev_max);
+ */
+
+int
+xf86ScaleAxis(int	Cx,
+              int	to_max,
+              int	to_min,
+              int	from_max,
+              int	from_min )
+{
+    int X;
+    int64_t to_width = to_max - to_min;
+    int64_t from_width = from_max - from_min;
+
+    if (from_width) {
+	X = (int)(((to_width * (Cx - from_min)) / from_width) + to_min);
+    }
+    else {
+	X = 0;
+	ErrorF ("Divide by Zero in xf86ScaleAxis\n");
+    }
+    
+    if (X > to_max)
+	X = to_max;
+    if (X < to_min)
+	X = to_min;
+    
+    return X;
+}
+
+/*
+ * This function checks the given screen against the current screen and
+ * makes changes if appropriate. It should be called from an XInput driver's
+ * ReadInput function before any events are posted, if the device is screen
+ * specific like a touch screen.
+ */
+void
+xf86XInputSetScreen(InputInfoPtr	pInfo,
+		    int			screen_number,
+		    int			x,
+		    int			y)
+{
+    if (miPointerGetScreen(pInfo->dev) !=
+          screenInfo.screens[screen_number]) {
+	miPointerSetScreen(pInfo->dev, screen_number, x, y);
+    }
+}
+
+
+void
+xf86InitValuatorAxisStruct(DeviceIntPtr dev, int axnum, Atom label, int minval, int maxval,
+			   int resolution, int min_res, int max_res, int mode)
+{
+    if (!dev || !dev->valuator)
+        return;
+
+    InitValuatorAxisStruct(dev, axnum, label, minval, maxval, resolution, min_res,
+			   max_res, mode);
+}
+
+/*
+ * Set the valuator values to be in synch with dix/event.c
+ * DefineInitialRootWindow().
+ */
+void
+xf86InitValuatorDefaults(DeviceIntPtr dev, int axnum)
+{
+    if (axnum == 0) {
+	dev->valuator->axisVal[0] = screenInfo.screens[0]->width / 2;
+        dev->last.valuators[0] = dev->valuator->axisVal[0];
+    }
+    else if (axnum == 1) {
+	dev->valuator->axisVal[1] = screenInfo.screens[0]->height / 2;
+        dev->last.valuators[1] = dev->valuator->axisVal[1];
+    }
+}
+
+
+/**
+ * Deactivate a device. Call this function from the driver if you receive a
+ * read error or something else that spoils your day.
+ * Device will be moved to the off_devices list, but it will still be there
+ * until you really clean up after it.
+ * Notifies the client about an inactive device.
+ * 
+ * @param panic True if device is unrecoverable and needs to be removed.
+ */
+void
+xf86DisableDevice(DeviceIntPtr dev, Bool panic)
+{
+    if(!panic)
+    {
+        DisableDevice(dev, TRUE);
+    } else
+    {
+        SendDevicePresenceEvent(dev->id, DeviceUnrecoverable);
+        DeleteInputDeviceRequest(dev);
+    }
+}
+
+/**
+ * Reactivate a device. Call this function from the driver if you just found
+ * out that the read error wasn't quite that bad after all.
+ * Device will be re-activated, and an event sent to the client. 
+ */
+void
+xf86EnableDevice(DeviceIntPtr dev)
+{
+    EnableDevice(dev, TRUE);
+}
+
+/* end of xf86Xinput.c */
diff --git a/xorg-server/hw/xfree86/doc/Makefile.am b/xorg-server/hw/xfree86/doc/Makefile.am
index a8cbc3c6b..80217365d 100644
--- a/xorg-server/hw/xfree86/doc/Makefile.am
+++ b/xorg-server/hw/xfree86/doc/Makefile.am
@@ -1,8 +1,4 @@
-if BUILDDOCS

-SUBDIRS = devel man sgml

-else

-SUBDIRS = man

-endif

-

-EXTRA_DIST = \

-	README.modes

+SUBDIRS = devel man sgml
+
+EXTRA_DIST = \
+	README.modes
diff --git a/xorg-server/hw/xquartz/GL/Makefile.am b/xorg-server/hw/xquartz/GL/Makefile.am
index af890776e..736c94b4a 100644
--- a/xorg-server/hw/xquartz/GL/Makefile.am
+++ b/xorg-server/hw/xquartz/GL/Makefile.am
@@ -1,5 +1,5 @@
 noinst_LTLIBRARIES = libCGLCore.la
-AM_CFLAGS = $(DIX_CFLAGS)
+AM_CFLAGS = $(DIX_CFLAGS) $(GL_CFLAGS)
 AM_CPPFLAGS = \
 	-I$(top_srcdir) \
 	-I$(top_srcdir)/glx \
diff --git a/xorg-server/hw/xquartz/Makefile.am b/xorg-server/hw/xquartz/Makefile.am
index 23bf04c2e..96b1fb0c5 100644
--- a/xorg-server/hw/xquartz/Makefile.am
+++ b/xorg-server/hw/xquartz/Makefile.am
@@ -1,56 +1,54 @@
-noinst_LTLIBRARIES = libXquartz.la

-AM_CFLAGS = $(DIX_CFLAGS)

-AM_OBJCFLAGS = $(DIX_CFLAGS)

-AM_CPPFLAGS = \

-	-DBUILD_DATE=\"$(BUILD_DATE)\" \

-	-DXSERVER_VERSION=\"$(VERSION)\" \

-	-DINXQUARTZ \

-	-DUSE_NEW_CLUT \

-	-DXFree86Server \

-	-I$(top_srcdir)/miext/rootless \

-	-DX11LIBDIR=\"$(libdir)\"

-

-if GLX

-GL_DIR = GL

-endif

-

-SUBDIRS = bundle . $(GL_DIR) xpr pbproxy mach-startup doc

-

-DIST_SUBDIRS = bundle . GL xpr pbproxy mach-startup doc

-

-libXquartz_la_SOURCES = \

-	$(top_srcdir)/fb/fbcmap_mi.c \

-	$(top_srcdir)/mi/miinitext.c \

-	X11Application.m \

-	X11Controller.m \

-	applewm.c \

-	darwin.c \

-	darwinEvents.c \

-	darwinXinput.c \

-	keysym2ucs.c \

-	pseudoramiX.c \

-	quartz.c \

-	quartzAudio.c \

-	quartzCocoa.m \

-	quartzKeyboard.c \

-	quartzStartup.c \

-	quartzRandR.c \

-	threadSafety.c

-

-EXTRA_DIST = \

-	X11Application.h \

-	X11Controller.h \

-	applewmExt.h \

-	darwin.h \

-	darwinfb.h \

-	darwinEvents.h \

-	keysym2ucs.h \

-	pseudoramiX.h \

-	quartz.h \

-	quartzAudio.h \

-	quartzCommon.h \

-	quartzKeyboard.h \

-	quartzRandR.h \

-	sanitizedCarbon.h \

-	sanitizedCocoa.h \

-	threadSafety.h

+noinst_LTLIBRARIES = libXquartz.la
+AM_CFLAGS = $(DIX_CFLAGS)
+AM_OBJCFLAGS = $(DIX_CFLAGS)
+AM_CPPFLAGS = \
+	-DBUILD_DATE=\"$(BUILD_DATE)\" \
+	-DXSERVER_VERSION=\"$(VERSION)\" \
+	-DINXQUARTZ \
+	-DUSE_NEW_CLUT \
+	-DXFree86Server \
+	-I$(top_srcdir)/miext/rootless \
+	-DX11LIBDIR=\"$(libdir)\"
+
+if GLX
+GL_DIR = GL
+endif
+
+SUBDIRS = bundle . $(GL_DIR) xpr pbproxy mach-startup doc
+
+DIST_SUBDIRS = bundle . GL xpr pbproxy mach-startup doc
+
+libXquartz_la_SOURCES = \
+	$(top_srcdir)/fb/fbcmap_mi.c \
+	$(top_srcdir)/mi/miinitext.c \
+	X11Application.m \
+	X11Controller.m \
+	applewm.c \
+	darwin.c \
+	darwinEvents.c \
+	darwinXinput.c \
+	keysym2ucs.c \
+	pseudoramiX.c \
+	quartz.c \
+	quartzCocoa.m \
+	quartzKeyboard.c \
+	quartzStartup.c \
+	quartzRandR.c \
+	threadSafety.c
+
+EXTRA_DIST = \
+	X11Application.h \
+	X11Controller.h \
+	applewmExt.h \
+	darwin.h \
+	darwinfb.h \
+	darwinEvents.h \
+	keysym2ucs.h \
+	pseudoramiX.h \
+	quartz.h \
+	quartzCommon.h \
+	quartzKeyboard.h \
+	quartzRandR.h \
+	sanitizedCarbon.h \
+	sanitizedCocoa.h \
+	threadSafety.h
diff --git a/xorg-server/hw/xquartz/X11Application.h b/xorg-server/hw/xquartz/X11Application.h
index 71a593b40..b3ad19b53 100644
--- a/xorg-server/hw/xquartz/X11Application.h
+++ b/xorg-server/hw/xquartz/X11Application.h
@@ -1,110 +1,109 @@
-/* X11Application.h -- subclass of NSApplication to multiplex events

-

-   Copyright (c) 2002-2007 Apple Inc. All rights reserved.

-

-   Permission is hereby granted, free of charge, to any person

-   obtaining a copy of this software and associated documentation files

-   (the "Software"), to deal in the Software without restriction,

-   including without limitation the rights to use, copy, modify, merge,

-   publish, distribute, sublicense, and/or sell copies of the Software,

-   and to permit persons to whom the Software is furnished to do so,

-   subject to the following conditions:

-

-   The above copyright notice and this permission notice shall be

-   included in all copies or substantial portions of the Software.

-

-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

-   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

-   NONINFRINGEMENT.  IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT

-   HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,

-   WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER

-   DEALINGS IN THE SOFTWARE.

-

-   Except as contained in this notice, the name(s) of the above

-   copyright holders shall not be used in advertising or otherwise to

-   promote the sale, use or other dealings in this Software without

-   prior written authorization. */

-

-#ifndef X11APPLICATION_H

-#define X11APPLICATION_H 1

-

-#if __OBJC__

-

-#import "X11Controller.h"

-

-@interface X11Application : NSApplication {

-    X11Controller *_controller;

-

-    unsigned int _x_active :1;

-}

-

-- (void) set_controller:controller;

-- (void) set_window_menu:(NSArray *)list;

-

-- (int) prefs_get_integer:(NSString *)key default:(int)def;

-- (const char *) prefs_get_string:(NSString *)key default:(const char *)def;

-- (float) prefs_get_float:(NSString *)key default:(float)def;

-- (int) prefs_get_boolean:(NSString *)key default:(int)def;

-- (NSURL *) prefs_copy_url:(NSString *)key default:(NSURL *)def;

-- (NSArray *) prefs_get_array:(NSString *)key;

-- (void) prefs_set_integer:(NSString *)key value:(int)value;

-- (void) prefs_set_float:(NSString *)key value:(float)value;

-- (void) prefs_set_boolean:(NSString *)key value:(int)value;

-- (void) prefs_set_array:(NSString *)key value:(NSArray *)value;

-- (void) prefs_set_string:(NSString *)key value:(NSString *)value;

-- (void) prefs_synchronize;

-

-- (X11Controller *) controller;

-- (OSX_BOOL) x_active;

-@end

-

-extern X11Application *X11App;

-

-#endif /* __OBJC__ */

-

-void X11ApplicationSetWindowMenu (int nitems, const char **items,

-					 const char *shortcuts);

-void X11ApplicationSetWindowMenuCheck (int idx);

-void X11ApplicationSetFrontProcess (void);

-void X11ApplicationSetCanQuit (int state);

-void X11ApplicationServerReady (void);

-void X11ApplicationShowHideMenubar (int state);

-void X11ApplicationLaunchClient (const char *cmd);

-

-void X11ApplicationMain(int argc, char **argv, char **envp);

-

-#define PREFS_APPSMENU              "apps_menu"

-#define PREFS_FAKEBUTTONS           "enable_fake_buttons"

-#define PREFS_SYSBEEP               "enable_system_beep"

-#define PREFS_KEYEQUIVS             "enable_key_equivalents"

-#define PREFS_FULLSCREEN_HOTKEYS    "fullscreen_hotkeys"

-#define PREFS_FULLSCREEN_MENU       "fullscreen_menu"

-#define PREFS_SYNC_KEYMAP           "sync_keymap"

-#define PREFS_DEPTH                 "depth"

-#define PREFS_NO_AUTH               "no_auth"

-#define PREFS_NO_TCP                "nolisten_tcp"

-#define PREFS_DONE_XINIT_CHECK      "done_xinit_check"

-#define PREFS_NO_QUIT_ALERT         "no_quit_alert"

-#define PREFS_OPTION_SENDS_ALT      "option_sends_alt"

-#define PREFS_FAKE_BUTTON2          "fake_button2"

-#define PREFS_FAKE_BUTTON3          "fake_button3"

-#define PREFS_APPKIT_MODIFIERS      "appkit_modifiers"

-#define PREFS_WINDOW_ITEM_MODIFIERS "window_item_modifiers"

-#define PREFS_ROOTLESS              "rootless"

-#define PREFS_TEST_EXTENSIONS       "enable_test_extensions"

-#define PREFS_XP_OPTIONS            "xp_options"

-#define PREFS_LOGIN_SHELL           "login_shell"

-#define PREFS_UPDATE_FEED           "update_feed"

-#define PREFS_CLICK_THROUGH         "wm_click_through"

-#define PREFS_FFM                   "wm_ffm"

-#define PREFS_FOCUS_ON_NEW_WINDOW   "wm_focus_on_new_window"

-

-#define PREFS_SYNC_PB                "sync_pasteboard"

-#define PREFS_SYNC_PB_TO_CLIPBOARD   "sync_pasteboard_to_clipboard"

-#define PREFS_SYNC_PB_TO_PRIMARY     "sync_pasteboard_to_primary"

-#define PREFS_SYNC_CLIPBOARD_TO_PB   "sync_clipboard_to_pasteboard"

-#define PREFS_SYNC_PRIMARY_ON_SELECT "sync_primary_on_select"

-

-#endif /* X11APPLICATION_H */

+/* X11Application.h -- subclass of NSApplication to multiplex events
+
+   Copyright (c) 2002-2007 Apple Inc. All rights reserved.
+
+   Permission is hereby granted, free of charge, to any person
+   obtaining a copy of this software and associated documentation files
+   (the "Software"), to deal in the Software without restriction,
+   including without limitation the rights to use, copy, modify, merge,
+   publish, distribute, sublicense, and/or sell copies of the Software,
+   and to permit persons to whom the Software is furnished to do so,
+   subject to the following conditions:
+
+   The above copyright notice and this permission notice shall be
+   included in all copies or substantial portions of the Software.
+
+   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+   NONINFRINGEMENT.  IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT
+   HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+   WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+   DEALINGS IN THE SOFTWARE.
+
+   Except as contained in this notice, the name(s) of the above
+   copyright holders shall not be used in advertising or otherwise to
+   promote the sale, use or other dealings in this Software without
+   prior written authorization. */
+
+#ifndef X11APPLICATION_H
+#define X11APPLICATION_H 1
+
+#if __OBJC__
+
+#import "X11Controller.h"
+
+@interface X11Application : NSApplication {
+    X11Controller *_controller;
+
+    unsigned int _x_active :1;
+}
+
+- (void) set_controller:controller;
+- (void) set_window_menu:(NSArray *)list;
+
+- (int) prefs_get_integer:(NSString *)key default:(int)def;
+- (const char *) prefs_get_string:(NSString *)key default:(const char *)def;
+- (float) prefs_get_float:(NSString *)key default:(float)def;
+- (int) prefs_get_boolean:(NSString *)key default:(int)def;
+- (NSURL *) prefs_copy_url:(NSString *)key default:(NSURL *)def;
+- (NSArray *) prefs_get_array:(NSString *)key;
+- (void) prefs_set_integer:(NSString *)key value:(int)value;
+- (void) prefs_set_float:(NSString *)key value:(float)value;
+- (void) prefs_set_boolean:(NSString *)key value:(int)value;
+- (void) prefs_set_array:(NSString *)key value:(NSArray *)value;
+- (void) prefs_set_string:(NSString *)key value:(NSString *)value;
+- (void) prefs_synchronize;
+
+- (X11Controller *) controller;
+- (OSX_BOOL) x_active;
+@end
+
+extern X11Application *X11App;
+
+#endif /* __OBJC__ */
+
+void X11ApplicationSetWindowMenu (int nitems, const char **items,
+					 const char *shortcuts);
+void X11ApplicationSetWindowMenuCheck (int idx);
+void X11ApplicationSetFrontProcess (void);
+void X11ApplicationSetCanQuit (int state);
+void X11ApplicationServerReady (void);
+void X11ApplicationShowHideMenubar (int state);
+void X11ApplicationLaunchClient (const char *cmd);
+
+void X11ApplicationMain(int argc, char **argv, char **envp);
+
+#define PREFS_APPSMENU              "apps_menu"
+#define PREFS_FAKEBUTTONS           "enable_fake_buttons"
+#define PREFS_KEYEQUIVS             "enable_key_equivalents"
+#define PREFS_FULLSCREEN_HOTKEYS    "fullscreen_hotkeys"
+#define PREFS_FULLSCREEN_MENU       "fullscreen_menu"
+#define PREFS_SYNC_KEYMAP           "sync_keymap"
+#define PREFS_DEPTH                 "depth"
+#define PREFS_NO_AUTH               "no_auth"
+#define PREFS_NO_TCP                "nolisten_tcp"
+#define PREFS_DONE_XINIT_CHECK      "done_xinit_check"
+#define PREFS_NO_QUIT_ALERT         "no_quit_alert"
+#define PREFS_OPTION_SENDS_ALT      "option_sends_alt"
+#define PREFS_FAKE_BUTTON2          "fake_button2"
+#define PREFS_FAKE_BUTTON3          "fake_button3"
+#define PREFS_APPKIT_MODIFIERS      "appkit_modifiers"
+#define PREFS_WINDOW_ITEM_MODIFIERS "window_item_modifiers"
+#define PREFS_ROOTLESS              "rootless"
+#define PREFS_TEST_EXTENSIONS       "enable_test_extensions"
+#define PREFS_XP_OPTIONS            "xp_options"
+#define PREFS_LOGIN_SHELL           "login_shell"
+#define PREFS_UPDATE_FEED           "update_feed"
+#define PREFS_CLICK_THROUGH         "wm_click_through"
+#define PREFS_FFM                   "wm_ffm"
+#define PREFS_FOCUS_ON_NEW_WINDOW   "wm_focus_on_new_window"
+
+#define PREFS_SYNC_PB                "sync_pasteboard"
+#define PREFS_SYNC_PB_TO_CLIPBOARD   "sync_pasteboard_to_clipboard"
+#define PREFS_SYNC_PB_TO_PRIMARY     "sync_pasteboard_to_primary"
+#define PREFS_SYNC_CLIPBOARD_TO_PB   "sync_clipboard_to_pasteboard"
+#define PREFS_SYNC_PRIMARY_ON_SELECT "sync_primary_on_select"
+
+#endif /* X11APPLICATION_H */
diff --git a/xorg-server/hw/xquartz/X11Application.m b/xorg-server/hw/xquartz/X11Application.m
index 264c1fbea..b855c8358 100644
--- a/xorg-server/hw/xquartz/X11Application.m
+++ b/xorg-server/hw/xquartz/X11Application.m
@@ -1,1322 +1,1320 @@
-/* X11Application.m -- subclass of NSApplication to multiplex events

- 

- Copyright (c) 2002-2008 Apple Inc.

- 

- Permission is hereby granted, free of charge, to any person

- obtaining a copy of this software and associated documentation files

- (the "Software"), to deal in the Software without restriction,

- including without limitation the rights to use, copy, modify, merge,

- publish, distribute, sublicense, and/or sell copies of the Software,

- and to permit persons to whom the Software is furnished to do so,

- subject to the following conditions:

- 

- The above copyright notice and this permission notice shall be

- included in all copies or substantial portions of the Software.

- 

- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

- NONINFRINGEMENT.  IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT

- HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,

- WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER

- DEALINGS IN THE SOFTWARE.

- 

- Except as contained in this notice, the name(s) of the above

- copyright holders shall not be used in advertising or otherwise to

- promote the sale, use or other dealings in this Software without

- prior written authorization. */

-

-#include "sanitizedCarbon.h"

-

-#ifdef HAVE_DIX_CONFIG_H

-#include <dix-config.h>

-#endif

-

-#include "quartzCommon.h"

-

-#import "X11Application.h"

-

-#include "darwin.h"

-#include "quartz.h"

-#include "darwinEvents.h"

-#include "quartzKeyboard.h"

-#include "quartz.h"

-#include <X11/extensions/applewmconst.h>

-#include "micmap.h"

-#include "exglobals.h"

-

-#include <mach/mach.h>

-#include <unistd.h>

-#include <AvailabilityMacros.h>

-

-#include <Xplugin.h>

-

-// pbproxy/pbproxy.h

-extern int xpbproxy_run (void);

-

-#define DEFAULTS_FILE X11LIBDIR"/X11/xserver/Xquartz.plist"

-

-#ifndef XSERVER_VERSION

-#define XSERVER_VERSION "?"

-#endif

-

-/* Stuck modifier / button state... force release when we context switch */

-static NSEventType keyState[NUM_KEYCODES];

-

-extern Bool noTestExtensions;

-

-#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050

-static TISInputSourceRef last_key_layout;

-#else

-static KeyboardLayoutRef last_key_layout;

-#endif

-

-extern int darwinFakeButtons;

-

-/* Store the mouse location while in the background, and update X11's pointer

- * location when we become the foreground application

- */

-static NSPoint bgMouseLocation;

-static BOOL bgMouseLocationUpdated = FALSE;

-

-X11Application *X11App;

-

-CFStringRef app_prefs_domain_cfstr = NULL;

-

-#define ALL_KEY_MASKS (NSShiftKeyMask | NSControlKeyMask | NSAlternateKeyMask | NSCommandKeyMask)

-

-@interface X11Application (Private)

-- (void) sendX11NSEvent:(NSEvent *)e;

-@end

-

-@implementation X11Application

-

-typedef struct message_struct message;

-struct message_struct {

-    mach_msg_header_t hdr;

-    SEL selector;

-    NSObject *arg;

-};

-

-static mach_port_t _port;

-

-/* Quartz mode initialization routine. This is often dynamically loaded

-   but is statically linked into this X server. */

-Bool QuartzModeBundleInit(void);

-

-static void init_ports (void) {

-    kern_return_t r;

-    NSPort *p;

-	

-    if (_port != MACH_PORT_NULL) return;

-	

-    r = mach_port_allocate (mach_task_self (), MACH_PORT_RIGHT_RECEIVE, &_port);

-    if (r != KERN_SUCCESS) return;

-	

-    p = [NSMachPort portWithMachPort:_port];

-    [p setDelegate:NSApp];

-    [p scheduleInRunLoop:[NSRunLoop currentRunLoop] forMode:NSDefaultRunLoopMode];

-}

-

-static void message_kit_thread (SEL selector, NSObject *arg) {

-    message msg;

-    kern_return_t r;

-	

-    msg.hdr.msgh_bits = MACH_MSGH_BITS (MACH_MSG_TYPE_MAKE_SEND, 0);

-    msg.hdr.msgh_size = sizeof (msg);

-    msg.hdr.msgh_remote_port = _port;

-    msg.hdr.msgh_local_port = MACH_PORT_NULL;

-    msg.hdr.msgh_reserved = 0;

-    msg.hdr.msgh_id = 0;

-	

-    msg.selector = selector;

-    msg.arg = [arg retain];

-	

-    r = mach_msg (&msg.hdr, MACH_SEND_MSG, msg.hdr.msgh_size,

-		  0, MACH_PORT_NULL, 0, MACH_PORT_NULL);

-    if (r != KERN_SUCCESS)

-		ErrorF("%s: mach_msg failed: %x\n", __FUNCTION__, r);

-}

-

-- (void) handleMachMessage:(void *)_msg {

-    message *msg = _msg;

-	

-    [self performSelector:msg->selector withObject:msg->arg];

-    [msg->arg release];

-}

-

-- (void) set_controller:obj {

-    if (_controller == nil) _controller = [obj retain];

-}

-

-- (void) dealloc {

-    if (_controller != nil) [_controller release];

-	

-    if (_port != MACH_PORT_NULL)

-		mach_port_deallocate (mach_task_self (), _port);

-	

-    [super dealloc];

-}

-

-- (void) orderFrontStandardAboutPanel: (id) sender {

-    NSMutableDictionary *dict;

-    NSDictionary *infoDict;

-    NSString *tem;

-    

-    dict = [NSMutableDictionary dictionaryWithCapacity:3];

-    infoDict = [[NSBundle mainBundle] infoDictionary];

-    

-    [dict setObject: NSLocalizedString (@"The X Window System", @"About panel")

-          forKey:@"ApplicationName"];

-    

-    tem = [infoDict objectForKey:@"CFBundleShortVersionString"];

-    

-    [dict setObject:[NSString stringWithFormat:@"XQuartz %@", tem]

-          forKey:@"ApplicationVersion"];

-

-    [dict setObject:[NSString stringWithFormat:@"xorg-server %s", XSERVER_VERSION]

-          forKey:@"Version"];

-    

-    [self orderFrontStandardAboutPanelWithOptions: dict];

-}

-

-- (void) activateX:(OSX_BOOL)state {

-    size_t i;

-    DEBUG_LOG("state=%d, _x_active=%d, \n", state, _x_active)

-    if (state) {

-        if(bgMouseLocationUpdated) {

-            DarwinSendPointerEvents(darwinPointer, MotionNotify, 0, bgMouseLocation.x, bgMouseLocation.y, 0.0, 0.0, 0.0);

-            bgMouseLocationUpdated = FALSE;

-        }

-        DarwinSendDDXEvent(kXquartzActivate, 0);

-    } else {

-

-        if(darwin_all_modifier_flags)

-            DarwinUpdateModKeys(0);

-        for(i=0; i < NUM_KEYCODES; i++) {

-            if(keyState[i] == NSKeyDown) {

-                DarwinSendKeyboardEvents(KeyRelease, i);

-                keyState[i] = NSKeyUp;

-            }

-        }

-        

-        DarwinSendDDXEvent(kXquartzDeactivate, 0);

-    }

-

-    _x_active = state;

-}

-

-- (void) became_key:(NSWindow *)win {

-	[self activateX:NO];

-}

-

-- (void) sendEvent:(NSEvent *)e {

-    OSX_BOOL for_appkit, for_x;

-    

-    /* By default pass down the responder chain and to X. */

-    for_appkit = YES;

-    for_x = YES;

-    

-    switch ([e type]) {

-        case NSLeftMouseDown: case NSRightMouseDown: case NSOtherMouseDown:

-        case NSLeftMouseUp: case NSRightMouseUp: case NSOtherMouseUp:

-            if ([e window] != nil) {

-                /* Pointer event has an (AppKit) window. Probably something for the kit. */

-                for_x = NO;

-                if (_x_active) [self activateX:NO];

-            } else if ([self modalWindow] == nil) {

-                /* Must be an X window. Tell appkit it doesn't have focus. */

-                for_appkit = NO;

-                

-                if ([self isActive]) {

-                    [self deactivate];

-                    if (!_x_active && quartzProcs->IsX11Window([e window],

-                                                               [e windowNumber]))

-                        [self activateX:YES];

-                }

-            }

-

-            /* We want to force sending to appkit if we're over the menu bar */

-            if(!for_appkit) {

-                NSPoint NSlocation = [e locationInWindow];

-                NSWindow *window = [e window];

-                NSRect NSframe, NSvisibleFrame;

-                CGRect CGframe, CGvisibleFrame;

-                CGPoint CGlocation;

-

-                if (window != nil)	{

-                    NSRect frame = [window frame];

-                    NSlocation.x += frame.origin.x;

-                    NSlocation.y += frame.origin.y;

-                }

-

-                NSframe = [[NSScreen mainScreen] frame];

-                NSvisibleFrame = [[NSScreen mainScreen] visibleFrame];

-                

-                CGframe = CGRectMake(NSframe.origin.x, NSframe.origin.y,

-                                            NSframe.size.width, NSframe.size.height);

-                CGvisibleFrame = CGRectMake(NSvisibleFrame.origin.x,

-                                                   NSvisibleFrame.origin.y,

-                                                   NSvisibleFrame.size.width,

-                                                   NSvisibleFrame.size.height);

-                CGlocation = CGPointMake(NSlocation.x, NSlocation.y);

-                

-                if(CGRectContainsPoint(CGframe, CGlocation) &&

-                   !CGRectContainsPoint(CGvisibleFrame, CGlocation))

-                    for_appkit = YES;

-            }

-            

-            break;

-            

-        case NSKeyDown: case NSKeyUp:

-            

-            if(_x_active) {

-                static BOOL do_swallow = NO;

-                static int swallow_keycode;

-                

-                if([e type] == NSKeyDown) {

-                    /* Before that though, see if there are any global

-                     * shortcuts bound to it. */

-

-                    if(darwinAppKitModMask & [e modifierFlags]) {

-                        /* Override to force sending to Appkit */

-                        swallow_keycode = [e keyCode];

-                        do_swallow = YES;

-                        for_x = NO;

-#if XPLUGIN_VERSION >= 1

-                    } else if(XQuartzEnableKeyEquivalents &&

-                             xp_is_symbolic_hotkey_event([e eventRef])) {

-                        swallow_keycode = [e keyCode];

-                        do_swallow = YES;

-                        for_x = NO;

-#endif

-                    } else if(XQuartzEnableKeyEquivalents &&

-                              [[self mainMenu] performKeyEquivalent:e]) {

-                        swallow_keycode = [e keyCode];

-                        do_swallow = YES;

-                        for_appkit = NO;

-                        for_x = NO;

-                    } else if(!XQuartzIsRootless

-                              && ([e modifierFlags] & ALL_KEY_MASKS) == (NSCommandKeyMask | NSAlternateKeyMask)

-                              && ([e keyCode] == 0 /*a*/ || [e keyCode] == 53 /*Esc*/)) {

-                        /* We have this here to force processing fullscreen 

-                         * toggle even if XQuartzEnableKeyEquivalents is disabled */

-                        swallow_keycode = [e keyCode];

-                        do_swallow = YES;

-                        for_x = NO;

-                        for_appkit = NO;

-                        DarwinSendDDXEvent(kXquartzToggleFullscreen, 0);

-                    } else {

-                        /* No kit window is focused, so send it to X. */

-                        for_appkit = NO;

-                    }

-                } else { /* KeyUp */

-                    /* If we saw a key equivalent on the down, don't pass

-                     * the up through to X. */

-                    if (do_swallow && [e keyCode] == swallow_keycode) {

-                        do_swallow = NO;

-                        for_x = NO;

-                    }

-                }

-            } else { /* !_x_active */

-                for_x = NO;

-            }

-            break;

-            

-        case NSFlagsChanged:

-            /* Don't tell X11 about modifiers changing while it's not active */

-            if (!_x_active)

-                for_x = NO;

-            break;

-            

-        case NSAppKitDefined:

-            switch ([e subtype]) {

-                case NSApplicationActivatedEventType:

-                    for_x = NO;

-                    if ([self modalWindow] == nil) {

-                        BOOL order_all_windows = YES, workspaces, ok;

-                        for_appkit = NO;

-                        

-                        /* FIXME: hack to avoid having to pass the event to appkit,

-                         which would cause it to raise one of its windows. */

-                        _appFlags._active = YES;

-                        

-                        [self activateX:YES];

-                        

-                        /* Get the Spaces preference for SwitchOnActivate */

-                        (void)CFPreferencesAppSynchronize(CFSTR("com.apple.dock"));

-                        workspaces = CFPreferencesGetAppBooleanValue(CFSTR("workspaces"), CFSTR("com.apple.dock"), &ok);

-                        if (!ok)

-                            workspaces = NO;

-

-                        if (workspaces) {

-                            (void)CFPreferencesAppSynchronize(CFSTR(".GlobalPreferences"));

-                            order_all_windows = CFPreferencesGetAppBooleanValue(CFSTR("AppleSpacesSwitchOnActivate"), CFSTR(".GlobalPreferences"), &ok);

-                            if (!ok)

-                                order_all_windows = YES;

-                        }

-                        

-                        /* TODO: In the workspaces && !AppleSpacesSwitchOnActivate case, the windows are ordered

-                         *       correctly, but we need to activate the top window on this space if there is

-                         *       none active.

-                         *

-                         *       If there are no active windows, and there are minimized windows, we should

-                         *       be restoring one of them.

-                         */

-                        if ([e data2] & 0x10) // 0x10 is set when we use cmd-tab or the dock icon

-                            DarwinSendDDXEvent(kXquartzBringAllToFront, 1, order_all_windows);

-                    }

-                    break;

-                    

-                case 18: /* ApplicationDidReactivate */

-                    if (XQuartzFullscreenVisible) for_appkit = NO;

-                    break;

-                    

-                case NSApplicationDeactivatedEventType:

-                    for_x = NO;

-                    [self activateX:NO];

-                    break;

-            }

-            break;

-            

-        default: break; /* for gcc */

-    }

-    

-    if (for_appkit) [super sendEvent:e];

-    

-    if (for_x) [self sendX11NSEvent:e];

-}

-

-- (void) set_window_menu:(NSArray *)list {

-	[_controller set_window_menu:list];

-}

-

-- (void) set_window_menu_check:(NSNumber *)n {

-	[_controller set_window_menu_check:n];

-}

-

-- (void) set_apps_menu:(NSArray *)list {

-	[_controller set_apps_menu:list];

-}

-

-- (void) set_front_process:unused {

-	[NSApp activateIgnoringOtherApps:YES];

-

-	if ([self modalWindow] == nil)

-		[self activateX:YES];

-}

-

-- (void) set_can_quit:(NSNumber *)state {

-	[_controller set_can_quit:[state boolValue]];

-}

-

-- (void) server_ready:unused {

-	[_controller server_ready];

-}

-

-- (void) show_hide_menubar:(NSNumber *)state {

-    /* Also shows/hides the dock */

-    if ([state boolValue])

-        SetSystemUIMode(kUIModeNormal, 0); 

-    else

-        SetSystemUIMode(kUIModeAllHidden, XQuartzFullscreenMenu ? kUIOptionAutoShowMenuBar : 0); // kUIModeAllSuppressed or kUIOptionAutoShowMenuBar can be used to allow "mouse-activation"

-}

-

-- (void) launch_client:(NSString *)cmd {

-    (void)[_controller application:self openFile:cmd];

-}

-

-/* user preferences */

-

-/* Note that these functions only work for arrays whose elements

- can be toll-free-bridged between NS and CF worlds. */

-

-static const void *cfretain (CFAllocatorRef a, const void *b) {

-    return CFRetain (b);

-}

-

-static void cfrelease (CFAllocatorRef a, const void *b) {

-    CFRelease (b);

-}

-

-static CFMutableArrayRef nsarray_to_cfarray (NSArray *in) {

-	CFMutableArrayRef out;

-	CFArrayCallBacks cb;

-	NSObject *ns;

-	const CFTypeRef *cf;

-	int i, count;

-

-	memset (&cb, 0, sizeof (cb));

-	cb.version = 0;

-	cb.retain = cfretain;

-	cb.release = cfrelease;

-

-	count = [in count];

-	out = CFArrayCreateMutable (NULL, count, &cb);

-

-	for (i = 0; i < count; i++) {

-		ns = [in objectAtIndex:i];

-

-		if ([ns isKindOfClass:[NSArray class]])

-			cf = (CFTypeRef) nsarray_to_cfarray ((NSArray *) ns);

-		else

-			cf = CFRetain ((CFTypeRef) ns);

-

-		CFArrayAppendValue (out, cf);

-		CFRelease (cf);

-	}

-

-	return out;

-}

-

-static NSMutableArray * cfarray_to_nsarray (CFArrayRef in) {

-	NSMutableArray *out;

-	const CFTypeRef *cf;

-	NSObject *ns;

-	int i, count;

-

-	count = CFArrayGetCount (in);

-	out = [[NSMutableArray alloc] initWithCapacity:count];

-

-	for (i = 0; i < count; i++) {

-		cf = CFArrayGetValueAtIndex (in, i);

-

-		if (CFGetTypeID (cf) == CFArrayGetTypeID ())

-			ns = cfarray_to_nsarray ((CFArrayRef) cf);

-		else

-			ns = [(id)cf retain];

-

-		[out addObject:ns];

-		[ns release];

-	}

-

-	return out;

-}

-

-- (CFPropertyListRef) prefs_get_copy:(NSString *)key {

-    CFPropertyListRef value;

-	

-    value = CFPreferencesCopyAppValue ((CFStringRef) key, app_prefs_domain_cfstr);

-	

-    if (value == NULL) {

-      static CFDictionaryRef defaults;

-      

-      if (defaults == NULL) {

-	CFStringRef error = NULL;

-	CFDataRef data;

-	CFURLRef url;

-	SInt32 error_code;

-	

-	url = (CFURLCreateFromFileSystemRepresentation

-	       (NULL, (unsigned char *)DEFAULTS_FILE, strlen (DEFAULTS_FILE), false));

-	if (CFURLCreateDataAndPropertiesFromResource (NULL, url, &data,

-						      NULL, NULL, &error_code)) {

-	  defaults = (CFPropertyListCreateFromXMLData

-		      (NULL, data, kCFPropertyListMutableContainersAndLeaves, &error));

-	  if (error != NULL) CFRelease (error);

-	  CFRelease (data);

-	}

-	CFRelease (url);

-			

-	if (defaults != NULL) {

-	  NSMutableArray *apps, *elt;

-	  int count, i;

-	  NSString *name, *nname;

-	  

-	  /* Localize the names in the default apps menu. */

-	  

-	  apps = [(NSDictionary *)defaults objectForKey:@PREFS_APPSMENU];

-	  if (apps != nil) {

-	    count = [apps count];

-	    for (i = 0; i < count; i++)	{

-	      elt = [apps objectAtIndex:i];

-	      if (elt != nil && [elt isKindOfClass:[NSArray class]]) {

-		name = [elt objectAtIndex:0];

-		if (name != nil) {

-		  nname = NSLocalizedString (name, nil);

-		  if (nname != nil && nname != name)

-		    [elt replaceObjectAtIndex:0 withObject:nname];

-		}

-	      }

-	    }

-	  }

-	}

-      }

-		

-      if (defaults != NULL) value = CFDictionaryGetValue (defaults, key);

-      if (value != NULL) CFRetain (value);

-    }

-	

-    return value;

-}

-

-- (int) prefs_get_integer:(NSString *)key default:(int)def {

-  CFPropertyListRef value;

-  int ret;

-  

-  value = [self prefs_get_copy:key];

-  

-  if (value != NULL && CFGetTypeID (value) == CFNumberGetTypeID ())

-    CFNumberGetValue (value, kCFNumberIntType, &ret);

-  else if (value != NULL && CFGetTypeID (value) == CFStringGetTypeID ())

-    ret = CFStringGetIntValue (value);

-  else

-    ret = def;

-  

-  if (value != NULL) CFRelease (value);

-  

-  return ret;

-}

-

-- (const char *) prefs_get_string:(NSString *)key default:(const char *)def {

-  CFPropertyListRef value;

-  const char *ret = NULL;

-  

-  value = [self prefs_get_copy:key];

-  

-  if (value != NULL && CFGetTypeID (value) == CFStringGetTypeID ()) {

-    NSString *s = (NSString *) value;

-    

-    ret = [s UTF8String];

-  }

-  

-  if (value != NULL) CFRelease (value);

-  

-  return ret != NULL ? ret : def;

-}

-

-- (NSURL *) prefs_copy_url:(NSString *)key default:(NSURL *)def {

-    CFPropertyListRef value;

-    NSURL *ret = NULL;

-    

-    value = [self prefs_get_copy:key];

-    

-    if (value != NULL && CFGetTypeID (value) == CFStringGetTypeID ()) {

-        NSString *s = (NSString *) value;

-

-        ret = [NSURL URLWithString:s];

-        [ret retain];

-    }

-    

-    if (value != NULL) CFRelease (value);

-    

-    return ret != NULL ? ret : def;

-}

-

-- (float) prefs_get_float:(NSString *)key default:(float)def {

-  CFPropertyListRef value;

-  float ret = def;

-  

-  value = [self prefs_get_copy:key];

-  

-  if (value != NULL

-      && CFGetTypeID (value) == CFNumberGetTypeID ()

-      && CFNumberIsFloatType (value))

-    CFNumberGetValue (value, kCFNumberFloatType, &ret);

-  else if (value != NULL && CFGetTypeID (value) == CFStringGetTypeID ())

-    ret = CFStringGetDoubleValue (value);

-	

-  if (value != NULL) CFRelease (value);

-  

-  return ret;

-}

-

-- (int) prefs_get_boolean:(NSString *)key default:(int)def {

-  CFPropertyListRef value;

-  int ret = def;

-  

-  value = [self prefs_get_copy:key];

-  

-  if (value != NULL) {

-    if (CFGetTypeID (value) == CFNumberGetTypeID ())

-      CFNumberGetValue (value, kCFNumberIntType, &ret);

-    else if (CFGetTypeID (value) == CFBooleanGetTypeID ())

-      ret = CFBooleanGetValue (value);

-    else if (CFGetTypeID (value) == CFStringGetTypeID ()) {

-      const char *tem = [(NSString *) value UTF8String];

-      if (strcasecmp (tem, "true") == 0 || strcasecmp (tem, "yes") == 0)

-	ret = YES;

-      else

-	ret = NO;

-    }

-    

-    CFRelease (value);

-  }

-  return ret;

-}

-

-- (NSArray *) prefs_get_array:(NSString *)key {

-  NSArray *ret = nil;

-  CFPropertyListRef value;

-  

-  value = [self prefs_get_copy:key];

-  

-  if (value != NULL) {

-    if (CFGetTypeID (value) == CFArrayGetTypeID ())

-      ret = [cfarray_to_nsarray (value) autorelease];

-    

-    CFRelease (value);

-  }

-  

-  return ret;

-}

-

-- (void) prefs_set_integer:(NSString *)key value:(int)value {

-    CFNumberRef x;

-	

-    x = CFNumberCreate (NULL, kCFNumberIntType, &value);

-	

-    CFPreferencesSetValue ((CFStringRef) key, (CFTypeRef) x, app_prefs_domain_cfstr,

-			   kCFPreferencesCurrentUser, kCFPreferencesAnyHost);

-	

-    CFRelease (x);

-}

-

-- (void) prefs_set_float:(NSString *)key value:(float)value {

-    CFNumberRef x;

-	

-    x = CFNumberCreate (NULL, kCFNumberFloatType, &value);

-	

-    CFPreferencesSetValue ((CFStringRef) key, (CFTypeRef) x, app_prefs_domain_cfstr,

-			   kCFPreferencesCurrentUser, kCFPreferencesAnyHost);

-	

-    CFRelease (x);

-}

-

-- (void) prefs_set_boolean:(NSString *)key value:(int)value {

-  CFPreferencesSetValue ((CFStringRef) key,

-			 (CFTypeRef) (value ? kCFBooleanTrue

-			 : kCFBooleanFalse), app_prefs_domain_cfstr,

-			 kCFPreferencesCurrentUser, kCFPreferencesAnyHost);

-  

-}

-

-- (void) prefs_set_array:(NSString *)key value:(NSArray *)value {

-  CFArrayRef cfarray;

-  

-  cfarray = nsarray_to_cfarray (value);

-  CFPreferencesSetValue ((CFStringRef) key,

-			 (CFTypeRef) cfarray,

-			 app_prefs_domain_cfstr,

-			 kCFPreferencesCurrentUser, kCFPreferencesAnyHost);

-  CFRelease (cfarray);

-}

-

-- (void) prefs_set_string:(NSString *)key value:(NSString *)value {

-  CFPreferencesSetValue ((CFStringRef) key, (CFTypeRef) value,

-			 app_prefs_domain_cfstr, kCFPreferencesCurrentUser,

-			 kCFPreferencesAnyHost);

-}

-

-- (void) prefs_synchronize {

-    CFPreferencesAppSynchronize (kCFPreferencesCurrentApplication);

-}

-

-- (void) read_defaults

-{

-    NSString *nsstr;

-    const char *tem;

-	

-    XQuartzUseSysBeep = [self prefs_get_boolean:@PREFS_SYSBEEP

-                                       default:XQuartzUseSysBeep];

-    XQuartzRootlessDefault = [self prefs_get_boolean:@PREFS_ROOTLESS

-                                           default:XQuartzRootlessDefault];

-    XQuartzFullscreenMenu = [self prefs_get_boolean:@PREFS_FULLSCREEN_MENU

-                                           default:XQuartzFullscreenMenu];

-    XQuartzFullscreenDisableHotkeys = ![self prefs_get_boolean:@PREFS_FULLSCREEN_HOTKEYS

-                                                      default:!XQuartzFullscreenDisableHotkeys];

-    darwinFakeButtons = [self prefs_get_boolean:@PREFS_FAKEBUTTONS

-                                        default:darwinFakeButtons];

-    XQuartzOptionSendsAlt = [self prefs_get_boolean:@PREFS_OPTION_SENDS_ALT

-                                           default:XQuartzOptionSendsAlt];

-

-    if (darwinFakeButtons) {

-        const char *fake2, *fake3;

-

-        fake2 = [self prefs_get_string:@PREFS_FAKE_BUTTON2 default:NULL];

-        fake3 = [self prefs_get_string:@PREFS_FAKE_BUTTON3 default:NULL];

-

-        if (fake2 != NULL) darwinFakeMouse2Mask = DarwinParseModifierList(fake2, TRUE);

-        if (fake3 != NULL) darwinFakeMouse3Mask = DarwinParseModifierList(fake3, TRUE);

-    }

-

-    tem = [self prefs_get_string:@PREFS_APPKIT_MODIFIERS default:NULL];

-    if (tem != NULL) darwinAppKitModMask = DarwinParseModifierList(tem, TRUE);

-	

-    tem = [self prefs_get_string:@PREFS_WINDOW_ITEM_MODIFIERS default:NULL];

-    if (tem != NULL) {

-        windowItemModMask = DarwinParseModifierList(tem, FALSE);

-    } else {

-        nsstr = NSLocalizedString (@"window item modifiers", @"window item modifiers");

-        if(nsstr != NULL) {

-            tem = [nsstr UTF8String];

-            if((tem != NULL) && strcmp(tem, "window item modifiers")) {

-                windowItemModMask = DarwinParseModifierList(tem, FALSE);

-            }

-        }

-    }

-

-    XQuartzEnableKeyEquivalents = [self prefs_get_boolean:@PREFS_KEYEQUIVS

-                                              default:XQuartzEnableKeyEquivalents];

-	

-    darwinSyncKeymap = [self prefs_get_boolean:@PREFS_SYNC_KEYMAP

-                                       default:darwinSyncKeymap];

-		

-    darwinDesiredDepth = [self prefs_get_integer:@PREFS_DEPTH

-                                         default:darwinDesiredDepth];

-    

-    noTestExtensions = ![self prefs_get_boolean:@PREFS_TEST_EXTENSIONS

-                                        default:FALSE];

-

-#if XQUARTZ_SPARKLE

-    NSURL *url =  [self prefs_copy_url:@PREFS_UPDATE_FEED default:nil];

-    if(url) {

-        [[SUUpdater sharedUpdater] setFeedURL:url];

-        [url release];

-    }

-#endif

-}

-

-/* This will end up at the end of the responder chain. */

-- (void) copy:sender {

-  DarwinSendDDXEvent(kXquartzPasteboardNotify, 1,

-			     AppleWMCopyToPasteboard);

-}

-

-- (X11Controller *) controller {

-    return _controller;

-}

-

-- (OSX_BOOL) x_active {

-    return _x_active;

-}

-

-@end

-

-static NSArray *

-array_with_strings_and_numbers (int nitems, const char **items,

-				const char *numbers) {

-  NSMutableArray *array, *subarray;

-  NSString *string, *number;

-  int i;

-	

-  /* (Can't autorelease on the X server thread) */

-  

-  array = [[NSMutableArray alloc] initWithCapacity:nitems];

-  

-  for (i = 0; i < nitems; i++) {

-    subarray = [[NSMutableArray alloc] initWithCapacity:2];

-    

-    string = [[NSString alloc] initWithUTF8String:items[i]];

-    [subarray addObject:string];

-    [string release];

-    

-    if (numbers[i] != 0) {

-      number = [[NSString alloc] initWithFormat:@"%d", numbers[i]];

-      [subarray addObject:number];

-      [number release];

-    } else

-      [subarray addObject:@""];

-    

-    [array addObject:subarray];

-    [subarray release];

-  }

-  

-  return array;

-}

-

-void X11ApplicationSetWindowMenu (int nitems, const char **items,

-				  const char *shortcuts) {

-  NSArray *array;

-  array = array_with_strings_and_numbers (nitems, items, shortcuts);

-  

-  /* Send the array of strings over to the appkit thread */

-  

-  message_kit_thread (@selector (set_window_menu:), array);

-  [array release];

-}

-

-void X11ApplicationSetWindowMenuCheck (int idx) {

-  NSNumber *n;

-  

-  n = [[NSNumber alloc] initWithInt:idx];

-  

-  message_kit_thread (@selector (set_window_menu_check:), n);

-  

-  [n release];

-}

-

-void X11ApplicationSetFrontProcess (void) {

-    message_kit_thread (@selector (set_front_process:), nil);

-}

-

-void X11ApplicationSetCanQuit (int state) {

-    NSNumber *n;

-	

-    n = [[NSNumber alloc] initWithBool:state];

-	

-    message_kit_thread (@selector (set_can_quit:), n);

-	

-    [n release];

-}

-

-void X11ApplicationServerReady (void) {

-    message_kit_thread (@selector (server_ready:), nil);

-}

-

-void X11ApplicationShowHideMenubar (int state) {

-    NSNumber *n;

-	

-    n = [[NSNumber alloc] initWithBool:state];

-	

-    message_kit_thread (@selector (show_hide_menubar:), n);

-	

-    [n release];

-}

-

-void X11ApplicationLaunchClient (const char *cmd) {

-    NSString *string;

-    

-    string = [[NSString alloc] initWithUTF8String:cmd];

-	

-    message_kit_thread (@selector (launch_client:), string);

-	

-    [string release];

-}

-

-static void check_xinitrc (void) {

-    char *tem, buf[1024];

-    NSString *msg;

-	

-    if ([X11App prefs_get_boolean:@PREFS_DONE_XINIT_CHECK default:NO])

-		return;

-	

-    tem = getenv ("HOME");

-    if (tem == NULL) goto done;

-	

-    snprintf (buf, sizeof (buf), "%s/.xinitrc", tem);

-    if (access (buf, F_OK) != 0)

-		goto done;

-	

-    msg = NSLocalizedString (@"You have an existing ~/.xinitrc file.\n\n\

-Windows displayed by X11 applications may not have titlebars, or may look \

-different to windows displayed by native applications.\n\n\

-Would you like to move aside the existing file and use the standard X11 \

-environment the next time you start X11?", @"Startup xinitrc dialog");

-

-    if(NSAlertDefaultReturn == NSRunAlertPanel (nil, msg, NSLocalizedString (@"Yes", @""),

-                                                NSLocalizedString (@"No", @""), nil)) {

-        char buf2[1024];

-        int i = -1;

-      

-        snprintf (buf2, sizeof (buf2), "%s.old", buf);

-      

-        for(i = 1; access (buf2, F_OK) == 0; i++)

-            snprintf (buf2, sizeof (buf2), "%s.old.%d", buf, i);

-

-        rename (buf, buf2);

-    }

-    

- done:

-    [X11App prefs_set_boolean:@PREFS_DONE_XINIT_CHECK value:YES];

-    [X11App prefs_synchronize];

-}

-

-static inline pthread_t create_thread(void *func, void *arg) {

-    pthread_attr_t attr;

-    pthread_t tid;

-    

-    pthread_attr_init(&attr);

-    pthread_attr_setscope(&attr, PTHREAD_SCOPE_SYSTEM);

-    pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);

-    pthread_create(&tid, &attr, func, arg);

-    pthread_attr_destroy(&attr);

-    

-    return tid;

-}

-

-static void *xpbproxy_x_thread(void *args) {

-    xpbproxy_run();

-

-    fprintf(stderr, "xpbproxy thread is terminating unexpectedly.\n");

-    return NULL;

-}

-

-void X11ApplicationMain (int argc, char **argv, char **envp) {

-    NSAutoreleasePool *pool;

-

-#ifdef DEBUG

-    while (access ("/tmp/x11-block", F_OK) == 0) sleep (1);

-#endif

-  

-    pool = [[NSAutoreleasePool alloc] init];

-    X11App = (X11Application *) [X11Application sharedApplication];

-    init_ports ();

-    

-    app_prefs_domain_cfstr = (CFStringRef)[[NSBundle mainBundle] bundleIdentifier];

-

-    [NSApp read_defaults];

-    [NSBundle loadNibNamed:@"main" owner:NSApp];

-    [[NSNotificationCenter defaultCenter] addObserver:NSApp

-					selector:@selector (became_key:)

-					name:NSWindowDidBecomeKeyNotification object:nil];

-

-    /*

-     * The xpr Quartz mode is statically linked into this server.

-     * Initialize all the Quartz functions.

-     */

-    QuartzModeBundleInit();

-

-    /* Calculate the height of the menubar so we can avoid it. */

-    aquaMenuBarHeight = NSHeight([[NSScreen mainScreen] frame]) -

-    NSMaxY([[NSScreen mainScreen] visibleFrame]);

-

-    /* Set the key layout seed before we start the server */

-#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050

-    last_key_layout = TISCopyCurrentKeyboardLayoutInputSource();    

-

-    if(!last_key_layout)

-        fprintf(stderr, "X11ApplicationMain: Unable to determine TISCopyCurrentKeyboardLayoutInputSource() at startup.\n");

-#else

-    KLGetCurrentKeyboardLayout(&last_key_layout);

-    if(!last_key_layout)

-        fprintf(stderr, "X11ApplicationMain: Unable to determine KLGetCurrentKeyboardLayout() at startup.\n");

-#endif

-

-    if (!QuartsResyncKeymap(FALSE)) {

-        fprintf(stderr, "X11ApplicationMain: Could not build a valid keymap.\n");

-    }

-

-    /* Tell the server thread that it can proceed */

-    QuartzInitServer(argc, argv, envp);

-    

-    /* This must be done after QuartzInitServer because it can result in

-     * an mieqEnqueue() - <rdar://problem/6300249>

-     */

-    check_xinitrc();

-    

-    create_thread(xpbproxy_x_thread, NULL);

-

-#if XQUARTZ_SPARKLE

-    [[X11App controller] setup_sparkle];

-    [[SUUpdater sharedUpdater] resetUpdateCycle];

-//    [[SUUpdater sharedUpdater] checkForUpdates:X11App];

-#endif

-

-    [pool release];

-    [NSApp run];

-    /* not reached */

-}

-

-@implementation X11Application (Private)

-

-#ifdef NX_DEVICELCMDKEYMASK

-/* This is to workaround a bug in the VNC server where we sometimes see the L

- * modifier and sometimes see no "side"

- */

-static inline int ensure_flag(int flags, int device_independent, int device_dependents, int device_dependent_default) {

-    if( (flags & device_independent) &&

-       !(flags & device_dependents))

-        flags |= device_dependent_default;

-    return flags;

-}

-#endif

-

-#ifdef DEBUG_UNTRUSTED_POINTER_DELTA

-static const char *untrusted_str(NSEvent *e) {

-    switch([e type]) {

-        case NSScrollWheel:

-            return "NSScrollWheel";

-        case NSTabletPoint:

-            return "NSTabletPoint";

-        case NSOtherMouseDown:

-            return "NSOtherMouseDown";

-        case NSOtherMouseUp:

-            return "NSOtherMouseUp";

-        case NSLeftMouseDown:

-            return "NSLeftMouseDown";

-        case NSLeftMouseUp:

-            return "NSLeftMouseUp";

-        default:

-            switch([e subtype]) {

-                case NSTabletPointEventSubtype:

-                    return "NSTabletPointEventSubtype";

-                case NSTabletProximityEventSubtype:

-                    return "NSTabletProximityEventSubtype";

-                default:

-                    return "Other";

-            }

-    }

-}

-#endif

-

-- (void) sendX11NSEvent:(NSEvent *)e {

-    NSPoint location = NSZeroPoint, tilt = NSZeroPoint;

-    int ev_button, ev_type;

-    float pressure = 0.0;

-    DeviceIntPtr pDev;

-    int modifierFlags;

-    BOOL isMouseOrTabletEvent, isTabletEvent;

-

-    isMouseOrTabletEvent =  [e type] == NSLeftMouseDown    ||  [e type] == NSOtherMouseDown    ||  [e type] == NSRightMouseDown    ||

-                            [e type] == NSLeftMouseUp      ||  [e type] == NSOtherMouseUp      ||  [e type] == NSRightMouseUp      ||

-                            [e type] == NSLeftMouseDragged ||  [e type] == NSOtherMouseDragged ||  [e type] == NSRightMouseDragged ||

-                            [e type] == NSMouseMoved       ||  [e type] == NSTabletPoint       ||  [e type] == NSScrollWheel;

-

-    isTabletEvent = ([e type] == NSTabletPoint) ||

-                    (isMouseOrTabletEvent && ([e subtype] == NSTabletPointEventSubtype || [e subtype] == NSTabletProximityEventSubtype));

-

-    if(isMouseOrTabletEvent) {

-        static NSPoint lastpt;

-        NSWindow *window = [e window];

-        NSRect screen = [[[NSScreen screens] objectAtIndex:0] frame];

-	    BOOL hasUntrustedPointerDelta;

-        

-        // NSEvents for tablets are not consistent wrt deltaXY between events, so we cannot rely on that

-        // Thus tablets will be subject to the warp-pointer bug worked around by the delta, but tablets

-        // are not normally used in cases where that bug would present itself, so this is a fair tradeoff

-        // <rdar://problem/7111003> deltaX and deltaY are incorrect for NSMouseMoved, NSTabletPointEventSubtype

-        // http://xquartz.macosforge.org/trac/ticket/288

-        hasUntrustedPointerDelta = isTabletEvent;

-        

-        // The deltaXY for middle click events also appear erroneous after fast user switching

-        // <rdar://problem/7979468> deltaX and deltaY are incorrect for NSOtherMouseDown and NSOtherMouseUp after FUS

-        // http://xquartz.macosforge.org/trac/ticket/389

-        hasUntrustedPointerDelta = hasUntrustedPointerDelta || [e type] == NSOtherMouseDown || [e type] == NSOtherMouseUp;

-

-        // The deltaXY for scroll events correspond to the scroll delta, not the pointer delta

-        // <rdar://problem/7989690> deltaXY for wheel events are being sent as mouse movement

-        hasUntrustedPointerDelta = hasUntrustedPointerDelta || [e type] == NSScrollWheel;

-

-#ifdef DEBUG_UNTRUSTED_POINTER_DELTA

-        hasUntrustedPointerDelta = hasUntrustedPointerDelta || [e type] == NSLeftMouseDown || [e type] == NSLeftMouseUp;

-#endif

-        

-        if (window != nil)	{

-            NSRect frame = [window frame];

-            location = [e locationInWindow];

-            location.x += frame.origin.x;

-            location.y += frame.origin.y;

-            lastpt = location;

-        } else if(hasUntrustedPointerDelta) {

-#ifdef DEBUG_UNTRUSTED_POINTER_DELTA

-            ErrorF("--- Begin Event Debug ---\n");

-            ErrorF("Event type: %s\n", untrusted_str(e));

-            ErrorF("old lastpt: (%0.2f, %0.2f)\n", lastpt.x, lastpt.y);

-            ErrorF("     delta: (%0.2f, %0.2f)\n", [e deltaX], -[e deltaY]);

-            ErrorF("  location: (%0.2f, %0.2f)\n", lastpt.x + [e deltaX], lastpt.y - [e deltaY]);

-            ErrorF("workaround: (%0.2f, %0.2f)\n", [e locationInWindow].x, [e locationInWindow].y);

-            ErrorF("--- End Event Debug ---\n");

-

-            location.x = lastpt.x + [e deltaX];

-            location.y = lastpt.y - [e deltaY];

-            lastpt = [e locationInWindow];

-#else

-            location = [e locationInWindow];

-            lastpt = location;

-#endif

-        } else {

-            location.x = lastpt.x + [e deltaX];

-            location.y = lastpt.y - [e deltaY];

-            lastpt = [e locationInWindow];

-        }

-        

-        /* Convert coordinate system */

-        location.y = (screen.origin.y + screen.size.height) - location.y;

-    }

-    

-    modifierFlags = [e modifierFlags];

-    

-#ifdef NX_DEVICELCMDKEYMASK

-    /* This is to workaround a bug in the VNC server where we sometimes see the L

-     * modifier and sometimes see no "side"

-     */

-    modifierFlags = ensure_flag(modifierFlags, NX_CONTROLMASK,   NX_DEVICELCTLKEYMASK   | NX_DEVICERCTLKEYMASK,     NX_DEVICELCTLKEYMASK);

-    modifierFlags = ensure_flag(modifierFlags, NX_SHIFTMASK,     NX_DEVICELSHIFTKEYMASK | NX_DEVICERSHIFTKEYMASK,   NX_DEVICELSHIFTKEYMASK);

-    modifierFlags = ensure_flag(modifierFlags, NX_COMMANDMASK,   NX_DEVICELCMDKEYMASK   | NX_DEVICERCMDKEYMASK,     NX_DEVICELCMDKEYMASK);

-    modifierFlags = ensure_flag(modifierFlags, NX_ALTERNATEMASK, NX_DEVICELALTKEYMASK   | NX_DEVICERALTKEYMASK,     NX_DEVICELALTKEYMASK);

-#endif

-

-    modifierFlags &= darwin_all_modifier_mask;

-

-    /* We don't receive modifier key events while out of focus, and 3button

-     * emulation mucks this up, so we need to check our modifier flag state

-     * on every event... ugg

-     */

-    

-    if(darwin_all_modifier_flags != modifierFlags)

-        DarwinUpdateModKeys(modifierFlags);

-    

-	switch ([e type]) {

-		case NSLeftMouseDown:     ev_button=1; ev_type=ButtonPress;   goto handle_mouse;

-		case NSOtherMouseDown:    ev_button=2; ev_type=ButtonPress;   goto handle_mouse;

-		case NSRightMouseDown:    ev_button=3; ev_type=ButtonPress;   goto handle_mouse;

-		case NSLeftMouseUp:       ev_button=1; ev_type=ButtonRelease; goto handle_mouse;

-		case NSOtherMouseUp:      ev_button=2; ev_type=ButtonRelease; goto handle_mouse;

-		case NSRightMouseUp:      ev_button=3; ev_type=ButtonRelease; goto handle_mouse;

-		case NSLeftMouseDragged:  ev_button=1; ev_type=MotionNotify;  goto handle_mouse;

-		case NSOtherMouseDragged: ev_button=2; ev_type=MotionNotify;  goto handle_mouse;

-		case NSRightMouseDragged: ev_button=3; ev_type=MotionNotify;  goto handle_mouse;

-		case NSMouseMoved:        ev_button=0; ev_type=MotionNotify;  goto handle_mouse;

-        case NSTabletPoint:       ev_button=0; ev_type=MotionNotify;  goto handle_mouse;

-            

-        handle_mouse:

-            pDev = darwinPointer;

-

-            /* NSTabletPoint can have no subtype */

-            if([e type] != NSTabletPoint &&

-               [e subtype] == NSTabletProximityEventSubtype) {

-                switch([e pointingDeviceType]) {

-                    case NSEraserPointingDevice:

-                        darwinTabletCurrent=darwinTabletEraser;

-                        break;

-                    case NSPenPointingDevice:

-                        darwinTabletCurrent=darwinTabletStylus;

-                        break;

-                    case NSCursorPointingDevice:

-                    case NSUnknownPointingDevice:

-                    default:

-                        darwinTabletCurrent=darwinTabletCursor;

-                        break;

-                }

-                

-                /* NSTabletProximityEventSubtype doesn't encode pressure ant tilt

-                 * So we just pretend the motion was caused by the mouse.  Hopefully

-                 * we'll have a better solution for this in the future (like maybe

-                 * NSTabletProximityEventSubtype will come from NSTabletPoint

-                 * rather than NSMouseMoved.

-                pressure = [e pressure];

-                tilt     = [e tilt];

-                pDev = darwinTabletCurrent;                

-                 */

-

-                DarwinSendProximityEvents([e isEnteringProximity] ? ProximityIn : ProximityOut,

-                                          location.x, location.y);

-            }

-

-			if ([e type] == NSTabletPoint || [e subtype] == NSTabletPointEventSubtype) {

-                pressure = [e pressure];

-                tilt     = [e tilt];

-                

-                pDev = darwinTabletCurrent;

-            }

-

-            if(!XQuartzServerVisible && noTestExtensions) {

-#if defined(XPLUGIN_VERSION) && XPLUGIN_VERSION > 0

-/* Older libXplugin (Tiger/"Stock" Leopard) aren't thread safe, so we can't call xp_find_window from the Appkit thread */

-                xp_window_id wid = 0;

-                xp_error e;

-

-                /* Sigh. Need to check that we're really over one of

-                 * our windows. (We need to receive pointer events while

-                 * not in the foreground, but we don't want to receive them

-                 * when another window is over us or we might show a tooltip)

-                 */

-

-                e = xp_find_window(location.x, location.y, 0, &wid);

-

-                if (e != XP_Success || (e == XP_Success && wid == 0))

-#endif

-                {

-                    bgMouseLocation = location;

-                    bgMouseLocationUpdated = TRUE;

-                    return;

-                }

-            }

-            

-            if(bgMouseLocationUpdated) {

-                if(!(ev_type == MotionNotify && ev_button == 0)) {

-                    DarwinSendPointerEvents(pDev, MotionNotify, 0, location.x,

-                                            location.y, pressure, tilt.x, tilt.y);

-                }

-                bgMouseLocationUpdated = FALSE;

-            }

-

-            DarwinSendPointerEvents(pDev, ev_type, ev_button, location.x, location.y,

-                                    pressure, tilt.x, tilt.y);

-            

-            break;

-            

-		case NSTabletProximity:

-            switch([e pointingDeviceType]) {

-                case NSEraserPointingDevice:

-                    darwinTabletCurrent=darwinTabletEraser;

-                    break;

-                case NSPenPointingDevice:

-                    darwinTabletCurrent=darwinTabletStylus;

-                    break;

-                case NSCursorPointingDevice:

-                case NSUnknownPointingDevice:

-                default:

-                    darwinTabletCurrent=darwinTabletCursor;

-                    break;

-            }

-            

-			DarwinSendProximityEvents([e isEnteringProximity] ? ProximityIn : ProximityOut,

-                                      location.x, location.y);

-            break;

-            

-		case NSScrollWheel:

-#if !defined(XPLUGIN_VERSION) || XPLUGIN_VERSION == 0

-            /* If we're in the background, we need to send a MotionNotify event

-             * first, since we aren't getting them on background mouse motion

-             */

-            if(!XQuartzServerVisible && noTestExtensions) {

-                bgMouseLocationUpdated = FALSE;

-                DarwinSendPointerEvents(darwinPointer, MotionNotify, 0, location.x,

-                                        location.y, pressure, tilt.x, tilt.y);

-            }

-#endif

-			DarwinSendScrollEvents([e deltaX], [e deltaY], location.x, location.y,

-                                   pressure, tilt.x, tilt.y);

-            break;

-            

-        case NSKeyDown: case NSKeyUp:

-            {

-                /* XKB clobbers our keymap at startup, so we need to force it on the first keypress.

-                 * TODO: Make this less of a kludge.

-                 */

-                static int force_resync_keymap = YES;

-                if(force_resync_keymap) {

-                    DarwinSendDDXEvent(kXquartzReloadKeymap, 0);

-                    force_resync_keymap = NO;

-                }

-            }

-

-            if(darwinSyncKeymap) {

-#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050

-                TISInputSourceRef key_layout = TISCopyCurrentKeyboardLayoutInputSource();

-                TISInputSourceRef clear;

-                if (CFEqual(key_layout, last_key_layout)) {

-                    CFRelease(key_layout);

-                } else {

-                    /* Swap/free thread-safely */

-                    clear = last_key_layout;

-                    last_key_layout = key_layout;

-                    CFRelease(clear);

-#else

-                KeyboardLayoutRef key_layout;

-                KLGetCurrentKeyboardLayout(&key_layout);

-                if(key_layout != last_key_layout) {

-                    last_key_layout = key_layout;

-#endif

-                    /* Update keyInfo */

-                    if (!QuartsResyncKeymap(TRUE)) {

-                        fprintf(stderr, "sendX11NSEvent: Could not build a valid keymap.\n");

-                    }

-                }

-            }

-

-            /* Avoid stuck keys on context switch */

-            if(keyState[[e keyCode]] == [e type])

-                return;

-            keyState[[e keyCode]] = [e type];

-

-            DarwinSendKeyboardEvents(([e type] == NSKeyDown) ? KeyPress : KeyRelease, [e keyCode]);

-            break;

-            

-        default: break; /* for gcc */

-	}	

-}

-@end

+/* X11Application.m -- subclass of NSApplication to multiplex events
+ 
+ Copyright (c) 2002-2008 Apple Inc.
+ 
+ Permission is hereby granted, free of charge, to any person
+ obtaining a copy of this software and associated documentation files
+ (the "Software"), to deal in the Software without restriction,
+ including without limitation the rights to use, copy, modify, merge,
+ publish, distribute, sublicense, and/or sell copies of the Software,
+ and to permit persons to whom the Software is furnished to do so,
+ subject to the following conditions:
+ 
+ The above copyright notice and this permission notice shall be
+ included in all copies or substantial portions of the Software.
+ 
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NONINFRINGEMENT.  IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT
+ HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ DEALINGS IN THE SOFTWARE.
+ 
+ Except as contained in this notice, the name(s) of the above
+ copyright holders shall not be used in advertising or otherwise to
+ promote the sale, use or other dealings in this Software without
+ prior written authorization. */
+
+#include "sanitizedCarbon.h"
+
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
+#include "quartzCommon.h"
+
+#import "X11Application.h"
+
+#include "darwin.h"
+#include "quartz.h"
+#include "darwinEvents.h"
+#include "quartzKeyboard.h"
+#include "quartz.h"
+#include <X11/extensions/applewmconst.h>
+#include "micmap.h"
+#include "exglobals.h"
+
+#include <mach/mach.h>
+#include <unistd.h>
+#include <AvailabilityMacros.h>
+
+#include <Xplugin.h>
+
+// pbproxy/pbproxy.h
+extern int xpbproxy_run (void);
+
+#define DEFAULTS_FILE X11LIBDIR"/X11/xserver/Xquartz.plist"
+
+#ifndef XSERVER_VERSION
+#define XSERVER_VERSION "?"
+#endif
+
+/* Stuck modifier / button state... force release when we context switch */
+static NSEventType keyState[NUM_KEYCODES];
+
+extern Bool noTestExtensions;
+
+#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050
+static TISInputSourceRef last_key_layout;
+#else
+static KeyboardLayoutRef last_key_layout;
+#endif
+
+extern int darwinFakeButtons;
+
+/* Store the mouse location while in the background, and update X11's pointer
+ * location when we become the foreground application
+ */
+static NSPoint bgMouseLocation;
+static BOOL bgMouseLocationUpdated = FALSE;
+
+X11Application *X11App;
+
+CFStringRef app_prefs_domain_cfstr = NULL;
+
+#define ALL_KEY_MASKS (NSShiftKeyMask | NSControlKeyMask | NSAlternateKeyMask | NSCommandKeyMask)
+
+@interface X11Application (Private)
+- (void) sendX11NSEvent:(NSEvent *)e;
+@end
+
+@implementation X11Application
+
+typedef struct message_struct message;
+struct message_struct {
+    mach_msg_header_t hdr;
+    SEL selector;
+    NSObject *arg;
+};
+
+static mach_port_t _port;
+
+/* Quartz mode initialization routine. This is often dynamically loaded
+   but is statically linked into this X server. */
+Bool QuartzModeBundleInit(void);
+
+static void init_ports (void) {
+    kern_return_t r;
+    NSPort *p;
+	
+    if (_port != MACH_PORT_NULL) return;
+	
+    r = mach_port_allocate (mach_task_self (), MACH_PORT_RIGHT_RECEIVE, &_port);
+    if (r != KERN_SUCCESS) return;
+	
+    p = [NSMachPort portWithMachPort:_port];
+    [p setDelegate:NSApp];
+    [p scheduleInRunLoop:[NSRunLoop currentRunLoop] forMode:NSDefaultRunLoopMode];
+}
+
+static void message_kit_thread (SEL selector, NSObject *arg) {
+    message msg;
+    kern_return_t r;
+	
+    msg.hdr.msgh_bits = MACH_MSGH_BITS (MACH_MSG_TYPE_MAKE_SEND, 0);
+    msg.hdr.msgh_size = sizeof (msg);
+    msg.hdr.msgh_remote_port = _port;
+    msg.hdr.msgh_local_port = MACH_PORT_NULL;
+    msg.hdr.msgh_reserved = 0;
+    msg.hdr.msgh_id = 0;
+	
+    msg.selector = selector;
+    msg.arg = [arg retain];
+	
+    r = mach_msg (&msg.hdr, MACH_SEND_MSG, msg.hdr.msgh_size,
+		  0, MACH_PORT_NULL, 0, MACH_PORT_NULL);
+    if (r != KERN_SUCCESS)
+		ErrorF("%s: mach_msg failed: %x\n", __FUNCTION__, r);
+}
+
+- (void) handleMachMessage:(void *)_msg {
+    message *msg = _msg;
+	
+    [self performSelector:msg->selector withObject:msg->arg];
+    [msg->arg release];
+}
+
+- (void) set_controller:obj {
+    if (_controller == nil) _controller = [obj retain];
+}
+
+- (void) dealloc {
+    if (_controller != nil) [_controller release];
+	
+    if (_port != MACH_PORT_NULL)
+		mach_port_deallocate (mach_task_self (), _port);
+	
+    [super dealloc];
+}
+
+- (void) orderFrontStandardAboutPanel: (id) sender {
+    NSMutableDictionary *dict;
+    NSDictionary *infoDict;
+    NSString *tem;
+    
+    dict = [NSMutableDictionary dictionaryWithCapacity:3];
+    infoDict = [[NSBundle mainBundle] infoDictionary];
+    
+    [dict setObject: NSLocalizedString (@"The X Window System", @"About panel")
+          forKey:@"ApplicationName"];
+    
+    tem = [infoDict objectForKey:@"CFBundleShortVersionString"];
+    
+    [dict setObject:[NSString stringWithFormat:@"XQuartz %@", tem]
+          forKey:@"ApplicationVersion"];
+
+    [dict setObject:[NSString stringWithFormat:@"xorg-server %s", XSERVER_VERSION]
+          forKey:@"Version"];
+    
+    [self orderFrontStandardAboutPanelWithOptions: dict];
+}
+
+- (void) activateX:(OSX_BOOL)state {
+    size_t i;
+    DEBUG_LOG("state=%d, _x_active=%d, \n", state, _x_active)
+    if (state) {
+        if(bgMouseLocationUpdated) {
+            DarwinSendPointerEvents(darwinPointer, MotionNotify, 0, bgMouseLocation.x, bgMouseLocation.y, 0.0, 0.0, 0.0);
+            bgMouseLocationUpdated = FALSE;
+        }
+        DarwinSendDDXEvent(kXquartzActivate, 0);
+    } else {
+
+        if(darwin_all_modifier_flags)
+            DarwinUpdateModKeys(0);
+        for(i=0; i < NUM_KEYCODES; i++) {
+            if(keyState[i] == NSKeyDown) {
+                DarwinSendKeyboardEvents(KeyRelease, i);
+                keyState[i] = NSKeyUp;
+            }
+        }
+        
+        DarwinSendDDXEvent(kXquartzDeactivate, 0);
+    }
+
+    _x_active = state;
+}
+
+- (void) became_key:(NSWindow *)win {
+	[self activateX:NO];
+}
+
+- (void) sendEvent:(NSEvent *)e {
+    OSX_BOOL for_appkit, for_x;
+    
+    /* By default pass down the responder chain and to X. */
+    for_appkit = YES;
+    for_x = YES;
+    
+    switch ([e type]) {
+        case NSLeftMouseDown: case NSRightMouseDown: case NSOtherMouseDown:
+        case NSLeftMouseUp: case NSRightMouseUp: case NSOtherMouseUp:
+            if ([e window] != nil) {
+                /* Pointer event has an (AppKit) window. Probably something for the kit. */
+                for_x = NO;
+                if (_x_active) [self activateX:NO];
+            } else if ([self modalWindow] == nil) {
+                /* Must be an X window. Tell appkit it doesn't have focus. */
+                for_appkit = NO;
+                
+                if ([self isActive]) {
+                    [self deactivate];
+                    if (!_x_active && quartzProcs->IsX11Window([e window],
+                                                               [e windowNumber]))
+                        [self activateX:YES];
+                }
+            }
+
+            /* We want to force sending to appkit if we're over the menu bar */
+            if(!for_appkit) {
+                NSPoint NSlocation = [e locationInWindow];
+                NSWindow *window = [e window];
+                NSRect NSframe, NSvisibleFrame;
+                CGRect CGframe, CGvisibleFrame;
+                CGPoint CGlocation;
+
+                if (window != nil)	{
+                    NSRect frame = [window frame];
+                    NSlocation.x += frame.origin.x;
+                    NSlocation.y += frame.origin.y;
+                }
+
+                NSframe = [[NSScreen mainScreen] frame];
+                NSvisibleFrame = [[NSScreen mainScreen] visibleFrame];
+                
+                CGframe = CGRectMake(NSframe.origin.x, NSframe.origin.y,
+                                            NSframe.size.width, NSframe.size.height);
+                CGvisibleFrame = CGRectMake(NSvisibleFrame.origin.x,
+                                                   NSvisibleFrame.origin.y,
+                                                   NSvisibleFrame.size.width,
+                                                   NSvisibleFrame.size.height);
+                CGlocation = CGPointMake(NSlocation.x, NSlocation.y);
+                
+                if(CGRectContainsPoint(CGframe, CGlocation) &&
+                   !CGRectContainsPoint(CGvisibleFrame, CGlocation))
+                    for_appkit = YES;
+            }
+            
+            break;
+            
+        case NSKeyDown: case NSKeyUp:
+            
+            if(_x_active) {
+                static BOOL do_swallow = NO;
+                static int swallow_keycode;
+                
+                if([e type] == NSKeyDown) {
+                    /* Before that though, see if there are any global
+                     * shortcuts bound to it. */
+
+                    if(darwinAppKitModMask & [e modifierFlags]) {
+                        /* Override to force sending to Appkit */
+                        swallow_keycode = [e keyCode];
+                        do_swallow = YES;
+                        for_x = NO;
+#if XPLUGIN_VERSION >= 1
+                    } else if(XQuartzEnableKeyEquivalents &&
+                             xp_is_symbolic_hotkey_event([e eventRef])) {
+                        swallow_keycode = [e keyCode];
+                        do_swallow = YES;
+                        for_x = NO;
+#endif
+                    } else if(XQuartzEnableKeyEquivalents &&
+                              [[self mainMenu] performKeyEquivalent:e]) {
+                        swallow_keycode = [e keyCode];
+                        do_swallow = YES;
+                        for_appkit = NO;
+                        for_x = NO;
+                    } else if(!XQuartzIsRootless
+                              && ([e modifierFlags] & ALL_KEY_MASKS) == (NSCommandKeyMask | NSAlternateKeyMask)
+                              && ([e keyCode] == 0 /*a*/ || [e keyCode] == 53 /*Esc*/)) {
+                        /* We have this here to force processing fullscreen 
+                         * toggle even if XQuartzEnableKeyEquivalents is disabled */
+                        swallow_keycode = [e keyCode];
+                        do_swallow = YES;
+                        for_x = NO;
+                        for_appkit = NO;
+                        DarwinSendDDXEvent(kXquartzToggleFullscreen, 0);
+                    } else {
+                        /* No kit window is focused, so send it to X. */
+                        for_appkit = NO;
+                    }
+                } else { /* KeyUp */
+                    /* If we saw a key equivalent on the down, don't pass
+                     * the up through to X. */
+                    if (do_swallow && [e keyCode] == swallow_keycode) {
+                        do_swallow = NO;
+                        for_x = NO;
+                    }
+                }
+            } else { /* !_x_active */
+                for_x = NO;
+            }
+            break;
+            
+        case NSFlagsChanged:
+            /* Don't tell X11 about modifiers changing while it's not active */
+            if (!_x_active)
+                for_x = NO;
+            break;
+            
+        case NSAppKitDefined:
+            switch ([e subtype]) {
+                case NSApplicationActivatedEventType:
+                    for_x = NO;
+                    if ([self modalWindow] == nil) {
+                        BOOL order_all_windows = YES, workspaces, ok;
+                        for_appkit = NO;
+                        
+                        /* FIXME: hack to avoid having to pass the event to appkit,
+                         which would cause it to raise one of its windows. */
+                        _appFlags._active = YES;
+                        
+                        [self activateX:YES];
+                        
+                        /* Get the Spaces preference for SwitchOnActivate */
+                        (void)CFPreferencesAppSynchronize(CFSTR("com.apple.dock"));
+                        workspaces = CFPreferencesGetAppBooleanValue(CFSTR("workspaces"), CFSTR("com.apple.dock"), &ok);
+                        if (!ok)
+                            workspaces = NO;
+
+                        if (workspaces) {
+                            (void)CFPreferencesAppSynchronize(CFSTR(".GlobalPreferences"));
+                            order_all_windows = CFPreferencesGetAppBooleanValue(CFSTR("AppleSpacesSwitchOnActivate"), CFSTR(".GlobalPreferences"), &ok);
+                            if (!ok)
+                                order_all_windows = YES;
+                        }
+                        
+                        /* TODO: In the workspaces && !AppleSpacesSwitchOnActivate case, the windows are ordered
+                         *       correctly, but we need to activate the top window on this space if there is
+                         *       none active.
+                         *
+                         *       If there are no active windows, and there are minimized windows, we should
+                         *       be restoring one of them.
+                         */
+                        if ([e data2] & 0x10) // 0x10 is set when we use cmd-tab or the dock icon
+                            DarwinSendDDXEvent(kXquartzBringAllToFront, 1, order_all_windows);
+                    }
+                    break;
+                    
+                case 18: /* ApplicationDidReactivate */
+                    if (XQuartzFullscreenVisible) for_appkit = NO;
+                    break;
+                    
+                case NSApplicationDeactivatedEventType:
+                    for_x = NO;
+                    [self activateX:NO];
+                    break;
+            }
+            break;
+            
+        default: break; /* for gcc */
+    }
+    
+    if (for_appkit) [super sendEvent:e];
+    
+    if (for_x) [self sendX11NSEvent:e];
+}
+
+- (void) set_window_menu:(NSArray *)list {
+	[_controller set_window_menu:list];
+}
+
+- (void) set_window_menu_check:(NSNumber *)n {
+	[_controller set_window_menu_check:n];
+}
+
+- (void) set_apps_menu:(NSArray *)list {
+	[_controller set_apps_menu:list];
+}
+
+- (void) set_front_process:unused {
+	[NSApp activateIgnoringOtherApps:YES];
+
+	if ([self modalWindow] == nil)
+		[self activateX:YES];
+}
+
+- (void) set_can_quit:(NSNumber *)state {
+	[_controller set_can_quit:[state boolValue]];
+}
+
+- (void) server_ready:unused {
+	[_controller server_ready];
+}
+
+- (void) show_hide_menubar:(NSNumber *)state {
+    /* Also shows/hides the dock */
+    if ([state boolValue])
+        SetSystemUIMode(kUIModeNormal, 0); 
+    else
+        SetSystemUIMode(kUIModeAllHidden, XQuartzFullscreenMenu ? kUIOptionAutoShowMenuBar : 0); // kUIModeAllSuppressed or kUIOptionAutoShowMenuBar can be used to allow "mouse-activation"
+}
+
+- (void) launch_client:(NSString *)cmd {
+    (void)[_controller application:self openFile:cmd];
+}
+
+/* user preferences */
+
+/* Note that these functions only work for arrays whose elements
+ can be toll-free-bridged between NS and CF worlds. */
+
+static const void *cfretain (CFAllocatorRef a, const void *b) {
+    return CFRetain (b);
+}
+
+static void cfrelease (CFAllocatorRef a, const void *b) {
+    CFRelease (b);
+}
+
+static CFMutableArrayRef nsarray_to_cfarray (NSArray *in) {
+	CFMutableArrayRef out;
+	CFArrayCallBacks cb;
+	NSObject *ns;
+	const CFTypeRef *cf;
+	int i, count;
+
+	memset (&cb, 0, sizeof (cb));
+	cb.version = 0;
+	cb.retain = cfretain;
+	cb.release = cfrelease;
+
+	count = [in count];
+	out = CFArrayCreateMutable (NULL, count, &cb);
+
+	for (i = 0; i < count; i++) {
+		ns = [in objectAtIndex:i];
+
+		if ([ns isKindOfClass:[NSArray class]])
+			cf = (CFTypeRef) nsarray_to_cfarray ((NSArray *) ns);
+		else
+			cf = CFRetain ((CFTypeRef) ns);
+
+		CFArrayAppendValue (out, cf);
+		CFRelease (cf);
+	}
+
+	return out;
+}
+
+static NSMutableArray * cfarray_to_nsarray (CFArrayRef in) {
+	NSMutableArray *out;
+	const CFTypeRef *cf;
+	NSObject *ns;
+	int i, count;
+
+	count = CFArrayGetCount (in);
+	out = [[NSMutableArray alloc] initWithCapacity:count];
+
+	for (i = 0; i < count; i++) {
+		cf = CFArrayGetValueAtIndex (in, i);
+
+		if (CFGetTypeID (cf) == CFArrayGetTypeID ())
+			ns = cfarray_to_nsarray ((CFArrayRef) cf);
+		else
+			ns = [(id)cf retain];
+
+		[out addObject:ns];
+		[ns release];
+	}
+
+	return out;
+}
+
+- (CFPropertyListRef) prefs_get_copy:(NSString *)key {
+    CFPropertyListRef value;
+	
+    value = CFPreferencesCopyAppValue ((CFStringRef) key, app_prefs_domain_cfstr);
+	
+    if (value == NULL) {
+      static CFDictionaryRef defaults;
+      
+      if (defaults == NULL) {
+	CFStringRef error = NULL;
+	CFDataRef data;
+	CFURLRef url;
+	SInt32 error_code;
+	
+	url = (CFURLCreateFromFileSystemRepresentation
+	       (NULL, (unsigned char *)DEFAULTS_FILE, strlen (DEFAULTS_FILE), false));
+	if (CFURLCreateDataAndPropertiesFromResource (NULL, url, &data,
+						      NULL, NULL, &error_code)) {
+	  defaults = (CFPropertyListCreateFromXMLData
+		      (NULL, data, kCFPropertyListMutableContainersAndLeaves, &error));
+	  if (error != NULL) CFRelease (error);
+	  CFRelease (data);
+	}
+	CFRelease (url);
+			
+	if (defaults != NULL) {
+	  NSMutableArray *apps, *elt;
+	  int count, i;
+	  NSString *name, *nname;
+	  
+	  /* Localize the names in the default apps menu. */
+	  
+	  apps = [(NSDictionary *)defaults objectForKey:@PREFS_APPSMENU];
+	  if (apps != nil) {
+	    count = [apps count];
+	    for (i = 0; i < count; i++)	{
+	      elt = [apps objectAtIndex:i];
+	      if (elt != nil && [elt isKindOfClass:[NSArray class]]) {
+		name = [elt objectAtIndex:0];
+		if (name != nil) {
+		  nname = NSLocalizedString (name, nil);
+		  if (nname != nil && nname != name)
+		    [elt replaceObjectAtIndex:0 withObject:nname];
+		}
+	      }
+	    }
+	  }
+	}
+      }
+		
+      if (defaults != NULL) value = CFDictionaryGetValue (defaults, key);
+      if (value != NULL) CFRetain (value);
+    }
+	
+    return value;
+}
+
+- (int) prefs_get_integer:(NSString *)key default:(int)def {
+  CFPropertyListRef value;
+  int ret;
+  
+  value = [self prefs_get_copy:key];
+  
+  if (value != NULL && CFGetTypeID (value) == CFNumberGetTypeID ())
+    CFNumberGetValue (value, kCFNumberIntType, &ret);
+  else if (value != NULL && CFGetTypeID (value) == CFStringGetTypeID ())
+    ret = CFStringGetIntValue (value);
+  else
+    ret = def;
+  
+  if (value != NULL) CFRelease (value);
+  
+  return ret;
+}
+
+- (const char *) prefs_get_string:(NSString *)key default:(const char *)def {
+  CFPropertyListRef value;
+  const char *ret = NULL;
+  
+  value = [self prefs_get_copy:key];
+  
+  if (value != NULL && CFGetTypeID (value) == CFStringGetTypeID ()) {
+    NSString *s = (NSString *) value;
+    
+    ret = [s UTF8String];
+  }
+  
+  if (value != NULL) CFRelease (value);
+  
+  return ret != NULL ? ret : def;
+}
+
+- (NSURL *) prefs_copy_url:(NSString *)key default:(NSURL *)def {
+    CFPropertyListRef value;
+    NSURL *ret = NULL;
+    
+    value = [self prefs_get_copy:key];
+    
+    if (value != NULL && CFGetTypeID (value) == CFStringGetTypeID ()) {
+        NSString *s = (NSString *) value;
+
+        ret = [NSURL URLWithString:s];
+        [ret retain];
+    }
+    
+    if (value != NULL) CFRelease (value);
+    
+    return ret != NULL ? ret : def;
+}
+
+- (float) prefs_get_float:(NSString *)key default:(float)def {
+  CFPropertyListRef value;
+  float ret = def;
+  
+  value = [self prefs_get_copy:key];
+  
+  if (value != NULL
+      && CFGetTypeID (value) == CFNumberGetTypeID ()
+      && CFNumberIsFloatType (value))
+    CFNumberGetValue (value, kCFNumberFloatType, &ret);
+  else if (value != NULL && CFGetTypeID (value) == CFStringGetTypeID ())
+    ret = CFStringGetDoubleValue (value);
+	
+  if (value != NULL) CFRelease (value);
+  
+  return ret;
+}
+
+- (int) prefs_get_boolean:(NSString *)key default:(int)def {
+  CFPropertyListRef value;
+  int ret = def;
+  
+  value = [self prefs_get_copy:key];
+  
+  if (value != NULL) {
+    if (CFGetTypeID (value) == CFNumberGetTypeID ())
+      CFNumberGetValue (value, kCFNumberIntType, &ret);
+    else if (CFGetTypeID (value) == CFBooleanGetTypeID ())
+      ret = CFBooleanGetValue (value);
+    else if (CFGetTypeID (value) == CFStringGetTypeID ()) {
+      const char *tem = [(NSString *) value UTF8String];
+      if (strcasecmp (tem, "true") == 0 || strcasecmp (tem, "yes") == 0)
+	ret = YES;
+      else
+	ret = NO;
+    }
+    
+    CFRelease (value);
+  }
+  return ret;
+}
+
+- (NSArray *) prefs_get_array:(NSString *)key {
+  NSArray *ret = nil;
+  CFPropertyListRef value;
+  
+  value = [self prefs_get_copy:key];
+  
+  if (value != NULL) {
+    if (CFGetTypeID (value) == CFArrayGetTypeID ())
+      ret = [cfarray_to_nsarray (value) autorelease];
+    
+    CFRelease (value);
+  }
+  
+  return ret;
+}
+
+- (void) prefs_set_integer:(NSString *)key value:(int)value {
+    CFNumberRef x;
+	
+    x = CFNumberCreate (NULL, kCFNumberIntType, &value);
+	
+    CFPreferencesSetValue ((CFStringRef) key, (CFTypeRef) x, app_prefs_domain_cfstr,
+			   kCFPreferencesCurrentUser, kCFPreferencesAnyHost);
+	
+    CFRelease (x);
+}
+
+- (void) prefs_set_float:(NSString *)key value:(float)value {
+    CFNumberRef x;
+	
+    x = CFNumberCreate (NULL, kCFNumberFloatType, &value);
+	
+    CFPreferencesSetValue ((CFStringRef) key, (CFTypeRef) x, app_prefs_domain_cfstr,
+			   kCFPreferencesCurrentUser, kCFPreferencesAnyHost);
+	
+    CFRelease (x);
+}
+
+- (void) prefs_set_boolean:(NSString *)key value:(int)value {
+  CFPreferencesSetValue ((CFStringRef) key,
+			 (CFTypeRef) (value ? kCFBooleanTrue
+			 : kCFBooleanFalse), app_prefs_domain_cfstr,
+			 kCFPreferencesCurrentUser, kCFPreferencesAnyHost);
+  
+}
+
+- (void) prefs_set_array:(NSString *)key value:(NSArray *)value {
+  CFArrayRef cfarray;
+  
+  cfarray = nsarray_to_cfarray (value);
+  CFPreferencesSetValue ((CFStringRef) key,
+			 (CFTypeRef) cfarray,
+			 app_prefs_domain_cfstr,
+			 kCFPreferencesCurrentUser, kCFPreferencesAnyHost);
+  CFRelease (cfarray);
+}
+
+- (void) prefs_set_string:(NSString *)key value:(NSString *)value {
+  CFPreferencesSetValue ((CFStringRef) key, (CFTypeRef) value,
+			 app_prefs_domain_cfstr, kCFPreferencesCurrentUser,
+			 kCFPreferencesAnyHost);
+}
+
+- (void) prefs_synchronize {
+    CFPreferencesAppSynchronize (kCFPreferencesCurrentApplication);
+}
+
+- (void) read_defaults
+{
+    NSString *nsstr;
+    const char *tem;
+	
+    XQuartzRootlessDefault = [self prefs_get_boolean:@PREFS_ROOTLESS
+                                           default:XQuartzRootlessDefault];
+    XQuartzFullscreenMenu = [self prefs_get_boolean:@PREFS_FULLSCREEN_MENU
+                                           default:XQuartzFullscreenMenu];
+    XQuartzFullscreenDisableHotkeys = ![self prefs_get_boolean:@PREFS_FULLSCREEN_HOTKEYS
+                                                      default:!XQuartzFullscreenDisableHotkeys];
+    darwinFakeButtons = [self prefs_get_boolean:@PREFS_FAKEBUTTONS
+                                        default:darwinFakeButtons];
+    XQuartzOptionSendsAlt = [self prefs_get_boolean:@PREFS_OPTION_SENDS_ALT
+                                           default:XQuartzOptionSendsAlt];
+
+    if (darwinFakeButtons) {
+        const char *fake2, *fake3;
+
+        fake2 = [self prefs_get_string:@PREFS_FAKE_BUTTON2 default:NULL];
+        fake3 = [self prefs_get_string:@PREFS_FAKE_BUTTON3 default:NULL];
+
+        if (fake2 != NULL) darwinFakeMouse2Mask = DarwinParseModifierList(fake2, TRUE);
+        if (fake3 != NULL) darwinFakeMouse3Mask = DarwinParseModifierList(fake3, TRUE);
+    }
+
+    tem = [self prefs_get_string:@PREFS_APPKIT_MODIFIERS default:NULL];
+    if (tem != NULL) darwinAppKitModMask = DarwinParseModifierList(tem, TRUE);
+	
+    tem = [self prefs_get_string:@PREFS_WINDOW_ITEM_MODIFIERS default:NULL];
+    if (tem != NULL) {
+        windowItemModMask = DarwinParseModifierList(tem, FALSE);
+    } else {
+        nsstr = NSLocalizedString (@"window item modifiers", @"window item modifiers");
+        if(nsstr != NULL) {
+            tem = [nsstr UTF8String];
+            if((tem != NULL) && strcmp(tem, "window item modifiers")) {
+                windowItemModMask = DarwinParseModifierList(tem, FALSE);
+            }
+        }
+    }
+
+    XQuartzEnableKeyEquivalents = [self prefs_get_boolean:@PREFS_KEYEQUIVS
+                                              default:XQuartzEnableKeyEquivalents];
+	
+    darwinSyncKeymap = [self prefs_get_boolean:@PREFS_SYNC_KEYMAP
+                                       default:darwinSyncKeymap];
+		
+    darwinDesiredDepth = [self prefs_get_integer:@PREFS_DEPTH
+                                         default:darwinDesiredDepth];
+    
+    noTestExtensions = ![self prefs_get_boolean:@PREFS_TEST_EXTENSIONS
+                                        default:FALSE];
+
+#if XQUARTZ_SPARKLE
+    NSURL *url =  [self prefs_copy_url:@PREFS_UPDATE_FEED default:nil];
+    if(url) {
+        [[SUUpdater sharedUpdater] setFeedURL:url];
+        [url release];
+    }
+#endif
+}
+
+/* This will end up at the end of the responder chain. */
+- (void) copy:sender {
+  DarwinSendDDXEvent(kXquartzPasteboardNotify, 1,
+			     AppleWMCopyToPasteboard);
+}
+
+- (X11Controller *) controller {
+    return _controller;
+}
+
+- (OSX_BOOL) x_active {
+    return _x_active;
+}
+
+@end
+
+static NSArray *
+array_with_strings_and_numbers (int nitems, const char **items,
+				const char *numbers) {
+  NSMutableArray *array, *subarray;
+  NSString *string, *number;
+  int i;
+	
+  /* (Can't autorelease on the X server thread) */
+  
+  array = [[NSMutableArray alloc] initWithCapacity:nitems];
+  
+  for (i = 0; i < nitems; i++) {
+    subarray = [[NSMutableArray alloc] initWithCapacity:2];
+    
+    string = [[NSString alloc] initWithUTF8String:items[i]];
+    [subarray addObject:string];
+    [string release];
+    
+    if (numbers[i] != 0) {
+      number = [[NSString alloc] initWithFormat:@"%d", numbers[i]];
+      [subarray addObject:number];
+      [number release];
+    } else
+      [subarray addObject:@""];
+    
+    [array addObject:subarray];
+    [subarray release];
+  }
+  
+  return array;
+}
+
+void X11ApplicationSetWindowMenu (int nitems, const char **items,
+				  const char *shortcuts) {
+  NSArray *array;
+  array = array_with_strings_and_numbers (nitems, items, shortcuts);
+  
+  /* Send the array of strings over to the appkit thread */
+  
+  message_kit_thread (@selector (set_window_menu:), array);
+  [array release];
+}
+
+void X11ApplicationSetWindowMenuCheck (int idx) {
+  NSNumber *n;
+  
+  n = [[NSNumber alloc] initWithInt:idx];
+  
+  message_kit_thread (@selector (set_window_menu_check:), n);
+  
+  [n release];
+}
+
+void X11ApplicationSetFrontProcess (void) {
+    message_kit_thread (@selector (set_front_process:), nil);
+}
+
+void X11ApplicationSetCanQuit (int state) {
+    NSNumber *n;
+	
+    n = [[NSNumber alloc] initWithBool:state];
+	
+    message_kit_thread (@selector (set_can_quit:), n);
+	
+    [n release];
+}
+
+void X11ApplicationServerReady (void) {
+    message_kit_thread (@selector (server_ready:), nil);
+}
+
+void X11ApplicationShowHideMenubar (int state) {
+    NSNumber *n;
+	
+    n = [[NSNumber alloc] initWithBool:state];
+	
+    message_kit_thread (@selector (show_hide_menubar:), n);
+	
+    [n release];
+}
+
+void X11ApplicationLaunchClient (const char *cmd) {
+    NSString *string;
+    
+    string = [[NSString alloc] initWithUTF8String:cmd];
+	
+    message_kit_thread (@selector (launch_client:), string);
+	
+    [string release];
+}
+
+static void check_xinitrc (void) {
+    char *tem, buf[1024];
+    NSString *msg;
+	
+    if ([X11App prefs_get_boolean:@PREFS_DONE_XINIT_CHECK default:NO])
+		return;
+	
+    tem = getenv ("HOME");
+    if (tem == NULL) goto done;
+	
+    snprintf (buf, sizeof (buf), "%s/.xinitrc", tem);
+    if (access (buf, F_OK) != 0)
+		goto done;
+	
+    msg = NSLocalizedString (@"You have an existing ~/.xinitrc file.\n\n\
+Windows displayed by X11 applications may not have titlebars, or may look \
+different to windows displayed by native applications.\n\n\
+Would you like to move aside the existing file and use the standard X11 \
+environment the next time you start X11?", @"Startup xinitrc dialog");
+
+    if(NSAlertDefaultReturn == NSRunAlertPanel (nil, msg, NSLocalizedString (@"Yes", @""),
+                                                NSLocalizedString (@"No", @""), nil)) {
+        char buf2[1024];
+        int i = -1;
+      
+        snprintf (buf2, sizeof (buf2), "%s.old", buf);
+      
+        for(i = 1; access (buf2, F_OK) == 0; i++)
+            snprintf (buf2, sizeof (buf2), "%s.old.%d", buf, i);
+
+        rename (buf, buf2);
+    }
+    
+ done:
+    [X11App prefs_set_boolean:@PREFS_DONE_XINIT_CHECK value:YES];
+    [X11App prefs_synchronize];
+}
+
+static inline pthread_t create_thread(void *func, void *arg) {
+    pthread_attr_t attr;
+    pthread_t tid;
+    
+    pthread_attr_init(&attr);
+    pthread_attr_setscope(&attr, PTHREAD_SCOPE_SYSTEM);
+    pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
+    pthread_create(&tid, &attr, func, arg);
+    pthread_attr_destroy(&attr);
+    
+    return tid;
+}
+
+static void *xpbproxy_x_thread(void *args) {
+    xpbproxy_run();
+
+    fprintf(stderr, "xpbproxy thread is terminating unexpectedly.\n");
+    return NULL;
+}
+
+void X11ApplicationMain (int argc, char **argv, char **envp) {
+    NSAutoreleasePool *pool;
+
+#ifdef DEBUG
+    while (access ("/tmp/x11-block", F_OK) == 0) sleep (1);
+#endif
+  
+    pool = [[NSAutoreleasePool alloc] init];
+    X11App = (X11Application *) [X11Application sharedApplication];
+    init_ports ();
+    
+    app_prefs_domain_cfstr = (CFStringRef)[[NSBundle mainBundle] bundleIdentifier];
+
+    [NSApp read_defaults];
+    [NSBundle loadNibNamed:@"main" owner:NSApp];
+    [[NSNotificationCenter defaultCenter] addObserver:NSApp
+					selector:@selector (became_key:)
+					name:NSWindowDidBecomeKeyNotification object:nil];
+
+    /*
+     * The xpr Quartz mode is statically linked into this server.
+     * Initialize all the Quartz functions.
+     */
+    QuartzModeBundleInit();
+
+    /* Calculate the height of the menubar so we can avoid it. */
+    aquaMenuBarHeight = NSHeight([[NSScreen mainScreen] frame]) -
+    NSMaxY([[NSScreen mainScreen] visibleFrame]);
+
+    /* Set the key layout seed before we start the server */
+#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050
+    last_key_layout = TISCopyCurrentKeyboardLayoutInputSource();    
+
+    if(!last_key_layout)
+        fprintf(stderr, "X11ApplicationMain: Unable to determine TISCopyCurrentKeyboardLayoutInputSource() at startup.\n");
+#else
+    KLGetCurrentKeyboardLayout(&last_key_layout);
+    if(!last_key_layout)
+        fprintf(stderr, "X11ApplicationMain: Unable to determine KLGetCurrentKeyboardLayout() at startup.\n");
+#endif
+
+    if (!QuartsResyncKeymap(FALSE)) {
+        fprintf(stderr, "X11ApplicationMain: Could not build a valid keymap.\n");
+    }
+
+    /* Tell the server thread that it can proceed */
+    QuartzInitServer(argc, argv, envp);
+    
+    /* This must be done after QuartzInitServer because it can result in
+     * an mieqEnqueue() - <rdar://problem/6300249>
+     */
+    check_xinitrc();
+    
+    create_thread(xpbproxy_x_thread, NULL);
+
+#if XQUARTZ_SPARKLE
+    [[X11App controller] setup_sparkle];
+    [[SUUpdater sharedUpdater] resetUpdateCycle];
+//    [[SUUpdater sharedUpdater] checkForUpdates:X11App];
+#endif
+
+    [pool release];
+    [NSApp run];
+    /* not reached */
+}
+
+@implementation X11Application (Private)
+
+#ifdef NX_DEVICELCMDKEYMASK
+/* This is to workaround a bug in the VNC server where we sometimes see the L
+ * modifier and sometimes see no "side"
+ */
+static inline int ensure_flag(int flags, int device_independent, int device_dependents, int device_dependent_default) {
+    if( (flags & device_independent) &&
+       !(flags & device_dependents))
+        flags |= device_dependent_default;
+    return flags;
+}
+#endif
+
+#ifdef DEBUG_UNTRUSTED_POINTER_DELTA
+static const char *untrusted_str(NSEvent *e) {
+    switch([e type]) {
+        case NSScrollWheel:
+            return "NSScrollWheel";
+        case NSTabletPoint:
+            return "NSTabletPoint";
+        case NSOtherMouseDown:
+            return "NSOtherMouseDown";
+        case NSOtherMouseUp:
+            return "NSOtherMouseUp";
+        case NSLeftMouseDown:
+            return "NSLeftMouseDown";
+        case NSLeftMouseUp:
+            return "NSLeftMouseUp";
+        default:
+            switch([e subtype]) {
+                case NSTabletPointEventSubtype:
+                    return "NSTabletPointEventSubtype";
+                case NSTabletProximityEventSubtype:
+                    return "NSTabletProximityEventSubtype";
+                default:
+                    return "Other";
+            }
+    }
+}
+#endif
+
+- (void) sendX11NSEvent:(NSEvent *)e {
+    NSPoint location = NSZeroPoint, tilt = NSZeroPoint;
+    int ev_button, ev_type;
+    float pressure = 0.0;
+    DeviceIntPtr pDev;
+    int modifierFlags;
+    BOOL isMouseOrTabletEvent, isTabletEvent;
+
+    isMouseOrTabletEvent =  [e type] == NSLeftMouseDown    ||  [e type] == NSOtherMouseDown    ||  [e type] == NSRightMouseDown    ||
+                            [e type] == NSLeftMouseUp      ||  [e type] == NSOtherMouseUp      ||  [e type] == NSRightMouseUp      ||
+                            [e type] == NSLeftMouseDragged ||  [e type] == NSOtherMouseDragged ||  [e type] == NSRightMouseDragged ||
+                            [e type] == NSMouseMoved       ||  [e type] == NSTabletPoint       ||  [e type] == NSScrollWheel;
+
+    isTabletEvent = ([e type] == NSTabletPoint) ||
+                    (isMouseOrTabletEvent && ([e subtype] == NSTabletPointEventSubtype || [e subtype] == NSTabletProximityEventSubtype));
+
+    if(isMouseOrTabletEvent) {
+        static NSPoint lastpt;
+        NSWindow *window = [e window];
+        NSRect screen = [[[NSScreen screens] objectAtIndex:0] frame];
+	    BOOL hasUntrustedPointerDelta;
+        
+        // NSEvents for tablets are not consistent wrt deltaXY between events, so we cannot rely on that
+        // Thus tablets will be subject to the warp-pointer bug worked around by the delta, but tablets
+        // are not normally used in cases where that bug would present itself, so this is a fair tradeoff
+        // <rdar://problem/7111003> deltaX and deltaY are incorrect for NSMouseMoved, NSTabletPointEventSubtype
+        // http://xquartz.macosforge.org/trac/ticket/288
+        hasUntrustedPointerDelta = isTabletEvent;
+        
+        // The deltaXY for middle click events also appear erroneous after fast user switching
+        // <rdar://problem/7979468> deltaX and deltaY are incorrect for NSOtherMouseDown and NSOtherMouseUp after FUS
+        // http://xquartz.macosforge.org/trac/ticket/389
+        hasUntrustedPointerDelta = hasUntrustedPointerDelta || [e type] == NSOtherMouseDown || [e type] == NSOtherMouseUp;
+
+        // The deltaXY for scroll events correspond to the scroll delta, not the pointer delta
+        // <rdar://problem/7989690> deltaXY for wheel events are being sent as mouse movement
+        hasUntrustedPointerDelta = hasUntrustedPointerDelta || [e type] == NSScrollWheel;
+
+#ifdef DEBUG_UNTRUSTED_POINTER_DELTA
+        hasUntrustedPointerDelta = hasUntrustedPointerDelta || [e type] == NSLeftMouseDown || [e type] == NSLeftMouseUp;
+#endif
+        
+        if (window != nil)	{
+            NSRect frame = [window frame];
+            location = [e locationInWindow];
+            location.x += frame.origin.x;
+            location.y += frame.origin.y;
+            lastpt = location;
+        } else if(hasUntrustedPointerDelta) {
+#ifdef DEBUG_UNTRUSTED_POINTER_DELTA
+            ErrorF("--- Begin Event Debug ---\n");
+            ErrorF("Event type: %s\n", untrusted_str(e));
+            ErrorF("old lastpt: (%0.2f, %0.2f)\n", lastpt.x, lastpt.y);
+            ErrorF("     delta: (%0.2f, %0.2f)\n", [e deltaX], -[e deltaY]);
+            ErrorF("  location: (%0.2f, %0.2f)\n", lastpt.x + [e deltaX], lastpt.y - [e deltaY]);
+            ErrorF("workaround: (%0.2f, %0.2f)\n", [e locationInWindow].x, [e locationInWindow].y);
+            ErrorF("--- End Event Debug ---\n");
+
+            location.x = lastpt.x + [e deltaX];
+            location.y = lastpt.y - [e deltaY];
+            lastpt = [e locationInWindow];
+#else
+            location = [e locationInWindow];
+            lastpt = location;
+#endif
+        } else {
+            location.x = lastpt.x + [e deltaX];
+            location.y = lastpt.y - [e deltaY];
+            lastpt = [e locationInWindow];
+        }
+        
+        /* Convert coordinate system */
+        location.y = (screen.origin.y + screen.size.height) - location.y;
+    }
+    
+    modifierFlags = [e modifierFlags];
+    
+#ifdef NX_DEVICELCMDKEYMASK
+    /* This is to workaround a bug in the VNC server where we sometimes see the L
+     * modifier and sometimes see no "side"
+     */
+    modifierFlags = ensure_flag(modifierFlags, NX_CONTROLMASK,   NX_DEVICELCTLKEYMASK   | NX_DEVICERCTLKEYMASK,     NX_DEVICELCTLKEYMASK);
+    modifierFlags = ensure_flag(modifierFlags, NX_SHIFTMASK,     NX_DEVICELSHIFTKEYMASK | NX_DEVICERSHIFTKEYMASK,   NX_DEVICELSHIFTKEYMASK);
+    modifierFlags = ensure_flag(modifierFlags, NX_COMMANDMASK,   NX_DEVICELCMDKEYMASK   | NX_DEVICERCMDKEYMASK,     NX_DEVICELCMDKEYMASK);
+    modifierFlags = ensure_flag(modifierFlags, NX_ALTERNATEMASK, NX_DEVICELALTKEYMASK   | NX_DEVICERALTKEYMASK,     NX_DEVICELALTKEYMASK);
+#endif
+
+    modifierFlags &= darwin_all_modifier_mask;
+
+    /* We don't receive modifier key events while out of focus, and 3button
+     * emulation mucks this up, so we need to check our modifier flag state
+     * on every event... ugg
+     */
+    
+    if(darwin_all_modifier_flags != modifierFlags)
+        DarwinUpdateModKeys(modifierFlags);
+    
+	switch ([e type]) {
+		case NSLeftMouseDown:     ev_button=1; ev_type=ButtonPress;   goto handle_mouse;
+		case NSOtherMouseDown:    ev_button=2; ev_type=ButtonPress;   goto handle_mouse;
+		case NSRightMouseDown:    ev_button=3; ev_type=ButtonPress;   goto handle_mouse;
+		case NSLeftMouseUp:       ev_button=1; ev_type=ButtonRelease; goto handle_mouse;
+		case NSOtherMouseUp:      ev_button=2; ev_type=ButtonRelease; goto handle_mouse;
+		case NSRightMouseUp:      ev_button=3; ev_type=ButtonRelease; goto handle_mouse;
+		case NSLeftMouseDragged:  ev_button=1; ev_type=MotionNotify;  goto handle_mouse;
+		case NSOtherMouseDragged: ev_button=2; ev_type=MotionNotify;  goto handle_mouse;
+		case NSRightMouseDragged: ev_button=3; ev_type=MotionNotify;  goto handle_mouse;
+		case NSMouseMoved:        ev_button=0; ev_type=MotionNotify;  goto handle_mouse;
+        case NSTabletPoint:       ev_button=0; ev_type=MotionNotify;  goto handle_mouse;
+            
+        handle_mouse:
+            pDev = darwinPointer;
+
+            /* NSTabletPoint can have no subtype */
+            if([e type] != NSTabletPoint &&
+               [e subtype] == NSTabletProximityEventSubtype) {
+                switch([e pointingDeviceType]) {
+                    case NSEraserPointingDevice:
+                        darwinTabletCurrent=darwinTabletEraser;
+                        break;
+                    case NSPenPointingDevice:
+                        darwinTabletCurrent=darwinTabletStylus;
+                        break;
+                    case NSCursorPointingDevice:
+                    case NSUnknownPointingDevice:
+                    default:
+                        darwinTabletCurrent=darwinTabletCursor;
+                        break;
+                }
+                
+                /* NSTabletProximityEventSubtype doesn't encode pressure ant tilt
+                 * So we just pretend the motion was caused by the mouse.  Hopefully
+                 * we'll have a better solution for this in the future (like maybe
+                 * NSTabletProximityEventSubtype will come from NSTabletPoint
+                 * rather than NSMouseMoved.
+                pressure = [e pressure];
+                tilt     = [e tilt];
+                pDev = darwinTabletCurrent;                
+                 */
+
+                DarwinSendProximityEvents([e isEnteringProximity] ? ProximityIn : ProximityOut,
+                                          location.x, location.y);
+            }
+
+			if ([e type] == NSTabletPoint || [e subtype] == NSTabletPointEventSubtype) {
+                pressure = [e pressure];
+                tilt     = [e tilt];
+                
+                pDev = darwinTabletCurrent;
+            }
+
+            if(!XQuartzServerVisible && noTestExtensions) {
+#if defined(XPLUGIN_VERSION) && XPLUGIN_VERSION > 0
+/* Older libXplugin (Tiger/"Stock" Leopard) aren't thread safe, so we can't call xp_find_window from the Appkit thread */
+                xp_window_id wid = 0;
+                xp_error e;
+
+                /* Sigh. Need to check that we're really over one of
+                 * our windows. (We need to receive pointer events while
+                 * not in the foreground, but we don't want to receive them
+                 * when another window is over us or we might show a tooltip)
+                 */
+
+                e = xp_find_window(location.x, location.y, 0, &wid);
+
+                if (e != XP_Success || (e == XP_Success && wid == 0))
+#endif
+                {
+                    bgMouseLocation = location;
+                    bgMouseLocationUpdated = TRUE;
+                    return;
+                }
+            }
+            
+            if(bgMouseLocationUpdated) {
+                if(!(ev_type == MotionNotify && ev_button == 0)) {
+                    DarwinSendPointerEvents(pDev, MotionNotify, 0, location.x,
+                                            location.y, pressure, tilt.x, tilt.y);
+                }
+                bgMouseLocationUpdated = FALSE;
+            }
+
+            DarwinSendPointerEvents(pDev, ev_type, ev_button, location.x, location.y,
+                                    pressure, tilt.x, tilt.y);
+            
+            break;
+            
+		case NSTabletProximity:
+            switch([e pointingDeviceType]) {
+                case NSEraserPointingDevice:
+                    darwinTabletCurrent=darwinTabletEraser;
+                    break;
+                case NSPenPointingDevice:
+                    darwinTabletCurrent=darwinTabletStylus;
+                    break;
+                case NSCursorPointingDevice:
+                case NSUnknownPointingDevice:
+                default:
+                    darwinTabletCurrent=darwinTabletCursor;
+                    break;
+            }
+            
+			DarwinSendProximityEvents([e isEnteringProximity] ? ProximityIn : ProximityOut,
+                                      location.x, location.y);
+            break;
+            
+		case NSScrollWheel:
+#if !defined(XPLUGIN_VERSION) || XPLUGIN_VERSION == 0
+            /* If we're in the background, we need to send a MotionNotify event
+             * first, since we aren't getting them on background mouse motion
+             */
+            if(!XQuartzServerVisible && noTestExtensions) {
+                bgMouseLocationUpdated = FALSE;
+                DarwinSendPointerEvents(darwinPointer, MotionNotify, 0, location.x,
+                                        location.y, pressure, tilt.x, tilt.y);
+            }
+#endif
+			DarwinSendScrollEvents([e deltaX], [e deltaY], location.x, location.y,
+                                   pressure, tilt.x, tilt.y);
+            break;
+            
+        case NSKeyDown: case NSKeyUp:
+            {
+                /* XKB clobbers our keymap at startup, so we need to force it on the first keypress.
+                 * TODO: Make this less of a kludge.
+                 */
+                static int force_resync_keymap = YES;
+                if(force_resync_keymap) {
+                    DarwinSendDDXEvent(kXquartzReloadKeymap, 0);
+                    force_resync_keymap = NO;
+                }
+            }
+
+            if(darwinSyncKeymap) {
+#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050
+                TISInputSourceRef key_layout = TISCopyCurrentKeyboardLayoutInputSource();
+                TISInputSourceRef clear;
+                if (CFEqual(key_layout, last_key_layout)) {
+                    CFRelease(key_layout);
+                } else {
+                    /* Swap/free thread-safely */
+                    clear = last_key_layout;
+                    last_key_layout = key_layout;
+                    CFRelease(clear);
+#else
+                KeyboardLayoutRef key_layout;
+                KLGetCurrentKeyboardLayout(&key_layout);
+                if(key_layout != last_key_layout) {
+                    last_key_layout = key_layout;
+#endif
+                    /* Update keyInfo */
+                    if (!QuartsResyncKeymap(TRUE)) {
+                        fprintf(stderr, "sendX11NSEvent: Could not build a valid keymap.\n");
+                    }
+                }
+            }
+
+            /* Avoid stuck keys on context switch */
+            if(keyState[[e keyCode]] == [e type])
+                return;
+            keyState[[e keyCode]] = [e type];
+
+            DarwinSendKeyboardEvents(([e type] == NSKeyDown) ? KeyPress : KeyRelease, [e keyCode]);
+            break;
+            
+        default: break; /* for gcc */
+	}	
+}
+@end
diff --git a/xorg-server/hw/xquartz/X11Controller.h b/xorg-server/hw/xquartz/X11Controller.h
index 65a09b8d5..9edaacdd5 100644
--- a/xorg-server/hw/xquartz/X11Controller.h
+++ b/xorg-server/hw/xquartz/X11Controller.h
@@ -65,7 +65,6 @@ typedef unsigned int NSUInteger;
     IBOutlet NSButton *fake_buttons;
     IBOutlet NSButton *enable_fullscreen;
     IBOutlet NSButton *enable_fullscreen_menu;
-    IBOutlet NSButton *use_sysbeep;
     IBOutlet NSButton *enable_keyequivs;
     IBOutlet NSButton *sync_keymap;
     IBOutlet NSButton *option_sends_alt;
diff --git a/xorg-server/hw/xquartz/X11Controller.m b/xorg-server/hw/xquartz/X11Controller.m
index 5502999e3..2edfb185e 100644
--- a/xorg-server/hw/xquartz/X11Controller.m
+++ b/xorg-server/hw/xquartz/X11Controller.m
@@ -1,844 +1,840 @@
-/* X11Controller.m -- connect the IB ui, also the NSApp delegate

- 

-   Copyright (c) 2002-2008 Apple Inc. All rights reserved.

- 

-   Permission is hereby granted, free of charge, to any person

-   obtaining a copy of this software and associated documentation files

-   (the "Software"), to deal in the Software without restriction,

-   including without limitation the rights to use, copy, modify, merge,

-   publish, distribute, sublicense, and/or sell copies of the Software,

-   and to permit persons to whom the Software is furnished to do so,

-   subject to the following conditions:

- 

-   The above copyright notice and this permission notice shall be

-   included in all copies or substantial portions of the Software.

- 

-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

-   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

-   NONINFRINGEMENT.  IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT

-   HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,

-   WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER

-   DEALINGS IN THE SOFTWARE.

- 

-   Except as contained in this notice, the name(s) of the above

-   copyright holders shall not be used in advertising or otherwise to

-   promote the sale, use or other dealings in this Software without

-   prior written authorization. */

-

-#include "sanitizedCarbon.h"

-#include <AvailabilityMacros.h>

-

-#ifdef HAVE_DIX_CONFIG_H

-#include <dix-config.h>

-#endif

-

-#include "quartzCommon.h"

-

-#import "X11Controller.h"

-#import "X11Application.h"

-

-#include "opaque.h"

-#include "darwin.h"

-#include "darwinEvents.h"

-#include "quartz.h"

-#include "quartzKeyboard.h"

-#include <X11/extensions/applewmconst.h>

-#include "applewmExt.h"

-

-#include <stdio.h>

-#include <unistd.h>

-#include <fcntl.h>

-#include <sys/types.h>

-#include <sys/wait.h>

-

-@implementation X11Controller

-

-- (void) awakeFromNib

-{

-  X11Application *xapp = NSApp;

-  NSArray *array;

-	

-  /* Point X11Application at ourself. */

-  [xapp set_controller:self];

-	

-  array = [xapp prefs_get_array:@PREFS_APPSMENU];

-  if (array != nil)

-    {

-      int count;

-		

-      /* convert from [TITLE1 COMMAND1 TITLE2 COMMAND2 ...]

-	 to [[TITLE1 COMMAND1] [TITLE2 COMMAND2] ...] format. */

-		

-      count = [array count];

-      if (count > 0

-	  && ![[array objectAtIndex:0] isKindOfClass:[NSArray class]])

-	{

-	  int i;

-	  NSMutableArray *copy, *sub;

-			

-	  copy = [NSMutableArray arrayWithCapacity:(count / 2)];

-			

-	  for (i = 0; i < count / 2; i++)

-	    {

-	      sub = [[NSMutableArray alloc] initWithCapacity:3];

-	      [sub addObject:[array objectAtIndex:i*2]];

-	      [sub addObject:[array objectAtIndex:i*2+1]];

-	      [sub addObject:@""];

-	      [copy addObject:sub];

-	      [sub release];

-	    }

-			

-	  array = copy;

-	}

-		

-      [self set_apps_menu:array];

-    }

-    

-    [[NSNotificationCenter defaultCenter]

-     addObserver: self

-     selector: @selector(apps_table_done:)

-     name: NSWindowWillCloseNotification

-     object: [apps_table window]];

-

-    // Setup data about our Windows menu

-    if(window_separator) {

-        [[window_separator menu] removeItem:window_separator];

-        window_separator = nil;

-    }

-    

-    windows_menu_start = [[X11App windowsMenu] numberOfItems];

-}

-

-- (void) item_selected:sender

-{

-  [NSApp activateIgnoringOtherApps:YES];

-	

-  DarwinSendDDXEvent(kXquartzControllerNotify, 2,

-			     AppleWMWindowMenuItem, [sender tag]);

-}

-

-- (void) remove_window_menu

-{

-  NSMenu *menu;

-  int count, i;

-

-  /* Work backwards so we don't mess up the indices */

-  menu = [X11App windowsMenu];

-  count = [menu numberOfItems];

-  for (i = count - 1; i >= windows_menu_start; i--)

-    [menu removeItemAtIndex:i];

-	

-  count = [dock_menu indexOfItem:dock_window_separator];

-  for (i = 0; i < count; i++)

-    [dock_menu removeItemAtIndex:0];

-}

-

-- (void) install_window_menu:(NSArray *)list

-{

-  NSMenu *menu;

-  NSMenuItem *item;

-  int first, count, i;

-

-  menu = [X11App windowsMenu];

-  first = windows_menu_start + 1;

-  count = [list count];

-  

-  // Push a Separator

-  if(count) {

-      [menu addItem:[NSMenuItem separatorItem]];

-  }

-

-  for (i = 0; i < count; i++)

-    {

-      NSString *name, *shortcut;

-		

-      name = [[list objectAtIndex:i] objectAtIndex:0];

-      shortcut = [[list objectAtIndex:i] objectAtIndex:1];

-        

-      if(windowItemModMask == 0 || windowItemModMask == -1)

-          shortcut = @"";

-

-      item = (NSMenuItem *) [menu addItemWithTitle:name action:@selector

-				  (item_selected:) keyEquivalent:shortcut];

-      [item setKeyEquivalentModifierMask:(NSUInteger) windowItemModMask];

-      [item setTarget:self];

-      [item setTag:i];

-      [item setEnabled:YES];

-

-      item = (NSMenuItem *) [dock_menu insertItemWithTitle:name

-				       action:@selector

-				       (item_selected:) keyEquivalent:shortcut

-				       atIndex:i];

-      [item setKeyEquivalentModifierMask:(NSUInteger) windowItemModMask];

-      [item setTarget:self];

-      [item setTag:i];

-      [item setEnabled:YES];

-    }

-	

-  if (checked_window_item >= 0 && checked_window_item < count)

-    {

-      item = (NSMenuItem *) [menu itemAtIndex:first + checked_window_item];

-      [item setState:NSOnState];

-      item = (NSMenuItem *) [dock_menu itemAtIndex:checked_window_item];

-      [item setState:NSOnState];

-    }

-}

-

-- (void) remove_apps_menu

-{

-  NSMenu *menu;

-  NSMenuItem *item;

-  int i;

-	

-  if (apps == nil || apps_separator == nil) return;

-	

-  menu = [apps_separator menu];

-	

-  if (menu != nil)

-    {

-      for (i = [menu numberOfItems] - 1; i >= 0; i--)

-	{

-	  item = (NSMenuItem *) [menu itemAtIndex:i];

-	  if ([item tag] != 0)

-	    [menu removeItemAtIndex:i];

-	}

-    }

-    

-  if (dock_apps_menu != nil)

-    {

-      for (i = [dock_apps_menu numberOfItems] - 1; i >= 0; i--)

-	{

-	  item = (NSMenuItem *) [dock_apps_menu itemAtIndex:i];

-	  if ([item tag] != 0)

-	    [dock_apps_menu removeItemAtIndex:i];

-	}

-    }

-    

-  [apps release];

-  apps = nil;

-}

-

-- (void) prepend_apps_item:(NSArray *)list index:(int)i menu:(NSMenu *)menu

-{

-  NSString *title, *shortcut = @"";

-  NSArray *group;

-  NSMenuItem *item;

-	

-  group = [list objectAtIndex:i];

-  title = [group objectAtIndex:0];

-  if ([group count] >= 3)

-    shortcut = [group objectAtIndex:2];

-	

-  if ([title length] != 0)

-    {

-      item = (NSMenuItem *) [menu insertItemWithTitle:title

-				  action:@selector (app_selected:)

-				  keyEquivalent:shortcut atIndex:0];

-      [item setTarget:self];

-      [item setEnabled:YES];

-    }

-  else

-    {

-      item = (NSMenuItem *) [NSMenuItem separatorItem];

-      [menu insertItem:item atIndex:0];

-    }

-	

-  [item setTag:i+1];			/* can't be zero, so add one */

-}

-

-- (void) install_apps_menu:(NSArray *)list

-{

-  NSMenu *menu;

-  int i, count;

-	

-  count = [list count];

-	

-  if (count == 0 || apps_separator == nil) return;

-	

-  menu = [apps_separator menu];

-	

-  for (i = count - 1; i >= 0; i--)

-    {

-      if (menu != nil)

-	[self prepend_apps_item:list index:i menu:menu];

-      if (dock_apps_menu != nil)

-	[self prepend_apps_item:list index:i menu:dock_apps_menu];

-    }

-	

-  apps = [list retain];

-}

-

-- (void) set_window_menu:(NSArray *)list

-{

-  [self remove_window_menu];

-  [self install_window_menu:list];

-	

-  DarwinSendDDXEvent(kXquartzControllerNotify, 1,

-			     AppleWMWindowMenuNotify);

-}

-

-- (void) set_window_menu_check:(NSNumber *)nn

-{

-  NSMenu *menu;

-  NSMenuItem *item;

-  int first, count;

-  int n = [nn intValue];

-

-  menu = [X11App windowsMenu];

-  first = windows_menu_start + 1;

-  count = [menu numberOfItems] - first;

-	

-  if (checked_window_item >= 0 && checked_window_item < count)

-    {

-      item = (NSMenuItem *) [menu itemAtIndex:first + checked_window_item];

-      [item setState:NSOffState];

-      item = (NSMenuItem *) [dock_menu itemAtIndex:checked_window_item];

-      [item setState:NSOffState];

-    }

-  if (n >= 0 && n < count)

-    {

-      item = (NSMenuItem *) [menu itemAtIndex:first + n];

-      [item setState:NSOnState];

-      item = (NSMenuItem *) [dock_menu itemAtIndex:n];

-      [item setState:NSOnState];

-    }

-  checked_window_item = n;

-}

-

-- (void) set_apps_menu:(NSArray *)list

-{

-  [self remove_apps_menu];

-  [self install_apps_menu:list];

-}

-

-#ifdef XQUARTZ_SPARKLE

-- (void) setup_sparkle {

-    if(check_for_updates_item)

-        return; // already did it...

-

-    NSMenu *menu = [x11_about_item menu];

-

-    check_for_updates_item = [menu insertItemWithTitle:NSLocalizedString(@"Check for X11 Updates...", @"Check for X11 Updates...")

-                                               action:@selector (checkForUpdates:)

-                                        keyEquivalent:@""

-                                              atIndex:1];

-    [check_for_updates_item setTarget:[SUUpdater sharedUpdater]];

-    [check_for_updates_item setEnabled:YES];

-

-    // Set X11Controller as the delegate for the updater.

-    [[SUUpdater sharedUpdater] setDelegate:self];

-}

-

-// Sent immediately before installing the specified update.

-- (void)updater:(SUUpdater *)updater willInstallUpdate:(SUAppcastItem *)update {

-    //[self set_can_quit:YES];

-}

-

-#endif

-

-- (void) launch_client:(NSString *)filename

-{

-    int child1, child2 = 0;

-    int status;

-    const char *newargv[4];

-    char buf[128];

-    char *s;

-    

-    newargv[0] = [X11App prefs_get_string:@PREFS_LOGIN_SHELL default:"/bin/sh"];

-    newargv[1] = "-c";

-    newargv[2] = [filename UTF8String];

-    newargv[3] = NULL;

-    

-    s = getenv("DISPLAY");

-    if (s == NULL || s[0] == 0) {

-        snprintf(buf, sizeof(buf), ":%s", display);

-        setenv("DISPLAY", buf, TRUE);

-    }

-

-    /* Do the fork-twice trick to avoid having to reap zombies */

-    child1 = fork();

-    switch (child1) {

-        case -1:                                /* error */

-            break;

-      

-        case 0:                                 /* child1 */

-            child2 = fork();

-      

-            switch (child2) {

-                int max_files, i;

-	

-                case -1:                            /* error */

-                    _exit(1);

-	 

-                case 0:                             /* child2 */

-                /* close all open files except for standard streams */

-                max_files = sysconf(_SC_OPEN_MAX);

-                for(i = 3; i < max_files; i++)

-                    close(i);

-	

-                /* ensure stdin is on /dev/null */

-                close(0);

-                open("/dev/null", O_RDONLY);

-	

-                execvp(newargv[0], (char **const) newargv);

-                _exit(2);

-	

-                default:                            /* parent (child1) */

-                _exit(0);

-            }

-            break;

-      

-        default:                                /* parent */

-            waitpid(child1, &status, 0);

-    }

-}

-

-- (void) app_selected:sender

-{

-  int tag;

-  NSString *item;

-  

-  tag = [sender tag] - 1;

-  if (apps == nil || tag < 0 || tag >= [apps count])

-    return;

-  

-  item = [[apps objectAtIndex:tag] objectAtIndex:1];

-  

-  [self launch_client:item];

-}

-

-- (IBAction) apps_table_show:sender

-{

-  NSArray *columns;

-  NSMutableArray *oldapps = nil;

-	

-  if (table_apps != nil)

-    oldapps = table_apps;

-

-  table_apps = [[NSMutableArray alloc] initWithCapacity:1];

-  if(apps != nil)

-      [table_apps addObjectsFromArray:apps];

-	

-  columns = [apps_table tableColumns];

-  [[columns objectAtIndex:0] setIdentifier:@"0"];

-  [[columns objectAtIndex:1] setIdentifier:@"1"];

-  [[columns objectAtIndex:2] setIdentifier:@"2"];

-	

-  [apps_table setDataSource:self];

-  [apps_table selectRowIndexes:[NSIndexSet indexSetWithIndex:0] byExtendingSelection:NO];

-

-  [[apps_table window] makeKeyAndOrderFront:sender];

-  [apps_table reloadData];

-  if(oldapps != nil)

-    [oldapps release];

-}

-

-- (IBAction) apps_table_done:sender

-{

-  [apps_table deselectAll:sender];	/* flush edits? */

-	

-  [self remove_apps_menu];

-  [self install_apps_menu:table_apps];

-	

-  [NSApp prefs_set_array:@PREFS_APPSMENU value:table_apps];

-  [NSApp prefs_synchronize];

-	

-  [[apps_table window] orderOut:sender];

-	

-  [table_apps release];

-  table_apps = nil;

-}

-

-- (IBAction) apps_table_new:sender

-{

-  NSMutableArray *item;

-	

-  int row = [apps_table selectedRow], i;

-	

-  if (row < 0) row = 0;

-  else row = row + 1;

-	

-  i = row;

-  if (i > [table_apps count])

-    return;				/* avoid exceptions */

-	

-  [apps_table deselectAll:sender];

-	

-  item = [[NSMutableArray alloc] initWithCapacity:3];

-  [item addObject:@""];

-  [item addObject:@""];

-  [item addObject:@""];

-	

-  [table_apps insertObject:item atIndex:i];

-  [item release];

-	

-  [apps_table reloadData];

-  [apps_table selectRowIndexes:[NSIndexSet indexSetWithIndex:row] byExtendingSelection:NO];

-}

-

-- (IBAction) apps_table_duplicate:sender

-{

-  int row = [apps_table selectedRow], i;

-  NSObject *item;

-	

-  if (row < 0) {

-    [self apps_table_new:sender];

-    return;

-  }

-	

-  i = row;

-  if (i > [table_apps count] - 1) return;				/* avoid exceptions */

-    

-  [apps_table deselectAll:sender];

-	

-  item = [[table_apps objectAtIndex:i] mutableCopy];

-  [table_apps insertObject:item atIndex:i];

-  [item release];

-	

-  [apps_table reloadData];

-  [apps_table selectRowIndexes:[NSIndexSet indexSetWithIndex:row+1] byExtendingSelection:NO];

-}

-

-- (IBAction) apps_table_delete:sender

-{

-  int row = [apps_table selectedRow];

-	

-  if (row >= 0)

-    {

-      int i = row;

-      

-      if (i > [table_apps count] - 1) return;			/* avoid exceptions */

-      

-      [apps_table deselectAll:sender];

-      

-      [table_apps removeObjectAtIndex:i];

-    }

-	

-  [apps_table reloadData];

-	

-  row = MIN (row, [table_apps count] - 1);

-  if (row >= 0)

-    [apps_table selectRowIndexes:[NSIndexSet indexSetWithIndex:row] byExtendingSelection:NO];

-}

-

-- (NSInteger) numberOfRowsInTableView:(NSTableView *)tableView

-{

-  if (table_apps == nil) return 0;

-  

-  return [table_apps count];

-}

-

-- (id) tableView:(NSTableView *)tableView

-objectValueForTableColumn:(NSTableColumn *)tableColumn row:(NSInteger)row

-{

-  NSArray *item;

-  int col;

-	

-  if (table_apps == nil) return nil;

-	

-  col = [[tableColumn identifier] intValue];

-	

-  item = [table_apps objectAtIndex:row];

-  if ([item count] > col)

-    return [item objectAtIndex:col];

-  else

-    return @"";

-}

-

-- (void) tableView:(NSTableView *)tableView setObjectValue:(id)object

-    forTableColumn:(NSTableColumn *)tableColumn row:(NSInteger)row

-{

-  NSMutableArray *item;

-  int col;

-	

-  if (table_apps == nil) return;

-	

-  col = [[tableColumn identifier] intValue];

-	

-  item = [table_apps objectAtIndex:row];

-  [item replaceObjectAtIndex:col withObject:object];

-}

-

-- (void) hide_window:sender

-{

-  if ([X11App x_active])

-    DarwinSendDDXEvent(kXquartzControllerNotify, 1, AppleWMHideWindow);

-  else

-    NSBeep ();			/* FIXME: something here */

-}

-

-- (IBAction)bring_to_front:sender

-{

-  DarwinSendDDXEvent(kXquartzControllerNotify, 1, AppleWMBringAllToFront);

-}

-

-- (IBAction)close_window:sender

-{

-  if ([X11App x_active])

-    DarwinSendDDXEvent(kXquartzControllerNotify, 1, AppleWMCloseWindow);

-  else

-    [[NSApp keyWindow] performClose:sender];

-}

-

-- (IBAction)minimize_window:sender

-{

-  if ([X11App x_active])

-    DarwinSendDDXEvent(kXquartzControllerNotify, 1, AppleWMMinimizeWindow);

-  else

-    [[NSApp keyWindow] performMiniaturize:sender];

-}

-

-- (IBAction)zoom_window:sender

-{

-  if ([X11App x_active])

-    DarwinSendDDXEvent(kXquartzControllerNotify, 1, AppleWMZoomWindow);

-  else

-    [[NSApp keyWindow] performZoom:sender];

-}

-

-- (IBAction) next_window:sender

-{

-  DarwinSendDDXEvent(kXquartzControllerNotify, 1, AppleWMNextWindow);

-}

-

-- (IBAction) previous_window:sender

-{

-  DarwinSendDDXEvent(kXquartzControllerNotify, 1, AppleWMPreviousWindow);

-}

-

-- (IBAction) enable_fullscreen_changed:sender {

-    XQuartzRootlessDefault = ![enable_fullscreen intValue];

-

-    [enable_fullscreen_menu setEnabled:!XQuartzRootlessDefault];

-

-    DarwinSendDDXEvent(kXquartzSetRootless, 1, XQuartzRootlessDefault);

-

-    [NSApp prefs_set_boolean:@PREFS_ROOTLESS value:XQuartzRootlessDefault];

-    [NSApp prefs_synchronize];

-}

-

-- (IBAction) toggle_fullscreen:sender

-{

-  DarwinSendDDXEvent(kXquartzToggleFullscreen, 0);

-}

-

-- (void) set_can_quit:(OSX_BOOL)state

-{

-  can_quit = state;

-}

-

-- (IBAction)prefs_changed:sender

-{

-    if(!sender)

-        return;

-    

-    if(sender == fake_buttons) {

-        darwinFakeButtons = [fake_buttons intValue];

-        [NSApp prefs_set_boolean:@PREFS_FAKEBUTTONS value:darwinFakeButtons];

-    } else if(sender == use_sysbeep) {

-        XQuartzUseSysBeep = [use_sysbeep intValue];

-        [NSApp prefs_set_boolean:@PREFS_SYSBEEP value:XQuartzUseSysBeep];

-    } else if(sender == enable_keyequivs) {

-        XQuartzEnableKeyEquivalents =  [enable_keyequivs intValue];

-        [NSApp prefs_set_boolean:@PREFS_KEYEQUIVS value:XQuartzEnableKeyEquivalents];

-    } else if(sender == sync_keymap) {

-        darwinSyncKeymap = [sync_keymap intValue];

-        [NSApp prefs_set_boolean:@PREFS_SYNC_KEYMAP value:darwinSyncKeymap];

-    } else if(sender == enable_fullscreen_menu) {

-        XQuartzFullscreenMenu = [enable_fullscreen_menu intValue];

-        [NSApp prefs_set_boolean:@PREFS_FULLSCREEN_MENU value:XQuartzFullscreenMenu];

-    } else if(sender == option_sends_alt) {

-        BOOL prev_opt_sends_alt = XQuartzOptionSendsAlt;

-        

-        XQuartzOptionSendsAlt = [option_sends_alt intValue];

-        [NSApp prefs_set_boolean:@PREFS_OPTION_SENDS_ALT value:XQuartzOptionSendsAlt];

-

-        if(prev_opt_sends_alt != XQuartzOptionSendsAlt)

-            QuartsResyncKeymap(TRUE);

-    } else if(sender == click_through) {

-        [NSApp prefs_set_boolean:@PREFS_CLICK_THROUGH value:[click_through intValue]];

-    } else if(sender == focus_follows_mouse) {

-        [NSApp prefs_set_boolean:@PREFS_FFM value:[focus_follows_mouse intValue]];

-    } else if(sender == focus_on_new_window) {

-        [NSApp prefs_set_boolean:@PREFS_FOCUS_ON_NEW_WINDOW value:[focus_on_new_window intValue]];

-    } else if(sender == enable_auth) {

-        [NSApp prefs_set_boolean:@PREFS_NO_AUTH value:![enable_auth intValue]];

-    } else if(sender == enable_tcp) {

-        [NSApp prefs_set_boolean:@PREFS_NO_TCP value:![enable_tcp intValue]];

-    } else if(sender == depth) {

-        [NSApp prefs_set_integer:@PREFS_DEPTH value:[depth selectedTag]];

-    } else if(sender == sync_pasteboard) {

-        BOOL pbproxy_active = [sync_pasteboard intValue];

-        [NSApp prefs_set_boolean:@PREFS_SYNC_PB value:pbproxy_active];

-

-        [sync_pasteboard_to_clipboard setEnabled:pbproxy_active];

-        [sync_pasteboard_to_primary setEnabled:pbproxy_active];

-        [sync_clipboard_to_pasteboard setEnabled:pbproxy_active];

-        [sync_primary_immediately setEnabled:pbproxy_active];

-

-        // setEnabled doesn't do this...

-        [sync_text1 setTextColor:pbproxy_active ? [NSColor controlTextColor] : [NSColor disabledControlTextColor]];

-        [sync_text2 setTextColor:pbproxy_active ? [NSColor controlTextColor] : [NSColor disabledControlTextColor]];

-    } else if(sender == sync_pasteboard_to_clipboard) {

-        [NSApp prefs_set_boolean:@PREFS_SYNC_PB_TO_CLIPBOARD value:[sync_pasteboard_to_clipboard intValue]];

-    } else if(sender == sync_pasteboard_to_primary) {

-        [NSApp prefs_set_boolean:@PREFS_SYNC_PB_TO_PRIMARY value:[sync_pasteboard_to_primary intValue]];

-    } else if(sender == sync_clipboard_to_pasteboard) {

-        [NSApp prefs_set_boolean:@PREFS_SYNC_CLIPBOARD_TO_PB value:[sync_clipboard_to_pasteboard intValue]];

-    } else if(sender == sync_primary_immediately) {

-        [NSApp prefs_set_boolean:@PREFS_SYNC_PRIMARY_ON_SELECT value:[sync_primary_immediately intValue]];

-    }

-

-    [NSApp prefs_synchronize];

-    

-    DarwinSendDDXEvent(kXquartzReloadPreferences, 0);

-}

-

-- (IBAction) prefs_show:sender

-{

-    BOOL pbproxy_active = [NSApp prefs_get_boolean:@PREFS_SYNC_PB default:YES];

-    

-    [fake_buttons setIntValue:darwinFakeButtons];

-    [use_sysbeep setIntValue:XQuartzUseSysBeep];

-    [enable_keyequivs setIntValue:XQuartzEnableKeyEquivalents];

-    [sync_keymap setIntValue:darwinSyncKeymap];

-    [option_sends_alt setIntValue:XQuartzOptionSendsAlt];

-    [click_through setIntValue:[NSApp prefs_get_boolean:@PREFS_CLICK_THROUGH default:NO]];

-    [focus_follows_mouse setIntValue:[NSApp prefs_get_boolean:@PREFS_FFM default:NO]];

-    [focus_on_new_window setIntValue:[NSApp prefs_get_boolean:@PREFS_FOCUS_ON_NEW_WINDOW default:YES]];

-    

-    [enable_auth setIntValue:![NSApp prefs_get_boolean:@PREFS_NO_AUTH default:NO]];

-    [enable_tcp setIntValue:![NSApp prefs_get_boolean:@PREFS_NO_TCP default:NO]];

-

-    [depth selectItemAtIndex:[depth indexOfItemWithTag:[NSApp prefs_get_integer:@PREFS_DEPTH default:-1]]];

-

-    [sync_pasteboard setIntValue:pbproxy_active];

-    [sync_pasteboard_to_clipboard setIntValue:[NSApp prefs_get_boolean:@PREFS_SYNC_PB_TO_CLIPBOARD default:YES]];

-    [sync_pasteboard_to_primary setIntValue:[NSApp prefs_get_boolean:@PREFS_SYNC_PB_TO_PRIMARY default:YES]];

-    [sync_clipboard_to_pasteboard setIntValue:[NSApp prefs_get_boolean:@PREFS_SYNC_CLIPBOARD_TO_PB default:YES]];

-    [sync_primary_immediately setIntValue:[NSApp prefs_get_boolean:@PREFS_SYNC_PRIMARY_ON_SELECT default:NO]];

-

-    [sync_pasteboard_to_clipboard setEnabled:pbproxy_active];

-    [sync_pasteboard_to_primary setEnabled:pbproxy_active];

-    [sync_clipboard_to_pasteboard setEnabled:pbproxy_active];

-    [sync_primary_immediately setEnabled:pbproxy_active];

-

-    // setEnabled doesn't do this...

-    [sync_text1 setTextColor:pbproxy_active ? [NSColor controlTextColor] : [NSColor disabledControlTextColor]];

-    [sync_text2 setTextColor:pbproxy_active ? [NSColor controlTextColor] : [NSColor disabledControlTextColor]];

-	

-    [enable_fullscreen setIntValue:!XQuartzRootlessDefault];

-    [enable_fullscreen_menu setEnabled:!XQuartzRootlessDefault];

-    [enable_fullscreen_menu setIntValue:XQuartzFullscreenMenu];

-    

-    [prefs_panel makeKeyAndOrderFront:sender];

-}

-

-- (IBAction) quit:sender {

-    DarwinSendDDXEvent(kXquartzQuit, 0);

-}

-

-- (IBAction) x11_help:sender {

-#if MAC_OS_X_VERSION_MIN_REQUIRED < 1060

-    AHLookupAnchor((CFStringRef)NSLocalizedString(@"Mac Help", no comment), CFSTR("mchlp2276"));

-#else

-    AHLookupAnchor(CFSTR("com.apple.machelp"), CFSTR("mchlp2276"));

-#endif

-}

-

-- (OSX_BOOL) validateMenuItem:(NSMenuItem *)item {

-  NSMenu *menu = [item menu];

-    

-  if (item == toggle_fullscreen_item)

-    return !XQuartzIsRootless;

-  else if (menu == [X11App windowsMenu] || menu == dock_menu

-	   || (menu == [x11_about_item menu] && [item tag] == 42))

-    return (AppleWMSelectedEvents () & AppleWMControllerNotifyMask) != 0;

-  else

-    return TRUE;

-}

-

-- (void) applicationDidHide:(NSNotification *)notify

-{

-  DarwinSendDDXEvent(kXquartzControllerNotify, 1, AppleWMHideAll);

-}

-

-- (void) applicationDidUnhide:(NSNotification *)notify

-{

-  DarwinSendDDXEvent(kXquartzControllerNotify, 1, AppleWMShowAll);

-}

-

-- (NSApplicationTerminateReply) applicationShouldTerminate:sender {

-    NSString *msg;

-    NSString *title;

-	

-    if (can_quit || [X11App prefs_get_boolean:@PREFS_NO_QUIT_ALERT default:NO])

-        return NSTerminateNow;

-	

-    /* Make sure we're frontmost. */

-    [NSApp activateIgnoringOtherApps:YES];

-	

-    title = NSLocalizedString(@"Do you really want to quit X11?", @"Dialog title when quitting");

-    msg = NSLocalizedString(@"Any open X11 applications will stop immediately, and you will lose any unsaved changes.", @"Dialog when quitting");

-

-    /* FIXME: safe to run the alert in here? Or should we return Later

-     *        and then run the alert on a timer? It seems to work here, so..

-     */

-	

-    return (NSRunAlertPanel (title, msg, NSLocalizedString (@"Quit", @""),

-                             NSLocalizedString (@"Cancel", @""), nil)

-            == NSAlertDefaultReturn) ? NSTerminateNow : NSTerminateCancel;

-}

-

-- (void) applicationWillTerminate:(NSNotification *)aNotification

-{

-  unsigned remain;

-  [X11App prefs_synchronize];

-	

-  /* shutdown the X server, it will exit () for us. */

-  DarwinSendDDXEvent(kXquartzQuit, 0);

-	

-  /* In case it doesn't, exit anyway after a while. */

-  remain = 10000000;

-  while((remain = usleep(remain)) > 0);

-

-  exit (1);

-}

-

-- (void) server_ready

-{

-  x_list *node;

-	

-  finished_launching = YES;

-	

-  for (node = pending_apps; node != NULL; node = node->next)

-    {

-      NSString *filename = node->data;

-      [self launch_client:filename];

-      [filename release];

-    }

-	

-  x_list_free (pending_apps);

-  pending_apps = NULL;

-}

-

-- (OSX_BOOL) application:(NSApplication *)app openFile:(NSString *)filename

-{

-    const char *name = [filename UTF8String];

-    

-    if (finished_launching)

-        [self launch_client:filename];

-    else if (name[0] != ':')		/* ignore display names */

-        pending_apps = x_list_prepend (pending_apps, [filename retain]);

-    

-    /* FIXME: report failures. */

-    return YES;

-}

-

-@end

-

-void X11ControllerMain(int argc, char **argv, char **envp) {

-    X11ApplicationMain (argc, argv, envp);

-}

+/* X11Controller.m -- connect the IB ui, also the NSApp delegate
+ 
+   Copyright (c) 2002-2008 Apple Inc. All rights reserved.
+ 
+   Permission is hereby granted, free of charge, to any person
+   obtaining a copy of this software and associated documentation files
+   (the "Software"), to deal in the Software without restriction,
+   including without limitation the rights to use, copy, modify, merge,
+   publish, distribute, sublicense, and/or sell copies of the Software,
+   and to permit persons to whom the Software is furnished to do so,
+   subject to the following conditions:
+ 
+   The above copyright notice and this permission notice shall be
+   included in all copies or substantial portions of the Software.
+ 
+   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+   NONINFRINGEMENT.  IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT
+   HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+   WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+   DEALINGS IN THE SOFTWARE.
+ 
+   Except as contained in this notice, the name(s) of the above
+   copyright holders shall not be used in advertising or otherwise to
+   promote the sale, use or other dealings in this Software without
+   prior written authorization. */
+
+#include "sanitizedCarbon.h"
+#include <AvailabilityMacros.h>
+
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
+#include "quartzCommon.h"
+
+#import "X11Controller.h"
+#import "X11Application.h"
+
+#include "opaque.h"
+#include "darwin.h"
+#include "darwinEvents.h"
+#include "quartz.h"
+#include "quartzKeyboard.h"
+#include <X11/extensions/applewmconst.h>
+#include "applewmExt.h"
+
+#include <stdio.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+
+@implementation X11Controller
+
+- (void) awakeFromNib
+{
+  X11Application *xapp = NSApp;
+  NSArray *array;
+	
+  /* Point X11Application at ourself. */
+  [xapp set_controller:self];
+	
+  array = [xapp prefs_get_array:@PREFS_APPSMENU];
+  if (array != nil)
+    {
+      int count;
+		
+      /* convert from [TITLE1 COMMAND1 TITLE2 COMMAND2 ...]
+	 to [[TITLE1 COMMAND1] [TITLE2 COMMAND2] ...] format. */
+		
+      count = [array count];
+      if (count > 0
+	  && ![[array objectAtIndex:0] isKindOfClass:[NSArray class]])
+	{
+	  int i;
+	  NSMutableArray *copy, *sub;
+			
+	  copy = [NSMutableArray arrayWithCapacity:(count / 2)];
+			
+	  for (i = 0; i < count / 2; i++)
+	    {
+	      sub = [[NSMutableArray alloc] initWithCapacity:3];
+	      [sub addObject:[array objectAtIndex:i*2]];
+	      [sub addObject:[array objectAtIndex:i*2+1]];
+	      [sub addObject:@""];
+	      [copy addObject:sub];
+	      [sub release];
+	    }
+			
+	  array = copy;
+	}
+		
+      [self set_apps_menu:array];
+    }
+    
+    [[NSNotificationCenter defaultCenter]
+     addObserver: self
+     selector: @selector(apps_table_done:)
+     name: NSWindowWillCloseNotification
+     object: [apps_table window]];
+
+    // Setup data about our Windows menu
+    if(window_separator) {
+        [[window_separator menu] removeItem:window_separator];
+        window_separator = nil;
+    }
+    
+    windows_menu_start = [[X11App windowsMenu] numberOfItems];
+}
+
+- (void) item_selected:sender
+{
+  [NSApp activateIgnoringOtherApps:YES];
+	
+  DarwinSendDDXEvent(kXquartzControllerNotify, 2,
+			     AppleWMWindowMenuItem, [sender tag]);
+}
+
+- (void) remove_window_menu
+{
+  NSMenu *menu;
+  int count, i;
+
+  /* Work backwards so we don't mess up the indices */
+  menu = [X11App windowsMenu];
+  count = [menu numberOfItems];
+  for (i = count - 1; i >= windows_menu_start; i--)
+    [menu removeItemAtIndex:i];
+	
+  count = [dock_menu indexOfItem:dock_window_separator];
+  for (i = 0; i < count; i++)
+    [dock_menu removeItemAtIndex:0];
+}
+
+- (void) install_window_menu:(NSArray *)list
+{
+  NSMenu *menu;
+  NSMenuItem *item;
+  int first, count, i;
+
+  menu = [X11App windowsMenu];
+  first = windows_menu_start + 1;
+  count = [list count];
+  
+  // Push a Separator
+  if(count) {
+      [menu addItem:[NSMenuItem separatorItem]];
+  }
+
+  for (i = 0; i < count; i++)
+    {
+      NSString *name, *shortcut;
+		
+      name = [[list objectAtIndex:i] objectAtIndex:0];
+      shortcut = [[list objectAtIndex:i] objectAtIndex:1];
+        
+      if(windowItemModMask == 0 || windowItemModMask == -1)
+          shortcut = @"";
+
+      item = (NSMenuItem *) [menu addItemWithTitle:name action:@selector
+				  (item_selected:) keyEquivalent:shortcut];
+      [item setKeyEquivalentModifierMask:(NSUInteger) windowItemModMask];
+      [item setTarget:self];
+      [item setTag:i];
+      [item setEnabled:YES];
+
+      item = (NSMenuItem *) [dock_menu insertItemWithTitle:name
+				       action:@selector
+				       (item_selected:) keyEquivalent:shortcut
+				       atIndex:i];
+      [item setKeyEquivalentModifierMask:(NSUInteger) windowItemModMask];
+      [item setTarget:self];
+      [item setTag:i];
+      [item setEnabled:YES];
+    }
+	
+  if (checked_window_item >= 0 && checked_window_item < count)
+    {
+      item = (NSMenuItem *) [menu itemAtIndex:first + checked_window_item];
+      [item setState:NSOnState];
+      item = (NSMenuItem *) [dock_menu itemAtIndex:checked_window_item];
+      [item setState:NSOnState];
+    }
+}
+
+- (void) remove_apps_menu
+{
+  NSMenu *menu;
+  NSMenuItem *item;
+  int i;
+	
+  if (apps == nil || apps_separator == nil) return;
+	
+  menu = [apps_separator menu];
+	
+  if (menu != nil)
+    {
+      for (i = [menu numberOfItems] - 1; i >= 0; i--)
+	{
+	  item = (NSMenuItem *) [menu itemAtIndex:i];
+	  if ([item tag] != 0)
+	    [menu removeItemAtIndex:i];
+	}
+    }
+    
+  if (dock_apps_menu != nil)
+    {
+      for (i = [dock_apps_menu numberOfItems] - 1; i >= 0; i--)
+	{
+	  item = (NSMenuItem *) [dock_apps_menu itemAtIndex:i];
+	  if ([item tag] != 0)
+	    [dock_apps_menu removeItemAtIndex:i];
+	}
+    }
+    
+  [apps release];
+  apps = nil;
+}
+
+- (void) prepend_apps_item:(NSArray *)list index:(int)i menu:(NSMenu *)menu
+{
+  NSString *title, *shortcut = @"";
+  NSArray *group;
+  NSMenuItem *item;
+	
+  group = [list objectAtIndex:i];
+  title = [group objectAtIndex:0];
+  if ([group count] >= 3)
+    shortcut = [group objectAtIndex:2];
+	
+  if ([title length] != 0)
+    {
+      item = (NSMenuItem *) [menu insertItemWithTitle:title
+				  action:@selector (app_selected:)
+				  keyEquivalent:shortcut atIndex:0];
+      [item setTarget:self];
+      [item setEnabled:YES];
+    }
+  else
+    {
+      item = (NSMenuItem *) [NSMenuItem separatorItem];
+      [menu insertItem:item atIndex:0];
+    }
+	
+  [item setTag:i+1];			/* can't be zero, so add one */
+}
+
+- (void) install_apps_menu:(NSArray *)list
+{
+  NSMenu *menu;
+  int i, count;
+	
+  count = [list count];
+	
+  if (count == 0 || apps_separator == nil) return;
+	
+  menu = [apps_separator menu];
+	
+  for (i = count - 1; i >= 0; i--)
+    {
+      if (menu != nil)
+	[self prepend_apps_item:list index:i menu:menu];
+      if (dock_apps_menu != nil)
+	[self prepend_apps_item:list index:i menu:dock_apps_menu];
+    }
+	
+  apps = [list retain];
+}
+
+- (void) set_window_menu:(NSArray *)list
+{
+  [self remove_window_menu];
+  [self install_window_menu:list];
+	
+  DarwinSendDDXEvent(kXquartzControllerNotify, 1,
+			     AppleWMWindowMenuNotify);
+}
+
+- (void) set_window_menu_check:(NSNumber *)nn
+{
+  NSMenu *menu;
+  NSMenuItem *item;
+  int first, count;
+  int n = [nn intValue];
+
+  menu = [X11App windowsMenu];
+  first = windows_menu_start + 1;
+  count = [menu numberOfItems] - first;
+	
+  if (checked_window_item >= 0 && checked_window_item < count)
+    {
+      item = (NSMenuItem *) [menu itemAtIndex:first + checked_window_item];
+      [item setState:NSOffState];
+      item = (NSMenuItem *) [dock_menu itemAtIndex:checked_window_item];
+      [item setState:NSOffState];
+    }
+  if (n >= 0 && n < count)
+    {
+      item = (NSMenuItem *) [menu itemAtIndex:first + n];
+      [item setState:NSOnState];
+      item = (NSMenuItem *) [dock_menu itemAtIndex:n];
+      [item setState:NSOnState];
+    }
+  checked_window_item = n;
+}
+
+- (void) set_apps_menu:(NSArray *)list
+{
+  [self remove_apps_menu];
+  [self install_apps_menu:list];
+}
+
+#ifdef XQUARTZ_SPARKLE
+- (void) setup_sparkle {
+    if(check_for_updates_item)
+        return; // already did it...
+
+    NSMenu *menu = [x11_about_item menu];
+
+    check_for_updates_item = [menu insertItemWithTitle:NSLocalizedString(@"Check for X11 Updates...", @"Check for X11 Updates...")
+                                               action:@selector (checkForUpdates:)
+                                        keyEquivalent:@""
+                                              atIndex:1];
+    [check_for_updates_item setTarget:[SUUpdater sharedUpdater]];
+    [check_for_updates_item setEnabled:YES];
+
+    // Set X11Controller as the delegate for the updater.
+    [[SUUpdater sharedUpdater] setDelegate:self];
+}
+
+// Sent immediately before installing the specified update.
+- (void)updater:(SUUpdater *)updater willInstallUpdate:(SUAppcastItem *)update {
+    //[self set_can_quit:YES];
+}
+
+#endif
+
+- (void) launch_client:(NSString *)filename
+{
+    int child1, child2 = 0;
+    int status;
+    const char *newargv[4];
+    char buf[128];
+    char *s;
+    
+    newargv[0] = [X11App prefs_get_string:@PREFS_LOGIN_SHELL default:"/bin/sh"];
+    newargv[1] = "-c";
+    newargv[2] = [filename UTF8String];
+    newargv[3] = NULL;
+    
+    s = getenv("DISPLAY");
+    if (s == NULL || s[0] == 0) {
+        snprintf(buf, sizeof(buf), ":%s", display);
+        setenv("DISPLAY", buf, TRUE);
+    }
+
+    /* Do the fork-twice trick to avoid having to reap zombies */
+    child1 = fork();
+    switch (child1) {
+        case -1:                                /* error */
+            break;
+      
+        case 0:                                 /* child1 */
+            child2 = fork();
+      
+            switch (child2) {
+                int max_files, i;
+	
+                case -1:                            /* error */
+                    _exit(1);
+	 
+                case 0:                             /* child2 */
+                /* close all open files except for standard streams */
+                max_files = sysconf(_SC_OPEN_MAX);
+                for(i = 3; i < max_files; i++)
+                    close(i);
+	
+                /* ensure stdin is on /dev/null */
+                close(0);
+                open("/dev/null", O_RDONLY);
+	
+                execvp(newargv[0], (char **const) newargv);
+                _exit(2);
+	
+                default:                            /* parent (child1) */
+                _exit(0);
+            }
+            break;
+      
+        default:                                /* parent */
+            waitpid(child1, &status, 0);
+    }
+}
+
+- (void) app_selected:sender
+{
+  int tag;
+  NSString *item;
+  
+  tag = [sender tag] - 1;
+  if (apps == nil || tag < 0 || tag >= [apps count])
+    return;
+  
+  item = [[apps objectAtIndex:tag] objectAtIndex:1];
+  
+  [self launch_client:item];
+}
+
+- (IBAction) apps_table_show:sender
+{
+  NSArray *columns;
+  NSMutableArray *oldapps = nil;
+	
+  if (table_apps != nil)
+    oldapps = table_apps;
+
+  table_apps = [[NSMutableArray alloc] initWithCapacity:1];
+  if(apps != nil)
+      [table_apps addObjectsFromArray:apps];
+	
+  columns = [apps_table tableColumns];
+  [[columns objectAtIndex:0] setIdentifier:@"0"];
+  [[columns objectAtIndex:1] setIdentifier:@"1"];
+  [[columns objectAtIndex:2] setIdentifier:@"2"];
+	
+  [apps_table setDataSource:self];
+  [apps_table selectRowIndexes:[NSIndexSet indexSetWithIndex:0] byExtendingSelection:NO];
+
+  [[apps_table window] makeKeyAndOrderFront:sender];
+  [apps_table reloadData];
+  if(oldapps != nil)
+    [oldapps release];
+}
+
+- (IBAction) apps_table_done:sender
+{
+  [apps_table deselectAll:sender];	/* flush edits? */
+	
+  [self remove_apps_menu];
+  [self install_apps_menu:table_apps];
+	
+  [NSApp prefs_set_array:@PREFS_APPSMENU value:table_apps];
+  [NSApp prefs_synchronize];
+	
+  [[apps_table window] orderOut:sender];
+	
+  [table_apps release];
+  table_apps = nil;
+}
+
+- (IBAction) apps_table_new:sender
+{
+  NSMutableArray *item;
+	
+  int row = [apps_table selectedRow], i;
+	
+  if (row < 0) row = 0;
+  else row = row + 1;
+	
+  i = row;
+  if (i > [table_apps count])
+    return;				/* avoid exceptions */
+	
+  [apps_table deselectAll:sender];
+	
+  item = [[NSMutableArray alloc] initWithCapacity:3];
+  [item addObject:@""];
+  [item addObject:@""];
+  [item addObject:@""];
+	
+  [table_apps insertObject:item atIndex:i];
+  [item release];
+	
+  [apps_table reloadData];
+  [apps_table selectRowIndexes:[NSIndexSet indexSetWithIndex:row] byExtendingSelection:NO];
+}
+
+- (IBAction) apps_table_duplicate:sender
+{
+  int row = [apps_table selectedRow], i;
+  NSObject *item;
+	
+  if (row < 0) {
+    [self apps_table_new:sender];
+    return;
+  }
+	
+  i = row;
+  if (i > [table_apps count] - 1) return;				/* avoid exceptions */
+    
+  [apps_table deselectAll:sender];
+	
+  item = [[table_apps objectAtIndex:i] mutableCopy];
+  [table_apps insertObject:item atIndex:i];
+  [item release];
+	
+  [apps_table reloadData];
+  [apps_table selectRowIndexes:[NSIndexSet indexSetWithIndex:row+1] byExtendingSelection:NO];
+}
+
+- (IBAction) apps_table_delete:sender
+{
+  int row = [apps_table selectedRow];
+	
+  if (row >= 0)
+    {
+      int i = row;
+      
+      if (i > [table_apps count] - 1) return;			/* avoid exceptions */
+      
+      [apps_table deselectAll:sender];
+      
+      [table_apps removeObjectAtIndex:i];
+    }
+	
+  [apps_table reloadData];
+	
+  row = MIN (row, [table_apps count] - 1);
+  if (row >= 0)
+    [apps_table selectRowIndexes:[NSIndexSet indexSetWithIndex:row] byExtendingSelection:NO];
+}
+
+- (NSInteger) numberOfRowsInTableView:(NSTableView *)tableView
+{
+  if (table_apps == nil) return 0;
+  
+  return [table_apps count];
+}
+
+- (id) tableView:(NSTableView *)tableView
+objectValueForTableColumn:(NSTableColumn *)tableColumn row:(NSInteger)row
+{
+  NSArray *item;
+  int col;
+	
+  if (table_apps == nil) return nil;
+	
+  col = [[tableColumn identifier] intValue];
+	
+  item = [table_apps objectAtIndex:row];
+  if ([item count] > col)
+    return [item objectAtIndex:col];
+  else
+    return @"";
+}
+
+- (void) tableView:(NSTableView *)tableView setObjectValue:(id)object
+    forTableColumn:(NSTableColumn *)tableColumn row:(NSInteger)row
+{
+  NSMutableArray *item;
+  int col;
+	
+  if (table_apps == nil) return;
+	
+  col = [[tableColumn identifier] intValue];
+	
+  item = [table_apps objectAtIndex:row];
+  [item replaceObjectAtIndex:col withObject:object];
+}
+
+- (void) hide_window:sender
+{
+  if ([X11App x_active])
+    DarwinSendDDXEvent(kXquartzControllerNotify, 1, AppleWMHideWindow);
+  else
+    NSBeep ();			/* FIXME: something here */
+}
+
+- (IBAction)bring_to_front:sender
+{
+  DarwinSendDDXEvent(kXquartzControllerNotify, 1, AppleWMBringAllToFront);
+}
+
+- (IBAction)close_window:sender
+{
+  if ([X11App x_active])
+    DarwinSendDDXEvent(kXquartzControllerNotify, 1, AppleWMCloseWindow);
+  else
+    [[NSApp keyWindow] performClose:sender];
+}
+
+- (IBAction)minimize_window:sender
+{
+  if ([X11App x_active])
+    DarwinSendDDXEvent(kXquartzControllerNotify, 1, AppleWMMinimizeWindow);
+  else
+    [[NSApp keyWindow] performMiniaturize:sender];
+}
+
+- (IBAction)zoom_window:sender
+{
+  if ([X11App x_active])
+    DarwinSendDDXEvent(kXquartzControllerNotify, 1, AppleWMZoomWindow);
+  else
+    [[NSApp keyWindow] performZoom:sender];
+}
+
+- (IBAction) next_window:sender
+{
+  DarwinSendDDXEvent(kXquartzControllerNotify, 1, AppleWMNextWindow);
+}
+
+- (IBAction) previous_window:sender
+{
+  DarwinSendDDXEvent(kXquartzControllerNotify, 1, AppleWMPreviousWindow);
+}
+
+- (IBAction) enable_fullscreen_changed:sender {
+    XQuartzRootlessDefault = ![enable_fullscreen intValue];
+
+    [enable_fullscreen_menu setEnabled:!XQuartzRootlessDefault];
+
+    DarwinSendDDXEvent(kXquartzSetRootless, 1, XQuartzRootlessDefault);
+
+    [NSApp prefs_set_boolean:@PREFS_ROOTLESS value:XQuartzRootlessDefault];
+    [NSApp prefs_synchronize];
+}
+
+- (IBAction) toggle_fullscreen:sender
+{
+  DarwinSendDDXEvent(kXquartzToggleFullscreen, 0);
+}
+
+- (void) set_can_quit:(OSX_BOOL)state
+{
+  can_quit = state;
+}
+
+- (IBAction)prefs_changed:sender
+{
+    if(!sender)
+        return;
+    
+    if(sender == fake_buttons) {
+        darwinFakeButtons = [fake_buttons intValue];
+        [NSApp prefs_set_boolean:@PREFS_FAKEBUTTONS value:darwinFakeButtons];
+    } else if(sender == enable_keyequivs) {
+        XQuartzEnableKeyEquivalents =  [enable_keyequivs intValue];
+        [NSApp prefs_set_boolean:@PREFS_KEYEQUIVS value:XQuartzEnableKeyEquivalents];
+    } else if(sender == sync_keymap) {
+        darwinSyncKeymap = [sync_keymap intValue];
+        [NSApp prefs_set_boolean:@PREFS_SYNC_KEYMAP value:darwinSyncKeymap];
+    } else if(sender == enable_fullscreen_menu) {
+        XQuartzFullscreenMenu = [enable_fullscreen_menu intValue];
+        [NSApp prefs_set_boolean:@PREFS_FULLSCREEN_MENU value:XQuartzFullscreenMenu];
+    } else if(sender == option_sends_alt) {
+        BOOL prev_opt_sends_alt = XQuartzOptionSendsAlt;
+        
+        XQuartzOptionSendsAlt = [option_sends_alt intValue];
+        [NSApp prefs_set_boolean:@PREFS_OPTION_SENDS_ALT value:XQuartzOptionSendsAlt];
+
+        if(prev_opt_sends_alt != XQuartzOptionSendsAlt)
+            QuartsResyncKeymap(TRUE);
+    } else if(sender == click_through) {
+        [NSApp prefs_set_boolean:@PREFS_CLICK_THROUGH value:[click_through intValue]];
+    } else if(sender == focus_follows_mouse) {
+        [NSApp prefs_set_boolean:@PREFS_FFM value:[focus_follows_mouse intValue]];
+    } else if(sender == focus_on_new_window) {
+        [NSApp prefs_set_boolean:@PREFS_FOCUS_ON_NEW_WINDOW value:[focus_on_new_window intValue]];
+    } else if(sender == enable_auth) {
+        [NSApp prefs_set_boolean:@PREFS_NO_AUTH value:![enable_auth intValue]];
+    } else if(sender == enable_tcp) {
+        [NSApp prefs_set_boolean:@PREFS_NO_TCP value:![enable_tcp intValue]];
+    } else if(sender == depth) {
+        [NSApp prefs_set_integer:@PREFS_DEPTH value:[depth selectedTag]];
+    } else if(sender == sync_pasteboard) {
+        BOOL pbproxy_active = [sync_pasteboard intValue];
+        [NSApp prefs_set_boolean:@PREFS_SYNC_PB value:pbproxy_active];
+
+        [sync_pasteboard_to_clipboard setEnabled:pbproxy_active];
+        [sync_pasteboard_to_primary setEnabled:pbproxy_active];
+        [sync_clipboard_to_pasteboard setEnabled:pbproxy_active];
+        [sync_primary_immediately setEnabled:pbproxy_active];
+
+        // setEnabled doesn't do this...
+        [sync_text1 setTextColor:pbproxy_active ? [NSColor controlTextColor] : [NSColor disabledControlTextColor]];
+        [sync_text2 setTextColor:pbproxy_active ? [NSColor controlTextColor] : [NSColor disabledControlTextColor]];
+    } else if(sender == sync_pasteboard_to_clipboard) {
+        [NSApp prefs_set_boolean:@PREFS_SYNC_PB_TO_CLIPBOARD value:[sync_pasteboard_to_clipboard intValue]];
+    } else if(sender == sync_pasteboard_to_primary) {
+        [NSApp prefs_set_boolean:@PREFS_SYNC_PB_TO_PRIMARY value:[sync_pasteboard_to_primary intValue]];
+    } else if(sender == sync_clipboard_to_pasteboard) {
+        [NSApp prefs_set_boolean:@PREFS_SYNC_CLIPBOARD_TO_PB value:[sync_clipboard_to_pasteboard intValue]];
+    } else if(sender == sync_primary_immediately) {
+        [NSApp prefs_set_boolean:@PREFS_SYNC_PRIMARY_ON_SELECT value:[sync_primary_immediately intValue]];
+    }
+
+    [NSApp prefs_synchronize];
+    
+    DarwinSendDDXEvent(kXquartzReloadPreferences, 0);
+}
+
+- (IBAction) prefs_show:sender
+{
+    BOOL pbproxy_active = [NSApp prefs_get_boolean:@PREFS_SYNC_PB default:YES];
+    
+    [fake_buttons setIntValue:darwinFakeButtons];
+    [enable_keyequivs setIntValue:XQuartzEnableKeyEquivalents];
+    [sync_keymap setIntValue:darwinSyncKeymap];
+    [option_sends_alt setIntValue:XQuartzOptionSendsAlt];
+    [click_through setIntValue:[NSApp prefs_get_boolean:@PREFS_CLICK_THROUGH default:NO]];
+    [focus_follows_mouse setIntValue:[NSApp prefs_get_boolean:@PREFS_FFM default:NO]];
+    [focus_on_new_window setIntValue:[NSApp prefs_get_boolean:@PREFS_FOCUS_ON_NEW_WINDOW default:YES]];
+    
+    [enable_auth setIntValue:![NSApp prefs_get_boolean:@PREFS_NO_AUTH default:NO]];
+    [enable_tcp setIntValue:![NSApp prefs_get_boolean:@PREFS_NO_TCP default:NO]];
+
+    [depth selectItemAtIndex:[depth indexOfItemWithTag:[NSApp prefs_get_integer:@PREFS_DEPTH default:-1]]];
+
+    [sync_pasteboard setIntValue:pbproxy_active];
+    [sync_pasteboard_to_clipboard setIntValue:[NSApp prefs_get_boolean:@PREFS_SYNC_PB_TO_CLIPBOARD default:YES]];
+    [sync_pasteboard_to_primary setIntValue:[NSApp prefs_get_boolean:@PREFS_SYNC_PB_TO_PRIMARY default:YES]];
+    [sync_clipboard_to_pasteboard setIntValue:[NSApp prefs_get_boolean:@PREFS_SYNC_CLIPBOARD_TO_PB default:YES]];
+    [sync_primary_immediately setIntValue:[NSApp prefs_get_boolean:@PREFS_SYNC_PRIMARY_ON_SELECT default:NO]];
+
+    [sync_pasteboard_to_clipboard setEnabled:pbproxy_active];
+    [sync_pasteboard_to_primary setEnabled:pbproxy_active];
+    [sync_clipboard_to_pasteboard setEnabled:pbproxy_active];
+    [sync_primary_immediately setEnabled:pbproxy_active];
+
+    // setEnabled doesn't do this...
+    [sync_text1 setTextColor:pbproxy_active ? [NSColor controlTextColor] : [NSColor disabledControlTextColor]];
+    [sync_text2 setTextColor:pbproxy_active ? [NSColor controlTextColor] : [NSColor disabledControlTextColor]];
+	
+    [enable_fullscreen setIntValue:!XQuartzRootlessDefault];
+    [enable_fullscreen_menu setEnabled:!XQuartzRootlessDefault];
+    [enable_fullscreen_menu setIntValue:XQuartzFullscreenMenu];
+    
+    [prefs_panel makeKeyAndOrderFront:sender];
+}
+
+- (IBAction) quit:sender {
+    DarwinSendDDXEvent(kXquartzQuit, 0);
+}
+
+- (IBAction) x11_help:sender {
+#if MAC_OS_X_VERSION_MIN_REQUIRED < 1060
+    AHLookupAnchor((CFStringRef)NSLocalizedString(@"Mac Help", no comment), CFSTR("mchlp2276"));
+#else
+    AHLookupAnchor(CFSTR("com.apple.machelp"), CFSTR("mchlp2276"));
+#endif
+}
+
+- (OSX_BOOL) validateMenuItem:(NSMenuItem *)item {
+  NSMenu *menu = [item menu];
+    
+  if (item == toggle_fullscreen_item)
+    return !XQuartzIsRootless;
+  else if (menu == [X11App windowsMenu] || menu == dock_menu
+	   || (menu == [x11_about_item menu] && [item tag] == 42))
+    return (AppleWMSelectedEvents () & AppleWMControllerNotifyMask) != 0;
+  else
+    return TRUE;
+}
+
+- (void) applicationDidHide:(NSNotification *)notify
+{
+  DarwinSendDDXEvent(kXquartzControllerNotify, 1, AppleWMHideAll);
+}
+
+- (void) applicationDidUnhide:(NSNotification *)notify
+{
+  DarwinSendDDXEvent(kXquartzControllerNotify, 1, AppleWMShowAll);
+}
+
+- (NSApplicationTerminateReply) applicationShouldTerminate:sender {
+    NSString *msg;
+    NSString *title;
+	
+    if (can_quit || [X11App prefs_get_boolean:@PREFS_NO_QUIT_ALERT default:NO])
+        return NSTerminateNow;
+	
+    /* Make sure we're frontmost. */
+    [NSApp activateIgnoringOtherApps:YES];
+	
+    title = NSLocalizedString(@"Do you really want to quit X11?", @"Dialog title when quitting");
+    msg = NSLocalizedString(@"Any open X11 applications will stop immediately, and you will lose any unsaved changes.", @"Dialog when quitting");
+
+    /* FIXME: safe to run the alert in here? Or should we return Later
+     *        and then run the alert on a timer? It seems to work here, so..
+     */
+	
+    return (NSRunAlertPanel (title, msg, NSLocalizedString (@"Quit", @""),
+                             NSLocalizedString (@"Cancel", @""), nil)
+            == NSAlertDefaultReturn) ? NSTerminateNow : NSTerminateCancel;
+}
+
+- (void) applicationWillTerminate:(NSNotification *)aNotification
+{
+  unsigned remain;
+  [X11App prefs_synchronize];
+	
+  /* shutdown the X server, it will exit () for us. */
+  DarwinSendDDXEvent(kXquartzQuit, 0);
+	
+  /* In case it doesn't, exit anyway after a while. */
+  remain = 10000000;
+  while((remain = usleep(remain)) > 0);
+
+  exit (1);
+}
+
+- (void) server_ready
+{
+  x_list *node;
+	
+  finished_launching = YES;
+	
+  for (node = pending_apps; node != NULL; node = node->next)
+    {
+      NSString *filename = node->data;
+      [self launch_client:filename];
+      [filename release];
+    }
+	
+  x_list_free (pending_apps);
+  pending_apps = NULL;
+}
+
+- (OSX_BOOL) application:(NSApplication *)app openFile:(NSString *)filename
+{
+    const char *name = [filename UTF8String];
+    
+    if (finished_launching)
+        [self launch_client:filename];
+    else if (name[0] != ':')		/* ignore display names */
+        pending_apps = x_list_prepend (pending_apps, [filename retain]);
+    
+    /* FIXME: report failures. */
+    return YES;
+}
+
+@end
+
+void X11ControllerMain(int argc, char **argv, char **envp) {
+    X11ApplicationMain (argc, argv, envp);
+}
diff --git a/xorg-server/hw/xquartz/bundle/Resources/English.lproj/main.nib/designable.nib b/xorg-server/hw/xquartz/bundle/Resources/English.lproj/main.nib/designable.nib
index 7609393ba..bbf7eda62 100644
--- a/xorg-server/hw/xquartz/bundle/Resources/English.lproj/main.nib/designable.nib
+++ b/xorg-server/hw/xquartz/bundle/Resources/English.lproj/main.nib/designable.nib
@@ -2,19 +2,22 @@
 <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
 	<data>
 		<int key="IBDocument.SystemTarget">1040</int>
-		<string key="IBDocument.SystemVersion">10D573</string>
-		<string key="IBDocument.InterfaceBuilderVersion">761</string>
-		<string key="IBDocument.AppKitVersion">1038.29</string>
-		<string key="IBDocument.HIToolboxVersion">460.00</string>
+		<string key="IBDocument.SystemVersion">10J541</string>
+		<string key="IBDocument.InterfaceBuilderVersion">850</string>
+		<string key="IBDocument.AppKitVersion">1038.35</string>
+		<string key="IBDocument.HIToolboxVersion">462.00</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
-			<string key="NS.object.0">761</string>
+			<string key="NS.object.0">850</string>
 		</object>
 		<array class="NSMutableArray" key="IBDocument.EditedObjectIDs"/>
 		<array key="IBDocument.PluginDependencies">
 			<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 		</array>
-		<dictionary class="NSMutableDictionary" key="IBDocument.Metadata"/>
+		<object class="NSMutableDictionary" key="IBDocument.Metadata">
+			<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
+			<integer value="1" key="NS.object.0"/>
+		</object>
 		<array class="NSMutableArray" key="IBDocument.RootObjects" id="904585544">
 			<object class="NSCustomObject" id="815810918">
 				<object class="NSMutableString" key="NSClassName">
@@ -388,7 +391,7 @@
 										<characters key="NS.bytes">1</characters>
 									</object>
 									<object class="NSView" key="NSView" id="596750588">
-										<reference key="NSNextResponder" ref="448510093"/>
+										<nil key="NSNextResponder"/>
 										<int key="NSvFlags">256</int>
 										<array class="NSMutableArray" key="NSSubviews">
 											<object class="NSButton" id="119157981">
@@ -396,7 +399,6 @@
 												<int key="NSvFlags">256</int>
 												<string key="NSFrame">{{18, 210}, {402, 18}}</string>
 												<reference key="NSSuperview" ref="596750588"/>
-												<reference key="NSWindow"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSButtonCell" key="NSCell" id="990762273">
 													<int key="NSCellFlags">67239424</int>
@@ -424,7 +426,6 @@
 												<int key="NSvFlags">256</int>
 												<string key="NSFrame">{{36, 60}, {385, 31}}</string>
 												<reference key="NSSuperview" ref="596750588"/>
-												<reference key="NSWindow"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSTextFieldCell" key="NSCell" id="391919450">
 													<int key="NSCellFlags">67239424</int>
@@ -461,7 +462,6 @@
 												<int key="NSvFlags">256</int>
 												<string key="NSFrame">{{36, 162}, {385, 42}}</string>
 												<reference key="NSSuperview" ref="596750588"/>
-												<reference key="NSWindow"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSTextFieldCell" key="NSCell" id="649334366">
 													<int key="NSCellFlags">67239424</int>
@@ -479,7 +479,6 @@ IG9yIHJpZ2h0IG1vdXNlIGJ1dHRvbnMuCg</string>
 												<int key="NSvFlags">256</int>
 												<string key="NSFrame">{{18, 97}, {402, 18}}</string>
 												<reference key="NSSuperview" ref="596750588"/>
-												<reference key="NSWindow"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSButtonCell" key="NSCell" id="940564599">
 													<int key="NSCellFlags">67239424</int>
@@ -501,7 +500,6 @@ IG9yIHJpZ2h0IG1vdXNlIGJ1dHRvbnMuCg</string>
 												<int key="NSvFlags">256</int>
 												<string key="NSFrame">{{36, 126}, {385, 14}}</string>
 												<reference key="NSSuperview" ref="596750588"/>
-												<reference key="NSWindow"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSTextFieldCell" key="NSCell" id="666057093">
 													<int key="NSCellFlags">67239424</int>
@@ -518,7 +516,6 @@ IG9yIHJpZ2h0IG1vdXNlIGJ1dHRvbnMuCg</string>
 												<int key="NSvFlags">256</int>
 												<string key="NSFrame">{{18, 146}, {402, 18}}</string>
 												<reference key="NSSuperview" ref="596750588"/>
-												<reference key="NSWindow"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSButtonCell" key="NSCell" id="967619578">
 													<int key="NSCellFlags">67239424</int>
@@ -540,7 +537,6 @@ IG9yIHJpZ2h0IG1vdXNlIGJ1dHRvbnMuCg</string>
 												<int key="NSvFlags">256</int>
 												<string key="NSFrame">{{36, -1}, {385, 31}}</string>
 												<reference key="NSSuperview" ref="596750588"/>
-												<reference key="NSWindow"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSTextFieldCell" key="NSCell" id="617441821">
 													<int key="NSCellFlags">67239424</int>
@@ -557,7 +553,6 @@ IG9yIHJpZ2h0IG1vdXNlIGJ1dHRvbnMuCg</string>
 												<int key="NSvFlags">256</int>
 												<string key="NSFrame">{{18, 36}, {402, 18}}</string>
 												<reference key="NSSuperview" ref="596750588"/>
-												<reference key="NSWindow"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSButtonCell" key="NSCell" id="67728988">
 													<int key="NSCellFlags">67239424</int>
@@ -576,8 +571,6 @@ IG9yIHJpZ2h0IG1vdXNlIGJ1dHRvbnMuCg</string>
 											</object>
 										</array>
 										<string key="NSFrame">{{10, 33}, {438, 246}}</string>
-										<reference key="NSSuperview" ref="448510093"/>
-										<reference key="NSWindow"/>
 									</object>
 									<string key="NSLabel">Input</string>
 									<reference key="NSColor" ref="57160303"/>
@@ -588,51 +581,15 @@ IG9yIHJpZ2h0IG1vdXNlIGJ1dHRvbnMuCg</string>
 										<characters key="NS.bytes">2</characters>
 									</object>
 									<object class="NSView" key="NSView" id="515308735">
-										<nil key="NSNextResponder"/>
+										<reference key="NSNextResponder" ref="448510093"/>
 										<int key="NSvFlags">256</int>
 										<array class="NSMutableArray" key="NSSubviews">
-											<object class="NSButton" id="418227126">
-												<reference key="NSNextResponder" ref="515308735"/>
-												<int key="NSvFlags">256</int>
-												<string key="NSFrame">{{18, 63}, {402, 18}}</string>
-												<reference key="NSSuperview" ref="515308735"/>
-												<bool key="NSEnabled">YES</bool>
-												<object class="NSButtonCell" key="NSCell" id="1016069354">
-													<int key="NSCellFlags">67239424</int>
-													<int key="NSCellFlags2">0</int>
-													<string key="NSContents">Use system alert effect</string>
-													<reference key="NSSupport" ref="463863101"/>
-													<reference key="NSControlView" ref="418227126"/>
-													<int key="NSButtonFlags">1211912703</int>
-													<int key="NSButtonFlags2">2</int>
-													<reference key="NSAlternateImage" ref="391434389"/>
-													<string key="NSAlternateContents"/>
-													<string key="NSKeyEquivalent"/>
-													<int key="NSPeriodicDelay">200</int>
-													<int key="NSPeriodicInterval">25</int>
-												</object>
-											</object>
-											<object class="NSTextField" id="1039016593">
-												<reference key="NSNextResponder" ref="515308735"/>
-												<int key="NSvFlags">256</int>
-												<string key="NSFrame">{{36, 29}, {385, 28}}</string>
-												<reference key="NSSuperview" ref="515308735"/>
-												<bool key="NSEnabled">YES</bool>
-												<object class="NSTextFieldCell" key="NSCell" id="624655599">
-													<int key="NSCellFlags">67239424</int>
-													<int key="NSCellFlags2">4194304</int>
-													<string key="NSContents">X11 beeps will use the standard system alert, as defined in the Sound Effects system preferences panel.</string>
-													<reference key="NSSupport" ref="26"/>
-													<reference key="NSControlView" ref="1039016593"/>
-													<reference key="NSBackgroundColor" ref="57160303"/>
-													<reference key="NSTextColor" ref="930815747"/>
-												</object>
-											</object>
 											<object class="NSPopUpButton" id="709074847">
 												<reference key="NSNextResponder" ref="515308735"/>
 												<int key="NSvFlags">256</int>
 												<string key="NSFrame">{{74, 202}, {128, 26}}</string>
 												<reference key="NSSuperview" ref="515308735"/>
+												<reference key="NSWindow"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSPopUpButtonCell" key="NSCell" id="633115429">
 													<int key="NSCellFlags">-2076049856</int>
@@ -723,6 +680,7 @@ IG9yIHJpZ2h0IG1vdXNlIGJ1dHRvbnMuCg</string>
 												<int key="NSvFlags">256</int>
 												<string key="NSFrame">{{17, 205}, {55, 20}}</string>
 												<reference key="NSSuperview" ref="515308735"/>
+												<reference key="NSWindow"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSTextFieldCell" key="NSCell" id="930265681">
 													<int key="NSCellFlags">67239424</int>
@@ -739,6 +697,7 @@ IG9yIHJpZ2h0IG1vdXNlIGJ1dHRvbnMuCg</string>
 												<int key="NSvFlags">256</int>
 												<string key="NSFrame">{{36, 183}, {392, 14}}</string>
 												<reference key="NSSuperview" ref="515308735"/>
+												<reference key="NSWindow"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSTextFieldCell" key="NSCell" id="311969422">
 													<int key="NSCellFlags">67239424</int>
@@ -755,6 +714,7 @@ IG9yIHJpZ2h0IG1vdXNlIGJ1dHRvbnMuCg</string>
 												<int key="NSvFlags">256</int>
 												<string key="NSFrame">{{18, 149}, {409, 23}}</string>
 												<reference key="NSSuperview" ref="515308735"/>
+												<reference key="NSWindow"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSButtonCell" key="NSCell" id="631531164">
 													<int key="NSCellFlags">67239424</int>
@@ -776,6 +736,7 @@ IG9yIHJpZ2h0IG1vdXNlIGJ1dHRvbnMuCg</string>
 												<int key="NSvFlags">256</int>
 												<string key="NSFrame">{{37, 83}, {409, 23}}</string>
 												<reference key="NSSuperview" ref="515308735"/>
+												<reference key="NSWindow"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSButtonCell" key="NSCell" id="917248662">
 													<int key="NSCellFlags">67239424</int>
@@ -797,6 +758,7 @@ IG9yIHJpZ2h0IG1vdXNlIGJ1dHRvbnMuCg</string>
 												<int key="NSvFlags">256</int>
 												<string key="NSFrame">{{36, 112}, {385, 31}}</string>
 												<reference key="NSSuperview" ref="515308735"/>
+												<reference key="NSWindow"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSTextFieldCell" key="NSCell" id="761107402">
 													<int key="NSCellFlags">67239424</int>
@@ -810,6 +772,8 @@ IG9yIHJpZ2h0IG1vdXNlIGJ1dHRvbnMuCg</string>
 											</object>
 										</array>
 										<string key="NSFrame">{{10, 33}, {438, 246}}</string>
+										<reference key="NSSuperview" ref="448510093"/>
+										<reference key="NSWindow"/>
 									</object>
 									<string key="NSLabel">Output</string>
 									<reference key="NSColor" ref="57160303"/>
@@ -1212,13 +1176,13 @@ IG9yIHJpZ2h0IG1vdXNlIGJ1dHRvbnMuCg</string>
 									<reference key="NSTabView" ref="448510093"/>
 								</object>
 							</array>
-							<reference key="NSSelectedTabViewItem" ref="287591690"/>
+							<reference key="NSSelectedTabViewItem" ref="960678392"/>
 							<reference key="NSFont" ref="463863101"/>
 							<int key="NSTvFlags">0</int>
 							<bool key="NSAllowTruncatedLabels">YES</bool>
 							<bool key="NSDrawsBackground">YES</bool>
 							<array class="NSMutableArray" key="NSSubviews">
-								<reference ref="596750588"/>
+								<reference ref="515308735"/>
 							</array>
 						</object>
 					</array>
@@ -1734,14 +1698,6 @@ IG9yIHJpZ2h0IG1vdXNlIGJ1dHRvbnMuCg</string>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">use_sysbeep</string>
-						<reference key="source" ref="485884620"/>
-						<reference key="destination" ref="418227126"/>
-					</object>
-					<int key="connectionID">390</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
 						<string key="label">fake_buttons</string>
 						<reference key="source" ref="485884620"/>
 						<reference key="destination" ref="119157981"/>
@@ -1792,14 +1748,6 @@ IG9yIHJpZ2h0IG1vdXNlIGJ1dHRvbnMuCg</string>
 					<object class="IBActionConnection" key="connection">
 						<string key="label">prefs_changed:</string>
 						<reference key="source" ref="485884620"/>
-						<reference key="destination" ref="418227126"/>
-					</object>
-					<int key="connectionID">397</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">prefs_changed:</string>
-						<reference key="source" ref="485884620"/>
 						<reference key="destination" ref="709074847"/>
 					</object>
 					<int key="connectionID">398</int>
@@ -2547,28 +2495,10 @@ IG9yIHJpZ2h0IG1vdXNlIGJ1dHRvbnMuCg</string>
 							<reference ref="477203622"/>
 							<reference ref="57246850"/>
 							<reference ref="298603383"/>
-							<reference ref="418227126"/>
-							<reference ref="1039016593"/>
 						</array>
 						<reference key="parent" ref="960678392"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">371</int>
-						<reference key="object" ref="418227126"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="1016069354"/>
-						</array>
-						<reference key="parent" ref="515308735"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">372</int>
-						<reference key="object" ref="1039016593"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="624655599"/>
-						</array>
-						<reference key="parent" ref="515308735"/>
-					</object>
-					<object class="IBObjectRecord">
 						<int key="objectID">382</int>
 						<reference key="object" ref="709074847"/>
 						<array class="NSMutableArray" key="children">
@@ -2761,16 +2691,6 @@ IG9yIHJpZ2h0IG1vdXNlIGJ1dHRvbnMuCg</string>
 						<reference key="parent" ref="179949713"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">100371</int>
-						<reference key="object" ref="1016069354"/>
-						<reference key="parent" ref="418227126"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">100372</int>
-						<reference key="object" ref="624655599"/>
-						<reference key="parent" ref="1039016593"/>
-					</object>
-					<object class="IBObjectRecord">
 						<int key="objectID">100382</int>
 						<reference key="object" ref="633115429"/>
 						<array class="NSMutableArray" key="children">
@@ -3249,8 +3169,6 @@ IG9yIHJpZ2h0IG1vdXNlIGJ1dHRvbnMuCg</string>
 				<string key="100368.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="100369.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="100370.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="100371.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="100372.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="100374.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="100375.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="100376.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -3443,10 +3361,6 @@ IG9yIHJpZ2h0IG1vdXNlIGJ1dHRvbnMuCg</string>
 				<integer value="1" key="369.ImportedFromIB2"/>
 				<string key="370.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<integer value="1" key="370.ImportedFromIB2"/>
-				<string key="371.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<integer value="1" key="371.ImportedFromIB2"/>
-				<string key="372.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<integer value="1" key="372.ImportedFromIB2"/>
 				<string key="374.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<integer value="1" key="374.ImportedFromIB2"/>
 				<string key="375.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -3582,6 +3496,76 @@ IG9yIHJpZ2h0IG1vdXNlIGJ1dHRvbnMuCg</string>
 						<string key="x11_help:">id</string>
 						<string key="zoom_window:">id</string>
 					</dictionary>
+					<dictionary class="NSMutableDictionary" key="actionInfosByName">
+						<object class="IBActionInfo" key="apps_table_delete:">
+							<string key="name">apps_table_delete:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="apps_table_done:">
+							<string key="name">apps_table_done:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="apps_table_duplicate:">
+							<string key="name">apps_table_duplicate:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="apps_table_new:">
+							<string key="name">apps_table_new:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="apps_table_show:">
+							<string key="name">apps_table_show:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="bring_to_front:">
+							<string key="name">bring_to_front:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="close_window:">
+							<string key="name">close_window:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="enable_fullscreen_changed:">
+							<string key="name">enable_fullscreen_changed:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="minimize_window:">
+							<string key="name">minimize_window:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="next_window:">
+							<string key="name">next_window:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="prefs_changed:">
+							<string key="name">prefs_changed:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="prefs_show:">
+							<string key="name">prefs_show:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="previous_window:">
+							<string key="name">previous_window:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="quit:">
+							<string key="name">quit:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="toggle_fullscreen:">
+							<string key="name">toggle_fullscreen:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="x11_help:">
+							<string key="name">x11_help:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="zoom_window:">
+							<string key="name">zoom_window:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+					</dictionary>
 					<dictionary class="NSMutableDictionary" key="outlets">
 						<string key="apps_separator">NSMenuItem</string>
 						<string key="apps_table">NSTableView</string>
@@ -3614,6 +3598,128 @@ IG9yIHJpZ2h0IG1vdXNlIGJ1dHRvbnMuCg</string>
 						<string key="window_separator">NSMenuItem</string>
 						<string key="x11_about_item">NSMenuItem</string>
 					</dictionary>
+					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<object class="IBToOneOutletInfo" key="apps_separator">
+							<string key="name">apps_separator</string>
+							<string key="candidateClassName">NSMenuItem</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="apps_table">
+							<string key="name">apps_table</string>
+							<string key="candidateClassName">NSTableView</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="click_through">
+							<string key="name">click_through</string>
+							<string key="candidateClassName">NSButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="copy_menu_item">
+							<string key="name">copy_menu_item</string>
+							<string key="candidateClassName">NSMenuItem</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="depth">
+							<string key="name">depth</string>
+							<string key="candidateClassName">NSPopUpButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="dock_apps_menu">
+							<string key="name">dock_apps_menu</string>
+							<string key="candidateClassName">NSMenu</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="dock_menu">
+							<string key="name">dock_menu</string>
+							<string key="candidateClassName">NSMenu</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="dock_window_separator">
+							<string key="name">dock_window_separator</string>
+							<string key="candidateClassName">NSMenuItem</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="enable_auth">
+							<string key="name">enable_auth</string>
+							<string key="candidateClassName">NSButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="enable_fullscreen">
+							<string key="name">enable_fullscreen</string>
+							<string key="candidateClassName">NSButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="enable_fullscreen_menu">
+							<string key="name">enable_fullscreen_menu</string>
+							<string key="candidateClassName">NSButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="enable_keyequivs">
+							<string key="name">enable_keyequivs</string>
+							<string key="candidateClassName">NSButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="enable_tcp">
+							<string key="name">enable_tcp</string>
+							<string key="candidateClassName">NSButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="fake_buttons">
+							<string key="name">fake_buttons</string>
+							<string key="candidateClassName">NSButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="focus_follows_mouse">
+							<string key="name">focus_follows_mouse</string>
+							<string key="candidateClassName">NSButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="focus_on_new_window">
+							<string key="name">focus_on_new_window</string>
+							<string key="candidateClassName">NSButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="option_sends_alt">
+							<string key="name">option_sends_alt</string>
+							<string key="candidateClassName">NSButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="prefs_panel">
+							<string key="name">prefs_panel</string>
+							<string key="candidateClassName">NSPanel</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="sync_clipboard_to_pasteboard">
+							<string key="name">sync_clipboard_to_pasteboard</string>
+							<string key="candidateClassName">NSButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="sync_keymap">
+							<string key="name">sync_keymap</string>
+							<string key="candidateClassName">NSButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="sync_pasteboard">
+							<string key="name">sync_pasteboard</string>
+							<string key="candidateClassName">NSButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="sync_pasteboard_to_clipboard">
+							<string key="name">sync_pasteboard_to_clipboard</string>
+							<string key="candidateClassName">NSButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="sync_pasteboard_to_primary">
+							<string key="name">sync_pasteboard_to_primary</string>
+							<string key="candidateClassName">NSButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="sync_primary_immediately">
+							<string key="name">sync_primary_immediately</string>
+							<string key="candidateClassName">NSButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="sync_text1">
+							<string key="name">sync_text1</string>
+							<string key="candidateClassName">NSTextField</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="sync_text2">
+							<string key="name">sync_text2</string>
+							<string key="candidateClassName">NSTextField</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="toggle_fullscreen_item">
+							<string key="name">toggle_fullscreen_item</string>
+							<string key="candidateClassName">NSMenuItem</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="use_sysbeep">
+							<string key="name">use_sysbeep</string>
+							<string key="candidateClassName">NSButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="window_separator">
+							<string key="name">window_separator</string>
+							<string key="candidateClassName">NSMenuItem</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="x11_about_item">
+							<string key="name">x11_about_item</string>
+							<string key="candidateClassName">NSMenuItem</string>
+						</object>
+					</dictionary>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBDocumentRelativeSource</string>
 						<string key="minorKey">../../../X11Controller.h</string>
diff --git a/xorg-server/hw/xquartz/bundle/Resources/English.lproj/main.nib/keyedobjects.nib b/xorg-server/hw/xquartz/bundle/Resources/English.lproj/main.nib/keyedobjects.nib
index 888424dfc..836d59532 100644
--- a/xorg-server/hw/xquartz/bundle/Resources/English.lproj/main.nib/keyedobjects.nib
+++ b/xorg-server/hw/xquartz/bundle/Resources/English.lproj/main.nib/keyedobjects.nib
diff --git a/xorg-server/hw/xquartz/quartz.c b/xorg-server/hw/xquartz/quartz.c
index aed063489..6c185a8eb 100644
--- a/xorg-server/hw/xquartz/quartz.c
+++ b/xorg-server/hw/xquartz/quartz.c
@@ -1,448 +1,457 @@
-/*

- *

- * Quartz-specific support for the Darwin X Server

- *

- * Copyright (c) 2001-2004 Greg Parker and Torrey T. Lyons.

- *                 All Rights Reserved.

- *

- * Permission is hereby granted, free of charge, to any person obtaining a

- * copy of this software and associated documentation files (the "Software"),

- * to deal in the Software without restriction, including without limitation

- * the rights to use, copy, modify, merge, publish, distribute, sublicense,

- * and/or sell copies of the Software, and to permit persons to whom the

- * Software is furnished to do so, subject to the following conditions:

- *

- * The above copyright notice and this permission notice shall be included in

- * all copies or substantial portions of the Software.

- *

- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL

- * THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR

- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,

- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER

- * DEALINGS IN THE SOFTWARE.

- *

- * Except as contained in this notice, the name(s) of the above copyright

- * holders shall not be used in advertising or otherwise to promote the sale,

- * use or other dealings in this Software without prior written authorization.

- */

-

-#include "sanitizedCarbon.h"

-

-#ifdef HAVE_DIX_CONFIG_H

-#include <dix-config.h>

-#endif

-

-#include "quartzCommon.h"

-#include "quartzRandR.h"

-#include "inputstr.h"

-#include "quartz.h"

-#include "darwin.h"

-#include "darwinEvents.h"

-#include "pseudoramiX.h"

-#define _APPLEWM_SERVER_

-#include "applewmExt.h"

-

-#include "X11Application.h"

-

-#include <X11/extensions/applewmconst.h>

-

-// X headers

-#include "scrnintstr.h"

-#include "windowstr.h"

-#include "colormapst.h"

-#include "globals.h"

-#include "mi.h"

-

-// System headers

-#include <stdlib.h>

-#include <string.h>

-#include <sys/types.h>

-#include <sys/stat.h>

-#include <fcntl.h>

-#include <IOKit/pwr_mgt/IOPMLib.h>

-#include <pthread.h>

-

-#include <rootlessCommon.h>

-#include <Xplugin.h>

-

-DevPrivateKeyRec        quartzScreenKeyRec;

-int                     aquaMenuBarHeight = 0;

-QuartzModeProcsPtr      quartzProcs = NULL;

-const char             *quartzOpenGLBundle = NULL;

-

-Bool XQuartzFullscreenDisableHotkeys = TRUE;

-Bool XQuartzOptionSendsAlt = FALSE;

-Bool XQuartzEnableKeyEquivalents = TRUE;

-Bool XQuartzFullscreenVisible = FALSE;

-Bool XQuartzRootlessDefault = TRUE;

-Bool XQuartzIsRootless = TRUE;

-Bool XQuartzServerVisible = FALSE;

-Bool XQuartzFullscreenMenu = FALSE;

-Bool XQuartzUseSysBeep = FALSE;

-

-/*

-===========================================================================

-

- Screen functions

-

-===========================================================================

-*/

-

-/*

- * QuartzAddScreen

- *  Do mode dependent initialization of each screen for Quartz.

- */

-Bool QuartzAddScreen(

-    int index,

-    ScreenPtr pScreen)

-{

-    // allocate space for private per screen Quartz specific storage

-    QuartzScreenPtr displayInfo = calloc(sizeof(QuartzScreenRec), 1);

-

-    // QUARTZ_PRIV(pScreen) = displayInfo;

-    dixSetPrivate(&pScreen->devPrivates, quartzScreenKey, displayInfo);

-

-    // do Quartz mode specific initialization

-    return quartzProcs->AddScreen(index, pScreen);

-}

-

-

-/*

- * QuartzSetupScreen

- *  Finalize mode specific setup of each screen.

- */

-Bool QuartzSetupScreen(

-    int index,

-    ScreenPtr pScreen)

-{

-    // do Quartz mode specific setup

-    if (! quartzProcs->SetupScreen(index, pScreen))

-        return FALSE;

-

-    // setup cursor support

-    if (! quartzProcs->InitCursor(pScreen))

-        return FALSE;

-

-#if defined(RANDR)

-    if(!QuartzRandRInit(pScreen)) {

-        DEBUG_LOG("Failed to init RandR extension.\n");

-        return FALSE;

-    }

-#endif

-

-    return TRUE;

-}

-

-

-/*

- * QuartzInitOutput

- *  Quartz display initialization.

- */

-void QuartzInitOutput(

-    int argc,

-    char **argv )

-{

-    if (!RegisterBlockAndWakeupHandlers(QuartzBlockHandler,

-                                        QuartzWakeupHandler,

-                                        NULL))

-    {

-        FatalError("Could not register block and wakeup handlers.");

-    }

-

-    if (!dixRegisterPrivateKey(&quartzScreenKeyRec, PRIVATE_SCREEN, 0))

-	FatalError("Failed to alloc quartz screen private.\n");

-

-    // Do display mode specific initialization

-    quartzProcs->DisplayInit();

-}

-

-

-/*

- * QuartzInitInput

- *  Inform the main thread the X server is ready to handle events.

- */

-void QuartzInitInput(

-    int argc,

-    char **argv )

-{

-    X11ApplicationSetCanQuit(0);

-    X11ApplicationServerReady();

-    // Do final display mode specific initialization before handling events

-    if (quartzProcs->InitInput)

-        quartzProcs->InitInput(argc, argv);

-}

-

-

-void QuartzUpdateScreens(void) {

-    ScreenPtr pScreen;

-    WindowPtr pRoot;

-    int x, y, width, height, sx, sy;

-    xEvent e;

-    BoxRec bounds;

-    

-    if (noPseudoramiXExtension || screenInfo.numScreens != 1)

-    {

-        /* FIXME: if not using Xinerama, we have multiple screens, and

-         to do this properly may need to add or remove screens. Which

-         isn't possible. So don't do anything. Another reason why

-         we default to running with Xinerama. */

-        

-        return;

-    }

-    

-    pScreen = screenInfo.screens[0];

-    

-    PseudoramiXResetScreens();

-    quartzProcs->AddPseudoramiXScreens(&x, &y, &width, &height, pScreen);

-    

-    pScreen->x = x;

-    pScreen->y = y;

-    pScreen->mmWidth = pScreen->mmWidth * ((double) width / pScreen->width);

-    pScreen->mmHeight = pScreen->mmHeight * ((double) height / pScreen->height);

-    pScreen->width = width;

-    pScreen->height = height;

-    

-    DarwinAdjustScreenOrigins(&screenInfo);

-    

-    /* DarwinAdjustScreenOrigins or UpdateScreen may change pScreen->x/y,

-     * so use it rather than x/y

-     */

-    sx = pScreen->x + darwinMainScreenX;

-    sy = pScreen->y + darwinMainScreenY;

-    

-    /* Adjust the root window. */

-    pRoot = pScreen->root;

-    AppleWMSetScreenOrigin(pRoot);

-    pScreen->ResizeWindow(pRoot, x - sx, y - sy, width, height, NULL);

-

-    miPaintWindow(pRoot, &pRoot->borderClip,  PW_BACKGROUND);

-

-    /* <rdar://problem/7770779> pointer events are clipped to old display region after display reconfiguration

-     * http://xquartz.macosforge.org/trac/ticket/346

-     */

-    bounds.x1 = 0;

-    bounds.x2 = width;

-    bounds.y1 = 0;

-    bounds.y2 = height;

-    pScreen->ConstrainCursor(inputInfo.pointer, pScreen, &bounds);

-    inputInfo.pointer->spriteInfo->sprite->physLimits = bounds;

-    inputInfo.pointer->spriteInfo->sprite->hotLimits = bounds;

-

-    DEBUG_LOG("Root Window: %dx%d @ (%d, %d) darwinMainScreen (%d, %d) xy (%d, %d) dixScreenOrigins (%d, %d)\n", width, height, x - sx, y - sy, darwinMainScreenX, darwinMainScreenY, x, y, pScreen->x, pScreen->y);

-

-    /* Send an event for the root reconfigure */

-    e.u.u.type = ConfigureNotify;

-    e.u.configureNotify.window = pRoot->drawable.id;

-    e.u.configureNotify.aboveSibling = None;

-    e.u.configureNotify.x = x - sx;

-    e.u.configureNotify.y = y - sy;

-    e.u.configureNotify.width = width;

-    e.u.configureNotify.height = height;

-    e.u.configureNotify.borderWidth = wBorderWidth(pRoot);

-    e.u.configureNotify.override = pRoot->overrideRedirect;

-    DeliverEvents(pRoot, &e, 1, NullWindow);

-

-    quartzProcs->UpdateScreen(pScreen);

-}

-

-static void pokeActivityCallback(CFRunLoopTimerRef timer, void *info) {

-    UpdateSystemActivity(OverallAct);

-}

-

-static void QuartzScreenSaver(int state) {

-    static CFRunLoopTimerRef pokeActivityTimer = NULL;

-    static CFRunLoopTimerContext pokeActivityContext = { 0, NULL, NULL, NULL, NULL };

-    static pthread_mutex_t pokeActivityMutex = PTHREAD_MUTEX_INITIALIZER;

-

-    pthread_mutex_lock(&pokeActivityMutex);

-    

-    if(state) {

-        if(pokeActivityTimer == NULL)

-            goto QuartzScreenSaverEnd;

-

-        CFRunLoopTimerInvalidate(pokeActivityTimer);

-        CFRelease(pokeActivityTimer);

-        pokeActivityTimer = NULL;

-    } else {

-        if(pokeActivityTimer != NULL)

-            goto QuartzScreenSaverEnd;

-        

-        pokeActivityTimer = CFRunLoopTimerCreate(NULL, CFAbsoluteTimeGetCurrent(), 30, 0, 0, pokeActivityCallback, &pokeActivityContext);

-        if(pokeActivityTimer == NULL) {

-            ErrorF("Unable to create pokeActivityTimer.\n");

-            goto QuartzScreenSaverEnd;

-        }

-

-        CFRunLoopAddTimer(CFRunLoopGetMain(), pokeActivityTimer, kCFRunLoopCommonModes);

-    }

-QuartzScreenSaverEnd:

-    pthread_mutex_unlock(&pokeActivityMutex);

-}

-

-void QuartzShowFullscreen(int state) {

-    int i;

-    

-    DEBUG_LOG("QuartzShowFullscreen: state=%d\n", state);

-    

-    if(XQuartzIsRootless) {

-        ErrorF("QuartzShowFullscreen called while in rootless mode.\n");

-        return;

-    }

-    

-    QuartzScreenSaver(!state);

-    

-    if(XQuartzFullscreenVisible == state)

-        return;

-    

-    XQuartzFullscreenVisible = state;

-    

-    xp_disable_update ();

-    

-    if (!XQuartzFullscreenVisible)

-        RootlessHideAllWindows();

-    

-    RootlessUpdateRooted(XQuartzFullscreenVisible);

-    

-    if (XQuartzFullscreenVisible) {

-        RootlessShowAllWindows ();

-        for (i=0; i < screenInfo.numScreens; i++) {

-            ScreenPtr pScreen = screenInfo.screens[i];        

-            RootlessRepositionWindows(pScreen);

-            // JH: I don't think this is necessary, but keeping it here as a reminder

-            //RootlessUpdateScreenPixmap(pScreen);

-        }

-    }

-

-    /* Somehow the menubar manages to interfere with our event stream

-     * in fullscreen mode, even though it's not visible. 

-     */

-    X11ApplicationShowHideMenubar(!XQuartzFullscreenVisible);

-    

-    xp_reenable_update ();

-    

-    if (XQuartzFullscreenDisableHotkeys)

-        xp_disable_hot_keys(XQuartzFullscreenVisible);

-}

-

-void QuartzSetRootless(Bool state) {    

-    DEBUG_LOG("QuartzSetRootless state=%d\n", state);

-    

-    if(XQuartzIsRootless == state)

-        return;

-    

-    if(state)

-        QuartzShowFullscreen(FALSE);

-    

-    XQuartzIsRootless = state;

-

-    xp_disable_update();

-

-    /* When in rootless, the menubar is not part of the screen, so we need to update our screens on toggle */    

-    QuartzUpdateScreens();

-

-    if(XQuartzIsRootless) {

-        RootlessShowAllWindows();

-    } else {

-        RootlessHideAllWindows();

-    }

-

-    X11ApplicationShowHideMenubar(TRUE);

-

-    xp_reenable_update();

-

-    xp_disable_hot_keys(FALSE);

-}

-

-/*

- * QuartzShow

- *  Show the X server on screen. Does nothing if already shown.

- *  Calls mode specific screen resume to restore the X clip regions

- *  (if needed) and the X server cursor state.

- */

-void QuartzShow(void) {

-    int i;

-

-    if (XQuartzServerVisible)

-        return;

-    

-    XQuartzServerVisible = TRUE;

-    for (i = 0; i < screenInfo.numScreens; i++) {

-        if (screenInfo.screens[i]) {

-            quartzProcs->ResumeScreen(screenInfo.screens[i]);

-        }

-    }

-    

-    if (!XQuartzIsRootless)

-        QuartzShowFullscreen(TRUE);

-}

-

-

-/*

- * QuartzHide

- *  Remove the X server display from the screen. Does nothing if already

- *  hidden. Calls mode specific screen suspend to set X clip regions to

- *  prevent drawing (if needed) and restore the Aqua cursor.

- */

-void QuartzHide(void)

-{

-    int i;

-

-    if (XQuartzServerVisible) {

-        for (i = 0; i < screenInfo.numScreens; i++) {

-            if (screenInfo.screens[i]) {

-                quartzProcs->SuspendScreen(screenInfo.screens[i]);

-            }

-        }

-    }

-

-    if(!XQuartzIsRootless)

-        QuartzShowFullscreen(FALSE);

-    XQuartzServerVisible = FALSE;

-}

-

-

-/*

- * QuartzSetRootClip

- *  Enable or disable rendering to the X screen.

- */

-void QuartzSetRootClip(

-    BOOL enable)

-{

-    int i;

-

-    if (!XQuartzServerVisible)

-        return;

-

-    for (i = 0; i < screenInfo.numScreens; i++) {

-        if (screenInfo.screens[i]) {

-            xf86SetRootClip(screenInfo.screens[i], enable);

-        }

-    }

-}

-

-/* 

- * QuartzSpaceChanged

- *  Unmap offscreen windows, map onscreen windows

- */

-void QuartzSpaceChanged(uint32_t space_id) {

-    /* Do something special here, so we don't depend on quartz-wm for spaces to work... */

-    DEBUG_LOG("Space Changed (%u) ... do something interesting...\n", space_id);

-}

-

-/*

- * QuartzCopyDisplayIDs

- *  Associate an X11 screen with one or more CoreGraphics display IDs by copying

- *  the list into a private array. Free the previously copied array, if present.

- */

-void QuartzCopyDisplayIDs(ScreenPtr pScreen,

-                          int displayCount, CGDirectDisplayID *displayIDs) {

-    QuartzScreenPtr pQuartzScreen = QUARTZ_PRIV(pScreen);

-    int size = displayCount * sizeof(CGDirectDisplayID);

-

-    free(pQuartzScreen->displayIDs);

-    pQuartzScreen->displayIDs = malloc(size);

-    memcpy(pQuartzScreen->displayIDs, displayIDs, size);

-    pQuartzScreen->displayCount = displayCount;

-}

+/*
+ *
+ * Quartz-specific support for the Darwin X Server
+ *
+ * Copyright (c) 2001-2004 Greg Parker and Torrey T. Lyons.
+ *                 All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Except as contained in this notice, the name(s) of the above copyright
+ * holders shall not be used in advertising or otherwise to promote the sale,
+ * use or other dealings in this Software without prior written authorization.
+ */
+
+#include "sanitizedCarbon.h"
+
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
+#include "quartzCommon.h"
+#include "quartzRandR.h"
+#include "inputstr.h"
+#include "quartz.h"
+#include "darwin.h"
+#include "darwinEvents.h"
+#include "pseudoramiX.h"
+#define _APPLEWM_SERVER_
+#include "applewmExt.h"
+
+#include "X11Application.h"
+
+#include <X11/extensions/applewmconst.h>
+
+// X headers
+#include "scrnintstr.h"
+#include "windowstr.h"
+#include "colormapst.h"
+#include "globals.h"
+#include "mi.h"
+
+// System headers
+#include <stdlib.h>
+#include <string.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <IOKit/pwr_mgt/IOPMLib.h>
+#include <pthread.h>
+
+#include <rootlessCommon.h>
+#include <Xplugin.h>
+
+DevPrivateKeyRec        quartzScreenKeyRec;
+int                     aquaMenuBarHeight = 0;
+QuartzModeProcsPtr      quartzProcs = NULL;
+const char             *quartzOpenGLBundle = NULL;
+
+Bool XQuartzFullscreenDisableHotkeys = TRUE;
+Bool XQuartzOptionSendsAlt = FALSE;
+Bool XQuartzEnableKeyEquivalents = TRUE;
+Bool XQuartzFullscreenVisible = FALSE;
+Bool XQuartzRootlessDefault = TRUE;
+Bool XQuartzIsRootless = TRUE;
+Bool XQuartzServerVisible = FALSE;
+Bool XQuartzFullscreenMenu = FALSE;
+
+/*
+===========================================================================
+
+ Screen functions
+
+===========================================================================
+*/
+
+/*
+ * QuartzAddScreen
+ *  Do mode dependent initialization of each screen for Quartz.
+ */
+Bool QuartzAddScreen(
+    int index,
+    ScreenPtr pScreen)
+{
+    // allocate space for private per screen Quartz specific storage
+    QuartzScreenPtr displayInfo = calloc(sizeof(QuartzScreenRec), 1);
+
+    // QUARTZ_PRIV(pScreen) = displayInfo;
+    dixSetPrivate(&pScreen->devPrivates, quartzScreenKey, displayInfo);
+
+    // do Quartz mode specific initialization
+    return quartzProcs->AddScreen(index, pScreen);
+}
+
+
+/*
+ * QuartzSetupScreen
+ *  Finalize mode specific setup of each screen.
+ */
+Bool QuartzSetupScreen(
+    int index,
+    ScreenPtr pScreen)
+{
+    // do Quartz mode specific setup
+    if (! quartzProcs->SetupScreen(index, pScreen))
+        return FALSE;
+
+    // setup cursor support
+    if (! quartzProcs->InitCursor(pScreen))
+        return FALSE;
+
+#if defined(RANDR)
+    if(!QuartzRandRInit(pScreen)) {
+        DEBUG_LOG("Failed to init RandR extension.\n");
+        return FALSE;
+    }
+#endif
+
+    return TRUE;
+}
+
+
+/*
+ * QuartzInitOutput
+ *  Quartz display initialization.
+ */
+void QuartzInitOutput(
+    int argc,
+    char **argv )
+{
+    if (!RegisterBlockAndWakeupHandlers(QuartzBlockHandler,
+                                        QuartzWakeupHandler,
+                                        NULL))
+    {
+        FatalError("Could not register block and wakeup handlers.");
+    }
+
+    if (!dixRegisterPrivateKey(&quartzScreenKeyRec, PRIVATE_SCREEN, 0))
+	FatalError("Failed to alloc quartz screen private.\n");
+
+    // Do display mode specific initialization
+    quartzProcs->DisplayInit();
+}
+
+
+/*
+ * QuartzInitInput
+ *  Inform the main thread the X server is ready to handle events.
+ */
+void QuartzInitInput(
+    int argc,
+    char **argv )
+{
+    X11ApplicationSetCanQuit(0);
+    X11ApplicationServerReady();
+    // Do final display mode specific initialization before handling events
+    if (quartzProcs->InitInput)
+        quartzProcs->InitInput(argc, argv);
+}
+
+
+void QuartzUpdateScreens(void) {
+    ScreenPtr pScreen;
+    WindowPtr pRoot;
+    int x, y, width, height, sx, sy;
+    xEvent e;
+    BoxRec bounds;
+    
+    if (noPseudoramiXExtension || screenInfo.numScreens != 1)
+    {
+        /* FIXME: if not using Xinerama, we have multiple screens, and
+         to do this properly may need to add or remove screens. Which
+         isn't possible. So don't do anything. Another reason why
+         we default to running with Xinerama. */
+        
+        return;
+    }
+    
+    pScreen = screenInfo.screens[0];
+    
+    PseudoramiXResetScreens();
+    quartzProcs->AddPseudoramiXScreens(&x, &y, &width, &height, pScreen);
+    
+    pScreen->x = x;
+    pScreen->y = y;
+    pScreen->mmWidth = pScreen->mmWidth * ((double) width / pScreen->width);
+    pScreen->mmHeight = pScreen->mmHeight * ((double) height / pScreen->height);
+    pScreen->width = width;
+    pScreen->height = height;
+    
+    DarwinAdjustScreenOrigins(&screenInfo);
+    
+    /* DarwinAdjustScreenOrigins or UpdateScreen may change pScreen->x/y,
+     * so use it rather than x/y
+     */
+    sx = pScreen->x + darwinMainScreenX;
+    sy = pScreen->y + darwinMainScreenY;
+    
+    /* Adjust the root window. */
+    pRoot = pScreen->root;
+    AppleWMSetScreenOrigin(pRoot);
+    pScreen->ResizeWindow(pRoot, x - sx, y - sy, width, height, NULL);
+
+    miPaintWindow(pRoot, &pRoot->borderClip,  PW_BACKGROUND);
+
+    /* <rdar://problem/7770779> pointer events are clipped to old display region after display reconfiguration
+     * http://xquartz.macosforge.org/trac/ticket/346
+     */
+    bounds.x1 = 0;
+    bounds.x2 = width;
+    bounds.y1 = 0;
+    bounds.y2 = height;
+    pScreen->ConstrainCursor(inputInfo.pointer, pScreen, &bounds);
+    inputInfo.pointer->spriteInfo->sprite->physLimits = bounds;
+    inputInfo.pointer->spriteInfo->sprite->hotLimits = bounds;
+
+    DEBUG_LOG("Root Window: %dx%d @ (%d, %d) darwinMainScreen (%d, %d) xy (%d, %d) dixScreenOrigins (%d, %d)\n", width, height, x - sx, y - sy, darwinMainScreenX, darwinMainScreenY, x, y, pScreen->x, pScreen->y);
+
+    /* Send an event for the root reconfigure */
+    e.u.u.type = ConfigureNotify;
+    e.u.configureNotify.window = pRoot->drawable.id;
+    e.u.configureNotify.aboveSibling = None;
+    e.u.configureNotify.x = x - sx;
+    e.u.configureNotify.y = y - sy;
+    e.u.configureNotify.width = width;
+    e.u.configureNotify.height = height;
+    e.u.configureNotify.borderWidth = wBorderWidth(pRoot);
+    e.u.configureNotify.override = pRoot->overrideRedirect;
+    DeliverEvents(pRoot, &e, 1, NullWindow);
+
+    quartzProcs->UpdateScreen(pScreen);
+}
+
+static void pokeActivityCallback(CFRunLoopTimerRef timer, void *info) {
+    UpdateSystemActivity(OverallAct);
+}
+
+static void QuartzScreenSaver(int state) {
+    static CFRunLoopTimerRef pokeActivityTimer = NULL;
+    static CFRunLoopTimerContext pokeActivityContext = { 0, NULL, NULL, NULL, NULL };
+    static pthread_mutex_t pokeActivityMutex = PTHREAD_MUTEX_INITIALIZER;
+
+    pthread_mutex_lock(&pokeActivityMutex);
+    
+    if(state) {
+        if(pokeActivityTimer == NULL)
+            goto QuartzScreenSaverEnd;
+
+        CFRunLoopTimerInvalidate(pokeActivityTimer);
+        CFRelease(pokeActivityTimer);
+        pokeActivityTimer = NULL;
+    } else {
+        if(pokeActivityTimer != NULL)
+            goto QuartzScreenSaverEnd;
+        
+        pokeActivityTimer = CFRunLoopTimerCreate(NULL, CFAbsoluteTimeGetCurrent(), 30, 0, 0, pokeActivityCallback, &pokeActivityContext);
+        if(pokeActivityTimer == NULL) {
+            ErrorF("Unable to create pokeActivityTimer.\n");
+            goto QuartzScreenSaverEnd;
+        }
+
+        CFRunLoopAddTimer(CFRunLoopGetMain(), pokeActivityTimer, kCFRunLoopCommonModes);
+    }
+QuartzScreenSaverEnd:
+    pthread_mutex_unlock(&pokeActivityMutex);
+}
+
+void QuartzShowFullscreen(int state) {
+    int i;
+    
+    DEBUG_LOG("QuartzShowFullscreen: state=%d\n", state);
+    
+    if(XQuartzIsRootless) {
+        ErrorF("QuartzShowFullscreen called while in rootless mode.\n");
+        return;
+    }
+    
+    QuartzScreenSaver(!state);
+    
+    if(XQuartzFullscreenVisible == state)
+        return;
+    
+    XQuartzFullscreenVisible = state;
+    
+    xp_disable_update ();
+    
+    if (!XQuartzFullscreenVisible)
+        RootlessHideAllWindows();
+    
+    RootlessUpdateRooted(XQuartzFullscreenVisible);
+    
+    if (XQuartzFullscreenVisible) {
+        RootlessShowAllWindows ();
+        for (i=0; i < screenInfo.numScreens; i++) {
+            ScreenPtr pScreen = screenInfo.screens[i];        
+            RootlessRepositionWindows(pScreen);
+            // JH: I don't think this is necessary, but keeping it here as a reminder
+            //RootlessUpdateScreenPixmap(pScreen);
+        }
+    }
+
+    /* Somehow the menubar manages to interfere with our event stream
+     * in fullscreen mode, even though it's not visible. 
+     */
+    X11ApplicationShowHideMenubar(!XQuartzFullscreenVisible);
+    
+    xp_reenable_update ();
+    
+    if (XQuartzFullscreenDisableHotkeys)
+        xp_disable_hot_keys(XQuartzFullscreenVisible);
+}
+
+void QuartzSetRootless(Bool state) {    
+    DEBUG_LOG("QuartzSetRootless state=%d\n", state);
+    
+    if(XQuartzIsRootless == state)
+        return;
+    
+    if(state)
+        QuartzShowFullscreen(FALSE);
+    
+    XQuartzIsRootless = state;
+
+    xp_disable_update();
+
+    /* When in rootless, the menubar is not part of the screen, so we need to update our screens on toggle */    
+    QuartzUpdateScreens();
+
+    if(XQuartzIsRootless) {
+        RootlessShowAllWindows();
+    } else {
+        RootlessHideAllWindows();
+    }
+
+    X11ApplicationShowHideMenubar(TRUE);
+
+    xp_reenable_update();
+
+    xp_disable_hot_keys(FALSE);
+}
+
+/*
+ * QuartzShow
+ *  Show the X server on screen. Does nothing if already shown.
+ *  Calls mode specific screen resume to restore the X clip regions
+ *  (if needed) and the X server cursor state.
+ */
+void QuartzShow(void) {
+    int i;
+
+    if (XQuartzServerVisible)
+        return;
+    
+    XQuartzServerVisible = TRUE;
+    for (i = 0; i < screenInfo.numScreens; i++) {
+        if (screenInfo.screens[i]) {
+            quartzProcs->ResumeScreen(screenInfo.screens[i]);
+        }
+    }
+    
+    if (!XQuartzIsRootless)
+        QuartzShowFullscreen(TRUE);
+}
+
+
+/*
+ * QuartzHide
+ *  Remove the X server display from the screen. Does nothing if already
+ *  hidden. Calls mode specific screen suspend to set X clip regions to
+ *  prevent drawing (if needed) and restore the Aqua cursor.
+ */
+void QuartzHide(void)
+{
+    int i;
+
+    if (XQuartzServerVisible) {
+        for (i = 0; i < screenInfo.numScreens; i++) {
+            if (screenInfo.screens[i]) {
+                quartzProcs->SuspendScreen(screenInfo.screens[i]);
+            }
+        }
+    }
+
+    if(!XQuartzIsRootless)
+        QuartzShowFullscreen(FALSE);
+    XQuartzServerVisible = FALSE;
+}
+
+
+/*
+ * QuartzSetRootClip
+ *  Enable or disable rendering to the X screen.
+ */
+void QuartzSetRootClip(
+    BOOL enable)
+{
+    int i;
+
+    if (!XQuartzServerVisible)
+        return;
+
+    for (i = 0; i < screenInfo.numScreens; i++) {
+        if (screenInfo.screens[i]) {
+            xf86SetRootClip(screenInfo.screens[i], enable);
+        }
+    }
+}
+
+/* 
+ * QuartzSpaceChanged
+ *  Unmap offscreen windows, map onscreen windows
+ */
+void QuartzSpaceChanged(uint32_t space_id) {
+    /* Do something special here, so we don't depend on quartz-wm for spaces to work... */
+    DEBUG_LOG("Space Changed (%u) ... do something interesting...\n", space_id);
+}
+
+/*
+ * QuartzCopyDisplayIDs
+ *  Associate an X11 screen with one or more CoreGraphics display IDs by copying
+ *  the list into a private array. Free the previously copied array, if present.
+ */
+void QuartzCopyDisplayIDs(ScreenPtr pScreen,
+                          int displayCount, CGDirectDisplayID *displayIDs) {
+    QuartzScreenPtr pQuartzScreen = QUARTZ_PRIV(pScreen);
+    int size = displayCount * sizeof(CGDirectDisplayID);
+
+    free(pQuartzScreen->displayIDs);
+    pQuartzScreen->displayIDs = malloc(size);
+    memcpy(pQuartzScreen->displayIDs, displayIDs, size);
+    pQuartzScreen->displayCount = displayCount;
+}
+
+void NSBeep(void);
+void DDXRingBell(
+    int volume,         // volume is % of max
+    int pitch,          // pitch is Hz
+    int duration)       // duration is milliseconds
+{
+    if (volume)
+        NSBeep();
+}
diff --git a/xorg-server/hw/xquartz/quartz.h b/xorg-server/hw/xquartz/quartz.h
index f0b519e21..b83391db9 100644
--- a/xorg-server/hw/xquartz/quartz.h
+++ b/xorg-server/hw/xquartz/quartz.h
@@ -1,146 +1,145 @@
-/*

- * quartz.h

- *

- * External interface of the Quartz display modes seen by the generic, mode

- * independent parts of the Darwin X server.

- *

- * Copyright (c) 2001-2003 Greg Parker and Torrey T. Lyons.

- *                 All Rights Reserved.

- *

- * Permission is hereby granted, free of charge, to any person obtaining a

- * copy of this software and associated documentation files (the "Software"),

- * to deal in the Software without restriction, including without limitation

- * the rights to use, copy, modify, merge, publish, distribute, sublicense,

- * and/or sell copies of the Software, and to permit persons to whom the

- * Software is furnished to do so, subject to the following conditions:

- *

- * The above copyright notice and this permission notice shall be included in

- * all copies or substantial portions of the Software.

- *

- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL

- * THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR

- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,

- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER

- * DEALINGS IN THE SOFTWARE.

- *

- * Except as contained in this notice, the name(s) of the above copyright

- * holders shall not be used in advertising or otherwise to promote the sale,

- * use or other dealings in this Software without prior written authorization.

- */

-

-#ifndef _QUARTZ_H

-#define _QUARTZ_H

-

-#include "screenint.h"

-#include "window.h"

-#include "pixmap.h"

-

-/*------------------------------------------

-   Quartz display mode function types

-  ------------------------------------------*/

-

-/*

- * Display mode initialization

- */

-typedef void (*DisplayInitProc)(void);

-typedef Bool (*AddScreenProc)(int index, ScreenPtr pScreen);

-typedef Bool (*SetupScreenProc)(int index, ScreenPtr pScreen);

-typedef void (*InitInputProc)(int argc, char **argv);

-

-/*

- * Cursor functions

- */

-typedef Bool (*InitCursorProc)(ScreenPtr pScreen);

-

-/*

- * Suspend and resume X11 activity

- */

-typedef void (*SuspendScreenProc)(ScreenPtr pScreen);

-typedef void (*ResumeScreenProc)(ScreenPtr pScreen);

-

-/*

- * Screen state change support

- */

-typedef void (*AddPseudoramiXScreensProc)

-    (int *x, int *y, int *width, int *height, ScreenPtr pScreen);

-typedef void (*UpdateScreenProc)(ScreenPtr pScreen);

-

-/*

- * Rootless helper functions

- */

-typedef Bool (*IsX11WindowProc)(void *nsWindow, int windowNumber);

-typedef void (*HideWindowsProc)(Bool hide);

-

-/*

- * Rootless functions for optional export to GLX layer

- */

-typedef void * (*FrameForWindowProc)(WindowPtr pWin, Bool create);

-typedef WindowPtr (*TopLevelParentProc)(WindowPtr pWindow);

-typedef Bool (*CreateSurfaceProc)

-    (ScreenPtr pScreen, Drawable id, DrawablePtr pDrawable,

-     unsigned int client_id, unsigned int *surface_id,

-     unsigned int key[2], void (*notify) (void *arg, void *data),

-     void *notify_data);

-typedef Bool (*DestroySurfaceProc)

-    (ScreenPtr pScreen, Drawable id, DrawablePtr pDrawable,

-     void (*notify) (void *arg, void *data), void *notify_data);

-

-/*

- * Quartz display mode function list

- */

-typedef struct _QuartzModeProcs {

-    DisplayInitProc DisplayInit;

-    AddScreenProc AddScreen;

-    SetupScreenProc SetupScreen;

-    InitInputProc InitInput;

-

-    InitCursorProc InitCursor;

-

-    SuspendScreenProc SuspendScreen;

-    ResumeScreenProc ResumeScreen;

-

-    AddPseudoramiXScreensProc AddPseudoramiXScreens;

-    UpdateScreenProc UpdateScreen;

-

-    IsX11WindowProc IsX11Window;

-    HideWindowsProc HideWindows;

-

-    FrameForWindowProc FrameForWindow;

-    TopLevelParentProc TopLevelParent;

-    CreateSurfaceProc CreateSurface;

-    DestroySurfaceProc DestroySurface;

-} QuartzModeProcsRec, *QuartzModeProcsPtr;

-

-extern QuartzModeProcsPtr quartzProcs;

-

-extern Bool XQuartzFullscreenVisible; /* Are the windows visible (predicated on !rootless) */

-extern Bool XQuartzServerVisible;     /* Is the server visible ... TODO: Refactor to "active" */

-extern Bool XQuartzEnableKeyEquivalents;

-extern Bool XQuartzRootlessDefault;  /* Is our default mode rootless? */

-extern Bool XQuartzIsRootless;       /* Is our current mode rootless (or FS)? */

-extern Bool XQuartzFullscreenMenu;   /* Show the menu bar (autohide) while in FS */

-extern Bool XQuartzFullscreenDisableHotkeys;

-extern Bool XQuartzOptionSendsAlt;   /* Alt or Mode_switch? */

-extern Bool XQuartzUseSysBeep;       /* Sys beep or our own? */

-

-Bool QuartzAddScreen(int index, ScreenPtr pScreen);

-Bool QuartzSetupScreen(int index, ScreenPtr pScreen);

-void QuartzInitOutput(int argc,char **argv);

-void QuartzInitInput(int argc, char **argv);

-void QuartzInitServer(int argc, char **argv, char **envp);

-void QuartzGiveUp(void);

-void QuartzProcessEvent(xEvent *xe);

-void QuartzUpdateScreens(void);

-

-void QuartzShow(void);

-void QuartzHide(void);

-void QuartzSetRootClip(BOOL enable);

-void QuartzSpaceChanged(uint32_t space_id);

-

-void QuartzSetRootless(Bool state);

-void QuartzShowFullscreen(Bool state);

-

-int server_main(int argc, char **argv, char **envp);

-#endif

+/*
+ * quartz.h
+ *
+ * External interface of the Quartz display modes seen by the generic, mode
+ * independent parts of the Darwin X server.
+ *
+ * Copyright (c) 2001-2003 Greg Parker and Torrey T. Lyons.
+ *                 All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Except as contained in this notice, the name(s) of the above copyright
+ * holders shall not be used in advertising or otherwise to promote the sale,
+ * use or other dealings in this Software without prior written authorization.
+ */
+
+#ifndef _QUARTZ_H
+#define _QUARTZ_H
+
+#include "screenint.h"
+#include "window.h"
+#include "pixmap.h"
+
+/*------------------------------------------
+   Quartz display mode function types
+  ------------------------------------------*/
+
+/*
+ * Display mode initialization
+ */
+typedef void (*DisplayInitProc)(void);
+typedef Bool (*AddScreenProc)(int index, ScreenPtr pScreen);
+typedef Bool (*SetupScreenProc)(int index, ScreenPtr pScreen);
+typedef void (*InitInputProc)(int argc, char **argv);
+
+/*
+ * Cursor functions
+ */
+typedef Bool (*InitCursorProc)(ScreenPtr pScreen);
+
+/*
+ * Suspend and resume X11 activity
+ */
+typedef void (*SuspendScreenProc)(ScreenPtr pScreen);
+typedef void (*ResumeScreenProc)(ScreenPtr pScreen);
+
+/*
+ * Screen state change support
+ */
+typedef void (*AddPseudoramiXScreensProc)
+    (int *x, int *y, int *width, int *height, ScreenPtr pScreen);
+typedef void (*UpdateScreenProc)(ScreenPtr pScreen);
+
+/*
+ * Rootless helper functions
+ */
+typedef Bool (*IsX11WindowProc)(void *nsWindow, int windowNumber);
+typedef void (*HideWindowsProc)(Bool hide);
+
+/*
+ * Rootless functions for optional export to GLX layer
+ */
+typedef void * (*FrameForWindowProc)(WindowPtr pWin, Bool create);
+typedef WindowPtr (*TopLevelParentProc)(WindowPtr pWindow);
+typedef Bool (*CreateSurfaceProc)
+    (ScreenPtr pScreen, Drawable id, DrawablePtr pDrawable,
+     unsigned int client_id, unsigned int *surface_id,
+     unsigned int key[2], void (*notify) (void *arg, void *data),
+     void *notify_data);
+typedef Bool (*DestroySurfaceProc)
+    (ScreenPtr pScreen, Drawable id, DrawablePtr pDrawable,
+     void (*notify) (void *arg, void *data), void *notify_data);
+
+/*
+ * Quartz display mode function list
+ */
+typedef struct _QuartzModeProcs {
+    DisplayInitProc DisplayInit;
+    AddScreenProc AddScreen;
+    SetupScreenProc SetupScreen;
+    InitInputProc InitInput;
+
+    InitCursorProc InitCursor;
+
+    SuspendScreenProc SuspendScreen;
+    ResumeScreenProc ResumeScreen;
+
+    AddPseudoramiXScreensProc AddPseudoramiXScreens;
+    UpdateScreenProc UpdateScreen;
+
+    IsX11WindowProc IsX11Window;
+    HideWindowsProc HideWindows;
+
+    FrameForWindowProc FrameForWindow;
+    TopLevelParentProc TopLevelParent;
+    CreateSurfaceProc CreateSurface;
+    DestroySurfaceProc DestroySurface;
+} QuartzModeProcsRec, *QuartzModeProcsPtr;
+
+extern QuartzModeProcsPtr quartzProcs;
+
+extern Bool XQuartzFullscreenVisible; /* Are the windows visible (predicated on !rootless) */
+extern Bool XQuartzServerVisible;     /* Is the server visible ... TODO: Refactor to "active" */
+extern Bool XQuartzEnableKeyEquivalents;
+extern Bool XQuartzRootlessDefault;  /* Is our default mode rootless? */
+extern Bool XQuartzIsRootless;       /* Is our current mode rootless (or FS)? */
+extern Bool XQuartzFullscreenMenu;   /* Show the menu bar (autohide) while in FS */
+extern Bool XQuartzFullscreenDisableHotkeys;
+extern Bool XQuartzOptionSendsAlt;   /* Alt or Mode_switch? */
+
+Bool QuartzAddScreen(int index, ScreenPtr pScreen);
+Bool QuartzSetupScreen(int index, ScreenPtr pScreen);
+void QuartzInitOutput(int argc,char **argv);
+void QuartzInitInput(int argc, char **argv);
+void QuartzInitServer(int argc, char **argv, char **envp);
+void QuartzGiveUp(void);
+void QuartzProcessEvent(xEvent *xe);
+void QuartzUpdateScreens(void);
+
+void QuartzShow(void);
+void QuartzHide(void);
+void QuartzSetRootClip(BOOL enable);
+void QuartzSpaceChanged(uint32_t space_id);
+
+void QuartzSetRootless(Bool state);
+void QuartzShowFullscreen(Bool state);
+
+int server_main(int argc, char **argv, char **envp);
+#endif
diff --git a/xorg-server/hw/xquartz/quartzAudio.c b/xorg-server/hw/xquartz/quartzAudio.c
deleted file mode 100644
index d17d65808..000000000
--- a/xorg-server/hw/xquartz/quartzAudio.c
+++ /dev/null
@@ -1,329 +0,0 @@
-//

-// QuartzAudio.m

-//

-// X Window bell support using CoreAudio or AppKit.

-// Greg Parker  gparker@cs.stanford.edu  19 Feb 2001

-//

-// Info about sine wave sound playback:

-// CoreAudio code derived from macosx-dev posting by Tim Wood

-//  http://www.omnigroup.com/mailman/archive/macosx-dev/2000-May/002004.html

-// Smoothing transitions between sounds

-//  http://www.wam.umd.edu/~mphoenix/dss/dss.html

-//

-/*

- * Copyright (c) 2001 Greg Parker. All Rights Reserved.

- *

- * Permission is hereby granted, free of charge, to any person obtaining a

- * copy of this software and associated documentation files (the "Software"),

- * to deal in the Software without restriction, including without limitation

- * the rights to use, copy, modify, merge, publish, distribute, sublicense,

- * and/or sell copies of the Software, and to permit persons to whom the

- * Software is furnished to do so, subject to the following conditions:

- *

- * The above copyright notice and this permission notice shall be included in

- * all copies or substantial portions of the Software.

- *

- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL

- * THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR

- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,

- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER

- * DEALINGS IN THE SOFTWARE.

- *

- * Except as contained in this notice, the name(s) of the above copyright

- * holders shall not be used in advertising or otherwise to promote the sale,

- * use or other dealings in this Software without prior written authorization.

- */

-

-#include "sanitizedCarbon.h"

-

-#ifdef HAVE_DIX_CONFIG_H

-#include <dix-config.h>

-#endif

-

-#include "quartz.h"

-#include "quartzAudio.h"

-

-#include <CoreAudio/CoreAudio.h>

-#include <pthread.h>

-#include <AvailabilityMacros.h>

-

-#include "inputstr.h"

-#include <X11/extensions/XI.h>

-#include <assert.h>

-

-void NSBeep(void);

-

-typedef struct QuartzAudioRec {

-    double frequency;

-    double amplitude;

-

-    UInt32 curFrame;

-    UInt32 remainingFrames;

-    UInt32 totalFrames;

-    double sampleRate;

-    UInt32 fadeLength;

-

-    UInt32 bufferByteCount;

-    Boolean playing;

-    pthread_mutex_t lock;

-

-    // used to fade out interrupted sound and avoid 'pop'

-    double prevFrequency;

-    double prevAmplitude;

-    UInt32 prevFrame; 

-} QuartzAudioRec;

-

-static AudioDeviceID quartzAudioDevice = kAudioDeviceUnknown;

-static QuartzAudioRec data;

-

-

-/*

- * QuartzAudioEnvelope

- *  Fade sound in and out to avoid pop.

- *  Sounds with shorter duration will never reach full amplitude. Deal.

- */

-static double QuartzAudioEnvelope(

-    UInt32 curFrame,

-    UInt32 totalFrames,

-    UInt32 fadeLength )

-{

-    double fadeFrames = min(fadeLength, totalFrames / 2);

-    if (fadeFrames < 1) return 0;

-

-    if (curFrame < fadeFrames) {

-        return curFrame / fadeFrames;

-    } else if (curFrame > totalFrames - fadeFrames) {

-        return (totalFrames-curFrame) / fadeFrames;

-    } else {

-        return 1.0;

-    }

-}

-

-

-/*

- * QuartzFillBuffer

- *  Fill this buffer with data and update the data position.

- *  FIXME: this is ugly

- */

-static void QuartzFillBuffer(

-    AudioBuffer *audiobuffer,

-    QuartzAudioRec *data )

-{

-    float *buffer, *b;

-    unsigned int frame, frameCount;

-    unsigned int bufferFrameCount;

-    float multiplier, v;

-    int i;

-    

-    buffer = (float *)audiobuffer->mData;

-    bufferFrameCount = audiobuffer->mDataByteSize / (sizeof(float) * audiobuffer->mNumberChannels);

-

-    frameCount = min(bufferFrameCount, data->remainingFrames);

-

-    // Fade out previous sine wave, if any.

-    b = buffer;

-    if (data->prevFrame) {

-        multiplier = 2*M_PI*(data->prevFrequency/data->sampleRate);

-        for (frame = 0; frame < data->fadeLength; frame++) {

-            v = data->prevAmplitude *

-                QuartzAudioEnvelope(frame+data->fadeLength,

-                                    2*data->fadeLength,

-                                    data->fadeLength) *

-                sin(multiplier * (data->prevFrame+frame));

-            for (i = 0; i < audiobuffer->mNumberChannels; i++) {

-                *b++ = v;

-            }

-        }

-        // no more prev fade

-        data->prevFrame = 0;

-

-        // adjust for space eaten by prev fade

-        b += audiobuffer->mNumberChannels*frame;

-        bufferFrameCount -= frame;

-        frameCount = min(bufferFrameCount, data->remainingFrames);

-    }

-

-    // Write a sine wave with the specified frequency and amplitude

-    multiplier = 2*M_PI*(data->frequency/data->sampleRate);

-    for (frame = 0; frame < frameCount; frame++) {

-        v = data->amplitude * 

-            QuartzAudioEnvelope(data->curFrame+frame, data->totalFrames,

-                                data->fadeLength) *

-            sin(multiplier * (data->curFrame+frame));

-        for (i = 0; i < audiobuffer->mNumberChannels; i++) {

-            *b++ = v;

-        }

-    }

-

-    // Zero out the rest of the buffer, if any

-    memset(b, 0, sizeof(float) * audiobuffer->mNumberChannels *

-           (bufferFrameCount-frame));

-

-    data->curFrame += frameCount;

-    data->remainingFrames -= frameCount;

-    if (data->remainingFrames == 0) {

-        data->playing = FALSE;

-        data->curFrame = 0;

-    }

-}

-

-

-/*

- * QuartzAudioIOProc

- *  Callback function for audio playback.

- *  FIXME: use inOutputTime to correct for skipping

- */

-static OSStatus 

-QuartzAudioIOProc(

-    AudioDeviceID inDevice, 

-    const AudioTimeStamp *inNow, 

-    const AudioBufferList *inInputData, 

-    const AudioTimeStamp *inInputTime, 

-    AudioBufferList *outOutputData, 

-    const AudioTimeStamp *inOutputTime, 

-    void *inClientData )

-{

-    QuartzAudioRec *data = (QuartzAudioRec *)inClientData;

-    int i;

-    Boolean wasPlaying;

-

-    pthread_mutex_lock(&data->lock);

-    wasPlaying = data->playing;

-    for (i = 0; i < outOutputData->mNumberBuffers; i++) {

-        if (data->playing) {

-            QuartzFillBuffer(outOutputData->mBuffers+i, data); 

-        }

-        else {

-            memset(outOutputData->mBuffers[i].mData, 0, 

-                   outOutputData->mBuffers[i].mDataByteSize);

-        }

-    }

-    if (wasPlaying  &&  !data->playing) {

-        OSStatus err;

-        err = AudioDeviceStop(inDevice, QuartzAudioIOProc);

-        if(err != noErr)

-            fprintf(stderr, "Error stopping audio device: %ld\n", (long int)err);

-    }

-    pthread_mutex_unlock(&data->lock);

-    return 0;

-}

-

-

-/*

- * DDXRingBell

- * Play a tone using the CoreAudio API

- */

-void DDXRingBell(

-    int volume,         // volume is % of max

-    int pitch,          // pitch is Hz

-    int duration )      // duration is milliseconds

-{

-    if (XQuartzUseSysBeep) {

-        if (volume)

-            NSBeep();

-        return;

-    }

-        

-    if (quartzAudioDevice == kAudioDeviceUnknown) return;

-

-    pthread_mutex_lock(&data.lock);

-

-    // fade previous sound, if any

-    data.prevFrequency = data.frequency;

-    data.prevAmplitude = data.amplitude;

-    data.prevFrame = data.curFrame;

-

-    // set new sound

-    data.frequency = pitch;

-    data.amplitude = volume / 100.0;

-    data.curFrame = 0;

-    data.totalFrames = (int)(data.sampleRate * duration / 1000.0);

-    data.remainingFrames = data.totalFrames;

-

-    if (! data.playing) {

-        OSStatus status;

-        status = AudioDeviceStart(quartzAudioDevice, QuartzAudioIOProc);

-        if (status) {

-            ErrorF("DDXRingBell: AudioDeviceStart returned %ld\n", (long)status);

-        } else {

-            data.playing = TRUE;

-        }

-    }

-    pthread_mutex_unlock(&data.lock);

-}

-

-/*

- * QuartzAudioInit

- *  Prepare to play the bell with the CoreAudio API

- */

-void QuartzAudioInit(void) 

-{

-    UInt32 propertySize;

-    OSStatus status;

-    AudioDeviceID outputDevice;

-    double sampleRate;

-    AudioObjectPropertyAddress devicePropertyAddress = { kAudioHardwarePropertyDefaultOutputDevice, kAudioObjectPropertyScopeGlobal, kAudioObjectPropertyElementMaster };

-    AudioObjectPropertyAddress sampleRatePropertyAddress = { kAudioDevicePropertyNominalSampleRate, kAudioDevicePropertyScopeOutput, kAudioObjectPropertyElementMaster };

-    

-    // Get the default output device

-    propertySize = sizeof(outputDevice);

-    status = AudioObjectGetPropertyData(kAudioObjectSystemObject, &devicePropertyAddress,

-                                        0, NULL,

-                                        &propertySize, &outputDevice);

-    if (status) {

-        ErrorF("QuartzAudioInit: AudioObjectGetPropertyData(output device) returned %ld\n",

-               (long)status);

-        return;

-    }

-    if (outputDevice == kAudioDeviceUnknown) {

-        ErrorF("QuartzAudioInit: No audio output devices available.\n");

-        return;

-    }

-

-    // Get the basic device description

-    sampleRate = 0.;

-    propertySize = sizeof(sampleRate);

-    status = AudioObjectGetPropertyData(outputDevice, &sampleRatePropertyAddress,

-                                        0, NULL,

-                                        &propertySize, &sampleRate);

-    if (status) {

-        ErrorF("QuartzAudioInit: AudioObjectGetPropertyData(sample rate) returned %ld\n",

-               (long)status);

-        return;

-    }

-

-    // Fill in the playback data

-    data.frequency = 0;

-    data.amplitude = 0;

-    data.curFrame = 0;

-    data.remainingFrames = 0; 

-    data.sampleRate = sampleRate;

-    // data.bufferByteCount = bufferByteCount;

-    data.playing = FALSE;

-    data.prevAmplitude = 0;

-    data.prevFrame = 0;

-    data.prevFrequency = 0;

-    data.fadeLength = data.sampleRate / 200;

-    pthread_mutex_init(&data.lock, NULL); // fixme error check

-

-    // fixme assert fadeLength<framesPerBuffer

-

-    // Prepare for playback

-#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050

-    {

-    AudioDeviceIOProcID sInputIOProcID = NULL;

-    status = AudioDeviceCreateIOProcID( outputDevice, QuartzAudioIOProc, &data, &sInputIOProcID );

-    }

-#else

-    status = AudioDeviceAddIOProc(outputDevice, QuartzAudioIOProc, &data);

-#endif

-    if (status) {

-        ErrorF("QuartzAudioInit: AddIOProc returned %ld\n", (long)status);

-        return;

-    }

-

-    // success!

-    quartzAudioDevice = outputDevice;

-}

diff --git a/xorg-server/hw/xquartz/quartzAudio.h b/xorg-server/hw/xquartz/quartzAudio.h
deleted file mode 100644
index 2a78b3957..000000000
--- a/xorg-server/hw/xquartz/quartzAudio.h
+++ /dev/null
@@ -1,37 +0,0 @@
-//
-// QuartzAudio.h
-//
-// X Window bell support using CoreAudio or AppKit.
-// Greg Parker   gparker@cs.stanford.edu   19 Feb 2001
-/*
- * Copyright (c) 2001 Greg Parker. All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- * Except as contained in this notice, the name(s) of the above copyright
- * holders shall not be used in advertising or otherwise to promote the sale,
- * use or other dealings in this Software without prior written authorization.
- */
-
-#ifndef _QUARTZAUDIO_H
-#define _QUARTZAUDIO_H
-
-void QuartzAudioInit(void);
-
-#endif
diff --git a/xorg-server/hw/xquartz/quartzKeyboard.c b/xorg-server/hw/xquartz/quartzKeyboard.c
index cd73ec5bd..54f709a8b 100644
--- a/xorg-server/hw/xquartz/quartzKeyboard.c
+++ b/xorg-server/hw/xquartz/quartzKeyboard.c
@@ -1,858 +1,857 @@
-/*

-   quartzKeyboard.c: Keyboard support for Xquartz

-

-   Copyright (c) 2003-2008 Apple Inc.

-   Copyright (c) 2001-2004 Torrey T. Lyons. All Rights Reserved.

-   Copyright 2004 Kaleb S. KEITHLEY. All Rights Reserved.

-

-   Copyright (C) 1999,2000 by Eric Sunshine <sunshine@sunshineco.com>

-   All rights reserved.

-

-   Redistribution and use in source and binary forms, with or without

-   modification, are permitted provided that the following conditions are met:

-

-     1. Redistributions of source code must retain the above copyright

-        notice, this list of conditions and the following disclaimer.

-     2. Redistributions in binary form must reproduce the above copyright

-        notice, this list of conditions and the following disclaimer in the

-        documentation and/or other materials provided with the distribution.

-     3. The name of the author may not be used to endorse or promote products

-        derived from this software without specific prior written permission.

-

-   THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR

-   IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES

-   OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN

-   NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,

-   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED

-   TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR

-   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF

-   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

-   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-*/

-

-#include "sanitizedCarbon.h"

-

-#ifdef HAVE_DIX_CONFIG_H

-#include <dix-config.h>

-#endif

-

-#define HACK_MISSING 1

-#define HACK_KEYPAD 1

-#define HACK_BLACKLIST 1

-

-#include <unistd.h>

-#include <stdio.h>

-#include <stdlib.h>

-#include <errno.h>

-#include <sys/stat.h>

-#include <AvailabilityMacros.h>

-

-#include "quartz.h"

-#include "darwin.h"

-#include "darwinEvents.h"

-

-#include "quartzKeyboard.h"

-#include "quartzAudio.h"

-

-#include "X11Application.h"

-

-#include "threadSafety.h"

-

-#ifdef NDEBUG

-#undef NDEBUG

-#include <assert.h>

-#define NDEBUG 1

-#else

-#include <assert.h>

-#endif

-#include <pthread.h>

-

-#include "xkbsrv.h"

-#include "exevents.h"

-#include "X11/keysym.h"

-#include "keysym2ucs.h"

-

-extern void

-CopyKeyClass(DeviceIntPtr device, DeviceIntPtr master);

-

-enum {

-    MOD_COMMAND = 256,

-    MOD_SHIFT = 512,

-    MOD_OPTION = 2048,

-    MOD_CONTROL = 4096,

-};

-

-#define UKEYSYM(u) ((u) | 0x01000000)

-

-#if HACK_MISSING

-/* Table of keycode->keysym mappings we use to fallback on for important

-   keys that are often not in the Unicode mapping. */

-

-const static struct {

-    unsigned short keycode;

-    KeySym keysym;

-} known_keys[] = {

-    {55,  XK_Meta_L},

-    {56,  XK_Shift_L},

-    {57,  XK_Caps_Lock},

-    {58,  XK_Alt_L},

-    {59,  XK_Control_L},

-

-    {60,  XK_Shift_R},

-    {61,  XK_Alt_R},

-    {62,  XK_Control_R},

-    {63,  XK_Meta_R},

-

-    {122, XK_F1},

-    {120, XK_F2},

-    {99,  XK_F3},

-    {118, XK_F4},

-    {96,  XK_F5},

-    {97,  XK_F6},

-    {98,  XK_F7},

-    {100, XK_F8},

-    {101, XK_F9},

-    {109, XK_F10},

-    {103, XK_F11},

-    {111, XK_F12},

-    {105, XK_F13},

-    {107, XK_F14},

-    {113, XK_F15},

-};

-#endif

-

-#if HACK_KEYPAD

-/* Table of keycode->old,new-keysym mappings we use to fixup the numeric

-   keypad entries. */

-

-const static struct {

-    unsigned short keycode;

-    KeySym normal, keypad;

-} known_numeric_keys[] = {

-    {65, XK_period, XK_KP_Decimal},

-    {67, XK_asterisk, XK_KP_Multiply},

-    {69, XK_plus, XK_KP_Add},

-    {75, XK_slash, XK_KP_Divide},

-    {76, 0x01000003, XK_KP_Enter},

-    {78, XK_minus, XK_KP_Subtract},

-    {81, XK_equal, XK_KP_Equal},

-    {82, XK_0, XK_KP_0},

-    {83, XK_1, XK_KP_1},

-    {84, XK_2, XK_KP_2},

-    {85, XK_3, XK_KP_3},

-    {86, XK_4, XK_KP_4},

-    {87, XK_5, XK_KP_5},

-    {88, XK_6, XK_KP_6},

-    {89, XK_7, XK_KP_7},

-    {91, XK_8, XK_KP_8},

-    {92, XK_9, XK_KP_9},

-};

-#endif

-

-#if HACK_BLACKLIST

-/* <rdar://problem/7824370> wine notepad produces wrong characters on shift+arrow

- * http://xquartz.macosforge.org/trac/ticket/295

- * http://developer.apple.com/legacy/mac/library/documentation/mac/Text/Text-579.html

- *

- * legacy Mac keycodes for arrow keys that shift-modify to math symbols

- */

-const static unsigned short keycode_blacklist[] = {66, 70, 72, 77};

-#endif

-

-/* Table mapping normal keysyms to their dead equivalents.

-   FIXME: all the unicode keysyms (apart from circumflex) were guessed. */

-

-const static struct {

-    KeySym normal, dead;

-} dead_keys[] = {

-    {XK_grave, XK_dead_grave},

-    {XK_apostrophe, XK_dead_acute},             /* US:"=" on a Czech keyboard */

-    {XK_acute, XK_dead_acute},

-    {UKEYSYM (0x384), XK_dead_acute},           /* US:";" on a Greek keyboard */

-//    {XK_Greek_accentdieresis, XK_dead_diaeresis},   /* US:"opt+;" on a Greek keyboard ... replace with dead_accentdieresis if there is one */

-    {XK_asciicircum, XK_dead_circumflex},

-    {UKEYSYM (0x2c6), XK_dead_circumflex},	/* MODIFIER LETTER CIRCUMFLEX ACCENT */

-    {XK_asciitilde, XK_dead_tilde},

-    {UKEYSYM (0x2dc), XK_dead_tilde},		/* SMALL TILDE */

-    {XK_macron, XK_dead_macron},

-    {XK_breve, XK_dead_breve},

-    {XK_abovedot, XK_dead_abovedot},

-    {XK_diaeresis, XK_dead_diaeresis},

-    {UKEYSYM (0x2da), XK_dead_abovering},	/* DOT ABOVE */

-    {XK_doubleacute, XK_dead_doubleacute},

-    {XK_caron, XK_dead_caron},

-    {XK_cedilla, XK_dead_cedilla},

-    {XK_ogonek, XK_dead_ogonek},

-    {UKEYSYM (0x269), XK_dead_iota},		/* LATIN SMALL LETTER IOTA */

-    {UKEYSYM (0x2ec), XK_dead_voiced_sound},	/* MODIFIER LETTER VOICING */

-/*  {XK_semivoiced_sound, XK_dead_semivoiced_sound}, */

-    {UKEYSYM (0x323), XK_dead_belowdot},	/* COMBINING DOT BELOW */

-    {UKEYSYM (0x309), XK_dead_hook}, 		/* COMBINING HOOK ABOVE */

-    {UKEYSYM (0x31b), XK_dead_horn},		/* COMBINING HORN */

-};

-

-typedef struct darwinKeyboardInfo_struct {

-    CARD8 modMap[MAP_LENGTH];

-    KeySym keyMap[MAP_LENGTH * GLYPHS_PER_KEY];

-    unsigned char modifierKeycodes[32][2];

-} darwinKeyboardInfo;

-

-darwinKeyboardInfo keyInfo;

-pthread_mutex_t keyInfo_mutex = PTHREAD_MUTEX_INITIALIZER;

-

-static void DarwinChangeKeyboardControl(DeviceIntPtr device, KeybdCtrl *ctrl) {

-    // FIXME: to be implemented

-    // keyclick, bell volume / pitch, autorepead, LED's

-}

-

-//-----------------------------------------------------------------------------

-// Utility functions to help parse Darwin keymap

-//-----------------------------------------------------------------------------

-

-/*

- * DarwinBuildModifierMaps

- *      Use the keyMap field of keyboard info structure to populate

- *      the modMap and modifierKeycodes fields.

- */

-static void DarwinBuildModifierMaps(darwinKeyboardInfo *info) {

-    int i;

-    KeySym *k;

-

-    memset(info->modMap, NoSymbol, sizeof(info->modMap));

-    memset(info->modifierKeycodes, 0, sizeof(info->modifierKeycodes));

-

-    for (i = 0; i < NUM_KEYCODES; i++) {

-        k = info->keyMap + i * GLYPHS_PER_KEY;

-

-        switch (*k) {

-            case XK_Shift_L:

-                info->modifierKeycodes[NX_MODIFIERKEY_SHIFT][0] = i;

-                info->modMap[MIN_KEYCODE + i] = ShiftMask;

-                break;

-

-            case XK_Shift_R:

-#ifdef NX_MODIFIERKEY_RSHIFT

-                info->modifierKeycodes[NX_MODIFIERKEY_RSHIFT][0] = i;

-#else

-                info->modifierKeycodes[NX_MODIFIERKEY_SHIFT][0] = i;

-#endif

-                info->modMap[MIN_KEYCODE + i] = ShiftMask;

-                break;

-

-            case XK_Control_L:

-                info->modifierKeycodes[NX_MODIFIERKEY_CONTROL][0] = i;

-                info->modMap[MIN_KEYCODE + i] = ControlMask;

-                break;

-

-            case XK_Control_R:

-#ifdef NX_MODIFIERKEY_RCONTROL

-                info->modifierKeycodes[NX_MODIFIERKEY_RCONTROL][0] = i;

-#else

-                info->modifierKeycodes[NX_MODIFIERKEY_CONTROL][0] = i;

-#endif

-                info->modMap[MIN_KEYCODE + i] = ControlMask;

-                break;

-

-            case XK_Caps_Lock:

-                info->modifierKeycodes[NX_MODIFIERKEY_ALPHALOCK][0] = i;

-                info->modMap[MIN_KEYCODE + i] = LockMask;

-                break;

-

-            case XK_Alt_L:

-                info->modifierKeycodes[NX_MODIFIERKEY_ALTERNATE][0] = i;

-                info->modMap[MIN_KEYCODE + i] = Mod1Mask;

-                if(!XQuartzOptionSendsAlt)

-                    *k = XK_Mode_switch; // Yes, this is ugly.  This needs to be cleaned up when we integrate quartzKeyboard with this code and refactor.

-                break;

-

-            case XK_Alt_R:

-#ifdef NX_MODIFIERKEY_RALTERNATE

-                info->modifierKeycodes[NX_MODIFIERKEY_RALTERNATE][0] = i;

-#else

-                info->modifierKeycodes[NX_MODIFIERKEY_ALTERNATE][0] = i;

-#endif

-                if(!XQuartzOptionSendsAlt)

-                    *k = XK_Mode_switch; // Yes, this is ugly.  This needs to be cleaned up when we integrate quartzKeyboard with this code and refactor.

-                info->modMap[MIN_KEYCODE + i] = Mod1Mask;

-                break;

-

-            case XK_Mode_switch:

-                ErrorF("DarwinBuildModifierMaps: XK_Mode_switch encountered, unable to determine side.\n");

-                info->modifierKeycodes[NX_MODIFIERKEY_ALTERNATE][0] = i;

-#ifdef NX_MODIFIERKEY_RALTERNATE

-                info->modifierKeycodes[NX_MODIFIERKEY_RALTERNATE][0] = i;

-#endif

-                info->modMap[MIN_KEYCODE + i] = Mod1Mask;

-                break;

-

-            case XK_Meta_L:

-                info->modifierKeycodes[NX_MODIFIERKEY_COMMAND][0] = i;

-                info->modMap[MIN_KEYCODE + i] = Mod2Mask;

-                break;

-

-            case XK_Meta_R:

-#ifdef NX_MODIFIERKEY_RCOMMAND

-                info->modifierKeycodes[NX_MODIFIERKEY_RCOMMAND][0] = i;

-#else

-                info->modifierKeycodes[NX_MODIFIERKEY_COMMAND][0] = i;

-#endif

-                info->modMap[MIN_KEYCODE + i] = Mod2Mask;

-                break;

-

-            case XK_Num_Lock:

-                info->modMap[MIN_KEYCODE + i] = Mod3Mask;

-                break;

-        }

-    }

-}

-

-/*

- * DarwinKeyboardInit

- *      Get the Darwin keyboard map and compute an equivalent

- *      X keyboard map and modifier map. Set the new keyboard

- *      device structure.

- */

-void DarwinKeyboardInit(DeviceIntPtr pDev) {

-    // Open a shared connection to the HID System.

-    // Note that the Event Status Driver is really just a wrapper

-    // for a kIOHIDParamConnectType connection.

-    assert(darwinParamConnect = NXOpenEventStatus());

-

-    InitKeyboardDeviceStruct(pDev, NULL, NULL, DarwinChangeKeyboardControl);

-

-    DarwinKeyboardReloadHandler();

-

-    CopyKeyClass(pDev, inputInfo.keyboard);

-}

-

-/* Set the repeat rates based on global preferences and keycodes for modifiers.

- * Precondition: Has the keyInfo_mutex lock.

- */

-static void DarwinKeyboardSetRepeat(DeviceIntPtr pDev, int initialKeyRepeatValue, int keyRepeatValue) {

-    if(initialKeyRepeatValue == 300000) { // off

-        /* Turn off repeats globally */

-        XkbSetRepeatKeys(pDev, -1, AutoRepeatModeOff);

-    } else {

-        int i;

-        XkbControlsPtr      ctrl;

-        XkbControlsRec      old;

-

-        /* Turn on repeats globally */

-        XkbSetRepeatKeys(pDev, -1, AutoRepeatModeOn);

-        

-        /* Setup the bit mask for individual key repeats */

-        ctrl = pDev->key->xkbInfo->desc->ctrls;

-        old= *ctrl;

-        

-        ctrl->repeat_delay = initialKeyRepeatValue * 15;

-        ctrl->repeat_interval = keyRepeatValue * 15;

-

-        /* Turn off key-repeat for modifier keys, on for others */

-        /* First set them all on */

-        for(i=0; i < XkbPerKeyBitArraySize; i++)

-            ctrl->per_key_repeat[i] = -1;

-

-        /* Now turn off the modifiers */

-        for(i=0; i < 32; i++) {

-            unsigned char keycode;

-            

-            keycode = keyInfo.modifierKeycodes[i][0];

-            if(keycode)

-                ClearBit(ctrl->per_key_repeat, keycode + MIN_KEYCODE);

-

-            keycode = keyInfo.modifierKeycodes[i][1];

-            if(keycode)

-                ClearBit(ctrl->per_key_repeat, keycode + MIN_KEYCODE);

-        }

-

-        /* Hurray for data duplication */

-        if (pDev->kbdfeed)

-            memcpy(pDev->kbdfeed->ctrl.autoRepeats, ctrl->per_key_repeat, XkbPerKeyBitArraySize);

-

-        //fprintf(stderr, "per_key_repeat =\n");

-        //for(i=0; i < XkbPerKeyBitArraySize; i++)

-        //    fprintf(stderr, "%02x%s", ctrl->per_key_repeat[i], (i + 1) & 7 ? "" : "\n");

-

-        /* And now we notify the puppies about the changes */

-        XkbDDXChangeControls(pDev, &old, ctrl);

-    }

-}

-

-void DarwinKeyboardReloadHandler(void) {

-    KeySymsRec keySyms;

-    CFIndex initialKeyRepeatValue, keyRepeatValue;

-    BOOL ok;

-    DeviceIntPtr pDev;

-    const char *xmodmap = PROJECTROOT "/bin/xmodmap";

-    const char *sysmodmap = PROJECTROOT "/lib/X11/xinit/.Xmodmap";

-    const char *homedir = getenv("HOME");

-    char usermodmap[PATH_MAX], cmd[PATH_MAX];

-

-    DEBUG_LOG("DarwinKeyboardReloadHandler\n");

-

-    /* Get our key repeat settings from GlobalPreferences */

-    (void)CFPreferencesAppSynchronize(CFSTR(".GlobalPreferences"));

-    

-    initialKeyRepeatValue = CFPreferencesGetAppIntegerValue(CFSTR("InitialKeyRepeat"), CFSTR(".GlobalPreferences"), &ok);

-    if(!ok)

-        initialKeyRepeatValue = 35;

-    

-    keyRepeatValue = CFPreferencesGetAppIntegerValue(CFSTR("KeyRepeat"), CFSTR(".GlobalPreferences"), &ok);

-    if(!ok)

-        keyRepeatValue = 6;

-    

-    pthread_mutex_lock(&keyInfo_mutex); {

-        /* Initialize our keySyms */

-        keySyms.map = keyInfo.keyMap;

-        keySyms.mapWidth   = GLYPHS_PER_KEY;

-        keySyms.minKeyCode = MIN_KEYCODE;

-        keySyms.maxKeyCode = MAX_KEYCODE;

-

-	// TODO: We should build the entire XkbDescRec and use XkbCopyKeymap

-        /* Apply the mappings to darwinKeyboard */

-        XkbApplyMappingChange(darwinKeyboard, &keySyms, keySyms.minKeyCode,

-                              keySyms.maxKeyCode - keySyms.minKeyCode + 1,

-                              keyInfo.modMap, serverClient);

-        DarwinKeyboardSetRepeat(darwinKeyboard, initialKeyRepeatValue, keyRepeatValue);

-

-        /* Apply the mappings to the core keyboard */

-        for (pDev = inputInfo.devices; pDev; pDev = pDev->next) {

-            if ((pDev->coreEvents || pDev == inputInfo.keyboard) && pDev->key) {

-                XkbApplyMappingChange(pDev, &keySyms, keySyms.minKeyCode,

-                                      keySyms.maxKeyCode - keySyms.minKeyCode + 1,

-                                      keyInfo.modMap, serverClient);

-                DarwinKeyboardSetRepeat(pDev, initialKeyRepeatValue, keyRepeatValue);    

-            }

-        }

-    } pthread_mutex_unlock(&keyInfo_mutex);

-

-    /* Modify with xmodmap */

-    if (access(xmodmap, F_OK) == 0) {

-        /* Check for system .Xmodmap */

-        if (access(sysmodmap, F_OK) == 0) {

-            if(snprintf (cmd, sizeof(cmd), "%s %s", xmodmap, sysmodmap) < sizeof(cmd)) {

-                X11ApplicationLaunchClient(cmd);

-            } else {

-                ErrorF("X11.app: Unable to create / execute xmodmap command line");

-            }

-        }

-

-        /* Check for user's local .Xmodmap */

-        if ((homedir != NULL) && (snprintf (usermodmap, sizeof(usermodmap), "%s/.Xmodmap", homedir) < sizeof(usermodmap))) {

-            if (access(usermodmap, F_OK) == 0) {

-                if(snprintf (cmd, sizeof(cmd), "%s %s", xmodmap, usermodmap) < sizeof(cmd)) {

-                    X11ApplicationLaunchClient(cmd);

-                } else {

-                    ErrorF("X11.app: Unable to create / execute xmodmap command line");

-                }

-            }

-        } else {

-            ErrorF("X11.app: Unable to determine path to user's .Xmodmap");

-        }

-    }

-}

-

-//-----------------------------------------------------------------------------

-// Modifier translation functions

-//

-// There are three different ways to specify a Mac modifier key:

-// keycode - specifies hardware key, read from keymapping

-// key     - NX_MODIFIERKEY_*, really an index

-// mask    - NX_*MASK, mask for modifier flags in event record

-// Left and right side have different keycodes but the same key and mask.

-//-----------------------------------------------------------------------------

-

-/*

- * DarwinModifierNXKeyToNXKeycode

- *      Return the keycode for an NX_MODIFIERKEY_* modifier.

- *      side = 0 for left or 1 for right.

- *      Returns 0 if key+side is not a known modifier.

- */

-int DarwinModifierNXKeyToNXKeycode(int key, int side) {

-    int retval;

-    pthread_mutex_lock(&keyInfo_mutex);

-    retval = keyInfo.modifierKeycodes[key][side];

-    pthread_mutex_unlock(&keyInfo_mutex);

-

-    return retval;

-}

-

-/*

- * DarwinModifierNXKeycodeToNXKey

- *      Returns -1 if keycode+side is not a modifier key

- *      outSide may be NULL, else it gets 0 for left and 1 for right.

- */

-int DarwinModifierNXKeycodeToNXKey(unsigned char keycode, int *outSide) {

-    int key, side;

-

-    keycode += MIN_KEYCODE;

-

-    // search modifierKeycodes for this keycode+side

-    pthread_mutex_lock(&keyInfo_mutex);

-    for (key = 0; key < NX_NUMMODIFIERS; key++) {

-        for (side = 0; side <= 1; side++) {

-            if (keyInfo.modifierKeycodes[key][side] == keycode) break;

-        }

-    }

-    pthread_mutex_unlock(&keyInfo_mutex);

-

-    if (key == NX_NUMMODIFIERS) {

-        return -1;

-    }

-    if (outSide) *outSide = side;

-

-    return key;

-}

-

-/*

- * DarwinModifierNXMaskToNXKey

- *      Returns -1 if mask is not a known modifier mask.

- */

-int DarwinModifierNXMaskToNXKey(int mask) {

-    switch (mask) {

-        case NX_ALPHASHIFTMASK:       return NX_MODIFIERKEY_ALPHALOCK;

-        case NX_SHIFTMASK:            return NX_MODIFIERKEY_SHIFT;

-#ifdef NX_DEVICELSHIFTKEYMASK

-        case NX_DEVICELSHIFTKEYMASK:  return NX_MODIFIERKEY_SHIFT;

-        case NX_DEVICERSHIFTKEYMASK:  return NX_MODIFIERKEY_RSHIFT;

-#endif

-        case NX_CONTROLMASK:          return NX_MODIFIERKEY_CONTROL;

-#ifdef NX_DEVICELCTLKEYMASK

-        case NX_DEVICELCTLKEYMASK:    return NX_MODIFIERKEY_CONTROL;

-        case NX_DEVICERCTLKEYMASK:    return NX_MODIFIERKEY_RCONTROL;

-#endif

-        case NX_ALTERNATEMASK:        return NX_MODIFIERKEY_ALTERNATE;

-#ifdef NX_DEVICELALTKEYMASK

-        case NX_DEVICELALTKEYMASK:    return NX_MODIFIERKEY_ALTERNATE;

-        case NX_DEVICERALTKEYMASK:    return NX_MODIFIERKEY_RALTERNATE;

-#endif

-        case NX_COMMANDMASK:          return NX_MODIFIERKEY_COMMAND;

-#ifdef NX_DEVICELCMDKEYMASK

-        case NX_DEVICELCMDKEYMASK:    return NX_MODIFIERKEY_COMMAND;

-        case NX_DEVICERCMDKEYMASK:    return NX_MODIFIERKEY_RCOMMAND;

-#endif

-        case NX_NUMERICPADMASK:       return NX_MODIFIERKEY_NUMERICPAD;

-        case NX_HELPMASK:             return NX_MODIFIERKEY_HELP;

-        case NX_SECONDARYFNMASK:      return NX_MODIFIERKEY_SECONDARYFN;

-    }

-    return -1;

-}

-

-/*

- * DarwinModifierNXKeyToNXMask

- *      Returns 0 if key is not a known modifier key.

- */

-int DarwinModifierNXKeyToNXMask(int key) {

-    switch (key) {

-        case NX_MODIFIERKEY_ALPHALOCK:   return NX_ALPHASHIFTMASK;

-#ifdef NX_DEVICELSHIFTKEYMASK

-        case NX_MODIFIERKEY_SHIFT:       return NX_DEVICELSHIFTKEYMASK;

-        case NX_MODIFIERKEY_RSHIFT:      return NX_DEVICERSHIFTKEYMASK;

-        case NX_MODIFIERKEY_CONTROL:     return NX_DEVICELCTLKEYMASK;

-        case NX_MODIFIERKEY_RCONTROL:    return NX_DEVICERCTLKEYMASK;

-        case NX_MODIFIERKEY_ALTERNATE:   return NX_DEVICELALTKEYMASK;

-        case NX_MODIFIERKEY_RALTERNATE:  return NX_DEVICERALTKEYMASK;

-        case NX_MODIFIERKEY_COMMAND:     return NX_DEVICELCMDKEYMASK;

-        case NX_MODIFIERKEY_RCOMMAND:    return NX_DEVICERCMDKEYMASK;

-#else

-        case NX_MODIFIERKEY_SHIFT:       return NX_SHIFTMASK;

-        case NX_MODIFIERKEY_CONTROL:     return NX_CONTROLMASK;

-        case NX_MODIFIERKEY_ALTERNATE:   return NX_ALTERNATEMASK;

-        case NX_MODIFIERKEY_COMMAND:     return NX_COMMANDMASK;

-#endif

-        case NX_MODIFIERKEY_NUMERICPAD:  return NX_NUMERICPADMASK;

-        case NX_MODIFIERKEY_HELP:        return NX_HELPMASK;

-        case NX_MODIFIERKEY_SECONDARYFN: return NX_SECONDARYFNMASK;

-    }

-    return 0;

-}

-

-/*

- * DarwinModifierStringToNXMask

- *      Returns 0 if string is not a known modifier.

- */

-int DarwinModifierStringToNXMask(const char *str, int separatelr) {

-#ifdef NX_DEVICELSHIFTKEYMASK

-    if(separatelr) {

-        if (!strcasecmp(str, "shift"))    return NX_DEVICELSHIFTKEYMASK | NX_DEVICERSHIFTKEYMASK;

-        if (!strcasecmp(str, "control"))  return NX_DEVICELCTLKEYMASK | NX_DEVICERCTLKEYMASK;

-        if (!strcasecmp(str, "option"))   return NX_DEVICELALTKEYMASK | NX_DEVICERALTKEYMASK;

-        if (!strcasecmp(str, "alt"))   return NX_DEVICELALTKEYMASK | NX_DEVICERALTKEYMASK;

-        if (!strcasecmp(str, "command"))  return NX_DEVICELCMDKEYMASK | NX_DEVICERCMDKEYMASK;

-        if (!strcasecmp(str, "lshift"))   return NX_DEVICELSHIFTKEYMASK;

-        if (!strcasecmp(str, "rshift"))   return NX_DEVICERSHIFTKEYMASK;

-        if (!strcasecmp(str, "lcontrol")) return NX_DEVICELCTLKEYMASK;

-        if (!strcasecmp(str, "rcontrol")) return NX_DEVICERCTLKEYMASK;

-        if (!strcasecmp(str, "loption"))  return NX_DEVICELALTKEYMASK;

-        if (!strcasecmp(str, "roption"))  return NX_DEVICERALTKEYMASK;

-        if (!strcasecmp(str, "lalt"))  return NX_DEVICELALTKEYMASK;

-        if (!strcasecmp(str, "ralt"))  return NX_DEVICERALTKEYMASK;

-        if (!strcasecmp(str, "lcommand")) return NX_DEVICELCMDKEYMASK;

-        if (!strcasecmp(str, "rcommand")) return NX_DEVICERCMDKEYMASK;

-    } else {

-#endif

-        if (!strcasecmp(str, "shift"))    return NX_SHIFTMASK;

-        if (!strcasecmp(str, "control"))  return NX_CONTROLMASK;

-        if (!strcasecmp(str, "option"))   return NX_ALTERNATEMASK;

-        if (!strcasecmp(str, "alt"))   return NX_ALTERNATEMASK;

-        if (!strcasecmp(str, "command"))  return NX_COMMANDMASK;

-        if (!strcasecmp(str, "lshift"))   return NX_SHIFTMASK;

-        if (!strcasecmp(str, "rshift"))   return NX_SHIFTMASK;

-        if (!strcasecmp(str, "lcontrol")) return NX_CONTROLMASK;

-        if (!strcasecmp(str, "rcontrol")) return NX_CONTROLMASK;

-        if (!strcasecmp(str, "loption"))  return NX_ALTERNATEMASK;

-        if (!strcasecmp(str, "roption"))  return NX_ALTERNATEMASK;

-        if (!strcasecmp(str, "lalt"))  return NX_ALTERNATEMASK;

-        if (!strcasecmp(str, "ralt"))  return NX_ALTERNATEMASK;

-        if (!strcasecmp(str, "lcommand")) return NX_COMMANDMASK;

-        if (!strcasecmp(str, "rcommand")) return NX_COMMANDMASK;

-#ifdef NX_DEVICELSHIFTKEYMASK

-    }

-#endif

-    if (!strcasecmp(str, "lock"))     return NX_ALPHASHIFTMASK;

-    if (!strcasecmp(str, "fn"))       return NX_SECONDARYFNMASK;

-    if (!strcasecmp(str, "help"))     return NX_HELPMASK;

-    if (!strcasecmp(str, "numlock"))  return NX_NUMERICPADMASK;

-    return 0;

-}

-

-/*

- * LegalModifier

- *      This allows the ddx layer to prevent some keys from being remapped

- *      as modifier keys.

- */

-Bool LegalModifier(unsigned int key, DeviceIntPtr pDev)

-{

-    return 1;

-}

-

-static inline UniChar macroman2ucs(unsigned char c) {

-    /* Precalculated table mapping MacRoman-128 to Unicode. Generated

-       by creating single element CFStringRefs then extracting the

-       first character. */

-

-    static const unsigned short table[128] = {

-        0xc4, 0xc5, 0xc7, 0xc9, 0xd1, 0xd6, 0xdc, 0xe1,

-        0xe0, 0xe2, 0xe4, 0xe3, 0xe5, 0xe7, 0xe9, 0xe8,

-        0xea, 0xeb, 0xed, 0xec, 0xee, 0xef, 0xf1, 0xf3,

-        0xf2, 0xf4, 0xf6, 0xf5, 0xfa, 0xf9, 0xfb, 0xfc,

-        0x2020, 0xb0, 0xa2, 0xa3, 0xa7, 0x2022, 0xb6, 0xdf,

-        0xae, 0xa9, 0x2122, 0xb4, 0xa8, 0x2260, 0xc6, 0xd8,

-        0x221e, 0xb1, 0x2264, 0x2265, 0xa5, 0xb5, 0x2202, 0x2211,

-        0x220f, 0x3c0, 0x222b, 0xaa, 0xba, 0x3a9, 0xe6, 0xf8,

-        0xbf, 0xa1, 0xac, 0x221a, 0x192, 0x2248, 0x2206, 0xab,

-        0xbb, 0x2026, 0xa0, 0xc0, 0xc3, 0xd5, 0x152, 0x153,

-        0x2013, 0x2014, 0x201c, 0x201d, 0x2018, 0x2019, 0xf7, 0x25ca,

-        0xff, 0x178, 0x2044, 0x20ac, 0x2039, 0x203a, 0xfb01, 0xfb02,

-        0x2021, 0xb7, 0x201a, 0x201e, 0x2030, 0xc2, 0xca, 0xc1,

-        0xcb, 0xc8, 0xcd, 0xce, 0xcf, 0xcc, 0xd3, 0xd4,

-        0xf8ff, 0xd2, 0xda, 0xdb, 0xd9, 0x131, 0x2c6, 0x2dc,

-        0xaf, 0x2d8, 0x2d9, 0x2da, 0xb8, 0x2dd, 0x2db, 0x2c7,

-    };

-

-    if (c < 128) return c;

-    else         return table[c - 128];

-}

-

-static KeySym make_dead_key(KeySym in) {

-    int i;

-

-    for (i = 0; i < sizeof (dead_keys) / sizeof (dead_keys[0]); i++)

-        if (dead_keys[i].normal == in) return dead_keys[i].dead;

-

-    return in;

-}

-

-static Bool QuartzReadSystemKeymap(darwinKeyboardInfo *info) {

-#if !defined(__LP64__) || MAC_OS_X_VERSION_MIN_REQUIRED < 1050

-    KeyboardLayoutRef key_layout;

-    int is_uchr = 1;

-#endif

-    const void *chr_data = NULL;

-    int num_keycodes = NUM_KEYCODES;

-    UInt32 keyboard_type = LMGetKbdType();

-    int i, j;

-    OSStatus err;

-    KeySym *k;

-    CFDataRef currentKeyLayoutDataRef = NULL;

-

-#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050

-    TISInputSourceRef currentKeyLayoutRef = TISCopyCurrentKeyboardLayoutInputSource();

-

-    if (currentKeyLayoutRef) {

-      currentKeyLayoutDataRef = (CFDataRef )TISGetInputSourceProperty(currentKeyLayoutRef, kTISPropertyUnicodeKeyLayoutData);

-      if (currentKeyLayoutDataRef)

-          chr_data = CFDataGetBytePtr(currentKeyLayoutDataRef);

-    }

-#endif

-

-#if !defined(__LP64__) || MAC_OS_X_VERSION_MIN_REQUIRED < 1050

-    if (chr_data == NULL) {

-#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050

-        ErrorF("X11.app: Error detected in determining keyboard layout.  If you are using an Apple-provided keyboard layout, please report this error at http://xquartz.macosforge.org and http://bugreport.apple.com\n");

-        ErrorF("X11.app: Debug Info: keyboard_type=%u, currentKeyLayoutRef=%p, currentKeyLayoutDataRef=%p, chr_data=%p\n",

-               (unsigned)keyboard_type, currentKeyLayoutRef, currentKeyLayoutDataRef, chr_data);

-#endif

-

-        KLGetCurrentKeyboardLayout (&key_layout);

-        KLGetKeyboardLayoutProperty (key_layout, kKLuchrData, &chr_data);

-

-#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050

-        if(chr_data != NULL) {

-            ErrorF("X11.app: Fallback succeeded, but this is still a bug.  Please report the above information.\n");

-        }

-#endif

-    }

-

-    if (chr_data == NULL) {

-        ErrorF("X11.app: Debug Info: kKLuchrData failed, trying kKLKCHRData.\n");

-        ErrorF("If you are using a 3rd party keyboard layout, please see http://xquartz.macosforge.org/trac/ticket/154\n");

-        KLGetKeyboardLayoutProperty (key_layout, kKLKCHRData, &chr_data);

-        is_uchr = 0;

-        num_keycodes = 128;

-        

-#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050

-        if(chr_data != NULL) {

-            ErrorF("X11.app: Fallback succeeded, but this is still a bug.  Please report the above information.\n");

-        }

-#endif

-    }

-#endif

-

-#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050

-    if(currentKeyLayoutRef)

-        CFRelease(currentKeyLayoutRef);

-#endif

-    

-    if (chr_data == NULL) {

-      ErrorF ( "Couldn't get uchr or kchr resource\n");

-      return FALSE;

-    }

-    

-    /* Scan the keycode range for the Unicode character that each

-       key produces in the four shift states. Then convert that to

-       an X11 keysym (which may just the bit that says "this is

-       Unicode" if it can't find the real symbol.) */

-       

-    /* KeyTranslate is not available on 64-bit platforms; UCKeyTranslate

-       must be used instead. */

-

-    for (i = 0; i < num_keycodes; i++) {

-        static const int mods[4] = {0, MOD_SHIFT, MOD_OPTION,

-                                    MOD_OPTION | MOD_SHIFT};

-

-        k = info->keyMap + i * GLYPHS_PER_KEY;

-

-        for (j = 0; j < 4; j++) {

-#if !defined(__LP64__) || MAC_OS_X_VERSION_MIN_REQUIRED < 1050

-            if (is_uchr)  {

-#endif

-                UniChar s[8];

-                UniCharCount len;

-                UInt32 dead_key_state = 0, extra_dead = 0;

-

-                err = UCKeyTranslate (chr_data, i, kUCKeyActionDown,

-                                      mods[j] >> 8, keyboard_type, 0,

-                                      &dead_key_state, 8, &len, s);

-                if (err != noErr) continue;

-

-                if (len == 0 && dead_key_state != 0) {

-                    /* Found a dead key. Work out which one it is, but

-                       remembering that it's dead. */

-                    err = UCKeyTranslate (chr_data, i, kUCKeyActionDown,

-                                          mods[j] >> 8, keyboard_type,

-                                          kUCKeyTranslateNoDeadKeysMask,

-                                          &extra_dead, 8, &len, s);

-                    if (err != noErr) continue;

-                }

-

-                /* Not sure why 0x0010 is there.

-                 * 0x0000 - <rdar://problem/7793566> 'Unicode Hex Input' ...

-                 */

-                if (len > 0 && s[0] != 0x0010 && s[0] != 0x0000) {

-                    k[j] = ucs2keysym (s[0]);

-                    if (dead_key_state != 0) k[j] = make_dead_key (k[j]);

-                }

-#if !defined(__LP64__) || MAC_OS_X_VERSION_MIN_REQUIRED < 1050

-            } else { // kchr

-	      UInt32 c, state = 0, state2 = 0;

-                UInt16 code;

-

-                code = i | mods[j];

-                c = KeyTranslate (chr_data, code, &state);

-

-                /* Dead keys are only processed on key-down, so ask

-                   to translate those events. When we find a dead key,

-                   translating the matching key up event will give

-                   us the actual dead character. */

-

-                if (state != 0)

-                    c = KeyTranslate (chr_data, code | 128, &state2);

-

-                /* Characters seem to be in MacRoman encoding. */

-

-                if (c != 0 && c != 0x0010) {

-                    k[j] = ucs2keysym (macroman2ucs (c & 255));

-

-                    if (state != 0) k[j] = make_dead_key (k[j]);

-                }

-            }

-#endif

-        }

-

-        if (k[3] == k[2]) k[3] = NoSymbol;

-        if (k[1] == k[0]) k[1] = NoSymbol;

-        if (k[0] == k[2] && k[1] == k[3]) k[2] = k[3] = NoSymbol;

-        if (k[3] == k[0] && k[2] == k[1] && k[2] == NoSymbol) k[3] = NoSymbol;

-    }

-

-#if HACK_MISSING

-    /* Fix up some things that are normally missing.. */

-    

-    for (i = 0; i < sizeof (known_keys) / sizeof (known_keys[0]); i++) {

-        k = info->keyMap + known_keys[i].keycode * GLYPHS_PER_KEY;

-        

-        if (   k[0] == NoSymbol && k[1] == NoSymbol

-            && k[2] == NoSymbol && k[3] == NoSymbol)

-            k[0] = known_keys[i].keysym;

-    }

-#endif

-    

-#if HACK_KEYPAD

-    /* And some more things. We find the right symbols for the numeric

-     keypad, but not the KP_ keysyms. So try to convert known keycodes. */

-    for (i = 0; i < sizeof (known_numeric_keys) / sizeof (known_numeric_keys[0]); i++) {

-        k = info->keyMap + known_numeric_keys[i].keycode * GLYPHS_PER_KEY;

-        

-        if (k[0] == known_numeric_keys[i].normal)

-            k[0] = known_numeric_keys[i].keypad;

-    }

-#endif

-    

-#if HACK_BLACKLIST

-    for (i = 0; i < sizeof (keycode_blacklist) / sizeof (keycode_blacklist[0]); i++) {

-        k = info->keyMap + keycode_blacklist[i] * GLYPHS_PER_KEY;

-        k[0] = k[1] = k[2] = k[3] = NoSymbol;

-    }

-#endif

-

-    DarwinBuildModifierMaps(info);

-

-    return TRUE;

-}

-

-Bool QuartsResyncKeymap(Bool sendDDXEvent) {

-    Bool retval;

-    /* Update keyInfo */

-    pthread_mutex_lock(&keyInfo_mutex);

-    memset(keyInfo.keyMap, 0, sizeof(keyInfo.keyMap));

-    retval = QuartzReadSystemKeymap(&keyInfo);

-    pthread_mutex_unlock(&keyInfo_mutex);

-

-    /* Tell server thread to deal with new keyInfo */

-    if(sendDDXEvent)

-        DarwinSendDDXEvent(kXquartzReloadKeymap, 0);

-

-    return retval;

-}

+/*
+   quartzKeyboard.c: Keyboard support for Xquartz
+
+   Copyright (c) 2003-2008 Apple Inc.
+   Copyright (c) 2001-2004 Torrey T. Lyons. All Rights Reserved.
+   Copyright 2004 Kaleb S. KEITHLEY. All Rights Reserved.
+
+   Copyright (C) 1999,2000 by Eric Sunshine <sunshine@sunshineco.com>
+   All rights reserved.
+
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions are met:
+
+     1. Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+     2. Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+     3. The name of the author may not be used to endorse or promote products
+        derived from this software without specific prior written permission.
+
+   THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+   IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+   OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN
+   NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+   TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#include "sanitizedCarbon.h"
+
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
+#define HACK_MISSING 1
+#define HACK_KEYPAD 1
+#define HACK_BLACKLIST 1
+
+#include <unistd.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <sys/stat.h>
+#include <AvailabilityMacros.h>
+
+#include "quartz.h"
+#include "darwin.h"
+#include "darwinEvents.h"
+
+#include "quartzKeyboard.h"
+
+#include "X11Application.h"
+
+#include "threadSafety.h"
+
+#ifdef NDEBUG
+#undef NDEBUG
+#include <assert.h>
+#define NDEBUG 1
+#else
+#include <assert.h>
+#endif
+#include <pthread.h>
+
+#include "xkbsrv.h"
+#include "exevents.h"
+#include "X11/keysym.h"
+#include "keysym2ucs.h"
+
+extern void
+CopyKeyClass(DeviceIntPtr device, DeviceIntPtr master);
+
+enum {
+    MOD_COMMAND = 256,
+    MOD_SHIFT = 512,
+    MOD_OPTION = 2048,
+    MOD_CONTROL = 4096,
+};
+
+#define UKEYSYM(u) ((u) | 0x01000000)
+
+#if HACK_MISSING
+/* Table of keycode->keysym mappings we use to fallback on for important
+   keys that are often not in the Unicode mapping. */
+
+const static struct {
+    unsigned short keycode;
+    KeySym keysym;
+} known_keys[] = {
+    {55,  XK_Meta_L},
+    {56,  XK_Shift_L},
+    {57,  XK_Caps_Lock},
+    {58,  XK_Alt_L},
+    {59,  XK_Control_L},
+
+    {60,  XK_Shift_R},
+    {61,  XK_Alt_R},
+    {62,  XK_Control_R},
+    {63,  XK_Meta_R},
+
+    {122, XK_F1},
+    {120, XK_F2},
+    {99,  XK_F3},
+    {118, XK_F4},
+    {96,  XK_F5},
+    {97,  XK_F6},
+    {98,  XK_F7},
+    {100, XK_F8},
+    {101, XK_F9},
+    {109, XK_F10},
+    {103, XK_F11},
+    {111, XK_F12},
+    {105, XK_F13},
+    {107, XK_F14},
+    {113, XK_F15},
+};
+#endif
+
+#if HACK_KEYPAD
+/* Table of keycode->old,new-keysym mappings we use to fixup the numeric
+   keypad entries. */
+
+const static struct {
+    unsigned short keycode;
+    KeySym normal, keypad;
+} known_numeric_keys[] = {
+    {65, XK_period, XK_KP_Decimal},
+    {67, XK_asterisk, XK_KP_Multiply},
+    {69, XK_plus, XK_KP_Add},
+    {75, XK_slash, XK_KP_Divide},
+    {76, 0x01000003, XK_KP_Enter},
+    {78, XK_minus, XK_KP_Subtract},
+    {81, XK_equal, XK_KP_Equal},
+    {82, XK_0, XK_KP_0},
+    {83, XK_1, XK_KP_1},
+    {84, XK_2, XK_KP_2},
+    {85, XK_3, XK_KP_3},
+    {86, XK_4, XK_KP_4},
+    {87, XK_5, XK_KP_5},
+    {88, XK_6, XK_KP_6},
+    {89, XK_7, XK_KP_7},
+    {91, XK_8, XK_KP_8},
+    {92, XK_9, XK_KP_9},
+};
+#endif
+
+#if HACK_BLACKLIST
+/* <rdar://problem/7824370> wine notepad produces wrong characters on shift+arrow
+ * http://xquartz.macosforge.org/trac/ticket/295
+ * http://developer.apple.com/legacy/mac/library/documentation/mac/Text/Text-579.html
+ *
+ * legacy Mac keycodes for arrow keys that shift-modify to math symbols
+ */
+const static unsigned short keycode_blacklist[] = {66, 70, 72, 77};
+#endif
+
+/* Table mapping normal keysyms to their dead equivalents.
+   FIXME: all the unicode keysyms (apart from circumflex) were guessed. */
+
+const static struct {
+    KeySym normal, dead;
+} dead_keys[] = {
+    {XK_grave, XK_dead_grave},
+    {XK_apostrophe, XK_dead_acute},             /* US:"=" on a Czech keyboard */
+    {XK_acute, XK_dead_acute},
+    {UKEYSYM (0x384), XK_dead_acute},           /* US:";" on a Greek keyboard */
+//    {XK_Greek_accentdieresis, XK_dead_diaeresis},   /* US:"opt+;" on a Greek keyboard ... replace with dead_accentdieresis if there is one */
+    {XK_asciicircum, XK_dead_circumflex},
+    {UKEYSYM (0x2c6), XK_dead_circumflex},	/* MODIFIER LETTER CIRCUMFLEX ACCENT */
+    {XK_asciitilde, XK_dead_tilde},
+    {UKEYSYM (0x2dc), XK_dead_tilde},		/* SMALL TILDE */
+    {XK_macron, XK_dead_macron},
+    {XK_breve, XK_dead_breve},
+    {XK_abovedot, XK_dead_abovedot},
+    {XK_diaeresis, XK_dead_diaeresis},
+    {UKEYSYM (0x2da), XK_dead_abovering},	/* DOT ABOVE */
+    {XK_doubleacute, XK_dead_doubleacute},
+    {XK_caron, XK_dead_caron},
+    {XK_cedilla, XK_dead_cedilla},
+    {XK_ogonek, XK_dead_ogonek},
+    {UKEYSYM (0x269), XK_dead_iota},		/* LATIN SMALL LETTER IOTA */
+    {UKEYSYM (0x2ec), XK_dead_voiced_sound},	/* MODIFIER LETTER VOICING */
+/*  {XK_semivoiced_sound, XK_dead_semivoiced_sound}, */
+    {UKEYSYM (0x323), XK_dead_belowdot},	/* COMBINING DOT BELOW */
+    {UKEYSYM (0x309), XK_dead_hook}, 		/* COMBINING HOOK ABOVE */
+    {UKEYSYM (0x31b), XK_dead_horn},		/* COMBINING HORN */
+};
+
+typedef struct darwinKeyboardInfo_struct {
+    CARD8 modMap[MAP_LENGTH];
+    KeySym keyMap[MAP_LENGTH * GLYPHS_PER_KEY];
+    unsigned char modifierKeycodes[32][2];
+} darwinKeyboardInfo;
+
+darwinKeyboardInfo keyInfo;
+pthread_mutex_t keyInfo_mutex = PTHREAD_MUTEX_INITIALIZER;
+
+static void DarwinChangeKeyboardControl(DeviceIntPtr device, KeybdCtrl *ctrl) {
+    // FIXME: to be implemented
+    // keyclick, bell volume / pitch, autorepead, LED's
+}
+
+//-----------------------------------------------------------------------------
+// Utility functions to help parse Darwin keymap
+//-----------------------------------------------------------------------------
+
+/*
+ * DarwinBuildModifierMaps
+ *      Use the keyMap field of keyboard info structure to populate
+ *      the modMap and modifierKeycodes fields.
+ */
+static void DarwinBuildModifierMaps(darwinKeyboardInfo *info) {
+    int i;
+    KeySym *k;
+
+    memset(info->modMap, NoSymbol, sizeof(info->modMap));
+    memset(info->modifierKeycodes, 0, sizeof(info->modifierKeycodes));
+
+    for (i = 0; i < NUM_KEYCODES; i++) {
+        k = info->keyMap + i * GLYPHS_PER_KEY;
+
+        switch (*k) {
+            case XK_Shift_L:
+                info->modifierKeycodes[NX_MODIFIERKEY_SHIFT][0] = i;
+                info->modMap[MIN_KEYCODE + i] = ShiftMask;
+                break;
+
+            case XK_Shift_R:
+#ifdef NX_MODIFIERKEY_RSHIFT
+                info->modifierKeycodes[NX_MODIFIERKEY_RSHIFT][0] = i;
+#else
+                info->modifierKeycodes[NX_MODIFIERKEY_SHIFT][0] = i;
+#endif
+                info->modMap[MIN_KEYCODE + i] = ShiftMask;
+                break;
+
+            case XK_Control_L:
+                info->modifierKeycodes[NX_MODIFIERKEY_CONTROL][0] = i;
+                info->modMap[MIN_KEYCODE + i] = ControlMask;
+                break;
+
+            case XK_Control_R:
+#ifdef NX_MODIFIERKEY_RCONTROL
+                info->modifierKeycodes[NX_MODIFIERKEY_RCONTROL][0] = i;
+#else
+                info->modifierKeycodes[NX_MODIFIERKEY_CONTROL][0] = i;
+#endif
+                info->modMap[MIN_KEYCODE + i] = ControlMask;
+                break;
+
+            case XK_Caps_Lock:
+                info->modifierKeycodes[NX_MODIFIERKEY_ALPHALOCK][0] = i;
+                info->modMap[MIN_KEYCODE + i] = LockMask;
+                break;
+
+            case XK_Alt_L:
+                info->modifierKeycodes[NX_MODIFIERKEY_ALTERNATE][0] = i;
+                info->modMap[MIN_KEYCODE + i] = Mod1Mask;
+                if(!XQuartzOptionSendsAlt)
+                    *k = XK_Mode_switch; // Yes, this is ugly.  This needs to be cleaned up when we integrate quartzKeyboard with this code and refactor.
+                break;
+
+            case XK_Alt_R:
+#ifdef NX_MODIFIERKEY_RALTERNATE
+                info->modifierKeycodes[NX_MODIFIERKEY_RALTERNATE][0] = i;
+#else
+                info->modifierKeycodes[NX_MODIFIERKEY_ALTERNATE][0] = i;
+#endif
+                if(!XQuartzOptionSendsAlt)
+                    *k = XK_Mode_switch; // Yes, this is ugly.  This needs to be cleaned up when we integrate quartzKeyboard with this code and refactor.
+                info->modMap[MIN_KEYCODE + i] = Mod1Mask;
+                break;
+
+            case XK_Mode_switch:
+                ErrorF("DarwinBuildModifierMaps: XK_Mode_switch encountered, unable to determine side.\n");
+                info->modifierKeycodes[NX_MODIFIERKEY_ALTERNATE][0] = i;
+#ifdef NX_MODIFIERKEY_RALTERNATE
+                info->modifierKeycodes[NX_MODIFIERKEY_RALTERNATE][0] = i;
+#endif
+                info->modMap[MIN_KEYCODE + i] = Mod1Mask;
+                break;
+
+            case XK_Meta_L:
+                info->modifierKeycodes[NX_MODIFIERKEY_COMMAND][0] = i;
+                info->modMap[MIN_KEYCODE + i] = Mod2Mask;
+                break;
+
+            case XK_Meta_R:
+#ifdef NX_MODIFIERKEY_RCOMMAND
+                info->modifierKeycodes[NX_MODIFIERKEY_RCOMMAND][0] = i;
+#else
+                info->modifierKeycodes[NX_MODIFIERKEY_COMMAND][0] = i;
+#endif
+                info->modMap[MIN_KEYCODE + i] = Mod2Mask;
+                break;
+
+            case XK_Num_Lock:
+                info->modMap[MIN_KEYCODE + i] = Mod3Mask;
+                break;
+        }
+    }
+}
+
+/*
+ * DarwinKeyboardInit
+ *      Get the Darwin keyboard map and compute an equivalent
+ *      X keyboard map and modifier map. Set the new keyboard
+ *      device structure.
+ */
+void DarwinKeyboardInit(DeviceIntPtr pDev) {
+    // Open a shared connection to the HID System.
+    // Note that the Event Status Driver is really just a wrapper
+    // for a kIOHIDParamConnectType connection.
+    assert(darwinParamConnect = NXOpenEventStatus());
+
+    InitKeyboardDeviceStruct(pDev, NULL, NULL, DarwinChangeKeyboardControl);
+
+    DarwinKeyboardReloadHandler();
+
+    CopyKeyClass(pDev, inputInfo.keyboard);
+}
+
+/* Set the repeat rates based on global preferences and keycodes for modifiers.
+ * Precondition: Has the keyInfo_mutex lock.
+ */
+static void DarwinKeyboardSetRepeat(DeviceIntPtr pDev, int initialKeyRepeatValue, int keyRepeatValue) {
+    if(initialKeyRepeatValue == 300000) { // off
+        /* Turn off repeats globally */
+        XkbSetRepeatKeys(pDev, -1, AutoRepeatModeOff);
+    } else {
+        int i;
+        XkbControlsPtr      ctrl;
+        XkbControlsRec      old;
+
+        /* Turn on repeats globally */
+        XkbSetRepeatKeys(pDev, -1, AutoRepeatModeOn);
+        
+        /* Setup the bit mask for individual key repeats */
+        ctrl = pDev->key->xkbInfo->desc->ctrls;
+        old= *ctrl;
+        
+        ctrl->repeat_delay = initialKeyRepeatValue * 15;
+        ctrl->repeat_interval = keyRepeatValue * 15;
+
+        /* Turn off key-repeat for modifier keys, on for others */
+        /* First set them all on */
+        for(i=0; i < XkbPerKeyBitArraySize; i++)
+            ctrl->per_key_repeat[i] = -1;
+
+        /* Now turn off the modifiers */
+        for(i=0; i < 32; i++) {
+            unsigned char keycode;
+            
+            keycode = keyInfo.modifierKeycodes[i][0];
+            if(keycode)
+                ClearBit(ctrl->per_key_repeat, keycode + MIN_KEYCODE);
+
+            keycode = keyInfo.modifierKeycodes[i][1];
+            if(keycode)
+                ClearBit(ctrl->per_key_repeat, keycode + MIN_KEYCODE);
+        }
+
+        /* Hurray for data duplication */
+        if (pDev->kbdfeed)
+            memcpy(pDev->kbdfeed->ctrl.autoRepeats, ctrl->per_key_repeat, XkbPerKeyBitArraySize);
+
+        //fprintf(stderr, "per_key_repeat =\n");
+        //for(i=0; i < XkbPerKeyBitArraySize; i++)
+        //    fprintf(stderr, "%02x%s", ctrl->per_key_repeat[i], (i + 1) & 7 ? "" : "\n");
+
+        /* And now we notify the puppies about the changes */
+        XkbDDXChangeControls(pDev, &old, ctrl);
+    }
+}
+
+void DarwinKeyboardReloadHandler(void) {
+    KeySymsRec keySyms;
+    CFIndex initialKeyRepeatValue, keyRepeatValue;
+    BOOL ok;
+    DeviceIntPtr pDev;
+    const char *xmodmap = PROJECTROOT "/bin/xmodmap";
+    const char *sysmodmap = PROJECTROOT "/lib/X11/xinit/.Xmodmap";
+    const char *homedir = getenv("HOME");
+    char usermodmap[PATH_MAX], cmd[PATH_MAX];
+
+    DEBUG_LOG("DarwinKeyboardReloadHandler\n");
+
+    /* Get our key repeat settings from GlobalPreferences */
+    (void)CFPreferencesAppSynchronize(CFSTR(".GlobalPreferences"));
+    
+    initialKeyRepeatValue = CFPreferencesGetAppIntegerValue(CFSTR("InitialKeyRepeat"), CFSTR(".GlobalPreferences"), &ok);
+    if(!ok)
+        initialKeyRepeatValue = 35;
+    
+    keyRepeatValue = CFPreferencesGetAppIntegerValue(CFSTR("KeyRepeat"), CFSTR(".GlobalPreferences"), &ok);
+    if(!ok)
+        keyRepeatValue = 6;
+    
+    pthread_mutex_lock(&keyInfo_mutex); {
+        /* Initialize our keySyms */
+        keySyms.map = keyInfo.keyMap;
+        keySyms.mapWidth   = GLYPHS_PER_KEY;
+        keySyms.minKeyCode = MIN_KEYCODE;
+        keySyms.maxKeyCode = MAX_KEYCODE;
+
+	// TODO: We should build the entire XkbDescRec and use XkbCopyKeymap
+        /* Apply the mappings to darwinKeyboard */
+        XkbApplyMappingChange(darwinKeyboard, &keySyms, keySyms.minKeyCode,
+                              keySyms.maxKeyCode - keySyms.minKeyCode + 1,
+                              keyInfo.modMap, serverClient);
+        DarwinKeyboardSetRepeat(darwinKeyboard, initialKeyRepeatValue, keyRepeatValue);
+
+        /* Apply the mappings to the core keyboard */
+        for (pDev = inputInfo.devices; pDev; pDev = pDev->next) {
+            if ((pDev->coreEvents || pDev == inputInfo.keyboard) && pDev->key) {
+                XkbApplyMappingChange(pDev, &keySyms, keySyms.minKeyCode,
+                                      keySyms.maxKeyCode - keySyms.minKeyCode + 1,
+                                      keyInfo.modMap, serverClient);
+                DarwinKeyboardSetRepeat(pDev, initialKeyRepeatValue, keyRepeatValue);    
+            }
+        }
+    } pthread_mutex_unlock(&keyInfo_mutex);
+
+    /* Modify with xmodmap */
+    if (access(xmodmap, F_OK) == 0) {
+        /* Check for system .Xmodmap */
+        if (access(sysmodmap, F_OK) == 0) {
+            if(snprintf (cmd, sizeof(cmd), "%s %s", xmodmap, sysmodmap) < sizeof(cmd)) {
+                X11ApplicationLaunchClient(cmd);
+            } else {
+                ErrorF("X11.app: Unable to create / execute xmodmap command line");
+            }
+        }
+
+        /* Check for user's local .Xmodmap */
+        if ((homedir != NULL) && (snprintf (usermodmap, sizeof(usermodmap), "%s/.Xmodmap", homedir) < sizeof(usermodmap))) {
+            if (access(usermodmap, F_OK) == 0) {
+                if(snprintf (cmd, sizeof(cmd), "%s %s", xmodmap, usermodmap) < sizeof(cmd)) {
+                    X11ApplicationLaunchClient(cmd);
+                } else {
+                    ErrorF("X11.app: Unable to create / execute xmodmap command line");
+                }
+            }
+        } else {
+            ErrorF("X11.app: Unable to determine path to user's .Xmodmap");
+        }
+    }
+}
+
+//-----------------------------------------------------------------------------
+// Modifier translation functions
+//
+// There are three different ways to specify a Mac modifier key:
+// keycode - specifies hardware key, read from keymapping
+// key     - NX_MODIFIERKEY_*, really an index
+// mask    - NX_*MASK, mask for modifier flags in event record
+// Left and right side have different keycodes but the same key and mask.
+//-----------------------------------------------------------------------------
+
+/*
+ * DarwinModifierNXKeyToNXKeycode
+ *      Return the keycode for an NX_MODIFIERKEY_* modifier.
+ *      side = 0 for left or 1 for right.
+ *      Returns 0 if key+side is not a known modifier.
+ */
+int DarwinModifierNXKeyToNXKeycode(int key, int side) {
+    int retval;
+    pthread_mutex_lock(&keyInfo_mutex);
+    retval = keyInfo.modifierKeycodes[key][side];
+    pthread_mutex_unlock(&keyInfo_mutex);
+
+    return retval;
+}
+
+/*
+ * DarwinModifierNXKeycodeToNXKey
+ *      Returns -1 if keycode+side is not a modifier key
+ *      outSide may be NULL, else it gets 0 for left and 1 for right.
+ */
+int DarwinModifierNXKeycodeToNXKey(unsigned char keycode, int *outSide) {
+    int key, side;
+
+    keycode += MIN_KEYCODE;
+
+    // search modifierKeycodes for this keycode+side
+    pthread_mutex_lock(&keyInfo_mutex);
+    for (key = 0; key < NX_NUMMODIFIERS; key++) {
+        for (side = 0; side <= 1; side++) {
+            if (keyInfo.modifierKeycodes[key][side] == keycode) break;
+        }
+    }
+    pthread_mutex_unlock(&keyInfo_mutex);
+
+    if (key == NX_NUMMODIFIERS) {
+        return -1;
+    }
+    if (outSide) *outSide = side;
+
+    return key;
+}
+
+/*
+ * DarwinModifierNXMaskToNXKey
+ *      Returns -1 if mask is not a known modifier mask.
+ */
+int DarwinModifierNXMaskToNXKey(int mask) {
+    switch (mask) {
+        case NX_ALPHASHIFTMASK:       return NX_MODIFIERKEY_ALPHALOCK;
+        case NX_SHIFTMASK:            return NX_MODIFIERKEY_SHIFT;
+#ifdef NX_DEVICELSHIFTKEYMASK
+        case NX_DEVICELSHIFTKEYMASK:  return NX_MODIFIERKEY_SHIFT;
+        case NX_DEVICERSHIFTKEYMASK:  return NX_MODIFIERKEY_RSHIFT;
+#endif
+        case NX_CONTROLMASK:          return NX_MODIFIERKEY_CONTROL;
+#ifdef NX_DEVICELCTLKEYMASK
+        case NX_DEVICELCTLKEYMASK:    return NX_MODIFIERKEY_CONTROL;
+        case NX_DEVICERCTLKEYMASK:    return NX_MODIFIERKEY_RCONTROL;
+#endif
+        case NX_ALTERNATEMASK:        return NX_MODIFIERKEY_ALTERNATE;
+#ifdef NX_DEVICELALTKEYMASK
+        case NX_DEVICELALTKEYMASK:    return NX_MODIFIERKEY_ALTERNATE;
+        case NX_DEVICERALTKEYMASK:    return NX_MODIFIERKEY_RALTERNATE;
+#endif
+        case NX_COMMANDMASK:          return NX_MODIFIERKEY_COMMAND;
+#ifdef NX_DEVICELCMDKEYMASK
+        case NX_DEVICELCMDKEYMASK:    return NX_MODIFIERKEY_COMMAND;
+        case NX_DEVICERCMDKEYMASK:    return NX_MODIFIERKEY_RCOMMAND;
+#endif
+        case NX_NUMERICPADMASK:       return NX_MODIFIERKEY_NUMERICPAD;
+        case NX_HELPMASK:             return NX_MODIFIERKEY_HELP;
+        case NX_SECONDARYFNMASK:      return NX_MODIFIERKEY_SECONDARYFN;
+    }
+    return -1;
+}
+
+/*
+ * DarwinModifierNXKeyToNXMask
+ *      Returns 0 if key is not a known modifier key.
+ */
+int DarwinModifierNXKeyToNXMask(int key) {
+    switch (key) {
+        case NX_MODIFIERKEY_ALPHALOCK:   return NX_ALPHASHIFTMASK;
+#ifdef NX_DEVICELSHIFTKEYMASK
+        case NX_MODIFIERKEY_SHIFT:       return NX_DEVICELSHIFTKEYMASK;
+        case NX_MODIFIERKEY_RSHIFT:      return NX_DEVICERSHIFTKEYMASK;
+        case NX_MODIFIERKEY_CONTROL:     return NX_DEVICELCTLKEYMASK;
+        case NX_MODIFIERKEY_RCONTROL:    return NX_DEVICERCTLKEYMASK;
+        case NX_MODIFIERKEY_ALTERNATE:   return NX_DEVICELALTKEYMASK;
+        case NX_MODIFIERKEY_RALTERNATE:  return NX_DEVICERALTKEYMASK;
+        case NX_MODIFIERKEY_COMMAND:     return NX_DEVICELCMDKEYMASK;
+        case NX_MODIFIERKEY_RCOMMAND:    return NX_DEVICERCMDKEYMASK;
+#else
+        case NX_MODIFIERKEY_SHIFT:       return NX_SHIFTMASK;
+        case NX_MODIFIERKEY_CONTROL:     return NX_CONTROLMASK;
+        case NX_MODIFIERKEY_ALTERNATE:   return NX_ALTERNATEMASK;
+        case NX_MODIFIERKEY_COMMAND:     return NX_COMMANDMASK;
+#endif
+        case NX_MODIFIERKEY_NUMERICPAD:  return NX_NUMERICPADMASK;
+        case NX_MODIFIERKEY_HELP:        return NX_HELPMASK;
+        case NX_MODIFIERKEY_SECONDARYFN: return NX_SECONDARYFNMASK;
+    }
+    return 0;
+}
+
+/*
+ * DarwinModifierStringToNXMask
+ *      Returns 0 if string is not a known modifier.
+ */
+int DarwinModifierStringToNXMask(const char *str, int separatelr) {
+#ifdef NX_DEVICELSHIFTKEYMASK
+    if(separatelr) {
+        if (!strcasecmp(str, "shift"))    return NX_DEVICELSHIFTKEYMASK | NX_DEVICERSHIFTKEYMASK;
+        if (!strcasecmp(str, "control"))  return NX_DEVICELCTLKEYMASK | NX_DEVICERCTLKEYMASK;
+        if (!strcasecmp(str, "option"))   return NX_DEVICELALTKEYMASK | NX_DEVICERALTKEYMASK;
+        if (!strcasecmp(str, "alt"))   return NX_DEVICELALTKEYMASK | NX_DEVICERALTKEYMASK;
+        if (!strcasecmp(str, "command"))  return NX_DEVICELCMDKEYMASK | NX_DEVICERCMDKEYMASK;
+        if (!strcasecmp(str, "lshift"))   return NX_DEVICELSHIFTKEYMASK;
+        if (!strcasecmp(str, "rshift"))   return NX_DEVICERSHIFTKEYMASK;
+        if (!strcasecmp(str, "lcontrol")) return NX_DEVICELCTLKEYMASK;
+        if (!strcasecmp(str, "rcontrol")) return NX_DEVICERCTLKEYMASK;
+        if (!strcasecmp(str, "loption"))  return NX_DEVICELALTKEYMASK;
+        if (!strcasecmp(str, "roption"))  return NX_DEVICERALTKEYMASK;
+        if (!strcasecmp(str, "lalt"))  return NX_DEVICELALTKEYMASK;
+        if (!strcasecmp(str, "ralt"))  return NX_DEVICERALTKEYMASK;
+        if (!strcasecmp(str, "lcommand")) return NX_DEVICELCMDKEYMASK;
+        if (!strcasecmp(str, "rcommand")) return NX_DEVICERCMDKEYMASK;
+    } else {
+#endif
+        if (!strcasecmp(str, "shift"))    return NX_SHIFTMASK;
+        if (!strcasecmp(str, "control"))  return NX_CONTROLMASK;
+        if (!strcasecmp(str, "option"))   return NX_ALTERNATEMASK;
+        if (!strcasecmp(str, "alt"))   return NX_ALTERNATEMASK;
+        if (!strcasecmp(str, "command"))  return NX_COMMANDMASK;
+        if (!strcasecmp(str, "lshift"))   return NX_SHIFTMASK;
+        if (!strcasecmp(str, "rshift"))   return NX_SHIFTMASK;
+        if (!strcasecmp(str, "lcontrol")) return NX_CONTROLMASK;
+        if (!strcasecmp(str, "rcontrol")) return NX_CONTROLMASK;
+        if (!strcasecmp(str, "loption"))  return NX_ALTERNATEMASK;
+        if (!strcasecmp(str, "roption"))  return NX_ALTERNATEMASK;
+        if (!strcasecmp(str, "lalt"))  return NX_ALTERNATEMASK;
+        if (!strcasecmp(str, "ralt"))  return NX_ALTERNATEMASK;
+        if (!strcasecmp(str, "lcommand")) return NX_COMMANDMASK;
+        if (!strcasecmp(str, "rcommand")) return NX_COMMANDMASK;
+#ifdef NX_DEVICELSHIFTKEYMASK
+    }
+#endif
+    if (!strcasecmp(str, "lock"))     return NX_ALPHASHIFTMASK;
+    if (!strcasecmp(str, "fn"))       return NX_SECONDARYFNMASK;
+    if (!strcasecmp(str, "help"))     return NX_HELPMASK;
+    if (!strcasecmp(str, "numlock"))  return NX_NUMERICPADMASK;
+    return 0;
+}
+
+/*
+ * LegalModifier
+ *      This allows the ddx layer to prevent some keys from being remapped
+ *      as modifier keys.
+ */
+Bool LegalModifier(unsigned int key, DeviceIntPtr pDev)
+{
+    return 1;
+}
+
+static inline UniChar macroman2ucs(unsigned char c) {
+    /* Precalculated table mapping MacRoman-128 to Unicode. Generated
+       by creating single element CFStringRefs then extracting the
+       first character. */
+
+    static const unsigned short table[128] = {
+        0xc4, 0xc5, 0xc7, 0xc9, 0xd1, 0xd6, 0xdc, 0xe1,
+        0xe0, 0xe2, 0xe4, 0xe3, 0xe5, 0xe7, 0xe9, 0xe8,
+        0xea, 0xeb, 0xed, 0xec, 0xee, 0xef, 0xf1, 0xf3,
+        0xf2, 0xf4, 0xf6, 0xf5, 0xfa, 0xf9, 0xfb, 0xfc,
+        0x2020, 0xb0, 0xa2, 0xa3, 0xa7, 0x2022, 0xb6, 0xdf,
+        0xae, 0xa9, 0x2122, 0xb4, 0xa8, 0x2260, 0xc6, 0xd8,
+        0x221e, 0xb1, 0x2264, 0x2265, 0xa5, 0xb5, 0x2202, 0x2211,
+        0x220f, 0x3c0, 0x222b, 0xaa, 0xba, 0x3a9, 0xe6, 0xf8,
+        0xbf, 0xa1, 0xac, 0x221a, 0x192, 0x2248, 0x2206, 0xab,
+        0xbb, 0x2026, 0xa0, 0xc0, 0xc3, 0xd5, 0x152, 0x153,
+        0x2013, 0x2014, 0x201c, 0x201d, 0x2018, 0x2019, 0xf7, 0x25ca,
+        0xff, 0x178, 0x2044, 0x20ac, 0x2039, 0x203a, 0xfb01, 0xfb02,
+        0x2021, 0xb7, 0x201a, 0x201e, 0x2030, 0xc2, 0xca, 0xc1,
+        0xcb, 0xc8, 0xcd, 0xce, 0xcf, 0xcc, 0xd3, 0xd4,
+        0xf8ff, 0xd2, 0xda, 0xdb, 0xd9, 0x131, 0x2c6, 0x2dc,
+        0xaf, 0x2d8, 0x2d9, 0x2da, 0xb8, 0x2dd, 0x2db, 0x2c7,
+    };
+
+    if (c < 128) return c;
+    else         return table[c - 128];
+}
+
+static KeySym make_dead_key(KeySym in) {
+    int i;
+
+    for (i = 0; i < sizeof (dead_keys) / sizeof (dead_keys[0]); i++)
+        if (dead_keys[i].normal == in) return dead_keys[i].dead;
+
+    return in;
+}
+
+static Bool QuartzReadSystemKeymap(darwinKeyboardInfo *info) {
+#if !defined(__LP64__) || MAC_OS_X_VERSION_MIN_REQUIRED < 1050
+    KeyboardLayoutRef key_layout;
+    int is_uchr = 1;
+#endif
+    const void *chr_data = NULL;
+    int num_keycodes = NUM_KEYCODES;
+    UInt32 keyboard_type = LMGetKbdType();
+    int i, j;
+    OSStatus err;
+    KeySym *k;
+    CFDataRef currentKeyLayoutDataRef = NULL;
+
+#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050
+    TISInputSourceRef currentKeyLayoutRef = TISCopyCurrentKeyboardLayoutInputSource();
+
+    if (currentKeyLayoutRef) {
+      currentKeyLayoutDataRef = (CFDataRef )TISGetInputSourceProperty(currentKeyLayoutRef, kTISPropertyUnicodeKeyLayoutData);
+      if (currentKeyLayoutDataRef)
+          chr_data = CFDataGetBytePtr(currentKeyLayoutDataRef);
+    }
+#endif
+
+#if !defined(__LP64__) || MAC_OS_X_VERSION_MIN_REQUIRED < 1050
+    if (chr_data == NULL) {
+#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050
+        ErrorF("X11.app: Error detected in determining keyboard layout.  If you are using an Apple-provided keyboard layout, please report this error at http://xquartz.macosforge.org and http://bugreport.apple.com\n");
+        ErrorF("X11.app: Debug Info: keyboard_type=%u, currentKeyLayoutRef=%p, currentKeyLayoutDataRef=%p, chr_data=%p\n",
+               (unsigned)keyboard_type, currentKeyLayoutRef, currentKeyLayoutDataRef, chr_data);
+#endif
+
+        KLGetCurrentKeyboardLayout (&key_layout);
+        KLGetKeyboardLayoutProperty (key_layout, kKLuchrData, &chr_data);
+
+#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050
+        if(chr_data != NULL) {
+            ErrorF("X11.app: Fallback succeeded, but this is still a bug.  Please report the above information.\n");
+        }
+#endif
+    }
+
+    if (chr_data == NULL) {
+        ErrorF("X11.app: Debug Info: kKLuchrData failed, trying kKLKCHRData.\n");
+        ErrorF("If you are using a 3rd party keyboard layout, please see http://xquartz.macosforge.org/trac/ticket/154\n");
+        KLGetKeyboardLayoutProperty (key_layout, kKLKCHRData, &chr_data);
+        is_uchr = 0;
+        num_keycodes = 128;
+        
+#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050
+        if(chr_data != NULL) {
+            ErrorF("X11.app: Fallback succeeded, but this is still a bug.  Please report the above information.\n");
+        }
+#endif
+    }
+#endif
+
+#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050
+    if(currentKeyLayoutRef)
+        CFRelease(currentKeyLayoutRef);
+#endif
+    
+    if (chr_data == NULL) {
+      ErrorF ( "Couldn't get uchr or kchr resource\n");
+      return FALSE;
+    }
+    
+    /* Scan the keycode range for the Unicode character that each
+       key produces in the four shift states. Then convert that to
+       an X11 keysym (which may just the bit that says "this is
+       Unicode" if it can't find the real symbol.) */
+       
+    /* KeyTranslate is not available on 64-bit platforms; UCKeyTranslate
+       must be used instead. */
+
+    for (i = 0; i < num_keycodes; i++) {
+        static const int mods[4] = {0, MOD_SHIFT, MOD_OPTION,
+                                    MOD_OPTION | MOD_SHIFT};
+
+        k = info->keyMap + i * GLYPHS_PER_KEY;
+
+        for (j = 0; j < 4; j++) {
+#if !defined(__LP64__) || MAC_OS_X_VERSION_MIN_REQUIRED < 1050
+            if (is_uchr)  {
+#endif
+                UniChar s[8];
+                UniCharCount len;
+                UInt32 dead_key_state = 0, extra_dead = 0;
+
+                err = UCKeyTranslate (chr_data, i, kUCKeyActionDown,
+                                      mods[j] >> 8, keyboard_type, 0,
+                                      &dead_key_state, 8, &len, s);
+                if (err != noErr) continue;
+
+                if (len == 0 && dead_key_state != 0) {
+                    /* Found a dead key. Work out which one it is, but
+                       remembering that it's dead. */
+                    err = UCKeyTranslate (chr_data, i, kUCKeyActionDown,
+                                          mods[j] >> 8, keyboard_type,
+                                          kUCKeyTranslateNoDeadKeysMask,
+                                          &extra_dead, 8, &len, s);
+                    if (err != noErr) continue;
+                }
+
+                /* Not sure why 0x0010 is there.
+                 * 0x0000 - <rdar://problem/7793566> 'Unicode Hex Input' ...
+                 */
+                if (len > 0 && s[0] != 0x0010 && s[0] != 0x0000) {
+                    k[j] = ucs2keysym (s[0]);
+                    if (dead_key_state != 0) k[j] = make_dead_key (k[j]);
+                }
+#if !defined(__LP64__) || MAC_OS_X_VERSION_MIN_REQUIRED < 1050
+            } else { // kchr
+	      UInt32 c, state = 0, state2 = 0;
+                UInt16 code;
+
+                code = i | mods[j];
+                c = KeyTranslate (chr_data, code, &state);
+
+                /* Dead keys are only processed on key-down, so ask
+                   to translate those events. When we find a dead key,
+                   translating the matching key up event will give
+                   us the actual dead character. */
+
+                if (state != 0)
+                    c = KeyTranslate (chr_data, code | 128, &state2);
+
+                /* Characters seem to be in MacRoman encoding. */
+
+                if (c != 0 && c != 0x0010) {
+                    k[j] = ucs2keysym (macroman2ucs (c & 255));
+
+                    if (state != 0) k[j] = make_dead_key (k[j]);
+                }
+            }
+#endif
+        }
+
+        if (k[3] == k[2]) k[3] = NoSymbol;
+        if (k[1] == k[0]) k[1] = NoSymbol;
+        if (k[0] == k[2] && k[1] == k[3]) k[2] = k[3] = NoSymbol;
+        if (k[3] == k[0] && k[2] == k[1] && k[2] == NoSymbol) k[3] = NoSymbol;
+    }
+
+#if HACK_MISSING
+    /* Fix up some things that are normally missing.. */
+    
+    for (i = 0; i < sizeof (known_keys) / sizeof (known_keys[0]); i++) {
+        k = info->keyMap + known_keys[i].keycode * GLYPHS_PER_KEY;
+        
+        if (   k[0] == NoSymbol && k[1] == NoSymbol
+            && k[2] == NoSymbol && k[3] == NoSymbol)
+            k[0] = known_keys[i].keysym;
+    }
+#endif
+    
+#if HACK_KEYPAD
+    /* And some more things. We find the right symbols for the numeric
+     keypad, but not the KP_ keysyms. So try to convert known keycodes. */
+    for (i = 0; i < sizeof (known_numeric_keys) / sizeof (known_numeric_keys[0]); i++) {
+        k = info->keyMap + known_numeric_keys[i].keycode * GLYPHS_PER_KEY;
+        
+        if (k[0] == known_numeric_keys[i].normal)
+            k[0] = known_numeric_keys[i].keypad;
+    }
+#endif
+    
+#if HACK_BLACKLIST
+    for (i = 0; i < sizeof (keycode_blacklist) / sizeof (keycode_blacklist[0]); i++) {
+        k = info->keyMap + keycode_blacklist[i] * GLYPHS_PER_KEY;
+        k[0] = k[1] = k[2] = k[3] = NoSymbol;
+    }
+#endif
+
+    DarwinBuildModifierMaps(info);
+
+    return TRUE;
+}
+
+Bool QuartsResyncKeymap(Bool sendDDXEvent) {
+    Bool retval;
+    /* Update keyInfo */
+    pthread_mutex_lock(&keyInfo_mutex);
+    memset(keyInfo.keyMap, 0, sizeof(keyInfo.keyMap));
+    retval = QuartzReadSystemKeymap(&keyInfo);
+    pthread_mutex_unlock(&keyInfo_mutex);
+
+    /* Tell server thread to deal with new keyInfo */
+    if(sendDDXEvent)
+        DarwinSendDDXEvent(kXquartzReloadKeymap, 0);
+
+    return retval;
+}
diff --git a/xorg-server/hw/xquartz/quartzStartup.c b/xorg-server/hw/xquartz/quartzStartup.c
index ba92ecef6..36c8182ae 100644
--- a/xorg-server/hw/xquartz/quartzStartup.c
+++ b/xorg-server/hw/xquartz/quartzStartup.c
@@ -40,7 +40,6 @@
 #include "X11Controller.h"
 #include "darwin.h"
 #include "darwinEvents.h"
-#include "quartzAudio.h"
 #include "quartz.h"
 #include "opaque.h"
 #include "micmap.h"
@@ -117,9 +116,6 @@ int server_main(int argc, char **argv, char **envp) {
         }
     }
 
-    /* Create the audio mutex */
-    QuartzAudioInit();
-
     X11ControllerMain(argc, argv, envp);
     exit(0);
 }