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.34 by root, Wed Mar 31 22:46:40 2010 UTC vs.
Revision 1.40 by sf-exg, Thu Jun 2 17:43:43 2011 UTC

6# include <X11/Xft/Xft.h> 6# include <X11/Xft/Xft.h>
7#endif 7#endif
8 8
9#include <inttypes.h> 9#include <inttypes.h>
10 10
11#include "feature.h"
12#include "encoding.h" 11#include "encoding.h"
13#include "rxvtutil.h" 12#include "rxvtutil.h"
14#include "rxvttoolkit.h" 13#include "rxvttoolkit.h"
15 14
16struct rxvt_term; 15struct rxvt_term;
56 55
57 virtual void draw (rxvt_drawable &d, 56 virtual void draw (rxvt_drawable &d,
58 int x, int y, 57 int x, int y,
59 const text_t *text, int len, 58 const text_t *text, int len,
60 int fg, int bg) = 0; 59 int fg, int bg) = 0;
60
61 void unref ()
62 {
63 clear ();
64 delete this;
65 }
61}; 66};
62
63#define FONT_UNREF(f) do { (f)->clear (); delete (f); } while (0)
64 67
65struct rxvt_fallback_font; 68struct rxvt_fallback_font;
66 69
67struct rxvt_fontset 70struct rxvt_fontset
68{ 71{
69 char *fontdesc; 72 char *fontdesc;
70 73
71 enum { fontCount = 3 }; // must be power-of-two - 1, also has to match RS_fontMask in rxvt.h 74 // must be power-of-two - 1, also has to match RS_fontMask in rxvt.h
72 enum { firstFont = 2 }; // index of first font in set 75#if USE_256_COLORS
76 enum { fontCount = 7 }; // 4 extra colors bits, 4 fewer fontcount bits
77#else
78 enum { fontCount = 127 };
79#endif
80
81 // index of first font in set
82 enum { firstFont = 2 };
73 83
74 rxvt_fontset (rxvt_term *term); 84 rxvt_fontset (rxvt_term *term);
75 ~rxvt_fontset (); 85 ~rxvt_fontset ();
76 86
77 bool populate (const char *desc); 87 bool populate (const char *desc);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines