diff -Nru xcb-proto-1.6/aclocal.m4 xcb-proto-1.6+git20110412.c4497cdb/aclocal.m4 --- xcb-proto-1.6/aclocal.m4 2009-12-02 09:07:43.000000000 +0000 +++ xcb-proto-1.6+git20110412.c4497cdb/aclocal.m4 2011-04-12 16:50:49.000000000 +0000 @@ -1,4 +1,4 @@ -# generated automatically by aclocal 1.11 -*- Autoconf -*- +# generated automatically by aclocal 1.11.1 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, # 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. @@ -13,8 +13,8 @@ m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],, -[m4_warning([this file was generated for autoconf 2.65. +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.67],, +[m4_warning([this file was generated for autoconf 2.67. You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically `autoreconf'.])]) @@ -34,7 +34,7 @@ [am__api_version='1.11' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.11], [], +m4_if([$1], [1.11.1], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -50,7 +50,7 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.11])dnl +[AM_AUTOMAKE_VERSION([1.11.1])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) @@ -461,7 +461,7 @@ dnl Find a Python interpreter. Python versions prior to 2.0 are not dnl supported. (2.0 was released on October 16, 2000). m4_define_default([_AM_PYTHON_INTERPRETER_LIST], - [python python2 python3 python3.0 python2.5 python2.4 python2.3 python2.2 dnl + [python python2 python3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 dnl python2.1 python2.0]) m4_if([$1],[],[ @@ -552,6 +552,14 @@ am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'` am_cv_python_pythondir=`echo "$am_cv_python_pythondir" | sed "s,^$am__strip_prefix,$PYTHON_PREFIX,"` ;; + *) + case $am_py_prefix in + /usr|/System*) ;; + *) + am_cv_python_pythondir=$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages + ;; + esac + ;; esac ]) AC_SUBST([pythondir], [$am_cv_python_pythondir]) @@ -582,6 +590,14 @@ am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'` am_cv_python_pyexecdir=`echo "$am_cv_python_pyexecdir" | sed "s,^$am__strip_prefix,$PYTHON_EXEC_PREFIX,"` ;; + *) + case $am_py_exec_prefix in + /usr|/System*) ;; + *) + am_cv_python_pyexecdir=$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages + ;; + esac + ;; esac ]) AC_SUBST([pyexecdir], [$am_cv_python_pyexecdir]) diff -Nru xcb-proto-1.6/autogen.sh xcb-proto-1.6+git20110412.c4497cdb/autogen.sh --- xcb-proto-1.6/autogen.sh 1970-01-01 00:00:00.000000000 +0000 +++ xcb-proto-1.6+git20110412.c4497cdb/autogen.sh 2011-04-12 16:50:44.000000000 +0000 @@ -0,0 +1,12 @@ +#! /bin/sh + +srcdir=`dirname $0` +test -z "$srcdir" && srcdir=. + +ORIGDIR=`pwd` +cd $srcdir + +autoreconf -v --install || exit 1 +cd $ORIGDIR || exit $? + +$srcdir/configure --enable-maintainer-mode "$@" diff -Nru xcb-proto-1.6/ChangeLog xcb-proto-1.6+git20110412.c4497cdb/ChangeLog --- xcb-proto-1.6/ChangeLog 1970-01-01 00:00:00.000000000 +0000 +++ xcb-proto-1.6+git20110412.c4497cdb/ChangeLog 2011-04-12 16:50:51.000000000 +0000 @@ -0,0 +1,1762 @@ +commit 417420be9c81c25f9ab11b12c64630aee9fb3dd9 +Author: Robert Hooker +Date: Tue Apr 12 12:50:44 2011 -0400 + + Add debian tree from debian/unstable + +commit c4497cdbf0640c376cdebb0a9e5ea62458e6ba51 +Merge: 661fe8d e172bed +Author: Peter Harris +Date: Thu Dec 23 13:02:52 2010 -0500 + + Merge branch 'master' of git://anongit.freedesktop.org/~peterh/xcbproto + +commit 661fe8dd7727c27467e61a0d20dc91557ce3747f +Author: Julien Cristau +Date: Thu Oct 21 14:59:37 2010 +0200 + + xproto: fix TranslateCoordinates reply + + dst_x and dst_y are signed values (listed as INT16 in the spec). + + Signed-off-by: Julien Cristau + Reviewed-by: Mikhail Gusarov + Signed-off-by: Julien Danjou + +commit e172bed68294746981eebbaa0c0740c00a0c8bd4 +Author: Peter Harris +Date: Wed Oct 20 12:05:37 2010 -0400 + + [xkb] Rename type, sequence, and length + + These fields are already defined by the protocol. Rename them to avoid + potential name collisions. + + Signed-off-by: Peter Harris + +commit 0ba74c7d503776ee133ee841b794a91d4a6c33a9 +Author: Peter Harris +Date: Wed Oct 20 10:24:09 2010 -0400 + + Revert "xproto.xml: turned valueparam in CreateWindow request into switch" + + This reverts commit 9895cf562c5842813782ce494253c9127e699354. + + This is intended to be a temporary revert. When we are ready to migrate + to switch, we should migrate all of the valueparams at the same time. + + Signed-off-by: Peter Harris + +commit 476a3fdbc9f4f6256cd64f6683f4529bab1aecec +Author: Peter Harris +Date: Wed Sep 22 23:26:16 2010 -0400 + + Fix 'make check' + + Adds support for optional bitcase names. + Partially reverts 76ca2c0b152 which appears to have added fixed_type to + xproto.xml by accident. + + Signed-off-by: Peter Harris + +commit 9da6ea6269f91602293ad2a4ebccceafa35123f4 +Merge: e7aa34e 76ca2c0 +Author: Peter Harris +Date: Wed Sep 8 14:35:32 2010 -0400 + + Merge branch 'gsoc2010' of git://anongit.freedesktop.org/~chr/xcb_proto + + Signed-off-by: Peter Harris + +commit 76ca2c0b1527541be59c344118c538ba055ad9d8 +Author: Christoph Reimann +Date: Mon Aug 16 18:32:13 2010 +0200 + + xcbgen: small fix to store anchestor objects more systematic + xml: small fixes according to Xlib or the spec + +commit 854e2a05c76ad72bc11fb56c78d707a81e5cf614 +Author: Christoph Reimann +Date: Mon Aug 2 23:27:06 2010 +0200 + + small fix wrt bitcase type names + +commit dd227908abdb36ba630ac9d8a5449470721e38b8 +Author: Christoph Reimann +Date: Thu Jul 22 22:53:49 2010 +0200 + + support name attribute for bitcases and set BitcaseType.has_name accordingly + +commit 9895cf562c5842813782ce494253c9127e699354 +Author: Christoph Reimann +Date: Thu Jul 15 10:44:12 2010 +0200 + + xproto.xml: turned valueparam in CreateWindow request into switch + +commit 946817d43e10a581b75d8fcab91a6b68e31fb965 +Author: Christoph Reimann +Date: Thu Jul 15 01:06:49 2010 +0200 + + assign switch name to bitcases as well (important in case of switch that appear inside another switch) + +commit 73c14cd5f2cebc0255a395c4cb1d5a85a11a0120 +Author: Christoph Reimann +Date: Tue Jul 13 07:59:58 2010 +0200 + + - changed handling of anchestor types (may be more than one now) + - added SwitchType and BitcaseType + +commit d30664b58016687379d42d18056827fe57830d20 +Author: Christoph Reimann +Date: Tue Jul 13 07:58:24 2010 +0200 + + add support for new expr tags popcount, enumref, sumof + +commit e7aa34e6b3d846d0508ef08e74ea95d86da047d0 +Author: Julien Cristau +Date: Wed Jun 23 18:56:26 2010 +0100 + + xf86dri: fix GetDrawableInfo reply + + Add missing fields and list of clip rects. + + Reviewed-by: Peter Harris + Signed-off-by: Julien Danjou + +commit 29da739948419b660ff4a94706b1cb59c93ab9cc +Author: Christoph Reimann +Date: Sat Jun 12 23:25:08 2010 +0200 + + xcbgen: perform lenfield lookup within all anchestors + +commit cb4c5d2f464660abc596aa2761b2fb034be1c59a +Author: Christoph Reimann +Date: Sat May 22 18:04:53 2010 +0200 + + changed Exception message in case of unknown/unhandled XML tags + +commit f91186b9f3e55e1d478476749c929b86e2865cc8 +Author: Marcin Kościelnicki +Date: Thu May 13 21:06:00 2010 +0000 + + dri2: Add proper padding before driver_name + + Reviewed-by: Julien Cristau + Signed-off-by: Julien Danjou + +commit 0188b175cc5e2ef61396e237657ac109757a3265 +Author: Marcin Kościelnicki +Date: Thu May 13 21:05:59 2010 +0000 + + xf86vidmode: Fix padding expressions + + Reviewed-by: Julien Cristau + Signed-off-by: Julien Danjou + +commit 70e270182fd523a6ea2270d8cf9ad21960dd0f74 +Author: Marcin Kościelnicki +Date: Thu May 13 21:05:58 2010 +0000 + + xcbgen: Add unop support + + Reviewed-by: Julien Cristau + Signed-off-by: Julien Danjou + +commit dae6b32d78f1a4ee30229d7f944ca6528aa50a7d +Author: Mikhail Gusarov +Date: Fri May 14 04:24:27 2010 +0700 + + Revive support for hex literals in protocol + + As a side-effect it also adds octal and binary literals. Exact syntax is + described at http://docs.python.org/reference/lexical_analysis.html#numbers + + It is unwise to use full syntax, as there might be other binding generators, + octal, binary and hex literals seem to be safe though. + + Signed-off-by: Mikhail Gusarov + Signed-off-by: Julien Danjou + +commit 2d873a3dc8c0e1315be426da8054adb4188574b0 +Author: Peter Harris +Date: Mon Mar 29 15:26:38 2010 -0400 + + xkb: Fix opcode for Bell and GetState requests + + Reviewed-by: Ian Osgood + Signed-off-by: Peter Harris + +commit 3c75db3bcce102c678fc90154a1930fd08b2537c +Author: Peter Harris +Date: Wed Feb 10 16:07:16 2010 -0500 + + Collection of small fixes for xkb.xml + + These were discovered while updating the wireshark dissector: + + - Clean up "ID" enum definition and usage + - Clean up XIFeature masks + - Use SetOfGroup (not Group) for masks + - Use LedClass as an enum, not as a mask + +commit e458401b43b3ebb1b9eb4584269455c7292dfcfa +Author: Peter Harris +Date: Wed Nov 11 14:41:38 2009 -0500 + + Add XKEYBOARD protocol description + + Thanks to Mariusz Ceier for starting this work, and + to Google's Summer of Code for sponsoring the initial work. + + Signed-off-by: Peter Harris + +commit 9d03507afa4354ce402333f94d01f6bcb2cf41e6 +Author: Peter Harris +Date: Wed Nov 11 14:41:16 2009 -0500 + + Add description of new protocol elements + + These new elements will be used to support XKEYBOARD (and potentially + other troublesome extensions in the future). + + Thanks to Mariusz Ceier for starting this work, and + to Google's Summer of Code for sponsoring the initial work. + + Signed-off-by: Peter Harris + +commit 78e48a24c7df2381269fc6c6accc3b44bc237ab2 +Author: Julien Danjou +Date: Wed Dec 2 10:06:23 2009 +0100 + + Release xcb-proto 1.6 + + Signed-off-by: Julien Danjou + +commit 09beaa8043fe94ee47caf5da43fc5e81df5fd9da +Author: Peter Harris +Date: Fri Nov 6 15:48:00 2009 -0500 + + Add pre-defined atoms to Atom enum + + Signed-off-by: Peter Harris + +commit 0b6663d19e72c02dd478b5756242220714be0b9e +Author: Peter Harris +Date: Wed Oct 28 16:05:26 2009 -0400 + + Fix length calculation for xfixes/FetchRegion reply + + Signed-off-by: Peter Harris + Reviewed-by: Julien Cristau + +commit b684b0d0806c59526f57ca4e36e77104eec1b580 +Author: Eamon Walsh +Date: Wed Oct 21 18:37:33 2009 -0400 + + Re-fix the ConfigureWindow request padding issue. + + We rely on the fact that the valueparam field is treated as a list, + and, like any other list, the Python code will check if the length + field is previously defined in the structure before adding a new one. + This allows us to insert the necessary 2-byte padding. + + Signed-off-by: Eamon Walsh + +commit a03633320a28e07e561de86b32e75c8e4626ece7 +Author: Eamon Walsh +Date: Wed Oct 21 18:22:06 2009 -0400 + + Revert "made changes to support new value-mask-pad field of valueparam structures" + + This change fixes a ConfigureWindow request padding issue, + but has a bug that affects xpyb (#24507). + + This reverts commit 57934caa3fb207320c33312646d8e98290950f51. + +commit ae06ddd86a3c050f403eeee849b9a1357aac097d +Author: Eric Anholt +Date: Thu Oct 15 13:12:50 2009 -0700 + + Add DRI2 protocol, based off of dri2proto.h and the server code. (v2) + + v2: Incorporate comments from jcristau, and convert to 2-space indents to + match the dominant style. + +commit a5a414b38180bb24d8cd994375ed51f006d32c20 +Author: Jamey Sharp +Date: Fri Oct 9 10:13:33 2009 -0700 + + xf86dri.xml seems to have been wrong forever. Fixes bug #16894. + +commit 4f4d43eceb888bafca1798164d5508c09d63dba2 +Author: Guillem Jover +Date: Tue Sep 22 19:43:23 2009 +0200 + + Add py-compile to .gitignore + + Signed-off-by: Guillem Jover + Signed-off-by: Peter Harris + +commit a507629647dfa0f06eb1b3f4fd5d9d9893daaf06 +Author: Julien Danjou +Date: Sun Aug 16 11:05:17 2009 +0200 + + shape: add missing padding bytes to GetRectangles + + Signed-off-by: Julien Danjou + +commit 4fb5556c67b82d1b8ce9066cfdd24975dc22fa2c +Author: Peter Harris +Date: Mon Jun 1 14:16:09 2009 -0400 + + Fix typo in xf86vidmode.xml + + Signed-off-by: Peter Harris + +commit a8c55f7972ebc7b1a549d640b8d9eaf4a0228ca0 +Author: Peter Harris +Date: Thu May 21 15:29:13 2009 -0400 + + Add XML description for the XFree86VidMode extension. + + Signed-off-by: Peter Harris + +commit e7e9fcc744f59a84aa6d941fabd8ee928fe92437 +Author: Peter Harris +Date: Thu May 21 14:12:24 2009 -0400 + + Add XML description for the Generic Event extension. + + Signed-off-by: Peter Harris + +commit 57beb8a0ef5c7066ebafad7b60a4a8852e017ca6 +Author: Julien Danjou +Date: Fri May 29 08:12:16 2009 +0200 + + Release xcb-proto 1.5 + + Signed-off-by: Julien Danjou + +commit 6d62c3c28c23596b60b697d8968c6254483b412d +Author: Julien Cristau +Date: Tue May 26 10:59:26 2009 +0200 + + Fix ShmCompletion event + + Reported-by: Remi Denis-Courmont + Signed-off-by: Julien Cristau + Signed-off-by: Julien Danjou + +commit 1d6890e640a292092e22943aa52e8f4f5c99b1d3 +Author: Julien Danjou +Date: Tue May 26 11:32:18 2009 +0200 + + Revert "shm: fix Completion event fields" + + This reverts commit 51c5112d18fc4359c8a3cbe82cb884dcef1a320e. + +commit 51c5112d18fc4359c8a3cbe82cb884dcef1a320e +Author: Julien Danjou +Date: Tue May 26 10:45:57 2009 +0200 + + shm: fix Completion event fields + + This should fix Debian bug #530560. + + Signed-off-by: Julien Danjou + +commit 38426f8b897793841bd5620b9cfe92e2a98bce0c +Author: Julien Danjou +Date: Sat May 9 17:58:59 2009 +0200 + + bump version to 1.5 + + Signed-off-by: Julien Danjou + +commit 60d3f9fd9cd96915379d0b413cafb4f3ea3febe3 +Author: Julien Cristau +Date: Wed Apr 22 19:14:28 2009 +0200 + + Add RandR 1.3 requests + + Signed-off-by: Julien Cristau + +commit f584ee1100a95d4333712500b6741e076a318057 +Merge: df2cdee 88d0841 +Author: Peter Harris +Date: Tue Apr 21 12:33:15 2009 -0400 + + Merge branch 'enum' + +commit 88d08418b1a2d8d88225386214ebb749b926cdab +Author: Peter Harris +Date: Thu Apr 9 15:30:13 2009 -0400 + + Add enum references to fields in SYNC + + Signed-off-by: Peter Harris + +commit 84bfafb49f8abd5ea63bcc1170cbde92bffd10d1 +Author: Peter Harris +Date: Wed Apr 8 21:22:56 2009 -0400 + + Add enum references to fields in RENDER + + Signed-off-by: Peter Harris + +commit 9b2b6acffaeca4a3f2b8ecf2877614fdb3d6ae46 +Author: Peter Harris +Date: Tue Mar 31 15:54:59 2009 -0400 + + Add enum references to fields in XVideo + + Signed-off-by: Peter Harris + +commit 1de0b6ba14b1ecf2a97e83b424192a0d9f6827fe +Author: Peter Harris +Date: Tue Mar 17 15:02:16 2009 -0400 + + Add enum references to fields in XInputExtension + + Signed-off-by: Peter Harris + +commit 3c40a15d3b139c72e6df7714752805f3ae5c9041 +Author: Peter Harris +Date: Mon Mar 16 14:57:36 2009 -0400 + + Add enum references to fields in RANDR + + Signed-off-by: Peter Harris + +commit df2cdeecb9ed57aa54a883df043db10ce5881ce3 +Author: Julien Danjou +Date: Sun Apr 12 01:41:35 2009 +0200 + + xtest: rename window field + + The XTest specs call this field 'root' window, which is really more clear + than just 'window'. + + Signed-off-by: Julien Danjou + +commit fe7b12db4fc0e95f3eef038581bf2154e1727c7a +Author: Eamon Walsh +Date: Tue Apr 7 23:56:33 2009 -0400 + + Correct the length calculation for the value field of GetPropertyReply. + + value_len only contains the number of data units, which are 1, 2, or 4 + bytes depending on the value of the format field. The length of the + value field is thus value_len multiplied by the bytes per unit, + which is format / 8. + + Signed-off-by: Eamon Walsh + +commit 4d9e8c51ea03546592fde23dd4304effd27f359d +Author: Julien Danjou +Date: Mon Apr 6 10:55:41 2009 +0200 + + Fix miter spelling + + This fixes bug #13140. + + Signed-off-by: Julien Danjou + +commit b4ca142b367768c694d1fbff2a34f5a2745eb2cc +Author: Peter Harris +Date: Fri Mar 6 11:34:11 2009 -0500 + + Add enum references to fields in DPMS + + Signed-off-by: Peter Harris + +commit 907c9246777b189506858fad6a5e970336fdcce0 +Author: Peter Harris +Date: Wed Mar 18 16:39:29 2009 -0400 + + Move enums above their first use in xproto.xml + + This change makes it easier to process the xml file in a single streamy + pass. + + Signed-off-by: Peter Harris + +commit 727ae3b3d3b0987fc2db3eca4658872717d2c605 +Author: Peter Harris +Date: Fri Mar 6 11:20:17 2009 -0500 + + Add enum references to fields in Damage + + Signed-off-by: Peter Harris + +commit 80af10abf4bad56e9956020870df10a5b0de38ab +Author: Peter Harris +Date: Fri Mar 6 11:20:09 2009 -0500 + + Add enum references to fields in XFIXES + + Signed-off-by: Peter Harris + +commit 091c0caeec5ddd92a44ba2436e16609420316b48 +Author: Peter Harris +Date: Fri Mar 6 10:44:10 2009 -0500 + + Add enum references to fields in Composite + + Signed-off-by: Peter Harris + +commit 33e4c1ce67a3d7f12a891f396f48cb576fc83477 +Author: Peter Harris +Date: Thu Mar 5 18:26:21 2009 -0500 + + Add enum references to fields in Shape + + Signed-off-by: Peter Harris + +commit 35286bcd46309b8395535f6f4b06ffb429c0422d +Author: Peter Harris +Date: Thu Mar 19 13:42:19 2009 -0400 + + xinput tweaks + + - The 'present' field is boolean + - The spec seems to imply that AxisInfo should be signed. + In actual usage, some devices center on 0, and transmit signed values. + - Add error definitions + + Signed-off-by: Peter Harris + +commit cb45e38331e383c8b04cb6c32c26fbbadf43e9eb +Author: Peter Harris +Date: Wed Feb 25 16:46:00 2009 -0500 + + Add a variety of 'None' enum types and altenum references. + + Signed-off-by: Peter Harris + +commit 6c5e2f42871bb77f5e90ed77ab421bc681c35bd9 +Author: Peter Harris +Date: Thu Feb 19 14:49:11 2009 -0500 + + Add (and use) KeyButMask enum. + + Signed-off-by: Peter Harris + +commit 8de2fc333fd5e6bb1ddf342d1c1ff702ef497c93 +Author: Peter Harris +Date: Thu Feb 19 14:44:46 2009 -0500 + + Add (and use) Time/CurrentTime enum. + + Signed-off-by: Peter Harris + +commit e5b4ec6a39c7e73a9ad231fcba850efba2ed8302 +Author: Peter Harris +Date: Thu Feb 5 16:09:05 2009 -0500 + + Document enum, altenum, and mask + + Signed-off-by: Peter Harris + +commit d001afae934bb5447368347c1f3d6e1e0ba090e1 +Author: Peter Harris +Date: Thu Feb 5 16:42:50 2009 -0500 + + Add altenum (non-exhaustive enum) + + Signed-off-by: Peter Harris + +commit 8e5a650fb7911a0714447134f97f27afb430f805 +Author: Peter Harris +Date: Thu Feb 19 14:37:37 2009 -0500 + + Most usages of ModMask may also take the special value "Any". + + Signed-off-by: Peter Harris + +commit 3b32ef907c26bf8babda8eebb1cc5d5ab524976b +Author: Julien Danjou +Date: Mon Feb 16 11:35:46 2009 +0100 + + Release xcb-proto 1.4 + +commit d7f720df741114d42bac270839719aee3da59af5 +Author: Peter Harris +Date: Thu Feb 5 16:01:49 2009 -0500 + + Move the definition of "enum" and "mask" from to "var". + + In theory, anything that may contain a value may contain an enum value. + + In practise, the Render extension has a of enum in the + QueryPictFormats reply. + + Signed-off-by: Peter Harris + +commit 505dd632bbbd9a55c2bd334d0c06abc175445327 +Author: Peter Harris +Date: Thu Feb 5 16:16:09 2009 -0500 + + Remove obsolete references to XSLT + + Signed-off-by: Peter Harris + +commit 1804c114bb16294e64ba124dc1b0ce6c8c57be4e +Author: Peter Harris +Date: Mon Jan 5 11:35:10 2009 -0500 + + Add missing enum references to xproto.xml + + Fix enum typos in xproto.xml + + Signed-off-by: Peter Harris + +commit 12a2b2bf7492d292c9f8e2b2abb3be1dc3e98ab1 +Author: Antoine Latter +Date: Sun Jan 4 20:13:13 2009 -0600 + + Associate fields with the enum which describes their allowed values. + + Two optional attributes are added to the field element: + enum - This fieled may assume one of the values in the named enum + mask - This fieled is a bitmask of the values in the named enum + + Signed-off-by: Julien Danjou + +commit 52d0702ed569771936c874b9a417ae368c1b57c4 +Author: Antoine Latter +Date: Sat Dec 27 19:50:13 2008 -0500 + + Add padding to the setup request struct as required by the protocol. + + Add padding to QueryExtension as required by the protocol. + + Signed-off-by: Julien Danjou + +commit fcf07ca7e9e107740f19e21c562f0dc2aab6f23c +Author: Julien Danjou +Date: Wed Dec 10 11:33:43 2008 +0100 + + Release xcb-proto 1.3 + + Signed-off-by: Julien Danjou + +commit d054344c5511161af81572d8dd46959030cc7a59 +Author: Julien Danjou +Date: Wed Dec 10 11:29:30 2008 +0100 + + NEWS: add 1.2 release NEWS + + Signed-off-by: Julien Danjou + +commit 5b65f8e883d1ddb374028672858e3601848f6827 +Author: Peter Harris +Date: Fri Oct 17 16:10:48 2008 -0400 + + Change CARD8 to char when referring to a string in xfixes.xml + +commit cb4beff523f586cdaf60e57fa479a9340bdcbd50 +Author: Thomas Hunger +Date: Wed Jul 4 13:58:25 2007 +0200 + + Change type="CARD8" to type="char" where the X specs require a STRING8 + +commit 05661475698179c9353087740b6595e66ffdca5b +Author: Peter Harris +Date: Tue Nov 4 16:19:12 2008 -0500 + + randr: Use xidtype where appropriate + + Signed-off-by: Peter Harris + +commit f442680c7fd72ec39336209a58531f7d03be819a +Author: Peter Harris +Date: Wed Nov 5 14:08:16 2008 -0500 + + randr: Update to match protocol specification + + From 5334bcd14310dd9bf99df5d1391ce119366c6085 Mon Sep 17 00:00:00 2001 + From: Peter Harris + Date: Wed, 5 Nov 2008 11:40:40 -0500 + Subject: [PATCH] randr: Update to match protocol specification + + Some of these changes are semi-cosmetic + - CARD vs INT + - pad vs "status" in some replies + + Some of these changes are actual bug fixes: + - ConfigureOutputProperty values + - ChangeOutputProperty data + - SetCrtcConfig outputs + + Signed-off-by: Peter Harris + Signed-off-by: Julien Danjou + +commit b95df0a7fed9c37bdd3a6ddb11ed5a2769defcd9 +Author: Alberto Milone +Date: Wed Oct 22 15:59:41 2008 -0400 + + RandR: add missing outputs list to GetCrtcInfoReply. + +commit b5553dfd705e9a7cc23ce92fc9f94bf076278954 +Author: Peter Harris +Date: Thu Oct 16 19:04:40 2008 -0400 + + Move the defintion of STRING8 above its first use in xprint.xml + + Signed-off-by: Julien Danjou + +commit 6a901fb9a684d9980e78789e2993c4a42946d4cd +Author: Peter Harris +Date: Thu Oct 16 18:58:38 2008 -0400 + + Move structures above their first uses in xinput.xml + + This change makes it easier to process the xml file in a single streamy pass. + + Signed-off-by: Julien Danjou + +commit b7ca344b92a34953c3617a2819f0848d28e11502 +Author: Peter Harris +Date: Thu Oct 16 18:40:00 2008 -0400 + + Move Format above its first use in xv.xml + + This change makes it easier to process the xml file in a single streamy + pass. + + Signed-off-by: Julien Danjou + +commit c8129e1f19ceb2002c9764b94f03564600f13a8f +Author: Eamon Walsh +Date: Mon Oct 20 14:05:37 2008 -0400 + + RandR: Remove extraneous field from GetCrtcInfoReply. + + Signed-off-by: Eamon Walsh + +commit 11e7ac02c2298b930996dbfdc78b3328c81d564e +Author: minami +Date: Thu Oct 16 23:42:23 2008 +0200 + + render: fix missing field in gradient proto + + Signed-off-by: Julien Danjou + +commit d81ca233e98be8fa59e8c90d262c0516944c5a66 +Author: Julien Danjou +Date: Mon Sep 1 15:05:46 2008 +0200 + + xv: add missing padding bytes + + Signed-off-by: Julien Danjou + +commit 008388baff0e1f1279a3b111b28e4c2a4ee6bb8e +Author: Julien Danjou +Date: Mon Sep 1 15:05:44 2008 +0200 + + sync: add missing padding bytes + + Signed-off-by: Julien Danjou + +commit 0d62c1d03f48f3c65e75e95b0479b364ebd25e36 +Author: Julien Danjou +Date: Mon Sep 1 15:05:43 2008 +0200 + + xproto: add missing padding bytes + + Signed-off-by: Julien Danjou + +commit 0704a33a6753677328b0f9e939278d4cf48c431e +Author: Julien Danjou +Date: Mon Sep 1 15:05:42 2008 +0200 + + shm: add missing padding bytes + + Signed-off-by: Julien Danjou + +commit 109a70c496ea9a2047c793815eccd9d27ea440e4 +Author: Julien Danjou +Date: Mon Sep 1 15:05:41 2008 +0200 + + shape: add missing padding bytes + + Signed-off-by: Julien Danjou + +commit e4fba94ba63c2c93dccdedec051c0d1ccedd41ef +Author: Julien Danjou +Date: Mon Sep 1 15:05:40 2008 +0200 + + render: add missing padding bytes + + Signed-off-by: Julien Danjou + +commit c0e94a5ce4d3a8046cff962a928cb090d180ee63 +Author: Julien Danjou +Date: Mon Sep 1 15:05:39 2008 +0200 + + randr: add missing padding bytes + + Signed-off-by: Julien Danjou + +commit db3a0e008998c876696107f646158fae63244baa +Author: Julien Danjou +Date: Mon Sep 1 15:05:38 2008 +0200 + + dpms: add missing padding bytes + + Signed-off-by: Julien Danjou + +commit f9c1bc3c6f24b5533f8ec8a441c9856a57824576 +Author: Carsten Meier +Date: Wed Sep 3 12:55:04 2008 +0200 + + Make bit-numbers available to code-generators + + The Enum-class now exports the bit numbers in the 'bits'-list + if they have been specified in the protocol description. + + Signed-off-by: Bart Massey + +commit 929646d767c1eff07c6d0a551cce01922b2c887d +Author: Carsten Meier +Date: Wed Sep 3 12:50:26 2008 +0200 + + Generate values instead of shift-expressions for enum-bits + + Now more language independent as some languages don't have + C-like shift-operators. + + Signed-off-by: Bart Massey + +commit 8b3c1209de3c4545f288b0a5c3bd395828f6da34 +Author: Bart Massey +Date: Wed Sep 3 11:37:03 2008 -0700 + + did remaining replacements of hex constants with decimal + +commit 183ecffd8b681ca3922cfadfa26e0236a1e2d94f +Author: Carsten Meier +Date: Wed Sep 3 13:01:24 2008 +0200 + + Replaced hex-values with decimal ones + + Replaced the GC-function values with decimal ones as some + languages have a different notation for hex-values. + + Signed-off-by: Bart Massey + +commit 57934caa3fb207320c33312646d8e98290950f51 +Author: Bart Massey +Date: Sun Aug 31 00:45:17 2008 -0700 + + made changes to support new value-mask-pad field of valueparam structures + +commit 91b5a1b56c744c2aa2740eb814d39ec48cbd27af +Author: Eamon Walsh +Date: Tue Sep 2 17:38:30 2008 -0400 + + xcb-xselinux: Add GetClientContext request. + +commit 47206b3df018b7c682dfcbdcbf490e698958ab55 +Author: Julien Danjou +Date: Wed Aug 27 11:51:06 2008 +0200 + + glx: add padding for PbufferClobber event + + Signed-off-by: Julien Danjou + +commit 9a6b4466f41e29d84c4d53810be5d1dddd303da0 +Author: Julien Danjou +Date: Wed Aug 27 11:50:49 2008 +0200 + + screensaver: add padding for notify event + + Signed-off-by: Julien Danjou + +commit 53366c673ce685bd51e1cbd35fe95f893b41ce1d +Author: Julien Danjou +Date: Wed Aug 27 11:40:52 2008 +0200 + + xproto: fix alignment for RotateProperties request + + Signed-off-by: Julien Danjou + +commit 89fc37ddba3a4e0caef1fa6eba02d4ac8ff1fdfc +Author: Peter Harris +Date: Wed Aug 27 10:17:23 2008 +0200 + + xv.xml: Use for padding + + Signed-off-by: Julien Danjou + +commit 56e3160f88f30e4f08433d5da826515575b75f09 +Author: Peter Harris +Date: Wed Aug 27 10:13:18 2008 +0200 + + xv.xml: Make padding explicit + + I noticed that xv.xml assumes implicit padding in a couple of locations. + Please apply this patch to make the padding explicit. Or is implicit + pad support required in all consumers of xcb/proto? + + Signed-off-by: Julien Danjou + +commit 025997b87b333d120bf8cbaf23a5cce44ba711e5 +Author: Peter Hutterer +Date: Fri Jul 18 10:59:58 2008 +0930 + + Release xcb-proto 1.2. + +commit bf652a63fe0de259857ed174d7e921d645184634 +Author: Eamon Walsh +Date: Wed Jul 9 13:41:10 2008 -0400 + + Work around a Python bug involving the file name 'types.py'. + +commit 3e8dbef32e691150ca1c86a2bccfd4458ef16190 +Author: Eamon Walsh +Date: Wed May 21 22:49:14 2008 -0400 + + Avoid using enum types as structure fields. + +commit 9ae5448fc231a008fa02eb704fd034de099cf2bb +Author: Eamon Walsh +Date: Wed May 21 22:25:50 2008 -0400 + + Fix a type size calculation. + +commit 0212c5ea88f4387a1a200ef80b2e844d01ace470 +Author: Eamon Walsh +Date: Fri May 16 14:53:49 2008 -0400 + + Add is_simple boolean attribute for plain integer types. + +commit 82f981d1bda43fc3b3c8712be578c6d26e3245a5 +Author: Eamon Walsh +Date: Wed Apr 23 20:21:31 2008 -0400 + + Add the python install dir to xcb-xproto.pc. + +commit 7820273c4b00209d5ace8cbfdb1400728e15c158 +Author: Eamon Walsh +Date: Thu Apr 17 19:46:16 2008 -0400 + + Add Python parser language-independent parts. + +commit b15d25b2c6b950bfc844ee626870c84f46f21082 +Author: Eamon Walsh +Date: Mon Apr 14 19:24:02 2008 -0400 + + Require a length specification for lists in reply structures. + +commit d1f26106925f64907a8e4a26ab7678f5b3e8b6ca +Author: Eamon Walsh +Date: Mon Apr 14 14:42:39 2008 -0400 + + Remove some stray padding from an XInput request. + +commit 72877f45f5fa2bda839b64a42f302f03440438da +Author: Eamon Walsh +Date: Mon Apr 14 14:40:47 2008 -0400 + + Xinerama GetScreenSize screen field is a CARD32, not an xproto screen struct. + +commit 8e71c3348c4017fa12403cb5438727218950f9fd +Author: Eamon Walsh +Date: Thu Apr 3 17:58:41 2008 -0400 + + Use multiword attribute instead of oneword in XSELinux description. + Fixes validation. + +commit ebf1c9dd1bcde3b63c925ff6056445e05e5df7df +Author: Eamon Walsh +Date: Wed Mar 5 12:50:49 2008 -0500 + + xcb-xselinux: Revisions to xselinux extension protocol. + +commit 28a7cd06af0886a67c3c8a0f990d517e0bde61fe +Author: Eamon Walsh +Date: Mon Feb 25 19:33:15 2008 -0500 + + xcb-xselinux: Remove an errant padding statement. + + Bug reported by Xavier Toth. + +commit 442371b6b5785b223d0b4b682f19e19be9757bba +Author: Eamon Walsh +Date: Thu Jan 24 15:48:07 2008 -0500 + + Add XML description for SELinux extension. + +commit d4daeb1dcc5da665d0c54ee262c3a80875e5ef2d +Author: Eamon Walsh +Date: Thu Jan 24 15:46:59 2008 -0500 + + Add XML description for XInput extension. + + Some requests and replies are not yet implemented. + +commit 4ebc84c7503d16c01c7899713ca5932aa8f50b79 +Author: Peter Harris +Date: Mon Dec 10 19:58:48 2007 -0500 + + Use instead of where appropriate + +commit ffbac5d94f91652b0a371260c26e3fbe2cdbbd59 +Author: Bart Massey +Date: Mon Dec 10 14:34:40 2007 -0800 + + fixed xv SelectPortNotify argument; bug reported by Julien Cristau + +commit 5e266db51e8e85d324d0b898e911c28942075822 +Author: Peter Harris +Date: Fri Dec 7 14:23:53 2007 -0800 + + Change the protocol definition of X-Resource to use ATOMs. + +commit 480d3bd8c084971c1212a005e960d641a809af06 +Author: Jamey Sharp +Date: Sat Dec 1 12:32:38 2007 -0800 + + Bugfix: GetKeyboardMapping's keysyms list had the wrong length. + +commit 6caf9bd62576149d06762ffc00883e422786833d +Author: Jamey Sharp +Date: Sun Nov 4 14:17:52 2007 -0800 + + Release xcb-proto 1.1 + +commit 6d21e886f2ef967e0ff1cac3762df6f8f6909991 +Author: Rob Taylor +Date: Mon Aug 27 06:56:45 2007 -0700 + + fix XSync Initialize call + + Initialize takes two CARD8 fields for desired Xsync version. + +commit cb188ab9d7afb737a459d4d8105ce15fa00fdf0d +Author: Matthias Hopf +Date: Wed Apr 11 17:23:44 2007 +0200 + + Update autogen.sh to one that does objdir != srcdir. + +commit ea93d1b25b470d01931bc16130d3933b4b80498f +Author: Eamon Walsh +Date: Tue Apr 10 11:56:43 2007 -0400 + + Modifies new attribute from previous patch so that it need only be used + on extensions with split names. + +commit 35ea50bc6a001181eb9a8c658fbcdf5f075bf6c4 +Author: Eamon Walsh +Date: Thu Mar 29 12:26:28 2007 -0700 + + Introduces attribute to schema and modifies currently special-cased + protocol descriptions to use it. + +commit dc8737707ef3651aca8194f2d96df54b8d00abe4 +Author: Jeremy Kolb +Date: Mon Feb 12 19:49:12 2007 -0500 + + Update DAMAGE to 1.1 + +commit e7f9e65036490e7a5f70166d16414432bfff194d +Author: Ian Osgood +Date: Sat Dec 2 08:54:14 2006 -0800 + + Use lowercase for field names. + +commit 0561900cfe6738329dd271df93f38fec8f538789 +Author: Ian Osgood +Date: Sat Dec 2 08:42:24 2006 -0800 + + Fix ListOutputProperties protocol. + +commit 37b681288c18754037a00d1765fdbde456b1c1a5 +Author: Ian Osgood +Date: Thu Nov 30 12:01:22 2006 -0800 + + Update RandR to version 1.2 + +commit 701dec025966bd19dcd1a6ae6f277abf3f1abd16 +Author: Josh Triplett +Date: Thu Nov 23 07:21:09 2006 -0800 + + Release xcb-proto 1.0 + +commit 1df54ae21a42aa20538e3123a9c2d9f4d6c07c94 +Author: Vincent Torri +Date: Tue Nov 21 21:57:38 2006 -0800 + + Bug #8990: randr type fixes + +commit 186c79774257193307f92d2cf2008a18bcd68393 +Author: Patrick Guimond +Date: Wed Nov 8 17:34:33 2006 -0500 + + Estethic change for attribute parameter name + + Changed num_attributes parameter of QueryContext request to num_attribs + for consistency with other requests + +commit a4681227e8a7d8622b3d6995b6700e18e91067c6 +Author: Patrick Guimond +Date: Wed Nov 8 17:32:43 2006 -0500 + + fixed screen parameter type in requests + + For the following requests, fixed the paramater type to be CARD32 instead + of SCREEN structure + + Requests: - CreateNewContext + - CreatePbuffer + - CreateWindow + +commit 015b2696afd0824590dd9952bd8ba61a9d5ab6e2 +Author: Patrick Guimond +Date: Wed Nov 8 17:29:43 2006 -0500 + + Changed valueparam arguments for attribute lists + + For following request and replies, substitutes attribute list passing + to a parameter list instead of valuemask/values + + Requests: - CreatePixmap + - QueryContext + - CreatePbuffer + - ChangeDrawableAttributes + - CreateWindow + Reply: - GetDrawableAttributes + +commit 854d08c8242e8fbe7b5a000b75ec6845419806c4 +Author: Jamey Sharp +Date: Sun Nov 19 14:51:26 2006 -0800 + + Remove support for the tag: nothing needs it. + + Only one use of remained, for a list length expression in + xv.xml. List length parameters that don't actually appear in the + protocol should be left implicit: if no length expression is given, then + a localfield will be automatically created by c-client.xsl. + +commit 36134f48236f50aeee386b36be7e82c809688bc8 +Author: Jamey Sharp +Date: Sat Nov 11 16:12:54 2006 -0800 + + Bug #8973: In UngrabKey, the 'key' field is of type KEYCODE, not the more general CARD8. + + Thanks to Vincent Torri for pointing out the error. + +commit 38ded0002498cfe125e66dbc513071448f7480f5 +Author: Jamey Sharp +Date: Thu Nov 2 16:49:43 2006 -0800 + + Release xcb-proto 1.0 RC3 (0.9.93). + +commit 372f3b46eca54ac3cf6fbf9162742289ddfeac1e +Author: Ian Osgood +Date: Wed Nov 1 21:35:24 2006 -0800 + + Fix cap style enumeration (bug #8857). + +commit db02bf21d9e3f9d812d808bfcef8dd453656e6fd +Author: Jeremy Kolb jkolb@brandeis.edu +Date: Mon Oct 30 18:10:20 2006 -0500 + + Update the record extension. Type in the version. + + Updated xcb.xsd for major-version and minor-version attributes of the xcb tag. + +commit 2df1bbfa953fe7989524c1bc7000f517e121a645 +Author: Jeremy Kolb jkolb@brandeis.edu +Date: Sun Oct 29 19:27:53 2006 -0500 + + Added major-version and minor-version attributes to the xcb tag. + +commit c10a77848f9318856129161be08a05379ffb39de +Author: Ian Osgood +Date: Fri Oct 20 07:38:55 2006 -0700 + + Fix GrabMode enumeration (reported by Yang JianJun) + +commit b3423e67845cb6f2b858fb3f22295a5ef79821fb +Author: Josh Triplett +Date: Sun Oct 15 12:39:04 2006 -0700 + + Move extension descriptions out of extensions/ subdirectory + + Now that the extensions do not get installed to an extensions/ subdirectory, + move them out of the extensions/ subdirectory in the source as well. + +commit 39a58929682650c0761e3ccfe2f10978ec5f0b74 +Author: Jeremy Kolb +Date: Thu Oct 12 23:54:51 2006 -0400 + + Oops. keithp told me to forget about videmode. + +commit 01c0c9eda8e4fb9fe0135f4e447c5fa7c18bf2e6 +Author: Jeremy Kolb +Date: Thu Oct 12 23:51:18 2006 -0400 + + The Xinerama extension 1.1. + +commit 790dd5c68bdf38df4c4e364091cc5becd68661a8 +Author: Ian Osgood +Date: Sun Oct 8 08:57:30 2006 -0700 + + Add REPEAT enumeration to fix bug #8535. + +commit 2f065ed8c9e96d4f8c6555f6c7e97b362808dfaa +Author: Jamey Sharp +Date: Sat Oct 7 22:49:45 2006 -0700 + + Move debian/ directory to new branch "debian". + +commit 4b738b87b2e3791877e9e0d6ba66f48282f174f7 +Author: Jamey Sharp +Date: Sat Oct 7 19:46:15 2006 -0700 + + Release xcb-proto 1.0 RC2 (0.9.92). + +commit 4e5e08b3251fe9174ae94e01ce3b682b0ffa9967 +Author: Jamey Sharp +Date: Sat Oct 7 19:37:54 2006 -0700 + + Make CompositeGlyphs* usable. + + render.xml no longer describes the CompositeGlyphs* requests as taking + lists of complicated unions of structures of lists: it says instead that + they take a LISTofBYTE. The caller is responsible for constructing an + appropriate sequence of glyph elements. Previously, the requests could + not actually be used because XCB did not correctly compute the length of + the provided data. + +commit b8071b0fa537a759be69892508ea8b9427b2adb1 +Author: Josh Triplett +Date: Sat Oct 7 01:26:48 2006 -0700 + + Add xproto explicitly to extensions that use xproto. + +commit 62668fb2e24ea3c11ee3782ae0b497395a9d2bc8 +Author: Josh Triplett +Date: Sat Oct 7 00:14:11 2006 -0700 + + Change "union" to "xidunion" for XID unions like DRAWABLE and FONTABLE + +commit 25550af7387e2d51470f3470642a144465088f81 +Author: Josh Triplett +Date: Fri Oct 6 21:16:27 2006 -0700 + + KEYCODE and BUTTON should become typedefs of CARD8, not CARD32 + +commit 036019dcab226d70e456c7adc5e79364eb86b72b +Author: Josh Triplett +Date: Fri Oct 6 21:13:22 2006 -0700 + + Replace structures attempting to provide C type safety with CARD32 typedefs + +commit bc21baeacec4b57261dc226f1b108c1c64f4d28a +Author: Jamey Sharp +Date: Mon Sep 25 05:11:57 2006 -0700 + + Release xcb-proto 1.0 RC1 (0.9.91). + +commit 7f0d92bba3e9cf3f73c2bc9148be91300ee0bc72 +Author: Josh Triplett +Date: Mon Sep 25 05:10:37 2006 -0700 + + Stop installing the protocol descriptions for extensions to an extensions/ + subdirectory + +commit 0608038f1213086405a4204cc0c6264a15e32a63 +Author: Jamey Sharp +Date: Mon Sep 25 03:27:27 2006 -0700 + + Move XML protocol descriptions to $datadir/xcb (generally $prefix/share/xcb). + +commit 5f14bbec75abbbc3d2585db0f53fcfe8dbdfa625 +Author: Josh Triplett +Date: Sun Sep 24 03:15:39 2006 -0700 + + Integrate top-level .gitignore into .gitignore for each subdirectory + + In preparation for the repository split, move the relevant contents of the + top-level .gitignore into the .gitignore for each immediate subdirectory. + +commit 42b647d43a2f56469b6cbd1d48a9a79462a71350 +Author: Josh Triplett +Date: Sat Sep 23 12:22:22 2006 -0700 + + The Great XCB Renaming + + Rename API to follow a new naming convention: + * XCB_CONSTANTS_UPPERCASE_WITH_UNDERSCORES + * xcb_functions_lowercase_with_underscores + * xcb_types_lowercase_with_underscores_and_suffix_t + * expand all abbreviations like "req", "rep", and "iter" + + Word boundaries for the names in the protocol descriptions fall: + * Wherever the protocol descriptions already have an underscore + * Between a lowercase letter and a subsequent uppercase letter + * Before the last uppercase letter in a string of uppercase letters followed + by a lowercase letter (such as in LSBFirst between LSB and First) + * Before and after a string of digits (with exceptions for sized types like + xcb_char2b_t and xcb_glx_float32_t to match the stdint.h convention) + + Also fix up some particular naming issues: + * Rename shape_op and shape_kind to drop the "shape_" prefix, since otherwise + these types end up as xcb_shape_shape_{op,kind}_t. + * Remove leading underscores from enums in the GLX protocol description, + previously needed to ensure a word separator, but now redundant. + + This renaming breaks code written for the previous API naming convention. The + scripts in XCB's tools directory will convert code written for the old API to + use the new API; they work well enough that we used them to convert the + non-program-generated code in XCB, and when run on the old program-generated + code, they almost exactly reproduce the new program-generated code (modulo + whitespace and bugs in the old code generator). + + Authors: Vincent Torri, Thomas Hunger, Josh Triplett + +commit 453b1ae69b2df7f9d16c5db3316b3dc32fb65ea2 +Author: TORRI Vincent +Date: Mon Sep 18 21:28:24 2006 +0200 + + XCBButton -> XCBButtonIndex. XCBHost -> XCBHostMode. XCBSetupReq -> XCBSetupRequest + +commit 0275e428b753f0af736ca0b79c5331639c6517ef +Author: Jamey Sharp +Date: Mon Aug 7 14:28:08 2006 -0700 + + Remove combine-adjacent tag on PolyPoint: it will not work for some forms of the request. + +commit fad63e7641a81fc427078e805edbfe81106cadf9 +Author: TORRI Vincent +Date: Mon Jul 24 17:24:13 2006 +0200 + + add flags for Alarm Attributes + +commit ee75a587334dc42757893b642ea5e463997413a4 +Author: Jamey Sharp +Date: Thu Jun 15 10:27:40 2006 -0700 + + Add a useful assertion message if a type gets multiply declared. + +commit 1bd636fd64940e62d101d690468e9979d2716dfa +Author: Jamey Sharp +Date: Thu Jun 15 10:25:46 2006 -0700 + + Bugfix: Make type shadowing go the right way in type.py. + +commit ab4393d3a63dde6fca2a167f7d6aaf64972b02f0 +Author: Josh Triplett +Date: Thu Jun 15 03:03:13 2006 -0700 + + Remove arbitrary division between xcb_types and xproto by merging + xcb_types.xml into xproto.xml. + +commit 4f1ff61d7906b3a27bb261564cf681a97154df18 +Author: Jamey Sharp +Date: Wed Jun 14 16:45:24 2006 -0700 + + Bugfix for size.py: count padding in struct size. + +commit 7aee7e35d3acdb6b68e27500f9d61cb15529f900 +Author: Jamey Sharp +Date: Wed Jun 14 14:18:49 2006 -0700 + + type.py qualifies all type names with the header in which they are defined. + Update size.py to quit doing a bad job at the same task. + Suggested usage is now: + ./import.py extensions/composite.xml | ./type.py | ./size.py + +commit b09b5306f2b67cb7a826be3702380bbdc045b9da +Author: Jamey Sharp +Date: Tue Jun 13 17:23:03 2006 -0700 + + Process directives with a new import.py tool. + Update size.py to accept all the data it needs in one file or stdin. + +commit 1855f0671e282c55c023c80ce6ef28c446190b43 +Author: Jamey Sharp +Date: Tue Jun 13 17:11:56 2006 -0700 + + Simpler implementation of AttributesUnion for XML processing. + +commit 7691c6e8351e083e9250c9dfb5e4a2665c94431d +Author: Jamey Sharp +Date: Tue Jun 13 01:58:53 2006 -0700 + + New tool to annotate XML-XCB s with their size in bytes. + +commit 8be539c492e4f118421348804420c5f1c9b7837b +Author: Ian Osgood +Date: Tue Jun 6 15:25:24 2006 -0700 + + Update Shape extension to version 1.1 + +commit ea11c03594d4966b2f5b29a0d57ef0af92b00865 +Author: Ian Osgood +Date: Tue Jun 6 13:33:10 2006 -0700 + + Screen saver: wrong reply field sizes. + +commit 76e0c3ca055545ffe9d0ee78dda92616e4032333 +Author: Ian Osgood +Date: Tue Jun 6 12:40:01 2006 -0700 + + Update Composite to version 0.3 + +commit 7703293f183b111852840fc959b7b4d16f46558c +Author: Ian Osgood +Date: Tue Jun 6 12:36:20 2006 -0700 + + Update Render to version 0.10 + Renamed previous type TRAP -> TRAPEZOID to make room for new TRAP type. + Use construct for masks. + +commit 851a57b6153c7191d7ee29d815331df30410c963 +Author: Ian Osgood +Date: Tue Jun 6 11:26:31 2006 -0700 + + Update screen saver protocol to version 1.1 + Fix type names, field sizes, and padding. + +commit 356cf013ec205580037b5f3c46442c601a9795a4 +Author: Ian Osgood +Date: Tue Jun 6 10:02:16 2006 -0700 + + Update XFixes to protocol version 4. + Use construct for mask enums. + +commit a2cf7b73787354b62dc9ad34658b91f25e0bc204 +Author: Jeremy Kolb +Date: Tue May 9 15:36:47 2006 -0400 + + num_props is a stupid name, changing to num_properties, it's a bit clearer and matches fields such as "num_visuals". + +commit 0ebc4ad4d385f96528da1d26f96f09cf0c7af2a8 +Merge: 5462c08 a342706 +Author: Josh Triplett +Date: Sat Apr 29 11:00:01 2006 -0700 + + Merge branch 'master' of git+ssh://git.freedesktop.org/git/xcb + +commit a34270694747289ed61c2ebe25e76e78b0363423 +Author: Josh Triplett +Date: Sat Apr 29 10:58:23 2006 -0700 + + Set distribution to experimental. + +commit 592a3d116a6503ed7b4e053208defd3f63407db9 +Author: Josh Triplett +Date: Sat Apr 29 10:56:56 2006 -0700 + + Remove Bugs field in debian/control, so bugs go to the Debian BTS. + +commit 5462c08a22bc6eff039f8ce7e498a114e90eb3df +Author: Jeremy Kolb +Date: Sat Apr 29 10:58:50 2006 -0400 + + Get rid of the value list/mask in requests. + +commit fb118062c5022e1ad0c1a5b3fab2341696fa9dda +Author: Ian Osgood +Date: Fri Apr 28 15:27:09 2006 -0700 + + Move the remainder of the constants in X.h into XML enumerations. + Fix xcb_auth to use one of the new enumerations. + +commit 9128f32f4dd5dbdfe0ee60208e7385185dad6d6f +Author: Alp Toker +Date: Thu Mar 30 04:36:04 2006 +0100 + + Fix incorrect extension xname + +commit d35df7cbf68d25191bd7f1713555e07647b72410 +Author: Josh Triplett +Date: Thu Apr 27 17:58:37 2006 -0700 + + Fix the year in the other COPYING. + +commit 26900ee380520686aaae32a5681a5866e3263fab +Author: Josh Triplett +Date: Thu Apr 27 14:14:54 2006 -0700 + + Add test program for XFree86-DRI extension to xcb-demo. Mark XFree86-DRI extension as tested and working. + +commit 675983fa17565e17048bc04e659db0266575e08d +Author: Josh Triplett +Date: Thu Apr 27 12:14:55 2006 -0700 + + Add some additional extensions from xdpyinfo to the TODO list. + +commit efaa93a5c1797846dff467556d597000c42407d0 +Author: Josh Triplett +Date: Thu Apr 27 12:08:24 2006 -0700 + + Fix typo in TODO. + +commit e4b9bde090f0a8de0e5a6205044e18e9fc355d2d +Author: Josh Triplett +Date: Thu Apr 27 12:07:50 2006 -0700 + + Update TODO for XTEST implementation. + +commit 97afdc623e3c4fb867e758e4e5e1eaa022270813 +Author: Jamey Sharp +Date: Wed Apr 26 23:19:16 2006 -0700 + + Rename ConnSetup* to Setup*, Setup*Rep to Setup*, and SetupSuccess* to Setup*. Provide deprecated backwards-compatability functions and typedefs for the old names, to be removed before 1.0. + +commit 8400c847608d26d9c02ec692b073d321266833cc +Author: Ian Osgood +Date: Wed Apr 26 10:50:31 2006 -0700 + + Changes to makefile to build libXCBxtest + +commit ab86b41cfdd33ceb3721f324146e371cb2dd7ffd +Author: Ian Osgood +Date: Mon Apr 24 14:16:38 2006 -0700 + + Implement XTest extension and xte demo + +commit f52c9b1bc8e81f0f28e54e9f300d82b2b8b1a122 +Merge: 4dab6a9 0e15e3d +Author: Ian Osgood +Date: Wed Apr 19 20:45:31 2006 -0700 + + Merge branch 'master' of git+ssh://iano@git.freedesktop.org/git/xcb + +commit 0e15e3d9feb1ab14815a00133da922b24db27f19 +Author: Josh Triplett +Date: Sun Apr 16 13:05:21 2006 -0700 + + * Validate the protocol descriptions during the build: + * Set DEB_MAKE_CHECK_TARGET=check in debian/rules. + * Add Build-Depends on libxml2-utils for xmllint. + +commit 999cf2a810192f5134fa650c75f442abc5ac8d48 +Merge: c190bd2 16e4c9b +Author: Josh Triplett +Date: Sun Apr 16 11:23:52 2006 -0700 + + Merge branch 'master' of git+ssh://git.freedesktop.org/git/xcb + +commit c190bd298070584c374dc2a8b1763cf991d07e9f +Author: Josh Triplett +Date: Sun Apr 16 11:05:50 2006 -0700 + + Improve package descriptions. + +commit 708e87fb852623ed8194cd1f6c38fd2b9d22bf8a +Author: Josh Triplett +Date: Sun Apr 16 09:23:13 2006 -0700 + + * Debian X11R7 transition: + * Install protocol descriptions to /usr/include/X11, not + /usr/X11R6/include/X11. + * Pre-Depends: x11-common (>= 1:1.09). + +commit 9dc2b4d4ab16b6164796f1e7eb5c419209ec4ff2 +Author: Josh Triplett +Date: Sat Apr 15 19:39:39 2006 -0700 + + Change human-readable name from "XCBProto" to "XCB Proto"; this changes the + tarname to "xcb-proto", which matches the Debian package and looks better than + "xcbproto". + +commit 79ca7d76089363ed913765f876292b733bbe588f +Author: Josh Triplett +Date: Sat Apr 15 19:20:47 2006 -0700 + + Stop running autoreconf in debian/rules, and remove Build-Depends for autoconf + and automake. + +commit 3adad9d9cb812f3e7554cfb341af00f995bdcbf4 +Author: Josh Triplett +Date: Sat Apr 15 14:52:36 2006 -0700 + + Add doc directory to EXTRA_DIST. + +commit d0cf02d9d6dce3f7bc92d6b59feb4b5a42ebd305 +Author: Josh Triplett +Date: Sat Apr 15 12:48:02 2006 -0700 + + * Actually add extensions/screensaver.xml to Makefile.am, so it gets checked + and installed. + * Don't line up backslashes in a single column, since it forces a change to + every line when adding a longer item. + +commit 16e4c9bc2e2d1280fbdc1191a1f450dcd54c9417 +Author: Jeremy Kolb +Date: Tue Mar 28 14:54:05 2006 -0500 + + Clean up some names. + +commit 4dab6a9b8cfc099dc94f997de7e5881566861bbf +Author: Ian Osgood +Date: Wed Mar 22 17:57:57 2006 -0800 + + Work on the tutorial, and update xproto.xml to match: + * Fixed grammar + * Answered some TODO's and added some more + * Updated X.h constants to those in xproto.h + * Added enumerations used in tutorial to xproto.xml + * Prefered XCBFlush to XCBSync + * Corrected and refactored the "events" example + + I extracted the examples to test them. Where should I put them? + +commit c4dcd1ac04a9112eaf59c1403cd637ba6986b384 +Author: Josh Triplett +Date: Tue Mar 21 14:22:21 2006 -0800 + + Remove outdated fd.o-* entries from */debian/.gitignore (obsolete since before they came from .cvsignore). + +commit c6bc27ff1409591af79efd9806451386317bded4 +Author: Josh Triplett +Date: Tue Mar 21 14:15:56 2006 -0800 + + Remove outdated comment in xproto.xml; we support ListFontsWithInfo just fine + now. + +commit 946717baec905a8a58ed9f833a3fd91e71dd3a02 +Author: Ian Osgood +Date: Mon Mar 20 07:36:39 2006 -0800 + + Update xml-xcb.txt to include new expression. + +commit f4c0265fea283895e7d87091c77369542b1704a4 +Author: Ian Osgood +Date: Wed Mar 15 22:41:08 2006 -0800 + + Change syntax to n as Jamey and Josh suggested + and add more button, key, and graphics enumerations. + +commit bc1e40e85697c2f64ae5e583f43e4e4ac8a53165 +Author: Ian Osgood +Date: Wed Mar 15 10:09:47 2006 -0800 + + Remove proto/X11 dependencies from xcb-demo. + +commit 6d0f08eefe7dd4e7eb7214807c8b8e2e8aa899d7 +Author: Ian Osgood +Date: Tue Mar 14 18:23:37 2006 -0800 + + Remove xcb-util dependency on proto/X11 + by moving many defs from X.h to s in xproto.xml + +commit db7df9aa326d199d51eb8a2489a95aaa9a3a8606 +Merge: 5ac3157 ada24b5 +Author: Ian Osgood +Date: Tue Mar 14 11:44:43 2006 -0800 + + Merge branch 'master' of git+ssh://iano@git.freedesktop.org/git/xcb + +commit ada24b538474dc205ec27e7cda550d23a3bc3767 +Author: Ian Osgood +Date: Tue Mar 14 10:18:22 2006 -0800 + + Add an expression construct + for mask enumerations such as CW flags. + Replaces the C-specific use of 1< +Date: Mon Mar 13 22:05:10 2006 -0500 + + Added new type CONTEXT_TAG (just a CARD32). + +commit 0f5c21380c69c29aa25c71902c14cbf47ad521ba +Author: Jeremy Kolb +Date: Thu Mar 9 21:52:33 2006 -0500 + + share_list is a GLX_CONTEXT, not a CARD32 + +commit fcea9ae0ebc9189509d67d4800d8db0452ba8584 +Merge: 73d1953 65fdc0d +Author: Ian Osgood +Date: Wed Mar 8 22:57:01 2006 -0800 + + Merge branch 'master' of git+ssh://iano@git.freedesktop.org/git/xcb + +commit 73d195345b84601e9b41e28a818bd61de93f3f6b +Author: Ian Osgood +Date: Wed Mar 8 22:56:40 2006 -0800 + + Replace XIDs with CARD32s in the xc_misc protocol descriptions. + (XIDs only exist client-side.) + +commit 65fdc0d1456beeccbd943392f3a1d1dc5dd13e5e +Author: Jamey Sharp +Date: Wed Mar 8 22:49:59 2006 -0800 + + Unify autofoo .gitignore bits into one top-level file, and remove resulting redundancies. + +commit 659264ca76f1624295ee630ea81feab86150fd8f +Author: Alp Toker +Date: Tue Mar 7 04:19:02 2006 +0000 + + Typo + +commit 28875a37f5bdc933476bb06950e15f4443138c8e +Author: Jeremy Kolb +Date: Sun Mar 5 14:44:16 2006 -0500 + + Change event copy to error copy. + +commit 6c91f7e6cb20cd9df4a1509ac506f72e3a09940d +Author: Josh Triplett +Date: Sun Mar 5 00:49:04 2006 -0800 + + XMLLINT, not XSLTPROC. + +commit 340268c45c01b14267aebf9e2f71c7694c798822 +Author: Josh Triplett +Date: Sat Mar 4 18:35:53 2006 -0800 + + Add *.tar.{bz2,gz} to .gitignore for the benefit of "make distcheck". + +commit 66f5611130625d2db2c5106e387ce2fb5b3fc28c +Author: Josh Triplett +Date: Sat Mar 4 18:29:40 2006 -0800 + + Validate protocol descriptions against schema in "make check", using xmllint. These tests will also run when doing "make distcheck" to create a distribution. + +commit 3084d8b32e541c7a4f8e198be2566bc6d6f4aa98 +Author: Josh Triplett +Date: Sat Mar 4 14:07:04 2006 -0800 + + In XML Schema, attributes default to optional unless explicitly marked use="required"; add use="required" to all required attributes. Add fake error number to error name="Generic" in glx.xml, since error is now a required attribute. + +commit ec8315d965d3e2653f2e7d70689d229091846725 +Author: Josh Triplett +Date: Fri Feb 24 16:10:42 2006 -0800 + + Update the schema: a reply may contain a valueparam. + +commit ee2d45a37432454b61fb6e6d321b1fb9b2282083 +Author: Josh Triplett +Date: Fri Feb 24 15:59:48 2006 -0800 + + Remove stray character from randr.xml + +commit 209cb2a20614c29180662680a66e83a31c874a57 +Author: Eric Anholt +Date: Sat Feb 18 22:56:03 2006 -0800 + + Move .cvsignore to .gitignore. + +commit 9b4d1c844fbd4c9dfd50c3ba94fda2d193c289ad +Author: Jeremy Kolb +Date: Sat Feb 18 22:40:19 2006 -0500 + + Apply Alp Toker's patch for fixing typos. Thanks! + +commit 9605e865e5fa7afad87f4dfce55de67551421e95 +Author: Josh Triplett +Date: Sat Feb 18 16:49:41 2006 -0800 + + Remove xcl and CVSROOT. diff -Nru xcb-proto-1.6/configure xcb-proto-1.6+git20110412.c4497cdb/configure --- xcb-proto-1.6/configure 2009-12-02 09:07:44.000000000 +0000 +++ xcb-proto-1.6+git20110412.c4497cdb/configure 2011-04-12 16:50:50.000000000 +0000 @@ -1,13 +1,13 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.65 for XCB Proto 1.6. +# Generated by GNU Autoconf 2.67 for XCB Proto 1.6. # # Report bugs to . # # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software +# Foundation, Inc. # # # This configure script is free software; the Free Software Foundation @@ -318,7 +318,7 @@ test -d "$as_dir" && break done test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" + } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" } # as_fn_mkdir_p @@ -358,19 +358,19 @@ fi # as_fn_arith -# as_fn_error ERROR [LINENO LOG_FD] -# --------------------------------- +# as_fn_error STATUS ERROR [LINENO LOG_FD] +# ---------------------------------------- # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are # provided, also output the error to LOG_FD, referencing LINENO. Then exit the -# script with status $?, using 1 if that was 0. +# script with STATUS, using 1 if that was 0. as_fn_error () { - as_status=$?; test $as_status -eq 0 && as_status=1 - if test "$3"; then - as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 + as_status=$1; test $as_status -eq 0 && as_status=1 + if test "$4"; then + as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 fi - $as_echo "$as_me: error: $1" >&2 + $as_echo "$as_me: error: $2" >&2 as_fn_exit $as_status } # as_fn_error @@ -532,7 +532,7 @@ exec 6>&1 # Name of the host. -# hostname on some systems (SVR3.2, Linux) returns a bogus exit status, +# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status, # so uname gets run too. ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` @@ -702,8 +702,9 @@ fi case $ac_option in - *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; - *) ac_optarg=yes ;; + *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; + *=) ac_optarg= ;; + *) ac_optarg=yes ;; esac # Accept the important Cygnus configure options, so we can diagnose typos. @@ -748,7 +749,7 @@ ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error "invalid feature name: $ac_useropt" + as_fn_error $? "invalid feature name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -774,7 +775,7 @@ ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error "invalid feature name: $ac_useropt" + as_fn_error $? "invalid feature name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -978,7 +979,7 @@ ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error "invalid package name: $ac_useropt" + as_fn_error $? "invalid package name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -994,7 +995,7 @@ ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error "invalid package name: $ac_useropt" + as_fn_error $? "invalid package name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1024,8 +1025,8 @@ | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) x_libraries=$ac_optarg ;; - -*) as_fn_error "unrecognized option: \`$ac_option' -Try \`$0 --help' for more information." + -*) as_fn_error $? "unrecognized option: \`$ac_option' +Try \`$0 --help' for more information" ;; *=*) @@ -1033,7 +1034,7 @@ # Reject names that are not valid shell variable names. case $ac_envvar in #( '' | [0-9]* | *[!_$as_cr_alnum]* ) - as_fn_error "invalid variable name: \`$ac_envvar'" ;; + as_fn_error $? "invalid variable name: \`$ac_envvar'" ;; esac eval $ac_envvar=\$ac_optarg export $ac_envvar ;; @@ -1051,13 +1052,13 @@ if test -n "$ac_prev"; then ac_option=--`echo $ac_prev | sed 's/_/-/g'` - as_fn_error "missing argument to $ac_option" + as_fn_error $? "missing argument to $ac_option" fi if test -n "$ac_unrecognized_opts"; then case $enable_option_checking in no) ;; - fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;; + fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; esac fi @@ -1080,7 +1081,7 @@ [\\/$]* | ?:[\\/]* ) continue;; NONE | '' ) case $ac_var in *prefix ) continue;; esac;; esac - as_fn_error "expected an absolute directory name for --$ac_var: $ac_val" + as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val" done # There might be people who depend on the old broken behavior: `$host' @@ -1094,8 +1095,8 @@ if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe - $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. - If a cross compiler is detected then cross compile mode will be used." >&2 + $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. + If a cross compiler is detected then cross compile mode will be used" >&2 elif test "x$build_alias" != "x$host_alias"; then cross_compiling=yes fi @@ -1110,9 +1111,9 @@ ac_pwd=`pwd` && test -n "$ac_pwd" && ac_ls_di=`ls -di .` && ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || - as_fn_error "working directory cannot be determined" + as_fn_error $? "working directory cannot be determined" test "X$ac_ls_di" = "X$ac_pwd_ls_di" || - as_fn_error "pwd does not report name of working directory" + as_fn_error $? "pwd does not report name of working directory" # Find the source files, if location was not specified. @@ -1151,11 +1152,11 @@ fi if test ! -r "$srcdir/$ac_unique_file"; then test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." - as_fn_error "cannot find sources ($ac_unique_file) in $srcdir" + as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir" fi ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" ac_abs_confdir=`( - cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg" + cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg" pwd)` # When building in place, set srcdir=. if test "$ac_abs_confdir" = "$ac_pwd"; then @@ -1195,7 +1196,7 @@ --help=short display options specific to this package --help=recursive display the short help of all the included packages -V, --version display version information and exit - -q, --quiet, --silent do not print \`checking...' messages + -q, --quiet, --silent do not print \`checking ...' messages --cache-file=FILE cache test results in FILE [disabled] -C, --config-cache alias for \`--cache-file=config.cache' -n, --no-create do not create output files @@ -1315,9 +1316,9 @@ if $ac_init_version; then cat <<\_ACEOF XCB Proto configure 1.6 -generated by GNU Autoconf 2.65 +generated by GNU Autoconf 2.67 -Copyright (C) 2009 Free Software Foundation, Inc. +Copyright (C) 2010 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -1332,7 +1333,7 @@ running configure, to aid debugging if configure makes a mistake. It was created by XCB Proto $as_me 1.6, which was -generated by GNU Autoconf 2.65. Invocation command line was +generated by GNU Autoconf 2.67. Invocation command line was $ $0 $@ @@ -1442,11 +1443,9 @@ { echo - cat <<\_ASBOX -## ---------------- ## + $as_echo "## ---------------- ## ## Cache variables. ## -## ---------------- ## -_ASBOX +## ---------------- ##" echo # The following way of writing the cache mishandles newlines in values, ( @@ -1480,11 +1479,9 @@ ) echo - cat <<\_ASBOX -## ----------------- ## + $as_echo "## ----------------- ## ## Output variables. ## -## ----------------- ## -_ASBOX +## ----------------- ##" echo for ac_var in $ac_subst_vars do @@ -1497,11 +1494,9 @@ echo if test -n "$ac_subst_files"; then - cat <<\_ASBOX -## ------------------- ## + $as_echo "## ------------------- ## ## File substitutions. ## -## ------------------- ## -_ASBOX +## ------------------- ##" echo for ac_var in $ac_subst_files do @@ -1515,11 +1510,9 @@ fi if test -s confdefs.h; then - cat <<\_ASBOX -## ----------- ## + $as_echo "## ----------- ## ## confdefs.h. ## -## ----------- ## -_ASBOX +## ----------- ##" echo cat confdefs.h echo @@ -1574,7 +1567,12 @@ ac_site_file1=NONE ac_site_file2=NONE if test -n "$CONFIG_SITE"; then - ac_site_file1=$CONFIG_SITE + # We do not want a PATH search for config.site. + case $CONFIG_SITE in #(( + -*) ac_site_file1=./$CONFIG_SITE;; + */*) ac_site_file1=$CONFIG_SITE;; + *) ac_site_file1=./$CONFIG_SITE;; + esac elif test "x$prefix" != xNONE; then ac_site_file1=$prefix/share/config.site ac_site_file2=$prefix/etc/config.site @@ -1589,7 +1587,11 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 $as_echo "$as_me: loading site script $ac_site_file" >&6;} sed 's/^/| /' "$ac_site_file" >&5 - . "$ac_site_file" + . "$ac_site_file" \ + || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "failed to load site script $ac_site_file +See \`config.log' for more details" "$LINENO" 5 ; } fi done @@ -1665,7 +1667,7 @@ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} - as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 + as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 fi ## -------------------- ## ## Main body of script. ## @@ -1683,16 +1685,22 @@ ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do - for ac_t in install-sh install.sh shtool; do - if test -f "$ac_dir/$ac_t"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/$ac_t -c" - break 2 - fi - done + if test -f "$ac_dir/install-sh"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install-sh -c" + break + elif test -f "$ac_dir/install.sh"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install.sh -c" + break + elif test -f "$ac_dir/shtool"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/shtool install -c" + break + fi done if test -z "$ac_aux_dir"; then - as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 + as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 fi # These three variables are undocumented and unsupported, @@ -1808,11 +1816,11 @@ ' case `pwd` in *[\\\"\#\$\&\'\`$am_lf]*) - as_fn_error "unsafe absolute working directory name" "$LINENO" 5;; + as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5 ;; esac case $srcdir in *[\\\"\#\$\&\'\`$am_lf\ \ ]*) - as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; + as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5 ;; esac # Do `set' in a subshell so we don't clobber the current shell's @@ -1834,7 +1842,7 @@ # if, for instance, CONFIG_SHELL is bash and it inherits a # broken ls alias from the environment. This has actually # happened. Such a system could not be considered "sane". - as_fn_error "ls -t appears to fail. Make sure there is not a broken + as_fn_error $? "ls -t appears to fail. Make sure there is not a broken alias in your environment" "$LINENO" 5 fi @@ -1844,7 +1852,7 @@ # Ok. : else - as_fn_error "newly created file is older than distributed files! + as_fn_error $? "newly created file is older than distributed files! Check your system clock" "$LINENO" 5 fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 @@ -2082,7 +2090,7 @@ $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } set x ${MAKE-make} ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` -if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then : $as_echo_n "(cached) " >&6 else cat >conftest.make <<\_ACEOF @@ -2090,7 +2098,7 @@ all: @echo '@@@%%%=$(MAKE)=@@@%%%' _ACEOF -# GNU make sometimes prints "make[1]: Entering...", which would confuse us. +# GNU make sometimes prints "make[1]: Entering ...", which would confuse us. case `${MAKE-make} -f conftest.make 2>/dev/null` in *@@@%%%=?*=@@@%%%*) eval ac_cv_prog_make_${ac_make}_set=yes;; @@ -2124,7 +2132,7 @@ am__isrc=' -I$(srcdir)' # test to see if srcdir already configured if test -f $srcdir/config.status; then - as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 + as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 fi fi @@ -2260,7 +2268,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else - as_fn_error "too old" "$LINENO" 5 + as_fn_error $? "too old" "$LINENO" 5 fi am_display_PYTHON=$PYTHON else @@ -2272,7 +2280,7 @@ $as_echo_n "(cached) " >&6 else - for am_cv_pathless_PYTHON in python python2 python3 python3.0 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do + for am_cv_pathless_PYTHON in python python2 python3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do test "$am_cv_pathless_PYTHON" = none && break prog="import sys # split strings by '.' and convert to numeric. Append some zeros @@ -2344,7 +2352,7 @@ if test "$PYTHON" = :; then - as_fn_error "no suitable Python interpreter found" "$LINENO" 5 + as_fn_error $? "no suitable Python interpreter found" "$LINENO" 5 else @@ -2399,6 +2407,14 @@ am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'` am_cv_python_pythondir=`echo "$am_cv_python_pythondir" | sed "s,^$am__strip_prefix,$PYTHON_PREFIX,"` ;; + *) + case $am_py_prefix in + /usr|/System*) ;; + *) + am_cv_python_pythondir=$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages + ;; + esac + ;; esac fi @@ -2429,6 +2445,14 @@ am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'` am_cv_python_pyexecdir=`echo "$am_cv_python_pyexecdir" | sed "s,^$am__strip_prefix,$PYTHON_EXEC_PREFIX,"` ;; + *) + case $am_py_exec_prefix in + /usr|/System*) ;; + *) + am_cv_python_pyexecdir=$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages + ;; + esac + ;; esac fi @@ -2570,6 +2594,7 @@ ac_libobjs= ac_ltlibobjs= +U= for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue # 1. Remove the extension, and $U if already installed. ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' @@ -2586,7 +2611,7 @@ if test -z "${HAVE_XMLLINT_TRUE}" && test -z "${HAVE_XMLLINT_FALSE}"; then - as_fn_error "conditional \"HAVE_XMLLINT\" was never defined. + as_fn_error $? "conditional \"HAVE_XMLLINT\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi @@ -2736,19 +2761,19 @@ (unset CDPATH) >/dev/null 2>&1 && unset CDPATH -# as_fn_error ERROR [LINENO LOG_FD] -# --------------------------------- +# as_fn_error STATUS ERROR [LINENO LOG_FD] +# ---------------------------------------- # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are # provided, also output the error to LOG_FD, referencing LINENO. Then exit the -# script with status $?, using 1 if that was 0. +# script with STATUS, using 1 if that was 0. as_fn_error () { - as_status=$?; test $as_status -eq 0 && as_status=1 - if test "$3"; then - as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 + as_status=$1; test $as_status -eq 0 && as_status=1 + if test "$4"; then + as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 fi - $as_echo "$as_me: error: $1" >&2 + $as_echo "$as_me: error: $2" >&2 as_fn_exit $as_status } # as_fn_error @@ -2944,7 +2969,7 @@ test -d "$as_dir" && break done test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" + } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" } # as_fn_mkdir_p @@ -2998,7 +3023,7 @@ # values after options handling. ac_log=" This file was extended by XCB Proto $as_me 1.6, which was -generated by GNU Autoconf 2.65. Invocation command line was +generated by GNU Autoconf 2.67. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -3051,10 +3076,10 @@ ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ XCB Proto config.status 1.6 -configured by $0, generated by GNU Autoconf 2.65, +configured by $0, generated by GNU Autoconf 2.67, with options \\"\$ac_cs_config\\" -Copyright (C) 2009 Free Software Foundation, Inc. +Copyright (C) 2010 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -3072,11 +3097,16 @@ while test $# != 0 do case $1 in - --*=*) + --*=?*) ac_option=`expr "X$1" : 'X\([^=]*\)='` ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` ac_shift=: ;; + --*=) + ac_option=`expr "X$1" : 'X\([^=]*\)='` + ac_optarg= + ac_shift=: + ;; *) ac_option=$1 ac_optarg=$2 @@ -3098,6 +3128,7 @@ $ac_shift case $ac_optarg in *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + '') as_fn_error $? "missing file argument" ;; esac as_fn_append CONFIG_FILES " '$ac_optarg'" ac_need_defaults=false;; @@ -3108,7 +3139,7 @@ ac_cs_silent=: ;; # This is an error. - -*) as_fn_error "unrecognized option: \`$1' + -*) as_fn_error $? "unrecognized option: \`$1' Try \`$0 --help' for more information." ;; *) as_fn_append ac_config_targets " $1" @@ -3162,7 +3193,7 @@ "xcbgen/Makefile") CONFIG_FILES="$CONFIG_FILES xcbgen/Makefile" ;; "xcb-proto.pc") CONFIG_FILES="$CONFIG_FILES xcb-proto.pc" ;; - *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;; + *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;; esac done @@ -3198,7 +3229,7 @@ { tmp=./conf$$-$RANDOM (umask 077 && mkdir "$tmp") -} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5 +} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 # Set up the scripts for CONFIG_FILES section. # No need to generate them if there are no CONFIG_FILES. @@ -3215,7 +3246,7 @@ fi ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' /dev/null` if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then - ac_cs_awk_cr='\r' + ac_cs_awk_cr='\\r' else ac_cs_awk_cr=$ac_cr fi @@ -3229,18 +3260,18 @@ echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && echo "_ACEOF" } >conf$$subs.sh || - as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 -ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'` + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 +ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'` ac_delim='%!_!# ' for ac_last_try in false false false false false :; do . ./conf$$subs.sh || - as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` if test $ac_delim_n = $ac_delim_num; then break elif $ac_last_try; then - as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 else ac_delim="$ac_delim!$ac_delim _$ac_delim!! " fi @@ -3329,20 +3360,28 @@ else cat fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ - || as_fn_error "could not setup config files machinery" "$LINENO" 5 + || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 _ACEOF -# VPATH may cause trouble with some makes, so we remove $(srcdir), -# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and +# VPATH may cause trouble with some makes, so we remove sole $(srcdir), +# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and # trailing colons and then remove the whole line if VPATH becomes empty # (actually we leave an empty line to preserve line numbers). if test "x$srcdir" = x.; then - ac_vpsub='/^[ ]*VPATH[ ]*=/{ -s/:*\$(srcdir):*/:/ -s/:*\${srcdir}:*/:/ -s/:*@srcdir@:*/:/ -s/^\([^=]*=[ ]*\):*/\1/ + ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{ +h +s/// +s/^/:/ +s/[ ]*$/:/ +s/:\$(srcdir):/:/g +s/:\${srcdir}:/:/g +s/:@srcdir@:/:/g +s/^:*// s/:*$// +x +s/\(=[ ]*\).*/\1/ +G +s/\n// s/^[^=]*=[ ]*$// }' fi @@ -3360,7 +3399,7 @@ esac case $ac_mode$ac_tag in :[FHL]*:*);; - :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;; + :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;; :[FH]-) ac_tag=-:-;; :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; esac @@ -3388,7 +3427,7 @@ [\\/$]*) false;; *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; esac || - as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;; + as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;; esac case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac as_fn_append ac_file_inputs " '$ac_f'" @@ -3415,7 +3454,7 @@ case $ac_tag in *:-:* | *:-) cat >"$tmp/stdin" \ - || as_fn_error "could not create $ac_file" "$LINENO" 5 ;; + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; esac ;; esac @@ -3552,22 +3591,22 @@ $ac_datarootdir_hack " eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ - || as_fn_error "could not create $ac_file" "$LINENO" 5 + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' -which seems to be undefined. Please make sure it is defined." >&5 +which seems to be undefined. Please make sure it is defined" >&5 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' -which seems to be undefined. Please make sure it is defined." >&2;} +which seems to be undefined. Please make sure it is defined" >&2;} rm -f "$tmp/stdin" case $ac_file in -) cat "$tmp/out" && rm -f "$tmp/out";; *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; esac \ - || as_fn_error "could not create $ac_file" "$LINENO" 5 + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; @@ -3582,7 +3621,7 @@ ac_clean_files=$ac_clean_files_save test $ac_write_fail = 0 || - as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5 + as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5 # configure is writing to config.log, and then calls config.status. @@ -3603,7 +3642,7 @@ exec 5>>config.log # Use ||, not &&, to avoid exiting from the if with $? = 1, which # would make configure fail if this is the last instruction. - $ac_cs_success || as_fn_exit $? + $ac_cs_success || as_fn_exit 1 fi if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 diff -Nru xcb-proto-1.6/debian/changelog xcb-proto-1.6+git20110412.c4497cdb/debian/changelog --- xcb-proto-1.6/debian/changelog 2010-01-12 10:25:33.000000000 +0000 +++ xcb-proto-1.6+git20110412.c4497cdb/debian/changelog 2011-04-12 16:50:52.000000000 +0000 @@ -1,3 +1,12 @@ +xcb-proto (1.6+git20110412.c4497cdb-0ubuntu0sarvatt) natty; urgency=low + + * Checkout from git 20110412 (master branch) up to commit + c4497cdbf0640c376cdebb0a9e5ea62458e6ba51 + * Source: git://anongit.freedesktop.org/xcb/proto + * Only added debian/ tree from debian/unstable + + -- Robert Hooker Tue, 12 Apr 2011 12:50:52 -0400 + xcb-proto (1.6-2) unstable; urgency=low * Drop cdbs in favor of dh 7 (Closes: #564351) diff -Nru xcb-proto-1.6/debian/control xcb-proto-1.6+git20110412.c4497cdb/debian/control --- xcb-proto-1.6/debian/control 2010-01-12 09:54:10.000000000 +0000 +++ xcb-proto-1.6+git20110412.c4497cdb/debian/control 2011-04-12 16:50:51.000000000 +0000 @@ -1,7 +1,8 @@ Source: xcb-proto Section: libdevel Priority: optional -Maintainer: XCB Developers +Maintainer: Ubuntu Core Developers +XSBC-Original-Maintainer: XCB Developers Uploaders: Jamey Sharp , Josh Triplett , Julien Danjou Build-Depends: debhelper (>= 7.0.50~), libxml2-utils, python-support, automake Standards-Version: 3.8.3 diff -Nru xcb-proto-1.6/debian/patches/debian-changes-1.6-2 xcb-proto-1.6+git20110412.c4497cdb/debian/patches/debian-changes-1.6-2 --- xcb-proto-1.6/debian/patches/debian-changes-1.6-2 2010-01-12 10:31:38.000000000 +0000 +++ xcb-proto-1.6+git20110412.c4497cdb/debian/patches/debian-changes-1.6-2 1970-01-01 00:00:00.000000000 +0000 @@ -1,799 +0,0 @@ -Description: Upstream changes introduced in version 1.6-2 - This patch has been created by dpkg-source during the package build. - Here's the last changelog entry, hopefully it gives details on why - those changes were made: - . - xcb-proto (1.6-2) unstable; urgency=low - . - * Drop cdbs in favor of dh 7 (Closes: #564351) - . - The person named in the Author field signed this changelog entry. -Author: Julien Danjou -Bug-Debian: http://bugs.debian.org/564351 - ---- -The information above should follow the Patch Tagging Guidelines, please -checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here -are templates for supplementary fields that you might want to add: - -Origin: , -Bug: -Bug-Debian: http://bugs.debian.org/ -Forwarded: -Reviewed-By: -Last-Update: - ---- xcb-proto-1.6.orig/configure -+++ xcb-proto-1.6/configure -@@ -2272,7 +2272,7 @@ if test "${am_cv_pathless_PYTHON+set}" = - $as_echo_n "(cached) " >&6 - else - -- for am_cv_pathless_PYTHON in python python2 python3 python3.0 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do -+ for am_cv_pathless_PYTHON in python python2 python3 python3.0 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do - test "$am_cv_pathless_PYTHON" = none && break - prog="import sys - # split strings by '.' and convert to numeric. Append some zeros ---- /dev/null -+++ xcb-proto-1.6/autogen.sh -@@ -0,0 +1,12 @@ -+#! /bin/sh -+ -+srcdir=`dirname $0` -+test -z "$srcdir" && srcdir=. -+ -+ORIGDIR=`pwd` -+cd $srcdir -+ -+autoreconf -v --install || exit 1 -+cd $ORIGDIR || exit $? -+ -+$srcdir/configure --enable-maintainer-mode "$@" ---- xcb-proto-1.6.orig/aclocal.m4 -+++ xcb-proto-1.6/aclocal.m4 -@@ -461,7 +461,7 @@ AC_DEFUN([AM_PATH_PYTHON], - dnl Find a Python interpreter. Python versions prior to 2.0 are not - dnl supported. (2.0 was released on October 16, 2000). - m4_define_default([_AM_PYTHON_INTERPRETER_LIST], -- [python python2 python3 python3.0 python2.5 python2.4 python2.3 python2.2 dnl -+ [python python2 python3 python3.0 python2.6 python2.5 python2.4 python2.3 python2.2 dnl - python2.1 python2.0]) - - m4_if([$1],[],[ ---- /dev/null -+++ xcb-proto-1.6/src/ge.xml -@@ -0,0 +1,42 @@ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ ---- /dev/null -+++ xcb-proto-1.6/src/xf86vidmode.xml -@@ -0,0 +1,464 @@ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ 0 -+ 1 -+ 2 -+ 3 -+ 4 -+ 5 -+ 6 -+ 7 -+ 8 -+ 9 -+ 10 -+ 11 -+ 12 -+ -+ -+ -+ 0 -+ -+ -+ -+ 0 -+ 1 -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ privsize -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ privsize -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ num_hsync -+ -+ -+ num_vsync -+ -+ -+ vendor_length -+ -+ -+ -+ -+ -+ vendor_length -+ 3 -+ -+ 0xFFFFFFFC -+ -+ vendor_length -+ -+ -+ -+ model_length -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ modecount -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ privsize -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ privsize -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ privsize -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ privsize -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ 1 -+ -+ flags -+ 1 -+ -+ -+ clocks -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ size -+ 1 -+ -+ 0xFFFFFFFE -+ -+ -+ -+ -+ -+ size -+ 1 -+ -+ 0xFFFFFFFE -+ -+ -+ -+ -+ -+ size -+ 1 -+ -+ 0xFFFFFFFE -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ size -+ 1 -+ -+ 0xFFFFFFFE -+ -+ -+ -+ -+ -+ size -+ 1 -+ -+ 0xFFFFFFFE -+ -+ -+ -+ -+ -+ size -+ 1 -+ -+ 0xFFFFFFFE -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ ---- /dev/null -+++ xcb-proto-1.6/src/import.py -@@ -0,0 +1,66 @@ -+#!/usr/bin/python -+ -+from xml.sax.saxutils import XMLFilterBase, XMLGenerator -+from xml.sax import make_parser -+import sys, os -+ -+path = [os.path.curdir, 'extensions'] -+def find_file_on_path(name): -+ for d in path: -+ test = os.path.join(d, name) -+ if os.path.isfile(test): -+ return test -+ raise OSError(errno.ENOENT, os.strerror(errno.ENOENT), name) -+ -+seen = {} -+ -+class ProcessImports(XMLFilterBase): -+ def setContentHandler(self, handler): -+ self.handler = handler -+ XMLFilterBase.setContentHandler(self, handler) -+ -+ def ensure(self, name): -+ if not seen.has_key(name): -+ child = ProcessImports(make_parser()) -+ child.setContentHandler(self.handler) -+ child.parse(find_file_on_path(name + '.xml')) -+ -+ def startDocument(self): -+ pass -+ def endDocument(self): -+ pass -+ -+ inimport = None -+ -+ def startElement(self, name, attrs): -+ assert self.inimport is None -+ if name == 'import': -+ self.inimport = "" -+ return -+ XMLFilterBase.startElement(self, name, attrs) -+ if name == 'xcb': -+ seen[attrs['header']] = True -+ self.ensure('xproto') -+ -+ def characters(self, content): -+ if self.inimport is not None: -+ self.inimport += content -+ else: -+ XMLFilterBase.characters(self, content) -+ -+ def endElement(self, name): -+ if name == 'import': -+ self.ensure(self.inimport) -+ self.inimport = None -+ return -+ XMLFilterBase.endElement(self, name) -+ -+out = XMLGenerator() -+importer = ProcessImports(make_parser()) -+importer.setContentHandler(out) -+out.startDocument() -+if len(sys.argv) > 1: -+ importer.parse(sys.argv[1]) -+else: -+ importer.parse(sys.stdin) -+out.endDocument() ---- /dev/null -+++ xcb-proto-1.6/src/size.py -@@ -0,0 +1,76 @@ -+#!/usr/bin/python -+ -+from xml.sax.saxutils import XMLFilterBase, XMLGenerator -+from xml.sax.xmlreader import AttributesImpl -+from xml.sax import make_parser -+import sys -+ -+def AttributesUnion(base, **values): -+ baseitems = dict(base) -+ baseitems.update(values) -+ return AttributesImpl(baseitems) -+ -+class AnnotateSize(XMLFilterBase): -+ types = { -+ 'BYTE': 1, 'BOOL': 1, -+ 'CARD8': 1, 'CARD16': 2, 'CARD32': 4, -+ 'INT8': 1, 'INT16': 2, 'INT32': 4, -+ 'char': 1, 'void': 1, -+ 'float': 4, 'double': 8, -+ 'XID': 4, -+ } -+ header = [] -+ def setTypeSize(self, name, size): -+ assert not self.types.has_key(name), "size of " + name + " declared as both " + str(size) + " and " + str(self.types[name]) -+ self.types[name] = size -+ -+ struct = None -+ union = None -+ def startElement(self, name, attrs): -+ if name == 'xcb': -+ self.header.insert(0, attrs['header']) -+ elif name == 'field': -+ size = self.types.get(attrs['type'], 0) -+ if self.struct is not None: -+ self.totalsize += size -+ elif self.union is not None: -+ self.totalsize = max(self.totalsize, size) -+ attrs = AttributesUnion(attrs, bytes=str(size)) -+ elif name == 'pad': -+ assert self.union is None -+ if self.struct is not None: -+ self.totalsize += int(attrs['bytes']) -+ elif name == 'xidtype': -+ self.setTypeSize(attrs['name'], 4) -+ elif name == 'typedef': -+ self.setTypeSize(attrs['newname'], self.types[attrs['oldname']]) -+ elif name == 'struct' or name == 'union': -+ assert self.struct is None and self.union is None -+ setattr(self, name, attrs['name']) -+ self.totalsize = 0 -+ -+ if len(self.header) == 1 or name == 'xcb': -+ XMLFilterBase.startElement(self, name, attrs) -+ -+ def characters(self, content): -+ if len(self.header) == 1: -+ XMLFilterBase.characters(self, content) -+ -+ def endElement(self, name): -+ if len(self.header) == 1 or name == 'xcb': -+ XMLFilterBase.endElement(self, name) -+ -+ if name == 'xcb': -+ self.header.pop(0) -+ elif name == 'struct' or name == 'union': -+ assert getattr(self, name) is not None -+ self.setTypeSize(getattr(self, name), self.totalsize) -+ setattr(self, name, None) -+ del self.totalsize -+ -+annotator = AnnotateSize(make_parser()) -+annotator.setContentHandler(XMLGenerator()) -+if len(sys.argv) > 1: -+ annotator.parse(sys.argv[1]) -+else: -+ annotator.parse(sys.stdin) ---- /dev/null -+++ xcb-proto-1.6/src/type.py -@@ -0,0 +1,74 @@ -+#!/usr/bin/python -+ -+from xml.sax.saxutils import XMLFilterBase, XMLGenerator -+from xml.sax.xmlreader import AttributesImpl -+from xml.sax import make_parser -+import sys -+ -+def AttributesUnion(base, **values): -+ baseitems = dict(base) -+ baseitems.update(values) -+ return AttributesImpl(baseitems) -+ -+class AnnotateType(XMLFilterBase): -+ scopes = [] -+ map = dict([(name, [name]) for name in [ -+ 'BOOL', 'BYTE', -+ 'CARD8', 'CARD16', 'CARD32', -+ 'INT8', 'INT16', 'INT32', -+ 'char', 'void', -+ 'float', 'double', -+ 'XID', -+ ]]) -+ def startScope(self, name): -+ self.scopes.insert(0, name) -+ def declareType(self, name): -+ assert ':' not in name -+ qname = self.scopes[0] + ':' + name -+ self.map.setdefault(name, []).insert(0, qname) -+ def getQualifiedType(self, name): -+ if ':' in name: -+ return name -+ names = self.map.get(name, []) -+ return names[0] -+ def endScope(self): -+ self.scopes.pop(0) -+ -+ def startElement(self, name, attrs): -+ attnames = [] -+ if name == 'xcb': -+ self.startScope(attrs['header']) -+ elif name in ['struct', 'union', 'xidtype', 'enum', 'event', 'eventcopy', 'error', 'errorcopy']: -+ self.declareType(attrs['name']) -+ attnames = ['name'] -+ if name.endswith('copy'): -+ attnames.append('ref') -+ elif name == 'typedef': -+ self.declareType(attrs['newname']) -+ attnames = ['oldname', 'newname'] -+ elif name == 'valueparam': -+ attnames = ['value-mask-type'] -+ elif attrs.has_key('type'): -+ attnames = ['type'] -+ newattrs = {} -+ for attname in attnames: -+ newattrs[attname] = self.getQualifiedType(attrs[attname]) -+ if newattrs: -+ attrs = AttributesUnion(attrs, **newattrs) -+ XMLFilterBase.startElement(self, name, attrs) -+ -+ def endElement(self, name): -+ XMLFilterBase.endElement(self, name) -+ if name == 'xcb': -+ self.endScope() -+ -+annotator = AnnotateType(make_parser()) -+annotator.setContentHandler(XMLGenerator()) -+if len(sys.argv) > 1: -+ annotator.parse(sys.argv[1]) -+else: -+ annotator.parse(sys.stdin) -+ -+for name,names in annotator.map.iteritems(): -+ if len(names) != 1: -+ print "" diff -Nru xcb-proto-1.6/debian/patches/series xcb-proto-1.6+git20110412.c4497cdb/debian/patches/series --- xcb-proto-1.6/debian/patches/series 2010-01-12 10:27:25.000000000 +0000 +++ xcb-proto-1.6+git20110412.c4497cdb/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -debian-changes-1.6-2 diff -Nru xcb-proto-1.6/doc/xml-xcb.txt xcb-proto-1.6+git20110412.c4497cdb/doc/xml-xcb.txt --- xcb-proto-1.6/doc/xml-xcb.txt 2009-05-09 15:33:25.000000000 +0000 +++ xcb-proto-1.6+git20110412.c4497cdb/doc/xml-xcb.txt 2011-04-12 16:50:44.000000000 +0000 @@ -225,8 +225,17 @@ defining the set of values included, and a list containing these values. value-mask-type gives the type of the bitmask; this must be CARD16 or CARD32. value-mask-name gives the field name of the bitmask, and - value-list-name gives the field name of the list of values. + value-list-name gives the field name of the list of values. Please use + instead for new protocol definitions. + switch expression + bitcase expression, fields + + This element represents conditional inclusion of fields. It can be viewed + as sequence of multiple ifs: if ( switch expression & bitcase expression ) + is equal to bitcase expression, bitcase fields are included in structure. + It can be used only as the last field of structure. New protocol definitions + should prefer to use this instead of . Expressions ----------- @@ -256,3 +265,22 @@ The bit element represents a literal bitmask value in an expression. The integer must be in the range 0..31, expanding to (1<enum item identifier + + This element represents a reference to item of enum. + +expression + + This element represents a unary operator, with the op attribute specifying + which operator. The only supported operation so far is ~, and its semantic + is identical to the corresponding operator in C. + + + + This element represents a sumation of the elements of the referenced list. + +expression + + This element represents the number of bits set in the expression. + diff -Nru xcb-proto-1.6/.gitignore xcb-proto-1.6+git20110412.c4497cdb/.gitignore --- xcb-proto-1.6/.gitignore 1970-01-01 00:00:00.000000000 +0000 +++ xcb-proto-1.6+git20110412.c4497cdb/.gitignore 2011-04-12 16:50:43.000000000 +0000 @@ -0,0 +1,31 @@ +aclocal.m4 +autom4te.cache +compile +depcomp +install-sh +libtool +ltmain.sh +missing +mkinstalldirs +py-compile +config.guess +config.h +config.h.in +config.log +config.status +config.sub +configure +configure.lineno +.deps +.dirstamp +.libs +*.lo +*.loT +*.la +Makefile +Makefile.in +stamp-h1 +*.o +*.pc +*.tar.bz2 +*.tar.gz diff -Nru xcb-proto-1.6/.lastcommit xcb-proto-1.6+git20110412.c4497cdb/.lastcommit --- xcb-proto-1.6/.lastcommit 1970-01-01 00:00:00.000000000 +0000 +++ xcb-proto-1.6+git20110412.c4497cdb/.lastcommit 2011-04-12 16:50:44.000000000 +0000 @@ -0,0 +1 @@ +commit c4497cdbf0640c376cdebb0a9e5ea62458e6ba51 diff -Nru xcb-proto-1.6/Makefile.in xcb-proto-1.6+git20110412.c4497cdb/Makefile.in --- xcb-proto-1.6/Makefile.in 2009-12-02 09:07:44.000000000 +0000 +++ xcb-proto-1.6+git20110412.c4497cdb/Makefile.in 2011-04-12 16:50:51.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -276,7 +276,7 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -301,7 +301,7 @@ fi; test -z "$$fail" $(RECURSIVE_CLEAN_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -465,7 +465,8 @@ fi; \ done -test -n "$(am__skip_mode_fix)" \ - || find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ + || find "$(distdir)" -type d ! -perm -755 \ + -exec chmod u+rwx,go+rx {} \; -o \ ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ @@ -509,17 +510,17 @@ distcheck: dist case '$(DIST_ARCHIVES)' in \ *.tar.gz*) \ - GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ + GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ - bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ + bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ *.tar.lzma*) \ - unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\ + lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ *.tar.xz*) \ xz -dc $(distdir).tar.xz | $(am__untar) ;;\ *.tar.Z*) \ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ *.shar.gz*) \ - GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\ + GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\ *.zip*) \ unzip $(distdir).zip ;;\ esac diff -Nru xcb-proto-1.6/src/dri2.xml xcb-proto-1.6+git20110412.c4497cdb/src/dri2.xml --- xcb-proto-1.6/src/dri2.xml 2009-11-06 11:42:27.000000000 +0000 +++ xcb-proto-1.6+git20110412.c4497cdb/src/dri2.xml 2011-04-12 16:50:44.000000000 +0000 @@ -85,6 +85,20 @@ driver_name_length + + + + + driver_name_length + 3 + + + 3 + + + driver_name_length + + device_name_length diff -Nru xcb-proto-1.6/src/ge.xml xcb-proto-1.6+git20110412.c4497cdb/src/ge.xml --- xcb-proto-1.6/src/ge.xml 1970-01-01 00:00:00.000000000 +0000 +++ xcb-proto-1.6+git20110412.c4497cdb/src/ge.xml 2011-04-12 16:50:43.000000000 +0000 @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + diff -Nru xcb-proto-1.6/src/import.py xcb-proto-1.6+git20110412.c4497cdb/src/import.py --- xcb-proto-1.6/src/import.py 1970-01-01 00:00:00.000000000 +0000 +++ xcb-proto-1.6+git20110412.c4497cdb/src/import.py 2011-04-12 16:50:44.000000000 +0000 @@ -0,0 +1,66 @@ +#!/usr/bin/python + +from xml.sax.saxutils import XMLFilterBase, XMLGenerator +from xml.sax import make_parser +import sys, os + +path = [os.path.curdir, 'extensions'] +def find_file_on_path(name): + for d in path: + test = os.path.join(d, name) + if os.path.isfile(test): + return test + raise OSError(errno.ENOENT, os.strerror(errno.ENOENT), name) + +seen = {} + +class ProcessImports(XMLFilterBase): + def setContentHandler(self, handler): + self.handler = handler + XMLFilterBase.setContentHandler(self, handler) + + def ensure(self, name): + if not seen.has_key(name): + child = ProcessImports(make_parser()) + child.setContentHandler(self.handler) + child.parse(find_file_on_path(name + '.xml')) + + def startDocument(self): + pass + def endDocument(self): + pass + + inimport = None + + def startElement(self, name, attrs): + assert self.inimport is None + if name == 'import': + self.inimport = "" + return + XMLFilterBase.startElement(self, name, attrs) + if name == 'xcb': + seen[attrs['header']] = True + self.ensure('xproto') + + def characters(self, content): + if self.inimport is not None: + self.inimport += content + else: + XMLFilterBase.characters(self, content) + + def endElement(self, name): + if name == 'import': + self.ensure(self.inimport) + self.inimport = None + return + XMLFilterBase.endElement(self, name) + +out = XMLGenerator() +importer = ProcessImports(make_parser()) +importer.setContentHandler(out) +out.startDocument() +if len(sys.argv) > 1: + importer.parse(sys.argv[1]) +else: + importer.parse(sys.stdin) +out.endDocument() diff -Nru xcb-proto-1.6/src/Makefile.am xcb-proto-1.6+git20110412.c4497cdb/src/Makefile.am --- xcb-proto-1.6/src/Makefile.am 2009-11-06 11:42:27.000000000 +0000 +++ xcb-proto-1.6+git20110412.c4497cdb/src/Makefile.am 2011-04-12 16:50:44.000000000 +0000 @@ -21,6 +21,7 @@ xfixes.xml \ xinerama.xml \ xinput.xml \ + xkb.xml \ xprint.xml \ xselinux.xml \ xtest.xml \ diff -Nru xcb-proto-1.6/src/Makefile.in xcb-proto-1.6+git20110412.c4497cdb/src/Makefile.in --- xcb-proto-1.6/src/Makefile.in 2009-12-02 09:07:44.000000000 +0000 +++ xcb-proto-1.6+git20110412.c4497cdb/src/Makefile.in 2011-04-12 16:50:50.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -176,6 +176,7 @@ xfixes.xml \ xinerama.xml \ xinput.xml \ + xkb.xml \ xprint.xml \ xselinux.xml \ xtest.xml \ diff -Nru xcb-proto-1.6/src/size.py xcb-proto-1.6+git20110412.c4497cdb/src/size.py --- xcb-proto-1.6/src/size.py 1970-01-01 00:00:00.000000000 +0000 +++ xcb-proto-1.6+git20110412.c4497cdb/src/size.py 2011-04-12 16:50:44.000000000 +0000 @@ -0,0 +1,76 @@ +#!/usr/bin/python + +from xml.sax.saxutils import XMLFilterBase, XMLGenerator +from xml.sax.xmlreader import AttributesImpl +from xml.sax import make_parser +import sys + +def AttributesUnion(base, **values): + baseitems = dict(base) + baseitems.update(values) + return AttributesImpl(baseitems) + +class AnnotateSize(XMLFilterBase): + types = { + 'BYTE': 1, 'BOOL': 1, + 'CARD8': 1, 'CARD16': 2, 'CARD32': 4, + 'INT8': 1, 'INT16': 2, 'INT32': 4, + 'char': 1, 'void': 1, + 'float': 4, 'double': 8, + 'XID': 4, + } + header = [] + def setTypeSize(self, name, size): + assert not self.types.has_key(name), "size of " + name + " declared as both " + str(size) + " and " + str(self.types[name]) + self.types[name] = size + + struct = None + union = None + def startElement(self, name, attrs): + if name == 'xcb': + self.header.insert(0, attrs['header']) + elif name == 'field': + size = self.types.get(attrs['type'], 0) + if self.struct is not None: + self.totalsize += size + elif self.union is not None: + self.totalsize = max(self.totalsize, size) + attrs = AttributesUnion(attrs, bytes=str(size)) + elif name == 'pad': + assert self.union is None + if self.struct is not None: + self.totalsize += int(attrs['bytes']) + elif name == 'xidtype': + self.setTypeSize(attrs['name'], 4) + elif name == 'typedef': + self.setTypeSize(attrs['newname'], self.types[attrs['oldname']]) + elif name == 'struct' or name == 'union': + assert self.struct is None and self.union is None + setattr(self, name, attrs['name']) + self.totalsize = 0 + + if len(self.header) == 1 or name == 'xcb': + XMLFilterBase.startElement(self, name, attrs) + + def characters(self, content): + if len(self.header) == 1: + XMLFilterBase.characters(self, content) + + def endElement(self, name): + if len(self.header) == 1 or name == 'xcb': + XMLFilterBase.endElement(self, name) + + if name == 'xcb': + self.header.pop(0) + elif name == 'struct' or name == 'union': + assert getattr(self, name) is not None + self.setTypeSize(getattr(self, name), self.totalsize) + setattr(self, name, None) + del self.totalsize + +annotator = AnnotateSize(make_parser()) +annotator.setContentHandler(XMLGenerator()) +if len(sys.argv) > 1: + annotator.parse(sys.argv[1]) +else: + annotator.parse(sys.stdin) diff -Nru xcb-proto-1.6/src/type.py xcb-proto-1.6+git20110412.c4497cdb/src/type.py --- xcb-proto-1.6/src/type.py 1970-01-01 00:00:00.000000000 +0000 +++ xcb-proto-1.6+git20110412.c4497cdb/src/type.py 2011-04-12 16:50:44.000000000 +0000 @@ -0,0 +1,74 @@ +#!/usr/bin/python + +from xml.sax.saxutils import XMLFilterBase, XMLGenerator +from xml.sax.xmlreader import AttributesImpl +from xml.sax import make_parser +import sys + +def AttributesUnion(base, **values): + baseitems = dict(base) + baseitems.update(values) + return AttributesImpl(baseitems) + +class AnnotateType(XMLFilterBase): + scopes = [] + map = dict([(name, [name]) for name in [ + 'BOOL', 'BYTE', + 'CARD8', 'CARD16', 'CARD32', + 'INT8', 'INT16', 'INT32', + 'char', 'void', + 'float', 'double', + 'XID', + ]]) + def startScope(self, name): + self.scopes.insert(0, name) + def declareType(self, name): + assert ':' not in name + qname = self.scopes[0] + ':' + name + self.map.setdefault(name, []).insert(0, qname) + def getQualifiedType(self, name): + if ':' in name: + return name + names = self.map.get(name, []) + return names[0] + def endScope(self): + self.scopes.pop(0) + + def startElement(self, name, attrs): + attnames = [] + if name == 'xcb': + self.startScope(attrs['header']) + elif name in ['struct', 'union', 'xidtype', 'enum', 'event', 'eventcopy', 'error', 'errorcopy']: + self.declareType(attrs['name']) + attnames = ['name'] + if name.endswith('copy'): + attnames.append('ref') + elif name == 'typedef': + self.declareType(attrs['newname']) + attnames = ['oldname', 'newname'] + elif name == 'valueparam': + attnames = ['value-mask-type'] + elif attrs.has_key('type'): + attnames = ['type'] + newattrs = {} + for attname in attnames: + newattrs[attname] = self.getQualifiedType(attrs[attname]) + if newattrs: + attrs = AttributesUnion(attrs, **newattrs) + XMLFilterBase.startElement(self, name, attrs) + + def endElement(self, name): + XMLFilterBase.endElement(self, name) + if name == 'xcb': + self.endScope() + +annotator = AnnotateType(make_parser()) +annotator.setContentHandler(XMLGenerator()) +if len(sys.argv) > 1: + annotator.parse(sys.argv[1]) +else: + annotator.parse(sys.stdin) + +for name,names in annotator.map.iteritems(): + if len(names) != 1: + print "" diff -Nru xcb-proto-1.6/src/xcb.xsd xcb-proto-1.6+git20110412.c4497cdb/src/xcb.xsd --- xcb-proto-1.6/src/xcb.xsd 2009-11-06 11:42:27.000000000 +0000 +++ xcb-proto-1.6+git20110412.c4497cdb/src/xcb.xsd 2011-04-12 16:50:44.000000000 +0000 @@ -55,6 +55,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -89,7 +120,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -126,7 +190,12 @@ - + + + + + + @@ -166,12 +235,20 @@ + + + - - - - + + + + + + + + + diff -Nru xcb-proto-1.6/src/xf86dri.xml xcb-proto-1.6+git20110412.c4497cdb/src/xf86dri.xml --- xcb-proto-1.6/src/xf86dri.xml 2009-11-06 11:42:27.000000000 +0000 +++ xcb-proto-1.6+git20110412.c4497cdb/src/xf86dri.xml 2011-04-12 16:50:44.000000000 +0000 @@ -132,10 +132,15 @@ - + + + num_clip_rects + + num_back_clip_rects + diff -Nru xcb-proto-1.6/src/xf86vidmode.xml xcb-proto-1.6+git20110412.c4497cdb/src/xf86vidmode.xml --- xcb-proto-1.6/src/xf86vidmode.xml 1970-01-01 00:00:00.000000000 +0000 +++ xcb-proto-1.6+git20110412.c4497cdb/src/xf86vidmode.xml 2011-04-12 16:50:44.000000000 +0000 @@ -0,0 +1,478 @@ + + + + + + + + + + + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + + + + 0 + + + + 0 + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + privsize + + + + + + + + + + + + + + + + + + + + + privsize + + + + + + + + + + + + + + + + + + + + num_hsync + + + num_vsync + + + vendor_length + + + + + + vendor_length + 3 + + + 3 + + + vendor_length + + + + model_length + + + + + + + + + + + + + + + + + + modecount + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + privsize + + + + + + + + + + + + + + + + + + + + + privsize + + + + + + + + + + + + + + + + + + + + + privsize + + + + + + + + + + + + + + + + + + + + + + + + + + privsize + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1 + + flags + 1 + + + clocks + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + size + 1 + + + 1 + + + + + + + size + 1 + + + 1 + + + + + + + size + 1 + + + 1 + + + + + + + + + + + + + size + 1 + + + 1 + + + + + + + size + 1 + + + 1 + + + + + + + size + 1 + + + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru xcb-proto-1.6/src/xkb.xml xcb-proto-1.6+git20110412.c4497cdb/src/xkb.xml --- xcb-proto-1.6/src/xkb.xml 1970-01-01 00:00:00.000000000 +0000 +++ xcb-proto-1.6+git20110412.c4497cdb/src/xkb.xml 2011-04-12 16:50:44.000000000 +0000 @@ -0,0 +1,2774 @@ + + + + + xproto + + + + 255 + + 32 + + + 4 + + + + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + + + + 0 + 1 + 2 + + + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + + + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + + + + 0 + 1 + + + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + + + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + + + + + 27 + 28 + 29 + 30 + 31 + + + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + + + + 6 + 7 + + + + + + + + + + + 0 + 4 + + + + 768 + 1280 + + + + + 0 + 5 + + + + 768 + + + + + 256 + 512 + 768 + 1024 + 1280 + 1536 + 65280 + + + + + 0 + 1 + 2 + 3 + + + + 254 + 255 + + + + 0 + 1 + 2 + 3 + + + + 7 + + + + 0 + 6 + 7 + + + + 7 + 6 + 5 + 4 + 3 + 2 + 1 + 0 + + + + 7 + 6 + 5 + 4 + 3 + 2 + 1 + 0 + + + + 15 + 14 + 13 + 12 + 11 + 10 + 9 + 8 + 7 + 6 + 5 + 4 + 3 + 2 + 1 + 0 + + + + 7 + 6 + 5 + 4 + 3 + 2 + 1 + 0 + + + + 0 + 1 + 2 + 3 + 4 + + + + 7 + 127 + + + + 7 + 6 + 5 + + + + 4 + 3 + 2 + 1 + 0 + + + + 4 + 3 + 2 + 1 + 0 + + + + + + + + + + + + + + + 0 + 1 + + + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + + + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + + + + 0 + 1 + 2 + 3 + 4 + + + + 0 + 1 + 2 + 3 + 4 + + + + + + + + + + + 4 + + + + + + 4 + + + 4 + + + + + + + length + + + + + + + length + + + + + + + + + + + + + + + + + + + + + + + + nMapEntries + + + + hasPreserve + nMapEntries + + + + + + + 4 + + + + + + nSyms + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0 + 1 + 2 + 3 + 4 + 129 + 130 + 131 + 132 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + nMapEntries + + + + preserve + nMapEntries + + + + + + + + + + nameLength + + + + valueLength + + + + + + + + + nPoints + + + + + + + + + + + nOutlines + + + + + + 4 + + + + + + + + + 4 + + + 4 + + + + + + + + + nKeys + + + + + + + + + nRows + + + + + + + + + + + nKeys + + + + + 1 + 2 + 3 + 4 + 5 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + nRows + + + nDoodads + + + nOverlays + + + + + + + + length + + + + + + + + + + + + + namesPresent + + + + + mapsPresent + + + + + + + + 255 + 254 + 253 + + + + + + + + + + + + + 0 + 1 + 2 + 2 + + + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + 15 + 16 + 17 + 18 + 19 + 20 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0 + 1 + 2 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1 + 0 + + + + + + + + + + + + 0 + 1 + 2 + 2 + 3 + + + + 3 + 4 + 5 + 6 + + + + + + + + + + + + + + + + + + + + 0 + 2 + + + + + + + + + + + 0 + 1 + 2 + 3 + 4 + + + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + + + + + + + + + + + + + + 0 + 1 + 2 + + + + + + + 6 + + + + + + + + + + + + + + + + + + + + + + + + + 0 + 1 + + + + + + + + + + + + 0 + 1 + 2 + 3 + 4 + 5 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + affectWhich + + clear + selectAll + + + + NewKeyboardNotify + + + + + StateNotify + + + + + ControlsNotify + + + + + IndicatorStateNotify + + + + + IndicatorMapNotify + + + + + NamesNotify + + + + + CompatMapNotify + + + + + BellNotify + + + + + ActionMessage + + + + + AccessXNotify + + + + + ExtensionDeviceNotify + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 32 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 32 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + present + + KeyTypes + + nTypes + + + + KeySyms + + nKeySyms + + + + KeyActions + + nKeyActions + + + totalActions + + + + KeyBehaviors + + totalKeyBehaviors + + + + VirtualMods + + nVModMapKeys + + + + ExplicitComponents + + totalKeyExplicit + + + + ModifierMap + + totalModMapKeys + + + + VirtualModMap + + totalVModMapKeys + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + present + + KeyTypes + + nTypes + + + + KeySyms + + nKeySyms + + + + KeyActions + + nKeyActions + + + totalActions + + + + KeyBehaviors + + totalKeyBehaviors + + + + VirtualMods + + nVModMapKeys + + + + ExplicitComponents + + totalKeyExplicit + + + + ModifierMap + + totalModMapKeys + + + + VirtualModMap + + totalVModMapKeys + + + + + + + + + + + + + + + + + + + + + + 16 + nSIRtrn + + + + + groupsRtrn + + + + + + + + + + + + + + + + + 16 + nSI + + + + + groups + + + + + + + + + + + + + + + + + + + + + + + + + + nIndicators + + + + + + + + + + + which + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + which + + Keycodes + + + + Geometry + + + + Symbols + + + + PhysSymbols + + + + Types + + + + Compat + + + + KeyTypeNames + + nTypes + + + + KTLevelNames + + + nTypes + + + + + + + IndicatorNames + + + indicators + + + + + VirtualModNames + + + virtualMods + + + + + GroupNames + + + groupNames + + + + + KeyNames + + nKeys + + + + KeyAliases + + nKeyAliases + + + + RGNames + + nRadioGroups + + + + + + + + + + + + + + + + + + + + + + + + which + + Keycodes + + + + Geometry + + + + Symbols + + + + PhysSymbols + + + + Types + + + + Compat + + + + KeyTypeNames + + nTypes + + + + KTLevelNames + + nKTLevels + + + + + + + IndicatorNames + + + indicators + + + + + VirtualModNames + + + virtualMods + + + + + GroupNames + + + groupNames + + + + + KeyNames + + nKeys + + + + KeyAliases + + nKeyAliases + + + + RGNames + + nRadioGroups + + + + + + + + + + + + + + + + + + + + + + + + + + + nProperties + + + nColors + + + nShapes + + + nSections + + + nDoodads + + + nKeyAliases + + + + + + + + + + + + + + + + + + + + + nProperties + + + nColors + + + nShapes + + + nSections + + + nDoodads + + + nKeyAliases + + + + + + + + + + + + + + + + + + + + + + + + + + + keymapsSpecLen + + + + keycodesSpecLen + + + + typesSpecLen + + + + compatMapSpecLen + + + + symbolsSpecLen + + + + geometrySpecLen + + + + + + + + + + + + + nKeymaps + + + nKeycodes + + + nTypes + + + nCompatMaps + + + nSymbols + + + nGeometries + + + + + + + + + + + + + keymapsSpecLen + + + + keycodesSpecLen + + + + typesSpecLen + + + + compatMapSpecLen + + + + symbolsSpecLen + + + + geometrySpecLen + + + + + + + + + + + + reported + + Types + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + present + + KeyTypes + + nTypes + + + + KeySyms + + nKeySyms + + + + KeyActions + + nKeyActions + + + totalActions + + + + KeyBehaviors + + totalKeyBehaviors + + + + VirtualMods + + nVModMapKeys + + + + ExplicitComponents + + totalKeyExplicit + + + + ModifierMap + + totalModMapKeys + + + + VirtualModMap + + totalVModMapKeys + + + + + + CompatMap + + + + + + + + + + 16 + nSIRtrn + + + + + groupsRtrn + + + + + ClientSymbols + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + present + + KeyTypes + + nTypes + + + + KeySyms + + nKeySyms + + + + KeyActions + + nKeyActions + + + totalActions + + + + KeyBehaviors + + totalKeyBehaviors + + + + VirtualMods + + nVModMapKeys + + + + ExplicitComponents + + totalKeyExplicit + + + + ModifierMap + + totalModMapKeys + + + + VirtualModMap + + totalVModMapKeys + + + + + + ServerSymbols + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + present + + KeyTypes + + nTypes + + + + KeySyms + + nKeySyms + + + + KeyActions + + nKeyActions + + + totalActions + + + + KeyBehaviors + + totalKeyBehaviors + + + + VirtualMods + + nVModMapKeys + + + + ExplicitComponents + + totalKeyExplicit + + + + ModifierMap + + totalModMapKeys + + + + VirtualModMap + + totalVModMapKeys + + + + + + IndicatorMaps + + + + + + + nIndicators + + + + KeyNames + + + + + + + + + + + + + + + + which + + Keycodes + + + + Geometry + + + + Symbols + + + + PhysSymbols + + + + Types + + + + Compat + + + + KeyTypeNames + + nTypes + + + + KTLevelNames + + nKTLevels + + + + + + + IndicatorNames + + + indicators + + + + + VirtualModNames + + + virtualMods + + + + + GroupNames + + + groupNames + + + + + KeyNames + + nKeys + + + + KeyAliases + + nKeyAliases + + + + RGNames + + nRadioGroups + + + + + + OtherNames + + + + + + + + + + + + + + + + which + + Keycodes + + + + Geometry + + + + Symbols + + + + PhysSymbols + + + + Types + + + + Compat + + + + KeyTypeNames + + nTypes + + + + KTLevelNames + + nKTLevels + + + + + + + IndicatorNames + + + indicators + + + + + VirtualModNames + + + virtualMods + + + + + GroupNames + + + groupNames + + + + + KeyNames + + nKeys + + + + KeyAliases + + nKeyAliases + + + + RGNames + + nRadioGroups + + + + + + Geometry + + + + + + + + + + + + + + + + + nProperties + + + nColors + + + nShapes + + + nSections + + + nDoodads + + + nKeyAliases + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + nameLen + + + nBtnsRtrn + + + nDeviceLedFBs + + + + + + + + + + + + + nBtns + + + nDeviceLedFBs + + + + + + + + + + + + msgLength + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 8 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru xcb-proto-1.6/src/xproto.xml xcb-proto-1.6+git20110412.c4497cdb/src/xproto.xml --- xcb-proto-1.6/src/xproto.xml 2009-12-02 09:06:59.000000000 +0000 +++ xcb-proto-1.6+git20110412.c4497cdb/src/xproto.xml 2011-04-12 16:50:44.000000000 +0000 @@ -1296,8 +1296,8 @@ - - + + diff -Nru xcb-proto-1.6/xcbgen/expr.py xcb-proto-1.6+git20110412.c4497cdb/xcbgen/expr.py --- xcb-proto-1.6/xcbgen/expr.py 2008-08-27 08:12:22.000000000 +0000 +++ xcb-proto-1.6+git20110412.c4497cdb/xcbgen/expr.py 2011-04-12 16:50:44.000000000 +0000 @@ -26,7 +26,7 @@ Represents a mathematical expression for a list length or exprfield. Public fields: - op is the operation (text +,*,/,<<) or None. + op is the operation (text +,*,/,<<,~) or None. lhs and rhs are the sub-Expressions if op is set. lenfield_name is the name of the length field, or None for request lists. lenfield is the Field object for the length field, or None. @@ -40,6 +40,7 @@ self.lenfield_name = None self.lenfield_type = None + self.lenfield_parent = None self.lenfield = None self.lenwire = False self.bitfield = False @@ -75,14 +76,52 @@ if self.lenfield_name == None: self.lenfield_name = self.rhs.lenfield_name + elif elt.tag == 'unop': + # Op field. Need to recurse. + self.op = elt.get('op') + self.rhs = Expression(list(elt)[0], parent) + + self.lenfield_name = self.rhs.lenfield_name + elif elt.tag == 'value': # Constant expression - self.nmemb = int(elt.text) + self.nmemb = int(elt.text, 0) + + elif elt.tag == 'popcount': + self.op = 'popcount' + self.rhs = Expression(list(elt)[0], parent) + self.lenfield_name = self.rhs.lenfield_name + # xcb_popcount returns 'int' - handle the type in the language-specific part + + elif elt.tag == 'enumref': + self.op = 'enumref' + self.lenfield_name = (elt.get('ref'), elt.text) + + elif elt.tag == 'sumof': + self.op = 'sumof' + self.lenfield_name = elt.get('ref') else: # Notreached - raise Exception('XXX') - + raise Exception("undefined tag '%s'" % elt.tag) def fixed_size(self): return self.nmemb != None + + def resolve(self, module, parents): + if self.op == 'enumref': + self.lenfield_type = module.get_type(self.lenfield_name[0]) + self.lenfield_name = self.lenfield_name[1] + elif self.op == 'sumof': + # need to find the field with lenfield_name + for p in reversed(parents): + fields = dict([(f.field_name, f) for f in p.fields]) + if self.lenfield_name in fields.keys(): + if p.is_bitcase: + # switch is the anchestor + self.lenfield_parent = p.parents[-1] + else: + self.lenfield_parent = p + self.lenfield_type = fields[self.lenfield_name].field_type + break + diff -Nru xcb-proto-1.6/xcbgen/Makefile.in xcb-proto-1.6+git20110412.c4497cdb/xcbgen/Makefile.in --- xcb-proto-1.6/xcbgen/Makefile.in 2009-12-02 09:07:44.000000000 +0000 +++ xcb-proto-1.6+git20110412.c4497cdb/xcbgen/Makefile.in 2011-04-12 16:50:50.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -Nru xcb-proto-1.6/xcbgen/xtypes.py xcb-proto-1.6+git20110412.c4497cdb/xcbgen/xtypes.py --- xcb-proto-1.6/xcbgen/xtypes.py 2009-11-06 11:42:27.000000000 +0000 +++ xcb-proto-1.6+git20110412.c4497cdb/xcbgen/xtypes.py 2011-04-12 16:50:44.000000000 +0000 @@ -32,6 +32,8 @@ self.is_reply = False self.is_union = False self.is_pad = False + self.is_switch = False + self.is_bitcase = False def resolve(self, module): ''' @@ -73,6 +75,7 @@ complex_type.fields.append(new_field) + class SimpleType(Type): ''' Derived class which represents a cardinal type like CARD32 or char. @@ -131,7 +134,7 @@ if value.tag == 'value': self.values.append((item.get('name'), value.text)) elif value.tag == 'bit': - self.values.append((item.get('name'), '%u' % (1 << int(value.text)))) + self.values.append((item.get('name'), '%u' % (1 << int(value.text, 0)))) self.bits.append((item.get('name'), value.text)) def resolve(self, module): @@ -152,11 +155,11 @@ parent is the structure type containing the list. expr is an Expression object containing the length information, for variable-sized lists. ''' - def __init__(self, elt, member, parent): + def __init__(self, elt, member, *parent): Type.__init__(self, member.name) self.is_list = True self.member = member - self.parent = parent + self.parents = list(parent) if elt.tag == 'list': elts = list(elt) @@ -177,9 +180,10 @@ needlen = True # See if the length field is already in the structure. - for field in self.parent.fields: - if field.field_name == lenfield_name: - needlen = False + for parent in self.parents: + for field in parent.fields: + if field.field_name == lenfield_name: + needlen = False # It isn't, so we need to add it to the structure ourself. if needlen: @@ -194,15 +198,17 @@ if self.resolved: return self.member.resolve(module) + self.expr.resolve(module, self.parents) # Find my length field again. We need the actual Field object in the expr. # This is needed because we might have added it ourself above. if not self.fixed_size(): - for field in self.parent.fields: - if field.field_name == self.expr.lenfield_name and field.wire: - self.expr.lenfield = field - break - + for parent in self.parents: + for field in parent.fields: + if field.field_name == self.expr.lenfield_name and field.wire: + self.expr.lenfield = field + break + self.resolved = True def fixed_size(self): @@ -215,7 +221,7 @@ Public fields added: expr is an Expression object containing the value of the field. ''' - def __init__(self, elt, member, parent): + def __init__(self, elt, member, *parent): Type.__init__(self, member.name) self.is_expr = True self.member = member @@ -243,7 +249,7 @@ Type.__init__(self, tcard8.name) self.is_pad = True self.size = 1 - self.nmemb = 1 if (elt == None) else int(elt.get('bytes')) + self.nmemb = 1 if (elt == None) else int(elt.get('bytes'), 0) def resolve(self, module): self.resolved = True @@ -266,6 +272,7 @@ self.fields = [] self.nmemb = 1 self.size = 0 + self.lenfield_parent = [self] def resolve(self, module): if self.resolved: @@ -288,18 +295,27 @@ elif child.tag == 'exprfield': field_name = child.get('name') fkey = child.get('type') - type = ExprType(child, module.get_type(fkey), self) + type = ExprType(child, module.get_type(fkey), *self.lenfield_parent) visible = False elif child.tag == 'list': field_name = child.get('name') fkey = child.get('type') - type = ListType(child, module.get_type(fkey), self) + type = ListType(child, module.get_type(fkey), *self.lenfield_parent) visible = True elif child.tag == 'valueparam': field_name = child.get('value-list-name') fkey = 'CARD32' - type = ListType(child, module.get_type(fkey), self) + type = ListType(child, module.get_type(fkey), *self.lenfield_parent) + visible = True + elif child.tag == 'switch': + field_name = child.get('name') + # construct the switch type name from the parent type and the field name + field_type = self.name + (field_name,) + type = SwitchType(field_type, child, *self.lenfield_parent) visible = True + type.make_member_of(module, self, field_type, field_name, visible, True, False) + type.resolve(module) + continue else: # Hit this on Reply continue @@ -331,6 +347,109 @@ return False return True +class SwitchType(ComplexType): + ''' + Derived class which represents a List of Items. + + Public fields added: + bitcases is an array of Bitcase objects describing the list items + ''' + + def __init__(self, name, elt, *parents): + ComplexType.__init__(self, name, elt) + self.parents = parents + # FIXME: switch cannot store lenfields, so it should just delegate the parents + self.lenfield_parent = list(parents) + [self] + # self.fields contains all possible fields collected from the Bitcase objects, + # whereas self.items contains the Bitcase objects themselves + self.bitcases = [] + + self.is_switch = True + elts = list(elt) + self.expr = Expression(elts[0] if len(elts) else elt, self) + + def resolve(self, module): + if self.resolved: + return +# pads = 0 + + parents = list(self.parents) + [self] + + # Resolve all of our field datatypes. + for index, child in enumerate(list(self.elt)): + if child.tag == 'bitcase': + field_name = child.get('name') + if field_name is None: + field_type = self.name + ('bitcase%d' % index,) + else: + field_type = self.name + (field_name,) + + # use self.parent to indicate anchestor, + # as switch does not contain named fields itself + type = BitcaseType(index, field_type, child, *parents) + # construct the switch type name from the parent type and the field name + if field_name is None: + type.has_name = False + # Get the full type name for the field + field_type = type.name + visible = True + + # add the field to ourself + type.make_member_of(module, self, field_type, field_name, visible, True, False) + + # recursively resolve the type (could be another structure, list) + type.resolve(module) + inserted = False + for new_field in type.fields: + # We dump the _placeholder_byte if any fields are added. + for (idx, field) in enumerate(self.fields): + if field == _placeholder_byte: + self.fields[idx] = new_field + inserted = True + break + if False == inserted: + self.fields.append(new_field) + + self.calc_size() # Figure out how big we are + self.resolved = True + + def make_member_of(self, module, complex_type, field_type, field_name, visible, wire, auto): + if not self.fixed_size(): + # We need a length field. + # Ask our Expression object for it's name, type, and whether it's on the wire. + lenfid = self.expr.lenfield_type + lenfield_name = self.expr.lenfield_name + lenwire = self.expr.lenwire + needlen = True + + # See if the length field is already in the structure. + for parent in self.parents: + for field in parent.fields: + if field.field_name == lenfield_name: + needlen = False + + # It isn't, so we need to add it to the structure ourself. + if needlen: + type = module.get_type(lenfid) + lenfield_type = module.get_type_name(lenfid) + type.make_member_of(module, complex_type, lenfield_type, lenfield_name, True, lenwire, False) + + # Add ourself to the structure by calling our original method. + Type.make_member_of(self, module, complex_type, field_type, field_name, visible, wire, auto) + + # size for switch can only be calculated at runtime + def calc_size(self): + pass + + # note: switch is _always_ of variable size, but we indicate here wether + # it contains elements that are variable-sized themselves + def fixed_size(self): + return False +# for m in self.fields: +# if not m.type.fixed_size(): +# return False +# return True + class Struct(ComplexType): ''' @@ -350,6 +469,48 @@ out = __main__.output['union'] +class BitcaseType(ComplexType): + ''' + Derived class representing a struct data type. + ''' + def __init__(self, index, name, elt, *parent): + elts = list(elt) + self.expr = Expression(elts[0] if len(elts) else elt, self) + ComplexType.__init__(self, name, elts[1:]) + self.has_name = True + self.index = 1 + self.lenfield_parent = list(parent) + [self] + self.parents = list(parent) + self.is_bitcase = True + + def make_member_of(self, module, switch_type, field_type, field_name, visible, wire, auto): + ''' + register BitcaseType with the corresponding SwitchType + + module is the global module object. + complex_type is the structure object. + see Field for the meaning of the other parameters. + ''' + new_field = Field(self, field_type, field_name, visible, wire, auto) + + # We dump the _placeholder_byte if any bitcases are added. + for (idx, field) in enumerate(switch_type.bitcases): + if field == _placeholder_byte: + switch_type.bitcases[idx] = new_field + return + + switch_type.bitcases.append(new_field) + + def resolve(self, module): + if self.resolved: + return + + self.expr.resolve(module, self.parents+[self]) + + # Resolve the bitcase expression + ComplexType.resolve(self, module) + + class Reply(ComplexType): ''' Derived class representing a reply. Only found as a field of Request.