--- Xext/xcalibrate.c | 47 ++++++++++++++++++++++++++++++++++++++++++++++- hw/kdrive/src/kdrive.h | 3 +++ hw/kdrive/src/kinput.c | 12 ++++++++++++ 3 files changed, 61 insertions(+), 1 deletion(-) Index: xorg-server-1.1.99.3/Xext/xcalibrate.c =================================================================== --- xorg-server-1.1.99.3.orig/Xext/xcalibrate.c 2007-06-30 16:27:13.000000000 +0100 +++ xorg-server-1.1.99.3/Xext/xcalibrate.c 2007-06-30 16:27:15.000000000 +0100 @@ -166,7 +166,6 @@ ProcXCalibrateSetRawMode (ClientPtr clie return (client->noClientException); } - static int SProcXCalibrateSetRawMode (ClientPtr client) { @@ -180,6 +179,47 @@ SProcXCalibrateSetRawMode (ClientPtr cli return ProcXCalibrateSetRawMode(client); } +static int +ProcXCalibrateScreenToCoord (ClientPtr client) +{ + REQUEST(xXCalibrateScreenToCoordReq); + xXCalibrateScreenToCoordReply rep; + + REQUEST_SIZE_MATCH (xXCalibrateScreenToCoordReq); + + memset (&rep, 0, sizeof (rep)); + rep.type = X_Reply; + rep.sequenceNumber = client->sequence; + rep.x = stuff->x; + rep.y = stuff->y; + + KdScreenToMouseCoords(&rep.x, &rep.y); + + if (client->swapped) + { + int n; + + swaps (&rep.x, n); + swaps (&rep.y, n); + } + WriteToClient(client, sizeof (rep), (char *) &rep); + return (client->noClientException); +} + +static int +SProcXCalibrateScreenToCoord (ClientPtr client) +{ + REQUEST(xXCalibrateScreenToCoordReq); + int n; + + REQUEST_SIZE_MATCH (xXCalibrateScreenToCoordReq); + + swaps(&stuff->x, n); + swaps(&stuff->y, n); + + return ProcXCalibrateScreenToCoord(client); +} + static void XCalibrateResetProc (ExtensionEntry *extEntry) { @@ -194,6 +234,9 @@ ProcXCalibrateDispatch (ClientPtr client return ProcXCalibrateQueryVersion(client); case X_XCalibrateRawMode: return ProcXCalibrateSetRawMode(client); + case X_XCalibrateScreenToCoord: + return ProcXCalibrateScreenToCoord(client); + default: break; } @@ -213,6 +256,8 @@ SProcXCalibrateDispatch (ClientPtr clien return SProcXCalibrateQueryVersion(client); case X_XCalibrateRawMode: return SProcXCalibrateSetRawMode(client); + case X_XCalibrateScreenToCoord: + return SProcXCalibrateScreenToCoord(client); default: break; } Index: xorg-server-1.1.99.3/hw/kdrive/src/kdrive.h =================================================================== --- xorg-server-1.1.99.3.orig/hw/kdrive/src/kdrive.h 2007-06-30 16:27:13.000000000 +0100 +++ xorg-server-1.1.99.3/hw/kdrive/src/kdrive.h 2007-06-30 16:30:40.000000000 +0100 @@ -851,6 +851,9 @@ void KdSetPointerMatrix (KdPointerMatrix *pointer); void +KdScreenToMouseCoords (int *x, int *y); + +void KdComputePointerMatrix (KdPointerMatrix *pointer, Rotation randr, int width, int height); void Index: xorg-server-1.1.99.3/hw/kdrive/src/kinput.c =================================================================== --- xorg-server-1.1.99.3.orig/hw/kdrive/src/kinput.c 2007-06-30 16:27:14.000000000 +0100 +++ xorg-server-1.1.99.3/hw/kdrive/src/kinput.c 2007-06-30 16:30:16.000000000 +0100 @@ -570,6 +570,18 @@ KdSetPointerMatrix (KdPointerMatrix *mat } void +KdScreenToMouseCoords (int *x, int *y) +{ + int (*m)[3] = kdPointerMatrix.matrix; + int div = m[0][1] * m[1][0] - m[1][1] * m[0][0]; + int sx = *x; + int sy = *y; + + *x = (m[0][1] * sy - m[0][1] * m[1][2] + m[1][1] * m[0][2] - m[1][1] * sx) / div; + *y = (m[1][0] * sx + m[0][0] * m[1][2] - m[1][0] * m[0][2] - m[0][0] * sy) / div; +} + +void KdComputePointerMatrix (KdPointerMatrix *m, Rotation randr, int width, int height) {