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.25 by root, Wed Nov 5 14:43:54 2008 UTC vs.
Revision 1.27 by root, Tue Mar 30 22:46:25 2010 UTC

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
43 void set_name (char *name); 43 void set_name (char *name_);
44 44
45 rxvt_font (); 45 rxvt_font ();
46 virtual ~rxvt_font () { free (name); }; 46 virtual ~rxvt_font () { free (name); };
47 47
48 virtual void clear () { }; 48 virtual void clear () { };
66 66
67struct rxvt_fontset 67struct rxvt_fontset
68{ 68{
69 char *fontdesc; 69 char *fontdesc;
70 70
71 enum { fontCount = 127 }; // must be power-of-two - 1, also has to match RS_fontMask in rxvt.h
72
71 rxvt_fontset (rxvt_term *term); 73 rxvt_fontset (rxvt_term *term);
72 ~rxvt_fontset (); 74 ~rxvt_fontset ();
73 75
74 bool populate (const char *desc); 76 bool populate (const char *desc);
75 void set_prop (const rxvt_fontprop &prop, bool force_prop) { this->prop = prop; this->force_prop = force_prop; } 77 void set_prop (const rxvt_fontprop &prop, bool force_prop) { this->prop = prop; this->force_prop = force_prop; }
78 bool realize_font (int i); 80 bool realize_font (int i);
79 81
80 // font-id's MUST fit into a signed 16 bit integer, and within 0..255 82 // font-id's MUST fit into a signed 16 bit integer, and within 0..255
81 rxvt_font *operator [] (int id) const 83 rxvt_font *operator [] (int id) const
82 { 84 {
83 return fonts[id & 0x7f]; 85 return fonts[id & fontCount];
84 } 86 }
85 87
86private: 88private:
87 rxvt_term *term; 89 rxvt_term *term;
88 rxvt_fontprop prop; 90 rxvt_fontprop prop;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines