dbe: Fold midbe reset into dix
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Adam Jackson <ajax@redhat.com>
This commit is contained in:
parent
44d7707500
commit
1489637d56
|
@ -91,7 +91,6 @@ DbeStubScreen(DbeScreenPrivPtr pDbeScreenPriv, int *nStubbedScreens)
|
|||
pDbeScreenPriv->AllocBackBufferName = NULL;
|
||||
pDbeScreenPriv->SwapBuffers = NULL;
|
||||
pDbeScreenPriv->WinPrivDelete = NULL;
|
||||
pDbeScreenPriv->ResetProc = NULL;
|
||||
|
||||
(*nStubbedScreens)++;
|
||||
|
||||
|
@ -1255,10 +1254,7 @@ DbeResetProc(ExtensionEntry * extEntry)
|
|||
if (pDbeScreenPriv) {
|
||||
/* Unwrap DestroyWindow, which was wrapped in DbeExtensionInit(). */
|
||||
pScreen->DestroyWindow = pDbeScreenPriv->DestroyWindow;
|
||||
|
||||
if (pDbeScreenPriv->ResetProc)
|
||||
(*pDbeScreenPriv->ResetProc) (pScreen);
|
||||
|
||||
pScreen->PositionWindow = pDbeScreenPriv->PositionWindow;
|
||||
free(pDbeScreenPriv);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -183,9 +183,6 @@ typedef struct _DbeScreenPrivRec {
|
|||
void (*WinPrivDelete) (DbeWindowPrivPtr /*pDbeWindowPriv */ ,
|
||||
XID /*bufId */
|
||||
);
|
||||
void (*ResetProc) (ScreenPtr /*pScreen */
|
||||
);
|
||||
|
||||
} DbeScreenPrivRec, *DbeScreenPrivPtr;
|
||||
|
||||
#endif /* DBE_STRUCT_H */
|
||||
|
|
25
dbe/midbe.c
25
dbe/midbe.c
|
@ -680,30 +680,6 @@ miDbePositionWindow(WindowPtr pWin, int x, int y)
|
|||
|
||||
} /* miDbePositionWindow() */
|
||||
|
||||
/******************************************************************************
|
||||
*
|
||||
* DBE MI Procedure: miDbeResetProc
|
||||
*
|
||||
* Description:
|
||||
*
|
||||
* This function is called from DbeResetProc(), which is called at the end
|
||||
* of every server generation. This function peforms any MI-specific
|
||||
* shutdown tasks.
|
||||
*
|
||||
*****************************************************************************/
|
||||
|
||||
static void
|
||||
miDbeResetProc(ScreenPtr pScreen)
|
||||
{
|
||||
DbeScreenPrivPtr pDbeScreenPriv;
|
||||
|
||||
pDbeScreenPriv = DBE_SCREEN_PRIV(pScreen);
|
||||
|
||||
/* Unwrap wrappers */
|
||||
pScreen->PositionWindow = pDbeScreenPriv->PositionWindow;
|
||||
|
||||
} /* miDbeResetProc() */
|
||||
|
||||
/******************************************************************************
|
||||
*
|
||||
* DBE MI Procedure: miDbeInit
|
||||
|
@ -729,7 +705,6 @@ miDbeInit(ScreenPtr pScreen, DbeScreenPrivPtr pDbeScreenPriv)
|
|||
pDbeScreenPriv->GetVisualInfo = miDbeGetVisualInfo;
|
||||
pDbeScreenPriv->AllocBackBufferName = miDbeAllocBackBufferName;
|
||||
pDbeScreenPriv->SwapBuffers = miDbeSwapBuffers;
|
||||
pDbeScreenPriv->ResetProc = miDbeResetProc;
|
||||
pDbeScreenPriv->WinPrivDelete = miDbeWinPrivDelete;
|
||||
|
||||
return TRUE;
|
||||
|
|
Loading…
Reference in New Issue
Block a user