libX11 xserver fontconfig mesa pixman xkbcomp xkeyboard-config git update

23 Mar 2012

1 files changed, 144 insertions, 182 deletions

diff --git a/xorg-server/fb/fbfill.c b/xorg-server/fb/fbfill.c
index e62a48ae0..de9d6b313 100644
--- a/xorg-server/fb/fbfill.c
+++ b/xorg-server/fb/fbfill.c
@@ -27,204 +27,166 @@
 #include "fb.h"
 
 void
-fbFill (DrawablePtr pDrawable,
-	GCPtr	    pGC,
-	int	    x,
-	int	    y,
-	int	    width,
-	int	    height)
+fbFill(DrawablePtr pDrawable, GCPtr pGC, int x, int y, int width, int height)
 {
-    FbBits	    *dst;
-    FbStride	    dstStride;
-    int		    dstBpp;
-    int		    dstXoff, dstYoff;
-    FbGCPrivPtr	    pPriv = fbGetGCPrivate(pGC);
-    
-    fbGetDrawable (pDrawable, dst, dstStride, dstBpp, dstXoff, dstYoff);
+    FbBits *dst;
+    FbStride dstStride;
+    int dstBpp;
+    int dstXoff, dstYoff;
+    FbGCPrivPtr pPriv = fbGetGCPrivate(pGC);
+
+    fbGetDrawable(pDrawable, dst, dstStride, dstBpp, dstXoff, dstYoff);
 
     switch (pGC->fillStyle) {
     case FillSolid:
 #ifndef FB_ACCESS_WRAPPER
-	if (pPriv->and || !pixman_fill ((uint32_t *)dst, dstStride, dstBpp,
-					x + dstXoff, y + dstYoff,
-					width, height,
-					pPriv->xor))
-#endif	    
-	    fbSolid (dst + (y + dstYoff) * dstStride, 
-		     dstStride, 
-		     (x + dstXoff) * dstBpp,
-		     dstBpp,
-		     width * dstBpp, height,
-		     pPriv->and, pPriv->xor);
-	break;
+        if (pPriv->and || !pixman_fill((uint32_t *) dst, dstStride, dstBpp,
+                                       x + dstXoff, y + dstYoff,
+                                       width, height, pPriv->xor))
+#endif
+            fbSolid(dst + (y + dstYoff) * dstStride,
+                    dstStride,
+                    (x + dstXoff) * dstBpp,
+                    dstBpp, width * dstBpp, height, pPriv->and, pPriv->xor);
+        break;
     case FillStippled:
-    case FillOpaqueStippled: {
-	PixmapPtr   pStip = pGC->stipple;
-	int	    stipWidth = pStip->drawable.width;
-	int	    stipHeight = pStip->drawable.height;
-	
-	if (dstBpp == 1)
-	{
-	    int		alu;
-	    FbBits	*stip;
-	    FbStride    stipStride;
-	    int		stipBpp;
-	    _X_UNUSED int	stipXoff, stipYoff;
-
-	    if (pGC->fillStyle == FillStippled)
-		alu = FbStipple1Rop(pGC->alu,pGC->fgPixel);
-	    else
-		alu = FbOpaqueStipple1Rop(pGC->alu,pGC->fgPixel,pGC->bgPixel);
-	    fbGetDrawable (&pStip->drawable, stip, stipStride, stipBpp, stipXoff, stipYoff);
-	    fbTile (dst + (y + dstYoff) * dstStride,
-		    dstStride,
-		    x + dstXoff,
-		    width, height,
-		    stip,
-		    stipStride,
-		    stipWidth,
-		    stipHeight,
-		    alu,
-		    pPriv->pm,
-		    dstBpp,
-		    
-		    (pGC->patOrg.x + pDrawable->x + dstXoff),
-		    pGC->patOrg.y + pDrawable->y - y);
-	    fbFinishAccess (&pStip->drawable);
-	}
-	else
-	{
-	    FbStip	*stip;
-	    FbStride    stipStride;
-	    int		stipBpp;
-	    _X_UNUSED int	stipXoff, stipYoff;
-	    FbBits	fgand, fgxor, bgand, bgxor;
-
-	    fgand = pPriv->and;
-	    fgxor = pPriv->xor;
-	    if (pGC->fillStyle == FillStippled)
-	    {
-		bgand = fbAnd(GXnoop,(FbBits) 0,FB_ALLONES);
-		bgxor = fbXor(GXnoop,(FbBits) 0,FB_ALLONES);
-	    }
-	    else
-	    {
-		bgand = pPriv->bgand;
-		bgxor = pPriv->bgxor;
-	    }
-
-	    fbGetStipDrawable (&pStip->drawable, stip, stipStride, stipBpp, stipXoff, stipYoff);
-	    fbStipple (dst + (y + dstYoff) * dstStride, 
-		       dstStride, 
-		       (x + dstXoff) * dstBpp,
-		       dstBpp,
-		       width * dstBpp, height,
-		       stip,
-		       stipStride,
-		       stipWidth,
-		       stipHeight,
-		       pPriv->evenStipple,
-		       fgand, fgxor,
-		       bgand, bgxor,
-		       pGC->patOrg.x + pDrawable->x + dstXoff,
-		       pGC->patOrg.y + pDrawable->y - y);
-	    fbFinishAccess (&pStip->drawable);
-	}
-	break;
+    case FillOpaqueStippled:{
+        PixmapPtr pStip = pGC->stipple;
+        int stipWidth = pStip->drawable.width;
+        int stipHeight = pStip->drawable.height;
+
+        if (dstBpp == 1) {
+            int alu;
+            FbBits *stip;
+            FbStride stipStride;
+            int stipBpp;
+            _X_UNUSED int stipXoff, stipYoff;
+
+            if (pGC->fillStyle == FillStippled)
+                alu = FbStipple1Rop(pGC->alu, pGC->fgPixel);
+            else
+                alu = FbOpaqueStipple1Rop(pGC->alu, pGC->fgPixel, pGC->bgPixel);
+            fbGetDrawable(&pStip->drawable, stip, stipStride, stipBpp, stipXoff,
+                          stipYoff);
+            fbTile(dst + (y + dstYoff) * dstStride, dstStride, x + dstXoff,
+                   width, height, stip, stipStride, stipWidth, stipHeight, alu,
+                   pPriv->pm, dstBpp, (pGC->patOrg.x + pDrawable->x + dstXoff),
+                   pGC->patOrg.y + pDrawable->y - y);
+            fbFinishAccess(&pStip->drawable);
+        }
+        else {
+            FbStip *stip;
+            FbStride stipStride;
+            int stipBpp;
+            _X_UNUSED int stipXoff, stipYoff;
+            FbBits fgand, fgxor, bgand, bgxor;
+
+            fgand = pPriv->and;
+            fgxor = pPriv->xor;
+            if (pGC->fillStyle == FillStippled) {
+                bgand = fbAnd(GXnoop, (FbBits) 0, FB_ALLONES);
+                bgxor = fbXor(GXnoop, (FbBits) 0, FB_ALLONES);
+            }
+            else {
+                bgand = pPriv->bgand;
+                bgxor = pPriv->bgxor;
+            }
+
+            fbGetStipDrawable(&pStip->drawable, stip, stipStride, stipBpp,
+                              stipXoff, stipYoff);
+            fbStipple(dst + (y + dstYoff) * dstStride, dstStride,
+                      (x + dstXoff) * dstBpp, dstBpp, width * dstBpp, height,
+                      stip, stipStride, stipWidth, stipHeight,
+                      pPriv->evenStipple, fgand, fgxor, bgand, bgxor,
+                      pGC->patOrg.x + pDrawable->x + dstXoff,
+                      pGC->patOrg.y + pDrawable->y - y);
+            fbFinishAccess(&pStip->drawable);
+        }
+        break;
     }
-    case FillTiled: {
-	PixmapPtr   pTile = pGC->tile.pixmap;
-	FbBits	    *tile;
-	FbStride    tileStride;
-	int	    tileBpp;
-	int	    tileWidth;
-	int	    tileHeight;
-	_X_UNUSED int	tileXoff, tileYoff;
-	
-	fbGetDrawable (&pTile->drawable, tile, tileStride, tileBpp, tileXoff, tileYoff);
-	tileWidth = pTile->drawable.width;
-	tileHeight = pTile->drawable.height;
-	fbTile (dst + (y + dstYoff) * dstStride, 
-		dstStride, 
-		(x + dstXoff) * dstBpp, 
-		width * dstBpp, height,
-		tile,
-		tileStride,
-		tileWidth * tileBpp,
-		tileHeight,
-		pGC->alu,
-		pPriv->pm,
-		dstBpp,
-		(pGC->patOrg.x + pDrawable->x + dstXoff) * dstBpp,
-		pGC->patOrg.y + pDrawable->y - y);
-	fbFinishAccess (&pTile->drawable);
-	break;
+    case FillTiled:{
+        PixmapPtr pTile = pGC->tile.pixmap;
+        FbBits *tile;
+        FbStride tileStride;
+        int tileBpp;
+        int tileWidth;
+        int tileHeight;
+        _X_UNUSED int tileXoff, tileYoff;
+
+        fbGetDrawable(&pTile->drawable, tile, tileStride, tileBpp, tileXoff,
+                      tileYoff);
+        tileWidth = pTile->drawable.width;
+        tileHeight = pTile->drawable.height;
+        fbTile(dst + (y + dstYoff) * dstStride,
+               dstStride,
+               (x + dstXoff) * dstBpp,
+               width * dstBpp, height,
+               tile,
+               tileStride,
+               tileWidth * tileBpp,
+               tileHeight,
+               pGC->alu,
+               pPriv->pm,
+               dstBpp,
+               (pGC->patOrg.x + pDrawable->x + dstXoff) * dstBpp,
+               pGC->patOrg.y + pDrawable->y - y);
+        fbFinishAccess(&pTile->drawable);
+        break;
     }
     }
-    fbValidateDrawable (pDrawable);
-    fbFinishAccess (pDrawable);
+    fbValidateDrawable(pDrawable);
+    fbFinishAccess(pDrawable);
 }
 
 void
-fbSolidBoxClipped (DrawablePtr	pDrawable,
-		   RegionPtr	pClip,
-		   int		x1,
-		   int		y1,
-		   int		x2,
-		   int		y2,
-		   FbBits	and,
-		   FbBits	xor)
+fbSolidBoxClipped(DrawablePtr pDrawable,
+                  RegionPtr pClip,
+                  int x1, int y1, int x2, int y2, FbBits and, FbBits xor)
 {
-    FbBits	*dst;
-    FbStride	dstStride;
-    int		dstBpp;
-    int		dstXoff, dstYoff;
-    BoxPtr	pbox;
-    int		nbox;
-    int		partX1, partX2, partY1, partY2;
-
-    fbGetDrawable (pDrawable, dst, dstStride, dstBpp, dstXoff, dstYoff);
-    
+    FbBits *dst;
+    FbStride dstStride;
+    int dstBpp;
+    int dstXoff, dstYoff;
+    BoxPtr pbox;
+    int nbox;
+    int partX1, partX2, partY1, partY2;
+
+    fbGetDrawable(pDrawable, dst, dstStride, dstBpp, dstXoff, dstYoff);
+
     for (nbox = RegionNumRects(pClip), pbox = RegionRects(pClip);
-	 nbox--; 
-	 pbox++)
-    {
-	partX1 = pbox->x1;
-	if (partX1 < x1)
-	    partX1 = x1;
-	
-	partX2 = pbox->x2;
-	if (partX2 > x2)
-	    partX2 = x2;
-	
-	if (partX2 <= partX1)
-	    continue;
-	
-	partY1 = pbox->y1;
-	if (partY1 < y1)
-	    partY1 = y1;
-	
-	partY2 = pbox->y2;
-	if (partY2 > y2)
-	    partY2 = y2;
-	
-	if (partY2 <= partY1)
-	    continue;
+         nbox--; pbox++) {
+        partX1 = pbox->x1;
+        if (partX1 < x1)
+            partX1 = x1;
+
+        partX2 = pbox->x2;
+        if (partX2 > x2)
+            partX2 = x2;
+
+        if (partX2 <= partX1)
+            continue;
+
+        partY1 = pbox->y1;
+        if (partY1 < y1)
+            partY1 = y1;
+
+        partY2 = pbox->y2;
+        if (partY2 > y2)
+            partY2 = y2;
+
+        if (partY2 <= partY1)
+            continue;
 
 #ifndef FB_ACCESS_WRAPPER
-	if (and || !pixman_fill ((uint32_t *)dst, dstStride, dstBpp,
-				 partX1 + dstXoff, partY1 + dstYoff,
-				 (partX2 - partX1), (partY2 - partY1),
-				 xor))
+        if (and || !pixman_fill((uint32_t *) dst, dstStride, dstBpp,
+                                partX1 + dstXoff, partY1 + dstYoff,
+                                (partX2 - partX1), (partY2 - partY1), xor))
 #endif
-	    fbSolid (dst + (partY1 + dstYoff) * dstStride,
-		     dstStride,
-		     (partX1 + dstXoff) * dstBpp,
-		     dstBpp,
-		     
-		     (partX2 - partX1) * dstBpp,
-		     (partY2 - partY1),
-		     and, xor);
+            fbSolid(dst + (partY1 + dstYoff) * dstStride,
+                    dstStride,
+                    (partX1 + dstXoff) * dstBpp,
+                    dstBpp,
+                    (partX2 - partX1) * dstBpp, (partY2 - partY1), and, xor);
     }
-    fbFinishAccess (pDrawable);
+    fbFinishAccess(pDrawable);
 }