… | |
… | |
32 | void set_term (rxvt_term *term) { this->term = term; } |
32 | void set_term (rxvt_term *term) { this->term = term; } |
33 | |
33 | |
34 | char *name; |
34 | char *name; |
35 | codeset cs; |
35 | codeset cs; |
36 | bool loaded; // whether we tried loading it before (not whether it's loaded) |
36 | bool loaded; // whether we tried loading it before (not whether it's loaded) |
|
|
37 | bool can_compose; // whether the font composes glyphs itself or not, should be a class method, but.. speed.... |
37 | |
38 | |
38 | // managed by the font object |
39 | // managed by the font object |
39 | int ascent, descent, |
40 | int ascent, descent, |
40 | width, height; |
41 | width, height; |
41 | |
42 | |
… | |
… | |
71 | { |
72 | { |
72 | char *fontdesc; |
73 | char *fontdesc; |
73 | |
74 | |
74 | // must be power-of-two - 1, also has to match RS_fontMask in rxvt.h |
75 | // must be power-of-two - 1, also has to match RS_fontMask in rxvt.h |
75 | #if USE_256_COLORS |
76 | #if USE_256_COLORS |
76 | enum { fontCount = 7 }; // 4 extra colors bits, 4 fewer fontcount bits |
77 | enum { fontCount = 7 }; // 2 extra colors bits, 2 fewer fontcount bits |
77 | #else |
78 | #else |
78 | enum { fontCount = 127 }; |
79 | enum { fontCount = 31 }; |
79 | #endif |
80 | #endif |
80 | |
81 | |
81 | // index of first font in set |
82 | // index of first font in set |
82 | enum { firstFont = 2 }; |
83 | enum { firstFont = 2 }; |
83 | |
84 | |
… | |
… | |
107 | bool force_prop; |
108 | bool force_prop; |
108 | simplevec<rxvt_font *> fonts; |
109 | simplevec<rxvt_font *> fonts; |
109 | const rxvt_fallback_font *fallback; |
110 | const rxvt_fallback_font *fallback; |
110 | |
111 | |
111 | // this once was a "typedef xxx pagemap[256] |
112 | // this once was a "typedef xxx pagemap[256] |
112 | // but c++ arrays are not normal types, and cnanot be |
113 | // but c++ arrays are not normal types, and cannot be |
113 | // put into containers, new doesn't work for them etc. etc. |
114 | // put into containers, new doesn't work for them etc. etc. |
114 | // so we wrap out array into an objetc that acts like one. doh. |
115 | // so we wrap out array into an object that acts like one. doh. |
115 | // example: C++ has no separate new and new [] forms, |
116 | // example: C++ has no separate new and new [] forms, |
116 | // and if pagemap is char[256], new incorrectly assumes we want to |
117 | // and if pagemap is char[256], new incorrectly assumes we want to |
117 | // allocate an array of chars instead of a single pagemap. |
118 | // allocate an array of chars instead of a single pagemap. |
118 | struct pagemap |
119 | struct pagemap |
119 | { |
120 | { |