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

diff --git a/libXfont/src/util/fontaccel.c b/libXfont/src/util/fontaccel.c
new file mode 100644
index 000000000..c37f69a39
--- /dev/null
+++ b/libXfont/src/util/fontaccel.c
@@ -0,0 +1,107 @@
+/* $Xorg: fontaccel.c,v 1.4 2001/02/09 02:04:04 xorgcvs Exp $ */
+
+/*
+
+Copyright 1990, 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/font/util/fontaccel.c,v 1.6 2001/01/17 19:43:33 dawes Exp $ */
+
+/*
+ * Author:  Keith Packard, MIT X Consortium
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include    <X11/fonts/fontmisc.h>
+#include    <X11/fonts/fontstruct.h>
+#include    <X11/fonts/fontutil.h>
+
+void
+FontComputeInfoAccelerators(FontInfoPtr pFontInfo)
+{
+    pFontInfo->noOverlap = FALSE;
+    if (pFontInfo->maxOverlap <= pFontInfo->minbounds.leftSideBearing)
+	pFontInfo->noOverlap = TRUE;
+
+    if ((pFontInfo->minbounds.ascent == pFontInfo->maxbounds.ascent) &&
+	    (pFontInfo->minbounds.descent == pFontInfo->maxbounds.descent) &&
+	    (pFontInfo->minbounds.leftSideBearing ==
+	     pFontInfo->maxbounds.leftSideBearing) &&
+	    (pFontInfo->minbounds.rightSideBearing ==
+	     pFontInfo->maxbounds.rightSideBearing) &&
+	    (pFontInfo->minbounds.characterWidth ==
+	     pFontInfo->maxbounds.characterWidth) &&
+      (pFontInfo->minbounds.attributes == pFontInfo->maxbounds.attributes)) {
+	pFontInfo->constantMetrics = TRUE;
+	if ((pFontInfo->maxbounds.leftSideBearing == 0) &&
+		(pFontInfo->maxbounds.rightSideBearing ==
+		 pFontInfo->maxbounds.characterWidth) &&
+		(pFontInfo->maxbounds.ascent == pFontInfo->fontAscent) &&
+		(pFontInfo->maxbounds.descent == pFontInfo->fontDescent))
+	    pFontInfo->terminalFont = TRUE;
+	else
+	    pFontInfo->terminalFont = FALSE;
+    } else {
+	pFontInfo->constantMetrics = FALSE;
+	pFontInfo->terminalFont = FALSE;
+    }
+    if (pFontInfo->minbounds.characterWidth == pFontInfo->maxbounds.characterWidth)
+	pFontInfo->constantWidth = TRUE;
+    else
+	pFontInfo->constantWidth = FALSE;
+
+    if ((pFontInfo->minbounds.leftSideBearing >= 0) &&
+	    (pFontInfo->maxOverlap <= 0) &&
+	    (pFontInfo->minbounds.ascent >= -pFontInfo->fontDescent) &&
+	    (pFontInfo->maxbounds.ascent <= pFontInfo->fontAscent) &&
+	    (-pFontInfo->minbounds.descent <= pFontInfo->fontAscent) &&
+	    (pFontInfo->maxbounds.descent <= pFontInfo->fontDescent))
+	pFontInfo->inkInside = TRUE;
+    else
+	pFontInfo->inkInside = FALSE;
+}
+
+int 
+FontCouldBeTerminal(FontInfoPtr pFontInfo)
+{
+    if ((pFontInfo->minbounds.leftSideBearing >= 0) &&
+	    (pFontInfo->maxbounds.rightSideBearing <= pFontInfo->maxbounds.characterWidth) &&
+	    (pFontInfo->minbounds.characterWidth == pFontInfo->maxbounds.characterWidth) &&
+	    (pFontInfo->maxbounds.ascent <= pFontInfo->fontAscent) &&
+	    (pFontInfo->maxbounds.descent <= pFontInfo->fontDescent) &&
+	    (pFontInfo->maxbounds.leftSideBearing != 0 ||
+	     pFontInfo->minbounds.rightSideBearing != pFontInfo->minbounds.characterWidth ||
+	     pFontInfo->minbounds.ascent != pFontInfo->fontAscent ||
+	     pFontInfo->minbounds.descent != pFontInfo->fontDescent)) {
+	/* blow off font with nothing but a SPACE */
+	if (pFontInfo->maxbounds.ascent == 0 && 
+	    pFontInfo->maxbounds.descent == 0)
+		return FALSE;
+	return TRUE;
+    }
+    return FALSE;
+}