Checked in the following released items:

xkeyboard-config-1.4.tar.gz
ttf-bitstream-vera-1.10.tar.gz
font-alias-1.0.1.tar.gz
font-sun-misc-1.0.0.tar.gz
font-sun-misc-1.0.0.tar.gz
font-sony-misc-1.0.0.tar.gz
font-schumacher-misc-1.0.0.tar.gz
font-mutt-misc-1.0.0.tar.gz
font-misc-misc-1.0.0.tar.gz
font-misc-meltho-1.0.0.tar.gz
font-micro-misc-1.0.0.tar.gz
font-jis-misc-1.0.0.tar.gz
font-isas-misc-1.0.0.tar.gz
font-dec-misc-1.0.0.tar.gz
font-daewoo-misc-1.0.0.tar.gz
font-cursor-misc-1.0.0.tar.gz
font-arabic-misc-1.0.0.tar.gz
font-winitzki-cyrillic-1.0.0.tar.gz
font-misc-cyrillic-1.0.0.tar.gz
font-cronyx-cyrillic-1.0.0.tar.gz
font-screen-cyrillic-1.0.1.tar.gz
font-xfree86-type1-1.0.1.tar.gz
font-adobe-utopia-type1-1.0.1.tar.gz
font-ibm-type1-1.0.0.tar.gz
font-bitstream-type1-1.0.0.tar.gz
font-bitstream-speedo-1.0.0.tar.gz
font-bh-ttf-1.0.0.tar.gz
font-bh-type1-1.0.0.tar.gz
font-bitstream-100dpi-1.0.0.tar.gz
font-bh-lucidatypewriter-100dpi-1.0.0.tar.gz
font-bh-100dpi-1.0.0.tar.gz
font-adobe-utopia-100dpi-1.0.1.tar.gz
font-adobe-100dpi-1.0.0.tar.gz
font-util-1.0.1.tar.gz
font-bitstream-75dpi-1.0.0.tar.gz
font-bh-lucidatypewriter-75dpi-1.0.0.tar.gz
font-adobe-utopia-75dpi-1.0.1.tar.gz
font-bh-75dpi-1.0.0.tar.gz
bdftopcf-1.0.1.tar.gz
font-adobe-75dpi-1.0.0.tar.gz
mkfontscale-1.0.6.tar.gz
openssl-0.9.8k.tar.gz
bigreqsproto-1.0.2.tar.gz
xtrans-1.2.2.tar.gz
resourceproto-1.0.2.tar.gz
inputproto-1.4.4.tar.gz
compositeproto-0.4.tar.gz
damageproto-1.1.0.tar.gz
zlib-1.2.3.tar.gz
xkbcomp-1.0.5.tar.gz
freetype-2.3.9.tar.gz
pthreads-w32-2-8-0-release.tar.gz
pixman-0.12.0.tar.gz
kbproto-1.0.3.tar.gz
evieext-1.0.2.tar.gz
fixesproto-4.0.tar.gz
recordproto-1.13.2.tar.gz
randrproto-1.2.2.tar.gz
scrnsaverproto-1.1.0.tar.gz
renderproto-0.9.3.tar.gz
xcmiscproto-1.1.2.tar.gz
fontsproto-2.0.2.tar.gz
xextproto-7.0.3.tar.gz
xproto-7.0.14.tar.gz
libXdmcp-1.0.2.tar.gz
libxkbfile-1.0.5.tar.gz
libfontenc-1.0.4.tar.gz
libXfont-1.3.4.tar.gz
libX11-1.1.5.tar.gz
libXau-1.0.4.tar.gz
libxcb-1.1.tar.gz
xorg-server-1.5.3.tar.gz

8 files changed, 3914 insertions, 0 deletions

diff --git a/xorg-server/hw/xgl/glx/Makefile.am b/xorg-server/hw/xgl/glx/Makefile.am
new file mode 100644
index 000000000..ea34ea460
--- /dev/null
+++ b/xorg-server/hw/xgl/glx/Makefile.am
@@ -0,0 +1,48 @@
+if XGL
+XGL_MODULE_DIRS = module
+endif
+
+DIST_SUBDIRS = module
+
+SUBDIRS =		  \
+	.		  \
+	$(XGL_MODULE_DIRS)
+
+AM_CFLAGS = \
+	-I$(srcdir)/.. \
+	-I$(srcdir)/../glxext \
+	-I$(top_srcdir)/glx \
+	-I$(top_srcdir)/GL/include \
+	-I@MESA_SOURCE@/include \
+	-I@MESA_SOURCE@/src/mesa/glapi \
+	 $(DIX_CFLAGS) \
+	-DHAVE_XGL_CONFIG_H \
+	-DHAVE_DIX_CONFIG_H \
+	$(XGLXMODULES_CFLAGS)
+
+noinst_LTLIBRARIES = libxglx.la
+
+libxglx_la_SOURCES = \
+	xglx.h	     \
+	xglx.c	     \
+	xglxorg.c
+
+# Xglx_DEPENDENCIES = @XGLX_LIBS@
+# Xglx_LDFLAGS	  = -export-dynamic
+# Xglx_SOURCES	  = \
+#	xglxinit.c \
+#	$(top_srcdir)/mi/miinitext.c \
+#	$(top_srcdir)/Xext/dpmsstubs.c \
+#	$(top_srcdir)/Xi/stubs.c \
+#	$(top_srcdir)/fb/fbcmap.c
+#Xglx_LDADD = \
+#	libxglx.la \
+#	../libxgl.a \
+#	$(XORG_CORE_LIBS) \
+#	$(XGLX_LIBS) \
+#	$(EXTENSION_LIBS) \
+#	$(XGLXMODULES_LIBS) \
+#	-lXrandr
+#Xglx_programs	  = Xglx
+#
+#bin_PROGRAMS = $(Xglx_programs)
diff --git a/xorg-server/hw/xgl/glx/Makefile.in b/xorg-server/hw/xgl/glx/Makefile.in
new file mode 100644
index 000000000..17563358a
--- /dev/null
+++ b/xorg-server/hw/xgl/glx/Makefile.in
@@ -0,0 +1,797 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = hw/xgl/glx
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/include/do-not-use-config.h \
+	$(top_builddir)/include/xorg-server.h \
+	$(top_builddir)/include/dix-config.h \
+	$(top_builddir)/include/xgl-config.h \
+	$(top_builddir)/include/xorg-config.h \
+	$(top_builddir)/include/xkb-config.h \
+	$(top_builddir)/include/xwin-config.h \
+	$(top_builddir)/include/kdrive-config.h
+CONFIG_CLEAN_FILES =
+LTLIBRARIES = $(noinst_LTLIBRARIES)
+libxglx_la_LIBADD =
+am_libxglx_la_OBJECTS = xglx.lo xglxorg.lo
+libxglx_la_OBJECTS = $(am_libxglx_la_OBJECTS)
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
+SOURCES = $(libxglx_la_SOURCES)
+DIST_SOURCES = $(libxglx_la_SOURCES)
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+	html-recursive info-recursive install-data-recursive \
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
+ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
+ALLOCA = @ALLOCA@
+AMTAR = @AMTAR@
+APPDEFAULTDIR = @APPDEFAULTDIR@
+APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@
+APP_MAN_DIR = @APP_MAN_DIR@
+APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
+AR = @AR@
+AS = @AS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BASE_FONT_PATH = @BASE_FONT_PATH@
+BUILD_DATE = @BUILD_DATE@
+BUILD_TIME = @BUILD_TIME@
+CC = @CC@
+CCAS = @CCAS@
+CCASDEPMODE = @CCASDEPMODE@
+CCASFLAGS = @CCASFLAGS@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DARWIN_LIBS = @DARWIN_LIBS@
+DBUS_CFLAGS = @DBUS_CFLAGS@
+DBUS_LIBS = @DBUS_LIBS@
+DEFAULT_LIBRARY_PATH = @DEFAULT_LIBRARY_PATH@
+DEFAULT_LOGPREFIX = @DEFAULT_LOGPREFIX@
+DEFAULT_MODULE_PATH = @DEFAULT_MODULE_PATH@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DGA_CFLAGS = @DGA_CFLAGS@
+DGA_LIBS = @DGA_LIBS@
+DIX_CFLAGS = @DIX_CFLAGS@
+DLLTOOL = @DLLTOOL@
+DMXEXAMPLES_DEP_CFLAGS = @DMXEXAMPLES_DEP_CFLAGS@
+DMXEXAMPLES_DEP_LIBS = @DMXEXAMPLES_DEP_LIBS@
+DMXMODULES_CFLAGS = @DMXMODULES_CFLAGS@
+DMXMODULES_LIBS = @DMXMODULES_LIBS@
+DMXXIEXAMPLES_DEP_CFLAGS = @DMXXIEXAMPLES_DEP_CFLAGS@
+DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@
+DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@
+DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@
+DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@
+DRI2PROTO_LIBS = @DRI2PROTO_LIBS@
+DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@
+DRIPROTO_LIBS = @DRIPROTO_LIBS@
+DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
+DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
+DRI_DRIVER_PATH = @DRI_DRIVER_PATH@
+DSYMUTIL = @DSYMUTIL@
+DTRACE = @DTRACE@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+FFLAGS = @FFLAGS@
+FILE_MAN_DIR = @FILE_MAN_DIR@
+FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
+FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+FREETYPE_LIBS = @FREETYPE_LIBS@
+GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@
+GLX_DEFINES = @GLX_DEFINES@
+GL_CFLAGS = @GL_CFLAGS@
+GL_LIBS = @GL_LIBS@
+GREP = @GREP@
+HAL_CFLAGS = @HAL_CFLAGS@
+HAL_LIBS = @HAL_LIBS@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+KDRIVE_CFLAGS = @KDRIVE_CFLAGS@
+KDRIVE_INCS = @KDRIVE_INCS@
+KDRIVE_LIBS = @KDRIVE_LIBS@
+KDRIVE_LOCAL_LIBS = @KDRIVE_LOCAL_LIBS@
+KDRIVE_PURE_INCS = @KDRIVE_PURE_INCS@
+KDRIVE_PURE_LIBS = @KDRIVE_PURE_LIBS@
+LAUNCHD = @LAUNCHD@
+LDFLAGS = @LDFLAGS@
+LD_EXPORT_SYMBOLS_FLAG = @LD_EXPORT_SYMBOLS_FLAG@
+LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBDRM_CFLAGS = @LIBDRM_CFLAGS@
+LIBDRM_LIBS = @LIBDRM_LIBS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIB_MAN_DIR = @LIB_MAN_DIR@
+LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
+LINUXDOC = @LINUXDOC@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MAKE_HTML = @MAKE_HTML@
+MAKE_PDF = @MAKE_PDF@
+MAKE_PS = @MAKE_PS@
+MAKE_TEXT = @MAKE_TEXT@
+MESA_SOURCE = @MESA_SOURCE@
+MISC_MAN_DIR = @MISC_MAN_DIR@
+MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+MKDIR_P = @MKDIR_P@
+MKFONTDIR = @MKFONTDIR@
+MKFONTSCALE = @MKFONTSCALE@
+NMEDIT = @NMEDIT@
+OBJC = @OBJC@
+OBJCCLD = @OBJCCLD@
+OBJCDEPMODE = @OBJCDEPMODE@
+OBJCFLAGS = @OBJCFLAGS@
+OBJCLINK = @OBJCLINK@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OPENSSL_CFLAGS = @OPENSSL_CFLAGS@
+OPENSSL_LIBS = @OPENSSL_LIBS@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
+PCIACCESS_LIBS = @PCIACCESS_LIBS@
+PCI_TXT_IDS_PATH = @PCI_TXT_IDS_PATH@
+PERL = @PERL@
+PKG_CONFIG = @PKG_CONFIG@
+PROJECTROOT = @PROJECTROOT@
+PS2PDF = @PS2PDF@
+RANLIB = @RANLIB@
+RAWCPP = @RAWCPP@
+RAWCPPFLAGS = @RAWCPPFLAGS@
+SED = @SED@
+SERVER_MISC_CONFIG_PATH = @SERVER_MISC_CONFIG_PATH@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@
+SOLARIS_INOUT_ARCH = @SOLARIS_INOUT_ARCH@
+STRIP = @STRIP@
+TSLIB_CFLAGS = @TSLIB_CFLAGS@
+TSLIB_LIBS = @TSLIB_LIBS@
+UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
+VENDOR_MAN_VERSION = @VENDOR_MAN_VERSION@
+VENDOR_NAME = @VENDOR_NAME@
+VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
+VENDOR_RELEASE = @VENDOR_RELEASE@
+VERSION = @VERSION@
+X11APP_ARCHS = @X11APP_ARCHS@
+X11EXAMPLES_DEP_CFLAGS = @X11EXAMPLES_DEP_CFLAGS@
+X11EXAMPLES_DEP_LIBS = @X11EXAMPLES_DEP_LIBS@
+XDMCP_CFLAGS = @XDMCP_CFLAGS@
+XDMCP_LIBS = @XDMCP_LIBS@
+XDMXCONFIG_DEP_CFLAGS = @XDMXCONFIG_DEP_CFLAGS@
+XDMXCONFIG_DEP_LIBS = @XDMXCONFIG_DEP_LIBS@
+XDMX_CFLAGS = @XDMX_CFLAGS@
+XDMX_LIBS = @XDMX_LIBS@
+XDMX_SYS_LIBS = @XDMX_SYS_LIBS@
+XEGLMODULES_CFLAGS = @XEGLMODULES_CFLAGS@
+XEGL_LIBS = @XEGL_LIBS@
+XEGL_SYS_LIBS = @XEGL_SYS_LIBS@
+XEPHYR_CFLAGS = @XEPHYR_CFLAGS@
+XEPHYR_DRI_LIBS = @XEPHYR_DRI_LIBS@
+XEPHYR_INCS = @XEPHYR_INCS@
+XEPHYR_LIBS = @XEPHYR_LIBS@
+XF86CONFIGFILE = @XF86CONFIGFILE@
+XF86MISC_CFLAGS = @XF86MISC_CFLAGS@
+XF86MISC_LIBS = @XF86MISC_LIBS@
+XF86VIDMODE_CFLAGS = @XF86VIDMODE_CFLAGS@
+XF86VIDMODE_LIBS = @XF86VIDMODE_LIBS@
+XGLMODULES_CFLAGS = @XGLMODULES_CFLAGS@
+XGLMODULES_LIBS = @XGLMODULES_LIBS@
+XGLXMODULES_CFLAGS = @XGLXMODULES_CFLAGS@
+XGLXMODULES_LIBS = @XGLXMODULES_LIBS@
+XGLX_LIBS = @XGLX_LIBS@
+XGLX_SYS_LIBS = @XGLX_SYS_LIBS@
+XGL_LIBS = @XGL_LIBS@
+XGL_MODULE_PATH = @XGL_MODULE_PATH@
+XGL_SYS_LIBS = @XGL_SYS_LIBS@
+XKB_BASE_DIRECTORY = @XKB_BASE_DIRECTORY@
+XKB_BIN_DIRECTORY = @XKB_BIN_DIRECTORY@
+XKB_COMPILED_DIR = @XKB_COMPILED_DIR@
+XKM_OUTPUT_DIR = @XKM_OUTPUT_DIR@
+XLIB_CFLAGS = @XLIB_CFLAGS@
+XLIB_LIBS = @XLIB_LIBS@
+XNESTMODULES_CFLAGS = @XNESTMODULES_CFLAGS@
+XNESTMODULES_LIBS = @XNESTMODULES_LIBS@
+XNEST_LIBS = @XNEST_LIBS@
+XNEST_SYS_LIBS = @XNEST_SYS_LIBS@
+XORGCFG_DEP_CFLAGS = @XORGCFG_DEP_CFLAGS@
+XORGCFG_DEP_LIBS = @XORGCFG_DEP_LIBS@
+XORGCONFIG_DEP_CFLAGS = @XORGCONFIG_DEP_CFLAGS@
+XORGCONFIG_DEP_LIBS = @XORGCONFIG_DEP_LIBS@
+XORG_CFLAGS = @XORG_CFLAGS@
+XORG_INCS = @XORG_INCS@
+XORG_LIBS = @XORG_LIBS@
+XORG_MODULES_CFLAGS = @XORG_MODULES_CFLAGS@
+XORG_MODULES_LIBS = @XORG_MODULES_LIBS@
+XORG_OS = @XORG_OS@
+XORG_OS_SUBDIR = @XORG_OS_SUBDIR@
+XORG_SYS_LIBS = @XORG_SYS_LIBS@
+XPRINTMODULES_CFLAGS = @XPRINTMODULES_CFLAGS@
+XPRINTMODULES_LIBS = @XPRINTMODULES_LIBS@
+XPRINTPROTO_CFLAGS = @XPRINTPROTO_CFLAGS@
+XPRINTPROTO_LIBS = @XPRINTPROTO_LIBS@
+XPRINT_CFLAGS = @XPRINT_CFLAGS@
+XPRINT_LIBS = @XPRINT_LIBS@
+XPRINT_SYS_LIBS = @XPRINT_SYS_LIBS@
+XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@
+XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@
+XSDL_INCS = @XSDL_INCS@
+XSDL_LIBS = @XSDL_LIBS@
+XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@
+XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@
+XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@
+XSERVERLIBS_LIBS = @XSERVERLIBS_LIBS@
+XSERVER_LIBS = @XSERVER_LIBS@
+XSERVER_SYS_LIBS = @XSERVER_SYS_LIBS@
+XTSTEXAMPLES_DEP_CFLAGS = @XTSTEXAMPLES_DEP_CFLAGS@
+XTSTEXAMPLES_DEP_LIBS = @XTSTEXAMPLES_DEP_LIBS@
+XVFB_LIBS = @XVFB_LIBS@
+XVFB_SYS_LIBS = @XVFB_SYS_LIBS@
+XWINMODULES_CFLAGS = @XWINMODULES_CFLAGS@
+XWINMODULES_LIBS = @XWINMODULES_LIBS@
+XWIN_LIBS = @XWIN_LIBS@
+XWIN_SERVER_NAME = @XWIN_SERVER_NAME@
+XWIN_SYS_LIBS = @XWIN_SYS_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
+__XCONFIGFILE__ = @__XCONFIGFILE__@
+abi_ansic = @abi_ansic@
+abi_extension = @abi_extension@
+abi_font = @abi_font@
+abi_videodrv = @abi_videodrv@
+abi_xinput = @abi_xinput@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+driverdir = @driverdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+extdir = @extdir@
+ft_config = @ft_config@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+launchagentsdir = @launchagentsdir@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+logdir = @logdir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+moduledir = @moduledir@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sdkdir = @sdkdir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+xglmoduledir = @xglmoduledir@
+xpconfigdir = @xpconfigdir@
+@XGL_TRUE@XGL_MODULE_DIRS = module
+DIST_SUBDIRS = module
+SUBDIRS = \
+	.		  \
+	$(XGL_MODULE_DIRS)
+
+AM_CFLAGS = \
+	-I$(srcdir)/.. \
+	-I$(srcdir)/../glxext \
+	-I$(top_srcdir)/glx \
+	-I$(top_srcdir)/GL/include \
+	-I@MESA_SOURCE@/include \
+	-I@MESA_SOURCE@/src/mesa/glapi \
+	 $(DIX_CFLAGS) \
+	-DHAVE_XGL_CONFIG_H \
+	-DHAVE_DIX_CONFIG_H \
+	$(XGLXMODULES_CFLAGS)
+
+noinst_LTLIBRARIES = libxglx.la
+libxglx_la_SOURCES = \
+	xglx.h	     \
+	xglx.c	     \
+	xglxorg.c
+
+all: all-recursive
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  hw/xgl/glx/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign  hw/xgl/glx/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+clean-noinstLTLIBRARIES:
+	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+	@list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
+	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+	  test "$$dir" != "$$p" || dir=.; \
+	  echo "rm -f \"$${dir}/so_locations\""; \
+	  rm -f "$${dir}/so_locations"; \
+	done
+libxglx.la: $(libxglx_la_OBJECTS) $(libxglx_la_DEPENDENCIES) 
+	$(LINK)  $(libxglx_la_OBJECTS) $(libxglx_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xglx.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xglxorg.Plo@am__quote@
+
+.c.o:
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
+
+.c.obj:
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+.c.lo:
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run `make' without going through this Makefile.
+# To change the values of `make' variables: instead of editing Makefiles,
+# (1) if the variable is set in `config.status', edit `config.status'
+#     (which will cause the Makefiles to be regenerated when you run `make');
+# (2) otherwise, pass the desired values on the `make' command line.
+$(RECURSIVE_TARGETS):
+	@failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
+	dot_seen=no; \
+	target=`echo $@ | sed s/-recursive//`; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+$(RECURSIVE_CLEAN_TARGETS):
+	@failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
+	dot_seen=no; \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	rev=''; for subdir in $$list; do \
+	  if test "$$subdir" = "."; then :; else \
+	    rev="$$subdir $$rev"; \
+	  fi; \
+	done; \
+	rev="$$rev ."; \
+	target=`echo $@ | sed s/-recursive//`; \
+	for subdir in $$rev; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done && test -z "$$fail"
+tags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	done
+ctags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	done
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+	  include_option=--etags-include; \
+	  empty_fix=.; \
+	else \
+	  include_option=--include; \
+	  empty_fix=; \
+	fi; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test ! -f $$subdir/TAGS || \
+	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+	  fi; \
+	done; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
+ctags: CTAGS
+CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test -d "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
+	    || exit 1; \
+	    distdir=`$(am__cd) $(distdir) && pwd`; \
+	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+	    (cd $$subdir && \
+	      $(MAKE) $(AM_MAKEFLAGS) \
+	        top_distdir="$$top_distdir" \
+	        distdir="$$distdir/$$subdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
+	        distdir) \
+	      || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-recursive
+all-am: Makefile $(LTLIBRARIES)
+installdirs: installdirs-recursive
+installdirs-am:
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-recursive
+
+clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
+	mostlyclean-am
+
+distclean: distclean-recursive
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-recursive
+
+dvi-am:
+
+html: html-recursive
+
+info: info-recursive
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-recursive
+
+install-exec-am:
+
+install-html: install-html-recursive
+
+install-info: install-info-recursive
+
+install-man:
+
+install-pdf: install-pdf-recursive
+
+install-ps: install-ps-recursive
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-recursive
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+	install-strip
+
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am check check-am clean clean-generic clean-libtool \
+	clean-noinstLTLIBRARIES ctags ctags-recursive distclean \
+	distclean-compile distclean-generic distclean-libtool \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	installdirs-am maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
+	uninstall uninstall-am
+
+
+# Xglx_DEPENDENCIES = @XGLX_LIBS@
+# Xglx_LDFLAGS	  = -export-dynamic
+# Xglx_SOURCES	  = \
+#	xglxinit.c \
+#	$(top_srcdir)/mi/miinitext.c \
+#	$(top_srcdir)/Xext/dpmsstubs.c \
+#	$(top_srcdir)/Xi/stubs.c \
+#	$(top_srcdir)/fb/fbcmap.c
+#Xglx_LDADD = \
+#	libxglx.la \
+#	../libxgl.a \
+#	$(XORG_CORE_LIBS) \
+#	$(XGLX_LIBS) \
+#	$(EXTENSION_LIBS) \
+#	$(XGLXMODULES_LIBS) \
+#	-lXrandr
+#Xglx_programs	  = Xglx
+#
+#bin_PROGRAMS = $(Xglx_programs)
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/xorg-server/hw/xgl/glx/module/Makefile.am b/xorg-server/hw/xgl/glx/module/Makefile.am
new file mode 100644
index 000000000..bd1c4b08f
--- /dev/null
+++ b/xorg-server/hw/xgl/glx/module/Makefile.am
@@ -0,0 +1,21 @@
+if GLX
+GLX_LIB = $(top_builddir)/hw/xgl/glxext/libxglglxext.la
+endif
+
+AM_CFLAGS = $(DIX_CFLAGS) \
+	-I$(srcdir)/.. \
+	-I$(srcdir)/../.. \
+	$(XGLXMODULES_CFLAGS)
+
+libxglx_la_DEPENDENCIES = $(GLX_LIB)
+libxglx_la_LDFLAGS = -avoid-version
+libxglx_la_SOURCES = xglxmodule.c
+libxglx_la_LIBADD = \
+	$(top_builddir)/hw/xgl/glx/libxglx.la \
+	$(GLX_LIB) \
+	$(XGLXMODULES_LIBS) \
+	-lXrandr
+
+moduledir = @xglmoduledir@
+
+module_LTLIBRARIES = libxglx.la
diff --git a/xorg-server/hw/xgl/glx/module/Makefile.in b/xorg-server/hw/xgl/glx/module/Makefile.in
new file mode 100644
index 000000000..d84bdb070
--- /dev/null
+++ b/xorg-server/hw/xgl/glx/module/Makefile.in
@@ -0,0 +1,688 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = hw/xgl/glx/module
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/include/do-not-use-config.h \
+	$(top_builddir)/include/xorg-server.h \
+	$(top_builddir)/include/dix-config.h \
+	$(top_builddir)/include/xgl-config.h \
+	$(top_builddir)/include/xorg-config.h \
+	$(top_builddir)/include/xkb-config.h \
+	$(top_builddir)/include/xwin-config.h \
+	$(top_builddir)/include/kdrive-config.h
+CONFIG_CLEAN_FILES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(moduledir)"
+moduleLTLIBRARIES_INSTALL = $(INSTALL)
+LTLIBRARIES = $(module_LTLIBRARIES)
+am__DEPENDENCIES_1 =
+am_libxglx_la_OBJECTS = xglxmodule.lo
+libxglx_la_OBJECTS = $(am_libxglx_la_OBJECTS)
+libxglx_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(libxglx_la_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
+SOURCES = $(libxglx_la_SOURCES)
+DIST_SOURCES = $(libxglx_la_SOURCES)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
+ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
+ALLOCA = @ALLOCA@
+AMTAR = @AMTAR@
+APPDEFAULTDIR = @APPDEFAULTDIR@
+APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@
+APP_MAN_DIR = @APP_MAN_DIR@
+APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
+AR = @AR@
+AS = @AS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BASE_FONT_PATH = @BASE_FONT_PATH@
+BUILD_DATE = @BUILD_DATE@
+BUILD_TIME = @BUILD_TIME@
+CC = @CC@
+CCAS = @CCAS@
+CCASDEPMODE = @CCASDEPMODE@
+CCASFLAGS = @CCASFLAGS@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DARWIN_LIBS = @DARWIN_LIBS@
+DBUS_CFLAGS = @DBUS_CFLAGS@
+DBUS_LIBS = @DBUS_LIBS@
+DEFAULT_LIBRARY_PATH = @DEFAULT_LIBRARY_PATH@
+DEFAULT_LOGPREFIX = @DEFAULT_LOGPREFIX@
+DEFAULT_MODULE_PATH = @DEFAULT_MODULE_PATH@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DGA_CFLAGS = @DGA_CFLAGS@
+DGA_LIBS = @DGA_LIBS@
+DIX_CFLAGS = @DIX_CFLAGS@
+DLLTOOL = @DLLTOOL@
+DMXEXAMPLES_DEP_CFLAGS = @DMXEXAMPLES_DEP_CFLAGS@
+DMXEXAMPLES_DEP_LIBS = @DMXEXAMPLES_DEP_LIBS@
+DMXMODULES_CFLAGS = @DMXMODULES_CFLAGS@
+DMXMODULES_LIBS = @DMXMODULES_LIBS@
+DMXXIEXAMPLES_DEP_CFLAGS = @DMXXIEXAMPLES_DEP_CFLAGS@
+DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@
+DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@
+DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@
+DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@
+DRI2PROTO_LIBS = @DRI2PROTO_LIBS@
+DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@
+DRIPROTO_LIBS = @DRIPROTO_LIBS@
+DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
+DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
+DRI_DRIVER_PATH = @DRI_DRIVER_PATH@
+DSYMUTIL = @DSYMUTIL@
+DTRACE = @DTRACE@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+FFLAGS = @FFLAGS@
+FILE_MAN_DIR = @FILE_MAN_DIR@
+FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
+FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+FREETYPE_LIBS = @FREETYPE_LIBS@
+GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@
+GLX_DEFINES = @GLX_DEFINES@
+GL_CFLAGS = @GL_CFLAGS@
+GL_LIBS = @GL_LIBS@
+GREP = @GREP@
+HAL_CFLAGS = @HAL_CFLAGS@
+HAL_LIBS = @HAL_LIBS@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+KDRIVE_CFLAGS = @KDRIVE_CFLAGS@
+KDRIVE_INCS = @KDRIVE_INCS@
+KDRIVE_LIBS = @KDRIVE_LIBS@
+KDRIVE_LOCAL_LIBS = @KDRIVE_LOCAL_LIBS@
+KDRIVE_PURE_INCS = @KDRIVE_PURE_INCS@
+KDRIVE_PURE_LIBS = @KDRIVE_PURE_LIBS@
+LAUNCHD = @LAUNCHD@
+LDFLAGS = @LDFLAGS@
+LD_EXPORT_SYMBOLS_FLAG = @LD_EXPORT_SYMBOLS_FLAG@
+LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBDRM_CFLAGS = @LIBDRM_CFLAGS@
+LIBDRM_LIBS = @LIBDRM_LIBS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIB_MAN_DIR = @LIB_MAN_DIR@
+LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
+LINUXDOC = @LINUXDOC@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MAKE_HTML = @MAKE_HTML@
+MAKE_PDF = @MAKE_PDF@
+MAKE_PS = @MAKE_PS@
+MAKE_TEXT = @MAKE_TEXT@
+MESA_SOURCE = @MESA_SOURCE@
+MISC_MAN_DIR = @MISC_MAN_DIR@
+MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+MKDIR_P = @MKDIR_P@
+MKFONTDIR = @MKFONTDIR@
+MKFONTSCALE = @MKFONTSCALE@
+NMEDIT = @NMEDIT@
+OBJC = @OBJC@
+OBJCCLD = @OBJCCLD@
+OBJCDEPMODE = @OBJCDEPMODE@
+OBJCFLAGS = @OBJCFLAGS@
+OBJCLINK = @OBJCLINK@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OPENSSL_CFLAGS = @OPENSSL_CFLAGS@
+OPENSSL_LIBS = @OPENSSL_LIBS@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
+PCIACCESS_LIBS = @PCIACCESS_LIBS@
+PCI_TXT_IDS_PATH = @PCI_TXT_IDS_PATH@
+PERL = @PERL@
+PKG_CONFIG = @PKG_CONFIG@
+PROJECTROOT = @PROJECTROOT@
+PS2PDF = @PS2PDF@
+RANLIB = @RANLIB@
+RAWCPP = @RAWCPP@
+RAWCPPFLAGS = @RAWCPPFLAGS@
+SED = @SED@
+SERVER_MISC_CONFIG_PATH = @SERVER_MISC_CONFIG_PATH@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@
+SOLARIS_INOUT_ARCH = @SOLARIS_INOUT_ARCH@
+STRIP = @STRIP@
+TSLIB_CFLAGS = @TSLIB_CFLAGS@
+TSLIB_LIBS = @TSLIB_LIBS@
+UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
+VENDOR_MAN_VERSION = @VENDOR_MAN_VERSION@
+VENDOR_NAME = @VENDOR_NAME@
+VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
+VENDOR_RELEASE = @VENDOR_RELEASE@
+VERSION = @VERSION@
+X11APP_ARCHS = @X11APP_ARCHS@
+X11EXAMPLES_DEP_CFLAGS = @X11EXAMPLES_DEP_CFLAGS@
+X11EXAMPLES_DEP_LIBS = @X11EXAMPLES_DEP_LIBS@
+XDMCP_CFLAGS = @XDMCP_CFLAGS@
+XDMCP_LIBS = @XDMCP_LIBS@
+XDMXCONFIG_DEP_CFLAGS = @XDMXCONFIG_DEP_CFLAGS@
+XDMXCONFIG_DEP_LIBS = @XDMXCONFIG_DEP_LIBS@
+XDMX_CFLAGS = @XDMX_CFLAGS@
+XDMX_LIBS = @XDMX_LIBS@
+XDMX_SYS_LIBS = @XDMX_SYS_LIBS@
+XEGLMODULES_CFLAGS = @XEGLMODULES_CFLAGS@
+XEGL_LIBS = @XEGL_LIBS@
+XEGL_SYS_LIBS = @XEGL_SYS_LIBS@
+XEPHYR_CFLAGS = @XEPHYR_CFLAGS@
+XEPHYR_DRI_LIBS = @XEPHYR_DRI_LIBS@
+XEPHYR_INCS = @XEPHYR_INCS@
+XEPHYR_LIBS = @XEPHYR_LIBS@
+XF86CONFIGFILE = @XF86CONFIGFILE@
+XF86MISC_CFLAGS = @XF86MISC_CFLAGS@
+XF86MISC_LIBS = @XF86MISC_LIBS@
+XF86VIDMODE_CFLAGS = @XF86VIDMODE_CFLAGS@
+XF86VIDMODE_LIBS = @XF86VIDMODE_LIBS@
+XGLMODULES_CFLAGS = @XGLMODULES_CFLAGS@
+XGLMODULES_LIBS = @XGLMODULES_LIBS@
+XGLXMODULES_CFLAGS = @XGLXMODULES_CFLAGS@
+XGLXMODULES_LIBS = @XGLXMODULES_LIBS@
+XGLX_LIBS = @XGLX_LIBS@
+XGLX_SYS_LIBS = @XGLX_SYS_LIBS@
+XGL_LIBS = @XGL_LIBS@
+XGL_MODULE_PATH = @XGL_MODULE_PATH@
+XGL_SYS_LIBS = @XGL_SYS_LIBS@
+XKB_BASE_DIRECTORY = @XKB_BASE_DIRECTORY@
+XKB_BIN_DIRECTORY = @XKB_BIN_DIRECTORY@
+XKB_COMPILED_DIR = @XKB_COMPILED_DIR@
+XKM_OUTPUT_DIR = @XKM_OUTPUT_DIR@
+XLIB_CFLAGS = @XLIB_CFLAGS@
+XLIB_LIBS = @XLIB_LIBS@
+XNESTMODULES_CFLAGS = @XNESTMODULES_CFLAGS@
+XNESTMODULES_LIBS = @XNESTMODULES_LIBS@
+XNEST_LIBS = @XNEST_LIBS@
+XNEST_SYS_LIBS = @XNEST_SYS_LIBS@
+XORGCFG_DEP_CFLAGS = @XORGCFG_DEP_CFLAGS@
+XORGCFG_DEP_LIBS = @XORGCFG_DEP_LIBS@
+XORGCONFIG_DEP_CFLAGS = @XORGCONFIG_DEP_CFLAGS@
+XORGCONFIG_DEP_LIBS = @XORGCONFIG_DEP_LIBS@
+XORG_CFLAGS = @XORG_CFLAGS@
+XORG_INCS = @XORG_INCS@
+XORG_LIBS = @XORG_LIBS@
+XORG_MODULES_CFLAGS = @XORG_MODULES_CFLAGS@
+XORG_MODULES_LIBS = @XORG_MODULES_LIBS@
+XORG_OS = @XORG_OS@
+XORG_OS_SUBDIR = @XORG_OS_SUBDIR@
+XORG_SYS_LIBS = @XORG_SYS_LIBS@
+XPRINTMODULES_CFLAGS = @XPRINTMODULES_CFLAGS@
+XPRINTMODULES_LIBS = @XPRINTMODULES_LIBS@
+XPRINTPROTO_CFLAGS = @XPRINTPROTO_CFLAGS@
+XPRINTPROTO_LIBS = @XPRINTPROTO_LIBS@
+XPRINT_CFLAGS = @XPRINT_CFLAGS@
+XPRINT_LIBS = @XPRINT_LIBS@
+XPRINT_SYS_LIBS = @XPRINT_SYS_LIBS@
+XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@
+XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@
+XSDL_INCS = @XSDL_INCS@
+XSDL_LIBS = @XSDL_LIBS@
+XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@
+XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@
+XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@
+XSERVERLIBS_LIBS = @XSERVERLIBS_LIBS@
+XSERVER_LIBS = @XSERVER_LIBS@
+XSERVER_SYS_LIBS = @XSERVER_SYS_LIBS@
+XTSTEXAMPLES_DEP_CFLAGS = @XTSTEXAMPLES_DEP_CFLAGS@
+XTSTEXAMPLES_DEP_LIBS = @XTSTEXAMPLES_DEP_LIBS@
+XVFB_LIBS = @XVFB_LIBS@
+XVFB_SYS_LIBS = @XVFB_SYS_LIBS@
+XWINMODULES_CFLAGS = @XWINMODULES_CFLAGS@
+XWINMODULES_LIBS = @XWINMODULES_LIBS@
+XWIN_LIBS = @XWIN_LIBS@
+XWIN_SERVER_NAME = @XWIN_SERVER_NAME@
+XWIN_SYS_LIBS = @XWIN_SYS_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
+__XCONFIGFILE__ = @__XCONFIGFILE__@
+abi_ansic = @abi_ansic@
+abi_extension = @abi_extension@
+abi_font = @abi_font@
+abi_videodrv = @abi_videodrv@
+abi_xinput = @abi_xinput@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+driverdir = @driverdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+extdir = @extdir@
+ft_config = @ft_config@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+launchagentsdir = @launchagentsdir@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+logdir = @logdir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+moduledir = @xglmoduledir@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sdkdir = @sdkdir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+xglmoduledir = @xglmoduledir@
+xpconfigdir = @xpconfigdir@
+@GLX_TRUE@GLX_LIB = $(top_builddir)/hw/xgl/glxext/libxglglxext.la
+AM_CFLAGS = $(DIX_CFLAGS) \
+	-I$(srcdir)/.. \
+	-I$(srcdir)/../.. \
+	$(XGLXMODULES_CFLAGS)
+
+libxglx_la_DEPENDENCIES = $(GLX_LIB)
+libxglx_la_LDFLAGS = -avoid-version
+libxglx_la_SOURCES = xglxmodule.c
+libxglx_la_LIBADD = \
+	$(top_builddir)/hw/xgl/glx/libxglx.la \
+	$(GLX_LIB) \
+	$(XGLXMODULES_LIBS) \
+	-lXrandr
+
+module_LTLIBRARIES = libxglx.la
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  hw/xgl/glx/module/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign  hw/xgl/glx/module/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+install-moduleLTLIBRARIES: $(module_LTLIBRARIES)
+	@$(NORMAL_INSTALL)
+	test -z "$(moduledir)" || $(MKDIR_P) "$(DESTDIR)$(moduledir)"
+	@list='$(module_LTLIBRARIES)'; for p in $$list; do \
+	  if test -f $$p; then \
+	    f=$(am__strip_dir) \
+	    echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(moduledir)/$$f'"; \
+	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(moduledir)/$$f"; \
+	  else :; fi; \
+	done
+
+uninstall-moduleLTLIBRARIES:
+	@$(NORMAL_UNINSTALL)
+	@list='$(module_LTLIBRARIES)'; for p in $$list; do \
+	  p=$(am__strip_dir) \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(moduledir)/$$p'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(moduledir)/$$p"; \
+	done
+
+clean-moduleLTLIBRARIES:
+	-test -z "$(module_LTLIBRARIES)" || rm -f $(module_LTLIBRARIES)
+	@list='$(module_LTLIBRARIES)'; for p in $$list; do \
+	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+	  test "$$dir" != "$$p" || dir=.; \
+	  echo "rm -f \"$${dir}/so_locations\""; \
+	  rm -f "$${dir}/so_locations"; \
+	done
+libxglx.la: $(libxglx_la_OBJECTS) $(libxglx_la_DEPENDENCIES) 
+	$(libxglx_la_LINK) -rpath $(moduledir) $(libxglx_la_OBJECTS) $(libxglx_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xglxmodule.Plo@am__quote@
+
+.c.o:
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
+
+.c.obj:
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+.c.lo:
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LTLIBRARIES)
+installdirs:
+	for dir in "$(DESTDIR)$(moduledir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-moduleLTLIBRARIES \
+	mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am: install-moduleLTLIBRARIES
+
+install-dvi: install-dvi-am
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-info: install-info-am
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-moduleLTLIBRARIES
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-moduleLTLIBRARIES ctags distclean \
+	distclean-compile distclean-generic distclean-libtool \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-moduleLTLIBRARIES install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags uninstall uninstall-am uninstall-moduleLTLIBRARIES
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/xorg-server/hw/xgl/glx/module/xglxmodule.c b/xorg-server/hw/xgl/glx/module/xglxmodule.c
new file mode 100644
index 000000000..40af8907d
--- /dev/null
+++ b/xorg-server/hw/xgl/glx/module/xglxmodule.c
@@ -0,0 +1,104 @@
+/*
+ * Copyright © 2005 Novell, 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
+ * Novell, Inc. not be used in advertising or publicity pertaining to
+ * distribution of the software without specific, written prior permission.
+ * Novell, Inc. makes no representations about the suitability of this
+ * software for any purpose. It is provided "as is" without express or
+ * implied warranty.
+ *
+ * NOVELL, INC. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
+ * NO EVENT SHALL NOVELL, INC. 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.
+ *
+ * Author: David Reveman <davidr@novell.com>
+ */
+
+#include "xglx.h"
+#include "xglmodule.h"
+
+#include <glitz-glx.h>
+
+char *
+moduleVersion (void)
+{
+    return VERSION;
+}
+
+Bool
+moduleInit (const char *module)
+{
+    glitz_glx_init (module);
+
+    return TRUE;
+}
+
+void
+InitOutput (ScreenInfo *pScreenInfo,
+	    int	       argc,
+	    char       **argv)
+{
+    xglxInitOutput (pScreenInfo, argc, argv);
+}
+
+Bool
+LegalModifier (unsigned int key,
+	       DeviceIntPtr pDev)
+{
+    return xglxLegalModifier (key, pDev);
+}
+
+void
+ProcessInputEvents (void)
+{
+    xglxProcessInputEvents ();
+}
+
+void
+InitInput (int	argc,
+	   char	**argv)
+{
+    xglxInitInput (argc, argv);
+}
+
+void
+ddxUseMsg (void)
+{
+    ErrorF ("\nXglx usage:\n");
+    xglxUseMsg ();
+}
+
+int
+ddxProcessArgument (int	 argc,
+		    char **argv,
+		    int	 i)
+{
+    return xglxProcessArgument (argc, argv, i);
+}
+
+void
+AbortDDX (void)
+{
+    xglxAbort ();
+}
+
+void
+ddxGiveUp (void)
+{
+    xglxGiveUp ();
+}
+
+void
+OsVendorInit (void)
+{
+    xglxOsVendorInit ();
+}
diff --git a/xorg-server/hw/xgl/glx/xglx.c b/xorg-server/hw/xgl/glx/xglx.c
new file mode 100644
index 000000000..33b276b74
--- /dev/null
+++ b/xorg-server/hw/xgl/glx/xglx.c
@@ -0,0 +1,1444 @@
+/*
+ * Copyright © 2004 David Reveman
+ *
+ * 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
+ * David Reveman not be used in advertising or publicity pertaining to
+ * distribution of the software without specific, written prior permission.
+ * David Reveman makes no representations about the suitability of this
+ * software for any purpose. It is provided "as is" without express or
+ * implied warranty.
+ *
+ * DAVID REVEMAN DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
+ * NO EVENT SHALL DAVID REVEMAN 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.
+ *
+ * Author: David Reveman <davidr@novell.com>
+ */
+
+#include "xglx.h"
+
+#include <X11/extensions/Xrandr.h>
+#include <X11/cursorfont.h>
+
+#include <glitz-glx.h>
+
+#ifdef GLXEXT
+#include "xglglxext.h"
+#endif
+
+#include "inputstr.h"
+#include "cursorstr.h"
+#include "mipointer.h"
+
+#ifdef RANDR
+#include "randrstr.h"
+#endif
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <signal.h>
+#include <math.h>
+
+#ifdef XKB
+#include <X11/extensions/XKB.h>
+#include <xkbsrv.h>
+#include <X11/extensions/XKBconfig.h>
+
+extern Bool
+XkbQueryExtension (Display *dpy,
+		   int     *opcodeReturn,
+		   int     *eventBaseReturn,
+		   int     *errorBaseReturn,
+		   int     *majorRtrn,
+		   int     *minorRtrn);
+
+extern XkbDescPtr
+XkbGetKeyboard (Display      *dpy,
+		unsigned int which,
+		unsigned int deviceSpec);
+
+extern Status
+XkbGetControls (Display	    *dpy,
+		unsigned long which,
+		XkbDescPtr    desc);
+
+#ifndef XKB_BASE_DIRECTORY
+#define	XKB_BASE_DIRECTORY	"/usr/lib/X11/xkb/"
+#endif
+#ifndef XKB_CONFIG_FILE
+#define	XKB_CONFIG_FILE		"X0-config.keyboard"
+#endif
+#ifndef XKB_DFLT_RULES_FILE
+#define	XKB_DFLT_RULES_FILE	"xorg"
+#endif
+#ifndef XKB_DFLT_KB_LAYOUT
+#define	XKB_DFLT_KB_LAYOUT	"us"
+#endif
+#ifndef XKB_DFLT_KB_MODEL
+#define	XKB_DFLT_KB_MODEL	"pc101"
+#endif
+#ifndef XKB_DFLT_KB_VARIANT
+#define	XKB_DFLT_KB_VARIANT	NULL
+#endif
+#ifndef XKB_DFLT_KB_OPTIONS
+#define	XKB_DFLT_KB_OPTIONS	NULL
+#endif
+
+#endif
+
+#define XGLX_DEFAULT_SCREEN_WIDTH  800
+#define XGLX_DEFAULT_SCREEN_HEIGHT 600
+
+typedef struct _xglxScreen {
+    Window	       win, root;
+    Colormap	       colormap;
+    Bool	       fullscreen;
+    CloseScreenProcPtr CloseScreen;
+} xglxScreenRec, *xglxScreenPtr;
+
+DevPrivateKey xglxScreenPrivateKey = &xglxScreenPrivateKey;
+
+#define XGLX_GET_SCREEN_PRIV(pScreen) ((xglxScreenPtr) \
+    dixLookupPrivate(&(pScreen)->devPrivates, xglxScreenPrivateKey))
+
+#define XGLX_SET_SCREEN_PRIV(pScreen, v) \
+    dixSetPrivate(&(pScreen)->devPrivates, xglxScreenPrivateKey, v)
+
+#define XGLX_SCREEN_PRIV(pScreen)			       \
+    xglxScreenPtr pScreenPriv = XGLX_GET_SCREEN_PRIV (pScreen)
+
+typedef struct _xglxCursor {
+    Cursor cursor;
+} xglxCursorRec, *xglxCursorPtr;
+
+#define XGLX_GET_CURSOR_PRIV(pCursor, pScreen)		   \
+    ((xglxCursorPtr)dixLookupPrivate(&(pCursor)->devPrivates, pScreen))
+
+#define XGLX_SET_CURSOR_PRIV(pCursor, pScreen, v)	 \
+    dixSetPrivate(&(pCursor)->devPrivates, pScreen, v)
+
+#define XGLX_CURSOR_PRIV(pCursor, pScreen)			        \
+    xglxCursorPtr pCursorPriv = XGLX_GET_CURSOR_PRIV (pCursor, pScreen)
+
+static char	 *xDisplayName = 0;
+static Display	 *xdisplay     = 0;
+static int	 xscreen;
+static CARD32	 lastEventTime = 0;
+static ScreenPtr currentScreen = 0;
+static Bool	 softCursor    = FALSE;
+static Bool	 fullscreen    = TRUE;
+
+static Bool randrExtension = FALSE;
+static int  randrEvent, randrError;
+
+static glitz_drawable_format_t *xglxScreenFormat = 0;
+
+static Bool
+xglxAllocatePrivates (ScreenPtr pScreen)
+{
+    xglxScreenPtr pScreenPriv;
+
+    pScreenPriv = xalloc (sizeof (xglxScreenRec));
+    if (!pScreenPriv)
+	return FALSE;
+
+    XGLX_SET_SCREEN_PRIV (pScreen, pScreenPriv);
+
+    return TRUE;
+}
+
+#ifdef RANDR
+
+#define DEFAULT_REFRESH_RATE 50
+
+static Bool
+xglxRandRGetInfo (ScreenPtr pScreen,
+		  Rotation  *rotations)
+{
+    RRScreenSizePtr pSize;
+
+    *rotations = RR_Rotate_0;
+
+    if (randrExtension)
+    {
+	XRRScreenConfiguration *xconfig;
+	XRRScreenSize	       *sizes;
+	int		       nSizes, currentSize = 0;
+	short		       *rates, currentRate;
+	int		       nRates, i, j;
+
+	XGLX_SCREEN_PRIV (pScreen);
+
+	xconfig	    = XRRGetScreenInfo (xdisplay, pScreenPriv->root);
+	sizes	    = XRRConfigSizes (xconfig, &nSizes);
+	currentRate = XRRConfigCurrentRate (xconfig);
+
+	if (pScreenPriv->fullscreen)
+	{
+	    Rotation rotation;
+
+	    currentSize = XRRConfigCurrentConfiguration (xconfig, &rotation);
+
+	    for (i = 0; i < nSizes; i++)
+	    {
+		pSize = RRRegisterSize (pScreen,
+					sizes[i].width,
+					sizes[i].height,
+					sizes[i].mwidth,
+					sizes[i].mheight);
+
+		rates = XRRConfigRates (xconfig, i, &nRates);
+
+		for (j = 0; j < nRates; j++)
+		{
+		    RRRegisterRate (pScreen, pSize, rates[j]);
+
+		    if (i == currentSize && rates[j] == currentRate)
+			RRSetCurrentConfig (pScreen, RR_Rotate_0, currentRate,
+					    pSize);
+		}
+	    }
+	}
+	else
+	{
+	    pSize = RRRegisterSize (pScreen,
+				    pScreen->width,
+				    pScreen->height,
+				    pScreen->mmWidth,
+				    pScreen->mmHeight);
+
+	    for (i = 0; i < nSizes; i++)
+	    {
+		rates = XRRConfigRates (xconfig, i, &nRates);
+
+		for (j = 0; j < nRates; j++)
+		{
+		    RRRegisterRate (pScreen, pSize, rates[j]);
+
+		    if (rates[j] == currentRate)
+			RRSetCurrentConfig (pScreen, RR_Rotate_0, currentRate,
+					    pSize);
+		}
+	    }
+	}
+
+	XRRFreeScreenConfigInfo (xconfig);
+    }
+    else
+    {
+	pSize = RRRegisterSize (pScreen,
+				pScreen->width,
+				pScreen->height,
+				pScreen->mmWidth,
+				pScreen->mmHeight);
+
+	RRRegisterRate (pScreen, pSize, DEFAULT_REFRESH_RATE);
+	RRSetCurrentConfig (pScreen, RR_Rotate_0, DEFAULT_REFRESH_RATE, pSize);
+    }
+
+    return TRUE;
+}
+
+static Bool
+xglxRandRSetConfig (ScreenPtr	    pScreen,
+		    Rotation	    rotations,
+		    int		    rate,
+		    RRScreenSizePtr pSize)
+{
+    if (randrExtension)
+    {
+	XRRScreenConfiguration *xconfig;
+	XRRScreenSize	       *sizes;
+	int		       nSizes, currentSize;
+	int		       i, size = -1;
+	int		       status = RRSetConfigFailed;
+	Rotation	       rotation;
+
+	XGLX_SCREEN_PRIV (pScreen);
+
+	xconfig	    = XRRGetScreenInfo (xdisplay, pScreenPriv->root);
+	sizes	    = XRRConfigSizes (xconfig, &nSizes);
+	currentSize = XRRConfigCurrentConfiguration (xconfig, &rotation);
+
+	for (i = 0; i < nSizes; i++)
+	{
+	    if (pScreenPriv->fullscreen)
+	    {
+		if (sizes[i].width   == pSize->width   &&
+		    sizes[i].height  == pSize->height  &&
+		    sizes[i].mwidth  == pSize->mmWidth &&
+		    sizes[i].mheight == pSize->mmHeight)
+		{
+		    size = i;
+		    break;
+		}
+	    }
+	    else
+	    {
+		short *rates;
+		int   nRates, j;
+
+		rates = XRRConfigRates (xconfig, i, &nRates);
+
+		for (j = 0; j < nRates; j++)
+		{
+		    if (rates[j] == rate)
+		    {
+			size = i;
+			if (i >= currentSize)
+			    break;
+		    }
+		}
+	    }
+	}
+
+	if (size >= 0)
+	    status = XRRSetScreenConfigAndRate (xdisplay,
+						xconfig,
+						pScreenPriv->root,
+						size,
+						RR_Rotate_0,
+						rate,
+						CurrentTime);
+
+	XRRFreeScreenConfigInfo (xconfig);
+
+	if (status == RRSetConfigSuccess)
+	{
+	    PixmapPtr pPixmap;
+
+	    pPixmap = (*pScreen->GetScreenPixmap) (pScreen);
+
+	    if (pScreenPriv->fullscreen)
+	    {
+		XGL_PIXMAP_PRIV (pPixmap);
+
+		xglSetRootClip (pScreen, FALSE);
+
+		XResizeWindow (xdisplay, pScreenPriv->win,
+			       pSize->width, pSize->height);
+
+		glitz_drawable_update_size (pPixmapPriv->drawable,
+					    pSize->width, pSize->height);
+
+		pScreen->width    = pSize->width;
+		pScreen->height   = pSize->height;
+		pScreen->mmWidth  = pSize->mmWidth;
+		pScreen->mmHeight = pSize->mmHeight;
+
+		(*pScreen->ModifyPixmapHeader) (pPixmap,
+						pScreen->width,
+						pScreen->height,
+						pPixmap->drawable.depth,
+						pPixmap->drawable.bitsPerPixel,
+						0, 0);
+
+		xglSetRootClip (pScreen, TRUE);
+	    }
+
+	    return TRUE;
+	}
+    }
+
+    return FALSE;
+}
+
+static Bool
+xglxRandRInit (ScreenPtr pScreen)
+{
+    rrScrPrivPtr pScrPriv;
+
+    if (!RRScreenInit (pScreen))
+	return FALSE;
+
+    pScrPriv = rrGetScrPriv (pScreen);
+    pScrPriv->rrGetInfo   = xglxRandRGetInfo;
+    pScrPriv->rrSetConfig = xglxRandRSetConfig;
+
+    return TRUE;
+}
+
+#endif
+
+static void
+xglxConstrainCursor (ScreenPtr pScreen,
+		     BoxPtr    pBox)
+{
+}
+
+static void
+xglxCursorLimits (ScreenPtr pScreen,
+		  CursorPtr pCursor,
+		  BoxPtr    pHotBox,
+		  BoxPtr    pTopLeftBox)
+{
+    *pTopLeftBox = *pHotBox;
+}
+
+static Bool
+xglxDisplayCursor (ScreenPtr pScreen,
+		   CursorPtr pCursor)
+{
+    XGLX_SCREEN_PRIV (pScreen);
+    XGLX_CURSOR_PRIV (pCursor, pScreen);
+
+    XDefineCursor (xdisplay, pScreenPriv->win, pCursorPriv->cursor);
+
+    return TRUE;
+}
+
+#ifdef ARGB_CURSOR
+
+static Bool
+xglxARGBCursorSupport (void);
+
+static Cursor
+xglxCreateARGBCursor (ScreenPtr pScreen,
+		      CursorPtr pCursor);
+
+#endif
+
+static Bool
+xglxRealizeCursor (ScreenPtr pScreen,
+		   CursorPtr pCursor)
+{
+    xglxCursorPtr pCursorPriv;
+    XImage	  *ximage;
+    Pixmap	  source, mask;
+    XColor	  fgColor, bgColor;
+    XlibGC	  xgc;
+    unsigned long valuemask;
+    XGCValues	  values;
+
+    XGLX_SCREEN_PRIV (pScreen);
+
+    valuemask = GCForeground | GCBackground;
+
+    values.foreground = 1L;
+    values.background = 0L;
+
+    pCursorPriv = xalloc (sizeof (xglxCursorRec));
+    if (!pCursorPriv)
+	return FALSE;
+
+    XGLX_SET_CURSOR_PRIV (pCursor, pScreen, pCursorPriv);
+
+#ifdef ARGB_CURSOR
+    if (pCursor->bits->argb)
+    {
+	pCursorPriv->cursor = xglxCreateARGBCursor (pScreen, pCursor);
+	if (pCursorPriv->cursor)
+	    return TRUE;
+    }
+#endif
+
+    source = XCreatePixmap (xdisplay,
+			    pScreenPriv->win,
+			    pCursor->bits->width,
+			    pCursor->bits->height,
+			    1);
+
+    mask = XCreatePixmap (xdisplay,
+			  pScreenPriv->win,
+			  pCursor->bits->width,
+			  pCursor->bits->height,
+			  1);
+
+    xgc = XCreateGC (xdisplay, source, valuemask, &values);
+
+    ximage = XCreateImage (xdisplay,
+			   DefaultVisual (xdisplay, xscreen),
+			   1, XYBitmap, 0,
+			   (char *) pCursor->bits->source,
+			   pCursor->bits->width,
+			   pCursor->bits->height,
+			   BitmapPad (xdisplay), 0);
+
+    XPutImage (xdisplay, source, xgc, ximage,
+	       0, 0, 0, 0, pCursor->bits->width, pCursor->bits->height);
+
+    XFree (ximage);
+
+    ximage = XCreateImage (xdisplay,
+			   DefaultVisual (xdisplay, xscreen),
+			   1, XYBitmap, 0,
+			   (char *) pCursor->bits->mask,
+			   pCursor->bits->width,
+			   pCursor->bits->height,
+			   BitmapPad (xdisplay), 0);
+
+    XPutImage (xdisplay, mask, xgc, ximage,
+	       0, 0, 0, 0, pCursor->bits->width, pCursor->bits->height);
+
+    XFree (ximage);
+    XFreeGC (xdisplay, xgc);
+
+    fgColor.red   = pCursor->foreRed;
+    fgColor.green = pCursor->foreGreen;
+    fgColor.blue  = pCursor->foreBlue;
+
+    bgColor.red   = pCursor->backRed;
+    bgColor.green = pCursor->backGreen;
+    bgColor.blue  = pCursor->backBlue;
+
+    pCursorPriv->cursor =
+	XCreatePixmapCursor (xdisplay, source, mask, &fgColor, &bgColor,
+			     pCursor->bits->xhot, pCursor->bits->yhot);
+
+    XFreePixmap (xdisplay, mask);
+    XFreePixmap (xdisplay, source);
+
+    return TRUE;
+}
+
+static Bool
+xglxUnrealizeCursor (ScreenPtr pScreen,
+		     CursorPtr pCursor)
+{
+    XGLX_CURSOR_PRIV (pCursor, pScreen);
+
+    XFreeCursor (xdisplay, pCursorPriv->cursor);
+    xfree (pCursorPriv);
+
+    return TRUE;
+}
+
+static void
+xglxRecolorCursor (ScreenPtr pScreen,
+		   CursorPtr pCursor,
+		   Bool	     displayed)
+{
+    XColor fgColor, bgColor;
+
+    XGLX_CURSOR_PRIV (pCursor, pScreen);
+
+    fgColor.red   = pCursor->foreRed;
+    fgColor.green = pCursor->foreGreen;
+    fgColor.blue  = pCursor->foreBlue;
+
+    bgColor.red   = pCursor->backRed;
+    bgColor.green = pCursor->backGreen;
+    bgColor.blue  = pCursor->backBlue;
+
+    XRecolorCursor (xdisplay, pCursorPriv->cursor, &fgColor, &bgColor);
+}
+
+static Bool
+xglxSetCursorPosition (ScreenPtr pScreen,
+		       int	 x,
+		       int	 y,
+		       Bool	 generateEvent)
+{
+    XGLX_SCREEN_PRIV (pScreen);
+
+    XWarpPointer (xdisplay, pScreenPriv->win, pScreenPriv->win,
+		  0, 0, 0, 0, x, y);
+
+    return TRUE;
+}
+
+static Bool
+xglxCloseScreen (int	   index,
+		 ScreenPtr pScreen)
+{
+    glitz_drawable_t *drawable;
+
+    XGLX_SCREEN_PRIV (pScreen);
+
+    drawable = XGL_GET_SCREEN_PRIV (pScreen)->drawable;
+    if (drawable)
+	glitz_drawable_destroy (drawable);
+
+    xglClearVisualTypes ();
+
+    if (pScreenPriv->win)
+	XDestroyWindow (xdisplay, pScreenPriv->win);
+
+    if (pScreenPriv->colormap)
+	XFreeColormap (xdisplay, pScreenPriv->colormap);
+
+    XGL_SCREEN_UNWRAP (CloseScreen);
+    xfree (pScreenPriv);
+
+    return (*pScreen->CloseScreen) (index, pScreen);
+}
+
+static Bool
+xglxCursorOffScreen (ScreenPtr *ppScreen, int *x, int *y)
+{
+    return FALSE;
+}
+
+static void
+xglxCrossScreen (ScreenPtr pScreen, Bool entering)
+{
+}
+
+static void
+xglxWarpCursor (ScreenPtr pScreen, int x, int y)
+{
+    miPointerWarpCursor (pScreen, x, y);
+}
+
+miPointerScreenFuncRec xglxPointerScreenFuncs = {
+    xglxCursorOffScreen,
+    xglxCrossScreen,
+    xglxWarpCursor
+};
+
+static Bool
+xglxScreenInit (int	  index,
+		ScreenPtr pScreen,
+		int	  argc,
+		char	  **argv)
+{
+    XSetWindowAttributes    xswa;
+    XWMHints		    *wmHints;
+    XSizeHints		    *normalHints;
+    XClassHint		    *classHint;
+    xglxScreenPtr	    pScreenPriv;
+    XVisualInfo		    *vinfo;
+    XEvent		    xevent;
+    glitz_drawable_format_t *format;
+    glitz_drawable_t	    *drawable;
+
+    format = xglxScreenFormat;
+
+    if (!xglxAllocatePrivates (pScreen))
+	return FALSE;
+
+    currentScreen = pScreen;
+
+    pScreenPriv = XGLX_GET_SCREEN_PRIV (pScreen);
+
+    pScreenPriv->root	    = RootWindow (xdisplay, xscreen);
+    pScreenPriv->fullscreen = fullscreen;
+
+    vinfo = glitz_glx_get_visual_info_from_format (xdisplay, xscreen, format);
+    if (!vinfo)
+    {
+	ErrorF ("[%d] no visual info from format\n", index);
+	return FALSE;
+    }
+
+    pScreenPriv->colormap =
+	XCreateColormap (xdisplay, pScreenPriv->root, vinfo->visual,
+			 AllocNone);
+
+    if (XRRQueryExtension (xdisplay, &randrEvent, &randrError))
+	randrExtension = TRUE;
+
+    if (fullscreen)
+    {
+	xglScreenInfo.width    = DisplayWidth (xdisplay, xscreen);
+	xglScreenInfo.height   = DisplayHeight (xdisplay, xscreen);
+	xglScreenInfo.widthMm  = DisplayWidthMM (xdisplay, xscreen);
+	xglScreenInfo.heightMm = DisplayHeightMM (xdisplay, xscreen);
+
+	if (randrExtension)
+	{
+	    XRRScreenConfiguration *xconfig;
+	    Rotation		   rotation;
+	    XRRScreenSize	   *sizes;
+	    int			   nSizes, currentSize;
+
+	    xconfig	= XRRGetScreenInfo (xdisplay, pScreenPriv->root);
+	    currentSize = XRRConfigCurrentConfiguration (xconfig, &rotation);
+	    sizes	= XRRConfigSizes (xconfig, &nSizes);
+
+	    xglScreenInfo.width    = sizes[currentSize].width;
+	    xglScreenInfo.height   = sizes[currentSize].height;
+	    xglScreenInfo.widthMm  = sizes[currentSize].mwidth;
+	    xglScreenInfo.heightMm = sizes[currentSize].mheight;
+
+	    XRRFreeScreenConfigInfo (xconfig);
+	}
+    }
+    else if (xglScreenInfo.width == 0 || xglScreenInfo.height == 0)
+    {
+	xglScreenInfo.width  = XGLX_DEFAULT_SCREEN_WIDTH;
+	xglScreenInfo.height = XGLX_DEFAULT_SCREEN_HEIGHT;
+    }
+
+    xswa.colormap = pScreenPriv->colormap;
+
+    pScreenPriv->win =
+	XCreateWindow (xdisplay, pScreenPriv->root, 0, 0,
+		       xglScreenInfo.width, xglScreenInfo.height, 0,
+		       vinfo->depth, InputOutput, vinfo->visual,
+		       CWColormap, &xswa);
+
+    XFree (vinfo);
+
+    normalHints = XAllocSizeHints ();
+    normalHints->flags      = PMinSize | PMaxSize | PSize;
+    normalHints->min_width  = xglScreenInfo.width;
+    normalHints->min_height = xglScreenInfo.height;
+    normalHints->max_width  = xglScreenInfo.width;
+    normalHints->max_height = xglScreenInfo.height;
+
+    if (fullscreen)
+    {
+	normalHints->x = 0;
+	normalHints->y = 0;
+	normalHints->flags |= PPosition;
+    }
+
+    classHint = XAllocClassHint ();
+    classHint->res_name = "xglx";
+    classHint->res_class = "Xglx";
+
+    wmHints = XAllocWMHints ();
+    wmHints->flags = InputHint;
+    wmHints->input = TRUE;
+
+    Xutf8SetWMProperties (xdisplay, pScreenPriv->win, "Xglx", "Xglx", 0, 0,
+			  normalHints, wmHints, classHint);
+
+    XFree (wmHints);
+    XFree (classHint);
+    XFree (normalHints);
+
+    drawable = glitz_glx_create_drawable_for_window (xdisplay, xscreen,
+						     format, pScreenPriv->win,
+						     xglScreenInfo.width,
+						     xglScreenInfo.height);
+    if (!drawable)
+    {
+	ErrorF ("[%d] couldn't create glitz drawable for window\n", index);
+	return FALSE;
+    }
+
+    XSelectInput (xdisplay, pScreenPriv->win,
+		  ButtonPressMask | ButtonReleaseMask |
+		  KeyPressMask | KeyReleaseMask | EnterWindowMask |
+		  PointerMotionMask | ExposureMask);
+
+    XMapWindow (xdisplay, pScreenPriv->win);
+
+    if (fullscreen)
+    {
+	XClientMessageEvent xev;
+
+	memset (&xev, 0, sizeof (xev));
+
+	xev.type = ClientMessage;
+	xev.message_type = XInternAtom (xdisplay, "_NET_WM_STATE", FALSE);
+	xev.display = xdisplay;
+	xev.window = pScreenPriv->win;
+	xev.format = 32;
+	xev.data.l[0] = 1;
+	xev.data.l[1] =
+	    XInternAtom (xdisplay, "_NET_WM_STATE_FULLSCREEN", FALSE);
+
+	XSendEvent (xdisplay, pScreenPriv->root, FALSE,
+		    SubstructureRedirectMask, (XEvent *) &xev);
+    }
+
+    xglScreenInfo.drawable = drawable;
+
+    if (!xglScreenInit (pScreen))
+	return FALSE;
+
+#ifdef GLXEXT
+    if (!xglInitVisualConfigs (pScreen))
+	return FALSE;
+#endif
+
+    XGL_SCREEN_WRAP (CloseScreen, xglxCloseScreen);
+
+#ifdef ARGB_CURSOR
+    if (!xglxARGBCursorSupport ())
+	softCursor = TRUE;
+#endif
+
+    if (softCursor)
+    {
+	static char data = 0;
+	XColor	    black, dummy;
+	Pixmap	    bitmap;
+	Cursor	    cursor;
+
+	if (!XAllocNamedColor (xdisplay, pScreenPriv->colormap,
+			       "black", &black, &dummy))
+	    return FALSE;
+
+	bitmap = XCreateBitmapFromData (xdisplay, pScreenPriv->win, &data,
+					1, 1);
+	if (!bitmap)
+	    return FALSE;
+
+	cursor = XCreatePixmapCursor (xdisplay, bitmap, bitmap, &black, &black,
+				      0, 0);
+	if (!cursor)
+	    return FALSE;
+
+	XDefineCursor (xdisplay, pScreenPriv->win, cursor);
+
+	XFreeCursor (xdisplay, cursor);
+	XFreePixmap (xdisplay, bitmap);
+	XFreeColors (xdisplay, pScreenPriv->colormap, &black.pixel, 1, 0);
+
+	miDCInitialize (pScreen, &xglxPointerScreenFuncs);
+    }
+    else
+    {
+	pScreen->ConstrainCursor   = xglxConstrainCursor;
+	pScreen->CursorLimits      = xglxCursorLimits;
+	pScreen->DisplayCursor     = xglxDisplayCursor;
+	pScreen->RealizeCursor     = xglxRealizeCursor;
+	pScreen->UnrealizeCursor   = xglxUnrealizeCursor;
+	pScreen->RecolorCursor     = xglxRecolorCursor;
+	pScreen->SetCursorPosition = xglxSetCursorPosition;
+    }
+
+    if (!xglFinishScreenInit (pScreen))
+	return FALSE;
+
+#ifdef RANDR
+    if (!xglxRandRInit (pScreen))
+	return FALSE;
+#endif
+
+    while (XNextEvent (xdisplay, &xevent))
+	if (xevent.type == Expose)
+	    break;
+
+    return TRUE;
+}
+
+void
+xglxInitOutput (ScreenInfo *pScreenInfo,
+		int	   argc,
+		char	   **argv)
+{
+    glitz_drawable_format_t *format, templ;
+    int			    i;
+    unsigned long	    mask;
+    unsigned long	    extraMask[] = {
+	GLITZ_FORMAT_DOUBLEBUFFER_MASK | GLITZ_FORMAT_ALPHA_SIZE_MASK,
+	GLITZ_FORMAT_DOUBLEBUFFER_MASK,
+	GLITZ_FORMAT_ALPHA_SIZE_MASK,
+	0
+    };
+
+    xglClearVisualTypes ();
+
+    xglSetPixmapFormats (pScreenInfo);
+
+    if (!xdisplay)
+    {
+	char *name = xDisplayName;
+
+	if (!name)
+	    name = xglxInitXorg ();
+
+	xdisplay = XOpenDisplay (name);
+	if (!xdisplay)
+	    FatalError ("can't open display: %s\n", name ? name : "NULL");
+
+	xscreen = DefaultScreen (xdisplay);
+
+	if (!xDisplayName)
+	    XDefineCursor (xdisplay, RootWindow (xdisplay, xscreen),
+			   XCreateFontCursor (xdisplay, XC_watch));
+    }
+
+    templ.samples          = 1;
+    templ.doublebuffer     = 1;
+    templ.color.fourcc     = GLITZ_FOURCC_RGB;
+    templ.color.alpha_size = 8;
+
+    mask = GLITZ_FORMAT_SAMPLES_MASK | GLITZ_FORMAT_FOURCC_MASK;
+
+    for (i = 0; i < sizeof (extraMask) / sizeof (extraMask[0]); i++)
+    {
+	format = glitz_glx_find_window_format (xdisplay, xscreen,
+					       mask | extraMask[i],
+					       &templ, 0);
+	if (format)
+	    break;
+    }
+
+    if (!format)
+	FatalError ("no visual format found");
+
+    xglScreenInfo.depth =
+	format->color.red_size   +
+	format->color.green_size +
+	format->color.blue_size;
+
+    xglSetVisualTypes (xglScreenInfo.depth,
+		       (1 << TrueColor),
+		       format->color.red_size,
+		       format->color.green_size,
+		       format->color.blue_size);
+
+    xglxScreenFormat = format;
+
+    AddScreen (xglxScreenInit, argc, argv);
+}
+
+static Bool
+xglxExposurePredicate (Display *xdisplay,
+		       XEvent  *xevent,
+		       char    *args)
+{
+    return (xevent->type == Expose);
+}
+
+static Bool
+xglxNotExposurePredicate (Display *xdisplay,
+			  XEvent  *xevent,
+			  char	  *args)
+{
+    return (xevent->type != Expose);
+}
+
+static int
+xglxWindowExposures (WindowPtr pWin,
+		     pointer   pReg)
+{
+    ScreenPtr pScreen = pWin->drawable.pScreen;
+    RegionRec ClipList;
+
+    if (HasBorder (pWin))
+    {
+	REGION_INIT (pScreen, &ClipList, NullBox, 0);
+	REGION_SUBTRACT (pScreen, &ClipList, &pWin->borderClip,
+			 &pWin->winSize);
+	REGION_INTERSECT (pScreen, &ClipList, &ClipList, (RegionPtr) pReg);
+	miPaintWindow(pWin, &ClipList, PW_BORDER);
+	REGION_UNINIT (pScreen, &ClipList);
+    }
+
+    REGION_INIT (pScreen, &ClipList, NullBox, 0);
+    REGION_INTERSECT (pScreen, &ClipList, &pWin->clipList, (RegionPtr) pReg);
+    (*pScreen->WindowExposures) (pWin, &ClipList, NullRegion);
+    REGION_UNINIT (pScreen, &ClipList);
+
+    return WT_WALKCHILDREN;
+}
+
+static void
+xglxBlockHandler (pointer   blockData,
+		  OSTimePtr pTimeout,
+		  pointer   pReadMask)
+{
+    XEvent    X;
+    RegionRec region;
+    BoxRec    box;
+
+    XGL_SCREEN_PRIV (currentScreen);
+
+    while (XCheckIfEvent (xdisplay, &X, xglxExposurePredicate, NULL))
+    {
+	ScreenPtr pScreen = currentScreen;
+
+	box.x1 = X.xexpose.x;
+	box.y1 = X.xexpose.y;
+	box.x2 = box.x1 + X.xexpose.width;
+	box.y2 = box.y1 + X.xexpose.height;
+
+	REGION_INIT (currentScreen, &region, &box, 1);
+
+	WalkTree (pScreen, xglxWindowExposures, &region);
+
+	REGION_UNINIT (pScreen, &region);
+    }
+
+    if (!xglSyncSurface (&pScreenPriv->pScreenPixmap->drawable))
+	FatalError (XGL_SW_FAILURE_STRING);
+
+    glitz_surface_flush (pScreenPriv->surface);
+    glitz_drawable_flush (pScreenPriv->drawable);
+
+    XFlush (xdisplay);
+}
+
+static void
+xglxWakeupHandler (pointer blockData,
+		   int     result,
+		   pointer pReadMask)
+{
+    ScreenPtr pScreen = currentScreen;
+    XEvent    X;
+    xEvent    x;
+
+    while (XCheckIfEvent (xdisplay, &X, xglxNotExposurePredicate, NULL))
+    {
+	switch (X.type) {
+	case KeyPress:
+	    x.u.u.type = KeyPress;
+	    x.u.u.detail = X.xkey.keycode;
+	    x.u.keyButtonPointer.time = lastEventTime = GetTimeInMillis ();
+	    mieqEnqueue (&x);
+	    break;
+	case KeyRelease:
+	    x.u.u.type = KeyRelease;
+	    x.u.u.detail = X.xkey.keycode;
+	    x.u.keyButtonPointer.time = lastEventTime = GetTimeInMillis ();
+	    mieqEnqueue (&x);
+	    break;
+	case ButtonPress:
+	    x.u.u.type = ButtonPress;
+	    x.u.u.detail = X.xbutton.button;
+	    x.u.keyButtonPointer.time = lastEventTime = GetTimeInMillis ();
+	    mieqEnqueue (&x);
+	    break;
+	case ButtonRelease:
+	    x.u.u.type = ButtonRelease;
+	    x.u.u.detail = X.xbutton.button;
+	    x.u.keyButtonPointer.time = lastEventTime = GetTimeInMillis ();
+	    mieqEnqueue (&x);
+	    break;
+	case MotionNotify:
+	    x.u.u.type = MotionNotify;
+	    x.u.u.detail = 0;
+	    x.u.keyButtonPointer.rootX = X.xmotion.x;
+	    x.u.keyButtonPointer.rootY = X.xmotion.y;
+	    x.u.keyButtonPointer.time = lastEventTime = GetTimeInMillis ();
+	    miPointerAbsoluteCursor (X.xmotion.x, X.xmotion.y, lastEventTime);
+	    mieqEnqueue (&x);
+	    break;
+	case EnterNotify:
+	    if (X.xcrossing.detail != NotifyInferior) {
+		if (pScreen) {
+		    NewCurrentScreen (pScreen, X.xcrossing.x, X.xcrossing.y);
+		    x.u.u.type = MotionNotify;
+		    x.u.u.detail = 0;
+		    x.u.keyButtonPointer.rootX = X.xcrossing.x;
+		    x.u.keyButtonPointer.rootY = X.xcrossing.y;
+		    x.u.keyButtonPointer.time = lastEventTime =
+			GetTimeInMillis ();
+		    mieqEnqueue (&x);
+		}
+	    }
+	    break;
+	default:
+	    break;
+	}
+    }
+}
+
+static void
+xglxBell (int	       volume,
+	  DeviceIntPtr pDev,
+	  pointer      ctrl,
+	  int	       cls)
+{
+  XBell (xdisplay, volume);
+}
+
+static void
+xglxKbdCtrl (DeviceIntPtr pDev,
+	     KeybdCtrl    *ctrl)
+{
+    unsigned long    valueMask;
+    XKeyboardControl values;
+    int		     i;
+
+    valueMask = KBKeyClickPercent | KBBellPercent | KBBellPitch |
+	KBBellDuration | KBAutoRepeatMode;
+
+    values.key_click_percent = ctrl->click;
+    values.bell_percent	     = ctrl->bell;
+    values.bell_pitch	     = ctrl->bell_pitch;
+    values.bell_duration     = ctrl->bell_duration;
+    values.auto_repeat_mode  = (ctrl->autoRepeat) ? AutoRepeatModeOn :
+	AutoRepeatModeOff;
+
+    XChangeKeyboardControl (xdisplay, valueMask, &values);
+
+    valueMask = KBLed | KBLedMode;
+
+    for (i = 1; i <= 32; i++)
+    {
+	values.led = i;
+	values.led_mode = (ctrl->leds & (1 << (i - 1))) ? LedModeOn :
+	    LedModeOff;
+
+	XChangeKeyboardControl (xdisplay, valueMask, &values);
+    }
+}
+
+static int
+xglxKeybdProc (DeviceIntPtr pDevice,
+	       int	    onoff)
+{
+    Bool      ret = FALSE;
+    DevicePtr pDev = (DevicePtr) pDevice;
+
+    if (!pDev)
+	return BadImplementation;
+
+    switch (onoff) {
+    case DEVICE_INIT: {
+      XModifierKeymap *xmodMap;
+      KeySym	      *xkeyMap;
+      int	      minKeyCode, maxKeyCode, mapWidth, i, j;
+      KeySymsRec      xglxKeySyms;
+      CARD8	      xglxModMap[256];
+      XKeyboardState  values;
+
+#ifdef _XSERVER64
+      KeySym64	      *xkeyMap64;
+      int	      len;
+#endif
+
+#ifdef XKB
+      Bool	      xkbExtension = FALSE;
+      int	      xkbOp, xkbEvent, xkbError, xkbMajor, xkbMinor;
+#endif
+
+      if (pDev != (DevicePtr)inputInfo.keyboard)
+	  return !Success;
+
+      xmodMap = XGetModifierMapping (xdisplay);
+
+      XDisplayKeycodes (xdisplay, &minKeyCode, &maxKeyCode);
+
+#ifdef _XSERVER64
+      xkeyMap64 = XGetKeyboardMapping (xdisplay,
+				       minKeyCode,
+				       maxKeyCode - minKeyCode + 1,
+				       &mapWidth);
+
+      len = (maxKeyCode - minKeyCode + 1) * mapWidth;
+      xkeyMap = (KeySym *) xalloc (len * sizeof (KeySym));
+      for (i = 0; i < len; ++i)
+	  xkeyMap[i] = xkeyMap64[i];
+
+      XFree (xkeyMap64);
+#else
+      xkeyMap = XGetKeyboardMapping (xdisplay,
+				     minKeyCode,
+				     maxKeyCode - minKeyCode + 1,
+				     &mapWidth);
+#endif
+
+      memset (xglxModMap, 0, 256);
+
+      for (j = 0; j < 8; j++)
+      {
+	  for (i = 0; i < xmodMap->max_keypermod; i++)
+	  {
+	      CARD8 keyCode;
+
+	      keyCode = xmodMap->modifiermap[j * xmodMap->max_keypermod + i];
+	      if (keyCode)
+		  xglxModMap[keyCode] |= 1 << j;
+	  }
+      }
+
+      XFreeModifiermap (xmodMap);
+
+      xglxKeySyms.minKeyCode = minKeyCode;
+      xglxKeySyms.maxKeyCode = maxKeyCode;
+      xglxKeySyms.mapWidth   = mapWidth;
+      xglxKeySyms.map	     = xkeyMap;
+
+#ifdef XKB
+      if (!noXkbExtension)
+	  xkbExtension = XkbQueryExtension (xdisplay,
+					    &xkbOp, &xkbEvent, &xkbError,
+					    &xkbMajor, &xkbMinor);
+
+      if (xkbExtension)
+      {
+	  XkbDescPtr desc;
+	  char	     *rules, *model, *layout, *variants, *options;
+
+	  desc = XkbGetKeyboard (xdisplay,
+				 XkbGBN_AllComponentsMask,
+				 XkbUseCoreKbd);
+
+	  if (desc && desc->geom)
+	  {
+	      XkbComponentNamesRec names;
+	      FILE		   *file;
+
+	      rules    = XKB_DFLT_RULES_FILE;
+	      model    = XKB_DFLT_KB_MODEL;
+	      layout   = XKB_DFLT_KB_LAYOUT;
+	      variants = XKB_DFLT_KB_VARIANT;
+	      options  = XKB_DFLT_KB_OPTIONS;
+
+	      XkbGetControls (xdisplay, XkbAllControlsMask, desc);
+
+	      memset (&names, 0, sizeof (XkbComponentNamesRec));
+
+	      XkbSetRulesDflts (rules, model, layout, variants, options);
+
+	      ret = XkbInitKeyboardDeviceStruct ((pointer) pDev,
+						 &names,
+						 &xglxKeySyms,
+						 xglxModMap,
+						 xglxBell,
+						 xglxKbdCtrl);
+
+	      if (ret)
+		  XkbDDXChangeControls ((pointer) pDev, desc->ctrls,
+					desc->ctrls);
+
+	      XkbFreeKeyboard (desc, 0, False);
+	  }
+      }
+#endif
+
+      if (!ret)
+      {
+	  XGetKeyboardControl (xdisplay, &values);
+
+	  memmove (defaultKeyboardControl.autoRepeats,
+		   values.auto_repeats, sizeof (values.auto_repeats));
+
+	  ret = InitKeyboardDeviceStruct (pDev,
+					  &xglxKeySyms,
+					  xglxModMap,
+					  xglxBell,
+					  xglxKbdCtrl);
+      }
+
+#ifdef _XSERVER64
+      xfree (xkeyMap);
+#else
+      XFree (xkeyMap);
+#endif
+
+      if (!ret)
+	  return BadImplementation;
+
+    } break;
+    case DEVICE_ON:
+	pDev->on = TRUE;
+	break;
+    case DEVICE_OFF:
+    case DEVICE_CLOSE:
+	pDev->on = FALSE;
+	break;
+    }
+
+    return Success;
+}
+
+Bool
+xglxLegalModifier (unsigned int key,
+		   DeviceIntPtr pDev)
+{
+    return TRUE;
+}
+
+void
+xglxProcessInputEvents (void)
+{
+    mieqProcessInputEvents ();
+    miPointerUpdate ();
+}
+
+void
+xglxInitInput (int  argc,
+	       char **argv)
+{
+    DeviceIntPtr pKeyboard, pPointer;
+
+    pPointer  = AddInputDevice (xglMouseProc, TRUE);
+    pKeyboard = AddInputDevice (xglxKeybdProc, TRUE);
+
+    RegisterPointerDevice (pPointer);
+    RegisterKeyboardDevice (pKeyboard);
+
+    miRegisterPointerDevice (screenInfo.screens[0], pPointer);
+    mieqInit (&pKeyboard->public, &pPointer->public);
+
+    AddEnabledDevice (XConnectionNumber (xdisplay));
+
+    RegisterBlockAndWakeupHandlers (xglxBlockHandler,
+				    xglxWakeupHandler,
+				    NULL);
+}
+
+void
+xglxUseMsg (void)
+{
+    ErrorF ("-screen WIDTH[/WIDTHMM]xHEIGHT[/HEIGHTMM] "
+	    "specify screen characteristics\n");
+    ErrorF ("-fullscreen            run fullscreen\n");
+    ErrorF ("-display string        display name of the real server\n");
+    ErrorF ("-softcursor            force software cursor\n");
+
+    if (!xDisplayName)
+	xglxUseXorgMsg ();
+}
+
+int
+xglxProcessArgument (int  argc,
+		     char **argv,
+		     int  i)
+{
+    static Bool checkDisplayName = FALSE;
+
+    if (!checkDisplayName)
+    {
+	char *display = ":0";
+	int  j;
+
+	for (j = i; j < argc; j++)
+	{
+	    if (!strcmp (argv[j], "-display"))
+	    {
+		if (++j < argc)
+		    xDisplayName = argv[j];
+
+		break;
+	    }
+	    else if (argv[j][0] == ':')
+	    {
+		display = argv[j];
+	    }
+	}
+
+	if (!xDisplayName)
+	    xDisplayName = getenv ("DISPLAY");
+
+	if (xDisplayName)
+	{
+	    int n;
+
+	    n = strspn (xDisplayName, ":0123456789");
+	    if (strncmp (xDisplayName, display, n) == 0)
+		xDisplayName = 0;
+	}
+
+	if (xDisplayName)
+	    fullscreen = FALSE;
+
+	checkDisplayName = TRUE;
+    }
+
+    if (!strcmp (argv[i], "-screen"))
+    {
+	if ((i + 1) < argc)
+	{
+	    xglParseScreen (argv[i + 1]);
+	}
+	else
+	    return 1;
+
+	return 2;
+    }
+    else if (!strcmp (argv[i], "-fullscreen"))
+    {
+	fullscreen = TRUE;
+	return 1;
+    }
+    else if (!strcmp (argv[i], "-display"))
+    {
+	if (++i < argc)
+	    return 2;
+
+	return 0;
+    }
+    else if (!strcmp (argv[i], "-softcursor"))
+    {
+	softCursor = TRUE;
+	return 1;
+    }
+    else if (!xDisplayName)
+    {
+	return xglxProcessXorgArgument (argc, argv, i);
+    }
+
+    return 0;
+}
+
+void
+xglxAbort (void)
+{
+    xglxAbortXorg ();
+}
+
+void
+xglxGiveUp (void)
+{
+    AbortDDX ();
+}
+
+void
+xglxOsVendorInit (void)
+{
+}
+
+#ifdef ARGB_CURSOR
+
+#include <X11/extensions/Xrender.h>
+
+static Bool
+xglxARGBCursorSupport (void)
+{
+    int renderMajor, renderMinor;
+
+    if (!XRenderQueryVersion (xdisplay, &renderMajor, &renderMinor))
+	renderMajor = renderMinor = -1;
+
+    return (renderMajor > 0 || renderMinor > 4);
+}
+
+static Cursor
+xglxCreateARGBCursor (ScreenPtr pScreen,
+		      CursorPtr pCursor)
+{
+    Pixmap	      xpixmap;
+    XlibGC	      xgc;
+    XImage	      *ximage;
+    XRenderPictFormat *xformat;
+    Picture	      xpicture;
+    Cursor	      cursor;
+
+    XGLX_SCREEN_PRIV (pScreen);
+
+    xpixmap = XCreatePixmap (xdisplay,
+			     pScreenPriv->win,
+			     pCursor->bits->width,
+			     pCursor->bits->height,
+			     32);
+
+    xgc = XCreateGC (xdisplay, xpixmap, 0, NULL);
+
+    ximage = XCreateImage (xdisplay,
+			   DefaultVisual (xdisplay, xscreen),
+			   32, ZPixmap, 0,
+			   (char *) pCursor->bits->argb,
+			   pCursor->bits->width,
+			   pCursor->bits->height,
+			   32, pCursor->bits->width * 4);
+
+    XPutImage (xdisplay, xpixmap, xgc, ximage,
+	       0, 0, 0, 0, pCursor->bits->width, pCursor->bits->height);
+
+    XFree (ximage);
+    XFreeGC (xdisplay, xgc);
+
+    xformat = XRenderFindStandardFormat (xdisplay, PictStandardARGB32);
+    xpicture = XRenderCreatePicture (xdisplay, xpixmap, xformat, 0, 0);
+
+    cursor = XRenderCreateCursor (xdisplay, xpicture,
+				  pCursor->bits->xhot,
+				  pCursor->bits->yhot);
+
+    XRenderFreePicture (xdisplay, xpicture);
+    XFreePixmap (xdisplay, xpixmap);
+
+    return cursor;
+}
+
+#endif
diff --git a/xorg-server/hw/xgl/glx/xglx.h b/xorg-server/hw/xgl/glx/xglx.h
new file mode 100644
index 000000000..a8c894661
--- /dev/null
+++ b/xorg-server/hw/xgl/glx/xglx.h
@@ -0,0 +1,138 @@
+/*
+ * Copyright © 2005 Novell, 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
+ * Novell, Inc. not be used in advertising or publicity pertaining to
+ * distribution of the software without specific, written prior permission.
+ * Novell, Inc. makes no representations about the suitability of this
+ * software for any purpose. It is provided "as is" without express or
+ * implied warranty.
+ *
+ * NOVELL, INC. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
+ * NO EVENT SHALL NOVELL, INC. 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.
+ *
+ * Author: David Reveman <davidr@novell.com>
+ */
+
+#ifndef _XGLX_H_
+#define _XGLX_H_
+
+#include "xgl.h"
+
+#ifdef _XSERVER64
+#define _XSERVER64_tmp
+#undef _XSERVER64
+typedef unsigned long XID64;
+typedef unsigned long Mask64;
+typedef unsigned long Atom64;
+typedef unsigned long VisualID64;
+typedef unsigned long Time64;
+#define XID      XID64
+#define Mask     Mask64
+#define Atom     Atom64
+#define VisualID VisualID64
+#define Time     Time64
+typedef XID Window64;
+typedef XID Drawable64;
+typedef XID Font64;
+typedef XID Pixmap64;
+typedef XID Cursor64;
+typedef XID Colormap64;
+typedef XID GContext64;
+typedef XID KeySym64;
+#define Window   Window64
+#define Drawable Drawable64
+#define Font     Font64
+#define Pixmap   Pixmap64
+#define Cursor   Cursor64
+#define Colormap Colormap64
+#define GContext GContext64
+#define KeySym   KeySym64
+#endif
+
+#define GC XlibGC
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+#undef GC
+
+#ifdef _XSERVER64_tmp
+#ifndef _XSERVER64
+#define _XSERVER64
+#endif
+#undef _XSERVER64_tmp
+#undef XID
+#undef Mask
+#undef Atom
+#undef VisualID
+#undef Time
+#undef Window
+#undef Drawable
+#undef Font
+#undef Pixmap
+#undef Cursor
+#undef Colormap
+#undef GContext
+#undef KeySym
+#endif
+
+void
+xglxInitOutput (ScreenInfo *pScreenInfo,
+		int	   argc,
+		char	   **argv);
+
+Bool
+xglxLegalModifier (unsigned int key,
+		   DeviceIntPtr pDev);
+
+void
+xglxProcessInputEvents (void);
+
+void
+xglxInitInput (int  argc,
+	       char **argv);
+
+void
+xglxUseMsg (void);
+
+int
+xglxProcessArgument (int  argc,
+		     char **argv,
+		     int  i);
+
+void
+xglxAbort (void);
+
+void
+xglxGiveUp (void);
+
+void
+xglxOsVendorInit (void);
+
+#ifndef NXGLXORG
+
+void
+xglxUseXorgMsg (void);
+
+int
+xglxProcessXorgArgument (int  argc,
+			 char **argv,
+			 int  i);
+
+void
+xglxAbortXorg (void);
+
+char *
+xglxInitXorg (void);
+
+#endif
+
+#endif /* _XGLX_H_ */
diff --git a/xorg-server/hw/xgl/glx/xglxorg.c b/xorg-server/hw/xgl/glx/xglxorg.c
new file mode 100644
index 000000000..1d6fc9a30
--- /dev/null
+++ b/xorg-server/hw/xgl/glx/xglxorg.c
@@ -0,0 +1,674 @@
+/*
+ * Copyright © 2005 Novell, 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
+ * Novell, Inc. not be used in advertising or publicity pertaining to
+ * distribution of the software without specific, written prior permission.
+ * Novell, Inc. makes no representations about the suitability of this
+ * software for any purpose. It is provided "as is" without express or
+ * implied warranty.
+ *
+ * NOVELL, INC. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
+ * NO EVENT SHALL NOVELL, INC. 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.
+ *
+ * Authors: David Reveman <davidr@novell.com>
+ *          Matthias Hopf <mhopf@suse.de>
+ */
+
+#include "xglx.h"
+
+#ifndef NXGLXORG
+
+#include <X11/Xauth.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <errno.h>
+#include <ctype.h>
+#include <signal.h>
+#include <setjmp.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <sys/stat.h>
+#include <libgen.h>
+
+typedef void (*sighandler_t) (int);
+
+#define XORG_DIE_TIMEOUT 3
+#define XORG_DEV_RANDOM  "/dev/urandom"
+
+static char xorgAuthBuf[256];
+static char *xorgAuthTempl = "/tmp/.Xgl-auth-XXXXXX";
+static char *xorgAuth      = NULL;
+
+static char *xorgProgs[] = { "/usr/bin/Xorg", "/usr/X11R6/bin/Xorg" };
+static char *xorgProg    = NULL;
+
+static char *xorgDisplay   = ":93";
+static char *xorgTerminate = "-terminate";
+
+static pid_t   xorgPid = 0;
+static int     receivedUsr1 = 0;
+static jmp_buf jumpbuf;
+
+static Bool waitAndExit = FALSE;
+
+static char **xorgArgv = 0;
+static int  nXorgArgv  = 0;
+
+typedef struct _xglxArg *xglxArgPtr;
+
+typedef int (*xglxProcessArgumentProc) (xglxArgPtr, int, char **, int);
+
+typedef struct _xglxArg {
+    xglxProcessArgumentProc processArgument;
+    const char		    *name;
+    const char		    *usage;
+} xglxArgRec;
+
+static int
+xglxAddXorgArguments (char **argv,
+		      int  n)
+{
+    char **newArgv;
+    int  i;
+
+    newArgv = xrealloc (xorgArgv, sizeof (char *) * (nXorgArgv + n));
+    if (!newArgv)
+	return 0;
+
+    for (i = 0; i < n; i++)
+	newArgv[nXorgArgv + i] = argv[i];
+
+    xorgArgv   = newArgv;
+    nXorgArgv += n;
+
+    return n;
+}
+
+static int
+xglxProcessCommonXorgArgument (xglxArgPtr pArg,
+			       int	  n,
+			       int	  argc,
+			       char	  **argv,
+			       int	  i)
+{
+    if (strcmp (argv[i], pArg->name) == 0)
+    {
+	if (i + n - 1 < argc)
+	    return xglxAddXorgArguments (&argv[i], n);
+    }
+
+    return 0;
+}
+
+#define PROCESS_COMMON_XORG_ARGUMENT_IMP(args)				  \
+    static int								  \
+    xglxProcess ## args ## CommonXorgArgument (xglxArgPtr pArg,		  \
+					       int	  argc,		  \
+					       char	  **argv,	  \
+					       int	  i)		  \
+    {									  \
+	return xglxProcessCommonXorgArgument (pArg, args, argc, argv, i); \
+    }
+
+PROCESS_COMMON_XORG_ARGUMENT_IMP (1)
+PROCESS_COMMON_XORG_ARGUMENT_IMP (2)
+
+static int
+xglxProcessXorgVTArgument (xglxArgPtr pArg,
+			   int	      argc,
+			   char	      **argv,
+			   int	      i)
+{
+    if (argv[i][0] == 'v' && argv[i][1] == 't' &&
+	strspn (&argv[i][2], "0123456789") == strlen (&argv[i][2]))
+	return xglxAddXorgArguments (&argv[i], 1);
+
+    return 0;
+}
+
+static int
+xglxProcessXorgAcArgument (xglxArgPtr pArg,
+			   int	      argc,
+			   char	      **argv,
+			   int	      i)
+{
+    static char *ac = "-ac";
+
+    if (strcmp (argv[i], pArg->name) == 0)
+    {
+	if (xglxAddXorgArguments (&ac, 1))
+	    return 1;
+    }
+
+    return 0;
+}
+
+static int
+xglxProcessXorgVersionArgument (xglxArgPtr pArg,
+				int	   argc,
+				char	   **argv,
+				int	   i)
+{
+    static char *version = "-version";
+
+    if (strcmp (argv[i], pArg->name) == 0)
+    {
+	if (xglxAddXorgArguments (&version, 1))
+	{
+	    waitAndExit = TRUE;
+	    return 1;
+	}
+    }
+
+    return 0;
+}
+
+static int
+xglxProcessXorgProgArgument (xglxArgPtr pArg,
+			     int	argc,
+			     char	**argv,
+			     int	i)
+{
+    if (strcmp (argv[i], pArg->name) == 0)
+    {
+	if (i + 1 < argc)
+	{
+	    xorgProg = argv[i + 1];
+	    return 2;
+	}
+    }
+
+    return 0;
+}
+
+static int
+xglxProcessXorgDisplayArgument (xglxArgPtr pArg,
+				int	   argc,
+				char	   **argv,
+				int	   i)
+{
+    if (strcmp (argv[i], pArg->name) == 0)
+    {
+	if (i + 1 < argc)
+	{
+	    xorgDisplay = argv[i + 1];
+	    return 2;
+	}
+    }
+
+    return 0;
+}
+
+static int
+xglxProcessXorgWaitExitArgument (xglxArgPtr pArg,
+				 int	    argc,
+				 char	    **argv,
+				 int	    i)
+{
+    if (xglxProcessCommonXorgArgument (pArg, 1, argc, argv, i))
+    {
+	waitAndExit = TRUE;
+	return 1;
+    }
+
+    return 0;
+}
+
+#define ARG(processArgument, name, usage) \
+    { processArgument, name, usage }
+
+#define XORG_ARG(name, args)				     \
+    ARG (xglxProcess ## args ## CommonXorgArgument, name, 0)
+
+#define XORG_UARG(name, usage, args)				 \
+    ARG (xglxProcess ## args ## CommonXorgArgument, name, usage)
+
+xglxArgRec xorgUid0Args[] = {
+    XORG_UARG ("-modulepath", " paths      specify the module search path", 2),
+    XORG_UARG ("-logfile", " file          specify a log file name", 2),
+    ARG (xglxProcessXorgWaitExitArgument, "-configure",
+	 "             probe for devices and write an Xorg config")
+};
+
+xglxArgRec xorgUidArgs[] = {
+    XORG_UARG ("-config",
+	       " file           specify configuration file, relative to the\n"
+	       "                       Xorg config search path, "
+	       "only root can use absolute", 2)
+};
+
+xglxArgRec xorgArgs[] = {
+    ARG (xglxProcessXorgWaitExitArgument, "-probeonly",
+	 "             probe for devices, then exit"),
+    XORG_UARG ("-verbose", " [n]           verbose startup messages", 2),
+    XORG_UARG ("-logverbose", " [n]        verbose log messages", 2),
+    XORG_UARG ("-quiet", "                 minimal startup messages", 1),
+    XORG_UARG ("-depth", " n               set colour depth. Default: 8", 2),
+    XORG_UARG ("-gamma",
+	       " f               set gamma value (0.1 < f < 10.0) "
+	       "Default: 1.0", 2),
+    XORG_UARG ("-rgamma", " f              set gamma value for red phase", 2),
+    XORG_UARG ("-ggamma", " f              set gamma value for green phase",
+	       2),
+    XORG_UARG ("-bgamma", " f              set gamma value for blue phase", 2),
+    XORG_UARG ("-layout",
+	       " name           specify the ServerLayout section name", 2),
+    XORG_UARG ("-screen",
+	       " name           specify the Screen section name", 2),
+    XORG_UARG ("-keyboard",
+	       " name         specify the core keyboard InputDevice name", 2),
+    XORG_UARG ("-pointer",
+	       " name          specify the core pointer InputDevice name", 2),
+    XORG_UARG ("-nosilk", "                disable Silken Mouse", 1),
+    XORG_UARG ("-disableModInDev",
+	       "       disable dynamic modification of input device settings",
+	       1),
+    XORG_UARG ("-allowMouseOpenFail",
+	       "    start server even if the mouse can't be initialized", 1),
+    XORG_UARG ("-bestRefresh",
+	       "           choose modes with the best refresh rate", 1),
+    XORG_UARG ("-ignoreABI",
+	       "             make module ABI mismatches non-fatal", 1),
+    XORG_UARG ("-isolateDevice",
+	       " bus_id  restrict device resets to bus_id (PCI only)", 2),
+    ARG (xglxProcessXorgVTArgument, "vtXX",
+	 "                   use the specified VT number"),
+    XORG_UARG ("-keeptty",
+	       "               don't detach controlling tty "
+	       "(for debugging only)", 1),
+    XORG_UARG ("-novtswitch", "            don't immediately switch to new VT",
+	       1),
+    XORG_UARG ("-sharevts", "              share VTs with another X server",
+	       1),
+    ARG (xglxProcessXorgAcArgument, "-xorgAc",
+	 "                disable access control restrictions"),
+    ARG (xglxProcessXorgProgArgument, "-xorgProgram",
+	 "           server program"),
+    ARG (xglxProcessXorgDisplayArgument, "-xorgDisplay",
+	 "           server display"),
+    ARG (xglxProcessXorgVersionArgument, "-xorgVersion",
+	 "           show the server version")
+};
+
+xglxArgRec sharedArgs[] = {
+    XORG_ARG ("-br", 1)
+};
+
+void
+xglxUseXorgMsg (void)
+{
+    int i;
+
+    ErrorF ("\nXorg usage:\n");
+
+    if (getuid () == 0)
+    {
+	for (i = 0; i < sizeof (xorgUid0Args) / sizeof (xglxArgRec); i++)
+	    ErrorF ("%s%s\n", xorgUid0Args[i].name, xorgUid0Args[i].usage);
+    }
+    else
+    {
+	for (i = 0; i < sizeof (xorgUidArgs) / sizeof (xglxArgRec); i++)
+	    ErrorF ("%s%s\n", xorgUidArgs[i].name, xorgUidArgs[i].usage);
+    }
+
+    for (i = 0; i < sizeof (xorgArgs) / sizeof (xglxArgRec); i++)
+	ErrorF ("%s%s\n", xorgArgs[i].name, xorgArgs[i].usage);
+}
+
+int
+xglxProcessXorgArgument (int  argc,
+			 char **argv,
+			 int  i)
+{
+    int skip, j;
+
+    if (nXorgArgv == 0)
+    {
+	if (!xglxAddXorgArguments (&xorgProg, 1))
+	    return 0;
+    }
+
+    if (getuid () == 0)
+    {
+	for (j = 0; j < sizeof (xorgUid0Args) / sizeof (xglxArgRec); j++)
+	{
+	    skip = (*xorgUid0Args[j].processArgument) (&xorgUid0Args[j],
+						       argc, argv, i);
+	    if (skip)
+		return skip;
+	}
+    }
+    else
+    {
+	for (j = 0; j < sizeof (xorgUidArgs) / sizeof (xglxArgRec); j++)
+	{
+	    skip = (*xorgUidArgs[j].processArgument) (&xorgUidArgs[j],
+						      argc, argv, i);
+	    if (skip)
+		return skip;
+	}
+    }
+
+    for (j = 0; j < sizeof (xorgArgs) / sizeof (xorgArgs[0]); j++)
+    {
+	skip = (*xorgArgs[j].processArgument) (&xorgArgs[j], argc, argv, i);
+	if (skip)
+	    return skip;
+    }
+
+    for (j = 0; j < sizeof (sharedArgs) / sizeof (sharedArgs[0]); j++)
+    {
+	skip = (*sharedArgs[j].processArgument) (&sharedArgs[j], argc, argv, i);
+	if (skip)
+	    return 0;
+    }
+
+    return 0;
+}
+
+static void
+sigAlarm (int sig)
+{
+    ErrorF ("%s won't die, killing it\n", basename (xorgProg));
+
+    kill (xorgPid, SIGKILL);
+    if (xorgPid)
+	while (waitpid (xorgPid, NULL, 0) == -1 && errno == EINTR);
+}
+
+void
+xglxAbortXorg (void)
+{
+    sighandler_t oldSigAlarm;
+    unsigned int oldAlarm;
+    int          status = 0;
+    char	 *name;
+
+    if (!xorgPid)
+	return;
+
+    name = basename (xorgProg);
+
+    oldAlarm    = alarm (0);
+    oldSigAlarm = signal (SIGALRM, sigAlarm);
+
+    kill (xorgPid, SIGTERM);
+
+    alarm (XORG_DIE_TIMEOUT);
+    while (waitpid (xorgPid, &status, 0) == -1 && errno == EINTR);
+    alarm (0);
+
+    signal (SIGALRM, oldSigAlarm);
+    alarm (oldAlarm);
+
+    if (WIFEXITED (status))
+    {
+	if (WEXITSTATUS (status))
+	    ErrorF ("%s died, exit status %d\n", name, WEXITSTATUS (status));
+    }
+    else if (WIFSIGNALED (status))
+	ErrorF ("%s died, signal %d\n", name, WTERMSIG (status));
+    else
+	ErrorF ("%s died, dubious exit\n", name);
+
+    if (xorgAuth)
+	unlink (xorgAuth);
+}
+
+static void
+sigUsr1Waiting (int sig)
+{
+    signal (sig, sigUsr1Waiting);
+    receivedUsr1++;
+}
+
+static void
+sigUsr1Jump (int sig)
+{
+
+#ifdef HAVE_SIGPROCMASK
+    sigset_t set;
+#endif
+
+    signal (sig, sigUsr1Waiting);
+
+#ifdef HAVE_SIGPROCMASK
+    sigemptyset (&set);
+    sigaddset (&set, SIGUSR1);
+    sigprocmask (SIG_UNBLOCK, &set, NULL);
+#endif
+
+    longjmp (jumpbuf, 1);
+}
+
+#define AUTH_DATA_LEN 16 /* bytes of authorization data */
+
+static Bool
+xglxSetupAuth (char *name, int authFd)
+{
+    Xauth   auth;
+    int	    randomFd;
+    ssize_t bytes, size;
+    char    authHost[256];
+    char    authData[AUTH_DATA_LEN];
+    FILE    *file;
+
+    auth.family = FamilyLocal;
+
+    gethostname (authHost, sizeof (authHost));
+
+    auth.address	= authHost;
+    auth.address_length = strlen (authHost);
+
+    auth.number	= strrchr (xorgDisplay, ':');
+    if (!auth.number)
+    {
+	ErrorF ("Bad Xorg display name: %s\n", xorgDisplay);
+	return FALSE;
+    }
+
+    auth.number++;
+
+    auth.number_length = strlen (auth.number);
+    if (!auth.number_length)
+    {
+	ErrorF ("Bad Xorg display name: %s\n", xorgDisplay);
+	return FALSE;
+    }
+
+    auth.name	     = "MIT-MAGIC-COOKIE-1";
+    auth.name_length = strlen (auth.name);
+
+    randomFd = open (XORG_DEV_RANDOM, O_RDONLY);
+    if (randomFd == -1)
+    {
+	ErrorF ("Failed to open " XORG_DEV_RANDOM "\n");
+	return FALSE;
+    }
+
+    bytes = 0;
+    do {
+	size = read (randomFd, authData + bytes, AUTH_DATA_LEN - bytes);
+	if (size <= 0)
+	    break;
+
+	bytes += size;
+    } while (bytes != AUTH_DATA_LEN);
+
+    close (randomFd);
+
+    if (bytes != AUTH_DATA_LEN)
+    {
+	ErrorF ("Failed to read %d random bytes from " XORG_DEV_RANDOM "\n",
+		AUTH_DATA_LEN);
+	return FALSE;
+    }
+
+    auth.data	     = authData;
+    auth.data_length = AUTH_DATA_LEN;
+
+    file = fdopen (authFd, "w");
+    if (!file)
+    {
+	ErrorF ("Failed to open authorization file: %s\n", name);
+	close (authFd);
+	return FALSE;
+    }
+
+    XauWriteAuth (file, &auth);
+    fclose (file);
+
+    return TRUE;
+}
+
+char *
+xglxInitXorg (void)
+{
+    sighandler_t oldSigUsr1;
+    pid_t	 pid;
+    char	 *name;
+    char	 *auth[] = { "-auth", xorgAuthBuf, "-nolisten", "tcp" };
+    char	 *saver[] = { "-dpms", "-v", "-s", "0" };
+    char	 *endArg = NULL;
+    int		 authFd;
+    int		 mask;
+
+    if (xorgPid)
+	return xorgDisplay;
+
+    if (!xorgProg)
+    {
+	struct stat buf;
+	int i;
+
+	for (i = 0; i < sizeof (xorgProgs) / sizeof (char *); i++)
+	{
+	    if (stat (xorgProgs[i], &buf) == 0)
+	    {
+		xorgProg = xorgProgs[i];
+		break;
+	    }
+	}
+
+	if (!xorgProg)
+	    FatalError ("Can't find Xorg executable\n");
+    }
+
+    strcpy (xorgAuthBuf, xorgAuthTempl);
+    mask = umask (0077);
+    authFd = mkstemp (xorgAuthBuf);
+    umask (mask);
+    if (authFd == -1)
+	FatalError ("Failed to generate unique authorization file\n");
+
+    xorgAuth = xorgAuthBuf;
+
+    if (nXorgArgv == 0)
+    {
+	if (!xglxAddXorgArguments (&xorgProg, 1))
+	    return 0;
+    }
+    else
+    {
+	xorgArgv[0] = xorgProg;
+    }
+
+    if (!xglxAddXorgArguments (auth, sizeof (auth) / sizeof (char *)))
+	return 0;
+
+    if (!xglxAddXorgArguments (saver, sizeof (saver) / sizeof (char *)))
+	return 0;
+
+    if (!xglxAddXorgArguments (&xorgDisplay, 1))
+	return 0;
+
+    if (!xglxAddXorgArguments (&xorgTerminate, 1))
+	return 0;
+
+    if (!xglxAddXorgArguments (&endArg, 1))
+	return 0;
+
+    name = basename (xorgProg);
+
+    if (!xglxSetupAuth (xorgAuth, authFd))
+	FatalError ("Failed to set up authorization: %s\n", xorgAuth);
+
+    oldSigUsr1 = signal (SIGUSR1, sigUsr1Waiting);
+
+    pid = fork ();
+
+    switch (pid) {
+    case -1:
+	perror ("fork");
+	FatalError ("fork");
+	break;
+    case 0:
+	signal (SIGUSR1, SIG_IGN);
+	execv (xorgArgv[0], xorgArgv);
+	perror (xorgArgv[0]);
+	exit (2);
+	break;
+    default:
+	xorgPid = pid;
+	break;
+    }
+
+    for (;;)
+    {
+	int status;
+
+	signal (SIGUSR1, sigUsr1Waiting);
+	if (setjmp (jumpbuf) && !waitAndExit)
+	    break;
+
+	signal (SIGUSR1, sigUsr1Jump);
+	if (receivedUsr1 && !waitAndExit)
+	    break;
+
+	if (waitpid (xorgPid, &status, 0) != -1)
+	{
+	    if (WIFEXITED (status))
+	    {
+		if (waitAndExit)
+		{
+		    if (WEXITSTATUS (status))
+			FatalError ("%s died, exit status %d\n", name,
+				    WEXITSTATUS (status));
+
+		    exit (WEXITSTATUS (status));
+		}
+		else
+		{
+		    FatalError ("%s died, exit status %d\n", name,
+				WEXITSTATUS (status));
+		}
+	    }
+	    else if (WIFSIGNALED (status))
+		FatalError ("%s died, signal %d\n", name, WTERMSIG (status));
+	    else
+		FatalError ("%s died, dubious exit\n", name);
+	}
+    }
+
+    signal (SIGUSR1, oldSigUsr1);
+
+    setenv ("XAUTHORITY", xorgAuth, 1);
+
+    return xorgDisplay;
+}
+
+#endif