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, 343 insertions, 0 deletions

diff --git a/xorg-server/afb/afbbitblt.c b/xorg-server/afb/afbbitblt.c
new file mode 100644
index 000000000..d8b2ccda5
--- /dev/null
+++ b/xorg-server/afb/afbbitblt.c
@@ -0,0 +1,343 @@
+/* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
+/***********************************************************
+
+Copyright (c) 1987  X Consortium
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of the X Consortium shall not be
+used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization from the X Consortium.
+
+
+Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
+
+                        All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in
+supporting documentation, and that the name of Digital not be
+used in advertising or publicity pertaining to distribution of the
+software without specific, written prior permission.
+
+DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
+ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
+DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
+ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+SOFTWARE.
+
+******************************************************************/
+
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
+#include <stdlib.h>
+
+#include <X11/X.h>
+#include <X11/Xprotostr.h>
+
+#include "regionstr.h"
+#include "gcstruct.h"
+#include "windowstr.h"
+#include "pixmapstr.h"
+#include "scrnintstr.h"
+
+#include "mi.h"
+
+#include "afb.h"
+#include "maskbits.h"
+
+/* CopyArea and CopyPlane for a monchrome frame buffer
+
+
+	clip the source rectangle to the source's available bits.  (this
+avoids copying unnecessary pieces that will just get exposed anyway.)
+this becomes the new shape of the destination.
+	clip the destination region to the composite clip in the
+GC.  this requires translating the destination region to (dstx, dsty).
+	build a list of source points, one for each rectangle in the
+destination.  this is a simple translation.
+	go do the multiple rectangle copies
+	do graphics exposures
+*/
+/** Optimized for drawing pixmaps into windows, especially when drawing into
+ ** unobscured windows.  Calls to the general-purpose region code were
+ ** replaced with rectangle-to-rectangle clipping comparisions.  This is
+ ** possible, since the pixmap is a single rectangle.  In an unobscured
+ ** window, the destination clip is also a single rectangle, and region
+ ** code can be avoided entirely.  This is a big savings, since the region
+ ** code uses XAlloc() and makes many function calls.
+ **
+ ** In addition, if source is a pixmap, there is no need to call the
+ ** expensive miHandleExposures() routine.  Instead, we simply return NULL.
+ **
+ ** Previously, drawing a pixmap into an unobscured window executed at least
+ ** 8 XAlloc()'s, 30 function calls, and hundreds of lines of code.
+ **
+ ** Now, the same operation requires no XAlloc()'s, no region function calls,
+ ** and much less overhead.  Nice for drawing lots of small pixmaps.
+ */
+
+void
+afbDoBitblt(DrawablePtr pSrc, DrawablePtr pDst, int alu, RegionPtr prgnDst, DDXPointPtr pptSrc, long unsigned int planemask)
+{
+	switch (alu) {
+		case GXcopy:
+			afbDoBitbltCopy(pSrc, pDst, alu, prgnDst, pptSrc, planemask);
+			break;
+		case GXxor:
+			afbDoBitbltXor(pSrc, pDst, alu, prgnDst, pptSrc, planemask);
+			break;
+		case GXcopyInverted:
+			afbDoBitbltCopyInverted(pSrc, pDst, alu, prgnDst, pptSrc, planemask);
+			break;
+		case GXor:
+			afbDoBitbltOr(pSrc, pDst, alu, prgnDst, pptSrc, planemask);
+			break;
+		default:
+			afbDoBitbltGeneral(pSrc, pDst, alu, prgnDst, pptSrc, planemask);
+			break;
+	}
+}
+
+typedef void (*afb_blit_func)
+    (DrawablePtr, DrawablePtr, int, RegionPtr, DDXPointPtr, unsigned long);
+
+static RegionPtr
+afbBitBlt(register DrawablePtr pSrcDrawable, register DrawablePtr pDstDrawable, register GC *pGC, int srcx, int srcy, int width, int height, int dstx, int dsty, afb_blit_func doBitBlt, long unsigned int planemask)
+{
+	RegionPtr prgnSrcClip = NULL;		/* may be a new region, or just a copy */
+	Bool freeSrcClip = FALSE;
+
+	RegionPtr prgnExposed;
+	RegionRec rgnDst;
+	DDXPointPtr pptSrc;
+	register DDXPointPtr ppt;
+	register BoxPtr pbox;
+	int i;
+	register int dx;
+	register int dy;
+	xRectangle origSource;
+	DDXPointRec origDest;
+	int numRects;
+	BoxRec fastBox;
+	int fastClip = 0;					/* for fast clipping with pixmap source */
+	int fastExpose = 0;				/* for fast exposures with pixmap source */
+
+	origSource.x = srcx;
+	origSource.y = srcy;
+	origSource.width = width;
+	origSource.height = height;
+	origDest.x = dstx;
+	origDest.y = dsty;
+
+	if ((pSrcDrawable != pDstDrawable) && pSrcDrawable->pScreen->SourceValidate)
+		(*pSrcDrawable->pScreen->SourceValidate)(pSrcDrawable, srcx, srcy, width,
+															  height);
+
+	srcx += pSrcDrawable->x;
+	srcy += pSrcDrawable->y;
+
+	/* clip the source */
+
+	if (pSrcDrawable->type == DRAWABLE_PIXMAP)
+		if ((pSrcDrawable == pDstDrawable) && (pGC->clientClipType == CT_NONE))
+			prgnSrcClip = pGC->pCompositeClip;
+		else
+			fastClip = 1;
+	else if (pGC->subWindowMode == IncludeInferiors)
+		if (!((WindowPtr)pSrcDrawable)->parent)
+			/*
+			 * special case bitblt from root window in
+			 * IncludeInferiors mode; just like from a pixmap
+			 */
+			fastClip = 1;
+		else if ((pSrcDrawable == pDstDrawable) && (pGC->clientClipType == CT_NONE))
+			prgnSrcClip = pGC->pCompositeClip;
+		else {
+			prgnSrcClip = NotClippedByChildren((WindowPtr)pSrcDrawable);
+			freeSrcClip = TRUE;
+		}
+	else
+		prgnSrcClip = &((WindowPtr)pSrcDrawable)->clipList;
+
+	fastBox.x1 = srcx;
+	fastBox.y1 = srcy;
+	fastBox.x2 = srcx + width;
+	fastBox.y2 = srcy + height;
+
+	/* Don't create a source region if we are doing a fast clip */
+	if (fastClip) {
+		fastExpose = 1;
+		/*
+		 * clip the source; if regions extend beyond the source size,
+		 * make sure exposure events get sent
+		 */
+		if (fastBox.x1 < pSrcDrawable->x) {
+			fastBox.x1 = pSrcDrawable->x;
+			fastExpose = 0;
+		}
+		if (fastBox.y1 < pSrcDrawable->y) {
+			fastBox.y1 = pSrcDrawable->y;
+			fastExpose = 0;
+		}
+		if (fastBox.x2 > pSrcDrawable->x + (int)pSrcDrawable->width) {
+			fastBox.x2 = pSrcDrawable->x + (int)pSrcDrawable->width;
+			fastExpose = 0;
+		}
+		if (fastBox.y2 > pSrcDrawable->y + (int)pSrcDrawable->height) {
+			fastBox.y2 = pSrcDrawable->y + (int)pSrcDrawable->height;
+			fastExpose = 0;
+		}
+	} else {
+		REGION_INIT(pGC->pScreen, &rgnDst, &fastBox, 1);
+		REGION_INTERSECT(pGC->pScreen, &rgnDst, &rgnDst, prgnSrcClip);
+	}
+
+	dstx += pDstDrawable->x;
+	dsty += pDstDrawable->y;
+
+	if (pDstDrawable->type == DRAWABLE_WINDOW)
+		if (!((WindowPtr)pDstDrawable)->realized) {
+			if (!fastClip)
+				REGION_UNINIT(pGC->pScreen, &rgnDst);
+			if (freeSrcClip)
+				REGION_DESTROY(pGC->pScreen, prgnSrcClip);
+			return NULL;
+		}
+
+	dx = srcx - dstx;
+	dy = srcy - dsty;
+
+	/* Translate and clip the dst to the destination composite clip */
+	if (fastClip) {
+		RegionPtr cclip;
+
+		/* Translate the region directly */
+		fastBox.x1 -= dx;
+		fastBox.x2 -= dx;
+		fastBox.y1 -= dy;
+		fastBox.y2 -= dy;
+
+		/* If the destination composite clip is one rectangle we can
+		   do the clip directly.  Otherwise we have to create a full
+		   blown region and call intersect */
+		cclip = pGC->pCompositeClip;
+		if (REGION_NUM_RECTS(cclip) == 1) {
+			BoxPtr pBox = REGION_RECTS(cclip);
+
+			if (fastBox.x1 < pBox->x1)
+				fastBox.x1 = pBox->x1;
+			if (fastBox.x2 > pBox->x2)
+				fastBox.x2 = pBox->x2;
+			if (fastBox.y1 < pBox->y1)
+				fastBox.y1 = pBox->y1;
+			if (fastBox.y2 > pBox->y2)
+				fastBox.y2 = pBox->y2;
+
+			/* Check to see if the region is empty */
+			if (fastBox.x1 >= fastBox.x2 || fastBox.y1 >= fastBox.y2) {
+				REGION_NULL(pGC->pScreen, &rgnDst);
+			} else {
+				REGION_INIT(pGC->pScreen, &rgnDst, &fastBox, 1);
+			}
+		} else {
+			/* We must turn off fastClip now, since we must create
+			   a full blown region.  It is intersected with the
+			   composite clip below. */
+			fastClip = 0;
+			REGION_INIT(pGC->pScreen, &rgnDst, &fastBox,1);
+		}
+	} else
+		REGION_TRANSLATE(pGC->pScreen, &rgnDst, -dx, -dy);
+
+	if (!fastClip) {
+		REGION_INTERSECT(pGC->pScreen, &rgnDst, &rgnDst,
+		 pGC->pCompositeClip);
+	}
+
+	/* Do bit blitting */
+	numRects = REGION_NUM_RECTS(&rgnDst);
+	if (numRects && width && height) {
+		if(!(pptSrc = (DDXPointPtr)xalloc(numRects *
+												  sizeof(DDXPointRec)))) {
+			REGION_UNINIT(pGC->pScreen, &rgnDst);
+			if (freeSrcClip)
+				REGION_DESTROY(pGC->pScreen, prgnSrcClip);
+			return NULL;
+		}
+		pbox = REGION_RECTS(&rgnDst);
+		ppt = pptSrc;
+		for (i = numRects; --i >= 0; pbox++, ppt++) {
+			ppt->x = pbox->x1 + dx;
+			ppt->y = pbox->y1 + dy;
+		}
+
+		(*doBitBlt)(pSrcDrawable, pDstDrawable, pGC->alu, &rgnDst, pptSrc,
+					 planemask);
+
+		xfree(pptSrc);
+	}
+
+	prgnExposed = NULL;
+	if (pGC->fExpose)  {
+		/* Pixmap sources generate a NoExposed (we return NULL to do this) */
+		if (!fastExpose)
+			prgnExposed = miHandleExposures(pSrcDrawable, pDstDrawable, pGC,
+													  origSource.x, origSource.y,
+													  (int)origSource.width,
+													  (int)origSource.height, origDest.x,
+													  origDest.y, (unsigned long)0);
+	}
+	REGION_UNINIT(pGC->pScreen, &rgnDst);
+	if (freeSrcClip)
+		REGION_DESTROY(pGC->pScreen, prgnSrcClip);
+	return prgnExposed;
+}
+
+RegionPtr
+afbCopyArea(DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable, GC *pGC, int srcx, int srcy, int width, int height, int dstx, int dsty)
+{
+	afb_blit_func doBitBlt;
+
+	switch (pGC->alu) {
+		case GXcopy:
+			doBitBlt = afbDoBitbltCopy;
+			break;
+		case GXxor:
+			doBitBlt = afbDoBitbltXor;
+			break;
+		case GXcopyInverted:
+			doBitBlt = afbDoBitbltCopyInverted;
+			break;
+		case GXor:
+			doBitBlt = afbDoBitbltOr;
+			break;
+		default:
+			doBitBlt = afbDoBitbltGeneral;
+			break;
+	}
+
+	return(afbBitBlt(pSrcDrawable, pDstDrawable, pGC, srcx, srcy,
+			 width, height, dstx, dsty, doBitBlt, pGC->planemask));
+}