diff options
Diffstat (limited to 'lib/libXi')
56 files changed, 1105 insertions, 822 deletions
diff --git a/lib/libXi/COPYING b/lib/libXi/COPYING index 3b8f4fd6a..7423b2f45 100644 --- a/lib/libXi/COPYING +++ b/lib/libXi/COPYING @@ -82,3 +82,24 @@ 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 © 2009 Red Hat, Inc. + +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the "Software"), +to deal in the Software without restriction, including without limitation +the rights to use, copy, modify, merge, publish, distribute, sublicense, +and/or sell copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice (including the next +paragraph) shall be included in all copies or substantial portions of the +Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +DEALINGS IN THE SOFTWARE. diff --git a/lib/libXi/ChangeLog b/lib/libXi/ChangeLog index 9ea6b0957..052b6d5fa 100644 --- a/lib/libXi/ChangeLog +++ b/lib/libXi/ChangeLog @@ -177,6 +177,185 @@ Date: Tue Oct 27 15:07:25 2009 -0400 future changes. (cherry picked from commit 847b72d9de8dd839c391321b50312368e63e7305) +commit 8e44e907f5715705c1c69e7ee79615dbd0aa24ab +Author: Peter Hutterer <peter.hutterer@who-t.net> +Date: Wed Aug 4 07:58:15 2010 +1000 + + libXi 1.3.2 + + Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> + +commit 24da86e6a0a0f6753f943c998f53b225f5d24b02 +Author: Peter Hutterer <peter.hutterer@who-t.net> +Date: Mon Aug 2 15:35:46 2010 +1000 + + Fix broken cherry-pick for doctools check. + + Cherry-pick d7d8a9e4fc37ab0f865e74ea1871617a3b542906 conflict resolve was + broken. Test was inverted, reports "not found" when found and the other way + round. + + Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> + Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com> + Tested-by: Jeremy Huddleston <jeremyhu@apple.com> + Tested-by: Gaetan Nadon <gaetan.nadon@videotron.ca> + +commit 41c7b9513342c10c2a5ad17fa2cde7c2aa91042b +Author: Peter Hutterer <peter.hutterer@who-t.net> +Date: Mon Aug 2 09:58:16 2010 +1000 + + libXi 1.3.1 + + Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> + +commit b764411d074f0379810b7e921473504b539cfdf3 +Author: Pauli Nieminen <ext-pauli.nieminen@nokia.com> +Date: Fri Jun 18 11:32:36 2010 +0300 + + Always unlock display correctly + + XISelectEvents and XIGetSelectedEvents were not unlocking display in all + return paths. + + Reported-by: Julien Cristau <jcristau@debian.org> + Signed-off-by: Pauli Nieminen <ext-pauli.nieminen@nokia.com> + (cherry picked from commit 8daf961d0fe6a1433c8248d984618a7e22ff88b8) + +commit e116a06d5964e51623d68c329119be87d3ce8ab0 +Author: Pauli Nieminen <ext-pauli.nieminen@nokia.com> +Date: Mon Jun 14 10:05:36 2010 +0300 + + Fix memory leak in XIGetSelectedEvents + + mask_in was leaking for every successfull XIGetSelectedEvents. + + Signed-off-by: Pauli Nieminen <ext-pauli.nieminen@nokia.com> + Reviewed-by: Julien Cristau <jcristau@debian.org> + (cherry picked from commit b953bf7b9775e5970776a21ae3f7919592289c92) + +commit e2a82e587b528e2d1b352ee89d9f0b4ad5450f0a +Author: Pauli Nieminen <ext-pauli.nieminen@nokia.com> +Date: Fri Jun 11 17:30:44 2010 +0300 + + Fix usage of uninitialized value + + In error case length of extra data could be uninitialized. This would + result randomly sized request later in function. + + Signed-off-by: Pauli Nieminen <ext-pauli.nieminen@nokia.com> + Reviewed-by: Julien Cristau <jcristau@debian.org> + (cherry picked from commit 6199f89992e2b6ba5f96833f4f4087b61ca61ac5) + +commit 9ab5ba3eabc58f5154b25f4f1de631c2fdaec3ce +Author: Jamey Sharp <jamey@minilop.net> +Date: Fri Apr 9 17:31:00 2010 -0700 + + Don't unlock the Display twice. + + _xiQueryVersion's caller must wrap it in a LockDisplay/UnlockDisplay + pair, so it shouldn't call UnlockDisplay itself. + + Signed-off-by: Jamey Sharp <jamey@minilop.net> + (cherry picked from commit 54fbe5759aa961dccc618b35573845f847675570) + +commit 87b6e5822532f63b63dc926cbf6788726b83812d +Author: Peter Hutterer <peter.hutterer@who-t.net> +Date: Wed Dec 9 13:59:57 2009 +1000 + + Initialize extension with the right number of events. + + If the server supports a lower XI version than the client, the Xlib-internal + event vector may be smashed. See libXext for more details. + http://cgit.freedesktop.org/xorg/lib/libXext/commit/?id=83fdb27df4ddc2fb088ddf2ec65f0db6b7c57287 + + This patch queries the server for the supported XI extension before + registering the extension with Xlib. The number of events registered depends + on the server version. + + Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> + Reviewed-by: Julien Cristau <jcristau@debian.org> + (cherry picked from commit 299de21b2ab3cfa2078823215f84da67e7b3d1a3) + +commit 7b3e496d17b85fd2ec245194376628263ce31cab +Author: Peter Hutterer <peter.hutterer@who-t.net> +Date: Thu Feb 18 16:52:12 2010 +1000 + + man: fix types for XGetSelectedExtensionEvents. + + The return values are of type XEventClass** and int*, respectively. + + Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> + Reviewed-by: Dan Nicholson <dbn.lists@gmail.com> + (cherry picked from commit d7e421f97db74332783ae885f6835f84133c92b5) + +commit d7d8a9e4fc37ab0f865e74ea1871617a3b542906 +Author: Peter Hutterer <peter.hutterer@who-t.net> +Date: Mon Aug 2 10:03:56 2010 +1000 + + Need both xmlto and asciidoc to install man pages from a checkout + + The check for whether to build the pages looked for both xmlto and + asciidoc, but the check to install didn't. Refactor a bit so that the + check is done only once. + + Signed-off-by: Dan Nicholson <dbn.lists@gmail.com> + Tested-by: Gaetan Nadon <memsize@videotron.ca> + Tested-by: Christian Hartmann <cornogle@googlemail.com> + (cherry picked from commit b75b8fa4bda0fb18872fa82a04fe7f609a147f8b) + + Conflicts: + + configure.ac + +commit 4e42d40e282e0977d8df882c49e1602740d3d79f +Author: Gaetan Nadon <memsize@videotron.ca> +Date: Sat Jan 23 10:04:38 2010 -0500 + + man: allow installing prebuilt man pages from tarball + + The man pages source may be supplied in the tarball or built + from git. The makefile needs to take that into consideration + and adjust the targets accordingly. + + Reviewed-by: Dan Nicholson <dbn.lists@gmail.com> + Signed-off-by: Gaetan Nadon <memsize@videotron.ca> + (cherry picked from commit c183e15263787af913bf8eb7be707e0f2e974824) + +commit 08775f43d3dc288ff2ce5eda5adad24ee2ccad84 +Author: Gaetan Nadon <memsize@videotron.ca> +Date: Thu Jan 14 09:22:08 2010 -0500 + + COPYING: add missing copyright notice + + Refer to: XiAllowEvents.c + Copyright © 2009 Red Hat, Inc. + + Signed-off-by: Gaetan Nadon <memsize@videotron.ca> + (cherry picked from commit bb07265cfbd919de4903dadbfe42d1779c20225c) + +commit c6f447477a0a8d2d6fcea24b5850f25f11ec7c9b +Author: Gaetan Nadon <memsize@videotron.ca> +Date: Wed Oct 28 14:09:10 2009 -0400 + + INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206 + + Add missing INSTALL file. Use standard GNU file on building tarball + README may have been updated + Remove AUTHORS file as it is empty and no content available yet. + Remove NEWS file as it is empty and no content available yet. + (cherry picked from commit d157e3b4ac31710fb1d4d62f1cc4fa743ec61522) + +commit 456ee0853b03ea9ec34d390eb39247e1c06d89e9 +Author: Gaetan Nadon <memsize@videotron.ca> +Date: Tue Oct 27 15:07:25 2009 -0400 + + Deploy the new XORG_DEFAULT_OPTIONS #24242 + + This macro aggregate a number of existing macros that sets commmon + X.Org components configuration options. It shields the configuration file from + future changes. + (cherry picked from commit 847b72d9de8dd839c391321b50312368e63e7305) + commit 63621888d6e36a2f9e41e81c14728d70beeff5ee Author: Peter Hutterer <peter.hutterer@who-t.net> Date: Fri Oct 2 12:09:17 2009 +1000 diff --git a/lib/libXi/Makefile.am b/lib/libXi/Makefile.am index b78d03297..9f52a74f3 100644 --- a/lib/libXi/Makefile.am +++ b/lib/libXi/Makefile.am @@ -7,9 +7,12 @@ EXTRA_DIST = xi.pc.in ChangeLog CLEANFILES = ChangeLog -.PHONY: ChangeLog +.PHONY: ChangeLog INSTALL + +INSTALL: + $(INSTALL_CMD) ChangeLog: $(CHANGELOG_CMD) -dist-hook: ChangeLog +dist-hook: ChangeLog INSTALL diff --git a/lib/libXi/Makefile.in b/lib/libXi/Makefile.in index b836e0e6d..2935b153c 100644 --- a/lib/libXi/Makefile.in +++ b/lib/libXi/Makefile.in @@ -38,7 +38,7 @@ build_triplet = @build@ host_triplet = @host@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(srcdir)/xi.pc.in \ - $(top_srcdir)/configure AUTHORS COPYING ChangeLog NEWS \ + $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \ config.guess config.sub depcomp install-sh ltmain.sh missing subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -124,14 +124,12 @@ FFLAGS = @FFLAGS@ FILE_MAN_DIR = @FILE_MAN_DIR@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ GREP = @GREP@ -HAVE_ASCIIDOC_FALSE = @HAVE_ASCIIDOC_FALSE@ -HAVE_ASCIIDOC_TRUE = @HAVE_ASCIIDOC_TRUE@ HAVE_DOCTOOLS_FALSE = @HAVE_DOCTOOLS_FALSE@ HAVE_DOCTOOLS_TRUE = @HAVE_DOCTOOLS_TRUE@ -HAVE_XMLTO_FALSE = @HAVE_XMLTO_FALSE@ -HAVE_XMLTO_TRUE = @HAVE_XMLTO_TRUE@ INSTALL_CMD = @INSTALL_CMD@ INSTALL_DATA = @INSTALL_DATA@ +INSTALL_MANPAGES_FALSE = @INSTALL_MANPAGES_FALSE@ +INSTALL_MANPAGES_TRUE = @INSTALL_MANPAGES_TRUE@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ @@ -148,6 +146,7 @@ MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@ +MAN_SUBSTS = @MAN_SUBSTS@ MISC_MAN_DIR = @MISC_MAN_DIR@ MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@ NMEDIT = @NMEDIT@ @@ -170,6 +169,7 @@ XI_CFLAGS = @XI_CFLAGS@ XI_LIBS = @XI_LIBS@ XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@ XMLTO = @XMLTO@ +XORG_MAN_PAGE = @XORG_MAN_PAGE@ XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ @@ -668,12 +668,15 @@ uninstall-info: uninstall-info-recursive uninstall-pkgconfigDATA -.PHONY: ChangeLog +.PHONY: ChangeLog INSTALL + +INSTALL: + $(INSTALL_CMD) ChangeLog: $(CHANGELOG_CMD) -dist-hook: ChangeLog +dist-hook: ChangeLog INSTALL # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/lib/libXi/aclocal.m4 b/lib/libXi/aclocal.m4 index d0447035a..b77d3cf83 100644 --- a/lib/libXi/aclocal.m4 +++ b/lib/libXi/aclocal.m4 @@ -7670,7 +7670,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.7.0]) +m4_define([vers_have], [1.10.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,, @@ -7738,9 +7738,12 @@ AC_SUBST(RAWCPPFLAGS) # on this OS - replaces *ManSuffix settings in old Imake *.cf per-os files. # Not sure if there's any better way than just hardcoding by OS name. # Override default settings by setting environment variables +# Added MAN_SUBSTS in version 1.8 +# Added AC_PROG_SED in version 1.8 AC_DEFUN([XORG_MANPAGE_SECTIONS],[ AC_REQUIRE([AC_CANONICAL_HOST]) +AC_REQUIRE([AC_PROG_SED]) if test x$APP_MAN_SUFFIX = x ; then APP_MAN_SUFFIX=1 @@ -7809,31 +7812,57 @@ AC_SUBST([FILE_MAN_DIR]) AC_SUBST([MISC_MAN_DIR]) AC_SUBST([DRIVER_MAN_DIR]) AC_SUBST([ADMIN_MAN_DIR]) + +XORG_MAN_PAGE="X Version 11" +AC_SUBST([XORG_MAN_PAGE]) +MAN_SUBSTS="\ + -e 's|__vendorversion__|\"\$(PACKAGE_STRING)\" \"\$(XORG_MAN_PAGE)\"|' \ + -e 's|__xorgversion__|\"\$(PACKAGE_STRING)\" \"\$(XORG_MAN_PAGE)\"|' \ + -e 's|__xservername__|Xorg|g' \ + -e 's|__xconfigfile__|xorg.conf|g' \ + -e 's|__projectroot__|\$(prefix)|g' \ + -e 's|__appmansuffix__|\$(APP_MAN_SUFFIX)|g' \ + -e 's|__drivermansuffix__|\$(DRIVER_MAN_SUFFIX)|g' \ + -e 's|__adminmansuffix__|\$(ADMIN_MAN_SUFFIX)|g' \ + -e 's|__libmansuffix__|\$(LIB_MAN_SUFFIX)|g' \ + -e 's|__miscmansuffix__|\$(MISC_MAN_SUFFIX)|g' \ + -e 's|__filemansuffix__|\$(FILE_MAN_SUFFIX)|g'" +AC_SUBST([MAN_SUBSTS]) + ]) # XORG_MANPAGE_SECTIONS -# XORG_CHECK_SGML_DOCTOOLS +# XORG_CHECK_SGML_DOCTOOLS([MIN-VERSION]) # ------------------------ # Minimum version: 1.7.0 # # Defines the variable XORG_SGML_PATH containing the location of X11/defs.ent # provided by xorg-sgml-doctools, if installed. AC_DEFUN([XORG_CHECK_SGML_DOCTOOLS],[ -AC_MSG_CHECKING([for X.Org SGML entities]) +AC_MSG_CHECKING([for X.Org SGML entities m4_ifval([$1],[>= $1])]) XORG_SGML_PATH= -PKG_CHECK_EXISTS([xorg-sgml-doctools], +PKG_CHECK_EXISTS([xorg-sgml-doctools m4_ifval([$1],[>= $1])], [XORG_SGML_PATH=`$PKG_CONFIG --variable=sgmlrootdir xorg-sgml-doctools`], - [if test x"$cross_compiling" != x"yes" ; then - AC_CHECK_FILE([$prefix/share/sgml/X11/defs.ent], - [XORG_SGML_PATH=$prefix/share/sgml]) - fi]) + [m4_ifval([$1],[:], + [if test x"$cross_compiling" != x"yes" ; then + AC_CHECK_FILE([$prefix/share/sgml/X11/defs.ent], + [XORG_SGML_PATH=$prefix/share/sgml]) + 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 @@ -7846,9 +7875,9 @@ AC_SUBST(XORG_SGML_PATH) # with the AM_CONDITIONAL "BUILD_LINUXDOC" AC_DEFUN([XORG_CHECK_LINUXDOC],[ AC_REQUIRE([XORG_CHECK_SGML_DOCTOOLS]) +AC_REQUIRE([XORG_WITH_PS2PDF]) AC_PATH_PROG(LINUXDOC, linuxdoc) -AC_PATH_PROG(PS2PDF, ps2pdf) AC_MSG_CHECKING([whether to build documentation]) @@ -7864,7 +7893,7 @@ AC_MSG_RESULT([$BUILDDOC]) AC_MSG_CHECKING([whether to build pdf documentation]) -if test x$PS2PDF != x && test x$BUILD_PDFDOC != xno; then +if test x$have_ps2pdf != xno && test x$BUILD_PDFDOC != xno; then BUILDPDFDOC=yes else BUILDPDFDOC=no @@ -7874,7 +7903,7 @@ AM_CONDITIONAL(BUILD_PDFDOC, [test x$BUILDPDFDOC = xyes]) AC_MSG_RESULT([$BUILDPDFDOC]) -MAKE_TEXT="SGML_SEARCH_PATH=$XORG_SGML_PATH GROFF_NO_SGR=y $LINUXDOC -B txt" +MAKE_TEXT="SGML_SEARCH_PATH=$XORG_SGML_PATH GROFF_NO_SGR=y $LINUXDOC -B txt -f" MAKE_PS="SGML_SEARCH_PATH=$XORG_SGML_PATH $LINUXDOC -B latex --papersize=letter --output=ps" MAKE_PDF="$PS2PDF" MAKE_HTML="SGML_SEARCH_PATH=$XORG_SGML_PATH $LINUXDOC -B html --split=0" @@ -7966,6 +7995,10 @@ 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],[ @@ -7997,6 +8030,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 @@ -8011,6 +8046,17 @@ 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 @@ -8163,6 +8209,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 @@ -8202,6 +8254,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]) @@ -8219,9 +8272,25 @@ 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 @@ -8486,38 +8555,69 @@ AC_SUBST([XTMALLOC_ZERO_CFLAGS]) # ---------------- # Minimum version: 1.1.0 # -# Sets up flags for source checkers such as lint and sparse if --with-lint -# is specified. (Use --with-lint=sparse for sparse.) -# Sets $LINT to name of source checker passed with --with-lint (default: lint) -# Sets $LINT_FLAGS to flags to pass to source checker -# Sets LINT automake conditional if enabled (default: disabled) +# This macro enables the use of a tool that flags some suspicious and +# non-portable constructs (likely to be bugs) in C language source code. +# It will attempt to locate the tool and use appropriate options. +# There are various lint type tools on different platforms. +# +# Interface to module: +# LINT: returns the path to the tool found on the platform +# or the value set to LINT on the configure cmd line +# also an Automake conditional +# LINT_FLAGS: an Automake variable with appropriate flags +# +# --with-lint: 'yes' user instructs the module to use lint +# 'no' user instructs the module not to use lint (default) +# +# If the user sets the value of LINT, AC_PATH_PROG skips testing the path. +# If the user sets the value of LINT_FLAGS, they are used verbatim. # AC_DEFUN([XORG_WITH_LINT],[ -# Allow checking code with lint, sparse, etc. +AC_ARG_VAR([LINT], [Path to a lint-style command]) +AC_ARG_VAR([LINT_FLAGS], [Flags for the lint-style command]) AC_ARG_WITH(lint, [AS_HELP_STRING([--with-lint], [Use a lint-style source code checker (default: disabled)])], [use_lint=$withval], [use_lint=no]) -if test "x$use_lint" = "xyes" ; then - LINT="lint" + +# Obtain platform specific info like program name and options +# The lint program on FreeBSD and NetBSD is different from the one on Solaris +case $host_os in + *linux* | *openbsd* | kfreebsd*-gnu | darwin* | cygwin*) + lint_name=splint + lint_options="-badflag" + ;; + *freebsd* | *netbsd*) + lint_name=lint + lint_options="-u -b" + ;; + *solaris*) + lint_name=lint + lint_options="-u -b -h -erroff=E_INDISTING_FROM_TRUNC2" + ;; +esac + +# Test for the presence of the program (either guessed by the code or spelled out by the user) +if test "x$use_lint" = x"yes" ; then + AC_PATH_PROG([LINT], [$lint_name]) + if test "x$LINT" = "x"; then + AC_MSG_ERROR([--with-lint=yes specified but lint-style tool not found in PATH]) + fi +elif test "x$use_lint" = x"no" ; then + if test "x$LINT" != "x"; then + AC_MSG_WARN([ignoring LINT environment variable since --with-lint=no was specified]) + fi else - LINT="$use_lint" + AC_MSG_ERROR([--with-lint expects 'yes' or 'no'. Use LINT variable to specify path.]) fi -if test "x$LINT_FLAGS" = "x" -a "x$LINT" != "xno" ; then - case $LINT in - lint|*/lint) - case $host_os in - solaris*) - LINT_FLAGS="-u -b -h -erroff=E_INDISTING_FROM_TRUNC2" - ;; - esac - ;; - esac + +# User supplied flags override default flags +if test "x$LINT_FLAGS" != "x"; then + lint_options=$LINT_FLAGS fi -AC_SUBST(LINT) -AC_SUBST(LINT_FLAGS) -AM_CONDITIONAL(LINT, [test x$LINT != xno]) +AC_SUBST([LINT_FLAGS],[$lint_options]) +AM_CONDITIONAL(LINT, [test "x$LINT" != x]) ]) # XORG_WITH_LINT @@ -8527,28 +8627,29 @@ AM_CONDITIONAL(LINT, [test x$LINT != xno]) # # Sets up flags for building lint libraries for checking programs that call # functions in the library. -# Disabled by default, enable with --enable-lint-library -# Sets: -# @LINTLIB@ - name of lint library file to make -# MAKE_LINT_LIB - automake conditional # +# Interface to module: +# LINTLIB - Automake variable with the name of lint library file to make +# MAKE_LINT_LIB - Automake conditional +# +# --enable-lint-library: - 'yes' user instructs the module to created a lint library +# - 'no' user instructs the module not to create a lint library (default) AC_DEFUN([XORG_LINT_LIBRARY],[ AC_REQUIRE([XORG_WITH_LINT]) -# Build lint "library" for more indepth checks of programs calling this library AC_ARG_ENABLE(lint-library, [AS_HELP_STRING([--enable-lint-library], [Create lint library (default: disabled)])], [make_lint_lib=$enableval], [make_lint_lib=no]) -if test "x$make_lint_lib" != "xno" ; then - if test "x$LINT" = "xno" ; then - AC_MSG_ERROR([Cannot make lint library without --with-lint]) - fi - if test "x$make_lint_lib" = "xyes" ; then - LINTLIB=llib-l$1.ln - else - LINTLIB=$make_lint_lib - fi + +if test "x$make_lint_lib" = x"yes" ; then + LINTLIB=llib-l$1.ln + if test "x$LINT" = "x"; then + AC_MSG_ERROR([Cannot make lint library without --with-lint]) + fi +elif test "x$make_lint_lib" != x"no" ; then + AC_MSG_ERROR([--enable-lint-library expects 'yes' or 'no'.]) fi + AC_SUBST(LINTLIB) AM_CONDITIONAL(MAKE_LINT_LIB, [test x$make_lint_lib != xno]) @@ -8561,7 +8662,7 @@ AM_CONDITIONAL(MAKE_LINT_LIB, [test x$make_lint_lib != xno]) # Defines CWARNFLAGS to enable C compiler warnings. # AC_DEFUN([XORG_CWARNFLAGS], [ -AC_REQUIRE([AC_PROG_CC]) +AC_REQUIRE([AC_PROG_CC_C99]) if test "x$GCC" = xyes ; then CWARNFLAGS="-Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes \ -Wmissing-declarations -Wnested-externs -fno-strict-aliasing \ @@ -8586,7 +8687,7 @@ AC_SUBST(CWARNFLAGS) # # Add configure option to enable strict compilation AC_DEFUN([XORG_STRICT_OPTION], [ -AC_REQUIRE([AC_PROG_CC]) +# If the module's configure.ac calls AC_PROG_CC later on, CC gets set to C89 AC_REQUIRE([AC_PROG_CC_C99]) AC_REQUIRE([XORG_CWARNFLAGS]) @@ -8616,6 +8717,7 @@ AC_SUBST([CWARNFLAGS]) # Defines default options for X.Org modules. # AC_DEFUN([XORG_DEFAULT_OPTIONS], [ +AC_REQUIRE([AC_PROG_INSTALL]) XORG_CWARNFLAGS XORG_STRICT_OPTION XORG_RELEASE_VERSION @@ -8669,22 +8771,9 @@ dnl # XORG_RELEASE_VERSION # -------------------- -# Adds --with/without-release-string and changes the PACKAGE and -# PACKAGE_TARNAME to use "$PACKAGE{_TARNAME}-$RELEASE_VERSION". If -# no option is given, PACKAGE and PACKAGE_TARNAME are unchanged. Also -# defines PACKAGE_VERSION_{MAJOR,MINOR,PATCHLEVEL} for modules to use. +# Defines PACKAGE_VERSION_{MAJOR,MINOR,PATCHLEVEL} for modules to use. AC_DEFUN([XORG_RELEASE_VERSION],[ - AC_ARG_WITH(release-version, - AS_HELP_STRING([--with-release-version=STRING], - [Use release version string in package name]), - [RELEASE_VERSION="$withval"], - [RELEASE_VERSION=""]) - if test "x$RELEASE_VERSION" != "x"; then - PACKAGE="$PACKAGE-$RELEASE_VERSION" - PACKAGE_TARNAME="$PACKAGE_TARNAME-$RELEASE_VERSION" - AC_MSG_NOTICE([Building with package name set to $PACKAGE]) - fi AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MAJOR], [`echo $PACKAGE_VERSION | cut -d . -f 1`], [Major version of this package]) diff --git a/lib/libXi/configure b/lib/libXi/configure index 5ecc7dcd7..3248defde 100644 --- a/lib/libXi/configure +++ b/lib/libXi/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.62 for libXi 1.3. +# Generated by GNU Autoconf 2.62 for libXi 1.3.2. # # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>. # @@ -750,8 +750,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='libXi' PACKAGE_TARNAME='libXi' -PACKAGE_VERSION='1.3' -PACKAGE_STRING='libXi 1.3' +PACKAGE_VERSION='1.3.2' +PACKAGE_STRING='libXi 1.3.2' PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg' # Factoring default headers for most tests. @@ -882,6 +882,7 @@ host host_cpu host_vendor host_os +SED APP_MAN_SUFFIX LIB_MAN_SUFFIX FILE_MAN_SUFFIX @@ -894,14 +895,9 @@ FILE_MAN_DIR MISC_MAN_DIR DRIVER_MAN_DIR ADMIN_MAN_DIR +XORG_MAN_PAGE +MAN_SUBSTS AM_DEFAULT_VERBOSITY -XMLTO -HAVE_XMLTO_TRUE -HAVE_XMLTO_FALSE -ASCIIDOC -HAVE_ASCIIDOC_TRUE -HAVE_ASCIIDOC_FALSE -SED LN_S ECHO AR @@ -921,8 +917,12 @@ ac_ct_F77 LIBTOOL XI_CFLAGS XI_LIBS +XMLTO +ASCIIDOC HAVE_DOCTOOLS_TRUE HAVE_DOCTOOLS_FALSE +INSTALL_MANPAGES_TRUE +INSTALL_MANPAGES_FALSE MALLOC_ZERO_CFLAGS XMALLOC_ZERO_CFLAGS XTMALLOC_ZERO_CFLAGS @@ -934,9 +934,6 @@ enable_option_checking enable_maintainer_mode enable_dependency_tracking enable_strict_compilation -with_release_version -with_xmlto -with_asciidoc enable_shared enable_static enable_fast_install @@ -956,8 +953,6 @@ LIBS CPPFLAGS CPP PKG_CONFIG -XMLTO -ASCIIDOC CXX CXXFLAGS CCC @@ -965,7 +960,9 @@ CXXCPP F77 FFLAGS XI_CFLAGS -XI_LIBS' +XI_LIBS +XMLTO +ASCIIDOC' # Initialize some variables set by options. @@ -1518,7 +1515,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 libXi 1.3 to adapt to many kinds of systems. +\`configure' configures libXi 1.3.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1588,7 +1585,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libXi 1.3:";; + short | recursive ) echo "Configuration of libXi 1.3.2:";; esac cat <<\_ACEOF @@ -1614,12 +1611,6 @@ Optional Features: Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) - --with-release-version=STRING - Use release version string in package name - --with-xmlto Use xmlto to regenerate documentation (default: yes, - if installed) - --with-asciidoc Use asciidoc to regenerate documentation (default: - yes, if installed) --with-gnu-ld assume the C compiler uses GNU ld [default=no] --with-pic try to use only PIC/non-PIC objects [default=use both] @@ -1635,8 +1626,6 @@ Some influential environment variables: you have headers in a nonstandard directory <include dir> CPP C preprocessor PKG_CONFIG path to pkg-config utility - XMLTO Path to xmlto command - ASCIIDOC Path to asciidoc command CXX C++ compiler command CXXFLAGS C++ compiler flags CXXCPP C++ preprocessor @@ -1644,6 +1633,8 @@ Some influential environment variables: FFLAGS Fortran 77 compiler flags XI_CFLAGS C compiler flags for XI, overriding pkg-config XI_LIBS linker flags for XI, overriding pkg-config + XMLTO Path to xmlto command + ASCIIDOC Path to asciidoc command Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. @@ -1711,7 +1702,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libXi configure 1.3 +libXi configure 1.3.2 generated by GNU Autoconf 2.62 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1725,7 +1716,7 @@ 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 libXi $as_me 1.3, which was +It was created by libXi $as_me 1.3.2, which was generated by GNU Autoconf 2.62. Invocation command line was $ $0 $@ @@ -2374,7 +2365,7 @@ fi # Define the identity of the package. PACKAGE='libXi' - VERSION='1.3' + VERSION='1.3.2' cat >>confdefs.h <<_ACEOF @@ -2545,7 +2536,7 @@ fi -# Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG +# Require xorg-macros: XORG_DEFAULT_OPTIONS @@ -3662,6 +3653,208 @@ else fi + { $as_echo "$as_me:$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 + $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 +/* end confdefs.h. */ +#include <stdarg.h> +#include <stdbool.h> +#include <stdlib.h> +#include <wchar.h> +#include <stdio.h> + +// Check varargs macros. These examples are taken from C99 6.10.3.5. +#define debug(...) fprintf (stderr, __VA_ARGS__) +#define showlist(...) puts (#__VA_ARGS__) +#define report(test,...) ((test) ? puts (#test) : printf (__VA_ARGS__)) +static void +test_varargs_macros (void) +{ + int x = 1234; + int y = 5678; + debug ("Flag"); + debug ("X = %d\n", x); + showlist (The first, second, and third items.); + report (x>y, "x is %d but y is %d", x, y); +} + +// Check long long types. +#define BIG64 18446744073709551615ull +#define BIG32 4294967295ul +#define BIG_OK (BIG64 / BIG32 == 4294967297ull && BIG64 % BIG32 == 0) +#if !BIG_OK + your preprocessor is broken; +#endif +#if BIG_OK +#else + your preprocessor is broken; +#endif +static long long int bignum = -9223372036854775807LL; +static unsigned long long int ubignum = BIG64; + +struct incomplete_array +{ + int datasize; + double data[]; +}; + +struct named_init { + int number; + const wchar_t *name; + double average; +}; + +typedef const char *ccp; + +static inline int +test_restrict (ccp restrict text) +{ + // See if C++-style comments work. + // Iterate through items via the restricted pointer. + // Also check for declarations in for loops. + for (unsigned int i = 0; *(text+i) != '\0'; ++i) + continue; + return 0; +} + +// Check varargs and va_copy. +static void +test_varargs (const char *format, ...) +{ + va_list args; + va_start (args, format); + va_list args_copy; + va_copy (args_copy, args); + + const char *str; + int number; + float fnumber; + + while (*format) + { + switch (*format++) + { + case 's': // string + str = va_arg (args_copy, const char *); + break; + case 'd': // int + number = va_arg (args_copy, int); + break; + case 'f': // float + fnumber = va_arg (args_copy, double); + break; + default: + break; + } + } + va_end (args_copy); + va_end (args); +} + +int +main () +{ + + // Check bool. + _Bool success = false; + + // Check restrict. + if (test_restrict ("String literal") == 0) + success = true; + char *restrict newvar = "Another string"; + + // Check varargs. + test_varargs ("s, d' f .", "string", 65, 34.234); + test_varargs_macros (); + + // Check flexible array members. + struct incomplete_array *ia = + malloc (sizeof (struct incomplete_array) + (sizeof (double) * 10)); + ia->datasize = 10; + for (int i = 0; i < ia->datasize; ++i) + ia->data[i] = i * 1.234; + + // Check named initializers. + struct named_init ni = { + .number = 34, + .name = L"Test wide string", + .average = 543.34343, + }; + + ni.number = 58; + + int dynamic_array[ni.number]; + dynamic_array[ni.number - 1] = 543; + + // work around unused variable warnings + return (!success || bignum == 0LL || ubignum == 0uLL || newvar[0] == 'x' + || dynamic_array[ni.number - 1] != 543); + + ; + return 0; +} +_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 + 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 +rm -f conftest.$ac_ext +CC=$ac_save_CC + +fi +# AC_CACHE_VAL +case "x$ac_cv_prog_cc_c99" in + x) + { $as_echo "$as_me:$LINENO: result: none needed" >&5 +$as_echo "none needed" >&6; } ;; + xno) + { $as_echo "$as_me:$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 "$ac_cv_prog_cc_c99" >&6; } ;; +esac + + + ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -4282,208 +4475,6 @@ fi done - { $as_echo "$as_me:$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 - $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 -/* end confdefs.h. */ -#include <stdarg.h> -#include <stdbool.h> -#include <stdlib.h> -#include <wchar.h> -#include <stdio.h> - -// Check varargs macros. These examples are taken from C99 6.10.3.5. -#define debug(...) fprintf (stderr, __VA_ARGS__) -#define showlist(...) puts (#__VA_ARGS__) -#define report(test,...) ((test) ? puts (#test) : printf (__VA_ARGS__)) -static void -test_varargs_macros (void) -{ - int x = 1234; - int y = 5678; - debug ("Flag"); - debug ("X = %d\n", x); - showlist (The first, second, and third items.); - report (x>y, "x is %d but y is %d", x, y); -} - -// Check long long types. -#define BIG64 18446744073709551615ull -#define BIG32 4294967295ul -#define BIG_OK (BIG64 / BIG32 == 4294967297ull && BIG64 % BIG32 == 0) -#if !BIG_OK - your preprocessor is broken; -#endif -#if BIG_OK -#else - your preprocessor is broken; -#endif -static long long int bignum = -9223372036854775807LL; -static unsigned long long int ubignum = BIG64; - -struct incomplete_array -{ - int datasize; - double data[]; -}; - -struct named_init { - int number; - const wchar_t *name; - double average; -}; - -typedef const char *ccp; - -static inline int -test_restrict (ccp restrict text) -{ - // See if C++-style comments work. - // Iterate through items via the restricted pointer. - // Also check for declarations in for loops. - for (unsigned int i = 0; *(text+i) != '\0'; ++i) - continue; - return 0; -} - -// Check varargs and va_copy. -static void -test_varargs (const char *format, ...) -{ - va_list args; - va_start (args, format); - va_list args_copy; - va_copy (args_copy, args); - - const char *str; - int number; - float fnumber; - - while (*format) - { - switch (*format++) - { - case 's': // string - str = va_arg (args_copy, const char *); - break; - case 'd': // int - number = va_arg (args_copy, int); - break; - case 'f': // float - fnumber = va_arg (args_copy, double); - break; - default: - break; - } - } - va_end (args_copy); - va_end (args); -} - -int -main () -{ - - // Check bool. - _Bool success = false; - - // Check restrict. - if (test_restrict ("String literal") == 0) - success = true; - char *restrict newvar = "Another string"; - - // Check varargs. - test_varargs ("s, d' f .", "string", 65, 34.234); - test_varargs_macros (); - - // Check flexible array members. - struct incomplete_array *ia = - malloc (sizeof (struct incomplete_array) + (sizeof (double) * 10)); - ia->datasize = 10; - for (int i = 0; i < ia->datasize; ++i) - ia->data[i] = i * 1.234; - - // Check named initializers. - struct named_init ni = { - .number = 34, - .name = L"Test wide string", - .average = 543.34343, - }; - - ni.number = 58; - - int dynamic_array[ni.number]; - dynamic_array[ni.number - 1] = 543; - - // work around unused variable warnings - return (!success || bignum == 0LL || ubignum == 0uLL || newvar[0] == 'x' - || dynamic_array[ni.number - 1] != 543); - - ; - return 0; -} -_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 - 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 -rm -f conftest.$ac_ext -CC=$ac_save_CC - -fi -# AC_CACHE_VAL -case "x$ac_cv_prog_cc_c99" in - x) - { $as_echo "$as_me:$LINENO: result: none needed" >&5 -$as_echo "none needed" >&6; } ;; - xno) - { $as_echo "$as_me:$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 "$ac_cv_prog_cc_c99" >&6; } ;; -esac - - - if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then @@ -4687,6 +4678,78 @@ 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_n "checking for a sed that does not truncate output... " >&6; } +if test "${ac_cv_path_SED+set}" = set; then + $as_echo_n "(cached) " >&6 +else + ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ + for ac_i in 1 2 3 4 5 6 7; do + 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= + if test -z "$SED"; then + ac_path_SED_found=false + # Loop through the user's path and test for each of PROGNAME-LIST + 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_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 +# Check for GNU ac_path_SED and select it if it is found. + # Check for GNU $ac_path_SED +case `"$ac_path_SED" --version 2>&1` in +*GNU*) + ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;; +*) + ac_count=0 + $as_echo_n 0123456789 >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + $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` + 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" + ac_path_SED_max=$ac_count + fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +esac + + $ac_path_SED_found && break 3 + 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; }; } + fi +else + ac_cv_path_SED=$SED +fi + +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_SED" >&5 +$as_echo "$ac_cv_path_SED" >&6; } + SED="$ac_cv_path_SED" + rm -f conftest.sed + + @@ -4766,7 +4829,7 @@ fi - +# If the module's configure.ac calls AC_PROG_CC later on, CC gets set to C89 @@ -4909,20 +4972,6 @@ CWARNFLAGS="$CWARNFLAGS $STRICT_CFLAGS" -# Check whether --with-release-version was given. -if test "${with_release_version+set}" = set; then - withval=$with_release_version; RELEASE_VERSION="$withval" -else - RELEASE_VERSION="" -fi - - if test "x$RELEASE_VERSION" != "x"; then - PACKAGE="$PACKAGE-$RELEASE_VERSION" - PACKAGE_TARNAME="$PACKAGE_TARNAME-$RELEASE_VERSION" - { $as_echo "$as_me:$LINENO: Building with package name set to $PACKAGE" >&5 -$as_echo "$as_me: Building with package name set to $PACKAGE" >&6;} - fi - cat >>confdefs.h <<_ACEOF #define PACKAGE_VERSION_MAJOR `echo $PACKAGE_VERSION | cut -d . -f 1` _ACEOF @@ -4965,6 +5014,7 @@ echo 'util-macros \"pkgdatadir\" from xorg-macros.pc not found: installing possi + if test x$APP_MAN_SUFFIX = x ; then APP_MAN_SUFFIX=1 fi @@ -5033,265 +5083,24 @@ fi -AM_DEFAULT_VERBOSITY=1 +XORG_MAN_PAGE="X Version 11" +MAN_SUBSTS="\ + -e 's|__vendorversion__|\"\$(PACKAGE_STRING)\" \"\$(XORG_MAN_PAGE)\"|' \ + -e 's|__xorgversion__|\"\$(PACKAGE_STRING)\" \"\$(XORG_MAN_PAGE)\"|' \ + -e 's|__xservername__|Xorg|g' \ + -e 's|__xconfigfile__|xorg.conf|g' \ + -e 's|__projectroot__|\$(prefix)|g' \ + -e 's|__appmansuffix__|\$(APP_MAN_SUFFIX)|g' \ + -e 's|__drivermansuffix__|\$(DRIVER_MAN_SUFFIX)|g' \ + -e 's|__adminmansuffix__|\$(ADMIN_MAN_SUFFIX)|g' \ + -e 's|__libmansuffix__|\$(LIB_MAN_SUFFIX)|g' \ + -e 's|__miscmansuffix__|\$(MISC_MAN_SUFFIX)|g' \ + -e 's|__filemansuffix__|\$(FILE_MAN_SUFFIX)|g'" - -# Check whether --with-xmlto was given. -if test "${with_xmlto+set}" = set; then - withval=$with_xmlto; use_xmlto=$withval -else - use_xmlto=auto -fi - - -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:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_XMLTO+set}" = set; then - $as_echo_n "(cached) " >&6 -else - 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:$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:$LINENO: result: $XMLTO" >&5 -$as_echo "$XMLTO" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi - - - if test "x$XMLTO" = "x"; then - { $as_echo "$as_me:$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:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_XMLTO+set}" = set; then - $as_echo_n "(cached) " >&6 -else - 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:$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:$LINENO: result: $XMLTO" >&5 -$as_echo "$XMLTO" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi - - - if test "x$XMLTO" = "x"; then - { { $as_echo "$as_me:$LINENO: error: --with-xmlto=yes specified but xmlto not found in PATH" >&5 -$as_echo "$as_me: error: --with-xmlto=yes specified but xmlto not found in PATH" >&2;} - { (exit 1); exit 1; }; } - fi - have_xmlto=yes -elif test "x$use_xmlto" = x"no" ; then - if test "x$XMLTO" != "x"; then - { $as_echo "$as_me:$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_echo "$as_me:$LINENO: error: --with-xmlto expects 'yes' or 'no'" >&5 -$as_echo "$as_me: error: --with-xmlto expects 'yes' or 'no'" >&2;} - { (exit 1); exit 1; }; } -fi - - - -if test "$have_xmlto" = yes; then - HAVE_XMLTO_TRUE= - HAVE_XMLTO_FALSE='#' -else - HAVE_XMLTO_TRUE='#' - HAVE_XMLTO_FALSE= -fi - - - - - -# Check whether --with-asciidoc was given. -if test "${with_asciidoc+set}" = set; then - withval=$with_asciidoc; use_asciidoc=$withval -else - use_asciidoc=auto -fi - - -if test "x$use_asciidoc" = x"auto"; then - # Extract the first word of "asciidoc", so it can be a program name with args. -set dummy asciidoc; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_ASCIIDOC+set}" = set; then - $as_echo_n "(cached) " >&6 -else - case $ASCIIDOC in - [\\/]* | ?:[\\/]*) - ac_cv_path_ASCIIDOC="$ASCIIDOC" # 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_ASCIIDOC="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - - ;; -esac -fi -ASCIIDOC=$ac_cv_path_ASCIIDOC -if test -n "$ASCIIDOC"; then - { $as_echo "$as_me:$LINENO: result: $ASCIIDOC" >&5 -$as_echo "$ASCIIDOC" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi - - - if test "x$ASCIIDOC" = "x"; then - { $as_echo "$as_me:$LINENO: WARNING: asciidoc not found - documentation targets will be skipped" >&5 -$as_echo "$as_me: WARNING: asciidoc not found - documentation targets will be skipped" >&2;} - have_asciidoc=no - else - have_asciidoc=yes - fi -elif test "x$use_asciidoc" = x"yes" ; then - # Extract the first word of "asciidoc", so it can be a program name with args. -set dummy asciidoc; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_ASCIIDOC+set}" = set; then - $as_echo_n "(cached) " >&6 -else - case $ASCIIDOC in - [\\/]* | ?:[\\/]*) - ac_cv_path_ASCIIDOC="$ASCIIDOC" # 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_ASCIIDOC="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - - ;; -esac -fi -ASCIIDOC=$ac_cv_path_ASCIIDOC -if test -n "$ASCIIDOC"; then - { $as_echo "$as_me:$LINENO: result: $ASCIIDOC" >&5 -$as_echo "$ASCIIDOC" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi - - - if test "x$ASCIIDOC" = "x"; then - { { $as_echo "$as_me:$LINENO: error: --with-asciidoc=yes specified but asciidoc not found in PATH" >&5 -$as_echo "$as_me: error: --with-asciidoc=yes specified but asciidoc not found in PATH" >&2;} - { (exit 1); exit 1; }; } - fi - have_asciidoc=yes -elif test "x$use_asciidoc" = x"no" ; then - if test "x$ASCIIDOC" != "x"; then - { $as_echo "$as_me:$LINENO: WARNING: ignoring ASCIIDOC environment variable since --with-asciidoc=no was specified" >&5 -$as_echo "$as_me: WARNING: ignoring ASCIIDOC environment variable since --with-asciidoc=no was specified" >&2;} - fi - have_asciidoc=no -else - { { $as_echo "$as_me:$LINENO: error: --with-asciidoc expects 'yes' or 'no'" >&5 -$as_echo "$as_me: error: --with-asciidoc expects 'yes' or 'no'" >&2;} - { (exit 1); exit 1; }; } -fi - - - -if test "$have_asciidoc" = yes; then - HAVE_ASCIIDOC_TRUE= - HAVE_ASCIIDOC_FALSE='#' -else - HAVE_ASCIIDOC_TRUE='#' - HAVE_ASCIIDOC_FALSE= -fi +AM_DEFAULT_VERBOSITY=1 ac_config_headers="$ac_config_headers src/config.h" @@ -6658,7 +6467,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 6661 "configure"' > conftest.$ac_ext + echo '#line 6470 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -9281,11 +9090,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9284: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9093: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:9288: \$? = $ac_status" >&5 + echo "$as_me:9097: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -9571,11 +9380,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9574: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9383: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:9578: \$? = $ac_status" >&5 + echo "$as_me:9387: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -9675,11 +9484,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9678: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9487: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:9682: \$? = $ac_status" >&5 + echo "$as_me:9491: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -12075,7 +11884,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 12078 "configure" +#line 11887 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12175,7 +11984,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 12178 "configure" +#line 11987 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -14584,11 +14393,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14587: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14396: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:14591: \$? = $ac_status" >&5 + echo "$as_me:14400: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -14688,11 +14497,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14691: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14500: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:14695: \$? = $ac_status" >&5 + echo "$as_me:14504: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -16271,11 +16080,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16274: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16083: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16278: \$? = $ac_status" >&5 + echo "$as_me:16087: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -16375,11 +16184,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16378: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16187: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:16382: \$? = $ac_status" >&5 + echo "$as_me:16191: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -18590,11 +18399,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:18593: $lt_compile\"" >&5) + (eval echo "\"\$as_me:18402: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:18597: \$? = $ac_status" >&5 + echo "$as_me:18406: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -18880,11 +18689,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:18883: $lt_compile\"" >&5) + (eval echo "\"\$as_me:18692: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:18887: \$? = $ac_status" >&5 + echo "$as_me:18696: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -18984,11 +18793,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:18987: $lt_compile\"" >&5) + (eval echo "\"\$as_me:18796: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:18991: \$? = $ac_status" >&5 + echo "$as_me:18800: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -21860,8 +21669,95 @@ XI_CFLAGS="$CWARNFLAGS $XI_CFLAGS" # Check for xmlto and asciidoc for man page conversion # (only needed by people building tarballs) +# 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:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_XMLTO+set}" = set; then + $as_echo_n "(cached) " >&6 +else + 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:$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:$LINENO: result: $XMLTO" >&5 +$as_echo "$XMLTO" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +fi + + + +# Extract the first word of "asciidoc", so it can be a program name with args. +set dummy asciidoc; ac_word=$2 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_ASCIIDOC+set}" = set; then + $as_echo_n "(cached) " >&6 +else + case $ASCIIDOC in + [\\/]* | ?:[\\/]*) + ac_cv_path_ASCIIDOC="$ASCIIDOC" # 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_ASCIIDOC="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + + ;; +esac +fi +ASCIIDOC=$ac_cv_path_ASCIIDOC +if test -n "$ASCIIDOC"; then + { $as_echo "$as_me:$LINENO: result: $ASCIIDOC" >&5 +$as_echo "$ASCIIDOC" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +fi + if test "x$XMLTO" != "x" && test "x$ASCIIDOC" != "x"; then + have_doctools=yes +else + have_doctools=no +fi + + +if test $have_doctools = yes; then HAVE_DOCTOOLS_TRUE= HAVE_DOCTOOLS_FALSE='#' else @@ -21869,11 +21765,25 @@ else HAVE_DOCTOOLS_FALSE= fi -if test "x$XMLTO" = "x" || test "x$ASCIIDOC" = "x"; then +if test $have_doctools = no; then { $as_echo "$as_me:$LINENO: WARNING: xmlto or asciidoc not found - cannot create man pages without it" >&5 $as_echo "$as_me: WARNING: xmlto or asciidoc not found - cannot create man pages without it" >&2;} fi +# Determine if the source for man pages is available +# It may already be present (tarball) or can be generated using doctools + + +if test -f "$srcdir/man/XAllowDeviceEvents.man" || \ + test $have_doctools = yes; then + INSTALL_MANPAGES_TRUE= + INSTALL_MANPAGES_FALSE='#' +else + INSTALL_MANPAGES_TRUE='#' + INSTALL_MANPAGES_FALSE= +fi + + # Check whether --enable-malloc0returnsnull was given. if test "${enable_malloc0returnsnull+set}" = set; then @@ -22078,20 +21988,6 @@ $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; }; } fi -if test -z "${HAVE_XMLTO_TRUE}" && test -z "${HAVE_XMLTO_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_XMLTO\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"HAVE_XMLTO\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -fi -if test -z "${HAVE_ASCIIDOC_TRUE}" && test -z "${HAVE_ASCIIDOC_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_ASCIIDOC\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"HAVE_ASCIIDOC\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -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 @@ -22113,6 +22009,13 @@ $as_echo "$as_me: error: conditional \"HAVE_DOCTOOLS\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi +if test -z "${INSTALL_MANPAGES_TRUE}" && test -z "${INSTALL_MANPAGES_FALSE}"; then + { { $as_echo "$as_me:$LINENO: error: conditional \"INSTALL_MANPAGES\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +$as_echo "$as_me: error: conditional \"INSTALL_MANPAGES\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi : ${CONFIG_STATUS=./config.status} ac_write_fail=0 @@ -22435,7 +22338,7 @@ exec 6>&1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by libXi $as_me 1.3, which was +This file was extended by libXi $as_me 1.3.2, which was generated by GNU Autoconf 2.62. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -22488,7 +22391,7 @@ Report bugs to <bug-autoconf@gnu.org>." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -libXi config.status 1.3 +libXi config.status 1.3.2 configured by $0, generated by GNU Autoconf 2.62, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff --git a/lib/libXi/configure.ac b/lib/libXi/configure.ac index 48be7ab7a..f3a8bd9b1 100644 --- a/lib/libXi/configure.ac +++ b/lib/libXi/configure.ac @@ -2,16 +2,15 @@ dnl Process this file with autoconf to create configure. AC_PREREQ([2.57]) -AC_INIT(libXi, 1.3, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXi) -AM_INIT_AUTOMAKE([dist-bzip2 foreign]) +AC_INIT(libXi, 1.3.2, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXi) +AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE -# Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG -m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.5 or later before running autoconf/autogen])]) -XORG_MACROS_VERSION(1.5) +# Require xorg-macros: XORG_DEFAULT_OPTIONS +m4_ifndef([XORG_MACROS_VERSION], + [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.3) XORG_DEFAULT_OPTIONS -XORG_WITH_XMLTO -XORG_WITH_ASCIIDOC AM_CONFIG_HEADER(src/config.h) # Check for progs @@ -27,11 +26,26 @@ AC_SUBST(XI_LIBS) # Check for xmlto and asciidoc for man page conversion # (only needed by people building tarballs) -AM_CONDITIONAL([HAVE_DOCTOOLS], [test "x$XMLTO" != "x" && test "x$ASCIIDOC" != "x"]) -if test "x$XMLTO" = "x" || test "x$ASCIIDOC" = "x"; then +AC_ARG_VAR([XMLTO], [Path to xmlto command]) +AC_PATH_PROG([XMLTO], [xmlto]) +AC_ARG_VAR([ASCIIDOC], [Path to asciidoc command]) +AC_PATH_PROG([ASCIIDOC], [asciidoc]) +if test "x$XMLTO" != "x" && test "x$ASCIIDOC" != "x"; then + have_doctools=yes +else + have_doctools=no +fi +AM_CONDITIONAL([HAVE_DOCTOOLS], [test $have_doctools = yes]) +if test $have_doctools = no; then AC_MSG_WARN([xmlto or asciidoc not found - cannot create man pages without it]) fi +# Determine if the source for man pages is available +# It may already be present (tarball) or can be generated using doctools +AM_CONDITIONAL([INSTALL_MANPAGES], + [test -f "$srcdir/man/XAllowDeviceEvents.man" || \ + test $have_doctools = yes]) + XORG_CHECK_MALLOC_ZERO AC_OUTPUT([Makefile diff --git a/lib/libXi/man/Makefile.am b/lib/libXi/man/Makefile.am index 221b6777c..e1e972217 100644 --- a/lib/libXi/man/Makefile.am +++ b/lib/libXi/man/Makefile.am @@ -114,7 +114,7 @@ libman_ref = \ libman_pre = $(libman_txt:.txt=.man) $(libman_ref) -if HAVE_DOCTOOLS +if INSTALL_MANPAGES nodist_libman_DATA = $(libman_pre:.man=.$(LIB_MAN_SUFFIX)) endif @@ -122,6 +122,7 @@ EXTRA_DIST = $(libman_txt) $(libman_pre) CLEANFILES = $(nodist_libman_DATA) *.libmansuffix MAINTAINERCLEANFILES = $(libman_pre) *.xml +if HAVE_DOCTOOLS # prerequisites for the side effect pages XGetDeviceDontPropagateList.man: XChangeDeviceDontPropagateList.man XChangeDeviceControl.man: XGetDeviceControl.man @@ -151,6 +152,7 @@ XIDeleteProperty.man: XIChangeProperty.man XIUngrabEnter.man XIGrabFocusIn.man XIUngrabFocusIn.man: XIGrabEnter.man XIGetSelectedEvents.man: XISelectEvents.man XIFreeDeviceInfo.man: XIQueryDevice.man +endif # Strings to replace in man pages XORGRELSTRING = $(PACKAGE_STRING) diff --git a/lib/libXi/man/Makefile.in b/lib/libXi/man/Makefile.in index d3cfd35e1..1165d11ba 100644 --- a/lib/libXi/man/Makefile.in +++ b/lib/libXi/man/Makefile.in @@ -127,14 +127,12 @@ FFLAGS = @FFLAGS@ FILE_MAN_DIR = @FILE_MAN_DIR@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ GREP = @GREP@ -HAVE_ASCIIDOC_FALSE = @HAVE_ASCIIDOC_FALSE@ -HAVE_ASCIIDOC_TRUE = @HAVE_ASCIIDOC_TRUE@ HAVE_DOCTOOLS_FALSE = @HAVE_DOCTOOLS_FALSE@ HAVE_DOCTOOLS_TRUE = @HAVE_DOCTOOLS_TRUE@ -HAVE_XMLTO_FALSE = @HAVE_XMLTO_FALSE@ -HAVE_XMLTO_TRUE = @HAVE_XMLTO_TRUE@ INSTALL_CMD = @INSTALL_CMD@ INSTALL_DATA = @INSTALL_DATA@ +INSTALL_MANPAGES_FALSE = @INSTALL_MANPAGES_FALSE@ +INSTALL_MANPAGES_TRUE = @INSTALL_MANPAGES_TRUE@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ @@ -151,6 +149,14 @@ MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@ +MAN_SUBSTS = \ + -e 's/__xorgversion__/"$(XORGRELSTRING)" "$(XORGMANNAME)"/' \ + -e 's/__xservername__/Xorg/g' \ + -e 's/__xconfigfile__/xorg.conf/g' \ + -e 's/__appmansuffix__/$(APP_MAN_SUFFIX)/g' \ + -e 's/libmansuffix/$(LIB_MAN_SUFFIX)/g' \ + -e 's/__filemansuffix__/$(FILE_MAN_SUFFIX)/g' + MISC_MAN_DIR = @MISC_MAN_DIR@ MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@ NMEDIT = @NMEDIT@ @@ -173,6 +179,7 @@ XI_CFLAGS = @XI_CFLAGS@ XI_LIBS = @XI_LIBS@ XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@ XMLTO = @XMLTO@ +XORG_MAN_PAGE = @XORG_MAN_PAGE@ XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ @@ -306,7 +313,7 @@ libman_ref = \ $(XI2_refpages) libman_pre = $(libman_txt:.txt=.man) $(libman_ref) -@HAVE_DOCTOOLS_TRUE@nodist_libman_DATA = $(libman_pre:.man=.$(LIB_MAN_SUFFIX)) +@INSTALL_MANPAGES_TRUE@nodist_libman_DATA = $(libman_pre:.man=.$(LIB_MAN_SUFFIX)) EXTRA_DIST = $(libman_txt) $(libman_pre) CLEANFILES = $(nodist_libman_DATA) *.libmansuffix MAINTAINERCLEANFILES = $(libman_pre) *.xml @@ -314,14 +321,6 @@ MAINTAINERCLEANFILES = $(libman_pre) *.xml # Strings to replace in man pages XORGRELSTRING = $(PACKAGE_STRING) XORGMANNAME = X Version 11 -MAN_SUBSTS = \ - -e 's/__xorgversion__/"$(XORGRELSTRING)" "$(XORGMANNAME)"/' \ - -e 's/__xservername__/Xorg/g' \ - -e 's/__xconfigfile__/xorg.conf/g' \ - -e 's/__appmansuffix__/$(APP_MAN_SUFFIX)/g' \ - -e 's/libmansuffix/$(LIB_MAN_SUFFIX)/g' \ - -e 's/__filemansuffix__/$(FILE_MAN_SUFFIX)/g' - SUFFIXES = .man .$(LIB_MAN_SUFFIX) $(am__append_1) all: all-am @@ -509,34 +508,34 @@ uninstall-am: uninstall-info-am uninstall-nodist_libmanDATA # prerequisites for the side effect pages -XGetDeviceDontPropagateList.man: XChangeDeviceDontPropagateList.man -XChangeDeviceControl.man: XGetDeviceControl.man -XChangeDeviceKeyMapping.man: XGetDeviceKeyMapping.man -XSetDeviceModifierMapping.man: XGetDeviceModifierMapping.man -XDeviceTimeCoord.man: XGetDeviceMotionEvents.man -XChangeFeedbackControl.man: XGetFeedbackControl.man -XUngrabDeviceButton.man: XGrabDeviceButton.man -XUngrabDeviceKey.man: XGrabDeviceKey.man -XUngrabDevice.man: XGrabDevice.man -XFreeDeviceList.man: XListInputDevices.man -XCloseDevice.man: XOpenDevice.man -XGetSelectedExtensionEvents.man: XSelectExtensionEvent.man -XGetDeviceButtonMapping.man: XSetDeviceButtonMapping.man -XGetDeviceFocus.man: XSetDeviceFocus.man -XChangeDeviceProperty.man: XGetDeviceProperty.man -XDeleteDeviceProperty.man: XGetDeviceProperty.man +@HAVE_DOCTOOLS_TRUE@XGetDeviceDontPropagateList.man: XChangeDeviceDontPropagateList.man +@HAVE_DOCTOOLS_TRUE@XChangeDeviceControl.man: XGetDeviceControl.man +@HAVE_DOCTOOLS_TRUE@XChangeDeviceKeyMapping.man: XGetDeviceKeyMapping.man +@HAVE_DOCTOOLS_TRUE@XSetDeviceModifierMapping.man: XGetDeviceModifierMapping.man +@HAVE_DOCTOOLS_TRUE@XDeviceTimeCoord.man: XGetDeviceMotionEvents.man +@HAVE_DOCTOOLS_TRUE@XChangeFeedbackControl.man: XGetFeedbackControl.man +@HAVE_DOCTOOLS_TRUE@XUngrabDeviceButton.man: XGrabDeviceButton.man +@HAVE_DOCTOOLS_TRUE@XUngrabDeviceKey.man: XGrabDeviceKey.man +@HAVE_DOCTOOLS_TRUE@XUngrabDevice.man: XGrabDevice.man +@HAVE_DOCTOOLS_TRUE@XFreeDeviceList.man: XListInputDevices.man +@HAVE_DOCTOOLS_TRUE@XCloseDevice.man: XOpenDevice.man +@HAVE_DOCTOOLS_TRUE@XGetSelectedExtensionEvents.man: XSelectExtensionEvent.man +@HAVE_DOCTOOLS_TRUE@XGetDeviceButtonMapping.man: XSetDeviceButtonMapping.man +@HAVE_DOCTOOLS_TRUE@XGetDeviceFocus.man: XSetDeviceFocus.man +@HAVE_DOCTOOLS_TRUE@XChangeDeviceProperty.man: XGetDeviceProperty.man +@HAVE_DOCTOOLS_TRUE@XDeleteDeviceProperty.man: XGetDeviceProperty.man # XI2 prereqs -XIUndefineCursor.man: XIDefineCursor.man -XIUngrabButton.man XIGrabKeycode.man XIUngrabKeycode.man: XIGrabButton.man -XIGetClientPointer.man: XISetClientPointer.man -XIGetFocus.man: XISetFocus.man -XIUngrabDevice.man: XIGrabDevice.man -XIGetProperty.man: XIChangeProperty.man -XIDeleteProperty.man: XIChangeProperty.man -XIUngrabEnter.man XIGrabFocusIn.man XIUngrabFocusIn.man: XIGrabEnter.man -XIGetSelectedEvents.man: XISelectEvents.man -XIFreeDeviceInfo.man: XIQueryDevice.man +@HAVE_DOCTOOLS_TRUE@XIUndefineCursor.man: XIDefineCursor.man +@HAVE_DOCTOOLS_TRUE@XIUngrabButton.man XIGrabKeycode.man XIUngrabKeycode.man: XIGrabButton.man +@HAVE_DOCTOOLS_TRUE@XIGetClientPointer.man: XISetClientPointer.man +@HAVE_DOCTOOLS_TRUE@XIGetFocus.man: XISetFocus.man +@HAVE_DOCTOOLS_TRUE@XIUngrabDevice.man: XIGrabDevice.man +@HAVE_DOCTOOLS_TRUE@XIGetProperty.man: XIChangeProperty.man +@HAVE_DOCTOOLS_TRUE@XIDeleteProperty.man: XIChangeProperty.man +@HAVE_DOCTOOLS_TRUE@XIUngrabEnter.man XIGrabFocusIn.man XIUngrabFocusIn.man: XIGrabEnter.man +@HAVE_DOCTOOLS_TRUE@XIGetSelectedEvents.man: XISelectEvents.man +@HAVE_DOCTOOLS_TRUE@XIFreeDeviceInfo.man: XIQueryDevice.man .man.$(LIB_MAN_SUFFIX): $(SED) $(MAN_SUBSTS) < $< > $@ @HAVE_DOCTOOLS_TRUE@.txt.xml: diff --git a/lib/libXi/man/XAllowDeviceEvents.man b/lib/libXi/man/XAllowDeviceEvents.man index ed10458d2..78316c05b 100644 --- a/lib/libXi/man/XAllowDeviceEvents.man +++ b/lib/libXi/man/XAllowDeviceEvents.man @@ -1,13 +1,13 @@ '\" t .\" Title: xallowdeviceevents .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] -.\" Generator: DocBook XSL Stylesheets v1.74.3 <http://docbook.sf.net/> -.\" Date: 10/02/2009 +.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> +.\" Date: 08/04/2010 .\" Manual: [FIXME: manual] .\" Source: [FIXME: source] .\" Language: English .\" -.TH "XALLOWDEVICEEVENTS" "libmansuffix" "10/02/2009" "[FIXME: source]" "[FIXME: manual]" +.TH "XALLOWDEVICEEVENTS" "libmansuffix" "08/04/2010" "[FIXME: source]" "[FIXME: manual]" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/lib/libXi/man/XChangeDeviceDontPropagateList.man b/lib/libXi/man/XChangeDeviceDontPropagateList.man index 7d2129df4..632ae1593 100644 --- a/lib/libXi/man/XChangeDeviceDontPropagateList.man +++ b/lib/libXi/man/XChangeDeviceDontPropagateList.man @@ -1,13 +1,13 @@ '\" t .\" Title: xchangedevicedontpropagatelist .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] -.\" Generator: DocBook XSL Stylesheets v1.74.3 <http://docbook.sf.net/> -.\" Date: 10/02/2009 +.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> +.\" Date: 08/04/2010 .\" Manual: [FIXME: manual] .\" Source: [FIXME: source] .\" Language: English .\" -.TH "XCHANGEDEVICEDONTPRO" "libmansuffix" "10/02/2009" "[FIXME: source]" "[FIXME: manual]" +.TH "XCHANGEDEVICEDONTPRO" "libmansuffix" "08/04/2010" "[FIXME: source]" "[FIXME: manual]" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/lib/libXi/man/XChangeKeyboardDevice.man b/lib/libXi/man/XChangeKeyboardDevice.man index c933b2dca..15cf02d7a 100644 --- a/lib/libXi/man/XChangeKeyboardDevice.man +++ b/lib/libXi/man/XChangeKeyboardDevice.man @@ -1,13 +1,13 @@ '\" t .\" Title: xchangekeyboarddevice .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] -.\" Generator: DocBook XSL Stylesheets v1.74.3 <http://docbook.sf.net/> -.\" Date: 10/02/2009 +.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> +.\" Date: 08/04/2010 .\" Manual: [FIXME: manual] .\" Source: [FIXME: source] .\" Language: English .\" -.TH "XCHANGEKEYBOARDDEVIC" "libmansuffix" "10/02/2009" "[FIXME: source]" "[FIXME: manual]" +.TH "XCHANGEKEYBOARDDEVIC" "libmansuffix" "08/04/2010" "[FIXME: source]" "[FIXME: manual]" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/lib/libXi/man/XChangePointerDevice.man b/lib/libXi/man/XChangePointerDevice.man index e4ce9c196..242cf3b05 100644 --- a/lib/libXi/man/XChangePointerDevice.man +++ b/lib/libXi/man/XChangePointerDevice.man @@ -1,13 +1,13 @@ '\" t .\" Title: xchangepointerdevice .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] -.\" Generator: DocBook XSL Stylesheets v1.74.3 <http://docbook.sf.net/> -.\" Date: 10/02/2009 +.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> +.\" Date: 08/04/2010 .\" Manual: [FIXME: manual] .\" Source: [FIXME: source] .\" Language: English .\" -.TH "XCHANGEPOINTERDEVICE" "libmansuffix" "10/02/2009" "[FIXME: source]" "[FIXME: manual]" +.TH "XCHANGEPOINTERDEVICE" "libmansuffix" "08/04/2010" "[FIXME: source]" "[FIXME: manual]" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/lib/libXi/man/XDeviceBell.man b/lib/libXi/man/XDeviceBell.man index ee8b63d51..4eed069eb 100644 --- a/lib/libXi/man/XDeviceBell.man +++ b/lib/libXi/man/XDeviceBell.man @@ -1,13 +1,13 @@ '\" t .\" Title: xdevicebell .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] -.\" Generator: DocBook XSL Stylesheets v1.74.3 <http://docbook.sf.net/> -.\" Date: 10/02/2009 +.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> +.\" Date: 08/04/2010 .\" Manual: [FIXME: manual] .\" Source: [FIXME: source] .\" Language: English .\" -.TH "XDEVICEBELL" "libmansuffix" "10/02/2009" "[FIXME: source]" "[FIXME: manual]" +.TH "XDEVICEBELL" "libmansuffix" "08/04/2010" "[FIXME: source]" "[FIXME: manual]" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/lib/libXi/man/XGetDeviceControl.man b/lib/libXi/man/XGetDeviceControl.man index 9eaa8b421..c8284c72b 100644 --- a/lib/libXi/man/XGetDeviceControl.man +++ b/lib/libXi/man/XGetDeviceControl.man @@ -1,13 +1,13 @@ '\" t .\" Title: xgetdevicecontrol .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] -.\" Generator: DocBook XSL Stylesheets v1.74.3 <http://docbook.sf.net/> -.\" Date: 10/02/2009 +.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> +.\" Date: 08/04/2010 .\" Manual: [FIXME: manual] .\" Source: [FIXME: source] .\" Language: English .\" -.TH "XGETDEVICECONTROL" "libmansuffix" "10/02/2009" "[FIXME: source]" "[FIXME: manual]" +.TH "XGETDEVICECONTROL" "libmansuffix" "08/04/2010" "[FIXME: source]" "[FIXME: manual]" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/lib/libXi/man/XGetDeviceKeyMapping.man b/lib/libXi/man/XGetDeviceKeyMapping.man index 42e19cc65..4e83c8442 100644 --- a/lib/libXi/man/XGetDeviceKeyMapping.man +++ b/lib/libXi/man/XGetDeviceKeyMapping.man @@ -1,13 +1,13 @@ '\" t .\" Title: xgetdevicekeymapping .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] -.\" Generator: DocBook XSL Stylesheets v1.74.3 <http://docbook.sf.net/> -.\" Date: 10/02/2009 +.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> +.\" Date: 08/04/2010 .\" Manual: [FIXME: manual] .\" Source: [FIXME: source] .\" Language: English .\" -.TH "XGETDEVICEKEYMAPPING" "libmansuffix" "10/02/2009" "[FIXME: source]" "[FIXME: manual]" +.TH "XGETDEVICEKEYMAPPING" "libmansuffix" "08/04/2010" "[FIXME: source]" "[FIXME: manual]" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/lib/libXi/man/XGetDeviceModifierMapping.man b/lib/libXi/man/XGetDeviceModifierMapping.man index 2e0af7a04..3953da099 100644 --- a/lib/libXi/man/XGetDeviceModifierMapping.man +++ b/lib/libXi/man/XGetDeviceModifierMapping.man @@ -1,13 +1,13 @@ '\" t .\" Title: xgetdevicemodifiermapping .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] -.\" Generator: DocBook XSL Stylesheets v1.74.3 <http://docbook.sf.net/> -.\" Date: 10/02/2009 +.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> +.\" Date: 08/04/2010 .\" Manual: [FIXME: manual] .\" Source: [FIXME: source] .\" Language: English .\" -.TH "XGETDEVICEMODIFIERMA" "libmansuffix" "10/02/2009" "[FIXME: source]" "[FIXME: manual]" +.TH "XGETDEVICEMODIFIERMA" "libmansuffix" "08/04/2010" "[FIXME: source]" "[FIXME: manual]" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/lib/libXi/man/XGetDeviceMotionEvents.man b/lib/libXi/man/XGetDeviceMotionEvents.man index cb93a0762..0f2aced84 100644 --- a/lib/libXi/man/XGetDeviceMotionEvents.man +++ b/lib/libXi/man/XGetDeviceMotionEvents.man @@ -1,13 +1,13 @@ '\" t .\" Title: xgetdevicemotionevents .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] -.\" Generator: DocBook XSL Stylesheets v1.74.3 <http://docbook.sf.net/> -.\" Date: 10/02/2009 +.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> +.\" Date: 08/04/2010 .\" Manual: [FIXME: manual] .\" Source: [FIXME: source] .\" Language: English .\" -.TH "XGETDEVICEMOTIONEVEN" "libmansuffix" "10/02/2009" "[FIXME: source]" "[FIXME: manual]" +.TH "XGETDEVICEMOTIONEVEN" "libmansuffix" "08/04/2010" "[FIXME: source]" "[FIXME: manual]" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/lib/libXi/man/XGetDeviceProperty.man b/lib/libXi/man/XGetDeviceProperty.man index e2ba90151..9fbf70a10 100644 --- a/lib/libXi/man/XGetDeviceProperty.man +++ b/lib/libXi/man/XGetDeviceProperty.man @@ -1,13 +1,13 @@ '\" t .\" Title: xgetdeviceproperty .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] -.\" Generator: DocBook XSL Stylesheets v1.74.3 <http://docbook.sf.net/> -.\" Date: 10/02/2009 +.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> +.\" Date: 08/04/2010 .\" Manual: [FIXME: manual] .\" Source: [FIXME: source] .\" Language: English .\" -.TH "XGETDEVICEPROPERTY" "libmansuffix" "10/02/2009" "[FIXME: source]" "[FIXME: manual]" +.TH "XGETDEVICEPROPERTY" "libmansuffix" "08/04/2010" "[FIXME: source]" "[FIXME: manual]" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/lib/libXi/man/XGetExtensionVersion.man b/lib/libXi/man/XGetExtensionVersion.man index 61b7285ab..cac4d13d5 100644 --- a/lib/libXi/man/XGetExtensionVersion.man +++ b/lib/libXi/man/XGetExtensionVersion.man @@ -1,13 +1,13 @@ '\" t .\" Title: xgetextensionversion .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] -.\" Generator: DocBook XSL Stylesheets v1.74.3 <http://docbook.sf.net/> -.\" Date: 10/02/2009 +.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> +.\" Date: 08/04/2010 .\" Manual: [FIXME: manual] .\" Source: [FIXME: source] .\" Language: English .\" -.TH "XGETEXTENSIONVERSION" "libmansuffix" "10/02/2009" "[FIXME: source]" "[FIXME: manual]" +.TH "XGETEXTENSIONVERSION" "libmansuffix" "08/04/2010" "[FIXME: source]" "[FIXME: manual]" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/lib/libXi/man/XGetFeedbackControl.man b/lib/libXi/man/XGetFeedbackControl.man index 221b5a6ea..ce0a5930e 100644 --- a/lib/libXi/man/XGetFeedbackControl.man +++ b/lib/libXi/man/XGetFeedbackControl.man @@ -1,13 +1,13 @@ '\" t .\" Title: xgetfeedbackcontrol .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] -.\" Generator: DocBook XSL Stylesheets v1.74.3 <http://docbook.sf.net/> -.\" Date: 10/02/2009 +.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> +.\" Date: 08/04/2010 .\" Manual: [FIXME: manual] .\" Source: [FIXME: source] .\" Language: English .\" -.TH "XGETFEEDBACKCONTROL" "libmansuffix" "10/02/2009" "[FIXME: source]" "[FIXME: manual]" +.TH "XGETFEEDBACKCONTROL" "libmansuffix" "08/04/2010" "[FIXME: source]" "[FIXME: manual]" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/lib/libXi/man/XGrabDevice.man b/lib/libXi/man/XGrabDevice.man index b594b62f6..85580fda2 100644 --- a/lib/libXi/man/XGrabDevice.man +++ b/lib/libXi/man/XGrabDevice.man @@ -1,13 +1,13 @@ '\" t .\" Title: xgrabdevice .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] -.\" Generator: DocBook XSL Stylesheets v1.74.3 <http://docbook.sf.net/> -.\" Date: 10/02/2009 +.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> +.\" Date: 08/04/2010 .\" Manual: [FIXME: manual] .\" Source: [FIXME: source] .\" Language: English .\" -.TH "XGRABDEVICE" "libmansuffix" "10/02/2009" "[FIXME: source]" "[FIXME: manual]" +.TH "XGRABDEVICE" "libmansuffix" "08/04/2010" "[FIXME: source]" "[FIXME: manual]" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/lib/libXi/man/XGrabDeviceButton.man b/lib/libXi/man/XGrabDeviceButton.man index 17ff48b25..d363610c8 100644 --- a/lib/libXi/man/XGrabDeviceButton.man +++ b/lib/libXi/man/XGrabDeviceButton.man @@ -1,13 +1,13 @@ '\" t .\" Title: xgrabdevicebutton .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] -.\" Generator: DocBook XSL Stylesheets v1.74.3 <http://docbook.sf.net/> -.\" Date: 10/02/2009 +.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> +.\" Date: 08/04/2010 .\" Manual: [FIXME: manual] .\" Source: [FIXME: source] .\" Language: English .\" -.TH "XGRABDEVICEBUTTON" "libmansuffix" "10/02/2009" "[FIXME: source]" "[FIXME: manual]" +.TH "XGRABDEVICEBUTTON" "libmansuffix" "08/04/2010" "[FIXME: source]" "[FIXME: manual]" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/lib/libXi/man/XGrabDeviceKey.man b/lib/libXi/man/XGrabDeviceKey.man index e934895af..13a592356 100644 --- a/lib/libXi/man/XGrabDeviceKey.man +++ b/lib/libXi/man/XGrabDeviceKey.man @@ -1,13 +1,13 @@ '\" t .\" Title: xgrabdevicekey .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] -.\" Generator: DocBook XSL Stylesheets v1.74.3 <http://docbook.sf.net/> -.\" Date: 10/02/2009 +.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> +.\" Date: 08/04/2010 .\" Manual: [FIXME: manual] .\" Source: [FIXME: source] .\" Language: English .\" -.TH "XGRABDEVICEKEY" "libmansuffix" "10/02/2009" "[FIXME: source]" "[FIXME: manual]" +.TH "XGRABDEVICEKEY" "libmansuffix" "08/04/2010" "[FIXME: source]" "[FIXME: manual]" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/lib/libXi/man/XIChangeHierarchy.man b/lib/libXi/man/XIChangeHierarchy.man index 83b34e9e0..acfc25ca0 100644 --- a/lib/libXi/man/XIChangeHierarchy.man +++ b/lib/libXi/man/XIChangeHierarchy.man @@ -1,13 +1,13 @@ '\" t .\" Title: xichangehierarchy .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] -.\" Generator: DocBook XSL Stylesheets v1.74.3 <http://docbook.sf.net/> -.\" Date: 10/02/2009 +.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> +.\" Date: 08/04/2010 .\" Manual: [FIXME: manual] .\" Source: [FIXME: source] .\" Language: English .\" -.TH "XICHANGEHIERARCHY" "libmansuffix" "10/02/2009" "[FIXME: source]" "[FIXME: manual]" +.TH "XICHANGEHIERARCHY" "libmansuffix" "08/04/2010" "[FIXME: source]" "[FIXME: manual]" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/lib/libXi/man/XIChangeProperty.man b/lib/libXi/man/XIChangeProperty.man index 160667b51..31b68548f 100644 --- a/lib/libXi/man/XIChangeProperty.man +++ b/lib/libXi/man/XIChangeProperty.man @@ -1,13 +1,13 @@ '\" t .\" Title: xichangeproperty .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] -.\" Generator: DocBook XSL Stylesheets v1.74.3 <http://docbook.sf.net/> -.\" Date: 10/02/2009 +.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> +.\" Date: 08/04/2010 .\" Manual: [FIXME: manual] .\" Source: [FIXME: source] .\" Language: English .\" -.TH "XICHANGEPROPERTY" "libmansuffix" "10/02/2009" "[FIXME: source]" "[FIXME: manual]" +.TH "XICHANGEPROPERTY" "libmansuffix" "08/04/2010" "[FIXME: source]" "[FIXME: manual]" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/lib/libXi/man/XIDefineCursor.man b/lib/libXi/man/XIDefineCursor.man index 1941a7ddf..86a7c0505 100644 --- a/lib/libXi/man/XIDefineCursor.man +++ b/lib/libXi/man/XIDefineCursor.man @@ -1,13 +1,13 @@ '\" t .\" Title: xidefinecursor .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] -.\" Generator: DocBook XSL Stylesheets v1.74.3 <http://docbook.sf.net/> -.\" Date: 10/02/2009 +.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> +.\" Date: 08/04/2010 .\" Manual: [FIXME: manual] .\" Source: [FIXME: source] .\" Language: English .\" -.TH "XIDEFINECURSOR" "libmansuffix" "10/02/2009" "[FIXME: source]" "[FIXME: manual]" +.TH "XIDEFINECURSOR" "libmansuffix" "08/04/2010" "[FIXME: source]" "[FIXME: manual]" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/lib/libXi/man/XIGrabButton.man b/lib/libXi/man/XIGrabButton.man index 27d6c3725..2369765bd 100644 --- a/lib/libXi/man/XIGrabButton.man +++ b/lib/libXi/man/XIGrabButton.man @@ -1,13 +1,13 @@ '\" t .\" Title: xigrabbutton .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] -.\" Generator: DocBook XSL Stylesheets v1.74.3 <http://docbook.sf.net/> -.\" Date: 10/02/2009 +.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> +.\" Date: 08/04/2010 .\" Manual: [FIXME: manual] .\" Source: [FIXME: source] .\" Language: English .\" -.TH "XIGRABBUTTON" "libmansuffix" "10/02/2009" "[FIXME: source]" "[FIXME: manual]" +.TH "XIGRABBUTTON" "libmansuffix" "08/04/2010" "[FIXME: source]" "[FIXME: manual]" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/lib/libXi/man/XIGrabDevice.man b/lib/libXi/man/XIGrabDevice.man index 6dc0125de..d66b26b80 100644 --- a/lib/libXi/man/XIGrabDevice.man +++ b/lib/libXi/man/XIGrabDevice.man @@ -1,13 +1,13 @@ '\" t .\" Title: xigrabdevice .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] -.\" Generator: DocBook XSL Stylesheets v1.74.3 <http://docbook.sf.net/> -.\" Date: 10/02/2009 +.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> +.\" Date: 08/04/2010 .\" Manual: [FIXME: manual] .\" Source: [FIXME: source] .\" Language: English .\" -.TH "XIGRABDEVICE" "libmansuffix" "10/02/2009" "[FIXME: source]" "[FIXME: manual]" +.TH "XIGRABDEVICE" "libmansuffix" "08/04/2010" "[FIXME: source]" "[FIXME: manual]" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/lib/libXi/man/XIGrabEnter.man b/lib/libXi/man/XIGrabEnter.man index de1b46ea8..324e2765e 100644 --- a/lib/libXi/man/XIGrabEnter.man +++ b/lib/libXi/man/XIGrabEnter.man @@ -1,13 +1,13 @@ '\" t .\" Title: xigrabenter .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] -.\" Generator: DocBook XSL Stylesheets v1.74.3 <http://docbook.sf.net/> -.\" Date: 10/02/2009 +.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> +.\" Date: 08/04/2010 .\" Manual: [FIXME: manual] .\" Source: [FIXME: source] .\" Language: English .\" -.TH "XIGRABENTER" "libmansuffix" "10/02/2009" "[FIXME: source]" "[FIXME: manual]" +.TH "XIGRABENTER" "libmansuffix" "08/04/2010" "[FIXME: source]" "[FIXME: manual]" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/lib/libXi/man/XIListProperties.man b/lib/libXi/man/XIListProperties.man index 0ce14ba91..ebfd671fb 100644 --- a/lib/libXi/man/XIListProperties.man +++ b/lib/libXi/man/XIListProperties.man @@ -1,13 +1,13 @@ '\" t .\" Title: xilistproperties .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] -.\" Generator: DocBook XSL Stylesheets v1.74.3 <http://docbook.sf.net/> -.\" Date: 10/02/2009 +.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> +.\" Date: 08/04/2010 .\" Manual: [FIXME: manual] .\" Source: [FIXME: source] .\" Language: English .\" -.TH "XILISTPROPERTIES" "libmansuffix" "10/02/2009" "[FIXME: source]" "[FIXME: manual]" +.TH "XILISTPROPERTIES" "libmansuffix" "08/04/2010" "[FIXME: source]" "[FIXME: manual]" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/lib/libXi/man/XIQueryDevice.man b/lib/libXi/man/XIQueryDevice.man index 5f9f6a6fc..72eac52bc 100644 --- a/lib/libXi/man/XIQueryDevice.man +++ b/lib/libXi/man/XIQueryDevice.man @@ -1,13 +1,13 @@ '\" t .\" Title: xiquerydevice .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] -.\" Generator: DocBook XSL Stylesheets v1.74.3 <http://docbook.sf.net/> -.\" Date: 10/02/2009 +.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> +.\" Date: 08/04/2010 .\" Manual: [FIXME: manual] .\" Source: [FIXME: source] .\" Language: English .\" -.TH "XIQUERYDEVICE" "libmansuffix" "10/02/2009" "[FIXME: source]" "[FIXME: manual]" +.TH "XIQUERYDEVICE" "libmansuffix" "08/04/2010" "[FIXME: source]" "[FIXME: manual]" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/lib/libXi/man/XIQueryPointer.man b/lib/libXi/man/XIQueryPointer.man index 88ba6077e..0f6017b7a 100644 --- a/lib/libXi/man/XIQueryPointer.man +++ b/lib/libXi/man/XIQueryPointer.man @@ -1,13 +1,13 @@ '\" t .\" Title: xiquerypointer .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] -.\" Generator: DocBook XSL Stylesheets v1.74.3 <http://docbook.sf.net/> -.\" Date: 10/02/2009 +.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> +.\" Date: 08/04/2010 .\" Manual: [FIXME: manual] .\" Source: [FIXME: source] .\" Language: English .\" -.TH "XIQUERYPOINTER" "libmansuffix" "10/02/2009" "[FIXME: source]" "[FIXME: manual]" +.TH "XIQUERYPOINTER" "libmansuffix" "08/04/2010" "[FIXME: source]" "[FIXME: manual]" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/lib/libXi/man/XIQueryVersion.man b/lib/libXi/man/XIQueryVersion.man index da8b158d2..07b982a8e 100644 --- a/lib/libXi/man/XIQueryVersion.man +++ b/lib/libXi/man/XIQueryVersion.man @@ -1,13 +1,13 @@ '\" t .\" Title: xiqueryversion .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] -.\" Generator: DocBook XSL Stylesheets v1.74.3 <http://docbook.sf.net/> -.\" Date: 10/02/2009 +.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> +.\" Date: 08/04/2010 .\" Manual: [FIXME: manual] .\" Source: [FIXME: source] .\" Language: English .\" -.TH "XIQUERYVERSION" "libmansuffix" "10/02/2009" "[FIXME: source]" "[FIXME: manual]" +.TH "XIQUERYVERSION" "libmansuffix" "08/04/2010" "[FIXME: source]" "[FIXME: manual]" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/lib/libXi/man/XISelectEvents.man b/lib/libXi/man/XISelectEvents.man index 7ca8a308e..8d93d4543 100644 --- a/lib/libXi/man/XISelectEvents.man +++ b/lib/libXi/man/XISelectEvents.man @@ -1,13 +1,13 @@ '\" t .\" Title: xiselectevents .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] -.\" Generator: DocBook XSL Stylesheets v1.74.3 <http://docbook.sf.net/> -.\" Date: 10/02/2009 +.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> +.\" Date: 08/04/2010 .\" Manual: [FIXME: manual] .\" Source: [FIXME: source] .\" Language: English .\" -.TH "XISELECTEVENTS" "libmansuffix" "10/02/2009" "[FIXME: source]" "[FIXME: manual]" +.TH "XISELECTEVENTS" "libmansuffix" "08/04/2010" "[FIXME: source]" "[FIXME: manual]" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/lib/libXi/man/XISetClientPointer.man b/lib/libXi/man/XISetClientPointer.man index 95142c086..da57093f2 100644 --- a/lib/libXi/man/XISetClientPointer.man +++ b/lib/libXi/man/XISetClientPointer.man @@ -1,13 +1,13 @@ '\" t .\" Title: xisetclientpointer .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] -.\" Generator: DocBook XSL Stylesheets v1.74.3 <http://docbook.sf.net/> -.\" Date: 10/02/2009 +.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> +.\" Date: 08/04/2010 .\" Manual: [FIXME: manual] .\" Source: [FIXME: source] .\" Language: English .\" -.TH "XISETCLIENTPOINTER" "libmansuffix" "10/02/2009" "[FIXME: source]" "[FIXME: manual]" +.TH "XISETCLIENTPOINTER" "libmansuffix" "08/04/2010" "[FIXME: source]" "[FIXME: manual]" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/lib/libXi/man/XISetFocus.man b/lib/libXi/man/XISetFocus.man index 419cafcac..50a1bb1c4 100644 --- a/lib/libXi/man/XISetFocus.man +++ b/lib/libXi/man/XISetFocus.man @@ -1,13 +1,13 @@ '\" t .\" Title: xisetfocus .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] -.\" Generator: DocBook XSL Stylesheets v1.74.3 <http://docbook.sf.net/> -.\" Date: 10/02/2009 +.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> +.\" Date: 08/04/2010 .\" Manual: [FIXME: manual] .\" Source: [FIXME: source] .\" Language: English .\" -.TH "XISETFOCUS" "libmansuffix" "10/02/2009" "[FIXME: source]" "[FIXME: manual]" +.TH "XISETFOCUS" "libmansuffix" "08/04/2010" "[FIXME: source]" "[FIXME: manual]" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/lib/libXi/man/XIWarpPointer.man b/lib/libXi/man/XIWarpPointer.man index f5c66eeb9..c23e43640 100644 --- a/lib/libXi/man/XIWarpPointer.man +++ b/lib/libXi/man/XIWarpPointer.man @@ -1,13 +1,13 @@ '\" t .\" Title: xiwarppointer .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] -.\" Generator: DocBook XSL Stylesheets v1.74.3 <http://docbook.sf.net/> -.\" Date: 10/02/2009 +.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> +.\" Date: 08/04/2010 .\" Manual: [FIXME: manual] .\" Source: [FIXME: source] .\" Language: English .\" -.TH "XIWARPPOINTER" "libmansuffix" "10/02/2009" "[FIXME: source]" "[FIXME: manual]" +.TH "XIWARPPOINTER" "libmansuffix" "08/04/2010" "[FIXME: source]" "[FIXME: manual]" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/lib/libXi/man/XListDeviceProperties.man b/lib/libXi/man/XListDeviceProperties.man index 43777df07..e2e9814fa 100644 --- a/lib/libXi/man/XListDeviceProperties.man +++ b/lib/libXi/man/XListDeviceProperties.man @@ -1,13 +1,13 @@ '\" t .\" Title: xlistdeviceproperties .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] -.\" Generator: DocBook XSL Stylesheets v1.74.3 <http://docbook.sf.net/> -.\" Date: 10/02/2009 +.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> +.\" Date: 08/04/2010 .\" Manual: [FIXME: manual] .\" Source: [FIXME: source] .\" Language: English .\" -.TH "XLISTDEVICEPROPERTIE" "libmansuffix" "10/02/2009" "[FIXME: source]" "[FIXME: manual]" +.TH "XLISTDEVICEPROPERTIE" "libmansuffix" "08/04/2010" "[FIXME: source]" "[FIXME: manual]" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/lib/libXi/man/XListInputDevices.man b/lib/libXi/man/XListInputDevices.man index aa478a0f0..0a66ef616 100644 --- a/lib/libXi/man/XListInputDevices.man +++ b/lib/libXi/man/XListInputDevices.man @@ -1,13 +1,13 @@ '\" t .\" Title: xlistinputdevices .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] -.\" Generator: DocBook XSL Stylesheets v1.74.3 <http://docbook.sf.net/> -.\" Date: 10/02/2009 +.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> +.\" Date: 08/04/2010 .\" Manual: [FIXME: manual] .\" Source: [FIXME: source] .\" Language: English .\" -.TH "XLISTINPUTDEVICES" "libmansuffix" "10/02/2009" "[FIXME: source]" "[FIXME: manual]" +.TH "XLISTINPUTDEVICES" "libmansuffix" "08/04/2010" "[FIXME: source]" "[FIXME: manual]" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/lib/libXi/man/XOpenDevice.man b/lib/libXi/man/XOpenDevice.man index e536541f9..6603f7409 100644 --- a/lib/libXi/man/XOpenDevice.man +++ b/lib/libXi/man/XOpenDevice.man @@ -1,13 +1,13 @@ '\" t .\" Title: xopendevice .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] -.\" Generator: DocBook XSL Stylesheets v1.74.3 <http://docbook.sf.net/> -.\" Date: 10/02/2009 +.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> +.\" Date: 08/04/2010 .\" Manual: [FIXME: manual] .\" Source: [FIXME: source] .\" Language: English .\" -.TH "XOPENDEVICE" "libmansuffix" "10/02/2009" "[FIXME: source]" "[FIXME: manual]" +.TH "XOPENDEVICE" "libmansuffix" "08/04/2010" "[FIXME: source]" "[FIXME: manual]" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/lib/libXi/man/XQueryDeviceState.man b/lib/libXi/man/XQueryDeviceState.man index 6b449be4b..e76d4f4c6 100644 --- a/lib/libXi/man/XQueryDeviceState.man +++ b/lib/libXi/man/XQueryDeviceState.man @@ -1,13 +1,13 @@ '\" t .\" Title: xquerydevicestate .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] -.\" Generator: DocBook XSL Stylesheets v1.74.3 <http://docbook.sf.net/> -.\" Date: 10/02/2009 +.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> +.\" Date: 08/04/2010 .\" Manual: [FIXME: manual] .\" Source: [FIXME: source] .\" Language: English .\" -.TH "XQUERYDEVICESTATE" "libmansuffix" "10/02/2009" "[FIXME: source]" "[FIXME: manual]" +.TH "XQUERYDEVICESTATE" "libmansuffix" "08/04/2010" "[FIXME: source]" "[FIXME: manual]" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/lib/libXi/man/XSelectExtensionEvent.man b/lib/libXi/man/XSelectExtensionEvent.man index e20cb0187..6b1b5a8fd 100644 --- a/lib/libXi/man/XSelectExtensionEvent.man +++ b/lib/libXi/man/XSelectExtensionEvent.man @@ -1,13 +1,13 @@ '\" t .\" Title: xselectextensionevent .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] -.\" Generator: DocBook XSL Stylesheets v1.74.3 <http://docbook.sf.net/> -.\" Date: 10/02/2009 +.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> +.\" Date: 08/04/2010 .\" Manual: [FIXME: manual] .\" Source: [FIXME: source] .\" Language: English .\" -.TH "XSELECTEXTENSIONEVEN" "libmansuffix" "10/02/2009" "[FIXME: source]" "[FIXME: manual]" +.TH "XSELECTEXTENSIONEVEN" "libmansuffix" "08/04/2010" "[FIXME: source]" "[FIXME: manual]" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- @@ -36,10 +36,10 @@ XSelectExtensionEvent( Display *display, .nf XGetSelectedExtensionEvents( Display *display, Window w, - int this_client_event_count_return, - XEventClass *this_client_event_list_return, - int all_clients_event_count_return, - XEventClass *all_clients_event_list_return); + int *this_client_event_count_return, + XEventClass **this_client_event_list_return, + int *all_clients_event_count_return, + XEventClass **all_clients_event_list_return); .fi .sp .nf diff --git a/lib/libXi/man/XSelectExtensionEvent.txt b/lib/libXi/man/XSelectExtensionEvent.txt index a31ca4037..cbcfffe49 100644 --- a/lib/libXi/man/XSelectExtensionEvent.txt +++ b/lib/libXi/man/XSelectExtensionEvent.txt @@ -20,10 +20,10 @@ SYNOPSIS XGetSelectedExtensionEvents( Display *display, Window w, - int this_client_event_count_return, - XEventClass *this_client_event_list_return, - int all_clients_event_count_return, - XEventClass *all_clients_event_list_return); + int *this_client_event_count_return, + XEventClass **this_client_event_list_return, + int *all_clients_event_count_return, + XEventClass **all_clients_event_list_return); display Specifies the connection to the X server. diff --git a/lib/libXi/man/XSendExtensionEvent.man b/lib/libXi/man/XSendExtensionEvent.man index 2db5527c2..6d745a9c1 100644 --- a/lib/libXi/man/XSendExtensionEvent.man +++ b/lib/libXi/man/XSendExtensionEvent.man @@ -1,13 +1,13 @@ '\" t .\" Title: xsendextensionevent .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] -.\" Generator: DocBook XSL Stylesheets v1.74.3 <http://docbook.sf.net/> -.\" Date: 10/02/2009 +.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> +.\" Date: 08/04/2010 .\" Manual: [FIXME: manual] .\" Source: [FIXME: source] .\" Language: English .\" -.TH "XSENDEXTENSIONEVENT" "libmansuffix" "10/02/2009" "[FIXME: source]" "[FIXME: manual]" +.TH "XSENDEXTENSIONEVENT" "libmansuffix" "08/04/2010" "[FIXME: source]" "[FIXME: manual]" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/lib/libXi/man/XSetDeviceButtonMapping.man b/lib/libXi/man/XSetDeviceButtonMapping.man index 6642675d8..1bfce526d 100644 --- a/lib/libXi/man/XSetDeviceButtonMapping.man +++ b/lib/libXi/man/XSetDeviceButtonMapping.man @@ -1,13 +1,13 @@ '\" t .\" Title: xsetdevicebuttonmapping .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] -.\" Generator: DocBook XSL Stylesheets v1.74.3 <http://docbook.sf.net/> -.\" Date: 10/02/2009 +.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> +.\" Date: 08/04/2010 .\" Manual: [FIXME: manual] .\" Source: [FIXME: source] .\" Language: English .\" -.TH "XSETDEVICEBUTTONMAPP" "libmansuffix" "10/02/2009" "[FIXME: source]" "[FIXME: manual]" +.TH "XSETDEVICEBUTTONMAPP" "libmansuffix" "08/04/2010" "[FIXME: source]" "[FIXME: manual]" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/lib/libXi/man/XSetDeviceFocus.man b/lib/libXi/man/XSetDeviceFocus.man index 2e1ff092f..4363aa05c 100644 --- a/lib/libXi/man/XSetDeviceFocus.man +++ b/lib/libXi/man/XSetDeviceFocus.man @@ -1,13 +1,13 @@ '\" t .\" Title: xsetdevicefocus .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] -.\" Generator: DocBook XSL Stylesheets v1.74.3 <http://docbook.sf.net/> -.\" Date: 10/02/2009 +.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> +.\" Date: 08/04/2010 .\" Manual: [FIXME: manual] .\" Source: [FIXME: source] .\" Language: English .\" -.TH "XSETDEVICEFOCUS" "libmansuffix" "10/02/2009" "[FIXME: source]" "[FIXME: manual]" +.TH "XSETDEVICEFOCUS" "libmansuffix" "08/04/2010" "[FIXME: source]" "[FIXME: manual]" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/lib/libXi/man/XSetDeviceMode.man b/lib/libXi/man/XSetDeviceMode.man index 38b6777cc..90705e349 100644 --- a/lib/libXi/man/XSetDeviceMode.man +++ b/lib/libXi/man/XSetDeviceMode.man @@ -1,13 +1,13 @@ '\" t .\" Title: xsetdevicemode .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] -.\" Generator: DocBook XSL Stylesheets v1.74.3 <http://docbook.sf.net/> -.\" Date: 10/02/2009 +.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> +.\" Date: 08/04/2010 .\" Manual: [FIXME: manual] .\" Source: [FIXME: source] .\" Language: English .\" -.TH "XSETDEVICEMODE" "libmansuffix" "10/02/2009" "[FIXME: source]" "[FIXME: manual]" +.TH "XSETDEVICEMODE" "libmansuffix" "08/04/2010" "[FIXME: source]" "[FIXME: manual]" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/lib/libXi/man/XSetDeviceValuators.man b/lib/libXi/man/XSetDeviceValuators.man index 39196dbe5..120a2a35c 100644 --- a/lib/libXi/man/XSetDeviceValuators.man +++ b/lib/libXi/man/XSetDeviceValuators.man @@ -1,13 +1,13 @@ '\" t .\" Title: xsetdevicevaluators .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] -.\" Generator: DocBook XSL Stylesheets v1.74.3 <http://docbook.sf.net/> -.\" Date: 10/02/2009 +.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> +.\" Date: 08/04/2010 .\" Manual: [FIXME: manual] .\" Source: [FIXME: source] .\" Language: English .\" -.TH "XSETDEVICEVALUATORS" "libmansuffix" "10/02/2009" "[FIXME: source]" "[FIXME: manual]" +.TH "XSETDEVICEVALUATORS" "libmansuffix" "08/04/2010" "[FIXME: source]" "[FIXME: manual]" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/lib/libXi/src/Makefile.in b/lib/libXi/src/Makefile.in index a6d6ea56b..8dc82bed2 100644 --- a/lib/libXi/src/Makefile.in +++ b/lib/libXi/src/Makefile.in @@ -134,14 +134,12 @@ FFLAGS = @FFLAGS@ FILE_MAN_DIR = @FILE_MAN_DIR@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ GREP = @GREP@ -HAVE_ASCIIDOC_FALSE = @HAVE_ASCIIDOC_FALSE@ -HAVE_ASCIIDOC_TRUE = @HAVE_ASCIIDOC_TRUE@ HAVE_DOCTOOLS_FALSE = @HAVE_DOCTOOLS_FALSE@ HAVE_DOCTOOLS_TRUE = @HAVE_DOCTOOLS_TRUE@ -HAVE_XMLTO_FALSE = @HAVE_XMLTO_FALSE@ -HAVE_XMLTO_TRUE = @HAVE_XMLTO_TRUE@ INSTALL_CMD = @INSTALL_CMD@ INSTALL_DATA = @INSTALL_DATA@ +INSTALL_MANPAGES_FALSE = @INSTALL_MANPAGES_FALSE@ +INSTALL_MANPAGES_TRUE = @INSTALL_MANPAGES_TRUE@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ @@ -158,6 +156,7 @@ MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@ +MAN_SUBSTS = @MAN_SUBSTS@ MISC_MAN_DIR = @MISC_MAN_DIR@ MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@ NMEDIT = @NMEDIT@ @@ -180,6 +179,7 @@ XI_CFLAGS = @XI_CFLAGS@ XI_LIBS = @XI_LIBS@ XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@ XMLTO = @XMLTO@ +XORG_MAN_PAGE = @XORG_MAN_PAGE@ XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ diff --git a/lib/libXi/src/XExtInt.c b/lib/libXi/src/XExtInt.c index e87ead8a9..80b3fc7cb 100644 --- a/lib/libXi/src/XExtInt.c +++ b/lib/libXi/src/XExtInt.c @@ -173,6 +173,63 @@ static char *XInputErrorList[] = { "BadClass, invalid event class", /* BadClass */ }; +/* Get the version supported by the server to know which number of +* events are support. Otherwise, a wrong number of events may smash +* the Xlib-internal event processing vector. +* +* Since the extension hasn't been initialized yet, we need to +* manually get the opcode, then the version. +*/ +static int +_XiFindEventsSupported(Display *dpy) +{ + XExtCodes codes; + XExtensionVersion *extversion = NULL; + int nevents = 0; + + if (!XQueryExtension(dpy, INAME, &codes.major_opcode, + &codes.first_event, &codes.first_error)) + goto out; + + LockDisplay(dpy); + extversion = _XiGetExtensionVersionRequest(dpy, INAME, codes.major_opcode); + UnlockDisplay(dpy); + SyncHandle(); + + if (!extversion || !extversion->present) + goto out; + + if (extversion->major_version >= 2) + nevents = IEVENTS; /* number is fixed, XI2 adds GenericEvents only */ + else if (extversion->major_version <= 0) + { + printf("XInput_find_display: invalid extension version %d.%d\n", + extversion->major_version, extversion->minor_version); + goto out; + } + else + { + switch(extversion->minor_version) + { + case XI_Add_DeviceProperties_Minor: + nevents = XI_DevicePropertyNotify + 1; + break; + case XI_Add_DevicePresenceNotify_Minor: + nevents = XI_DevicePresenceNotify + 1; + break; + default: + nevents = XI_DeviceButtonstateNotify + 1; + break; + } + } + +out: + if (extversion) + XFree(extversion); + return nevents; +} + + _X_HIDDEN XExtDisplayInfo *XInput_find_display (Display *dpy) { @@ -180,12 +237,17 @@ XExtDisplayInfo *XInput_find_display (Display *dpy) if (!xinput_info) { if (!(xinput_info = XextCreateExtension())) return NULL; } if (!(dpyinfo = XextFindDisplay (xinput_info, dpy))) { + int nevents = _XiFindEventsSupported(dpy); + dpyinfo = XextAddDisplay (xinput_info, dpy, xinput_extension_name, &xinput_extension_hooks, - IEVENTS, NULL); - XESetWireToEventCookie(dpy, dpyinfo->codes->major_opcode, XInputWireToCookie); - XESetCopyEventCookie(dpy, dpyinfo->codes->major_opcode, XInputCopyCookie); + nevents, NULL); + if (dpyinfo->codes) /* NULL if XI doesn't exist on the server */ + { + XESetWireToEventCookie(dpy, dpyinfo->codes->major_opcode, XInputWireToCookie); + XESetCopyEventCookie(dpy, dpyinfo->codes->major_opcode, XInputCopyCookie); + } } return dpyinfo; } diff --git a/lib/libXi/src/XGetVers.c b/lib/libXi/src/XGetVers.c index 3b500aeea..47186178c 100644 --- a/lib/libXi/src/XGetVers.c +++ b/lib/libXi/src/XGetVers.c @@ -72,19 +72,15 @@ XGetExtensionVersion(register Display * dpy, _Xconst char *name) return (ext); } -_X_HIDDEN XExtensionVersion * -_XiGetExtensionVersion(register Display * dpy, _Xconst char *name, - XExtDisplayInfo *info) +_X_HIDDEN XExtensionVersion* +_XiGetExtensionVersionRequest(Display *dpy, _Xconst char *name, int xi_opcode) { xGetExtensionVersionReq *req; xGetExtensionVersionReply rep; XExtensionVersion *ext; - if (_XiCheckExtInit(dpy, Dont_Check, info) == -1) - return ((XExtensionVersion *) NoSuchExtension); - GetReq(GetExtensionVersion, req); - req->reqType = info->codes->major_opcode; + req->reqType = xi_opcode; req->ReqType = X_GetExtensionVersion; req->nbytes = strlen(name); req->length += (unsigned)(req->nbytes + 3) >> 2; @@ -93,6 +89,7 @@ _XiGetExtensionVersion(register Display * dpy, _Xconst char *name, if (!_XReply(dpy, (xReply *) & rep, 0, xTrue)) { return (XExtensionVersion *) NULL; } + ext = (XExtensionVersion *) Xmalloc(sizeof(XExtensionVersion)); if (ext) { ext->present = rep.present; @@ -101,5 +98,16 @@ _XiGetExtensionVersion(register Display * dpy, _Xconst char *name, ext->minor_version = rep.minor_version; } } - return (ext); + + return ext; +} + +_X_HIDDEN XExtensionVersion * +_XiGetExtensionVersion(register Display * dpy, _Xconst char *name, + XExtDisplayInfo *info) +{ + if (_XiCheckExtInit(dpy, Dont_Check, info) == -1) + return ((XExtensionVersion *) NoSuchExtension); + + return _XiGetExtensionVersionRequest(dpy, name, info->codes->major_opcode); } diff --git a/lib/libXi/src/XIProperties.c b/lib/libXi/src/XIProperties.c index 045cc715f..0f77e5849 100644 --- a/lib/libXi/src/XIProperties.c +++ b/lib/libXi/src/XIProperties.c @@ -150,6 +150,7 @@ XIChangeProperty(Display* dpy, int deviceid, Atom property, Atom type, default: /* BadValue will be generated */ ; + len = 0; } /* we use data instead of Data32 and friends to avoid Xlib's braindead diff --git a/lib/libXi/src/XIQueryVersion.c b/lib/libXi/src/XIQueryVersion.c index a14e9c987..1e4f9a443 100644 --- a/lib/libXi/src/XIQueryVersion.c +++ b/lib/libXi/src/XIQueryVersion.c @@ -60,7 +60,6 @@ _xiQueryVersion(Display * dpy, int *major, int *minor, XExtDisplayInfo *info) if (!info || !info->data) { *major = 0; *minor = 0; - UnlockDisplay(dpy); return BadRequest; } diff --git a/lib/libXi/src/XISelEv.c b/lib/libXi/src/XISelEv.c index bdc4fd1b0..f1f3fa425 100644 --- a/lib/libXi/src/XISelEv.c +++ b/lib/libXi/src/XISelEv.c @@ -48,11 +48,14 @@ XISelectEvents(Display* dpy, Window win, XIEventMask* masks, int num_masks) xXIEventMask mask; int i; int len = 0; + int r = Success; XExtDisplayInfo *info = XInput_find_display(dpy); LockDisplay(dpy); - if (_XiCheckExtInit(dpy, Dont_Check, info) == -1) - return (NoSuchExtension); + if (_XiCheckExtInit(dpy, Dont_Check, info) == -1) { + r = NoSuchExtension; + goto out; + } GetReq(XISelectEvents, req); req->reqType = info->codes->major_opcode; @@ -85,9 +88,10 @@ XISelectEvents(Display* dpy, Window win, XIEventMask* masks, int num_masks) free(buff); } +out: UnlockDisplay(dpy); SyncHandle(); - return Success; + return r; } @@ -100,14 +104,12 @@ XIGetSelectedEvents(Display* dpy, Window win, int *num_masks_return) xXIEventMask *mask_in = NULL, *mi; xXIGetSelectedEventsReq *req; xXIGetSelectedEventsReply reply; - XExtDisplayInfo *info = XInput_find_display(dpy); + + *num_masks_return = -1; LockDisplay(dpy); if (_XiCheckExtInit(dpy, Dont_Check, info) == -1) - { - *num_masks_return = -1; - return NULL; - } + goto out; GetReq(XIGetSelectedEvents, req); @@ -116,17 +118,17 @@ XIGetSelectedEvents(Display* dpy, Window win, int *num_masks_return) req->win = win; if (!_XReply(dpy, (xReply *) &reply, 0, xFalse)) - goto error; + goto out; if (reply.num_masks == 0) { *num_masks_return = 0; - return NULL; + goto out; } mask_in = Xmalloc(reply.length * 4); if (!mask_in) - goto error; + goto out; _XRead(dpy, (char*)mask_in, reply.length * 4); @@ -144,7 +146,7 @@ XIGetSelectedEvents(Display* dpy, Window win, int *num_masks_return) mask_out = Xmalloc(len); if (!mask_out) - goto error; + goto out; mi = mask_in; mask = (unsigned char*)&mask_out[reply.num_masks]; @@ -161,14 +163,11 @@ XIGetSelectedEvents(Display* dpy, Window win, int *num_masks_return) *num_masks_return = reply.num_masks; - return mask_out; +out: + Xfree(mask_in); -error: - if (mask_in) - Xfree(mask_in); - *num_masks_return = -1; UnlockDisplay(dpy); SyncHandle(); - return NULL; + return mask_out; } diff --git a/lib/libXi/src/XIint.h b/lib/libXi/src/XIint.h index 400c92077..00e84d354 100644 --- a/lib/libXi/src/XIint.h +++ b/lib/libXi/src/XIint.h @@ -14,6 +14,7 @@ extern XExtDisplayInfo *XInput_find_display(Display *); extern int _XiCheckExtInit(Display *, int, XExtDisplayInfo *); extern XExtensionVersion *_XiGetExtensionVersion(Display *, _Xconst char *, XExtDisplayInfo *); +extern XExtensionVersion* _XiGetExtensionVersionRequest(Display *dpy, _Xconst char *name, int xi_opcode); extern Status _xiQueryVersion(Display *dpy, int*, int*, XExtDisplayInfo *); extern Status _XiEventToWire( |