diff options
| author | marha <marha@users.sourceforge.net> | 2012-01-11 08:18:52 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-01-11 08:18:52 +0100 |
| commit | 38e661c7d82fa0b34fbe9b3f3261295787bb6427 (patch) | |
| tree | ef71c86cfe741318555e06dec3e9e2817d731e7a /xorg-server/dix/getevents.c | |
| parent | a1e97828c89278770cb249039ec92d959440c640 (diff) | |
| download | vcxsrv-38e661c7d82fa0b34fbe9b3f3261295787bb6427.tar.gz vcxsrv-38e661c7d82fa0b34fbe9b3f3261295787bb6427.tar.bz2 vcxsrv-38e661c7d82fa0b34fbe9b3f3261295787bb6427.zip | |
mesa pixman xserver git update 11 jan 2012
Diffstat (limited to 'xorg-server/dix/getevents.c')
| -rw-r--r-- | xorg-server/dix/getevents.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/xorg-server/dix/getevents.c b/xorg-server/dix/getevents.c index 3b40a5bb7..d0014e617 100644 --- a/xorg-server/dix/getevents.c +++ b/xorg-server/dix/getevents.c @@ -1328,7 +1328,7 @@ fill_pointer_events(InternalEvent *events, DeviceIntPtr pDev, int type, storeLastValuators(pDev, &mask, 0, 1, devx, devy); /* Update the MD's co-ordinates, which are always in desktop space. */ - if (!IsMaster(pDev) || !IsFloating(pDev)) { + if (!IsMaster(pDev) && !IsFloating(pDev)) { DeviceIntPtr master = GetMaster(pDev, MASTER_POINTER); master->last.valuators[0] = screenx; master->last.valuators[1] = screeny; |