[PATCH] mi: removed unused PointerNonInterestBox functions.
Oliver McFadden
oliver.mcfadden at nokia.com
Thu May 13 01:45:02 PDT 2010
Signed-off-by: Oliver McFadden <oliver.mcfadden at nokia.com>
---
hw/xnest/Screen.c | 1 -
include/scrnintstr.h | 2 +-
mi/mipointer.c | 12 ------------
mi/miscrinit.c | 1 -
4 files changed, 1 insertions(+), 15 deletions(-)
diff --git a/hw/xnest/Screen.c b/hw/xnest/Screen.c
index ca903d7..1604a4c 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 ab50e7a..fcff6ea 100644
--- a/include/scrnintstr.h
+++ b/include/scrnintstr.h
@@ -480,7 +480,7 @@ typedef struct _Screen {
SaveScreenProcPtr SaveScreen;
GetImageProcPtr GetImage;
GetSpansProcPtr GetSpans;
- PointerNonInterestBoxProcPtr PointerNonInterestBox;
+ PointerNonInterestBoxProcPtr PointerNonInterestBox; /** unused */
SourceValidateProcPtr SourceValidate;
/* Window Procedures */
diff --git a/mi/mipointer.c b/mi/mipointer.c
index b2bf3c6..3a13c72 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;
@@ -219,15 +216,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 96113d6..9122086 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
More information about the xorg-devel
mailing list