[Xcb] [PATCH 5/7] xkb: Comment out the struct Property and {Get, Set}Geometry
Daniel Martin
consume.noise at gmail.com
Sun Oct 13 04:44:39 PDT 2013
This struct has intermixed fixed size fields and lists, which
c_client.py doesn't handle properly. Therefor comment out the struct and
the fields type-referencing it.
As doodads are commented out already and with Property gone the requests
GetGeomtry and SetGeometry become pretty much useless. Therefor comment
them out completly.
Signed-off-by: Daniel Martin <consume.noise at gmail.com>
---
src/xkb.xml | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/xkb.xml b/src/xkb.xml
index 703c7f1..0e65da4 100644
--- a/src/xkb.xml
+++ b/src/xkb.xml
@@ -555,6 +555,7 @@ <struct name="SetKeyType">
<typedef oldname="char" newname="STRING8" />
+ <!-- XXX: Property is broken
<struct name="Property">
<field name="nameLength" type="CARD16" />
<list name="name" type="STRING8">
@@ -565,6 +566,7 @@ <struct name="Property">
<fieldref>valueLength</fieldref>
</list>
</struct>
+ -->
<struct name="Outline">
<field name="nPoints" type="CARD8" />
@@ -1879,6 +1881,7 @@ <request name="SetNames" opcode="18">
</switch>
</request>
+ <!-- XXX: Property and doodads are broken, which renders GetGeometry useless
<request name="GetGeometry" opcode="19">
<field name="deviceSpec" type="DeviceSpec" />
<pad bytes="2" />
@@ -1908,7 +1911,6 @@ <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>
@@ -1918,10 +1920,11 @@ <request name="GetGeometry" opcode="19">
<list name="keyAliases" type="KeyAlias">
<fieldref>nKeyAliases</fieldref>
</list>
- -->
</reply>
</request>
+ -->
+ <!-- XXX: Property and doodads are broken, which renders SetGeometry useless
<request name="SetGeometry" opcode="20">
<field name="deviceSpec" type="DeviceSpec" />
<field name="nShapes" type="CARD8" />
@@ -1946,7 +1949,6 @@ <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>
@@ -1956,8 +1958,8 @@ <request name="SetGeometry" opcode="20">
<list name="keyAliases" type="KeyAlias">
<fieldref>nKeyAliases</fieldref>
</list>
- -->
</request>
+ -->
<request name="PerClientFlags" opcode="21">
<field name="deviceSpec" type="DeviceSpec" />
@@ -2338,6 +2340,7 @@ <request name="GetKbdByName" opcode="23">
<field name="baseColorNdx" type="CARD8" />
<field name="labelColorNdx" type="CARD8" />
<field name="labelFont" type="CountedString16" />
+ <!-- XXX: Property is broken
<list name="properties" type="Property">
<fieldref>nProperties</fieldref>
</list>
@@ -2347,6 +2350,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>
--
1.8.4
More information about the Xcb
mailing list