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

(!1705) xwin: drop wrapping on ScreenRec->CreateWindow() 

Instead of complicated wrapping, just call fbCreateWindow 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:54:57 +02:00
parent 1caa65d8bc
commit 5b0fe6cfe8
4 changed files with 2 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

@ -500,7 +500,6 @@ typedef struct _winPrivScreenRec {
winCreateScreenResourcesProc pwinCreateScreenResources; winCreateScreenResourcesProc pwinCreateScreenResources;
/* Window Procedures for Rootless mode */ /* Window Procedures for Rootless mode */
CreateWindowProcPtr CreateWindow;
ChangeWindowAttributesProcPtr ChangeWindowAttributes; ChangeWindowAttributesProcPtr ChangeWindowAttributes;
RealizeWindowProcPtr RealizeWindow; RealizeWindowProcPtr RealizeWindow;
UnrealizeWindowProcPtr UnrealizeWindow; UnrealizeWindowProcPtr UnrealizeWindow;

4
hw/xwin/winmultiwindowwindow.c
View File

@ -109,9 +109,7 @@ winCreateWindowMultiWindow(WindowPtr pWin)
winTrace("winCreateWindowMultiWindow - pWin: %p\n", pWin); winTrace("winCreateWindowMultiWindow - pWin: %p\n", pWin);
#endif #endif
WIN_UNWRAP(CreateWindow); fbCreateWindow(pWin);
fResult = (*pScreen->CreateWindow) (pWin);
WIN_WRAP(CreateWindow, winCreateWindowMultiWindow);
/* Initialize some privates values */ /* Initialize some privates values */
pWinPriv->hRgn = NULL; pWinPriv->hRgn = NULL;

2
hw/xwin/winscrinit.c
View File

@ -377,7 +377,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(RealizeWindow); WRAP(RealizeWindow);
WRAP(UnrealizeWindow); WRAP(UnrealizeWindow);
WRAP(ChangeWindowAttributes); WRAP(ChangeWindowAttributes);
@ -408,7 +407,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(RealizeWindow); WRAP(RealizeWindow);
WRAP(UnrealizeWindow); WRAP(UnrealizeWindow);
WRAP(ChangeWindowAttributes); WRAP(ChangeWindowAttributes);

4
hw/xwin/winwindow.c
View File

@ -65,9 +65,7 @@ winCreateWindowRootless(WindowPtr pWin)
winTrace("winCreateWindowRootless (%p)\n", pWin); winTrace("winCreateWindowRootless (%p)\n", pWin);
#endif #endif
WIN_UNWRAP(CreateWindow); fResult = fbCreateWindow(pWin);
fResult = (*pScreen->CreateWindow) (pWin);
WIN_WRAP(CreateWindow, winCreateWindowRootless);
pWinPriv->hRgn = NULL; pWinPriv->hRgn = NULL;