gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-19 12:28:22 +01:00
Code Issues Projects Releases Wiki Activity

use macros for property names

Browse Source
This commit is contained in:
kojima
2004-10-13 23:48:58 +00:00
parent 3ed1d3e25c
commit 2b51c21ee5
1 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
WINGs/wfont.c
View File

@@ -89,15 +89,15 @@ makeFontOfSize(char *font, int size, char *fallback)
//FcPatternPrint(pattern); //FcPatternPrint(pattern);
if (size > 0) { if (size > 0) {
FcPatternDel(pattern, "pixelsize"); FcPatternDel(pattern, FC_PIXEL_SIZE);
FcPatternAddDouble(pattern, "pixelsize", (double)size); FcPatternAddDouble(pattern, FC_PIXEL_SIZE, (double)size);
} else if (size==0 && !hasProperty(pattern, "size") && } else if (size==0 && !hasProperty(pattern, "size") &&
!hasProperty(pattern, "pixelsize")) { !hasProperty(pattern, FC_PIXEL_SIZE)) {
FcPatternAddDouble(pattern, "pixelsize", (double)DEFAULT_SIZE); FcPatternAddDouble(pattern, FC_PIXEL_SIZE, (double)DEFAULT_SIZE);
} }
if (fallback && !hasPropertyWithStringValue(pattern, "family", fallback)) { if (fallback && !hasPropertyWithStringValue(pattern, FC_FAMILY, fallback)) {
FcPatternAddString(pattern, "family", fallback); FcPatternAddString(pattern, FC_FAMILY, fallback);
} }
result = FcNameUnparse(pattern); result = FcNameUnparse(pattern);
@@ -348,27 +348,27 @@ WMCopyFontWithStyle(WMScreen *scrPtr, WMFont *font, WMFontStyle style)
pattern = FcNameParse(WMGetFontName(font)); pattern = FcNameParse(WMGetFontName(font));
switch (style) { switch (style) {
case WFSNormal: case WFSNormal:
FcPatternDel(pattern, "weight"); FcPatternDel(pattern, FC_WEIGHT);
FcPatternDel(pattern, "slant"); FcPatternDel(pattern, FC_SLANT);
FcPatternAddString(pattern, "weight", "regular"); FcPatternAddString(pattern, FC_WEIGHT, "regular");
FcPatternAddString(pattern, "weight", "medium"); FcPatternAddString(pattern, FC_WEIGHT, "medium");
FcPatternAddString(pattern, "slant", "roman"); FcPatternAddString(pattern, FC_SLANT, "roman");
break; break;
case WFSBold: case WFSBold:
FcPatternDel(pattern, "weight"); FcPatternDel(pattern, FC_WEIGHT);
FcPatternAddString(pattern, "weight", "bold"); FcPatternAddString(pattern, FC_WEIGHT, "bold");
break; break;
case WFSEmphasized: case WFSEmphasized:
FcPatternDel(pattern, "slant"); FcPatternDel(pattern, FC_SLANT);
FcPatternAddString(pattern, "slant", "italic"); FcPatternAddString(pattern, FC_SLANT, "italic");
FcPatternAddString(pattern, "slant", "oblique"); FcPatternAddString(pattern, FC_SLANT, "oblique");
break; break;
case WFSBoldEmphasized: case WFSBoldEmphasized:
FcPatternDel(pattern, "weight"); FcPatternDel(pattern, FC_WEIGHT);
FcPatternDel(pattern, "slant"); FcPatternDel(pattern, FC_SLANT);
FcPatternAddString(pattern, "weight", "bold"); FcPatternAddString(pattern, FC_WEIGHT, "bold");
FcPatternAddString(pattern, "slant", "italic"); FcPatternAddString(pattern, FC_SLANT, "italic");
FcPatternAddString(pattern, "slant", "oblique"); FcPatternAddString(pattern, FC_SLANT, "oblique");
break; break;
} }