X-Git-Url: http://git.demorecorder.com/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fxcb.xsd;h=b40ee6ab8e430770f22cbe9fd2fb9d594a3dde0a;hb=53366c673ce685bd51e1cbd35fe95f893b41ce1d;hp=8b3e1fdc9e6e19a03382023cf6c495a689d58283;hpb=ada24b538474dc205ec27e7cda550d23a3bc3767;p=free-sw%2Fxcb%2Fproto

diff --git a/src/xcb.xsd b/src/xcb.xsd
index 8b3e1fd..b40ee6a 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>
 
@@ -65,9 +68,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>
@@ -88,11 +88,7 @@ authorization from the authors.
       </xsd:element>
       <xsd:element name="fieldref" type="xsd:string" />
       <xsd:element name="value" type="dec-or-hex-integer" />
-      <xsd:element name="bit">
-        <xsd:complexType>
-          <xsd:attribute name="bit" type="xsd:integer" use="required" />
-        </xsd:complexType>
-      </xsd:element>
+      <xsd:element name="bit" type="xsd:integer" />
     </xsd:choice>
   </xsd:group>
   
@@ -164,7 +160,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>
@@ -203,6 +198,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">