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

diff --git a/xorg-server/fb/fbpoint.c b/xorg-server/fb/fbpoint.c
new file mode 100644
index 000000000..c0ea8ba5b
--- /dev/null
+++ b/xorg-server/fb/fbpoint.c
@@ -0,0 +1,162 @@
+/*
+ * Copyright © 1998 Keith Packard
+ *
+ * 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, and that the name of Keith Packard not be used in
+ * advertising or publicity pertaining to distribution of the software without
+ * specific, written prior permission.  Keith Packard makes no
+ * representations about the suitability of this software for any purpose.  It
+ * is provided "as is" without express or implied warranty.
+ *
+ * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL KEITH PACKARD 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 "fb.h"
+
+typedef void	(*FbDots)  (FbBits	*dst,
+			    FbStride    dstStride,
+			    int		dstBpp,
+			    BoxPtr	pBox,
+			    xPoint	*pts,
+			    int		npt,
+			    int		xorg,
+			    int		yorg,
+			    int		xoff,
+			    int		yoff,
+			    FbBits	and,
+			    FbBits	xor);
+
+void
+fbDots (FbBits	    *dstOrig,
+	FbStride    dstStride,
+	int	    dstBpp,
+	BoxPtr	    pBox,
+	xPoint	    *pts,
+	int	    npt,
+	int	    xorg,
+	int	    yorg,
+	int	    xoff,
+	int	    yoff,
+	FbBits	    andOrig,
+	FbBits	    xorOrig)
+{
+    FbStip	*dst = (FbStip *) dstOrig;
+    int		x1, y1, x2, y2;
+    int		x, y;
+    FbStip	*d;
+    FbStip	and = andOrig;
+    FbStip	xor = xorOrig;
+
+    dstStride = FbBitsStrideToStipStride (dstStride);
+    x1 = pBox->x1;
+    y1 = pBox->y1;
+    x2 = pBox->x2;
+    y2 = pBox->y2;
+    while (npt--)
+    {
+	x = pts->x + xorg;
+	y = pts->y + yorg;
+	pts++;
+	if (x1 <= x && x < x2 && y1 <= y && y < y2)
+	{
+	    x = (x + xoff) * dstBpp;
+	    d = dst + ((y + yoff) * dstStride) + (x >> FB_STIP_SHIFT);
+	    x &= FB_STIP_MASK;
+#ifdef FB_24BIT
+	    if (dstBpp == 24)
+	    {
+		FbStip	leftMask, rightMask;
+		int	n, rot;
+		FbStip	andT, xorT;
+		
+		rot = FbFirst24Rot (x);
+		andT = FbRot24Stip(and,rot);
+		xorT = FbRot24Stip(xor,rot);
+		FbMaskStip (x, 24, leftMask, n, rightMask);
+		if (leftMask)
+		{
+		    WRITE(d, FbDoMaskRRop (READ(d), andT, xorT, leftMask));
+		    andT = FbNext24Stip(andT);
+		    xorT = FbNext24Stip(xorT);
+		    d++;
+		}
+		if (rightMask)
+		    WRITE(d, FbDoMaskRRop(READ(d), andT, xorT, rightMask));
+	    }
+	    else
+#endif
+	    {
+		FbStip	mask;
+		mask = FbStipMask(x, dstBpp);
+		WRITE(d, FbDoMaskRRop (READ(d), and, xor, mask));
+	    }
+	}
+    }
+}
+
+void
+fbPolyPoint (DrawablePtr    pDrawable,
+	     GCPtr	    pGC,
+	     int	    mode,
+	     int	    nptInit,
+	     xPoint	    *pptInit)
+{
+    FbGCPrivPtr pPriv = fbGetGCPrivate (pGC);
+    RegionPtr	pClip = fbGetCompositeClip(pGC);
+    FbBits	*dst;
+    FbStride	dstStride;
+    int		dstBpp;
+    int		dstXoff, dstYoff;
+    FbDots	dots;
+    FbBits	and, xor;
+    xPoint	*ppt;
+    int		npt;
+    BoxPtr	pBox;
+    int		nBox;
+    
+    /* make pointlist origin relative */
+    ppt = pptInit;
+    npt = nptInit;
+    if (mode == CoordModePrevious)
+    {
+	npt--;
+	while(npt--)
+	{
+	    ppt++;
+	    ppt->x += (ppt-1)->x;
+	    ppt->y += (ppt-1)->y;
+	}
+    }
+    fbGetDrawable (pDrawable, dst, dstStride, dstBpp, dstXoff, dstYoff);
+    and = pPriv->and;
+    xor = pPriv->xor;
+    dots = fbDots;
+#ifndef FBNOPIXADDR
+    switch (dstBpp) {
+    case 8:	dots = fbDots8; break;
+    case 16:    dots = fbDots16; break;
+#ifdef FB_24BIT
+    case 24:    dots = fbDots24; break;
+#endif
+    case 32:    dots = fbDots32; break;
+    }
+#endif
+    for (nBox = REGION_NUM_RECTS (pClip), pBox = REGION_RECTS (pClip);
+	 nBox--; pBox++)
+	(*dots) (dst, dstStride, dstBpp, pBox, pptInit, nptInit, 
+		 pDrawable->x, pDrawable->y, dstXoff, dstYoff, and, xor);
+    fbFinishAccess (pDrawable);
+}