From 5f31e2196179f8db3170d65a17d8ad40da1acb0d Mon Sep 17 00:00:00 2001 From: Tim Yamin Date: Mon, 8 Mar 2010 12:45:15 +1000 Subject: [PATCH] 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 Reviewed-by: Peter Hutterer Signed-off-by: Peter Hutterer --- dix/events.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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