diff options
| author | marha <marha@users.sourceforge.net> | 2009-07-25 20:12:58 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-07-25 20:12:58 +0000 |
| commit | 2553bdd7c359cd87525d367761c86932cec5adff (patch) | |
| tree | ae71245933c98474a699d3e392de5820879b2018 /xorg-server/include/dixfont.h | |
| parent | e2c51f2ee7b0a3ea1a052fc49324057b4a4bbc78 (diff) | |
| parent | 4a3dbb926ae3f5410198d7cc4f4ebe4f62eebf05 (diff) | |
| download | vcxsrv-2553bdd7c359cd87525d367761c86932cec5adff.tar.gz vcxsrv-2553bdd7c359cd87525d367761c86932cec5adff.tar.bz2 vcxsrv-2553bdd7c359cd87525d367761c86932cec5adff.zip | |
svn merge file:///D:/svnrepos/vcxsrv/branches/released .
Diffstat (limited to 'xorg-server/include/dixfont.h')
| -rw-r--r-- | xorg-server/include/dixfont.h | 53 |
1 files changed, 43 insertions, 10 deletions
diff --git a/xorg-server/include/dixfont.h b/xorg-server/include/dixfont.h index 516d91b58..0f3df97cf 100644 --- a/xorg-server/include/dixfont.h +++ b/xorg-server/include/dixfont.h @@ -33,10 +33,6 @@ SOFTWARE. typedef struct _DIXFontProp *DIXFontPropPtr; -extern FPEFunctions *fpe_functions; - -extern int FontToXError(int /*err*/); - extern Bool SetDefaultFont(char * /*defaultfontname*/); extern void QueueFontWakeup(FontPathElementPtr /*fpe*/); @@ -110,12 +106,6 @@ extern int GetFontPath(ClientPtr client, int *length, unsigned char **result); -extern int LoadGlyphs(ClientPtr /*client*/, - FontPtr /*pfont*/, - unsigned /*nchars*/, - int /*item_size*/, - unsigned char * /*data*/); - extern void DeleteClientFontStuff(ClientPtr /*client*/); /* Quartz support on Mac OS X pulls in the QuickDraw @@ -152,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 */ |