X-Git-Url: http://git.demorecorder.com/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fsync.xml;h=8a5194752b16b38218af1eac27f1a5713f7d60f2;hb=e6a246e50e62cbcba33d0e1d2371e69e6e089383;hp=6efca36735b528793f435e25a193a872cdddc4c3;hpb=b3423e67845cb6f2b858fb3f22295a5ef79821fb;p=free-sw%2Fxcb%2Fproto

diff --git a/src/sync.xml b/src/sync.xml
index 6efca36..8a51947 100644
--- a/src/sync.xml
+++ b/src/sync.xml
@@ -4,7 +4,8 @@ Copyright (C) 2004 Mikko Torni and Josh Triplett.
 All Rights Reserved.  See the file COPYING in this directory
 for licensing information.
 -->
-<xcb header="sync" extension-xname="SYNC" extension-name="Sync">
+<xcb header="sync" extension-xname="SYNC" extension-name="Sync"
+    major-version="3" minor-version="1">
   <import>xproto</import>
 
   <xidtype name="ALARM" />
@@ -17,6 +18,8 @@ for licensing information.
 
   <xidtype name="COUNTER" />
 
+  <xidtype name="FENCE" />
+
   <enum name="TESTTYPE">
     <item name="PositiveTransition" />
     <item name="NegativeTransition" />
@@ -47,16 +50,16 @@ for licensing information.
     <field type="COUNTER" name="counter" />
     <field type="INT64" name="resolution" />
     <field type="CARD16" name="name_len" />
-    <list type="CARD8" name="name">
+    <list type="char" name="name">
       <fieldref>name_len</fieldref>
     </list>
   </struct>
 
   <struct name="TRIGGER">
     <field type="COUNTER" name="counter" />
-    <field type="VALUETYPE" name="wait_type" />
+    <field type="CARD32" name="wait_type" enum="VALUETYPE" />
     <field type="INT64" name="wait_value" />
-    <field type="TESTTYPE" name="test_type" />
+    <field type="CARD32" name="test_type" enum="TESTTYPE" />
   </struct>
 
   <struct name="WAITCONDITION">
@@ -77,10 +80,13 @@ for licensing information.
   </error>
     
   <request name="Initialize" opcode="0">
+    <field type="CARD8" name="desired_major_version" />
+    <field type="CARD8" name="desired_minor_version" />
     <reply>
       <pad bytes="1" />
       <field type="CARD8" name="major_version" />
       <field type="CARD8" name="minor_version" />
+      <pad bytes="22" />
     </reply>
   </request>
 
@@ -128,16 +134,66 @@ for licensing information.
 
   <request name="CreateAlarm" opcode="8">
     <field type="ALARM" name="id" />
-    <valueparam value-mask-type="CARD32"
-                value-mask-name="value_mask"
-                value-list-name="value_list" />
+    <field type="CARD32" name="value_mask" mask="CA" />
+    <switch name="value_list">
+      <fieldref>value_mask</fieldref>
+      <bitcase>
+        <enumref ref="CA">Counter</enumref>
+        <field type="COUNTER" name="counter" />
+      </bitcase>
+      <bitcase>
+        <enumref ref="CA">ValueType</enumref>
+        <field type="CARD32" name="valueType" mask="VALUETYPE" />
+      </bitcase>
+      <bitcase>
+        <enumref ref="CA">Value</enumref>
+        <field type="INT64" name="value" />
+      </bitcase>
+      <bitcase>
+        <enumref ref="CA">TestType</enumref>
+        <field type="CARD32" name="testType" mask="TESTTYPE" />
+      </bitcase>
+      <bitcase>
+        <enumref ref="CA">Delta</enumref>
+        <field type="INT64" name="delta" />
+      </bitcase>
+      <bitcase>
+        <enumref ref="CA">Events</enumref>
+        <field type="CARD32" name="events" />
+      </bitcase>
+    </switch>
   </request>
 
   <request name="ChangeAlarm" opcode="9">
     <field type="ALARM" name="id" />
-    <valueparam value-mask-type="CARD32"
-                value-mask-name="value_mask"
-                value-list-name="value_list" />
+    <field type="CARD32" name="value_mask" mask="CA" />
+    <switch name="value_list">
+      <fieldref>value_mask</fieldref>
+      <bitcase>
+        <enumref ref="CA">Counter</enumref>
+        <field type="COUNTER" name="counter" />
+      </bitcase>
+      <bitcase>
+        <enumref ref="CA">ValueType</enumref>
+        <field type="CARD32" name="valueType" mask="VALUETYPE" />
+      </bitcase>
+      <bitcase>
+        <enumref ref="CA">Value</enumref>
+        <field type="INT64" name="value" />
+      </bitcase>
+      <bitcase>
+        <enumref ref="CA">TestType</enumref>
+        <field type="CARD32" name="testType" mask="TESTTYPE" />
+      </bitcase>
+      <bitcase>
+        <enumref ref="CA">Delta</enumref>
+        <field type="INT64" name="delta" />
+      </bitcase>
+      <bitcase>
+        <enumref ref="CA">Events</enumref>
+        <field type="CARD32" name="events" />
+      </bitcase>
+    </switch>
   </request>
 
   <request name="DestroyAlarm" opcode="11">
@@ -151,7 +207,8 @@ for licensing information.
       <field type="TRIGGER" name="trigger" />
       <field type="INT64" name="delta" />
       <field type="BOOL" name="events" />
-      <field type="ALARMSTATE" name="state" />
+      <field type="CARD8" name="state" enum="ALARMSTATE" />
+      <pad bytes="2" />
     </reply>
   </request>
 
@@ -168,6 +225,37 @@ for licensing information.
     </reply>
   </request>
 
+  <request name="CreateFence" opcode="14">
+    <field type="DRAWABLE" name="drawable" />
+    <field type="FENCE" name="fence" />
+    <field type="BOOL" name="initially_triggered" />
+  </request>
+
+  <request name="TriggerFence" opcode="15">
+    <field type="FENCE" name="fence" />
+  </request>
+
+  <request name="ResetFence" opcode="16">
+    <field type="FENCE" name="fence" />
+  </request>
+
+  <request name="DestroyFence" opcode="17">
+    <field type="FENCE" name="fence" />
+  </request>
+
+  <request name="QueryFence" opcode="18">
+    <field type="FENCE" name="fence" />
+    <reply>
+      <pad bytes="1" />
+      <field type="BOOL" name="triggered" />
+      <pad bytes="23" />
+    </reply>
+  </request>
+
+  <request name="AwaitFence" opcode="19">
+    <list type="FENCE" name="fence_list" />
+  </request>
+
   <event name="CounterNotify" number="0">
     <field type="CARD8" name="kind" />
     <field type="COUNTER" name="counter" />
@@ -176,6 +264,7 @@ for licensing information.
     <field type="TIMESTAMP" name="timestamp" />
     <field type="CARD16" name="count" />
     <field type="BOOL" name="destroyed" />
+    <pad bytes="1" />
   </event>
 
   <event name="AlarmNotify" number="1">
@@ -184,5 +273,7 @@ for licensing information.
     <field type="INT64" name="counter_value" />
     <field type="INT64" name="alarm_value" />
     <field type="TIMESTAMP" name="timestamp" />
+    <field type="CARD8" name="state" enum="ALARMSTATE" />
+    <pad bytes="3" />
   </event>
 </xcb>