diff options
| author | marha <marha@users.sourceforge.net> | 2010-04-16 09:32:42 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-04-16 09:32:42 +0000 |
| commit | 0afd2d366de6470b72f0d305643be9afd8cc461d (patch) | |
| tree | 9363104b0080ddd001256d1b3a0eceae078f13a0 /xorg-server/dix | |
| parent | 6412df1b3df28c6213b43821c4a98cc3857d9a3f (diff) | |
| download | vcxsrv-0afd2d366de6470b72f0d305643be9afd8cc461d.tar.gz vcxsrv-0afd2d366de6470b72f0d305643be9afd8cc461d.tar.bz2 vcxsrv-0afd2d366de6470b72f0d305643be9afd8cc461d.zip | |
git update 16/4/2010
Diffstat (limited to 'xorg-server/dix')
| -rw-r--r-- | xorg-server/dix/events.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/xorg-server/dix/events.c b/xorg-server/dix/events.c index 654165251..6d0137da4 100644 --- a/xorg-server/dix/events.c +++ b/xorg-server/dix/events.c @@ -738,7 +738,11 @@ CheckPhysLimits( new.y = pSprite->physLimits.y2 - 1; if (pSprite->hotShape) ConfineToShape(pDev, pSprite->hotShape, &new.x, &new.y); - if ((pScreen != pSprite->hotPhys.pScreen) || + if (( +#ifdef PANORAMIX + noPanoramiXExtension && +#endif + (pScreen != pSprite->hotPhys.pScreen)) || (new.x != pSprite->hotPhys.x) || (new.y != pSprite->hotPhys.y)) { #ifdef PANORAMIX @@ -3976,7 +3980,7 @@ DeliverGrabbedEvent(InternalEvent *event, DeviceIntPtr thisDev, FreezeThaw(dev, TRUE); if ((dev->deviceGrab.sync.state == FREEZE_BOTH_NEXT_EVENT) && (CLIENT_BITS(grab->resource) == - CLIENT_BITS(dev->deviceGrab.sync.other->resource))) + CLIENT_BITS(dev->deviceGrab.grab->resource))) dev->deviceGrab.sync.state = FROZEN_NO_EVENT; else dev->deviceGrab.sync.other = grab; |