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.23 by ayin, Mon Jun 25 13:50:41 2007 UTC vs.
Revision 1.29 by root, Tue Mar 30 23:36:14 2010 UTC

… …
2#define DEFAULTFONT_H_ 2#define DEFAULTFONT_H_
3 3
4#include <X11/Xlib.h> 4#include <X11/Xlib.h>
5#if XFT 5#if XFT
6# include <X11/Xft/Xft.h> 6# include <X11/Xft/Xft.h>
7#endif
8
9#ifdef HAVE_XSETLOCALE
10# define X_LOCALE
11# include <X11/Xlocale.h>
12#else
13# ifdef HAVE_SETLOCALE
14# include <clocale>
15# endif
16#endif
17
18#ifdef HAVE_NL_LANGINFO
19# include <langinfo.h>
20#endif 7#endif
21 8
22#include <inttypes.h> 9#include <inttypes.h>
23 10
24#include "feature.h" 11#include "feature.h"
… …
26#include "rxvtutil.h" 13#include "rxvtutil.h"
27#include "rxvttoolkit.h" 14#include "rxvttoolkit.h"
28 15
29struct rxvt_term; 16struct rxvt_term;
30 17
31struct rxvt_fontprop { 18struct rxvt_fontprop
19{
32 enum { 20 enum {
33 unset = -1, 21 unset = -1,
34 medium = 100, bold = 200, 22 medium = 100, bold = 200,
35 roman = 0, italic = 100, 23 roman = 0, italic = 100,
36 }; 24 };
37 int width, height, ascent; 25 int width, height, ascent;
38 int weight, slant; 26 int weight, slant;
39}; 27};
40 28
41struct rxvt_font { 29struct rxvt_font
30{
42 // managed by the fontset 31 // managed by the fontset
43 rxvt_term *term; 32 rxvt_term *term;
44 void set_term (rxvt_term *term) { this->term = term; } 33 void set_term (rxvt_term *term) { this->term = term; }
45 34
46 char *name; 35 char *name;
… …
49 38
50 // managed by the font object 39 // managed by the font object
51 int ascent, descent, 40 int ascent, descent,
52 width, height; 41 width, height;
53 42
54 void set_name (char *name); 43 void set_name (char *name_);
55 44
56 rxvt_font (); 45 rxvt_font ();
57 virtual ~rxvt_font () { free (name); }; 46 virtual ~rxvt_font () { free (name); };
58 47
59 virtual void clear () { }; 48 virtual void clear () { };
… …
73 62
74#define FONT_UNREF(f) do { (f)->clear (); delete (f); } while (0) 63#define FONT_UNREF(f) do { (f)->clear (); delete (f); } while (0)
75 64
76struct rxvt_fallback_font; 65struct rxvt_fallback_font;
77 66
78struct rxvt_fontset { 67struct rxvt_fontset
68{
79 char *fontdesc; 69 char *fontdesc;
70
71 enum { fontCount = 3 }; // must be power-of-two - 1, also has to match RS_fontMask in rxvt.h
72 enum { Careful = fontCount + 1 };
80 73
81 rxvt_fontset (rxvt_term *term); 74 rxvt_fontset (rxvt_term *term);
82 ~rxvt_fontset (); 75 ~rxvt_fontset ();
83 76
84 bool populate (const char *desc); 77 bool populate (const char *desc);
… …
86 int find_font (uint32_t unicode); 79 int find_font (uint32_t unicode);
87 int find_font (const char *name) const; 80 int find_font (const char *name) const;
88 bool realize_font (int i); 81 bool realize_font (int i);
89 82
90 // font-id's MUST fit into a signed 16 bit integer, and within 0..255 83 // font-id's MUST fit into a signed 16 bit integer, and within 0..255
91 rxvt_font *operator [] (int id) const 84 rxvt_font *get (uint32_t unicode, int id = fontCount)
92 { 85 {
93 return fonts[id & 0x7f]; 86 bool dummy;
87
88 id &= fontCount;
89
90 return fonts[id == fontCount ? find_font_idx (unicode, dummy) : id];
94 } 91 }
95 92
96private: 93private:
97 rxvt_term *term; 94 rxvt_term *term;
98 rxvt_fontprop prop; 95 rxvt_fontprop prop;
… …
104 vector<pagemap *> fmap; 101 vector<pagemap *> fmap;
105 102
106 void clear (); 103 void clear ();
107 rxvt_font *new_font (const char *name, codeset cs); 104 rxvt_font *new_font (const char *name, codeset cs);
108 void add_fonts (const char *desc); 105 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
109}; 107};
110 108
111#endif /* _DEFAULTFONT_H_ */ 109#endif /* _DEFAULTFONT_H_ */
112 110

Diff Legend

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