… | |
… | |
812 | delete fontset[0]; |
812 | delete fontset[0]; |
813 | fontset[0] = fs; |
813 | fontset[0] = fs; |
814 | |
814 | |
815 | prop = (*fs)[1]->properties (); |
815 | prop = (*fs)[1]->properties (); |
816 | prop.height += lineSpace; |
816 | prop.height += lineSpace; |
|
|
817 | |
817 | fs->set_prop (prop); |
818 | fs->set_prop (prop, false); |
818 | |
819 | |
819 | fwidth = prop.width; |
820 | fwidth = prop.width; |
820 | fheight = prop.height; |
821 | fheight = prop.height; |
821 | fbase = prop.ascent; |
822 | fbase = prop.ascent; |
822 | |
823 | |
… | |
… | |
831 | { |
832 | { |
832 | fontset[style] = fs = new rxvt_fontset (this); |
833 | fontset[style] = fs = new rxvt_fontset (this); |
833 | rxvt_fontprop prop2 = prop; |
834 | rxvt_fontprop prop2 = prop; |
834 | |
835 | |
835 | if (res) |
836 | if (res) |
836 | prop2.weight = prop2.slant = rxvt_fontprop::unset; |
837 | { |
|
|
838 | fs->populate (res); |
|
|
839 | fs->set_prop (prop2, false); |
|
|
840 | } |
837 | else |
841 | else |
838 | { |
842 | { |
839 | res = fontset[0]->fontdesc; |
843 | fs->populate (fontset[0]->fontdesc); |
840 | |
844 | |
841 | if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; |
845 | if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; |
842 | if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic; |
846 | if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic; |
|
|
847 | |
|
|
848 | fs->set_prop (prop2, true); |
843 | } |
849 | } |
844 | |
850 | |
845 | fs->populate (res); |
|
|
846 | fs->set_prop (prop2); |
|
|
847 | } |
851 | } |
848 | #else |
852 | #else |
849 | fontset[style] = fontset[0]; |
853 | fontset[style] = fontset[0]; |
850 | #endif |
854 | #endif |
851 | } |
855 | } |