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

diff --git a/xorg-server/cfb/cfbglblt8.c b/xorg-server/cfb/cfbglblt8.c
new file mode 100644
index 000000000..4d964b35d
--- /dev/null
+++ b/xorg-server/cfb/cfbglblt8.c
@@ -0,0 +1,477 @@
+/*
+
+Copyright 1989, 1998  The Open Group
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+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
+OPEN GROUP 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 Open Group 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 Open Group.
+*/
+
+/*
+ * Poly glyph blt.  Accepts an arbitrary font <= 32 bits wide, in Copy mode
+ * only.
+ */
+
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
+#include	<X11/X.h>
+#include	<X11/Xmd.h>
+#include	<X11/Xproto.h>
+#include	"cfb.h"
+#include	<X11/fonts/fontstruct.h>
+#include	"dixfontstr.h"
+#include	"gcstruct.h"
+#include	"windowstr.h"
+#include	"scrnintstr.h"
+#include	"pixmapstr.h"
+#include	"regionstr.h"
+#include	"cfbmskbits.h"
+#include	"cfb8bit.h"
+
+#define BOX_OVERLAP(box1, box2, xoffset, yoffset) \
+ 	((box1)->x1 <= ((int) (box2)->x2 + (xoffset)) && \
+ 	 ((int) (box2)->x1 + (xoffset)) <= (box1)->x2 && \
+	 (box1)->y1 <= ((int) (box2)->y2 + (yoffset)) && \
+ 	 ((int) (box2)->y1 + (yoffset)) <= (box1)->y2)
+
+#define BOX_CONTAINS(box1, box2, xoffset, yoffset) \
+ 	((box1)->x1 <= ((int) (box2)->x1 + (xoffset)) && \
+ 	 ((int) (box2)->x2 + (xoffset)) <= (box1)->x2 && \
+	 (box1)->y1 <= ((int) (box2)->y1 + (yoffset)) && \
+ 	 ((int) (box2)->y2 + (yoffset)) <= (box1)->y2)
+
+#if defined(FOUR_BIT_CODE) || defined(WriteBitGroup) && !defined(GLYPHROP)
+
+#if GLYPHPADBYTES != 4
+#define USE_LEFTBITS
+#endif
+
+#ifdef USE_LEFTBITS
+typedef	unsigned char	*glyphPointer;
+
+#define GlyphBits(bits,width,dst)	getleftbits(bits,width,dst); \
+					(dst) &= widthMask; \
+					(bits) += widthGlyph;
+#define GlyphBitsS(bits,width,dst,off)	GlyphBits(bits,width,dst); \
+					dst = BitRight (dst, off);
+#else
+typedef CARD32	*glyphPointer;
+
+#define GlyphBits(bits,width,dst)	dst = *bits++;
+#define GlyphBitsS(bits,width,dst,off)	dst = BitRight(*bits++, off);
+#endif
+
+#ifdef GLYPHROP
+#define cfbPolyGlyphBlt8	cfbPolyGlyphRop8
+#define cfbPolyGlyphBlt8Clipped	cfbPolyGlyphRop8Clipped
+
+#undef WriteBitGroup
+#define WriteBitGroup(dst,pixel,bits)	RRopBitGroup(dst,bits)
+
+#endif
+
+static void cfbPolyGlyphBlt8Clipped(
+    DrawablePtr pDrawable,
+    GCPtr	pGC,
+    int 	x,
+    int         y,
+    unsigned int nglyph,
+    CharInfoPtr *ppci,		/* array of character info */
+    unsigned char *pglyphBase); /* start of array of glyphs */
+
+#if defined(HAS_STIPPLE_CODE) && !defined(GLYPHROP) && !defined(USE_LEFTBITS)
+#define USE_STIPPLE_CODE
+#endif
+
+#if defined(__GNUC__) && !defined(GLYPHROP) && (defined(mc68020) || defined(mc68000) || defined(__mc68000__)) && PSZ == 8 && !defined(USE_LEFTBITS)
+#ifdef USE_STIPPLE_CODE
+#undef USE_STIPPLE_CODE
+#endif
+#include "stip68kgnu.h"
+#endif
+
+#if PSZ == 24
+#define DST_INC	    3
+#else
+#define DST_INC	    (PGSZB >> PWSH)
+#endif
+
+/*  cfbStippleStack/cfbStippleStackTE are coded in assembly language.
+ *  They are only provided on some architecures.
+ */
+#ifdef USE_STIPPLE_CODE
+extern void		cfbStippleStack (), cfbStippleStackTE ();
+#endif
+
+void
+cfbPolyGlyphBlt8 (pDrawable, pGC, x, y, nglyph, ppci, pglyphBase)
+    DrawablePtr pDrawable;
+    GCPtr	pGC;
+    int 	x, y;
+    unsigned int nglyph;
+    CharInfoPtr *ppci;		/* array of character info */
+    pointer	pglyphBase;	/* start of array of glyphs */
+{
+#ifndef GLYPHROP
+    register CfbBits  pixel;
+#endif
+#if !defined(STIPPLE) && !defined(USE_STIPPLE_CODE)
+    register CfbBits  c;
+    register CfbBits  *dst;
+#endif
+    register glyphPointer   glyphBits;
+    register int	    xoff;
+
+    FontPtr		pfont = pGC->font;
+    CharInfoPtr		pci;
+    CfbBits	*dstLine;
+    CfbBits	*pdstBase;
+    int			hTmp;
+    int			bwidthDst;
+    int			widthDst;
+    int			h;
+    BoxRec		bbox;		/* for clipping */
+    int			w;
+    RegionPtr		clip;
+    BoxPtr		extents;
+#ifdef USE_LEFTBITS
+    int			widthGlyph;
+    CfbBits	widthMask;
+#endif
+#ifndef STIPPLE
+#ifdef USE_STIPPLE_CODE
+    void		(*stipple)();
+
+    stipple = cfbStippleStack;
+    if (FONTCONSTMETRICS(pfont))
+	stipple = cfbStippleStackTE;
+#endif
+#endif
+    
+    x += pDrawable->x;
+    y += pDrawable->y;
+
+    /* compute an approximate (but covering) bounding box */
+    bbox.x1 = 0;
+    if ((ppci[0]->metrics.leftSideBearing < 0))
+	bbox.x1 = ppci[0]->metrics.leftSideBearing;
+    h = nglyph - 1;
+    w = ppci[h]->metrics.rightSideBearing;
+    while (--h >= 0)
+	w += ppci[h]->metrics.characterWidth;
+    bbox.x2 = w;
+    bbox.y1 = -FONTMAXBOUNDS(pfont,ascent);
+    bbox.y2 = FONTMAXBOUNDS(pfont,descent);
+
+    clip = cfbGetCompositeClip(pGC);
+    extents = &clip->extents;
+
+    if (!clip->data) 
+    {
+	if (!BOX_CONTAINS(extents, &bbox, x, y))
+	{
+	    if (BOX_OVERLAP (extents, &bbox, x, y))
+		cfbPolyGlyphBlt8Clipped(pDrawable, pGC, x, y,
+					nglyph, ppci, pglyphBase);
+	    return;
+	}
+    }
+    else
+    {
+    	/* check to make sure some of the text appears on the screen */
+    	if (!BOX_OVERLAP (extents, &bbox, x, y))
+	    return;
+    
+    	bbox.x1 += x;
+    	bbox.x2 += x;
+    	bbox.y1 += y;
+    	bbox.y2 += y;
+    
+    	switch (RECT_IN_REGION(pGC->pScreen, clip, &bbox))
+    	{
+      	  case rgnPART:
+	    cfbPolyGlyphBlt8Clipped(pDrawable, pGC, x, y,
+				    nglyph, ppci, pglyphBase);
+      	  case rgnOUT:
+	    return;
+    	}
+    }
+
+#ifdef GLYPHROP
+    cfb8CheckStipple (pGC->alu, pGC->fgPixel, pGC->planemask);
+#else
+    pixel = cfbGetGCPrivate(pGC)->xor;
+#endif
+
+    cfbGetTypedWidthAndPointer (pDrawable, bwidthDst, pdstBase, char, CfbBits)
+
+    widthDst = bwidthDst / PGSZB;
+    while (nglyph--)
+    {
+	pci = *ppci++;
+	glyphBits = (glyphPointer) FONTGLYPHBITS(pglyphBase,pci);
+	xoff = x + pci->metrics.leftSideBearing;
+#if PSZ == 24
+	dstLine = pdstBase + (y - pci->metrics.ascent) * widthDst +((xoff>> 2)*3);
+#else
+	dstLine = pdstBase +
+	          (y - pci->metrics.ascent) * widthDst + (xoff >> PWSH);
+#endif
+	x += pci->metrics.characterWidth;
+	if ((hTmp = pci->metrics.descent + pci->metrics.ascent))
+	{
+#if PSZ == 24
+	    xoff &= 0x03;
+#else
+	    xoff &= PIM;
+#endif /* PSZ == 24 */
+#ifdef STIPPLE
+	    STIPPLE(dstLine,glyphBits,pixel,bwidthDst,hTmp,xoff);
+#else
+#ifdef USE_STIPPLE_CODE
+	    (*stipple)(dstLine,glyphBits,pixel,bwidthDst,hTmp,xoff);
+#else
+#ifdef USE_LEFTBITS
+	    w = pci->metrics.rightSideBearing - pci->metrics.leftSideBearing;
+	    widthGlyph = PADGLYPHWIDTHBYTES(w);
+	    widthMask = mfbGetendtab(w);
+#endif
+	    do {
+	    	dst = dstLine;
+	    	dstLine = (CfbBits *) (((char *) dstLine) + bwidthDst);
+	    	GlyphBits(glyphBits, w, c)
+	    	WriteBitGroup(dst, pixel, GetBitGroup(BitRight(c,xoff)));
+	    	dst += DST_INC;
+	    	c = BitLeft(c,PGSZB - xoff);
+	    	while (c)
+	    	{
+		    WriteBitGroup(dst, pixel, GetBitGroup(c));
+		    NextBitGroup(c);
+		    dst += DST_INC;
+	    	}
+	    } while (--hTmp);
+#endif /* USE_STIPPLE_CODE else */
+#endif /* STIPPLE else */
+	}
+    }
+}
+
+static void
+cfbPolyGlyphBlt8Clipped(
+    DrawablePtr pDrawable,
+    GCPtr	pGC,
+    int 	x,
+    int         y,
+    unsigned int nglyph,
+    CharInfoPtr *ppci,		/* array of character info */
+    unsigned char *pglyphBase)	/* start of array of glyphs */
+{
+#ifndef GLYPHROP
+    register CfbBits	pixel;
+#endif
+#if !defined(STIPPLE) && !defined(USE_STIPPLE_CODE)
+    register CfbBits	c;
+#endif
+    register glyphPointer   glyphBits;
+    register int	xoff;
+#if defined(USE_LEFTBITS) || (!defined(STIPPLE) && !defined(USE_STIPPLE_CODE))
+    register CfbBits	*dst;
+#endif
+
+    CharInfoPtr		pci;
+    FontPtr		pfont = pGC->font;
+    CfbBits		*dstLine;
+    CfbBits		*pdstBase;
+#ifdef USE_LEFTBITS
+    CARD32		*cTmp;
+#endif
+    CARD32		*clips;
+    int			maxAscent, maxDescent;
+    int			minLeftBearing;
+    int			hTmp;
+    int			widthDst;
+    int			bwidthDst;
+    int			xG, yG;
+    BoxPtr		pBox;
+    int			numRects;
+    int			w;
+    RegionPtr		pRegion;
+    int			yBand;
+#ifdef GLYPHROP
+    CfbBits		bits;
+#endif
+#ifdef USE_LEFTBITS
+    int			widthGlyph;
+    CfbBits		widthMask;
+#endif
+
+#ifdef GLYPHROP
+    cfb8CheckStipple (pGC->alu, pGC->fgPixel, pGC->planemask);
+#else
+    pixel = cfbGetGCPrivate(pGC)->xor;
+#endif
+    
+    cfbGetTypedWidthAndPointer (pDrawable, bwidthDst, pdstBase, char, CfbBits)
+
+    widthDst = bwidthDst / PGSZB;
+    maxAscent = FONTMAXBOUNDS(pfont,ascent);
+    maxDescent = FONTMAXBOUNDS(pfont,descent);
+    minLeftBearing = FONTMINBOUNDS(pfont,leftSideBearing);
+
+    pRegion = cfbGetCompositeClip(pGC);
+
+    pBox = REGION_RECTS(pRegion);
+    numRects = REGION_NUM_RECTS (pRegion);
+    while (numRects && pBox->y2 <= y - maxAscent)
+    {
+	++pBox;
+	--numRects;
+    }
+    if (!numRects || pBox->y1 >= y + maxDescent)
+	return;
+    yBand = pBox->y1;
+    while (numRects && pBox->y1 == yBand && pBox->x2 <= x + minLeftBearing)
+    {
+	++pBox;
+	--numRects;
+    }
+    if (!numRects)
+	return;
+    clips = (CARD32 *)xalloc ((maxAscent + maxDescent) *
+						sizeof (CARD32));
+    while (nglyph--)
+    {
+	pci = *ppci++;
+	glyphBits = (glyphPointer) FONTGLYPHBITS(pglyphBase,pci);
+	w = pci->metrics.rightSideBearing - pci->metrics.leftSideBearing;
+	xG = x + pci->metrics.leftSideBearing;
+	yG = y - pci->metrics.ascent;
+	x += pci->metrics.characterWidth;
+	if ((hTmp = pci->metrics.descent + pci->metrics.ascent))
+	{
+#if PSZ == 24
+	    dstLine = pdstBase + yG * widthDst + ((xG>> 2)*3);
+	    /* never use (xG*3)>>2 */
+#else
+	    dstLine = pdstBase + yG * widthDst + (xG >> PWSH);
+#endif
+#if PSZ == 24
+	    xoff = xG & 3;
+#else
+	    xoff = xG & PIM;
+#endif
+#ifdef USE_LEFTBITS
+	    w = pci->metrics.rightSideBearing - pci->metrics.leftSideBearing;
+	    widthGlyph = PADGLYPHWIDTHBYTES(w);
+	    widthMask = mfbGetendtab(w);
+#endif
+	    switch (cfb8ComputeClipMasks32 (pBox, numRects, xG, yG, w, hTmp, clips))
+ 	    {
+	    case rgnPART:
+#ifdef USE_LEFTBITS
+	    	cTmp = clips;
+	    	do {
+	    	    dst = dstLine;
+	    	    dstLine = (CfbBits *) (((char *) dstLine) + bwidthDst);
+	    	    GlyphBits(glyphBits, w, c)
+		    c &= *cTmp++;
+		    if (c)
+		    {
+	    	    	WriteBitGroup(dst, pixel, GetBitGroup(BitRight(c,xoff)));
+	    	    	c = BitLeft(c,PGSZB - xoff); 
+	    	    	dst += DST_INC;
+	    	    	while (c)
+	    	    	{
+		    	    WriteBitGroup(dst, pixel, GetBitGroup(c));
+		    	    NextBitGroup(c);
+		    	    dst += DST_INC;
+	    	    	}
+		    }
+	    	} while (--hTmp);
+	    	break;
+#else /* !USE_LEFTBITS */
+	    	{
+		    int h;
+    
+		    h = hTmp;
+		    do
+		    {
+			--h;
+		    	clips[h] = clips[h] & glyphBits[h];
+		    } while (h);
+	    	}
+	    	glyphBits = clips;
+	    	/* fall through */
+#endif /* USE_LEFTBITS */
+	    case rgnIN:
+#ifdef STIPPLE
+	    	STIPPLE(dstLine,glyphBits,pixel,bwidthDst,hTmp,xoff);
+#else
+#ifdef USE_STIPPLE_CODE
+	    	cfbStippleStackTE(dstLine,glyphBits,pixel,bwidthDst,hTmp,xoff);
+#else
+	    	do {
+	    	    dst = dstLine;
+	    	    dstLine = (CfbBits *) (((char *) dstLine) + bwidthDst);
+	    	    GlyphBits(glyphBits, w, c)
+		    if (c)
+		    {
+		        /* This code originally could read memory locations
+			 * that were not mapped. Hence we have to check the
+			 * trailing bits to see whether they are zero and if
+			 * then skip them correctly. This is no problem for
+			 * the GXcopy case, since there only the pixels that
+			 * are non-zero are written ...
+			 */
+#ifndef GLYPHROP
+	    	    	WriteBitGroup(dst, pixel, GetBitGroup(BitRight(c,xoff)));
+	    	    	c = BitLeft(c,PGSZB - xoff);
+	    	    	dst += DST_INC;
+#else /* GLYPHROP */
+                        if ((bits = GetBitGroup(BitRight(c,xoff))))
+	    	    	  WriteBitGroup(dst, pixel, bits);
+	    	    	c = BitLeft(c,PGSZB - xoff);
+	    	    	dst += DST_INC;
+
+			while (c && ((bits = GetBitGroup(c)) == 0))
+		        {
+		    	    NextBitGroup(c);
+		    	    dst += DST_INC;
+                        } 
+#endif /* GLYPHROP */
+	    	    	while (c)
+	    	    	{
+		    	    WriteBitGroup(dst, pixel, GetBitGroup(c));
+		    	    NextBitGroup(c);
+		    	    dst += DST_INC;
+	    	    	}
+		    }
+	    	} while (--hTmp);
+#endif /* USE_STIPPLE_CODE else */
+#endif /* STIPPLE else */
+	    	break;
+	    }
+	}
+    }
+    xfree (clips);
+}
+
+#endif /* FOUR_BIT_CODE */