[Xcb] [PATCH proto 7/7] xinput: req ListInputDevices: remove obsolete structs

Christian Linhart chris at demorecorder.com
Wed Sep 3 04:18:00 PDT 2014


Remove structs that are no longer needed because of modeling
this request/reply with new xml-constructs.

Removing these structs modifies the API but maybe it's still OK.
---
 src/xinput.xml | 26 --------------------------
 1 file changed, 26 deletions(-)

diff --git a/src/xinput.xml b/src/xinput.xml
index c9ed3ac..09297e5 100644
--- a/src/xinput.xml
+++ b/src/xinput.xml
@@ -178,46 +178,20 @@ <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" enum="DeviceUse" />
         <pad bytes="1" />
     </struct>
 
-    <struct name="KeyInfo">
-        <field type="CARD8"   name="class_id" enum="InputClass" />
-        <field type="CARD8"   name="len" />
-        <field type="KeyCode" name="min_keycode" />
-        <field type="KeyCode" name="max_keycode" />
-        <field type="CARD16"  name="num_keys" />
-        <pad bytes="2" />
-    </struct>
-
-    <struct name="ButtonInfo">
-        <field type="CARD8"  name="class_id" enum="InputClass" />
-        <field type="CARD8"  name="len" />
-        <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" enum="InputClass" />
-        <field type="CARD8"   name="len" />
-        <field type="CARD8"   name="axes_len" />
-        <field type="CARD8"   name="mode" enum="ValuatorMode" />
-        <field type="CARD32"  name="motion_size" />
-        <list type="AxisInfo" name="axes">
-            <fieldref>axes_len</fieldref>
-        </list>
-    </struct>
-
     <struct name="InputInfo">
         <field type="CARD8" name="class_id" enum="InputClass" />
         <field type="CARD8" name="len" />
         <switch name="info">
             <fieldref>class_id</fieldref>
             <case name="key">
                 <enumref ref="InputClass">Key</enumref>
-- 
2.0.1



More information about the Xcb mailing list