Add missing enum references to xproto.xml

[free-sw/xcb/proto] / src / xcb.xsd

diff --git a/src/xcb.xsd b/src/xcb.xsd
index ae62799..f84d194 100644 (file)
--- a/src/xcb.xsd
+++ b/src/xcb.xsd
@@ -33,7 +33,7 @@ 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-oneword" type="xsd:boolean" use="optional" default="false" />
+      <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>
@@ -53,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
@@ -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>