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.29 by root, Tue Mar 30 23:36:14 2010 UTC vs.
Revision 1.42 by sf-exg, Fri May 18 16:11:27 2012 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
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
75#if USE_256_COLORS
76 enum { fontCount = 7 }; // 4 extra colors bits, 4 fewer fontcount bits
77#else
72 enum { Careful = fontCount + 1 }; 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);
78 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; }
79 int find_font (uint32_t unicode); 89 int find_font_idx (uint32_t unicode);
80 int find_font (const char *name) const; 90 int find_font (const char *name) const;
81 bool realize_font (int i); 91 bool realize_font (int i);
82 92
83 // font-id's MUST fit into a signed 16 bit integer, and within 0..255 93 rxvt_font *operator [] (int id) const
84 rxvt_font *get (uint32_t unicode, int id = fontCount)
85 { 94 {
86 bool dummy; 95 return fonts[id >> 1];
96 }
87 97
88 id &= fontCount; 98 int
89 99 find_font (unicode_t unicode)
90 return fonts[id == fontCount ? find_font_idx (unicode, dummy) : id]; 100 {
101 return min<int> ((fontCount << 1) | 1, find_font_idx (unicode));
91 } 102 }
92 103
93private: 104private:
94 rxvt_term *term; 105 rxvt_term *term;
95 rxvt_fontprop prop; 106 rxvt_fontprop prop;
96 bool force_prop; 107 bool force_prop;
97 simplevec<rxvt_font *> fonts; 108 simplevec<rxvt_font *> fonts;
98 const rxvt_fallback_font *fallback; 109 const rxvt_fallback_font *fallback;
99 110
100 typedef unsigned char pagemap[256]; 111 // this once was a "typedef xxx pagemap[256]
112 // but c++ arrays are not normal types, and cannot be
113 // put into containers, new doesn't work for them etc. etc.
114 // so we wrap out array into an object that acts like one. doh.
115 // example: C++ has no separate new and new [] forms,
116 // and if pagemap is char[256], new incorrectly assumes we want to
117 // allocate an array of chars instead of a single pagemap.
118 struct pagemap
119 {
120 unsigned char cppsucks[256];
121 unsigned char &operator [](int i) { return cppsucks [i]; };
122 };
101 vector<pagemap *> fmap; 123 vector<pagemap *> fmap;
102 124
103 void clear (); 125 void clear ();
104 rxvt_font *new_font (const char *name, codeset cs); 126 rxvt_font *new_font (const char *name, codeset cs);
127 void prepare_font (rxvt_font *font, codeset cs);
105 void add_fonts (const char *desc); 128 void add_fonts (const char *desc);
106 int find_font_idx (uint32_t unicode, bool &careful); // same as find_font, but does not limit index 129 void push_font (rxvt_font *font);
107}; 130};
108 131
109#endif /* _DEFAULTFONT_H_ */ 132#endif /* _DEFAULTFONT_H_ */
110 133

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines