From 150771e7aabf4c864b0b970c5b8d773634793abe Mon Sep 17 00:00:00 2001 From: marha Date: Tue, 4 Jun 2013 09:07:26 +0200 Subject: xwininfo fontconfig libX11 libXau libXdmcp libXext mesa libXinerama libxcb libxcb/xcb-proto libfontenc pixman xkbcomp mkfontscale xkeyboard-config git update 4 Jun 2013 xserver commit c21344add2fc589df83b29be5831c36a372201bd libxcb commit 9ae84ad187e2ba440c40f44b8eb21c82c2fdbf12 libxcb/xcb-proto commit bdfedfa57a13ff805580cfacafc70f9cc55df363 xkeyboard-config commit dad9ade4e83d1ef5a517fcc4cc9ad3a79b47acce libX11 commit 8496122eb00ce6cd5d2308ee54f64b68c378e455 libXdmcp commit 0b443c1b769b9c9a3b45b4252afe07e18b709ff4 libXext commit d8366afbb0d2e4fbb1e419b1187f490522270bea libfontenc commit 3acba630d8b57084f7e92c15732408711ed5137a libXinerama commit 6e1d1dc328ba8162bba2f4694e7f3c706a1491ff libXau commit 899790011304c4029e15abf410e49ce7cec17e0a xkbcomp commit ed582f4fccd4e23abcfba8b3b03649fea6414f44 pixman commit 2acfac5f8e097ee2ae225d986f981b55d65dd152 mkfontscale commit 19e2cb7c6a3ec2c5b1bc0d24866fa685eef0ee13 xwininfo commit ba0d1b0da21d2dbdd81098ed5778f3792b472e13 fontconfig commit cd9b1033a68816a7acfbba1718ba0aa5888f6ec7 mesa commit 7bafd88c153e395274b632e7eae4bc9fc3aec1d2 --- libxcb/xcb-proto/doc/xml-xcb.txt | 13 +- libxcb/xcb-proto/src/res.xml | 70 +++++- libxcb/xcb-proto/src/screensaver.xml | 13 +- libxcb/xcb-proto/src/xcb.xsd | 2 +- libxcb/xcb-proto/src/xkb.xml | 447 ++++++++--------------------------- libxcb/xcb-proto/xcbgen/xtypes.py | 18 +- 6 files changed, 198 insertions(+), 365 deletions(-) (limited to 'libxcb/xcb-proto') diff --git a/libxcb/xcb-proto/doc/xml-xcb.txt b/libxcb/xcb-proto/doc/xml-xcb.txt index 705772736..cf6d14e46 100644 --- a/libxcb/xcb-proto/doc/xml-xcb.txt +++ b/libxcb/xcb-proto/doc/xml-xcb.txt @@ -229,13 +229,18 @@ enum; the value is restricted to one of the constants named in the enum. instead for new protocol definitions. switch expression - bitcase expression, fields + bitcase expression(s), 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 . + is non-zero, bitcase fields are included in structure. It can be used only + as the last field of a structure. + + When a bitcase includes multiple clauses, the contents of the + bitcase are only present once regardless of the number of bitcase expressions + that match. + + New protocol definitions should prefer to use this instead of . Expressions ----------- diff --git a/libxcb/xcb-proto/src/res.xml b/libxcb/xcb-proto/src/res.xml index d758d893b..1dd3bd196 100644 --- a/libxcb/xcb-proto/src/res.xml +++ b/libxcb/xcb-proto/src/res.xml @@ -26,9 +26,10 @@ sale, use or other dealings in this Software without prior written authorization from the authors. --> + major-version="1" minor-version="2"> xproto + @@ -39,6 +40,41 @@ authorization from the authors. + + + + + + + + + + + length + + + + + + + + + + + + + + + + + + + + num_cross_references + + + + @@ -80,4 +116,36 @@ authorization from the authors. + + + + + + num_specs + + + + + + + num_ids + + + + + + + + + num_specs + + + + + + + num_sizes + + + diff --git a/libxcb/xcb-proto/src/screensaver.xml b/libxcb/xcb-proto/src/screensaver.xml index 9c7bccb08..7449c0a0b 100644 --- a/libxcb/xcb-proto/src/screensaver.xml +++ b/libxcb/xcb-proto/src/screensaver.xml @@ -75,14 +75,14 @@ Draft Standard Version 1.1 - + - + @@ -92,7 +92,7 @@ Draft Standard Version 1.1 - + - - - - + - + diff --git a/libxcb/xcb-proto/src/xcb.xsd b/libxcb/xcb-proto/src/xcb.xsd index cfa90c9c2..4ef269e10 100644 --- a/libxcb/xcb-proto/src/xcb.xsd +++ b/libxcb/xcb-proto/src/xcb.xsd @@ -59,7 +59,7 @@ authorization from the authors. - + diff --git a/libxcb/xcb-proto/src/xkb.xml b/libxcb/xcb-proto/src/xkb.xml index a6ef37490..0e263c4fb 100644 --- a/libxcb/xcb-proto/src/xkb.xml +++ b/libxcb/xcb-proto/src/xkb.xml @@ -268,7 +268,7 @@ authorization from the authors. 0 - + 0 1 2 @@ -311,7 +311,7 @@ authorization from the authors. - + @@ -370,33 +370,42 @@ authorization from the authors. - + 4 - + 4 - + 4 - - - - length - - - - + length - + + + + + length + 5 + + + 3 + + + + length + 2 + + + @@ -1020,6 +1029,23 @@ authorization from the authors. + + + + 7 + + + + + + + + + + + + + @@ -1060,11 +1086,11 @@ authorization from the authors. - - - - - + + + + + affectWhich @@ -1211,9 +1237,9 @@ authorization from the authors. - - - + + + 32 @@ -1234,8 +1260,8 @@ authorization from the authors. - - + + @@ -1247,8 +1273,8 @@ authorization from the authors. - - + + @@ -1258,8 +1284,8 @@ authorization from the authors. - - + + @@ -1281,7 +1307,7 @@ authorization from the authors. - + @@ -1337,7 +1363,7 @@ authorization from the authors. VirtualMods - nVModMapKeys + virtualMods @@ -1364,7 +1390,7 @@ authorization from the authors. - + @@ -1421,7 +1447,7 @@ authorization from the authors. VirtualMods - nVModMapKeys + virtualMods @@ -1459,11 +1485,8 @@ authorization from the authors. - - - 16 - nSIRtrn - + + nSIRtrn @@ -1482,11 +1505,8 @@ authorization from the authors. - - - 16 - nSI - + + nSI @@ -1516,7 +1536,7 @@ authorization from the authors. - nIndicators + which @@ -1984,6 +2004,8 @@ authorization from the authors. reported Types + ClientSymbols + ServerSymbols @@ -1995,7 +2017,7 @@ authorization from the authors. - + @@ -2051,7 +2073,7 @@ authorization from the authors. VirtualMods - nVModMapKeys + virtualMods @@ -2076,18 +2098,20 @@ authorization from the authors. CompatMap + + + + + - - - 16 - nSIRtrn - + + nSIRtrn @@ -2095,179 +2119,14 @@ authorization from the authors. - - 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 + + + + + @@ -2278,7 +2137,13 @@ authorization from the authors. KeyNames + OtherNames + + + + + @@ -2377,110 +2242,14 @@ authorization from the authors. - - 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 + + + + + @@ -2593,9 +2362,8 @@ authorization from the authors. - + - @@ -2609,9 +2377,8 @@ authorization from the authors. - + - @@ -2636,9 +2403,8 @@ authorization from the authors. - + - @@ -2662,9 +2428,8 @@ authorization from the authors. - + - @@ -2679,9 +2444,8 @@ authorization from the authors. - + - @@ -2690,9 +2454,8 @@ authorization from the authors. - + - @@ -2701,9 +2464,8 @@ authorization from the authors. - + - @@ -2723,9 +2485,8 @@ authorization from the authors. - + - @@ -2735,9 +2496,8 @@ authorization from the authors. - + - @@ -2751,9 +2511,8 @@ authorization from the authors. - + - @@ -2767,9 +2526,8 @@ authorization from the authors. - + - @@ -2779,9 +2537,8 @@ authorization from the authors. - + - diff --git a/libxcb/xcb-proto/xcbgen/xtypes.py b/libxcb/xcb-proto/xcbgen/xtypes.py index f6d463445..5469cd961 100644 --- a/libxcb/xcb-proto/xcbgen/xtypes.py +++ b/libxcb/xcb-proto/xcbgen/xtypes.py @@ -481,8 +481,14 @@ class BitcaseType(ComplexType): ''' 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.expr = [] + fields = [] + for elt in elts: + if elt.tag == 'enumref': + self.expr.append(Expression(elt, self)) + else: + fields.append(elt) + ComplexType.__init__(self, name, fields) self.has_name = True self.index = 1 self.lenfield_parent = list(parent) + [self] @@ -510,8 +516,9 @@ class BitcaseType(ComplexType): def resolve(self, module): if self.resolved: return - - self.expr.resolve(module, self.parents+[self]) + + for e in self.expr: + e.resolve(module, self.parents+[self]) # Resolve the bitcase expression ComplexType.resolve(self, module) @@ -593,8 +600,7 @@ class Event(ComplexType): ComplexType.__init__(self, name, elt) self.opcodes = {} - tmp = elt.get('no-sequence-number') - self.has_seq = (tmp == None or tmp.lower() == 'false' or tmp == '0') + self.has_seq = not bool(elt.get('no-sequence-number')) self.doc = None for item in list(elt): -- cgit v1.2.3