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

diff --git a/xorg-server/mfb/mfbtegblt.c b/xorg-server/mfb/mfbtegblt.c
new file mode 100644
index 000000000..ff52d8c9e
--- /dev/null
+++ b/xorg-server/mfb/mfbtegblt.c
@@ -0,0 +1,366 @@
+/* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
+/***********************************************************
+
+Copyright 1987, 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.
+
+
+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	<X11/Xproto.h>
+#include	"mfb.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	"maskbits.h"
+
+/*
+    this works for fonts with glyphs <= PPW bits wide.
+
+    This should be called only with a terminal-emulator font;
+this means that the FIXED_METRICS flag is set, and that
+glyphbounds == charbounds.
+
+    in theory, this goes faster; even if it doesn't, it reduces the
+flicker caused by writing a string over itself with image text (since
+the background gets repainted per character instead of per string.)
+this seems to be important for some converted X10 applications.
+
+    Image text looks at the bits in the glyph and the fg and bg in the
+GC.  it paints a rectangle, as defined in the protocol dcoument,
+and the paints the characters.
+
+   to avoid source proliferation, this file is compiled
+two times:
+	MFBTEGLYPHBLT		OP
+	mfbTEGlyphBltWhite		(white text, black bg )
+	mfbTEGlyphBltBlack	~	(black text, white bg )
+
+*/
+
+#if defined(NO_3_60_CG4) && defined(FASTPUTBITS) && defined(FASTGETBITS)
+#define FASTCHARS
+#endif
+
+/*
+ * this macro "knows" that only characters <= 8 bits wide will
+ * fit this case (which is why it is independent of GLYPHPADBYTES)
+ */
+
+#if (BITMAP_BIT_ORDER == MSBFirst) && (GLYPHPADBYTES != 4)
+#if GLYPHPADBYTES == 1
+#define ShiftAmnt   24
+#else
+#define ShiftAmnt   16
+#endif
+
+/*
+ * XXX XXX XXX There is something horribly, massively wrong here. There are
+ * hardcoded shifts by 64 below; these cannot work on any present-day
+ * architecture.
+ */
+
+/*
+ * Note: for BITMAP_BIT_ORDER != IMAGE_BYTE_ORDER, SCRRIGHT() evaluates its
+ * first argument more than once.  Thus the imbedded char++ have to be moved.
+ * (DHD)
+ */
+#if BITMAP_BIT_ORDER == IMAGE_BYTE_ORDER
+#define GetBits4    c = (*char1++ << ShiftAmnt) | \
+			SCRRIGHT (*char2++ << ShiftAmnt, xoff2) | \
+			SCRRIGHT (*char3++ << ShiftAmnt, xoff3) | \
+			SCRRIGHT (*char4++ << ShiftAmnt, xoff4);
+#else /* BITMAP_BIT_ORDER != IMAGE_BYTE_ORDER */
+#define GetBits4    c = (*char1++ << ShiftAmnt) | \
+			SCRRIGHT (*char2 << ShiftAmnt, xoff2) | \
+			SCRRIGHT (*char3 << ShiftAmnt, xoff3) | \
+			SCRRIGHT (*char4 << ShiftAmnt, xoff4); \
+			char2++; char3++; char4++;
+#endif /* BITMAP_BIT_ORDER == IMAGE_BYTE_ORDER */
+
+#else /* (BITMAP_BIT_ORDER != MSBFirst) || (GLYPHPADBYTES == 4) */
+
+#if BITMAP_BIT_ORDER == IMAGE_BYTE_ORDER
+#define GetBits4    c = *char1++ | \
+			SCRRIGHT (*char2++, xoff2) | \
+			SCRRIGHT (*char3++, xoff3) | \
+			SCRRIGHT (*char4++, xoff4);
+#else /* BITMAP_BIT_ORDER != IMAGE_BYTE_ORDER */
+#define GetBits4    c = *char1++ | \
+			SCRRIGHT (*char2, xoff2) | \
+			SCRRIGHT (*char3, xoff3) | \
+			SCRRIGHT (*char4, xoff4); \
+			char2++; char3++; char4++;
+#endif /* BITMAP_BIT_ORDER == IMAGE_BYTE_ORDER */
+
+#endif /* BITMAP_BIT_ORDER && GLYPHPADBYTES */
+
+
+#if GLYPHPADBYTES == 1
+typedef	unsigned char	*glyphPointer;
+#define USE_LEFTBITS
+#endif
+
+#if GLYPHPADBYTES == 2
+typedef unsigned short	*glyphPointer;
+#define USE_LEFTBITS
+#endif
+
+#if GLYPHPADBYTES == 4
+typedef unsigned int	*glyphPointer;
+#endif
+
+#ifdef USE_LEFTBITS
+#define GetBits1    getleftbits (char1, widthGlyph, c); \
+		    c &= glyphMask; \
+		    char1 = (glyphPointer) (((char *) char1) + glyphBytes);
+#else
+#define GetBits1    c = *char1++;
+#endif
+
+void
+MFBTEGLYPHBLT(pDrawable, pGC, x, y, nglyph, ppci, pglyphBase)
+    DrawablePtr pDrawable;
+    GC 		*pGC;
+    int 	x, y;
+    unsigned int nglyph;
+    CharInfoPtr *ppci;		/* array of character info */
+    pointer	pglyphBase;	/* start of array of glyphs */
+{
+    FontPtr	pfont = pGC->font;
+    int widthDst;
+    PixelType *pdstBase;	/* pointer to longword with top row 
+				   of current glyph */
+
+    int h;			/* height of glyph and char */
+    register int xpos;		/* current x  */
+    int ypos;			/* current y */
+    int widthGlyph;
+
+    int hTmp;			/* counter for height */
+    register PixelType startmask, endmask;
+    int nfirst;			/* used if glyphs spans a longword boundary */
+    BoxRec bbox;		/* for clipping */
+    int	widthGlyphs;
+    register PixelType  *dst;
+    register PixelType  c;
+    register int	    xoff1, xoff2, xoff3, xoff4;
+    register glyphPointer   char1, char2, char3, char4;
+
+#ifdef USE_LEFTBITS
+    register PixelType  glyphMask;
+    register PixelType  tmpSrc;
+    register int	    glyphBytes;
+#endif
+
+    if (!(pGC->planemask & 1))
+	return;
+
+    mfbGetPixelWidthAndPointer(pDrawable, widthDst, pdstBase);
+
+    xpos = x + pDrawable->x;
+    ypos = y + pDrawable->y;
+
+    widthGlyph = FONTMAXBOUNDS(pfont,characterWidth);
+    h = FONTASCENT(pfont) + FONTDESCENT(pfont);
+
+    xpos += FONTMAXBOUNDS(pfont,leftSideBearing);
+    ypos -= FONTASCENT(pfont);
+
+    bbox.x1 = xpos;
+    bbox.x2 = xpos + (widthGlyph * nglyph);
+    bbox.y1 = ypos;
+    bbox.y2 = ypos + h;
+
+    switch (RECT_IN_REGION(pGC->pScreen, pGC->pCompositeClip, &bbox))
+    {
+      case rgnPART:
+	/* this is the WRONG thing to do, but it works.
+	   calling the non-terminal text is easy, but slow, given
+	   what we know about the font.
+
+	   the right thing to do is something like:
+	    for each clip rectangle
+		compute at which row the glyph starts to be in it,
+		   and at which row the glyph ceases to be in it
+		compute which is the first glyph inside the left
+		    edge, and the last one inside the right edge
+		draw a fractional first glyph, using only
+		    the rows we know are in
+		draw all the whole glyphs, using the appropriate rows
+		draw any pieces of the last glyph, using the right rows
+
+	   this way, the code would take advantage of knowing that
+	   all glyphs are the same height and don't overlap.
+
+	   one day...
+	*/
+	CLIPTETEXT(pDrawable, pGC, x, y, nglyph, ppci, pglyphBase);
+      case rgnOUT:
+	return;
+    }
+    pdstBase = mfbScanlineDeltaNoBankSwitch(pdstBase, ypos, widthDst);
+    widthGlyphs = widthGlyph * PGSZB;
+
+#ifdef USE_LEFTBITS
+    glyphMask = endtab[widthGlyph];
+    glyphBytes = GLYPHWIDTHBYTESPADDED(*ppci);
+#endif
+
+    if (nglyph >= PGSZB && widthGlyphs <= PPW)
+    {
+	while (nglyph >= PGSZB)
+	{
+	    nglyph -= PGSZB;
+	    xoff1 = xpos & PIM;
+	    xoff2 = widthGlyph;
+	    xoff3 = xoff2 + widthGlyph;
+	    xoff4 = xoff3 + widthGlyph;
+	    char1 = (glyphPointer) FONTGLYPHBITS(pglyphBase,(*ppci++));
+	    char2 = (glyphPointer) FONTGLYPHBITS(pglyphBase,(*ppci++));
+	    char3 = (glyphPointer) FONTGLYPHBITS(pglyphBase,(*ppci++));
+	    char4 = (glyphPointer) FONTGLYPHBITS(pglyphBase,(*ppci++));
+
+	    hTmp = h;
+	    dst = mfbScanlineOffset(pdstBase, (xpos >> PWSH)); /* switch now */
+
+#ifndef FASTCHARS
+	    if (xoff1 + widthGlyphs <= PPW)
+	    {
+		maskpartialbits (xoff1, widthGlyphs, startmask);
+#endif
+		while (hTmp--)
+		{
+		    GetBits4
+#ifdef FASTCHARS
+# if BITMAP_BIT_ORDER == MSBFirst
+		    c >>= PPW - widthGlyphs;
+# endif
+		    FASTPUTBITS(OP(c), xoff1, widthGlyphs, dst);
+#else
+		    *(dst) = ((*dst) & ~startmask) | (OP(SCRRIGHT(c, xoff1)) & startmask);
+#endif
+		    mfbScanlineInc(dst, widthDst);
+		}
+#ifndef FASTCHARS
+	    }
+	    else
+	    {
+		maskPPWbits (xoff1, widthGlyphs, startmask, endmask);
+		nfirst = PPW - xoff1;
+		while (hTmp--)
+		{
+		    GetBits4
+		    dst[0] = (dst[0] & ~startmask) |
+			     (OP(SCRRIGHT(c,xoff1)) & startmask);
+		    dst[1] = (dst[1] & ~endmask) |
+			     (OP(SCRLEFT(c,nfirst)) & endmask);
+		    mfbScanlineInc(dst, widthDst);
+		}
+	    }
+#endif
+	    xpos += widthGlyphs;
+	}
+    }
+
+    while(nglyph--)
+    {
+	xoff1 = xpos & PIM;
+	char1 = (glyphPointer) FONTGLYPHBITS(pglyphBase,(*ppci++));
+	hTmp = h;
+	dst = mfbScanlineOffset(pdstBase, (xpos >> PWSH));
+
+#ifndef FASTCHARS
+	if (xoff1 + widthGlyph <= PPW)
+	{
+	    maskpartialbits (xoff1, widthGlyph, startmask);
+#endif
+	    while (hTmp--)
+	    {
+#ifdef FASTCHARS
+#ifdef USE_LEFTBITS
+		FASTGETBITS (char1,0,widthGlyph,c);
+		char1 = (glyphPointer) (((char *) char1) + glyphBytes);
+#else
+		c = *char1++;
+#if BITMAP_BIT_ORDER == MSBFirst
+		c >>= PPW - widthGlyph;
+#endif
+#endif
+		FASTPUTBITS (OP(c),xoff1,widthGlyph,dst);
+#else
+		GetBits1
+		(*dst) = ((*dst) & ~startmask) | (OP(SCRRIGHT(c, xoff1)) & startmask);
+#endif
+		mfbScanlineInc(dst, widthDst);
+	    }
+#ifndef FASTCHARS
+	}
+	else
+	{
+	    maskPPWbits (xoff1, widthGlyph, startmask, endmask);
+	    nfirst = PPW - xoff1;
+	    while (hTmp--)
+	    {
+		GetBits1
+		dst[0] = (dst[0] & ~startmask) |
+			 (OP(SCRRIGHT(c,xoff1)) & startmask);
+		dst[1] = (dst[1] & ~endmask) |
+			 (OP(SCRLEFT(c,nfirst)) & endmask);
+		mfbScanlineInc(dst, widthDst);
+	    }
+	}
+#endif
+	xpos += widthGlyph;
+    }
+}