diff options
| author | Adam Jackson <ajax@redhat.com> | 2008-07-16 14:44:33 -0400 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2008-07-16 14:49:36 -0400 |
| commit | affec10635343668839994ea2bac16c1d4524200 (patch) | |
| tree | ccf5a8b878d74b00e989c7a8c9dc1af4f7007453 /dix/dixfonts.c | |
| parent | acc91054316208844742495dea0b80a860ef02bb (diff) | |
Remove loadable font renderer support.
Diffstat (limited to 'dix/dixfonts.c')
| -rw-r--r-- | dix/dixfonts.c | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/dix/dixfonts.c b/dix/dixfonts.c index 1c6d37fda..7b79bac51 100644 --- a/dix/dixfonts.c +++ b/dix/dixfonts.c @@ -87,7 +87,7 @@ extern FontPtr defaultFont; static FontPathElementPtr *font_path_elements = (FontPathElementPtr *) 0; static int num_fpes = 0; -_X_EXPORT FPEFunctions *fpe_functions = (FPEFunctions *) 0; +static FPEFunctions *fpe_functions = (FPEFunctions *) 0; static int num_fpe_types = 0; static unsigned char *font_path_string; @@ -97,7 +97,7 @@ static int size_slept_fpes = 0; static FontPathElementPtr *slept_fpes = (FontPathElementPtr *) 0; static FontPatternCachePtr patternCache; -_X_EXPORT int +static int FontToXError(err) int err; { @@ -117,6 +117,16 @@ FontToXError(err) } } +static int +LoadGlyphs(ClientPtr client, FontPtr pfont, unsigned nchars, int item_size, + unsigned char *data) +{ + if (fpe_functions[pfont->fpe->type].load_glyphs) + return (*fpe_functions[pfont->fpe->type].load_glyphs) + (client, pfont, 0, nchars, item_size, data); + else + return Successful; +} /* * adding RT_FONT prevents conflict with default cursor font @@ -470,7 +480,7 @@ OpenFont(ClientPtr client, XID fid, Mask flags, unsigned lenfname, char *pfontna * * \param value must conform to DeleteType */ -_X_EXPORT int +int CloseFont(pointer value, XID fid) { int nscr; @@ -1879,16 +1889,6 @@ GetFontPath(ClientPtr client, int *count, int *length, unsigned char **result) return Success; } -_X_EXPORT int -LoadGlyphs(ClientPtr client, FontPtr pfont, unsigned nchars, int item_size, unsigned char *data) -{ - if (fpe_functions[pfont->fpe->type].load_glyphs) - return (*fpe_functions[pfont->fpe->type].load_glyphs) - (client, pfont, 0, nchars, item_size, data); - else - return Successful; -} - void DeleteClientFontStuff(ClientPtr client) { @@ -1911,6 +1911,7 @@ InitFonts (void) #ifdef BUILTIN_FONTS BuiltinRegisterFpeFunctions(); #else + FreeTypeRegisterFontFileFunctions(); FontFileRegisterFpeFunctions(); fs_register_fpe_functions(); #endif |