XLibre/xf86-video-trident
1
0
Fork 0
mirror of https://github.com/X11Libre/xf86-video-trident.git synced 2026-04-14 11:14:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

shadow: shadowInit -> shadowAdd/Remove

Browse Source 
Signed-off-by: Adam Jackson <ajax@redhat.com>
This commit is contained in:
Adam Jackson
2014-07-29 09:27:48 -04:00
parent 2650c0bf05
commit 9f8e49e04b
2 changed files with 27 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/trident.h
View File

@@ -159,6 +159,7 @@ typedef struct {
#endif
CloseScreenProcPtr CloseScreen;
ScreenBlockHandlerProcPtr BlockHandler;
CreateScreenResourcesProcPtr CreateScreenResources;
int panelWidth;
int panelHeight;
unsigned int (*ddc1Read)(ScrnInfoPtr);

28
src/trident_driver.c
View File

@@ -2764,6 +2764,24 @@ TRIDENTRestore(ScrnInfoPtr pScrn)
vgaHWProtect(pScrn, FALSE);
}
static Bool
TRIDENTCreateScreenResources(ScreenPtr pScreen)
{
ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
TRIDENTPtr pTrident = TRIDENTPTR(pScrn);
Bool ret;
pScreen->CreateScreenResources = pTrident->CreateScreenResources;
ret = pScreen->CreateScreenResources(pScreen);
pTrident->CreateScreenResources = pScreen->CreateScreenResources;
pScreen->CreateScreenResources = TRIDENTCreateScreenResources;
if (ret)
ret = shadowAdd(pScreen, pScreen->GetScreenPixmap(pScreen),
TRIDENTShadowUpdate, NULL, 0, 0);
return ret;
}
/* Mandatory */
@@ -3088,7 +3106,10 @@ TRIDENTScreenInit(SCREEN_INIT_ARGS_DECL)
} else {
pTrident->RefreshArea = TRIDENTRefreshArea;
}
shadowInit (pScreen, TRIDENTShadowUpdate, 0);
if (!shadowSetup(pScreen))
return FALSE;
pTrident->CreateScreenResources = pScreen->CreateScreenResources;
pScreen->CreateScreenResources = TRIDENTCreateScreenResources;
}
xf86DPMSInit(pScreen, (DPMSSetProcPtr)TRIDENTDisplayPowerManagementSet, 0);
@@ -3276,8 +3297,11 @@ TRIDENTCloseScreen(CLOSE_SCREEN_ARGS_DECL)
}
if (pTrident->CursorInfoRec)
xf86DestroyCursorInfoRec(pTrident->CursorInfoRec);
if (pTrident->ShadowPtr)
if (pTrident->ShadowPtr) {
shadowRemove(pScreen, pScreen->GetScreenPixmap(pScreen));
free(pTrident->ShadowPtr);
pScreen->CreateScreenResources = pTrident->CreateScreenResources;
}
if (pTrident->DGAModes)
free(pTrident->DGAModes);
pScrn->vtSema = FALSE;