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.24 by ayin, Thu Oct 18 09:11:43 2007 UTC vs.
Revision 1.39 by root, Sun May 23 00:12:02 2010 UTC

… …
13#include "rxvtutil.h" 13#include "rxvtutil.h"
14#include "rxvttoolkit.h" 14#include "rxvttoolkit.h"
15 15
16struct rxvt_term; 16struct rxvt_term;
17 17
18struct rxvt_fontprop { 18struct rxvt_fontprop
19{
19 enum { 20 enum {
20 unset = -1, 21 unset = -1,
21 medium = 100, bold = 200, 22 medium = 100, bold = 200,
22 roman = 0, italic = 100, 23 roman = 0, italic = 100,
23 }; 24 };
24 int width, height, ascent; 25 int width, height, ascent;
25 int weight, slant; 26 int weight, slant;
26}; 27};
27 28
28struct rxvt_font { 29struct rxvt_font
30{
29 // managed by the fontset 31 // managed by the fontset
30 rxvt_term *term; 32 rxvt_term *term;
31 void set_term (rxvt_term *term) { this->term = term; } 33 void set_term (rxvt_term *term) { this->term = term; }
32 34
33 char *name; 35 char *name;
34 codeset cs; 36 codeset cs;
35 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)
36 38
37 // managed by the font object 39 // managed by the font object
38 int ascent, descent, 40 int ascent, descent,
39 width, height; 41 width, height;
40 42
41 void set_name (char *name); 43 void set_name (char *name_);
42 44
43 rxvt_font (); 45 rxvt_font ();
44 virtual ~rxvt_font () { free (name); }; 46 virtual ~rxvt_font () { free (name); };
45 47
46 virtual void clear () { }; 48 virtual void clear () { };
… …
54 56
55 virtual void draw (rxvt_drawable &d, 57 virtual void draw (rxvt_drawable &d,
56 int x, int y, 58 int x, int y,
57 const text_t *text, int len, 59 const text_t *text, int len,
58 int fg, int bg) = 0; 60 int fg, int bg) = 0;
61
62 void unref ()
63 {
64 clear ();
65 delete this;
66 }
59}; 67};
60
61#define FONT_UNREF(f) do { (f)->clear (); delete (f); } while (0)
62 68
63struct rxvt_fallback_font; 69struct rxvt_fallback_font;
64 70
65struct rxvt_fontset { 71struct rxvt_fontset
72{
66 char *fontdesc; 73 char *fontdesc;
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 };
67 84
68 rxvt_fontset (rxvt_term *term); 85 rxvt_fontset (rxvt_term *term);
69 ~rxvt_fontset (); 86 ~rxvt_fontset ();
70 87
71 bool populate (const char *desc); 88 bool populate (const char *desc);
72 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; }
73 int find_font (uint32_t unicode); 90 int find_font_idx (uint32_t unicode);
74 int find_font (const char *name) const; 91 int find_font (const char *name) const;
75 bool realize_font (int i); 92 bool realize_font (int i);
76 93
77 // font-id's MUST fit into a signed 16 bit integer, and within 0..255
78 rxvt_font *operator [] (int id) const 94 rxvt_font *operator [] (int id) const
79 { 95 {
80 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));
81 } 103 }
82 104
83private: 105private:
84 rxvt_term *term; 106 rxvt_term *term;
85 rxvt_fontprop prop; 107 rxvt_fontprop prop;
… …
90 typedef unsigned char pagemap[256]; 112 typedef unsigned char pagemap[256];
91 vector<pagemap *> fmap; 113 vector<pagemap *> fmap;
92 114
93 void clear (); 115 void clear ();
94 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);
95 void add_fonts (const char *desc); 118 void add_fonts (const char *desc);
119 void push_font (rxvt_font *font);
96}; 120};
97 121
98#endif /* _DEFAULTFONT_H_ */ 122#endif /* _DEFAULTFONT_H_ */
99 123

Diff Legend

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