xfree86: fbman: drop FreeBoxesUpdateCallback
Nobody fills it anymore, so not needed at all anymore. Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
parent
ef49e6aa19
commit
b782306f40
|
@ -260,23 +260,9 @@ typedef struct {
|
||||||
int NumUsedAreas;
|
int NumUsedAreas;
|
||||||
FBLinearLinkPtr LinearAreas;
|
FBLinearLinkPtr LinearAreas;
|
||||||
CloseScreenProcPtr CloseScreen;
|
CloseScreenProcPtr CloseScreen;
|
||||||
int NumCallbacks;
|
|
||||||
FreeBoxCallbackProcPtr *FreeBoxesUpdateCallback;
|
|
||||||
DevUnion *devPrivates;
|
DevUnion *devPrivates;
|
||||||
} FBManager, *FBManagerPtr;
|
} FBManager, *FBManagerPtr;
|
||||||
|
|
||||||
static void
|
|
||||||
SendCallFreeBoxCallbacks(FBManagerPtr offman)
|
|
||||||
{
|
|
||||||
int i = offman->NumCallbacks;
|
|
||||||
|
|
||||||
while (i--) {
|
|
||||||
(*offman->FreeBoxesUpdateCallback[i]) (offman->pScreen,
|
|
||||||
offman->FreeBoxes,
|
|
||||||
offman->devPrivates[i].ptr);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
static FBAreaPtr
|
static FBAreaPtr
|
||||||
AllocateArea(FBManagerPtr offman,
|
AllocateArea(FBManagerPtr offman,
|
||||||
int w, int h,
|
int w, int h,
|
||||||
|
@ -375,14 +361,10 @@ localAllocateOffscreenArea(ScreenPtr pScreen,
|
||||||
RemoveAreaCallbackProcPtr removeCB, void *privData)
|
RemoveAreaCallbackProcPtr removeCB, void *privData)
|
||||||
{
|
{
|
||||||
FBManagerPtr offman;
|
FBManagerPtr offman;
|
||||||
FBAreaPtr area = NULL;
|
|
||||||
|
|
||||||
offman = (FBManagerPtr) dixLookupPrivate(&pScreen->devPrivates,
|
offman = (FBManagerPtr) dixLookupPrivate(&pScreen->devPrivates,
|
||||||
xf86FBScreenKey);
|
xf86FBScreenKey);
|
||||||
if ((area = AllocateArea(offman, w, h, gran, moveCB, removeCB, privData)))
|
return AllocateArea(offman, w, h, gran, moveCB, removeCB, privData);
|
||||||
SendCallFreeBoxCallbacks(offman);
|
|
||||||
|
|
||||||
return area;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
@ -419,8 +401,6 @@ localFreeOffscreenArea(FBAreaPtr area)
|
||||||
|
|
||||||
free(pLink);
|
free(pLink);
|
||||||
offman->NumUsedAreas--;
|
offman->NumUsedAreas--;
|
||||||
|
|
||||||
SendCallFreeBoxCallbacks(offman);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static Bool
|
static Bool
|
||||||
|
@ -471,8 +451,6 @@ localResizeOffscreenArea(FBAreaPtr resize, int w, int h)
|
||||||
RegionUninit(&FreedReg);
|
RegionUninit(&FreedReg);
|
||||||
RegionUninit(&NewReg);
|
RegionUninit(&NewReg);
|
||||||
|
|
||||||
SendCallFreeBoxCallbacks(offman);
|
|
||||||
|
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -530,8 +508,6 @@ localResizeOffscreenArea(FBAreaPtr resize, int w, int h)
|
||||||
|
|
||||||
RegionUninit(&FreedReg);
|
RegionUninit(&FreedReg);
|
||||||
|
|
||||||
SendCallFreeBoxCallbacks(offman);
|
|
||||||
|
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -698,7 +674,6 @@ localPurgeUnlockedOffscreenAreas(ScreenPtr pScreen)
|
||||||
|
|
||||||
if (anyUsed) {
|
if (anyUsed) {
|
||||||
RegionValidate(offman->FreeBoxes, &anyUsed);
|
RegionValidate(offman->FreeBoxes, &anyUsed);
|
||||||
SendCallFreeBoxCallbacks(offman);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return TRUE;
|
return TRUE;
|
||||||
|
@ -1109,7 +1084,6 @@ xf86FBCloseScreen(ScreenPtr pScreen)
|
||||||
RegionDestroy(offman->InitialBoxes);
|
RegionDestroy(offman->InitialBoxes);
|
||||||
RegionDestroy(offman->FreeBoxes);
|
RegionDestroy(offman->FreeBoxes);
|
||||||
|
|
||||||
free(offman->FreeBoxesUpdateCallback);
|
|
||||||
free(offman->devPrivates);
|
free(offman->devPrivates);
|
||||||
free(offman);
|
free(offman);
|
||||||
dixSetPrivate(&pScreen->devPrivates, xf86FBScreenKey, NULL);
|
dixSetPrivate(&pScreen->devPrivates, xf86FBScreenKey, NULL);
|
||||||
|
@ -1187,8 +1161,6 @@ xf86InitFBManagerRegion(ScreenPtr pScreen, RegionPtr FullRegion)
|
||||||
offman->UsedAreas = NULL;
|
offman->UsedAreas = NULL;
|
||||||
offman->LinearAreas = NULL;
|
offman->LinearAreas = NULL;
|
||||||
offman->NumUsedAreas = 0;
|
offman->NumUsedAreas = 0;
|
||||||
offman->NumCallbacks = 0;
|
|
||||||
offman->FreeBoxesUpdateCallback = NULL;
|
|
||||||
offman->devPrivates = NULL;
|
offman->devPrivates = NULL;
|
||||||
|
|
||||||
return TRUE;
|
return TRUE;
|
||||||
|
|
|
@ -60,7 +60,6 @@ typedef struct _FBLinear {
|
||||||
DevUnion devPrivate;
|
DevUnion devPrivate;
|
||||||
} FBLinear, *FBLinearPtr;
|
} FBLinear, *FBLinearPtr;
|
||||||
|
|
||||||
typedef void (*FreeBoxCallbackProcPtr) (ScreenPtr, RegionPtr, void *);
|
|
||||||
typedef void (*MoveAreaCallbackProcPtr) (FBAreaPtr, FBAreaPtr);
|
typedef void (*MoveAreaCallbackProcPtr) (FBAreaPtr, FBAreaPtr);
|
||||||
typedef void (*RemoveAreaCallbackProcPtr) (FBAreaPtr);
|
typedef void (*RemoveAreaCallbackProcPtr) (FBAreaPtr);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue