diff options
| author | Keith Packard <keithp@keithp.com> | 2015-09-01 18:50:55 -0700 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2016-07-18 15:25:59 -0400 |
| commit | 05a793f5b3c40747d5a92a076def7f4fb673c7e7 (patch) | |
| tree | 222f652ac4e1b982fd45e5f79479b1caf10526d1 /include | |
| parent | 950ffb8d6fd1480f305e38c571bda44f247f1de2 (diff) | |
dix: Switch to the libXfont2 API (v2)
This new libXfont API eliminates exposing internal X server symbols to
the font library, replacing those with a struct full of the entire API
needed to use that library.
v2: Use libXfont2 instead of libXfont_2
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/dixfont.h | 18 | ||||
| -rw-r--r-- | include/dixfontstr.h | 1 | ||||
| -rw-r--r-- | include/dixfontstubs.h | 43 |
3 files changed, 7 insertions, 55 deletions
diff --git a/include/dixfont.h b/include/dixfont.h index b44996ffa..3a38d10c5 100644 --- a/include/dixfont.h +++ b/include/dixfont.h @@ -29,7 +29,6 @@ SOFTWARE. #include "closure.h" #include <X11/fonts/fontstruct.h> #include <X11/fonts/fontproto.h> -#include <X11/fonts/fontutil.h> #define NullDIXFontProp ((DIXFontPropPtr)0) @@ -98,16 +97,11 @@ extern _X_EXPORT void InitFonts(void); extern _X_EXPORT void FreeFonts(void); -extern _X_EXPORT FontPtr find_old_font(XID /*id */ ); - -#define GetGlyphs dixGetGlyphs -extern _X_EXPORT void dixGetGlyphs(FontPtr /*font */ , - unsigned long /*count */ , - unsigned char * /*chars */ , - FontEncoding /*fontEncoding */ , - unsigned long * /*glyphcount */ , - CharInfoPtr * /*glyphs */ ); - -extern _X_EXPORT void register_fpe_functions(void); +extern _X_EXPORT void GetGlyphs(FontPtr /*font */ , + unsigned long /*count */ , + unsigned char * /*chars */ , + FontEncoding /*fontEncoding */ , + unsigned long * /*glyphcount */ , + CharInfoPtr * /*glyphs */ ); #endif /* DIXFONT_H */ diff --git a/include/dixfontstr.h b/include/dixfontstr.h index ce878d06a..7deb84ac5 100644 --- a/include/dixfontstr.h +++ b/include/dixfontstr.h @@ -27,6 +27,7 @@ SOFTWARE. #include "servermd.h" #include "dixfont.h" #include <X11/fonts/fontstruct.h> +#include <X11/fonts/libxfont2.h> #include "closure.h" #include <X11/Xproto.h> /* for xQueryFontReply */ diff --git a/include/dixfontstubs.h b/include/dixfontstubs.h deleted file mode 100644 index 535d312e6..000000000 --- a/include/dixfontstubs.h +++ /dev/null @@ -1,43 +0,0 @@ -#ifndef DIXFONTSTUBS_H -#define DIXFONTSTUBS_H 1 - -/* - * libXfont stubs replacements - * This header exists solely for the purpose of sdksyms generation; - * source code should #include "dixfonts.h" instead, which pulls in these - * declarations from <X11/fonts/fontproto.h> - */ -extern _X_EXPORT int client_auth_generation(ClientPtr client); - -extern _X_EXPORT void DeleteFontClientID(Font id); - -extern _X_EXPORT int GetDefaultPointSize(void); - -extern _X_EXPORT Font GetNewFontClientID(void); - -extern _X_EXPORT int init_fs_handlers(FontPathElementPtr fpe, - BlockHandlerProcPtr block_handler); - -extern _X_EXPORT 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 _X_EXPORT void remove_fs_handlers(FontPathElementPtr fpe, - BlockHandlerProcPtr blockHandler, - Bool all); - -extern _X_EXPORT int StoreFontClientFont(FontPtr pfont, Font id); - -#endif |