Checked in the following released items:

xkeyboard-config-1.4.tar.gz
ttf-bitstream-vera-1.10.tar.gz
font-alias-1.0.1.tar.gz
font-sun-misc-1.0.0.tar.gz
font-sun-misc-1.0.0.tar.gz
font-sony-misc-1.0.0.tar.gz
font-schumacher-misc-1.0.0.tar.gz
font-mutt-misc-1.0.0.tar.gz
font-misc-misc-1.0.0.tar.gz
font-misc-meltho-1.0.0.tar.gz
font-micro-misc-1.0.0.tar.gz
font-jis-misc-1.0.0.tar.gz
font-isas-misc-1.0.0.tar.gz
font-dec-misc-1.0.0.tar.gz
font-daewoo-misc-1.0.0.tar.gz
font-cursor-misc-1.0.0.tar.gz
font-arabic-misc-1.0.0.tar.gz
font-winitzki-cyrillic-1.0.0.tar.gz
font-misc-cyrillic-1.0.0.tar.gz
font-cronyx-cyrillic-1.0.0.tar.gz
font-screen-cyrillic-1.0.1.tar.gz
font-xfree86-type1-1.0.1.tar.gz
font-adobe-utopia-type1-1.0.1.tar.gz
font-ibm-type1-1.0.0.tar.gz
font-bitstream-type1-1.0.0.tar.gz
font-bitstream-speedo-1.0.0.tar.gz
font-bh-ttf-1.0.0.tar.gz
font-bh-type1-1.0.0.tar.gz
font-bitstream-100dpi-1.0.0.tar.gz
font-bh-lucidatypewriter-100dpi-1.0.0.tar.gz
font-bh-100dpi-1.0.0.tar.gz
font-adobe-utopia-100dpi-1.0.1.tar.gz
font-adobe-100dpi-1.0.0.tar.gz
font-util-1.0.1.tar.gz
font-bitstream-75dpi-1.0.0.tar.gz
font-bh-lucidatypewriter-75dpi-1.0.0.tar.gz
font-adobe-utopia-75dpi-1.0.1.tar.gz
font-bh-75dpi-1.0.0.tar.gz
bdftopcf-1.0.1.tar.gz
font-adobe-75dpi-1.0.0.tar.gz
mkfontscale-1.0.6.tar.gz
openssl-0.9.8k.tar.gz
bigreqsproto-1.0.2.tar.gz
xtrans-1.2.2.tar.gz
resourceproto-1.0.2.tar.gz
inputproto-1.4.4.tar.gz
compositeproto-0.4.tar.gz
damageproto-1.1.0.tar.gz
zlib-1.2.3.tar.gz
xkbcomp-1.0.5.tar.gz
freetype-2.3.9.tar.gz
pthreads-w32-2-8-0-release.tar.gz
pixman-0.12.0.tar.gz
kbproto-1.0.3.tar.gz
evieext-1.0.2.tar.gz
fixesproto-4.0.tar.gz
recordproto-1.13.2.tar.gz
randrproto-1.2.2.tar.gz
scrnsaverproto-1.1.0.tar.gz
renderproto-0.9.3.tar.gz
xcmiscproto-1.1.2.tar.gz
fontsproto-2.0.2.tar.gz
xextproto-7.0.3.tar.gz
xproto-7.0.14.tar.gz
libXdmcp-1.0.2.tar.gz
libxkbfile-1.0.5.tar.gz
libfontenc-1.0.4.tar.gz
libXfont-1.3.4.tar.gz
libX11-1.1.5.tar.gz
libXau-1.0.4.tar.gz
libxcb-1.1.tar.gz
xorg-server-1.5.3.tar.gz

1 files changed, 210 insertions, 0 deletions

diff --git a/xorg-server/hw/xfree86/xaa/xaaCpyPlane.c b/xorg-server/hw/xfree86/xaa/xaaCpyPlane.c
new file mode 100644
index 000000000..cd9e9d47f
--- /dev/null
+++ b/xorg-server/hw/xfree86/xaa/xaaCpyPlane.c
@@ -0,0 +1,210 @@
+
+/*
+   A CopyPlane function that handles bitmap->screen copies and
+   sends anything else to the Fallback.
+
+   Also, a PushPixels for solid fill styles.
+
+   Written by Mark Vojkovich (markv@valinux.com)
+
+*/
+
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
+#include <string.h>
+
+#include "misc.h"
+#include "xf86.h"
+#include "xf86_OSproc.h"
+#include "servermd.h"
+
+#include <X11/X.h>
+#include "scrnintstr.h"
+#include "mi.h"
+#include "pixmapstr.h"
+#include "xf86str.h"
+#include "xaa.h"
+#include "xaalocal.h"
+#include "xaawrap.h"
+
+static void XAACopyPlane1toNColorExpand(DrawablePtr pSrc, DrawablePtr pDst,
+					GCPtr pGC, RegionPtr rgnDst,
+					DDXPointPtr pptSrc);
+static void XAACopyPlaneNtoNColorExpand(DrawablePtr pSrc, DrawablePtr pDst,
+					GCPtr pGC, RegionPtr rgnDst,
+					DDXPointPtr pptSrc);
+
+
+static unsigned long TmpBitPlane; 
+
+RegionPtr
+XAACopyPlaneColorExpansion(
+    DrawablePtr	pSrc,
+    DrawablePtr	pDst,
+    GCPtr pGC,
+    int	srcx, int srcy,
+    int	width, int height,
+    int	dstx, int dsty,
+    unsigned long bitPlane 
+){
+    if((pSrc->type == DRAWABLE_PIXMAP) && !XAA_DEPTH_BUG(pGC)) {
+	if(pSrc->bitsPerPixel == 1) {
+	   return(XAABitBlt(pSrc, pDst, pGC, srcx, srcy,
+			width, height, dstx, dsty, 
+			XAACopyPlane1toNColorExpand, bitPlane));
+	} else if(bitPlane < (1 << pDst->depth)){
+	   TmpBitPlane = bitPlane;
+	   return(XAABitBlt(pSrc, pDst, pGC, srcx, srcy,
+			width, height, dstx, dsty, 
+			XAACopyPlaneNtoNColorExpand, bitPlane));
+	}
+    }
+
+    return (XAAFallbackOps.CopyPlane(pSrc, pDst, pGC, srcx, srcy, 
+			width, height, dstx, dsty, bitPlane));
+}
+
+
+static void 
+XAACopyPlane1toNColorExpand(
+    DrawablePtr   pSrc, 
+    DrawablePtr	  pDst,
+    GCPtr	  pGC,
+    RegionPtr     rgnDst,
+    DDXPointPtr   pptSrc )
+{
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);
+    BoxPtr pbox = REGION_RECTS(rgnDst);
+    int numrects = REGION_NUM_RECTS(rgnDst);
+    unsigned char *src = ((PixmapPtr)pSrc)->devPrivate.ptr;
+    int srcwidth = ((PixmapPtr)pSrc)->devKind; 
+    
+    while(numrects--) {	
+	(*infoRec->WriteBitmap)(infoRec->pScrn, pbox->x1, pbox->y1, 
+		pbox->x2 - pbox->x1, pbox->y2 - pbox->y1, 
+		src + (srcwidth * pptSrc->y) + ((pptSrc->x >> 5) << 2), 
+		srcwidth, pptSrc->x & 31, 
+		pGC->fgPixel, pGC->bgPixel, pGC->alu, pGC->planemask);
+	pbox++; pptSrc++;
+    }
+}
+
+
+static void 
+XAACopyPlaneNtoNColorExpand(
+    DrawablePtr   pSrc, 
+    DrawablePtr	  pDst,
+    GCPtr	  pGC,
+    RegionPtr     rgnDst,
+    DDXPointPtr   pptSrc 
+){
+    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);
+    BoxPtr pbox = REGION_RECTS(rgnDst);
+    int numrects = REGION_NUM_RECTS(rgnDst);
+    unsigned char *src = ((PixmapPtr)pSrc)->devPrivate.ptr;
+    unsigned char *data, *srcPtr, *dataPtr;
+    int srcwidth = ((PixmapPtr)pSrc)->devKind; 
+    int pitch, width, height, h, i, index, offset;
+    int Bpp = pSrc->bitsPerPixel >> 3;
+    unsigned long mask = TmpBitPlane;
+
+    if(TmpBitPlane < 8) {
+	offset = 0;
+    } else if(TmpBitPlane < 16) {
+	offset = 1;
+	mask >>= 8;
+    } else if(TmpBitPlane < 24) {
+	offset = 2;
+	mask >>= 16;
+    } else {
+	offset = 3;
+	mask >>= 24;
+    }
+
+    if(IS_OFFSCREEN_PIXMAP(pSrc))
+	SYNC_CHECK(pSrc);
+    
+    while(numrects--) {	
+	width = pbox->x2 - pbox->x1;
+	h = height = pbox->y2 - pbox->y1;
+	pitch = BitmapBytePad(width);
+
+	if(!(data = xalloc(height * pitch)))
+	   goto ALLOC_FAILED;
+
+        bzero(data, height * pitch);
+
+	dataPtr = data;
+        srcPtr = ((pptSrc->y) * srcwidth) + src + 
+                        ((pptSrc->x) * Bpp) + offset;
+
+	while(h--) {
+	    for(i = index = 0; i < width; i++, index += Bpp) {
+	       if(mask & srcPtr[index])
+		  dataPtr[i >> 3] |= (1 << (i & 7));
+	    }
+	    dataPtr += pitch;
+	    srcPtr += srcwidth;
+	}
+
+	(*infoRec->WriteBitmap)(infoRec->pScrn, 
+		pbox->x1, pbox->y1, width, height, data, pitch, 0, 
+		pGC->fgPixel, pGC->bgPixel, pGC->alu, pGC->planemask);
+	
+	xfree(data);
+
+ALLOC_FAILED:
+
+	pbox++; pptSrc++;
+    }
+}
+
+void
+XAAPushPixelsSolidColorExpansion(
+    GCPtr	pGC,
+    PixmapPtr	pBitMap,
+    DrawablePtr pDraw,
+    int	dx, int dy, 
+    int xOrg, int yOrg )
+{
+   XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);
+   int MaxBoxes = REGION_NUM_RECTS(pGC->pCompositeClip);
+   BoxPtr	pbox, pClipBoxes;
+   int		nboxes, srcx, srcy;
+   xRectangle TheRect;
+   unsigned char *src = pBitMap->devPrivate.ptr;
+   int srcwidth = pBitMap->devKind;
+
+   if(!REGION_NUM_RECTS(pGC->pCompositeClip))
+	return;
+
+   TheRect.x = xOrg;
+   TheRect.y = yOrg;
+   TheRect.width = dx;
+   TheRect.height = dy; 
+
+   if(MaxBoxes > (infoRec->PreAllocSize/sizeof(BoxRec))) {
+	pClipBoxes = xalloc(MaxBoxes * sizeof(BoxRec));
+	if(!pClipBoxes) return;	
+   } else pClipBoxes = (BoxPtr)infoRec->PreAllocMem;
+
+   nboxes = XAAGetRectClipBoxes(pGC, pClipBoxes, 1, &TheRect);
+   pbox = pClipBoxes;
+
+   while(nboxes--) {
+	srcx = pbox->x1 - xOrg;
+	srcy = pbox->y1 - yOrg;
+ 	(*infoRec->WriteBitmap)(infoRec->pScrn, pbox->x1, pbox->y1, 
+		pbox->x2 - pbox->x1, pbox->y2 - pbox->y1, 
+		src + (srcwidth * srcy) + ((srcx >> 5) << 2), 
+		srcwidth, srcx & 31, 
+		pGC->fgPixel, -1, pGC->alu, pGC->planemask);
+	pbox++;
+   }
+
+    if(pClipBoxes != (BoxPtr)infoRec->PreAllocMem)
+	xfree(pClipBoxes);
+}
+