diff options
| author | Oliver McFadden <oliver.mcfadden@nokia.com> | 2010-05-13 07:12:43 +0300 |
|---|---|---|
| committer | Oliver McFadden <oliver.mcfadden@nokia.com> | 2010-05-14 07:50:49 +0300 |
| commit | 71296885b0bb946e7ab986169f5b872952c221a0 (patch) | |
| tree | fca313c9277b35cd9e4bdf0504e10649b8675ac5 | |
| parent | 795432d4a92ed5b9fa4d9163e73c8e4fe4c74534 (diff) | |
mi: removed unused PointerNonInterestBox functions.
Please note this patch breaks the ABI.
Signed-off-by: Oliver McFadden <oliver.mcfadden@nokia.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
| -rw-r--r-- | hw/xnest/Screen.c | 1 | ||||
| -rw-r--r-- | include/scrnintstr.h | 6 | ||||
| -rw-r--r-- | mi/mipointer.c | 12 | ||||
| -rw-r--r-- | mi/miscrinit.c | 1 |
4 files changed, 0 insertions, 20 deletions
diff --git a/hw/xnest/Screen.c b/hw/xnest/Screen.c index 8c1c2449d..62255b883 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 553893677..a4ca0c6f6 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 ad7b3db0c..296c57f5d 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 d46b9f555..1b88ecbb1 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 */ |