1 | /*--------------------------------*-C-*---------------------------------* |
1 | /*----------------------------------------------------------------------* |
2 | * File: rxvtfont.C |
2 | * File: rxvtfont.C |
3 | *----------------------------------------------------------------------* |
3 | *----------------------------------------------------------------------* |
4 | * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> |
4 | * Copyright (c) 2003-2008 Marc Lehmann <pcg@goof.com> |
5 | * - original version. |
5 | * - original version. |
6 | * |
6 | * |
7 | * This program is free software; you can redistribute it and/or modify |
7 | * This program is free software; you can redistribute it and/or modify |
8 | * it under the terms of the GNU General Public License as published by |
8 | * it under the terms of the GNU General Public License as published by |
9 | * the Free Software Foundation; either version 2 of the License, or |
9 | * the Free Software Foundation; either version 2 of the License, or |
… | |
… | |
23 | #include "rxvt.h" |
23 | #include "rxvt.h" |
24 | #include "rxvtutil.h" |
24 | #include "rxvtutil.h" |
25 | #include "rxvtfont.h" |
25 | #include "rxvtfont.h" |
26 | |
26 | |
27 | #include <cstdlib> |
27 | #include <cstdlib> |
28 | #include <wchar.h> |
28 | |
29 | #include <inttypes.h> |
29 | #include <inttypes.h> |
30 | |
30 | |
31 | #define DISPLAY r->display->display |
31 | #if XFT |
32 | #define TGC r->gc |
32 | # include <fontconfig/fontconfig.h> |
|
|
33 | #endif |
33 | |
34 | |
34 | #define MAX_OVERLAP (4 + 1) // max. character width in 4ths of the base width |
35 | #define MAX_OVERLAP_ROMAN (8 + 2) // max. character width in 8ths of the base width |
|
|
36 | #define MAX_OVERLAP_ITALIC (8 + 3) // max. overlap for italic fonts |
35 | |
37 | |
|
|
38 | #define OVERLAP_OK(w,wcw,prop) ((w) <= ( \ |
|
|
39 | (prop)->slant >= rxvt_fontprop::italic \ |
|
|
40 | ? ((prop)->width * (wcw) * MAX_OVERLAP_ITALIC + 7) >> 3 \ |
|
|
41 | : ((prop)->width * (wcw) * MAX_OVERLAP_ROMAN + 7) >> 3 \ |
|
|
42 | )) |
|
|
43 | |
36 | const struct rxvt_fallback_font { |
44 | static const struct rxvt_fallback_font { |
37 | codeset cs; |
45 | codeset cs; |
38 | const char *name; |
46 | const char *name; |
39 | } fallback_fonts[] = { |
47 | } fallback_fonts[] = { |
40 | { CS_ISO8859_1, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-1" }, |
48 | { CS_ISO8859_1, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-1" }, |
41 | { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-15" }, |
49 | { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-15" }, |
42 | { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-fcd8859-15" }, |
50 | { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-fcd8859-15" }, |
43 | |
51 | |
44 | #if ENCODING_EU |
52 | #if ENCODING_EU |
45 | // cyrillic |
53 | // cyrillic |
46 | { CS_KOI8_R, "-*-*-*-r-*--*-*-*-*-c-*-koi8-r" }, |
54 | { CS_KOI8_R, "-*-*-*-r-*--*-*-*-*-c-*-koi8-r" }, |
47 | { CS_KOI8_U, "-*-*-*-r-*--*-*-*-*-c-*-koi8-u" }, |
55 | { CS_KOI8_U, "-*-*-*-r-*--*-*-*-*-c-*-koi8-u" }, |
48 | |
56 | |
49 | { CS_ISO8859_2, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-2" }, |
57 | { CS_ISO8859_2, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-2" }, |
50 | { CS_ISO8859_3, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-3" }, |
58 | { CS_ISO8859_3, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-3" }, |
51 | { CS_ISO8859_4, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-4" }, |
59 | { CS_ISO8859_4, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-4" }, |
52 | { CS_ISO8859_5, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-5" }, |
60 | { CS_ISO8859_5, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-5" }, |
53 | { CS_ISO8859_6, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-6" }, |
61 | { CS_ISO8859_6, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-6" }, |
… | |
… | |
59 | { CS_ISO8859_13, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-13" }, |
67 | { CS_ISO8859_13, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-13" }, |
60 | { CS_ISO8859_14, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-14" }, |
68 | { CS_ISO8859_14, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-14" }, |
61 | { CS_ISO8859_16, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-16" }, |
69 | { CS_ISO8859_16, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-16" }, |
62 | |
70 | |
63 | # if XFT |
71 | # if XFT |
64 | { CS_KOI8_U, "xft::spacing=100:lang=ru:antialias=false" }, |
72 | { CS_KOI8_U, "xft::lang=ru" }, |
65 | |
73 | |
66 | { CS_ISO8859_5, "xft::spacing=100:lang=ru:antialias=false" }, |
74 | { CS_ISO8859_5, "xft::lang=ru" }, |
67 | { CS_ISO8859_6, "xft::spacing=100:lang=ar:antialias=false" }, |
75 | { CS_ISO8859_6, "xft::lang=ar" }, |
68 | { CS_ISO8859_7, "xft::spacing=100:lang=el:antialias=false" }, |
76 | { CS_ISO8859_7, "xft::lang=el" }, |
69 | { CS_ISO8859_8, "xft::spacing=100:lang=he:antialias=false" }, |
77 | { CS_ISO8859_8, "xft::lang=he" }, |
70 | { CS_ISO8859_9, "xft::spacing=100:lang=tr:antialias=false" }, |
78 | { CS_ISO8859_9, "xft::lang=tr" }, |
71 | { CS_ISO8859_10, "xft::spacing=100:lang=se:antialias=false" }, |
79 | { CS_ISO8859_10, "xft::lang=se" }, |
72 | { CS_ISO8859_11, "xft::spacing=100:lang=th:antialias=false" }, |
80 | { CS_ISO8859_11, "xft::lang=th" }, |
73 | # endif |
81 | # endif |
74 | #endif |
82 | #endif |
75 | |
83 | |
76 | // japanese |
84 | // japanese |
77 | #if ENCODING_JP || ENCODING_JP_EXT |
85 | #if ENCODING_JP || ENCODING_JP_EXT |
78 | # if XFT |
86 | # if XFT |
79 | // prefer xft for complex scripts |
87 | // prefer xft for complex scripts |
|
|
88 | { CS_JIS0208_1990_0, "xft:Sazanami Mincho:antialias=false" }, |
80 | { CS_JIS0208_1990_0, "xft:Kochi Gothic:antialias=false" }, |
89 | { CS_JIS0208_1990_0, "xft:Kochi Gothic:antialias=false" }, |
81 | { CS_JIS0208_1990_0, "xft:Sazanami Mincho:antialias=false" }, |
|
|
82 | { CS_JIS0208_1990_0, "xft:Mincho:antialias=false" }, |
90 | { CS_JIS0208_1990_0, "xft:Mincho:antialias=false" }, |
83 | { CS_JIS0208_1990_0, "xft::lang=ja:spacing=100:antialias=false" }, |
91 | { CS_JIS0208_1990_0, "xft::lang=ja:antialias=false" }, |
84 | # endif |
92 | # endif |
85 | { CS_JIS0201_1976_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0201*-0" }, |
93 | { CS_JIS0201_1976_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0201*-0" }, |
86 | { CS_JIS0208_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" }, |
94 | { CS_JIS0208_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" }, |
87 | { CS_JIS0212_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0212*-0" }, |
95 | { CS_JIS0212_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0212*-0" }, |
88 | { CS_JIS0201_1976_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0201*-0" }, |
96 | { CS_JIS0201_1976_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0201*-0" }, |
… | |
… | |
92 | |
100 | |
93 | #if ENCODING_ZH || ENCODING_ZH_EXT |
101 | #if ENCODING_ZH || ENCODING_ZH_EXT |
94 | # if XFT |
102 | # if XFT |
95 | { CS_GBK_0, "xft:AR PL KaitiM GB" }, |
103 | { CS_GBK_0, "xft:AR PL KaitiM GB" }, |
96 | { CS_GBK_0, "xft:AR PL SungtiL GB" }, |
104 | { CS_GBK_0, "xft:AR PL SungtiL GB" }, |
97 | { CS_GBK_0, "xft::spacing=100:lang=zh" }, |
105 | { CS_GBK_0, "xft::lang=zh" }, |
98 | { CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" }, |
106 | { CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" }, |
99 | { CS_BIG5_EXT, "xft:AR PL KaitiM Big5" }, |
107 | { CS_BIG5_EXT, "xft:AR PL KaitiM Big5" }, |
100 | { CS_GB2312_1980_0, "xft:AR PL KaitiM GB" }, |
108 | { CS_GB2312_1980_0, "xft:AR PL KaitiM GB" }, |
101 | { CS_GB2312_1980_0, "xft:AR PL SungtiL GB" }, |
109 | { CS_GB2312_1980_0, "xft:AR PL SungtiL GB" }, |
102 | { CS_GB2312_1980_0, "xft::spacing=100:lang=zh" }, |
110 | { CS_GB2312_1980_0, "xft::lang=zh" }, |
103 | # endif |
111 | # endif |
104 | { CS_GBK_0, "-*-*-*-*-*-*-*-*-*-*-c-*-gbk*-0" }, |
112 | { CS_GBK_0, "-*-*-*-*-*-*-*-*-*-*-c-*-gbk*-0" }, |
105 | { CS_BIG5, "-*-*-*-*-*-*-*-*-*-*-c-*-big5-0" }, |
113 | { CS_BIG5, "-*-*-*-*-*-*-*-*-*-*-c-*-big5-0" }, |
106 | { CS_BIG5_PLUS, "-*-*-*-*-*-*-*-*-*-*-c-*-big5p-0" }, |
114 | { CS_BIG5_PLUS, "-*-*-*-*-*-*-*-*-*-*-c-*-big5p-0" }, |
107 | { CS_BIG5_EXT, "-*-*-*-*-*-*-*-*-*-*-c-*-big5.eten-0" }, |
115 | { CS_BIG5_EXT, "-*-*-*-*-*-*-*-*-*-*-c-*-big5.eten-0" }, |
… | |
… | |
120 | #if ENCODING_KR |
128 | #if ENCODING_KR |
121 | { CS_KSC5601_1987_0, "-baekmuk-gulim-*-*-*-*-*-*-*-*-c-*-ksc5601*" }, |
129 | { CS_KSC5601_1987_0, "-baekmuk-gulim-*-*-*-*-*-*-*-*-c-*-ksc5601*" }, |
122 | { CS_KSC5601_1987_0, "-*-*-*-*-*-*-*-*-*-*-c-*-ksc5601*" }, |
130 | { CS_KSC5601_1987_0, "-*-*-*-*-*-*-*-*-*-*-c-*-ksc5601*" }, |
123 | # if XFT |
131 | # if XFT |
124 | { CS_KSC5601_1987_0, "xft:Baekmuk Gulim:antialias=false" }, |
132 | { CS_KSC5601_1987_0, "xft:Baekmuk Gulim:antialias=false" }, |
125 | { CS_KSC5601_1987_0, "xft::spacing=100:lang=ko:antialias=false" }, |
133 | { CS_KSC5601_1987_0, "xft::lang=ko:antialias=false" }, |
126 | # endif |
134 | # endif |
127 | #endif |
135 | #endif |
128 | |
136 | |
129 | // generic font fallback |
|
|
130 | { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" }, |
137 | { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" }, |
131 | { CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" }, |
138 | //{ CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" }, // this gem of a font has actual dotted circles within the combining character glyphs. |
132 | { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" }, |
|
|
133 | { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" }, |
|
|
134 | #if XFT |
139 | #if XFT |
135 | { CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true" }, |
140 | { CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true" }, |
136 | { CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" }, |
141 | { CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" }, |
137 | { CS_UNICODE, "xft:Andale Mono:antialias=false:autohint=false" }, |
142 | { CS_UNICODE, "xft:Andale Mono:antialias=false:autohint=false" }, |
138 | { CS_UNICODE, "xft:Arial Unicode MS:antialias=false:autohint=false" }, |
143 | { CS_UNICODE, "xft:Arial Unicode MS:antialias=false:autohint=false" }, |
139 | |
144 | |
140 | // FreeMono is usually uglier than x fonts, so try last only. |
145 | // FreeMono is usually uglier than x fonts, so try after the others |
141 | { CS_UNICODE, "xft:FreeMono:autohint=true" }, |
146 | { CS_UNICODE, "xft:FreeMono:autohint=true" }, |
142 | #endif |
147 | #endif |
143 | |
148 | |
|
|
149 | // generic font fallback, put this last, as many iso10646 fonts have extents |
|
|
150 | // specified for all glyphs in the range they cover, but most are simply empty |
|
|
151 | //{ CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" }, |
|
|
152 | //{ CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" }, |
144 | { CS_UNKNOWN, 0 } |
153 | { CS_UNKNOWN, 0 } |
145 | }; |
154 | }; |
146 | |
155 | |
147 | // these characters are used to guess the font height and width |
156 | // these characters are used to guess the font height and width |
148 | // pango uses a similar algorithm and doesn't trust the font either. |
157 | // pango uses a similar algorithm and doesn't trust the font either. |
… | |
… | |
150 | '0', '1', '8', 'a', 'd', 'x', 'm', 'y', 'g', 'W', 'X', '\'', '_', |
159 | '0', '1', '8', 'a', 'd', 'x', 'm', 'y', 'g', 'W', 'X', '\'', '_', |
151 | 0x00cd, 0x00d5, 0x0114, 0x0177, 0x0643, // ÍÕĔŷﻙ |
160 | 0x00cd, 0x00d5, 0x0114, 0x0177, 0x0643, // ÍÕĔŷﻙ |
152 | 0x304c, 0x672c, // が本 |
161 | 0x304c, 0x672c, // が本 |
153 | }; |
162 | }; |
154 | |
163 | |
155 | #define NUM_EXTENT_TEST_CHARS (sizeof (extent_test_chars) / sizeof (extent_test_chars[0])) |
164 | #define dTermDisplay Display *disp = term->dpy |
|
|
165 | #define dTermGC GC gc = term->gc |
156 | |
166 | |
157 | ///////////////////////////////////////////////////////////////////////////// |
167 | ///////////////////////////////////////////////////////////////////////////// |
158 | |
|
|
159 | #if XFT |
|
|
160 | rxvt_drawable::~rxvt_drawable () |
|
|
161 | { |
|
|
162 | if (xftdrawable) |
|
|
163 | XftDrawDestroy (xftdrawable); |
|
|
164 | } |
|
|
165 | |
|
|
166 | rxvt_drawable::operator XftDraw *() |
|
|
167 | { |
|
|
168 | if (!xftdrawable) |
|
|
169 | xftdrawable = XftDrawCreate (display->display, drawable, display->visual, display->cmap); |
|
|
170 | |
|
|
171 | return xftdrawable; |
|
|
172 | } |
|
|
173 | #endif |
|
|
174 | |
|
|
175 | ///////////////////////////////////////////////////////////////////////////// |
|
|
176 | |
|
|
177 | static void *enc_buf; |
|
|
178 | static uint32_t enc_len; |
|
|
179 | |
|
|
180 | static inline void * |
|
|
181 | get_enc_buf (uint32_t len) |
|
|
182 | { |
|
|
183 | if (len > enc_len) |
|
|
184 | { |
|
|
185 | free (enc_buf); |
|
|
186 | enc_buf = malloc (len); |
|
|
187 | enc_len = len; |
|
|
188 | } |
|
|
189 | |
|
|
190 | return enc_buf; |
|
|
191 | } |
|
|
192 | |
168 | |
193 | static const char * |
169 | static const char * |
194 | enc_char (const text_t *text, uint32_t len, codeset cs, bool &zero) |
170 | enc_char (const text_t *text, uint32_t len, codeset cs, bool &zero) |
195 | { |
171 | { |
196 | uint8_t *buf = (uint8_t *)get_enc_buf (len); |
172 | uint8_t *buf = rxvt_temp_buf<uint8_t> (len); |
|
|
173 | uint8_t *res = buf; |
197 | |
174 | |
198 | while (len--) |
175 | while (len--) |
199 | { |
176 | { |
200 | uint32_t c = FROM_UNICODE (cs, *text++); |
177 | uint32_t c = FROM_UNICODE (cs, *text++); |
201 | |
178 | |
… | |
… | |
206 | } |
183 | } |
207 | |
184 | |
208 | *buf++ = c; |
185 | *buf++ = c; |
209 | } |
186 | } |
210 | |
187 | |
211 | return (const char *)enc_buf; |
188 | return (const char *)res; |
212 | } |
189 | } |
213 | |
190 | |
214 | static const XChar2b * |
191 | static const XChar2b * |
215 | enc_xchar2b (const text_t *text, uint32_t len, codeset cs, bool &zero) |
192 | enc_xchar2b (const text_t *text, uint32_t len, codeset cs, bool &zero) |
216 | { |
193 | { |
217 | XChar2b *buf = (XChar2b *)get_enc_buf (len * sizeof (XChar2b)); |
194 | XChar2b *buf = rxvt_temp_buf<XChar2b> (len); |
|
|
195 | XChar2b *res = buf; |
218 | |
196 | |
219 | while (len--) |
197 | while (len--) |
220 | { |
198 | { |
221 | uint32_t c = FROM_UNICODE (cs, *text++); |
199 | uint32_t c = FROM_UNICODE (cs, *text++); |
222 | |
200 | |
… | |
… | |
229 | buf->byte1 = c >> 8; |
207 | buf->byte1 = c >> 8; |
230 | buf->byte2 = c; |
208 | buf->byte2 = c; |
231 | buf++; |
209 | buf++; |
232 | } |
210 | } |
233 | |
211 | |
234 | return (XChar2b *)enc_buf; |
212 | return res; |
235 | } |
213 | } |
236 | |
214 | |
237 | ///////////////////////////////////////////////////////////////////////////// |
215 | ///////////////////////////////////////////////////////////////////////////// |
238 | |
216 | |
|
|
217 | rxvt_font::rxvt_font () |
|
|
218 | : name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset) |
|
|
219 | { |
|
|
220 | } |
|
|
221 | |
239 | void |
222 | void |
240 | rxvt_font::set_name (char *name) |
223 | rxvt_font::set_name (char *name_) |
241 | { |
224 | { |
242 | if (this->name == name) |
225 | if (name == name_) |
243 | return; |
226 | return; |
244 | |
227 | |
245 | if (this->name) free (this->name); // let the compiler optimize |
228 | if (name) free (name); // let the compiler optimize |
246 | this->name = name; |
229 | name = name_; |
247 | } |
230 | } |
248 | |
231 | |
249 | void |
232 | void |
250 | rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) |
233 | rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const |
251 | { |
234 | { |
252 | if (color == Color_bg) |
235 | dTermDisplay; |
253 | XClearArea (d.display->display, d, x, y, w, h, FALSE); |
236 | dTermGC; |
|
|
237 | |
|
|
238 | if (color == Color_bg || color == Color_transparent) |
|
|
239 | XClearArea (disp, d, x, y, w, h, false); |
254 | else if (color >= 0) |
240 | else if (color >= 0) |
255 | { |
241 | { |
256 | #if XFT |
242 | #if XFT |
|
|
243 | Picture dst; |
|
|
244 | |
|
|
245 | # ifdef HAVE_BG_PIXMAP |
|
|
246 | if (term->bgPixmap.pixmap |
|
|
247 | && !term->pix_colors[color].is_opaque () |
|
|
248 | && ((dst = XftDrawPicture (d)))) |
|
|
249 | { |
|
|
250 | XClearArea (disp, d, x, y, w, h, false); |
|
|
251 | |
|
|
252 | Picture solid_color_pict = XftDrawSrcPicture (d, &term->pix_colors[color].c); |
|
|
253 | XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, x, y, w, h); |
|
|
254 | } |
|
|
255 | else |
|
|
256 | # endif |
257 | XftDrawRect (d, &r->pix_colors[color].c, x, y, w, h); |
257 | XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h); |
|
|
258 | |
258 | #else |
259 | #else |
259 | XSetForeground (d.display->display, TGC, r->pix_colors[color]); |
260 | XSetForeground (disp, gc, term->pix_colors[color]); |
260 | XFillRectangle (d.display->display, d, TGC, x, y, w, h); |
261 | XFillRectangle (disp, d, gc, x, y, w, h); |
261 | #endif |
262 | #endif |
262 | } |
263 | } |
263 | } |
264 | } |
264 | |
265 | |
265 | #include "table/linedraw.h" |
266 | ///////////////////////////////////////////////////////////////////////////// |
266 | |
267 | |
267 | struct rxvt_font_default : rxvt_font { |
268 | struct rxvt_font_default : rxvt_font { |
268 | struct rxvt_fontset *fs; |
269 | struct rxvt_fontset *fs; |
269 | |
270 | |
270 | rxvt_font_default (rxvt_fontset *fs) |
271 | rxvt_font_default (rxvt_fontset *fs) |
… | |
… | |
283 | p.slant = rxvt_fontprop::roman; |
284 | p.slant = rxvt_fontprop::roman; |
284 | |
285 | |
285 | return p; |
286 | return p; |
286 | } |
287 | } |
287 | |
288 | |
288 | bool load (const rxvt_fontprop &prop) |
289 | bool load (const rxvt_fontprop &prop, bool force_prop) |
289 | { |
290 | { |
290 | width = 1; height = 1; |
291 | width = 1; height = 1; |
291 | ascent = 1; descent = 0; |
292 | ascent = 1; descent = 0; |
292 | |
293 | |
293 | set_name (strdup ("built-in support font")); |
294 | set_name (strdup ("built-in support font")); |
294 | |
295 | |
295 | return true; |
296 | return true; |
296 | } |
297 | } |
297 | |
298 | |
298 | bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) |
299 | bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const |
299 | { |
300 | { |
300 | careful = false; |
301 | careful = false; |
301 | |
302 | |
302 | if (unicode <= 0x001f) |
303 | if (unicode <= 0x001f) |
303 | return true; |
304 | return true; |
… | |
… | |
306 | return false; |
307 | return false; |
307 | |
308 | |
308 | if (unicode <= 0x009f) |
309 | if (unicode <= 0x009f) |
309 | return true; |
310 | return true; |
310 | |
311 | |
|
|
312 | #ifdef BUILTIN_GLYPHS |
311 | if (unicode >= 0x2500 && unicode <= 0x259f) |
313 | if (unicode >= 0x2500 && unicode <= 0x259f && |
|
|
314 | !term->option (Opt_skipBuiltinGlyphs)) |
312 | return true; |
315 | return true; |
|
|
316 | #endif |
313 | |
317 | |
314 | if (IS_COMPOSE (unicode)) |
318 | if (IS_COMPOSE (unicode)) |
315 | return true; |
319 | return true; |
316 | |
320 | |
317 | switch (unicode) |
321 | switch (unicode) |
… | |
… | |
332 | void |
336 | void |
333 | rxvt_font_default::draw (rxvt_drawable &d, int x, int y, |
337 | rxvt_font_default::draw (rxvt_drawable &d, int x, int y, |
334 | const text_t *text, int len, |
338 | const text_t *text, int len, |
335 | int fg, int bg) |
339 | int fg, int bg) |
336 | { |
340 | { |
337 | Display *disp = d.display->display; |
341 | dTermDisplay; |
|
|
342 | dTermGC; |
338 | |
343 | |
339 | clear_rect (d, x, y, r->fwidth * len, r->fheight, bg); |
344 | clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); |
340 | |
345 | |
341 | XSetForeground (disp, TGC, r->pix_colors[fg]); |
346 | XSetForeground (disp, gc, term->pix_colors[fg]); |
342 | |
347 | |
343 | while (len) |
348 | while (len) |
344 | { |
349 | { |
345 | #if ENABLE_COMBINING |
350 | #if ENABLE_COMBINING |
346 | compose_char *cc; |
351 | compose_char *cc; |
… | |
… | |
350 | |
355 | |
351 | while (++text, --len && *text == NOCHAR) |
356 | while (++text, --len && *text == NOCHAR) |
352 | ; |
357 | ; |
353 | |
358 | |
354 | int width = text - tp; |
359 | int width = text - tp; |
355 | int fwidth = r->fwidth * width; |
360 | int fwidth = term->fwidth * width; |
356 | |
361 | |
|
|
362 | #ifdef BUILTIN_GLYPHS |
357 | if (0x2500 <= t && t <= 0x259f) |
363 | if (0x2500 <= t && t <= 0x259f) |
358 | { |
364 | { |
|
|
365 | # include "table/linedraw.h" |
359 | uint16_t offs = linedraw_offs[t - 0x2500]; |
366 | uint16_t offs = linedraw_offs[t - 0x2500]; |
360 | uint32_t *a = linedraw_command + (offs >> 4); |
367 | uint32_t *a = linedraw_command + (offs >> 4); |
361 | uint32_t *b = a + (offs & 15); |
368 | uint32_t *b = a + (offs & 15); |
362 | |
369 | |
363 | int W = fwidth; |
370 | int W = fwidth; |
364 | int H = r->fheight; |
371 | int H = term->fheight; |
365 | |
372 | |
366 | int x_[16]; |
373 | int x_[16]; |
367 | int y_[16]; |
374 | int y_[16]; |
368 | |
375 | |
369 | for (int i = 0; i <= 8; i++) |
376 | for (int i = 0; i <= 8; i++) |
… | |
… | |
377 | |
384 | |
378 | XGCValues gcv; |
385 | XGCValues gcv; |
379 | |
386 | |
380 | gcv.cap_style = CapButt; |
387 | gcv.cap_style = CapButt; |
381 | gcv.line_width = 0; |
388 | gcv.line_width = 0; |
382 | XChangeGC (disp, TGC, GCLineWidth | GCCapStyle, &gcv); |
389 | XChangeGC (disp, gc, GCLineWidth | GCCapStyle, &gcv); |
383 | |
390 | |
384 | while (a < b) |
391 | while (a < b) |
385 | { |
392 | { |
386 | uint32_t command = *a++; |
393 | uint32_t command = *a++; |
387 | |
394 | |
… | |
… | |
394 | int y2 = y_[(command >> 0) & 15]; |
401 | int y2 = y_[(command >> 0) & 15]; |
395 | |
402 | |
396 | switch (op) |
403 | switch (op) |
397 | { |
404 | { |
398 | case 0: // line |
405 | case 0: // line |
399 | XDrawLine (disp, d, TGC, x1, y1, x2, y2); |
406 | XDrawLine (disp, d, gc, x1, y1, x2, y2); |
400 | break; |
407 | break; |
401 | |
408 | |
402 | case 1: // rectangle, possibly stippled |
409 | case 1: // rectangle, possibly stippled |
403 | if (a) |
410 | if (a) |
404 | { |
411 | { |
405 | static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 }; |
412 | static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 }; |
406 | |
413 | |
407 | gcv.fill_style = FillStippled; |
414 | gcv.fill_style = FillStippled; |
408 | gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2); |
415 | gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2); |
409 | gcv.ts_x_origin = x; |
416 | gcv.ts_x_origin = x; |
410 | gcv.ts_y_origin = y; |
417 | gcv.ts_y_origin = y; |
411 | |
418 | |
412 | XChangeGC (disp, TGC, |
419 | XChangeGC (disp, gc, |
413 | GCFillStyle | GCStipple | GCTileStipXOrigin | GCTileStipYOrigin, |
420 | GCFillStyle | GCStipple | GCTileStipXOrigin | GCTileStipYOrigin, |
414 | &gcv); |
421 | &gcv); |
415 | } |
422 | } |
416 | |
423 | |
417 | XFillRectangle (disp, d, TGC, x1, y1, x2 - x1 + 1, y2 - y1 + 1); |
424 | XFillRectangle (disp, d, gc, x1, y1, x2 - x1 + 1, y2 - y1 + 1); |
418 | |
425 | |
419 | if (a) |
426 | if (a) |
420 | { |
427 | { |
421 | XFreePixmap (disp, gcv.stipple); |
428 | XFreePixmap (disp, gcv.stipple); |
422 | gcv.stipple = 0; |
429 | gcv.stipple = 0; |
423 | gcv.fill_style = FillSolid; |
430 | gcv.fill_style = FillSolid; |
424 | XChangeGC (disp, TGC, GCFillStyle, &gcv); |
431 | XChangeGC (disp, gc, GCFillStyle, &gcv); |
425 | } |
432 | } |
426 | break; |
433 | break; |
427 | case 2: // arc |
434 | case 2: // arc |
428 | XDrawArc (disp, d, TGC, |
435 | XDrawArc (disp, d, gc, |
429 | x1 - W/2, y1 - H/2, W-1, H-1, |
436 | x1 - W/2, y1 - H/2, W-1, H-1, |
430 | (a - 1) * 90*64, (b - 1) * 90*64); |
437 | (a - 1) * 90*64, (b - 1) * 90*64); |
431 | break; |
438 | break; |
432 | } |
439 | } |
433 | } |
440 | } |
434 | } |
441 | } |
|
|
442 | #else |
|
|
443 | if (0) |
|
|
444 | ; |
|
|
445 | #endif |
435 | #if ENABLE_COMBINING |
446 | #if ENABLE_COMBINING |
436 | else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) |
447 | else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) |
437 | { |
448 | { |
|
|
449 | min_it (width, 2); // we only support wcwidth up to 2 |
|
|
450 | |
438 | text_t chrs[2]; |
451 | text_t chrs[2]; |
439 | width = min (2, width); |
|
|
440 | chrs [1] = NOCHAR; |
452 | chrs [1] = NOCHAR; |
441 | |
453 | |
442 | *chrs = cc->c1; |
454 | *chrs = cc->c1; |
443 | rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)]; |
455 | rxvt_font *f1 = (*fs)[fs->find_font_idx (cc->c1)]; |
444 | f1->draw (d, x, y, chrs, width, fg, bg); |
456 | f1->draw (d, x, y, chrs, width, fg, bg); |
445 | |
457 | |
446 | if (cc->c2 != NOCHAR) |
458 | if (cc->c2 != NOCHAR) |
447 | { |
459 | { |
448 | bool careful; |
460 | bool careful; |
449 | |
461 | |
450 | // prefer font of first character, for no good reasons |
462 | // prefer font of first character, for no good reasons |
451 | *chrs = cc->c2; |
463 | *chrs = cc->c2; |
452 | rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful) |
464 | rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful) |
453 | ? f1 |
465 | ? f1 |
454 | : (*fs)[fs->find_font (cc->c2)]; |
466 | : (*fs)[fs->find_font_idx (cc->c2)]; |
455 | |
467 | |
456 | f2->draw (d, x, y, chrs, width, fg, -1); |
468 | f2->draw (d, x, y, chrs, width, fg, Color_none); |
457 | } |
469 | } |
458 | } |
470 | } |
459 | #endif |
471 | #endif |
460 | else |
472 | else |
461 | switch (t) |
473 | switch (t) |
… | |
… | |
464 | case ZERO_WIDTH_CHAR: |
476 | case ZERO_WIDTH_CHAR: |
465 | case NOCHAR: |
477 | case NOCHAR: |
466 | break; |
478 | break; |
467 | |
479 | |
468 | default: |
480 | default: |
469 | XDrawRectangle (disp, d, TGC, x + 2, y + 2, |
481 | XDrawRectangle (disp, d, gc, x + 2, y + 2, |
470 | fwidth - 4, r->fheight - 4); |
482 | fwidth - 4, term->fheight - 4); |
471 | } |
483 | } |
472 | |
484 | |
473 | x += fwidth; |
485 | x += fwidth; |
474 | } |
486 | } |
475 | } |
487 | } |
|
|
488 | |
|
|
489 | struct rxvt_font_overflow : rxvt_font { |
|
|
490 | struct rxvt_fontset *fs; |
|
|
491 | |
|
|
492 | rxvt_font_overflow (rxvt_fontset *fs) |
|
|
493 | : rxvt_font () |
|
|
494 | { |
|
|
495 | this->fs = fs; |
|
|
496 | } |
|
|
497 | |
|
|
498 | rxvt_fontprop properties () |
|
|
499 | { |
|
|
500 | rxvt_fontprop p; |
|
|
501 | |
|
|
502 | p.width = p.height = 1; |
|
|
503 | p.ascent = rxvt_fontprop::unset; |
|
|
504 | p.weight = rxvt_fontprop::medium; |
|
|
505 | p.slant = rxvt_fontprop::roman; |
|
|
506 | |
|
|
507 | return p; |
|
|
508 | } |
|
|
509 | |
|
|
510 | bool load (const rxvt_fontprop &prop, bool force_prop) |
|
|
511 | { |
|
|
512 | width = 1; height = 1; |
|
|
513 | ascent = 1; descent = 0; |
|
|
514 | |
|
|
515 | set_name (strdup ("built-in rendition overflow font")); |
|
|
516 | |
|
|
517 | return true; |
|
|
518 | } |
|
|
519 | |
|
|
520 | bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const |
|
|
521 | { |
|
|
522 | return false; |
|
|
523 | } |
|
|
524 | |
|
|
525 | void draw (rxvt_drawable &d, int x, int y, |
|
|
526 | const text_t *text, int len, |
|
|
527 | int fg, int bg) |
|
|
528 | { |
|
|
529 | while (len--) |
|
|
530 | { |
|
|
531 | int fid = fs->find_font_idx (*text); |
|
|
532 | (*fs)[fid]->draw (d, x, y, text, 1, fg, bg); |
|
|
533 | ++text; |
|
|
534 | x += term->fwidth; |
|
|
535 | } |
|
|
536 | } |
|
|
537 | }; |
476 | |
538 | |
477 | ///////////////////////////////////////////////////////////////////////////// |
539 | ///////////////////////////////////////////////////////////////////////////// |
478 | |
540 | |
479 | struct rxvt_font_x11 : rxvt_font { |
541 | struct rxvt_font_x11 : rxvt_font { |
480 | rxvt_font_x11 () { f = 0; } |
542 | rxvt_font_x11 () { f = 0; } |
481 | |
543 | |
482 | void clear (); |
544 | void clear (); |
483 | |
545 | |
484 | rxvt_fontprop properties (); |
546 | rxvt_fontprop properties (); |
485 | |
547 | |
486 | bool load (const rxvt_fontprop &prop); |
548 | bool load (const rxvt_fontprop &prop, bool force_prop); |
487 | |
549 | |
488 | bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful); |
550 | bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const; |
489 | |
551 | |
490 | void draw (rxvt_drawable &d, int x, int y, |
552 | void draw (rxvt_drawable &d, int x, int y, |
491 | const text_t *text, int len, |
553 | const text_t *text, int len, |
492 | int fg, int bg); |
554 | int fg, int bg); |
493 | |
555 | |
494 | bool slow; // wether this is a proportional font or has other funny characteristics |
556 | bool slow; // whether this is a proportional font or has other funny characteristics |
495 | XFontStruct *f; |
557 | XFontStruct *f; |
496 | codeset cs; |
|
|
497 | bool enc2b, encm; |
558 | bool enc2b, encm; |
498 | |
559 | |
499 | char *get_property (XFontStruct *f, const char *property, const char *repl) const; |
560 | char *get_property (XFontStruct *f, Atom property, const char *repl) const; |
500 | bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth); |
561 | bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth); |
501 | bool set_properties (rxvt_fontprop &p, XFontStruct *f); |
562 | bool set_properties (rxvt_fontprop &p, XFontStruct *f); |
502 | bool set_properties (rxvt_fontprop &p, const char *name); |
563 | bool set_properties (rxvt_fontprop &p, const char *name); |
503 | }; |
564 | }; |
504 | |
565 | |
505 | char * |
566 | char * |
506 | rxvt_font_x11::get_property (XFontStruct *f, const char *property, const char *repl) const |
567 | rxvt_font_x11::get_property (XFontStruct *f, Atom property, const char *repl) const |
507 | { |
568 | { |
508 | unsigned long value; |
569 | unsigned long value; |
509 | |
570 | |
510 | if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value)) |
571 | if (XGetFontProperty (f, property, &value)) |
511 | return XGetAtomName (DISPLAY, value); |
572 | return XGetAtomName (term->dpy, value); |
512 | else |
573 | else |
513 | return rxvt_strdup (repl); |
574 | return repl ? strdup (repl) : 0; |
514 | } |
575 | } |
515 | |
576 | |
516 | rxvt_fontprop |
577 | rxvt_fontprop |
517 | rxvt_font_x11::properties () |
578 | rxvt_font_x11::properties () |
518 | { |
579 | { |
… | |
… | |
522 | } |
583 | } |
523 | |
584 | |
524 | bool |
585 | bool |
525 | rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth) |
586 | rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth) |
526 | { |
587 | { |
527 | p.width = avgwidth ? (avgwidth + 1) / 10 : (height + 1) / 2; |
588 | p.width = width != rxvt_fontprop::unset ? width |
|
|
589 | : avgwidth ? (avgwidth + 1) / 10 |
|
|
590 | : (height + 1) / 2; |
528 | p.height = height; |
591 | p.height = height; |
529 | p.ascent = rxvt_fontprop::unset; |
592 | p.ascent = rxvt_fontprop::unset; |
530 | p.weight = *weight == 'B' || *weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium; |
593 | p.weight = *weight == 'B' || *weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium; |
531 | p.slant = *slant == 'r' || *slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic; |
594 | p.slant = *slant == 'r' || *slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic; |
532 | |
595 | |
… | |
… | |
537 | rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f) |
600 | rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f) |
538 | { |
601 | { |
539 | unsigned long height; |
602 | unsigned long height; |
540 | |
603 | |
541 | #if 0 |
604 | #if 0 |
542 | if (!XGetFontProperty (f, XInternAtom (DISPLAY, "PIXEL_SIZE", 0), &height)) |
605 | if (!XGetFontProperty (f, XInternAtom (term->dpy, "PIXEL_SIZE", 0), &height)) |
543 | return false; |
606 | return false; |
544 | #else |
607 | #else |
545 | height = f->ascent + f->descent; |
608 | height = f->ascent + f->descent; |
546 | #endif |
609 | #endif |
547 | |
610 | |
548 | unsigned long avgwidth; |
611 | unsigned long avgwidth; |
549 | if (!XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth)) |
612 | if (!XGetFontProperty (f, term->xa [XA_AVERAGE_WIDTH], &avgwidth)) |
550 | avgwidth = 0; |
613 | avgwidth = 0; |
551 | |
614 | |
552 | char *weight = get_property (f, "WEIGHT_NAME", "medium"); |
615 | char *weight = get_property (f, term->xa [XA_WEIGHT_NAME], "medium"); |
553 | char *slant = get_property (f, "SLANT", "r"); |
616 | char *slant = get_property (f, term->xa [XA_SLANT], "r"); |
554 | |
617 | |
555 | set_properties (p, height, weight, slant, avgwidth); |
618 | set_properties (p, height, weight, slant, avgwidth); |
556 | |
619 | |
557 | free (weight); |
620 | free (weight); |
558 | free (slant); |
621 | free (slant); |
… | |
… | |
563 | } |
626 | } |
564 | |
627 | |
565 | bool |
628 | bool |
566 | rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name) |
629 | rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name) |
567 | { |
630 | { |
|
|
631 | dTermDisplay; |
568 | int slashes = 0; |
632 | int slashes = 0; |
569 | const char *comp[13]; |
633 | const char *comp[13]; |
570 | |
634 | |
571 | for (const char *c = name; *c; c++) |
635 | for (const char *c = name; *c; c++) |
572 | if (*c == '-') |
636 | if (*c == '-') |
… | |
… | |
580 | if (slashes >= 13 |
644 | if (slashes >= 13 |
581 | && (*comp[ 6] >= '1' && *comp[ 6] <= '9') |
645 | && (*comp[ 6] >= '1' && *comp[ 6] <= '9') |
582 | && (*comp[11] >= '0' && *comp[11] <= '9')) |
646 | && (*comp[11] >= '0' && *comp[11] <= '9')) |
583 | return set_properties (p, atoi (comp[6]), comp[2], comp[3], atoi (comp[11])); |
647 | return set_properties (p, atoi (comp[6]), comp[2], comp[3], atoi (comp[11])); |
584 | |
648 | |
585 | XFontStruct *f = XLoadQueryFont (DISPLAY, name); |
649 | XFontStruct *f = XLoadQueryFont (disp, name); |
586 | |
650 | |
587 | if (f) |
651 | if (f) |
588 | { |
652 | { |
589 | // the font should really exist now. if not, we have a problem |
653 | // the font should really exist now. if not, we have a problem |
590 | // (e.g. if the user did xset fp rehash just when we were searching fonts). |
654 | // (e.g. if the user did xset fp rehash just when we were searching fonts). |
591 | // in that case, just return garbage. |
655 | // in that case, just return garbage. |
592 | bool ret = set_properties (p, f); |
656 | bool ret = set_properties (p, f); |
593 | XFreeFont (DISPLAY, f); |
657 | XFreeFont (disp, f); |
594 | return ret; |
658 | return ret; |
595 | } |
659 | } |
596 | else |
660 | else |
597 | return false; |
661 | return false; |
598 | } |
662 | } |
599 | |
663 | |
600 | // fix the size of scalable fonts |
664 | // fix the size of scalable fonts |
601 | static bool |
665 | static bool |
602 | replace_field (char *buf, const char *name, int index, const char old, const char *replace) |
666 | replace_field (char **ptr, const char *name, int index, const char old, const char *replace) |
603 | { |
667 | { |
604 | int slashes = 0; |
668 | int slashes = 0; |
605 | const char *field, *end; |
669 | const char *field, *end; |
606 | |
670 | |
607 | for (const char *c = name; *c; c++) |
671 | for (const char *c = name; *c; c++) |
… | |
… | |
617 | break; |
681 | break; |
618 | } |
682 | } |
619 | |
683 | |
620 | if (slashes >= 13 && (!old || *field == old)) |
684 | if (slashes >= 13 && (!old || *field == old)) |
621 | { |
685 | { |
622 | // TODO: check for overflow in font-name |
686 | size_t len = field - name; |
623 | strncpy (buf, name, field - name); |
687 | *ptr = (char *)malloc (len + strlen (replace) + strlen (end) + 1); |
624 | buf += field - name; |
688 | memcpy (*ptr, name, len); |
625 | strcpy (buf, replace); |
689 | strcpy (*ptr + len, replace); |
626 | strcat (buf, end); |
690 | strcat (*ptr, end); |
627 | |
691 | |
628 | return true; |
692 | return true; |
629 | } |
693 | } |
630 | else |
694 | else |
631 | { |
695 | { |
632 | strcpy (buf, name); |
696 | *ptr = strdup (name); |
633 | |
697 | |
634 | return false; |
698 | return false; |
635 | } |
699 | } |
636 | } |
700 | } |
637 | |
701 | |
638 | bool |
702 | bool |
639 | rxvt_font_x11::load (const rxvt_fontprop &prop) |
703 | rxvt_font_x11::load (const rxvt_fontprop &prop, bool force_prop) |
640 | { |
704 | { |
641 | Display *disp = DISPLAY; |
705 | dTermDisplay; |
642 | |
706 | |
643 | clear (); |
707 | clear (); |
644 | |
708 | |
645 | char field_str[64]; // enough for 128 bits |
709 | char field_str[64]; // enough for 128 bits |
646 | |
710 | |
647 | // first morph the font if required |
711 | // first morph the font if required |
648 | if (prop.weight != rxvt_fontprop::unset |
712 | if (force_prop) |
649 | || prop.slant != rxvt_fontprop::unset) |
|
|
650 | { |
713 | { |
651 | char fname[1024]; |
714 | char *fname; |
652 | |
715 | |
653 | if (name[0] != '-') |
716 | if (name[0] != '-') |
654 | { |
717 | { |
655 | f = XLoadQueryFont (disp, name); |
718 | f = XLoadQueryFont (disp, name); |
656 | |
719 | |
657 | if (!f) |
720 | if (!f) |
658 | return false; |
721 | return false; |
659 | |
722 | |
660 | char *new_name = get_property (f, "FONT", name); |
723 | char *new_name = get_property (f, XA_FONT, 0); |
661 | |
724 | |
662 | if (new_name) |
725 | if (new_name) |
663 | set_name (new_name); |
726 | set_name (new_name); |
664 | else |
727 | else |
665 | rxvt_warn ("font '%s' has no FONT property, continuing without.", name); |
728 | rxvt_warn ("font '%s' has no FONT property, continuing without.\n", name); |
666 | |
729 | |
667 | XFreeFont (disp, f); |
730 | XFreeFont (disp, f); |
668 | f = 0; |
731 | f = 0; |
669 | } |
732 | } |
670 | |
733 | |
671 | if (prop.weight != rxvt_fontprop::unset) |
734 | if (prop.weight != rxvt_fontprop::unset) |
672 | { |
735 | { |
673 | replace_field (fname, name, 2, 0, |
736 | replace_field (&fname, name, 2, 0, |
674 | prop.weight < rxvt_fontprop::bold |
737 | prop.weight < rxvt_fontprop::bold |
675 | ? "medium" : "bold"); |
738 | ? "medium" : "bold"); |
676 | set_name (strdup (fname)); |
739 | set_name (fname); |
677 | } |
740 | } |
678 | |
741 | |
679 | if (prop.slant != rxvt_fontprop::unset) |
742 | if (prop.slant != rxvt_fontprop::unset) |
680 | { |
743 | { |
681 | replace_field (fname, name, 3, 0, |
744 | replace_field (&fname, name, 3, 0, |
682 | prop.slant < rxvt_fontprop::italic |
745 | prop.slant < rxvt_fontprop::italic |
683 | ? "r" : "i"); // TODO: handle "o"blique, too |
746 | ? "r" : "i"); // TODO: handle "o"blique, too |
684 | set_name (strdup (fname)); |
747 | set_name (fname); |
685 | } |
748 | } |
686 | } |
749 | } |
687 | |
750 | |
688 | sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset |
751 | sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset |
689 | ? 0 : prop.height); |
752 | ? 0 : prop.height); |
… | |
… | |
714 | font_weight *fonts = new font_weight[count]; |
777 | font_weight *fonts = new font_weight[count]; |
715 | |
778 | |
716 | for (int i = 0; i < count; i++) |
779 | for (int i = 0; i < count; i++) |
717 | { |
780 | { |
718 | rxvt_fontprop p; |
781 | rxvt_fontprop p; |
719 | char fname[1024]; |
782 | char *fname; |
720 | |
783 | |
721 | int diff = 0; |
784 | int diff = 0; |
722 | |
785 | |
723 | if (replace_field (fname, list[i], 6, '0', field_str)) |
786 | if (replace_field (&fname, list[i], 6, '0', field_str)) |
724 | diff += 10; // slightly penalize scalable fonts |
787 | diff += 10; // slightly penalize scalable fonts |
|
|
788 | else |
|
|
789 | { |
|
|
790 | free (fname); |
725 | else if (replace_field (fname, list[i], 11, '0', "0")) |
791 | if (replace_field (&fname, list[i], 11, '0', "0")) |
726 | diff += 300; // more heavily penalize what looks like scaled bitmap fotns |
792 | diff += 300; // more heavily penalize what looks like scaled bitmap fonts |
|
|
793 | } |
727 | |
794 | |
728 | if (!set_properties (p, fname)) |
795 | if (!set_properties (p, fname) |
|
|
796 | // also weed out too large fonts |
|
|
797 | || (prop.height != rxvt_fontprop::unset |
|
|
798 | && p.height > prop.height)) |
|
|
799 | { |
|
|
800 | free (fname); |
729 | continue; |
801 | continue; |
730 | |
802 | } |
731 | if (prop.height != rxvt_fontprop::unset |
|
|
732 | && p.height > prop.height) // weed out too large fonts |
|
|
733 | continue; |
|
|
734 | |
803 | |
735 | if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128; |
804 | 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); |
805 | 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); |
806 | 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); |
807 | //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width); |
739 | |
808 | |
740 | fonts[i].name = strdup (fname); |
809 | fonts[i].name = fname; |
741 | fonts[i].diff = diff; |
810 | fonts[i].diff = diff; |
742 | } |
811 | } |
743 | |
812 | |
744 | XFreeFontNames (list); |
813 | XFreeFontNames (list); |
745 | |
814 | |
… | |
… | |
774 | delete [] fonts; |
843 | delete [] fonts; |
775 | |
844 | |
776 | if (!f) |
845 | if (!f) |
777 | return false; |
846 | return false; |
778 | |
847 | |
779 | char *registry = get_property (f, "CHARSET_REGISTRY", 0); |
848 | char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0); |
780 | char *encoding = get_property (f, "CHARSET_ENCODING", 0); |
849 | char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0); |
|
|
850 | |
|
|
851 | cs = CS_UNKNOWN; |
781 | |
852 | |
782 | if (registry && encoding) |
853 | if (registry && encoding) |
783 | { |
854 | { |
784 | char charset[64]; |
855 | char charset[64]; |
785 | snprintf (charset, 64, "%s-%s", registry, encoding); |
856 | snprintf (charset, 64, "%s-%s", registry, encoding); |
786 | |
857 | |
787 | cs = codeset_from_name (charset); |
858 | cs = codeset_from_name (charset); |
788 | } |
859 | |
789 | else |
860 | if (cs == CS_UNKNOWN) |
|
|
861 | rxvt_warn ("%s: cannot deduce encoding from registry/encoding properties \"%s\", ignoring font.\n", name, charset); |
790 | { |
862 | } |
|
|
863 | |
|
|
864 | free (registry); |
|
|
865 | free (encoding); |
|
|
866 | |
|
|
867 | if (cs == CS_UNKNOWN) |
|
|
868 | { |
791 | const char *charset = get_property (f, "FONT", 0); |
869 | char *value = get_property (f, XA_FONT, 0); |
|
|
870 | const char *charset = value; |
792 | |
871 | |
793 | if (!charset) |
872 | if (!charset) |
794 | charset = name; |
873 | charset = name; |
795 | |
874 | |
796 | int count = 13; |
875 | int count = 13; |
797 | while (*charset) |
876 | while (*charset) |
798 | if (*charset++ == '-' && !--count) |
877 | if (*charset++ == '-' && !--count) |
799 | break; |
878 | break; |
800 | |
879 | |
801 | cs = codeset_from_name (charset); |
880 | cs = codeset_from_name (charset); |
|
|
881 | if (cs == CS_UNKNOWN) |
|
|
882 | rxvt_warn ("%s: cannot deduce encoding from font name property \"%s\", ignoring font.\n", name, charset); |
|
|
883 | |
|
|
884 | free (value); |
|
|
885 | } |
|
|
886 | |
|
|
887 | if (cs == CS_UNKNOWN) |
802 | } |
888 | { |
803 | |
889 | clear (); |
804 | free (registry); |
890 | return false; |
805 | free (encoding); |
891 | } |
806 | |
892 | |
807 | if (cs == CS_UNICODE) |
893 | if (cs == CS_UNICODE) |
808 | cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font |
894 | cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font |
809 | |
895 | |
810 | encm = f->min_byte1 != 0 || f->max_byte1 != 0; |
896 | encm = f->min_byte1 != 0 || f->max_byte1 != 0; |
811 | enc2b = encm || f->max_char_or_byte2 > 255; |
897 | enc2b = encm || f->max_char_or_byte2 > 255; |
812 | |
898 | |
813 | slow = false; |
899 | slow = false; |
814 | |
900 | |
815 | #if 1 // only used for slow detection, TODO optimize |
901 | #if 1 // only used for slow detection, TODO optimize |
816 | if (f->min_bounds.width == f->max_bounds.width) |
902 | 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; |
903 | width = f->max_bounds.width; |
820 | else |
904 | else |
821 | { |
905 | { |
822 | slow = true; |
906 | slow = true; |
823 | |
907 | |
824 | int N = f->max_char_or_byte2 - f->min_char_or_byte2; |
908 | int N = f->max_char_or_byte2 - f->min_char_or_byte2; |
825 | |
909 | |
826 | if (encm) |
910 | if (encm) |
827 | N += (f->max_byte1 - f->min_byte1) |
911 | N += (f->max_byte1 - f->min_byte1) |
828 | * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1); |
912 | * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1); |
829 | |
913 | |
830 | while (N) |
914 | while (N) |
831 | { |
915 | { |
832 | if (f->per_char[N].width > width) |
916 | if (f->per_char[N].width > width) |
833 | width = f->per_char[N].width; |
917 | width = f->per_char[N].width; |
834 | |
918 | |
… | |
… | |
837 | } |
921 | } |
838 | #endif |
922 | #endif |
839 | |
923 | |
840 | width = 1; |
924 | width = 1; |
841 | |
925 | |
842 | for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) |
926 | for (uint16_t *t = extent_test_chars + ARRAY_LENGTH(extent_test_chars); t-- > extent_test_chars; ) |
843 | { |
927 | { |
844 | if (cs != CS_UNICODE |
|
|
845 | && *t > 0x100 |
|
|
846 | && FROM_UNICODE (cs, *t) == NOCHAR) |
928 | if (FROM_UNICODE (cs, *t) == NOCHAR) |
847 | continue; |
929 | continue; |
848 | |
930 | |
849 | // ignore characters we wouldn't use anyways |
931 | // ignore characters we wouldn't use anyways |
850 | bool careful; |
932 | bool careful; |
851 | if (!has_char (*t, &prop, careful)) |
933 | if (!has_char (*t, &prop, careful)) |
… | |
… | |
855 | |
937 | |
856 | XCharStruct g; |
938 | XCharStruct g; |
857 | int dir_ret, asc_ret, des_ret; |
939 | int dir_ret, asc_ret, des_ret; |
858 | XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); |
940 | XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); |
859 | |
941 | |
|
|
942 | int wcw = WCWIDTH (*t); |
860 | int wcw = wcwidth (*t); if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; |
943 | if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; |
861 | |
944 | |
862 | if (width < g.width) width = g.width; |
945 | if (width < g.width) width = g.width; |
863 | } |
|
|
864 | |
|
|
865 | if (cs == CS_UNKNOWN) |
|
|
866 | { |
946 | } |
867 | fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name); |
|
|
868 | |
947 | |
|
|
948 | #if 0 // do it per-character |
|
|
949 | if (prop && width > prop->width) |
|
|
950 | { |
869 | clear (); |
951 | clear (); |
870 | return false; |
952 | return false; |
871 | } |
953 | } |
872 | |
|
|
873 | #if 0 // do it per-character |
|
|
874 | if (prop && width > prop->width) |
|
|
875 | { |
|
|
876 | clear (); |
|
|
877 | return false; |
|
|
878 | } |
|
|
879 | #endif |
954 | #endif |
880 | |
955 | |
881 | return true; |
956 | return true; |
882 | } |
957 | } |
883 | |
958 | |
884 | void |
959 | void |
885 | rxvt_font_x11::clear () |
960 | rxvt_font_x11::clear () |
886 | { |
961 | { |
887 | if (f) |
962 | if (f) |
888 | { |
963 | { |
889 | XFreeFont (DISPLAY, f); |
964 | XFreeFont (term->dpy, f); |
890 | f = 0; |
965 | f = 0; |
891 | } |
966 | } |
892 | } |
967 | } |
893 | |
968 | |
894 | bool |
969 | bool |
895 | rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) |
970 | rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const |
896 | { |
971 | { |
897 | uint32_t ch = FROM_UNICODE (cs, unicode); |
972 | uint32_t ch = FROM_UNICODE (cs, unicode); |
898 | |
973 | |
899 | if (ch == NOCHAR) |
974 | if (ch == NOCHAR) |
900 | return false; |
975 | return false; |
901 | |
976 | |
902 | /* check wether the character exists in _this_ font. horrible. */ |
977 | /* check whether the character exists in _this_ font. horrible. */ |
903 | XCharStruct *xcs; |
978 | XCharStruct *xcs; |
904 | |
979 | |
905 | if (encm) |
980 | if (encm) |
906 | { |
981 | { |
907 | unsigned char byte1 = ch >> 8; |
982 | unsigned char byte1 = ch >> 8; |
… | |
… | |
937 | return false; |
1012 | return false; |
938 | |
1013 | |
939 | if (!prop || prop->width == rxvt_fontprop::unset) |
1014 | if (!prop || prop->width == rxvt_fontprop::unset) |
940 | return true; |
1015 | return true; |
941 | |
1016 | |
942 | // check character against base font bounding box |
1017 | // check whether character overlaps previous/next character |
943 | int w = xcs->width; |
1018 | int w = xcs->rbearing - xcs->lbearing; |
944 | int wcw = wcwidth (unicode); |
1019 | int wcw = max (WCWIDTH (unicode), 1); |
945 | if (wcw > 0) w = (w + wcw - 1) / wcw; |
|
|
946 | |
1020 | |
947 | careful = w > prop->width; |
1021 | careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw; |
948 | if (careful && w > prop->width * MAX_OVERLAP >> 2) |
1022 | |
|
|
1023 | if (careful && !OVERLAP_OK (w, wcw, prop)) |
949 | return false; |
1024 | return false; |
950 | |
1025 | |
951 | return true; |
1026 | return true; |
952 | } |
1027 | } |
953 | |
1028 | |
… | |
… | |
959 | // this looks like a mess /. |
1034 | // this looks like a mess /. |
960 | // and it is a mess /. |
1035 | // and it is a mess /. |
961 | // yet we are trying to be perfect /. |
1036 | // yet we are trying to be perfect /. |
962 | // but the result still isn't perfect /. |
1037 | // but the result still isn't perfect /. |
963 | |
1038 | |
|
|
1039 | dTermDisplay; |
|
|
1040 | dTermGC; |
|
|
1041 | |
964 | bool slow = this->slow |
1042 | bool slow = this->slow |
965 | || width != r->fwidth |
1043 | || width != term->fwidth |
966 | || height != r->fheight; |
1044 | || height != term->fheight; |
967 | |
1045 | |
968 | int base = ascent; // sorry, incorrect: r->fbase; |
1046 | int base = ascent; // sorry, incorrect: term->fbase; |
969 | |
1047 | |
970 | XGCValues v; |
1048 | XGCValues v; |
971 | v.foreground = r->pix_colors[fg]; |
1049 | v.foreground = term->pix_colors[fg]; |
972 | v.font = f->fid; |
1050 | v.font = f->fid; |
973 | |
1051 | |
974 | if (enc2b) |
1052 | if (enc2b) |
975 | { |
1053 | { |
976 | const XChar2b *xc = enc_xchar2b (text, len, cs, slow); |
1054 | const XChar2b *xc = enc_xchar2b (text, len, cs, slow); |
977 | |
1055 | |
978 | if (bg == Color_bg && !slow) |
1056 | if (bg == Color_bg && !slow) |
979 | { |
1057 | { |
980 | v.background = r->pix_colors[bg]; |
1058 | v.background = term->pix_colors[bg]; |
981 | XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); |
1059 | XChangeGC (disp, gc, GCForeground | GCBackground | GCFont, &v); |
982 | XDrawImageString16 (d.display->display, d, TGC, x, y + base, xc, len); |
1060 | XDrawImageString16 (disp, d, gc, x, y + base, xc, len); |
983 | } |
1061 | } |
984 | else |
1062 | else |
985 | { |
1063 | { |
986 | clear_rect (d, x, y, r->fwidth * len, r->fheight, bg); |
1064 | clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); |
987 | |
1065 | |
988 | XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v); |
1066 | XChangeGC (disp, gc, GCForeground | GCFont, &v); |
989 | |
1067 | |
990 | if (slow) |
1068 | if (slow) |
991 | { |
1069 | { |
992 | do |
1070 | do |
993 | { |
1071 | { |
994 | if (xc->byte1 || xc->byte2) |
1072 | if (xc->byte1 || xc->byte2) |
995 | XDrawString16 (d.display->display, d, TGC, x, y + base, xc, 1); |
1073 | XDrawString16 (disp, d, gc, x, y + base, xc, 1); |
996 | |
1074 | |
997 | x += r->fwidth; |
1075 | x += term->fwidth; |
998 | xc++; len--; |
1076 | xc++; len--; |
999 | } |
1077 | } |
1000 | while (len); |
1078 | while (len); |
1001 | } |
1079 | } |
1002 | else |
1080 | else |
1003 | XDrawString16 (d.display->display, d, TGC, x, y + base, xc, len); |
1081 | XDrawString16 (disp, d, gc, x, y + base, xc, len); |
1004 | } |
1082 | } |
1005 | } |
1083 | } |
1006 | else |
1084 | else |
1007 | { |
1085 | { |
1008 | const char *xc = enc_char (text, len, cs, slow); |
1086 | const char *xc = enc_char (text, len, cs, slow); |
1009 | |
1087 | |
1010 | if (bg == Color_bg && !slow) |
1088 | if (bg == Color_bg && !slow) |
1011 | { |
1089 | { |
1012 | v.background = r->pix_colors[bg]; |
1090 | v.background = term->pix_colors[bg]; |
1013 | XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); |
1091 | XChangeGC (disp, gc, GCForeground | GCBackground | GCFont, &v); |
1014 | XDrawImageString (d.display->display, d, TGC, x, y + base, xc, len); |
1092 | XDrawImageString (disp, d, gc, x, y + base, xc, len); |
1015 | } |
1093 | } |
1016 | else |
1094 | else |
1017 | { |
1095 | { |
1018 | clear_rect (d, x, y, r->fwidth * len, r->fheight, bg); |
1096 | clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); |
1019 | |
1097 | |
1020 | XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v); |
1098 | XChangeGC (disp, gc, GCForeground | GCFont, &v); |
1021 | |
1099 | |
1022 | if (slow) |
1100 | if (slow) |
1023 | { |
1101 | { |
1024 | do |
1102 | do |
1025 | { |
1103 | { |
1026 | if (*xc) |
1104 | if (*xc) |
1027 | XDrawString (d.display->display, d, TGC, x, y + base, xc, 1); |
1105 | XDrawString (disp, d, gc, x, y + base, xc, 1); |
1028 | |
1106 | |
1029 | x += r->fwidth; |
1107 | x += term->fwidth; |
1030 | xc++; len--; |
1108 | xc++; len--; |
1031 | } |
1109 | } |
1032 | while (len); |
1110 | while (len); |
1033 | } |
1111 | } |
1034 | else |
1112 | else |
1035 | XDrawString (d.display->display, d, TGC, x, y + base, xc, len); |
1113 | XDrawString (disp, d, gc, x, y + base, xc, len); |
1036 | } |
1114 | } |
1037 | } |
1115 | } |
1038 | } |
1116 | } |
1039 | |
1117 | |
1040 | ///////////////////////////////////////////////////////////////////////////// |
1118 | ///////////////////////////////////////////////////////////////////////////// |
… | |
… | |
1046 | |
1124 | |
1047 | void clear (); |
1125 | void clear (); |
1048 | |
1126 | |
1049 | rxvt_fontprop properties (); |
1127 | rxvt_fontprop properties (); |
1050 | |
1128 | |
1051 | bool load (const rxvt_fontprop &prop); |
1129 | bool load (const rxvt_fontprop &prop, bool force_prop); |
1052 | |
1130 | |
1053 | void draw (rxvt_drawable &d, int x, int y, |
1131 | void draw (rxvt_drawable &d, int x, int y, |
1054 | const text_t *text, int len, |
1132 | const text_t *text, int len, |
1055 | int fg, int bg); |
1133 | int fg, int bg); |
1056 | |
1134 | |
1057 | bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &carefull); |
1135 | bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const; |
1058 | |
1136 | |
1059 | protected: |
1137 | protected: |
1060 | XftFont *f; |
1138 | XftFont *f; |
1061 | }; |
1139 | }; |
1062 | |
1140 | |
1063 | void |
1141 | void |
1064 | rxvt_font_xft::clear () |
1142 | rxvt_font_xft::clear () |
1065 | { |
1143 | { |
1066 | if (f) |
1144 | if (f) |
1067 | { |
1145 | { |
1068 | XftFontClose (DISPLAY, f); |
1146 | XftFontClose (term->dpy, f); |
1069 | f = 0; |
1147 | f = 0; |
1070 | } |
1148 | } |
1071 | } |
1149 | } |
1072 | |
1150 | |
1073 | rxvt_fontprop |
1151 | rxvt_fontprop |
… | |
… | |
1089 | |
1167 | |
1090 | return p; |
1168 | return p; |
1091 | } |
1169 | } |
1092 | |
1170 | |
1093 | bool |
1171 | bool |
1094 | rxvt_font_xft::load (const rxvt_fontprop &prop) |
1172 | rxvt_font_xft::load (const rxvt_fontprop &prop, bool force_prop) |
1095 | { |
1173 | { |
1096 | Display *disp = DISPLAY; |
1174 | dTermDisplay; |
1097 | |
1175 | |
1098 | clear (); |
1176 | clear (); |
1099 | |
1177 | |
1100 | FcPattern *p = FcNameParse ((FcChar8 *) name); |
1178 | FcPattern *p = FcNameParse ((FcChar8 *) name); |
1101 | |
1179 | |
… | |
… | |
1108 | && (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch |
1186 | && (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch |
1109 | && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch)) |
1187 | && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch)) |
1110 | FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height); |
1188 | FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height); |
1111 | |
1189 | |
1112 | if (prop.weight != rxvt_fontprop::unset |
1190 | if (prop.weight != rxvt_fontprop::unset |
1113 | && FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch) |
1191 | && (force_prop || FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch)) |
1114 | FcPatternAddInteger (p, FC_WEIGHT, prop.weight); |
1192 | FcPatternAddInteger (p, FC_WEIGHT, prop.weight); |
1115 | |
1193 | |
1116 | if (prop.slant != rxvt_fontprop::unset |
1194 | if (prop.slant != rxvt_fontprop::unset |
1117 | && FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch) |
1195 | && (force_prop || FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch)) |
1118 | FcPatternAddInteger (p, FC_SLANT, prop.slant); |
1196 | FcPatternAddInteger (p, FC_SLANT, prop.slant); |
1119 | |
1197 | |
1120 | #if 0 // clipping unfortunately destroys our precious double-width-characters |
1198 | #if 0 // clipping unfortunately destroys our precious double-width-characters |
1121 | // clip width, we can't do better, or can we? |
1199 | // clip width, we can't do better, or can we? |
1122 | if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) |
1200 | if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) |
1123 | FcPatternAddInteger (p, FC_CHAR_WIDTH, prop->width); |
1201 | FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width); |
1124 | #endif |
1202 | #endif |
1125 | |
1203 | |
1126 | if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch) |
1204 | if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch) |
1127 | FcPatternAddBool (p, FC_MINSPACE, 1); |
1205 | FcPatternAddBool (p, FC_MINSPACE, 1); |
1128 | |
1206 | |
1129 | // store generated name so iso14755 view gives better results |
1207 | // store generated name so iso14755 view gives better results |
1130 | set_name ((char *)FcNameUnparse (p)); |
1208 | set_name ((char *)FcNameUnparse (p)); |
1131 | |
1209 | |
1132 | XftResult result; |
1210 | XftResult result; |
1133 | FcPattern *match = XftFontMatch (disp, r->display->screen, p, &result); |
1211 | FcPattern *match = XftFontMatch (disp, term->display->screen, p, &result); |
1134 | |
1212 | |
1135 | FcPatternDestroy (p); |
1213 | FcPatternDestroy (p); |
1136 | |
1214 | |
1137 | if (!match) |
1215 | if (!match) |
1138 | return false; |
1216 | return false; |
… | |
… | |
1161 | |
1239 | |
1162 | XftUnlockFace (f); |
1240 | XftUnlockFace (f); |
1163 | |
1241 | |
1164 | int glheight = height; |
1242 | int glheight = height; |
1165 | |
1243 | |
1166 | for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) |
1244 | for (uint16_t *t = extent_test_chars + ARRAY_LENGTH(extent_test_chars); t-- > extent_test_chars; ) |
1167 | { |
1245 | { |
1168 | FcChar16 ch = *t; |
1246 | FcChar16 ch = *t; |
1169 | |
1247 | |
1170 | if (cs != CS_UNICODE |
1248 | if (cs != CS_UNICODE |
1171 | && ch > 0x100 |
1249 | && ch > 0x100 |
… | |
… | |
1180 | XGlyphInfo g; |
1258 | XGlyphInfo g; |
1181 | XftTextExtents16 (disp, f, &ch, 1, &g); |
1259 | XftTextExtents16 (disp, f, &ch, 1, &g); |
1182 | |
1260 | |
1183 | g.width -= g.x; |
1261 | g.width -= g.x; |
1184 | |
1262 | |
1185 | int wcw = wcwidth (ch); |
1263 | int wcw = WCWIDTH (ch); |
1186 | if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; |
1264 | if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; |
1187 | |
1265 | |
1188 | if (width < g.width ) width = g.width; |
1266 | if (width < g.width ) width = g.width; |
1189 | if (height < g.height ) height = g.height; |
1267 | if (height < g.height ) height = g.height; |
1190 | if (glheight < g.height - g.y) glheight = g.height - g.y; |
1268 | if (glheight < g.height - g.y) glheight = g.height - g.y; |
… | |
… | |
1236 | |
1314 | |
1237 | return success; |
1315 | return success; |
1238 | } |
1316 | } |
1239 | |
1317 | |
1240 | bool |
1318 | bool |
1241 | rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) |
1319 | rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const |
1242 | { |
1320 | { |
1243 | careful = false; |
1321 | careful = false; |
1244 | |
1322 | |
1245 | if (!XftCharExists (DISPLAY, f, unicode)) |
1323 | if (!XftCharExists (term->dpy, f, unicode)) |
1246 | return false; |
1324 | return false; |
1247 | |
1325 | |
1248 | if (!prop || prop->width == rxvt_fontprop::unset) |
1326 | if (!prop || prop->width == rxvt_fontprop::unset) |
1249 | return true; |
1327 | return true; |
1250 | |
1328 | |
1251 | // check character against base font bounding box |
1329 | // check character against base font bounding box |
1252 | FcChar32 ch = unicode; |
1330 | FcChar32 ch = unicode; |
1253 | XGlyphInfo g; |
1331 | XGlyphInfo g; |
1254 | XftTextExtents32 (DISPLAY, f, &ch, 1, &g); |
1332 | XftTextExtents32 (term->dpy, f, &ch, 1, &g); |
1255 | |
1333 | |
1256 | int w = g.width - g.x; |
1334 | int w = g.width - g.x; |
1257 | int wcw = wcwidth (unicode); |
1335 | int wcw = max (WCWIDTH (unicode), 1); |
1258 | if (wcw > 0) w = (w + wcw - 1) / wcw; |
|
|
1259 | |
1336 | |
1260 | careful = w > prop->width; |
1337 | careful = g.x > 0 || w > prop->width * wcw; |
1261 | if (careful && w > prop->width * MAX_OVERLAP >> 2) |
1338 | |
|
|
1339 | if (careful && !OVERLAP_OK (w, wcw, prop)) |
|
|
1340 | return false; |
|
|
1341 | |
|
|
1342 | // this weeds out _totally_ broken fonts, or glyphs |
|
|
1343 | if (!OVERLAP_OK (g.xOff, wcw, prop)) |
1262 | return false; |
1344 | return false; |
1263 | |
1345 | |
1264 | return true; |
1346 | return true; |
1265 | } |
1347 | } |
1266 | |
1348 | |
1267 | void |
1349 | void |
1268 | rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, |
1350 | rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, |
1269 | const text_t *text, int len, |
1351 | const text_t *text, int len, |
1270 | int fg, int bg) |
1352 | int fg, int bg) |
1271 | { |
1353 | { |
1272 | clear_rect (d, x, y, r->fwidth * len, r->fheight, bg); |
|
|
1273 | |
|
|
1274 | int base = ascent; // should be fbase, but that is incorrect |
|
|
1275 | |
|
|
1276 | XGlyphInfo extents; |
1354 | XGlyphInfo extents; |
1277 | FcChar32 *enc = (FcChar32 *) get_enc_buf (len * sizeof (FcChar32)); |
1355 | XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len); |
1278 | FcChar32 *ep = enc; |
1356 | XftGlyphSpec *ep = enc; |
1279 | int ewidth = 0; |
1357 | |
|
|
1358 | dTermDisplay; |
|
|
1359 | dTermGC; |
|
|
1360 | |
|
|
1361 | int w = term->fwidth * len; |
|
|
1362 | int h = term->fheight; |
|
|
1363 | |
|
|
1364 | bool buffered = bg >= Color_transparent |
|
|
1365 | && term->option (Opt_buffered); |
|
|
1366 | |
|
|
1367 | // cut trailing spaces |
|
|
1368 | while (len && text [len - 1] == ' ') |
|
|
1369 | len--; |
|
|
1370 | |
|
|
1371 | int x_ = buffered ? 0 : x; |
|
|
1372 | int y_ = buffered ? 0 : y; |
1280 | |
1373 | |
1281 | while (len) |
1374 | while (len) |
1282 | { |
1375 | { |
1283 | int cwidth = r->fwidth; |
1376 | int cwidth = term->fwidth; |
1284 | FcChar32 fc = *text++; len--; |
1377 | FcChar32 fc = *text++; len--; |
1285 | |
1378 | |
1286 | while (len && *text == NOCHAR) |
1379 | while (len && *text == NOCHAR) |
1287 | text++, len--, cwidth += r->fwidth; |
1380 | text++, len--, cwidth += term->fwidth; |
|
|
1381 | |
|
|
1382 | if (fc != ' ') // skip spaces |
1288 | |
1383 | { |
1289 | if (fc == ' ' && ep == enc) // skip leading spaces |
1384 | FT_UInt glyph = XftCharIndex (disp, f, fc); |
|
|
1385 | XftGlyphExtents (disp, f, &glyph, 1, &extents); |
|
|
1386 | |
|
|
1387 | ep->glyph = glyph; |
|
|
1388 | ep->x = x_ + (cwidth - extents.xOff >> 1); |
|
|
1389 | ep->y = y_ + ascent; |
|
|
1390 | |
|
|
1391 | if (extents.xOff == 0) |
|
|
1392 | ep->x = x_ + cwidth; |
|
|
1393 | |
|
|
1394 | ep++; |
|
|
1395 | } |
|
|
1396 | |
1290 | x += cwidth; |
1397 | x_ += cwidth; |
1291 | else |
1398 | } |
1292 | { |
|
|
1293 | FT_UInt gl = XftCharIndex (d.display->display, f, fc); |
|
|
1294 | XftGlyphExtents (d.display->display, f, &gl, 1, &extents); |
|
|
1295 | |
1399 | |
1296 | if (extents.xOff != cwidth) |
1400 | if (buffered) |
|
|
1401 | { |
|
|
1402 | if (ep != enc) |
|
|
1403 | { |
|
|
1404 | rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); |
|
|
1405 | |
|
|
1406 | #ifdef HAVE_BG_PIXMAP |
|
|
1407 | Picture dst = 0; // the only assignment is done conditionally in the following if condition |
|
|
1408 | |
|
|
1409 | if (term->bgPixmap.pixmap |
|
|
1410 | && (bg == Color_transparent || bg == Color_bg |
|
|
1411 | || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2)))))) |
1297 | { |
1412 | { |
1298 | if (ewidth) |
1413 | int src_x = x, src_y = y; |
|
|
1414 | |
|
|
1415 | if (term->bgPixmap.flags & bgPixmap_t::isTransparent) |
1299 | { |
1416 | { |
1300 | XftDrawGlyphs (d, &r->pix_colors[fg].c, f, |
|
|
1301 | x, y + base, enc, ep - enc); |
|
|
1302 | x += ewidth; |
1417 | src_x += term->window_vt_x; |
1303 | |
1418 | src_y += term->window_vt_y; |
1304 | ep = enc; |
|
|
1305 | ewidth = 0; |
|
|
1306 | } |
1419 | } |
1307 | |
1420 | |
1308 | if (extents.xOff > cwidth) |
1421 | if (term->bgPixmap.pmap_width >= src_x + w |
1309 | extents.xOff = cwidth; |
1422 | && term->bgPixmap.pmap_height >= src_y + h) |
|
|
1423 | { |
|
|
1424 | XCopyArea (disp, term->bgPixmap.pixmap, d2, gc, |
|
|
1425 | src_x, src_y, w, h, 0, 0); |
|
|
1426 | } |
|
|
1427 | else |
|
|
1428 | { |
|
|
1429 | XGCValues gcv; |
1310 | |
1430 | |
1311 | XftDrawGlyphs (d, &r->pix_colors[fg].c, f, |
1431 | gcv.fill_style = FillTiled; |
1312 | x + (cwidth - extents.xOff >> 1), |
1432 | gcv.tile = term->bgPixmap.pixmap; |
|
|
1433 | gcv.ts_x_origin = -src_x; |
|
|
1434 | gcv.ts_y_origin = -src_y; |
|
|
1435 | |
|
|
1436 | XChangeGC (disp, gc, |
|
|
1437 | GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle, |
1313 | y + base, &gl, 1); |
1438 | &gcv); |
1314 | x += cwidth; |
1439 | |
|
|
1440 | XFillRectangle (disp, d2, gc, 0, 0, w, h); |
|
|
1441 | |
|
|
1442 | gcv.fill_style = FillSolid; |
|
|
1443 | XChangeGC (disp, gc, GCFillStyle, &gcv); |
|
|
1444 | } |
|
|
1445 | |
|
|
1446 | if (dst) |
|
|
1447 | { |
|
|
1448 | Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c); |
|
|
1449 | |
|
|
1450 | // dst can only be set when bg >= 0 |
|
|
1451 | XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h); |
|
|
1452 | } |
1315 | } |
1453 | } |
1316 | else |
1454 | else |
1317 | { |
1455 | #endif |
1318 | *ep++ = gl; |
1456 | XftDrawRect (d2, &term->pix_colors[bg >= 0 ? bg : Color_bg].c, 0, 0, w, h); |
1319 | ewidth += cwidth; |
1457 | |
|
|
1458 | XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc); |
|
|
1459 | XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y); |
1320 | } |
1460 | } |
1321 | } |
1461 | else |
|
|
1462 | clear_rect (d, x, y, w, h, bg); |
|
|
1463 | } |
|
|
1464 | else |
1322 | } |
1465 | { |
1323 | |
1466 | clear_rect (d, x, y, w, h, bg); |
1324 | if (ep != enc) |
|
|
1325 | XftDrawGlyphs (d, &r->pix_colors[fg].c, f, |
1467 | XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc); |
1326 | x, y + base, enc, ep - enc); |
1468 | } |
1327 | } |
1469 | } |
|
|
1470 | |
1328 | #endif |
1471 | #endif |
1329 | |
1472 | |
1330 | ///////////////////////////////////////////////////////////////////////////// |
1473 | ///////////////////////////////////////////////////////////////////////////// |
1331 | |
1474 | |
1332 | rxvt_fontset::rxvt_fontset (rxvt_t r) |
1475 | rxvt_fontset::rxvt_fontset (rxvt_term *term) |
1333 | : fontdesc (0), r (r) |
1476 | : fontdesc (0), term (term) |
1334 | { |
1477 | { |
1335 | clear (); |
1478 | clear (); |
1336 | } |
1479 | } |
1337 | |
1480 | |
1338 | rxvt_fontset::~rxvt_fontset () |
1481 | rxvt_fontset::~rxvt_fontset () |
… | |
… | |
1343 | void |
1486 | void |
1344 | rxvt_fontset::clear () |
1487 | rxvt_fontset::clear () |
1345 | { |
1488 | { |
1346 | prop.width = prop.height = prop.ascent = prop.weight = prop.slant |
1489 | prop.width = prop.height = prop.ascent = prop.weight = prop.slant |
1347 | = rxvt_fontprop::unset; |
1490 | = rxvt_fontprop::unset; |
|
|
1491 | force_prop = false; |
1348 | |
1492 | |
1349 | for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) |
1493 | for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) |
1350 | FONT_UNREF (*i); |
1494 | (*i)->unref (); |
1351 | |
1495 | |
1352 | for (pagemap **p = fmap.begin (); p != fmap.end (); p++) |
1496 | for (pagemap **p = fmap.begin (); p != fmap.end (); p++) |
1353 | delete *p; |
1497 | delete *p; |
1354 | |
1498 | |
1355 | free (fontdesc); fontdesc = 0; |
1499 | free (fontdesc); fontdesc = 0; |
… | |
… | |
1357 | fonts.clear (); |
1501 | fonts.clear (); |
1358 | |
1502 | |
1359 | fallback = fallback_fonts; |
1503 | fallback = fallback_fonts; |
1360 | } |
1504 | } |
1361 | |
1505 | |
|
|
1506 | void |
|
|
1507 | rxvt_fontset::prepare_font (rxvt_font *font, codeset cs) |
|
|
1508 | { |
|
|
1509 | font->set_term (term); |
|
|
1510 | |
|
|
1511 | font->cs = cs; |
|
|
1512 | font->loaded = false; |
|
|
1513 | } |
|
|
1514 | |
1362 | rxvt_font * |
1515 | rxvt_font * |
1363 | rxvt_fontset::new_font (const char *name, codeset cs) |
1516 | rxvt_fontset::new_font (const char *name, codeset cs) |
1364 | { |
1517 | { |
1365 | rxvt_font *f; |
1518 | rxvt_font *f; |
1366 | |
1519 | |
1367 | if (!name || !*name) |
1520 | if (!name || !*name) |
1368 | { |
1521 | { |
1369 | name = ""; |
1522 | name = ""; |
1370 | f = new rxvt_font_default (this); |
1523 | f = new rxvt_font_default (this); |
1371 | } |
1524 | } |
… | |
… | |
1382 | f = new rxvt_font_x11; |
1535 | f = new rxvt_font_x11; |
1383 | } |
1536 | } |
1384 | else |
1537 | else |
1385 | f = new rxvt_font_x11; |
1538 | f = new rxvt_font_x11; |
1386 | |
1539 | |
1387 | f->set_term (r); |
|
|
1388 | f->set_name (strdup (name)); |
1540 | f->set_name (strdup (name)); |
1389 | |
1541 | prepare_font (f, cs); |
1390 | f->cs = cs; |
|
|
1391 | f->loaded = false; |
|
|
1392 | |
1542 | |
1393 | return f; |
1543 | return f; |
1394 | } |
1544 | } |
1395 | |
1545 | |
1396 | ///////////////////////////////////////////////////////////////////////////// |
1546 | ///////////////////////////////////////////////////////////////////////////// |
|
|
1547 | |
|
|
1548 | void |
|
|
1549 | rxvt_fontset::push_font (rxvt_font *font) |
|
|
1550 | { |
|
|
1551 | // the fontCount index is reserved for the overflow font, it is only |
|
|
1552 | // necessary when we get fontCount or more fonts, as they cannot be |
|
|
1553 | // represented in the rendition. |
|
|
1554 | if (fonts.size () == fontCount) |
|
|
1555 | { |
|
|
1556 | rxvt_font *f = new rxvt_font_overflow (this); |
|
|
1557 | |
|
|
1558 | prepare_font (f, CS_UNICODE); |
|
|
1559 | fonts.push_back (f); |
|
|
1560 | } |
|
|
1561 | |
|
|
1562 | fonts.push_back (font); |
|
|
1563 | } |
1397 | |
1564 | |
1398 | void |
1565 | void |
1399 | rxvt_fontset::add_fonts (const char *desc) |
1566 | rxvt_fontset::add_fonts (const char *desc) |
1400 | { |
1567 | { |
1401 | if (desc) |
1568 | if (desc) |
… | |
… | |
1439 | if (!end) |
1606 | if (!end) |
1440 | end = desc + strlen (desc); |
1607 | end = desc + strlen (desc); |
1441 | |
1608 | |
1442 | if (end - desc < 511) |
1609 | if (end - desc < 511) |
1443 | { |
1610 | { |
1444 | strncpy (buf, desc, end - desc); |
1611 | memcpy (buf, desc, end - desc); |
1445 | buf[end - desc] = 0; |
1612 | buf[end - desc] = 0; |
1446 | |
1613 | |
1447 | fonts.push_back (new_font (buf, cs)); |
1614 | push_font (new_font (buf, cs)); |
1448 | } |
1615 | } |
1449 | else |
1616 | else |
1450 | rxvt_warn ("fontset element too long (>511 bytes), ignored."); |
1617 | rxvt_warn ("fontset element too long (>511 bytes), ignored."); |
1451 | |
1618 | |
1452 | desc = end + 1; |
1619 | desc = end + 1; |
… | |
… | |
1464 | if (fonts[i]->loaded) |
1631 | if (fonts[i]->loaded) |
1465 | return true; |
1632 | return true; |
1466 | |
1633 | |
1467 | fonts[i]->loaded = true; |
1634 | fonts[i]->loaded = true; |
1468 | |
1635 | |
1469 | if (!fonts[i]->load (prop)) |
1636 | if (!fonts[i]->load (prop, force_prop)) |
1470 | { |
1637 | { |
1471 | fonts[i]->cs = CS_UNKNOWN; |
1638 | fonts[i]->cs = CS_UNKNOWN; |
1472 | return false; |
1639 | return false; |
1473 | } |
1640 | } |
1474 | |
1641 | |
… | |
… | |
1480 | { |
1647 | { |
1481 | clear (); |
1648 | clear (); |
1482 | |
1649 | |
1483 | fontdesc = strdup (desc); |
1650 | fontdesc = strdup (desc); |
1484 | |
1651 | |
1485 | fonts.push_back (new_font (0, CS_UNICODE)); |
1652 | push_font (new_font (0, CS_UNICODE)); |
1486 | realize_font (0); |
1653 | realize_font (0); |
1487 | |
1654 | |
1488 | add_fonts (desc); |
1655 | add_fonts (desc); |
1489 | |
1656 | |
1490 | return true; |
1657 | return true; |
… | |
… | |
1499 | |
1666 | |
1500 | return -1; |
1667 | return -1; |
1501 | } |
1668 | } |
1502 | |
1669 | |
1503 | int |
1670 | int |
1504 | rxvt_fontset::find_font (unicode_t unicode) |
1671 | rxvt_fontset::find_font_idx (unicode_t unicode) |
1505 | { |
1672 | { |
1506 | if (unicode >= 1<<20) |
1673 | if (unicode >= 1<<20) |
1507 | return 0; |
1674 | return 0; |
1508 | |
1675 | |
1509 | unicode_t hi = unicode >> 8; |
1676 | unicode_t hi = unicode >> 8; |
… | |
… | |
1535 | goto next_font; |
1702 | goto next_font; |
1536 | |
1703 | |
1537 | bool careful; |
1704 | bool careful; |
1538 | if (f->has_char (unicode, &prop, careful)) |
1705 | if (f->has_char (unicode, &prop, careful)) |
1539 | { |
1706 | { |
1540 | if (careful) |
1707 | i = (i << 1) | careful; |
1541 | i |= 128; |
|
|
1542 | |
1708 | |
1543 | goto found; |
1709 | goto found; |
1544 | } |
1710 | } |
1545 | |
1711 | |
1546 | next_font: |
1712 | next_font: |
1547 | if (i == fonts.size () - 1) |
1713 | if (i == fonts.size () - 1) |
1548 | { |
1714 | { |
1549 | if (fallback->name) |
1715 | if (fallback->name) |
1550 | { |
1716 | { |
1551 | // search through the fallback list |
1717 | // search through the fallback list |
1552 | fonts.push_back (new_font (fallback->name, fallback->cs)); |
1718 | push_font (new_font (fallback->name, fallback->cs)); |
1553 | fallback++; |
1719 | fallback++; |
1554 | } |
1720 | } |
1555 | else |
1721 | else |
1556 | { |
1722 | { |
1557 | // try to find a new font. |
1723 | // try to find a new font. |
… | |
… | |
1575 | FcPatternAddInteger (p, FC_SLANT, prop.slant); |
1741 | FcPatternAddInteger (p, FC_SLANT, prop.slant); |
1576 | FcPatternAddBool (p, FC_MINSPACE, 1); |
1742 | FcPatternAddBool (p, FC_MINSPACE, 1); |
1577 | //FcPatternAddBool (p, FC_ANTIALIAS, 1); |
1743 | //FcPatternAddBool (p, FC_ANTIALIAS, 1); |
1578 | |
1744 | |
1579 | XftResult result; |
1745 | XftResult result; |
1580 | FcPattern *match = XftFontMatch (DISPLAY, r->display->screen, p, &result); |
1746 | FcPattern *match = XftFontMatch (term->dpy, term->display->screen, p, &result); |
1581 | |
1747 | |
1582 | FcPatternDestroy (p); |
1748 | FcPatternDestroy (p); |
1583 | |
1749 | |
1584 | if (match) |
1750 | if (match) |
1585 | { |
1751 | { |
… | |
… | |
1588 | FcPatternDestroy (match); |
1754 | FcPatternDestroy (match); |
1589 | |
1755 | |
1590 | if (find_font (font) < 0) |
1756 | if (find_font (font) < 0) |
1591 | { |
1757 | { |
1592 | char fontname[4096]; |
1758 | char fontname[4096]; |
1593 | sprintf (fontname, "xft:%-.4090s", font); |
1759 | snprintf (fontname, sizeof (fontname), "xft:%s", font); |
1594 | |
1760 | |
1595 | fonts.push_back (new_font (fontname, CS_UNICODE)); |
1761 | push_font (new_font (fontname, CS_UNICODE)); |
1596 | } |
1762 | } |
1597 | |
1763 | |
1598 | free (font); |
1764 | free (font); |
1599 | } |
1765 | } |
1600 | #endif |
1766 | #endif |
… | |
… | |
1622 | } |
1788 | } |
1623 | |
1789 | |
1624 | return i; |
1790 | return i; |
1625 | } |
1791 | } |
1626 | |
1792 | |
1627 | |
|
|
1628 | |
|
|