svn merge ^/branches/released .

1 files changed, 5 insertions, 19 deletions

diff --git a/xorg-server/mi/mipointer.c b/xorg-server/mi/mipointer.c
index f11de7da0..1f84e5309 100644
--- a/xorg-server/mi/mipointer.c
+++ b/xorg-server/mi/mipointer.c
@@ -73,6 +73,7 @@ static void miPointerMove(DeviceIntPtr pDev, ScreenPtr pScreen,
 static Bool miPointerDeviceInitialize(DeviceIntPtr pDev, ScreenPtr pScreen);

 static void miPointerDeviceCleanup(DeviceIntPtr pDev,

                                    ScreenPtr pScreen);

+static void miPointerMoveNoEvent (DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y);

 

 static EventList* events; /* for WarpPointer MotionNotifies */

 

@@ -305,24 +306,9 @@ miPointerWarpCursor (DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y)
     }

 

     if (GenerateEvent)

-    {

 	miPointerMove (pDev, pScreen, x, y);

-    }

     else

-    {

-	/* everything from miPointerMove except the event and history */

-

-    	if (!pScreenPriv->waitForUpdate && pScreen == pPointer->pSpriteScreen)

-    	{

-	    pPointer->devx = x;

-	    pPointer->devy = y;

-	    if(pPointer->pCursor && !pPointer->pCursor->bits->emptyMask)

-		(*pScreenPriv->spriteFuncs->MoveCursor) (pDev, pScreen, x, y);

-    	}

-	pPointer->x = x;

-	pPointer->y = y;

-	pPointer->pScreen = pScreen;

-    }

+        miPointerMoveNoEvent(pDev, pScreen, x, y);

 

     /* Don't call USFS if we use Xinerama, otherwise the root window is

      * updated to the second screen, and we never receive any events.

@@ -470,7 +456,7 @@ miPointerSetWaitForUpdate(ScreenPtr pScreen, Bool wait)
 

 /* Move the pointer on the current screen,  and update the sprite. */

 static void

-miPointerMoved (DeviceIntPtr pDev, ScreenPtr pScreen,

+miPointerMoveNoEvent (DeviceIntPtr pDev, ScreenPtr pScreen,

                 int x, int y)

 {

     miPointerPtr pPointer;

@@ -546,7 +532,7 @@ miPointerSetPosition(DeviceIntPtr pDev, int *x, int *y)
             pPointer->pScreen == pScreen) 

         return;

 

-    miPointerMoved(pDev, pScreen, *x, *y);

+    miPointerMoveNoEvent(pDev, pScreen, *x, *y);

 }

 

 void

@@ -568,7 +554,7 @@ miPointerMove (DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y)
     int i, nevents;

     int valuators[2];

 

-    miPointerMoved(pDev, pScreen, x, y);

+    miPointerMoveNoEvent(pDev, pScreen, x, y);

 

     /* generate motion notify */

     valuators[0] = x;