… | |
… | |
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 | }; |
39 | }; |
40 | |
40 | |
41 | struct rxvt_drawable { |
41 | struct rxvt_drawable { |
42 | rxvt_display *display; |
42 | rxvt_display *display; |
43 | Drawable drawable; |
|
|
44 | #if XFT |
43 | #if XFT |
45 | XftDraw *xftdrawable; |
44 | XftDraw *xftdrawable; |
46 | operator XftDraw *(); |
45 | operator XftDraw *(); |
47 | #endif |
46 | #endif |
|
|
47 | Drawable drawable; |
48 | |
48 | |
49 | rxvt_drawable (rxvt_display *display, Drawable drawable) |
49 | rxvt_drawable (rxvt_display *display, Drawable drawable) |
50 | : display(display), |
50 | : display(display), |
51 | #if XFT |
51 | #if XFT |
52 | xftdrawable(0), |
52 | xftdrawable(0), |
… | |
… | |
98 | |
98 | |
99 | struct rxvt_fallback_font; |
99 | struct rxvt_fallback_font; |
100 | |
100 | |
101 | struct rxvt_fontset { |
101 | struct rxvt_fontset { |
102 | char *fontdesc; |
102 | char *fontdesc; |
103 | rxvt_fontprop prop; |
|
|
104 | |
103 | |
105 | rxvt_fontset (rxvt_term *r); |
104 | rxvt_fontset (rxvt_term *r); |
106 | ~rxvt_fontset (); |
105 | ~rxvt_fontset (); |
107 | |
106 | |
108 | rxvt_font *new_font (const char *name, codeset cs); |
107 | bool populate (const char *desc); |
109 | |
108 | void set_prop (const rxvt_fontprop &prop) { this->prop = prop; } |
110 | bool populate (const char *desc, const rxvt_fontprop &prop); |
|
|
111 | int find_font (uint32_t unicode); |
109 | int find_font (uint32_t unicode); |
112 | int find_font (const char *name) const; |
110 | int find_font (const char *name) const; |
113 | bool realize_font (int i); |
111 | bool realize_font (int i); |
114 | |
112 | |
115 | // font-id's MUST fit into a signed 16 bit integer, and within 0..255 |
113 | // font-id's MUST fit into a signed 16 bit integer, and within 0..255 |
… | |
… | |
118 | return fonts[id & 0x7f]; |
116 | return fonts[id & 0x7f]; |
119 | } |
117 | } |
120 | |
118 | |
121 | private: |
119 | private: |
122 | rxvt_term *r; |
120 | rxvt_term *r; |
|
|
121 | rxvt_fontprop prop; |
123 | simplevec<rxvt_font *> fonts; |
122 | simplevec<rxvt_font *> fonts; |
124 | const rxvt_fallback_font *fallback; |
123 | const rxvt_fallback_font *fallback; |
125 | |
124 | |
126 | typedef unsigned char pagemap[256]; |
125 | typedef unsigned char pagemap[256]; |
127 | vector<pagemap *> fmap; |
126 | vector<pagemap *> fmap; |
128 | |
127 | |
|
|
128 | void clear (); |
|
|
129 | rxvt_font *new_font (const char *name, codeset cs); |
129 | void add_fonts (const char *desc); |
130 | void add_fonts (const char *desc); |
130 | void clear (); |
|
|
131 | }; |
131 | }; |
132 | |
132 | |
133 | #endif /* _DEFAULTFONT_H_ */ |
133 | #endif /* _DEFAULTFONT_H_ */ |
134 | |
134 | |