1 | /*--------------------------------*-C-*---------------------------------* |
1 | /*----------------------------------------------------------------------* |
2 | * File: rxvtfont.C |
2 | * File: rxvtfont.C |
3 | *----------------------------------------------------------------------* |
3 | *----------------------------------------------------------------------* |
4 | * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> |
4 | * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> |
5 | * - original version. |
5 | * - original version. |
6 | * |
6 | * |
… | |
… | |
19 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
19 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
20 | *---------------------------------------------------------------------*/ |
20 | *---------------------------------------------------------------------*/ |
21 | |
21 | |
22 | #include "../config.h" |
22 | #include "../config.h" |
23 | #include "rxvt.h" |
23 | #include "rxvt.h" |
24 | #include "rxvtlib.h" |
|
|
25 | #include "rxvtutil.h" |
24 | #include "rxvtutil.h" |
26 | #include "rxvtfont.h" |
25 | #include "rxvtfont.h" |
27 | |
26 | |
28 | #include <cstdlib> |
27 | #include <cstdlib> |
29 | #include <wchar.h> |
28 | |
30 | #include <inttypes.h> |
29 | #include <inttypes.h> |
31 | |
30 | |
32 | #define MAX_OVERLAP_ROMAN (8 + 2) // max. character width in 8ths of the base width |
31 | #define MAX_OVERLAP_ROMAN (8 + 2) // max. character width in 8ths of the base width |
33 | #define MAX_OVERLAP_ITALIC (8 + 3) // max. overlap for italic fonts |
32 | #define MAX_OVERLAP_ITALIC (8 + 3) // max. overlap for italic fonts |
34 | |
33 | |
35 | #define OVERLAP_OK(w,prop) (w) > ( \ |
34 | #define OVERLAP_OK(w,wcw,prop) ((w) <= ( \ |
36 | prop->slant >= rxvt_fontprop::italic \ |
35 | (prop)->slant >= rxvt_fontprop::italic \ |
37 | ? (prop->width * MAX_OVERLAP_ITALIC + 7) >> 3 \ |
36 | ? ((prop)->width * (wcw) * MAX_OVERLAP_ITALIC + 7) >> 3 \ |
38 | : (prop->width * MAX_OVERLAP_ROMAN + 7) >> 3 \ |
37 | : ((prop)->width * (wcw) * MAX_OVERLAP_ROMAN + 7) >> 3 \ |
39 | ) |
38 | )) |
40 | |
39 | |
41 | const struct rxvt_fallback_font { |
40 | const struct rxvt_fallback_font { |
42 | codeset cs; |
41 | codeset cs; |
43 | const char *name; |
42 | const char *name; |
44 | } fallback_fonts[] = { |
43 | } fallback_fonts[] = { |
45 | { CS_ISO8859_1, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-1" }, |
44 | { CS_ISO8859_1, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-1" }, |
46 | { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-15" }, |
45 | { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-15" }, |
47 | { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-fcd8859-15" }, |
46 | { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-fcd8859-15" }, |
48 | |
47 | |
49 | #if ENCODING_EU |
48 | #if ENCODING_EU |
50 | // cyrillic |
49 | // cyrillic |
51 | { CS_KOI8_R, "-*-*-*-r-*--*-*-*-*-c-*-koi8-r" }, |
50 | { CS_KOI8_R, "-*-*-*-r-*--*-*-*-*-c-*-koi8-r" }, |
52 | { CS_KOI8_U, "-*-*-*-r-*--*-*-*-*-c-*-koi8-u" }, |
51 | { CS_KOI8_U, "-*-*-*-r-*--*-*-*-*-c-*-koi8-u" }, |
53 | |
52 | |
54 | { CS_ISO8859_2, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-2" }, |
53 | { CS_ISO8859_2, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-2" }, |
55 | { CS_ISO8859_3, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-3" }, |
54 | { CS_ISO8859_3, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-3" }, |
56 | { CS_ISO8859_4, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-4" }, |
55 | { CS_ISO8859_4, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-4" }, |
57 | { CS_ISO8859_5, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-5" }, |
56 | { CS_ISO8859_5, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-5" }, |
58 | { CS_ISO8859_6, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-6" }, |
57 | { CS_ISO8859_6, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-6" }, |
… | |
… | |
64 | { CS_ISO8859_13, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-13" }, |
63 | { CS_ISO8859_13, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-13" }, |
65 | { CS_ISO8859_14, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-14" }, |
64 | { CS_ISO8859_14, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-14" }, |
66 | { CS_ISO8859_16, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-16" }, |
65 | { CS_ISO8859_16, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-16" }, |
67 | |
66 | |
68 | # if XFT |
67 | # if XFT |
69 | { CS_KOI8_U, "xft::spacing=100:lang=ru:antialias=false" }, |
68 | { CS_KOI8_U, "xft::lang=ru" }, |
70 | |
69 | |
71 | { CS_ISO8859_5, "xft::spacing=100:lang=ru:antialias=false" }, |
70 | { CS_ISO8859_5, "xft::lang=ru" }, |
72 | { CS_ISO8859_6, "xft::spacing=100:lang=ar:antialias=false" }, |
71 | { CS_ISO8859_6, "xft::lang=ar" }, |
73 | { CS_ISO8859_7, "xft::spacing=100:lang=el:antialias=false" }, |
72 | { CS_ISO8859_7, "xft::lang=el" }, |
74 | { CS_ISO8859_8, "xft::spacing=100:lang=he:antialias=false" }, |
73 | { CS_ISO8859_8, "xft::lang=he" }, |
75 | { CS_ISO8859_9, "xft::spacing=100:lang=tr:antialias=false" }, |
74 | { CS_ISO8859_9, "xft::lang=tr" }, |
76 | { CS_ISO8859_10, "xft::spacing=100:lang=se:antialias=false" }, |
75 | { CS_ISO8859_10, "xft::lang=se" }, |
77 | { CS_ISO8859_11, "xft::spacing=100:lang=th:antialias=false" }, |
76 | { CS_ISO8859_11, "xft::lang=th" }, |
78 | # endif |
77 | # endif |
79 | #endif |
78 | #endif |
80 | |
79 | |
81 | // japanese |
80 | // japanese |
82 | #if ENCODING_JP || ENCODING_JP_EXT |
81 | #if ENCODING_JP || ENCODING_JP_EXT |
83 | # if XFT |
82 | # if XFT |
84 | // prefer xft for complex scripts |
83 | // prefer xft for complex scripts |
85 | { CS_JIS0208_1990_0, "xft:Kochi Gothic:antialias=false" }, |
84 | { CS_JIS0208_1990_0, "xft:Kochi Gothic:antialias=false" }, |
86 | { CS_JIS0208_1990_0, "xft:Sazanami Mincho:antialias=false" }, |
85 | { CS_JIS0208_1990_0, "xft:Sazanami Mincho:antialias=false" }, |
87 | { CS_JIS0208_1990_0, "xft:Mincho:antialias=false" }, |
86 | { CS_JIS0208_1990_0, "xft:Mincho:antialias=false" }, |
88 | { CS_JIS0208_1990_0, "xft::lang=ja:spacing=100:antialias=false" }, |
87 | { CS_JIS0208_1990_0, "xft::lang=ja:antialias=false" }, |
89 | # endif |
88 | # endif |
90 | { CS_JIS0201_1976_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0201*-0" }, |
89 | { CS_JIS0201_1976_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0201*-0" }, |
91 | { CS_JIS0208_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" }, |
90 | { CS_JIS0208_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" }, |
92 | { CS_JIS0212_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0212*-0" }, |
91 | { CS_JIS0212_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0212*-0" }, |
93 | { CS_JIS0201_1976_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0201*-0" }, |
92 | { CS_JIS0201_1976_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0201*-0" }, |
… | |
… | |
97 | |
96 | |
98 | #if ENCODING_ZH || ENCODING_ZH_EXT |
97 | #if ENCODING_ZH || ENCODING_ZH_EXT |
99 | # if XFT |
98 | # if XFT |
100 | { CS_GBK_0, "xft:AR PL KaitiM GB" }, |
99 | { CS_GBK_0, "xft:AR PL KaitiM GB" }, |
101 | { CS_GBK_0, "xft:AR PL SungtiL GB" }, |
100 | { CS_GBK_0, "xft:AR PL SungtiL GB" }, |
102 | { CS_GBK_0, "xft::spacing=100:lang=zh" }, |
101 | { CS_GBK_0, "xft::lang=zh" }, |
103 | { CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" }, |
102 | { CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" }, |
104 | { CS_BIG5_EXT, "xft:AR PL KaitiM Big5" }, |
103 | { CS_BIG5_EXT, "xft:AR PL KaitiM Big5" }, |
105 | { CS_GB2312_1980_0, "xft:AR PL KaitiM GB" }, |
104 | { CS_GB2312_1980_0, "xft:AR PL KaitiM GB" }, |
106 | { CS_GB2312_1980_0, "xft:AR PL SungtiL GB" }, |
105 | { CS_GB2312_1980_0, "xft:AR PL SungtiL GB" }, |
107 | { CS_GB2312_1980_0, "xft::spacing=100:lang=zh" }, |
106 | { CS_GB2312_1980_0, "xft::lang=zh" }, |
108 | # endif |
107 | # endif |
109 | { CS_GBK_0, "-*-*-*-*-*-*-*-*-*-*-c-*-gbk*-0" }, |
108 | { CS_GBK_0, "-*-*-*-*-*-*-*-*-*-*-c-*-gbk*-0" }, |
110 | { CS_BIG5, "-*-*-*-*-*-*-*-*-*-*-c-*-big5-0" }, |
109 | { CS_BIG5, "-*-*-*-*-*-*-*-*-*-*-c-*-big5-0" }, |
111 | { CS_BIG5_PLUS, "-*-*-*-*-*-*-*-*-*-*-c-*-big5p-0" }, |
110 | { CS_BIG5_PLUS, "-*-*-*-*-*-*-*-*-*-*-c-*-big5p-0" }, |
112 | { CS_BIG5_EXT, "-*-*-*-*-*-*-*-*-*-*-c-*-big5.eten-0" }, |
111 | { CS_BIG5_EXT, "-*-*-*-*-*-*-*-*-*-*-c-*-big5.eten-0" }, |
… | |
… | |
125 | #if ENCODING_KR |
124 | #if ENCODING_KR |
126 | { CS_KSC5601_1987_0, "-baekmuk-gulim-*-*-*-*-*-*-*-*-c-*-ksc5601*" }, |
125 | { CS_KSC5601_1987_0, "-baekmuk-gulim-*-*-*-*-*-*-*-*-c-*-ksc5601*" }, |
127 | { CS_KSC5601_1987_0, "-*-*-*-*-*-*-*-*-*-*-c-*-ksc5601*" }, |
126 | { CS_KSC5601_1987_0, "-*-*-*-*-*-*-*-*-*-*-c-*-ksc5601*" }, |
128 | # if XFT |
127 | # if XFT |
129 | { CS_KSC5601_1987_0, "xft:Baekmuk Gulim:antialias=false" }, |
128 | { CS_KSC5601_1987_0, "xft:Baekmuk Gulim:antialias=false" }, |
130 | { CS_KSC5601_1987_0, "xft::spacing=100:lang=ko:antialias=false" }, |
129 | { CS_KSC5601_1987_0, "xft::lang=ko:antialias=false" }, |
131 | # endif |
130 | # endif |
132 | #endif |
131 | #endif |
133 | |
132 | |
134 | // generic font fallback |
|
|
135 | { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" }, |
133 | { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" }, |
136 | { CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" }, |
134 | //{ CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" }, // this gem of a font has actual dotted circles within the combining character glyphs. |
137 | { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" }, |
|
|
138 | { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" }, |
|
|
139 | #if XFT |
135 | #if XFT |
140 | { CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true" }, |
136 | { CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true" }, |
141 | { CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" }, |
137 | { CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" }, |
142 | { CS_UNICODE, "xft:Andale Mono:antialias=false:autohint=false" }, |
138 | { CS_UNICODE, "xft:Andale Mono:antialias=false:autohint=false" }, |
143 | { CS_UNICODE, "xft:Arial Unicode MS:antialias=false:autohint=false" }, |
139 | { CS_UNICODE, "xft:Arial Unicode MS:antialias=false:autohint=false" }, |
144 | |
140 | |
145 | // FreeMono is usually uglier than x fonts, so try last only. |
141 | // FreeMono is usually uglier than x fonts, so try after the others |
146 | { CS_UNICODE, "xft:FreeMono:autohint=true" }, |
142 | { CS_UNICODE, "xft:FreeMono:autohint=true" }, |
147 | #endif |
143 | #endif |
148 | |
144 | |
|
|
145 | // generic font fallback, put this last, as many iso10646 fonts have extents |
|
|
146 | // specified for all glyphs in the range they cover, but most are simply empty |
|
|
147 | //{ CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" }, |
|
|
148 | //{ CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" }, |
149 | { CS_UNKNOWN, 0 } |
149 | { CS_UNKNOWN, 0 } |
150 | }; |
150 | }; |
151 | |
151 | |
152 | // these characters are used to guess the font height and width |
152 | // these characters are used to guess the font height and width |
153 | // pango uses a similar algorithm and doesn't trust the font either. |
153 | // pango uses a similar algorithm and doesn't trust the font either. |
… | |
… | |
157 | 0x304c, 0x672c, // が本 |
157 | 0x304c, 0x672c, // が本 |
158 | }; |
158 | }; |
159 | |
159 | |
160 | #define NUM_EXTENT_TEST_CHARS (sizeof (extent_test_chars) / sizeof (extent_test_chars[0])) |
160 | #define NUM_EXTENT_TEST_CHARS (sizeof (extent_test_chars) / sizeof (extent_test_chars[0])) |
161 | |
161 | |
162 | #define dTermDisplay Display *disp = term->display->display |
162 | #define dTermDisplay Display *disp = term->dpy |
163 | #define dTermGC GC gc = term->gc |
163 | #define dTermGC GC gc = term->gc |
164 | |
|
|
165 | ///////////////////////////////////////////////////////////////////////////// |
|
|
166 | |
|
|
167 | #if XFT |
|
|
168 | rxvt_drawable::~rxvt_drawable () |
|
|
169 | { |
|
|
170 | if (xftdrawable) |
|
|
171 | XftDrawDestroy (xftdrawable); |
|
|
172 | } |
|
|
173 | |
|
|
174 | rxvt_drawable::operator XftDraw *() |
|
|
175 | { |
|
|
176 | if (!xftdrawable) |
|
|
177 | xftdrawable = XftDrawCreate (screen->xdisp, drawable, screen->visual, screen->cmap); |
|
|
178 | |
|
|
179 | return xftdrawable; |
|
|
180 | } |
|
|
181 | #endif |
|
|
182 | |
164 | |
183 | ///////////////////////////////////////////////////////////////////////////// |
165 | ///////////////////////////////////////////////////////////////////////////// |
184 | |
166 | |
185 | static const char * |
167 | static const char * |
186 | enc_char (const text_t *text, uint32_t len, codeset cs, bool &zero) |
168 | enc_char (const text_t *text, uint32_t len, codeset cs, bool &zero) |
… | |
… | |
228 | return res; |
210 | return res; |
229 | } |
211 | } |
230 | |
212 | |
231 | ///////////////////////////////////////////////////////////////////////////// |
213 | ///////////////////////////////////////////////////////////////////////////// |
232 | |
214 | |
|
|
215 | rxvt_font::rxvt_font () |
|
|
216 | : name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset) |
|
|
217 | { |
|
|
218 | } |
|
|
219 | |
233 | void |
220 | void |
234 | rxvt_font::set_name (char *name) |
221 | rxvt_font::set_name (char *name) |
235 | { |
222 | { |
236 | if (this->name == name) |
223 | if (this->name == name) |
237 | return; |
224 | return; |
… | |
… | |
243 | void |
230 | void |
244 | rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const |
231 | rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const |
245 | { |
232 | { |
246 | dTermDisplay; |
233 | dTermDisplay; |
247 | dTermGC; |
234 | dTermGC; |
248 | |
235 | |
249 | if (color == Color_bg) |
236 | if (color == Color_bg || color == Color_transparent) |
250 | XClearArea (disp, d, x, y, w, h, FALSE); |
237 | XClearArea (disp, d, x, y, w, h, false); |
251 | else if (color >= 0) |
238 | else if (color >= 0) |
252 | { |
239 | { |
253 | #if XFT |
240 | #if XFT |
|
|
241 | bool done = false; |
|
|
242 | |
|
|
243 | # ifdef HAVE_BG_PIXMAP |
|
|
244 | if (term->bgPixmap.pixmap && color >= 0 && !term->pix_colors[color].is_opaque ()) |
|
|
245 | { |
|
|
246 | Picture dst = XftDrawPicture (d); |
|
|
247 | |
|
|
248 | if (dst != 0) |
|
|
249 | { |
|
|
250 | XClearArea (disp, d, x, y, w, h, false); |
|
|
251 | Picture solid_color_pict = XftDrawSrcPicture (d, &term->pix_colors[color].c); |
|
|
252 | XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, x, y, w, h); |
|
|
253 | done = true; |
|
|
254 | } |
|
|
255 | } |
|
|
256 | # endif |
|
|
257 | if (!done) |
254 | XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h); |
258 | XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h); |
|
|
259 | |
255 | #else |
260 | #else |
256 | XSetForeground (disp, gc, term->pix_colors[color]); |
261 | XSetForeground (disp, gc, term->pix_colors[color]); |
257 | XFillRectangle (disp, d, gc, x, y, w, h); |
262 | XFillRectangle (disp, d, gc, x, y, w, h); |
258 | #endif |
263 | #endif |
259 | } |
264 | } |
260 | } |
265 | } |
261 | |
266 | |
262 | #include "table/linedraw.h" |
267 | ///////////////////////////////////////////////////////////////////////////// |
263 | |
268 | |
264 | struct rxvt_font_default : rxvt_font { |
269 | struct rxvt_font_default : rxvt_font { |
265 | struct rxvt_fontset *fs; |
270 | struct rxvt_fontset *fs; |
266 | |
271 | |
267 | rxvt_font_default (rxvt_fontset *fs) |
272 | rxvt_font_default (rxvt_fontset *fs) |
… | |
… | |
280 | p.slant = rxvt_fontprop::roman; |
285 | p.slant = rxvt_fontprop::roman; |
281 | |
286 | |
282 | return p; |
287 | return p; |
283 | } |
288 | } |
284 | |
289 | |
285 | bool load (const rxvt_fontprop &prop) |
290 | bool load (const rxvt_fontprop &prop, bool force_prop) |
286 | { |
291 | { |
287 | width = 1; height = 1; |
292 | width = 1; height = 1; |
288 | ascent = 1; descent = 0; |
293 | ascent = 1; descent = 0; |
289 | |
294 | |
290 | set_name (strdup ("built-in support font")); |
295 | set_name (strdup ("built-in support font")); |
… | |
… | |
303 | return false; |
308 | return false; |
304 | |
309 | |
305 | if (unicode <= 0x009f) |
310 | if (unicode <= 0x009f) |
306 | return true; |
311 | return true; |
307 | |
312 | |
|
|
313 | #ifdef BUILTIN_GLYPHS |
308 | if (unicode >= 0x2500 && unicode <= 0x259f && |
314 | if (unicode >= 0x2500 && unicode <= 0x259f && |
309 | !term->option (Opt_skipBuiltinGlyphs)) |
315 | !term->option (Opt_skipBuiltinGlyphs)) |
310 | return true; |
316 | return true; |
|
|
317 | #endif |
311 | |
318 | |
312 | if (IS_COMPOSE (unicode)) |
319 | if (IS_COMPOSE (unicode)) |
313 | return true; |
320 | return true; |
314 | |
321 | |
315 | switch (unicode) |
322 | switch (unicode) |
… | |
… | |
351 | ; |
358 | ; |
352 | |
359 | |
353 | int width = text - tp; |
360 | int width = text - tp; |
354 | int fwidth = term->fwidth * width; |
361 | int fwidth = term->fwidth * width; |
355 | |
362 | |
|
|
363 | #ifdef BUILTIN_GLYPHS |
356 | if (0x2500 <= t && t <= 0x259f) |
364 | if (0x2500 <= t && t <= 0x259f) |
357 | { |
365 | { |
|
|
366 | # include "table/linedraw.h" |
358 | uint16_t offs = linedraw_offs[t - 0x2500]; |
367 | uint16_t offs = linedraw_offs[t - 0x2500]; |
359 | uint32_t *a = linedraw_command + (offs >> 4); |
368 | uint32_t *a = linedraw_command + (offs >> 4); |
360 | uint32_t *b = a + (offs & 15); |
369 | uint32_t *b = a + (offs & 15); |
361 | |
370 | |
362 | int W = fwidth; |
371 | int W = fwidth; |
… | |
… | |
400 | |
409 | |
401 | case 1: // rectangle, possibly stippled |
410 | case 1: // rectangle, possibly stippled |
402 | if (a) |
411 | if (a) |
403 | { |
412 | { |
404 | static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 }; |
413 | static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 }; |
405 | |
414 | |
406 | gcv.fill_style = FillStippled; |
415 | gcv.fill_style = FillStippled; |
407 | gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2); |
416 | gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2); |
408 | gcv.ts_x_origin = x; |
417 | gcv.ts_x_origin = x; |
409 | gcv.ts_y_origin = y; |
418 | gcv.ts_y_origin = y; |
410 | |
419 | |
… | |
… | |
429 | (a - 1) * 90*64, (b - 1) * 90*64); |
438 | (a - 1) * 90*64, (b - 1) * 90*64); |
430 | break; |
439 | break; |
431 | } |
440 | } |
432 | } |
441 | } |
433 | } |
442 | } |
|
|
443 | #else |
|
|
444 | if (0) |
|
|
445 | ; |
|
|
446 | #endif |
434 | #if ENABLE_COMBINING |
447 | #if ENABLE_COMBINING |
435 | else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) |
448 | else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) |
436 | { |
449 | { |
|
|
450 | min_it (width, 2); // we only support wcwidth up to 2 |
|
|
451 | |
437 | text_t chrs[2]; |
452 | text_t chrs[2]; |
438 | width = min (2, width); |
|
|
439 | chrs [1] = NOCHAR; |
453 | chrs [1] = NOCHAR; |
440 | |
454 | |
441 | *chrs = cc->c1; |
455 | *chrs = cc->c1; |
442 | rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)]; |
456 | rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)]; |
443 | f1->draw (d, x, y, chrs, width, fg, bg); |
457 | f1->draw (d, x, y, chrs, width, fg, bg); |
… | |
… | |
450 | *chrs = cc->c2; |
464 | *chrs = cc->c2; |
451 | rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful) |
465 | rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful) |
452 | ? f1 |
466 | ? f1 |
453 | : (*fs)[fs->find_font (cc->c2)]; |
467 | : (*fs)[fs->find_font (cc->c2)]; |
454 | |
468 | |
455 | f2->draw (d, x, y, chrs, width, fg, -1); |
469 | f2->draw (d, x, y, chrs, width, fg, Color_none); |
456 | } |
470 | } |
457 | } |
471 | } |
458 | #endif |
472 | #endif |
459 | else |
473 | else |
460 | switch (t) |
474 | switch (t) |
… | |
… | |
480 | |
494 | |
481 | void clear (); |
495 | void clear (); |
482 | |
496 | |
483 | rxvt_fontprop properties (); |
497 | rxvt_fontprop properties (); |
484 | |
498 | |
485 | bool load (const rxvt_fontprop &prop); |
499 | bool load (const rxvt_fontprop &prop, bool force_prop); |
486 | |
500 | |
487 | bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const; |
501 | bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const; |
488 | |
502 | |
489 | void draw (rxvt_drawable &d, int x, int y, |
503 | void draw (rxvt_drawable &d, int x, int y, |
490 | const text_t *text, int len, |
504 | const text_t *text, int len, |
491 | int fg, int bg); |
505 | int fg, int bg); |
492 | |
506 | |
493 | bool slow; // wether this is a proportional font or has other funny characteristics |
507 | bool slow; // wether this is a proportional font or has other funny characteristics |
494 | XFontStruct *f; |
508 | XFontStruct *f; |
495 | codeset cs; |
|
|
496 | bool enc2b, encm; |
509 | bool enc2b, encm; |
497 | |
510 | |
498 | char *get_property (XFontStruct *f, const char *property, const char *repl) const; |
511 | char *get_property (XFontStruct *f, Atom property, const char *repl) const; |
499 | bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth); |
512 | bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth); |
500 | bool set_properties (rxvt_fontprop &p, XFontStruct *f); |
513 | bool set_properties (rxvt_fontprop &p, XFontStruct *f); |
501 | bool set_properties (rxvt_fontprop &p, const char *name); |
514 | bool set_properties (rxvt_fontprop &p, const char *name); |
502 | }; |
515 | }; |
503 | |
516 | |
504 | char * |
517 | char * |
505 | rxvt_font_x11::get_property (XFontStruct *f, const char *property, const char *repl) const |
518 | rxvt_font_x11::get_property (XFontStruct *f, Atom property, const char *repl) const |
506 | { |
519 | { |
507 | unsigned long value; |
520 | unsigned long value; |
508 | |
521 | |
509 | if (XGetFontProperty (f, XInternAtom (term->display->display, property, 0), &value)) |
522 | if (XGetFontProperty (f, property, &value)) |
510 | return XGetAtomName (term->display->display, value); |
523 | return XGetAtomName (term->dpy, value); |
511 | else |
524 | else |
512 | return rxvt_strdup (repl); |
525 | return repl ? strdup (repl) : 0; |
513 | } |
526 | } |
514 | |
527 | |
515 | rxvt_fontprop |
528 | rxvt_fontprop |
516 | rxvt_font_x11::properties () |
529 | rxvt_font_x11::properties () |
517 | { |
530 | { |
… | |
… | |
521 | } |
534 | } |
522 | |
535 | |
523 | bool |
536 | bool |
524 | rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth) |
537 | rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth) |
525 | { |
538 | { |
526 | p.width = avgwidth ? (avgwidth + 1) / 10 : (height + 1) / 2; |
539 | p.width = width != rxvt_fontprop::unset ? width |
|
|
540 | : avgwidth ? (avgwidth + 1) / 10 |
|
|
541 | : (height + 1) / 2; |
527 | p.height = height; |
542 | p.height = height; |
528 | p.ascent = rxvt_fontprop::unset; |
543 | p.ascent = rxvt_fontprop::unset; |
529 | p.weight = *weight == 'B' || *weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium; |
544 | p.weight = *weight == 'B' || *weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium; |
530 | p.slant = *slant == 'r' || *slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic; |
545 | p.slant = *slant == 'r' || *slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic; |
531 | |
546 | |
… | |
… | |
536 | rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f) |
551 | rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f) |
537 | { |
552 | { |
538 | unsigned long height; |
553 | unsigned long height; |
539 | |
554 | |
540 | #if 0 |
555 | #if 0 |
541 | if (!XGetFontProperty (f, XInternAtom (term->display->display, "PIXEL_SIZE", 0), &height)) |
556 | if (!XGetFontProperty (f, XInternAtom (term->dpy, "PIXEL_SIZE", 0), &height)) |
542 | return false; |
557 | return false; |
543 | #else |
558 | #else |
544 | height = f->ascent + f->descent; |
559 | height = f->ascent + f->descent; |
545 | #endif |
560 | #endif |
546 | |
561 | |
547 | unsigned long avgwidth; |
562 | unsigned long avgwidth; |
548 | if (!XGetFontProperty (f, XInternAtom (term->display->display, "AVERAGE_WIDTH", 0), &avgwidth)) |
563 | if (!XGetFontProperty (f, term->xa [XA_AVERAGE_WIDTH], &avgwidth)) |
549 | avgwidth = 0; |
564 | avgwidth = 0; |
550 | |
565 | |
551 | char *weight = get_property (f, "WEIGHT_NAME", "medium"); |
566 | char *weight = get_property (f, term->xa [XA_WEIGHT_NAME], "medium"); |
552 | char *slant = get_property (f, "SLANT", "r"); |
567 | char *slant = get_property (f, term->xa [XA_SLANT], "r"); |
553 | |
568 | |
554 | set_properties (p, height, weight, slant, avgwidth); |
569 | set_properties (p, height, weight, slant, avgwidth); |
555 | |
570 | |
556 | free (weight); |
571 | free (weight); |
557 | free (slant); |
572 | free (slant); |
… | |
… | |
597 | return false; |
612 | return false; |
598 | } |
613 | } |
599 | |
614 | |
600 | // fix the size of scalable fonts |
615 | // fix the size of scalable fonts |
601 | static bool |
616 | static bool |
602 | replace_field (char *buf, const char *name, int index, const char old, const char *replace) |
617 | replace_field (char **ptr, const char *name, int index, const char old, const char *replace) |
603 | { |
618 | { |
604 | int slashes = 0; |
619 | int slashes = 0; |
605 | const char *field, *end; |
620 | const char *field, *end; |
606 | |
621 | |
607 | for (const char *c = name; *c; c++) |
622 | for (const char *c = name; *c; c++) |
… | |
… | |
617 | break; |
632 | break; |
618 | } |
633 | } |
619 | |
634 | |
620 | if (slashes >= 13 && (!old || *field == old)) |
635 | if (slashes >= 13 && (!old || *field == old)) |
621 | { |
636 | { |
622 | // TODO: check for overflow in font-name |
637 | size_t len = field - name; |
623 | strncpy (buf, name, field - name); |
638 | *ptr = (char *)malloc (len + strlen (replace) + strlen (end) + 1); |
624 | buf += field - name; |
639 | memcpy (*ptr, name, len); |
625 | strcpy (buf, replace); |
640 | strcpy (*ptr + len, replace); |
626 | strcat (buf, end); |
641 | strcat (*ptr, end); |
627 | |
642 | |
628 | return true; |
643 | return true; |
629 | } |
644 | } |
630 | else |
645 | else |
631 | { |
646 | { |
632 | strcpy (buf, name); |
647 | *ptr = strdup (name); |
633 | |
648 | |
634 | return false; |
649 | return false; |
635 | } |
650 | } |
636 | } |
651 | } |
637 | |
652 | |
638 | bool |
653 | bool |
639 | rxvt_font_x11::load (const rxvt_fontprop &prop) |
654 | rxvt_font_x11::load (const rxvt_fontprop &prop, bool force_prop) |
640 | { |
655 | { |
641 | dTermDisplay; |
656 | dTermDisplay; |
642 | |
657 | |
643 | clear (); |
658 | clear (); |
644 | |
659 | |
645 | char field_str[64]; // enough for 128 bits |
660 | char field_str[64]; // enough for 128 bits |
646 | |
661 | |
647 | // first morph the font if required |
662 | // first morph the font if required |
648 | if (prop.weight != rxvt_fontprop::unset |
663 | if (force_prop) |
649 | || prop.slant != rxvt_fontprop::unset) |
|
|
650 | { |
664 | { |
651 | char fname[1024]; |
665 | char *fname; |
652 | |
666 | |
653 | if (name[0] != '-') |
667 | if (name[0] != '-') |
654 | { |
668 | { |
655 | f = XLoadQueryFont (disp, name); |
669 | f = XLoadQueryFont (disp, name); |
656 | |
670 | |
657 | if (!f) |
671 | if (!f) |
658 | return false; |
672 | return false; |
659 | |
673 | |
660 | char *new_name = get_property (f, "FONT", name); |
674 | char *new_name = get_property (f, XA_FONT, name); |
661 | |
675 | |
662 | if (new_name) |
676 | if (new_name) |
663 | set_name (new_name); |
677 | set_name (new_name); |
664 | else |
678 | else |
665 | rxvt_warn ("font '%s' has no FONT property, continuing without.", name); |
679 | rxvt_warn ("font '%s' has no FONT property, continuing without.", name); |
… | |
… | |
668 | f = 0; |
682 | f = 0; |
669 | } |
683 | } |
670 | |
684 | |
671 | if (prop.weight != rxvt_fontprop::unset) |
685 | if (prop.weight != rxvt_fontprop::unset) |
672 | { |
686 | { |
673 | replace_field (fname, name, 2, 0, |
687 | replace_field (&fname, name, 2, 0, |
674 | prop.weight < rxvt_fontprop::bold |
688 | prop.weight < rxvt_fontprop::bold |
675 | ? "medium" : "bold"); |
689 | ? "medium" : "bold"); |
676 | set_name (strdup (fname)); |
690 | set_name (fname); |
677 | } |
691 | } |
678 | |
692 | |
679 | if (prop.slant != rxvt_fontprop::unset) |
693 | if (prop.slant != rxvt_fontprop::unset) |
680 | { |
694 | { |
681 | replace_field (fname, name, 3, 0, |
695 | replace_field (&fname, name, 3, 0, |
682 | prop.slant < rxvt_fontprop::italic |
696 | prop.slant < rxvt_fontprop::italic |
683 | ? "r" : "i"); // TODO: handle "o"blique, too |
697 | ? "r" : "i"); // TODO: handle "o"blique, too |
684 | set_name (strdup (fname)); |
698 | set_name (fname); |
685 | } |
699 | } |
686 | } |
700 | } |
687 | |
701 | |
688 | sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset |
702 | sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset |
689 | ? 0 : prop.height); |
703 | ? 0 : prop.height); |
… | |
… | |
714 | font_weight *fonts = new font_weight[count]; |
728 | font_weight *fonts = new font_weight[count]; |
715 | |
729 | |
716 | for (int i = 0; i < count; i++) |
730 | for (int i = 0; i < count; i++) |
717 | { |
731 | { |
718 | rxvt_fontprop p; |
732 | rxvt_fontprop p; |
719 | char fname[1024]; |
733 | char *fname; |
720 | |
734 | |
721 | int diff = 0; |
735 | int diff = 0; |
722 | |
736 | |
723 | if (replace_field (fname, list[i], 6, '0', field_str)) |
737 | if (replace_field (&fname, list[i], 6, '0', field_str)) |
724 | diff += 10; // slightly penalize scalable fonts |
738 | diff += 10; // slightly penalize scalable fonts |
|
|
739 | else |
|
|
740 | { |
|
|
741 | free (fname); |
725 | else if (replace_field (fname, list[i], 11, '0', "0")) |
742 | if (replace_field (&fname, list[i], 11, '0', "0")) |
726 | diff += 300; // more heavily penalize what looks like scaled bitmap fonts |
743 | diff += 300; // more heavily penalize what looks like scaled bitmap fonts |
|
|
744 | } |
727 | |
745 | |
728 | if (!set_properties (p, fname)) |
746 | if (!set_properties (p, fname)) |
729 | continue; |
747 | continue; |
730 | |
748 | |
731 | if (prop.height != rxvt_fontprop::unset |
749 | if (prop.height != rxvt_fontprop::unset |
… | |
… | |
735 | if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128; |
753 | if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128; |
736 | if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight); |
754 | if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight); |
737 | if (prop.slant != rxvt_fontprop::unset) diff += abs (prop.slant - p.slant); |
755 | if (prop.slant != rxvt_fontprop::unset) diff += abs (prop.slant - p.slant); |
738 | //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width); |
756 | //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width); |
739 | |
757 | |
740 | fonts[i].name = strdup (fname); |
758 | fonts[i].name = fname; |
741 | fonts[i].diff = diff; |
759 | fonts[i].diff = diff; |
742 | } |
760 | } |
743 | |
761 | |
744 | XFreeFontNames (list); |
762 | XFreeFontNames (list); |
745 | |
763 | |
… | |
… | |
774 | delete [] fonts; |
792 | delete [] fonts; |
775 | |
793 | |
776 | if (!f) |
794 | if (!f) |
777 | return false; |
795 | return false; |
778 | |
796 | |
779 | char *registry = get_property (f, "CHARSET_REGISTRY", 0); |
797 | char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0); |
780 | char *encoding = get_property (f, "CHARSET_ENCODING", 0); |
798 | char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0); |
781 | |
799 | |
782 | if (registry && encoding) |
800 | if (registry && encoding) |
783 | { |
801 | { |
784 | char charset[64]; |
802 | char charset[64]; |
785 | snprintf (charset, 64, "%s-%s", registry, encoding); |
803 | snprintf (charset, 64, "%s-%s", registry, encoding); |
786 | |
804 | |
787 | cs = codeset_from_name (charset); |
805 | cs = codeset_from_name (charset); |
788 | } |
806 | } |
789 | else |
807 | else |
790 | { |
808 | { |
791 | const char *charset = get_property (f, "FONT", 0); |
809 | const char *charset = get_property (f, XA_FONT, 0); |
792 | |
810 | |
793 | if (!charset) |
811 | if (!charset) |
794 | charset = name; |
812 | charset = name; |
795 | |
813 | |
796 | int count = 13; |
814 | int count = 13; |
… | |
… | |
811 | enc2b = encm || f->max_char_or_byte2 > 255; |
829 | enc2b = encm || f->max_char_or_byte2 > 255; |
812 | |
830 | |
813 | slow = false; |
831 | slow = false; |
814 | |
832 | |
815 | #if 1 // only used for slow detection, TODO optimize |
833 | #if 1 // only used for slow detection, TODO optimize |
816 | if (f->min_bounds.width == f->max_bounds.width) |
834 | if (f->min_bounds.width == f->max_bounds.width || !f->per_char) |
817 | width = f->min_bounds.width; |
|
|
818 | else if (f->per_char == NULL) |
|
|
819 | width = f->max_bounds.width; |
835 | width = f->max_bounds.width; |
820 | else |
836 | else |
821 | { |
837 | { |
822 | slow = true; |
838 | slow = true; |
823 | |
839 | |
824 | int N = f->max_char_or_byte2 - f->min_char_or_byte2; |
840 | int N = f->max_char_or_byte2 - f->min_char_or_byte2; |
825 | |
841 | |
826 | if (encm) |
842 | if (encm) |
827 | N += (f->max_byte1 - f->min_byte1) |
843 | N += (f->max_byte1 - f->min_byte1) |
828 | * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1); |
844 | * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1); |
829 | |
845 | |
830 | while (N) |
846 | while (N) |
831 | { |
847 | { |
832 | if (f->per_char[N].width > width) |
848 | if (f->per_char[N].width > width) |
833 | width = f->per_char[N].width; |
849 | width = f->per_char[N].width; |
834 | |
850 | |
… | |
… | |
839 | |
855 | |
840 | width = 1; |
856 | width = 1; |
841 | |
857 | |
842 | for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) |
858 | for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) |
843 | { |
859 | { |
844 | if (cs != CS_UNICODE |
|
|
845 | && *t > 0x100 |
|
|
846 | && FROM_UNICODE (cs, *t) == NOCHAR) |
860 | if (FROM_UNICODE (cs, *t) == NOCHAR) |
847 | continue; |
861 | continue; |
848 | |
862 | |
849 | // ignore characters we wouldn't use anyways |
863 | // ignore characters we wouldn't use anyways |
850 | bool careful; |
864 | bool careful; |
851 | if (!has_char (*t, &prop, careful)) |
865 | if (!has_char (*t, &prop, careful)) |
… | |
… | |
855 | |
869 | |
856 | XCharStruct g; |
870 | XCharStruct g; |
857 | int dir_ret, asc_ret, des_ret; |
871 | int dir_ret, asc_ret, des_ret; |
858 | XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); |
872 | XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); |
859 | |
873 | |
|
|
874 | int wcw = WCWIDTH (*t); |
860 | int wcw = WCWIDTH (*t); if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; |
875 | if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; |
861 | |
876 | |
862 | if (width < g.width) width = g.width; |
877 | if (width < g.width) width = g.width; |
863 | } |
878 | } |
864 | |
879 | |
865 | if (cs == CS_UNKNOWN) |
880 | if (cs == CS_UNKNOWN) |
866 | { |
881 | { |
867 | fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name); |
882 | fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name); |
… | |
… | |
884 | void |
899 | void |
885 | rxvt_font_x11::clear () |
900 | rxvt_font_x11::clear () |
886 | { |
901 | { |
887 | if (f) |
902 | if (f) |
888 | { |
903 | { |
889 | XFreeFont (term->display->display, f); |
904 | XFreeFont (term->dpy, f); |
890 | f = 0; |
905 | f = 0; |
891 | } |
906 | } |
892 | } |
907 | } |
893 | |
908 | |
894 | bool |
909 | bool |
… | |
… | |
937 | return false; |
952 | return false; |
938 | |
953 | |
939 | if (!prop || prop->width == rxvt_fontprop::unset) |
954 | if (!prop || prop->width == rxvt_fontprop::unset) |
940 | return true; |
955 | return true; |
941 | |
956 | |
942 | // check character against base font bounding box |
957 | // check wether character overlaps previous/next character |
943 | int w = xcs->rbearing - xcs->lbearing; |
958 | int w = xcs->rbearing - xcs->lbearing; |
944 | int wcw = WCWIDTH (unicode); |
959 | int wcw = max (WCWIDTH (unicode), 1); |
945 | if (wcw > 0) w = (w + wcw - 1) / wcw; |
|
|
946 | |
960 | |
947 | careful = w > prop->width; |
961 | careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw; |
|
|
962 | |
948 | if (careful && OVERLAP_OK (w, prop)) |
963 | if (careful && !OVERLAP_OK (w, wcw, prop)) |
949 | return false; |
964 | return false; |
950 | |
965 | |
951 | return true; |
966 | return true; |
952 | } |
967 | } |
953 | |
968 | |
… | |
… | |
987 | else |
1002 | else |
988 | { |
1003 | { |
989 | clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); |
1004 | clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); |
990 | |
1005 | |
991 | XChangeGC (disp, gc, GCForeground | GCFont, &v); |
1006 | XChangeGC (disp, gc, GCForeground | GCFont, &v); |
992 | |
1007 | |
993 | if (slow) |
1008 | if (slow) |
994 | { |
1009 | { |
995 | do |
1010 | do |
996 | { |
1011 | { |
997 | if (xc->byte1 || xc->byte2) |
1012 | if (xc->byte1 || xc->byte2) |
… | |
… | |
1019 | else |
1034 | else |
1020 | { |
1035 | { |
1021 | clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); |
1036 | clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); |
1022 | |
1037 | |
1023 | XChangeGC (disp, gc, GCForeground | GCFont, &v); |
1038 | XChangeGC (disp, gc, GCForeground | GCFont, &v); |
1024 | |
1039 | |
1025 | if (slow) |
1040 | if (slow) |
1026 | { |
1041 | { |
1027 | do |
1042 | do |
1028 | { |
1043 | { |
1029 | if (*xc) |
1044 | if (*xc) |
… | |
… | |
1049 | |
1064 | |
1050 | void clear (); |
1065 | void clear (); |
1051 | |
1066 | |
1052 | rxvt_fontprop properties (); |
1067 | rxvt_fontprop properties (); |
1053 | |
1068 | |
1054 | bool load (const rxvt_fontprop &prop); |
1069 | bool load (const rxvt_fontprop &prop, bool force_prop); |
1055 | |
1070 | |
1056 | void draw (rxvt_drawable &d, int x, int y, |
1071 | void draw (rxvt_drawable &d, int x, int y, |
1057 | const text_t *text, int len, |
1072 | const text_t *text, int len, |
1058 | int fg, int bg); |
1073 | int fg, int bg); |
1059 | |
1074 | |
1060 | bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &carefull) const; |
1075 | bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const; |
1061 | |
1076 | |
1062 | protected: |
1077 | protected: |
1063 | XftFont *f; |
1078 | XftFont *f; |
1064 | }; |
1079 | }; |
1065 | |
1080 | |
1066 | void |
1081 | void |
1067 | rxvt_font_xft::clear () |
1082 | rxvt_font_xft::clear () |
1068 | { |
1083 | { |
1069 | if (f) |
1084 | if (f) |
1070 | { |
1085 | { |
1071 | XftFontClose (term->display->display, f); |
1086 | XftFontClose (term->dpy, f); |
1072 | f = 0; |
1087 | f = 0; |
1073 | } |
1088 | } |
1074 | } |
1089 | } |
1075 | |
1090 | |
1076 | rxvt_fontprop |
1091 | rxvt_fontprop |
… | |
… | |
1092 | |
1107 | |
1093 | return p; |
1108 | return p; |
1094 | } |
1109 | } |
1095 | |
1110 | |
1096 | bool |
1111 | bool |
1097 | rxvt_font_xft::load (const rxvt_fontprop &prop) |
1112 | rxvt_font_xft::load (const rxvt_fontprop &prop, bool force_prop) |
1098 | { |
1113 | { |
1099 | dTermDisplay; |
1114 | dTermDisplay; |
1100 | |
1115 | |
1101 | clear (); |
1116 | clear (); |
1102 | |
1117 | |
… | |
… | |
1111 | && (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch |
1126 | && (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch |
1112 | && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch)) |
1127 | && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch)) |
1113 | FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height); |
1128 | FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height); |
1114 | |
1129 | |
1115 | if (prop.weight != rxvt_fontprop::unset |
1130 | if (prop.weight != rxvt_fontprop::unset |
1116 | && FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch) |
1131 | && (force_prop || FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch)) |
1117 | FcPatternAddInteger (p, FC_WEIGHT, prop.weight); |
1132 | FcPatternAddInteger (p, FC_WEIGHT, prop.weight); |
1118 | |
1133 | |
1119 | if (prop.slant != rxvt_fontprop::unset |
1134 | if (prop.slant != rxvt_fontprop::unset |
1120 | && FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch) |
1135 | && (force_prop || FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch)) |
1121 | FcPatternAddInteger (p, FC_SLANT, prop.slant); |
1136 | FcPatternAddInteger (p, FC_SLANT, prop.slant); |
1122 | |
1137 | |
1123 | #if 0 // clipping unfortunately destroys our precious double-width-characters |
1138 | #if 0 // clipping unfortunately destroys our precious double-width-characters |
1124 | // clip width, we can't do better, or can we? |
1139 | // clip width, we can't do better, or can we? |
1125 | if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) |
1140 | if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) |
… | |
… | |
1243 | bool |
1258 | bool |
1244 | rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const |
1259 | rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const |
1245 | { |
1260 | { |
1246 | careful = false; |
1261 | careful = false; |
1247 | |
1262 | |
1248 | if (!XftCharExists (term->display->display, f, unicode)) |
1263 | if (!XftCharExists (term->dpy, f, unicode)) |
1249 | return false; |
1264 | return false; |
1250 | |
1265 | |
1251 | if (!prop || prop->width == rxvt_fontprop::unset) |
1266 | if (!prop || prop->width == rxvt_fontprop::unset) |
1252 | return true; |
1267 | return true; |
1253 | |
1268 | |
1254 | // check character against base font bounding box |
1269 | // check character against base font bounding box |
1255 | FcChar32 ch = unicode; |
1270 | FcChar32 ch = unicode; |
1256 | XGlyphInfo g; |
1271 | XGlyphInfo g; |
1257 | XftTextExtents32 (term->display->display, f, &ch, 1, &g); |
1272 | XftTextExtents32 (term->dpy, f, &ch, 1, &g); |
1258 | |
1273 | |
1259 | int w = g.width - g.x; |
1274 | int w = g.width - g.x; |
1260 | int wcw = WCWIDTH (unicode); |
1275 | int wcw = max (WCWIDTH (unicode), 1); |
1261 | if (wcw > 0) w = (w + wcw - 1) / wcw; |
|
|
1262 | |
1276 | |
1263 | careful = w > prop->width; |
1277 | careful = g.x > 0 || w > prop->width * wcw; |
|
|
1278 | |
1264 | if (careful && OVERLAP_OK (w, prop)) |
1279 | if (careful && !OVERLAP_OK (w, wcw, prop)) |
|
|
1280 | return false; |
|
|
1281 | |
|
|
1282 | // this weeds out _totally_ broken fonts, or glyphs |
|
|
1283 | if (!OVERLAP_OK (g.xOff, wcw, prop)) |
1265 | return false; |
1284 | return false; |
1266 | |
1285 | |
1267 | return true; |
1286 | return true; |
1268 | } |
1287 | } |
1269 | |
1288 | |
1270 | void |
1289 | void |
1271 | rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, |
1290 | rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, |
1272 | const text_t *text, int len, |
1291 | const text_t *text, int len, |
1273 | int fg, int bg) |
1292 | int fg, int bg) |
1274 | { |
1293 | { |
1275 | clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); |
|
|
1276 | |
|
|
1277 | XGlyphInfo extents; |
1294 | XGlyphInfo extents; |
1278 | XftGlyphSpec *enc = (XftGlyphSpec *)rxvt_temp_buf (len * sizeof (XftGlyphSpec)); |
1295 | XftGlyphSpec *enc = (XftGlyphSpec *)rxvt_temp_buf (len * sizeof (XftGlyphSpec)); |
1279 | XftGlyphSpec *ep = enc; |
1296 | XftGlyphSpec *ep = enc; |
1280 | |
1297 | |
1281 | dTermDisplay; |
1298 | dTermDisplay; |
1282 | dTermGC; |
1299 | dTermGC; |
1283 | |
1300 | |
|
|
1301 | int w = term->fwidth * len; |
|
|
1302 | int h = term->fheight; |
|
|
1303 | |
|
|
1304 | /* |
|
|
1305 | * Maybe make buffering into a resource flag? Compile time option doesn't seems like a |
|
|
1306 | * good idea from the perspective of packaging for wide variety of user configs. |
|
|
1307 | */ |
|
|
1308 | bool buffered = bg >= Color_transparent; |
|
|
1309 | #ifdef FORCE_UNBUFFERED_XFT |
|
|
1310 | buffered = false; |
|
|
1311 | #endif |
|
|
1312 | |
1284 | // cut trailing spaces |
1313 | // cut trailing spaces |
1285 | while (len && text [len - 1] == ' ') |
1314 | while (len && text [len - 1] == ' ') |
1286 | len--; |
1315 | len--; |
1287 | |
1316 | |
|
|
1317 | int x_ = buffered ? 0 : x; |
|
|
1318 | int y_ = buffered ? 0 : y; |
|
|
1319 | |
1288 | while (len) |
1320 | while (len) |
1289 | { |
1321 | { |
1290 | int cwidth = term->fwidth; |
1322 | int cwidth = term->fwidth; |
1291 | FcChar32 fc = *text++; len--; |
1323 | FcChar32 fc = *text++; len--; |
1292 | |
1324 | |
1293 | while (len && *text == NOCHAR) |
1325 | while (len && *text == NOCHAR) |
1294 | text++, len--, cwidth += term->fwidth; |
1326 | text++, len--, cwidth += term->fwidth; |
1295 | |
1327 | |
1296 | if (fc != ' ') // skip spaces |
1328 | if (fc != ' ') // skip spaces |
1297 | { |
1329 | { |
1298 | FT_UInt glyph = XftCharIndex (disp, f, fc); |
1330 | FT_UInt glyph = XftCharIndex (disp, f, fc); |
1299 | XftGlyphExtents (disp, f, &glyph, 1, &extents); |
1331 | XftGlyphExtents (disp, f, &glyph, 1, &extents); |
1300 | |
1332 | |
1301 | ep->glyph = glyph; |
1333 | ep->glyph = glyph; |
1302 | ep->x = x + (cwidth - extents.xOff >> 1); |
1334 | ep->x = x_ + (cwidth - extents.xOff >> 1); |
1303 | ep->y = y + ascent; |
1335 | ep->y = y_ + ascent; |
|
|
1336 | |
|
|
1337 | if (extents.xOff == 0) |
|
|
1338 | ep->x = x_ + cwidth; |
|
|
1339 | |
1304 | ep++; |
1340 | ep++; |
1305 | } |
1341 | } |
1306 | |
1342 | |
1307 | x += cwidth; |
1343 | x_ += cwidth; |
|
|
1344 | } |
|
|
1345 | |
|
|
1346 | if (buffered) |
1308 | } |
1347 | { |
1309 | |
|
|
1310 | if (ep != enc) |
1348 | if (ep != enc) |
|
|
1349 | { |
|
|
1350 | bool back_rendered = false; |
|
|
1351 | rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); |
|
|
1352 | |
|
|
1353 | #ifdef HAVE_BG_PIXMAP |
|
|
1354 | if (term->bgPixmap.pixmap) |
|
|
1355 | { |
|
|
1356 | Picture dst = 0; |
|
|
1357 | |
|
|
1358 | if (bg >= 0 && term->pix_colors[bg].is_opaque ()) |
|
|
1359 | XftDrawRect (d2, &term->pix_colors[bg].c, 0, 0, w, h); |
|
|
1360 | else |
|
|
1361 | dst = XftDrawPicture (d2); |
|
|
1362 | |
|
|
1363 | if (dst) |
|
|
1364 | { |
|
|
1365 | int src_x = x, src_y = y; |
|
|
1366 | |
|
|
1367 | if (term->bgPixmap.is_parentOrigin ()) |
|
|
1368 | { |
|
|
1369 | src_x += term->window_vt_x; |
|
|
1370 | src_y += term->window_vt_y; |
|
|
1371 | } |
|
|
1372 | |
|
|
1373 | if (term->bgPixmap.pmap_width >= src_x+w |
|
|
1374 | && term->bgPixmap.pmap_height >= src_y+h) |
|
|
1375 | { |
|
|
1376 | XCopyArea (disp, term->bgPixmap.pixmap, d2, gc, |
|
|
1377 | src_x, src_y, w, h, 0, 0); |
|
|
1378 | } |
|
|
1379 | else |
|
|
1380 | { |
|
|
1381 | XGCValues gcv; |
|
|
1382 | |
|
|
1383 | gcv.fill_style = FillTiled; |
|
|
1384 | gcv.tile = term->bgPixmap.pixmap; |
|
|
1385 | gcv.ts_x_origin = -src_x; |
|
|
1386 | gcv.ts_y_origin = -src_y; |
|
|
1387 | |
|
|
1388 | XChangeGC (disp, gc, |
|
|
1389 | GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle, |
|
|
1390 | &gcv); |
|
|
1391 | |
|
|
1392 | XFillRectangle (disp, d2, gc, 0, 0, w, h); |
|
|
1393 | |
|
|
1394 | gcv.fill_style = FillSolid; |
|
|
1395 | XChangeGC (disp, gc, GCFillStyle, &gcv); |
|
|
1396 | } |
|
|
1397 | |
|
|
1398 | if (bg >= 0) |
|
|
1399 | { |
|
|
1400 | Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c); |
|
|
1401 | XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h); |
|
|
1402 | } |
|
|
1403 | |
|
|
1404 | back_rendered = true; |
|
|
1405 | } |
|
|
1406 | } |
|
|
1407 | #endif |
|
|
1408 | |
|
|
1409 | if (!back_rendered) |
|
|
1410 | XftDrawRect (d2, &term->pix_colors[bg < 0 ? Color_bg : bg].c, 0, 0, w, h); |
|
|
1411 | |
|
|
1412 | XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc); |
|
|
1413 | XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y); |
|
|
1414 | } |
|
|
1415 | else |
|
|
1416 | clear_rect (d, x, y, w, h, bg); |
|
|
1417 | } |
|
|
1418 | else |
|
|
1419 | { |
|
|
1420 | clear_rect (d, x, y, w, h, bg); |
1311 | XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc); |
1421 | XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc); |
|
|
1422 | } |
1312 | } |
1423 | } |
|
|
1424 | |
1313 | #endif |
1425 | #endif |
1314 | |
1426 | |
1315 | ///////////////////////////////////////////////////////////////////////////// |
1427 | ///////////////////////////////////////////////////////////////////////////// |
1316 | |
1428 | |
1317 | rxvt_fontset::rxvt_fontset (rxvt_term *term) |
1429 | rxvt_fontset::rxvt_fontset (rxvt_term *term) |
… | |
… | |
1328 | void |
1440 | void |
1329 | rxvt_fontset::clear () |
1441 | rxvt_fontset::clear () |
1330 | { |
1442 | { |
1331 | prop.width = prop.height = prop.ascent = prop.weight = prop.slant |
1443 | prop.width = prop.height = prop.ascent = prop.weight = prop.slant |
1332 | = rxvt_fontprop::unset; |
1444 | = rxvt_fontprop::unset; |
|
|
1445 | force_prop = false; |
1333 | |
1446 | |
1334 | for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) |
1447 | for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) |
1335 | FONT_UNREF (*i); |
1448 | FONT_UNREF (*i); |
1336 | |
1449 | |
1337 | for (pagemap **p = fmap.begin (); p != fmap.end (); p++) |
1450 | for (pagemap **p = fmap.begin (); p != fmap.end (); p++) |
… | |
… | |
1346 | |
1459 | |
1347 | rxvt_font * |
1460 | rxvt_font * |
1348 | rxvt_fontset::new_font (const char *name, codeset cs) |
1461 | rxvt_fontset::new_font (const char *name, codeset cs) |
1349 | { |
1462 | { |
1350 | rxvt_font *f; |
1463 | rxvt_font *f; |
1351 | |
1464 | |
1352 | if (!name || !*name) |
1465 | if (!name || !*name) |
1353 | { |
1466 | { |
1354 | name = ""; |
1467 | name = ""; |
1355 | f = new rxvt_font_default (this); |
1468 | f = new rxvt_font_default (this); |
1356 | } |
1469 | } |
… | |
… | |
1424 | if (!end) |
1537 | if (!end) |
1425 | end = desc + strlen (desc); |
1538 | end = desc + strlen (desc); |
1426 | |
1539 | |
1427 | if (end - desc < 511) |
1540 | if (end - desc < 511) |
1428 | { |
1541 | { |
1429 | strncpy (buf, desc, end - desc); |
1542 | memcpy (buf, desc, end - desc); |
1430 | buf[end - desc] = 0; |
1543 | buf[end - desc] = 0; |
1431 | |
1544 | |
1432 | fonts.push_back (new_font (buf, cs)); |
1545 | fonts.push_back (new_font (buf, cs)); |
1433 | } |
1546 | } |
1434 | else |
1547 | else |
… | |
… | |
1449 | if (fonts[i]->loaded) |
1562 | if (fonts[i]->loaded) |
1450 | return true; |
1563 | return true; |
1451 | |
1564 | |
1452 | fonts[i]->loaded = true; |
1565 | fonts[i]->loaded = true; |
1453 | |
1566 | |
1454 | if (!fonts[i]->load (prop)) |
1567 | if (!fonts[i]->load (prop, force_prop)) |
1455 | { |
1568 | { |
1456 | fonts[i]->cs = CS_UNKNOWN; |
1569 | fonts[i]->cs = CS_UNKNOWN; |
1457 | return false; |
1570 | return false; |
1458 | } |
1571 | } |
1459 | |
1572 | |
… | |
… | |
1560 | FcPatternAddInteger (p, FC_SLANT, prop.slant); |
1673 | FcPatternAddInteger (p, FC_SLANT, prop.slant); |
1561 | FcPatternAddBool (p, FC_MINSPACE, 1); |
1674 | FcPatternAddBool (p, FC_MINSPACE, 1); |
1562 | //FcPatternAddBool (p, FC_ANTIALIAS, 1); |
1675 | //FcPatternAddBool (p, FC_ANTIALIAS, 1); |
1563 | |
1676 | |
1564 | XftResult result; |
1677 | XftResult result; |
1565 | FcPattern *match = XftFontMatch (term->display->display, term->display->screen, p, &result); |
1678 | FcPattern *match = XftFontMatch (term->dpy, term->display->screen, p, &result); |
1566 | |
1679 | |
1567 | FcPatternDestroy (p); |
1680 | FcPatternDestroy (p); |
1568 | |
1681 | |
1569 | if (match) |
1682 | if (match) |
1570 | { |
1683 | { |
… | |
… | |
1575 | if (find_font (font) < 0) |
1688 | if (find_font (font) < 0) |
1576 | { |
1689 | { |
1577 | char fontname[4096]; |
1690 | char fontname[4096]; |
1578 | sprintf (fontname, "xft:%-.4090s", font); |
1691 | sprintf (fontname, "xft:%-.4090s", font); |
1579 | |
1692 | |
1580 | fonts.push_back (new_font (fontname, CS_UNICODE)); |
1693 | fonts.push_back (new_font (fontname, CS_UNICODE)); |
1581 | } |
1694 | } |
1582 | |
1695 | |
1583 | free (font); |
1696 | free (font); |
1584 | } |
1697 | } |
1585 | #endif |
1698 | #endif |