mi: closing memory leak, miPointer is freed in miPointerCloseScreen

	bugfix: uninitialized pPointer in miPointerGetPosition ifndef MPX
	adding DeviceIntPtr parameter to ScreenRec's cursor functions.
	cleanup of miPointer code to use same scheme in each function

dix:	MPHasCursor() function determines checking whether to invoke
	cursor rendering.

animcur: adding DeviceIntPtr parameter to cursor functions but animcur relies
	 on the core pointer right now.

xfixes: adding DeviceIntPtr parameter to cursor functions but xfixes relies on
	the core pointer right now.

rac:	adding DeviceIntPtr parameter to cursor functions but RAC relies on
	the core pointer right now.

ramdac:	adding DeviceIntPtr parameter to cursor functions but ramdac relies on
	the core pointer right now.

1 files changed, 9 insertions, 7 deletions

diff --git a/mi/micursor.c b/mi/micursor.c
index 6e06fbc07..af2cd0870 100644
--- a/mi/micursor.c
+++ b/mi/micursor.c
@@ -52,24 +52,26 @@ SOFTWARE.
 #include "cursor.h"
 #include "misc.h"
 #include "mi.h"
+#include "inputstr.h"
 
 extern Bool Must_have_memory;
 
 _X_EXPORT void
-miRecolorCursor( pScr, pCurs, displayed)
-    ScreenPtr	pScr;
-    CursorPtr	pCurs;
-    Bool	displayed;
+miRecolorCursor( pDev, pScr, pCurs, displayed)
+    DeviceIntPtr pDev;
+    ScreenPtr	 pScr;
+    CursorPtr	 pCurs;
+    Bool	 displayed;
 {
     /*
      * This is guaranteed to correct any color-dependent state which may have
      * been bound up in private state created by RealizeCursor
      */
-    (* pScr->UnrealizeCursor)( pScr, pCurs);
+    (* pScr->UnrealizeCursor)( pDev, pScr, pCurs);
     Must_have_memory = TRUE; /* XXX */
-    (* pScr->RealizeCursor)( pScr, pCurs);
+    (* pScr->RealizeCursor)( pDev, pScr, pCurs);
     Must_have_memory = FALSE; /* XXX */
     if ( displayed)
-	(* pScr->DisplayCursor)( pScr, pCurs);
+	(* pScr->DisplayCursor)( pDev, pScr, pCurs);
 
 }