diff options
Diffstat (limited to 'libxcb/xcb-proto/src')
| -rw-r--r-- | libxcb/xcb-proto/src/xcb.xsd | 3 | ||||
| -rw-r--r-- | libxcb/xcb-proto/src/xkb.xml | 60 |
2 files changed, 6 insertions, 57 deletions
diff --git a/libxcb/xcb-proto/src/xcb.xsd b/libxcb/xcb-proto/src/xcb.xsd index 73dbf8a77..580d2588d 100644 --- a/libxcb/xcb-proto/src/xcb.xsd +++ b/libxcb/xcb-proto/src/xcb.xsd @@ -42,7 +42,8 @@ authorization from the authors. <!-- Padding --> <xsd:element name="pad"> <xsd:complexType> - <xsd:attribute name="bytes" type="xsd:integer" use="required" /> + <xsd:attribute name="bytes" type="xsd:integer" use="optional" /> + <xsd:attribute name="align" type="xsd:integer" use="optional" /> </xsd:complexType> </xsd:element> diff --git a/libxcb/xcb-proto/src/xkb.xml b/libxcb/xcb-proto/src/xkb.xml index 1df0771e1..9ef4402ec 100644 --- a/libxcb/xcb-proto/src/xkb.xml +++ b/libxcb/xcb-proto/src/xkb.xml @@ -1351,20 +1351,7 @@ authorization from the authors. <list name="acts_rtrn_count" type="CARD8"> <fieldref>nKeyActions</fieldref> </list> - <list type="CARD8" name="alignment_pad"> - <op op="-"> - <op op="&"> - <op op="+"> - <fieldref>nKeyActions</fieldref> - <value>3</value> - </op> - <unop op="~"> - <value>3</value> - </unop> - </op> - <fieldref>nKeyActions</fieldref> - </op> - </list> + <pad align="4" /> <list name="acts_rtrn_acts" type="Action"> <fieldref>totalActions</fieldref> </list> @@ -1380,60 +1367,21 @@ authorization from the authors. <list name="vmods_rtrn" type="CARD8" mask="ModMask"> <popcount><fieldref>virtualMods</fieldref></popcount> </list> - <list type="CARD8" name="alignment_pad2"> - <op op="-"> - <op op="&"> - <op op="+"> - <popcount><fieldref>virtualMods</fieldref></popcount> - <value>3</value> - </op> - <unop op="~"> - <value>3</value> - </unop> - </op> - <popcount><fieldref>virtualMods</fieldref></popcount> - </op> - </list> + <pad align="4" /> </bitcase> <bitcase> <enumref ref="MapPart">ExplicitComponents</enumref> <list name="explicit_rtrn" type="SetExplicit"> <fieldref>totalKeyExplicit</fieldref> </list> - <list type="CARD16" name="alignment_pad3"> - <op op="-"> - <op op="&"> - <op op="+"> - <fieldref>totalKeyExplicit</fieldref> - <value>1</value> - </op> - <unop op="~"> - <value>1</value> - </unop> - </op> - <fieldref>totalKeyExplicit</fieldref> - </op> - </list> + <pad align="4" /> </bitcase> <bitcase> <enumref ref="MapPart">ModifierMap</enumref> <list name="modmap_rtrn" type="KeyModMap"> <fieldref>totalModMapKeys</fieldref> </list> - <list type="CARD16" name="alignment_pad4"> - <op op="-"> - <op op="&"> - <op op="+"> - <fieldref>totalModMapKeys</fieldref> - <value>1</value> - </op> - <unop op="~"> - <value>1</value> - </unop> - </op> - <fieldref>totalModMapKeys</fieldref> - </op> - </list> + <pad align="4" /> </bitcase> <bitcase> <enumref ref="MapPart">VirtualModMap</enumref> |