xv: Add align. pad in struct AdaptorInfo

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

diff --git a/src/shape.xml b/src/shape.xml
index d832460..d75549e 100644 (file)
--- a/src/shape.xml
+++ b/src/shape.xml
@@ -34,22 +34,22 @@ authorization from the authors.
 
   <!-- Shape attributes of type OP. -->
   <enum name="SO">
-    <item name="Set" />
-    <item name="Union" />
-    <item name="Intersect" />
-    <item name="Subtract" />
-    <item name="Invert" />
+    <item name="Set">       <value>0</value> </item>
+    <item name="Union">     <value>1</value> </item>
+    <item name="Intersect"> <value>2</value> </item>
+    <item name="Subtract">  <value>3</value> </item>
+    <item name="Invert">    <value>4</value> </item>
   </enum>
 
   <!-- Shape attributes of type KIND. -->
   <enum name="SK">
-    <item name="Bounding" />
-    <item name="Clip" />
-    <item name="Input" />      <!-- added in version 1.1 -->
+    <item name="Bounding"> <value>0</value> </item>
+    <item name="Clip">     <value>1</value> </item>
+    <item name="Input">    <value>2</value> </item>      <!-- added in version 1.1 -->
   </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>