fdo-mirrors/xorg-xcbproto
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/proto/xcbproto.git synced 2026-05-05 23:58:14 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

In XML Schema, attributes default to optional unless explicitly marked use="required"; add use="required" to all required attributes. Add fake error number to error name="Generic" in glx.xml, since error is now a required attribute.

Browse source
This commit is contained in:
Josh Triplett 2006-03-04 14:07:04 -08:00
parent ec8315d965
commit 3084d8b32e
2 changed files with 26 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/extensions/glx.xml
View file

@ -59,7 +59,7 @@ The patch that fixed this server bug in X.org CVS is here:
<typedef oldname="CARD32" newname="BOOL32" />
<!-- Errors -->
<error name="Generic">
<error name="Generic" number="-1"> <!-- FIXME: fake number -->
<field type="CARD32" name="bad_value" />
<field type="CARD16" name="minor_opcode" />
<field type="CARD8" name="major_opcode" />

48
src/xcb.xsd
View file

@ -30,7 +30,7 @@ authorization from the authors.
<xsd:element name="xcb">
<xsd:complexType>
<xsd:group ref="macro" minOccurs="0" maxOccurs="unbounded" />
<xsd:attribute name="header" type="xsd:string" />
<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:complexType>
@ -39,14 +39,14 @@ authorization from the authors.
<!-- Padding -->
<xsd:element name="pad">
<xsd:complexType>
<xsd:attribute name="bytes" type="xsd:integer" />
<xsd:attribute name="bytes" type="xsd:integer" use="required" />
</xsd:complexType>
</xsd:element>
<!-- Type for fields or parameters with attributes "name" and "type" -->
<xsd:complexType name="var">
<xsd:attribute name="name" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" use="required" />
<xsd:attribute name="type" type="xsd:string" use="required" />
</xsd:complexType>
<!-- field replaces FIELD, PARAM, and REPLY. -->
@ -77,7 +77,7 @@ authorization from the authors.
<xsd:group ref="expression" />
<xsd:group ref="expression" />
</xsd:sequence>
<xsd:attribute name="op">
<xsd:attribute name="op" use="required">
<xsd:simpleType>
<xsd:restriction base="xsd:string">
<xsd:pattern value="\+|-|\*|/|&amp;|&lt;&lt;" />
@ -106,9 +106,9 @@ authorization from the authors.
<!-- BITMASK/LISTofVALUE parameter pairs. -->
<xsd:element name="valueparam">
<xsd:complexType>
<xsd:attribute name="value-mask-type" type="xsd:string" />
<xsd:attribute name="value-mask-name" type="xsd:string" />
<xsd:attribute name="value-list-name" type="xsd:string" />
<xsd:attribute name="value-mask-type" type="xsd:string" use="required" />
<xsd:attribute name="value-mask-name" type="xsd:string" use="required" />
<xsd:attribute name="value-list-name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
@ -123,21 +123,21 @@ authorization from the authors.
<!-- Type for a structure -->
<xsd:complexType name="struct">
<xsd:group ref="fields" minOccurs="1" maxOccurs="unbounded" />
<xsd:attribute name="name" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
<!-- Type for a packet structure -->
<xsd:complexType name="packet-struct">
<xsd:group ref="fields" minOccurs="0" maxOccurs="unbounded" />
<xsd:attribute name="name" type="xsd:string" />
<xsd:attribute name="number" type="xsd:integer" />
<xsd:attribute name="name" type="xsd:string" use="required" />
<xsd:attribute name="number" type="xsd:integer" use="required" />
</xsd:complexType>
<!-- Type for a packet structure copy -->
<xsd:complexType name="packet-struct-copy">
<xsd:attribute name="name" type="xsd:string" />
<xsd:attribute name="number" type="xsd:integer" />
<xsd:attribute name="ref" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" use="required" />
<xsd:attribute name="number" type="xsd:integer" use="required" />
<xsd:attribute name="ref" type="xsd:string" use="required" />
</xsd:complexType>
<!-- Type for hex integers -->
@ -172,16 +172,18 @@ authorization from the authors.
</xsd:complexType>
</xsd:element>
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" />
<xsd:attribute name="opcode" type="xsd:integer" />
<xsd:attribute name="combine-adjacent" type="xsd:boolean" />
<xsd:attribute name="name" type="xsd:string" use="required" />
<xsd:attribute name="opcode" type="xsd:integer" use="required" />
<xsd:attribute name="combine-adjacent" type="xsd:boolean"
use="optional"/>
</xsd:complexType>
</xsd:element>
<xsd:element name="event">
<xsd:complexType>
<xsd:complexContent>
<xsd:extension base="packet-struct">
<xsd:attribute name="no-sequence-number" type="xsd:boolean" />
<xsd:attribute name="no-sequence-number" type="xsd:boolean"
use="optional" />
</xsd:extension>
</xsd:complexContent>
</xsd:complexType>
@ -193,7 +195,7 @@ authorization from the authors.
<xsd:element name="union" type="struct" />
<xsd:element name="xidtype">
<xsd:complexType>
<xsd:attribute name="name" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
<xsd:element name="enum">
@ -202,17 +204,17 @@ authorization from the authors.
<xsd:element name="item">
<xsd:complexType>
<xsd:group ref="expression" minOccurs="0" maxOccurs="1" />
<xsd:attribute name="name" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
<xsd:element name="typedef">
<xsd:complexType>
<xsd:attribute name="oldname" type="xsd:string" />
<xsd:attribute name="newname" type="xsd:string" />
<xsd:attribute name="oldname" type="xsd:string" use="required" />
<xsd:attribute name="newname" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
<!-- The import element allows a protocol description to reference the