From 7da51447eaab34292e14077fb5a48e6b2e587781 Mon Sep 17 00:00:00 2001
From: Daniel Stone <daniel@fooishbar.org>
Date: Thu, 17 Aug 2006 21:24:07 +0300
Subject: [PATCH] events.c: fix tiny XEvIE thinko Make sure xeviehot gets
 updated after the ConfineToShape() call.

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

diff --git a/dix/events.c b/dix/events.c
index 7437bb44f..7225543a3 100644
--- a/dix/events.c
+++ b/dix/events.c
@@ -2016,13 +2016,13 @@ 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) ||