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

(!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:
Enrico Weigelt, metux IT consult 2024-09-26 20:35:07 +02:00
parent f7e2c1030d
commit 1603cf9df3
4 changed files with 4 additions and 9 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 */
RealizeWindowProcPtr RealizeWindow;
UnrealizeWindowProcPtr UnrealizeWindow; UnrealizeWindowProcPtr UnrealizeWindow;
ValidateTreeProcPtr ValidateTree; ValidateTreeProcPtr ValidateTree;
PostValidateTreeProcPtr PostValidateTree; PostValidateTreeProcPtr PostValidateTree;

4
hw/xwin/winmultiwindowwindow.c
View File

@ -343,9 +343,7 @@ winMapWindowMultiWindow(WindowPtr pWin)
ErrorF("winMapWindowMultiWindow - pWin: %p\n", pWin); ErrorF("winMapWindowMultiWindow - pWin: %p\n", pWin);
#endif #endif
WIN_UNWRAP(RealizeWindow); fbRealizeWindow(pWin);
fResult = (*pScreen->RealizeWindow) (pWin);
WIN_WRAP(RealizeWindow, winMapWindowMultiWindow);
/* Flag that this window has not been destroyed */ /* Flag that this window has not been destroyed */
pWinPriv->fXKilled = FALSE; pWinPriv->fXKilled = FALSE;

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(RealizeWindow);
WRAP(UnrealizeWindow); WRAP(UnrealizeWindow);
/* Assign rootless window procedures to be top level procedures */ /* 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 */ /* Save a pointer to each lower-level window procedure */
WRAP(RealizeWindow);
WRAP(UnrealizeWindow); WRAP(UnrealizeWindow);
WRAP(ReparentWindow); WRAP(ReparentWindow);
WRAP(RestackWindow); WRAP(RestackWindow);

6
hw/xwin/winwindow.c
View File

@ -34,6 +34,8 @@
#endif #endif
#include "win.h" #include "win.h"
#include "mi/mi_priv.h"
/* /*
* Prototypes for local functions * Prototypes for local functions
*/ */
@ -191,9 +193,7 @@ winMapWindowRootless(WindowPtr pWin)
winTrace("winMapWindowRootless (%p)\n", pWin); winTrace("winMapWindowRootless (%p)\n", pWin);
#endif #endif
WIN_UNWRAP(RealizeWindow); fbRealizeWindow(pWin);
fResult = (*pScreen->RealizeWindow) (pWin);
WIN_WRAP(RealizeWindow, winMapWindowRootless);
winReshapeRootless(pWin); winReshapeRootless(pWin);