From 462f18c7b25fe3e467f837647d07ab0a78aa8d2b Mon Sep 17 00:00:00 2001 From: marha Date: Sun, 22 Feb 2015 21:39:56 +0100 Subject: Merged origin/release (checked in because wanted to merge new stuff) --- xorg-server/mi/mipointer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'xorg-server/mi') diff --git a/xorg-server/mi/mipointer.c b/xorg-server/mi/mipointer.c index 2bdd6ca98..ada1ab570 100644 --- a/xorg-server/mi/mipointer.c +++ b/xorg-server/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, -- cgit v1.2.3