(!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

@@ -499,7 +499,6 @@ typedef struct _winPrivScreenRec {
     winCreateScreenResourcesProc pwinCreateScreenResources;
 
     /* Window Procedures for Rootless mode */
-    RealizeWindowProcPtr RealizeWindow;
     UnrealizeWindowProcPtr UnrealizeWindow;
     ValidateTreeProcPtr ValidateTree;
     PostValidateTreeProcPtr PostValidateTree;

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;

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);

hw/xwin/winwindow.c

@@ -34,6 +34,8 @@
 #endif
 #include "win.h"
 
+#include "mi/mi_priv.h"
+
 /*
  * Prototypes for local functions
  */
@@ -191,9 +193,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);