… | |
… | |
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 | |
… | |
… | |
99 | find_font (unicode_t unicode) |
100 | find_font (unicode_t unicode) |
100 | { |
101 | { |
101 | return min<int> ((fontCount << 1) | 1, find_font_idx (unicode)); |
102 | return min<int> ((fontCount << 1) | 1, find_font_idx (unicode)); |
102 | } |
103 | } |
103 | |
104 | |
|
|
105 | // find the font containing ' ' - we always assume this is font 1, as |
|
|
106 | // every font should contain space, and font 1 is our base font. |
|
|
107 | // pango assumes this, so it must be correct! |
|
|
108 | int |
|
|
109 | find_space_font () |
|
|
110 | { |
|
|
111 | return 1 << 1; |
|
|
112 | } |
|
|
113 | |
104 | private: |
114 | private: |
105 | rxvt_term *term; |
115 | rxvt_term *term; |
106 | rxvt_fontprop prop; |
116 | rxvt_fontprop prop; |
107 | bool force_prop; |
117 | bool force_prop; |
108 | simplevec<rxvt_font *> fonts; |
118 | simplevec<rxvt_font *> fonts; |
109 | const rxvt_fallback_font *fallback; |
119 | const rxvt_fallback_font *fallback; |
110 | |
120 | |
111 | typedef unsigned char pagemap[256]; |
121 | // this once was a "typedef xxx pagemap[256] |
|
|
122 | // but c++ arrays are not normal types, and cannot be |
|
|
123 | // put into containers, new doesn't work for them etc. etc. |
|
|
124 | // so we wrap out array into an object that acts like one. doh. |
|
|
125 | // example: C++ has no separate new and new [] forms, |
|
|
126 | // and if pagemap is char[256], new incorrectly assumes we want to |
|
|
127 | // allocate an array of chars instead of a single pagemap. |
|
|
128 | struct pagemap |
|
|
129 | { |
|
|
130 | unsigned char cppsucks[256]; |
|
|
131 | unsigned char &operator [](int i) { return cppsucks [i]; }; |
|
|
132 | }; |
112 | vector<pagemap *> fmap; |
133 | vector<pagemap *> fmap; |
113 | |
134 | |
114 | void clear (); |
135 | void clear (); |
115 | rxvt_font *new_font (const char *name, codeset cs); |
136 | rxvt_font *new_font (const char *name, codeset cs); |
116 | void prepare_font (rxvt_font *font, codeset cs); |
137 | void prepare_font (rxvt_font *font, codeset cs); |