| … | |
… | |
| 71 | { |
71 | { |
| 72 | char *fontdesc; |
72 | char *fontdesc; |
| 73 | |
73 | |
| 74 | // must be power-of-two - 1, also has to match RS_fontMask in rxvt.h |
74 | // must be power-of-two - 1, also has to match RS_fontMask in rxvt.h |
| 75 | #if USE_256_COLORS |
75 | #if USE_256_COLORS |
| 76 | enum { fontCount = 7 }; // 4 extra colors bits, 4 fewer fontcount bits |
76 | enum { fontCount = 7 }; // 2 extra colors bits, 2 fewer fontcount bits |
| 77 | #else |
77 | #else |
| 78 | enum { fontCount = 127 }; |
78 | enum { fontCount = 31 }; |
| 79 | #endif |
79 | #endif |
| 80 | |
80 | |
| 81 | // index of first font in set |
81 | // index of first font in set |
| 82 | enum { firstFont = 2 }; |
82 | enum { firstFont = 2 }; |
| 83 | |
83 | |
| … | |
… | |
| 106 | rxvt_fontprop prop; |
106 | rxvt_fontprop prop; |
| 107 | bool force_prop; |
107 | bool force_prop; |
| 108 | simplevec<rxvt_font *> fonts; |
108 | simplevec<rxvt_font *> fonts; |
| 109 | const rxvt_fallback_font *fallback; |
109 | const rxvt_fallback_font *fallback; |
| 110 | |
110 | |
| 111 | typedef unsigned char pagemap[256]; |
111 | // this once was a "typedef xxx pagemap[256] |
|
|
112 | // but c++ arrays are not normal types, and cannot be |
|
|
113 | // put into containers, new doesn't work for them etc. etc. |
|
|
114 | // so we wrap out array into an object that acts like one. doh. |
|
|
115 | // example: C++ has no separate new and new [] forms, |
|
|
116 | // and if pagemap is char[256], new incorrectly assumes we want to |
|
|
117 | // allocate an array of chars instead of a single pagemap. |
|
|
118 | struct pagemap |
|
|
119 | { |
|
|
120 | unsigned char cppsucks[256]; |
|
|
121 | unsigned char &operator [](int i) { return cppsucks [i]; }; |
|
|
122 | }; |
| 112 | vector<pagemap *> fmap; |
123 | vector<pagemap *> fmap; |
| 113 | |
124 | |
| 114 | void clear (); |
125 | void clear (); |
| 115 | rxvt_font *new_font (const char *name, codeset cs); |
126 | rxvt_font *new_font (const char *name, codeset cs); |
| 116 | void prepare_font (rxvt_font *font, codeset cs); |
127 | void prepare_font (rxvt_font *font, codeset cs); |
