From 5ee5b91b019005aa27273dff01388a68c12be293 Mon Sep 17 00:00:00 2001 From: marha Date: Mon, 26 Aug 2013 09:04:58 +0200 Subject: xserver mesa fontconfig libX11 libxcb libxcb/xcb-proto xkeyboard-config git update 26 Aug 2013 xserver commit e01a3f65d3e6d92f92ef2992b338cc9625bde082 libxcb commit c52f2891b43ae77008f63700982f800371458f4d libxcb/xcb-proto commit bd7708ac1037e647b094fa7440ebb6171b9bc75f xkeyboard-config commit 77026e8c59cc64856180452c5f89be86928fea7c libX11 commit e9b14d10d0258bfcc273ff8bc84cd349dccda62c libXdmcp commit 66514a4af7eaa47e8718434356d7efce95e570cf libXext commit 7378d4bdbd33ed49ed6cfa5c4f73d7527982aab4 libfontenc commit 3acba630d8b57084f7e92c15732408711ed5137a libXinerama commit 6e1d1dc328ba8162bba2f4694e7f3c706a1491ff libXau commit 899790011304c4029e15abf410e49ce7cec17e0a xkbcomp commit 0ebdf47fd4bc434ac3d2339544c022a869510738 pixman commit 3518a0dafa63098d41e466f73d105b7e3e4b12de xextproto commit f27fcc99d1cf935cc289933326f7d3baacd5107a randrproto commit ca7cc541c2e43e6c784df19b4583ac35829d2f72 glproto commit 8e3407e02980d088e20041e79bdcdd3737e7827e mkfontscale commit f48de13423c7300f4da9f61993b624426b38ddc0 xwininfo commit ba0d1b0da21d2dbdd81098ed5778f3792b472e13 libXft commit c5e760a239afc62a1c75e0509868e35957c8df52 libXmu commit d5dac08d65c4865f311cb62c161dbb1300eecd11 libxtrans commit f6a161f2a003f4da0a2e414b4faa0ee0de0c01f0 fontconfig commit fba9efecd2ef3aca84e0a4806899c09ba95f4c19 mesa commit 7fa18774bd9d0e97a82ee9b7dfce8fc5a1041c3a --- libxcb/.autom4te.cfg | 3 + libxcb/.gitignore | 41 +- libxcb/Makefile.am | 2 + libxcb/acinclude.m4 | 142 --- libxcb/configure.ac | 32 +- libxcb/m4/xcb.m4 | 142 +++ libxcb/src/c_client.py | 12 +- libxcb/tests/.gitignore | 3 + libxcb/tests/Makefile.am | 2 +- libxcb/xcb-proto/src/xinput.xml | 2545 ++++++++++++++++++++++++++++----------- libxcb/xcb-proto/src/xkb.xml | 106 +- libxcb/xcb-proto/src/xproto.xml | 18 +- 12 files changed, 2147 insertions(+), 901 deletions(-) create mode 100644 libxcb/.autom4te.cfg delete mode 100644 libxcb/acinclude.m4 create mode 100644 libxcb/m4/xcb.m4 (limited to 'libxcb') diff --git a/libxcb/.autom4te.cfg b/libxcb/.autom4te.cfg new file mode 100644 index 000000000..36e43540e --- /dev/null +++ b/libxcb/.autom4te.cfg @@ -0,0 +1,3 @@ +begin-language: "Autoconf-without-aclocal-m4" +args: --cache=build-aux +end-language: "Autoconf-without-aclocal-m4" diff --git a/libxcb/.gitignore b/libxcb/.gitignore index a922ee4cf..0981ed2d9 100644 --- a/libxcb/.gitignore +++ b/libxcb/.gitignore @@ -1,30 +1,23 @@ -aclocal.m4 -autom4te.cache -compile -depcomp -install-sh -libtool -ltmain.sh -missing -mkinstalldirs -config.guess -config.h -config.h.in -config.log -config.status -config.sub -configure -configure.lineno -.deps -.dirstamp -.libs +*.la *.lo *.loT -*.la -Makefile -Makefile.in -stamp-h1 *.o *.pc *.tar.bz2 *.tar.gz +.deps +.dirstamp +.libs +Makefile +Makefile.in +aclocal.m4 +build-aux +config.h* +config.log +config.status +configure +configure.lineno +libtool +m4/l*.m4 +mkinstalldirs +stamp-h1 diff --git a/libxcb/Makefile.am b/libxcb/Makefile.am index 1f88b72da..961595ba3 100644 --- a/libxcb/Makefile.am +++ b/libxcb/Makefile.am @@ -1,3 +1,5 @@ +ACLOCAL_AMFLAGS=-I m4 + SUBDIRS=src tests doc pkgconfigdir = $(libdir)/pkgconfig diff --git a/libxcb/acinclude.m4 b/libxcb/acinclude.m4 deleted file mode 100644 index ad24bc2e5..000000000 --- a/libxcb/acinclude.m4 +++ /dev/null @@ -1,142 +0,0 @@ -dnl Detection and configuration of the visibility feature of gcc -dnl Vincent Torri 2006-02-11 -dnl -dnl XCB_CHECK_VISIBILITY([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]) -dnl Check the visibility feature of gcc -dnl -AC_DEFUN([XCB_CHECK_VISIBILITY], -[ -AC_MSG_CHECKING([whether ${CC} supports symbol visibility]) - -save_CFLAGS=${CFLAGS} -CFLAGS="$CFLAGS -fvisibility=hidden -fvisibility-inlines-hidden" -AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM( - [[ -#pragma GCC visibility push(hidden) -extern void f(int); -#pragma GCC visibility pop - ]], - [[]] - )], - [AC_DEFINE( - GCC_HAS_VISIBILITY, - [], - [Defined if GCC supports the visibility feature]) - m4_if([$1], [], [:], [$1]) - AC_MSG_RESULT(yes)], - [m4_if([$2], [], [:], [$2]) - AC_MSG_RESULT(no)]) - -CFLAGS=${save_CFLAGS} -]) - -dnl Configure script for doxygen -dnl Vincent Torri 2006-05-11 -dnl -dnl XCB_CHECK_DOXYGEN([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]) -dnl Test for the doxygen program, and define BUILD_DOCS and DOXYGEN. -dnl -AC_DEFUN([XCB_CHECK_DOXYGEN], -[ -DOXYGEN="doxygen" - -dnl -dnl Disable the build of the documentation -dnl -AC_ARG_ENABLE( - [build_docs], - AC_HELP_STRING( - [--disable-build-docs], - [Disable the build of the documentation]), - [if test x"$enableval" != x"yes" ; then - enable_build_docs="no" - else - enable_build_docs="yes" - fi], - [enable_build_docs="yes"]) - -if test "$enable_build_docs" = "no" ; then - BUILD_DOCS=no -else -dnl -dnl Get the prefix where doxygen is installed. -dnl -AC_ARG_WITH( - [doxygen], - AC_HELP_STRING( - [--with-doxygen=FILE], - [doxygen program to use (eg /usr/bin/doxygen)]), - dnl - dnl Check the given doxygen program. - dnl - [DOXYGEN=${withval} - AC_CHECK_PROG( - [BUILD_DOCS], - [${DOXYGEN}], - [yes], - [no]) - if test $BUILD_DOCS = no; then - echo "WARNING:" - echo "The doxygen program you specified:" - echo "$DOXYGEN" - echo "was not found. Please check the path and make sure " - echo "the program exists and is executable." - AC_MSG_WARN( - [Warning: no doxygen detected. Documentation will not be built]) - fi], - [AC_CHECK_PROG( - [BUILD_DOCS], - [${DOXYGEN}], - [yes], - [no]) - if test ${BUILD_DOCS} = no; then - echo "WARNING:" - echo "The doxygen program was not found in your execute" - echo "You may have doxygen installed somewhere not covered by your path." - echo "" - echo "If this is the case make sure you have the packages installed, AND" - echo "that the doxygen program is in your execute path (see your" - echo "shell manual page on setting the \$PATH environment variable), OR" - echo "alternatively, specify the program to use with --with-doxygen." - AC_MSG_WARN( - [Warning: no doxygen detected. Documentation will not be built]) - fi]) - AC_PATH_PROG(DOT, dot, no) - if test "$DOT" = "no"; then - AC_MSG_WARN([Warning: no dot detected. Documentation will not be built]) - BUILD_DOCS="no" - fi -fi -AC_MSG_CHECKING([whether documentation is built]) -AC_MSG_RESULT([${BUILD_DOCS}]) - -dnl -dnl Substitution -dnl -AC_SUBST([DOXYGEN]) - -AM_CONDITIONAL(BUILD_DOCS, test "x$BUILD_DOCS" = "xyes") - -]) - -dnl Detection and configuration of the visibility feature of gcc -dnl Vincent Torri 2006-02-11 -dnl -dnl XCB_EXTENSION(name, default) -dnl set the X extension -dnl -AC_DEFUN([XCB_EXTENSION], -[ -pushdef([UP], translit([$1], [-a-z], [_A-Z]))dnl -pushdef([DOWN], translit([$1], [A-Z], [a-z]))dnl - -AC_ARG_ENABLE(DOWN, - [AS_HELP_STRING([--enable-[]DOWN], [Build XCB $1 Extension (default: $2)])], - [BUILD_[]UP=$enableval], - [BUILD_[]UP=$2]) - -AM_CONDITIONAL(BUILD_[]UP, [test "x$BUILD_[]UP" = "xyes"]) -]) - -dnl End of acinclude.m4 diff --git a/libxcb/configure.ac b/libxcb/configure.ac index 482f85b2b..6c107bcd0 100644 --- a/libxcb/configure.ac +++ b/libxcb/configure.ac @@ -2,20 +2,23 @@ # Process this file with autoconf to produce a configure script. # Initialize Autoconf -AC_PREREQ(2.57) +AC_PREREQ([2.60]) AC_INIT([libxcb], 1.9, [xcb@lists.freedesktop.org]) +AC_CONFIG_AUX_DIR([build-aux]) +AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_SRCDIR([xcb.pc.in]) -# Set common system defines for POSIX extensions, such as _GNU_SOURCE -# Must be called before any macros that run the compiler (like AC_PROG_LIBTOOL) -# to avoid autoconf errors. -AC_USE_SYSTEM_EXTENSIONS # Initialize Automake AM_INIT_AUTOMAKE([foreign dist-bzip2]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) +# Set common system defines for POSIX extensions, such as _GNU_SOURCE +# Must be called before any macros that run the compiler (like AC_PROG_LIBTOOL) +# to avoid autoconf errors. +AC_USE_SYSTEM_EXTENSIONS + AM_PATH_PYTHON([2.6]) PKG_CHECK_MODULES(CHECK, [check >= 0.9.4], [HAVE_CHECK=yes], [HAVE_CHECK=no]) @@ -27,15 +30,12 @@ AC_LIBTOOL_WIN32_DLL AC_PROG_LIBTOOL AC_PROG_CC -AC_PATH_PROG(XSLTPROC, xsltproc, no) -if test "$XSLTPROC" = "no"; then - AC_MSG_ERROR([XCB requires xsltproc.]) -fi - -HTML_CHECK_RESULT=false +XSLTPROC=no +HTML_CHECK_RESULT=no if test x"$HAVE_CHECK" = xyes; then + AC_PATH_PROG(XSLTPROC, xsltproc, no) if test x"$XSLTPROC" != xno; then - HTML_CHECK_RESULT=true + HTML_CHECK_RESULT=yes fi fi AC_SUBST(HTML_CHECK_RESULT) @@ -140,13 +140,6 @@ AC_SUBST(CWARNFLAGS) XCB_CHECK_VISIBILITY() -# htmldir is not defined prior to autoconf 2.59c, so on earlier versions -# set an equivalent value. -AC_PREREQ([2.59c], [], [AC_SUBST([htmldir], [m4_ifset([AC_PACKAGE_TARNAME], - ['${datadir}/doc/${PACKAGE_TARNAME}'], - ['${datadir}/doc/${PACKAGE}']) -])]) - XCB_CHECK_DOXYGEN() AC_CHECK_FUNC(getaddrinfo, [AC_DEFINE(HAVE_GETADDRINFO, 1, [getaddrinfo() function is available])], ) @@ -258,6 +251,7 @@ echo "" echo " Configuration" echo " XDM support.........: ${have_xdmcp}" echo " Build unit tests....: ${HAVE_CHECK}" +echo " with html results.: ${HTML_CHECK_RESULT}" echo " XCB buffer size.....: ${xcb_queue_buffer_size}" echo "" echo " X11 extensions" diff --git a/libxcb/m4/xcb.m4 b/libxcb/m4/xcb.m4 new file mode 100644 index 000000000..ad24bc2e5 --- /dev/null +++ b/libxcb/m4/xcb.m4 @@ -0,0 +1,142 @@ +dnl Detection and configuration of the visibility feature of gcc +dnl Vincent Torri 2006-02-11 +dnl +dnl XCB_CHECK_VISIBILITY([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]) +dnl Check the visibility feature of gcc +dnl +AC_DEFUN([XCB_CHECK_VISIBILITY], +[ +AC_MSG_CHECKING([whether ${CC} supports symbol visibility]) + +save_CFLAGS=${CFLAGS} +CFLAGS="$CFLAGS -fvisibility=hidden -fvisibility-inlines-hidden" +AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( + [[ +#pragma GCC visibility push(hidden) +extern void f(int); +#pragma GCC visibility pop + ]], + [[]] + )], + [AC_DEFINE( + GCC_HAS_VISIBILITY, + [], + [Defined if GCC supports the visibility feature]) + m4_if([$1], [], [:], [$1]) + AC_MSG_RESULT(yes)], + [m4_if([$2], [], [:], [$2]) + AC_MSG_RESULT(no)]) + +CFLAGS=${save_CFLAGS} +]) + +dnl Configure script for doxygen +dnl Vincent Torri 2006-05-11 +dnl +dnl XCB_CHECK_DOXYGEN([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]) +dnl Test for the doxygen program, and define BUILD_DOCS and DOXYGEN. +dnl +AC_DEFUN([XCB_CHECK_DOXYGEN], +[ +DOXYGEN="doxygen" + +dnl +dnl Disable the build of the documentation +dnl +AC_ARG_ENABLE( + [build_docs], + AC_HELP_STRING( + [--disable-build-docs], + [Disable the build of the documentation]), + [if test x"$enableval" != x"yes" ; then + enable_build_docs="no" + else + enable_build_docs="yes" + fi], + [enable_build_docs="yes"]) + +if test "$enable_build_docs" = "no" ; then + BUILD_DOCS=no +else +dnl +dnl Get the prefix where doxygen is installed. +dnl +AC_ARG_WITH( + [doxygen], + AC_HELP_STRING( + [--with-doxygen=FILE], + [doxygen program to use (eg /usr/bin/doxygen)]), + dnl + dnl Check the given doxygen program. + dnl + [DOXYGEN=${withval} + AC_CHECK_PROG( + [BUILD_DOCS], + [${DOXYGEN}], + [yes], + [no]) + if test $BUILD_DOCS = no; then + echo "WARNING:" + echo "The doxygen program you specified:" + echo "$DOXYGEN" + echo "was not found. Please check the path and make sure " + echo "the program exists and is executable." + AC_MSG_WARN( + [Warning: no doxygen detected. Documentation will not be built]) + fi], + [AC_CHECK_PROG( + [BUILD_DOCS], + [${DOXYGEN}], + [yes], + [no]) + if test ${BUILD_DOCS} = no; then + echo "WARNING:" + echo "The doxygen program was not found in your execute" + echo "You may have doxygen installed somewhere not covered by your path." + echo "" + echo "If this is the case make sure you have the packages installed, AND" + echo "that the doxygen program is in your execute path (see your" + echo "shell manual page on setting the \$PATH environment variable), OR" + echo "alternatively, specify the program to use with --with-doxygen." + AC_MSG_WARN( + [Warning: no doxygen detected. Documentation will not be built]) + fi]) + AC_PATH_PROG(DOT, dot, no) + if test "$DOT" = "no"; then + AC_MSG_WARN([Warning: no dot detected. Documentation will not be built]) + BUILD_DOCS="no" + fi +fi +AC_MSG_CHECKING([whether documentation is built]) +AC_MSG_RESULT([${BUILD_DOCS}]) + +dnl +dnl Substitution +dnl +AC_SUBST([DOXYGEN]) + +AM_CONDITIONAL(BUILD_DOCS, test "x$BUILD_DOCS" = "xyes") + +]) + +dnl Detection and configuration of the visibility feature of gcc +dnl Vincent Torri 2006-02-11 +dnl +dnl XCB_EXTENSION(name, default) +dnl set the X extension +dnl +AC_DEFUN([XCB_EXTENSION], +[ +pushdef([UP], translit([$1], [-a-z], [_A-Z]))dnl +pushdef([DOWN], translit([$1], [A-Z], [a-z]))dnl + +AC_ARG_ENABLE(DOWN, + [AS_HELP_STRING([--enable-[]DOWN], [Build XCB $1 Extension (default: $2)])], + [BUILD_[]UP=$enableval], + [BUILD_[]UP=$2]) + +AM_CONDITIONAL(BUILD_[]UP, [test "x$BUILD_[]UP" = "xyes"]) +]) + +dnl End of acinclude.m4 diff --git a/libxcb/src/c_client.py b/libxcb/src/c_client.py index c477bab82..a6f8edd73 100644 --- a/libxcb/src/c_client.py +++ b/libxcb/src/c_client.py @@ -1132,11 +1132,11 @@ def _c_serialize(context, self): _c(' %s *xcb_out = *_buffer;', self.c_type) _c(' unsigned int xcb_out_pad = -sizeof(%s) & 3;', self.c_type) _c(' unsigned int xcb_buffer_len = sizeof(%s) + xcb_out_pad;', self.c_type) - _c(' unsigned int xcb_align_to;') + _c(' unsigned int xcb_align_to = 0;') else: _c(' char *xcb_out = *_buffer;') _c(' unsigned int xcb_buffer_len = 0;') - _c(' unsigned int xcb_align_to;') + _c(' unsigned int xcb_align_to = 0;') prefix = [('_aux', '->', self)] aux_ptr = 'xcb_out' @@ -1159,7 +1159,7 @@ def _c_serialize(context, self): _c(' unsigned int xcb_buffer_len = 0;') _c(' unsigned int xcb_block_len = 0;') _c(' unsigned int xcb_pad = 0;') - _c(' unsigned int xcb_align_to;') + _c(' unsigned int xcb_align_to = 0;') elif 'sizeof' == context: param_names = [p[2] for p in params] @@ -1204,7 +1204,7 @@ def _c_serialize(context, self): _c(' unsigned int xcb_buffer_len = 0;') _c(' unsigned int xcb_block_len = 0;') _c(' unsigned int xcb_pad = 0;') - _c(' unsigned int xcb_align_to;') + _c(' unsigned int xcb_align_to = 0;') _c('') for t in temp_vars: @@ -1787,12 +1787,12 @@ def _c_complex(self): for field in struct_fields: length = len(field.c_field_type) # account for '*' pointer_spec - if not field.type.fixed_size(): + if not field.type.fixed_size() and not self.is_union: length += 1 maxtypelen = max(maxtypelen, length) def _c_complex_field(self, field, space=''): - if (field.type.fixed_size() or + if (field.type.fixed_size() or self.is_union or # in case of switch with switch children, don't make the field a pointer # necessary for unserialize to work (self.is_switch and field.type.is_switch)): diff --git a/libxcb/tests/.gitignore b/libxcb/tests/.gitignore index 9d27cc57b..7d19f3b7b 100644 --- a/libxcb/tests/.gitignore +++ b/libxcb/tests/.gitignore @@ -1,3 +1,6 @@ CheckLog.html CheckLog_xcb.xml check_all +check_all.log +check_all.trs +test-suite.log diff --git a/libxcb/tests/Makefile.am b/libxcb/tests/Makefile.am index 20bdc7217..ceef722c2 100644 --- a/libxcb/tests/Makefile.am +++ b/libxcb/tests/Makefile.am @@ -14,7 +14,7 @@ check_all_SOURCES = check_all.c check_suites.h check_public.c check-local: check-TESTS $(RM) CheckLog.html - if test x$(HTML_CHECK_RESULT) = xtrue; then \ + if test x$(HTML_CHECK_RESULT) = xyes; then \ $(XSLTPROC) $(srcdir)/CheckLog.xsl CheckLog*.xml > CheckLog.html; \ else \ touch CheckLog.html; \ diff --git a/libxcb/xcb-proto/src/xinput.xml b/libxcb/xcb-proto/src/xinput.xml index 80416fe3f..cd1a39788 100644 --- a/libxcb/xcb-proto/src/xinput.xml +++ b/libxcb/xcb-proto/src/xinput.xml @@ -1,6 +1,7 @@ - + + major-version="2" minor-version="3"> + xfixes xproto - + + + - - 0 - 1 - + - - 0 - 1 - + + + + + + + + + - - - - name_len - - - - - - - - + + + + name_len + + + + + + + + - 0 - 1 - 2 - 3 - 4 + 0 + 1 + 2 + 3 + 4 - - - - - - - - - - - - - - - devices_len - - - - - - - 0 - 1 - 2 - 3 - 4 - 5 - 6 + 0 + 1 + 2 + 3 + 4 + 5 + 6 - - - + + 0 + 1 + + + + + + + + - - - - - - + + + + + + - - - + + + - - - + + + - - - - - - - axes_len - + + + + + + + axes_len + + + + + + + + + + len + + + + + + + + + + devices_len + + + + + + - - + + - - - - - - - - num_classes - - + + + + + + + + num_classes + + - - + + - - - - - - - - + + + + + + + + - - - - - num_classes - + + + + + num_classes + - - - - - - - - num_this_classes - - - num_all_classes - - + + + + + + + + num_this_classes + + + num_all_classes + + + + 0 + 1 + + - - - - - - num_classes - + + + + + + num_classes + - - - - - - - num_classes - - + + + + + + + num_classes + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - - num_classes - - - - - - + + + + + + + + + + num_classes + + + + + + - - + + - - - - - - - - - - - - num_classes - + + + + + + + + + + + + num_classes + - - - - - + + + + + - - - - - - - - - - - - num_classes - + + + + + + + + + + + + num_classes + - - - - - + + + + + - - - - - - + + + + + + - - - + + + - - - - - - - - - + + + + + + + + + - - - - + + + + - - - - - - - - - - - - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - 32 + + + + + + + + + + + + + 32 + - - - - - - - + + + + + + + - - - - - - + + + + + + - - - - - - - num_keysyms - + + + + + + + num_keysyms + - - - - - - - + + + + + + + - - - - - + + + + + - - - - - - - + - - - - - - - - - - - + + + + + + + + + + + - - - - - - - + + + + + + + - - - - + + + + - - - - - - - num_keysyms - + + + + + + + num_keysyms + - - - - - - - + + + + + + + - - - - - + + + + + + + + + + + + + + len + 4 + + + + + + + + + - - - - - - - - - length - - + + + + + + + + + + length + + - - - - - - - keycode_count - keysyms_per_keycode - - + + + + + + + keycode_count + keysyms_per_keycode + + - - - - - - - - - keycodes_per_modifier - 8 - - - + + + + + + + + + keycodes_per_modifier + 8 + + + - - - - - - keycodes_per_modifier - 8 - - - - - - - + + + + + + keycodes_per_modifier + 8 + + + + + + + - - - - - - - - map_size - - + + + + + + + + map_size + + - - - - - map_size - - - - - - + + + + + map_size + + + + + + - - - - - - - - - - - - - - - - - - - - - - - 32 - + + + + + + 32 + - - - - - - 32 - + + + + + + 32 + - - - - - - num_valuators - + + + + + + num_valuators + + + + + + + + + + + len + 4 + + + + + + + + + + + num_classes + + + + - - - - - - - - - num_events - 32 - - - - num_classes - + + + + + + + + + num_events + 32 + + + + num_classes + - - - - + + + + - - - - - - num_valuators - - - - - - + + + + + + num_valuators + + + + + + - - - - - - - - - - - - - - - - + + 1 + 2 + 3 + 4 + 5 + - - - - - num_valuators - - - num_valuators - - - num_valuators - + + + + + num_valuators + + + num_valuators + + + num_valuators + - - - - - - - - - - + + + + + + + + + + - - - - - - - - + + + + + + + + - - - - - + + + + + - - - - + + + + - - - - - - + - - - - - - num_valuators - + + + + + + num_valuators + - - - - - - - - - - + + + + + + + + + + - - - - - - - - + + + + + + + + - - - - + + + + - - - - + + + + - + + + + + + len + 4 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + num_atoms + + + + + + + + 8 + 16 + 32 + + + + + + + + + + + + format + + + 8Bits + + num_items + + + + 16Bits + + num_items + + + + 32Bits + + num_items + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + format + + + 8Bits + + num_items + + + + 16Bits + + num_items + + + + 32Bits + + num_items + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + buttons_len + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1 + 2 + 3 + 4 + + + + 1 + 2 + + + + + + + + + + name_len + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + len + 4 + + 4 + + + + + + + + num_changes + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + mask_len + + + + + + + + + num_mask + + + + + + + + + + + + + + + + + + + + + 0 + 1 + 2 + 3 + 8 + + + + 1 + 2 + 3 + 4 + 5 + + + + 0 + 1 + + + + 1 + 2 + + + + 1 + 2 + + + + + + + + + + + num_buttons + 31 + + 32 + + + + num_buttons + + + + + + + + + + num_keys + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + len + 4 + + 8 + + + + + + + + + + + + + + + + + + name_len + 3 + + 4 + + 4 + + + + num_classes + + + + + + + + + + + + num_infos + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + mask_len + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 31 + + + + + + + + + + + + + + + + + + + + + + + mask_len + + + num_modifiers + + + + + + + num_modifiers + + + + + + + + + + + + + + + num_modifiers + + + + + + + + + + + + + + num_properties + + + + + + + + + + + + + + + format + + + 8Bits + + num_items + + + + 16Bits + + num_items + + + + 32Bits + + num_items + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + format + + + 8Bits + + num_items + + + + 16Bits + + num_items + + + + 32Bits + + num_items + + + + + + + + + + + + + + + + num_masks + + + + + + + + + + + + + + + + + + + num_barriers + + + + + - - - - - 6 + + + + + + 6 + - - - - - - - - - - - - + + + + + + + + + + + + - - + + - - - - - - - - - - - + + + + + + + + + - + + + - - - - - - - + + + + + + + 4 - - + + 4 - - - 3 - + + + 3 + - - - - - - - + + + + + + + - - - - + + + + - - + + 28 - + - - + + 28 - + + + + + + + + + + + + - - - - + + + + + + + + + + + + + + + + + + + + + 1 + 2 + + + + + + + + + + + + + num_classes + + + + + 16 + + + + + + + + + + + + + + + + + + + + + + + + buttons_len + + + valuators_len + + + + + + + + 16 + + + + + + + + + + + + + + + + + + + + + + + + buttons_len + + + valuators_len + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + buttons_len + + + + + + + + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + + + + + + + + + + + + + + + + + + + + + num_infos + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + valuators_len + + + + + + + + + + + + + + + + + + + valuators_len + + + + + + + + + + + + 16 + 17 + + + + + + + + + + + + + + + + + + + + + + + + buttons_len + + + valuators_len + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + valuators_len + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + diff --git a/libxcb/xcb-proto/src/xkb.xml b/libxcb/xcb-proto/src/xkb.xml index 0e263c4fb..b702cad43 100644 --- a/libxcb/xcb-proto/src/xkb.xml +++ b/libxcb/xcb-proto/src/xkb.xml @@ -161,8 +161,10 @@ authorization from the authors. - 768 - 1280 + 0 + 4 + 768 + 1280 @@ -172,7 +174,9 @@ authorization from the authors. - 768 + 0 + 5 + 768 @@ -410,12 +414,8 @@ authorization from the authors. - - - @@ -471,32 +471,26 @@ authorization from the authors. - + - - - - - - - + - - + + - - + + @@ -878,7 +872,8 @@ authorization from the authors. - 1 + + 2 0 @@ -1350,6 +1345,20 @@ authorization from the authors. nKeyActions + + + + + nKeyActions + 3 + + + 3 + + + nKeyActions + + totalActions @@ -1365,18 +1374,60 @@ authorization from the authors. virtualMods + + + + + virtualMods + 3 + + + 3 + + + virtualMods + + ExplicitComponents totalKeyExplicit + + + + + totalKeyExplicit + 1 + + + 1 + + + totalKeyExplicit + + ModifierMap totalModMapKeys + + + + + totalModMapKeys + 1 + + + 1 + + + totalModMapKeys + + VirtualModMap @@ -1573,6 +1624,7 @@ authorization from the authors. + @@ -1657,6 +1709,20 @@ authorization from the authors. nKTLevels --> nTypes + + + + + nTypes + 3 + + + 3 + + + nTypes + + diff --git a/libxcb/xcb-proto/src/xproto.xml b/libxcb/xcb-proto/src/xproto.xml index bf4dcbf0f..c97919bef 100644 --- a/libxcb/xcb-proto/src/xproto.xml +++ b/libxcb/xcb-proto/src/xproto.xml @@ -3404,7 +3404,7 @@ The number of characters in `string`. - - - @@ -4073,7 +4073,7 @@ The height of the area to copy (in pixels). - - - - - -