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

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

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:08:24 +02:00
parent 2c42e1eee9
commit fdd94d7a2a
3 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hw/xwin/win.h
View File

@ -504,7 +504,6 @@ typedef struct _winPrivScreenRec {
ClearToBackgroundProcPtr ClearToBackground; ClearToBackgroundProcPtr ClearToBackground;
ClipNotifyProcPtr ClipNotify; ClipNotifyProcPtr ClipNotify;
RestackWindowProcPtr RestackWindow; RestackWindowProcPtr RestackWindow;
ReparentWindowProcPtr ReparentWindow;
ResizeWindowProcPtr ResizeWindow; ResizeWindowProcPtr ResizeWindow;
MoveWindowProcPtr MoveWindow; MoveWindowProcPtr MoveWindow;
ModifyPixmapHeaderProcPtr ModifyPixmapHeader; ModifyPixmapHeaderProcPtr ModifyPixmapHeader;

5
hw/xwin/winmultiwindowwindow.c
View File

@ -373,11 +373,6 @@ winReparentWindowMultiWindow(WindowPtr pWin, WindowPtr pPriorParent)
pPriorParent, (unsigned int)pPriorParent->drawable.id, pPriorParent, (unsigned int)pPriorParent->drawable.id,
pWin->parent, (unsigned int)pWin->parent->drawable.id); pWin->parent, (unsigned int)pWin->parent->drawable.id);
WIN_UNWRAP(ReparentWindow);
if (pScreen->ReparentWindow)
(*pScreen->ReparentWindow) (pWin, pPriorParent);
WIN_WRAP(ReparentWindow, winReparentWindowMultiWindow);
/* Update the Windows window associated with this X window */ /* Update the Windows window associated with this X window */
winUpdateWindowsWindow(pWin); winUpdateWindowsWindow(pWin);
} }

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(ReparentWindow);
WRAP(RestackWindow); WRAP(RestackWindow);
WRAP(ResizeWindow); WRAP(ResizeWindow);
WRAP(MoveWindow); WRAP(MoveWindow);