summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Harris <pharris@opentext.com>2009-02-05 16:01:49 -0500
committerPeter Harris <pharris@opentext.com>2009-02-05 16:28:54 -0500
commitd7f720df741114d42bac270839719aee3da59af5 (patch)
treeaca0ab5491d7b5b73ed3587de4f696525d8b3960
parent505dd632bbbd9a55c2bd334d0c06abc175445327 (diff)
Move the definition of "enum" and "mask" from <field> to "var".
In theory, anything that may contain a value may contain an enum value. In practise, the Render extension has a <list> of enum in the QueryPictFormats reply. Signed-off-by: Peter Harris <pharris@opentext.com>
-rw-r--r--src/xcb.xsd16
1 files changed, 3 insertions, 13 deletions
diff --git a/src/xcb.xsd b/src/xcb.xsd
index f84d194..43eb85b 100644
--- a/src/xcb.xsd
+++ b/src/xcb.xsd
@@ -50,22 +50,12 @@ authorization from the authors.
<xsd:complexType name="var">
<xsd:attribute name="name" type="xsd:string" use="required" />
<xsd:attribute name="type" type="xsd:string" use="required" />
+ <xsd:attribute name="enum" type="xsd:string" use="optional" />
+ <xsd:attribute name="mask" type="xsd:string" use="optional" />
</xsd:complexType>
<!-- field replaces FIELD, PARAM, and REPLY. -->
- <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>
+ <xsd:element name="field" type="var" />
<!-- list replaces ARRAYFIELD, LISTPARAM, and ARRAYREPLY. The name and type
are specified as attributes. The content is an expression giving the