svn merge "^/branches/released" .

Solved mouse motion bug in new version of dix/getevents.c

2 files changed, 7 insertions, 5 deletions

diff --git a/xorg-server/Xext/panoramiXprocs.c b/xorg-server/Xext/panoramiXprocs.c
index 067fb6cf7..615246bab 100644
--- a/xorg-server/Xext/panoramiXprocs.c
+++ b/xorg-server/Xext/panoramiXprocs.c
@@ -634,7 +634,7 @@ int PanoramiXTranslateCoords(ClientPtr client)
     rep.dstX = x - pDst->drawable.x;

     rep.dstY = y - pDst->drawable.y;

     if((pDst == screenInfo.screens[0]->root) ||

-       (pWin->drawable.id == screenInfo.screens[0]->screensaver.wid))

+       (pDst->drawable.id == screenInfo.screens[0]->screensaver.wid))

     {

 	rep.dstX += screenInfo.screens[0]->x;

 	rep.dstY += screenInfo.screens[0]->y;

diff --git a/xorg-server/Xext/xtest.c b/xorg-server/Xext/xtest.c
index f1edfaca6..859057e2b 100644
--- a/xorg-server/Xext/xtest.c
+++ b/xorg-server/Xext/xtest.c
@@ -52,6 +52,7 @@
 #include "mipointer.h"

 #include "xserver-properties.h"

 #include "exevents.h"

+#include "inpututils.h"

 

 #include "modinit.h"

 

@@ -153,6 +154,7 @@ ProcXTestFakeInput(ClientPtr client)
     WindowPtr root;

     Bool extension = FALSE;

     deviceValuator *dv = NULL;

+    ValuatorMask mask;

     int valuators[MAX_VALUATORS] = {0};

     int numValuators = 0;

     int firstValuator = 0;

@@ -413,14 +415,14 @@ ProcXTestFakeInput(ClientPtr client)
 

     switch(type) {

         case MotionNotify:

-            nevents = GetPointerEvents(xtest_evlist, dev, type, 0, flags,

-                            firstValuator, numValuators, valuators);

+            valuator_mask_set_range(&mask, firstValuator, numValuators, valuators);

+            nevents = GetPointerEvents(xtest_evlist, dev, type, 0, flags, &mask);

             break;

         case ButtonPress:

         case ButtonRelease:

+            valuator_mask_set_range(&mask, firstValuator, numValuators, valuators);

             nevents = GetPointerEvents(xtest_evlist, dev, type, ev->u.u.detail,

-                                       flags, firstValuator,

-                                       numValuators, valuators);

+                                       flags, &mask);

             break;

         case KeyPress:

         case KeyRelease: