Change "union" to "xidunion" for XID unions like DRAWABLE and FONTABLE

diff --git a/src/extensions/glx.xml b/src/extensions/glx.xml
index ba5c253..b10326b 100644 (file)
--- 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 (file)
--- 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 (file)
--- 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" />