xkb: Comment out Doodads

Doodads are known to be broken (*). Comment them out until they can be
handled properly.

(*) One problem is that TextDoodad and LogoDoodad have variadic lists at
the end. But, they're within a union with other fixed size Doodads. A
union doesn't have a hint which field is in use and therefor the code
generator (at least c_client.py) just creates a generic iterator for the
Doodad union, which fails for TextDoodad and LogoDoodad.

Signed-off-by: Daniel Martin <consume.noise@gmail.com>
Reviewed-By: Ran Benita <ran234@gmail.com>

diff --git a/src/xkb.xml b/src/xkb.xml
index 2ea659c..5436401 100644 (file)
--- a/src/xkb.xml
+++ b/src/xkb.xml
@@ -633,6 +633,7 @@ authorization from the authors.
                <item name="Logo">      <value>5</value> </item>
        </enum>
 
+       <!-- XXX: doodads are broken
        <struct name="CommonDoodad">
                <field name="name" type="ATOM" />
                <field name="type" type="CARD8" enum="DoodadType" />
@@ -726,6 +727,7 @@ authorization from the authors.
                        <fieldref>nOverlays</fieldref>
                </list>
        </struct>
+       -->
 
        <struct name="Listing">
                <field name="flags" type="CARD16" />
@@ -1898,6 +1900,7 @@ authorization from the authors.
                        <list name="shapes" type="Shape">
                                <fieldref>nShapes</fieldref>
                        </list>
+                       <!-- XXX: doodads are broken
                        <list name="sections" type="Section">
                                <fieldref>nSections</fieldref>
                        </list>
@@ -1907,6 +1910,7 @@ authorization from the authors.
                        <list name="keyAliases" type="KeyAlias">
                                <fieldref>nKeyAliases</fieldref>
                        </list>
+                       -->
                </reply>
        </request>
 
@@ -1934,6 +1938,7 @@ authorization from the authors.
                <list name="shapes" type="Shape">
                        <fieldref>nShapes</fieldref>
                </list>
+               <!-- XXX: doodads are broken
                <list name="sections" type="Section">
                        <fieldref>nSections</fieldref>
                </list>
@@ -1943,6 +1948,7 @@ authorization from the authors.
                <list name="keyAliases" type="KeyAlias">
                        <fieldref>nKeyAliases</fieldref>
                </list>
+               -->
        </request>
 
        <request name="PerClientFlags" opcode="21">
@@ -2333,6 +2339,7 @@ authorization from the authors.
                                        <list name="shapes" type="Shape">
                                                <fieldref>nShapes</fieldref>
                                        </list>
+                                       <!-- XXX: doodads are broken
                                        <list name="sections" type="Section">
                                                <fieldref>nSections</fieldref>
                                        </list>
@@ -2342,6 +2349,7 @@ authorization from the authors.
                                        <list name="keyAliases" type="KeyAlias">
                                                <fieldref>nKeyAliases</fieldref>
                                        </list>
+                                       -->
                                </bitcase>
                        </switch>
                </reply>