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.36 by sf-exg, Sat Apr 17 23:00:45 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 () { };
… …
60 62
61#define FONT_UNREF(f) do { (f)->clear (); delete (f); } while (0) 63#define FONT_UNREF(f) do { (f)->clear (); delete (f); } while (0)
62 64
63struct rxvt_fallback_font; 65struct rxvt_fallback_font;
64 66
65struct rxvt_fontset { 67struct rxvt_fontset
68{
66 char *fontdesc; 69 char *fontdesc;
70
71 enum { fontCount = 7 }; // 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
67 73
68 rxvt_fontset (rxvt_term *term); 74 rxvt_fontset (rxvt_term *term);
69 ~rxvt_fontset (); 75 ~rxvt_fontset ();
70 76
71 bool populate (const char *desc); 77 bool populate (const char *desc);
72 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; }
73 int find_font (uint32_t unicode); 79 int find_font_idx (uint32_t unicode);
74 int find_font (const char *name) const; 80 int find_font (const char *name) const;
75 bool realize_font (int i); 81 bool realize_font (int i);
76 82
77 // font-id's MUST fit into a signed 16 bit integer, and within 0..255
78 rxvt_font *operator [] (int id) const 83 rxvt_font *operator [] (int id) const
79 { 84 {
80 return fonts[id & 0x7f]; 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));
81 } 92 }
82 93
83private: 94private:
84 rxvt_term *term; 95 rxvt_term *term;
85 rxvt_fontprop prop; 96 rxvt_fontprop prop;
… …
90 typedef unsigned char pagemap[256]; 101 typedef unsigned char pagemap[256];
91 vector<pagemap *> fmap; 102 vector<pagemap *> fmap;
92 103
93 void clear (); 104 void clear ();
94 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);
95 void add_fonts (const char *desc); 107 void add_fonts (const char *desc);
108 void push_font (rxvt_font *font);
96}; 109};
97 110
98#endif /* _DEFAULTFONT_H_ */ 111#endif /* _DEFAULTFONT_H_ */
99 112

Diff Legend

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