summaryrefslogtreecommitdiff
path: root/dix
diff options
context:
space:
mode:
authorPaulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>2009-01-07 19:37:03 -0200
committerPaulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>2009-01-07 19:37:03 -0200
commit49b93df8a3002db7196aa3fc1fd8dca1c12a55d6 (patch)
tree10e6be875a410b30842fed19cc551cea960663c2 /dix
parent4f004231871c830e16c4525cfaab183fad0aee86 (diff)
Default to use standard bitmap fonts, with builtins as fallback
The builtin-fonts configure option was removed, as it at best should have been a runtime option. Instead, now it always register all "font path element" backends, and adds built-ins fonts at the end of the default font path. This should be a more reasonable solution, to "correct" the most common Xorg FAQ (could not open default font 'fixed'), and also don't break by default applications that use only the standard/historical X Font rendering.
Diffstat (limited to 'dix')
-rw-r--r--dix/dixfonts.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/dix/dixfonts.c b/dix/dixfonts.c
index 15d011c1d..b0fbed232 100644
--- a/dix/dixfonts.c
+++ b/dix/dixfonts.c
@@ -1906,12 +1906,9 @@ InitFonts (void)
{
patternCache = MakeFontPatternCache();
-#ifdef BUILTIN_FONTS
BuiltinRegisterFpeFunctions();
-#else
FontFileRegisterFpeFunctions();
fs_register_fpe_functions();
-#endif
}
int