xinput: update TODO: remove parametrized structs

[free-sw/xcb/proto] / src / xprint.xml

diff --git a/src/xprint.xml b/src/xprint.xml
index 040b353..e32293f 100644 (file)
--- a/src/xprint.xml
+++ b/src/xprint.xml
@@ -27,12 +27,14 @@ authorization from the authors.
 -->
 
 <xcb header="xprint" extension-xname="XpExtension" extension-name="XPrint"
-    major-version="1" minor-version="0">
+    extension-multiword="true" major-version="1" minor-version="0">
 
     <!-- Conforms to XPRINT 1.0 -->
 
     <import>xproto</import>
     
+    <typedef oldname="char" newname="STRING8" />
+
     <!-- Types -->
     <struct name="PRINTER">
         <field type="CARD32" name="nameLen" />
@@ -49,7 +51,6 @@ authorization from the authors.
 
     <!--<typedef oldname="CARD32" newname="PCONTEXT" />-->
     <xidtype name="PCONTEXT" />
-    <typedef oldname="char" newname="STRING8" />
 
     <!-- "PrintGetDocumentData" -->
     <enum name="GetDoc">
@@ -59,9 +60,9 @@ authorization from the authors.
 
     <!-- Event Mask ("PrintSelectInput") -->
     <enum name="EvMask">
-        <item name="NoEventMask"><value>0x00000000</value></item>
-        <item name="PrintMask"><value>0x00000001</value></item>
-        <item name="AttributeMask"><value>0x00000002</value></item>
+        <item name="NoEventMask"><value>0</value></item>
+        <item name="PrintMask"><bit>0</bit></item>
+        <item name="AttributeMask"><bit>1</bit></item>
     </enum>
 
     <!-- "PrintNotify" detail -->
@@ -234,7 +235,9 @@ authorization from the authors.
             <pad bytes="1" />
             <field type="CARD32" name="stringLen" />
             <pad bytes="20" />
-            <field type="STRING8" name="attributes" />
+            <list type="STRING8" name="attributes">
+                <fieldref>stringLen</fieldref>
+            </list>
         </reply>
     </request>