DEVICE_TOUCHPAD -> DEVICE_ABS_CALIB.

As it's really calibration for absolute devices, add some stuff.

DEVICE_ABS_AREA

Defines the area of the screen that an absolute device covers if it is sending
core events.

3 files changed, 55 insertions, 12 deletions

diff --git a/XI.h b/XI.h
index 1cfac91..fbecd80 100644
--- a/XI.h
+++ b/XI.h
@@ -158,9 +158,10 @@ SOFTWARE.
 #define XI_Add_DevicePresenceNotify_Minor	4
 
 #define DEVICE_RESOLUTION	1
-#define DEVICE_TOUCHSCREEN      2
+#define DEVICE_ABS_CALIB        2
 #define DEVICE_CORE             3
 #define DEVICE_ENABLE           4
+#define DEVICE_ABS_AREA         5
 
 #define NoSuchExtension		1
 
diff --git a/XInput.h b/XInput.h
index 3cc7d31..528e442 100644
--- a/XInput.h
+++ b/XInput.h
@@ -664,8 +664,22 @@ typedef struct {
     int             max_x;
     int             min_y;
     int             max_y;
+    int             flip_x;
+    int             flip_y;
+    int             rotation;
     int             button_threshold;
-} XDeviceTSControl, XDeviceTSState;
+} XDeviceAbsCalibControl, XDeviceAbsCalibState;
+
+typedef struct {
+    XID             control;
+    int             length;
+    int             offset_x;
+    int             offset_y;
+    int             width;
+    int             height;
+    int             screen;
+    XID             following;
+} XDeviceAbsAreaControl, XDeviceAbsAreaState;
 
 typedef struct {
     XID             control;
diff --git a/XIproto.h b/XIproto.h
index c1b6202..139d828 100644
--- a/XIproto.h
+++ b/XIproto.h
@@ -1294,12 +1294,26 @@ typedef struct {
 typedef struct {
      CARD16         control B16;
      CARD16         length B16;
-     CARD32         min_x;
-     CARD32         max_x;
-     CARD32         min_y;
-     CARD32         max_y;
+     INT32          min_x;
+     INT32          max_x;
+     INT32          min_y;
+     INT32          max_y;
+     CARD32         flip_x;
+     CARD32         flip_y;
+     CARD32         rotation;
      CARD32         button_threshold;
-} xDeviceTSState;
+} xDeviceAbsCalibState;
+
+typedef struct {
+     CARD16         control B16;
+     CARD16         length B16;
+     CARD32         offset_x;
+     CARD32         offset_y;
+     CARD32         width;
+     CARD32         height;
+     CARD32         screen;
+     CARD32         following;
+} xDeviceAbsAreaState;
 
 typedef struct {
     CARD16      control B16;            /* control type                 */
@@ -1362,12 +1376,26 @@ typedef struct {
 typedef struct {
      CARD16         control B16;
      CARD16         length B16;
-     CARD32         min_x;
-     CARD32         max_x;
-     CARD32         min_y;
-     CARD32         max_y;
+     INT32          min_x;
+     INT32          max_x;
+     INT32          min_y;
+     INT32          max_y;
+     CARD32         flip_x;
+     CARD32         flip_y;
+     CARD32         rotation;
      CARD32         button_threshold;
-} xDeviceTSCtl;
+} xDeviceAbsCalibCtl;
+
+typedef struct {
+     CARD16         control B16;
+     CARD16         length B16;
+     CARD32         offset_x;
+     CARD32         offset_y;
+     INT32          width;
+     INT32          height;
+     INT32          screen;
+     CARD32         following;
+} xDeviceAbsAreaCtl;
 
 typedef struct {
     CARD16          control B16;