summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@openedhand.com>2008-01-08 12:35:16 +0100
committerDodji Seketeli <dodji@seketeli.org>2008-01-08 12:35:16 +0100
commit1da6fd1e2c7a49648245c98481fabea8b9690a8c (patch)
tree3f4780da5f0d5286f40ef2c373be86f2a87099e1
parent1ea5b191cccf465e595ac571e1c7254d0161cb8d (diff)
[xcalibrate] take orientation in account
-rw-r--r--xcalibrateproto.h25
-rw-r--r--xcalibratewire.h5
2 files changed, 28 insertions, 2 deletions
diff --git a/xcalibrateproto.h b/xcalibrateproto.h
index 9a174a4..feded32 100644
--- a/xcalibrateproto.h
+++ b/xcalibrateproto.h
@@ -78,6 +78,31 @@ typedef struct {
#define sz_xXCalibrateRawModeReply 32
+typedef struct {
+ CARD8 reqType;
+ CARD8 xCalibrateReqType;
+ CARD16 length B16;
+ CARD32 x B32;
+ CARD32 y B32;
+} xXCalibrateScreenToCoordReq;
+
+#define sz_xXCalibrateScreenToCoordReq 12
+
+typedef struct {
+ BYTE type; /* X_Reply */
+ BYTE pad1;
+ CARD16 sequenceNumber B16;
+ CARD32 x;
+ CARD32 y;
+ CARD32 pad2 B32;
+ CARD32 pad3 B32;
+ CARD32 pad4 B32;
+ CARD32 pad5 B32;
+ CARD32 pad6 B32;
+} xXCalibrateScreenToCoordReply;
+
+#define sz_xXCalibrateScreenToCoordReply 32
+
/* Events */
typedef struct {
diff --git a/xcalibratewire.h b/xcalibratewire.h
index a5b1aec..0a1c904 100644
--- a/xcalibratewire.h
+++ b/xcalibratewire.h
@@ -26,13 +26,14 @@
#define XCALIBRATEWIRE_H
#define XCALIBRATE_MAJOR_VERSION 0
-#define XCALIBRATE_MINOR_VERSION 0
+#define XCALIBRATE_MINOR_VERSION 1
#define XCALIBRATE_NAME "XCALIBRATE"
#define X_XCalibrateQueryVersion 0
#define X_XCalibrateRawMode 1
+#define X_XCalibrateScreenToCoord 2
-#define XCalibrateNumberRequests (X_XCalibrateSetRawMode + 1)
+#define XCalibrateNumberRequests (X_XCalibrateScreenToCoord + 1)
#define X_XCalibrateRawTouchscreen 0