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.39 by root, Sun May 23 00:12:02 2010 UTC vs.
Revision 1.45 by root, Thu Jun 17 11:01:57 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
72{ 72{
73 char *fontdesc; 73 char *fontdesc;
74 74
75 // 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
76#if USE_256_COLORS 76#if USE_256_COLORS
77 enum { fontCount = 7 }; // 4 extra colors bits, 4 fewer fontcount bits 77 enum { fontCount = 7 }; // 2 extra colors bits, 2 fewer fontcount bits
78#else 78#else
79 enum { fontCount = 127 }; 79 enum { fontCount = 31 };
80#endif 80#endif
81 81
82 // index of first font in set 82 // index of first font in set
83 enum { firstFont = 2 }; 83 enum { firstFont = 2 };
84 84
100 find_font (unicode_t unicode) 100 find_font (unicode_t unicode)
101 { 101 {
102 return min<int> ((fontCount << 1) | 1, find_font_idx (unicode)); 102 return min<int> ((fontCount << 1) | 1, find_font_idx (unicode));
103 } 103 }
104 104
105 // find the font containing ' ' - we always assume this is font 1, as
106 // every font should contain space, and font 1 is our base font.
107 // pango assumes this, so it must be correct!
108 int
109 find_space_font ()
110 {
111 return 1 << 1;
112 }
113
105private: 114private:
106 rxvt_term *term; 115 rxvt_term *term;
107 rxvt_fontprop prop; 116 rxvt_fontprop prop;
108 bool force_prop; 117 bool force_prop;
109 simplevec<rxvt_font *> fonts; 118 simplevec<rxvt_font *> fonts;
110 const rxvt_fallback_font *fallback; 119 const rxvt_fallback_font *fallback;
111 120
112 typedef unsigned char pagemap[256]; 121 // this once was a "typedef xxx pagemap[256]
122 // but c++ arrays are not normal types, and cannot be
123 // put into containers, new doesn't work for them etc. etc.
124 // so we wrap out array into an object that acts like one. doh.
125 // example: C++ has no separate new and new [] forms,
126 // and if pagemap is char[256], new incorrectly assumes we want to
127 // allocate an array of chars instead of a single pagemap.
128 struct pagemap
129 {
130 unsigned char cppsucks[256];
131 unsigned char &operator [](int i) { return cppsucks [i]; };
132 };
113 vector<pagemap *> fmap; 133 vector<pagemap *> fmap;
114 134
115 void clear (); 135 void clear ();
116 rxvt_font *new_font (const char *name, codeset cs); 136 rxvt_font *new_font (const char *name, codeset cs);
117 void prepare_font (rxvt_font *font, codeset cs); 137 void prepare_font (rxvt_font *font, codeset cs);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines