[Xcb] [PATCH proto 1/3] xkb: Comment out Doodads

[Ran Benita]

On Sun, Aug 18, 2013 at 04:53:57PM +0200, Daniel Martin wrote:
> 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.

Actually the iterator for the union is not generic, just not
implemented, i.e. the next function is empty with a TODO. So you get
infinite loops etc.

> 
> Signed-off-by: Daniel Martin <consume.noise at gmail.com>

Reviewed-By: Ran Benita <ran234 at gmail.com>

> ---
>  src/xkb.xml | 8 ++++++++
>  1 file changed, 8 insertions(+)
> 
> diff --git a/src/xkb.xml b/src/xkb.xml
> index b702cad..af8f512 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" />
> @@ -733,6 +734,7 @@ <struct name="Section">
>  			<fieldref>nOverlays</fieldref>
>  		</list>
>  	</struct>
> +	-->
>  
>  	<struct name="Listing">
>  		<field name="flags" type="CARD16" />
> @@ -1904,6 +1906,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>
> @@ -1913,6 +1916,7 @@ <request name="GetGeometry" opcode="19">
>  			<list name="keyAliases" type="KeyAlias">
>  				<fieldref>nKeyAliases</fieldref>
>  			</list>
> +			-->
>  		</reply>
>  	</request>
>  
> @@ -1940,6 +1944,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>
> @@ -1949,6 +1954,7 @@ <request name="SetGeometry" opcode="20">
>  		<list name="keyAliases" type="KeyAlias">
>  			<fieldref>nKeyAliases</fieldref>
>  		</list>
> +		-->
>  	</request>
>  
>  	<request name="PerClientFlags" opcode="21">
> @@ -2339,6 +2345,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>
> @@ -2348,6 +2355,7 @@ <request name="GetKbdByName" opcode="23">
>  					<list name="keyAliases" type="KeyAlias">
>  						<fieldref>nKeyAliases</fieldref>
>  					</list>
> +					-->
>  				</bitcase>
>  			</switch>
>  		</reply>
> -- 
> 1.8.3.3
> 
> _______________________________________________
> Xcb mailing list
> Xcb at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/xcb