diff options
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rw-r--r-- | configure.ac | 8 | ||||
| -rw-r--r-- | include/X11/fonts/fontmod.h | 16 | ||||
| -rw-r--r-- | src/fontfile/ffcheck.c | 33 | ||||
| -rw-r--r-- | src/fontfile/register.c | 1 | ||||
| -rw-r--r-- | src/stubs/Makefile.am | 1 | ||||
| -rw-r--r-- | src/stubs/fontmod.c | 14 |
7 files changed, 2 insertions, 72 deletions
diff --git a/Makefile.am b/Makefile.am index bb908c2..7971605 100644 --- a/Makefile.am +++ b/Makefile.am @@ -31,7 +31,6 @@ libXfontinclude_HEADERS = \ include/X11/fonts/fntfilst.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 \ diff --git a/configure.ac b/configure.ac index fbb7c4a..ab3b121 100644 --- a/configure.ac +++ b/configure.ac @@ -170,14 +170,6 @@ if test "x$XFONT_FONTFILE" = xyes; then AC_DEFINE(XFONT_FONTFILE,1,[Support fonts in files]) fi -AC_ARG_ENABLE(loadable-font-modules, - AC_HELP_STRING([--disable-loadable-font-modules], - [support dynamically loaded font modules (default is enabled)]), - [LOADABLE_FONTS=$enableval], [LOADABLE_FONTS=yes]) -if test "x$LOADABLE_FONTS" = xyes; then - AC_DEFINE(LOADABLEFONTS,1,[Support dynamically loaded font modules]) -fi - # # Support connection to font servers? # diff --git a/include/X11/fonts/fontmod.h b/include/X11/fonts/fontmod.h deleted file mode 100644 index 42d277f..0000000 --- a/include/X11/fonts/fontmod.h +++ /dev/null @@ -1,16 +0,0 @@ -/* $XFree86: xc/lib/font/include/fontmod.h,v 1.2 1998/07/25 06:57:09 dawes Exp $ */ - -#ifndef _FONTMOD_H_ -#define _FONTMOD_H_ - -typedef void (*InitFont)(void); - -typedef struct { - InitFont initFunc; - char * name; - pointer module; -} FontModule; - -extern FontModule *FontModuleList; - -#endif /* _FONTMOD_H_ */ diff --git a/src/fontfile/ffcheck.c b/src/fontfile/ffcheck.c index fd94fd0..e7f8b85 100644 --- a/src/fontfile/ffcheck.c +++ b/src/fontfile/ffcheck.c @@ -35,7 +35,6 @@ in this Software without prior written authorization from The Open Group. #endif #include <X11/fonts/fntfilst.h> #include <X11/fonts/bitmap.h> -#include <X11/fonts/fontmod.h> /* * Map FPE functions to renderer functions @@ -114,46 +113,18 @@ FontFileCheckListNextFontOrAlias(pointer client, FontPathElementPtr fpe, return BadFontName; } -/* Font renderers to initialize when not linked into something like - Xorg that provides its own module configuration options */ -static const FontModule builtinFontModuleList[] = { -#ifdef XFONT_FREETYPE - { - FreeTypeRegisterFontFileFunctions, - "freetype", - NULL - }, -#endif - /* List terminator - must be last entry */ - { NULL, NULL, NULL } -}; - void FontFileCheckRegisterFpeFunctions (void) { - const FontModule *fmlist = builtinFontModuleList; - #ifdef XFONT_BITMAP /* bitmap is always builtin to libXfont now */ BitmapRegisterFontFileFunctions (); #endif -#ifdef LOADABLEFONTS - if (FontModuleList) { - fmlist = FontModuleList; - } +#ifdef XFONT_FREETYPE + FreeTypeRegisterFontFileFunctions(); #endif - if (fmlist) { - int i; - - for (i = 0; fmlist[i].name; i++) { - if (fmlist[i].initFunc) { - fmlist[i].initFunc(); - } - } - } - RegisterFPEFunctions(FontFileNameCheck, FontFileInitFPE, FontFileFreeFPE, diff --git a/src/fontfile/register.c b/src/fontfile/register.c index 6e60985..1a63cb3 100644 --- a/src/fontfile/register.c +++ b/src/fontfile/register.c @@ -33,7 +33,6 @@ in this Software without prior written authorization from The Open Group. #include <X11/fonts/fontmisc.h> #include <X11/fonts/fntfilst.h> #include <X11/fonts/bitmap.h> -#include <X11/fonts/fontmod.h> /* * Translate monolithic build symbols to modular build symbols. diff --git a/src/stubs/Makefile.am b/src/stubs/Makefile.am index 963470f..cb3bb35 100644 --- a/src/stubs/Makefile.am +++ b/src/stubs/Makefile.am @@ -12,7 +12,6 @@ libstubs_la_SOURCES = \ errorf.c \ fatalerror.c \ findoldfnt.c \ - fontmod.c \ getcres.c \ getdefptsize.c \ getnewfntcid.c \ diff --git a/src/stubs/fontmod.c b/src/stubs/fontmod.c deleted file mode 100644 index 5a0bd0e..0000000 --- a/src/stubs/fontmod.c +++ /dev/null @@ -1,14 +0,0 @@ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - -#ifdef LOADABLEFONTS -#include "stubs.h" -#include <X11/fonts/fontmod.h> - -#ifdef __SUNPRO_C -#pragma weak FontModuleList -#endif - -weak FontModule *FontModuleList; -#endif /* LOADABLEFONTS */ |