diff options
| author | Keith Packard <keithp@keithp.com> | 2010-04-15 15:01:34 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2010-04-15 15:01:34 -0700 |
| commit | e424d5812300e82de375d83dc0b490a76d865016 (patch) | |
| tree | e9635d5aedf4257496fb48ca82e0105c357a803d /dix/events.c | |
| parent | 5b0faf355465c9f21ad96e0ed266fbdbc29efb5b (diff) | |
| parent | 0e7703f9b1927328954a2fc87aac6be244819329 (diff) | |
Merge remote branch 'whot/for-keith'
Diffstat (limited to 'dix/events.c')
| -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 24c9e8405..6d0137da4 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 |