1 | /*--------------------------------*-C-*---------------------------------* |
1 | /*----------------------------------------------------------------------* |
2 | * File: rxvtfont.C |
2 | * File: rxvtfont.C |
3 | *----------------------------------------------------------------------* |
3 | *----------------------------------------------------------------------* |
4 | * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> |
4 | * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> |
5 | * - original version. |
5 | * - original version. |
6 | * |
6 | * |
… | |
… | |
24 | #include "rxvtlib.h" |
24 | #include "rxvtlib.h" |
25 | #include "rxvtutil.h" |
25 | #include "rxvtutil.h" |
26 | #include "rxvtfont.h" |
26 | #include "rxvtfont.h" |
27 | |
27 | |
28 | #include <cstdlib> |
28 | #include <cstdlib> |
29 | #include <wchar.h> |
29 | |
30 | #include <inttypes.h> |
30 | #include <inttypes.h> |
31 | |
31 | |
32 | #define MAX_OVERLAP (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 | )) |
33 | |
40 | |
34 | const struct rxvt_fallback_font { |
41 | const struct rxvt_fallback_font { |
35 | codeset cs; |
42 | codeset cs; |
36 | const char *name; |
43 | const char *name; |
37 | } fallback_fonts[] = { |
44 | } fallback_fonts[] = { |
38 | { CS_ISO8859_1, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-1" }, |
45 | { CS_ISO8859_1, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-1" }, |
39 | { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-15" }, |
46 | { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-15" }, |
40 | { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-fcd8859-15" }, |
47 | { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-fcd8859-15" }, |
41 | |
48 | |
42 | #if ENCODING_EU |
49 | #if ENCODING_EU |
43 | // cyrillic |
50 | // cyrillic |
44 | { CS_KOI8_R, "-*-*-*-r-*--*-*-*-*-c-*-koi8-r" }, |
51 | { CS_KOI8_R, "-*-*-*-r-*--*-*-*-*-c-*-koi8-r" }, |
45 | { CS_KOI8_U, "-*-*-*-r-*--*-*-*-*-c-*-koi8-u" }, |
52 | { CS_KOI8_U, "-*-*-*-r-*--*-*-*-*-c-*-koi8-u" }, |
46 | |
53 | |
47 | { CS_ISO8859_2, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-2" }, |
54 | { CS_ISO8859_2, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-2" }, |
48 | { CS_ISO8859_3, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-3" }, |
55 | { CS_ISO8859_3, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-3" }, |
49 | { CS_ISO8859_4, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-4" }, |
56 | { CS_ISO8859_4, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-4" }, |
50 | { CS_ISO8859_5, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-5" }, |
57 | { CS_ISO8859_5, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-5" }, |
51 | { CS_ISO8859_6, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-6" }, |
58 | { CS_ISO8859_6, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-6" }, |
… | |
… | |
57 | { CS_ISO8859_13, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-13" }, |
64 | { CS_ISO8859_13, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-13" }, |
58 | { CS_ISO8859_14, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-14" }, |
65 | { CS_ISO8859_14, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-14" }, |
59 | { CS_ISO8859_16, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-16" }, |
66 | { CS_ISO8859_16, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-16" }, |
60 | |
67 | |
61 | # if XFT |
68 | # if XFT |
62 | { CS_KOI8_U, "xft::spacing=100:lang=ru:antialias=false" }, |
69 | { CS_KOI8_U, "xft::lang=ru" }, |
63 | |
70 | |
64 | { CS_ISO8859_5, "xft::spacing=100:lang=ru:antialias=false" }, |
71 | { CS_ISO8859_5, "xft::lang=ru" }, |
65 | { CS_ISO8859_6, "xft::spacing=100:lang=ar:antialias=false" }, |
72 | { CS_ISO8859_6, "xft::lang=ar" }, |
66 | { CS_ISO8859_7, "xft::spacing=100:lang=el:antialias=false" }, |
73 | { CS_ISO8859_7, "xft::lang=el" }, |
67 | { CS_ISO8859_8, "xft::spacing=100:lang=he:antialias=false" }, |
74 | { CS_ISO8859_8, "xft::lang=he" }, |
68 | { CS_ISO8859_9, "xft::spacing=100:lang=tr:antialias=false" }, |
75 | { CS_ISO8859_9, "xft::lang=tr" }, |
69 | { CS_ISO8859_10, "xft::spacing=100:lang=se:antialias=false" }, |
76 | { CS_ISO8859_10, "xft::lang=se" }, |
70 | { CS_ISO8859_11, "xft::spacing=100:lang=th:antialias=false" }, |
77 | { CS_ISO8859_11, "xft::lang=th" }, |
71 | # endif |
78 | # endif |
72 | #endif |
79 | #endif |
73 | |
80 | |
74 | // japanese |
81 | // japanese |
75 | #if ENCODING_JP || ENCODING_JP_EXT |
82 | #if ENCODING_JP || ENCODING_JP_EXT |
76 | # if XFT |
83 | # if XFT |
77 | // prefer xft for complex scripts |
84 | // prefer xft for complex scripts |
78 | { CS_JIS0208_1990_0, "xft:Kochi Gothic:antialias=false" }, |
85 | { CS_JIS0208_1990_0, "xft:Kochi Gothic:antialias=false" }, |
79 | { CS_JIS0208_1990_0, "xft:Sazanami Mincho:antialias=false" }, |
86 | { CS_JIS0208_1990_0, "xft:Sazanami Mincho:antialias=false" }, |
80 | { CS_JIS0208_1990_0, "xft:Mincho:antialias=false" }, |
87 | { CS_JIS0208_1990_0, "xft:Mincho:antialias=false" }, |
81 | { CS_JIS0208_1990_0, "xft::lang=ja:spacing=100:antialias=false" }, |
88 | { CS_JIS0208_1990_0, "xft::lang=ja:antialias=false" }, |
82 | # endif |
89 | # endif |
83 | { CS_JIS0201_1976_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0201*-0" }, |
90 | { CS_JIS0201_1976_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0201*-0" }, |
84 | { CS_JIS0208_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" }, |
91 | { CS_JIS0208_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" }, |
85 | { CS_JIS0212_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0212*-0" }, |
92 | { CS_JIS0212_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0212*-0" }, |
86 | { CS_JIS0201_1976_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0201*-0" }, |
93 | { CS_JIS0201_1976_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0201*-0" }, |
… | |
… | |
90 | |
97 | |
91 | #if ENCODING_ZH || ENCODING_ZH_EXT |
98 | #if ENCODING_ZH || ENCODING_ZH_EXT |
92 | # if XFT |
99 | # if XFT |
93 | { CS_GBK_0, "xft:AR PL KaitiM GB" }, |
100 | { CS_GBK_0, "xft:AR PL KaitiM GB" }, |
94 | { CS_GBK_0, "xft:AR PL SungtiL GB" }, |
101 | { CS_GBK_0, "xft:AR PL SungtiL GB" }, |
95 | { CS_GBK_0, "xft::spacing=100:lang=zh" }, |
102 | { CS_GBK_0, "xft::lang=zh" }, |
96 | { CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" }, |
103 | { CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" }, |
97 | { CS_BIG5_EXT, "xft:AR PL KaitiM Big5" }, |
104 | { CS_BIG5_EXT, "xft:AR PL KaitiM Big5" }, |
98 | { CS_GB2312_1980_0, "xft:AR PL KaitiM GB" }, |
105 | { CS_GB2312_1980_0, "xft:AR PL KaitiM GB" }, |
99 | { CS_GB2312_1980_0, "xft:AR PL SungtiL GB" }, |
106 | { CS_GB2312_1980_0, "xft:AR PL SungtiL GB" }, |
100 | { CS_GB2312_1980_0, "xft::spacing=100:lang=zh" }, |
107 | { CS_GB2312_1980_0, "xft::lang=zh" }, |
101 | # endif |
108 | # endif |
102 | { CS_GBK_0, "-*-*-*-*-*-*-*-*-*-*-c-*-gbk*-0" }, |
109 | { CS_GBK_0, "-*-*-*-*-*-*-*-*-*-*-c-*-gbk*-0" }, |
103 | { CS_BIG5, "-*-*-*-*-*-*-*-*-*-*-c-*-big5-0" }, |
110 | { CS_BIG5, "-*-*-*-*-*-*-*-*-*-*-c-*-big5-0" }, |
104 | { CS_BIG5_PLUS, "-*-*-*-*-*-*-*-*-*-*-c-*-big5p-0" }, |
111 | { CS_BIG5_PLUS, "-*-*-*-*-*-*-*-*-*-*-c-*-big5p-0" }, |
105 | { CS_BIG5_EXT, "-*-*-*-*-*-*-*-*-*-*-c-*-big5.eten-0" }, |
112 | { CS_BIG5_EXT, "-*-*-*-*-*-*-*-*-*-*-c-*-big5.eten-0" }, |
… | |
… | |
118 | #if ENCODING_KR |
125 | #if ENCODING_KR |
119 | { CS_KSC5601_1987_0, "-baekmuk-gulim-*-*-*-*-*-*-*-*-c-*-ksc5601*" }, |
126 | { CS_KSC5601_1987_0, "-baekmuk-gulim-*-*-*-*-*-*-*-*-c-*-ksc5601*" }, |
120 | { CS_KSC5601_1987_0, "-*-*-*-*-*-*-*-*-*-*-c-*-ksc5601*" }, |
127 | { CS_KSC5601_1987_0, "-*-*-*-*-*-*-*-*-*-*-c-*-ksc5601*" }, |
121 | # if XFT |
128 | # if XFT |
122 | { CS_KSC5601_1987_0, "xft:Baekmuk Gulim:antialias=false" }, |
129 | { CS_KSC5601_1987_0, "xft:Baekmuk Gulim:antialias=false" }, |
123 | { CS_KSC5601_1987_0, "xft::spacing=100:lang=ko:antialias=false" }, |
130 | { CS_KSC5601_1987_0, "xft::lang=ko:antialias=false" }, |
124 | # endif |
131 | # endif |
125 | #endif |
132 | #endif |
126 | |
133 | |
127 | // generic font fallback |
|
|
128 | { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" }, |
134 | { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" }, |
129 | { CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" }, |
135 | //{ CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" }, // this gem of a font has actual dotted circles within the combining character glyphs. |
130 | { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" }, |
|
|
131 | { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" }, |
|
|
132 | #if XFT |
136 | #if XFT |
133 | { CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true" }, |
137 | { CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true" }, |
134 | { CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" }, |
138 | { CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" }, |
135 | { CS_UNICODE, "xft:Andale Mono:antialias=false:autohint=false" }, |
139 | { CS_UNICODE, "xft:Andale Mono:antialias=false:autohint=false" }, |
136 | { CS_UNICODE, "xft:Arial Unicode MS:antialias=false:autohint=false" }, |
140 | { CS_UNICODE, "xft:Arial Unicode MS:antialias=false:autohint=false" }, |
137 | |
141 | |
138 | // FreeMono is usually uglier than x fonts, so try last only. |
142 | // FreeMono is usually uglier than x fonts, so try after the others |
139 | { CS_UNICODE, "xft:FreeMono:autohint=true" }, |
143 | { CS_UNICODE, "xft:FreeMono:autohint=true" }, |
140 | #endif |
144 | #endif |
141 | |
145 | |
|
|
146 | // generic font fallback, put this last, as many iso10646 fonts have extents |
|
|
147 | // specified for all glyphs in the range they cover, but most are simply empty |
|
|
148 | //{ CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" }, |
|
|
149 | //{ CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" }, |
142 | { CS_UNKNOWN, 0 } |
150 | { CS_UNKNOWN, 0 } |
143 | }; |
151 | }; |
144 | |
152 | |
145 | // these characters are used to guess the font height and width |
153 | // these characters are used to guess the font height and width |
146 | // pango uses a similar algorithm and doesn't trust the font either. |
154 | // pango uses a similar algorithm and doesn't trust the font either. |
… | |
… | |
150 | 0x304c, 0x672c, // が本 |
158 | 0x304c, 0x672c, // が本 |
151 | }; |
159 | }; |
152 | |
160 | |
153 | #define NUM_EXTENT_TEST_CHARS (sizeof (extent_test_chars) / sizeof (extent_test_chars[0])) |
161 | #define NUM_EXTENT_TEST_CHARS (sizeof (extent_test_chars) / sizeof (extent_test_chars[0])) |
154 | |
162 | |
155 | #define dTermDisplay Display *disp = term->display->display |
163 | #define dTermDisplay Display *disp = term->dpy |
156 | #define dTermGC GC gc = term->gc |
164 | #define dTermGC GC gc = term->gc |
157 | |
165 | |
158 | ///////////////////////////////////////////////////////////////////////////// |
166 | ///////////////////////////////////////////////////////////////////////////// |
159 | |
|
|
160 | #if XFT |
|
|
161 | rxvt_drawable::~rxvt_drawable () |
|
|
162 | { |
|
|
163 | if (xftdrawable) |
|
|
164 | XftDrawDestroy (xftdrawable); |
|
|
165 | } |
|
|
166 | |
|
|
167 | rxvt_drawable::operator XftDraw *() |
|
|
168 | { |
|
|
169 | if (!xftdrawable) |
|
|
170 | xftdrawable = XftDrawCreate (display->display, drawable, display->visual, display->cmap); |
|
|
171 | |
|
|
172 | return xftdrawable; |
|
|
173 | } |
|
|
174 | #endif |
|
|
175 | |
|
|
176 | ///////////////////////////////////////////////////////////////////////////// |
|
|
177 | |
|
|
178 | static void *enc_buf; |
|
|
179 | static uint32_t enc_len; |
|
|
180 | |
|
|
181 | static inline void * |
|
|
182 | get_enc_buf (uint32_t len) |
|
|
183 | { |
|
|
184 | if (len > enc_len) |
|
|
185 | { |
|
|
186 | free (enc_buf); |
|
|
187 | enc_buf = malloc (len); |
|
|
188 | enc_len = len; |
|
|
189 | } |
|
|
190 | |
|
|
191 | return enc_buf; |
|
|
192 | } |
|
|
193 | |
167 | |
194 | static const char * |
168 | static const char * |
195 | enc_char (const text_t *text, uint32_t len, codeset cs, bool &zero) |
169 | enc_char (const text_t *text, uint32_t len, codeset cs, bool &zero) |
196 | { |
170 | { |
197 | uint8_t *buf = (uint8_t *)get_enc_buf (len); |
171 | uint8_t *buf = rxvt_temp_buf<uint8_t> (len); |
|
|
172 | uint8_t *res = buf; |
198 | |
173 | |
199 | while (len--) |
174 | while (len--) |
200 | { |
175 | { |
201 | uint32_t c = FROM_UNICODE (cs, *text++); |
176 | uint32_t c = FROM_UNICODE (cs, *text++); |
202 | |
177 | |
… | |
… | |
207 | } |
182 | } |
208 | |
183 | |
209 | *buf++ = c; |
184 | *buf++ = c; |
210 | } |
185 | } |
211 | |
186 | |
212 | return (const char *)enc_buf; |
187 | return (const char *)res; |
213 | } |
188 | } |
214 | |
189 | |
215 | static const XChar2b * |
190 | static const XChar2b * |
216 | enc_xchar2b (const text_t *text, uint32_t len, codeset cs, bool &zero) |
191 | enc_xchar2b (const text_t *text, uint32_t len, codeset cs, bool &zero) |
217 | { |
192 | { |
218 | XChar2b *buf = (XChar2b *)get_enc_buf (len * sizeof (XChar2b)); |
193 | XChar2b *buf = rxvt_temp_buf<XChar2b> (len); |
|
|
194 | XChar2b *res = buf; |
219 | |
195 | |
220 | while (len--) |
196 | while (len--) |
221 | { |
197 | { |
222 | uint32_t c = FROM_UNICODE (cs, *text++); |
198 | uint32_t c = FROM_UNICODE (cs, *text++); |
223 | |
199 | |
… | |
… | |
230 | buf->byte1 = c >> 8; |
206 | buf->byte1 = c >> 8; |
231 | buf->byte2 = c; |
207 | buf->byte2 = c; |
232 | buf++; |
208 | buf++; |
233 | } |
209 | } |
234 | |
210 | |
235 | return (XChar2b *)enc_buf; |
211 | return res; |
236 | } |
212 | } |
237 | |
213 | |
238 | ///////////////////////////////////////////////////////////////////////////// |
214 | ///////////////////////////////////////////////////////////////////////////// |
|
|
215 | |
|
|
216 | rxvt_font::rxvt_font () |
|
|
217 | : name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset) |
|
|
218 | { |
|
|
219 | } |
239 | |
220 | |
240 | void |
221 | void |
241 | rxvt_font::set_name (char *name) |
222 | rxvt_font::set_name (char *name) |
242 | { |
223 | { |
243 | if (this->name == name) |
224 | if (this->name == name) |
… | |
… | |
250 | void |
231 | void |
251 | rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const |
232 | rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const |
252 | { |
233 | { |
253 | dTermDisplay; |
234 | dTermDisplay; |
254 | dTermGC; |
235 | dTermGC; |
255 | |
236 | |
256 | if (color == Color_bg) |
237 | if (color == Color_bg || color == Color_transparent) |
257 | XClearArea (disp, d, x, y, w, h, FALSE); |
238 | XClearArea (disp, d, x, y, w, h, false); |
258 | else if (color >= 0) |
239 | else if (color >= 0) |
259 | { |
240 | { |
260 | #if XFT |
241 | #if XFT |
|
|
242 | bool done = false; |
|
|
243 | #ifdef HAVE_BG_PIXMAP |
|
|
244 | if (term->bgPixmap.pixmap && color >= 0 && term->pix_colors[color].c.color.alpha < 0x0ff00) |
|
|
245 | { |
|
|
246 | Picture dst = XftDrawPicture (d); |
|
|
247 | if (dst != 0) |
|
|
248 | { |
|
|
249 | XClearArea (disp, d, x, y, w, h, false); |
|
|
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 | done = true; |
|
|
253 | } |
|
|
254 | } |
|
|
255 | #endif |
|
|
256 | if (!done) |
261 | XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h); |
257 | XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h); |
262 | #else |
258 | #else |
263 | XSetForeground (disp, gc, term->pix_colors[color]); |
259 | XSetForeground (disp, gc, term->pix_colors[color]); |
264 | XFillRectangle (disp, d, gc, x, y, w, h); |
260 | XFillRectangle (disp, d, gc, x, y, w, h); |
265 | #endif |
261 | #endif |
266 | } |
262 | } |
267 | } |
263 | } |
268 | |
264 | |
269 | #include "table/linedraw.h" |
265 | ///////////////////////////////////////////////////////////////////////////// |
270 | |
266 | |
271 | struct rxvt_font_default : rxvt_font { |
267 | struct rxvt_font_default : rxvt_font { |
272 | struct rxvt_fontset *fs; |
268 | struct rxvt_fontset *fs; |
273 | |
269 | |
274 | rxvt_font_default (rxvt_fontset *fs) |
270 | rxvt_font_default (rxvt_fontset *fs) |
… | |
… | |
287 | p.slant = rxvt_fontprop::roman; |
283 | p.slant = rxvt_fontprop::roman; |
288 | |
284 | |
289 | return p; |
285 | return p; |
290 | } |
286 | } |
291 | |
287 | |
292 | bool load (const rxvt_fontprop &prop) |
288 | bool load (const rxvt_fontprop &prop, bool force_prop) |
293 | { |
289 | { |
294 | width = 1; height = 1; |
290 | width = 1; height = 1; |
295 | ascent = 1; descent = 0; |
291 | ascent = 1; descent = 0; |
296 | |
292 | |
297 | set_name (strdup ("built-in support font")); |
293 | set_name (strdup ("built-in support font")); |
… | |
… | |
358 | ; |
354 | ; |
359 | |
355 | |
360 | int width = text - tp; |
356 | int width = text - tp; |
361 | int fwidth = term->fwidth * width; |
357 | int fwidth = term->fwidth * width; |
362 | |
358 | |
|
|
359 | #ifdef BUILTIN_GLYPHS |
363 | if (0x2500 <= t && t <= 0x259f) |
360 | if (0x2500 <= t && t <= 0x259f) |
364 | { |
361 | { |
|
|
362 | # include "table/linedraw.h" |
365 | uint16_t offs = linedraw_offs[t - 0x2500]; |
363 | uint16_t offs = linedraw_offs[t - 0x2500]; |
366 | uint32_t *a = linedraw_command + (offs >> 4); |
364 | uint32_t *a = linedraw_command + (offs >> 4); |
367 | uint32_t *b = a + (offs & 15); |
365 | uint32_t *b = a + (offs & 15); |
368 | |
366 | |
369 | int W = fwidth; |
367 | int W = fwidth; |
… | |
… | |
407 | |
405 | |
408 | case 1: // rectangle, possibly stippled |
406 | case 1: // rectangle, possibly stippled |
409 | if (a) |
407 | if (a) |
410 | { |
408 | { |
411 | static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 }; |
409 | static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 }; |
412 | |
410 | |
413 | gcv.fill_style = FillStippled; |
411 | gcv.fill_style = FillStippled; |
414 | gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2); |
412 | gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2); |
415 | gcv.ts_x_origin = x; |
413 | gcv.ts_x_origin = x; |
416 | gcv.ts_y_origin = y; |
414 | gcv.ts_y_origin = y; |
417 | |
415 | |
… | |
… | |
436 | (a - 1) * 90*64, (b - 1) * 90*64); |
434 | (a - 1) * 90*64, (b - 1) * 90*64); |
437 | break; |
435 | break; |
438 | } |
436 | } |
439 | } |
437 | } |
440 | } |
438 | } |
|
|
439 | #else |
|
|
440 | if (0) |
|
|
441 | ; |
|
|
442 | #endif |
441 | #if ENABLE_COMBINING |
443 | #if ENABLE_COMBINING |
442 | else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) |
444 | else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) |
443 | { |
445 | { |
|
|
446 | min_it (width, 2); // we only support wcwidth up to 2 |
|
|
447 | |
444 | text_t chrs[2]; |
448 | text_t chrs[2]; |
445 | width = min (2, width); |
|
|
446 | chrs [1] = NOCHAR; |
449 | chrs [1] = NOCHAR; |
447 | |
450 | |
448 | *chrs = cc->c1; |
451 | *chrs = cc->c1; |
449 | rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)]; |
452 | rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)]; |
450 | f1->draw (d, x, y, chrs, width, fg, bg); |
453 | f1->draw (d, x, y, chrs, width, fg, bg); |
… | |
… | |
457 | *chrs = cc->c2; |
460 | *chrs = cc->c2; |
458 | rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful) |
461 | rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful) |
459 | ? f1 |
462 | ? f1 |
460 | : (*fs)[fs->find_font (cc->c2)]; |
463 | : (*fs)[fs->find_font (cc->c2)]; |
461 | |
464 | |
462 | f2->draw (d, x, y, chrs, width, fg, -1); |
465 | f2->draw (d, x, y, chrs, width, fg, Color_none); |
463 | } |
466 | } |
464 | } |
467 | } |
465 | #endif |
468 | #endif |
466 | else |
469 | else |
467 | switch (t) |
470 | switch (t) |
… | |
… | |
487 | |
490 | |
488 | void clear (); |
491 | void clear (); |
489 | |
492 | |
490 | rxvt_fontprop properties (); |
493 | rxvt_fontprop properties (); |
491 | |
494 | |
492 | bool load (const rxvt_fontprop &prop); |
495 | bool load (const rxvt_fontprop &prop, bool force_prop); |
493 | |
496 | |
494 | bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const; |
497 | bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const; |
495 | |
498 | |
496 | void draw (rxvt_drawable &d, int x, int y, |
499 | void draw (rxvt_drawable &d, int x, int y, |
497 | const text_t *text, int len, |
500 | const text_t *text, int len, |
498 | int fg, int bg); |
501 | int fg, int bg); |
499 | |
502 | |
500 | bool slow; // wether this is a proportional font or has other funny characteristics |
503 | bool slow; // wether this is a proportional font or has other funny characteristics |
501 | XFontStruct *f; |
504 | XFontStruct *f; |
502 | codeset cs; |
|
|
503 | bool enc2b, encm; |
505 | bool enc2b, encm; |
504 | |
506 | |
505 | char *get_property (XFontStruct *f, const char *property, const char *repl) const; |
507 | char *get_property (XFontStruct *f, Atom property, const char *repl) const; |
506 | bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth); |
508 | bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth); |
507 | bool set_properties (rxvt_fontprop &p, XFontStruct *f); |
509 | bool set_properties (rxvt_fontprop &p, XFontStruct *f); |
508 | bool set_properties (rxvt_fontprop &p, const char *name); |
510 | bool set_properties (rxvt_fontprop &p, const char *name); |
509 | }; |
511 | }; |
510 | |
512 | |
511 | char * |
513 | char * |
512 | rxvt_font_x11::get_property (XFontStruct *f, const char *property, const char *repl) const |
514 | rxvt_font_x11::get_property (XFontStruct *f, Atom property, const char *repl) const |
513 | { |
515 | { |
514 | unsigned long value; |
516 | unsigned long value; |
515 | |
517 | |
516 | if (XGetFontProperty (f, XInternAtom (term->display->display, property, 0), &value)) |
518 | if (XGetFontProperty (f, property, &value)) |
517 | return XGetAtomName (term->display->display, value); |
519 | return XGetAtomName (term->dpy, value); |
518 | else |
520 | else |
519 | return rxvt_strdup (repl); |
521 | return repl ? strdup (repl) : 0; |
520 | } |
522 | } |
521 | |
523 | |
522 | rxvt_fontprop |
524 | rxvt_fontprop |
523 | rxvt_font_x11::properties () |
525 | rxvt_font_x11::properties () |
524 | { |
526 | { |
… | |
… | |
528 | } |
530 | } |
529 | |
531 | |
530 | bool |
532 | bool |
531 | rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth) |
533 | rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth) |
532 | { |
534 | { |
533 | p.width = avgwidth ? (avgwidth + 1) / 10 : (height + 1) / 2; |
535 | p.width = width != rxvt_fontprop::unset ? width |
|
|
536 | : avgwidth ? (avgwidth + 1) / 10 |
|
|
537 | : (height + 1) / 2; |
534 | p.height = height; |
538 | p.height = height; |
535 | p.ascent = rxvt_fontprop::unset; |
539 | p.ascent = rxvt_fontprop::unset; |
536 | p.weight = *weight == 'B' || *weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium; |
540 | p.weight = *weight == 'B' || *weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium; |
537 | p.slant = *slant == 'r' || *slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic; |
541 | p.slant = *slant == 'r' || *slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic; |
538 | |
542 | |
… | |
… | |
543 | rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f) |
547 | rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f) |
544 | { |
548 | { |
545 | unsigned long height; |
549 | unsigned long height; |
546 | |
550 | |
547 | #if 0 |
551 | #if 0 |
548 | if (!XGetFontProperty (f, XInternAtom (term->display->display, "PIXEL_SIZE", 0), &height)) |
552 | if (!XGetFontProperty (f, XInternAtom (term->dpy, "PIXEL_SIZE", 0), &height)) |
549 | return false; |
553 | return false; |
550 | #else |
554 | #else |
551 | height = f->ascent + f->descent; |
555 | height = f->ascent + f->descent; |
552 | #endif |
556 | #endif |
553 | |
557 | |
554 | unsigned long avgwidth; |
558 | unsigned long avgwidth; |
555 | if (!XGetFontProperty (f, XInternAtom (term->display->display, "AVERAGE_WIDTH", 0), &avgwidth)) |
559 | if (!XGetFontProperty (f, term->xa [XA_AVERAGE_WIDTH], &avgwidth)) |
556 | avgwidth = 0; |
560 | avgwidth = 0; |
557 | |
561 | |
558 | char *weight = get_property (f, "WEIGHT_NAME", "medium"); |
562 | char *weight = get_property (f, term->xa [XA_WEIGHT_NAME], "medium"); |
559 | char *slant = get_property (f, "SLANT", "r"); |
563 | char *slant = get_property (f, term->xa [XA_SLANT], "r"); |
560 | |
564 | |
561 | set_properties (p, height, weight, slant, avgwidth); |
565 | set_properties (p, height, weight, slant, avgwidth); |
562 | |
566 | |
563 | free (weight); |
567 | free (weight); |
564 | free (slant); |
568 | free (slant); |
… | |
… | |
641 | return false; |
645 | return false; |
642 | } |
646 | } |
643 | } |
647 | } |
644 | |
648 | |
645 | bool |
649 | bool |
646 | rxvt_font_x11::load (const rxvt_fontprop &prop) |
650 | rxvt_font_x11::load (const rxvt_fontprop &prop, bool force_prop) |
647 | { |
651 | { |
648 | dTermDisplay; |
652 | dTermDisplay; |
649 | |
653 | |
650 | clear (); |
654 | clear (); |
651 | |
655 | |
652 | char field_str[64]; // enough for 128 bits |
656 | char field_str[64]; // enough for 128 bits |
653 | |
657 | |
654 | // first morph the font if required |
658 | // first morph the font if required |
655 | if (prop.weight != rxvt_fontprop::unset |
659 | if (force_prop) |
656 | || prop.slant != rxvt_fontprop::unset) |
|
|
657 | { |
660 | { |
658 | char fname[1024]; |
661 | char fname[1024]; |
659 | |
662 | |
660 | if (name[0] != '-') |
663 | if (name[0] != '-') |
661 | { |
664 | { |
662 | f = XLoadQueryFont (disp, name); |
665 | f = XLoadQueryFont (disp, name); |
663 | |
666 | |
664 | if (!f) |
667 | if (!f) |
665 | return false; |
668 | return false; |
666 | |
669 | |
667 | char *new_name = get_property (f, "FONT", name); |
670 | char *new_name = get_property (f, XA_FONT, name); |
668 | |
671 | |
669 | if (new_name) |
672 | if (new_name) |
670 | set_name (new_name); |
673 | set_name (new_name); |
671 | else |
674 | else |
672 | rxvt_warn ("font '%s' has no FONT property, continuing without.", name); |
675 | rxvt_warn ("font '%s' has no FONT property, continuing without.", name); |
… | |
… | |
675 | f = 0; |
678 | f = 0; |
676 | } |
679 | } |
677 | |
680 | |
678 | if (prop.weight != rxvt_fontprop::unset) |
681 | if (prop.weight != rxvt_fontprop::unset) |
679 | { |
682 | { |
680 | replace_field (fname, name, 2, 0, |
683 | replace_field (fname, name, 2, 0, |
681 | prop.weight < rxvt_fontprop::bold |
684 | prop.weight < rxvt_fontprop::bold |
682 | ? "medium" : "bold"); |
685 | ? "medium" : "bold"); |
683 | set_name (strdup (fname)); |
686 | set_name (strdup (fname)); |
684 | } |
687 | } |
685 | |
688 | |
… | |
… | |
781 | delete [] fonts; |
784 | delete [] fonts; |
782 | |
785 | |
783 | if (!f) |
786 | if (!f) |
784 | return false; |
787 | return false; |
785 | |
788 | |
786 | char *registry = get_property (f, "CHARSET_REGISTRY", 0); |
789 | char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0); |
787 | char *encoding = get_property (f, "CHARSET_ENCODING", 0); |
790 | char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0); |
788 | |
791 | |
789 | if (registry && encoding) |
792 | if (registry && encoding) |
790 | { |
793 | { |
791 | char charset[64]; |
794 | char charset[64]; |
792 | snprintf (charset, 64, "%s-%s", registry, encoding); |
795 | snprintf (charset, 64, "%s-%s", registry, encoding); |
793 | |
796 | |
794 | cs = codeset_from_name (charset); |
797 | cs = codeset_from_name (charset); |
795 | } |
798 | } |
796 | else |
799 | else |
797 | { |
800 | { |
798 | const char *charset = get_property (f, "FONT", 0); |
801 | const char *charset = get_property (f, XA_FONT, 0); |
799 | |
802 | |
800 | if (!charset) |
803 | if (!charset) |
801 | charset = name; |
804 | charset = name; |
802 | |
805 | |
803 | int count = 13; |
806 | int count = 13; |
… | |
… | |
818 | enc2b = encm || f->max_char_or_byte2 > 255; |
821 | enc2b = encm || f->max_char_or_byte2 > 255; |
819 | |
822 | |
820 | slow = false; |
823 | slow = false; |
821 | |
824 | |
822 | #if 1 // only used for slow detection, TODO optimize |
825 | #if 1 // only used for slow detection, TODO optimize |
823 | if (f->min_bounds.width == f->max_bounds.width) |
826 | if (f->min_bounds.width == f->max_bounds.width || !f->per_char) |
824 | width = f->min_bounds.width; |
|
|
825 | else if (f->per_char == NULL) |
|
|
826 | width = f->max_bounds.width; |
827 | width = f->max_bounds.width; |
827 | else |
828 | else |
828 | { |
829 | { |
829 | slow = true; |
830 | slow = true; |
830 | |
831 | |
831 | int N = f->max_char_or_byte2 - f->min_char_or_byte2; |
832 | int N = f->max_char_or_byte2 - f->min_char_or_byte2; |
832 | |
833 | |
833 | if (encm) |
834 | if (encm) |
834 | N += (f->max_byte1 - f->min_byte1) |
835 | N += (f->max_byte1 - f->min_byte1) |
835 | * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1); |
836 | * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1); |
836 | |
837 | |
837 | while (N) |
838 | while (N) |
838 | { |
839 | { |
839 | if (f->per_char[N].width > width) |
840 | if (f->per_char[N].width > width) |
840 | width = f->per_char[N].width; |
841 | width = f->per_char[N].width; |
841 | |
842 | |
… | |
… | |
846 | |
847 | |
847 | width = 1; |
848 | width = 1; |
848 | |
849 | |
849 | 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; ) |
850 | { |
851 | { |
851 | if (cs != CS_UNICODE |
|
|
852 | && *t > 0x100 |
|
|
853 | && FROM_UNICODE (cs, *t) == NOCHAR) |
852 | if (FROM_UNICODE (cs, *t) == NOCHAR) |
854 | continue; |
853 | continue; |
855 | |
854 | |
856 | // ignore characters we wouldn't use anyways |
855 | // ignore characters we wouldn't use anyways |
857 | bool careful; |
856 | bool careful; |
858 | if (!has_char (*t, &prop, careful)) |
857 | if (!has_char (*t, &prop, careful)) |
… | |
… | |
862 | |
861 | |
863 | XCharStruct g; |
862 | XCharStruct g; |
864 | int dir_ret, asc_ret, des_ret; |
863 | int dir_ret, asc_ret, des_ret; |
865 | XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); |
864 | XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); |
866 | |
865 | |
|
|
866 | int wcw = WCWIDTH (*t); |
867 | int wcw = wcwidth (*t); if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; |
867 | if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; |
868 | |
868 | |
869 | if (width < g.width) width = g.width; |
869 | if (width < g.width) width = g.width; |
870 | } |
870 | } |
871 | |
871 | |
872 | if (cs == CS_UNKNOWN) |
872 | if (cs == CS_UNKNOWN) |
873 | { |
873 | { |
874 | fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name); |
874 | fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name); |
… | |
… | |
891 | void |
891 | void |
892 | rxvt_font_x11::clear () |
892 | rxvt_font_x11::clear () |
893 | { |
893 | { |
894 | if (f) |
894 | if (f) |
895 | { |
895 | { |
896 | XFreeFont (term->display->display, f); |
896 | XFreeFont (term->dpy, f); |
897 | f = 0; |
897 | f = 0; |
898 | } |
898 | } |
899 | } |
899 | } |
900 | |
900 | |
901 | bool |
901 | bool |
… | |
… | |
944 | return false; |
944 | return false; |
945 | |
945 | |
946 | if (!prop || prop->width == rxvt_fontprop::unset) |
946 | if (!prop || prop->width == rxvt_fontprop::unset) |
947 | return true; |
947 | return true; |
948 | |
948 | |
949 | // check character against base font bounding box |
949 | // check wether character overlaps previous/next character |
950 | int w = xcs->width; |
950 | int w = xcs->rbearing - xcs->lbearing; |
951 | int wcw = wcwidth (unicode); |
951 | int wcw = max (WCWIDTH (unicode), 1); |
952 | if (wcw > 0) w = (w + wcw - 1) / wcw; |
|
|
953 | |
952 | |
954 | careful = w > prop->width; |
953 | careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw; |
955 | if (careful && w > prop->width * MAX_OVERLAP >> 2) |
954 | |
|
|
955 | if (careful && !OVERLAP_OK (w, wcw, prop)) |
956 | return false; |
956 | return false; |
957 | |
957 | |
958 | return true; |
958 | return true; |
959 | } |
959 | } |
960 | |
960 | |
… | |
… | |
994 | else |
994 | else |
995 | { |
995 | { |
996 | clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); |
996 | clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); |
997 | |
997 | |
998 | XChangeGC (disp, gc, GCForeground | GCFont, &v); |
998 | XChangeGC (disp, gc, GCForeground | GCFont, &v); |
999 | |
999 | |
1000 | if (slow) |
1000 | if (slow) |
1001 | { |
1001 | { |
1002 | do |
1002 | do |
1003 | { |
1003 | { |
1004 | if (xc->byte1 || xc->byte2) |
1004 | if (xc->byte1 || xc->byte2) |
… | |
… | |
1026 | else |
1026 | else |
1027 | { |
1027 | { |
1028 | clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); |
1028 | clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); |
1029 | |
1029 | |
1030 | XChangeGC (disp, gc, GCForeground | GCFont, &v); |
1030 | XChangeGC (disp, gc, GCForeground | GCFont, &v); |
1031 | |
1031 | |
1032 | if (slow) |
1032 | if (slow) |
1033 | { |
1033 | { |
1034 | do |
1034 | do |
1035 | { |
1035 | { |
1036 | if (*xc) |
1036 | if (*xc) |
… | |
… | |
1056 | |
1056 | |
1057 | void clear (); |
1057 | void clear (); |
1058 | |
1058 | |
1059 | rxvt_fontprop properties (); |
1059 | rxvt_fontprop properties (); |
1060 | |
1060 | |
1061 | bool load (const rxvt_fontprop &prop); |
1061 | bool load (const rxvt_fontprop &prop, bool force_prop); |
1062 | |
1062 | |
1063 | void draw (rxvt_drawable &d, int x, int y, |
1063 | void draw (rxvt_drawable &d, int x, int y, |
1064 | const text_t *text, int len, |
1064 | const text_t *text, int len, |
1065 | int fg, int bg); |
1065 | int fg, int bg); |
1066 | |
1066 | |
1067 | bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &carefull) const; |
1067 | bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const; |
1068 | |
1068 | |
1069 | protected: |
1069 | protected: |
1070 | XftFont *f; |
1070 | XftFont *f; |
1071 | }; |
1071 | }; |
1072 | |
1072 | |
1073 | void |
1073 | void |
1074 | rxvt_font_xft::clear () |
1074 | rxvt_font_xft::clear () |
1075 | { |
1075 | { |
1076 | if (f) |
1076 | if (f) |
1077 | { |
1077 | { |
1078 | XftFontClose (term->display->display, f); |
1078 | XftFontClose (term->dpy, f); |
1079 | f = 0; |
1079 | f = 0; |
1080 | } |
1080 | } |
1081 | } |
1081 | } |
1082 | |
1082 | |
1083 | rxvt_fontprop |
1083 | rxvt_fontprop |
… | |
… | |
1099 | |
1099 | |
1100 | return p; |
1100 | return p; |
1101 | } |
1101 | } |
1102 | |
1102 | |
1103 | bool |
1103 | bool |
1104 | rxvt_font_xft::load (const rxvt_fontprop &prop) |
1104 | rxvt_font_xft::load (const rxvt_fontprop &prop, bool force_prop) |
1105 | { |
1105 | { |
1106 | dTermDisplay; |
1106 | dTermDisplay; |
1107 | |
1107 | |
1108 | clear (); |
1108 | clear (); |
1109 | |
1109 | |
… | |
… | |
1118 | && (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch |
1118 | && (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch |
1119 | && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch)) |
1119 | && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch)) |
1120 | FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height); |
1120 | FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height); |
1121 | |
1121 | |
1122 | if (prop.weight != rxvt_fontprop::unset |
1122 | if (prop.weight != rxvt_fontprop::unset |
1123 | && FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch) |
1123 | && (force_prop || FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch)) |
1124 | FcPatternAddInteger (p, FC_WEIGHT, prop.weight); |
1124 | FcPatternAddInteger (p, FC_WEIGHT, prop.weight); |
1125 | |
1125 | |
1126 | if (prop.slant != rxvt_fontprop::unset |
1126 | if (prop.slant != rxvt_fontprop::unset |
1127 | && FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch) |
1127 | && (force_prop || FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch)) |
1128 | FcPatternAddInteger (p, FC_SLANT, prop.slant); |
1128 | FcPatternAddInteger (p, FC_SLANT, prop.slant); |
1129 | |
1129 | |
1130 | #if 0 // clipping unfortunately destroys our precious double-width-characters |
1130 | #if 0 // clipping unfortunately destroys our precious double-width-characters |
1131 | // clip width, we can't do better, or can we? |
1131 | // clip width, we can't do better, or can we? |
1132 | if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) |
1132 | if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) |
… | |
… | |
1190 | XGlyphInfo g; |
1190 | XGlyphInfo g; |
1191 | XftTextExtents16 (disp, f, &ch, 1, &g); |
1191 | XftTextExtents16 (disp, f, &ch, 1, &g); |
1192 | |
1192 | |
1193 | g.width -= g.x; |
1193 | g.width -= g.x; |
1194 | |
1194 | |
1195 | int wcw = wcwidth (ch); |
1195 | int wcw = WCWIDTH (ch); |
1196 | if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; |
1196 | if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; |
1197 | |
1197 | |
1198 | if (width < g.width ) width = g.width; |
1198 | if (width < g.width ) width = g.width; |
1199 | if (height < g.height ) height = g.height; |
1199 | if (height < g.height ) height = g.height; |
1200 | if (glheight < g.height - g.y) glheight = g.height - g.y; |
1200 | if (glheight < g.height - g.y) glheight = g.height - g.y; |
… | |
… | |
1250 | bool |
1250 | bool |
1251 | rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const |
1251 | rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const |
1252 | { |
1252 | { |
1253 | careful = false; |
1253 | careful = false; |
1254 | |
1254 | |
1255 | if (!XftCharExists (term->display->display, f, unicode)) |
1255 | if (!XftCharExists (term->dpy, f, unicode)) |
1256 | return false; |
1256 | return false; |
1257 | |
1257 | |
1258 | if (!prop || prop->width == rxvt_fontprop::unset) |
1258 | if (!prop || prop->width == rxvt_fontprop::unset) |
1259 | return true; |
1259 | return true; |
1260 | |
1260 | |
1261 | // check character against base font bounding box |
1261 | // check character against base font bounding box |
1262 | FcChar32 ch = unicode; |
1262 | FcChar32 ch = unicode; |
1263 | XGlyphInfo g; |
1263 | XGlyphInfo g; |
1264 | XftTextExtents32 (term->display->display, f, &ch, 1, &g); |
1264 | XftTextExtents32 (term->dpy, f, &ch, 1, &g); |
1265 | |
1265 | |
1266 | int w = g.width - g.x; |
1266 | int w = g.width - g.x; |
1267 | int wcw = wcwidth (unicode); |
1267 | int wcw = max (WCWIDTH (unicode), 1); |
1268 | if (wcw > 0) w = (w + wcw - 1) / wcw; |
|
|
1269 | |
1268 | |
1270 | careful = w > prop->width; |
1269 | careful = g.x > 0 || w > prop->width * wcw; |
1271 | if (careful && w > prop->width * MAX_OVERLAP >> 2) |
1270 | |
|
|
1271 | if (careful && !OVERLAP_OK (w, wcw, prop)) |
|
|
1272 | return false; |
|
|
1273 | |
|
|
1274 | // this weeds out _totally_ broken fonts, or glyphs |
|
|
1275 | if (!OVERLAP_OK (g.xOff, wcw, prop)) |
1272 | return false; |
1276 | return false; |
1273 | |
1277 | |
1274 | return true; |
1278 | return true; |
1275 | } |
1279 | } |
1276 | |
1280 | |
1277 | void |
1281 | void |
1278 | rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, |
1282 | rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, |
1279 | const text_t *text, int len, |
1283 | const text_t *text, int len, |
1280 | int fg, int bg) |
1284 | int fg, int bg) |
1281 | { |
1285 | { |
1282 | clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); |
|
|
1283 | |
|
|
1284 | XGlyphInfo extents; |
1286 | XGlyphInfo extents; |
1285 | XftGlyphSpec *enc = (XftGlyphSpec *)get_enc_buf (len * sizeof (XftGlyphSpec)); |
1287 | XftGlyphSpec *enc = (XftGlyphSpec *)rxvt_temp_buf (len * sizeof (XftGlyphSpec)); |
1286 | XftGlyphSpec *ep = enc; |
1288 | XftGlyphSpec *ep = enc; |
1287 | |
1289 | |
1288 | dTermDisplay; |
1290 | dTermDisplay; |
1289 | dTermGC; |
1291 | dTermGC; |
1290 | |
1292 | |
|
|
1293 | int w = term->fwidth * len; |
|
|
1294 | int h = term->fheight; |
|
|
1295 | |
|
|
1296 | /* TODO: this logic needs some more thinking, since we no longer do pseudo-transparency. |
|
|
1297 | * Maybe make buffering into a resource flag? Compile time option doesn't seems like a |
|
|
1298 | * good idea from the perspective of packaging for wide variety of user configs. |
|
|
1299 | */ |
|
|
1300 | bool buffered = true |
|
|
1301 | #ifdef FORCE_UNBUFFERED_XFT |
|
|
1302 | && bg >= 0 |
|
|
1303 | #endif |
|
|
1304 | ; |
1291 | // cut trailing spaces |
1305 | // cut trailing spaces |
1292 | while (len && text [len - 1] == ' ') |
1306 | while (len && text [len - 1] == ' ') |
1293 | len--; |
1307 | len--; |
1294 | |
1308 | |
|
|
1309 | int x_ = buffered ? 0 : x; |
|
|
1310 | int y_ = buffered ? 0 : y; |
|
|
1311 | |
1295 | while (len) |
1312 | while (len) |
1296 | { |
1313 | { |
1297 | int cwidth = term->fwidth; |
1314 | int cwidth = term->fwidth; |
1298 | FcChar32 fc = *text++; len--; |
1315 | FcChar32 fc = *text++; len--; |
1299 | |
1316 | |
1300 | while (len && *text == NOCHAR) |
1317 | while (len && *text == NOCHAR) |
1301 | text++, len--, cwidth += term->fwidth; |
1318 | text++, len--, cwidth += term->fwidth; |
1302 | |
1319 | |
1303 | if (fc != ' ') // skip spaces |
1320 | if (fc != ' ') // skip spaces |
1304 | { |
1321 | { |
1305 | FT_UInt glyph = XftCharIndex (disp, f, fc); |
1322 | FT_UInt glyph = XftCharIndex (disp, f, fc); |
1306 | XftGlyphExtents (disp, f, &glyph, 1, &extents); |
1323 | XftGlyphExtents (disp, f, &glyph, 1, &extents); |
1307 | |
1324 | |
1308 | ep->glyph = glyph; |
1325 | ep->glyph = glyph; |
1309 | ep->x = x + (cwidth - extents.xOff >> 1); |
1326 | ep->x = x_ + (cwidth - extents.xOff >> 1); |
1310 | ep->y = y + ascent; |
1327 | ep->y = y_ + ascent; |
|
|
1328 | |
|
|
1329 | if (extents.xOff == 0) |
|
|
1330 | ep->x = x_ + cwidth; |
|
|
1331 | |
1311 | ep++; |
1332 | ep++; |
1312 | } |
1333 | } |
1313 | |
1334 | |
1314 | x += cwidth; |
1335 | x_ += cwidth; |
|
|
1336 | } |
|
|
1337 | |
|
|
1338 | if (buffered) |
1315 | } |
1339 | { |
1316 | |
1340 | bool back_rendered = false; |
1317 | if (ep != enc) |
1341 | if (ep != enc) |
|
|
1342 | { |
|
|
1343 | rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); |
|
|
1344 | |
|
|
1345 | #ifdef HAVE_BG_PIXMAP |
|
|
1346 | if (term->bgPixmap.pixmap) |
|
|
1347 | { |
|
|
1348 | Picture dst = 0; |
|
|
1349 | |
|
|
1350 | if (bg >= 0 && term->pix_colors[bg].c.color.alpha < 0x0ff00) |
|
|
1351 | dst = XftDrawPicture (d2); |
|
|
1352 | |
|
|
1353 | if (bg < 0 || dst != 0) |
|
|
1354 | { |
|
|
1355 | int src_x = x, src_y = y ; |
|
|
1356 | |
|
|
1357 | if (term->bgPixmap.is_parentOrigin ()) |
|
|
1358 | { |
|
|
1359 | src_x += term->window_vt_x; |
|
|
1360 | src_y += term->window_vt_y; |
|
|
1361 | } |
|
|
1362 | |
|
|
1363 | if (term->bgPixmap.pmap_width >= src_x+w |
|
|
1364 | && term->bgPixmap.pmap_height >= src_y+h) |
|
|
1365 | { |
|
|
1366 | XCopyArea (disp, term->bgPixmap.pixmap, d2, gc, |
|
|
1367 | src_x, src_y, w, h, 0, 0); |
|
|
1368 | } |
|
|
1369 | else |
|
|
1370 | { |
|
|
1371 | XGCValues gcv; |
|
|
1372 | |
|
|
1373 | gcv.fill_style = FillTiled; |
|
|
1374 | gcv.tile = term->bgPixmap.pixmap; |
|
|
1375 | gcv.ts_x_origin = -src_x; |
|
|
1376 | gcv.ts_y_origin = -src_y; |
|
|
1377 | |
|
|
1378 | XChangeGC (disp, gc, |
|
|
1379 | GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle, |
|
|
1380 | &gcv); |
|
|
1381 | |
|
|
1382 | XFillRectangle (disp, d2, gc, 0, 0, w, h); |
|
|
1383 | |
|
|
1384 | gcv.fill_style = FillSolid; |
|
|
1385 | XChangeGC (disp, gc, GCFillStyle, &gcv); |
|
|
1386 | } |
|
|
1387 | |
|
|
1388 | if (bg >= 0) |
|
|
1389 | { |
|
|
1390 | Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c); |
|
|
1391 | XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h); |
|
|
1392 | } |
|
|
1393 | |
|
|
1394 | back_rendered = true; |
|
|
1395 | } |
|
|
1396 | } |
|
|
1397 | #endif |
|
|
1398 | |
|
|
1399 | if (bg >= 0 && !back_rendered) |
|
|
1400 | XftDrawRect (d2, &term->pix_colors[bg].c, 0, 0, w, h); |
|
|
1401 | |
|
|
1402 | XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc); |
|
|
1403 | XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y); |
|
|
1404 | } |
|
|
1405 | else |
|
|
1406 | clear_rect (d, x, y, w, h, bg); |
|
|
1407 | } |
|
|
1408 | else |
|
|
1409 | { |
|
|
1410 | clear_rect (d, x, y, w, h, bg); |
1318 | XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc); |
1411 | XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc); |
|
|
1412 | } |
1319 | } |
1413 | } |
|
|
1414 | |
1320 | #endif |
1415 | #endif |
1321 | |
1416 | |
1322 | ///////////////////////////////////////////////////////////////////////////// |
1417 | ///////////////////////////////////////////////////////////////////////////// |
1323 | |
1418 | |
1324 | rxvt_fontset::rxvt_fontset (rxvt_term *term) |
1419 | rxvt_fontset::rxvt_fontset (rxvt_term *term) |
… | |
… | |
1335 | void |
1430 | void |
1336 | rxvt_fontset::clear () |
1431 | rxvt_fontset::clear () |
1337 | { |
1432 | { |
1338 | prop.width = prop.height = prop.ascent = prop.weight = prop.slant |
1433 | prop.width = prop.height = prop.ascent = prop.weight = prop.slant |
1339 | = rxvt_fontprop::unset; |
1434 | = rxvt_fontprop::unset; |
|
|
1435 | force_prop = false; |
1340 | |
1436 | |
1341 | for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) |
1437 | for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) |
1342 | FONT_UNREF (*i); |
1438 | FONT_UNREF (*i); |
1343 | |
1439 | |
1344 | for (pagemap **p = fmap.begin (); p != fmap.end (); p++) |
1440 | for (pagemap **p = fmap.begin (); p != fmap.end (); p++) |
… | |
… | |
1353 | |
1449 | |
1354 | rxvt_font * |
1450 | rxvt_font * |
1355 | rxvt_fontset::new_font (const char *name, codeset cs) |
1451 | rxvt_fontset::new_font (const char *name, codeset cs) |
1356 | { |
1452 | { |
1357 | rxvt_font *f; |
1453 | rxvt_font *f; |
1358 | |
1454 | |
1359 | if (!name || !*name) |
1455 | if (!name || !*name) |
1360 | { |
1456 | { |
1361 | name = ""; |
1457 | name = ""; |
1362 | f = new rxvt_font_default (this); |
1458 | f = new rxvt_font_default (this); |
1363 | } |
1459 | } |
… | |
… | |
1456 | if (fonts[i]->loaded) |
1552 | if (fonts[i]->loaded) |
1457 | return true; |
1553 | return true; |
1458 | |
1554 | |
1459 | fonts[i]->loaded = true; |
1555 | fonts[i]->loaded = true; |
1460 | |
1556 | |
1461 | if (!fonts[i]->load (prop)) |
1557 | if (!fonts[i]->load (prop, force_prop)) |
1462 | { |
1558 | { |
1463 | fonts[i]->cs = CS_UNKNOWN; |
1559 | fonts[i]->cs = CS_UNKNOWN; |
1464 | return false; |
1560 | return false; |
1465 | } |
1561 | } |
1466 | |
1562 | |
… | |
… | |
1567 | FcPatternAddInteger (p, FC_SLANT, prop.slant); |
1663 | FcPatternAddInteger (p, FC_SLANT, prop.slant); |
1568 | FcPatternAddBool (p, FC_MINSPACE, 1); |
1664 | FcPatternAddBool (p, FC_MINSPACE, 1); |
1569 | //FcPatternAddBool (p, FC_ANTIALIAS, 1); |
1665 | //FcPatternAddBool (p, FC_ANTIALIAS, 1); |
1570 | |
1666 | |
1571 | XftResult result; |
1667 | XftResult result; |
1572 | FcPattern *match = XftFontMatch (term->display->display, term->display->screen, p, &result); |
1668 | FcPattern *match = XftFontMatch (term->dpy, term->display->screen, p, &result); |
1573 | |
1669 | |
1574 | FcPatternDestroy (p); |
1670 | FcPatternDestroy (p); |
1575 | |
1671 | |
1576 | if (match) |
1672 | if (match) |
1577 | { |
1673 | { |
… | |
… | |
1582 | if (find_font (font) < 0) |
1678 | if (find_font (font) < 0) |
1583 | { |
1679 | { |
1584 | char fontname[4096]; |
1680 | char fontname[4096]; |
1585 | sprintf (fontname, "xft:%-.4090s", font); |
1681 | sprintf (fontname, "xft:%-.4090s", font); |
1586 | |
1682 | |
1587 | fonts.push_back (new_font (fontname, CS_UNICODE)); |
1683 | fonts.push_back (new_font (fontname, CS_UNICODE)); |
1588 | } |
1684 | } |
1589 | |
1685 | |
1590 | free (font); |
1686 | free (font); |
1591 | } |
1687 | } |
1592 | #endif |
1688 | #endif |