gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2026-02-09 10:05:49 +01:00
Code Issues Projects Releases Wiki Activity

- Simplified font conversion a bit, as fontconfig does the job of getting

Browse Source 
the closest match for us
- Removed wsetfont. No longer needed.
This commit is contained in:
dan
2004-10-22 23:19:37 +00:00
parent b034bb077f
commit 4bda625076
3 changed files with 7 additions and 733 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
WINGs/wfont.c
View File

@@ -362,36 +362,30 @@ WMCopyFontWithStyle(WMScreen *scrPtr, WMFont *font, WMFontStyle style)
if (!font)
return NULL;
/* It's enough to add italic to slant, even if the font has no italic
* variant, but only oblique. This is because fontconfig will actually
* return the closest match font to what we requested which is the
* oblique font. Same goes for using bold for weight.
*/
pattern = FcNameParse(WMGetFontName(font));
switch (style) {
case WFSNormal:
FcPatternDel(pattern, FC_WEIGHT);
FcPatternDel(pattern, FC_SLANT);
//FcPatternAddString(pattern, FC_WEIGHT, "medium");
//FcPatternAddString(pattern, FC_WEIGHT, "light");
//FcPatternAddString(pattern, FC_SLANT, "roman");
break;
case WFSBold:
FcPatternDel(pattern, FC_WEIGHT);
FcPatternAddString(pattern, FC_WEIGHT, "bold");
FcPatternAddString(pattern, FC_WEIGHT, "demibold");
FcPatternAddString(pattern, FC_WEIGHT, "black");
break;
case WFSItalic:
FcPatternDel(pattern, FC_SLANT);
FcPatternAddString(pattern, FC_SLANT, "italic");
FcPatternAddString(pattern, FC_SLANT, "oblique");
//FcPatternAddInteger(pattern, FC_SLANT, FC_SLANT_ITALIC);
//FcPatternAddInteger(pattern, FC_SLANT, FC_SLANT_OBLIQUE);
break;
case WFSBoldItalic:
FcPatternDel(pattern, FC_WEIGHT);
FcPatternDel(pattern, FC_SLANT);
FcPatternAddString(pattern, FC_WEIGHT, "bold");
FcPatternAddString(pattern, FC_WEIGHT, "demibold");
FcPatternAddString(pattern, FC_WEIGHT, "black");
FcPatternAddString(pattern, FC_SLANT, "italic");
FcPatternAddString(pattern, FC_SLANT, "oblique");
break;
}
@@ -403,5 +397,3 @@ WMCopyFontWithStyle(WMScreen *scrPtr, WMFont *font, WMFontStyle style)
return copy;
}