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.36 by sf-exg, Sat Apr 17 23:00:45 2010 UTC vs.
Revision 1.46 by root, Thu Jun 17 19:37:28 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;
… …
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 = 7 }; // 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 }; // 2 extra colors bits, 2 fewer fontcount bits
77#else
78 enum { fontCount = 31 };
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);
… …
89 find_font (unicode_t unicode) 99 find_font (unicode_t unicode)
90 { 100 {
91 return min<int> ((fontCount << 1) | 1, find_font_idx (unicode)); 101 return min<int> ((fontCount << 1) | 1, find_font_idx (unicode));
92 } 102 }
93 103
104 // find the font containing ' ' - we always assume this is font 1, as
105 // every font should contain space, and font 1 is our base font.
106 // pango assumes this, so it must be correct!
107 int
108 find_space_font ()
109 {
110 return 1 << 1;
111 }
112
94private: 113private:
95 rxvt_term *term; 114 rxvt_term *term;
96 rxvt_fontprop prop; 115 rxvt_fontprop prop;
97 bool force_prop; 116 bool force_prop;
98 simplevec<rxvt_font *> fonts; 117 simplevec<rxvt_font *> fonts;
99 const rxvt_fallback_font *fallback; 118 const rxvt_fallback_font *fallback;
100 119
101 typedef unsigned char pagemap[256]; 120 // this once was a "typedef xxx pagemap[256]
121 // but c++ arrays are not normal types, and cannot be
122 // put into containers, new doesn't work for them etc. etc.
123 // so we wrap out array into an object that acts like one. doh.
124 // example: C++ has no separate new and new [] forms,
125 // and if pagemap is char[256], new incorrectly assumes we want to
126 // allocate an array of chars instead of a single pagemap.
127 struct pagemap
128 {
129 unsigned char cppsucks[256];
130 unsigned char &operator [](int i) { return cppsucks [i]; };
131 };
102 vector<pagemap *> fmap; 132 vector<pagemap *> fmap;
103 133
104 void clear (); 134 void clear ();
105 rxvt_font *new_font (const char *name, codeset cs); 135 rxvt_font *new_font (const char *name, codeset cs);
106 void prepare_font (rxvt_font *font, codeset cs); 136 void prepare_font (rxvt_font *font, codeset cs);

Diff Legend

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