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

diff --git a/xorg-server/hw/xfree86/xf4bpp/mfbbresd.c b/xorg-server/hw/xfree86/xf4bpp/mfbbresd.c
new file mode 100644
index 000000000..318d4f5da
--- /dev/null
+++ b/xorg-server/hw/xfree86/xf4bpp/mfbbresd.c
@@ -0,0 +1,205 @@
+/***********************************************************
+
+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.
+
+******************************************************************/
+/* GJA -- modified this file for vga16 */
+
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
+#include "xf4bpp.h"
+#include "OScompiler.h"
+#include "mfbmap.h"
+#include "mfb.h"
+#include "maskbits.h"
+#include "miline.h"
+#include "wm3.h"
+#include "xf86.h"
+
+/* Dashed bresenham line */
+
+#define NO_INK (-1) /* GJA -- means: dash is off */
+
+#define StepDash\
+    if (!--dashRemaining) { \
+	if (++ dashIndex == numInDashList) \
+	    dashIndex = 0; \
+	dashRemaining = pDash[dashIndex]; \
+	ink = fgink; \
+	if (dashIndex & 1) \
+	    ink = bgink; \
+	if (isDoubleDash) \
+	    WM3_SET_INK(ink); \
+    }
+
+void
+xf4bppBresD(pDrawable, fgink, bgink,
+	 pdashIndex, pDash, numInDashList, pdashOffset, isDoubleDash,
+	 addrlbase, nlwidth,
+	 signdx, signdy, axis, x1, y1, e, e1, e2, len)
+DrawablePtr pDrawable;
+int fgink, bgink;
+int *pdashIndex;	/* current dash */
+unsigned char *pDash;	/* dash list */
+int numInDashList;	/* total length of dash list */
+int *pdashOffset;	/* offset into current dash */
+int isDoubleDash;
+PixelType *addrlbase;	/* pointer to base of bitmap */
+int nlwidth;		/* width in longwords of bitmap */
+int signdx, signdy;	/* signs of directions */
+int axis;		/* major axis (Y_AXIS or X_AXIS) */
+int x1, y1;		/* initial point */
+register int e;		/* error accumulator */
+register int e1;	/* bresenham increments */
+int e2;
+int len;		/* length of line */
+{
+    IOADDRESS REGBASE =
+	xf86Screens[pDrawable->pScreen->myNum]->domainIOBase + 0x300;
+    register int yinc;	/* increment to next scanline, in bytes */
+    register PixelType *addrl;
+    register int e3 = e2-e1;
+    register unsigned long bit;
+    PixelType leftbit = mfbGetmask(0); /* leftmost bit to process in new word */
+    PixelType rightbit = mfbGetmask(PPW-1); /* rightmost bit to process in new word */
+    int dashIndex;
+    int dashOffset;
+    int dashRemaining;
+    int	ink;
+
+    fgink &= 0x0F; bgink &= 0x0F; /* GJA -- so they're != NO_INK */
+
+    dashOffset = *pdashOffset;
+    dashIndex = *pdashIndex;
+    dashRemaining = pDash[dashIndex] - dashOffset;
+    ink = fgink;
+    if (!isDoubleDash)
+	bgink = NO_INK;
+    if (dashIndex & 1)
+	ink = bgink;
+    if ( ink != NO_INK ) WM3_SET_INK(ink);
+
+    /* point to longword containing first point */
+    addrl = mfbScanline(addrlbase, x1, y1, nlwidth);
+    yinc = signdy * nlwidth;
+    e = e-e1;			/* to make looping easier */
+    bit = mfbGetmask(x1 & PIM);
+    if (axis == X_AXIS)
+    {
+	if (signdx > 0)
+	{
+	    while(len--)
+	    { 
+		if ( ink != NO_INK ) UPDRW(addrl,bit);
+		e += e1;
+		if (e >= 0)
+		{
+		    addrl += yinc;
+		    e += e3;
+		}
+		bit = SCRRIGHT(bit,1);
+		if (!bit) { bit = leftbit; addrl++; }
+		StepDash
+	    }
+	}
+	else
+	{
+	    while(len--)
+	    { 
+		
+		if ( ink != NO_INK ) UPDRW(addrl,bit);
+		e += e1;
+		if (e >= 0)
+		{
+		    addrl += yinc;
+		    e += e3;
+		}
+		bit = SCRLEFT(bit,1);
+		if (!bit) { bit = rightbit; addrl--; }
+		StepDash
+	    }
+	}
+    } /* if X_AXIS */
+    else
+    {
+	if (signdx > 0)
+	{
+	    while(len--)
+	    {
+		if ( ink != NO_INK ) UPDRW(addrl,bit);
+		e += e1;
+		if (e >= 0)
+		{
+		    bit = SCRRIGHT(bit,1);
+		    if (!bit) { bit = leftbit; addrl++; }
+		    e += e3;
+		}
+		addrl += yinc;
+		StepDash
+	    }
+	}
+	else
+	{
+	    while(len--)
+	    {
+		
+		if ( ink != NO_INK ) UPDRW(addrl,bit);
+		e += e1;
+		if (e >= 0)
+		{
+		    bit = SCRLEFT(bit,1);
+		    if (!bit) { bit = rightbit; addrl--; }
+		    e += e3;
+		}
+		addrl += yinc;
+		StepDash
+	    }
+	}
+    } /* else Y_AXIS */
+    *pdashIndex = dashIndex;
+    *pdashOffset = pDash[dashIndex] - dashRemaining;
+}