X-Git-Url: http://git.demorecorder.com/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fxfixes.xml;h=7b9be170b13348aee5f1fa7fd248d891c84c72e2;hb=99cea12515da556b763f2a32b4b2dfa937552a20;hp=203c2a8585e64418397f8dfa68dcf0f66e206c4e;hpb=ea93d1b25b470d01931bc16130d3933b4b80498f;p=free-sw%2Fxcb%2Fproto

diff --git a/src/xfixes.xml b/src/xfixes.xml
index 203c2a8..7b9be17 100644
--- a/src/xfixes.xml
+++ b/src/xfixes.xml
@@ -26,7 +26,7 @@ authorization from the authors.
 -->
 <!-- This file describes version 4 of XFixes. -->
 <xcb header="xfixes" extension-xname="XFIXES" extension-name="XFixes"
-    major-version="4" minor-version="0">
+    major-version="5" minor-version="0">
   <import>xproto</import>
   <import>render</import>
   <import>shape</import>
@@ -59,9 +59,9 @@ authorization from the authors.
   </enum>
 
   <request name="ChangeSaveSet" opcode="1">
-    <field type="BYTE" name="mode" />   <!-- SaveSetMode -->
-    <field type="BYTE" name="target" /> <!-- SaveSetTarget -->
-    <field type="BYTE" name="map" />    <!-- SaveSetMapping -->
+    <field type="BYTE" name="mode"   enum="SaveSetMode" />
+    <field type="BYTE" name="target" enum="SaveSetTarget" />
+    <field type="BYTE" name="map"    enum="SaveSetMapping" />
     <pad bytes="1" />
     <field type="WINDOW" name="window" />
   </request>
@@ -79,7 +79,7 @@ authorization from the authors.
   </enum>
 
   <event name="SelectionNotify" number="0">
-    <field type="CARD8"     name="subtype" /> <!-- SelectionEvent -->
+    <field type="CARD8"     name="subtype" enum="SelectionEvent" />
     <field type="WINDOW"    name="window" />
     <field type="WINDOW"    name="owner" />
     <field type="ATOM"      name="selection" />
@@ -91,7 +91,7 @@ authorization from the authors.
   <request name="SelectSelectionInput" opcode="2">
     <field type="WINDOW" name="window" />
     <field type="ATOM"   name="selection" />
-    <field type="CARD32" name="event_mask" /> <!-- SelectionEventMask -->
+    <field type="CARD32" name="event_mask" mask="SelectionEventMask" />
   </request>
 
   <enum name="CursorNotify">
@@ -103,17 +103,17 @@ authorization from the authors.
   </enum>
 
   <event name="CursorNotify" number="1">
-    <field type="CARD8"     name="subtype" /> <!-- CursorNotify -->
+    <field type="CARD8"     name="subtype" enum="CursorNotify" />
     <field type="WINDOW"    name="window" />
     <field type="CARD32"    name="cursor_serial" />
     <field type="TIMESTAMP" name="timestamp" />
-    <field type="ATOM"      name="name" /> <!-- Added in version 2 -->
+    <field type="ATOM"      name="name" altenum="Atom" /> <!-- Added in version 2 -->
     <pad bytes="12" />
   </event>
 
   <request name="SelectCursorInput" opcode="3">
     <field type="WINDOW" name="window" />
-    <field type="CARD32" name="event_mask" /> <!-- CursorNotifyMask -->
+    <field type="CARD32" name="event_mask" mask="CursorNotifyMask" />
   </request>
 
   <request name="GetCursorImage" opcode="4">
@@ -142,6 +142,10 @@ authorization from the authors.
 
   <error name="BadRegion" number="0" />
 
+  <enum name="Region">
+    <item name="None" />
+  </enum>
+
   <request name="CreateRegion" opcode="5">
     <field type="REGION"    name="region" />
     <list  type="RECTANGLE" name="rectangles" />
@@ -155,7 +159,7 @@ authorization from the authors.
   <request name="CreateRegionFromWindow" opcode="7">
     <field type="REGION"     name="region" />
     <field type="WINDOW"     name="window" />
-    <field type="shape:KIND" name="kind" />
+    <field type="shape:KIND" name="kind"   enum="SK" />
     <pad bytes="3" />
   </request>
 
@@ -224,29 +228,34 @@ authorization from the authors.
       <pad bytes="1" />
       <field type="RECTANGLE" name="extents" />
       <pad bytes="16" />
-      <list  type="RECTANGLE" name="rectangles" />
+      <list  type="RECTANGLE" name="rectangles">
+	<op op='/'>
+		<fieldref>length</fieldref>
+		<value>2</value>
+	</op>
+      </list>
     </reply>
   </request>
 
   <request name="SetGCClipRegion" opcode="20">
     <field type="GCONTEXT" name="gc" />
-    <field type="REGION"   name="region" />
+    <field type="REGION"   name="region" altenum="Region" />
     <field type="INT16"    name="x_origin" />
     <field type="INT16"    name="y_origin" />
   </request>
 
   <request name="SetWindowShapeRegion" opcode="21">
     <field type="WINDOW"     name="dest" />
-    <field type="shape:KIND" name="dest_kind" />
+    <field type="shape:KIND" name="dest_kind" enum="SK" />
     <pad bytes="3" />
     <field type="INT16"      name="x_offset" />
     <field type="INT16"      name="y_offset" />
-    <field type="REGION"     name="region" />
+    <field type="REGION"     name="region" altenum="Region" />
   </request>
 
   <request name="SetPictureClipRegion" opcode="22">
     <field type="PICTURE" name="picture" />
-    <field type="REGION"  name="region" />
+    <field type="REGION"  name="region" altenum="Region" />
     <field type="INT16"   name="x_origin" />
     <field type="INT16"   name="y_origin" />
   </request>
@@ -255,17 +264,17 @@ authorization from the authors.
     <field type="CURSOR" name="cursor" />
     <field type="CARD16" name="nbytes" />
     <pad bytes="2" />
-    <list  type="CARD8"  name="name"><fieldref>nbytes</fieldref></list>
+    <list  type="char"   name="name"><fieldref>nbytes</fieldref></list>
   </request>
 
   <request name="GetCursorName" opcode="24">
     <field type="CURSOR" name="cursor" />
     <reply>
       <pad bytes="1" />
-      <field type="ATOM"   name="atom" />
+      <field type="ATOM"   name="atom" altenum="Atom" />
       <field type="CARD16" name="nbytes" />
       <pad bytes="18" />
-      <list  type="CARD8"  name="name"><fieldref>nbytes</fieldref></list>
+      <list  type="char"   name="name"><fieldref>nbytes</fieldref></list>
     </reply>
   </request>
 
@@ -279,10 +288,10 @@ authorization from the authors.
       <field type="CARD16" name="xhot" />
       <field type="CARD16" name="yhot" />
       <field type="CARD32" name="cursor_serial" />
-      <field type="ATOM"   name="cursor_atom" />
+      <field type="ATOM"   name="cursor_atom" altenum="Atom" />
       <field type="CARD16" name="nbytes" />
       <pad bytes="2" />
-      <list  type="CARD8"  name="name"><fieldref>nbytes</fieldref></list>
+      <list  type="char"   name="name"><fieldref>nbytes</fieldref></list>
       <list  type="CARD32" name="cursor_image">
         <op op="*">
           <fieldref>width</fieldref>
@@ -301,7 +310,7 @@ authorization from the authors.
     <field type="CURSOR" name="src" />
     <field type="CARD16" name="nbytes" />
     <pad bytes="2" />
-    <list  type="CARD8"  name="name"><fieldref>nbytes</fieldref></list>
+    <list  type="char"   name="name"><fieldref>nbytes</fieldref></list>
   </request>
 
   <!-- Version 3 -->
@@ -322,4 +331,32 @@ authorization from the authors.
   <request name="ShowCursor" opcode="30">
     <field type="WINDOW" name="window" />
   </request>
+
+  <!-- Version 5 -->
+
+  <xidtype name="BARRIER" />
+
+  <enum name="BarrierDirections">
+    <item name="PositiveX"><bit>0</bit></item>
+    <item name="PositiveY"><bit>1</bit></item>
+    <item name="NegativeX"><bit>2</bit></item>
+    <item name="NegativeY"><bit>3</bit></item>
+  </enum>
+
+  <request name="CreatePointerBarrier" opcode="31">
+    <field type="BARRIER" name="barrier" />
+    <field type="WINDOW" name="window" />
+    <field type="CARD16" name="x1" />
+    <field type="CARD16" name="y1" />
+    <field type="CARD16" name="x2" />
+    <field type="CARD16" name="y2" />
+    <field type="CARD32" name="directions" mask="BarrierDirections" />
+    <pad bytes="2" />
+    <field type="CARD16" name="num_devices" />
+    <list type="CARD16" name="devices"><fieldref>num_devices</fieldref></list>
+  </request>
+
+  <request name="DeletePointerBarrier" opcode="32">
+    <field type="BARRIER" name="barrier" />
+  </request>
 </xcb>