Update to xcb-util-keysyms 0.4.0

13 files changed, 777 insertions, 99 deletions

diff --git a/lib/xcb-util-keysyms/ChangeLog b/lib/xcb-util-keysyms/ChangeLog
index 9e9e21bd2..820f74f2f 100644
--- a/lib/xcb-util-keysyms/ChangeLog
+++ b/lib/xcb-util-keysyms/ChangeLog
@@ -1,3 +1,90 @@
+commit 0e51ee5570a6a80bdf98770b975dfe8a57f4eeb1
+Author: Arnaud Fontaine <arnau@debian.org>
+Date:   Wed Sep 24 20:03:48 2014 +0900
+
+    Release 0.4.0
+
+commit 79fc93047b97fc038a92b48dcd1ca0ec3896c9aa
+Author: Arnaud Fontaine <arnau@debian.org>
+Date:   Wed Oct 1 12:05:30 2014 +0900
+
+    Remove old/outdated documentation crufts.
+
+commit 03a23b71e44ca73baae1b2da8d6783ee193b82c8
+Author: Arnaud Fontaine <arnau@debian.org>
+Date:   Wed Sep 24 20:01:47 2014 +0900
+
+    Pick-up changes in m4 submodule as it's better to have all util repos at same m4 level.
+
+commit ae88512d7f142a50a75a48ff52320e5e1f3ad236
+Author: Uli Schlachter <psychon@znc.in>
+Date:   Sat Nov 16 12:33:40 2013 +0100
+
+    Fix handling of error connections
+    
+    When an xcb_connection_t goes into an error state, all operations on it will
+    fail. This means that after a call to xcb_key_symbols_get_reply(), syms->u.reply
+    would still be a NULL pointer and that xcb_get_setup() returns a NULL pointer.
+    
+    The only way for xcb_get_setup() to return NULL is for an error connection, but
+    xcb_get_keyboard_mapping_reply() could also fail for other reasons. So to fix
+    this, all functions need to check for error connections and if syms->u.reply is
+    not NULL.
+    
+    This was tested with the following C code:
+    
+      #include <xcb_keysyms.h>
+      #include <stdio.h>
+      #include <stdlib.h>
+    
+      int main()
+      {
+      	xcb_connection_t *c = xcb_connect(NULL, NULL);
+      	xcb_key_symbols_t *syms = xcb_key_symbols_alloc(c);
+      	/* The above sent a GetKeyboardMapping request. Let's now break the
+      	 * connection so that it cannot get the reply.
+      	 */
+      	uint32_t max = xcb_get_maximum_request_length(c);
+      	xcb_screen_t *s = xcb_setup_roots_iterator(xcb_get_setup(c)).data;
+      	size_t len = (max << 2) * 2;
+      	void *p = malloc(len);
+    
+      	printf("Sending request of length %d*2=%d\n",
+      			xcb_get_maximum_request_length(c), len);
+      	xcb_change_property(c, XCB_PROP_MODE_REPLACE, s->root,
+      			XCB_ATOM_STRING, XCB_ATOM_STRING, 8, len, p);
+      	free(p);
+    
+      	if (!xcb_connection_has_error(c))
+      		puts("Connection did not break :(");
+    
+      	/* Crash? */
+      	free(xcb_key_symbols_get_keycode(syms, 0xff14));
+    
+      	return 0;
+      }
+    
+    Reference: https://awesome.naquadah.org/bugs/index.php?do=details&task_id=1195
+    Signed-off-by: Uli Schlachter <psychon@znc.in>
+
+commit 3d7b2ba8299cb2d0e2f5e58f61c1a60625f2d015
+Author: Bastien Dejean <nihilhill@gmail.com>
+Date:   Wed Jan 2 21:13:12 2013 +0100
+
+    Duplicate keycodes are unnecessary
+    
+    When multiple keysym matches occur on one keycode, we do not want to
+    return that keycode multiple times.
+    
+    Signed-off-by: Bastien Dejean <nihilhill@gmail.com>
+    Signed-off-by: Michael Stapelberg <michael+xcb@stapelberg.de>
+
+commit e527fdc914d4b4fa816ea9e563c6abf6505b39d3
+Author: Michael Stapelberg <michael@stapelberg.de>
+Date:   Wed Oct 10 09:09:38 2012 +0200
+
+    autogen.sh: verify that git submodules are initialized
+
 commit 12fc61fbbdf1ca2df25281a7d8e00f2dab75d1c2
 Author: Arnaud Fontaine <arnau@debian.org>
 Date:   Wed May 30 21:07:38 2012 +0900
diff --git a/lib/xcb-util-keysyms/INSTALL b/lib/xcb-util-keysyms/INSTALL
index 8b82ade08..a1e89e18a 100644
--- a/lib/xcb-util-keysyms/INSTALL
+++ b/lib/xcb-util-keysyms/INSTALL
@@ -1,11 +1,13 @@
 Installation Instructions
 *************************
 
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
-2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright (C) 1994-1996, 1999-2002, 2004-2011 Free Software Foundation,
+Inc.
 
-   This file is free documentation; the Free Software Foundation gives
-unlimited permission to copy, distribute and modify it.
+   Copying and distribution of this file, with or without modification,
+are permitted in any medium without royalty provided the copyright
+notice and this notice are preserved.  This file is offered as-is,
+without warranty of any kind.
 
 Basic Installation
 ==================
@@ -13,7 +15,11 @@ Basic Installation
    Briefly, the shell commands `./configure; make; make install' should
 configure, build, and install this package.  The following
 more-detailed instructions are generic; see the `README' file for
-instructions specific to this package.
+instructions specific to this package.  Some packages provide this
+`INSTALL' file but do not implement all of the features documented
+below.  The lack of an optional feature in a given package is not
+necessarily a bug.  More recommendations for GNU packages can be found
+in *note Makefile Conventions: (standards)Makefile Conventions.
 
    The `configure' shell script attempts to guess correct values for
 various system-dependent variables used during compilation.  It uses
@@ -42,7 +48,7 @@ may remove or edit it.
 you want to change it or regenerate `configure' using a newer version
 of `autoconf'.
 
-The simplest way to compile this package is:
+   The simplest way to compile this package is:
 
   1. `cd' to the directory containing the package's source code and type
      `./configure' to configure the package for your system.
@@ -53,12 +59,22 @@ The simplest way to compile this package is:
   2. Type `make' to compile the package.
 
   3. Optionally, type `make check' to run any self-tests that come with
-     the package.
+     the package, generally using the just-built uninstalled binaries.
 
   4. Type `make install' to install the programs and any data files and
-     documentation.
-
-  5. You can remove the program binaries and object files from the
+     documentation.  When installing into a prefix owned by root, it is
+     recommended that the package be configured and built as a regular
+     user, and only the `make install' phase executed with root
+     privileges.
+
+  5. Optionally, type `make installcheck' to repeat any self-tests, but
+     this time using the binaries in their final installed location.
+     This target does not install anything.  Running this target as a
+     regular user, particularly if the prior `make install' required
+     root privileges, verifies that the installation completed
+     correctly.
+
+  6. You can remove the program binaries and object files from the
      source code directory by typing `make clean'.  To also remove the
      files that `configure' created (so you can compile the package for
      a different kind of computer), type `make distclean'.  There is
@@ -67,8 +83,15 @@ The simplest way to compile this package is:
      all sorts of other programs in order to regenerate files that came
      with the distribution.
 
-  6. Often, you can also type `make uninstall' to remove the installed
-     files again.
+  7. Often, you can also type `make uninstall' to remove the installed
+     files again.  In practice, not all packages have tested that
+     uninstallation works correctly, even though it is required by the
+     GNU Coding Standards.
+
+  8. Some packages, particularly those that use Automake, provide `make
+     distcheck', which can by used by developers to test that all other
+     targets like `make install' and `make uninstall' work correctly.
+     This target is generally not run by end users.
 
 Compilers and Options
 =====================
@@ -93,7 +116,8 @@ same time, by placing the object files for each architecture in their
 own directory.  To do this, you can use GNU `make'.  `cd' to the
 directory where you want the object files and executables to go and run
 the `configure' script.  `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'.
+source code in the directory that `configure' is in and in `..'.  This
+is known as a "VPATH" build.
 
    With a non-GNU `make', it is safer to compile the package for one
 architecture at a time in the source code directory.  After you have
@@ -120,7 +144,8 @@ Installation Names
    By default, `make install' installs the package's commands under
 `/usr/local/bin', include files under `/usr/local/include', etc.  You
 can specify an installation prefix other than `/usr/local' by giving
-`configure' the option `--prefix=PREFIX'.
+`configure' the option `--prefix=PREFIX', where PREFIX must be an
+absolute file name.
 
    You can specify separate installation prefixes for
 architecture-specific files and architecture-independent files.  If you
@@ -131,15 +156,46 @@ Documentation and other data files still use the regular prefix.
    In addition, if you use an unusual directory layout you can give
 options like `--bindir=DIR' to specify different values for particular
 kinds of files.  Run `configure --help' for a list of the directories
-you can set and what kinds of files go in them.
+you can set and what kinds of files go in them.  In general, the
+default for these options is expressed in terms of `${prefix}', so that
+specifying just `--prefix' will affect all of the other directory
+specifications that were not explicitly provided.
+
+   The most portable way to affect installation locations is to pass the
+correct locations to `configure'; however, many packages provide one or
+both of the following shortcuts of passing variable assignments to the
+`make install' command line to change installation locations without
+having to reconfigure or recompile.
+
+   The first method involves providing an override variable for each
+affected directory.  For example, `make install
+prefix=/alternate/directory' will choose an alternate location for all
+directory configuration variables that were expressed in terms of
+`${prefix}'.  Any directories that were specified during `configure',
+but not in terms of `${prefix}', must each be overridden at install
+time for the entire installation to be relocated.  The approach of
+makefile variable overrides for each directory variable is required by
+the GNU Coding Standards, and ideally causes no recompilation.
+However, some platforms have known limitations with the semantics of
+shared libraries that end up requiring recompilation when using this
+method, particularly noticeable in packages that use GNU Libtool.
+
+   The second method involves providing the `DESTDIR' variable.  For
+example, `make install DESTDIR=/alternate/directory' will prepend
+`/alternate/directory' before all installation names.  The approach of
+`DESTDIR' overrides is not required by the GNU Coding Standards, and
+does not work on platforms that have drive letters.  On the other hand,
+it does better at avoiding recompilation issues, and works well even
+when some directory options were not specified in terms of `${prefix}'
+at `configure' time.
+
+Optional Features
+=================
 
    If the package supports it, you can cause programs to be installed
 with an extra prefix or suffix on their names by giving `configure' the
 option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
 
-Optional Features
-=================
-
    Some packages pay attention to `--enable-FEATURE' options to
 `configure', where FEATURE indicates an optional part of the package.
 They may also pay attention to `--with-PACKAGE' options, where PACKAGE
@@ -152,6 +208,13 @@ find the X include and library files automatically, but if it doesn't,
 you can use the `configure' options `--x-includes=DIR' and
 `--x-libraries=DIR' to specify their locations.
 
+   Some packages offer the ability to configure how verbose the
+execution of `make' will be.  For these packages, running `./configure
+--enable-silent-rules' sets the default to minimal output, which can be
+overridden with `make V=1'; while running `./configure
+--disable-silent-rules' sets the default to verbose, which can be
+overridden with `make V=0'.
+
 Particular systems
 ==================
 
@@ -159,10 +222,15 @@ Particular systems
 CC is not installed, it is recommended to use the following options in
 order to use an ANSI C compiler:
 
-     ./configure CC="cc -Ae"
+     ./configure CC="cc -Ae -D_XOPEN_SOURCE=500"
 
 and if that doesn't work, install pre-built binaries of GCC for HP-UX.
 
+   HP-UX `make' updates targets which have the same time stamps as
+their prerequisites, which makes it generally unusable when shipped
+generated files such as `configure' are involved.  Use GNU `make'
+instead.
+
    On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
 parse its `<wchar.h>' header file.  The option `-nodtk' can be used as
 a workaround.  If GNU CC is not installed, it is therefore recommended
@@ -174,6 +242,16 @@ and if that doesn't work, try
 
      ./configure CC="cc -nodtk"
 
+   On Solaris, don't put `/usr/ucb' early in your `PATH'.  This
+directory contains several dysfunctional programs; working variants of
+these programs are available in `/usr/bin'.  So, if you need `/usr/ucb'
+in your `PATH', put it _after_ `/usr/bin'.
+
+   On Haiku, software installed for all users goes in `/boot/common',
+not `/usr/local'.  It is recommended to use the following options:
+
+     ./configure --prefix=/boot/common
+
 Specifying the System Type
 ==========================
 
@@ -189,7 +267,8 @@ type, such as `sun4', or a canonical name which has the form:
 
 where SYSTEM can have one of these forms:
 
-     OS KERNEL-OS
+     OS
+     KERNEL-OS
 
    See the file `config.sub' for the possible values of each field.  If
 `config.sub' isn't included in this package, then this package doesn't
@@ -277,7 +356,7 @@ operates.
      `configure' can determine that directory automatically.
 
 `--prefix=DIR'
-     Use DIR as the installation prefix.  *Note Installation Names::
+     Use DIR as the installation prefix.  *note Installation Names::
      for more details, including other options available for fine-tuning
      the installation locations.
 
diff --git a/lib/xcb-util-keysyms/Makefile.in b/lib/xcb-util-keysyms/Makefile.in
index f047e059d..e0772e889 100644
--- a/lib/xcb-util-keysyms/Makefile.in
+++ b/lib/xcb-util-keysyms/Makefile.in
@@ -51,9 +51,9 @@ build_triplet = @build@
 host_triplet = @host@
 subdir = .
 DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in $(srcdir)/xcb_util_intro.in \
-	$(top_srcdir)/configure ChangeLog INSTALL NEWS config.guess \
-	config.sub depcomp install-sh ltmain.sh missing
+	$(srcdir)/Makefile.in $(top_srcdir)/configure ChangeLog \
+	INSTALL NEWS compile config.guess config.sub depcomp \
+	install-sh ltmain.sh missing
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_compare_version.m4 \
 	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
@@ -65,7 +65,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
  configure.lineno config.status.lineno
 mkinstalldirs = $(install_sh) -d
-CONFIG_CLEAN_FILES = xcb_util_intro
+CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
@@ -168,6 +168,7 @@ CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
+DOT = @DOT@
 DOXYGEN = @DOXYGEN@
 DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
 DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
@@ -182,6 +183,7 @@ FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 GREP = @GREP@
+HAVE_DOT = @HAVE_DOT@
 INSTALL = @INSTALL@
 INSTALL_CMD = @INSTALL_CMD@
 INSTALL_DATA = @INSTALL_DATA@
@@ -329,8 +331,6 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	$(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 $(am__aclocal_m4_deps):
-xcb_util_intro: $(top_builddir)/config.status $(srcdir)/xcb_util_intro.in
-	cd $(top_builddir) && $(SHELL) ./config.status $@
 
 mostlyclean-libtool:
 	-rm -f *.lo
diff --git a/lib/xcb-util-keysyms/NEWS b/lib/xcb-util-keysyms/NEWS
index 0221d7646..36308cf20 100644
--- a/lib/xcb-util-keysyms/NEWS
+++ b/lib/xcb-util-keysyms/NEWS
@@ -1,3 +1,9 @@
+Release 0.4.0 (2014-10-01)
+==========================
+
+- Duplicate keycodes are unnecessary.
+- Fix handling of error connections.
+
 Release 0.3.9 (2012-05-30)
 ==========================
 
diff --git a/lib/xcb-util-keysyms/aclocal.m4 b/lib/xcb-util-keysyms/aclocal.m4
index 82632972f..6e213fbec 100644
--- a/lib/xcb-util-keysyms/aclocal.m4
+++ b/lib/xcb-util-keysyms/aclocal.m4
@@ -1286,7 +1286,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.17.1])
+m4_define([vers_have], [1.19.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,,
@@ -1336,6 +1336,7 @@ if test `${RAWCPP} < conftest.$ac_ext | grep -c 'preserve   \"'` -eq 1 ; then
 	AC_MSG_RESULT([no])
 else
 	if test `${RAWCPP} -traditional < conftest.$ac_ext | grep -c 'preserve   \"'` -eq 1 ; then
+		TRADITIONALCPPFLAGS="-traditional"
 		RAWCPPFLAGS="${RAWCPPFLAGS} -traditional"
 		AC_MSG_RESULT([yes])
 	else
@@ -1344,6 +1345,7 @@ else
 fi
 rm -f conftest.$ac_ext
 AC_SUBST(RAWCPPFLAGS)
+AC_SUBST(TRADITIONALCPPFLAGS)
 ]) # XORG_PROG_RAWCPP
 
 # XORG_MANPAGE_SECTIONS()
@@ -1868,9 +1870,10 @@ AM_CONDITIONAL([HAVE_ASCIIDOC], [test "$have_asciidoc" = yes])
 ]) # XORG_WITH_ASCIIDOC
 
 # XORG_WITH_DOXYGEN([MIN-VERSION], [DEFAULT])
-# --------------------------------
+# -------------------------------------------
 # Minimum version: 1.5.0
 # Minimum version for optional DEFAULT argument: 1.11.0
+# Minimum version for optional DOT checking: 1.18.0
 #
 # Documentation tools are not always available on all platforms and sometimes
 # not at the appropriate level. This macro enables a module to test for the
@@ -1890,6 +1893,7 @@ AM_CONDITIONAL([HAVE_ASCIIDOC], [test "$have_asciidoc" = yes])
 #
 AC_DEFUN([XORG_WITH_DOXYGEN],[
 AC_ARG_VAR([DOXYGEN], [Path to doxygen command])
+AC_ARG_VAR([DOT], [Path to the dot graphics utility])
 m4_define([_defopt], m4_default([$2], [auto]))
 AC_ARG_WITH(doxygen,
 	AS_HELP_STRING([--with-doxygen],
@@ -1933,6 +1937,20 @@ m4_ifval([$1],
             AC_MSG_ERROR([doxygen version $doxygen_version found, but $1 needed])
         fi])
 fi])
+
+dnl Check for DOT if we have doxygen. The caller decides if it is mandatory
+dnl HAVE_DOT is a variable that can be used in your doxygen.in config file:
+dnl 	HAVE_DOT = @HAVE_DOT@
+HAVE_DOT=no
+if test "x$have_doxygen" = "xyes"; then
+  AC_PATH_PROG([DOT], [dot])
+    if test "x$DOT" != "x"; then
+      HAVE_DOT=yes
+    fi
+fi
+
+AC_SUBST([HAVE_DOT])
+AM_CONDITIONAL([HAVE_DOT], [test "$HAVE_DOT" = "yes"])
 AM_CONDITIONAL([HAVE_DOXYGEN], [test "$have_doxygen" = yes])
 ]) # XORG_WITH_DOXYGEN
 
@@ -2115,6 +2133,29 @@ fi])
 AM_CONDITIONAL([HAVE_FOP], [test "$have_fop" = yes])
 ]) # XORG_WITH_FOP
 
+# XORG_WITH_M4([MIN-VERSION])
+# ---------------------------
+# Minimum version: 1.19.0
+#
+# This macro attempts to locate an m4 macro processor which supports
+# -I option and is only useful for modules relying on M4 in order to
+# expand macros in source code files.
+#
+# Interface to module:
+# M4:	 	returns the path of the m4 program found
+#		returns the path set by the user in the environment
+#
+AC_DEFUN([XORG_WITH_M4], [
+AC_CACHE_CHECK([for m4 that supports -I option], [ac_cv_path_M4],
+   [AC_PATH_PROGS_FEATURE_CHECK([M4], [m4 gm4],
+       [[$ac_path_M4 -I. /dev/null > /dev/null 2>&1 && \
+         ac_cv_path_M4=$ac_path_M4 ac_path_M4_found=:]],
+   [AC_MSG_ERROR([could not find m4 that supports -I option])],
+   [$PATH:/usr/gnu/bin])])
+
+AC_SUBST([M4], [$ac_cv_path_M4])
+]) # XORG_WITH_M4
+
 # XORG_WITH_PS2PDF([DEFAULT])
 # ----------------
 # Minimum version: 1.6.0
@@ -2569,7 +2610,8 @@ AC_ARG_ENABLE(malloc0returnsnull,
 
 AC_MSG_CHECKING([whether malloc(0) returns NULL])
 if test "x$MALLOC_ZERO_RETURNS_NULL" = xauto; then
-	AC_RUN_IFELSE([AC_LANG_PROGRAM([
+AC_CACHE_VAL([xorg_cv_malloc0_returns_null],
+	[AC_RUN_IFELSE([AC_LANG_PROGRAM([
 #include <stdlib.h>
 ],[
     char *m0, *r0, *c0, *p;
@@ -2579,9 +2621,9 @@ if test "x$MALLOC_ZERO_RETURNS_NULL" = xauto; then
     c0 = calloc(0,10);
     exit((m0 == 0 || r0 == 0 || c0 == 0) ? 0 : 1);
 ])],
-		[MALLOC_ZERO_RETURNS_NULL=yes],
-		[MALLOC_ZERO_RETURNS_NULL=no],
-		[MALLOC_ZERO_RETURNS_NULL=yes])
+		[xorg_cv_malloc0_returns_null=yes],
+		[xorg_cv_malloc0_returns_null=no])])
+MALLOC_ZERO_RETURNS_NULL=$xorg_cv_malloc0_returns_null
 fi
 AC_MSG_RESULT([$MALLOC_ZERO_RETURNS_NULL])
 
@@ -2870,7 +2912,7 @@ AC_LANG_CASE(
 		XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wmissing-prototypes])
 		XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wnested-externs])
 		XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wbad-function-cast])
-		XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wold-style-definition])
+		XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wold-style-definition], [-fd])
 		XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wdeclaration-after-statement])
 	]
 )
@@ -2879,16 +2921,17 @@ AC_LANG_CASE(
 XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wunused])
 XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wuninitialized])
 XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wshadow])
-XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wcast-qual])
 XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wmissing-noreturn])
 XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wmissing-format-attribute])
+# XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wredundant-decls])
+XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wlogical-op])
 
 # These are currently disabled because they are noisy.  They will be enabled
 # in the future once the codebase is sufficiently modernized to silence
 # them.  For now, I don't want them to drown out the other warnings.
-# XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wlogical-op])
 # XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wparentheses])
 # XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wcast-align])
+# XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wcast-qual])
 
 # Turn some warnings into errors, so we don't accidently get successful builds
 # when there are problems that should be fixed.
diff --git a/lib/xcb-util-keysyms/autogen.sh b/lib/xcb-util-keysyms/autogen.sh
index 904cd6746..afe529980 100644
--- a/lib/xcb-util-keysyms/autogen.sh
+++ b/lib/xcb-util-keysyms/autogen.sh
@@ -6,6 +6,21 @@ test -z "$srcdir" && srcdir=.
 ORIGDIR=`pwd`
 cd $srcdir
 
+# If this is a git checkout, verify that the submodules are initialized,
+# otherwise autotools will just fail with an unhelpful error message.
+if [ -d ".git" ] && [ -r ".gitmodules" ]
+then
+	# If git is not in PATH, this will not return 0, thus not keeping us
+	# from building. Since the message is worthless when git is not
+	# installed, this is what we want.
+	if git submodule status 2>/dev/null | grep -q '^-'
+	then
+		echo "You have uninitialized git submodules." >&2
+		echo "Please run: git submodule update --init" >&2
+		exit 1
+	fi
+fi
+
 autoreconf -v --install || exit 1
 cd $ORIGDIR || exit $?
 
diff --git a/lib/xcb-util-keysyms/compile b/lib/xcb-util-keysyms/compile
new file mode 100644
index 000000000..531136b06
--- /dev/null
+++ b/lib/xcb-util-keysyms/compile
@@ -0,0 +1,347 @@
+#! /bin/sh
+# Wrapper for compilers which do not understand '-c -o'.
+
+scriptversion=2012-10-14.11; # UTC
+
+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Written by Tom Tromey <tromey@cygnus.com>.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# This file is maintained in Automake, please report
+# bugs to <bug-automake@gnu.org> or send patches to
+# <automake-patches@gnu.org>.
+
+nl='
+'
+
+# We need space, tab and new line, in precisely that order.  Quoting is
+# there to prevent tools from complaining about whitespace usage.
+IFS=" ""	$nl"
+
+file_conv=
+
+# func_file_conv build_file lazy
+# Convert a $build file to $host form and store it in $file
+# Currently only supports Windows hosts. If the determined conversion
+# type is listed in (the comma separated) LAZY, no conversion will
+# take place.
+func_file_conv ()
+{
+  file=$1
+  case $file in
+    / | /[!/]*) # absolute file, and not a UNC file
+      if test -z "$file_conv"; then
+	# lazily determine how to convert abs files
+	case `uname -s` in
+	  MINGW*)
+	    file_conv=mingw
+	    ;;
+	  CYGWIN*)
+	    file_conv=cygwin
+	    ;;
+	  *)
+	    file_conv=wine
+	    ;;
+	esac
+      fi
+      case $file_conv/,$2, in
+	*,$file_conv,*)
+	  ;;
+	mingw/*)
+	  file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
+	  ;;
+	cygwin/*)
+	  file=`cygpath -m "$file" || echo "$file"`
+	  ;;
+	wine/*)
+	  file=`winepath -w "$file" || echo "$file"`
+	  ;;
+      esac
+      ;;
+  esac
+}
+
+# func_cl_dashL linkdir
+# Make cl look for libraries in LINKDIR
+func_cl_dashL ()
+{
+  func_file_conv "$1"
+  if test -z "$lib_path"; then
+    lib_path=$file
+  else
+    lib_path="$lib_path;$file"
+  fi
+  linker_opts="$linker_opts -LIBPATH:$file"
+}
+
+# func_cl_dashl library
+# Do a library search-path lookup for cl
+func_cl_dashl ()
+{
+  lib=$1
+  found=no
+  save_IFS=$IFS
+  IFS=';'
+  for dir in $lib_path $LIB
+  do
+    IFS=$save_IFS
+    if $shared && test -f "$dir/$lib.dll.lib"; then
+      found=yes
+      lib=$dir/$lib.dll.lib
+      break
+    fi
+    if test -f "$dir/$lib.lib"; then
+      found=yes
+      lib=$dir/$lib.lib
+      break
+    fi
+    if test -f "$dir/lib$lib.a"; then
+      found=yes
+      lib=$dir/lib$lib.a
+      break
+    fi
+  done
+  IFS=$save_IFS
+
+  if test "$found" != yes; then
+    lib=$lib.lib
+  fi
+}
+
+# func_cl_wrapper cl arg...
+# Adjust compile command to suit cl
+func_cl_wrapper ()
+{
+  # Assume a capable shell
+  lib_path=
+  shared=:
+  linker_opts=
+  for arg
+  do
+    if test -n "$eat"; then
+      eat=
+    else
+      case $1 in
+	-o)
+	  # configure might choose to run compile as 'compile cc -o foo foo.c'.
+	  eat=1
+	  case $2 in
+	    *.o | *.[oO][bB][jJ])
+	      func_file_conv "$2"
+	      set x "$@" -Fo"$file"
+	      shift
+	      ;;
+	    *)
+	      func_file_conv "$2"
+	      set x "$@" -Fe"$file"
+	      shift
+	      ;;
+	  esac
+	  ;;
+	-I)
+	  eat=1
+	  func_file_conv "$2" mingw
+	  set x "$@" -I"$file"
+	  shift
+	  ;;
+	-I*)
+	  func_file_conv "${1#-I}" mingw
+	  set x "$@" -I"$file"
+	  shift
+	  ;;
+	-l)
+	  eat=1
+	  func_cl_dashl "$2"
+	  set x "$@" "$lib"
+	  shift
+	  ;;
+	-l*)
+	  func_cl_dashl "${1#-l}"
+	  set x "$@" "$lib"
+	  shift
+	  ;;
+	-L)
+	  eat=1
+	  func_cl_dashL "$2"
+	  ;;
+	-L*)
+	  func_cl_dashL "${1#-L}"
+	  ;;
+	-static)
+	  shared=false
+	  ;;
+	-Wl,*)
+	  arg=${1#-Wl,}
+	  save_ifs="$IFS"; IFS=','
+	  for flag in $arg; do
+	    IFS="$save_ifs"
+	    linker_opts="$linker_opts $flag"
+	  done
+	  IFS="$save_ifs"
+	  ;;
+	-Xlinker)
+	  eat=1
+	  linker_opts="$linker_opts $2"
+	  ;;
+	-*)
+	  set x "$@" "$1"
+	  shift
+	  ;;
+	*.cc | *.CC | *.cxx | *.CXX | *.[cC]++)
+	  func_file_conv "$1"
+	  set x "$@" -Tp"$file"
+	  shift
+	  ;;
+	*.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO])
+	  func_file_conv "$1" mingw
+	  set x "$@" "$file"
+	  shift
+	  ;;
+	*)
+	  set x "$@" "$1"
+	  shift
+	  ;;
+      esac
+    fi
+    shift
+  done
+  if test -n "$linker_opts"; then
+    linker_opts="-link$linker_opts"
+  fi
+  exec "$@" $linker_opts
+  exit 1
+}
+
+eat=
+
+case $1 in
+  '')
+     echo "$0: No command.  Try '$0 --help' for more information." 1>&2
+     exit 1;
+     ;;
+  -h | --h*)
+    cat <<\EOF
+Usage: compile [--help] [--version] PROGRAM [ARGS]
+
+Wrapper for compilers which do not understand '-c -o'.
+Remove '-o dest.o' from ARGS, run PROGRAM with the remaining
+arguments, and rename the output as expected.
+
+If you are trying to build a whole package this is not the
+right script to run: please start by reading the file 'INSTALL'.
+
+Report bugs to <bug-automake@gnu.org>.
+EOF
+    exit $?
+    ;;
+  -v | --v*)
+    echo "compile $scriptversion"
+    exit $?
+    ;;
+  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
+    func_cl_wrapper "$@"      # Doesn't return...
+    ;;
+esac
+
+ofile=
+cfile=
+
+for arg
+do
+  if test -n "$eat"; then
+    eat=
+  else
+    case $1 in
+      -o)
+	# configure might choose to run compile as 'compile cc -o foo foo.c'.
+	# So we strip '-o arg' only if arg is an object.
+	eat=1
+	case $2 in
+	  *.o | *.obj)
+	    ofile=$2
+	    ;;
+	  *)
+	    set x "$@" -o "$2"
+	    shift
+	    ;;
+	esac
+	;;
+      *.c)
+	cfile=$1
+	set x "$@" "$1"
+	shift
+	;;
+      *)
+	set x "$@" "$1"
+	shift
+	;;
+    esac
+  fi
+  shift
+done
+
+if test -z "$ofile" || test -z "$cfile"; then
+  # If no '-o' option was seen then we might have been invoked from a
+  # pattern rule where we don't need one.  That is ok -- this is a
+  # normal compilation that the losing compiler can handle.  If no
+  # '.c' file was seen then we are probably linking.  That is also
+  # ok.
+  exec "$@"
+fi
+
+# Name of file we expect compiler to create.
+cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'`
+
+# Create the lock directory.
+# Note: use '[/\\:.-]' here to ensure that we don't use the same name
+# that we are using for the .o file.  Also, base the name on the expected
+# object file name, since that is what matters with a parallel build.
+lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d
+while true; do
+  if mkdir "$lockdir" >/dev/null 2>&1; then
+    break
+  fi
+  sleep 1
+done
+# FIXME: race condition here if user kills between mkdir and trap.
+trap "rmdir '$lockdir'; exit 1" 1 2 15
+
+# Run the compile.
+"$@"
+ret=$?
+
+if test -f "$cofile"; then
+  test "$cofile" = "$ofile" || mv "$cofile" "$ofile"
+elif test -f "${cofile}bj"; then
+  test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile"
+fi
+
+rmdir "$lockdir"
+exit $ret
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:
diff --git a/lib/xcb-util-keysyms/configure b/lib/xcb-util-keysyms/configure
index 9ec4032ba..7f833684b 100644
--- a/lib/xcb-util-keysyms/configure
+++ b/lib/xcb-util-keysyms/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for xcb-util-keysyms 0.3.9.
+# Generated by GNU Autoconf 2.69 for xcb-util-keysyms 0.4.0.
 #
 # Report bugs to <xcb@lists.freedesktop.org>.
 #
@@ -590,8 +590,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='xcb-util-keysyms'
 PACKAGE_TARNAME='xcb-util-keysyms'
-PACKAGE_VERSION='0.3.9'
-PACKAGE_STRING='xcb-util-keysyms 0.3.9'
+PACKAGE_VERSION='0.4.0'
+PACKAGE_STRING='xcb-util-keysyms 0.4.0'
 PACKAGE_BUGREPORT='xcb@lists.freedesktop.org'
 PACKAGE_URL=''
 
@@ -640,6 +640,10 @@ XPROTO_LIBS
 XPROTO_CFLAGS
 HAVE_DOXYGEN_FALSE
 HAVE_DOXYGEN_TRUE
+HAVE_DOT_FALSE
+HAVE_DOT_TRUE
+HAVE_DOT
+DOT
 DOXYGEN
 ENABLE_DEVEL_DOCS_FALSE
 ENABLE_DEVEL_DOCS_TRUE
@@ -817,6 +821,7 @@ PKG_CONFIG_LIBDIR
 XCB_CFLAGS
 XCB_LIBS
 DOXYGEN
+DOT
 XPROTO_CFLAGS
 XPROTO_LIBS'
 
@@ -1359,7 +1364,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures xcb-util-keysyms 0.3.9 to adapt to many kinds of systems.
+\`configure' configures xcb-util-keysyms 0.4.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1430,7 +1435,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of xcb-util-keysyms 0.3.9:";;
+     short | recursive ) echo "Configuration of xcb-util-keysyms 0.4.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1489,6 +1494,7 @@ Some influential environment variables:
   XCB_CFLAGS  C compiler flags for XCB, overriding pkg-config
   XCB_LIBS    linker flags for XCB, overriding pkg-config
   DOXYGEN     Path to doxygen command
+  DOT         Path to the dot graphics utility
   XPROTO_CFLAGS
               C compiler flags for XPROTO, overriding pkg-config
   XPROTO_LIBS linker flags for XPROTO, overriding pkg-config
@@ -1559,7 +1565,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-xcb-util-keysyms configure 0.3.9
+xcb-util-keysyms configure 0.4.0
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1883,7 +1889,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 xcb-util-keysyms $as_me 0.3.9, which was
+It was created by xcb-util-keysyms $as_me 0.4.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2709,7 +2715,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='xcb-util-keysyms'
- VERSION='0.3.9'
+ VERSION='0.4.0'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -13007,6 +13013,55 @@ $as_echo "$supported" >&6; }
 		fi
 	fi
 
+	if test $found = "no" ; then
+		if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
+			CFLAGS="$CFLAGS -Werror=unknown-warning-option"
+		fi
+
+		if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then
+			CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
+		fi
+
+		CFLAGS="$CFLAGS -fd"
+
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -fd" >&5
+$as_echo_n "checking if $CC supports -fd... " >&6; }
+		cacheid=xorg_cv_cc_flag__fd
+		if eval \${$cacheid+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+int i;
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  eval $cacheid=yes
+else
+  eval $cacheid=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+fi
+
+
+		CFLAGS="$xorg_testset_save_CFLAGS"
+
+		eval supported=\$$cacheid
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5
+$as_echo "$supported" >&6; }
+		if test "$supported" = "yes" ; then
+			BASE_CFLAGS="$BASE_CFLAGS -fd"
+			found="yes"
+		fi
+	fi
+
 
 
 
@@ -13561,11 +13616,11 @@ found="no"
 			CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
 		fi
 
-		CFLAGS="$CFLAGS -Wcast-qual"
+		CFLAGS="$CFLAGS -Wmissing-noreturn"
 
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wcast-qual" >&5
-$as_echo_n "checking if $CC supports -Wcast-qual... " >&6; }
-		cacheid=xorg_cv_cc_flag__Wcast_qual
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wmissing-noreturn" >&5
+$as_echo_n "checking if $CC supports -Wmissing-noreturn... " >&6; }
+		cacheid=xorg_cv_cc_flag__Wmissing_noreturn
 		if eval \${$cacheid+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -13596,7 +13651,7 @@ fi
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5
 $as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
-			BASE_CFLAGS="$BASE_CFLAGS -Wcast-qual"
+			BASE_CFLAGS="$BASE_CFLAGS -Wmissing-noreturn"
 			found="yes"
 		fi
 	fi
@@ -13679,11 +13734,11 @@ found="no"
 			CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
 		fi
 
-		CFLAGS="$CFLAGS -Wmissing-noreturn"
+		CFLAGS="$CFLAGS -Wmissing-format-attribute"
 
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wmissing-noreturn" >&5
-$as_echo_n "checking if $CC supports -Wmissing-noreturn... " >&6; }
-		cacheid=xorg_cv_cc_flag__Wmissing_noreturn
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wmissing-format-attribute" >&5
+$as_echo_n "checking if $CC supports -Wmissing-format-attribute... " >&6; }
+		cacheid=xorg_cv_cc_flag__Wmissing_format_attribute
 		if eval \${$cacheid+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -13714,12 +13769,13 @@ fi
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5
 $as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
-			BASE_CFLAGS="$BASE_CFLAGS -Wmissing-noreturn"
+			BASE_CFLAGS="$BASE_CFLAGS -Wmissing-format-attribute"
 			found="yes"
 		fi
 	fi
 
 
+# XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wredundant-decls])
 
 
 
@@ -13797,11 +13853,11 @@ found="no"
 			CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
 		fi
 
-		CFLAGS="$CFLAGS -Wmissing-format-attribute"
+		CFLAGS="$CFLAGS -Wlogical-op"
 
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wmissing-format-attribute" >&5
-$as_echo_n "checking if $CC supports -Wmissing-format-attribute... " >&6; }
-		cacheid=xorg_cv_cc_flag__Wmissing_format_attribute
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wlogical-op" >&5
+$as_echo_n "checking if $CC supports -Wlogical-op... " >&6; }
+		cacheid=xorg_cv_cc_flag__Wlogical_op
 		if eval \${$cacheid+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -13832,7 +13888,7 @@ fi
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5
 $as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
-			BASE_CFLAGS="$BASE_CFLAGS -Wmissing-format-attribute"
+			BASE_CFLAGS="$BASE_CFLAGS -Wlogical-op"
 			found="yes"
 		fi
 	fi
@@ -13842,9 +13898,9 @@ $as_echo "$supported" >&6; }
 # These are currently disabled because they are noisy.  They will be enabled
 # in the future once the codebase is sufficiently modernized to silence
 # them.  For now, I don't want them to drown out the other warnings.
-# XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wlogical-op])
 # XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wparentheses])
 # XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wcast-align])
+# XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wcast-qual])
 
 # Turn some warnings into errors, so we don't accidently get successful builds
 # when there are problems that should be fixed.
@@ -17714,6 +17770,7 @@ $as_echo "$build_devel_docs" >&6; }
 
 
 
+
 # Check whether --with-doxygen was given.
 if test "${with_doxygen+set}" = set; then :
   withval=$with_doxygen; use_doxygen=$withval
@@ -17826,6 +17883,63 @@ else
    as_fn_error $? "--with-doxygen expects 'yes' or 'no'" "$LINENO" 5
 fi
 
+
+HAVE_DOT=no
+if test "x$have_doxygen" = "xyes"; then
+  # Extract the first word of "dot", so it can be a program name with args.
+set dummy dot; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_DOT+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $DOT in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_DOT="$DOT" # 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_DOT="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+DOT=$ac_cv_path_DOT
+if test -n "$DOT"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DOT" >&5
+$as_echo "$DOT" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+    if test "x$DOT" != "x"; then
+      HAVE_DOT=yes
+    fi
+fi
+
+
+ if test "$HAVE_DOT" = "yes"; then
+  HAVE_DOT_TRUE=
+  HAVE_DOT_FALSE='#'
+else
+  HAVE_DOT_TRUE='#'
+  HAVE_DOT_FALSE=
+fi
+
  if test "$have_doxygen" = yes; then
   HAVE_DOXYGEN_TRUE=
   HAVE_DOXYGEN_FALSE='#'
@@ -17929,7 +18043,7 @@ $as_echo "yes" >&6; }
 
 fi
 
-ac_config_files="$ac_config_files Makefile keysyms/Makefile keysyms/xcb-keysyms.pc xcb_util_intro"
+ac_config_files="$ac_config_files Makefile keysyms/Makefile keysyms/xcb-keysyms.pc"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -18108,6 +18222,10 @@ if test -z "${ENABLE_DEVEL_DOCS_TRUE}" && test -z "${ENABLE_DEVEL_DOCS_FALSE}";
   as_fn_error $? "conditional \"ENABLE_DEVEL_DOCS\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${HAVE_DOT_TRUE}" && test -z "${HAVE_DOT_FALSE}"; then
+  as_fn_error $? "conditional \"HAVE_DOT\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${HAVE_DOXYGEN_TRUE}" && test -z "${HAVE_DOXYGEN_FALSE}"; then
   as_fn_error $? "conditional \"HAVE_DOXYGEN\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -18509,7 +18627,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by xcb-util-keysyms $as_me 0.3.9, which was
+This file was extended by xcb-util-keysyms $as_me 0.4.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -18566,7 +18684,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-xcb-util-keysyms config.status 0.3.9
+xcb-util-keysyms config.status 0.4.0
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -18966,7 +19084,6 @@ do
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     "keysyms/Makefile") CONFIG_FILES="$CONFIG_FILES keysyms/Makefile" ;;
     "keysyms/xcb-keysyms.pc") CONFIG_FILES="$CONFIG_FILES keysyms/xcb-keysyms.pc" ;;
-    "xcb_util_intro") CONFIG_FILES="$CONFIG_FILES xcb_util_intro" ;;
 
   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac
diff --git a/lib/xcb-util-keysyms/configure.ac b/lib/xcb-util-keysyms/configure.ac
index fd0700cfb..826f38885 100644
--- a/lib/xcb-util-keysyms/configure.ac
+++ b/lib/xcb-util-keysyms/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ(2.59c)
-AC_INIT([xcb-util-keysyms],0.3.9,[xcb@lists.freedesktop.org])
+AC_INIT([xcb-util-keysyms],0.4.0,[xcb@lists.freedesktop.org])
 AC_CONFIG_SRCDIR([Makefile.am])
 AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
@@ -11,5 +11,4 @@ PKG_CHECK_MODULES(XPROTO, xproto >= 7.0.8)
 
 AC_OUTPUT([Makefile
 	keysyms/Makefile keysyms/xcb-keysyms.pc
-	xcb_util_intro
 	])
diff --git a/lib/xcb-util-keysyms/keysyms/Makefile.in b/lib/xcb-util-keysyms/keysyms/Makefile.in
index 0ea82921c..b35a7edfe 100644
--- a/lib/xcb-util-keysyms/keysyms/Makefile.in
+++ b/lib/xcb-util-keysyms/keysyms/Makefile.in
@@ -179,6 +179,7 @@ CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
+DOT = @DOT@
 DOXYGEN = @DOXYGEN@
 DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
 DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
@@ -193,6 +194,7 @@ FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 GREP = @GREP@
+HAVE_DOT = @HAVE_DOT@
 INSTALL = @INSTALL@
 INSTALL_CMD = @INSTALL_CMD@
 INSTALL_DATA = @INSTALL_DATA@
diff --git a/lib/xcb-util-keysyms/keysyms/keysyms.c b/lib/xcb-util-keysyms/keysyms/keysyms.c
index 7584cccf3..419c58bdb 100644
--- a/lib/xcb-util-keysyms/keysyms/keysyms.c
+++ b/lib/xcb-util-keysyms/keysyms/keysyms.c
@@ -77,7 +77,7 @@ xcb_key_symbols_alloc (xcb_connection_t *c)
   xcb_keycode_t     min_keycode;
   xcb_keycode_t     max_keycode;
 
-  if (!c)
+  if (!c || xcb_connection_has_error(c))
     return NULL;
 
   syms = malloc (sizeof (xcb_key_symbols_t));
@@ -198,10 +198,13 @@ xcb_keysym_t xcb_key_symbols_get_keysym (xcb_key_symbols_t *syms,
   xcb_keycode_t max_keycode;
   int        per;
   
-  if (!syms)
+  if (!syms || xcb_connection_has_error(syms->c))
     return keysym_null;
   
   xcb_key_symbols_get_reply (syms, NULL);
+
+  if (!syms->u.reply)
+    return keysym_null;
   
   keysyms = xcb_get_keyboard_mapping_keysyms (syms->u.reply);
   min_keycode = xcb_get_setup (syms->c)->min_keycode;
@@ -245,14 +248,17 @@ xcb_key_symbols_get_keycode(xcb_key_symbols_t *syms,
   int j, nresult = 0;
   xcb_keycode_t i, min, max, *result = NULL, *result_np = NULL;
 
-  if(syms)
+  if(syms && !xcb_connection_has_error(syms->c))
   {
       xcb_key_symbols_get_reply (syms, NULL);
       min = xcb_get_setup(syms->c)->min_keycode;
       max = xcb_get_setup(syms->c)->max_keycode;
 
-      for(j = 0; j < syms->u.reply->keysyms_per_keycode; j++)
-          for(i = min; i && i <= max; i++)
+      if (!syms->u.reply)
+        return NULL;
+
+      for(i = min; i && i <= max; i++)
+          for(j = 0; j < syms->u.reply->keysyms_per_keycode; j++)
           {
               ks = xcb_key_symbols_get_keysym(syms, i, j);
               if(ks == keysym)
@@ -270,6 +276,7 @@ xcb_key_symbols_get_keycode(xcb_key_symbols_t *syms,
                   result = result_np;
                   result[nresult - 1] = i;
                   result[nresult] = XCB_NO_SYMBOL;
+                  break;
               }
           }
   }
@@ -297,7 +304,7 @@ int
 xcb_refresh_keyboard_mapping (xcb_key_symbols_t         *syms,
 			   xcb_mapping_notify_event_t *event)
 {
-  if (event->request == XCB_MAPPING_KEYBOARD && syms) {
+  if (event->request == XCB_MAPPING_KEYBOARD && syms && !xcb_connection_has_error(syms->c)) {
     if (syms->tag == TAG_VALUE) {
       xcb_keycode_t     min_keycode;
       xcb_keycode_t     max_keycode;
diff --git a/lib/xcb-util-keysyms/m4/xcb_util_common.m4 b/lib/xcb-util-keysyms/m4/xcb_util_common.m4
index f9463d37f..bc1cd423e 100644
--- a/lib/xcb-util-keysyms/m4/xcb_util_common.m4
+++ b/lib/xcb-util-keysyms/m4/xcb_util_common.m4
@@ -2,7 +2,7 @@
 # -----------------------------------------------------------------
 #
 # Defines default options for xcb-util libraries.  xorg/util/macros >=
-# 1.6.0 is  required for  cross-platform compiler  flags and  to build
+# 1.16.0 is  required for  cross-platform compiler  flags and  to build
 # library documentation.
 #
 AC_DEFUN([XCB_UTIL_COMMON], [
@@ -35,9 +35,9 @@ fi
 
 # Call macros from Xorg util-macros
 m4_ifndef([XORG_MACROS_VERSION],
-          [m4_fatal([must install xorg-macros 1.6.0 or later before running autoconf/autogen])])
+          [m4_fatal([must install xorg-macros 1.16.0 or later before running autoconf/autogen])])
 
-XORG_MACROS_VERSION([1.6.0])
+XORG_MACROS_VERSION([1.16.0])
 XORG_DEFAULT_OPTIONS
 XORG_ENABLE_DEVEL_DOCS
 XORG_WITH_DOXYGEN
diff --git a/lib/xcb-util-keysyms/xcb_util_intro.in b/lib/xcb-util-keysyms/xcb_util_intro.in
deleted file mode 100644
index f063613ae..000000000
--- a/lib/xcb-util-keysyms/xcb_util_intro.in
+++ /dev/null
@@ -1,24 +0,0 @@
-/** 
-@file
-@brief XCB Utility functions
- 
-These routines are used to facilitate the use of XCB in programs.
-*/
-
-/**
-
-@mainpage XCB Utility Documentation
-@version @PACKAGE_VERSION@
-@author Ian Osgood <iano@quirkster.com>
-@author Bart Massey <bart@cs.pdx.edu>
-@author Jamey Sharp <jamey@minilop.net>
-@author Josh Triplett <josh@freedesktop.org>
-@author Keith Packard <keithp@keithp.com>
-@author Vincent Torri <torri@iecn.u-nancy.fr>
-@author Julien Danjou <julien@danjou.info>
-@author Arnaud Fontaine <arnau@debian.org>
-@date 2005-2008
-
-@section intro What is available ?
-
-*/