svn merge ^/branches/released .

110 files changed, 18206 insertions, 12723 deletions

diff --git a/X11/ChangeLog b/X11/ChangeLog
index 0a7d482a7..3740835ff 100644
--- a/X11/ChangeLog
+++ b/X11/ChangeLog
@@ -1,3 +1,94 @@
+commit cda6ce66caa01997b9dd32eb8689d6e746558369
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date:   Wed Nov 3 00:04:22 2010 -0700
+
+    xproto 7.0.19
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 25bd19ee8587e2c00be7179cf809f4bd8e2a3bed
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date:   Wed Nov 3 00:04:06 2010 -0700
+
+    README: Provide a small description
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit ce8b17064d38ec03527a51c2191674d56989807b
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date:   Sun Oct 31 15:35:52 2010 -0700
+
+    specs: Fix nesting of chapters included in sect1-9.xml
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 14acb707dbd1f49eb0e8e5bf4164f32c3209e030
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date:   Sun Oct 31 14:56:08 2010 -0700
+
+    specs: Move indexterms out of glossdef tags
+    
+    Try to avoid problems similar to those fixed in libX11
+    commit 511c4f6d29b2da4f71093feabcbb3913cb5d12a7
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 0d44b3e4db593f3fb48835c9b39e23ef231efcb7
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date:   Sun Oct 31 14:51:55 2010 -0700
+
+    specs: Restore missing indexterms for request, type, error & event definitions
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit ea96e0e74fca3306c1320a5daf7fb9ff609b3c5a
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date:   Sat Oct 30 20:01:25 2010 -0700
+
+    specs: Convert troff ``quotes'' to DocBook <quote>quotes</quote>
+    
+    perl -i -p -e 's{\`\`([^\047]+)\047\047}{<quote>$1</quote>}g' *.xml
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit d27f326c976d7da9ea43706bca1c3766f225ee6f
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date:   Sat Oct 30 19:54:56 2010 -0700
+
+    specs: Convert .IN troff tags to <indexterm> DocBook Tags
+    
+    Many of the .IN tags seem to have been lost in translation before this.
+    
+    Converted those still in comments with:
+    
+    perl -i -p -e 's{\<\!-- \.IN "([^"]+)" "" "\@DEF\@" --\>}{<indexterm significance="preferred"><primary>$1</primary></indexterm>}' *.xml
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 34b099b7b6e72ceaf8edcbf0ca351af410c3b2fb
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date:   Sat Oct 30 19:26:10 2010 -0700
+
+    specs: Fix authorship section
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit c23cc9a4a728e5cccf685388f2e54eff31c3867f
+Author: Matt Dew <matt@osource.org>
+Date:   Tue Aug 17 20:49:44 2010 -0400
+
+    specs: convert protocol .ms from xorg-docs to DocBook XML
+    
+    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit cb020b302c1ebb9477cd5b4adae8677597269733
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Tue Aug 10 10:20:01 2010 -0400
+
+    xproto 7.0.18
+    
+    Signed-off-by: Adam Jackson <ajax@redhat.com>
+
 commit d14e0d02507dd873f43b1122c468a52ed5b295c1
 Author: Alan Coopersmith <alan.coopersmith@oracle.com>
 Date:   Mon May 17 20:57:27 2010 -0700
diff --git a/X11/Makefile.am b/X11/Makefile.am
index 26b99954a..e9b30cf3b 100644
--- a/X11/Makefile.am
+++ b/X11/Makefile.am
@@ -1,3 +1,5 @@
+SUBDIRS=specs
+
 xprotodir = $(includedir)/X11
 xproto_HEADERS = \
 	ap_keysym.h \
diff --git a/X11/Makefile.in b/X11/Makefile.in
index ad879b15e..814d2dec5 100644
--- a/X11/Makefile.in
+++ b/X11/Makefile.in
@@ -60,6 +60,13 @@ am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
 am__v_at_0 = @
 SOURCES =
 DIST_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
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -85,8 +92,14 @@ am__installdirs = "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(xprotodir)" \
 	"$(DESTDIR)$(xprotodir)"
 DATA = $(pkgconfig_DATA)
 HEADERS = $(nodist_xproto_HEADERS) $(xproto_HEADERS)
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+	distdir dist dist-all distcheck
 ETAGS = etags
 CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
@@ -94,6 +107,31 @@ am__remove_distdir = \
   { test ! -d "$(distdir)" \
     || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
          && rm -fr "$(distdir)"; }; }
+am__relativize = \
+  dir0=`pwd`; \
+  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+  sed_rest='s,^[^/]*/*,,'; \
+  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+  sed_butlast='s,/*[^/]*$$,,'; \
+  while test -n "$$dir1"; do \
+    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+    if test "$$first" != "."; then \
+      if test "$$first" = ".."; then \
+        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+      else \
+        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+        if test "$$first2" = "$$first"; then \
+          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+        else \
+          dir2="../$$dir2"; \
+        fi; \
+        dir0="$$dir0"/"$$first"; \
+      fi; \
+    fi; \
+    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+  done; \
+  reldir="$$dir2"
 DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2
 GZIP_ENV = --best
 distuninstallcheck_listfiles = find . -type f -print
@@ -128,6 +166,7 @@ EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
+FOP = @FOP@
 GREP = @GREP@
 INSTALL = @INSTALL@
 INSTALL_CMD = @INSTALL_CMD@
@@ -153,6 +192,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
@@ -160,9 +200,13 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@
 USE_FDS_BITS = @USE_FDS_BITS@
 VERSION = @VERSION@
+XMLTO = @XMLTO@
 XORG_MAN_PAGE = @XORG_MAN_PAGE@
+XORG_SGML_PATH = @XORG_SGML_PATH@
+XSL_STYLESHEET = @XSL_STYLESHEET@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -213,6 +257,7 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+SUBDIRS = specs
 xprotodir = $(includedir)/X11
 xproto_HEADERS = \
 	ap_keysym.h \
@@ -248,7 +293,7 @@ pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = xproto.pc
 MAINTAINERCLEANFILES = ChangeLog INSTALL
 all: do-not-use-config.h Xfuncproto.h
-	$(MAKE) $(AM_MAKEFLAGS) all-am
+	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 
 .SUFFIXES:
 am--refresh:
@@ -377,6 +422,76 @@ uninstall-xprotoHEADERS:
 	echo " ( cd '$(DESTDIR)$(xprotodir)' && rm -f" $$files ")"; \
 	cd "$(DESTDIR)$(xprotodir)" && rm -f $$files
 
+# 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):
+	@fail= 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; \
+	  ($(am__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):
+	@fail= 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; \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done && test -z "$$fail"
+tags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	done
+ctags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || ($(am__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 \
@@ -387,10 +502,23 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	mkid -fID $$unique
 tags: TAGS
 
-TAGS:  $(HEADERS) $(SOURCES) do-not-use-config.h.in Xfuncproto.h.in $(TAGS_DEPENDENCIES) \
+TAGS: tags-recursive $(HEADERS) $(SOURCES) do-not-use-config.h.in Xfuncproto.h.in $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	set x; \
 	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 || \
+	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
+	  fi; \
+	done; \
 	list='$(SOURCES) $(HEADERS) do-not-use-config.h.in Xfuncproto.h.in $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
@@ -409,7 +537,7 @@ TAGS:  $(HEADERS) $(SOURCES) do-not-use-config.h.in Xfuncproto.h.in $(TAGS_DEPEN
 	  fi; \
 	fi
 ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES) do-not-use-config.h.in Xfuncproto.h.in $(TAGS_DEPENDENCIES) \
+CTAGS: ctags-recursive $(HEADERS) $(SOURCES) do-not-use-config.h.in Xfuncproto.h.in $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	list='$(SOURCES) $(HEADERS) do-not-use-config.h.in Xfuncproto.h.in $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -461,6 +589,34 @@ distdir: $(DISTFILES)
 	    || 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; \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+	    $(am__relativize); \
+	    new_distdir=$$reldir; \
+	    dir1=$$subdir; dir2="$(top_distdir)"; \
+	    $(am__relativize); \
+	    new_top_distdir=$$reldir; \
+	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+	    ($(am__cd) $$subdir && \
+	      $(MAKE) $(AM_MAKEFLAGS) \
+	        top_distdir="$$new_top_distdir" \
+	        distdir="$$new_distdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
+		am__skip_mode_fix=: \
+	        distdir) \
+	      || exit 1; \
+	  fi; \
+	done
 	$(MAKE) $(AM_MAKEFLAGS) \
 	  top_distdir="$(top_distdir)" distdir="$(distdir)" \
 	  dist-hook
@@ -580,21 +736,22 @@ distcleancheck: distclean
 	       $(distcleancheck_listfiles) ; \
 	       exit 1; } >&2
 check-am: all-am
-check: check-am
+check: check-recursive
 all-am: Makefile $(DATA) $(HEADERS) do-not-use-config.h Xfuncproto.h
-installdirs:
+installdirs: installdirs-recursive
+installdirs-am:
 	for dir in "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(xprotodir)" "$(DESTDIR)$(xprotodir)"; 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: 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-am
+installcheck: installcheck-recursive
 install-strip:
 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
 	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
@@ -612,81 +769,83 @@ maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
 	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-clean: clean-am
+clean: clean-recursive
 
 clean-am: clean-generic mostlyclean-am
 
-distclean: distclean-am
+distclean: distclean-recursive
 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
 	-rm -f Makefile
 distclean-am: clean-am distclean-generic distclean-hdr distclean-tags
 
-dvi: dvi-am
+dvi: dvi-recursive
 
 dvi-am:
 
-html: html-am
+html: html-recursive
 
 html-am:
 
-info: info-am
+info: info-recursive
 
 info-am:
 
 install-data-am: install-nodist_xprotoHEADERS install-pkgconfigDATA \
 	install-xprotoHEADERS
 
-install-dvi: install-dvi-am
+install-dvi: install-dvi-recursive
 
 install-dvi-am:
 
 install-exec-am:
 
-install-html: install-html-am
+install-html: install-html-recursive
 
 install-html-am:
 
-install-info: install-info-am
+install-info: install-info-recursive
 
 install-info-am:
 
 install-man:
 
-install-pdf: install-pdf-am
+install-pdf: install-pdf-recursive
 
 install-pdf-am:
 
-install-ps: install-ps-am
+install-ps: install-ps-recursive
 
 install-ps-am:
 
 installcheck-am:
 
-maintainer-clean: maintainer-clean-am
+maintainer-clean: maintainer-clean-recursive
 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
 	-rm -rf $(top_srcdir)/autom4te.cache
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
-mostlyclean: mostlyclean-am
+mostlyclean: mostlyclean-recursive
 
 mostlyclean-am: mostlyclean-generic
 
-pdf: pdf-am
+pdf: pdf-recursive
 
 pdf-am:
 
-ps: ps-am
+ps: ps-recursive
 
 ps-am:
 
 uninstall-am: uninstall-nodist_xprotoHEADERS uninstall-pkgconfigDATA \
 	uninstall-xprotoHEADERS
 
-.MAKE: all install-am install-strip
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \
+	ctags-recursive install-am install-strip tags-recursive
 
-.PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
-	clean-generic ctags dist dist-all dist-bzip2 dist-gzip \
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am am--refresh check check-am clean clean-generic \
+	ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
 	dist-hook dist-lzma dist-shar dist-tarZ dist-xz dist-zip \
 	distcheck distclean distclean-generic distclean-hdr \
 	distclean-tags distcleancheck distdir distuninstallcheck dvi \
@@ -697,10 +856,11 @@ uninstall-am: uninstall-nodist_xprotoHEADERS uninstall-pkgconfigDATA \
 	install-nodist_xprotoHEADERS install-pdf install-pdf-am \
 	install-pkgconfigDATA install-ps install-ps-am install-strip \
 	install-xprotoHEADERS installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
-	uninstall-am uninstall-nodist_xprotoHEADERS \
-	uninstall-pkgconfigDATA uninstall-xprotoHEADERS
+	installdirs-am maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am tags \
+	tags-recursive uninstall uninstall-am \
+	uninstall-nodist_xprotoHEADERS uninstall-pkgconfigDATA \
+	uninstall-xprotoHEADERS
 
 
 .PHONY: ChangeLog INSTALL
diff --git a/X11/README b/X11/README
index f310ce8c7..436f07b24 100644
--- a/X11/README
+++ b/X11/README
@@ -1,4 +1,11 @@
-				X Window System Core Protocol
+		X Window System Core Protocol
+
+This package provides the headers and specification documents defining
+the X Window System Core Protocol, Version 11.
+
+It also includes a number of headers that aren't purely protocol related,
+but are depended upon by many other X Window System packages to provide
+common definitions and porting layer.
 
 All questions regarding this software should be directed at the
 Xorg mailing list:
diff --git a/X11/aclocal.m4 b/X11/aclocal.m4
index b5569bf1f..641b5d91f 100644
--- a/X11/aclocal.m4
+++ b/X11/aclocal.m4
@@ -13,171 +13,1012 @@
 
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.63],,
-[m4_warning([this file was generated for autoconf 2.63.
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],,
+[m4_warning([this file was generated for autoconf 2.68.
 You have another version of autoconf.  It may work, but is not guaranteed to.
 If you have problems, you may need to regenerate the build system entirely.
 To do so, use the procedure documented by the package, typically `autoreconf'.])])
 
-# pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
-# 
-# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
+# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 #
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# This file 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.
+
+# AM_AUTOMAKE_VERSION(VERSION)
+# ----------------------------
+# Automake X.Y traces this macro to ensure aclocal.m4 has been
+# generated from the m4 files accompanying Automake X.Y.
+# (This private macro should not be called outside this file.)
+AC_DEFUN([AM_AUTOMAKE_VERSION],
+[am__api_version='1.11'
+dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
+dnl require some minimum version.  Point them to the right macro.
+m4_if([$1], [1.11.1], [],
+      [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
+])
+
+# _AM_AUTOCONF_VERSION(VERSION)
+# -----------------------------
+# aclocal traces this macro to find the Autoconf version.
+# This is a private macro too.  Using m4_define simplifies
+# the logic in aclocal, which can simply ignore this definition.
+m4_define([_AM_AUTOCONF_VERSION], [])
+
+# AM_SET_CURRENT_AUTOMAKE_VERSION
+# -------------------------------
+# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
+# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
+AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
+[AM_AUTOMAKE_VERSION([1.11.1])dnl
+m4_ifndef([AC_AUTOCONF_VERSION],
+  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
+
+# AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
+
+# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
 #
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
+# This file 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.
+
+# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
+# $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
+# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
 #
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Of course, Automake must honor this variable whenever it calls a
+# tool from the auxiliary directory.  The problem is that $srcdir (and
+# therefore $ac_aux_dir as well) can be either absolute or relative,
+# depending on how configure is run.  This is pretty annoying, since
+# it makes $ac_aux_dir quite unusable in subdirectories: in the top
+# source directory, any form will work fine, but in subdirectories a
+# relative path needs to be adjusted first.
 #
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
+# $ac_aux_dir/missing
+#    fails when called from a subdirectory if $ac_aux_dir is relative
+# $top_srcdir/$ac_aux_dir/missing
+#    fails if $ac_aux_dir is absolute,
+#    fails when called from a subdirectory in a VPATH build with
+#          a relative $ac_aux_dir
+#
+# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
+# are both prefixed by $srcdir.  In an in-source build this is usually
+# harmless because $srcdir is `.', but things will broke when you
+# start a VPATH build or use an absolute $srcdir.
+#
+# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
+# iff we strip the leading $srcdir from $ac_aux_dir.  That would be:
+#   am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
+# and then we would define $MISSING as
+#   MISSING="\${SHELL} $am_aux_dir/missing"
+# This will work as long as MISSING is not called from configure, because
+# unfortunately $(top_srcdir) has no meaning in configure.
+# However there are other variables, like CC, which are often used in
+# configure, and could therefore not use this "fixed" $ac_aux_dir.
+#
+# Another solution, used here, is to always expand $ac_aux_dir to an
+# absolute PATH.  The drawback is that using absolute paths prevent a
+# configured tree to be moved without reconfiguration.
 
-# PKG_PROG_PKG_CONFIG([MIN-VERSION])
-# ----------------------------------
-AC_DEFUN([PKG_PROG_PKG_CONFIG],
-[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
-m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
-AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
-if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
-	AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
+AC_DEFUN([AM_AUX_DIR_EXPAND],
+[dnl Rely on autoconf to set up CDPATH properly.
+AC_PREREQ([2.50])dnl
+# expand $ac_aux_dir to an absolute path
+am_aux_dir=`cd $ac_aux_dir && pwd`
+])
+
+# AM_CONDITIONAL                                            -*- Autoconf -*-
+
+# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008
+# Free Software Foundation, Inc.
+#
+# This file 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.
+
+# serial 9
+
+# AM_CONDITIONAL(NAME, SHELL-CONDITION)
+# -------------------------------------
+# Define a conditional.
+AC_DEFUN([AM_CONDITIONAL],
+[AC_PREREQ(2.52)dnl
+ ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
+	[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
+AC_SUBST([$1_TRUE])dnl
+AC_SUBST([$1_FALSE])dnl
+_AM_SUBST_NOTMAKE([$1_TRUE])dnl
+_AM_SUBST_NOTMAKE([$1_FALSE])dnl
+m4_define([_AM_COND_VALUE_$1], [$2])dnl
+if $2; then
+  $1_TRUE=
+  $1_FALSE='#'
+else
+  $1_TRUE='#'
+  $1_FALSE=
 fi
-if test -n "$PKG_CONFIG"; then
-	_pkg_min_version=m4_default([$1], [0.9.0])
-	AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
-	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-		AC_MSG_RESULT([yes])
-	else
-		AC_MSG_RESULT([no])
-		PKG_CONFIG=""
-	fi
-		
-fi[]dnl
-])# PKG_PROG_PKG_CONFIG
+AC_CONFIG_COMMANDS_PRE(
+[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
+  AC_MSG_ERROR([[conditional "$1" was never defined.
+Usually this means the macro was only invoked conditionally.]])
+fi])])
 
-# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009
+# Free Software Foundation, Inc.
 #
-# Check to see whether a particular set of modules exists.  Similar
-# to PKG_CHECK_MODULES(), but does not set variables or print errors.
+# This file 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.
+
+# serial 10
+
+# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
+# written in clear, in which case automake, when reading aclocal.m4,
+# will think it sees a *use*, and therefore will trigger all it's
+# C support machinery.  Also note that it means that autoscan, seeing
+# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
+
+
+# _AM_DEPENDENCIES(NAME)
+# ----------------------
+# See how the compiler implements dependency checking.
+# NAME is "CC", "CXX", "GCJ", or "OBJC".
+# We try a few techniques and use that to set a single cache variable.
 #
+# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
+# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
+# dependency, and given that the user is not expected to run this macro,
+# just rely on AC_PROG_CC.
+AC_DEFUN([_AM_DEPENDENCIES],
+[AC_REQUIRE([AM_SET_DEPDIR])dnl
+AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
+AC_REQUIRE([AM_MAKE_INCLUDE])dnl
+AC_REQUIRE([AM_DEP_TRACK])dnl
+
+ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=],
+       [$1], CXX,  [depcc="$CXX"  am_compiler_list=],
+       [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
+       [$1], UPC,  [depcc="$UPC"  am_compiler_list=],
+       [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
+                   [depcc="$$1"   am_compiler_list=])
+
+AC_CACHE_CHECK([dependency style of $depcc],
+               [am_cv_$1_dependencies_compiler_type],
+[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+  # We make a subdir and do the tests there.  Otherwise we can end up
+  # making bogus files that we don't know about and never remove.  For
+  # instance it was reported that on HP-UX the gcc test will end up
+  # making a dummy file named `D' -- because `-MD' means `put the output
+  # in D'.
+  mkdir conftest.dir
+  # Copy depcomp to subdir because otherwise we won't find it if we're
+  # using a relative directory.
+  cp "$am_depcomp" conftest.dir
+  cd conftest.dir
+  # We will build objects and dependencies in a subdirectory because
+  # it helps to detect inapplicable dependency modes.  For instance
+  # both Tru64's cc and ICC support -MD to output dependencies as a
+  # side effect of compilation, but ICC will put the dependencies in
+  # the current directory while Tru64 will put them in the object
+  # directory.
+  mkdir sub
+
+  am_cv_$1_dependencies_compiler_type=none
+  if test "$am_compiler_list" = ""; then
+     am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
+  fi
+  am__universal=false
+  m4_case([$1], [CC],
+    [case " $depcc " in #(
+     *\ -arch\ *\ -arch\ *) am__universal=true ;;
+     esac],
+    [CXX],
+    [case " $depcc " in #(
+     *\ -arch\ *\ -arch\ *) am__universal=true ;;
+     esac])
+
+  for depmode in $am_compiler_list; do
+    # Setup a source with many dependencies, because some compilers
+    # like to wrap large dependency lists on column 80 (with \), and
+    # we should not choose a depcomp mode which is confused by this.
+    #
+    # We need to recreate these files for each test, as the compiler may
+    # overwrite some of them when testing with obscure command lines.
+    # This happens at least with the AIX C compiler.
+    : > sub/conftest.c
+    for i in 1 2 3 4 5 6; do
+      echo '#include "conftst'$i'.h"' >> sub/conftest.c
+      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
+      # Solaris 8's {/usr,}/bin/sh.
+      touch sub/conftst$i.h
+    done
+    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+
+    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+    # mode.  It turns out that the SunPro C++ compiler does not properly
+    # handle `-M -o', and we need to detect this.  Also, some Intel
+    # versions had trouble with output in subdirs
+    am__obj=sub/conftest.${OBJEXT-o}
+    am__minus_obj="-o $am__obj"
+    case $depmode in
+    gcc)
+      # This depmode causes a compiler race in universal mode.
+      test "$am__universal" = false || continue
+      ;;
+    nosideeffect)
+      # after this tag, mechanisms are not by side-effect, so they'll
+      # only be used when explicitly requested
+      if test "x$enable_dependency_tracking" = xyes; then
+	continue
+      else
+	break
+      fi
+      ;;
+    msvisualcpp | msvcmsys)
+      # This compiler won't grok `-c -o', but also, the minuso test has
+      # not run yet.  These depmodes are late enough in the game, and
+      # so weak that their functioning should not be impacted.
+      am__obj=conftest.${OBJEXT-o}
+      am__minus_obj=
+      ;;
+    none) break ;;
+    esac
+    if depmode=$depmode \
+       source=sub/conftest.c object=$am__obj \
+       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
+         >/dev/null 2>conftest.err &&
+       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
+       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+      # icc doesn't choke on unknown options, it will just issue warnings
+      # or remarks (even with -Werror).  So we grep stderr for any message
+      # that says an option was ignored or not supported.
+      # When given -MP, icc 7.0 and 7.1 complain thusly:
+      #   icc: Command line warning: ignoring option '-M'; no argument required
+      # The diagnosis changed in icc 8.0:
+      #   icc: Command line remark: option '-MP' not supported
+      if (grep 'ignoring option' conftest.err ||
+          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
+        am_cv_$1_dependencies_compiler_type=$depmode
+        break
+      fi
+    fi
+  done
+
+  cd ..
+  rm -rf conftest.dir
+else
+  am_cv_$1_dependencies_compiler_type=none
+fi
+])
+AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
+AM_CONDITIONAL([am__fastdep$1], [
+  test "x$enable_dependency_tracking" != xno \
+  && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
+])
+
+
+# AM_SET_DEPDIR
+# -------------
+# Choose a directory name for dependency files.
+# This macro is AC_REQUIREd in _AM_DEPENDENCIES
+AC_DEFUN([AM_SET_DEPDIR],
+[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
+AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
+])
+
+
+# AM_DEP_TRACK
+# ------------
+AC_DEFUN([AM_DEP_TRACK],
+[AC_ARG_ENABLE(dependency-tracking,
+[  --disable-dependency-tracking  speeds up one-time build
+  --enable-dependency-tracking   do not reject slow dependency extractors])
+if test "x$enable_dependency_tracking" != xno; then
+  am_depcomp="$ac_aux_dir/depcomp"
+  AMDEPBACKSLASH='\'
+fi
+AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
+AC_SUBST([AMDEPBACKSLASH])dnl
+_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
+])
+
+# Generate code to set up dependency tracking.              -*- Autoconf -*-
+
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
+# Free Software Foundation, Inc.
 #
-# Similar to PKG_CHECK_MODULES, make sure that the first instance of
-# this or PKG_CHECK_MODULES is called, or make sure to call
-# PKG_CHECK_EXISTS manually
-# --------------------------------------------------------------
-AC_DEFUN([PKG_CHECK_EXISTS],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-if test -n "$PKG_CONFIG" && \
-    AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
-  m4_ifval([$2], [$2], [:])
-m4_ifvaln([$3], [else
-  $3])dnl
-fi])
+# This file 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.
 
+#serial 5
 
-# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
-# ---------------------------------------------
-m4_define([_PKG_CONFIG],
-[if test -n "$$1"; then
-    pkg_cv_[]$1="$$1"
- elif test -n "$PKG_CONFIG"; then
-    PKG_CHECK_EXISTS([$3],
-                     [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
-		     [pkg_failed=yes])
- else
-    pkg_failed=untried
-fi[]dnl
-])# _PKG_CONFIG
+# _AM_OUTPUT_DEPENDENCY_COMMANDS
+# ------------------------------
+AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
+[{
+  # Autoconf 2.62 quotes --file arguments for eval, but not when files
+  # are listed without --file.  Let's play safe and only enable the eval
+  # if we detect the quoting.
+  case $CONFIG_FILES in
+  *\'*) eval set x "$CONFIG_FILES" ;;
+  *)   set x $CONFIG_FILES ;;
+  esac
+  shift
+  for mf
+  do
+    # Strip MF so we end up with the name of the file.
+    mf=`echo "$mf" | sed -e 's/:.*$//'`
+    # Check whether this is an Automake generated Makefile or not.
+    # We used to match only the files named `Makefile.in', but
+    # some people rename them; so instead we look at the file content.
+    # Grep'ing the first line is not enough: some people post-process
+    # each Makefile.in and add a new line on top of each file to say so.
+    # Grep'ing the whole file is not good either: AIX grep has a line
+    # limit of 2048, but all sed's we know have understand at least 4000.
+    if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
+      dirpart=`AS_DIRNAME("$mf")`
+    else
+      continue
+    fi
+    # Extract the definition of DEPDIR, am__include, and am__quote
+    # from the Makefile without running `make'.
+    DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
+    test -z "$DEPDIR" && continue
+    am__include=`sed -n 's/^am__include = //p' < "$mf"`
+    test -z "am__include" && continue
+    am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
+    # When using ansi2knr, U may be empty or an underscore; expand it
+    U=`sed -n 's/^U = //p' < "$mf"`
+    # Find all dependency output files, they are included files with
+    # $(DEPDIR) in their names.  We invoke sed twice because it is the
+    # simplest approach to changing $(DEPDIR) to its actual value in the
+    # expansion.
+    for file in `sed -n "
+      s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
+	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+      # Make sure the directory exists.
+      test -f "$dirpart/$file" && continue
+      fdir=`AS_DIRNAME(["$file"])`
+      AS_MKDIR_P([$dirpart/$fdir])
+      # echo "creating $dirpart/$file"
+      echo '# dummy' > "$dirpart/$file"
+    done
+  done
+}
+])# _AM_OUTPUT_DEPENDENCY_COMMANDS
 
-# _PKG_SHORT_ERRORS_SUPPORTED
+
+# AM_OUTPUT_DEPENDENCY_COMMANDS
 # -----------------------------
-AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
+# This macro should only be invoked once -- use via AC_REQUIRE.
+#
+# This code is only required when automatic dependency tracking
+# is enabled.  FIXME.  This creates each `.P' file that we will
+# need in order to bootstrap the dependency handling code.
+AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
+[AC_CONFIG_COMMANDS([depfiles],
+     [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
+     [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
+])
+
+# Do all the work for Automake.                             -*- Autoconf -*-
+
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+# 2005, 2006, 2008, 2009 Free Software Foundation, Inc.
+#
+# This file 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.
+
+# serial 16
+
+# This macro actually does too much.  Some checks are only needed if
+# your package does certain things.  But this isn't really a big deal.
+
+# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
+# AM_INIT_AUTOMAKE([OPTIONS])
+# -----------------------------------------------
+# The call with PACKAGE and VERSION arguments is the old style
+# call (pre autoconf-2.50), which is being phased out.  PACKAGE
+# and VERSION should now be passed to AC_INIT and removed from
+# the call to AM_INIT_AUTOMAKE.
+# We support both call styles for the transition.  After
+# the next Automake release, Autoconf can make the AC_INIT
+# arguments mandatory, and then we can depend on a new Autoconf
+# release and drop the old call support.
+AC_DEFUN([AM_INIT_AUTOMAKE],
+[AC_PREREQ([2.62])dnl
+dnl Autoconf wants to disallow AM_ names.  We explicitly allow
+dnl the ones we care about.
+m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
+AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
+AC_REQUIRE([AC_PROG_INSTALL])dnl
+if test "`cd $srcdir && pwd`" != "`pwd`"; then
+  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
+  # is not polluted with repeated "-I."
+  AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
+  # test to see if srcdir already configured
+  if test -f $srcdir/config.status; then
+    AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
+  fi
+fi
+
+# test whether we have cygpath
+if test -z "$CYGPATH_W"; then
+  if (cygpath --version) >/dev/null 2>/dev/null; then
+    CYGPATH_W='cygpath -w'
+  else
+    CYGPATH_W=echo
+  fi
+fi
+AC_SUBST([CYGPATH_W])
+
+# Define the identity of the package.
+dnl Distinguish between old-style and new-style calls.
+m4_ifval([$2],
+[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
+ AC_SUBST([PACKAGE], [$1])dnl
+ AC_SUBST([VERSION], [$2])],
+[_AM_SET_OPTIONS([$1])dnl
+dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
+m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
+  [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
+ AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
+ AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
+
+_AM_IF_OPTION([no-define],,
+[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
+ AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
+
+# Some tools Automake needs.
+AC_REQUIRE([AM_SANITY_CHECK])dnl
+AC_REQUIRE([AC_ARG_PROGRAM])dnl
+AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
+AM_MISSING_PROG(AUTOCONF, autoconf)
+AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
+AM_MISSING_PROG(AUTOHEADER, autoheader)
+AM_MISSING_PROG(MAKEINFO, makeinfo)
+AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
+AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
+AC_REQUIRE([AM_PROG_MKDIR_P])dnl
+# We need awk for the "check" target.  The system "awk" is bad on
+# some platforms.
+AC_REQUIRE([AC_PROG_AWK])dnl
+AC_REQUIRE([AC_PROG_MAKE_SET])dnl
+AC_REQUIRE([AM_SET_LEADING_DOT])dnl
+_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
+	      [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
+			     [_AM_PROG_TAR([v7])])])
+_AM_IF_OPTION([no-dependencies],,
+[AC_PROVIDE_IFELSE([AC_PROG_CC],
+		  [_AM_DEPENDENCIES(CC)],
+		  [define([AC_PROG_CC],
+			  defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_CXX],
+		  [_AM_DEPENDENCIES(CXX)],
+		  [define([AC_PROG_CXX],
+			  defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_OBJC],
+		  [_AM_DEPENDENCIES(OBJC)],
+		  [define([AC_PROG_OBJC],
+			  defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
+])
+_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl
+dnl The `parallel-tests' driver may need to know about EXEEXT, so add the
+dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This macro
+dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.
+AC_CONFIG_COMMANDS_PRE(dnl
+[m4_provide_if([_AM_COMPILER_EXEEXT],
+  [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
+])
+
+dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
+dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
+dnl mangled by Autoconf and run in a shell conditional statement.
+m4_define([_AC_COMPILER_EXEEXT],
+m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
+
+
+# When config.status generates a header, we must update the stamp-h file.
+# This file resides in the same directory as the config header
+# that is generated.  The stamp files are numbered to have different names.
+
+# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
+# loop where config.status creates the headers, so we can generate
+# our stamp files there.
+AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
+[# Compute $1's index in $config_headers.
+_am_arg=$1
+_am_stamp_count=1
+for _am_header in $config_headers :; do
+  case $_am_header in
+    $_am_arg | $_am_arg:* )
+      break ;;
+    * )
+      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
+  esac
+done
+echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
+
+# Copyright (C) 2001, 2003, 2005, 2008  Free Software Foundation, Inc.
+#
+# This file 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.
+
+# AM_PROG_INSTALL_SH
+# ------------------
+# Define $install_sh.
+AC_DEFUN([AM_PROG_INSTALL_SH],
+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+if test x"${install_sh}" != xset; then
+  case $am_aux_dir in
+  *\ * | *\	*)
+    install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
+  *)
+    install_sh="\${SHELL} $am_aux_dir/install-sh"
+  esac
+fi
+AC_SUBST(install_sh)])
+
+# Copyright (C) 2003, 2005  Free Software Foundation, Inc.
+#
+# This file 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.
+
+# serial 2
+
+# Check whether the underlying file-system supports filenames
+# with a leading dot.  For instance MS-DOS doesn't.
+AC_DEFUN([AM_SET_LEADING_DOT],
+[rm -rf .tst 2>/dev/null
+mkdir .tst 2>/dev/null
+if test -d .tst; then
+  am__leading_dot=.
 else
-        _pkg_short_errors_supported=no
-fi[]dnl
-])# _PKG_SHORT_ERRORS_SUPPORTED
+  am__leading_dot=_
+fi
+rmdir .tst 2>/dev/null
+AC_SUBST([am__leading_dot])])
 
+# Add --enable-maintainer-mode option to configure.         -*- Autoconf -*-
+# From Jim Meyering
 
-# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
-# [ACTION-IF-NOT-FOUND])
+# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008
+# Free Software Foundation, Inc.
 #
+# This file 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.
+
+# serial 5
+
+# AM_MAINTAINER_MODE([DEFAULT-MODE])
+# ----------------------------------
+# Control maintainer-specific portions of Makefiles.
+# Default is to disable them, unless `enable' is passed literally.
+# For symmetry, `disable' may be passed as well.  Anyway, the user
+# can override the default with the --enable/--disable switch.
+AC_DEFUN([AM_MAINTAINER_MODE],
+[m4_case(m4_default([$1], [disable]),
+       [enable], [m4_define([am_maintainer_other], [disable])],
+       [disable], [m4_define([am_maintainer_other], [enable])],
+       [m4_define([am_maintainer_other], [enable])
+        m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])])
+AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles])
+  dnl maintainer-mode's default is 'disable' unless 'enable' is passed
+  AC_ARG_ENABLE([maintainer-mode],
+[  --][am_maintainer_other][-maintainer-mode  am_maintainer_other make rules and dependencies not useful
+			  (and sometimes confusing) to the casual installer],
+      [USE_MAINTAINER_MODE=$enableval],
+      [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes]))
+  AC_MSG_RESULT([$USE_MAINTAINER_MODE])
+  AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes])
+  MAINT=$MAINTAINER_MODE_TRUE
+  AC_SUBST([MAINT])dnl
+]
+)
+
+AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
+
+# Check to see how 'make' treats includes.	            -*- Autoconf -*-
+
+# Copyright (C) 2001, 2002, 2003, 2005, 2009  Free Software Foundation, Inc.
 #
-# Note that if there is a possibility the first call to
-# PKG_CHECK_MODULES might not happen, you should be sure to include an
-# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
+# This file 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.
+
+# serial 4
+
+# AM_MAKE_INCLUDE()
+# -----------------
+# Check to see how make treats includes.
+AC_DEFUN([AM_MAKE_INCLUDE],
+[am_make=${MAKE-make}
+cat > confinc << 'END'
+am__doit:
+	@echo this is the am__doit target
+.PHONY: am__doit
+END
+# If we don't find an include directive, just comment out the code.
+AC_MSG_CHECKING([for style of include used by $am_make])
+am__include="#"
+am__quote=
+_am_result=none
+# First try GNU make style include.
+echo "include confinc" > confmf
+# Ignore all kinds of additional output from `make'.
+case `$am_make -s -f confmf 2> /dev/null` in #(
+*the\ am__doit\ target*)
+  am__include=include
+  am__quote=
+  _am_result=GNU
+  ;;
+esac
+# Now try BSD make style include.
+if test "$am__include" = "#"; then
+   echo '.include "confinc"' > confmf
+   case `$am_make -s -f confmf 2> /dev/null` in #(
+   *the\ am__doit\ target*)
+     am__include=.include
+     am__quote="\""
+     _am_result=BSD
+     ;;
+   esac
+fi
+AC_SUBST([am__include])
+AC_SUBST([am__quote])
+AC_MSG_RESULT([$_am_result])
+rm -f confinc confmf
+])
+
+# Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
+
+# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008
+# Free Software Foundation, Inc.
 #
+# This file 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.
+
+# serial 6
+
+# AM_MISSING_PROG(NAME, PROGRAM)
+# ------------------------------
+AC_DEFUN([AM_MISSING_PROG],
+[AC_REQUIRE([AM_MISSING_HAS_RUN])
+$1=${$1-"${am_missing_run}$2"}
+AC_SUBST($1)])
+
+
+# AM_MISSING_HAS_RUN
+# ------------------
+# Define MISSING if not defined so far and test if it supports --run.
+# If it does, set am_missing_run to use it, otherwise, to nothing.
+AC_DEFUN([AM_MISSING_HAS_RUN],
+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+AC_REQUIRE_AUX_FILE([missing])dnl
+if test x"${MISSING+set}" != xset; then
+  case $am_aux_dir in
+  *\ * | *\	*)
+    MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
+  *)
+    MISSING="\${SHELL} $am_aux_dir/missing" ;;
+  esac
+fi
+# Use eval to expand $SHELL
+if eval "$MISSING --run true"; then
+  am_missing_run="$MISSING --run "
+else
+  am_missing_run=
+  AC_MSG_WARN([`missing' script is too old or missing])
+fi
+])
+
+# Copyright (C) 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 #
-# --------------------------------------------------------------
-AC_DEFUN([PKG_CHECK_MODULES],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
-AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
+# This file 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.
 
-pkg_failed=no
-AC_MSG_CHECKING([for $1])
+# AM_PROG_MKDIR_P
+# ---------------
+# Check for `mkdir -p'.
+AC_DEFUN([AM_PROG_MKDIR_P],
+[AC_PREREQ([2.60])dnl
+AC_REQUIRE([AC_PROG_MKDIR_P])dnl
+dnl Automake 1.8 to 1.9.6 used to define mkdir_p.  We now use MKDIR_P,
+dnl while keeping a definition of mkdir_p for backward compatibility.
+dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
+dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
+dnl Makefile.ins that do not define MKDIR_P, so we do our own
+dnl adjustment using top_builddir (which is defined more often than
+dnl MKDIR_P).
+AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
+case $mkdir_p in
+  [[\\/$]]* | ?:[[\\/]]*) ;;
+  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
+esac
+])
 
-_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
-_PKG_CONFIG([$1][_LIBS], [libs], [$2])
+# Helper functions for option handling.                     -*- Autoconf -*-
 
-m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
-and $1[]_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.])
+# Copyright (C) 2001, 2002, 2003, 2005, 2008  Free Software Foundation, Inc.
+#
+# This file 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.
 
-if test $pkg_failed = yes; then
-        _PKG_SHORT_ERRORS_SUPPORTED
-        if test $_pkg_short_errors_supported = yes; then
-	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
-        else 
-	        $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
+# serial 4
 
-	ifelse([$4], , [AC_MSG_ERROR(dnl
-[Package requirements ($2) were not met:
+# _AM_MANGLE_OPTION(NAME)
+# -----------------------
+AC_DEFUN([_AM_MANGLE_OPTION],
+[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
 
-$$1_PKG_ERRORS
+# _AM_SET_OPTION(NAME)
+# ------------------------------
+# Set option NAME.  Presently that only means defining a flag for this option.
+AC_DEFUN([_AM_SET_OPTION],
+[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
 
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
+# _AM_SET_OPTIONS(OPTIONS)
+# ----------------------------------
+# OPTIONS is a space-separated list of Automake options.
+AC_DEFUN([_AM_SET_OPTIONS],
+[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
 
-_PKG_TEXT
-])],
-		[AC_MSG_RESULT([no])
-                $4])
-elif test $pkg_failed = untried; then
-	ifelse([$4], , [AC_MSG_FAILURE(dnl
-[The pkg-config script could not be found or is too old.  Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
+# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
+# -------------------------------------------
+# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
+AC_DEFUN([_AM_IF_OPTION],
+[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
 
-_PKG_TEXT
+# Check to make sure that the build environment is sane.    -*- Autoconf -*-
 
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
-		[$4])
+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008
+# Free Software Foundation, Inc.
+#
+# This file 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.
+
+# serial 5
+
+# AM_SANITY_CHECK
+# ---------------
+AC_DEFUN([AM_SANITY_CHECK],
+[AC_MSG_CHECKING([whether build environment is sane])
+# Just in case
+sleep 1
+echo timestamp > conftest.file
+# Reject unsafe characters in $srcdir or the absolute working directory
+# name.  Accept space and tab only in the latter.
+am_lf='
+'
+case `pwd` in
+  *[[\\\"\#\$\&\'\`$am_lf]]*)
+    AC_MSG_ERROR([unsafe absolute working directory name]);;
+esac
+case $srcdir in
+  *[[\\\"\#\$\&\'\`$am_lf\ \	]]*)
+    AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);;
+esac
+
+# Do `set' in a subshell so we don't clobber the current shell's
+# arguments.  Must try -L first in case configure is actually a
+# symlink; some systems play weird games with the mod time of symlinks
+# (eg FreeBSD returns the mod time of the symlink's containing
+# directory).
+if (
+   set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+   if test "$[*]" = "X"; then
+      # -L didn't work.
+      set X `ls -t "$srcdir/configure" conftest.file`
+   fi
+   rm -f conftest.file
+   if test "$[*]" != "X $srcdir/configure conftest.file" \
+      && test "$[*]" != "X conftest.file $srcdir/configure"; then
+
+      # If neither matched, then we have a broken ls.  This can happen
+      # if, for instance, CONFIG_SHELL is bash and it inherits a
+      # broken ls alias from the environment.  This has actually
+      # happened.  Such a system could not be considered "sane".
+      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
+alias in your environment])
+   fi
+
+   test "$[2]" = conftest.file
+   )
+then
+   # Ok.
+   :
 else
-	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
-	$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
-        AC_MSG_RESULT([yes])
-	ifelse([$3], , :, [$3])
-fi[]dnl
-])# PKG_CHECK_MODULES
+   AC_MSG_ERROR([newly created file is older than distributed files!
+Check your system clock])
+fi
+AC_MSG_RESULT(yes)])
+
+# Copyright (C) 2009  Free Software Foundation, Inc.
+#
+# This file 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.
+
+# serial 1
+
+# AM_SILENT_RULES([DEFAULT])
+# --------------------------
+# Enable less verbose build rules; with the default set to DEFAULT
+# (`yes' being less verbose, `no' or empty being verbose).
+AC_DEFUN([AM_SILENT_RULES],
+[AC_ARG_ENABLE([silent-rules],
+[  --enable-silent-rules          less verbose build output (undo: `make V=1')
+  --disable-silent-rules         verbose build output (undo: `make V=0')])
+case $enable_silent_rules in
+yes) AM_DEFAULT_VERBOSITY=0;;
+no)  AM_DEFAULT_VERBOSITY=1;;
+*)   AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
+esac
+AC_SUBST([AM_DEFAULT_VERBOSITY])dnl
+AM_BACKSLASH='\'
+AC_SUBST([AM_BACKSLASH])dnl
+_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
+])
+
+# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
+#
+# This file 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.
+
+# AM_PROG_INSTALL_STRIP
+# ---------------------
+# One issue with vendor `install' (even GNU) is that you can't
+# specify the program used to strip binaries.  This is especially
+# annoying in cross-compiling environments, where the build's strip
+# is unlikely to handle the host's binaries.
+# Fortunately install-sh will honor a STRIPPROG variable, so we
+# always use install-sh in `make install-strip', and initialize
+# STRIPPROG with the value of the STRIP variable (set by the user).
+AC_DEFUN([AM_PROG_INSTALL_STRIP],
+[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
+# Installed binaries are usually stripped using `strip' when the user
+# run `make install-strip'.  However `strip' might not be the right
+# tool to use in cross-compilation environments, therefore Automake
+# will honor the `STRIP' environment variable to overrule this program.
+dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
+if test "$cross_compiling" != no; then
+  AC_CHECK_TOOL([STRIP], [strip], :)
+fi
+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
+AC_SUBST([INSTALL_STRIP_PROGRAM])])
+
+# Copyright (C) 2006, 2008  Free Software Foundation, Inc.
+#
+# This file 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.
+
+# serial 2
+
+# _AM_SUBST_NOTMAKE(VARIABLE)
+# ---------------------------
+# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
+# This macro is traced by Automake.
+AC_DEFUN([_AM_SUBST_NOTMAKE])
+
+# AM_SUBST_NOTMAKE(VARIABLE)
+# ---------------------------
+# Public sister of _AM_SUBST_NOTMAKE.
+AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
+
+# Check how to create a tarball.                            -*- Autoconf -*-
+
+# Copyright (C) 2004, 2005  Free Software Foundation, Inc.
+#
+# This file 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.
+
+# serial 2
+
+# _AM_PROG_TAR(FORMAT)
+# --------------------
+# Check how to create a tarball in format FORMAT.
+# FORMAT should be one of `v7', `ustar', or `pax'.
+#
+# Substitute a variable $(am__tar) that is a command
+# writing to stdout a FORMAT-tarball containing the directory
+# $tardir.
+#     tardir=directory && $(am__tar) > result.tar
+#
+# Substitute a variable $(am__untar) that extract such
+# a tarball read from stdin.
+#     $(am__untar) < result.tar
+AC_DEFUN([_AM_PROG_TAR],
+[# Always define AMTAR for backward compatibility.
+AM_MISSING_PROG([AMTAR], [tar])
+m4_if([$1], [v7],
+     [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
+     [m4_case([$1], [ustar],, [pax],,
+              [m4_fatal([Unknown tar format])])
+AC_MSG_CHECKING([how to create a $1 tar archive])
+# Loop over all known methods to create a tar archive until one works.
+_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
+_am_tools=${am_cv_prog_tar_$1-$_am_tools}
+# Do not fold the above two line into one, because Tru64 sh and
+# Solaris sh will not grok spaces in the rhs of `-'.
+for _am_tool in $_am_tools
+do
+  case $_am_tool in
+  gnutar)
+    for _am_tar in tar gnutar gtar;
+    do
+      AM_RUN_LOG([$_am_tar --version]) && break
+    done
+    am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
+    am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
+    am__untar="$_am_tar -xf -"
+    ;;
+  plaintar)
+    # Must skip GNU tar: if it does not support --format= it doesn't create
+    # ustar tarball either.
+    (tar --version) >/dev/null 2>&1 && continue
+    am__tar='tar chf - "$$tardir"'
+    am__tar_='tar chf - "$tardir"'
+    am__untar='tar xf -'
+    ;;
+  pax)
+    am__tar='pax -L -x $1 -w "$$tardir"'
+    am__tar_='pax -L -x $1 -w "$tardir"'
+    am__untar='pax -r'
+    ;;
+  cpio)
+    am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
+    am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
+    am__untar='cpio -i -H $1 -d'
+    ;;
+  none)
+    am__tar=false
+    am__tar_=false
+    am__untar=false
+    ;;
+  esac
+
+  # If the value was cached, stop now.  We just wanted to have am__tar
+  # and am__untar set.
+  test -n "${am_cv_prog_tar_$1}" && break
+
+  # tar/untar a dummy directory, and stop if the command works
+  rm -rf conftest.dir
+  mkdir conftest.dir
+  echo GrepMe > conftest.dir/file
+  AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
+  rm -rf conftest.dir
+  if test -s conftest.tar; then
+    AM_RUN_LOG([$am__untar <conftest.tar])
+    grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
+  fi
+done
+rm -rf conftest.dir
+
+AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
+AC_MSG_RESULT([$am_cv_prog_tar_$1])])
+AC_SUBST([am__tar])
+AC_SUBST([am__untar])
+]) # _AM_PROG_TAR
 
 dnl xorg-macros.m4.  Generated from xorg-macros.m4.in xorgversion.m4 by configure.
 dnl
-dnl Copyright 2005-2006 Sun Microsystems, Inc.  All rights reserved.
+dnl Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
 dnl 
 dnl Permission is hereby granted, free of charge, to any person obtaining a
 dnl copy of this software and associated documentation files (the "Software"),
@@ -214,7 +1055,7 @@ dnl DEALINGS IN THE SOFTWARE.
 # See the "minimum version" comment for each macro you use to see what 
 # version you require.
 m4_defun([XORG_MACROS_VERSION],[
-m4_define([vers_have], [1.8.0])
+m4_define([vers_have], [1.11.0])
 m4_define([maj_have], m4_substr(vers_have, 0, m4_index(vers_have, [.])))
 m4_define([maj_needed], m4_substr([$1], 0, m4_index([$1], [.])))
 m4_if(m4_cmp(maj_have, maj_needed), 0,,
@@ -365,6 +1206,7 @@ MAN_SUBSTS="\
 	-e 's|__xservername__|Xorg|g' \
 	-e 's|__xconfigfile__|xorg.conf|g' \
 	-e 's|__projectroot__|\$(prefix)|g' \
+	-e 's|__apploaddir__|\$(appdefaultdir)|g' \
 	-e 's|__appmansuffix__|\$(APP_MAN_SUFFIX)|g' \
 	-e 's|__drivermansuffix__|\$(DRIVER_MAN_SUFFIX)|g' \
 	-e 's|__adminmansuffix__|\$(ADMIN_MAN_SUFFIX)|g' \
@@ -393,13 +1235,20 @@ PKG_CHECK_EXISTS([xorg-sgml-doctools m4_ifval([$1],[>= $1])],
          fi])
     ])
 
+# Define variables STYLESHEET_SRCDIR and XSL_STYLESHEET containing
+# the path and the name of the doc stylesheet
 if test "x$XORG_SGML_PATH" != "x" ; then
    AC_MSG_RESULT([$XORG_SGML_PATH])
+   STYLESHEET_SRCDIR=$XORG_SGML_PATH/X11
+   XSL_STYLESHEET=$STYLESHEET_SRCDIR/xorg.xsl
 else
    AC_MSG_RESULT([no])
 fi
 
 AC_SUBST(XORG_SGML_PATH)
+AC_SUBST(STYLESHEET_SRCDIR)
+AC_SUBST(XSL_STYLESHEET)
+AM_CONDITIONAL([HAVE_STYLESHEETS], [test "x$XSL_STYLESHEET" != "x"])
 ]) # XORG_CHECK_SGML_DOCTOOLS
 
 # XORG_CHECK_LINUXDOC
@@ -515,15 +1364,17 @@ AC_SUBST(MAKE_PDF)
 AC_SUBST(MAKE_HTML)
 ]) # XORG_CHECK_DOCBOOK
 
-# XORG_WITH_XMLTO([MIN-VERSION])
+# XORG_WITH_XMLTO([MIN-VERSION], [DEFAULT])
 # ----------------
 # Minimum version: 1.5.0
+# Minimum version for optional DEFAULT argument: 1.11.0
 #
 # Documentation tools are not always available on all platforms and sometimes
 # not at the appropriate level. This macro enables a module to test for the
 # presence of the tool and obtain it's path in separate variables. Coupled with
 # the --with-xmlto option, it allows maximum flexibilty in making decisions
-# as whether or not to use the xmlto package.
+# as whether or not to use the xmlto package. When DEFAULT is not specified,
+# --with-xmlto assumes 'auto'.
 #
 # Interface to module:
 # HAVE_XMLTO: 	used in makefiles to conditionally generate documentation
@@ -532,14 +1383,20 @@ AC_SUBST(MAKE_HTML)
 # --with-xmlto:	'yes' user instructs the module to use xmlto
 #		'no' user instructs the module not to use xmlto
 #
+# Added in version 1.10.0
+# HAVE_XMLTO_TEXT: used in makefiles to conditionally generate text documentation
+#                  xmlto for text output requires either lynx, links, or w3m browsers
+#
 # If the user sets the value of XMLTO, AC_PATH_PROG skips testing the path.
 #
 AC_DEFUN([XORG_WITH_XMLTO],[
 AC_ARG_VAR([XMLTO], [Path to xmlto command])
+m4_define([_defopt], m4_default([$2], [auto]))
 AC_ARG_WITH(xmlto,
 	AS_HELP_STRING([--with-xmlto],
-	   [Use xmlto to regenerate documentation (default: yes, if installed)]),
-	   [use_xmlto=$withval], [use_xmlto=auto])
+	   [Use xmlto to regenerate documentation (default: ]_defopt[)]),
+	   [use_xmlto=$withval], [use_xmlto=]_defopt)
+m4_undefine([_defopt])
 
 if test "x$use_xmlto" = x"auto"; then
    AC_PATH_PROG([XMLTO], [xmlto])
@@ -563,6 +1420,8 @@ elif test "x$use_xmlto" = x"no" ; then
 else
    AC_MSG_ERROR([--with-xmlto expects 'yes' or 'no'])
 fi
+
+# Test for a minimum version of xmlto, if provided.
 m4_ifval([$1],
 [if test "$have_xmlto" = yes; then
     # scrape the xmlto version
@@ -577,18 +1436,31 @@ m4_ifval([$1],
             AC_MSG_ERROR([xmlto version $xmlto_version found, but $1 needed])
         fi])
 fi])
+
+# Test for the ability of xmlto to generate a text target
+have_xmlto_text=no
+cat > conftest.xml << "EOF"
+EOF
+AS_IF([test "$have_xmlto" = yes],
+      [AS_IF([$XMLTO --skip-validation txt conftest.xml >/dev/null 2>&1],
+             [have_xmlto_text=yes],
+             [AC_MSG_WARN([xmlto cannot generate text format, this format skipped])])])
+rm -f conftest.xml
+AM_CONDITIONAL([HAVE_XMLTO_TEXT], [test $have_xmlto_text = yes])
 AM_CONDITIONAL([HAVE_XMLTO], [test "$have_xmlto" = yes])
 ]) # XORG_WITH_XMLTO
 
-# XORG_WITH_ASCIIDOC([MIN-VERSION])
+# XORG_WITH_ASCIIDOC([MIN-VERSION], [DEFAULT])
 # ----------------
 # Minimum version: 1.5.0
+# Minimum version for optional DEFAULT argument: 1.11.0
 #
 # Documentation tools are not always available on all platforms and sometimes
 # not at the appropriate level. This macro enables a module to test for the
 # presence of the tool and obtain it's path in separate variables. Coupled with
 # the --with-asciidoc option, it allows maximum flexibilty in making decisions
-# as whether or not to use the asciidoc package.
+# as whether or not to use the asciidoc package. When DEFAULT is not specified,
+# --with-asciidoc assumes 'auto'.
 #
 # Interface to module:
 # HAVE_ASCIIDOC: used in makefiles to conditionally generate documentation
@@ -601,10 +1473,12 @@ AM_CONDITIONAL([HAVE_XMLTO], [test "$have_xmlto" = yes])
 #
 AC_DEFUN([XORG_WITH_ASCIIDOC],[
 AC_ARG_VAR([ASCIIDOC], [Path to asciidoc command])
+m4_define([_defopt], m4_default([$2], [auto]))
 AC_ARG_WITH(asciidoc,
 	AS_HELP_STRING([--with-asciidoc],
-	   [Use asciidoc to regenerate documentation (default: yes, if installed)]),
-	   [use_asciidoc=$withval], [use_asciidoc=auto])
+	   [Use asciidoc to regenerate documentation (default: ]_defopt[)]),
+	   [use_asciidoc=$withval], [use_asciidoc=]_defopt)
+m4_undefine([_defopt])
 
 if test "x$use_asciidoc" = x"auto"; then
    AC_PATH_PROG([ASCIIDOC], [asciidoc])
@@ -645,15 +1519,17 @@ fi])
 AM_CONDITIONAL([HAVE_ASCIIDOC], [test "$have_asciidoc" = yes])
 ]) # XORG_WITH_ASCIIDOC
 
-# XORG_WITH_DOXYGEN([MIN-VERSION])
+# XORG_WITH_DOXYGEN([MIN-VERSION], [DEFAULT])
 # --------------------------------
 # Minimum version: 1.5.0
+# Minimum version for optional DEFAULT argument: 1.11.0
 #
 # Documentation tools are not always available on all platforms and sometimes
 # not at the appropriate level. This macro enables a module to test for the
 # presence of the tool and obtain it's path in separate variables. Coupled with
 # the --with-doxygen option, it allows maximum flexibilty in making decisions
-# as whether or not to use the doxygen package.
+# as whether or not to use the doxygen package. When DEFAULT is not specified,
+# --with-doxygen assumes 'auto'.
 #
 # Interface to module:
 # HAVE_DOXYGEN: used in makefiles to conditionally generate documentation
@@ -666,10 +1542,12 @@ AM_CONDITIONAL([HAVE_ASCIIDOC], [test "$have_asciidoc" = yes])
 #
 AC_DEFUN([XORG_WITH_DOXYGEN],[
 AC_ARG_VAR([DOXYGEN], [Path to doxygen command])
+m4_define([_defopt], m4_default([$2], [auto]))
 AC_ARG_WITH(doxygen,
 	AS_HELP_STRING([--with-doxygen],
-	   [Use doxygen to regenerate documentation (default: yes, if installed)]),
-	   [use_doxygen=$withval], [use_doxygen=auto])
+	   [Use doxygen to regenerate documentation (default: ]_defopt[)]),
+	   [use_doxygen=$withval], [use_doxygen=]_defopt)
+m4_undefine([_defopt])
 
 if test "x$use_doxygen" = x"auto"; then
    AC_PATH_PROG([DOXYGEN], [doxygen])
@@ -710,15 +1588,17 @@ fi])
 AM_CONDITIONAL([HAVE_DOXYGEN], [test "$have_doxygen" = yes])
 ]) # XORG_WITH_DOXYGEN
 
-# XORG_WITH_GROFF
+# XORG_WITH_GROFF([DEFAULT])
 # ----------------
 # Minimum version: 1.6.0
+# Minimum version for optional DEFAULT argument: 1.11.0
 #
 # Documentation tools are not always available on all platforms and sometimes
 # not at the appropriate level. This macro enables a module to test for the
 # presence of the tool and obtain it's path in separate variables. Coupled with
 # the --with-groff option, it allows maximum flexibilty in making decisions
-# as whether or not to use the groff package.
+# as whether or not to use the groff package. When DEFAULT is not specified,
+# --with-groff assumes 'auto'.
 #
 # Interface to module:
 # HAVE_GROFF:	 used in makefiles to conditionally generate documentation
@@ -729,6 +1609,12 @@ AM_CONDITIONAL([HAVE_DOXYGEN], [test "$have_doxygen" = yes])
 # --with-groff:	 'yes' user instructs the module to use groff
 #		 'no' user instructs the module not to use groff
 #
+# Added in version 1.9.0:
+# HAVE_GROFF_HTML: groff has dependencies to output HTML format:
+#		   pnmcut pnmcrop pnmtopng pnmtops from the netpbm package.
+#		   psselect from the psutils package.
+#		   the ghostcript package. Refer to the grohtml man pages
+#
 # If the user sets the value of GROFF, AC_PATH_PROG skips testing the path.
 #
 # OS and distros often splits groff in a basic and full package, the former
@@ -741,10 +1627,12 @@ AM_CONDITIONAL([HAVE_DOXYGEN], [test "$have_doxygen" = yes])
 #
 AC_DEFUN([XORG_WITH_GROFF],[
 AC_ARG_VAR([GROFF], [Path to groff command])
+m4_define([_defopt], m4_default([$1], [auto]))
 AC_ARG_WITH(groff,
 	AS_HELP_STRING([--with-groff],
-	   [Use groff to regenerate documentation (default: yes, if installed)]),
-	   [use_groff=$withval], [use_groff=auto])
+	   [Use groff to regenerate documentation (default: ]_defopt[)]),
+	   [use_groff=$withval], [use_groff=]_defopt)
+m4_undefine([_defopt])
 
 if test "x$use_groff" = x"auto"; then
    AC_PATH_PROG([GROFF], [groff])
@@ -768,6 +1656,7 @@ elif test "x$use_groff" = x"no" ; then
 else
    AC_MSG_ERROR([--with-groff expects 'yes' or 'no'])
 fi
+
 # We have groff, test for the presence of the macro packages
 if test "x$have_groff" = x"yes"; then
     AC_MSG_CHECKING([for ${GROFF} -ms macros])
@@ -785,20 +1674,38 @@ if test "x$have_groff" = x"yes"; then
     fi
     AC_MSG_RESULT([$groff_mm_works])
 fi
+
+# We have groff, test for HTML dependencies, one command per package
+if test "x$have_groff" = x"yes"; then
+   AC_PATH_PROGS(GS_PATH, [gs gswin32c])
+   AC_PATH_PROG(PNMTOPNG_PATH, [pnmtopng])
+   AC_PATH_PROG(PSSELECT_PATH, [psselect])
+   if test "x$GS_PATH" != "x" -a "x$PNMTOPNG_PATH" != "x" -a "x$PSSELECT_PATH" != "x"; then
+      have_groff_html=yes
+   else
+      have_groff_html=no
+      AC_MSG_WARN([grohtml dependencies not found - HTML Documentation skipped. Refer to grohtml man pages])
+   fi
+fi
+
+# Set Automake conditionals for Makefiles
 AM_CONDITIONAL([HAVE_GROFF], [test "$have_groff" = yes])
 AM_CONDITIONAL([HAVE_GROFF_MS], [test "$groff_ms_works" = yes])
 AM_CONDITIONAL([HAVE_GROFF_MM], [test "$groff_mm_works" = yes])
+AM_CONDITIONAL([HAVE_GROFF_HTML], [test "$have_groff_html" = yes])
 ]) # XORG_WITH_GROFF
 
-# XORG_WITH_FOP
+# XORG_WITH_FOP([DEFAULT])
 # ----------------
 # Minimum version: 1.6.0
+# Minimum version for optional DEFAULT argument: 1.11.0
 #
 # Documentation tools are not always available on all platforms and sometimes
 # not at the appropriate level. This macro enables a module to test for the
 # presence of the tool and obtain it's path in separate variables. Coupled with
 # the --with-fop option, it allows maximum flexibilty in making decisions
-# as whether or not to use the fop package.
+# as whether or not to use the fop package. When DEFAULT is not specified,
+# --with-fop assumes 'auto'.
 #
 # Interface to module:
 # HAVE_FOP: 	used in makefiles to conditionally generate documentation
@@ -811,10 +1718,12 @@ AM_CONDITIONAL([HAVE_GROFF_MM], [test "$groff_mm_works" = yes])
 #
 AC_DEFUN([XORG_WITH_FOP],[
 AC_ARG_VAR([FOP], [Path to fop command])
+m4_define([_defopt], m4_default([$1], [auto]))
 AC_ARG_WITH(fop,
 	AS_HELP_STRING([--with-fop],
-	   [Use fop to regenerate documentation (default: yes, if installed)]),
-	   [use_fop=$withval], [use_fop=auto])
+	   [Use fop to regenerate documentation (default: ]_defopt[)]),
+	   [use_fop=$withval], [use_fop=]_defopt)
+m4_undefine([_defopt])
 
 if test "x$use_fop" = x"auto"; then
    AC_PATH_PROG([FOP], [fop])
@@ -841,15 +1750,17 @@ fi
 AM_CONDITIONAL([HAVE_FOP], [test "$have_fop" = yes])
 ]) # XORG_WITH_FOP
 
-# XORG_WITH_PS2PDF
+# XORG_WITH_PS2PDF([DEFAULT])
 # ----------------
 # Minimum version: 1.6.0
+# Minimum version for optional DEFAULT argument: 1.11.0
 #
 # Documentation tools are not always available on all platforms and sometimes
 # not at the appropriate level. This macro enables a module to test for the
 # presence of the tool and obtain it's path in separate variables. Coupled with
 # the --with-ps2pdf option, it allows maximum flexibilty in making decisions
-# as whether or not to use the ps2pdf package.
+# as whether or not to use the ps2pdf package. When DEFAULT is not specified,
+# --with-ps2pdf assumes 'auto'.
 #
 # Interface to module:
 # HAVE_PS2PDF: 	used in makefiles to conditionally generate documentation
@@ -862,10 +1773,12 @@ AM_CONDITIONAL([HAVE_FOP], [test "$have_fop" = yes])
 #
 AC_DEFUN([XORG_WITH_PS2PDF],[
 AC_ARG_VAR([PS2PDF], [Path to ps2pdf command])
+m4_define([_defopt], m4_default([$1], [auto]))
 AC_ARG_WITH(ps2pdf,
 	AS_HELP_STRING([--with-ps2pdf],
-	   [Use ps2pdf to regenerate documentation (default: yes, if installed)]),
-	   [use_ps2pdf=$withval], [use_ps2pdf=auto])
+	   [Use ps2pdf to regenerate documentation (default: ]_defopt[)]),
+	   [use_ps2pdf=$withval], [use_ps2pdf=]_defopt)
+m4_undefine([_defopt])
 
 if test "x$use_ps2pdf" = x"auto"; then
    AC_PATH_PROG([PS2PDF], [ps2pdf])
@@ -916,14 +1829,12 @@ AM_CONDITIONAL([HAVE_PS2PDF], [test "$have_ps2pdf" = yes])
 # parm1:	specify the default value, yes or no.
 #
 AC_DEFUN([XORG_ENABLE_DOCS],[
-default=$1
-if test "x$default" = x ; then
-  default="yes"
-fi
+m4_define([default], m4_default([$1], [yes]))
 AC_ARG_ENABLE(docs,
 	AS_HELP_STRING([--enable-docs],
-	   [Enable building the documentation (default: yes)]),
-	   [build_docs=$enableval], [build_docs=$default])
+	   [Enable building the documentation (default: ]default[)]),
+	   [build_docs=$enableval], [build_docs=]default)
+m4_undefine([default])
 AM_CONDITIONAL(ENABLE_DOCS, [test x$build_docs = xyes])
 AC_MSG_CHECKING([whether to build documentation])
 AC_MSG_RESULT([$build_docs])
@@ -951,14 +1862,12 @@ AC_MSG_RESULT([$build_docs])
 # parm1:		specify the default value, yes or no.
 #
 AC_DEFUN([XORG_ENABLE_DEVEL_DOCS],[
-devel_default=$1
-if test "x$devel_default" = x ; then
-  devel_default="yes"
-fi
+m4_define([devel_default], m4_default([$1], [yes]))
 AC_ARG_ENABLE(devel-docs,
 	AS_HELP_STRING([--enable-devel-docs],
-	   [Enable building the developer documentation (default: yes)]),
-	   [build_devel_docs=$enableval], [build_devel_docs=$devel_default])
+	   [Enable building the developer documentation (default: ]devel_default[)]),
+	   [build_devel_docs=$enableval], [build_devel_docs=]devel_default)
+m4_undefine([devel_default])
 AM_CONDITIONAL(ENABLE_DEVEL_DOCS, [test x$build_devel_docs = xyes])
 AC_MSG_CHECKING([whether to build developer documentation])
 AC_MSG_RESULT([$build_devel_docs])
@@ -986,14 +1895,12 @@ AC_MSG_RESULT([$build_devel_docs])
 # parm1:		specify the default value, yes or no.
 #
 AC_DEFUN([XORG_ENABLE_SPECS],[
-spec_default=$1
-if test "x$spec_default" = x ; then
-  spec_default="yes"
-fi
+m4_define([spec_default], m4_default([$1], [yes]))
 AC_ARG_ENABLE(specs,
 	AS_HELP_STRING([--enable-specs],
-	   [Enable building the specs (default: yes)]),
-	   [build_specs=$enableval], [build_specs=$spec_default])
+	   [Enable building the specs (default: ]spec_default[)]),
+	   [build_specs=$enableval], [build_specs=]spec_default)
+m4_undefine([spec_default])
 AM_CONDITIONAL(ENABLE_SPECS, [test x$build_specs = xyes])
 AC_MSG_CHECKING([whether to build functional specifications])
 AC_MSG_RESULT([$build_specs])
@@ -1306,1000 +2213,159 @@ echo 'git directory not found: installing possibly empty changelog.' >&2)"
 AC_SUBST([CHANGELOG_CMD])
 ]) # XORG_CHANGELOG
 
-# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
-#
-# This file 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.
-
-# AM_AUTOMAKE_VERSION(VERSION)
-# ----------------------------
-# Automake X.Y traces this macro to ensure aclocal.m4 has been
-# generated from the m4 files accompanying Automake X.Y.
-# (This private macro should not be called outside this file.)
-AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.11'
-dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
-dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.11.1], [],
-      [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
-])
-
-# _AM_AUTOCONF_VERSION(VERSION)
-# -----------------------------
-# aclocal traces this macro to find the Autoconf version.
-# This is a private macro too.  Using m4_define simplifies
-# the logic in aclocal, which can simply ignore this definition.
-m4_define([_AM_AUTOCONF_VERSION], [])
-
-# AM_SET_CURRENT_AUTOMAKE_VERSION
-# -------------------------------
-# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
-# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.11.1])dnl
-m4_ifndef([AC_AUTOCONF_VERSION],
-  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
-
-# AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
-
-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
-#
-# This file 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.
-
-# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
-# $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
-# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
-#
-# Of course, Automake must honor this variable whenever it calls a
-# tool from the auxiliary directory.  The problem is that $srcdir (and
-# therefore $ac_aux_dir as well) can be either absolute or relative,
-# depending on how configure is run.  This is pretty annoying, since
-# it makes $ac_aux_dir quite unusable in subdirectories: in the top
-# source directory, any form will work fine, but in subdirectories a
-# relative path needs to be adjusted first.
-#
-# $ac_aux_dir/missing
-#    fails when called from a subdirectory if $ac_aux_dir is relative
-# $top_srcdir/$ac_aux_dir/missing
-#    fails if $ac_aux_dir is absolute,
-#    fails when called from a subdirectory in a VPATH build with
-#          a relative $ac_aux_dir
+# pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
+# 
+# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
 #
-# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
-# are both prefixed by $srcdir.  In an in-source build this is usually
-# harmless because $srcdir is `.', but things will broke when you
-# start a VPATH build or use an absolute $srcdir.
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
 #
-# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
-# iff we strip the leading $srcdir from $ac_aux_dir.  That would be:
-#   am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
-# and then we would define $MISSING as
-#   MISSING="\${SHELL} $am_aux_dir/missing"
-# This will work as long as MISSING is not called from configure, because
-# unfortunately $(top_srcdir) has no meaning in configure.
-# However there are other variables, like CC, which are often used in
-# configure, and could therefore not use this "fixed" $ac_aux_dir.
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
 #
-# Another solution, used here, is to always expand $ac_aux_dir to an
-# absolute PATH.  The drawback is that using absolute paths prevent a
-# configured tree to be moved without reconfiguration.
-
-AC_DEFUN([AM_AUX_DIR_EXPAND],
-[dnl Rely on autoconf to set up CDPATH properly.
-AC_PREREQ([2.50])dnl
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
-])
-
-# AM_CONDITIONAL                                            -*- Autoconf -*-
-
-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008
-# Free Software Foundation, Inc.
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #
-# This file 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.
-
-# serial 9
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
 
-# AM_CONDITIONAL(NAME, SHELL-CONDITION)
-# -------------------------------------
-# Define a conditional.
-AC_DEFUN([AM_CONDITIONAL],
-[AC_PREREQ(2.52)dnl
- ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
-	[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
-AC_SUBST([$1_TRUE])dnl
-AC_SUBST([$1_FALSE])dnl
-_AM_SUBST_NOTMAKE([$1_TRUE])dnl
-_AM_SUBST_NOTMAKE([$1_FALSE])dnl
-m4_define([_AM_COND_VALUE_$1], [$2])dnl
-if $2; then
-  $1_TRUE=
-  $1_FALSE='#'
-else
-  $1_TRUE='#'
-  $1_FALSE=
+# PKG_PROG_PKG_CONFIG([MIN-VERSION])
+# ----------------------------------
+AC_DEFUN([PKG_PROG_PKG_CONFIG],
+[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
+m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
+AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+	AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
 fi
-AC_CONFIG_COMMANDS_PRE(
-[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
-  AC_MSG_ERROR([[conditional "$1" was never defined.
-Usually this means the macro was only invoked conditionally.]])
-fi])])
+if test -n "$PKG_CONFIG"; then
+	_pkg_min_version=m4_default([$1], [0.9.0])
+	AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
+	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+		AC_MSG_RESULT([yes])
+	else
+		AC_MSG_RESULT([no])
+		PKG_CONFIG=""
+	fi
+		
+fi[]dnl
+])# PKG_PROG_PKG_CONFIG
 
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009
-# Free Software Foundation, Inc.
+# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
 #
-# This file 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.
-
-# serial 10
-
-# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
-# written in clear, in which case automake, when reading aclocal.m4,
-# will think it sees a *use*, and therefore will trigger all it's
-# C support machinery.  Also note that it means that autoscan, seeing
-# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
-
-
-# _AM_DEPENDENCIES(NAME)
-# ----------------------
-# See how the compiler implements dependency checking.
-# NAME is "CC", "CXX", "GCJ", or "OBJC".
-# We try a few techniques and use that to set a single cache variable.
+# Check to see whether a particular set of modules exists.  Similar
+# to PKG_CHECK_MODULES(), but does not set variables or print errors.
 #
-# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
-# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
-# dependency, and given that the user is not expected to run this macro,
-# just rely on AC_PROG_CC.
-AC_DEFUN([_AM_DEPENDENCIES],
-[AC_REQUIRE([AM_SET_DEPDIR])dnl
-AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
-AC_REQUIRE([AM_MAKE_INCLUDE])dnl
-AC_REQUIRE([AM_DEP_TRACK])dnl
-
-ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=],
-       [$1], CXX,  [depcc="$CXX"  am_compiler_list=],
-       [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
-       [$1], UPC,  [depcc="$UPC"  am_compiler_list=],
-       [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
-                   [depcc="$$1"   am_compiler_list=])
-
-AC_CACHE_CHECK([dependency style of $depcc],
-               [am_cv_$1_dependencies_compiler_type],
-[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-  # We make a subdir and do the tests there.  Otherwise we can end up
-  # making bogus files that we don't know about and never remove.  For
-  # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named `D' -- because `-MD' means `put the output
-  # in D'.
-  mkdir conftest.dir
-  # Copy depcomp to subdir because otherwise we won't find it if we're
-  # using a relative directory.
-  cp "$am_depcomp" conftest.dir
-  cd conftest.dir
-  # We will build objects and dependencies in a subdirectory because
-  # it helps to detect inapplicable dependency modes.  For instance
-  # both Tru64's cc and ICC support -MD to output dependencies as a
-  # side effect of compilation, but ICC will put the dependencies in
-  # the current directory while Tru64 will put them in the object
-  # directory.
-  mkdir sub
-
-  am_cv_$1_dependencies_compiler_type=none
-  if test "$am_compiler_list" = ""; then
-     am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
-  fi
-  am__universal=false
-  m4_case([$1], [CC],
-    [case " $depcc " in #(
-     *\ -arch\ *\ -arch\ *) am__universal=true ;;
-     esac],
-    [CXX],
-    [case " $depcc " in #(
-     *\ -arch\ *\ -arch\ *) am__universal=true ;;
-     esac])
-
-  for depmode in $am_compiler_list; do
-    # Setup a source with many dependencies, because some compilers
-    # like to wrap large dependency lists on column 80 (with \), and
-    # we should not choose a depcomp mode which is confused by this.
-    #
-    # We need to recreate these files for each test, as the compiler may
-    # overwrite some of them when testing with obscure command lines.
-    # This happens at least with the AIX C compiler.
-    : > sub/conftest.c
-    for i in 1 2 3 4 5 6; do
-      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-      # Solaris 8's {/usr,}/bin/sh.
-      touch sub/conftst$i.h
-    done
-    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-    # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.  Also, some Intel
-    # versions had trouble with output in subdirs
-    am__obj=sub/conftest.${OBJEXT-o}
-    am__minus_obj="-o $am__obj"
-    case $depmode in
-    gcc)
-      # This depmode causes a compiler race in universal mode.
-      test "$am__universal" = false || continue
-      ;;
-    nosideeffect)
-      # after this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested
-      if test "x$enable_dependency_tracking" = xyes; then
-	continue
-      else
-	break
-      fi
-      ;;
-    msvisualcpp | msvcmsys)
-      # This compiler won't grok `-c -o', but also, the minuso test has
-      # not run yet.  These depmodes are late enough in the game, and
-      # so weak that their functioning should not be impacted.
-      am__obj=conftest.${OBJEXT-o}
-      am__minus_obj=
-      ;;
-    none) break ;;
-    esac
-    if depmode=$depmode \
-       source=sub/conftest.c object=$am__obj \
-       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
-         >/dev/null 2>conftest.err &&
-       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
-       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-      # icc doesn't choke on unknown options, it will just issue warnings
-      # or remarks (even with -Werror).  So we grep stderr for any message
-      # that says an option was ignored or not supported.
-      # When given -MP, icc 7.0 and 7.1 complain thusly:
-      #   icc: Command line warning: ignoring option '-M'; no argument required
-      # The diagnosis changed in icc 8.0:
-      #   icc: Command line remark: option '-MP' not supported
-      if (grep 'ignoring option' conftest.err ||
-          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-        am_cv_$1_dependencies_compiler_type=$depmode
-        break
-      fi
-    fi
-  done
-
-  cd ..
-  rm -rf conftest.dir
-else
-  am_cv_$1_dependencies_compiler_type=none
-fi
-])
-AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
-AM_CONDITIONAL([am__fastdep$1], [
-  test "x$enable_dependency_tracking" != xno \
-  && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
-])
-
-
-# AM_SET_DEPDIR
-# -------------
-# Choose a directory name for dependency files.
-# This macro is AC_REQUIREd in _AM_DEPENDENCIES
-AC_DEFUN([AM_SET_DEPDIR],
-[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
-])
-
-
-# AM_DEP_TRACK
-# ------------
-AC_DEFUN([AM_DEP_TRACK],
-[AC_ARG_ENABLE(dependency-tracking,
-[  --disable-dependency-tracking  speeds up one-time build
-  --enable-dependency-tracking   do not reject slow dependency extractors])
-if test "x$enable_dependency_tracking" != xno; then
-  am_depcomp="$ac_aux_dir/depcomp"
-  AMDEPBACKSLASH='\'
-fi
-AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
-AC_SUBST([AMDEPBACKSLASH])dnl
-_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
-])
-
-# Generate code to set up dependency tracking.              -*- Autoconf -*-
-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
-# Free Software Foundation, Inc.
 #
-# This file 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.
+# Similar to PKG_CHECK_MODULES, make sure that the first instance of
+# this or PKG_CHECK_MODULES is called, or make sure to call
+# PKG_CHECK_EXISTS manually
+# --------------------------------------------------------------
+AC_DEFUN([PKG_CHECK_EXISTS],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+if test -n "$PKG_CONFIG" && \
+    AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
+  m4_ifval([$2], [$2], [:])
+m4_ifvaln([$3], [else
+  $3])dnl
+fi])
 
-#serial 5
-
-# _AM_OUTPUT_DEPENDENCY_COMMANDS
-# ------------------------------
-AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
-[{
-  # Autoconf 2.62 quotes --file arguments for eval, but not when files
-  # are listed without --file.  Let's play safe and only enable the eval
-  # if we detect the quoting.
-  case $CONFIG_FILES in
-  *\'*) eval set x "$CONFIG_FILES" ;;
-  *)   set x $CONFIG_FILES ;;
-  esac
-  shift
-  for mf
-  do
-    # Strip MF so we end up with the name of the file.
-    mf=`echo "$mf" | sed -e 's/:.*$//'`
-    # Check whether this is an Automake generated Makefile or not.
-    # We used to match only the files named `Makefile.in', but
-    # some people rename them; so instead we look at the file content.
-    # Grep'ing the first line is not enough: some people post-process
-    # each Makefile.in and add a new line on top of each file to say so.
-    # Grep'ing the whole file is not good either: AIX grep has a line
-    # limit of 2048, but all sed's we know have understand at least 4000.
-    if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
-      dirpart=`AS_DIRNAME("$mf")`
-    else
-      continue
-    fi
-    # Extract the definition of DEPDIR, am__include, and am__quote
-    # from the Makefile without running `make'.
-    DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-    test -z "$DEPDIR" && continue
-    am__include=`sed -n 's/^am__include = //p' < "$mf"`
-    test -z "am__include" && continue
-    am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-    # When using ansi2knr, U may be empty or an underscore; expand it
-    U=`sed -n 's/^U = //p' < "$mf"`
-    # Find all dependency output files, they are included files with
-    # $(DEPDIR) in their names.  We invoke sed twice because it is the
-    # simplest approach to changing $(DEPDIR) to its actual value in the
-    # expansion.
-    for file in `sed -n "
-      s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
-      # Make sure the directory exists.
-      test -f "$dirpart/$file" && continue
-      fdir=`AS_DIRNAME(["$file"])`
-      AS_MKDIR_P([$dirpart/$fdir])
-      # echo "creating $dirpart/$file"
-      echo '# dummy' > "$dirpart/$file"
-    done
-  done
-}
-])# _AM_OUTPUT_DEPENDENCY_COMMANDS
 
+# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
+# ---------------------------------------------
+m4_define([_PKG_CONFIG],
+[if test -n "$$1"; then
+    pkg_cv_[]$1="$$1"
+ elif test -n "$PKG_CONFIG"; then
+    PKG_CHECK_EXISTS([$3],
+                     [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
+		     [pkg_failed=yes])
+ else
+    pkg_failed=untried
+fi[]dnl
+])# _PKG_CONFIG
 
-# AM_OUTPUT_DEPENDENCY_COMMANDS
+# _PKG_SHORT_ERRORS_SUPPORTED
 # -----------------------------
-# This macro should only be invoked once -- use via AC_REQUIRE.
-#
-# This code is only required when automatic dependency tracking
-# is enabled.  FIXME.  This creates each `.P' file that we will
-# need in order to bootstrap the dependency handling code.
-AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
-[AC_CONFIG_COMMANDS([depfiles],
-     [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
-     [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
-])
-
-# Do all the work for Automake.                             -*- Autoconf -*-
-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2008, 2009 Free Software Foundation, Inc.
-#
-# This file 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.
-
-# serial 16
-
-# This macro actually does too much.  Some checks are only needed if
-# your package does certain things.  But this isn't really a big deal.
-
-# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
-# AM_INIT_AUTOMAKE([OPTIONS])
-# -----------------------------------------------
-# The call with PACKAGE and VERSION arguments is the old style
-# call (pre autoconf-2.50), which is being phased out.  PACKAGE
-# and VERSION should now be passed to AC_INIT and removed from
-# the call to AM_INIT_AUTOMAKE.
-# We support both call styles for the transition.  After
-# the next Automake release, Autoconf can make the AC_INIT
-# arguments mandatory, and then we can depend on a new Autoconf
-# release and drop the old call support.
-AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_PREREQ([2.62])dnl
-dnl Autoconf wants to disallow AM_ names.  We explicitly allow
-dnl the ones we care about.
-m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
-AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-AC_REQUIRE([AC_PROG_INSTALL])dnl
-if test "`cd $srcdir && pwd`" != "`pwd`"; then
-  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
-  # is not polluted with repeated "-I."
-  AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
-  # test to see if srcdir already configured
-  if test -f $srcdir/config.status; then
-    AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
-  fi
-fi
-
-# test whether we have cygpath
-if test -z "$CYGPATH_W"; then
-  if (cygpath --version) >/dev/null 2>/dev/null; then
-    CYGPATH_W='cygpath -w'
-  else
-    CYGPATH_W=echo
-  fi
-fi
-AC_SUBST([CYGPATH_W])
-
-# Define the identity of the package.
-dnl Distinguish between old-style and new-style calls.
-m4_ifval([$2],
-[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
- AC_SUBST([PACKAGE], [$1])dnl
- AC_SUBST([VERSION], [$2])],
-[_AM_SET_OPTIONS([$1])dnl
-dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
-m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
-  [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
- AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
- AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
-
-_AM_IF_OPTION([no-define],,
-[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
-
-# Some tools Automake needs.
-AC_REQUIRE([AM_SANITY_CHECK])dnl
-AC_REQUIRE([AC_ARG_PROGRAM])dnl
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
-AM_MISSING_PROG(AUTOCONF, autoconf)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
-AM_MISSING_PROG(AUTOHEADER, autoheader)
-AM_MISSING_PROG(MAKEINFO, makeinfo)
-AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
-AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
-AC_REQUIRE([AM_PROG_MKDIR_P])dnl
-# We need awk for the "check" target.  The system "awk" is bad on
-# some platforms.
-AC_REQUIRE([AC_PROG_AWK])dnl
-AC_REQUIRE([AC_PROG_MAKE_SET])dnl
-AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
-	      [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
-			     [_AM_PROG_TAR([v7])])])
-_AM_IF_OPTION([no-dependencies],,
-[AC_PROVIDE_IFELSE([AC_PROG_CC],
-		  [_AM_DEPENDENCIES(CC)],
-		  [define([AC_PROG_CC],
-			  defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
-AC_PROVIDE_IFELSE([AC_PROG_CXX],
-		  [_AM_DEPENDENCIES(CXX)],
-		  [define([AC_PROG_CXX],
-			  defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
-AC_PROVIDE_IFELSE([AC_PROG_OBJC],
-		  [_AM_DEPENDENCIES(OBJC)],
-		  [define([AC_PROG_OBJC],
-			  defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
-])
-_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl
-dnl The `parallel-tests' driver may need to know about EXEEXT, so add the
-dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This macro
-dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.
-AC_CONFIG_COMMANDS_PRE(dnl
-[m4_provide_if([_AM_COMPILER_EXEEXT],
-  [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
-])
-
-dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
-dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
-dnl mangled by Autoconf and run in a shell conditional statement.
-m4_define([_AC_COMPILER_EXEEXT],
-m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
-
-
-# When config.status generates a header, we must update the stamp-h file.
-# This file resides in the same directory as the config header
-# that is generated.  The stamp files are numbered to have different names.
-
-# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
-# loop where config.status creates the headers, so we can generate
-# our stamp files there.
-AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
-[# Compute $1's index in $config_headers.
-_am_arg=$1
-_am_stamp_count=1
-for _am_header in $config_headers :; do
-  case $_am_header in
-    $_am_arg | $_am_arg:* )
-      break ;;
-    * )
-      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
-  esac
-done
-echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
-
-# Copyright (C) 2001, 2003, 2005, 2008  Free Software Foundation, Inc.
-#
-# This file 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.
-
-# AM_PROG_INSTALL_SH
-# ------------------
-# Define $install_sh.
-AC_DEFUN([AM_PROG_INSTALL_SH],
-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-if test x"${install_sh}" != xset; then
-  case $am_aux_dir in
-  *\ * | *\	*)
-    install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
-  *)
-    install_sh="\${SHELL} $am_aux_dir/install-sh"
-  esac
-fi
-AC_SUBST(install_sh)])
-
-# Copyright (C) 2003, 2005  Free Software Foundation, Inc.
-#
-# This file 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.
-
-# serial 2
-
-# Check whether the underlying file-system supports filenames
-# with a leading dot.  For instance MS-DOS doesn't.
-AC_DEFUN([AM_SET_LEADING_DOT],
-[rm -rf .tst 2>/dev/null
-mkdir .tst 2>/dev/null
-if test -d .tst; then
-  am__leading_dot=.
+AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
 else
-  am__leading_dot=_
-fi
-rmdir .tst 2>/dev/null
-AC_SUBST([am__leading_dot])])
-
-# Add --enable-maintainer-mode option to configure.         -*- Autoconf -*-
-# From Jim Meyering
-
-# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008
-# Free Software Foundation, Inc.
-#
-# This file 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.
-
-# serial 5
-
-# AM_MAINTAINER_MODE([DEFAULT-MODE])
-# ----------------------------------
-# Control maintainer-specific portions of Makefiles.
-# Default is to disable them, unless `enable' is passed literally.
-# For symmetry, `disable' may be passed as well.  Anyway, the user
-# can override the default with the --enable/--disable switch.
-AC_DEFUN([AM_MAINTAINER_MODE],
-[m4_case(m4_default([$1], [disable]),
-       [enable], [m4_define([am_maintainer_other], [disable])],
-       [disable], [m4_define([am_maintainer_other], [enable])],
-       [m4_define([am_maintainer_other], [enable])
-        m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])])
-AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles])
-  dnl maintainer-mode's default is 'disable' unless 'enable' is passed
-  AC_ARG_ENABLE([maintainer-mode],
-[  --][am_maintainer_other][-maintainer-mode  am_maintainer_other make rules and dependencies not useful
-			  (and sometimes confusing) to the casual installer],
-      [USE_MAINTAINER_MODE=$enableval],
-      [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes]))
-  AC_MSG_RESULT([$USE_MAINTAINER_MODE])
-  AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes])
-  MAINT=$MAINTAINER_MODE_TRUE
-  AC_SUBST([MAINT])dnl
-]
-)
-
-AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
+        _pkg_short_errors_supported=no
+fi[]dnl
+])# _PKG_SHORT_ERRORS_SUPPORTED
 
-# Check to see how 'make' treats includes.	            -*- Autoconf -*-
 
-# Copyright (C) 2001, 2002, 2003, 2005, 2009  Free Software Foundation, Inc.
+# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
+# [ACTION-IF-NOT-FOUND])
 #
-# This file 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.
-
-# serial 4
-
-# AM_MAKE_INCLUDE()
-# -----------------
-# Check to see how make treats includes.
-AC_DEFUN([AM_MAKE_INCLUDE],
-[am_make=${MAKE-make}
-cat > confinc << 'END'
-am__doit:
-	@echo this is the am__doit target
-.PHONY: am__doit
-END
-# If we don't find an include directive, just comment out the code.
-AC_MSG_CHECKING([for style of include used by $am_make])
-am__include="#"
-am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# Ignore all kinds of additional output from `make'.
-case `$am_make -s -f confmf 2> /dev/null` in #(
-*the\ am__doit\ target*)
-  am__include=include
-  am__quote=
-  _am_result=GNU
-  ;;
-esac
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
-   echo '.include "confinc"' > confmf
-   case `$am_make -s -f confmf 2> /dev/null` in #(
-   *the\ am__doit\ target*)
-     am__include=.include
-     am__quote="\""
-     _am_result=BSD
-     ;;
-   esac
-fi
-AC_SUBST([am__include])
-AC_SUBST([am__quote])
-AC_MSG_RESULT([$_am_result])
-rm -f confinc confmf
-])
-
-# Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
-
-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008
-# Free Software Foundation, Inc.
 #
-# This file 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.
-
-# serial 6
-
-# AM_MISSING_PROG(NAME, PROGRAM)
-# ------------------------------
-AC_DEFUN([AM_MISSING_PROG],
-[AC_REQUIRE([AM_MISSING_HAS_RUN])
-$1=${$1-"${am_missing_run}$2"}
-AC_SUBST($1)])
-
-
-# AM_MISSING_HAS_RUN
-# ------------------
-# Define MISSING if not defined so far and test if it supports --run.
-# If it does, set am_missing_run to use it, otherwise, to nothing.
-AC_DEFUN([AM_MISSING_HAS_RUN],
-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-AC_REQUIRE_AUX_FILE([missing])dnl
-if test x"${MISSING+set}" != xset; then
-  case $am_aux_dir in
-  *\ * | *\	*)
-    MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
-  *)
-    MISSING="\${SHELL} $am_aux_dir/missing" ;;
-  esac
-fi
-# Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
-  am_missing_run="$MISSING --run "
-else
-  am_missing_run=
-  AC_MSG_WARN([`missing' script is too old or missing])
-fi
-])
-
-# Copyright (C) 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# Note that if there is a possibility the first call to
+# PKG_CHECK_MODULES might not happen, you should be sure to include an
+# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
 #
-# This file 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.
-
-# AM_PROG_MKDIR_P
-# ---------------
-# Check for `mkdir -p'.
-AC_DEFUN([AM_PROG_MKDIR_P],
-[AC_PREREQ([2.60])dnl
-AC_REQUIRE([AC_PROG_MKDIR_P])dnl
-dnl Automake 1.8 to 1.9.6 used to define mkdir_p.  We now use MKDIR_P,
-dnl while keeping a definition of mkdir_p for backward compatibility.
-dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
-dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
-dnl Makefile.ins that do not define MKDIR_P, so we do our own
-dnl adjustment using top_builddir (which is defined more often than
-dnl MKDIR_P).
-AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
-case $mkdir_p in
-  [[\\/$]]* | ?:[[\\/]]*) ;;
-  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-esac
-])
-
-# Helper functions for option handling.                     -*- Autoconf -*-
-
-# Copyright (C) 2001, 2002, 2003, 2005, 2008  Free Software Foundation, Inc.
 #
-# This file 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.
-
-# serial 4
-
-# _AM_MANGLE_OPTION(NAME)
-# -----------------------
-AC_DEFUN([_AM_MANGLE_OPTION],
-[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
+# --------------------------------------------------------------
+AC_DEFUN([PKG_CHECK_MODULES],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
+AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
 
-# _AM_SET_OPTION(NAME)
-# ------------------------------
-# Set option NAME.  Presently that only means defining a flag for this option.
-AC_DEFUN([_AM_SET_OPTION],
-[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
+pkg_failed=no
+AC_MSG_CHECKING([for $1])
 
-# _AM_SET_OPTIONS(OPTIONS)
-# ----------------------------------
-# OPTIONS is a space-separated list of Automake options.
-AC_DEFUN([_AM_SET_OPTIONS],
-[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
+_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
+_PKG_CONFIG([$1][_LIBS], [libs], [$2])
 
-# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
-# -------------------------------------------
-# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
-AC_DEFUN([_AM_IF_OPTION],
-[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
+m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
+and $1[]_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.])
 
-# Check to make sure that the build environment is sane.    -*- Autoconf -*-
+if test $pkg_failed = yes; then
+        _PKG_SHORT_ERRORS_SUPPORTED
+        if test $_pkg_short_errors_supported = yes; then
+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
+        else 
+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
 
-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008
-# Free Software Foundation, Inc.
-#
-# This file 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.
+	ifelse([$4], , [AC_MSG_ERROR(dnl
+[Package requirements ($2) were not met:
 
-# serial 5
+$$1_PKG_ERRORS
 
-# AM_SANITY_CHECK
-# ---------------
-AC_DEFUN([AM_SANITY_CHECK],
-[AC_MSG_CHECKING([whether build environment is sane])
-# Just in case
-sleep 1
-echo timestamp > conftest.file
-# Reject unsafe characters in $srcdir or the absolute working directory
-# name.  Accept space and tab only in the latter.
-am_lf='
-'
-case `pwd` in
-  *[[\\\"\#\$\&\'\`$am_lf]]*)
-    AC_MSG_ERROR([unsafe absolute working directory name]);;
-esac
-case $srcdir in
-  *[[\\\"\#\$\&\'\`$am_lf\ \	]]*)
-    AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);;
-esac
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
 
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
-   if test "$[*]" = "X"; then
-      # -L didn't work.
-      set X `ls -t "$srcdir/configure" conftest.file`
-   fi
-   rm -f conftest.file
-   if test "$[*]" != "X $srcdir/configure conftest.file" \
-      && test "$[*]" != "X conftest.file $srcdir/configure"; then
+_PKG_TEXT
+])],
+		[AC_MSG_RESULT([no])
+                $4])
+elif test $pkg_failed = untried; then
+	ifelse([$4], , [AC_MSG_FAILURE(dnl
+[The pkg-config script could not be found or is too old.  Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
 
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
-alias in your environment])
-   fi
+_PKG_TEXT
 
-   test "$[2]" = conftest.file
-   )
-then
-   # Ok.
-   :
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
+		[$4])
 else
-   AC_MSG_ERROR([newly created file is older than distributed files!
-Check your system clock])
-fi
-AC_MSG_RESULT(yes)])
-
-# Copyright (C) 2009  Free Software Foundation, Inc.
-#
-# This file 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.
-
-# serial 1
-
-# AM_SILENT_RULES([DEFAULT])
-# --------------------------
-# Enable less verbose build rules; with the default set to DEFAULT
-# (`yes' being less verbose, `no' or empty being verbose).
-AC_DEFUN([AM_SILENT_RULES],
-[AC_ARG_ENABLE([silent-rules],
-[  --enable-silent-rules          less verbose build output (undo: `make V=1')
-  --disable-silent-rules         verbose build output (undo: `make V=0')])
-case $enable_silent_rules in
-yes) AM_DEFAULT_VERBOSITY=0;;
-no)  AM_DEFAULT_VERBOSITY=1;;
-*)   AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
-esac
-AC_SUBST([AM_DEFAULT_VERBOSITY])dnl
-AM_BACKSLASH='\'
-AC_SUBST([AM_BACKSLASH])dnl
-_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
-])
-
-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
-#
-# This file 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.
-
-# AM_PROG_INSTALL_STRIP
-# ---------------------
-# One issue with vendor `install' (even GNU) is that you can't
-# specify the program used to strip binaries.  This is especially
-# annoying in cross-compiling environments, where the build's strip
-# is unlikely to handle the host's binaries.
-# Fortunately install-sh will honor a STRIPPROG variable, so we
-# always use install-sh in `make install-strip', and initialize
-# STRIPPROG with the value of the STRIP variable (set by the user).
-AC_DEFUN([AM_PROG_INSTALL_STRIP],
-[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'.  However `strip' might not be the right
-# tool to use in cross-compilation environments, therefore Automake
-# will honor the `STRIP' environment variable to overrule this program.
-dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
-if test "$cross_compiling" != no; then
-  AC_CHECK_TOOL([STRIP], [strip], :)
-fi
-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
-AC_SUBST([INSTALL_STRIP_PROGRAM])])
-
-# Copyright (C) 2006, 2008  Free Software Foundation, Inc.
-#
-# This file 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.
-
-# serial 2
-
-# _AM_SUBST_NOTMAKE(VARIABLE)
-# ---------------------------
-# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
-# This macro is traced by Automake.
-AC_DEFUN([_AM_SUBST_NOTMAKE])
-
-# AM_SUBST_NOTMAKE(VARIABLE)
-# ---------------------------
-# Public sister of _AM_SUBST_NOTMAKE.
-AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
-
-# Check how to create a tarball.                            -*- Autoconf -*-
-
-# Copyright (C) 2004, 2005  Free Software Foundation, Inc.
-#
-# This file 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.
-
-# serial 2
-
-# _AM_PROG_TAR(FORMAT)
-# --------------------
-# Check how to create a tarball in format FORMAT.
-# FORMAT should be one of `v7', `ustar', or `pax'.
-#
-# Substitute a variable $(am__tar) that is a command
-# writing to stdout a FORMAT-tarball containing the directory
-# $tardir.
-#     tardir=directory && $(am__tar) > result.tar
-#
-# Substitute a variable $(am__untar) that extract such
-# a tarball read from stdin.
-#     $(am__untar) < result.tar
-AC_DEFUN([_AM_PROG_TAR],
-[# Always define AMTAR for backward compatibility.
-AM_MISSING_PROG([AMTAR], [tar])
-m4_if([$1], [v7],
-     [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
-     [m4_case([$1], [ustar],, [pax],,
-              [m4_fatal([Unknown tar format])])
-AC_MSG_CHECKING([how to create a $1 tar archive])
-# Loop over all known methods to create a tar archive until one works.
-_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
-_am_tools=${am_cv_prog_tar_$1-$_am_tools}
-# Do not fold the above two line into one, because Tru64 sh and
-# Solaris sh will not grok spaces in the rhs of `-'.
-for _am_tool in $_am_tools
-do
-  case $_am_tool in
-  gnutar)
-    for _am_tar in tar gnutar gtar;
-    do
-      AM_RUN_LOG([$_am_tar --version]) && break
-    done
-    am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
-    am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
-    am__untar="$_am_tar -xf -"
-    ;;
-  plaintar)
-    # Must skip GNU tar: if it does not support --format= it doesn't create
-    # ustar tarball either.
-    (tar --version) >/dev/null 2>&1 && continue
-    am__tar='tar chf - "$$tardir"'
-    am__tar_='tar chf - "$tardir"'
-    am__untar='tar xf -'
-    ;;
-  pax)
-    am__tar='pax -L -x $1 -w "$$tardir"'
-    am__tar_='pax -L -x $1 -w "$tardir"'
-    am__untar='pax -r'
-    ;;
-  cpio)
-    am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
-    am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
-    am__untar='cpio -i -H $1 -d'
-    ;;
-  none)
-    am__tar=false
-    am__tar_=false
-    am__untar=false
-    ;;
-  esac
-
-  # If the value was cached, stop now.  We just wanted to have am__tar
-  # and am__untar set.
-  test -n "${am_cv_prog_tar_$1}" && break
-
-  # tar/untar a dummy directory, and stop if the command works
-  rm -rf conftest.dir
-  mkdir conftest.dir
-  echo GrepMe > conftest.dir/file
-  AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
-  rm -rf conftest.dir
-  if test -s conftest.tar; then
-    AM_RUN_LOG([$am__untar <conftest.tar])
-    grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
-  fi
-done
-rm -rf conftest.dir
-
-AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
-AC_MSG_RESULT([$am_cv_prog_tar_$1])])
-AC_SUBST([am__tar])
-AC_SUBST([am__untar])
-]) # _AM_PROG_TAR
+	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
+	$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
+        AC_MSG_RESULT([yes])
+	ifelse([$3], , :, [$3])
+fi[]dnl
+])# PKG_CHECK_MODULES
 
diff --git a/X11/config.guess b/X11/config.guess
index dc84c68ef..285237846 100644
--- a/X11/config.guess
+++ b/X11/config.guess
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
 #   Free Software Foundation, Inc.
 
-timestamp='2009-11-20'
+timestamp='2010-08-21'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -56,8 +56,9 @@ version="\
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
+Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -91,7 +92,7 @@ if test $# != 0; then
   exit 1
 fi
 
-trap 'exit 1' 1 2 15
+trap 'exit 1' HUP INT TERM
 
 # CC_FOR_BUILD -- compiler used by this script. Note that the use of a
 # compiler to aid in system detection is discouraged as it requires
@@ -105,7 +106,7 @@ trap 'exit 1' 1 2 15
 
 set_cc_for_build='
 trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
-trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
+trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" HUP INT PIPE TERM ;
 : ${TMPDIR=/tmp} ;
  { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
  { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
@@ -551,7 +552,7 @@ EOF
 		echo rs6000-ibm-aix3.2
 	fi
 	exit ;;
-    *:AIX:*:[456])
+    *:AIX:*:[4567])
 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
 		IBM_ARCH=rs6000
@@ -967,6 +968,9 @@ EOF
     sparc:Linux:*:* | sparc64:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
+    tile*:Linux:*:*)
+	echo ${UNAME_MACHINE}-tilera-linux-gnu
+	exit ;;
     vax:Linux:*:*)
 	echo ${UNAME_MACHINE}-dec-linux-gnu
 	exit ;;
diff --git a/X11/config.sub b/X11/config.sub
index 2a55a5075..320e30388 100644
--- a/X11/config.sub
+++ b/X11/config.sub
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
 #   Free Software Foundation, Inc.
 
-timestamp='2009-11-20'
+timestamp='2010-09-11'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -75,8 +75,9 @@ Report bugs and patches to <config-patches@gnu.org>."
 version="\
 GNU config.sub ($timestamp)
 
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
+Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -123,8 +124,9 @@ esac
 # Here we must recognize all the valid KERNEL-OS combinations.
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
-  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
-  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
+  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
+  linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
+  knetbsd*-gnu* | netbsd*-gnu* | \
   kopensolaris*-gnu* | \
   storm-chaos* | os2-emx* | rtmk-nova*)
     os=-$maybe_os
@@ -281,6 +283,7 @@ case $basic_machine in
 	| moxie \
 	| mt \
 	| msp430 \
+	| nds32 | nds32le | nds32be \
 	| nios | nios2 \
 	| ns16k | ns32k \
 	| or32 \
@@ -294,7 +297,7 @@ case $basic_machine in
 	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
 	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
 	| spu | strongarm \
-	| tahoe | thumb | tic4x | tic80 | tron \
+	| tahoe | thumb | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
 	| ubicom32 \
 	| v850 | v850e \
 	| we32k \
@@ -302,6 +305,15 @@ case $basic_machine in
 	| z8k | z80)
 		basic_machine=$basic_machine-unknown
 		;;
+	c54x)
+		basic_machine=tic54x-unknown
+		;;
+	c55x)
+		basic_machine=tic55x-unknown
+		;;
+	c6x)
+		basic_machine=tic6x-unknown
+		;;
 	m6811 | m68hc11 | m6812 | m68hc12 | picochip)
 		# Motorola 68HC11/12.
 		basic_machine=$basic_machine-unknown
@@ -333,7 +345,7 @@ case $basic_machine in
 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
 	| avr-* | avr32-* \
 	| bfin-* | bs2000-* \
-	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
+	| c[123]* | c30-* | [cjt]90-* | c4x-* \
 	| clipper-* | craynv-* | cydra-* \
 	| d10v-* | d30v-* | dlx-* \
 	| elxsi-* \
@@ -367,6 +379,7 @@ case $basic_machine in
 	| mmix-* \
 	| mt-* \
 	| msp430-* \
+	| nds32-* | nds32le-* | nds32be-* \
 	| nios-* | nios2-* \
 	| none-* | np1-* | ns16k-* | ns32k-* \
 	| orion-* \
@@ -380,7 +393,8 @@ case $basic_machine in
 	| sparclite-* \
 	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
 	| tahoe-* | thumb-* \
-	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
+	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+	| tile-* | tilegx-* \
 	| tron-* \
 	| ubicom32-* \
 	| v850-* | v850e-* | vax-* \
@@ -480,6 +494,15 @@ case $basic_machine in
 		basic_machine=powerpc-ibm
 		os=-cnk
 		;;
+	c54x-*)
+		basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	c55x-*)
+		basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	c6x-*)
+		basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
 	c90)
 		basic_machine=c90-cray
 		os=-unicos
@@ -839,6 +862,12 @@ case $basic_machine in
 	np1)
 		basic_machine=np1-gould
 		;;
+        neo-tandem)
+		basic_machine=neo-tandem
+		;;
+        nse-tandem)
+		basic_machine=nse-tandem
+		;;
 	nsr-tandem)
 		basic_machine=nsr-tandem
 		;;
@@ -1073,17 +1102,10 @@ case $basic_machine in
 		basic_machine=t90-cray
 		os=-unicos
 		;;
-	tic54x | c54x*)
-		basic_machine=tic54x-unknown
-		os=-coff
-		;;
-	tic55x | c55x*)
-		basic_machine=tic55x-unknown
-		os=-coff
-		;;
-	tic6x | c6x*)
-		basic_machine=tic6x-unknown
-		os=-coff
+        # This must be matched before tile*.
+        tilegx*)
+		basic_machine=tilegx-unknown
+		os=-linux-gnu
 		;;
 	tile*)
 		basic_machine=tile-unknown
@@ -1294,7 +1316,8 @@ case $os in
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
 	      | -chorusos* | -chorusrdb* | -cegcc* \
 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
+	      | -mingw32* | -linux-gnu* | -linux-android* \
+	      | -linux-newlib* | -linux-uclibc* \
 	      | -uxpv* | -beos* | -mpeix* | -udk* \
 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
@@ -1435,6 +1458,8 @@ case $os in
 	-dicos*)
 		os=-dicos
 		;;
+        -nacl*)
+	        ;;
 	-none)
 		;;
 	*)
@@ -1475,6 +1500,15 @@ case $basic_machine in
         c4x-* | tic4x-*)
         	os=-coff
 		;;
+	tic54x-*)
+		os=-coff
+		;;
+	tic55x-*)
+		os=-coff
+		;;
+	tic6x-*)
+		os=-coff
+		;;
 	# This must come before the *-dec entry.
 	pdp10-*)
 		os=-tops20
diff --git a/X11/configure b/X11/configure
index 05cb9531e..6fd584807 100644
--- a/X11/configure
+++ b/X11/configure
@@ -1,20 +1,24 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for Xproto 7.0.18.
+# Generated by GNU Autoconf 2.68 for Xproto 7.0.19.
 #
 # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
 #
+#
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
+# Foundation, Inc.
+#
+#
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
+## -------------------- ##
+## M4sh Initialization. ##
+## -------------------- ##
 
 # Be more Bourne compatible
 DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
   emulate sh
   NULLCMD=:
   # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
@@ -22,23 +26,15 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
 else
-  case `(set -o) 2>/dev/null` in
-  *posix*) set -o posix ;;
+  case `(set -o) 2>/dev/null` in #(
+  *posix*) :
+    set -o posix ;; #(
+  *) :
+     ;;
 esac
-
 fi
 
 
-
-
-# PATH needs CR
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
 as_nl='
 '
 export as_nl
@@ -46,7 +42,13 @@ export as_nl
 as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
 as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
 as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+# Prefer a ksh shell builtin over an external printf program on Solaris,
+# but without wasting forks for bash or zsh.
+if test -z "$BASH_VERSION$ZSH_VERSION" \
+    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='print -r --'
+  as_echo_n='print -rn --'
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
   as_echo='printf %s\n'
   as_echo_n='printf %s'
 else
@@ -57,7 +59,7 @@ else
     as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
     as_echo_n_body='eval
       arg=$1;
-      case $arg in
+      case $arg in #(
       *"$as_nl"*)
 	expr "X$arg" : "X\\(.*\\)$as_nl";
 	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
@@ -80,13 +82,6 @@ if test "${PATH_SEPARATOR+set}" != set; then
   }
 fi
 
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
-fi
-
 
 # IFS
 # We need space, tab and new line, in precisely that order.  Quoting is
@@ -96,15 +91,16 @@ fi
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
-case $0 in
+as_myself=
+case $0 in #((
   *[\\/]* ) as_myself=$0 ;;
   *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
+    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+  done
 IFS=$as_save_IFS
 
      ;;
@@ -116,12 +112,16 @@ if test "x$as_myself" = x; then
 fi
 if test ! -f "$as_myself"; then
   $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-  { (exit 1); exit 1; }
+  exit 1
 fi
 
-# Work around bugs in pre-3.0 UWIN ksh.
-for as_var in ENV MAIL MAILPATH
-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+# Unset variables that we do not need and which cause bugs (e.g. in
+# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
+# suppresses any "Segmentation fault" message there.  '((' could
+# trigger a bug in pdksh 5.2.14.
+for as_var in BASH_ENV ENV MAIL MAILPATH
+do eval test x\${$as_var+set} = xset \
+  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
 done
 PS1='$ '
 PS2='> '
@@ -133,330 +133,308 @@ export LC_ALL
 LANGUAGE=C
 export LANGUAGE
 
-# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-
-# Name of the executable.
-as_me=`$as_basename -- "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-
 # CDPATH.
-$as_unset CDPATH
-
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
 if test "x$CONFIG_SHELL" = x; then
-  if (eval ":") 2>/dev/null; then
-  as_have_required=yes
+  as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
+  emulate sh
+  NULLCMD=:
+  # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '\${1+\"\$@\"}'='\"\$@\"'
+  setopt NO_GLOB_SUBST
 else
-  as_have_required=no
+  case \`(set -o) 2>/dev/null\` in #(
+  *posix*) :
+    set -o posix ;; #(
+  *) :
+     ;;
+esac
 fi
-
-  if test $as_have_required = yes &&	 (eval ":
-(as_func_return () {
-  (exit \$1)
-}
-as_func_success () {
-  as_func_return 0
-}
-as_func_failure () {
-  as_func_return 1
-}
-as_func_ret_success () {
-  return 0
-}
-as_func_ret_failure () {
-  return 1
-}
+"
+  as_required="as_fn_return () { (exit \$1); }
+as_fn_success () { as_fn_return 0; }
+as_fn_failure () { as_fn_return 1; }
+as_fn_ret_success () { return 0; }
+as_fn_ret_failure () { return 1; }
 
 exitcode=0
-if as_func_success; then
-  :
-else
-  exitcode=1
-  echo as_func_success failed.
-fi
-
-if as_func_failure; then
-  exitcode=1
-  echo as_func_failure succeeded.
-fi
-
-if as_func_ret_success; then
-  :
-else
-  exitcode=1
-  echo as_func_ret_success failed.
-fi
-
-if as_func_ret_failure; then
-  exitcode=1
-  echo as_func_ret_failure succeeded.
-fi
-
-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
-  :
+as_fn_success || { exitcode=1; echo as_fn_success failed.; }
+as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
+as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
+as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
+if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
+
+else
+  exitcode=1; echo positional parameters were not saved.
+fi
+test x\$exitcode = x0 || exit 1"
+  as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
+  as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
+  eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
+  test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
+test \$(( 1 + 1 )) = 2 || exit 1"
+  if (eval "$as_required") 2>/dev/null; then :
+  as_have_required=yes
 else
-  exitcode=1
-  echo positional parameters were not saved.
+  as_have_required=no
 fi
+  if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
 
-test \$exitcode = 0) || { (exit 1); exit 1; }
-
-(
-  as_lineno_1=\$LINENO
-  as_lineno_2=\$LINENO
-  test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
-  test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
-") 2> /dev/null; then
-  :
 else
-  as_candidate_shells=
-    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+as_found=false
 for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  case $as_dir in
+  as_found=:
+  case $as_dir in #(
 	 /*)
 	   for as_base in sh bash ksh sh5; do
-	     as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
+	     # Try only shells that exist, to save several forks.
+	     as_shell=$as_dir/$as_base
+	     if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
+		    { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
+  CONFIG_SHELL=$as_shell as_have_required=yes
+		   if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
+  break 2
+fi
+fi
 	   done;;
        esac
+  as_found=false
 done
+$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
+	      { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
+  CONFIG_SHELL=$SHELL as_have_required=yes
+fi; }
 IFS=$as_save_IFS
 
 
-      for as_shell in $as_candidate_shells $SHELL; do
-	 # Try only shells that exist, to save several forks.
-	 if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
-		{ ("$as_shell") 2> /dev/null <<\_ASEOF
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in
-  *posix*) set -o posix ;;
-esac
-
+      if test "x$CONFIG_SHELL" != x; then :
+  # We cannot yet assume a decent shell, so we have to provide a
+	# neutralization value for shells without unset; and this also
+	# works around shells that cannot unset nonexistent variables.
+	# Preserve -v and -x to the replacement shell.
+	BASH_ENV=/dev/null
+	ENV=/dev/null
+	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+	export CONFIG_SHELL
+	case $- in # ((((
+	  *v*x* | *x*v* ) as_opts=-vx ;;
+	  *v* ) as_opts=-v ;;
+	  *x* ) as_opts=-x ;;
+	  * ) as_opts= ;;
+	esac
+	exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
 fi
 
-
-:
-_ASEOF
-}; then
-  CONFIG_SHELL=$as_shell
-	       as_have_required=yes
-	       if { "$as_shell" 2> /dev/null <<\_ASEOF
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in
-  *posix*) set -o posix ;;
-esac
-
+    if test x$as_have_required = xno; then :
+  $as_echo "$0: This script requires a shell more modern than all"
+  $as_echo "$0: the shells that I found on your system."
+  if test x${ZSH_VERSION+set} = xset ; then
+    $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
+    $as_echo "$0: be upgraded to zsh 4.3.4 or later."
+  else
+    $as_echo "$0: Please tell bug-autoconf@gnu.org and
+$0: https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+$0: about your system, including any error possibly output
+$0: before this message. Then install a modern shell, or
+$0: manually run the script under such a shell if you do
+$0: have one."
+  fi
+  exit 1
 fi
+fi
+fi
+SHELL=${CONFIG_SHELL-/bin/sh}
+export SHELL
+# Unset more variables known to interfere with behavior of common tools.
+CLICOLOR_FORCE= GREP_OPTIONS=
+unset CLICOLOR_FORCE GREP_OPTIONS
 
-
-:
-(as_func_return () {
-  (exit $1)
-}
-as_func_success () {
-  as_func_return 0
-}
-as_func_failure () {
-  as_func_return 1
-}
-as_func_ret_success () {
-  return 0
-}
-as_func_ret_failure () {
-  return 1
+## --------------------- ##
+## M4sh Shell Functions. ##
+## --------------------- ##
+# as_fn_unset VAR
+# ---------------
+# Portably unset VAR.
+as_fn_unset ()
+{
+  { eval $1=; unset $1;}
 }
+as_unset=as_fn_unset
 
-exitcode=0
-if as_func_success; then
-  :
-else
-  exitcode=1
-  echo as_func_success failed.
-fi
+# as_fn_set_status STATUS
+# -----------------------
+# Set $? to STATUS, without forking.
+as_fn_set_status ()
+{
+  return $1
+} # as_fn_set_status
 
-if as_func_failure; then
-  exitcode=1
-  echo as_func_failure succeeded.
-fi
+# as_fn_exit STATUS
+# -----------------
+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
+as_fn_exit ()
+{
+  set +e
+  as_fn_set_status $1
+  exit $1
+} # as_fn_exit
+
+# as_fn_mkdir_p
+# -------------
+# Create "$as_dir" as a directory, including parents if necessary.
+as_fn_mkdir_p ()
+{
 
-if as_func_ret_success; then
-  :
+  case $as_dir in #(
+  -*) as_dir=./$as_dir;;
+  esac
+  test -d "$as_dir" || eval $as_mkdir_p || {
+    as_dirs=
+    while :; do
+      case $as_dir in #(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *) as_qdir=$as_dir;;
+      esac
+      as_dirs="'$as_qdir' $as_dirs"
+      as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_dir" : 'X\(//\)[^/]' \| \
+	 X"$as_dir" : 'X\(//\)$' \| \
+	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_dir" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+      test -d "$as_dir" && break
+    done
+    test -z "$as_dirs" || eval "mkdir $as_dirs"
+  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
+
+
+} # as_fn_mkdir_p
+# as_fn_append VAR VALUE
+# ----------------------
+# Append the text in VALUE to the end of the definition contained in VAR. Take
+# advantage of any shell optimizations that allow amortized linear growth over
+# repeated appends, instead of the typical quadratic growth present in naive
+# implementations.
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+  eval 'as_fn_append ()
+  {
+    eval $1+=\$2
+  }'
 else
-  exitcode=1
-  echo as_func_ret_success failed.
-fi
-
-if as_func_ret_failure; then
-  exitcode=1
-  echo as_func_ret_failure succeeded.
-fi
-
-if ( set x; as_func_ret_success y && test x = "$1" ); then
-  :
+  as_fn_append ()
+  {
+    eval $1=\$$1\$2
+  }
+fi # as_fn_append
+
+# as_fn_arith ARG...
+# ------------------
+# Perform arithmetic evaluation on the ARGs, and store the result in the
+# global $as_val. Take advantage of shells that can avoid forks. The arguments
+# must be portable across $(()) and expr.
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+  eval 'as_fn_arith ()
+  {
+    as_val=$(( $* ))
+  }'
 else
-  exitcode=1
-  echo positional parameters were not saved.
-fi
-
-test $exitcode = 0) || { (exit 1); exit 1; }
-
-(
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
-
-_ASEOF
-}; then
-  break
-fi
-
-fi
-
-      done
-
-      if test "x$CONFIG_SHELL" != x; then
-  for as_var in BASH_ENV ENV
-	do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-	done
-	export CONFIG_SHELL
-	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
-fi
-
-
-    if test $as_have_required = no; then
-  echo This script requires a shell more modern than all the
-      echo shells that I found on your system.  Please install a
-      echo modern shell, or manually run the script under such a
-      echo shell if you do have one.
-      { (exit 1); exit 1; }
-fi
-
-
-fi
-
-fi
-
+  as_fn_arith ()
+  {
+    as_val=`expr "$@" || test $? -eq 1`
+  }
+fi # as_fn_arith
 
 
-(eval "as_func_return () {
-  (exit \$1)
-}
-as_func_success () {
-  as_func_return 0
-}
-as_func_failure () {
-  as_func_return 1
-}
-as_func_ret_success () {
-  return 0
-}
-as_func_ret_failure () {
-  return 1
-}
+# as_fn_error STATUS ERROR [LINENO LOG_FD]
+# ----------------------------------------
+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+# script with STATUS, using 1 if that was 0.
+as_fn_error ()
+{
+  as_status=$1; test $as_status -eq 0 && as_status=1
+  if test "$4"; then
+    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+  fi
+  $as_echo "$as_me: error: $2" >&2
+  as_fn_exit $as_status
+} # as_fn_error
 
-exitcode=0
-if as_func_success; then
-  :
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+  as_expr=expr
 else
-  exitcode=1
-  echo as_func_success failed.
-fi
-
-if as_func_failure; then
-  exitcode=1
-  echo as_func_failure succeeded.
+  as_expr=false
 fi
 
-if as_func_ret_success; then
-  :
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
+  as_basename=basename
 else
-  exitcode=1
-  echo as_func_ret_success failed.
-fi
-
-if as_func_ret_failure; then
-  exitcode=1
-  echo as_func_ret_failure succeeded.
+  as_basename=false
 fi
 
-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
-  :
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+  as_dirname=dirname
 else
-  exitcode=1
-  echo positional parameters were not saved.
+  as_dirname=false
 fi
 
-test \$exitcode = 0") || {
-  echo No shell found that supports shell functions.
-  echo Please tell bug-autoconf@gnu.org about your system,
-  echo including any error possibly output before this message.
-  echo This can help us improve future autoconf versions.
-  echo Configuration will now proceed without shell functions.
-}
-
+as_me=`$as_basename -- "$0" ||
+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+	 X"$0" : 'X\(//\)$' \| \
+	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X/"$0" |
+    sed '/^.*\/\([^/][^/]*\)\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
 
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
 
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
 
-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-  # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line after each line using $LINENO; the second 'sed'
-  # does the real work.  The second script uses 'N' to pair each
-  # line-number line with the line containing $LINENO, and appends
-  # trailing '-' during substitution so that $LINENO is not a special
-  # case at line end.
-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # scripts with optimization help from Paolo Bonzini.  Blame Lee
-  # E. McMahon (1931-1989) for sed's syntax.  :-)
+  as_lineno_1=$LINENO as_lineno_1a=$LINENO
+  as_lineno_2=$LINENO as_lineno_2a=$LINENO
+  eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
+  test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
+  # Blame Lee E. McMahon (1931-1989) for sed's syntax.  :-)
   sed -n '
     p
     /[$]LINENO/=
@@ -473,8 +451,7 @@ test \$exitcode = 0") || {
       s/-\n.*//
     ' >$as_me.lineno &&
   chmod +x "$as_me.lineno" ||
-    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
-   { (exit 1); exit 1; }; }
+    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
 
   # Don't try to exec as it changes $[0], causing all sort of problems
   # (the dirname of $[0] is not the place where we might find the
@@ -484,29 +461,18 @@ test \$exitcode = 0") || {
   exit
 }
 
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-  as_dirname=dirname
-else
-  as_dirname=false
-fi
-
 ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in
+case `echo -n x` in #(((((
 -n*)
-  case `echo 'x\c'` in
+  case `echo 'xy\c'` in
   *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  *)   ECHO_C='\c';;
+  xy)  ECHO_C='\c';;
+  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
+       ECHO_T='	';;
   esac;;
 *)
   ECHO_N='-n';;
 esac
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
 
 rm -f conf$$ conf$$.exe conf$$.file
 if test -d conf$$.dir; then
@@ -536,7 +502,7 @@ rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
 
 if mkdir -p . 2>/dev/null; then
-  as_mkdir_p=:
+  as_mkdir_p='mkdir -p "$as_dir"'
 else
   test -d ./-p && rmdir ./-p
   as_mkdir_p=false
@@ -555,10 +521,10 @@ else
       if test -d "$1"; then
 	test -d "$1/.";
       else
-	case $1 in
+	case $1 in #(
 	-*)set "./$1";;
 	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
 	???[sx]*):;;*)false;;esac;fi
     '\'' sh
   '
@@ -571,12 +537,72 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
 # Sed expression to map a string onto a valid variable name.
 as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
 
+as_awk_strverscmp='
+  # Use only awk features that work with 7th edition Unix awk (1978).
+  # My, what an old awk you have, Mr. Solaris!
+  END {
+    while (length(v1) && length(v2)) {
+      # Set d1 to be the next thing to compare from v1, and likewise for d2.
+      # Normally this is a single character, but if v1 and v2 contain digits,
+      # compare them as integers and fractions as strverscmp does.
+      if (v1 ~ /^[0-9]/ && v2 ~ /^[0-9]/) {
+	# Split v1 and v2 into their leading digit string components d1 and d2,
+	# and advance v1 and v2 past the leading digit strings.
+	for (len1 = 1; substr(v1, len1 + 1) ~ /^[0-9]/; len1++) continue
+	for (len2 = 1; substr(v2, len2 + 1) ~ /^[0-9]/; len2++) continue
+	d1 = substr(v1, 1, len1); v1 = substr(v1, len1 + 1)
+	d2 = substr(v2, 1, len2); v2 = substr(v2, len2 + 1)
+	if (d1 ~ /^0/) {
+	  if (d2 ~ /^0/) {
+	    # Compare two fractions.
+	    while (d1 ~ /^0/ && d2 ~ /^0/) {
+	      d1 = substr(d1, 2); len1--
+	      d2 = substr(d2, 2); len2--
+	    }
+	    if (len1 != len2 && ! (len1 && len2 && substr(d1, 1, 1) == substr(d2, 1, 1))) {
+	      # The two components differ in length, and the common prefix
+	      # contains only leading zeros.  Consider the longer to be less.
+	      d1 = -len1
+	      d2 = -len2
+	    } else {
+	      # Otherwise, compare as strings.
+	      d1 = "x" d1
+	      d2 = "x" d2
+	    }
+	  } else {
+	    # A fraction is less than an integer.
+	    exit 1
+	  }
+	} else {
+	  if (d2 ~ /^0/) {
+	    # An integer is greater than a fraction.
+	    exit 2
+	  } else {
+	    # Compare two integers.
+	    d1 += 0
+	    d2 += 0
+	  }
+	}
+      } else {
+	# The normal case, without worrying about digits.
+	d1 = substr(v1, 1, 1); v1 = substr(v1, 2)
+	d2 = substr(v2, 1, 1); v2 = substr(v2, 2)
+      }
+      if (d1 < d2) exit 1
+      if (d1 > d2) exit 2
+    }
+    # Beware Solaris /usr/xgp4/bin/awk (at least through Solaris 10),
+    # which mishandles some comparisons of empty strings to integers.
+    if (length(v2)) exit 1
+    if (length(v1)) exit 2
+  }
+'
 
-
-exec 7<&0 </dev/null 6>&1
+test -n "$DJDIR" || exec 7<&0 </dev/null
+exec 6>&1
 
 # Name of the host.
-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
+# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
 # so uname gets run too.
 ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
 
@@ -591,14 +617,14 @@ cross_compiling=no
 subdirs=
 MFLAGS=
 MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
 
 # Identity of this package.
 PACKAGE_NAME='Xproto'
 PACKAGE_TARNAME='xproto'
-PACKAGE_VERSION='7.0.18'
-PACKAGE_STRING='Xproto 7.0.18'
+PACKAGE_VERSION='7.0.19'
+PACKAGE_STRING='Xproto 7.0.19'
 PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
+PACKAGE_URL=''
 
 # Factoring default headers for most tests.
 ac_includes_default="\
@@ -641,6 +667,21 @@ am__EXEEXT_TRUE
 LTLIBOBJS
 LIBOBJS
 USE_FDS_BITS
+HAVE_STYLESHEETS_FALSE
+HAVE_STYLESHEETS_TRUE
+XSL_STYLESHEET
+STYLESHEET_SRCDIR
+XORG_SGML_PATH
+HAVE_FOP_FALSE
+HAVE_FOP_TRUE
+FOP
+HAVE_XMLTO_FALSE
+HAVE_XMLTO_TRUE
+HAVE_XMLTO_TEXT_FALSE
+HAVE_XMLTO_TEXT_TRUE
+XMLTO
+ENABLE_SPECS_FALSE
+ENABLE_SPECS_TRUE
 AM_BACKSLASH
 AM_DEFAULT_VERBOSITY
 MAN_SUBSTS
@@ -745,6 +786,7 @@ bindir
 program_transform_name
 prefix
 exec_prefix
+PACKAGE_URL
 PACKAGE_BUGREPORT
 PACKAGE_STRING
 PACKAGE_VERSION
@@ -759,6 +801,9 @@ enable_maintainer_mode
 enable_dependency_tracking
 enable_strict_compilation
 enable_silent_rules
+enable_specs
+with_xmlto
+with_fop
 enable_function_prototypes
 enable_varargs_prototypes
 enable_const_prototypes
@@ -774,7 +819,9 @@ LDFLAGS
 LIBS
 CPPFLAGS
 CPP
-PKG_CONFIG'
+PKG_CONFIG
+XMLTO
+FOP'
 
 
 # Initialize some variables set by options.
@@ -837,8 +884,9 @@ do
   fi
 
   case $ac_option in
-  *=*)	ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
-  *)	ac_optarg=yes ;;
+  *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
+  *=)   ac_optarg= ;;
+  *)    ac_optarg=yes ;;
   esac
 
   # Accept the important Cygnus configure options, so we can diagnose typos.
@@ -883,8 +931,7 @@ do
     ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
-   { (exit 1); exit 1; }; }
+      as_fn_error $? "invalid feature name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -910,8 +957,7 @@ do
     ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
-   { (exit 1); exit 1; }; }
+      as_fn_error $? "invalid feature name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -1115,8 +1161,7 @@ do
     ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
-   { (exit 1); exit 1; }; }
+      as_fn_error $? "invalid package name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -1132,8 +1177,7 @@ do
     ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
-   { (exit 1); exit 1; }; }
+      as_fn_error $? "invalid package name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -1163,17 +1207,17 @@ do
   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
     x_libraries=$ac_optarg ;;
 
-  -*) { $as_echo "$as_me: error: unrecognized option: $ac_option
-Try \`$0 --help' for more information." >&2
-   { (exit 1); exit 1; }; }
+  -*) as_fn_error $? "unrecognized option: \`$ac_option'
+Try \`$0 --help' for more information"
     ;;
 
   *=*)
     ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
-      { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2
-   { (exit 1); exit 1; }; }
+    case $ac_envvar in #(
+      '' | [0-9]* | *[!_$as_cr_alnum]* )
+      as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
+    esac
     eval $ac_envvar=\$ac_optarg
     export $ac_envvar ;;
 
@@ -1182,7 +1226,7 @@ Try \`$0 --help' for more information." >&2
     $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
     expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
       $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
+    : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
     ;;
 
   esac
@@ -1190,15 +1234,13 @@ done
 
 if test -n "$ac_prev"; then
   ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  { $as_echo "$as_me: error: missing argument to $ac_option" >&2
-   { (exit 1); exit 1; }; }
+  as_fn_error $? "missing argument to $ac_option"
 fi
 
 if test -n "$ac_unrecognized_opts"; then
   case $enable_option_checking in
     no) ;;
-    fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2
-   { (exit 1); exit 1; }; } ;;
+    fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
     *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
   esac
 fi
@@ -1221,8 +1263,7 @@ do
     [\\/$]* | ?:[\\/]* )  continue;;
     NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
   esac
-  { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-   { (exit 1); exit 1; }; }
+  as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
 done
 
 # There might be people who depend on the old broken behavior: `$host'
@@ -1236,8 +1277,8 @@ target=$target_alias
 if test "x$host_alias" != x; then
   if test "x$build_alias" = x; then
     cross_compiling=maybe
-    $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
-    If a cross compiler is detected then cross compile mode will be used." >&2
+    $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
+    If a cross compiler is detected then cross compile mode will be used" >&2
   elif test "x$build_alias" != "x$host_alias"; then
     cross_compiling=yes
   fi
@@ -1252,11 +1293,9 @@ test "$silent" = yes && exec 6>/dev/null
 ac_pwd=`pwd` && test -n "$ac_pwd" &&
 ac_ls_di=`ls -di .` &&
 ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-  { $as_echo "$as_me: error: working directory cannot be determined" >&2
-   { (exit 1); exit 1; }; }
+  as_fn_error $? "working directory cannot be determined"
 test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-  { $as_echo "$as_me: error: pwd does not report name of working directory" >&2
-   { (exit 1); exit 1; }; }
+  as_fn_error $? "pwd does not report name of working directory"
 
 
 # Find the source files, if location was not specified.
@@ -1295,13 +1334,11 @@ else
 fi
 if test ! -r "$srcdir/$ac_unique_file"; then
   test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-  { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
-   { (exit 1); exit 1; }; }
+  as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
 fi
 ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
 ac_abs_confdir=`(
-	cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2
-   { (exit 1); exit 1; }; }
+	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
 	pwd)`
 # When building in place, set srcdir=.
 if test "$ac_abs_confdir" = "$ac_pwd"; then
@@ -1327,7 +1364,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures Xproto 7.0.18 to adapt to many kinds of systems.
+\`configure' configures Xproto 7.0.19 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1341,7 +1378,7 @@ Configuration:
       --help=short        display options specific to this package
       --help=recursive    display the short help of all the included packages
   -V, --version           display version information and exit
-  -q, --quiet, --silent   do not print \`checking...' messages
+  -q, --quiet, --silent   do not print \`checking ...' messages
       --cache-file=FILE   cache test results in FILE [disabled]
   -C, --config-cache      alias for \`--cache-file=config.cache'
   -n, --no-create         do not create output files
@@ -1397,7 +1434,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of Xproto 7.0.18:";;
+     short | recursive ) echo "Configuration of Xproto 7.0.19:";;
    esac
   cat <<\_ACEOF
 
@@ -1414,6 +1451,7 @@ Optional Features:
                           errors (default: disabled)
   --enable-silent-rules          less verbose build output (undo: `make V=1')
   --disable-silent-rules         verbose build output (undo: `make V=0')
+  --enable-specs          Enable building the specs (default: yes)
   --enable-function-prototypes
                           force function prototypes (default: auto)
   --enable-varargs-prototypes
@@ -1425,16 +1463,25 @@ Optional Features:
   --enable-wide-prototypes
                           widen function prototypes (default: auto)
 
+Optional Packages:
+  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
+  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+  --with-xmlto            Use xmlto to regenerate documentation (default:
+                          auto)
+  --with-fop              Use fop to regenerate documentation (default: auto)
+
 Some influential environment variables:
   CC          C compiler command
   CFLAGS      C compiler flags
   LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
               nonstandard directory <lib dir>
   LIBS        libraries to pass to the linker, e.g. -l<library>
-  CPPFLAGS    C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
+  CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
               you have headers in a nonstandard directory <include dir>
   CPP         C preprocessor
   PKG_CONFIG  path to pkg-config utility
+  XMLTO       Path to xmlto command
+  FOP         Path to fop command
 
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
@@ -1502,22 +1549,367 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-Xproto configure 7.0.18
-generated by GNU Autoconf 2.63
+Xproto configure 7.0.19
+generated by GNU Autoconf 2.68
 
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright (C) 2010 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
   exit
 fi
+
+## ------------------------ ##
+## Autoconf initialization. ##
+## ------------------------ ##
+
+# ac_fn_c_try_compile LINENO
+# --------------------------
+# Try to compile conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_compile ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  rm -f conftest.$ac_objext
+  if { { ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_compile") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_retval=1
+fi
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_compile
+
+# ac_fn_c_check_decl LINENO SYMBOL VAR INCLUDES
+# ---------------------------------------------
+# Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR
+# accordingly.
+ac_fn_c_check_decl ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  as_decl_name=`echo $2|sed 's/ *(.*//'`
+  as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'`
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5
+$as_echo_n "checking whether $as_decl_name is declared... " >&6; }
+if eval \${$3+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+#ifndef $as_decl_name
+#ifdef __cplusplus
+  (void) $as_decl_use;
+#else
+  (void) $as_decl_name;
+#endif
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  eval "$3=yes"
+else
+  eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_check_decl
+
+# ac_fn_c_try_cpp LINENO
+# ----------------------
+# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_cpp ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if { { ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } > conftest.i && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+    ac_retval=1
+fi
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_cpp
+
+# ac_fn_c_try_run LINENO
+# ----------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
+# that executables *can* be run.
+ac_fn_c_try_run ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
+  { { case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+       $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+       ac_retval=$ac_status
+fi
+  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_run
+
+# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
+# -------------------------------------------------------
+# Tests whether HEADER exists and can be compiled using the include files in
+# INCLUDES, setting the cache variable VAR accordingly.
+ac_fn_c_check_header_compile ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+#include <$2>
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  eval "$3=yes"
+else
+  eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_check_header_compile
+
+# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
+# -------------------------------------------------------
+# Tests whether HEADER exists, giving a warning if it cannot be compiled using
+# the include files in INCLUDES and setting the cache variable VAR
+# accordingly.
+ac_fn_c_check_header_mongrel ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if eval \${$3+:} false; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+  $as_echo_n "(cached) " >&6
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+else
+  # Is the header compilable?
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
+$as_echo_n "checking $2 usability... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+#include <$2>
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_header_compiler=yes
+else
+  ac_header_compiler=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
+$as_echo_n "checking $2 presence... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <$2>
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+  ac_header_preproc=yes
+else
+  ac_header_preproc=no
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
+  yes:no: )
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
+    ;;
+  no:yes:* )
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $2:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
+( $as_echo "## ---------------------------------------------------------------------- ##
+## Report this to https://bugs.freedesktop.org/enter_bug.cgi?product=xorg ##
+## ---------------------------------------------------------------------- ##"
+     ) | sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+esac
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  eval "$3=\$ac_header_compiler"
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+fi
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_check_header_mongrel
+
+# ac_fn_c_check_member LINENO AGGR MEMBER VAR INCLUDES
+# ----------------------------------------------------
+# Tries to find if the field MEMBER exists in type AGGR, after including
+# INCLUDES, setting cache variable VAR accordingly.
+ac_fn_c_check_member ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5
+$as_echo_n "checking for $2.$3... " >&6; }
+if eval \${$4+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$5
+int
+main ()
+{
+static $2 ac_aggr;
+if (ac_aggr.$3)
+return 0;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  eval "$4=yes"
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$5
+int
+main ()
+{
+static $2 ac_aggr;
+if (sizeof ac_aggr.$3)
+return 0;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  eval "$4=yes"
+else
+  eval "$4=no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$4
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_check_member
 cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by Xproto $as_me 7.0.18, which was
-generated by GNU Autoconf 2.63.  Invocation command line was
+It was created by Xproto $as_me 7.0.19, which was
+generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
 
@@ -1553,8 +1945,8 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  $as_echo "PATH: $as_dir"
-done
+    $as_echo "PATH: $as_dir"
+  done
 IFS=$as_save_IFS
 
 } >&5
@@ -1591,9 +1983,9 @@ do
       ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
     esac
     case $ac_pass in
-    1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
+    1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
     2)
-      ac_configure_args1="$ac_configure_args1 '$ac_arg'"
+      as_fn_append ac_configure_args1 " '$ac_arg'"
       if test $ac_must_keep_next = true; then
 	ac_must_keep_next=false # Got value, back to normal.
       else
@@ -1609,13 +2001,13 @@ do
 	  -* ) ac_must_keep_next=true ;;
 	esac
       fi
-      ac_configure_args="$ac_configure_args '$ac_arg'"
+      as_fn_append ac_configure_args " '$ac_arg'"
       ;;
     esac
   done
 done
-$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
-$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
+{ ac_configure_args0=; unset ac_configure_args0;}
+{ ac_configure_args1=; unset ac_configure_args1;}
 
 # When interrupted or exit'd, cleanup temporary files, and complete
 # config.log.  We remove comments because anyway the quotes in there
@@ -1627,11 +2019,9 @@ trap 'exit_status=$?
   {
     echo
 
-    cat <<\_ASBOX
-## ---------------- ##
+    $as_echo "## ---------------- ##
 ## Cache variables. ##
-## ---------------- ##
-_ASBOX
+## ---------------- ##"
     echo
     # The following way of writing the cache mishandles newlines in values,
 (
@@ -1640,13 +2030,13 @@ _ASBOX
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
+      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
 $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
       BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-      *) $as_unset $ac_var ;;
+      *) { eval $ac_var=; unset $ac_var;} ;;
       esac ;;
     esac
   done
@@ -1665,11 +2055,9 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
 )
     echo
 
-    cat <<\_ASBOX
-## ----------------- ##
+    $as_echo "## ----------------- ##
 ## Output variables. ##
-## ----------------- ##
-_ASBOX
+## ----------------- ##"
     echo
     for ac_var in $ac_subst_vars
     do
@@ -1682,11 +2070,9 @@ _ASBOX
     echo
 
     if test -n "$ac_subst_files"; then
-      cat <<\_ASBOX
-## ------------------- ##
+      $as_echo "## ------------------- ##
 ## File substitutions. ##
-## ------------------- ##
-_ASBOX
+## ------------------- ##"
       echo
       for ac_var in $ac_subst_files
       do
@@ -1700,11 +2086,9 @@ _ASBOX
     fi
 
     if test -s confdefs.h; then
-      cat <<\_ASBOX
-## ----------- ##
+      $as_echo "## ----------- ##
 ## confdefs.h. ##
-## ----------- ##
-_ASBOX
+## ----------- ##"
       echo
       cat confdefs.h
       echo
@@ -1718,46 +2102,53 @@ _ASBOX
     exit $exit_status
 ' 0
 for ac_signal in 1 2 13 15; do
-  trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
+  trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal
 done
 ac_signal=0
 
 # confdefs.h avoids OS command line length limits that DEFS can exceed.
 rm -f -r conftest* confdefs.h
 
+$as_echo "/* confdefs.h */" > confdefs.h
+
 # Predefined preprocessor variables.
 
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE_NAME "$PACKAGE_NAME"
 _ACEOF
 
-
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE_TARNAME "$PACKAGE_TARNAME"
 _ACEOF
 
-
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE_VERSION "$PACKAGE_VERSION"
 _ACEOF
 
-
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE_STRING "$PACKAGE_STRING"
 _ACEOF
 
-
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
 _ACEOF
 
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_URL "$PACKAGE_URL"
+_ACEOF
+
 
 # Let the site file select an alternate cache file if it wants to.
 # Prefer an explicitly selected file to automatically selected ones.
 ac_site_file1=NONE
 ac_site_file2=NONE
 if test -n "$CONFIG_SITE"; then
-  ac_site_file1=$CONFIG_SITE
+  # We do not want a PATH search for config.site.
+  case $CONFIG_SITE in #((
+    -*)  ac_site_file1=./$CONFIG_SITE;;
+    */*) ac_site_file1=$CONFIG_SITE;;
+    *)   ac_site_file1=./$CONFIG_SITE;;
+  esac
 elif test "x$prefix" != xNONE; then
   ac_site_file1=$prefix/share/config.site
   ac_site_file2=$prefix/etc/config.site
@@ -1768,19 +2159,23 @@ fi
 for ac_site_file in "$ac_site_file1" "$ac_site_file2"
 do
   test "x$ac_site_file" = xNONE && continue
-  if test -r "$ac_site_file"; then
-    { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
+  if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
 $as_echo "$as_me: loading site script $ac_site_file" >&6;}
     sed 's/^/| /' "$ac_site_file" >&5
-    . "$ac_site_file"
+    . "$ac_site_file" \
+      || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "failed to load site script $ac_site_file
+See \`config.log' for more details" "$LINENO" 5; }
   fi
 done
 
 if test -r "$cache_file"; then
-  # Some versions of bash will fail to source /dev/null (special
-  # files actually), so we avoid doing that.
-  if test -f "$cache_file"; then
-    { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5
+  # Some versions of bash will fail to source /dev/null (special files
+  # actually), so we avoid doing that.  DJGPP emulates it as a regular file.
+  if test /dev/null != "$cache_file" && test -f "$cache_file"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
 $as_echo "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
       [\\/]* | ?:[\\/]* ) . "$cache_file";;
@@ -1788,7 +2183,7 @@ $as_echo "$as_me: loading cache $cache_file" >&6;}
     esac
   fi
 else
-  { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
 $as_echo "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi
@@ -1803,11 +2198,11 @@ for ac_var in $ac_precious_vars; do
   eval ac_new_val=\$ac_env_${ac_var}_value
   case $ac_old_set,$ac_new_set in
     set,)
-      { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
 $as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,set)
-      { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
+      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
 $as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,);;
@@ -1817,17 +2212,17 @@ $as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
 	ac_old_val_w=`echo x $ac_old_val`
 	ac_new_val_w=`echo x $ac_new_val`
 	if test "$ac_old_val_w" != "$ac_new_val_w"; then
-	  { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
 $as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
 	  ac_cache_corrupted=:
 	else
-	  { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
 $as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
 	  eval $ac_var=\$ac_old_val
 	fi
-	{ $as_echo "$as_me:$LINENO:   former value:  \`$ac_old_val'" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}:   former value:  \`$ac_old_val'" >&5
 $as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
-	{ $as_echo "$as_me:$LINENO:   current value: \`$ac_new_val'" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}:   current value: \`$ac_new_val'" >&5
 $as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
       fi;;
   esac
@@ -1839,43 +2234,20 @@ $as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
     esac
     case " $ac_configure_args " in
       *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
-      *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
+      *) as_fn_append ac_configure_args " '$ac_arg'" ;;
     esac
   fi
 done
 if $ac_cache_corrupted; then
-  { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-  { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
 $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
-$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
 fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+## -------------------- ##
+## Main body of script. ##
+## -------------------- ##
 
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -1903,9 +2275,7 @@ for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
   fi
 done
 if test -z "$ac_aux_dir"; then
-  { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
-$as_echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
 fi
 
 # These three variables are undocumented and unsupported,
@@ -1931,10 +2301,10 @@ ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 # OS/2's system install, which has a completely different semantic
 # ./install, which can be erroneously created by make from ./install.sh.
 # Reject install programs that cannot install multiple files.
-{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
 $as_echo_n "checking for a BSD-compatible install... " >&6; }
 if test -z "$INSTALL"; then
-if test "${ac_cv_path_install+set}" = set; then
+if ${ac_cv_path_install+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -1942,11 +2312,11 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  # Account for people who put trailing slashes in PATH elements.
-case $as_dir/ in
-  ./ | .// | /cC/* | \
+    # Account for people who put trailing slashes in PATH elements.
+case $as_dir/ in #((
+  ./ | .// | /[cC]/* | \
   /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
-  ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
+  ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \
   /usr/ucb/* ) ;;
   *)
     # OSF1 and SCO ODT 3.0 have their own names for install.
@@ -1983,7 +2353,7 @@ case $as_dir/ in
     ;;
 esac
 
-done
+  done
 IFS=$as_save_IFS
 
 rm -rf conftest.one conftest.two conftest.dir
@@ -1999,7 +2369,7 @@ fi
     INSTALL=$ac_install_sh
   fi
 fi
-{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
 $as_echo "$INSTALL" >&6; }
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
@@ -2010,7 +2380,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
 
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
-{ $as_echo "$as_me:$LINENO: checking whether build environment is sane" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
 $as_echo_n "checking whether build environment is sane... " >&6; }
 # Just in case
 sleep 1
@@ -2021,15 +2391,11 @@ am_lf='
 '
 case `pwd` in
   *[\\\"\#\$\&\'\`$am_lf]*)
-    { { $as_echo "$as_me:$LINENO: error: unsafe absolute working directory name" >&5
-$as_echo "$as_me: error: unsafe absolute working directory name" >&2;}
-   { (exit 1); exit 1; }; };;
+    as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;;
 esac
 case $srcdir in
   *[\\\"\#\$\&\'\`$am_lf\ \	]*)
-    { { $as_echo "$as_me:$LINENO: error: unsafe srcdir value: \`$srcdir'" >&5
-$as_echo "$as_me: error: unsafe srcdir value: \`$srcdir'" >&2;}
-   { (exit 1); exit 1; }; };;
+    as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
 esac
 
 # Do `set' in a subshell so we don't clobber the current shell's
@@ -2051,11 +2417,8 @@ if (
       # if, for instance, CONFIG_SHELL is bash and it inherits a
       # broken ls alias from the environment.  This has actually
       # happened.  Such a system could not be considered "sane".
-      { { $as_echo "$as_me:$LINENO: error: ls -t appears to fail.  Make sure there is not a broken
-alias in your environment" >&5
-$as_echo "$as_me: error: ls -t appears to fail.  Make sure there is not a broken
-alias in your environment" >&2;}
-   { (exit 1); exit 1; }; }
+      as_fn_error $? "ls -t appears to fail.  Make sure there is not a broken
+alias in your environment" "$LINENO" 5
    fi
 
    test "$2" = conftest.file
@@ -2064,13 +2427,10 @@ then
    # Ok.
    :
 else
-   { { $as_echo "$as_me:$LINENO: error: newly created file is older than distributed files!
-Check your system clock" >&5
-$as_echo "$as_me: error: newly created file is older than distributed files!
-Check your system clock" >&2;}
-   { (exit 1); exit 1; }; }
+   as_fn_error $? "newly created file is older than distributed files!
+Check your system clock" "$LINENO" 5
 fi
-{ $as_echo "$as_me:$LINENO: result: yes" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 test "$program_prefix" != NONE &&
   program_transform_name="s&^&$program_prefix&;$program_transform_name"
@@ -2098,7 +2458,7 @@ if eval "$MISSING --run true"; then
   am_missing_run="$MISSING --run "
 else
   am_missing_run=
-  { $as_echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5
 $as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
 fi
 
@@ -2119,9 +2479,9 @@ if test "$cross_compiling" != no; then
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
 set dummy ${ac_tool_prefix}strip; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_STRIP+set}" = set; then
+if ${ac_cv_prog_STRIP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$STRIP"; then
@@ -2132,24 +2492,24 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 STRIP=$ac_cv_prog_STRIP
 if test -n "$STRIP"; then
-  { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
 $as_echo "$STRIP" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -2159,9 +2519,9 @@ if test -z "$ac_cv_prog_STRIP"; then
   ac_ct_STRIP=$STRIP
   # Extract the first word of "strip", so it can be a program name with args.
 set dummy strip; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
+if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_STRIP"; then
@@ -2172,24 +2532,24 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_STRIP="strip"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
 if test -n "$ac_ct_STRIP"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
 $as_echo "$ac_ct_STRIP" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -2198,7 +2558,7 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
@@ -2211,10 +2571,10 @@ fi
 fi
 INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 
-{ $as_echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
 $as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
 if test -z "$MKDIR_P"; then
-  if test "${ac_cv_path_mkdir+set}" = set; then
+  if ${ac_cv_path_mkdir+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -2222,7 +2582,7 @@ for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_prog in mkdir gmkdir; do
+    for ac_prog in mkdir gmkdir; do
 	 for ac_exec_ext in '' $ac_executable_extensions; do
 	   { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
 	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
@@ -2234,11 +2594,12 @@ do
 	   esac
 	 done
        done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 
+  test -d ./--version && rmdir ./--version
   if test "${ac_cv_path_mkdir+set}" = set; then
     MKDIR_P="$ac_cv_path_mkdir -p"
   else
@@ -2246,11 +2607,10 @@ fi
     # value for MKDIR_P within a source directory, because that will
     # break other packages using the cache if that directory is
     # removed, or if the value is a relative name.
-    test -d ./--version && rmdir ./--version
     MKDIR_P="$ac_install_sh -d"
   fi
 fi
-{ $as_echo "$as_me:$LINENO: result: $MKDIR_P" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
 $as_echo "$MKDIR_P" >&6; }
 
 mkdir_p="$MKDIR_P"
@@ -2263,9 +2623,9 @@ for ac_prog in gawk mawk nawk awk
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_AWK+set}" = set; then
+if ${ac_cv_prog_AWK+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$AWK"; then
@@ -2276,24 +2636,24 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_AWK="$ac_prog"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 AWK=$ac_cv_prog_AWK
 if test -n "$AWK"; then
-  { $as_echo "$as_me:$LINENO: result: $AWK" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
 $as_echo "$AWK" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -2301,11 +2661,11 @@ fi
   test -n "$AWK" && break
 done
 
-{ $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
 $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
 set x ${MAKE-make}
 ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
+if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.make <<\_ACEOF
@@ -2313,7 +2673,7 @@ SHELL = /bin/sh
 all:
 	@echo '@@@%%%=$(MAKE)=@@@%%%'
 _ACEOF
-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
+# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
 case `${MAKE-make} -f conftest.make 2>/dev/null` in
   *@@@%%%=?*=@@@%%%*)
     eval ac_cv_prog_make_${ac_make}_set=yes;;
@@ -2323,11 +2683,11 @@ esac
 rm -f conftest.make
 fi
 if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
-  { $as_echo "$as_me:$LINENO: result: yes" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
   SET_MAKE=
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
   SET_MAKE="MAKE=${MAKE-make}"
 fi
@@ -2347,9 +2707,7 @@ if test "`cd $srcdir && pwd`" != "`pwd`"; then
   am__isrc=' -I$(srcdir)'
   # test to see if srcdir already configured
   if test -f $srcdir/config.status; then
-    { { $as_echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
-$as_echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
   fi
 fi
 
@@ -2365,7 +2723,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='xproto'
- VERSION='7.0.18'
+ VERSION='7.0.19'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2406,16 +2764,16 @@ am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
 
 
 
-{ $as_echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
 $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
     # Check whether --enable-maintainer-mode was given.
-if test "${enable_maintainer_mode+set}" = set; then
+if test "${enable_maintainer_mode+set}" = set; then :
   enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
 else
   USE_MAINTAINER_MODE=no
 fi
 
-  { $as_echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5
 $as_echo "$USE_MAINTAINER_MODE" >&6; }
    if test $USE_MAINTAINER_MODE = yes; then
   MAINTAINER_MODE_TRUE=
@@ -2429,7 +2787,7 @@ fi
 
 
 
-# Require xorg-macros: XORG_DEFAULT_OPTIONS
+# Require xorg-macros minimum of 1.10 for DocBook XML documentation
 
 
 
@@ -2453,7 +2811,7 @@ am__doit:
 .PHONY: am__doit
 END
 # If we don't find an include directive, just comment out the code.
-{ $as_echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5
 $as_echo_n "checking for style of include used by $am_make... " >&6; }
 am__include="#"
 am__quote=
@@ -2481,12 +2839,12 @@ if test "$am__include" = "#"; then
 fi
 
 
-{ $as_echo "$as_me:$LINENO: result: $_am_result" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5
 $as_echo "$_am_result" >&6; }
 rm -f confinc confmf
 
 # Check whether --enable-dependency-tracking was given.
-if test "${enable_dependency_tracking+set}" = set; then
+if test "${enable_dependency_tracking+set}" = set; then :
   enableval=$enable_dependency_tracking;
 fi
 
@@ -2511,9 +2869,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
+if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -2524,24 +2882,24 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
 $as_echo "$CC" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -2551,9 +2909,9 @@ if test -z "$ac_cv_prog_CC"; then
   ac_ct_CC=$CC
   # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
@@ -2564,24 +2922,24 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CC="gcc"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
 $as_echo "$ac_ct_CC" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -2590,7 +2948,7 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
@@ -2604,9 +2962,9 @@ if test -z "$CC"; then
           if test -n "$ac_tool_prefix"; then
     # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
+if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -2617,24 +2975,24 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="${ac_tool_prefix}cc"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
 $as_echo "$CC" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -2644,9 +3002,9 @@ fi
 if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
+if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -2658,18 +3016,18 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
        ac_prog_rejected=yes
        continue
      fi
     ac_cv_prog_CC="cc"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 if test $ac_prog_rejected = yes; then
@@ -2688,10 +3046,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
 $as_echo "$CC" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -2703,9 +3061,9 @@ if test -z "$CC"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
+if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -2716,24 +3074,24 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
 $as_echo "$CC" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -2747,9 +3105,9 @@ if test -z "$CC"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
@@ -2760,24 +3118,24 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CC="$ac_prog"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
 $as_echo "$ac_ct_CC" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -2790,7 +3148,7 @@ done
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
@@ -2801,57 +3159,37 @@ fi
 fi
 
 
-test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
+as_fn_error $? "no acceptable C compiler found in \$PATH
+See \`config.log' for more details" "$LINENO" 5; }
 
 # Provide some information about the compiler.
-$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
 set X $ac_compile
 ac_compiler=$2
-{ (ac_try="$ac_compiler --version >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compiler --version >&5") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (ac_try="$ac_compiler -v >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compiler -v >&5") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (ac_try="$ac_compiler -V >&5"
+for ac_option in --version -v -V -qversion; do
+  { { ac_try="$ac_compiler $ac_option >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compiler -V >&5") 2>&5
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
+  if test -s conftest.err; then
+    sed '10a\
+... rest of stderr output deleted ...
+         10q' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+  fi
+  rm -f conftest.er1 conftest.err
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+done
 
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -2867,8 +3205,8 @@ ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
 # Try to create an executable without -o first, disregard a.out.
 # It will help us diagnose broken compilers, and finding out an intuition
 # of exeext.
-{ $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
-$as_echo_n "checking for C compiler default output file name... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
+$as_echo_n "checking whether the C compiler works... " >&6; }
 ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
 
 # The possible output files:
@@ -2884,17 +3222,17 @@ do
 done
 rm -f $ac_rmfiles
 
-if { (ac_try="$ac_link_default"
+if { { ac_try="$ac_link_default"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
   (eval "$ac_link_default") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then :
   # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
 # So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
 # in a Makefile.  We should not override ac_cv_exeext if it was cached,
@@ -2911,7 +3249,7 @@ do
 	# certainly right.
 	break;;
     *.* )
-        if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
+	if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
 	then :; else
 	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
 	fi
@@ -2930,84 +3268,41 @@ test "$ac_cv_exeext" = no && ac_cv_exeext=
 else
   ac_file=''
 fi
-
-{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5
-$as_echo "$ac_file" >&6; }
-if test -z "$ac_file"; then
-  $as_echo "$as_me: failed program was:" >&5
+if test -z "$ac_file"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: C compiler cannot create executables
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }; }
+as_fn_error 77 "C compiler cannot create executables
+See \`config.log' for more details" "$LINENO" 5; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 fi
-
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
+$as_echo_n "checking for C compiler default output file name... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
+$as_echo "$ac_file" >&6; }
 ac_exeext=$ac_cv_exeext
 
-# Check that the compiler produces executables we can run.  If not, either
-# the compiler is broken, or we cross compile.
-{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5
-$as_echo_n "checking whether the C compiler works... " >&6; }
-# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
-# If not cross compiling, check that we can run a simple program.
-if test "$cross_compiling" != yes; then
-  if { ac_try='./$ac_file'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-    cross_compiling=no
-  else
-    if test "$cross_compiling" = maybe; then
-	cross_compiling=yes
-    else
-	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
-    fi
-  fi
-fi
-{ $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
-
 rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
 ac_clean_files=$ac_clean_files_save
-# Check that the compiler produces executables we can run.  If not, either
-# the compiler is broken, or we cross compile.
-{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
-$as_echo_n "checking whether we are cross compiling... " >&6; }
-{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5
-$as_echo "$cross_compiling" >&6; }
-
-{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
 $as_echo_n "checking for suffix of executables... " >&6; }
-if { (ac_try="$ac_link"
+if { { ac_try="$ac_link"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then :
   # If both `conftest.exe' and `conftest' are `present' (well, observable)
 # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
 # work properly (i.e., refer to `conftest.exe'), while it won't with
@@ -3022,32 +3317,83 @@ for ac_file in conftest.exe conftest conftest.*; do
   esac
 done
 else
-  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
+as_fn_error $? "cannot compute suffix of executables: cannot compile and link
+See \`config.log' for more details" "$LINENO" 5; }
 fi
-
-rm -f conftest$ac_cv_exeext
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
+rm -f conftest conftest$ac_cv_exeext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
 $as_echo "$ac_cv_exeext" >&6; }
 
 rm -f conftest.$ac_ext
 EXEEXT=$ac_cv_exeext
 ac_exeext=$EXEEXT
-{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdio.h>
+int
+main ()
+{
+FILE *f = fopen ("conftest.out", "w");
+ return ferror (f) || fclose (f) != 0;
+
+  ;
+  return 0;
+}
+_ACEOF
+ac_clean_files="$ac_clean_files conftest.out"
+# Check that the compiler produces executables we can run.  If not, either
+# the compiler is broken, or we cross compile.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
+$as_echo_n "checking whether we are cross compiling... " >&6; }
+if test "$cross_compiling" != yes; then
+  { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+  if { ac_try='./conftest$ac_cv_exeext'
+  { { case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; }; then
+    cross_compiling=no
+  else
+    if test "$cross_compiling" = maybe; then
+	cross_compiling=yes
+    else
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "cannot run C compiled programs.
+If you meant to cross compile, use \`--host'.
+See \`config.log' for more details" "$LINENO" 5; }
+    fi
+  fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
+$as_echo "$cross_compiling" >&6; }
+
+rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
+ac_clean_files=$ac_clean_files_save
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
 $as_echo_n "checking for suffix of object files... " >&6; }
-if test "${ac_cv_objext+set}" = set; then
+if ${ac_cv_objext+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -3059,17 +3405,17 @@ main ()
 }
 _ACEOF
 rm -f conftest.o conftest.obj
-if { (ac_try="$ac_compile"
+if { { ac_try="$ac_compile"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
   (eval "$ac_compile") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then :
   for ac_file in conftest.o conftest.obj conftest.*; do
   test -f "$ac_file" || continue;
   case $ac_file in
@@ -3082,31 +3428,23 @@ else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
+as_fn_error $? "cannot compute suffix of object files: cannot compile
+See \`config.log' for more details" "$LINENO" 5; }
 fi
-
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
 $as_echo "$ac_cv_objext" >&6; }
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
-{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
 $as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if test "${ac_cv_c_compiler_gnu+set}" = set; then
+if ${ac_cv_c_compiler_gnu+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -3120,37 +3458,16 @@ main ()
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_compiler_gnu=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_compiler_gnu=no
+  ac_compiler_gnu=no
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
 $as_echo "$ac_cv_c_compiler_gnu" >&6; }
 if test $ac_compiler_gnu = yes; then
   GCC=yes
@@ -3159,20 +3476,16 @@ else
 fi
 ac_test_CFLAGS=${CFLAGS+set}
 ac_save_CFLAGS=$CFLAGS
-{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
 $as_echo_n "checking whether $CC accepts -g... " >&6; }
-if test "${ac_cv_prog_cc_g+set}" = set; then
+if ${ac_cv_prog_cc_g+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_save_c_werror_flag=$ac_c_werror_flag
    ac_c_werror_flag=yes
    ac_cv_prog_cc_g=no
    CFLAGS="-g"
-   cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -3183,35 +3496,11 @@ main ()
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_prog_cc_g=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	CFLAGS=""
-      cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  CFLAGS=""
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -3222,36 +3511,12 @@ main ()
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  :
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_c_try_compile "$LINENO"; then :
 
-	ac_c_werror_flag=$ac_save_c_werror_flag
+else
+  ac_c_werror_flag=$ac_save_c_werror_flag
 	 CFLAGS="-g"
-	 cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -3262,42 +3527,17 @@ main ()
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_prog_cc_g=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    ac_c_werror_flag=$ac_save_c_werror_flag
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
 $as_echo "$ac_cv_prog_cc_g" >&6; }
 if test "$ac_test_CFLAGS" = set; then
   CFLAGS=$ac_save_CFLAGS
@@ -3314,18 +3554,14 @@ else
     CFLAGS=
   fi
 fi
-{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if test "${ac_cv_prog_cc_c89+set}" = set; then
+if ${ac_cv_prog_cc_c89+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_cv_prog_cc_c89=no
 ac_save_CC=$CC
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdarg.h>
 #include <stdio.h>
@@ -3382,32 +3618,9 @@ for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
 	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
 do
   CC="$ac_save_CC $ac_arg"
-  rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_prog_cc_c89=$ac_arg
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
 fi
-
 rm -f core conftest.err conftest.$ac_objext
   test "x$ac_cv_prog_cc_c89" != "xno" && break
 done
@@ -3418,17 +3631,19 @@ fi
 # AC_CACHE_VAL
 case "x$ac_cv_prog_cc_c89" in
   x)
-    { $as_echo "$as_me:$LINENO: result: none needed" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
 $as_echo "none needed" >&6; } ;;
   xno)
-    { $as_echo "$as_me:$LINENO: result: unsupported" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
 $as_echo "unsupported" >&6; } ;;
   *)
     CC="$CC $ac_cv_prog_cc_c89"
-    { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
 $as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
 esac
+if test "x$ac_cv_prog_cc_c89" != xno; then :
 
+fi
 
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -3438,9 +3653,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 depcc="$CC"   am_compiler_list=
 
-{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
 $as_echo_n "checking dependency style of $depcc... " >&6; }
-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
+if ${am_cv_CC_dependencies_compiler_type+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
@@ -3548,7 +3763,7 @@ else
 fi
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
 $as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
 CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
 
@@ -3563,18 +3778,14 @@ else
 fi
 
 
-   { $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C99" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C99" >&5
 $as_echo_n "checking for $CC option to accept ISO C99... " >&6; }
-if test "${ac_cv_prog_cc_c99+set}" = set; then
+if ${ac_cv_prog_cc_c99+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_cv_prog_cc_c99=no
 ac_save_CC=$CC
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdarg.h>
 #include <stdbool.h>
@@ -3716,32 +3927,9 @@ _ACEOF
 for ac_arg in '' -std=gnu99 -std=c99 -c99 -AC99 -xc99=all -qlanglvl=extc99
 do
   CC="$ac_save_CC $ac_arg"
-  rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_prog_cc_c99=$ac_arg
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
 fi
-
 rm -f core conftest.err conftest.$ac_objext
   test "x$ac_cv_prog_cc_c99" != "xno" && break
 done
@@ -3752,17 +3940,19 @@ fi
 # AC_CACHE_VAL
 case "x$ac_cv_prog_cc_c99" in
   x)
-    { $as_echo "$as_me:$LINENO: result: none needed" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
 $as_echo "none needed" >&6; } ;;
   xno)
-    { $as_echo "$as_me:$LINENO: result: unsupported" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
 $as_echo "unsupported" >&6; } ;;
   *)
     CC="$CC $ac_cv_prog_cc_c99"
-    { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c99" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5
 $as_echo "$ac_cv_prog_cc_c99" >&6; } ;;
 esac
+if test "x$ac_cv_prog_cc_c99" != xno; then :
 
+fi
 
 
 
@@ -3771,14 +3961,14 @@ ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
 $as_echo_n "checking how to run the C preprocessor... " >&6; }
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
 fi
 if test -z "$CPP"; then
-  if test "${ac_cv_prog_CPP+set}" = set; then
+  if ${ac_cv_prog_CPP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
       # Double quotes because CPP needs to be expanded
@@ -3793,11 +3983,7 @@ do
   # <limits.h> exists even on freestanding compilers.
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #ifdef __STDC__
 # include <limits.h>
@@ -3806,78 +3992,34 @@ cat >>conftest.$ac_ext <<_ACEOF
 #endif
 		     Syntax error
 _ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  :
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_c_try_cpp "$LINENO"; then :
 
+else
   # Broken: fails on valid input.
 continue
 fi
-
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 
   # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
+if ac_fn_c_try_cpp "$LINENO"; then :
   # Broken: success on invalid input.
 continue
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
   # Passes both tests.
 ac_preproc_ok=:
 break
 fi
-
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
+rm -f conftest.i conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then :
   break
 fi
 
@@ -3889,7 +4031,7 @@ fi
 else
   ac_cv_prog_CPP=$CPP
 fi
-{ $as_echo "$as_me:$LINENO: result: $CPP" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
 $as_echo "$CPP" >&6; }
 ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
@@ -3900,11 +4042,7 @@ do
   # <limits.h> exists even on freestanding compilers.
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #ifdef __STDC__
 # include <limits.h>
@@ -3913,87 +4051,40 @@ cat >>conftest.$ac_ext <<_ACEOF
 #endif
 		     Syntax error
 _ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  :
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_c_try_cpp "$LINENO"; then :
 
+else
   # Broken: fails on valid input.
 continue
 fi
-
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 
   # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
+if ac_fn_c_try_cpp "$LINENO"; then :
   # Broken: success on invalid input.
 continue
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
   # Passes both tests.
 ac_preproc_ok=:
 break
 fi
-
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
-  :
+rm -f conftest.i conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then :
+
 else
-  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
+as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details" "$LINENO" 5; }
 fi
 
 ac_ext=c
@@ -4003,9 +4094,9 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
 $as_echo_n "checking for grep that handles long lines and -e... " >&6; }
-if test "${ac_cv_path_GREP+set}" = set; then
+if ${ac_cv_path_GREP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -z "$GREP"; then
@@ -4016,7 +4107,7 @@ for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_prog in grep ggrep; do
+    for ac_prog in grep ggrep; do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
       { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
@@ -4036,7 +4127,7 @@ case `"$ac_path_GREP" --version 2>&1` in
     $as_echo 'GREP' >> "conftest.nl"
     "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    ac_count=`expr $ac_count + 1`
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
     if test $ac_count -gt ${ac_path_GREP_max-0}; then
       # Best one so far, save it but keep looking for a better one
       ac_cv_path_GREP="$ac_path_GREP"
@@ -4051,26 +4142,24 @@ esac
       $ac_path_GREP_found && break 3
     done
   done
-done
+  done
 IFS=$as_save_IFS
   if test -z "$ac_cv_path_GREP"; then
-    { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
   fi
 else
   ac_cv_path_GREP=$GREP
 fi
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
 $as_echo "$ac_cv_path_GREP" >&6; }
  GREP="$ac_cv_path_GREP"
 
 
-{ $as_echo "$as_me:$LINENO: checking for egrep" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
 $as_echo_n "checking for egrep... " >&6; }
-if test "${ac_cv_path_EGREP+set}" = set; then
+if ${ac_cv_path_EGREP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
@@ -4084,7 +4173,7 @@ for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_prog in egrep; do
+    for ac_prog in egrep; do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
       { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
@@ -4104,7 +4193,7 @@ case `"$ac_path_EGREP" --version 2>&1` in
     $as_echo 'EGREP' >> "conftest.nl"
     "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    ac_count=`expr $ac_count + 1`
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
     if test $ac_count -gt ${ac_path_EGREP_max-0}; then
       # Best one so far, save it but keep looking for a better one
       ac_cv_path_EGREP="$ac_path_EGREP"
@@ -4119,12 +4208,10 @@ esac
       $ac_path_EGREP_found && break 3
     done
   done
-done
+  done
 IFS=$as_save_IFS
   if test -z "$ac_cv_path_EGREP"; then
-    { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
   fi
 else
   ac_cv_path_EGREP=$EGREP
@@ -4132,21 +4219,17 @@ fi
 
    fi
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
 $as_echo "$ac_cv_path_EGREP" >&6; }
  EGREP="$ac_cv_path_EGREP"
 
 
-{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
 $as_echo_n "checking for ANSI C header files... " >&6; }
-if test "${ac_cv_header_stdc+set}" = set; then
+if ${ac_cv_header_stdc+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdlib.h>
 #include <stdarg.h>
@@ -4161,48 +4244,23 @@ main ()
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_header_stdc=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_header_stdc=no
+  ac_cv_header_stdc=no
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <string.h>
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "memchr" >/dev/null 2>&1; then
-  :
+  $EGREP "memchr" >/dev/null 2>&1; then :
+
 else
   ac_cv_header_stdc=no
 fi
@@ -4212,18 +4270,14 @@ fi
 
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdlib.h>
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "free" >/dev/null 2>&1; then
-  :
+  $EGREP "free" >/dev/null 2>&1; then :
+
 else
   ac_cv_header_stdc=no
 fi
@@ -4233,14 +4287,10 @@ fi
 
 if test $ac_cv_header_stdc = yes; then
   # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-  if test "$cross_compiling" = yes; then
+  if test "$cross_compiling" = yes; then :
   :
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <ctype.h>
 #include <stdlib.h>
@@ -4267,118 +4317,33 @@ main ()
   return 0;
 }
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  :
-else
-  $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_c_try_run "$LINENO"; then :
 
-( exit $ac_status )
-ac_cv_header_stdc=no
+else
+  ac_cv_header_stdc=no
 fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
-
 fi
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
 $as_echo "$ac_cv_header_stdc" >&6; }
 if test $ac_cv_header_stdc = yes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define STDC_HEADERS 1
-_ACEOF
+$as_echo "#define STDC_HEADERS 1" >>confdefs.h
 
 fi
 
 # On IRIX 5.3, sys/types and inttypes.h are conflicting.
-
-
-
-
-
-
-
-
-
 for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
 		  inttypes.h stdint.h unistd.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  eval "$as_ac_Header=yes"
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_Header=no"
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
+"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -4394,9 +4359,9 @@ if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
 	if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
 set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+if ${ac_cv_path_PKG_CONFIG+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $PKG_CONFIG in
@@ -4409,14 +4374,14 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
   ;;
@@ -4424,10 +4389,10 @@ esac
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
 if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
 $as_echo "$PKG_CONFIG" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -4437,9 +4402,9 @@ if test -z "$ac_cv_path_PKG_CONFIG"; then
   ac_pt_PKG_CONFIG=$PKG_CONFIG
   # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
+if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $ac_pt_PKG_CONFIG in
@@ -4452,14 +4417,14 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
   ;;
@@ -4467,10 +4432,10 @@ esac
 fi
 ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
 if test -n "$ac_pt_PKG_CONFIG"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
 $as_echo "$ac_pt_PKG_CONFIG" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -4479,7 +4444,7 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
@@ -4492,13 +4457,13 @@ fi
 fi
 if test -n "$PKG_CONFIG"; then
 	_pkg_min_version=0.9.0
-	{ $as_echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
 $as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
 	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-		{ $as_echo "$as_me:$LINENO: result: yes" >&5
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 	else
-		{ $as_echo "$as_me:$LINENO: result: no" >&5
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 		PKG_CONFIG=""
 	fi
@@ -4506,35 +4471,27 @@ $as_echo "no" >&6; }
 fi
 # Make sure we can run config.sub.
 $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-  { { $as_echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
-$as_echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
 
-{ $as_echo "$as_me:$LINENO: checking build system type" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
 $as_echo_n "checking build system type... " >&6; }
-if test "${ac_cv_build+set}" = set; then
+if ${ac_cv_build+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_build_alias=$build_alias
 test "x$ac_build_alias" = x &&
   ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
 test "x$ac_build_alias" = x &&
-  { { $as_echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
-$as_echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
 ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
-  { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
-$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_build" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
 $as_echo "$ac_cv_build" >&6; }
 case $ac_cv_build in
 *-*-*) ;;
-*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
-$as_echo "$as_me: error: invalid value of canonical build" >&2;}
-   { (exit 1); exit 1; }; };;
+*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
 esac
 build=$ac_cv_build
 ac_save_IFS=$IFS; IFS='-'
@@ -4550,28 +4507,24 @@ IFS=$ac_save_IFS
 case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
 
 
-{ $as_echo "$as_me:$LINENO: checking host system type" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
 $as_echo_n "checking host system type... " >&6; }
-if test "${ac_cv_host+set}" = set; then
+if ${ac_cv_host+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test "x$host_alias" = x; then
   ac_cv_host=$ac_cv_build
 else
   ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
-    { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
-$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
 fi
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_host" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
 $as_echo "$ac_cv_host" >&6; }
 case $ac_cv_host in
 *-*-*) ;;
-*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
-$as_echo "$as_me: error: invalid value of canonical host" >&2;}
-   { (exit 1); exit 1; }; };;
+*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
 esac
 host=$ac_cv_host
 ac_save_IFS=$IFS; IFS='-'
@@ -4587,9 +4540,9 @@ IFS=$ac_save_IFS
 case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
 
 
-{ $as_echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
 $as_echo_n "checking for a sed that does not truncate output... " >&6; }
-if test "${ac_cv_path_SED+set}" = set; then
+if ${ac_cv_path_SED+:} false; then :
   $as_echo_n "(cached) " >&6
 else
             ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
@@ -4597,7 +4550,7 @@ else
        ac_script="$ac_script$as_nl$ac_script"
      done
      echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
-     $as_unset ac_script || ac_script=
+     { ac_script=; unset ac_script;}
      if test -z "$SED"; then
   ac_path_SED_found=false
   # Loop through the user's path and test for each of PROGNAME-LIST
@@ -4606,7 +4559,7 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_prog in sed gsed; do
+    for ac_prog in sed gsed; do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
       { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
@@ -4626,7 +4579,7 @@ case `"$ac_path_SED" --version 2>&1` in
     $as_echo '' >> "conftest.nl"
     "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    ac_count=`expr $ac_count + 1`
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
     if test $ac_count -gt ${ac_path_SED_max-0}; then
       # Best one so far, save it but keep looking for a better one
       ac_cv_path_SED="$ac_path_SED"
@@ -4641,19 +4594,17 @@ esac
       $ac_path_SED_found && break 3
     done
   done
-done
+  done
 IFS=$as_save_IFS
   if test -z "$ac_cv_path_SED"; then
-    { { $as_echo "$as_me:$LINENO: error: no acceptable sed could be found in \$PATH" >&5
-$as_echo "$as_me: error: no acceptable sed could be found in \$PATH" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5
   fi
 else
   ac_cv_path_SED=$SED
 fi
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_SED" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
 $as_echo "$ac_cv_path_SED" >&6; }
  SED="$ac_cv_path_SED"
   rm -f conftest.sed
@@ -4672,60 +4623,8 @@ if  test "x$GCC" = xyes ; then
 	;;
     esac
 else
-    { $as_echo "$as_me:$LINENO: checking whether __SUNPRO_C is declared" >&5
-$as_echo_n "checking whether __SUNPRO_C is declared... " >&6; }
-if test "${ac_cv_have_decl___SUNPRO_C+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-#ifndef __SUNPRO_C
-  (void) __SUNPRO_C;
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_have_decl___SUNPRO_C=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_have_decl___SUNPRO_C=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl___SUNPRO_C" >&5
-$as_echo "$ac_cv_have_decl___SUNPRO_C" >&6; }
-if test "x$ac_cv_have_decl___SUNPRO_C" = x""yes; then
+    ac_fn_c_check_decl "$LINENO" "__SUNPRO_C" "ac_cv_have_decl___SUNPRO_C" "$ac_includes_default"
+if test "x$ac_cv_have_decl___SUNPRO_C" = xyes; then :
   SUNCC="yes"
 else
   SUNCC="no"
@@ -4743,126 +4642,22 @@ fi
 
 
 # Check whether --enable-strict-compilation was given.
-if test "${enable_strict_compilation+set}" = set; then
+if test "${enable_strict_compilation+set}" = set; then :
   enableval=$enable_strict_compilation; STRICT_COMPILE=$enableval
 else
   STRICT_COMPILE=no
 fi
 
 if test "x$STRICT_COMPILE" = "xyes"; then
-	{ $as_echo "$as_me:$LINENO: checking whether __SUNPRO_C is declared" >&5
-$as_echo_n "checking whether __SUNPRO_C is declared... " >&6; }
-if test "${ac_cv_have_decl___SUNPRO_C+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-#ifndef __SUNPRO_C
-  (void) __SUNPRO_C;
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_have_decl___SUNPRO_C=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_have_decl___SUNPRO_C=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl___SUNPRO_C" >&5
-$as_echo "$ac_cv_have_decl___SUNPRO_C" >&6; }
-if test "x$ac_cv_have_decl___SUNPRO_C" = x""yes; then
+	ac_fn_c_check_decl "$LINENO" "__SUNPRO_C" "ac_cv_have_decl___SUNPRO_C" "$ac_includes_default"
+if test "x$ac_cv_have_decl___SUNPRO_C" = xyes; then :
   SUNCC="yes"
 else
   SUNCC="no"
 fi
 
-	{ $as_echo "$as_me:$LINENO: checking whether __INTEL_COMPILER is declared" >&5
-$as_echo_n "checking whether __INTEL_COMPILER is declared... " >&6; }
-if test "${ac_cv_have_decl___INTEL_COMPILER+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-#ifndef __INTEL_COMPILER
-  (void) __INTEL_COMPILER;
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_have_decl___INTEL_COMPILER=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_have_decl___INTEL_COMPILER=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl___INTEL_COMPILER" >&5
-$as_echo "$ac_cv_have_decl___INTEL_COMPILER" >&6; }
-if test "x$ac_cv_have_decl___INTEL_COMPILER" = x""yes; then
+	ac_fn_c_check_decl "$LINENO" "__INTEL_COMPILER" "ac_cv_have_decl___INTEL_COMPILER" "$ac_includes_default"
+if test "x$ac_cv_have_decl___INTEL_COMPILER" = xyes; then :
   INTELCC="yes"
 else
   INTELCC="no"
@@ -5000,6 +4795,7 @@ MAN_SUBSTS="\
 	-e 's|__xservername__|Xorg|g' \
 	-e 's|__xconfigfile__|xorg.conf|g' \
 	-e 's|__projectroot__|\$(prefix)|g' \
+	-e 's|__apploaddir__|\$(appdefaultdir)|g' \
 	-e 's|__appmansuffix__|\$(APP_MAN_SUFFIX)|g' \
 	-e 's|__drivermansuffix__|\$(DRIVER_MAN_SUFFIX)|g' \
 	-e 's|__adminmansuffix__|\$(ADMIN_MAN_SUFFIX)|g' \
@@ -5010,7 +4806,7 @@ MAN_SUBSTS="\
 
 
 # Check whether --enable-silent-rules was given.
-if test "${enable_silent_rules+set}" = set; then
+if test "${enable_silent_rules+set}" = set; then :
   enableval=$enable_silent_rules;
 fi
 
@@ -5023,85 +4819,200 @@ AM_BACKSLASH='\'
 
 
 
-ac_config_headers="$ac_config_headers do-not-use-config.h"
 
-ac_config_headers="$ac_config_headers Xfuncproto.h"
+# Check whether --enable-specs was given.
+if test "${enable_specs+set}" = set; then :
+  enableval=$enable_specs; build_specs=$enableval
+else
+  build_specs=yes
+fi
 
 
-{ $as_echo "$as_me:$LINENO: checking host system type" >&5
-$as_echo_n "checking host system type... " >&6; }
-if test "${ac_cv_host+set}" = set; then
-  $as_echo_n "(cached) " >&6
+ if test x$build_specs = xyes; then
+  ENABLE_SPECS_TRUE=
+  ENABLE_SPECS_FALSE='#'
 else
-  if test "x$host_alias" = x; then
-  ac_cv_host=$ac_cv_build
-else
-  ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
-    { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
-$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
-   { (exit 1); exit 1; }; }
+  ENABLE_SPECS_TRUE='#'
+  ENABLE_SPECS_FALSE=
 fi
 
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_host" >&5
-$as_echo "$ac_cv_host" >&6; }
-case $ac_cv_host in
-*-*-*) ;;
-*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
-$as_echo "$as_me: error: invalid value of canonical host" >&2;}
-   { (exit 1); exit 1; }; };;
-esac
-host=$ac_cv_host
-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_host
-shift
-host_cpu=$1
-host_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-host_os=$*
-IFS=$ac_save_IFS
-case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build functional specifications" >&5
+$as_echo_n "checking whether to build functional specifications... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $build_specs" >&5
+$as_echo "$build_specs" >&6; }
 
 
 
 
 
-# Check for enable/disable options
-# Check whether --enable-function-prototypes was given.
-if test "${enable_function_prototypes+set}" = set; then
-  enableval=$enable_function_prototypes; FUNCPROTO=$enableval
+# Check whether --with-xmlto was given.
+if test "${with_xmlto+set}" = set; then :
+  withval=$with_xmlto; use_xmlto=$withval
 else
-  FUNCPROTO=auto
+  use_xmlto=auto
 fi
 
-# Check whether --enable-varargs-prototypes was given.
-if test "${enable_varargs_prototypes+set}" = set; then
-  enableval=$enable_varargs_prototypes; VAPROTO=$enableval
+
+
+if test "x$use_xmlto" = x"auto"; then
+   # Extract the first word of "xmlto", so it can be a program name with args.
+set dummy xmlto; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_XMLTO+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
-  VAPROTO=auto
+  case $XMLTO in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_XMLTO="$XMLTO" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_XMLTO="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+XMLTO=$ac_cv_path_XMLTO
+if test -n "$XMLTO"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XMLTO" >&5
+$as_echo "$XMLTO" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
-# Check whether --enable-const-prototypes was given.
-if test "${enable_const_prototypes+set}" = set; then
-  enableval=$enable_const_prototypes; CONSTPROTO=$enableval
+
+   if test "x$XMLTO" = "x"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: xmlto not found - documentation targets will be skipped" >&5
+$as_echo "$as_me: WARNING: xmlto not found - documentation targets will be skipped" >&2;}
+	have_xmlto=no
+   else
+        have_xmlto=yes
+   fi
+elif test "x$use_xmlto" = x"yes" ; then
+   # Extract the first word of "xmlto", so it can be a program name with args.
+set dummy xmlto; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_XMLTO+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
-  CONSTPROTO=auto
+  case $XMLTO in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_XMLTO="$XMLTO" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_XMLTO="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+XMLTO=$ac_cv_path_XMLTO
+if test -n "$XMLTO"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XMLTO" >&5
+$as_echo "$XMLTO" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
-# Check whether --enable-nested-prototypes was given.
-if test "${enable_nested_prototypes+set}" = set; then
-  enableval=$enable_nested_prototypes; NESTEDPROTO=$enableval
+
+   if test "x$XMLTO" = "x"; then
+        as_fn_error $? "--with-xmlto=yes specified but xmlto not found in PATH" "$LINENO" 5
+   fi
+   have_xmlto=yes
+elif test "x$use_xmlto" = x"no" ; then
+   if test "x$XMLTO" != "x"; then
+      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ignoring XMLTO environment variable since --with-xmlto=no was specified" >&5
+$as_echo "$as_me: WARNING: ignoring XMLTO environment variable since --with-xmlto=no was specified" >&2;}
+   fi
+   have_xmlto=no
+else
+   as_fn_error $? "--with-xmlto expects 'yes' or 'no'" "$LINENO" 5
+fi
+
+# Test for a minimum version of xmlto, if provided.
+if test "$have_xmlto" = yes; then
+    # scrape the xmlto version
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking the xmlto version" >&5
+$as_echo_n "checking the xmlto version... " >&6; }
+    xmlto_version=`$XMLTO --version 2>/dev/null | cut -d' ' -f3`
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $xmlto_version" >&5
+$as_echo "$xmlto_version" >&6; }
+    as_arg_v1=$xmlto_version
+as_arg_v2=0.0.20
+awk "$as_awk_strverscmp" v1="$as_arg_v1" v2="$as_arg_v2" /dev/null
+case $? in #(
+  1) :
+    if test "x$use_xmlto" = xauto; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: xmlto version $xmlto_version found, but 0.0.20 needed" >&5
+$as_echo "$as_me: WARNING: xmlto version $xmlto_version found, but 0.0.20 needed" >&2;}
+            have_xmlto=no
+        else
+            as_fn_error $? "xmlto version $xmlto_version found, but 0.0.20 needed" "$LINENO" 5
+        fi ;; #(
+  0) :
+     ;; #(
+  2) :
+     ;; #(
+  *) :
+     ;;
+esac
+fi
+
+# Test for the ability of xmlto to generate a text target
+have_xmlto_text=no
+cat > conftest.xml << "EOF"
+EOF
+if test "$have_xmlto" = yes; then :
+  if $XMLTO --skip-validation txt conftest.xml >/dev/null 2>&1; then :
+  have_xmlto_text=yes
 else
-  NESTEDPROTO=auto
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: xmlto cannot generate text format, this format skipped" >&5
+$as_echo "$as_me: WARNING: xmlto cannot generate text format, this format skipped" >&2;}
+fi
+fi
+rm -f conftest.xml
+ if test $have_xmlto_text = yes; then
+  HAVE_XMLTO_TEXT_TRUE=
+  HAVE_XMLTO_TEXT_FALSE='#'
+else
+  HAVE_XMLTO_TEXT_TRUE='#'
+  HAVE_XMLTO_TEXT_FALSE=
 fi
 
-# Check whether --enable-wide-prototypes was given.
-if test "${enable_wide_prototypes+set}" = set; then
-  enableval=$enable_wide_prototypes; WIDEPROTO=$enableval
+ if test "$have_xmlto" = yes; then
+  HAVE_XMLTO_TRUE=
+  HAVE_XMLTO_FALSE='#'
 else
-  WIDEPROTO=auto
+  HAVE_XMLTO_TRUE='#'
+  HAVE_XMLTO_FALSE=
 fi
 
 
@@ -5109,311 +5020,237 @@ fi
 
 
 
+# Check whether --with-fop was given.
+if test "${with_fop+set}" = set; then :
+  withval=$with_fop; use_fop=$withval
+else
+  use_fop=auto
+fi
+
 
-for ac_header in sys/select.h sys/param.h sys/types.h sys/time.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+
+if test "x$use_fop" = x"auto"; then
+   # Extract the first word of "fop", so it can be a program name with args.
+set dummy fop; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_FOP+:} false; then :
   $as_echo_n "(cached) " >&6
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
 else
-  # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
-$as_echo_n "checking $ac_header usability... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
+  case $FOP in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_FOP="$FOP" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_FOP="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_header_compiler=yes
+fi
+FOP=$ac_cv_path_FOP
+if test -n "$FOP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FOP" >&5
+$as_echo "$FOP" >&6; }
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_header_compiler=no
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
 
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
-$as_echo_n "checking $ac_header presence... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  ac_header_preproc=yes
+   if test "x$FOP" = "x"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: fop not found - documentation targets will be skipped" >&5
+$as_echo "$as_me: WARNING: fop not found - documentation targets will be skipped" >&2;}
+	have_fop=no
+   else
+        have_fop=yes
+   fi
+elif test "x$use_fop" = x"yes" ; then
+   # Extract the first word of "fop", so it can be a program name with args.
+set dummy fop; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_FOP+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+  case $FOP in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_FOP="$FOP" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_FOP="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
 
-  ac_header_preproc=no
+  ;;
+esac
+fi
+FOP=$ac_cv_path_FOP
+if test -n "$FOP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FOP" >&5
+$as_echo "$FOP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
 
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-    ( cat <<\_ASBOX
-## ---------------------------------------------------------------------- ##
-## Report this to https://bugs.freedesktop.org/enter_bug.cgi?product=xorg ##
-## ---------------------------------------------------------------------- ##
-_ASBOX
-     ) | sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
+   if test "x$FOP" = "x"; then
+        as_fn_error $? "--with-fop=yes specified but fop not found in PATH" "$LINENO" 5
+   fi
+   have_fop=yes
+elif test "x$use_fop" = x"no" ; then
+   if test "x$FOP" != "x"; then
+      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ignoring FOP environment variable since --with-fop=no was specified" >&5
+$as_echo "$as_me: WARNING: ignoring FOP environment variable since --with-fop=no was specified" >&2;}
+   fi
+   have_fop=no
 else
-  eval "$as_ac_Header=\$ac_header_preproc"
+   as_fn_error $? "--with-fop expects 'yes' or 'no'" "$LINENO" 5
 fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
+ if test "$have_fop" = yes; then
+  HAVE_FOP_TRUE=
+  HAVE_FOP_FALSE='#'
+else
+  HAVE_FOP_TRUE='#'
+  HAVE_FOP_FALSE=
+fi
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for X.Org SGML entities >= 1.5" >&5
+$as_echo_n "checking for X.Org SGML entities >= 1.5... " >&6; }
+XORG_SGML_PATH=
+if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xorg-sgml-doctools >= 1.5\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "xorg-sgml-doctools >= 1.5") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  XORG_SGML_PATH=`$PKG_CONFIG --variable=sgmlrootdir xorg-sgml-doctools`
+else
+  :
 
 fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
 
+# Define variables STYLESHEET_SRCDIR and XSL_STYLESHEET containing
+# the path and the name of the doc stylesheet
+if test "x$XORG_SGML_PATH" != "x" ; then
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XORG_SGML_PATH" >&5
+$as_echo "$XORG_SGML_PATH" >&6; }
+   STYLESHEET_SRCDIR=$XORG_SGML_PATH/X11
+   XSL_STYLESHEET=$STYLESHEET_SRCDIR/xorg.xsl
+else
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
-done
 
 
-# Handle Xpoll.h.in
-# Avoid determining fds_bits on WIN32 hosts (not including cygwin)
-case $host_os in
-	mingw*)		fds_bits_found=true;;
-	*)		fds_bits_found=false;;
-esac
 
-if test "x$fds_bits_found" = xfalse ; then
-   { $as_echo "$as_me:$LINENO: checking for fd_set.fds_bits" >&5
-$as_echo_n "checking for fd_set.fds_bits... " >&6; }
-if test "${ac_cv_member_fd_set_fds_bits+set}" = set; then
-  $as_echo_n "(cached) " >&6
+ if test "x$XSL_STYLESHEET" != "x"; then
+  HAVE_STYLESHEETS_TRUE=
+  HAVE_STYLESHEETS_FALSE='#'
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  HAVE_STYLESHEETS_TRUE='#'
+  HAVE_STYLESHEETS_FALSE=
+fi
 
-                               #ifdef HAVE_SYS_PARAM_H
-                               #include <sys/param.h>
-                               #endif
-                               #ifdef HAVE_SYS_TYPES_H
-                               #include <sys/types.h>
-                               #endif
-                               #ifdef HAVE_SYS_TIME_H
-                               #include <sys/time.h>
-                               #endif
-                               #ifdef HAVE_SYS_SELECT_H
-			       #include <sys/select.h>
-                               #endif
 
 
-int
-main ()
-{
-static fd_set ac_aggr;
-if (ac_aggr.fds_bits)
-return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_member_fd_set_fds_bits=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+ac_config_headers="$ac_config_headers do-not-use-config.h"
 
-	cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+ac_config_headers="$ac_config_headers Xfuncproto.h"
 
-                               #ifdef HAVE_SYS_PARAM_H
-                               #include <sys/param.h>
-                               #endif
-                               #ifdef HAVE_SYS_TYPES_H
-                               #include <sys/types.h>
-                               #endif
-                               #ifdef HAVE_SYS_TIME_H
-                               #include <sys/time.h>
-                               #endif
-                               #ifdef HAVE_SYS_SELECT_H
-			       #include <sys/select.h>
-                               #endif
 
 
-int
-main ()
-{
-static fd_set ac_aggr;
-if (sizeof ac_aggr.fds_bits)
-return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_member_fd_set_fds_bits=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_cv_member_fd_set_fds_bits=no
-fi
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+# Check for enable/disable options
+# Check whether --enable-function-prototypes was given.
+if test "${enable_function_prototypes+set}" = set; then :
+  enableval=$enable_function_prototypes; FUNCPROTO=$enableval
+else
+  FUNCPROTO=auto
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_fd_set_fds_bits" >&5
-$as_echo "$ac_cv_member_fd_set_fds_bits" >&6; }
-if test "x$ac_cv_member_fd_set_fds_bits" = x""yes; then
 
-			       fds_bits_found=plain
-			       USE_FDS_BITS="fds_bits"
+# Check whether --enable-varargs-prototypes was given.
+if test "${enable_varargs_prototypes+set}" = set; then :
+  enableval=$enable_varargs_prototypes; VAPROTO=$enableval
+else
+  VAPROTO=auto
+fi
 
+# Check whether --enable-const-prototypes was given.
+if test "${enable_const_prototypes+set}" = set; then :
+  enableval=$enable_const_prototypes; CONSTPROTO=$enableval
+else
+  CONSTPROTO=auto
 fi
 
+# Check whether --enable-nested-prototypes was given.
+if test "${enable_nested_prototypes+set}" = set; then :
+  enableval=$enable_nested_prototypes; NESTEDPROTO=$enableval
+else
+  NESTEDPROTO=auto
 fi
 
-if test "x$fds_bits_found" = xfalse ; then
-   { $as_echo "$as_me:$LINENO: checking for fd_set.__fds_bits" >&5
-$as_echo_n "checking for fd_set.__fds_bits... " >&6; }
-if test "${ac_cv_member_fd_set___fds_bits+set}" = set; then
-  $as_echo_n "(cached) " >&6
+# Check whether --enable-wide-prototypes was given.
+if test "${enable_wide_prototypes+set}" = set; then :
+  enableval=$enable_wide_prototypes; WIDEPROTO=$enableval
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
+  WIDEPROTO=auto
+fi
+
+
+
+for ac_header in sys/select.h sys/param.h sys/types.h sys/time.h
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
 
+fi
+
+done
+
+
+# Handle Xpoll.h.in
+# Avoid determining fds_bits on WIN32 hosts (not including cygwin)
+case $host_os in
+	mingw*)		fds_bits_found=true;;
+	*)		fds_bits_found=false;;
+esac
+
+if test "x$fds_bits_found" = xfalse ; then
+   ac_fn_c_check_member "$LINENO" "fd_set" "fds_bits" "ac_cv_member_fd_set_fds_bits" "
                                #ifdef HAVE_SYS_PARAM_H
                                #include <sys/param.h>
                                #endif
@@ -5427,47 +5264,18 @@ cat >>conftest.$ac_ext <<_ACEOF
 			       #include <sys/select.h>
                                #endif
 
+"
+if test "x$ac_cv_member_fd_set_fds_bits" = xyes; then :
 
-int
-main ()
-{
-static fd_set ac_aggr;
-if (ac_aggr.__fds_bits)
-return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_member_fd_set___fds_bits=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+			       fds_bits_found=plain
+			       USE_FDS_BITS="fds_bits"
 
-	cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+fi
+
+fi
 
+if test "x$fds_bits_found" = xfalse ; then
+   ac_fn_c_check_member "$LINENO" "fd_set" "__fds_bits" "ac_cv_member_fd_set___fds_bits" "
                                #ifdef HAVE_SYS_PARAM_H
                                #include <sys/param.h>
                                #endif
@@ -5481,51 +5289,8 @@ cat >>conftest.$ac_ext <<_ACEOF
 			       #include <sys/select.h>
                                #endif
 
-
-int
-main ()
-{
-static fd_set ac_aggr;
-if (sizeof ac_aggr.__fds_bits)
-return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_member_fd_set___fds_bits=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_member_fd_set___fds_bits=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_fd_set___fds_bits" >&5
-$as_echo "$ac_cv_member_fd_set___fds_bits" >&6; }
-if test "x$ac_cv_member_fd_set___fds_bits" = x""yes; then
+"
+if test "x$ac_cv_member_fd_set___fds_bits" = xyes; then :
 
 			    fds_bits_found=underscores
 			    USE_FDS_BITS="__fds_bits"
@@ -5535,18 +5300,15 @@ fi
 fi
 
 if test "x$fds_bits_found" = xfalse ; then
-    { { $as_echo "$as_me:$LINENO: error: Could not determine how to access the fds_bits or equivalent
-                  structure in fd_set on your platform." >&5
-$as_echo "$as_me: error: Could not determine how to access the fds_bits or equivalent
-                  structure in fd_set on your platform." >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error $? "Could not determine how to access the fds_bits or equivalent
+                  structure in fd_set on your platform." "$LINENO" 5
 fi
 
 
 
 
 # Handle Xfuncproto.h
-{ $as_echo "$as_me:$LINENO: checking whether const prototypes are supported" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether const prototypes are supported" >&5
 $as_echo_n "checking whether const prototypes are supported... " >&6; }
 if test "x$CONSTPROTO" = xauto; then
 	case $host_os in
@@ -5558,10 +5320,10 @@ if test "x$CONSTPROTO" = xauto; then
 		*)		CONSTPROTO=no ;;
 	esac
 fi
-{ $as_echo "$as_me:$LINENO: result: $CONSTPROTO" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CONSTPROTO" >&5
 $as_echo "$CONSTPROTO" >&6; }
 
-{ $as_echo "$as_me:$LINENO: checking whether varargs prototypes are supported" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether varargs prototypes are supported" >&5
 $as_echo_n "checking whether varargs prototypes are supported... " >&6; }
 if test "x$VAPROTO" = xauto; then
 	case $host_os in
@@ -5573,10 +5335,10 @@ if test "x$VAPROTO" = xauto; then
 		*)		VAPROTO=no ;;
 	esac
 fi
-{ $as_echo "$as_me:$LINENO: result: $VAPROTO" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $VAPROTO" >&5
 $as_echo "$VAPROTO" >&6; }
 
-{ $as_echo "$as_me:$LINENO: checking whether nested prototypes are supported" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether nested prototypes are supported" >&5
 $as_echo_n "checking whether nested prototypes are supported... " >&6; }
 if test "x$NESTEDPROTO" = xauto; then
 	case $host_os in
@@ -5588,10 +5350,10 @@ if test "x$NESTEDPROTO" = xauto; then
 		*)		NESTEDPROTO=no ;;
 	esac
 fi
-{ $as_echo "$as_me:$LINENO: result: $NESTEDPROTO" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $NESTEDPROTO" >&5
 $as_echo "$NESTEDPROTO" >&6; }
 
-{ $as_echo "$as_me:$LINENO: checking whether to force function prototypes" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to force function prototypes" >&5
 $as_echo_n "checking whether to force function prototypes... " >&6; }
 if test "x$FUNCPROTO" = xauto; then
 	case $host_os in
@@ -5608,57 +5370,43 @@ if test "x$FUNCPROTO" = xauto; then
 		;;
 	esac
 fi
-{ $as_echo "$as_me:$LINENO: result: $FUNCPROTO" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $FUNCPROTO" >&5
 $as_echo "$FUNCPROTO" >&6; }
 
 # Logic for this was taken from Imake.tmpl
 if test "x$FUNCPROTO" = xyes && test "x$VAPROTO" = xyes && test "x$NESTEDPROTO" = xyes && test "x$CONSTPROTO" = xyes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define FUNCPROTO 15
-_ACEOF
+$as_echo "#define FUNCPROTO 15" >>confdefs.h
 
 else
   if test "x$FUNCPROTO" = xyes && test "x$VAPROTO" = xyes && test "x$NESTEDPROTO" = xyes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define FUNCPROTO 11
-_ACEOF
+$as_echo "#define FUNCPROTO 11" >>confdefs.h
 
   else
     if test "x$FUNCPROTO" = xyes && test "x$NESTEDPROTO" = xyes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define FUNCPROTO 9
-_ACEOF
+$as_echo "#define FUNCPROTO 9" >>confdefs.h
 
     else
       if test "x$FUNCPROTO" = xyes && test "x$VAPROTO" = xyes && test "x$CONSTPROTO" = xyes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define FUNCPROTO 7
-_ACEOF
+$as_echo "#define FUNCPROTO 7" >>confdefs.h
 
       else
         if test "x$FUNCPROTO" = xyes && test "x$CONSTPROTO" = xyes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define FUNCPROTO 5
-_ACEOF
+$as_echo "#define FUNCPROTO 5" >>confdefs.h
 
         else
           if test "x$FUNCPROTO" = xyes && test "x$VAPROTO" = xyes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define FUNCPROTO 3
-_ACEOF
+$as_echo "#define FUNCPROTO 3" >>confdefs.h
 
           else
             if test "x$FUNCPROTO" = xyes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define FUNCPROTO /**/
-_ACEOF
+$as_echo "#define FUNCPROTO /**/" >>confdefs.h
 
             fi
           fi
@@ -5668,7 +5416,7 @@ _ACEOF
   fi
 fi
 
-{ $as_echo "$as_me:$LINENO: checking whether to widen function prototypes" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to widen function prototypes" >&5
 $as_echo_n "checking whether to widen function prototypes... " >&6; }
 if test "x$WIDEPROTO" = xauto; then
 	case $host_os in
@@ -5679,19 +5427,17 @@ if test "x$WIDEPROTO" = xauto; then
 		*)		WIDEPROTO=yes ;;
 	esac
 fi
-{ $as_echo "$as_me:$LINENO: result: $WIDEPROTO" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $WIDEPROTO" >&5
 $as_echo "$WIDEPROTO" >&6; }
 
 if test "x$WIDEPROTO" = xno; then
 
-cat >>confdefs.h <<\_ACEOF
-#define NARROWPROTO /**/
-_ACEOF
+$as_echo "#define NARROWPROTO /**/" >>confdefs.h
 
 fi
 
 
-ac_config_files="$ac_config_files Makefile Xpoll.h xproto.pc"
+ac_config_files="$ac_config_files Makefile specs/Makefile Xpoll.h xproto.pc"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -5720,13 +5466,13 @@ _ACEOF
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
+      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
 $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
       BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-      *) $as_unset $ac_var ;;
+      *) { eval $ac_var=; unset $ac_var;} ;;
       esac ;;
     esac
   done
@@ -5734,8 +5480,8 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
   (set) 2>&1 |
     case $as_nl`(ac_space=' '; set) 2>&1` in #(
     *${as_nl}ac_space=\ *)
-      # `set' does not quote correctly, so add quotes (double-quote
-      # substitution turns \\\\ into \\, and sed turns \\ into \).
+      # `set' does not quote correctly, so add quotes: double-quote
+      # substitution turns \\\\ into \\, and sed turns \\ into \.
       sed -n \
 	"s/'/'\\\\''/g;
 	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
@@ -5757,12 +5503,23 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
      :end' >>confcache
 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
   if test -w "$cache_file"; then
-    test "x$cache_file" != "x/dev/null" &&
-      { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5
+    if test "x$cache_file" != "x/dev/null"; then
+      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
 $as_echo "$as_me: updating cache $cache_file" >&6;}
-    cat confcache >$cache_file
+      if test ! -f "$cache_file" || test -h "$cache_file"; then
+	cat confcache >"$cache_file"
+      else
+        case $cache_file in #(
+        */* | ?:*)
+	  mv -f confcache "$cache_file"$$ &&
+	  mv -f "$cache_file"$$ "$cache_file" ;; #(
+        *)
+	  mv -f confcache "$cache_file" ;;
+	esac
+      fi
+    fi
   else
-    { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
 $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
   fi
 fi
@@ -5776,14 +5533,15 @@ DEFS=-DHAVE_CONFIG_H
 
 ac_libobjs=
 ac_ltlibobjs=
+U=
 for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
   # 1. Remove the extension, and $U if already installed.
   ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
   ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
   # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
   #    will be set to the directory where LIBOBJS objects are built.
-  ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
-  ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
+  as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
+  as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo'
 done
 LIBOBJS=$ac_libobjs
 
@@ -5799,34 +5557,46 @@ else
 fi
 
 if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"AMDEP\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error $? "conditional \"AMDEP\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${ENABLE_SPECS_TRUE}" && test -z "${ENABLE_SPECS_FALSE}"; then
+  as_fn_error $? "conditional \"ENABLE_SPECS\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${HAVE_XMLTO_TEXT_TRUE}" && test -z "${HAVE_XMLTO_TEXT_FALSE}"; then
+  as_fn_error $? "conditional \"HAVE_XMLTO_TEXT\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${HAVE_XMLTO_TRUE}" && test -z "${HAVE_XMLTO_FALSE}"; then
+  as_fn_error $? "conditional \"HAVE_XMLTO\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${HAVE_FOP_TRUE}" && test -z "${HAVE_FOP_FALSE}"; then
+  as_fn_error $? "conditional \"HAVE_FOP\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${HAVE_STYLESHEETS_TRUE}" && test -z "${HAVE_STYLESHEETS_FALSE}"; then
+  as_fn_error $? "conditional \"HAVE_STYLESHEETS\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 
-: ${CONFIG_STATUS=./config.status}
+: "${CONFIG_STATUS=./config.status}"
 ac_write_fail=0
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
 $as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
-cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+as_write_fail=0
+cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
 #! $SHELL
 # Generated by $as_me.
 # Run this file to recreate the current configuration.
@@ -5836,17 +5606,18 @@ cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 debug=false
 ac_cs_recheck=false
 ac_cs_silent=false
-SHELL=\${CONFIG_SHELL-$SHELL}
-_ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
+SHELL=\${CONFIG_SHELL-$SHELL}
+export SHELL
+_ASEOF
+cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
+## -------------------- ##
+## M4sh Initialization. ##
+## -------------------- ##
 
 # Be more Bourne compatible
 DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
   emulate sh
   NULLCMD=:
   # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
@@ -5854,23 +5625,15 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
 else
-  case `(set -o) 2>/dev/null` in
-  *posix*) set -o posix ;;
+  case `(set -o) 2>/dev/null` in #(
+  *posix*) :
+    set -o posix ;; #(
+  *) :
+     ;;
 esac
-
 fi
 
 
-
-
-# PATH needs CR
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
 as_nl='
 '
 export as_nl
@@ -5878,7 +5641,13 @@ export as_nl
 as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
 as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
 as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+# Prefer a ksh shell builtin over an external printf program on Solaris,
+# but without wasting forks for bash or zsh.
+if test -z "$BASH_VERSION$ZSH_VERSION" \
+    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='print -r --'
+  as_echo_n='print -rn --'
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
   as_echo='printf %s\n'
   as_echo_n='printf %s'
 else
@@ -5889,7 +5658,7 @@ else
     as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
     as_echo_n_body='eval
       arg=$1;
-      case $arg in
+      case $arg in #(
       *"$as_nl"*)
 	expr "X$arg" : "X\\(.*\\)$as_nl";
 	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
@@ -5912,13 +5681,6 @@ if test "${PATH_SEPARATOR+set}" != set; then
   }
 fi
 
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
-fi
-
 
 # IFS
 # We need space, tab and new line, in precisely that order.  Quoting is
@@ -5928,15 +5690,16 @@ fi
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
-case $0 in
+as_myself=
+case $0 in #((
   *[\\/]* ) as_myself=$0 ;;
   *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
+    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+  done
 IFS=$as_save_IFS
 
      ;;
@@ -5948,12 +5711,16 @@ if test "x$as_myself" = x; then
 fi
 if test ! -f "$as_myself"; then
   $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-  { (exit 1); exit 1; }
+  exit 1
 fi
 
-# Work around bugs in pre-3.0 UWIN ksh.
-for as_var in ENV MAIL MAILPATH
-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+# Unset variables that we do not need and which cause bugs (e.g. in
+# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
+# suppresses any "Segmentation fault" message there.  '((' could
+# trigger a bug in pdksh 5.2.14.
+for as_var in BASH_ENV ENV MAIL MAILPATH
+do eval test x\${$as_var+set} = xset \
+  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
 done
 PS1='$ '
 PS2='> '
@@ -5965,7 +5732,89 @@ export LC_ALL
 LANGUAGE=C
 export LANGUAGE
 
-# Required to use basename.
+# CDPATH.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+
+# as_fn_error STATUS ERROR [LINENO LOG_FD]
+# ----------------------------------------
+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+# script with STATUS, using 1 if that was 0.
+as_fn_error ()
+{
+  as_status=$1; test $as_status -eq 0 && as_status=1
+  if test "$4"; then
+    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+  fi
+  $as_echo "$as_me: error: $2" >&2
+  as_fn_exit $as_status
+} # as_fn_error
+
+
+# as_fn_set_status STATUS
+# -----------------------
+# Set $? to STATUS, without forking.
+as_fn_set_status ()
+{
+  return $1
+} # as_fn_set_status
+
+# as_fn_exit STATUS
+# -----------------
+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
+as_fn_exit ()
+{
+  set +e
+  as_fn_set_status $1
+  exit $1
+} # as_fn_exit
+
+# as_fn_unset VAR
+# ---------------
+# Portably unset VAR.
+as_fn_unset ()
+{
+  { eval $1=; unset $1;}
+}
+as_unset=as_fn_unset
+# as_fn_append VAR VALUE
+# ----------------------
+# Append the text in VALUE to the end of the definition contained in VAR. Take
+# advantage of any shell optimizations that allow amortized linear growth over
+# repeated appends, instead of the typical quadratic growth present in naive
+# implementations.
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+  eval 'as_fn_append ()
+  {
+    eval $1+=\$2
+  }'
+else
+  as_fn_append ()
+  {
+    eval $1=\$$1\$2
+  }
+fi # as_fn_append
+
+# as_fn_arith ARG...
+# ------------------
+# Perform arithmetic evaluation on the ARGs, and store the result in the
+# global $as_val. Take advantage of shells that can avoid forks. The arguments
+# must be portable across $(()) and expr.
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+  eval 'as_fn_arith ()
+  {
+    as_val=$(( $* ))
+  }'
+else
+  as_fn_arith ()
+  {
+    as_val=`expr "$@" || test $? -eq 1`
+  }
+fi # as_fn_arith
+
+
 if expr a : '\(a\)' >/dev/null 2>&1 &&
    test "X`expr 00001 : '.*\(...\)'`" = X001; then
   as_expr=expr
@@ -5979,8 +5828,12 @@ else
   as_basename=false
 fi
 
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+  as_dirname=dirname
+else
+  as_dirname=false
+fi
 
-# Name of the executable.
 as_me=`$as_basename -- "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
@@ -6000,76 +5853,25 @@ $as_echo X/"$0" |
 	  }
 	  s/.*/./; q'`
 
-# CDPATH.
-$as_unset CDPATH
-
-
-
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
-
-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-  # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line after each line using $LINENO; the second 'sed'
-  # does the real work.  The second script uses 'N' to pair each
-  # line-number line with the line containing $LINENO, and appends
-  # trailing '-' during substitution so that $LINENO is not a special
-  # case at line end.
-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # scripts with optimization help from Paolo Bonzini.  Blame Lee
-  # E. McMahon (1931-1989) for sed's syntax.  :-)
-  sed -n '
-    p
-    /[$]LINENO/=
-  ' <$as_myself |
-    sed '
-      s/[$]LINENO.*/&-/
-      t lineno
-      b
-      :lineno
-      N
-      :loop
-      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
-      t loop
-      s/-\n.*//
-    ' >$as_me.lineno &&
-  chmod +x "$as_me.lineno" ||
-    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
-   { (exit 1); exit 1; }; }
-
-  # Don't try to exec as it changes $[0], causing all sort of problems
-  # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensitive to this).
-  . "./$as_me.lineno"
-  # Exit status is that of the last command.
-  exit
-}
-
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-  as_dirname=dirname
-else
-  as_dirname=false
-fi
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
 
 ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in
+case `echo -n x` in #(((((
 -n*)
-  case `echo 'x\c'` in
+  case `echo 'xy\c'` in
   *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  *)   ECHO_C='\c';;
+  xy)  ECHO_C='\c';;
+  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
+       ECHO_T='	';;
   esac;;
 *)
   ECHO_N='-n';;
 esac
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
 
 rm -f conf$$ conf$$.exe conf$$.file
 if test -d conf$$.dir; then
@@ -6098,8 +5900,56 @@ fi
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
 
+
+# as_fn_mkdir_p
+# -------------
+# Create "$as_dir" as a directory, including parents if necessary.
+as_fn_mkdir_p ()
+{
+
+  case $as_dir in #(
+  -*) as_dir=./$as_dir;;
+  esac
+  test -d "$as_dir" || eval $as_mkdir_p || {
+    as_dirs=
+    while :; do
+      case $as_dir in #(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *) as_qdir=$as_dir;;
+      esac
+      as_dirs="'$as_qdir' $as_dirs"
+      as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_dir" : 'X\(//\)[^/]' \| \
+	 X"$as_dir" : 'X\(//\)$' \| \
+	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_dir" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+      test -d "$as_dir" && break
+    done
+    test -z "$as_dirs" || eval "mkdir $as_dirs"
+  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
+
+
+} # as_fn_mkdir_p
 if mkdir -p . 2>/dev/null; then
-  as_mkdir_p=:
+  as_mkdir_p='mkdir -p "$as_dir"'
 else
   test -d ./-p && rmdir ./-p
   as_mkdir_p=false
@@ -6118,10 +5968,10 @@ else
       if test -d "$1"; then
 	test -d "$1/.";
       else
-	case $1 in
+	case $1 in #(
 	-*)set "./$1";;
 	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
 	???[sx]*):;;*)false;;esac;fi
     '\'' sh
   '
@@ -6136,13 +5986,19 @@ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
 
 
 exec 6>&1
+## ----------------------------------- ##
+## Main body of $CONFIG_STATUS script. ##
+## ----------------------------------- ##
+_ASEOF
+test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
 
-# Save the log message, to keep $[0] and so on meaningful, and to
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# Save the log message, to keep $0 and so on meaningful, and to
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by Xproto $as_me 7.0.18, which was
-generated by GNU Autoconf 2.63.  Invocation command line was
+This file was extended by Xproto $as_me 7.0.19, which was
+generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -6174,13 +6030,15 @@ _ACEOF
 
 cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 ac_cs_usage="\
-\`$as_me' instantiates files from templates according to the
-current configuration.
+\`$as_me' instantiates files and other configuration actions
+from templates according to the current configuration.  Unless the files
+and actions are specified as TAGs, all are instantiated by default.
 
-Usage: $0 [OPTION]... [FILE]...
+Usage: $0 [OPTION]... [TAG]...
 
   -h, --help       print this help, then exit
   -V, --version    print version number and configuration settings, then exit
+      --config     print configuration, then exit
   -q, --quiet, --silent
                    do not print progress messages
   -d, --debug      don't remove temporary files
@@ -6199,16 +6057,17 @@ $config_headers
 Configuration commands:
 $config_commands
 
-Report bugs to <bug-autoconf@gnu.org>."
+Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>."
 
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-Xproto config.status 7.0.18
-configured by $0, generated by GNU Autoconf 2.63,
-  with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+Xproto config.status 7.0.19
+configured by $0, generated by GNU Autoconf 2.68,
+  with options \\"\$ac_cs_config\\"
 
-Copyright (C) 2008 Free Software Foundation, Inc.
+Copyright (C) 2010 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
@@ -6226,11 +6085,16 @@ ac_need_defaults=:
 while test $# != 0
 do
   case $1 in
-  --*=*)
+  --*=?*)
     ac_option=`expr "X$1" : 'X\([^=]*\)='`
     ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
     ac_shift=:
     ;;
+  --*=)
+    ac_option=`expr "X$1" : 'X\([^=]*\)='`
+    ac_optarg=
+    ac_shift=:
+    ;;
   *)
     ac_option=$1
     ac_optarg=$2
@@ -6244,27 +6108,29 @@ do
     ac_cs_recheck=: ;;
   --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
     $as_echo "$ac_cs_version"; exit ;;
+  --config | --confi | --conf | --con | --co | --c )
+    $as_echo "$ac_cs_config"; exit ;;
   --debug | --debu | --deb | --de | --d | -d )
     debug=: ;;
   --file | --fil | --fi | --f )
     $ac_shift
     case $ac_optarg in
     *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    '') as_fn_error $? "missing file argument" ;;
     esac
-    CONFIG_FILES="$CONFIG_FILES '$ac_optarg'"
+    as_fn_append CONFIG_FILES " '$ac_optarg'"
     ac_need_defaults=false;;
   --header | --heade | --head | --hea )
     $ac_shift
     case $ac_optarg in
     *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
     esac
-    CONFIG_HEADERS="$CONFIG_HEADERS '$ac_optarg'"
+    as_fn_append CONFIG_HEADERS " '$ac_optarg'"
     ac_need_defaults=false;;
   --he | --h)
     # Conflict between --help and --header
-    { $as_echo "$as_me: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&2
-   { (exit 1); exit 1; }; };;
+    as_fn_error $? "ambiguous option: \`$1'
+Try \`$0 --help' for more information.";;
   --help | --hel | -h )
     $as_echo "$ac_cs_usage"; exit ;;
   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
@@ -6272,11 +6138,10 @@ Try \`$0 --help' for more information." >&2
     ac_cs_silent=: ;;
 
   # This is an error.
-  -*) { $as_echo "$as_me: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&2
-   { (exit 1); exit 1; }; } ;;
+  -*) as_fn_error $? "unrecognized option: \`$1'
+Try \`$0 --help' for more information." ;;
 
-  *) ac_config_targets="$ac_config_targets $1"
+  *) as_fn_append ac_config_targets " $1"
      ac_need_defaults=false ;;
 
   esac
@@ -6331,12 +6196,11 @@ do
     "do-not-use-config.h") CONFIG_HEADERS="$CONFIG_HEADERS do-not-use-config.h" ;;
     "Xfuncproto.h") CONFIG_HEADERS="$CONFIG_HEADERS Xfuncproto.h" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+    "specs/Makefile") CONFIG_FILES="$CONFIG_FILES specs/Makefile" ;;
     "Xpoll.h") CONFIG_FILES="$CONFIG_FILES Xpoll.h" ;;
     "xproto.pc") CONFIG_FILES="$CONFIG_FILES xproto.pc" ;;
 
-  *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-   { (exit 1); exit 1; }; };;
+  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac
 done
 
@@ -6359,26 +6223,24 @@ fi
 # after its creation but before its name has been assigned to `$tmp'.
 $debug ||
 {
-  tmp=
+  tmp= ac_tmp=
   trap 'exit_status=$?
-  { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
+  : "${ac_tmp:=$tmp}"
+  { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
 ' 0
-  trap '{ (exit 1); exit 1; }' 1 2 13 15
+  trap 'as_fn_exit 1' 1 2 13 15
 }
 # Create a (secure) tmp directory for tmp files.
 
 {
   tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
-  test -n "$tmp" && test -d "$tmp"
+  test -d "$tmp"
 }  ||
 {
   tmp=./conf$$-$RANDOM
   (umask 077 && mkdir "$tmp")
-} ||
-{
-   $as_echo "$as_me: cannot create a temporary directory in ." >&2
-   { (exit 1); exit 1; }
-}
+} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
+ac_tmp=$tmp
 
 # Set up the scripts for CONFIG_FILES section.
 # No need to generate them if there are no CONFIG_FILES.
@@ -6386,7 +6248,13 @@ $debug ||
 if test -n "$CONFIG_FILES"; then
 
 
-ac_cr='
'
+ac_cr=`echo X | tr X '\015'`
+# On cygwin, bash can eat \r inside `` if the user requested igncr.
+# But we know of no other shell where ac_cr would be empty at this
+# point, so we can use a bashism as a fallback.
+if test "x$ac_cr" = x; then
+  eval ac_cr=\$\'\\r\'
+fi
 ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
 if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
   ac_cs_awk_cr='\\r'
@@ -6394,7 +6262,7 @@ else
   ac_cs_awk_cr=$ac_cr
 fi
 
-echo 'BEGIN {' >"$tmp/subs1.awk" &&
+echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
 _ACEOF
 
 
@@ -6403,24 +6271,18 @@ _ACEOF
   echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
   echo "_ACEOF"
 } >conf$$subs.sh ||
-  { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-   { (exit 1); exit 1; }; }
-ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
+  as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   . ./conf$$subs.sh ||
-    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
 
   ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
   if test $ac_delim_n = $ac_delim_num; then
     break
   elif $ac_last_try; then
-    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
   else
     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
   fi
@@ -6428,7 +6290,7 @@ done
 rm -f conf$$subs.sh
 
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
+cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
 _ACEOF
 sed -n '
 h
@@ -6442,7 +6304,7 @@ s/'"$ac_delim"'$//
 t delim
 :nl
 h
-s/\(.\{148\}\).*/\1/
+s/\(.\{148\}\)..*/\1/
 t more1
 s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
 p
@@ -6456,7 +6318,7 @@ s/.\{148\}//
 t nl
 :delim
 h
-s/\(.\{148\}\).*/\1/
+s/\(.\{148\}\)..*/\1/
 t more2
 s/["\\]/\\&/g; s/^/"/; s/$/"/
 p
@@ -6476,7 +6338,7 @@ t delim
 rm -f conf$$subs.awk
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 _ACAWK
-cat >>"\$tmp/subs1.awk" <<_ACAWK &&
+cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
   for (key in S) S_is_set[key] = 1
   FS = ""
 
@@ -6508,23 +6370,29 @@ if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
   sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
 else
   cat
-fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
-  || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5
-$as_echo "$as_me: error: could not setup config files machinery" >&2;}
-   { (exit 1); exit 1; }; }
+fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
+  || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
 _ACEOF
 
-# VPATH may cause trouble with some makes, so we remove $(srcdir),
-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
+# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
+# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
 # trailing colons and then remove the whole line if VPATH becomes empty
 # (actually we leave an empty line to preserve line numbers).
 if test "x$srcdir" = x.; then
-  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
-s/:*\$(srcdir):*/:/
-s/:*\${srcdir}:*/:/
-s/:*@srcdir@:*/:/
-s/^\([^=]*=[	 ]*\):*/\1/
+  ac_vpsub='/^[	 ]*VPATH[	 ]*=[	 ]*/{
+h
+s///
+s/^/:/
+s/[	 ]*$/:/
+s/:\$(srcdir):/:/g
+s/:\${srcdir}:/:/g
+s/:@srcdir@:/:/g
+s/^:*//
 s/:*$//
+x
+s/\(=[	 ]*\).*/\1/
+G
+s/\n//
 s/^[^=]*=[	 ]*$//
 }'
 fi
@@ -6536,7 +6404,7 @@ fi # test -n "$CONFIG_FILES"
 # No need to generate them if there are no CONFIG_HEADERS.
 # This happens for instance with `./config.status Makefile'.
 if test -n "$CONFIG_HEADERS"; then
-cat >"$tmp/defines.awk" <<\_ACAWK ||
+cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
 BEGIN {
 _ACEOF
 
@@ -6548,13 +6416,11 @@ _ACEOF
 # handling of long lines.
 ac_delim='%!_!# '
 for ac_last_try in false false :; do
-  ac_t=`sed -n "/$ac_delim/p" confdefs.h`
-  if test -z "$ac_t"; then
+  ac_tt=`sed -n "/$ac_delim/p" confdefs.h`
+  if test -z "$ac_tt"; then
     break
   elif $ac_last_try; then
-    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_HEADERS" >&5
-$as_echo "$as_me: error: could not make $CONFIG_HEADERS" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
   else
     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
   fi
@@ -6639,9 +6505,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 _ACAWK
 _ACEOF
 cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-  { { $as_echo "$as_me:$LINENO: error: could not setup config headers machinery" >&5
-$as_echo "$as_me: error: could not setup config headers machinery" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
 fi # test -n "$CONFIG_HEADERS"
 
 
@@ -6654,9 +6518,7 @@ do
   esac
   case $ac_mode$ac_tag in
   :[FHL]*:*);;
-  :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5
-$as_echo "$as_me: error: invalid tag $ac_tag" >&2;}
-   { (exit 1); exit 1; }; };;
+  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
   :[FH]-) ac_tag=-:-;;
   :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
   esac
@@ -6675,7 +6537,7 @@ $as_echo "$as_me: error: invalid tag $ac_tag" >&2;}
     for ac_f
     do
       case $ac_f in
-      -) ac_f="$tmp/stdin";;
+      -) ac_f="$ac_tmp/stdin";;
       *) # Look for the file first in the build tree, then in the source tree
 	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
 	 # because $ac_f cannot contain `:'.
@@ -6684,12 +6546,10 @@ $as_echo "$as_me: error: invalid tag $ac_tag" >&2;}
 	   [\\/$]*) false;;
 	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
 	   esac ||
-	   { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
-$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;}
-   { (exit 1); exit 1; }; };;
+	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
       esac
       case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
-      ac_file_inputs="$ac_file_inputs '$ac_f'"
+      as_fn_append ac_file_inputs " '$ac_f'"
     done
 
     # Let's still pretend it is `configure' which instantiates (i.e., don't
@@ -6700,7 +6560,7 @@ $as_echo "$as_me: error: cannot find input file: $ac_f" >&2;}
 	`' by configure.'
     if test x"$ac_file" != x-; then
       configure_input="$ac_file.  $configure_input"
-      { $as_echo "$as_me:$LINENO: creating $ac_file" >&5
+      { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
 $as_echo "$as_me: creating $ac_file" >&6;}
     fi
     # Neutralize special characters interpreted by sed in replacement strings.
@@ -6712,10 +6572,8 @@ $as_echo "$as_me: creating $ac_file" >&6;}
     esac
 
     case $ac_tag in
-    *:-:* | *:-) cat >"$tmp/stdin" \
-      || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
-   { (exit 1); exit 1; }; } ;;
+    *:-:* | *:-) cat >"$ac_tmp/stdin" \
+      || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
     esac
     ;;
   esac
@@ -6743,47 +6601,7 @@ $as_echo X"$ac_file" |
 	    q
 	  }
 	  s/.*/./; q'`
-  { as_dir="$ac_dir"
-  case $as_dir in #(
-  -*) as_dir=./$as_dir;;
-  esac
-  test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
-    as_dirs=
-    while :; do
-      case $as_dir in #(
-      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
-      *) as_qdir=$as_dir;;
-      esac
-      as_dirs="'$as_qdir' $as_dirs"
-      as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-      test -d "$as_dir" && break
-    done
-    test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
-   { (exit 1); exit 1; }; }; }
+  as_dir="$ac_dir"; as_fn_mkdir_p
   ac_builddir=.
 
 case "$ac_dir" in
@@ -6840,7 +6658,6 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # If the template does not know about datarootdir, expand it.
 # FIXME: This hack should be removed a few years after 2.60.
 ac_datarootdir_hack=; ac_datarootdir_seen=
-
 ac_sed_dataroot='
 /datarootdir/ {
   p
@@ -6850,12 +6667,11 @@ ac_sed_dataroot='
 /@docdir@/p
 /@infodir@/p
 /@localedir@/p
-/@mandir@/p
-'
+/@mandir@/p'
 case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
 *datarootdir*) ac_datarootdir_seen=yes;;
 *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-  { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
 $as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
@@ -6865,7 +6681,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
   s&@infodir@&$infodir&g
   s&@localedir@&$localedir&g
   s&@mandir@&$mandir&g
-    s&\\\${datarootdir}&$datarootdir&g' ;;
+  s&\\\${datarootdir}&$datarootdir&g' ;;
 esac
 _ACEOF
 
@@ -6893,27 +6709,24 @@ s&@INSTALL@&$ac_INSTALL&;t t
 s&@MKDIR_P@&$ac_MKDIR_P&;t t
 $ac_datarootdir_hack
 "
-eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
-  || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
-   { (exit 1); exit 1; }; }
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
+  >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
 
 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
-  { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
-  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
-  { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined." >&5
+  { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
+  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' \
+      "$ac_tmp/out"`; test -z "$ac_out"; } &&
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+which seems to be undefined.  Please make sure it is defined" >&5
 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined." >&2;}
+which seems to be undefined.  Please make sure it is defined" >&2;}
 
-  rm -f "$tmp/stdin"
+  rm -f "$ac_tmp/stdin"
   case $ac_file in
-  -) cat "$tmp/out" && rm -f "$tmp/out";;
-  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
+  -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
+  *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
   esac \
-  || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
-   { (exit 1); exit 1; }; }
+  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
  ;;
   :H)
   #
@@ -6922,27 +6735,21 @@ $as_echo "$as_me: error: could not create $ac_file" >&2;}
   if test x"$ac_file" != x-; then
     {
       $as_echo "/* $configure_input  */" \
-      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
-    } >"$tmp/config.h" \
-      || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
-   { (exit 1); exit 1; }; }
-    if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
-      { $as_echo "$as_me:$LINENO: $ac_file is unchanged" >&5
+      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
+    } >"$ac_tmp/config.h" \
+      || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+    if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
+      { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
 $as_echo "$as_me: $ac_file is unchanged" >&6;}
     else
       rm -f "$ac_file"
-      mv "$tmp/config.h" "$ac_file" \
-	|| { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
-   { (exit 1); exit 1; }; }
+      mv "$ac_tmp/config.h" "$ac_file" \
+	|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
     fi
   else
     $as_echo "/* $configure_input  */" \
-      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
-      || { { $as_echo "$as_me:$LINENO: error: could not create -" >&5
-$as_echo "$as_me: error: could not create -" >&2;}
-   { (exit 1); exit 1; }; }
+      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
+      || as_fn_error $? "could not create -" "$LINENO" 5
   fi
 # Compute "$ac_file"'s index in $config_headers.
 _am_arg="$ac_file"
@@ -6980,7 +6787,7 @@ $as_echo X"$_am_arg" |
 	  s/.*/./; q'`/stamp-h$_am_stamp_count
  ;;
 
-  :C)  { $as_echo "$as_me:$LINENO: executing $ac_file commands" >&5
+  :C)  { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
 $as_echo "$as_me: executing $ac_file commands" >&6;}
  ;;
   esac
@@ -7075,47 +6882,7 @@ $as_echo X"$file" |
 	    q
 	  }
 	  s/.*/./; q'`
-      { as_dir=$dirpart/$fdir
-  case $as_dir in #(
-  -*) as_dir=./$as_dir;;
-  esac
-  test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
-    as_dirs=
-    while :; do
-      case $as_dir in #(
-      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
-      *) as_qdir=$as_dir;;
-      esac
-      as_dirs="'$as_qdir' $as_dirs"
-      as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-      test -d "$as_dir" && break
-    done
-    test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
-   { (exit 1); exit 1; }; }; }
+      as_dir=$dirpart/$fdir; as_fn_mkdir_p
       # echo "creating $dirpart/$file"
       echo '# dummy' > "$dirpart/$file"
     done
@@ -7127,15 +6894,12 @@ $as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
 done # for ac_tag
 
 
-{ (exit 0); exit 0; }
+as_fn_exit 0
 _ACEOF
-chmod +x $CONFIG_STATUS
 ac_clean_files=$ac_clean_files_save
 
 test $ac_write_fail = 0 ||
-  { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5
-$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
 
 
 # configure is writing to config.log, and then calls config.status.
@@ -7156,10 +6920,10 @@ if test "$no_create" != yes; then
   exec 5>>config.log
   # Use ||, not &&, to avoid exiting from the if with $? = 1, which
   # would make configure fail if this is the last instruction.
-  $ac_cs_success || { (exit 1); exit 1; }
+  $ac_cs_success || as_fn_exit 1
 fi
 if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
-  { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
 $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
 fi
 
diff --git a/X11/configure.ac b/X11/configure.ac
index 18044a488..9de04cb6f 100644
--- a/X11/configure.ac
+++ b/X11/configure.ac
@@ -1,13 +1,18 @@
 AC_PREREQ([2.60])
-AC_INIT([Xproto], [7.0.18], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_INIT([Xproto], [7.0.19],
+        [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE
 
-# Require xorg-macros: XORG_DEFAULT_OPTIONS
+# Require xorg-macros minimum of 1.10 for DocBook XML documentation
 m4_ifndef([XORG_MACROS_VERSION],
-          [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.3)
+          [m4_fatal([must install xorg-macros 1.10 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.10)
 XORG_DEFAULT_OPTIONS
+XORG_ENABLE_SPECS
+XORG_WITH_XMLTO(0.0.20)
+XORG_WITH_FOP
+XORG_CHECK_SGML_DOCTOOLS(1.5)
 
 AC_CONFIG_HEADER([do-not-use-config.h])
 AC_CONFIG_HEADER([Xfuncproto.h])
@@ -205,5 +210,6 @@ fi
 
 
 AC_OUTPUT([Makefile
+           specs/Makefile
            Xpoll.h
            xproto.pc])
diff --git a/X11/do-not-use-config.h.in b/X11/do-not-use-config.h.in
index 4c3523491..25b8013a3 100644
--- a/X11/do-not-use-config.h.in
+++ b/X11/do-not-use-config.h.in
@@ -57,6 +57,9 @@
 /* Define to the one symbol short name of this package. */
 #undef PACKAGE_TARNAME
 
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION
 
diff --git a/X11/extensions/XI2proto.txt b/X11/extensions/XI2proto.txt
index 706f50a03..10f58c261 100644
--- a/X11/extensions/XI2proto.txt
+++ b/X11/extensions/XI2proto.txt
@@ -296,7 +296,7 @@ are required to be 0.
                   value:                FP3232
                   resolution:           CARD32 }
 
-    XIQueryDevices details information about the requested input devices.
+    XIQueryDevice details information about the requested input devices.
 
     devices
         The device to list. If devices is AllDevices, all enabled and
@@ -871,7 +871,7 @@ are required to be 0.
     └───
 
     This request releases the device if this client has it actively grabbed
-    (from either XIGrabDevice,  XIGrabDeviceKey or XIGrabDeviceButton) and
+    (from either XIGrabDevice or  XIPassiveGrabDevice) and
     releases any queued events. If any devices were frozen by the grab,
     XIUngrabDevice thaws them.
 
@@ -999,7 +999,7 @@ are required to be 0.
     └───
 
         GRABTYPE         { GrabtypeButton, GrabtypeKeycode, GrabtypeEnter,
-                           GrabTypeFocusIn}
+                           GrabtypeFocusIn}
 
         GRABMODIFIERINFO {   status:    Access
                              modifiers: CARD32 }
@@ -1223,7 +1223,7 @@ are required to be 0.
         until server reset.
 
         A property cannot be deleted by setting nitems to zero. To delete a
-        property, use XIDeleteDeviceProperty.
+        property, use XIDeleteProperty.
 
         This request generates an XIPropertyEvent.
 
@@ -1443,8 +1443,7 @@ EVENTHEADER { type:                       BYTE
         Details the available classes provided by the device.  The order the
         classes are provided in is undefined.
 
-    For a detailed description of classes, see the XQueryInputDevice
-    request.
+    For a detailed description of classes, see the XQueryDevice request.
 
     ┌───
         DeviceEvent:
@@ -1486,7 +1485,8 @@ EVENTHEADER { type:                       BYTE
 
     An XIDeviceEvent is generated whenever the logical state of a device
     changes in response to a button press, a button release, a motion, a key
-    press or a key release.
+    press or a key release. The event type may be one of KeyPress,
+    KeyRelease, ButtonPress, ButtonRelease, Motion.
 
     detail
         The button number or key code, or 0.
@@ -1554,8 +1554,8 @@ EVENTHEADER { type:                       BYTE
             axisvalues_raw:            LISTofFP3232
     └───
 
-    A RawDevice event provides the information provided by the driver to the
-    client. RawDevice provide both the raw data as supplied by the driver and
+    A RawEvent provides the information provided by the driver to the
+    client. RawEvent provides both the raw data as supplied by the driver and
     transformed data as used in the server. Transformations include, but are
     not limited to, axis clipping and acceleration.
     Transformed valuator data may be equivalent to raw data. In this case,
diff --git a/X11/extensions/XIproto.txt b/X11/extensions/XIproto.txt
index 20cc02a03..f9d19f09d 100644
--- a/X11/extensions/XIproto.txt
+++ b/X11/extensions/XIproto.txt
@@ -577,7 +577,9 @@
    already has the device open with a different mode. It will fail
    and return AlreadyGrabbed if another client has the device
    grabbed. The request will fail with a BadMatch error if the
-   requested mode is not supported by the device.
+   device has no valuators and reports no axes of motion. The
+   request will fail with a BadMode error if the requested mode
+   is not supported by the device.
 
                        SetDeviceMode
                                device:DEVICE
diff --git a/X11/extensions/composite.h b/X11/extensions/composite.h
index 30b190fde..e460118b7 100644
--- a/X11/extensions/composite.h
+++ b/X11/extensions/composite.h
@@ -1,26 +1,26 @@
 /*
- * $Id: composite.h,v 1.4 2004/07/08 07:20:55 keithp Exp $
+ * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
  *
- * Copyright © 2006 Sun Microsystems
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
  *
- * 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 Sun Microsystems not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission.  Sun Microsystems makes no
- * representations about the suitability of this software for any purpose.  It
- * is provided "as is" without express or implied warranty.
- *
- * SUN MICROSYSTEMS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL SUN MICROSYSTEMS 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.
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
  *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+/*
  * Copyright © 2003 Keith Packard
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/X11/extensions/compositeproto.h b/X11/extensions/compositeproto.h
index 2e392e2eb..0417f2ce3 100644
--- a/X11/extensions/compositeproto.h
+++ b/X11/extensions/compositeproto.h
@@ -1,27 +1,26 @@
 /*
- * $Id: compositeproto.h,v 1.4 2004/07/08 07:20:55 keithp Exp $
+ * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
  *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
  *
- * Copyright © 2006 Sun Microsystems
- *
- * 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 Sun Microsystems not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission.  Sun Microsystems makes no
- * representations about the suitability of this software for any purpose.  It
- * is provided "as is" without express or implied warranty.
- *
- * SUN MICROSYSTEMS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL SUN MICROSYSTEMS 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.
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
  *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+/*
  * Copyright © 2003 Keith Packard
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/X11/extensions/configure.ac b/X11/extensions/configure.ac
index 599651b35..92d49d9d7 100644
--- a/X11/extensions/configure.ac
+++ b/X11/extensions/configure.ac
@@ -1,18 +1,18 @@
-AC_PREREQ([2.60])
-AC_INIT([XExtProto], [7.1.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
-AM_INIT_AUTOMAKE([foreign dist-bzip2])
-AM_MAINTAINER_MODE
-
-# Require xorg-macros minimum of 1.10 for DocBook XML documentation
-m4_ifndef([XORG_MACROS_VERSION],
-          [m4_fatal([must install xorg-macros 1.10 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.10)
-XORG_DEFAULT_OPTIONS
-XORG_ENABLE_SPECS
-XORG_WITH_XMLTO(0.0.20)
-XORG_WITH_FOP
-XORG_CHECK_SGML_DOCTOOLS(1.5)
-
-AC_OUTPUT([Makefile
-           specs/Makefile
-           xextproto.pc])
+AC_PREREQ([2.60])

+AC_INIT([XExtProto], [7.1.99.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])

+AM_INIT_AUTOMAKE([foreign dist-bzip2])

+AM_MAINTAINER_MODE

+

+# Require xorg-macros minimum of 1.10 for DocBook XML documentation

+m4_ifndef([XORG_MACROS_VERSION],

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

+XORG_MACROS_VERSION(1.10)

+XORG_DEFAULT_OPTIONS

+XORG_ENABLE_SPECS

+XORG_WITH_XMLTO(0.0.20)

+XORG_WITH_FOP

+XORG_CHECK_SGML_DOCTOOLS(1.5)

+

+AC_OUTPUT([Makefile

+           specs/Makefile

+           xextproto.pc])

diff --git a/X11/extensions/randr.h b/X11/extensions/randr.h
index 1ee95f936..fec7f4f4e 100644
--- a/X11/extensions/randr.h
+++ b/X11/extensions/randr.h
@@ -1,163 +1,173 @@
-/*
- * Copyright © 2000 Compaq Computer Corporation
- * Copyright © 2002 Hewlett Packard Company
- * Copyright © 2006 Intel Corporation
- * Copyright © 2008 Red Hat, Inc.
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of the copyright holders not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission.  The copyright holders make no representations
- * about the suitability of this software for any purpose.  It is provided "as
- * is" without express or implied warranty.
- *
- * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL THE COPYRIGHT HOLDERS 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:  Jim Gettys, HP Labs, Hewlett-Packard, Inc.
- *	    Keith Packard, Intel Corporation
- */
-
-#ifndef _RANDR_H_
-#define _RANDR_H_
-
-typedef unsigned short	Rotation;
-typedef unsigned short	SizeID;
-typedef unsigned short	SubpixelOrder;
-typedef unsigned short	Connection;
-typedef unsigned short	XRandrRotation;
-typedef unsigned short	XRandrSizeID;
-typedef unsigned short	XRandrSubpixelOrder;
-typedef unsigned long	XRandrModeFlags;
-
-#define RANDR_NAME		"RANDR"
-#define RANDR_MAJOR		1
-#define RANDR_MINOR		3
-
-#define RRNumberErrors		3
-#define RRNumberEvents		2
-#define RRNumberRequests	32
-
-#define X_RRQueryVersion	0
-/* we skip 1 to make old clients fail pretty immediately */
-#define X_RROldGetScreenInfo	1
-#define X_RR1_0SetScreenConfig	2
-/* V1.0 apps share the same set screen config request id */
-#define X_RRSetScreenConfig	2
-#define X_RROldScreenChangeSelectInput	3
-/* 3 used to be ScreenChangeSelectInput; deprecated */
-#define X_RRSelectInput		4
-#define X_RRGetScreenInfo	5
-
-/* V1.2 additions */
-#define X_RRGetScreenSizeRange	    6
-#define X_RRSetScreenSize	    7
-#define X_RRGetScreenResources	    8
-#define X_RRGetOutputInfo	    9
-#define X_RRListOutputProperties    10
-#define X_RRQueryOutputProperty	    11
-#define X_RRConfigureOutputProperty 12
-#define X_RRChangeOutputProperty    13
-#define X_RRDeleteOutputProperty    14
-#define X_RRGetOutputProperty	    15
-#define X_RRCreateMode		    16
-#define X_RRDestroyMode		    17
-#define X_RRAddOutputMode	    18
-#define X_RRDeleteOutputMode	    19
-#define X_RRGetCrtcInfo		    20
-#define X_RRSetCrtcConfig	    21
-#define X_RRGetCrtcGammaSize	    22
-#define X_RRGetCrtcGamma	    23
-#define X_RRSetCrtcGamma	    24
-
-/* V1.3 additions */
-#define X_RRGetScreenResourcesCurrent	25
-#define X_RRSetCrtcTransform	    26
-#define X_RRGetCrtcTransform	    27
-#define X_RRGetPanning		    28
-#define X_RRSetPanning		    29
-#define X_RRSetOutputPrimary	    30
-#define X_RRGetOutputPrimary	    31
-
-#define RRTransformUnit		    (1L << 0)
-#define RRTransformScaleUp	    (1L << 1)
-#define RRTransformScaleDown	    (1L << 2)
-#define RRTransformProjective	    (1L << 3)
-
-/* Event selection bits */
-#define RRScreenChangeNotifyMask  (1L << 0)
-/* V1.2 additions */
-#define RRCrtcChangeNotifyMask	    (1L << 1)
-#define RROutputChangeNotifyMask    (1L << 2)
-#define RROutputPropertyNotifyMask  (1L << 3)
-
-/* Event codes */
-#define RRScreenChangeNotify	0
-/* V1.2 additions */
-#define RRNotify		    1
-/* RRNotify Subcodes */
-#define  RRNotify_CrtcChange	    0
-#define  RRNotify_OutputChange	    1
-#define  RRNotify_OutputProperty    2
-
-/* used in the rotation field; rotation and reflection in 0.1 proto. */
-#define RR_Rotate_0		1
-#define RR_Rotate_90		2
-#define RR_Rotate_180		4
-#define RR_Rotate_270		8
-
-/* new in 1.0 protocol, to allow reflection of screen */
-
-#define RR_Reflect_X		16
-#define RR_Reflect_Y		32
-
-#define RRSetConfigSuccess		0
-#define RRSetConfigInvalidConfigTime	1
-#define RRSetConfigInvalidTime		2
-#define RRSetConfigFailed		3
-
-/* new in 1.2 protocol */
-
-#define RR_HSyncPositive	0x00000001
-#define RR_HSyncNegative	0x00000002
-#define RR_VSyncPositive	0x00000004
-#define RR_VSyncNegative	0x00000008
-#define RR_Interlace		0x00000010
-#define RR_DoubleScan		0x00000020
-#define RR_CSync		0x00000040
-#define RR_CSyncPositive	0x00000080
-#define RR_CSyncNegative	0x00000100
-#define RR_HSkewPresent		0x00000200
-#define RR_BCast		0x00000400
-#define RR_PixelMultiplex	0x00000800
-#define RR_DoubleClock		0x00001000
-#define RR_ClockDivideBy2	0x00002000
-
-#define RR_Connected		0
-#define RR_Disconnected		1
-#define RR_UnknownConnection	2
-
-#define BadRROutput		0
-#define BadRRCrtc		1
-#define BadRRMode		2
-
-/* Conventional RandR output properties */
-
-#define RR_PROPERTY_BACKLIGHT		"Backlight"
-#define RR_PROPERTY_RANDR_EDID		"EDID"
-#define RR_PROPERTY_SIGNAL_FORMAT	"SignalFormat"
-#define RR_PROPERTY_SIGNAL_PROPERTIES	"SignalProperties"
-#define RR_PROPERTY_CONNECTOR_TYPE	"ConnectorType"
-#define RR_PROPERTY_CONNECTOR_NUMBER	"ConnectorNumber"
-#define RR_PROPERTY_COMPATIBILITY_LIST	"CompatibilityList"
-#define RR_PROPERTY_CLONE_LIST		"CloneList"
-
-#endif	/* _RANDR_H_ */
+/*

+ * Copyright © 2000 Compaq Computer Corporation

+ * Copyright © 2002 Hewlett Packard Company

+ * Copyright © 2006 Intel Corporation

+ * Copyright © 2008 Red Hat, Inc.

+ *

+ * Permission to use, copy, modify, distribute, and sell this software and its

+ * documentation for any purpose is hereby granted without fee, provided that

+ * the above copyright notice appear in all copies and that both that copyright

+ * notice and this permission notice appear in supporting documentation, and

+ * that the name of the copyright holders not be used in advertising or

+ * publicity pertaining to distribution of the software without specific,

+ * written prior permission.  The copyright holders make no representations

+ * about the suitability of this software for any purpose.  It is provided "as

+ * is" without express or implied warranty.

+ *

+ * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO

+ * EVENT SHALL THE COPYRIGHT HOLDERS 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:  Jim Gettys, HP Labs, Hewlett-Packard, Inc.

+ *	    Keith Packard, Intel Corporation

+ */

+

+#ifndef _RANDR_H_

+#define _RANDR_H_

+

+typedef unsigned short	Rotation;

+typedef unsigned short	SizeID;

+typedef unsigned short	SubpixelOrder;

+typedef unsigned short	Connection;

+typedef unsigned short	XRandrRotation;

+typedef unsigned short	XRandrSizeID;

+typedef unsigned short	XRandrSubpixelOrder;

+typedef unsigned long	XRandrModeFlags;

+

+#define RANDR_NAME		"RANDR"

+#define RANDR_MAJOR		1

+#define RANDR_MINOR		4

+

+#define RRNumberErrors		3

+#define RRNumberEvents		2

+#define RRNumberRequests	37

+

+#define X_RRQueryVersion	0

+/* we skip 1 to make old clients fail pretty immediately */

+#define X_RROldGetScreenInfo	1

+#define X_RR1_0SetScreenConfig	2

+/* V1.0 apps share the same set screen config request id */

+#define X_RRSetScreenConfig	2

+#define X_RROldScreenChangeSelectInput	3

+/* 3 used to be ScreenChangeSelectInput; deprecated */

+#define X_RRSelectInput		4

+#define X_RRGetScreenInfo	5

+

+/* V1.2 additions */

+#define X_RRGetScreenSizeRange	    6

+#define X_RRSetScreenSize	    7

+#define X_RRGetScreenResources	    8

+#define X_RRGetOutputInfo	    9

+#define X_RRListOutputProperties    10

+#define X_RRQueryOutputProperty	    11

+#define X_RRConfigureOutputProperty 12

+#define X_RRChangeOutputProperty    13

+#define X_RRDeleteOutputProperty    14

+#define X_RRGetOutputProperty	    15

+#define X_RRCreateMode		    16

+#define X_RRDestroyMode		    17

+#define X_RRAddOutputMode	    18

+#define X_RRDeleteOutputMode	    19

+#define X_RRGetCrtcInfo		    20

+#define X_RRSetCrtcConfig	    21

+#define X_RRGetCrtcGammaSize	    22

+#define X_RRGetCrtcGamma	    23

+#define X_RRSetCrtcGamma	    24

+

+/* V1.3 additions */

+#define X_RRGetScreenResourcesCurrent	25

+#define X_RRSetCrtcTransform	    26

+#define X_RRGetCrtcTransform	    27

+#define X_RRGetPanning		    28

+#define X_RRSetPanning		    29

+#define X_RRSetOutputPrimary	    30

+#define X_RRGetOutputPrimary	    31

+

+#define RRTransformUnit		    (1L << 0)

+#define RRTransformScaleUp	    (1L << 1)

+#define RRTransformScaleDown	    (1L << 2)

+#define RRTransformProjective	    (1L << 3)

+

+/* V1.4 additions */

+#define X_RRQueryScanoutPixmaps	    32

+#define X_RRCreateScanoutPixmap	    33

+#define X_RRSetCrtcSpriteTransform  34

+#define X_RRGetCrtcSpriteTransform  35

+#define X_RRSetCrtcConfigs	    36

+

+/* Event selection bits */

+#define RRScreenChangeNotifyMask  (1L << 0)

+/* V1.2 additions */

+#define RRCrtcChangeNotifyMask	    (1L << 1)

+#define RROutputChangeNotifyMask    (1L << 2)

+#define RROutputPropertyNotifyMask  (1L << 3)

+

+/* Event codes */

+#define RRScreenChangeNotify	0

+/* V1.2 additions */

+#define RRNotify		    1

+/* RRNotify Subcodes */

+#define  RRNotify_CrtcChange	    0

+#define  RRNotify_OutputChange	    1

+#define  RRNotify_OutputProperty    2

+

+/* used in the rotation field; rotation and reflection in 0.1 proto. */

+#define RR_Rotate_0		1

+#define RR_Rotate_90		2

+#define RR_Rotate_180		4

+#define RR_Rotate_270		8

+

+/* new in 1.0 protocol, to allow reflection of screen */

+

+#define RR_Reflect_X		16

+#define RR_Reflect_Y		32

+

+#define RRSetConfigSuccess		0

+#define RRSetConfigInvalidConfigTime	1

+#define RRSetConfigInvalidTime		2

+#define RRSetConfigFailed		3

+

+/* new in 1.2 protocol */

+

+#define RR_HSyncPositive	0x00000001

+#define RR_HSyncNegative	0x00000002

+#define RR_VSyncPositive	0x00000004

+#define RR_VSyncNegative	0x00000008

+#define RR_Interlace		0x00000010

+#define RR_DoubleScan		0x00000020

+#define RR_CSync		0x00000040

+#define RR_CSyncPositive	0x00000080

+#define RR_CSyncNegative	0x00000100

+#define RR_HSkewPresent		0x00000200

+#define RR_BCast		0x00000400

+#define RR_PixelMultiplex	0x00000800

+#define RR_DoubleClock		0x00001000

+#define RR_ClockDivideBy2	0x00002000

+

+#define RR_Connected		0

+#define RR_Disconnected		1

+#define RR_UnknownConnection	2

+

+#define BadRROutput		0

+#define BadRRCrtc		1

+#define BadRRMode		2

+

+/* new in 1.4 protocol */

+#define RR_CurrentScanoutPixmap	1	/* current scanout pixmap in RRSetCrtcConfigs */

+

+/* Conventional RandR output properties */

+

+#define RR_PROPERTY_BACKLIGHT		"Backlight"

+#define RR_PROPERTY_RANDR_EDID		"EDID"

+#define RR_PROPERTY_SIGNAL_FORMAT	"SignalFormat"

+#define RR_PROPERTY_SIGNAL_PROPERTIES	"SignalProperties"

+#define RR_PROPERTY_CONNECTOR_TYPE	"ConnectorType"

+#define RR_PROPERTY_CONNECTOR_NUMBER	"ConnectorNumber"

+#define RR_PROPERTY_COMPATIBILITY_LIST	"CompatibilityList"

+#define RR_PROPERTY_CLONE_LIST		"CloneList"

+

+#endif	/* _RANDR_H_ */

diff --git a/X11/extensions/randrproto.h b/X11/extensions/randrproto.h
index 3b98a9f1f..298d4cfad 100644
--- a/X11/extensions/randrproto.h
+++ b/X11/extensions/randrproto.h
@@ -1,802 +1,922 @@
-/*
- * Copyright © 2000 Compaq Computer Corporation
- * Copyright © 2002 Hewlett-Packard Company
- * Copyright © 2006 Intel Corporation
- * Copyright © 2008 Red Hat, Inc.
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of the copyright holders not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission.  The copyright holders make no representations
- * about the suitability of this software for any purpose.  It is provided "as
- * is" without express or implied warranty.
- *
- * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL THE COPYRIGHT HOLDERS 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:  Jim Gettys, Hewlett-Packard Company, Inc.
- *	    Keith Packard, Intel Corporation
- */
-
-/* note that RANDR 1.0 is incompatible with version 0.0, or 0.1 */
-/* V1.0 removes depth switching from the protocol */
-#ifndef _XRANDRP_H_
-#define _XRANDRP_H_
-
-#include <X11/extensions/randr.h>
-#include <X11/extensions/renderproto.h>
-
-#define Window CARD32
-#define Drawable CARD32
-#define Font CARD32
-#define Pixmap CARD32
-#define Cursor CARD32
-#define Colormap CARD32
-#define GContext CARD32
-#define Atom CARD32
-#define Time CARD32
-#define KeyCode CARD8
-#define KeySym CARD32
-#define RROutput CARD32
-#define RRMode CARD32
-#define RRCrtc CARD32
-#define RRModeFlags CARD32
-
-#define Rotation CARD16
-#define SizeID CARD16
-#define SubpixelOrder CARD16
-
-/*
- * data structures
- */
-
-typedef struct {
-    CARD16 widthInPixels B16;
-    CARD16 heightInPixels B16;
-    CARD16 widthInMillimeters B16;
-    CARD16 heightInMillimeters B16;
-} xScreenSizes;
-#define sz_xScreenSizes 8
-
-/* 
- * requests and replies
- */
-
-typedef struct {
-    CARD8   reqType;
-    CARD8   randrReqType;
-    CARD16  length B16;
-    CARD32  majorVersion B32;
-    CARD32  minorVersion B32;
-} xRRQueryVersionReq;
-#define sz_xRRQueryVersionReq   12
-
-typedef struct {
-    BYTE    type;   /* X_Reply */
-    BYTE    pad1;
-    CARD16  sequenceNumber B16;
-    CARD32  length B32;
-    CARD32  majorVersion B32;
-    CARD32  minorVersion B32;
-    CARD32  pad2 B32;
-    CARD32  pad3 B32;
-    CARD32  pad4 B32;
-    CARD32  pad5 B32;
-} xRRQueryVersionReply;
-#define sz_xRRQueryVersionReply	32
-
-typedef struct {
-    CARD8   reqType;
-    CARD8   randrReqType;
-    CARD16  length B16;
-    Window  window B32;
-} xRRGetScreenInfoReq;
-#define sz_xRRGetScreenInfoReq   8
-
-/* 
- * the xRRScreenInfoReply structure is followed by:
- *
- * the size information
- */
-
-
-typedef struct {
-    BYTE    type;   /* X_Reply */
-    BYTE    setOfRotations;
-    CARD16  sequenceNumber B16;
-    CARD32  length B32;
-    Window  root B32;
-    Time    timestamp B32;
-    Time    configTimestamp B32;
-    CARD16  nSizes B16;
-    SizeID  sizeID B16;
-    Rotation  rotation B16;
-    CARD16  rate B16;
-    CARD16  nrateEnts B16;
-    CARD16  pad B16;
-} xRRGetScreenInfoReply;
-#define sz_xRRGetScreenInfoReply	32
-
-typedef struct {
-    CARD8    reqType;
-    CARD8    randrReqType;
-    CARD16   length B16;
-    Drawable drawable B32;
-    Time     timestamp B32;
-    Time     configTimestamp B32;
-    SizeID   sizeID B16;
-    Rotation rotation B16;
-} xRR1_0SetScreenConfigReq;
-#define sz_xRR1_0SetScreenConfigReq   20
-
-typedef struct {
-    CARD8    reqType;
-    CARD8    randrReqType;
-    CARD16   length B16;
-    Drawable drawable B32;
-    Time     timestamp B32;
-    Time     configTimestamp B32;
-    SizeID   sizeID B16;
-    Rotation rotation B16;
-    CARD16   rate B16;
-    CARD16   pad B16;
-} xRRSetScreenConfigReq;
-#define sz_xRRSetScreenConfigReq   24
-
-typedef struct {
-    BYTE    type;   /* X_Reply */
-    CARD8   status;
-    CARD16  sequenceNumber B16;
-    CARD32  length B32;
-    Time    newTimestamp B32;  
-    Time    newConfigTimestamp B32;
-    Window  root;
-    CARD16  subpixelOrder B16;
-    CARD16  pad4 B16;
-    CARD32  pad5 B32;
-    CARD32  pad6 B32;
-} xRRSetScreenConfigReply;
-#define sz_xRRSetScreenConfigReply 32
-
-typedef struct {
-    CARD8   reqType;
-    CARD8   randrReqType;
-    CARD16  length B16;
-    Window  window B32;
-    CARD16  enable B16;
-    CARD16  pad2 B16;
-} xRRSelectInputReq;
-#define sz_xRRSelectInputReq   12
-
-/*
- * Additions for version 1.2
- */
-
-typedef struct _xRRModeInfo {
-    RRMode		id B32;
-    CARD16		width B16;
-    CARD16		height B16;
-    CARD32		dotClock B32;
-    CARD16		hSyncStart B16;
-    CARD16		hSyncEnd B16;
-    CARD16		hTotal B16;
-    CARD16		hSkew B16;
-    CARD16		vSyncStart B16;
-    CARD16		vSyncEnd B16;
-    CARD16		vTotal B16;
-    CARD16		nameLength B16;
-    RRModeFlags		modeFlags B32;
-} xRRModeInfo;
-#define sz_xRRModeInfo		    32
-
-typedef struct {
-    CARD8   reqType;
-    CARD8   randrReqType;
-    CARD16  length B16;
-    Window  window B32;
-} xRRGetScreenSizeRangeReq;
-#define sz_xRRGetScreenSizeRangeReq 8
-
-typedef struct {
-    BYTE    type;   /* X_Reply */
-    CARD8   pad;
-    CARD16  sequenceNumber B16;
-    CARD32  length B32;
-    CARD16  minWidth B16;
-    CARD16  minHeight B16;
-    CARD16  maxWidth B16;
-    CARD16  maxHeight B16;
-    CARD32  pad0 B32;
-    CARD32  pad1 B32;
-    CARD32  pad2 B32;
-    CARD32  pad3 B32;
-} xRRGetScreenSizeRangeReply;
-#define sz_xRRGetScreenSizeRangeReply 32
-
-typedef struct {
-    CARD8   reqType;
-    CARD8   randrReqType;
-    CARD16  length B16;
-    Window  window B32;
-    CARD16  width B16;
-    CARD16  height B16;
-    CARD32  widthInMillimeters B32;
-    CARD32  heightInMillimeters B32;
-} xRRSetScreenSizeReq;
-#define sz_xRRSetScreenSizeReq	    20
-
-typedef struct {
-    CARD8   reqType;
-    CARD8   randrReqType;
-    CARD16  length B16;
-    Window  window B32;
-} xRRGetScreenResourcesReq;
-#define sz_xRRGetScreenResourcesReq 8
-
-typedef struct {
-    BYTE	type;
-    CARD8	pad;
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    Time	timestamp B32;
-    Time	configTimestamp B32;
-    CARD16	nCrtcs B16;
-    CARD16	nOutputs B16;
-    CARD16	nModes B16;
-    CARD16	nbytesNames B16;
-    CARD32	pad1 B32;
-    CARD32	pad2 B32;
-} xRRGetScreenResourcesReply;
-#define sz_xRRGetScreenResourcesReply	32
-
-typedef struct {
-    CARD8	reqType;
-    CARD8	randrReqType;
-    CARD16	length B16;
-    RROutput	output B32;
-    Time	configTimestamp B32;
-} xRRGetOutputInfoReq;
-#define sz_xRRGetOutputInfoReq		12
-
-typedef struct {
-    BYTE	type;
-    CARD8	status;
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    Time	timestamp B32;
-    RRCrtc	crtc B32;
-    CARD32	mmWidth B32;
-    CARD32	mmHeight B32;
-    CARD8	connection;
-    CARD8	subpixelOrder;
-    CARD16	nCrtcs B16;
-    CARD16	nModes B16;
-    CARD16	nPreferred B16;
-    CARD16	nClones B16;
-    CARD16	nameLength B16;
-} xRRGetOutputInfoReply;
-#define sz_xRRGetOutputInfoReply	36
-
-typedef struct {
-    CARD8	reqType;
-    CARD8	randrReqType;
-    CARD16	length B16;
-    RROutput	output B32;
-} xRRListOutputPropertiesReq; 
-#define sz_xRRListOutputPropertiesReq	8
-
-typedef struct {
-    BYTE	type;
-    CARD8	pad0;
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD16	nAtoms B16;
-    CARD16	pad1 B16;
-    CARD32	pad2 B32;
-    CARD32	pad3 B32;
-    CARD32	pad4 B32;
-    CARD32	pad5 B32;
-    CARD32	pad6 B32;
-} xRRListOutputPropertiesReply;
-#define sz_xRRListOutputPropertiesReply	32
-
-typedef struct {
-    CARD8	reqType;
-    CARD8	randrReqType;
-    CARD16	length B16;
-    RROutput	output B32;
-    Atom	property B32;
-} xRRQueryOutputPropertyReq; 
-#define sz_xRRQueryOutputPropertyReq	12
-
-typedef struct {
-    BYTE	type;
-    BYTE	pad0;
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    BOOL	pending;
-    BOOL	range;
-    BOOL	immutable;
-    BYTE	pad1;
-    CARD32	pad2 B32;
-    CARD32	pad3 B32;
-    CARD32	pad4 B32;
-    CARD32	pad5 B32;
-    CARD32	pad6 B32;
-} xRRQueryOutputPropertyReply;
-#define sz_xRRQueryOutputPropertyReply	32
-
-typedef struct {
-    CARD8	reqType;
-    CARD8	randrReqType;
-    CARD16	length B16;
-    RROutput	output B32;
-    Atom	property B32;
-    BOOL	pending;
-    BOOL	range;
-    CARD16	pad B16;
-} xRRConfigureOutputPropertyReq; 
-#define sz_xRRConfigureOutputPropertyReq	16
-
-typedef struct {
-    CARD8	reqType;
-    CARD8	randrReqType;
-    CARD16	length B16;
-    RROutput	output B32;
-    Atom	property B32;
-    Atom	type B32;
-    CARD8	format;
-    CARD8	mode;
-    CARD16	pad;
-    CARD32	nUnits B32;
-} xRRChangeOutputPropertyReq;
-#define sz_xRRChangeOutputPropertyReq	24
-
-typedef struct {
-    CARD8	reqType;
-    CARD8	randrReqType;
-    CARD16	length B16;
-    RROutput	output B32;
-    Atom	property B32;
-} xRRDeleteOutputPropertyReq;
-#define sz_xRRDeleteOutputPropertyReq	12
-
-typedef struct {
-    CARD8	reqType;
-    CARD8	randrReqType;
-    CARD16	length B16;
-    RROutput	output B32;
-    Atom	property B32;
-    Atom	type B32;
-    CARD32	longOffset B32;
-    CARD32	longLength B32;
-#ifdef __cplusplus
-    BOOL	_delete;
-#else
-    BOOL	delete;
-#endif
-    BOOL	pending;
-    CARD16	pad1 B16;
-} xRRGetOutputPropertyReq;
-#define sz_xRRGetOutputPropertyReq	28
-
-typedef struct {
-    BYTE	type;
-    CARD8	format;
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    Atom	propertyType B32;
-    CARD32	bytesAfter B32;
-    CARD32	nItems B32;
-    CARD32	pad1 B32;
-    CARD32	pad2 B32;
-    CARD32	pad3 B32;
-} xRRGetOutputPropertyReply;
-#define sz_xRRGetOutputPropertyReply	32
-
-typedef struct {
-    CARD8	reqType;
-    CARD8	randrReqType;
-    CARD16	length B16;
-    Window	window B32;
-    xRRModeInfo	modeInfo;
-} xRRCreateModeReq; 
-#define sz_xRRCreateModeReq		40
-
-typedef struct {
-    BYTE	type;
-    CARD8	pad0;
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    RRMode	mode B32;
-    CARD32	pad1 B32;
-    CARD32	pad2 B32;
-    CARD32	pad3 B32;
-    CARD32	pad4 B32;
-    CARD32	pad5 B32;
-} xRRCreateModeReply;
-#define sz_xRRCreateModeReply		32
-
-typedef struct {
-    CARD8	reqType;
-    CARD8	randrReqType;
-    CARD16	length B16;
-    RRMode	mode B32;
-} xRRDestroyModeReq;
-#define sz_xRRDestroyModeReq		8
-
-typedef struct {
-    CARD8	reqType;
-    CARD8	randrReqType;
-    CARD16	length B16;
-    RROutput	output B32;
-    RRMode	mode B32;
-} xRRAddOutputModeReq;
-#define sz_xRRAddOutputModeReq		12
-
-typedef struct {
-    CARD8	reqType;
-    CARD8	randrReqType;
-    CARD16	length B16;
-    RROutput	output B32;
-    RRMode	mode B32;
-} xRRDeleteOutputModeReq;
-#define sz_xRRDeleteOutputModeReq	12
-
-typedef struct {
-    CARD8	reqType;
-    CARD8	randrReqType;
-    CARD16	length B16;
-    RRCrtc	crtc B32;
-    Time	configTimestamp B32;
-} xRRGetCrtcInfoReq; 
-#define sz_xRRGetCrtcInfoReq		12
-
-typedef struct {
-    BYTE	type;
-    CARD8	status;
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    Time	timestamp B32;
-    INT16	x B16;
-    INT16	y B16;
-    CARD16	width B16;
-    CARD16	height B16;
-    RRMode	mode B32;
-    Rotation	rotation B16;
-    Rotation	rotations B16;
-    CARD16	nOutput B16;
-    CARD16	nPossibleOutput B16;
-} xRRGetCrtcInfoReply;
-#define sz_xRRGetCrtcInfoReply		32
-
-typedef struct {
-    CARD8	reqType;
-    CARD8	randrReqType;
-    CARD16	length B16;
-    RRCrtc	crtc B32;
-    Time	timestamp B32;
-    Time    	configTimestamp B32;
-    INT16	x B16;
-    INT16	y B16;
-    RRMode	mode B32;
-    Rotation	rotation B16;
-    CARD16	pad B16;
-} xRRSetCrtcConfigReq; 
-#define sz_xRRSetCrtcConfigReq		28
-
-typedef struct {
-    BYTE	type;
-    CARD8	status;
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    Time	newTimestamp B32;
-    CARD32	pad1 B32;
-    CARD32	pad2 B16;
-    CARD32	pad3 B32;
-    CARD32	pad4 B32;
-    CARD32	pad5 B32;
-} xRRSetCrtcConfigReply;
-#define sz_xRRSetCrtcConfigReply	32
-
-typedef struct {
-    CARD8	reqType;
-    CARD8	randrReqType;
-    CARD16	length B16;
-    RRCrtc	crtc B32;
-} xRRGetCrtcGammaSizeReq; 
-#define sz_xRRGetCrtcGammaSizeReq	8
-
-typedef struct {
-    BYTE	type;
-    CARD8	status;
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD16	size B16;
-    CARD16	pad1 B16;
-    CARD32	pad2 B32;
-    CARD32	pad3 B32;
-    CARD32	pad4 B32;
-    CARD32	pad5 B32;
-    CARD32	pad6 B32;
-} xRRGetCrtcGammaSizeReply;
-#define sz_xRRGetCrtcGammaSizeReply	32
-
-typedef struct {
-    CARD8	reqType;
-    CARD8	randrReqType;
-    CARD16	length B16;
-    RRCrtc	crtc B32;
-} xRRGetCrtcGammaReq; 
-#define sz_xRRGetCrtcGammaReq		8
-
-typedef struct {
-    BYTE	type;
-    CARD8	status;
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD16	size B16;
-    CARD16	pad1 B16;
-    CARD32	pad2 B32;
-    CARD32	pad3 B32;
-    CARD32	pad4 B32;
-    CARD32	pad5 B32;
-    CARD32	pad6 B32;
-} xRRGetCrtcGammaReply;
-#define sz_xRRGetCrtcGammaReply		32
-
-typedef struct {
-    CARD8	reqType;
-    CARD8	randrReqType;
-    CARD16	length B16;
-    RRCrtc	crtc B32;
-    CARD16	size B16;
-    CARD16	pad1 B16;
-} xRRSetCrtcGammaReq;
-#define sz_xRRSetCrtcGammaReq		12
-
-/*
- * Additions for V1.3
- */
-
-typedef xRRGetScreenResourcesReq xRRGetScreenResourcesCurrentReq;
-
-#define sz_xRRGetScreenResourcesCurrentReq sz_xRRGetScreenResourcesReq
-
-typedef xRRGetScreenResourcesReply xRRGetScreenResourcesCurrentReply;
-#define sz_xRRGetScreenResourcesCurrentReply	sz_xRRGetScreenResourcesReply
-
-typedef struct {
-    CARD8		reqType;
-    CARD8		randrReqType;
-    CARD16		length B16;
-    RRCrtc		crtc B32;
-    xRenderTransform	transform;
-    CARD16		nbytesFilter;	/* number of bytes in filter name */
-    CARD16		pad B16;
-} xRRSetCrtcTransformReq;
-
-#define sz_xRRSetCrtcTransformReq	48
-
-typedef struct {
-    CARD8		reqType;
-    CARD8		randrReqType;
-    CARD16		length B16;
-    RRCrtc		crtc B32;
-} xRRGetCrtcTransformReq;
-
-#define sz_xRRGetCrtcTransformReq	8
-
-typedef struct {
-    BYTE		type;
-    CARD8		status;
-    CARD16		sequenceNumber B16;
-    CARD32		length B32;
-    xRenderTransform	pendingTransform;
-    BYTE		hasTransforms;
-    CARD8		pad0;
-    CARD16		pad1 B16;
-    xRenderTransform	currentTransform;
-    CARD32		pad2 B32;
-    CARD16		pendingNbytesFilter B16;    /* number of bytes in filter name */
-    CARD16		pendingNparamsFilter B16;   /* number of filter params */
-    CARD16		currentNbytesFilter B16;    /* number of bytes in filter name */
-    CARD16		currentNparamsFilter B16;   /* number of filter params */
-} xRRGetCrtcTransformReply;
-
-#define sz_xRRGetCrtcTransformReply	96
-
-typedef struct {
-    CARD8	reqType;
-    CARD8	randrReqType;
-    CARD16	length B16;
-    Window	window B32;
-    RROutput	output B32;
-} xRRSetOutputPrimaryReq;
-#define sz_xRRSetOutputPrimaryReq	12
-
-typedef struct {
-    CARD8	reqType;
-    CARD8	randrReqType;
-    CARD16	length B16;
-    Window	window B32;
-} xRRGetOutputPrimaryReq;
-#define sz_xRRGetOutputPrimaryReq	8
-
-typedef struct {
-    BYTE	type;
-    CARD8	pad;
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    RROutput	output B32;
-    CARD32	pad1 B32;
-    CARD32	pad2 B32;
-    CARD32	pad3 B32;
-    CARD32	pad4 B32;
-    CARD32	pad5 B32;
-} xRRGetOutputPrimaryReply;
-#define sz_xRRGetOutputPrimaryReply	32
-
-/*
- * event
- */
-typedef struct {
-    CARD8 type;				/* always evBase + ScreenChangeNotify */
-    CARD8 rotation;			/* new rotation */
-    CARD16 sequenceNumber B16;
-    Time timestamp B32;			/* time screen was changed */
-    Time configTimestamp B32;		/* time config data was changed */
-    Window root B32;			/* root window */
-    Window window B32;			/* window requesting notification */
-    SizeID sizeID B16;			/* new size ID */
-    CARD16 subpixelOrder B16;		/* subpixel order */
-    CARD16 widthInPixels B16;		/* new size */
-    CARD16 heightInPixels B16;
-    CARD16 widthInMillimeters B16;
-    CARD16 heightInMillimeters B16;
-} xRRScreenChangeNotifyEvent;
-#define sz_xRRScreenChangeNotifyEvent	32
-
-typedef struct {
-    CARD8 type;				/* always evBase + RRNotify */
-    CARD8 subCode;			/* RRNotify_CrtcChange */
-    CARD16 sequenceNumber B16;
-    Time timestamp B32;			/* time crtc was changed */
-    Window window B32;			/* window requesting notification */
-    RRCrtc crtc B32;			/* affected CRTC */
-    RRMode mode B32;			/* current mode */
-    CARD16 rotation B16;		/* rotation and reflection */
-    CARD16 pad1 B16;			/* unused */
-    INT16 x B16;			/* new location */
-    INT16 y B16;
-    CARD16 width B16;			/* new size */
-    CARD16 height B16;
-} xRRCrtcChangeNotifyEvent;
-#define sz_xRRCrtcChangeNotifyEvent	32
-
-typedef struct {
-    CARD8 type;				/* always evBase + RRNotify */
-    CARD8 subCode;			/* RRNotify_OutputChange */
-    CARD16 sequenceNumber B16;
-    Time timestamp B32;			/* time output was changed */
-    Time configTimestamp B32;		/* time config was changed */
-    Window window B32;			/* window requesting notification */
-    RROutput output B32;		/* affected output */
-    RRCrtc crtc B32;			/* current crtc */
-    RRMode mode B32;			/* current mode */
-    CARD16 rotation B16;		/* rotation and reflection */
-    CARD8 connection;			/* connection status */
-    CARD8 subpixelOrder;		/* subpixel order */
-} xRROutputChangeNotifyEvent;
-#define sz_xRROutputChangeNotifyEvent	32
-
-typedef struct {
-    CARD8 type;				/* always evBase + RRNotify */
-    CARD8 subCode;			/* RRNotify_OutputProperty */
-    CARD16 sequenceNumber B16;
-    Window window B32;			/* window requesting notification */
-    RROutput output B32;		/* affected output */
-    Atom atom B32;			/* property name */
-    Time timestamp B32;			/* time crtc was changed */
-    CARD8 state;			/* NewValue or Deleted */
-    CARD8 pad1;
-    CARD16 pad2 B16;
-    CARD32 pad3 B32;
-    CARD32 pad4 B32;
-} xRROutputPropertyNotifyEvent;
-#define sz_xRROutputPropertyNotifyEvent	32
-
-typedef struct {
-    CARD8	reqType;
-    CARD8	randrReqType;
-    CARD16	length B16;
-    RRCrtc	crtc B32;
-} xRRGetPanningReq; 
-#define sz_xRRGetPanningReq		8
-
-typedef struct {
-    BYTE	type;
-    CARD8	status;
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    Time	timestamp B32;
-    CARD16	left B16;
-    CARD16	top B16;
-    CARD16	width B16;
-    CARD16	height B16;
-    CARD16	track_left B16;
-    CARD16	track_top B16;
-    CARD16	track_width B16;
-    CARD16	track_height B16;
-    INT16	border_left B16;
-    INT16	border_top B16;
-    INT16	border_right B16;
-    INT16	border_bottom B16;
-} xRRGetPanningReply;
-#define sz_xRRGetPanningReply		36
-
-typedef struct {
-    CARD8	reqType;
-    CARD8	randrReqType;
-    CARD16	length B16;
-    RRCrtc	crtc B32;
-    Time	timestamp B32;
-    CARD16	left B16;
-    CARD16	top B16;
-    CARD16	width B16;
-    CARD16	height B16;
-    CARD16	track_left B16;
-    CARD16	track_top B16;
-    CARD16	track_width B16;
-    CARD16	track_height B16;
-    INT16	border_left B16;
-    INT16	border_top B16;
-    INT16	border_right B16;
-    INT16	border_bottom B16;
-} xRRSetPanningReq; 
-#define sz_xRRSetPanningReq		36
-
-typedef struct {
-    BYTE	type;
-    CARD8	status;
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    Time	newTimestamp B32;
-    CARD32      pad1 B32;
-    CARD32      pad2 B32;
-    CARD32      pad3 B32;
-    CARD32      pad4 B32;
-    CARD32      pad5 B32;
-} xRRSetPanningReply;
-#define sz_xRRSetPanningReply	32
-
-#undef RRModeFlags
-#undef RRCrtc
-#undef RRMode
-#undef RROutput
-#undef RRMode
-#undef RRCrtc
-#undef Drawable
-#undef Window
-#undef Font
-#undef Pixmap
-#undef Cursor
-#undef Colormap
-#undef GContext
-#undef Atom
-#undef Time
-#undef KeyCode
-#undef KeySym
-#undef Rotation
-#undef SizeID
-#undef SubpixelOrder
-
-#endif /* _XRANDRP_H_ */
+/*

+ * Copyright © 2000 Compaq Computer Corporation

+ * Copyright © 2002 Hewlett-Packard Company

+ * Copyright © 2006 Intel Corporation

+ * Copyright © 2008 Red Hat, Inc.

+ *

+ * Permission to use, copy, modify, distribute, and sell this software and its

+ * documentation for any purpose is hereby granted without fee, provided that

+ * the above copyright notice appear in all copies and that both that copyright

+ * notice and this permission notice appear in supporting documentation, and

+ * that the name of the copyright holders not be used in advertising or

+ * publicity pertaining to distribution of the software without specific,

+ * written prior permission.  The copyright holders make no representations

+ * about the suitability of this software for any purpose.  It is provided "as

+ * is" without express or implied warranty.

+ *

+ * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO

+ * EVENT SHALL THE COPYRIGHT HOLDERS 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:  Jim Gettys, Hewlett-Packard Company, Inc.

+ *	    Keith Packard, Intel Corporation

+ */

+

+/* note that RANDR 1.0 is incompatible with version 0.0, or 0.1 */

+/* V1.0 removes depth switching from the protocol */

+#ifndef _XRANDRP_H_

+#define _XRANDRP_H_

+

+#include <X11/extensions/randr.h>

+#include <X11/extensions/renderproto.h>

+

+#define Window CARD32

+#define Drawable CARD32

+#define Font CARD32

+#define Pixmap CARD32

+#define Cursor CARD32

+#define Colormap CARD32

+#define GContext CARD32

+#define Atom CARD32

+#define Time CARD32

+#define KeyCode CARD8

+#define KeySym CARD32

+#define RROutput CARD32

+#define RRMode CARD32

+#define RRCrtc CARD32

+#define RRModeFlags CARD32

+#define PictFormat CARD32

+

+#define Rotation CARD16

+#define SizeID CARD16

+#define SubpixelOrder CARD16

+

+/*

+ * data structures

+ */

+

+typedef struct {

+    CARD16 widthInPixels B16;

+    CARD16 heightInPixels B16;

+    CARD16 widthInMillimeters B16;

+    CARD16 heightInMillimeters B16;

+} xScreenSizes;

+#define sz_xScreenSizes 8

+

+/* 

+ * requests and replies

+ */

+

+typedef struct {

+    CARD8   reqType;

+    CARD8   randrReqType;

+    CARD16  length B16;

+    CARD32  majorVersion B32;

+    CARD32  minorVersion B32;

+} xRRQueryVersionReq;

+#define sz_xRRQueryVersionReq   12

+

+typedef struct {

+    BYTE    type;   /* X_Reply */

+    BYTE    pad1;

+    CARD16  sequenceNumber B16;

+    CARD32  length B32;

+    CARD32  majorVersion B32;

+    CARD32  minorVersion B32;

+    CARD32  pad2 B32;

+    CARD32  pad3 B32;

+    CARD32  pad4 B32;

+    CARD32  pad5 B32;

+} xRRQueryVersionReply;

+#define sz_xRRQueryVersionReply	32

+

+typedef struct {

+    CARD8   reqType;

+    CARD8   randrReqType;

+    CARD16  length B16;

+    Window  window B32;

+} xRRGetScreenInfoReq;

+#define sz_xRRGetScreenInfoReq   8

+

+/* 

+ * the xRRScreenInfoReply structure is followed by:

+ *

+ * the size information

+ */

+

+

+typedef struct {

+    BYTE    type;   /* X_Reply */

+    BYTE    setOfRotations;

+    CARD16  sequenceNumber B16;

+    CARD32  length B32;

+    Window  root B32;

+    Time    timestamp B32;

+    Time    configTimestamp B32;

+    CARD16  nSizes B16;

+    SizeID  sizeID B16;

+    Rotation  rotation B16;

+    CARD16  rate B16;

+    CARD16  nrateEnts B16;

+    CARD16  pad B16;

+} xRRGetScreenInfoReply;

+#define sz_xRRGetScreenInfoReply	32

+

+typedef struct {

+    CARD8    reqType;

+    CARD8    randrReqType;

+    CARD16   length B16;

+    Drawable drawable B32;

+    Time     timestamp B32;

+    Time     configTimestamp B32;

+    SizeID   sizeID B16;

+    Rotation rotation B16;

+} xRR1_0SetScreenConfigReq;

+#define sz_xRR1_0SetScreenConfigReq   20

+

+typedef struct {

+    CARD8    reqType;

+    CARD8    randrReqType;

+    CARD16   length B16;

+    Drawable drawable B32;

+    Time     timestamp B32;

+    Time     configTimestamp B32;

+    SizeID   sizeID B16;

+    Rotation rotation B16;

+    CARD16   rate B16;

+    CARD16   pad B16;

+} xRRSetScreenConfigReq;

+#define sz_xRRSetScreenConfigReq   24

+

+typedef struct {

+    BYTE    type;   /* X_Reply */

+    CARD8   status;

+    CARD16  sequenceNumber B16;

+    CARD32  length B32;

+    Time    newTimestamp B32;  

+    Time    newConfigTimestamp B32;

+    Window  root;

+    CARD16  subpixelOrder B16;

+    CARD16  pad4 B16;

+    CARD32  pad5 B32;

+    CARD32  pad6 B32;

+} xRRSetScreenConfigReply;

+#define sz_xRRSetScreenConfigReply 32

+

+typedef struct {

+    CARD8   reqType;

+    CARD8   randrReqType;

+    CARD16  length B16;

+    Window  window B32;

+    CARD16  enable B16;

+    CARD16  pad2 B16;

+} xRRSelectInputReq;

+#define sz_xRRSelectInputReq   12

+

+/*

+ * Additions for version 1.2

+ */

+

+typedef struct _xRRModeInfo {

+    RRMode		id B32;

+    CARD16		width B16;

+    CARD16		height B16;

+    CARD32		dotClock B32;

+    CARD16		hSyncStart B16;

+    CARD16		hSyncEnd B16;

+    CARD16		hTotal B16;

+    CARD16		hSkew B16;

+    CARD16		vSyncStart B16;

+    CARD16		vSyncEnd B16;

+    CARD16		vTotal B16;

+    CARD16		nameLength B16;

+    RRModeFlags		modeFlags B32;

+} xRRModeInfo;

+#define sz_xRRModeInfo		    32

+

+typedef struct {

+    CARD8   reqType;

+    CARD8   randrReqType;

+    CARD16  length B16;

+    Window  window B32;

+} xRRGetScreenSizeRangeReq;

+#define sz_xRRGetScreenSizeRangeReq 8

+

+typedef struct {

+    BYTE    type;   /* X_Reply */

+    CARD8   pad;

+    CARD16  sequenceNumber B16;

+    CARD32  length B32;

+    CARD16  minWidth B16;

+    CARD16  minHeight B16;

+    CARD16  maxWidth B16;

+    CARD16  maxHeight B16;

+    CARD32  pad0 B32;

+    CARD32  pad1 B32;

+    CARD32  pad2 B32;

+    CARD32  pad3 B32;

+} xRRGetScreenSizeRangeReply;

+#define sz_xRRGetScreenSizeRangeReply 32

+

+typedef struct {

+    CARD8   reqType;

+    CARD8   randrReqType;

+    CARD16  length B16;

+    Window  window B32;

+    CARD16  width B16;

+    CARD16  height B16;

+    CARD32  widthInMillimeters B32;

+    CARD32  heightInMillimeters B32;

+} xRRSetScreenSizeReq;

+#define sz_xRRSetScreenSizeReq	    20

+

+typedef struct {

+    CARD8   reqType;

+    CARD8   randrReqType;

+    CARD16  length B16;

+    Window  window B32;

+} xRRGetScreenResourcesReq;

+#define sz_xRRGetScreenResourcesReq 8

+

+typedef struct {

+    BYTE	type;

+    CARD8	pad;

+    CARD16	sequenceNumber B16;

+    CARD32	length B32;

+    Time	timestamp B32;

+    Time	configTimestamp B32;

+    CARD16	nCrtcs B16;

+    CARD16	nOutputs B16;

+    CARD16	nModes B16;

+    CARD16	nbytesNames B16;

+    CARD32	pad1 B32;

+    CARD32	pad2 B32;

+} xRRGetScreenResourcesReply;

+#define sz_xRRGetScreenResourcesReply	32

+

+typedef struct {

+    CARD8	reqType;

+    CARD8	randrReqType;

+    CARD16	length B16;

+    RROutput	output B32;

+    Time	configTimestamp B32;

+} xRRGetOutputInfoReq;

+#define sz_xRRGetOutputInfoReq		12

+

+typedef struct {

+    BYTE	type;

+    CARD8	status;

+    CARD16	sequenceNumber B16;

+    CARD32	length B32;

+    Time	timestamp B32;

+    RRCrtc	crtc B32;

+    CARD32	mmWidth B32;

+    CARD32	mmHeight B32;

+    CARD8	connection;

+    CARD8	subpixelOrder;

+    CARD16	nCrtcs B16;

+    CARD16	nModes B16;

+    CARD16	nPreferred B16;

+    CARD16	nClones B16;

+    CARD16	nameLength B16;

+} xRRGetOutputInfoReply;

+#define sz_xRRGetOutputInfoReply	36

+

+typedef struct {

+    CARD8	reqType;

+    CARD8	randrReqType;

+    CARD16	length B16;

+    RROutput	output B32;

+} xRRListOutputPropertiesReq; 

+#define sz_xRRListOutputPropertiesReq	8

+

+typedef struct {

+    BYTE	type;

+    CARD8	pad0;

+    CARD16	sequenceNumber B16;

+    CARD32	length B32;

+    CARD16	nAtoms B16;

+    CARD16	pad1 B16;

+    CARD32	pad2 B32;

+    CARD32	pad3 B32;

+    CARD32	pad4 B32;

+    CARD32	pad5 B32;

+    CARD32	pad6 B32;

+} xRRListOutputPropertiesReply;

+#define sz_xRRListOutputPropertiesReply	32

+

+typedef struct {

+    CARD8	reqType;

+    CARD8	randrReqType;

+    CARD16	length B16;

+    RROutput	output B32;

+    Atom	property B32;

+} xRRQueryOutputPropertyReq; 

+#define sz_xRRQueryOutputPropertyReq	12

+

+typedef struct {

+    BYTE	type;

+    BYTE	pad0;

+    CARD16	sequenceNumber B16;

+    CARD32	length B32;

+    BOOL	pending;

+    BOOL	range;

+    BOOL	immutable;

+    BYTE	pad1;

+    CARD32	pad2 B32;

+    CARD32	pad3 B32;

+    CARD32	pad4 B32;

+    CARD32	pad5 B32;

+    CARD32	pad6 B32;

+} xRRQueryOutputPropertyReply;

+#define sz_xRRQueryOutputPropertyReply	32

+

+typedef struct {

+    CARD8	reqType;

+    CARD8	randrReqType;

+    CARD16	length B16;

+    RROutput	output B32;

+    Atom	property B32;

+    BOOL	pending;

+    BOOL	range;

+    CARD16	pad B16;

+} xRRConfigureOutputPropertyReq; 

+#define sz_xRRConfigureOutputPropertyReq	16

+

+typedef struct {

+    CARD8	reqType;

+    CARD8	randrReqType;

+    CARD16	length B16;

+    RROutput	output B32;

+    Atom	property B32;

+    Atom	type B32;

+    CARD8	format;

+    CARD8	mode;

+    CARD16	pad;

+    CARD32	nUnits B32;

+} xRRChangeOutputPropertyReq;

+#define sz_xRRChangeOutputPropertyReq	24

+

+typedef struct {

+    CARD8	reqType;

+    CARD8	randrReqType;

+    CARD16	length B16;

+    RROutput	output B32;

+    Atom	property B32;

+} xRRDeleteOutputPropertyReq;

+#define sz_xRRDeleteOutputPropertyReq	12

+

+typedef struct {

+    CARD8	reqType;

+    CARD8	randrReqType;

+    CARD16	length B16;

+    RROutput	output B32;

+    Atom	property B32;

+    Atom	type B32;

+    CARD32	longOffset B32;

+    CARD32	longLength B32;

+#ifdef __cplusplus

+    BOOL	_delete;

+#else

+    BOOL	delete;

+#endif

+    BOOL	pending;

+    CARD16	pad1 B16;

+} xRRGetOutputPropertyReq;

+#define sz_xRRGetOutputPropertyReq	28

+

+typedef struct {

+    BYTE	type;

+    CARD8	format;

+    CARD16	sequenceNumber B16;

+    CARD32	length B32;

+    Atom	propertyType B32;

+    CARD32	bytesAfter B32;

+    CARD32	nItems B32;

+    CARD32	pad1 B32;

+    CARD32	pad2 B32;

+    CARD32	pad3 B32;

+} xRRGetOutputPropertyReply;

+#define sz_xRRGetOutputPropertyReply	32

+

+typedef struct {

+    CARD8	reqType;

+    CARD8	randrReqType;

+    CARD16	length B16;

+    Window	window B32;

+    xRRModeInfo	modeInfo;

+} xRRCreateModeReq; 

+#define sz_xRRCreateModeReq		40

+

+typedef struct {

+    BYTE	type;

+    CARD8	pad0;

+    CARD16	sequenceNumber B16;

+    CARD32	length B32;

+    RRMode	mode B32;

+    CARD32	pad1 B32;

+    CARD32	pad2 B32;

+    CARD32	pad3 B32;

+    CARD32	pad4 B32;

+    CARD32	pad5 B32;

+} xRRCreateModeReply;

+#define sz_xRRCreateModeReply		32

+

+typedef struct {

+    CARD8	reqType;

+    CARD8	randrReqType;

+    CARD16	length B16;

+    RRMode	mode B32;

+} xRRDestroyModeReq;

+#define sz_xRRDestroyModeReq		8

+

+typedef struct {

+    CARD8	reqType;

+    CARD8	randrReqType;

+    CARD16	length B16;

+    RROutput	output B32;

+    RRMode	mode B32;

+} xRRAddOutputModeReq;

+#define sz_xRRAddOutputModeReq		12

+

+typedef struct {

+    CARD8	reqType;

+    CARD8	randrReqType;

+    CARD16	length B16;

+    RROutput	output B32;

+    RRMode	mode B32;

+} xRRDeleteOutputModeReq;

+#define sz_xRRDeleteOutputModeReq	12

+

+typedef struct {

+    CARD8	reqType;

+    CARD8	randrReqType;

+    CARD16	length B16;

+    RRCrtc	crtc B32;

+    Time	configTimestamp B32;

+} xRRGetCrtcInfoReq; 

+#define sz_xRRGetCrtcInfoReq		12

+

+typedef struct {

+    BYTE	type;

+    CARD8	status;

+    CARD16	sequenceNumber B16;

+    CARD32	length B32;

+    Time	timestamp B32;

+    INT16	x B16;

+    INT16	y B16;

+    CARD16	width B16;

+    CARD16	height B16;

+    RRMode	mode B32;

+    Rotation	rotation B16;

+    Rotation	rotations B16;

+    CARD16	nOutput B16;

+    CARD16	nPossibleOutput B16;

+} xRRGetCrtcInfoReply;

+#define sz_xRRGetCrtcInfoReply		32

+

+typedef struct {

+    CARD8	reqType;

+    CARD8	randrReqType;

+    CARD16	length B16;

+    RRCrtc	crtc B32;

+    Time	timestamp B32;

+    Time    	configTimestamp B32;

+    INT16	x B16;

+    INT16	y B16;

+    RRMode	mode B32;

+    Rotation	rotation B16;

+    CARD16	pad B16;

+} xRRSetCrtcConfigReq; 

+#define sz_xRRSetCrtcConfigReq		28

+

+typedef struct {

+    BYTE	type;

+    CARD8	status;

+    CARD16	sequenceNumber B16;

+    CARD32	length B32;

+    Time	newTimestamp B32;

+    CARD32	pad1 B32;

+    CARD32	pad2 B16;

+    CARD32	pad3 B32;

+    CARD32	pad4 B32;

+    CARD32	pad5 B32;

+} xRRSetCrtcConfigReply;

+#define sz_xRRSetCrtcConfigReply	32

+

+typedef struct {

+    CARD8	reqType;

+    CARD8	randrReqType;

+    CARD16	length B16;

+    RRCrtc	crtc B32;

+} xRRGetCrtcGammaSizeReq; 

+#define sz_xRRGetCrtcGammaSizeReq	8

+

+typedef struct {

+    BYTE	type;

+    CARD8	status;

+    CARD16	sequenceNumber B16;

+    CARD32	length B32;

+    CARD16	size B16;

+    CARD16	pad1 B16;

+    CARD32	pad2 B32;

+    CARD32	pad3 B32;

+    CARD32	pad4 B32;

+    CARD32	pad5 B32;

+    CARD32	pad6 B32;

+} xRRGetCrtcGammaSizeReply;

+#define sz_xRRGetCrtcGammaSizeReply	32

+

+typedef struct {

+    CARD8	reqType;

+    CARD8	randrReqType;

+    CARD16	length B16;

+    RRCrtc	crtc B32;

+} xRRGetCrtcGammaReq; 

+#define sz_xRRGetCrtcGammaReq		8

+

+typedef struct {

+    BYTE	type;

+    CARD8	status;

+    CARD16	sequenceNumber B16;

+    CARD32	length B32;

+    CARD16	size B16;

+    CARD16	pad1 B16;

+    CARD32	pad2 B32;

+    CARD32	pad3 B32;

+    CARD32	pad4 B32;

+    CARD32	pad5 B32;

+    CARD32	pad6 B32;

+} xRRGetCrtcGammaReply;

+#define sz_xRRGetCrtcGammaReply		32

+

+typedef struct {

+    CARD8	reqType;

+    CARD8	randrReqType;

+    CARD16	length B16;

+    RRCrtc	crtc B32;

+    CARD16	size B16;

+    CARD16	pad1 B16;

+} xRRSetCrtcGammaReq;

+#define sz_xRRSetCrtcGammaReq		12

+

+/*

+ * Additions for V1.3

+ */

+

+typedef xRRGetScreenResourcesReq xRRGetScreenResourcesCurrentReq;

+

+#define sz_xRRGetScreenResourcesCurrentReq sz_xRRGetScreenResourcesReq

+

+typedef xRRGetScreenResourcesReply xRRGetScreenResourcesCurrentReply;

+#define sz_xRRGetScreenResourcesCurrentReply	sz_xRRGetScreenResourcesReply

+

+typedef struct {

+    CARD8		reqType;

+    CARD8		randrReqType;

+    CARD16		length B16;

+    RRCrtc		crtc B32;

+    xRenderTransform	transform;

+    CARD16		nbytesFilter;	/* number of bytes in filter name */

+    CARD16		pad B16;

+} xRRSetCrtcTransformReq;

+

+#define sz_xRRSetCrtcTransformReq	48

+

+typedef struct {

+    CARD8		reqType;

+    CARD8		randrReqType;

+    CARD16		length B16;

+    RRCrtc		crtc B32;

+} xRRGetCrtcTransformReq;

+

+#define sz_xRRGetCrtcTransformReq	8

+

+typedef struct {

+    BYTE		type;

+    CARD8		status;

+    CARD16		sequenceNumber B16;

+    CARD32		length B32;

+    xRenderTransform	pendingTransform;

+    BYTE		hasTransforms;

+    CARD8		pad0;

+    CARD16		pad1 B16;

+    xRenderTransform	currentTransform;

+    CARD32		pad2 B32;

+    CARD16		pendingNbytesFilter B16;    /* number of bytes in filter name */

+    CARD16		pendingNparamsFilter B16;   /* number of filter params */

+    CARD16		currentNbytesFilter B16;    /* number of bytes in filter name */

+    CARD16		currentNparamsFilter B16;   /* number of filter params */

+} xRRGetCrtcTransformReply;

+

+#define sz_xRRGetCrtcTransformReply	96

+

+typedef struct {

+    CARD8	reqType;

+    CARD8	randrReqType;

+    CARD16	length B16;

+    Window	window B32;

+    RROutput	output B32;

+} xRRSetOutputPrimaryReq;

+#define sz_xRRSetOutputPrimaryReq	12

+

+typedef struct {

+    CARD8	reqType;

+    CARD8	randrReqType;

+    CARD16	length B16;

+    Window	window B32;

+} xRRGetOutputPrimaryReq;

+#define sz_xRRGetOutputPrimaryReq	8

+

+typedef struct {

+    BYTE	type;

+    CARD8	pad;

+    CARD16	sequenceNumber B16;

+    CARD32	length B32;

+    RROutput	output B32;

+    CARD32	pad1 B32;

+    CARD32	pad2 B32;

+    CARD32	pad3 B32;

+    CARD32	pad4 B32;

+    CARD32	pad5 B32;

+} xRRGetOutputPrimaryReply;

+#define sz_xRRGetOutputPrimaryReply	32

+

+/*

+ * Additions for 1.4

+ */

+

+typedef struct {

+    PictFormat format B32;

+    CARD16 maxWidth B16, maxHeight B16;

+    Rotation rotations B16;

+    CARD16 pad0 B16;

+    CARD32 pad1 B32;

+} xRRScanoutPixmapInfo;

+#define sz_xRRScanoutPixmapInfo	16

+

+typedef struct {

+    RRCrtc crtc B32;

+    INT16 x B16, y B16;

+    RRMode mode B32;

+    Rotation rotation B16;

+    CARD16 nOutput B16;

+    xRenderTransform spritePositionTransform;

+    xRenderTransform spriteImageTransform;

+    Pixmap pixmap B32;

+    INT16 xPixmap B16, yPixmap B16;

+} xRRCrtcConfig;

+#define sz_xRRCrtcConfig (2*sz_xRenderTransform + 24)

+

+typedef struct {

+    CARD8 reqType;

+    CARD8 randrReqType;

+    CARD16 length B16;

+    Drawable drawable B32;

+} xRRQueryScanoutPixmapsReq;

+#define sz_xRRQueryScanoutPixmapsReq	8

+

+typedef struct {

+    BYTE	type;

+    CARD8	pad;

+    CARD16	sequenceNumber B16;

+    CARD32	length B32;

+    CARD32	pad0 B32;

+    CARD32	pad1 B32;

+    CARD32	pad2 B32;

+    CARD32	pad3 B32;

+    CARD32	pad4 B32;

+    CARD32	pad5 B32;

+} xRRQueryScanoutPixmapsReply;

+#define sz_xRRQueryScanoutPixmapsReply	32

+

+typedef struct {

+    CARD8 reqType;

+    CARD8 randrReqType;

+    CARD16 length B16;

+    Pixmap pid B32;

+    Drawable drawable B32;

+    CARD16 width B16, height B16;

+    PictFormat format B32;

+    Rotation rotations B16;

+    CARD16 pad B16;

+} xRRCreateScanoutPixmapReq;

+#define sz_xRRCreateScanoutPixmapReq	24

+

+typedef struct {

+    CARD8 reqType;

+    CARD8 randrReqType;

+    CARD16 length B16;

+    RRCrtc crtc B32;

+    xRenderTransform positionTransform;

+    xRenderTransform imageTransform;

+} xRRSetCrtcSpriteTransformReq;

+#define sz_xRRSetCrtcSpriteTransformReq	(2*sz_xRenderTransform + 8)

+

+typedef struct {

+    CARD8 reqType;

+    CARD8 randrReqType;

+    CARD16 length B16;

+    RRCrtc crtc B32;

+} xRRGetCrtcSpriteTransformReq;

+#define sz_xRRGetCrtcSpriteTransformReq	8

+

+typedef struct {

+    BYTE type;

+    CARD8 pad;

+    CARD16 sequenceNumber B16;

+    CARD32 length B32;

+    xRenderTransform positionTransform;

+    xRenderTransform imageTransform;

+} xRRGetCrtcSpriteTransformReply;

+#define sz_xRRGetCrtcSpriteTransformReply	(2*sz_xRenderTransform + 8)

+

+typedef struct {

+    CARD8 reqType;

+    CARD8 randrReqType;

+    CARD16 length B16;

+    Drawable drawable B32;

+    CARD16 screenPixmapWidth B16, screenPixmapHeight B16;

+    CARD16 screenWidth B16, screenHeight B16;

+    CARD32 widthInMillimeters B32;

+    CARD32 heightInMillimeters B32;

+    CARD16 nConfigs B16;

+    CARD16 pad0 B16;

+    CARD32 pad1 B32;

+} xRRSetCrtcConfigsReq;

+#define sz_xRRSetCrtcConfigsReq 32

+

+typedef struct {

+    BYTE	type;

+    CARD8	status;

+    CARD16	sequenceNumber B16;

+    CARD32	length B32;

+    CARD32	pad0 B32;

+    CARD32	pad1 B32;

+    CARD32	pad2 B16;

+    CARD32	pad3 B32;

+    CARD32	pad4 B32;

+    CARD32	pad5 B32;

+} xRRSetCrtcConfigsReply;

+#define sz_xRRSetCrtcConfigsReply	32

+

+/*

+ * event

+ */

+typedef struct {

+    CARD8 type;				/* always evBase + ScreenChangeNotify */

+    CARD8 rotation;			/* new rotation */

+    CARD16 sequenceNumber B16;

+    Time timestamp B32;			/* time screen was changed */

+    Time configTimestamp B32;		/* time config data was changed */

+    Window root B32;			/* root window */

+    Window window B32;			/* window requesting notification */

+    SizeID sizeID B16;			/* new size ID */

+    CARD16 subpixelOrder B16;		/* subpixel order */

+    CARD16 widthInPixels B16;		/* new size */

+    CARD16 heightInPixels B16;

+    CARD16 widthInMillimeters B16;

+    CARD16 heightInMillimeters B16;

+} xRRScreenChangeNotifyEvent;

+#define sz_xRRScreenChangeNotifyEvent	32

+

+typedef struct {

+    CARD8 type;				/* always evBase + RRNotify */

+    CARD8 subCode;			/* RRNotify_CrtcChange */

+    CARD16 sequenceNumber B16;

+    Time timestamp B32;			/* time crtc was changed */

+    Window window B32;			/* window requesting notification */

+    RRCrtc crtc B32;			/* affected CRTC */

+    RRMode mode B32;			/* current mode */

+    CARD16 rotation B16;		/* rotation and reflection */

+    CARD16 pad1 B16;			/* unused */

+    INT16 x B16;			/* new location */

+    INT16 y B16;

+    CARD16 width B16;			/* new size */

+    CARD16 height B16;

+} xRRCrtcChangeNotifyEvent;

+#define sz_xRRCrtcChangeNotifyEvent	32

+

+typedef struct {

+    CARD8 type;				/* always evBase + RRNotify */

+    CARD8 subCode;			/* RRNotify_OutputChange */

+    CARD16 sequenceNumber B16;

+    Time timestamp B32;			/* time output was changed */

+    Time configTimestamp B32;		/* time config was changed */

+    Window window B32;			/* window requesting notification */

+    RROutput output B32;		/* affected output */

+    RRCrtc crtc B32;			/* current crtc */

+    RRMode mode B32;			/* current mode */

+    CARD16 rotation B16;		/* rotation and reflection */

+    CARD8 connection;			/* connection status */

+    CARD8 subpixelOrder;		/* subpixel order */

+} xRROutputChangeNotifyEvent;

+#define sz_xRROutputChangeNotifyEvent	32

+

+typedef struct {

+    CARD8 type;				/* always evBase + RRNotify */

+    CARD8 subCode;			/* RRNotify_OutputProperty */

+    CARD16 sequenceNumber B16;

+    Window window B32;			/* window requesting notification */

+    RROutput output B32;		/* affected output */

+    Atom atom B32;			/* property name */

+    Time timestamp B32;			/* time crtc was changed */

+    CARD8 state;			/* NewValue or Deleted */

+    CARD8 pad1;

+    CARD16 pad2 B16;

+    CARD32 pad3 B32;

+    CARD32 pad4 B32;

+} xRROutputPropertyNotifyEvent;

+#define sz_xRROutputPropertyNotifyEvent	32

+

+typedef struct {

+    CARD8	reqType;

+    CARD8	randrReqType;

+    CARD16	length B16;

+    RRCrtc	crtc B32;

+} xRRGetPanningReq; 

+#define sz_xRRGetPanningReq		8

+

+typedef struct {

+    BYTE	type;

+    CARD8	status;

+    CARD16	sequenceNumber B16;

+    CARD32	length B32;

+    Time	timestamp B32;

+    CARD16	left B16;

+    CARD16	top B16;

+    CARD16	width B16;

+    CARD16	height B16;

+    CARD16	track_left B16;

+    CARD16	track_top B16;

+    CARD16	track_width B16;

+    CARD16	track_height B16;

+    INT16	border_left B16;

+    INT16	border_top B16;

+    INT16	border_right B16;

+    INT16	border_bottom B16;

+} xRRGetPanningReply;

+#define sz_xRRGetPanningReply		36

+

+typedef struct {

+    CARD8	reqType;

+    CARD8	randrReqType;

+    CARD16	length B16;

+    RRCrtc	crtc B32;

+    Time	timestamp B32;

+    CARD16	left B16;

+    CARD16	top B16;

+    CARD16	width B16;

+    CARD16	height B16;

+    CARD16	track_left B16;

+    CARD16	track_top B16;

+    CARD16	track_width B16;

+    CARD16	track_height B16;

+    INT16	border_left B16;

+    INT16	border_top B16;

+    INT16	border_right B16;

+    INT16	border_bottom B16;

+} xRRSetPanningReq; 

+#define sz_xRRSetPanningReq		36

+

+typedef struct {

+    BYTE	type;

+    CARD8	status;

+    CARD16	sequenceNumber B16;

+    CARD32	length B32;

+    Time	newTimestamp B32;

+    CARD32      pad1 B32;

+    CARD32      pad2 B32;

+    CARD32      pad3 B32;

+    CARD32      pad4 B32;

+    CARD32      pad5 B32;

+} xRRSetPanningReply;

+#define sz_xRRSetPanningReply	32

+

+#undef PictFormat

+#undef RRModeFlags

+#undef RRCrtc

+#undef RRMode

+#undef RROutput

+#undef RRMode

+#undef RRCrtc

+#undef Drawable

+#undef Window

+#undef Font

+#undef Pixmap

+#undef Cursor

+#undef Colormap

+#undef GContext

+#undef Atom

+#undef Time

+#undef KeyCode

+#undef KeySym

+#undef Rotation

+#undef SizeID

+#undef SubpixelOrder

+

+#endif /* _XRANDRP_H_ */

diff --git a/X11/extensions/randrproto.txt b/X11/extensions/randrproto.txt
index c56bd5f29..9fe800f0c 100644
--- a/X11/extensions/randrproto.txt
+++ b/X11/extensions/randrproto.txt
@@ -1,2379 +1,2577 @@
-	       The X Resize, Rotate and Reflect Extension
-			     Version 1.3.1
-			       2009-10-5
-
-			      Jim Gettys
-			   Jim.Gettys@hp.com
-		     Cambridge Research Laboratory
-				HP Labs
-			Hewlett Packard Company
-
-			     Keith Packard
-			keith.packard@intel.com
-		     Open Source Technology Center
-			   Intel Corporation
-
-1. Introduction
-
-The X Resize, Rotate and Reflect Extension, called RandR for short,
-brings the ability to resize, rotate and reflect the root window of a
-screen. It is based on the X Resize and Rotate Extension as specified
-in the Proceedings of the 2001 Usenix Technical Conference [RANDR].
-
-RandR as implemented and integrated into the X server differs in
-one substantial fashion from the design discussed in that paper: that
-is, RandR 1.0 does not implement the depth switching described in that
-document, and the support described for that in the protocol in that
-document and in the implementation has been removed from the
-protocol described here, as it has been overtaken by events.
-
-These events include:
-      ► Modern toolkits (in this case, GTK+ 2.x) have progressed to the point
-        of implementing migration between screens of arbitrary depths
-      ► The continued advance of Moore's law has made limited amounts of VRAM
-        less of an issue, reducing the pressure to implement depth switching
-	on laptops or desktop systems
-      ► The continued decline of legacy toolkits whose design would have
-        required depth switching to support migration
-      ► The lack of depth switching implementation experience in the
-        intervening time, due to events beyond our control
-
-Additionally, the requirement to support depth switching might
-complicate other re-engineering of the device independent part of the
-X server that is currently being contemplated.
-
-Rather than further delaying RandR's widespread deployment for a feature
-long wanted by the community (resizing of screens, particularly on laptops),
-or the deployment of a protocol design that might be flawed due to lack of
-implementation experience, we decided to remove depth switching from the
-protocol. It may be implemented at a later time if resources and
-interests permit as a revision to the protocol described here, which will
-remain a stable base for applications. The protocol described here has been
-implemented in the main X.org server, and more fully in the hw/kdrive
-implementation in the distribution, which fully implements resizing,
-rotation and reflection.
-
-1.2 Introduction to version 1.2 of the extension
-
-One of the significant limitations found in version 1.1 of the RandR
-protocol was the inability to deal with the Xinerama model where multiple
-monitors display portions of a common underlying screen. In this environment,
-zero or more video outputs are associated with each CRT controller which
-defines both a set of video timings and a 'viewport' within the larger
-screen. This viewport is independent of the overall size of the screen, and
-may be located anywhere within the screen.
-
-The effect is to decouple the reported size of the screen from the size
-presented by each video output, and to permit multiple outputs to present
-information for a single screen.
-
-To extend RandR for this model, we separate out the output, CRTC and screen
-configuration information and permit them to be configured separately. For
-compatibility with the 1.1 version of the protocol, we make the 1.1 requests
-simultaneously affect both the screen and the (presumably sole) CRTC and
-output. The set of available outputs are presented with UTF-8 encoded names
-and may be connected to CRTCs as permitted by the underlying hardware. CRTC
-configuration is now done with full mode information instead of just size
-and refresh rate, and these modes have names. These names also use UTF-8
-encoding. New modes may also be added by the user.
-
-Additional requests and events are provided for this new functionality.
-
-       ┌────────────────────────────────┬──────────┐
-    ┏━━━━━━━┳───────────────┐       ╔════════╗ ╔════════╗
-    ┃   1   ┃               │       ║   A    ║ ║   B    ║
-    ┃   ┏━━━╋━━━━━━━━━━━━━━━┫       ║        ║ ║        ║
-    ┣━━━╋━━━┛               ┃       ╚════════╝ ╚════════╝
-    │   ┃         2         ┃─────────────────┐
-    │   ┃                   ┃        ╔═══════════════════╗
-    │   ┃                   ┃        ║                   ║
-    │   ┗━━━━━━━━━━━━━━━━━━━┫        ║        C          ║
-    └───────────────────────┘        ║                   ║
-    ┌──────┐  ┏━━━━┓  ╔══════╗       ║                   ║
-    │screen│  ┃CRTC┃  ║output║       ╚═══════════════════╝
-    └──────┘  ┗━━━━┛  ╚══════╝
-
-In this picture, the screen is covered (incompletely) by two CRTCs. CRTC1
-is connected to two outputs, A and B. CRTC2 is connected to output C.
-Outputs A and B will present exactly the same region of the screen using
-the same mode line. Output C will present a different (larger) region of
-the screen using a different mode line.
-
-RandR provides information about each available CRTC and output; the
-connection between CRTC and output is under application control, although
-the hardware will probably impose restrictions on the possible
-configurations. The protocol doesn't try to describe these restrictions,
-instead it provides a mechanism to find out what combinations are supported.
-
-For instance, dual-link DVI gangs two CRTC outputs together to provide higher
-bandwidth for large resolution screens. This is exposed in RandR by
-requiring that nothing be connected to the second CRTC when driving a high
-resolution screen on the first.
-
-1.3 Introduction to version 1.3 of the extension
-
-Version 1.3 builds on the changes made with version 1.2 and adds some new
-capabilities without fundmentally changing the extension again. The
-following features are added in this version:
-
-   • Projective Transforms. The implementation work for general rotation
-     support made it trivial to add full projective transformations. These
-     can be used to scale the screen up/down as well as perform projector
-     keystone correct or other effects.
-
-   • Panning. It was removed with RandR 1.2 because the old semantics didn't
-     fit any longer. With RandR 1.3 panning can be specified per crtc.
-
-1.1 Acknowledgements
-
-Our thanks to the contributors to the design found on the xpert mailing
-list, in particular:
-
-Alan Hourihane for work on the early implementation
-Andrew C. Aitchison for help with the XFree86 DDX implementation
-Andy Ritger for early questions about how mergefb/Xinerama work with RandR
-Carl Worth for editing the specification and Usenix paper
-David Dawes for XFree86 DDX integration work
-Thomas Winischhofer for the hardware-accelerated SiS rotation implementation
-Matthew Tippett and Kevin Martin for splitting outputs and CRTCs to more
-fully expose what video hardware can do
-
-                              ❧❧❧❧❧❧❧❧❧❧❧
-
-2. Screen change model
-
-Screens may change dynamically, either under control of this extension, or
-due to external events. Examples include: monitors being swapped, pressing a
-button to switch from internal display to an external monitor on a laptop,
-or, eventually, the hotplug of a display card entirely on busses such as
-Cardbus or Express Card which permit hot-swap (which will require other work
-in addition to this extension).
-
-Since the screen configuration is dynamic and asynchronous to the client and
-may change at any time RandR provides mechanisms to ensure that your clients
-view is up to date with the configuration possibilities of the moment and
-enforces applications that wish to control the configuration to prove that
-their information is up to date before honoring requests to change the
-screen configuration (by requiring a timestamp on the request).
-
-Interested applications are notified whenever the screen configuration
-changes, providing the current size of the screen and subpixel order (see
-the Render extension [RENDER]), to enable proper rendering of subpixel
-decimated client text to continue, along with a time stamp of the
-configuration change. A client must refresh its knowledge of the screen
-configuration before attempting to change the configuration after a
-notification, or the request will fail.
-
-To avoid multiplicative explosion between orientation, reflection and sizes,
-the sizes are only those sizes in the normal (0) rotation.
-
-Rotation and reflection and how they interact can be confusing. In Randr,
-the coordinate system is rotated in a counter-clockwise direction relative
-to the normal orientation. Reflection is along the window system coordinate
-system, not the physical screen X and Y axis, so that rotation and
-reflection do not interact. The other way to consider reflection is to is
-specified in the "normal" orientation, before rotation, if you find the
-other way confusing.
-
-We expect that most clients and toolkits will be oblivious to changes to the
-screen structure, as they generally use the values in the connections Display
-structure directly. By toolkits updating the values on the fly, we believe
-pop-up menus and other pop up windows will position themselves correctly in
-the face of screen configuration changes (the issue is ensuring that pop-ups
-are visible on the reconfigured screen).
-
-                              ❧❧❧❧❧❧❧❧❧❧❧
-
-3. Data Types
-
-The subpixel order is shared with the Render extension, and is documented
-there. The only datatype defined is the screen size, defined in the normal
-(0 degree) orientation.
-
-                              ❧❧❧❧❧❧❧❧❧❧❧
-
-4. Errors
-
-Errors are sent using core X error reports.
-
-Output
-	A value for an OUTPUT argument does not name a defined OUTPUT.
-CRTC
-	A value for a CRTC argument does not name a defined CRTC.
-Mode
-	A value for a MODE argument does not name a defined MODE.
-
-                              ❧❧❧❧❧❧❧❧❧❧❧
-
-5. Protocol Types
-
-RRCONFIGSTATUS { Success
-		 InvalidConfigTime
-		 InvalidTime
-		 Failed }
-
-	A value of type RRCONFIGSTATUS returned when manipulating the output
-	configuration or querying information from the server that has some
-	time-dependency.
-
-	InvalidConfigTime indicates that the supplied configuration
-	timestamp does not match the current X server configuration
-	timestamp. Usually this means that the output configuration has
-	changed since the timestamp was received by the application.
-
-	InvalidTime indicates that the supplied output reconfiguration time
-	is earlier than the most recent output reconfiguration request.
-	Generally this indicates that another application has reconfigured
-	the output using a later timestamp.
-
-	Failed is returned whenever the operation is unsuccessful for some
-	other reason. This generally indicates that the requested output
-	configuration is unsupported by the hardware. The goal is to make
-	these limitations expressed by the protocol, but when that isn't
-	possible it is correct to return this error value. If, as a
-	implentor, you find this error code required, please submit the
-	hardware constraints that exist so that a future version of the
-	extension can correctly capture the configuration constraints in
-	your system.
-
-ROTATION { Rotate_0
-	   Rotate_90
-	   Rotate_180
-	   Rotate_270
-	   Reflect_X
-	   Reflect_Y }
-
-	These values are used both to indicate a set of allowed rotations
-	and reflections as well as to indicate a specific rotation and
-	reflection combination.
-
-RRSELECTMASK { RRScreenChangeNotifyMask
-	       RRCrtcChangeNotifyMask (New in version 1.2)
-	       RROutputChangeNotifyMask (New in version 1.2)
-	       RROutputPropertyNotifyMask (New in version 1.2) }
-
-SIZEID { CARD16 }
-
-MODE { XID or None }
-
-CRTC { XID }
-
-OUTPUT { XID }
-
-CONNECTION { Connected, Disconnected, UnknownConnection }
-
-	This value provides an indication of whether an output is actually
-	connected to a monitor or other presentation device.
-
-SUBPIXELORDER { SubPixelUnknown		The subpixel order uses the Render
-	        SubPixelHorizontalRGB	extensions definitions; they are here
-	        SubPixelHorizontalBGR	only for convenience.
-	        SubPixelVerticalRGB
-	        SubPixelVerticalBGR
-	        SubPixelNone }
-
-SCREENSIZE { widthInPixels, heightInPixels: CARD16
-	     widthInMillimeters, heightInMillimeters: CARD16 }
-
-MODEFLAG { HSyncPositive
-	   HSyncNegative
-	   VSyncPositive
-	   VSyncNegative
-	   Interlace
-	   DoubleScan
-	   CSync
-	   CSyncPositive
-	   CSyncNegative
-	   HSkewPresent
-	   BCast
-	   PixelMultiplex
-	   DoubleClock
-	   ClockDivideBy2 }
-
-MODEINFO { id: MODE
-	   name: STRING
-           width, height: CARD16
-           dotClock: CARD32
-           hSyncStart, hSyncEnd, hTotal, hSkew: CARD16
-           vSyncStart, vSyncEnd, vTotal: CARD16
-           modeFlags: SETofMODEFLAG }
-
-REFRESH { rates: LISTofCARD16 }
-
-                              ❧❧❧❧❧❧❧❧❧❧❧
-
-6. Extension Initialization
-
-The name of this extension is "RANDR".
-
-┌───
-    RRQueryVersion
-	client-major-version:	CARD32
-	client-minor-version:	CARD32
-      ▶
-	major-version:		CARD32
-	minor-version:		CARD32
-└───
-
-	The client sends the highest supported version to the server
-	and the server sends the highest version it supports, but no
-	higher than the requested version. Major versions changes can
-	introduce incompatibilities in existing functionality, minor
-	version changes introduce only backward compatible changes.
-	It is the clients responsibility to ensure that the server
-	supports a version which is compatible with its expectations.
-
-                              ❧❧❧❧❧❧❧❧❧❧❧
-
-7. Extension Requests
-
-┌───
-    RRSelectInput
-	window: WINDOW
-	enable: SETofRRSELECTMASK
-└───
-	Errors: Window, Value
-
-	If 'enable' is RRScreenChangeNotifyMask, RRScreenChangeNotify events
-	will be sent when the screen configuration changes, either from
-	this protocol extension, or due to detected external screen
-	configuration changes. RRScreenChangeNotify may also be sent when
-	this request executes if the screen configuration has changed since
-	the client connected, to avoid race conditions.
-
-	New for version 1.2:
-
-	If 'enable' contains RRCrtcChangeMask, RRCrtcChangeNotify events
-	will be sent when a the configuration for a CRTC associated with the
-	screen changes, either through this protocol extension or due to
-	detected external changes. RRCrtcChangeNotify may also be sent when
-	this request executes if the CRTC configuration has changed since
-	the client connected, to avoid race conditions.
-
-	If 'enable' contains RROutputChangeMask, RROutputChangeNotify events
-	will be sent when a the configuration for an output associated with
-	the screen changes, either through this protocol extension or due to
-	detected external changes. RROutputChangeNotify may also be sent
-	when this request executes if the output configuration has changed
-	since the client connected, to avoid race conditions.
-
-	If 'enable' contains RROutputPropertyNotifyMask,
-	RROutputPropertyNotify events will be sent when properties change on
-	this output.
-
-┌───
-    RRSetScreenConfig
-	window: WINDOW
-	timestamp: TIMESTAMP
-	config-timestamp: TIMESTAMP
-	size-id: SIZEID
-	rotation: ROTATION
-	rate: CARD16
-      ▶
-	status: RRCONFIGSTATUS
-	new-timestamp: TIMESTAMP
-	config-timestamp: TIMESTAMP
-	root: WINDOW
-	subpixelOrder: SUBPIXELORDER
-└───
-	Errors: Value, Match
-
-	If 'timestamp' is less than the time when the configuration was last
-	successfully set, the request is ignored and InvalidTime returned in
-	status.
-
-	If 'config-timestamp' is not equal to when the server's screen
-	configurations last changed, the request is ignored and
-	InvalidConfigTime returned in status. This could occur if the
-	screen changed since you last made a RRGetScreenInfo request,
-	perhaps by a different piece of display hardware being installed.
-	Rather than allowing an incorrect call to be executed based on stale
-	data, the server will ignore the request.
-
-	'rate' contains the desired refresh rate. If it is zero, the server
-	selects an appropriate rate.
-
-	This request may fail for other indeterminate reasons, in which case
-	'status' will be set to Failed and no configuration change will be
-	made.
-
-	This request sets the screen to the specified size, rate, rotation
-	and reflection.
-
-	When this request succeeds, 'status' contains Success and the
-	requested changes to configuration will have been made.
-
-	'new-time-stamp' contains the time at which this request was
-	executed.
-
-	'config-timestamp' contains the time when the possible screen
-	configurations were last changed.
-
-	'root' contains the root window for the screen indicated by the
-	window.
-
-	'subpixelOrder' contains the resulting subpixel order of the screen
-	to allow correct subpixel rendering.
-
-	Value errors are generated when 'rotation', 'rate' or 'size-id'
-	are invalid.
-
-┌───
-    RRGetScreenInfo
-	window: WINDOW
-      ▶
-	rotations: SETofROTATION
-	root: WINDOW
-	timestamp: TIMESTAMP
-	config-timestamp: TIMESTAMP
-	size-id: SIZEID
-	rotation: ROTATION
-	rate: CARD16
-	sizes: LISTofSCREENSIZE
-	refresh: LISTofREFRESH
-└───
-
-	Errors: Window
-
-	RRGetScreenInfo returns information about the current and available
-	configurations for the screen associated with 'window'.
-
-	'rotations' contains the set of rotations and reflections supported
-	by the screen.
-
-	'root' is the root window of the screen.
-
-	'config-timestamp' indicates when the screen configuration
-	information last changed: requests to set the screen will fail
-	unless the timestamp indicates that the information the client
-	is using is up to date, to ensure clients can be well behaved
-	in the face of race conditions.
-
-	'timestamp' indicates when the configuration was last set.
-
-	'size-id' indicates which size is active.
-
-	'rate' is the current refresh rate. This is zero when the refresh
-	rate is unknown or on devices for which refresh is not relevant.
-
-	'sizes' is the list of possible frame buffer sizes (at the normal
-	orientation. Each size indicates both the linear physical size of
-	the screen and the pixel size.
-
-	'refresh' is the list of refresh rates for each size. Each element
-	of 'sizes' has a corresponding element in 'refresh'. An empty list
-	indicates no known rates, or a device for which refresh is not
-	relevant.
-
-	The default size of the screen (the size that would become the
-	current size when the server resets) is the first size in the
-	list.
-
-7.1. Extension Requests added in version 1.2 of the extension
-
-As introduced above, version 1.2 of the extension splits the screen size
-from the crtc and output configuration, permitting the subset of the screen
-presented by multiple outputs to be configured. As a separate notion, the
-size of the screen itself may be arbitrarily configured within a defined
-range. As crtcs and outputs are added and removed from the system, the set
-returned by the extension will change so that applications can detect
-dynamic changes in the display environment.
-
-┌───
-    RRGetScreenSizeRange
-	window: WINDOW
-      ▶
-	CARD16	minWidth, minHeight
-	CARD16	maxWidth, maxHeight
-└───
-	Errors: Window
-
-	Returns the range of possible screen sizes. The screen may be set to
-	any size within this range.
-
-┌───
-    RRSetScreenSize
-	window: WINDOW
-	width: CARD16
-	height: CARD16
-	width-in-millimeters: CARD32
-	height-in-millimeters: CARD32
-└───
-	Errors: Window, Match, Value
-
-	Sets the screen to the specified size. 'width' and 'height' must be
-	within the range allowed by GetScreenSizeRanges, otherwise a Value
-	error results. All active monitors must be configured to display a
-	subset of the specified size, else a Match error results.
-
-	'width-in-millimeters' and 'height-in-millimeters' can be set to
-	reflect the physical size of the screen reported both through this
-	extension and the core protocol. They must be non-zero, or Value
-	error results.
-
-	If panning is enabled, the width and height of the panning and the
-	tracking areas are adapted to the new size and clamped afterwards.
-	Disabled panning axes remain disabled.
-	Panning borders are disabled if their requirements are no longer met
-	(see RRSetPanning).
-
-┌───
-    RRGetScreenResources
-	window: WINDOW
-      ▶
-	timestamp: TIMESTAMP
-	config-timestamp: TIMESTAMP
-	crtcs: LISTofCRTC
-	outputs: LISTofOUTPUT
-	modes: LISTofMODEINFO
-└───
-	Errors: Window
-
-	RRGetScreenResources returns the list of outputs and crtcs connected
-	to the screen associated with 'window'.
-
-	'timestamp' indicates when the configuration was last set.
-
-	'config-timestamp' indicates when the configuration information last
-	changed. Requests to configure the output will fail unless the
-	timestamp indicates that the information the client is using is up
-	to date, to ensure clients can be well behaved in the face of race
-	conditions.
-
-	'crtcs' contains the list of CRTCs associated with the screen.
-
-	'outputs' contains the list of outputs associated with the screen.
-
-	'modes' contains the list of modes associated with the screen
-
-	This request explicitly asks the server to ensure that the
-	configuration data is up-to-date wrt the hardware. If that requires
-	polling, this is when such polling would take place.  If the
-	current configuration is all that's required, use
-	RRGetScreenResourcesCurrent instead.
-
-┌───
-    RRGetOutputInfo
-	output: OUTPUT
-	config-timestamp: TIMESTAMP
-      ▶
-	status: RRCONFIGSTATUS
-	timestamp: TIMESTAMP
-	crtc: CRTC
-
-	name: STRING
-	connection: CONNECTION
-	subpixel-order: SUBPIXELORDER
-        widthInMillimeters, heightInMillimeters: CARD32
-	crtcs: LISTofCRTC
-	clones: LISTofOUTPUT
-	modes: LISTofMODE
-	num-preferred: CARD16
-└───
-	Errors: Output
-
-	RRGetOutputInfo returns information about the current and available
-	configurations 'output'.
-
-	If 'config-timestamp' does not match the current configuration
-	timestamp (as returned by RRGetScreenResources), 'status' is set to
-	InvalidConfigTime and the remaining reply data is empty. Otherwise,
-	'status' is set to Success.
-
-	'timestamp' indicates when the configuration was last set.
-
-	'crtc' is the current source CRTC for video data, or Disabled if the
-	output is not connected to any CRTC.
-
-	'name' is a UTF-8 encoded string designed to be presented to the
-	user to indicate which output this is. E.g. "S-Video" or "DVI".
-
-	'connection' indicates whether the hardware was able to detect a
-	device connected to this output. If the hardware cannot determine
-	whether something is connected, it will set this to
-	UnknownConnection.
-
-	'subpixel-order' contains the resulting subpixel order of the
-	connected device to allow correct subpixel rendering.
-
-	'widthInMillimeters' and 'heightInMillimeters' report the physical
-	size of the displayed area. If unknown, or not really fixed (e.g.,
-	for a projector), these	values are both zero.
-
-	'crtcs' is the list of CRTCs that this output may be connected to.
-	Attempting to connect this output to a different CRTC results in a
-	Match error.
-
-	'clones' is the list of outputs which may be simultaneously
-	connected to the same CRTC along with this output. Attempting to
-	connect this output with an output not in the 'clones' list
-	results in a Match error.
-
-	'modes' is the list of modes supported by this output. Attempting to
-	connect this output to a CRTC not using one of these modes results
-	in a Match error.
-
-	The first 'num-preferred' modes in 'modes' are preferred by the
-	monitor in some way; for fixed-pixel devices, this would generally
-	indicate which modes match the resolution of the output device.
-
-┌───
-    RRListOutputProperties
-    	output:OUTPUT
-      ▶
-      	atoms: LISTof ATOM
-└───
-	Errors: Output
-
-	This request returns the atoms of properties currently defined on
-	the output.
-
-┌───
-    RRQueryOutputProperty
-	output: OUTPUT
-	property: ATOM
-      ▶
-      	pending: BOOL
-	range: BOOL
-	immutable: BOOL
-	valid-values: LISTofINT32
-└───
-	Errors: Name, Atom, Output
-
-	If the specified property does not exist for the specified output,
-	then a Name error is returned.
-
-	If 'pending' is TRUE, changes made to property values with
-	RRChangeOutputProperty will be saved in the pending property value
-	and be automatically copied to the current value on the next
-	RRSetCrtcConfig request involving the named output. If 'pending' is
-	FALSE, changes are copied immediately.
-
-	If 'range' is TRUE, then the valid-values list will contain
-	precisely two values indicating the minimum and maximum allowed
-	values. If 'range' is FALSE, then the valid-values list will contain
-	the list of possible values; attempts to set other values will
-	result in a Value error.
-
-	If 'immutable' is TRUE, then the property configuration cannot be
-	changed by clients. Immutable properties are interpreted by the X
-	server.
-
-┌───
-    RRConfigureOutputProperty
-	output: OUTPUT
-	property: ATOM
-      	pending: BOOL
-	range: BOOL
-	valid-values: LISTofINT32
-└───
-	Errors: Access, Name, Atom, Output
-
-	If the specified property is 'immutable', an Access error is
-	returned.
-
-	Otherwise, the configuration of the specified property is changed to
-	the values provided in this request.
-
-	If the specified property does not exist for the specified output,
-	it is created with an empty value and None type.
-
-┌───
-    RRChangeOutputProperty
-    	output: OUTPUT
-	property, type: ATOM
-	format: {8, 16, 32}
-	mode: { Replace, Prepend, Append }
-	data: LISTofINT8 or LISTofINT16 or LISTofINT32
-└───
-	Errors: Alloc, Atom, Match, Value, Output
-
-	This request alters the value of the property for the specified
-	output. If the property is marked as a 'pending' property, only the
-	pending value of the property is changed. Otherwise, changes are
-	reflected in both the pending and current values of the property.
-	The type is uninterpreted by the server.  The format specifies
-	whether the data should be viewed as a list of 8-bit, 16-bit, or
-	32-bit quantities so that the server can correctly byte-swap as
-	necessary.
-
-	If the mode is Replace, the previous property value is discarded.
-	If the mode is Prepend or Append, then the type and format must
-	match the existing property value (or a Match error results).  If
-	the property is undefined, it is treated as defined with the correct
-	type and format with zero-length data.
-
-	For Prepend, the data is tacked on to the beginning of the existing
-	data, and for Append, it is tacked on to the end of the existing data.
-
-	This request generates a OutputPropertyNotify
-
-	The lifetime of a property is not tied to the storing client.
-	Properties remain until explicitly deleted, until the output is
-	destroyed, or until server reset (see section 10).
-
-	The maximum size of a property is server-dependent and may vary
-	dynamically.
-
-┌───
-    RRDeleteOutputProperty
-    	output: OUTPUT
-	property: ATOM
-└───
-	Errors: Atom, Output
-
-	This request deletes the property from the specified window if the
-	property exists and generates a OutputPropertyNotify event unless
-	the property does not exist.
-
-┌───
-    RRGetOutputProperty
-    	output: OUTPUT
-	property: ATOM
-	type: ATOM or AnyPropertyType
-	long-offset, long-length: CARD32
-	delete: BOOL
-	pending: BOOL
-      ▶
-	type: ATOM or None
-	format: {0, 8, 16, 32}
-	bytes-after: CARD32
-	value: LISTofINT8 or LISTofINT16 or LISTofINT32
-└───
-	Errors: Atom, Value, Output
-
-	If the specified property does not exist for the specified output,
-	then the return type is None, the format and bytes-after are zero,
-	and the value is empty.  The delete argument is ignored in this
-	case.
-
-	If the specified property exists but its type does not match the
-	specified type, then the return type is the actual type of the
-	property, the format is the actual format of the property (never
-	zero), the bytes-after is the length of the property in bytes (even
-	if the format is 16 or 32), and the value is empty.  The delete
-	argument is ignored in this case.
-
-	If the specified property exists and either AnyPropertyType is
-	specified or the specified type matches the actual type of the
-	property, then the return type is the actual type of the property,
-	the format is the actual format of the property (never zero), and
-	the bytes-after and value are as follows, given:
-
-		N = actual length of the stored property in bytes
-				  (even if the format is 16 or 32)
-		I = 4 × offset
-		T = N - I
-		L = MINIMUM(T, 4 × long-length)
-		A = N - (I + L)
-
-	If 'pending' is true, and if the property holds a pending value,
-	then the value returned will be the pending value of the property
-	rather than the current value.  The returned value starts at byte
-	index I in the property (indexing from 0), and its length in bytes
-	is L.  However, it is a Value error if long-offset is given such
-	that L is negative.  The value of bytes-after is A, giving the
-	number of trailing unread bytes in the stored property.  If delete
-	is True and the bytes-after is zero, the property is also deleted
-	from the output, and a RROutputPropertyNotify event is generated.
-
-┌───
-    RRCreateMode
-    	window: WINDOW
-	modeinfo: MODEINFO
-      ▶
-      	mode: MODE
-└───
-	Errors: Window, Name, Value
-
-	'modeinfo' provides a new mode for outputs on the screen
-	associated with 'window'. If the name of 'modeinfo' names an
-	existing mode, a Name error is returned.  If some parameter of the
-	mode is not valid in some other way, a Value error is returned.
-
-	The returned 'mode' provides the id for the mode.
-
-┌───
-    RRDestroyMode
-      	mode: MODE
-└───
-	Errors: Mode, Access
-
-	The user-defined 'mode' is destroyed. 'mode' must name a mode
-	defined with RRCreateMode, else an Match error is returned.  If
-	'mode' is in use by some CRTC or Output, then an Access error is
-	returned.
-
-┌───
-    RRAddOutputMode
-	output: OUTPUT
-	mode: MODE
-└───
-	Errors: Output, Mode, Match
-
-	'output' indicates which output is to be configured.
-
-	'mode' specifies which mode to add. If 'mode' is not valid for
-	'output', then a Match error is generated.
-
-	This request generates OutputChangeNotify events.
-
-┌───
-    RRDeleteOutputMode
-	output: OUTPUT
-	mode: MODE
-└───
-	Errors: Output, Mode
-
-	'output' indicates which output is to be configured.
-
-	'mode' specifies which mode to delete. 'mode' must have been added
-	with RRAddOutputMode, else an Access error is returned. 'mode' must
-	not be active, else a Match error is returned.
-
-	This request generates OutputChangeNotify events.
-
-┌───
-    RRGetCrtcInfo
-	crtc: CRTC
-	config-timestamp: TIMESTAMP
-      ▶
-	status: RRCONFIGSTATUS
-	timestamp: TIMESTAMP
-	x, y: INT16
-	width, height: CARD16
-	mode: MODE
-	rotation: ROTATION
-	outputs: LISTofOUTPUT
-
-	rotations: SETofROTATION
-	possible-outputs: LISTofOUTPUT
-└───
-
-	Errors: Window
-
-	RRGetCrtcModes returns information about the current and available
-	configurations for the specified crtc connected to the screen
-	associated with 'window'.
-
-	If 'config-timestamp' does not match the current configuration
-	timestamp (as returned by RRGetScreenResources), 'status' is set to
-	InvalidConfigTime and the remaining reply data is empty. Otherwise,
-	'status' is set to Success.
-
-	'timestamp' indicates when the configuration was last set.
-
-	'x' and 'y' indicate the position of this CRTC within the screen
-	region. They will be set to 0 when the CRTC is disabled.
-
-	'width' and 'height' indicate the size of the area within the screen
-	presented by this CRTC. This may be different than the size of the
-	mode due to rotation. They will be set to 0 when the CRTC
-	is disabled.
-
-	'mode' indicates which mode is active, or None indicating that the
-	CRTC has been disabled and is not displaying the screen contents.
-
-	'rotation' indicates the active rotation. It is set to Rotate_0
-	when the CRTC is disabled.
-
-	'outputs' is the list of outputs currently connected to this CRTC
-	and is empty when the CRTC is disabled.
-
-	'rotations' contains the set of rotations and reflections supported
-	by the CRTC.
-
-	'possible-outputs' lists all of the outputs which may be connected
-	to this CRTC.
-
-┌───
-    RRSetCrtcConfig
-	crtc: CRTC
-	timestamp: TIMESTAMP
-	config-timestamp: TIMESTAMP
-	x, y: INT16
-	mode: MODE
-	rotation: ROTATION
-	outputs: LISTofOUTPUT
-      ▶
-	status: RRCONFIGSTATUS
-	new-timestamp: TIMESTAMP
-└───
-	Errors: Value, Match
-
-	If 'timestamp' is less than the time when the configuration was last
-	successfully set, the request is ignored and InvalidTime returned in
-	status.
-
-	If 'config-timestamp' is not equal to when the monitor's
-	configuration last changed, the request is ignored and
-	InvalidConfigTime returned in status. This could occur if the
-	monitor changed since you last made a RRGetScreenInfo request,
-	perhaps by a different monitor being connected to the machine.
-	Rather than allowing an incorrect call to be executed based on stale
-	data, the server will ignore the request.
-
-	'x' and 'y' contain the desired location within the screen for this
-	monitor's content. 'x' and 'y' must be within the screen size, else
-	a Value error results.
-
-	'mode' is either the desired mode or None indicating the CRTC should
-	be disabled. If 'mode' is not one of these values, a Value
-	error results. 'mode' must be valid for all of the configured outputs,
-	else a Match error.
-
-	'rotation' contains the desired rotation along with which
-	reflections should be enabled. The rotation and reflection values
-	must be among those allowed for this monitor, else a Value error
-	results.
-
-	'outputs' contains the set of outputs that this CRTC should be
-	connected to. The set must be among the list of acceptable output
-	sets for this CRTC or a Match error results.
-
-	If 'mode' is None, then 'outputs' must be empty, else a Match error
-	results. Conversely, if 'mode' is not None, then 'outputs' must not be
-	empty, else a Match error results.
-
-	This request may fail for other indeterminate reasons, in which case
-	'status' will be set to Failed and no configuration change will be
-	made.
-
-	This request sets the CRTC to the specified position, mode, rotation
-	and reflection. The entire area of the CRTC must fit within the
-	screen size, else a Match error results. As an example, rotating the
-	screen so that a single CRTC fills the entire screen before and
-	after may necessitate disabling the CRTC, resizing the screen,
-	then re-enabling the CRTC at the new configuration to avoid an
-	invalid intermediate configuration.
-
-	If panning is enabled, the width and height of the panning and the
-	tracking areas are clamped to the new mode size.
-	Disabled panning axes remain disabled.
-	Panning borders are disabled if their requirements are no longer met
-	(see RRSetPanning).
-
-	When this request succeeds, 'status' contains Success and the
-	requested changes to configuration will have been made.
-
-	'new-time-stamp' contains the time at which this request was
-	executed.
-
-┌───
-    RRGetCrtcGammaSize
-	crtc: CRTC
-      ▶
-	size: CARD16
-└───
-	Errors: Crtc
-
-	This request returns the size of the gamma ramps used by 'crtc'.
-
-┌───
-    RRGetCrtcGamma
-	crtc: CRTC
-      ▶
-      	red: LISTofCARD16
-	green: LISTofCARD16
-	blue: LISTofCARD16
-└───
-	Errors: Crtc
-
-	This request returns the currently set gamma ramps for 'crtc'.  All
-	three lists will be the size returned by the RRGetCrtcGammaSize
-	request.
-
-┌───
-    RRSetCrtcGamma
-	crtc: CRTC
-	red: LISTofCARD16
-	green: LISTofCARD16
-	blue: LISTofCARD16
-└───
-	Errors: Crtc, Match
-
-	This request sets the gamma ramps for 'crtc'. All three lists
-	must be the size returned by RRGetCrtcGammaSize else a Value error
-	results.
-
-7.2. Extension Requests added in version 1.3 of the extension
-
-┌───
-    RRGetScreenResourcesCurrent
-	window: WINDOW
-      ▶
-	timestamp: TIMESTAMP
-	config-timestamp: TIMESTAMP
-	crtcs: LISTofCRTC
-	outputs: LISTofOUTPUT
-	modes: LISTofMODEINFO
-└───
-	Errors: Window
-
-	RRGetScreenResourcesCurrent returns the list of outputs and crtcs
-	connected to the screen associated with 'window'.
-
-	'timestamp' indicates when the configuration was last set.
-
-	'config-timestamp' indicates when the configuration information last
-	changed. Requests to configure the output will fail unless the
-	timestamp indicates that the information the client is using is up
-	to date, to ensure clients can be well behaved in the face of race
-	conditions.
-
-	'crtcs' contains the list of CRTCs associated with the screen.
-
-	'outputs' contains the list of outputs associated with the screen.
-
-	'modes' contains the list of modes associated with the screen.
-
-	Unlike RRGetScreenResources, this merely returns the current
-	configuration, and does not poll for hardware changes.
-
-┌───
-    RRSetCrtcTransform
-	crtc: CRTC
-	transform: TRANSFORM
-	filter: STRING8
-	values: LISTofFIXED
-└───
-	Errors: Crtc, Match
-
-	This request provides a mechanism that is more general than the
-	existing rotation and reflection values for describing the
-	transformation from frame buffer image to crtc presentation.
-	'transform' is a full 2D projective transformation from screen
-	coordinate space to crtc coordinate space. This transformation is
-	applied before the rotation and reflection values to compute the
-	complete transform.
-
-	'filter' and 'values' specify a Render filter that may be used by the
-	server when transforming data from frame buffer to crtc.
-
-	This request sets the transform to be used at the next
-	RRSetCrtcConfig request execution; it does not cause any change to
-	occur in the current configuration.
-
-	When a non-identity transformation is in use, the rectangle returned
-	by RRGetCrtcInfo defines the bounding rectangle of the screen that is
-	projected to the crtc. It is this projected rectangle which must be
-	within the area of the screen when the mode is set.
-
-┌───
-    RRGetCrtcTransform
-	crtc: CRTC
-      ▶
-	pending-transform: TRANSFORM
-	pending-filter: STRING8
-	pending-values: LISTofFIXED
-	current-transform: TRANSFORM
-	current-filter: STRING8
-	current-values: LISTofFIXED
-└───
-
-	This request returns the pending and current transforms for the
-	specified CRTC. The pending transform will be the same as the current
-	transform if no new pending transform has been set since the last call
-	to RRSetCrtcConfig.
-
-┌───
-    RRGetPanning
-	crtc: CRTC
-      ▶
-	status: RRCONFIGSTATUS
-	timestamp: TIMESTAMP
-	left, top, width, height: CARD16
-	track_left, track_top, track_width, track_height: CARD16
-	border_left, border_top, border_right, border_bottom: INT16
-└───
-
-	Errors: Crtc
-
-	Version 1.3 adds panning support again. If multiple crtcs are active
-	the panning behavior can be defined per crtc individually.
-	RRGetPanning returns information about the currently set panning
-	configuration for the specified crtc.  If the CRTC does not support
-	panning, all fields (except timestamp) will be 0.
-
-	'timestamp' indicates when the configuration was last set.
-
-	All other entries are explained for RRSetPanning.
-
-┌───
-    RRSetPanning
-	crtc: CRTC
-	timestamp: TIMESTAMP
-	left, top, width, height: CARD16
-	track_left, track_top, track_width, track_height: CARD16
-	border_left, border_top, border_right, border_bottom: INT16
-      ▶
-	status: RRCONFIGSTATUS
-	new-timestamp: TIMESTAMP
-└───
-	Errors: Crtc, Match
-
-	This request sets the panning parameters.  As soon as panning is
-	enabled, the CRTC position can change with every pointer move.
-	RRCrtcChangeNotify events are sent to the clients requesting those.
-
-	If 'timestamp' is less than the time when the configuration was last
-	successfully set, the request is ignored and InvalidTime returned in
-	status.
-
-	┌──┳━━━━━━━━━━━━━━┳─────┬ ─ ─ ─ ─ ─ ┐
-	│  ┃     CRTC     ┃     │
-	│  ┃              ┃     │           │
-	│  ┃             X┃→    │
-	│  ┃              ┃     │           │  framebuffer
-	│  ┗━━━━━━━━━━━━━━┛     │
-	│                       │           │
-	│panning area           │
-	└───────────────────────┴ ─ ─ ─ ─ ─ ┘
-
-	'left', 'top', 'width', and 'height' contain the total panning area
-	for this CRTC.  'width' has to be larger than or equal to the CRTC's
-	width or 0, and 'left'+'width' must be within the screen size, else a
-	Match error results.  Equivalent restrictions for the height exist.
-	'width' or 'height' set to 0 indicate that panning should be disabled
-	on the according axis.  Setting 'width'/'height' to the CRTC's
-	width/height will disable panning on the X/Y axis as well, but
-	RRSetScreenSize will silently enable panning if the screen size is
-	increased. This does not happen if set to 0.
-
-	┌────────┳━━━━━━━━━━━━━━┳ ─ ─ ─ ─ ─ ┐
-	│        ┃     CRTC     ┃
-	│        ┃              ┃           │
-	│        ┃              ┃
-	│        ┃              ┃           │  tracking area
-	│        ┗━━━━━━━━━━━━━━┫     X
-	│               ↓       │     ↓     │
-	│panning area           │
-	└───────────────────────┴ ─ ─ ─ ─ ─ ┘
-
-	'track_left', 'track_top', 'track_width', and 'track_height' contain
-	the pointer area for which the panning region is updated.  For normal
-	use cases it should enclose the panning area minus borders, and is
-	typically set to either the panning area minus borders, or to the
-	total screen size. If set to the total screen size, the CRTC will pan
-	in the remaining axis even if the pointer is outside the panning area
-	on a different CRTC, as shown in the figure above. If the pointer is
-	outside the tracking area, the CRTC will not pan. Zero can be used as
-	an alias for the total screen size.
-
-	┌──┳━━━━━━━━━━━━━━┳────────────┐
-	│  ┃     CRTC     ┃            │
-	│  ┃              ┃            │
-	│  ┃              ┃→           │
-	│  ┃           X←→┃            │
-	│  ┃       border_right        │
-	│  ┗━━━━━━━━━━━━━━┛            │
-	│                              │
-	│panning area                  │
-	└──────────────────────────────┘
-
-	'border_left', 'border_top', 'border_right', and 'border_bottom'
-	define the distances from the CRTC borders that will activate panning
-	if the pointer hits them.  If the borders are 0, the screen will pan
-	when the pointer hits the CRTC borders (behavior of pre-RandR Xserver
-	panning).  If the borders are positive, the screen will pan when the
-	pointer gets close to the CRTC borders, if they are negative, the
-	screen will only pan when the pointer is already way past the CRTC
-	borders.  Negative values might confuse users and disable panning to
-	the very edges of the screen.  Thus they are discouraged.
-	border_left + border_right has to be lower or equal than the CRTC's
-	width, else a Match error results.  An equivalent restriction for the
-	height exists.
-
-	Screen size changes update the panning and the tracking areas to the
-	new size. Both screen size changes and mode changes clamp these areas
-	to the current CRTC size.  In these cases panning borders are disabled
-	if their requirements are no longer met.
-
-	When this request succeeds, 'status' contains Success and the
-	requested changes to configuration will have been made.
-
-	'new-time-stamp' contains the time at which this request was
-	executed.
-
-┌───
-    RRSetOutputPrimary
-	window: WINDOW
-	output: OUTPUT
-└───
-	Errors: Match, Output, Window
-
-	RRSetOutputPrimary marks 'output' as the primary output for the
-	screen with the same root window as 'window'. This output's CRTC
-	will be sorted to the front of the list in Xinerama and RANDR
-	geometry requests for the benefit of older applications. The
-	default primary output is None, and None is a legal value to pass
-	to RRSetOutputPrimary. This request is expected to be used by
-	desktop environments to mark the screen that should hold the primary
-	menu bar or panel.
-
-	As this changes the logical layout of the screen, ConfigureNotify
-	and RRScreenChangeNotify will be generated on the appropriate root
-	window when the primary output is changed by this call. This request
-	also generates RROutputChangeNotify events on the outputs that gained
-	and lost primary status.
-
-	If an output is disconnected asynchronously (eg. due to recabling),
-	the primary status does not change, but RROutputChangeNotify events
-	will be generated if the hardware is capable of detecting this;
-	clients are expected to reconfigure if appropriate.
-
-	If an output is deleted (eg. due to device hotplug), the server will
-	act as though None was passed to RRSetOutputPrimary, including
-	generating the appropriate events.
-
-┌───
-    RRGetOutputPrimary
-	window: WINDOW
-      ▶
-	output: OUTPUT
-└───
-	Errors: Window
-
-	RRGetOutputPrimary returns the primary output for the screen.
-
-                              ❧❧❧❧❧❧❧❧❧❧❧
-
-8. Extension Events
-
-Clients MAY select for ConfigureNotify on the root window to be
-informed of screen changes. This may be advantageous if all your
-client needs to know is the size of the root window, as it avoids
-round trips to set up the extension.
-
-RRScreenChangeNotify is sent if RRSelectInput has requested it
-whenever properties of the screen change, which may be due to external
-factors, such as re-cabling a monitor, etc.
-
-┌───
-    RRScreenChangeNotify
-
-	rotation: ROTATION;		new rotation
-	sequenceNumber: CARD16		low 16 bits of request seq. number
-	timestamp: TIMESTAMP		time screen was changed
-	configTimestamp: TIMESTAMP	time config data was changed
-	root: WINDOW			root window of screen
-	window: WINDOW			window requesting notification
-	size-id: SIZEID			index of new SCREENSIZE
-	subpixelOrder: SUBPIXELORDER	order of subpixels
-	widthInPixels: CARD16		width in pixels of the new SCREENSIZE
-	heightInPixels: CARD16		height in pixels of the new SCREENSIZE
-	widthInMillimeters: CARD16	width in mm of the new SCREENSIZE
-	heightInMillimeters: CARD16	height in mm of the new SCREENSIZE
-└───
-	This event is generated whenever the screen configuration is changed
-	and sent to requesting clients. 'timestamp' indicates when the
-	screen configuration was changed. 'configTimestamp' says when the
-	last time the configuration was changed. 'root' is the root of the
-	screen the change occurred on, 'window' is window selecting for this
-	event. 'size-id' contains the index of the current size.
-
-	This event is sent whenever the screen's configuration changes
-	or if a new screen configuration becomes available that was
-	not available in the past. In this case (config-timestamp in
-	the event not being equal to the config-timestamp returned in
-	the last call to RRGetScreenInfo), the client MUST call
-	RRGetScreenInfo to update its view of possible screen
-	configurations to have a correct view of possible screen
-	organizations.
-
-	Clients which select screen change notification events may be
-	sent an event immediately if the screen configuration was
-	changed between when they connected to the X server and
-	selected for notification. This is to prevent a common race
-	that might occur on log-in, where many applications start up
-	just at the time when a display manager or log in script might
-	be changing the screen size or configuration.
-
-	Note that the sizes in this event reflect the new SCREENSIZE and
-	thus will appear rotated by the 'rotation' parameter from the sizes
-	of the screen itself. In other words, when rotation is 90 or 270,
-	widthInPixels in this event will be the same as the height value
-	from a ConfigureNotify that reflects the same size change. This
-	will probably confuse developers.
-
-8.1 Events added in version 1.2 of the RandR extension
-
-┌───
-    RROutputChangeNotify:
-	timestamp: TIMESTAMP		time screen was reconfigured
-	config-timestamp: TIMESTAMP	time available config data was changed
-	window: WINDOW			window requesting notification
-	output: OUTPUT			output affected by change
-	crtc: CRTC			connected CRTC or None
-	mode: MODE			mode in use on CRTC or None
-	connection: CONNECTION		connection status
-└───
-
-	This event is generated whenever the available output configurations
-	have changed and is sent to requesting clients. 'timestamp'
-	indicates when the crtc configuration was changed by a client.
-	'config-timestamp' says when the last time the available
-	configurations changed. 'root' is the root of the screen the change
-	occurred on, 'window' is window selecting for this event. The
-	precise change can be detected by examining the new state of the
-	system.
-
-┌───
-    RROutputPropertyNotify:
-	window: WINDOW			window requesting notification
-	output: OUTPUT			output affected by change
-	atom: ATOM			affected property
-	time: TIMESTAMP			time property was changed
-	subpixel-order: SUBPIXELORDER	order of subpixels
-	state: { NewValue, Deleted }	new property state
-└───
-
-	This event is reported to clients selecting RROutputPropertyChange
-	on the window and is generated with state NewValue when a property
-	of the window is changed using RRChangeOutputProperty even when
-	adding zero-length data and when replacing all or part of a property
-	with identical data.  It is generated with state Deleted when a
-	property of the window is deleted using either
-	RRDeleteOutputProperty or RRGetOutputProperty.  The timestamp
-	indicates the server time when the property was changed.
-
-┌───
-    RRCrtcChangeNotify
-	timestamp: TIMESTAMP		time monitor was changed
-	window: WINDOW			window requesting notification
-	crtc: CRTC			CRTC which changed
-	mode: MODE			new mode
-	rotation: ROTATION;		new rotation
-	x: INT16			x position of CRTC within screen
-	y: INT16			y position of CRTC within screen
-	width: CARD16			width of new mode
-	height: CARD16			height of new mode
-└───
-	This event is generated whenever the CRTC configuration is changed
-	and sent to requesting clients. 'timestamp' indicates when the
-	CRTC configuration was changed. 'window' is window selecting for this
-	event. 'mode' is the new mode, or None if the crtc is disabled.
-	'x' and 'y' mark the location in the screen where this CRTC
-	is reading data. 'width' and 'height' indicate the size of the
-	mode. 'x', 'y, 'width' and 'height' are all zero when 'mode' is None.
-
-	This event is sent whenever the monitor's configuration changes
-	or if a new monitor configuration becomes available that was
-	not available in the past. In this case, the client MUST call
-	RRGetCrtcModes to update its view of possible monitor
-	configurations to have a correct view of possible monitor
-	organizations.
-
-	Clients which select monitor change notification events may be
-	sent an event immediately if the monitor configuration was
-	changed between when they connected to the X server and
-	selected for notification. This is to prevent a common race
-	that might occur on log-in, where many applications start up
-	just at the time when a display manager or log in script might
-	be changing the monitor size or configuration.
-
-                              ❧❧❧❧❧❧❧❧❧❧❧
-
-9. Properties
-
-Properties are used for output specific parameters, and for announcing
-static or rarely changing data.  Announced data is typically
-immutable.  Properties are also used for evaluating new parameters
-before adding them to the RandR protocol.
-
-The following properties are hereby declared official, and drivers SHOULD
-prefix driver specific properties with '_', unless they are planned to be
-added to this specification.  List values, that are not declared by the table
-below, and will remain driver specific or are not planned to be added to this
-specification, SHOULD be prefixed with "_" as well in order to avoid name
-space or semantics clashes with future extensions of these values.
-
-Beginning with version 1.3 of the RandR extension, certain properties
-are mandatory and MUST be provided by implementations.  Earlier
-versions of the RandR extension MAY provide these properties as well,
-as long as the semantics are not altered.  Clients SHOULD fall back
-gracefully to lower version functionality, though, if the driver
-doesn't handle a mandatory property correctly.
-
-9.1 Known properties
-
-    "Backlight"			aka RR_PROPERTY_BACKLIGHT
-	Type:			int32
-	Flags:			-
-	Range/List:		0-x (driver specific)
-
-	This property controls the brightness on laptop panels and equivalent
-	displays with a backlight controller. The driver specific maximum
-	value MUST turn the backlight to full brightness, 1 SHOULD turn the
-	backlight to minimum brightness, 0 SHOULD turn the backlight off.
-
-    "CloneList"			aka RR_PROPERTY_CLONE_LIST
-	Type:			int32 [2*n] / Atom pairs
-	Flags:			Immutable
-	Range/List:		0-
-
-	Some combinations of outputs on some cards cannot be served
-	independently from each other, because they are wired up to the same
-	encoder outputs.
-	This property lists all output + signal format pairs that are
-	driven together with this output, and thus can only be programmed in
-	clone mode with the same CRTC.
-	This property MUST be symmetric, but may change with changing signal
-	format. I.e. if the property for DVI-1/VGA specifies VGA-1/VGA to be
-	cloned, VGA-1/VGA has to list DVI-1/VGA as well.
-	Outputs / format pairs listed in this property MUST be included in the
-	CompatibilityList.
-
-    "CompatibilityList"		aka RR_PROPERTY_COMPATIBILITY_LIST
-	Type:			int32 [2*n] / Atom pairs
-	Flags:			Immutable
-	Range/List:		0-
-
-	Some combinations of outputs on some cards cannot be served at all,
-	because the according encoder is only capable of driving one output at
-	a time.
-	This property lists all output + signal format pairs that can be
-	driven together with this output. NULL atoms specify any output / any
-	signal format, respectively.
-	This property MUST be symmetric, but may change with changing signal
-	format. I.e. if the property for DVI-1/TMDS specifies VGA-1/VGA to be
-	available, VGA-1/VGA has to list DVI-1/TMDS as well.
-
-    "ConnectorNumber"		aka RR_PROPERTY_CONNECTOR_NUMBER
-	Type:			int32
-	Flags:			Immutable, Static
-	Range/List:		0-
-
-	Outputs that route their signal to the same connector MUST
-	have the same connector number. Outputs with the same
-	connector number MUST route their signal to the same
-	connector, except if it is 0, which indicates unknown
-	connectivity. 1 is called the primary connector, 2 the
-	secondary. 3 is typically a TV connector, but that is completely
-	driver / hardware dependent.
-	Outputs with the same connector number SHOULD have the same
-	connector type. Meaning and client behavior for mismatching
-	connector types is undefined at the moment.
-
-    "ConnectorType"		aka RR_PROPERTY_CONNECTOR_TYPE
-	Type:			int32 / Atom
-	Flags:			Immutable, Static
-	Range/List:		unknown VGA DVI DVI‐I DVI‐A DVI‐D HDMI Panel
-				TV TV-Composite TV-SVideo TV-Component
-				TV-SCART TV-C4 DisplayPort
-
-	Connector type, as far as known to the driver.
-	Values with dashes (TV‐Composite) describe more specific versions of
-	the base values (TV). The former SHOULD be used if the connector is
-	not capable of producing other signal formats. The later SHOULD be
-	used if the exact connector is unknown, or the connector is a
-	multi‐format connector that is not described otherwise. DVI, for
-	instance, SHOULD be handled like a DVI‐I connector, unless additional
-	information is available to the user agent. PANEL describes
-	laptop‐internal (normally LVDS) displays. TV, TV‐SCART, TV‐Component,
-	and TV‐C4 with signal format VGA are valid combinations and describe
-	RGB TV signals.
-
-    "EDID"			aka RR_PROPERTY_RANDR_EDID
-	Type:			int8 [n]
-	Flags:			Immutable
-	Range/List:		-
-
-	Raw EDID data from the device attached to the according
-	output. Should include main EDID data and all extension
-	blocks. Previously known as EdidData.
-
-    "SignalFormat"		aka RR_PROPERTY_SIGNAL_FORMAT
-	Type:			int32 / Atom
-	Flags:			-
-	Range/List:		unknown VGA TMDS LVDS Composite Composite-PAL
-				Composite-NTSC Composite-SECAM SVideo
-				Component DisplayPort
-
-	Signal format / physical protocol format that is used for the
-	specified output. valid-values lists all possible formats on this
-	output, which SHOULD be a subset of the list above and MUST be static.
-	Values with dashes (Composite-PAL) describe more specific versions of
-	the base values (Composite) and SHOULD be used if known to the driver.
-	A driver MAY change this property of an output if the underlying
-	hardware indicates a protocol change (e.g. TV formats).  Clients are
-	allowed to change the signal format in order to select a different
-	signal format (e.g. Composite etc.) or physical protocol (e.g. VGA or
-	TMDS on DVI-I).
-	Laptop panels SHOULD not be detected with this property, but rather by
-	ConnectorType.
-
-    "SignalProperties"		aka RR_PROPERTY_SIGNAL_FORMAT
-	Type:			int32 [n] / Atom
-	Flags:			-
-	Range/List:		For Composite signals:
-				  NTSC NTSC-M NTSC-J NTSC-N NTSC-4.43 NTSC-film
-				  PAL PAL-B PAL-G PAL-H PAL-H PAL-I PAL-M PAL-D
-				  PAL-N PAL-Nc PAL-L PAL-60
-				  SECAM SECAM-L SECAM-B SECAM-G SECAM-D SECAM-K
-				  SECAM-H SECAM-K
-				For TMDS signals:
-				  SingleLink DualLink
-				For DisplayPort signals:
-				  Lane1 Lane2 Lane4 LowSpeed HiSpeed
-
-	Properties of the signal format that is currently used for the
-	specified output. valid-values lists all possible properties on this
-	output, which SHOULD be a subset of the list above. It will change if
-	SignalFormat changes.  Multiple properties are allowed.
-	Values with dashes (PAL-B) describe more specific versions of the base
-	values (PAL) and SHOULD be used if known to the driver.  A driver MAY
-	change this property of an output if the underlying hardware indicates
-	a signal change (e.g. TV formats).  Clients are allowed to change the
-	properties in order to select a different signal subformat.
-
-
-9.2 Properties introduced with version 1.2 of the RandR extension
-
-Property			Immutable	Mandatory since
-────────			─────────	───────────────
-EDID				yes		n/a
-
-EDID is provided by the RandR frontend, thus not driver specific.
-
-
-9.3 Properties introduced with version 1.3 of the RandR extension
-
-Property			Immutable	Mandatory since
-────────			─────────	───────────────
-CloneList			yes		not mandatory
-CompatibilityList		yes		not mandatory
-ConnectorNumber			yes: static	not mandatory
-ConnectorType			yes: static	RandR 1.3
-SignalFormat			no		RandR 1.3
-SignalProperties		no		not mandatory
-
-9.4 Properties introduced with version 1.4 of the RandR extension
-
-Property			Immutable	Mandatory since
-────────			─────────	───────────────
-Backlight			no		not mandatory
-
-                              ❧❧❧❧❧❧❧❧❧❧❧
-
-10. Extension Versioning
-
-The RandR extension was developed in parallel with the implementation
-to ensure the feasibility of various portions of the design. As
-portions of the extension are implemented, the version number of the
-extension has changed to reflect the portions of the standard provided.
-This document describes the version 1.2 of the specification, the
-partial implementations have version numbers less than that. Here's a
-list of what each version provided:
-
-	0.0: This prototype implemented resize and rotation in the
-	     TinyX server Used approximately the protocol described in
-	     the Usenix paper. Appeared in the TinyX server in
-	     XFree86 4.2, but not in the XFree86 main server.
-
-	0.1: Added subpixel order, added an event for subpixel order.
-	     This version was never checked in to XFree86 CVS.
-
-	1.0: Implements resize, rotation, and reflection. Implemented
-	     both in the XFree86 main server (size change only at this
-	     date), and fully (size change, rotation, and reflection)
-	     in XFree86's TinyX server.
-
-	1.1: Added refresh rates
-
-	1.2: Separate screens from CRTCs and outputs, switch to full VESA
-	     modes
-
-	1.3: Added cheap version of RRGetScreenResources.  Added CRTC
-	     transformations.  Added panning.  Added primary outputs.
-	     Added standard properties.
-
-Compatibility between 0.0 and 1.0 was *NOT* preserved, and 0.0 clients
-will fail against 1.0 servers. The wire encoding op-codes were
-changed for GetScreenInfo to ensure this failure in a relatively
-graceful way. Version 1.1 servers and clients are cross compatible with
-1.0. Version 1.1 is considered to be stable and we intend upward
-compatibility from this point. Version 1.2 offers an extended model of the
-system with multiple output support. Version 1.3 adds a cheap version of
-GetScreenResources to avoid expensive DDC operations, CRTC transformations,
-panning, and the primary output concept. 1.2 and 1.3 are backward-compatible
-with 1.1.
-
-                              ❧❧❧❧❧❧❧❧❧❧❧
-
-11. Relationship with other extensions
-
-Two other extensions have a direct relationship with this extension. This
-section attempts to explain how these three are supposed to work together.
-
-11.1 XFree86-VidModeExtension
-
-XFree86-VidModeExtension changes the configuration of a single monitor
-attached to the screen without changing the configuration of the screen
-itself. It provides the ability to specify new mode lines for the server to
-use along with selecting among existing mode lines. As it uses screen
-numbers instead of window identifiers, it can be used to affect multiple
-monitors in a single-screen Xinerama configuration. However, the association
-between screen numbers and root windows in a multi-Screen environment is not
-defined by the extension. Version 2.0 of this extension added the ability to
-adjust the DAC values in a TrueColor server to modify the brightness curves
-of the display.
-
-All of the utility of this extension is subsumed by RandR version 1.2, RandR
-should be used in preference to XFree86-VidModeExtension where both are
-present.
-
-11.2 Xinerama
-
-Xinerama provides a mechanism for describing the relationship between the
-overall screen display and monitors placed within that area. As such, it
-provides the query functionality of RandR 1.2 without any of the
-configuration functionality. Applications using Xinerama to discover
-monitor geometry can continue to do so, with the caveat that they will not be
-informed of changes when they occur. However, Xinerama configuration data
-will be updated, so applications selecting for RandR notification and
-re-querying the configuration with the Xinerama extension will get updated
-information. It is probably better to view RandR as a superset of Xinerama
-at this point and use it in preference to Xinerama where both are present.
-
-                              ❧❧❧❧❧❧❧❧❧❧❧
-
-Appendix A. Protocol Encoding
-
-Syntactic Conventions
-
-This document uses the same syntactic conventions as the core X
-protocol encoding document.
-
-A.1 Common Types
-
-┌───
-    ROTATION
-	0x0001	Rotate_0
-	0x0002	Rotate_90
-	0x0004	Rotate_180
-	0x0008	Rotate_270
-	0x0010	Reflect_X
-	0x0020	Reflect_Y
-└───
-	Used to encode both sets of possible rotations and individual
-	selected rotations.
-
-┌───
-    RRSELECTMASK
-	0x0001	ScreenChangeNotifyMask
-	0x0002	CrtcChangeNotifyMask		Added in version 1.2
-	0x0004	OutputChangeNotifyMask		Added in version 1.2
-	0x0008	OutputPropertyNotifyMask	Added in version 1.2
-└───
-      Event select mask for RRSelectInput
-
-┌───
-    RRCONFIGSTATUS
-	0x0 Success
-	0x1 InvalidConfigTime
-	0x2 InvalidTime
-	0x3 Failed
-└───
-	Return status for requests which depend on time.
-
-┌───
-    MODEINFO (32)				Added in version 1.2
-	4	CARD32		id
-	2	CARD16		width in pixels
-	2	CARD16		height in pixels
-	4	CARD32		dot clock
-	2	CARD16		h sync start
-	2	CARD16		h sync end
-	2	CARD16		h total
-	2	CARD16		h skew
-	2	CARD16		v sync start
-	2	CARD16		v sync end
-	2	CARD16		v total
-	2	CARD16		name length
-	4	SETofMODEFLAG	mode flags
-└───
-
-	An output mode specifies the complete CRTC timings for
-	a specific mode. The vertical and horizontal synchronization rates
-	can be computed given the dot clock and the h total/v total
-	values. If the dot clock is zero, then all of the timing
-	parameters and flags are not used, and must be zero as this
-	indicates that the timings are unknown or otherwise unused.
-	The name itself will be encoded separately in each usage.
-
-┌───
-    MODEFLAG
-	0x00000001	HSyncPositive
-	0x00000002	HSyncNegative
-	0x00000004	VSyncPositive
-	0x00000008	VSyncNegative
-	0x00000010	Interlace
-	0x00000020	DoubleScan
-	0x00000040	CSync
-	0x00000080	CSyncPositive
-	0x00000100	CSyncNegative
-	0x00000200	HSkewPresent
-	0x00000400	BCast
-	0x00000800	PixelMultiplex
-	0x00001000	DoubleClock
-	0x00002000	ClockDivideBy2
-└───
-┌───
-    CONNECTION
-	0		Connected
-	1		Disconnected
-	2		UnknownConnection
-└───
-
-
-A.2 Protocol Requests
-
-Opcodes 1 and 3 were used in the 0.0 protocols, and will return
-errors if used in version 1.0.
-
-┌───
-    RRQueryVersion
-
-	1	CARD8			major opcode
-	1	0			RandR opcode
-	2	3			length
-	4	CARD32			major version
-	4	CARD32			minor version
-      ▶
-	1	1			Reply
-        1				unused
-	2	CARD16			sequence number
-	4	0			reply length
-	1	CARD32			major version
-        1	CARD32			minor version
-└───
-┌───
-    RRSetScreenConfig
-
-	1	CARD8			major opcode
-	1	2			RandR opcode
-	2	6			length
-	4	WINDOW			window on screen to be configured
-	4	TIMESTAMP		timestamp
-	4	TIMESTAMP		config timestamp
-	2	SIZEID			size index
-	2	ROTATION		rotation/reflection
-	2	CARD16			refresh rate (1.1 only)
-	2	CARD16			pad
-      ▶
-	1	1			Reply
-	1	RRCONFIGSTATUS		status
-	2	CARD16			sequence number
-	4	0			reply length
-	4	TIMESTAMP		new timestamp
-	4	TIMESTAMP		new configuration timestamp
-	4	WINDOW			root
-	2	SUBPIXELORDER		subpixel order defined in Render
-	2	CARD16			pad4
-	4	CARD32			pad5
-	4	CARD32			pad6
-└───
-┌───
-    RRSelectInput
-
-	1	CARD8			major opcode
-	1	4			RandR opcode
-	2	3			length
-	4	WINDOW			window
-	2	SETofRRSELECTMASK	enable
-	2	CARD16			pad
-└───
-┌───
-    RRGetScreenInfo
-
-	1	CARD8			major opcode
-	1	5			RandR opcode
-	2	2			length
-	4	WINDOW			window
-      ▶
-	1	1			Reply
-	1	CARD8			set of Rotations
-	2	CARD16			sequence number
-	4	0			reply length
-	4	WINDOW			root window
-	4	TIMESTAMP		timestamp
-	4	TIMESTAMP		config timestamp
-	2	CARD16			number of SCREENSIZE following
-	2	SIZEID			current size index
-	2	ROTATION		current rotation and reflection
-	2	CARD16			current rate (added in version 1.1)
-	2	CARD16			length of rate info (number of CARD16s)
-	2	CARD16			pad
-
-	SCREENSIZE
-	2	CARD16			width in pixels
-	2	CARD16			height in pixels
-	2	CARD16			width in millimeters
-	2	CARD16			height in millimeters
-
-	REFRESH
-	2	CARD16			number of rates (n)
-	2n	CARD16			rates
-└───
-
-A.2.1 Protocol Requests added with version 1.2
-
-┌───
-    RRGetScreenSizeRange
-	1	CARD8			major opcode
-	1	6			RandR opcode
-	2	2			length
-	4	WINDOW			window
-      ▶
-	1	1			Reply
-	1				unused
-	2	CARD16			sequence number
-	4	0			reply length
-	2	CARD16			minWidth
-	2	CARD16			minHeight
-	2	CARD16			maxWidth
-	2	CARD16			maxHeight
-	16				unused
-└───
-┌───
-    RRSetScreenSize
-	1	CARD8			major opcode
-	1	7			RandR opcode
-	2	5			length
-	4	WINDOW			window
-	2	CARD16			width
-	2	CARD16			height
-	4	CARD32			width in millimeters
-	4	CARD32			height in millimeters
-└───
-┌───
-    RRGetScreenResources
-	1	CARD8			major opcode
-	1	8			RandR opcode
-	2	2			length
-	4	WINDOW			window
-      ▶
-	1	1			Reply
-	1				unused
-	2	CARD16			sequence number
-	4	c+o+8m+(b+p)/4		reply length
-	4	TIMESTAMP		timestamp
-	4	TIMESTAMP		config-timestamp
-	2	c			number of CRTCs
-	2	o			number of outputs
-	2	m			number of modeinfos
-	2	b			total bytes in mode names
-	8				unused
-	4c	LISTofCRTC		crtcs
-	4o	LISTofOUTPUT		outputs
-	32m	LISTofMODEINFO		modeinfos
-	b	STRING8			mode names
-	p				unused, p=pad(b)
-└───
-┌───
-    RRGetOutputInfo
-	1	CARD8			major opcode
-	1	9			RandR opcode
-	2	3			length
-	4	OUTPUT			output
-	4	TIMESTAMP		config-timestamp
-      ▶
-	1	1			Reply
-	1	RRCONFIGSTATUS		status
-	2	CARD16			sequence number
-	4	1+c+m+(n+p)/4		reply length
-	4	TIMESTAMP		timestamp
-	4	CRTC			current connected crtc
-	4	CARD32			width in millimeters
-	4	CARD32			height in millimeters
-	1	CONNECTION		connection
-	1	SUBPIXELORDER		subpixel-order
-	2	c			number of CRTCs
-	2	m			number of modes
-	2	p			number of preferred modes
-	2	o			number of clones
-	2	n			length of name
-	4c	LISTofCRTC		crtcs
-	4m	LISTofMODE		modes
-	4o	LISTofOUTPUT		clones
-	n	STRING8			name
-	p				unused, p=pad(n)
-└───
-┌───
-    RRListOutputProperties
-	1	CARD8			major opcode
-	1	10			RandR opcode
-	2	2			length
-	4	OUTPUT			output
-      ▶
-	1	1			Reply
-	1				unused
-	2	CARD16			sequence number
-	4	n			reply length
-	2	n			number of ATOMs in atoms
-	22				unused
-	4n	LISTofATOM		atoms
-└───
-┌───
-    RRQueryOutputProperty
-	1	CARD8			major opcode
-	1	11			RandR opcode
-	2	3			request length
-	4	OUTPUT			output
-	4	ATOM			property
-      ▶
-	1	1			Reply
-	1				unused
-	2	CARD16			sequence number
-	4	n			reply length
-	1	BOOL			pending
-	1	BOOL			range
-	1	BOOL			immutable
-	21				unused
-	4n	LISTofINT32		valid values
-└───
-┌───
-    RRConfigureOutputProperty
-	1	CARD8			major opcode
-	1	12			RandR opcode
-	2	4+n			request length
-	4	OUTPUT			output
-	4	ATOM			property
-	1	BOOL			pending
-	1	BOOL			range
-	2				unused
-	4n	LISTofINT32		valid values
-└───
-┌───
-    RRChangeOutputProperty
-	1	CARD8			major opcode
-	1	13			RandR opcode
-	2	6+(n+p)/4		request length
-	4	OUTPUT			output
-	4	ATOM			property
-	4	ATOM			type
-	1	CARD8			format
-	1				mode
-		0	Replace
-		1	Prepend
-		2	Append
-	2				unused
-	4	CARD32			length of data in format units
-					(= n for format = 8)
-					(= n/2 for format = 16)
-					(= n/4 for format = 32)
-	n	LISTofBYTE		data
-					(n is a multiple of 2 for format = 16)
-					(n is a multiple of 4 for format = 32)
-	p				unused, p=pad(n)
-└───
-┌───
-    RRDeleteOutputProperty
-	1	CARD8			major opcode
-	1	14			RandR opcode
-	2	3			request length
-	4	OUTPUT			output
-	4	ATOM			property
-└───
-┌───
-    RRGetOutputProperty
-	1	CARD8			major opcode
-	1	15			RandR opcode
-	2	7			request length
-	4	OUTPUT			output
-	4	ATOM			property
-	4	ATOM			type
-		0	AnyPropertyType
-	4	CARD32			long-offset
-	4	CARD32			long-length
-	1	BOOL			delete
-	1	BOOL			pending
-	2				unused
-      ▶
-	1	1			Reply
-	1	CARD8			format
-	2	CARD16			sequence number
-	4	(n+p)/4			reply length
-	4	ATOM			type
-		0	None
-	4	CARD32			bytes-after
-	4	CARD32			length of value in format units
-					(= 0 for format = 0)
-					(= n for format = 8)
-					(= n/2 for format = 16)
-					(= n/4 for format = 32)
-	12				unused
-	n	LISTofBYTE		value
-					(n is zero for format = 0)
-					(n is a multiple of 2 for format = 16)
-					(n is a multiple of 4 for format = 32)
-	p				unused, p=pad(n)
-└───
-┌───
-    RRCreateMode
-	1	CARD8			major opcode
-	1	16			RandR opcode
-	2	12+(n+p)/4		length
-	4	WINDOW			window
-	32	MODEINFO		mode
-	n	STRING8			mode name
-	p				unused, p=pad(n)
-      ▶
-	1	1			Reply
-	1				unused
-	2	CARD16			sequence number
-	4	0			reply length
-	4	MODE			mode
-	20				unused
-└───
-┌───
-    RRDestroyMode
-	1	CARD8			major opcode
-	1	17			RandR opcode
-	2	2			length
-	4	MODE			mode
-└───
-┌───
-    RRAddOutputMode
-	1	CARD8			major opcode
-	1	18			RandR opcode
-	2	3			length
-	4	OUTPUT			output
-	4	MODE			mode
-└───
-┌───
-    RRDeleteOutputMode
-	1	CARD8			major opcode
-	1	19			RandR opcode
-	2	3			length
-	4	OUTPUT			output
-	4	MODE			mode
-└───
-┌───
-    RRGetCrtcInfo
-	1	CARD8			major opcode
-	1	20			RandR opcode
-	2	3			length
-	4	CRTC			crtc
-	4	TIMESTAMP		config-timestamp
-      ▶
-	1	1			Reply
-	1	RRCONFIGSTATUS		status
-	2	CARD16			sequence number
-	4	o+p			reply length
-	4	TIMESTATMP		timestamp
-	2	INT16			x
-	2	INT16			y
-	2	CARD16			width
-	2	CARD16			height
-	4	MODE			mode
-	2	ROTATION		current rotation and reflection
-	2	ROTATION		set of possible rotations
-	2	o			number of outputs
-	2	p			number of possible outputs
-	4o	LISTofOUTPUT		outputs
-	4p	LISTofOUTPUT		possible outputs
-└───
-┌───
-    RRSetCrtcConfig
-	1	CARD8			major opcode
-	1	21			RandR opcode
-	2	7+2n			length
-	4	CRTC			crtc
-	4	TIMESTAMP		timestamp
-	4	TIMESTAMP		config timestamp
-	2	INT16			x
-	2	INT16			y
-	4	MODE			mode
-	2	ROTATION		rotation/reflection
-	2				unused
-	8n	LISTofOUTPUT		outputs
-      ▶
-	1	1			Reply
-	1	RRCONFIGSTATUS		status
-	2	CARD16			sequence number
-	4	0			reply length
-	4	TIMESTAMP		new timestamp
-	20				unused
-└───
-┌───
-    RRGetCrtcGammaSize
-	1	CARD8			major opcode
-	1	22			RandR opcode
-	2	2			length
-	4	CRTC			crtc
-      ▶
-	1	1			Reply
-	1				unused
-	2	CARD16			sequence number
-	4	0			reply length
-	2	CARD16			size
-	22				unused
-└───
-┌───
-    RRGetCrtcGamma
-	1	CARD8			major opcode
-	1	23			RandR opcode
-	2	2			length
-	4	CRTC			crtc
-      ▶
-	1	1			Reply
-	1				unused
-	2	CARD16			sequence number
-	4	(6n+2)/4		reply length
-	2	n			size
-	20				unused
-	2n	LISTofCARD16		red
-	2n	LISTofCARD16		green
-	2n	LISTofCARD16		blue
-	p				unused, p=pad(6n)
-└───
-┌───
-    RRSetCrtcGamma
-	1	CARD8			major opcode
-	1	24			RandR opcode
-	2	3+(6n+2)/4		length
-	4	CRTC			crtc
-	2	n			size
-	2				unused
-	2n	LISTofCARD16		red
-	2n	LISTofCARD16		green
-	2n	LISTofCARD16		blue
-	p				unused, p=pad(6n)
-└───
-
-A.2.2 Protocol Requests added with version 1.3
-
-┌───
-    RRGetScreenResourcesCurrent
-	1	CARD8			major opcode
-	1	25			RandR opcode
-	2	2			length
-	4	WINDOW			window
-      ▶
-	1	1			Reply
-	1				unused
-	2	CARD16			sequence number
-	4	c+o+8m+(b+p)/4		reply length
-	4	TIMESTAMP		timestamp
-	4	TIMESTAMP		config-timestamp
-	2	c			number of CRTCs
-	2	o			number of outputs
-	2	m			number of modeinfos
-	2	b			total bytes in mode names
-	8				unused
-	4c	LISTofCRTC		crtcs
-	4o	LISTofOUTPUT		outputs
-	32m	LISTofMODEINFO		modeinfos
-	b	STRING8			mode names
-	p				unused, p=pad(b)
-└───
-
-┌───
-    RRSetCrtcTransform
-	1	CARD8			major opcode
-	1	26			RandR opcode
-	2	12+(n+p)/4+v		length
-	4	CRTC			crtc
-	36	TRANSFORM		transform
-	2	CARD16			filter length
-	2				unused
-	n	STRING8			filter name
-	p				unused, p=pad(n)
-	4v	FIXED			filter params
-└───
-
-┌───
-    RRGetCrtcTransform
-	1	CARD8			major opcode
-	1	27			RandR opcode
-	2	2			length
-	4	CRTC			crtc
-      ▶
-	1	1			Reply
-	1				unused
-	2	CARD16			sequence number
-	4	16+(pn+pnp)/4+(cn+cnp)/4+pf+cf	reply length
-	36	TRANSFORM		pending transform
-	1	BOOL			has transforms
-	3				unused
-	36	TRANSFORM		current transform
-	4				unused
-	2	pn			pending filter name length
-	2	pf			pending filter num params
-	2	cn			current filter name length
-	2	cf			current filter num params
-	pn	STRING8			pending filter name
-	pnp				unused, pnp=pad(pn)
-	4*pf	FIXED			pending filter params
-	cn	STRING8			current filter name
-	cnp				unused, cnp=pad(cn)
-	4*cf	FIXED			current filter params
-└───
-
-┌───
-    RRGetPanning
-	1	CARD8			major opcode
-	1	28			RandR opcode
-	2	2			length
-	4	CRTC			crtc
-      ▶
-	1	1			Reply
-	1	RRCONFIGSTATUS		status
-	2	CARD16			sequence number
-	4	1			reply length
-	4	TIMESTAMP		timestamp
-	2	CARD16			left
-	2	CARD16			top
-	2	CARD16			width
-	2	CARD16			height
-	2	CARD16			track_left
-	2	CARD16			track_top
-	2	CARD16			track_width
-	2	CARD16			track_height
-	2	INT16			border_left
-	2	INT16			border_top
-	2	INT16			border_right
-	2	INT16			border_bottom
-└───
-┌───
-    RRSetPanning
-	1	CARD8			major opcode
-	1	29			RandR opcode
-	2	9			length
-	4	CRTC			crtc
-	4	TIMESTAMP		timestamp
-	2	CARD16			left
-	2	CARD16			top
-	2	CARD16			width
-	2	CARD16			height
-	2	CARD16			track_left
-	2	CARD16			track_top
-	2	CARD16			track_width
-	2	CARD16			track_height
-	2	INT16			border_left
-	2	INT16			border_top
-	2	INT16			border_right
-	2	INT16			border_bottom
-      ▶
-	1	1			Reply
-	1	RRCONFIGSTATUS		status
-	2	CARD16			sequence number
-	4	0			reply length
-	4	TIMESTAMP		new timestamp
-	20				unused
-└───
-
-┌───
-    RRSetOutputPrimary
-	1	CARD8			major opcode
-	1	30			RandR opcode
-	2	3			length
-	4	WINDOW			window
-	4	OUTPUT			output
-└───
-
-┌───
-    RRGetOutputPrimary
-	1	CARD8			major opcode
-	1	31			RandR opcode
-	2	2			length
-	4	WINDOW			window
-      ▶
-	1	1			Reply
-	1				unused
-	2	CARD16			sequence number
-	4	CARD32			length
-	4	OUTPUT			output
-	4	CARD32			pad1
-	4	CARD32			pad2
-	4	CARD32			pad3
-	4	CARD32			pad4
-└───
-
-A.3 Protocol Events
-
-┌───
-    RRScreenChangeNotify
-	1	Base + 0		code
-	1	ROTATION		new rotation and reflection
-	2	CARD16			sequence number
-	4	TIMESTAMP		timestamp
-	4	TIMESTAMP		configuration timestamp
-	4	WINDOW			root window
-	4	WINDOW			request window
-	2	SIZEID			size ID
-	2	SUBPIXELORDER		subpixel order defined in Render
-	2	CARD16			width in pixels
-	2	CARD16			height in pixels
-	2	CARD16			width in millimeters
-	2	CARD16			height in millimeters
-└───
-
-A.3.1 Protocol Events added with version 1.2
-
-┌───
-    RRCrtcChangeNotify
-	1	Base + 1		code
-	1	0			sub-code
-	2	CARD16			sequence number
-	4	TIMESTAMP		timestamp
-	4	WINDOW			request window
-	4	CRTC			crtc affected
-	4	MODE			mode in use
-	2	ROTATION		new rotation and reflection
-	2				unused
-	2	INT16			x
-	2	INT16			y
-	2	CARD16			width
-	2	CARD16			height
-└───
-┌───
-    RROutputChangeNotify
-	1	Base + 1		code
-	1	1			sub-code
-	2	CARD16			sequence number
-	4	TIMESTAMP		timestamp
-	4	TIMESTAMP		configuration timestamp
-	4	WINDOW			request window
-	4	OUTPUT			output affected
-	4	CRTC			crtc in use
-	4	MODE			mode in use
-	2	ROTATION		rotation in use
-	1	CONNECTION		connection status
-	1	SUBPIXELORDER		subpixel order
-└───
-┌───
-    RROutputPropertyNotify
-	1	Base + 1		code
-	1	2			sub-code
-	2	CARD16			sequence number
-	4	WINDOW			window
-	4	OUTPUT			output
-	4	ATOM			atom
-	4	TIMESTAMP		time
-	1				state
-		0	NewValue
-		1	Deleted
-	11				unused
-└───
-
-A.4 Protocol Errors
-
-┌───
-    ERRORS
-	Base + 0		Output
-	Base + 1		Crtc
-	Base + 2		Mode
-└───
-
-Bibliography
-
-[RANDR] Gettys, Jim and Keith Packard, "The X Resize and Rotate
-	Extension - RandR", Proceedings of the 2001 USENIX Annual
-	Technical Conference, Boston, MA
-
-[RENDER]
-	Packard, Keith, "The X Rendering Extension", work in progress,
-	http://cgit.freedesktop.org/xorg/proto/renderproto/tree/renderproto.txt
+	       The X Resize, Rotate and Reflect Extension

+			     Version 1.3.1

+			       2009-10-5

+

+			      Jim Gettys

+			   Jim.Gettys@hp.com

+		     Cambridge Research Laboratory

+				HP Labs

+			Hewlett Packard Company

+

+			     Keith Packard

+			keith.packard@intel.com

+		     Open Source Technology Center

+			   Intel Corporation

+

+1. Introduction

+

+The X Resize, Rotate and Reflect Extension, called RandR for short,

+brings the ability to resize, rotate and reflect the root window of a

+screen. It is based on the X Resize and Rotate Extension as specified

+in the Proceedings of the 2001 Usenix Technical Conference [RANDR].

+

+RandR as implemented and integrated into the X server differs in

+one substantial fashion from the design discussed in that paper: that

+is, RandR 1.0 does not implement the depth switching described in that

+document, and the support described for that in the protocol in that

+document and in the implementation has been removed from the

+protocol described here, as it has been overtaken by events.

+

+These events include:

+      ► Modern toolkits (in this case, GTK+ 2.x) have progressed to the point

+	of implementing migration between screens of arbitrary depths

+      ► The continued advance of Moore's law has made limited amounts of VRAM

+	less of an issue, reducing the pressure to implement depth switching

+	on laptops or desktop systems

+      ► The continued decline of legacy toolkits whose design would have

+	required depth switching to support migration

+      ► The lack of depth switching implementation experience in the

+	intervening time, due to events beyond our control

+

+Additionally, the requirement to support depth switching might

+complicate other re-engineering of the device independent part of the

+X server that is currently being contemplated.

+

+Rather than further delaying RandR's widespread deployment for a feature

+long wanted by the community (resizing of screens, particularly on laptops),

+or the deployment of a protocol design that might be flawed due to lack of

+implementation experience, we decided to remove depth switching from the

+protocol. It may be implemented at a later time if resources and

+interests permit as a revision to the protocol described here, which will

+remain a stable base for applications. The protocol described here has been

+implemented in the main X.org server, and more fully in the hw/kdrive

+implementation in the distribution, which fully implements resizing,

+rotation and reflection.

+

+1.2 Introduction to version 1.2 of the extension

+

+One of the significant limitations found in version 1.1 of the RandR

+protocol was the inability to deal with the Xinerama model where multiple

+monitors display portions of a common underlying screen. In this environment,

+zero or more video outputs are associated with each CRT controller which

+defines both a set of video timings and a 'viewport' within the larger

+screen. This viewport is independent of the overall size of the screen, and

+may be located anywhere within the screen.

+

+The effect is to decouple the reported size of the screen from the size

+presented by each video output, and to permit multiple outputs to present

+information for a single screen.

+

+To extend RandR for this model, we separate out the output, CRTC and screen

+configuration information and permit them to be configured separately. For

+compatibility with the 1.1 version of the protocol, we make the 1.1 requests

+simultaneously affect both the screen and the (presumably sole) CRTC and

+output. The set of available outputs are presented with UTF-8 encoded names

+and may be connected to CRTCs as permitted by the underlying hardware. CRTC

+configuration is now done with full mode information instead of just size

+and refresh rate, and these modes have names. These names also use UTF-8

+encoding. New modes may also be added by the user.

+

+Additional requests and events are provided for this new functionality.

+

+       ┌────────────────────────────────┬──────────┐

+    ┏━━━━━━━┳───────────────┐       ╔════════╗ ╔════════╗

+    ┃   1   ┃               │       ║   A    ║ ║   B    ║

+    ┃   ┏━━━╋━━━━━━━━━━━━━━━┫       ║        ║ ║        ║

+    ┣━━━╋━━━┛               ┃       ╚════════╝ ╚════════╝

+    │   ┃         2         ┃─────────────────┐

+    │   ┃                   ┃        ╔═══════════════════╗

+    │   ┃                   ┃        ║                   ║

+    │   ┗━━━━━━━━━━━━━━━━━━━┫        ║        C          ║

+    └───────────────────────┘        ║                   ║

+    ┌──────┐  ┏━━━━┓  ╔══════╗       ║                   ║

+    │screen│  ┃CRTC┃  ║output║       ╚═══════════════════╝

+    └──────┘  ┗━━━━┛  ╚══════╝

+

+In this picture, the screen is covered (incompletely) by two CRTCs. CRTC1

+is connected to two outputs, A and B. CRTC2 is connected to output C.

+Outputs A and B will present exactly the same region of the screen using

+the same mode line. Output C will present a different (larger) region of

+the screen using a different mode line.

+

+RandR provides information about each available CRTC and output; the

+connection between CRTC and output is under application control, although

+the hardware will probably impose restrictions on the possible

+configurations. The protocol doesn't try to describe these restrictions,

+instead it provides a mechanism to find out what combinations are supported.

+

+For instance, dual-link DVI gangs two CRTC outputs together to provide higher

+bandwidth for large resolution screens. This is exposed in RandR by

+requiring that nothing be connected to the second CRTC when driving a high

+resolution screen on the first.

+

+1.3 Introduction to version 1.3 of the extension

+

+Version 1.3 builds on the changes made with version 1.2 and adds some new

+capabilities without fundmentally changing the extension again. The

+following features are added in this version:

+

+   • Projective Transforms. The implementation work for general rotation

+     support made it trivial to add full projective transformations. These

+     can be used to scale the screen up/down as well as perform projector

+     keystone correct or other effects.

+

+   • Panning. It was removed with RandR 1.2 because the old semantics didn't

+     fit any longer. With RandR 1.3 panning can be specified per crtc.

+

+1.4 Introduction to version 1.4 of the extension

+

+Version 1.4 adds a couple more capabilities to further expose the

+underlying hardware to clients

+

+   • Per-crtc pixmaps. This provides for multiple scan-out buffers

+     which applications can create and assign to arbitrary collections

+     of crtcs.

+

+   • Sprite position and image transforms. These provide a projective

+     transform for both the hot spot location and the sprite image

+     itself for each CRTC.

+

+   • RRSetCrtcConfigs request. This supplies a set of

+     crtc configurations to the server that must be applied together

+     or not at all. This can reduce screen flicker while also

+     providing the server a complete configuration for appropriate

+     resource management.

+

+The first two additions, per-crtc pixmaps and sprite transforms are

+designed to solve two problems:

+

+ 1) Screen transforms. The software transform code in the X server

+    uses a shadow frame buffer, adding another copy to every graphics

+    operation. Worse, the server has no idea about when clients are

+    done drawing a frame, so the user gets additional latency and

+    judder.

+

+    The goal is to move this operation out to the compositing manager

+    which already deals with an extra copy of the frame buffer for

+    many operations. Have the compositing manager create and draw to a

+    separate pixmap for scanout. It can perform whatever transforms

+    are required to get the image in the right orientation for the

+    user.

+

+ 2) Hardware scanout engine size limits. With a single scanout buffer

+    for the entire screen, it's possible for the user to ask for a

+    configuration which requires that scanout buffer to be larger than

+    the hardware is capable of scanning out from. Again, having the

+    compositing manager create a pixmap for each CRTC will allow for

+    any configuration where monitor position within the virtual space

+    isn't limited by the scanout limits.

+

+In both of these cases, the Sprite transforms are necessary to ensure

+that the sprite appears at the desired spot on each CRTC and with the

+right shape.

+

+1.99 Acknowledgements

+

+Our thanks to the contributors to the design found on the xpert mailing

+list, in particular:

+

+Alan Hourihane for work on the early implementation

+Andrew C. Aitchison for help with the XFree86 DDX implementation

+Andy Ritger for early questions about how mergefb/Xinerama work with RandR

+Carl Worth for editing the specification and Usenix paper

+David Dawes for XFree86 DDX integration work

+Thomas Winischhofer for the hardware-accelerated SiS rotation implementation

+Matthew Tippett and Kevin Martin for splitting outputs and CRTCs to more

+fully expose what video hardware can do

+

+			      ❧❧❧❧❧❧❧❧❧❧❧

+

+2. Screen change model

+

+Screens may change dynamically, either under control of this extension, or

+due to external events. Examples include: monitors being swapped, pressing a

+button to switch from internal display to an external monitor on a laptop,

+or, eventually, the hotplug of a display card entirely on busses such as

+Cardbus or Express Card which permit hot-swap (which will require other work

+in addition to this extension).

+

+Since the screen configuration is dynamic and asynchronous to the client and

+may change at any time RandR provides mechanisms to ensure that your clients

+view is up to date with the configuration possibilities of the moment and

+enforces applications that wish to control the configuration to prove that

+their information is up to date before honoring requests to change the

+screen configuration (by requiring a timestamp on the request).

+

+Interested applications are notified whenever the screen configuration

+changes, providing the current size of the screen and subpixel order (see

+the Render extension [RENDER]), to enable proper rendering of subpixel

+decimated client text to continue, along with a time stamp of the

+configuration change. A client must refresh its knowledge of the screen

+configuration before attempting to change the configuration after a

+notification, or the request will fail.

+

+To avoid multiplicative explosion between orientation, reflection and sizes,

+the sizes are only those sizes in the normal (0) rotation.

+

+Rotation and reflection and how they interact can be confusing. In Randr,

+the coordinate system is rotated in a counter-clockwise direction relative

+to the normal orientation. Reflection is along the window system coordinate

+system, not the physical screen X and Y axis, so that rotation and

+reflection do not interact. The other way to consider reflection is to is

+specified in the "normal" orientation, before rotation, if you find the

+other way confusing.

+

+We expect that most clients and toolkits will be oblivious to changes to the

+screen structure, as they generally use the values in the connections Display

+structure directly. By toolkits updating the values on the fly, we believe

+pop-up menus and other pop up windows will position themselves correctly in

+the face of screen configuration changes (the issue is ensuring that pop-ups

+are visible on the reconfigured screen).

+

+			      ❧❧❧❧❧❧❧❧❧❧❧

+

+3. Data Types

+

+The subpixel order is shared with the Render extension, and is documented

+there. The only datatype defined is the screen size, defined in the normal

+(0 degree) orientation.

+

+			      ❧❧❧❧❧❧❧❧❧❧❧

+

+4. Errors

+

+Errors are sent using core X error reports.

+

+Output

+	A value for an OUTPUT argument does not name a defined OUTPUT.

+CRTC

+	A value for a CRTC argument does not name a defined CRTC.

+Mode

+	A value for a MODE argument does not name a defined MODE.

+

+			      ❧❧❧❧❧❧❧❧❧❧❧

+

+5. Protocol Types

+

+RRCONFIGSTATUS { Success

+		 InvalidConfigTime

+		 InvalidTime

+		 Failed }

+

+	A value of type RRCONFIGSTATUS returned when manipulating the output

+	configuration or querying information from the server that has some

+	time-dependency.

+

+	InvalidConfigTime indicates that the supplied configuration

+	timestamp does not match the current X server configuration

+	timestamp. Usually this means that the output configuration has

+	changed since the timestamp was received by the application.

+

+	InvalidTime indicates that the supplied output reconfiguration time

+	is earlier than the most recent output reconfiguration request.

+	Generally this indicates that another application has reconfigured

+	the output using a later timestamp.

+

+	Failed is returned whenever the operation is unsuccessful for some

+	other reason. This generally indicates that the requested output

+	configuration is unsupported by the hardware. The goal is to make

+	these limitations expressed by the protocol, but when that isn't

+	possible it is correct to return this error value. If, as a

+	implentor, you find this error code required, please submit the

+	hardware constraints that exist so that a future version of the

+	extension can correctly capture the configuration constraints in

+	your system.

+

+ROTATION { Rotate_0

+	   Rotate_90

+	   Rotate_180

+	   Rotate_270

+	   Reflect_X

+	   Reflect_Y }

+

+	These values are used both to indicate a set of allowed rotations

+	and reflections as well as to indicate a specific rotation and

+	reflection combination.

+

+RRSELECTMASK { RRScreenChangeNotifyMask

+	       RRCrtcChangeNotifyMask (New in version 1.2)

+	       RROutputChangeNotifyMask (New in version 1.2)

+	       RROutputPropertyNotifyMask (New in version 1.2) }

+

+SIZEID { CARD16 }

+

+MODE { XID or None }

+

+CRTC { XID }

+

+OUTPUT { XID }

+

+CONNECTION { Connected, Disconnected, UnknownConnection }

+

+	This value provides an indication of whether an output is actually

+	connected to a monitor or other presentation device.

+

+SUBPIXELORDER { SubPixelUnknown		The subpixel order uses the Render

+		SubPixelHorizontalRGB	extensions definitions; they are here

+		SubPixelHorizontalBGR	only for convenience.

+		SubPixelVerticalRGB

+		SubPixelVerticalBGR

+		SubPixelNone }

+

+SCREENSIZE { widthInPixels, heightInPixels: CARD16

+	     widthInMillimeters, heightInMillimeters: CARD16 }

+

+MODEFLAG { HSyncPositive

+	   HSyncNegative

+	   VSyncPositive

+	   VSyncNegative

+	   Interlace

+	   DoubleScan

+	   CSync

+	   CSyncPositive

+	   CSyncNegative

+	   HSkewPresent

+	   BCast

+	   PixelMultiplex

+	   DoubleClock

+	   ClockDivideBy2 }

+

+MODEINFO { id: MODE

+	   name: STRING

+	   width, height: CARD16

+	   dotClock: CARD32

+	   hSyncStart, hSyncEnd, hTotal, hSkew: CARD16

+	   vSyncStart, vSyncEnd, vTotal: CARD16

+	   modeFlags: SETofMODEFLAG }

+

+REFRESH { rates: LISTofCARD16 }

+

+			      ❧❧❧❧❧❧❧❧❧❧❧

+

+5.4. Protocol Types added in version 1.4 of the extension

+

+SCANOUTPIXMAPINFO { format: PICTFORMAT

+		    maxWidth, maxHeight: CARD16

+		    rotations: SETofROTATION }

+

+	'format' is the format of the pixels within the scanout

+	pixmap. Only 'Direct' formats are supported, this will never

+	be an 'Indexed' format.

+

+	'maxWidth' and 'maxHeight' define the largest supported

+	scanout pixmap. There is no minimum size; scanout pixmaps down

+	to 1x1 may be created.

+

+	'rotations' lists the set of rotations which can be provided

+	without additional latency or memory usage within the

+	environment. This typically means that they are supported

+	directly by the hardware. It is expected that a compositing

+	manager will perform other transforms as a part of the

+	compositing process in conjunction with the sprite transforms

+	described in this extension.

+

+CRTCCONFIG { crtc: CRTC

+	     x, y: INT16

+	     mode: MODE

+	     rotation: ROTATION

+	     sprite-position-transform: TRANSFORM

+	     sprite-image-transform: TRANSFORM

+	     outputs: LISTofOUTPUT

+	     pixmap: PIXMAP, None or CurrentScanoutPixmap

+	     pixmap-x, pixmap-y: INT16 }

+

+	The sprite-position-transform and sprite-image-transform

+	values are used as in the RRSetCrtcSpriteTransform request

+	position-transform and image-transform parameters.

+

+	'pixmap' specifies the origin of the pixel data to be presented on

+	'crtc'. If 'pixmap' is None, then data will be presented from

+	the screen pixmap. If 'pixmap' is 'CurrentScanoutPixmap', then

+	whatever source is currently in use will remain in use, whether

+	that is the screen pixmap or some other allocated scanout pixmap.

+

+	'pixmap-x' and 'pixmap-y' specify the origin of the scanout

+	data within the pixmap, the area from that location to

+	pixmap-x + width-of(mode), pixmap-y + height-of(mode) is what

+	will be seen on the connected outputs.

+

+	The pixmap value must specify a scanout pixmap as created by

+	RRCreateScanoutPixmap, or a Match error results.

+

+	The specified pixmap must be at least as large as the area to

+	be scanned out, or a Match error results.

+

+	The specified pixmap must have had the specified 'rotation'

+	included as a part of its creation paramaeters, or a Match

+	error results.

+

+	If 'pixmap' is destroyed while still being used as a scanout

+	pixmap, then the associated CRTC will have its scanout pixmap

+	set back to None, the CRTC origin set back to 0,0 (to make

+	sure it fits) and the screen pixmap width and height increased

+	to be at least as big as the current CRTC mode.

+

+			      ❧❧❧❧❧❧❧❧❧❧❧

+

+6. Extension Initialization

+

+The name of this extension is "RANDR".

+

+┌───

+    RRQueryVersion

+	client-major-version:	CARD32

+	client-minor-version:	CARD32

+      ▶

+	major-version:		CARD32

+	minor-version:		CARD32

+└───

+

+	The client sends the highest supported version to the server

+	and the server sends the highest version it supports, but no

+	higher than the requested version. Major versions changes can

+	introduce incompatibilities in existing functionality, minor

+	version changes introduce only backward compatible changes.

+	It is the clients responsibility to ensure that the server

+	supports a version which is compatible with its expectations.

+

+			      ❧❧❧❧❧❧❧❧❧❧❧

+

+7. Extension Requests

+

+┌───

+    RRSelectInput

+	window: WINDOW

+	enable: SETofRRSELECTMASK

+└───

+	Errors: Window, Value

+

+	If 'enable' is RRScreenChangeNotifyMask, RRScreenChangeNotify events

+	will be sent when the screen configuration changes, either from

+	this protocol extension, or due to detected external screen

+	configuration changes. RRScreenChangeNotify may also be sent when

+	this request executes if the screen configuration has changed since

+	the client connected, to avoid race conditions.

+

+	New for version 1.2:

+

+	If 'enable' contains RRCrtcChangeMask, RRCrtcChangeNotify events

+	will be sent when a the configuration for a CRTC associated with the

+	screen changes, either through this protocol extension or due to

+	detected external changes. RRCrtcChangeNotify may also be sent when

+	this request executes if the CRTC configuration has changed since

+	the client connected, to avoid race conditions.

+

+	If 'enable' contains RROutputChangeMask, RROutputChangeNotify events

+	will be sent when a the configuration for an output associated with

+	the screen changes, either through this protocol extension or due to

+	detected external changes. RROutputChangeNotify may also be sent

+	when this request executes if the output configuration has changed

+	since the client connected, to avoid race conditions.

+

+	If 'enable' contains RROutputPropertyNotifyMask,

+	RROutputPropertyNotify events will be sent when properties change on

+	this output.

+

+┌───

+    RRSetScreenConfig

+	window: WINDOW

+	timestamp: TIMESTAMP

+	config-timestamp: TIMESTAMP

+	size-id: SIZEID

+	rotation: ROTATION

+	rate: CARD16

+      ▶

+	status: RRCONFIGSTATUS

+	new-timestamp: TIMESTAMP

+	config-timestamp: TIMESTAMP

+	root: WINDOW

+	subpixelOrder: SUBPIXELORDER

+└───

+	Errors: Value, Match

+

+	If 'timestamp' is less than the time when the configuration was last

+	successfully set, the request is ignored and InvalidTime returned in

+	status.

+

+	If 'config-timestamp' is not equal to when the server's screen

+	configurations last changed, the request is ignored and

+	InvalidConfigTime returned in status. This could occur if the

+	screen changed since you last made a RRGetScreenInfo request,

+	perhaps by a different piece of display hardware being installed.

+	Rather than allowing an incorrect call to be executed based on stale

+	data, the server will ignore the request.

+

+	'rate' contains the desired refresh rate. If it is zero, the server

+	selects an appropriate rate.

+

+	This request may fail for other indeterminate reasons, in which case

+	'status' will be set to Failed and no configuration change will be

+	made.

+

+	This request sets the screen to the specified size, rate, rotation

+	and reflection.

+

+	When this request succeeds, 'status' contains Success and the

+	requested changes to configuration will have been made.

+

+	'new-time-stamp' contains the time at which this request was

+	executed.

+

+	'config-timestamp' contains the time when the possible screen

+	configurations were last changed.

+

+	'root' contains the root window for the screen indicated by the

+	window.

+

+	'subpixelOrder' contains the resulting subpixel order of the screen

+	to allow correct subpixel rendering.

+

+	Value errors are generated when 'rotation', 'rate' or 'size-id'

+	are invalid.

+

+┌───

+    RRGetScreenInfo

+	window: WINDOW

+      ▶

+	rotations: SETofROTATION

+	root: WINDOW

+	timestamp: TIMESTAMP

+	config-timestamp: TIMESTAMP

+	size-id: SIZEID

+	rotation: ROTATION

+	rate: CARD16

+	sizes: LISTofSCREENSIZE

+	refresh: LISTofREFRESH

+└───

+

+	Errors: Window

+

+	RRGetScreenInfo returns information about the current and available

+	configurations for the screen associated with 'window'.

+

+	'rotations' contains the set of rotations and reflections supported

+	by the screen.

+

+	'root' is the root window of the screen.

+

+	'config-timestamp' indicates when the screen configuration

+	information last changed: requests to set the screen will fail

+	unless the timestamp indicates that the information the client

+	is using is up to date, to ensure clients can be well behaved

+	in the face of race conditions.

+

+	'timestamp' indicates when the configuration was last set.

+

+	'size-id' indicates which size is active.

+

+	'rate' is the current refresh rate. This is zero when the refresh

+	rate is unknown or on devices for which refresh is not relevant.

+

+	'sizes' is the list of possible frame buffer sizes (at the normal

+	orientation. Each size indicates both the linear physical size of

+	the screen and the pixel size.

+

+	'refresh' is the list of refresh rates for each size. Each element

+	of 'sizes' has a corresponding element in 'refresh'. An empty list

+	indicates no known rates, or a device for which refresh is not

+	relevant.

+

+	The default size of the screen (the size that would become the

+	current size when the server resets) is the first size in the

+	list.

+

+7.1. Extension Requests added in version 1.2 of the extension

+

+As introduced above, version 1.2 of the extension splits the screen size

+from the crtc and output configuration, permitting the subset of the screen

+presented by multiple outputs to be configured. As a separate notion, the

+size of the screen itself may be arbitrarily configured within a defined

+range. As crtcs and outputs are added and removed from the system, the set

+returned by the extension will change so that applications can detect

+dynamic changes in the display environment.

+

+┌───

+    RRGetScreenSizeRange

+	window: WINDOW

+      ▶

+	CARD16	minWidth, minHeight

+	CARD16	maxWidth, maxHeight

+└───

+	Errors: Window

+

+	Returns the range of possible screen sizes. The screen may be set to

+	any size within this range.

+

+┌───

+    RRSetScreenSize

+	window: WINDOW

+	width: CARD16

+	height: CARD16

+	width-in-millimeters: CARD32

+	height-in-millimeters: CARD32

+└───

+	Errors: Window, Match, Value

+

+	Sets the screen to the specified size. 'width' and 'height' must be

+	within the range allowed by GetScreenSizeRanges, otherwise a Value

+	error results. All active monitors must be configured to display a

+	subset of the specified size, else a Match error results.

+

+	'width-in-millimeters' and 'height-in-millimeters' can be set to

+	reflect the physical size of the screen reported both through this

+	extension and the core protocol. They must be non-zero, or Value

+	error results.

+

+	If panning is enabled, the width and height of the panning and the

+	tracking areas are adapted to the new size and clamped afterwards.

+	Disabled panning axes remain disabled.

+	Panning borders are disabled if their requirements are no longer met

+	(see RRSetPanning).

+

+┌───

+    RRGetScreenResources

+	window: WINDOW

+      ▶

+	timestamp: TIMESTAMP

+	config-timestamp: TIMESTAMP

+	crtcs: LISTofCRTC

+	outputs: LISTofOUTPUT

+	modes: LISTofMODEINFO

+└───

+	Errors: Window

+

+	RRGetScreenResources returns the list of outputs and crtcs connected

+	to the screen associated with 'window'.

+

+	'timestamp' indicates when the configuration was last set.

+

+	'config-timestamp' indicates when the configuration information last

+	changed. Requests to configure the output will fail unless the

+	timestamp indicates that the information the client is using is up

+	to date, to ensure clients can be well behaved in the face of race

+	conditions.

+

+	'crtcs' contains the list of CRTCs associated with the screen.

+

+	'outputs' contains the list of outputs associated with the screen.

+

+	'modes' contains the list of modes associated with the screen

+

+	This request explicitly asks the server to ensure that the

+	configuration data is up-to-date wrt the hardware. If that requires

+	polling, this is when such polling would take place.  If the

+	current configuration is all that's required, use

+	RRGetScreenResourcesCurrent instead.

+

+┌───

+    RRGetOutputInfo

+	output: OUTPUT

+	config-timestamp: TIMESTAMP

+      ▶

+	status: RRCONFIGSTATUS

+	timestamp: TIMESTAMP

+	crtc: CRTC

+

+	name: STRING

+	connection: CONNECTION

+	subpixel-order: SUBPIXELORDER

+	widthInMillimeters, heightInMillimeters: CARD32

+	crtcs: LISTofCRTC

+	clones: LISTofOUTPUT

+	modes: LISTofMODE

+	num-preferred: CARD16

+└───

+	Errors: Output

+

+	RRGetOutputInfo returns information about the current and available

+	configurations 'output'.

+

+	If 'config-timestamp' does not match the current configuration

+	timestamp (as returned by RRGetScreenResources), 'status' is set to

+	InvalidConfigTime and the remaining reply data is empty. Otherwise,

+	'status' is set to Success.

+

+	'timestamp' indicates when the configuration was last set.

+

+	'crtc' is the current source CRTC for video data, or Disabled if the

+	output is not connected to any CRTC.

+

+	'name' is a UTF-8 encoded string designed to be presented to the

+	user to indicate which output this is. E.g. "S-Video" or "DVI".

+

+	'connection' indicates whether the hardware was able to detect a

+	device connected to this output. If the hardware cannot determine

+	whether something is connected, it will set this to

+	UnknownConnection.

+

+	'subpixel-order' contains the resulting subpixel order of the

+	connected device to allow correct subpixel rendering.

+

+	'widthInMillimeters' and 'heightInMillimeters' report the physical

+	size of the displayed area. If unknown, or not really fixed (e.g.,

+	for a projector), these	values are both zero.

+

+	'crtcs' is the list of CRTCs that this output may be connected to.

+	Attempting to connect this output to a different CRTC results in a

+	Match error.

+

+	'clones' is the list of outputs which may be simultaneously

+	connected to the same CRTC along with this output. Attempting to

+	connect this output with an output not in the 'clones' list

+	results in a Match error.

+

+	'modes' is the list of modes supported by this output. Attempting to

+	connect this output to a CRTC not using one of these modes results

+	in a Match error.

+

+	The first 'num-preferred' modes in 'modes' are preferred by the

+	monitor in some way; for fixed-pixel devices, this would generally

+	indicate which modes match the resolution of the output device.

+

+┌───

+    RRListOutputProperties

+	output:OUTPUT

+      ▶

+	atoms: LISTof ATOM

+└───

+	Errors: Output

+

+	This request returns the atoms of properties currently defined on

+	the output.

+

+┌───

+    RRQueryOutputProperty

+	output: OUTPUT

+	property: ATOM

+      ▶

+	pending: BOOL

+	range: BOOL

+	immutable: BOOL

+	valid-values: LISTofINT32

+└───

+	Errors: Name, Atom, Output

+

+	If the specified property does not exist for the specified output,

+	then a Name error is returned.

+

+	If 'pending' is TRUE, changes made to property values with

+	RRChangeOutputProperty will be saved in the pending property value

+	and be automatically copied to the current value on the next

+	RRSetCrtcConfig request involving the named output. If 'pending' is

+	FALSE, changes are copied immediately.

+

+	If 'range' is TRUE, then the valid-values list will contain

+	precisely two values indicating the minimum and maximum allowed

+	values. If 'range' is FALSE, then the valid-values list will contain

+	the list of possible values; attempts to set other values will

+	result in a Value error.

+

+	If 'immutable' is TRUE, then the property configuration cannot be

+	changed by clients. Immutable properties are interpreted by the X

+	server.

+

+┌───

+    RRConfigureOutputProperty

+	output: OUTPUT

+	property: ATOM

+	pending: BOOL

+	range: BOOL

+	valid-values: LISTofINT32

+└───

+	Errors: Access, Name, Atom, Output

+

+	If the specified property is 'immutable', an Access error is

+	returned.

+

+	Otherwise, the configuration of the specified property is changed to

+	the values provided in this request.

+

+	If the specified property does not exist for the specified output,

+	it is created with an empty value and None type.

+

+┌───

+    RRChangeOutputProperty

+	output: OUTPUT

+	property, type: ATOM

+	format: {8, 16, 32}

+	mode: { Replace, Prepend, Append }

+	data: LISTofINT8 or LISTofINT16 or LISTofINT32

+└───

+	Errors: Alloc, Atom, Match, Value, Output

+

+	This request alters the value of the property for the specified

+	output. If the property is marked as a 'pending' property, only the

+	pending value of the property is changed. Otherwise, changes are

+	reflected in both the pending and current values of the property.

+	The type is uninterpreted by the server.  The format specifies

+	whether the data should be viewed as a list of 8-bit, 16-bit, or

+	32-bit quantities so that the server can correctly byte-swap as

+	necessary.

+

+	If the mode is Replace, the previous property value is discarded.

+	If the mode is Prepend or Append, then the type and format must

+	match the existing property value (or a Match error results).  If

+	the property is undefined, it is treated as defined with the correct

+	type and format with zero-length data.

+

+	For Prepend, the data is tacked on to the beginning of the existing

+	data, and for Append, it is tacked on to the end of the existing data.

+

+	This request generates a OutputPropertyNotify

+

+	The lifetime of a property is not tied to the storing client.

+	Properties remain until explicitly deleted, until the output is

+	destroyed, or until server reset (see section 10).

+

+	The maximum size of a property is server-dependent and may vary

+	dynamically.

+

+┌───

+    RRDeleteOutputProperty

+	output: OUTPUT

+	property: ATOM

+└───

+	Errors: Atom, Output

+

+	This request deletes the property from the specified window if the

+	property exists and generates a OutputPropertyNotify event unless

+	the property does not exist.

+

+┌───

+    RRGetOutputProperty

+	output: OUTPUT

+	property: ATOM

+	type: ATOM or AnyPropertyType

+	long-offset, long-length: CARD32

+	delete: BOOL

+	pending: BOOL

+      ▶

+	type: ATOM or None

+	format: {0, 8, 16, 32}

+	bytes-after: CARD32

+	value: LISTofINT8 or LISTofINT16 or LISTofINT32

+└───

+	Errors: Atom, Value, Output

+

+	If the specified property does not exist for the specified output,

+	then the return type is None, the format and bytes-after are zero,

+	and the value is empty.  The delete argument is ignored in this

+	case.

+

+	If the specified property exists but its type does not match the

+	specified type, then the return type is the actual type of the

+	property, the format is the actual format of the property (never

+	zero), the bytes-after is the length of the property in bytes (even

+	if the format is 16 or 32), and the value is empty.  The delete

+	argument is ignored in this case.

+

+	If the specified property exists and either AnyPropertyType is

+	specified or the specified type matches the actual type of the

+	property, then the return type is the actual type of the property,

+	the format is the actual format of the property (never zero), and

+	the bytes-after and value are as follows, given:

+

+		N = actual length of the stored property in bytes

+				  (even if the format is 16 or 32)

+		I = 4 × offset

+		T = N - I

+		L = MINIMUM(T, 4 × long-length)

+		A = N - (I + L)

+

+	If 'pending' is true, and if the property holds a pending value,

+	then the value returned will be the pending value of the property

+	rather than the current value.  The returned value starts at byte

+	index I in the property (indexing from 0), and its length in bytes

+	is L.  However, it is a Value error if long-offset is given such

+	that L is negative.  The value of bytes-after is A, giving the

+	number of trailing unread bytes in the stored property.  If delete

+	is True and the bytes-after is zero, the property is also deleted

+	from the output, and a RROutputPropertyNotify event is generated.

+

+┌───

+    RRCreateMode

+	window: WINDOW

+	modeinfo: MODEINFO

+      ▶

+	mode: MODE

+└───

+	Errors: Window, Name, Value

+

+	'modeinfo' provides a new mode for outputs on the screen

+	associated with 'window'. If the name of 'modeinfo' names an

+	existing mode, a Name error is returned.  If some parameter of the

+	mode is not valid in some other way, a Value error is returned.

+

+	The returned 'mode' provides the id for the mode.

+

+┌───

+    RRDestroyMode

+	mode: MODE

+└───

+	Errors: Mode, Access

+

+	The user-defined 'mode' is destroyed. 'mode' must name a mode

+	defined with RRCreateMode, else an Match error is returned.  If

+	'mode' is in use by some CRTC or Output, then an Access error is

+	returned.

+

+┌───

+    RRAddOutputMode

+	output: OUTPUT

+	mode: MODE

+└───

+	Errors: Output, Mode, Match

+

+	'output' indicates which output is to be configured.

+

+	'mode' specifies which mode to add. If 'mode' is not valid for

+	'output', then a Match error is generated.

+

+	This request generates OutputChangeNotify events.

+

+┌───

+    RRDeleteOutputMode

+	output: OUTPUT

+	mode: MODE

+└───

+	Errors: Output, Mode

+

+	'output' indicates which output is to be configured.

+

+	'mode' specifies which mode to delete. 'mode' must have been added

+	with RRAddOutputMode, else an Access error is returned. 'mode' must

+	not be active, else a Match error is returned.

+

+	This request generates OutputChangeNotify events.

+

+┌───

+    RRGetCrtcInfo

+	crtc: CRTC

+	config-timestamp: TIMESTAMP

+      ▶

+	status: RRCONFIGSTATUS

+	timestamp: TIMESTAMP

+	x, y: INT16

+	width, height: CARD16

+	mode: MODE

+	rotation: ROTATION

+	outputs: LISTofOUTPUT

+

+	rotations: SETofROTATION

+	possible-outputs: LISTofOUTPUT

+└───

+

+	Errors: Window

+

+	RRGetCrtcModes returns information about the current and available

+	configurations for the specified crtc connected to the screen

+	associated with 'window'.

+

+	If 'config-timestamp' does not match the current configuration

+	timestamp (as returned by RRGetScreenResources), 'status' is set to

+	InvalidConfigTime and the remaining reply data is empty. Otherwise,

+	'status' is set to Success.

+

+	'timestamp' indicates when the configuration was last set.

+

+	'x' and 'y' indicate the position of this CRTC within the screen

+	region. They will be set to 0 when the CRTC is disabled.

+

+	'width' and 'height' indicate the size of the area within the screen

+	presented by this CRTC. This may be different than the size of the

+	mode due to rotation. They will be set to 0 when the CRTC

+	is disabled.

+

+	'mode' indicates which mode is active, or None indicating that the

+	CRTC has been disabled and is not displaying the screen contents.

+

+	'rotation' indicates the active rotation. It is set to Rotate_0

+	when the CRTC is disabled.

+

+	'outputs' is the list of outputs currently connected to this CRTC

+	and is empty when the CRTC is disabled.

+

+	'rotations' contains the set of rotations and reflections supported

+	by the CRTC.

+

+	'possible-outputs' lists all of the outputs which may be connected

+	to this CRTC.

+

+┌───

+    RRSetCrtcConfig

+	crtc: CRTC

+	timestamp: TIMESTAMP

+	config-timestamp: TIMESTAMP

+	x, y: INT16

+	mode: MODE

+	rotation: ROTATION

+	outputs: LISTofOUTPUT

+      ▶

+	status: RRCONFIGSTATUS

+	new-timestamp: TIMESTAMP

+└───

+	Errors: Value, Match

+

+	If 'timestamp' is less than the time when the configuration was last

+	successfully set, the request is ignored and InvalidTime returned in

+	status.

+

+	If 'config-timestamp' is not equal to when the monitor's

+	configuration last changed, the request is ignored and

+	InvalidConfigTime returned in status. This could occur if the

+	monitor changed since you last made a RRGetScreenInfo request,

+	perhaps by a different monitor being connected to the machine.

+	Rather than allowing an incorrect call to be executed based on stale

+	data, the server will ignore the request.

+

+	'x' and 'y' contain the desired location within the screen for this

+	monitor's content. 'x' and 'y' must be within the screen size, else

+	a Value error results.

+

+	'mode' is either the desired mode or None indicating the CRTC should

+	be disabled. If 'mode' is not one of these values, a Value

+	error results. 'mode' must be valid for all of the configured outputs,

+	else a Match error.

+

+	'rotation' contains the desired rotation along with which

+	reflections should be enabled. The rotation and reflection values

+	must be among those allowed for this monitor, else a Value error

+	results.

+

+	'outputs' contains the set of outputs that this CRTC should be

+	connected to. The set must be among the list of acceptable output

+	sets for this CRTC or a Match error results.

+

+	If 'mode' is None, then 'outputs' must be empty, else a Match error

+	results. Conversely, if 'mode' is not None, then 'outputs' must not be

+	empty, else a Match error results.

+

+	This request may fail for other indeterminate reasons, in which case

+	'status' will be set to Failed and no configuration change will be

+	made.

+

+	This request sets the CRTC to the specified position, mode, rotation

+	and reflection. The entire area of the CRTC must fit within the

+	screen size, else a Match error results. As an example, rotating the

+	screen so that a single CRTC fills the entire screen before and

+	after may necessitate disabling the CRTC, resizing the screen,

+	then re-enabling the CRTC at the new configuration to avoid an

+	invalid intermediate configuration.

+

+	If panning is enabled, the width and height of the panning and the

+	tracking areas are clamped to the new mode size.

+	Disabled panning axes remain disabled.

+	Panning borders are disabled if their requirements are no longer met

+	(see RRSetPanning).

+

+	When this request succeeds, 'status' contains Success and the

+	requested changes to configuration will have been made.

+

+	'new-time-stamp' contains the time at which this request was

+	executed.

+

+┌───

+    RRGetCrtcGammaSize

+	crtc: CRTC

+      ▶

+	size: CARD16

+└───

+	Errors: Crtc

+

+	This request returns the size of the gamma ramps used by 'crtc'.

+

+┌───

+    RRGetCrtcGamma

+	crtc: CRTC

+      ▶

+	red: LISTofCARD16

+	green: LISTofCARD16

+	blue: LISTofCARD16

+└───

+	Errors: Crtc

+

+	This request returns the currently set gamma ramps for 'crtc'.  All

+	three lists will be the size returned by the RRGetCrtcGammaSize

+	request.

+

+┌───

+    RRSetCrtcGamma

+	crtc: CRTC

+	red: LISTofCARD16

+	green: LISTofCARD16

+	blue: LISTofCARD16

+└───

+	Errors: Crtc, Match

+

+	This request sets the gamma ramps for 'crtc'. All three lists

+	must be the size returned by RRGetCrtcGammaSize else a Value error

+	results.

+

+7.2. Extension Requests added in version 1.3 of the extension

+

+┌───

+    RRGetScreenResourcesCurrent

+	window: WINDOW

+      ▶

+	timestamp: TIMESTAMP

+	config-timestamp: TIMESTAMP

+	crtcs: LISTofCRTC

+	outputs: LISTofOUTPUT

+	modes: LISTofMODEINFO

+└───

+	Errors: Window

+

+	RRGetScreenResourcesCurrent returns the list of outputs and crtcs

+	connected to the screen associated with 'window'.

+

+	'timestamp' indicates when the configuration was last set.

+

+	'config-timestamp' indicates when the configuration information last

+	changed. Requests to configure the output will fail unless the

+	timestamp indicates that the information the client is using is up

+	to date, to ensure clients can be well behaved in the face of race

+	conditions.

+

+	'crtcs' contains the list of CRTCs associated with the screen.

+

+	'outputs' contains the list of outputs associated with the screen.

+

+	'modes' contains the list of modes associated with the screen.

+

+	Unlike RRGetScreenResources, this merely returns the current

+	configuration, and does not poll for hardware changes.

+

+┌───

+    RRSetCrtcTransform

+	crtc: CRTC

+	transform: TRANSFORM

+	filter: STRING8

+	values: LISTofFIXED

+└───

+	Errors: Crtc, Match

+

+	This request provides a mechanism that is more general than the

+	existing rotation and reflection values for describing the

+	transformation from frame buffer image to crtc presentation.

+	'transform' is a full 2D projective transformation from screen

+	coordinate space to crtc coordinate space. This transformation is

+	applied before the rotation and reflection values to compute the

+	complete transform.

+

+	'filter' and 'values' specify a Render filter that may be used by the

+	server when transforming data from frame buffer to crtc.

+

+	This request sets the transform to be used at the next

+	RRSetCrtcConfig request execution; it does not cause any change to

+	occur in the current configuration.

+

+	When a non-identity transformation is in use, the rectangle returned

+	by RRGetCrtcInfo defines the bounding rectangle of the screen that is

+	projected to the crtc. It is this projected rectangle which must be

+	within the area of the screen when the mode is set.

+

+┌───

+    RRGetCrtcTransform

+	crtc: CRTC

+      ▶

+	pending-transform: TRANSFORM

+	pending-filter: STRING8

+	pending-values: LISTofFIXED

+	current-transform: TRANSFORM

+	current-filter: STRING8

+	current-values: LISTofFIXED

+└───

+

+	This request returns the pending and current transforms for the

+	specified CRTC. The pending transform will be the same as the current

+	transform if no new pending transform has been set since the last call

+	to RRSetCrtcConfig.

+

+┌───

+    RRGetPanning

+	crtc: CRTC

+      ▶

+	status: RRCONFIGSTATUS

+	timestamp: TIMESTAMP

+	left, top, width, height: CARD16

+	track_left, track_top, track_width, track_height: CARD16

+	border_left, border_top, border_right, border_bottom: INT16

+└───

+

+	Errors: Crtc

+

+	Version 1.3 adds panning support again. If multiple crtcs are active

+	the panning behavior can be defined per crtc individually.

+	RRGetPanning returns information about the currently set panning

+	configuration for the specified crtc.  If the CRTC does not support

+	panning, all fields (except timestamp) will be 0.

+

+	'timestamp' indicates when the configuration was last set.

+

+	All other entries are explained for RRSetPanning.

+

+┌───

+    RRSetPanning

+	crtc: CRTC

+	timestamp: TIMESTAMP

+	left, top, width, height: CARD16

+	track_left, track_top, track_width, track_height: CARD16

+	border_left, border_top, border_right, border_bottom: INT16

+      ▶

+	status: RRCONFIGSTATUS

+	new-timestamp: TIMESTAMP

+└───

+	Errors: Crtc, Match

+

+	This request sets the panning parameters.  As soon as panning is

+	enabled, the CRTC position can change with every pointer move.

+	RRCrtcChangeNotify events are sent to the clients requesting those.

+

+	If 'timestamp' is less than the time when the configuration was last

+	successfully set, the request is ignored and InvalidTime returned in

+	status.

+

+	┌──┳━━━━━━━━━━━━━━┳─────┬ ─ ─ ─ ─ ─ ┐

+	│  ┃     CRTC     ┃     │

+	│  ┃              ┃     │           │

+	│  ┃             X┃→    │

+	│  ┃              ┃     │           │  framebuffer

+	│  ┗━━━━━━━━━━━━━━┛     │

+	│                       │           │

+	│panning area           │

+	└───────────────────────┴ ─ ─ ─ ─ ─ ┘

+

+	'left', 'top', 'width', and 'height' contain the total panning area

+	for this CRTC.  'width' has to be larger than or equal to the CRTC's

+	width or 0, and 'left'+'width' must be within the screen size, else a

+	Match error results.  Equivalent restrictions for the height exist.

+	'width' or 'height' set to 0 indicate that panning should be disabled

+	on the according axis.  Setting 'width'/'height' to the CRTC's

+	width/height will disable panning on the X/Y axis as well, but

+	RRSetScreenSize will silently enable panning if the screen size is

+	increased. This does not happen if set to 0.

+

+	┌────────┳━━━━━━━━━━━━━━┳ ─ ─ ─ ─ ─ ┐

+	│        ┃     CRTC     ┃

+	│        ┃              ┃           │

+	│        ┃              ┃

+	│        ┃              ┃           │  tracking area

+	│        ┗━━━━━━━━━━━━━━┫     X

+	│               ↓       │     ↓     │

+	│panning area           │

+	└───────────────────────┴ ─ ─ ─ ─ ─ ┘

+

+	'track_left', 'track_top', 'track_width', and 'track_height' contain

+	the pointer area for which the panning region is updated.  For normal

+	use cases it should enclose the panning area minus borders, and is

+	typically set to either the panning area minus borders, or to the

+	total screen size. If set to the total screen size, the CRTC will pan

+	in the remaining axis even if the pointer is outside the panning area

+	on a different CRTC, as shown in the figure above. If the pointer is

+	outside the tracking area, the CRTC will not pan. Zero can be used as

+	an alias for the total screen size.

+

+	┌──┳━━━━━━━━━━━━━━┳────────────┐

+	│  ┃     CRTC     ┃            │

+	│  ┃              ┃            │

+	│  ┃              ┃→           │

+	│  ┃           X←→┃            │

+	│  ┃       border_right        │

+	│  ┗━━━━━━━━━━━━━━┛            │

+	│                              │

+	│panning area                  │

+	└──────────────────────────────┘

+

+	'border_left', 'border_top', 'border_right', and 'border_bottom'

+	define the distances from the CRTC borders that will activate panning

+	if the pointer hits them.  If the borders are 0, the screen will pan

+	when the pointer hits the CRTC borders (behavior of pre-RandR Xserver

+	panning).  If the borders are positive, the screen will pan when the

+	pointer gets close to the CRTC borders, if they are negative, the

+	screen will only pan when the pointer is already way past the CRTC

+	borders.  Negative values might confuse users and disable panning to

+	the very edges of the screen.  Thus they are discouraged.

+	border_left + border_right has to be lower or equal than the CRTC's

+	width, else a Match error results.  An equivalent restriction for the

+	height exists.

+

+	Screen size changes update the panning and the tracking areas to the

+	new size. Both screen size changes and mode changes clamp these areas

+	to the current CRTC size.  In these cases panning borders are disabled

+	if their requirements are no longer met.

+

+	When this request succeeds, 'status' contains Success and the

+	requested changes to configuration will have been made.

+

+	'new-time-stamp' contains the time at which this request was

+	executed.

+

+┌───

+    RRSetOutputPrimary

+	window: WINDOW

+	output: OUTPUT

+└───

+	Errors: Match, Output, Window

+

+	RRSetOutputPrimary marks 'output' as the primary output for the

+	screen with the same root window as 'window'. This output's CRTC

+	will be sorted to the front of the list in Xinerama and RANDR

+	geometry requests for the benefit of older applications. The

+	default primary output is None, and None is a legal value to pass

+	to RRSetOutputPrimary. This request is expected to be used by

+	desktop environments to mark the screen that should hold the primary

+	menu bar or panel.

+

+	As this changes the logical layout of the screen, ConfigureNotify

+	and RRScreenChangeNotify will be generated on the appropriate root

+	window when the primary output is changed by this call. This request

+	also generates RROutputChangeNotify events on the outputs that gained

+	and lost primary status.

+

+	If an output is disconnected asynchronously (eg. due to recabling),

+	the primary status does not change, but RROutputChangeNotify events

+	will be generated if the hardware is capable of detecting this;

+	clients are expected to reconfigure if appropriate.

+

+	If an output is deleted (eg. due to device hotplug), the server will

+	act as though None was passed to RRSetOutputPrimary, including

+	generating the appropriate events.

+

+┌───

+    RRGetOutputPrimary

+	window: WINDOW

+      ▶

+	output: OUTPUT

+└───

+	Errors: Window

+

+	RRGetOutputPrimary returns the primary output for the screen.

+

+			      ❧❧❧❧❧❧❧❧❧❧❧

+

+7.3. Extension Requests added in version 1.4 of the extension.

+

+┌───

+    RRQueryScanoutPixmaps

+	window: WINDOW

+      ▶

+	infos: LISTofSCANOUTPIXMAPINFO

+└───

+	Errors: Window

+

+	This request returns information about the server support for

+	alternate scanout pixmaps. For each pictformat, there is a set

+	of rotations and a maximum supported size. The rotations here

+	are those provided by the scanout hardware itself, not by

+	software emulation.

+

+┌───

+    RRCreateScanoutPixmap

+	pixmap: PIXMAP

+	drawable: DRAWABLE

+	width, height: CARD16

+	format: PICTFORMAT

+	rotations: SETofROTATION

+└───

+	Errors: Drawable, Match, Value

+

+	Creates a pixmap which can subsequently be used as a scanout

+	buffer for the screen associated with 'drawable'. 'rotations'

+	is the set of rotation values which may be used with the

+	resulting scanout buffer when it is associated with a CRTC.

+

+	'format' must be one of the supported scanout formats, or a

+	Match error results.

+

+	'width' and 'height' must be within the supported range for

+	the specified format or a Value error results.

+

+	'rotations' must be a subset of those supported for the

+	specified format or a Match error results.

+

+┌───

+    RRSetCrtcSpriteTransform

+	crtc: CRTC

+	position-transform: TRANSFORM

+	image-transform: TRANSFORM

+└───

+	Sets the sprite transforms for the specified crtc, any sprites

+	presented on this crtc will have their positions transformed

+	by the position-transform matrix. Sprite images displayed on the crtc

+	will be transformed by the image-transform matrix.

+

+┌───

+    RRGetCrtcSpriteTransform

+	crtc: CRTC

+      ▶

+	position-transform: TRANSFORM

+	image-transform: TRANSFORM

+└───

+	Gets the sprite transforms for the specified crtc.

+

+┌───

+    RRSetCrtcConfigs

+	drawable: DRAWABLE

+	screen-pixmap-width: CARD16

+	screen-pixmap-height: CARD16

+	screen-width: CARD16

+	screen-height: CARD16

+	width-in-millimeters: CARD32

+	height-in-millimeters: CARD32

+	configs: LISTofCRTCCONFIG

+      ▶

+	status: RRCONFIGSTATUS

+└───

+	Errors: Value, Match

+

+	This works much like RRSetScreenSize followed by a sequence of

+	RRSetCrtcConfig, except that the entire configuration is set

+	in a single operation, either succeeding or failing without

+	any partial execution.

+

+	In addition to the pre-1.4 semantics, this request adds the

+	ability to specific a scanout pixmap for each crtc, and

+	integrates the 1.4 sprite transform request as well.

+

+			      ❧❧❧❧❧❧❧❧❧❧❧

+

+8. Extension Events

+

+Clients MAY select for ConfigureNotify on the root window to be

+informed of screen changes. This may be advantageous if all your

+client needs to know is the size of the root window, as it avoids

+round trips to set up the extension.

+

+RRScreenChangeNotify is sent if RRSelectInput has requested it

+whenever properties of the screen change, which may be due to external

+factors, such as re-cabling a monitor, etc.

+

+┌───

+    RRScreenChangeNotify

+

+	rotation: ROTATION;		new rotation

+	sequenceNumber: CARD16		low 16 bits of request seq. number

+	timestamp: TIMESTAMP		time screen was changed

+	configTimestamp: TIMESTAMP	time config data was changed

+	root: WINDOW			root window of screen

+	window: WINDOW			window requesting notification

+	size-id: SIZEID			index of new SCREENSIZE

+	subpixelOrder: SUBPIXELORDER	order of subpixels

+	widthInPixels: CARD16		width in pixels of the new SCREENSIZE

+	heightInPixels: CARD16		height in pixels of the new SCREENSIZE

+	widthInMillimeters: CARD16	width in mm of the new SCREENSIZE

+	heightInMillimeters: CARD16	height in mm of the new SCREENSIZE

+└───

+	This event is generated whenever the screen configuration is changed

+	and sent to requesting clients. 'timestamp' indicates when the

+	screen configuration was changed. 'configTimestamp' says when the

+	last time the configuration was changed. 'root' is the root of the

+	screen the change occurred on, 'window' is window selecting for this

+	event. 'size-id' contains the index of the current size.

+

+	This event is sent whenever the screen's configuration changes

+	or if a new screen configuration becomes available that was

+	not available in the past. In this case (config-timestamp in

+	the event not being equal to the config-timestamp returned in

+	the last call to RRGetScreenInfo), the client MUST call

+	RRGetScreenInfo to update its view of possible screen

+	configurations to have a correct view of possible screen

+	organizations.

+

+	Clients which select screen change notification events may be

+	sent an event immediately if the screen configuration was

+	changed between when they connected to the X server and

+	selected for notification. This is to prevent a common race

+	that might occur on log-in, where many applications start up

+	just at the time when a display manager or log in script might

+	be changing the screen size or configuration.

+

+	Note that the sizes in this event reflect the new SCREENSIZE and

+	thus will appear rotated by the 'rotation' parameter from the sizes

+	of the screen itself. In other words, when rotation is 90 or 270,

+	widthInPixels in this event will be the same as the height value

+	from a ConfigureNotify that reflects the same size change. This

+	will probably confuse developers.

+

+8.1 Events added in version 1.2 of the RandR extension

+

+┌───

+    RROutputChangeNotify:

+	timestamp: TIMESTAMP		time screen was reconfigured

+	config-timestamp: TIMESTAMP	time available config data was changed

+	window: WINDOW			window requesting notification

+	output: OUTPUT			output affected by change

+	crtc: CRTC			connected CRTC or None

+	mode: MODE			mode in use on CRTC or None

+	connection: CONNECTION		connection status

+└───

+

+	This event is generated whenever the available output configurations

+	have changed and is sent to requesting clients. 'timestamp'

+	indicates when the crtc configuration was changed by a client.

+	'config-timestamp' says when the last time the available

+	configurations changed. 'root' is the root of the screen the change

+	occurred on, 'window' is window selecting for this event. The

+	precise change can be detected by examining the new state of the

+	system.

+

+┌───

+    RROutputPropertyNotify:

+	window: WINDOW			window requesting notification

+	output: OUTPUT			output affected by change

+	atom: ATOM			affected property

+	time: TIMESTAMP			time property was changed

+	subpixel-order: SUBPIXELORDER	order of subpixels

+	state: { NewValue, Deleted }	new property state

+└───

+

+	This event is reported to clients selecting RROutputPropertyChange

+	on the window and is generated with state NewValue when a property

+	of the window is changed using RRChangeOutputProperty even when

+	adding zero-length data and when replacing all or part of a property

+	with identical data.  It is generated with state Deleted when a

+	property of the window is deleted using either

+	RRDeleteOutputProperty or RRGetOutputProperty.  The timestamp

+	indicates the server time when the property was changed.

+

+┌───

+    RRCrtcChangeNotify

+	timestamp: TIMESTAMP		time monitor was changed

+	window: WINDOW			window requesting notification

+	crtc: CRTC			CRTC which changed

+	mode: MODE			new mode

+	rotation: ROTATION;		new rotation

+	x: INT16			x position of CRTC within screen

+	y: INT16			y position of CRTC within screen

+	width: CARD16			width of new mode

+	height: CARD16			height of new mode

+└───

+	This event is generated whenever the CRTC configuration is changed

+	and sent to requesting clients. 'timestamp' indicates when the

+	CRTC configuration was changed. 'window' is window selecting for this

+	event. 'mode' is the new mode, or None if the crtc is disabled.

+	'x' and 'y' mark the location in the screen where this CRTC

+	is reading data. 'width' and 'height' indicate the size of the

+	mode. 'x', 'y, 'width' and 'height' are all zero when 'mode' is None.

+

+	This event is sent whenever the monitor's configuration changes

+	or if a new monitor configuration becomes available that was

+	not available in the past. In this case, the client MUST call

+	RRGetCrtcModes to update its view of possible monitor

+	configurations to have a correct view of possible monitor

+	organizations.

+

+	Clients which select monitor change notification events may be

+	sent an event immediately if the monitor configuration was

+	changed between when they connected to the X server and

+	selected for notification. This is to prevent a common race

+	that might occur on log-in, where many applications start up

+	just at the time when a display manager or log in script might

+	be changing the monitor size or configuration.

+

+			      ❧❧❧❧❧❧❧❧❧❧❧

+

+9. Properties

+

+Properties are used for output specific parameters, and for announcing

+static or rarely changing data.  Announced data is typically

+immutable.  Properties are also used for evaluating new parameters

+before adding them to the RandR protocol.

+

+The following properties are hereby declared official, and drivers SHOULD

+prefix driver specific properties with '_', unless they are planned to be

+added to this specification.  List values, that are not declared by the table

+below, and will remain driver specific or are not planned to be added to this

+specification, SHOULD be prefixed with "_" as well in order to avoid name

+space or semantics clashes with future extensions of these values.

+

+Beginning with version 1.3 of the RandR extension, certain properties

+are mandatory and MUST be provided by implementations.  Earlier

+versions of the RandR extension MAY provide these properties as well,

+as long as the semantics are not altered.  Clients SHOULD fall back

+gracefully to lower version functionality, though, if the driver

+doesn't handle a mandatory property correctly.

+

+9.1 Known properties

+

+    "Backlight"			aka RR_PROPERTY_BACKLIGHT

+	Type:			int32

+	Flags:			-

+	Range/List:		0-x (driver specific)

+

+	This property controls the brightness on laptop panels and equivalent

+	displays with a backlight controller. The driver specific maximum

+	value MUST turn the backlight to full brightness, 1 SHOULD turn the

+	backlight to minimum brightness, 0 SHOULD turn the backlight off.

+

+    "CloneList"			aka RR_PROPERTY_CLONE_LIST

+	Type:			int32 [2*n] / Atom pairs

+	Flags:			Immutable

+	Range/List:		0-

+

+	Some combinations of outputs on some cards cannot be served

+	independently from each other, because they are wired up to the same

+	encoder outputs.

+	This property lists all output + signal format pairs that are

+	driven together with this output, and thus can only be programmed in

+	clone mode with the same CRTC.

+	This property MUST be symmetric, but may change with changing signal

+	format. I.e. if the property for DVI-1/VGA specifies VGA-1/VGA to be

+	cloned, VGA-1/VGA has to list DVI-1/VGA as well.

+	Outputs / format pairs listed in this property MUST be included in the

+	CompatibilityList.

+

+    "CompatibilityList"		aka RR_PROPERTY_COMPATIBILITY_LIST

+	Type:			int32 [2*n] / Atom pairs

+	Flags:			Immutable

+	Range/List:		0-

+

+	Some combinations of outputs on some cards cannot be served at all,

+	because the according encoder is only capable of driving one output at

+	a time.

+	This property lists all output + signal format pairs that can be

+	driven together with this output. NULL atoms specify any output / any

+	signal format, respectively.

+	This property MUST be symmetric, but may change with changing signal

+	format. I.e. if the property for DVI-1/TMDS specifies VGA-1/VGA to be

+	available, VGA-1/VGA has to list DVI-1/TMDS as well.

+

+    "ConnectorNumber"		aka RR_PROPERTY_CONNECTOR_NUMBER

+	Type:			int32

+	Flags:			Immutable, Static

+	Range/List:		0-

+

+	Outputs that route their signal to the same connector MUST

+	have the same connector number. Outputs with the same

+	connector number MUST route their signal to the same

+	connector, except if it is 0, which indicates unknown

+	connectivity. 1 is called the primary connector, 2 the

+	secondary. 3 is typically a TV connector, but that is completely

+	driver / hardware dependent.

+	Outputs with the same connector number SHOULD have the same

+	connector type. Meaning and client behavior for mismatching

+	connector types is undefined at the moment.

+

+    "ConnectorType"		aka RR_PROPERTY_CONNECTOR_TYPE

+	Type:			int32 / Atom

+	Flags:			Immutable, Static

+	Range/List:		unknown VGA DVI DVI‐I DVI‐A DVI‐D HDMI Panel

+				TV TV-Composite TV-SVideo TV-Component

+				TV-SCART TV-C4 DisplayPort

+

+	Connector type, as far as known to the driver.

+	Values with dashes (TV‐Composite) describe more specific versions of

+	the base values (TV). The former SHOULD be used if the connector is

+	not capable of producing other signal formats. The later SHOULD be

+	used if the exact connector is unknown, or the connector is a

+	multi‐format connector that is not described otherwise. DVI, for

+	instance, SHOULD be handled like a DVI‐I connector, unless additional

+	information is available to the user agent. PANEL describes

+	laptop‐internal (normally LVDS) displays. TV, TV‐SCART, TV‐Component,

+	and TV‐C4 with signal format VGA are valid combinations and describe

+	RGB TV signals.

+

+    "EDID"			aka RR_PROPERTY_RANDR_EDID

+	Type:			int8 [n]

+	Flags:			Immutable

+	Range/List:		-

+

+	Raw EDID data from the device attached to the according

+	output. Should include main EDID data and all extension

+	blocks. Previously known as EdidData.

+

+    "SignalFormat"		aka RR_PROPERTY_SIGNAL_FORMAT

+	Type:			int32 / Atom

+	Flags:			-

+	Range/List:		unknown VGA TMDS LVDS Composite Composite-PAL

+				Composite-NTSC Composite-SECAM SVideo

+				Component DisplayPort

+

+	Signal format / physical protocol format that is used for the

+	specified output. valid-values lists all possible formats on this

+	output, which SHOULD be a subset of the list above and MUST be static.

+	Values with dashes (Composite-PAL) describe more specific versions of

+	the base values (Composite) and SHOULD be used if known to the driver.

+	A driver MAY change this property of an output if the underlying

+	hardware indicates a protocol change (e.g. TV formats).  Clients are

+	allowed to change the signal format in order to select a different

+	signal format (e.g. Composite etc.) or physical protocol (e.g. VGA or

+	TMDS on DVI-I).

+	Laptop panels SHOULD not be detected with this property, but rather by

+	ConnectorType.

+

+    "SignalProperties"		aka RR_PROPERTY_SIGNAL_FORMAT

+	Type:			int32 [n] / Atom

+	Flags:			-

+	Range/List:		For Composite signals:

+				  NTSC NTSC-M NTSC-J NTSC-N NTSC-4.43 NTSC-film

+				  PAL PAL-B PAL-G PAL-H PAL-H PAL-I PAL-M PAL-D

+				  PAL-N PAL-Nc PAL-L PAL-60

+				  SECAM SECAM-L SECAM-B SECAM-G SECAM-D SECAM-K

+				  SECAM-H SECAM-K

+				For TMDS signals:

+				  SingleLink DualLink

+				For DisplayPort signals:

+				  Lane1 Lane2 Lane4 LowSpeed HiSpeed

+

+	Properties of the signal format that is currently used for the

+	specified output. valid-values lists all possible properties on this

+	output, which SHOULD be a subset of the list above. It will change if

+	SignalFormat changes.  Multiple properties are allowed.

+	Values with dashes (PAL-B) describe more specific versions of the base

+	values (PAL) and SHOULD be used if known to the driver.  A driver MAY

+	change this property of an output if the underlying hardware indicates

+	a signal change (e.g. TV formats).  Clients are allowed to change the

+	properties in order to select a different signal subformat.

+

+

+9.2 Properties introduced with version 1.2 of the RandR extension

+

+Property			Immutable	Mandatory since

+────────			─────────	───────────────

+EDID				yes		n/a

+

+EDID is provided by the RandR frontend, thus not driver specific.

+

+

+9.3 Properties introduced with version 1.3 of the RandR extension

+

+Property			Immutable	Mandatory since

+────────			─────────	───────────────

+CloneList			yes		not mandatory

+CompatibilityList		yes		not mandatory

+ConnectorNumber			yes: static	not mandatory

+ConnectorType			yes: static	RandR 1.3

+SignalFormat			no		RandR 1.3

+SignalProperties		no		not mandatory

+

+9.4 Properties introduced with version 1.3.1 of the RandR extension

+

+Property			Immutable	Mandatory since

+────────			─────────	───────────────

+Backlight			no		not mandatory

+

+			      ❧❧❧❧❧❧❧❧❧❧❧

+

+10. Extension Versioning

+

+The RandR extension was developed in parallel with the implementation

+to ensure the feasibility of various portions of the design. As

+portions of the extension are implemented, the version number of the

+extension has changed to reflect the portions of the standard provided.

+This document describes the version 1.2 of the specification, the

+partial implementations have version numbers less than that. Here's a

+list of what each version provided:

+

+	0.0: This prototype implemented resize and rotation in the

+	     TinyX server Used approximately the protocol described in

+	     the Usenix paper. Appeared in the TinyX server in

+	     XFree86 4.2, but not in the XFree86 main server.

+

+	0.1: Added subpixel order, added an event for subpixel order.

+	     This version was never checked in to XFree86 CVS.

+

+	1.0: Implements resize, rotation, and reflection. Implemented

+	     both in the XFree86 main server (size change only at this

+	     date), and fully (size change, rotation, and reflection)

+	     in XFree86's TinyX server.

+

+	1.1: Added refresh rates

+

+	1.2: Separate screens from CRTCs and outputs, switch to full VESA

+	     modes

+

+	1.3: Added cheap version of RRGetScreenResources.  Added CRTC

+	     transformations.  Added panning.  Added primary outputs.

+	     Added standard properties.

+

+Compatibility between 0.0 and 1.0 was *NOT* preserved, and 0.0 clients

+will fail against 1.0 servers. The wire encoding op-codes were

+changed for GetScreenInfo to ensure this failure in a relatively

+graceful way. Version 1.1 servers and clients are cross compatible with

+1.0. Version 1.1 is considered to be stable and we intend upward

+compatibility from this point. Version 1.2 offers an extended model of the

+system with multiple output support. Version 1.3 adds a cheap version of

+GetScreenResources to avoid expensive DDC operations, CRTC transformations,

+panning, and the primary output concept. 1.2 and 1.3 are backward-compatible

+with 1.1.

+

+			      ❧❧❧❧❧❧❧❧❧❧❧

+

+11. Relationship with other extensions

+

+Two other extensions have a direct relationship with this extension. This

+section attempts to explain how these three are supposed to work together.

+

+11.1 XFree86-VidModeExtension

+

+XFree86-VidModeExtension changes the configuration of a single monitor

+attached to the screen without changing the configuration of the screen

+itself. It provides the ability to specify new mode lines for the server to

+use along with selecting among existing mode lines. As it uses screen

+numbers instead of window identifiers, it can be used to affect multiple

+monitors in a single-screen Xinerama configuration. However, the association

+between screen numbers and root windows in a multi-Screen environment is not

+defined by the extension. Version 2.0 of this extension added the ability to

+adjust the DAC values in a TrueColor server to modify the brightness curves

+of the display.

+

+All of the utility of this extension is subsumed by RandR version 1.2, RandR

+should be used in preference to XFree86-VidModeExtension where both are

+present.

+

+11.2 Xinerama

+

+Xinerama provides a mechanism for describing the relationship between the

+overall screen display and monitors placed within that area. As such, it

+provides the query functionality of RandR 1.2 without any of the

+configuration functionality. Applications using Xinerama to discover

+monitor geometry can continue to do so, with the caveat that they will not be

+informed of changes when they occur. However, Xinerama configuration data

+will be updated, so applications selecting for RandR notification and

+re-querying the configuration with the Xinerama extension will get updated

+information. It is probably better to view RandR as a superset of Xinerama

+at this point and use it in preference to Xinerama where both are present.

+

+			      ❧❧❧❧❧❧❧❧❧❧❧

+

+Appendix A. Protocol Encoding

+

+Syntactic Conventions

+

+This document uses the same syntactic conventions as the core X

+protocol encoding document.

+

+A.1 Common Types

+

+┌───

+    ROTATION

+	0x0001	Rotate_0

+	0x0002	Rotate_90

+	0x0004	Rotate_180

+	0x0008	Rotate_270

+	0x0010	Reflect_X

+	0x0020	Reflect_Y

+└───

+	Used to encode both sets of possible rotations and individual

+	selected rotations.

+

+┌───

+    RRSELECTMASK

+	0x0001	ScreenChangeNotifyMask

+	0x0002	CrtcChangeNotifyMask		Added in version 1.2

+	0x0004	OutputChangeNotifyMask		Added in version 1.2

+	0x0008	OutputPropertyNotifyMask	Added in version 1.2

+└───

+      Event select mask for RRSelectInput

+

+┌───

+    RRCONFIGSTATUS

+	0x0 Success

+	0x1 InvalidConfigTime

+	0x2 InvalidTime

+	0x3 Failed

+└───

+	Return status for requests which depend on time.

+

+┌───

+    MODEINFO (32)				Added in version 1.2

+	4	CARD32		id

+	2	CARD16		width in pixels

+	2	CARD16		height in pixels

+	4	CARD32		dot clock

+	2	CARD16		h sync start

+	2	CARD16		h sync end

+	2	CARD16		h total

+	2	CARD16		h skew

+	2	CARD16		v sync start

+	2	CARD16		v sync end

+	2	CARD16		v total

+	2	CARD16		name length

+	4	SETofMODEFLAG	mode flags

+└───

+

+	An output mode specifies the complete CRTC timings for

+	a specific mode. The vertical and horizontal synchronization rates

+	can be computed given the dot clock and the h total/v total

+	values. If the dot clock is zero, then all of the timing

+	parameters and flags are not used, and must be zero as this

+	indicates that the timings are unknown or otherwise unused.

+	The name itself will be encoded separately in each usage.

+

+┌───

+    MODEFLAG

+	0x00000001	HSyncPositive

+	0x00000002	HSyncNegative

+	0x00000004	VSyncPositive

+	0x00000008	VSyncNegative

+	0x00000010	Interlace

+	0x00000020	DoubleScan

+	0x00000040	CSync

+	0x00000080	CSyncPositive

+	0x00000100	CSyncNegative

+	0x00000200	HSkewPresent

+	0x00000400	BCast

+	0x00000800	PixelMultiplex

+	0x00001000	DoubleClock

+	0x00002000	ClockDivideBy2

+└───

+┌───

+    CONNECTION

+	0		Connected

+	1		Disconnected

+	2		UnknownConnection

+└───

+

+

+A.2 Protocol Requests

+

+Opcodes 1 and 3 were used in the 0.0 protocols, and will return

+errors if used in version 1.0.

+

+┌───

+    RRQueryVersion

+

+	1	CARD8			major opcode

+	1	0			RandR opcode

+	2	3			length

+	4	CARD32			major version

+	4	CARD32			minor version

+      ▶

+	1	1			Reply

+	1				unused

+	2	CARD16			sequence number

+	4	0			reply length

+	1	CARD32			major version

+	1	CARD32			minor version

+└───

+┌───

+    RRSetScreenConfig

+

+	1	CARD8			major opcode

+	1	2			RandR opcode

+	2	6			length

+	4	WINDOW			window on screen to be configured

+	4	TIMESTAMP		timestamp

+	4	TIMESTAMP		config timestamp

+	2	SIZEID			size index

+	2	ROTATION		rotation/reflection

+	2	CARD16			refresh rate (1.1 only)

+	2	CARD16			pad

+      ▶

+	1	1			Reply

+	1	RRCONFIGSTATUS		status

+	2	CARD16			sequence number

+	4	0			reply length

+	4	TIMESTAMP		new timestamp

+	4	TIMESTAMP		new configuration timestamp

+	4	WINDOW			root

+	2	SUBPIXELORDER		subpixel order defined in Render

+	2	CARD16			pad4

+	4	CARD32			pad5

+	4	CARD32			pad6

+└───

+┌───

+    RRSelectInput

+

+	1	CARD8			major opcode

+	1	4			RandR opcode

+	2	3			length

+	4	WINDOW			window

+	2	SETofRRSELECTMASK	enable

+	2	CARD16			pad

+└───

+┌───

+    RRGetScreenInfo

+

+	1	CARD8			major opcode

+	1	5			RandR opcode

+	2	2			length

+	4	WINDOW			window

+      ▶

+	1	1			Reply

+	1	CARD8			set of Rotations

+	2	CARD16			sequence number

+	4	0			reply length

+	4	WINDOW			root window

+	4	TIMESTAMP		timestamp

+	4	TIMESTAMP		config timestamp

+	2	CARD16			number of SCREENSIZE following

+	2	SIZEID			current size index

+	2	ROTATION		current rotation and reflection

+	2	CARD16			current rate (added in version 1.1)

+	2	CARD16			length of rate info (number of CARD16s)

+	2	CARD16			pad

+

+	SCREENSIZE

+	2	CARD16			width in pixels

+	2	CARD16			height in pixels

+	2	CARD16			width in millimeters

+	2	CARD16			height in millimeters

+

+	REFRESH

+	2	CARD16			number of rates (n)

+	2n	CARD16			rates

+└───

+

+A.2.1 Protocol Requests added with version 1.2

+

+┌───

+    RRGetScreenSizeRange

+	1	CARD8			major opcode

+	1	6			RandR opcode

+	2	2			length

+	4	WINDOW			window

+      ▶

+	1	1			Reply

+	1				unused

+	2	CARD16			sequence number

+	4	0			reply length

+	2	CARD16			minWidth

+	2	CARD16			minHeight

+	2	CARD16			maxWidth

+	2	CARD16			maxHeight

+	16				unused

+└───

+┌───

+    RRSetScreenSize

+	1	CARD8			major opcode

+	1	7			RandR opcode

+	2	5			length

+	4	WINDOW			window

+	2	CARD16			width

+	2	CARD16			height

+	4	CARD32			width in millimeters

+	4	CARD32			height in millimeters

+└───

+┌───

+    RRGetScreenResources

+	1	CARD8			major opcode

+	1	8			RandR opcode

+	2	2			length

+	4	WINDOW			window

+      ▶

+	1	1			Reply

+	1				unused

+	2	CARD16			sequence number

+	4	c+o+8m+(b+p)/4		reply length

+	4	TIMESTAMP		timestamp

+	4	TIMESTAMP		config-timestamp

+	2	c			number of CRTCs

+	2	o			number of outputs

+	2	m			number of modeinfos

+	2	b			total bytes in mode names

+	8				unused

+	4c	LISTofCRTC		crtcs

+	4o	LISTofOUTPUT		outputs

+	32m	LISTofMODEINFO		modeinfos

+	b	STRING8			mode names

+	p				unused, p=pad(b)

+└───

+┌───

+    RRGetOutputInfo

+	1	CARD8			major opcode

+	1	9			RandR opcode

+	2	3			length

+	4	OUTPUT			output

+	4	TIMESTAMP		config-timestamp

+      ▶

+	1	1			Reply

+	1	RRCONFIGSTATUS		status

+	2	CARD16			sequence number

+	4	1+c+m+(n+p)/4		reply length

+	4	TIMESTAMP		timestamp

+	4	CRTC			current connected crtc

+	4	CARD32			width in millimeters

+	4	CARD32			height in millimeters

+	1	CONNECTION		connection

+	1	SUBPIXELORDER		subpixel-order

+	2	c			number of CRTCs

+	2	m			number of modes

+	2	p			number of preferred modes

+	2	o			number of clones

+	2	n			length of name

+	4c	LISTofCRTC		crtcs

+	4m	LISTofMODE		modes

+	4o	LISTofOUTPUT		clones

+	n	STRING8			name

+	p				unused, p=pad(n)

+└───

+┌───

+    RRListOutputProperties

+	1	CARD8			major opcode

+	1	10			RandR opcode

+	2	2			length

+	4	OUTPUT			output

+      ▶

+	1	1			Reply

+	1				unused

+	2	CARD16			sequence number

+	4	n			reply length

+	2	n			number of ATOMs in atoms

+	22				unused

+	4n	LISTofATOM		atoms

+└───

+┌───

+    RRQueryOutputProperty

+	1	CARD8			major opcode

+	1	11			RandR opcode

+	2	3			request length

+	4	OUTPUT			output

+	4	ATOM			property

+      ▶

+	1	1			Reply

+	1				unused

+	2	CARD16			sequence number

+	4	n			reply length

+	1	BOOL			pending

+	1	BOOL			range

+	1	BOOL			immutable

+	21				unused

+	4n	LISTofINT32		valid values

+└───

+┌───

+    RRConfigureOutputProperty

+	1	CARD8			major opcode

+	1	12			RandR opcode

+	2	4+n			request length

+	4	OUTPUT			output

+	4	ATOM			property

+	1	BOOL			pending

+	1	BOOL			range

+	2				unused

+	4n	LISTofINT32		valid values

+└───

+┌───

+    RRChangeOutputProperty

+	1	CARD8			major opcode

+	1	13			RandR opcode

+	2	6+(n+p)/4		request length

+	4	OUTPUT			output

+	4	ATOM			property

+	4	ATOM			type

+	1	CARD8			format

+	1				mode

+		0	Replace

+		1	Prepend

+		2	Append

+	2				unused

+	4	CARD32			length of data in format units

+					(= n for format = 8)

+					(= n/2 for format = 16)

+					(= n/4 for format = 32)

+	n	LISTofBYTE		data

+					(n is a multiple of 2 for format = 16)

+					(n is a multiple of 4 for format = 32)

+	p				unused, p=pad(n)

+└───

+┌───

+    RRDeleteOutputProperty

+	1	CARD8			major opcode

+	1	14			RandR opcode

+	2	3			request length

+	4	OUTPUT			output

+	4	ATOM			property

+└───

+┌───

+    RRGetOutputProperty

+	1	CARD8			major opcode

+	1	15			RandR opcode

+	2	7			request length

+	4	OUTPUT			output

+	4	ATOM			property

+	4	ATOM			type

+		0	AnyPropertyType

+	4	CARD32			long-offset

+	4	CARD32			long-length

+	1	BOOL			delete

+	1	BOOL			pending

+	2				unused

+      ▶

+	1	1			Reply

+	1	CARD8			format

+	2	CARD16			sequence number

+	4	(n+p)/4			reply length

+	4	ATOM			type

+		0	None

+	4	CARD32			bytes-after

+	4	CARD32			length of value in format units

+					(= 0 for format = 0)

+					(= n for format = 8)

+					(= n/2 for format = 16)

+					(= n/4 for format = 32)

+	12				unused

+	n	LISTofBYTE		value

+					(n is zero for format = 0)

+					(n is a multiple of 2 for format = 16)

+					(n is a multiple of 4 for format = 32)

+	p				unused, p=pad(n)

+└───

+┌───

+    RRCreateMode

+	1	CARD8			major opcode

+	1	16			RandR opcode

+	2	12+(n+p)/4		length

+	4	WINDOW			window

+	32	MODEINFO		mode

+	n	STRING8			mode name

+	p				unused, p=pad(n)

+      ▶

+	1	1			Reply

+	1				unused

+	2	CARD16			sequence number

+	4	0			reply length

+	4	MODE			mode

+	20				unused

+└───

+┌───

+    RRDestroyMode

+	1	CARD8			major opcode

+	1	17			RandR opcode

+	2	2			length

+	4	MODE			mode

+└───

+┌───

+    RRAddOutputMode

+	1	CARD8			major opcode

+	1	18			RandR opcode

+	2	3			length

+	4	OUTPUT			output

+	4	MODE			mode

+└───

+┌───

+    RRDeleteOutputMode

+	1	CARD8			major opcode

+	1	19			RandR opcode

+	2	3			length

+	4	OUTPUT			output

+	4	MODE			mode

+└───

+┌───

+    RRGetCrtcInfo

+	1	CARD8			major opcode

+	1	20			RandR opcode

+	2	3			length

+	4	CRTC			crtc

+	4	TIMESTAMP		config-timestamp

+      ▶

+	1	1			Reply

+	1	RRCONFIGSTATUS		status

+	2	CARD16			sequence number

+	4	o+p			reply length

+	4	TIMESTATMP		timestamp

+	2	INT16			x

+	2	INT16			y

+	2	CARD16			width

+	2	CARD16			height

+	4	MODE			mode

+	2	ROTATION		current rotation and reflection

+	2	ROTATION		set of possible rotations

+	2	o			number of outputs

+	2	p			number of possible outputs

+	4o	LISTofOUTPUT		outputs

+	4p	LISTofOUTPUT		possible outputs

+└───

+┌───

+    RRSetCrtcConfig

+	1	CARD8			major opcode

+	1	21			RandR opcode

+	2	7+2n			length

+	4	CRTC			crtc

+	4	TIMESTAMP		timestamp

+	4	TIMESTAMP		config timestamp

+	2	INT16			x

+	2	INT16			y

+	4	MODE			mode

+	2	ROTATION		rotation/reflection

+	2				unused

+	8n	LISTofOUTPUT		outputs

+      ▶

+	1	1			Reply

+	1	RRCONFIGSTATUS		status

+	2	CARD16			sequence number

+	4	0			reply length

+	4	TIMESTAMP		new timestamp

+	20				unused

+└───

+┌───

+    RRGetCrtcGammaSize

+	1	CARD8			major opcode

+	1	22			RandR opcode

+	2	2			length

+	4	CRTC			crtc

+      ▶

+	1	1			Reply

+	1				unused

+	2	CARD16			sequence number

+	4	0			reply length

+	2	CARD16			size

+	22				unused

+└───

+┌───

+    RRGetCrtcGamma

+	1	CARD8			major opcode

+	1	23			RandR opcode

+	2	2			length

+	4	CRTC			crtc

+      ▶

+	1	1			Reply

+	1				unused

+	2	CARD16			sequence number

+	4	(6n+2)/4		reply length

+	2	n			size

+	20				unused

+	2n	LISTofCARD16		red

+	2n	LISTofCARD16		green

+	2n	LISTofCARD16		blue

+	p				unused, p=pad(6n)

+└───

+┌───

+    RRSetCrtcGamma

+	1	CARD8			major opcode

+	1	24			RandR opcode

+	2	3+(6n+2)/4		length

+	4	CRTC			crtc

+	2	n			size

+	2				unused

+	2n	LISTofCARD16		red

+	2n	LISTofCARD16		green

+	2n	LISTofCARD16		blue

+	p				unused, p=pad(6n)

+└───

+

+A.2.2 Protocol Requests added with version 1.3

+

+┌───

+    RRGetScreenResourcesCurrent

+	1	CARD8			major opcode

+	1	25			RandR opcode

+	2	2			length

+	4	WINDOW			window

+      ▶

+	1	1			Reply

+	1				unused

+	2	CARD16			sequence number

+	4	c+o+8m+(b+p)/4		reply length

+	4	TIMESTAMP		timestamp

+	4	TIMESTAMP		config-timestamp

+	2	c			number of CRTCs

+	2	o			number of outputs

+	2	m			number of modeinfos

+	2	b			total bytes in mode names

+	8				unused

+	4c	LISTofCRTC		crtcs

+	4o	LISTofOUTPUT		outputs

+	32m	LISTofMODEINFO		modeinfos

+	b	STRING8			mode names

+	p				unused, p=pad(b)

+└───

+

+┌───

+    RRSetCrtcTransform

+	1	CARD8			major opcode

+	1	26			RandR opcode

+	2	12+(n+p)/4+v		length

+	4	CRTC			crtc

+	36	TRANSFORM		transform

+	2	CARD16			filter length

+	2				unused

+	n	STRING8			filter name

+	p				unused, p=pad(n)

+	4v	FIXED			filter params

+└───

+

+┌───

+    RRGetCrtcTransform

+	1	CARD8			major opcode

+	1	27			RandR opcode

+	2	2			length

+	4	CRTC			crtc

+      ▶

+	1	1			Reply

+	1				unused

+	2	CARD16			sequence number

+	4	16+(pn+pnp)/4+(cn+cnp)/4+pf+cf	reply length

+	36	TRANSFORM		pending transform

+	1	BOOL			has transforms

+	3				unused

+	36	TRANSFORM		current transform

+	4				unused

+	2	pn			pending filter name length

+	2	pf			pending filter num params

+	2	cn			current filter name length

+	2	cf			current filter num params

+	pn	STRING8			pending filter name

+	pnp				unused, pnp=pad(pn)

+	4*pf	FIXED			pending filter params

+	cn	STRING8			current filter name

+	cnp				unused, cnp=pad(cn)

+	4*cf	FIXED			current filter params

+└───

+

+┌───

+    RRGetPanning

+	1	CARD8			major opcode

+	1	28			RandR opcode

+	2	2			length

+	4	CRTC			crtc

+      ▶

+	1	1			Reply

+	1	RRCONFIGSTATUS		status

+	2	CARD16			sequence number

+	4	1			reply length

+	4	TIMESTAMP		timestamp

+	2	CARD16			left

+	2	CARD16			top

+	2	CARD16			width

+	2	CARD16			height

+	2	CARD16			track_left

+	2	CARD16			track_top

+	2	CARD16			track_width

+	2	CARD16			track_height

+	2	INT16			border_left

+	2	INT16			border_top

+	2	INT16			border_right

+	2	INT16			border_bottom

+└───

+┌───

+    RRSetPanning

+	1	CARD8			major opcode

+	1	29			RandR opcode

+	2	9			length

+	4	CRTC			crtc

+	4	TIMESTAMP		timestamp

+	2	CARD16			left

+	2	CARD16			top

+	2	CARD16			width

+	2	CARD16			height

+	2	CARD16			track_left

+	2	CARD16			track_top

+	2	CARD16			track_width

+	2	CARD16			track_height

+	2	INT16			border_left

+	2	INT16			border_top

+	2	INT16			border_right

+	2	INT16			border_bottom

+      ▶

+	1	1			Reply

+	1	RRCONFIGSTATUS		status

+	2	CARD16			sequence number

+	4	0			reply length

+	4	TIMESTAMP		new timestamp

+	20				unused

+└───

+

+┌───

+    RRSetOutputPrimary

+	1	CARD8			major opcode

+	1	30			RandR opcode

+	2	3			length

+	4	WINDOW			window

+	4	OUTPUT			output

+└───

+

+┌───

+    RRGetOutputPrimary

+	1	CARD8			major opcode

+	1	31			RandR opcode

+	2	2			length

+	4	WINDOW			window

+      ▶

+	1	1			Reply

+	1				unused

+	2	CARD16			sequence number

+	4	CARD32			length

+	4	OUTPUT			output

+	4	CARD32			pad1

+	4	CARD32			pad2

+	4	CARD32			pad3

+	4	CARD32			pad4

+└───

+

+A.3 Protocol Events

+

+┌───

+    RRScreenChangeNotify

+	1	Base + 0		code

+	1	ROTATION		new rotation and reflection

+	2	CARD16			sequence number

+	4	TIMESTAMP		timestamp

+	4	TIMESTAMP		configuration timestamp

+	4	WINDOW			root window

+	4	WINDOW			request window

+	2	SIZEID			size ID

+	2	SUBPIXELORDER		subpixel order defined in Render

+	2	CARD16			width in pixels

+	2	CARD16			height in pixels

+	2	CARD16			width in millimeters

+	2	CARD16			height in millimeters

+└───

+

+A.3.1 Protocol Events added with version 1.2

+

+┌───

+    RRCrtcChangeNotify

+	1	Base + 1		code

+	1	0			sub-code

+	2	CARD16			sequence number

+	4	TIMESTAMP		timestamp

+	4	WINDOW			request window

+	4	CRTC			crtc affected

+	4	MODE			mode in use

+	2	ROTATION		new rotation and reflection

+	2				unused

+	2	INT16			x

+	2	INT16			y

+	2	CARD16			width

+	2	CARD16			height

+└───

+┌───

+    RROutputChangeNotify

+	1	Base + 1		code

+	1	1			sub-code

+	2	CARD16			sequence number

+	4	TIMESTAMP		timestamp

+	4	TIMESTAMP		configuration timestamp

+	4	WINDOW			request window

+	4	OUTPUT			output affected

+	4	CRTC			crtc in use

+	4	MODE			mode in use

+	2	ROTATION		rotation in use

+	1	CONNECTION		connection status

+	1	SUBPIXELORDER		subpixel order

+└───

+┌───

+    RROutputPropertyNotify

+	1	Base + 1		code

+	1	2			sub-code

+	2	CARD16			sequence number

+	4	WINDOW			window

+	4	OUTPUT			output

+	4	ATOM			atom

+	4	TIMESTAMP		time

+	1				state

+		0	NewValue

+		1	Deleted

+	11				unused

+└───

+

+A.4 Protocol Errors

+

+┌───

+    ERRORS

+	Base + 0		Output

+	Base + 1		Crtc

+	Base + 2		Mode

+└───

+

+Bibliography

+

+[RANDR] Gettys, Jim and Keith Packard, "The X Resize and Rotate

+	Extension - RandR", Proceedings of the 2001 USENIX Annual

+	Technical Conference, Boston, MA

+

+[RENDER]

+	Packard, Keith, "The X Rendering Extension", work in progress,

+	http://cgit.freedesktop.org/xorg/proto/renderproto/tree/renderproto.txt

diff --git a/X11/extensions/shmstr.h b/X11/extensions/shmstr.h
index 635886053..7cd2933e0 100644
--- a/X11/extensions/shmstr.h
+++ b/X11/extensions/shmstr.h
@@ -1,66 +1,63 @@
-/* $XFree86: xc/include/extensions/shmstr.h,v 3.3 2001/12/14 19:53:29 dawes Exp $ */
-/************************************************************
-
-Copyright 1989, 1998  The Open Group
-
-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.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-********************************************************/
-
-/* THIS IS NOT AN X CONSORTIUM STANDARD OR AN X PROJECT TEAM SPECIFICATION */
-
-#ifndef _SHMSTR_H_
-#define _SHMSTR_H_
-
-/* $Xorg: shmstr.h,v 1.4 2001/02/09 02:03:24 xorgcvs Exp $ */
-
-#include <X11/extensions/shmproto.h>
-
-#ifdef _XSHM_SERVER_
-#define XSHM_PUT_IMAGE_ARGS \
-    DrawablePtr		/* dst */, \
-    GCPtr		/* pGC */, \
-    int			/* depth */, \
-    unsigned int	/* format */, \
-    int			/* w */, \
-    int			/* h */, \
-    int			/* sx */, \
-    int			/* sy */, \
-    int			/* sw */, \
-    int			/* sh */, \
-    int			/* dx */, \
-    int			/* dy */, \
-    char *		/* data */
-
-#define XSHM_CREATE_PIXMAP_ARGS \
-    ScreenPtr	/* pScreen */, \
-    int		/* width */, \
-    int		/* height */, \
-    int		/* depth */, \
-    char *	/* addr */
-
-typedef struct _ShmFuncs {
-    PixmapPtr	(* CreatePixmap)(XSHM_CREATE_PIXMAP_ARGS);
-    void	(* PutImage)(XSHM_PUT_IMAGE_ARGS);
-} ShmFuncs, *ShmFuncsPtr;
-#endif
-
-#endif /* _SHMSTR_H_ */
+/************************************************************

+

+Copyright 1989, 1998  The Open Group

+

+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.

+

+The above copyright notice and this permission notice shall be included in

+all copies or substantial portions of the Software.

+

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

+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE

+OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN

+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN

+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

+

+Except as contained in this notice, the name of The Open Group shall not be

+used in advertising or otherwise to promote the sale, use or other dealings

+in this Software without prior written authorization from The Open Group.

+

+********************************************************/

+

+/* THIS IS NOT AN X CONSORTIUM STANDARD OR AN X PROJECT TEAM SPECIFICATION */

+

+#ifndef _SHMSTR_H_

+#define _SHMSTR_H_

+

+#include <X11/extensions/shmproto.h>

+

+#ifdef _XSHM_SERVER_

+#define XSHM_PUT_IMAGE_ARGS \

+    DrawablePtr		/* dst */, \

+    GCPtr		/* pGC */, \

+    int			/* depth */, \

+    unsigned int	/* format */, \

+    int			/* w */, \

+    int			/* h */, \

+    int			/* sx */, \

+    int			/* sy */, \

+    int			/* sw */, \

+    int			/* sh */, \

+    int			/* dx */, \

+    int			/* dy */, \

+    char *		/* data */

+

+#define XSHM_CREATE_PIXMAP_ARGS \

+    ScreenPtr	/* pScreen */, \

+    int		/* width */, \

+    int		/* height */, \

+    int		/* depth */, \

+    char *	/* addr */

+

+typedef struct _ShmFuncs {

+    PixmapPtr	(* CreatePixmap)(XSHM_CREATE_PIXMAP_ARGS);

+    void	(* PutImage)(XSHM_PUT_IMAGE_ARGS);

+} ShmFuncs, *ShmFuncsPtr;

+#endif

+

+#endif /* _SHMSTR_H_ */

diff --git a/X11/extensions/sync.h b/X11/extensions/sync.h
index 460bf56ca..0ed5b728d 100644
--- a/X11/extensions/sync.h
+++ b/X11/extensions/sync.h
@@ -335,6 +335,39 @@ extern Status XSyncGetPriority(
     int* /*return_priority*/

 );

 

+extern XSyncFence XSyncCreateFence(

+    Display* /*dpy*/,

+    Drawable /*d*/,

+    Bool /*initially_triggered*/

+);

+

+extern Bool XSyncTriggerFence(

+    Display* /*dpy*/,

+    XSyncFence /*fence*/

+);

+

+extern Bool XSyncResetFence(

+    Display* /*dpy*/,

+    XSyncFence /*fence*/

+);

+

+extern Bool XSyncDestroyFence(

+    Display* /*dpy*/,

+    XSyncFence /*fence*/

+);

+

+extern Bool XSyncQueryFence(

+    Display* /*dpy*/,

+    XSyncFence /*fence*/,

+    Bool* /*triggered*/

+);

+

+extern Bool XSyncAwaitFence(

+    Display* /*dpy*/,

+    const XSyncFence* /*fence_list*/,

+    int /*n_fences*/

+);

+

 _XFUNCPROTOEND

 

 #endif /* _SYNC_SERVER */

diff --git a/X11/extensions/syncconst.h b/X11/extensions/syncconst.h
index 926b60cb7..33e77e99c 100644
--- a/X11/extensions/syncconst.h
+++ b/X11/extensions/syncconst.h
@@ -1,179 +1,181 @@
-/*
-
-Copyright 1991, 1993, 1994, 1998  The Open Group
-
-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.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-
-/***********************************************************
-Copyright 1991,1993 by Digital Equipment Corporation, Maynard, Massachusetts,
-and Olivetti Research Limited, Cambridge, England.
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-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 names of Digital or Olivetti
-not be used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
-
-DIGITAL AND OLIVETTI DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
-SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS, IN NO EVENT SHALL THEY 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.
-
-******************************************************************/
-
-#ifndef _SYNCCONST_H_
-#define _SYNCCONST_H_
-
-#define SYNC_NAME "SYNC"
-
-#define SYNC_MAJOR_VERSION	3
-#define SYNC_MINOR_VERSION	0
-
-
-#define XSyncCounterNotify              0
-#define XSyncAlarmNotify		1
-#define XSyncAlarmNotifyMask 		(1L << XSyncAlarmNotify)
-
-#define XSyncNumberEvents		2L
-
-#define XSyncBadCounter			0L
-#define XSyncBadAlarm			1L
-#define XSyncNumberErrors		(XSyncBadAlarm + 1)
-
-/*
- * Flags for Alarm Attributes
- */
-#define XSyncCACounter			(1L<<0)
-#define XSyncCAValueType		(1L<<1)
-#define XSyncCAValue			(1L<<2)
-#define XSyncCATestType			(1L<<3)
-#define XSyncCADelta			(1L<<4)
-#define XSyncCAEvents			(1L<<5)
-
-/*  The _XSync macros below are for library internal use only.  They exist
- *  so that if we have to make a fix, we can change it in this one place
- *  and have both the macro and function variants inherit the fix.
- */
-
-#define _XSyncIntToValue(pv, i)     ((pv)->hi=((i<0)?~0:0),(pv)->lo=(i))
-#define _XSyncIntsToValue(pv, l, h) ((pv)->lo = (l), (pv)->hi = (h))
-#define _XSyncValueGreaterThan(a, b)\
-    ((a).hi>(b).hi || ((a).hi==(b).hi && (a).lo>(b).lo))
-#define _XSyncValueLessThan(a, b)\
-    ((a).hi<(b).hi || ((a).hi==(b).hi && (a).lo<(b).lo))
-#define _XSyncValueGreaterOrEqual(a, b)\
-    ((a).hi>(b).hi || ((a).hi==(b).hi && (a).lo>=(b).lo))
-#define _XSyncValueLessOrEqual(a, b)\
-    ((a).hi<(b).hi || ((a).hi==(b).hi && (a).lo<=(b).lo))
-#define _XSyncValueEqual(a, b)	((a).lo==(b).lo && (a).hi==(b).hi)
-#define _XSyncValueIsNegative(v) (((v).hi & 0x80000000) ? 1 : 0)
-#define _XSyncValueIsZero(a)	((a).lo==0 && (a).hi==0)
-#define _XSyncValueIsPositive(v) (((v).hi & 0x80000000) ? 0 : 1)
-#define _XSyncValueLow32(v)	((v).lo)
-#define _XSyncValueHigh32(v)	((v).hi)
-#define _XSyncValueAdd(presult,a,b,poverflow) {\
-	int t = (a).lo;\
-	Bool signa = XSyncValueIsNegative(a);\
-	Bool signb = XSyncValueIsNegative(b);\
-	((presult)->lo = (a).lo + (b).lo);\
-	((presult)->hi = (a).hi + (b).hi);\
-	if (t>(presult)->lo) (presult)->hi++;\
-	*poverflow = ((signa == signb) && !(signa == XSyncValueIsNegative(*presult)));\
-     }
-#define _XSyncValueSubtract(presult,a,b,poverflow) {\
-	int t = (a).lo;\
-	Bool signa = XSyncValueIsNegative(a);\
-	Bool signb = XSyncValueIsNegative(b);\
-	((presult)->lo = (a).lo - (b).lo);\
-	((presult)->hi = (a).hi - (b).hi);\
-	if (t<(presult)->lo) (presult)->hi--;\
-	*poverflow = ((signa == signb) && !(signa == XSyncValueIsNegative(*presult)));\
-     }
-#define _XSyncMaxValue(pv) ((pv)->hi = 0x7fffffff, (pv)->lo = 0xffffffff)
-#define _XSyncMinValue(pv) ((pv)->hi = 0x80000000, (pv)->lo = 0)
-
-/*
- *  These are the publically usable macros.  If you want the function version
- *  of one of these, just #undef the macro to uncover the function.
- *  (This is the same convention that the ANSI C library uses.)
- */
-
-#define XSyncIntToValue(pv, i) _XSyncIntToValue(pv, i)
-#define XSyncIntsToValue(pv, l, h) _XSyncIntsToValue(pv, l, h)
-#define XSyncValueGreaterThan(a, b) _XSyncValueGreaterThan(a, b)
-#define XSyncValueLessThan(a, b) _XSyncValueLessThan(a, b)
-#define XSyncValueGreaterOrEqual(a, b) _XSyncValueGreaterOrEqual(a, b)
-#define XSyncValueLessOrEqual(a, b) _XSyncValueLessOrEqual(a, b)
-#define XSyncValueEqual(a, b) _XSyncValueEqual(a, b)
-#define XSyncValueIsNegative(v) _XSyncValueIsNegative(v)
-#define XSyncValueIsZero(a) _XSyncValueIsZero(a)
-#define XSyncValueIsPositive(v) _XSyncValueIsPositive(v)
-#define XSyncValueLow32(v) _XSyncValueLow32(v)
-#define XSyncValueHigh32(v) _XSyncValueHigh32(v)
-#define XSyncValueAdd(presult,a,b,poverflow) _XSyncValueAdd(presult,a,b,poverflow)
-#define XSyncValueSubtract(presult,a,b,poverflow) _XSyncValueSubtract(presult,a,b,poverflow)
-#define XSyncMaxValue(pv) _XSyncMaxValue(pv)
-#define XSyncMinValue(pv) _XSyncMinValue(pv)
-
-/*
- * Constants for the value_type argument of various requests
- */
-typedef enum {
-    XSyncAbsolute,
-    XSyncRelative
-} XSyncValueType;
-
-/*
- * Alarm Test types
- */
-typedef enum {
-    XSyncPositiveTransition,
-    XSyncNegativeTransition,
-    XSyncPositiveComparison,
-    XSyncNegativeComparison
-} XSyncTestType;
-
-/*
- * Alarm state constants
- */
-typedef enum {
-    XSyncAlarmActive,
-    XSyncAlarmInactive,
-    XSyncAlarmDestroyed
-} XSyncAlarmState;
-
-
-typedef XID XSyncCounter;
-typedef XID XSyncAlarm;
-typedef struct _XSyncValue {
-    int hi;
-    unsigned int lo;
-} XSyncValue;
-#endif /* _SYNCCONST_H_ */
+/*

+

+Copyright 1991, 1993, 1994, 1998  The Open Group

+

+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.

+

+The above copyright notice and this permission notice shall be included in

+all copies or substantial portions of the Software.

+

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

+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE

+OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN

+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN

+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

+

+Except as contained in this notice, the name of The Open Group shall not be

+used in advertising or otherwise to promote the sale, use or other dealings

+in this Software without prior written authorization from The Open Group.

+

+*/

+

+/***********************************************************

+Copyright 1991,1993 by Digital Equipment Corporation, Maynard, Massachusetts,

+and Olivetti Research Limited, Cambridge, England.

+

+                        All Rights Reserved

+

+Permission to use, copy, modify, and distribute this software and its

+documentation for any purpose and without fee is hereby granted,

+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 names of Digital or Olivetti

+not be used in advertising or publicity pertaining to distribution of the

+software without specific, written prior permission.

+

+DIGITAL AND OLIVETTI DISCLAIM ALL WARRANTIES WITH REGARD TO THIS

+SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND

+FITNESS, IN NO EVENT SHALL THEY 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.

+

+******************************************************************/

+

+#ifndef _SYNCCONST_H_

+#define _SYNCCONST_H_

+

+#define SYNC_NAME "SYNC"

+

+#define SYNC_MAJOR_VERSION	3

+#define SYNC_MINOR_VERSION	1

+

+

+#define XSyncCounterNotify              0

+#define XSyncAlarmNotify		1

+#define XSyncAlarmNotifyMask 		(1L << XSyncAlarmNotify)

+

+#define XSyncNumberEvents		2L

+

+#define XSyncBadCounter			0L

+#define XSyncBadAlarm			1L

+#define XSyncBadFence           2L

+#define XSyncNumberErrors		(XSyncBadFence + 1)

+

+/*

+ * Flags for Alarm Attributes

+ */

+#define XSyncCACounter			(1L<<0)

+#define XSyncCAValueType		(1L<<1)

+#define XSyncCAValue			(1L<<2)

+#define XSyncCATestType			(1L<<3)

+#define XSyncCADelta			(1L<<4)

+#define XSyncCAEvents			(1L<<5)

+

+/*  The _XSync macros below are for library internal use only.  They exist

+ *  so that if we have to make a fix, we can change it in this one place

+ *  and have both the macro and function variants inherit the fix.

+ */

+

+#define _XSyncIntToValue(pv, i)     ((pv)->hi=((i<0)?~0:0),(pv)->lo=(i))

+#define _XSyncIntsToValue(pv, l, h) ((pv)->lo = (l), (pv)->hi = (h))

+#define _XSyncValueGreaterThan(a, b)\

+    ((a).hi>(b).hi || ((a).hi==(b).hi && (a).lo>(b).lo))

+#define _XSyncValueLessThan(a, b)\

+    ((a).hi<(b).hi || ((a).hi==(b).hi && (a).lo<(b).lo))

+#define _XSyncValueGreaterOrEqual(a, b)\

+    ((a).hi>(b).hi || ((a).hi==(b).hi && (a).lo>=(b).lo))

+#define _XSyncValueLessOrEqual(a, b)\

+    ((a).hi<(b).hi || ((a).hi==(b).hi && (a).lo<=(b).lo))

+#define _XSyncValueEqual(a, b)	((a).lo==(b).lo && (a).hi==(b).hi)

+#define _XSyncValueIsNegative(v) (((v).hi & 0x80000000) ? 1 : 0)

+#define _XSyncValueIsZero(a)	((a).lo==0 && (a).hi==0)

+#define _XSyncValueIsPositive(v) (((v).hi & 0x80000000) ? 0 : 1)

+#define _XSyncValueLow32(v)	((v).lo)

+#define _XSyncValueHigh32(v)	((v).hi)

+#define _XSyncValueAdd(presult,a,b,poverflow) {\

+	int t = (a).lo;\

+	Bool signa = XSyncValueIsNegative(a);\

+	Bool signb = XSyncValueIsNegative(b);\

+	((presult)->lo = (a).lo + (b).lo);\

+	((presult)->hi = (a).hi + (b).hi);\

+	if (t>(presult)->lo) (presult)->hi++;\

+	*poverflow = ((signa == signb) && !(signa == XSyncValueIsNegative(*presult)));\

+     }

+#define _XSyncValueSubtract(presult,a,b,poverflow) {\

+	int t = (a).lo;\

+	Bool signa = XSyncValueIsNegative(a);\

+	Bool signb = XSyncValueIsNegative(b);\

+	((presult)->lo = (a).lo - (b).lo);\

+	((presult)->hi = (a).hi - (b).hi);\

+	if (t<(presult)->lo) (presult)->hi--;\

+	*poverflow = ((signa == signb) && !(signa == XSyncValueIsNegative(*presult)));\

+     }

+#define _XSyncMaxValue(pv) ((pv)->hi = 0x7fffffff, (pv)->lo = 0xffffffff)

+#define _XSyncMinValue(pv) ((pv)->hi = 0x80000000, (pv)->lo = 0)

+

+/*

+ *  These are the publically usable macros.  If you want the function version

+ *  of one of these, just #undef the macro to uncover the function.

+ *  (This is the same convention that the ANSI C library uses.)

+ */

+

+#define XSyncIntToValue(pv, i) _XSyncIntToValue(pv, i)

+#define XSyncIntsToValue(pv, l, h) _XSyncIntsToValue(pv, l, h)

+#define XSyncValueGreaterThan(a, b) _XSyncValueGreaterThan(a, b)

+#define XSyncValueLessThan(a, b) _XSyncValueLessThan(a, b)

+#define XSyncValueGreaterOrEqual(a, b) _XSyncValueGreaterOrEqual(a, b)

+#define XSyncValueLessOrEqual(a, b) _XSyncValueLessOrEqual(a, b)

+#define XSyncValueEqual(a, b) _XSyncValueEqual(a, b)

+#define XSyncValueIsNegative(v) _XSyncValueIsNegative(v)

+#define XSyncValueIsZero(a) _XSyncValueIsZero(a)

+#define XSyncValueIsPositive(v) _XSyncValueIsPositive(v)

+#define XSyncValueLow32(v) _XSyncValueLow32(v)

+#define XSyncValueHigh32(v) _XSyncValueHigh32(v)

+#define XSyncValueAdd(presult,a,b,poverflow) _XSyncValueAdd(presult,a,b,poverflow)

+#define XSyncValueSubtract(presult,a,b,poverflow) _XSyncValueSubtract(presult,a,b,poverflow)

+#define XSyncMaxValue(pv) _XSyncMaxValue(pv)

+#define XSyncMinValue(pv) _XSyncMinValue(pv)

+

+/*

+ * Constants for the value_type argument of various requests

+ */

+typedef enum {

+    XSyncAbsolute,

+    XSyncRelative

+} XSyncValueType;

+

+/*

+ * Alarm Test types

+ */

+typedef enum {

+    XSyncPositiveTransition,

+    XSyncNegativeTransition,

+    XSyncPositiveComparison,

+    XSyncNegativeComparison

+} XSyncTestType;

+

+/*

+ * Alarm state constants

+ */

+typedef enum {

+    XSyncAlarmActive,

+    XSyncAlarmInactive,

+    XSyncAlarmDestroyed

+} XSyncAlarmState;

+

+

+typedef XID XSyncCounter;

+typedef XID XSyncAlarm;

+typedef XID XSyncFence;

+typedef struct _XSyncValue {

+    int hi;

+    unsigned int lo;

+} XSyncValue;

+#endif /* _SYNCCONST_H_ */

diff --git a/X11/extensions/syncproto.h b/X11/extensions/syncproto.h
index 13b53d531..ab7c1f528 100644
--- a/X11/extensions/syncproto.h
+++ b/X11/extensions/syncproto.h
@@ -1,378 +1,474 @@
-/*
-
-Copyright 1991, 1993, 1994, 1998  The Open Group
-
-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.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-
-/***********************************************************
-Copyright 1991,1993 by Digital Equipment Corporation, Maynard, Massachusetts,
-and Olivetti Research Limited, Cambridge, England.
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-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 names of Digital or Olivetti
-not be used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
-
-DIGITAL AND OLIVETTI DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
-SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS, IN NO EVENT SHALL THEY 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.
-
-******************************************************************/
-
-#ifndef _SYNCPROTO_H_
-#define _SYNCPROTO_H_
-
-#include <X11/extensions/syncconst.h>
-
-#define X_SyncInitialize		0
-#define X_SyncListSystemCounters	1
-#define X_SyncCreateCounter		2
-#define X_SyncSetCounter		3
-#define X_SyncChangeCounter		4
-#define X_SyncQueryCounter              5
-#define X_SyncDestroyCounter		6
-#define X_SyncAwait			7
-#define X_SyncCreateAlarm               8
-#define X_SyncChangeAlarm	        9
-#define X_SyncQueryAlarm	       10
-#define X_SyncDestroyAlarm	       11
-#define X_SyncSetPriority   	       12
-#define X_SyncGetPriority   	       13
-
-/* cover up types from sync.h to make sure they're the right size for
- * protocol packaging.  These will be undef'ed after all the protocol
- * structures are defined.
- */
-#define XSyncCounter CARD32
-#define XSyncAlarm   CARD32
-
-/*
- * Initialize
- */
-typedef struct _xSyncInitialize {
-    CARD8	reqType;
-    CARD8	syncReqType;
-    CARD16	length B16;
-    CARD8	majorVersion;
-    CARD8	minorVersion;
-    CARD16	pad B16;
-} xSyncInitializeReq;
-#define sz_xSyncInitializeReq		8
-
-typedef struct {
-    BYTE	type;
-    CARD8	unused;
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD8	majorVersion;
-    CARD8	minorVersion;
-    CARD16	pad B16;
-    CARD32	pad0 B32;
-    CARD32	pad1 B32;
-    CARD32	pad2 B32;
-    CARD32	pad3 B32;
-    CARD32	pad4 B32;
-} xSyncInitializeReply;
-#define sz_xSyncInitializeReply	32
-
-/*
- * ListSystemCounters
- */
-typedef struct _xSyncListSystemCounters
-{
-    CARD8	reqType;
-    CARD8	syncReqType;
-    CARD16	length B16;
-} xSyncListSystemCountersReq;
-#define sz_xSyncListSystemCountersReq	4
-
-typedef struct {
-    BYTE	type;
-    CARD8	unused;
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    INT32	nCounters B32;
-    CARD32	pad0 B32;
-    CARD32	pad1 B32;
-    CARD32	pad2 B32;
-    CARD32	pad3 B32;
-    CARD32	pad4 B32;
-} xSyncListSystemCountersReply;
-#define sz_xSyncListSystemCountersReply	32
-
-typedef struct {
-    XSyncCounter counter B32;
-    INT32	resolution_hi B32;
-    CARD32	resolution_lo B32;
-    CARD16	name_length B16;
-} xSyncSystemCounter;
-#define sz_xSyncSystemCounter 14
-
-/*
- * Create Counter
- */
-typedef struct _xSyncCreateCounterReq {
-    CARD8	reqType;
-    CARD8	syncReqType;
-    CARD16	length B16;
-    XSyncCounter cid B32;
-    INT32       initial_value_hi B32;
-    CARD32	initial_value_lo B32;
-} xSyncCreateCounterReq;
-#define sz_xSyncCreateCounterReq	16
-
-/*
- * Change Counter
- */
-typedef struct _xSyncChangeCounterReq {
-    CARD8	reqType;
-    CARD8	syncReqType;
-    CARD16	length B16;
-    XSyncCounter cid B32;
-    INT32       value_hi B32;
-    CARD32	value_lo B32;
-} xSyncChangeCounterReq;
-#define sz_xSyncChangeCounterReq	16
-
-/*
- * Set Counter
- */
-typedef struct _xSyncSetCounterReq {
-    CARD8	reqType;
-    CARD8	syncReqType;
-    CARD16	length B16;
-    XSyncCounter cid B32;
-    INT32       value_hi B32;
-    CARD32	value_lo B32;
-} xSyncSetCounterReq;
-#define sz_xSyncSetCounterReq	16
-
-/*
- * Destroy Counter
- */
-typedef struct _xSyncDestroyCounterReq {
-    CARD8	reqType;
-    CARD8	syncReqType;
-    CARD16	length B16;
-    XSyncCounter counter B32;
-} xSyncDestroyCounterReq;
-#define sz_xSyncDestroyCounterReq	8
-
-/*
- * Query Counter
- */
-typedef struct _xSyncQueryCounterReq {
-    CARD8	reqType;
-    CARD8	syncReqType;
-    CARD16	length B16;
-    XSyncCounter counter B32;
-} xSyncQueryCounterReq;
-#define sz_xSyncQueryCounterReq		8
-
-
-typedef struct {
-    BYTE	type;
-    CARD8	unused;
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    INT32	value_hi B32;
-    CARD32	value_lo B32;
-    CARD32	pad0 B32;
-    CARD32	pad1 B32;
-    CARD32	pad2 B32;
-    CARD32	pad3 B32;
-} xSyncQueryCounterReply;
-#define sz_xSyncQueryCounterReply	32
-
-/*
- * Await
- */
-typedef struct _xSyncAwaitReq {
-    CARD8	reqType;
-    CARD8	syncReqType;
-    CARD16	length B16;
-} xSyncAwaitReq;
-#define sz_xSyncAwaitReq		4
-
-typedef struct _xSyncWaitCondition {
-    XSyncCounter counter B32;
-    CARD32	value_type B32;
-    INT32       wait_value_hi B32;
-    CARD32      wait_value_lo B32;
-    CARD32	test_type B32;
-    INT32	event_threshold_hi B32;
-    CARD32	event_threshold_lo B32;
-} xSyncWaitCondition;
-#define sz_xSyncWaitCondition		28
-
-/*
- * Create Alarm
- */
-typedef struct _xSyncCreateAlarmReq {
-    CARD8	reqType;
-    CARD8	syncReqType;
-    CARD16	length B16;
-    XSyncAlarm	id B32;
-    CARD32      valueMask B32;
-} xSyncCreateAlarmReq;
-#define sz_xSyncCreateAlarmReq		12
-
-/*
- * Destroy Alarm
- */
-typedef struct _xSyncDestroyAlarmReq {
-    CARD8	reqType;
-    CARD8	syncReqType;
-    CARD16	length B16;
-    XSyncAlarm	alarm B32;
-} xSyncDestroyAlarmReq;
-#define sz_xSyncDestroyAlarmReq		8
-
-/*
- * Query Alarm
- */
-typedef struct _xSyncQueryAlarmReq {
-    CARD8	reqType;
-    CARD8	syncReqType;
-    CARD16	length B16;
-    XSyncAlarm	alarm B32;
-} xSyncQueryAlarmReq;
-#define sz_xSyncQueryAlarmReq		8
-
-typedef struct {
-    BYTE	type;
-    CARD8	unused;
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    XSyncCounter counter B32;
-    CARD32	value_type B32;
-    INT32	wait_value_hi B32;
-    CARD32	wait_value_lo B32;
-    CARD32	test_type      B32;
-    INT32	delta_hi B32;
-    CARD32	delta_lo B32;
-    BOOL        events;
-    BYTE        state;
-    BYTE	pad0;
-    BYTE	pad1;
-} xSyncQueryAlarmReply;
-#define sz_xSyncQueryAlarmReply		40
-
-/*
- * Change Alarm
- */
-typedef struct _xSyncChangeAlarmReq {
-    CARD8	reqType;
-    CARD8	syncReqType;
-    CARD16	length B16;
-    XSyncAlarm	alarm B32;
-    CARD32	valueMask B32;
-} xSyncChangeAlarmReq;
-#define sz_xSyncChangeAlarmReq		12
-
-/*
- * SetPriority
- */
-typedef struct _xSyncSetPriority{
-    CARD8   	reqType;
-    CARD8   	syncReqType;
-    CARD16  	length B16;
-    CARD32  	id B32;
-    INT32  	priority B32;
-} xSyncSetPriorityReq;
-#define sz_xSyncSetPriorityReq	    	12
-
-/*
- * Get Priority
- */
-typedef struct _xSyncGetPriority{
-    CARD8   	reqType;
-    CARD8   	syncReqType;
-    CARD16  	length B16;
-    CARD32  	id B32; /*XXX XID? */
-} xSyncGetPriorityReq;
-#define sz_xSyncGetPriorityReq	    	 8
-
-typedef struct {
-    BYTE	type;
-    CARD8	unused;
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    INT32  	priority B32;
-    CARD32  	pad0 B32;
-    CARD32  	pad1 B32;
-    CARD32  	pad2 B32;
-    CARD32  	pad3 B32;
-    CARD32  	pad4 B32;
-} xSyncGetPriorityReply;
-#define sz_xSyncGetPriorityReply	32
-
-/*
- * Events
- */
-
-typedef struct _xSyncCounterNotifyEvent {
-    BYTE	type;
-    BYTE	kind;
-    CARD16	sequenceNumber B16;
-    XSyncCounter counter B32;
-    INT32	wait_value_hi B32;
-    CARD32	wait_value_lo B32;
-    INT32	counter_value_hi B32;
-    CARD32	counter_value_lo B32;
-    CARD32	time B32;
-    CARD16	count B16;
-    BOOL	destroyed;
-    BYTE        pad0;
-} xSyncCounterNotifyEvent;
-
-typedef struct _xSyncAlarmNotifyEvent {
-    BYTE	type;
-    BYTE	kind;
-    CARD16	sequenceNumber B16;
-    XSyncAlarm	alarm B32;
-    INT32	counter_value_hi B32;
-    CARD32	counter_value_lo B32;
-    INT32	alarm_value_hi B32;
-    CARD32	alarm_value_lo B32;
-    CARD32	time B32;
-    CARD8       state;
-    BYTE        pad0;
-    BYTE        pad1;
-    BYTE        pad2;
-} xSyncAlarmNotifyEvent;
-
-#undef XSyncCounter
-#undef XSyncAlarm
-
-
-#endif /* _SYNCPROTO_H_ */
+/*

+

+Copyright 1991, 1993, 1994, 1998  The Open Group

+

+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.

+

+The above copyright notice and this permission notice shall be included in

+all copies or substantial portions of the Software.

+

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

+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE

+OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN

+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN

+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

+

+Except as contained in this notice, the name of The Open Group shall not be

+used in advertising or otherwise to promote the sale, use or other dealings

+in this Software without prior written authorization from The Open Group.

+

+*/

+

+/***********************************************************

+Copyright 1991,1993 by Digital Equipment Corporation, Maynard, Massachusetts,

+and Olivetti Research Limited, Cambridge, England.

+

+                        All Rights Reserved

+

+Permission to use, copy, modify, and distribute this software and its

+documentation for any purpose and without fee is hereby granted,

+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 names of Digital or Olivetti

+not be used in advertising or publicity pertaining to distribution of the

+software without specific, written prior permission.

+

+DIGITAL AND OLIVETTI DISCLAIM ALL WARRANTIES WITH REGARD TO THIS

+SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND

+FITNESS, IN NO EVENT SHALL THEY 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.

+

+******************************************************************/

+

+#ifndef _SYNCPROTO_H_

+#define _SYNCPROTO_H_

+

+#include <X11/extensions/syncconst.h>

+

+#define X_SyncInitialize		0

+#define X_SyncListSystemCounters	1

+#define X_SyncCreateCounter		2

+#define X_SyncSetCounter		3

+#define X_SyncChangeCounter		4

+#define X_SyncQueryCounter              5

+#define X_SyncDestroyCounter		6

+#define X_SyncAwait			7

+#define X_SyncCreateAlarm               8

+#define X_SyncChangeAlarm	        9

+#define X_SyncQueryAlarm	       10

+#define X_SyncDestroyAlarm	       11

+#define X_SyncSetPriority   	       12

+#define X_SyncGetPriority   	       13

+#define X_SyncCreateFence	       14

+#define X_SyncTriggerFence	       15

+#define X_SyncResetFence	       16

+#define X_SyncDestroyFence	       17

+#define X_SyncQueryFence	       18

+#define X_SyncAwaitFence	       19

+

+/* cover up types from sync.h to make sure they're the right size for

+ * protocol packaging.  These will be undef'ed after all the protocol

+ * structures are defined.

+ */

+#define XSyncCounter CARD32

+#define XSyncAlarm   CARD32

+#define XSyncFence   CARD32

+#define Drawable     CARD32

+

+/*

+ * Initialize

+ */

+typedef struct _xSyncInitialize {

+    CARD8	reqType;

+    CARD8	syncReqType;

+    CARD16	length B16;

+    CARD8	majorVersion;

+    CARD8	minorVersion;

+    CARD16	pad B16;

+} xSyncInitializeReq;

+#define sz_xSyncInitializeReq		8

+

+typedef struct {

+    BYTE	type;

+    CARD8	unused;

+    CARD16	sequenceNumber B16;

+    CARD32	length B32;

+    CARD8	majorVersion;

+    CARD8	minorVersion;

+    CARD16	pad B16;

+    CARD32	pad0 B32;

+    CARD32	pad1 B32;

+    CARD32	pad2 B32;

+    CARD32	pad3 B32;

+    CARD32	pad4 B32;

+} xSyncInitializeReply;

+#define sz_xSyncInitializeReply	32

+

+/*

+ * ListSystemCounters

+ */

+typedef struct _xSyncListSystemCounters

+{

+    CARD8	reqType;

+    CARD8	syncReqType;

+    CARD16	length B16;

+} xSyncListSystemCountersReq;

+#define sz_xSyncListSystemCountersReq	4

+

+typedef struct {

+    BYTE	type;

+    CARD8	unused;

+    CARD16	sequenceNumber B16;

+    CARD32	length B32;

+    INT32	nCounters B32;

+    CARD32	pad0 B32;

+    CARD32	pad1 B32;

+    CARD32	pad2 B32;

+    CARD32	pad3 B32;

+    CARD32	pad4 B32;

+} xSyncListSystemCountersReply;

+#define sz_xSyncListSystemCountersReply	32

+

+typedef struct {

+    XSyncCounter counter B32;

+    INT32	resolution_hi B32;

+    CARD32	resolution_lo B32;

+    CARD16	name_length B16;

+} xSyncSystemCounter;

+#define sz_xSyncSystemCounter 14

+

+/*

+ * Create Counter

+ */

+typedef struct _xSyncCreateCounterReq {

+    CARD8	reqType;

+    CARD8	syncReqType;

+    CARD16	length B16;

+    XSyncCounter cid B32;

+    INT32       initial_value_hi B32;

+    CARD32	initial_value_lo B32;

+} xSyncCreateCounterReq;

+#define sz_xSyncCreateCounterReq	16

+

+/*

+ * Change Counter

+ */

+typedef struct _xSyncChangeCounterReq {

+    CARD8	reqType;

+    CARD8	syncReqType;

+    CARD16	length B16;

+    XSyncCounter cid B32;

+    INT32       value_hi B32;

+    CARD32	value_lo B32;

+} xSyncChangeCounterReq;

+#define sz_xSyncChangeCounterReq	16

+

+/*

+ * Set Counter

+ */

+typedef struct _xSyncSetCounterReq {

+    CARD8	reqType;

+    CARD8	syncReqType;

+    CARD16	length B16;

+    XSyncCounter cid B32;

+    INT32       value_hi B32;

+    CARD32	value_lo B32;

+} xSyncSetCounterReq;

+#define sz_xSyncSetCounterReq	16

+

+/*

+ * Destroy Counter

+ */

+typedef struct _xSyncDestroyCounterReq {

+    CARD8	reqType;

+    CARD8	syncReqType;

+    CARD16	length B16;

+    XSyncCounter counter B32;

+} xSyncDestroyCounterReq;

+#define sz_xSyncDestroyCounterReq	8

+

+/*

+ * Query Counter

+ */

+typedef struct _xSyncQueryCounterReq {

+    CARD8	reqType;

+    CARD8	syncReqType;

+    CARD16	length B16;

+    XSyncCounter counter B32;

+} xSyncQueryCounterReq;

+#define sz_xSyncQueryCounterReq		8

+

+

+typedef struct {

+    BYTE	type;

+    CARD8	unused;

+    CARD16	sequenceNumber B16;

+    CARD32	length B32;

+    INT32	value_hi B32;

+    CARD32	value_lo B32;

+    CARD32	pad0 B32;

+    CARD32	pad1 B32;

+    CARD32	pad2 B32;

+    CARD32	pad3 B32;

+} xSyncQueryCounterReply;

+#define sz_xSyncQueryCounterReply	32

+

+/*

+ * Await

+ */

+typedef struct _xSyncAwaitReq {

+    CARD8	reqType;

+    CARD8	syncReqType;

+    CARD16	length B16;

+} xSyncAwaitReq;

+#define sz_xSyncAwaitReq		4

+

+typedef struct _xSyncWaitCondition {

+    XSyncCounter counter B32;

+    CARD32	value_type B32;

+    INT32       wait_value_hi B32;

+    CARD32      wait_value_lo B32;

+    CARD32	test_type B32;

+    INT32	event_threshold_hi B32;

+    CARD32	event_threshold_lo B32;

+} xSyncWaitCondition;

+#define sz_xSyncWaitCondition		28

+

+/*

+ * Create Alarm

+ */

+typedef struct _xSyncCreateAlarmReq {

+    CARD8	reqType;

+    CARD8	syncReqType;

+    CARD16	length B16;

+    XSyncAlarm	id B32;

+    CARD32      valueMask B32;

+} xSyncCreateAlarmReq;

+#define sz_xSyncCreateAlarmReq		12

+

+/*

+ * Destroy Alarm

+ */

+typedef struct _xSyncDestroyAlarmReq {

+    CARD8	reqType;

+    CARD8	syncReqType;

+    CARD16	length B16;

+    XSyncAlarm	alarm B32;

+} xSyncDestroyAlarmReq;

+#define sz_xSyncDestroyAlarmReq		8

+

+/*

+ * Query Alarm

+ */

+typedef struct _xSyncQueryAlarmReq {

+    CARD8	reqType;

+    CARD8	syncReqType;

+    CARD16	length B16;

+    XSyncAlarm	alarm B32;

+} xSyncQueryAlarmReq;

+#define sz_xSyncQueryAlarmReq		8

+

+typedef struct {

+    BYTE	type;

+    CARD8	unused;

+    CARD16	sequenceNumber B16;

+    CARD32	length B32;

+    XSyncCounter counter B32;

+    CARD32	value_type B32;

+    INT32	wait_value_hi B32;

+    CARD32	wait_value_lo B32;

+    CARD32	test_type      B32;

+    INT32	delta_hi B32;

+    CARD32	delta_lo B32;

+    BOOL        events;

+    BYTE        state;

+    BYTE	pad0;

+    BYTE	pad1;

+} xSyncQueryAlarmReply;

+#define sz_xSyncQueryAlarmReply		40

+

+/*

+ * Change Alarm

+ */

+typedef struct _xSyncChangeAlarmReq {

+    CARD8	reqType;

+    CARD8	syncReqType;

+    CARD16	length B16;

+    XSyncAlarm	alarm B32;

+    CARD32	valueMask B32;

+} xSyncChangeAlarmReq;

+#define sz_xSyncChangeAlarmReq		12

+

+/*

+ * SetPriority

+ */

+typedef struct _xSyncSetPriority{

+    CARD8   	reqType;

+    CARD8   	syncReqType;

+    CARD16  	length B16;

+    CARD32  	id B32;

+    INT32  	priority B32;

+} xSyncSetPriorityReq;

+#define sz_xSyncSetPriorityReq	    	12

+

+/*

+ * Get Priority

+ */

+typedef struct _xSyncGetPriority{

+    CARD8   	reqType;

+    CARD8   	syncReqType;

+    CARD16  	length B16;

+    CARD32  	id B32; /*XXX XID? */

+} xSyncGetPriorityReq;

+#define sz_xSyncGetPriorityReq	    	 8

+

+typedef struct {

+    BYTE	type;

+    CARD8	unused;

+    CARD16	sequenceNumber B16;

+    CARD32	length B32;

+    INT32  	priority B32;

+    CARD32  	pad0 B32;

+    CARD32  	pad1 B32;

+    CARD32  	pad2 B32;

+    CARD32  	pad3 B32;

+    CARD32  	pad4 B32;

+} xSyncGetPriorityReply;

+#define sz_xSyncGetPriorityReply	32

+

+/*

+ * Create Fence

+ */

+typedef struct _xSyncCreateFenceReq {

+    CARD8	reqType;

+    CARD8	syncReqType;

+    CARD16	length B16;

+    Drawable	d B32;

+    XSyncFence	fid B32;

+    BOOL	initially_triggered;

+    CARD8	pad0;

+    CARD16	pad1;

+} xSyncCreateFenceReq;

+#define sz_xSyncCreateFenceReq		16

+

+/*

+ * Put a fence object in the "triggered" state.

+ */

+typedef struct _xSyncTriggerFenceReq {

+    CARD8	reqType;

+    CARD8	syncReqType;

+    CARD16	length B16;

+    XSyncFence	fid B32;

+} xSyncTriggerFenceReq;

+#define sz_xSyncTriggerFenceReq		8

+

+/*

+ * Put a fence in the "untriggered" state.

+ */

+typedef struct _xSyncResetFenceReq {

+    CARD8	reqType;

+    CARD8	syncReqType;

+    CARD16	length B16;

+    XSyncFence	fid B32;

+} xSyncResetFenceReq;

+#define sz_xSyncResetFenceReq		8

+

+/*

+ * Destroy a fence object

+ */

+typedef struct _xSyncDestroyFenceReq {

+    CARD8	reqType;

+    CARD8	syncReqType;

+    CARD16	length B16;

+    XSyncFence	fid B32;

+} xSyncDestroyFenceReq;

+#define sz_xSyncDestroyFenceReq		8

+

+/*

+ * Query a fence object

+ */

+typedef struct _xSyncQueryFenceReq {

+    CARD8	reqType;

+    CARD8	syncReqType;

+    CARD16	length B16;

+    XSyncFence	fid B32;

+} xSyncQueryFenceReq;

+#define sz_xSyncQueryFenceReq		8

+

+/*

+ * Wait for any of a list of fence sync objects

+ * to reach the "triggered" state.

+ */

+typedef struct _xSyncAwaitFenceReq {

+    CARD8	reqType;

+    CARD8	syncReqType;

+    CARD16	length B16;

+} xSyncAwaitFenceReq;

+#define sz_xSyncAwaitFenceReq		4

+

+typedef struct {

+    BYTE	type;

+    CARD8	unused;

+    CARD16	sequenceNumber B16;

+    CARD32	length B32;

+    BOOL	triggered;

+    BYTE	pad0;

+    CARD16	pad1 B16;

+    CARD32	pad2 B32;

+    CARD32	pad3 B32;

+    CARD32	pad4 B32;

+    CARD32	pad5 B32;

+    CARD32	pad6 B32;

+} xSyncQueryFenceReply;

+#define sz_xSyncQueryFenceReply		32

+

+/*

+ * Events

+ */

+

+typedef struct _xSyncCounterNotifyEvent {

+    BYTE	type;

+    BYTE	kind;

+    CARD16	sequenceNumber B16;

+    XSyncCounter counter B32;

+    INT32	wait_value_hi B32;

+    CARD32	wait_value_lo B32;

+    INT32	counter_value_hi B32;

+    CARD32	counter_value_lo B32;

+    CARD32	time B32;

+    CARD16	count B16;

+    BOOL	destroyed;

+    BYTE        pad0;

+} xSyncCounterNotifyEvent;

+

+typedef struct _xSyncAlarmNotifyEvent {

+    BYTE	type;

+    BYTE	kind;

+    CARD16	sequenceNumber B16;

+    XSyncAlarm	alarm B32;

+    INT32	counter_value_hi B32;

+    CARD32	counter_value_lo B32;

+    INT32	alarm_value_hi B32;

+    CARD32	alarm_value_lo B32;

+    CARD32	time B32;

+    CARD8       state;

+    BYTE        pad0;

+    BYTE        pad1;

+    BYTE        pad2;

+} xSyncAlarmNotifyEvent;

+

+#undef XSyncCounter

+#undef XSyncAlarm

+#undef XSyncFence

+#undef Drawable

+

+

+#endif /* _SYNCPROTO_H_ */

diff --git a/X11/extensions/syncstr.h b/X11/extensions/syncstr.h
index 87697a22f..43697e498 100644
--- a/X11/extensions/syncstr.h
+++ b/X11/extensions/syncstr.h
@@ -1,184 +1,182 @@
-/* $Xorg: syncstr.h,v 1.4 2001/02/09 02:03:24 xorgcvs Exp $ */
-/*
-
-Copyright 1991, 1993, 1994, 1998  The Open Group
-
-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.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-
-/***********************************************************
-Copyright 1991,1993 by Digital Equipment Corporation, Maynard, Massachusetts,
-and Olivetti Research Limited, Cambridge, England.
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
-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 names of Digital or Olivetti
-not be used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
-
-DIGITAL AND OLIVETTI DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
-SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS, IN NO EVENT SHALL THEY 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.
-
-******************************************************************/
-/* $XFree86: xc/include/extensions/syncstr.h,v 1.3 2003/07/16 01:38:24 dawes Exp $ */
-
-#ifndef _SYNCSTR_H_
-#define _SYNCSTR_H_
-
-#include <X11/extensions/syncproto.h>
-
-#ifdef _SYNC_SERVER
-
-#define CARD64 XSyncValue /* XXX temporary! need real 64 bit values for Alpha */
-
-typedef struct _SyncCounter {
-    ClientPtr		client;	/* Owning client. 0 for system counters */
-    XSyncCounter	id;		/* resource ID */
-    CARD64		value;		/* counter value */
-    struct _SyncTriggerList *pTriglist;	/* list of triggers */
-    Bool		beingDestroyed; /* in process of going away */
-    struct _SysCounterInfo *pSysCounterInfo; /* NULL if not a system counter */
-} SyncCounter;
-
-/*
- * The System Counter interface
- */
-
-typedef enum {
-    XSyncCounterNeverChanges,
-    XSyncCounterNeverIncreases,
-    XSyncCounterNeverDecreases,
-    XSyncCounterUnrestricted
-} SyncCounterType;
-
-typedef struct _SysCounterInfo {
-    char	*name;
-    CARD64	resolution;
-    CARD64	bracket_greater;
-    CARD64	bracket_less;
-    SyncCounterType counterType;  /* how can this counter change */
-    void        (*QueryValue)(
-			      pointer /*pCounter*/,
-			      CARD64 * /*freshvalue*/
-);
-    void	(*BracketValues)(
-				 pointer /*pCounter*/,
-				 CARD64 * /*lessthan*/,
-				 CARD64 * /*greaterthan*/
-);
-} SysCounterInfo;
-
-
-
-typedef struct _SyncTrigger {
-    SyncCounter *pCounter;
-    CARD64	wait_value;	/* wait value */
-    unsigned int value_type;     /* Absolute or Relative */
-    unsigned int test_type;	/* transition or Comparision type */
-    CARD64	test_value;	/* trigger event threshold value */
-    Bool	(*CheckTrigger)(
-				struct _SyncTrigger * /*pTrigger*/,
-				CARD64 /*newval*/
-				);
-    void	(*TriggerFired)(
-				struct _SyncTrigger * /*pTrigger*/
-				);
-    void	(*CounterDestroyed)(
-				struct _SyncTrigger * /*pTrigger*/
-				    );
-} SyncTrigger;
-
-typedef struct _SyncTriggerList {
-    SyncTrigger *pTrigger;
-    struct _SyncTriggerList *next;
-} SyncTriggerList;
-
-typedef struct _SyncAlarmClientList {
-    ClientPtr	client;
-    XID		delete_id;
-    struct _SyncAlarmClientList *next;
-} SyncAlarmClientList;
-
-typedef struct _SyncAlarm {
-    SyncTrigger trigger;
-    ClientPtr	client;
-    XSyncAlarm 	alarm_id;
-    CARD64	delta;
-    int		events;
-    int		state;
-    SyncAlarmClientList *pEventClients;
-} SyncAlarm;
-
-typedef struct {
-    ClientPtr	client;
-    CARD32 	delete_id;
-    int		num_waitconditions;
-} SyncAwaitHeader;
-
-typedef struct {
-    SyncTrigger trigger;
-    CARD64	event_threshold;
-    SyncAwaitHeader *pHeader;
-} SyncAwait;
-
-typedef union {
-    SyncAwaitHeader header;
-    SyncAwait	    await;
-} SyncAwaitUnion;
-
-
-extern pointer SyncCreateSystemCounter(
-    char *	/* name */,
-    CARD64  	/* inital_value */,
-    CARD64  	/* resolution */,
-    SyncCounterType /* change characterization */,
-    void        (* /*QueryValue*/ ) (
-        pointer /* pCounter */,
-        CARD64 * /* pValue_return */), /* XXX prototype */
-    void        (* /*BracketValues*/) (
-        pointer /* pCounter */, 
-        CARD64 * /* pbracket_less */,
-        CARD64 * /* pbracket_greater */)
-);
-
-extern void SyncChangeCounter(
-    SyncCounter *	/* pCounter*/,
-    CARD64  		/* new_value */
-);
-
-extern void SyncDestroySystemCounter(
-    pointer pCounter
-);
-extern void InitServertime(void);
-
-#endif /* _SYNC_SERVER */
-
-#endif /* _SYNCSTR_H_ */
+/*

+

+Copyright 1991, 1993, 1994, 1998  The Open Group

+

+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.

+

+The above copyright notice and this permission notice shall be included in

+all copies or substantial portions of the Software.

+

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

+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE

+OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN

+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN

+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

+

+Except as contained in this notice, the name of The Open Group shall not be

+used in advertising or otherwise to promote the sale, use or other dealings

+in this Software without prior written authorization from The Open Group.

+

+*/

+

+/***********************************************************

+Copyright 1991,1993 by Digital Equipment Corporation, Maynard, Massachusetts,

+and Olivetti Research Limited, Cambridge, England.

+

+                        All Rights Reserved

+

+Permission to use, copy, modify, and distribute this software and its 

+documentation for any purpose and without fee is hereby granted, 

+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 names of Digital or Olivetti

+not be used in advertising or publicity pertaining to distribution of the

+software without specific, written prior permission.  

+

+DIGITAL AND OLIVETTI DISCLAIM ALL WARRANTIES WITH REGARD TO THIS

+SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND

+FITNESS, IN NO EVENT SHALL THEY 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.

+

+******************************************************************/

+

+#ifndef _SYNCSTR_H_

+#define _SYNCSTR_H_

+

+#include <X11/extensions/syncproto.h>

+

+#ifdef _SYNC_SERVER

+

+#define CARD64 XSyncValue /* XXX temporary! need real 64 bit values for Alpha */

+

+typedef struct _SyncCounter {

+    ClientPtr		client;	/* Owning client. 0 for system counters */

+    XSyncCounter	id;		/* resource ID */

+    CARD64		value;		/* counter value */

+    struct _SyncTriggerList *pTriglist;	/* list of triggers */

+    Bool		beingDestroyed; /* in process of going away */

+    struct _SysCounterInfo *pSysCounterInfo; /* NULL if not a system counter */

+} SyncCounter;

+

+/*

+ * The System Counter interface

+ */

+

+typedef enum {

+    XSyncCounterNeverChanges,

+    XSyncCounterNeverIncreases,

+    XSyncCounterNeverDecreases,

+    XSyncCounterUnrestricted

+} SyncCounterType;

+

+typedef struct _SysCounterInfo {

+    char	*name;

+    CARD64	resolution;

+    CARD64	bracket_greater;

+    CARD64	bracket_less;

+    SyncCounterType counterType;  /* how can this counter change */

+    void        (*QueryValue)(

+			      pointer /*pCounter*/,

+			      CARD64 * /*freshvalue*/

+);

+    void	(*BracketValues)(

+				 pointer /*pCounter*/,

+				 CARD64 * /*lessthan*/,

+				 CARD64 * /*greaterthan*/

+);

+} SysCounterInfo;

+

+

+

+typedef struct _SyncTrigger {

+    SyncCounter *pCounter;

+    CARD64	wait_value;	/* wait value */

+    unsigned int value_type;     /* Absolute or Relative */

+    unsigned int test_type;	/* transition or Comparision type */

+    CARD64	test_value;	/* trigger event threshold value */

+    Bool	(*CheckTrigger)(

+				struct _SyncTrigger * /*pTrigger*/,

+				CARD64 /*newval*/

+				);

+    void	(*TriggerFired)(

+				struct _SyncTrigger * /*pTrigger*/

+				);

+    void	(*CounterDestroyed)(

+				struct _SyncTrigger * /*pTrigger*/

+				    );

+} SyncTrigger;

+

+typedef struct _SyncTriggerList {

+    SyncTrigger *pTrigger;

+    struct _SyncTriggerList *next;

+} SyncTriggerList;

+

+typedef struct _SyncAlarmClientList {

+    ClientPtr	client;

+    XID		delete_id;

+    struct _SyncAlarmClientList *next;

+} SyncAlarmClientList;

+

+typedef struct _SyncAlarm {

+    SyncTrigger trigger;

+    ClientPtr	client;

+    XSyncAlarm 	alarm_id;

+    CARD64	delta;

+    int		events;

+    int		state;

+    SyncAlarmClientList *pEventClients;

+} SyncAlarm;

+

+typedef struct {

+    ClientPtr	client;

+    CARD32 	delete_id;

+    int		num_waitconditions;

+} SyncAwaitHeader;

+

+typedef struct {

+    SyncTrigger trigger;

+    CARD64	event_threshold;

+    SyncAwaitHeader *pHeader;

+} SyncAwait;

+

+typedef union {

+    SyncAwaitHeader header;

+    SyncAwait	    await;

+} SyncAwaitUnion;

+

+

+extern pointer SyncCreateSystemCounter(

+    char *	/* name */,

+    CARD64  	/* inital_value */,

+    CARD64  	/* resolution */,

+    SyncCounterType /* change characterization */,

+    void        (* /*QueryValue*/ ) (

+        pointer /* pCounter */,

+        CARD64 * /* pValue_return */), /* XXX prototype */

+    void        (* /*BracketValues*/) (

+        pointer /* pCounter */, 

+        CARD64 * /* pbracket_less */,

+        CARD64 * /* pbracket_greater */)

+);

+

+extern void SyncChangeCounter(

+    SyncCounter *	/* pCounter*/,

+    CARD64  		/* new_value */

+);

+

+extern void SyncDestroySystemCounter(

+    pointer pCounter

+);

+extern void InitServertime(void);

+

+#endif /* _SYNC_SERVER */

+

+#endif /* _SYNCSTR_H_ */

diff --git a/X11/extensions/xfixesproto.h b/X11/extensions/xfixesproto.h
index 1e9a98306..ed872d195 100644
--- a/X11/extensions/xfixesproto.h
+++ b/X11/extensions/xfixesproto.h
@@ -1,25 +1,27 @@
 /*
- * Copyright � 2006 Sun Microsystems
+ * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
  *
- * 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 Sun Microsystems not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission.  Sun Microsystems makes no
- * representations about the suitability of this software for any purpose.  It
- * is provided "as is" without express or implied warranty.
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
  *
- * SUN MICROSYSTEMS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL SUN MICROSYSTEMS 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.
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
  *
- * Copyright � 2002 Keith Packard, member of The XFree86 Project, Inc.
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+/*
+ * Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc.
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
  * documentation for any purpose is hereby granted without fee, provided that
diff --git a/X11/extensions/xfixeswire.h b/X11/extensions/xfixeswire.h
index 72e84a7ff..7b43f09e9 100644
--- a/X11/extensions/xfixeswire.h
+++ b/X11/extensions/xfixeswire.h
@@ -1,25 +1,27 @@
 /*
- * Copyright � 2006 Sun Microsystems
+ * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
  *
- * 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 Sun Microsystems not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission.  Sun Microsystems makes no
- * representations about the suitability of this software for any purpose.  It
- * is provided "as is" without express or implied warranty.
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
  *
- * SUN MICROSYSTEMS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL SUN MICROSYSTEMS 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.
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
  *
- * Copyright � 2002 Keith Packard, member of The XFree86 Project, Inc.
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+/*
+ * Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc.
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
  * documentation for any purpose is hereby granted without fee, provided that
diff --git a/libXext/configure.ac b/libXext/configure.ac
index 631b774cc..ea1d6ca92 100644
--- a/libXext/configure.ac
+++ b/libXext/configure.ac
@@ -3,7 +3,7 @@
 

 AC_PREREQ([2.60])

 AC_INIT([libXext],

-        [1.2.0],

+        [1.2.99.0],

         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],

         [libXext])

 

@@ -40,7 +40,7 @@ AC_PROG_LIBTOOL
 AC_PROG_CC

 

 # Checks for pkg-config packages

-PKG_CHECK_MODULES(XEXT, [xproto >= 7.0.13] [x11 >= 1.1.99.1] [xextproto >= 7.0.99.2])

+PKG_CHECK_MODULES(XEXT, [xproto >= 7.0.13] [x11 >= 1.1.99.1] [xextproto >= 7.1.99])

 AC_SUBST(XEXT_CFLAGS)

 AC_SUBST(XEXT_LIBS)

 

diff --git a/libXext/include/X11/extensions/sync.h b/libXext/include/X11/extensions/sync.h
index 460bf56ca..0ed5b728d 100644
--- a/libXext/include/X11/extensions/sync.h
+++ b/libXext/include/X11/extensions/sync.h
@@ -335,6 +335,39 @@ extern Status XSyncGetPriority(
     int* /*return_priority*/

 );

 

+extern XSyncFence XSyncCreateFence(

+    Display* /*dpy*/,

+    Drawable /*d*/,

+    Bool /*initially_triggered*/

+);

+

+extern Bool XSyncTriggerFence(

+    Display* /*dpy*/,

+    XSyncFence /*fence*/

+);

+

+extern Bool XSyncResetFence(

+    Display* /*dpy*/,

+    XSyncFence /*fence*/

+);

+

+extern Bool XSyncDestroyFence(

+    Display* /*dpy*/,

+    XSyncFence /*fence*/

+);

+

+extern Bool XSyncQueryFence(

+    Display* /*dpy*/,

+    XSyncFence /*fence*/,

+    Bool* /*triggered*/

+);

+

+extern Bool XSyncAwaitFence(

+    Display* /*dpy*/,

+    const XSyncFence* /*fence_list*/,

+    int /*n_fences*/

+);

+

 _XFUNCPROTOEND

 

 #endif /* _SYNC_SERVER */

diff --git a/libXext/specs/Makefile.am b/libXext/specs/Makefile.am
index 0d6379223..10dbed24f 100644
--- a/libXext/specs/Makefile.am
+++ b/libXext/specs/Makefile.am
@@ -22,7 +22,7 @@
 #

 

 if ENABLE_SPECS

-doc_sources = dbelib.xml dpmslib.xml shapelib.xml synclib.xml

+doc_sources = dbelib.xml dpmslib.xml shapelib.xml synclib.xml xtest1.xml

 dist_doc_DATA = $(doc_sources)

 

 if HAVE_XMLTO

diff --git a/libXext/specs/xtest1.xml b/libXext/specs/xtest1.xml
new file mode 100644
index 000000000..4652de72a
--- /dev/null
+++ b/libXext/specs/xtest1.xml
@@ -0,0 +1,954 @@
+<?xml version="1.0" encoding="UTF-8" ?>

+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"

+                   "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd">

+

+

+<book id="xtest1">

+

+<bookinfo>

+   <title>X11 INPUT SYNTHESIS EXTENSION PROPOSAL</title>

+   <subtitle>X Consortium Standard</subtitle>

+   <releaseinfo>Version 1.0</releaseinfo>

+   <authorgroup>

+      <author>

+         <firstname>Larry</firstname><surname>Woestman</surname>

+         <affiliation><orgname>Hewlett Packard, Member of Technical Staff</orgname></affiliation>

+      </author>

+   </authorgroup>

+   <corpname>X Consortium Standard</corpname>

+   <copyright><year>1993</year><holder>X Consortium</holder></copyright>

+   <affiliation><orgname>X Consortium</orgname></affiliation>

+   <productnumber>X Version 11, Release 7</productnumber>

+

+<abstract>

+<para>

+This is a proposal for an extension to the X11 server and Xlib.

+</para>

+</abstract>

+

+</bookinfo>

+

+<chapter>

+<title>TITLE</title>

+<sect1 id="introduction">

+<title>Introduction</title>

+<para>

+This is a proposal for an extension to the X11 server and Xlib.

+It provides two capabilities:

+</para>

+

+<itemizedlist>

+  <listitem>

+    <para>

+It allows a client to generate user input actions in the server without

+requiring a user to be present.

+    </para>

+  </listitem>

+  <listitem>

+    <para>

+It also allows a client to control the

+handling of user input actions by the server.

+    </para>

+  </listitem>

+</itemizedlist>

+

+<para>

+The capability

+to allow a client to generate user input actions in the server

+will be used by some of the X Testing Consortium Xlib tests.

+Both capabilities will be used by the X Testing Consortium client exerciser

+program.

+These capabilities may also be useful in other programs.

+</para>

+

+<para>

+This extension requires modification to device-dependent code in the

+server.  Therefore it is not a 'portable' extension as defined by the

+X11 Server Extensions document.  However, the majority of the code

+and functionality of this extension will be implementation-independent.

+</para>

+

+</sect1>

+

+<sect1 id="conventions_used_in_this_document">

+<title>Conventions Used In This Document</title>

+

+<para>

+The naming conventions used in the Xlib documentation are followed

+with these additions:

+</para>

+

+<itemizedlist>

+  <listitem>

+    <para>

+The names of all functions defined in this extension begin with 'XTest',

+with the first letter of each additional word capitalized.

+    </para>

+  </listitem>

+  <listitem>

+    <para>

+The names of the protocol request structures follow the Xlib convention

+of 'x&lt;name&gt;Req'.

+    </para>

+  </listitem>

+  <listitem>

+    <para>

+The names of the protocol request minor type codes follow the Xlib convention

+of 'X_&lt;name&gt;'.

+    </para>

+  </listitem>

+  <listitem>

+    <para>

+The names of all other constants defined in this extension begin with 'XTest',

+with the rest of the name in upper case letters.

+    </para>

+  </listitem>

+  <listitem>

+    <para>

+All constants and structures defined in this extension will have their

+values specified in the 'xtestext1.h' file (listed in section 5).

+    </para>

+  </listitem>

+</itemizedlist>

+

+</sect1>

+<sect1 id="definition_of_terms">

+<title>Definition Of Terms</title>

+

+<sect2 id="input_actions">

+<title>Input Actions</title>

+<para>

+Input actions are pointer movements, button presses and releases,

+and key presses and releases.  They can be generated by a user or by a client

+(using functions in this extension).

+</para>

+</sect2>

+

+<sect2 id="user_input_actions">

+<title>User Input Actions</title>

+<para>

+User input actions are input actions that are generated by the user

+moving a pointing device (typically a mouse), pressing and releasing buttons on

+the pointing device, and pressing and releasing keys on the keyboard.

+</para>

+</sect2>

+

+</sect1>

+

+<sect1 id="what_does_this_extension_do">

+<title>What Does This Extension Do?</title>

+<para>

+Without this extension, user input actions are processed by the server,

+and are converted into normal X events that are sent to the

+appropriate client or clients.

+</para>

+

+<para>

+This extension adds the following capabilities:

+</para>

+

+<itemizedlist>

+  <listitem>

+    <para>

+Input actions may be sent from a client to the server to be

+processed just as if the user had physically performed them.

+The input actions are provided to the server in the form of X protocol

+requests defined by this extension.

+The information provided to the server includes what action should be

+performed, and how long to delay before processing the action in the server.

+    </para>

+  </listitem>

+  <listitem>

+    <para>

+User input actions may be diverted to a client before being processed by the

+server.

+The effect on the server is as if the user had performed no input action.

+The user input actions are provided to the client in the form of X events

+defined by this extension.

+The information provided to the client includes what user input action

+occurred and the delay between this user input action and the previous user

+input action.

+The client may then do anything it wishes with this information.

+    </para>

+  </listitem>

+  <listitem>

+    <para>

+User input actions may be copied, with one copy going to the server in the

+normal way, and the other copy being sent to a client as described above.

+    </para>

+  </listitem>

+</itemizedlist>

+

+</sect1>

+<sect1 id="functions_in_this_extension">

+<title>Functions In This Extension</title>

+

+<sect2 id="high_level_functions">

+<title>High Level Functions</title>

+

+<para>

+These functions are built on top of the low level functions described later.

+</para>

+

+<sect3 id="xtestmovepointer">

+<title>XTestMovePointer</title>

+

+<funcsynopsis>

+<funcprototype>

+  <funcdef>int <function>XTestMovePointer</function></funcdef>

+    <paramdef>Display <parameter>*display</parameter></paramdef>

+    <paramdef>int <parameter>device_id</parameter></paramdef>

+    <paramdef>unsigned long <parameter>delay</parameter></paramdef>

+    <paramdef>int <parameter>x</parameter></paramdef>

+    <paramdef>int <parameter>y</parameter></paramdef>

+    <paramdef>unsigned int <parameter>count</parameter></paramdef>

+</funcprototype>

+</funcsynopsis>

+

+<variablelist>

+  <varlistentry>

+    <term>display</term>

+    <listitem>

+      <para>

+Specifies the connection to the X server.

+      </para>

+    </listitem>

+  </varlistentry>

+  <varlistentry>

+    <term>device_id</term>

+    <listitem>

+      <para>

+Specifies which pointer device was supposed to have caused the input action.

+This is a provision for future support of multiple (distinguishable) pointer

+devices, and should always be set to 0 for now.

+      </para>

+    </listitem>

+  </varlistentry>

+  <varlistentry>

+    <term>delay</term>

+    <listitem>

+      <para>

+Specifies the time (in milliseconds) to wait before each movement

+of the pointer.

+      </para>

+    </listitem>

+  </varlistentry>

+  <varlistentry>

+    <term>x, y</term>

+    <listitem>

+      <para>

+Specifies the x and y coordinates to move the pointer to relative to the

+root window for the specified display.

+      </para>

+    </listitem>

+  </varlistentry>

+  <varlistentry>

+    <term>count</term>

+    <listitem>

+      <para>

+Specifies the number of 'delay, x, y' triplets contained in the

+<emphasis>delay</emphasis>,

+<emphasis>x</emphasis> and

+<emphasis>y</emphasis> arrays.

+      </para>

+    </listitem>

+  </varlistentry>

+</variablelist>

+

+<para>

+The

+<function>XTestMovePointer</function>

+function creates input actions to be sent to the the server.

+The input actions will be accumulated in a request defined by this extension

+until the request is full or the XTestFlush function is called.

+They will then be sent to the server.

+When the input actions are sent to the server, the input actions will cause

+the server to think that the pointer was moved to the specified position(s),

+with the specified delay before each input action.

+</para>

+<para>

+The

+<function>XTestMovePointer</function>

+function will return -1 if there is an error, and 0 otherwise.

+</para>

+</sect3>

+

+<sect3 id="xtestpressbutton">

+<title>XTestPressButton</title>

+

+<funcsynopsis>

+<funcprototype>

+  <funcdef>int <function>XTestPressButton</function></funcdef>

+    <paramdef>Display <parameter>*display</parameter></paramdef>

+    <paramdef>int <parameter>device_id</parameter></paramdef>

+    <paramdef>unsigned long <parameter>delay</parameter></paramdef>

+    <paramdef>unsigned int <parameter>button_number</parameter></paramdef>

+    <paramdef>unsigned int <parameter>button_action</parameter></paramdef>

+</funcprototype>

+</funcsynopsis>

+

+

+<!-- .VL 15 -->

+<variablelist>

+  <varlistentry>

+    <term>display</term>

+    <listitem>

+      <para>

+Specifies the connection to the X server.

+      </para>

+    </listitem>

+  </varlistentry>

+  <varlistentry>

+    <term>device_id</term>

+    <listitem>

+      <para>

+Specifies which button device was supposed to have caused the input action.

+This is a provision for future support of multiple (distinguishable) button

+devices, and should always be set to 0 for now.

+      </para>

+    </listitem>

+  </varlistentry>

+  <varlistentry>

+    <term>delay</term>

+    <listitem>

+      <para>

+Specifies the time (in milliseconds) to wait before the input action.

+      </para>

+    </listitem>

+  </varlistentry>

+  <varlistentry>

+    <term>button_number</term>

+    <listitem>

+      <para>

+Specifies which button is being acted upon.

+      </para>

+    </listitem>

+  </varlistentry>

+  <varlistentry>

+    <term>button_action</term>

+    <listitem>

+      <para>

+Specifies the action to be performed (one of

+<emphasis>XTestPRESS</emphasis>,

+<emphasis>XTestRELEASE</emphasis>, or

+<emphasis>XTestSTROKE</emphasis>).

+      </para>

+    </listitem>

+  </varlistentry>

+</variablelist>

+

+<para>

+The

+<function>XTestPressButton</function>

+function creates input actions to be sent to the the server.

+The input actions will be accumulated in a request defined by this extension

+until the request is full or the XTestFlush function is called.

+They will then be sent to the server.

+When the input actions are sent to the server, the input actions will cause

+the server to think that the specified button was moved as specified.

+</para>

+<para>

+The

+<function>XTestPressButton</function>

+function will return -1 if there is an error, and 0 otherwise.

+</para>

+</sect3>

+

+<sect3 id="xtestpresskey">

+<title>XTestPressKey</title>

+

+<funcsynopsis>

+<funcprototype>

+  <funcdef>int <function>XTestPressKey</function></funcdef>

+    <paramdef>Display <parameter>*display</parameter></paramdef>

+    <paramdef>int <parameter>device_id</parameter></paramdef>

+    <paramdef>unsigned long <parameter>delay</parameter></paramdef>

+    <paramdef>unsigned int <parameter>keycode</parameter></paramdef>

+    <paramdef>unsigned int <parameter>key_action</parameter></paramdef>

+</funcprototype>

+</funcsynopsis>

+

+<!-- .VL 12 -->

+<variablelist>

+  <varlistentry>

+    <term>display</term>

+    <listitem>

+      <para>

+Specifies the connection to the X server.

+      </para>

+    </listitem>

+  </varlistentry>

+  <varlistentry>

+    <term>device_id</term>

+    <listitem>

+      <para>

+Specifies which keyboard device was supposed to have caused the input action.

+This is a provision for future support of multiple (distinguishable) keyboard

+devices, and should always be set to 0 for now.

+      </para>

+    </listitem>

+  </varlistentry>

+  <varlistentry>

+    <term>delay</term>

+    <listitem>

+      <para>

+Specifies the time (in milliseconds) to wait before the input action.

+      </para>

+    </listitem>

+  </varlistentry>

+  <varlistentry>

+    <term>keycode</term>

+    <listitem>

+      <para>

+Specifies which keycode is being acted upon.

+      </para>

+    </listitem>

+  </varlistentry>

+  <varlistentry>

+    <term>key_action</term>

+    <listitem>

+      <para>

+Specifies the action to be performed (one of

+<emphasis>XTestPRESS</emphasis>,

+<emphasis>XTestRELEASE</emphasis>, or

+<emphasis>XTestSTROKE</emphasis>).

+      </para>

+    </listitem>

+  </varlistentry>

+</variablelist>

+

+

+<para>

+The

+<function>XTestPressKey</function>

+function creates input actions to be sent to the the server.

+The input actions will be accumulated in a request defined by this extension

+until the request is full or the XTestFlush function is called.

+They will then be sent to the server.

+When the input actions are sent to the server, the input actions will cause

+the server to think that the specified key on the keyboard was moved as

+specified.

+</para>

+

+<para>

+The

+<function>XTestPressKey</function>

+function will return -1 if there is an error, and 0 otherwise.

+</para>

+

+</sect3>

+<sect3 id="xtestflush">

+<title>XTestFlush</title>

+

+<funcsynopsis>

+<funcprototype>

+  <funcdef>int <function>XTestFlush</function></funcdef>

+    <paramdef>Display <parameter>*display</parameter></paramdef>

+</funcprototype>

+</funcsynopsis>

+

+<!-- .VL 9 -->

+<variablelist>

+  <varlistentry>

+    <term>display</term>

+    <listitem>

+      <para>

+Specifies the connection to the X server.

+      </para>

+    </listitem>

+  </varlistentry>

+</variablelist>

+

+<para>

+The

+<function>XTestFlush</function>

+will send any remaining input actions to the server.

+</para>

+

+<para>

+The

+<function>XTestFlush</function>

+function will return -1 if there is an error, and 0 otherwise.

+</para>

+

+</sect3>

+</sect2>

+

+<!-- .H 2 Low~Level~Functions -->

+<sect2 id="low_level_functions">

+<title>Low Level Functions</title>

+

+<!-- .H 3 XTestGetInput -->

+<sect3 id="xtestgetinput">

+<title>XTestGetInput</title>

+

+<funcsynopsis>

+<funcprototype>

+  <funcdef>int <function>XTestGetInput</function></funcdef>

+    <paramdef>Display <parameter>*display</parameter></paramdef>

+    <paramdef>int <parameter>action_handling</parameter></paramdef>

+</funcprototype>

+</funcsynopsis>

+

+

+<variablelist>

+  <varlistentry>

+    <term>display</term>

+    <listitem>

+      <para>

+Specifies the connection to the X server.

+      </para>

+    </listitem>

+  </varlistentry>

+  <varlistentry>

+    <term>action_handling</term>

+    <listitem>

+      <para>

+Specifies to the server what to do with the user input actions.  (one of

+0, <emphasis>XTestPACKED_MOTION</emphasis> or

+<emphasis>XTestPACKED_ACTIONS</emphasis>; optionally 'or'ed

+with <emphasis>XTestEXCLUSIVE</emphasis>).

+      </para>

+    </listitem>

+  </varlistentry>

+</variablelist>

+

+

+<para>

+The

+<function>XTestGetInput</function>

+function tells the server to begin putting information about user input actions

+into events to be sent to the client that called this function.  These events

+can be read via the Xlib <function>XNextEvent</function>fR function.

+</para>

+

+<para>

+The server assigns an event type of

+<emphasis>XTestInputActionType</emphasis> to these events

+to distinguish them from other events.

+Since the actual value of the event type may vary depending on how many

+extensions are included with an X11 implementation,

+<emphasis>XTestInputActionType</emphasis> is a variable that will be

+contained in the Xlib

+part of this extension.  It may be referenced as follows:

+</para>

+

+<para>

+extern int XTestInputActionType;

+</para>

+

+<itemizedlist>

+  <listitem>

+    <para>

+An <emphasis>action_handling</emphasis> value of 0 causes the server

+to send one user input action in each

+<emphasis>XTestInputActionType</emphasis> event.

+This can sometimes cause performance problems.

+    </para>

+  </listitem>

+  <listitem>

+    <para>

+An <emphasis>action_handling</emphasis> value of

+<emphasis>XTestPACKED_ACTIONS</emphasis> causes the server

+to pack as many user input actions as possible into a

+<emphasis>XTestInputActionType</emphasis> event.

+This is needed if user input actions are happening rapidly (such as

+when the user moves the pointer) to keep performance at a reasonable level.

+    </para>

+  </listitem>

+  <listitem>

+    <para>

+An <emphasis>action_handling</emphasis> value of

+<emphasis>XTestPACKED_MOTION</emphasis> causes the server

+to pack only user input actions associated with moving the pointer.

+This allows the

+client to receive button and key motions as they happen without waiting for the

+event to fill up, while still keeping performance at a reasonable level.

+    </para>

+  </listitem>

+  <listitem>

+    <para>

+An <emphasis>action_handling</emphasis> value with

+<emphasis>XTestEXCLUSIVE</emphasis> 'or'ed in

+causes the server to send user input actions only to the client.

+The effect on the server is as if the user had performed no input actions.

+    </para>

+  </listitem>

+  <listitem>

+    <para>

+An <emphasis>action_handling</emphasis> value without

+<emphasis>XTestEXCLUSIVE</emphasis>

+causes the server to copy user input actions, sending one copy to the

+client, and handling the other copy normally (as it would if this extension

+were not installed).

+    </para>

+  </listitem>

+</itemizedlist>

+

+<para>

+There are four types of input actions that are passed from the server

+to the client.  They are:

+</para>

+

+<variablelist>

+  <varlistentry>

+    <term>key/button~state~change</term>

+    <listitem>

+      <para>

+This type of input action contains the keycode of the key or button that

+changed state;

+whether the key or button is up or down,

+and the time delay between this input action and the previous input action.

+      </para>

+    </listitem>

+  </varlistentry>

+  <varlistentry>

+    <term>pointer~motions</term>

+    <listitem>

+      <para>

+This type of input action contains information about the motion of the

+pointer when the pointer has only moved a short distance.

+If the pointer has moved a long distance,

+the pointer jump input action is used.

+      </para>

+    </listitem>

+  </varlistentry>

+  <varlistentry>

+    <term>pointer~jumps</term>

+    <listitem>

+      <para>

+This type of input action contains information about the motion of the

+pointer when the pointer has moved a long distance.

+      </para>

+    </listitem>

+  </varlistentry>

+  <varlistentry>

+    <term>delays</term>

+    <listitem>

+      <para>

+This type of input action is used when the delay between input actions is too

+large to be held in the other input actions.

+      </para>

+    </listitem>

+  </varlistentry>

+</variablelist>

+

+<para>

+The

+<function>XTestGetInput</function>

+function will return -1 if there is an error, and 0 otherwise.

+</para>

+<para>

+An error code of <emphasis>BadAccess</emphasis> means that another client

+has already requested that user input actions be sent to it.

+</para>

+

+</sect3>

+

+<!-- .H 3 XTestStopInput -->

+<sect3 id="xteststopinput">

+<title>XTestStopInput</title>

+

+<funcsynopsis>

+<funcprototype>

+  <funcdef>int <function>XTestStopInput</function></funcdef>

+    <paramdef>Display <parameter>*display</parameter></paramdef>

+</funcprototype>

+</funcsynopsis>

+

+

+

+<variablelist>

+  <varlistentry>

+    <term>display</term>

+    <listitem>

+      <para>

+Specifies the connection to the X server.

+      </para>

+    </listitem>

+  </varlistentry>

+</variablelist>

+

+<para>

+The

+<function>XTestStopInput</function>

+function tells the server to stop putting information about user input actions

+into events.

+The server will process user input actions normally (as it would

+if this extension were not in the server).

+</para>

+

+<para>

+The

+<function>XTestStopInput</function>

+function will return -1 if there is an error, and 0 otherwise.

+</para>

+

+<para>

+An error code of <emphasis>BadAccess</emphasis> means that a request

+was made to stop input when input has never been started.

+</para>

+

+</sect3>

+

+<!-- .H 3 XTestFakeInput -->

+<sect3 id="xtestfakeinput">

+<title>XTestFakeInput</title>

+

+<funcsynopsis>

+<funcprototype>

+  <funcdef>int <function>XTestFakeInput</function></funcdef>

+    <paramdef>Display <parameter>*display</parameter></paramdef>

+    <paramdef>char <parameter>*action_list_addr</parameter></paramdef>

+    <paramdef>int <parameter>action_list_size</parameter></paramdef>

+    <paramdef>int <parameter>ack_flag</parameter></paramdef>

+</funcprototype>

+</funcsynopsis>

+

+

+<!-- .VL 18 -->

+

+<variablelist>

+  <varlistentry>

+    <term>display</term>

+    <listitem>

+      <para>

+Specifies the connection to the X server.

+      </para>

+    </listitem>

+  </varlistentry>

+  <varlistentry>

+    <term>action_list_addr</term>

+    <listitem>

+      <para>

+Specifies the address of an list of input actions to be sent to the server.

+      </para>

+    </listitem>

+  </varlistentry>

+  <varlistentry>

+    <term>action_list_size</term>

+    <listitem>

+      <para>

+Specifies the size (in bytes) of the list of input actions.

+It may be no larger than <emphasis>XTestMAX_ACTION_LIST_SIZE</emphasis> bytes.

+      </para>

+    </listitem>

+  </varlistentry>

+  <varlistentry>

+    <term>ack_flag</term>

+    <listitem>

+      <para>

+Specifies whether the server needs to send an event to indicate that its

+input action buffer is empty (one of

+<emphasis>XTestFAKE_ACK_NOT_NEEDED</emphasis> or

+<emphasis>XTestFAKE_ACK_REQUEST</emphasis>).

+      </para>

+    </listitem>

+  </varlistentry>

+</variablelist>

+

+<para>

+The

+<function>XTestFakeInput</function>

+function tells the server to take the specified user input actions and process

+them as if the user had physically performed them.

+</para>

+

+<para>

+The server can only accept a limited number of input actions at one

+time.  This limit can be determined by the

+<function>XTestQueryInputSize</function> function

+in this extension.

+</para>

+

+<para>

+The client should set <emphasis>ack_flag</emphasis> to

+<emphasis>XTestFAKE_ACK_NOT_NEEDED</emphasis>

+on calls to <emphasis>XTestFakeInput</emphasis> that do not reach this limit.

+</para>

+

+<para>

+The client should set <emphasis>ack_flag</emphasis> to

+<emphasis>XTestFAKE_ACK_REQUEST</emphasis>

+on the call to <emphasis>XTestFakeInput</emphasis> that reaches this limit.

+</para>

+

+<para>

+When the server sees an <emphasis>ack_flag</emphasis> value of

+<emphasis>XTestFAKE_ACK_REQUEST</emphasis>

+it finishes processing its input action buffer, then sends an event with

+type <emphasis>XTestFakeAckType</emphasis> to the client.

+When the client reads this event, it knows that it is safe to resume

+sending input actions to the server.

+</para>

+

+<para>

+Since the actual value of the event type may vary depending on how many

+extensions are included with an X11 implementation,

+<emphasis>XTestFakeAckType</emphasis> is a variable that is contained

+in the Xlib part of this extension.  It may be referenced as follows:

+</para>

+

+<para>

+extern int XTestFakeAckType;

+</para>

+

+<para>

+There are four types of input actions that are passed from the client

+to the server.  They are:

+</para>

+

+<variablelist>

+  <varlistentry>

+    <term>key/button~state~change</term>

+    <listitem>

+      <para>

+This type of input action contains the keycode of the key or button that

+is to change state;

+whether the key or button is to be up or down,

+and the time to delay before changing the state of the key or button.

+      </para>

+    </listitem>

+  </varlistentry>

+  <varlistentry>

+    <term>pointer~motions</term>

+    <listitem>

+      <para>

+This type of input action contains information about the motion of the

+pointer when the pointer is to be moved a short distance,

+and the time to delay before moving the pointer.

+If the pointer is to be moved a long distance,

+the pointer jump input action must be used.

+      </para>

+    </listitem>

+  </varlistentry>

+  <varlistentry>

+    <term>pointer~jumps</term>

+    <listitem>

+      <para>

+This type of input action contains information about the motion of the

+pointer when the pointer is to be moved a long distance,

+and the time to delay before moving the pointer.

+      </para>

+    </listitem>

+  </varlistentry>

+  <varlistentry>

+    <term>delays</term>

+    <listitem>

+      <para>

+This type of input action is used when the delay between input actions is too

+large to be held in the other input actions.

+      </para>

+    </listitem>

+  </varlistentry>

+</variablelist>

+

+

+<para>

+The

+<function>XTestFakeInput</function>

+function will return -1 if there is an error, and 0 otherwise.

+</para>

+

+<para>

+An error code of \fIBadAccess\fR means that another client has already

+sent user input actions to the server, and the server has not finished

+processing the user input actions.

+</para>

+

+</sect3>

+

+<!-- .H 3 XTestQueryInputSize -->

+<sect3 id="xtestqueryinputsize">

+<title>XTestQueryInputSize</title>

+

+<funcsynopsis>

+<funcprototype>

+  <funcdef>int <function>XTestQueryInputSize</function></funcdef>

+    <paramdef>Display <parameter>*display</parameter></paramdef>

+    <paramdef>unsigned long <parameter>size_return</parameter></paramdef>

+</funcprototype>

+</funcsynopsis>

+

+

+<variablelist>

+  <varlistentry>

+    <term>display</term>

+    <listitem>

+      <para>

+Specifies the connection to the X server.

+      </para>

+    </listitem>

+  </varlistentry>

+  <varlistentry>

+    <term>size_return</term>

+    <listitem>

+      <para>

+Returns the number of input actions that the server's input action buffer can

+hold.

+      </para>

+    </listitem>

+  </varlistentry>

+</variablelist>

+

+<para>

+The

+<function>XTestQueryInputSize</function>

+function asks the server to return the number of input actions that it can hold

+in its input action buffer in the unsigned long pointed to by \fIsize_return\fR.

+</para>

+<para>

+The

+<function>XTestQueryInputSize</function>

+function will return -1 if there is an error, and 0 otherwise.

+</para>

+</sect3>

+

+<!-- .H 3 XTestReset -->

+<sect3 id="xtestreset">

+<title>XTestReset</title>

+

+<funcsynopsis>

+<funcprototype>

+  <funcdef>int <function>XTestReset</function></funcdef>

+    <paramdef>Display <parameter>*display</parameter></paramdef>

+</funcprototype>

+</funcsynopsis>

+

+

+<variablelist>

+  <varlistentry>

+    <term>display</term>

+    <listitem>

+      <para>

+Specifies the connection to the X server.

+      </para>

+    </listitem>

+  </varlistentry>

+</variablelist>

+

+<para>

+The

+<function>XTestReset</function>

+function tells the server to set everything having to do with this extension

+back to its initial state.  After this call the server will act as if this

+extension were not installed until one of the extension functions is called by

+a client.  This function is not normally needed, but is included in case a

+client wishes to clean up the server state, such as after a serious error.

+</para>

+

+<para>

+The

+<function>XTestReset</function>

+function will return -1 if there is an error, and 0 otherwise.

+</para>

+

+</sect3>

+</sect2>

+</sect1>

+

+<!-- .H 1 'xtestext1.h'~File~Listing -->

+<!-- .so xtestext1.h -->

+<!-- .TC 1 1 4 -->

+</chapter>

+</book>

diff --git a/libXext/src/XSync.c b/libXext/src/XSync.c
index 250d10cd3..9fdb47e2f 100644
--- a/libXext/src/XSync.c
+++ b/libXext/src/XSync.c
@@ -92,21 +92,107 @@ static XExtensionHooks sync_extension_hooks = {
 static char    *sync_error_list[] = {

     "BadCounter",

     "BadAlarm",

+    "BadFence",

 };

 

+typedef struct _SyncVersionInfoRec {

+    short major;

+    short minor;

+    int num_errors;

+} SyncVersionInfo;

+

+static /* const */ SyncVersionInfo supported_versions[] = {

+    { 3 /* major */, 0 /* minor */, 2 /* num_errors */ },

+    { 3 /* major */, 1 /* minor */, 3 /* num_errors */ },

+};

+

+#define NUM_VERSIONS (sizeof(supported_versions)/sizeof(supported_versions[0]))

+#define GET_VERSION(info) ((info) ? (const SyncVersionInfo*)(info)->data : NULL)

+#define IS_VERSION_SUPPORTED(info) (!!GET_VERSION(info))

+

 static

-XEXT_GENERATE_FIND_DISPLAY(find_display, sync_info,

-			   sync_extension_name,

-			   &sync_extension_hooks,

-			   XSyncNumberEvents, (XPointer) NULL)

+const SyncVersionInfo* GetVersionInfo(Display *dpy)

+{

+    xSyncInitializeReply rep;

+    xSyncInitializeReq *req;

+    XExtCodes codes;

+    int i;

+

+    if (!XQueryExtension(dpy, sync_extension_name,

+                         &codes.major_opcode,

+                         &codes.first_event,

+                         &codes.first_error))

+        return NULL;

+

+    LockDisplay(dpy);

+    GetReq(SyncInitialize, req);

+    req->reqType = codes.major_opcode;

+    req->syncReqType = X_SyncInitialize;

+    req->majorVersion = SYNC_MAJOR_VERSION;

+    req->minorVersion = SYNC_MINOR_VERSION;

+    if (!_XReply(dpy, (xReply *) & rep, 0, xTrue))

+    {

+	UnlockDisplay(dpy);

+	SyncHandle();

+	return NULL;

+    }

+    UnlockDisplay(dpy);

+    SyncHandle();

+

+    for (i = 0; i < NUM_VERSIONS; i++) {

+	if (supported_versions[i].major == rep.majorVersion &&

+	    supported_versions[i].minor == rep.minorVersion) {

+	    return &supported_versions[i];

+	}

+    }

+

+    return NULL;

+}

+

+static

+XExtDisplayInfo *find_display_create_optional(Display *dpy, Bool create)

+{

+    XExtDisplayInfo *dpyinfo;

+

+    if (!sync_info) {

+        if (!(sync_info = XextCreateExtension())) return NULL;

+    }

+

+    if (!(dpyinfo = XextFindDisplay (sync_info, dpy)) && create) {

+        dpyinfo = XextAddDisplay(sync_info, dpy,

+                                 sync_extension_name,

+                                 &sync_extension_hooks,

+                                 XSyncNumberEvents,

+                                 (XPointer)GetVersionInfo(dpy));

+    }

+

+    return dpyinfo;

+}

+

+static

+XExtDisplayInfo *find_display (Display *dpy)

+{

+    return find_display_create_optional(dpy, True);

+}

 

 static

 XEXT_GENERATE_CLOSE_DISPLAY(close_display, sync_info)

 

 static

-XEXT_GENERATE_ERROR_STRING(error_string, sync_extension_name,

-			   XSyncNumberErrors, sync_error_list)

+char *error_string(Display *dpy, int code, XExtCodes *codes, char *buf, int n)

+{

+    XExtDisplayInfo *info = find_display_create_optional(dpy, False);

+    int nerr = IS_VERSION_SUPPORTED(info) ? GET_VERSION(info)->num_errors : 0;

 

+    code -= codes->first_error;

+    if (code >= 0 && code < nerr) {

+	char tmp[256];

+	sprintf (tmp, "%s.%d", sync_extension_name, code);

+	XGetErrorDatabaseText (dpy, "XProtoError", tmp, sync_error_list[code], buf, n);

+	return buf;

+    }

+    return (char *)0;

+}

 

 static Bool

 wire_to_event(Display *dpy, XEvent *event, xEvent *wire)

@@ -231,32 +317,17 @@ XSyncInitialize(
     int *major_version_return, int *minor_version_return)

 {

     XExtDisplayInfo *info = find_display(dpy);

-    xSyncInitializeReply rep;

-    xSyncInitializeReq *req;

 

     SyncCheckExtension(dpy, info, False);

 

-    LockDisplay(dpy);

-    GetReq(SyncInitialize, req);

-    req->reqType = info->codes->major_opcode;

-    req->syncReqType = X_SyncInitialize;

-    req->majorVersion = SYNC_MAJOR_VERSION;

-    req->minorVersion = SYNC_MINOR_VERSION;

-    if (!_XReply(dpy, (xReply *) & rep, 0, xTrue))

-    {

-	UnlockDisplay(dpy);

-	SyncHandle();

+    if (IS_VERSION_SUPPORTED(info)) {

+	*major_version_return = GET_VERSION(info)->major;

+	*minor_version_return = GET_VERSION(info)->minor;

+

+	return True;

+    } else {

 	return False;

     }

-    UnlockDisplay(dpy);

-    SyncHandle();

-    *major_version_return = rep.majorVersion;

-    *minor_version_return = rep.minorVersion;

-    return ((rep.majorVersion == SYNC_MAJOR_VERSION)

-#if SYNC_MINOR_VERSION > 0	/* avoid compiler warning */

-	    && (rep.minorVersion >= SYNC_MINOR_VERSION)

-#endif

-	    );

 }

 

 XSyncSystemCounter *

@@ -691,6 +762,139 @@ XSyncGetPriority(Display *dpy, XID client_resource_id, int *return_priority)
     return True;

 }

 

+XSyncFence

+XSyncCreateFence(Display *dpy, Drawable d, Bool initially_triggered)

+{

+    XExtDisplayInfo *info = find_display(dpy);

+    xSyncCreateFenceReq *req;

+    XSyncFence id;

+

+    SyncCheckExtension(dpy, info, None);

+

+    LockDisplay(dpy);

+    GetReq(SyncCreateFence, req);

+    req->reqType = info->codes->major_opcode;

+    req->syncReqType = X_SyncCreateFence;

+

+    req->d = d;

+    id = req->fid = XAllocID(dpy);

+    req->initially_triggered = initially_triggered;

+

+    UnlockDisplay(dpy);

+    SyncHandle();

+    return id;

+}

+

+Bool

+XSyncTriggerFence(Display *dpy, XSyncFence fence)

+{

+    XExtDisplayInfo *info = find_display(dpy);

+    xSyncTriggerFenceReq *req;

+

+    SyncCheckExtension(dpy, info, None);

+

+    LockDisplay(dpy);

+    GetReq(SyncTriggerFence, req);

+    req->reqType = info->codes->major_opcode;

+    req->syncReqType = X_SyncTriggerFence;

+

+    req->fid = fence;

+

+    UnlockDisplay(dpy);

+    SyncHandle();

+    return True;

+}

+

+Bool

+XSyncResetFence(Display *dpy, XSyncFence fence)

+{

+    XExtDisplayInfo *info = find_display(dpy);

+    xSyncResetFenceReq *req;

+

+    SyncCheckExtension(dpy, info, None);

+

+    LockDisplay(dpy);

+    GetReq(SyncResetFence, req);

+    req->reqType = info->codes->major_opcode;

+    req->syncReqType = X_SyncResetFence;

+

+    req->fid = fence;

+

+    UnlockDisplay(dpy);

+    SyncHandle();

+    return True;

+}

+

+Bool

+XSyncDestroyFence(Display *dpy, XSyncFence fence)

+{

+    XExtDisplayInfo *info = find_display(dpy);

+    xSyncDestroyFenceReq *req;

+

+    SyncCheckExtension(dpy, info, None);

+

+    LockDisplay(dpy);

+    GetReq(SyncDestroyFence, req);

+    req->reqType = info->codes->major_opcode;

+    req->syncReqType = X_SyncDestroyFence;

+

+    req->fid = fence;

+

+    UnlockDisplay(dpy);

+    SyncHandle();

+    return True;

+}

+

+Bool

+XSyncQueryFence(Display *dpy, XSyncFence fence, Bool *triggered)

+{

+    XExtDisplayInfo *info = find_display(dpy);

+    xSyncQueryFenceReply rep;

+    xSyncQueryFenceReq *req;

+

+    SyncCheckExtension(dpy, info, None);

+

+    LockDisplay(dpy);

+    GetReq(SyncQueryFence, req);

+    req->reqType = info->codes->major_opcode;

+    req->syncReqType = X_SyncQueryFence;

+    req->fid = fence;

+

+    if (!_XReply(dpy, (xReply *) & rep, 0, xFalse))

+    {

+	UnlockDisplay(dpy);

+	SyncHandle();

+	return False;

+    }

+    if (triggered)

+	*triggered = rep.triggered;

+

+    UnlockDisplay(dpy);

+    SyncHandle();

+    return True;

+}

+

+Bool

+XSyncAwaitFence(Display *dpy, const XSyncFence *fence_list, int n_fences)

+{

+    XExtDisplayInfo *info = find_display(dpy);

+    xSyncAwaitFenceReq  *req;

+

+    SyncCheckExtension(dpy, info, False);

+

+    LockDisplay(dpy);

+    GetReq(SyncAwaitFence, req);

+    req->reqType = info->codes->major_opcode;

+    req->syncReqType = X_SyncAwaitFence;

+    SetReqLen(req, n_fences, n_fences);

+

+    Data32(dpy, (char *)fence_list, sizeof(CARD32) * n_fences);

+

+    UnlockDisplay(dpy);

+    SyncHandle();

+    return True;

+}

+

 /*

  *  Functions corresponding to the macros for manipulating 64-bit values

  */

diff --git a/packages.txt b/packages.txt
index 702bc0324..d273a5838 100644
--- a/packages.txt
+++ b/packages.txt
@@ -1,10 +1,11 @@
 bdftopcf-1.0.2

-bigreqsproto-1.1.0

-compositeproto-0.4.1

-damageproto-1.2.0

+bigreqsproto-1.1.1

+compositeproto-0.4.2

+damageproto-1.2.1

 encodings-1.0.3

 evieext-1.0.2

 fixesproto-4.1.1

+fixesproto-4.1.2

 font-adobe-100dpi-1.0.1

 font-adobe-75dpi-1.0.1

 font-adobe-utopia-100dpi-1.0.2

@@ -42,46 +43,46 @@ font-sun-misc-1.0.2
 font-util-1.1.1

 font-winitzki-cyrillic-1.0.1

 font-xfree86-type1-1.0.2

-fontsproto-2.1.0

+fontsproto-2.1.1

 freetype-2.4.2

 glproto-1.4.12

-inputproto-2.0

+inputproto-2.0.1

 kbproto-1.0.5

-libfontenc-1.0.5

 libX11-1.3.6

 libXau-1.0.6

 libXaw-1.0.7

-libxcb-1.5

 libXdmcp-1.0.3

 libXext-1.1.2

 libXfont-1.4.2

 libXinerama-1.1

-libxkbfile-1.0.6

 libXmu-1.0.5

 libXpm-3.5.8

 libXt-1.0.8

+libfontenc-1.0.5

+libxcb-1.5

+libxkbfile-1.0.6

 mesa-7.9

 mkfontscale-1.0.7

 openssl-1.0.0a

 pixman-0.19.2

 pthreads-w32-2-8-0-release

-randrproto-1.3.1

-recordproto-1.14

+randrproto-1.3.2

+recordproto-1.14.1

 renderproto-0.11.1

 resourceproto-1.1.0

-scrnsaverproto-1.2.0

+scrnsaverproto-1.2.1

 terminus-font-4.30

 ttf-bitstream-vera-1.10

 xcalc-1.0.2

-xclock-1.0.5

 xcb-proto-1.6

-xcmiscproto-1.2.0

+xclock-1.0.5

+xcmiscproto-1.2.1

 xextproto-7.1.2

 xineramaproto-1.2

 xkbcomp-1.1.1

 xkeyboard-config-1.8

 xorg-server-1.8.0

-xproto-7.0.18

+xproto-7.0.19

 xtrans-1.2.5

 xwininfo-1.1.0

 zlib-1.2.3

diff --git a/pixman/pixman/pixman-arm-common.h b/pixman/pixman/pixman-arm-common.h
index 08f34cc20..ede63a629 100644
--- a/pixman/pixman/pixman-arm-common.h
+++ b/pixman/pixman/pixman-arm-common.h
@@ -47,6 +47,9 @@
  * or mask), the corresponding stride argument is unused.

  */

 

+#define SKIP_ZERO_SRC  1

+#define SKIP_ZERO_MASK 2

+

 #define PIXMAN_ARM_BIND_FAST_PATH_SRC_DST(cputype, name,                \

                                           src_type, src_cnt,            \

                                           dst_type, dst_cnt)            \

@@ -87,7 +90,7 @@ cputype##_composite_##name (pixman_implementation_t *imp,               \
                                              src_line, src_stride);     \

 }

 

-#define PIXMAN_ARM_BIND_FAST_PATH_N_DST(cputype, name,                  \

+#define PIXMAN_ARM_BIND_FAST_PATH_N_DST(flags, cputype, name,           \

                                         dst_type, dst_cnt)              \

 void                                                                    \

 pixman_composite_##name##_asm_##cputype (int32_t    w,                  \

@@ -117,7 +120,7 @@ cputype##_composite_##name (pixman_implementation_t *imp,               \
                                                                         \

     src = _pixman_image_get_solid (src_image, dst_image->bits.format);  \

                                                                         \

-    if (src == 0)                                                       \

+    if ((flags & SKIP_ZERO_SRC) && src == 0)                            \

 	return;                                                         \

                                                                         \

     PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, dst_type,         \

@@ -128,7 +131,7 @@ cputype##_composite_##name (pixman_implementation_t *imp,               \
                                              src);                      \

 }

 

-#define PIXMAN_ARM_BIND_FAST_PATH_N_MASK_DST(cputype, name,             \

+#define PIXMAN_ARM_BIND_FAST_PATH_N_MASK_DST(flags, cputype, name,      \

                                              mask_type, mask_cnt,       \

                                              dst_type, dst_cnt)         \

 void                                                                    \

@@ -163,7 +166,7 @@ cputype##_composite_##name (pixman_implementation_t *imp,               \
                                                                         \

     src = _pixman_image_get_solid (src_image, dst_image->bits.format);  \

                                                                         \

-    if (src == 0)                                                       \

+    if ((flags & SKIP_ZERO_SRC) && src == 0)                            \

 	return;                                                         \

                                                                         \

     PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, dst_type,         \

@@ -177,7 +180,7 @@ cputype##_composite_##name (pixman_implementation_t *imp,               \
                                              mask_line, mask_stride);   \

 }

 

-#define PIXMAN_ARM_BIND_FAST_PATH_SRC_N_DST(cputype, name,              \

+#define PIXMAN_ARM_BIND_FAST_PATH_SRC_N_DST(flags, cputype, name,       \

                                             src_type, src_cnt,          \

                                             dst_type, dst_cnt)          \

 void                                                                    \

@@ -211,7 +214,7 @@ cputype##_composite_##name (pixman_implementation_t *imp,               \
                                                                         \

     mask = _pixman_image_get_solid (mask_image, dst_image->bits.format);\

                                                                         \

-    if (mask == 0)                                                      \

+    if ((flags & SKIP_ZERO_MASK) && mask == 0)                          \

 	return;                                                         \

                                                                         \

     PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, dst_type,         \

diff --git a/pixman/pixman/pixman-arm-neon-asm.S b/pixman/pixman/pixman-arm-neon-asm.S
index 0229bedfa..51533d42f 100644
--- a/pixman/pixman/pixman-arm-neon-asm.S
+++ b/pixman/pixman/pixman-arm-neon-asm.S
@@ -791,61 +791,112 @@ generate_composite_function \
 

 /******************************************************************************/

 

-.macro pixman_composite_over_n_8_0565_process_pixblock_head

-    /* in */

-    vmull.u8    q0, d24, d8

-    vmull.u8    q1, d24, d9

-    vmull.u8    q6, d24, d10

-    vmull.u8    q7, d24, d11

-    vrshr.u16   q10, q0, #8

-    vrshr.u16   q11, q1, #8

-    vrshr.u16   q12, q6, #8

-    vrshr.u16   q13, q7, #8

-    vraddhn.u16 d0, q0, q10

-    vraddhn.u16 d1, q1, q11

-    vraddhn.u16 d2, q6, q12

-    vraddhn.u16 d3, q7, q13

-

-    vshrn.u16   d6, q2, #8

-    vshrn.u16   d7, q2, #3

-    vsli.u16    q2, q2, #5

-    vsri.u8     d6, d6, #5

-    vmvn.8      d3, d3

-    vsri.u8     d7, d7, #6

-    vshrn.u16   d30, q2, #2

-    /* now do alpha blending */

-    vmull.u8    q10, d3, d6

-    vmull.u8    q11, d3, d7

-    vmull.u8    q12, d3, d30

-    vrshr.u16   q13, q10, #8

-    vrshr.u16   q3, q11, #8

-    vrshr.u16   q15, q12, #8

-    vraddhn.u16 d20, q10, q13

-    vraddhn.u16 d23, q11, q3

-    vraddhn.u16 d22, q12, q15

-.endm

-

-.macro pixman_composite_over_n_8_0565_process_pixblock_tail

-    vqadd.u8    d16, d2, d20

-    vqadd.u8    q9, q0, q11

-    /* convert to r5g6b5 */

-    vshll.u8    q14, d16, #8

-    vshll.u8    q8, d19, #8

-    vshll.u8    q9, d18, #8

-    vsri.u16    q14, q8, #5

-    vsri.u16    q14, q9, #11

+.macro pixman_composite_over_8888_8_0565_process_pixblock_head

+    vmull.u8    q0,  d24, d8    /* IN for SRC pixels (part1) */

+    vmull.u8    q1,  d24, d9

+    vmull.u8    q6,  d24, d10

+    vmull.u8    q7,  d24, d11

+        vshrn.u16   d6,  q2, #8 /* convert DST_R data to 32-bpp (part1) */

+        vshrn.u16   d7,  q2, #3

+        vsli.u16    q2,  q2, #5

+    vrshr.u16   q8,  q0,  #8    /* IN for SRC pixels (part2) */

+    vrshr.u16   q9,  q1,  #8

+    vrshr.u16   q10, q6,  #8

+    vrshr.u16   q11, q7,  #8

+    vraddhn.u16 d0,  q0,  q8

+    vraddhn.u16 d1,  q1,  q9

+    vraddhn.u16 d2,  q6,  q10

+    vraddhn.u16 d3,  q7,  q11

+        vsri.u8     d6,  d6, #5 /* convert DST_R data to 32-bpp (part2) */

+        vsri.u8     d7,  d7, #6

+    vmvn.8      d3,  d3

+        vshrn.u16   d30, q2, #2

+    vmull.u8    q8,  d3, d6     /* now do alpha blending */

+    vmull.u8    q9,  d3, d7

+    vmull.u8    q10, d3, d30

+.endm

+

+.macro pixman_composite_over_8888_8_0565_process_pixblock_tail

+    /* 3 cycle bubble (after vmull.u8) */

+    vrshr.u16   q13, q8,  #8

+    vrshr.u16   q11, q9,  #8

+    vrshr.u16   q15, q10, #8

+    vraddhn.u16 d16, q8,  q13

+    vraddhn.u16 d27, q9,  q11

+    vraddhn.u16 d26, q10, q15

+    vqadd.u8    d16, d2,  d16

+    /* 1 cycle bubble */

+    vqadd.u8    q9,  q0,  q13

+    vshll.u8    q14, d16, #8    /* convert to 16bpp */

+    vshll.u8    q8,  d19, #8

+    vshll.u8    q9,  d18, #8

+    vsri.u16    q14, q8,  #5

+    /* 1 cycle bubble */

+    vsri.u16    q14, q9,  #11

 .endm

 

-/* TODO: expand macros and do better instructions scheduling */

-.macro pixman_composite_over_n_8_0565_process_pixblock_tail_head

-    pixman_composite_over_n_8_0565_process_pixblock_tail

-    vst1.16     {d28, d29}, [DST_W, :128]!

+.macro pixman_composite_over_8888_8_0565_process_pixblock_tail_head

     vld1.16     {d4, d5}, [DST_R, :128]!

-    vld1.8      {d24}, [MASK]!

+    vshrn.u16   d6,  q2,  #8

+    fetch_mask_pixblock

+    vshrn.u16   d7,  q2,  #3

+    fetch_src_pixblock

+    vmull.u8    q6,  d24, d10

+        vrshr.u16   q13, q8,  #8

+        vrshr.u16   q11, q9,  #8

+        vrshr.u16   q15, q10, #8

+        vraddhn.u16 d16, q8,  q13

+        vraddhn.u16 d27, q9,  q11

+        vraddhn.u16 d26, q10, q15

+        vqadd.u8    d16, d2,  d16

+    vmull.u8    q1,  d24, d9

+        vqadd.u8    q9,  q0,  q13

+        vshll.u8    q14, d16, #8

+    vmull.u8    q0,  d24, d8

+        vshll.u8    q8,  d19, #8

+        vshll.u8    q9,  d18, #8

+        vsri.u16    q14, q8,  #5

+    vmull.u8    q7,  d24, d11

+        vsri.u16    q14, q9,  #11

+

     cache_preload 8, 8

-    pixman_composite_over_n_8_0565_process_pixblock_head

+

+    vsli.u16    q2,  q2,  #5

+    vrshr.u16   q8,  q0,  #8

+    vrshr.u16   q9,  q1,  #8

+    vrshr.u16   q10, q6,  #8

+    vrshr.u16   q11, q7,  #8

+    vraddhn.u16 d0,  q0,  q8

+    vraddhn.u16 d1,  q1,  q9

+    vraddhn.u16 d2,  q6,  q10

+    vraddhn.u16 d3,  q7,  q11

+    vsri.u8     d6,  d6,  #5

+    vsri.u8     d7,  d7,  #6

+    vmvn.8      d3,  d3

+    vshrn.u16   d30, q2,  #2

+    vst1.16     {d28, d29}, [DST_W, :128]!

+    vmull.u8    q8,  d3,  d6

+    vmull.u8    q9,  d3,  d7

+    vmull.u8    q10, d3,  d30

 .endm

 

+generate_composite_function \

+    pixman_composite_over_8888_8_0565_asm_neon, 32, 8, 16, \

+    FLAG_DST_READWRITE | FLAG_DEINTERLEAVE_32BPP, \

+    8, /* number of pixels, processed in a single block */ \

+    5, /* prefetch distance */ \

+    default_init_need_all_regs, \

+    default_cleanup_need_all_regs, \

+    pixman_composite_over_8888_8_0565_process_pixblock_head, \

+    pixman_composite_over_8888_8_0565_process_pixblock_tail, \

+    pixman_composite_over_8888_8_0565_process_pixblock_tail_head, \

+    28, /* dst_w_basereg */ \

+    4,  /* dst_r_basereg */ \

+    8,  /* src_basereg   */ \

+    24  /* mask_basereg  */

+

+/******************************************************************************/

+

 /*

  * This function needs a special initialization of solid mask.

  * Solid source pixel data is fetched from stack at ARGS_STACK_OFFSET

@@ -877,32 +928,32 @@ generate_composite_function \
     5, /* prefetch distance */ \

     pixman_composite_over_n_8_0565_init, \

     pixman_composite_over_n_8_0565_cleanup, \

-    pixman_composite_over_n_8_0565_process_pixblock_head, \

-    pixman_composite_over_n_8_0565_process_pixblock_tail, \

-    pixman_composite_over_n_8_0565_process_pixblock_tail_head

+    pixman_composite_over_8888_8_0565_process_pixblock_head, \

+    pixman_composite_over_8888_8_0565_process_pixblock_tail, \

+    pixman_composite_over_8888_8_0565_process_pixblock_tail_head

 

 /******************************************************************************/

 

-/* TODO: expand macros and do better instructions scheduling */

-.macro pixman_composite_over_8888_8_0565_process_pixblock_tail_head

-    vld1.16     {d4, d5}, [DST_R, :128]!

-    pixman_composite_over_n_8_0565_process_pixblock_tail

-    fetch_src_pixblock

-    cache_preload 8, 8

-    vld1.8      {d24}, [MASK]!

-    pixman_composite_over_n_8_0565_process_pixblock_head

-    vst1.16     {d28, d29}, [DST_W, :128]!

+.macro pixman_composite_over_8888_n_0565_init

+    add         DUMMY, sp, #(ARGS_STACK_OFFSET + 8)

+    vpush       {d8-d15}

+    vld1.32     {d24[0]}, [DUMMY]

+    vdup.8      d24, d24[3]

+.endm

+

+.macro pixman_composite_over_8888_n_0565_cleanup

+    vpop        {d8-d15}

 .endm

 

 generate_composite_function \

-    pixman_composite_over_8888_8_0565_asm_neon, 32, 8, 16, \

+    pixman_composite_over_8888_n_0565_asm_neon, 32, 0, 16, \

     FLAG_DST_READWRITE | FLAG_DEINTERLEAVE_32BPP, \

     8, /* number of pixels, processed in a single block */ \

     5, /* prefetch distance */ \

-    default_init_need_all_regs, \

-    default_cleanup_need_all_regs, \

-    pixman_composite_over_n_8_0565_process_pixblock_head, \

-    pixman_composite_over_n_8_0565_process_pixblock_tail, \

+    pixman_composite_over_8888_n_0565_init, \

+    pixman_composite_over_8888_n_0565_cleanup, \

+    pixman_composite_over_8888_8_0565_process_pixblock_head, \

+    pixman_composite_over_8888_8_0565_process_pixblock_tail, \

     pixman_composite_over_8888_8_0565_process_pixblock_tail_head, \

     28, /* dst_w_basereg */ \

     4,  /* dst_r_basereg */ \

@@ -1171,7 +1222,7 @@ generate_composite_function \
     pixman_composite_over_n_8_8888_process_pixblock_tail

     vst4.8      {d28, d29, d30, d31}, [DST_W, :128]!

     vld4.8      {d4, d5, d6, d7}, [DST_R, :128]!

-    vld1.8      {d24}, [MASK]!

+    fetch_mask_pixblock

     cache_preload 8, 8

     pixman_composite_over_n_8_8888_process_pixblock_head

 .endm

@@ -1203,6 +1254,74 @@ generate_composite_function \
 

 /******************************************************************************/

 

+.macro pixman_composite_over_n_8_8_process_pixblock_head

+    vmull.u8    q0,  d24, d8

+    vmull.u8    q1,  d25, d8

+    vmull.u8    q6,  d26, d8

+    vmull.u8    q7,  d27, d8

+    vrshr.u16   q10, q0,  #8

+    vrshr.u16   q11, q1,  #8

+    vrshr.u16   q12, q6,  #8

+    vrshr.u16   q13, q7,  #8

+    vraddhn.u16 d0,  q0,  q10

+    vraddhn.u16 d1,  q1,  q11

+    vraddhn.u16 d2,  q6,  q12

+    vraddhn.u16 d3,  q7,  q13

+    vmvn.8      q12, q0

+    vmvn.8      q13, q1

+    vmull.u8    q8,  d24, d4

+    vmull.u8    q9,  d25, d5

+    vmull.u8    q10, d26, d6

+    vmull.u8    q11, d27, d7

+.endm

+

+.macro pixman_composite_over_n_8_8_process_pixblock_tail

+    vrshr.u16   q14, q8,  #8

+    vrshr.u16   q15, q9,  #8

+    vrshr.u16   q12, q10, #8

+    vrshr.u16   q13, q11, #8

+    vraddhn.u16 d28, q14, q8

+    vraddhn.u16 d29, q15, q9

+    vraddhn.u16 d30, q12, q10

+    vraddhn.u16 d31, q13, q11

+    vqadd.u8    q14, q0,  q14

+    vqadd.u8    q15, q1,  q15

+.endm

+

+/* TODO: expand macros and do better instructions scheduling */

+.macro pixman_composite_over_n_8_8_process_pixblock_tail_head

+    vld1.8      {d4, d5, d6, d7}, [DST_R, :128]!

+    pixman_composite_over_n_8_8_process_pixblock_tail

+    fetch_mask_pixblock

+    cache_preload 32, 32

+    vst1.8      {d28, d29, d30, d31}, [DST_W, :128]!

+    pixman_composite_over_n_8_8_process_pixblock_head

+.endm

+

+.macro pixman_composite_over_n_8_8_init

+    add         DUMMY, sp, #ARGS_STACK_OFFSET

+    vpush       {d8-d15}

+    vld1.32     {d8[0]}, [DUMMY]

+    vdup.8      d8, d8[3]

+.endm

+

+.macro pixman_composite_over_n_8_8_cleanup

+    vpop        {d8-d15}

+.endm

+

+generate_composite_function \

+    pixman_composite_over_n_8_8_asm_neon, 0, 8, 8, \

+    FLAG_DST_READWRITE, \

+    32, /* number of pixels, processed in a single block */ \

+    5, /* prefetch distance */ \

+    pixman_composite_over_n_8_8_init, \

+    pixman_composite_over_n_8_8_cleanup, \

+    pixman_composite_over_n_8_8_process_pixblock_head, \

+    pixman_composite_over_n_8_8_process_pixblock_tail, \

+    pixman_composite_over_n_8_8_process_pixblock_tail_head

+

+/******************************************************************************/

+

 .macro pixman_composite_over_n_8888_8888_ca_process_pixblock_head

     /*

      * 'combine_mask_ca' replacement

@@ -1273,7 +1392,7 @@ generate_composite_function \
         vraddhn.u16 d29, q15, q9

         vraddhn.u16 d30, q6, q10

         vraddhn.u16 d31, q7, q11

-    vld4.8      {d24, d25, d26, d27}, [MASK]!

+    fetch_mask_pixblock

         vqadd.u8    q14, q0, q14

         vqadd.u8    q15, q1, q15

     cache_preload 8, 8

@@ -1308,6 +1427,58 @@ generate_composite_function \
 

 /******************************************************************************/

 

+.macro pixman_composite_in_n_8_process_pixblock_head

+    /* expecting source data in {d0, d1, d2, d3} */

+    /* and destination data in {d4, d5, d6, d7} */

+    vmull.u8    q8,  d4,  d3

+    vmull.u8    q9,  d5,  d3

+    vmull.u8    q10, d6,  d3

+    vmull.u8    q11, d7,  d3

+.endm

+

+.macro pixman_composite_in_n_8_process_pixblock_tail

+    vrshr.u16   q14, q8,  #8

+    vrshr.u16   q15, q9,  #8

+    vrshr.u16   q12, q10, #8

+    vrshr.u16   q13, q11, #8

+    vraddhn.u16 d28, q8,  q14

+    vraddhn.u16 d29, q9,  q15

+    vraddhn.u16 d30, q10, q12

+    vraddhn.u16 d31, q11, q13

+.endm

+

+.macro pixman_composite_in_n_8_process_pixblock_tail_head

+    pixman_composite_in_n_8_process_pixblock_tail

+    vld1.8      {d4, d5, d6, d7}, [DST_R, :128]!

+    cache_preload 32, 32

+    pixman_composite_in_n_8_process_pixblock_head

+    vst1.8      {d28, d29, d30, d31}, [DST_W, :128]!

+.endm

+

+.macro pixman_composite_in_n_8_init

+    add         DUMMY, sp, #ARGS_STACK_OFFSET

+    vld1.32     {d3[0]}, [DUMMY]

+    vdup.8      d3, d3[3]

+.endm

+

+.macro pixman_composite_in_n_8_cleanup

+.endm

+

+generate_composite_function \

+    pixman_composite_in_n_8_asm_neon, 0, 0, 8, \

+    FLAG_DST_READWRITE, \

+    32, /* number of pixels, processed in a single block */ \

+    5, /* prefetch distance */ \

+    pixman_composite_in_n_8_init, \

+    pixman_composite_in_n_8_cleanup, \

+    pixman_composite_in_n_8_process_pixblock_head, \

+    pixman_composite_in_n_8_process_pixblock_tail, \

+    pixman_composite_in_n_8_process_pixblock_tail_head, \

+    28, /* dst_w_basereg */ \

+    4,  /* dst_r_basereg */ \

+    0,  /* src_basereg   */ \

+    24  /* mask_basereg  */

+

 .macro pixman_composite_add_n_8_8_process_pixblock_head

     /* expecting source data in {d8, d9, d10, d11} */

     /* d8 - blue, d9 - green, d10 - red, d11 - alpha */

@@ -1337,7 +1508,7 @@ generate_composite_function \
     pixman_composite_add_n_8_8_process_pixblock_tail

     vst1.8      {d28, d29, d30, d31}, [DST_W, :128]!

     vld1.8      {d4, d5, d6, d7}, [DST_R, :128]!

-    vld1.8      {d24, d25, d26, d27}, [MASK]!

+    fetch_mask_pixblock

     cache_preload 32, 32

     pixman_composite_add_n_8_8_process_pixblock_head

 .endm

@@ -1394,7 +1565,7 @@ generate_composite_function \
     pixman_composite_add_8_8_8_process_pixblock_tail

     vst1.8      {d28, d29, d30, d31}, [DST_W, :128]!

     vld1.8      {d4, d5, d6, d7}, [DST_R, :128]!

-    vld1.8      {d24, d25, d26, d27}, [MASK]!

+    fetch_mask_pixblock

     fetch_src_pixblock

     cache_preload 32, 32

     pixman_composite_add_8_8_8_process_pixblock_head

@@ -1423,34 +1594,50 @@ generate_composite_function \
     /* expecting source data in {d0, d1, d2, d3} */

     /* destination data in {d4, d5, d6, d7} */

     /* mask in {d24, d25, d26, d27} */

-    vmull.u8    q8, d27, d0

-    vmull.u8    q9, d27, d1

+    vmull.u8    q8,  d27, d0

+    vmull.u8    q9,  d27, d1

     vmull.u8    q10, d27, d2

     vmull.u8    q11, d27, d3

-    vrshr.u16   q0, q8, #8

-    vrshr.u16   q1, q9, #8

-    vrshr.u16   q12, q10, #8

-    vrshr.u16   q13, q11, #8

-    vraddhn.u16 d0, q0, q8

-    vraddhn.u16 d1, q1, q9

-    vraddhn.u16 d2, q12, q10

-    vraddhn.u16 d3, q13, q11

-    vqadd.u8    q14, q0, q2

-    vqadd.u8    q15, q1, q3

+    /* 1 cycle bubble */

+    vrsra.u16   q8,  q8,  #8

+    vrsra.u16   q9,  q9,  #8

+    vrsra.u16   q10, q10, #8

+    vrsra.u16   q11, q11, #8

 .endm

 

 .macro pixman_composite_add_8888_8888_8888_process_pixblock_tail

+    /* 2 cycle bubble */

+    vrshrn.u16  d28, q8,  #8

+    vrshrn.u16  d29, q9,  #8

+    vrshrn.u16  d30, q10, #8

+    vrshrn.u16  d31, q11, #8

+    vqadd.u8    q14, q2,  q14

+    /* 1 cycle bubble */

+    vqadd.u8    q15, q3,  q15

 .endm

 

-/* TODO: expand macros and do better instructions scheduling */

 .macro pixman_composite_add_8888_8888_8888_process_pixblock_tail_head

-    pixman_composite_add_8888_8888_8888_process_pixblock_tail

-    vst4.8      {d28, d29, d30, d31}, [DST_W, :128]!

-    vld4.8      {d4, d5, d6, d7}, [DST_R, :128]!

-    vld4.8      {d24, d25, d26, d27}, [MASK]!

     fetch_src_pixblock

+        vrshrn.u16  d28, q8,  #8

+    fetch_mask_pixblock

+        vrshrn.u16  d29, q9,  #8

+    vmull.u8    q8,  d27, d0

+        vrshrn.u16  d30, q10, #8

+    vmull.u8    q9,  d27, d1

+        vrshrn.u16  d31, q11, #8

+    vmull.u8    q10, d27, d2

+        vqadd.u8    q14, q2,  q14

+    vmull.u8    q11, d27, d3

+        vqadd.u8    q15, q3,  q15

+    vrsra.u16   q8,  q8,  #8

+    vld4.8      {d4, d5, d6, d7}, [DST_R, :128]!

+    vrsra.u16   q9,  q9,  #8

+        vst4.8      {d28, d29, d30, d31}, [DST_W, :128]!

+    vrsra.u16   q10, q10, #8

+

     cache_preload 8, 8

-    pixman_composite_add_8888_8888_8888_process_pixblock_head

+

+    vrsra.u16   q11, q11, #8

 .endm

 

 generate_composite_function \

@@ -1476,6 +1663,78 @@ generate_composite_function_single_scanline \
 

 /******************************************************************************/

 

+generate_composite_function \

+    pixman_composite_add_8888_8_8888_asm_neon, 32, 8, 32, \

+    FLAG_DST_READWRITE | FLAG_DEINTERLEAVE_32BPP, \

+    8, /* number of pixels, processed in a single block */ \

+    5, /* prefetch distance */ \

+    default_init, \

+    default_cleanup, \

+    pixman_composite_add_8888_8888_8888_process_pixblock_head, \

+    pixman_composite_add_8888_8888_8888_process_pixblock_tail, \

+    pixman_composite_add_8888_8888_8888_process_pixblock_tail_head, \

+    28, /* dst_w_basereg */ \

+    4,  /* dst_r_basereg */ \

+    0,  /* src_basereg   */ \

+    27  /* mask_basereg  */

+

+/******************************************************************************/

+

+.macro pixman_composite_add_n_8_8888_init

+    add         DUMMY, sp, #ARGS_STACK_OFFSET

+    vld1.32     {d3[0]}, [DUMMY]

+    vdup.8      d0, d3[0]

+    vdup.8      d1, d3[1]

+    vdup.8      d2, d3[2]

+    vdup.8      d3, d3[3]

+.endm

+

+.macro pixman_composite_add_n_8_8888_cleanup

+.endm

+

+generate_composite_function \

+    pixman_composite_add_n_8_8888_asm_neon, 0, 8, 32, \

+    FLAG_DST_READWRITE | FLAG_DEINTERLEAVE_32BPP, \

+    8, /* number of pixels, processed in a single block */ \

+    5, /* prefetch distance */ \

+    pixman_composite_add_n_8_8888_init, \

+    pixman_composite_add_n_8_8888_cleanup, \

+    pixman_composite_add_8888_8888_8888_process_pixblock_head, \

+    pixman_composite_add_8888_8888_8888_process_pixblock_tail, \

+    pixman_composite_add_8888_8888_8888_process_pixblock_tail_head, \

+    28, /* dst_w_basereg */ \

+    4,  /* dst_r_basereg */ \

+    0,  /* src_basereg   */ \

+    27  /* mask_basereg  */

+

+/******************************************************************************/

+

+.macro pixman_composite_add_8888_n_8888_init

+    add         DUMMY, sp, #(ARGS_STACK_OFFSET + 8)

+    vld1.32     {d27[0]}, [DUMMY]

+    vdup.8      d27, d27[3]

+.endm

+

+.macro pixman_composite_add_8888_n_8888_cleanup

+.endm

+

+generate_composite_function \

+    pixman_composite_add_8888_n_8888_asm_neon, 32, 0, 32, \

+    FLAG_DST_READWRITE | FLAG_DEINTERLEAVE_32BPP, \

+    8, /* number of pixels, processed in a single block */ \

+    5, /* prefetch distance */ \

+    pixman_composite_add_8888_n_8888_init, \

+    pixman_composite_add_8888_n_8888_cleanup, \

+    pixman_composite_add_8888_8888_8888_process_pixblock_head, \

+    pixman_composite_add_8888_8888_8888_process_pixblock_tail, \

+    pixman_composite_add_8888_8888_8888_process_pixblock_tail_head, \

+    28, /* dst_w_basereg */ \

+    4,  /* dst_r_basereg */ \

+    0,  /* src_basereg   */ \

+    27  /* mask_basereg  */

+

+/******************************************************************************/

+

 .macro pixman_composite_out_reverse_8888_n_8888_process_pixblock_head

     /* expecting source data in {d0, d1, d2, d3} */

     /* destination data in {d4, d5, d6, d7} */

@@ -1519,7 +1778,7 @@ generate_composite_function_single_scanline \
     pixman_composite_out_reverse_8888_n_8888_process_pixblock_tail

     fetch_src_pixblock

     cache_preload 8, 8

-    vld4.8     {d12, d13, d14, d15}, [MASK]!

+    fetch_mask_pixblock

     pixman_composite_out_reverse_8888_n_8888_process_pixblock_head

     vst4.8     {d28, d29, d30, d31}, [DST_W, :128]!

 .endm

@@ -1590,7 +1849,7 @@ generate_composite_function \
     pixman_composite_over_8888_n_8888_process_pixblock_tail

     fetch_src_pixblock

     cache_preload 8, 8

-    vld4.8     {d12, d13, d14, d15}, [MASK]!

+    fetch_mask_pixblock

     pixman_composite_over_8888_n_8888_process_pixblock_head

     vst4.8     {d28, d29, d30, d31}, [DST_W, :128]!

 .endm

@@ -1632,7 +1891,7 @@ generate_composite_function_single_scanline \
     pixman_composite_over_8888_n_8888_process_pixblock_tail

     fetch_src_pixblock

     cache_preload 8, 8

-    vld1.8     {d15}, [MASK]!

+    fetch_mask_pixblock

     pixman_composite_over_8888_n_8888_process_pixblock_head

     vst4.8     {d28, d29, d30, d31}, [DST_W, :128]!

 .endm

@@ -1813,6 +2072,63 @@ generate_composite_function \
 

 /******************************************************************************/

 

+.macro pixman_composite_src_rpixbuf_8888_process_pixblock_head

+    vmull.u8    q8, d3, d0

+    vmull.u8    q9, d3, d1

+    vmull.u8    q10, d3, d2

+.endm

+

+.macro pixman_composite_src_rpixbuf_8888_process_pixblock_tail

+    vrshr.u16   q11, q8, #8

+    vswp        d3, d31

+    vrshr.u16   q12, q9, #8

+    vrshr.u16   q13, q10, #8

+    vraddhn.u16 d28, q11, q8

+    vraddhn.u16 d29, q12, q9

+    vraddhn.u16 d30, q13, q10

+.endm

+

+.macro pixman_composite_src_rpixbuf_8888_process_pixblock_tail_head

+        vrshr.u16   q11, q8, #8

+        vswp        d3, d31

+        vrshr.u16   q12, q9, #8

+        vrshr.u16   q13, q10, #8

+    fetch_src_pixblock

+        vraddhn.u16 d28, q11, q8

+                                    PF add PF_X, PF_X, #8

+                                    PF tst PF_CTL, #0xF

+                                    PF addne PF_X, PF_X, #8

+                                    PF subne PF_CTL, PF_CTL, #1

+        vraddhn.u16 d29, q12, q9

+        vraddhn.u16 d30, q13, q10

+    vmull.u8    q8, d3, d0

+    vmull.u8    q9, d3, d1

+    vmull.u8    q10, d3, d2

+        vst4.8 {d28, d29, d30, d31}, [DST_W, :128]!

+                                    PF cmp PF_X, ORIG_W

+                                    PF pld, [PF_SRC, PF_X, lsl #src_bpp_shift]

+                                    PF subge PF_X, PF_X, ORIG_W

+                                    PF subges PF_CTL, PF_CTL, #0x10

+                                    PF ldrgeb DUMMY, [PF_SRC, SRC_STRIDE, lsl #src_bpp_shift]!

+.endm

+

+generate_composite_function \

+    pixman_composite_src_rpixbuf_8888_asm_neon, 32, 0, 32, \

+    FLAG_DST_WRITEONLY | FLAG_DEINTERLEAVE_32BPP, \

+    8, /* number of pixels, processed in a single block */ \

+    10, /* prefetch distance */ \

+    default_init, \

+    default_cleanup, \

+    pixman_composite_src_rpixbuf_8888_process_pixblock_head, \

+    pixman_composite_src_rpixbuf_8888_process_pixblock_tail, \

+    pixman_composite_src_rpixbuf_8888_process_pixblock_tail_head, \

+    28, /* dst_w_basereg */ \

+    0, /* dst_r_basereg */ \

+    0, /* src_basereg   */ \

+    0  /* mask_basereg  */

+

+/******************************************************************************/

+

 .macro pixman_composite_over_0565_8_0565_process_pixblock_head

     /* mask is in d15 */

     convert_0565_to_x888 q4, d2, d1, d0

@@ -1849,7 +2165,7 @@ generate_composite_function \
 

 /* TODO: expand macros and do better instructions scheduling */

 .macro pixman_composite_over_0565_8_0565_process_pixblock_tail_head

-    vld1.8     {d15}, [MASK]!

+    fetch_mask_pixblock

     pixman_composite_over_0565_8_0565_process_pixblock_tail

     fetch_src_pixblock

     vld1.16    {d10, d11}, [DST_R, :128]!

@@ -1875,6 +2191,34 @@ generate_composite_function \
 

 /******************************************************************************/

 

+.macro pixman_composite_over_0565_n_0565_init

+    add         DUMMY, sp, #(ARGS_STACK_OFFSET + 8)

+    vpush       {d8-d15}

+    vld1.32     {d15[0]}, [DUMMY]

+    vdup.8      d15, d15[3]

+.endm

+

+.macro pixman_composite_over_0565_n_0565_cleanup

+    vpop        {d8-d15}

+.endm

+

+generate_composite_function \

+    pixman_composite_over_0565_n_0565_asm_neon, 16, 0, 16, \

+    FLAG_DST_READWRITE, \

+    8, /* number of pixels, processed in a single block */ \

+    5, /* prefetch distance */ \

+    pixman_composite_over_0565_n_0565_init, \

+    pixman_composite_over_0565_n_0565_cleanup, \

+    pixman_composite_over_0565_8_0565_process_pixblock_head, \

+    pixman_composite_over_0565_8_0565_process_pixblock_tail, \

+    pixman_composite_over_0565_8_0565_process_pixblock_tail_head, \

+    28, /* dst_w_basereg */ \

+    10, /* dst_r_basereg */ \

+    8,  /* src_basereg   */ \

+    15  /* mask_basereg  */

+

+/******************************************************************************/

+

 .macro pixman_composite_add_0565_8_0565_process_pixblock_head

     /* mask is in d15 */

     convert_0565_to_x888 q4, d2, d1, d0

@@ -1901,7 +2245,7 @@ generate_composite_function \
 

 /* TODO: expand macros and do better instructions scheduling */

 .macro pixman_composite_add_0565_8_0565_process_pixblock_tail_head

-    vld1.8     {d15}, [MASK]!

+    fetch_mask_pixblock

     pixman_composite_add_0565_8_0565_process_pixblock_tail

     fetch_src_pixblock

     vld1.16    {d10, d11}, [DST_R, :128]!

diff --git a/pixman/pixman/pixman-arm-neon-asm.h b/pixman/pixman/pixman-arm-neon-asm.h
index 1d8a31c1e..6e3d583f5 100644
--- a/pixman/pixman/pixman-arm-neon-asm.h
+++ b/pixman/pixman/pixman-arm-neon-asm.h
@@ -431,6 +431,11 @@
 .endif

 .endm

 

+.macro fetch_mask_pixblock

+    pixld       pixblock_size, mask_bpp, \

+                (mask_basereg - pixblock_size * mask_bpp / 64), MASK

+.endm

+

 /*

  * Macro which is used to process leading pixels until destination

  * pointer is properly aligned (at 16 bytes boundary). When destination

diff --git a/pixman/pixman/pixman-arm-neon.c b/pixman/pixman/pixman-arm-neon.c
index 858bb071e..e89cc3215 100644
--- a/pixman/pixman/pixman-arm-neon.c
+++ b/pixman/pixman/pixman-arm-neon.c
@@ -52,6 +52,8 @@ PIXMAN_ARM_BIND_FAST_PATH_SRC_DST (neon, src_0888_0565_rev,
                                    uint8_t, 3, uint16_t, 1)

 PIXMAN_ARM_BIND_FAST_PATH_SRC_DST (neon, src_pixbuf_8888,

                                    uint32_t, 1, uint32_t, 1)

+PIXMAN_ARM_BIND_FAST_PATH_SRC_DST (neon, src_rpixbuf_8888,

+                                   uint32_t, 1, uint32_t, 1)

 PIXMAN_ARM_BIND_FAST_PATH_SRC_DST (neon, add_8_8,

                                    uint8_t, 1, uint8_t, 1)

 PIXMAN_ARM_BIND_FAST_PATH_SRC_DST (neon, add_8888_8888,

@@ -63,29 +65,43 @@ PIXMAN_ARM_BIND_FAST_PATH_SRC_DST (neon, over_8888_8888,
 PIXMAN_ARM_BIND_FAST_PATH_SRC_DST (neon, out_reverse_8_0565,

                                    uint8_t, 1, uint16_t, 1)

 

-PIXMAN_ARM_BIND_FAST_PATH_N_DST (neon, over_n_0565,

+PIXMAN_ARM_BIND_FAST_PATH_N_DST (SKIP_ZERO_SRC, neon, over_n_0565,

                                  uint16_t, 1)

-PIXMAN_ARM_BIND_FAST_PATH_N_DST (neon, over_n_8888,

+PIXMAN_ARM_BIND_FAST_PATH_N_DST (SKIP_ZERO_SRC, neon, over_n_8888,

                                  uint32_t, 1)

-PIXMAN_ARM_BIND_FAST_PATH_N_DST (neon, over_reverse_n_8888,

+PIXMAN_ARM_BIND_FAST_PATH_N_DST (SKIP_ZERO_SRC, neon, over_reverse_n_8888,

                                  uint32_t, 1)

+PIXMAN_ARM_BIND_FAST_PATH_N_DST (0, neon, in_n_8,

+                                 uint8_t, 1)

 

-PIXMAN_ARM_BIND_FAST_PATH_N_MASK_DST (neon, over_n_8_0565,

+PIXMAN_ARM_BIND_FAST_PATH_N_MASK_DST (SKIP_ZERO_SRC, neon, over_n_8_0565,

                                       uint8_t, 1, uint16_t, 1)

-PIXMAN_ARM_BIND_FAST_PATH_N_MASK_DST (neon, over_n_8_8888,

+PIXMAN_ARM_BIND_FAST_PATH_N_MASK_DST (SKIP_ZERO_SRC, neon, over_n_8_8888,

                                       uint8_t, 1, uint32_t, 1)

-PIXMAN_ARM_BIND_FAST_PATH_N_MASK_DST (neon, over_n_8888_8888_ca,

+PIXMAN_ARM_BIND_FAST_PATH_N_MASK_DST (SKIP_ZERO_SRC, neon, over_n_8888_8888_ca,

                                       uint32_t, 1, uint32_t, 1)

-PIXMAN_ARM_BIND_FAST_PATH_N_MASK_DST (neon, add_n_8_8,

+PIXMAN_ARM_BIND_FAST_PATH_N_MASK_DST (SKIP_ZERO_SRC, neon, over_n_8_8,

+                                      uint8_t, 1, uint8_t, 1)

+PIXMAN_ARM_BIND_FAST_PATH_N_MASK_DST (SKIP_ZERO_SRC, neon, add_n_8_8,

                                       uint8_t, 1, uint8_t, 1)

+PIXMAN_ARM_BIND_FAST_PATH_N_MASK_DST (SKIP_ZERO_SRC, neon, add_n_8_8888,

+                                      uint8_t, 1, uint32_t, 1)

 

-PIXMAN_ARM_BIND_FAST_PATH_SRC_N_DST (neon, over_8888_n_8888,

+PIXMAN_ARM_BIND_FAST_PATH_SRC_N_DST (SKIP_ZERO_MASK, neon, over_8888_n_8888,

+                                     uint32_t, 1, uint32_t, 1)

+PIXMAN_ARM_BIND_FAST_PATH_SRC_N_DST (SKIP_ZERO_MASK, neon, over_8888_n_0565,

+                                     uint32_t, 1, uint16_t, 1)

+PIXMAN_ARM_BIND_FAST_PATH_SRC_N_DST (SKIP_ZERO_MASK, neon, over_0565_n_0565,

+                                     uint16_t, 1, uint16_t, 1)

+PIXMAN_ARM_BIND_FAST_PATH_SRC_N_DST (SKIP_ZERO_MASK, neon, add_8888_n_8888,

                                      uint32_t, 1, uint32_t, 1)

 

 PIXMAN_ARM_BIND_FAST_PATH_SRC_MASK_DST (neon, add_8_8_8,

                                         uint8_t, 1, uint8_t, 1, uint8_t, 1)

 PIXMAN_ARM_BIND_FAST_PATH_SRC_MASK_DST (neon, add_0565_8_0565,

                                         uint16_t, 1, uint8_t, 1, uint16_t, 1)

+PIXMAN_ARM_BIND_FAST_PATH_SRC_MASK_DST (neon, add_8888_8_8888,

+                                        uint32_t, 1, uint8_t, 1, uint32_t, 1)

 PIXMAN_ARM_BIND_FAST_PATH_SRC_MASK_DST (neon, add_8888_8888_8888,

                                         uint32_t, 1, uint32_t, 1, uint32_t, 1)

 PIXMAN_ARM_BIND_FAST_PATH_SRC_MASK_DST (neon, over_8888_8_8888,

@@ -235,6 +251,10 @@ static const pixman_fast_path_t arm_neon_fast_paths[] =
     PIXMAN_STD_FAST_PATH (SRC,  b8g8r8,   null,     x8r8g8b8, neon_composite_src_0888_8888_rev),

     PIXMAN_STD_FAST_PATH (SRC,  b8g8r8,   null,     r5g6b5,   neon_composite_src_0888_0565_rev),

     PIXMAN_STD_FAST_PATH (SRC,  pixbuf,   pixbuf,   a8r8g8b8, neon_composite_src_pixbuf_8888),

+    PIXMAN_STD_FAST_PATH (SRC,  pixbuf,   pixbuf,   a8b8g8r8, neon_composite_src_rpixbuf_8888),

+    PIXMAN_STD_FAST_PATH (SRC,  rpixbuf,  rpixbuf,  a8r8g8b8, neon_composite_src_rpixbuf_8888),

+    PIXMAN_STD_FAST_PATH (SRC,  rpixbuf,  rpixbuf,  a8b8g8r8, neon_composite_src_pixbuf_8888),

+    PIXMAN_STD_FAST_PATH (OVER, solid,    a8,       a8,       neon_composite_over_n_8_8),

     PIXMAN_STD_FAST_PATH (OVER, solid,    a8,       r5g6b5,   neon_composite_over_n_8_0565),

     PIXMAN_STD_FAST_PATH (OVER, solid,    a8,       b5g6r5,   neon_composite_over_n_8_0565),

     PIXMAN_STD_FAST_PATH (OVER, solid,    a8,       a8r8g8b8, neon_composite_over_n_8_8888),

@@ -250,6 +270,10 @@ static const pixman_fast_path_t arm_neon_fast_paths[] =
     PIXMAN_STD_FAST_PATH_CA (OVER, solid, a8b8g8r8, x8b8g8r8, neon_composite_over_n_8888_8888_ca),

     PIXMAN_STD_FAST_PATH (OVER, a8r8g8b8, solid,    a8r8g8b8, neon_composite_over_8888_n_8888),

     PIXMAN_STD_FAST_PATH (OVER, a8r8g8b8, solid,    x8r8g8b8, neon_composite_over_8888_n_8888),

+    PIXMAN_STD_FAST_PATH (OVER, a8r8g8b8, solid,    r5g6b5,   neon_composite_over_8888_n_0565),

+    PIXMAN_STD_FAST_PATH (OVER, a8b8g8r8, solid,    b5g6r5,   neon_composite_over_8888_n_0565),

+    PIXMAN_STD_FAST_PATH (OVER, r5g6b5,   solid,    r5g6b5,   neon_composite_over_0565_n_0565),

+    PIXMAN_STD_FAST_PATH (OVER, b5g6r5,   solid,    b5g6r5,   neon_composite_over_0565_n_0565),

     PIXMAN_STD_FAST_PATH (OVER, a8r8g8b8, a8,       a8r8g8b8, neon_composite_over_8888_8_8888),

     PIXMAN_STD_FAST_PATH (OVER, a8r8g8b8, a8,       x8r8g8b8, neon_composite_over_8888_8_8888),

     PIXMAN_STD_FAST_PATH (OVER, a8b8g8r8, a8,       a8b8g8r8, neon_composite_over_8888_8_8888),

@@ -268,13 +292,20 @@ static const pixman_fast_path_t arm_neon_fast_paths[] =
     PIXMAN_STD_FAST_PATH (OVER, x8r8g8b8, null,     a8r8g8b8, neon_composite_src_x888_8888),

     PIXMAN_STD_FAST_PATH (OVER, x8b8g8r8, null,     a8b8g8r8, neon_composite_src_x888_8888),

     PIXMAN_STD_FAST_PATH (ADD,  solid,    a8,       a8,       neon_composite_add_n_8_8),

+    PIXMAN_STD_FAST_PATH (ADD,  solid,    a8,       a8r8g8b8, neon_composite_add_n_8_8888),

+    PIXMAN_STD_FAST_PATH (ADD,  solid,    a8,       a8b8g8r8, neon_composite_add_n_8_8888),

     PIXMAN_STD_FAST_PATH (ADD,  a8,       a8,       a8,       neon_composite_add_8_8_8),

     PIXMAN_STD_FAST_PATH (ADD,  r5g6b5,   a8,       r5g6b5,   neon_composite_add_0565_8_0565),

     PIXMAN_STD_FAST_PATH (ADD,  b5g6r5,   a8,       b5g6r5,   neon_composite_add_0565_8_0565),

+    PIXMAN_STD_FAST_PATH (ADD,  a8r8g8b8, a8,       a8r8g8b8, neon_composite_add_8888_8_8888),

+    PIXMAN_STD_FAST_PATH (ADD,  a8b8g8r8, a8,       a8b8g8r8, neon_composite_add_8888_8_8888),

     PIXMAN_STD_FAST_PATH (ADD,  a8r8g8b8, a8r8g8b8, a8r8g8b8, neon_composite_add_8888_8888_8888),

+    PIXMAN_STD_FAST_PATH (ADD,  a8r8g8b8, solid,    a8r8g8b8, neon_composite_add_8888_n_8888),

+    PIXMAN_STD_FAST_PATH (ADD,  a8b8g8r8, solid,    a8b8g8r8, neon_composite_add_8888_n_8888),

     PIXMAN_STD_FAST_PATH (ADD,  a8,       null,     a8,       neon_composite_add_8_8),

     PIXMAN_STD_FAST_PATH (ADD,  a8r8g8b8, null,     a8r8g8b8, neon_composite_add_8888_8888),

     PIXMAN_STD_FAST_PATH (ADD,  a8b8g8r8, null,     a8b8g8r8, neon_composite_add_8888_8888),

+    PIXMAN_STD_FAST_PATH (IN,   solid,    null,     a8,       neon_composite_in_n_8),

     PIXMAN_STD_FAST_PATH (OVER_REVERSE, solid, null, a8r8g8b8, neon_composite_over_reverse_n_8888),

     PIXMAN_STD_FAST_PATH (OVER_REVERSE, solid, null, a8b8g8r8, neon_composite_over_reverse_n_8888),

     PIXMAN_STD_FAST_PATH (OUT_REVERSE,  a8,    null, r5g6b5,   neon_composite_out_reverse_8_0565),

diff --git a/pixman/pixman/pixman-arm-simd.c b/pixman/pixman/pixman-arm-simd.c
index 7f789ceab..e03dfe020 100644
--- a/pixman/pixman/pixman-arm-simd.c
+++ b/pixman/pixman/pixman-arm-simd.c
@@ -381,10 +381,10 @@ PIXMAN_ARM_BIND_FAST_PATH_SRC_DST (armv6, add_8_8,
 PIXMAN_ARM_BIND_FAST_PATH_SRC_DST (armv6, over_8888_8888,

                                    uint32_t, 1, uint32_t, 1)

 

-PIXMAN_ARM_BIND_FAST_PATH_SRC_N_DST (armv6, over_8888_n_8888,

+PIXMAN_ARM_BIND_FAST_PATH_SRC_N_DST (SKIP_ZERO_MASK, armv6, over_8888_n_8888,

                                      uint32_t, 1, uint32_t, 1)

 

-PIXMAN_ARM_BIND_FAST_PATH_N_MASK_DST (armv6, over_n_8_8888,

+PIXMAN_ARM_BIND_FAST_PATH_N_MASK_DST (SKIP_ZERO_SRC, armv6, over_n_8_8888,

                                       uint8_t, 1, uint32_t, 1)

 

 PIXMAN_ARM_BIND_SCALED_NEAREST_SRC_DST (armv6, 0565_0565, SRC,

diff --git a/pixman/pixman/pixman-general.c b/pixman/pixman/pixman-general.c
index 105125359..5a639051b 100644
--- a/pixman/pixman/pixman-general.c
+++ b/pixman/pixman/pixman-general.c
@@ -56,8 +56,8 @@ general_composite_rect  (pixman_implementation_t *imp,
                          int32_t                  width,

                          int32_t                  height)

 {

-    uint8_t stack_scanline_buffer[SCANLINE_BUFFER_LENGTH * 3];

-    uint8_t *scanline_buffer = stack_scanline_buffer;

+    uint64_t stack_scanline_buffer[(SCANLINE_BUFFER_LENGTH * 3 + 7) / 8];

+    uint8_t *scanline_buffer = (uint8_t *) stack_scanline_buffer;

     uint8_t *src_buffer, *mask_buffer, *dest_buffer;

     fetch_scanline_t fetch_src = NULL, fetch_mask = NULL, fetch_dest = NULL;

     pixman_combine_32_func_t compose;

@@ -255,7 +255,7 @@ general_composite_rect  (pixman_implementation_t *imp,
 	}

     }

 

-    if (scanline_buffer != stack_scanline_buffer)

+    if (scanline_buffer != (uint8_t *) stack_scanline_buffer)

 	free (scanline_buffer);

 }

 

diff --git a/xorg-server/COPYING b/xorg-server/COPYING
index 3fb06b8df..16b719376 100644
--- a/xorg-server/COPYING
+++ b/xorg-server/COPYING
@@ -1,1822 +1,1822 @@
-The following is the 'standard copyright' agreed upon by most contributors,
-and is currently the canonical license preferred by the X.Org Foundation.
-This is a slight variant of the common MIT license form published by the
-Open Source Initiative at http://www.opensource.org/licenses/mit-license.php
-
-Copyright holders of new code should use this license statement where
-possible, and insert their name to this list.  Please sort by surname
-for people, and by the full name for other entities (e.g.  Juliusz
-Chroboczek sorts before Intel Corporation sorts before Daniel Stone).
-
-Copyright © 2000-2001 Juliusz Chroboczek
-Copyright © 1998 Egbert Eich
-Copyright © 2006-2007 Intel Corporation
-Copyright © 2006 Nokia Corporation
-Copyright © 2006-2008 Peter Hutterer
-Copyright © 2006 Adam Jackson
-Copyright © 2009 NVIDIA Corporation
-Copyright © 1999 Keith Packard
-Copyright © 2007-2009 Red Hat, Inc.
-Copyright © 2005-2008 Daniel Stone
-Copyright © 2006-2009 Simon Thum
-Copyright © 1987, 2003-2006, 2008-2009 Sun Microsystems, Inc.
-Copyright © 2006 Luc Verhaegen
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice (including the next
-paragraph) shall be included in all copies or substantial portions of the
-Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
-
-
-
-
-The following licenses are 'legacy': usually MIT/X11 licenses with the name
-of the copyright holder(s) in the license statement, but also some BSD-like
-licenses.
-
-
-Copyright (C) 1994-2003 The XFree86 Project, Inc.  All Rights Reserved.
-Copyright (C) Colin Harrison 2005-2008
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-of the Software, and to permit persons to whom the Software is furnished to do
-so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT-
-NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of the XFree86 Project shall not
-be used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from the XFree86 Project.
-
-
-Copyright 1997 by The XFree86 Project, 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 the XFree86 Project, Inc.
-not be used in advertising or publicity pertaining to distribution of
-the software without specific, written prior permission.  The Xfree86
-Project, Inc. makes no representations about the suitability of this
-software for any purpose.  It is provided "as is" without express or
-implied warranty.
-
-THE XFREE86 PROJECT, INC. DISCLAIMS ALL WARRANTIES WITH REGARD
-TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS, IN NO EVENT SHALL OREST ZBOROWSKI OR DAVID WEXELBLAT BE LIABLE
-FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-
-Copyright 1985-1998, 2001  The Open Group
-Copyright 2002 Red Hat Inc., Durham, North Carolina.
-
-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.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-
-Copyright (c) 1987, 1989-1990, 1992-1995  X Consortium
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of the X Consortium shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from the X Consortium.
-
-
-Copyright © 1999-2000 SuSE, Inc.
-Copyright © 2007 Red Hat, Inc.
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation, and that the name of SuSE not be used in advertising or
-publicity pertaining to distribution of the software without specific,
-written prior permission.  SuSE makes no representations about the
-suitability of this software for any purpose.  It is provided "as is"
-without express or implied warranty.
-
-SuSE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL SuSE
-BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
-OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
-CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-
-Copyright 1987-1991, 1993 by Digital Equipment Corporation, Maynard, Massachusetts.
-Copyright 1991 Massachusetts Institute of Technology, Cambridge, Massachusetts.
-Copyright 1991, 1993 Olivetti Research Limited, Cambridge, England.
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-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 Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-
-Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts,
-Copyright 1994 Quarterdeck Office Systems.
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-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 names of Digital and
-Quarterdeck not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-DIGITAL AND QUARTERDECK DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
-SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS, IN NO EVENT SHALL DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT
-OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
-OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
-OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE
-OR PERFORMANCE OF THIS SOFTWARE.
-
-
-Copyright 1997 Digital Equipment Corporation.
-All rights reserved.
-
-This software is furnished under license and may be used and copied only in
-accordance with the following terms and conditions.  Subject to these
-conditions, you may download, copy, install, use, modify and distribute
-this software in source and/or binary form. No title or ownership is
-transferred hereby.
-
-1) Any source code used, modified or distributed must reproduce and retain
-   this copyright notice and list of conditions as they appear in the
-   source file.
-
-2) No right is granted to use any trade name, trademark, or logo of Digital
-   Equipment Corporation. Neither the "Digital Equipment Corporation"
-   name nor any trademark or logo of Digital Equipment Corporation may be
-   used to endorse or promote products derived from this software without
-   the prior written permission of Digital Equipment Corporation.
-
-3) This software is provided "AS-IS" and any express or implied warranties,
-   including but not limited to, any implied warranties of merchantability,
-   fitness for a particular purpose, or non-infringement are disclaimed.
-   In no event shall DIGITAL be liable for any damages whatsoever, and in
-   particular, DIGITAL shall not be liable for special, indirect,
-   consequential, or incidental damages or damages for lost profits, loss
-   of revenue or loss of use, whether such damages arise in contract,
-   negligence, tort, under statute, in equity, at law or otherwise, even
-   if advised of the possibility of such damage.
-
-
-Copyright (c) 1991, 1996-1997 Digital Equipment Corporation, Maynard, Massachusetts.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-DIGITAL EQUIPMENT CORPORATION BE LIABLE FOR ANY CLAIM, DAMAGES, INCLUDING,
-BUT NOT LIMITED TO CONSEQUENTIAL OR INCIDENTAL DAMAGES, OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
-IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of Digital Equipment Corporation
-shall not be used in advertising or otherwise to promote the sale, use or other
-dealings in this Software without prior written authorization from Digital
-Equipment Corporation.
-
-
-SGI FREE SOFTWARE LICENSE B (Version 2.0, Sept. 18, 2008)
-Copyright (C) 1991-2000 Silicon Graphics, Inc. All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice including the dates of first publication and
-either this permission notice or a reference to
-http://oss.sgi.com/projects/FreeB/
-shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-SILICON GRAPHICS, INC. BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
-OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-
-Copyright (c) 1994, 1995  Hewlett-Packard Company
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL HEWLETT-PACKARD COMPANY BE LIABLE FOR ANY CLAIM,
-DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
-THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of the Hewlett-Packard
-Company shall not be used in advertising or otherwise to promote the
-sale, use or other dealings in this Software without prior written
-authorization from the Hewlett-Packard Company.
-
-
-Copyright 1989 by Hewlett-Packard Company, Palo Alto, California.
-All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-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 Hewlett-Packard not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
-
-HEWLETT-PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-HEWLETT-PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-
-Copyright 2001-2004 Red Hat Inc., Durham, North Carolina.
-Copyright (c) 2003 by the XFree86 Project, Inc.
-Copyright 2004-2005 Red Hat Inc., Raleigh, North Carolina.
-All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation on the rights to use, copy, modify, merge,
-publish, distribute, sublicense, and/or sell copies of the Software,
-and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice (including the
-next paragraph) shall be included in all copies or substantial
-portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
-BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-
-Copyright © 2008 Red Hat, Inc.
-Partly based on code Copyright © 2000 SuSE, Inc.
-
-Permission to use, copy, modify, distribute, and sell this software
-and its documentation for any purpose is hereby granted without
-fee, provided that the above copyright notice appear in all copies
-and that both that copyright notice and this permission notice
-appear in supporting documentation, and that the name of Red Hat
-not be used in advertising or publicity pertaining to distribution
-of the software without specific, written prior permission.  Red
-Hat makes no representations about the suitability of this software
-for any purpose.  It is provided "as is" without express or implied
-warranty.
-
-Red Hat DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
-NO EVENT SHALL Red Hat BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
-OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
-CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-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 SuSE not be used in advertising or
-publicity pertaining to distribution of the software without specific,
-written prior permission.  SuSE makes no representations about the
-suitability of this software for any purpose.  It is provided "as is"
-without express or implied warranty.
-
-SuSE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL SuSE
-BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
-OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
-CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-
-Copyright © 2006  Red Hat, Inc.
-(C) Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
-All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sub license,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice (including the next
-paragraph) shall be included in all copies or substantial portions of the
-Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.  IN NO EVENT SHALL
-RED HAT, INC, OR PRECISION INSIGHT AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT
-OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
-THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-
-Copyright (c) 1995  X Consortium
-Copyright 2004 Red Hat Inc., Durham, North Carolina.
-All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation on the rights to use, copy, modify, merge,
-publish, distribute, sublicense, and/or sell copies of the Software,
-and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT, THE X CONSORTIUM,
-AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of the X Consortium
-shall not be used in advertising or otherwise to promote the sale,
-use or other dealings in this Software without prior written
-authorization from the X Consortium.
-
-
-Copyright 1998-2000 Precision Insight, Inc., Cedar Park, Texas.
-Copyright 2000 VA Linux Systems, Inc.
-Copyright (c) 2002, 2008, 2009 Apple Computer, Inc.
-Copyright (c) 2003-2004 Torrey T. Lyons.
-All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sub license, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice (including the
-next paragraph) shall be included in all copies or substantial portions
-of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
-IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
-ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-
-(C) Copyright IBM Corporation 2003
-All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-on the rights to use, copy, modify, merge, publish, distribute, sub
-license, and/or sell copies of the Software, and to permit persons to whom
-the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice (including the next
-paragraph) shall be included in all copies or substantial portions of the
-Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.  IN NO EVENT SHALL
-VA LINUX SYSTEM, IBM AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM,
-DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
-USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-
-(C) Copyright IBM Corporation 2004-2005
-All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sub license,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice (including the next
-paragraph) shall be included in all copies or substantial portions of the
-Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.  IN NO EVENT SHALL
-IBM,
-AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
-OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-
-Copyright (c) 1997  Metro Link Incorporated
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
-OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-Except as contained in this notice, the name of the Metro Link shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from Metro Link.
-
-
-Copyright 1995-1998 by Metro Link, Inc.
-Copyright (c) 1997 Matthieu Herrb
-
-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 Metro Link, Inc. not be used in
-advertising or publicity pertaining to distribution of the software without
-specific, written prior permission.  Metro Link, Inc. makes no
-representations about the suitability of this software for any purpose.
- It is provided "as is" without express or implied warranty.
-
-METRO LINK, INC. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-EVENT SHALL METRO LINK, 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.
-
-
-Copyright 1998 by Metro Link Incorporated
-
-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 Metro Link
-Incorporated not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.  Metro Link Incorporated makes no representations
-about the suitability of this software for any purpose.  It is
-provided "as is" without express or implied warranty.
-
-METRO LINK INCORPORATED DISCLAIMS ALL WARRANTIES WITH REGARD
-TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS, IN NO EVENT SHALL METRO LINK INCORPORATED BE
-LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY
-DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-
-Copyright (c) 2000 by Conectiva S.A. (http://www.conectiva.com)
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-CONECTIVA LINUX BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
-OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-Except as contained in this notice, the name of Conectiva Linux shall
-not be used in advertising or otherwise to promote the sale, use or other
-dealings in this Software without prior written authorization from
-Conectiva Linux.
-
-
-Copyright (c) 2001, Andy Ritger  aritger@nvidia.com
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-o Redistributions of source code must retain the above copyright
-  notice, this list of conditions and the following disclaimer.
-o Redistributions in binary form must reproduce the above copyright
-  notice, this list of conditions and the following disclaimer
-  in the documentation and/or other materials provided with the
-  distribution.
-o Neither the name of NVIDIA nor the names of its contributors
-  may be used to endorse or promote products derived from this
-  software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT
-NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
-THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
-
-
-Copyright 1992 Vrije Universiteit, The Netherlands
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted, 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 the Vrije Universiteit not be used in
-advertising or publicity pertaining to distribution of the software without
-specific, written prior permission.  The Vrije Universiteit makes no
-representations about the suitability of this software for any purpose.
-It is provided "as is" without express or implied warranty.
-
-The Vrije Universiteit DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-EVENT SHALL The Vrije Universiteit BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-
-
-Copyright 1998 by Concurrent Computer Corporation
-
-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 Concurrent Computer
-Corporation not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.  Concurrent Computer Corporation makes no representations
-about the suitability of this software for any purpose.  It is
-provided "as is" without express or implied warranty.
-
-CONCURRENT COMPUTER CORPORATION DISCLAIMS ALL WARRANTIES WITH REGARD
-TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS, IN NO EVENT SHALL CONCURRENT COMPUTER CORPORATION BE
-LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY
-DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-
-Copyright © 2004 Nokia
-
-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 Nokia not be used in
-advertising or publicity pertaining to distribution of the software without
-specific, written prior permission. Nokia makes no
-representations about the suitability of this software for any purpose.  It
-is provided "as is" without express or implied warranty.
-
-NOKIA DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-EVENT SHALL NOKIA 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.
-
-
-(c)Copyright 1988,1991 Adobe Systems Incorporated.
-All rights reserved.
-
-Permission to use, copy, modify, distribute, and sublicense this software and its
-documentation for any purpose and without fee is hereby granted, provided that
-the above copyright notices appear in all copies and that both those copyright
-notices and this permission notice appear in supporting documentation and that
-the name of Adobe Systems Incorporated not be used in advertising or publicity
-pertaining to distribution of the software without specific, written prior
-permission.  No trademark license to use the Adobe trademarks is hereby
-granted.  If the Adobe trademark "Display PostScript"(tm) is used to describe
-this software, its functionality or for any other purpose, such use shall be
-limited to a statement that this software works in conjunction with the Display
-PostScript system.  Proper trademark attribution to reflect Adobe's ownership
-of the trademark shall be given whenever any such reference to the Display
-PostScript system is made.
-
-ADOBE MAKES NO REPRESENTATIONS ABOUT THE SUITABILITY OF THE SOFTWARE FOR ANY
-PURPOSE.  IT IS PROVIDED "AS IS" WITHOUT EXPRESS OR IMPLIED WARRANTY.  ADOBE
-DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED
-WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-
-INFRINGEMENT OF THIRD PARTY RIGHTS.  IN NO EVENT SHALL ADOBE BE LIABLE TO YOU
-OR ANY OTHER PARTY FOR ANY SPECIAL, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY
-DAMAGES WHATSOEVER WHETHER IN AN ACTION OF CONTRACT,NEGLIGENCE, STRICT
-LIABILITY OR ANY OTHER ACTION ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.  ADOBE WILL NOT PROVIDE ANY TRAINING OR OTHER
-SUPPORT FOR THE SOFTWARE.
-
-Adobe, PostScript, and Display PostScript are trademarks of Adobe Systems
-Incorporated which may be registered in certain jurisdictions.
-
-
-Copyright 1989 Network Computing Devices, Inc., Mountain View, California.
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted, 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 N.C.D. not be used in advertising or
-publicity pertaining to distribution of the software without specific,
-written prior permission.  N.C.D. makes no representations about the
-suitability of this software for any purpose.  It is provided "as is"
-without express or implied warranty.
-
-
-Copyright (c) 1987 by the Regents of the University of California
-
-Permission to use, copy, modify, and distribute this
-software and its documentation for any purpose and without
-fee is hereby granted, provided that the above copyright
-notice appear in all copies.  The University of California
-makes no representations about the suitability of this
-software for any purpose.  It is provided "as is" without
-express or implied warranty.
-
-
-Copyright 1992, 1993 Data General Corporation;
-Copyright 1992, 1993 OMRON Corporation
-
-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
-neither the name OMRON or DATA GENERAL be used in advertising or publicity
-pertaining to distribution of the software without specific, written prior
-permission of the party whose name is to be used.  Neither OMRON or
-DATA GENERAL make any representation about the suitability of this software
-for any purpose.  It is provided "as is" without express or implied warranty.
-
-OMRON AND DATA GENERAL EACH DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
-SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS,
-IN NO EVENT SHALL OMRON OR DATA GENERAL BE LIABLE FOR ANY SPECIAL, INDIRECT
-OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
-OF THIS SOFTWARE.
-
-
-Copyright © 1998-2004, 2006 Keith Packard
-Copyright © 2000-2002 Keith Packard, member of The XFree86 Project, Inc.
-Copyright (c) 2002 Apple Computer, Inc.
-Copyright (c) 2003 Torrey T. Lyons.
-All Rights Reserved.
-
-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 Keith Packard not be used in
-advertising or publicity pertaining to distribution of the software without
-specific, written prior permission.  Keith Packard makes no
-representations about the suitability of this software for any purpose.  It
-is provided "as is" without express or implied warranty.
-
-KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-
-
-Copyright © 1999 Keith Packard
-Copyright © 2000 Compaq Computer Corporation
-Copyright © 2002 MontaVista Software Inc.
-Copyright © 2005 OpenedHand Ltd.
-Copyright © 2006 Nokia Corporation
-
-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 the authors and/or copyright holders
-not be used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  The authors and/or
-copyright holders make no representations about the suitability of this
-software for any purpose.  It is provided "as is" without express or
-implied warranty.
-
-THE AUTHORS AND/OR COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD
-TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS, IN NO EVENT SHALL THE AUTHORS AND/OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-
-Copyright 1993 by Davor Matic
-
-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.  Davor Matic makes no representations about
-the suitability of this software for any purpose.  It is provided "as
-is" without express or implied warranty.
-
-
-Copyright (C) 2001-2004 Harold L Hunt II All Rights Reserved.
-Copyright (C) Colin Harrison 2005-2008
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL HAROLD L HUNT II BE LIABLE FOR
-ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
-CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of Harold L Hunt II
-shall not be used in advertising or otherwise to promote the sale, use
-or other dealings in this Software without prior written authorization
-from Harold L Hunt II.
-
-
-Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
-
-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 Thomas Roell not be used in
-advertising or publicity pertaining to distribution of the software without
-specific, written prior permission.  Thomas Roell makes no representations
-about the suitability of this software for any purpose.  It is provided
-"as is" without express or implied warranty.
-
-THOMAS ROELL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-EVENT SHALL THOMAS ROELL BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-
-
-Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany
-Copyright 1993 by David Wexelblat <dwex@goblin.org>
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation, and that the names of Thomas Roell and David Wexelblat
-not be used in advertising or publicity pertaining to distribution of
-the software without specific, written prior permission.  Thomas Roell and
-David Wexelblat makes no representations about the suitability of this
-software for any purpose.  It is provided "as is" without express or
-implied warranty.
-
-THOMAS ROELL AND DAVID WEXELBLAT DISCLAIMS ALL WARRANTIES WITH REGARD TO
-THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS, IN NO EVENT SHALL THOMAS ROELL OR DAVID WEXELBLAT BE LIABLE FOR
-ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
-RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
-CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
-CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-
-Copyright 1990,91,92,93 by Thomas Roell, Germany.
-Copyright 1991,92,93    by SGCS (Snitily Graphics Consulting Services), USA.
-
-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 Thomas Roell nor
-SGCS be used in advertising or publicity pertaining to distribution
-of the software without specific, written prior permission.
-Thomas Roell nor SGCS makes no representations about the suitability
-of this software for any purpose. It is provided "as is" without
-express or implied warranty.
-
-THOMAS ROELL AND SGCS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
-SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS, IN NO EVENT SHALL THOMAS ROELL OR SGCS BE LIABLE FOR ANY
-SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
-RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
-CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
-CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-
-Copyright 1998 by Alan Hourihane, Wigan, England.
-Copyright 2000-2002 by Alan Hourihane, Flint Mountain, North Wales.
-
-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 Alan Hourihane not be used in
-advertising or publicity pertaining to distribution of the software without
-specific, written prior permission.  Alan Hourihane makes no representations
-about the suitability of this software for any purpose.  It is provided
-"as is" without express or implied warranty.
-
-ALAN HOURIHANE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-EVENT SHALL ALAN HOURIHANE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-
-
-Copyright 1995  Kaleb S. KEITHLEY
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL Kaleb S. KEITHLEY BE LIABLE FOR ANY CLAIM, DAMAGES
-OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of Kaleb S. KEITHLEY
-shall not be used in advertising or otherwise to promote the sale, use
-or other dealings in this Software without prior written authorization
-from Kaleb S. KEITHLEY
-
-
-Copyright (c) 1997 Matthieu Herrb
-
-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 Matthieu Herrb not be used in
-advertising or publicity pertaining to distribution of the software without
-specific, written prior permission.  Matthieu Herrb makes no
-representations about the suitability of this software for any purpose.
- It is provided "as is" without express or implied warranty.
-
-MATTHIEU HERRB DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-EVENT SHALL MATTHIEU HERRB BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-
-
-Copyright 2004, Egbert Eich
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to
-deal in the Software without restriction, including without limitation the
-rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-sell copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-EGBERT EICH BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CON-
-NECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of Egbert Eich shall not
-be used in advertising or otherwise to promote the sale, use or other deal-
-ings in this Software without prior written authorization from Egbert Eich.
-
-
-Copyright 1993 by David Wexelblat <dwex@goblin.org>
-Copyright 2005 by Kean Johnston <jkj@sco.com>
-Copyright 1993 by David McCullough <davidm@stallion.oz.au>
-
-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 Wexelblat not be used in
-advertising or publicity pertaining to distribution of the software without
-specific, written prior permission.  David Wexelblat makes no representations
-about the suitability of this software for any purpose.  It is provided
-"as is" without express or implied warranty.
-
-DAVID WEXELBLAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-EVENT SHALL DAVID WEXELBLAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-
-
-Copyright 1992 by Orest Zborowski <obz@Kodak.com>
-Copyright 1993 by David Wexelblat <dwex@goblin.org>
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation, and that the names of Orest Zborowski and David Wexelblat
-not be used in advertising or publicity pertaining to distribution of
-the software without specific, written prior permission.  Orest Zborowski
-and David Wexelblat make no representations about the suitability of this
-software for any purpose.  It is provided "as is" without express or
-implied warranty.
-
-OREST ZBOROWSKI AND DAVID WEXELBLAT DISCLAIMS ALL WARRANTIES WITH REGARD
-TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS, IN NO EVENT SHALL OREST ZBOROWSKI OR DAVID WEXELBLAT BE LIABLE
-FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-
-Copyright 1992 by Orest Zborowski <obz@Kodak.com>
-Copyright 1993 by David Dawes <dawes@xfree86.org>
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation, and that the names of Orest Zborowski and David Dawes
-not be used in advertising or publicity pertaining to distribution of
-the software without specific, written prior permission.  Orest Zborowski
-and David Dawes make no representations about the suitability of this
-software for any purpose.  It is provided "as is" without express or
-implied warranty.
-
-OREST ZBOROWSKI AND DAVID DAWES DISCLAIMS ALL WARRANTIES WITH REGARD
-TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS, IN NO EVENT SHALL OREST ZBOROWSKI OR DAVID DAWES BE LIABLE
-FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-
-Copyright 1995-1999 by Frederic Lepied, France. <fred@sugix.frmug.fr.net>
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is  hereby granted without fee, provided that
-the  above copyright   notice appear  in   all  copies and  that both  that
-copyright  notice   and   this  permission   notice  appear  in  supporting
-documentation, and that   the  name of  Frederic   Lepied not  be  used  in
-advertising or publicity pertaining to distribution of the software without
-specific,  written      prior  permission.     Frederic  Lepied   makes  no
-representations about the suitability of this software for any purpose.  It
-is provided "as is" without express or implied warranty.
-
-FREDERIC  LEPIED DISCLAIMS ALL   WARRANTIES WITH REGARD  TO  THIS SOFTWARE,
-INCLUDING ALL IMPLIED   WARRANTIES OF MERCHANTABILITY  AND   FITNESS, IN NO
-EVENT  SHALL FREDERIC  LEPIED BE   LIABLE   FOR ANY  SPECIAL, INDIRECT   OR
-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-DATA  OR PROFITS, WHETHER  IN  AN ACTION OF  CONTRACT,  NEGLIGENCE OR OTHER
-TORTIOUS  ACTION, ARISING    OUT OF OR   IN  CONNECTION  WITH THE USE    OR
-PERFORMANCE OF THIS SOFTWARE.
-
-
-Copyright 1992 by Rich Murphey <Rich@Rice.edu>
-Copyright 1993 by David Wexelblat <dwex@goblin.org>
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation, and that the names of Rich Murphey and David Wexelblat
-not be used in advertising or publicity pertaining to distribution of
-the software without specific, written prior permission.  Rich Murphey and
-David Wexelblat make no representations about the suitability of this
-software for any purpose.  It is provided "as is" without express or
-implied warranty.
-
-RICH MURPHEY AND DAVID WEXELBLAT DISCLAIM ALL WARRANTIES WITH REGARD TO
-THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS, IN NO EVENT SHALL RICH MURPHEY OR DAVID WEXELBLAT BE LIABLE FOR
-ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
-RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
-CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
-CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-
-Copyright 1992 by Rich Murphey <Rich@Rice.edu>
-Copyright 1993 by David Dawes <dawes@xfree86.org>
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation, and that the names of Rich Murphey and David Dawes
-not be used in advertising or publicity pertaining to distribution of
-the software without specific, written prior permission.  Rich Murphey and
-David Dawes make no representations about the suitability of this
-software for any purpose.  It is provided "as is" without express or
-implied warranty.
-
-RICH MURPHEY AND DAVID DAWES DISCLAIM ALL WARRANTIES WITH REGARD TO
-THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS, IN NO EVENT SHALL RICH MURPHEY OR DAVID DAWES BE LIABLE FOR
-ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
-RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
-CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
-CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-
-Copyright © 2003-2004 Anders Carlsson
-
-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 Anders Carlsson not be used in
-advertising or publicity pertaining to distribution of the software without
-specific, written prior permission.  Anders Carlsson makes no
-representations about the suitability of this software for any purpose.  It
-is provided "as is" without express or implied warranty.
-
-ANDERS CARLSSON DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-EVENT SHALL ANDERS CARLSSON BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-
-
-Copyright (C) 2003 Anders Carlsson
-Copyright © 2003-2004 Eric Anholt
-Copyright © 2004 Keith Packard
-
-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 Eric Anholt not be used in
-advertising or publicity pertaining to distribution of the software without
-specific, written prior permission.  Eric Anholt makes no
-representations about the suitability of this software for any purpose.  It
-is provided "as is" without express or implied warranty.
-
-ERIC ANHOLT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-EVENT SHALL ERIC ANHOLT BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-
-
-Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
-
-Permission to use, copy, modify, and distribute this software for any
-purpose with or without fee is hereby granted, provided that the above
-copyright notice and this permission notice appear in all copies.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND TODD C. MILLER DISCLAIMS ALL
-WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
-OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL TODD C. MILLER BE LIABLE
-FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
-OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
-CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-
-Copyright © 2003-2004 Philip Blundell
-
-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 Philip Blundell not be used in
-advertising or publicity pertaining to distribution of the software without
-specific, written prior permission.  Philip Blundell makes no
-representations about the suitability of this software for any purpose.  It
-is provided "as is" without express or implied warranty.
-
-PHILIP BLUNDELL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-EVENT SHALL PHILIP BLUNDELL BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-
-
-
-Copyright (c) 1994-2003 by The XFree86 Project, Inc.
-Copyright 1997 by Metro Link, Inc.
-Copyright 2003 by David H. Dawes.
-Copyright 2003 by X-Oz Technologies.
-Copyright (c) 2004, X.Org Foundation
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of the copyright holder(s)
-and author(s) shall not be used in advertising or otherwise to promote
-the sale, use or other dealings in this Software without prior written
-authorization from the copyright holder(s) and author(s).
-
-
-Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany
-Copyright 1993 by David Wexelblat <dwex@goblin.org>
-Copyright 1999 by David Holland <davidh@iquest.net>
-Copyright © 2000 Compaq Computer Corporation
-Copyright © 2002 Hewlett-Packard Company
-Copyright © 2004, 2005 Red Hat, Inc.
-Copyright © 2004 Nicholas Miell
-Copyright © 2005 Trolltech AS
-Copyright © 2006 Intel Corporation
-Copyright © 2006-2007 Keith Packard
-Copyright © 2008 Red Hat, Inc
-Copyright © 2008 George Sapountzis <gsap7@yahoo.gr>
-
-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 the copyright holders not be used in advertising or
-publicity pertaining to distribution of the software without specific,
-written prior permission.  The copyright holders make no representations
-about the suitability of this software for any purpose.  It is provided "as
-is" without express or implied warranty.
-
-THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
-SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
-SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
-AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
-OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-
-Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc.
-            2005 Lars Knoll & Zack Rusin, Trolltech
-
-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 Keith Packard not be used in
-advertising or publicity pertaining to distribution of the software without
-specific, written prior permission.  Keith Packard makes no
-representations about the suitability of this software for any purpose.  It
-is provided "as is" without express or implied warranty.
-
-THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
-SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
-SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
-AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
-OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-
-Copyright 1987, 1998  The Open Group
-Copyright © 1998-1999, 2001 The XFree86 Project, Inc.
-Copyright © 2000 VA Linux Systems, Inc.
-Copyright (c) 2000, 2001 Nokia Home Communications
-Copyright © 2007, 2008 Red Hat, Inc.
-All rights reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, and/or sell copies of the Software, and to permit persons
-to whom the Software is furnished to do so, provided that the above
-copyright notice(s) and this permission notice appear in all copies of
-the Software and that both the above copyright notice(s) and this
-permission notice appear in supporting documentation.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR 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.
-
-Except as contained in this notice, the name of a copyright holder
-shall not be used in advertising or otherwise to promote the sale, use
-or other dealings in this Software without prior written authorization
-of the copyright holder.
-
-
-Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-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 the above listed
-copyright holder(s) not be used in advertising or publicity pertaining
-to distribution of the software without specific, written prior
-permission.
-
-THE ABOVE LISTED COPYRIGHT HOLDER(S) DISCLAIM ALL WARRANTIES WITH REGARD
-TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS, IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE
-LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-
-Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
-Copyright (c) 2001 Andreas Monitzer.
-Copyright (c) 2001-2004 Greg Parker.
-Copyright (c) 2001-2004 Torrey T. Lyons
-Copyright (c) 2002-2003 Apple Computer, Inc.
-Copyright (c) 2004-2005 Alexander Gottwald
-Copyright (c) 2002-2009 Apple Inc.
-Copyright (c) 2007 Jeremy Huddleston
-All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name(s) of the above copyright
-holders shall not be used in advertising or otherwise to promote the sale,
-use or other dealings in this Software without prior written authorization.
-
-
-Copyright (C) 1999,2000 by Eric Sunshine <sunshine@sunshineco.com>
-Copyright (C) 2001-2005 by Thomas Winischhofer, Vienna, Austria.
-
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-  1. Redistributions of source code must retain the above copyright
-     notice, this list of conditions and the following disclaimer.
-  2. Redistributions in binary form must reproduce the above copyright
-     notice, this list of conditions and the following disclaimer in the
-     documentation and/or other materials provided with the distribution.
-  3. The name of the author may not be used to endorse or promote products
-     derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN
-NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
-TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-Copyright (C) 2005 Bogdan D. bogdand@users.sourceforge.net
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-of the Software, and to permit persons to whom the Software is furnished to do
-so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of the author shall not be used in
-advertising or otherwise to promote the sale, use or other dealings in this
-Software without prior written authorization from the author.
-
-
-Copyright © 2002 David Dawes
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-THE AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
-OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-Except as contained in this notice, the name of the author(s) shall
-not be used in advertising or otherwise to promote the sale, use or other
-dealings in this Software without prior written authorization from
-the author(s).
-
-
-Copyright (C) 1996-1999 SciTech Software, Inc.
-Copyright (C) David Mosberger-Tang
-Copyright (C) 1999 Egbert Eich
-Copyright (C) 2008 Bart Trojanowski, Symbio Technologies, LLC
-
-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 the authors not be used
-in advertising or publicity pertaining to distribution of the software
-without specific, written prior permission.  The authors makes no
-representations about the suitability of this software for any purpose.
-It is provided "as is" without express or implied warranty.
-
-THE AUTHORS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-EVENT SHALL THE AUTHORS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
-USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-
-
-Copyright 2005-2006 Luc Verhaegen.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-
-Copyright 1995 by Robin Cutshaw <robin@XFree86.Org>
-Copyright 2000 by Egbert Eich
-Copyright 2002 by David Dawes
-
-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 names of the above listed copyright holder(s)
-not be used in advertising or publicity pertaining to distribution of
-the software without specific, written prior permission.  The above listed
-copyright holder(s) make(s) no representations about the suitability of this
-software for any purpose.  It is provided "as is" without express or
-implied warranty.
-
-THE ABOVE LISTED COPYRIGHT HOLDER(S) DISCLAIM(S) ALL WARRANTIES WITH REGARD
-TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS, IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE
-LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY
-DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER
-IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
-OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-
-Copyright 1997-2004 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that copyright
-notice and this permission notice appear in supporting documentation, and
-that the name of Marc Aurele La France not be used in advertising or
-publicity pertaining to distribution of the software without specific,
-written prior permission.  Marc Aurele La France makes no representations
-about the suitability of this software for any purpose.  It is provided
-"as-is" without express or implied warranty.
-
-MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.  IN NO
-EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
-OF THIS SOFTWARE.
-
-
-Copyright 1990, 1991 by Thomas Roell, Dinkelscherben, Germany
-Copyright 1992 by David Dawes <dawes@XFree86.org>
-Copyright 1992 by Jim Tsillas <jtsilla@damon.ccs.northeastern.edu>
-Copyright 1992 by Rich Murphey <Rich@Rice.edu>
-Copyright 1992 by Robert Baron <Robert.Baron@ernst.mach.cs.cmu.edu>
-Copyright 1992 by Orest Zborowski <obz@eskimo.com>
-Copyright 1993 by Vrije Universiteit, The Netherlands
-Copyright 1993 by David Wexelblat <dwex@XFree86.org>
-Copyright 1994, 1996 by Holger Veit <Holger.Veit@gmd.de>
-Copyright 1997 by Takis Psarogiannakopoulos <takis@dpmms.cam.ac.uk>
-Copyright 1994-2003 by The XFree86 Project, 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 names of the above listed copyright holders
-not be used in advertising or publicity pertaining to distribution of
-the software without specific, written prior permission.  The above listed
-copyright holders make no representations about the suitability of this
-software for any purpose.  It is provided "as is" without express or
-implied warranty.
-
-THE ABOVE LISTED COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD
-TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS, IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDERS BE
-LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY
-DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER
-IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
-OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-
-Copyright 2001-2005 by J. Kean Johnston <jkj@sco.com>
-
-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 J. Kean Johnston not be used in
-advertising or publicity pertaining to distribution of the software without
-specific, written prior permission.  J. Kean Johnston makes no
-representations about the suitability of this software for any purpose.
-It is provided "as is" without express or implied warranty.
-
-J. KEAN JOHNSTON DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-EVENT SHALL J. KEAN JOHNSTON BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
-USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-
-
-Copyright (C) 2000 Jakub Jelinek (jakub@redhat.com)
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-JAKUB JELINEK BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-
-Copyright 1997,1998 by UCHIYAMA Yasushi
-
-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 UCHIYAMA Yasushi not be used in
-advertising or publicity pertaining to distribution of the software without
-specific, written prior permission.  UCHIYAMA Yasushi makes no representations
-about the suitability of this software for any purpose.  It is provided
-"as is" without express or implied warranty.
-
-UCHIYAMA YASUSHI DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-EVENT SHALL UCHIYAMA YASUSHI BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-
-
-Copyright (C) 2000 Keith Packard
-              2004 Eric Anholt
-              2005 Zack Rusin
-
-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 copyright holders not be used in
-advertising or publicity pertaining to distribution of the software without
-specific, written prior permission. Copyright holders make no
-representations about the suitability of this software for any purpose.  It
-is provided "as is" without express or implied warranty.
-
-THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
-SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS 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.
-
-
-(C) Copyright IBM Corporation 2002-2007
-All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-on the rights to use, copy, modify, merge, publish, distribute, sub
-license, and/or sell copies of the Software, and to permit persons to whom
-the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice (including the next
-paragraph) shall be included in all copies or substantial portions of the
-Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.  IN NO EVENT SHALL
-THE COPYRIGHT HOLDERS AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM,
-DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
-USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-this permission notice appear in supporting documentation.  This permission
-notice shall be included in all copies or substantial portions of the
-Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-AUTHOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-
-Copyright © 2007 OpenedHand Ltd
-
-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 OpenedHand Ltd not be used in
-advertising or publicity pertaining to distribution of the software without
-specific, written prior permission. OpenedHand Ltd makes no
-representations about the suitability of this software for any purpose.  It
-is provided "as is" without express or implied warranty.
-
-OpenedHand Ltd DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-EVENT SHALL OpenedHand Ltd BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-
-
-Copyright (c) 1989, 1990, 1993, 1994
-     The Regents of the University of California.  All rights reserved.
-
-This code is derived from software contributed to Berkeley by
-Chris Torek.
-
-This code is derived from software contributed to Berkeley by
-Michael Rendell of Memorial University of Newfoundland.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
- 1. Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
- 2. Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
- 4. Neither the name of the University nor the names of its contributors
-    may be used to endorse or promote products derived from this software
-    without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGE.
+The following is the 'standard copyright' agreed upon by most contributors,

+and is currently the canonical license preferred by the X.Org Foundation.

+This is a slight variant of the common MIT license form published by the

+Open Source Initiative at http://www.opensource.org/licenses/mit-license.php

+

+Copyright holders of new code should use this license statement where

+possible, and insert their name to this list.  Please sort by surname

+for people, and by the full name for other entities (e.g.  Juliusz

+Chroboczek sorts before Intel Corporation sorts before Daniel Stone).

+

+Copyright © 2000-2001 Juliusz Chroboczek

+Copyright © 1998 Egbert Eich

+Copyright © 2006-2007 Intel Corporation

+Copyright © 2006 Nokia Corporation

+Copyright © 2006-2008 Peter Hutterer

+Copyright © 2006 Adam Jackson

+Copyright © 2009-2010 NVIDIA Corporation

+Copyright © 1999 Keith Packard

+Copyright © 2007-2009 Red Hat, Inc.

+Copyright © 2005-2008 Daniel Stone

+Copyright © 2006-2009 Simon Thum

+Copyright © 1987, 2003-2006, 2008-2009 Sun Microsystems, Inc.

+Copyright © 2006 Luc Verhaegen

+

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

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

+to deal in the Software without restriction, including without limitation

+the rights to use, copy, modify, merge, publish, distribute, sublicense,

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

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

+

+The above copyright notice and this permission notice (including the next

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

+Software.

+

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

+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

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

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

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

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

+DEALINGS IN THE SOFTWARE.

+

+

+

+

+The following licenses are 'legacy': usually MIT/X11 licenses with the name

+of the copyright holder(s) in the license statement, but also some BSD-like

+licenses.

+

+

+Copyright (C) 1994-2003 The XFree86 Project, Inc.  All Rights Reserved.

+Copyright (C) Colin Harrison 2005-2008

+

+Permission is hereby granted, free of charge, to any person obtaining a copy of

+this software and associated documentation files (the "Software"), to deal in

+the Software without restriction, including without limitation the rights to

+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies

+of the Software, and to permit persons to whom the Software is furnished to do

+so, subject to the following conditions:

+

+The above copyright notice and this permission notice shall be included in all

+copies or substantial portions of the Software.

+

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

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

+NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE

+XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN

+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION

+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

+

+Except as contained in this notice, the name of the XFree86 Project shall not

+be used in advertising or otherwise to promote the sale, use or other dealings

+in this Software without prior written authorization from the XFree86 Project.

+

+

+Copyright 1997 by The XFree86 Project, 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 the XFree86 Project, Inc.

+not be used in advertising or publicity pertaining to distribution of

+the software without specific, written prior permission.  The Xfree86

+Project, Inc. makes no representations about the suitability of this

+software for any purpose.  It is provided "as is" without express or

+implied warranty.

+

+THE XFREE86 PROJECT, INC. DISCLAIMS ALL WARRANTIES WITH REGARD

+TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND

+FITNESS, IN NO EVENT SHALL OREST ZBOROWSKI OR DAVID WEXELBLAT BE LIABLE

+FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES

+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN

+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF

+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

+

+

+Copyright 1985-1998, 2001  The Open Group

+Copyright 2002 Red Hat Inc., Durham, North Carolina.

+

+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.

+

+The above copyright notice and this permission notice shall be included in

+all copies or substantial portions of the Software.

+

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

+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE

+OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN

+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN

+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

+

+Except as contained in this notice, the name of The Open Group shall not be

+used in advertising or otherwise to promote the sale, use or other dealings

+in this Software without prior written authorization from The Open Group.

+

+

+Copyright (c) 1987, 1989-1990, 1992-1995  X Consortium

+

+Permission is hereby granted, free of charge, to any person obtaining a copy

+of this software and associated documentation files (the "Software"), to deal

+in the Software without restriction, including without limitation the rights

+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

+copies of the Software, and to permit persons to whom the Software is

+furnished to do so, subject to the following conditions:

+

+The above copyright notice and this permission notice shall be included in

+all copies or substantial portions of the Software.

+

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

+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE

+X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN

+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN

+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

+

+Except as contained in this notice, the name of the X Consortium shall not be

+used in advertising or otherwise to promote the sale, use or other dealings

+in this Software without prior written authorization from the X Consortium.

+

+

+Copyright © 1999-2000 SuSE, Inc.

+Copyright © 2007 Red Hat, Inc.

+

+Permission to use, copy, modify, distribute, and sell this software and its

+documentation for any purpose is hereby granted without fee, provided that

+the above copyright notice appear in all copies and that both that

+copyright notice and this permission notice appear in supporting

+documentation, and that the name of SuSE not be used in advertising or

+publicity pertaining to distribution of the software without specific,

+written prior permission.  SuSE makes no representations about the

+suitability of this software for any purpose.  It is provided "as is"

+without express or implied warranty.

+

+SuSE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL

+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL SuSE

+BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES

+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION

+OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN

+CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

+

+

+Copyright 1987-1991, 1993 by Digital Equipment Corporation, Maynard, Massachusetts.

+Copyright 1991 Massachusetts Institute of Technology, Cambridge, Massachusetts.

+Copyright 1991, 1993 Olivetti Research Limited, Cambridge, England.

+

+                        All Rights Reserved

+

+Permission to use, copy, modify, and distribute this software and its

+documentation for any purpose and without fee is hereby granted,

+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 Digital not be

+used in advertising or publicity pertaining to distribution of the

+software without specific, written prior permission.

+

+DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING

+ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL

+DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR

+ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,

+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,

+ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS

+SOFTWARE.

+

+

+Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts,

+Copyright 1994 Quarterdeck Office Systems.

+

+                        All Rights Reserved

+

+Permission to use, copy, modify, and distribute this software and its

+documentation for any purpose and without fee is hereby granted,

+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 names of Digital and

+Quarterdeck not be used in advertising or publicity pertaining to

+distribution of the software without specific, written prior

+permission.

+

+DIGITAL AND QUARTERDECK DISCLAIM ALL WARRANTIES WITH REGARD TO THIS

+SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND

+FITNESS, IN NO EVENT SHALL DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT

+OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS

+OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE

+OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE

+OR PERFORMANCE OF THIS SOFTWARE.

+

+

+Copyright 1997 Digital Equipment Corporation.

+All rights reserved.

+

+This software is furnished under license and may be used and copied only in

+accordance with the following terms and conditions.  Subject to these

+conditions, you may download, copy, install, use, modify and distribute

+this software in source and/or binary form. No title or ownership is

+transferred hereby.

+

+1) Any source code used, modified or distributed must reproduce and retain

+   this copyright notice and list of conditions as they appear in the

+   source file.

+

+2) No right is granted to use any trade name, trademark, or logo of Digital

+   Equipment Corporation. Neither the "Digital Equipment Corporation"

+   name nor any trademark or logo of Digital Equipment Corporation may be

+   used to endorse or promote products derived from this software without

+   the prior written permission of Digital Equipment Corporation.

+

+3) This software is provided "AS-IS" and any express or implied warranties,

+   including but not limited to, any implied warranties of merchantability,

+   fitness for a particular purpose, or non-infringement are disclaimed.

+   In no event shall DIGITAL be liable for any damages whatsoever, and in

+   particular, DIGITAL shall not be liable for special, indirect,

+   consequential, or incidental damages or damages for lost profits, loss

+   of revenue or loss of use, whether such damages arise in contract,

+   negligence, tort, under statute, in equity, at law or otherwise, even

+   if advised of the possibility of such damage.

+

+

+Copyright (c) 1991, 1996-1997 Digital Equipment Corporation, Maynard, Massachusetts.

+

+Permission is hereby granted, free of charge, to any person obtaining a copy

+of this software and associated documentation files (the "Software"), to deal

+in the Software without restriction, including without limitation the rights

+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

+copies of the Software.

+

+The above copyright notice and this permission notice shall be included in

+all copies or substantial portions of the Software.

+

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

+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

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

+DIGITAL EQUIPMENT CORPORATION BE LIABLE FOR ANY CLAIM, DAMAGES, INCLUDING,

+BUT NOT LIMITED TO CONSEQUENTIAL OR INCIDENTAL DAMAGES, OR OTHER LIABILITY,

+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR

+IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

+

+Except as contained in this notice, the name of Digital Equipment Corporation

+shall not be used in advertising or otherwise to promote the sale, use or other

+dealings in this Software without prior written authorization from Digital

+Equipment Corporation.

+

+

+SGI FREE SOFTWARE LICENSE B (Version 2.0, Sept. 18, 2008)

+Copyright (C) 1991-2000 Silicon Graphics, Inc. All Rights Reserved.

+

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

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

+to deal in the Software without restriction, including without limitation

+the rights to use, copy, modify, merge, publish, distribute, sublicense,

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

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

+

+The above copyright notice including the dates of first publication and

+either this permission notice or a reference to

+http://oss.sgi.com/projects/FreeB/

+shall be included in all copies or substantial portions of the Software.

+

+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

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

+SILICON GRAPHICS, INC. BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,

+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF

+OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

+SOFTWARE.

+

+

+Copyright (c) 1994, 1995  Hewlett-Packard Company

+

+Permission is hereby granted, free of charge, to any person obtaining

+a copy of this software and associated documentation files (the

+"Software"), to deal in the Software without restriction, including

+without limitation the rights to use, copy, modify, merge, publish,

+distribute, sublicense, and/or sell copies of the Software, and to

+permit persons to whom the Software is furnished to do so, subject to

+the following conditions:

+

+The above copyright notice and this permission notice shall be included

+in all copies or substantial portions of the Software.

+

+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

+IN NO EVENT SHALL HEWLETT-PACKARD COMPANY BE LIABLE FOR ANY CLAIM,

+DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR

+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR

+THE USE OR OTHER DEALINGS IN THE SOFTWARE.

+

+Except as contained in this notice, the name of the Hewlett-Packard

+Company shall not be used in advertising or otherwise to promote the

+sale, use or other dealings in this Software without prior written

+authorization from the Hewlett-Packard Company.

+

+

+Copyright 1989 by Hewlett-Packard Company, Palo Alto, California.

+All Rights Reserved

+

+Permission to use, copy, modify, and distribute this software and its

+documentation for any purpose and without fee is hereby granted,

+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 Hewlett-Packard not be

+used in advertising or publicity pertaining to distribution of the

+software without specific, written prior permission.

+

+HEWLETT-PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING

+ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL

+HEWLETT-PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR

+ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,

+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,

+ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS

+SOFTWARE.

+

+

+Copyright 2001-2004 Red Hat Inc., Durham, North Carolina.

+Copyright (c) 2003 by the XFree86 Project, Inc.

+Copyright 2004-2005 Red Hat Inc., Raleigh, North Carolina.

+All Rights Reserved.

+

+Permission is hereby granted, free of charge, to any person obtaining

+a copy of this software and associated documentation files (the

+"Software"), to deal in the Software without restriction, including

+without limitation on the rights to use, copy, modify, merge,

+publish, distribute, sublicense, and/or sell copies of the Software,

+and to permit persons to whom the Software is furnished to do so,

+subject to the following conditions:

+

+The above copyright notice and this permission notice (including the

+next paragraph) shall be included in all copies or substantial

+portions of the Software.

+

+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

+NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS

+BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN

+ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN

+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

+SOFTWARE.

+

+

+Copyright © 2008 Red Hat, Inc.

+Partly based on code Copyright © 2000 SuSE, Inc.

+

+Permission to use, copy, modify, distribute, and sell this software

+and its documentation for any purpose is hereby granted without

+fee, provided that the above copyright notice appear in all copies

+and that both that copyright notice and this permission notice

+appear in supporting documentation, and that the name of Red Hat

+not be used in advertising or publicity pertaining to distribution

+of the software without specific, written prior permission.  Red

+Hat makes no representations about the suitability of this software

+for any purpose.  It is provided "as is" without express or implied

+warranty.

+

+Red Hat DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN

+NO EVENT SHALL Red Hat BE LIABLE FOR ANY SPECIAL, INDIRECT OR

+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS

+OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,

+NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN

+CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

+

+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 SuSE not be used in advertising or

+publicity pertaining to distribution of the software without specific,

+written prior permission.  SuSE makes no representations about the

+suitability of this software for any purpose.  It is provided "as is"

+without express or implied warranty.

+

+SuSE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL

+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL SuSE

+BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES

+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION

+OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN

+CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

+

+

+Copyright © 2006  Red Hat, Inc.

+(C) Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.

+All Rights Reserved.

+

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

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

+to deal in the Software without restriction, including without limitation

+the rights to use, copy, modify, merge, publish, distribute, sub license,

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

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

+

+The above copyright notice and this permission notice (including the next

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

+Software.

+

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

+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

+FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.  IN NO EVENT SHALL

+RED HAT, INC, OR PRECISION INSIGHT AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY

+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT

+OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR

+THE USE OR OTHER DEALINGS IN THE SOFTWARE.

+

+

+Copyright (c) 1995  X Consortium

+Copyright 2004 Red Hat Inc., Durham, North Carolina.

+All Rights Reserved.

+

+Permission is hereby granted, free of charge, to any person obtaining

+a copy of this software and associated documentation files (the

+"Software"), to deal in the Software without restriction, including

+without limitation on the rights to use, copy, modify, merge,

+publish, distribute, sublicense, and/or sell copies of the Software,

+and to permit persons to whom the Software is furnished to do so,

+subject to the following conditions:

+

+The above copyright notice and this permission notice shall be

+included in all copies or substantial portions of the Software.

+

+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

+NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT, THE X CONSORTIUM,

+AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,

+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

+OTHER DEALINGS IN THE SOFTWARE.

+

+Except as contained in this notice, the name of the X Consortium

+shall not be used in advertising or otherwise to promote the sale,

+use or other dealings in this Software without prior written

+authorization from the X Consortium.

+

+

+Copyright 1998-2000 Precision Insight, Inc., Cedar Park, Texas.

+Copyright 2000 VA Linux Systems, Inc.

+Copyright (c) 2002, 2008, 2009 Apple Computer, Inc.

+Copyright (c) 2003-2004 Torrey T. Lyons.

+All Rights Reserved.

+

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

+copy of this software and associated documentation files (the

+"Software"), to deal in the Software without restriction, including

+without limitation the rights to use, copy, modify, merge, publish,

+distribute, sub license, and/or sell copies of the Software, and to

+permit persons to whom the Software is furnished to do so, subject to

+the following conditions:

+

+The above copyright notice and this permission notice (including the

+next paragraph) shall be included in all copies or substantial portions

+of the Software.

+

+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.

+IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR

+ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,

+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE

+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

+

+

+(C) Copyright IBM Corporation 2003

+All Rights Reserved.

+

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

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

+to deal in the Software without restriction, including without limitation

+on the rights to use, copy, modify, merge, publish, distribute, sub

+license, and/or sell copies of the Software, and to permit persons to whom

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

+

+The above copyright notice and this permission notice (including the next

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

+Software.

+

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

+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

+FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.  IN NO EVENT SHALL

+VA LINUX SYSTEM, IBM AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM,

+DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR

+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE

+USE OR OTHER DEALINGS IN THE SOFTWARE.

+

+

+(C) Copyright IBM Corporation 2004-2005

+All Rights Reserved.

+

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

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

+to deal in the Software without restriction, including without limitation

+the rights to use, copy, modify, merge, publish, distribute, sub license,

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

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

+

+The above copyright notice and this permission notice (including the next

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

+Software.

+

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

+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

+FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.  IN NO EVENT SHALL

+IBM,

+AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,

+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF

+OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

+SOFTWARE.

+

+

+Copyright (c) 1997  Metro Link Incorporated

+

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

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

+to deal in the Software without restriction, including without limitation

+the rights to use, copy, modify, merge, publish, distribute, sublicense,

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

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

+

+The above copyright notice and this permission notice shall be included in

+all copies or substantial portions of the Software.

+

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

+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

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

+THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,

+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF

+OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

+SOFTWARE.

+

+Except as contained in this notice, the name of the Metro Link shall not be

+used in advertising or otherwise to promote the sale, use or other dealings

+in this Software without prior written authorization from Metro Link.

+

+

+Copyright 1995-1998 by Metro Link, Inc.

+Copyright (c) 1997 Matthieu Herrb

+

+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 Metro Link, Inc. not be used in

+advertising or publicity pertaining to distribution of the software without

+specific, written prior permission.  Metro Link, Inc. makes no

+representations about the suitability of this software for any purpose.

+ It is provided "as is" without express or implied warranty.

+

+METRO LINK, INC. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO

+EVENT SHALL METRO LINK, 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.

+

+

+Copyright 1998 by Metro Link Incorporated

+

+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 Metro Link

+Incorporated not be used in advertising or publicity pertaining to

+distribution of the software without specific, written prior

+permission.  Metro Link Incorporated makes no representations

+about the suitability of this software for any purpose.  It is

+provided "as is" without express or implied warranty.

+

+METRO LINK INCORPORATED DISCLAIMS ALL WARRANTIES WITH REGARD

+TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY

+AND FITNESS, IN NO EVENT SHALL METRO LINK INCORPORATED BE

+LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY

+DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,

+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,

+ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS

+SOFTWARE.

+

+

+Copyright (c) 2000 by Conectiva S.A. (http://www.conectiva.com)

+

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

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

+to deal in the Software without restriction, including without limitation

+the rights to use, copy, modify, merge, publish, distribute, sublicense,

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

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

+

+The above copyright notice and this permission notice shall be included in

+all copies or substantial portions of the Software.

+

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

+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

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

+CONECTIVA LINUX BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,

+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF

+OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

+SOFTWARE.

+

+Except as contained in this notice, the name of Conectiva Linux shall

+not be used in advertising or otherwise to promote the sale, use or other

+dealings in this Software without prior written authorization from

+Conectiva Linux.

+

+

+Copyright (c) 2001, Andy Ritger  aritger@nvidia.com

+All rights reserved.

+

+Redistribution and use in source and binary forms, with or without

+modification, are permitted provided that the following conditions

+are met:

+

+o Redistributions of source code must retain the above copyright

+  notice, this list of conditions and the following disclaimer.

+o Redistributions in binary form must reproduce the above copyright

+  notice, this list of conditions and the following disclaimer

+  in the documentation and/or other materials provided with the

+  distribution.

+o Neither the name of NVIDIA nor the names of its contributors

+  may be used to endorse or promote products derived from this

+  software without specific prior written permission.

+

+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS

+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT

+NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND

+FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL

+THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,

+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,

+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;

+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER

+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT

+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN

+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE

+POSSIBILITY OF SUCH DAMAGE.

+

+

+Copyright 1992 Vrije Universiteit, The Netherlands

+

+Permission to use, copy, modify, and distribute this software and its

+documentation for any purpose and without fee is hereby granted, 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 the Vrije Universiteit not be used in

+advertising or publicity pertaining to distribution of the software without

+specific, written prior permission.  The Vrije Universiteit makes no

+representations about the suitability of this software for any purpose.

+It is provided "as is" without express or implied warranty.

+

+The Vrije Universiteit DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO

+EVENT SHALL The Vrije Universiteit BE LIABLE FOR ANY SPECIAL, INDIRECT OR

+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,

+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER

+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR

+PERFORMANCE OF THIS SOFTWARE.

+

+

+Copyright 1998 by Concurrent Computer Corporation

+

+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 Concurrent Computer

+Corporation not be used in advertising or publicity pertaining to

+distribution of the software without specific, written prior

+permission.  Concurrent Computer Corporation makes no representations

+about the suitability of this software for any purpose.  It is

+provided "as is" without express or implied warranty.

+

+CONCURRENT COMPUTER CORPORATION DISCLAIMS ALL WARRANTIES WITH REGARD

+TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY

+AND FITNESS, IN NO EVENT SHALL CONCURRENT COMPUTER CORPORATION BE

+LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY

+DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,

+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,

+ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS

+SOFTWARE.

+

+

+Copyright © 2004 Nokia

+

+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 Nokia not be used in

+advertising or publicity pertaining to distribution of the software without

+specific, written prior permission. Nokia makes no

+representations about the suitability of this software for any purpose.  It

+is provided "as is" without express or implied warranty.

+

+NOKIA DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO

+EVENT SHALL NOKIA 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.

+

+

+(c)Copyright 1988,1991 Adobe Systems Incorporated.

+All rights reserved.

+

+Permission to use, copy, modify, distribute, and sublicense this software and its

+documentation for any purpose and without fee is hereby granted, provided that

+the above copyright notices appear in all copies and that both those copyright

+notices and this permission notice appear in supporting documentation and that

+the name of Adobe Systems Incorporated not be used in advertising or publicity

+pertaining to distribution of the software without specific, written prior

+permission.  No trademark license to use the Adobe trademarks is hereby

+granted.  If the Adobe trademark "Display PostScript"(tm) is used to describe

+this software, its functionality or for any other purpose, such use shall be

+limited to a statement that this software works in conjunction with the Display

+PostScript system.  Proper trademark attribution to reflect Adobe's ownership

+of the trademark shall be given whenever any such reference to the Display

+PostScript system is made.

+

+ADOBE MAKES NO REPRESENTATIONS ABOUT THE SUITABILITY OF THE SOFTWARE FOR ANY

+PURPOSE.  IT IS PROVIDED "AS IS" WITHOUT EXPRESS OR IMPLIED WARRANTY.  ADOBE

+DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED

+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-

+INFRINGEMENT OF THIRD PARTY RIGHTS.  IN NO EVENT SHALL ADOBE BE LIABLE TO YOU

+OR ANY OTHER PARTY FOR ANY SPECIAL, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY

+DAMAGES WHATSOEVER WHETHER IN AN ACTION OF CONTRACT,NEGLIGENCE, STRICT

+LIABILITY OR ANY OTHER ACTION ARISING OUT OF OR IN CONNECTION WITH THE USE OR

+PERFORMANCE OF THIS SOFTWARE.  ADOBE WILL NOT PROVIDE ANY TRAINING OR OTHER

+SUPPORT FOR THE SOFTWARE.

+

+Adobe, PostScript, and Display PostScript are trademarks of Adobe Systems

+Incorporated which may be registered in certain jurisdictions.

+

+

+Copyright 1989 Network Computing Devices, Inc., Mountain View, California.

+

+Permission to use, copy, modify, and distribute this software and its

+documentation for any purpose and without fee is hereby granted, 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 N.C.D. not be used in advertising or

+publicity pertaining to distribution of the software without specific,

+written prior permission.  N.C.D. makes no representations about the

+suitability of this software for any purpose.  It is provided "as is"

+without express or implied warranty.

+

+

+Copyright (c) 1987 by the Regents of the University of California

+

+Permission to use, copy, modify, and distribute this

+software and its documentation for any purpose and without

+fee is hereby granted, provided that the above copyright

+notice appear in all copies.  The University of California

+makes no representations about the suitability of this

+software for any purpose.  It is provided "as is" without

+express or implied warranty.

+

+

+Copyright 1992, 1993 Data General Corporation;

+Copyright 1992, 1993 OMRON Corporation

+

+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

+neither the name OMRON or DATA GENERAL be used in advertising or publicity

+pertaining to distribution of the software without specific, written prior

+permission of the party whose name is to be used.  Neither OMRON or

+DATA GENERAL make any representation about the suitability of this software

+for any purpose.  It is provided "as is" without express or implied warranty.

+

+OMRON AND DATA GENERAL EACH DISCLAIM ALL WARRANTIES WITH REGARD TO THIS

+SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS,

+IN NO EVENT SHALL OMRON OR DATA GENERAL BE LIABLE FOR ANY SPECIAL, INDIRECT

+OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,

+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER

+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE

+OF THIS SOFTWARE.

+

+

+Copyright © 1998-2004, 2006 Keith Packard

+Copyright © 2000-2002 Keith Packard, member of The XFree86 Project, Inc.

+Copyright (c) 2002 Apple Computer, Inc.

+Copyright (c) 2003 Torrey T. Lyons.

+All Rights Reserved.

+

+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 Keith Packard not be used in

+advertising or publicity pertaining to distribution of the software without

+specific, written prior permission.  Keith Packard makes no

+representations about the suitability of this software for any purpose.  It

+is provided "as is" without express or implied warranty.

+

+KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO

+EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR

+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,

+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER

+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR

+PERFORMANCE OF THIS SOFTWARE.

+

+

+Copyright © 1999 Keith Packard

+Copyright © 2000 Compaq Computer Corporation

+Copyright © 2002 MontaVista Software Inc.

+Copyright © 2005 OpenedHand Ltd.

+Copyright © 2006 Nokia Corporation

+

+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 the authors and/or copyright holders

+not be used in advertising or publicity pertaining to distribution of the

+software without specific, written prior permission.  The authors and/or

+copyright holders make no representations about the suitability of this

+software for any purpose.  It is provided "as is" without express or

+implied warranty.

+

+THE AUTHORS AND/OR COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD

+TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY

+AND FITNESS, IN NO EVENT SHALL THE AUTHORS AND/OR COPYRIGHT HOLDERS BE

+LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES

+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN

+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF

+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

+

+

+Copyright 1993 by Davor Matic

+

+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.  Davor Matic makes no representations about

+the suitability of this software for any purpose.  It is provided "as

+is" without express or implied warranty.

+

+

+Copyright (C) 2001-2004 Harold L Hunt II All Rights Reserved.

+Copyright (C) Colin Harrison 2005-2008

+

+Permission is hereby granted, free of charge, to any person obtaining

+a copy of this software and associated documentation files (the

+"Software"), to deal in the Software without restriction, including

+without limitation the rights to use, copy, modify, merge, publish,

+distribute, sublicense, and/or sell copies of the Software, and to

+permit persons to whom the Software is furnished to do so, subject to

+the following conditions:

+

+The above copyright notice and this permission notice shall be

+included in all copies or substantial portions of the Software.

+

+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

+NONINFRINGEMENT. IN NO EVENT SHALL HAROLD L HUNT II BE LIABLE FOR

+ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF

+CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION

+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

+

+Except as contained in this notice, the name of Harold L Hunt II

+shall not be used in advertising or otherwise to promote the sale, use

+or other dealings in this Software without prior written authorization

+from Harold L Hunt II.

+

+

+Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.

+

+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 Thomas Roell not be used in

+advertising or publicity pertaining to distribution of the software without

+specific, written prior permission.  Thomas Roell makes no representations

+about the suitability of this software for any purpose.  It is provided

+"as is" without express or implied warranty.

+

+THOMAS ROELL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO

+EVENT SHALL THOMAS ROELL BE LIABLE FOR ANY SPECIAL, INDIRECT OR

+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,

+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER

+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR

+PERFORMANCE OF THIS SOFTWARE.

+

+

+Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany

+Copyright 1993 by David Wexelblat <dwex@goblin.org>

+

+Permission to use, copy, modify, distribute, and sell this software and its

+documentation for any purpose is hereby granted without fee, provided that

+the above copyright notice appear in all copies and that both that

+copyright notice and this permission notice appear in supporting

+documentation, and that the names of Thomas Roell and David Wexelblat

+not be used in advertising or publicity pertaining to distribution of

+the software without specific, written prior permission.  Thomas Roell and

+David Wexelblat makes no representations about the suitability of this

+software for any purpose.  It is provided "as is" without express or

+implied warranty.

+

+THOMAS ROELL AND DAVID WEXELBLAT DISCLAIMS ALL WARRANTIES WITH REGARD TO

+THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND

+FITNESS, IN NO EVENT SHALL THOMAS ROELL OR DAVID WEXELBLAT BE LIABLE FOR

+ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER

+RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF

+CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN

+CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

+

+

+Copyright 1990,91,92,93 by Thomas Roell, Germany.

+Copyright 1991,92,93    by SGCS (Snitily Graphics Consulting Services), USA.

+

+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 Thomas Roell nor

+SGCS be used in advertising or publicity pertaining to distribution

+of the software without specific, written prior permission.

+Thomas Roell nor SGCS makes no representations about the suitability

+of this software for any purpose. It is provided "as is" without

+express or implied warranty.

+

+THOMAS ROELL AND SGCS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS

+SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND

+FITNESS, IN NO EVENT SHALL THOMAS ROELL OR SGCS BE LIABLE FOR ANY

+SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER

+RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF

+CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN

+CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

+

+

+Copyright 1998 by Alan Hourihane, Wigan, England.

+Copyright 2000-2002 by Alan Hourihane, Flint Mountain, North Wales.

+

+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 Alan Hourihane not be used in

+advertising or publicity pertaining to distribution of the software without

+specific, written prior permission.  Alan Hourihane makes no representations

+about the suitability of this software for any purpose.  It is provided

+"as is" without express or implied warranty.

+

+ALAN HOURIHANE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO

+EVENT SHALL ALAN HOURIHANE BE LIABLE FOR ANY SPECIAL, INDIRECT OR

+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,

+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER

+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR

+PERFORMANCE OF THIS SOFTWARE.

+

+

+Copyright 1995  Kaleb S. KEITHLEY

+

+Permission is hereby granted, free of charge, to any person obtaining

+a copy of this software and associated documentation files (the

+"Software"), to deal in the Software without restriction, including

+without limitation the rights to use, copy, modify, merge, publish,

+distribute, sublicense, and/or sell copies of the Software, and to

+permit persons to whom the Software is furnished to do so, subject to

+the following conditions:

+

+The above copyright notice and this permission notice shall be

+included in all copies or substantial portions of the Software.

+

+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

+IN NO EVENT SHALL Kaleb S. KEITHLEY BE LIABLE FOR ANY CLAIM, DAMAGES

+OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,

+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

+OTHER DEALINGS IN THE SOFTWARE.

+

+Except as contained in this notice, the name of Kaleb S. KEITHLEY

+shall not be used in advertising or otherwise to promote the sale, use

+or other dealings in this Software without prior written authorization

+from Kaleb S. KEITHLEY

+

+

+Copyright (c) 1997 Matthieu Herrb

+

+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 Matthieu Herrb not be used in

+advertising or publicity pertaining to distribution of the software without

+specific, written prior permission.  Matthieu Herrb makes no

+representations about the suitability of this software for any purpose.

+ It is provided "as is" without express or implied warranty.

+

+MATTHIEU HERRB DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO

+EVENT SHALL MATTHIEU HERRB BE LIABLE FOR ANY SPECIAL, INDIRECT OR

+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,

+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER

+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR

+PERFORMANCE OF THIS SOFTWARE.

+

+

+Copyright 2004, Egbert Eich

+

+Permission is hereby granted, free of charge, to any person obtaining a copy

+of this software and associated documentation files (the "Software"), to

+deal in the Software without restriction, including without limitation the

+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or

+sell copies of the Software, and to permit persons to whom the Software is

+furnished to do so, subject to the following conditions:

+

+The above copyright notice and this permission notice shall be included in

+all copies or substantial portions of the Software.

+

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

+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

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

+EGBERT EICH BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER

+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CON-

+NECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

+

+Except as contained in this notice, the name of Egbert Eich shall not

+be used in advertising or otherwise to promote the sale, use or other deal-

+ings in this Software without prior written authorization from Egbert Eich.

+

+

+Copyright 1993 by David Wexelblat <dwex@goblin.org>

+Copyright 2005 by Kean Johnston <jkj@sco.com>

+Copyright 1993 by David McCullough <davidm@stallion.oz.au>

+

+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 Wexelblat not be used in

+advertising or publicity pertaining to distribution of the software without

+specific, written prior permission.  David Wexelblat makes no representations

+about the suitability of this software for any purpose.  It is provided

+"as is" without express or implied warranty.

+

+DAVID WEXELBLAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO

+EVENT SHALL DAVID WEXELBLAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR

+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,

+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER

+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR

+PERFORMANCE OF THIS SOFTWARE.

+

+

+Copyright 1992 by Orest Zborowski <obz@Kodak.com>

+Copyright 1993 by David Wexelblat <dwex@goblin.org>

+

+Permission to use, copy, modify, distribute, and sell this software and its

+documentation for any purpose is hereby granted without fee, provided that

+the above copyright notice appear in all copies and that both that

+copyright notice and this permission notice appear in supporting

+documentation, and that the names of Orest Zborowski and David Wexelblat

+not be used in advertising or publicity pertaining to distribution of

+the software without specific, written prior permission.  Orest Zborowski

+and David Wexelblat make no representations about the suitability of this

+software for any purpose.  It is provided "as is" without express or

+implied warranty.

+

+OREST ZBOROWSKI AND DAVID WEXELBLAT DISCLAIMS ALL WARRANTIES WITH REGARD

+TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND

+FITNESS, IN NO EVENT SHALL OREST ZBOROWSKI OR DAVID WEXELBLAT BE LIABLE

+FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES

+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN

+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF

+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

+

+

+Copyright 1992 by Orest Zborowski <obz@Kodak.com>

+Copyright 1993 by David Dawes <dawes@xfree86.org>

+

+Permission to use, copy, modify, distribute, and sell this software and its

+documentation for any purpose is hereby granted without fee, provided that

+the above copyright notice appear in all copies and that both that

+copyright notice and this permission notice appear in supporting

+documentation, and that the names of Orest Zborowski and David Dawes

+not be used in advertising or publicity pertaining to distribution of

+the software without specific, written prior permission.  Orest Zborowski

+and David Dawes make no representations about the suitability of this

+software for any purpose.  It is provided "as is" without express or

+implied warranty.

+

+OREST ZBOROWSKI AND DAVID DAWES DISCLAIMS ALL WARRANTIES WITH REGARD

+TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND

+FITNESS, IN NO EVENT SHALL OREST ZBOROWSKI OR DAVID DAWES BE LIABLE

+FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES

+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN

+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF

+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

+

+

+Copyright 1995-1999 by Frederic Lepied, France. <fred@sugix.frmug.fr.net>

+

+Permission to use, copy, modify, distribute, and sell this software and its

+documentation for any purpose is  hereby granted without fee, provided that

+the  above copyright   notice appear  in   all  copies and  that both  that

+copyright  notice   and   this  permission   notice  appear  in  supporting

+documentation, and that   the  name of  Frederic   Lepied not  be  used  in

+advertising or publicity pertaining to distribution of the software without

+specific,  written      prior  permission.     Frederic  Lepied   makes  no

+representations about the suitability of this software for any purpose.  It

+is provided "as is" without express or implied warranty.

+

+FREDERIC  LEPIED DISCLAIMS ALL   WARRANTIES WITH REGARD  TO  THIS SOFTWARE,

+INCLUDING ALL IMPLIED   WARRANTIES OF MERCHANTABILITY  AND   FITNESS, IN NO

+EVENT  SHALL FREDERIC  LEPIED BE   LIABLE   FOR ANY  SPECIAL, INDIRECT   OR

+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,

+DATA  OR PROFITS, WHETHER  IN  AN ACTION OF  CONTRACT,  NEGLIGENCE OR OTHER

+TORTIOUS  ACTION, ARISING    OUT OF OR   IN  CONNECTION  WITH THE USE    OR

+PERFORMANCE OF THIS SOFTWARE.

+

+

+Copyright 1992 by Rich Murphey <Rich@Rice.edu>

+Copyright 1993 by David Wexelblat <dwex@goblin.org>

+

+Permission to use, copy, modify, distribute, and sell this software and its

+documentation for any purpose is hereby granted without fee, provided that

+the above copyright notice appear in all copies and that both that

+copyright notice and this permission notice appear in supporting

+documentation, and that the names of Rich Murphey and David Wexelblat

+not be used in advertising or publicity pertaining to distribution of

+the software without specific, written prior permission.  Rich Murphey and

+David Wexelblat make no representations about the suitability of this

+software for any purpose.  It is provided "as is" without express or

+implied warranty.

+

+RICH MURPHEY AND DAVID WEXELBLAT DISCLAIM ALL WARRANTIES WITH REGARD TO

+THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND

+FITNESS, IN NO EVENT SHALL RICH MURPHEY OR DAVID WEXELBLAT BE LIABLE FOR

+ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER

+RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF

+CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN

+CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

+

+

+Copyright 1992 by Rich Murphey <Rich@Rice.edu>

+Copyright 1993 by David Dawes <dawes@xfree86.org>

+

+Permission to use, copy, modify, distribute, and sell this software and its

+documentation for any purpose is hereby granted without fee, provided that

+the above copyright notice appear in all copies and that both that

+copyright notice and this permission notice appear in supporting

+documentation, and that the names of Rich Murphey and David Dawes

+not be used in advertising or publicity pertaining to distribution of

+the software without specific, written prior permission.  Rich Murphey and

+David Dawes make no representations about the suitability of this

+software for any purpose.  It is provided "as is" without express or

+implied warranty.

+

+RICH MURPHEY AND DAVID DAWES DISCLAIM ALL WARRANTIES WITH REGARD TO

+THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND

+FITNESS, IN NO EVENT SHALL RICH MURPHEY OR DAVID DAWES BE LIABLE FOR

+ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER

+RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF

+CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN

+CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

+

+

+Copyright © 2003-2004 Anders Carlsson

+

+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 Anders Carlsson not be used in

+advertising or publicity pertaining to distribution of the software without

+specific, written prior permission.  Anders Carlsson makes no

+representations about the suitability of this software for any purpose.  It

+is provided "as is" without express or implied warranty.

+

+ANDERS CARLSSON DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO

+EVENT SHALL ANDERS CARLSSON BE LIABLE FOR ANY SPECIAL, INDIRECT OR

+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,

+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER

+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR

+PERFORMANCE OF THIS SOFTWARE.

+

+

+Copyright (C) 2003 Anders Carlsson

+Copyright © 2003-2004 Eric Anholt

+Copyright © 2004 Keith Packard

+

+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 Eric Anholt not be used in

+advertising or publicity pertaining to distribution of the software without

+specific, written prior permission.  Eric Anholt makes no

+representations about the suitability of this software for any purpose.  It

+is provided "as is" without express or implied warranty.

+

+ERIC ANHOLT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO

+EVENT SHALL ERIC ANHOLT BE LIABLE FOR ANY SPECIAL, INDIRECT OR

+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,

+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER

+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR

+PERFORMANCE OF THIS SOFTWARE.

+

+

+Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>

+

+Permission to use, copy, modify, and distribute this software for any

+purpose with or without fee is hereby granted, provided that the above

+copyright notice and this permission notice appear in all copies.

+

+THE SOFTWARE IS PROVIDED "AS IS" AND TODD C. MILLER DISCLAIMS ALL

+WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES

+OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL TODD C. MILLER BE LIABLE

+FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES

+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION

+OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN

+CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

+

+

+Copyright © 2003-2004 Philip Blundell

+

+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 Philip Blundell not be used in

+advertising or publicity pertaining to distribution of the software without

+specific, written prior permission.  Philip Blundell makes no

+representations about the suitability of this software for any purpose.  It

+is provided "as is" without express or implied warranty.

+

+PHILIP BLUNDELL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO

+EVENT SHALL PHILIP BLUNDELL BE LIABLE FOR ANY SPECIAL, INDIRECT OR

+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,

+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER

+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR

+PERFORMANCE OF THIS SOFTWARE.

+

+

+

+Copyright (c) 1994-2003 by The XFree86 Project, Inc.

+Copyright 1997 by Metro Link, Inc.

+Copyright 2003 by David H. Dawes.

+Copyright 2003 by X-Oz Technologies.

+Copyright (c) 2004, X.Org Foundation

+

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

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

+to deal in the Software without restriction, including without limitation

+the rights to use, copy, modify, merge, publish, distribute, sublicense,

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

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

+

+The above copyright notice and this permission notice shall be included in

+all copies or substantial portions of the Software.

+

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

+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

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

+THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR

+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,

+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

+OTHER DEALINGS IN THE SOFTWARE.

+

+Except as contained in this notice, the name of the copyright holder(s)

+and author(s) shall not be used in advertising or otherwise to promote

+the sale, use or other dealings in this Software without prior written

+authorization from the copyright holder(s) and author(s).

+

+

+Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany

+Copyright 1993 by David Wexelblat <dwex@goblin.org>

+Copyright 1999 by David Holland <davidh@iquest.net>

+Copyright © 2000 Compaq Computer Corporation

+Copyright © 2002 Hewlett-Packard Company

+Copyright © 2004, 2005 Red Hat, Inc.

+Copyright © 2004 Nicholas Miell

+Copyright © 2005 Trolltech AS

+Copyright © 2006 Intel Corporation

+Copyright © 2006-2007 Keith Packard

+Copyright © 2008 Red Hat, Inc

+Copyright © 2008 George Sapountzis <gsap7@yahoo.gr>

+

+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 the copyright holders not be used in advertising or

+publicity pertaining to distribution of the software without specific,

+written prior permission.  The copyright holders make no representations

+about the suitability of this software for any purpose.  It is provided "as

+is" without express or implied warranty.

+

+THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS

+SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND

+FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY

+SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES

+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN

+AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING

+OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS

+SOFTWARE.

+

+

+Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc.

+            2005 Lars Knoll & Zack Rusin, Trolltech

+

+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 Keith Packard not be used in

+advertising or publicity pertaining to distribution of the software without

+specific, written prior permission.  Keith Packard makes no

+representations about the suitability of this software for any purpose.  It

+is provided "as is" without express or implied warranty.

+

+THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS

+SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND

+FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY

+SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES

+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN

+AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING

+OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS

+SOFTWARE.

+

+

+Copyright 1987, 1998  The Open Group

+Copyright © 1998-1999, 2001 The XFree86 Project, Inc.

+Copyright © 2000 VA Linux Systems, Inc.

+Copyright (c) 2000, 2001 Nokia Home Communications

+Copyright © 2007, 2008 Red Hat, Inc.

+All rights reserved.

+

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

+copy of this software and associated documentation files (the

+"Software"), to deal in the Software without restriction, including

+without limitation the rights to use, copy, modify, merge, publish,

+distribute, and/or sell copies of the Software, and to permit persons

+to whom the Software is furnished to do so, provided that the above

+copyright notice(s) and this permission notice appear in all copies of

+the Software and that both the above copyright notice(s) and this

+permission notice appear in supporting documentation.

+

+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT

+OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR

+HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR 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.

+

+Except as contained in this notice, the name of a copyright holder

+shall not be used in advertising or otherwise to promote the sale, use

+or other dealings in this Software without prior written authorization

+of the copyright holder.

+

+

+Copyright 1996 by Thomas E. Dickey <dickey@clark.net>

+

+                        All Rights Reserved

+

+Permission to use, copy, modify, and distribute this software and its

+documentation for any purpose and without fee is hereby granted,

+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 the above listed

+copyright holder(s) not be used in advertising or publicity pertaining

+to distribution of the software without specific, written prior

+permission.

+

+THE ABOVE LISTED COPYRIGHT HOLDER(S) DISCLAIM ALL WARRANTIES WITH REGARD

+TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY

+AND FITNESS, IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE

+LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES

+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN

+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF

+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

+

+

+Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.

+Copyright (c) 2001 Andreas Monitzer.

+Copyright (c) 2001-2004 Greg Parker.

+Copyright (c) 2001-2004 Torrey T. Lyons

+Copyright (c) 2002-2003 Apple Computer, Inc.

+Copyright (c) 2004-2005 Alexander Gottwald

+Copyright (c) 2002-2009 Apple Inc.

+Copyright (c) 2007 Jeremy Huddleston

+All Rights Reserved.

+

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

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

+to deal in the Software without restriction, including without limitation

+the rights to use, copy, modify, merge, publish, distribute, sublicense,

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

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

+

+The above copyright notice and this permission notice shall be included in

+all copies or substantial portions of the Software.

+

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

+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

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

+THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR

+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,

+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER

+DEALINGS IN THE SOFTWARE.

+

+Except as contained in this notice, the name(s) of the above copyright

+holders shall not be used in advertising or otherwise to promote the sale,

+use or other dealings in this Software without prior written authorization.

+

+

+Copyright (C) 1999,2000 by Eric Sunshine <sunshine@sunshineco.com>

+Copyright (C) 2001-2005 by Thomas Winischhofer, Vienna, Austria.

+

+All rights reserved.

+

+Redistribution and use in source and binary forms, with or without

+modification, are permitted provided that the following conditions are met:

+

+  1. Redistributions of source code must retain the above copyright

+     notice, this list of conditions and the following disclaimer.

+  2. Redistributions in binary form must reproduce the above copyright

+     notice, this list of conditions and the following disclaimer in the

+     documentation and/or other materials provided with the distribution.

+  3. The name of the author may not be used to endorse or promote products

+     derived from this software without specific prior written permission.

+

+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR

+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES

+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN

+NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,

+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED

+TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR

+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF

+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

+

+

+Copyright (C) 2005 Bogdan D. bogdand@users.sourceforge.net

+

+Permission is hereby granted, free of charge, to any person obtaining a copy of

+this software and associated documentation files (the "Software"), to deal in

+the Software without restriction, including without limitation the rights to

+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies

+of the Software, and to permit persons to whom the Software is furnished to do

+so, subject to the following conditions:

+

+The above copyright notice and this permission notice shall be included in all

+copies or substantial portions of the Software.

+

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

+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

+AUTHOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN

+ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION

+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

+

+Except as contained in this notice, the name of the author shall not be used in

+advertising or otherwise to promote the sale, use or other dealings in this

+Software without prior written authorization from the author.

+

+

+Copyright © 2002 David Dawes

+

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

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

+to deal in the Software without restriction, including without limitation

+the rights to use, copy, modify, merge, publish, distribute, sublicense,

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

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

+

+The above copyright notice and this permission notice shall be included in

+all copies or substantial portions of the Software.

+

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

+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

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

+THE AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,

+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF

+OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

+SOFTWARE.

+

+Except as contained in this notice, the name of the author(s) shall

+not be used in advertising or otherwise to promote the sale, use or other

+dealings in this Software without prior written authorization from

+the author(s).

+

+

+Copyright (C) 1996-1999 SciTech Software, Inc.

+Copyright (C) David Mosberger-Tang

+Copyright (C) 1999 Egbert Eich

+Copyright (C) 2008 Bart Trojanowski, Symbio Technologies, LLC

+

+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 the authors not be used

+in advertising or publicity pertaining to distribution of the software

+without specific, written prior permission.  The authors makes no

+representations about the suitability of this software for any purpose.

+It is provided "as is" without express or implied warranty.

+

+THE AUTHORS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO

+EVENT SHALL THE AUTHORS BE LIABLE FOR ANY SPECIAL, INDIRECT OR

+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF

+USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR

+OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR

+PERFORMANCE OF THIS SOFTWARE.

+

+

+Copyright 2005-2006 Luc Verhaegen.

+

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

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

+to deal in the Software without restriction, including without limitation

+the rights to use, copy, modify, merge, publish, distribute, sublicense,

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

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

+

+The above copyright notice and this permission notice shall be included in

+all copies or substantial portions of the Software.

+

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

+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

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

+THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR

+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,

+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

+OTHER DEALINGS IN THE SOFTWARE.

+

+

+Copyright 1995 by Robin Cutshaw <robin@XFree86.Org>

+Copyright 2000 by Egbert Eich

+Copyright 2002 by David Dawes

+

+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 names of the above listed copyright holder(s)

+not be used in advertising or publicity pertaining to distribution of

+the software without specific, written prior permission.  The above listed

+copyright holder(s) make(s) no representations about the suitability of this

+software for any purpose.  It is provided "as is" without express or

+implied warranty.

+

+THE ABOVE LISTED COPYRIGHT HOLDER(S) DISCLAIM(S) ALL WARRANTIES WITH REGARD

+TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY

+AND FITNESS, IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE

+LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY

+DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER

+IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING

+OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

+

+

+Copyright 1997-2004 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org

+

+Permission to use, copy, modify, distribute, and sell this software and its

+documentation for any purpose is hereby granted without fee, provided that

+the above copyright notice appear in all copies and that both that copyright

+notice and this permission notice appear in supporting documentation, and

+that the name of Marc Aurele La France not be used in advertising or

+publicity pertaining to distribution of the software without specific,

+written prior permission.  Marc Aurele La France makes no representations

+about the suitability of this software for any purpose.  It is provided

+"as-is" without express or implied warranty.

+

+MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.  IN NO

+EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR

+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,

+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER

+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE

+OF THIS SOFTWARE.

+

+

+Copyright 1990, 1991 by Thomas Roell, Dinkelscherben, Germany

+Copyright 1992 by David Dawes <dawes@XFree86.org>

+Copyright 1992 by Jim Tsillas <jtsilla@damon.ccs.northeastern.edu>

+Copyright 1992 by Rich Murphey <Rich@Rice.edu>

+Copyright 1992 by Robert Baron <Robert.Baron@ernst.mach.cs.cmu.edu>

+Copyright 1992 by Orest Zborowski <obz@eskimo.com>

+Copyright 1993 by Vrije Universiteit, The Netherlands

+Copyright 1993 by David Wexelblat <dwex@XFree86.org>

+Copyright 1994, 1996 by Holger Veit <Holger.Veit@gmd.de>

+Copyright 1997 by Takis Psarogiannakopoulos <takis@dpmms.cam.ac.uk>

+Copyright 1994-2003 by The XFree86 Project, 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 names of the above listed copyright holders

+not be used in advertising or publicity pertaining to distribution of

+the software without specific, written prior permission.  The above listed

+copyright holders make no representations about the suitability of this

+software for any purpose.  It is provided "as is" without express or

+implied warranty.

+

+THE ABOVE LISTED COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD

+TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY

+AND FITNESS, IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDERS BE

+LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY

+DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER

+IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING

+OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

+

+

+Copyright 2001-2005 by J. Kean Johnston <jkj@sco.com>

+

+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 J. Kean Johnston not be used in

+advertising or publicity pertaining to distribution of the software without

+specific, written prior permission.  J. Kean Johnston makes no

+representations about the suitability of this software for any purpose.

+It is provided "as is" without express or implied warranty.

+

+J. KEAN JOHNSTON DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO

+EVENT SHALL J. KEAN JOHNSTON BE LIABLE FOR ANY SPECIAL, INDIRECT OR

+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF

+USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR

+OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR

+PERFORMANCE OF THIS SOFTWARE.

+

+

+Copyright (C) 2000 Jakub Jelinek (jakub@redhat.com)

+

+Permission is hereby granted, free of charge, to any person obtaining a copy

+of this software and associated documentation files (the "Software"), to deal

+in the Software without restriction, including without limitation the rights

+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

+copies of the Software, and to permit persons to whom the Software is

+furnished to do so, subject to the following conditions:

+

+The above copyright notice and this permission notice shall be included in

+all copies or substantial portions of the Software.

+

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

+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

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

+JAKUB JELINEK BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER

+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN

+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

+

+

+Copyright 1997,1998 by UCHIYAMA Yasushi

+

+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 UCHIYAMA Yasushi not be used in

+advertising or publicity pertaining to distribution of the software without

+specific, written prior permission.  UCHIYAMA Yasushi makes no representations

+about the suitability of this software for any purpose.  It is provided

+"as is" without express or implied warranty.

+

+UCHIYAMA YASUSHI DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO

+EVENT SHALL UCHIYAMA YASUSHI BE LIABLE FOR ANY SPECIAL, INDIRECT OR

+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,

+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER

+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR

+PERFORMANCE OF THIS SOFTWARE.

+

+

+Copyright (C) 2000 Keith Packard

+              2004 Eric Anholt

+              2005 Zack Rusin

+

+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 copyright holders not be used in

+advertising or publicity pertaining to distribution of the software without

+specific, written prior permission. Copyright holders make no

+representations about the suitability of this software for any purpose.  It

+is provided "as is" without express or implied warranty.

+

+THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS

+SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND

+FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS 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.

+

+

+(C) Copyright IBM Corporation 2002-2007

+All Rights Reserved.

+

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

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

+to deal in the Software without restriction, including without limitation

+on the rights to use, copy, modify, merge, publish, distribute, sub

+license, and/or sell copies of the Software, and to permit persons to whom

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

+

+The above copyright notice and this permission notice (including the next

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

+Software.

+

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

+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

+FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.  IN NO EVENT SHALL

+THE COPYRIGHT HOLDERS AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM,

+DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR

+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE

+USE OR OTHER DEALINGS IN THE SOFTWARE.

+

+

+Permission to use, copy, modify, distribute, and sell this software and its

+documentation for any purpose is hereby granted without fee, provided that

+this permission notice appear in supporting documentation.  This permission

+notice shall be included in all copies or substantial portions of the

+Software.

+

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

+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE

+AUTHOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN

+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN

+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

+

+

+Copyright © 2007 OpenedHand Ltd

+

+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 OpenedHand Ltd not be used in

+advertising or publicity pertaining to distribution of the software without

+specific, written prior permission. OpenedHand Ltd makes no

+representations about the suitability of this software for any purpose.  It

+is provided "as is" without express or implied warranty.

+

+OpenedHand Ltd DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO

+EVENT SHALL OpenedHand Ltd BE LIABLE FOR ANY SPECIAL, INDIRECT OR

+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,

+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER

+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR

+PERFORMANCE OF THIS SOFTWARE.

+

+

+Copyright (c) 1989, 1990, 1993, 1994

+     The Regents of the University of California.  All rights reserved.

+

+This code is derived from software contributed to Berkeley by

+Chris Torek.

+

+This code is derived from software contributed to Berkeley by

+Michael Rendell of Memorial University of Newfoundland.

+

+Redistribution and use in source and binary forms, with or without

+modification, are permitted provided that the following conditions

+are met:

+ 1. Redistributions of source code must retain the above copyright

+    notice, this list of conditions and the following disclaimer.

+ 2. Redistributions in binary form must reproduce the above copyright

+    notice, this list of conditions and the following disclaimer in the

+    documentation and/or other materials provided with the distribution.

+ 4. Neither the name of the University nor the names of its contributors

+    may be used to endorse or promote products derived from this software

+    without specific prior written permission.

+

+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND

+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE

+ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE

+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL

+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS

+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)

+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT

+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY

+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF

+SUCH DAMAGE.

diff --git a/xorg-server/Xext/Makefile b/xorg-server/Xext/Makefile
index 86a6790f7..1fd048d52 100644
--- a/xorg-server/Xext/Makefile
+++ b/xorg-server/Xext/Makefile
@@ -31,7 +31,7 @@ panoramiXSwap.c
 
 LIBRARY=libxext
 
-INCLUDES += ..\hw\xfree86\dixmods\extmod ..\composite
+INCLUDES += ..\hw\xfree86\dixmods\extmod ..\composite ..\miext\sync
 
 
 
diff --git a/xorg-server/Xext/Makefile.am b/xorg-server/Xext/Makefile.am
index cdf8366c1..8a604c3e7 100644
--- a/xorg-server/Xext/Makefile.am
+++ b/xorg-server/Xext/Makefile.am
@@ -15,7 +15,7 @@ INCLUDES = -I$(top_srcdir)/hw/xfree86/dixmods/extmod
 AM_CFLAGS = $(DIX_CFLAGS)

 

 if XORG

-sdk_HEADERS = xvdix.h xvmcext.h geext.h geint.h shmint.h

+sdk_HEADERS = xvdix.h xvmcext.h geext.h geint.h shmint.h syncsdk.h

 endif

 

 # Sources always included in libXextbuiltin.la & libXext.la

@@ -26,6 +26,7 @@ BUILTIN_SRCS =			\
 	sleepuntil.c		\

 	sleepuntil.h		\

 	sync.c			\

+	syncsdk.h		\

 	syncsrv.h		\

 	xcmisc.c		\

 	xtest.c

diff --git a/xorg-server/Xext/sync.c b/xorg-server/Xext/sync.c
index bf57ce059..d1948d3ed 100644
--- a/xorg-server/Xext/sync.c
+++ b/xorg-server/Xext/sync.c
@@ -59,14 +59,17 @@ PERFORMANCE OF THIS SOFTWARE.
 #include <X11/X.h>

 #include <X11/Xproto.h>

 #include <X11/Xmd.h>

-#include "misc.h"

+#include "scrnintstr.h"

 #include "os.h"

 #include "extnsionst.h"

 #include "dixstruct.h"

+#include "pixmapstr.h"

 #include "resource.h"

 #include "opaque.h"

 #include <X11/extensions/syncproto.h>

 #include "syncsrv.h"

+#include "syncsdk.h"

+#include "protocol-versions.h"

 

 #include <stdio.h>

 #if !defined(WIN32)

@@ -84,11 +87,12 @@ static RESTYPE  RTCounter = 0;
 static RESTYPE  RTAwait;

 static RESTYPE  RTAlarm;

 static RESTYPE  RTAlarmClient;

+static RESTYPE  RTFence;

 static int SyncNumSystemCounters = 0;

 static SyncCounter **SysCounterList = NULL;

 

 #define IsSystemCounter(pCounter) \

-    (pCounter && (pCounter->client == NULL))

+    (pCounter && (pCounter->sync.client == NULL))

 

 /* these are all the alarm attributes that pertain to the alarm's trigger */

 #define XSyncCAAllTrigger \

@@ -106,18 +110,19 @@ static void SyncInitIdleTime(void);
  *  delete and add triggers on this list.

  */

 static void

-SyncDeleteTriggerFromCounter(SyncTrigger *pTrigger)

+SyncDeleteTriggerFromSyncObject(SyncTrigger *pTrigger)

 {

     SyncTriggerList *pCur;

     SyncTriggerList *pPrev;

+    SyncCounter *pCounter;

 

-    /* pCounter needs to be stored in pTrigger before calling here. */

+    /* pSync needs to be stored in pTrigger before calling here. */

 

-    if (!pTrigger->pCounter)

+    if (!pTrigger->pSync)

 	return;

 

     pPrev = NULL;

-    pCur = pTrigger->pCounter->pTriglist;

+    pCur = pTrigger->pSync->pTriglist;

 

     while (pCur)

     {

@@ -126,7 +131,7 @@ SyncDeleteTriggerFromCounter(SyncTrigger *pTrigger)
 	    if (pPrev)

 		pPrev->next = pCur->next;

 	    else

-		pTrigger->pCounter->pTriglist = pCur->next;

+		pTrigger->pSync->pTriglist = pCur->next;

 

 	    free(pCur);

 	    break;

@@ -136,21 +141,30 @@ SyncDeleteTriggerFromCounter(SyncTrigger *pTrigger)
 	pCur = pCur->next;

     }

 

-    if (IsSystemCounter(pTrigger->pCounter))

-	SyncComputeBracketValues(pTrigger->pCounter);

+    if (SYNC_COUNTER == pTrigger->pSync->type)

+    {

+	pCounter = (SyncCounter *)pTrigger->pSync;

+

+	if (IsSystemCounter(pCounter))

+	    SyncComputeBracketValues(pCounter);

+    } else if (SYNC_FENCE == pTrigger->pSync->type) {

+	SyncFence* pFence = (SyncFence*) pTrigger->pSync;

+	pFence->funcs.DeleteTrigger(pTrigger);

+    }

 }

 

 

 static int

-SyncAddTriggerToCounter(SyncTrigger *pTrigger)

+SyncAddTriggerToSyncObject(SyncTrigger *pTrigger)

 {

     SyncTriggerList *pCur;

+    SyncCounter *pCounter;

 

-    if (!pTrigger->pCounter)

+    if (!pTrigger->pSync)

 	return Success;

 

     /* don't do anything if it's already there */

-    for (pCur = pTrigger->pCounter->pTriglist; pCur; pCur = pCur->next)

+    for (pCur = pTrigger->pSync->pTriglist; pCur; pCur = pCur->next)

     {

 	if (pCur->pTrigger == pTrigger)

 	    return Success;

@@ -160,96 +174,137 @@ SyncAddTriggerToCounter(SyncTrigger *pTrigger)
 	return BadAlloc;

 

     pCur->pTrigger = pTrigger;

-    pCur->next = pTrigger->pCounter->pTriglist;

-    pTrigger->pCounter->pTriglist = pCur;

+    pCur->next = pTrigger->pSync->pTriglist;

+    pTrigger->pSync->pTriglist = pCur;

+

+    if (SYNC_COUNTER == pTrigger->pSync->type)

+    {

+	pCounter = (SyncCounter *)pTrigger->pSync;

 

-    if (IsSystemCounter(pTrigger->pCounter))

-	SyncComputeBracketValues(pTrigger->pCounter);

+	if (IsSystemCounter(pCounter))

+	    SyncComputeBracketValues(pCounter);

+    } else if (SYNC_FENCE == pTrigger->pSync->type) {

+	SyncFence* pFence = (SyncFence*) pTrigger->pSync;

+	pFence->funcs.AddTrigger(pTrigger);

+    }

 

     return Success;

 }

 

 

-/*  Below are four possible functions that can be plugged into

- *  pTrigger->CheckTrigger, corresponding to the four possible

- *  test-types.  These functions are called after the counter's

- *  value changes but are also passed the old counter value

- *  so they can inspect both the old and new values.

- *  (PositiveTransition and NegativeTransition need to see both

- *  pieces of information.)  These functions return the truth value

- *  of the trigger.

+/*  Below are five possible functions that can be plugged into

+ *  pTrigger->CheckTrigger for counter sync objects, corresponding to

+ *  the four possible test-types, and the one possible function that

+ *  can be plugged into pTrigger->CheckTrigger for fence sync objects.

+ *  These functions are called after the sync object's state changes

+ *  but are also passed the old state so they can inspect both the old

+ *  and new values.  (PositiveTransition and NegativeTransition need to

+ *  see both pieces of information.)  These functions return the truth

+ *  value of the trigger.

  *

- *  All of them include the condition pTrigger->pCounter == NULL.

- *  This is because the spec says that a trigger with a counter value

+ *  All of them include the condition pTrigger->pSync == NULL.

+ *  This is because the spec says that a trigger with a sync value

  *  of None is always TRUE.

  */

 

 static Bool

 SyncCheckTriggerPositiveComparison(SyncTrigger *pTrigger, CARD64 oldval)

 {

-    return (pTrigger->pCounter == NULL ||

-	    XSyncValueGreaterOrEqual(pTrigger->pCounter->value,

-				     pTrigger->test_value));

+    SyncCounter *pCounter;

+

+    assert(!pTrigger->pSync || (SYNC_COUNTER == pTrigger->pSync->type));

+    pCounter = (SyncCounter *)pTrigger->pSync;

+

+    return (pCounter == NULL ||

+	    XSyncValueGreaterOrEqual(pCounter->value, pTrigger->test_value));

 }

 

 static Bool

 SyncCheckTriggerNegativeComparison(SyncTrigger *pTrigger,  CARD64 oldval)

 {

-    return (pTrigger->pCounter == NULL ||

-	    XSyncValueLessOrEqual(pTrigger->pCounter->value,

-				  pTrigger->test_value));

+    SyncCounter *pCounter;

+

+    assert(!pTrigger->pSync || (SYNC_COUNTER == pTrigger->pSync->type));

+    pCounter = (SyncCounter *)pTrigger->pSync;

+

+    return (pCounter == NULL ||

+	    XSyncValueLessOrEqual(pCounter->value, pTrigger->test_value));

 }

 

 static Bool

 SyncCheckTriggerPositiveTransition(SyncTrigger *pTrigger, CARD64 oldval)

 {

-    return (pTrigger->pCounter == NULL ||

+    SyncCounter *pCounter;

+

+    assert(!pTrigger->pSync || (SYNC_COUNTER == pTrigger->pSync->type));

+    pCounter = (SyncCounter *)pTrigger->pSync;

+

+    return (pCounter == NULL ||

 	    (XSyncValueLessThan(oldval, pTrigger->test_value) &&

-	     XSyncValueGreaterOrEqual(pTrigger->pCounter->value,

-				      pTrigger->test_value)));

+	     XSyncValueGreaterOrEqual(pCounter->value, pTrigger->test_value)));

 }

 

 static Bool

 SyncCheckTriggerNegativeTransition(SyncTrigger *pTrigger, CARD64 oldval)

 {

-    return (pTrigger->pCounter == NULL ||

+    SyncCounter *pCounter;

+

+    assert(!pTrigger->pSync || (SYNC_COUNTER == pTrigger->pSync->type));

+    pCounter = (SyncCounter *)pTrigger->pSync;

+

+    return (pCounter == NULL ||

 	    (XSyncValueGreaterThan(oldval, pTrigger->test_value) &&

-	     XSyncValueLessOrEqual(pTrigger->pCounter->value,

-				   pTrigger->test_value)));

+	     XSyncValueLessOrEqual(pCounter->value, pTrigger->test_value)));

+}

+

+static Bool

+SyncCheckTriggerFence(SyncTrigger *pTrigger, CARD64 unused)

+{

+    SyncFence* pFence = (SyncFence*) pTrigger->pSync;

+    (void)unused;

+

+    return (pFence == NULL ||

+	    pFence->funcs.CheckTriggered(pFence));

 }

 

 static int

-SyncInitTrigger(ClientPtr client, SyncTrigger *pTrigger, XSyncCounter counter,

-		Mask changes)

+SyncInitTrigger(ClientPtr client, SyncTrigger *pTrigger, XID syncObject,

+		RESTYPE resType, Mask changes)

 {

-    SyncCounter *pCounter = pTrigger->pCounter;

+    SyncObject *pSync = pTrigger->pSync;

+    SyncCounter *pCounter = NULL;

     int		rc;

-    Bool	newcounter = FALSE;

+    Bool	newSyncObject = FALSE;

 

     if (changes & XSyncCACounter)

     {

-	if (counter == None)

-	    pCounter = NULL;

-	else if (Success != (rc = dixLookupResourceByType ((pointer *)&pCounter,

-				counter, RTCounter, client, DixReadAccess)))

+	if (syncObject == None)

+	    pSync = NULL;

+	else if (Success != (rc = dixLookupResourceByType ((pointer *)&pSync,

+				syncObject, resType, client, DixReadAccess)))

 	{

-	    client->errorValue = counter;

+	    client->errorValue = syncObject;

 	    return rc;

 	}

-	if (pCounter != pTrigger->pCounter)

+	if (pSync != pTrigger->pSync)

 	{ /* new counter for trigger */

-	    SyncDeleteTriggerFromCounter(pTrigger);

-	    pTrigger->pCounter = pCounter;

-	    newcounter = TRUE;

+	    SyncDeleteTriggerFromSyncObject(pTrigger);

+	    pTrigger->pSync = pSync;

+	    newSyncObject = TRUE;

 	}

     }

 

     /* if system counter, ask it what the current value is */

 

-    if (IsSystemCounter(pCounter))

+    if (pSync && SYNC_COUNTER == pSync->type)

     {

-	(*pCounter->pSysCounterInfo->QueryValue) ((pointer) pCounter,

-						  &pCounter->value);

+	pCounter = (SyncCounter *)pSync;

+

+	if (IsSystemCounter(pCounter))

+	{

+	    (*pCounter->pSysCounterInfo->QueryValue) ((pointer) pCounter,

+						      &pCounter->value);

+	}

     }

 

     if (changes & XSyncCAValueType)

@@ -264,30 +319,38 @@ SyncInitTrigger(ClientPtr client, SyncTrigger *pTrigger, XSyncCounter counter,
 

     if (changes & XSyncCATestType)

     {

-	if (pTrigger->test_type != XSyncPositiveTransition &&

-	    pTrigger->test_type != XSyncNegativeTransition &&

-	    pTrigger->test_type != XSyncPositiveComparison &&

-	    pTrigger->test_type != XSyncNegativeComparison)

+

+	if (pSync && SYNC_FENCE == pSync->type)

 	{

-	    client->errorValue = pTrigger->test_type;

-	    return BadValue;

+	    pTrigger->CheckTrigger = SyncCheckTriggerFence;

 	}

-	/* select appropriate CheckTrigger function */

-

-	switch (pTrigger->test_type)

+	else

 	{

-        case XSyncPositiveTransition:

-	    pTrigger->CheckTrigger = SyncCheckTriggerPositiveTransition;

-	    break;

-        case XSyncNegativeTransition:

-	    pTrigger->CheckTrigger = SyncCheckTriggerNegativeTransition;

-	    break;

-        case XSyncPositiveComparison:

-	    pTrigger->CheckTrigger = SyncCheckTriggerPositiveComparison;

-	    break;

-        case XSyncNegativeComparison:

-	    pTrigger->CheckTrigger = SyncCheckTriggerNegativeComparison;

-	    break;

+	    if (pTrigger->test_type != XSyncPositiveTransition &&

+		pTrigger->test_type != XSyncNegativeTransition &&

+		pTrigger->test_type != XSyncPositiveComparison &&

+		pTrigger->test_type != XSyncNegativeComparison)

+	    {

+		client->errorValue = pTrigger->test_type;

+		return BadValue;

+	    }

+	    /* select appropriate CheckTrigger function */

+

+	    switch (pTrigger->test_type)

+	    {

+	    case XSyncPositiveTransition:

+		pTrigger->CheckTrigger = SyncCheckTriggerPositiveTransition;

+		break;

+	    case XSyncNegativeTransition:

+		pTrigger->CheckTrigger = SyncCheckTriggerNegativeTransition;

+		break;

+	    case XSyncPositiveComparison:

+		pTrigger->CheckTrigger = SyncCheckTriggerPositiveComparison;

+		break;

+	    case XSyncNegativeComparison:

+		pTrigger->CheckTrigger = SyncCheckTriggerNegativeComparison;

+		break;

+	    }

 	}

     }

 

@@ -314,12 +377,12 @@ SyncInitTrigger(ClientPtr client, SyncTrigger *pTrigger, XSyncCounter counter,
     /*  we wait until we're sure there are no errors before registering

      *  a new counter on a trigger

      */

-    if (newcounter)

+    if (newSyncObject)

     {

-	if ((rc = SyncAddTriggerToCounter(pTrigger)) != Success)

+	if ((rc = SyncAddTriggerToSyncObject(pTrigger)) != Success)

 	    return rc;

     }

-    else if (IsSystemCounter(pCounter))

+    else if (pCounter && IsSystemCounter(pCounter))

     {

 	SyncComputeBracketValues(pCounter);

     }

@@ -337,16 +400,21 @@ SyncSendAlarmNotifyEvents(SyncAlarm *pAlarm)
     SyncAlarmClientList *pcl;

     xSyncAlarmNotifyEvent ane;

     SyncTrigger *pTrigger = &pAlarm->trigger;

+    SyncCounter *pCounter;

+

+    assert(!pTrigger->pSync || (SYNC_COUNTER == pTrigger->pSync->type));

+

+    pCounter = (SyncCounter *)pTrigger->pSync;

 

     UpdateCurrentTime();

 

     ane.type = SyncEventBase + XSyncAlarmNotify;

     ane.kind = XSyncAlarmNotify;

     ane.alarm = pAlarm->alarm_id;

-    if (pTrigger->pCounter)

+    if (pTrigger->pSync && SYNC_COUNTER == pTrigger->pSync->type)

     {

-	ane.counter_value_hi = XSyncValueHigh32(pTrigger->pCounter->value);

-	ane.counter_value_lo = XSyncValueLow32(pTrigger->pCounter->value);

+	ane.counter_value_hi = XSyncValueHigh32(pCounter->value);

+	ane.counter_value_lo = XSyncValueLow32(pCounter->value);

     }

     else

     { /* XXX what else can we do if there's no counter? */

@@ -389,14 +457,25 @@ SyncSendCounterNotifyEvents(ClientPtr client, SyncAwait **ppAwait,
 	SyncTrigger *pTrigger = &(*ppAwait)->trigger;

 	pev->type = SyncEventBase + XSyncCounterNotify;

 	pev->kind = XSyncCounterNotify;

-	pev->counter = pTrigger->pCounter->id;

+	pev->counter = pTrigger->pSync->id;

 	pev->wait_value_lo = XSyncValueLow32(pTrigger->test_value);

 	pev->wait_value_hi = XSyncValueHigh32(pTrigger->test_value);

-	pev->counter_value_lo = XSyncValueLow32(pTrigger->pCounter->value);

-	pev->counter_value_hi = XSyncValueHigh32(pTrigger->pCounter->value);

+	if (SYNC_COUNTER == pTrigger->pSync->type)

+	{

+	    SyncCounter *pCounter = (SyncCounter *)pTrigger->pSync;

+

+	    pev->counter_value_lo = XSyncValueLow32(pCounter->value);

+	    pev->counter_value_hi = XSyncValueHigh32(pCounter->value);

+	}

+	else

+	{

+	    pev->counter_value_lo = 0;

+	    pev->counter_value_hi = 0;

+	}

+

 	pev->time = currentTime.milliseconds;

 	pev->count = num_events - i - 1; /* events remaining */

-	pev->destroyed = pTrigger->pCounter->beingDestroyed;

+	pev->destroyed = pTrigger->pSync->beingDestroyed;

     }

     /* swapping will be taken care of by this */

     WriteEventsToClient(client, num_events, (xEvent *)pEvents);

@@ -414,7 +493,7 @@ SyncAlarmCounterDestroyed(SyncTrigger *pTrigger)
 

     pAlarm->state = XSyncAlarmInactive;

     SyncSendAlarmNotifyEvents(pAlarm);

-    pTrigger->pCounter = NULL;

+    pTrigger->pSync = NULL;

 }

 

 

@@ -425,8 +504,12 @@ static void
 SyncAlarmTriggerFired(SyncTrigger *pTrigger)

 {

     SyncAlarm *pAlarm = (SyncAlarm *)pTrigger;

+    SyncCounter *pCounter;

     CARD64 new_test_value;

 

+    assert(!pTrigger->pSync || (SYNC_COUNTER == pTrigger->pSync->type));

+    pCounter = (SyncCounter *)pTrigger->pSync;

+

     /* no need to check alarm unless it's active */

     if (pAlarm->state != XSyncAlarmActive)

 	return;

@@ -436,7 +519,7 @@ SyncAlarmTriggerFired(SyncTrigger *pTrigger)
      *    no change is made to value (test-value) and the alarm

      *    state is changed to Inactive before the event is generated."

      */

-    if (pAlarm->trigger.pCounter == NULL

+    if (pCounter == NULL

 	|| (XSyncValueIsZero(pAlarm->delta)

 	    && (pAlarm->trigger.test_type == XSyncPositiveComparison

 		|| pAlarm->trigger.test_type == XSyncNegativeComparison)))

@@ -449,6 +532,10 @@ SyncAlarmTriggerFired(SyncTrigger *pTrigger)
 	Bool overflow;

 	CARD64 oldvalue;

 	SyncTrigger *paTrigger = &pAlarm->trigger;

+	SyncCounter *paCounter;

+

+	assert(!paTrigger->pSync || (SYNC_COUNTER == paTrigger->pSync->type));

+	paCounter = (SyncCounter *)pTrigger->pSync;

 

 	/* "The alarm is updated by repeatedly adding delta to the

 	 *  value of the trigger and re-initializing it until it

@@ -464,7 +551,7 @@ SyncAlarmTriggerFired(SyncTrigger *pTrigger)
 			  pAlarm->delta, &overflow);

 	} while (!overflow &&

 	      (*paTrigger->CheckTrigger)(paTrigger,

-					paTrigger->pCounter->value));

+					paCounter->value));

 

 	new_test_value = paTrigger->test_value;

 	paTrigger->test_value = oldvalue;

@@ -531,46 +618,51 @@ SyncAwaitTriggerFired(SyncTrigger *pTrigger)
 	 *  always generated if the counter for one of the triggers is

 	 *  destroyed."

 	 */

-	if (pAwait->trigger.pCounter->beingDestroyed)

+	if (pAwait->trigger.pSync->beingDestroyed)

 	{

 	    ppAwait[num_events++] = pAwait;

 	    continue;

 	}

+	

+	if (SYNC_COUNTER == pAwait->trigger.pSync->type)

+	{

+	    SyncCounter *pCounter = (SyncCounter *) pAwait->trigger.pSync;

 

-	/* "The difference between the counter and the test value is

-	 *  calculated by subtracting the test value from the value of

-	 *  the counter."

-	 */

-	XSyncValueSubtract(&diff, pAwait->trigger.pCounter->value,

-			   pAwait->trigger.test_value, &overflow);

+	    /* "The difference between the counter and the test value is

+	     *  calculated by subtracting the test value from the value of

+	     *  the counter."

+	     */

+	    XSyncValueSubtract(&diff, pCounter->value,

+			       pAwait->trigger.test_value, &overflow);

 

-	/* "If the difference lies outside the range for an INT64, an

-	 *  event is not generated."

-	 */

-	if (overflow)

-	    continue;

-	diffgreater = XSyncValueGreaterThan(diff, pAwait->event_threshold);

-	diffequal   = XSyncValueEqual(diff, pAwait->event_threshold);

-

-	/* "If the test-type is PositiveTransition or

-	 *  PositiveComparison, a CounterNotify event is generated if

-	 *  the difference is at least event-threshold. If the test-type

-	 *  is NegativeTransition or NegativeComparison, a CounterNotify

-	 *  event is generated if the difference is at most

-	 *  event-threshold."

-	 */

+	    /* "If the difference lies outside the range for an INT64, an

+	     *  event is not generated."

+	     */

+	    if (overflow)

+		continue;

+	    diffgreater = XSyncValueGreaterThan(diff, pAwait->event_threshold);

+	    diffequal   = XSyncValueEqual(diff, pAwait->event_threshold);

+

+	    /* "If the test-type is PositiveTransition or

+	     *  PositiveComparison, a CounterNotify event is generated if

+	     *  the difference is at least event-threshold. If the test-type

+	     *  is NegativeTransition or NegativeComparison, a CounterNotify

+	     *  event is generated if the difference is at most

+	     *  event-threshold."

+	     */

 

-	if ( ((pAwait->trigger.test_type == XSyncPositiveComparison ||

-	       pAwait->trigger.test_type == XSyncPositiveTransition)

-	       && (diffgreater || diffequal))

-	     ||

-	     ((pAwait->trigger.test_type == XSyncNegativeComparison ||

-	       pAwait->trigger.test_type == XSyncNegativeTransition)

-	      && (!diffgreater) /* less or equal */

-	      )

-	   )

-	{

-	    ppAwait[num_events++] = pAwait;

+	    if ( ((pAwait->trigger.test_type == XSyncPositiveComparison ||

+		   pAwait->trigger.test_type == XSyncPositiveTransition)

+		  && (diffgreater || diffequal))

+		 ||

+		 ((pAwait->trigger.test_type == XSyncNegativeComparison ||

+		   pAwait->trigger.test_type == XSyncNegativeTransition)

+		  && (!diffgreater) /* less or equal */

+		 )

+	       )

+	    {

+		ppAwait[num_events++] = pAwait;

+	    }

 	}

     }

     if (num_events)

@@ -599,7 +691,7 @@ SyncChangeCounter(SyncCounter *pCounter, CARD64 newval)
     pCounter->value = newval;

 

     /* run through triggers to see if any become true */

-    for (ptl = pCounter->pTriglist; ptl; ptl = pnext)

+    for (ptl = pCounter->sync.pTriglist; ptl; ptl = pnext)

     {

 	pnext = ptl->next;

 	if ((*ptl->pTrigger->CheckTrigger)(ptl->pTrigger, oldval))

@@ -691,7 +783,8 @@ SyncChangeAlarmAttributes(ClientPtr client, SyncAlarm *pAlarm, Mask mask,
     XSyncCounter   counter;

     Mask	   origmask = mask;

 

-    counter = pAlarm->trigger.pCounter ? pAlarm->trigger.pCounter->id : None;

+    counter =

+	pAlarm->trigger.pSync ? pAlarm->trigger.pSync->id : None;

 

     while (mask)

     {

@@ -771,7 +864,7 @@ SyncChangeAlarmAttributes(ClientPtr client, SyncAlarm *pAlarm, Mask mask,
     }

 

     /* postpone this until now, when we're sure nothing else can go wrong */

-    if ((status = SyncInitTrigger(client, &pAlarm->trigger, counter,

+    if ((status = SyncInitTrigger(client, &pAlarm->trigger, counter, RTCounter,

 			     origmask & XSyncCAAllTrigger)) != Success)

 	return status;

 

@@ -780,26 +873,63 @@ SyncChangeAlarmAttributes(ClientPtr client, SyncAlarm *pAlarm, Mask mask,
     return Success;

 }

 

-

-static SyncCounter *

-SyncCreateCounter(ClientPtr client, XSyncCounter id, CARD64 initialvalue)

+static SyncObject *

+SyncCreate(ClientPtr client, XID id, unsigned char type)

 {

-    SyncCounter *pCounter;

+    SyncObject *pSync;

+    RESTYPE resType;

 

-    if (!(pCounter = malloc(sizeof(SyncCounter))))

+    switch (type) {

+    case SYNC_COUNTER:

+	resType = RTCounter;

+	pSync = malloc(sizeof(SyncCounter));

+	break;

+    case SYNC_FENCE:

+	resType = RTFence;

+	pSync = dixAllocateObjectWithPrivates(SyncFence,

+					      PRIVATE_SYNC_FENCE);

+	break;

+    default:

+	return NULL;

+    }

+

+    if (!pSync)

 	return NULL;

 

-    if (!AddResource(id, RTCounter, (pointer) pCounter))

+    if (!AddResource(id, resType, (pointer) pSync))

     {

-	free(pCounter);

+	switch (type) {

+	case SYNC_FENCE:

+	    dixFreeObjectWithPrivates((SyncFence *)pSync, PRIVATE_SYNC_FENCE);

+	    break;

+	default:

+	    free(pSync);

+	}

+

 	return NULL;

     }

 

-    pCounter->client = client;

-    pCounter->id = id;

+    pSync->client = client;

+    pSync->id = id;

+    pSync->pTriglist = NULL;

+    pSync->beingDestroyed = FALSE;

+    pSync->type = type;

+

+    return pSync;

+}

+

+

+static SyncCounter *

+SyncCreateCounter(ClientPtr client, XSyncCounter id, CARD64 initialvalue)

+{

+    SyncCounter *pCounter;

+

+    if (!(pCounter = (SyncCounter *)SyncCreate(client,

+					       id,

+					       SYNC_COUNTER)))

+	return NULL;

+

     pCounter->value = initialvalue;

-    pCounter->pTriglist = NULL;

-    pCounter->beingDestroyed = FALSE;

     pCounter->pSysCounterInfo = NULL;

     return pCounter;

 }

@@ -851,7 +981,7 @@ SyncCreateSystemCounter(
 	psci = malloc(sizeof(SysCounterInfo));

 	if (!psci)

 	{

-	    FreeResource(pCounter->id, RT_NONE);

+	    FreeResource(pCounter->sync.id, RT_NONE);

 	    return pCounter;

 	}

 	pCounter->pSysCounterInfo = psci;

@@ -871,7 +1001,7 @@ void
 SyncDestroySystemCounter(pointer pSysCounter)

 {

     SyncCounter *pCounter = (SyncCounter *)pSysCounter;

-    FreeResource(pCounter->id, RT_NONE);

+    FreeResource(pCounter->sync.id, RT_NONE);

 }

 

 static void

@@ -895,7 +1025,7 @@ SyncComputeBracketValues(SyncCounter *pCounter)
     XSyncMaxValue(&psci->bracket_greater);

     XSyncMinValue(&psci->bracket_less);

 

-    for (pCur = pCounter->pTriglist; pCur; pCur = pCur->next)

+    for (pCur = pCounter->sync.pTriglist; pCur; pCur = pCur->next)

     {

 	pTrigger = pCur->pTrigger;

 	

@@ -968,7 +1098,7 @@ FreeAlarm(void *addr, XID id)
     while (pAlarm->pEventClients)

 	FreeResource(pAlarm->pEventClients->delete_id, RT_NONE);

 

-    SyncDeleteTriggerFromCounter(&pAlarm->trigger);

+    SyncDeleteTriggerFromSyncObject(&pAlarm->trigger);

 

     free(pAlarm);

     return Success;

@@ -985,9 +1115,9 @@ FreeCounter(void *env, XID id)
     SyncCounter     *pCounter = (SyncCounter *) env;

     SyncTriggerList *ptl, *pnext;

 

-    pCounter->beingDestroyed = TRUE;

+    pCounter->sync.beingDestroyed = TRUE;

     /* tell all the counter's triggers that the counter has been destroyed */

-    for (ptl = pCounter->pTriglist; ptl; ptl = pnext)

+    for (ptl = pCounter->sync.pTriglist; ptl; ptl = pnext)

     {

 	(*ptl->pTrigger->CounterDestroyed)(ptl->pTrigger);

 	pnext = ptl->next;

@@ -1046,9 +1176,9 @@ FreeAwait(void *addr, XID id)
 	/* If the counter is being destroyed, FreeCounter will delete

 	 * the trigger list itself, so don't do it here.

 	 */

-	SyncCounter *pCounter = pAwait->trigger.pCounter;

-	if (pCounter && !pCounter->beingDestroyed)

-	    SyncDeleteTriggerFromCounter(&pAwait->trigger);

+	SyncObject *pSync = pAwait->trigger.pSync;

+	if (pSync && !pSync->beingDestroyed)

+	    SyncDeleteTriggerFromSyncObject(&pAwait->trigger);

     }

     free(pAwaitUnion);

     return Success;

@@ -1103,8 +1233,8 @@ ProcSyncInitialize(ClientPtr client)
     memset(&rep, 0, sizeof(xSyncInitializeReply));

     rep.type = X_Reply;

     rep.sequenceNumber = client->sequence;

-    rep.majorVersion = SYNC_MAJOR_VERSION;

-    rep.minorVersion = SYNC_MINOR_VERSION;

+    rep.majorVersion = SERVER_SYNC_MAJOR_VERSION;

+    rep.minorVersion = SERVER_SYNC_MINOR_VERSION;

     rep.length = 0;

 

     if (client->swapped)

@@ -1161,7 +1291,7 @@ ProcSyncListSystemCounters(ClientPtr client)
 	char *pname_in_reply;

 	SysCounterInfo *psci = SysCounterList[i]->pSysCounterInfo;

 

-	walklist->counter = SysCounterList[i]->id;

+	walklist->counter = SysCounterList[i]->sync.id;

 	walklist->resolution_hi = XSyncValueHigh32(psci->resolution);

 	walklist->resolution_lo = XSyncValueLow32(psci->resolution);

 	namelen = strlen(psci->name);

@@ -1374,10 +1504,70 @@ ProcSyncDestroyCounter(ClientPtr client)
 	client->errorValue = stuff->counter;

 	return BadAccess;

     }

-    FreeResource(pCounter->id, RT_NONE);

+    FreeResource(pCounter->sync.id, RT_NONE);

     return Success;

 }

 

+static SyncAwaitUnion*

+SyncAwaitPrologue(ClientPtr client, int items)

+{

+    SyncAwaitUnion *pAwaitUnion;

+

+    /*  all the memory for the entire await list is allocated

+     *  here in one chunk

+     */

+    pAwaitUnion = malloc((items+1) * sizeof(SyncAwaitUnion));

+    if (!pAwaitUnion)

+	return NULL;

+

+    /* first item is the header, remainder are real wait conditions */

+

+    pAwaitUnion->header.delete_id = FakeClientID(client->index);

+    if (!AddResource(pAwaitUnion->header.delete_id, RTAwait, pAwaitUnion))

+    {

+	free(pAwaitUnion);

+	return NULL;

+    }

+

+    pAwaitUnion->header.client = client;

+    pAwaitUnion->header.num_waitconditions = 0;

+

+    return pAwaitUnion;

+}

+

+static void

+SyncAwaitEpilogue(ClientPtr client, int items, SyncAwaitUnion *pAwaitUnion)

+{

+    SyncAwait *pAwait;

+    int i;

+

+    IgnoreClient(client);

+

+    /* see if any of the triggers are already true */

+

+    pAwait = &(pAwaitUnion+1)->await; /* skip over header */

+    for (i = 0; i < items; i++, pAwait++)

+    {

+	CARD64 value;

+

+	/*  don't have to worry about NULL counters because the request

+	 *  errors before we get here out if they occur

+	 */

+	switch (pAwait->trigger.pSync->type) {

+	case SYNC_COUNTER:

+	    value = ((SyncCounter *)pAwait->trigger.pSync)->value;

+	    break;

+	default:

+	    XSyncIntToValue(&value, 0);

+	}

+

+	if ((*pAwait->trigger.CheckTrigger)(&pAwait->trigger, value))

+	{

+	    (*pAwait->trigger.TriggerFired)(&pAwait->trigger);

+	    break; /* once is enough */

+	}

+    }

+}

 

 /*

  * ** Await

@@ -1409,28 +1599,12 @@ ProcSyncAwait(ClientPtr client)
 	return BadValue;

     }

 

-    pProtocolWaitConds = (xSyncWaitCondition *) & stuff[1];

-

-    /*  all the memory for the entire await list is allocated

-     *  here in one chunk

-     */

-    pAwaitUnion = malloc((items+1) * sizeof(SyncAwaitUnion));

-    if (!pAwaitUnion)

-	return BadAlloc;

-

-    /* first item is the header, remainder are real wait conditions */

-

-    pAwaitUnion->header.delete_id = FakeClientID(client->index);

-    if (!AddResource(pAwaitUnion->header.delete_id, RTAwait, pAwaitUnion))

-    {

-	free(pAwaitUnion);

+    if (!(pAwaitUnion = SyncAwaitPrologue(client, items)))

 	return BadAlloc;

-    }

 

     /* don't need to do any more memory allocation for this request! */

 

-    pAwaitUnion->header.client = client;

-    pAwaitUnion->header.num_waitconditions = 0;

+    pProtocolWaitConds = (xSyncWaitCondition *) & stuff[1];

 

     pAwait = &(pAwaitUnion+1)->await; /* skip over header */

     for (i = 0; i < items; i++, pProtocolWaitConds++, pAwait++)

@@ -1438,7 +1612,7 @@ ProcSyncAwait(ClientPtr client)
 	if (pProtocolWaitConds->counter == None) /* XXX protocol change */

 	{

 	    /*  this should take care of removing any triggers created by

-	     *  this request that have already been registered on counters

+	     *  this request that have already been registered on sync objects

 	     */

 	    FreeResource(pAwaitUnion->header.delete_id, RT_NONE);

 	    client->errorValue = pProtocolWaitConds->counter;

@@ -1446,7 +1620,7 @@ ProcSyncAwait(ClientPtr client)
 	}

 

 	/* sanity checks are in SyncInitTrigger */

-	pAwait->trigger.pCounter = NULL;

+	pAwait->trigger.pSync = NULL;

 	pAwait->trigger.value_type = pProtocolWaitConds->value_type;

 	XSyncIntsToValue(&pAwait->trigger.wait_value,

 			 pProtocolWaitConds->wait_value_lo,

@@ -1454,11 +1628,12 @@ ProcSyncAwait(ClientPtr client)
 	pAwait->trigger.test_type = pProtocolWaitConds->test_type;

 

 	status = SyncInitTrigger(client, &pAwait->trigger,

-			 pProtocolWaitConds->counter, XSyncCAAllTrigger);

+				 pProtocolWaitConds->counter, RTCounter,

+				 XSyncCAAllTrigger);

 	if (status != Success)

 	{

 	    /*  this should take care of removing any triggers created by

-	     *  this request that have already been registered on counters

+	     *  this request that have already been registered on sync objects

 	     */

 	    FreeResource(pAwaitUnion->header.delete_id, RT_NONE);

 	    return status;

@@ -1473,23 +1648,8 @@ ProcSyncAwait(ClientPtr client)
 	pAwaitUnion->header.num_waitconditions++;

     }

 

-    IgnoreClient(client);

-

-    /* see if any of the triggers are already true */

+    SyncAwaitEpilogue(client, items, pAwaitUnion);

 

-    pAwait = &(pAwaitUnion+1)->await; /* skip over header */

-    for (i = 0; i < items; i++, pAwait++)

-    {

-	/*  don't have to worry about NULL counters because the request

-	 *  errors before we get here out if they occur

-	 */

-	if ((*pAwait->trigger.CheckTrigger)(&pAwait->trigger,

-					    pAwait->trigger.pCounter->value))

-	{

-	    (*pAwait->trigger.TriggerFired)(&pAwait->trigger);

-	    break; /* once is enough */

-	}

-    }

     return Success;

 }

 

@@ -1569,13 +1729,14 @@ ProcSyncCreateAlarm(ClientPtr client)
     /* set up defaults */

 

     pTrigger = &pAlarm->trigger;

-    pTrigger->pCounter = NULL;

+    pTrigger->pSync = NULL;

     pTrigger->value_type = XSyncAbsolute;

     XSyncIntToValue(&pTrigger->wait_value, 0L);

     pTrigger->test_type = XSyncPositiveComparison;

     pTrigger->TriggerFired = SyncAlarmTriggerFired;

     pTrigger->CounterDestroyed = SyncAlarmCounterDestroyed;

-    status = SyncInitTrigger(client, pTrigger, None, XSyncCAAllTrigger);

+    status = SyncInitTrigger(client, pTrigger, None, RTCounter,

+			     XSyncCAAllTrigger);

     if (status != Success)

     {

 	free(pAlarm);

@@ -1606,13 +1767,19 @@ ProcSyncCreateAlarm(ClientPtr client)
      *  in CreateAlarm and sets alarm state to Inactive.

      */

 

-    if (!pTrigger->pCounter)

+    if (!pTrigger->pSync)

     {

 	pAlarm->state = XSyncAlarmInactive; /* XXX protocol change */

     }

-    else if ((*pTrigger->CheckTrigger)(pTrigger, pTrigger->pCounter->value))

+    else

     {

-	(*pTrigger->TriggerFired)(pTrigger);

+	SyncCounter *pCounter;

+

+	assert(SYNC_COUNTER == pTrigger->pSync->type);

+	pCounter = (SyncCounter *)pTrigger->pSync;

+

+	if ((*pTrigger->CheckTrigger)(pTrigger, pCounter->value))

+	    (*pTrigger->TriggerFired)(pTrigger);

     }

 

     return Success;

@@ -1626,6 +1793,7 @@ ProcSyncChangeAlarm(ClientPtr client)
 {

     REQUEST(xSyncChangeAlarmReq);

     SyncAlarm   *pAlarm;

+    SyncCounter *pCounter = NULL;

     long        vmask;

     int         len, status;

 

@@ -1646,13 +1814,18 @@ ProcSyncChangeAlarm(ClientPtr client)
 					    (CARD32 *)&stuff[1])) != Success)

 	return status;

 

+    if (pAlarm->trigger.pSync)

+    {

+	assert(SYNC_COUNTER == pAlarm->trigger.pSync->type);

+	pCounter = (SyncCounter *)pAlarm->trigger.pSync;

+    }

+

     /*  see if alarm already triggered.  NULL counter WILL trigger

      *  in ChangeAlarm.

      */

 

-    if (!pAlarm->trigger.pCounter ||

-	(*pAlarm->trigger.CheckTrigger)(&pAlarm->trigger,

-					pAlarm->trigger.pCounter->value))

+    if (!pCounter ||

+	(*pAlarm->trigger.CheckTrigger)(&pAlarm->trigger, pCounter->value))

     {

 	(*pAlarm->trigger.TriggerFired)(&pAlarm->trigger);

     }

@@ -1680,7 +1853,7 @@ ProcSyncQueryAlarm(ClientPtr client)
     rep.sequenceNumber = client->sequence;

 

     pTrigger = &pAlarm->trigger;

-    rep.counter = (pTrigger->pCounter) ? pTrigger->pCounter->id : None;

+    rep.counter = (pTrigger->pSync) ? pTrigger->pSync->id : None;

 

 #if 0 /* XXX unclear what to do, depends on whether relative value-types

        * are "consumed" immediately and are considered absolute from then

@@ -1736,6 +1909,228 @@ ProcSyncDestroyAlarm(ClientPtr client)
     return Success;

 }

 

+static int

+ProcSyncCreateFence(ClientPtr client)

+{

+    REQUEST(xSyncCreateFenceReq);

+    DrawablePtr pDraw;

+    SyncFence *pFence;

+    int rc;

+

+    REQUEST_SIZE_MATCH(xSyncCreateFenceReq);

+

+    rc = dixLookupDrawable(&pDraw, stuff->d, client, M_ANY, DixGetAttrAccess);

+    if (rc != Success)

+	return rc;

+

+    LEGAL_NEW_RESOURCE(stuff->fid, client);

+

+    if (!(pFence = (SyncFence *)SyncCreate(client,

+					   stuff->fid,

+					   SYNC_FENCE)))

+	return BadAlloc;

+

+    miSyncInitFence(pDraw->pScreen, pFence, stuff->initially_triggered);

+

+    return client->noClientException;

+}

+

+static int

+FreeFence(void *obj, XID id)

+{

+    SyncFence *pFence = (SyncFence *) obj;

+

+    miSyncDestroyFence(pFence);

+

+    return Success;

+}

+

+int SyncVerifyFence(SyncFence **ppSyncFence, XID fid,

+		    ClientPtr client, Mask mode)

+{

+    int rc = dixLookupResourceByType((pointer *)ppSyncFence, fid, RTFence,

+				     client, mode);

+

+    if (rc != Success)

+	client->errorValue = fid;

+

+    return rc;

+}

+

+static int

+ProcSyncTriggerFence(ClientPtr client)

+{

+    REQUEST(xSyncTriggerFenceReq);

+    SyncFence *pFence;

+    int rc;

+

+    REQUEST_SIZE_MATCH(xSyncTriggerFenceReq);

+

+    rc = dixLookupResourceByType((pointer *)&pFence, stuff->fid, RTFence,

+				 client, DixWriteAccess);

+    if (rc != Success)

+	return rc;

+

+    miSyncTriggerFence(pFence);

+

+    return client->noClientException;

+}

+

+static int

+ProcSyncResetFence(ClientPtr client)

+{

+    REQUEST(xSyncResetFenceReq);

+    SyncFence *pFence;

+    int rc;

+

+    REQUEST_SIZE_MATCH(xSyncResetFenceReq);

+

+    rc = dixLookupResourceByType((pointer *)&pFence, stuff->fid, RTFence,

+				 client, DixWriteAccess);

+    if (rc != Success)

+	return rc;

+

+    if (pFence->funcs.CheckTriggered(pFence) != TRUE)

+	return BadMatch;

+

+    pFence->funcs.Reset(pFence);

+

+    return client->noClientException;

+}

+

+static int

+ProcSyncDestroyFence(ClientPtr client)

+{

+    REQUEST(xSyncDestroyFenceReq);

+    SyncFence *pFence;

+    int rc;

+

+    REQUEST_SIZE_MATCH(xSyncDestroyFenceReq);

+

+    rc = dixLookupResourceByType((pointer *)&pFence, stuff->fid, RTFence,

+				 client, DixDestroyAccess);

+    if (rc != Success)

+	return rc;

+

+    FreeResource(stuff->fid, RT_NONE);

+    return client->noClientException;

+}

+

+static int

+ProcSyncQueryFence(ClientPtr client)

+{

+    REQUEST(xSyncQueryFenceReq);

+    xSyncQueryFenceReply rep;

+    SyncFence *pFence;

+    int rc;

+

+    REQUEST_SIZE_MATCH(xSyncQueryFenceReq);

+

+    rc = dixLookupResourceByType((pointer *)&pFence, stuff->fid,

+				 RTFence, client, DixReadAccess);

+    if (rc != Success)

+	return rc;

+

+    rep.type = X_Reply;

+    rep.length = 0;

+    rep.sequenceNumber = client->sequence;

+

+    rep.triggered = pFence->funcs.CheckTriggered(pFence);

+

+    if (client->swapped)

+    {

+	char n;

+	swaps(&rep.sequenceNumber, n);

+	swapl(&rep.length, n);

+    }

+

+    WriteToClient(client, sizeof(xSyncQueryFenceReply), (char *) &rep);

+    return client->noClientException;

+}

+

+static int

+ProcSyncAwaitFence(ClientPtr client)

+{

+    REQUEST(xSyncAwaitFenceReq);

+    SyncAwaitUnion *pAwaitUnion;

+    SyncAwait *pAwait;

+    /* Use CARD32 rather than XSyncFence because XIDs are hard-coded to

+     * CARD32 in protocol definitions */

+    CARD32 *pProtocolFences;

+    int status;

+    int len;

+    int items;

+    int i;

+

+    REQUEST_AT_LEAST_SIZE(xSyncAwaitFenceReq);

+

+    len = client->req_len << 2;

+    len -= sz_xSyncAwaitFenceReq;

+    items = len / sizeof(CARD32);

+

+    if (items * sizeof(CARD32) != len)

+    {

+	return BadLength;

+    }

+    if (items == 0)

+    {

+	client->errorValue = items; /* XXX protocol change */

+	return BadValue;

+    }

+

+    if (!(pAwaitUnion = SyncAwaitPrologue(client, items)))

+	return BadAlloc;

+

+    /* don't need to do any more memory allocation for this request! */

+

+    pProtocolFences = (CARD32 *) & stuff[1];

+

+    pAwait = &(pAwaitUnion+1)->await; /* skip over header */

+    for (i = 0; i < items; i++, pProtocolFences++, pAwait++)

+    {

+	if (*pProtocolFences == None) /* XXX protocol change */

+	{

+	    /*  this should take care of removing any triggers created by

+	     *  this request that have already been registered on sync objects

+	     */

+	    FreeResource(pAwaitUnion->header.delete_id, RT_NONE);

+	    client->errorValue = *pProtocolFences;

+	    return SyncErrorBase + XSyncBadCounter;

+	}

+

+	pAwait->trigger.pSync = NULL;

+	/* Provide acceptable values for these unused fields to

+	 * satisfy SyncInitTrigger's validation logic

+	 */

+	pAwait->trigger.value_type = XSyncAbsolute;

+	XSyncIntToValue(&pAwait->trigger.wait_value, 0);

+	pAwait->trigger.test_type = 0;

+

+	status = SyncInitTrigger(client, &pAwait->trigger,

+				 *pProtocolFences, RTFence,

+				 XSyncCAAllTrigger);

+	if (status != Success)

+	{

+	    /*  this should take care of removing any triggers created by

+	     *  this request that have already been registered on sync objects

+	     */

+	    FreeResource(pAwaitUnion->header.delete_id, RT_NONE);

+	    return status;

+	}

+	/* this is not a mistake -- same function works for both cases */

+	pAwait->trigger.TriggerFired = SyncAwaitTriggerFired;

+	pAwait->trigger.CounterDestroyed = SyncAwaitTriggerFired;

+	/* event_threshold is unused for fence syncs */

+	XSyncIntToValue(&pAwait->event_threshold, 0);

+	pAwait->pHeader = &pAwaitUnion->header;

+	pAwaitUnion->header.num_waitconditions++;

+    }

+

+    SyncAwaitEpilogue(client, items, pAwaitUnion);

+

+    return client->noClientException;

+}

+

 /*

  * ** Given an extension request, call the appropriate request procedure

  */

@@ -1774,6 +2169,18 @@ ProcSyncDispatch(ClientPtr client)
 	return ProcSyncSetPriority(client);

       case X_SyncGetPriority:

 	return ProcSyncGetPriority(client);

+      case X_SyncCreateFence:

+	return ProcSyncCreateFence(client);

+      case X_SyncTriggerFence:

+	return ProcSyncTriggerFence(client);

+      case X_SyncResetFence:

+	return ProcSyncResetFence(client);

+      case X_SyncDestroyFence:

+	return ProcSyncDestroyFence(client);

+      case X_SyncQueryFence:

+	return ProcSyncQueryFence(client);

+      case X_SyncAwaitFence:

+	return ProcSyncAwaitFence(client);

       default:

 	return BadRequest;

     }

@@ -1973,6 +2380,83 @@ SProcSyncGetPriority(ClientPtr client)
     return ProcSyncGetPriority(client);

 }

 

+static int

+SProcSyncCreateFence(ClientPtr client)

+{

+    REQUEST(xSyncCreateFenceReq);

+    char n;

+

+    swaps(&stuff->length, n);

+    REQUEST_SIZE_MATCH (xSyncCreateFenceReq);

+    swapl(&stuff->fid, n);

+

+    return ProcSyncCreateFence(client);

+}

+

+static int

+SProcSyncTriggerFence(ClientPtr client)

+{

+    REQUEST(xSyncTriggerFenceReq);

+    char n;

+

+    swaps(&stuff->length, n);

+    REQUEST_SIZE_MATCH (xSyncTriggerFenceReq);

+    swapl(&stuff->fid, n);

+

+    return ProcSyncTriggerFence(client);

+}

+

+static int

+SProcSyncResetFence(ClientPtr client)

+{

+    REQUEST(xSyncResetFenceReq);

+    char n;

+

+    swaps(&stuff->length, n);

+    REQUEST_SIZE_MATCH (xSyncResetFenceReq);

+    swapl(&stuff->fid, n);

+

+    return ProcSyncResetFence(client);

+}

+

+static int

+SProcSyncDestroyFence(ClientPtr client)

+{

+    REQUEST(xSyncDestroyFenceReq);

+    char n;

+

+    swaps(&stuff->length, n);

+    REQUEST_SIZE_MATCH (xSyncDestroyFenceReq);

+    swapl(&stuff->fid, n);

+

+    return ProcSyncDestroyFence(client);

+}

+

+static int

+SProcSyncQueryFence(ClientPtr client)

+{

+    REQUEST(xSyncQueryFenceReq);

+    char   n;

+

+    swaps(&stuff->length, n);

+    REQUEST_SIZE_MATCH (xSyncQueryFenceReq);

+    swapl(&stuff->fid, n);

+

+    return ProcSyncQueryFence(client);

+}

+

+static int

+SProcSyncAwaitFence(ClientPtr client)

+{

+    REQUEST(xSyncAwaitFenceReq);

+    char   n;

+

+    swaps(&stuff->length, n);

+    REQUEST_AT_LEAST_SIZE(xSyncAwaitFenceReq);

+    SwapRestL(stuff);

+

+    return ProcSyncAwaitFence(client);

+}

 

 static int

 SProcSyncDispatch(ClientPtr client)

@@ -2009,6 +2493,18 @@ SProcSyncDispatch(ClientPtr client)
 	return SProcSyncSetPriority(client);

       case X_SyncGetPriority:

 	return SProcSyncGetPriority(client);

+      case X_SyncCreateFence:

+	return SProcSyncCreateFence(client);

+      case X_SyncTriggerFence:

+	return SProcSyncTriggerFence(client);

+      case X_SyncResetFence:

+	return SProcSyncResetFence(client);

+      case X_SyncDestroyFence:

+	return SProcSyncDestroyFence(client);

+      case X_SyncQueryFence:

+	return SProcSyncQueryFence(client);

+      case X_SyncAwaitFence:

+	return SProcSyncAwaitFence(client);

       default:

 	return BadRequest;

     }

@@ -2062,7 +2558,6 @@ SyncResetProc(ExtensionEntry *extEntry)
     RTCounter = 0;

 }

 

-

 /*

  * ** Initialise the extension.

  */

@@ -2070,6 +2565,10 @@ void
 SyncExtensionInit(void)

 {

     ExtensionEntry *extEntry;

+    int 	    s;

+

+    for (s = 0; s < screenInfo.numScreens; s++)

+	miSyncSetup(screenInfo.screens[s]);

 

     if (RTCounter == 0)

     {

@@ -2077,6 +2576,7 @@ SyncExtensionInit(void)
     }

     RTAlarm = CreateNewResourceType(FreeAlarm, "SyncAlarm");

     RTAwait = CreateNewResourceType(FreeAwait, "SyncAwait");

+    RTFence = CreateNewResourceType(FreeFence, "SyncFence");

     if (RTAwait)

 	RTAwait |= RC_NEVERRETAIN;

     RTAlarmClient = CreateNewResourceType(FreeAlarmClient, "SyncAlarmClient");

@@ -2103,6 +2603,7 @@ SyncExtensionInit(void)
 

     SetResourceTypeErrorValue(RTCounter, SyncErrorBase + XSyncBadCounter);

     SetResourceTypeErrorValue(RTAlarm, SyncErrorBase + XSyncBadAlarm);

+    SetResourceTypeErrorValue(RTFence, SyncErrorBase + XSyncBadFence);

 

     /*

      * Although SERVERTIME is implemented by the OS layer, we initialise it

@@ -2246,7 +2747,7 @@ static void
 IdleTimeBlockHandler(pointer env, struct timeval **wt, pointer LastSelectMask)

 {

     XSyncValue idle, old_idle;

-    SyncTriggerList *list = IdleTimeCounter->pTriglist;

+    SyncTriggerList *list = IdleTimeCounter->sync.pTriglist;

     SyncTrigger *trig;

 

     if (!pIdleTimeValueLess && !pIdleTimeValueGreater)

@@ -2267,7 +2768,7 @@ IdleTimeBlockHandler(pointer env, struct timeval **wt, pointer LastSelectMask)
 	 * immediately so we can reschedule.

 	 */

 

-	for (list = IdleTimeCounter->pTriglist; list; list = list->next) {

+	for (list = IdleTimeCounter->sync.pTriglist; list; list = list->next) {

 	    trig = list->pTrigger;

 	    if (trig->CheckTrigger(trig, old_idle)) {

 		AdjustWaitForDelay(wt, 0);

@@ -2293,7 +2794,7 @@ IdleTimeBlockHandler(pointer env, struct timeval **wt, pointer LastSelectMask)
 	                        idle, &overflow);

 	    timeout = min(timeout, XSyncValueLow32 (value));

 	} else {

-	    for (list = IdleTimeCounter->pTriglist; list; list = list->next) {

+	    for (list = IdleTimeCounter->sync.pTriglist; list; list = list->next) {

 		trig = list->pTrigger;

 		if (trig->CheckTrigger(trig, old_idle)) {

 		    timeout = min(timeout, 0);

diff --git a/xorg-server/Xext/syncsdk.h b/xorg-server/Xext/syncsdk.h
new file mode 100644
index 000000000..eab5451f1
--- /dev/null
+++ b/xorg-server/Xext/syncsdk.h
@@ -0,0 +1,47 @@
+/*

+ * Copyright © 2010 NVIDIA Corporation

+ *

+ * Permission is hereby granted, free of charge, to any person obtaining a

+ * copy of this software and associated documentation files (the "Software"),

+ * to deal in the Software without restriction, including without limitation

+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,

+ * and/or sell copies of the Software, and to permit persons to whom the

+ * Software is furnished to do so, subject to the following conditions:

+ *

+ * The above copyright notice and this permission notice (including the next

+ * paragraph) shall be included in all copies or substantial portions of the

+ * Software.

+ *

+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING

+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER

+ * DEALINGS IN THE SOFTWARE.

+ */

+

+#ifndef _SYNCSDK_H_

+#define _SYNCSDK_H_

+

+#include "misync.h"

+

+extern _X_EXPORT int

+SyncVerifyFence(SyncFence **ppFence, XID fid, ClientPtr client, Mask mode);

+

+#define VERIFY_SYNC_FENCE(pFence, fid, client, mode)			\

+    do {								\

+	int rc;								\

+	rc = SyncVerifyFence(&(pFence), (fid), (client), (mode));	\

+	if (Success != rc) return rc;					\

+    } while (0)

+

+#define VERIFY_SYNC_FENCE_OR_NONE(pFence, fid, client, mode)		\

+    do {								\

+        pFence = 0;							\

+        if (None != fid)						\

+	    VERIFY_SYNC_FENCE((pFence), (fid), (client), (mode));	\

+    } while (0)

+

+#endif /* _SYNCSDK_H_ */

+

diff --git a/xorg-server/Xext/syncsrv.h b/xorg-server/Xext/syncsrv.h
index 6d0e3d64a..6fe9cd123 100644
--- a/xorg-server/Xext/syncsrv.h
+++ b/xorg-server/Xext/syncsrv.h
@@ -1,177 +1,146 @@
-/*
-
-Copyright 1991, 1993, 1994, 1998  The Open Group
-
-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.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-
-/***********************************************************
-Copyright 1991,1993 by Digital Equipment Corporation, Maynard, Massachusetts,
-and Olivetti Research Limited, Cambridge, England.
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
-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 names of Digital or Olivetti
-not be used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
-
-DIGITAL AND OLIVETTI DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
-SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS, IN NO EVENT SHALL THEY 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.
-
-******************************************************************/
-
-#ifndef _SYNCSRV_H_
-#define _SYNCSRV_H_
-
-#define CARD64 XSyncValue /* XXX temporary! need real 64 bit values for Alpha */
-
-typedef struct _SyncCounter {
-    ClientPtr		client;	/* Owning client. 0 for system counters */
-    XSyncCounter	id;		/* resource ID */
-    CARD64		value;		/* counter value */
-    struct _SyncTriggerList *pTriglist;	/* list of triggers */
-    Bool		beingDestroyed; /* in process of going away */
-    struct _SysCounterInfo *pSysCounterInfo; /* NULL if not a system counter */
-} SyncCounter;
-
-/*
- * The System Counter interface
- */
-
-typedef enum {
-    XSyncCounterNeverChanges,
-    XSyncCounterNeverIncreases,
-    XSyncCounterNeverDecreases,
-    XSyncCounterUnrestricted
-} SyncCounterType;
-
-typedef struct _SysCounterInfo {
-    char	*name;
-    CARD64	resolution;
-    CARD64	bracket_greater;
-    CARD64	bracket_less;
-    SyncCounterType counterType;  /* how can this counter change */
-    void        (*QueryValue)(
-			      pointer /*pCounter*/,
-			      CARD64 * /*freshvalue*/
-);
-    void	(*BracketValues)(
-				 pointer /*pCounter*/,
-				 CARD64 * /*lessthan*/,
-				 CARD64 * /*greaterthan*/
-);
-} SysCounterInfo;
-
-
-
-typedef struct _SyncTrigger {
-    SyncCounter *pCounter;
-    CARD64	wait_value;	/* wait value */
-    unsigned int value_type;     /* Absolute or Relative */
-    unsigned int test_type;	/* transition or Comparision type */
-    CARD64	test_value;	/* trigger event threshold value */
-    Bool	(*CheckTrigger)(
-				struct _SyncTrigger * /*pTrigger*/,
-				CARD64 /*newval*/
-				);
-    void	(*TriggerFired)(
-				struct _SyncTrigger * /*pTrigger*/
-				);
-    void	(*CounterDestroyed)(
-				struct _SyncTrigger * /*pTrigger*/
-				    );
-} SyncTrigger;
-
-typedef struct _SyncTriggerList {
-    SyncTrigger *pTrigger;
-    struct _SyncTriggerList *next;
-} SyncTriggerList;
-
-typedef struct _SyncAlarmClientList {
-    ClientPtr	client;
-    XID		delete_id;
-    struct _SyncAlarmClientList *next;
-} SyncAlarmClientList;
-
-typedef struct _SyncAlarm {
-    SyncTrigger trigger;
-    ClientPtr	client;
-    XSyncAlarm 	alarm_id;
-    CARD64	delta;
-    int		events;
-    int		state;
-    SyncAlarmClientList *pEventClients;
-} SyncAlarm;
-
-typedef struct {
-    ClientPtr	client;
-    CARD32 	delete_id;
-    int		num_waitconditions;
-} SyncAwaitHeader;
-
-typedef struct {
-    SyncTrigger trigger;
-    CARD64	event_threshold;
-    SyncAwaitHeader *pHeader;
-} SyncAwait;
-
-typedef union {
-    SyncAwaitHeader header;
-    SyncAwait	    await;
-} SyncAwaitUnion;
-
-
-extern pointer SyncCreateSystemCounter(
-    char *	/* name */,
-    CARD64  	/* inital_value */,
-    CARD64  	/* resolution */,
-    SyncCounterType /* change characterization */,
-    void        (* /*QueryValue*/ ) (
-        pointer /* pCounter */,
-        CARD64 * /* pValue_return */), /* XXX prototype */
-    void        (* /*BracketValues*/) (
-        pointer /* pCounter */, 
-        CARD64 * /* pbracket_less */,
-        CARD64 * /* pbracket_greater */)
-);
-
-extern void SyncChangeCounter(
-    SyncCounter *	/* pCounter*/,
-    CARD64  		/* new_value */
-);
-
-extern void SyncDestroySystemCounter(
-    pointer pCounter
-);
-extern void InitServertime(void);
-
-extern void SyncExtensionInit(void);
-#endif /* _SYNCSRV_H_ */
+/*

+

+Copyright 1991, 1993, 1994, 1998  The Open Group

+

+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.

+

+The above copyright notice and this permission notice shall be included in

+all copies or substantial portions of the Software.

+

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

+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE

+OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN

+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN

+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

+

+Except as contained in this notice, the name of The Open Group shall not be

+used in advertising or otherwise to promote the sale, use or other dealings

+in this Software without prior written authorization from The Open Group.

+

+*/

+

+/***********************************************************

+Copyright 1991,1993 by Digital Equipment Corporation, Maynard, Massachusetts,

+and Olivetti Research Limited, Cambridge, England.

+

+                        All Rights Reserved

+

+Permission to use, copy, modify, and distribute this software and its 

+documentation for any purpose and without fee is hereby granted, 

+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 names of Digital or Olivetti

+not be used in advertising or publicity pertaining to distribution of the

+software without specific, written prior permission.  

+

+DIGITAL AND OLIVETTI DISCLAIM ALL WARRANTIES WITH REGARD TO THIS

+SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND

+FITNESS, IN NO EVENT SHALL THEY 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.

+

+******************************************************************/

+

+#ifndef _SYNCSRV_H_

+#define _SYNCSRV_H_

+

+#include "misync.h"

+#include "misyncstr.h"

+

+/*

+ * The System Counter interface

+ */

+

+typedef enum {

+    XSyncCounterNeverChanges,

+    XSyncCounterNeverIncreases,

+    XSyncCounterNeverDecreases,

+    XSyncCounterUnrestricted

+} SyncCounterType;

+

+typedef struct _SysCounterInfo {

+    char	*name;

+    CARD64	resolution;

+    CARD64	bracket_greater;

+    CARD64	bracket_less;

+    SyncCounterType counterType;  /* how can this counter change */

+    void        (*QueryValue)(

+			      pointer /*pCounter*/,

+			      CARD64 * /*freshvalue*/

+);

+    void	(*BracketValues)(

+				 pointer /*pCounter*/,

+				 CARD64 * /*lessthan*/,

+				 CARD64 * /*greaterthan*/

+);

+} SysCounterInfo;

+

+

+

+typedef struct _SyncAlarmClientList {

+    ClientPtr	client;

+    XID		delete_id;

+    struct _SyncAlarmClientList *next;

+} SyncAlarmClientList;

+

+typedef struct _SyncAlarm {

+    SyncTrigger trigger;

+    ClientPtr	client;

+    XSyncAlarm 	alarm_id;

+    CARD64	delta;

+    int		events;

+    int		state;

+    SyncAlarmClientList *pEventClients;

+} SyncAlarm;

+

+typedef struct {

+    ClientPtr	client;

+    CARD32 	delete_id;

+    int		num_waitconditions;

+} SyncAwaitHeader;

+

+typedef struct {

+    SyncTrigger trigger;

+    CARD64	event_threshold;

+    SyncAwaitHeader *pHeader;

+} SyncAwait;

+

+typedef union {

+    SyncAwaitHeader header;

+    SyncAwait	    await;

+} SyncAwaitUnion;

+

+extern pointer SyncCreateSystemCounter(

+    char *	/* name */,

+    CARD64  	/* inital_value */,

+    CARD64  	/* resolution */,

+    SyncCounterType /* change characterization */,

+    void        (* /*QueryValue*/ ) (

+        pointer /* pCounter */,

+        CARD64 * /* pValue_return */), /* XXX prototype */

+    void        (* /*BracketValues*/) (

+        pointer /* pCounter */, 

+        CARD64 * /* pbracket_less */,

+        CARD64 * /* pbracket_greater */)

+);

+

+extern void SyncChangeCounter(

+    SyncCounter *	/* pCounter*/,

+    CARD64  		/* new_value */

+);

+

+extern void SyncDestroySystemCounter(

+    pointer pCounter

+);

+

+extern void InitServertime(void);

+

+extern void SyncExtensionInit(void);

+#endif /* _SYNCSRV_H_ */

diff --git a/xorg-server/Xi/exevents.c b/xorg-server/Xi/exevents.c
index 3acf2b5e8..7370a0bcf 100644
--- a/xorg-server/Xi/exevents.c
+++ b/xorg-server/Xi/exevents.c
@@ -872,8 +872,10 @@ UpdateDeviceState(DeviceIntPtr device, DeviceEvent* event)
                     continue;

                 if (!sd->button)

                     continue;

-                if (button_is_down(sd, key, BUTTON_PROCESSED))

-                    return DONT_PROCESS;

+                for (i = 1; i <= sd->button->numButtons; i++)

+                    if (sd->button->map[i] == key &&

+                        button_is_down(sd, i, BUTTON_PROCESSED))

+                        return DONT_PROCESS;

             }

         }

         set_button_up(device, key, BUTTON_PROCESSED);

diff --git a/xorg-server/configure.ac b/xorg-server/configure.ac
index 5546858cd..ea2803795 100644
--- a/xorg-server/configure.ac
+++ b/xorg-server/configure.ac
@@ -26,8 +26,8 @@ dnl
 dnl Process this file with autoconf to create configure.

 

 AC_PREREQ(2.57)

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

-RELEASE_DATE="2010-10-01"

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

+RELEASE_DATE="2010-12-06"

 AC_CONFIG_SRCDIR([Makefile.am])

 AM_INIT_AUTOMAKE([foreign dist-bzip2])

 AM_MAINTAINER_MODE

@@ -64,9 +64,7 @@ dnl version-config.h covers the version numbers so they can be bumped without
 dnl forcing an entire recompile.x

 AC_CONFIG_HEADERS(include/version-config.h)

 

-AC_PROG_CC

 AM_PROG_AS

-AC_PROG_INSTALL

 AC_PROG_LN_S

 AC_LIBTOOL_WIN32_DLL

 AC_DISABLE_STATIC

@@ -77,7 +75,6 @@ AC_PROG_LEX
 AC_PROG_YACC

 AC_SYS_LARGEFILE

 XORG_PROG_RAWCPP

-AC_PROG_SED

 

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

 # easier overrides at build time.

@@ -791,7 +788,7 @@ WINDOWSWMPROTO="windowswmproto"
 APPLEWMPROTO="applewmproto >= 1.4"

 

 dnl Core modules for most extensions, et al.

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

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

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

 AC_SUBST(SDK_REQUIRED_MODULES)

 

@@ -1335,7 +1332,7 @@ AC_DEFINE(BIGREQS, 1, [Support BigRequests extension])
 

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

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

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

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

 else

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

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

@@ -1353,6 +1350,8 @@ FB_LIB='$(top_builddir)/fb/libfb.la'
 FB_INC='-I$(top_srcdir)/fb'

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

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

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

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

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

 

 # SHA1 hashing

@@ -1492,7 +1491,7 @@ AC_EGREP_CPP([I_AM_SVR4],[
 AC_DEFINE([SVR4],1,[Define to 1 on systems derived from System V Release 4])

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

 

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

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

 

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

 dnl DDX section.

@@ -1505,7 +1504,7 @@ AC_MSG_RESULT([$XVFB])
 AM_CONDITIONAL(XVFB, [test "x$XVFB" = xyes])

 

 if test "x$XVFB" = xyes; then

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

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

 	XVFB_SYS_LIBS="$XVFBMODULES_LIBS $GLX_SYS_LIBS"

 	AC_SUBST([XVFB_LIBS])

 	AC_SUBST([XVFB_SYS_LIBS])

@@ -1526,7 +1525,7 @@ if test "x$XNEST" = xyes; then
 	if test "x$have_xnest" = xno; then

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

 	fi

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

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

 	XNEST_SYS_LIBS="$XNESTMODULES_LIBS $GLX_SYS_LIBS"

 	AC_SUBST([XNEST_LIBS])

 	AC_SUBST([XNEST_SYS_LIBS])

@@ -1554,7 +1553,7 @@ if test "x$XORG" = xyes; then
 	XORG_OSINCS='-I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir)/hw/xfree86/os-support/bus -I$(top_srcdir)/os'

 	XORG_INCS="$XORG_DDXINCS $XORG_OSINCS"

 	XORG_CFLAGS="$XORGSERVER_CFLAGS -DHAVE_XORG_CONFIG_H"

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

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

 

 	dnl ==================================================================

 	dnl symbol visibility

@@ -1889,7 +1888,7 @@ if test "x$XWIN" = xyes; then
 			XWIN_SYS_LIBS=-lwinsock2

 			;;

 	esac

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

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

 	XWIN_SYS_LIBS="$XWIN_SYS_LIBS $XWINMODULES_LIBS"

 	AC_SUBST(XWIN_LIBS)

 	AC_SUBST(XWIN_SERVER_NAME)

@@ -1919,7 +1918,7 @@ if test "x$XQUARTZ" = xyes; then
 	AC_DEFINE(XQUARTZ,1,[Have Quartz])

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

 

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

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

 	AC_SUBST([DARWIN_LIBS])

 

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

@@ -1980,7 +1979,7 @@ if test "x$DMX" = xyes; then
 	fi

 	DMX_INCLUDES="$XEXT_INC $RENDER_INC $RECORD_INC"

 	XDMX_CFLAGS="$DMXMODULES_CFLAGS"

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

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

 	XDMX_SYS_LIBS="$DMXMODULES_LIBS"

 	AC_SUBST([XDMX_CFLAGS])

 	AC_SUBST([XDMX_LIBS])

@@ -2085,13 +2084,13 @@ if test "$KDRIVE" = yes; then
     

     # damage shadow extension glx (NOTYET) fb mi

     KDRIVE_INC='-I$(top_srcdir)/hw/kdrive/src'

-    KDRIVE_PURE_INCS="$KDRIVE_INC $MIEXT_DAMAGE_INC $MIEXT_SHADOW_INC $XEXT_INC $FB_INC $MI_INC"

+    KDRIVE_PURE_INCS="$KDRIVE_INC $MIEXT_SYNC_INC $MIEXT_DAMAGE_INC $MIEXT_SHADOW_INC $XEXT_INC $FB_INC $MI_INC"

     KDRIVE_OS_INC='-I$(top_srcdir)/hw/kdrive/linux'

     KDRIVE_INCS="$KDRIVE_PURE_INCS $KDRIVE_OS_INC"

     

     KDRIVE_CFLAGS="$XSERVER_CFLAGS -DHAVE_KDRIVE_CONFIG_H $TSLIB_CFLAGS"

 

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

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

     KDRIVE_LIB='$(top_builddir)/hw/kdrive/src/libkdrive.la'

     case $host_os in

 	*linux*)

@@ -2122,7 +2121,7 @@ if test "$KDRIVE" = yes; then
     KDRIVE_STUB_LIB='$(top_builddir)/hw/kdrive/src/libkdrivestubs.la'

     KDRIVE_LOCAL_LIBS="$MAIN_LIB $DIX_LIB $KDRIVE_LIB $KDRIVE_STUB_LIB"

     KDRIVE_LOCAL_LIBS="$KDRIVE_LOCAL_LIBS $FB_LIB $MI_LIB $KDRIVE_PURE_LIBS"

-    KDRIVE_LOCAL_LIBS="$KDRIVE_LOCAL_LIBS $KDRIVE_OS_LIB $OS_LIB"

+    KDRIVE_LOCAL_LIBS="$KDRIVE_LOCAL_LIBS $KDRIVE_OS_LIB"

     KDRIVE_LIBS="$KDRIVE_LOCAL_LIBS $XSERVER_SYS_LIBS $GLX_SYS_LIBS $DLOPEN_LIBS $TSLIB_LIBS"

 

     AC_SUBST([XEPHYR_LIBS])

@@ -2183,6 +2182,7 @@ damageext/Makefile
 dbe/Makefile

 dix/Makefile

 doc/Makefile

+doc/man/Makefile

 doc/xml/Makefile

 doc/xml/dtrace/Makefile

 doc/xml/xserver.ent

@@ -2191,6 +2191,7 @@ record/Makefile
 config/Makefile

 mi/Makefile

 miext/Makefile

+miext/sync/Makefile

 miext/damage/Makefile

 miext/shadow/Makefile

 miext/cw/Makefile

diff --git a/xorg-server/dix/eventconvert.c b/xorg-server/dix/eventconvert.c
index e9297149c..dff1a5631 100644
--- a/xorg-server/dix/eventconvert.c
+++ b/xorg-server/dix/eventconvert.c
@@ -326,14 +326,6 @@ countValuators(DeviceEvent *ev, int *first)
     {

         if (BitIsOn(ev->valuators.mask, i))

         {

-            /* Assume mode of first_valuator matches XI1 device mode. Stop when the

-             * event mode changes since XI1 can't handle mixed mode devices.

-             */

-            if (first_valuator > -1 &&

-                 BitIsOn(ev->valuators.mode, i) !=

-                 BitIsOn(ev->valuators.mode, first_valuator))

-                break;

-

             if (first_valuator == -1)

                 first_valuator = i;

             last_valuator = i;

diff --git a/xorg-server/dix/privates.c b/xorg-server/dix/privates.c
index 3c743deb3..d261f6895 100644
--- a/xorg-server/dix/privates.c
+++ b/xorg-server/dix/privates.c
@@ -465,7 +465,8 @@ static const char *key_names[PRIVATE_LAST] = {
     /*[PRIVATE_DAMAGE] =*/      "DAMAGE",

     /*[PRIVATE_GLYPH] =*/       "GLYPH",

     /*[PRIVATE_GLYPHSET] =*/    "GLYPHSET",

-    /*[PRIVATE_PICTURE] =*/     "PICTURE"

+    /*[PRIVATE_PICTURE] =*/     "PICTURE" ,

+    /*[PRIVATE_SYNC_FENCE] =*/ "SYNC_FENCE"

 };

 

 void

diff --git a/xorg-server/doc/Makefile.am b/xorg-server/doc/Makefile.am
index 1cfc1d6a1..8cb3649fe 100644
--- a/xorg-server/doc/Makefile.am
+++ b/xorg-server/doc/Makefile.am
@@ -1,26 +1,3 @@
+SUBDIRS = man xml

 

-# Xserver.man covers options generic to all X servers built in this tree

-# (i.e. those handled in the os/utils.c options processing instead of in

-#  the DDX-level options processing)

-appmandir = $(APP_MAN_DIR)

-appman_PRE = Xserver.man.pre

-

-appman_PROCESSED = $(appman_PRE:man.pre=man)

-appman_DATA = $(appman_PRE:man.pre=@APP_MAN_SUFFIX@)

-

-BUILT_SOURCES = $(appman_PROCESSED)

-CLEANFILES = $(appman_PROCESSED) $(appman_DATA)

-

-include $(top_srcdir)/cpprules.in

-

-.man.$(APP_MAN_SUFFIX):

-	$(AM_V_at)cp $< $@

-

-EXTRAMANDEFS = -D__default_font_path__="`echo $(COMPILEDDEFAULTFONTPATH) | $(SED) -e 's/,/, /g'`"

-

-# Docs about X server internals that we ship with source but don't install

-DEVEL_DOCS = smartsched

-

-EXTRA_DIST = $(DEVEL_DOCS) $(appman_PRE) $(fileman_PRE)

-

-SUBDIRS = xml

+dist_noinst_DATA = smartsched

diff --git a/xorg-server/doc/man/Makefile.am b/xorg-server/doc/man/Makefile.am
new file mode 100644
index 000000000..5259a104f
--- /dev/null
+++ b/xorg-server/doc/man/Makefile.am
@@ -0,0 +1,20 @@
+# Xserver.man covers options generic to all X servers built in this tree

+# (i.e. those handled in the os/utils.c options processing instead of in

+#  the DDX-level options processing)

+

+appmandir = $(APP_MAN_DIR)

+appman_PRE = Xserver.man

+appman_DATA = $(appman_PRE:man=$(APP_MAN_SUFFIX))

+

+EXTRA_DIST = $(appman_PRE)

+CLEANFILES = $(appman_DATA)

+SUFFIXES = .$(APP_MAN_SUFFIX) .man

+

+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure

+# 's|/,|/, |g' will add a space to help font path formatting

+MAN_SUBSTS += 	-e 's|__datadir__|$(datadir)|g' \

+		-e 's|__default_font_path__|$(COMPILEDDEFAULTFONTPATH)|g' \

+		-e '\|$(COMPILEDDEFAULTFONTPATH)| s|/,|/, |g'

+

+.man.$(APP_MAN_SUFFIX):

+	$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@

diff --git a/xorg-server/doc/man/Xserver.man b/xorg-server/doc/man/Xserver.man
new file mode 100644
index 000000000..d3a16e2b7
--- /dev/null
+++ b/xorg-server/doc/man/Xserver.man
@@ -0,0 +1,584 @@
+.\" $Xorg: Xserver.man,v 1.4 2001/02/09 02:04:07 xorgcvs Exp $

+.\" $XdotOrg: xserver/xorg/doc/Xserver.man.pre,v 1.4 2005/12/23 20:11:12 alanc Exp $

+.\" Copyright 1984 - 1991, 1993, 1994, 1998  The Open Group

+.\"

+.\" 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.

+.\"

+.\" The above copyright notice and this permission notice shall be included

+.\" in all copies or substantial portions of the Software.

+.\"

+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

+.\" IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR

+.\" OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,

+.\" ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

+.\" OTHER DEALINGS IN THE SOFTWARE.

+.\"

+.\" Except as contained in this notice, the name of The Open Group shall

+.\" not be used in advertising or otherwise to promote the sale, use or

+.\" other dealings in this Software without prior written authorization

+.\" from The Open Group.

+.\" $XFree86: xc/programs/Xserver/Xserver.man,v 3.31 2004/01/10 22:27:46 dawes Exp $

+.\" shorthand for double quote that works everywhere.

+.ds q \N'34'

+.TH XSERVER 1 __xorgversion__

+.SH NAME

+Xserver \- X Window System display server

+.SH SYNOPSIS

+.B X

+[option ...]

+.SH DESCRIPTION

+.I X

+is the generic name for the X Window System display server.  It is

+frequently a link or a copy of the appropriate server binary for

+driving the most frequently used server on a given machine.

+.SH "STARTING THE SERVER"

+The X server is usually started from the X Display Manager program

+\fIxdm\fP(1) or a similar display manager program.

+This utility is run from the system boot files and takes care of keeping

+the server running, prompting for usernames and passwords, and starting up

+the user sessions.

+.PP

+Installations that run more than one window system may need to use the

+\fIxinit\fP(1) utility instead of a display manager.  However, \fIxinit\fP is

+to be considered a tool for building startup scripts and is not

+intended for use by end users.  Site administrators are \fBstrongly\fP

+urged to use a display manager, or build other interfaces for novice users.

+.PP

+The X server may also be started directly by the user, though this

+method is usually reserved for testing and is not recommended for

+normal operation.  On some platforms, the user must have special

+permission to start the X server, often because access to certain

+devices (e.g. \fI/dev/mouse\fP) is restricted.

+.PP

+When the X server starts up, it typically takes over the display.  If

+you are running on a workstation whose console is the display, you may

+not be able to log into the console while the server is running.

+.SH OPTIONS

+Many X servers have device-specific command line options.  See the manual

+pages for the individual servers for more details; a list of

+server-specific manual pages is provided in the SEE ALSO section below.

+.PP

+All of the X servers accept the command line options described below.

+Some X servers may have alternative ways of providing the parameters

+described here, but the values provided via the command line options

+should override values specified via other mechanisms.

+.TP 8

+.B :\fIdisplaynumber\fP

+The X server runs as the given \fIdisplaynumber\fP, which by default is 0.

+If multiple X servers are to run simultaneously on a host, each must have

+a unique display number.  See the DISPLAY

+NAMES section of the \fIX\fP(__miscmansuffix__) manual page to learn how to

+specify which display number clients should try to use.

+.TP 8

+.B \-a \fInumber\fP

+sets pointer acceleration (i.e. the ratio of how much is reported to how much

+the user actually moved the pointer).

+.TP 8

+.B \-ac

+disables host-based access control mechanisms.  Enables access by any host,

+and permits any host to modify the access control list.

+Use with extreme caution.

+This option exists primarily for running test suites remotely.

+.TP 8

+.B \-audit \fIlevel\fP

+sets the audit trail level.  The default level is 1, meaning only connection

+rejections are reported.  Level 2 additionally reports all successful

+connections and disconnects.  Level 4 enables messages from the

+SECURITY extension, if present, including generation and revocation of

+authorizations and violations of the security policy.

+Level 0 turns off the audit trail.

+Audit lines are sent as standard error output.

+.TP 8

+.B \-auth \fIauthorization-file\fP

+specifies a file which contains a collection of authorization records used

+to authenticate access.  See also the \fIxdm\fP(1) and

+\fIXsecurity\fP(__miscmansuffix__) manual pages.

+.TP 8

+.B \-br

+sets the default root window to solid black instead of the standard root weave

+pattern.   This is the default unless -retro or -wr is specified.

+.TP 8

+.B \-bs

+disables backing store support on all screens.

+.TP 8

+.B \-c

+turns off key-click.

+.TP 8

+.B c \fIvolume\fP

+sets key-click volume (allowable range: 0-100).

+.TP 8

+.B \-cc \fIclass\fP

+sets the visual class for the root window of color screens.

+The class numbers are as specified in the X protocol.

+Not obeyed by all servers.

+.TP 8

+.B \-core

+causes the server to generate a core dump on fatal errors.

+.TP 8

+.B \-deferglyphs \fIwhichfonts\fP

+specifies the types of fonts for which the server should attempt to use

+deferred glyph loading.  \fIwhichfonts\fP can be all (all fonts),

+none (no fonts), or 16 (16 bit fonts only).

+.TP 8

+.B \-dpi \fIresolution\fP

+sets the resolution for all screens, in dots per inch.

+To be used when the server cannot determine the screen size(s) from the

+hardware.

+.TP 8

+.B dpms

+enables DPMS (display power management services), where supported.  The

+default state is platform and configuration specific.

+.TP 8

+.B \-dpms

+disables DPMS (display power management services).  The default state

+is platform and configuration specific.

+.TP 8

+.BI \-extension extensionName

+disables named extension.   If an unknown extension name is specified,

+a list of accepted extension names is printed.

+.TP 8

+.BI \+extension extensionName

+enables named extension.   If an unknown extension name is specified,

+a list of accepted extension names is printed.

+.TP 8

+.B \-f \fIvolume\fP

+sets feep (bell) volume (allowable range: 0-100).

+.TP 8

+.B \-fc \fIcursorFont\fP

+sets default cursor font.

+.TP 8

+.B \-fn \fIfont\fP

+sets the default font.

+.TP 8

+.B \-fp \fIfontPath\fP

+sets the search path for fonts.  This path is a comma separated list

+of directories which the X server searches for font databases.

+See the FONTS section of this manual page for more information and the default

+list.

+.TP 8

+.B \-help

+prints a usage message.

+.TP 8

+.B \-I

+causes all remaining command line arguments to be ignored.

+.TP 8

+.B \-maxbigreqsize \fIsize\fP

+sets the maximum big request to

+.I size

+MB.

+.TP 8

+.B \-nocursor

+disable the display of the pointer cursor.

+.TP 8

+.B \-nolisten \fItrans-type\fP

+disables a transport type.  For example, TCP/IP connections can be disabled

+with

+.BR "\-nolisten tcp" .

+This option may be issued multiple times to disable listening to different

+transport types.

+.TP 8

+.B \-noreset

+prevents a server reset when the last client connection is closed.  This

+overrides a previous

+.B \-terminate

+command line option.

+.TP 8

+.B \-p \fIminutes\fP

+sets screen-saver pattern cycle time in minutes.

+.TP 8

+.B \-pn

+permits the server to continue running if it fails to establish all of

+its well-known sockets (connection points for clients), but

+establishes at least one.  This option is set by default.

+.TP 8

+.B \-nopn

+causes the server to exit if it fails to establish all of its well-known

+sockets (connection points for clients).

+.TP 8

+.B \-r

+turns off auto-repeat.

+.TP 8

+.B r

+turns on auto-repeat.

+.TP 8

+.B -retro

+starts the stipple with the classic stipple and cursor visible.  The default

+is to start with a black root window, and to suppress display of the cursor

+until the first time an application calls XDefineCursor().  For the Xorg

+server, this also sets the default for the DontZap option to FALSE.  For

+kdrive servers, this implies -zap.

+.TP 8

+.B \-s \fIminutes\fP

+sets screen-saver timeout time in minutes.

+.TP 8

+.B \-su

+disables save under support on all screens.

+.TP 8

+.B \-t \fInumber\fP

+sets pointer acceleration threshold in pixels (i.e. after how many pixels

+pointer acceleration should take effect).

+.TP 8

+.B \-terminate

+causes the server to terminate at server reset, instead of continuing to run.

+This overrides a previous

+.B \-noreset

+command line option.

+.TP 8

+.B \-to \fIseconds\fP

+sets default connection timeout in seconds.

+.TP 8

+.B \-tst

+disables all testing extensions (e.g., XTEST, XTrap, XTestExtension1, RECORD).

+.TP 8

+.B tty\fIxx\fP

+ignored, for servers started the ancient way (from init).

+.TP 8

+.B v

+sets video-off screen-saver preference.

+.TP 8

+.B \-v

+sets video-on screen-saver preference.

+.TP 8

+.B \-wm

+forces the default backing-store of all windows to be WhenMapped.  This

+is a backdoor way of getting backing-store to apply to all windows.

+Although all mapped windows will have backing store, the backing store

+attribute value reported by the server for a window will be the last

+value established by a client.  If it has never been set by a client,

+the server will report the default value, NotUseful.  This behavior is

+required by the X protocol, which allows the server to exceed the

+client's backing store expectations but does not provide a way to tell

+the client that it is doing so.

+.TP 8

+.B \-wr

+sets the default root window to solid white instead of the standard root weave

+pattern.

+.TP 8

+.B \-x \fIextension\fP

+loads the specified extension at init.

+This is a no-op for most implementations.

+.TP 8

+.B [+-]xinerama

+enables(+) or disables(-) the XINERAMA extension.  The default state is

+platform and configuration specific.

+.SH SERVER DEPENDENT OPTIONS

+Some X servers accept the following options:

+.TP 8

+.B \-ld \fIkilobytes\fP

+sets the data space limit of the server to the specified number of kilobytes.

+A value of zero makes the data size as large as possible.  The default value

+of \-1 leaves the data space limit unchanged.

+.TP 8

+.B \-lf \fIfiles\fP

+sets the number-of-open-files limit of the server to the specified number.

+A value of zero makes the limit as large as possible.  The default value

+of \-1 leaves the limit unchanged.

+.TP 8

+.B \-ls \fIkilobytes\fP

+sets the stack space limit of the server to the specified number of kilobytes.

+A value of zero makes the stack size as large as possible.  The default value

+of \-1 leaves the stack space limit unchanged.

+.TP 8

+.B \-render

+.BR default | mono | gray | color

+sets the color allocation policy that will be used by the render extension.

+.RS 8

+.TP 8

+.I default

+selects the default policy defined for the display depth of the X

+server.

+.TP 8

+.I mono

+don't use any color cell.

+.TP 8

+.I gray

+use a gray map of 13 color cells for the X render extension.

+.TP 8

+.I color

+use a color cube of at most 4*4*4 colors (that is 64 color cells).

+.RE

+.TP 8

+.B \-dumbSched

+disables smart scheduling on platforms that support the smart scheduler.

+.TP

+.B \-schedInterval \fIinterval\fP

+sets the smart scheduler's scheduling interval to

+.I interval

+milliseconds.

+.SH XDMCP OPTIONS

+X servers that support XDMCP have the following options.

+See the \fIX Display Manager Control Protocol\fP specification for more

+information.

+.TP 8

+.B \-query \fIhostname\fP

+enables XDMCP and sends Query packets to the specified

+.IR hostname .

+.TP 8

+.B \-broadcast

+enable XDMCP and broadcasts BroadcastQuery packets to the network.  The

+first responding display manager will be chosen for the session.

+.TP 8

+.B \-multicast [\fIaddress\fP [\fIhop count\fP]]

+Enable XDMCP and multicast BroadcastQuery packets to the  network.

+The first responding display manager is chosen for the session.  If an

+address is specified, the multicast is sent to that address.  If no

+address is specified, the multicast is sent to the default XDMCP IPv6

+multicast group.  If a hop count is specified, it is used as the maximum

+hop count for the multicast.  If no hop count is specified, the multicast

+is set to a maximum of 1 hop, to prevent the multicast from being routed

+beyond the local network.

+.TP 8

+.B \-indirect \fIhostname\fP

+enables XDMCP and send IndirectQuery packets to the specified

+.IR hostname .

+.TP 8

+.B \-port \fIport-number\fP

+uses the specified \fIport-number\fP for XDMCP packets, instead of the

+default.  This option must be specified before any \-query, \-broadcast,

+\-multicast, or \-indirect options.

+.TP 8

+.B \-from \fIlocal-address\fP

+specifies the local address to connect from (useful if the connecting host

+has multiple network interfaces).  The \fIlocal-address\fP may be expressed

+in any form acceptable to the host platform's \fIgethostbyname\fP(3)

+implementation.

+.TP 8

+.B \-once

+causes the server to terminate (rather than reset) when the XDMCP session

+ends.

+.TP 8

+.B \-class \fIdisplay-class\fP

+XDMCP has an additional display qualifier used in resource lookup for

+display-specific options.  This option sets that value, by default it

+is "MIT-Unspecified" (not a very useful value).

+.TP 8

+.B \-cookie \fIxdm-auth-bits\fP

+When testing XDM-AUTHENTICATION-1, a private key is shared between the

+server and the manager.  This option sets the value of that private

+data (not that it is very private, being on the command line!).

+.TP 8

+.B \-displayID \fIdisplay-id\fP

+Yet another XDMCP specific value, this one allows the display manager to

+identify each display so that it can locate the shared key.

+.SH XKEYBOARD OPTIONS

+X servers that support the XKEYBOARD (a.k.a. \*qXKB\*q) extension accept the

+following options.  All layout files specified on the command line must be

+located in the XKB base directory or a subdirectory, and specified as the

+relative path from the XKB base directory.  The default XKB base directory is

+.IR __projectroot__/lib/X11/xkb .

+.TP 8

+.BR [+-]accessx " [ \fItimeout\fP [ \fItimeout_mask\fP [ \fIfeedback\fP [ \fIoptions_mask\fP ] ] ] ]"

+enables(+) or disables(-) AccessX key sequences.

+.TP 8

+.B \-xkbdir \fIdirectory\fP

+base directory for keyboard layout files.  This option is not available

+for setuid X servers (i.e., when the X server's real and effective uids

+are different).

+.TP 8

+.B \-ardelay \fImilliseconds\fP

+sets the autorepeat delay (length of time in milliseconds that a key must

+be depressed before autorepeat starts).

+.TP 8

+.B \-arinterval \fImilliseconds\fP

+sets the autorepeat interval (length of time in milliseconds that should

+elapse between autorepeat-generated keystrokes).

+.TP 8

+.B \-xkbmap \fIfilename\fP

+loads keyboard description in \fIfilename\fP on server startup.

+.SH "NETWORK CONNECTIONS"

+The X server supports client connections via a platform-dependent subset of

+the following transport types: TCP\/IP, Unix Domain sockets, DECnet,

+and several varieties of SVR4 local connections.  See the DISPLAY

+NAMES section of the \fIX\fP(__miscmansuffix__) manual page to learn how to

+specify which transport type clients should try to use.

+.SH GRANTING ACCESS

+The X server implements a platform-dependent subset of the following

+authorization protocols: MIT-MAGIC-COOKIE-1, XDM-AUTHORIZATION-1,

+XDM-AUTHORIZATION-2, SUN-DES-1, and MIT-KERBEROS-5.  See the

+\fIXsecurity\fP(__miscmansuffix__) manual page for information on the

+operation of these protocols.

+.PP

+Authorization data required by the above protocols is passed to the

+server in a private file named with the \fB\-auth\fP command line

+option.  Each time the server is about to accept the first connection

+after a reset (or when the server is starting), it reads this file.

+If this file contains any authorization records, the local host is not

+automatically allowed access to the server, and only clients which

+send one of the authorization records contained in the file in the

+connection setup information will be allowed access.  See the

+\fIXau\fP manual page for a description of the binary format of this

+file.  See \fIxauth\fP(1) for maintenance of this file, and distribution

+of its contents to remote hosts.

+.PP

+The X server also uses a host-based access control list for deciding

+whether or not to accept connections from clients on a particular machine.

+If no other authorization mechanism is being used,

+this list initially consists of the host on which the server is running as

+well as any machines listed in the file \fI/etc/X\fBn\fI.hosts\fR, where

+\fBn\fP is the display number of the server.  Each line of the file should

+contain either an Internet hostname (e.g. expo.lcs.mit.edu) or a DECnet

+hostname in double colon format (e.g. hydra::) or a complete name in the format

+\fIfamily\fP:\fIname\fP as described in the \fIxhost\fP(1) manual page.

+There should be no leading or trailing spaces on any lines.  For example:

+.sp

+.in +8

+.nf

+joesworkstation

+corporate.company.com

+star::

+inet:bigcpu

+local:

+.fi

+.in -8

+.PP

+Users can add or remove hosts from this list and enable or disable access

+control using the \fIxhost\fP command from the same machine as the server.

+.PP

+If the X FireWall Proxy (\fIxfwp\fP) is being used without a sitepolicy,

+host-based authorization must be turned on for clients to be able to

+connect to the X server via the \fIxfwp\fP.  If \fIxfwp\fP is run without

+a configuration file and thus no sitepolicy is defined, if \fIxfwp\fP

+is using an X server where xhost + has been run to turn off host-based

+authorization checks, when a client tries to connect to this X server

+via \fIxfwp\fP, the X server will deny the connection.  See \fIxfwp\fP(1)

+for more information about this proxy.

+.PP

+The X protocol intrinsically does not have any notion of window operation

+permissions or place any restrictions on what a client can do; if a program can

+connect to a display, it has full run of the screen.

+X servers that support the SECURITY extension fare better because clients

+can be designated untrusted via the authorization they use to connect; see

+the \fIxauth\fP(1) manual page for details.  Restrictions are imposed

+on untrusted clients that curtail the mischief they can do.  See the SECURITY

+extension specification for a complete list of these restrictions.

+.PP

+Sites that have better

+authentication and authorization systems might wish to make

+use of the hooks in the libraries and the server to provide additional

+security models.

+.SH SIGNALS

+The X server attaches special meaning to the following signals:

+.TP 8

+.I SIGHUP

+This signal causes the server to close all existing connections, free all

+resources, and restore all defaults.  It is sent by the display manager

+whenever the main user's main application (usually an \fIxterm\fP or window

+manager) exits to force the server to clean up and prepare for the next

+user.

+.TP 8

+.I SIGTERM

+This signal causes the server to exit cleanly.

+.TP 8

+.I SIGUSR1

+This signal is used quite differently from either of the above.  When the

+server starts, it checks to see if it has inherited SIGUSR1 as SIG_IGN

+instead of the usual SIG_DFL.  In this case, the server sends a SIGUSR1 to

+its parent process after it has set up the various connection schemes.

+\fIXdm\fP uses this feature to recognize when connecting to the server

+is possible.

+.SH FONTS

+The X server can obtain fonts from directories and/or from font servers.

+The list of directories and font servers

+the X server uses when trying to open a font is controlled

+by the \fIfont path\fP.

+.LP

+The default font path is

+__default_font_path__ .

+.LP

+A special kind of directory can be specified using the \fBcatalogue\fP:

+prefix. Directories specified this way can contain symlinks pointing to the

+real font directories. See the FONTPATH.D section for details.

+.LP

+The font path can be set with the \fB\-fp\fP option or by \fIxset\fP(1)

+after the server has started.

+.SH "FONTPATH.D"

+You can specify a special kind of font path in the form \fBcatalogue:<dir>\fR.

+The directory specified after the catalogue: prefix will be scanned for symlinks

+and each symlink destination will be added as a local fontfile FPE.

+.PP

+The symlink can be suffixed by attributes such as '\fBunscaled\fR', which

+will be passed through to the underlying fontfile FPE. The only exception is

+the newly introduced '\fBpri\fR' attribute, which will be used for ordering

+the font paths specified by the symlinks.

+

+An example configuration:

+

+.nf

+    75dpi:unscaled:pri=20 \-> /usr/share/X11/fonts/75dpi

+    ghostscript:pri=60 \-> /usr/share/fonts/default/ghostscript

+    misc:unscaled:pri=10 \-> /usr/share/X11/fonts/misc

+    type1:pri=40 \-> /usr/share/X11/fonts/Type1

+    type1:pri=50 \-> /usr/share/fonts/default/Type1

+.fi

+

+This will add /usr/share/X11/fonts/misc as the first FPE with the attribute

+'unscaled', second FPE will be /usr/share/X11/fonts/75dpi, also with

+the attribute unscaled etc. This is functionally equivalent to setting

+the following font path:

+

+.nf

+    /usr/share/X11/fonts/misc:unscaled,

+    /usr/share/X11/fonts/75dpi:unscaled,

+    /usr/share/X11/fonts/Type1,

+    /usr/share/fonts/default/Type1,

+    /usr/share/fonts/default/ghostscript

+.fi

+

+.SH FILES

+.TP 30

+.I /etc/X\fBn\fP.hosts

+Initial access control list for display number \fBn\fP

+.TP 30

+.IR __datadir__/fonts/X11/misc , __datadir__/fonts/X11/75dpi , __datadir__/fonts/X11/100dpi

+Bitmap font directories

+.TP 30

+.IR __datadir__/fonts/X11/TTF , __datadir__/fonts/X11/Type1

+Outline font directories

+.TP 30

+.I /tmp/.X11-unix/X\fBn\fP

+Unix domain socket for display number \fBn\fP

+.TP 30

+.I /usr/adm/X\fBn\fPmsgs

+Error log file for display number \fBn\fP if run from \fIinit\fP(__adminmansuffix__)

+.TP 30

+.I __projectroot__/lib/X11/xdm/xdm-errors

+Default error log file if the server is run from \fIxdm\fP(1)

+.SH "SEE ALSO"

+General information: \fIX\fP(__miscmansuffix__)

+.PP

+Protocols:

+.I "X Window System Protocol,"

+.I "The X Font Service Protocol,"

+.I "X Display Manager Control Protocol"

+.PP

+Fonts: \fIbdftopcf\fP(1), \fImkfontdir\fP(1), \fImkfontscale\fP(1),

+\fIxfs\fP(1), \fIxlsfonts\fP(1), \fIxfontsel\fP(1), \fIxfd\fP(1),

+.I "X Logical Font Description Conventions"

+.PP

+Security: \fIXsecurity\fP(__miscmansuffix__), \fIxauth\fP(1), \fIXau\fP(1),

+\fIxdm\fP(1), \fIxhost\fP(1), \fIxfwp\fP(1),

+.I "Security Extension Specification"

+.PP

+Starting the server: \fIstartx\fP(1), \fIxdm\fP(1), \fIxinit\fP(1)

+.PP

+Controlling the server once started: \fIxset\fP(1), \fIxsetroot\fP(1),

+\fIxhost\fP(1), \fIxinput\fP(1), \fIxrandr\fP(1)

+.PP

+Server-specific man pages:

+\fIXorg\fP(1), \fIXdmx\fP(1), \fIXephyr\fP(1), \fIXnest\fP(1),

+\fIXvfb\fP(1), \fIXquartz\fP(1), \fIXWin\fP(1).

+.PP

+Server internal documentation:

+.I "Definition of the Porting Layer for the X v11 Sample Server"

+.SH AUTHORS

+The sample server was originally written by Susan Angebranndt, Raymond

+Drewry, Philip Karlton, and Todd Newman, from Digital Equipment

+Corporation, with support from a large cast.  It has since been

+extensively rewritten by Keith Packard and Bob Scheifler, from MIT.

+Dave Wiggins took over post-R5 and made substantial improvements.

diff --git a/xorg-server/doc/xml/Xserver-spec.xml b/xorg-server/doc/xml/Xserver-spec.xml
index 6b8917042..c31a8c4e2 100644
--- a/xorg-server/doc/xml/Xserver-spec.xml
+++ b/xorg-server/doc/xml/Xserver-spec.xml
@@ -442,18 +442,29 @@ and type; if skipFree is true, then the deleteFunc is not called.
 To look up a resource, use one of the following.

 <blockquote><programlisting>

 

-	pointer LookupIDByType(id, rtype)

-	    XID id;

-	    RESTYPE rtype;

-

-	pointer LookupIDByClass(id, classes)

-	    XID id;

-	    RESTYPE classes;

-

-</programlisting></blockquote>

-LookupIDByType finds a resource with the given id and exact type.

-LookupIDByClass finds a resource with the given id whose type is

-included in any one of the specified classes.</para>

+	int dixLookupResourceByType(

+	    pointer *result,

+	    XID id,

+	    RESTYPE rtype,

+	    ClientPtr client,

+	    Mask access_mode);

+

+	int dixLookupResourceByClass(

+	    pointer *result,

+	    XID id,

+	    RESTYPE rclass,

+	    ClientPtr client,

+	    Mask access_mode);

+

+</programlisting></blockquote>

+dixLookupResourceByType finds a resource with the given id and exact type.

+dixLookupResourceByClass finds a resource with the given id whose type is

+included in any one of the specified classes.

+The client and access_mode must be provided to allow security extensions to

+check if the client has the right privileges for the requested access.

+The bitmask values defined in the dixaccess.h header are or'ed together

+to define the requested access_mode.

+</para>

 </section>

 </section>

 <section>

@@ -469,7 +480,7 @@ these operations.</para>
 Before getting bogged down in the interface details, an typical usage

 example should establish the framework.  Let's look at the

 ClientStateCallback in dix/dispatch.c.  The purpose of this particular

-callback is to notify intereseted parties when a client's state

+callback is to notify interested parties when a client's state

 (initial, running, gone) changes.  The callback is "created" in this

 case by simply declaring a variable:

 <blockquote><programlisting>

@@ -478,7 +489,7 @@ case by simply declaring a variable:
 </para>

 <para>

 Whenever the client's state changes, the following code appears, which notifies

-all intereseted parties of the change:

+all interested parties of the change:

 <blockquote><programlisting>

 	if (ClientStateCallback) CallCallbacks(&amp;ClientStateCallback, (pointer)client);

 </programlisting></blockquote>

@@ -499,24 +510,6 @@ When CallCallbacks is invoked on the list, func will be called thusly:
 Now for the details.

 <blockquote><programlisting>

 

-	Bool CreateCallbackList(pcbl, cbfuncs)

-	    CallbackListPtr  *pcbl;

-	    CallbackFuncsPtr cbfuncs;

-

-</programlisting></blockquote>

-CreateCallbackList creates a callback list.  We envision that this

-function will be rarely used because the callback list is created

-automatically (if it doesn't already exist) when the first call to

-AddCallback is made on the list.  The only reason to explicitly create

-the callback list with this function is if you want to override the

-implementation of some of the other operations on the list by passing

-your own cbfuncs.  You also lose something by explicit creation: you

-introduce an order dependency during server startup because the list

-must be created before any modules subscribe to it.  Returns TRUE if

-successful.</para>

-<para>

-<blockquote><programlisting>

-

 	Bool AddCallback(pcbl, callback, subscriber_data)

 	    CallbackListPtr *pcbl;

 	    CallbackProcPtr callback;

@@ -595,8 +588,9 @@ used here which takes the minor opcode from the normal place in the request
 There are a number of macros in Xserver/include/dix.h which

 are useful to the extension writer.  Ones of particular interest

 are: REQUEST, REQUEST_SIZE_MATCH, REQUEST_AT_LEAST_SIZE,

-REQUEST_FIXED_SIZE, LEGAL_NEW_RESOURCE, LOOKUP_DRAWABLE, VERIFY_GC, and

+REQUEST_FIXED_SIZE, LEGAL_NEW_RESOURCE, and

 VALIDATE_DRAWABLE_AND_GC. Useful byte swapping macros can be found

+in Xserver/include/dix.h: WriteReplyToClient and WriteSwappedDataToClient; and

 in Xserver/include/misc.h: lswapl, lswaps, LengthRestB, LengthRestS,

 LengthRestL, SwapRestS, SwapRestL, swapl, swaps, cpswapl, and cpswaps.</para>

 </section>

@@ -765,7 +759,7 @@ These registered block handlers are called after the per-screen handlers:
 <programlisting>

 	void (*BlockHandler) (blockData, pptv, pReadmask)

 		pointer	blockData;

-		OSTimePtr pptv;

+		OsTimerPtr pptv;

 		pointer	pReadmask;

 </programlisting>

 </blockquote>

@@ -776,7 +770,7 @@ which on UNIX family systems is generally represented by a struct timeval
 consisting of seconds and microseconds in 32 bit values.

 As a convenience to reduce error prone struct timeval computations which

 require modulus arithmetic and correct overflow behavior in the face of

-millisecond wrapping throrugh 32 bits,

+millisecond wrapping through 32 bits,

 <blockquote><programlisting>

 

 	void AdjustWaitForDelay(pointer /*waitTime*, unsigned long /* newdelay */)

@@ -881,7 +875,7 @@ and RemoveEnabledDevice are in Xserver/os/connection.c.
 Similarly, the X server or an extension may need to wait for some timeout.

 Early X releases implemented this functionality using block and wakeup handlers,

 but this has been rewritten to use a general timer facilty, and the

-internal screen saver facilties reimplemented to use Timers.

+internal screen saver facilities reimplemented to use Timers.

 These functions are TimerInit, TimerForce, TimerSet, TimerCheck, TimerCancel,

 and TimerFree, as defined in Xserver/include/os.h. A callback function will be called

 when the timer fires, along with the current time, and a user provided argument.

@@ -919,11 +913,11 @@ for the timer entry.
 

 	void TimerCancel(OsTimerPtr /* pTimer */)

 

-	void TimerFree(OSTimerPtr /* pTimer */)

+	void TimerFree(OsTimerPtr /* pTimer */)

 </programlisting></blockquote>

 </para>

 <para>

-TimerInit frees any exisiting timer entries. TimerForce forces a call to the timer's

+TimerInit frees any existing timer entries. TimerForce forces a call to the timer's

 callback function and returns true if the timer entry existed, else it returns false and

 does not call the callback function. TimerCancel will cancel the specified timer.

 TimerFree calls TimerCancel and frees the specified timer.

@@ -1188,7 +1182,8 @@ are requests in that client's input queue.
   <title>Font Support</title>

 <para>

 In the sample server, fonts are encoded in disk files or fetched from the

-font server.

+font server.   The two fonts required by the server, <quote>fixed</quote>

+and <quote>cursor</quote> are commonly compiled into the font library.

 For disk fonts, there is one file per font, with a file name like

 "fixed.pcf".  Font server fonts are read over the network using the

 X Font Server Protocol.  The disk directories containing disk fonts and

@@ -1202,9 +1197,10 @@ appropriate code in the Font Library, you will automatically export fonts in
 that format both through the X server and the Font server.

 </para>

 <para>

-With the incorporation of font-server based fonts and the Speedo donation

-from Bitstream, the font interfaces have been moved into a separate

-library, now called the Font Library (../fonts/lib).  These routines are

+The code for processing fonts in different formats, as well as handling the

+metadata files for them on disk (such as <filename>fonts.dir</filename>) is

+located in the libXfont library, which is provided as a separately compiled

+module.  These routines are

 shared between the X server and the Font server, so instead of this document

 specifying what you must implement, simply refer to the font

 library interface specification for the details.  All of the interface code to the Font

@@ -1215,20 +1211,12 @@ library is contained in dix/dixfonts.c
   <title>Memory Management</title>

 <para>

 Memory management is based on functions in the C runtime library.

-Xalloc(), Xrealloc(), and Xfree() work just like malloc(), realloc(),

-and free(), except that you can pass a null pointer to Xrealloc() to

-have it allocate anew or pass a null pointer to Xfree() and nothing

-will happen.  The versions in the sample server also do some checking

-that is useful for debugging.  Consult a C runtime library reference

+Xalloc(), Xrealloc(), and Xfree() are deprecated aliases for malloc(),

+realloc(), and free(), and you should simply call the C library functions

+directly.  Consult a C runtime library reference

 manual for more details.

 </para>

 <para>

-The macros ALLOCATE_LOCAL and DEALLOCATE_LOCAL are provided in

-Xserver/include/os.h.  These are useful if your compiler supports

-alloca() (or some method of allocating memory from the stack); and are

-defined appropriately on systems which support it.

-</para>

-<para>

 Treat memory allocation carefully in your implementation.  Memory

 leaks can be very hard to find and are frustrating to a user.  An X

 server could be running for days or weeks without being reset, just

@@ -1358,7 +1346,7 @@ terminate the server; it must not return.
 </para>

 <para>

 The sample server implementation for these routines

-is in Xserver/os/util.c.

+is in Xserver/os/log.c along with other routines for logging messages.

 </para>

 </section>

 </section>

@@ -1821,7 +1809,7 @@ printed on each keycap. (See X11/keysym.h)
 <para>

 Legal modifier keys must generate both up and down transitions.  When

 a client tries to change a modifier key (for instance, to make "A" the

-"Control" key), DIX calls the following routine, which should retuurn

+"Control" key), DIX calls the following routine, which should return

 TRUE if the key can be used as a modifier on the given device:

 <blockquote><programlisting>

 

@@ -2722,7 +2710,7 @@ Xserver/dix/colormap.c.)</para>
 

 

 </programlisting></blockquote>

-ListInstalledColormaps fills the pCMapList in with the resource ids

+ListInstalledColormaps fills the pCmapList in with the resource ids

 of the installed maps and returns a count of installed maps.

 pCmapList will point to an array of size MaxInstalledMaps that was allocated

 by the caller.</para>

@@ -3620,7 +3608,7 @@ this screen function.  The new border width is given by width.</para>
 </programlisting></blockquote>

 This function is called for windows that are being unrealized as part of

 an UnrealizeTree.  pChild is the window being unrealized, pWin is an

-ancestor, and the fromConfigure value is simply propogated from UnrealizeTree.</para>

+ancestor, and the fromConfigure value is simply propagated from UnrealizeTree.</para>

 </section>

 </section>

 </section>

@@ -5025,7 +5013,7 @@ mi and fb implementations.</para>
 <row><entry><function>ListInstalledColormaps</function></entry><entry><literal>ddx</literal></entry><entry><para>Screen</para></entry></row>

 <row><entry><function>LookupKeyboardDevice</function></entry><entry><literal>dix</literal></entry><entry><para></para></entry></row>

 <row><entry><function>LookupPointerDevice</function></entry><entry><literal>dix</literal></entry><entry><para></para></entry></row>

-<row><entry><function>ModifyPixmapheader</function></entry><entry><literal>mi</literal></entry><entry><para>Screen</para></entry></row>

+<row><entry><function>ModifyPixmapHeader</function></entry><entry><literal>mi</literal></entry><entry><para>Screen</para></entry></row>

 <row><entry><function>NextAvailableClient</function></entry><entry><literal>dix</literal></entry><entry><para></para></entry></row>

 <row><entry><function>OsInit</function></entry><entry><literal>os</literal></entry><entry><para></para></entry></row>

 <row><entry><function>PaintWindowBackground</function></entry><entry><literal>mi</literal></entry><entry><para>Window</para></entry></row>

diff --git a/xorg-server/hw/dmx/glxProxy/glxcmds.c b/xorg-server/hw/dmx/glxProxy/glxcmds.c
index 26ffad825..540fd00cd 100644
--- a/xorg-server/hw/dmx/glxProxy/glxcmds.c
+++ b/xorg-server/hw/dmx/glxProxy/glxcmds.c
@@ -1531,7 +1531,7 @@ int __glXGetVisualConfigs(__GLXclientState *cl, GLbyte *pc)
     int i, p;

 

     screen = req->screen;

-    if (screen > screenInfo.numScreens) {

+    if (screen >= screenInfo.numScreens) {

 	/* The client library must send a valid screen number. */

 	client->errorValue = screen;

 	return BadValue;

@@ -2680,7 +2680,7 @@ int __glXGetFBConfigs(__GLXclientState *cl, GLbyte *pc)
     int numFBConfigs, i, p;

     __GLXscreenInfo *pGlxScreen;

 

-    if (screen > screenInfo.numScreens) {

+    if (screen >= screenInfo.numScreens) {

 	/* The client library must send a valid screen number. */

 	client->errorValue = screen;

 	return BadValue;

@@ -3102,7 +3102,7 @@ int __glXCreatePbuffer(__GLXclientState *cl, GLbyte *pc)
    /*

     ** Look up screen and FBConfig.

     */

-    if (screen > screenInfo.numScreens) {

+    if (screen >= screenInfo.numScreens) {

         /* The client library must send a valid screen number. */

         client->errorValue = screen;

         return BadValue;

diff --git a/xorg-server/hw/dmx/glxProxy/glxcmdsswap.c b/xorg-server/hw/dmx/glxProxy/glxcmdsswap.c
index da5956952..ca41c1585 100644
--- a/xorg-server/hw/dmx/glxProxy/glxcmdsswap.c
+++ b/xorg-server/hw/dmx/glxProxy/glxcmdsswap.c
@@ -252,7 +252,7 @@ int __glXSwapGetVisualConfigs(__GLXclientState *cl, GLbyte *pc)
 

     __GLX_SWAP_INT(&req->screen);

     screen = req->screen;

-    if (screen > screenInfo.numScreens) {

+    if (screen >= screenInfo.numScreens) {

 	/* The client library must send a valid screen number. */

 	client->errorValue = screen;

 	return BadValue;

diff --git a/xorg-server/hw/kdrive/ephyr/ephyrdriext.c b/xorg-server/hw/kdrive/ephyr/ephyrdriext.c
index def7a39a8..6db06fca7 100644
--- a/xorg-server/hw/kdrive/ephyr/ephyrdriext.c
+++ b/xorg-server/hw/kdrive/ephyr/ephyrdriext.c
@@ -398,7 +398,7 @@ EphyrDuplicateVisual (unsigned int a_screen,
     int i=0 ;

 

     EPHYR_LOG ("enter\n") ; 

-    if (a_screen > screenInfo.numScreens) {

+    if (a_screen >= screenInfo.numScreens) {

         EPHYR_LOG_ERROR ("bad screen number\n") ;

         goto out;

     }

diff --git a/xorg-server/hw/xfree86/common/xf86AutoConfig.c b/xorg-server/hw/xfree86/common/xf86AutoConfig.c
index a00340191..14b266d38 100644
--- a/xorg-server/hw/xfree86/common/xf86AutoConfig.c
+++ b/xorg-server/hw/xfree86/common/xf86AutoConfig.c
@@ -282,21 +282,31 @@ listPossibleVideoDrivers(char *matches[], int nmatches)
 static Bool

 copyScreen(confScreenPtr oscreen, GDevPtr odev, int i, char *driver)

 {

+    confScreenPtr nscreen;

     GDevPtr cptr = NULL;

 

-    xf86ConfigLayout.screens[i].screen = xnfcalloc(1, sizeof(confScreenRec));

-    if(!xf86ConfigLayout.screens[i].screen)

+    nscreen = malloc(sizeof(confScreenRec));

+    if (!nscreen)

         return FALSE;

-    memcpy(xf86ConfigLayout.screens[i].screen, oscreen, sizeof(confScreenRec));

+    memcpy(nscreen, oscreen, sizeof(confScreenRec));

 

-    cptr = calloc(1, sizeof(GDevRec));

-    if (!cptr)

+    cptr = malloc(sizeof(GDevRec));

+    if (!cptr) {

+        free(nscreen);

         return FALSE;

+    }

     memcpy(cptr, odev, sizeof(GDevRec));

 

     cptr->identifier = Xprintf("Autoconfigured Video Device %s", driver);

+    if (!cptr->identifier) {

+        free(cptr);

+        free(nscreen);

+        return FALSE;

+    }

     cptr->driver = driver;

 

+    xf86ConfigLayout.screens[i].screen = nscreen;

+

     /* now associate the new driver entry with the new screen entry */

     xf86ConfigLayout.screens[i].screen->device = cptr;

     cptr->myScreenSection = xf86ConfigLayout.screens[i].screen;

diff --git a/xorg-server/hw/xfree86/common/xf86Config.c b/xorg-server/hw/xfree86/common/xf86Config.c
index c0cba2994..c439221f9 100644
--- a/xorg-server/hw/xfree86/common/xf86Config.c
+++ b/xorg-server/hw/xfree86/common/xf86Config.c
@@ -1458,14 +1458,15 @@ configInputDevices(XF86ConfLayoutPtr layout, serverLayoutPtr servlayoutp)
     irp = layout->lay_input_lst;

     count = 0;

     while (irp) {

-	indp[count] = xnfalloc(sizeof(InputInfoRec));

+	indp[count] = xf86AllocateInput();

 	if (!configInput(indp[count], irp->iref_inputdev, X_CONFIG)) {

 	    while(count--)

 		free(indp[count]);

 	    free(indp);

 	    return FALSE;

 	}

-	indp[count]->options = irp->iref_option_lst;

+	indp[count]->options = xf86OptionListMerge(indp[count]->options,

+						   irp->iref_option_lst);

 	count++;

 	irp = (XF86ConfInputrefPtr)irp->list.next;

     }

diff --git a/xorg-server/hw/xfree86/common/xf86Helper.c b/xorg-server/hw/xfree86/common/xf86Helper.c
index abb198690..9b6daaf41 100644
--- a/xorg-server/hw/xfree86/common/xf86Helper.c
+++ b/xorg-server/hw/xfree86/common/xf86Helper.c
@@ -1038,7 +1038,12 @@ xf86SetRootClip (ScreenPtr pScreen, Bool enable)
 	RegionInit(&pWin->winSize, &box, 1);

 	RegionInit(&pWin->borderSize, &box, 1);

 	if (WasViewable)

+	{

+	    PixmapPtr	pPixmap = (*pScreen->GetScreenPixmap) (pScreen);

+	    box.x2 = pPixmap->drawable.width;

+	    box.y2 = pPixmap->drawable.height;

 	    RegionReset(&pWin->borderClip, &box);

+	}

 	pWin->drawable.width = pScreen->width;

 	pWin->drawable.height = pScreen->height;

         RegionBreak(&pWin->clipList);

@@ -1116,7 +1121,6 @@ xf86EnableDisableFBAccess(int scrnIndex, Bool enable)
 	 */

 	if (!xf86Resetting)

 	    xf86SetRootClip (pScreen, TRUE);

-

     }

     else

     {

@@ -1190,7 +1194,7 @@ xf86VIDrvMsgVerb(InputInfoPtr dev, MessageType type, int verb, const char *forma
     char *msg;

 

     msg = Xprintf("%s: %s: %s", dev->drv->driverName, dev->name, format);

-    LogVMessageVerb(type, verb, "%s", msg);

+    LogVMessageVerb(type, verb, msg, args);

     free(msg);

 }

 

diff --git a/xorg-server/hw/xfree86/common/xf86Mode.c b/xorg-server/hw/xfree86/common/xf86Mode.c
index 2ba5ea990..df0884794 100644
--- a/xorg-server/hw/xfree86/common/xf86Mode.c
+++ b/xorg-server/hw/xfree86/common/xf86Mode.c
@@ -1643,8 +1643,7 @@ xf86ValidateModes(ScrnInfoPtr scrp, DisplayModePtr availModes,
 	    new = xnfcalloc(1, sizeof(DisplayModeRec));

 	    new->prev = last;

 	    new->type = M_T_USERDEF;

-	    new->name = xnfalloc(strlen(modeNames[i]) + 1);

-	    strcpy(new->name, modeNames[i]);

+	    new->name = xnfstrdup(modeNames[i]);

 	    if (new->prev)

 		new->prev->next = new;

 	    *endp = last = new;

@@ -1716,10 +1715,9 @@ xf86ValidateModes(ScrnInfoPtr scrp, DisplayModePtr availModes,
 

 	    p = xnfcalloc(1, sizeof(DisplayModeRec));

 	    p->prev = last;

-	    p->name = xnfalloc(strlen(r->name) + 1);

+	    p->name = xnfstrdup(r->name);

 	    if (!userModes)

 		p->type = M_T_USERDEF;

-	    strcpy(p->name, r->name);

 	    if (p->prev)

 		p->prev->next = p;

 	    *endp = last = p;

diff --git a/xorg-server/hw/xfree86/common/xf86Module.h b/xorg-server/hw/xfree86/common/xf86Module.h
index 9335e116f..fb6f9673d 100644
--- a/xorg-server/hw/xfree86/common/xf86Module.h
+++ b/xorg-server/hw/xfree86/common/xf86Module.h
@@ -84,7 +84,7 @@ typedef enum {
 #define ABI_ANSIC_VERSION	SET_ABI_VERSION(0, 4)

 #define ABI_VIDEODRV_VERSION	SET_ABI_VERSION(9, 0)

 #define ABI_XINPUT_VERSION	SET_ABI_VERSION(12, 0)

-#define ABI_EXTENSION_VERSION	SET_ABI_VERSION(4, 0)

+#define ABI_EXTENSION_VERSION	SET_ABI_VERSION(5, 0)

 #define ABI_FONT_VERSION	SET_ABI_VERSION(0, 6)

 

 #define MODINFOSTRING1	0xef23fdc5

diff --git a/xorg-server/hw/xfree86/common/xf86Xinput.c b/xorg-server/hw/xfree86/common/xf86Xinput.c
index 3a48fe9c3..dad993ec1 100644
--- a/xorg-server/hw/xfree86/common/xf86Xinput.c
+++ b/xorg-server/hw/xfree86/common/xf86Xinput.c
@@ -280,7 +280,8 @@ void
 xf86ProcessCommonOptions(InputInfoPtr pInfo,

                          pointer	list)

 {

-    if (!xf86SetBoolOption(list, "AlwaysCore", 1) ||

+    if (xf86SetBoolOption(list, "Floating", 0) ||

+        !xf86SetBoolOption(list, "AlwaysCore", 1) ||

         !xf86SetBoolOption(list, "SendCoreEvents", 1) ||

         !xf86SetBoolOption(list, "CorePointer", 1) ||

         !xf86SetBoolOption(list, "CoreKeyboard", 1)) {

@@ -652,7 +653,7 @@ IgnoreInputClass(const InputInfoPtr idev, const InputAttributes *attrs)
     return ignore;

 }

 

-static InputInfoPtr

+InputInfoPtr

 xf86AllocateInput(void)

 {

     InputInfoPtr pInfo;

diff --git a/xorg-server/hw/xfree86/common/xf86Xinput.h b/xorg-server/hw/xfree86/common/xf86Xinput.h
index 15ab82421..84683168c 100644
--- a/xorg-server/hw/xfree86/common/xf86Xinput.h
+++ b/xorg-server/hw/xfree86/common/xf86Xinput.h
@@ -155,6 +155,7 @@ extern _X_EXPORT void xf86DisableDevice(DeviceIntPtr dev, Bool panic);
 extern _X_EXPORT void xf86EnableDevice(DeviceIntPtr dev);

 /* not exported */

 int xf86NewInputDevice(InputInfoPtr pInfo, DeviceIntPtr *pdev, BOOL is_auto);

+InputInfoPtr xf86AllocateInput(void);

 

 /* xf86Helper.c */

 extern _X_EXPORT void xf86AddInputDriver(InputDriverPtr driver, pointer module, int flags);

diff --git a/xorg-server/hw/xfree86/common/xf86pciBus.c b/xorg-server/hw/xfree86/common/xf86pciBus.c
index b5e8790b6..aef7d277a 100644
--- a/xorg-server/hw/xfree86/common/xf86pciBus.c
+++ b/xorg-server/hw/xfree86/common/xf86pciBus.c
@@ -1167,6 +1167,7 @@ videoPtrToDriverList(struct pci_device *dev,
     return i;	/* Number of entries added */

 }

 

+#ifdef __linux__

 static int

 xchomp(char *line)

 {

@@ -1183,7 +1184,6 @@ xchomp(char *line)
     return 0;

 }

 

-#ifdef __linux__

 /* This function is used to provide a workaround for binary drivers that

  * don't export their PCI ID's properly. If distros don't end up using this

  * feature it can and should be removed because the symbol-based resolution

diff --git a/xorg-server/hw/xfree86/common/xf86str.h b/xorg-server/hw/xfree86/common/xf86str.h
index 0b7685012..74ad759c5 100644
--- a/xorg-server/hw/xfree86/common/xf86str.h
+++ b/xorg-server/hw/xfree86/common/xf86str.h
@@ -498,7 +498,7 @@ typedef struct _confdrirec {
 /* These values should be adjusted when new fields are added to ScrnInfoRec */

 #define NUM_RESERVED_INTS		16

 #define NUM_RESERVED_POINTERS		14

-#define NUM_RESERVED_FUNCS		11

+#define NUM_RESERVED_FUNCS		10

 

 typedef pointer (*funcPointer)(void);

 

@@ -652,6 +652,7 @@ typedef Bool xf86PMEventProc              (int, pmEvent, Bool);
 typedef void xf86DPMSSetProc		  (ScrnInfoPtr, int, int);

 typedef void xf86LoadPaletteProc   (ScrnInfoPtr, int, int *, LOCO *, VisualPtr);

 typedef void xf86SetOverscanProc          (ScrnInfoPtr, int);

+typedef void xf86ModeSetProc              (ScrnInfoPtr);

 

 

 /*

@@ -802,6 +803,7 @@ typedef struct _ScrnInfoRec {
     xf86LoadPaletteProc			*LoadPalette;

     xf86SetOverscanProc			*SetOverscan;

     xorgDriverFuncProc			*DriverFunc;

+    xf86ModeSetProc			*ModeSet;

 

     /*

      * This can be used when the minor ABI version is incremented.

diff --git a/xorg-server/hw/xfree86/common/xf86xv.c b/xorg-server/hw/xfree86/common/xf86xv.c
index 74e76f923..9f62a8397 100644
--- a/xorg-server/hw/xfree86/common/xf86xv.c
+++ b/xorg-server/hw/xfree86/common/xf86xv.c
@@ -104,6 +104,7 @@ static void xf86XVClipNotify(WindowPtr pWin, int dx, int dy);
 static Bool xf86XVEnterVT(int, int);

 static void xf86XVLeaveVT(int, int);

 static void xf86XVAdjustFrame(int index, int x, int y, int flags);

+static void xf86XVModeSet(ScrnInfoPtr pScrn);

 

 /* misc */

 

@@ -287,6 +288,7 @@ xf86XVScreenInit(
   ScreenPriv->EnterVT = pScrn->EnterVT;

   ScreenPriv->LeaveVT = pScrn->LeaveVT;

   ScreenPriv->AdjustFrame = pScrn->AdjustFrame;

+  ScreenPriv->ModeSet = pScrn->ModeSet;

 

   pScreen->DestroyWindow = xf86XVDestroyWindow;

   pScreen->WindowExposures = xf86XVWindowExposures;

@@ -295,6 +297,7 @@ xf86XVScreenInit(
   pScrn->LeaveVT = xf86XVLeaveVT;

   if(pScrn->AdjustFrame)

      pScrn->AdjustFrame = xf86XVAdjustFrame;

+  pScrn->ModeSet = xf86XVModeSet;

 

   if(!xf86XVInitAdaptors(pScreen, adaptors, num))

 	return FALSE;

@@ -556,7 +559,7 @@ xf86XVInitAdaptors(
       adaptorPriv->QueryBestSize = adaptorPtr->QueryBestSize;

       adaptorPriv->QueryImageAttributes = adaptorPtr->QueryImageAttributes;

       adaptorPriv->PutImage = adaptorPtr->PutImage;

-      adaptorPriv->ReputImage = adaptorPtr->ReputImage;

+      adaptorPriv->ReputImage = adaptorPtr->ReputImage; /* image/still */

 

       pa->devPriv.ptr = (pointer)adaptorPriv;

 

@@ -661,8 +664,7 @@ xf86XVUpdateCompositeClip(XvPortRecPrivatePtr portPriv)
    pCompositeClip = RegionCreate(NullBox, 1);

    RegionCopy(pCompositeClip, portPriv->clientClip);

    RegionTranslate(pCompositeClip,

-			portPriv->pDraw->x + portPriv->clipOrg.x,

-			portPriv->pDraw->y + portPriv->clipOrg.y);

+		   portPriv->pDraw->x, portPriv->pDraw->y);

    RegionIntersect(pCompositeClip, pregWin, pCompositeClip);

 

    portPriv->pCompositeClip = pCompositeClip;

@@ -687,6 +689,8 @@ xf86XVCopyClip(
 	    portPriv->clientClip = RegionCreate(NullBox, 1);

 	/* Note: this is in window coordinates */

 	RegionCopy(portPriv->clientClip, pGC->clientClip);

+	RegionTranslate(portPriv->clientClip,

+			pGC->clipOrg.x, pGC->clipOrg.y);

     } else if(portPriv->clientClip) { /* free the old clientClip */

 	RegionDestroy(portPriv->clientClip);

 	portPriv->clientClip = NULL;

@@ -697,7 +701,27 @@ xf86XVCopyClip(
 	RegionDestroy(portPriv->pCompositeClip);

     }

 

-    portPriv->clipOrg = pGC->clipOrg;

+    portPriv->pCompositeClip = pGC->pCompositeClip;

+    portPriv->FreeCompositeClip = FALSE;

+    portPriv->subWindowMode = pGC->subWindowMode;

+}

+

+static void

+xf86XVCopyCompositeClip(XvPortRecPrivatePtr portPriv,

+			GCPtr pGC,

+			DrawablePtr pDraw)

+{

+    if (!portPriv->clientClip)

+	portPriv->clientClip = RegionCreate(NullBox, 1);

+    /* Keep the original GC composite clip around for ReputImage */

+    RegionCopy(portPriv->clientClip, pGC->pCompositeClip);

+    RegionTranslate(portPriv->clientClip,

+		    -pDraw->x, -pDraw->y);

+

+    /* get rid of the old clip list */

+    if (portPriv->pCompositeClip && portPriv->FreeCompositeClip)

+	RegionDestroy(portPriv->pCompositeClip);

+

     portPriv->pCompositeClip = pGC->pCompositeClip;

     portPriv->FreeCompositeClip = FALSE;

     portPriv->subWindowMode = pGC->subWindowMode;

@@ -852,6 +876,7 @@ CLIP_VIDEO_BAILOUT:
   return ret;

 }

 

+/* Reput image/still */

 static int

 xf86XVReputImage(XvPortRecPrivatePtr portPriv)

 {

@@ -863,6 +888,11 @@ xf86XVReputImage(XvPortRecPrivatePtr portPriv)
 

   xf86XVUpdateCompositeClip(portPriv);

 

+  /* the clip can get smaller over time */

+  RegionCopy(portPriv->clientClip, portPriv->pCompositeClip);

+  RegionTranslate(portPriv->clientClip,

+		  -portPriv->pDraw->x, -portPriv->pDraw->y);

+

   /* translate the video region to the screen */

   WinBox.x1 = portPriv->pDraw->x + portPriv->drw_x;

   WinBox.y1 = portPriv->pDraw->y + portPriv->drw_y;

@@ -912,7 +942,10 @@ xf86XVReputImage(XvPortRecPrivatePtr portPriv)
   }

 

   ret = (*portPriv->AdaptorRec->ReputImage)(portPriv->pScrn,

+			portPriv->vid_x, portPriv->vid_y,

 			WinBox.x1, WinBox.y1,

+			portPriv->vid_w, portPriv->vid_h,

+			portPriv->drw_w, portPriv->drw_h,

 			&ClipRegion, portPriv->DevPriv.ptr,

 			portPriv->pDraw);

 

@@ -1004,6 +1037,71 @@ xf86XVRemovePortFromWindow(WindowPtr pWin, XvPortRecPrivatePtr portPriv)
      portPriv->pDraw = NULL;

 }

 

+static void

+xf86XVReputOrStopPort(XvPortRecPrivatePtr pPriv,

+		      WindowPtr pWin,

+		      Bool visible)

+{

+    if (!visible) {

+	if (pPriv->isOn == XV_ON) {

+	    (*pPriv->AdaptorRec->StopVideo)(pPriv->pScrn, pPriv->DevPriv.ptr, FALSE);

+	    pPriv->isOn = XV_PENDING;

+	}

+

+	if (!pPriv->type) /* overlaid still/image*/

+	    xf86XVRemovePortFromWindow(pWin, pPriv);

+

+	return;

+    }

+

+    switch (pPriv->type) {

+    case XvInputMask:

+	xf86XVReputVideo(pPriv);

+	break;

+    case XvOutputMask:

+	xf86XVRegetVideo(pPriv);

+	break;

+    default:  /* overlaid still/image*/

+	if (pPriv->AdaptorRec->ReputImage)

+	    xf86XVReputImage(pPriv);

+	break;

+    }

+}

+

+static void

+xf86XVReputOrStopAllPorts(ScrnInfoPtr pScrn)

+{

+    ScreenPtr pScreen = pScrn->pScreen;

+    XvScreenPtr pxvs = GET_XV_SCREEN(pScreen);

+    XvAdaptorPtr pa;

+    int c, i;

+

+    for (c = pxvs->nAdaptors, pa = pxvs->pAdaptors; c > 0; c--, pa++) {

+	XvPortPtr pPort = pa->pPorts;

+

+	for (i = pa->nPorts; i > 0; i--, pPort++) {

+	    XvPortRecPrivatePtr pPriv = (XvPortRecPrivatePtr)pPort->devPriv.ptr;

+	    WindowPtr pWin = (WindowPtr)pPriv->pDraw;

+	    Bool visible;

+

+	    if (pPriv->isOn == XV_OFF || !pWin)

+		continue;

+

+	    visible = pWin->visibility == VisibilityUnobscured ||

+		      pWin->visibility == VisibilityPartiallyObscured;

+

+	    /*

+	     * Stop and remove still/images if

+	     * ReputImage isn't supported.

+	     */

+	    if (!pPriv->type && !pPriv->AdaptorRec->ReputImage)

+		visible = FALSE;

+

+	    xf86XVReputOrStopPort(pPriv, pWin, visible);

+	}

+    }

+}

+

 /****  ScreenRec fields ****/

 

 static Bool

@@ -1048,7 +1146,6 @@ xf86XVWindowExposures(WindowPtr pWin, RegionPtr reg1, RegionPtr reg2)
   ScreenPtr pScreen = pWin->drawable.pScreen;

   XF86XVScreenPtr ScreenPriv = GET_XF86XV_SCREEN(pScreen);

   XF86XVWindowPtr WinPriv = GET_XF86XV_WINDOW(pWin);

-  XF86XVWindowPtr pPrev;

   XvPortRecPrivatePtr pPriv;

   Bool AreasExposed;

 

@@ -1061,47 +1158,20 @@ xf86XVWindowExposures(WindowPtr pWin, RegionPtr reg1, RegionPtr reg2)
   /* filter out XClearWindow/Area */

   if (!pWin->valdata) return;

 

-  pPrev = NULL;

-

   while(WinPriv) {

-     pPriv = WinPriv->PortRec;

-

-     /* Reput anyone with a reput function */

+     Bool visible = TRUE;

 

-     switch(pPriv->type) {

-     case XvInputMask:

-	xf86XVReputVideo(pPriv);

-	break;

-     case XvOutputMask:

-	xf86XVRegetVideo(pPriv);

-	break;

-     default:  /* overlaid still/image*/

-	if (pPriv->AdaptorRec->ReputImage)

-	   xf86XVReputImage(pPriv);

-	else if(AreasExposed) {

-	    XF86XVWindowPtr tmp;

+     pPriv = WinPriv->PortRec;

 

-	    if (pPriv->isOn == XV_ON) {

-		(*pPriv->AdaptorRec->StopVideo)(

-		    pPriv->pScrn, pPriv->DevPriv.ptr, FALSE);

-		pPriv->isOn = XV_PENDING;

-	    }

-	    pPriv->pDraw = NULL;

+     /*

+      * Stop and remove still/images if areas were exposed and

+      * ReputImage isn't supported.

+      */

+     if (!pPriv->type && !pPriv->AdaptorRec->ReputImage)

+	visible = !AreasExposed;

 

-	    if(!pPrev)

-		dixSetPrivate(&pWin->devPrivates, XF86XVWindowKey,

-			      WinPriv->next);

-	    else

-	       pPrev->next = WinPriv->next;

-	    tmp = WinPriv;

-	    WinPriv = WinPriv->next;

-	    free(tmp);

-	    continue;

-	}

-	break;

-     }

-     pPrev = WinPriv;

      WinPriv = WinPriv->next;

+     xf86XVReputOrStopPort(pPriv, pWin, visible);

   }

 }

 

@@ -1112,16 +1182,14 @@ xf86XVClipNotify(WindowPtr pWin, int dx, int dy)
   ScreenPtr pScreen = pWin->drawable.pScreen;

   XF86XVScreenPtr ScreenPriv = GET_XF86XV_SCREEN(pScreen);

   XF86XVWindowPtr WinPriv = GET_XF86XV_WINDOW(pWin);

-  XF86XVWindowPtr tmp, pPrev = NULL;

   XvPortRecPrivatePtr pPriv;

-  Bool visible = (pWin->visibility == VisibilityUnobscured) ||

-		 (pWin->visibility == VisibilityPartiallyObscured);

 

   while(WinPriv) {

+     Bool visible = pWin->visibility == VisibilityUnobscured ||

+		    pWin->visibility == VisibilityPartiallyObscured;

+

      pPriv = WinPriv->PortRec;

 

-     if(!pPriv) goto next;

- 

      if(pPriv->pCompositeClip && pPriv->FreeCompositeClip)

 	RegionDestroy(pPriv->pCompositeClip);

 

@@ -1131,34 +1199,15 @@ xf86XVClipNotify(WindowPtr pWin, int dx, int dy)
         (*pPriv->AdaptorRec->ClipNotify)(pPriv->pScrn, pPriv->DevPriv.ptr,

                                          pWin, dx, dy);

 

-     /* Stop everything except images, but stop them too if the

-	window isn't visible.  But we only remove the images. */

-

-     if(pPriv->type || !visible) {

-	if(pPriv->isOn == XV_ON) {

-	    (*pPriv->AdaptorRec->StopVideo)(

-			pPriv->pScrn, pPriv->DevPriv.ptr, FALSE);

-	    pPriv->isOn = XV_PENDING;

-	}

-

-	if(!pPriv->type) {  /* overlaid still/image */

-	    pPriv->pDraw = NULL;

-

-	    if(!pPrev)

-		dixSetPrivate(&pWin->devPrivates, XF86XVWindowKey,

-			      WinPriv->next);

-	    else

-	       pPrev->next = WinPriv->next;

-	    tmp = WinPriv;

-	    WinPriv = WinPriv->next;

-	    free(tmp);

-	    continue;

-	}

-     }

+     /*

+      * Stop and remove still/images if

+      * ReputImage isn't supported.

+      */

+     if (!pPriv->type && !pPriv->AdaptorRec->ReputImage)

+	visible = FALSE;

 

-next:

-     pPrev = WinPriv;

      WinPriv = WinPriv->next;

+     xf86XVReputOrStopPort(pPriv, pWin, visible);

   }

 

   if(ScreenPriv->ClipNotify) {

@@ -1195,6 +1244,7 @@ xf86XVCloseScreen(int i, ScreenPtr pScreen)
   pScrn->EnterVT = ScreenPriv->EnterVT;

   pScrn->LeaveVT = ScreenPriv->LeaveVT;

   pScrn->AdjustFrame = ScreenPriv->AdjustFrame;

+  pScrn->ModeSet = ScreenPriv->ModeSet;

 

   for(c = 0, pa = pxvs->pAdaptors; c < pxvs->nAdaptors; c++, pa++) {

        xf86XVFreeAdaptor(pa);

@@ -1287,11 +1337,7 @@ xf86XVAdjustFrame(int index, int x, int y, int flags)
 {

   ScrnInfoPtr pScrn = xf86Screens[index];

   ScreenPtr pScreen = pScrn->pScreen;

-  XvScreenPtr pxvs = GET_XV_SCREEN(pScreen);

   XF86XVScreenPtr ScreenPriv = GET_XF86XV_SCREEN(pScreen);

-  WindowPtr pWin;

-  XvAdaptorPtr pa;

-  int c, i;

 

   if(ScreenPriv->AdjustFrame) {

 	pScrn->AdjustFrame = ScreenPriv->AdjustFrame;

@@ -1299,40 +1345,30 @@ xf86XVAdjustFrame(int index, int x, int y, int flags)
 	pScrn->AdjustFrame = xf86XVAdjustFrame;

   }

 

-  for(c = pxvs->nAdaptors, pa = pxvs->pAdaptors; c > 0; c--, pa++) {

-      XvPortPtr pPort = pa->pPorts;

-      XvPortRecPrivatePtr pPriv;

-

-      for(i = pa->nPorts; i > 0; i--, pPort++) {

-	pPriv = (XvPortRecPrivatePtr)pPort->devPriv.ptr;

+  xf86XVReputOrStopAllPorts(pScrn);

+}

 

-	if(!pPriv->type && (pPriv->isOn != XV_OFF)) { /* overlaid still/image */

+static void

+xf86XVModeSet(ScrnInfoPtr pScrn)

+{

+    ScreenPtr pScreen = pScrn->pScreen;

+    XF86XVScreenPtr ScreenPriv;

 

-	  if(pPriv->pCompositeClip && pPriv->FreeCompositeClip)

-	     RegionDestroy(pPriv->pCompositeClip);

+    /* Can be called before pScrn->pScreen is set */

+    if (!pScreen)

+	return;

 

-	  pPriv->pCompositeClip = NULL;

+    ScreenPriv = GET_XF86XV_SCREEN(pScreen);

 

-	  pWin = (WindowPtr)pPriv->pDraw;

+    if (ScreenPriv->ModeSet) {

+	pScrn->ModeSet = ScreenPriv->ModeSet;

+	(*pScrn->ModeSet)(pScrn);

+	pScrn->ModeSet = xf86XVModeSet;

+    }

 

-	  if ((pPriv->AdaptorRec->ReputImage) &&

-	     ((pWin->visibility == VisibilityUnobscured) ||

-	      (pWin->visibility == VisibilityPartiallyObscured)))

-	  {

-	      xf86XVReputImage(pPriv);

-	  } else if (pPriv->isOn == XV_ON) {

-	     (*pPriv->AdaptorRec->StopVideo)(

-				 pPriv->pScrn, pPriv->DevPriv.ptr, FALSE);

-	     xf86XVRemovePortFromWindow(pWin, pPriv);

-	     pPriv->isOn = XV_PENDING;

-	     continue;

-	  }

-	}

-     }

-  }

+    xf86XVReputOrStopAllPorts(pScrn);

 }

 

-

 /**** XvAdaptorRec fields ****/

 

 static int

@@ -1429,6 +1465,8 @@ xf86XVPutStill(
   WinBox.x2 = WinBox.x1 + drw_w;

   WinBox.y2 = WinBox.y1 + drw_h;

 

+  xf86XVCopyCompositeClip(portPriv, pGC, pDraw);

+

   RegionInit(&WinRegion, &WinBox, 1);

   RegionNull(&ClipRegion);

   RegionIntersect(&ClipRegion, &WinRegion, pGC->pCompositeClip);

@@ -1482,6 +1520,8 @@ xf86XVPutStill(
 

      xf86XVEnlistPortInWindow((WindowPtr)pDraw, portPriv);

      portPriv->isOn = XV_ON;

+     portPriv->vid_x = vid_x;  portPriv->vid_y = vid_y;

+     portPriv->vid_w = vid_w;  portPriv->vid_h = vid_h;

      portPriv->drw_x = drw_x;  portPriv->drw_y = drw_y;

      portPriv->drw_w = drw_w;  portPriv->drw_h = drw_h;

      portPriv->type = 0;  /* no mask means it's transient and should

@@ -1497,6 +1537,10 @@ PUT_STILL_BAILOUT:
 	portPriv->isOn = XV_PENDING;

   }

 

+  /* This clip was copied and only good for one shot */

+  if(!portPriv->FreeCompositeClip)

+     portPriv->pCompositeClip = NULL;

+

   RegionUninit(&WinRegion);

   RegionUninit(&ClipRegion);

 

@@ -1718,6 +1762,8 @@ xf86XVPutImage(
 

   if(!portPriv->pScrn->vtSema) return Success; /* Success ? */

 

+  xf86XVCopyCompositeClip(portPriv, pGC, pDraw);

+

   WinBox.x1 = pDraw->x + drw_x;

   WinBox.y1 = pDraw->y + drw_y;

   WinBox.x2 = WinBox.x1 + drw_w;

@@ -1779,6 +1825,8 @@ xf86XVPutImage(
 	(portPriv->AdaptorRec->flags & VIDEO_OVERLAID_IMAGES)) {

 

      portPriv->isOn = XV_ON;

+     portPriv->vid_x = src_x;  portPriv->vid_y = src_y;

+     portPriv->vid_w = src_w;  portPriv->vid_h = src_h;

      portPriv->drw_x = drw_x;  portPriv->drw_y = drw_y;

      portPriv->drw_w = drw_w;  portPriv->drw_h = drw_h;

      portPriv->type = 0;  /* no mask means it's transient and should

@@ -1794,6 +1842,10 @@ PUT_IMAGE_BAILOUT:
 	portPriv->isOn = XV_PENDING;

   }

 

+  /* This clip was copied and only good for one shot */

+  if(!portPriv->FreeCompositeClip)

+     portPriv->pCompositeClip = NULL;

+

   RegionUninit(&WinRegion);

   RegionUninit(&ClipRegion);

 

diff --git a/xorg-server/hw/xfree86/common/xf86xv.h b/xorg-server/hw/xfree86/common/xf86xv.h
index c3db6cc73..25f3e4ad3 100644
--- a/xorg-server/hw/xfree86/common/xf86xv.h
+++ b/xorg-server/hw/xfree86/common/xf86xv.h
@@ -1,280 +1,286 @@
-
-/*
- * Copyright (c) 1998-2003 by The XFree86 Project, Inc.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- *
- * Except as contained in this notice, the name of the copyright holder(s)
- * and author(s) shall not be used in advertising or otherwise to promote
- * the sale, use or other dealings in this Software without prior written
- * authorization from the copyright holder(s) and author(s).
- */
-
-#ifndef _XF86XV_H_
-#define _XF86XV_H_
-
-#include "xvdix.h"
-#include "xf86str.h"
-
-#define VIDEO_NO_CLIPPING			0x00000001
-#define VIDEO_INVERT_CLIPLIST			0x00000002
-#define VIDEO_OVERLAID_IMAGES			0x00000004
-#define VIDEO_OVERLAID_STILLS			0x00000008
-#define VIDEO_CLIP_TO_VIEWPORT			0x00000010
-
-typedef struct {
-  int id;
-  int type;
-  int byte_order;
-  unsigned char guid[16];               
-  int bits_per_pixel;
-  int format;
-  int num_planes;
-
-  /* for RGB formats only */
-  int depth;
-  unsigned int red_mask;       
-  unsigned int green_mask;   
-  unsigned int blue_mask;   
-
-  /* for YUV formats only */
-  unsigned int y_sample_bits;
-  unsigned int u_sample_bits;
-  unsigned int v_sample_bits;   
-  unsigned int horz_y_period;
-  unsigned int horz_u_period;
-  unsigned int horz_v_period;
-  unsigned int vert_y_period;
-  unsigned int vert_u_period;
-  unsigned int vert_v_period;
-  char component_order[32];
-  int scanline_order;
-} XF86ImageRec, *XF86ImagePtr; 
-
-
-typedef struct {
-  ScrnInfoPtr pScrn;
-  int id;
-  unsigned short width, height;
-  int *pitches; /* bytes */
-  int *offsets; /* in bytes from start of framebuffer */
-  DevUnion devPrivate;  
-} XF86SurfaceRec, *XF86SurfacePtr;
-
-
-typedef int (* PutVideoFuncPtr)( ScrnInfoPtr pScrn, 
-	short vid_x, short vid_y, short drw_x, short drw_y,
-	short vid_w, short vid_h, short drw_w, short drw_h,
-	RegionPtr clipBoxes, pointer data, DrawablePtr pDraw );
-typedef int (* PutStillFuncPtr)( ScrnInfoPtr pScrn, 
-	short vid_x, short vid_y, short drw_x, short drw_y,
-	short vid_w, short vid_h, short drw_w, short drw_h,
-	RegionPtr clipBoxes, pointer data, DrawablePtr pDraw );
-typedef int (* GetVideoFuncPtr)( ScrnInfoPtr pScrn, 
-	short vid_x, short vid_y, short drw_x, short drw_y,
-	short vid_w, short vid_h, short drw_w, short drw_h,
-	RegionPtr clipBoxes, pointer data, DrawablePtr pDraw );
-typedef int (* GetStillFuncPtr)( ScrnInfoPtr pScrn, 
-	short vid_x, short vid_y, short drw_x, short drw_y,
-	short vid_w, short vid_h, short drw_w, short drw_h,
-	RegionPtr clipBoxes, pointer data, DrawablePtr pDraw );
-typedef void (* StopVideoFuncPtr)(ScrnInfoPtr pScrn, pointer data, Bool Exit);
-typedef int (* SetPortAttributeFuncPtr)(ScrnInfoPtr pScrn, Atom attribute,
-	INT32 value, pointer data);
-typedef int (* GetPortAttributeFuncPtr)(ScrnInfoPtr pScrn, Atom attribute,
-	INT32 *value, pointer data);
-typedef void (* QueryBestSizeFuncPtr)(ScrnInfoPtr pScrn, Bool motion,
-	short vid_w, short vid_h, short drw_w, short drw_h, 
-	unsigned int *p_w, unsigned int *p_h, pointer data);
-typedef int (* PutImageFuncPtr)( ScrnInfoPtr pScrn, 
-	short src_x, short src_y, short drw_x, short drw_y,
-	short src_w, short src_h, short drw_w, short drw_h,
-	int image, unsigned char* buf, short width, short height, Bool Sync,
-	RegionPtr clipBoxes, pointer data, DrawablePtr pDraw );
-typedef int (* ReputImageFuncPtr)( ScrnInfoPtr pScrn, short drw_x, short drw_y,
-	RegionPtr clipBoxes, pointer data, DrawablePtr pDraw );
-typedef int (*QueryImageAttributesFuncPtr)(ScrnInfoPtr pScrn, 
-	int image, unsigned short *width, unsigned short *height, 
-	int *pitches, int *offsets);
-typedef void (*ClipNotifyFuncPtr)(ScrnInfoPtr pScrn, pointer data,
-                                  WindowPtr window, int dx, int dy);
-
-typedef enum {
-    XV_OFF,
-    XV_PENDING,
-    XV_ON
-} XvStatus;
-
-/*** this is what the driver needs to fill out ***/
-
-typedef struct {
-  int id;
-  char *name;
-  unsigned short width, height;
-  XvRationalRec rate;
-} XF86VideoEncodingRec, *XF86VideoEncodingPtr;
-
-typedef struct {
-  char 	depth;  
-  short class;
-} XF86VideoFormatRec, *XF86VideoFormatPtr;
-
-typedef struct {
-  int   flags;
-  int   min_value;
-  int   max_value;
-  char  *name;
-} XF86AttributeRec, *XF86AttributePtr;
-
-typedef struct {
-  unsigned int type; 
-  int flags;
-  char *name;
-  int nEncodings;
-  XF86VideoEncodingPtr pEncodings;  
-  int nFormats;
-  XF86VideoFormatPtr pFormats;  
-  int nPorts;
-  DevUnion *pPortPrivates;
-  int nAttributes;
-  XF86AttributePtr pAttributes;
-  int nImages;
-  XF86ImagePtr pImages;
-  PutVideoFuncPtr PutVideo;
-  PutStillFuncPtr PutStill;
-  GetVideoFuncPtr GetVideo;
-  GetStillFuncPtr GetStill;
-  StopVideoFuncPtr StopVideo;
-  SetPortAttributeFuncPtr SetPortAttribute;
-  GetPortAttributeFuncPtr GetPortAttribute;
-  QueryBestSizeFuncPtr QueryBestSize;
-  PutImageFuncPtr PutImage;
-  ReputImageFuncPtr ReputImage;
-  QueryImageAttributesFuncPtr QueryImageAttributes;
-  ClipNotifyFuncPtr ClipNotify;
-} XF86VideoAdaptorRec, *XF86VideoAdaptorPtr;
-
-typedef struct {
-  XF86ImagePtr image;
-  int flags;
-  int (*alloc_surface)(ScrnInfoPtr pScrn,
-		  int id,
-		  unsigned short width, 	
-		  unsigned short height,
-		  XF86SurfacePtr surface);
-  int (*free_surface)(XF86SurfacePtr surface);
-  int (*display) (XF86SurfacePtr surface,
-		  short vid_x, short vid_y, 
-		  short drw_x, short drw_y,
-		  short vid_w, short vid_h, 
-		  short drw_w, short drw_h,
-		  RegionPtr clipBoxes);
-  int (*stop)    (XF86SurfacePtr surface);
-  int (*getAttribute) (ScrnInfoPtr pScrn, Atom attr, INT32 *value);
-  int (*setAttribute) (ScrnInfoPtr pScrn, Atom attr, INT32 value);
-  int max_width;
-  int max_height;
-  int num_attributes;
-  XF86AttributePtr attributes;
-} XF86OffscreenImageRec, *XF86OffscreenImagePtr;
-
-extern _X_EXPORT Bool
-xf86XVScreenInit(
-   ScreenPtr pScreen, 
-   XF86VideoAdaptorPtr 	*Adaptors,
-   int num
-);
-
-typedef int (* xf86XVInitGenericAdaptorPtr)(ScrnInfoPtr pScrn,
-	XF86VideoAdaptorPtr **Adaptors);
-
-extern _X_EXPORT int
-xf86XVRegisterGenericAdaptorDriver(
-    xf86XVInitGenericAdaptorPtr InitFunc
-);
-
-extern _X_EXPORT int
-xf86XVListGenericAdaptors(
-    ScrnInfoPtr          pScrn,
-    XF86VideoAdaptorPtr  **Adaptors
-);
-
-extern _X_EXPORT Bool
-xf86XVRegisterOffscreenImages(
-   ScreenPtr pScreen,
-   XF86OffscreenImagePtr images,
-   int num
-);
-
-extern _X_EXPORT XF86OffscreenImagePtr
-xf86XVQueryOffscreenImages(
-   ScreenPtr pScreen,
-   int *num
-);
-   
-extern _X_EXPORT XF86VideoAdaptorPtr xf86XVAllocateVideoAdaptorRec(ScrnInfoPtr pScrn);
-
-extern _X_EXPORT void xf86XVFreeVideoAdaptorRec(XF86VideoAdaptorPtr ptr);
-
-extern _X_EXPORT void
-xf86XVFillKeyHelper (ScreenPtr pScreen, CARD32 key, RegionPtr clipboxes);
-
-extern _X_EXPORT void
-xf86XVFillKeyHelperDrawable (DrawablePtr pDraw, CARD32 key, RegionPtr clipboxes);
-
-extern _X_EXPORT Bool
-xf86XVClipVideoHelper(
-    BoxPtr dst,
-    INT32 *xa,
-    INT32 *xb,
-    INT32 *ya,
-    INT32 *yb,
-    RegionPtr reg,
-    INT32 width,
-    INT32 height
-);
-
-extern _X_EXPORT void
-xf86XVCopyYUV12ToPacked(
-    const void *srcy,
-    const void *srcv,
-    const void *srcu,
-    void *dst,
-    int srcPitchy,
-    int srcPitchuv,
-    int dstPitch,
-    int h,
-    int w
-);
-
-extern _X_EXPORT void
-xf86XVCopyPacked(
-    const void *src,
-    void *dst,
-    int srcPitch,
-    int dstPitch,
-    int h,
-    int w
-);
-
-extern _X_EXPORT DevPrivateKey (*XvGetScreenKeyProc)(void);
-extern _X_EXPORT unsigned long (*XvGetRTPortProc)(void);
-extern _X_EXPORT int (*XvScreenInitProc)(ScreenPtr);
-
-#endif  /* _XF86XV_H_ */
+

+/*

+ * Copyright (c) 1998-2003 by The XFree86 Project, Inc.

+ *

+ * Permission is hereby granted, free of charge, to any person obtaining a

+ * copy of this software and associated documentation files (the "Software"),

+ * to deal in the Software without restriction, including without limitation

+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,

+ * and/or sell copies of the Software, and to permit persons to whom the

+ * Software is furnished to do so, subject to the following conditions:

+ *

+ * The above copyright notice and this permission notice shall be included in

+ * all copies or substantial portions of the Software.

+ *

+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

+ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR

+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,

+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

+ * OTHER DEALINGS IN THE SOFTWARE.

+ *

+ * Except as contained in this notice, the name of the copyright holder(s)

+ * and author(s) shall not be used in advertising or otherwise to promote

+ * the sale, use or other dealings in this Software without prior written

+ * authorization from the copyright holder(s) and author(s).

+ */

+

+#ifndef _XF86XV_H_

+#define _XF86XV_H_

+

+#include "xvdix.h"

+#include "xf86str.h"

+

+#define VIDEO_NO_CLIPPING			0x00000001

+#define VIDEO_INVERT_CLIPLIST			0x00000002

+#define VIDEO_OVERLAID_IMAGES			0x00000004

+#define VIDEO_OVERLAID_STILLS			0x00000008

+/*

+ * Usage of VIDEO_CLIP_TO_VIEWPORT is not recommended.

+ * It can make reput behaviour inconsistent.

+ */

+#define VIDEO_CLIP_TO_VIEWPORT			0x00000010

+

+typedef struct {

+  int id;

+  int type;

+  int byte_order;

+  unsigned char guid[16];               

+  int bits_per_pixel;

+  int format;

+  int num_planes;

+

+  /* for RGB formats only */

+  int depth;

+  unsigned int red_mask;       

+  unsigned int green_mask;   

+  unsigned int blue_mask;   

+

+  /* for YUV formats only */

+  unsigned int y_sample_bits;

+  unsigned int u_sample_bits;

+  unsigned int v_sample_bits;   

+  unsigned int horz_y_period;

+  unsigned int horz_u_period;

+  unsigned int horz_v_period;

+  unsigned int vert_y_period;

+  unsigned int vert_u_period;

+  unsigned int vert_v_period;

+  char component_order[32];

+  int scanline_order;

+} XF86ImageRec, *XF86ImagePtr; 

+

+

+typedef struct {

+  ScrnInfoPtr pScrn;

+  int id;

+  unsigned short width, height;

+  int *pitches; /* bytes */

+  int *offsets; /* in bytes from start of framebuffer */

+  DevUnion devPrivate;  

+} XF86SurfaceRec, *XF86SurfacePtr;

+

+

+typedef int (* PutVideoFuncPtr)( ScrnInfoPtr pScrn, 

+	short vid_x, short vid_y, short drw_x, short drw_y,

+	short vid_w, short vid_h, short drw_w, short drw_h,

+	RegionPtr clipBoxes, pointer data, DrawablePtr pDraw );

+typedef int (* PutStillFuncPtr)( ScrnInfoPtr pScrn, 

+	short vid_x, short vid_y, short drw_x, short drw_y,

+	short vid_w, short vid_h, short drw_w, short drw_h,

+	RegionPtr clipBoxes, pointer data, DrawablePtr pDraw );

+typedef int (* GetVideoFuncPtr)( ScrnInfoPtr pScrn, 

+	short vid_x, short vid_y, short drw_x, short drw_y,

+	short vid_w, short vid_h, short drw_w, short drw_h,

+	RegionPtr clipBoxes, pointer data, DrawablePtr pDraw );

+typedef int (* GetStillFuncPtr)( ScrnInfoPtr pScrn, 

+	short vid_x, short vid_y, short drw_x, short drw_y,

+	short vid_w, short vid_h, short drw_w, short drw_h,

+	RegionPtr clipBoxes, pointer data, DrawablePtr pDraw );

+typedef void (* StopVideoFuncPtr)(ScrnInfoPtr pScrn, pointer data, Bool Exit);

+typedef int (* SetPortAttributeFuncPtr)(ScrnInfoPtr pScrn, Atom attribute,

+	INT32 value, pointer data);

+typedef int (* GetPortAttributeFuncPtr)(ScrnInfoPtr pScrn, Atom attribute,

+	INT32 *value, pointer data);

+typedef void (* QueryBestSizeFuncPtr)(ScrnInfoPtr pScrn, Bool motion,

+	short vid_w, short vid_h, short drw_w, short drw_h, 

+	unsigned int *p_w, unsigned int *p_h, pointer data);

+typedef int (* PutImageFuncPtr)( ScrnInfoPtr pScrn, 

+	short src_x, short src_y, short drw_x, short drw_y,

+	short src_w, short src_h, short drw_w, short drw_h,

+	int image, unsigned char* buf, short width, short height, Bool Sync,

+	RegionPtr clipBoxes, pointer data, DrawablePtr pDraw );

+typedef int (* ReputImageFuncPtr)( ScrnInfoPtr pScrn,

+	short src_x, short src_y, short drw_x, short drw_y,

+	short src_w, short src_h, short drw_w, short drw_h,

+	RegionPtr clipBoxes, pointer data, DrawablePtr pDraw );

+typedef int (*QueryImageAttributesFuncPtr)(ScrnInfoPtr pScrn, 

+	int image, unsigned short *width, unsigned short *height, 

+	int *pitches, int *offsets);

+typedef void (*ClipNotifyFuncPtr)(ScrnInfoPtr pScrn, pointer data,

+                                  WindowPtr window, int dx, int dy);

+

+typedef enum {

+    XV_OFF,

+    XV_PENDING,

+    XV_ON

+} XvStatus;

+

+/*** this is what the driver needs to fill out ***/

+

+typedef struct {

+  int id;

+  char *name;

+  unsigned short width, height;

+  XvRationalRec rate;

+} XF86VideoEncodingRec, *XF86VideoEncodingPtr;

+

+typedef struct {

+  char 	depth;  

+  short class;

+} XF86VideoFormatRec, *XF86VideoFormatPtr;

+

+typedef struct {

+  int   flags;

+  int   min_value;

+  int   max_value;

+  char  *name;

+} XF86AttributeRec, *XF86AttributePtr;

+

+typedef struct {

+  unsigned int type; 

+  int flags;

+  char *name;

+  int nEncodings;

+  XF86VideoEncodingPtr pEncodings;  

+  int nFormats;

+  XF86VideoFormatPtr pFormats;  

+  int nPorts;

+  DevUnion *pPortPrivates;

+  int nAttributes;

+  XF86AttributePtr pAttributes;

+  int nImages;

+  XF86ImagePtr pImages;

+  PutVideoFuncPtr PutVideo;

+  PutStillFuncPtr PutStill;

+  GetVideoFuncPtr GetVideo;

+  GetStillFuncPtr GetStill;

+  StopVideoFuncPtr StopVideo;

+  SetPortAttributeFuncPtr SetPortAttribute;

+  GetPortAttributeFuncPtr GetPortAttribute;

+  QueryBestSizeFuncPtr QueryBestSize;

+  PutImageFuncPtr PutImage;

+  ReputImageFuncPtr ReputImage; /* image/still */

+  QueryImageAttributesFuncPtr QueryImageAttributes;

+  ClipNotifyFuncPtr ClipNotify;

+} XF86VideoAdaptorRec, *XF86VideoAdaptorPtr;

+

+typedef struct {

+  XF86ImagePtr image;

+  int flags;

+  int (*alloc_surface)(ScrnInfoPtr pScrn,

+		  int id,

+		  unsigned short width, 	

+		  unsigned short height,

+		  XF86SurfacePtr surface);

+  int (*free_surface)(XF86SurfacePtr surface);

+  int (*display) (XF86SurfacePtr surface,

+		  short vid_x, short vid_y, 

+		  short drw_x, short drw_y,

+		  short vid_w, short vid_h, 

+		  short drw_w, short drw_h,

+		  RegionPtr clipBoxes);

+  int (*stop)    (XF86SurfacePtr surface);

+  int (*getAttribute) (ScrnInfoPtr pScrn, Atom attr, INT32 *value);

+  int (*setAttribute) (ScrnInfoPtr pScrn, Atom attr, INT32 value);

+  int max_width;

+  int max_height;

+  int num_attributes;

+  XF86AttributePtr attributes;

+} XF86OffscreenImageRec, *XF86OffscreenImagePtr;

+

+extern _X_EXPORT Bool

+xf86XVScreenInit(

+   ScreenPtr pScreen, 

+   XF86VideoAdaptorPtr 	*Adaptors,

+   int num

+);

+

+typedef int (* xf86XVInitGenericAdaptorPtr)(ScrnInfoPtr pScrn,

+	XF86VideoAdaptorPtr **Adaptors);

+

+extern _X_EXPORT int

+xf86XVRegisterGenericAdaptorDriver(

+    xf86XVInitGenericAdaptorPtr InitFunc

+);

+

+extern _X_EXPORT int

+xf86XVListGenericAdaptors(

+    ScrnInfoPtr          pScrn,

+    XF86VideoAdaptorPtr  **Adaptors

+);

+

+extern _X_EXPORT Bool

+xf86XVRegisterOffscreenImages(

+   ScreenPtr pScreen,

+   XF86OffscreenImagePtr images,

+   int num

+);

+

+extern _X_EXPORT XF86OffscreenImagePtr

+xf86XVQueryOffscreenImages(

+   ScreenPtr pScreen,

+   int *num

+);

+   

+extern _X_EXPORT XF86VideoAdaptorPtr xf86XVAllocateVideoAdaptorRec(ScrnInfoPtr pScrn);

+

+extern _X_EXPORT void xf86XVFreeVideoAdaptorRec(XF86VideoAdaptorPtr ptr);

+

+extern _X_EXPORT void

+xf86XVFillKeyHelper (ScreenPtr pScreen, CARD32 key, RegionPtr clipboxes);

+

+extern _X_EXPORT void

+xf86XVFillKeyHelperDrawable (DrawablePtr pDraw, CARD32 key, RegionPtr clipboxes);

+

+extern _X_EXPORT Bool

+xf86XVClipVideoHelper(

+    BoxPtr dst,

+    INT32 *xa,

+    INT32 *xb,

+    INT32 *ya,

+    INT32 *yb,

+    RegionPtr reg,

+    INT32 width,

+    INT32 height

+);

+

+extern _X_EXPORT void

+xf86XVCopyYUV12ToPacked(

+    const void *srcy,

+    const void *srcv,

+    const void *srcu,

+    void *dst,

+    int srcPitchy,

+    int srcPitchuv,

+    int dstPitch,

+    int h,

+    int w

+);

+

+extern _X_EXPORT void

+xf86XVCopyPacked(

+    const void *src,

+    void *dst,

+    int srcPitch,

+    int dstPitch,

+    int h,

+    int w

+);

+

+extern _X_EXPORT DevPrivateKey (*XvGetScreenKeyProc)(void);

+extern _X_EXPORT unsigned long (*XvGetRTPortProc)(void);

+extern _X_EXPORT int (*XvScreenInitProc)(ScreenPtr);

+

+#endif  /* _XF86XV_H_ */

diff --git a/xorg-server/hw/xfree86/common/xf86xvpriv.h b/xorg-server/hw/xfree86/common/xf86xvpriv.h
index 7623d297d..35d72ca9c 100644
--- a/xorg-server/hw/xfree86/common/xf86xvpriv.h
+++ b/xorg-server/hw/xfree86/common/xf86xvpriv.h
@@ -1,88 +1,88 @@
-
-/*
- * Copyright (c) 2003 by The XFree86 Project, Inc.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- *
- * Except as contained in this notice, the name of the copyright holder(s)
- * and author(s) shall not be used in advertising or otherwise to promote
- * the sale, use or other dealings in this Software without prior written
- * authorization from the copyright holder(s) and author(s).
- */
-
-#ifndef _XF86XVPRIV_H_
-#define _XF86XVPRIV_H_
-
-#include "xf86xv.h"
-#include "privates.h"
-
-/*** These are DDX layer privates ***/
-
-extern _X_EXPORT DevPrivateKey XF86XvScreenKey;
-
-typedef struct {
-   DestroyWindowProcPtr		DestroyWindow;
-   ClipNotifyProcPtr		ClipNotify;
-   WindowExposuresProcPtr	WindowExposures;
-   void                         (*AdjustFrame)(int, int, int, int);
-   Bool                         (*EnterVT)(int, int);
-   void                         (*LeaveVT)(int, int);
-   GCPtr			videoGC;
-} XF86XVScreenRec, *XF86XVScreenPtr;
-
-typedef struct {
-  int flags;  
-  PutVideoFuncPtr PutVideo;
-  PutStillFuncPtr PutStill;
-  GetVideoFuncPtr GetVideo;
-  GetStillFuncPtr GetStill;
-  StopVideoFuncPtr StopVideo;
-  SetPortAttributeFuncPtr SetPortAttribute;
-  GetPortAttributeFuncPtr GetPortAttribute;
-  QueryBestSizeFuncPtr QueryBestSize;
-  PutImageFuncPtr PutImage;
-  ReputImageFuncPtr ReputImage;
-  QueryImageAttributesFuncPtr QueryImageAttributes;
-  ClipNotifyFuncPtr ClipNotify;
-} XvAdaptorRecPrivate, *XvAdaptorRecPrivatePtr;
-
-typedef struct {
-   ScrnInfoPtr pScrn;
-   DrawablePtr pDraw;
-   unsigned char type;
-   unsigned int subWindowMode;
-   DDXPointRec clipOrg;
-   RegionPtr clientClip;
-   RegionPtr pCompositeClip;
-   Bool FreeCompositeClip;
-   XvAdaptorRecPrivatePtr AdaptorRec;
-   XvStatus isOn;
-   Bool moved;
-   int vid_x, vid_y, vid_w, vid_h;
-   int drw_x, drw_y, drw_w, drw_h;
-   DevUnion DevPriv;
-} XvPortRecPrivate, *XvPortRecPrivatePtr;
-
-typedef struct _XF86XVWindowRec{
-   XvPortRecPrivatePtr PortRec;
-   struct _XF86XVWindowRec *next;
-   GCPtr pGC;
-} XF86XVWindowRec, *XF86XVWindowPtr;
-
-#endif  /* _XF86XVPRIV_H_ */
+

+/*

+ * Copyright (c) 2003 by The XFree86 Project, Inc.

+ *

+ * Permission is hereby granted, free of charge, to any person obtaining a

+ * copy of this software and associated documentation files (the "Software"),

+ * to deal in the Software without restriction, including without limitation

+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,

+ * and/or sell copies of the Software, and to permit persons to whom the

+ * Software is furnished to do so, subject to the following conditions:

+ *

+ * The above copyright notice and this permission notice shall be included in

+ * all copies or substantial portions of the Software.

+ *

+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

+ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR

+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,

+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

+ * OTHER DEALINGS IN THE SOFTWARE.

+ *

+ * Except as contained in this notice, the name of the copyright holder(s)

+ * and author(s) shall not be used in advertising or otherwise to promote

+ * the sale, use or other dealings in this Software without prior written

+ * authorization from the copyright holder(s) and author(s).

+ */

+

+#ifndef _XF86XVPRIV_H_

+#define _XF86XVPRIV_H_

+

+#include "xf86xv.h"

+#include "privates.h"

+

+/*** These are DDX layer privates ***/

+

+extern _X_EXPORT DevPrivateKey XF86XvScreenKey;

+

+typedef struct {

+   DestroyWindowProcPtr		DestroyWindow;

+   ClipNotifyProcPtr		ClipNotify;

+   WindowExposuresProcPtr	WindowExposures;

+   void                         (*AdjustFrame)(int, int, int, int);

+   Bool                         (*EnterVT)(int, int);

+   void                         (*LeaveVT)(int, int);

+   GCPtr			videoGC;

+   xf86ModeSetProc		*ModeSet;

+} XF86XVScreenRec, *XF86XVScreenPtr;

+

+typedef struct {

+  int flags;  

+  PutVideoFuncPtr PutVideo;

+  PutStillFuncPtr PutStill;

+  GetVideoFuncPtr GetVideo;

+  GetStillFuncPtr GetStill;

+  StopVideoFuncPtr StopVideo;

+  SetPortAttributeFuncPtr SetPortAttribute;

+  GetPortAttributeFuncPtr GetPortAttribute;

+  QueryBestSizeFuncPtr QueryBestSize;

+  PutImageFuncPtr PutImage;

+  ReputImageFuncPtr ReputImage;

+  QueryImageAttributesFuncPtr QueryImageAttributes;

+  ClipNotifyFuncPtr ClipNotify;

+} XvAdaptorRecPrivate, *XvAdaptorRecPrivatePtr;

+

+typedef struct {

+   ScrnInfoPtr pScrn;

+   DrawablePtr pDraw;

+   unsigned char type;

+   unsigned int subWindowMode;

+   RegionPtr clientClip;

+   RegionPtr pCompositeClip;

+   Bool FreeCompositeClip;

+   XvAdaptorRecPrivatePtr AdaptorRec;

+   XvStatus isOn;

+   Bool moved;

+   int vid_x, vid_y, vid_w, vid_h;

+   int drw_x, drw_y, drw_w, drw_h;

+   DevUnion DevPriv;

+} XvPortRecPrivate, *XvPortRecPrivatePtr;

+

+typedef struct _XF86XVWindowRec{

+   XvPortRecPrivatePtr PortRec;

+   struct _XF86XVWindowRec *next;

+   GCPtr pGC;

+} XF86XVWindowRec, *XF86XVWindowPtr;

+

+#endif  /* _XF86XVPRIV_H_ */

diff --git a/xorg-server/hw/xfree86/dixmods/extmod/xf86dga2.c b/xorg-server/hw/xfree86/dixmods/extmod/xf86dga2.c
index 060e5a4d7..f1c740723 100644
--- a/xorg-server/hw/xfree86/dixmods/extmod/xf86dga2.c
+++ b/xorg-server/hw/xfree86/dixmods/extmod/xf86dga2.c
@@ -99,7 +99,7 @@ ProcXDGAOpenFramebuffer(ClientPtr client)
     char *deviceName;

     int nameSize;

 

-    if (stuff->screen > screenInfo.numScreens)

+    if (stuff->screen >= screenInfo.numScreens)

         return BadValue;

 

     if (!DGAAvailable(stuff->screen))

@@ -133,7 +133,7 @@ ProcXDGACloseFramebuffer(ClientPtr client)
 {

     REQUEST(xXDGACloseFramebufferReq);

 

-    if (stuff->screen > screenInfo.numScreens)

+    if (stuff->screen >= screenInfo.numScreens)

         return BadValue;

 

     if (!DGAAvailable(stuff->screen))

@@ -155,7 +155,7 @@ ProcXDGAQueryModes(ClientPtr client)
     xXDGAModeInfo info;

     XDGAModePtr mode;

 

-    if (stuff->screen > screenInfo.numScreens)

+    if (stuff->screen >= screenInfo.numScreens)

         return BadValue;

 

     REQUEST_SIZE_MATCH(xXDGAQueryModesReq);

@@ -274,7 +274,7 @@ ProcXDGASetMode(ClientPtr client)
     ClientPtr owner;

     int size;

 

-    if (stuff->screen > screenInfo.numScreens)

+    if (stuff->screen >= screenInfo.numScreens)

         return BadValue;

     owner = DGA_GETCLIENT(stuff->screen);

 

@@ -363,7 +363,7 @@ ProcXDGASetViewport(ClientPtr client)
 {

     REQUEST(xXDGASetViewportReq);

 

-    if (stuff->screen > screenInfo.numScreens)

+    if (stuff->screen >= screenInfo.numScreens)

         return BadValue;

 

     if(DGA_GETCLIENT(stuff->screen) != client)

@@ -383,7 +383,7 @@ ProcXDGAInstallColormap(ClientPtr client)
     int rc;

     REQUEST(xXDGAInstallColormapReq);

 

-    if (stuff->screen > screenInfo.numScreens)

+    if (stuff->screen >= screenInfo.numScreens)

         return BadValue;

 

     if(DGA_GETCLIENT(stuff->screen) != client)

@@ -405,7 +405,7 @@ ProcXDGASelectInput(ClientPtr client)
 {

     REQUEST(xXDGASelectInputReq);

 

-    if (stuff->screen > screenInfo.numScreens)

+    if (stuff->screen >= screenInfo.numScreens)

         return BadValue;

 

     if(DGA_GETCLIENT(stuff->screen) != client)

@@ -425,7 +425,7 @@ ProcXDGAFillRectangle(ClientPtr client)
 {

     REQUEST(xXDGAFillRectangleReq);

 

-    if (stuff->screen > screenInfo.numScreens)

+    if (stuff->screen >= screenInfo.numScreens)

         return BadValue;

 

     if(DGA_GETCLIENT(stuff->screen) != client)

@@ -445,7 +445,7 @@ ProcXDGACopyArea(ClientPtr client)
 {

     REQUEST(xXDGACopyAreaReq);

 

-    if (stuff->screen > screenInfo.numScreens)

+    if (stuff->screen >= screenInfo.numScreens)

         return BadValue;

 

     if(DGA_GETCLIENT(stuff->screen) != client)

@@ -466,7 +466,7 @@ ProcXDGACopyTransparentArea(ClientPtr client)
 {

     REQUEST(xXDGACopyTransparentAreaReq);

 

-    if (stuff->screen > screenInfo.numScreens)

+    if (stuff->screen >= screenInfo.numScreens)

         return BadValue;

 

     if(DGA_GETCLIENT(stuff->screen) != client)

@@ -488,7 +488,7 @@ ProcXDGAGetViewportStatus(ClientPtr client)
     REQUEST(xXDGAGetViewportStatusReq);

     xXDGAGetViewportStatusReply rep;

 

-    if (stuff->screen > screenInfo.numScreens)

+    if (stuff->screen >= screenInfo.numScreens)

         return BadValue;

 

     if(DGA_GETCLIENT(stuff->screen) != client)

@@ -511,7 +511,7 @@ ProcXDGASync(ClientPtr client)
     REQUEST(xXDGASyncReq);

     xXDGASyncReply rep;

 

-    if (stuff->screen > screenInfo.numScreens)

+    if (stuff->screen >= screenInfo.numScreens)

         return BadValue;

 

     if(DGA_GETCLIENT(stuff->screen) != client)

@@ -556,7 +556,7 @@ ProcXDGAChangePixmapMode(ClientPtr client)
     xXDGAChangePixmapModeReply rep;

     int x, y;

 

-    if (stuff->screen > screenInfo.numScreens)

+    if (stuff->screen >= screenInfo.numScreens)

         return BadValue;

 

     if(DGA_GETCLIENT(stuff->screen) != client)

@@ -587,7 +587,7 @@ ProcXDGACreateColormap(ClientPtr client)
     REQUEST(xXDGACreateColormapReq);

     int result;

 

-    if (stuff->screen > screenInfo.numScreens)

+    if (stuff->screen >= screenInfo.numScreens)

         return BadValue;

 

     if(DGA_GETCLIENT(stuff->screen) != client)

@@ -625,7 +625,7 @@ ProcXF86DGAGetVideoLL(ClientPtr client)
     int num, offset, flags;

     char *name;

 

-    if (stuff->screen > screenInfo.numScreens)

+    if (stuff->screen >= screenInfo.numScreens)

 	return BadValue;

 

     REQUEST_SIZE_MATCH(xXF86DGAGetVideoLLReq);

@@ -664,7 +664,7 @@ ProcXF86DGADirectVideo(ClientPtr client)
     ClientPtr owner;

     REQUEST(xXF86DGADirectVideoReq);

 

-    if (stuff->screen > screenInfo.numScreens)

+    if (stuff->screen >= screenInfo.numScreens)

 	return BadValue;

     REQUEST_SIZE_MATCH(xXF86DGADirectVideoReq);

 

@@ -718,7 +718,7 @@ ProcXF86DGAGetViewPortSize(ClientPtr client)
     REQUEST(xXF86DGAGetViewPortSizeReq);

     xXF86DGAGetViewPortSizeReply rep;

 

-    if (stuff->screen > screenInfo.numScreens)

+    if (stuff->screen >= screenInfo.numScreens)

 	return BadValue;

 

     REQUEST_SIZE_MATCH(xXF86DGAGetViewPortSizeReq);

@@ -746,7 +746,7 @@ ProcXF86DGASetViewPort(ClientPtr client)
 {

     REQUEST(xXF86DGASetViewPortReq);

 

-    if (stuff->screen > screenInfo.numScreens)

+    if (stuff->screen >= screenInfo.numScreens)

 	return BadValue;

 

     if (DGA_GETCLIENT(stuff->screen) != client)

@@ -773,7 +773,7 @@ ProcXF86DGAGetVidPage(ClientPtr client)
     REQUEST(xXF86DGAGetVidPageReq);

     xXF86DGAGetVidPageReply rep;

 

-    if (stuff->screen > screenInfo.numScreens)

+    if (stuff->screen >= screenInfo.numScreens)

 	return BadValue;

 

     REQUEST_SIZE_MATCH(xXF86DGAGetVidPageReq);

@@ -792,7 +792,7 @@ ProcXF86DGASetVidPage(ClientPtr client)
 {

     REQUEST(xXF86DGASetVidPageReq);

 

-    if (stuff->screen > screenInfo.numScreens)

+    if (stuff->screen >= screenInfo.numScreens)

 	return BadValue;

 

     REQUEST_SIZE_MATCH(xXF86DGASetVidPageReq);

@@ -810,7 +810,7 @@ ProcXF86DGAInstallColormap(ClientPtr client)
     int rc;

     REQUEST(xXF86DGAInstallColormapReq);

 

-    if (stuff->screen > screenInfo.numScreens)

+    if (stuff->screen >= screenInfo.numScreens)

 	return BadValue;

 

     if (DGA_GETCLIENT(stuff->screen) != client)

@@ -837,7 +837,7 @@ ProcXF86DGAQueryDirectVideo(ClientPtr client)
     REQUEST(xXF86DGAQueryDirectVideoReq);

     xXF86DGAQueryDirectVideoReply rep;

 

-    if (stuff->screen > screenInfo.numScreens)

+    if (stuff->screen >= screenInfo.numScreens)

 	return BadValue;

 

     REQUEST_SIZE_MATCH(xXF86DGAQueryDirectVideoReq);

@@ -859,7 +859,7 @@ ProcXF86DGAViewPortChanged(ClientPtr client)
     REQUEST(xXF86DGAViewPortChangedReq);

     xXF86DGAViewPortChangedReply rep;

 

-    if (stuff->screen > screenInfo.numScreens)

+    if (stuff->screen >= screenInfo.numScreens)

 	return BadValue;

 

     if (DGA_GETCLIENT(stuff->screen) != client)

diff --git a/xorg-server/hw/xfree86/doc/devel/Registry b/xorg-server/hw/xfree86/doc/devel/Registry
index 613b50c7b..89a5f10fa 100644
--- a/xorg-server/hw/xfree86/doc/devel/Registry
+++ b/xorg-server/hw/xfree86/doc/devel/Registry
@@ -243,6 +243,7 @@ DemandLoad                O     I    ??
 Device                    S     I    Device file name

 DeviceName                S     I    Input device name

 FlowControl               S     I    Serial flow control ("xon", "none")

+Floating                  B     I    Device initialised as floating

 HistorySize               I     I    ??

 MaxX                      I     I    Maximum X coordinate

 MaxY                      I     I    Maximum Y coordinate

diff --git a/xorg-server/hw/xfree86/doc/man/xorg.conf.man.pre b/xorg-server/hw/xfree86/doc/man/xorg.conf.man.pre
index 6547d38aa..2267a0a1a 100644
--- a/xorg-server/hw/xfree86/doc/man/xorg.conf.man.pre
+++ b/xorg-server/hw/xfree86/doc/man/xorg.conf.man.pre
@@ -904,30 +904,42 @@ the server. This affects implied layouts as well as explicit layouts
 specified in the configuration and/or on the command line.

 .TP 7

 .BI "Option \*qCorePointer\*q"

-Deprecated, use

-.B SendCoreEvents

-instead.

+Deprecated, see

+.B Floating

 .TP 7

 .BI "Option \*qCoreKeyboard\*q"

-Deprecated, use

-.B SendCoreEvents

-instead.

+Deprecated, see

+.B Floating

 .TP 7

 .BI "Option \*qAlwaysCore\*q  \*q" boolean \*q

-.B

-Deprecated, use

-.B SendCoreEvents

-instead.

+Deprecated, see

+.B Floating

 .TP 7

 .BI "Option \*qSendCoreEvents\*q  \*q" boolean \*q

-Both of these options are equivalent, and when enabled cause the

-input device to report core events through the master device. They are

-enabled by default.  Any device configured to send core events will be

-attached to the virtual core pointer or keyboard and control the cursor by

-default. Devices with

-.B SendCoreEvents

-disabled will be \*qfloating\*q and only accessible by clients employing the

-X Input extension. This option controls the startup behavior only, a device

+Deprecated, see

+.B Floating

+

+.TP 7

+.BI "Option \*qFloating\*q  \*q" boolean \*q

+When enabled, the input device is set up floating and does not

+report events through any master device or control a cursor. The device is

+only available to clients using the X Input Extension API. This option is

+disabled by default.

+The options

+.B CorePointer,

+.B CoreKeyboard,

+.B AlwaysCore,

+and

+.B SendCoreEvents,

+are the inverse of option

+.B Floating

+(i.e.

+.B SendCoreEvents \*qon\*q

+is equivalent to

+.B Floating \*qoff\*q

+).

+

+This option controls the startup behavior only, a device

 may be reattached or set floating at runtime.

 .PP

 For pointing devices, the following options control how the pointer

diff --git a/xorg-server/hw/xfree86/loader/loadmod.c b/xorg-server/hw/xfree86/loader/loadmod.c
index 395cdf104..6fcb06df2 100644
--- a/xorg-server/hw/xfree86/loader/loadmod.c
+++ b/xorg-server/hw/xfree86/loader/loadmod.c
@@ -406,21 +406,21 @@ FindModuleInSubdir(const char *dirpath, const char *module)
  

         snprintf(tmpBuf, PATH_MAX, "lib%s.so", module);

         if (strcmp(direntry->d_name, tmpBuf) == 0) {

-            ret = malloc(strlen(tmpBuf) + strlen(dirpath) + 2);

+            ret = malloc(strlen(tmpBuf) + strlen(dirpath) + 1);

             sprintf(ret, "%s%s", dirpath, tmpBuf);

             break;

         }

 

         snprintf(tmpBuf, PATH_MAX, "%s_drv.so", module);

         if (strcmp(direntry->d_name, tmpBuf) == 0) {

-            ret = malloc(strlen(tmpBuf) + strlen(dirpath) + 2);

+            ret = malloc(strlen(tmpBuf) + strlen(dirpath) + 1);

             sprintf(ret, "%s%s", dirpath, tmpBuf);

             break;

         }

 

         snprintf(tmpBuf, PATH_MAX, "%s.so", module);

         if (strcmp(direntry->d_name, tmpBuf) == 0) {

-            ret = malloc(strlen(tmpBuf) + strlen(dirpath) + 2);

+            ret = malloc(strlen(tmpBuf) + strlen(dirpath) + 1);

             sprintf(ret, "%s%s", dirpath, tmpBuf);

             break;

         }

diff --git a/xorg-server/hw/xfree86/loader/sdksyms.sh b/xorg-server/hw/xfree86/loader/sdksyms.sh
index e9f8eda78..d69ae769e 100644
--- a/xorg-server/hw/xfree86/loader/sdksyms.sh
+++ b/xorg-server/hw/xfree86/loader/sdksyms.sh
@@ -41,6 +41,9 @@ cat > sdksyms.c << EOF
 #include "damage.h"

 #include "damagestr.h"

 

+/* miext/sync/Makefile.am */

+#include "misync.h"

+#include "misyncstr.h"

 

 /* Xext/Makefile.am -- half is module, half is builtin */

 /*

@@ -50,6 +53,7 @@ cat > sdksyms.c << EOF
 #include "geext.h"

 #include "geint.h"

 #include "shmint.h"

+#include "syncsdk.h"

 #if XINERAMA

 # include "panoramiXsrv.h"

 # include "panoramiX.h"

diff --git a/xorg-server/hw/xfree86/modes/xf86Crtc.c b/xorg-server/hw/xfree86/modes/xf86Crtc.c
index d421a942f..99658e0ca 100644
--- a/xorg-server/hw/xfree86/modes/xf86Crtc.c
+++ b/xorg-server/hw/xfree86/modes/xf86Crtc.c
@@ -82,6 +82,17 @@ xf86CrtcSetSizeRange (ScrnInfoPtr scrn,
     config->maxHeight = maxHeight;

 }

 

+void

+xf86CrtcSetScanoutFormats(ScrnInfoPtr		scrn,

+			  int			num_formats,

+			  xf86CrtcScanoutFormat	*formats)

+{

+    xf86CrtcConfigPtr	config = XF86_CRTC_CONFIG_PTR(scrn);

+

+    config->num_scanout_formats = num_formats;

+    config->scanout_formats = formats;

+}

+

 /*

  * Crtc functions

  */

@@ -106,12 +117,17 @@ xf86CrtcCreate (ScrnInfoPtr		scrn,
     pixman_transform_init_identity (&crtc->crtc_to_framebuffer);

     pixman_f_transform_init_identity (&crtc->f_crtc_to_framebuffer);

     pixman_f_transform_init_identity (&crtc->f_framebuffer_to_crtc);

+    pixman_f_transform_init_identity (&crtc->f_screen_to_crtc);

+    pixman_f_transform_init_identity (&crtc->user_sprite_position_transform);

+    pixman_f_transform_init_identity (&crtc->f_crtc_to_cursor);

+    pixman_f_transform_init_identity (&crtc->user_sprite_image_transform);

     crtc->filter = NULL;

     crtc->params = NULL;

     crtc->nparams = 0;

     crtc->filter_width = 0;

     crtc->filter_height = 0;

     crtc->transform_in_use = FALSE;

+    crtc->sprite_transform_in_use = FALSE;

     crtc->transformPresent = FALSE;

     crtc->desiredTransformPresent = FALSE;

     memset (&crtc->bounds, '\0', sizeof (crtc->bounds));

@@ -247,20 +263,20 @@ xf86CrtcSetScreenSubpixelOrder (ScreenPtr pScreen)
  * Sets the given video mode on the given crtc

  */

 Bool

-xf86CrtcSetModeTransform (xf86CrtcPtr crtc, DisplayModePtr mode, Rotation rotation,

-			  RRTransformPtr transform, int x, int y)

+xf86CrtcSet(xf86CrtcPtr crtc, xf86CrtcSetRec *set)

 {

     ScrnInfoPtr		scrn = crtc->scrn;

     xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(scrn);

     int			i;

     Bool		ret = FALSE;

     Bool		didLock = FALSE;

-    DisplayModePtr	adjusted_mode;

+    DisplayModePtr	adjusted_mode = NULL;

     DisplayModeRec	saved_mode;

     int			saved_x, saved_y;

     Rotation		saved_rotation;

     RRTransformRec	saved_transform;

     Bool		saved_transform_present;

+    PixmapPtr		saved_scanout_pixmap;

 

     crtc->enabled = xf86CrtcInUse (crtc);

 

@@ -272,13 +288,15 @@ xf86CrtcSetModeTransform (xf86CrtcPtr crtc, DisplayModePtr mode, Rotation rotati
 	return TRUE;

     }

 

-    adjusted_mode = xf86DuplicateMode(mode);

-

+    /* See if nothing has changed */

+    if (!set->flags)

+	return TRUE;

 

     saved_mode = crtc->mode;

     saved_x = crtc->x;

     saved_y = crtc->y;

     saved_rotation = crtc->rotation;

+    saved_scanout_pixmap = crtc->scanoutPixmap;

     if (crtc->transformPresent) {

 	RRTransformInit (&saved_transform);

 	RRTransformCopy (&saved_transform, &crtc->transform);

@@ -288,21 +306,46 @@ xf86CrtcSetModeTransform (xf86CrtcPtr crtc, DisplayModePtr mode, Rotation rotati
     /* Update crtc values up front so the driver can rely on them for mode

      * setting.

      */

-    crtc->mode = *mode;

-    crtc->x = x;

-    crtc->y = y;

-    crtc->rotation = rotation;

-    if (transform) {

-	RRTransformCopy (&crtc->transform, transform);

-	crtc->transformPresent = TRUE;

-    } else

-	crtc->transformPresent = FALSE;

+    if (set->flags & XF86CrtcSetMode)

+	crtc->mode = *set->mode;

+    if (set->flags & XF86CrtcSetOrigin) {

+	crtc->x = set->x;

+	crtc->y = set->y;

+    }

+    if (set->flags & XF86CrtcSetRotation)

+	crtc->rotation = set->rotation;

+    if (set->flags & XF86CrtcSetScanoutPixmap)

+	crtc->scanoutPixmap = set->scanout_pixmap;

+

+    if (set->flags & XF86CrtcSetTransform) {

+	if (set->transform) {

+	    RRTransformCopy (&crtc->transform, set->transform);

+	    crtc->transformPresent = TRUE;

+	} else

+	    crtc->transformPresent = FALSE;

+    }

+

+    if (crtc->funcs->set) {

+	ret = crtc->funcs->set(crtc, set->flags);

+	goto done;

+    }

+

+    if (set->flags == XF86CrtcSetOrigin && crtc->funcs->set_origin) {

+	ret = xf86CrtcRotate(crtc);

+	if (ret)

+	    crtc->funcs->set_origin(crtc, crtc->x, crtc->y);

+	goto done;

+    }

 

     if (crtc->funcs->set_mode_major) {

-	ret = crtc->funcs->set_mode_major(crtc, mode, rotation, x, y);

+	ret = crtc->funcs->set_mode_major(crtc, &crtc->mode,

+					  crtc->rotation,

+					  crtc->x, crtc->y);

 	goto done;

     }

 

+    adjusted_mode = xf86DuplicateMode(&crtc->mode);

+

     didLock = crtc->funcs->lock (crtc);

     /* Pass our mode to the outputs and the CRTC to give them a chance to

      * adjust it according to limitations or output properties, and also

@@ -314,12 +357,12 @@ xf86CrtcSetModeTransform (xf86CrtcPtr crtc, DisplayModePtr mode, Rotation rotati
 	if (output->crtc != crtc)

 	    continue;

 

-	if (!output->funcs->mode_fixup(output, mode, adjusted_mode)) {

+	if (!output->funcs->mode_fixup(output, &crtc->mode, adjusted_mode)) {

 	    goto done;

 	}

     }

 

-    if (!crtc->funcs->mode_fixup(crtc, mode, adjusted_mode)) {

+    if (!crtc->funcs->mode_fixup(crtc, &crtc->mode, adjusted_mode)) {

 	goto done;

     }

 

@@ -342,12 +385,12 @@ xf86CrtcSetModeTransform (xf86CrtcPtr crtc, DisplayModePtr mode, Rotation rotati
     /* Set up the DPLL and any output state that needs to adjust or depend

      * on the DPLL.

      */

-    crtc->funcs->mode_set(crtc, mode, adjusted_mode, crtc->x, crtc->y);

+    crtc->funcs->mode_set(crtc, &crtc->mode, adjusted_mode, crtc->x, crtc->y);

     for (i = 0; i < xf86_config->num_output; i++) 

     {

 	xf86OutputPtr output = xf86_config->output[i];

 	if (output->crtc == crtc)

-	    output->funcs->mode_set(output, mode, adjusted_mode);

+	    output->funcs->mode_set(output, &crtc->mode, adjusted_mode);

     }

 

     /* Only upload when needed, to avoid unneeded delays. */

@@ -371,6 +414,8 @@ done:
 	crtc->active = TRUE;

 	if (scrn->pScreen)

 	    xf86CrtcSetScreenSubpixelOrder (scrn->pScreen);

+	if (scrn->ModeSet)

+	    scrn->ModeSet(scrn);

     } else {

 	crtc->x = saved_x;

 	crtc->y = saved_y;

@@ -379,10 +424,13 @@ done:
 	if (saved_transform_present)

 	    RRTransformCopy (&crtc->transform, &saved_transform);

 	crtc->transformPresent = saved_transform_present;

+	crtc->scanoutPixmap = saved_scanout_pixmap;

     }

 

-    free(adjusted_mode->name);

-    free(adjusted_mode);

+    if (adjusted_mode) {

+	free(adjusted_mode->name);

+	free(adjusted_mode);

+    }

 

     if (didLock)

 	crtc->funcs->unlock (crtc);

@@ -391,31 +439,19 @@ done:
 }

 

 /**

- * Sets the given video mode on the given crtc, but without providing

- * a transform

- */

-Bool

-xf86CrtcSetMode (xf86CrtcPtr crtc, DisplayModePtr mode, Rotation rotation,

-		 int x, int y)

-{

-    return xf86CrtcSetModeTransform (crtc, mode, rotation, NULL, x, y);

-}

-

-/**

  * Pans the screen, does not change the mode

  */

 void

 xf86CrtcSetOrigin (xf86CrtcPtr crtc, int x, int y)

 {

-    crtc->x = x;

-    crtc->y = y;

-    if (crtc->funcs->set_origin) {

-	if (!xf86CrtcRotate (crtc))

-	    return;

-	crtc->funcs->set_origin (crtc, x, y);

+    xf86CrtcSetRec	set;

+

+    if (x != crtc->x || y != crtc->y) {

+	set.x = x;

+	set.y = y;

+	set.flags = XF86CrtcSetOrigin;

+	(void) xf86CrtcSet(crtc, &set);

     }

-    else

-	xf86CrtcSetMode (crtc, &crtc->mode, crtc->rotation, x, y);

 }

 

 /*

@@ -660,13 +696,11 @@ xf86OutputCreate (ScrnInfoPtr		    scrn,
 Bool

 xf86OutputRename (xf86OutputPtr output, const char *name)

 {

-    int	    len = strlen(name) + 1;

-    char    *newname = malloc(len);

+    char    *newname = strdup(name);

     

     if (!newname)

 	return FALSE;	/* so sorry... */

     

-    strcpy (newname, name);

     if (output->name && output->name != (char *) (output + 1))

 	free(output->name);

     output->name = newname;

@@ -2613,6 +2647,7 @@ xf86SetDesiredModes (ScrnInfoPtr scrn)
     for (c = 0; c < config->num_crtc; c++)

     {

 	xf86OutputPtr	output = NULL;

+	xf86CrtcSetRec	set;

 	int		o;

 	RRTransformPtr	transform;

 

@@ -2656,8 +2691,15 @@ xf86SetDesiredModes (ScrnInfoPtr scrn)
 	    transform = &crtc->desiredTransform;

 	else

 	    transform = NULL;

-	if (!xf86CrtcSetModeTransform (crtc, &crtc->desiredMode, crtc->desiredRotation,

-				       transform, crtc->desiredX, crtc->desiredY))

+	set.mode = &crtc->desiredMode;

+	set.rotation = crtc->desiredRotation;

+	set.transform = transform;

+	set.x = crtc->desiredX;

+	set.y = crtc->desiredY;

+	set.flags = (XF86CrtcSetMode | XF86CrtcSetOutput |

+		     XF86CrtcSetOrigin | XF86CrtcSetTransform |

+		     XF86CrtcSetRotation);

+	if (!xf86CrtcSet(crtc, &set))

 	    return FALSE;

     }

 

@@ -2761,6 +2803,7 @@ xf86SetSingleMode (ScrnInfoPtr pScrn, DisplayModePtr desired, Rotation rotation)
 	xf86CrtcPtr	crtc = config->crtc[c];

 	DisplayModePtr	crtc_mode = NULL;

 	int		o;

+	xf86CrtcSetRec	set;

 

 	if (!crtc->enabled)

 	    continue;

@@ -2788,7 +2831,15 @@ xf86SetSingleMode (ScrnInfoPtr pScrn, DisplayModePtr desired, Rotation rotation)
 	    crtc->enabled = FALSE;

 	    continue;

 	}

-	if (!xf86CrtcSetModeTransform (crtc, crtc_mode, rotation, NULL, 0, 0))

+	set.mode = crtc_mode;

+	set.rotation = rotation;

+	set.transform = NULL;

+	set.x = 0;

+	set.y = 0;

+	set.flags = (XF86CrtcSetMode | XF86CrtcSetOutput |

+		     XF86CrtcSetOrigin | XF86CrtcSetTransform |

+		     XF86CrtcSetRotation);

+	if (!xf86CrtcSet (crtc, &set))

 	    ok = FALSE;

 	else

 	{

@@ -2894,6 +2945,8 @@ xf86DisableUnusedFunctions(ScrnInfoPtr pScrn)
     }

     if (pScrn->pScreen)

 	xf86_crtc_notify(pScrn->pScreen);

+    if (pScrn->ModeSet)

+	pScrn->ModeSet(pScrn);

 }

 

 #ifdef RANDR_12_INTERFACE

diff --git a/xorg-server/hw/xfree86/modes/xf86Crtc.h b/xorg-server/hw/xfree86/modes/xf86Crtc.h
index 68a968cc2..e4037142f 100644
--- a/xorg-server/hw/xfree86/modes/xf86Crtc.h
+++ b/xorg-server/hw/xfree86/modes/xf86Crtc.h
@@ -1,972 +1,1075 @@
-/*
- * Copyright © 2006 Keith Packard
- *
- * 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 the copyright holders not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission.  The copyright holders make no representations
- * about the suitability of this software for any purpose.  It is provided "as
- * is" without express or implied warranty.
- *
- * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL THE COPYRIGHT HOLDERS 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.
- */
-#ifndef _XF86CRTC_H_
-#define _XF86CRTC_H_
-
-#include <edid.h>
-#include "randrstr.h"
-#if XF86_MODES_RENAME
-#include "xf86Rename.h"
-#endif
-#include "xf86Modes.h"
-#include "xf86Cursor.h"
-#include "xf86i2c.h"
-#include "damage.h"
-#include "picturestr.h"
-
-/* Compat definitions for older X Servers. */
-#ifndef M_T_PREFERRED
-#define M_T_PREFERRED	0x08
-#endif
-#ifndef M_T_DRIVER
-#define M_T_DRIVER	0x40
-#endif
-#ifndef M_T_USERPREF
-#define M_T_USERPREF	0x80
-#endif
-#ifndef HARDWARE_CURSOR_ARGB
-#define HARDWARE_CURSOR_ARGB				0x00004000
-#endif
-
-typedef struct _xf86Crtc xf86CrtcRec, *xf86CrtcPtr;
-typedef struct _xf86Output xf86OutputRec, *xf86OutputPtr;
-
-/* define a standard for connector types */
-typedef enum _xf86ConnectorType {
-   XF86ConnectorNone,
-   XF86ConnectorVGA,
-   XF86ConnectorDVI_I,
-   XF86ConnectorDVI_D,
-   XF86ConnectorDVI_A,
-   XF86ConnectorComposite,
-   XF86ConnectorSvideo,
-   XF86ConnectorComponent,
-   XF86ConnectorLFP,
-   XF86ConnectorProprietary,
-   XF86ConnectorHDMI,
-   XF86ConnectorDisplayPort,
-} xf86ConnectorType;
-
-typedef enum _xf86OutputStatus {
-   XF86OutputStatusConnected,
-   XF86OutputStatusDisconnected,
-   XF86OutputStatusUnknown
-} xf86OutputStatus;
-
-typedef struct _xf86CrtcFuncs {
-   /**
-    * Turns the crtc on/off, or sets intermediate power levels if available.
-    *
-    * Unsupported intermediate modes drop to the lower power setting.  If the
-    * mode is DPMSModeOff, the crtc must be disabled sufficiently for it to
-    * be safe to call mode_set.
-    */
-   void
-    (*dpms)(xf86CrtcPtr		crtc,
-	    int		    	mode);
-
-   /**
-    * Saves the crtc's state for restoration on VT switch.
-    */
-   void
-    (*save)(xf86CrtcPtr		crtc);
-
-   /**
-    * Restore's the crtc's state at VT switch.
-    */
-   void
-    (*restore)(xf86CrtcPtr	crtc);
-
-    /**
-     * Lock CRTC prior to mode setting, mostly for DRI.
-     * Returns whether unlock is needed
-     */
-    Bool
-    (*lock) (xf86CrtcPtr crtc);
-    
-    /**
-     * Unlock CRTC after mode setting, mostly for DRI
-     */
-    void
-    (*unlock) (xf86CrtcPtr crtc);
-    
-    /**
-     * Callback to adjust the mode to be set in the CRTC.
-     *
-     * This allows a CRTC to adjust the clock or even the entire set of
-     * timings, which is used for panels with fixed timings or for
-     * buses with clock limitations.
-     */
-    Bool
-    (*mode_fixup)(xf86CrtcPtr crtc,
-		  DisplayModePtr mode,
-		  DisplayModePtr adjusted_mode);
-
-    /**
-     * Prepare CRTC for an upcoming mode set.
-     */
-    void
-    (*prepare)(xf86CrtcPtr crtc);
-
-    /**
-     * Callback for setting up a video mode after fixups have been made.
-     */
-    void
-    (*mode_set)(xf86CrtcPtr crtc,
-		DisplayModePtr mode,
-		DisplayModePtr adjusted_mode,
-		int x, int y);
-
-    /**
-     * Commit mode changes to a CRTC
-     */
-    void
-    (*commit)(xf86CrtcPtr crtc);
-
-    /* Set the color ramps for the CRTC to the given values. */
-    void
-    (*gamma_set)(xf86CrtcPtr crtc, CARD16 *red, CARD16 *green, CARD16 *blue,
-		 int size);
-
-    /**
-     * Allocate the shadow area, delay the pixmap creation until needed
-     */
-    void *
-    (*shadow_allocate) (xf86CrtcPtr crtc, int width, int height);
-    
-    /**
-     * Create shadow pixmap for rotation support
-     */
-    PixmapPtr
-    (*shadow_create) (xf86CrtcPtr crtc, void *data, int width, int height);
-    
-    /**
-     * Destroy shadow pixmap
-     */
-    void
-    (*shadow_destroy) (xf86CrtcPtr crtc, PixmapPtr pPixmap, void *data);
-
-    /**
-     * Set cursor colors
-     */
-    void
-    (*set_cursor_colors) (xf86CrtcPtr crtc, int bg, int fg);
-
-    /**
-     * Set cursor position
-     */
-    void
-    (*set_cursor_position) (xf86CrtcPtr crtc, int x, int y);
-
-    /**
-     * Show cursor
-     */
-    void
-    (*show_cursor) (xf86CrtcPtr crtc);
-
-    /**
-     * Hide cursor
-     */
-    void
-    (*hide_cursor) (xf86CrtcPtr crtc);
-
-    /**
-     * Load monochrome image
-     */
-    void
-    (*load_cursor_image) (xf86CrtcPtr crtc, CARD8 *image);
-
-    /**
-     * Load ARGB image
-     */
-     void
-     (*load_cursor_argb) (xf86CrtcPtr crtc, CARD32 *image);
-     
-    /**
-     * Clean up driver-specific bits of the crtc
-     */
-    void
-    (*destroy) (xf86CrtcPtr	crtc);
-
-    /**
-     * Less fine-grained mode setting entry point for kernel modesetting
-     */
-    Bool
-    (*set_mode_major)(xf86CrtcPtr crtc, DisplayModePtr mode,
-		      Rotation rotation, int x, int y);
-
-    /**
-     * Callback for panning. Doesn't change the mode.
-     * Added in ABI version 2
-     */
-    void
-    (*set_origin)(xf86CrtcPtr crtc, int x, int y);
-
-} xf86CrtcFuncsRec, *xf86CrtcFuncsPtr;
-
-#define XF86_CRTC_VERSION 3
-
-struct _xf86Crtc {
-    /**
-     * ABI versioning
-     */
-    int version;
-
-    /**
-     * Associated ScrnInfo
-     */
-    ScrnInfoPtr	    scrn;
-    
-    /**
-     * Desired state of this CRTC
-     *
-     * Set when this CRTC should be driving one or more outputs 
-     */
-    Bool	    enabled;
-    
-    /**
-     * Active mode
-     *
-     * This reflects the mode as set in the CRTC currently
-     * It will be cleared when the VT is not active or
-     * during server startup
-     */
-    DisplayModeRec  mode;
-    Rotation	    rotation;
-    PixmapPtr	    rotatedPixmap;
-    void	    *rotatedData;
-    
-    /**
-     * Position on screen
-     *
-     * Locates this CRTC within the frame buffer
-     */
-    int		    x, y;
-    
-    /**
-     * Desired mode
-     *
-     * This is set to the requested mode, independent of
-     * whether the VT is active. In particular, it receives
-     * the startup configured mode and saves the active mode
-     * on VT switch.
-     */
-    DisplayModeRec  desiredMode;
-    Rotation	    desiredRotation;
-    int		    desiredX, desiredY;
-    
-    /** crtc-specific functions */
-    const xf86CrtcFuncsRec *funcs;
-
-    /**
-     * Driver private
-     *
-     * Holds driver-private information
-     */
-    void	    *driver_private;
-
-#ifdef RANDR_12_INTERFACE
-    /**
-     * RandR crtc
-     *
-     * When RandR 1.2 is available, this
-     * points at the associated crtc object
-     */
-    RRCrtcPtr	    randr_crtc;
-#else
-    void	    *randr_crtc;
-#endif
-
-    /**
-     * Current cursor is ARGB
-     */
-    Bool	    cursor_argb;
-    /**
-     * Track whether cursor is within CRTC range 
-     */
-    Bool	    cursor_in_range;
-    /**
-     * Track state of cursor associated with this CRTC
-     */
-    Bool	    cursor_shown;
-
-    /**
-     * Current transformation matrix
-     */
-    PictTransform   crtc_to_framebuffer;
-    /* framebuffer_to_crtc was removed in ABI 2 */
-    struct pict_f_transform f_crtc_to_framebuffer; /* ABI 2 */
-    struct pict_f_transform f_framebuffer_to_crtc; /* ABI 2 */
-    PictFilterPtr   filter; /* ABI 2 */
-    xFixed	    *params; /* ABI 2 */
-    int		    nparams; /* ABI 2 */
-    int		    filter_width; /* ABI 2 */
-    int		    filter_height; /* ABI 2 */
-    Bool	    transform_in_use;
-    RRTransformRec  transform; /* ABI 2 */
-    Bool	    transformPresent; /* ABI 2 */
-    RRTransformRec  desiredTransform; /* ABI 2 */
-    Bool	    desiredTransformPresent; /* ABI 2 */
-    /**
-     * Bounding box in screen space
-     */
-    BoxRec	    bounds;
-    /**
-     * Panning:
-     * TotalArea: total panning area, larger than CRTC's size
-     * TrackingArea: Area of the pointer for which the CRTC is panned
-     * border: Borders of the displayed CRTC area which induces panning if the pointer reaches them
-     * Added in ABI version 2
-     */
-    BoxRec          panningTotalArea;
-    BoxRec          panningTrackingArea;
-    INT16           panningBorder[4];
-
-    /**
-     * Current gamma, especially useful after initial config.
-     * Added in ABI version 3
-     */
-    CARD16 *gamma_red;
-    CARD16 *gamma_green;
-    CARD16 *gamma_blue;
-    int gamma_size;
-
-    /**
-     * Actual state of this CRTC
-     *
-     * Set to TRUE after modesetting, set to FALSE if no outputs are connected
-     * Added in ABI version 3
-     */
-    Bool	    active;
-    /**
-     * Clear the shadow
-     */
-    Bool	    shadowClear;
-};
-
-typedef struct _xf86OutputFuncs {
-    /**
-     * Called to allow the output a chance to create properties after the
-     * RandR objects have been created.
-     */
-    void
-    (*create_resources)(xf86OutputPtr output);
-
-    /**
-     * Turns the output on/off, or sets intermediate power levels if available.
-     *
-     * Unsupported intermediate modes drop to the lower power setting.  If the
-     * mode is DPMSModeOff, the output must be disabled, as the DPLL may be
-     * disabled afterwards.
-     */
-    void
-    (*dpms)(xf86OutputPtr	output,
-	    int			mode);
-
-    /**
-     * Saves the output's state for restoration on VT switch.
-     */
-    void
-    (*save)(xf86OutputPtr	output);
-
-    /**
-     * Restore's the output's state at VT switch.
-     */
-    void
-    (*restore)(xf86OutputPtr	output);
-
-    /**
-     * Callback for testing a video mode for a given output.
-     *
-     * This function should only check for cases where a mode can't be supported
-     * on the output specifically, and not represent generic CRTC limitations.
-     *
-     * \return MODE_OK if the mode is valid, or another MODE_* otherwise.
-     */
-    int
-    (*mode_valid)(xf86OutputPtr	    output,
-		  DisplayModePtr    pMode);
-
-    /**
-     * Callback to adjust the mode to be set in the CRTC.
-     *
-     * This allows an output to adjust the clock or even the entire set of
-     * timings, which is used for panels with fixed timings or for
-     * buses with clock limitations.
-     */
-    Bool
-    (*mode_fixup)(xf86OutputPtr output,
-		  DisplayModePtr mode,
-		  DisplayModePtr adjusted_mode);
-
-    /**
-     * Callback for preparing mode changes on an output
-     */
-    void
-    (*prepare)(xf86OutputPtr output);
-
-    /**
-     * Callback for committing mode changes on an output
-     */
-    void
-    (*commit)(xf86OutputPtr output);
-
-    /**
-     * Callback for setting up a video mode after fixups have been made.
-     *
-     * This is only called while the output is disabled.  The dpms callback
-     * must be all that's necessary for the output, to turn the output on
-     * after this function is called.
-     */
-    void
-    (*mode_set)(xf86OutputPtr  output,
-		DisplayModePtr mode,
-		DisplayModePtr adjusted_mode);
-
-    /**
-     * Probe for a connected output, and return detect_status.
-     */
-    xf86OutputStatus
-    (*detect)(xf86OutputPtr	    output);
-
-    /**
-     * Query the device for the modes it provides.
-     *
-     * This function may also update MonInfo, mm_width, and mm_height.
-     *
-     * \return singly-linked list of modes or NULL if no modes found.
-     */
-    DisplayModePtr
-    (*get_modes)(xf86OutputPtr	    output);
-
-#ifdef RANDR_12_INTERFACE
-    /**
-     * Callback when an output's property has changed.
-     */
-    Bool
-    (*set_property)(xf86OutputPtr output,
-		    Atom property,
-		    RRPropertyValuePtr value);
-#endif
-#ifdef RANDR_13_INTERFACE
-    /**
-     * Callback to get an updated property value
-     */
-    Bool
-    (*get_property)(xf86OutputPtr output,
-		    Atom property);
-#endif
-#ifdef RANDR_GET_CRTC_INTERFACE
-    /**
-     * Callback to get current CRTC for a given output
-     */
-    xf86CrtcPtr
-    (*get_crtc)(xf86OutputPtr output);
-#endif
-    /**
-     * Clean up driver-specific bits of the output
-     */
-    void
-    (*destroy) (xf86OutputPtr	    output);
-} xf86OutputFuncsRec, *xf86OutputFuncsPtr;
-
-
-#define XF86_OUTPUT_VERSION 2
-
-struct _xf86Output {
-    /**
-     * ABI versioning
-     */
-    int version;
-
-    /**
-     * Associated ScrnInfo
-     */
-    ScrnInfoPtr		scrn;
-
-    /**
-     * Currently connected crtc (if any)
-     *
-     * If this output is not in use, this field will be NULL.
-     */
-    xf86CrtcPtr		crtc;
-
-    /**
-     * Possible CRTCs for this output as a mask of crtc indices
-     */
-    CARD32		possible_crtcs;
-
-    /**
-     * Possible outputs to share the same CRTC as a mask of output indices
-     */
-    CARD32		possible_clones;
-    
-    /**
-     * Whether this output can support interlaced modes
-     */
-    Bool		interlaceAllowed;
-
-    /**
-     * Whether this output can support double scan modes
-     */
-    Bool		doubleScanAllowed;
-
-    /**
-     * List of available modes on this output.
-     *
-     * This should be the list from get_modes(), plus perhaps additional
-     * compatible modes added later.
-     */
-    DisplayModePtr	probed_modes;
-
-    /**
-     * Options parsed from the related monitor section
-     */
-    OptionInfoPtr	options;
-    
-    /**
-     * Configured monitor section
-     */
-    XF86ConfMonitorPtr  conf_monitor;
-    
-    /**
-     * Desired initial position
-     */
-    int			initial_x, initial_y;
-
-    /**
-     * Desired initial rotation
-     */
-    Rotation		initial_rotation;
-
-    /**
-     * Current connection status
-     *
-     * This indicates whether a monitor is known to be connected
-     * to this output or not, or whether there is no way to tell
-     */
-    xf86OutputStatus	status;
-
-    /** EDID monitor information */
-    xf86MonPtr		MonInfo;
-
-    /** subpixel order */
-    int			subpixel_order;
-
-    /** Physical size of the currently attached output device. */
-    int			mm_width, mm_height;
-
-    /** Output name */
-    char		*name;
-
-    /** output-specific functions */
-    const xf86OutputFuncsRec *funcs;
-
-    /** driver private information */
-    void		*driver_private;
-    
-    /** Whether to use the old per-screen Monitor config section */
-    Bool		use_screen_monitor;
-
-#ifdef RANDR_12_INTERFACE
-    /**
-     * RandR 1.2 output structure.
-     *
-     * When RandR 1.2 is available, this points at the associated
-     * RandR output structure and is created when this output is created
-     */
-    RROutputPtr		randr_output;
-#else
-    void		*randr_output;
-#endif
-    /** 
-     * Desired initial panning
-     * Added in ABI version 2
-     */
-    BoxRec          initialTotalArea;
-    BoxRec          initialTrackingArea;
-    INT16           initialBorder[4];
-};
-
-typedef struct _xf86CrtcConfigFuncs {
-    /**
-     * Requests that the driver resize the screen.
-     *
-     * The driver is responsible for updating scrn->virtualX and scrn->virtualY.
-     * If the requested size cannot be set, the driver should leave those values
-     * alone and return FALSE.
-     *
-     * A naive driver that cannot reallocate the screen may simply change
-     * virtual[XY].  A more advanced driver will want to also change the
-     * devPrivate.ptr and devKind of the screen pixmap, update any offscreen
-     * pixmaps it may have moved, and change pScrn->displayWidth.
-     */
-    Bool
-    (*resize)(ScrnInfoPtr	scrn,
-	      int		width,
-	      int		height);
-} xf86CrtcConfigFuncsRec, *xf86CrtcConfigFuncsPtr;
-
-typedef void (*xf86_crtc_notify_proc_ptr) (ScreenPtr pScreen);
-
-typedef struct _xf86CrtcConfig {
-    int			num_output;
-    xf86OutputPtr	*output;
-    /**
-     * compat_output is used whenever we deal
-     * with legacy code that only understands a single
-     * output. pScrn->modes will be loaded from this output,
-     * adjust frame will whack this output, etc.
-     */
-    int			compat_output;
-
-    int			num_crtc;
-    xf86CrtcPtr		*crtc;
-
-    int			minWidth, minHeight;
-    int			maxWidth, maxHeight;
-    
-    /* For crtc-based rotation */
-    DamagePtr		rotation_damage;
-    Bool		rotation_damage_registered;
-
-    /* DGA */
-    unsigned int	dga_flags;
-    unsigned long	dga_address;
-    DGAModePtr		dga_modes;
-    int			dga_nmode;
-    int			dga_width, dga_height, dga_stride;
-    DisplayModePtr	dga_save_mode;
-
-    const xf86CrtcConfigFuncsRec *funcs;
-
-    CreateScreenResourcesProcPtr    CreateScreenResources;
-
-    CloseScreenProcPtr		    CloseScreen;
-
-    /* Cursor information */
-    xf86CursorInfoPtr	cursor_info;
-    CursorPtr		cursor;
-    CARD8		*cursor_image;
-    Bool		cursor_on;
-    CARD32		cursor_fg, cursor_bg;
-
-    /**
-     * Options parsed from the related device section
-     */
-    OptionInfoPtr	options;
-
-    Bool		debug_modes;
-
-    /* wrap screen BlockHandler for rotation */
-    ScreenBlockHandlerProcPtr	BlockHandler;
-
-    /* callback when crtc configuration changes */
-    xf86_crtc_notify_proc_ptr  xf86_crtc_notify;
-
-} xf86CrtcConfigRec, *xf86CrtcConfigPtr;
-
-extern _X_EXPORT int xf86CrtcConfigPrivateIndex;
-
-#define XF86_CRTC_CONFIG_PTR(p)	((xf86CrtcConfigPtr) ((p)->privates[xf86CrtcConfigPrivateIndex].ptr))
-
-static _X_INLINE xf86OutputPtr
-xf86CompatOutput(ScrnInfoPtr pScrn)
-{
-    xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn);
-    return config->output[config->compat_output];
-}
-
-static _X_INLINE xf86CrtcPtr
-xf86CompatCrtc(ScrnInfoPtr pScrn)
-{
-    xf86OutputPtr compat_output = xf86CompatOutput(pScrn);
-    if (!compat_output)
-	return NULL;
-    return compat_output->crtc;
-}
-
-static _X_INLINE RRCrtcPtr
-xf86CompatRRCrtc(ScrnInfoPtr pScrn)
-{
-    xf86CrtcPtr	compat_crtc = xf86CompatCrtc(pScrn);
-    if (!compat_crtc)
-	return NULL;
-    return compat_crtc->randr_crtc;
-}
-
-
-/*
- * Initialize xf86CrtcConfig structure
- */
-
-extern _X_EXPORT void
-xf86CrtcConfigInit (ScrnInfoPtr				scrn,
-		    const xf86CrtcConfigFuncsRec	*funcs);
-
-extern _X_EXPORT void
-xf86CrtcSetSizeRange (ScrnInfoPtr scrn,
-		      int minWidth, int minHeight,
-		      int maxWidth, int maxHeight);
-
-/*
- * Crtc functions
- */
-extern _X_EXPORT xf86CrtcPtr
-xf86CrtcCreate (ScrnInfoPtr		scrn,
-		const xf86CrtcFuncsRec	*funcs);
-
-extern _X_EXPORT void
-xf86CrtcDestroy (xf86CrtcPtr		crtc);
-
-
-/**
- * Sets the given video mode on the given crtc
- */
-
-extern _X_EXPORT Bool
-xf86CrtcSetModeTransform (xf86CrtcPtr crtc, DisplayModePtr mode, Rotation rotation,
-			  RRTransformPtr transform, int x, int y);
-
-extern _X_EXPORT Bool
-xf86CrtcSetMode (xf86CrtcPtr crtc, DisplayModePtr mode, Rotation rotation,
-		 int x, int y);
-
-extern _X_EXPORT void
-xf86CrtcSetOrigin (xf86CrtcPtr crtc, int x, int y);
-
-/*
- * Assign crtc rotation during mode set
- */
-extern _X_EXPORT Bool
-xf86CrtcRotate (xf86CrtcPtr crtc);
-
-/*
- * Clean up any rotation data, used when a crtc is turned off
- * as well as when rotation is disabled.
- */
-extern _X_EXPORT void
-xf86RotateDestroy (xf86CrtcPtr crtc);
-
-/*
- * free shadow memory allocated for all crtcs
- */
-extern _X_EXPORT void
-xf86RotateFreeShadow(ScrnInfoPtr pScrn);
-
-/*
- * Clean up rotation during CloseScreen
- */
-extern _X_EXPORT void
-xf86RotateCloseScreen (ScreenPtr pScreen);
-
-/**
- * Return whether any output is assigned to the crtc
- */
-extern _X_EXPORT Bool
-xf86CrtcInUse (xf86CrtcPtr crtc);
-
-/*
- * Output functions
- */
-extern _X_EXPORT xf86OutputPtr
-xf86OutputCreate (ScrnInfoPtr		    scrn,
-		  const xf86OutputFuncsRec  *funcs,
-		  const char		    *name);
-
-extern _X_EXPORT void
-xf86OutputUseScreenMonitor (xf86OutputPtr output, Bool use_screen_monitor);
-
-extern _X_EXPORT Bool
-xf86OutputRename (xf86OutputPtr output, const char *name);
-
-extern _X_EXPORT void
-xf86OutputDestroy (xf86OutputPtr	output);
-
-extern _X_EXPORT void
-xf86ProbeOutputModes (ScrnInfoPtr pScrn, int maxX, int maxY);
-
-extern _X_EXPORT void
-xf86SetScrnInfoModes (ScrnInfoPtr pScrn);
-
-#ifdef RANDR_13_INTERFACE
-# define ScreenInitRetType	int
-#else
-# define ScreenInitRetType	Bool
-#endif
-
-extern _X_EXPORT ScreenInitRetType
-xf86CrtcScreenInit (ScreenPtr pScreen);
-
-extern _X_EXPORT Bool
-xf86InitialConfiguration (ScrnInfoPtr pScrn, Bool canGrow);
-
-extern _X_EXPORT void
-xf86DPMSSet(ScrnInfoPtr pScrn, int PowerManagementMode, int flags);
-    
-extern _X_EXPORT Bool
-xf86SaveScreen(ScreenPtr pScreen, int mode);
-
-extern _X_EXPORT void
-xf86DisableUnusedFunctions(ScrnInfoPtr pScrn);
-
-extern _X_EXPORT DisplayModePtr
-xf86OutputFindClosestMode (xf86OutputPtr output, DisplayModePtr desired);
-    
-extern _X_EXPORT Bool
-xf86SetSingleMode (ScrnInfoPtr pScrn, DisplayModePtr desired, Rotation rotation);
-
-/**
- * Set the EDID information for the specified output
- */
-extern _X_EXPORT void
-xf86OutputSetEDID (xf86OutputPtr output, xf86MonPtr edid_mon);
-
-/**
- * Return the list of modes supported by the EDID information
- * stored in 'output'
- */
-extern _X_EXPORT DisplayModePtr
-xf86OutputGetEDIDModes (xf86OutputPtr output);
-
-extern _X_EXPORT xf86MonPtr
-xf86OutputGetEDID (xf86OutputPtr output, I2CBusPtr pDDCBus);
-
-/**
- * Initialize dga for this screen
- */
-
-#ifdef XFreeXDGA
-extern _X_EXPORT Bool
-xf86DiDGAInit (ScreenPtr pScreen, unsigned long dga_address);
-
-/* this is the real function, used only internally */
-_X_INTERNAL Bool
-_xf86_di_dga_init_internal (ScreenPtr pScreen);
-
-/**
- * Re-initialize dga for this screen (as when the set of modes changes)
- */
-
-extern _X_EXPORT Bool
-xf86DiDGAReInit (ScreenPtr pScreen);
-#endif
-
-/* This is the real function, used only internally */
-_X_INTERNAL Bool
-_xf86_di_dga_reinit_internal (ScreenPtr pScreen);
-
-/*
- * Set the subpixel order reported for the screen using
- * the information from the outputs
- */
-
-extern _X_EXPORT void
-xf86CrtcSetScreenSubpixelOrder (ScreenPtr pScreen);
-
-/*
- * Get a standard string name for a connector type 
- */
-extern _X_EXPORT char *
-xf86ConnectorGetName(xf86ConnectorType connector);
-
-/*
- * Using the desired mode information in each crtc, set
- * modes (used in EnterVT functions, or at server startup)
- */
-
-extern _X_EXPORT Bool
-xf86SetDesiredModes (ScrnInfoPtr pScrn);
-
-/**
- * Initialize the CRTC-based cursor code. CRTC function vectors must
- * contain relevant cursor setting functions.
- *
- * Driver should call this from ScreenInit function
- */
-extern _X_EXPORT Bool
-xf86_cursors_init (ScreenPtr screen, int max_width, int max_height, int flags);
-
-/**
- * Called when anything on the screen is reconfigured.
- *
- * Reloads cursor images as needed, then adjusts cursor positions.
- * 
- * Driver should call this from crtc commit function.
- */
-extern _X_EXPORT void
-xf86_reload_cursors (ScreenPtr screen);
-
-/**
- * Called from EnterVT to turn the cursors back on
- */
-extern _X_EXPORT void
-xf86_show_cursors (ScrnInfoPtr scrn);
-
-/**
- * Called by the driver to turn cursors off
- */
-extern _X_EXPORT void
-xf86_hide_cursors (ScrnInfoPtr scrn);
-
-/**
- * Clean up CRTC-based cursor code. Driver must call this at CloseScreen time.
- */
-extern _X_EXPORT void
-xf86_cursors_fini (ScreenPtr screen);
-
-/*
- * For overlay video, compute the relevant CRTC and
- * clip video to that.
- * wraps xf86XVClipVideoHelper()
- */
-
-extern _X_EXPORT Bool
-xf86_crtc_clip_video_helper(ScrnInfoPtr pScrn,
-			    xf86CrtcPtr *crtc_ret,
-			    xf86CrtcPtr desired_crtc,
-			    BoxPtr      dst,
-			    INT32	*xa,
-			    INT32	*xb,
-			    INT32	*ya,
-			    INT32	*yb,
-			    RegionPtr   reg,
-			    INT32	width,
-			    INT32	height);
-    
-extern _X_EXPORT xf86_crtc_notify_proc_ptr
-xf86_wrap_crtc_notify (ScreenPtr pScreen, xf86_crtc_notify_proc_ptr new);
-
-extern _X_EXPORT void
-xf86_unwrap_crtc_notify(ScreenPtr pScreen, xf86_crtc_notify_proc_ptr old);
-
-extern _X_EXPORT void
-xf86_crtc_notify(ScreenPtr pScreen);
-
-/**
- * Gamma
- */
-
-extern _X_EXPORT Bool
-xf86_crtc_supports_gamma(ScrnInfoPtr pScrn);
-
-#endif /* _XF86CRTC_H_ */
+/*

+ * Copyright © 2006 Keith Packard

+ *

+ * 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 the copyright holders not be used in advertising or

+ * publicity pertaining to distribution of the software without specific,

+ * written prior permission.  The copyright holders make no representations

+ * about the suitability of this software for any purpose.  It is provided "as

+ * is" without express or implied warranty.

+ *

+ * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO

+ * EVENT SHALL THE COPYRIGHT HOLDERS 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.

+ */

+#ifndef _XF86CRTC_H_

+#define _XF86CRTC_H_

+

+#include <edid.h>

+#include "randrstr.h"

+#if XF86_MODES_RENAME

+#include "xf86Rename.h"

+#endif

+#include "xf86Modes.h"

+#include "xf86Cursor.h"

+#include "xf86i2c.h"

+#include "damage.h"

+#include "picturestr.h"

+

+/* Compat definitions for older X Servers. */

+#ifndef M_T_PREFERRED

+#define M_T_PREFERRED	0x08

+#endif

+#ifndef M_T_DRIVER

+#define M_T_DRIVER	0x40

+#endif

+#ifndef M_T_USERPREF

+#define M_T_USERPREF	0x80

+#endif

+#ifndef HARDWARE_CURSOR_ARGB

+#define HARDWARE_CURSOR_ARGB				0x00004000

+#endif

+

+typedef struct _xf86Crtc xf86CrtcRec, *xf86CrtcPtr;

+typedef struct _xf86Output xf86OutputRec, *xf86OutputPtr;

+

+/* define a standard for connector types */

+typedef enum _xf86ConnectorType {

+   XF86ConnectorNone,

+   XF86ConnectorVGA,

+   XF86ConnectorDVI_I,

+   XF86ConnectorDVI_D,

+   XF86ConnectorDVI_A,

+   XF86ConnectorComposite,

+   XF86ConnectorSvideo,

+   XF86ConnectorComponent,

+   XF86ConnectorLFP,

+   XF86ConnectorProprietary,

+   XF86ConnectorHDMI,

+   XF86ConnectorDisplayPort,

+} xf86ConnectorType;

+

+typedef enum _xf86OutputStatus {

+   XF86OutputStatusConnected,

+   XF86OutputStatusDisconnected,

+   XF86OutputStatusUnknown

+} xf86OutputStatus;

+

+typedef enum _xf86CrtcSetFlags {

+    XF86CrtcSetMode = 1,		/* mode */

+    XF86CrtcSetOutput = 2,		/* outputs */

+    XF86CrtcSetOrigin = 4,		/* x/y */

+    XF86CrtcSetTransform = 8,		/* transform */

+    XF86CrtcSetRotation = 16,		/* rotation */

+    XF86CrtcSetProperty = 32,		/* output property */

+    XF86CrtcSetScanoutPixmap = 64,	/* scanout pixmap */

+} xf86CrtcSetFlags;

+

+typedef struct _xf86CrtcSet {

+    xf86CrtcSetFlags	flags;

+    DisplayModePtr	mode;

+    Rotation		rotation;

+    RRTransformPtr	transform;

+    int			x, y;

+    PixmapPtr		scanout_pixmap;

+} xf86CrtcSetRec;

+

+typedef struct _xf86CrtcFuncs {

+   /**

+    * Turns the crtc on/off, or sets intermediate power levels if available.

+    *

+    * Unsupported intermediate modes drop to the lower power setting.  If the

+    * mode is DPMSModeOff, the crtc must be disabled sufficiently for it to

+    * be safe to call mode_set.

+    */

+   void

+    (*dpms)(xf86CrtcPtr		crtc,

+	    int		    	mode);

+

+   /**

+    * Saves the crtc's state for restoration on VT switch.

+    */

+   void

+    (*save)(xf86CrtcPtr		crtc);

+

+   /**

+    * Restore's the crtc's state at VT switch.

+    */

+   void

+    (*restore)(xf86CrtcPtr	crtc);

+

+    /**

+     * Lock CRTC prior to mode setting, mostly for DRI.

+     * Returns whether unlock is needed

+     */

+    Bool

+    (*lock) (xf86CrtcPtr crtc);

+    

+    /**

+     * Unlock CRTC after mode setting, mostly for DRI

+     */

+    void

+    (*unlock) (xf86CrtcPtr crtc);

+    

+    /**

+     * Callback to adjust the mode to be set in the CRTC.

+     *

+     * This allows a CRTC to adjust the clock or even the entire set of

+     * timings, which is used for panels with fixed timings or for

+     * buses with clock limitations.

+     */

+    Bool

+    (*mode_fixup)(xf86CrtcPtr crtc,

+		  DisplayModePtr mode,

+		  DisplayModePtr adjusted_mode);

+

+    /**

+     * Prepare CRTC for an upcoming mode set.

+     */

+    void

+    (*prepare)(xf86CrtcPtr crtc);

+

+    /**

+     * Callback for setting up a video mode after fixups have been made.

+     */

+    void

+    (*mode_set)(xf86CrtcPtr crtc,

+		DisplayModePtr mode,

+		DisplayModePtr adjusted_mode,

+		int x, int y);

+

+    /**

+     * Commit mode changes to a CRTC

+     */

+    void

+    (*commit)(xf86CrtcPtr crtc);

+

+    /* Set the color ramps for the CRTC to the given values. */

+    void

+    (*gamma_set)(xf86CrtcPtr crtc, CARD16 *red, CARD16 *green, CARD16 *blue,

+		 int size);

+

+    /**

+     * Allocate the shadow area, delay the pixmap creation until needed

+     */

+    void *

+    (*shadow_allocate) (xf86CrtcPtr crtc, int width, int height);

+    

+    /**

+     * Create shadow pixmap for rotation support

+     */

+    PixmapPtr

+    (*shadow_create) (xf86CrtcPtr crtc, void *data, int width, int height);

+    

+    /**

+     * Destroy shadow pixmap

+     */

+    void

+    (*shadow_destroy) (xf86CrtcPtr crtc, PixmapPtr pPixmap, void *data);

+

+    /**

+     * Set cursor colors

+     */

+    void

+    (*set_cursor_colors) (xf86CrtcPtr crtc, int bg, int fg);

+

+    /**

+     * Set cursor position

+     */

+    void

+    (*set_cursor_position) (xf86CrtcPtr crtc, int x, int y);

+

+    /**

+     * Show cursor

+     */

+    void

+    (*show_cursor) (xf86CrtcPtr crtc);

+

+    /**

+     * Hide cursor

+     */

+    void

+    (*hide_cursor) (xf86CrtcPtr crtc);

+

+    /**

+     * Load monochrome image

+     */

+    void

+    (*load_cursor_image) (xf86CrtcPtr crtc, CARD8 *image);

+

+    /**

+     * Load ARGB image

+     */

+     void

+     (*load_cursor_argb) (xf86CrtcPtr crtc, CARD32 *image);

+     

+    /**

+     * Clean up driver-specific bits of the crtc

+     */

+    void

+    (*destroy) (xf86CrtcPtr	crtc);

+

+    /**

+     * Less fine-grained mode setting entry point for kernel modesetting

+     */

+    Bool

+    (*set_mode_major)(xf86CrtcPtr crtc, DisplayModePtr mode,

+		      Rotation rotation, int x, int y);

+

+    /**

+     * Callback for panning. Doesn't change the mode.

+     * Added in ABI version 2

+     */

+    void

+    (*set_origin)(xf86CrtcPtr crtc, int x, int y);

+

+    /**

+     * General mode setting entry point that does everything

+     */

+    Bool

+    (*set)(xf86CrtcPtr crtc, xf86CrtcSetFlags flags);

+

+} xf86CrtcFuncsRec, *xf86CrtcFuncsPtr;

+

+#define XF86_CRTC_VERSION 3

+

+struct _xf86Crtc {

+    /**

+     * ABI versioning

+     */

+    int version;

+

+    /**

+     * Associated ScrnInfo

+     */

+    ScrnInfoPtr	    scrn;

+    

+    /**

+     * Desired state of this CRTC

+     *

+     * Set when this CRTC should be driving one or more outputs 

+     */

+    Bool	    enabled;

+    

+    /**

+     * Active mode

+     *

+     * This reflects the mode as set in the CRTC currently

+     * It will be cleared when the VT is not active or

+     * during server startup

+     */

+    DisplayModeRec  mode;

+    Rotation	    rotation;

+    PixmapPtr	    rotatedPixmap;

+    void	    *rotatedData;

+    PixmapPtr	    scanoutPixmap;

+    

+    /**

+     * Position on screen

+     *

+     * Locates this CRTC within the frame buffer

+     */

+    int		    x, y;

+    

+    /**

+     * Desired mode

+     *

+     * This is set to the requested mode, independent of

+     * whether the VT is active. In particular, it receives

+     * the startup configured mode and saves the active mode

+     * on VT switch.

+     */

+    DisplayModeRec  desiredMode;

+    Rotation	    desiredRotation;

+    int		    desiredX, desiredY;

+    

+    /** crtc-specific functions */

+    const xf86CrtcFuncsRec *funcs;

+

+    /**

+     * Driver private

+     *

+     * Holds driver-private information

+     */

+    void	    *driver_private;

+

+#ifdef RANDR_12_INTERFACE

+    /**

+     * RandR crtc

+     *

+     * When RandR 1.2 is available, this

+     * points at the associated crtc object

+     */

+    RRCrtcPtr	    randr_crtc;

+#else

+    void	    *randr_crtc;

+#endif

+

+    /**

+     * Current cursor is ARGB

+     */

+    Bool	    cursor_argb;

+    /**

+     * Track whether cursor is within CRTC range 

+     */

+    Bool	    cursor_in_range;

+    /**

+     * Track state of cursor associated with this CRTC

+     */

+    Bool	    cursor_shown;

+

+    /**

+     * Current transformation matrix

+     */

+    PictTransform   crtc_to_framebuffer;

+    /* framebuffer_to_crtc was removed in ABI 2 */

+    struct pict_f_transform f_crtc_to_framebuffer; /* ABI 2 */

+    struct pict_f_transform f_framebuffer_to_crtc; /* ABI 2 */

+    PictFilterPtr   filter; /* ABI 2 */

+    xFixed	    *params; /* ABI 2 */

+    int		    nparams; /* ABI 2 */

+    int		    filter_width; /* ABI 2 */

+    int		    filter_height; /* ABI 2 */

+    Bool	    transform_in_use;

+    Bool	    sprite_transform_in_use;

+    RRTransformRec  transform; /* ABI 2 */

+    Bool	    transformPresent; /* ABI 2 */

+    RRTransformRec  desiredTransform; /* ABI 2 */

+    Bool	    desiredTransformPresent; /* ABI 2 */

+    /**

+     * Bounding box in screen space

+     */

+    BoxRec	    bounds;

+    /**

+     * Panning:

+     * TotalArea: total panning area, larger than CRTC's size

+     * TrackingArea: Area of the pointer for which the CRTC is panned

+     * border: Borders of the displayed CRTC area which induces panning if the pointer reaches them

+     * Added in ABI version 2

+     */

+    BoxRec          panningTotalArea;

+    BoxRec          panningTrackingArea;

+    INT16           panningBorder[4];

+

+    /**

+     * Current gamma, especially useful after initial config.

+     * Added in ABI version 3

+     */

+    CARD16 *gamma_red;

+    CARD16 *gamma_green;

+    CARD16 *gamma_blue;

+    int gamma_size;

+

+    /**

+     * Actual state of this CRTC

+     *

+     * Set to TRUE after modesetting, set to FALSE if no outputs are connected

+     * Added in ABI version 3

+     */

+    Bool	    active;

+    /**

+     * Clear the shadow

+     */

+    Bool	    shadowClear;

+

+    /**

+     * Sprite position transforms

+     */

+

+    /* Transform a screen coordinate to a crtc coordinate */

+    struct pixman_f_transform f_screen_to_crtc;

+

+    /* The user-specified portion of the screen to crtc conversion */

+    struct pixman_f_transform user_sprite_position_transform;

+

+    /* Transform a hardware cursor coordinate to a cursor coordinate */

+    struct pixman_f_transform f_crtc_to_cursor;

+

+    /* The user-specified portion of the cursor to hardware transform */

+    struct pixman_f_transform user_sprite_image_transform;

+};

+

+typedef struct _xf86OutputFuncs {

+    /**

+     * Called to allow the output a chance to create properties after the

+     * RandR objects have been created.

+     */

+    void

+    (*create_resources)(xf86OutputPtr output);

+

+    /**

+     * Turns the output on/off, or sets intermediate power levels if available.

+     *

+     * Unsupported intermediate modes drop to the lower power setting.  If the

+     * mode is DPMSModeOff, the output must be disabled, as the DPLL may be

+     * disabled afterwards.

+     */

+    void

+    (*dpms)(xf86OutputPtr	output,

+	    int			mode);

+

+    /**

+     * Saves the output's state for restoration on VT switch.

+     */

+    void

+    (*save)(xf86OutputPtr	output);

+

+    /**

+     * Restore's the output's state at VT switch.

+     */

+    void

+    (*restore)(xf86OutputPtr	output);

+

+    /**

+     * Callback for testing a video mode for a given output.

+     *

+     * This function should only check for cases where a mode can't be supported

+     * on the output specifically, and not represent generic CRTC limitations.

+     *

+     * \return MODE_OK if the mode is valid, or another MODE_* otherwise.

+     */

+    int

+    (*mode_valid)(xf86OutputPtr	    output,

+		  DisplayModePtr    pMode);

+

+    /**

+     * Callback to adjust the mode to be set in the CRTC.

+     *

+     * This allows an output to adjust the clock or even the entire set of

+     * timings, which is used for panels with fixed timings or for

+     * buses with clock limitations.

+     */

+    Bool

+    (*mode_fixup)(xf86OutputPtr output,

+		  DisplayModePtr mode,

+		  DisplayModePtr adjusted_mode);

+

+    /**

+     * Callback for preparing mode changes on an output

+     */

+    void

+    (*prepare)(xf86OutputPtr output);

+

+    /**

+     * Callback for committing mode changes on an output

+     */

+    void

+    (*commit)(xf86OutputPtr output);

+

+    /**

+     * Callback for setting up a video mode after fixups have been made.

+     *

+     * This is only called while the output is disabled.  The dpms callback

+     * must be all that's necessary for the output, to turn the output on

+     * after this function is called.

+     */

+    void

+    (*mode_set)(xf86OutputPtr  output,

+		DisplayModePtr mode,

+		DisplayModePtr adjusted_mode);

+

+    /**

+     * Probe for a connected output, and return detect_status.

+     */

+    xf86OutputStatus

+    (*detect)(xf86OutputPtr	    output);

+

+    /**

+     * Query the device for the modes it provides.

+     *

+     * This function may also update MonInfo, mm_width, and mm_height.

+     *

+     * \return singly-linked list of modes or NULL if no modes found.

+     */

+    DisplayModePtr

+    (*get_modes)(xf86OutputPtr	    output);

+

+#ifdef RANDR_12_INTERFACE

+    /**

+     * Callback when an output's property has changed.

+     */

+    Bool

+    (*set_property)(xf86OutputPtr output,

+		    Atom property,

+		    RRPropertyValuePtr value);

+#endif

+#ifdef RANDR_13_INTERFACE

+    /**

+     * Callback to get an updated property value

+     */

+    Bool

+    (*get_property)(xf86OutputPtr output,

+		    Atom property);

+#endif

+#ifdef RANDR_GET_CRTC_INTERFACE

+    /**

+     * Callback to get current CRTC for a given output

+     */

+    xf86CrtcPtr

+    (*get_crtc)(xf86OutputPtr output);

+#endif

+    /**

+     * Clean up driver-specific bits of the output

+     */

+    void

+    (*destroy) (xf86OutputPtr	    output);

+} xf86OutputFuncsRec, *xf86OutputFuncsPtr;

+

+

+#define XF86_OUTPUT_VERSION 2

+

+struct _xf86Output {

+    /**

+     * ABI versioning

+     */

+    int version;

+

+    /**

+     * Associated ScrnInfo

+     */

+    ScrnInfoPtr		scrn;

+

+    /**

+     * Currently connected crtc (if any)

+     *

+     * If this output is not in use, this field will be NULL.

+     */

+    xf86CrtcPtr		crtc;

+

+    /**

+     * Possible CRTCs for this output as a mask of crtc indices

+     */

+    CARD32		possible_crtcs;

+

+    /**

+     * Possible outputs to share the same CRTC as a mask of output indices

+     */

+    CARD32		possible_clones;

+    

+    /**

+     * Whether this output can support interlaced modes

+     */

+    Bool		interlaceAllowed;

+

+    /**

+     * Whether this output can support double scan modes

+     */

+    Bool		doubleScanAllowed;

+

+    /**

+     * List of available modes on this output.

+     *

+     * This should be the list from get_modes(), plus perhaps additional

+     * compatible modes added later.

+     */

+    DisplayModePtr	probed_modes;

+

+    /**

+     * Options parsed from the related monitor section

+     */

+    OptionInfoPtr	options;

+    

+    /**

+     * Configured monitor section

+     */

+    XF86ConfMonitorPtr  conf_monitor;

+    

+    /**

+     * Desired initial position

+     */

+    int			initial_x, initial_y;

+

+    /**

+     * Desired initial rotation

+     */

+    Rotation		initial_rotation;

+

+    /**

+     * Current connection status

+     *

+     * This indicates whether a monitor is known to be connected

+     * to this output or not, or whether there is no way to tell

+     */

+    xf86OutputStatus	status;

+

+    /** EDID monitor information */

+    xf86MonPtr		MonInfo;

+

+    /** subpixel order */

+    int			subpixel_order;

+

+    /** Physical size of the currently attached output device. */

+    int			mm_width, mm_height;

+

+    /** Output name */

+    char		*name;

+

+    /** output-specific functions */

+    const xf86OutputFuncsRec *funcs;

+

+    /** driver private information */

+    void		*driver_private;

+    

+    /** Whether to use the old per-screen Monitor config section */

+    Bool		use_screen_monitor;

+

+#ifdef RANDR_12_INTERFACE

+    /**

+     * RandR 1.2 output structure.

+     *

+     * When RandR 1.2 is available, this points at the associated

+     * RandR output structure and is created when this output is created

+     */

+    RROutputPtr		randr_output;

+#else

+    void		*randr_output;

+#endif

+    /** 

+     * Desired initial panning

+     * Added in ABI version 2

+     */

+    BoxRec          initialTotalArea;

+    BoxRec          initialTrackingArea;

+    INT16           initialBorder[4];

+};

+

+typedef enum _xf86SetConfigResponse {

+    xf86SetConfigFailed,		/* set_config failed */

+    xf86SetConfigChecked,		/* set_config validated the configuration */

+    xf86SetConfigDone,			/* set_config finished the work */

+} xf86SetConfigResponse;

+

+typedef struct _xf86CrtcSetConfig {

+    xf86CrtcPtr			crtc;

+    int				x, y;

+    DisplayModeRec		mode;

+    Rotation			rotation;

+    int				numOutputs;

+    xf86OutputPtr		*outputs;

+    struct pict_f_transform	sprite_position_transform;

+    struct pict_f_transform	sprite_image_transform;

+

+    /* Probably want some internal structure for the pixmap so that

+     * this can be set before the server is running

+     */

+    PixmapPtr			pixmap;

+    int				pixmap_x, pixmap_y;

+} xf86CrtcSetConfigRec, *xf86CrtcSetConfigPtr;

+

+typedef struct _xf86CrtcScanoutFormat {

+    int		    depth;

+    int		    bitsPerPixel;

+    int		    maxWidth, maxHeight;

+    Rotation	    rotations;

+    PictFormatShort format;

+} xf86CrtcScanoutFormat;

+

+typedef struct _xf86CrtcConfigFuncs {

+    /**

+     * Requests that the driver resize the screen.

+     *

+     * The driver is responsible for updating scrn->virtualX and scrn->virtualY.

+     * If the requested size cannot be set, the driver should leave those values

+     * alone and return FALSE.

+     *

+     * A naive driver that cannot reallocate the screen may simply change

+     * virtual[XY].  A more advanced driver will want to also change the

+     * devPrivate.ptr and devKind of the screen pixmap, update any offscreen

+     * pixmaps it may have moved, and change pScrn->displayWidth.

+     */

+    Bool

+    (*resize)(ScrnInfoPtr	scrn,

+	      int		width,

+	      int		height);

+

+    xf86SetConfigResponse

+    (*set_config) (ScrnInfoPtr		scrn,

+		   RRScreenConfigPtr	screen_config,

+		   xf86CrtcSetConfigPtr	crtc_configs,

+		   int			num_configs);

+

+    /**

+     * Create a scanout pixmap

+     */

+    PixmapPtr

+    (*create_scanout_pixmap)(ScrnInfoPtr		scrn,

+			     int			width,

+			     int			height,

+			     Rotation			rotations,

+			     xf86CrtcScanoutFormat	*format);

+

+} xf86CrtcConfigFuncsRec, *xf86CrtcConfigFuncsPtr;

+

+typedef void (*xf86_crtc_notify_proc_ptr) (ScreenPtr pScreen);

+

+typedef struct _xf86CrtcConfig {

+    int			num_output;

+    xf86OutputPtr	*output;

+    /**

+     * compat_output is used whenever we deal

+     * with legacy code that only understands a single

+     * output. pScrn->modes will be loaded from this output,

+     * adjust frame will whack this output, etc.

+     */

+    int			compat_output;

+

+    int			num_crtc;

+    xf86CrtcPtr		*crtc;

+

+    int			minWidth, minHeight;

+    int			maxWidth, maxHeight;

+    

+    /* For crtc-based rotation */

+    DamagePtr		rotation_damage;

+    Bool		rotation_damage_registered;

+

+    /* DGA */

+    unsigned int	dga_flags;

+    unsigned long	dga_address;

+    DGAModePtr		dga_modes;

+    int			dga_nmode;

+    int			dga_width, dga_height, dga_stride;

+    DisplayModePtr	dga_save_mode;

+

+    const xf86CrtcConfigFuncsRec *funcs;

+

+    CreateScreenResourcesProcPtr    CreateScreenResources;

+

+    CloseScreenProcPtr		    CloseScreen;

+

+    /* Cursor information */

+    xf86CursorInfoPtr	cursor_info;

+    CursorPtr		cursor;

+    CARD8		*cursor_image;

+    Bool		cursor_on;

+    CARD32		cursor_fg, cursor_bg;

+

+    /**

+     * Options parsed from the related device section

+     */

+    OptionInfoPtr	options;

+

+    Bool		debug_modes;

+

+    /* wrap screen BlockHandler for rotation */

+    ScreenBlockHandlerProcPtr	BlockHandler;

+

+    /* callback when crtc configuration changes */

+    xf86_crtc_notify_proc_ptr  xf86_crtc_notify;

+

+    /*

+     * Supported scanout pixmap formats

+     */

+    int			num_scanout_formats;

+    xf86CrtcScanoutFormat	*scanout_formats;

+} xf86CrtcConfigRec, *xf86CrtcConfigPtr;

+

+extern _X_EXPORT int xf86CrtcConfigPrivateIndex;

+

+#define XF86_CRTC_CONFIG_PTR(p)	((xf86CrtcConfigPtr) ((p)->privates[xf86CrtcConfigPrivateIndex].ptr))

+

+static _X_INLINE xf86OutputPtr

+xf86CompatOutput(ScrnInfoPtr pScrn)

+{

+    xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn);

+    return config->output[config->compat_output];

+}

+

+static _X_INLINE xf86CrtcPtr

+xf86CompatCrtc(ScrnInfoPtr pScrn)

+{

+    xf86OutputPtr compat_output = xf86CompatOutput(pScrn);

+    if (!compat_output)

+	return NULL;

+    return compat_output->crtc;

+}

+

+static _X_INLINE RRCrtcPtr

+xf86CompatRRCrtc(ScrnInfoPtr pScrn)

+{

+    xf86CrtcPtr	compat_crtc = xf86CompatCrtc(pScrn);

+    if (!compat_crtc)

+	return NULL;

+    return compat_crtc->randr_crtc;

+}

+

+

+/*

+ * Initialize xf86CrtcConfig structure

+ */

+

+extern _X_EXPORT void

+xf86CrtcConfigInit (ScrnInfoPtr				scrn,

+		    const xf86CrtcConfigFuncsRec	*funcs);

+

+extern _X_EXPORT void

+xf86CrtcSetSizeRange (ScrnInfoPtr scrn,

+		      int minWidth, int minHeight,

+		      int maxWidth, int maxHeight);

+

+extern _X_EXPORT void

+xf86CrtcSetScanoutFormats (ScrnInfoPtr			scrn,

+			   int				num_formats,

+			   xf86CrtcScanoutFormat	*formats);

+

+/*

+ * Crtc functions

+ */

+extern _X_EXPORT xf86CrtcPtr

+xf86CrtcCreate (ScrnInfoPtr		scrn,

+		const xf86CrtcFuncsRec	*funcs);

+

+extern _X_EXPORT void

+xf86CrtcDestroy (xf86CrtcPtr		crtc);

+

+/**

+ * Change a crtc configuration (modes, outputs, etc)

+ */

+

+extern _X_EXPORT Bool

+xf86CrtcSet (xf86CrtcPtr crtc, xf86CrtcSetRec *set);

+

+extern _X_EXPORT void

+xf86CrtcSetOrigin (xf86CrtcPtr crtc, int x, int y);

+

+/*

+ * Assign crtc rotation during mode set

+ */

+extern _X_EXPORT Bool

+xf86CrtcRotate (xf86CrtcPtr crtc);

+

+

+/*

+ * Update cursor transform matrices after user changes

+ * This is just the cursor subset of xf86CrtcRotate

+ */

+extern _X_EXPORT void

+xf86CrtcRotateCursor (xf86CrtcPtr crtc);

+

+/*

+ * Clean up any rotation data, used when a crtc is turned off

+ * as well as when rotation is disabled.

+ */

+extern _X_EXPORT void

+xf86RotateDestroy (xf86CrtcPtr crtc);

+

+/*

+ * free shadow memory allocated for all crtcs

+ */

+extern _X_EXPORT void

+xf86RotateFreeShadow(ScrnInfoPtr pScrn);

+

+/*

+ * Clean up rotation during CloseScreen

+ */

+extern _X_EXPORT void

+xf86RotateCloseScreen (ScreenPtr pScreen);

+

+/**

+ * Return whether any output is assigned to the crtc

+ */

+extern _X_EXPORT Bool

+xf86CrtcInUse (xf86CrtcPtr crtc);

+

+/*

+ * Output functions

+ */

+extern _X_EXPORT xf86OutputPtr

+xf86OutputCreate (ScrnInfoPtr		    scrn,

+		  const xf86OutputFuncsRec  *funcs,

+		  const char		    *name);

+

+extern _X_EXPORT void

+xf86OutputUseScreenMonitor (xf86OutputPtr output, Bool use_screen_monitor);

+

+extern _X_EXPORT Bool

+xf86OutputRename (xf86OutputPtr output, const char *name);

+

+extern _X_EXPORT void

+xf86OutputDestroy (xf86OutputPtr	output);

+

+extern _X_EXPORT void

+xf86ProbeOutputModes (ScrnInfoPtr pScrn, int maxX, int maxY);

+

+extern _X_EXPORT void

+xf86SetScrnInfoModes (ScrnInfoPtr pScrn);

+

+#ifdef RANDR_13_INTERFACE

+# define ScreenInitRetType	int

+#else

+# define ScreenInitRetType	Bool

+#endif

+

+extern _X_EXPORT ScreenInitRetType

+xf86CrtcScreenInit (ScreenPtr pScreen);

+

+extern _X_EXPORT Bool

+xf86InitialConfiguration (ScrnInfoPtr pScrn, Bool canGrow);

+

+extern _X_EXPORT void

+xf86DPMSSet(ScrnInfoPtr pScrn, int PowerManagementMode, int flags);

+    

+extern _X_EXPORT Bool

+xf86SaveScreen(ScreenPtr pScreen, int mode);

+

+extern _X_EXPORT void

+xf86DisableUnusedFunctions(ScrnInfoPtr pScrn);

+

+extern _X_EXPORT DisplayModePtr

+xf86OutputFindClosestMode (xf86OutputPtr output, DisplayModePtr desired);

+    

+extern _X_EXPORT Bool

+xf86SetSingleMode (ScrnInfoPtr pScrn, DisplayModePtr desired, Rotation rotation);

+

+/**

+ * Set the EDID information for the specified output

+ */

+extern _X_EXPORT void

+xf86OutputSetEDID (xf86OutputPtr output, xf86MonPtr edid_mon);

+

+/**

+ * Return the list of modes supported by the EDID information

+ * stored in 'output'

+ */

+extern _X_EXPORT DisplayModePtr

+xf86OutputGetEDIDModes (xf86OutputPtr output);

+

+extern _X_EXPORT xf86MonPtr

+xf86OutputGetEDID (xf86OutputPtr output, I2CBusPtr pDDCBus);

+

+/**

+ * Initialize dga for this screen

+ */

+

+#ifdef XFreeXDGA

+extern _X_EXPORT Bool

+xf86DiDGAInit (ScreenPtr pScreen, unsigned long dga_address);

+

+/* this is the real function, used only internally */

+_X_INTERNAL Bool

+_xf86_di_dga_init_internal (ScreenPtr pScreen);

+

+/**

+ * Re-initialize dga for this screen (as when the set of modes changes)

+ */

+

+extern _X_EXPORT Bool

+xf86DiDGAReInit (ScreenPtr pScreen);

+#endif

+

+/* This is the real function, used only internally */

+_X_INTERNAL Bool

+_xf86_di_dga_reinit_internal (ScreenPtr pScreen);

+

+/*

+ * Set the subpixel order reported for the screen using

+ * the information from the outputs

+ */

+

+extern _X_EXPORT void

+xf86CrtcSetScreenSubpixelOrder (ScreenPtr pScreen);

+

+/*

+ * Get a standard string name for a connector type 

+ */

+extern _X_EXPORT char *

+xf86ConnectorGetName(xf86ConnectorType connector);

+

+/*

+ * Using the desired mode information in each crtc, set

+ * modes (used in EnterVT functions, or at server startup)

+ */

+

+extern _X_EXPORT Bool

+xf86SetDesiredModes (ScrnInfoPtr pScrn);

+

+/**

+ * Initialize the CRTC-based cursor code. CRTC function vectors must

+ * contain relevant cursor setting functions.

+ *

+ * Driver should call this from ScreenInit function

+ */

+extern _X_EXPORT Bool

+xf86_cursors_init (ScreenPtr screen, int max_width, int max_height, int flags);

+

+/**

+ * Called when anything on the screen is reconfigured.

+ *

+ * Reloads cursor images as needed, then adjusts cursor positions.

+ * 

+ * Driver should call this from crtc commit function.

+ */

+extern _X_EXPORT void

+xf86_reload_cursors (ScreenPtr screen);

+

+/**

+ * Called from EnterVT to turn the cursors back on

+ */

+extern _X_EXPORT void

+xf86_show_cursors (ScrnInfoPtr scrn);

+

+/**

+ * Called by the driver to turn cursors off

+ */

+extern _X_EXPORT void

+xf86_hide_cursors (ScrnInfoPtr scrn);

+

+/**

+ * Clean up CRTC-based cursor code. Driver must call this at CloseScreen time.

+ */

+extern _X_EXPORT void

+xf86_cursors_fini (ScreenPtr screen);

+

+/*

+ * For overlay video, compute the relevant CRTC and

+ * clip video to that.

+ * wraps xf86XVClipVideoHelper()

+ */

+

+extern _X_EXPORT Bool

+xf86_crtc_clip_video_helper(ScrnInfoPtr pScrn,

+			    xf86CrtcPtr *crtc_ret,

+			    xf86CrtcPtr desired_crtc,

+			    BoxPtr      dst,

+			    INT32	*xa,

+			    INT32	*xb,

+			    INT32	*ya,

+			    INT32	*yb,

+			    RegionPtr   reg,

+			    INT32	width,

+			    INT32	height);

+    

+extern _X_EXPORT xf86_crtc_notify_proc_ptr

+xf86_wrap_crtc_notify (ScreenPtr pScreen, xf86_crtc_notify_proc_ptr new);

+

+extern _X_EXPORT void

+xf86_unwrap_crtc_notify(ScreenPtr pScreen, xf86_crtc_notify_proc_ptr old);

+

+extern _X_EXPORT void

+xf86_crtc_notify(ScreenPtr pScreen);

+

+/**

+ * Gamma

+ */

+

+extern _X_EXPORT Bool

+xf86_crtc_supports_gamma(ScrnInfoPtr pScrn);

+

+#endif /* _XF86CRTC_H_ */

diff --git a/xorg-server/hw/xfree86/modes/xf86Cursors.c b/xorg-server/hw/xfree86/modes/xf86Cursors.c
index 5562f29cc..3c2958743 100644
--- a/xorg-server/hw/xfree86/modes/xf86Cursors.c
+++ b/xorg-server/hw/xfree86/modes/xf86Cursors.c
@@ -338,7 +338,7 @@ xf86_crtc_set_cursor_position (xf86CrtcPtr crtc, int x, int y)
     /*

      * Transform position of cursor on screen

      */

-    if (crtc->transform_in_use)

+    if (crtc->sprite_transform_in_use)

     {

 	ScreenPtr	screen = scrn->pScreen;

 	xf86CursorScreenPtr ScreenPriv =

@@ -349,7 +349,7 @@ xf86_crtc_set_cursor_position (xf86CrtcPtr crtc, int x, int y)
 	v.v[0] = (x + ScreenPriv->HotX) + 0.5;

 	v.v[1] = (y + ScreenPriv->HotY) + 0.5;

 	v.v[2] = 1;

-	pixman_f_transform_point (&crtc->f_framebuffer_to_crtc, &v);

+	pixman_f_transform_point (&crtc->f_screen_to_crtc, &v);

 	/* cursor will have 0.5 added to it already so floor is sufficent */

 	x = floor (v.v[0]);

 	y = floor (v.v[1]);

diff --git a/xorg-server/hw/xfree86/modes/xf86RandR12.c b/xorg-server/hw/xfree86/modes/xf86RandR12.c
index 2b19d82ad..7bfb6fa47 100644
--- a/xorg-server/hw/xfree86/modes/xf86RandR12.c
+++ b/xorg-server/hw/xfree86/modes/xf86RandR12.c
@@ -180,14 +180,14 @@ xf86RandR13VerifyPanningArea (xf86CrtcPtr crtc, int screenWidth, int screenHeigh
  */

 

 static void

-xf86ComputeCrtcPan (Bool transform_in_use,

+xf86ComputeCrtcPan (Bool sprite_transform_in_use,

 		    struct pixman_f_transform *m,

 		    double screen_x, double screen_y,

 		    double crtc_x, double crtc_y,

 		    int old_pan_x, int old_pan_y,

 		    int *new_pan_x, int *new_pan_y)

 {

-    if (transform_in_use) {

+    if (sprite_transform_in_use) {

 	/*

 	 * Given the current transform, M, the current position

 	 * on the Screen, S, and the desired position on the CRTC,

@@ -374,8 +374,8 @@ xf86RandR13Pan (xf86CrtcPtr crtc, int x, int y)
 	c.v[0] = x;

 	c.v[1] = y;

 	c.v[2] = 1.0;

-	if (crtc->transform_in_use) {

-	    pixman_f_transform_point(&crtc->f_framebuffer_to_crtc, &c);

+	if (crtc->sprite_transform_in_use) {

+	    pixman_f_transform_point(&crtc->f_screen_to_crtc, &c);

 	} else {

 	    c.v[0] -= crtc->x;

 	    c.v[1] -= crtc->y;

@@ -402,8 +402,8 @@ xf86RandR13Pan (xf86CrtcPtr crtc, int x, int y)
 	    }

 	}

 	if (panned)

-	    xf86ComputeCrtcPan (crtc->transform_in_use,

-				&crtc->f_framebuffer_to_crtc,

+	    xf86ComputeCrtcPan (crtc->sprite_transform_in_use,

+				&crtc->f_screen_to_crtc,

 				x, y, c.v[0], c.v[1],

 				newX, newY, &newX, &newY);

     }

@@ -414,7 +414,7 @@ xf86RandR13Pan (xf86CrtcPtr crtc, int x, int y)
      * XXX This computation only works when we do not have a transform

      * in use.

      */

-    if (!crtc->transform_in_use)

+    if (!crtc->sprite_transform_in_use)

     {

 	/* Validate against [xy]1 after [xy]2, to be sure that results are > 0 for [xy]1 > 0 */

 	if (crtc->panningTotalArea.x2 > crtc->panningTotalArea.x1) {

@@ -659,10 +659,12 @@ xf86RandR12SetConfig (ScreenPtr		pScreen,
 

 static Bool

 xf86RandR12ScreenSetSize (ScreenPtr	pScreen,

-			CARD16		width,

-			CARD16		height,

-			CARD32		mmWidth,

-			CARD32		mmHeight)

+			  CARD16	width,

+			  CARD16	height,

+			  CARD16	pixWidth,

+			  CARD16	pixHeight,

+			  CARD32	mmWidth,

+			  CARD32	mmHeight)

 {

     XF86RandRInfoPtr	randrp = XF86RANDRINFO(pScreen);

     ScrnInfoPtr		pScrn = XF86SCRNINFO(pScreen);

@@ -670,6 +672,8 @@ xf86RandR12ScreenSetSize (ScreenPtr	pScreen,
     WindowPtr		pRoot = pScreen->root;

     PixmapPtr		pScrnPix;

     Bool		ret = FALSE;

+    Bool		pixSizeChanged = FALSE;

+    Bool		winSizeChanged = FALSE;

     int                 c;

 

     if (xf86RandR12Key) {

@@ -677,46 +681,85 @@ xf86RandR12ScreenSetSize (ScreenPtr	pScreen,
         {

 	    randrp->virtualX = pScrn->virtualX;

 	    randrp->virtualY = pScrn->virtualY;

+	    pixSizeChanged = TRUE;

         }

     }

-    if (pRoot && pScrn->vtSema)

-	(*pScrn->EnableDisableFBAccess) (pScreen->myNum, FALSE);

 

-    /* Let the driver update virtualX and virtualY */

-    if (!(*config->funcs->resize)(pScrn, width, height))

-	goto finish;

+    pScrnPix = (*pScreen->GetScreenPixmap)(pScreen);

+    if (pixWidth != pScrnPix->drawable.width ||

+	pixHeight != pScrnPix->drawable.height)

+	pixSizeChanged = TRUE;

+

+    if (width != pScreen->width || height != pScreen->height)

+	winSizeChanged = TRUE;

+

+    if (pixSizeChanged)

+    {

+	if (pRoot && pScrn->vtSema)

+	    (*pScrn->EnableDisableFBAccess) (pScreen->myNum, FALSE);

+

+	/* Let the driver update virtualX and virtualY */

+	if (!(*config->funcs->resize)(pScrn, pixWidth, pixHeight))

+	    goto finish;

+    }

 

     ret = TRUE;

-    /* Update panning information */

-    for (c = 0; c < config->num_crtc; c++) {

-	xf86CrtcPtr crtc = config->crtc[c];

-	if (crtc->panningTotalArea.x2 > crtc->panningTotalArea.x1 ||

-	    crtc->panningTotalArea.y2 > crtc->panningTotalArea.y1) {

-	    if (crtc->panningTotalArea.x2 > crtc->panningTrackingArea.x1)

-		crtc->panningTotalArea.x2 += width  - pScreen->width;

-	    if (crtc->panningTotalArea.y2 > crtc->panningTrackingArea.y1)

-		crtc->panningTotalArea.y2 += height - pScreen->height;

-	    if (crtc->panningTrackingArea.x2 > crtc->panningTrackingArea.x1)

-		crtc->panningTrackingArea.x2 += width  - pScreen->width;

-	    if (crtc->panningTrackingArea.y2 > crtc->panningTrackingArea.y1)

-		crtc->panningTrackingArea.y2 += height - pScreen->height;

-	    xf86RandR13VerifyPanningArea (crtc, width, height);

-	    xf86RandR13Pan (crtc, randrp->pointerX, randrp->pointerY);

+

+    if (winSizeChanged)

+    {

+	/* Update panning information */

+	for (c = 0; c < config->num_crtc; c++) {

+	    xf86CrtcPtr crtc = config->crtc[c];

+	    if (crtc->panningTotalArea.x2 > crtc->panningTotalArea.x1 ||

+		crtc->panningTotalArea.y2 > crtc->panningTotalArea.y1) {

+		if (crtc->panningTotalArea.x2 > crtc->panningTrackingArea.x1)

+		    crtc->panningTotalArea.x2 += width  - pScreen->width;

+		if (crtc->panningTotalArea.y2 > crtc->panningTrackingArea.y1)

+		    crtc->panningTotalArea.y2 += height - pScreen->height;

+		if (crtc->panningTrackingArea.x2 > crtc->panningTrackingArea.x1)

+		    crtc->panningTrackingArea.x2 += width  - pScreen->width;

+		if (crtc->panningTrackingArea.y2 > crtc->panningTrackingArea.y1)

+		    crtc->panningTrackingArea.y2 += height - pScreen->height;

+		xf86RandR13VerifyPanningArea (crtc, width, height);

+		xf86RandR13Pan (crtc, randrp->pointerX, randrp->pointerY);

+	    }

 	}

     }

 

     pScrnPix = (*pScreen->GetScreenPixmap)(pScreen);

-    pScreen->width = pScrnPix->drawable.width = width;

-    pScreen->height = pScrnPix->drawable.height = height;

+    pScreen->width = width;

+    pScreen->height = height;

+    if (pRoot)

+    {

+	BoxRec	box;

+

+	pRoot->drawable.width = width;

+	pRoot->drawable.height = height;

+	box.x1 = 0;

+	box.y1 = 0;

+	box.x2 = width;

+	box.y2 = height;

+	RegionInit(&pRoot->winSize, &box, 1);

+	RegionInit(&pRoot->borderSize, &box, 1);

+    }

+    pScrnPix->drawable.width = pixWidth;

+    pScrnPix->drawable.height = pixHeight;

     randrp->mmWidth = pScreen->mmWidth = mmWidth;

     randrp->mmHeight = pScreen->mmHeight = mmHeight;

 

-    xf86SetViewport (pScreen, pScreen->width-1, pScreen->height-1);

-    xf86SetViewport (pScreen, 0, 0);

+    if (winSizeChanged)

+    {

+	xf86SetViewport (pScreen, pScreen->width-1, pScreen->height-1);

+	xf86SetViewport (pScreen, 0, 0);

+    }

 

 finish:

-    if (pRoot && pScrn->vtSema)

-	(*pScrn->EnableDisableFBAccess) (pScreen->myNum, TRUE);

+    if (pixSizeChanged)

+    {

+	if (pRoot && pScrn->vtSema)

+	    (*pScrn->EnableDisableFBAccess) (pScreen->myNum, TRUE);

+    }

+

 #if RANDR_12_INTERFACE

     if (xf86RandR12Key && pScreen->root && ret)

 	RRScreenSizeNotify (pScreen);

@@ -758,7 +801,7 @@ xf86RandR12CreateScreenResources (ScreenPtr pScreen)
 	xf86CrtcPtr crtc = config->crtc[c];

 	int	    crtc_width = crtc->x + xf86ModeWidth (&crtc->mode, crtc->rotation);

 	int	    crtc_height = crtc->y + xf86ModeHeight (&crtc->mode, crtc->rotation);

-	

+

 	if (crtc->enabled) {

 	    if (crtc_width > width)

 		width = crtc_width;

@@ -770,13 +813,13 @@ xf86RandR12CreateScreenResources (ScreenPtr pScreen)
 		height = crtc->panningTotalArea.y2;

 	}

     }

-    

+

     if (width && height)

     {

 	/*

 	 * Compute physical size of screen

 	 */

-	if (monitorResolution) 

+	if (monitorResolution)

 	{

 	    mmWidth = width * 25.4 / monitorResolution;

 	    mmHeight = height * 25.4 / monitorResolution;

@@ -818,6 +861,8 @@ xf86RandR12CreateScreenResources (ScreenPtr pScreen)
 	xf86RandR12ScreenSetSize (pScreen,

 				  width,

 				  height,

+				  width,

+				  height,

 				  mmWidth,

 				  mmHeight);

     }

@@ -1007,7 +1052,7 @@ xf86RandRModeMatches (RRModePtr		randr_mode,
 	if (memcmp (randr_mode->name, mode->name, len) != 0)	return FALSE;

     }

 #endif

-    

+

     /* check for same timings */

     if (randr_mode->mode.dotClock / 1000 != mode->Clock)    return FALSE;

     if (randr_mode->mode.width        != mode->HDisplay)    return FALSE;

@@ -1019,11 +1064,11 @@ xf86RandRModeMatches (RRModePtr		randr_mode,
     if (randr_mode->mode.vSyncStart   != mode->VSyncStart)  return FALSE;

     if (randr_mode->mode.vSyncEnd     != mode->VSyncEnd)    return FALSE;

     if (randr_mode->mode.vTotal       != mode->VTotal)	    return FALSE;

-    

+

     /* check for same flags (using only the XF86 valid flag bits) */

     if ((randr_mode->mode.modeFlags & FLAG_BITS) != (mode->Flags & FLAG_BITS))

 	return FALSE;

-    

+

     /* everything matches */

     return TRUE;

 }

@@ -1063,7 +1108,7 @@ xf86RandR12CrtcNotify (RRCrtcPtr	randr_crtc)
 	    randr_output = output->randr_output;

 	    randr_outputs[numOutputs++] = randr_output;

 	    /*

-	     * We make copies of modes, so pointer equality 

+	     * We make copies of modes, so pointer equality

 	     * isn't sufficient

 	     */

 	    for (j = 0; j < randr_output->numModes + randr_output->numUserModes; j++)

@@ -1071,7 +1116,7 @@ xf86RandR12CrtcNotify (RRCrtcPtr	randr_crtc)
 		RRModePtr   m = (j < randr_output->numModes ?

 				 randr_output->modes[j] :

 				 randr_output->userModes[j-randr_output->numModes]);

-					 

+

 		if (xf86RandRModeMatches (m, mode))

 		{

 		    randr_mode = m;

@@ -1081,9 +1126,9 @@ xf86RandR12CrtcNotify (RRCrtcPtr	randr_crtc)
 	}

     }

     ret = RRCrtcNotify (randr_crtc, randr_mode, x, y,

-			rotation, 

+			rotation,

 			crtc->transformPresent ? &crtc->transform : NULL,

-			numOutputs, randr_outputs);

+			numOutputs, randr_outputs, crtc->scanoutPixmap);

     free(randr_outputs);

     return ret;

 }

@@ -1100,13 +1145,13 @@ xf86RandRModeConvert (ScrnInfoPtr	scrn,
     mode->status = MODE_OK;

 

     mode->Clock = randr_mode->mode.dotClock / 1000;

-    

+

     mode->HDisplay = randr_mode->mode.width;

     mode->HSyncStart = randr_mode->mode.hSyncStart;

     mode->HSyncEnd = randr_mode->mode.hSyncEnd;

     mode->HTotal = randr_mode->mode.hTotal;

     mode->HSkew = randr_mode->mode.hSkew;

-    

+

     mode->VDisplay = randr_mode->mode.height;

     mode->VSyncStart = randr_mode->mode.vSyncStart;

     mode->VSyncEnd = randr_mode->mode.vSyncEnd;

@@ -1126,14 +1171,15 @@ xf86RandR12CrtcSet (ScreenPtr	    pScreen,
 		    int		    y,

 		    Rotation	    rotation,

 		    int		    num_randr_outputs,

-		    RROutputPtr	    *randr_outputs)

+		    RROutputPtr	    *randr_outputs,

+		    PixmapPtr	    scanout_pixmap)

 {

     XF86RandRInfoPtr	randrp = XF86RANDRINFO(pScreen);

     ScrnInfoPtr		pScrn = xf86Screens[pScreen->myNum];

     xf86CrtcConfigPtr   config = XF86_CRTC_CONFIG_PTR(pScrn);

     xf86CrtcPtr		crtc = randr_crtc->devPrivate;

     RRTransformPtr	transform;

-    Bool		changed = FALSE;

+    xf86CrtcSetFlags	flags = 0;

     int			o, ro;

     xf86CrtcPtr		*save_crtcs;

     Bool		save_enabled = crtc->enabled;

@@ -1143,34 +1189,37 @@ xf86RandR12CrtcSet (ScreenPtr	    pScreen,
 

     save_crtcs = malloc(config->num_output * sizeof (xf86CrtcPtr));

     if ((randr_mode != NULL) != crtc->enabled)

-	changed = TRUE;

+	flags |= XF86CrtcSetMode;

     else if (randr_mode && !xf86RandRModeMatches (randr_mode, &crtc->mode))

-	changed = TRUE;

-    

+	flags |= XF86CrtcSetMode;

+

     if (rotation != crtc->rotation)

-	changed = TRUE;

+	flags |= XF86CrtcSetRotation;

 

     transform = RRCrtcGetTransform (randr_crtc);

     if ((transform != NULL) != crtc->transformPresent)

-	changed = TRUE;

+	flags |= XF86CrtcSetTransform;

     else if (transform && memcmp (&transform->transform, &crtc->transform.transform,

 				  sizeof (transform->transform)) != 0)

-	changed = TRUE;

+	flags |= XF86CrtcSetTransform;

+

+    if (scanout_pixmap != crtc->scanoutPixmap)

+	flags |= XF86CrtcSetScanoutPixmap;

 

     if (x != crtc->x || y != crtc->y)

-	changed = TRUE;

-    for (o = 0; o < config->num_output; o++) 

+	flags |= XF86CrtcSetOrigin;

+    for (o = 0; o < config->num_output; o++)

     {

 	xf86OutputPtr  output = config->output[o];

 	xf86CrtcPtr    new_crtc;

 

 	save_crtcs[o] = output->crtc;

-	

+

 	if (output->crtc == crtc)

 	    new_crtc = NULL;

 	else

 	    new_crtc = output->crtc;

-	for (ro = 0; ro < num_randr_outputs; ro++) 

+	for (ro = 0; ro < num_randr_outputs; ro++)

 	    if (output->randr_output == randr_outputs[ro])

 	    {

 		new_crtc = crtc;

@@ -1178,16 +1227,16 @@ xf86RandR12CrtcSet (ScreenPtr	    pScreen,
 	    }

 	if (new_crtc != output->crtc)

 	{

-	    changed = TRUE;

+	    flags |= XF86CrtcSetOutput;

 	    output->crtc = new_crtc;

 	}

     }

-    for (ro = 0; ro < num_randr_outputs; ro++) 

+    for (ro = 0; ro < num_randr_outputs; ro++)

         if (randr_outputs[ro]->pendingProperties)

-	    changed = TRUE;

+	    flags |= XF86CrtcSetProperty;

 

     /* XXX need device-independent mode setting code through an API */

-    if (changed)

+    if (flags)

     {

 	crtc->enabled = randr_mode != NULL;

 

@@ -1195,9 +1244,17 @@ xf86RandR12CrtcSet (ScreenPtr	    pScreen,
 	{

 	    DisplayModeRec  mode;

 	    RRTransformPtr  transform = RRCrtcGetTransform (randr_crtc);

+	    xf86CrtcSetRec  set;

 

 	    xf86RandRModeConvert (pScrn, randr_mode, &mode);

-	    if (!xf86CrtcSetModeTransform (crtc, &mode, rotation, transform, x, y))

+	    set.mode = &mode;

+	    set.rotation = rotation;

+	    set.transform = transform;

+	    set.x = x;

+	    set.y = y;

+	    set.scanout_pixmap = scanout_pixmap;

+	    set.flags = flags;

+	    if (!xf86CrtcSet(crtc, &set))

 	    {

 		crtc->enabled = save_enabled;

 		for (o = 0; o < config->num_output; o++)

@@ -1378,7 +1435,7 @@ xf86RROutputSetModes (RROutputPtr randr_output, DisplayModePtr modes)
 

     if (nmode) {

 	rrmodes = malloc(nmode * sizeof (RRModePtr));

-	

+

 	if (!rrmodes)

 	    return FALSE;

 	nmode = 0;

@@ -1388,7 +1445,7 @@ xf86RROutputSetModes (RROutputPtr randr_output, DisplayModePtr modes)
 		if ((pref != 0) == ((mode->type & M_T_PREFERRED) != 0)) {

 		    xRRModeInfo		modeInfo;

 		    RRModePtr		rrmode;

-		    

+

 		    modeInfo.nameLength = strlen (mode->name);

 		    modeInfo.width = mode->HDisplay;

 		    modeInfo.dotClock = mode->Clock * 1000;

@@ -1412,7 +1469,7 @@ xf86RROutputSetModes (RROutputPtr randr_output, DisplayModePtr modes)
 	    }

 	}

     }

-    

+

     ret = RROutputSetModes (randr_output, rrmodes, nmode, npreferred);

     free(rrmodes);

     return ret;

@@ -1432,13 +1489,13 @@ xf86RandR12SetInfo12 (ScreenPtr pScreen)
     int			o, c, l;

     RRCrtcPtr		randr_crtc;

     int			nclone;

-    

+

     clones = malloc(config->num_output * sizeof (RROutputPtr));

     crtcs = malloc(config->num_crtc * sizeof (RRCrtcPtr));

     for (o = 0; o < config->num_output; o++)

     {

 	xf86OutputPtr	output = config->output[o];

-	

+

 	ncrtc = 0;

 	for (c = 0; c < config->num_crtc; c++)

 	    if (output->possible_crtcs & (1 << c))

@@ -1456,7 +1513,7 @@ xf86RandR12SetInfo12 (ScreenPtr pScreen)
 	    return FALSE;

 	}

 

-	RROutputSetPhysicalSize(output->randr_output, 

+	RROutputSetPhysicalSize(output->randr_output,

 				output->mm_width,

 				output->mm_height);

 	xf86RROutputSetModes (output->randr_output, output->probed_modes);

@@ -1482,7 +1539,7 @@ xf86RandR12SetInfo12 (ScreenPtr pScreen)
 	for (l = 0; l < config->num_output; l++)

 	{

 	    xf86OutputPtr	    clone = config->output[l];

-	    

+

 	    if (l != o && (output->possible_clones & (1 << l)))

 		clones[nclone++] = clone->randr_output;

 	}

@@ -1523,7 +1580,7 @@ xf86RandR12CreateObjects12 (ScreenPtr pScreen)
     xf86CrtcConfigPtr   config = XF86_CRTC_CONFIG_PTR(pScrn);

     int			c;

     int			o;

-    

+

     if (!RRInit ())

 	return FALSE;

 

@@ -1533,7 +1590,7 @@ xf86RandR12CreateObjects12 (ScreenPtr pScreen)
     for (c = 0; c < config->num_crtc; c++)

     {

 	xf86CrtcPtr    crtc = config->crtc[c];

-	

+

 	crtc->randr_crtc = RRCrtcCreate (pScreen, crtc);

 	RRCrtcGammaSetSize (crtc->randr_crtc, 256);

     }

@@ -1544,7 +1601,7 @@ xf86RandR12CreateObjects12 (ScreenPtr pScreen)
     {

 	xf86OutputPtr	output = config->output[o];

 

-	output->randr_output = RROutputCreate (pScreen, output->name, 

+	output->randr_output = RROutputCreate (pScreen, output->name,

 					       strlen (output->name),

 					       output);

 

@@ -1567,7 +1624,7 @@ xf86RandR12CreateScreenResources12 (ScreenPtr pScreen)
 

     for (c = 0; c < config->num_crtc; c++)

         xf86RandR12CrtcNotify (config->crtc[c]->randr_crtc);

-    

+

     RRScreenSetSizeRange (pScreen, config->minWidth, config->minHeight,

 			  config->maxWidth, config->maxHeight);

     return TRUE;

@@ -1725,6 +1782,174 @@ xf86RandR12ChangeGamma(int scrnIndex, Gamma gamma)
     return Success;

 }

 

+static RRScanoutPixmapInfo *

+xf86RRQueryScanoutPixmaps(ScreenPtr screen, int *n_info)

+{

+    ScrnInfoPtr		scrn = xf86Screens[screen->myNum];

+    xf86CrtcConfigPtr	config = XF86_CRTC_CONFIG_PTR(scrn);

+    RRScanoutPixmapInfo	*info;

+    int			f;

+

+    info = calloc(config->num_scanout_formats, sizeof (RRScanoutPixmapInfo));

+    if (config->num_scanout_formats && !info) {

+	*n_info = 0;

+	return NULL;

+    }

+    for (f = 0; f < config->num_scanout_formats; f++) {

+	info[f].maxWidth = config->scanout_formats[f].maxWidth;

+	info[f].maxHeight = config->scanout_formats[f].maxHeight;

+	info[f].depth = config->scanout_formats[f].depth;

+	info[f].rotations = config->scanout_formats[f].rotations;

+	info[f].format = PictureMatchFormat (screen, info[f].depth,

+					     config->scanout_formats[f].format);

+    }

+    *n_info = config->num_scanout_formats;

+    return info;

+}

+

+static PixmapPtr

+xf86RRCreateScanoutPixmap(ScreenPtr screen,

+			  int width, int height, int depth,

+			  Rotation rotations,

+			  PictFormatPtr format)

+{

+    ScrnInfoPtr		scrn = xf86Screens[screen->myNum];

+    xf86CrtcConfigPtr	config = XF86_CRTC_CONFIG_PTR(scrn);

+    int			f;

+

+    if (!config->funcs->create_scanout_pixmap)

+	return NullPixmap;

+

+    for (f = 0; f < config->num_scanout_formats; f++)

+	if (config->scanout_formats[f].depth == depth &&

+	    (config->scanout_formats[f].format & 0xffffff) == format->format) {

+	    return (*config->funcs->create_scanout_pixmap) (scrn, width, height,

+							    rotations,

+							    &config->scanout_formats[f]);

+	}

+    return NullPixmap;

+}

+

+static void

+xf86RandR14SetCrtcSpriteTransform(ScreenPtr		pScreen,

+				  RRCrtcPtr		randr_crtc,

+				  struct pixman_f_transform *f_position_transform,

+				  struct pixman_f_transform *f_image_transform)

+{

+    xf86CrtcPtr		crtc = randr_crtc->devPrivate;

+

+    crtc->user_sprite_position_transform = *f_position_transform;

+    crtc->user_sprite_image_transform = *f_image_transform;

+    xf86CrtcRotateCursor(crtc);

+    xf86_reload_cursors(pScreen);

+}

+

+static Bool

+xf86RRConvertCrtcConfig(xf86CrtcSetConfigPtr	xf86_config,

+			RRCrtcConfigPtr		rr_config)

+{

+    RRCrtcPtr		rr_crtc = rr_config->crtc;

+    xf86CrtcPtr		crtc = rr_crtc->devPrivate;

+    ScrnInfoPtr		scrn = xf86Screens[rr_crtc->pScreen->myNum];

+    int			o;

+

+    xf86_config->crtc = crtc;

+    xf86_config->x = rr_config->x;

+    xf86_config->y = rr_config->y;

+    xf86RandRModeConvert(scrn, rr_config->mode, &xf86_config->mode);

+    xf86_config->rotation = rr_config->rotation;

+    xf86_config->numOutputs = rr_config->numOutputs;

+    xf86_config->outputs = calloc(rr_config->numOutputs, sizeof (xf86OutputPtr));

+    if (!xf86_config->outputs)

+	return FALSE;

+    for (o = 0; o < rr_config->numOutputs; o++)

+	xf86_config->outputs[o] = rr_config->outputs[o]->devPrivate;

+    xf86_config->sprite_position_transform = rr_config->sprite_position_f_transform;

+    xf86_config->sprite_image_transform = rr_config->sprite_image_f_transform;

+    xf86_config->pixmap = rr_config->pixmap;

+    xf86_config->pixmap_x = rr_config->pixmap_x;

+    xf86_config->pixmap_y = rr_config->pixmap_y;

+    return TRUE;

+}

+

+static void

+xf86FreeCrtcSetConfigs(xf86CrtcSetConfigPtr xf86_crtc_configs, int num_configs)

+{

+    int	i;

+

+    for (i = 0; i < num_configs; i++)

+	free(xf86_crtc_configs[i].outputs);

+    free(xf86_crtc_configs);

+}

+

+static Bool

+xf86RRSetCrtcConfigs(ScreenPtr screen,

+		     RRScreenConfigPtr screen_config,

+		     RRCrtcConfigPtr crtc_configs,

+		     int num_configs)

+{

+    ScrnInfoPtr	     		scrn = xf86Screens[screen->myNum];

+    xf86CrtcConfigPtr		config = XF86_CRTC_CONFIG_PTR(scrn);

+

+    if (config->funcs->set_config) {

+	xf86CrtcSetConfigPtr	xf86_crtc_configs;

+	int			i;

+	xf86SetConfigResponse	response;

+

+	/*

+	 * Convert RRCrtcConfigRecs to xf86CrtcSetConfigs

+	 */

+	xf86_crtc_configs = calloc(num_configs, sizeof (xf86CrtcSetConfigRec));

+	if (!xf86_crtc_configs)

+	    return FALSE;

+	for (i = 0; i < num_configs; i++)

+	    if (!xf86RRConvertCrtcConfig(&xf86_crtc_configs[i], &crtc_configs[i])) {

+		xf86FreeCrtcSetConfigs(xf86_crtc_configs, num_configs);

+		return FALSE;

+	    }

+

+	/*

+	 * Ask the driver to set the configuration

+	 */

+	response = (*config->funcs->set_config)(scrn,

+						screen_config,

+						xf86_crtc_configs,

+						num_configs);

+	xf86FreeCrtcSetConfigs(xf86_crtc_configs, num_configs);

+

+	/*

+	 * The driver is allowed to answer with one of three

+	 * responses:

+	 */

+	switch (response) {

+	case xf86SetConfigFailed:

+

+	    /* The configuration isn't usable, or some error

+	     * occurred while setting it. Everything has been

+	     * cleaned up and we're ready to return an error

+	     * back to the client

+	     */

+	    return FALSE;

+	case xf86SetConfigDone:

+

+	    /* The configuration was acceptable, and the whole

+	     * mode setting experience is over. Nothing more to do

+	     * here.

+	     */

+	    return TRUE;

+	case xf86SetConfigChecked:

+

+	    /* The configuration was acceptable, but the driver

+	     * didn't actually do anything. Go ask the DIX code

+	     * to do the mode setting operation using the simpler

+	     * interfaces

+	     */

+	    break;

+	}

+    }

+    return miRRSetCrtcConfigs(screen, screen_config, crtc_configs, num_configs);

+}

+

 static Bool

 xf86RandR12EnterVT (int screen_index, int flags)

 {

@@ -1733,6 +1958,7 @@ xf86RandR12EnterVT (int screen_index, int flags)
     XF86RandRInfoPtr randrp  = XF86RANDRINFO(pScreen);

     rrScrPrivPtr     rp = rrGetScrPriv(pScreen);

     Bool	     ret;

+    int i;

 

     if (randrp->orig_EnterVT) {

 	pScrn->EnterVT = randrp->orig_EnterVT;

@@ -1744,7 +1970,6 @@ xf86RandR12EnterVT (int screen_index, int flags)
     }

 

     /* reload gamma */

-    int i;

     for (i = 0; i < rp->numCrtcs; i++)

 	xf86RandR12CrtcSetGamma(pScreen, rp->crtcs[i]);

 

@@ -1766,15 +1991,17 @@ xf86RandR12Init12 (ScreenPtr pScreen)
     rp->rrCrtcGetGamma = xf86RandR12CrtcGetGamma;

     rp->rrOutputSetProperty = xf86RandR12OutputSetProperty;

     rp->rrOutputValidateMode = xf86RandR12OutputValidateMode;

-#if RANDR_13_INTERFACE

     rp->rrOutputGetProperty = xf86RandR13OutputGetProperty;

     rp->rrGetPanning = xf86RandR13GetPanning;

     rp->rrSetPanning = xf86RandR13SetPanning;

-#endif

     rp->rrModeDestroy = xf86RandR12ModeDestroy;

     rp->rrSetConfig = NULL;

     pScrn->PointerMoved = xf86RandR12PointerMoved;

     pScrn->ChangeGamma = xf86RandR12ChangeGamma;

+    rp->rrSetCrtcSpriteTransform = xf86RandR14SetCrtcSpriteTransform;

+    rp->rrSetCrtcConfigs = xf86RRSetCrtcConfigs;

+    rp->rrQueryScanoutPixmaps = xf86RRQueryScanoutPixmaps;

+    rp->rrCreateScanoutPixmap = xf86RRCreateScanoutPixmap;

 

     randrp->orig_EnterVT = pScrn->EnterVT;

     pScrn->EnterVT = xf86RandR12EnterVT;

diff --git a/xorg-server/hw/xfree86/modes/xf86Rotate.c b/xorg-server/hw/xfree86/modes/xf86Rotate.c
index 655857597..0181bc381 100644
--- a/xorg-server/hw/xfree86/modes/xf86Rotate.c
+++ b/xorg-server/hw/xfree86/modes/xf86Rotate.c
@@ -369,6 +369,39 @@ xf86CrtcFitsScreen (xf86CrtcPtr crtc, struct pict_f_transform *crtc_to_fb)
 	    0 <= b.y1 && b.y2 <= pScrn->virtualY);

 }

 

+/*

+ * A subset of xf86CrtcRotate that just deals with

+ * cursor image/position transforms. Used when changing

+ * the cursor transform

+ */

+void

+xf86CrtcRotateCursor (xf86CrtcPtr crtc)

+{

+    /* if this is called during ScreenInit() we don't have pScrn->pScreen yet */

+    RRTransformPtr	transform = NULL;

+    PictTransform	crtc_to_fb;

+    struct pict_f_transform f_crtc_to_fb, f_fb_to_crtc, f_screen_to_crtc, f_crtc_to_cursor;

+

+    if (crtc->transformPresent)

+	transform = &crtc->transform;

+

+    (void) RRTransformCompute (crtc->x, crtc->y,

+			       crtc->mode.HDisplay, crtc->mode.VDisplay,

+			       crtc->rotation,

+			       transform,

+			       &crtc->user_sprite_position_transform,

+			       &crtc->user_sprite_image_transform,

+

+			       &crtc_to_fb,

+			       &f_crtc_to_fb,

+			       &f_fb_to_crtc,

+			       &f_screen_to_crtc,

+			       &f_crtc_to_cursor,

+			       &crtc->sprite_transform_in_use);

+    crtc->f_screen_to_crtc = f_screen_to_crtc;

+    crtc->f_crtc_to_cursor = f_crtc_to_cursor;

+}

+

 Bool

 xf86CrtcRotate (xf86CrtcPtr crtc)

 {

@@ -377,7 +410,7 @@ xf86CrtcRotate (xf86CrtcPtr crtc)
     /* if this is called during ScreenInit() we don't have pScrn->pScreen yet */

     ScreenPtr		pScreen = screenInfo.screens[pScrn->scrnIndex];

     PictTransform	crtc_to_fb;

-    struct pict_f_transform f_crtc_to_fb, f_fb_to_crtc;

+    struct pict_f_transform f_crtc_to_fb, f_fb_to_crtc, f_screen_to_crtc, f_crtc_to_cursor;

     xFixed		*new_params = NULL;

     int			new_nparams = 0;

     PictFilterPtr	new_filter = NULL;

@@ -393,10 +426,15 @@ xf86CrtcRotate (xf86CrtcPtr crtc)
 			     crtc->mode.HDisplay, crtc->mode.VDisplay,

 			     crtc->rotation,

 			     transform,

+			     &crtc->user_sprite_position_transform,

+			     &crtc->user_sprite_image_transform,

 

 			     &crtc_to_fb,

 			     &f_crtc_to_fb,

-			     &f_fb_to_crtc) &&

+			     &f_fb_to_crtc,

+			     &f_screen_to_crtc,

+			     &f_crtc_to_cursor,

+			     &crtc->sprite_transform_in_use) &&

 	xf86CrtcFitsScreen (crtc, &f_crtc_to_fb))

     {

 	/*

@@ -505,6 +543,8 @@ xf86CrtcRotate (xf86CrtcPtr crtc)
     crtc->crtc_to_framebuffer = crtc_to_fb;

     crtc->f_crtc_to_framebuffer = f_crtc_to_fb;

     crtc->f_framebuffer_to_crtc = f_fb_to_crtc;

+    crtc->f_screen_to_crtc = f_screen_to_crtc;

+    crtc->f_crtc_to_cursor = f_crtc_to_cursor;

     free(crtc->params);

     crtc->params = new_params;

     crtc->nparams = new_nparams;

diff --git a/xorg-server/hw/xfree86/os-support/solaris/sun_agp.c b/xorg-server/hw/xfree86/os-support/solaris/sun_agp.c
index b85a3c86b..99c3abde5 100644
--- a/xorg-server/hw/xfree86/os-support/solaris/sun_agp.c
+++ b/xorg-server/hw/xfree86/os-support/solaris/sun_agp.c
@@ -318,7 +318,7 @@ xf86EnableAGP(int screenNum, CARD32 mode)
 	if (ioctl(gartFd, AGPIOC_SETUP, &setup) != 0) {

 		xf86DrvMsg(screenNum, X_WARNING, "xf86EnableAGP: "

 		    "AGPIOC_SETUP with mode %x failed (%s)\n",

-		    mode, strerror(errno));

+		    (unsigned int) mode, strerror(errno));

 		return FALSE;

 	}

 

diff --git a/xorg-server/hw/xfree86/os-support/solaris/sun_init.c b/xorg-server/hw/xfree86/os-support/solaris/sun_init.c
index 4716da93e..ae9adee4b 100644
--- a/xorg-server/hw/xfree86/os-support/solaris/sun_init.c
+++ b/xorg-server/hw/xfree86/os-support/solaris/sun_init.c
@@ -71,7 +71,6 @@ xf86OpenConsole(void)
     int fd;

     struct vt_mode VT;

     struct vt_stat vtinfo;

-    int FreeVTslot;

     MessageType from = X_PROBED;

 #endif

 

@@ -95,8 +94,8 @@ xf86OpenConsole(void)
 	    }

 	    else

 	    {

-		if ((int)mmap(0, 0x1000, PROT_NONE,

-			      MAP_FIXED | MAP_SHARED, fd, 0) == -1)

+		if (mmap(0, 0x1000, PROT_NONE,

+			 MAP_FIXED | MAP_SHARED, fd, 0) == MAP_FAILED)

 		    xf86Msg(X_WARNING,

 			"xf86OpenConsole: failed to protect page 0 (%s)\n",

 			strerror(errno));

@@ -413,7 +412,7 @@ xf86ProcessArgument(int argc, char **argv, int i)
     return 0;

 }

 

-void xf86UseMsg()

+void xf86UseMsg(void)

 {

 #ifdef HAS_USL_VTS

     ErrorF("vtX                    Use the specified VT number\n");

diff --git a/xorg-server/hw/xfree86/os-support/solaris/sun_vid.c b/xorg-server/hw/xfree86/os-support/solaris/sun_vid.c
index 5089ae74d..1991289fd 100644
--- a/xorg-server/hw/xfree86/os-support/solaris/sun_vid.c
+++ b/xorg-server/hw/xfree86/os-support/solaris/sun_vid.c
@@ -1,259 +1,258 @@
-/*
- * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany
- * Copyright 1993 by David Wexelblat <dwex@goblin.org>
- * Copyright 1999 by David Holland <davidh@iquest.net>
- *
- * 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 names of the copyright holders not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission.  The copyright holders make no representations
- * about the suitability of this software for any purpose.  It is provided "as
- * is" without express or implied warranty.
- *
- * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT
- * SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
- * OF THIS SOFTWARE.
- *
- */
-/* Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- */
-
-#ifdef HAVE_XORG_CONFIG_H
-#include <xorg-config.h>
-#endif
-
-#include <sys/types.h> /* get __x86 definition if not set by compiler */
-
-#if defined(__i386__) || defined(__i386) || defined(__x86)
-# define _NEED_SYSI86
-#endif
-#include "xf86.h"
-#include "xf86Priv.h"
-#include "xf86_OSlib.h"
-#include "xf86OSpriv.h"
-#include <sys/mman.h>
-
-/***************************************************************************/
-/* Video Memory Mapping section 					   */
-/***************************************************************************/
-
-static char *apertureDevName = NULL;
-static int apertureDevFD_ro = -1;
-static int apertureDevFD_rw = -1;
-
-static Bool
-solOpenAperture(void)
-{
-    if (apertureDevName == NULL)
-    {
-	apertureDevName = "/dev/xsvc";
-	if ((apertureDevFD_rw = open(apertureDevName, O_RDWR)) < 0)
-	{
-	    xf86MsgVerb(X_WARNING, 0,
-			"solOpenAperture: failed to open %s (%s)\n",
-			apertureDevName, strerror(errno));
-	    apertureDevName = "/dev/fbs/aperture";
-	    apertureDevFD_rw = open(apertureDevName, O_RDWR);
-	}
-	apertureDevFD_ro = open(apertureDevName, O_RDONLY);
-
-	if ((apertureDevFD_rw < 0) || (apertureDevFD_ro < 0))
-	{
-	    xf86MsgVerb(X_WARNING, 0,
-			"solOpenAperture: failed to open %s (%s)\n",
-			apertureDevName, strerror(errno));
-	    xf86MsgVerb(X_WARNING, 0,
-			"solOpenAperture: either /dev/fbs/aperture"
-			" or /dev/xsvc required\n");
-
-	    apertureDevName = NULL;
-
-	    if (apertureDevFD_rw >= 0)
-	    {
-		close(apertureDevFD_rw);
-	    }
-	    apertureDevFD_rw = -1;
-
-	    if (apertureDevFD_ro >= 0)
-	    {
-		close(apertureDevFD_ro);
-	    }
-	    apertureDevFD_ro = -1;
-
-	    return FALSE;
-	}
-    }
-    return TRUE;
-}
-
-static pointer
-solMapVidMem(int ScreenNum, unsigned long Base, unsigned long Size, int Flags)
-{
-    pointer base;
-    int fd;
-    int prot;
-
-    if (Flags & VIDMEM_READONLY)
-    {
-	fd = apertureDevFD_ro;
-	prot = PROT_READ;
-    }
-    else
-    {
-	fd = apertureDevFD_rw;
-	prot = PROT_READ | PROT_WRITE;
-    }
-
-    if (fd < 0)
-    {
-	xf86DrvMsg(ScreenNum, X_ERROR,
-		   "solMapVidMem: failed to open %s (%s)\n",
-		   apertureDevName, strerror(errno));
-	return NULL;
-    }
-
-    base = mmap(NULL, Size, prot, MAP_SHARED, fd, (off_t)Base);
-
-    if (base == MAP_FAILED) {
-        xf86DrvMsg(ScreenNum, X_ERROR,
-		   "solMapVidMem: failed to mmap %s (0x%08lx,0x%lx) (%s)\n",
-		   apertureDevName, Base, Size, strerror(errno));
-	return NULL;
-    }
-
-    return base;
-}
-
-/* ARGSUSED */
-static void
-solUnMapVidMem(int ScreenNum, pointer Base, unsigned long Size)
-{
-    if (munmap(Base, Size) != 0) {
-	xf86DrvMsgVerb(ScreenNum, X_WARNING, 0,
-		       "solUnMapVidMem: failed to unmap %s"
-		       " (0x%08lx,0x%lx) (%s)\n",
-		       apertureDevName, Base, Size,
-		       strerror(errno));
-    }
-}
-
-_X_HIDDEN void
-xf86OSInitVidMem(VidMemInfoPtr pVidMem)
-{
-    pVidMem->linearSupported = solOpenAperture();
-    if (pVidMem->linearSupported) {
-	pVidMem->mapMem = solMapVidMem;
-	pVidMem->unmapMem = solUnMapVidMem;
-    } else {
-	xf86MsgVerb(X_WARNING, 0,
-		    "xf86OSInitVidMem: linear memory access disabled\n");
-    }
-    pVidMem->initialised = TRUE;
-}
-
-/*
- * Read BIOS via mmap()ing physical memory.
- */
-int
-xf86ReadBIOS(unsigned long Base, unsigned long Offset, unsigned char *Buf,
-	     int Len)
-{
-    unsigned char *ptr;
-    int psize;
-    int mlen;
-
-    psize = getpagesize();
-    Offset += Base & (psize - 1);
-    Base &= ~(psize - 1);
-    mlen = (Offset + Len + psize - 1) & ~(psize - 1);
-
-    if (solOpenAperture() == FALSE)
-    {
-	xf86Msg(X_WARNING,
-		"xf86ReadBIOS: Failed to open aperture to read BIOS\n");
-	return -1;
-    }
-
-    ptr = (unsigned char *)mmap(NULL, mlen, PROT_READ,
-				MAP_SHARED, apertureDevFD_ro, (off_t)Base);
-    if (ptr == MAP_FAILED)
-    {
-	xf86Msg(X_WARNING, "xf86ReadBIOS: %s mmap failed [0x%08lx, 0x%04x]\n",
-		apertureDevName, Base, mlen);
-	return -1;
-    }
-
-    (void)memcpy(Buf, (void *)(ptr + Offset), Len);
-    if (munmap((caddr_t)ptr, mlen) != 0) {
-	xf86MsgVerb(X_WARNING, 0,
-		    "solUnMapVidMem: failed to unmap %s"
-		    " (0x%08lx,0x%lx) (%s)\n",
-		    apertureDevName, ptr, mlen, strerror(errno));
-    }
-
-    return Len;
-}
-
-
-/***************************************************************************/
-/* I/O Permissions section						   */
-/***************************************************************************/
-
-#if defined(__i386__) || defined(__i386) || defined(__x86)
-static Bool ExtendedEnabled = FALSE;
-#endif
-
-Bool
-xf86EnableIO(void)
-{
-#if defined(__i386__) || defined(__i386) || defined(__x86)
-    if (ExtendedEnabled)
-	return TRUE;
-
-    if (sysi86(SI86V86, V86SC_IOPL, PS_IOPL) < 0) {
-	xf86Msg(X_WARNING, "xf86EnableIOPorts: Failed to set IOPL for I/O\n");
-	return FALSE;
-    }
-    ExtendedEnabled = TRUE;
-#endif /* i386 */
-    return TRUE;
-}
-
-void
-xf86DisableIO(void)
-{
-#if defined(__i386__) || defined(__i386) || defined(__x86)
-    if(!ExtendedEnabled)
-	return;
-
-    sysi86(SI86V86, V86SC_IOPL, 0);
-
-    ExtendedEnabled = FALSE;
-#endif /* i386 */
-}
+/*

+ * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany

+ * Copyright 1993 by David Wexelblat <dwex@goblin.org>

+ * Copyright 1999 by David Holland <davidh@iquest.net>

+ *

+ * 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 names of the copyright holders not be used in advertising or

+ * publicity pertaining to distribution of the software without specific,

+ * written prior permission.  The copyright holders make no representations

+ * about the suitability of this software for any purpose.  It is provided "as

+ * is" without express or implied warranty.

+ *

+ * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT

+ * SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR

+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,

+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER

+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE

+ * OF THIS SOFTWARE.

+ *

+ */

+/* Copyright 2008 Sun Microsystems, Inc.  All rights reserved.

+ *

+ * Permission is hereby granted, free of charge, to any person obtaining a

+ * copy of this software and associated documentation files (the "Software"),

+ * to deal in the Software without restriction, including without limitation

+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,

+ * and/or sell copies of the Software, and to permit persons to whom the

+ * Software is furnished to do so, subject to the following conditions:

+ *

+ * The above copyright notice and this permission notice (including the next

+ * paragraph) shall be included in all copies or substantial portions of the

+ * Software.

+ *

+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING

+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER

+ * DEALINGS IN THE SOFTWARE.

+ */

+

+#ifdef HAVE_XORG_CONFIG_H

+#include <xorg-config.h>

+#endif

+

+#include <sys/types.h> /* get __x86 definition if not set by compiler */

+

+#if defined(__i386__) || defined(__i386) || defined(__x86)

+# define _NEED_SYSI86

+#endif

+#include "xf86.h"

+#include "xf86Priv.h"

+#include "xf86_OSlib.h"

+#include "xf86OSpriv.h"

+#include <sys/mman.h>

+

+/***************************************************************************/

+/* Video Memory Mapping section 					   */

+/***************************************************************************/

+

+static char *apertureDevName = NULL;

+static int apertureDevFD_ro = -1;

+static int apertureDevFD_rw = -1;

+

+static Bool

+solOpenAperture(void)

+{

+    if (apertureDevName == NULL)

+    {

+	apertureDevName = "/dev/xsvc";

+	if ((apertureDevFD_rw = open(apertureDevName, O_RDWR)) < 0)

+	{

+	    xf86MsgVerb(X_WARNING, 0,

+			"solOpenAperture: failed to open %s (%s)\n",

+			apertureDevName, strerror(errno));

+	    apertureDevName = "/dev/fbs/aperture";

+	    apertureDevFD_rw = open(apertureDevName, O_RDWR);

+	}

+	apertureDevFD_ro = open(apertureDevName, O_RDONLY);

+

+	if ((apertureDevFD_rw < 0) || (apertureDevFD_ro < 0))

+	{

+	    xf86MsgVerb(X_WARNING, 0,

+			"solOpenAperture: failed to open %s (%s)\n",

+			apertureDevName, strerror(errno));

+	    xf86MsgVerb(X_WARNING, 0,

+			"solOpenAperture: either /dev/fbs/aperture"

+			" or /dev/xsvc required\n");

+

+	    apertureDevName = NULL;

+

+	    if (apertureDevFD_rw >= 0)

+	    {

+		close(apertureDevFD_rw);

+	    }

+	    apertureDevFD_rw = -1;

+

+	    if (apertureDevFD_ro >= 0)

+	    {

+		close(apertureDevFD_ro);

+	    }

+	    apertureDevFD_ro = -1;

+

+	    return FALSE;

+	}

+    }

+    return TRUE;

+}

+

+static pointer

+solMapVidMem(int ScreenNum, unsigned long Base, unsigned long Size, int Flags)

+{

+    pointer base;

+    int fd;

+    int prot;

+

+    if (Flags & VIDMEM_READONLY)

+    {

+	fd = apertureDevFD_ro;

+	prot = PROT_READ;

+    }

+    else

+    {

+	fd = apertureDevFD_rw;

+	prot = PROT_READ | PROT_WRITE;

+    }

+

+    if (fd < 0)

+    {

+	xf86DrvMsg(ScreenNum, X_ERROR,

+		   "solMapVidMem: failed to open %s (%s)\n",

+		   apertureDevName, strerror(errno));

+	return NULL;

+    }

+

+    base = mmap(NULL, Size, prot, MAP_SHARED, fd, (off_t)Base);

+

+    if (base == MAP_FAILED) {

+        xf86DrvMsg(ScreenNum, X_ERROR,

+		   "solMapVidMem: failed to mmap %s (0x%08lx,0x%lx) (%s)\n",

+		   apertureDevName, Base, Size, strerror(errno));

+	return NULL;

+    }

+

+    return base;

+}

+

+/* ARGSUSED */

+static void

+solUnMapVidMem(int ScreenNum, pointer Base, unsigned long Size)

+{

+    if (munmap(Base, Size) != 0) {

+	xf86DrvMsgVerb(ScreenNum, X_WARNING, 0,

+		       "solUnMapVidMem: failed to unmap %s"

+		       " (0x%p,0x%lx) (%s)\n",

+		       apertureDevName, Base, Size,

+		       strerror(errno));

+    }

+}

+

+_X_HIDDEN void

+xf86OSInitVidMem(VidMemInfoPtr pVidMem)

+{

+    pVidMem->linearSupported = solOpenAperture();

+    if (pVidMem->linearSupported) {

+	pVidMem->mapMem = solMapVidMem;

+	pVidMem->unmapMem = solUnMapVidMem;

+    } else {

+	xf86MsgVerb(X_WARNING, 0,

+		    "xf86OSInitVidMem: linear memory access disabled\n");

+    }

+    pVidMem->initialised = TRUE;

+}

+

+/*

+ * Read BIOS via mmap()ing physical memory.

+ */

+int

+xf86ReadBIOS(unsigned long Base, unsigned long Offset, unsigned char *Buf,

+	     int Len)

+{

+    unsigned char *ptr;

+    int psize;

+    int mlen;

+

+    psize = getpagesize();

+    Offset += Base & (psize - 1);

+    Base &= ~(psize - 1);

+    mlen = (Offset + Len + psize - 1) & ~(psize - 1);

+

+    if (solOpenAperture() == FALSE)

+    {

+	xf86Msg(X_WARNING,

+		"xf86ReadBIOS: Failed to open aperture to read BIOS\n");

+	return -1;

+    }

+

+    ptr = (unsigned char *)mmap(NULL, mlen, PROT_READ,

+				MAP_SHARED, apertureDevFD_ro, (off_t)Base);

+    if (ptr == MAP_FAILED)

+    {

+	xf86Msg(X_WARNING, "xf86ReadBIOS: %s mmap failed [0x%08lx, 0x%04x]\n",

+		apertureDevName, Base, mlen);

+	return -1;

+    }

+

+    (void)memcpy(Buf, (void *)(ptr + Offset), Len);

+    if (munmap((caddr_t)ptr, mlen) != 0) {

+	xf86MsgVerb(X_WARNING, 0,

+		    "xf86ReadBIOS: failed to unmap %s (0x%p,0x%x) (%s)\n",

+		    apertureDevName, ptr, mlen, strerror(errno));

+    }

+

+    return Len;

+}

+

+

+/***************************************************************************/

+/* I/O Permissions section						   */

+/***************************************************************************/

+

+#if defined(__i386__) || defined(__i386) || defined(__x86)

+static Bool ExtendedEnabled = FALSE;

+#endif

+

+Bool

+xf86EnableIO(void)

+{

+#if defined(__i386__) || defined(__i386) || defined(__x86)

+    if (ExtendedEnabled)

+	return TRUE;

+

+    if (sysi86(SI86V86, V86SC_IOPL, PS_IOPL) < 0) {

+	xf86Msg(X_WARNING, "xf86EnableIOPorts: Failed to set IOPL for I/O\n");

+	return FALSE;

+    }

+    ExtendedEnabled = TRUE;

+#endif /* i386 */

+    return TRUE;

+}

+

+void

+xf86DisableIO(void)

+{

+#if defined(__i386__) || defined(__i386) || defined(__x86)

+    if(!ExtendedEnabled)

+	return;

+

+    sysi86(SI86V86, V86SC_IOPL, 0);

+

+    ExtendedEnabled = FALSE;

+#endif /* i386 */

+}

diff --git a/xorg-server/hw/xquartz/darwin.c b/xorg-server/hw/xquartz/darwin.c
index 4dbe74b97..56021ed0a 100644
--- a/xorg-server/hw/xquartz/darwin.c
+++ b/xorg-server/hw/xquartz/darwin.c
@@ -792,7 +792,7 @@ xf86SetRootClip (ScreenPtr pScreen, int enable)
     WindowPtr	pChild;

     Bool	WasViewable = (Bool)(pWin->viewable);

     Bool	anyMarked = TRUE;

-    RegionPtr	pOldClip = NULL, bsExposed;

+    RegionPtr	pOldClip = NULL;

     WindowPtr   pLayerWin;

     BoxRec	box;

 

diff --git a/xorg-server/hw/xquartz/mach-startup/bundle-main.c b/xorg-server/hw/xquartz/mach-startup/bundle-main.c
index e6386dc3a..aaff1c625 100644
--- a/xorg-server/hw/xquartz/mach-startup/bundle-main.c
+++ b/xorg-server/hw/xquartz/mach-startup/bundle-main.c
@@ -74,7 +74,7 @@ extern int noPanoramiXExtension;
 #endif

 

 static char __crashreporter_info_buff__[4096] = {0};

-static const char *__crashreporter_info__ = &__crashreporter_info_buff__[0];

+static const char *__crashreporter_info__ __attribute__((__used__)) = &__crashreporter_info_buff__[0];

 #if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050

 // This is actually a toolchain requirement, but I'm not sure the correct check,

 // but it should be fine to just only include it for Leopard and later.  This line

diff --git a/xorg-server/hw/xquartz/quartz.c b/xorg-server/hw/xquartz/quartz.c
index 7a92755c7..aed063489 100644
--- a/xorg-server/hw/xquartz/quartz.c
+++ b/xorg-server/hw/xquartz/quartz.c
@@ -62,6 +62,7 @@
 #include <sys/stat.h>

 #include <fcntl.h>

 #include <IOKit/pwr_mgt/IOPMLib.h>

+#include <pthread.h>

 

 #include <rootlessCommon.h>

 #include <Xplugin.h>

@@ -246,6 +247,40 @@ void QuartzUpdateScreens(void) {
     quartzProcs->UpdateScreen(pScreen);

 }

 

+static void pokeActivityCallback(CFRunLoopTimerRef timer, void *info) {

+    UpdateSystemActivity(OverallAct);

+}

+

+static void QuartzScreenSaver(int state) {

+    static CFRunLoopTimerRef pokeActivityTimer = NULL;

+    static CFRunLoopTimerContext pokeActivityContext = { 0, NULL, NULL, NULL, NULL };

+    static pthread_mutex_t pokeActivityMutex = PTHREAD_MUTEX_INITIALIZER;

+

+    pthread_mutex_lock(&pokeActivityMutex);

+    

+    if(state) {

+        if(pokeActivityTimer == NULL)

+            goto QuartzScreenSaverEnd;

+

+        CFRunLoopTimerInvalidate(pokeActivityTimer);

+        CFRelease(pokeActivityTimer);

+        pokeActivityTimer = NULL;

+    } else {

+        if(pokeActivityTimer != NULL)

+            goto QuartzScreenSaverEnd;

+        

+        pokeActivityTimer = CFRunLoopTimerCreate(NULL, CFAbsoluteTimeGetCurrent(), 30, 0, 0, pokeActivityCallback, &pokeActivityContext);

+        if(pokeActivityTimer == NULL) {

+            ErrorF("Unable to create pokeActivityTimer.\n");

+            goto QuartzScreenSaverEnd;

+        }

+

+        CFRunLoopAddTimer(CFRunLoopGetMain(), pokeActivityTimer, kCFRunLoopCommonModes);

+    }

+QuartzScreenSaverEnd:

+    pthread_mutex_unlock(&pokeActivityMutex);

+}

+

 void QuartzShowFullscreen(int state) {

     int i;

     

@@ -256,6 +291,8 @@ void QuartzShowFullscreen(int state) {
         return;

     }

     

+    QuartzScreenSaver(!state);

+    

     if(XQuartzFullscreenVisible == state)

         return;

     

diff --git a/xorg-server/hw/xquartz/quartzRandR.c b/xorg-server/hw/xquartz/quartzRandR.c
index bc58e2341..64ad72d84 100644
--- a/xorg-server/hw/xquartz/quartzRandR.c
+++ b/xorg-server/hw/xquartz/quartzRandR.c
@@ -438,18 +438,16 @@ static Bool QuartzRandRSetConfig (ScreenPtr           pScreen,
 static Bool _QuartzRandRUpdateFakeModes (ScreenPtr pScreen) {

     QuartzScreenPtr pQuartzScreen = QUARTZ_PRIV(pScreen);

 

-    if (pQuartzScreen->displayCount == 1) {

-        if(pQuartzScreen->fullscreenMode.ref)

-            CFRelease(pQuartzScreen->fullscreenMode.ref);

-        if(pQuartzScreen->currentMode.ref)

-            CFRelease(pQuartzScreen->currentMode.ref);

+    if(pQuartzScreen->fullscreenMode.ref)

+        CFRelease(pQuartzScreen->fullscreenMode.ref);

+    if(pQuartzScreen->currentMode.ref)

+        CFRelease(pQuartzScreen->currentMode.ref);

         

-        if (!QuartzRandRCopyCurrentModeInfo(pQuartzScreen->displayIDs[0],

-                                            &pQuartzScreen->fullscreenMode))

-            return FALSE;

+    if (!QuartzRandRCopyCurrentModeInfo(pQuartzScreen->displayIDs[0],

+                                        &pQuartzScreen->fullscreenMode))

+        return FALSE;

 

-        CFRetain(pQuartzScreen->fullscreenMode.ref);  /* This extra retain is for currentMode's copy */

-    } else {

+    if (pQuartzScreen->displayCount > 1) {

         pQuartzScreen->fullscreenMode.width = pScreen->width;

         pQuartzScreen->fullscreenMode.height = pScreen->height;

         if(XQuartzIsRootless)

@@ -467,6 +465,11 @@ static Bool _QuartzRandRUpdateFakeModes (ScreenPtr pScreen) {
     } else {

         pQuartzScreen->currentMode = pQuartzScreen->fullscreenMode;

     }

+

+    /* This extra retain is for currentMode's copy.

+     * fullscreen and rootless share a retain.

+     */

+    CFRetain(pQuartzScreen->currentMode.ref);

     

     DEBUG_LOG("rootlessMode: %d x %d\n", (int)pQuartzScreen->rootlessMode.width, (int)pQuartzScreen->rootlessMode.height);

     DEBUG_LOG("fullscreenMode: %d x %d\n", (int)pQuartzScreen->fullscreenMode.width, (int)pQuartzScreen->fullscreenMode.height);

diff --git a/xorg-server/include/os.h b/xorg-server/include/os.h
index 334156cbe..22b974e19 100644
--- a/xorg-server/include/os.h
+++ b/xorg-server/include/os.h
@@ -528,7 +528,7 @@ extern _X_EXPORT void FatalError(const char *f, ...) _X_ATTRIBUTE_PRINTF(1,2) _X
 

 extern _X_EXPORT void VErrorF(const char *f, va_list args);

 extern _X_EXPORT void ErrorF(const char *f, ...) _X_ATTRIBUTE_PRINTF(1,2);

-extern _X_EXPORT void Error(char *str);

+extern _X_EXPORT void Error(const char *str);

 extern _X_EXPORT void LogPrintMarkers(void);

 

 extern _X_EXPORT void xorg_backtrace(void);

diff --git a/xorg-server/include/privates.h b/xorg-server/include/privates.h
index f6f42f35e..ec2604cab 100644
--- a/xorg-server/include/privates.h
+++ b/xorg-server/include/privates.h
@@ -51,6 +51,7 @@ typedef enum {
     PRIVATE_GLYPH,

     PRIVATE_GLYPHSET,

     PRIVATE_PICTURE,

+    PRIVATE_SYNC_FENCE,

 

     /* last private type */

     PRIVATE_LAST,

diff --git a/xorg-server/include/protocol-versions.h b/xorg-server/include/protocol-versions.h
index 6ea4623da..441d76788 100644
--- a/xorg-server/include/protocol-versions.h
+++ b/xorg-server/include/protocol-versions.h
@@ -65,7 +65,7 @@
 

 /* RandR */

 #define SERVER_RANDR_MAJOR_VERSION		1

-#define SERVER_RANDR_MINOR_VERSION		3

+#define SERVER_RANDR_MINOR_VERSION		4

 

 /* Record */

 #define SERVER_RECORD_MAJOR_VERSION		1

@@ -95,6 +95,10 @@
 #define SERVER_SHM_MAJOR_VERSION		1

 #define SERVER_SHM_MINOR_VERSION		1

 

+/* Sync */

+#define SERVER_SYNC_MAJOR_VERSION		3

+#define SERVER_SYNC_MINOR_VERSION		1

+

 /* Windows WM */

 #define SERVER_WINDOWSWM_MAJOR_VERSION		1

 #define SERVER_WINDOWSWM_MINOR_VERSION		0

diff --git a/xorg-server/makefile b/xorg-server/makefile
index af33a26dc..f9163d953 100644
--- a/xorg-server/makefile
+++ b/xorg-server/makefile
@@ -15,6 +15,7 @@ INCLUDELIBFILES =  \
  mi\$(OBJDIR)\libmi.lib \
  miext\damage\$(OBJDIR)\libdamage.lib \
  miext\shadow\$(OBJDIR)\libshadow.lib \
+ miext\sync\$(OBJDIR)\libsync.lib \
  os\$(OBJDIR)\libos.lib \
  randr\$(OBJDIR)\librandr.lib \
  record\$(OBJDIR)\librecord.lib \
diff --git a/xorg-server/mi/mieq.c b/xorg-server/mi/mieq.c
index 707d0f8ff..66e2806c7 100644
--- a/xorg-server/mi/mieq.c
+++ b/xorg-server/mi/mieq.c
@@ -320,6 +320,7 @@ CopyGetMasterEvent(DeviceIntPtr sdev,
 {

     DeviceIntPtr mdev;

     int len = original->any.length;

+    int type = original->any.type;

 

     CHECKEVENT(original);

 

@@ -327,7 +328,12 @@ CopyGetMasterEvent(DeviceIntPtr sdev,
     if (!sdev || !sdev->u.master)

         return NULL;

 

-    switch(original->any.type)

+#if XFreeXDGA

+    if (type == ET_DGAEvent)

+        type = original->dga_event.subtype;

+#endif

+

+    switch(type)

     {

         case ET_KeyPress:

         case ET_KeyRelease:

@@ -443,6 +449,7 @@ mieqProcessInputEvents(void)
             event = realloc(event, evlen);

             event_size=evlen;

 

+

             if (!event)

                 FatalError("[mi] No memory left for event processing.\n");

         }

diff --git a/xorg-server/miext/Makefile.am b/xorg-server/miext/Makefile.am
index 84ab70855..850c41c66 100644
--- a/xorg-server/miext/Makefile.am
+++ b/xorg-server/miext/Makefile.am
@@ -1,11 +1,11 @@
-SUBDIRS = damage shadow
-if COMPOSITE
-SUBDIRS += cw
-endif
-if XQUARTZ
-SUBDIRS += rootless
-endif
-if XWIN_MULTIWINDOWEXTWM
-SUBDIRS += rootless
-endif
-DIST_SUBDIRS = damage shadow cw rootless
+SUBDIRS = sync damage shadow

+if COMPOSITE

+SUBDIRS += cw

+endif

+if XQUARTZ

+SUBDIRS += rootless

+endif

+if XWIN_MULTIWINDOWEXTWM

+SUBDIRS += rootless

+endif

+DIST_SUBDIRS = sync damage shadow cw rootless

diff --git a/xorg-server/miext/sync/Makefile.am b/xorg-server/miext/sync/Makefile.am
new file mode 100644
index 000000000..2bfe44da1
--- /dev/null
+++ b/xorg-server/miext/sync/Makefile.am
@@ -0,0 +1,14 @@
+noinst_LTLIBRARIES = libsync.la

+

+AM_CFLAGS = $(DIX_CFLAGS)

+

+INCLUDES = 

+

+if XORG

+sdk_HEADERS = misync.h misyncstr.h

+endif

+

+libsync_la_SOURCES =	\

+	misync.c	\

+	misync.h	\

+	misyncstr.h

diff --git a/xorg-server/miext/sync/makefile b/xorg-server/miext/sync/makefile
new file mode 100644
index 000000000..007233627
--- /dev/null
+++ b/xorg-server/miext/sync/makefile
@@ -0,0 +1,4 @@
+LIBRARY = libsync

+

+CSRCS =	\

+	misync.c

diff --git a/xorg-server/miext/sync/misync.c b/xorg-server/miext/sync/misync.c
new file mode 100644
index 000000000..932376cf0
--- /dev/null
+++ b/xorg-server/miext/sync/misync.c
@@ -0,0 +1,201 @@
+/*

+ * Copyright © 2010 NVIDIA Corporation

+ *

+ * Permission is hereby granted, free of charge, to any person obtaining a

+ * copy of this software and associated documentation files (the "Software"),

+ * to deal in the Software without restriction, including without limitation

+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,

+ * and/or sell copies of the Software, and to permit persons to whom the

+ * Software is furnished to do so, subject to the following conditions:

+ *

+ * The above copyright notice and this permission notice (including the next

+ * paragraph) shall be included in all copies or substantial portions of the

+ * Software.

+ *

+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING

+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER

+ * DEALINGS IN THE SOFTWARE.

+ */

+

+#ifdef HAVE_DIX_CONFIG_H

+#include <dix-config.h>

+#endif

+

+#include "scrnintstr.h"

+#include "misync.h"

+#include "misyncstr.h"

+

+static DevPrivateKeyRec syncScreenPrivateKeyRec;

+static DevPrivateKey syncScreenPrivateKey = &syncScreenPrivateKeyRec;

+

+#define SYNC_SCREEN_PRIV(pScreen) 				\

+    (SyncScreenPrivPtr) dixLookupPrivate(&pScreen->devPrivates,	\

+					 syncScreenPrivateKey)

+

+typedef struct _syncScreenPriv {

+    /* Wrappable sync-specific screen functions */

+    SyncScreenFuncsRec		funcs;

+

+    /* Wrapped screen functions */

+    CloseScreenProcPtr		CloseScreen;

+} SyncScreenPrivRec, *SyncScreenPrivPtr;

+

+/* Default implementations of the sync screen functions */

+void

+miSyncScreenCreateFence(ScreenPtr pScreen, SyncFence* pFence,

+                        Bool initially_triggered)

+{

+    (void)pScreen;

+

+    pFence->triggered = initially_triggered;

+}

+

+void miSyncScreenDestroyFence(ScreenPtr pScreen, SyncFence* pFence)

+{

+    (void)pScreen;

+    (void)pFence;

+}

+

+/* Default implementations of the per-object functions */

+static void

+miSyncFenceSetTriggered(SyncFence* pFence)

+{

+    pFence->triggered = TRUE;

+}

+

+static void

+miSyncFenceReset(SyncFence* pFence)

+{

+    pFence->triggered = FALSE;

+}

+

+static Bool

+miSyncFenceCheckTriggered(SyncFence* pFence)

+{

+    return pFence->triggered;

+}

+

+static void

+miSyncFenceAddTrigger(SyncTrigger* pTrigger)

+{

+    (void)pTrigger;

+

+    return;

+}

+

+static void

+miSyncFenceDeleteTrigger(SyncTrigger* pTrigger)

+{

+    (void)pTrigger;

+

+    return;

+}

+

+/* Machine independent portion of the fence sync object implementation */

+void

+miSyncInitFence(ScreenPtr pScreen, SyncFence* pFence, Bool initially_triggered)

+{

+    SyncScreenPrivPtr pScreenPriv = SYNC_SCREEN_PRIV(pScreen);

+    static const SyncFenceFuncsRec miSyncFenceFuncs = {

+	&miSyncFenceSetTriggered,

+	&miSyncFenceReset,

+	&miSyncFenceCheckTriggered,

+	&miSyncFenceAddTrigger,

+	&miSyncFenceDeleteTrigger

+    };

+

+    pFence->pScreen = pScreen;

+    pFence->funcs = miSyncFenceFuncs;

+

+    pScreenPriv->funcs.CreateFence(pScreen, pFence, initially_triggered);

+}

+

+void

+miSyncDestroyFence(SyncFence* pFence)

+{

+    ScreenPtr pScreen = pFence->pScreen;

+    SyncScreenPrivPtr pScreenPriv = SYNC_SCREEN_PRIV(pScreen);

+    SyncTriggerList *ptl, *pNext;

+

+    pFence->sync.beingDestroyed = TRUE;

+    /* tell all the fence's triggers that the counter has been destroyed */

+    for (ptl = pFence->sync.pTriglist; ptl; ptl = pNext)

+    {

+	(*ptl->pTrigger->CounterDestroyed)(ptl->pTrigger);

+	pNext = ptl->next;

+	free(ptl); /* destroy the trigger list as we go */

+    }

+

+    pScreenPriv->funcs.DestroyFence(pScreen, pFence);

+

+    dixFreeObjectWithPrivates(pFence, PRIVATE_SYNC_FENCE);

+}

+

+void

+miSyncTriggerFence(SyncFence* pFence)

+{

+    SyncTriggerList *ptl, *pNext;

+    CARD64 unused;

+

+    pFence->funcs.SetTriggered(pFence);

+

+    XSyncIntToValue(&unused, 0L);

+

+    /* run through triggers to see if any fired */

+    for (ptl = pFence->sync.pTriglist; ptl; ptl = pNext)

+    {

+	pNext = ptl->next;

+	if ((*ptl->pTrigger->CheckTrigger)(ptl->pTrigger, unused))

+	    (*ptl->pTrigger->TriggerFired)(ptl->pTrigger);

+    }

+}

+

+SyncScreenFuncsPtr miSyncGetScreenFuncs(ScreenPtr pScreen)

+{

+    SyncScreenPrivPtr pScreenPriv = SYNC_SCREEN_PRIV(pScreen);

+

+    return &pScreenPriv->funcs;

+}

+

+static Bool

+SyncCloseScreen (int i, ScreenPtr pScreen)

+{

+    SyncScreenPrivPtr pScreenPriv = SYNC_SCREEN_PRIV(pScreen);

+

+    pScreen->CloseScreen = pScreenPriv->CloseScreen;

+    free(pScreenPriv);

+

+    return (*pScreen->CloseScreen) (i, pScreen);

+}

+

+Bool

+miSyncSetup(ScreenPtr pScreen)

+{

+    SyncScreenPrivPtr	pScreenPriv;

+

+    static const SyncScreenFuncsRec miSyncScreenFuncs = {

+	&miSyncScreenCreateFence,

+	&miSyncScreenDestroyFence

+    };

+

+    if (dixPrivateKeyRegistered(syncScreenPrivateKey))

+	return TRUE;

+

+    if (!dixRegisterPrivateKey(syncScreenPrivateKey, PRIVATE_SCREEN,

+			       sizeof(SyncScreenPrivRec)))

+	return FALSE;

+

+    pScreenPriv = SYNC_SCREEN_PRIV(pScreen);

+

+    pScreenPriv->funcs = miSyncScreenFuncs;

+

+    /* Wrap CloseScreen to clean up */

+    pScreenPriv->CloseScreen = pScreen->CloseScreen;

+    pScreen->CloseScreen = SyncCloseScreen;

+

+    return TRUE;

+}

diff --git a/xorg-server/miext/sync/misync.h b/xorg-server/miext/sync/misync.h
new file mode 100644
index 000000000..644309324
--- /dev/null
+++ b/xorg-server/miext/sync/misync.h
@@ -0,0 +1,77 @@
+/*

+ * Copyright © 2010 NVIDIA Corporation

+ *

+ * Permission is hereby granted, free of charge, to any person obtaining a

+ * copy of this software and associated documentation files (the "Software"),

+ * to deal in the Software without restriction, including without limitation

+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,

+ * and/or sell copies of the Software, and to permit persons to whom the

+ * Software is furnished to do so, subject to the following conditions:

+ *

+ * The above copyright notice and this permission notice (including the next

+ * paragraph) shall be included in all copies or substantial portions of the

+ * Software.

+ *

+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING

+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER

+ * DEALINGS IN THE SOFTWARE.

+ */

+

+#ifdef HAVE_DIX_CONFIG_H

+#include <dix-config.h>

+#endif

+

+#ifndef _MISYNC_H_

+#define _MISYNC_H_

+

+typedef struct _SyncFence SyncFence;

+typedef struct _SyncTrigger SyncTrigger;

+

+typedef void (*SyncScreenCreateFenceFunc) (ScreenPtr pScreen,

+					   SyncFence* pFence,

+					   Bool initially_triggered);

+typedef void (*SyncScreenDestroyFenceFunc) (ScreenPtr pScreen,

+					    SyncFence* pFence);

+

+typedef struct _syncScreenFuncs {

+    SyncScreenCreateFenceFunc	CreateFence;

+    SyncScreenDestroyFenceFunc	DestroyFence;

+} SyncScreenFuncsRec, *SyncScreenFuncsPtr;

+

+extern _X_EXPORT void

+miSyncScreenCreateFence(ScreenPtr pScreen, SyncFence* pFence,

+			Bool initially_triggered);

+extern _X_EXPORT void

+miSyncScreenDestroyFence(ScreenPtr pScreen, SyncFence* pFence);

+

+typedef void (*SyncFenceSetTriggeredFunc) (SyncFence* pFence);

+typedef void (*SyncFenceResetFunc) (SyncFence* pFence);

+typedef Bool (*SyncFenceCheckTriggeredFunc) (SyncFence* pFence);

+typedef void (*SyncFenceAddTriggerFunc) (SyncTrigger* pTrigger);

+typedef void (*SyncFenceDeleteTriggerFunc) (SyncTrigger* pTrigger);

+

+typedef struct _syncFenceFuncs {

+    SyncFenceSetTriggeredFunc	SetTriggered;

+    SyncFenceResetFunc		Reset;

+    SyncFenceCheckTriggeredFunc	CheckTriggered;

+    SyncFenceAddTriggerFunc	AddTrigger;

+    SyncFenceDeleteTriggerFunc	DeleteTrigger;

+} SyncFenceFuncsRec, *SyncFenceFuncsPtr;

+

+extern _X_EXPORT void

+miSyncInitFence(ScreenPtr pScreen, SyncFence* pFence, Bool initially_triggered);

+extern _X_EXPORT void

+miSyncDestroyFence(SyncFence* pFence);

+extern _X_EXPORT void

+miSyncTriggerFence(SyncFence* pFence);

+

+extern _X_EXPORT SyncScreenFuncsPtr

+miSyncGetScreenFuncs(ScreenPtr pScreen);

+extern _X_EXPORT Bool

+miSyncSetup(ScreenPtr pScreen);

+

+#endif /* _MISYNC_H_ */

diff --git a/xorg-server/miext/sync/misyncstr.h b/xorg-server/miext/sync/misyncstr.h
new file mode 100644
index 000000000..9b0f24365
--- /dev/null
+++ b/xorg-server/miext/sync/misyncstr.h
@@ -0,0 +1,86 @@
+/*

+ * Copyright © 2010 NVIDIA Corporation

+ *

+ * Permission is hereby granted, free of charge, to any person obtaining a

+ * copy of this software and associated documentation files (the "Software"),

+ * to deal in the Software without restriction, including without limitation

+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,

+ * and/or sell copies of the Software, and to permit persons to whom the

+ * Software is furnished to do so, subject to the following conditions:

+ *

+ * The above copyright notice and this permission notice (including the next

+ * paragraph) shall be included in all copies or substantial portions of the

+ * Software.

+ *

+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING

+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER

+ * DEALINGS IN THE SOFTWARE.

+ */

+

+#ifdef HAVE_DIX_CONFIG_H

+#include <dix-config.h>

+#endif

+

+#ifndef _MISYNCSTR_H_

+#define _MISYNCSTR_H_

+

+#include "dix.h"

+#include <X11/extensions/syncconst.h>

+

+#define CARD64 XSyncValue /* XXX temporary! need real 64 bit values for Alpha */

+

+/* Sync object types */

+#define SYNC_COUNTER		0

+#define SYNC_FENCE		1

+

+typedef struct _SyncObject {

+    ClientPtr		client;	/* Owning client. 0 for system counters */

+    struct _SyncTriggerList *pTriglist;	/* list of triggers */

+    XID			id;		/* resource ID */

+    unsigned char	type;		/* SYNC_* */

+    Bool		beingDestroyed;	/* in process of going away */

+} SyncObject;

+

+typedef struct _SyncCounter {

+    SyncObject		sync;		/* Common sync object data */

+    CARD64		value;		/* counter value */

+    struct _SysCounterInfo *pSysCounterInfo; /* NULL if not a system counter */

+} SyncCounter;

+

+struct _SyncFence {

+    SyncObject		sync;		/* Common sync object data */

+    ScreenPtr		pScreen;	/* Screen of this fence object */

+    SyncFenceFuncsRec	funcs;		/* Funcs for performing ops on fence */

+    Bool		triggered;	/* fence state */

+    PrivateRec		*devPrivates;	/* driver-specific per-fence data */

+};

+

+struct _SyncTrigger {

+    SyncObject *pSync;

+    CARD64	wait_value;	/* wait value */

+    unsigned int value_type;	/* Absolute or Relative */

+    unsigned int test_type;	/* transition or Comparision type */

+    CARD64	test_value;	/* trigger event threshold value */

+    Bool	(*CheckTrigger)(

+				struct _SyncTrigger * /*pTrigger*/,

+				CARD64 /*newval*/

+				);

+    void	(*TriggerFired)(

+				struct _SyncTrigger * /*pTrigger*/

+				);

+    void	(*CounterDestroyed)(

+				struct _SyncTrigger * /*pTrigger*/

+				    );

+};

+

+typedef struct _SyncTriggerList {

+    SyncTrigger *pTrigger;

+    struct _SyncTriggerList *next;

+} SyncTriggerList;

+

+#endif /* _MISYNCSTR_H_ */

+

diff --git a/xorg-server/os/log.c b/xorg-server/os/log.c
index f997e3eee..ee231a31d 100644
--- a/xorg-server/os/log.c
+++ b/xorg-server/os/log.c
@@ -127,7 +127,7 @@ static Bool needBuffer = TRUE;
 #include <AvailabilityMacros.h>

 

 static char __crashreporter_info_buff__[4096] = {0};

-static const char *__crashreporter_info__ = &__crashreporter_info_buff__[0];

+static const char *__crashreporter_info__ __attribute__((__used__)) = &__crashreporter_info_buff__[0];

 #if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050

 // This is actually a toolchain requirement, but I'm not sure the correct check,        

 // but it should be fine to just only include it for Leopard and later.  This line

@@ -583,21 +583,14 @@ ErrorF(const char * f, ...)
 /* A perror() workalike. */

 

 void

-Error(char *str)

+Error(const char *str)

 {

-    char *err = NULL;

-    int saveErrno = errno;

-

-    if (str) {

-	err = malloc(strlen(strerror(saveErrno)) + strlen(str) + 2 + 1);

-	if (!err)

-	    return;

-	sprintf(err, "%s: ", str);

-	strcat(err, strerror(saveErrno));

+    const char *err = strerror(errno);

+

+    if (str)

+	LogWrite(-1, "%s: %s", str, err);

+    else

 	LogWrite(-1, "%s", err);

-	free(err);

-    } else

-	LogWrite(-1, "%s", strerror(saveErrno));

 }

 

 void

diff --git a/xorg-server/randr/Makefile.am b/xorg-server/randr/Makefile.am
index 4842df89c..2b0b3a984 100644
--- a/xorg-server/randr/Makefile.am
+++ b/xorg-server/randr/Makefile.am
@@ -16,12 +16,16 @@ librandr_la_SOURCES =	\
 	rrinfo.c	\

 	rrmode.c	\

 	rroutput.c	\

+	rrpixmap.c	\

 	rrpointer.c	\

 	rrproperty.c	\

 	rrscreen.c	\

 	rrsdispatch.c	\

+	rrsprite.c	\

 	rrtransform.h	\

-	rrtransform.c

+	rrtransform.c	\

+	mirrcrtc.c

+

 

 if XINERAMA

 librandr_la_SOURCES += ${XINERAMA_SRCS}

diff --git a/xorg-server/randr/makefile b/xorg-server/randr/makefile
index ba472232d..44516fc31 100644
--- a/xorg-server/randr/makefile
+++ b/xorg-server/randr/makefile
@@ -8,9 +8,12 @@ CSRCS =	\
 	rrinfo.c	\

 	rrmode.c	\

 	rroutput.c	\

+	rrpixmap.c	\

 	rrpointer.c	\

 	rrproperty.c	\

 	rrscreen.c	\

 	rrsdispatch.c	\

-	rrtransform.c

+	rrsprite.c	\

+	rrtransform.c	\

+	mirrcrtc.c

 

diff --git a/xorg-server/randr/mirrcrtc.c b/xorg-server/randr/mirrcrtc.c
new file mode 100644
index 000000000..812b2b68b
--- /dev/null
+++ b/xorg-server/randr/mirrcrtc.c
@@ -0,0 +1,174 @@
+/*

+ * Copyright © 2010 Keith Packard

+ *

+ * 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 the copyright holders not be used in advertising or

+ * publicity pertaining to distribution of the software without specific,

+ * written prior permission.  The copyright holders make no representations

+ * about the suitability of this software for any purpose.  It is provided "as

+ * is" without express or implied warranty.

+ *

+ * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO

+ * EVENT SHALL THE COPYRIGHT HOLDERS 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.

+ */

+

+#include "randrstr.h"

+

+Bool

+miRRSetScreenConfig(ScreenPtr screen,

+		    RRScreenConfigPtr screen_config)

+{

+    RRScreenConfigRec	old_screen_config;

+

+    RRScreenCurrentConfig(screen, &old_screen_config);

+

+    /* Check and see if nothing has changed */

+    if (old_screen_config.screen_width == screen_config->screen_width &&

+	old_screen_config.screen_height == screen_config->screen_height &&

+	old_screen_config.screen_pixmap_width == screen_config->screen_pixmap_width &&

+	old_screen_config.screen_pixmap_height == screen_config->screen_pixmap_height &&

+	old_screen_config.mm_width == screen_config->mm_width &&

+	old_screen_config.mm_height == screen_config->mm_height)

+	return TRUE;

+

+    return RRScreenSizeSet(screen,

+			   screen_config->screen_width,

+			   screen_config->screen_height,

+			   screen_config->screen_pixmap_width,

+			   screen_config->screen_pixmap_height,

+			   screen_config->mm_width,

+			   screen_config->mm_height);

+}

+

+Bool

+miRRSetCrtcConfig(RRCrtcConfigPtr crtc_config)

+{

+    int	x = crtc_config->x, y = crtc_config->y;

+

+    if (crtc_config->pixmap) {

+	x = crtc_config->pixmap_x;

+	y = crtc_config->pixmap_y;

+    }

+    if (!RRCrtcSet(crtc_config->crtc,

+		   crtc_config->mode,

+		   x,

+		   y,

+		   crtc_config->rotation,

+		   crtc_config->numOutputs,

+		   crtc_config->outputs,

+		   crtc_config->pixmap))

+	return FALSE;

+    RRCrtcSpriteTransformSet(crtc_config->crtc,

+			     &crtc_config->sprite_position_transform,

+			     &crtc_config->sprite_image_transform,

+			     &crtc_config->sprite_position_f_transform,

+			     &crtc_config->sprite_image_f_transform);

+    return TRUE;

+}

+

+Bool

+miRRDisableCrtc(RRCrtcPtr crtc)

+{

+    RRCrtcConfigRec	off_config;

+

+    memset(&off_config, '\0', sizeof (RRCrtcConfigRec));

+    off_config.crtc = crtc;

+    return miRRSetCrtcConfig(&off_config);

+}

+

+/*

+ * If the current crtc configuration doesn't fit

+ * with the new screen config, disable it

+ */

+Bool

+miRRCheckDisableCrtc(RRScreenConfigPtr new_screen_config,

+		     RRCrtcConfigPtr old_crtc_config)

+{

+    RRCrtcPtr crtc = old_crtc_config->crtc;

+

+    /* If it's already disabled, we're done */

+    if (!old_crtc_config->mode)

+	return TRUE;

+

+    /* If the crtc isn't scanning from the screen pixmap,

+     * we're done

+     */

+    if (old_crtc_config->pixmap)

+	return TRUE;

+

+    /* If the new screen configuration covers the existing CRTC space,

+     * we're done

+     */

+    if (RRScreenCoversCrtc(new_screen_config, old_crtc_config,

+			   &crtc->client_current_transform, NULL))

+	return TRUE;

+

+    /* Disable the crtc and let it get re-enabled */

+    return miRRDisableCrtc(crtc);

+}

+

+Bool

+miRRSetCrtcConfigs(ScreenPtr screen,

+		   RRScreenConfigPtr screen_config,

+		   RRCrtcConfigPtr crtc_configs,

+		   int num_configs)

+{

+    RRScreenConfigRec	old_screen_config;

+    RRCrtcConfigPtr	old_crtc_configs;

+    int			i;

+

+    /*

+     * Save existing state

+     */

+

+    RRScreenCurrentConfig(screen, &old_screen_config);

+    old_crtc_configs = calloc(num_configs, sizeof (RRCrtcConfigRec));

+    if (!old_crtc_configs)

+	return FALSE;

+

+    for (i = 0; i < num_configs; i++)

+	if (!RRCrtcCurrentConfig(crtc_configs[i].crtc, &old_crtc_configs[i]))

+	    goto fail_save;

+    /*

+     * Set the new configuration. If anything goes wrong,

+     * bail and restore the old configuration

+     */

+    for (i = 0; i < num_configs; i++)

+	if (!miRRCheckDisableCrtc(screen_config, &old_crtc_configs[i]))

+	    goto fail_disable;

+

+    if (!miRRSetScreenConfig(screen, screen_config))

+	goto fail_set_screen;

+

+    for (i = 0; i < num_configs; i++)

+	if (!miRRSetCrtcConfig(&crtc_configs[i]))

+	    goto fail_set_crtc;

+

+    RRFreeCrtcConfigs(old_crtc_configs, num_configs);

+    return TRUE;

+

+fail_set_crtc:

+    /*

+     * Restore the previous configuration. Ignore any errors

+     * as we just need to hope that the driver can manage to

+     * get back to the previous state without trouble.

+     */

+    for (i = 0; i < num_configs; i++)

+	(void) miRRDisableCrtc(old_crtc_configs[i].crtc);

+    (void) miRRSetScreenConfig(screen, &old_screen_config);

+fail_set_screen:

+fail_disable:

+    for (i = 0; i < num_configs; i++)

+	(void) miRRSetCrtcConfig(&old_crtc_configs[i]);

+fail_save:

+    RRFreeCrtcConfigs(old_crtc_configs, num_configs);

+    return FALSE;

+}

diff --git a/xorg-server/randr/randr.c b/xorg-server/randr/randr.c
index aa1e71dcf..1346d1e9c 100644
--- a/xorg-server/randr/randr.c
+++ b/xorg-server/randr/randr.c
@@ -98,6 +98,7 @@ RRCloseScreen (int i, ScreenPtr pScreen)
     

     free(pScrPriv->crtcs);

     free(pScrPriv->outputs);

+    free(pScrPriv->scanout_info);

     free(pScrPriv);

     RRNScreens -= 1;	/* ok, one fewer screen with RandR running */

     return (*pScreen->CloseScreen) (i, pScreen);    

@@ -248,6 +249,8 @@ Bool RRScreenInit(ScreenPtr pScreen)
     pScrPriv->rrCrtcSet = NULL;

     pScrPriv->rrCrtcSetGamma = NULL;

 #endif

+    pScrPriv->scanout_info = NULL;

+    pScrPriv->n_scanout_info = 0;

 #if RANDR_10_INTERFACE    

     pScrPriv->rrSetConfig = 0;

     pScrPriv->rotations = RR_Rotate_0;

@@ -482,6 +485,18 @@ RRVerticalRefresh (xRRModeInfo *mode)
     return (CARD16) refresh;

 }

 

+RRScanoutPixmapInfo *

+RRQueryScanoutPixmapInfo(ScreenPtr screen, int *n_info)

+{

+    rrScrPriv(screen);

+

+    if (!pScrPriv->scanout_info && pScrPriv->rrQueryScanoutPixmaps)

+	pScrPriv->scanout_info = pScrPriv->rrQueryScanoutPixmaps(screen,

+								 &pScrPriv->n_scanout_info);

+    *n_info = pScrPriv->n_scanout_info;

+    return pScrPriv->scanout_info;

+}

+

 static int

 ProcRRDispatch (ClientPtr client)

 {

diff --git a/xorg-server/randr/randrstr.h b/xorg-server/randr/randrstr.h
index b4acfe12a..ee208f569 100644
--- a/xorg-server/randr/randrstr.h
+++ b/xorg-server/randr/randrstr.h
@@ -55,9 +55,10 @@
 #define RANDR_10_INTERFACE 1

 #define RANDR_12_INTERFACE 1

 #define RANDR_13_INTERFACE 1 /* requires RANDR_12_INTERFACE */

+#define RANDR_14_INTERFACE 1 /* requires RANDR_13_INTERFACE */

 #define RANDR_GET_CRTC_INTERFACE 1

 

-#define RANDR_INTERFACE_VERSION 0x0103

+#define RANDR_INTERFACE_VERSION 0x0104

 

 typedef XID	RRMode;

 typedef XID	RROutput;

@@ -77,6 +78,8 @@ typedef struct _rrMode		RRModeRec, *RRModePtr;
 typedef struct _rrPropertyValue	RRPropertyValueRec, *RRPropertyValuePtr;

 typedef struct _rrProperty	RRPropertyRec, *RRPropertyPtr;

 typedef struct _rrCrtc		RRCrtcRec, *RRCrtcPtr;

+typedef struct _rrScreenConfig	RRScreenConfigRec, *RRScreenConfigPtr;

+typedef struct _rrCrtcConfig	RRCrtcConfigRec, *RRCrtcConfigPtr;

 typedef struct _rrOutput	RROutputRec, *RROutputPtr;

 

 struct _rrMode {

@@ -120,11 +123,43 @@ struct _rrCrtc {
     CARD16	    *gammaGreen;

     void	    *devPrivate;

     Bool	    transforms;

+    PixmapPtr	    scanoutPixmap;

     RRTransformRec  client_pending_transform;

     RRTransformRec  client_current_transform;

+    PictTransform   client_sprite_position_transform;

+    PictTransform   client_sprite_image_transform;

+    struct pict_f_transform	client_sprite_f_position_transform;

+    struct pict_f_transform	client_sprite_f_image_transform;

+

     PictTransform   transform;

     struct pict_f_transform f_transform;

     struct pict_f_transform f_inverse;

+    struct pict_f_transform f_sprite_position;		/* crtc from screen */

+    struct pict_f_transform f_sprite_image_inverse;	/* image from crtc */

+};

+

+struct _rrScreenConfig {

+    CARD16			screen_pixmap_width;

+    CARD16			screen_pixmap_height;

+    CARD16			screen_width;

+    CARD16			screen_height;

+    CARD32			mm_width;

+    CARD32			mm_height;

+};

+

+struct _rrCrtcConfig {

+    RRCrtcPtr			crtc;

+    int				x, y;

+    RRModePtr			mode;

+    Rotation			rotation;

+    int				numOutputs;

+    RROutputPtr			*outputs;

+    PictTransform		sprite_position_transform;

+    PictTransform		sprite_image_transform;

+    struct pict_f_transform	sprite_position_f_transform;

+    struct pict_f_transform	sprite_image_f_transform;

+    PixmapPtr			pixmap;

+    int				pixmap_x, pixmap_y;

 };

 

 struct _rrOutput {

@@ -156,6 +191,8 @@ struct _rrOutput {
 typedef Bool (*RRScreenSetSizeProcPtr) (ScreenPtr	pScreen,

 					CARD16		width,

 					CARD16		height,

+					CARD16		pixWidth,

+					CARD16		pixHeight,

 					CARD32		mmWidth,

 					CARD32		mmHeight);

 					

@@ -166,7 +203,8 @@ typedef Bool (*RRCrtcSetProcPtr) (ScreenPtr		pScreen,
 				  int			y,

 				  Rotation		rotation,

 				  int			numOutputs,

-				  RROutputPtr		*outputs);

+				  RROutputPtr		*outputs,

+				  PixmapPtr		scanout_pixmap);

 

 typedef Bool (*RRCrtcSetGammaProcPtr) (ScreenPtr	pScreen,

 				       RRCrtcPtr	crtc);

@@ -232,6 +270,35 @@ typedef Bool (*RRSetConfigProcPtr) (ScreenPtr		pScreen,
 

 #endif

 	

+typedef struct {

+    PictFormatPtr	format;

+    int			maxWidth, maxHeight;

+    int			depth;

+    Rotation		rotations;

+} RRScanoutPixmapInfo;

+

+typedef RRScanoutPixmapInfo *(*RRQueryScanoutPixmapsPtr) (ScreenPtr pScreen,

+							  int *num_info);

+

+typedef PixmapPtr (*RRCreateScanoutPixmapPtr) (ScreenPtr pScreen,

+					       int width, int height, int depth,

+					       Rotation rotations,

+					       PictFormatPtr format);

+

+typedef void (*RRSetCrtcSpriteTransformPtr) (ScreenPtr pScreen,

+					     RRCrtcPtr randr_crtc,

+					     struct pict_f_transform *position_transform,

+					     struct pict_f_transform *image_transform);

+

+typedef void (*RRGetCrtcSpriteTransformPtr) (ScreenPtr pScreen,

+					     RRCrtcPtr randr_crtc,

+					     struct pict_f_transform *position_transform,

+					     struct pict_f_transform *image_transform);

+

+typedef Bool (*RRSetCrtcConfigsPtr) (ScreenPtr screen,

+				     RRScreenConfigPtr screen_config,

+				     RRCrtcConfigPtr crtc_configs,

+				     int num_configs);

 

 typedef struct _rrScrPriv {

     /*

@@ -256,7 +323,12 @@ typedef struct _rrScrPriv {
     RRGetPanningProcPtr	rrGetPanning;

     RRSetPanningProcPtr	rrSetPanning;

 #endif

-    

+    RRQueryScanoutPixmapsPtr	rrQueryScanoutPixmaps;

+    RRCreateScanoutPixmapPtr	rrCreateScanoutPixmap;

+    RRSetCrtcSpriteTransformPtr	rrSetCrtcSpriteTransform;

+    RRGetCrtcSpriteTransformPtr	rrGetCrtcSpriteTransform;

+    RRSetCrtcConfigsPtr rrSetCrtcConfigs;

+

     /*

      * Private part of the structure; not considered part of the ABI

      */

@@ -283,6 +355,8 @@ typedef struct _rrScrPriv {
     /* Last known pointer position */

     RRCrtcPtr		    pointerCrtc;

 

+    RRScanoutPixmapInfo	    *scanout_info;

+    int			    n_scanout_info;

 #ifdef RANDR_10_INTERFACE

     /*

      * Configuration information

@@ -297,6 +371,7 @@ typedef struct _rrScrPriv {
     int			    rate;

     int			    size;

 #endif

+

 } rrScrPrivRec, *rrScrPrivPtr;

 

 extern _X_EXPORT DevPrivateKeyRec rrPrivKeyRec;

@@ -405,9 +480,15 @@ extern _X_EXPORT Bool
 RRScreenSizeSet (ScreenPtr  pScreen,

 		 CARD16	    width,

 		 CARD16	    height,

+		 CARD16	    pixWidth,

+		 CARD16	    pixHeight,

 		 CARD32	    mmWidth,

 		 CARD32	    mmHeight);

 

+extern _X_EXPORT void

+RRScreenCurrentConfig(ScreenPtr screen,

+		      RRScreenConfigPtr screen_config);

+

 /*

  * Send ConfigureNotify event to root window when 'something' happens

  */

@@ -467,6 +548,9 @@ RRGetRotation (ScreenPtr pScreen);
 extern _X_EXPORT CARD16

 RRVerticalRefresh (xRRModeInfo *mode);

 

+extern _X_EXPORT RRScanoutPixmapInfo *

+RRQueryScanoutPixmapInfo(ScreenPtr screen, int *n_info);

+

 #ifdef RANDR_10_INTERFACE					

 /*

  * This is the old interface, deprecated but left

@@ -545,7 +629,8 @@ RRCrtcNotify (RRCrtcPtr	    crtc,
 	      Rotation	    rotation,

 	      RRTransformPtr transform,

 	      int	    numOutputs,

-	      RROutputPtr   *outputs);

+	      RROutputPtr   *outputs,

+	      PixmapPtr	    scanoutPixmap);

 

 extern _X_EXPORT void

 RRDeliverCrtcEvent (ClientPtr client, WindowPtr pWin, RRCrtcPtr crtc);

@@ -560,7 +645,8 @@ RRCrtcSet (RRCrtcPtr    crtc,
 	   int		y,

 	   Rotation	rotation,

 	   int		numOutput,

-	   RROutputPtr  *outputs);

+	   RROutputPtr  *outputs,

+	   PixmapPtr	scanout_pixmap);

 

 /*

  * Request that the Crtc gamma be changed

@@ -589,6 +675,10 @@ RRCrtcGammaGet(RRCrtcPtr crtc);
 extern _X_EXPORT Bool

 RRCrtcGammaNotify (RRCrtcPtr	crtc);

 

+void

+RRModeGetScanoutSize (RRModePtr mode, struct pixman_f_transform *transform,

+		      int *width, int *height);

+

 /*

  * Set the size of the gamma table at server startup time

  */

@@ -606,25 +696,6 @@ extern _X_EXPORT void
 RRCrtcGetScanoutSize(RRCrtcPtr crtc, int *width, int *height);

 

 /*

- * Compute the complete transformation matrix including

- * client-specified transform, rotation/reflection values and the crtc 

- * offset.

- *

- * Return TRUE if the resulting transform is not a simple translation.

- */

-extern _X_EXPORT Bool

-RRTransformCompute (int			    x,

-		    int			    y,

-		    int			    width,

-		    int			    height,

-		    Rotation		    rotation,

-		    RRTransformPtr	    rr_transform,

-

-		    PictTransformPtr	    transform,

-		    struct pict_f_transform *f_transform,

-		    struct pict_f_transform *f_inverse);

-

-/*

  * Return crtc transform

  */

 extern _X_EXPORT RRTransformPtr

@@ -670,6 +741,38 @@ extern _X_EXPORT void
 RRCrtcInitErrorValue (void);

 

 /*

+ * Free a set of crtc configs and their attached output arrays

+ */

+void

+RRFreeCrtcConfigs(RRCrtcConfigPtr configs, int num_configs);

+

+/*

+ * Convert the current crtc configuration into an RRCrtcConfig

+ */

+extern _X_EXPORT Bool

+RRCrtcCurrentConfig(RRCrtcPtr crtc,

+		    RRCrtcConfigPtr crtc_config);

+

+/*

+ * Figure out whether the specific crtc_config can fit

+ * within the screen_config

+ */

+Bool

+RRScreenCoversCrtc(RRScreenConfigPtr screen_config,

+		   RRCrtcConfigPtr crtc_config,

+		   RRTransformPtr client_transform,

+		   XID *errorValue);

+

+/*

+ * Set a screen and set of crtc configurations in one operation

+ */

+Bool

+RRSetCrtcConfigs(ScreenPtr screen,

+		 RRScreenConfigPtr screen_config,

+		 RRCrtcConfigPtr crtc_configs,

+		 int num_configs);

+

+/*

  * Crtc dispatch

  */

 

@@ -694,12 +797,40 @@ ProcRRSetCrtcTransform (ClientPtr client);
 extern _X_EXPORT int

 ProcRRGetCrtcTransform (ClientPtr client);

 

+extern _X_EXPORT int

+ProcRRSetCrtcConfigs (ClientPtr client);

+

 int

 ProcRRGetPanning (ClientPtr client);

 

 int

 ProcRRSetPanning (ClientPtr client);

 

+void

+RRCrtcSpriteTransformSet(RRCrtcPtr crtc,

+			 PictTransform *position_transform,

+			 PictTransform *image_transform,

+			 struct pict_f_transform *f_position_transform,

+			 struct pict_f_transform *f_image_transform);

+

+int

+ProcRRQueryScanoutPixmaps (ClientPtr client);

+

+int

+ProcRRCreateScanoutPixmap (ClientPtr client);

+

+int

+ProcRRSetCrtcPixmapConfig (ClientPtr client);

+

+int

+ProcRRSetCrtcSpriteTransform (ClientPtr client);

+

+int

+ProcRRGetCrtcSpriteTransform (ClientPtr client);

+

+int

+ProcRRSetCrtcConfigs (ClientPtr client);

+

 /* rrdispatch.c */

 extern _X_EXPORT Bool

 RRClientKnowsRates (ClientPtr	pClient);

@@ -889,12 +1020,40 @@ ProcRRConfigureOutputProperty (ClientPtr client);
 extern _X_EXPORT int

 ProcRRDeleteOutputProperty (ClientPtr client);

 

+/* rrsprite.c */

+extern _X_EXPORT int

+ProcRRSetCrtcSpriteTransform (ClientPtr client);

+

+extern _X_EXPORT int

+ProcRRGetCrtcSpriteTransform (ClientPtr client);

+

 /* rrxinerama.c */

 #ifdef XINERAMA

 extern _X_EXPORT void

 RRXineramaExtensionInit(void);

 #endif

 

+/* mirrcrtc.c */

+Bool

+miRRSetScreenConfig(ScreenPtr screen,

+		    RRScreenConfigPtr screen_config);

+

+Bool

+miRRSetCrtcConfig(RRCrtcConfigPtr crtc_config);

+

+Bool

+miRRDisableCrtc(RRCrtcPtr crtc);

+

+Bool

+miRRCheckDisableCrtc(RRScreenConfigPtr new_screen_config,

+		     RRCrtcConfigPtr old_crtc_config);

+

+Bool

+miRRSetCrtcConfigs(ScreenPtr screen,

+		   RRScreenConfigPtr screen_config,

+		   RRCrtcConfigPtr crtc_configs,

+		   int num_configs);

+

 #endif /* _RANDRSTR_H_ */

 

 /*

diff --git a/xorg-server/randr/rrcrtc.c b/xorg-server/randr/rrcrtc.c
index 4194cb6c2..524fcd266 100644
--- a/xorg-server/randr/rrcrtc.c
+++ b/xorg-server/randr/rrcrtc.c
@@ -37,7 +37,7 @@ RRCrtcChanged (RRCrtcPtr crtc, Bool layoutChanged)
     if (pScreen)

     {

 	rrScrPriv(pScreen);

-    

+

 	pScrPriv->changed = TRUE;

 	/*

 	 * Send ConfigureNotify on any layout change

@@ -59,19 +59,19 @@ RRCrtcCreate (ScreenPtr pScreen, void *devPrivate)
 

     if (!RRInit())

 	return NULL;

-    

+

     pScrPriv = rrGetScrPriv(pScreen);

 

     /* make space for the crtc pointer */

     if (pScrPriv->numCrtcs)

-	crtcs = realloc(pScrPriv->crtcs, 

+	crtcs = realloc(pScrPriv->crtcs,

 			  (pScrPriv->numCrtcs + 1) * sizeof (RRCrtcPtr));

     else

 	crtcs = malloc(sizeof (RRCrtcPtr));

     if (!crtcs)

 	return FALSE;

     pScrPriv->crtcs = crtcs;

-    

+

     crtc = calloc(1, sizeof (RRCrtcRec));

     if (!crtc)

 	return NULL;

@@ -90,9 +90,13 @@ RRCrtcCreate (ScreenPtr pScreen, void *devPrivate)
     crtc->devPrivate = devPrivate;

     RRTransformInit (&crtc->client_pending_transform);

     RRTransformInit (&crtc->client_current_transform);

+    pixman_transform_init_identity (&crtc->client_sprite_position_transform);

+    pixman_transform_init_identity (&crtc->client_sprite_image_transform);

     pixman_transform_init_identity (&crtc->transform);

     pixman_f_transform_init_identity (&crtc->f_transform);

     pixman_f_transform_init_identity (&crtc->f_inverse);

+    pixman_f_transform_init_identity (&crtc->f_sprite_position);

+    pixman_f_transform_init_identity (&crtc->f_sprite_image_inverse);

 

     if (!AddResource (crtc->id, RRCrtcType, (pointer) crtc))

 	return NULL;

@@ -100,7 +104,7 @@ RRCrtcCreate (ScreenPtr pScreen, void *devPrivate)
     /* attach the screen and crtc together */

     crtc->pScreen = pScreen;

     pScrPriv->crtcs[pScrPriv->numCrtcs++] = crtc;

-    

+

     return crtc;

 }

 

@@ -134,10 +138,11 @@ RRCrtcNotify (RRCrtcPtr	    crtc,
 	      Rotation	    rotation,

 	      RRTransformPtr transform,

 	      int	    numOutputs,

-	      RROutputPtr   *outputs)

+	      RROutputPtr   *outputs,

+	      PixmapPtr	    scanoutPixmap)

 {

     int	    i, j;

-    

+

     /*

      * Check to see if any of the new outputs were

      * not in the old list and mark them as changed

@@ -177,7 +182,7 @@ RRCrtcNotify (RRCrtcPtr	    crtc,
     if (numOutputs != crtc->numOutputs)

     {

 	RROutputPtr *newoutputs;

-	

+

 	if (numOutputs)

 	{

 	    if (crtc->numOutputs)

@@ -231,15 +236,30 @@ RRCrtcNotify (RRCrtcPtr	    crtc,
 	RRTransformCopy (&crtc->client_current_transform, transform);

 	RRCrtcChanged (crtc, TRUE);

     }

+

+    if (scanoutPixmap != crtc->scanoutPixmap)

+    {

+	if (scanoutPixmap)

+	    ++scanoutPixmap->refcnt;

+	if (crtc->scanoutPixmap)

+	    (*crtc->scanoutPixmap->drawable.pScreen->DestroyPixmap) (crtc->scanoutPixmap);

+	crtc->scanoutPixmap = scanoutPixmap;

+    }

+

     if (crtc->changed && mode)

     {

 	RRTransformCompute (x, y,

 			    mode->mode.width, mode->mode.height,

 			    rotation,

 			    &crtc->client_current_transform,

+			    &crtc->client_sprite_f_position_transform,

+			    &crtc->client_sprite_f_image_transform,

 			    &crtc->transform, &crtc->f_transform,

-			    &crtc->f_inverse);

+			    &crtc->f_inverse, &crtc->f_sprite_position,

+			    &crtc->f_sprite_image_inverse,

+			    NULL);

     }

+

     return TRUE;

 }

 

@@ -250,7 +270,7 @@ RRDeliverCrtcEvent (ClientPtr client, WindowPtr pWin, RRCrtcPtr crtc)
     rrScrPriv (pScreen);

     xRRCrtcChangeNotifyEvent	ce;

     RRModePtr	mode = crtc->mode;

-    

+

     ce.type = RRNotify + RREventBase;

     ce.subCode = RRNotify_CrtcChange;

     ce.timestamp = pScrPriv->lastSetTime.milliseconds;

@@ -302,7 +322,8 @@ RRCrtcSet (RRCrtcPtr    crtc,
 	   int		y,

 	   Rotation	rotation,

 	   int		numOutputs,

-	   RROutputPtr  *outputs)

+	   RROutputPtr  *outputs,

+	   PixmapPtr	scanout_pixmap)

 {

     ScreenPtr	pScreen = crtc->pScreen;

     Bool	ret = FALSE;

@@ -316,7 +337,8 @@ RRCrtcSet (RRCrtcPtr    crtc,
 	crtc->numOutputs == numOutputs &&

 	!memcmp (crtc->outputs, outputs, numOutputs * sizeof (RROutputPtr)) &&

 	!RRCrtcPendingProperties (crtc) &&

-	!RRCrtcPendingTransform (crtc))

+	!RRCrtcPendingTransform (crtc) &&

+	crtc->scanoutPixmap == scanout_pixmap)

     {

 	ret = TRUE;

     }

@@ -325,8 +347,8 @@ RRCrtcSet (RRCrtcPtr    crtc,
 #if RANDR_12_INTERFACE

 	if (pScrPriv->rrCrtcSet)

 	{

-	    ret = (*pScrPriv->rrCrtcSet) (pScreen, crtc, mode, x, y, 

-					  rotation, numOutputs, outputs);

+	    ret = (*pScrPriv->rrCrtcSet) (pScreen, crtc, mode, x, y,

+					  rotation, numOutputs, outputs, scanout_pixmap);

 	}

 	else

 #endif

@@ -339,7 +361,7 @@ RRCrtcSet (RRCrtcPtr    crtc,
 

 		if (!mode)

 		{

-		    RRCrtcNotify (crtc, NULL, x, y, rotation, NULL, 0, NULL);

+		    RRCrtcNotify (crtc, NULL, x, y, rotation, NULL, 0, NULL, scanout_pixmap);

 		    ret = TRUE;

 		}

 		else

@@ -365,7 +387,7 @@ RRCrtcSet (RRCrtcPtr    crtc,
 		     */

 		    if (ret)

 		    {

-			RRCrtcNotify (crtc, mode, x, y, rotation, NULL, 1, outputs);

+			RRCrtcNotify (crtc, mode, x, y, rotation, NULL, 1, outputs, scanout_pixmap);

 			RRScreenSizeNotify (pScreen);

 		    }

 		}

@@ -384,6 +406,60 @@ RRCrtcSet (RRCrtcPtr    crtc,
     return ret;

 }

 

+void

+RRFreeCrtcConfigs(RRCrtcConfigPtr configs, int num_configs)

+{

+    int	i;

+

+    for (i = 0; i < num_configs; i++)

+	free(configs[i].outputs);

+    free(configs);

+}

+

+Bool

+RRCrtcCurrentConfig(RRCrtcPtr crtc,

+		    RRCrtcConfigPtr crtc_config)

+{

+    crtc_config->crtc = crtc;

+    crtc_config->x = crtc->x;

+    crtc_config->y = crtc->y;

+    crtc_config->mode = crtc->mode;

+    crtc_config->rotation = crtc->rotation;

+    crtc_config->numOutputs = crtc->numOutputs;

+    crtc_config->outputs = calloc(crtc->numOutputs, sizeof (RROutputPtr));

+    if (!crtc_config->outputs)

+	return FALSE;

+    memcpy(crtc_config->outputs, crtc->outputs, crtc->numOutputs * sizeof (RROutputPtr));

+    crtc_config->sprite_position_transform = crtc->client_sprite_position_transform;

+    crtc_config->sprite_image_transform = crtc->client_sprite_image_transform;

+    crtc_config->sprite_position_f_transform = crtc->client_sprite_f_position_transform;

+    crtc_config->sprite_image_f_transform = crtc->client_sprite_f_image_transform;

+

+    crtc_config->pixmap = crtc->scanoutPixmap;

+    crtc_config->pixmap_x = crtc->x;

+    crtc_config->pixmap_y = crtc->y;

+    return TRUE;

+}

+

+

+/*

+ * Request that a set of crtcs be configured at the same

+ * time on a single screen

+ */

+

+Bool

+RRSetCrtcConfigs(ScreenPtr screen,

+		 RRScreenConfigPtr screen_config,

+		 RRCrtcConfigPtr crtc_configs,

+		 int num_configs)

+{

+    rrScrPrivPtr	scr_priv = rrGetScrPriv(screen);

+

+    if (!scr_priv)

+	return FALSE;

+    return (*scr_priv->rrSetCrtcConfigs)(screen, screen_config, crtc_configs, num_configs);

+}

+

 /*

  * Return crtc transform

  */

@@ -427,7 +503,7 @@ RRCrtcDestroyResource (pointer value, XID pid)
     {

 	rrScrPriv(pScreen);

 	int		i;

-    

+

 	for (i = 0; i < pScrPriv->numCrtcs; i++)

 	{

 	    if (pScrPriv->crtcs[i] == crtc)

@@ -460,7 +536,7 @@ RRCrtcGammaSet (RRCrtcPtr   crtc,
 #if RANDR_12_INTERFACE

     ScreenPtr	pScreen = crtc->pScreen;

 #endif

-    

+

     memcpy (crtc->gammaRed, red, crtc->gammaSize * sizeof (CARD16));

     memcpy (crtc->gammaGreen, green, crtc->gammaSize * sizeof (CARD16));

     memcpy (crtc->gammaBlue, blue, crtc->gammaSize * sizeof (CARD16));

@@ -510,8 +586,11 @@ RRCrtcGammaNotify (RRCrtcPtr	crtc)
     return TRUE;    /* not much going on here */

 }

 

-static void

-RRModeGetScanoutSize (RRModePtr mode, PictTransformPtr transform,

+/*

+ * Compute overall scanout buffer requirements for the specified mode

+ */

+void

+RRModeGetScanoutSize (RRModePtr mode, struct pixman_f_transform *transform,

 		      int *width, int *height)

 {

     BoxRec  box;

@@ -527,7 +606,7 @@ RRModeGetScanoutSize (RRModePtr mode, PictTransformPtr transform,
     box.x2 = mode->mode.width;

     box.y2 = mode->mode.height;

 

-    pixman_transform_bounds (transform, &box);

+    pixman_f_transform_bounds (transform, &box);

     *width = box.x2 - box.x1;

     *height = box.y2 - box.y1;

 }

@@ -538,7 +617,7 @@ RRModeGetScanoutSize (RRModePtr mode, PictTransformPtr transform,
 void

 RRCrtcGetScanoutSize(RRCrtcPtr crtc, int *width, int *height)

 {

-    RRModeGetScanoutSize (crtc->mode, &crtc->transform, width, height);

+    RRModeGetScanoutSize (crtc->mode, &crtc->f_transform, width, height);

 }

 

 /*

@@ -623,6 +702,44 @@ RRCrtcTransformSet (RRCrtcPtr		crtc,
 }

 

 /*

+ * Figure out whether the specific crtc_config can fit

+ * within the screen_config

+ */

+Bool

+RRScreenCoversCrtc(RRScreenConfigPtr screen_config,

+		   RRCrtcConfigPtr crtc_config,

+		   RRTransformPtr client_transform,

+		   XID *errorValue)

+{

+    int source_width;

+    int	source_height;

+    struct pixman_f_transform f_transform;

+

+    RRTransformCompute (crtc_config->x, crtc_config->y,

+			crtc_config->mode->mode.width, crtc_config->mode->mode.height,

+			crtc_config->rotation,

+			client_transform,

+			&crtc_config->sprite_position_f_transform,

+			&crtc_config->sprite_image_f_transform,

+			NULL, &f_transform, NULL, NULL, NULL, NULL);

+

+    RRModeGetScanoutSize (crtc_config->mode, &f_transform,

+			  &source_width, &source_height);

+    if (crtc_config->x + source_width > screen_config->screen_pixmap_width) {

+	if (errorValue)

+	    *errorValue = crtc_config->x;

+	return FALSE;

+    }

+

+    if (crtc_config->y + source_height > screen_config->screen_pixmap_height) {

+	if (errorValue)

+	    *errorValue = crtc_config->y;

+	return FALSE;

+    }

+    return TRUE;

+}

+

+/*

  * Initialize crtc type

  */

 Bool

@@ -631,7 +748,7 @@ RRCrtcInit (void)
     RRCrtcType = CreateNewResourceType (RRCrtcDestroyResource, "CRTC");

     if (!RRCrtcType)

 	return FALSE;

-    

+

     return TRUE;

 }

 

@@ -660,7 +777,7 @@ ProcRRGetCrtcInfo (ClientPtr client)
     int				i, j, k, n;

     int				width, height;

     BoxRec			panned_area;

-    

+

     REQUEST_SIZE_MATCH(xRRGetCrtcInfoReq);

     VERIFY_RR_CRTC(stuff->crtc, crtc, DixReadAccess);

 

@@ -671,7 +788,7 @@ ProcRRGetCrtcInfo (ClientPtr client)
     pScrPriv = rrGetScrPriv(pScreen);

 

     mode = crtc->mode;

-    

+

     rep.type = X_Reply;

     rep.status = RRSetConfigSuccess;

     rep.sequenceNumber = client->sequence;

@@ -704,7 +821,7 @@ ProcRRGetCrtcInfo (ClientPtr client)
 	    if (pScrPriv->outputs[i]->crtcs[j] == crtc)

 		k++;

     rep.nPossibleOutput = k;

-    

+

     rep.length = rep.nOutput + rep.nPossibleOutput;

 

     extraLen = rep.length << 2;

@@ -719,7 +836,7 @@ ProcRRGetCrtcInfo (ClientPtr client)
 

     outputs = (RROutput *) extra;

     possible = (RROutput *) (outputs + rep.nOutput);

-    

+

     for (i = 0; i < crtc->numOutputs; i++)

     {

 	outputs[i] = crtc->outputs[i]->id;

@@ -736,7 +853,7 @@ ProcRRGetCrtcInfo (ClientPtr client)
 		    swapl (&possible[k], n);

 		k++;

 	    }

-    

+

     if (client->swapped) {

 	swaps(&rep.sequenceNumber, n);

 	swapl(&rep.length, n);

@@ -757,7 +874,7 @@ ProcRRGetCrtcInfo (ClientPtr client)
 	WriteToClient (client, extraLen, (char *) extra);

 	free(extra);

     }

-    

+

     return Success;

 }

 

@@ -777,10 +894,10 @@ ProcRRSetCrtcConfig (ClientPtr client)
     TimeStamp		    time;

     Rotation		    rotation;

     int			    rc, i, j;

-    

+

     REQUEST_AT_LEAST_SIZE(xRRSetCrtcConfigReq);

     numOutputs = (stuff->length - bytes_to_int32(SIZEOF (xRRSetCrtcConfigReq)));

-    

+

     VERIFY_RR_CRTC(stuff->crtc, crtc, DixSetAttrAccess);

 

     if (stuff->mode == None)

@@ -803,7 +920,7 @@ ProcRRSetCrtcConfig (ClientPtr client)
     }

     else

 	outputs = NULL;

-    

+

     outputIds = (RROutput *) (stuff + 1);

     for (i = 0; i < numOutputs; i++)

     {

@@ -826,7 +943,7 @@ ProcRRSetCrtcConfig (ClientPtr client)
 	/* validate mode for this output */

 	for (j = 0; j < outputs[i]->numModes + outputs[i]->numUserModes; j++)

 	{

-	    RRModePtr	m = (j < outputs[i]->numModes ? 

+	    RRModePtr	m = (j < outputs[i]->numModes ?

 			     outputs[i]->modes[j] :

 			     outputs[i]->userModes[j - outputs[i]->numModes]);

 	    if (m == mode)

@@ -861,17 +978,17 @@ ProcRRSetCrtcConfig (ClientPtr client)
 

     pScreen = crtc->pScreen;

     pScrPriv = rrGetScrPriv(pScreen);

-    

+

     time = ClientTimeToServerTime(stuff->timestamp);

     configTime = ClientTimeToServerTime(stuff->configTimestamp);

-    

+

     if (!pScrPriv)

     {

 	time = currentTime;

 	rep.status = RRSetConfigFailed;

 	goto sendReply;

     }

-    

+

     /*

      * Validate requested rotation

      */

@@ -904,7 +1021,7 @@ ProcRRSetCrtcConfig (ClientPtr client)
 	    free(outputs);

 	    return BadMatch;

 	}

-    

+

 #ifdef RANDR_12_INTERFACE

 	/*

 	 * Check screen size bounds if the DDX provides a 1.2 interface

@@ -924,16 +1041,19 @@ ProcRRSetCrtcConfig (ClientPtr client)
 				mode->mode.width, mode->mode.height,

 				rotation,

 				&crtc->client_pending_transform,

-				&transform, &f_transform, &f_inverse);

+				&crtc->client_sprite_f_position_transform,

+				&crtc->client_sprite_f_image_transform,

+				&transform, &f_transform, &f_inverse, NULL, NULL, NULL);

 

-	    RRModeGetScanoutSize (mode, &transform, &source_width, &source_height);

+	    RRModeGetScanoutSize (mode, &f_transform,

+				  &source_width, &source_height);

 	    if (stuff->x + source_width > pScreen->width)

 	    {

 		client->errorValue = stuff->x;

 		free(outputs);

 		return BadValue;

 	    }

-	    

+

 	    if (stuff->y + source_height > pScreen->height)

 	    {

 		client->errorValue = stuff->y;

@@ -943,26 +1063,26 @@ ProcRRSetCrtcConfig (ClientPtr client)
 	}

 #endif

     }

-    

+

     if (!RRCrtcSet (crtc, mode, stuff->x, stuff->y,

-		   rotation, numOutputs, outputs))

+		    rotation, numOutputs, outputs, NULL))

     {

 	rep.status = RRSetConfigFailed;

 	goto sendReply;

     }

     rep.status = RRSetConfigSuccess;

     pScrPriv->lastSetTime = time;

-    

+

 sendReply:

     free(outputs);

-    

+

     rep.type = X_Reply;

     /* rep.status has already been filled in */

     rep.length = 0;

     rep.sequenceNumber = client->sequence;

     rep.newTimestamp = pScrPriv->lastSetTime.milliseconds;

 

-    if (client->swapped) 

+    if (client->swapped)

     {

 	int n;

     	swaps(&rep.sequenceNumber, n);

@@ -970,7 +1090,7 @@ sendReply:
 	swapl(&rep.newTimestamp, n);

     }

     WriteToClient(client, sizeof(xRRSetCrtcConfigReply), (char *)&rep);

-    

+

     return Success;

 }

 

@@ -986,7 +1106,7 @@ ProcRRGetPanning (ClientPtr client)
     BoxRec		tracking;

     INT16		border[4];

     int			n;

-    

+

     REQUEST_SIZE_MATCH(xRRGetPanningReq);

     VERIFY_RR_CRTC(stuff->crtc, crtc, DixReadAccess);

 

@@ -1056,7 +1176,7 @@ ProcRRSetPanning (ClientPtr client)
     BoxRec		tracking;

     INT16		border[4];

     int			n;

-    

+

     REQUEST_SIZE_MATCH(xRRSetPanningReq);

     VERIFY_RR_CRTC(stuff->crtc, crtc, DixReadAccess);

 

@@ -1071,9 +1191,9 @@ ProcRRSetPanning (ClientPtr client)
 	rep.status = RRSetConfigFailed;

 	goto sendReply;

     }

-    

+

     time = ClientTimeToServerTime(stuff->timestamp);

-    

+

     if (!pScrPriv->rrGetPanning)

 	return RRErrorBase + BadRRCrtc;

 

@@ -1149,7 +1269,7 @@ ProcRRGetCrtcGamma (ClientPtr client)
     int				n;

     unsigned long		len;

     char			*extra = NULL;

-    

+

     REQUEST_SIZE_MATCH(xRRGetCrtcGammaReq);

     VERIFY_RR_CRTC(stuff->crtc, crtc, DixReadAccess);

 

@@ -1158,7 +1278,7 @@ ProcRRGetCrtcGamma (ClientPtr client)
         return RRErrorBase + BadRRCrtc;

 

     len = crtc->gammaSize * 3 * 2;

-    

+

     if (crtc->gammaSize) {

 	extra = malloc(len);

 	if (!extra)

@@ -1192,21 +1312,21 @@ ProcRRSetCrtcGamma (ClientPtr client)
     RRCrtcPtr			crtc;

     unsigned long		len;

     CARD16			*red, *green, *blue;

-    

+

     REQUEST_AT_LEAST_SIZE(xRRSetCrtcGammaReq);

     VERIFY_RR_CRTC(stuff->crtc, crtc, DixReadAccess);

-    

+

     len = client->req_len - bytes_to_int32(sizeof (xRRSetCrtcGammaReq));

     if (len < (stuff->size * 3 + 1) >> 1)

 	return BadLength;

 

     if (stuff->size != crtc->gammaSize)

 	return BadMatch;

-    

+

     red = (CARD16 *) (stuff + 1);

     green = red + crtc->gammaSize;

     blue = green + crtc->gammaSize;

-    

+

     RRCrtcGammaSet (crtc, red, green, blue);

 

     return Success;

@@ -1247,7 +1367,7 @@ ProcRRSetCrtcTransform (ClientPtr client)
 

 

 #define CrtcTransformExtra	(SIZEOF(xRRGetCrtcTransformReply) - 32)

-				

+

 static int

 transform_filter_length (RRTransformPtr transform)

 {

@@ -1349,3 +1469,331 @@ ProcRRGetCrtcTransform (ClientPtr client)
     free(reply);

     return Success;

 }

+

+static int

+RRConvertCrtcConfig(ClientPtr client, ScreenPtr screen,

+		    RRScreenConfigPtr screen_config,

+		    RRCrtcConfigPtr config, xRRCrtcConfig *x,

+		    RROutput *outputIds)

+{

+    RRCrtcPtr		crtc;

+    RROutputPtr		*outputs;

+    rrScrPrivPtr	scr_priv;

+    RRModePtr		mode;

+    PixmapPtr		pixmap;

+    int			rc, i, j;

+    Rotation		rotation;

+

+    VERIFY_RR_CRTC(x->crtc, crtc, DixSetAttrAccess);

+

+    if (x->mode == None)

+    {

+	mode = NULL;

+	if (x->nOutput > 0)

+	    return BadMatch;

+    }

+    else

+    {

+	VERIFY_RR_MODE(x->mode, mode, DixSetAttrAccess);

+	if (x->nOutput == 0)

+	    return BadMatch;

+    }

+    if (x->nOutput)

+    {

+	outputs = malloc(x->nOutput * sizeof (RROutputPtr));

+	if (!outputs)

+	    return BadAlloc;

+    }

+    else

+	outputs = NULL;

+

+    if (x->pixmap == None)

+	pixmap = NULL;

+    else if (x->pixmap == RR_CurrentScanoutPixmap)

+	pixmap = crtc->scanoutPixmap;

+    else

+    {

+	rc = dixLookupResourceByType((pointer *) &pixmap, x->pixmap,

+				     RT_PIXMAP, client, DixWriteAccess);

+	if (rc != Success) {

+	    free(outputs);

+	    return rc;

+	}

+	/* XXX check to make sure this is a scanout pixmap */

+    }

+

+    for (i = 0; i < x->nOutput; i++)

+    {

+	rc = dixLookupResourceByType((pointer *)(outputs + i), outputIds[i],

+				     RROutputType, client, DixSetAttrAccess);

+	if (rc != Success)

+	{

+	    free(outputs);

+	    return rc;

+	}

+	/* validate crtc for this output */

+	for (j = 0; j < outputs[i]->numCrtcs; j++)

+	    if (outputs[i]->crtcs[j] == crtc)

+		break;

+	if (j == outputs[i]->numCrtcs)

+	{

+	    free(outputs);

+	    return BadMatch;

+	}

+	/* validate mode for this output */

+	for (j = 0; j < outputs[i]->numModes + outputs[i]->numUserModes; j++)

+	{

+	    RRModePtr	m = (j < outputs[i]->numModes ?

+			     outputs[i]->modes[j] :

+			     outputs[i]->userModes[j - outputs[i]->numModes]);

+	    if (m == mode)

+		break;

+	}

+	if (j == outputs[i]->numModes + outputs[i]->numUserModes)

+	{

+	    free(outputs);

+	    return BadMatch;

+	}

+    }

+    /* validate clones */

+    for (i = 0; i < x->nOutput; i++)

+    {

+	for (j = 0; j < x->nOutput; j++)

+	{

+	    int k;

+	    if (i == j)

+		continue;

+	    for (k = 0; k < outputs[i]->numClones; k++)

+	    {

+		if (outputs[i]->clones[k] == outputs[j])

+		    break;

+	    }

+	    if (k == outputs[i]->numClones)

+	    {

+		free(outputs);

+		return BadMatch;

+	    }

+	}

+    }

+

+    if (crtc->pScreen != screen)

+	return BadMatch;

+

+    scr_priv = rrGetScrPriv(screen);

+

+    config->crtc = crtc;

+    config->x = x->x;

+    config->y = x->y;

+    config->mode = mode;

+    config->rotation = x->rotation;

+    config->numOutputs = x->nOutput;

+    config->outputs = outputs;

+    PictTransform_from_xRenderTransform(&config->sprite_position_transform,

+					     &x->spritePositionTransform);

+    PictTransform_from_xRenderTransform(&config->sprite_image_transform,

+					     &x->spriteImageTransform);

+    pixman_f_transform_from_pixman_transform(&config->sprite_position_f_transform,

+					     &config->sprite_position_transform);

+    pixman_f_transform_from_pixman_transform(&config->sprite_image_f_transform,

+					     &config->sprite_image_transform);

+    config->pixmap = pixmap;

+    config->pixmap_x = x->xPixmap;

+    config->pixmap_y = x->yPixmap;

+

+    /*

+     * Validate requested rotation

+     */

+    rotation = (Rotation) x->rotation;

+

+    /* test the rotation bits only! */

+    switch (rotation & 0xf) {

+    case RR_Rotate_0:

+    case RR_Rotate_90:

+    case RR_Rotate_180:

+    case RR_Rotate_270:

+	break;

+    default:

+	/*

+	 * Invalid rotation

+	 */

+	client->errorValue = x->rotation;

+	free(outputs);

+	return BadValue;

+    }

+

+    if (mode)

+    {

+	if ((~crtc->rotations) & rotation)

+	{

+	    /*

+	     * requested rotation or reflection not supported by screen

+	     */

+	    client->errorValue = x->rotation;

+	    free(outputs);

+	    return BadMatch;

+	}

+

+	/*

+	 * If scanning out from another pixmap, make sure the mode

+	 * fits

+	 */

+	if (pixmap)

+	{

+	    if (x->xPixmap + mode->mode.width > pixmap->drawable.width) {

+		client->errorValue = x->xPixmap;

+		free(outputs);

+		return BadValue;

+	    }

+	    if (x->yPixmap + mode->mode.height > pixmap->drawable.height) {

+		client->errorValue = x->yPixmap;

+		free(outputs);

+		return BadValue;

+	    }

+	}

+	/*

+	 * Check screen size bounds if the DDX provides a 1.2 interface

+	 * for setting screen size. Else, assume the CrtcSet sets

+	 * the size along with the mode. If the driver supports transforms,

+	 * then it must allow crtcs to display a subset of the screen, so

+	 * only do this check for drivers without transform support.

+	 */

+	else if (scr_priv->rrScreenSetSize && !crtc->transforms)

+	{

+	    if (!RRScreenCoversCrtc(screen_config, config,

+				    &crtc->client_pending_transform,

+				    &client->errorValue))

+	    {

+		free(outputs);

+		return BadValue;

+	    }

+	}

+    }

+

+    return Success;

+}

+

+int

+ProcRRSetCrtcConfigs (ClientPtr client)

+{

+    REQUEST(xRRSetCrtcConfigsReq);

+    xRRSetCrtcConfigsReply  rep;

+    DrawablePtr		    drawable;

+    ScreenPtr		    screen;

+    rrScrPrivPtr	    scr_priv;

+    xRRCrtcConfig	    *x_configs;

+    RRScreenConfigRec	    screen_config;

+    RRCrtcConfigPtr	    configs = NULL;

+    RROutput		    *output_ids;

+    int			    num_configs = 0;

+    int			    rc, i;

+    int			    extra_len;

+    int			    num_output_ids;

+

+    REQUEST_AT_LEAST_SIZE(xRRSetCrtcConfigsReq);

+

+    extra_len = client->req_len - bytes_to_int32(sizeof(xRRSetCrtcConfigsReq));

+

+    num_configs = stuff->nConfigs;

+

+    /* Check request length against number of configs specified */

+    if (num_configs * (sizeof (xRRCrtcConfig) >> 2) > extra_len)

+	return BadLength;

+

+    extra_len -= num_configs * (sizeof (xRRCrtcConfig) >> 2);

+    x_configs = (xRRCrtcConfig *) (stuff + 1);

+

+    /* Check remaining request length against number of outputs */

+    num_output_ids = 0;

+    for (i = 0; i < num_configs; i++)

+	num_output_ids += x_configs[i].nOutput;

+

+    if (extra_len != num_output_ids)

+	return BadLength;

+

+    rc = dixLookupDrawable(&drawable, stuff->drawable, client, 0, DixGetAttrAccess);

+    if (rc != Success)

+	return rc;

+

+    screen = drawable->pScreen;

+

+    scr_priv = rrGetScrPriv(screen);

+

+    if (!scr_priv)

+    {

+	rep.status = RRSetConfigFailed;

+	goto sendReply;

+    }

+

+    if (stuff->widthInMillimeters == 0 || stuff->heightInMillimeters == 0)

+    {

+	client->errorValue = 0;

+	return BadValue;

+    }

+

+    if (stuff->screenPixmapWidth < scr_priv->minWidth ||

+	scr_priv->maxWidth < stuff->screenPixmapWidth)

+    {

+	client->errorValue = stuff->screenPixmapWidth;

+	return BadValue;

+    }

+    if (stuff->screenPixmapHeight < scr_priv->minHeight ||

+	scr_priv->maxHeight < stuff->screenPixmapHeight)

+    {

+	client->errorValue = stuff->screenPixmapHeight;

+	return BadValue;

+    }

+

+    screen_config.screen_pixmap_width = stuff->screenPixmapWidth;

+    screen_config.screen_pixmap_height = stuff->screenPixmapHeight;

+    screen_config.screen_width = stuff->screenWidth;

+    screen_config.screen_height = stuff->screenHeight;

+    screen_config.mm_width = stuff->widthInMillimeters;

+    screen_config.mm_height = stuff->heightInMillimeters;

+

+    output_ids = (RROutput *) (x_configs + num_configs);

+

+    /*

+     * Convert protocol crtc configurations into

+     * server crtc configurations

+     */

+    configs = calloc(num_configs, sizeof (RRCrtcConfigRec));

+    if (num_configs > 0 && configs == NULL)

+	return BadAlloc;

+    for (i = 0; i < num_configs; i++) {

+	rc = RRConvertCrtcConfig(client, screen, &screen_config,

+				 &configs[i],

+				 &x_configs[i], output_ids);

+	if (rc != Success) {

+	    rep.status = RRSetConfigFailed;

+	    goto sendReply;

+	}

+	output_ids += x_configs[i].nOutput;

+    }

+

+    if (num_configs &&

+	!RRSetCrtcConfigs (screen, &screen_config, configs, num_configs))

+    {

+	rep.status = RRSetConfigFailed;

+	goto sendReply;

+    }

+    rep.status = RRSetConfigSuccess;

+    scr_priv->lastSetTime = currentTime;

+

+sendReply:

+    RRFreeCrtcConfigs(configs, num_configs);

+

+    rep.type = X_Reply;

+    /* rep.status has already been filled in */

+    rep.length = 0;

+    rep.sequenceNumber = client->sequence;

+

+    if (client->swapped)

+    {

+	int n;

+	swaps(&rep.sequenceNumber, n);

+	swapl(&rep.length, n);

+    }

+    WriteToClient(client, sizeof(xRRSetCrtcConfigsReply), (char *)&rep);

+

+    return Success;

+}

diff --git a/xorg-server/randr/rrdispatch.c b/xorg-server/randr/rrdispatch.c
index b54086bcb..7540b4d35 100644
--- a/xorg-server/randr/rrdispatch.c
+++ b/xorg-server/randr/rrdispatch.c
@@ -224,5 +224,11 @@ int (*ProcRandrVector[RRNumberRequests])(ClientPtr) = {
     ProcRRSetPanning,		/* 29 */

     ProcRRSetOutputPrimary,	/* 30 */

     ProcRRGetOutputPrimary,	/* 31 */

+/* V1.4 additions */

+    ProcRRQueryScanoutPixmaps,	/* 32 */

+    ProcRRCreateScanoutPixmap,	/* 33 */

+    ProcRRSetCrtcSpriteTransform,/* 34 */

+    ProcRRGetCrtcSpriteTransform,/* 35 */

+    ProcRRSetCrtcConfigs,	 /* 36 */

 };

 

diff --git a/xorg-server/randr/rrinfo.c b/xorg-server/randr/rrinfo.c
index 04c1a6c98..faac15afb 100644
--- a/xorg-server/randr/rrinfo.c
+++ b/xorg-server/randr/rrinfo.c
@@ -168,7 +168,7 @@ RRScanOldConfig (ScreenPtr pScreen, Rotation rotations)
     /* notice current mode */

     if (newMode)

 	RRCrtcNotify (crtc, newMode, 0, 0, pScrPriv->rotation,

-		      NULL, 1, &output);

+		      NULL, 1, &output, NULL);

 }

 #endif

 

diff --git a/xorg-server/randr/rrpixmap.c b/xorg-server/randr/rrpixmap.c
new file mode 100644
index 000000000..5949309c9
--- /dev/null
+++ b/xorg-server/randr/rrpixmap.c
@@ -0,0 +1,154 @@
+/*

+ * Copyright © 2010 Keith Packard

+ *

+ * 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 the copyright holders not be used in advertising or

+ * publicity pertaining to distribution of the software without specific,

+ * written prior permission.  The copyright holders make no representations

+ * about the suitability of this software for any purpose.  It is provided "as

+ * is" without express or implied warranty.

+ *

+ * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO

+ * EVENT SHALL THE COPYRIGHT HOLDERS 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.

+ */

+

+#include "randrstr.h"

+#include "xace.h"

+

+int

+ProcRRQueryScanoutPixmaps (ClientPtr client)

+{

+    REQUEST(xRRQueryScanoutPixmapsReq);

+    xRRQueryScanoutPixmapsReply	rep;

+    RRScanoutPixmapInfo		*info;

+    xRRScanoutPixmapInfo	*x_info;

+    int				n_info;

+    int				rc;

+    DrawablePtr			drawable;

+    ScreenPtr			screen;

+    rrScrPrivPtr		screen_priv;

+    int 			n, s;

+

+    REQUEST_SIZE_MATCH(xRRQueryScanoutPixmapsReq);

+    rc = dixLookupDrawable(&drawable, stuff->drawable, client, 0, DixGetAttrAccess);

+    if (rc != Success) {

+	client->errorValue = stuff->drawable;

+	return rc;

+    }

+

+    screen = drawable->pScreen;

+    screen_priv = rrGetScrPriv(screen);

+

+    rep.type = X_Reply;

+    /* rep.status has already been filled in */

+    rep.length = 0;

+    rep.sequenceNumber = client->sequence;

+

+    info = RRQueryScanoutPixmapInfo(screen, &n_info);

+    x_info = calloc(n_info, sizeof (xRRScanoutPixmapInfo));

+    if (n_info && !x_info)

+	return BadAlloc;

+    rep.length += (n_info * sizeof (xRRScanoutPixmapInfo)) >> 2;

+    if (client->swapped) {

+	swaps(&rep.sequenceNumber, n);

+	swapl(&rep.length, n);

+    }

+

+    for (s = 0; s < n_info; s++) {

+	x_info[s].format = info[s].format->id;

+	x_info[s].maxWidth = info[s].maxWidth;

+	x_info[s].maxHeight = info[s].maxHeight;

+	x_info[s].rotations = info[s].rotations;

+	if (client->swapped) {

+	    swapl(&x_info[s].format, n);

+	    swaps(&x_info[s].maxWidth, n);

+	    swaps(&x_info[s].maxHeight, n);

+	    swaps(&x_info[s].rotations, n);

+	}

+    }

+

+    WriteToClient(client, sizeof(rep), (char *)&rep);

+    if (n_info)

+	WriteToClient(client, n_info * sizeof (xRRScanoutPixmapInfo),

+		      (char *) x_info);

+    return Success;

+}

+

+int

+ProcRRCreateScanoutPixmap (ClientPtr client)

+{

+    REQUEST(xRRCreateScanoutPixmapReq);

+    int 		rc;

+    DrawablePtr		drawable;

+    ScreenPtr		screen;

+    rrScrPrivPtr	screen_priv;

+    PixmapPtr		pixmap;

+    int			n_info;

+    RRScanoutPixmapInfo	*info;

+    int			s;

+

+    REQUEST_SIZE_MATCH(xRRCreateScanoutPixmapReq);

+    client->errorValue = stuff->pid;

+    LEGAL_NEW_RESOURCE(stuff->pid, client);

+

+    rc = dixLookupDrawable(&drawable, stuff->drawable, client, 0, DixGetAttrAccess);

+    if (rc != Success) {

+	client->errorValue = stuff->drawable;

+	return rc;

+    }

+    screen = drawable->pScreen;

+    screen_priv = rrGetScrPriv(screen);

+    if (!screen_priv)

+	return BadValue;

+

+    info = RRQueryScanoutPixmapInfo(screen, &n_info);

+    for (s = 0; s < n_info; s++) {

+	if (info[s].format->id == stuff->format)

+	    break;

+    }

+    if (s == n_info || !screen_priv->rrCreateScanoutPixmap) {

+	client->errorValue = stuff->format;

+	return BadValue;

+    }

+    info = &info[s];

+    if (!stuff->width || stuff->width > info->maxWidth) {

+	client->errorValue = stuff->width;

+	return BadValue;

+    }

+    if (!stuff->height || stuff->height > info->maxHeight) {

+	client->errorValue = stuff->height;

+	return BadValue;

+    }

+    if ((stuff->rotations & info->rotations) != stuff->rotations) {

+	client->errorValue = stuff->rotations;

+	return BadValue;

+    }

+

+    pixmap = screen_priv->rrCreateScanoutPixmap (screen,

+						 stuff->width, stuff->height,

+						 info->depth,

+						 stuff->rotations,

+						 info->format);

+    if (!pixmap)

+	return BadAlloc;

+

+    pixmap->drawable.serialNumber = NEXT_SERIAL_NUMBER;

+    pixmap->drawable.id = stuff->pid;

+    rc = XaceHook(XACE_RESOURCE_ACCESS, client, stuff->pid, RT_PIXMAP,

+		  pixmap, RT_NONE, NULL, DixCreateAccess);

+    if (rc != Success) {

+	screen->DestroyPixmap(pixmap);

+	return rc;

+    }

+    if (!AddResource(stuff->pid, RT_PIXMAP, pixmap))

+	return BadAlloc;

+    return Success;

+}

diff --git a/xorg-server/randr/rrscreen.c b/xorg-server/randr/rrscreen.c
index f8631cee3..996ca3234 100644
--- a/xorg-server/randr/rrscreen.c
+++ b/xorg-server/randr/rrscreen.c
@@ -173,6 +173,8 @@ Bool
 RRScreenSizeSet (ScreenPtr  pScreen,

 		 CARD16	    width,

 		 CARD16	    height,

+		 CARD16	    pixWidth,

+		 CARD16	    pixHeight,

 		 CARD32	    mmWidth,

 		 CARD32	    mmHeight)

 {

@@ -183,6 +185,7 @@ RRScreenSizeSet (ScreenPtr  pScreen,
     {

 	return (*pScrPriv->rrScreenSetSize) (pScreen,

 					     width, height,

+					     pixWidth, pixHeight,

 					     mmWidth, mmHeight);

     }

 #endif

@@ -196,6 +199,24 @@ RRScreenSizeSet (ScreenPtr  pScreen,
 }

 

 /*

+ * Compute an RRScreenConfig from the current screen information

+ */

+void

+RRScreenCurrentConfig(ScreenPtr screen,

+		      RRScreenConfigPtr screen_config)

+{

+    PixmapPtr		screen_pixmap = screen->GetScreenPixmap(screen);

+    WindowPtr		root = screen->root;

+

+    screen_config->screen_pixmap_width = screen_pixmap->drawable.width;

+    screen_config->screen_pixmap_height = screen_pixmap->drawable.height;

+    screen_config->screen_width = root->drawable.width;

+    screen_config->screen_height = root->drawable.height;

+    screen_config->mm_width = screen->mmWidth;

+    screen_config->mm_height = screen->mmHeight;

+}

+

+/*

  * Retrieve valid screen size range

  */

 int

@@ -305,6 +326,7 @@ ProcRRSetScreenSize (ClientPtr client)
     }

     if (!RRScreenSizeSet (pScreen, 

 			  stuff->width, stuff->height,

+			  stuff->width, stuff->height,

 			  stuff->widthInMillimeters,

 			  stuff->heightInMillimeters))

     {

@@ -781,8 +803,10 @@ ProcRRSetScreenConfig (ClientPtr client)
     }

     

     rc = dixLookupDrawable(&pDraw, stuff->drawable, client, 0, DixWriteAccess);

-    if (rc != Success)

+    if (rc != Success) {

+	client->errorValue = stuff->drawable;

 	return rc;

+    }

 

     pScreen = pDraw->pScreen;

 

@@ -927,14 +951,14 @@ ProcRRSetScreenConfig (ClientPtr client)
 	for (c = 0; c < pScrPriv->numCrtcs; c++)

 	{

 	    if (!RRCrtcSet (pScrPriv->crtcs[c], NULL, 0, 0, RR_Rotate_0,

-			    0, NULL))

+			    0, NULL, NULL))

 	    {

 		rep.status = RRSetConfigFailed;

 		/* XXX recover from failure */

 		goto sendReply;

 	    }

 	}

-	if (!RRScreenSizeSet (pScreen, width, height,

+	if (!RRScreenSizeSet (pScreen, width, height, width, height,

 			      pScreen->mmWidth, pScreen->mmHeight))

 	{

 	    rep.status = RRSetConfigFailed;

@@ -943,7 +967,7 @@ ProcRRSetScreenConfig (ClientPtr client)
 	}

     }

 

-    if (!RRCrtcSet (crtc, mode, 0, 0, stuff->rotation, 1, &output))

+    if (!RRCrtcSet (crtc, mode, 0, 0, stuff->rotation, 1, &output, NULL))

 	rep.status = RRSetConfigFailed;

     else {

 	pScrPriv->lastSetTime = time;

diff --git a/xorg-server/randr/rrsdispatch.c b/xorg-server/randr/rrsdispatch.c
index e16090a41..5c6978aa1 100644
--- a/xorg-server/randr/rrsdispatch.c
+++ b/xorg-server/randr/rrsdispatch.c
@@ -1,503 +1,635 @@
-/*
- * Copyright © 2006 Keith Packard
- *
- * 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 the copyright holders not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission.  The copyright holders make no representations
- * about the suitability of this software for any purpose.  It is provided "as
- * is" without express or implied warranty.
- *
- * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL THE COPYRIGHT HOLDERS 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.
- */
-
-#include "randrstr.h"
-
-static int
-SProcRRQueryVersion (ClientPtr client)
-{
-    register int n;
-    REQUEST(xRRQueryVersionReq);
-
-    swaps(&stuff->length, n);
-    swapl(&stuff->majorVersion, n);
-    swapl(&stuff->minorVersion, n);
-    return (*ProcRandrVector[stuff->randrReqType]) (client);
-}
-
-static int
-SProcRRGetScreenInfo (ClientPtr client)
-{
-    register int n;
-    REQUEST(xRRGetScreenInfoReq);
-
-    swaps(&stuff->length, n);
-    swapl(&stuff->window, n);
-    return (*ProcRandrVector[stuff->randrReqType]) (client);
-}
-
-static int
-SProcRRSetScreenConfig (ClientPtr client)
-{
-    register int n;
-    REQUEST(xRRSetScreenConfigReq);
-
-    if (RRClientKnowsRates (client))
-    {
-	REQUEST_SIZE_MATCH (xRRSetScreenConfigReq);
-	swaps (&stuff->rate, n);
-    }
-    else
-    {
-	REQUEST_SIZE_MATCH (xRR1_0SetScreenConfigReq);
-    }
-    
-    swaps(&stuff->length, n);
-    swapl(&stuff->drawable, n);
-    swapl(&stuff->timestamp, n);
-    swaps(&stuff->sizeID, n);
-    swaps(&stuff->rotation, n);
-    return (*ProcRandrVector[stuff->randrReqType]) (client);
-}
-
-static int
-SProcRRSelectInput (ClientPtr client)
-{
-    register int n;
-    REQUEST(xRRSelectInputReq);
-
-    swaps(&stuff->length, n);
-    swapl(&stuff->window, n);
-    swaps(&stuff->enable, n);
-    return (*ProcRandrVector[stuff->randrReqType]) (client);
-}
-
-static int
-SProcRRGetScreenSizeRange (ClientPtr client)
-{
-    int n;
-    REQUEST(xRRGetScreenSizeRangeReq);
-
-    REQUEST_SIZE_MATCH(xRRGetScreenSizeRangeReq);
-    swaps(&stuff->length, n);
-    swapl(&stuff->window, n);
-    return (*ProcRandrVector[stuff->randrReqType]) (client);
-}
-
-static int
-SProcRRSetScreenSize (ClientPtr client)
-{
-    int n;
-    REQUEST(xRRSetScreenSizeReq);
-
-    REQUEST_SIZE_MATCH(xRRSetScreenSizeReq);
-    swaps(&stuff->length, n);
-    swapl(&stuff->window, n);
-    swaps(&stuff->width, n);
-    swaps(&stuff->height, n);
-    swapl(&stuff->widthInMillimeters, n);
-    swapl(&stuff->heightInMillimeters, n);
-    return (*ProcRandrVector[stuff->randrReqType]) (client);
-}
-
-static int
-SProcRRGetScreenResources (ClientPtr client)
-{
-    int n;
-    REQUEST(xRRGetScreenResourcesReq);
-
-    REQUEST_SIZE_MATCH(xRRGetScreenResourcesReq);
-    swaps(&stuff->length, n);
-    swapl(&stuff->window, n);
-    return (*ProcRandrVector[stuff->randrReqType]) (client);
-}
-
-static int
-SProcRRGetOutputInfo (ClientPtr client)
-{
-    int n;
-    REQUEST(xRRGetOutputInfoReq);
-
-    REQUEST_SIZE_MATCH(xRRGetOutputInfoReq);
-    swaps(&stuff->length, n);
-    swapl(&stuff->output, n);
-    swapl(&stuff->configTimestamp, n);
-    return (*ProcRandrVector[stuff->randrReqType]) (client);
-}
-
-static int
-SProcRRListOutputProperties (ClientPtr client)
-{
-    int n;
-    REQUEST(xRRListOutputPropertiesReq);
-
-    REQUEST_SIZE_MATCH(xRRListOutputPropertiesReq);
-    swaps(&stuff->length, n);
-    swapl(&stuff->output, n);
-    return (*ProcRandrVector[stuff->randrReqType]) (client);
-}
-
-static int
-SProcRRQueryOutputProperty (ClientPtr client)
-{
-    int n;
-    REQUEST(xRRQueryOutputPropertyReq);
-
-    REQUEST_SIZE_MATCH(xRRQueryOutputPropertyReq);
-    swaps(&stuff->length, n);
-    swapl(&stuff->output, n);
-    swapl(&stuff->property, n);
-    return (*ProcRandrVector[stuff->randrReqType]) (client);
-}
-
-static int
-SProcRRConfigureOutputProperty (ClientPtr client)
-{
-    int n;
-    REQUEST(xRRConfigureOutputPropertyReq);
-
-    swaps(&stuff->length, n);
-    swapl(&stuff->output, n);
-    swapl(&stuff->property, n);
-    SwapRestL(stuff);
-    return (*ProcRandrVector[stuff->randrReqType]) (client);
-}
-
-static int
-SProcRRChangeOutputProperty (ClientPtr client)
-{
-    int n;
-    REQUEST(xRRChangeOutputPropertyReq);
-
-    REQUEST_AT_LEAST_SIZE (xRRChangeOutputPropertyReq);
-    swaps(&stuff->length, n);
-    swapl(&stuff->output, n);
-    swapl(&stuff->property, n);
-    swapl(&stuff->type, n);
-    swapl(&stuff->nUnits, n);
-    switch(stuff->format) {
-	case 8:
-	    break;
-	case 16:
-	    SwapRestS(stuff);
-	    break;
-	case 32:
-	    SwapRestL(stuff);
-	    break;
-	default:
-	    client->errorValue = stuff->format;
-	    return BadValue;
-    }
-    return (*ProcRandrVector[stuff->randrReqType]) (client);
-}
-
-static int
-SProcRRDeleteOutputProperty (ClientPtr client)
-{
-    int n;
-    REQUEST(xRRDeleteOutputPropertyReq);
-    
-    REQUEST_SIZE_MATCH(xRRDeleteOutputPropertyReq);
-    swaps(&stuff->length, n);
-    swapl(&stuff->output, n);
-    swapl(&stuff->property, n);
-    return (*ProcRandrVector[stuff->randrReqType]) (client);
-}
-
-static int
-SProcRRGetOutputProperty (ClientPtr client)
-{
-    int n;
-    REQUEST(xRRGetOutputPropertyReq);
-
-    REQUEST_SIZE_MATCH(xRRGetOutputPropertyReq);
-    swaps(&stuff->length, n);
-    swapl(&stuff->output, n);
-    swapl(&stuff->property, n);
-    swapl(&stuff->type, n);
-    swapl(&stuff->longOffset, n);
-    swapl(&stuff->longLength, n);
-    return (*ProcRandrVector[stuff->randrReqType]) (client);
-}
-
-static int
-SProcRRCreateMode (ClientPtr client)
-{
-    int n;
-    xRRModeInfo *modeinfo;
-    REQUEST(xRRCreateModeReq);
-
-    REQUEST_AT_LEAST_SIZE(xRRCreateModeReq);
-    swaps(&stuff->length, n);
-    swapl(&stuff->window, n);
-
-    modeinfo = &stuff->modeInfo;
-    swapl(&modeinfo->id, n);
-    swaps(&modeinfo->width, n);
-    swaps(&modeinfo->height, n);
-    swapl(&modeinfo->dotClock, n);
-    swaps(&modeinfo->hSyncStart, n);
-    swaps(&modeinfo->hSyncEnd, n);
-    swaps(&modeinfo->hTotal, n);
-    swaps(&modeinfo->vSyncStart, n);
-    swaps(&modeinfo->vSyncEnd, n);
-    swaps(&modeinfo->vTotal, n);
-    swaps(&modeinfo->nameLength, n);
-    swapl(&modeinfo->modeFlags, n);
-    return (*ProcRandrVector[stuff->randrReqType]) (client);
-}
-
-static int
-SProcRRDestroyMode (ClientPtr client)
-{
-    int n;
-    REQUEST(xRRDestroyModeReq);
-
-    REQUEST_SIZE_MATCH(xRRDestroyModeReq);
-    swaps(&stuff->length, n);
-    swapl(&stuff->mode, n);
-    return (*ProcRandrVector[stuff->randrReqType]) (client);
-}
-
-static int
-SProcRRAddOutputMode (ClientPtr client)
-{
-    int n;
-    REQUEST(xRRAddOutputModeReq);
-
-    REQUEST_SIZE_MATCH(xRRAddOutputModeReq);
-    swaps(&stuff->length, n);
-    swapl(&stuff->output, n);
-    swapl(&stuff->mode, n);
-    return (*ProcRandrVector[stuff->randrReqType]) (client);
-}
-
-static int
-SProcRRDeleteOutputMode (ClientPtr client)
-{
-    int n;
-    REQUEST(xRRDeleteOutputModeReq);
-
-    REQUEST_SIZE_MATCH(xRRDeleteOutputModeReq);
-    swaps(&stuff->length, n);
-    swapl(&stuff->output, n);
-    swapl(&stuff->mode, n);
-    return (*ProcRandrVector[stuff->randrReqType]) (client);
-}
-
-static int
-SProcRRGetCrtcInfo (ClientPtr client)
-{
-    int n;
-    REQUEST(xRRGetCrtcInfoReq);
-
-    REQUEST_SIZE_MATCH(xRRGetCrtcInfoReq);
-    swaps(&stuff->length, n);
-    swapl(&stuff->crtc, n);
-    swapl(&stuff->configTimestamp, n);
-    return (*ProcRandrVector[stuff->randrReqType]) (client);
-}
-
-static int
-SProcRRSetCrtcConfig (ClientPtr client)
-{
-    int n;
-    REQUEST(xRRSetCrtcConfigReq);
-
-    REQUEST_AT_LEAST_SIZE(xRRSetCrtcConfigReq);
-    swaps(&stuff->length, n);
-    swapl(&stuff->crtc, n);
-    swapl(&stuff->timestamp, n);
-    swapl(&stuff->configTimestamp, n);
-    swaps(&stuff->x, n);
-    swaps(&stuff->y, n);
-    swapl(&stuff->mode, n);
-    swaps(&stuff->rotation, n);
-    SwapRestL(stuff);
-    return (*ProcRandrVector[stuff->randrReqType]) (client);
-}
-
-static int
-SProcRRGetCrtcGammaSize (ClientPtr client)
-{
-    int n;
-    REQUEST(xRRGetCrtcGammaSizeReq);
-
-    REQUEST_SIZE_MATCH(xRRGetCrtcGammaSizeReq);
-    swaps(&stuff->length, n);
-    swapl(&stuff->crtc, n);
-    return (*ProcRandrVector[stuff->randrReqType]) (client);
-}
-
-static int
-SProcRRGetCrtcGamma (ClientPtr client)
-{
-    int n;
-    REQUEST(xRRGetCrtcGammaReq);
-
-    REQUEST_SIZE_MATCH(xRRGetCrtcGammaReq);
-    swaps(&stuff->length, n);
-    swapl(&stuff->crtc, n);
-    return (*ProcRandrVector[stuff->randrReqType]) (client);
-}
-
-static int
-SProcRRSetCrtcGamma (ClientPtr client)
-{
-    int n;
-    REQUEST(xRRSetCrtcGammaReq);
-
-    REQUEST_AT_LEAST_SIZE(xRRSetCrtcGammaReq);
-    swaps(&stuff->length, n);
-    swapl(&stuff->crtc, n);
-    swaps(&stuff->size, n);
-    SwapRestS(stuff);
-    return (*ProcRandrVector[stuff->randrReqType]) (client);
-}
-
-static int
-SProcRRSetCrtcTransform (ClientPtr client)
-{
-    int n, nparams;
-    char *filter;
-    CARD32 *params;
-    REQUEST(xRRSetCrtcTransformReq);
-
-    REQUEST_AT_LEAST_SIZE(xRRSetCrtcTransformReq);
-    swaps(&stuff->length, n);
-    swapl(&stuff->crtc, n);
-    SwapLongs((CARD32 *)&stuff->transform, bytes_to_int32(sizeof(xRenderTransform)));
-    swaps(&stuff->nbytesFilter, n);
-    filter = (char *)(stuff + 1);
-    params = (CARD32 *) (filter + pad_to_int32(stuff->nbytesFilter));
-    nparams = ((CARD32 *) stuff + client->req_len) - params;
-    if (nparams < 0)
-	return BadLength;
-
-    SwapLongs(params, nparams);
-    return (*ProcRandrVector[stuff->randrReqType]) (client);
-}
-
-static int
-SProcRRGetCrtcTransform (ClientPtr client)
-{
-    int n;
-    REQUEST(xRRGetCrtcTransformReq);
-
-    REQUEST_SIZE_MATCH(xRRGetCrtcTransformReq);
-    swaps(&stuff->length, n);
-    swapl(&stuff->crtc, n);
-    return (*ProcRandrVector[stuff->randrReqType]) (client);
-}
-
-static int
-SProcRRGetPanning (ClientPtr client)
-{
-    int n;
-    REQUEST(xRRGetPanningReq);
-    
-    REQUEST_SIZE_MATCH(xRRGetPanningReq);
-    swaps(&stuff->length, n);
-    swapl(&stuff->crtc, n);
-    return (*ProcRandrVector[stuff->randrReqType]) (client);
-}
-
-static int
-SProcRRSetPanning (ClientPtr client)
-{
-    int n;
-    REQUEST(xRRSetPanningReq);
-    
-    REQUEST_SIZE_MATCH(xRRSetPanningReq);
-    swaps(&stuff->length, n);
-    swapl(&stuff->crtc, n);
-    swapl(&stuff->timestamp, n);
-    swaps(&stuff->left, n);
-    swaps(&stuff->top, n);
-    swaps(&stuff->width, n);
-    swaps(&stuff->height, n);
-    swaps(&stuff->track_left, n);
-    swaps(&stuff->track_top, n);
-    swaps(&stuff->track_width, n);
-    swaps(&stuff->track_height, n);
-    swaps(&stuff->border_left, n);
-    swaps(&stuff->border_top, n);
-    swaps(&stuff->border_right, n);
-    swaps(&stuff->border_bottom, n);
-    return (*ProcRandrVector[stuff->randrReqType]) (client);
-}
-
-static int
-SProcRRSetOutputPrimary (ClientPtr client)
-{
-    int n;
-    REQUEST(xRRSetOutputPrimaryReq);
-
-    REQUEST_SIZE_MATCH(xRRSetOutputPrimaryReq);
-    swaps(&stuff->length, n);
-    swapl(&stuff->window, n);
-    swapl(&stuff->output, n);
-    return ProcRandrVector[stuff->randrReqType](client);
-}
-
-static int
-SProcRRGetOutputPrimary (ClientPtr client)
-{
-    int n;
-    REQUEST(xRRGetOutputPrimaryReq);
-
-    REQUEST_SIZE_MATCH(xRRGetOutputPrimaryReq);
-    swaps(&stuff->length, n);
-    swapl(&stuff->window, n);
-    return ProcRandrVector[stuff->randrReqType](client);
-}
-
-int (*SProcRandrVector[RRNumberRequests])(ClientPtr) = {
-    SProcRRQueryVersion,	/* 0 */
-/* we skip 1 to make old clients fail pretty immediately */
-    NULL,			/* 1 SProcRandrOldGetScreenInfo */
-/* V1.0 apps share the same set screen config request id */
-    SProcRRSetScreenConfig,	/* 2 */
-    NULL,			/* 3 SProcRandrOldScreenChangeSelectInput */
-/* 3 used to be ScreenChangeSelectInput; deprecated */
-    SProcRRSelectInput,		/* 4 */
-    SProcRRGetScreenInfo,    	/* 5 */
-/* V1.2 additions */
-    SProcRRGetScreenSizeRange,	/* 6 */
-    SProcRRSetScreenSize,	/* 7 */
-    SProcRRGetScreenResources,	/* 8 */
-    SProcRRGetOutputInfo,	/* 9 */
-    SProcRRListOutputProperties,/* 10 */
-    SProcRRQueryOutputProperty,	/* 11 */
-    SProcRRConfigureOutputProperty,  /* 12 */
-    SProcRRChangeOutputProperty,/* 13 */
-    SProcRRDeleteOutputProperty,/* 14 */
-    SProcRRGetOutputProperty,	/* 15 */
-    SProcRRCreateMode,		/* 16 */
-    SProcRRDestroyMode,		/* 17 */
-    SProcRRAddOutputMode,	/* 18 */
-    SProcRRDeleteOutputMode,	/* 19 */
-    SProcRRGetCrtcInfo,		/* 20 */
-    SProcRRSetCrtcConfig,	/* 21 */
-    SProcRRGetCrtcGammaSize,	/* 22 */
-    SProcRRGetCrtcGamma,	/* 23 */
-    SProcRRSetCrtcGamma,	/* 24 */
-/* V1.3 additions */
-    SProcRRGetScreenResources,	/* 25 GetScreenResourcesCurrent */
-    SProcRRSetCrtcTransform,	/* 26 */
-    SProcRRGetCrtcTransform,	/* 27 */
-    SProcRRGetPanning,		/* 28 */
-    SProcRRSetPanning,		/* 29 */
-    SProcRRSetOutputPrimary,	/* 30 */
-    SProcRRGetOutputPrimary,	/* 31 */
-};
-
+/*

+ * Copyright © 2006 Keith Packard

+ *

+ * 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 the copyright holders not be used in advertising or

+ * publicity pertaining to distribution of the software without specific,

+ * written prior permission.  The copyright holders make no representations

+ * about the suitability of this software for any purpose.  It is provided "as

+ * is" without express or implied warranty.

+ *

+ * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO

+ * EVENT SHALL THE COPYRIGHT HOLDERS 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.

+ */

+

+#include "randrstr.h"

+

+static int

+SProcRRQueryVersion (ClientPtr client)

+{

+    register int n;

+    REQUEST(xRRQueryVersionReq);

+

+    swaps(&stuff->length, n);

+    swapl(&stuff->majorVersion, n);

+    swapl(&stuff->minorVersion, n);

+    return (*ProcRandrVector[stuff->randrReqType]) (client);

+}

+

+static int

+SProcRRGetScreenInfo (ClientPtr client)

+{

+    register int n;

+    REQUEST(xRRGetScreenInfoReq);

+

+    swaps(&stuff->length, n);

+    swapl(&stuff->window, n);

+    return (*ProcRandrVector[stuff->randrReqType]) (client);

+}

+

+static int

+SProcRRSetScreenConfig (ClientPtr client)

+{

+    register int n;

+    REQUEST(xRRSetScreenConfigReq);

+

+    if (RRClientKnowsRates (client))

+    {

+	REQUEST_SIZE_MATCH (xRRSetScreenConfigReq);

+	swaps (&stuff->rate, n);

+    }

+    else

+    {

+	REQUEST_SIZE_MATCH (xRR1_0SetScreenConfigReq);

+    }

+    

+    swaps(&stuff->length, n);

+    swapl(&stuff->drawable, n);

+    swapl(&stuff->timestamp, n);

+    swaps(&stuff->sizeID, n);

+    swaps(&stuff->rotation, n);

+    return (*ProcRandrVector[stuff->randrReqType]) (client);

+}

+

+static int

+SProcRRSelectInput (ClientPtr client)

+{

+    register int n;

+    REQUEST(xRRSelectInputReq);

+

+    swaps(&stuff->length, n);

+    swapl(&stuff->window, n);

+    swaps(&stuff->enable, n);

+    return (*ProcRandrVector[stuff->randrReqType]) (client);

+}

+

+static int

+SProcRRGetScreenSizeRange (ClientPtr client)

+{

+    int n;

+    REQUEST(xRRGetScreenSizeRangeReq);

+

+    REQUEST_SIZE_MATCH(xRRGetScreenSizeRangeReq);

+    swaps(&stuff->length, n);

+    swapl(&stuff->window, n);

+    return (*ProcRandrVector[stuff->randrReqType]) (client);

+}

+

+static int

+SProcRRSetScreenSize (ClientPtr client)

+{

+    int n;

+    REQUEST(xRRSetScreenSizeReq);

+

+    REQUEST_SIZE_MATCH(xRRSetScreenSizeReq);

+    swaps(&stuff->length, n);

+    swapl(&stuff->window, n);

+    swaps(&stuff->width, n);

+    swaps(&stuff->height, n);

+    swapl(&stuff->widthInMillimeters, n);

+    swapl(&stuff->heightInMillimeters, n);

+    return (*ProcRandrVector[stuff->randrReqType]) (client);

+}

+

+static int

+SProcRRGetScreenResources (ClientPtr client)

+{

+    int n;

+    REQUEST(xRRGetScreenResourcesReq);

+

+    REQUEST_SIZE_MATCH(xRRGetScreenResourcesReq);

+    swaps(&stuff->length, n);

+    swapl(&stuff->window, n);

+    return (*ProcRandrVector[stuff->randrReqType]) (client);

+}

+

+static int

+SProcRRGetOutputInfo (ClientPtr client)

+{

+    int n;

+    REQUEST(xRRGetOutputInfoReq);

+

+    REQUEST_SIZE_MATCH(xRRGetOutputInfoReq);

+    swaps(&stuff->length, n);

+    swapl(&stuff->output, n);

+    swapl(&stuff->configTimestamp, n);

+    return (*ProcRandrVector[stuff->randrReqType]) (client);

+}

+

+static int

+SProcRRListOutputProperties (ClientPtr client)

+{

+    int n;

+    REQUEST(xRRListOutputPropertiesReq);

+

+    REQUEST_SIZE_MATCH(xRRListOutputPropertiesReq);

+    swaps(&stuff->length, n);

+    swapl(&stuff->output, n);

+    return (*ProcRandrVector[stuff->randrReqType]) (client);

+}

+

+static int

+SProcRRQueryOutputProperty (ClientPtr client)

+{

+    int n;

+    REQUEST(xRRQueryOutputPropertyReq);

+

+    REQUEST_SIZE_MATCH(xRRQueryOutputPropertyReq);

+    swaps(&stuff->length, n);

+    swapl(&stuff->output, n);

+    swapl(&stuff->property, n);

+    return (*ProcRandrVector[stuff->randrReqType]) (client);

+}

+

+static int

+SProcRRConfigureOutputProperty (ClientPtr client)

+{

+    int n;

+    REQUEST(xRRConfigureOutputPropertyReq);

+

+    swaps(&stuff->length, n);

+    swapl(&stuff->output, n);

+    swapl(&stuff->property, n);

+    SwapRestL(stuff);

+    return (*ProcRandrVector[stuff->randrReqType]) (client);

+}

+

+static int

+SProcRRChangeOutputProperty (ClientPtr client)

+{

+    int n;

+    REQUEST(xRRChangeOutputPropertyReq);

+

+    REQUEST_AT_LEAST_SIZE (xRRChangeOutputPropertyReq);

+    swaps(&stuff->length, n);

+    swapl(&stuff->output, n);

+    swapl(&stuff->property, n);

+    swapl(&stuff->type, n);

+    swapl(&stuff->nUnits, n);

+    switch(stuff->format) {

+	case 8:

+	    break;

+	case 16:

+	    SwapRestS(stuff);

+	    break;

+	case 32:

+	    SwapRestL(stuff);

+	    break;

+	default:

+	    client->errorValue = stuff->format;

+	    return BadValue;

+    }

+    return (*ProcRandrVector[stuff->randrReqType]) (client);

+}

+

+static int

+SProcRRDeleteOutputProperty (ClientPtr client)

+{

+    int n;

+    REQUEST(xRRDeleteOutputPropertyReq);

+    

+    REQUEST_SIZE_MATCH(xRRDeleteOutputPropertyReq);

+    swaps(&stuff->length, n);

+    swapl(&stuff->output, n);

+    swapl(&stuff->property, n);

+    return (*ProcRandrVector[stuff->randrReqType]) (client);

+}

+

+static int

+SProcRRGetOutputProperty (ClientPtr client)

+{

+    int n;

+    REQUEST(xRRGetOutputPropertyReq);

+

+    REQUEST_SIZE_MATCH(xRRGetOutputPropertyReq);

+    swaps(&stuff->length, n);

+    swapl(&stuff->output, n);

+    swapl(&stuff->property, n);

+    swapl(&stuff->type, n);

+    swapl(&stuff->longOffset, n);

+    swapl(&stuff->longLength, n);

+    return (*ProcRandrVector[stuff->randrReqType]) (client);

+}

+

+static int

+SProcRRCreateMode (ClientPtr client)

+{

+    int n;

+    xRRModeInfo *modeinfo;

+    REQUEST(xRRCreateModeReq);

+

+    REQUEST_AT_LEAST_SIZE(xRRCreateModeReq);

+    swaps(&stuff->length, n);

+    swapl(&stuff->window, n);

+

+    modeinfo = &stuff->modeInfo;

+    swapl(&modeinfo->id, n);

+    swaps(&modeinfo->width, n);

+    swaps(&modeinfo->height, n);

+    swapl(&modeinfo->dotClock, n);

+    swaps(&modeinfo->hSyncStart, n);

+    swaps(&modeinfo->hSyncEnd, n);

+    swaps(&modeinfo->hTotal, n);

+    swaps(&modeinfo->vSyncStart, n);

+    swaps(&modeinfo->vSyncEnd, n);

+    swaps(&modeinfo->vTotal, n);

+    swaps(&modeinfo->nameLength, n);

+    swapl(&modeinfo->modeFlags, n);

+    return (*ProcRandrVector[stuff->randrReqType]) (client);

+}

+

+static int

+SProcRRDestroyMode (ClientPtr client)

+{

+    int n;

+    REQUEST(xRRDestroyModeReq);

+

+    REQUEST_SIZE_MATCH(xRRDestroyModeReq);

+    swaps(&stuff->length, n);

+    swapl(&stuff->mode, n);

+    return (*ProcRandrVector[stuff->randrReqType]) (client);

+}

+

+static int

+SProcRRAddOutputMode (ClientPtr client)

+{

+    int n;

+    REQUEST(xRRAddOutputModeReq);

+

+    REQUEST_SIZE_MATCH(xRRAddOutputModeReq);

+    swaps(&stuff->length, n);

+    swapl(&stuff->output, n);

+    swapl(&stuff->mode, n);

+    return (*ProcRandrVector[stuff->randrReqType]) (client);

+}

+

+static int

+SProcRRDeleteOutputMode (ClientPtr client)

+{

+    int n;

+    REQUEST(xRRDeleteOutputModeReq);

+

+    REQUEST_SIZE_MATCH(xRRDeleteOutputModeReq);

+    swaps(&stuff->length, n);

+    swapl(&stuff->output, n);

+    swapl(&stuff->mode, n);

+    return (*ProcRandrVector[stuff->randrReqType]) (client);

+}

+

+static int

+SProcRRGetCrtcInfo (ClientPtr client)

+{

+    int n;

+    REQUEST(xRRGetCrtcInfoReq);

+

+    REQUEST_SIZE_MATCH(xRRGetCrtcInfoReq);

+    swaps(&stuff->length, n);

+    swapl(&stuff->crtc, n);

+    swapl(&stuff->configTimestamp, n);

+    return (*ProcRandrVector[stuff->randrReqType]) (client);

+}

+

+static int

+SProcRRSetCrtcConfig (ClientPtr client)

+{

+    int n;

+    REQUEST(xRRSetCrtcConfigReq);

+

+    REQUEST_AT_LEAST_SIZE(xRRSetCrtcConfigReq);

+    swaps(&stuff->length, n);

+    swapl(&stuff->crtc, n);

+    swapl(&stuff->timestamp, n);

+    swapl(&stuff->configTimestamp, n);

+    swaps(&stuff->x, n);

+    swaps(&stuff->y, n);

+    swapl(&stuff->mode, n);

+    swaps(&stuff->rotation, n);

+    SwapRestL(stuff);

+    return (*ProcRandrVector[stuff->randrReqType]) (client);

+}

+

+static int

+SProcRRGetCrtcGammaSize (ClientPtr client)

+{

+    int n;

+    REQUEST(xRRGetCrtcGammaSizeReq);

+

+    REQUEST_SIZE_MATCH(xRRGetCrtcGammaSizeReq);

+    swaps(&stuff->length, n);

+    swapl(&stuff->crtc, n);

+    return (*ProcRandrVector[stuff->randrReqType]) (client);

+}

+

+static int

+SProcRRGetCrtcGamma (ClientPtr client)

+{

+    int n;

+    REQUEST(xRRGetCrtcGammaReq);

+

+    REQUEST_SIZE_MATCH(xRRGetCrtcGammaReq);

+    swaps(&stuff->length, n);

+    swapl(&stuff->crtc, n);

+    return (*ProcRandrVector[stuff->randrReqType]) (client);

+}

+

+static int

+SProcRRSetCrtcGamma (ClientPtr client)

+{

+    int n;

+    REQUEST(xRRSetCrtcGammaReq);

+

+    REQUEST_AT_LEAST_SIZE(xRRSetCrtcGammaReq);

+    swaps(&stuff->length, n);

+    swapl(&stuff->crtc, n);

+    swaps(&stuff->size, n);

+    SwapRestS(stuff);

+    return (*ProcRandrVector[stuff->randrReqType]) (client);

+}

+

+static int

+SProcRRSetCrtcTransform (ClientPtr client)

+{

+    int n, nparams;

+    char *filter;

+    CARD32 *params;

+    REQUEST(xRRSetCrtcTransformReq);

+

+    REQUEST_AT_LEAST_SIZE(xRRSetCrtcTransformReq);

+    swaps(&stuff->length, n);

+    swapl(&stuff->crtc, n);

+    SwapLongs((CARD32 *)&stuff->transform, bytes_to_int32(sizeof(xRenderTransform)));

+    swaps(&stuff->nbytesFilter, n);

+    filter = (char *)(stuff + 1);

+    params = (CARD32 *) (filter + pad_to_int32(stuff->nbytesFilter));

+    nparams = ((CARD32 *) stuff + client->req_len) - params;

+    if (nparams < 0)

+	return BadLength;

+

+    SwapLongs(params, nparams);

+    return (*ProcRandrVector[stuff->randrReqType]) (client);

+}

+

+static int

+SProcRRGetCrtcTransform (ClientPtr client)

+{

+    int n;

+    REQUEST(xRRGetCrtcTransformReq);

+

+    REQUEST_SIZE_MATCH(xRRGetCrtcTransformReq);

+    swaps(&stuff->length, n);

+    swapl(&stuff->crtc, n);

+    return (*ProcRandrVector[stuff->randrReqType]) (client);

+}

+

+static int

+SProcRRGetPanning (ClientPtr client)

+{

+    int n;

+    REQUEST(xRRGetPanningReq);

+    

+    REQUEST_SIZE_MATCH(xRRGetPanningReq);

+    swaps(&stuff->length, n);

+    swapl(&stuff->crtc, n);

+    return (*ProcRandrVector[stuff->randrReqType]) (client);

+}

+

+static int

+SProcRRSetPanning (ClientPtr client)

+{

+    int n;

+    REQUEST(xRRSetPanningReq);

+    

+    REQUEST_SIZE_MATCH(xRRSetPanningReq);

+    swaps(&stuff->length, n);

+    swapl(&stuff->crtc, n);

+    swapl(&stuff->timestamp, n);

+    swaps(&stuff->left, n);

+    swaps(&stuff->top, n);

+    swaps(&stuff->width, n);

+    swaps(&stuff->height, n);

+    swaps(&stuff->track_left, n);

+    swaps(&stuff->track_top, n);

+    swaps(&stuff->track_width, n);

+    swaps(&stuff->track_height, n);

+    swaps(&stuff->border_left, n);

+    swaps(&stuff->border_top, n);

+    swaps(&stuff->border_right, n);

+    swaps(&stuff->border_bottom, n);

+    return (*ProcRandrVector[stuff->randrReqType]) (client);

+}

+

+static int

+SProcRRSetOutputPrimary (ClientPtr client)

+{

+    int n;

+    REQUEST(xRRSetOutputPrimaryReq);

+

+    REQUEST_SIZE_MATCH(xRRSetOutputPrimaryReq);

+    swaps(&stuff->length, n);

+    swapl(&stuff->window, n);

+    swapl(&stuff->output, n);

+    return ProcRandrVector[stuff->randrReqType](client);

+}

+

+static int

+SProcRRGetOutputPrimary (ClientPtr client)

+{

+    int n;

+    REQUEST(xRRGetOutputPrimaryReq);

+

+    REQUEST_SIZE_MATCH(xRRGetOutputPrimaryReq);

+    swaps(&stuff->length, n);

+    swapl(&stuff->window, n);

+    return ProcRandrVector[stuff->randrReqType](client);

+}

+

+static int

+SProcRRQueryScanoutPixmaps (ClientPtr client)

+{

+    int n;

+    REQUEST(xRRQueryScanoutPixmapsReq);

+

+    REQUEST_SIZE_MATCH(xRRQueryScanoutPixmapsReq);

+    swaps(&stuff->length, n);

+    swapl(&stuff->drawable, n);

+    return ProcRandrVector[stuff->randrReqType](client);

+}

+

+static int

+SProcRRCreateScanoutPixmap (ClientPtr client)

+{

+    int n;

+    REQUEST(xRRCreateScanoutPixmapReq);

+

+    REQUEST_SIZE_MATCH(xRRCreateScanoutPixmapReq);

+    swaps(&stuff->length, n);

+    swapl(&stuff->pid, n);

+    swapl(&stuff->drawable, n);

+    swaps(&stuff->width, n);

+    swaps(&stuff->height, n);

+    swapl(&stuff->format, n);

+    swaps(&stuff->rotations, n);

+    return ProcRandrVector[stuff->randrReqType](client);

+}

+

+static void

+swap_transform(xRenderTransform *t)

+{

+    int n;

+    swapl(&t->matrix11, n);

+    swapl(&t->matrix12, n);

+    swapl(&t->matrix13, n);

+    swapl(&t->matrix21, n);

+    swapl(&t->matrix22, n);

+    swapl(&t->matrix23, n);

+    swapl(&t->matrix31, n);

+    swapl(&t->matrix32, n);

+    swapl(&t->matrix33, n);

+}

+

+static int

+SProcRRSetCrtcSpriteTransform (ClientPtr client)

+{

+    int n;

+    REQUEST(xRRSetCrtcSpriteTransformReq);

+

+    REQUEST_SIZE_MATCH(xRRSetCrtcSpriteTransformReq);

+    swaps(&stuff->length, n);

+    swapl(&stuff->crtc, n);

+    swap_transform(&stuff->positionTransform);

+    swap_transform(&stuff->imageTransform);

+    return ProcRandrVector[stuff->randrReqType](client);

+}

+

+static int

+SProcRRGetCrtcSpriteTransform (ClientPtr client)

+{

+    int n;

+    REQUEST(xRRGetCrtcSpriteTransformReq);

+

+    REQUEST_SIZE_MATCH(xRRGetCrtcSpriteTransformReq);

+    swaps(&stuff->length, n);

+    swapl(&stuff->crtc, n);

+    return ProcRandrVector[stuff->randrReqType](client);

+}

+

+static int

+SProcRRSetCrtcConfigs (ClientPtr client)

+{

+    int n;

+    REQUEST(xRRSetCrtcConfigsReq);

+    int c;

+    int extra_len;

+    int num_configs;

+    int num_output_ids;

+    xRRCrtcConfig *x_configs;

+

+    REQUEST_AT_LEAST_SIZE(xRRSetCrtcConfigsReq);

+    swaps(&stuff->length, n);

+    swapl(&stuff->drawable, n);

+    swaps(&stuff->screenPixmapWidth, n);

+    swaps(&stuff->screenPixmapHeight, n);

+    swaps(&stuff->screenWidth, n);

+    swaps(&stuff->screenHeight, n);

+    swapl(&stuff->widthInMillimeters, n);

+    swapl(&stuff->heightInMillimeters, n);

+    swaps(&stuff->nConfigs, n);

+

+    extra_len = client->req_len - bytes_to_int32(sizeof(xRRSetCrtcConfigsReq));

+

+    num_configs = stuff->nConfigs;

+

+    /* Check request length against number of configs specified */

+    if (num_configs * (sizeof (xRRCrtcConfig) >> 2) > extra_len)

+	return BadLength;

+

+    x_configs = (xRRCrtcConfig *) (stuff + 1);

+    for (c = 0; c < num_configs; c++) {

+	swapl(&x_configs->crtc, n);

+	swaps(&x_configs->x, n);

+	swaps(&x_configs->y, n);

+	swapl(&x_configs->mode, n);

+	swaps(&x_configs->rotation, n);

+	swaps(&x_configs->nOutput, n);

+	swap_transform(&x_configs->spritePositionTransform);

+	swap_transform(&x_configs->spriteImageTransform);

+	swapl(&x_configs->pixmap, n);

+	swaps(&x_configs->xPixmap, n);

+	swaps(&x_configs->yPixmap, n);

+	x_configs++;

+    }

+

+    /* Let the other dispatch function deal with verifying that

+     * the right number of output ids are present, just

+     * swap whatever is here

+     */

+    num_output_ids = extra_len - (num_configs * (sizeof (xRRCrtcConfig)) >> 2);

+    SwapLongs((CARD32 *) x_configs, num_output_ids);

+

+    return ProcRandrVector[stuff->randrReqType](client);

+}

+

+int (*SProcRandrVector[RRNumberRequests])(ClientPtr) = {

+    SProcRRQueryVersion,	/* 0 */

+/* we skip 1 to make old clients fail pretty immediately */

+    NULL,			/* 1 SProcRandrOldGetScreenInfo */

+/* V1.0 apps share the same set screen config request id */

+    SProcRRSetScreenConfig,	/* 2 */

+    NULL,			/* 3 SProcRandrOldScreenChangeSelectInput */

+/* 3 used to be ScreenChangeSelectInput; deprecated */

+    SProcRRSelectInput,		/* 4 */

+    SProcRRGetScreenInfo,    	/* 5 */

+/* V1.2 additions */

+    SProcRRGetScreenSizeRange,	/* 6 */

+    SProcRRSetScreenSize,	/* 7 */

+    SProcRRGetScreenResources,	/* 8 */

+    SProcRRGetOutputInfo,	/* 9 */

+    SProcRRListOutputProperties,/* 10 */

+    SProcRRQueryOutputProperty,	/* 11 */

+    SProcRRConfigureOutputProperty,  /* 12 */

+    SProcRRChangeOutputProperty,/* 13 */

+    SProcRRDeleteOutputProperty,/* 14 */

+    SProcRRGetOutputProperty,	/* 15 */

+    SProcRRCreateMode,		/* 16 */

+    SProcRRDestroyMode,		/* 17 */

+    SProcRRAddOutputMode,	/* 18 */

+    SProcRRDeleteOutputMode,	/* 19 */

+    SProcRRGetCrtcInfo,		/* 20 */

+    SProcRRSetCrtcConfig,	/* 21 */

+    SProcRRGetCrtcGammaSize,	/* 22 */

+    SProcRRGetCrtcGamma,	/* 23 */

+    SProcRRSetCrtcGamma,	/* 24 */

+/* V1.3 additions */

+    SProcRRGetScreenResources,	/* 25 GetScreenResourcesCurrent */

+    SProcRRSetCrtcTransform,	/* 26 */

+    SProcRRGetCrtcTransform,	/* 27 */

+    SProcRRGetPanning,		/* 28 */

+    SProcRRSetPanning,		/* 29 */

+    SProcRRSetOutputPrimary,	/* 30 */

+    SProcRRGetOutputPrimary,	/* 31 */

+/* V1.4 additions */

+    SProcRRQueryScanoutPixmaps,	/* 32 */

+    SProcRRCreateScanoutPixmap,	/* 33 */

+    SProcRRSetCrtcSpriteTransform,/* 34 */

+    SProcRRGetCrtcSpriteTransform,/* 35 */

+    SProcRRSetCrtcConfigs,	/* 36 */

+};

+

diff --git a/xorg-server/randr/rrsprite.c b/xorg-server/randr/rrsprite.c
new file mode 100644
index 000000000..c441e0396
--- /dev/null
+++ b/xorg-server/randr/rrsprite.c
@@ -0,0 +1,104 @@
+/*

+ * Copyright © 2010 Keith Packard

+ *

+ * 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 the copyright holders not be used in advertising or

+ * publicity pertaining to distribution of the software without specific,

+ * written prior permission.  The copyright holders make no representations

+ * about the suitability of this software for any purpose.  It is provided "as

+ * is" without express or implied warranty.

+ *

+ * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO

+ * EVENT SHALL THE COPYRIGHT HOLDERS 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.

+ */

+

+#include "randrstr.h"

+#include "swaprep.h"

+

+void

+RRCrtcSpriteTransformSet(RRCrtcPtr crtc,

+			 PictTransform *position_transform,

+			 PictTransform *image_transform,

+			 struct pict_f_transform *f_position_transform,

+			 struct pict_f_transform *f_image_transform)

+{

+    ScreenPtr			pScreen;

+    rrScrPrivPtr		pScrPriv;

+

+    pScreen = crtc->pScreen;

+    pScrPriv = rrGetScrPriv(pScreen);

+    crtc->client_sprite_position_transform = *position_transform;

+    crtc->client_sprite_image_transform = *image_transform;

+    crtc->client_sprite_f_position_transform = *f_position_transform;

+    crtc->client_sprite_f_image_transform = *f_image_transform;

+    if (pScrPriv->rrSetCrtcSpriteTransform)

+	(*pScrPriv->rrSetCrtcSpriteTransform) (pScreen, crtc,

+					       &crtc->client_sprite_f_position_transform,

+					       &crtc->client_sprite_f_image_transform);

+}

+

+int

+ProcRRSetCrtcSpriteTransform (ClientPtr client)

+{

+    REQUEST(xRRSetCrtcSpriteTransformReq);

+    RRCrtcPtr		    crtc;

+    PictTransform	    position_transform, image_transform;

+    struct pixman_f_transform f_position_transform, f_image_transform;

+

+    REQUEST_AT_LEAST_SIZE(xRRSetCrtcSpriteTransformReq);

+    VERIFY_RR_CRTC(stuff->crtc, crtc, DixReadAccess);

+

+    PictTransform_from_xRenderTransform (&position_transform, &stuff->positionTransform);

+    PictTransform_from_xRenderTransform (&image_transform, &stuff->imageTransform);

+    pixman_f_transform_from_pixman_transform (&f_position_transform, &position_transform);

+    pixman_f_transform_from_pixman_transform (&f_image_transform, &image_transform);

+

+    RRCrtcSpriteTransformSet (crtc, &position_transform, &image_transform,

+			      &f_position_transform, &f_image_transform);

+    return Success;

+}

+

+#define CrtcSpriteTransformExtra	(SIZEOF(xRRGetCrtcSpriteTransformReply) - 32)

+

+int

+ProcRRGetCrtcSpriteTransform (ClientPtr client)

+{

+    REQUEST(xRRGetCrtcSpriteTransformReq);

+    xRRGetCrtcSpriteTransformReply	*reply;

+    RRCrtcPtr			crtc;

+    int				n;

+    char			*extra;

+

+    REQUEST_SIZE_MATCH (xRRGetCrtcSpriteTransformReq);

+    VERIFY_RR_CRTC(stuff->crtc, crtc, DixReadAccess);

+

+    reply = malloc(sizeof (xRRGetCrtcSpriteTransformReply));

+    if (!reply)

+	return BadAlloc;

+

+    extra = (char *) (reply + 1);

+    reply->type = X_Reply;

+    reply->sequenceNumber = client->sequence;

+    reply->length = bytes_to_int32(CrtcSpriteTransformExtra);

+

+    xRenderTransform_from_PictTransform(&reply->positionTransform, &crtc->client_sprite_position_transform);

+    xRenderTransform_from_PictTransform(&reply->imageTransform, &crtc->client_sprite_image_transform);

+

+    if (client->swapped) {

+	swaps (&reply->sequenceNumber, n);

+	swapl (&reply->length, n);

+	SwapLongs((CARD32 *) &reply->positionTransform, bytes_to_int32(sizeof(xRenderTransform)));

+	SwapLongs((CARD32 *) &reply->imageTransform, bytes_to_int32(sizeof(xRenderTransform)));

+    }

+    WriteToClient (client, sizeof (xRRGetCrtcSpriteTransformReply), (char *) reply);

+    free(reply);

+    return Success;

+}

diff --git a/xorg-server/randr/rrtransform.c b/xorg-server/randr/rrtransform.c
index 102a0f48e..f78d5f913 100644
--- a/xorg-server/randr/rrtransform.c
+++ b/xorg-server/randr/rrtransform.c
@@ -134,6 +134,24 @@ RRTransformRescale(struct pixman_f_transform *f_transform, double limit)
 	    f_transform->m[j][i] *= scale;

 }

 

+#define EPSILON (1e-20)

+#define IS_F_SAME(a,b)	(fabs((a)-(b)) < EPSILON)

+#define IS_F_ZERO(a)	(fabs(a) < EPSILON)

+

+static Bool

+pict_f_transform_is_identity (const struct pixman_f_transform *t)

+{

+    return (IS_F_SAME (t->m[0][0], t->m[1][1]) &&

+	    IS_F_SAME (t->m[0][0], t->m[2][2]) &&

+	    !IS_F_ZERO (t->m[0][0]) &&

+	    IS_F_ZERO (t->m[0][1]) &&

+	    IS_F_ZERO (t->m[0][2]) &&

+	    IS_F_ZERO (t->m[1][0]) &&

+	    IS_F_ZERO (t->m[1][2]) &&

+	    IS_F_ZERO (t->m[2][0]) &&

+	    IS_F_ZERO (t->m[2][1]));

+}

+

 /*

  * Compute the complete transformation matrix including

  * client-specified transform, rotation/reflection values and the crtc 

@@ -148,23 +166,39 @@ RRTransformCompute (int			    x,
 		    int			    height,

 		    Rotation		    rotation,

 		    RRTransformPtr	    rr_transform,

+		    struct pixman_f_transform *sprite_position_transform,

+		    struct pixman_f_transform *sprite_image_transform,

 

 		    PictTransformPtr	    transform,

 		    struct pixman_f_transform *f_transform,

-		    struct pixman_f_transform *f_inverse)

+		    struct pixman_f_transform *f_inverse,

+		    struct pixman_f_transform *f_fb_to_sprite,

+		    struct pixman_f_transform *f_sprite_to_image,

+		    Bool		      *sprite_transform_in_use)

 {

     PictTransform	    t_transform, inverse;

     struct pixman_f_transform tf_transform, tf_inverse;

+    struct pixman_f_transform sf_position_transform, sf_image_transform;

+    struct pixman_f_transform f_image_to_sprite;

     Bool		    overflow = FALSE;

+    Bool		    ret = TRUE;

 

     if (!transform) transform = &t_transform;

     if (!f_transform) f_transform = &tf_transform;

     if (!f_inverse) f_inverse = &tf_inverse;

+    if (!f_fb_to_sprite) f_fb_to_sprite = &sf_position_transform;

+    if (!f_sprite_to_image) f_sprite_to_image = &sf_image_transform;

+

+    /* invert the sprite image transform to have it go from dest to source */

+    if (!pixman_f_transform_invert (&f_image_to_sprite, f_sprite_to_image))

+	pixman_f_transform_init_identity(&f_image_to_sprite);

 

     pixman_transform_init_identity (transform);

     pixman_transform_init_identity (&inverse);

     pixman_f_transform_init_identity (f_transform);

     pixman_f_transform_init_identity (f_inverse);

+    pixman_f_transform_init_identity (f_fb_to_sprite);

+    pixman_f_transform_init_identity (f_sprite_to_image);

     if (rotation != RR_Rotate_0)

     {

 	double	f_rot_cos, f_rot_sin, f_rot_dx, f_rot_dy;

@@ -246,7 +280,14 @@ RRTransformCompute (int			    x,
 	pixman_f_transform_translate (f_transform, f_inverse, f_scale_dx, f_scale_dy);

     }

     

-#ifdef RANDR_12_INTERFACE

+    /*

+     * Sprite position is affected by the transform matrix,

+     * but the image is not

+     */

+    pixman_f_transform_multiply(f_sprite_to_image,

+				f_transform,

+				&f_image_to_sprite);

+

     if (rr_transform)

     {

         if (!pixman_transform_multiply (transform, &rr_transform->transform, transform))

@@ -254,7 +295,7 @@ RRTransformCompute (int			    x,
 	pixman_f_transform_multiply (f_transform, &rr_transform->f_transform, f_transform);

 	pixman_f_transform_multiply (f_inverse, f_inverse, &rr_transform->f_inverse);

     }

-#endif

+

     /*

      * Compute the class of the resulting transform

      */

@@ -264,7 +305,7 @@ RRTransformCompute (int			    x,
 

 	pixman_f_transform_init_translate (f_transform,  x,  y);

 	pixman_f_transform_init_translate (f_inverse,   -x, -y);

-	return FALSE;

+	ret = FALSE;

     }

     else

     {

@@ -278,6 +319,19 @@ RRTransformCompute (int			    x,
 	    RRTransformRescale(&f_scaled, 16384.0);

 	    pixman_transform_from_pixman_f_transform(transform, &f_scaled);

 	}

-	return TRUE;

+	ret = TRUE;

     }

+

+    /*

+     * Sprite position is affected by the transform matrix,

+     * but the image is not

+     */

+    pixman_f_transform_multiply(f_fb_to_sprite,

+				f_inverse,

+				sprite_position_transform);

+    if (sprite_transform_in_use)

+	*sprite_transform_in_use = ret || !pict_f_transform_is_identity(f_fb_to_sprite);

+    return ret;

 }

+

+

diff --git a/xorg-server/randr/rrtransform.h b/xorg-server/randr/rrtransform.h
index 561762dfe..eaced0d3e 100644
--- a/xorg-server/randr/rrtransform.h
+++ b/xorg-server/randr/rrtransform.h
@@ -1,75 +1,86 @@
-/*
- * Copyright © 2007 Keith Packard
- *
- * 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 the copyright holders not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission.  The copyright holders make no representations
- * about the suitability of this software for any purpose.  It is provided "as
- * is" without express or implied warranty.
- *
- * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL THE COPYRIGHT HOLDERS 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.
- */
-
-#ifndef _RRTRANSFORM_H_
-#define _RRTRANSFORM_H_
-
-#include <X11/extensions/randr.h>
-#include "picturestr.h"
-
-typedef struct _rrTransform	RRTransformRec, *RRTransformPtr;
-
-struct _rrTransform {
-    PictTransform   transform;
-    struct pict_f_transform f_transform;
-    struct pict_f_transform f_inverse;
-    PictFilterPtr   filter;
-    xFixed	    *params;
-    int		    nparams;
-    int		    width;
-    int		    height;
-};
-
-extern _X_EXPORT void
-RRTransformInit (RRTransformPtr transform);
-
-extern _X_EXPORT void
-RRTransformFini (RRTransformPtr transform);
-
-extern _X_EXPORT Bool
-RRTransformEqual (RRTransformPtr a, RRTransformPtr b);
-
-extern _X_EXPORT Bool
-RRTransformSetFilter (RRTransformPtr	dst,
-		      PictFilterPtr	filter,
-		      xFixed		*params,
-		      int		nparams,
-		      int		width,
-		      int		height);
-
-extern _X_EXPORT Bool
-RRTransformCopy (RRTransformPtr dst, RRTransformPtr src);
-
-extern _X_EXPORT Bool
-RRTransformCompute (int			    x,
-		    int			    y,
-		    int			    width,
-		    int			    height,
-		    Rotation		    rotation,
-		    RRTransformPtr	    rr_transform,
-
-		    PictTransformPtr	    transform,
-		    struct pict_f_transform *f_transform,
-		    struct pict_f_transform *f_inverse);
-
-
-#endif /* _RRTRANSFORM_H_ */
+/*

+ * Copyright © 2007 Keith Packard

+ *

+ * 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 the copyright holders not be used in advertising or

+ * publicity pertaining to distribution of the software without specific,

+ * written prior permission.  The copyright holders make no representations

+ * about the suitability of this software for any purpose.  It is provided "as

+ * is" without express or implied warranty.

+ *

+ * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO

+ * EVENT SHALL THE COPYRIGHT HOLDERS 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.

+ */

+

+#ifndef _RRTRANSFORM_H_

+#define _RRTRANSFORM_H_

+

+#include <X11/extensions/randr.h>

+#include "picturestr.h"

+

+typedef struct _rrTransform	RRTransformRec, *RRTransformPtr;

+

+struct _rrTransform {

+    PictTransform   transform;

+    struct pict_f_transform f_transform;

+    struct pict_f_transform f_inverse;

+    PictFilterPtr   filter;

+    xFixed	    *params;

+    int		    nparams;

+    int		    width;

+    int		    height;

+};

+

+extern _X_EXPORT void

+RRTransformInit (RRTransformPtr transform);

+

+extern _X_EXPORT void

+RRTransformFini (RRTransformPtr transform);

+

+extern _X_EXPORT Bool

+RRTransformEqual (RRTransformPtr a, RRTransformPtr b);

+

+extern _X_EXPORT Bool

+RRTransformSetFilter (RRTransformPtr	dst,

+		      PictFilterPtr	filter,

+		      xFixed		*params,

+		      int		nparams,

+		      int		width,

+		      int		height);

+

+extern _X_EXPORT Bool

+RRTransformCopy (RRTransformPtr dst, RRTransformPtr src);

+

+/*

+ * Compute the complete transformation matrix including

+ * client-specified transform, rotation/reflection values and the crtc

+ * offset.

+ *

+ * Return TRUE if the resulting transform is not a simple translation.

+ */

+extern _X_EXPORT Bool

+RRTransformCompute (int			    x,

+		    int			    y,

+		    int			    width,

+		    int			    height,

+		    Rotation		    rotation,

+		    RRTransformPtr	    rr_transform,

+		    struct pict_f_transform *sprite_position_transform,

+		    struct pict_f_transform *sprite_image_transform,

+

+		    PictTransformPtr	    transform,

+		    struct pict_f_transform *f_transform,

+		    struct pict_f_transform *f_inverse,

+		    struct pict_f_transform *f_fb_to_sprite,

+		    struct pict_f_transform *f_sprite_to_image,

+		    Bool		    *sprite_transform_in_use);

+

+#endif /* _RRTRANSFORM_H_ */

diff --git a/xorg-server/render/render.c b/xorg-server/render/render.c
index 623d5db33..a9cbfef8b 100644
--- a/xorg-server/render/render.c
+++ b/xorg-server/render/render.c
@@ -2552,8 +2552,8 @@ static void swapStops(void *stuff, int num)
     }

     colors = (CARD16 *)(stops);

     for (i = 0; i < 4*num; ++i) {

-        swaps(stops, n);

-        ++stops;

+        swaps(colors, n);

+        ++colors;

     }

 }