[Xcb] [PATCH 6/7] xkb: Comment out intermixed fixed size fields and lists
Daniel Martin
consume.noise at gmail.com
Sun Oct 13 04:44:40 PDT 2013
c_client.py doesn't handle such intermixed fixed size fields and lists
correctly. Therefor comment them out.
With that change the size of the generated request structure for
ListComponents has 8 Bytes which is the same as xkbListComponentsReq
has and the server checks REQUEST_AT_LEAST_SIZE(xkbListComponentsReq).
The same goes for GetKbdByName, which results in a structure of 12
Bytes.
Signed-off-by: Daniel Martin <consume.noise at gmail.com>
---
src/xkb.xml | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/src/xkb.xml b/src/xkb.xml
index 0e65da4..e0ad022 100644
--- a/src/xkb.xml
+++ b/src/xkb.xml
@@ -1982,6 +1982,7 @@ <request name="PerClientFlags" opcode="21">
<request name="ListComponents" opcode="22">
<field name="deviceSpec" type="DeviceSpec" />
<field name="maxNames" type="CARD16" />
+ <!-- XXX: Intermixed fixed size fields and lists are broken
<field name="keymapsSpecLen" type="CARD8" />
<list name="keymapsSpec" type="STRING8">
<fieldref>keymapsSpecLen</fieldref>
@@ -2006,6 +2007,7 @@ <request name="ListComponents" opcode="22">
<list name="geometrySpec" type="STRING8">
<fieldref>geometrySpecLen</fieldref>
</list>
+ -->
<reply>
<field name="deviceID" type="CARD8" />
<field name="nKeymaps" type="CARD16" />
@@ -2043,6 +2045,7 @@ <request name="GetKbdByName" opcode="23">
<field name="want" type="CARD16" mask="GBNDetail" />
<field name="load" type="BOOL" />
<pad bytes="1" />
+ <!-- XXX: Intermixed fixed size fields and lists are broken
<field name="keymapsSpecLen" type="CARD8" />
<list name="keymapsSpec" type="STRING8">
<fieldref>keymapsSpecLen</fieldref>
@@ -2067,6 +2070,7 @@ <request name="GetKbdByName" opcode="23">
<list name="geometrySpec" type="STRING8">
<fieldref>geometrySpecLen</fieldref>
</list>
+ -->
<reply>
<field name="deviceID" type="CARD8" />
<field name="minKeyCode" type="KEYCODE" />
--
1.8.4
More information about the Xcb
mailing list