From 1d96b6838fd82d4a0d47cc73608d23122e038700 Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Thu, 26 Sep 2024 17:50:53 +0200
Subject: [PATCH] (!1705) xwin: drop wrapping on ScreenRec->PositionWindow()

Instead of complicated wrapping, just call fbPositionWindow directly.

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

diff --git a/hw/xwin/win.h b/hw/xwin/win.h
index 1efc8236e..f29466ffd 100644
--- a/hw/xwin/win.h
+++ b/hw/xwin/win.h
@@ -501,7 +501,6 @@ typedef struct _winPrivScreenRec {
 
     /* Window Procedures for Rootless mode */
     CreateWindowProcPtr CreateWindow;
-    PositionWindowProcPtr PositionWindow;
     ChangeWindowAttributesProcPtr ChangeWindowAttributes;
     RealizeWindowProcPtr RealizeWindow;
     UnrealizeWindowProcPtr UnrealizeWindow;
diff --git a/hw/xwin/winmultiwindowwindow.c b/hw/xwin/winmultiwindowwindow.c
index 0b7019292..909d6302c 100644
--- a/hw/xwin/winmultiwindowwindow.c
+++ b/hw/xwin/winmultiwindowwindow.c
@@ -188,9 +188,7 @@ winPositionWindowMultiWindow(WindowPtr pWin, int x, int y)
     winTrace("winPositionWindowMultiWindow - pWin: %p\n", pWin);
 #endif
 
-    WIN_UNWRAP(PositionWindow);
-    fResult = (*pScreen->PositionWindow) (pWin, x, y);
-    WIN_WRAP(PositionWindow, winPositionWindowMultiWindow);
+    fbPositionWindow(pWin, x, y);
 
 #if ENABLE_DEBUG
     ErrorF("winPositionWindowMultiWindow: (x, y) = (%d, %d)\n", x, y);
diff --git a/hw/xwin/winscrinit.c b/hw/xwin/winscrinit.c
index 5e12cccb8..23f6dae65 100644
--- a/hw/xwin/winscrinit.c
+++ b/hw/xwin/winscrinit.c
@@ -380,7 +380,6 @@ winFinishScreenInitFB(int i, ScreenPtr pScreen, int argc, char **argv)
         WRAP(CreateWindow);
         WRAP(RealizeWindow);
         WRAP(UnrealizeWindow);
-        WRAP(PositionWindow);
         WRAP(ChangeWindowAttributes);
         WRAP(SetShape);
 
@@ -412,7 +411,6 @@ winFinishScreenInitFB(int i, ScreenPtr pScreen, int argc, char **argv)
         WRAP(CreateWindow);
         WRAP(RealizeWindow);
         WRAP(UnrealizeWindow);
-        WRAP(PositionWindow);
         WRAP(ChangeWindowAttributes);
         WRAP(ReparentWindow);
         WRAP(RestackWindow);
diff --git a/hw/xwin/winwindow.c b/hw/xwin/winwindow.c
index e33176e62..d75616b7e 100644
--- a/hw/xwin/winwindow.c
+++ b/hw/xwin/winwindow.c
@@ -120,9 +120,7 @@ winPositionWindowRootless(WindowPtr pWin, int x, int y)
     winTrace("winPositionWindowRootless (%p)\n", pWin);
 #endif
 
-    WIN_UNWRAP(PositionWindow);
-    fResult = (*pScreen->PositionWindow) (pWin, x, y);
-    WIN_WRAP(PositionWindow, winPositionWindowRootless);
+    fbPositionWindow(pWin, x, y);
 
     winUpdateRgnRootless(pWin);