… | |
… | |
32 | rxvt_term *term; |
32 | rxvt_term *term; |
33 | void set_term (rxvt_term *term) { this->term = term; } |
33 | void set_term (rxvt_term *term) { this->term = term; } |
34 | |
34 | |
35 | char *name; |
35 | char *name; |
36 | codeset cs; |
36 | codeset cs; |
37 | bool loaded; // wether we tried loading it before (not wether it's loaded) |
37 | bool loaded; // whether we tried loading it before (not whether it's loaded) |
38 | |
38 | |
39 | // managed by the font object |
39 | // managed by the font object |
40 | int ascent, descent, |
40 | int ascent, descent, |
41 | width, height; |
41 | width, height; |
42 | |
42 | |
43 | void set_name (char *name); |
43 | void set_name (char *name_); |
44 | |
44 | |
45 | rxvt_font (); |
45 | rxvt_font (); |
46 | virtual ~rxvt_font () { free (name); }; |
46 | virtual ~rxvt_font () { free (name); }; |
47 | |
47 | |
48 | virtual void clear () { }; |
48 | virtual void clear () { }; |
… | |
… | |
66 | |
66 | |
67 | struct rxvt_fontset |
67 | struct rxvt_fontset |
68 | { |
68 | { |
69 | char *fontdesc; |
69 | char *fontdesc; |
70 | |
70 | |
|
|
71 | enum { fontCount = 127 }; // must be power-of-two - 1, also has to match RS_fontMask in rxvt.h |
|
|
72 | |
71 | rxvt_fontset (rxvt_term *term); |
73 | rxvt_fontset (rxvt_term *term); |
72 | ~rxvt_fontset (); |
74 | ~rxvt_fontset (); |
73 | |
75 | |
74 | bool populate (const char *desc); |
76 | bool populate (const char *desc); |
75 | void set_prop (const rxvt_fontprop &prop, bool force_prop) { this->prop = prop; this->force_prop = force_prop; } |
77 | void set_prop (const rxvt_fontprop &prop, bool force_prop) { this->prop = prop; this->force_prop = force_prop; } |
… | |
… | |
78 | bool realize_font (int i); |
80 | bool realize_font (int i); |
79 | |
81 | |
80 | // font-id's MUST fit into a signed 16 bit integer, and within 0..255 |
82 | // font-id's MUST fit into a signed 16 bit integer, and within 0..255 |
81 | rxvt_font *operator [] (int id) const |
83 | rxvt_font *operator [] (int id) const |
82 | { |
84 | { |
83 | return fonts[id & 0x7f]; |
85 | return fonts[id & fontCount]; |
84 | } |
86 | } |
85 | |
87 | |
86 | private: |
88 | private: |
87 | rxvt_term *term; |
89 | rxvt_term *term; |
88 | rxvt_fontprop prop; |
90 | rxvt_fontprop prop; |