| … | |
… | |
| 832 | { |
832 | { |
| 833 | fontset[style] = fs = new rxvt_fontset (this); |
833 | fontset[style] = fs = new rxvt_fontset (this); |
| 834 | rxvt_fontprop prop2 = prop; |
834 | rxvt_fontprop prop2 = prop; |
| 835 | |
835 | |
| 836 | if (res) |
836 | if (res) |
| 837 | prop2.weight = prop2.slant = rxvt_fontprop::unset; |
837 | { |
|
|
838 | fs->populate (res); |
|
|
839 | fs->set_prop (prop2, false); |
|
|
840 | } |
| 838 | else |
841 | else |
| 839 | { |
842 | { |
| 840 | res = fontset[0]->fontdesc; |
843 | fs->populate (fontset[0]->fontdesc); |
| 841 | |
844 | |
| 842 | 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; |
| 843 | 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); |
| 844 | } |
849 | } |
| 845 | |
850 | |
| 846 | fs->populate (res); |
|
|
| 847 | fs->set_prop (prop2, true); |
|
|
| 848 | } |
851 | } |
| 849 | #else |
852 | #else |
| 850 | fontset[style] = fontset[0]; |
853 | fontset[style] = fontset[0]; |
| 851 | #endif |
854 | #endif |
| 852 | } |
855 | } |
