[Xcb] [PATCH proto xkb] Fixes for xkb.xml

[Ran Benita]

> From 2fdf1ae05eb50ee22a14611d73e33c2c3cfecdda Mon Sep 17 00:00:00 2001
> From: Christian Linhart <chris at DemoRecorder.com>
> Date: Fri, 14 Feb 2014 16:09:01 +0100
> Subject: [PATCH 2/5] xkb: reactivated intermixed fixed size fields and lists
> 
> Other generators can handle intermixed fixed size fields and lists.
> Tests with another generator show that the xml is correct here.
> 
> Therefore this change reactivates these parts of the xml.

Yea, I think this makes sense, if the XML is OK. I'm also adding Daniel
Martin to CC, maybe he disagrees.

However, I'd prefer if you leave the problematic sections marked with
the XXX and an XXX-end or something, so we still know where to watch
out. But maybe add "broken with *libxcb*".

Ran

> ---
>  src/xkb.xml |    4 ----
>  1 files changed, 0 insertions(+), 4 deletions(-)
> 
> diff --git a/src/xkb.xml b/src/xkb.xml
> index ebfa5bf..2caffd4 100644
> --- a/src/xkb.xml
> +++ b/src/xkb.xml
> @@ -1930,7 +1930,6 @@ authorization from the authors.
>  	<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>
> @@ -1955,7 +1954,6 @@ authorization from the authors.
>  		<list name="geometrySpec" type="STRING8">
>  			<fieldref>geometrySpecLen</fieldref>
>  		</list>
> -		-->
>  		<reply>
>  			<field name="deviceID" type="CARD8" />
>  			<field name="nKeymaps" type="CARD16" />
> @@ -1992,7 +1990,6 @@ authorization from the authors.
>  		<field name="need" type="CARD16" mask="GBNDetail" />
>  		<field name="want" type="CARD16" mask="GBNDetail" />
>  		<field name="load" type="BOOL" />
> -		<!-- XXX: Intermixed fixed size fields and lists are broken
>  		<field name="keymapsSpecLen" type="CARD8" />
>  		<list name="keymapsSpec" type="STRING8">
>  			<fieldref>keymapsSpecLen</fieldref>
> @@ -2017,7 +2014,6 @@ authorization from the authors.
>  		<list name="geometrySpec" type="STRING8">
>  			<fieldref>geometrySpecLen</fieldref>
>  		</list>
> -		-->
>  		<reply>
>  			<field name="deviceID" type="CARD8" />
>  			<field name="minKeyCode" type="KEYCODE" />
> -- 
> 1.7.2.5
>