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

xwin: drop wrapping on ScreenRec->UnrealizeWindow() 

Instead of complicated wrapping, just call fbUnrealizeWindow() directly.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult 2024-09-26 20:42:47 +02:00
parent 0dfe79f9da
commit 41531e8220
4 changed files with 2 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hw/xwin/win.h
View File

@ -499,7 +499,6 @@ typedef struct _winPrivScreenRec {
winCreateScreenResourcesProc pwinCreateScreenResources; winCreateScreenResourcesProc pwinCreateScreenResources;
/* Window Procedures for Rootless mode */ /* Window Procedures for Rootless mode */
UnrealizeWindowProcPtr UnrealizeWindow;
ValidateTreeProcPtr ValidateTree; ValidateTreeProcPtr ValidateTree;
PostValidateTreeProcPtr PostValidateTree; PostValidateTreeProcPtr PostValidateTree;
ClearToBackgroundProcPtr ClearToBackground; ClearToBackgroundProcPtr ClearToBackground;

8
hw/xwin/winmultiwindowwindow.c
View File

@ -285,19 +285,13 @@ winChangeWindowAttributesMultiWindow(WindowPtr pWin, unsigned long mask)
Bool Bool
winUnmapWindowMultiWindow(WindowPtr pWin) winUnmapWindowMultiWindow(WindowPtr pWin)
{ {
Bool fResult = TRUE;
ScreenPtr pScreen = pWin->drawable.pScreen;
winWindowPriv(pWin); winWindowPriv(pWin);
winScreenPriv(pScreen);
#if ENABLE_DEBUG #if ENABLE_DEBUG
ErrorF("winUnmapWindowMultiWindow - pWin: %p\n", pWin); ErrorF("winUnmapWindowMultiWindow - pWin: %p\n", pWin);
#endif #endif
WIN_UNWRAP(UnrealizeWindow); Bool fResult = fbUnrealizeWindow(pWin);
fResult = (*pScreen->UnrealizeWindow) (pWin);
WIN_WRAP(UnrealizeWindow, winUnmapWindowMultiWindow);
/* Flag that the window has been killed */ /* Flag that the window has been killed */
pWinPriv->fXKilled = TRUE; pWinPriv->fXKilled = TRUE;

4
hw/xwin/winscrinit.c
View File

@ -377,9 +377,6 @@ winFinishScreenInitFB(int i, ScreenPtr pScreen, int argc, char **argv)
pScreenPriv->a = NULL; \ pScreenPriv->a = NULL; \
} }
/* Save a pointer to each lower-level window procedure */
WRAP(UnrealizeWindow);
/* Assign rootless window procedures to be top level procedures */ /* Assign rootless window procedures to be top level procedures */
pScreen->CreateWindow = winCreateWindowRootless; pScreen->CreateWindow = winCreateWindowRootless;
pScreen->DestroyWindow = winDestroyWindowRootless; pScreen->DestroyWindow = winDestroyWindowRootless;
@ -405,7 +402,6 @@ winFinishScreenInitFB(int i, ScreenPtr pScreen, int argc, char **argv)
} }
/* Save a pointer to each lower-level window procedure */ /* Save a pointer to each lower-level window procedure */
WRAP(UnrealizeWindow);
WRAP(ReparentWindow); WRAP(ReparentWindow);
WRAP(RestackWindow); WRAP(RestackWindow);
WRAP(ResizeWindow); WRAP(ResizeWindow);

8
hw/xwin/winwindow.c
View File

@ -137,19 +137,13 @@ winChangeWindowAttributesRootless(WindowPtr pWin, unsigned long mask)
Bool Bool
winUnmapWindowRootless(WindowPtr pWin) winUnmapWindowRootless(WindowPtr pWin)
{ {
Bool fResult = FALSE;
ScreenPtr pScreen = pWin->drawable.pScreen;
winWindowPriv(pWin); winWindowPriv(pWin);
winScreenPriv(pScreen);
#if ENABLE_DEBUG #if ENABLE_DEBUG
winTrace("winUnmapWindowRootless (%p)\n", pWin); winTrace("winUnmapWindowRootless (%p)\n", pWin);
#endif #endif
WIN_UNWRAP(UnrealizeWindow); Bool fResult = fbUnrealizeWindow(pWin);
fResult = (*pScreen->UnrealizeWindow) (pWin);
WIN_WRAP(UnrealizeWindow, winUnmapWindowRootless);
if (pWinPriv->hRgn != NULL) { if (pWinPriv->hRgn != NULL) {
DeleteObject(pWinPriv->hRgn); DeleteObject(pWinPriv->hRgn);