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.18 by root, Tue Jan 17 05:47:42 2006 UTC vs.
Revision 1.24 by ayin, Thu Oct 18 09:11:43 2007 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 /* HAVE_XLOCALE */
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"
… …
36 }; 23 };
37 int width, height, ascent; 24 int width, height, ascent;
38 int weight, slant; 25 int weight, slant;
39}; 26};
40 27
41struct rxvt_drawable {
42 rxvt_display *display;
43#if XFT
44 XftDraw *xftdrawable;
45 operator XftDraw *();
46#endif
47 Drawable drawable;
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};
63
64struct rxvt_font { 28struct rxvt_font {
65 // managed by the fontset 29 // managed by the fontset
66 rxvt_term *term; 30 rxvt_term *term;
67 void set_term (rxvt_term *term) { this->term = term; } 31 void set_term (rxvt_term *term) { this->term = term; }
68 32
… …
74 int ascent, descent, 38 int ascent, descent,
75 width, height; 39 width, height;
76 40
77 void set_name (char *name); 41 void set_name (char *name);
78 42
79 rxvt_font () { name = 0; } 43 rxvt_font ();
80 virtual ~rxvt_font () { free (name); }; 44 virtual ~rxvt_font () { free (name); };
81 45
82 virtual void clear () { }; 46 virtual void clear () { };
83 47
84 void clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const; 48 void clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const;
85 49
86 virtual rxvt_fontprop properties () = 0; 50 virtual rxvt_fontprop properties () = 0;
87 51
88 virtual bool load (const rxvt_fontprop &morph) = 0; 52 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) const = 0; 53 virtual bool has_char (uint32_t unicode, const rxvt_fontprop *prop, bool &careful) const = 0;
90 54
91 virtual void draw (rxvt_drawable &d, 55 virtual void draw (rxvt_drawable &d,
92 int x, int y, 56 int x, int y,
93 const text_t *text, int len, 57 const text_t *text, int len,
… …
103 67
104 rxvt_fontset (rxvt_term *term); 68 rxvt_fontset (rxvt_term *term);
105 ~rxvt_fontset (); 69 ~rxvt_fontset ();
106 70
107 bool populate (const char *desc); 71 bool populate (const char *desc);
108 void set_prop (const rxvt_fontprop &prop) { this->prop = prop; } 72 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); 73 int find_font (uint32_t unicode);
110 int find_font (const char *name) const; 74 int find_font (const char *name) const;
111 bool realize_font (int i); 75 bool realize_font (int i);
112 76
113 // font-id's MUST fit into a signed 16 bit integer, and within 0..255 77 // font-id's MUST fit into a signed 16 bit integer, and within 0..255
… …
117 } 81 }
118 82
119private: 83private:
120 rxvt_term *term; 84 rxvt_term *term;
121 rxvt_fontprop prop; 85 rxvt_fontprop prop;
86 bool force_prop;
122 simplevec<rxvt_font *> fonts; 87 simplevec<rxvt_font *> fonts;
123 const rxvt_fallback_font *fallback; 88 const rxvt_fallback_font *fallback;
124 89
125 typedef unsigned char pagemap[256]; 90 typedef unsigned char pagemap[256];
126 vector<pagemap *> fmap; 91 vector<pagemap *> fmap;

Diff Legend

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