[Xcb] [PATCH proto 2/3] xkb: Add missing LedClass and BellClass enum values

Ran Benita ran234 at gmail.com
Mon Aug 12 05:46:17 PDT 2013


As to which fields these are, the protocol encoding says:
http://www.x.org/releases/current/doc/kbproto/xkbproto.html#appD::Common_Types

    KB_LEDCLASSRESULT
        0     KbdFeedbackClass
        4     LedFeedbackClass

    KB_LEDCLASSSPEC
        Encoding same as KB_LEDCLASSRESULT, with the addition of:
        #x0300     XkbDfltXIClass
        #x0500     XkbAllXIClasses

    KB_BELLCLASSRESULT
        0     KbdFeedbackClass
        5     BellFeedbackClass

    KB_BELLCLASSSPEC
        Encoding same as KB_BELLCLASSRESULT, with the addition of:
        #x0300     XkbDfltXIClass

And the spec says something slightly different in another section:
http://www.x.org/releases/current/doc/kbproto/xkbproto.html#Common_Types

    KB_LEDCLASSSPEC { KbdFeedbackClass , LedFeedbackClass , DfltXIClass , AllXIClasses , XINone }
    KB_BELLCLASSSPEC    { KbdFeedbackClass , BellFeedbackClass , DfltXIClass , AllXIClasses  }}

>From what I could gather, the protocol encoding is the correct one, so
the missing fields compared to there are added.

Signed-off-by: Ran Benita <ran234 at gmail.com>
---
 src/xkb.xml | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/xkb.xml b/src/xkb.xml
index a5f808e..b702cad 100644
--- a/src/xkb.xml
+++ b/src/xkb.xml
@@ -157,26 +157,30 @@ authorization from the authors.
 
 	<enum name="LedClassResult">
 		<item name="KbdFeedbackClass"> <value>0</value> </item>
 		<item name="LedFeedbackClass"> <value>4</value> </item>
 	</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" />
 
 	<enum name="BellClassResult">
 		<item name="KbdFeedbackClass">  <value>0</value> </item>
 		<item name="BellFeedbackClass"> <value>5</value> </item>
 	</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" />
 
 	<enum name="ID">
 		<item name="UseCoreKbd">  <value>256</value> </item>    <!-- 0x100 -->
 		<item name="UseCorePtr">  <value>512</value> </item>    <!-- 0x200 -->
 		<item name="DfltXIClass"> <value>768</value> </item>    <!-- 0x300 -->
-- 
1.8.3.4



More information about the Xcb mailing list