xserver: Branch 'master'

[Daniel Stone]

 dix/events.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

New commits:
diff-tree 7da51447eaab34292e14077fb5a48e6b2e587781 (from 5d082f05632906c29296a44ef5c3a4962c0cbe62)
Author: Daniel Stone <daniel at fooishbar.org>
Date:   Thu Aug 17 21:24:07 2006 +0300

    events.c: fix tiny XEvIE thinko
    Make sure xeviehot gets updated after the ConfineToShape() call.

diff --git a/dix/events.c b/dix/events.c
index 7437bb4..7225543 100644
--- a/dix/events.c
+++ b/dix/events.c
@@ -2016,14 +2016,14 @@ CheckMotion(xEvent *xE)
 	    sprite.hot.y = sprite.physLimits.y1;
 	else if (sprite.hot.y >= sprite.physLimits.y2)
 	    sprite.hot.y = sprite.physLimits.y2 - 1;
-#ifdef XEVIE
-        xeviehot.x = sprite.hot.x;
-        xeviehot.y = sprite.hot.y;
-#endif
 #ifdef SHAPE
 	if (sprite.hotShape)
 	    ConfineToShape(sprite.hotShape, &sprite.hot.x, &sprite.hot.y);
 #endif
+#ifdef XEVIE
+        xeviehot.x = sprite.hot.x;
+        xeviehot.y = sprite.hot.y;
+#endif
 	sprite.hotPhys = sprite.hot;
 	if ((sprite.hotPhys.x != XE_KBPTR.rootX) ||
 	    (sprite.hotPhys.y != XE_KBPTR.rootY))