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

xwin: drop wrapping on ScreenRec->DestroyWindow() 

Instead of complicated wrapping, just call fbDestroyWindow 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 17:34:54 +02:00
parent 66e1b34a88
commit b0460841e8
4 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hw/xwin/win.h
View File

@ -501,7 +501,6 @@ typedef struct _winPrivScreenRec {
/* Window Procedures for Rootless mode */ /* Window Procedures for Rootless mode */
CreateWindowProcPtr CreateWindow; CreateWindowProcPtr CreateWindow;
DestroyWindowProcPtr DestroyWindow;
PositionWindowProcPtr PositionWindow; PositionWindowProcPtr PositionWindow;
ChangeWindowAttributesProcPtr ChangeWindowAttributes; ChangeWindowAttributesProcPtr ChangeWindowAttributes;
RealizeWindowProcPtr RealizeWindow; RealizeWindowProcPtr RealizeWindow;

8
hw/xwin/winmultiwindowwindow.c
View File

@ -131,19 +131,13 @@ winCreateWindowMultiWindow(WindowPtr pWin)
Bool Bool
winDestroyWindowMultiWindow(WindowPtr pWin) winDestroyWindowMultiWindow(WindowPtr pWin)
{ {
Bool fResult = TRUE;
ScreenPtr pScreen = pWin->drawable.pScreen;
winWindowPriv(pWin); winWindowPriv(pWin);
winScreenPriv(pScreen);
#if ENABLE_DEBUG #if ENABLE_DEBUG
ErrorF("winDestroyWindowMultiWindow - pWin: %p\n", pWin); ErrorF("winDestroyWindowMultiWindow - pWin: %p\n", pWin);
#endif #endif
WIN_UNWRAP(DestroyWindow); Bool fResult = fbDestroyWindow(pWin);
fResult = (*pScreen->DestroyWindow) (pWin);
WIN_WRAP(DestroyWindow, winDestroyWindowMultiWindow);
/* Flag that the window has been destroyed */ /* Flag that the window has been destroyed */
pWinPriv->fXKilled = TRUE; pWinPriv->fXKilled = TRUE;

2
hw/xwin/winscrinit.c
View File

@ -378,7 +378,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(CreateWindow); WRAP(CreateWindow);
WRAP(DestroyWindow);
WRAP(RealizeWindow); WRAP(RealizeWindow);
WRAP(UnrealizeWindow); WRAP(UnrealizeWindow);
WRAP(PositionWindow); WRAP(PositionWindow);
@ -411,7 +410,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(CreateWindow); WRAP(CreateWindow);
WRAP(DestroyWindow);
WRAP(RealizeWindow); WRAP(RealizeWindow);
WRAP(UnrealizeWindow); WRAP(UnrealizeWindow);
WRAP(PositionWindow); WRAP(PositionWindow);

8
hw/xwin/winwindow.c
View File

@ -80,19 +80,13 @@ winCreateWindowRootless(WindowPtr pWin)
Bool Bool
winDestroyWindowRootless(WindowPtr pWin) winDestroyWindowRootless(WindowPtr pWin)
{ {
Bool fResult = FALSE;
ScreenPtr pScreen = pWin->drawable.pScreen;
winWindowPriv(pWin); winWindowPriv(pWin);
winScreenPriv(pScreen);
#if ENABLE_DEBUG #if ENABLE_DEBUG
winTrace("winDestroyWindowRootless (%p)\n", pWin); winTrace("winDestroyWindowRootless (%p)\n", pWin);
#endif #endif
WIN_UNWRAP(DestroyWindow); Bool fResult = fbDestroyWindow(pWin);
fResult = (*pScreen->DestroyWindow) (pWin);
WIN_WRAP(DestroyWindow, winDestroyWindowRootless);
if (pWinPriv->hRgn != NULL) { if (pWinPriv->hRgn != NULL) {
DeleteObject(pWinPriv->hRgn); DeleteObject(pWinPriv->hRgn);