xkb: Add missing LedClass and BellClass enum values
authorRan Benita <ran234@gmail.com>
Mon, 12 Aug 2013 09:18:59 +0000 (12:18 +0300)
committerDaniel Martin <consume.noise@gmail.com>
Wed, 14 Aug 2013 22:23:54 +0000 (00:23 +0200)
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

Note that 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 encoding is the correct one (but I'm not
sure).

Signed-off-by: Ran Benita <ran234@gmail.com>
Reviewed-by: Daniel Martin <consume.noise@gmail.com>
src/xkb.xml

index a5f808e..b702cad 100644 (file)
@@ -161,8 +161,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 +174,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" />