#include <sys/stat.h>
#include "file-path.hh"
+#include "international.hh"
#include "main.hh"
#include "warn.hh"
font_config_global = FcInitLoadConfig ();
FcChar8 *cache_file = FcConfigGetCache (font_config_global);
+#if 0
+ // always returns 0 for FC 2.4
+ if (!cache_file)
+ programming_error ("Cannot find file for FontConfig cache.");
+#endif
/*
This is a terrible kludge, but there is apparently no way for
FontConfig to signal whether it needs to rescan directories.
*/
- if (!is_file ((char*)cache_file))
- message (_f ("Rebuilding FontConfig cache %s. this may take a while...", cache_file));
+ if (cache_file
+ && !is_file ((char const *)cache_file))
+ message (_f ("Rebuilding FontConfig cache %s, this may take a while...", cache_file));
- FcConfigSetCurrent (font_config_global);
-
- Array<String> dirs;
+ vector<string> dirs;
- dirs.push (prefix_directory + "/fonts/otf/");
- dirs.push (prefix_directory + "/fonts/type1/");
+ dirs.push_back (prefix_directory + "/fonts/otf/");
+ dirs.push_back (prefix_directory + "/fonts/type1/");
- for (int i = 0; i < dirs.size (); i++)
+ for (vsize i = 0; i < dirs.size (); i++)
{
- String dir = dirs[i];
- if (!FcConfigAppFontAddDir (font_config_global, (FcChar8 *)dir.to_str0 ()))
- error (_f ("adding font directory: %s", dir.to_str0 ()));
+ string dir = dirs[i];
+ if (!FcConfigAppFontAddDir (font_config_global, (FcChar8 *)dir.c_str ()))
+ error (_f ("failed adding font directory: %s", dir.c_str ()));
else if (be_verbose_global)
- message (_f ("adding font directory: %s", dir.to_str0 ()));
+ message (_f ("adding font directory: %s", dir.c_str ()));
}
-
+
+ if (be_verbose_global)
+ progress_indication ("Building font database.\n");
+ FcConfigBuildFonts (font_config_global);
+ FcConfigSetCurrent (font_config_global);
if (be_verbose_global)
progress_indication ("\n");
- if (!is_file ((char*)cache_file))
+ if (cache_file
+ && !is_file ((char*)cache_file))
{
/* inhibit future messages. */
FILE *f = fopen ((char*)cache_file, "w");
- fclose (f);
+ if (f)
+ fclose (f);
}
}