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

xwin: drop wrapping on ScreenRec->ChangeWindowAttributes() 

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 18:06:47 +02:00
parent acbb76fd70
commit 1b990d3c0c
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

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

9
hw/xwin/winmultiwindowwindow.c
View File

@ -264,18 +264,11 @@ winPositionWindowMultiWindow(WindowPtr pWin, int x, int y)
Bool Bool
winChangeWindowAttributesMultiWindow(WindowPtr pWin, unsigned long mask) winChangeWindowAttributesMultiWindow(WindowPtr pWin, unsigned long mask)
{ {
Bool fResult = TRUE;
ScreenPtr pScreen = pWin->drawable.pScreen;
winScreenPriv(pScreen);
#if ENABLE_DEBUG #if ENABLE_DEBUG
ErrorF("winChangeWindowAttributesMultiWindow - pWin: %p\n", pWin); ErrorF("winChangeWindowAttributesMultiWindow - pWin: %p\n", pWin);
#endif #endif
WIN_UNWRAP(ChangeWindowAttributes); Bool fResult = fbChangeWindowAttributes(pWin, mask);
fResult = (*pScreen->ChangeWindowAttributes) (pWin, mask);
WIN_WRAP(ChangeWindowAttributes, winChangeWindowAttributesMultiWindow);
/* /*
* NOTE: We do not currently need to do anything here. * NOTE: We do not currently need to do anything here.

2
hw/xwin/winscrinit.c
View File

@ -379,7 +379,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(RealizeWindow);
WRAP(UnrealizeWindow); WRAP(UnrealizeWindow);
WRAP(ChangeWindowAttributes);
WRAP(SetShape); WRAP(SetShape);
/* Assign rootless window procedures to be top level procedures */ /* Assign rootless window procedures to be top level procedures */
@ -409,7 +408,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(RealizeWindow);
WRAP(UnrealizeWindow); WRAP(UnrealizeWindow);
WRAP(ChangeWindowAttributes);
WRAP(ReparentWindow); WRAP(ReparentWindow);
WRAP(RestackWindow); WRAP(RestackWindow);
WRAP(ResizeWindow); WRAP(ResizeWindow);

9
hw/xwin/winwindow.c
View File

@ -117,18 +117,11 @@ winPositionWindowRootless(WindowPtr pWin, int x, int y)
Bool Bool
winChangeWindowAttributesRootless(WindowPtr pWin, unsigned long mask) winChangeWindowAttributesRootless(WindowPtr pWin, unsigned long mask)
{ {
Bool fResult = FALSE;
ScreenPtr pScreen = pWin->drawable.pScreen;
winScreenPriv(pScreen);
#if ENABLE_DEBUG #if ENABLE_DEBUG
winTrace("winChangeWindowAttributesRootless (%p)\n", pWin); winTrace("winChangeWindowAttributesRootless (%p)\n", pWin);
#endif #endif
WIN_UNWRAP(ChangeWindowAttributes); Bool fResult = fbChangeWindowAttributes(pWin, mask);
fResult = (*pScreen->ChangeWindowAttributes) (pWin, mask);
WIN_WRAP(ChangeWindowAttributes, winChangeWindowAttributesRootless);
winUpdateRgnRootless(pWin); winUpdateRgnRootless(pWin);