X-Git-Url: http://git.demorecorder.com/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fxinput.xml;h=bc10d06f7f103a36d6a2ca6035859b0f485780fc;hb=907c9246777b189506858fad6a5e970336fdcce0;hp=a80210cba04fe2afe7b90c447fd77af41df47d6f;hpb=d4daeb1dcc5da665d0c54ee262c3a80875e5ef2d;p=free-sw%2Fxcb%2Fproto

diff --git a/src/xinput.xml b/src/xinput.xml
index a80210c..bc10d06 100644
--- a/src/xinput.xml
+++ b/src/xinput.xml
@@ -57,13 +57,21 @@ authorization from the authors.
 	    <pad bytes="1" />
 	    <field type="CARD16" name="server_major" />
 	    <field type="CARD16" name="server_minor" />
-	    <field type="CARD8" name="present" />
+	    <field type="BOOL" name="present" />
 	    <pad bytes="19" />
 	</reply>
     </request>
 
     <!-- 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="INT32" name="minimum" />
+	<field type="INT32" 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>
@@ -851,7 +851,6 @@ authorization from the authors.
 	<list type="CARD32" name="resolution_values">
 	    <fieldref>num_valuators</fieldref>
 	</list>
-	<pad bytes="2" />
     </struct>
 
     <struct name="DeviceAbsCalibCtl">
@@ -992,4 +991,12 @@ authorization from the authors.
         <field type="CARD16" name="control" />
 	<pad bytes="20" />
     </event>
+
+    <!-- ERRORS -->
+    <error name="Device" number="0" />
+    <error name="Event" number="1" />
+    <error name="Mode" number="2" />
+    <error name="DeviceBusy" number="3" />
+    <error name="Class" number="4" />
+
 </xcb>