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.17 by root, Tue Jan 3 23:40:58 2006 UTC vs.
Revision 1.18 by root, Tue Jan 17 05:47:42 2006 UTC

61 operator Drawable() { return drawable; } 61 operator Drawable() { return drawable; }
62}; 62};
63 63
64struct rxvt_font { 64struct rxvt_font {
65 // managed by the fontset 65 // managed by the fontset
66 rxvt_term *r; 66 rxvt_term *term;
67 void set_term (rxvt_term *r) { this->r = r; } 67 void set_term (rxvt_term *term) { this->term = term; }
68 68
69 char *name; 69 char *name;
70 codeset cs; 70 codeset cs;
71 bool loaded; // wether we tried loading it before (not wether it's loaded) 71 bool loaded; // wether we tried loading it before (not wether it's loaded)
72 72
79 rxvt_font () { name = 0; } 79 rxvt_font () { name = 0; }
80 virtual ~rxvt_font () { free (name); }; 80 virtual ~rxvt_font () { free (name); };
81 81
82 virtual void clear () { }; 82 virtual void clear () { };
83 83
84 void clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color); 84 void clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const;
85 85
86 virtual rxvt_fontprop properties () = 0; 86 virtual rxvt_fontprop properties () = 0;
87 87
88 virtual bool load (const rxvt_fontprop &morph) = 0; 88 virtual bool load (const rxvt_fontprop &morph) = 0;
89 virtual bool has_char (uint32_t unicode, const rxvt_fontprop *prop, bool &careful) = 0; 89 virtual bool has_char (uint32_t unicode, const rxvt_fontprop *prop, bool &careful) const = 0;
90 90
91 virtual void draw (rxvt_drawable &d, 91 virtual void draw (rxvt_drawable &d,
92 int x, int y, 92 int x, int y,
93 const text_t *text, int len, 93 const text_t *text, int len,
94 int fg, int bg) = 0; 94 int fg, int bg) = 0;
99struct rxvt_fallback_font; 99struct rxvt_fallback_font;
100 100
101struct rxvt_fontset { 101struct rxvt_fontset {
102 char *fontdesc; 102 char *fontdesc;
103 103
104 rxvt_fontset (rxvt_term *r); 104 rxvt_fontset (rxvt_term *term);
105 ~rxvt_fontset (); 105 ~rxvt_fontset ();
106 106
107 bool populate (const char *desc); 107 bool populate (const char *desc);
108 void set_prop (const rxvt_fontprop &prop) { this->prop = prop; } 108 void set_prop (const rxvt_fontprop &prop) { this->prop = prop; }
109 int find_font (uint32_t unicode); 109 int find_font (uint32_t unicode);
115 { 115 {
116 return fonts[id & 0x7f]; 116 return fonts[id & 0x7f];
117 } 117 }
118 118
119private: 119private:
120 rxvt_term *r; 120 rxvt_term *term;
121 rxvt_fontprop prop; 121 rxvt_fontprop prop;
122 simplevec<rxvt_font *> fonts; 122 simplevec<rxvt_font *> fonts;
123 const rxvt_fallback_font *fallback; 123 const rxvt_fallback_font *fallback;
124 124
125 typedef unsigned char pagemap[256]; 125 typedef unsigned char pagemap[256];

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines