[ViewVC] Diff of: cvs/rxvt-unicode/src/rxvtfont.C

Comparing rxvt-unicode/src/rxvtfont.C (file contents):
Revision 1.46 by root, Wed Sep 8 05:45:30 2004 UTC vs.
Revision 1.48 by root, Sun Nov 21 20:19:24 2004 UTC

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

…		…
692	{	692	{
693	rxvt_fontprop p;	693	rxvt_fontprop p;
694	char fname[1024];	694	char fname[1024];
695		695
696	int diff = 0;	696	int diff = 0;
697		697
698	if (replace_field (fname, list[i], 6, '0', field_str))	698	if (replace_field (fname, list[i], 6, '0', field_str))
699	diff += 10; // slightly penalize scalable fonts	699	diff += 10; // slightly penalize scalable fonts
700		700
701	if (!set_properties (p, fname))	701	if (!set_properties (p, fname))
702	continue;	702	continue;
…		…
1056	return false;	1056	return false;
1057		1057
1058	FcValue v;	1058	FcValue v;
1059		1059
1060	if (prop.height != rxvt_fontprop::unset	1060	if (prop.height != rxvt_fontprop::unset
1061	&& FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch)	1061	\|\| FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch)
1062	FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);	1062	FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);
1063		1063
1064	if (prop.weight != rxvt_fontprop::unset	1064	if (prop.weight != rxvt_fontprop::unset
1065	&& FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch)	1065	&& FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch)
1066	FcPatternAddInteger (p, FC_WEIGHT, prop.weight);	1066	FcPatternAddInteger (p, FC_WEIGHT, prop.weight);