Ironing some glitches caused by the merge

4 files changed, 15 insertions, 4 deletions

diff --git a/Changelog b/Changelog
index 54c2f9e16..5a264ab22 100644
--- a/Changelog
+++ b/Changelog
@@ -24,6 +24,15 @@ ____________________________________________________________
 
 Merging from master
 
+____________________________________________________________
+
+Ironing some glitches caused by the merge
+
+Files:
+	Xi/exevents.c
+	randr/rrpointer.c
+	dix/events.c
+
 
 == 01.12.06 ==
 
diff --git a/Xi/exevents.c b/Xi/exevents.c
index 8150b1e90..9c6519351 100644
--- a/Xi/exevents.c
+++ b/Xi/exevents.c
@@ -266,7 +266,8 @@ ProcessOtherEvent(xEventPtr xE, register DeviceIntPtr other, int count)
     } else if (xE->u.u.type == DeviceButtonRelease
 #ifdef MPX
             || xE->u.u.type == MPXButtonRelease
-#endif) {
+#endif
+            ) {
         if (!b)
             return;
 
diff --git a/dix/events.c b/dix/events.c
index 3d7abd82d..8d7167ef1 100644
--- a/dix/events.c
+++ b/dix/events.c
@@ -360,7 +360,7 @@ static void ConfineToShape(DeviceIntPtr pDev, RegionPtr shape, int *px, int *py)
 static void PostNewCursor(DeviceIntPtr pDev);
 
 #define SyntheticMotion(x, y) \
-    PostSyntheticMotion(x, y, sprite.screen, \
+    PostSyntheticMotion(x, y, sprite->screen, \
                         syncEvents.playingEvents ? \
                           syncEvents.time.milliseconds : \
                           currentTime.milliseconds);
diff --git a/randr/rrpointer.c b/randr/rrpointer.c
index c092e494b..b9ee3bce2 100644
--- a/randr/rrpointer.c
+++ b/randr/rrpointer.c
@@ -21,6 +21,7 @@
  */
 
 #include "randrstr.h"
+#include "inputstr.h"
 
 /*
  * When the pointer moves, check to see if the specified position is outside
@@ -87,7 +88,7 @@ RRPointerToNearestCrtc (ScreenPtr pScreen, int x, int y, RRCrtcPtr skip)
 	}
     }
     if (best_dx || best_dy)
-	(*pScreen->SetCursorPosition) (pScreen, x + best_dx, y + best_dy, TRUE);
+	(*pScreen->SetCursorPosition) (inputInfo.pointer, pScreen, x + best_dx, y + best_dy, TRUE);
     pScrPriv->pointerCrtc = nearest;
 }
 
@@ -132,6 +133,6 @@ RRPointerScreenConfigured (ScreenPtr pScreen)
 
     if (pScreen != pCurrentScreen)
 	return;
-    GetSpritePosition (&x, &y);
+    GetSpritePosition(inputInfo.pointer, &x, &y);
     RRPointerToNearestCrtc (pScreen, x, y, NULL);
 }