projects
/
free-sw
/
xcb
/
proto
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename the ExprType "parent" attribute to "parents".
[free-sw/xcb/proto]
/
src
/
xkb.xml
diff --git
a/src/xkb.xml
b/src/xkb.xml
index
fb97ba4
..
e8f4c02
100644
(file)
--- a/
src/xkb.xml
+++ b/
src/xkb.xml
@@
-401,8
+401,12
@@
authorization from the authors.
<struct name="KTMapEntry">
<field name="active" type="BOOL" />
<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="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" />
<field name="mods_mods" type="CARD8" mask="ModMask" />
<field name="mods_vmods" type="CARD16" mask="VMod" />
<pad bytes="2" />
@@
-1127,7
+1131,7
@@
authorization from the authors.
</switch>
</request>
</switch>
</request>
- <request name="Bell" opcode="
2
">
+ <request name="Bell" opcode="
3
">
<field name="deviceSpec" type="DeviceSpec" />
<field name="bellClass" type="BellClassSpec" />
<field name="bellID" type="IDSpec" />
<field name="deviceSpec" type="DeviceSpec" />
<field name="bellClass" type="BellClassSpec" />
<field name="bellID" type="IDSpec" />
@@
-1142,7
+1146,7
@@
authorization from the authors.
<field name="window" type="WINDOW" />
</request>
<field name="window" type="WINDOW" />
</request>
- <request name="GetState" opcode="
3
">
+ <request name="GetState" opcode="
4
">
<field name="deviceSpec" type="DeviceSpec" />
<pad bytes="2" />
<reply>
<field name="deviceSpec" type="DeviceSpec" />
<pad bytes="2" />
<reply>
@@
-1158,6
+1162,7
@@
authorization from the authors.
<field name="compatState" type="CARD8" mask="ModMask" />
<field name="grabMods" type="CARD8" mask="ModMask" />
<field name="compatGrabMods" type="CARD8" mask="ModMask" />
<field name="compatState" type="CARD8" mask="ModMask" />
<field name="grabMods" type="CARD8" mask="ModMask" />
<field name="compatGrabMods" type="CARD8" mask="ModMask" />
+ <field name="lookupMods" type="CARD8" mask="ModMask" />
<field name="compatLookupMods" type="CARD8" mask="ModMask" />
<pad bytes="1" />
<field name="ptrBtnState" type="CARD16" mask="KeyButMask" />
<field name="compatLookupMods" type="CARD8" mask="ModMask" />
<pad bytes="1" />
<field name="ptrBtnState" type="CARD16" mask="KeyButMask" />
@@
-1218,13
+1223,13
@@
authorization from the authors.
<request name="SetControls" opcode="7">
<field name="deviceSpec" type="DeviceSpec" />
<field name="affectInternalRealMods" type="CARD8" mask="ModMask" />
<request name="SetControls" opcode="7">
<field name="deviceSpec" type="DeviceSpec" />
<field name="affectInternalRealMods" type="CARD8" mask="ModMask" />
- <field name="inter
an
lRealMods" type="CARD8" mask="ModMask" />
+ <field name="inter
na
lRealMods" type="CARD8" mask="ModMask" />
<field name="affectIgnoreLockRealMods" type="CARD8" mask="ModMask" />
<field name="ignoreLockRealMods" type="CARD8" mask="ModMask" />
<field name="affectInternalVirtualMods" type="CARD16" mask="VMod" />
<field name="internalVirtualMods" type="CARD16" mask="VMod" />
<field name="affectIgnoreLockRealMods" type="CARD8" mask="ModMask" />
<field name="ignoreLockRealMods" type="CARD8" mask="ModMask" />
<field name="affectInternalVirtualMods" type="CARD16" mask="VMod" />
<field name="internalVirtualMods" type="CARD16" mask="VMod" />
- <field name="affectI
nternal
LockVirtualMods" type="CARD16" mask="VMod" />
- <field name="i
nternal
LockVirtualMods" type="CARD16" mask="VMod" />
+ <field name="affectI
gnore
LockVirtualMods" type="CARD16" mask="VMod" />
+ <field name="i
gnore
LockVirtualMods" type="CARD16" mask="VMod" />
<field name="mouseKeysDfltBtn" type="CARD8" />
<field name="groupsWrap" type="CARD8" />
<field name="accessXOptions" type="AXOption" />
<field name="mouseKeysDfltBtn" type="CARD8" />
<field name="groupsWrap" type="CARD8" />
<field name="accessXOptions" type="AXOption" />
@@
-1626,7
+1631,11
@@
authorization from the authors.
<bitcase>
<enumref ref="NameDetail">KTLevelNames</enumref>
<list name="nLevelsPerType" type="CARD8">
<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" />
</list>
<list name="ktLevelNames" type="ATOM">
<sumof ref="nLevelsPerType" />
@@
-1973,9
+1982,16
@@
authorization from the authors.
<pad bytes="16" />
<switch name="replies">
<fieldref>reported</fieldref>
<pad bytes="16" />
<switch name="replies">
<fieldref>reported</fieldref>
- <bitcase>
+ <bitcase
name="types"
>
<enumref ref="GBNDetail">Types</enumref>
<enumref ref="GBNDetail">Types</enumref>
+ <!-- from the spec, this has to be a GetMap reply -->
+ <field name="getmap_type" type="CARD8" />
+ <!-- done 'emulating' GetMap reply header-->
<field name="typeDeviceID" type="CARD8" />
<field name="typeDeviceID" type="CARD8" />
+ <!-- from the spec, this has to be a GetMap reply -->
+ <field name="getmap_sequence" type="CARD16" />
+ <field name="getmap_length" type="CARD32" />
+ <!-- done 'emulating' GetMap reply header-->
<pad bytes="2" />
<field name="typeMinKeyCode" type="KEYCODE" />
<field name="typeMaxKeyCode" type="KEYCODE" />
<pad bytes="2" />
<field name="typeMinKeyCode" type="KEYCODE" />
<field name="typeMaxKeyCode" type="KEYCODE" />
@@
-2058,7
+2074,7
@@
authorization from the authors.
</bitcase>
</switch>
</bitcase>
</bitcase>
</switch>
</bitcase>
- <bitcase>
+ <bitcase
name="compat_map"
>
<enumref ref="GBNDetail">CompatMap</enumref>
<field name="compatDeviceID" type="CARD8" />
<field name="groupsRtrn" type="CARD8" mask="SetOfGroup" />
<enumref ref="GBNDetail">CompatMap</enumref>
<field name="compatDeviceID" type="CARD8" />
<field name="groupsRtrn" type="CARD8" mask="SetOfGroup" />
@@
-2079,7
+2095,7
@@
authorization from the authors.
</popcount>
</list>
</bitcase>
</popcount>
</list>
</bitcase>
- <bitcase>
+ <bitcase
name="client_symbols"
>
<enumref ref="GBNDetail">ClientSymbols</enumref>
<field name="clientDeviceID" type="CARD8" />
<pad bytes="2" />
<enumref ref="GBNDetail">ClientSymbols</enumref>
<field name="clientDeviceID" type="CARD8" />
<pad bytes="2" />
@@
-2164,7
+2180,7
@@
authorization from the authors.
</bitcase>
</switch>
</bitcase>
</bitcase>
</switch>
</bitcase>
- <bitcase>
+ <bitcase
name="server_symbols"
>
<enumref ref="GBNDetail">ServerSymbols</enumref>
<field name="serverDeviceID" type="CARD8" />
<pad bytes="2" />
<enumref ref="GBNDetail">ServerSymbols</enumref>
<field name="serverDeviceID" type="CARD8" />
<pad bytes="2" />
@@
-2249,7
+2265,7
@@
authorization from the authors.
</bitcase>
</switch>
</bitcase>
</bitcase>
</switch>
</bitcase>
- <bitcase>
+ <bitcase
name="indicator_maps"
>
<enumref ref="GBNDetail">IndicatorMaps</enumref>
<field name="indicatorDeviceID" type="CARD8" />
<field name="which" type="CARD32" />
<enumref ref="GBNDetail">IndicatorMaps</enumref>
<field name="indicatorDeviceID" type="CARD8" />
<field name="which" type="CARD32" />
@@
-2260,7
+2276,7
@@
authorization from the authors.
<fieldref>nIndicators</fieldref>
</list>
</bitcase>
<fieldref>nIndicators</fieldref>
</list>
</bitcase>
- <bitcase>
+ <bitcase
name="key_names"
>
<enumref ref="GBNDetail">KeyNames</enumref>
<field name="keyDeviceID" type="CARD8" />
<field name="which" type="CARD32" mask="NameDetail" />
<enumref ref="GBNDetail">KeyNames</enumref>
<field name="keyDeviceID" type="CARD8" />
<field name="which" type="CARD32" mask="NameDetail" />
@@
-2361,7
+2377,7
@@
authorization from the authors.
</bitcase>
</switch>
</bitcase>
</bitcase>
</switch>
</bitcase>
- <bitcase>
+ <bitcase
name="other_names"
>
<enumref ref="GBNDetail">OtherNames</enumref>
<field name="otherDeviceID" type="CARD8" />
<field name="which" type="CARD32" mask="NameDetail" />
<enumref ref="GBNDetail">OtherNames</enumref>
<field name="otherDeviceID" type="CARD8" />
<field name="which" type="CARD32" mask="NameDetail" />
@@
-2462,7
+2478,7
@@
authorization from the authors.
</bitcase>
</switch>
</bitcase>
</bitcase>
</switch>
</bitcase>
- <bitcase>
+ <bitcase
name="geometry"
>
<enumref ref="GBNDetail">Geometry</enumref>
<field name="geometryDeviceID" type="CARD8" />
<field name="name" type="ATOM" />
<enumref ref="GBNDetail">Geometry</enumref>
<field name="geometryDeviceID" type="CARD8" />
<field name="name" type="ATOM" />