X-Git-Url: http://git.demorecorder.com/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fc-client.xsl;h=e58d9909dafe58ea13a5bcee0280d746648e9b7d;hb=65ed274f05ba670eb02a55b098aed141fa9611ec;hp=6306a5c21a10a82240a9339c53fced440d70816d;hpb=71ddf29d00ad8ff2323faf2cc6c354cbf3eca16c;p=free-sw%2Fxcb%2Flibxcb

diff --git a/src/c-client.xsl b/src/c-client.xsl
index 6306a5c..e58d990 100644
--- a/src/c-client.xsl
+++ b/src/c-client.xsl
@@ -62,19 +62,9 @@ authorization from the authors.
     <xsl:for-each select="/xcb/import">
       <path><xsl:value-of select="concat($extension-path, ., '.xml')" /></path>
     </xsl:for-each>
-    <xsl:choose>
-      <xsl:when test="$header='xproto'">
-        <path><xsl:value-of select="concat($base-path,
-                                           'xcb_types.xml')" /></path>
-      </xsl:when>
-      <xsl:when test="$header='xcb_types'" />
-      <xsl:otherwise>
-        <path><xsl:value-of select="concat($base-path,
-                                           'xproto.xml')" /></path>
-        <path><xsl:value-of select="concat($base-path,
-                                           'xcb_types.xml')" /></path>
-      </xsl:otherwise>
-    </xsl:choose>
+    <xsl:if test="not($header='xproto')">
+      <path><xsl:value-of select="concat($base-path, 'xproto.xml')" /></path>
+    </xsl:if>
   </xsl:variable>
   <xsl:variable name="search-path" select="e:node-set($search-path-rtf)/path"/>
 
@@ -211,12 +201,14 @@ authorization from the authors.
   </xsl:template>
   
   <!-- Helper template for requests, that outputs the cookie type.  The
-       context node must be the request. -->
+       parameter "request" must be the request node, which defaults to the
+       context node. -->
   <xsl:template name="cookie-type">
+    <xsl:param name="request" select="." />
     <xsl:text>XCB</xsl:text>
     <xsl:choose>
-      <xsl:when test="reply">
-        <xsl:value-of select="concat($ext, @name)" />
+      <xsl:when test="$request/reply">
+        <xsl:value-of select="concat($ext, $request/@name)" />
       </xsl:when>
       <xsl:otherwise>
         <xsl:text>Void</xsl:text>
@@ -226,6 +218,7 @@ authorization from the authors.
   </xsl:template>
 
   <xsl:template match="request" mode="pass1">
+    <xsl:variable name="req" select="." />
     <xsl:if test="reply">
       <struct name="XCB{$ext}{@name}Cookie">
         <field type="unsigned int" name="sequence" />
@@ -241,14 +234,16 @@ authorization from the authors.
         <field type="CARD16" name="length" no-assign="true" />
       </middle>
     </struct>
-    <function name="XCB{$ext}{@name}">
+    <function name="XCB{$ext}{$req/@name}">
       <xsl:attribute name="type">
-        <xsl:call-template name="cookie-type" />
+        <xsl:call-template name="cookie-type">
+          <xsl:with-param name="request" select="$req" />
+        </xsl:call-template>
       </xsl:attribute>
       <field type="XCBConnection *" name="c" />
-      <xsl:apply-templates select="*[not(self::reply)]" mode="param" />
-      <do-request ref="XCB{$ext}{@name}Req" opcode="{@opcode}">
-        <xsl:if test="reply">
+      <xsl:apply-templates select="$req/*[not(self::reply)]" mode="param" />
+      <do-request ref="XCB{$ext}{$req/@name}Req" opcode="{$req/@opcode}">
+        <xsl:if test="$req/reply">
           <xsl:attribute name="has-reply">true</xsl:attribute>
         </xsl:if>
       </do-request>
@@ -711,7 +706,7 @@ authorization from the authors.
                                /*[self::valueparam or self::list]" />
       <xsl:if test="not($is-variable)">
         <function type="{@type} *" name="{$ref}{$field-name}">
-          <field type="{$ref}{$kind} *" name="R" />
+          <field type="const {$ref}{$kind} *" name="R" />
           <xsl:choose>
             <xsl:when test="$is-first">
               <l>return (<xsl:value-of select="@type" /> *) <!--
@@ -728,7 +723,7 @@ authorization from the authors.
         </function>
       </xsl:if>
       <function type="int" name="{$ref}{$field-name}Length">
-        <field type="{$ref}{$kind} *" name="R" />
+        <field type="const {$ref}{$kind} *" name="R" />
         <l>return <xsl:apply-templates mode="output-expression">
                     <xsl:with-param name="field-prefix" select="'R->'" />
                   </xsl:apply-templates>;</l>
@@ -736,7 +731,7 @@ authorization from the authors.
       <xsl:choose>
         <xsl:when test="substring(@type, 1, 3) = 'XCB'">
           <function type="{@type}Iter" name="{$ref}{$field-name}Iter">
-            <field type="{$ref}{$kind} *" name="R" />
+            <field type="const {$ref}{$kind} *" name="R" />
             <l><xsl:value-of select="@type" />Iter i;</l>
             <xsl:choose>
               <xsl:when test="$is-first">
@@ -766,7 +761,7 @@ authorization from the authors.
             </xsl:choose>
           </xsl:variable>
           <function type="XCBGenericIter" name="{$ref}{$field-name}End">
-            <field type="{$ref}{$kind} *" name="R" />
+            <field type="const {$ref}{$kind} *" name="R" />
             <l>XCBGenericIter i;</l>
             <xsl:choose>
               <xsl:when test="$is-first">
@@ -1091,7 +1086,7 @@ authorization from the authors.
 
   <xsl:template match="bit" mode="output-expression">
     <xsl:text>(1 &lt;&lt; </xsl:text>
-    <xsl:value-of select="@bit" />
+    <xsl:value-of select="." />
     <xsl:text>)</xsl:text>
   </xsl:template>