diff --git a/hw/xfree86/common/xf86fbman.c b/hw/xfree86/common/xf86fbman.c index 25779e510..93b3363d4 100644 --- a/hw/xfree86/common/xf86fbman.c +++ b/hw/xfree86/common/xf86fbman.c @@ -1220,92 +1220,6 @@ xf86InitFBManager(ScreenPtr pScreen, BoxPtr FullBox) return ret; } -Bool -xf86InitFBManagerArea(ScreenPtr pScreen, int PixelArea, int Verbosity) -{ - ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); - xRectangle Rect[3]; - RegionPtr pRegion, pScreenRegion; - int nRect; - Bool ret = FALSE; - - if (PixelArea < (pScrn->displayWidth * pScrn->virtualY)) - return FALSE; - - Rect[0].x = Rect[0].y = 0; - Rect[0].width = pScrn->displayWidth; - Rect[0].height = PixelArea / pScrn->displayWidth; - nRect = 1; - - /* Add a possible partial scanline */ - if ((Rect[1].height = Rect[1].width = PixelArea % pScrn->displayWidth)) { - Rect[1].x = 0; - Rect[1].y = Rect[0].height; - Rect[1].height = 1; - nRect++; - } - - /* Factor out virtual resolution */ - pRegion = RegionFromRects(nRect, Rect, 0); - if (pRegion) { - if (!RegionNar(pRegion)) { - Rect[2].x = Rect[2].y = 0; - Rect[2].width = pScrn->virtualX; - Rect[2].height = pScrn->virtualY; - - pScreenRegion = RegionFromRects(1, &Rect[2], 0); - if (pScreenRegion) { - if (!RegionNar(pScreenRegion)) { - RegionSubtract(pRegion, pRegion, pScreenRegion); - - ret = xf86InitFBManagerRegion(pScreen, pRegion); - - if (ret && xf86GetVerbosity() >= Verbosity) { - int scrnIndex = pScrn->scrnIndex; - - xf86DrvMsgVerb(scrnIndex, X_INFO, Verbosity, - "Largest offscreen areas (with overlaps):\n"); - - if (Rect[2].width < Rect[0].width) { - xf86DrvMsgVerb(scrnIndex, X_INFO, Verbosity, - "\t%d x %d rectangle at %d,0\n", - Rect[0].width - Rect[2].width, - Rect[0].height, Rect[2].width); - } - if (Rect[2].width < Rect[1].width) { - xf86DrvMsgVerb(scrnIndex, X_INFO, Verbosity, - "\t%d x %d rectangle at %d,0\n", - Rect[1].width - Rect[2].width, - Rect[0].height + Rect[1].height, - Rect[2].width); - } - if (Rect[2].height < Rect[0].height) { - xf86DrvMsgVerb(scrnIndex, X_INFO, Verbosity, - "\t%d x %d rectangle at 0,%d\n", - Rect[0].width, - Rect[0].height - Rect[2].height, - Rect[2].height); - } - if (Rect[1].height) { - xf86DrvMsgVerb(scrnIndex, X_INFO, Verbosity, - "\t%d x %d rectangle at 0,%d\n", - Rect[1].width, - Rect[0].height - Rect[2].height + - Rect[1].height, Rect[2].height); - } - } - } - - RegionDestroy(pScreenRegion); - } - } - - RegionDestroy(pRegion); - } - - return ret; -} - Bool xf86InitFBManagerRegion(ScreenPtr pScreen, RegionPtr FullRegion) { diff --git a/hw/xfree86/common/xf86fbman.h b/hw/xfree86/common/xf86fbman.h index 092c2e2dd..f8322e09b 100644 --- a/hw/xfree86/common/xf86fbman.h +++ b/hw/xfree86/common/xf86fbman.h @@ -104,9 +104,6 @@ extern _X_EXPORT Bool xf86RegisterOffscreenManager(ScreenPtr pScreen, extern _X_EXPORT Bool xf86InitFBManagerRegion(ScreenPtr pScreen, RegionPtr ScreenRegion); -extern _X_EXPORT Bool - xf86InitFBManagerArea(ScreenPtr pScreen, int PixalArea, int Verbosity); - extern _X_EXPORT Bool xf86InitFBManager(ScreenPtr pScreen, BoxPtr FullBox);