Embed Unifont OTF and use it by default

unifont-17.0.01.otf
TODO add license

use OTF because:
- smaller
- unifont stopped releasing TTF

embedded font used when cl_consoleFont is the empty string (the new
default)

Author: slipher

CMakeLists.txt

@@ -1070,6 +1070,15 @@ if (BUILD_CLIENT)
     string(APPEND SHADERS_CPP_TEXT "};\n")
 
     daemon_write_generated("shaders.cpp" "${SHADERS_CPP_TEXT}")
+
+    add_custom_command(
+        OUTPUT ${EMBED_INCLUDE_DIR}/daemon_unifont.h
+        COMMAND ${CMAKE_COMMAND} "-DINPUT_FILE=${CMAKE_CURRENT_SOURCE_DIR}/libs/unifont/unifont.otf" "-DOUTPUT_FILE=${EMBED_INCLUDE_DIR}/daemon_unifont.h"
+            -DTEXT_MODE=0 -DVARIABLE_NAME=daemon_unifont_bin -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/EmbedText.cmake
+        MAIN_DEPENDENCY ${CMAKE_CURRENT_SOURCE_DIR}/libs/unifont/unifont.otf
+    )
+    set_property(TARGET client-objects APPEND PROPERTY SOURCES ${EMBED_INCLUDE_DIR}/daemon_unifont.h)
+    include_directories(${EMBED_INCLUDE_DIR})
 endif()
 
 if (BUILD_SERVER)

libs/unifont/unifont.otf

@@ -2104,42 +2104,32 @@ bool CL_InitRenderer()
 		return false;
 	}
 
-	cl_consoleFont = Cvar_Get( "cl_consoleFont", "fonts/unifont.ttf",  CVAR_LATCH );
+	cl_consoleFont = Cvar_Get( "cl_consoleFont", "",  CVAR_LATCH );
 	cl_consoleFontSize = Cvar_Get( "cl_consoleFontSize", "16",  CVAR_LATCH );
 	cl_consoleFontScaling = Cvar_Get( "cl_consoleFontScaling", "1", CVAR_LATCH );
 
 	// load character sets
 	cls.charSetShader = re.RegisterShader( "gfx/2d/bigchars", RSF_2D );
 	cls.useLegacyConsoleFont = cls.useLegacyConsoleFace = true;
 
-	// Register console font specified by cl_consoleFont, if any
-	// filehandle is unused but forces FS_FOpenFileRead() to heed purecheck because it does not when filehandle is nullptr
-	if ( cl_consoleFont->string[0] )
-	{
-		if ( FS_FOpenFileRead( cl_consoleFont->string, &f ) >= 0 )
-		{
-			if ( cl_consoleFontScaling->value == 0 )
-			{
-				cls.consoleFont = re.RegisterFont( cl_consoleFont->string, cl_consoleFontSize->integer );
-			}
-			else
-			{
-				// This gets 12px on 1920×1080 screen, which is libRocket default for 1em
-				int fontScale = std::min(cls.windowConfig.vidWidth, cls.windowConfig.vidHeight) / 90;
+	// Register console font specified by cl_consoleFont. Empty string means use the embbed Unifont
 
-				// fontScale / 12px gets 1px on 1920×1080 screen
-				cls.consoleFont = re.RegisterFont( cl_consoleFont->string, cl_consoleFontSize->integer * fontScale / 12 );
-			}
+	if ( cl_consoleFontScaling->value == 0 )
+	{
+		cls.consoleFont = re.RegisterFont( cl_consoleFont->string, cl_consoleFontSize->integer );
+	}
+	else
+	{
+		// This gets 12px on 1920×1080 screen, which is libRocket default for 1em
+		int fontScale = std::min(cls.windowConfig.vidWidth, cls.windowConfig.vidHeight) / 90;
 
-			if ( cls.consoleFont != nullptr )
-				cls.useLegacyConsoleFont = false;
-		}
-		else
-		{
-			Log::Warn("Font file '%s' not found", cl_consoleFont->string);
-		}
+		// fontScale / 12px gets 1px on 1920×1080 screen
+		cls.consoleFont = re.RegisterFont( cl_consoleFont->string, cl_consoleFontSize->integer * fontScale / 12 );
+	}
 
-		FS_FCloseFile( f );
+	if ( cls.consoleFont != nullptr )
+	{
+		cls.useLegacyConsoleFont = false;
 	}
 
 	cls.whiteShader = re.RegisterShader( "white", RSF_NOMIP );

src/engine/client/cl_main.cpp

@@ -39,6 +39,8 @@ Maryland 20850 USA.
 #include "qcommon/qcommon.h"
 #include "qcommon/q_unicode.h"
 
+#include "daemon_unifont.h"
+
 #include <ft2build.h>
 #include FT_FREETYPE_H
 #include FT_ERRORS_H
@@ -417,6 +419,12 @@ void RE_RenderChunk( fontInfo_t *font, const int chunk )
 
 static int RE_LoadFontFile( const char *name, void **buffer )
 {
+	if ( !*name )
+	{
+		*buffer = (void *)( &daemon_unifont_bin );
+		return sizeof( daemon_unifont_bin );
+	}
+
 	void *tmp;
 	int  length = ri.FS_ReadFile( name, &tmp );
 
@@ -436,9 +444,13 @@ static int RE_LoadFontFile( const char *name, void **buffer )
 
 static void RE_FreeFontFile( void *data )
 {
-	Z_Free( data );
+	if ( data != daemon_unifont_bin )
+	{
+		Z_Free( data );
+	}
 }
 
+// If name is the empty string, load the embedded Unifont
 fontInfo_t* RE_RegisterFont( const char *fontName, int pointSize )
 {
 	FT_Face       face;