xserver: Branch 'master'

[Daniel Stone]

 dix/getevents.c     |    6 +++---
 include/dixevents.h |    2 +-
 include/input.h     |    2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

New commits:
diff-tree 05f915050cad72d4fb39cbb886be57beeac18749 (from c1674660a7115ebf993dcde78f4e45f756e4c951)
Author: Peter Hutterer <peter at cs.unisa.edu.au>
Date:   Wed Dec 27 16:38:06 2006 +0000

    dix/events: take screen number, not pointer, in PostSyntheticMotion
    Since we were using PostSyntheticMotion incorrectly anyway, update the
    declared API to match.

diff --git a/dix/getevents.c b/dix/getevents.c
index 0150d66..8b2a44d 100644
--- a/dix/getevents.c
+++ b/dix/getevents.c
@@ -761,7 +761,7 @@ SwitchCorePointer(DeviceIntPtr pDev)
  * to shift the pointer to get it inside the new bounds.
  */
 void
-PostSyntheticMotion(int x, int y, ScreenPtr pScreen, unsigned long time)
+PostSyntheticMotion(int x, int y, int screen, unsigned long time)
 {
     xEvent xE;
 
@@ -770,8 +770,8 @@ PostSyntheticMotion(int x, int y, Screen
        will translate from sprite screen to screen 0 upon reentry
        to the DIX layer. */
     if (!noPanoramiXExtension) {
-        x += panoramiXdataPtr[0].x - panoramiXdataPtr[pScreen->myNum].x;
-        y += panoramiXdataPtr[0].y - panoramiXdataPtr[pScreen->myNum].y;
+        x += panoramiXdataPtr[0].x - panoramiXdataPtr[screen].x;
+        y += panoramiXdataPtr[0].y - panoramiXdataPtr[screen].y;
     }
 #endif
 
diff --git a/include/dixevents.h b/include/dixevents.h
index c78fb0e..62c8672 100644
--- a/include/dixevents.h
+++ b/include/dixevents.h
@@ -103,7 +103,7 @@ extern int ProcUngrabButton(ClientPtr /*
 extern int ProcRecolorCursor(ClientPtr /* client */);
 
 #ifdef PANORAMIX
-extern void PostSyntheticMotion(int x, int y, ScreenPtr pScreen, unsigned long time);
+extern void PostSyntheticMotion(int x, int y, int screen, unsigned long time);
 #endif
 
 #endif /* DIXEVENTS_H */
diff --git a/include/input.h b/include/input.h
index ebb0915..fc607d3 100644
--- a/include/input.h
+++ b/include/input.h
@@ -421,7 +421,7 @@ extern int GetProximityEvents(
 extern void PostSyntheticMotion(
     int x,
     int y,
-    ScreenPtr pScreen,
+    int screen,
     unsigned long time);
 
 extern int GetMotionHistorySize(