XFree86 4.3.0.1xf86-4_3_0_1PRE_xf86-4_3_0_1

1 files changed, 17 insertions, 0 deletions

diff --git a/XIproto.h b/XIproto.h
index f13d990..0dbe4d2 100644
--- a/XIproto.h
+++ b/XIproto.h
@@ -45,6 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ********************************************************/
+/* $XFree86: xc/include/extensions/XIproto.h,v 1.5 2001/12/14 19:53:28 dawes Exp $ */
 
 #ifndef _XIPROTO_H
 #define _XIPROTO_H
@@ -1331,6 +1332,22 @@ typedef struct {
     CARD8  	pad1,pad2;
 } xDeviceResolutionCtl;
 
+
+/* Merged from Metrolink tree for XINPUT stuff	*/
+
+typedef struct {
+     CARD16         control;
+     CARD16         length;
+     CARD32         min_x;
+     CARD32         max_x;
+     CARD32         min_y;
+     CARD32         max_y;
+     CARD32         button_threshold;
+} xDeviceTSCalibrationCtl;
+
+/* End of merged section	*/
+
+
 /**********************************************************
  *
  * Input extension events.