expvintl/source-engine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix steam dick font loading

Browse Source
This commit is contained in:
nillerusr 2023-04-24 22:04:29 +00:00
parent f2fa241ae6
commit ba695d2092
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
vgui2/vgui_surfacelib/linuxfont.cpp
View File

@ -20,7 +20,9 @@
#include <tier0/dbg.h> #include <tier0/dbg.h>
#include <vgui/ISurface.h> #include <vgui/ISurface.h>
#include <utlbuffer.h> #include <utlbuffer.h>
#if HAVE_FC
#include <fontconfig/fontconfig.h> #include <fontconfig/fontconfig.h>
#endif
#include <freetype/ftbitmap.h> #include <freetype/ftbitmap.h>
#include "materialsystem/imaterialsystem.h" #include "materialsystem/imaterialsystem.h"
@ -462,10 +464,14 @@ char *TryFindFont(const char *winFontName, bool bBold, int italic)
return fontFile; return fontFile;
#else #else
// "platform/resource/linux_fonts/"; bool bRegularPostfix = false;
fontName = "dejavusans";
if( strcmp( winFontName, "Courier New") == 0 ) if( strcmp( winFontName, "Courier New") == 0 )
fontName = "liberationmono"; {
strncpy(fontFile, "platform/resource/linux_fonts/liberationmono-regular.ttf", sizeof(fontFile));
return fontFile;
}
if( bBold ) if( bBold )
{ {
@ -477,9 +483,13 @@ char *TryFindFont(const char *winFontName, bool bBold, int italic)
else if( italic ) else if( italic )
fontNamePost = "oblique"; fontNamePost = "oblique";
else else
fontNamePost = "regular"; fontNamePost = NULL;
if( fontNamePost )
snprintf(fontFile, sizeof fontFile, "platform/resource/linux_fonts/%s-%s.ttf", fontName, fontNamePost);
else
snprintf(fontFile, sizeof fontFile, "platform/resource/linux_fonts/%s.ttf", fontName );
snprintf(fontFile, sizeof fontFile, "platform/resource/linux_fonts/%s-%s.ttf", fontName, fontNamePost);
return fontFile; return fontFile;
#endif #endif
} }
@ -498,14 +508,14 @@ char *CLinuxFont::GetFontFileName( const char *windowsFontName, int flags )
else if ( !Q_stricmp( pchFontName, "Arial Black" ) || Q_stristr( pchFontName, "bold" ) ) else if ( !Q_stricmp( pchFontName, "Arial Black" ) || Q_stristr( pchFontName, "bold" ) )
bBold = true; bBold = true;
const int italic = ( flags & vgui::ISurface::FONTFLAG_ITALIC ) ? FC_SLANT_ITALIC : FC_SLANT_ROMAN;
#if !HAVE_FC #if !HAVE_FC
char *filename = TryFindFont( windowsFontName, bBold, italic ); char *filename = TryFindFont( windowsFontName, bBold, flags & vgui::ISurface::FONTFLAG_ITALIC );
Msg("Found font: %s\n", filename);
if( !filename ) return NULL; if( !filename ) return NULL;
Msg("Found font: %s\n", filename);
return strdup( filename ); return strdup( filename );
#else #else
const int italic = ( flags & vgui::ISurface::FONTFLAG_ITALIC ) ? FC_SLANT_ITALIC : FC_SLANT_ROMAN;
const int nFcWeight = bBold ? FC_WEIGHT_BOLD : FC_WEIGHT_NORMAL; const int nFcWeight = bBold ? FC_WEIGHT_BOLD : FC_WEIGHT_NORMAL;
FcPattern *match = FontMatch( FC_FAMILY, FcTypeString, pchFontName, FcPattern *match = FontMatch( FC_FAMILY, FcTypeString, pchFontName,
FC_WEIGHT, FcTypeInteger, nFcWeight, FC_WEIGHT, FcTypeInteger, nFcWeight,