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.21 by root, Sat Feb 18 14:14:43 2006 UTC vs.
Revision 1.22 by root, Sun Aug 27 10:10:25 2006 UTC

60 60
61 void clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const; 61 void clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const;
62 62
63 virtual rxvt_fontprop properties () = 0; 63 virtual rxvt_fontprop properties () = 0;
64 64
65 virtual bool load (const rxvt_fontprop &morph) = 0; 65 virtual bool load (const rxvt_fontprop &morph, bool force_prop) = 0;
66 virtual bool has_char (uint32_t unicode, const rxvt_fontprop *prop, bool &careful) const = 0; 66 virtual bool has_char (uint32_t unicode, const rxvt_fontprop *prop, bool &careful) const = 0;
67 67
68 virtual void draw (rxvt_drawable &d, 68 virtual void draw (rxvt_drawable &d,
69 int x, int y, 69 int x, int y,
70 const text_t *text, int len, 70 const text_t *text, int len,
80 80
81 rxvt_fontset (rxvt_term *term); 81 rxvt_fontset (rxvt_term *term);
82 ~rxvt_fontset (); 82 ~rxvt_fontset ();
83 83
84 bool populate (const char *desc); 84 bool populate (const char *desc);
85 void set_prop (const rxvt_fontprop &prop) { this->prop = prop; } 85 void set_prop (const rxvt_fontprop &prop, bool force_prop) { this->prop = prop; this->force_prop = force_prop; }
86 int find_font (uint32_t unicode); 86 int find_font (uint32_t unicode);
87 int find_font (const char *name) const; 87 int find_font (const char *name) const;
88 bool realize_font (int i); 88 bool realize_font (int i);
89 89
90 // font-id's MUST fit into a signed 16 bit integer, and within 0..255 90 // font-id's MUST fit into a signed 16 bit integer, and within 0..255
94 } 94 }
95 95
96private: 96private:
97 rxvt_term *term; 97 rxvt_term *term;
98 rxvt_fontprop prop; 98 rxvt_fontprop prop;
99 bool force_prop;
99 simplevec<rxvt_font *> fonts; 100 simplevec<rxvt_font *> fonts;
100 const rxvt_fallback_font *fallback; 101 const rxvt_fallback_font *fallback;
101 102
102 typedef unsigned char pagemap[256]; 103 typedef unsigned char pagemap[256];
103 vector<pagemap *> fmap; 104 vector<pagemap *> fmap;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines