From 147b9e0266e5ab7cb8778d4db27c36ebaad4191f Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Thu, 26 Sep 2024 20:35:07 +0200
Subject: [PATCH] (!1705) xwin: drop wrapping on ScreenRec->RealizeWindow()

Instead of complicated wrapping, just call fbRealizeWindow() 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 d65f8de3b..d7f4ffa6e 100644
--- a/hw/xwin/win.h
+++ b/hw/xwin/win.h
@@ -499,7 +499,6 @@ typedef struct _winPrivScreenRec {
     winCreateScreenResourcesProc pwinCreateScreenResources;
 
     /* Window Procedures for Rootless mode */
-    RealizeWindowProcPtr RealizeWindow;
     UnrealizeWindowProcPtr UnrealizeWindow;
     ValidateTreeProcPtr ValidateTree;
     PostValidateTreeProcPtr PostValidateTree;
diff --git a/hw/xwin/winmultiwindowwindow.c b/hw/xwin/winmultiwindowwindow.c
index 3688565e0..5a8659de7 100644
--- a/hw/xwin/winmultiwindowwindow.c
+++ b/hw/xwin/winmultiwindowwindow.c
@@ -343,9 +343,7 @@ winMapWindowMultiWindow(WindowPtr pWin)
     ErrorF("winMapWindowMultiWindow - pWin: %p\n", pWin);
 #endif
 
-    WIN_UNWRAP(RealizeWindow);
-    fResult = (*pScreen->RealizeWindow) (pWin);
-    WIN_WRAP(RealizeWindow, winMapWindowMultiWindow);
+    fbRealizeWindow(pWin);
 
     /* Flag that this window has not been destroyed */
     pWinPriv->fXKilled = FALSE;
diff --git a/hw/xwin/winscrinit.c b/hw/xwin/winscrinit.c
index ccc06560a..bfa981d07 100644
--- a/hw/xwin/winscrinit.c
+++ b/hw/xwin/winscrinit.c
@@ -378,7 +378,6 @@ winFinishScreenInitFB(int i, ScreenPtr pScreen, int argc, char **argv)
     }
 
         /* Save a pointer to each lower-level window procedure */
-        WRAP(RealizeWindow);
         WRAP(UnrealizeWindow);
 
         /* Assign rootless window procedures to be top level procedures */
@@ -406,7 +405,6 @@ winFinishScreenInitFB(int i, ScreenPtr pScreen, int argc, char **argv)
     }
 
         /* Save a pointer to each lower-level window procedure */
-        WRAP(RealizeWindow);
         WRAP(UnrealizeWindow);
         WRAP(ReparentWindow);
         WRAP(RestackWindow);
diff --git a/hw/xwin/winwindow.c b/hw/xwin/winwindow.c
index c70311e96..7445e4135 100644
--- a/hw/xwin/winwindow.c
+++ b/hw/xwin/winwindow.c
@@ -191,9 +191,7 @@ winMapWindowRootless(WindowPtr pWin)
     winTrace("winMapWindowRootless (%p)\n", pWin);
 #endif
 
-    WIN_UNWRAP(RealizeWindow);
-    fResult = (*pScreen->RealizeWindow) (pWin);
-    WIN_WRAP(RealizeWindow, winMapWindowRootless);
+    fbRealizeWindow(pWin);
 
     winReshapeRootless(pWin);