diff options
| author | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2009-01-07 19:37:03 -0200 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2009-02-17 19:10:14 -0800 |
| commit | 69a2728891e92da6a674d7313f3bb47c629b38dc (patch) | |
| tree | f66034162a4f0c7c57eb26c4c5882a031ffb80e5 /include | |
| parent | 444127f9f408d2f517fdfab0092bd67b29073373 (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 'include')
| -rw-r--r-- | include/dixfont.h | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/include/dixfont.h b/include/dixfont.h index d61dd7e9e..0f3df97cf 100644 --- a/include/dixfont.h +++ b/include/dixfont.h @@ -142,4 +142,47 @@ extern void InitGlyphCaching(void); extern void SetGlyphCachingMode(int /*newmode*/); +/* + * libXfont/src/builtins/builtin.h + */ +extern void BuiltinRegisterFpeFunctions(void); + +/* + * libXfont stubs. + */ +extern int client_auth_generation(ClientPtr client); + +extern void DeleteFontClientID(Font id); + +extern FontResolutionPtr GetClientResolutions(int *num); + +extern int GetDefaultPointSize(void); + +extern Font GetNewFontClientID(void); + +extern int init_fs_handlers(FontPathElementPtr fpe, + BlockHandlerProcPtr block_handler); + +extern int RegisterFPEFunctions(NameCheckFunc name_func, + InitFpeFunc init_func, + FreeFpeFunc free_func, + ResetFpeFunc reset_func, + OpenFontFunc open_func, + CloseFontFunc close_func, + ListFontsFunc list_func, + StartLfwiFunc start_lfwi_func, + NextLfwiFunc next_lfwi_func, + WakeupFpeFunc wakeup_func, + ClientDiedFunc client_died, + LoadGlyphsFunc load_glyphs, + StartLaFunc start_list_alias_func, + NextLaFunc next_list_alias_func, + SetPathFunc set_path_func); + +extern void remove_fs_handlers(FontPathElementPtr fpe, + BlockHandlerProcPtr blockHandler, + Bool all); + +extern int StoreFontClientFont(FontPtr pfont, Font id); + #endif /* DIXFONT_H */ |