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
committerKeith Packard <keithp@keithp.com>2009-02-17 19:10:14 -0800
commit69a2728891e92da6a674d7313f3bb47c629b38dc (patch)
treef66034162a4f0c7c57eb26c4c5882a031ffb80e5 /dix
parent444127f9f408d2f517fdfab0092bd67b29073373 (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. (cherry picked from commit 49b93df8a3002db7196aa3fc1fd8dca1c12a55d6) Signed-off-by: Keith Packard <keithp@keithp.com>
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 416adb352..719bca469 100644
--- a/dix/dixfonts.c
+++ b/dix/dixfonts.c
@@ -1907,12 +1907,9 @@ InitFonts (void)
{
patternCache = MakeFontPatternCache();
-#ifdef BUILTIN_FONTS
BuiltinRegisterFpeFunctions();
-#else
FontFileRegisterFpeFunctions();
fs_register_fpe_functions();
-#endif
}
int