summaryrefslogtreecommitdiff
path: root/src/xkb.xml
diff options
context:
space:
mode:
authorChristoph Reimann <oss@arcor.de>2010-08-16 18:32:13 +0200
committerChristoph Reimann <oss@arcor.de>2010-08-16 18:32:13 +0200
commit76ca2c0b1527541be59c344118c538ba055ad9d8 (patch)
treeee0ded502f67c587ba6e3785b5a62be134a05d47 /src/xkb.xml
parent854e2a05c76ad72bc11fb56c78d707a81e5cf614 (diff)
xcbgen: small fix to store anchestor objects more systematic
xml: small fixes according to Xlib or the spec
Diffstat (limited to 'src/xkb.xml')
-rw-r--r--src/xkb.xml17
1 files changed, 16 insertions, 1 deletions
diff --git a/src/xkb.xml b/src/xkb.xml
index 3ccc586..760d3f0 100644
--- a/src/xkb.xml
+++ b/src/xkb.xml
@@ -401,8 +401,12 @@ authorization from the authors.
<struct name="KTMapEntry">
<field name="active" type="BOOL" />
+ <!-- Xlib uses a different arrangement of fields
<field name="mods_mask" type="CARD8" mask="ModMask" />
<field name="level" type="CARD8" />
+ -->
+ <field name="level" type="CARD8" />
+ <field name="mods_mask" type="CARD8" mask="ModMask" />
<field name="mods_mods" type="CARD8" mask="ModMask" />
<field name="mods_vmods" type="CARD16" mask="VMod" />
<pad bytes="2" />
@@ -1626,7 +1630,11 @@ authorization from the authors.
<bitcase>
<enumref ref="NameDetail">KTLevelNames</enumref>
<list name="nLevelsPerType" type="CARD8">
- <fieldref>nKTLevels</fieldref>
+ <!-- Xlib uses NTypes here -
+ the spec says nKTLevels is correct, but
+ it does not work in reality
+ <fieldref>nKTLevels</fieldref> -->
+ <fieldref>nTypes</fieldref>
</list>
<list name="ktLevelNames" type="ATOM">
<sumof ref="nLevelsPerType" />
@@ -1975,7 +1983,14 @@ authorization from the authors.
<fieldref>reported</fieldref>
<bitcase name="types">
<enumref ref="GBNDetail">Types</enumref>
+ <!-- from the spec, this has to be a GetMap reply -->
+ <field name="type" type="CARD8" />
+ <!-- done 'emulating' GetMap reply header-->
<field name="typeDeviceID" type="CARD8" />
+ <!-- from the spec, this has to be a GetMap reply -->
+ <field name="sequence" type="CARD16" />
+ <field name="length" type="CARD32" />
+ <!-- done 'emulating' GetMap reply header-->
<pad bytes="2" />
<field name="typeMinKeyCode" type="KEYCODE" />
<field name="typeMaxKeyCode" type="KEYCODE" />