X-Git-Url: http://git.demorecorder.com/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fxproto.xml;h=343e73431c344d67b15871254c6d1ca7db8d3105;hb=53366c673ce685bd51e1cbd35fe95f893b41ce1d;hp=78fa4bf8324f3776d5519a754e55db6417330399;hpb=453b1ae69b2df7f9d16c5db3316b3dc32fb65ea2;p=free-sw%2Fxcb%2Fproto

diff --git a/src/xproto.xml b/src/xproto.xml
index 78fa4bf..343e734 100644
--- a/src/xproto.xml
+++ b/src/xproto.xml
@@ -47,35 +47,25 @@ 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>
   
-  <struct name="VISUALID">
-    <field type="CARD32" name="id" />
-  </struct>
+  <typedef oldname="CARD32" newname="VISUALID" />
 
-  <struct name="TIMESTAMP">
-    <field type="CARD32" name="id" />
-  </struct>
+  <typedef oldname="CARD32" newname="TIMESTAMP" />
 
-  <struct name="KEYSYM">
-    <field type="CARD32" name="id" />
-  </struct>
+  <typedef oldname="CARD32" newname="KEYSYM" />
 
-  <struct name="KEYCODE">
-    <field type="CARD8" name="id" />
-  </struct>
+  <typedef oldname="CARD8" newname="KEYCODE" />
 
-  <struct name="BUTTON">
-    <field type="CARD8" name="id" />
-  </struct>
+  <typedef oldname="CARD8" newname="BUTTON" />
 
   <struct name="POINT">
     <field type="INT16" name="x" />
@@ -998,8 +988,8 @@ authorization from the authors.
   </request>
 
   <enum name="GrabMode">
-    <item name="Async"><value>0</value></item>
-    <item name="Sync"> <value>1</value></item>
+    <item name="Sync"> <value>0</value></item>
+    <item name="Async"><value>1</value></item>
   </enum>
 
   <enum name="GrabStatus">
@@ -1096,7 +1086,7 @@ authorization from the authors.
   </request>
 
   <request name="UngrabKey" opcode="34">
-    <field type="CARD8" name="key" />
+    <field type="KEYCODE" name="key" />
     <field type="WINDOW" name="grab_window" />
     <field type="CARD16" name="modifiers" />
   </request>
@@ -1431,8 +1421,8 @@ authorization from the authors.
 
   <enum name="CapStyle">
     <item name="NotLast">   <value>0</value></item>
-    <item name="Cap">       <value>1</value></item>
-    <item name="Butt">      <value>2</value></item>
+    <item name="Butt">      <value>1</value></item>
+    <item name="Round">     <value>2</value></item>
     <item name="Projecting"><value>3</value></item>
   </enum>
 
@@ -2024,10 +2014,7 @@ authorization from the authors.
       <field type="BYTE" name="keysyms_per_keycode" />
       <pad bytes="24" />
       <list type="KEYSYM" name="keysyms">
-        <op op="*">
-          <fieldref>length</fieldref>
-          <value>4</value>
-        </op>
+        <fieldref>length</fieldref>
       </list>
     </reply>
   </request>
@@ -2202,6 +2189,7 @@ authorization from the authors.
   </request>
 
   <request name="RotateProperties" opcode="114">
+    <pad bytes="1" />
     <field type="WINDOW" name="window" />
     <field type="CARD16" name="atoms_len" />
     <field type="INT16" name="delta" />