X-Git-Url: http://git.demorecorder.com/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fxproto.xml;h=7fcbc2f1a53935ede699a015a85f04e9cd343271;hb=4b738b87b2e3791877e9e0d6ba66f48282f174f7;hp=925169e872c96b32c4476e4a3e71ca76fbedc1a4;hpb=036019dcab226d70e456c7adc5e79364eb86b72b;p=free-sw%2Fxcb%2Fproto

diff --git a/src/xproto.xml b/src/xproto.xml
index 925169e..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" />
 
@@ -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" />