diff options
| author | Richard Purdie <richard@openedhand.com> | 2007-06-30 15:27:45 +0000 |
|---|---|---|
| committer | Richard Purdie <richard@openedhand.com> | 2007-06-30 15:27:45 +0000 |
| commit | a863497347198c0c6968ff02148ac766085d6d12 (patch) | |
| tree | d19660610a8aff5d0b9cf65c58df46884647bbcb /meta/packages/xorg-proto | |
| parent | d5ba636e35b3f8ef200dae9c1450146f00699ebe (diff) | |
| download | openembedded-core-a863497347198c0c6968ff02148ac766085d6d12.tar.gz openembedded-core-a863497347198c0c6968ff02148ac766085d6d12.tar.bz2 openembedded-core-a863497347198c0c6968ff02148ac766085d6d12.zip | |
X calibration changes. Add functionality to the xcalibrate protocol (and X) to convert screen coordinates to mouse coordinates. xtscal can then be massively simplified removing a stack of bugs. Also remove stale cvs versions of xcalibrate.
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2067 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages/xorg-proto')
| -rw-r--r-- | meta/packages/xorg-proto/calibrateproto/coords.patch | 56 | ||||
| -rw-r--r-- | meta/packages/xorg-proto/calibrateproto_git.bb | 4 |
2 files changed, 59 insertions, 1 deletions
diff --git a/meta/packages/xorg-proto/calibrateproto/coords.patch b/meta/packages/xorg-proto/calibrateproto/coords.patch new file mode 100644 index 0000000000..8f44b029c5 --- /dev/null +++ b/meta/packages/xorg-proto/calibrateproto/coords.patch @@ -0,0 +1,56 @@ +--- + xcalibrateproto.h | 25 +++++++++++++++++++++++++ + xcalibratewire.h | 3 ++- + 2 files changed, 27 insertions(+), 1 deletion(-) + +Index: XCalibrateExt/xcalibrateproto.h +=================================================================== +--- XCalibrateExt.orig/xcalibrateproto.h 2004-06-02 20:18:47.000000000 +0100 ++++ XCalibrateExt/xcalibrateproto.h 2007-06-30 14:17:29.000000000 +0100 +@@ -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 { +Index: XCalibrateExt/xcalibratewire.h +=================================================================== +--- XCalibrateExt.orig/xcalibratewire.h 2004-06-02 20:18:47.000000000 +0100 ++++ XCalibrateExt/xcalibratewire.h 2007-06-30 14:17:29.000000000 +0100 +@@ -31,8 +31,9 @@ + + #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 + diff --git a/meta/packages/xorg-proto/calibrateproto_git.bb b/meta/packages/xorg-proto/calibrateproto_git.bb index dc03f02bf2..68c57ff3c7 100644 --- a/meta/packages/xorg-proto/calibrateproto_git.bb +++ b/meta/packages/xorg-proto/calibrateproto_git.bb @@ -3,7 +3,9 @@ require xorg-proto-common.inc DESCRIPTION = " Touchscreen calibration protocol" PV = "0.0+git${SRCDATE}" +PR = "r1" -SRC_URI = "git://anongit.freedesktop.org/git/xorg/proto/calibrateproto;protocol=git;tag=a1d5ef0c73fbef3e758c51b57ac69ba9567bae04" +SRC_URI = "git://anongit.freedesktop.org/git/xorg/proto/calibrateproto;protocol=git;tag=a1d5ef0c73fbef3e758c51b57ac69ba9567bae04 \ + file://coords.patch;patch=1" S = "${WORKDIR}/git" |