diff options
| author | marha <marha@users.sourceforge.net> | 2010-03-16 09:44:59 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-03-16 09:44:59 +0000 |
| commit | 06615d6166af0efaf2893c6b7328b96c5a86b786 (patch) | |
| tree | f6771f6813846d2c7aa771f5caef11ee5e398929 /xorg-server/dix/getevents.c | |
| parent | ed13095ef146649dce4a58c891544d7ff31915c7 (diff) | |
| parent | b958ead07bdfe03e2d697fd701bdfa82016ae5cb (diff) | |
| download | vcxsrv-06615d6166af0efaf2893c6b7328b96c5a86b786.tar.gz vcxsrv-06615d6166af0efaf2893c6b7328b96c5a86b786.tar.bz2 vcxsrv-06615d6166af0efaf2893c6b7328b96c5a86b786.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/dix/getevents.c')
| -rw-r--r-- | xorg-server/dix/getevents.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/xorg-server/dix/getevents.c b/xorg-server/dix/getevents.c index 40fe4b7bb..a277fcea0 100644 --- a/xorg-server/dix/getevents.c +++ b/xorg-server/dix/getevents.c @@ -720,7 +720,7 @@ moveRelative(DeviceIntPtr dev, int *x, int *y, /* if attached, clip both x and y to the defined limits (usually
* co-ord space limit). If it is attached, we need x/y to go over the
* limits to be able to change screens. */
- if(dev->u.master) {
+ if(dev->u.master && dev->valuator->mode == Absolute) {
clipAxis(dev, 0, x);
clipAxis(dev, 1, y);
}
@@ -730,7 +730,8 @@ moveRelative(DeviceIntPtr dev, int *x, int *y, for (; i < num; i++)
{
dev->last.valuators[i + first] += valuators[i];
- clipAxis(dev, i, &dev->last.valuators[i + first]);
+ if (dev->valuator->mode == Absolute)
+ clipAxis(dev, i, &dev->last.valuators[i + first]);
valuators[i] = dev->last.valuators[i + first];
}
}
|