hashirama/xserver
Watch
0
0
Fork
You've already forked xserver
 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-10-14 00:01:20 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote branch 'whot/for-keith'

Browse source
This commit is contained in:
Keith Packard 2010-04-15 15:01:34 -07:00
commit e424d58123
5 changed files with 132 additions and 185 deletions
Download patch file Download diff file Expand all files Collapse all files

6
dix/events.c
View file

@ -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