The Great XCB Renaming

[free-sw/xcb/proto] / src / extensions / xfixes.xml

diff --git a/src/extensions/xfixes.xml b/src/extensions/xfixes.xml
index ab59637..9bd14e3 100644 (file)
--- a/src/extensions/xfixes.xml
+++ b/src/extensions/xfixes.xml
@@ -24,7 +24,7 @@ institutions shall not be used in advertising or otherwise to promote the
 sale, use or other dealings in this Software without prior written
 authorization from the authors.
 -->
-<!-- This file describes version 3 of XFixes. -->
+<!-- This file describes version 4 of XFixes. -->
 <xcb header="xfixes" extension-xname="XFIXES" extension-name="XFixes">
   <import>render</import>
   <import>shape</import>
@@ -71,15 +71,9 @@ authorization from the authors.
   </enum>
 
   <enum name="SelectionEventMask">
-    <item name="SetSelectionOwner">
-      <op op="&lt;&lt;"><value>1</value><value>0</value></op>
-    </item>
-    <item name="SelectionWindowDestroy">
-      <op op="&lt;&lt;"><value>1</value><value>1</value></op>
-    </item>
-    <item name="SelectionClientClose">
-      <op op="&lt;&lt;"><value>1</value><value>2</value></op>
-    </item>
+    <item name="SetSelectionOwner">     <bit>0</bit></item>
+    <item name="SelectionWindowDestroy"><bit>1</bit></item>
+    <item name="SelectionClientClose">  <bit>2</bit></item>
   </enum>
 
   <event name="SelectionNotify" number="0">
@@ -103,9 +97,7 @@ authorization from the authors.
   </enum>
 
   <enum name="CursorNotifyMask">
-    <item name="DisplayCursor">
-      <op op="&lt;&lt;"><value>1</value><value>0</value></op>
-    </item>
+    <item name="DisplayCursor"><bit>0</bit></item>
   </enum>
 
   <event name="CursorNotify" number="1">
@@ -161,7 +153,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" />
     <pad bytes="3" />
   </request>
 
@@ -243,7 +235,7 @@ authorization from the authors.
 
   <request name="SetWindowShapeRegion" opcode="21">
     <field type="WINDOW"     name="dest" />
-    <field type="SHAPE_KIND" name="dest_kind" />
+    <field type="shape:KIND" name="dest_kind" />
     <pad bytes="3" />
     <field type="INT16"      name="x_offset" />
     <field type="INT16"      name="y_offset" />
@@ -319,4 +311,13 @@ authorization from the authors.
     <field type="CARD16" name="top" />
     <field type="CARD16" name="bottom" />
   </request>
+  
+  <!-- Version 4 -->
+  <request name="HideCursor" opcode="29">
+    <field type="WINDOW" name="window" />
+  </request>
+
+  <request name="ShowCursor" opcode="30">
+    <field type="WINDOW" name="window" />
+  </request>
 </xcb>