--- rxvt-unicode/src/rxvtfont.h 2004/08/25 05:03:33 1.12 +++ rxvt-unicode/src/rxvtfont.h 2004/08/25 13:07:07 1.13 @@ -100,14 +100,12 @@ struct rxvt_fontset { char *fontdesc; - rxvt_fontprop prop; rxvt_fontset (rxvt_term *r); ~rxvt_fontset (); - rxvt_font *new_font (const char *name, codeset cs); - - bool populate (const char *desc, const rxvt_fontprop &prop); + bool populate (const char *desc); + void set_prop (const rxvt_fontprop &prop) { this->prop = prop; } int find_font (uint32_t unicode); int find_font (const char *name) const; bool realize_font (int i); @@ -120,14 +118,16 @@ private: rxvt_term *r; + rxvt_fontprop prop; simplevec fonts; const rxvt_fallback_font *fallback; typedef unsigned char pagemap[256]; vector fmap; - void add_fonts (const char *desc); void clear (); + rxvt_font *new_font (const char *name, codeset cs); + void add_fonts (const char *desc); }; #endif /* _DEFAULTFONT_H_ */