Rampoina/MegaGlest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- bugfix for finding fonts in windows

Browse Source
This commit is contained in:
Mark Vejvoda 2011-06-07 03:33:32 +00:00
parent 815c832b33
commit 875e0c2920
1 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
source/shared_lib/sources/graphics/gl/font_textFTGL.cpp
View File

@ -23,7 +23,9 @@
#include <fontconfig/fontconfig.h>
#endif
#include "util.h"
using namespace std;
using namespace Shared::Util;
namespace Shared{ namespace Graphics{ namespace Gl{
@ -160,23 +162,43 @@ float TextFTGL::LineHeight(const wchar_t* str, const int len) {
}
const char* TextFTGL::findFont(const char *firstFontToTry) {
struct stat statbuf;
const char* font = NULL;
const char* path = NULL;
#define CHECK_FONT_PATH(filename) \
{ \
path = filename; \
if( !font && path && 0 == stat(path, &statbuf) ) \
if( !font && path && fileExists(path) == true ) \
font = strdup(path); \
}
string tryFont = "";
if(firstFontToTry) {
CHECK_FONT_PATH(getenv(firstFontToTry))
tryFont = firstFontToTry;
#ifdef WIN32
replaceAll(tryFont, "/", "\\");
#endif
CHECK_FONT_PATH(tryFont.c_str())
}
// Get user-specified font path
CHECK_FONT_PATH(getenv("MEGAGLEST_FONT"))
if(getenv("MEGAGLEST_FONT") != NULL) {
tryFont = getenv("MEGAGLEST_FONT");
#ifdef WIN32
replaceAll(tryFont, "/", "\\");
#endif
CHECK_FONT_PATH(tryFont.c_str())
}
string data_path = Text::DEFAULT_FONT_PATH;
string defaultFont = data_path + "data/core/fonts/gothub__.ttf";
tryFont = defaultFont;
#ifdef WIN32
replaceAll(tryFont, "/", "\\");
#endif
CHECK_FONT_PATH(tryFont.c_str())
#ifdef FONT_PATH
// Get distro-specified font path
@ -219,9 +241,6 @@ const char* TextFTGL::findFont(const char *firstFontToTry) {
}
#endif
string data_path = Text::DEFAULT_FONT_PATH;
const string defaultFont = data_path + "data/core/fonts/gothub__.ttf";
CHECK_FONT_PATH("/usr/share/fonts/truetype/uralic/gothub__.ttf")
// Check a couple of common paths for Gothic Uralic/bold as a last resort