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.27 by root, Tue Mar 30 22:46:25 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 /* 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"
… …
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_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 { 29struct rxvt_font
30{
65 // managed by the fontset 31 // managed by the fontset
66 rxvt_term *term; 32 rxvt_term *term;
67 void set_term (rxvt_term *term) { this->term = term; } 33 void set_term (rxvt_term *term) { this->term = term; }
68 34
69 char *name; 35 char *name;
… …
72 38
73 // managed by the font object 39 // managed by the font object
74 int ascent, descent, 40 int ascent, descent,
75 width, height; 41 width, height;
76 42
77 void set_name (char *name); 43 void set_name (char *name_);
78 44
79 rxvt_font () { name = 0; } 45 rxvt_font ();
80 virtual ~rxvt_font () { free (name); }; 46 virtual ~rxvt_font () { free (name); };
81 47
82 virtual void clear () { }; 48 virtual void clear () { };
83 49
84 void clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const; 50 void clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const;
85 51
86 virtual rxvt_fontprop properties () = 0; 52 virtual rxvt_fontprop properties () = 0;
87 53
88 virtual bool load (const rxvt_fontprop &morph) = 0; 54 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; 55 virtual bool has_char (uint32_t unicode, const rxvt_fontprop *prop, bool &careful) const = 0;
90 56
91 virtual void draw (rxvt_drawable &d, 57 virtual void draw (rxvt_drawable &d,
92 int x, int y, 58 int x, int y,
93 const text_t *text, int len, 59 const text_t *text, int len,
… …
96 62
97#define FONT_UNREF(f) do { (f)->clear (); delete (f); } while (0) 63#define FONT_UNREF(f) do { (f)->clear (); delete (f); } while (0)
98 64
99struct rxvt_fallback_font; 65struct rxvt_fallback_font;
100 66
101struct rxvt_fontset { 67struct rxvt_fontset
68{
102 char *fontdesc; 69 char *fontdesc;
70
71 enum { fontCount = 127 }; // must be power-of-two - 1, also has to match RS_fontMask in rxvt.h
103 72
104 rxvt_fontset (rxvt_term *term); 73 rxvt_fontset (rxvt_term *term);
105 ~rxvt_fontset (); 74 ~rxvt_fontset ();
106 75
107 bool populate (const char *desc); 76 bool populate (const char *desc);
108 void set_prop (const rxvt_fontprop &prop) { this->prop = prop; } 77 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); 78 int find_font (uint32_t unicode);
110 int find_font (const char *name) const; 79 int find_font (const char *name) const;
111 bool realize_font (int i); 80 bool realize_font (int i);
112 81
113 // font-id's MUST fit into a signed 16 bit integer, and within 0..255 82 // font-id's MUST fit into a signed 16 bit integer, and within 0..255
114 rxvt_font *operator [] (int id) const 83 rxvt_font *operator [] (int id) const
115 { 84 {
116 return fonts[id & 0x7f]; 85 return fonts[id & fontCount];
117 } 86 }
118 87
119private: 88private:
120 rxvt_term *term; 89 rxvt_term *term;
121 rxvt_fontprop prop; 90 rxvt_fontprop prop;
91 bool force_prop;
122 simplevec<rxvt_font *> fonts; 92 simplevec<rxvt_font *> fonts;
123 const rxvt_fallback_font *fallback; 93 const rxvt_fallback_font *fallback;
124 94
125 typedef unsigned char pagemap[256]; 95 typedef unsigned char pagemap[256];
126 vector<pagemap *> fmap; 96 vector<pagemap *> fmap;

Diff Legend

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