ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/rxvtfont.h
(Generate patch)

Comparing rxvt-unicode/src/rxvtfont.h (file contents):
Revision 1.40 by sf-exg, Thu Jun 2 17:43:43 2011 UTC vs.
Revision 1.46 by root, Thu Jun 17 19:37:28 2021 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines