ShuriZma
/
desmume
mirror of https://github.com/TASEmulators/desmume.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cocoa Port: Display presenter objects now cache the font file in memory, just in case a bad client decides to repeatedly force the reloading of the font. (cough... OpenEmu view resizing... cough)

This commit is contained in:
rogerman 2022-05-03 04:21:34 -07:00
parent ccfd5a5a55
commit cc530c7a38
2 changed files with 42 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
desmume/src/frontend/cocoa/ClientDisplayView.cpp
View File

@ -23,6 +23,9 @@
ClientDisplayPresenter::ClientDisplayPresenter()
{
_fetchObject = NULL;
_lastFontFilePath = NULL;
_hudFontFileCache = NULL;
_hudFontFileCacheSize = 0;
ClientDisplayPresenterProperties defaultProperty;
defaultProperty.normalWidth = GPU_FRAMEBUFFER_NATIVE_WIDTH;
@ -58,6 +61,13 @@ ClientDisplayPresenter::~ClientDisplayPresenter()
this->_ftLibrary = NULL;
}
if (this->_hudFontFileCache != NULL)
{
free(this->_hudFontFileCache);
this->_hudFontFileCache = NULL;
this->_hudFontFileCacheSize = 0;
}
pthread_mutex_destroy(&this->_mutexHUDString);
}
@ -478,7 +488,36 @@ void ClientDisplayPresenter::LoadHUDFont()
FT_Face fontFace;
FT_Error error = FT_Err_Ok;
error = FT_New_Face(this->_ftLibrary, this->_lastFontFilePath, 0, &fontFace);
// Cache the entire font file in memory just in case the client needs to repeatedly
// reload the font. Font files are small (usually less than 1MB), so we shouldn't be
// wasting too much memory by doing this.
if (this->_hudFontFileCache == NULL)
{
FILE *fp = fopen(this->_lastFontFilePath, "rb");
if (fp == NULL)
{
return;
}
// Do some basic validation of the font file.
fseek(fp, 0, SEEK_END);
const size_t fileSize = ftell(fp);
this->_hudFontFileCache = (uint8_t *)malloc(fileSize);
fseek(fp, 0, SEEK_SET);
this->_hudFontFileCacheSize = fread(this->_hudFontFileCache, 1, fileSize, fp);
fclose(fp);
if (this->_hudFontFileCacheSize != fileSize)
{
free(this->_hudFontFileCache);
this->_hudFontFileCache = NULL;
this->_hudFontFileCacheSize = 0;
return;
}
}
error = FT_New_Memory_Face(this->_ftLibrary, this->_hudFontFileCache, this->_hudFontFileCacheSize, 0, &fontFace);
if (error == FT_Err_Unknown_File_Format)
{
printf("ClientDisplayPresenter: FreeType failed to load font face because it is in an unknown format from:\n%s\n", this->_lastFontFilePath);

2
desmume/src/frontend/cocoa/ClientDisplayView.h
View File

@ -186,6 +186,8 @@ protected:
FT_Library _ftLibrary;
const char *_lastFontFilePath;
uint8_t *_hudFontFileCache;
size_t _hudFontFileCacheSize;
GlyphInfo _glyphInfo[256];
size_t _glyphSize;
size_t _glyphTileSize;