frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into input-hotplug

This commit is contained in:
Daniel Stone 2006-08-17 21:25:14 +03:00 committed by Daniel Stone
parent 95dbfcf882 7da51447ea
commit 633b6a69f5
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dix/events.c
View File

@ -2020,13 +2020,13 @@ CheckMotion(xEvent *xE)
sprite.hot.y = sprite.physLimits.y1; sprite.hot.y = sprite.physLimits.y1;
else if (sprite.hot.y >= sprite.physLimits.y2) else if (sprite.hot.y >= sprite.physLimits.y2)
sprite.hot.y = sprite.physLimits.y2 - 1; sprite.hot.y = sprite.physLimits.y2 - 1;
#ifdef XEVIE
xeviehot.x = sprite.hot.x;
xeviehot.y = sprite.hot.y;
#endif
#ifdef SHAPE #ifdef SHAPE
if (sprite.hotShape) if (sprite.hotShape)
ConfineToShape(sprite.hotShape, &sprite.hot.x, &sprite.hot.y); ConfineToShape(sprite.hotShape, &sprite.hot.x, &sprite.hot.y);
#endif
#ifdef XEVIE
xeviehot.x = sprite.hot.x;
xeviehot.y = sprite.hot.y;
#endif #endif
sprite.hotPhys = sprite.hot; sprite.hotPhys = sprite.hot;
if ((sprite.hotPhys.x != XE_KBPTR.rootX) || if ((sprite.hotPhys.x != XE_KBPTR.rootX) ||