(!1705) xwin: drop wrapping on ScreenRec->RealizeWindow()
Instead of complicated wrapping, just call fbRealizeWindow() directly. Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
parent
903f873084
commit
e8b370c9a9
|
@ -499,7 +499,6 @@ typedef struct _winPrivScreenRec {
|
|||
winCreateScreenResourcesProc pwinCreateScreenResources;
|
||||
|
||||
/* Window Procedures for Rootless mode */
|
||||
RealizeWindowProcPtr RealizeWindow;
|
||||
UnrealizeWindowProcPtr UnrealizeWindow;
|
||||
ValidateTreeProcPtr ValidateTree;
|
||||
PostValidateTreeProcPtr PostValidateTree;
|
||||
|
|
|
@ -345,9 +345,7 @@ winMapWindowMultiWindow(WindowPtr pWin)
|
|||
ErrorF("winMapWindowMultiWindow - pWin: %p\n", pWin);
|
||||
#endif
|
||||
|
||||
WIN_UNWRAP(RealizeWindow);
|
||||
fResult = (*pScreen->RealizeWindow) (pWin);
|
||||
WIN_WRAP(RealizeWindow, winMapWindowMultiWindow);
|
||||
fbRealizeWindow(pWin);
|
||||
|
||||
/* Flag that this window has not been destroyed */
|
||||
pWinPriv->fXKilled = FALSE;
|
||||
|
|
|
@ -378,7 +378,6 @@ winFinishScreenInitFB(int i, ScreenPtr pScreen, int argc, char **argv)
|
|||
}
|
||||
|
||||
/* Save a pointer to each lower-level window procedure */
|
||||
WRAP(RealizeWindow);
|
||||
WRAP(UnrealizeWindow);
|
||||
|
||||
/* Assign rootless window procedures to be top level procedures */
|
||||
|
@ -406,7 +405,6 @@ winFinishScreenInitFB(int i, ScreenPtr pScreen, int argc, char **argv)
|
|||
}
|
||||
|
||||
/* Save a pointer to each lower-level window procedure */
|
||||
WRAP(RealizeWindow);
|
||||
WRAP(UnrealizeWindow);
|
||||
WRAP(ReparentWindow);
|
||||
WRAP(RestackWindow);
|
||||
|
|
|
@ -194,9 +194,7 @@ winMapWindowRootless(WindowPtr pWin)
|
|||
winTrace("winMapWindowRootless (%p)\n", pWin);
|
||||
#endif
|
||||
|
||||
WIN_UNWRAP(RealizeWindow);
|
||||
fResult = (*pScreen->RealizeWindow) (pWin);
|
||||
WIN_WRAP(RealizeWindow, winMapWindowRootless);
|
||||
fbRealizeWindow(pWin);
|
||||
|
||||
winReshapeRootless(pWin);
|
||||
|
||||
|
|
Loading…
Reference in New Issue