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.43 by sf-exg, Tue Jun 21 12:03:56 2016 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;
72{ 71{
73 char *fontdesc; 72 char *fontdesc;
74 73
75 // 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
76#if USE_256_COLORS 75#if USE_256_COLORS
77 enum { fontCount = 7 }; // 4 extra colors bits, 4 fewer fontcount bits 76 enum { fontCount = 7 }; // 2 extra colors bits, 2 fewer fontcount bits
78#else 77#else
79 enum { fontCount = 127 }; 78 enum { fontCount = 31 };
80#endif 79#endif
81 80
82 // index of first font in set 81 // index of first font in set
83 enum { firstFont = 2 }; 82 enum { firstFont = 2 };
84 83
107 rxvt_fontprop prop; 106 rxvt_fontprop prop;
108 bool force_prop; 107 bool force_prop;
109 simplevec<rxvt_font *> fonts; 108 simplevec<rxvt_font *> fonts;
110 const rxvt_fallback_font *fallback; 109 const rxvt_fallback_font *fallback;
111 110
112 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 };
113 vector<pagemap *> fmap; 123 vector<pagemap *> fmap;
114 124
115 void clear (); 125 void clear ();
116 rxvt_font *new_font (const char *name, codeset cs); 126 rxvt_font *new_font (const char *name, codeset cs);
117 void prepare_font (rxvt_font *font, codeset cs); 127 void prepare_font (rxvt_font *font, codeset cs);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines