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.1 by root, Sun Aug 15 00:37:04 2004 UTC vs.
Revision 1.34 by root, Wed Mar 31 22:46:40 2010 UTC

… …
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 7#endif
8 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 /* HAVE_XLOCALE */
17
18#ifdef HAVE_NL_LANGINFO
19# include <langinfo.h>
20#endif
21
22#include <inttypes.h> 9#include <inttypes.h>
23 10
24#include "rxvtlib.h"
25#include "feature.h" 11#include "feature.h"
26#include "encoding.h" 12#include "encoding.h"
27#include "rxvtutil.h" 13#include "rxvtutil.h"
14#include "rxvttoolkit.h"
28 15
16struct rxvt_term;
17
29struct rxvt_fontprop { 18struct rxvt_fontprop
19{
30 enum { 20 enum {
21 unset = -1,
31 medium = 100, bold = 200, 22 medium = 100, bold = 200,
32 roman = 0, italic = 100, 23 roman = 0, italic = 100,
33 }; 24 };
34 int width, height; 25 int width, height, ascent;
35 int weight, slant; 26 int weight, slant;
36}; 27};
37 28
38struct rxvt_drawable {
39 rxvt_display *display;
40 Drawable drawable;
41#if XFT
42 XftDraw *xftdrawable;
43 operator XftDraw *();
44#endif
45
46 rxvt_drawable (rxvt_display *display, Drawable drawable)
47 : display(display),
48#if XFT
49 xftdrawable(0),
50#endif
51 drawable(drawable)
52 { }
53
54#if XFT
55 ~rxvt_drawable ();
56#endif
57
58 operator Drawable() { return drawable; }
59};
60
61struct rxvt_font { 29struct rxvt_font
62 struct rxvt_fontset *fs; 30{
63 // managed by the fontset 31 // managed by the fontset
64 rxvt_t r; 32 rxvt_term *term;
65 void set_term (rxvt_t r) { this->r = r; } 33 void set_term (rxvt_term *term) { this->term = term; }
66 34
67 char *name; 35 char *name;
68 codeset cs; 36 codeset cs;
69 bool loaded; // wether we tried loading it before (not wether it's loaded) 37 bool loaded; // whether we tried loading it before (not whether it's loaded)
70 38
71 // managed by the font object 39 // managed by the font object
72 bool slow; // wether this is a proportional font or has other funny characteristics
73 int ascent, descent, 40 int ascent, descent,
74 width, height; 41 width, height;
75 42
76 void set_name (char *name) 43 void set_name (char *name_);
77 {
78 if (this->name) free (this->name); // let the compiler optimize
79 this->name = name;
80 }
81 44
82 rxvt_font () { name = 0; } 45 rxvt_font ();
83 ~rxvt_font () { free (name); }; 46 virtual ~rxvt_font () { free (name); };
84
85 void clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color);
86 47
87 virtual void clear () { }; 48 virtual void clear () { };
88 49
50 void clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const;
51
89 virtual rxvt_fontprop properties () = 0; 52 virtual rxvt_fontprop properties () = 0;
90 53
91 virtual bool load (const rxvt_fontprop &prop) = 0; 54 virtual bool load (const rxvt_fontprop &morph, bool force_prop) = 0;
92 virtual bool has_codepoint (uint32_t unicode) = 0; 55 virtual bool has_char (uint32_t unicode, const rxvt_fontprop *prop, bool &careful) const = 0;
93 56
94 virtual void draw (rxvt_drawable &d, 57 virtual void draw (rxvt_drawable &d,
95 int x, int y, 58 int x, int y,
96 const text_t *text, int len, 59 const text_t *text, int len,
97 int fg, int bg) = 0; 60 int fg, int bg) = 0;
… …
99 62
100#define FONT_UNREF(f) do { (f)->clear (); delete (f); } while (0) 63#define FONT_UNREF(f) do { (f)->clear (); delete (f); } while (0)
101 64
102struct rxvt_fallback_font; 65struct rxvt_fallback_font;
103 66
104struct rxvt_fontset { 67struct rxvt_fontset
68{
105 char *fontdesc; 69 char *fontdesc;
106 70
71 enum { fontCount = 3 }; // 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
73
107 rxvt_fontset (rxvt_t r); 74 rxvt_fontset (rxvt_term *term);
108 ~rxvt_fontset (); 75 ~rxvt_fontset ();
109 76
110 rxvt_font *new_font (const char *name, codeset cs); 77 bool populate (const char *desc);
78 void set_prop (const rxvt_fontprop &prop, bool force_prop) { this->prop = prop; this->force_prop = force_prop; }
79 int find_font_idx (uint32_t unicode);
80 int find_font (const char *name) const;
81 bool realize_font (int i);
111 82
112 bool populate (const char *desc);
113 int find_font (uint32_t unicode, bool bold = false);
114 int find_font (const char *name) const;
115
116 // font-id's MUST fit into a signed 16 bit integer.
117 rxvt_font *operator [] (int id) const 83 rxvt_font *operator [] (int id) const
118 { 84 {
119 return fonts[id]; 85 return fonts[id >> 1];
120 } 86 }
121 87
122 rxvt_font *base_font () const 88 int
89 find_font (unicode_t unicode)
123 { 90 {
124 return fonts[base_id]; 91 return min<int> ((fontCount << 1) | 1, find_font_idx (unicode));
125 } 92 }
126 93
127private: 94private:
128 rxvt_t r; 95 rxvt_term *term;
96 rxvt_fontprop prop;
97 bool force_prop;
129 simplevec<rxvt_font *> fonts; 98 simplevec<rxvt_font *> fonts;
130 const rxvt_fallback_font *fallback; 99 const rxvt_fallback_font *fallback;
131 100
132 rxvt_fontprop base_prop; 101 typedef unsigned char pagemap[256];
133 int base_id; 102 vector<pagemap *> fmap;
134 103
135 bool realize_font (int i); 104 void clear ();
105 rxvt_font *new_font (const char *name, codeset cs);
106 void prepare_font (rxvt_font *font, codeset cs);
136 void add_fonts (const char *desc); 107 void add_fonts (const char *desc);
137 void clear (); 108 void push_font (rxvt_font *font);
138}; 109};
139 110
140#endif /* _DEFAULTFONT_H_ */ 111#endif /* _DEFAULTFONT_H_ */
141 112

Diff Legend

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