summaryrefslogtreecommitdiff
path: root/src/builtins/fpe.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/builtins/fpe.c')
-rw-r--r--src/builtins/fpe.c36
1 files changed, 21 insertions, 15 deletions
diff --git a/src/builtins/fpe.c b/src/builtins/fpe.c
index 4f5d4cf..e1b6973 100644
--- a/src/builtins/fpe.c
+++ b/src/builtins/fpe.c
@@ -24,6 +24,7 @@
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
+#include "libxfontint.h"
#include <X11/fonts/fntfilst.h>
#include "builtin.h"
@@ -65,24 +66,29 @@ BuiltinFreeFPE (FontPathElementPtr fpe)
return Successful;
}
+static const xfont2_fpe_funcs_rec builtin_fpe_funcs = {
+ .version = XFONT2_FPE_FUNCS_VERSION,
+ .name_check = BuiltinNameCheck,
+ .init_fpe = BuiltinInitFPE,
+ .free_fpe = BuiltinFreeFPE,
+ .reset_fpe = BuiltinResetFPE,
+ .open_font = FontFileOpenFont,
+ .close_font = FontFileCloseFont,
+ .list_fonts = FontFileListFonts,
+ .start_list_fonts_with_info = FontFileStartListFontsWithInfo,
+ .list_next_font_with_info = FontFileListNextFontWithInfo,
+ .wakeup_fpe = 0,
+ .client_died = 0,
+ .load_glyphs = 0,
+ .start_list_fonts_and_aliases = 0,
+ .list_next_font_or_alias = 0,
+ .set_path_hook = 0
+};
+
void
BuiltinRegisterFpeFunctions(void)
{
BuiltinRegisterFontFileFunctions ();
- font_file_type = RegisterFPEFunctions(BuiltinNameCheck,
- BuiltinInitFPE,
- BuiltinFreeFPE,
- BuiltinResetFPE,
- FontFileOpenFont,
- FontFileCloseFont,
- FontFileListFonts,
- FontFileStartListFontsWithInfo,
- FontFileListNextFontWithInfo,
- (WakeupFpeFunc) 0,
- (ClientDiedFunc) 0,
- (LoadGlyphsFunc) 0,
- (StartLaFunc) 0,
- (NextLaFunc) 0,
- (SetPathFunc) 0);
+ font_file_type = register_fpe_funcs(&builtin_fpe_funcs);
}