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 | * |
… | |
… | |
24 | #include "rxvtlib.h" |
24 | #include "rxvtlib.h" |
25 | #include "rxvtutil.h" |
25 | #include "rxvtutil.h" |
26 | #include "rxvtfont.h" |
26 | #include "rxvtfont.h" |
27 | |
27 | |
28 | #include <cstdlib> |
28 | #include <cstdlib> |
29 | #include <wchar.h> |
29 | |
30 | #include <inttypes.h> |
30 | #include <inttypes.h> |
31 | |
31 | |
32 | #define MAX_OVERLAP_ROMAN (8 + 2) // max. character width in 8ths of the base width |
32 | #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 |
33 | #define MAX_OVERLAP_ITALIC (8 + 3) // max. overlap for italic fonts |
34 | |
34 | |
35 | #define OVERLAP_OK(w,prop) (w) > ( \ |
35 | #define OVERLAP_OK(w,wcw,prop) ((w) <= ( \ |
36 | prop->slant >= rxvt_fontprop::italic \ |
36 | (prop)->slant >= rxvt_fontprop::italic \ |
37 | ? (prop->width * MAX_OVERLAP_ITALIC + 7) >> 3 \ |
37 | ? ((prop)->width * (wcw) * MAX_OVERLAP_ITALIC + 7) >> 3 \ |
38 | : (prop->width * MAX_OVERLAP_ROMAN + 7) >> 3 \ |
38 | : ((prop)->width * (wcw) * MAX_OVERLAP_ROMAN + 7) >> 3 \ |
39 | ) |
39 | )) |
40 | |
40 | |
41 | const struct rxvt_fallback_font { |
41 | const struct rxvt_fallback_font { |
42 | codeset cs; |
42 | codeset cs; |
43 | const char *name; |
43 | const char *name; |
44 | } fallback_fonts[] = { |
44 | } fallback_fonts[] = { |
… | |
… | |
64 | { CS_ISO8859_13, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-13" }, |
64 | { CS_ISO8859_13, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-13" }, |
65 | { CS_ISO8859_14, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-14" }, |
65 | { CS_ISO8859_14, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-14" }, |
66 | { CS_ISO8859_16, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-16" }, |
66 | { CS_ISO8859_16, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-16" }, |
67 | |
67 | |
68 | # if XFT |
68 | # if XFT |
69 | { CS_KOI8_U, "xft::spacing=100:lang=ru:antialias=false" }, |
69 | { CS_KOI8_U, "xft::lang=ru" }, |
70 | |
70 | |
71 | { CS_ISO8859_5, "xft::spacing=100:lang=ru:antialias=false" }, |
71 | { CS_ISO8859_5, "xft::lang=ru" }, |
72 | { CS_ISO8859_6, "xft::spacing=100:lang=ar:antialias=false" }, |
72 | { CS_ISO8859_6, "xft::lang=ar" }, |
73 | { CS_ISO8859_7, "xft::spacing=100:lang=el:antialias=false" }, |
73 | { CS_ISO8859_7, "xft::lang=el" }, |
74 | { CS_ISO8859_8, "xft::spacing=100:lang=he:antialias=false" }, |
74 | { CS_ISO8859_8, "xft::lang=he" }, |
75 | { CS_ISO8859_9, "xft::spacing=100:lang=tr:antialias=false" }, |
75 | { CS_ISO8859_9, "xft::lang=tr" }, |
76 | { CS_ISO8859_10, "xft::spacing=100:lang=se:antialias=false" }, |
76 | { CS_ISO8859_10, "xft::lang=se" }, |
77 | { CS_ISO8859_11, "xft::spacing=100:lang=th:antialias=false" }, |
77 | { CS_ISO8859_11, "xft::lang=th" }, |
78 | # endif |
78 | # endif |
79 | #endif |
79 | #endif |
80 | |
80 | |
81 | // japanese |
81 | // japanese |
82 | #if ENCODING_JP || ENCODING_JP_EXT |
82 | #if ENCODING_JP || ENCODING_JP_EXT |
83 | # if XFT |
83 | # if XFT |
84 | // prefer xft for complex scripts |
84 | // prefer xft for complex scripts |
85 | { CS_JIS0208_1990_0, "xft:Kochi Gothic:antialias=false" }, |
85 | { CS_JIS0208_1990_0, "xft:Kochi Gothic:antialias=false" }, |
86 | { CS_JIS0208_1990_0, "xft:Sazanami Mincho:antialias=false" }, |
86 | { CS_JIS0208_1990_0, "xft:Sazanami Mincho:antialias=false" }, |
87 | { CS_JIS0208_1990_0, "xft:Mincho:antialias=false" }, |
87 | { CS_JIS0208_1990_0, "xft:Mincho:antialias=false" }, |
88 | { CS_JIS0208_1990_0, "xft::lang=ja:spacing=100:antialias=false" }, |
88 | { CS_JIS0208_1990_0, "xft::lang=ja:antialias=false" }, |
89 | # endif |
89 | # endif |
90 | { CS_JIS0201_1976_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0201*-0" }, |
90 | { CS_JIS0201_1976_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0201*-0" }, |
91 | { CS_JIS0208_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" }, |
91 | { CS_JIS0208_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" }, |
92 | { CS_JIS0212_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0212*-0" }, |
92 | { CS_JIS0212_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0212*-0" }, |
93 | { CS_JIS0201_1976_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0201*-0" }, |
93 | { CS_JIS0201_1976_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0201*-0" }, |
… | |
… | |
97 | |
97 | |
98 | #if ENCODING_ZH || ENCODING_ZH_EXT |
98 | #if ENCODING_ZH || ENCODING_ZH_EXT |
99 | # if XFT |
99 | # if XFT |
100 | { CS_GBK_0, "xft:AR PL KaitiM GB" }, |
100 | { CS_GBK_0, "xft:AR PL KaitiM GB" }, |
101 | { CS_GBK_0, "xft:AR PL SungtiL GB" }, |
101 | { CS_GBK_0, "xft:AR PL SungtiL GB" }, |
102 | { CS_GBK_0, "xft::spacing=100:lang=zh" }, |
102 | { CS_GBK_0, "xft::lang=zh" }, |
103 | { CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" }, |
103 | { CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" }, |
104 | { CS_BIG5_EXT, "xft:AR PL KaitiM Big5" }, |
104 | { CS_BIG5_EXT, "xft:AR PL KaitiM Big5" }, |
105 | { CS_GB2312_1980_0, "xft:AR PL KaitiM GB" }, |
105 | { CS_GB2312_1980_0, "xft:AR PL KaitiM GB" }, |
106 | { CS_GB2312_1980_0, "xft:AR PL SungtiL GB" }, |
106 | { CS_GB2312_1980_0, "xft:AR PL SungtiL GB" }, |
107 | { CS_GB2312_1980_0, "xft::spacing=100:lang=zh" }, |
107 | { CS_GB2312_1980_0, "xft::lang=zh" }, |
108 | # endif |
108 | # endif |
109 | { CS_GBK_0, "-*-*-*-*-*-*-*-*-*-*-c-*-gbk*-0" }, |
109 | { CS_GBK_0, "-*-*-*-*-*-*-*-*-*-*-c-*-gbk*-0" }, |
110 | { CS_BIG5, "-*-*-*-*-*-*-*-*-*-*-c-*-big5-0" }, |
110 | { CS_BIG5, "-*-*-*-*-*-*-*-*-*-*-c-*-big5-0" }, |
111 | { CS_BIG5_PLUS, "-*-*-*-*-*-*-*-*-*-*-c-*-big5p-0" }, |
111 | { CS_BIG5_PLUS, "-*-*-*-*-*-*-*-*-*-*-c-*-big5p-0" }, |
112 | { CS_BIG5_EXT, "-*-*-*-*-*-*-*-*-*-*-c-*-big5.eten-0" }, |
112 | { CS_BIG5_EXT, "-*-*-*-*-*-*-*-*-*-*-c-*-big5.eten-0" }, |
… | |
… | |
125 | #if ENCODING_KR |
125 | #if ENCODING_KR |
126 | { CS_KSC5601_1987_0, "-baekmuk-gulim-*-*-*-*-*-*-*-*-c-*-ksc5601*" }, |
126 | { CS_KSC5601_1987_0, "-baekmuk-gulim-*-*-*-*-*-*-*-*-c-*-ksc5601*" }, |
127 | { CS_KSC5601_1987_0, "-*-*-*-*-*-*-*-*-*-*-c-*-ksc5601*" }, |
127 | { CS_KSC5601_1987_0, "-*-*-*-*-*-*-*-*-*-*-c-*-ksc5601*" }, |
128 | # if XFT |
128 | # if XFT |
129 | { CS_KSC5601_1987_0, "xft:Baekmuk Gulim:antialias=false" }, |
129 | { CS_KSC5601_1987_0, "xft:Baekmuk Gulim:antialias=false" }, |
130 | { CS_KSC5601_1987_0, "xft::spacing=100:lang=ko:antialias=false" }, |
130 | { CS_KSC5601_1987_0, "xft::lang=ko:antialias=false" }, |
131 | # endif |
131 | # endif |
132 | #endif |
132 | #endif |
133 | |
133 | |
134 | // generic font fallback |
|
|
135 | { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" }, |
134 | { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" }, |
136 | { CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" }, |
135 | //{ 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 |
136 | #if XFT |
140 | { CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true" }, |
137 | { CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true" }, |
141 | { CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" }, |
138 | { CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" }, |
142 | { CS_UNICODE, "xft:Andale Mono:antialias=false:autohint=false" }, |
139 | { CS_UNICODE, "xft:Andale Mono:antialias=false:autohint=false" }, |
143 | { CS_UNICODE, "xft:Arial Unicode MS:antialias=false:autohint=false" }, |
140 | { CS_UNICODE, "xft:Arial Unicode MS:antialias=false:autohint=false" }, |
144 | |
141 | |
145 | // FreeMono is usually uglier than x fonts, so try last only. |
142 | // FreeMono is usually uglier than x fonts, so try after the others |
146 | { CS_UNICODE, "xft:FreeMono:autohint=true" }, |
143 | { CS_UNICODE, "xft:FreeMono:autohint=true" }, |
147 | #endif |
144 | #endif |
148 | |
145 | |
|
|
146 | // generic font fallback, put this last, as many iso10646 fonts have extents |
|
|
147 | // specified for all glyphs in the range they cover, but most are simply empty |
|
|
148 | //{ CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" }, |
|
|
149 | //{ CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" }, |
149 | { CS_UNKNOWN, 0 } |
150 | { CS_UNKNOWN, 0 } |
150 | }; |
151 | }; |
151 | |
152 | |
152 | // these characters are used to guess the font height and width |
153 | // these characters are used to guess the font height and width |
153 | // pango uses a similar algorithm and doesn't trust the font either. |
154 | // pango uses a similar algorithm and doesn't trust the font either. |
… | |
… | |
157 | 0x304c, 0x672c, // が本 |
158 | 0x304c, 0x672c, // が本 |
158 | }; |
159 | }; |
159 | |
160 | |
160 | #define NUM_EXTENT_TEST_CHARS (sizeof (extent_test_chars) / sizeof (extent_test_chars[0])) |
161 | #define NUM_EXTENT_TEST_CHARS (sizeof (extent_test_chars) / sizeof (extent_test_chars[0])) |
161 | |
162 | |
162 | #define dTermDisplay Display *disp = term->display->display |
163 | #define dTermDisplay Display *disp = term->dpy |
163 | #define dTermGC GC gc = term->gc |
164 | #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 | |
165 | |
183 | ///////////////////////////////////////////////////////////////////////////// |
166 | ///////////////////////////////////////////////////////////////////////////// |
184 | |
167 | |
185 | static const char * |
168 | static const char * |
186 | enc_char (const text_t *text, uint32_t len, codeset cs, bool &zero) |
169 | enc_char (const text_t *text, uint32_t len, codeset cs, bool &zero) |
… | |
… | |
228 | return res; |
211 | return res; |
229 | } |
212 | } |
230 | |
213 | |
231 | ///////////////////////////////////////////////////////////////////////////// |
214 | ///////////////////////////////////////////////////////////////////////////// |
232 | |
215 | |
|
|
216 | rxvt_font::rxvt_font () |
|
|
217 | : name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset) |
|
|
218 | { |
|
|
219 | } |
|
|
220 | |
233 | void |
221 | void |
234 | rxvt_font::set_name (char *name) |
222 | rxvt_font::set_name (char *name) |
235 | { |
223 | { |
236 | if (this->name == name) |
224 | if (this->name == name) |
237 | return; |
225 | return; |
… | |
… | |
244 | rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const |
232 | rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const |
245 | { |
233 | { |
246 | dTermDisplay; |
234 | dTermDisplay; |
247 | dTermGC; |
235 | dTermGC; |
248 | |
236 | |
249 | if (color == Color_bg) |
237 | if (color == Color_bg || color == Color_transparent) |
250 | XClearArea (disp, d, x, y, w, h, FALSE); |
238 | XClearArea (disp, d, x, y, w, h, false); |
251 | else if (color >= 0) |
239 | else if (color >= 0) |
252 | { |
240 | { |
253 | #if XFT |
241 | #if XFT |
254 | XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h); |
242 | XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h); |
255 | #else |
243 | #else |
… | |
… | |
257 | XFillRectangle (disp, d, gc, x, y, w, h); |
245 | XFillRectangle (disp, d, gc, x, y, w, h); |
258 | #endif |
246 | #endif |
259 | } |
247 | } |
260 | } |
248 | } |
261 | |
249 | |
|
|
250 | ///////////////////////////////////////////////////////////////////////////// |
|
|
251 | |
262 | #include "table/linedraw.h" |
252 | #include "table/linedraw.h" |
263 | |
253 | |
264 | struct rxvt_font_default : rxvt_font { |
254 | struct rxvt_font_default : rxvt_font { |
265 | struct rxvt_fontset *fs; |
255 | struct rxvt_fontset *fs; |
266 | |
256 | |
… | |
… | |
280 | p.slant = rxvt_fontprop::roman; |
270 | p.slant = rxvt_fontprop::roman; |
281 | |
271 | |
282 | return p; |
272 | return p; |
283 | } |
273 | } |
284 | |
274 | |
285 | bool load (const rxvt_fontprop &prop) |
275 | bool load (const rxvt_fontprop &prop, bool force_prop) |
286 | { |
276 | { |
287 | width = 1; height = 1; |
277 | width = 1; height = 1; |
288 | ascent = 1; descent = 0; |
278 | ascent = 1; descent = 0; |
289 | |
279 | |
290 | set_name (strdup ("built-in support font")); |
280 | set_name (strdup ("built-in support font")); |
… | |
… | |
432 | } |
422 | } |
433 | } |
423 | } |
434 | #if ENABLE_COMBINING |
424 | #if ENABLE_COMBINING |
435 | else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) |
425 | else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) |
436 | { |
426 | { |
|
|
427 | min_it (width, 2); // we only support wcwidth up to 2 |
|
|
428 | |
437 | text_t chrs[2]; |
429 | text_t chrs[2]; |
438 | width = min (2, width); |
|
|
439 | chrs [1] = NOCHAR; |
430 | chrs [1] = NOCHAR; |
440 | |
431 | |
441 | *chrs = cc->c1; |
432 | *chrs = cc->c1; |
442 | rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)]; |
433 | rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)]; |
443 | f1->draw (d, x, y, chrs, width, fg, bg); |
434 | f1->draw (d, x, y, chrs, width, fg, bg); |
… | |
… | |
450 | *chrs = cc->c2; |
441 | *chrs = cc->c2; |
451 | rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful) |
442 | rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful) |
452 | ? f1 |
443 | ? f1 |
453 | : (*fs)[fs->find_font (cc->c2)]; |
444 | : (*fs)[fs->find_font (cc->c2)]; |
454 | |
445 | |
455 | f2->draw (d, x, y, chrs, width, fg, -1); |
446 | f2->draw (d, x, y, chrs, width, fg, Color_none); |
456 | } |
447 | } |
457 | } |
448 | } |
458 | #endif |
449 | #endif |
459 | else |
450 | else |
460 | switch (t) |
451 | switch (t) |
… | |
… | |
480 | |
471 | |
481 | void clear (); |
472 | void clear (); |
482 | |
473 | |
483 | rxvt_fontprop properties (); |
474 | rxvt_fontprop properties (); |
484 | |
475 | |
485 | bool load (const rxvt_fontprop &prop); |
476 | bool load (const rxvt_fontprop &prop, bool force_prop); |
486 | |
477 | |
487 | bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const; |
478 | bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const; |
488 | |
479 | |
489 | void draw (rxvt_drawable &d, int x, int y, |
480 | void draw (rxvt_drawable &d, int x, int y, |
490 | const text_t *text, int len, |
481 | const text_t *text, int len, |
491 | int fg, int bg); |
482 | int fg, int bg); |
492 | |
483 | |
493 | bool slow; // wether this is a proportional font or has other funny characteristics |
484 | bool slow; // wether this is a proportional font or has other funny characteristics |
494 | XFontStruct *f; |
485 | XFontStruct *f; |
495 | codeset cs; |
|
|
496 | bool enc2b, encm; |
486 | bool enc2b, encm; |
497 | |
487 | |
498 | char *get_property (XFontStruct *f, const char *property, const char *repl) const; |
488 | 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); |
489 | 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); |
490 | bool set_properties (rxvt_fontprop &p, XFontStruct *f); |
501 | bool set_properties (rxvt_fontprop &p, const char *name); |
491 | bool set_properties (rxvt_fontprop &p, const char *name); |
502 | }; |
492 | }; |
503 | |
493 | |
504 | char * |
494 | char * |
505 | rxvt_font_x11::get_property (XFontStruct *f, const char *property, const char *repl) const |
495 | rxvt_font_x11::get_property (XFontStruct *f, Atom property, const char *repl) const |
506 | { |
496 | { |
507 | unsigned long value; |
497 | unsigned long value; |
508 | |
498 | |
509 | if (XGetFontProperty (f, XInternAtom (term->display->display, property, 0), &value)) |
499 | if (XGetFontProperty (f, property, &value)) |
510 | return XGetAtomName (term->display->display, value); |
500 | return XGetAtomName (term->dpy, value); |
511 | else |
501 | else |
512 | return rxvt_strdup (repl); |
502 | return rxvt_strdup (repl); |
513 | } |
503 | } |
514 | |
504 | |
515 | rxvt_fontprop |
505 | rxvt_fontprop |
… | |
… | |
521 | } |
511 | } |
522 | |
512 | |
523 | bool |
513 | bool |
524 | rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth) |
514 | rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth) |
525 | { |
515 | { |
526 | p.width = avgwidth ? (avgwidth + 1) / 10 : (height + 1) / 2; |
516 | p.width = width != rxvt_fontprop::unset ? width |
|
|
517 | : avgwidth ? (avgwidth + 1) / 10 |
|
|
518 | : (height + 1) / 2; |
527 | p.height = height; |
519 | p.height = height; |
528 | p.ascent = rxvt_fontprop::unset; |
520 | p.ascent = rxvt_fontprop::unset; |
529 | p.weight = *weight == 'B' || *weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium; |
521 | 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; |
522 | p.slant = *slant == 'r' || *slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic; |
531 | |
523 | |
… | |
… | |
536 | rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f) |
528 | rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f) |
537 | { |
529 | { |
538 | unsigned long height; |
530 | unsigned long height; |
539 | |
531 | |
540 | #if 0 |
532 | #if 0 |
541 | if (!XGetFontProperty (f, XInternAtom (term->display->display, "PIXEL_SIZE", 0), &height)) |
533 | if (!XGetFontProperty (f, XInternAtom (term->dpy, "PIXEL_SIZE", 0), &height)) |
542 | return false; |
534 | return false; |
543 | #else |
535 | #else |
544 | height = f->ascent + f->descent; |
536 | height = f->ascent + f->descent; |
545 | #endif |
537 | #endif |
546 | |
538 | |
547 | unsigned long avgwidth; |
539 | unsigned long avgwidth; |
548 | if (!XGetFontProperty (f, XInternAtom (term->display->display, "AVERAGE_WIDTH", 0), &avgwidth)) |
540 | if (!XGetFontProperty (f, term->xa [XA_AVERAGE_WIDTH], &avgwidth)) |
549 | avgwidth = 0; |
541 | avgwidth = 0; |
550 | |
542 | |
551 | char *weight = get_property (f, "WEIGHT_NAME", "medium"); |
543 | char *weight = get_property (f, term->xa [XA_WEIGHT_NAME], "medium"); |
552 | char *slant = get_property (f, "SLANT", "r"); |
544 | char *slant = get_property (f, term->xa [XA_SLANT], "r"); |
553 | |
545 | |
554 | set_properties (p, height, weight, slant, avgwidth); |
546 | set_properties (p, height, weight, slant, avgwidth); |
555 | |
547 | |
556 | free (weight); |
548 | free (weight); |
557 | free (slant); |
549 | free (slant); |
… | |
… | |
634 | return false; |
626 | return false; |
635 | } |
627 | } |
636 | } |
628 | } |
637 | |
629 | |
638 | bool |
630 | bool |
639 | rxvt_font_x11::load (const rxvt_fontprop &prop) |
631 | rxvt_font_x11::load (const rxvt_fontprop &prop, bool force_prop) |
640 | { |
632 | { |
641 | dTermDisplay; |
633 | dTermDisplay; |
642 | |
634 | |
643 | clear (); |
635 | clear (); |
644 | |
636 | |
645 | char field_str[64]; // enough for 128 bits |
637 | char field_str[64]; // enough for 128 bits |
646 | |
638 | |
647 | // first morph the font if required |
639 | // first morph the font if required |
648 | if (prop.weight != rxvt_fontprop::unset |
640 | if (force_prop) |
649 | || prop.slant != rxvt_fontprop::unset) |
|
|
650 | { |
641 | { |
651 | char fname[1024]; |
642 | char fname[1024]; |
652 | |
643 | |
653 | if (name[0] != '-') |
644 | if (name[0] != '-') |
654 | { |
645 | { |
655 | f = XLoadQueryFont (disp, name); |
646 | f = XLoadQueryFont (disp, name); |
656 | |
647 | |
657 | if (!f) |
648 | if (!f) |
658 | return false; |
649 | return false; |
659 | |
650 | |
660 | char *new_name = get_property (f, "FONT", name); |
651 | char *new_name = get_property (f, XA_FONT, name); |
661 | |
652 | |
662 | if (new_name) |
653 | if (new_name) |
663 | set_name (new_name); |
654 | set_name (new_name); |
664 | else |
655 | else |
665 | rxvt_warn ("font '%s' has no FONT property, continuing without.", name); |
656 | rxvt_warn ("font '%s' has no FONT property, continuing without.", name); |
… | |
… | |
774 | delete [] fonts; |
765 | delete [] fonts; |
775 | |
766 | |
776 | if (!f) |
767 | if (!f) |
777 | return false; |
768 | return false; |
778 | |
769 | |
779 | char *registry = get_property (f, "CHARSET_REGISTRY", 0); |
770 | char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0); |
780 | char *encoding = get_property (f, "CHARSET_ENCODING", 0); |
771 | char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0); |
781 | |
772 | |
782 | if (registry && encoding) |
773 | if (registry && encoding) |
783 | { |
774 | { |
784 | char charset[64]; |
775 | char charset[64]; |
785 | snprintf (charset, 64, "%s-%s", registry, encoding); |
776 | snprintf (charset, 64, "%s-%s", registry, encoding); |
786 | |
777 | |
787 | cs = codeset_from_name (charset); |
778 | cs = codeset_from_name (charset); |
788 | } |
779 | } |
789 | else |
780 | else |
790 | { |
781 | { |
791 | const char *charset = get_property (f, "FONT", 0); |
782 | const char *charset = get_property (f, XA_FONT, 0); |
792 | |
783 | |
793 | if (!charset) |
784 | if (!charset) |
794 | charset = name; |
785 | charset = name; |
795 | |
786 | |
796 | int count = 13; |
787 | int count = 13; |
… | |
… | |
811 | enc2b = encm || f->max_char_or_byte2 > 255; |
802 | enc2b = encm || f->max_char_or_byte2 > 255; |
812 | |
803 | |
813 | slow = false; |
804 | slow = false; |
814 | |
805 | |
815 | #if 1 // only used for slow detection, TODO optimize |
806 | #if 1 // only used for slow detection, TODO optimize |
816 | if (f->min_bounds.width == f->max_bounds.width) |
807 | 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; |
808 | width = f->max_bounds.width; |
820 | else |
809 | else |
821 | { |
810 | { |
822 | slow = true; |
811 | slow = true; |
823 | |
812 | |
… | |
… | |
839 | |
828 | |
840 | width = 1; |
829 | width = 1; |
841 | |
830 | |
842 | for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) |
831 | for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) |
843 | { |
832 | { |
844 | if (cs != CS_UNICODE |
|
|
845 | && *t > 0x100 |
|
|
846 | && FROM_UNICODE (cs, *t) == NOCHAR) |
833 | if (FROM_UNICODE (cs, *t) == NOCHAR) |
847 | continue; |
834 | continue; |
848 | |
835 | |
849 | // ignore characters we wouldn't use anyways |
836 | // ignore characters we wouldn't use anyways |
850 | bool careful; |
837 | bool careful; |
851 | if (!has_char (*t, &prop, careful)) |
838 | if (!has_char (*t, &prop, careful)) |
… | |
… | |
855 | |
842 | |
856 | XCharStruct g; |
843 | XCharStruct g; |
857 | int dir_ret, asc_ret, des_ret; |
844 | int dir_ret, asc_ret, des_ret; |
858 | XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); |
845 | XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); |
859 | |
846 | |
|
|
847 | int wcw = WCWIDTH (*t); |
860 | int wcw = WCWIDTH (*t); if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; |
848 | if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; |
861 | |
849 | |
862 | if (width < g.width) width = g.width; |
850 | if (width < g.width) width = g.width; |
863 | } |
851 | } |
864 | |
852 | |
865 | if (cs == CS_UNKNOWN) |
853 | if (cs == CS_UNKNOWN) |
866 | { |
854 | { |
867 | fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name); |
855 | fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name); |
… | |
… | |
884 | void |
872 | void |
885 | rxvt_font_x11::clear () |
873 | rxvt_font_x11::clear () |
886 | { |
874 | { |
887 | if (f) |
875 | if (f) |
888 | { |
876 | { |
889 | XFreeFont (term->display->display, f); |
877 | XFreeFont (term->dpy, f); |
890 | f = 0; |
878 | f = 0; |
891 | } |
879 | } |
892 | } |
880 | } |
893 | |
881 | |
894 | bool |
882 | bool |
… | |
… | |
937 | return false; |
925 | return false; |
938 | |
926 | |
939 | if (!prop || prop->width == rxvt_fontprop::unset) |
927 | if (!prop || prop->width == rxvt_fontprop::unset) |
940 | return true; |
928 | return true; |
941 | |
929 | |
942 | // check character against base font bounding box |
930 | // check wether character overlaps previous/next character |
943 | int w = xcs->rbearing - xcs->lbearing; |
931 | int w = xcs->rbearing - xcs->lbearing; |
944 | int wcw = WCWIDTH (unicode); |
932 | int wcw = max (WCWIDTH (unicode), 1); |
945 | if (wcw > 0) w = (w + wcw - 1) / wcw; |
|
|
946 | |
933 | |
947 | careful = w > prop->width; |
934 | careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw; |
|
|
935 | |
948 | if (careful && OVERLAP_OK (w, prop)) |
936 | if (careful && !OVERLAP_OK (w, wcw, prop)) |
949 | return false; |
937 | return false; |
950 | |
938 | |
951 | return true; |
939 | return true; |
952 | } |
940 | } |
953 | |
941 | |
… | |
… | |
1049 | |
1037 | |
1050 | void clear (); |
1038 | void clear (); |
1051 | |
1039 | |
1052 | rxvt_fontprop properties (); |
1040 | rxvt_fontprop properties (); |
1053 | |
1041 | |
1054 | bool load (const rxvt_fontprop &prop); |
1042 | bool load (const rxvt_fontprop &prop, bool force_prop); |
1055 | |
1043 | |
1056 | void draw (rxvt_drawable &d, int x, int y, |
1044 | void draw (rxvt_drawable &d, int x, int y, |
1057 | const text_t *text, int len, |
1045 | const text_t *text, int len, |
1058 | int fg, int bg); |
1046 | int fg, int bg); |
1059 | |
1047 | |
… | |
… | |
1066 | void |
1054 | void |
1067 | rxvt_font_xft::clear () |
1055 | rxvt_font_xft::clear () |
1068 | { |
1056 | { |
1069 | if (f) |
1057 | if (f) |
1070 | { |
1058 | { |
1071 | XftFontClose (term->display->display, f); |
1059 | XftFontClose (term->dpy, f); |
1072 | f = 0; |
1060 | f = 0; |
1073 | } |
1061 | } |
1074 | } |
1062 | } |
1075 | |
1063 | |
1076 | rxvt_fontprop |
1064 | rxvt_fontprop |
… | |
… | |
1092 | |
1080 | |
1093 | return p; |
1081 | return p; |
1094 | } |
1082 | } |
1095 | |
1083 | |
1096 | bool |
1084 | bool |
1097 | rxvt_font_xft::load (const rxvt_fontprop &prop) |
1085 | rxvt_font_xft::load (const rxvt_fontprop &prop, bool force_prop) |
1098 | { |
1086 | { |
1099 | dTermDisplay; |
1087 | dTermDisplay; |
1100 | |
1088 | |
1101 | clear (); |
1089 | clear (); |
1102 | |
1090 | |
… | |
… | |
1111 | && (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch |
1099 | && (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch |
1112 | && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch)) |
1100 | && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch)) |
1113 | FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height); |
1101 | FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height); |
1114 | |
1102 | |
1115 | if (prop.weight != rxvt_fontprop::unset |
1103 | if (prop.weight != rxvt_fontprop::unset |
1116 | && FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch) |
1104 | && (force_prop || FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch)) |
1117 | FcPatternAddInteger (p, FC_WEIGHT, prop.weight); |
1105 | FcPatternAddInteger (p, FC_WEIGHT, prop.weight); |
1118 | |
1106 | |
1119 | if (prop.slant != rxvt_fontprop::unset |
1107 | if (prop.slant != rxvt_fontprop::unset |
1120 | && FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch) |
1108 | && (force_prop || FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch)) |
1121 | FcPatternAddInteger (p, FC_SLANT, prop.slant); |
1109 | FcPatternAddInteger (p, FC_SLANT, prop.slant); |
1122 | |
1110 | |
1123 | #if 0 // clipping unfortunately destroys our precious double-width-characters |
1111 | #if 0 // clipping unfortunately destroys our precious double-width-characters |
1124 | // clip width, we can't do better, or can we? |
1112 | // clip width, we can't do better, or can we? |
1125 | if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) |
1113 | if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) |
… | |
… | |
1243 | bool |
1231 | bool |
1244 | rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const |
1232 | rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const |
1245 | { |
1233 | { |
1246 | careful = false; |
1234 | careful = false; |
1247 | |
1235 | |
1248 | if (!XftCharExists (term->display->display, f, unicode)) |
1236 | if (!XftCharExists (term->dpy, f, unicode)) |
1249 | return false; |
1237 | return false; |
1250 | |
1238 | |
1251 | if (!prop || prop->width == rxvt_fontprop::unset) |
1239 | if (!prop || prop->width == rxvt_fontprop::unset) |
1252 | return true; |
1240 | return true; |
1253 | |
1241 | |
1254 | // check character against base font bounding box |
1242 | // check character against base font bounding box |
1255 | FcChar32 ch = unicode; |
1243 | FcChar32 ch = unicode; |
1256 | XGlyphInfo g; |
1244 | XGlyphInfo g; |
1257 | XftTextExtents32 (term->display->display, f, &ch, 1, &g); |
1245 | XftTextExtents32 (term->dpy, f, &ch, 1, &g); |
1258 | |
1246 | |
1259 | int w = g.width - g.x; |
1247 | int w = g.width - g.x; |
1260 | int wcw = WCWIDTH (unicode); |
1248 | int wcw = max (WCWIDTH (unicode), 1); |
1261 | if (wcw > 0) w = (w + wcw - 1) / wcw; |
|
|
1262 | |
1249 | |
1263 | careful = w > prop->width; |
1250 | careful = g.x > 0 || w > prop->width * wcw; |
|
|
1251 | |
1264 | if (careful && OVERLAP_OK (w, prop)) |
1252 | if (careful && !OVERLAP_OK (w, wcw, prop)) |
|
|
1253 | return false; |
|
|
1254 | |
|
|
1255 | // this weeds out _totally_ broken fonts, or glyphs |
|
|
1256 | if (!OVERLAP_OK (g.xOff, wcw, prop)) |
1265 | return false; |
1257 | return false; |
1266 | |
1258 | |
1267 | return true; |
1259 | return true; |
1268 | } |
1260 | } |
1269 | |
1261 | |
1270 | void |
1262 | void |
1271 | rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, |
1263 | rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, |
1272 | const text_t *text, int len, |
1264 | const text_t *text, int len, |
1273 | int fg, int bg) |
1265 | int fg, int bg) |
1274 | { |
1266 | { |
1275 | clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); |
|
|
1276 | |
|
|
1277 | XGlyphInfo extents; |
1267 | XGlyphInfo extents; |
1278 | XftGlyphSpec *enc = (XftGlyphSpec *)rxvt_temp_buf (len * sizeof (XftGlyphSpec)); |
1268 | XftGlyphSpec *enc = (XftGlyphSpec *)rxvt_temp_buf (len * sizeof (XftGlyphSpec)); |
1279 | XftGlyphSpec *ep = enc; |
1269 | XftGlyphSpec *ep = enc; |
1280 | |
1270 | |
1281 | dTermDisplay; |
1271 | dTermDisplay; |
1282 | dTermGC; |
1272 | dTermGC; |
1283 | |
1273 | |
|
|
1274 | int w = term->fwidth * len; |
|
|
1275 | int h = term->fheight; |
|
|
1276 | |
|
|
1277 | /* TODO: this logic needs some more thinking, since we no longer do pseudo-transparency. |
|
|
1278 | * Maybe make buffering into a resource flag? Compile time option doesn't seems like a |
|
|
1279 | * good idea from the perspective of packaging for wide variety of user configs. |
|
|
1280 | */ |
|
|
1281 | bool buffered = true |
|
|
1282 | #ifdef FORCE_UNBUFFERED_XFT |
|
|
1283 | && bg >= 0 |
|
|
1284 | #endif |
|
|
1285 | ; |
1284 | // cut trailing spaces |
1286 | // cut trailing spaces |
1285 | while (len && text [len - 1] == ' ') |
1287 | while (len && text [len - 1] == ' ') |
1286 | len--; |
1288 | len--; |
|
|
1289 | |
|
|
1290 | int x_ = buffered ? 0 : x; |
|
|
1291 | int y_ = buffered ? 0 : y; |
1287 | |
1292 | |
1288 | while (len) |
1293 | while (len) |
1289 | { |
1294 | { |
1290 | int cwidth = term->fwidth; |
1295 | int cwidth = term->fwidth; |
1291 | FcChar32 fc = *text++; len--; |
1296 | FcChar32 fc = *text++; len--; |
… | |
… | |
1297 | { |
1302 | { |
1298 | FT_UInt glyph = XftCharIndex (disp, f, fc); |
1303 | FT_UInt glyph = XftCharIndex (disp, f, fc); |
1299 | XftGlyphExtents (disp, f, &glyph, 1, &extents); |
1304 | XftGlyphExtents (disp, f, &glyph, 1, &extents); |
1300 | |
1305 | |
1301 | ep->glyph = glyph; |
1306 | ep->glyph = glyph; |
1302 | ep->x = x + (cwidth - extents.xOff >> 1); |
1307 | ep->x = x_ + (cwidth - extents.xOff >> 1); |
1303 | ep->y = y + ascent; |
1308 | ep->y = y_ + ascent; |
|
|
1309 | |
|
|
1310 | if (extents.xOff == 0) |
|
|
1311 | ep->x = x_ + cwidth; |
|
|
1312 | |
1304 | ep++; |
1313 | ep++; |
1305 | } |
1314 | } |
1306 | |
1315 | |
1307 | x += cwidth; |
1316 | x_ += cwidth; |
|
|
1317 | } |
|
|
1318 | |
|
|
1319 | if (buffered) |
1308 | } |
1320 | { |
1309 | |
|
|
1310 | if (ep != enc) |
1321 | if (ep != enc) |
|
|
1322 | { |
|
|
1323 | rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); |
|
|
1324 | bool back_rendered = false; |
|
|
1325 | |
|
|
1326 | #ifdef HAVE_BG_PIXMAP |
|
|
1327 | if (term->bgPixmap.pixmap) |
|
|
1328 | { |
|
|
1329 | Picture dst = 0; |
|
|
1330 | if (bg >= 0 && term->pix_colors[bg].c.color.alpha < 0x0ff00) |
|
|
1331 | dst = XftDrawPicture (d2); |
|
|
1332 | |
|
|
1333 | if (bg < 0 || dst != 0) |
|
|
1334 | { |
|
|
1335 | if (term->bgPixmap.pmap_width >= x + term->window_vt_x+w |
|
|
1336 | && term->bgPixmap.pmap_height >= y + term->window_vt_y+h) |
|
|
1337 | { |
|
|
1338 | XCopyArea (disp, term->bgPixmap.pixmap, d2, gc, |
|
|
1339 | x + term->window_vt_x, y + term->window_vt_y, |
|
|
1340 | w, h, 0, 0); |
|
|
1341 | } |
|
|
1342 | else |
|
|
1343 | { |
|
|
1344 | XGCValues gcv; |
|
|
1345 | |
|
|
1346 | gcv.fill_style = FillTiled; |
|
|
1347 | gcv.tile = term->bgPixmap.pixmap; |
|
|
1348 | gcv.ts_x_origin = -x; |
|
|
1349 | gcv.ts_y_origin = -y; |
|
|
1350 | |
|
|
1351 | XChangeGC (disp, gc, |
|
|
1352 | GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle, |
|
|
1353 | &gcv); |
|
|
1354 | |
|
|
1355 | XFillRectangle (disp, d2, gc, 0, 0, w, h); |
|
|
1356 | |
|
|
1357 | gcv.fill_style = FillSolid; |
|
|
1358 | XChangeGC (disp, gc, GCFillStyle, &gcv); |
|
|
1359 | } |
|
|
1360 | |
|
|
1361 | if (bg >= 0) |
|
|
1362 | { |
|
|
1363 | Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c); |
|
|
1364 | XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h); |
|
|
1365 | } |
|
|
1366 | |
|
|
1367 | back_rendered = true; |
|
|
1368 | } |
|
|
1369 | } |
|
|
1370 | #endif |
|
|
1371 | |
|
|
1372 | if (bg >= 0 && !back_rendered) |
|
|
1373 | XftDrawRect (d2, &term->pix_colors[bg].c, 0, 0, w, h); |
|
|
1374 | |
|
|
1375 | XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc); |
|
|
1376 | XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y); |
|
|
1377 | } |
|
|
1378 | else |
|
|
1379 | clear_rect (d, x, y, w, h, bg); |
|
|
1380 | } |
|
|
1381 | else |
|
|
1382 | { |
|
|
1383 | clear_rect (d, x, y, w, h, bg); |
1311 | XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc); |
1384 | XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc); |
|
|
1385 | } |
1312 | } |
1386 | } |
|
|
1387 | |
1313 | #endif |
1388 | #endif |
1314 | |
1389 | |
1315 | ///////////////////////////////////////////////////////////////////////////// |
1390 | ///////////////////////////////////////////////////////////////////////////// |
1316 | |
1391 | |
1317 | rxvt_fontset::rxvt_fontset (rxvt_term *term) |
1392 | rxvt_fontset::rxvt_fontset (rxvt_term *term) |
… | |
… | |
1328 | void |
1403 | void |
1329 | rxvt_fontset::clear () |
1404 | rxvt_fontset::clear () |
1330 | { |
1405 | { |
1331 | prop.width = prop.height = prop.ascent = prop.weight = prop.slant |
1406 | prop.width = prop.height = prop.ascent = prop.weight = prop.slant |
1332 | = rxvt_fontprop::unset; |
1407 | = rxvt_fontprop::unset; |
|
|
1408 | force_prop = false; |
1333 | |
1409 | |
1334 | for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) |
1410 | for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) |
1335 | FONT_UNREF (*i); |
1411 | FONT_UNREF (*i); |
1336 | |
1412 | |
1337 | for (pagemap **p = fmap.begin (); p != fmap.end (); p++) |
1413 | for (pagemap **p = fmap.begin (); p != fmap.end (); p++) |
… | |
… | |
1449 | if (fonts[i]->loaded) |
1525 | if (fonts[i]->loaded) |
1450 | return true; |
1526 | return true; |
1451 | |
1527 | |
1452 | fonts[i]->loaded = true; |
1528 | fonts[i]->loaded = true; |
1453 | |
1529 | |
1454 | if (!fonts[i]->load (prop)) |
1530 | if (!fonts[i]->load (prop, force_prop)) |
1455 | { |
1531 | { |
1456 | fonts[i]->cs = CS_UNKNOWN; |
1532 | fonts[i]->cs = CS_UNKNOWN; |
1457 | return false; |
1533 | return false; |
1458 | } |
1534 | } |
1459 | |
1535 | |
… | |
… | |
1560 | FcPatternAddInteger (p, FC_SLANT, prop.slant); |
1636 | FcPatternAddInteger (p, FC_SLANT, prop.slant); |
1561 | FcPatternAddBool (p, FC_MINSPACE, 1); |
1637 | FcPatternAddBool (p, FC_MINSPACE, 1); |
1562 | //FcPatternAddBool (p, FC_ANTIALIAS, 1); |
1638 | //FcPatternAddBool (p, FC_ANTIALIAS, 1); |
1563 | |
1639 | |
1564 | XftResult result; |
1640 | XftResult result; |
1565 | FcPattern *match = XftFontMatch (term->display->display, term->display->screen, p, &result); |
1641 | FcPattern *match = XftFontMatch (term->dpy, term->display->screen, p, &result); |
1566 | |
1642 | |
1567 | FcPatternDestroy (p); |
1643 | FcPatternDestroy (p); |
1568 | |
1644 | |
1569 | if (match) |
1645 | if (match) |
1570 | { |
1646 | { |