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.28 by root, Tue Mar 30 23:00:35 2010 UTC

73 rxvt_fontset (rxvt_term *term); 73 rxvt_fontset (rxvt_term *term);
74 ~rxvt_fontset (); 74 ~rxvt_fontset ();
75 75
76 bool populate (const char *desc); 76 bool populate (const char *desc);
77 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 int find_font_ (uint32_t unicode); // same as find_font, but does not limit index
78 int find_font (uint32_t unicode); 79 int find_font (uint32_t unicode);
79 int find_font (const char *name) const; 80 int find_font (const char *name) const;
80 bool realize_font (int i); 81 bool realize_font (int i);
81 82
82 // font-id's MUST fit into a signed 16 bit integer, and within 0..255 83 // font-id's MUST fit into a signed 16 bit integer, and within 0..255
83 rxvt_font *operator [] (int id) const 84 rxvt_font *get (uint32_t unicode, int id = fontCount)
84 { 85 {
85 return fonts[id & fontCount]; 86 id &= fontCount;
87
88 return fonts[id == fontCount ? find_font_ (unicode) : id];
86 } 89 }
87 90
88private: 91private:
89 rxvt_term *term; 92 rxvt_term *term;
90 rxvt_fontprop prop; 93 rxvt_fontprop prop;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines