Release xcb-proto 1.0 RC2 (0.9.92).

[free-sw/xcb/proto] / src / xproto.xml

diff --git a/src/xproto.xml b/src/xproto.xml
index 925169e..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" />
 
@@ -63,9 +63,9 @@ authorization from the authors.
 
   <typedef oldname="CARD32" newname="KEYSYM" />
 
-  <typedef oldname="CARD32" newname="KEYCODE" />
+  <typedef oldname="CARD8" newname="KEYCODE" />
 
-  <typedef oldname="CARD32" newname="BUTTON" />
+  <typedef oldname="CARD8" newname="BUTTON" />
 
   <struct name="POINT">
     <field type="INT16" name="x" />