X-Git-Url: http://git.demorecorder.com/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Fxv.xml;h=8a4933c02b61b1cd4e837691d354c3665121b038;hb=57934caa3fb207320c33312646d8e98290950f51;hp=b232deaaa9f072debac4d3d1986c94dc53546e5e;hpb=b3423e67845cb6f2b858fb3f22295a5ef79821fb;p=free-sw%2Fxcb%2Fproto

diff --git a/src/xv.xml b/src/xv.xml
index b232dea..8a4933c 100644
--- a/src/xv.xml
+++ b/src/xv.xml
@@ -26,7 +26,7 @@ sale, use or other dealings in this Software without prior written
 authorization from the authors.
 -->
 
-<xcb header="xv" extension-xname="XVideo" extension-name="Xv">
+<xcb header="xv" extension-xname="XVideo" extension-name="Xv" major-version="2" minor-version="2">
     <import>xproto</import>
     <import>shm</import>
     <!-- Implements version 2.2 of XV -->
@@ -36,11 +36,11 @@ authorization from the authors.
     <xidtype name="ENCODING" />
 
     <enum name="Type">
-        <item name="InputMask"><value>0x00000001</value></item>
-        <item name="OutputMask"><value>0x00000002</value></item>
-        <item name="VideoMask"><value>0x00000004</value></item>
-        <item name="StillMask"><value>0x00000008</value></item>
-        <item name="ImageMask"><value>0x00000010</value></item>
+        <item name="InputMask"><bit>0</bit></item>
+        <item name="OutputMask"><bit>1</bit></item>
+        <item name="VideoMask"><bit>2</bit></item>
+        <item name="StillMask"><bit>3</bit></item>
+        <item name="ImageMask"><bit>4</bit></item>
     </enum>
 
     <enum name="ImageFormatInfoType">
@@ -54,8 +54,8 @@ authorization from the authors.
     </enum>
 
     <enum name="AttributeFlag">
-        <item name="Gettable"><value>0x01</value></item>
-        <item name="Settable"><value>0x02</value></item>
+        <item name="Gettable"><bit>0</bit></item>
+        <item name="Settable"><bit>1</bit></item>
     </enum>
     
     <struct name="Rational">
@@ -69,7 +69,7 @@ authorization from the authors.
         <field type="CARD16" name="num_ports" />
         <field type="CARD16" name="num_formats" />
         <field type="CARD8" name="type" />
-        <field type="CARD8" name="pad" />
+        <pad bytes="1" />
         <list type="char" name="name">
             <fieldref>name_size</fieldref>
         </list>
@@ -84,11 +84,12 @@ authorization from the authors.
         <field type="CARD16" name="name_size" />
         <field type="CARD16" name="width" />
         <field type="CARD16" name="height" />
-        <field type="Rational" name="rate" />
         <!--
-        Xvproto.h has a padding CARD16 here but the name
-        overlaps.
+        Some versions of Xvproto.h incorrectly have
+        this padding after "rate".
         -->
+        <pad bytes="2" />
+        <field type="Rational" name="rate" />
         <list type="char" name="name">
             <fieldref>name_size</fieldref>
         </list>
@@ -97,6 +98,7 @@ authorization from the authors.
     <struct name="Format">
         <field type="VISUALID" name="visual" />
         <field type="CARD8" name="depth" />
+        <pad bytes="3" />
     </struct>
 
     <struct name="Image">
@@ -131,22 +133,20 @@ authorization from the authors.
         <field type="CARD32" name="id" />
         <field type="CARD8" name="type" />
         <field type="CARD8" name="byte_order" />
-        <field type="CARD16" name="pad1" />
+        <pad bytes="2" />
         <list type="CARD8" name="guid">
             <value>16</value>
         </list>
         <field type="CARD8" name="bpp" />
         <field type="CARD8" name="num_planes" />
-        <field type="CARD16" name="pad2" />
+        <pad bytes="2" />
         <field type="CARD8" name="depth" />
-        <field type="CARD8" name="pad3" />
-        <field type="CARD16" name="pad4" />
+        <pad bytes="3" />
         <field type="CARD32" name="red_mask" />
         <field type="CARD32" name="green_mask" />
         <field type="CARD32" name="blue_mask" />
         <field type="CARD8" name="format" />
-        <field type="CARD8" name="pad5" />
-        <field type="CARD16" name="pad6" />
+        <pad bytes="3" />
         <field type="CARD32" name="y_sample_bits" />
         <field type="CARD32" name="u_sample_bits" />
         <field type="CARD32" name="v_sample_bits" />
@@ -160,10 +160,7 @@ authorization from the authors.
             <value>32</value>
         </list>
         <field type="CARD8" name="vscanline_order" />
-        <field type="CARD8" name="vpad7" />
-        <field type="CARD16" name="vpad8" />
-        <field type="CARD32" name="vpad9" />
-        <field type="CARD32" name="vpad10" />
+        <pad bytes="11" />
     </struct>
 
 
@@ -306,7 +303,7 @@ authorization from the authors.
     </request>
 
     <request name="SelectPortNotify" opcode="11">
-        <field type="DRAWABLE" name="drawable" />
+        <field type="PORT" name="port" />
         <field type="BOOL" name="onoff" />
     </request>
 
@@ -402,10 +399,7 @@ authorization from the authors.
         <field type="CARD16" name="drw_h" />
         <field type="CARD16" name="width" />
         <field type="CARD16" name="height" />
-        <localfield type="CARD32" name="data_size" />
-        <list type="CARD8" name="data">
-            <fieldref>data_size</fieldref>
-        </list>
+	<list type="CARD8" name="data" />
     </request>
 
     <request name="ShmPutImage" opcode="19">