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

diff --git a/xorg-server/hw/xfree86/xf4bpp/ppcSetSp.c b/xorg-server/hw/xfree86/xf4bpp/ppcSetSp.c
new file mode 100644
index 000000000..7659384e7
--- /dev/null
+++ b/xorg-server/hw/xfree86/xf4bpp/ppcSetSp.c
@@ -0,0 +1,319 @@
+/*
+ * Copyright IBM Corporation 1987,1988,1989
+ *
+ * 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 IBM not be
+ * used in advertising or publicity pertaining to distribution of the
+ * software without specific, written prior permission.
+ *
+ * IBM DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
+ * ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
+ * IBM 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.
+ *
+*/
+
+/***********************************************************
+
+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_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
+#include <stdlib.h>
+
+#include "xf4bpp.h"
+#include "OScompiler.h"
+#include "mfbmap.h"
+#include "mfb.h"
+#include "servermd.h"
+
+/* SetScanline -- 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
+ppcSetScanline
+(
+    register int	   pixCount,	/* width of scanline in bits */
+    register char          *psrc,
+    register unsigned char *pdst,	/* where to put the bits */
+    register int	   pm,		/* plane mask */
+    const int		   alu		/* raster op */
+)
+{
+register int npm = ~pm ;	/* inverted plane mask */
+register char tmpx ;
+
+pm &= 0x0F; npm &= 0x0F; /* GJA */
+
+switch ( alu ) {
+	case GXclear:		/* 0x0 Zero 0 */
+		while ( pixCount-- )
+			*pdst++ &= npm ;
+		break ;
+	case GXand:		/* 0x1 src AND dst */
+		while ( pixCount-- )
+			*pdst++ &= *psrc++ | npm ;
+		break ;
+	case GXandReverse:	/* 0x2 src AND NOT dst */
+		for ( ; pixCount-- ; pdst++, psrc++ ) {
+			tmpx = *pdst;
+			*pdst = ( tmpx & npm ) | ( pm & *psrc & ~tmpx ) ;
+		}
+		break ;
+	case GXcopy:		/* 0x3 src */
+		for ( ; pixCount-- ; pdst++, psrc++ )
+			*pdst = ( *pdst & npm ) | ( pm & *psrc ) ;
+		break ;
+	case GXandInverted:	/* 0x4 NOT src AND dst */
+		while ( pixCount-- )
+			*pdst++ &= npm | ~*psrc++ ;
+		break ;
+	case GXnoop:		/* 0x5 dst */
+		break ;
+	case GXxor:		/* 0x6 src XOR dst */
+		while ( pixCount-- )
+			*pdst++ ^= pm & *psrc++ ;
+		break ;
+	case GXor:		/* 0x7 src OR dst */
+		while ( pixCount-- )
+			*pdst++ |= *psrc++ & pm ;
+		break ;
+	case GXnor:		/* 0x8 NOT src AND NOT dst */
+		for ( ; pixCount-- ; pdst++, psrc++ ) {
+			tmpx = *pdst;
+			*pdst = ( tmpx & npm ) | ( pm & ~( tmpx | *psrc ) ) ;
+		}
+		break ;
+	case GXequiv:		/* 0x9 NOT src XOR dst */
+		while ( pixCount-- )
+			*pdst++ ^= pm & ~ *psrc++ ;
+		break ;
+	case GXorReverse:	/* 0xb src OR NOT dst */
+		for ( ; pixCount-- ; pdst++, psrc++ ) {
+			tmpx = *pdst;
+			*pdst = ( tmpx & npm ) | ( pm & ( *psrc | ~tmpx ) ) ;
+		}
+		break ;
+	case GXinvert:		/* 0xa NOT dst */
+		while ( pixCount-- )
+			*pdst++ ^= pm ;
+		break ;
+	case GXcopyInverted:	/* 0xc NOT src */
+		for ( ; pixCount-- ; pdst++, psrc++ )
+			*pdst = ( *pdst & npm ) | ( pm & ~ *psrc ) ;
+		break ;
+	case GXorInverted:	/* 0xd NOT src OR dst */
+		while ( pixCount-- )
+			*pdst++ |= pm & ~ *psrc++ ;
+		break ;
+	case GXnand:		/* 0xe NOT src OR NOT dst */
+		for ( ; pixCount-- ; pdst++, psrc++ ) {
+			tmpx = *pdst;
+			*pdst = ( tmpx & npm ) | ( pm & ~( tmpx & *psrc ) ) ;
+		}
+		break ;
+	case GXset:		/* 0xf 1 */
+		while ( pixCount-- )
+			*pdst++ |= pm ;
+		break ;
+	default:
+		ErrorF( "ppcSetScanLine: bad alu value == 0x%02X\n", alu ) ;
+		break ;
+}
+
+return ;
+}
+
+/* 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
+xf4bppSetSpans( pDrawable, pGC, psrc, ppt, pwidth, nspans, fSorted )
+    register DrawablePtr	pDrawable ;
+    GCPtr			pGC ;
+    char			*psrc ;
+    register DDXPointPtr	ppt ;
+    int				*pwidth ;
+    int				nspans ;
+    int				fSorted ;
+{
+    unsigned char	*pdstBase = NULL;	/* start of dst bitmap */
+    int 		widthDst = 0;		/* width of bitmap in words */
+    register BoxPtr 	pbox, pboxLast, pboxTest ;
+    register DDXPointPtr pptLast ;
+    RegionPtr 		prgnDst ;
+    register int	width ;
+    int			xStart, xEnd ;
+    int			yMax ;
+    int			alu ;
+    int			pm ;
+
+    /* allow for 1-deep windows on nfb machines (eg apa8, aed) */
+    if ( ( pDrawable->depth == 1 ) && ( pDrawable->type == DRAWABLE_PIXMAP ) ) {
+	mfbSetSpans( pDrawable, pGC, psrc, ppt, pwidth, nspans, fSorted ) ;
+	return ;
+    }
+
+    if ( !( pm = pGC->planemask & ~( (~0) << pDrawable->depth ) )
+      || ( ( alu = pGC->alu ) == GXnoop ) )
+	return ;
+
+    prgnDst = pGC->pCompositeClip ;
+
+    if ( ! REGION_NUM_RECTS(prgnDst))
+	return ;
+
+    pboxLast = ( pbox = REGION_RECTS(prgnDst) ) + REGION_NUM_RECTS(prgnDst);
+    pptLast = ppt + nspans ;
+
+    if ( pDrawable->type == DRAWABLE_WINDOW ) {
+	yMax = (int) pDrawable->height + pDrawable->y ;
+    }
+    else {
+	pdstBase = (unsigned char *) ( (PixmapPtr) pDrawable )->devPrivate.ptr ;
+	widthDst = (int) ( (PixmapPtr) pDrawable )->devKind ;
+	yMax = pDrawable->height ;
+    }
+
+    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 
+     */
+	for ( pboxTest = pbox ;
+	      ( ppt < pptLast ) && ( ppt->y < yMax ) ;
+	      ppt++, pwidth++,
+	      psrc += PixmapBytePad( width, pDrawable->depth ) ) {
+	    width = *pwidth ;
+	    for ( pbox = pboxTest ;
+	          pbox < pboxLast ;
+		  pbox++ ) {
+		if ( pbox->y2 <= ppt->y ) {
+		    /* clip box is before scanline */
+		    pboxTest = pbox + 1 ;
+		}
+		else if ( ( pbox->y1 > ppt->y )
+		       || ( pbox->x1 > ppt->x + width ) )
+		    break ; /* scanline before clip box or left of clip box */
+		else if ( pbox->x2 > ppt->x ) {
+		    /* some of the scanline is in the current clip box */
+		    xStart = MAX( pbox->x1, ppt->x ) ;
+		    xEnd = MIN( ppt->x + width, pbox->x2 ) ;
+		    if ( pDrawable->type == DRAWABLE_PIXMAP )
+			    ppcSetScanline( xEnd - xStart,
+					    psrc + ( xStart - ppt->x ),
+					    pdstBase + xStart
+					    + ( ppt->y * widthDst ),
+				            pm, alu ) ;
+		    else
+			xf4bppDrawColorImage( (WindowPtr)pDrawable,
+			      xStart, ppt->y, xEnd - xStart, 1,
+			      (unsigned char *)psrc + ( xStart - ppt->x ),
+			      xEnd - xStart, alu, pm ) ;
+		    if ( ppt->x + width <= pbox->x2 )
+		        break ; /* End of the line, as it were */
+		}
+	    }
+	    /* We've tried this line against every box ; it must be outside them
+	     * all.  move on to the next point */
+	}
+    }
+    else {
+    /* scan lines not sorted. We must clip each line against all the boxes */
+	for ( ;
+	      ppt < pptLast ;
+	      ppt++, pwidth++,
+	      psrc += PixmapBytePad( width, pDrawable->depth ) ) {
+	    width = *pwidth ;
+	    if ( ppt->y >= 0 && ppt->y < yMax ) {
+		for ( pbox = REGION_RECTS(prgnDst) ; pbox < pboxLast ; pbox++ ) {
+		    if ( pbox->y1 > ppt->y )
+			break ; /* rest of clip region is above this scanline */
+		    else if ( ( pbox->y2 > ppt->y )
+			   && ( pbox->x1 <= ppt->x + width )
+			   && ( pbox->x2 > ppt->x ) ) {
+			xStart = MAX( pbox->x1, ppt->x ) ;
+			xEnd = MIN( pbox->x2, ppt->x + width ) ;
+    			if ( pDrawable->type == DRAWABLE_PIXMAP )
+				ppcSetScanline( xEnd - xStart,
+						psrc + ( xStart - ppt->x ),
+						/* ^ GJA */
+						( ( pdstBase
+						 + ( ppt->y * widthDst ) )
+						 + xStart ),
+						pm, alu ) ;
+    			else	/* pDrawable->type == DRAWABLE_WINDOW */
+			    xf4bppDrawColorImage( (WindowPtr)pDrawable,
+				  xStart, ppt->y, xEnd - xStart, 1,
+				  (unsigned char *)psrc + ( xStart - ppt->x ),
+							/* GJA ^ */
+				  xEnd - xStart, alu, pm ) ;
+		    }
+
+		}
+	    }
+	}
+    }
+    return ;
+}