[PATCH v2 1/2] mi: removed unused PointerNonInterestBox functions.

[Oliver McFadden]

Please note this patch breaks the ABI.

Signed-off-by: Oliver McFadden <oliver.mcfadden at nokia.com>
Reviewed-by: Keith Packard <keithp at keithp.com>
---
v2: completely remove the unused function pointer from the ScreenRec struct in
scrnintstr.h. Added note regarding ABI breakage.

 hw/xnest/Screen.c    |    1 -
 include/scrnintstr.h |    6 ------
 mi/mipointer.c       |   12 ------------
 mi/miscrinit.c       |    1 -
 4 files changed, 0 insertions(+), 20 deletions(-)

diff --git a/hw/xnest/Screen.c b/hw/xnest/Screen.c
index 8c1c244..62255b8 100644
--- a/hw/xnest/Screen.c
+++ b/hw/xnest/Screen.c
@@ -260,7 +260,6 @@ xnestOpenScreen(int index, ScreenPtr pScreen, int argc, char *argv[])
   pScreen->SaveScreen = xnestSaveScreen;
   pScreen->GetImage = xnestGetImage;
   pScreen->GetSpans = xnestGetSpans;
-  pScreen->PointerNonInterestBox = NULL;
   pScreen->SourceValidate = NULL;
 
   /* Window Procedures */
diff --git a/include/scrnintstr.h b/include/scrnintstr.h
index 5538936..a4ca0c6 100644
--- a/include/scrnintstr.h
+++ b/include/scrnintstr.h
@@ -121,11 +121,6 @@ typedef    void (* GetSpansProcPtr)(
 	int /*nspans*/,
 	char * /*pdstStart*/);
 
-typedef    void (* PointerNonInterestBoxProcPtr)(
-        DeviceIntPtr /*pDev*/,
-	ScreenPtr /*pScreen*/,
-	BoxPtr /*pBox*/);
-
 typedef    void (* SourceValidateProcPtr)(
 	DrawablePtr /*pDrawable*/,
 	int /*x*/,
@@ -489,7 +484,6 @@ typedef struct _Screen {
     SaveScreenProcPtr		SaveScreen;
     GetImageProcPtr		GetImage;
     GetSpansProcPtr		GetSpans;
-    PointerNonInterestBoxProcPtr PointerNonInterestBox;
     SourceValidateProcPtr	SourceValidate;
 
     /* Window Procedures */
diff --git a/mi/mipointer.c b/mi/mipointer.c
index ad7b3db..296c57f 100644
--- a/mi/mipointer.c
+++ b/mi/mipointer.c
@@ -63,8 +63,6 @@ static Bool miPointerDisplayCursor(DeviceIntPtr pDev, ScreenPtr pScreen,
                                    CursorPtr pCursor);
 static void miPointerConstrainCursor(DeviceIntPtr pDev, ScreenPtr pScreen,
                                      BoxPtr pBox); 
-static void miPointerPointerNonInterestBox(DeviceIntPtr pDev, 
-                                           ScreenPtr pScreen, BoxPtr pBox);
 static void miPointerCursorLimits(DeviceIntPtr pDev, ScreenPtr pScreen,
                                   CursorPtr pCursor, BoxPtr pHotBox, 
                                   BoxPtr pTopLeftBox);
@@ -115,7 +113,6 @@ miPointerInitialize (ScreenPtr                  pScreen,
     pScreen->UnrealizeCursor = miPointerUnrealizeCursor;
     pScreen->SetCursorPosition = miPointerSetCursorPosition;
     pScreen->RecolorCursor = miRecolorCursor;
-    pScreen->PointerNonInterestBox = miPointerPointerNonInterestBox;
     pScreen->DeviceCursorInitialize = miPointerDeviceInitialize;
     pScreen->DeviceCursorCleanup = miPointerDeviceCleanup;
 
@@ -211,15 +208,6 @@ miPointerConstrainCursor (DeviceIntPtr pDev, ScreenPtr pScreen, BoxPtr pBox)
 
 /*ARGSUSED*/
 static void
-miPointerPointerNonInterestBox (DeviceIntPtr    pDev,
-                                ScreenPtr       pScreen,
-                                BoxPtr          pBox)
-{
-    /* until DIX uses this, this will remain a stub */
-}
-
-/*ARGSUSED*/
-static void
 miPointerCursorLimits(DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCursor,
                       BoxPtr pHotBox, BoxPtr pTopLeftBox)
 {
diff --git a/mi/miscrinit.c b/mi/miscrinit.c
index d46b9f5..1b88ecb 100644
--- a/mi/miscrinit.c
+++ b/mi/miscrinit.c
@@ -246,7 +246,6 @@ miScreenInit(
     }
     /* else CloseScreen */
     /* QueryBestSize, SaveScreen, GetImage, GetSpans */
-    pScreen->PointerNonInterestBox = (PointerNonInterestBoxProcPtr) 0;
     pScreen->SourceValidate = (SourceValidateProcPtr) 0;
     /* CreateWindow, DestroyWindow, PositionWindow, ChangeWindowAttributes */
     /* RealizeWindow, UnrealizeWindow */
-- 
1.6.1