Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-07-04 17:38:08 +03:00
Code Issues Actions 36 Packages Projects Releases Wiki Activity

SDL: -uifont now can also look up system font families like Windows [R. Belmont]

Browse Source
This commit is contained in:
R. Belmont 2010-11-13 02:51:23 +00:00
parent 2917a254c3
commit f75bcedd30
2 changed files with 116 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/osd/sdl/sdl.mak
View File

@ -345,8 +345,8 @@ CCOMFLAGS += -D_GNU_SOURCE=1
LIBS += -lm -L$(SDL_INSTALL_ROOT)/lib -Wl,-rpath,$(SDL_INSTALL_ROOT)/lib -lSDL LIBS += -lm -L$(SDL_INSTALL_ROOT)/lib -Wl,-rpath,$(SDL_INSTALL_ROOT)/lib -lSDL
endif endif
INCPATH += `pkg-config --cflags SDL_ttf` INCPATH += `pkg-config --cflags SDL_ttf fontconfig`
LIBS += `pkg-config --libs SDL_ttf` LIBS += `pkg-config --libs SDL_ttf fontconfig`
endif # Unix endif # Unix

114
src/osd/sdl/sdlmain.c
View File

@ -15,6 +15,7 @@
#ifdef SDLMAME_UNIX #ifdef SDLMAME_UNIX
#include <SDL_ttf.h> #include <SDL_ttf.h>
#include <fontconfig/fontconfig.h>
#endif #endif
// standard includes // standard includes
@ -289,6 +290,7 @@ int main(int argc, char *argv[])
{ {
printf("SDL_ttf failed: %s\n", TTF_GetError()); printf("SDL_ttf failed: %s\n", TTF_GetError());
} }
FcInit();
#endif #endif
#ifdef SDLMAME_OS2 #ifdef SDLMAME_OS2
@ -331,6 +333,7 @@ int main(int argc, char *argv[])
#ifdef SDLMAME_UNIX #ifdef SDLMAME_UNIX
TTF_Quit(); TTF_Quit();
FcFini();
#endif #endif
exit(res); exit(res);
@ -620,15 +623,21 @@ void sdl_osd_interface::init(running_machine &machine)
osd_font sdl_osd_interface::font_open(const char *_name, int &height) osd_font sdl_osd_interface::font_open(const char *_name, int &height)
{ {
TTF_Font *font; TTF_Font *font = (TTF_Font *)NULL;
int style = 0; int style = 0;
FcConfig *config;
FcPattern *pat;
FcObjectSet *os;
FcFontSet *fontset;
FcValue val;
bool bakedstyles = false;
// accept qualifiers from the name // accept qualifiers from the name
astring name(_name); astring name(_name);
if (name == "default") if (name == "default")
{ {
return NULL; name = "Liberation Sans";
} }
bool bold = (name.replace(0, "[B]", "") + name.replace(0, "[b]", "") > 0); bool bold = (name.replace(0, "[B]", "") + name.replace(0, "[b]", "") > 0);
@ -636,17 +645,116 @@ osd_font sdl_osd_interface::font_open(const char *_name, int &height)
bool underline = (name.replace(0, "[U]", "") + name.replace(0, "[u]", "") > 0); bool underline = (name.replace(0, "[U]", "") + name.replace(0, "[u]", "") > 0);
bool strike = (name.replace(0, "[S]", "") + name.replace(0, "[s]", "") > 0); bool strike = (name.replace(0, "[S]", "") + name.replace(0, "[s]", "") > 0);
// first up, try it as a filename
font = TTF_OpenFont(name.cstr(), 120); font = TTF_OpenFont(name.cstr(), 120);
// if that didn't work, crank up the FontConfig database
if (!font)
{
config = FcConfigGetCurrent();
pat = FcPatternCreate();
os = FcObjectSetCreate();
FcPatternAddString(pat, FC_FAMILY, (const FcChar8 *)name.cstr());
// try and get a font with the requested styles baked-in
if (bold)
{
if (italic)
{
FcPatternAddString(pat, FC_STYLE, (const FcChar8 *)"Bold Italic");
}
else
{
FcPatternAddString(pat, FC_STYLE, (const FcChar8 *)"Bold");
}
}
else if (italic)
{
FcPatternAddString(pat, FC_STYLE, (const FcChar8 *)"Italic");
}
else
{
FcPatternAddString(pat, FC_STYLE, (const FcChar8 *)"Regular");
}
FcPatternAddString(pat, FC_FONTFORMAT, (const FcChar8 *)"TrueType");
FcObjectSetAdd(os, FC_FILE);
fontset = FcFontList(config, pat, os);
for (int i = 0; i < fontset->nfont; i++)
{
if (FcPatternGet(fontset->fonts[i], FC_FILE, 0, &val) != FcResultMatch)
{
continue;
}
if (val.type != FcTypeString)
{
continue;
}
mame_printf_verbose("Matching font: %s\n", val.u.s);
font = TTF_OpenFont((const char*)val.u.s, 120);
if (font)
{
bakedstyles = true;
break;
}
}
// didn't get a font above? try again with no baked-in styles
if (!font)
{
FcPatternDestroy(pat);
FcFontSetDestroy(fontset);
pat = FcPatternCreate();
FcPatternAddString(pat, FC_FAMILY, (const FcChar8 *)name.cstr());
FcPatternAddString(pat, FC_STYLE, (const FcChar8 *)"Regular");
FcPatternAddString(pat, FC_FONTFORMAT, (const FcChar8 *)"TrueType");
fontset = FcFontList(config, pat, os);
for (int i = 0; i < fontset->nfont; i++)
{
if (FcPatternGet(fontset->fonts[i], FC_FILE, 0, &val) != FcResultMatch)
{
continue;
}
if (val.type != FcTypeString)
{
continue;
}
mame_printf_verbose("Matching unstyled font: %s\n", val.u.s);
font = TTF_OpenFont((const char*)val.u.s, 120);
if (font)
{
break;
}
}
}
FcPatternDestroy(pat);
FcObjectSetDestroy(os);
FcFontSetDestroy(fontset);
}
if (!font) if (!font)
{ {
printf("WARNING: Opening TrueType font %s failed, using MAME default\n", name.cstr()); printf("WARNING: Couldn't find/open TrueType font %s, using MAME default\n", name.cstr());
return NULL; return NULL;
} }
// apply styles // apply styles
if (!bakedstyles)
{
style |= bold ? TTF_STYLE_BOLD : 0; style |= bold ? TTF_STYLE_BOLD : 0;
style |= italic ? TTF_STYLE_ITALIC : 0; style |= italic ? TTF_STYLE_ITALIC : 0;
}
style |= underline ? TTF_STYLE_UNDERLINE : 0; style |= underline ? TTF_STYLE_UNDERLINE : 0;
style |= strike ? TTF_STYLE_STRIKETHROUGH : 0; style |= strike ? TTF_STYLE_STRIKETHROUGH : 0;
TTF_SetFontStyle(font, style); TTF_SetFontStyle(font, style);