aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/dix/getevents.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-09-27 15:15:06 +0200
committermarha <marha@users.sourceforge.net>2012-09-27 15:15:06 +0200
commit24703f26d8ed55b1971aa2e94d33636e871bff0b (patch)
tree3e57b600f4446a1db1d8e73cb8a83519570eb678 /xorg-server/dix/getevents.c
parent94ef26cb962261d0b47daf7ef3c856510999bd4c (diff)
parent2cf1e3de4759264eac2fa8ac758ea750636542f8 (diff)
downloadvcxsrv-24703f26d8ed55b1971aa2e94d33636e871bff0b.tar.gz
vcxsrv-24703f26d8ed55b1971aa2e94d33636e871bff0b.tar.bz2
vcxsrv-24703f26d8ed55b1971aa2e94d33636e871bff0b.zip
Merge remote-tracking branch 'origin/released'
* origin/released: mesa xserver pixman xkeyboard-config git update 27 sep 2012
Diffstat (limited to 'xorg-server/dix/getevents.c')
-rw-r--r--xorg-server/dix/getevents.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/xorg-server/dix/getevents.c b/xorg-server/dix/getevents.c
index 9a350388b..4cf06406d 100644
--- a/xorg-server/dix/getevents.c
+++ b/xorg-server/dix/getevents.c
@@ -911,9 +911,9 @@ scale_to_desktop(DeviceIntPtr dev, ValuatorMask *mask,
/* scale x&y to desktop coordinates */
*screenx = rescaleValuatorAxis(x, dev->valuator->axes + 0, NULL,
- screenInfo.x, screenInfo.width);
+ screenInfo.x, screenInfo.width - 1);
*screeny = rescaleValuatorAxis(y, dev->valuator->axes + 1, NULL,
- screenInfo.y, screenInfo.height);
+ screenInfo.y, screenInfo.height - 1);
*devx = x;
*devy = y;