fntfil.h   fntfil.h 
skipping to change at line 75 skipping to change at line 75
#define FONT_ENTRY_ALIAS 3 #define FONT_ENTRY_ALIAS 3
#define FONT_ENTRY_BC 4 #define FONT_ENTRY_BC 4
#define MAXFONTNAMELEN 1024 #define MAXFONTNAMELEN 1024
#define MAXFONTFILENAMELEN 1024 #define MAXFONTFILENAMELEN 1024
#define FontDirFile "fonts.dir" #define FontDirFile "fonts.dir"
#define FontAliasFile "fonts.alias" #define FontAliasFile "fonts.alias"
#define FontScalableFile "fonts.scale" #define FontScalableFile "fonts.scale"
extern int FontFileNameCheck ( char *name ); extern int FontFileNameCheck ( const char *name );
extern int FontFileInitFPE ( FontPathElementPtr fpe ); extern int FontFileInitFPE ( FontPathElementPtr fpe );
extern int FontFileResetFPE ( FontPathElementPtr fpe ); extern int FontFileResetFPE ( FontPathElementPtr fpe );
extern int FontFileFreeFPE ( FontPathElementPtr fpe ); extern int FontFileFreeFPE ( FontPathElementPtr fpe );
extern int FontFileOpenFont ( pointer client, FontPathElementPtr fpe, extern int FontFileOpenFont ( pointer client, FontPathElementPtr fpe,
Mask flags, char *name, int namelen, Mask flags, const char *name, int namelen,
fsBitmapFormat format, fsBitmapFormatMask fmas k, fsBitmapFormat format, fsBitmapFormatMask fmas k,
XID id, FontPtr *pFont, char **aliasName, XID id, FontPtr *pFont, char **aliasName,
FontPtr non_cachable_font ); FontPtr non_cachable_font );
extern void FontFileCloseFont ( FontPathElementPtr fpe, FontPtr pFont ); extern void FontFileCloseFont ( FontPathElementPtr fpe, FontPtr pFont );
extern int FontFileOpenBitmap ( FontPathElementPtr fpe, FontPtr *pFont, extern int FontFileOpenBitmap ( FontPathElementPtr fpe, FontPtr *pFont,
int flags, FontEntryPtr entry, int flags, FontEntryPtr entry,
fsBitmapFormat format, fsBitmapFormat format,
fsBitmapFormatMask fmask ); fsBitmapFormatMask fmask );
extern int FontFileListFonts ( pointer client, FontPathElementPtr fpe, extern int FontFileListFonts ( pointer client, FontPathElementPtr fpe,
char *pat, int len, int max, const char *pat, int len, int max,
FontNamesPtr names ); FontNamesPtr names );
extern int FontFileStartListFonts ( pointer client, FontPathElementPtr fpe, extern int FontFileStartListFonts ( pointer client, FontPathElementPtr fpe,
char *pat, int len, int max, const char *pat, int len, int max,
pointer *privatep, int mark_aliases ); pointer *privatep, int mark_aliases );
extern int FontFileStartListFontsWithInfo ( pointer client, extern int FontFileStartListFontsWithInfo ( pointer client,
FontPathElementPtr fpe, FontPathElementPtr fpe,
char *pat, int len, int max, const char *pat, int len, int ma x,
pointer *privatep ); pointer *privatep );
extern int FontFileListNextFontWithInfo ( pointer client, extern int FontFileListNextFontWithInfo ( pointer client,
FontPathElementPtr fpe, FontPathElementPtr fpe,
char **namep, int *namelenp, char **namep, int *namelenp,
FontInfoPtr *pFontInfo, FontInfoPtr *pFontInfo,
int *numFonts, pointer private ); int *numFonts, pointer private );
extern int FontFileStartListFontsAndAliases ( pointer client, extern int FontFileStartListFontsAndAliases ( pointer client,
FontPathElementPtr fpe, FontPathElementPtr fpe,
char *pat, int len, int max, const char *pat, int len, int max,
pointer *privatep ); pointer *privatep );
extern int FontFileListNextFontOrAlias ( pointer client, extern int FontFileListNextFontOrAlias ( pointer client,
FontPathElementPtr fpe, FontPathElementPtr fpe,
char **namep, int *namelenp, char **namep, int *namelenp,
char **resolvedp, int *resolvedlenp , char **resolvedp, int *resolvedlenp ,
pointer private ); pointer private );
extern void FontFileRegisterLocalFpeFunctions ( void ); extern void FontFileRegisterLocalFpeFunctions ( void );
extern void CatalogueRegisterLocalFpeFunctions ( void ); extern void CatalogueRegisterLocalFpeFunctions ( void );
extern FontEntryPtr FontFileAddEntry ( FontTablePtr table, extern FontEntryPtr FontFileAddEntry ( FontTablePtr table,
skipping to change at line 175 skipping to change at line 175
extern void FontFileEmptyBitmapSource ( void ); extern void FontFileEmptyBitmapSource ( void );
extern int FontFileMatchBitmapSource ( FontPathElementPtr fpe, extern int FontFileMatchBitmapSource ( FontPathElementPtr fpe,
FontPtr *pFont, int flags, FontPtr *pFont, int flags,
FontEntryPtr entry, FontEntryPtr entry,
FontNamePtr zeroPat, FontNamePtr zeroPat,
FontScalablePtr vals, FontScalablePtr vals,
fsBitmapFormat format, fsBitmapFormat format,
fsBitmapFormatMask fmask, fsBitmapFormatMask fmask,
Bool noSpecificSize ); Bool noSpecificSize );
extern int FontFileReadDirectory ( char *directory, FontDirectoryPtr *pdir ); extern int FontFileReadDirectory ( const char *directory, FontDirectoryPtr *pdir );
extern Bool FontFileDirectoryChanged ( FontDirectoryPtr dir ); extern Bool FontFileDirectoryChanged ( FontDirectoryPtr dir );
#endif /* _FONTFILE_H_ */ #endif /* _FONTFILE_H_ */
 End of changes. 7 change blocks. 
7 lines changed or deleted 7 lines changed or added


 fontconf.h   fontconf.h 
skipping to change at line 37 skipping to change at line 37
/* Define as 1 if you have builtin font support in Xfont */ /* Define as 1 if you have builtin font support in Xfont */
#define XFONT_BUILTINS 1 #define XFONT_BUILTINS 1
/* Define as 1 if you have pcf font support in Xfont */ /* Define as 1 if you have pcf font support in Xfont */
#define XFONT_PCFFORMAT 1 #define XFONT_PCFFORMAT 1
/* Define as 1 if you have bdf font support in Xfont */ /* Define as 1 if you have bdf font support in Xfont */
#define XFONT_BDFFORMAT 1 #define XFONT_BDFFORMAT 1
/* Define as 1 if you have snf font support in Xfont */ /* Define as 1 if you have snf font support in Xfont */
#define XFONT_SNFFORMAT 1 /* #undef XFONT_SNFFORMAT */
/* Define as 1 if you have bitmap font support in Xfont */ /* Define as 1 if you have bitmap font support in Xfont */
#define XFONT_BITMAP 1 #define XFONT_BITMAP 1
/* Define as 1 if you have fontfile support in Xfont */ /* Define as 1 if you have fontfile support in Xfont */
#define XFONT_FONTFILE 1 #define XFONT_FONTFILE 1
/* Define as 1 if you have font cache support in Xfont */ /* Define as 1 if you have font cache support in Xfont */
/* #undef XFONT_FONTCACHE */ /* #undef XFONT_FONTCACHE */
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 fontmisc.h   fontmisc.h 
skipping to change at line 93 skipping to change at line 93
char*, char*,
char*, char*,
unsigned, unsigned,
unsigned, unsigned,
int, int,
int int
); );
extern void CopyISOLatin1Lowered( extern void CopyISOLatin1Lowered(
char * /*dest*/, char * /*dest*/,
char * /*source*/, const char * /*source*/,
int /*length*/ int /*length*/
); );
extern void register_fpe_functions(void); extern void register_fpe_functions(void);
#endif /* _FONTMISC_H_ */ #endif /* _FONTMISC_H_ */
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/