Drop fontconfig dependency as we're loading font files from extras.pk3

Author: a1batross

CMakeLists.txt

@@ -98,9 +98,9 @@ if(MAINUI_USE_CUSTOM_FONT_RENDER)
 		else()
 			# Use freetype2
 			find_package(PkgConfig)
-			pkg_check_modules(FC REQUIRED fontconfig)
-			include_directories(${FC_INCLUDE_DIRS})
-			target_link_libraries(${MAINUI_LIBRARY} ${FC_LIBRARIES})
+			pkg_check_modules(FT2 REQUIRED freetype2)
+			include_directories(${FT2_INCLUDE_DIRS})
+			target_link_libraries(${MAINUI_LIBRARY} ${FT2_LIBRARIES})
 			add_definitions(-DMAINUI_USE_FREETYPE)
 		endif()
 	endif()

font/FreeTypeFont.cpp

@@ -27,7 +27,7 @@ FT_Library CFreeTypeFont::m_Library;
 
 
 CFreeTypeFont::CFreeTypeFont() : CBaseFont(),
-	face(), m_szRealFontFile()
+	face()
 {
 
 }
@@ -36,94 +36,27 @@ CFreeTypeFont::~CFreeTypeFont()
 {
 }
 
-/**
- * Find a matching font where @type (one of FC_*) is equal to @value. For a
- * list of types, see http://fontconfig.org/fontconfig-devel/x19.html#AEN27.
- * The variable arguments are a list of triples, just like the first three
- * arguments, and must be NULL terminated.
- *
- * For example,
- *   FontMatchString(FC_FILE, FcTypeString, "/usr/share/fonts/myfont.ttf", NULL);
- *
- * Ripped from skia source code
- */
-static FcPattern* FontMatch(const char* type, ...)
-{
-	FcValue fcvalue;
-	va_list ap;
-
-	va_start(ap, type);
-
-	FcPattern* pattern = FcPatternCreate();
-
-	for (;;) {
-		// FcType is promoted to int when passed through ...
-		fcvalue.type = static_cast<FcType>(va_arg(ap, int));
-		switch (fcvalue.type) {
-			case FcTypeString:
-				fcvalue.u.s = va_arg(ap, const FcChar8 *);
-				break;
-			case FcTypeInteger:
-				fcvalue.u.i = va_arg(ap, int);
-				break;
-			default:
-				ASSERT(("FontMatch unhandled type"));
-		}
-		FcPatternAdd(pattern, type, fcvalue, FcFalse);
-
-		type = va_arg(ap, const char *);
-		if (!type)
-			break;
-	};
-	va_end(ap);
-
-	FcConfigSubstitute(NULL, pattern, FcMatchPattern);
-	FcDefaultSubstitute(pattern);
-
-	FcResult result;
-	FcPattern* match = FcFontMatch(NULL, pattern, &result);
-	FcPatternDestroy(pattern);
-
-	return match;
-}
-
 bool CFreeTypeFont::FindFontDataFile( const char *name, int tall, int weight, int flags, char *dataFile, int dataFileChars )
 {
-	int nFcWeight = weight / 5;
-	FcPattern *pattern;
-	FcChar8 *filename;
-
-	bool bRet;
-
-	if( !FcInit() )
-		return false;
-
-	int slant = FC_SLANT_ROMAN;
-	if( flags & ( FONT_ITALIC ))
-		slant = FC_SLANT_ITALIC;
-
-	pattern = FontMatch(
-		FC_FAMILY, FcTypeString,  name,
-		FC_WEIGHT, FcTypeInteger, nFcWeight,
-		FC_SLANT,  FcTypeInteger, slant,
-		NULL );
-
-	if( !pattern )
-		return false;
-
-	if( !FcPatternGetString( pattern, "file", 0, &filename ) )
+	if( !strcmp( name, "Trebuchet MS" ))
+	{
+		Q_strncpy( dataFile, "gfx/fonts/FiraSans-Regular.ttf", dataFileChars );
+		return true;
+	}
+	else if( !strcmp( name, "Tahoma" ))
 	{
-		bRet = true;
-		Q_strncpy( dataFile, (char*)filename, dataFileChars );
+		Q_strncpy( dataFile, "gfx/fonts/tahoma.ttf", dataFileChars );
+		return true;
 	}
-	else bRet = false;
 
-	FcPatternDestroy( pattern );
-	return bRet;
+	return false;
 }
 
 bool CFreeTypeFont::Create(const char *name, int tall, int weight, int blur, float brighten, int outlineSize, int scanlineOffset, float scanlineScale, int flags)
 {
+	char font_face_path[256];
+	int font_face_length;
+
 	Q_strncpy( m_szName, name, sizeof( m_szName ) );
 	m_iTall = tall;
 	m_iWeight = weight;
@@ -137,15 +70,24 @@ bool CFreeTypeFont::Create(const char *name, int tall, int weight, int blur, flo
 	m_iScanlineOffset = scanlineOffset;
 	m_fScanlineScale = scanlineScale;
 
-	if( !FindFontDataFile( name, tall, weight, flags, m_szRealFontFile, sizeof( m_szRealFontFile ) ) )
+	if( !FindFontDataFile( name, tall, weight, flags, font_face_path, sizeof( font_face_path )))
 	{
 		Con_Printf( "Unable to find font named %s\n", name );
 		m_szName[0] = 0;
 		return false;
 	}
 
-	if( FT_New_Face( m_Library, m_szRealFontFile, 0, &face ))
+	m_pFontData = g_FontMgr->LoadFontDataFile( font_face_path, &font_face_length );
+
+	if( !m_pFontData )
+	{
+		Con_Printf( "Unable to read font file %s!\n", font_face_path );
+		return false;
+	}
+
+	if( FT_New_Memory_Face( m_Library, m_pFontData, font_face_length, 0, &face ))
 	{
+		Con_Printf( "Unable to create font %s!\n", font_face_path );
 		return false;
 	}
 

font/FreeTypeFont.h

@@ -22,7 +22,6 @@ GNU General Public License for more details.
 
 extern "C"
 {
-    #include <fontconfig/fontconfig.h>
     #include <ft2build.h>
     #include FT_FREETYPE_H
 }
@@ -48,7 +47,7 @@ class CFreeTypeFont : public CBaseFont
 private:
 	FT_Face face;
 	static FT_Library m_Library;
-	char m_szRealFontFile[4096];
+	byte *m_pFontData;
 	bool FindFontDataFile(const char *name, int tall, int weight, int flags, char *dataFile, int dataFileChars);
 
 	friend class CFontManager;

wscript

@@ -15,13 +15,6 @@ FT2_CHECK='''extern "C" {
 int main() { return FT_Init_FreeType( NULL ); }
 '''
 
-FC_CHECK='''extern "C" {
-#include <fontconfig/fontconfig.h>
-}
-
-int main() { return (int)FcInit(); }
-'''
-
 def options(opt):
 	grp = opt.add_option_group('MainUI C++ options')
 	grp.add_option('--enable-stbtt', action = 'store_true', dest = 'USE_STBTT', default = False,
@@ -57,7 +50,6 @@ def configure(conf):
 	if conf.env.DEST_OS != 'win32' and conf.env.DEST_OS != 'dos':
 		if not conf.options.USE_STBTT and not conf.options.LOW_MEMORY:
 			conf.check_pkg('freetype2', 'FT2', FT2_CHECK)
-			conf.check_pkg('fontconfig', 'FC', FC_CHECK)
 			conf.define('MAINUI_USE_FREETYPE', 1)
 
 def build(bld):
@@ -88,7 +80,7 @@ def build(bld):
 		source   = source,
 		target   = 'menu',
 		includes = includes,
-		use      = 'werror FT2 FC GDI32 USER32',
+		use      = 'werror FT2 GDI32 USER32',
 		install_path = bld.env.LIBDIR,
 		subsystem = bld.env.MSVC_SUBSYSTEM,
 		cmake_skip = True