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.29 by root, Tue Mar 30 23:36:14 2010 UTC vs.
Revision 1.33 by root, Wed Mar 31 22:22:32 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 = 3 }; // must be power-of-two - 1, also has to match RS_fontMask in rxvt.h 71 enum { fontCount = 7 }; // must be power-of-two - 1, also has to match RS_fontMask in rxvt.h
72 enum { Careful = fontCount + 1 }; 72 enum { firstFont = 2 }; // index of first font in set
73 73
74 rxvt_fontset (rxvt_term *term); 74 rxvt_fontset (rxvt_term *term);
75 ~rxvt_fontset (); 75 ~rxvt_fontset ();
76 76
77 bool populate (const char *desc); 77 bool populate (const char *desc);
78 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; }
79 int find_font_idx (uint32_t unicode);
79 int find_font (uint32_t unicode); 80 int find_font (uint32_t unicode);
80 int find_font (const char *name) const; 81 int find_font (const char *name) const;
81 bool realize_font (int i); 82 bool realize_font (int i);
82 83
83 // font-id's MUST fit into a signed 16 bit integer, and within 0..255 84 // font-id's MUST fit into a signed 16 bit integer, and within 0..255
84 rxvt_font *get (uint32_t unicode, int id = fontCount) 85 rxvt_font *operator [] (int id) const
85 { 86 {
86 bool dummy; 87 return fonts[id >> 1];
87
88 id &= fontCount;
89
90 return fonts[id == fontCount ? find_font_idx (unicode, dummy) : id];
91 } 88 }
92 89
93private: 90private:
94 rxvt_term *term; 91 rxvt_term *term;
95 rxvt_fontprop prop; 92 rxvt_fontprop prop;
… …
101 vector<pagemap *> fmap; 98 vector<pagemap *> fmap;
102 99
103 void clear (); 100 void clear ();
104 rxvt_font *new_font (const char *name, codeset cs); 101 rxvt_font *new_font (const char *name, codeset cs);
105 void add_fonts (const char *desc); 102 void add_fonts (const char *desc);
106 int find_font_idx (uint32_t unicode, bool &careful); // same as find_font, but does not limit index
107}; 103};
108 104
109#endif /* _DEFAULTFONT_H_ */ 105#endif /* _DEFAULTFONT_H_ */
110 106

Diff Legend

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