ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/rxvtfont.C
(Generate patch)

Comparing rxvt-unicode/src/rxvtfont.C (file contents):
Revision 1.72 by root, Sat Jun 18 10:59:21 2005 UTC vs.
Revision 1.216 by root, Sat Jun 19 10:08:10 2021 UTC

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

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines