const char* dllnames [] =
{
#if defined(WIN32)
- "freetype6.dll",
"libfreetype-6.dll",
+ "freetype6.dll",
#elif defined(MACOSX)
"libfreetype.6.dylib",
"libfreetype.dylib",
void font_shutdown(void)
{
int i;
- for (i = 0; i < MAX_FONTS; ++i)
+ for (i = 0; i < dp_fonts.maxsize; ++i)
{
- if (dp_fonts[i].ft2)
+ if (dp_fonts.f[i].ft2)
{
- Font_UnloadFont(dp_fonts[i].ft2);
- dp_fonts[i].ft2 = NULL;
+ Font_UnloadFont(dp_fonts.f[i].ft2);
+ dp_fonts.f[i].ft2 = NULL;
}
}
Font_CloseLibrary();
Cvar_RegisterVariable(&r_font_size_snapping);
Cvar_RegisterVariable(&r_font_kerning);
Cvar_RegisterVariable(&developer_font);
+
// let's open it at startup already
Font_OpenLibrary();
}
namelen = strlen(name);
- memcpy(filename, name, namelen);
- memcpy(filename + namelen, ".ttf", 5);
+ // try load direct file
+ memcpy(filename, name, namelen+1);
data = FS_LoadFile(filename, font_mempool, false, &datasize);
+ // try load .ttf
+ if (!data)
+ {
+ memcpy(filename + namelen, ".ttf", 5);
+ data = FS_LoadFile(filename, font_mempool, false, &datasize);
+ }
+ // try load .otf
if (!data)
{
memcpy(filename + namelen, ".otf", 5);
data = FS_LoadFile(filename, font_mempool, false, &datasize);
}
+ // try load .pfb/afm
if (!data)
{
ft2_attachment_t afm;
Font_Attach(font, &afm);
}
}
-
if (!data)
{
// FS_LoadFile being not-quiet should print an error :)
return false;
}
- Con_Printf("Loading font %s face %i...\n", filename, _face);
+ Con_DPrintf("Loading font %s face %i...\n", filename, _face);
status = qFT_New_Memory_Face(font_ft2lib, (FT_Bytes)data, datasize, _face, (FT_Face*)&font->face);
if (status && _face != 0)
_face = 0;
status = qFT_New_Memory_Face(font_ft2lib, (FT_Bytes)data, datasize, 0, (FT_Face*)&font->face);
}
+ font->data = data;
if (status)
{
Con_Printf("ERROR: can't create face for %s\n"
void Font_UnloadFont(ft2_font_t *font)
{
int i;
+
+ // unload fallbacks
+ if(font->next)
+ Font_UnloadFont(font->next);
+
if (font->attachments && font->attachmentcount)
{
+ for (i = 0; i < font->attachmentcount; ++i) {
+ if (font->attachments[i].data)
+ Mem_Free(font->attachments[i].data);
+ }
Mem_Free(font->attachments);
font->attachmentcount = 0;
font->attachments = NULL;
font->face = NULL;
}
}
+ if (font->data) {
+ Mem_Free(font->data);
+ font->data = NULL;
+ }
}
static float Font_SearchSize(ft2_font_t *font, FT_Face fontface, float size)
map->texture = R_LoadTexture2D(font_texturepool, map_identifier,
map->glyphSize * FONT_CHARS_PER_LINE,
map->glyphSize * FONT_CHAR_LINES,
- data, TEXTYPE_ALPHA, TEXF_ALPHA /*gone: | TEXF_ALWAYSPRECACHE*/ /* | TEXF_MIPMAP*/, NULL);
+ data, TEXTYPE_ALPHA, TEXF_ALPHA /*gone: | TEXF_ALWAYSPRECACHE*/ /* | TEXF_MIPMAP*/, -1, NULL);
} else {
map->texture = R_LoadTexture2D(font_texturepool, map_identifier,
map->glyphSize * FONT_CHARS_PER_LINE,
map->glyphSize * FONT_CHAR_LINES,
- data, TEXTYPE_RGBA, TEXF_ALPHA /*gone: | TEXF_ALWAYSPRECACHE*/ /* | TEXF_MIPMAP*/, NULL);
+ data, TEXTYPE_RGBA, TEXF_ALPHA /*gone: | TEXF_ALWAYSPRECACHE*/ /* | TEXF_MIPMAP*/, -1, NULL);
}
Mem_Free(data);