Merge branch 'master' of https://github.com/minetest/minetest

1 files changed, 39 insertions, 175 deletions

diff --git a/src/client/fontengine.cpp b/src/client/fontengine.cpp
index f64315db4..ad8305b45 100644
--- a/src/client/fontengine.cpp
+++ b/src/client/fontengine.cpp
@@ -24,10 +24,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "porting.h"
 #include "filesys.h"
 #include "gettext.h"
-
-#if USE_FREETYPE
 #include "irrlicht_changes/CGUITTFont.h"
-#endif
 
 /** maximum size distance for getting a "similar" font size */
 #define MAX_FONT_SIZE_OFFSET 10
@@ -45,9 +42,8 @@ static void font_setting_changed(const std::string &name, void *userdata)
 FontEngine::FontEngine(gui::IGUIEnvironment* env) :
 	m_env(env)
 {
-
 	for (u32 &i : m_default_size) {
-		i = (FontMode) FONT_SIZE_UNSPECIFIED;
+		i = FONT_SIZE_UNSPECIFIED;
 	}
 
 	assert(g_settings != NULL); // pre-condition
@@ -56,23 +52,19 @@ FontEngine::FontEngine(gui::IGUIEnvironment* env) :
 
 	readSettings();
 
-	if (m_currentMode != FM_Simple) {
-		g_settings->registerChangedCallback("font_size", font_setting_changed, NULL);
-		g_settings->registerChangedCallback("font_bold", font_setting_changed, NULL);
-		g_settings->registerChangedCallback("font_italic", font_setting_changed, NULL);
-		g_settings->registerChangedCallback("font_path", font_setting_changed, NULL);
-		g_settings->registerChangedCallback("font_path_bold", font_setting_changed, NULL);
-		g_settings->registerChangedCallback("font_path_italic", font_setting_changed, NULL);
-		g_settings->registerChangedCallback("font_path_bolditalic", font_setting_changed, NULL);
-		g_settings->registerChangedCallback("font_shadow", font_setting_changed, NULL);
-		g_settings->registerChangedCallback("font_shadow_alpha", font_setting_changed, NULL);
-		g_settings->registerChangedCallback("fallback_font_path", font_setting_changed, NULL);
-	}
+	const char *settings[] = {
+		"font_size", "font_bold", "font_italic", "font_size_divisible_by",
+		"mono_font_size", "mono_font_size_divisible_by",
+		"font_shadow", "font_shadow_alpha",
+		"font_path", "font_path_bold", "font_path_italic", "font_path_bold_italic",
+		"mono_font_path", "mono_font_path_bold", "mono_font_path_italic",
+		"mono_font_path_bold_italic",
+		"fallback_font_path",
+		"screen_dpi", "gui_scaling",
+	};
 
-	g_settings->registerChangedCallback("mono_font_path", font_setting_changed, NULL);
-	g_settings->registerChangedCallback("mono_font_size", font_setting_changed, NULL);
-	g_settings->registerChangedCallback("screen_dpi", font_setting_changed, NULL);
-	g_settings->registerChangedCallback("gui_scaling", font_setting_changed, NULL);
+	for (auto name : settings)
+		g_settings->registerChangedCallback(name, font_setting_changed, NULL);
 }
 
 /******************************************************************************/
@@ -84,11 +76,13 @@ FontEngine::~FontEngine()
 /******************************************************************************/
 void FontEngine::cleanCache()
 {
+	RecursiveMutexAutoLock l(m_font_mutex);
+
 	for (auto &font_cache_it : m_font_cache) {
 
 		for (auto &font_it : font_cache_it) {
 			font_it.second->drop();
-			font_it.second = NULL;
+			font_it.second = nullptr;
 		}
 		font_cache_it.clear();
 	}
@@ -104,16 +98,8 @@ irr::gui::IGUIFont *FontEngine::getFont(FontSpec spec, bool may_fail)
 {
 	if (spec.mode == FM_Unspecified) {
 		spec.mode = m_currentMode;
-	} else if (m_currentMode == FM_Simple) {
-		// Freetype disabled -> Force simple mode
-		spec.mode = (spec.mode == FM_Mono ||
-				spec.mode == FM_SimpleMono) ?
-				FM_SimpleMono : FM_Simple;
-		// Support for those could be added, but who cares?
-		spec.bold = false;
-		spec.italic = false;
 	} else if (spec.mode == _FM_Fallback) {
-		// Fallback font doesn't support these either
+		// Fallback font doesn't support these
 		spec.bold = false;
 		spec.italic = false;
 	}
@@ -122,17 +108,15 @@ irr::gui::IGUIFont *FontEngine::getFont(FontSpec spec, bool may_fail)
 	if (spec.size == FONT_SIZE_UNSPECIFIED)
 		spec.size = m_default_size[spec.mode];
 
+	RecursiveMutexAutoLock l(m_font_mutex);
+
 	const auto &cache = m_font_cache[spec.getHash()];
 	auto it = cache.find(spec.size);
 	if (it != cache.end())
 		return it->second;
 
 	// Font does not yet exist
-	gui::IGUIFont *font = nullptr;
-	if (spec.mode == FM_Simple || spec.mode == FM_SimpleMono)
-		font = initSimpleFont(spec);
-	else
-		font = initFont(spec);
+	gui::IGUIFont *font = initFont(spec);
 
 	if (!font && !may_fail) {
 		errorstream << "Minetest cannot continue without a valid font. "
@@ -149,13 +133,7 @@ irr::gui::IGUIFont *FontEngine::getFont(FontSpec spec, bool may_fail)
 /******************************************************************************/
 unsigned int FontEngine::getTextHeight(const FontSpec &spec)
 {
-	irr::gui::IGUIFont *font = getFont(spec);
-
-	// use current skin font as fallback
-	if (font == NULL) {
-		font = m_env->getSkin()->getFont();
-	}
-	FATAL_ERROR_IF(font == NULL, "Could not get skin font");
+	gui::IGUIFont *font = getFont(spec);
 
 	return font->getDimension(L"Some unimportant example String").Height;
 }
@@ -163,28 +141,15 @@ unsigned int FontEngine::getTextHeight(const FontSpec &spec)
 /******************************************************************************/
 unsigned int FontEngine::getTextWidth(const std::wstring &text, const FontSpec &spec)
 {
-	irr::gui::IGUIFont *font = getFont(spec);
-
-	// use current skin font as fallback
-	if (font == NULL) {
-		font = m_env->getSkin()->getFont();
-	}
-	FATAL_ERROR_IF(font == NULL, "Could not get font");
+	gui::IGUIFont *font = getFont(spec);
 
 	return font->getDimension(text.c_str()).Width;
 }
 
-
 /** get line height for a specific font (including empty room between lines) */
 unsigned int FontEngine::getLineHeight(const FontSpec &spec)
 {
-	irr::gui::IGUIFont *font = getFont(spec);
-
-	// use current skin font as fallback
-	if (font == NULL) {
-		font = m_env->getSkin()->getFont();
-	}
-	FATAL_ERROR_IF(font == NULL, "Could not get font");
+	gui::IGUIFont *font = getFont(spec);
 
 	return font->getDimension(L"Some unimportant example String").Height
 			+ font->getKerningHeight();
@@ -198,13 +163,6 @@ unsigned int FontEngine::getDefaultFontSize()
 
 unsigned int FontEngine::getFontSize(FontMode mode)
 {
-	if (m_currentMode == FM_Simple) {
-		if (mode == FM_Mono || mode == FM_SimpleMono)
-			return m_default_size[FM_SimpleMono];
-		else
-			return m_default_size[FM_Simple];
-	}
-
 	if (mode == FM_Unspecified)
 		return m_default_size[FM_Standard];
 
@@ -214,20 +172,12 @@ unsigned int FontEngine::getFontSize(FontMode mode)
 /******************************************************************************/
 void FontEngine::readSettings()
 {
-	if (USE_FREETYPE && g_settings->getBool("freetype")) {
-		m_default_size[FM_Standard]  = g_settings->getU16("font_size");
-		m_default_size[_FM_Fallback] = g_settings->getU16("font_size");
-		m_default_size[FM_Mono]      = g_settings->getU16("mono_font_size");
-
-		m_default_bold = g_settings->getBool("font_bold");
-		m_default_italic = g_settings->getBool("font_italic");
+	m_default_size[FM_Standard]  = g_settings->getU16("font_size");
+	m_default_size[_FM_Fallback] = g_settings->getU16("font_size");
+	m_default_size[FM_Mono]      = g_settings->getU16("mono_font_size");
 
-	} else {
-		m_currentMode = FM_Simple;
-	}
-
-	m_default_size[FM_Simple]       = g_settings->getU16("font_size");
-	m_default_size[FM_SimpleMono]   = g_settings->getU16("mono_font_size");
+	m_default_bold = g_settings->getBool("font_bold");
+	m_default_italic = g_settings->getBool("font_italic");
 
 	cleanCache();
 	updateFontCache();
@@ -238,22 +188,9 @@ void FontEngine::readSettings()
 void FontEngine::updateSkin()
 {
 	gui::IGUIFont *font = getFont();
+	assert(font);
 
-	if (font)
-		m_env->getSkin()->setFont(font);
-	else
-		errorstream << "FontEngine: Default font file: " <<
-				"\n\t\"" << g_settings->get("font_path") << "\"" <<
-				"\n\trequired for current screen configuration was not found" <<
-				" or was invalid file format." <<
-				"\n\tUsing irrlicht default font." << std::endl;
-
-	// If we did fail to create a font our own make irrlicht find a default one
-	font = m_env->getSkin()->getFont();
-	FATAL_ERROR_IF(font == NULL, "Could not create/get font");
-
-	u32 text_height = font->getDimension(L"Hello, world!").Height;
-	infostream << "FontEngine: measured text_height=" << text_height << std::endl;
+	m_env->getSkin()->setFont(font);
 }
 
 /******************************************************************************/
@@ -280,15 +217,18 @@ gui::IGUIFont *FontEngine::initFont(const FontSpec &spec)
 	if (spec.italic)
 		setting_suffix.append("_italic");
 
-	u32 size = std::floor(RenderingEngine::getDisplayDensity() *
-			g_settings->getFloat("gui_scaling") * spec.size);
+	u32 size = std::max<u32>(spec.size * RenderingEngine::getDisplayDensity() *
+			g_settings->getFloat("gui_scaling"), 1);
 
-	if (size == 0) {
-		errorstream << "FontEngine: attempt to use font size 0" << std::endl;
-		errorstream << "  display density: " << RenderingEngine::getDisplayDensity() << std::endl;
-		abort();
+	// Constrain the font size to a certain multiple, if necessary
+	u16 divisible_by = g_settings->getU16(setting_prefix + "font_size_divisible_by");
+	if (divisible_by > 1) {
+		size = std::max<u32>(
+				std::round((double)size / divisible_by) * divisible_by, divisible_by);
 	}
 
+	sanity_check(size != 0);
+
 	u16 font_shadow       = 0;
 	u16 font_shadow_alpha = 0;
 	g_settings->getU16NoEx(setting_prefix + "font_shadow", font_shadow);
@@ -306,7 +246,6 @@ gui::IGUIFont *FontEngine::initFont(const FontSpec &spec)
 		Settings::getLayer(SL_DEFAULTS)->get(path_setting)
 	};
 
-#if USE_FREETYPE
 	for (const std::string &font_path : fallback_settings) {
 		gui::CGUITTFont *font = gui::CGUITTFont::createTTFont(m_env,
 				font_path.c_str(), size, true, true, font_shadow,
@@ -325,80 +264,5 @@ gui::IGUIFont *FontEngine::initFont(const FontSpec &spec)
 		}
 		return font;
 	}
-#else
-	errorstream << "FontEngine: Tried to load TTF font but Minetest was"
-			" compiled without Freetype." << std::endl;
-#endif
 	return nullptr;
 }
-
-/** initialize a font without freetype */
-gui::IGUIFont *FontEngine::initSimpleFont(const FontSpec &spec)
-{
-	assert(spec.mode == FM_Simple || spec.mode == FM_SimpleMono);
-	assert(spec.size != FONT_SIZE_UNSPECIFIED);
-
-	const std::string &font_path = g_settings->get(
-			(spec.mode == FM_SimpleMono) ? "mono_font_path" : "font_path");
-
-	size_t pos_dot = font_path.find_last_of('.');
-	std::string basename = font_path, ending;
-	if (pos_dot != std::string::npos)
-		ending = lowercase(font_path.substr(pos_dot));
-
-	if (ending == ".ttf") {
-		errorstream << "FontEngine: Found font \"" << font_path
-				<< "\" but freetype is not available." << std::endl;
-		return nullptr;
-	}
-
-	if (ending == ".xml" || ending == ".png")
-		basename = font_path.substr(0, pos_dot);
-
-	u32 size = std::floor(
-			RenderingEngine::getDisplayDensity() *
-			g_settings->getFloat("gui_scaling") *
-			spec.size);
-
-	irr::gui::IGUIFont *font = nullptr;
-	std::string font_extensions[] = { ".png", ".xml" };
-
-	// Find nearest matching font scale
-	// Does a "zig-zag motion" (positibe/negative), from 0 to MAX_FONT_SIZE_OFFSET
-	for (s32 zoffset = 0; zoffset < MAX_FONT_SIZE_OFFSET * 2; zoffset++) {
-		std::stringstream path;
-
-		// LSB to sign
-		s32 sign = (zoffset & 1) ? -1 : 1;
-		s32 offset = zoffset >> 1;
-
-		for (const std::string &ext : font_extensions) {
-			path.str(""); // Clear
-			path << basename << "_" << (size + offset * sign) << ext;
-
-			if (!fs::PathExists(path.str()))
-				continue;
-
-			font = m_env->getFont(path.str().c_str());
-
-			if (font) {
-				verbosestream << "FontEngine: found font: " << path.str() << std::endl;
-				break;
-			}
-		}
-
-		if (font)
-			break;
-	}
-
-	// try name direct
-	if (font == NULL) {
-		if (fs::PathExists(font_path)) {
-			font = m_env->getFont(font_path.c_str());
-			if (font)
-				verbosestream << "FontEngine: found font: " << font_path << std::endl;
-		}
-	}
-
-	return font;
-}