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

Diff Legend

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