Change CARD8 to char when referring to a string in xfixes.xml

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

diff --git a/src/xinput.xml b/src/xinput.xml
index a80210c..89f3459 100644 (file)
--- 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>
@@ -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">