X-Git-Url: http://git.demorecorder.com/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fextensions%2Fshape.xml;fp=src%2Fextensions%2Fshape.xml;h=8afbff7648df053e4de06cbdd6665b33b3cd17be;hb=42b647d43a2f56469b6cbd1d48a9a79462a71350;hp=36fb84ba02b9da2fd2c0a046a7a8306ba8681a4b;hpb=453b1ae69b2df7f9d16c5db3316b3dc32fb65ea2;p=free-sw%2Fxcb%2Fproto

diff --git a/src/extensions/shape.xml b/src/extensions/shape.xml
index 36fb84b..8afbff7 100644
--- a/src/extensions/shape.xml
+++ b/src/extensions/shape.xml
@@ -27,10 +27,10 @@ authorization from the authors.
 -->
 <!-- This file describes version 1.1 of the Shape extension. -->
 <xcb header="shape" extension-xname="SHAPE" extension-name="Shape">
-  <typedef oldname="CARD8" newname="SHAPE_OP" />
-  <typedef oldname="CARD8" newname="SHAPE_KIND" />
+  <typedef oldname="CARD8" newname="OP" />
+  <typedef oldname="CARD8" newname="KIND" />
 
-  <!-- Shape attributes of type SHAPE_OP. -->
+  <!-- Shape attributes of type OP. -->
   <enum name="SO">
     <item name="Set" />
     <item name="Union" />
@@ -39,7 +39,7 @@ authorization from the authors.
     <item name="Invert" />
   </enum>
 
-  <!-- Shape attributes of type SHAPE_KIND. -->
+  <!-- Shape attributes of type KIND. -->
   <enum name="SK">
     <item name="Bounding" />
     <item name="Clip" />
@@ -47,7 +47,7 @@ authorization from the authors.
   </enum>
 
   <event name="Notify" number="0">
-    <field type="SHAPE_KIND" name="shape_kind" />
+    <field type="KIND" name="shape_kind" />
     <field type="WINDOW" name="affected_window" />
     <field type="INT16" name="extents_x" />
     <field type="INT16" name="extents_y" />
@@ -66,8 +66,8 @@ authorization from the authors.
   </request>
 
   <request name="Rectangles" opcode="1">
-    <field type="SHAPE_OP" name="operation" />
-    <field type="SHAPE_KIND" name="destination_kind" />
+    <field type="OP" name="operation" />
+    <field type="KIND" name="destination_kind" />
     <field type="BYTE" name="ordering" />
     <pad bytes="1" />
     <field type="WINDOW" name="destination_window" />
@@ -77,8 +77,8 @@ authorization from the authors.
   </request>
 
   <request name="Mask" opcode="2">
-    <field type="SHAPE_OP" name="operation" />
-    <field type="SHAPE_KIND" name="destination_kind" />
+    <field type="OP" name="operation" />
+    <field type="KIND" name="destination_kind" />
     <pad bytes="2" />
     <field type="WINDOW" name="destination_window" />
     <field type="INT16" name="x_offset" />
@@ -87,9 +87,9 @@ authorization from the authors.
   </request>
 
   <request name="Combine" opcode="3">
-    <field type="SHAPE_OP" name="operation" />
-    <field type="SHAPE_KIND" name="destination_kind" />
-    <field type="SHAPE_KIND" name="source_kind" />
+    <field type="OP" name="operation" />
+    <field type="KIND" name="destination_kind" />
+    <field type="KIND" name="source_kind" />
     <pad bytes="1" />
     <field type="WINDOW" name="destination_window" />
     <field type="INT16" name="x_offset" />
@@ -98,7 +98,7 @@ authorization from the authors.
   </request>
 
   <request name="Offset" opcode="4">
-    <field type="SHAPE_KIND" name="destination_kind" />
+    <field type="KIND" name="destination_kind" />
     <pad bytes="3" />
     <field type="WINDOW" name="destination_window" />
     <field type="INT16" name="x_offset" />
@@ -137,7 +137,7 @@ authorization from the authors.
 
   <request name="GetRectangles" opcode="8">
     <field type="WINDOW" name="window" />
-    <field type="SHAPE_KIND" name="source_kind" />
+    <field type="KIND" name="source_kind" />
     <reply>
       <field type="BYTE" name="ordering" />
       <field type="CARD32" name="rectangles_len" />