From 6d8713b6a78463d65b47faa9677f82a05f72aad7 Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Fri, 27 Sep 2024 10:24:39 +0200
Subject: [PATCH] xwin: drop wrapping on ScreenRec->MoveWindow()

Instead of complicated wrapping, just call fbMoveWindow() directly.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
---
 hw/xwin/win.h                  |  1 -
 hw/xwin/winmultiwindowwindow.c | 10 +++-------
 hw/xwin/winscrinit.c           |  1 -
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/hw/xwin/win.h b/hw/xwin/win.h
index ed7561d5c..1e9d4b5ad 100644
--- a/hw/xwin/win.h
+++ b/hw/xwin/win.h
@@ -504,7 +504,6 @@ typedef struct _winPrivScreenRec {
     ClearToBackgroundProcPtr ClearToBackground;
     ClipNotifyProcPtr ClipNotify;
     ResizeWindowProcPtr ResizeWindow;
-    MoveWindowProcPtr MoveWindow;
     ModifyPixmapHeaderProcPtr ModifyPixmapHeader;
 
     winCursorRec cursor;
diff --git a/hw/xwin/winmultiwindowwindow.c b/hw/xwin/winmultiwindowwindow.c
index 4b431341a..043973f3d 100644
--- a/hw/xwin/winmultiwindowwindow.c
+++ b/hw/xwin/winmultiwindowwindow.c
@@ -36,6 +36,8 @@
 #include <xwin-config.h>
 #endif
 
+#include "mi/mi_priv.h"
+
 #include "win.h"
 #include "winmultiwindowclass.h"
 #include "winmultiwindowicons.h"
@@ -752,17 +754,11 @@ void
 winMoveWindowMultiWindow(WindowPtr pWin, int x, int y,
                          WindowPtr pSib, VTKind kind)
 {
-    ScreenPtr pScreen = pWin->drawable.pScreen;
-
-    winScreenPriv(pScreen);
-
 #if ENABLE_DEBUG
     ErrorF("MoveWindowMultiWindow to (%d, %d)\n", x, y);
 #endif
 
-    WIN_UNWRAP(MoveWindow);
-    (*pScreen->MoveWindow) (pWin, x, y, pSib, kind);
-    WIN_WRAP(MoveWindow, winMoveWindowMultiWindow);
+    miMoveWindow(pWin, x, y, pSib, kind);
 }
 
 /*
diff --git a/hw/xwin/winscrinit.c b/hw/xwin/winscrinit.c
index 6699c8978..e5137a458 100644
--- a/hw/xwin/winscrinit.c
+++ b/hw/xwin/winscrinit.c
@@ -403,7 +403,6 @@ winFinishScreenInitFB(int i, ScreenPtr pScreen, int argc, char **argv)
 
         /* Save a pointer to each lower-level window procedure */
         WRAP(ResizeWindow);
-        WRAP(MoveWindow);
         WRAP(ModifyPixmapHeader);
 
         /* Assign multi-window window procedures to be top level procedures */