X-Git-Url: http://git.demorecorder.com/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fxinput.xml;h=cd1a397886a575c4253a9a406225f9a62f1ac5bc;hb=e84ef3fc4b451a395605c03f22100f185052904e;hp=464d2d93b56fe8162afd5d1d7a434832a93f27a4;hpb=37f4ea687f129679ca555f0644d4d0fafc8b9765;p=free-sw%2Fxcb%2Fproto

diff --git a/src/xinput.xml b/src/xinput.xml
index 464d2d9..cd1a397 100644
--- a/src/xinput.xml
+++ b/src/xinput.xml
@@ -34,6 +34,7 @@ authorization from the authors.
 
 <xcb header="xinput" extension-xname="XInputExtension" extension-name="Input"
      major-version="2" minor-version="3">
+    <import>xfixes</import>
     <import>xproto</import>
 
     <!-- ⋅⋅⋅ Types (v1.0) ⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅ -->
@@ -51,10 +52,6 @@ authorization from the authors.
         <field type="CARD32" name="frac" />
     </struct>
 
-    <!-- ⋅⋅⋅ Types (v2.3) ⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅ -->
-
-    <typedef oldname="CARD32" newname="Barrier" />
-
     <!-- ⋅⋅⋅ Requests (v1.0) ⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅ -->
 
     <!-- GetExtensionVersion -->
@@ -1714,7 +1711,7 @@ authorization from the authors.
     <struct name="BarrierReleasePointerInfo">
         <field type="DeviceId" name="deviceid" />
         <pad bytes="2" />
-        <field type="Barrier"  name="barrier" />
+        <field type="BARRIER"  name="barrier" />
         <field type="CARD32"   name="eventid" />
     </struct>
 
@@ -2183,7 +2180,7 @@ authorization from the authors.
         <field type="CARD32"    name="eventid" />
         <field type="WINDOW"    name="root" />
         <field type="WINDOW"    name="event" />
-        <field type="Barrier"   name="barrier" />
+        <field type="BARRIER"   name="barrier" />
         <!-- 32 byte boundary -->
         <field type="CARD32"    name="dtime" />
         <field type="CARD32"    name="flags" />