XFree86 4.3.0.1

diff --git a/XI.h b/XI.h
index bb4cec1..ea162fa 100644 (file)
--- a/XI.h
+++ b/XI.h
@@ -45,6 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ********************************************************/
+/* $XFree86: xc/include/extensions/XI.h,v 1.5 2001/12/14 19:53:28 dawes Exp $ */
 
 /* Definitions used by the server, library and client */
 
@@ -203,6 +204,12 @@ SOFTWARE.
 #define DeviceMode              (1L << 0)
 #define Relative                0
 #define Absolute                1
+/* Merged from Metrolink tree for XINPUT stuff */
+#define TS_Raw                                 57
+#define TS_Scaled                              58
+#define SendCoreEvents                 59
+#define DontSendCoreEvents             60
+/* End of merged section       */
 
 #define ProximityState          (1L << 1)
 #define InProximity             (0L << 1)

diff --git a/XInput.h b/XInput.h
index 2470377..83aba0c 100644 (file)
--- a/XInput.h
+++ b/XInput.h
@@ -45,19 +45,15 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ********************************************************/
+/* $XFree86: xc/include/extensions/XInput.h,v 1.3 2001/12/14 19:53:28 dawes Exp $ */
 
 /* Definitions used by the library and client */
 
 #ifndef _XINPUT_H_
 #define _XINPUT_H_
 
-#ifndef _XLIB_H_
 #include <X11/Xlib.h>
-#endif
-
-#ifndef _XI_H_
-#include "XI.h"
-#endif
+#include <X11/extensions/XI.h>
 
 #define _deviceKeyPress                0
 #define _deviceKeyRelease      1

diff --git a/XIproto.h b/XIproto.h
index f13d990..0dbe4d2 100644 (file)
--- 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.