X-Git-Url: http://git.demorecorder.com/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fshape.xml;h=c128ade32844b9137d674733eb4adb05d38ed648;hb=08eb095955b1ea6a23df268a38b434f403a10229;hp=d8324603c1108ea880c14822760a40edf791c345;hpb=109a70c496ea9a2047c793815eccd9d27ea440e4;p=free-sw%2Fxcb%2Fproto

diff --git a/src/shape.xml b/src/shape.xml
index d832460..c128ade 100644
--- a/src/shape.xml
+++ b/src/shape.xml
@@ -49,7 +49,7 @@ authorization from the authors.
   </enum>
 
   <event name="Notify" number="0">
-    <field type="KIND" name="shape_kind" />
+    <field type="KIND" name="shape_kind" enum="SK" />
     <field type="WINDOW" name="affected_window" />
     <field type="INT16" name="extents_x" />
     <field type="INT16" name="extents_y" />
@@ -69,9 +69,9 @@ authorization from the authors.
   </request>
 
   <request name="Rectangles" opcode="1">
-    <field type="OP" name="operation" />
-    <field type="KIND" name="destination_kind" />
-    <field type="BYTE" name="ordering" />
+    <field type="OP" name="operation" enum="SO" />
+    <field type="KIND" name="destination_kind" enum="SK" />
+    <field type="BYTE" name="ordering" enum="ClipOrdering" />
     <pad bytes="1" />
     <field type="WINDOW" name="destination_window" />
     <field type="INT16" name="x_offset" />
@@ -80,19 +80,19 @@ authorization from the authors.
   </request>
 
   <request name="Mask" opcode="2">
-    <field type="OP" name="operation" />
-    <field type="KIND" name="destination_kind" />
+    <field type="OP" name="operation" enum="SO" />
+    <field type="KIND" name="destination_kind" enum="SK" />
     <pad bytes="2" />
     <field type="WINDOW" name="destination_window" />
     <field type="INT16" name="x_offset" />
     <field type="INT16" name="y_offset" />
-    <field type="PIXMAP" name="source_bitmap" />
+    <field type="PIXMAP" name="source_bitmap" altenum="Pixmap" />
   </request>
 
   <request name="Combine" opcode="3">
-    <field type="OP" name="operation" />
-    <field type="KIND" name="destination_kind" />
-    <field type="KIND" name="source_kind" />
+    <field type="OP" name="operation" enum="SO" />
+    <field type="KIND" name="destination_kind" enum="SK" />
+    <field type="KIND" name="source_kind" enum="SK" />
     <pad bytes="1" />
     <field type="WINDOW" name="destination_window" />
     <field type="INT16" name="x_offset" />
@@ -101,7 +101,7 @@ authorization from the authors.
   </request>
 
   <request name="Offset" opcode="4">
-    <field type="KIND" name="destination_kind" />
+    <field type="KIND" name="destination_kind" enum="SK" />
     <pad bytes="3" />
     <field type="WINDOW" name="destination_window" />
     <field type="INT16" name="x_offset" />
@@ -141,11 +141,12 @@ authorization from the authors.
 
   <request name="GetRectangles" opcode="8">
     <field type="WINDOW" name="window" />
-    <field type="KIND" name="source_kind" />
+    <field type="KIND" name="source_kind" enum="SK" />
     <pad bytes="3" />
     <reply>
-      <field type="BYTE" name="ordering" />
+      <field type="BYTE" name="ordering" enum="ClipOrdering" />
       <field type="CARD32" name="rectangles_len" />
+      <pad bytes="20" />
       <list type="RECTANGLE" name="rectangles">
         <fieldref>rectangles_len</fieldref>
       </list>