diff options
| author | Christian Linhart <chris@demorecorder.com> | 2015-11-01 19:44:29 +0100 |
|---|---|---|
| committer | Christian Linhart <chris@demorecorder.com> | 2016-01-06 01:26:18 +0100 |
| commit | fe8ae2426d0064972a2f612d5d520879ffbd9278 (patch) | |
| tree | 3c77bfd1049474db7d1e55b968453a2ebba1c114 /src | |
| parent | c499401bdac3b87bd4f9cd4bc64cfd1781ab447f (diff) | |
| download | xcb-proto-fe8ae2426d0064972a2f612d5d520879ffbd9278.tar.gz | |
make xkb pass the alignment checker
These are just minimal adjustments to get xkb through
the checks of the alignment checker.
It is not the big fixup which I have already posted an RFC patch
a while ago.
V2 of this patch:
make indentation consistent with the file
(tabs vs spaces)
Signed-off-by: Christian Linhart <chris@demorecorder.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/xkb.xml | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/src/xkb.xml b/src/xkb.xml index ad52ea2..06488e7 100644 --- a/src/xkb.xml +++ b/src/xkb.xml @@ -745,6 +745,7 @@ authorization from the authors. <list name="string" type="STRING8"> <fieldref>length</fieldref> </list> + <pad align="2" /> </struct> <struct name="DeviceLedInfo"> @@ -1443,6 +1444,7 @@ authorization from the authors. <list name="actionsCount" type="CARD8"> <fieldref>nKeyActions</fieldref> </list> + <pad align="4" /> <list name="actions" type="Action"> <fieldref>totalActions</fieldref> </list> @@ -1458,6 +1460,7 @@ authorization from the authors. <list name="vmods" type="CARD8"> <popcount><fieldref>virtualMods</fieldref></popcount> </list> + <pad align="4" /> </bitcase> <bitcase> <enumref ref="MapPart">ExplicitComponents</enumref> @@ -1667,20 +1670,7 @@ authorization from the authors. <fieldref>nKTLevels</fieldref> --> <fieldref>nTypes</fieldref> </list> - <list type="CARD8" name="alignment_pad"> - <op op="-"> - <op op="&"> - <op op="+"> - <fieldref>nTypes</fieldref> - <value>3</value> - </op> - <unop op="~"> - <value>3</value> - </unop> - </op> - <fieldref>nTypes</fieldref> - </op> - </list> + <pad align="4" /> <list name="ktLevelNames" type="ATOM"> <sumof ref="nLevelsPerType" /> </list> @@ -1784,6 +1774,7 @@ authorization from the authors. <list name="nLevelsPerType" type="CARD8"> <fieldref>nTypes</fieldref> </list> + <pad align="4"/> <list name="ktLevelNames" type="ATOM"> <sumof ref="nLevelsPerType" /> </list> @@ -2092,6 +2083,7 @@ authorization from the authors. <list name="acts_rtrn_count" type="CARD8"> <fieldref>nKeyActions</fieldref> </list> + <pad align="4" /> <list name="acts_rtrn_acts" type="Action"> <fieldref>totalActions</fieldref> </list> @@ -2107,18 +2099,21 @@ authorization from the authors. <list name="vmods_rtrn" type="CARD8" mask="ModMask"> <popcount><fieldref>virtualMods</fieldref></popcount> </list> + <pad align="4" /> </bitcase> <bitcase> <enumref ref="MapPart">ExplicitComponents</enumref> <list name="explicit_rtrn" type="SetExplicit"> <fieldref>totalKeyExplicit</fieldref> </list> + <pad align="4" /> </bitcase> <bitcase> <enumref ref="MapPart">ModifierMap</enumref> <list name="modmap_rtrn" type="KeyModMap"> <fieldref>totalModMapKeys</fieldref> </list> + <pad align="4" /> </bitcase> <bitcase> <enumref ref="MapPart">VirtualModMap</enumref> @@ -2226,6 +2221,7 @@ authorization from the authors. <list name="nLevelsPerType" type="CARD8"> <fieldref>nTypes</fieldref> </list> + <pad align="4" /> <list name="ktLevelNames" type="ATOM"> <sumof ref="nLevelsPerType" /> </list> @@ -2352,6 +2348,7 @@ authorization from the authors. <list name="name" type="STRING8"> <fieldref>nameLen</fieldref> </list> + <pad align="4" /> <list name="btnActions" type="Action"> <fieldref>nBtnsRtrn</fieldref> </list> |