dix/render: consolidate window format matching code.

 Backported from X.org:

 commit 957bf959fb577b292a3e4f6bb67740ca09e7aeb9
 Author: Dave Airlie <airlied@redhat.com>
 Date:   Wed Jun 27 14:36:04 2012 +0100

    dix/render: consolidate window format matching code.

    This code existed in 3 different forms, perhaps it should be
    consolidated.

    Reviewed-by: Keith Packard <keithp@keithp.com>
    Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
    Signed-off-by: Keith Packard <keithp@keithp.com>

    Backported to NX by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>

nx-X11/programs/Xserver/composite/compalloc.c

@@ -572,8 +572,8 @@ compNewPixmap (WindowPtr pWin, int x, int y, int w, int h)
         }
     }
     else {
-	PictFormatPtr	pSrcFormat = compWindowFormat (pParent);
-	PictFormatPtr	pDstFormat = compWindowFormat (pWin);
+	PictFormatPtr	pSrcFormat = PictureWindowFormat(pParent);
+	PictFormatPtr	pDstFormat = PictureWindowFormat(pWin);
         XID inferiors = IncludeInferiors;
         int error;
 

nx-X11/programs/Xserver/composite/compint.h

@@ -267,9 +267,6 @@ compCheckTree (ScreenPtr pScreen);
 #define compCheckTree(s)
 #endif
 
-PictFormatPtr
-compWindowFormat (WindowPtr pWin);
-
 void
 compSetPixmap (WindowPtr pWin, PixmapPtr pPixmap);
 

nx-X11/programs/Xserver/composite/compwindow.c

@@ -717,37 +717,15 @@ compGetRedirectBorderClip (WindowPtr pWin)
     return &cw->borderClip;
 }
 
-static VisualPtr
-compGetWindowVisual (WindowPtr pWin)
-{
-    ScreenPtr	    pScreen = pWin->drawable.pScreen;
-    VisualID	    vid = wVisual (pWin);
-    int		    i;
-
-    for (i = 0; i < pScreen->numVisuals; i++)
-	if (pScreen->visuals[i].vid == vid)
-	    return &pScreen->visuals[i];
-    return 0;
-}
-
-PictFormatPtr
-compWindowFormat (WindowPtr pWin)
-{
-    ScreenPtr	pScreen = pWin->drawable.pScreen;
-
-    return PictureMatchVisual (pScreen, pWin->drawable.depth,
-			       compGetWindowVisual (pWin));
-}
-
 static void
 compWindowUpdateAutomatic (WindowPtr pWin)
 {
     CompWindowPtr   cw = GetCompWindow (pWin);
     ScreenPtr	    pScreen = pWin->drawable.pScreen;
     WindowPtr	    pParent = pWin->parent;
     PixmapPtr	    pSrcPixmap = (*pScreen->GetWindowPixmap) (pWin);
-    PictFormatPtr   pSrcFormat = compWindowFormat (pWin);
-    PictFormatPtr   pDstFormat = compWindowFormat (pWin->parent);
+    PictFormatPtr   pSrcFormat = PictureWindowFormat (pWin);
+    PictFormatPtr   pDstFormat = PictureWindowFormat (pWin->parent);
     int		    error;
     RegionPtr	    pRegion = DamageRegion (cw->damage);
     PicturePtr	    pSrcPicture = CreatePicture (0, &pSrcPixmap->drawable,

nx-X11/programs/Xserver/dix/window.c

@@ -3692,5 +3692,17 @@ DrawLogo(WindowPtr pWin)
 
     FreeScratchGC(pGC);
 }
-
 #endif
+
+VisualPtr
+WindowGetVisual(WindowPtr pWin)
+{
+    ScreenPtr pScreen = pWin->drawable.pScreen;
+    VisualID vid = wVisual(pWin);
+    int i;
+
+    for (i = 0; i < pScreen->numVisuals; i++)
+        if (pScreen->visuals[i].vid == vid)
+            return &pScreen->visuals[i];
+    return 0;
+}

nx-X11/programs/Xserver/include/window.h

@@ -264,11 +264,6 @@ extern RegionPtr CreateBoundingShape(
 extern RegionPtr CreateClipShape(
     WindowPtr /* pWin */ );
 
-extern void DisableMapUnmapEvents(
+extern VisualPtr WindowGetVisual(
     WindowPtr /* pWin */ );
-extern void EnableMapUnmapEvents(
-    WindowPtr /* pWin */ );
-extern Bool MapUnmapEventsEnabled(
-    WindowPtr /* pWin */ );
-
 #endif /* WINDOW_H */

nx-X11/programs/Xserver/mi/midispcur.c

@@ -199,31 +199,16 @@ miDCRealizeCursor (pScreen, pCursor)
 #ifdef ARGB_CURSOR
 #define EnsurePicture(picture,draw,win) (picture || miDCMakePicture(&picture,draw,win))
 
-static VisualPtr
-miDCGetWindowVisual (WindowPtr pWin)
-{
-    ScreenPtr	    pScreen = pWin->drawable.pScreen;
-    VisualID	    vid = wVisual (pWin);
-    int		    i;
-
-    for (i = 0; i < pScreen->numVisuals; i++)
-	if (pScreen->visuals[i].vid == vid)
-	    return &pScreen->visuals[i];
-    return 0;
-}
-
 static PicturePtr
 miDCMakePicture (PicturePtr *ppPicture, DrawablePtr pDraw, WindowPtr pWin)
 {
     PictFormatPtr   pFormat;
     XID		    subwindow_mode = IncludeInferiors;
     PicturePtr	    pPicture;
     int		    error;
-
-    pVisual = miDCGetWindowVisual (pWin);
-    if (!pVisual)
-	return 0;
-    pFormat = PictureMatchVisual (pScreen, pDraw->depth, pVisual);
+
+
+    pFormat = PictureWindowFormat(pWin);
     if (!pFormat)
 	return 0;
     pPicture = CreatePicture (0, pDraw, pFormat,

nx-X11/programs/Xserver/render/picture.c

@@ -51,6 +51,14 @@ RESTYPE		PictFormatType;
 RESTYPE		GlyphSetType;
 int		PictureCmapPolicy = PictureCmapPolicyDefault;
 
+PictFormatPtr
+PictureWindowFormat(WindowPtr pWindow)
+{
+    ScreenPtr pScreen = pWindow->drawable.pScreen;
+    return PictureMatchVisual(pScreen, pWindow->drawable.depth,
+                              WindowGetVisual(pWindow));
+}
+
 Bool
 PictureDestroyWindow (WindowPtr pWindow)
 {

nx-X11/programs/Xserver/render/picturestr.h

@@ -412,6 +412,9 @@ PictureStoreColors (ColormapPtr pColormap, int ndef, xColorItem *pdef);
 Bool
 PictureInitIndexedFormats (ScreenPtr pScreen);
 
+PictFormatPtr
+PictureWindowFormat(WindowPtr pWindow);
+
 Bool
 PictureSetSubpixelOrder (ScreenPtr pScreen, int subpixel);