projects / free-sw / xcb / proto / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
xv: Remove obsolete comments in EncodingInfo and QueryEncodings
[free-sw/xcb/proto] / src / xkb.xml
diff --git a/src/xkb.xml b/src/xkb.xml
index 9b1c688..2ea659c 100644 (file)
--- a/src/xkb.xml
+++ b/src/xkb.xml
@@ -130,29 +130,21 @@ authorization from the authors.
                <item name="ControlsEnabled"> <bit>31</bit> </item>
        </enum>
 
-       <enum name="AXFBOpt">
+       <enum name="AXOption">
                <item name="SKPressFB">     <bit>0</bit> </item>
                <item name="SKAcceptFB">    <bit>1</bit> </item>
                <item name="FeatureFB">     <bit>2</bit> </item>
                <item name="SlowWarnFB">    <bit>3</bit> </item>
                <item name="IndicatorFB">   <bit>4</bit> </item>
                <item name="StickyKeysFB">  <bit>5</bit> </item>
-               <item name="SKReleaseFB">   <bit>6</bit> </item>
-               <item name="SKRejectFB">    <bit>7</bit> </item>
-               <item name="BKRejectFB">    <bit>8</bit> </item>
-               <item name="DumbBell">      <bit>9</bit> </item>
+               <item name="TwoKeys">       <bit>6</bit> </item>
+               <item name="LatchToLock">   <bit>7</bit> </item>
+               <item name="SKReleaseFB">   <bit>8</bit> </item>
+               <item name="SKRejectFB">    <bit>9</bit> </item>
+               <item name="BKRejectFB">    <bit>10</bit> </item>
+               <item name="DumbBell">      <bit>11</bit> </item>
        </enum>
 
-       <enum name="AXSKOpt">
-               <item name="TwoKeys">     <bit>6</bit> </item>
-               <item name="LatchToLock"> <bit>7</bit> </item>
-       </enum>
-
-       <union name="AXOption">
-               <field name="fbopt" type="CARD16" enum="AXFBOpt" />
-               <field name="skopt" type="CARD16" enum="AXSKOpt" />
-       </union>
-
        <typedef oldname="CARD16" newname="DeviceSpec" />
 
        <enum name="LedClassResult">
@@ -161,8 +153,10 @@ authorization from the authors.
        </enum>
 
        <enum name="LedClass">
-               <item name="DfltXIClass">  <value>768</value> </item>   <!--0x300-->
-               <item name="AllXIClasses"> <value>1280</value> </item>  <!--0x500-->
+               <item name="KbdFeedbackClass"> <value>0</value> </item>
+               <item name="LedFeedbackClass"> <value>4</value> </item>
+               <item name="DfltXIClass">      <value>768</value> </item>       <!--0x300-->
+               <item name="AllXIClasses">     <value>1280</value> </item>      <!--0x500-->
        </enum>
        <typedef oldname="CARD16" newname="LedClassSpec" />
 
@@ -172,7 +166,9 @@ authorization from the authors.
        </enum>
 
        <enum name="BellClass">
-               <item name="DfltXIClass"> <value>768</value> </item>    <!--0x300-->
+               <item name="KbdFeedbackClass">  <value>0</value> </item>
+               <item name="BellFeedbackClass"> <value>5</value> </item>
+               <item name="DfltXIClass">       <value>768</value> </item>      <!--0x300-->
        </enum>
        <typedef oldname="CARD16" newname="BellClassSpec" />
 
@@ -311,7 +307,7 @@ authorization from the authors.
                <field name="mods" type="CARD8" mask="ModMask" />
                <field name="realMods" type="CARD8" mask="ModMask" />
                <field name="vmods" type="CARD16" mask="VMod" />
-               <field name="ctrls" type="CARD32" enum="BoolCtrl" />
+               <field name="ctrls" type="CARD32" mask="BoolCtrl" />
        </struct>
 
        <enum name="CMDetail">
@@ -410,12 +406,8 @@ 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" />
@@ -471,32 +463,26 @@ authorization from the authors.
                <field name="group" type="CARD8" />
        </struct>
 
-       <struct name="Overlay1Behavior">
+       <struct name="OverlayBehavior">
                <field name="type" type="CARD8" />
                <field name="key" type="KEYCODE" />
        </struct>
 
-       <struct name="Overlay2Behavior">
-               <field name="type" type="CARD8" />
-               <field name="key" type="CARD8" />
-       </struct>
-
        <typedef oldname="LockBehavior" newname="PermamentLockBehavior" />
        <typedef oldname="RadioGroupBehavior" newname="PermamentRadioGroupBehavior" />
-       <typedef oldname="Overlay1Behavior" newname="PermamentOverlay1Behavior" />
-       <typedef oldname="Overlay2Behavior" newname="PermamentOverlay2Behavior" />
+       <typedef oldname="OverlayBehavior" newname="PermamentOverlayBehavior" />
 
        <union name="Behavior">
                <field name="common" type="CommonBehavior" />
                <field name="default" type="DefaultBehavior" />
                <field name="lock" type="LockBehavior" />
                <field name="radioGroup" type="RadioGroupBehavior" />
-               <field name="overlay1" type="Overlay1Behavior" />
-               <field name="overlay2" type="Overlay2Behavior" />
+               <field name="overlay1" type="OverlayBehavior" />
+               <field name="overlay2" type="OverlayBehavior" />
                <field name="permamentLock" type="PermamentLockBehavior" />
                <field name="permamentRadioGroup" type="PermamentRadioGroupBehavior" />
-               <field name="permamentOverlay1" type="PermamentOverlay1Behavior" />
-               <field name="permamentOverlay2" type="PermamentOverlay2Behavior" />
+               <field name="permamentOverlay1" type="PermamentOverlayBehavior" />
+               <field name="permamentOverlay2" type="PermamentOverlayBehavior" />
                <field name="type" type="CARD8" />
        </union>
 
@@ -654,6 +640,7 @@ authorization from the authors.
                <field name="top" type="INT16" />
                <field name="left" type="INT16" />
                <field name="angle" type="INT16" />
+               <pad bytes="8" />
        </struct>
 
        <struct name="ShapeDoodad">
@@ -878,7 +865,8 @@ authorization from the authors.
        </struct>
 
        <enum name="SASetPtrDfltFlag">
-               <item name="DfltBtnAbsolute">  <bit>1</bit> </item>
+               <!-- The spec says 0x02 but Xlib uses 0x04. -->
+               <item name="DfltBtnAbsolute">  <bit>2</bit> </item>
                <item name="AffectDfltButton"> <bit>0</bit> </item>
        </enum>
 
@@ -1007,6 +995,7 @@ authorization from the authors.
                <pad bytes="1" />
                <field name="button" type="CARD8" />
                <field name="device" type="CARD8" />
+               <pad bytes="3" />
        </struct>
 
        <enum name="SAValWhat">
@@ -1086,11 +1075,11 @@ authorization from the authors.
 
        <request name="SelectEvents" opcode="1">
                <field name="deviceSpec" type="DeviceSpec" />
-               <field name="affectWhich" type="CARD16" enum="EventType" />
-               <field name="clear" type="CARD16" enum="EventType" />
-               <field name="selectAll" type="CARD16" enum="EventType" />
-               <field name="affectMap" type="CARD16" enum="MapPart" />
-               <field name="map" type="CARD16" enum="MapPart" />
+               <field name="affectWhich" type="CARD16" mask="EventType" />
+               <field name="clear" type="CARD16" mask="EventType" />
+               <field name="selectAll" type="CARD16" mask="EventType" />
+               <field name="affectMap" type="CARD16" mask="MapPart" />
+               <field name="map" type="CARD16" mask="MapPart" />
                <switch name="details">
                        <op op="&amp;">
                                <fieldref>affectWhich</fieldref>
@@ -1232,14 +1221,14 @@ authorization from the authors.
                        <field name="mouseKeysTimeToMax" type="CARD16" />
                        <field name="mouseKeysMaxSpeed" type="CARD16" />
                        <field name="mouseKeysCurve" type="INT16" />
-                       <field name="accessXOption" type="AXOption" />
+                       <field name="accessXOption" type="CARD16" mask="AXOption" />
                        <field name="accessXTimeout" type="CARD16" />
-                       <field name="accessXTimeoutOptionsMask" type="AXOption" />
-                       <field name="accessXTimeoutOptionsValues" type="AXOption" />
+                       <field name="accessXTimeoutOptionsMask" type="CARD16" mask="AXOption" />
+                       <field name="accessXTimeoutOptionsValues" type="CARD16" mask="AXOption" />
                        <pad bytes="2" />
-                       <field name="accessXTimeoutMask" type="CARD32" enum="BoolCtrl" />
-                       <field name="accessXTimeoutValues" type="CARD32" enum="BoolCtrl" />
-                       <field name="enabledControls" type="CARD32" enum="BoolCtrl" />
+                       <field name="accessXTimeoutMask" type="CARD32" mask="BoolCtrl" />
+                       <field name="accessXTimeoutValues" type="CARD32" mask="BoolCtrl" />
+                       <field name="enabledControls" type="CARD32" mask="BoolCtrl" />
                        <list name="perKeyRepeat" type="CARD8">
                                <value>32</value>
                        </list>
@@ -1258,10 +1247,10 @@ authorization from the authors.
                <field name="ignoreLockVirtualMods" type="CARD16" mask="VMod" />
                <field name="mouseKeysDfltBtn" type="CARD8" />
                <field name="groupsWrap" type="CARD8" />
-               <field name="accessXOptions" type="AXOption" />
+               <field name="accessXOptions" type="CARD16" mask="AXOption" />
                <pad bytes="2" />
-               <field name="affectEnabledControls" type="CARD32" enum="BoolCtrl" />
-               <field name="enabledControls" type="CARD32" enum="BoolCtrl" />
+               <field name="affectEnabledControls" type="CARD32" mask="BoolCtrl" />
+               <field name="enabledControls" type="CARD32" mask="BoolCtrl" />
                <field name="changeControls" type="CARD32" mask="Control" />
                <field name="repeatDelay" type="CARD16" />
                <field name="repeatInterval" type="CARD16" />
@@ -1273,10 +1262,10 @@ authorization from the authors.
                <field name="mouseKeysMaxSpeed" type="CARD16" />
                <field name="mouseKeysCurve" type="INT16" />
                <field name="accessXTimeout" type="CARD16" />
-               <field name="accessXTimeoutMask" type="CARD32" enum="BoolCtrl" />
-               <field name="accessXTimeoutValues" type="CARD32" enum="BoolCtrl" />
-               <field name="accessXTimeoutOptionsMask" type="AXOption" />
-               <field name="accessXTimeoutOptionsValues" type="AXOption" />
+               <field name="accessXTimeoutMask" type="CARD32" mask="BoolCtrl" />
+               <field name="accessXTimeoutValues" type="CARD32" mask="BoolCtrl" />
+               <field name="accessXTimeoutOptionsMask" type="CARD16" mask="AXOption" />
+               <field name="accessXTimeoutOptionsValues" type="CARD16" mask="AXOption" />
                <list name="perKeyRepeat" type="CARD8">
                        <value>32</value>
                </list>
@@ -1284,8 +1273,8 @@ authorization from the authors.
 
        <request name="GetMap" opcode="8">
                <field name="deviceSpec" type="DeviceSpec" />
-               <field name="full" type="CARD16" enum="MapPart" />
-               <field name="partial" type="CARD16" enum="MapPart" />
+               <field name="full" type="CARD16" mask="MapPart" />
+               <field name="partial" type="CARD16" mask="MapPart" />
                <field name="firstType" type="CARD8" />
                <field name="nTypes" type="CARD8" />
                <field name="firstKeySym" type="KEYCODE" />
@@ -1307,7 +1296,7 @@ authorization from the authors.
                        <pad bytes="2" />
                        <field name="minKeyCode" type="KEYCODE" />
                        <field name="maxKeyCode" type="KEYCODE" />
-                       <field name="present" type="CARD16" enum="MapPart" />
+                       <field name="present" type="CARD16" mask="MapPart" />
                        <field name="firstType" type="CARD8" />
                        <field name="nTypes" type="CARD8" />
                        <field name="totalTypes" type="CARD8" />
@@ -1350,6 +1339,20 @@ 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>
                                        <list name="acts_rtrn_acts" type="Action">
                                                <fieldref>totalActions</fieldref>
                                        </list>
@@ -1365,18 +1368,60 @@ 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>
                                </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>
                                </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>
                                </bitcase>
                                <bitcase>
                                        <enumref ref="MapPart">VirtualModMap</enumref>
@@ -1390,7 +1435,7 @@ authorization from the authors.
 
        <request name="SetMap" opcode="9">
                <field name="deviceSpec" type="DeviceSpec" />
-               <field name="present" type="CARD16" enum="MapPart" />
+               <field name="present" type="CARD16" mask="MapPart" />
                <field name="flags" type="CARD16" mask="SetMapFlags" />
                <field name="minKeyCode" type="KEYCODE" />
                <field name="maxKeyCode" type="KEYCODE" />
@@ -1573,6 +1618,7 @@ authorization from the authors.
                        <field name="map_realMods" type="CARD8" mask="ModMask" />
                        <field name="map_vmod" type="CARD16" mask="VMod" />
                        <field name="map_ctrls" type="CARD32" mask="BoolCtrl" />
+                       <field name="supported" type="BOOL" />
                        <pad bytes="3" />
                </reply>
        </request>
@@ -1657,6 +1703,20 @@ authorization from the authors.
                                               <fieldref>nKTLevels</fieldref> -->
                                                <fieldref>nTypes</fieldref>
                                        </list>
+                                       <list type="CARD8" name="alignment_pad">
+                                           <op op="-">
+                                               <op op="&amp;">
+                                                   <op op="+">
+                                                       <fieldref>nTypes</fieldref>
+                                                       <value>3</value>
+                                                   </op>
+                                                   <unop op="~">
+                                                       <value>3</value>
+                                                   </unop>
+                                               </op>
+                                               <fieldref>nTypes</fieldref>
+                                           </op>
+                                       </list>
                                        <list name="ktLevelNames" type="ATOM">
                                                <sumof ref="nLevelsPerType" />
                                        </list>
@@ -2017,7 +2077,7 @@ authorization from the authors.
                                        <pad bytes="2" />
                                        <field name="typeMinKeyCode" type="KEYCODE" />
                                        <field name="typeMaxKeyCode" type="KEYCODE" />
-                                       <field name="present" type="CARD16" enum="MapPart" />
+                                       <field name="present" type="CARD16" mask="MapPart" />
                                        <field name="firstType" type="CARD8" />
                                        <field name="nTypes" type="CARD8" />
                                        <field name="totalTypes" type="CARD8" />
@@ -2544,7 +2604,7 @@ authorization from the authors.
                <pad bytes="1" />
                <field name="reason" type="CARD16" mask="XIFeature" />
                <field name="ledClass" type="CARD16" enum="LedClassResult" />
-               <field name="ledID" type="CARD8" />
+               <field name="ledID" type="CARD16" />
                <field name="ledsDefined" type="CARD32" />
                <field name="ledState" type="CARD32" />
                <field name="firstButton" type="CARD8" />
Unnamed repository; edit this file 'description' to name the repository.