ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/defaultfont.h
(Generate patch)

Comparing rxvt-unicode/src/defaultfont.h (file contents):
Revision 1.11 by pcg, Fri Feb 13 12:16:21 2004 UTC vs.
Revision 1.13 by pcg, Sun Feb 22 08:28:36 2004 UTC

47 if (this->name) free (this->name); // let the compiler optimize 47 if (this->name) free (this->name); // let the compiler optimize
48 this->name = name; 48 this->name = name;
49 } 49 }
50 50
51 rxvt_font () { name = 0; } 51 rxvt_font () { name = 0; }
52 ~rxvt_font () { clear (); free (name); }; 52 ~rxvt_font () { free (name); };
53 53
54 void clear_rect (int x, int y, int w, int h, int color); 54 void clear_rect (int x, int y, int w, int h, int color);
55 55
56 virtual void clear () { }; 56 virtual void clear () { };
57 57
63 virtual void draw (int x, int y, 63 virtual void draw (int x, int y,
64 const text_t *text, int len, 64 const text_t *text, int len,
65 int fg, int bg) = 0; 65 int fg, int bg) = 0;
66}; 66};
67 67
68//#define FONT_REF(obj) (obj)->refcnt++ 68#define FONT_UNREF(f) do { (f)->clear (); delete (f); } while (0)
69//#define FONT_UNREF(obj) if (!--(obj)->refcnt) delete (obj)
70#define FONT_UNREF(f) delete f
71 69
72struct rxvt_fallback_font; 70struct rxvt_fallback_font;
73 71
74struct rxvt_fontset { 72struct rxvt_fontset {
75 rxvt_fontset (rxvt_t r); 73 rxvt_fontset (rxvt_t r);
76 ~rxvt_fontset (); 74 ~rxvt_fontset ();
77 75
78 rxvt_font *new_font (const char *name, codeset cs); 76 rxvt_font *new_font (const char *name, codeset cs);
79 77
80 void populate (const char *desc); 78 bool populate (const char *desc);
81 int find_font (uint32_t unicode); 79 int find_font (uint32_t unicode);
82 80
83 rxvt_font *operator [] (int id) const 81 rxvt_font *operator [] (int id) const
84 { 82 {
85 return fonts[id]; 83 return fonts[id];

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines