frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Oliver McFadden 2010-05-13 07:12:43 +03:00
parent 795432d4a9
commit 71296885b0
4 changed files with 0 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hw/xnest/Screen.c
View File

@ -260,7 +260,6 @@ xnestOpenScreen(int index, ScreenPtr pScreen, int argc, char *argv[])
pScreen->SaveScreen = xnestSaveScreen; pScreen->SaveScreen = xnestSaveScreen;
pScreen->GetImage = xnestGetImage; pScreen->GetImage = xnestGetImage;
pScreen->GetSpans = xnestGetSpans; pScreen->GetSpans = xnestGetSpans;
pScreen->PointerNonInterestBox = NULL;
pScreen->SourceValidate = NULL; pScreen->SourceValidate = NULL;
/* Window Procedures */ /* Window Procedures */

6
include/scrnintstr.h
View File

@ -121,11 +121,6 @@ typedef void (* GetSpansProcPtr)(
int /*nspans*/, int /*nspans*/,
char * /*pdstStart*/); char * /*pdstStart*/);
typedef void (* PointerNonInterestBoxProcPtr)(
DeviceIntPtr /*pDev*/,
ScreenPtr /*pScreen*/,
BoxPtr /*pBox*/);
typedef void (* SourceValidateProcPtr)( typedef void (* SourceValidateProcPtr)(
DrawablePtr /*pDrawable*/, DrawablePtr /*pDrawable*/,
int /*x*/, int /*x*/,
@ -489,7 +484,6 @@ typedef struct _Screen {
SaveScreenProcPtr SaveScreen; SaveScreenProcPtr SaveScreen;
GetImageProcPtr GetImage; GetImageProcPtr GetImage;
GetSpansProcPtr GetSpans; GetSpansProcPtr GetSpans;
PointerNonInterestBoxProcPtr PointerNonInterestBox;
SourceValidateProcPtr SourceValidate; SourceValidateProcPtr SourceValidate;
/* Window Procedures */ /* Window Procedures */

12
mi/mipointer.c
View File

@ -63,8 +63,6 @@ static Bool miPointerDisplayCursor(DeviceIntPtr pDev, ScreenPtr pScreen,
CursorPtr pCursor); CursorPtr pCursor);
static void miPointerConstrainCursor(DeviceIntPtr pDev, ScreenPtr pScreen, static void miPointerConstrainCursor(DeviceIntPtr pDev, ScreenPtr pScreen,
BoxPtr pBox); BoxPtr pBox);
static void miPointerPointerNonInterestBox(DeviceIntPtr pDev,
ScreenPtr pScreen, BoxPtr pBox);
static void miPointerCursorLimits(DeviceIntPtr pDev, ScreenPtr pScreen, static void miPointerCursorLimits(DeviceIntPtr pDev, ScreenPtr pScreen,
CursorPtr pCursor, BoxPtr pHotBox, CursorPtr pCursor, BoxPtr pHotBox,
BoxPtr pTopLeftBox); BoxPtr pTopLeftBox);
@ -115,7 +113,6 @@ miPointerInitialize (ScreenPtr pScreen,
pScreen->UnrealizeCursor = miPointerUnrealizeCursor; pScreen->UnrealizeCursor = miPointerUnrealizeCursor;
pScreen->SetCursorPosition = miPointerSetCursorPosition; pScreen->SetCursorPosition = miPointerSetCursorPosition;
pScreen->RecolorCursor = miRecolorCursor; pScreen->RecolorCursor = miRecolorCursor;
pScreen->PointerNonInterestBox = miPointerPointerNonInterestBox;
pScreen->DeviceCursorInitialize = miPointerDeviceInitialize; pScreen->DeviceCursorInitialize = miPointerDeviceInitialize;
pScreen->DeviceCursorCleanup = miPointerDeviceCleanup; pScreen->DeviceCursorCleanup = miPointerDeviceCleanup;
@ -209,15 +206,6 @@ miPointerConstrainCursor (DeviceIntPtr pDev, ScreenPtr pScreen, BoxPtr pBox)
pPointer->confined = PointerConfinedToScreen(pDev); pPointer->confined = PointerConfinedToScreen(pDev);
} }
/*ARGSUSED*/
static void
miPointerPointerNonInterestBox (DeviceIntPtr pDev,
ScreenPtr pScreen,
BoxPtr pBox)
{
/* until DIX uses this, this will remain a stub */
}
/*ARGSUSED*/ /*ARGSUSED*/
static void static void
miPointerCursorLimits(DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCursor, miPointerCursorLimits(DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCursor,

1
mi/miscrinit.c
View File

@ -246,7 +246,6 @@ miScreenInit(
} }
/* else CloseScreen */ /* else CloseScreen */
/* QueryBestSize, SaveScreen, GetImage, GetSpans */ /* QueryBestSize, SaveScreen, GetImage, GetSpans */
pScreen->PointerNonInterestBox = (PointerNonInterestBoxProcPtr) 0;
pScreen->SourceValidate = (SourceValidateProcPtr) 0; pScreen->SourceValidate = (SourceValidateProcPtr) 0;
/* CreateWindow, DestroyWindow, PositionWindow, ChangeWindowAttributes */ /* CreateWindow, DestroyWindow, PositionWindow, ChangeWindowAttributes */
/* RealizeWindow, UnrealizeWindow */ /* RealizeWindow, UnrealizeWindow */