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

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:
Adam Jackson 2012-10-16 14:56:21 -04:00
parent 44d7707500
commit 1489637d56
3 changed files with 1 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dbe/dbe.c
View File

@ -91,7 +91,6 @@ DbeStubScreen(DbeScreenPrivPtr pDbeScreenPriv, int *nStubbedScreens)
pDbeScreenPriv->AllocBackBufferName = NULL; pDbeScreenPriv->AllocBackBufferName = NULL;
pDbeScreenPriv->SwapBuffers = NULL; pDbeScreenPriv->SwapBuffers = NULL;
pDbeScreenPriv->WinPrivDelete = NULL; pDbeScreenPriv->WinPrivDelete = NULL;
pDbeScreenPriv->ResetProc = NULL;
(*nStubbedScreens)++; (*nStubbedScreens)++;
@ -1255,10 +1254,7 @@ DbeResetProc(ExtensionEntry * extEntry)
if (pDbeScreenPriv) { if (pDbeScreenPriv) {
/* Unwrap DestroyWindow, which was wrapped in DbeExtensionInit(). */ /* Unwrap DestroyWindow, which was wrapped in DbeExtensionInit(). */
pScreen->DestroyWindow = pDbeScreenPriv->DestroyWindow; pScreen->DestroyWindow = pDbeScreenPriv->DestroyWindow;
pScreen->PositionWindow = pDbeScreenPriv->PositionWindow;
if (pDbeScreenPriv->ResetProc)
(*pDbeScreenPriv->ResetProc) (pScreen);
free(pDbeScreenPriv); free(pDbeScreenPriv);
} }
} }

3
dbe/dbestruct.h
View File

@ -183,9 +183,6 @@ typedef struct _DbeScreenPrivRec {
void (*WinPrivDelete) (DbeWindowPrivPtr /*pDbeWindowPriv */ , void (*WinPrivDelete) (DbeWindowPrivPtr /*pDbeWindowPriv */ ,
XID /*bufId */ XID /*bufId */
); );
void (*ResetProc) (ScreenPtr /*pScreen */
);
} DbeScreenPrivRec, *DbeScreenPrivPtr; } DbeScreenPrivRec, *DbeScreenPrivPtr;
#endif /* DBE_STRUCT_H */ #endif /* DBE_STRUCT_H */

25
dbe/midbe.c
View File

@ -680,30 +680,6 @@ miDbePositionWindow(WindowPtr pWin, int x, int y)
} /* miDbePositionWindow() */ } /* 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 * DBE MI Procedure: miDbeInit
@ -729,7 +705,6 @@ miDbeInit(ScreenPtr pScreen, DbeScreenPrivPtr pDbeScreenPriv)
pDbeScreenPriv->GetVisualInfo = miDbeGetVisualInfo; pDbeScreenPriv->GetVisualInfo = miDbeGetVisualInfo;
pDbeScreenPriv->AllocBackBufferName = miDbeAllocBackBufferName; pDbeScreenPriv->AllocBackBufferName = miDbeAllocBackBufferName;
pDbeScreenPriv->SwapBuffers = miDbeSwapBuffers; pDbeScreenPriv->SwapBuffers = miDbeSwapBuffers;
pDbeScreenPriv->ResetProc = miDbeResetProc;
pDbeScreenPriv->WinPrivDelete = miDbeWinPrivDelete; pDbeScreenPriv->WinPrivDelete = miDbeWinPrivDelete;
return TRUE; return TRUE;