diff options
| -rw-r--r-- | AUTHORS | 7 | ||||
| -rw-r--r-- | COPYING | 235 | ||||
| -rw-r--r-- | Makefile.am | 95 | ||||
| -rw-r--r-- | configure.ac | 151 | ||||
| -rw-r--r-- | include/X11/fonts/fontconf.h.in | 11 | ||||
| -rw-r--r-- | src/FreeType/Makefile.am | 13 | ||||
| -rw-r--r-- | src/bitmap/Makefile.am | 19 | ||||
| -rw-r--r-- | src/builtins/Makefile.am | 13 | ||||
| -rw-r--r-- | src/fc/Makefile.am | 14 | ||||
| -rw-r--r-- | src/fc/fstrans.c | 27 | ||||
| -rw-r--r-- | src/fontcache/Makefile.am | 8 | ||||
| -rw-r--r-- | src/fontfile/Makefile.am | 32 | ||||
| -rw-r--r-- | src/stubs/Makefile.am | 24 | ||||
| -rw-r--r-- | src/util/Makefile.am | 16 | ||||
| -rw-r--r-- | xfont.pc.in | 14 |
15 files changed, 679 insertions, 0 deletions
@@ -0,0 +1,7 @@ +Keith Packard, MIT X Consortium and SuSE, Inc. +Dave Lemke, Network Computing Devices (font server) +Mark Leisher, Juliusz Chroboczek, (Freetype) +Digital Equipment Corporation (bitmap) (Phil Karlton or Susan Angebrandt???) +Shunsuke Akiyama (TrueType) + +Our apologies if anyone has been missed. @@ -0,0 +1,235 @@ +Copyright (c) 1997 by Mark Leisher +Copyright (c) 1998-2003 by Juliusz Chroboczek + +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 +AUTHORS OR COPYRIGHT HOLDERS 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. + + +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. + + +Copyright 1989 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. + + +Copyright 1999 SuSE, Inc. + +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 SuSE not be used in advertising or +publicity pertaining to distribution of the software without specific, +written prior permission. SuSE makes no representations about the +suitability of this software for any purpose. It is provided "as is" +without express or implied warranty. + +SuSE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL SuSE +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. + + +Copyright 1990 Network Computing Devices + +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 Network Computing Devices not be used +in advertising or publicity pertaining to distribution of the software +without specific, written prior permission. Network Computing Devices +makes no representations about the suitability of this software for any +purpose. It is provided "as is" without express or implied warranty. + +NETWORK COMPUTING DEVICES DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS +SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, +IN NO EVENT SHALL NETWORK COMPUTING DEVICES 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. + + +Copyright 1990 Network Computing Devices + +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 AND 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. + + +[Note: clause 3 in the following license, the "advertising clause", was +rescinded by Berkeley in 1999. See +<ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change>] + +Copyright (c) 1991, 1993 + The Regents of the University of California. All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: +1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. +2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. +3. All advertising materials mentioning features or use of this software + must display the following acknowledgement: + This product includes software developed by the University of + California, Berkeley and its contributors. +4. Neither the name of the University nor the names of its contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +SUCH DAMAGE. + + +Copyright (c) 1998-1999 Shunsuke Akiyama <akiyama@jp.FreeBSD.org>. +All rights reserved. +Copyright (c) 1998-1999 X-TrueType Server Project, All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: +1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. +2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +SUCH DAMAGE. + + +Copyright © 2004 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. + + +/* lib/font/fontfile/gunzip.c + written by Mark Eichin <eichin@kitten.gen.ma.us> September 1996. + intended for inclusion in X11 public releases. */ + + +Copyright (c) 1999 The XFree86 Project Inc. + +All Rights Reserved. + +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 XFree86 Project +Inc. 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 XFree86 Project Inc.. diff --git a/Makefile.am b/Makefile.am new file mode 100644 index 0000000..178e918 --- /dev/null +++ b/Makefile.am @@ -0,0 +1,95 @@ +# +# $Id$ +# +# Copyright © 2003 Keith Packard, Noah Levitt +# +# 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. + +lib_LTLIBRARIES = libXfont.la + +if XFONT_FONTCACHE +FONTCACHE_DIR = src/fontcache +FONTCACHE_LIB = src/fontcache/libfontcache.la +endif + +if XFONT_FONTFILE +FONTFILE_DIR = src/fontfile +FONTFILE_LIB = src/fontfile/libfontfile.la +endif + +if XFONT_FREETYPE +FREETYPE_DIR = src/FreeType +FREETYPE_LIB = src/FreeType/libft.la +endif + +if XFONT_BITMAP +BITMAP_DIR = src/bitmap +BITMAP_LIB = src/bitmap/libbitmap.la +endif + +if XFONT_BUILTINS +BUILTINS_DIR = src/builtins +BUILTINS_LIB = src/builtins/libbuiltins.la +endif + +if XFONT_FC +FC_DIR = src/fc +FC_LIB = src/fc/libfc.la +endif + +UTIL_DIR = src/util +UTIL_LIB = src/util/libutil.la + +STUBS_LIB = src/stubs/libstubs.la +STUBS_DIR = src/stubs + +SUBDIRS=$(FONTFILE_DIR) $(FREETYPE_DIR) $(BITMAP_DIR) \ + $(BUILTINS_DIR) $(FC_DIR) $(UTIL_DIR) $(STUBS_DIR) $(FONTCACHE_DIR) + +libXfont_la_LIBADD = $(FREETYPE_LIB) $(BITMAP_LIB) $(BUILTINS_LIB) \ + $(FC_LIB) $(FONTFILE_LIB) $(UTIL_LIB) $(STUBS_LIB) \ + $(FREETYPE_LIBS) $(Z_LIBS) $(MATH_LIBS) $(FONTCACHE_LIB) + +libXfont_la_SOURCES = + +# +# Shared library version info. This is not the same as the package version +# +libXfont_la_LDFLAGS = -version-number 1:4:1 + +libXfontincludedir = $(includedir)/X11/fonts +libXfontinclude_HEADERS = \ + include/X11/fonts/bitmap.h \ + include/X11/fonts/bufio.h \ + include/X11/fonts/fntfil.h \ + include/X11/fonts/fntfilio.h \ + include/X11/fonts/fntfilst.h \ + include/X11/fonts/fontconf.h \ + include/X11/fonts/fontenc.h \ + include/X11/fonts/fontencc.h \ + include/X11/fonts/fontmisc.h \ + include/X11/fonts/fontmod.h \ + include/X11/fonts/fontshow.h \ + include/X11/fonts/fontutil.h \ + include/X11/fonts/fontxlfd.h + +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = xfont.pc + +EXTRA_DIST = xfont.pc.in autogen.sh include/X11/fonts/fontconf.h.in diff --git a/configure.ac b/configure.ac new file mode 100644 index 0000000..077ae46 --- /dev/null +++ b/configure.ac @@ -0,0 +1,151 @@ +dnl +dnl $Id$ +dnl +dnl Copyright © 2003 Keith Packard +dnl +dnl Permission to use, copy, modify, distribute, and sell this software and its +dnl documentation for any purpose is hereby granted without fee, provided that +dnl the above copyright notice appear in all copies and that both that +dnl copyright notice and this permission notice appear in supporting +dnl documentation, and that the name of Keith Packard not be used in +dnl advertising or publicity pertaining to distribution of the software without +dnl specific, written prior permission. Keith Packard makes no +dnl representations about the suitability of this software for any purpose. It +dnl is provided "as is" without express or implied warranty. +dnl +dnl KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +dnl INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +dnl EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +dnl CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +dnl DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +dnl TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +dnl PERFORMANCE OF THIS SOFTWARE. +dnl +dnl Process this file with autoconf to create configure. + +AC_PREREQ([2.57]) + +AC_INIT([libXfont], + 1.4.3, + [keithp@keithp.com], + libXfont) +dnl +dnl This is the package version number, not the shared library +dnl version. This same version number must appear in Xfont.h +dnl Yes, it is a pain to synchronize version numbers. Unfortunately, it's +dnl not possible to extract the version number here from Xfont.h +dnl +AM_INIT_AUTOMAKE([foreign dist-bzip2]) +AM_CONFIG_HEADER(config.h) +AC_CONFIG_HEADERS([include/X11/fonts/fontconf.h]) + +# Check for progs +AC_PROG_CC +AC_PROG_LIBTOOL +dnl If the first PKG_CHECK_MODULES appears inside a conditional, pkg-config +dnl must first be located explicitly. +PKG_PROG_PKG_CONFIG + +# Look for headers +AC_CHECK_HEADERS([endian.h]) + +# +# select libraries to include +# + +AC_ARG_ENABLE(freetype, [ --enable-freetype ],[XFONT_FREETYPE=$enableval],[XFONT_FREETYPE=no]) +AM_CONDITIONAL(XFONT_FREETYPE, [test x$XFONT_FREETYPE = xyes]) +if test x$XFONT_FREETYPE = xyes; then + AC_DEFINE(XFONT_FREETYPE,1,[Support FreeType fonts]) + AC_ARG_WITH(freetype-config, [ --with-freetype-config=PROG Use FreeType configuration program PROG], freetype_config=$withval, freetype_config=yes) + + if test "$freetype_config" = "yes"; then + AC_PATH_PROG(ft_config,freetype-config,no) + if test "$ft_config" = "no"; then + AC_MSG_ERROR([You must have freetype installed; see http://www.freetype.org/]) + fi + else + ft_config="$freetype_config" + fi + + FREETYPE_CFLAGS="`$ft_config --cflags`" + FREETYPE_LIBS="`$ft_config --libs`" + +else + FREETYPE_CFLAGS="" + FREETYPE_LIBS="" +fi +AC_SUBST(FREETYPE_LIBS) +AC_SUBST(FREETYPE_CFLAGS) + +AC_ARG_ENABLE(fontcache, [ --disable-fontcache ],[XFONT_FONTCACHE=$enableval],[XFONT_FONTCACHE=yes]) +AM_CONDITIONAL(XFONT_FONTCACHE, [test x$XFONT_FONTCACHE = xyes]) +if test x$XFONT_FONTCACHE = xyes; then + AC_DEFINE(XFONT_FONTCACHE,1,[Support the font caching extension]) + PKG_CHECK_MODULES(FONTCACHEPROTO, fontcacheproto) +else + FONTCACHEPROTO_CFLAGS="" +fi +AC_SUBST(FONTCACHEPROTO_CFLAGS) + +AC_ARG_ENABLE(fc, [ --enable-fc ],[XFONT_FC=$enableval],[XFONT_FC=no]) +AM_CONDITIONAL(XFONT_FC, [test x$XFONT_FC = xyes]) +if test x$XFONT_FC = xyes; then + AC_DEFINE(XFONT_FC,1,[Support the X Font Services Protocol]) +fi + +AC_ARG_ENABLE(builtins, [ --disable-builtins ], [XFONT_BUILTINS=$enableval], [XFONT_BUILTINS=yes]) +AM_CONDITIONAL(XFONT_BUILTINS, [test "x$XFONT_BUILTINS" = xyes ]) +if test "x$XFONT_BUILTINS" = xyes; then + AC_DEFINE(XFONT_BUILTINS,1,[Support built-in fonts]) +fi + +AC_ARG_ENABLE(bitmap, [ --disable-bitmap ], [XFONT_BITMAP=$enableval], [XFONT_BITMAP=yes]) +AM_CONDITIONAL(XFONT_BITMAP, [test "x$XFONT_BITMAP" = xyes ]) +if test "x$XFONT_BITMAP" = xyes; then + AC_DEFINE(XFONT_BITMAP,1,[Support bitmap font files]) +fi + +if test "x$XFONT_BULITINS" = xyes -o "x$XFONT_BITMAP" = xyes -o "x$XFONT_FREETYPE" = xyes; then + XFONT_FONTFILE=yes +else + XFONT_FONTFILE=no +fi +AM_CONDITIONAL(XFONT_FONTFILE, [test "x$XFONT_FONTFILE" = xyes]) +if test "x$XFONT_FONTFILE" = xyes; then + AC_DEFINE(XFONT_FONTFILE,,[Support fonts in files]) +fi + +AC_CHECK_LIB(z, gzopen, [Z_LIBS=-lz +AC_SUBST(Z_LIBS)], AC_MSG_ERROR([*** zlib is required])) + +AC_DEFINE(PCFFORMAT,,[Support PCF format fonts]) +AC_DEFINE(X_GZIP_FONT_COMPRESSION,1,[Support gzip fonts]) +X_GZIP_FONT_COMPRESSION=1 +AC_SUBST(X_GZIP_FONT_COMPRESSION) + +AC_CHECK_LIB(m, hypot, [MATH_LIBS=-lm +AC_SUBST(MATH_LIBS)], AC_MSG_ERROR([*** libm is required])) + +PKG_CHECK_MODULES(XFONT, xproto xtrans fontsproto) + +if test "x$GCC" = "xyes"; then + GCC_WARNINGS="-Wall -Wpointer-arith -Wstrict-prototypes \ + -Wmissing-prototypes -Wmissing-declarations \ + -Wnested-externs -fno-strict-aliasing" + CFLAGS="$GCC_WARNINGS $CFLAGS" +fi + +CFLAGS="$CFLAGS $XFONT_CFLAGS" +LIBS="$LIBS $XFONT_LIBS" + +AC_OUTPUT([Makefile + src/fontcache/Makefile + src/fontfile/Makefile + src/FreeType/Makefile + src/builtins/Makefile + src/bitmap/Makefile + src/fc/Makefile + src/util/Makefile + src/stubs/Makefile + xfont.pc]) diff --git a/include/X11/fonts/fontconf.h.in b/include/X11/fonts/fontconf.h.in new file mode 100644 index 0000000..6a08acf --- /dev/null +++ b/include/X11/fonts/fontconf.h.in @@ -0,0 +1,11 @@ +/* Define as 1 if you have fontfile support in Xfont */ +#undef XFONT_FONTFILE + +/* Define as 1 if you have builtin font support in Xfont */ +#undef XFONT_BUILTINS + +/* Define as 1 if you have FreeType support in Xfont */ +#undef XFONT_FREETYPE + +/* Define as 1 if you have X Font Services Protocol support in Xfont */ +#undef XFONT_FC diff --git a/src/FreeType/Makefile.am b/src/FreeType/Makefile.am new file mode 100644 index 0000000..a37b640 --- /dev/null +++ b/src/FreeType/Makefile.am @@ -0,0 +1,13 @@ +INCLUDES = \ + -I${top_srcdir}/include/X11/fonts + +noinst_LTLIBRARIES = libft.la + +libft_la_CFLAGS=$(FREETYPE_CFLAGS) + +libft_la_SOURCES = \ + ft.h \ + ftfuncs.h \ + ftenc.c \ + ftfuncs.c \ + fttools.c diff --git a/src/bitmap/Makefile.am b/src/bitmap/Makefile.am new file mode 100644 index 0000000..3fd57c0 --- /dev/null +++ b/src/bitmap/Makefile.am @@ -0,0 +1,19 @@ +INCLUDES = \ + -I${top_srcdir}/include/X11/fonts + +noinst_LTLIBRARIES = libbitmap.la + +libbitmap_la_SOURCES = \ + bdfint.h \ + bdfread.c \ + bdfutils.c \ + bitmap.c \ + bitmapfunc.c \ + bitmaputil.c \ + bitscale.c \ + fontink.c \ + pcf.h \ + pcfread.c \ + pcfwrite.c \ + snfread.c \ + snfstr.h diff --git a/src/builtins/Makefile.am b/src/builtins/Makefile.am new file mode 100644 index 0000000..f7041e0 --- /dev/null +++ b/src/builtins/Makefile.am @@ -0,0 +1,13 @@ +INCLUDES = \ + -I${top_srcdir}/include/X11/fonts \ + -I${top_srcdir}/src/bitmap + +noinst_LTLIBRARIES = libbuiltins.la + +libbuiltins_la_SOURCES = \ + builtin.h \ + dir.c \ + file.c \ + fonts.c \ + fpe.c \ + render.c diff --git a/src/fc/Makefile.am b/src/fc/Makefile.am new file mode 100644 index 0000000..512eea1 --- /dev/null +++ b/src/fc/Makefile.am @@ -0,0 +1,14 @@ +INCLUDES = \ + -I${top_srcdir}/include/X11/fonts + +noinst_LTLIBRARIES = libfc.la + +libfc_la_SOURCES = \ + fsconvert.c \ + fserve.c \ + fserve.h \ + fservestr.h \ + fsio.c \ + fsio.h \ + fslibos.h \ + fstrans.c diff --git a/src/fc/fstrans.c b/src/fc/fstrans.c new file mode 100644 index 0000000..c51d07c --- /dev/null +++ b/src/fc/fstrans.c @@ -0,0 +1,27 @@ +/* + * $Id$ + * + * Copyright © 2004 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. + */ + +#define FONT_t +#define TRANS_CLIENT +#include <X11/transport.c> diff --git a/src/fontcache/Makefile.am b/src/fontcache/Makefile.am new file mode 100644 index 0000000..7ade369 --- /dev/null +++ b/src/fontcache/Makefile.am @@ -0,0 +1,8 @@ +if XFONT_FONTCACHE +INCLUDES = \ + -I${top_srcdir}/include/X11/fonts +lib_LTLIBRARIES = libfontcache.la +libfontcache_la_CFLAGS = $(FONTCACHEPROTO_CFLAGS) +libfontcache_la_SOURCES = fontcache.c fontcacheint.h fcqueue.h +fontdir = $(includedir)/X11/fonts +endif diff --git a/src/fontfile/Makefile.am b/src/fontfile/Makefile.am new file mode 100644 index 0000000..1ba16b9 --- /dev/null +++ b/src/fontfile/Makefile.am @@ -0,0 +1,32 @@ +FONTDIR=${libdir}/X11/fonts +FONTENCDEFS = -DFONT_ENCODINGS_DIRECTORY=\"$(FONTDIR)/encodings/encodings.dir\" + +INCLUDES = \ + -I${top_srcdir}/include/X11/fonts \ + $(FONTENCDEFS) + +noinst_LTLIBRARIES = libfontfile.la + +libfontfile_la_LIBADD = \ + $(Z_LIBS) + +libfontfile_la_SOURCES = \ + bitsource.c \ + bufio.c \ + decompress.c \ + defaults.c \ + dirfile.c \ + encparse.c \ + ffcheck.c \ + fileio.c \ + filewr.c \ + fontdir.c \ + fontenc.c \ + fontencI.h \ + fontencc.c \ + fontfile.c \ + fontscale.c \ + gunzip.c \ + printerfont.c \ + register.c \ + renderers.c diff --git a/src/stubs/Makefile.am b/src/stubs/Makefile.am new file mode 100644 index 0000000..a3f0198 --- /dev/null +++ b/src/stubs/Makefile.am @@ -0,0 +1,24 @@ +INCLUDES = \ + -I${top_srcdir}/include/X11/fonts + +noinst_LTLIBRARIES = libstubs.la + +libstubs_la_SOURCES = \ + cauthgen.c \ + csignal.c \ + delfntcid.c \ + errorf.c \ + fatalerror.c \ + findoldfnt.c \ + getcres.c \ + getdefptsize.c \ + getnewfntcid.c \ + gettime.c \ + initfshdl.c \ + regfpefunc.c \ + rmfshdl.c \ + servclient.c \ + setfntauth.c \ + stfntcfnt.c \ + stubs.h \ + xpstubs.c diff --git a/src/util/Makefile.am b/src/util/Makefile.am new file mode 100644 index 0000000..97377ba --- /dev/null +++ b/src/util/Makefile.am @@ -0,0 +1,16 @@ +INCLUDES = \ + -I${top_srcdir}/include/X11/fonts + +noinst_LTLIBRARIES = libutil.la + +libutil_la_SOURCES = \ + atom.c \ + fontaccel.c \ + fontnames.c \ + fontutil.c \ + fontxlfd.c \ + format.c \ + miscutil.c \ + patcache.c \ + private.c \ + utilbitmap.c diff --git a/xfont.pc.in b/xfont.pc.in new file mode 100644 index 0000000..e1c4dd9 --- /dev/null +++ b/xfont.pc.in @@ -0,0 +1,14 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ +freetypelibs=@FREETYPE_LIBS@ +mathlibs=@MATH_LIBS@ +zlibs=@Z_LIBS@ +freetypecflags=@FREETYPE_CFLAGS@ + +Name: Xfont +Description: X font Library +Version: @VERSION@ +Cflags: -I${includedir} -I${includedir}/X11/fonts ${freetypecflags} +Libs: -L${libdir} -lXfont ${freetypelibs} ${mathlibs} ${zlibs} |