From 0dfe79f9da1d8e221afacf79133041d9713fddcb 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] 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 | 8 +-------
 hw/xwin/winscrinit.c           | 2 --
 hw/xwin/winwindow.c            | 9 +--------
 4 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/hw/xwin/win.h b/hw/xwin/win.h
index 1ea6f3173..55034b623 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 51dbc327e..9ac923308 100644
--- a/hw/xwin/winmultiwindowwindow.c
+++ b/hw/xwin/winmultiwindowwindow.c
@@ -316,19 +316,13 @@ winUnmapWindowMultiWindow(WindowPtr pWin)
 Bool
 winMapWindowMultiWindow(WindowPtr pWin)
 {
-    Bool fResult = TRUE;
-    ScreenPtr pScreen = pWin->drawable.pScreen;
-
     winWindowPriv(pWin);
-    winScreenPriv(pScreen);
 
 #if ENABLE_DEBUG
     ErrorF("winMapWindowMultiWindow - pWin: %p\n", pWin);
 #endif
 
-    WIN_UNWRAP(RealizeWindow);
-    fResult = (*pScreen->RealizeWindow) (pWin);
-    WIN_WRAP(RealizeWindow, winMapWindowMultiWindow);
+    Bool fResult = 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 0e4a11215..7509611a4 100644
--- a/hw/xwin/winwindow.c
+++ b/hw/xwin/winwindow.c
@@ -168,18 +168,11 @@ winUnmapWindowRootless(WindowPtr pWin)
 Bool
 winMapWindowRootless(WindowPtr pWin)
 {
-    Bool fResult = FALSE;
-    ScreenPtr pScreen = pWin->drawable.pScreen;
-
-    winScreenPriv(pScreen);
-
 #if ENABLE_DEBUG
     winTrace("winMapWindowRootless (%p)\n", pWin);
 #endif
 
-    WIN_UNWRAP(RealizeWindow);
-    fResult = (*pScreen->RealizeWindow) (pWin);
-    WIN_WRAP(RealizeWindow, winMapWindowRootless);
+    Bool fResult = fbRealizeWindow(pWin);
 
     winReshapeRootless(pWin);