/*
- Copyright (C) 2014-2021 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2014-2023 Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
#include "dcpomatic_assert.h"
+#include "dcpomatic_log.h"
+#include "font.h"
#include "font_config.h"
+#include "util.h"
+#include <dcp/filesystem.h>
#include <fontconfig/fontconfig.h>
#include <boost/filesystem.hpp>
#include <boost/optional.hpp>
+using std::shared_ptr;
using std::string;
using boost::optional;
}
+FontConfig::~FontConfig()
+{
+ for (auto file: _temp_files) {
+ boost::system::error_code ec;
+ dcp::filesystem::remove(file, ec);
+ }
+}
+
+
string
-FontConfig::make_font_available(boost::filesystem::path font_file)
+FontConfig::make_font_available(shared_ptr<dcpomatic::Font> font)
{
- auto existing = _available_fonts.find(font_file);
+ DCPOMATIC_ASSERT(font);
+
+ auto existing = _available_fonts.find(font->content());
if (existing != _available_fonts.end()) {
return existing->second;
}
+ boost::filesystem::path font_file = default_font_file();
+ if (font->file()) {
+ font_file = *font->file();
+ } else if (font->data()) {
+ /* This font only exists in memory (so far) but FontConfig doesn't have an API to add a font
+ * from a memory buffer (AFAICS).
+ * https://gitlab.freedesktop.org/fontconfig/fontconfig/-/issues/12
+ * As a workaround, write the font data to a temporary file and use that.
+ */
+ font_file = boost::filesystem::temp_directory_path() / boost::filesystem::unique_path();
+ _temp_files.push_back(font_file);
+ font->data()->write(font_file);
+ }
+
+
/* Make this font available to DCP-o-matic */
optional<string> font_name;
FcConfigAppFontAddFile (_config, reinterpret_cast<FcChar8 const *>(font_file.string().c_str()));
DCPOMATIC_ASSERT(font_name);
- _available_fonts[font_file] = *font_name;
+ /* We need to use the font object as the key, as we may be passed the same shared_ptr to a modified
+ * Font object in the future and in that case we need to load the new font.
+ */
+ _available_fonts[font->content()] = *font_name;
FcConfigBuildFonts(_config);
return *font_name;
{
optional<boost::filesystem::path> path;
+ LOG_GENERAL("Searching system for font %1", name);
auto pattern = FcNameParse(reinterpret_cast<FcChar8 const*>(name.c_str()));
auto object_set = FcObjectSetBuild(FC_FILE, nullptr);
auto font_set = FcFontList(_config, pattern, object_set);
if (font_set) {
+ LOG_GENERAL("%1 candidate fonts found", font_set->nfont);
for (int i = 0; i < font_set->nfont; ++i) {
auto font = font_set->fonts[i];
FcChar8* file;
if (FcPatternGetString(font, FC_FILE, 0, &file) == FcResultMatch) {
path = boost::filesystem::path(reinterpret_cast<char*>(file));
+ LOG_GENERAL("Found %1", *path);
break;
}
}
FcFontSetDestroy(font_set);
+ } else {
+ LOG_GENERAL_NC("No candidate fonts found");
}
FcObjectSetDestroy(object_set);
FcPatternDestroy(pattern);
+ if (path) {
+ LOG_GENERAL("Searched system for font %1, found %2", name, *path);
+ } else {
+ LOG_GENERAL("Searched system for font %1; nothing found", name);
+ }
+
return path;
}
return _instance;
}
+
+void
+FontConfig::drop()
+{
+ delete _instance;
+ _instance = nullptr;
+}
+