xserver: Branch 'mpx'

[Peter Hutterer]

 mi/mipointer.c |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

New commits:
diff-tree 5c4deb71a1cb981ea7e2e25d2b3a1179f27efa5a (from 7f36ba57062096e9c67889d5b7dd64e2fb0004e7)
Author: Peter Hutterer <peter at cs.unisa.edu.au>
Date:   Thu Apr 5 14:21:46 2007 +0930

    Synthesize WarpPointer events for the actual device rather than the VCP.

diff --git a/mi/mipointer.c b/mi/mipointer.c
index 863a405..b9f54c1 100644
--- a/mi/mipointer.c
+++ b/mi/mipointer.c
@@ -467,7 +467,6 @@ static void
 miPointerMoved (DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y,
                      unsigned long time)
 {
-    int valuators[2];
     miPointerPtr pPointer = MIPOINTER(pDev);
     SetupScreen(pScreen);
 
@@ -574,9 +573,8 @@ miPointerMove (DeviceIntPtr pDev, Screen
         }
     }
 
-    nevents = GetPointerEvents(events, inputInfo.pointer, MotionNotify, 0,
-                               POINTER_ABSOLUTE, 0, 2, valuators);
+    nevents = GetPointerEvents(events, pDev, MotionNotify, 0, POINTER_ABSOLUTE, 0, 2, valuators);
 
     for (i = 0; i < nevents; i++)
-        mieqEnqueue(inputInfo.pointer, &events[i]);
+        mieqEnqueue(pDev, &events[i]);
 }