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

diff --git a/xorg-server/afb/afbpixmap.c b/xorg-server/afb/afbpixmap.c
new file mode 100644
index 000000000..ad591a1af
--- /dev/null
+++ b/xorg-server/afb/afbpixmap.c
@@ -0,0 +1,299 @@
+/***********************************************************
+
+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.
+
+******************************************************************/
+
+/* pixmap management
+   written by drewry, september 1986
+
+   on a monchrome device, a pixmap is a bitmap.
+*/
+
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
+#include <string.h>
+
+#include <X11/Xmd.h>
+#include "scrnintstr.h"
+#include "pixmapstr.h"
+#include "maskbits.h"
+
+#include "afb.h"
+#include "mi.h"
+
+#include "servermd.h"
+#include "mfb.h"
+
+PixmapPtr
+afbCreatePixmap(pScreen, width, height, depth, usage_hint)
+	ScreenPtr		pScreen;
+	int				width;
+	int				height;
+	int				depth;
+	unsigned			usage_hint;
+{
+	PixmapPtr pPixmap;
+	size_t datasize;
+	size_t paddedWidth;
+
+	paddedWidth = BitmapBytePad(width);
+
+	if (paddedWidth > 32767 || height > 32767 || depth > 4)
+	    return NullPixmap;
+	
+	datasize = height * paddedWidth * depth;
+	pPixmap = AllocatePixmap(pScreen, datasize);
+	if (!pPixmap)
+		return(NullPixmap);
+	pPixmap->drawable.type = DRAWABLE_PIXMAP;
+	pPixmap->drawable.class = 0;
+	pPixmap->drawable.pScreen = pScreen;
+	pPixmap->drawable.depth = depth;
+	pPixmap->drawable.bitsPerPixel = depth;
+	pPixmap->drawable.id = 0;
+	pPixmap->drawable.serialNumber = NEXT_SERIAL_NUMBER;
+	pPixmap->drawable.x = 0;
+	pPixmap->drawable.y = 0;
+	pPixmap->drawable.width = width;
+	pPixmap->drawable.height = height;
+	pPixmap->devKind = paddedWidth;
+	pPixmap->refcnt = 1;
+	pPixmap->devPrivate.ptr =  datasize ?
+				(pointer)((char *)pPixmap + pScreen->totalPixmapSize) : NULL;
+	pPixmap->usage_hint = usage_hint;
+	return(pPixmap);
+}
+
+Bool
+afbDestroyPixmap(pPixmap)
+	PixmapPtr pPixmap;
+{
+	if(--pPixmap->refcnt)
+		return(TRUE);
+	dixFreePrivates(pPixmap->devPrivates);
+	xfree(pPixmap);
+	return(TRUE);
+}
+
+
+static PixmapPtr
+afbCopyPixmap(PixmapPtr pSrc)
+{
+	register PixmapPtr pDst;
+	int size;
+	ScreenPtr pScreen;
+
+	size = pSrc->drawable.height * pSrc->devKind * pSrc->drawable.depth;
+	pScreen = pSrc->drawable.pScreen;
+	pDst = (*pScreen->CreatePixmap)(pScreen,
+					pSrc->drawable.width,
+					pSrc->drawable.height,
+					pSrc->drawable.depth, 0);
+	if (!pDst)
+		return(NullPixmap);
+	memmove((char *)pDst->devPrivate.ptr, (char *)pSrc->devPrivate.ptr, size);
+	return(pDst);
+}
+
+
+/* replicates a pattern to be a full 32 bits wide.
+   relies on the fact that each scnaline is longword padded.
+   doesn't do anything if pixmap is not a factor of 32 wide.
+   changes width field of pixmap if successful, so that the fast
+		XRotatePixmap code gets used if we rotate the pixmap later.
+
+   calculate number of times to repeat
+   for each scanline of pattern
+	  zero out area to be filled with replicate
+	  left shift and or in original as many times as needed
+*/
+static void
+afbPadPixmap(PixmapPtr pPixmap)
+{
+	register int width = pPixmap->drawable.width;
+	register int h;
+	register PixelType mask;
+	register PixelType *p;
+	register PixelType bits;		/* real pattern bits */
+	register int i;
+	int d;
+	int rep;						/* repeat count for pattern */
+
+	if (width >= PPW)
+		return;
+
+	rep = PPW/width;
+	if (rep*width != PPW)
+		return;
+
+	mask = mfbGetendtab(width);
+
+	p = (PixelType *)(pPixmap->devPrivate.ptr);
+
+	for (d = 0; d < pPixmap->drawable.depth; d++) {
+		for (h = 0; h < pPixmap->drawable.height; h++) {
+			*p &= mask;
+			bits = *p;
+			for(i = 1; i < rep; i++) {
+				bits = SCRRIGHT(bits, width);
+				*p |= bits;
+			}
+			p++;	/* @@@ NEXT PLANE @@@ */
+		}
+	}
+	pPixmap->drawable.width = PPW;
+}
+
+/* Rotates pixmap pPix by w pixels to the right on the screen. Assumes that
+ * words are PPW bits wide, and that the least significant bit appears on the
+ * left.
+ */
+void
+afbXRotatePixmap(pPix, rw)
+	PixmapPtr		pPix;
+	register int rw;
+{
+	register PixelType		*pw, *pwFinal;
+	register PixelType		t;
+
+	if (pPix == NullPixmap)
+		return;
+
+	pw = (PixelType *)pPix->devPrivate.ptr;
+	rw %= (int)pPix->drawable.width;
+	if (rw < 0)
+		rw += (int)pPix->drawable.width;
+	if(pPix->drawable.width == PPW) {
+		pwFinal = pw + pPix->drawable.height * pPix->drawable.depth;
+		while(pw < pwFinal) {
+			t = *pw;
+			*pw++ = SCRRIGHT(t, rw) |
+				(SCRLEFT(t, (PPW-rw)) & mfbGetendtab(rw));
+		}
+	} else {
+		/* We no longer do this.  Validate doesn't try to rotate odd-size
+		 * tiles or stipples.  afbUnnatural<tile/stipple>FS works directly off
+		 * the unrotate tile/stipple in the GC
+		 */
+		ErrorF("X internal error: trying to rotate odd-sized pixmap.\n");
+	}
+
+}
+
+/* Rotates pixmap pPix by h lines.  Assumes that h is always less than
+   pPix->height
+   works on any width.
+ */
+void
+afbYRotatePixmap(pPix, rh)
+	register PixmapPtr		pPix;
+	int		rh;
+{
+	int nbyDown;		/* bytes to move down to row 0; also offset of
+								row rh */
+	int nbyUp;			/* bytes to move up to line rh; also
+								offset of first line moved down to 0 */
+	char *pbase;
+	char *ptmp;
+	int height;
+	int d;
+
+	if (pPix == NullPixmap)
+		return;
+	height = (int) pPix->drawable.height;
+	rh %= height;
+	if (rh < 0)
+		rh += height;
+
+	nbyDown = rh * pPix->devKind;
+	nbyUp = (pPix->devKind * height) - nbyDown;
+
+	if(!(ptmp = (char *)xalloc(nbyUp)))
+		return;
+
+	for (d = 0; d < pPix->drawable.depth; d++) {
+		pbase = (char *)pPix->devPrivate.ptr + pPix->devKind * height * d;	/* @@@ NEXT PLANE @@@ */
+
+		memmove(ptmp, pbase, nbyUp);					/* save the low rows */
+		memmove(pbase, pbase+nbyUp, nbyDown);		/* slide the top rows down */
+		memmove(pbase+nbyDown, ptmp, nbyUp);		/* move lower rows up to row rh */
+	}
+	xfree(ptmp);
+}
+
+void
+afbCopyRotatePixmap(psrcPix, ppdstPix, xrot, yrot)
+	register PixmapPtr psrcPix, *ppdstPix;
+	int		xrot, yrot;
+{
+	register PixmapPtr pdstPix;
+
+	if ((pdstPix = *ppdstPix) &&
+		(pdstPix->devKind == psrcPix->devKind) &&
+		(pdstPix->drawable.height == psrcPix->drawable.height) &&
+		(pdstPix->drawable.depth == psrcPix->drawable.depth)) {
+		memmove((char *)pdstPix->devPrivate.ptr,
+				(char *)psrcPix->devPrivate.ptr,
+				psrcPix->drawable.height * psrcPix->devKind *
+				psrcPix->drawable.depth);
+		pdstPix->drawable.width = psrcPix->drawable.width;
+		pdstPix->drawable.serialNumber = NEXT_SERIAL_NUMBER;
+	} else {
+		if (pdstPix)
+			/* FIX XBUG 6168 */
+			(*pdstPix->drawable.pScreen->DestroyPixmap)(pdstPix);
+		*ppdstPix = pdstPix = afbCopyPixmap(psrcPix);
+		if (!pdstPix)
+			return;
+	}
+	afbPadPixmap(pdstPix);
+	if (xrot)
+		afbXRotatePixmap(pdstPix, xrot);
+	if (yrot)
+		afbYRotatePixmap(pdstPix, yrot);
+}