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.30 by root, Tue Mar 30 23:54:30 2010 UTC vs.
Revision 1.34 by root, Wed Mar 31 22:46:40 2010 UTC

… …
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
… …
66 66
67struct rxvt_fontset 67struct 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 71 enum { fontCount = 3 }; // must be power-of-two - 1, also has to match RS_fontMask in rxvt.h
72 enum { firstFont = 2 }; // index of first font in set
72 73
73 rxvt_fontset (rxvt_term *term); 74 rxvt_fontset (rxvt_term *term);
74 ~rxvt_fontset (); 75 ~rxvt_fontset ();
75 76
76 bool populate (const char *desc); 77 bool populate (const char *desc);
77 void set_prop (const rxvt_fontprop &prop, bool force_prop) { this->prop = prop; this->force_prop = force_prop; } 78 void set_prop (const rxvt_fontprop &prop, bool force_prop) { this->prop = prop; this->force_prop = force_prop; }
78 int find_font (uint32_t unicode); 79 int find_font_idx (uint32_t unicode);
79 int find_font (const char *name) const; 80 int find_font (const char *name) const;
80 bool realize_font (int i); 81 bool realize_font (int i);
81 82
82 // font-id's MUST fit into a signed 16 bit integer, and within 0..255
83 rxvt_font *operator [] (int id) const 83 rxvt_font *operator [] (int id) const
84 { 84 {
85 return fonts[id & fontCount]; 85 return fonts[id >> 1];
86 }
87
88 int
89 find_font (unicode_t unicode)
90 {
91 return min<int> ((fontCount << 1) | 1, find_font_idx (unicode));
86 } 92 }
87 93
88private: 94private:
89 rxvt_term *term; 95 rxvt_term *term;
90 rxvt_fontprop prop; 96 rxvt_fontprop prop;
… …
95 typedef unsigned char pagemap[256]; 101 typedef unsigned char pagemap[256];
96 vector<pagemap *> fmap; 102 vector<pagemap *> fmap;
97 103
98 void clear (); 104 void clear ();
99 rxvt_font *new_font (const char *name, codeset cs); 105 rxvt_font *new_font (const char *name, codeset cs);
106 void prepare_font (rxvt_font *font, codeset cs);
100 void add_fonts (const char *desc); 107 void add_fonts (const char *desc);
108 void push_font (rxvt_font *font);
101}; 109};
102 110
103#endif /* _DEFAULTFONT_H_ */ 111#endif /* _DEFAULTFONT_H_ */
104 112

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines