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

(!1705) xwin: drop winCopyWindowMultiWindow() 

This wrapping function for Screen->CopyWindow() is does nothing more than
just call the original functions. So no need to keep wrapping it at all.

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:14:43 +02:00
parent a19219eb48
commit 68b4627973
3 changed files with 0 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hw/xwin/win.h
View File

@ -503,7 +503,6 @@ typedef struct _winPrivScreenRec {
UnrealizeWindowProcPtr UnrealizeWindow; UnrealizeWindowProcPtr UnrealizeWindow;
ValidateTreeProcPtr ValidateTree; ValidateTreeProcPtr ValidateTree;
PostValidateTreeProcPtr PostValidateTree; PostValidateTreeProcPtr PostValidateTree;
CopyWindowProcPtr CopyWindow;
ClearToBackgroundProcPtr ClearToBackground; ClearToBackgroundProcPtr ClearToBackground;
ClipNotifyProcPtr ClipNotify; ClipNotifyProcPtr ClipNotify;
RestackWindowProcPtr RestackWindow; RestackWindowProcPtr RestackWindow;
@ -925,11 +924,6 @@ void
winMoveWindowMultiWindow(WindowPtr pWin, int x, int y, winMoveWindowMultiWindow(WindowPtr pWin, int x, int y,
WindowPtr pSib, VTKind kind); WindowPtr pSib, VTKind kind);
void
winCopyWindowMultiWindow(WindowPtr pWin, DDXPointRec oldpt,
RegionPtr oldRegion);
PixmapPtr PixmapPtr
winCreatePixmapMultiwindow(ScreenPtr pScreen, int width, int height, int depth, winCreatePixmapMultiwindow(ScreenPtr pScreen, int width, int height, int depth,
unsigned usage_hint); unsigned usage_hint);

18
hw/xwin/winmultiwindowwindow.c
View File

@ -774,24 +774,6 @@ winReorderWindowsMultiWindow(void)
fRestacking = FALSE; fRestacking = FALSE;
} }
/*
* CopyWindow - See Porting Layer Definition - p. 39
*/
void
winCopyWindowMultiWindow(WindowPtr pWin, DDXPointRec oldpt, RegionPtr oldRegion)
{
ScreenPtr pScreen = pWin->drawable.pScreen;
winScreenPriv(pScreen);
#if ENABLE_DEBUG
ErrorF("CopyWindowMultiWindow\n");
#endif
WIN_UNWRAP(CopyWindow);
(*pScreen->CopyWindow) (pWin, oldpt, oldRegion);
WIN_WRAP(CopyWindow, winCopyWindowMultiWindow);
}
/* /*
* MoveWindow - See Porting Layer Definition - p. 42 * MoveWindow - See Porting Layer Definition - p. 42
*/ */

2
hw/xwin/winscrinit.c
View File

@ -413,7 +413,6 @@ winFinishScreenInitFB(int i, ScreenPtr pScreen, int argc, char **argv)
WRAP(RestackWindow); WRAP(RestackWindow);
WRAP(ResizeWindow); WRAP(ResizeWindow);
WRAP(MoveWindow); WRAP(MoveWindow);
WRAP(CopyWindow);
WRAP(SetShape); WRAP(SetShape);
WRAP(ModifyPixmapHeader); WRAP(ModifyPixmapHeader);
@ -428,7 +427,6 @@ winFinishScreenInitFB(int i, ScreenPtr pScreen, int argc, char **argv)
pScreen->RestackWindow = winRestackWindowMultiWindow; pScreen->RestackWindow = winRestackWindowMultiWindow;
pScreen->ResizeWindow = winResizeWindowMultiWindow; pScreen->ResizeWindow = winResizeWindowMultiWindow;
pScreen->MoveWindow = winMoveWindowMultiWindow; pScreen->MoveWindow = winMoveWindowMultiWindow;
pScreen->CopyWindow = winCopyWindowMultiWindow;
pScreen->SetShape = winSetShapeMultiWindow; pScreen->SetShape = winSetShapeMultiWindow;
if (pScreenInfo->fCompositeWM) { if (pScreenInfo->fCompositeWM) {