diff options
| author | Josh Triplett <josh@freedesktop.org> | 2006-10-07 00:14:11 -0700 |
|---|---|---|
| committer | Josh Triplett <josh@freedesktop.org> | 2006-10-07 00:14:11 -0700 |
| commit | 62668fb2e24ea3c11ee3782ae0b497395a9d2bc8 (patch) | |
| tree | 16339fe41081dc54c264b5aa641df3f3e76f6ad4 | |
| parent | 25550af7387e2d51470f3470642a144465088f81 (diff) | |
| download | xcb-proto-62668fb2e24ea3c11ee3782ae0b497395a9d2bc8.tar.gz | |
Change "union" to "xidunion" for XID unions like DRAWABLE and FONTABLE
| -rw-r--r-- | src/extensions/glx.xml | 12 | ||||
| -rw-r--r-- | src/xcb.xsd | 9 | ||||
| -rw-r--r-- | src/xproto.xml | 16 |
3 files changed, 23 insertions, 14 deletions
diff --git a/src/extensions/glx.xml b/src/extensions/glx.xml index ba5c253..b10326b 100644 --- a/src/extensions/glx.xml +++ b/src/extensions/glx.xml @@ -53,12 +53,12 @@ The patch that fixed this server bug in X.org CVS is here: <xidtype name="WINDOW" /> <xidtype name="FBCONFIG" /> - <union name="DRAWABLE"> - <field type="xproto:WINDOW" name="window" /> - <field type="PBUFFER" name="glx_pbuffer" /> - <field type="glx:PIXMAP" name="glx_pixmap" /> - <field type="glx:WINDOW" name="glx_window" /> - </union> + <xidunion name="DRAWABLE"> + <type>xproto:WINDOW</type> + <type>PBUFFER</type> + <type>glx:PIXMAP</type> + <type>glx:WINDOW</type> + </xidunion> <typedef oldname="float" newname="FLOAT32" /> <typedef oldname="double" newname="FLOAT64" /> diff --git a/src/xcb.xsd b/src/xcb.xsd index 4fa1fad..d171656 100644 --- a/src/xcb.xsd +++ b/src/xcb.xsd @@ -199,6 +199,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"> diff --git a/src/xproto.xml b/src/xproto.xml index 7ad966b..7fcbc2f 100644 --- a/src/xproto.xml +++ b/src/xproto.xml @@ -47,15 +47,15 @@ authorization from the authors. <xidtype name="ATOM" /> - <union name="DRAWABLE"> - <field type="WINDOW" name="window" /> - <field type="PIXMAP" name="pixmap" /> - </union> + <xidunion name="DRAWABLE"> + <type>WINDOW</type> + <type>PIXMAP</type> + </xidunion> - <union name="FONTABLE"> - <field type="FONT" name="font" /> - <field type="GCONTEXT" name="gcontext" /> - </union> + <xidunion name="FONTABLE"> + <type>FONT</type> + <type>GCONTEXT</type> + </xidunion> <typedef oldname="CARD32" newname="VISUALID" /> |