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.25 by root, Wed Nov 5 14:43:54 2008 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;
… …
32 rxvt_term *term; 31 rxvt_term *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; // wether we tried loading it before (not wether it's loaded) 36 bool loaded; // whether we tried loading it before (not whether it's loaded)
38 37
39 // managed by the font object 38 // managed by the font object
40 int ascent, descent, 39 int ascent, descent,
41 width, height; 40 width, height;
42 41
43 void set_name (char *name); 42 void set_name (char *name_);
44 43
45 rxvt_font (); 44 rxvt_font ();
46 virtual ~rxvt_font () { free (name); }; 45 virtual ~rxvt_font () { free (name); };
47 46
48 virtual void clear () { }; 47 virtual void clear () { };
… …
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
74 // must be power-of-two - 1, also has to match RS_fontMask in rxvt.h
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 };
83
71 rxvt_fontset (rxvt_term *term); 84 rxvt_fontset (rxvt_term *term);
72 ~rxvt_fontset (); 85 ~rxvt_fontset ();
73 86
74 bool populate (const char *desc); 87 bool populate (const char *desc);
75 void set_prop (const rxvt_fontprop &prop, bool force_prop) { this->prop = prop; this->force_prop = force_prop; } 88 void set_prop (const rxvt_fontprop &prop, bool force_prop) { this->prop = prop; this->force_prop = force_prop; }
76 int find_font (uint32_t unicode); 89 int find_font_idx (uint32_t unicode);
77 int find_font (const char *name) const; 90 int find_font (const char *name) const;
78 bool realize_font (int i); 91 bool realize_font (int i);
79 92
80 // font-id's MUST fit into a signed 16 bit integer, and within 0..255
81 rxvt_font *operator [] (int id) const 93 rxvt_font *operator [] (int id) const
82 { 94 {
83 return fonts[id & 0x7f]; 95 return fonts[id >> 1];
96 }
97
98 int
99 find_font (unicode_t unicode)
100 {
101 return min<int> ((fontCount << 1) | 1, find_font_idx (unicode));
84 } 102 }
85 103
86private: 104private:
87 rxvt_term *term; 105 rxvt_term *term;
88 rxvt_fontprop prop; 106 rxvt_fontprop prop;
… …
93 typedef unsigned char pagemap[256]; 111 typedef unsigned char pagemap[256];
94 vector<pagemap *> fmap; 112 vector<pagemap *> fmap;
95 113
96 void clear (); 114 void clear ();
97 rxvt_font *new_font (const char *name, codeset cs); 115 rxvt_font *new_font (const char *name, codeset cs);
116 void prepare_font (rxvt_font *font, codeset cs);
98 void add_fonts (const char *desc); 117 void add_fonts (const char *desc);
118 void push_font (rxvt_font *font);
99}; 119};
100 120
101#endif /* _DEFAULTFONT_H_ */ 121#endif /* _DEFAULTFONT_H_ */
102 122

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines