[Xcb-commit] 3 commits - src

[Julien Danjou]

 src/xinput.xml |   38 +++++++++++++++++++-------------------
 src/xprint.xml |    3 ++-
 src/xv.xml     |   12 ++++++------
 3 files changed, 27 insertions(+), 26 deletions(-)

New commits:
commit b5553dfd705e9a7cc23ce92fc9f94bf076278954
Author: Peter Harris <peter.harris at hummingbird.com>
Date:   Thu Oct 16 19:04:40 2008 -0400

    Move the defintion of STRING8 above its first use in xprint.xml
    
    Signed-off-by: Julien Danjou <julien at danjou.info>

diff --git a/src/xprint.xml b/src/xprint.xml
index 0dcff1d..ffd8df1 100644
--- a/src/xprint.xml
+++ b/src/xprint.xml
@@ -33,6 +33,8 @@ authorization from the authors.
 
     <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">
commit 6a901fb9a684d9980e78789e2993c4a42946d4cd
Author: Peter Harris <peter.harris at hummingbird.com>
Date:   Thu Oct 16 18:58:38 2008 -0400

    Move structures above their first uses in xinput.xml
    
    This change makes it easier to process the xml file in a single streamy pass.
    
    Signed-off-by: Julien Danjou <julien at danjou.info>

diff --git a/src/xinput.xml b/src/xinput.xml
index 2405308..89f3459 100644
--- a/src/xinput.xml
+++ b/src/xinput.xml
@@ -64,6 +64,14 @@ authorization from the authors.
 
     <!-- ListInputDevices -->
 
+    <struct name="DeviceInfo">
+	<field type="ATOM" name="device_type" />
+	<field type="CARD8" name="device_id" />
+	<field type="CARD8" name="num_class_info" />
+	<field type="CARD8" name="device_use" />
+	<pad bytes="1" />
+    </struct>
+
     <request name="ListInputDevices" opcode="2">
 	<reply>
 	    <pad bytes="1" />
@@ -77,14 +85,6 @@ authorization from the authors.
 	</reply>
     </request>
 
-    <struct name="DeviceInfo">
-	<field type="ATOM" name="device_type" />
-	<field type="CARD8" name="device_id" />
-	<field type="CARD8" name="num_class_info" />
-	<field type="CARD8" name="device_use" />
-	<pad bytes="1" />
-    </struct>
-
     <enum name="DeviceUse">
 	<item name="IsXPointer"><value>0</value></item>
 	<item name="IsXKeyboard"><value>1</value></item>
@@ -113,6 +113,12 @@ authorization from the authors.
 	<field type="CARD16" name="num_buttons" />
     </struct>
 
+    <struct name="AxisInfo">
+	<field type="CARD32" name="resolution" />
+	<field type="CARD32" name="minimum" />
+	<field type="CARD32" name="maximum" />
+    </struct>
+
     <struct name="ValuatorInfo">
 	<field type="CARD8" name="class_id" />
 	<field type="CARD8" name="len" />
@@ -124,14 +130,13 @@ authorization from the authors.
 	</list>
     </struct>
 
-    <struct name="AxisInfo">
-	<field type="CARD32" name="resolution" />
-	<field type="CARD32" name="minimum" />
-	<field type="CARD32" name="maximum" />
-    </struct>
-
     <!-- OpenDevice -->
 
+    <struct name="InputClassInfo">
+	<field type="CARD8" name="class_id" />
+	<field type="CARD8" name="event_type_base" />
+    </struct>
+
     <request name="OpenDevice" opcode="3">
 	<field type="CARD8" name="device_id" />
 	<pad bytes="3" />
@@ -145,11 +150,6 @@ authorization from the authors.
 	</reply>
     </request>
 
-    <struct name="InputClassInfo">
-	<field type="CARD8" name="class_id" />
-	<field type="CARD8" name="event_type_base" />
-    </struct>
-
     <enum name="InputClass">
 	<item name="Key"><value>0</value></item>
 	<item name="Button"><value>1</value></item>
commit b7ca344b92a34953c3617a2819f0848d28e11502
Author: Peter Harris <peter.harris at hummingbird.com>
Date:   Thu Oct 16 18:40:00 2008 -0400

    Move Format above its first use in xv.xml
    
    This change makes it easier to process the xml file in a single streamy
    pass.
    
    Signed-off-by: Julien Danjou <julien at danjou.info>

diff --git a/src/xv.xml b/src/xv.xml
index fb15d89..26047a6 100644
--- a/src/xv.xml
+++ b/src/xv.xml
@@ -63,6 +63,12 @@ authorization from the authors.
         <field type="INT32" name="denominator" />
     </struct>
 
+    <struct name="Format">
+        <field type="VISUALID" name="visual" />
+        <field type="CARD8" name="depth" />
+        <pad bytes="3" />
+    </struct>
+
     <struct name="AdaptorInfo">
         <field type="PORT" name="base_id" />
         <field type="CARD16" name="name_size" />
@@ -95,12 +101,6 @@ authorization from the authors.
         </list>
     </struct>
 
-    <struct name="Format">
-        <field type="VISUALID" name="visual" />
-        <field type="CARD8" name="depth" />
-        <pad bytes="3" />
-    </struct>
-
     <struct name="Image">
         <field type="CARD32" name="id" />
         <field type="CARD16" name="width" />