[Xcb] [PATCH 4/7] xkb: Comment out Doodads
Daniel Martin
consume.noise at gmail.com
Sun Oct 13 04:44:38 PDT 2013
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 at gmail.com>
Reviewed-By: Ran Benita <ran234 at gmail.com>
---
Resend as this is the base for the next 2 patches.
src/xkb.xml | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/src/xkb.xml b/src/xkb.xml
index 45f6412..703c7f1 100644
--- a/src/xkb.xml
+++ b/src/xkb.xml
@@ -641,6 +641,7 @@ <enum name="DoodadType">
<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" />
@@ -734,6 +735,7 @@ <struct name="Section">
<fieldref>nOverlays</fieldref>
</list>
</struct>
+ -->
<struct name="Listing">
<field name="flags" type="CARD16" />
@@ -1906,6 +1908,7 @@ <request name="GetGeometry" opcode="19">
<list name="shapes" type="Shape">
<fieldref>nShapes</fieldref>
</list>
+ <!-- XXX: doodads are broken
<list name="sections" type="Section">
<fieldref>nSections</fieldref>
</list>
@@ -1915,6 +1918,7 @@ <request name="GetGeometry" opcode="19">
<list name="keyAliases" type="KeyAlias">
<fieldref>nKeyAliases</fieldref>
</list>
+ -->
</reply>
</request>
@@ -1942,6 +1946,7 @@ <request name="SetGeometry" opcode="20">
<list name="shapes" type="Shape">
<fieldref>nShapes</fieldref>
</list>
+ <!-- XXX: doodads are broken
<list name="sections" type="Section">
<fieldref>nSections</fieldref>
</list>
@@ -1951,6 +1956,7 @@ <request name="SetGeometry" opcode="20">
<list name="keyAliases" type="KeyAlias">
<fieldref>nKeyAliases</fieldref>
</list>
+ -->
</request>
<request name="PerClientFlags" opcode="21">
@@ -2341,6 +2347,7 @@ <request name="GetKbdByName" opcode="23">
<list name="shapes" type="Shape">
<fieldref>nShapes</fieldref>
</list>
+ <!-- XXX: doodads are broken
<list name="sections" type="Section">
<fieldref>nSections</fieldref>
</list>
@@ -2350,6 +2357,7 @@ <request name="GetKbdByName" opcode="23">
<list name="keyAliases" type="KeyAlias">
<fieldref>nKeyAliases</fieldref>
</list>
+ -->
</bitcase>
</switch>
</reply>
--
1.8.4
More information about the Xcb
mailing list