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.26 by root, Sun Mar 29 13:36:03 2009 UTC vs.
Revision 1.39 by root, Sun May 23 00:12:02 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
… …
56 56
57 virtual void draw (rxvt_drawable &d, 57 virtual void draw (rxvt_drawable &d,
58 int x, int y, 58 int x, int y,
59 const text_t *text, int len, 59 const text_t *text, int len,
60 int fg, int bg) = 0; 60 int fg, int bg) = 0;
61
62 void unref ()
63 {
64 clear ();
65 delete this;
66 }
61}; 67};
62
63#define FONT_UNREF(f) do { (f)->clear (); delete (f); } while (0)
64 68
65struct rxvt_fallback_font; 69struct rxvt_fallback_font;
66 70
67struct rxvt_fontset 71struct rxvt_fontset
68{ 72{
69 char *fontdesc; 73 char *fontdesc;
70 74
75 // must be power-of-two - 1, also has to match RS_fontMask in rxvt.h
76#if USE_256_COLORS
77 enum { fontCount = 7 }; // 4 extra colors bits, 4 fewer fontcount bits
78#else
79 enum { fontCount = 127 };
80#endif
81
82 // index of first font in set
83 enum { firstFont = 2 };
84
71 rxvt_fontset (rxvt_term *term); 85 rxvt_fontset (rxvt_term *term);
72 ~rxvt_fontset (); 86 ~rxvt_fontset ();
73 87
74 bool populate (const char *desc); 88 bool populate (const char *desc);
75 void set_prop (const rxvt_fontprop &prop, bool force_prop) { this->prop = prop; this->force_prop = force_prop; } 89 void set_prop (const rxvt_fontprop &prop, bool force_prop) { this->prop = prop; this->force_prop = force_prop; }
76 int find_font (uint32_t unicode); 90 int find_font_idx (uint32_t unicode);
77 int find_font (const char *name) const; 91 int find_font (const char *name) const;
78 bool realize_font (int i); 92 bool realize_font (int i);
79 93
80 // font-id's MUST fit into a signed 16 bit integer, and within 0..255
81 rxvt_font *operator [] (int id) const 94 rxvt_font *operator [] (int id) const
82 { 95 {
83 return fonts[id & 0x7f]; 96 return fonts[id >> 1];
97 }
98
99 int
100 find_font (unicode_t unicode)
101 {
102 return min<int> ((fontCount << 1) | 1, find_font_idx (unicode));
84 } 103 }
85 104
86private: 105private:
87 rxvt_term *term; 106 rxvt_term *term;
88 rxvt_fontprop prop; 107 rxvt_fontprop prop;
… …
93 typedef unsigned char pagemap[256]; 112 typedef unsigned char pagemap[256];
94 vector<pagemap *> fmap; 113 vector<pagemap *> fmap;
95 114
96 void clear (); 115 void clear ();
97 rxvt_font *new_font (const char *name, codeset cs); 116 rxvt_font *new_font (const char *name, codeset cs);
117 void prepare_font (rxvt_font *font, codeset cs);
98 void add_fonts (const char *desc); 118 void add_fonts (const char *desc);
119 void push_font (rxvt_font *font);
99}; 120};
100 121
101#endif /* _DEFAULTFONT_H_ */ 122#endif /* _DEFAULTFONT_H_ */
102 123

Diff Legend

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