1 | /*--------------------------------*-C-*---------------------------------* |
1 | /*--------------------------------*-C-*---------------------------------* |
2 | * File: defaultfont.C |
2 | * File: rxvtfont.C |
3 | *----------------------------------------------------------------------* |
3 | *----------------------------------------------------------------------* |
4 | * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> |
4 | * Copyright (c) 2003-2006 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 |
… | |
… | |
14 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
14 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
15 | * GNU General Public License for more details. |
15 | * GNU General Public License for more details. |
16 | * |
16 | * |
17 | * You should have received a copy of the GNU General Public License |
17 | * You should have received a copy of the GNU General Public License |
18 | * along with this program; if not, write to the Free Software |
18 | * along with this program; if not, write to the Free Software |
19 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
19 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
20 | *---------------------------------------------------------------------*/ |
20 | *---------------------------------------------------------------------*/ |
21 | |
21 | |
22 | #include "../config.h" |
22 | #include "../config.h" |
23 | #include "rxvt.h" |
23 | #include "rxvt.h" |
|
|
24 | #include "rxvtlib.h" |
24 | #include "rxvtutil.h" |
25 | #include "rxvtutil.h" |
25 | #include "rxvtfont.h" |
26 | #include "rxvtfont.h" |
26 | |
27 | |
27 | #include <cstdlib> |
28 | #include <cstdlib> |
28 | #include <wchar.h> |
29 | |
29 | #include <inttypes.h> |
30 | #include <inttypes.h> |
30 | |
31 | |
31 | #define DISPLAY r->display->display |
|
|
32 | #define TGC r->TermWin.gc |
|
|
33 | |
|
|
34 | #define MAX_OVERLAP (4 + 1) // max. character width in 4ths 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 |
|
|
34 | |
|
|
35 | #define OVERLAP_OK(w,wcw,prop) ((w) <= ( \ |
|
|
36 | (prop)->slant >= rxvt_fontprop::italic \ |
|
|
37 | ? ((prop)->width * (wcw) * MAX_OVERLAP_ITALIC + 7) >> 3 \ |
|
|
38 | : ((prop)->width * (wcw) * MAX_OVERLAP_ROMAN + 7) >> 3 \ |
|
|
39 | )) |
35 | |
40 | |
36 | const struct rxvt_fallback_font { |
41 | const struct rxvt_fallback_font { |
37 | codeset cs; |
42 | codeset cs; |
38 | const char *name; |
43 | const char *name; |
39 | } fallback_fonts[] = { |
44 | } fallback_fonts[] = { |
… | |
… | |
59 | { CS_ISO8859_13, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-13" }, |
64 | { CS_ISO8859_13, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-13" }, |
60 | { CS_ISO8859_14, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-14" }, |
65 | { CS_ISO8859_14, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-14" }, |
61 | { CS_ISO8859_16, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-16" }, |
66 | { CS_ISO8859_16, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-16" }, |
62 | |
67 | |
63 | # if XFT |
68 | # if XFT |
64 | { CS_KOI8_U, "xft::spacing=100:lang=ru:antialias=false" }, |
69 | { CS_KOI8_U, "xft::lang=ru" }, |
65 | |
70 | |
66 | { CS_ISO8859_5, "xft::spacing=100:lang=ru:antialias=false" }, |
71 | { CS_ISO8859_5, "xft::lang=ru" }, |
67 | { CS_ISO8859_6, "xft::spacing=100:lang=ar:antialias=false" }, |
72 | { CS_ISO8859_6, "xft::lang=ar" }, |
68 | { CS_ISO8859_7, "xft::spacing=100:lang=el:antialias=false" }, |
73 | { CS_ISO8859_7, "xft::lang=el" }, |
69 | { CS_ISO8859_8, "xft::spacing=100:lang=he:antialias=false" }, |
74 | { CS_ISO8859_8, "xft::lang=he" }, |
70 | { CS_ISO8859_9, "xft::spacing=100:lang=tr:antialias=false" }, |
75 | { CS_ISO8859_9, "xft::lang=tr" }, |
71 | { CS_ISO8859_10, "xft::spacing=100:lang=se:antialias=false" }, |
76 | { CS_ISO8859_10, "xft::lang=se" }, |
72 | { CS_ISO8859_11, "xft::spacing=100:lang=th:antialias=false" }, |
77 | { CS_ISO8859_11, "xft::lang=th" }, |
73 | # endif |
78 | # endif |
74 | #endif |
79 | #endif |
75 | |
80 | |
76 | // japanese |
81 | // japanese |
77 | #if ENCODING_JP || ENCODING_JP_EXT |
82 | #if ENCODING_JP || ENCODING_JP_EXT |
78 | # if XFT |
83 | # if XFT |
79 | // prefer xft for complex scripts |
84 | // prefer xft for complex scripts |
80 | { CS_JIS0208_1990_0, "xft:Kochi Gothic:antialias=false" }, |
85 | { CS_JIS0208_1990_0, "xft:Kochi Gothic:antialias=false" }, |
81 | { CS_JIS0208_1990_0, "xft:Sazanami Mincho:antialias=false" }, |
86 | { CS_JIS0208_1990_0, "xft:Sazanami Mincho:antialias=false" }, |
82 | { CS_JIS0208_1990_0, "xft:Mincho:antialias=false" }, |
87 | { CS_JIS0208_1990_0, "xft:Mincho:antialias=false" }, |
83 | { CS_JIS0208_1990_0, "xft::lang=ja:spacing=100:antialias=false" }, |
88 | { CS_JIS0208_1990_0, "xft::lang=ja:antialias=false" }, |
84 | # endif |
89 | # endif |
85 | { CS_JIS0201_1976_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0201*-0" }, |
90 | { CS_JIS0201_1976_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0201*-0" }, |
86 | { CS_JIS0208_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" }, |
91 | { CS_JIS0208_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" }, |
87 | { CS_JIS0212_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0212*-0" }, |
92 | { CS_JIS0212_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0212*-0" }, |
88 | { CS_JIS0201_1976_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0201*-0" }, |
93 | { CS_JIS0201_1976_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0201*-0" }, |
… | |
… | |
90 | { CS_JIS0212_1990_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0212*-0" }, |
95 | { CS_JIS0212_1990_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0212*-0" }, |
91 | #endif |
96 | #endif |
92 | |
97 | |
93 | #if ENCODING_ZH || ENCODING_ZH_EXT |
98 | #if ENCODING_ZH || ENCODING_ZH_EXT |
94 | # if XFT |
99 | # if XFT |
|
|
100 | { CS_GBK_0, "xft:AR PL KaitiM GB" }, |
|
|
101 | { CS_GBK_0, "xft:AR PL SungtiL GB" }, |
|
|
102 | { CS_GBK_0, "xft::lang=zh" }, |
95 | { CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" }, |
103 | { CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" }, |
96 | { CS_BIG5_EXT, "xft:AR PL KaitiM Big5" }, |
104 | { CS_BIG5_EXT, "xft:AR PL KaitiM Big5" }, |
97 | { CS_GB2312_1980_0, "xft:AR PL KaitiM GB" }, |
105 | { CS_GB2312_1980_0, "xft:AR PL KaitiM GB" }, |
98 | { CS_GB2312_1980_0, "xft:AR PL SungtiL GB" }, |
106 | { CS_GB2312_1980_0, "xft:AR PL SungtiL GB" }, |
99 | { CS_GB2312_1980_0, "xft::spacing=100:lang=zh" }, |
107 | { CS_GB2312_1980_0, "xft::lang=zh" }, |
100 | # endif |
108 | # endif |
|
|
109 | { CS_GBK_0, "-*-*-*-*-*-*-*-*-*-*-c-*-gbk*-0" }, |
101 | { CS_BIG5, "-*-*-*-*-*-*-*-*-*-*-c-*-big5-0" }, |
110 | { CS_BIG5, "-*-*-*-*-*-*-*-*-*-*-c-*-big5-0" }, |
102 | { CS_BIG5_PLUS, "-*-*-*-*-*-*-*-*-*-*-c-*-big5p-0" }, |
111 | { CS_BIG5_PLUS, "-*-*-*-*-*-*-*-*-*-*-c-*-big5p-0" }, |
103 | { CS_BIG5_EXT, "-*-*-*-*-*-*-*-*-*-*-c-*-big5.eten-0" }, |
112 | { CS_BIG5_EXT, "-*-*-*-*-*-*-*-*-*-*-c-*-big5.eten-0" }, |
|
|
113 | { CS_GB2312_1980_0, "-*-*-*-*-*-*-*-*-*-*-c-*-gb2312*-0" }, |
104 | { CS_CNS11643_1992_1, "-*-*-*-*-*-*-*-*-*-*-c-*-gb2312*-0" }, |
114 | { CS_CNS11643_1992_1, "-*-*-*-*-*-*-*-*-*-*-c-*-gb2312*-0" }, |
105 | { CS_CNS11643_1992_1, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-1" }, |
115 | { CS_CNS11643_1992_1, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-1" }, |
106 | { CS_CNS11643_1992_2, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-2" }, |
116 | { CS_CNS11643_1992_2, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-2" }, |
107 | { CS_CNS11643_1992_3, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-3" }, |
117 | { CS_CNS11643_1992_3, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-3" }, |
108 | { CS_CNS11643_1992_4, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-4" }, |
118 | { CS_CNS11643_1992_4, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-4" }, |
… | |
… | |
115 | #if ENCODING_KR |
125 | #if ENCODING_KR |
116 | { CS_KSC5601_1987_0, "-baekmuk-gulim-*-*-*-*-*-*-*-*-c-*-ksc5601*" }, |
126 | { CS_KSC5601_1987_0, "-baekmuk-gulim-*-*-*-*-*-*-*-*-c-*-ksc5601*" }, |
117 | { CS_KSC5601_1987_0, "-*-*-*-*-*-*-*-*-*-*-c-*-ksc5601*" }, |
127 | { CS_KSC5601_1987_0, "-*-*-*-*-*-*-*-*-*-*-c-*-ksc5601*" }, |
118 | # if XFT |
128 | # if XFT |
119 | { CS_KSC5601_1987_0, "xft:Baekmuk Gulim:antialias=false" }, |
129 | { CS_KSC5601_1987_0, "xft:Baekmuk Gulim:antialias=false" }, |
120 | { CS_KSC5601_1987_0, "xft::spacing=100:lang=ko:antialias=false" }, |
130 | { CS_KSC5601_1987_0, "xft::lang=ko:antialias=false" }, |
121 | # endif |
131 | # endif |
122 | #endif |
132 | #endif |
123 | |
133 | |
124 | // generic font fallback |
134 | // generic font fallback |
125 | { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" }, |
135 | { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" }, |
126 | { CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" }, |
136 | { CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" }, |
127 | { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" }, |
137 | { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" }, |
128 | { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" }, |
138 | { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" }, |
129 | #if XFT |
139 | #if XFT |
130 | { CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true"}, |
140 | { CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true" }, |
131 | { CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" }, |
141 | { CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" }, |
132 | { CS_UNICODE, "xft:Andale Mono:antialias=false" }, |
142 | { CS_UNICODE, "xft:Andale Mono:antialias=false:autohint=false" }, |
133 | { CS_UNICODE, "xft:Arial Unicode MS:antialias=false" }, |
143 | { CS_UNICODE, "xft:Arial Unicode MS:antialias=false:autohint=false" }, |
134 | |
144 | |
135 | // FreeMono is usually uglier than x fonts, so try last only. |
145 | // FreeMono is usually uglier than x fonts, so try last only. |
136 | { CS_UNICODE, "xft:FreeMono:autohint=true" }, |
146 | { CS_UNICODE, "xft:FreeMono:autohint=true" }, |
137 | #endif |
147 | #endif |
138 | |
148 | |
139 | { CS_UNKNOWN, 0 } |
149 | { CS_UNKNOWN, 0 } |
140 | }; |
150 | }; |
141 | |
151 | |
142 | // these characters are used to guess the font height and width |
152 | // these characters are used to guess the font height and width |
143 | // pango uses a similar algorithm and eosn't trust the font either. |
153 | // pango uses a similar algorithm and doesn't trust the font either. |
144 | static uint16_t extent_test_chars[] = { |
154 | static uint16_t extent_test_chars[] = { |
145 | '0', '1', '8', 'a', 'd', 'x', 'm', 'y', 'g', 'W', 'X', '\'', '_', |
155 | '0', '1', '8', 'a', 'd', 'x', 'm', 'y', 'g', 'W', 'X', '\'', '_', |
146 | 0x00cd, 0x00d5, 0x0114, 0x0177, 0x0643, // ÍÕĔŷﻙ |
156 | 0x00cd, 0x00d5, 0x0114, 0x0177, 0x0643, // ÍÕĔŷﻙ |
147 | 0x304c, 0x672c, // が本 |
157 | 0x304c, 0x672c, // が本 |
148 | }; |
158 | }; |
149 | |
159 | |
150 | #define NUM_EXTENT_TEST_CHARS (sizeof (extent_test_chars) / sizeof (extent_test_chars[0])) |
160 | #define NUM_EXTENT_TEST_CHARS (sizeof (extent_test_chars) / sizeof (extent_test_chars[0])) |
151 | |
161 | |
|
|
162 | #define dTermDisplay Display *disp = term->xdisp |
|
|
163 | #define dTermGC GC gc = term->gc |
|
|
164 | |
152 | ///////////////////////////////////////////////////////////////////////////// |
165 | ///////////////////////////////////////////////////////////////////////////// |
153 | |
166 | |
154 | #if XFT |
167 | #if XFT |
155 | rxvt_drawable::~rxvt_drawable () |
168 | rxvt_drawable::~rxvt_drawable () |
156 | { |
169 | { |
… | |
… | |
159 | } |
172 | } |
160 | |
173 | |
161 | rxvt_drawable::operator XftDraw *() |
174 | rxvt_drawable::operator XftDraw *() |
162 | { |
175 | { |
163 | if (!xftdrawable) |
176 | if (!xftdrawable) |
164 | xftdrawable = XftDrawCreate (display->display, drawable, display->visual, display->cmap); |
177 | xftdrawable = XftDrawCreate (screen->xdisp, drawable, screen->visual, screen->cmap); |
165 | |
178 | |
166 | return xftdrawable; |
179 | return xftdrawable; |
167 | } |
180 | } |
168 | #endif |
181 | #endif |
169 | |
182 | |
170 | ///////////////////////////////////////////////////////////////////////////// |
183 | ///////////////////////////////////////////////////////////////////////////// |
171 | |
|
|
172 | static void *enc_buf; |
|
|
173 | static uint32_t enc_len; |
|
|
174 | |
|
|
175 | static inline void * |
|
|
176 | get_enc_buf (uint32_t len) |
|
|
177 | { |
|
|
178 | if (len > enc_len) |
|
|
179 | { |
|
|
180 | free (enc_buf); |
|
|
181 | enc_buf = malloc (len); |
|
|
182 | enc_len = len; |
|
|
183 | } |
|
|
184 | |
|
|
185 | return enc_buf; |
|
|
186 | } |
|
|
187 | |
184 | |
188 | static const char * |
185 | static const char * |
189 | enc_char (const text_t *text, uint32_t len, codeset cs, bool &zero) |
186 | enc_char (const text_t *text, uint32_t len, codeset cs, bool &zero) |
190 | { |
187 | { |
191 | uint8_t *buf = (uint8_t *)get_enc_buf (len); |
188 | uint8_t *buf = rxvt_temp_buf<uint8_t> (len); |
|
|
189 | uint8_t *res = buf; |
192 | |
190 | |
193 | while (len--) |
191 | while (len--) |
194 | { |
192 | { |
195 | uint32_t c = FROM_UNICODE (cs, *text++); |
193 | uint32_t c = FROM_UNICODE (cs, *text++); |
196 | |
194 | |
… | |
… | |
201 | } |
199 | } |
202 | |
200 | |
203 | *buf++ = c; |
201 | *buf++ = c; |
204 | } |
202 | } |
205 | |
203 | |
206 | return (const char *)enc_buf; |
204 | return (const char *)res; |
207 | } |
205 | } |
208 | |
206 | |
209 | static const XChar2b * |
207 | static const XChar2b * |
210 | enc_xchar2b (const text_t *text, uint32_t len, codeset cs, bool &zero) |
208 | enc_xchar2b (const text_t *text, uint32_t len, codeset cs, bool &zero) |
211 | { |
209 | { |
212 | XChar2b *buf = (XChar2b *)get_enc_buf (len * sizeof (XChar2b)); |
210 | XChar2b *buf = rxvt_temp_buf<XChar2b> (len); |
|
|
211 | XChar2b *res = buf; |
213 | |
212 | |
214 | while (len--) |
213 | while (len--) |
215 | { |
214 | { |
216 | uint32_t c = FROM_UNICODE (cs, *text++); |
215 | uint32_t c = FROM_UNICODE (cs, *text++); |
217 | |
216 | |
… | |
… | |
224 | buf->byte1 = c >> 8; |
223 | buf->byte1 = c >> 8; |
225 | buf->byte2 = c; |
224 | buf->byte2 = c; |
226 | buf++; |
225 | buf++; |
227 | } |
226 | } |
228 | |
227 | |
229 | return (XChar2b *)enc_buf; |
228 | return res; |
230 | } |
229 | } |
231 | |
230 | |
232 | ///////////////////////////////////////////////////////////////////////////// |
231 | ///////////////////////////////////////////////////////////////////////////// |
|
|
232 | |
|
|
233 | rxvt_font::rxvt_font () |
|
|
234 | : name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset) |
|
|
235 | { |
|
|
236 | } |
233 | |
237 | |
234 | void |
238 | void |
235 | rxvt_font::set_name (char *name) |
239 | rxvt_font::set_name (char *name) |
236 | { |
240 | { |
237 | if (this->name == name) |
241 | if (this->name == name) |
… | |
… | |
240 | if (this->name) free (this->name); // let the compiler optimize |
244 | if (this->name) free (this->name); // let the compiler optimize |
241 | this->name = name; |
245 | this->name = name; |
242 | } |
246 | } |
243 | |
247 | |
244 | void |
248 | void |
245 | rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) |
249 | rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const |
246 | { |
250 | { |
|
|
251 | dTermDisplay; |
|
|
252 | dTermGC; |
|
|
253 | |
247 | if (color == Color_bg) |
254 | if (color == Color_bg) |
248 | XClearArea (d.display->display, d, x, y, w, h, FALSE); |
255 | XClearArea (disp, d, x, y, w, h, false); |
249 | else if (color >= 0) |
256 | else if (color >= 0) |
250 | { |
257 | { |
251 | #if XFT |
258 | #if XFT |
252 | XftDrawRect (d, &r->pix_colors[color].c, x, y, w, h); |
259 | XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h); |
253 | #else |
260 | #else |
254 | XSetForeground (d.display->display, TGC, r->pix_colors[color]); |
261 | XSetForeground (disp, gc, term->pix_colors[color]); |
255 | XFillRectangle (d.display->display, d, TGC, x, y, w, h); |
262 | XFillRectangle (disp, d, gc, x, y, w, h); |
256 | #endif |
263 | #endif |
257 | } |
264 | } |
258 | } |
265 | } |
|
|
266 | |
|
|
267 | ///////////////////////////////////////////////////////////////////////////// |
259 | |
268 | |
260 | #include "table/linedraw.h" |
269 | #include "table/linedraw.h" |
261 | |
270 | |
262 | struct rxvt_font_default : rxvt_font { |
271 | struct rxvt_font_default : rxvt_font { |
263 | struct rxvt_fontset *fs; |
272 | struct rxvt_fontset *fs; |
… | |
… | |
271 | rxvt_fontprop properties () |
280 | rxvt_fontprop properties () |
272 | { |
281 | { |
273 | rxvt_fontprop p; |
282 | rxvt_fontprop p; |
274 | |
283 | |
275 | p.width = p.height = 1; |
284 | p.width = p.height = 1; |
|
|
285 | p.ascent = rxvt_fontprop::unset; |
276 | p.weight = rxvt_fontprop::medium; |
286 | p.weight = rxvt_fontprop::medium; |
277 | p.slant = rxvt_fontprop::roman; |
287 | p.slant = rxvt_fontprop::roman; |
278 | |
288 | |
279 | return p; |
289 | return p; |
280 | } |
290 | } |
… | |
… | |
287 | set_name (strdup ("built-in support font")); |
297 | set_name (strdup ("built-in support font")); |
288 | |
298 | |
289 | return true; |
299 | return true; |
290 | } |
300 | } |
291 | |
301 | |
292 | bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) |
302 | bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const |
293 | { |
303 | { |
294 | careful = false; |
304 | careful = false; |
295 | |
305 | |
296 | if (unicode <= 0x001f) |
306 | if (unicode <= 0x001f) |
297 | return true; |
307 | return true; |
… | |
… | |
300 | return false; |
310 | return false; |
301 | |
311 | |
302 | if (unicode <= 0x009f) |
312 | if (unicode <= 0x009f) |
303 | return true; |
313 | return true; |
304 | |
314 | |
305 | if (unicode >= 0x2500 && unicode <= 0x259f) |
315 | if (unicode >= 0x2500 && unicode <= 0x259f && |
|
|
316 | !term->option (Opt_skipBuiltinGlyphs)) |
306 | return true; |
317 | return true; |
307 | |
318 | |
308 | if (IS_COMPOSE (unicode)) |
319 | if (IS_COMPOSE (unicode)) |
309 | return true; |
320 | return true; |
310 | |
321 | |
… | |
… | |
326 | void |
337 | void |
327 | rxvt_font_default::draw (rxvt_drawable &d, int x, int y, |
338 | rxvt_font_default::draw (rxvt_drawable &d, int x, int y, |
328 | const text_t *text, int len, |
339 | const text_t *text, int len, |
329 | int fg, int bg) |
340 | int fg, int bg) |
330 | { |
341 | { |
|
|
342 | dTermDisplay; |
|
|
343 | dTermGC; |
|
|
344 | |
331 | clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); |
345 | clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); |
332 | |
346 | |
333 | XSetForeground (d.display->display, TGC, r->pix_colors[fg]); |
347 | XSetForeground (disp, gc, term->pix_colors[fg]); |
334 | |
348 | |
335 | while (len--) |
349 | while (len) |
336 | { |
350 | { |
337 | #if ENABLE_COMBINING |
351 | #if ENABLE_COMBINING |
338 | compose_char *cc; |
352 | compose_char *cc; |
339 | #endif |
353 | #endif |
|
|
354 | const text_t *tp = text; |
340 | text_t t = *text++; |
355 | text_t t = *tp; |
|
|
356 | |
|
|
357 | while (++text, --len && *text == NOCHAR) |
|
|
358 | ; |
|
|
359 | |
|
|
360 | int width = text - tp; |
|
|
361 | int fwidth = term->fwidth * width; |
341 | |
362 | |
342 | if (0x2500 <= t && t <= 0x259f) |
363 | if (0x2500 <= t && t <= 0x259f) |
343 | { |
364 | { |
344 | uint16_t offs = linedraw_offs[t - 0x2500]; |
365 | uint16_t offs = linedraw_offs[t - 0x2500]; |
345 | uint32_t *a = linedraw_command + (offs >> 4); |
366 | uint32_t *a = linedraw_command + (offs >> 4); |
346 | uint32_t *b = a + (offs & 15); |
367 | uint32_t *b = a + (offs & 15); |
347 | |
368 | |
348 | int W = r->TermWin.fwidth; |
369 | int W = fwidth; |
349 | int H = r->TermWin.fheight; |
370 | int H = term->fheight; |
350 | |
371 | |
351 | int x_[16]; |
372 | int x_[16]; |
352 | int y_[16]; |
373 | int y_[16]; |
353 | |
374 | |
354 | for (int i = 0; i <= 8; i++) |
375 | for (int i = 0; i <= 8; i++) |
… | |
… | |
362 | |
383 | |
363 | XGCValues gcv; |
384 | XGCValues gcv; |
364 | |
385 | |
365 | gcv.cap_style = CapButt; |
386 | gcv.cap_style = CapButt; |
366 | gcv.line_width = 0; |
387 | gcv.line_width = 0; |
367 | XChangeGC (d.display->display, TGC, GCLineWidth | GCCapStyle, &gcv); |
388 | XChangeGC (disp, gc, GCLineWidth | GCCapStyle, &gcv); |
368 | |
389 | |
369 | while (a < b) |
390 | while (a < b) |
370 | { |
391 | { |
371 | uint32_t command = *a++; |
392 | uint32_t command = *a++; |
372 | |
393 | |
… | |
… | |
379 | int y2 = y_[(command >> 0) & 15]; |
400 | int y2 = y_[(command >> 0) & 15]; |
380 | |
401 | |
381 | switch (op) |
402 | switch (op) |
382 | { |
403 | { |
383 | case 0: // line |
404 | case 0: // line |
384 | XDrawLine (d.display->display, d, TGC, x1, y1, x2, y2); |
405 | XDrawLine (disp, d, gc, x1, y1, x2, y2); |
385 | break; |
406 | break; |
386 | |
407 | |
387 | case 1: // rectangle, possibly stippled |
408 | case 1: // rectangle, possibly stippled |
388 | if (a) |
409 | if (a) |
389 | { |
410 | { |
390 | static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 }; |
411 | static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 }; |
391 | |
412 | |
392 | gcv.fill_style = FillStippled; |
413 | gcv.fill_style = FillStippled; |
393 | gcv.stipple = XCreateBitmapFromData (d.display->display, d, bm + a * 2, 2, 2); |
414 | gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2); |
394 | gcv.ts_x_origin = x; |
415 | gcv.ts_x_origin = x; |
395 | gcv.ts_y_origin = y; |
416 | gcv.ts_y_origin = y; |
396 | |
417 | |
397 | XChangeGC (d.display->display, TGC, |
418 | XChangeGC (disp, gc, |
398 | GCFillStyle | GCStipple | GCTileStipXOrigin | GCTileStipYOrigin, |
419 | GCFillStyle | GCStipple | GCTileStipXOrigin | GCTileStipYOrigin, |
399 | &gcv); |
420 | &gcv); |
400 | } |
421 | } |
401 | |
422 | |
402 | XFillRectangle (d.display->display, d, TGC, x1, y1, x2 - x1 + 1, y2 - y1 + 1); |
423 | XFillRectangle (disp, d, gc, x1, y1, x2 - x1 + 1, y2 - y1 + 1); |
403 | |
424 | |
404 | if (a) |
425 | if (a) |
405 | { |
426 | { |
406 | XFreePixmap (d.display->display, gcv.stipple); |
427 | XFreePixmap (disp, gcv.stipple); |
407 | gcv.stipple = 0; |
428 | gcv.stipple = 0; |
408 | gcv.fill_style = FillSolid; |
429 | gcv.fill_style = FillSolid; |
409 | XChangeGC (d.display->display, TGC, GCFillStyle, &gcv); |
430 | XChangeGC (disp, gc, GCFillStyle, &gcv); |
410 | } |
431 | } |
411 | break; |
432 | break; |
412 | case 2: // arc |
433 | case 2: // arc |
413 | XDrawArc (d.display->display, d, TGC, |
434 | XDrawArc (disp, d, gc, |
414 | x1 - W/2, y1 - H/2, W-1, H-1, |
435 | x1 - W/2, y1 - H/2, W-1, H-1, |
415 | (a - 1) * 90*64, (b - 1) * 90*64); |
436 | (a - 1) * 90*64, (b - 1) * 90*64); |
416 | break; |
437 | break; |
417 | } |
438 | } |
418 | } |
439 | } |
419 | } |
440 | } |
420 | #if ENABLE_COMBINING |
441 | #if ENABLE_COMBINING |
421 | else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) |
442 | else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) |
422 | { |
443 | { |
|
|
444 | min_it (width, 2); // we only support wcwidth up to 2 |
|
|
445 | |
423 | text_t c2[2]; |
446 | text_t chrs[2]; |
424 | int len2 = 1; |
447 | chrs [1] = NOCHAR; |
425 | |
|
|
426 | // support double-width (but not more) combining characters |
|
|
427 | if (len && *text == NOCHAR) |
|
|
428 | { |
|
|
429 | c2[1] = *text; // not text++ to get correct x-width |
|
|
430 | len2++; |
|
|
431 | } |
|
|
432 | |
448 | |
433 | c2[0] = cc->c1; |
449 | *chrs = cc->c1; |
434 | rxvt_font *f1 = (*fs)[fs->find_font (c2[0])]; |
450 | rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)]; |
435 | f1->draw (d, x, y, c2, len2, fg, bg); |
451 | f1->draw (d, x, y, chrs, width, fg, bg); |
436 | |
452 | |
437 | if (cc->c2 != NOCHAR) |
453 | if (cc->c2 != NOCHAR) |
438 | { |
454 | { |
439 | bool careful; |
455 | bool careful; |
440 | |
456 | |
441 | // prefer font of first character, for no good reasons |
457 | // prefer font of first character, for no good reasons |
442 | c2[0] = cc->c2; |
458 | *chrs = cc->c2; |
443 | rxvt_font *f2 = (f1->has_char (c2[0], 0, careful) && !careful) |
459 | rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful) |
444 | ? f1 |
460 | ? f1 |
445 | : (*fs)[fs->find_font (c2[0])]; |
461 | : (*fs)[fs->find_font (cc->c2)]; |
446 | |
462 | |
447 | f2->draw (d, x, y, c2, len2, fg, -1); |
463 | f2->draw (d, x, y, chrs, width, fg, -1); |
448 | } |
464 | } |
449 | } |
465 | } |
450 | #endif |
466 | #endif |
451 | else |
467 | else |
452 | switch (t) |
468 | switch (t) |
… | |
… | |
455 | case ZERO_WIDTH_CHAR: |
471 | case ZERO_WIDTH_CHAR: |
456 | case NOCHAR: |
472 | case NOCHAR: |
457 | break; |
473 | break; |
458 | |
474 | |
459 | default: |
475 | default: |
460 | int w = 0; |
|
|
461 | while (len > 0 && *text == NOCHAR) |
|
|
462 | { |
|
|
463 | ++text; |
|
|
464 | --len; |
|
|
465 | w += r->TermWin.fwidth; |
|
|
466 | } |
|
|
467 | |
|
|
468 | XDrawRectangle (d.display->display, d, TGC, x + 2, y + 2, |
476 | XDrawRectangle (disp, d, gc, x + 2, y + 2, |
469 | w + r->TermWin.fwidth - 4, r->TermWin.fheight - 4); |
477 | fwidth - 4, term->fheight - 4); |
470 | x += w; |
|
|
471 | } |
478 | } |
472 | |
479 | |
473 | x += r->TermWin.fwidth; |
480 | x += fwidth; |
474 | } |
481 | } |
475 | } |
482 | } |
476 | |
483 | |
477 | ///////////////////////////////////////////////////////////////////////////// |
484 | ///////////////////////////////////////////////////////////////////////////// |
478 | |
485 | |
… | |
… | |
483 | |
490 | |
484 | rxvt_fontprop properties (); |
491 | rxvt_fontprop properties (); |
485 | |
492 | |
486 | bool load (const rxvt_fontprop &prop); |
493 | bool load (const rxvt_fontprop &prop); |
487 | |
494 | |
488 | bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful); |
495 | bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const; |
489 | |
496 | |
490 | void draw (rxvt_drawable &d, int x, int y, |
497 | void draw (rxvt_drawable &d, int x, int y, |
491 | const text_t *text, int len, |
498 | const text_t *text, int len, |
492 | int fg, int bg); |
499 | int fg, int bg); |
493 | |
500 | |
494 | bool slow; // wether this is a proportional font or has other funny characteristics |
501 | bool slow; // wether this is a proportional font or has other funny characteristics |
495 | XFontStruct *f; |
502 | XFontStruct *f; |
496 | codeset cs; |
503 | codeset cs; |
497 | bool enc2b, encm; |
504 | bool enc2b, encm; |
498 | |
505 | |
499 | char *get_property (XFontStruct *f, const char *property, const char *repl) const; |
506 | 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); |
507 | 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); |
508 | bool set_properties (rxvt_fontprop &p, XFontStruct *f); |
502 | bool set_properties (rxvt_fontprop &p, const char *name); |
509 | bool set_properties (rxvt_fontprop &p, const char *name); |
503 | }; |
510 | }; |
504 | |
511 | |
505 | char * |
512 | char * |
506 | rxvt_font_x11::get_property (XFontStruct *f, const char *property, const char *repl) const |
513 | rxvt_font_x11::get_property (XFontStruct *f, Atom property, const char *repl) const |
507 | { |
514 | { |
508 | unsigned long value; |
515 | unsigned long value; |
509 | |
516 | |
510 | if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value)) |
517 | if (XGetFontProperty (f, property, &value)) |
511 | return XGetAtomName (DISPLAY, value); |
518 | return XGetAtomName (term->xdisp, value); |
512 | else |
519 | else |
513 | return rxvt_strdup (repl); |
520 | return rxvt_strdup (repl); |
514 | } |
521 | } |
515 | |
522 | |
516 | rxvt_fontprop |
523 | rxvt_fontprop |
… | |
… | |
522 | } |
529 | } |
523 | |
530 | |
524 | bool |
531 | bool |
525 | rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth) |
532 | rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth) |
526 | { |
533 | { |
527 | p.width = avgwidth ? (avgwidth + 1) / 10 : (height + 1) / 2; |
534 | p.width = width != rxvt_fontprop::unset ? width |
|
|
535 | : avgwidth ? (avgwidth + 1) / 10 |
|
|
536 | : (height + 1) / 2; |
528 | p.height = height; |
537 | p.height = height; |
|
|
538 | p.ascent = rxvt_fontprop::unset; |
529 | p.weight = *weight == 'B' || *weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium; |
539 | 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; |
540 | p.slant = *slant == 'r' || *slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic; |
531 | |
541 | |
532 | return true; |
542 | return true; |
533 | } |
543 | } |
534 | |
544 | |
535 | bool |
545 | bool |
536 | rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f) |
546 | rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f) |
537 | { |
547 | { |
538 | unsigned long height; |
548 | unsigned long height; |
|
|
549 | |
|
|
550 | #if 0 |
539 | if (!XGetFontProperty (f, XInternAtom (DISPLAY, "PIXEL_SIZE", 0), &height)) |
551 | if (!XGetFontProperty (f, XInternAtom (term->xdisp, "PIXEL_SIZE", 0), &height)) |
540 | return false; |
552 | return false; |
|
|
553 | #else |
|
|
554 | height = f->ascent + f->descent; |
|
|
555 | #endif |
541 | |
556 | |
542 | unsigned long avgwidth; |
557 | unsigned long avgwidth; |
543 | if (!XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth)) |
558 | if (!XGetFontProperty (f, term->xa [XA_AVERAGE_WIDTH], &avgwidth)) |
544 | avgwidth = 0; |
559 | avgwidth = 0; |
545 | |
560 | |
546 | char *weight = get_property (f, "WEIGHT_NAME", "medium"); |
561 | char *weight = get_property (f, term->xa [XA_WEIGHT_NAME], "medium"); |
547 | char *slant = get_property (f, "SLANT", "r"); |
562 | char *slant = get_property (f, term->xa [XA_SLANT], "r"); |
548 | |
563 | |
549 | set_properties (p, height, weight, slant, avgwidth); |
564 | set_properties (p, height, weight, slant, avgwidth); |
550 | |
565 | |
551 | free (weight); |
566 | free (weight); |
552 | free (slant); |
567 | free (slant); |
553 | |
568 | |
|
|
569 | p.ascent = f->ascent; |
|
|
570 | |
554 | return true; |
571 | return true; |
555 | } |
572 | } |
556 | |
573 | |
557 | bool |
574 | bool |
558 | rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name) |
575 | rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name) |
559 | { |
576 | { |
|
|
577 | dTermDisplay; |
560 | int slashes = 0; |
578 | int slashes = 0; |
561 | const char *comp[13]; |
579 | const char *comp[13]; |
562 | |
580 | |
563 | for (const char *c = name; *c; c++) |
581 | for (const char *c = name; *c; c++) |
564 | if (*c == '-') |
582 | if (*c == '-') |
… | |
… | |
572 | if (slashes >= 13 |
590 | if (slashes >= 13 |
573 | && (*comp[ 6] >= '1' && *comp[ 6] <= '9') |
591 | && (*comp[ 6] >= '1' && *comp[ 6] <= '9') |
574 | && (*comp[11] >= '0' && *comp[11] <= '9')) |
592 | && (*comp[11] >= '0' && *comp[11] <= '9')) |
575 | return set_properties (p, atoi (comp[6]), comp[2], comp[3], atoi (comp[11])); |
593 | return set_properties (p, atoi (comp[6]), comp[2], comp[3], atoi (comp[11])); |
576 | |
594 | |
577 | XFontStruct *f = XLoadQueryFont (DISPLAY, name); |
595 | XFontStruct *f = XLoadQueryFont (disp, name); |
578 | |
596 | |
579 | if (f) |
597 | if (f) |
580 | { |
598 | { |
581 | // the font should really exist now. if not, we have a problem |
599 | // the font should really exist now. if not, we have a problem |
582 | // (e.g. if the user did xset fp rehash just when we were searching fonts). |
600 | // (e.g. if the user did xset fp rehash just when we were searching fonts). |
583 | // in that case, just return garbage. |
601 | // in that case, just return garbage. |
584 | bool ret = set_properties (p, f); |
602 | bool ret = set_properties (p, f); |
585 | XFreeFont (DISPLAY, f); |
603 | XFreeFont (disp, f); |
586 | return ret; |
604 | return ret; |
587 | } |
605 | } |
588 | else |
606 | else |
589 | return false; |
607 | return false; |
590 | } |
608 | } |
… | |
… | |
628 | } |
646 | } |
629 | |
647 | |
630 | bool |
648 | bool |
631 | rxvt_font_x11::load (const rxvt_fontprop &prop) |
649 | rxvt_font_x11::load (const rxvt_fontprop &prop) |
632 | { |
650 | { |
|
|
651 | dTermDisplay; |
|
|
652 | |
633 | clear (); |
653 | clear (); |
634 | |
654 | |
635 | char field_str[64]; // enough for 128 bits |
655 | char field_str[64]; // enough for 128 bits |
636 | |
656 | |
637 | // first morph the font if required |
657 | // first morph the font if required |
… | |
… | |
640 | { |
660 | { |
641 | char fname[1024]; |
661 | char fname[1024]; |
642 | |
662 | |
643 | if (name[0] != '-') |
663 | if (name[0] != '-') |
644 | { |
664 | { |
645 | f = XLoadQueryFont (DISPLAY, name); |
665 | f = XLoadQueryFont (disp, name); |
646 | |
666 | |
647 | if (!f) |
667 | if (!f) |
648 | return false; |
668 | return false; |
649 | |
669 | |
650 | char *new_name = get_property (f, "FONT", name); |
670 | char *new_name = get_property (f, XA_FONT, name); |
651 | |
671 | |
652 | if (new_name) |
672 | if (new_name) |
653 | set_name (new_name); |
673 | set_name (new_name); |
654 | else |
674 | else |
655 | rxvt_warn ("font '%s' has no FONT property, continuing without.", name); |
675 | rxvt_warn ("font '%s' has no FONT property, continuing without.", name); |
656 | |
676 | |
657 | XFreeFont (DISPLAY, f); |
677 | XFreeFont (disp, f); |
658 | f = 0; |
678 | f = 0; |
659 | } |
679 | } |
660 | |
680 | |
661 | if (prop.weight != rxvt_fontprop::unset) |
681 | if (prop.weight != rxvt_fontprop::unset) |
662 | { |
682 | { |
… | |
… | |
673 | ? "r" : "i"); // TODO: handle "o"blique, too |
693 | ? "r" : "i"); // TODO: handle "o"blique, too |
674 | set_name (strdup (fname)); |
694 | set_name (strdup (fname)); |
675 | } |
695 | } |
676 | } |
696 | } |
677 | |
697 | |
|
|
698 | sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset |
|
|
699 | ? 0 : prop.height); |
|
|
700 | |
|
|
701 | struct font_weight { |
|
|
702 | char *name; |
|
|
703 | int diff; |
|
|
704 | |
|
|
705 | void clear () |
|
|
706 | { |
|
|
707 | name = 0; |
|
|
708 | diff = 0x7fffffff; |
|
|
709 | } |
|
|
710 | |
|
|
711 | font_weight () { clear (); } |
|
|
712 | ~font_weight () { free (name); } |
|
|
713 | }; |
|
|
714 | |
678 | char **list; |
715 | char **list; |
679 | int count; |
716 | int count; |
680 | list = XListFonts (DISPLAY, name, 1024, &count); |
717 | list = XListFonts (disp, name, 4000, &count); |
681 | |
718 | |
682 | set_name (0); |
719 | set_name (0); |
683 | |
720 | |
684 | if (!list) |
721 | if (!list) |
685 | return false; |
722 | return false; |
686 | |
723 | |
687 | sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset |
724 | font_weight *fonts = new font_weight[count]; |
688 | ? 0 : prop.height); |
|
|
689 | |
725 | |
690 | int bestdiff = 0x7fffffff; |
|
|
691 | for (int i = 0; i < count; i++) |
726 | for (int i = 0; i < count; i++) |
692 | { |
727 | { |
693 | rxvt_fontprop p; |
728 | rxvt_fontprop p; |
694 | char fname[1024]; |
729 | char fname[1024]; |
695 | |
730 | |
696 | int diff = 0; |
731 | int diff = 0; |
697 | |
732 | |
698 | if (replace_field (fname, list[i], 6, '0', field_str)) |
733 | if (replace_field (fname, list[i], 6, '0', field_str)) |
699 | diff += 10; // slightly penalize scalable fonts |
734 | diff += 10; // slightly penalize scalable fonts |
|
|
735 | else if (replace_field (fname, list[i], 11, '0', "0")) |
|
|
736 | diff += 300; // more heavily penalize what looks like scaled bitmap fonts |
700 | |
737 | |
701 | if (!set_properties (p, fname)) |
738 | if (!set_properties (p, fname)) |
702 | continue; |
739 | continue; |
703 | |
740 | |
704 | if (prop.height != rxvt_fontprop::unset |
741 | if (prop.height != rxvt_fontprop::unset |
… | |
… | |
708 | if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128; |
745 | if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128; |
709 | if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight); |
746 | if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight); |
710 | if (prop.slant != rxvt_fontprop::unset) diff += abs (prop.slant - p.slant); |
747 | if (prop.slant != rxvt_fontprop::unset) diff += abs (prop.slant - p.slant); |
711 | //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width); |
748 | //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width); |
712 | |
749 | |
713 | if (!name // compare against best found so far |
750 | fonts[i].name = strdup (fname); |
714 | || diff < bestdiff) |
751 | fonts[i].diff = diff; |
715 | { |
|
|
716 | set_name (strdup (fname)); |
|
|
717 | bestdiff = diff; |
|
|
718 | } |
|
|
719 | } |
752 | } |
720 | |
753 | |
721 | XFreeFontNames (list); |
754 | XFreeFontNames (list); |
722 | |
755 | |
723 | if (!name) |
756 | // this loop only iterates when the guessed font-size is too small |
724 | return false; |
757 | for (;;) |
|
|
758 | { |
|
|
759 | font_weight *best = fonts + count - 1; |
725 | |
760 | |
726 | f = XLoadQueryFont (DISPLAY, name); |
761 | for (font_weight *w = best; w-- > fonts; ) |
|
|
762 | if (w->diff <= best->diff) |
|
|
763 | best = w; |
|
|
764 | |
|
|
765 | if (!best->name |
|
|
766 | || !(f = XLoadQueryFont (disp, best->name))) |
|
|
767 | break; |
|
|
768 | |
|
|
769 | set_name (best->name); |
|
|
770 | best->clear (); |
|
|
771 | |
|
|
772 | ascent = f->ascent; |
|
|
773 | descent = f->descent; |
|
|
774 | height = ascent + descent; |
|
|
775 | |
|
|
776 | if (prop.height == rxvt_fontprop::unset |
|
|
777 | || height <= prop.height) |
|
|
778 | break; // font is ready for use |
|
|
779 | |
|
|
780 | // PIXEL_SIZE small enough, but real height too large |
|
|
781 | clear (); |
|
|
782 | } |
|
|
783 | |
|
|
784 | delete [] fonts; |
727 | |
785 | |
728 | if (!f) |
786 | if (!f) |
729 | return false; |
787 | return false; |
730 | |
788 | |
731 | char *registry = get_property (f, "CHARSET_REGISTRY", 0); |
789 | char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0); |
732 | char *encoding = get_property (f, "CHARSET_ENCODING", 0); |
790 | char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0); |
733 | |
791 | |
734 | if (registry && encoding) |
792 | if (registry && encoding) |
735 | { |
793 | { |
736 | char charset[64]; |
794 | char charset[64]; |
737 | snprintf (charset, 64, "%s-%s", registry, encoding); |
795 | snprintf (charset, 64, "%s-%s", registry, encoding); |
738 | |
796 | |
739 | cs = codeset_from_name (charset); |
797 | cs = codeset_from_name (charset); |
740 | } |
798 | } |
741 | else |
799 | else |
742 | { |
800 | { |
743 | const char *charset = get_property (f, "FONT", 0); |
801 | const char *charset = get_property (f, XA_FONT, 0); |
744 | |
802 | |
745 | if (!charset) |
803 | if (!charset) |
746 | charset = name; |
804 | charset = name; |
747 | |
805 | |
748 | int count = 13; |
806 | int count = 13; |
… | |
… | |
760 | cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font |
818 | cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font |
761 | |
819 | |
762 | encm = f->min_byte1 != 0 || f->max_byte1 != 0; |
820 | encm = f->min_byte1 != 0 || f->max_byte1 != 0; |
763 | enc2b = encm || f->max_char_or_byte2 > 255; |
821 | enc2b = encm || f->max_char_or_byte2 > 255; |
764 | |
822 | |
765 | ascent = f->ascent; |
|
|
766 | descent = f->descent; |
|
|
767 | height = ascent + descent; |
|
|
768 | |
|
|
769 | slow = false; |
823 | slow = false; |
770 | |
824 | |
771 | #if 1 // only used for slow detection, TODO optimize |
825 | #if 1 // only used for slow detection, TODO optimize |
772 | if (f->min_bounds.width == f->max_bounds.width) |
826 | if (f->min_bounds.width == f->max_bounds.width || !f->per_char) |
773 | width = f->min_bounds.width; |
|
|
774 | else if (f->per_char == NULL) |
|
|
775 | width = f->max_bounds.width; |
827 | width = f->max_bounds.width; |
776 | else |
828 | else |
777 | { |
829 | { |
778 | slow = true; |
830 | slow = true; |
779 | |
831 | |
… | |
… | |
795 | |
847 | |
796 | width = 1; |
848 | width = 1; |
797 | |
849 | |
798 | for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) |
850 | for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) |
799 | { |
851 | { |
800 | if (cs != CS_UNICODE |
|
|
801 | && *t > 0x100 |
|
|
802 | && FROM_UNICODE (cs, *t) == NOCHAR) |
852 | if (FROM_UNICODE (cs, *t) == NOCHAR) |
803 | continue; |
853 | continue; |
804 | |
854 | |
805 | // ignore characters we wouldn't use anyways |
855 | // ignore characters we wouldn't use anyways |
806 | bool careful; |
856 | bool careful; |
807 | if (!has_char (*t, &prop, careful)) |
857 | if (!has_char (*t, &prop, careful)) |
… | |
… | |
811 | |
861 | |
812 | XCharStruct g; |
862 | XCharStruct g; |
813 | int dir_ret, asc_ret, des_ret; |
863 | int dir_ret, asc_ret, des_ret; |
814 | XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); |
864 | XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); |
815 | |
865 | |
816 | int wcw = wcwidth (*t); if (wcw > 0) g.width = g.width / wcw; |
866 | int wcw = WCWIDTH (*t); if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; |
817 | |
867 | |
818 | if (width < g.width) width = g.width; |
868 | if (width < g.width) width = g.width; |
819 | } |
869 | } |
820 | |
870 | |
821 | if (cs == CS_UNKNOWN) |
871 | if (cs == CS_UNKNOWN) |
822 | { |
872 | { |
823 | fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name); |
873 | fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name); |
… | |
… | |
840 | void |
890 | void |
841 | rxvt_font_x11::clear () |
891 | rxvt_font_x11::clear () |
842 | { |
892 | { |
843 | if (f) |
893 | if (f) |
844 | { |
894 | { |
845 | XFreeFont (DISPLAY, f); |
895 | XFreeFont (term->xdisp, f); |
846 | f = 0; |
896 | f = 0; |
847 | } |
897 | } |
848 | } |
898 | } |
849 | |
899 | |
850 | bool |
900 | bool |
851 | rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) |
901 | rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const |
852 | { |
902 | { |
853 | uint32_t ch = FROM_UNICODE (cs, unicode); |
903 | uint32_t ch = FROM_UNICODE (cs, unicode); |
854 | |
904 | |
855 | if (ch == NOCHAR) |
905 | if (ch == NOCHAR) |
856 | return false; |
906 | return false; |
… | |
… | |
893 | return false; |
943 | return false; |
894 | |
944 | |
895 | if (!prop || prop->width == rxvt_fontprop::unset) |
945 | if (!prop || prop->width == rxvt_fontprop::unset) |
896 | return true; |
946 | return true; |
897 | |
947 | |
898 | // check character against base font bounding box |
948 | // check wether character overlaps previous/next character |
899 | int w = xcs->width; |
949 | int w = xcs->rbearing - xcs->lbearing; |
900 | int wcw = wcwidth (unicode); |
950 | int wcw = WCWIDTH (unicode); |
901 | if (wcw > 0) w /= wcw; |
|
|
902 | |
951 | |
903 | careful = w > prop->width; |
952 | careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw; |
904 | if (careful && w > prop->width * MAX_OVERLAP >> 2) |
953 | |
|
|
954 | if (careful && !OVERLAP_OK (w, wcw, prop)) |
905 | return false; |
955 | return false; |
906 | |
956 | |
907 | return true; |
957 | return true; |
908 | } |
958 | } |
909 | |
959 | |
… | |
… | |
915 | // this looks like a mess /. |
965 | // this looks like a mess /. |
916 | // and it is a mess /. |
966 | // and it is a mess /. |
917 | // yet we are trying to be perfect /. |
967 | // yet we are trying to be perfect /. |
918 | // but the result still isn't perfect /. |
968 | // but the result still isn't perfect /. |
919 | |
969 | |
|
|
970 | dTermDisplay; |
|
|
971 | dTermGC; |
|
|
972 | |
920 | bool slow = this->slow |
973 | bool slow = this->slow |
921 | || width != r->TermWin.fwidth |
974 | || width != term->fwidth |
922 | || height != r->TermWin.fheight; |
975 | || height != term->fheight; |
923 | |
976 | |
924 | int base = ascent; // sorry, incorrect: r->TermWin.fbase; |
977 | int base = ascent; // sorry, incorrect: term->fbase; |
925 | |
978 | |
926 | XGCValues v; |
979 | XGCValues v; |
927 | v.foreground = r->pix_colors[fg]; |
980 | v.foreground = term->pix_colors[fg]; |
928 | v.font = f->fid; |
981 | v.font = f->fid; |
929 | |
982 | |
930 | if (enc2b) |
983 | if (enc2b) |
931 | { |
984 | { |
932 | const XChar2b *xc = enc_xchar2b (text, len, cs, slow); |
985 | const XChar2b *xc = enc_xchar2b (text, len, cs, slow); |
933 | |
986 | |
934 | if (bg == Color_bg && !slow) |
987 | if (bg == Color_bg && !slow) |
935 | { |
988 | { |
936 | v.background = r->pix_colors[bg]; |
989 | v.background = term->pix_colors[bg]; |
937 | XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); |
990 | XChangeGC (disp, gc, GCForeground | GCBackground | GCFont, &v); |
938 | XDrawImageString16 (d.display->display, d, TGC, x, y + base, xc, len); |
991 | XDrawImageString16 (disp, d, gc, x, y + base, xc, len); |
939 | } |
992 | } |
940 | else |
993 | else |
941 | { |
994 | { |
942 | clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); |
995 | clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); |
943 | |
996 | |
944 | XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v); |
997 | XChangeGC (disp, gc, GCForeground | GCFont, &v); |
945 | |
998 | |
946 | if (slow) |
999 | if (slow) |
947 | { |
1000 | { |
948 | do |
1001 | do |
949 | { |
1002 | { |
950 | if (xc->byte1 || xc->byte2) |
1003 | if (xc->byte1 || xc->byte2) |
951 | XDrawString16 (d.display->display, d, TGC, x, y + base, xc, 1); |
1004 | XDrawString16 (disp, d, gc, x, y + base, xc, 1); |
952 | |
1005 | |
953 | x += r->TermWin.fwidth; |
1006 | x += term->fwidth; |
954 | xc++; len--; |
1007 | xc++; len--; |
955 | } |
1008 | } |
956 | while (len); |
1009 | while (len); |
957 | } |
1010 | } |
958 | else |
1011 | else |
959 | XDrawString16 (d.display->display, d, TGC, x, y + base, xc, len); |
1012 | XDrawString16 (disp, d, gc, x, y + base, xc, len); |
960 | } |
1013 | } |
961 | } |
1014 | } |
962 | else |
1015 | else |
963 | { |
1016 | { |
964 | const char *xc = enc_char (text, len, cs, slow); |
1017 | const char *xc = enc_char (text, len, cs, slow); |
965 | |
1018 | |
966 | if (bg == Color_bg && !slow) |
1019 | if (bg == Color_bg && !slow) |
967 | { |
1020 | { |
968 | v.background = r->pix_colors[bg]; |
1021 | v.background = term->pix_colors[bg]; |
969 | XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); |
1022 | XChangeGC (disp, gc, GCForeground | GCBackground | GCFont, &v); |
970 | XDrawImageString (d.display->display, d, TGC, x, y + base, xc, len); |
1023 | XDrawImageString (disp, d, gc, x, y + base, xc, len); |
971 | } |
1024 | } |
972 | else |
1025 | else |
973 | { |
1026 | { |
974 | clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); |
1027 | clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); |
975 | |
1028 | |
976 | XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v); |
1029 | XChangeGC (disp, gc, GCForeground | GCFont, &v); |
977 | |
1030 | |
978 | if (slow) |
1031 | if (slow) |
979 | { |
1032 | { |
980 | do |
1033 | do |
981 | { |
1034 | { |
982 | if (*xc) |
1035 | if (*xc) |
983 | XDrawString (d.display->display, d, TGC, x, y + base, xc, 1); |
1036 | XDrawString (disp, d, gc, x, y + base, xc, 1); |
984 | |
1037 | |
985 | x += r->TermWin.fwidth; |
1038 | x += term->fwidth; |
986 | xc++; len--; |
1039 | xc++; len--; |
987 | } |
1040 | } |
988 | while (len); |
1041 | while (len); |
989 | } |
1042 | } |
990 | else |
1043 | else |
991 | XDrawString (d.display->display, d, TGC, x, y + base, xc, len); |
1044 | XDrawString (disp, d, gc, x, y + base, xc, len); |
992 | } |
1045 | } |
993 | } |
1046 | } |
994 | } |
1047 | } |
995 | |
1048 | |
996 | ///////////////////////////////////////////////////////////////////////////// |
1049 | ///////////////////////////////////////////////////////////////////////////// |
… | |
… | |
1008 | |
1061 | |
1009 | void draw (rxvt_drawable &d, int x, int y, |
1062 | void draw (rxvt_drawable &d, int x, int y, |
1010 | const text_t *text, int len, |
1063 | const text_t *text, int len, |
1011 | int fg, int bg); |
1064 | int fg, int bg); |
1012 | |
1065 | |
1013 | bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &carefull); |
1066 | bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &carefull) const; |
1014 | |
1067 | |
1015 | protected: |
1068 | protected: |
1016 | XftFont *f; |
1069 | XftFont *f; |
1017 | }; |
1070 | }; |
1018 | |
1071 | |
1019 | void |
1072 | void |
1020 | rxvt_font_xft::clear () |
1073 | rxvt_font_xft::clear () |
1021 | { |
1074 | { |
1022 | if (f) |
1075 | if (f) |
1023 | { |
1076 | { |
1024 | XftFontClose (DISPLAY, f); |
1077 | XftFontClose (term->xdisp, f); |
1025 | f = 0; |
1078 | f = 0; |
1026 | } |
1079 | } |
1027 | } |
1080 | } |
1028 | |
1081 | |
1029 | rxvt_fontprop |
1082 | rxvt_fontprop |
… | |
… | |
1033 | |
1086 | |
1034 | FT_Face face = XftLockFace (f); |
1087 | FT_Face face = XftLockFace (f); |
1035 | |
1088 | |
1036 | p.width = width; |
1089 | p.width = width; |
1037 | p.height = height; |
1090 | p.height = height; |
|
|
1091 | p.ascent = ascent; |
1038 | p.weight = face->style_flags & FT_STYLE_FLAG_BOLD |
1092 | p.weight = face->style_flags & FT_STYLE_FLAG_BOLD |
1039 | ? rxvt_fontprop::bold : rxvt_fontprop::medium; |
1093 | ? rxvt_fontprop::bold : rxvt_fontprop::medium; |
1040 | p.slant = face->style_flags & FT_STYLE_FLAG_ITALIC |
1094 | p.slant = face->style_flags & FT_STYLE_FLAG_ITALIC |
1041 | ? rxvt_fontprop::italic : rxvt_fontprop::roman; |
1095 | ? rxvt_fontprop::italic : rxvt_fontprop::roman; |
1042 | |
1096 | |
… | |
… | |
1046 | } |
1100 | } |
1047 | |
1101 | |
1048 | bool |
1102 | bool |
1049 | rxvt_font_xft::load (const rxvt_fontprop &prop) |
1103 | rxvt_font_xft::load (const rxvt_fontprop &prop) |
1050 | { |
1104 | { |
|
|
1105 | dTermDisplay; |
|
|
1106 | |
1051 | clear (); |
1107 | clear (); |
1052 | |
1108 | |
1053 | FcPattern *p = FcNameParse ((FcChar8 *) name); |
1109 | FcPattern *p = FcNameParse ((FcChar8 *) name); |
1054 | |
1110 | |
1055 | if (!p) |
1111 | if (!p) |
1056 | return false; |
1112 | return false; |
1057 | |
1113 | |
1058 | FcValue v; |
1114 | FcValue v; |
1059 | |
1115 | |
1060 | if (prop.height != rxvt_fontprop::unset |
1116 | if (prop.height != rxvt_fontprop::unset |
1061 | || FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch) |
1117 | && (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch |
|
|
1118 | && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch)) |
1062 | FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height); |
1119 | FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height); |
1063 | |
1120 | |
1064 | if (prop.weight != rxvt_fontprop::unset |
1121 | if (prop.weight != rxvt_fontprop::unset |
1065 | && FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch) |
1122 | && FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch) |
1066 | FcPatternAddInteger (p, FC_WEIGHT, prop.weight); |
1123 | FcPatternAddInteger (p, FC_WEIGHT, prop.weight); |
… | |
… | |
1080 | |
1137 | |
1081 | // store generated name so iso14755 view gives better results |
1138 | // store generated name so iso14755 view gives better results |
1082 | set_name ((char *)FcNameUnparse (p)); |
1139 | set_name ((char *)FcNameUnparse (p)); |
1083 | |
1140 | |
1084 | XftResult result; |
1141 | XftResult result; |
1085 | FcPattern *match = XftFontMatch (DISPLAY, DefaultScreen (DISPLAY), p, &result); |
1142 | FcPattern *match = XftFontMatch (disp, term->display->screen, p, &result); |
1086 | |
1143 | |
1087 | FcPatternDestroy (p); |
1144 | FcPatternDestroy (p); |
1088 | |
1145 | |
1089 | if (!match) |
1146 | if (!match) |
1090 | return false; |
1147 | return false; |
… | |
… | |
1092 | int ftheight = 0; |
1149 | int ftheight = 0; |
1093 | bool success = true; |
1150 | bool success = true; |
1094 | |
1151 | |
1095 | for (;;) |
1152 | for (;;) |
1096 | { |
1153 | { |
1097 | f = XftFontOpenPattern (DISPLAY, FcPatternDuplicate (match)); |
1154 | f = XftFontOpenPattern (disp, FcPatternDuplicate (match)); |
1098 | |
1155 | |
1099 | if (!f) |
1156 | if (!f) |
1100 | { |
1157 | { |
1101 | success = false; |
1158 | success = false; |
1102 | break; |
1159 | break; |
… | |
… | |
1111 | |
1168 | |
1112 | bool scalable = face->face_flags & FT_FACE_FLAG_SCALABLE; |
1169 | bool scalable = face->face_flags & FT_FACE_FLAG_SCALABLE; |
1113 | |
1170 | |
1114 | XftUnlockFace (f); |
1171 | XftUnlockFace (f); |
1115 | |
1172 | |
|
|
1173 | int glheight = height; |
|
|
1174 | |
1116 | for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) |
1175 | for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) |
1117 | { |
1176 | { |
1118 | FcChar16 ch = *t; |
1177 | FcChar16 ch = *t; |
1119 | |
1178 | |
1120 | if (cs != CS_UNICODE |
1179 | if (cs != CS_UNICODE |
… | |
… | |
1126 | bool careful; |
1185 | bool careful; |
1127 | if (!has_char (*t, &prop, careful)) |
1186 | if (!has_char (*t, &prop, careful)) |
1128 | continue; |
1187 | continue; |
1129 | |
1188 | |
1130 | XGlyphInfo g; |
1189 | XGlyphInfo g; |
1131 | XftTextExtents16 (DISPLAY, f, &ch, 1, &g); |
1190 | XftTextExtents16 (disp, f, &ch, 1, &g); |
1132 | |
1191 | |
|
|
1192 | g.width -= g.x; |
|
|
1193 | |
1133 | int wcw = wcwidth (ch); |
1194 | int wcw = WCWIDTH (ch); |
1134 | if (wcw > 0) g.width = g.width / wcw; |
1195 | if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; |
1135 | |
1196 | |
1136 | if (width < g.width) width = g.width; |
1197 | if (width < g.width ) width = g.width; |
1137 | if (height < g.height) height = g.height; |
1198 | if (height < g.height ) height = g.height; |
|
|
1199 | if (glheight < g.height - g.y) glheight = g.height - g.y; |
|
|
1200 | } |
|
|
1201 | |
|
|
1202 | if (!width) |
|
|
1203 | { |
|
|
1204 | rxvt_warn ("unable to calculate font width for '%s', ignoring.\n", name); |
|
|
1205 | |
|
|
1206 | XftFontClose (disp, f); |
|
|
1207 | f = 0; |
|
|
1208 | |
|
|
1209 | success = false; |
|
|
1210 | break; |
1138 | } |
1211 | } |
1139 | |
1212 | |
1140 | if (prop.height == rxvt_fontprop::unset |
1213 | if (prop.height == rxvt_fontprop::unset |
1141 | || height <= prop.height |
1214 | || (height <= prop.height && glheight <= prop.height) |
1142 | || height <= 2 |
1215 | || height <= 2 |
1143 | || !scalable) |
1216 | || !scalable) |
1144 | break; |
1217 | break; |
1145 | |
1218 | |
1146 | if (ftheight) |
1219 | if (ftheight) |
… | |
… | |
1153 | ftheight -= height - prop.height; |
1226 | ftheight -= height - prop.height; |
1154 | } |
1227 | } |
1155 | else |
1228 | else |
1156 | ftheight = prop.height - 1; |
1229 | ftheight = prop.height - 1; |
1157 | |
1230 | |
1158 | XftFontClose (DISPLAY, f); |
1231 | XftFontClose (disp, f); |
1159 | FcPatternDel (match, FC_PIXEL_SIZE); |
1232 | FcPatternDel (match, FC_PIXEL_SIZE); |
1160 | FcPatternAddInteger (match, FC_PIXEL_SIZE, ftheight); |
1233 | FcPatternAddInteger (match, FC_PIXEL_SIZE, ftheight); |
1161 | } |
1234 | } |
1162 | |
1235 | |
1163 | FcPatternDestroy (match); |
1236 | FcPatternDestroy (match); |
1164 | |
1237 | |
1165 | #if 0 // do it per-character |
1238 | #if 0 // do it per-character |
… | |
… | |
1172 | |
1245 | |
1173 | return success; |
1246 | return success; |
1174 | } |
1247 | } |
1175 | |
1248 | |
1176 | bool |
1249 | bool |
1177 | rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) |
1250 | rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const |
1178 | { |
1251 | { |
1179 | careful = false; |
1252 | careful = false; |
1180 | |
1253 | |
1181 | if (!XftCharExists (DISPLAY, f, unicode)) |
1254 | if (!XftCharExists (term->xdisp, f, unicode)) |
1182 | return false; |
1255 | return false; |
1183 | |
1256 | |
1184 | if (!prop || prop->width == rxvt_fontprop::unset) |
1257 | if (!prop || prop->width == rxvt_fontprop::unset) |
1185 | return true; |
1258 | return true; |
1186 | |
1259 | |
1187 | // check character against base font bounding box |
1260 | // check character against base font bounding box |
1188 | FcChar32 ch = unicode; |
1261 | FcChar32 ch = unicode; |
1189 | XGlyphInfo g; |
1262 | XGlyphInfo g; |
1190 | XftTextExtents32 (DISPLAY, f, &ch, 1, &g); |
1263 | XftTextExtents32 (term->xdisp, f, &ch, 1, &g); |
1191 | |
1264 | |
1192 | int w = g.width; |
1265 | int w = g.width - g.x; |
1193 | int wcw = wcwidth (unicode); |
1266 | int wcw = WCWIDTH (unicode); |
1194 | if (wcw > 0) w /= wcw; |
|
|
1195 | |
1267 | |
1196 | careful = w > prop->width; |
1268 | careful = g.x > 0 || w > prop->width * wcw; |
1197 | if (careful && w > prop->width * MAX_OVERLAP >> 2) |
1269 | |
|
|
1270 | if (careful && !OVERLAP_OK (w, wcw, prop)) |
|
|
1271 | return false; |
|
|
1272 | |
|
|
1273 | // this weeds out _totally_ broken fonts, or glyphs |
|
|
1274 | if (!OVERLAP_OK (g.xOff, wcw, prop)) |
1198 | return false; |
1275 | return false; |
1199 | |
1276 | |
1200 | return true; |
1277 | return true; |
1201 | } |
1278 | } |
1202 | |
1279 | |
1203 | void |
1280 | void |
1204 | rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, |
1281 | rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, |
1205 | const text_t *text, int len, |
1282 | const text_t *text, int len, |
1206 | int fg, int bg) |
1283 | int fg, int bg) |
1207 | { |
1284 | { |
1208 | clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); |
1285 | clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); |
1209 | |
|
|
1210 | int base = ascent; // should be fbase, but that is incorrect |
|
|
1211 | |
1286 | |
1212 | XGlyphInfo extents; |
1287 | XGlyphInfo extents; |
1213 | FcChar32 *enc = (FcChar32 *) get_enc_buf (len * sizeof (FcChar32)); |
1288 | XftGlyphSpec *enc = (XftGlyphSpec *)rxvt_temp_buf (len * sizeof (XftGlyphSpec)); |
1214 | FcChar32 *ep = enc; |
1289 | XftGlyphSpec *ep = enc; |
1215 | int ewidth = 0; |
1290 | |
1216 | int xoff = 0; |
1291 | dTermDisplay; |
|
|
1292 | dTermGC; |
|
|
1293 | |
|
|
1294 | // cut trailing spaces |
|
|
1295 | while (len && text [len - 1] == ' ') |
|
|
1296 | len--; |
1217 | |
1297 | |
1218 | while (len) |
1298 | while (len) |
1219 | { |
1299 | { |
1220 | int cwidth = r->TermWin.fwidth; |
1300 | int cwidth = term->fwidth; |
1221 | FcChar32 fc = *text++; len--; |
1301 | FcChar32 fc = *text++; len--; |
1222 | FT_UInt gl; |
|
|
1223 | |
1302 | |
1224 | while (len && *text == NOCHAR) |
1303 | while (len && *text == NOCHAR) |
1225 | text++, len--, cwidth += r->TermWin.fwidth; |
1304 | text++, len--, cwidth += term->fwidth; |
1226 | |
1305 | |
1227 | gl = XftCharIndex (d.display->display, f, fc); |
1306 | if (fc != ' ') // skip spaces |
1228 | XftGlyphExtents (d.display->display, f, &gl, 1, &extents); |
|
|
1229 | |
|
|
1230 | if (extents.xOff != cwidth && ep != enc) |
|
|
1231 | { |
|
|
1232 | if (xoff > ewidth) xoff = ewidth; |
|
|
1233 | XftDrawGlyphs (d, &r->pix_colors[fg].c, f, |
|
|
1234 | x + (ewidth - xoff >> 1), |
|
|
1235 | y + base, enc, ep - enc); |
|
|
1236 | x += ewidth; |
|
|
1237 | |
|
|
1238 | ep = enc; |
|
|
1239 | ewidth = 0; |
|
|
1240 | xoff = 0; |
|
|
1241 | } |
1307 | { |
|
|
1308 | FT_UInt glyph = XftCharIndex (disp, f, fc); |
|
|
1309 | XftGlyphExtents (disp, f, &glyph, 1, &extents); |
1242 | |
1310 | |
1243 | if (fc == ' ' && ep == enc) // skip leading spaces |
1311 | |
|
|
1312 | ep->glyph = glyph; |
|
|
1313 | ep->x = x + (cwidth - extents.xOff >> 1); |
|
|
1314 | ep->y = y + ascent; |
|
|
1315 | |
|
|
1316 | if (extents.xOff == 0) |
|
|
1317 | ep->x = x + cwidth; |
|
|
1318 | |
|
|
1319 | ep++; |
1244 | { |
1320 | } |
|
|
1321 | |
1245 | x += cwidth; |
1322 | x += cwidth; |
1246 | continue; |
|
|
1247 | } |
|
|
1248 | |
|
|
1249 | else |
|
|
1250 | { |
|
|
1251 | *ep++ = gl; |
|
|
1252 | ewidth += cwidth; |
|
|
1253 | xoff += extents.xOff; |
|
|
1254 | } |
|
|
1255 | } |
1323 | } |
1256 | |
1324 | |
1257 | if (ep != enc) |
1325 | if (ep != enc) |
1258 | { |
|
|
1259 | if (xoff > ewidth) xoff = ewidth; |
|
|
1260 | XftDrawGlyphs (d, &r->pix_colors[fg].c, f, |
1326 | XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc); |
1261 | x + (ewidth - xoff >> 1), |
|
|
1262 | y + base, enc, ep - enc); |
|
|
1263 | } |
|
|
1264 | } |
1327 | } |
1265 | #endif |
1328 | #endif |
1266 | |
1329 | |
1267 | ///////////////////////////////////////////////////////////////////////////// |
1330 | ///////////////////////////////////////////////////////////////////////////// |
1268 | |
1331 | |
1269 | rxvt_fontset::rxvt_fontset (rxvt_t r) |
1332 | rxvt_fontset::rxvt_fontset (rxvt_term *term) |
1270 | : r (r), fontdesc (0) |
1333 | : fontdesc (0), term (term) |
1271 | { |
1334 | { |
1272 | clear (); |
1335 | clear (); |
1273 | } |
1336 | } |
1274 | |
1337 | |
1275 | rxvt_fontset::~rxvt_fontset () |
1338 | rxvt_fontset::~rxvt_fontset () |
… | |
… | |
1278 | } |
1341 | } |
1279 | |
1342 | |
1280 | void |
1343 | void |
1281 | rxvt_fontset::clear () |
1344 | rxvt_fontset::clear () |
1282 | { |
1345 | { |
1283 | prop.width = prop.height = prop.weight = prop.slant |
1346 | prop.width = prop.height = prop.ascent = prop.weight = prop.slant |
1284 | = rxvt_fontprop::unset; |
1347 | = rxvt_fontprop::unset; |
1285 | |
1348 | |
1286 | for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) |
1349 | for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) |
1287 | FONT_UNREF (*i); |
1350 | FONT_UNREF (*i); |
1288 | |
1351 | |
… | |
… | |
1319 | f = new rxvt_font_x11; |
1382 | f = new rxvt_font_x11; |
1320 | } |
1383 | } |
1321 | else |
1384 | else |
1322 | f = new rxvt_font_x11; |
1385 | f = new rxvt_font_x11; |
1323 | |
1386 | |
1324 | f->set_term (r); |
1387 | f->set_term (term); |
1325 | f->set_name (strdup (name)); |
1388 | f->set_name (strdup (name)); |
1326 | |
1389 | |
1327 | f->cs = cs; |
1390 | f->cs = cs; |
1328 | f->loaded = false; |
1391 | f->loaded = false; |
1329 | |
1392 | |
… | |
… | |
1340 | char buf[512]; |
1403 | char buf[512]; |
1341 | const char *end; |
1404 | const char *end; |
1342 | |
1405 | |
1343 | do |
1406 | do |
1344 | { |
1407 | { |
1345 | while (*desc <= ' ') desc++; |
1408 | while (*desc && *desc <= ' ') |
|
|
1409 | desc++; |
1346 | |
1410 | |
1347 | codeset cs = CS_UNICODE; |
1411 | codeset cs = CS_UNICODE; |
1348 | |
1412 | |
1349 | if (*desc == '[') |
1413 | if (*desc == '[') |
1350 | { |
1414 | { |
… | |
… | |
1460 | if (FROM_UNICODE (f->cs, unicode) == NOCHAR) |
1524 | if (FROM_UNICODE (f->cs, unicode) == NOCHAR) |
1461 | goto next_font; |
1525 | goto next_font; |
1462 | |
1526 | |
1463 | if (!realize_font (i)) |
1527 | if (!realize_font (i)) |
1464 | goto next_font; |
1528 | goto next_font; |
|
|
1529 | |
|
|
1530 | if (prop.ascent != rxvt_fontprop::unset) |
|
|
1531 | max_it (f->ascent, prop.ascent); |
1465 | } |
1532 | } |
1466 | |
1533 | |
1467 | if (f->cs == CS_UNKNOWN) |
1534 | if (f->cs == CS_UNKNOWN) |
1468 | goto next_font; |
1535 | goto next_font; |
1469 | |
1536 | |
… | |
… | |
1508 | FcPatternAddInteger (p, FC_SLANT, prop.slant); |
1575 | FcPatternAddInteger (p, FC_SLANT, prop.slant); |
1509 | FcPatternAddBool (p, FC_MINSPACE, 1); |
1576 | FcPatternAddBool (p, FC_MINSPACE, 1); |
1510 | //FcPatternAddBool (p, FC_ANTIALIAS, 1); |
1577 | //FcPatternAddBool (p, FC_ANTIALIAS, 1); |
1511 | |
1578 | |
1512 | XftResult result; |
1579 | XftResult result; |
1513 | FcPattern *match = XftFontMatch (DISPLAY, DefaultScreen (DISPLAY), p, &result); |
1580 | FcPattern *match = XftFontMatch (term->xdisp, term->display->screen, p, &result); |
1514 | |
1581 | |
1515 | FcPatternDestroy (p); |
1582 | FcPatternDestroy (p); |
1516 | |
1583 | |
1517 | if (match) |
1584 | if (match) |
1518 | { |
1585 | { |