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

diff --git a/libX11/src/TextExt.c b/libX11/src/TextExt.c
new file mode 100644
index 000000000..fc703011f
--- /dev/null
+++ b/libX11/src/TextExt.c
@@ -0,0 +1,236 @@
+/* $Xorg: TextExt.c,v 1.4 2001/02/09 02:03:37 xorgcvs Exp $ */
+/*
+
+Copyright 1989, 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.
+
+*/
+/* $XFree86: xc/lib/X11/TextExt.c,v 1.4 2001/12/14 19:54:07 dawes Exp $ */
+/*
+ * Copyright 1995 by FUJITSU LIMITED
+ * This is source code modified by FUJITSU LIMITED under the Joint
+ * Development Agreement for the CDE/Motif PST.
+ */
+
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include "Xlibint.h"
+
+#define min_byte2 min_char_or_byte2
+#define max_byte2 max_char_or_byte2
+
+
+/* 
+ * CI_GET_ROWZERO_CHAR_INFO_2D - do the same thing as CI_GET_CHAR_INFO_1D,
+ * except that the font has more than one row.  This is special case of more
+ * general version used in XTextExt16.c since row == 0.  This is used when
+ * max_byte2 is not zero.  A further optimization would do the check for
+ * min_byte1 being zero ahead of time.
+ */
+
+#define CI_GET_ROWZERO_CHAR_INFO_2D(fs,col,def,cs) \
+{ \
+    cs = def; \
+    if (fs->min_byte1 == 0 && \
+	col >= fs->min_byte2 && col <= fs->max_byte2) { \
+	if (fs->per_char == NULL) { \
+	    cs = &fs->min_bounds; \
+	} else { \
+	    cs = &fs->per_char[(col - fs->min_byte2)]; \
+	    if (CI_NONEXISTCHAR(cs)) cs = def; \
+	} \
+    } \
+}
+
+
+/*
+ * XTextExtents - compute the extents of string given as a sequences of eight
+ * bit bytes.  Since we know that the input characters will always be from the
+ * first row of the font (i.e. byte1 == 0), we can do some optimizations beyond
+ * what is done in XTextExtents16.
+ */
+int
+XTextExtents (
+    XFontStruct *fs,
+    _Xconst char *string,
+    int nchars,
+    int *dir,           /* RETURN font information */
+    int *font_ascent,   /* RETURN font information */
+    int *font_descent,  /* RETURN font information */
+    register XCharStruct *overall)	/* RETURN character information */
+{
+    int i;				/* iterator */
+    Bool singlerow = (fs->max_byte1 == 0);  /* optimization */
+    int nfound = 0;			/* number of characters found */
+    XCharStruct *def;			/* info about default char */
+    unsigned char *us;  		/* be 8bit clean */
+
+    if (singlerow) {			/* optimization */
+	CI_GET_DEFAULT_INFO_1D (fs, def);
+    } else {
+	CI_GET_DEFAULT_INFO_2D (fs, def);
+    }
+
+    *dir = fs->direction;
+    *font_ascent = fs->ascent;
+    *font_descent = fs->descent;
+
+    /*
+     * Iterate over the input string getting the appropriate * char struct.
+     * The default (which may be null if there is no def_char) will be returned
+     * if the character doesn't exist.  On the first time * through the loop,
+     * assign the values to overall; otherwise, compute * the new values.
+     */
+
+    for (i = 0, us = (unsigned char *) string; i < nchars; i++, us++) {
+	register unsigned uc = (unsigned) *us;	/* since about to do macro */
+	register XCharStruct *cs;
+
+	if (singlerow) {		/* optimization */
+	    CI_GET_CHAR_INFO_1D (fs, uc, def, cs);
+	} else {
+	    CI_GET_ROWZERO_CHAR_INFO_2D (fs, uc, def, cs);
+	}
+
+	if (cs) {
+	    if (nfound++ == 0) {
+		*overall = *cs;
+	    } else {
+		overall->ascent = max (overall->ascent, cs->ascent);
+		overall->descent = max (overall->descent, cs->descent);
+		overall->lbearing = min (overall->lbearing, 
+					 overall->width + cs->lbearing);
+		overall->rbearing = max (overall->rbearing,
+					 overall->width + cs->rbearing);
+		overall->width += cs->width;
+	    }
+	}
+    }
+
+    /*
+     * if there were no characters, then set everything to 0
+     */
+    if (nfound == 0) {
+	overall->width = overall->ascent = overall->descent = 
+	  overall->lbearing = overall->rbearing = 0;
+    }
+
+    return 0;
+}
+
+
+/*
+ * XTextWidth - compute the width of a string of eightbit bytes.  This is a 
+ * subset of XTextExtents.
+ */
+int
+XTextWidth (
+    XFontStruct *fs,
+    _Xconst char *string,
+    int count)
+{
+    int i;				/* iterator */
+    Bool singlerow = (fs->max_byte1 == 0);  /* optimization */
+    XCharStruct *def;			/* info about default char */
+    unsigned char *us;  		/* be 8bit clean */
+    int width = 0;			/* RETURN value */
+
+    if (singlerow) {			/* optimization */
+	CI_GET_DEFAULT_INFO_1D (fs, def);
+    } else {
+	CI_GET_DEFAULT_INFO_2D (fs, def);
+    }
+
+    if (def && fs->min_bounds.width == fs->max_bounds.width)
+	return (fs->min_bounds.width * count);
+
+    /*
+     * Iterate over all character in the input string; only consider characters
+     * that exist.
+     */
+    for (i = 0, us = (unsigned char *) string; i < count; i++, us++) {
+	register unsigned uc = (unsigned) *us;	/* since about to do macro */
+	register XCharStruct *cs;
+
+	if (singlerow) {		/* optimization */
+	    CI_GET_CHAR_INFO_1D (fs, uc, def, cs);
+	} else {
+	    CI_GET_ROWZERO_CHAR_INFO_2D (fs, uc, def, cs);
+	}
+
+	if (cs) width += cs->width;
+    }
+
+    return width;
+}
+
+
+
+/*
+ * _XTextHeight - compute the height of a string of eightbit bytes.
+ */
+int
+_XTextHeight (
+    XFontStruct *fs,
+    _Xconst char *string,
+    int count)
+{
+    int i;				/* iterator */
+    Bool singlerow = (fs->max_byte1 == 0);  /* optimization */
+    XCharStruct *def;			/* info about default char */
+    unsigned char *us;  		/* be 8bit clean */
+    int height = 0;			/* RETURN value */
+
+    if (singlerow) {			/* optimization */
+	CI_GET_DEFAULT_INFO_1D (fs, def);
+    } else {
+	CI_GET_DEFAULT_INFO_2D (fs, def);
+    }
+
+    if (def && (fs->min_bounds.ascent == fs->max_bounds.ascent)
+	    && (fs->min_bounds.descent == fs->max_bounds.descent))
+	return ((fs->min_bounds.ascent + fs->min_bounds.descent) * count);
+
+    /*
+     * Iterate over all character in the input string; only consider characters
+     * that exist.
+     */
+    for (i = 0, us = (unsigned char *) string; i < count; i++, us++) {
+	register unsigned uc = (unsigned) *us;	/* since about to do macro */
+	register XCharStruct *cs;
+
+	if (singlerow) {		/* optimization */
+	    CI_GET_CHAR_INFO_1D (fs, uc, def, cs);
+	} else {
+	    CI_GET_ROWZERO_CHAR_INFO_2D (fs, uc, def, cs);
+	}
+
+	if (cs) height += (cs->ascent + cs->descent);
+    }
+
+    return height;
+}
+