Merge branch 'uli42-pr/update_mi' into 3.6.x

nx-X11/programs/Xserver/hw/nxagent/NXmiexpose.c

@@ -504,7 +504,7 @@ int what;
     BITS32 gcmask, index, mask;
     RegionRec prgnWin;
     DDXPointRec oldCorner;
-    BoxRec box;
+    BoxRec box = {0};
     WindowPtr	pBgWin;
     GCPtr pGC;
     register int i;
@@ -566,8 +566,7 @@ int what;
 	}
     }
 
-    prect = (xRectangle *)malloc(RegionNumRects(prgn) *
-					 sizeof(xRectangle));
+    prect = (xRectangle *)calloc(RegionNumRects(prgn), sizeof(xRectangle));
     if (!prect)
 	return;
 

nx-X11/programs/Xserver/mi/mi.h

@@ -134,16 +134,6 @@ extern void miPutImage(
     char * /*pImage*/
 );
 
-/* miclipn.c */
-
-extern void miClipNotify(
-    void (* /*func*/)(
-	WindowPtr /* pWin */,
-	int /* dx */,
-	int /* dy */
-	)
-);
-
 /* micursor.c */
 
 extern void miRecolorCursor(

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

@@ -586,9 +586,11 @@ miDoInitVisuals(VisualPtr *visualp, DepthPtr *depthp, int *nvisualp,
 	if (nvtype)
 	{
 	    vid = (VisualID *) malloc (nvtype * sizeof (VisualID));
-	    if (!vid)
+	    if (!vid) {
+		free(preferredCVCs);
 		return FALSE;
 	    }
+	}
 	depth->depth = d;
 	depth->numVids = nvtype;
 	depth->vids = vid;

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

@@ -80,9 +80,6 @@ extern Bool noDamageExtension;
 #ifdef DBE
 extern Bool noDbeExtension;
 #endif
-#ifdef DPSEXT
-extern Bool noDPSExtension;
-#endif
 #ifdef DPMSExtension
 extern Bool noDPMSExtension;
 #endif
@@ -142,7 +139,6 @@ extern Bool noXIdleExtension;
 extern Bool noXvExtension;
 #endif
 
-#define INITARGS void
 typedef void (*InitExtension)(void);
 
 #ifdef MITSHM
@@ -228,6 +224,11 @@ extern void SecurityExtensionInit(void);
 extern void XFree86BigfontExtensionInit(void);
 #endif
 #ifdef GLXEXT
+/*
+typedef struct __GLXprovider __GLXprovider;
+extern __GLXprovider __glXMesaProvider;
+extern void GlxPushProvider(__GLXprovider *impl);
+*/
 #ifndef __DARWIN__
 extern void GlxExtensionInit(void);
 extern void GlxWrapInitVisuals(miInitVisualsProcPtr *);
@@ -290,9 +291,6 @@ static ExtensionToggle ExtensionToggleList[] =
 #ifdef DBE
     { "DOUBLE-BUFFER", &noDbeExtension },
 #endif
-#ifdef DPSEXT
-    { "DPSExtension", &noDPSExtension },
-#endif
 #ifdef DPMSExtension
     { "DPMS", &noDPMSExtension },
 #endif
@@ -447,6 +445,9 @@ InitExtensions(argc, argv)
 #endif
 #endif
 #ifdef GLXEXT
+    /*
+    GlxPushProvider(&__glXMesaProvider);
+    */
 #ifndef __DARWIN__
     if (!noGlxExtension) GlxExtensionInit();
 #else

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

@@ -262,33 +262,7 @@ miScreenInit(pScreen, pbits, xsize, ysize, dpix, dpiy, width,
     /* CreateGC */
     /* CreateColormap, DestroyColormap, InstallColormap, UninstallColormap */
     /* ListInstalledColormaps, StoreColors, ResolveColor */
-#ifdef NEED_SCREEN_REGIONS
-    pScreen->RegionCreate = RegionCreate;
-    pScreen->RegionInit = RegionInit;
-    pScreen->RegionCopy = RegionCopy;
-    pScreen->RegionDestroy = RegionDestroy;
-    pScreen->RegionUninit = RegionUninit;
-    pScreen->Intersect = RegionIntersect;
-    pScreen->Union = RegionUnion;
-    pScreen->Subtract = RegionSubtract;
-    pScreen->Inverse = RegionInverse;
-    pScreen->RegionReset = RegionReset;
-    pScreen->TranslateRegion = RegionTranslate;
-    pScreen->RectIn = RegionContainsRect;
-    pScreen->PointInRegion = RegionContainsPoint;
-    pScreen->RegionNotEmpty = RegionNotEmpty;
-    pScreen->RegionEqual = RegionEqual;
-    pScreen->RegionBroken = RegionBroken;
-    pScreen->RegionBreak = RegionBreak;
-    pScreen->RegionEmpty = RegionEmpty;
-    pScreen->RegionExtents = RegionExtents;
-    pScreen->RegionAppend = RegionAppend;
-    pScreen->RegionValidate = RegionValidate;
-#endif /* NEED_SCREEN_REGIONS */
     /* BitmapToRegion */
-#ifdef NEED_SCREEN_REGIONS
-    pScreen->RectsToRegion = RegionFromRects;
-#endif /* NEED_SCREEN_REGIONS */
     pScreen->SendGraphicsExpose = miSendGraphicsExpose;
     pScreen->BlockHandler = (ScreenBlockHandlerProcPtr)NoopDDA;
     pScreen->WakeupHandler = (ScreenWakeupHandlerProcPtr)NoopDDA;

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

@@ -98,11 +98,11 @@ static void	    miSpriteComputeSaved(ScreenPtr pScreen);
   ((pScreen)->field = \
    ((miSpriteScreenPtr) (pScreen)->devPrivates[miSpriteScreenIndex].ptr)->field)
 
-#define SCREEN_EPILOGUE(pScreen, field, wrapper)\
-    ((pScreen)->field = wrapper)
+#define SCREEN_EPILOGUE(pScreen, field)\
+    ((pScreen)->field = miSprite##field)
 
 /*
- * void *-sprite method table
+ * pointer-sprite method table
  */
 
 static Bool miSpriteRealizeCursor(ScreenPtr pScreen, CursorPtr pCursor);
@@ -298,7 +298,7 @@ miSpriteGetImage (pDrawable, sx, sy, w, h, format, planemask, pdstLine)
     (*pScreen->GetImage) (pDrawable, sx, sy, w, h,
 			  format, planemask, pdstLine);
 
-    SCREEN_EPILOGUE (pScreen, GetImage, miSpriteGetImage);
+    SCREEN_EPILOGUE (pScreen, GetImage);
 }
 
 static void
@@ -344,7 +344,7 @@ miSpriteGetSpans (pDrawable, wMax, ppt, pwidth, nspans, pdstStart)
 
     (*pScreen->GetSpans) (pDrawable, wMax, ppt, pwidth, nspans, pdstStart);
 
-    SCREEN_EPILOGUE (pScreen, GetSpans, miSpriteGetSpans);
+    SCREEN_EPILOGUE (pScreen, GetSpans);
 }
 
 static void
@@ -370,7 +370,7 @@ miSpriteSourceValidate (pDrawable, x, y, width, height)
     if (pScreen->SourceValidate)
 	(*pScreen->SourceValidate) (pDrawable, x, y, width, height);
 
-    SCREEN_EPILOGUE (pScreen, SourceValidate, miSpriteSourceValidate);
+    SCREEN_EPILOGUE (pScreen, SourceValidate);
 }
 
 static void
@@ -393,7 +393,7 @@ miSpriteCopyWindow (WindowPtr pWindow, DDXPointRec ptOldOrg, RegionPtr prgnSrc)
     }
 
     (*pScreen->CopyWindow) (pWindow, ptOldOrg, prgnSrc);
-    SCREEN_EPILOGUE (pScreen, CopyWindow, miSpriteCopyWindow);
+    SCREEN_EPILOGUE (pScreen, CopyWindow);
 }
 
 static void
@@ -412,7 +412,7 @@ miSpriteBlockHandler (i, blockData, pTimeout, pReadmask)
     
     (*pScreen->BlockHandler) (i, blockData, pTimeout, pReadmask);
 
-    SCREEN_EPILOGUE(pScreen, BlockHandler, miSpriteBlockHandler);
+    SCREEN_EPILOGUE(pScreen, BlockHandler);
 
     if (!pPriv->isUp && pPriv->shouldBeUp)
     {
@@ -434,7 +434,7 @@ miSpriteInstallColormap (pMap)
     
     (*pScreen->InstallColormap) (pMap);
 
-    SCREEN_EPILOGUE(pScreen, InstallColormap, miSpriteInstallColormap);
+    SCREEN_EPILOGUE(pScreen, InstallColormap);
 
     pPriv->pInstalledMap = pMap;
     if (pPriv->pColormap != pMap)
@@ -463,7 +463,7 @@ miSpriteStoreColors (pMap, ndef, pdef)
     
     (*pScreen->StoreColors) (pMap, ndef, pdef);
 
-    SCREEN_EPILOGUE(pScreen, StoreColors, miSpriteStoreColors);
+    SCREEN_EPILOGUE(pScreen, StoreColors);
 
     if (pPriv->pColormap == pMap)
     {
@@ -592,7 +592,7 @@ miSpriteSaveDoomedAreas (pWin, pObscured, dx, dy)
 
     (*pScreen->SaveDoomedAreas) (pWin, pObscured, dx, dy);
 
-    SCREEN_EPILOGUE (pScreen, SaveDoomedAreas, miSpriteSaveDoomedAreas);
+    SCREEN_EPILOGUE (pScreen, SaveDoomedAreas);
 }
 
 /*

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

@@ -237,6 +237,18 @@ miComputeClips (
 	dy = 32767;
     borderSize.y2 = dy;
 
+#ifdef COMPOSITE
+    /*
+     * In redirected drawing case, reset universe to borderSize
+     */
+    if (pParent->redirectDraw)
+    {
+	if (miSetRedirectBorderClipProc)
+	    (*miSetRedirectBorderClipProc) (pParent, universe);
+	RegionCopy(universe, &pParent->borderSize);
+    }
+#endif
+
     oldVis = pParent->visibility;
     switch (RegionContainsRect(universe, &borderSize))
     {
@@ -276,18 +288,6 @@ miComputeClips (
 	((pParent->eventMask | wOtherEventMasks(pParent)) & VisibilityChangeMask))
 	SendVisibilityNotify(pParent);
 
-#ifdef COMPOSITE
-    /*
-     * In redirected drawing case, reset universe to borderSize
-     */
-    if (pParent->redirectDraw)
-    {
-	if (miSetRedirectBorderClipProc)
-	    (*miSetRedirectBorderClipProc) (pParent, universe);
-	RegionCopy(universe, &pParent->borderSize);
-    }
-#endif
-
     dx = pParent->drawable.x - pParent->valdata->before.oldAbsCorner.x;
     dy = pParent->drawable.y - pParent->valdata->before.oldAbsCorner.y;
 

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

@@ -119,7 +119,8 @@ miFillPolyHelper (pDrawable, pGC, pixel, spanData, y, overall_height,
     	oldPixel = pGC->fgPixel;
     	if (pixel != oldPixel)
     	{
-    	    DoChangeGC (pGC, GCForeground, (XID *)&pixel, FALSE);
+	    XID tmpPixel = (XID)pixel;
+	    DoChangeGC (pGC, GCForeground, &tmpPixel, FALSE);
     	    ValidateGC (pDrawable, pGC);
     	}
     }
@@ -217,7 +218,8 @@ miFillRectPolyHelper (
     	oldPixel = pGC->fgPixel;
     	if (pixel != oldPixel)
     	{
-    	    DoChangeGC (pGC, GCForeground, (XID *)&pixel, FALSE);
+	    XID tmpPixel = (XID)pixel;
+	    DoChangeGC (pGC, GCForeground, &tmpPixel, FALSE);
     	    ValidateGC (pDrawable, pGC);
     	}
 	(*pGC->ops->PolyFillRect) (pDrawable, pGC, 1, &rect);
@@ -1068,7 +1070,8 @@ miLineArc (
     	oldPixel = pGC->fgPixel;
     	if (pixel != oldPixel)
     	{
-	    DoChangeGC(pGC, GCForeground, (XID *)&pixel, FALSE);
+	    XID tmpPixel = (XID)pixel;
+	    DoChangeGC(pGC, GCForeground, &tmpPixel, FALSE);
 	    ValidateGC (pDraw, pGC);
     	}
     }

nx-X11/programs/Xserver/miext/damage/Imakefile

@@ -10,7 +10,7 @@ SRCS = damage.c
 
 OBJS = damage.o
 
-   INCLUDES = -I. -I../shadow -I../../mi -I../../fb -I../../include -I$(XINCLUDESRC) \
+   INCLUDES = -I. -I../../mi -I../../fb -I../../include -I$(XINCLUDESRC) \
 	      -I$(XF86SRC)/common $(EXTRAINCLUDES) \
 	      -I../../render -I../cw -I$(EXTINCSRC) \
 	      `pkg-config --cflags-only-I pixman-1`

nx-X11/programs/Xserver/miext/damage/damagestr.h

@@ -30,6 +30,7 @@
 #define _DAMAGESTR_H_
 
 #include "damage.h"
+#include "gcstruct.h"
 #ifdef RENDER
 # include "picturestr.h"
 #endif