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