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.12 by root, Wed Aug 25 05:03:33 2004 UTC

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

Diff Legend

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