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

diff --git a/libXfont/src/Speedo/spfont.c b/libXfont/src/Speedo/spfont.c
new file mode 100644
index 000000000..c209d5a51
--- /dev/null
+++ b/libXfont/src/Speedo/spfont.c
@@ -0,0 +1,453 @@
+/* $Xorg: spfont.c,v 1.4 2001/02/09 02:04:00 xorgcvs Exp $ */
+/*
+ * Copyright 1990, 1991 Network Computing Devices;
+ * Portions Copyright 1987 by Digital Equipment Corporation
+ *
+ * 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 names of Network Computing Devices or Digital
+ * not be used in advertising or publicity pertaining to distribution of
+ * the software without specific, written prior permission.
+ *
+ * NETWORK COMPUTING DEVICES AND DIGITAL DISCLAIM ALL WARRANTIES WITH
+ * REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL NETWORK COMPUTING DEVICES OR 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.
+ *
+ * Author: Dave Lemke, Network Computing Devices Inc
+ */
+/* $XFree86: xc/lib/font/Speedo/spfont.c,v 3.12tsi Exp $ */
+
+/*
+
+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.
+
+*/
+
+/*
+ * Speedo font loading
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include	<X11/fonts/FSproto.h>
+#include	"spint.h"
+#include	<X11/fonts/fontutil.h>
+#ifndef FONTMODULE
+#ifdef _XOPEN_SOURCE
+#include <math.h>
+#else
+#define _XOPEN_SOURCE	/* to get prototype for hypot on some systems */
+#include <math.h>
+#undef _XOPEN_SOURCE
+#endif
+#else
+#include "servermd.h"
+#include "xf86_ansic.h"
+#endif
+
+#ifndef M_PI
+#define M_PI 3.14159
+#endif /* M_PI */
+#ifndef DEFAULT_BIT_ORDER
+
+#ifdef BITMAP_BIT_ORDER
+#define DEFAULT_BIT_ORDER BITMAP_BIT_ORDER
+#else
+#define DEFAULT_BIT_ORDER UNKNOWN_BIT_ORDER
+#endif
+
+#endif
+
+static void SpeedoCloseFont(FontPtr pfont);
+
+static int
+sp_get_glyphs(
+    FontPtr     pFont,
+    unsigned long count,
+    register unsigned char *chars,
+    FontEncoding charEncoding,
+    unsigned long *glyphCount,	/* RETURN */
+    CharInfoPtr *glyphs)	/* RETURN */
+{
+    SpeedoFontPtr spf;
+    unsigned int firstCol;
+    register unsigned int numCols;
+    unsigned int firstRow;
+    unsigned int numRows;
+    CharInfoPtr *glyphsBase;
+    register unsigned int c;
+    register CharInfoPtr pci;
+    unsigned int r;
+    CharInfoPtr encoding;
+    CharInfoPtr pDefault;
+#ifdef notyet
+    int         itemSize;
+#endif
+    int         err = Successful;
+
+    spf = (SpeedoFontPtr) pFont->fontPrivate;
+    encoding = spf->encoding;
+    pDefault = spf->pDefault;
+    firstCol = pFont->info.firstCol;
+    numCols = pFont->info.lastCol - firstCol + 1;
+    glyphsBase = glyphs;
+
+
+    /* XXX - this should be much smarter */
+    /* make sure the glyphs are there */
+#ifdef notyet
+    if (charEncoding == Linear8Bit || charEncoding == TwoD8Bit)
+	itemSize = 1;
+    else
+	itemSize = 2;
+
+    if (!fsd->complete)
+	err = fs_load_glyphs(NULL, pFont, count, itemSize, chars);
+#endif
+
+    if (err != Successful)
+	return err;
+
+    switch (charEncoding) {
+
+    case Linear8Bit:
+    case TwoD8Bit:
+	if (pFont->info.firstRow > 0)
+	    break;
+	if (pFont->info.allExist && pDefault) {
+	    while (count--) {
+		c = (*chars++) - firstCol;
+		if (c < numCols)
+		    *glyphs++ = &encoding[c];
+		else
+		    *glyphs++ = pDefault;
+	    }
+	} else {
+	    while (count--) {
+		c = (*chars++) - firstCol;
+		if (c < numCols && (pci = &encoding[c])->bits)
+		    *glyphs++ = pci;
+		else if (pDefault)
+		    *glyphs++ = pDefault;
+	    }
+	}
+	break;
+    case Linear16Bit:
+	if (pFont->info.allExist && pDefault) {
+	    while (count--) {
+		c = *chars++ << 8;
+		c = (c | *chars++) - firstCol;
+		if (c < numCols)
+		    *glyphs++ = &encoding[c];
+		else
+		    *glyphs++ = pDefault;
+	    }
+	} else {
+	    while (count--) {
+		c = *chars++ << 8;
+		c = (c | *chars++) - firstCol;
+		if (c < numCols && (pci = &encoding[c])->bits)
+		    *glyphs++ = pci;
+		else if (pDefault)
+		    *glyphs++ = pDefault;
+	    }
+	}
+	break;
+
+    case TwoD16Bit:
+	firstRow = pFont->info.firstRow;
+	numRows = pFont->info.lastRow - firstRow + 1;
+	while (count--) {
+	    r = (*chars++) - firstRow;
+	    c = (*chars++) - firstCol;
+	    if (r < numRows && c < numCols &&
+		    (pci = &encoding[r * numCols + c])->bits)
+		*glyphs++ = pci;
+	    else if (pDefault)
+		*glyphs++ = pDefault;
+	}
+	break;
+    }
+    *glyphCount = glyphs - glyphsBase;
+    return Successful;
+}
+
+static CharInfoRec nonExistantChar;
+
+static int
+sp_get_metrics(
+    FontPtr     pFont,
+    unsigned long count,
+    register unsigned char *chars,
+    FontEncoding charEncoding,
+    unsigned long *glyphCount,	/* RETURN */
+    xCharInfo **glyphs)		/* RETURN */
+{
+    int         ret;
+    SpeedoFontPtr spf;
+    CharInfoPtr	oldDefault;
+
+    spf = (SpeedoFontPtr) pFont->fontPrivate;
+    oldDefault = spf->pDefault;
+    spf->pDefault = &nonExistantChar;
+    ret = sp_get_glyphs(pFont, count, chars, charEncoding,
+			glyphCount, (CharInfoPtr *) glyphs);
+
+    spf->pDefault = oldDefault;
+    return ret;
+}
+
+int
+sp_open_font(
+    char        *fontname,
+    char        *filename,
+    FontEntryPtr entry,
+    FontScalablePtr vals,
+    fsBitmapFormat format,
+    fsBitmapFormatMask fmask,
+    Mask        flags,
+    SpeedoFontPtr *spfont)
+{
+    SpeedoFontPtr spf;
+    SpeedoMasterFontPtr spmf;
+    int         ret;
+    specs_t     specs;
+    int		xx8, xy8, yx8, yy8;
+
+    /* find a master (create it if necessary) */
+    spmf = (SpeedoMasterFontPtr) entry->u.scalable.extra->private;
+    if (!spmf)
+    {
+	ret = sp_open_master(fontname, filename, &spmf);
+	if (ret != Successful)
+	    return ret;
+	entry->u.scalable.extra->private = (pointer) spmf;
+	spmf->entry = entry;
+    }
+
+    spf = (SpeedoFontPtr) xalloc(sizeof(SpeedoFontRec));
+    if (!spf)
+	return AllocError;
+    bzero((char *) spf, sizeof(SpeedoFontRec));
+
+    *spfont = spf;
+
+    /* clobber everything -- this may be leaking, but other wise evil
+     * stuff is left behind -- succesive transformed fonts get mangled */
+    bzero((char *)&sp_globals, sizeof(sp_globals));
+
+    spf->master = spmf;
+    spf->entry = entry;
+    spmf->refcount++;
+    sp_reset_master(spmf);
+    /* now we've done enough that if we bail out we must call sp_close_font */
+
+    spf->vals = *vals;
+
+    /* set up specs */
+
+    specs.pfont = &spmf->font;
+
+    specs.xxmult = (int)(vals->pixel_matrix[0] * (double)(1L << 16));
+    specs.xymult = (int)(vals->pixel_matrix[2] * (double)(1L << 16));
+    specs.yxmult = (int)(vals->pixel_matrix[1] * (double)(1L << 16));
+    specs.yymult = (int)(vals->pixel_matrix[3] * (double)(1L << 16));
+
+    specs.xoffset = 0L << 16; /* XXX tweak? */
+    specs.yoffset = 0L << 16; /* XXX tweak? */
+
+    specs.flags = MODE_SCREEN;
+    specs.out_info = NULL;
+
+    /* When Speedo tries to generate a very small font bitmap, it
+       often crashes or goes into an infinite loop.
+       Don't know why this is so, but until we can fix it properly,
+       return BadFontName for anything smaller than 4 pixels.
+       */
+#define TINY_FACTOR (16 << 16)
+    xx8 = specs.xxmult >> 8;
+    xy8 = specs.xymult >> 8;
+    yx8 = specs.yxmult >> 8;
+    yy8 = specs.yymult >> 8;
+    if (xx8 * xx8 + xy8 * xy8 < TINY_FACTOR ||
+	yx8 * yx8 + yy8 * yy8 < TINY_FACTOR)
+    {
+	sp_close_font(spf);
+	return BadFontName;
+    }
+
+    /* clobber global state to avoid wrecking future transformed fonts */
+    bzero ((char *) &sp_globals, sizeof(sp_globals));
+
+    if (!sp_set_specs(&specs))
+    {
+	sp_close_font(spf);
+	return BadFontName;
+    }
+
+    spf->specs = specs;
+    spf->master = spmf;
+
+    *spfont = spf;
+    return Successful;
+}
+
+static int
+sp_load_font(
+    char       *fontname,
+    char       *filename,
+    FontEntryPtr    entry,
+    FontScalablePtr vals,
+    fsBitmapFormat format,
+    fsBitmapFormatMask fmask,
+    FontPtr     pfont,
+    Mask        flags)
+{
+    SpeedoFontPtr spf;
+    SpeedoMasterFontPtr spmf;
+    int         esize;
+    int         ret;
+    long	sWidth;
+
+    ret = sp_open_font(fontname, filename, entry, vals, format, fmask,
+		       flags, &spf);
+
+    if (ret != Successful)
+	return ret;
+
+    spmf = spf->master;
+    sp_reset_master(spmf);
+    esize = sizeof(CharInfoRec) * (spmf->max_id - spmf->first_char_id + 1);
+
+    spf->encoding = (CharInfoPtr) xalloc(esize);
+    if (!spf->encoding) {
+	sp_close_font(spf);
+	return AllocError;
+    }
+    bzero((char *) spf->encoding, esize);
+
+    sp_fp_cur = spf;
+
+    sp_make_header(spf, &pfont->info);
+
+    sp_compute_bounds(spf, &pfont->info, SaveMetrics, &sWidth);
+
+    sp_compute_props(spf, fontname, &pfont->info, sWidth);
+
+    pfont->fontPrivate = (pointer) spf;
+
+/* XXX */
+    flags |= FontLoadBitmaps;
+
+    if (flags & FontLoadBitmaps) {
+	sp_fp_cur = spf;
+	ret = sp_build_all_bitmaps(pfont, format, fmask);
+    }
+    if (ret != Successful)
+	return ret;
+
+    /* compute remaining accelerators */
+    FontComputeInfoAccelerators(&pfont->info);
+
+    pfont->format = format;
+
+    pfont->get_metrics = sp_get_metrics;
+    pfont->get_glyphs = sp_get_glyphs;
+    pfont->unload_font = SpeedoCloseFont;
+    pfont->unload_glyphs = NULL;
+    pfont->refcnt = 0;
+
+    /* have to hold on to master for min/max id */
+    sp_close_master_file(spmf);
+
+    return ret;
+}
+
+int
+SpeedoFontLoad(
+    FontPtr    *ppfont,
+    char       *fontname,
+    char       *filename,
+    FontEntryPtr    entry,
+    FontScalablePtr vals,
+    fsBitmapFormat format,
+    fsBitmapFormatMask fmask,
+    Mask        flags)
+{
+    FontPtr     pfont;
+    int         ret;
+
+    /* Reject ridiculously small sizes that will blow up the math */
+    if (hypot(vals->pixel_matrix[0], vals->pixel_matrix[1]) < 1.0 ||
+	hypot(vals->pixel_matrix[2], vals->pixel_matrix[3]) < 1.0)
+	return BadFontName;
+
+    if (!(pfont = CreateFontRec()))
+	return AllocError;
+
+    ret = sp_load_font(fontname, filename, entry, vals, format, fmask,
+		       pfont, flags);
+
+    if (ret == Successful)
+	*ppfont = pfont;
+    else
+	DestroyFontRec (pfont);
+    
+    return ret;
+}
+
+void
+sp_close_font(SpeedoFontPtr spf)
+{
+    SpeedoMasterFontPtr spmf;
+
+    spmf = spf->master;
+    --spmf->refcount;
+    if (spmf->refcount == 0)
+	sp_close_master_font (spmf);
+    xfree(spf->encoding);
+    xfree(spf->bitmaps);
+    xfree(spf);
+}
+
+static void
+SpeedoCloseFont(FontPtr pfont)
+{
+    SpeedoFontPtr spf;
+
+    spf = (SpeedoFontPtr) pfont->fontPrivate;
+    sp_close_font(spf);
+    xfree(pfont->info.isStringProp);
+    xfree(pfont->info.props);
+    DestroyFontRec(pfont);
+
+}