xv: Add align. pad in struct AdaptorInfo

[free-sw/xcb/proto] / src / xkb.xml

diff --git a/src/xkb.xml b/src/xkb.xml
index 8c9b067..04ab429 100644 (file)
--- a/src/xkb.xml
+++ b/src/xkb.xml
@@ -559,6 +559,14 @@ authorization from the authors.
                </list>
        </struct>
        -->
+       <!-- XXX: This would be the correct Property structure as per spec.,
+                 but it's broken atm. too. Add it anyway here, so we don't
+                 loose that information.
+       <struct name="Property">
+               <field name="name" type="CountedString16" />
+               <field name="value" type="CountedString16" />
+       </struct>
+       -->
 
        <struct name="Outline">
                <field name="nPoints" type="CARD8" />
@@ -1343,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="&amp;">
-                                                   <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>
@@ -1372,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="&amp;">
-                                                   <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="&amp;">
-                                                   <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="&amp;">
-                                                   <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>
@@ -1822,7 +1778,7 @@ authorization from the authors.
                        <bitcase>
                                <enumref ref="NameDetail">KTLevelNames</enumref>
                                <list name="nLevelsPerType" type="CARD8">
-                                       <fieldref>nKTLevels</fieldref>
+                                       <fieldref>nTypes</fieldref>
                                </list>
                                <list name="ktLevelNames" type="ATOM">
                                        <sumof ref="nLevelsPerType" />
@@ -2264,7 +2220,7 @@ authorization from the authors.
                                                <bitcase>
                                                        <enumref ref="NameDetail">KTLevelNames</enumref>
                                                        <list name="nLevelsPerType" type="CARD8">
-                                                               <fieldref>nKTLevels</fieldref>
+                                                               <fieldref>nTypes</fieldref>
                                                        </list>
                                                        <list name="ktLevelNames" type="ATOM">
                                                                <sumof ref="nLevelsPerType" />