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.35 by root, Wed Mar 31 23:01:51 2010 UTC vs.
Revision 1.44 by root, Thu Jun 17 00:49:20 2021 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;
33 void set_term (rxvt_term *term) { this->term = term; } 32 void set_term (rxvt_term *term) { this->term = term; }
34 33
35 char *name; 34 char *name;
36 codeset cs; 35 codeset cs;
37 bool loaded; // whether we tried loading it before (not whether it's loaded) 36 bool loaded; // whether we tried loading it before (not whether it's loaded)
37 bool can_compose; // whether the font composes glyphs itself or not, should be a class method, but.. speed....
38 38
39 // managed by the font object 39 // managed by the font object
40 int ascent, descent, 40 int ascent, descent,
41 width, height; 41 width, height;
42 42
56 56
57 virtual void draw (rxvt_drawable &d, 57 virtual void draw (rxvt_drawable &d,
58 int x, int y, 58 int x, int y,
59 const text_t *text, int len, 59 const text_t *text, int len,
60 int fg, int bg) = 0; 60 int fg, int bg) = 0;
61
62 void unref ()
63 {
64 clear ();
65 delete this;
66 }
61}; 67};
62
63#define FONT_UNREF(f) do { (f)->clear (); delete (f); } while (0)
64 68
65struct rxvt_fallback_font; 69struct rxvt_fallback_font;
66 70
67struct rxvt_fontset 71struct rxvt_fontset
68{ 72{
69 char *fontdesc; 73 char *fontdesc;
70 74
71 enum { fontCount = 15 }; // must be power-of-two - 1, also has to match RS_fontMask in rxvt.h 75 // 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 76#if USE_256_COLORS
77 enum { fontCount = 7 }; // 2 extra colors bits, 2 fewer fontcount bits
78#else
79 enum { fontCount = 31 };
80#endif
81
82 // index of first font in set
83 enum { firstFont = 2 };
73 84
74 rxvt_fontset (rxvt_term *term); 85 rxvt_fontset (rxvt_term *term);
75 ~rxvt_fontset (); 86 ~rxvt_fontset ();
76 87
77 bool populate (const char *desc); 88 bool populate (const char *desc);
96 rxvt_fontprop prop; 107 rxvt_fontprop prop;
97 bool force_prop; 108 bool force_prop;
98 simplevec<rxvt_font *> fonts; 109 simplevec<rxvt_font *> fonts;
99 const rxvt_fallback_font *fallback; 110 const rxvt_fallback_font *fallback;
100 111
101 typedef unsigned char pagemap[256]; 112 // this once was a "typedef xxx pagemap[256]
113 // but c++ arrays are not normal types, and cannot be
114 // put into containers, new doesn't work for them etc. etc.
115 // so we wrap out array into an object that acts like one. doh.
116 // example: C++ has no separate new and new [] forms,
117 // and if pagemap is char[256], new incorrectly assumes we want to
118 // allocate an array of chars instead of a single pagemap.
119 struct pagemap
120 {
121 unsigned char cppsucks[256];
122 unsigned char &operator [](int i) { return cppsucks [i]; };
123 };
102 vector<pagemap *> fmap; 124 vector<pagemap *> fmap;
103 125
104 void clear (); 126 void clear ();
105 rxvt_font *new_font (const char *name, codeset cs); 127 rxvt_font *new_font (const char *name, codeset cs);
106 void prepare_font (rxvt_font *font, codeset cs); 128 void prepare_font (rxvt_font *font, codeset cs);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines