X-Git-Url: http://git.demorecorder.com/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fxv.xml;h=fb15d893db37f1c426dcba4712d5f682949584b6;hb=c8129e1f19ceb2002c9764b94f03564600f13a8f;hp=bbaa4eb3dcecd1a78b586d0640acd59b6c47d999;hpb=854d08c8242e8fbe7b5a000b75ec6845419806c4;p=free-sw%2Fxcb%2Fproto

diff --git a/src/xv.xml b/src/xv.xml
index bbaa4eb..fb15d89 100644
--- a/src/xv.xml
+++ b/src/xv.xml
@@ -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>
 
 
@@ -303,11 +300,13 @@ authorization from the authors.
     <request name="SelectVideoNotify" opcode="10">
         <field type="DRAWABLE" name="drawable" />
         <field type="BOOL" name="onoff" />
+        <pad bytes="3" />
     </request>
 
     <request name="SelectPortNotify" opcode="11">
-        <field type="DRAWABLE" name="drawable" />
+        <field type="PORT" name="port" />
         <field type="BOOL" name="onoff" />
+        <pad bytes="3" />
     </request>
 
     <request name="QueryBestSize" opcode="12">
@@ -317,6 +316,7 @@ authorization from the authors.
         <field type="CARD16" name="drw_w" />
         <field type="CARD16" name="drw_h" />
         <field type="BOOL" name="motion" />
+        <pad bytes="3" />
         <reply>
             <pad bytes="1" />
             <field type="CARD16" name="actual_width" />
@@ -423,5 +423,6 @@ authorization from the authors.
         <field type="CARD16" name="width" />
         <field type="CARD16" name="height" />
         <field type="CARD8" name="send_event" />
+        <pad bytes="3" />
     </request>
 </xcb>