From 1758b9452033d5a18c4bb881ab014e4c13a3c0aa Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Fri, 27 Sep 2024 10:35:48 +0200
Subject: [PATCH] xwin: drop winResizeWindowMultiWindow()

This wrapping function for Screen->ResizeWindow() 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>
---
 hw/xwin/win.h                  |  6 ------
 hw/xwin/winmultiwindowwindow.c | 19 -------------------
 hw/xwin/winscrinit.c           |  2 --
 3 files changed, 27 deletions(-)

diff --git a/hw/xwin/win.h b/hw/xwin/win.h
index 1e9d4b5ad..1ed71b938 100644
--- a/hw/xwin/win.h
+++ b/hw/xwin/win.h
@@ -503,7 +503,6 @@ typedef struct _winPrivScreenRec {
     PostValidateTreeProcPtr PostValidateTree;
     ClearToBackgroundProcPtr ClearToBackground;
     ClipNotifyProcPtr ClipNotify;
-    ResizeWindowProcPtr ResizeWindow;
     ModifyPixmapHeaderProcPtr ModifyPixmapHeader;
 
     winCursorRec cursor;
@@ -910,11 +909,6 @@ void
  winReorderWindowsMultiWindow(void);
 
 void
-
-winResizeWindowMultiWindow(WindowPtr pWin, int x, int y, unsigned int w,
-                           unsigned int h, WindowPtr pSib);
-void
-
 winMoveWindowMultiWindow(WindowPtr pWin, int x, int y,
                          WindowPtr pSib, VTKind kind);
 
diff --git a/hw/xwin/winmultiwindowwindow.c b/hw/xwin/winmultiwindowwindow.c
index 043973f3d..99350a1d3 100644
--- a/hw/xwin/winmultiwindowwindow.c
+++ b/hw/xwin/winmultiwindowwindow.c
@@ -761,25 +761,6 @@ winMoveWindowMultiWindow(WindowPtr pWin, int x, int y,
     miMoveWindow(pWin, x, y, pSib, kind);
 }
 
-/*
- * ResizeWindow - See Porting Layer Definition - p. 42
- */
-void
-winResizeWindowMultiWindow(WindowPtr pWin, int x, int y, unsigned int w,
-                           unsigned int h, WindowPtr pSib)
-{
-    ScreenPtr pScreen = pWin->drawable.pScreen;
-
-    winScreenPriv(pScreen);
-
-#if ENABLE_DEBUG
-    ErrorF("ResizeWindowMultiWindow to (%d, %d) - %dx%d\n", x, y, w, h);
-#endif
-    WIN_UNWRAP(ResizeWindow);
-    (*pScreen->ResizeWindow) (pWin, x, y, w, h, pSib);
-    WIN_WRAP(ResizeWindow, winResizeWindowMultiWindow);
-}
-
 /*
  * winAdjustXWindow
  *
diff --git a/hw/xwin/winscrinit.c b/hw/xwin/winscrinit.c
index e5137a458..86293739f 100644
--- a/hw/xwin/winscrinit.c
+++ b/hw/xwin/winscrinit.c
@@ -402,7 +402,6 @@ winFinishScreenInitFB(int i, ScreenPtr pScreen, int argc, char **argv)
     }
 
         /* Save a pointer to each lower-level window procedure */
-        WRAP(ResizeWindow);
         WRAP(ModifyPixmapHeader);
 
         /* Assign multi-window window procedures to be top level procedures */
@@ -414,7 +413,6 @@ winFinishScreenInitFB(int i, ScreenPtr pScreen, int argc, char **argv)
         pScreen->UnrealizeWindow = winUnmapWindowMultiWindow;
         pScreen->ReparentWindow = winReparentWindowMultiWindow;
         pScreen->RestackWindow = winRestackWindowMultiWindow;
-        pScreen->ResizeWindow = winResizeWindowMultiWindow;
         pScreen->MoveWindow = winMoveWindowMultiWindow;
         pScreen->SetShape = winSetShapeMultiWindow;