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

fb/fb.h

@@ -844,6 +844,8 @@ fbPolyFillRect(DrawablePtr pDrawable,
 
 #define fbSetShape miSetShape
 
+#define fbMoveWindow miMoveWindow
+
 /*
  * fbfillsp.c
  */

hw/xwin/win.h

@@ -504,7 +504,6 @@ typedef struct _winPrivScreenRec {
     ClearToBackgroundProcPtr ClearToBackground;
     ClipNotifyProcPtr ClipNotify;
     ResizeWindowProcPtr ResizeWindow;
-    MoveWindowProcPtr MoveWindow;
     ModifyPixmapHeaderProcPtr ModifyPixmapHeader;
 
     winCursorRec cursor;

hw/xwin/winmultiwindowwindow.c

@@ -36,6 +36,8 @@
 #include <xwin-config.h>
 #endif
 
+#include "mi/mi_priv.h"
+
 #include "win.h"
 #include "dixevents.h"
 #include "winmultiwindowclass.h"
@@ -792,9 +794,7 @@ winMoveWindowMultiWindow(WindowPtr pWin, int x, int y,
     ErrorF("MoveWindowMultiWindow to (%d, %d)\n", x, y);
 #endif
 
-    WIN_UNWRAP(MoveWindow);
-    (*pScreen->MoveWindow) (pWin, x, y, pSib, kind);
-    WIN_WRAP(MoveWindow, winMoveWindowMultiWindow);
+    fbMoveWindow(pWin, x, y, pSib, kind);
 }
 
 /*

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 */