Wed Mar 14 13:47:40 2012 UTC ()

henning petersen in PR xsrc/46172: do not used removed function
miPointerAbsoluteCursor(), replace with miPointerSetPosition().


(martin)

diff -r1.1.1.4 -r1.2 xsrc/external/mit/xf86-video-sis/dist/src/sis_driver.c

--- xsrc/external/mit/xf86-video-sis/dist/src/sis_driver.c 2010/07/17 06:32:06	1.1.1.4
+++ xsrc/external/mit/xf86-video-sis/dist/src/sis_driver.c 2012/03/14 13:47:40	1.2

 @@ -76,26 +76,27 @@
 #define _XF86DGA_SERVER_
 #include <X11/extensions/xf86dgastr.h>
 #include "globals.h"
 #ifdef HAVE_XEXTPROTO_71
 #include <X11/extensions/dpmsconst.h>
 #else
 #define DPMS_SERVER
 #include <X11/extensions/dpms.h>
 #endif
 #include <inputstr.h>
 #ifdef XF86DRI
 #include "dri.h"
 #endif
 /* Globals (yes, these ARE really required to be global) */
 #ifdef SISUSEDEVPORT
 int 		sisdevport = 0;
 #endif
 #ifdef SISDUALHEAD
 static int	SISEntityIndex = -1;
 @@ -9312,29 +9313,28 @@ SISMergedPointerMoved(int scrnIndex, int
 	   switch(srel) {
 	   case sisLeftOf:
 	   case sisRightOf: y = pSiS->OffDead2.y0 - 1;
 			    doit = TRUE;
 			    break;
 	   case sisAbove:
 	   case sisBelow:   x = pSiS->OffDead2.x0 - 1;
 			    doit = TRUE;
 	   default:	    break;
+	   }
+	}
+     }
      if(doit) {
 	UpdateCurrentTime();
 	sigstate = xf86BlockSIGIO();
-	miPointerAbsoluteCursor(x, y, currentTime.milliseconds);
+	miPointerSetPosition(inputInfo.pointer, x, y);
 	xf86UnblockSIGIO(sigstate);
 	return;
+     }
+  }
   f1.x0 = old1x0 = pSiS->CRT1frameX0;
   f1.x1 = pSiS->CRT1frameX1;
   f1.y0 = old1y0 = pSiS->CRT1frameY0;
   f1.y1 = pSiS->CRT1frameY1;
   f2.x0 = old2x0 = pScrn2->frameX0;
   f2.x1 = pScrn2->frameX1;
   f2.y0 = old2y0 = pScrn2->frameY0;
   f2.y1 = pScrn2->frameY1;