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

diff --git a/xorg-server/afb/afbsetsp.c b/xorg-server/afb/afbsetsp.c
new file mode 100644
index 000000000..cb36dba99
--- /dev/null
+++ b/xorg-server/afb/afbsetsp.c
@@ -0,0 +1,257 @@
+/* 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 <X11/X.h>
+#include <X11/Xmd.h>
+
+#include "misc.h"
+#include "regionstr.h"
+#include "gcstruct.h"
+#include "windowstr.h"
+#include "pixmapstr.h"
+#include "scrnintstr.h"
+
+#include "afb.h"
+#include "maskbits.h"
+
+#include "servermd.h"
+
+
+/* afbSetScanline -- copies the bits from psrc to the drawable starting at
+ * (xStart, y) and continuing to (xEnd, y).  xOrigin tells us where psrc
+ * starts on the scanline. (I.e., if this scanline passes through multiple
+ * boxes, we may not want to start grabbing bits at psrc but at some offset
+ * further on.)
+ */
+static void
+afbSetScanline(int y, int xOrigin, int xStart, int xEnd, PixelType *psrc,
+	       int alu, PixelType *pdstBase, int widthDst, int sizeDst,
+	       int depthDst, int sizeSrc)
+{
+	int w;							/* width of scanline in bits */
+	register PixelType *pdst;	/* where to put the bits */
+	register PixelType tmpSrc;	/* scratch buffer to collect bits in */
+	int dstBit;						/* offset in bits from beginning of
+										 * word */
+	register int nstart; 		/* number of bits from first partial */
+	register int nend; 			/* " " last partial word */
+	int offSrc;
+	PixelType startmask, endmask;
+	PixelType *savePsrc = psrc + ((xStart - xOrigin) >> PWSH);
+	int nlMiddle, nl;
+	int d;
+
+	for (d = 0; d < depthDst; d++) {
+		pdst = afbScanline(pdstBase, xStart, y, widthDst) + sizeDst * d;	/* @@@ NEXT PLANE @@@ */
+		psrc = savePsrc + sizeSrc * d;	/* @@@ NEXT PLANE @@@ */
+		offSrc = (xStart - xOrigin) & PIM;
+		w = xEnd - xStart;
+		dstBit = xStart & PIM;
+
+		if (dstBit + w <= PPW) {
+			getandputrop(psrc, offSrc, dstBit, w, pdst, alu)
+		} else {
+			maskbits(xStart, w, startmask, endmask, nlMiddle);
+			if (startmask)
+				nstart = PPW - dstBit;
+			else
+				nstart = 0;
+			if (endmask)
+				nend = xEnd & PIM;
+			else
+				nend = 0;
+			if (startmask) {
+				getandputrop(psrc, offSrc, dstBit, nstart, pdst, alu)
+				pdst++;
+				offSrc += nstart;
+				if (offSrc > PLST) {
+					psrc++;
+					offSrc -= PPW;
+				}
+			}
+			nl = nlMiddle;
+			while (nl--) {
+				getbits(psrc, offSrc, PPW, tmpSrc);
+				DoRop(*pdst, alu, tmpSrc, *pdst);
+				pdst++;
+				psrc++;
+			}
+			if (endmask) {
+				getandputrop0(psrc, offSrc, nend, pdst, alu);
+			}
+		}
+	}
+}
+
+
+
+/* SetSpans -- for each span copy pwidth[i] bits from psrc to pDrawable at
+ * ppt[i] using the raster op from the GC.  If fSorted is TRUE, the scanlines
+ * are in increasing Y order.
+ * Source bit lines are server scanline padded so that they always begin
+ * on a word boundary.
+ */
+void
+afbSetSpans(pDrawable, pGC, pcharsrc, ppt, pwidth, nspans, fSorted)
+	DrawablePtr pDrawable;
+	GCPtr pGC;
+	char *pcharsrc;
+	register DDXPointPtr ppt;
+	int *pwidth;
+	int nspans;
+	int fSorted;
+{
+	PixelType *psrc = (PixelType *)pcharsrc;
+	PixelType *pdstBase;				/* start of dst bitmap */
+	int widthDst;						/* width of bitmap in words */
+	int sizeDst;
+	int depthDst;
+	int sizeSrc = 0;
+	register BoxPtr pbox, pboxLast, pboxTest;
+	register DDXPointPtr pptLast;
+	int alu;
+	RegionPtr prgnDst;
+	int xStart, xEnd;
+	int yMax;
+
+	alu = pGC->alu;
+	prgnDst = pGC->pCompositeClip;
+
+	pptLast = ppt + nspans;
+
+	yMax = pDrawable->y + (int) pDrawable->height;
+	afbGetPixelWidthSizeDepthAndPointer(pDrawable, widthDst, sizeDst, depthDst,
+													 pdstBase);
+
+	pbox =  REGION_RECTS(prgnDst);
+	pboxLast = pbox + REGION_NUM_RECTS(prgnDst);
+
+	if(fSorted) {
+	/* scan lines sorted in ascending order. Because they are sorted, we
+	 * don't have to check each scanline against each clip box.  We can be
+	 * sure that this scanline only has to be clipped to boxes at or after the
+	 * beginning of this y-band
+	 */
+		pboxTest = pbox;
+		while(ppt < pptLast) {
+			pbox = pboxTest;
+			if(ppt->y >= yMax)
+				break;
+			while(pbox < pboxLast) {
+				if(pbox->y1 > ppt->y) {
+					/* scanline is before clip box */
+					break;
+				} else if(pbox->y2 <= ppt->y) {
+					/* clip box is before scanline */
+					pboxTest = ++pbox;
+					continue;
+				} else if(pbox->x1 > ppt->x + *pwidth)  {
+					/* clip box is to right of scanline */
+					break;
+				} else if(pbox->x2 <= ppt->x) {
+					/* scanline is to right of clip box */
+					pbox++;
+					continue;
+				}
+
+				/* at least some of the scanline is in the current clip box */
+				xStart = max(pbox->x1, ppt->x);
+				xEnd = min(ppt->x + *pwidth, pbox->x2);
+				sizeSrc = PixmapWidthInPadUnits(*pwidth, 1);
+				afbSetScanline(ppt->y, ppt->x, xStart, xEnd, psrc, alu, pdstBase,
+									 widthDst, sizeDst, depthDst, sizeSrc);
+				if(ppt->x + *pwidth <= pbox->x2) {
+					/* End of the line, as it were */
+					break;
+				} else
+					pbox++;
+			}
+			/* We've tried this line against every box; it must be outside them
+			 * all.  move on to the next point */
+			ppt++;
+			psrc += sizeSrc * depthDst;
+			pwidth++;
+		}
+	} else {
+		/* scan lines not sorted. We must clip each line against all the boxes */
+		while(ppt < pptLast) {
+			if(ppt->y >= 0 && ppt->y < yMax) {
+				for(pbox = REGION_RECTS(prgnDst); pbox< pboxLast; pbox++) {
+					if(pbox->y1 > ppt->y) {
+						/* rest of clip region is above this scanline,
+						 * skip it */
+						break;
+					}
+					if(pbox->y2 <= ppt->y) {
+						/* clip box is below scanline */
+						pbox++;
+						break;
+					}
+					if(pbox->x1 <= ppt->x + *pwidth &&
+					   pbox->x2 > ppt->x) {
+						xStart = max(pbox->x1, ppt->x);
+						xEnd = min(pbox->x2, ppt->x + *pwidth);
+						sizeSrc = PixmapWidthInPadUnits(*pwidth, 1);
+						afbSetScanline(ppt->y, ppt->x, xStart, xEnd, psrc, alu,
+											 pdstBase, widthDst, sizeDst, depthDst,
+											 sizeSrc);
+					}
+
+				}
+			}
+		psrc += sizeSrc * depthDst;
+		ppt++;
+		pwidth++;
+		}
+	}
+}