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

xwin: drop wrapping on ScreenRec->RestackWindow() 

This proc vector is optional (callers check for non-null) and neither fb nor
mi set it, so we can just assign our function directly. No need for wrapping.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult 2024-09-27 10:16:31 +02:00
parent a698ebe1f8
commit 0356a26d9f
3 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hw/xwin/win.h
View File

@ -503,7 +503,6 @@ typedef struct _winPrivScreenRec {
PostValidateTreeProcPtr PostValidateTree; PostValidateTreeProcPtr PostValidateTree;
ClearToBackgroundProcPtr ClearToBackground; ClearToBackgroundProcPtr ClearToBackground;
ClipNotifyProcPtr ClipNotify; ClipNotifyProcPtr ClipNotify;
RestackWindowProcPtr RestackWindow;
ResizeWindowProcPtr ResizeWindow; ResizeWindowProcPtr ResizeWindow;
MoveWindowProcPtr MoveWindow; MoveWindowProcPtr MoveWindow;
ModifyPixmapHeaderProcPtr ModifyPixmapHeader; ModifyPixmapHeaderProcPtr ModifyPixmapHeader;

8
hw/xwin/winmultiwindowwindow.c
View File

@ -361,19 +361,11 @@ winRestackWindowMultiWindow(WindowPtr pWin, WindowPtr pOldNextSib)
HWND hInsertAfter; HWND hInsertAfter;
HWND hWnd = NULL; HWND hWnd = NULL;
#endif #endif
ScreenPtr pScreen = pWin->drawable.pScreen;
winScreenPriv(pScreen);
#if ENABLE_DEBUG || ENABLE_DEBUG #if ENABLE_DEBUG || ENABLE_DEBUG
winTrace("winRestackMultiWindow - %p\n", pWin); winTrace("winRestackMultiWindow - %p\n", pWin);
#endif #endif
WIN_UNWRAP(RestackWindow);
if (pScreen->RestackWindow)
(*pScreen->RestackWindow) (pWin, pOldNextSib);
WIN_WRAP(RestackWindow, winRestackWindowMultiWindow);
#if 1 #if 1
/* /*
* Calling winReorderWindowsMultiWindow here means our window manager * Calling winReorderWindowsMultiWindow here means our window manager

1
hw/xwin/winscrinit.c
View File

@ -402,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(RestackWindow);
WRAP(ResizeWindow); WRAP(ResizeWindow);
WRAP(MoveWindow); WRAP(MoveWindow);
WRAP(ModifyPixmapHeader); WRAP(ModifyPixmapHeader);