diff options
| author | Tim Yamin <plasm@roo.me.uk> | 2010-03-08 12:45:15 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2010-04-16 07:53:14 +1000 |
| commit | 5f31e2196179f8db3170d65a17d8ad40da1acb0d (patch) | |
| tree | 6517ceb6bd8999fbee918d764be87e632e755fd4 | |
| parent | fc5d76740851725e3788c68e14474a012a205892 (diff) | |
dix: fix cursor screen check for xinerama setups.
The de-duplication of CheckPhysLimits 942eae6868b8b0f343b6a added a
condition that is invalid for a Xinerama setup. pScreen is invalid for the
Xinerama case, so comparing it to anything is a bad idea.
Signed-off-by: Tim Yamin <plasm@roo.me.uk>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| -rw-r--r-- | dix/events.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/dix/events.c b/dix/events.c index 654165251..eaa2c576b 100644 --- a/dix/events.c +++ b/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 |