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.13 by root, Wed Aug 25 13:07:07 2004 UTC vs.
Revision 1.23 by ayin, Mon Jun 25 13:50:41 2007 UTC

… …
11# include <X11/Xlocale.h> 11# include <X11/Xlocale.h>
12#else 12#else
13# ifdef HAVE_SETLOCALE 13# ifdef HAVE_SETLOCALE
14# include <clocale> 14# include <clocale>
15# endif 15# endif
16#endif /* HAVE_XLOCALE */ 16#endif
17 17
18#ifdef HAVE_NL_LANGINFO 18#ifdef HAVE_NL_LANGINFO
19# include <langinfo.h> 19# include <langinfo.h>
20#endif 20#endif
21 21
… …
32 enum { 32 enum {
33 unset = -1, 33 unset = -1,
34 medium = 100, bold = 200, 34 medium = 100, bold = 200,
35 roman = 0, italic = 100, 35 roman = 0, italic = 100,
36 }; 36 };
37 int width, height; 37 int width, height, ascent;
38 int weight, slant; 38 int weight, slant;
39};
40
41struct rxvt_drawable {
42 rxvt_display *display;
43 Drawable drawable;
44#if XFT
45 XftDraw *xftdrawable;
46 operator XftDraw *();
47#endif
48
49 rxvt_drawable (rxvt_display *display, Drawable drawable)
50 : display(display),
51#if XFT
52 xftdrawable(0),
53#endif
54 drawable(drawable)
55 { }
56
57#if XFT
58 ~rxvt_drawable ();
59#endif
60
61 operator Drawable() { return drawable; }
62}; 39};
63 40
64struct rxvt_font { 41struct rxvt_font {
65 // managed by the fontset 42 // managed by the fontset
66 rxvt_term *r; 43 rxvt_term *term;
67 void set_term (rxvt_term *r) { this->r = r; } 44 void set_term (rxvt_term *term) { this->term = term; }
68 45
69 char *name; 46 char *name;
70 codeset cs; 47 codeset cs;
71 bool loaded; // wether we tried loading it before (not wether it's loaded) 48 bool loaded; // wether we tried loading it before (not wether it's loaded)
72 49
… …
74 int ascent, descent, 51 int ascent, descent,
75 width, height; 52 width, height;
76 53
77 void set_name (char *name); 54 void set_name (char *name);
78 55
79 rxvt_font () { name = 0; } 56 rxvt_font ();
80 virtual ~rxvt_font () { free (name); }; 57 virtual ~rxvt_font () { free (name); };
81 58
82 virtual void clear () { }; 59 virtual void clear () { };
83 60
84 void clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color); 61 void clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const;
85 62
86 virtual rxvt_fontprop properties () = 0; 63 virtual rxvt_fontprop properties () = 0;
87 64
88 virtual bool load (const rxvt_fontprop &morph) = 0; 65 virtual bool load (const rxvt_fontprop &morph, bool force_prop) = 0;
89 virtual bool has_char (uint32_t unicode, const rxvt_fontprop *prop, bool &careful) = 0; 66 virtual bool has_char (uint32_t unicode, const rxvt_fontprop *prop, bool &careful) const = 0;
90 67
91 virtual void draw (rxvt_drawable &d, 68 virtual void draw (rxvt_drawable &d,
92 int x, int y, 69 int x, int y,
93 const text_t *text, int len, 70 const text_t *text, int len,
94 int fg, int bg) = 0; 71 int fg, int bg) = 0;
… …
99struct rxvt_fallback_font; 76struct rxvt_fallback_font;
100 77
101struct rxvt_fontset { 78struct rxvt_fontset {
102 char *fontdesc; 79 char *fontdesc;
103 80
104 rxvt_fontset (rxvt_term *r); 81 rxvt_fontset (rxvt_term *term);
105 ~rxvt_fontset (); 82 ~rxvt_fontset ();
106 83
107 bool populate (const char *desc); 84 bool populate (const char *desc);
108 void set_prop (const rxvt_fontprop &prop) { this->prop = prop; } 85 void set_prop (const rxvt_fontprop &prop, bool force_prop) { this->prop = prop; this->force_prop = force_prop; }
109 int find_font (uint32_t unicode); 86 int find_font (uint32_t unicode);
110 int find_font (const char *name) const; 87 int find_font (const char *name) const;
111 bool realize_font (int i); 88 bool realize_font (int i);
112 89
113 // font-id's MUST fit into a signed 16 bit integer, and within 0..255 90 // font-id's MUST fit into a signed 16 bit integer, and within 0..255
… …
115 { 92 {
116 return fonts[id & 0x7f]; 93 return fonts[id & 0x7f];
117 } 94 }
118 95
119private: 96private:
120 rxvt_term *r; 97 rxvt_term *term;
121 rxvt_fontprop prop; 98 rxvt_fontprop prop;
99 bool force_prop;
122 simplevec<rxvt_font *> fonts; 100 simplevec<rxvt_font *> fonts;
123 const rxvt_fallback_font *fallback; 101 const rxvt_fallback_font *fallback;
124 102
125 typedef unsigned char pagemap[256]; 103 typedef unsigned char pagemap[256];
126 vector<pagemap *> fmap; 104 vector<pagemap *> fmap;

Diff Legend

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