xserver: Branch 'master'

[Keith Packard]

 mi/mipointer.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit b058dec281568d6a9c5b5e230c20eed096cbdc6d
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Mon Jan 5 11:19:46 2015 +1000

    mi: fix accidental x/y coordinate swap
    
    Reported-by: Adam Greenblatt <adam.greenblatt at gmail.com>
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
    Reviewed-by: Eric Anholt <eric at anholt.net>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/mi/mipointer.c b/mi/mipointer.c
index 2bdd6ca..ada1ab5 100644
--- a/mi/mipointer.c
+++ b/mi/mipointer.c
@@ -598,8 +598,8 @@ miPointerSetPosition(DeviceIntPtr pDev, int mode, double *screenx,
         int constrained_x, constrained_y;
         int current_x, current_y; /* current position in per-screen coord */
 
-        current_x = MIPOINTER(pDev)->x - pScreen->y;
-        current_y = MIPOINTER(pDev)->y - pScreen->x;
+        current_x = MIPOINTER(pDev)->x - pScreen->x;
+        current_y = MIPOINTER(pDev)->y - pScreen->y;
 
         input_constrain_cursor(pDev, pScreen,
                                current_x, current_y, x, y,