xserver: Branch 'master'

[James Cloos]

 hw/kdrive/src/kinput.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit d9bf52b4abd29a3c206cd1e765b680659ddac1c6
Author: David Jander <david.jander at protonic.nl>
Date:   Fri Apr 17 01:34:18 2009 -0400

    [kdrive] Fix rotation of pointer
    
    Rotation matrix for pointer coordinates was incomplete and pointers with
    absolute coordinates did not work correctly in xserver (kdrive) when the
    sceen was rotated other than by 0 degrees.
    
    Signed-off-by: David Jander <david.jander at protonic.nl>
    Signed-off-by: James Cloos <cloos at jhcloos.com>

diff --git a/hw/kdrive/src/kinput.c b/hw/kdrive/src/kinput.c
index 4b2d709..7ed3601 100644
--- a/hw/kdrive/src/kinput.c
+++ b/hw/kdrive/src/kinput.c
@@ -1918,8 +1918,8 @@ KdEnqueuePointerEvent(KdPointerInfo *pi, unsigned long flags, int rx, int ry,
     }
     else {
 	if (pi->transformCoordinates) {
-	    x = matrix[0][0] * rx + matrix[0][1] * ry;
-	    y = matrix[1][0] * rx + matrix[1][1] * ry;
+	    x = matrix[0][0] * rx + matrix[0][1] * ry + matrix[0][2];
+	    y = matrix[1][0] * rx + matrix[1][1] * ry + matrix[1][2];
 	}
 	else {
 	    x = rx;