X-Git-Url: http://git.demorecorder.com/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fxcb.xsd;h=f84d1948e6a052bb56f6faabd7ea4bab549fc2e1;hb=1804c114bb16294e64ba124dc1b0ce6c8c57be4e;hp=4fa1fad98da2dbed2f811269424ef330a6b06dad;hpb=f4c0265fea283895e7d87091c77369542b1704a4;p=free-sw%2Fxcb%2Fproto

diff --git a/src/xcb.xsd b/src/xcb.xsd
index 4fa1fad..f84d194 100644
--- a/src/xcb.xsd
+++ b/src/xcb.xsd
@@ -33,6 +33,9 @@ authorization from the authors.
       <xsd:attribute name="header" type="xsd:string" use="required" />
       <xsd:attribute name="extension-xname" type="xsd:string" use="optional" />
       <xsd:attribute name="extension-name"  type="xsd:string" use="optional" />
+      <xsd:attribute name="extension-multiword" type="xsd:boolean" use="optional" default="false" />
+      <xsd:attribute name="major-version"   type="xsd:integer" use="optional" />
+      <xsd:attribute name="minor-version"   type="xsd:integer" use="optional" />
     </xsd:complexType>
   </xsd:element>
 
@@ -50,7 +53,19 @@ authorization from the authors.
   </xsd:complexType>
 
   <!-- field replaces FIELD, PARAM, and REPLY. -->
-  <xsd:element name="field" type="var" />
+  <xsd:element name="field">
+    <xsd:complexType>
+      <xsd:extension base="var">
+	<!-- Used for fields which are bitmasks. Refers to the type which
+	     describes the mask. -->
+	<xsd:attribute name="mask" type="xsd:string" use="optional" />
+
+	<!-- Used for fields which are enums.  Refers to the type which
+	     describes the enumeration. -->
+	<xsd:attribute name="enum" type="xsd:string" use="optional" />
+      </xsd:extension>
+    </xsd:complexType>
+  </xsd:element>
 
   <!-- list replaces ARRAYFIELD, LISTPARAM, and ARRAYREPLY.  The name and type
        are specified as attributes.  The content is an expression giving the
@@ -65,9 +80,6 @@ authorization from the authors.
     </xsd:complexType>
   </xsd:element>
 
-  <!-- Parameters in requests that are not sent with the request. -->
-  <xsd:element name="localfield" type="var" />
-  
   <!-- Expressions -->
   <xsd:group name="expression">
     <xsd:choice>
@@ -109,6 +121,8 @@ authorization from the authors.
     <xsd:complexType>
       <xsd:attribute name="value-mask-type" type="xsd:string" use="required" />
       <xsd:attribute name="value-mask-name" type="xsd:string" use="required" />
+      <!-- This pad is currently needed only by ConfigureWindow.  Sigh. -->
+      <xsd:attribute name="value-mask-pad" type="xsd:integer" use="optional" />
       <xsd:attribute name="value-list-name" type="xsd:string" use="required" />
     </xsd:complexType>
   </xsd:element>
@@ -160,7 +174,6 @@ authorization from the authors.
           <xsd:sequence>
             <xsd:choice minOccurs="0" maxOccurs="unbounded">
               <xsd:group ref="fields" />
-              <xsd:element ref="localfield" />
               <xsd:element ref="exprfield" />
               <xsd:element ref="valueparam" />
             </xsd:choice>
@@ -199,6 +212,15 @@ authorization from the authors.
           <xsd:attribute name="name" type="xsd:string" use="required" />
         </xsd:complexType>
       </xsd:element>
+      <xsd:element name="xidunion">
+        <xsd:complexType>
+          <xsd:sequence>
+            <xsd:element name="type" type="xsd:string"
+                         minOccurs="1" maxOccurs="unbounded" />
+          </xsd:sequence>
+          <xsd:attribute name="name" type="xsd:string" use="required" />
+        </xsd:complexType>
+      </xsd:element>
       <xsd:element name="enum">
         <xsd:complexType>
           <xsd:sequence minOccurs="1" maxOccurs="unbounded">