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.73 by root, Mon Nov 28 19:35:04 2005 UTC vs.
Revision 1.198 by root, Wed Jun 16 22:51:55 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 struct rxvt_fontset *fs; 268 struct rxvt_fontset *fs;
269 269
270 rxvt_font_default (rxvt_fontset *fs) 270 rxvt_font_default (rxvt_fontset *fs)
… …
276 rxvt_fontprop properties () 276 rxvt_fontprop properties ()
277 { 277 {
278 rxvt_fontprop p; 278 rxvt_fontprop p;
279 279
280 p.width = p.height = 1; 280 p.width = p.height = 1;
281 p.ascent = rxvt_fontprop::unset;
281 p.weight = rxvt_fontprop::medium; 282 p.weight = rxvt_fontprop::medium;
282 p.slant = rxvt_fontprop::roman; 283 p.slant = rxvt_fontprop::roman;
283 284
284 return p; 285 return p;
285 } 286 }
286 287
287 bool load (const rxvt_fontprop &prop) 288 bool load (const rxvt_fontprop &prop, bool force_prop)
288 { 289 {
289 width = 1; height = 1; 290 width = 1; height = 1;
290 ascent = 1; descent = 0; 291 ascent = 1; descent = 0;
291 292
292 set_name (strdup ("built-in support font")); 293 set_name (strdup ("built-in support font"));
293 294
294 return true; 295 return true;
295 } 296 }
296 297
297 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) 298 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
298 { 299 {
299 careful = false; 300 careful = false;
300 301
301 if (unicode <= 0x001f) 302 if (unicode <= 0x001f)
302 return true; 303 return true;
… …
305 return false; 306 return false;
306 307
307 if (unicode <= 0x009f) 308 if (unicode <= 0x009f)
308 return true; 309 return true;
309 310
311#ifdef BUILTIN_GLYPHS
310 if (unicode >= 0x2500 && unicode <= 0x259f) 312 if (unicode >= 0x2500 && unicode <= 0x259f &&
313 !term->option (Opt_skipBuiltinGlyphs))
311 return true; 314 return true;
315#endif
312 316
313 if (IS_COMPOSE (unicode)) 317 if (IS_COMPOSE (unicode))
314 return true; 318 return true;
315 319
316 switch (unicode) 320 switch (unicode)
… …
331void 335void
332rxvt_font_default::draw (rxvt_drawable &d, int x, int y, 336rxvt_font_default::draw (rxvt_drawable &d, int x, int y,
333 const text_t *text, int len, 337 const text_t *text, int len,
334 int fg, int bg) 338 int fg, int bg)
335{ 339{
336 Display *disp = d.display->display; 340 dTermDisplay;
341 dTermGC;
337 342
338 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 343 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
339 344
340 XSetForeground (disp, TGC, r->pix_colors[fg]); 345 XSetForeground (disp, gc, term->pix_colors[fg]);
341 346
342 while (len) 347 while (len)
343 { 348 {
344#if ENABLE_COMBINING 349#if ENABLE_COMBINING
345 compose_char *cc; 350 compose_char *cc;
… …
349 354
350 while (++text, --len && *text == NOCHAR) 355 while (++text, --len && *text == NOCHAR)
351 ; 356 ;
352 357
353 int width = text - tp; 358 int width = text - tp;
354 int fwidth = r->TermWin.fwidth * width; 359 int fwidth = term->fwidth * width;
355 360
361#ifdef BUILTIN_GLYPHS
356 if (0x2500 <= t && t <= 0x259f) 362 if (0x2500 <= t && t <= 0x259f)
357 { 363 {
364# include "table/linedraw.h"
358 uint16_t offs = linedraw_offs[t - 0x2500]; 365 uint16_t offs = linedraw_offs[t - 0x2500];
359 uint32_t *a = linedraw_command + (offs >> 4); 366 uint32_t *a = linedraw_command + (offs >> 4);
360 uint32_t *b = a + (offs & 15); 367 uint32_t *b = a + (offs & 15);
361 368
362 int W = fwidth; 369 int W = fwidth;
363 int H = r->TermWin.fheight; 370 int H = term->fheight;
364 371
365 int x_[16]; 372 int x_[16];
366 int y_[16]; 373 int y_[16];
367 374
368 for (int i = 0; i <= 8; i++) 375 for (int i = 0; i <= 8; i++)
… …
376 383
377 XGCValues gcv; 384 XGCValues gcv;
378 385
379 gcv.cap_style = CapButt; 386 gcv.cap_style = CapButt;
380 gcv.line_width = 0; 387 gcv.line_width = 0;
381 XChangeGC (disp, TGC, GCLineWidth | GCCapStyle, &gcv); 388 XChangeGC (disp, gc, GCLineWidth | GCCapStyle, &gcv);
382 389
383 while (a < b) 390 while (a < b)
384 { 391 {
385 uint32_t command = *a++; 392 uint32_t command = *a++;
386 393
… …
393 int y2 = y_[(command >> 0) & 15]; 400 int y2 = y_[(command >> 0) & 15];
394 401
395 switch (op) 402 switch (op)
396 { 403 {
397 case 0: // line 404 case 0: // line
398 XDrawLine (disp, d, TGC, x1, y1, x2, y2); 405 XDrawLine (disp, d, gc, x1, y1, x2, y2);
399 break; 406 break;
400 407
401 case 1: // rectangle, possibly stippled 408 case 1: // rectangle, possibly stippled
402 if (a) 409 if (a)
403 { 410 {
404 static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 }; 411 static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 };
405 412
406 gcv.fill_style = FillStippled; 413 gcv.fill_style = FillStippled;
407 gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2); 414 gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2);
408 gcv.ts_x_origin = x; 415 gcv.ts_x_origin = x;
409 gcv.ts_y_origin = y; 416 gcv.ts_y_origin = y;
410 417
411 XChangeGC (disp, TGC, 418 XChangeGC (disp, gc,
412 GCFillStyle | GCStipple | GCTileStipXOrigin | GCTileStipYOrigin, 419 GCFillStyle | GCStipple | GCTileStipXOrigin | GCTileStipYOrigin,
413 &gcv); 420 &gcv);
414 } 421 }
415 422
416 XFillRectangle (disp, d, TGC, x1, y1, x2 - x1 + 1, y2 - y1 + 1); 423 XFillRectangle (disp, d, gc, x1, y1, x2 - x1 + 1, y2 - y1 + 1);
417 424
418 if (a) 425 if (a)
419 { 426 {
420 XFreePixmap (disp, gcv.stipple); 427 XFreePixmap (disp, gcv.stipple);
421 gcv.stipple = 0; 428 gcv.stipple = 0;
422 gcv.fill_style = FillSolid; 429 gcv.fill_style = FillSolid;
423 XChangeGC (disp, TGC, GCFillStyle, &gcv); 430 XChangeGC (disp, gc, GCFillStyle, &gcv);
424 } 431 }
425 break; 432 break;
426 case 2: // arc 433 case 2: // arc
427 XDrawArc (disp, d, TGC, 434 XDrawArc (disp, d, gc,
428 x1 - W/2, y1 - H/2, W-1, H-1, 435 x1 - W/2, y1 - H/2, W-1, H-1,
429 (a - 1) * 90*64, (b - 1) * 90*64); 436 (a - 1) * 90*64, (b - 1) * 90*64);
430 break; 437 break;
431 } 438 }
432 } 439 }
433 } 440 }
441#else
442 if (0)
443 ;
444#endif
434#if ENABLE_COMBINING 445#if ENABLE_COMBINING
435 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) 446 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
436 { 447 {
448 min_it (width, 2); // we only support wcwidth up to 2
449
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}
496
497struct rxvt_font_overflow : rxvt_font {
498 struct rxvt_fontset *fs;
499
500 rxvt_font_overflow (rxvt_fontset *fs)
501 : rxvt_font ()
502 {
503 this->fs = fs;
504 }
505
506 rxvt_fontprop properties ()
507 {
508 rxvt_fontprop p;
509
510 p.width = p.height = 1;
511 p.ascent = rxvt_fontprop::unset;
512 p.weight = rxvt_fontprop::medium;
513 p.slant = rxvt_fontprop::roman;
514
515 return p;
516 }
517
518 bool load (const rxvt_fontprop &prop, bool force_prop)
519 {
520 width = 1; height = 1;
521 ascent = 1; descent = 0;
522
523 set_name (strdup ("built-in rendition overflow font"));
524
525 return true;
526 }
527
528 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
529 {
530 return false;
531 }
532
533 void draw (rxvt_drawable &d, int x, int y,
534 const text_t *text, int len,
535 int fg, int bg)
536 {
537 while (len)
538 {
539 int fid = fs->find_font_idx (*text);
540 int w = 1;
541 while (w < len && text[w] == NOCHAR)
542 w++;
543 (*fs)[fid]->draw (d, x, y, text, w, fg, bg);
544 text += w;
545 len -= w;
546 x += term->fwidth * w;
547 }
548 }
549};
475 550
476///////////////////////////////////////////////////////////////////////////// 551/////////////////////////////////////////////////////////////////////////////
477 552
478struct rxvt_font_x11 : rxvt_font { 553struct rxvt_font_x11 : rxvt_font {
479 rxvt_font_x11 () { f = 0; } 554 rxvt_font_x11 () { f = 0; }
480 555
481 void clear (); 556 void clear ();
482 557
483 rxvt_fontprop properties (); 558 rxvt_fontprop properties ();
484 559
485 bool load (const rxvt_fontprop &prop); 560 bool load (const rxvt_fontprop &prop, bool force_prop);
486 561
487 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful); 562 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
488 563
489 void draw (rxvt_drawable &d, int x, int y, 564 void draw (rxvt_drawable &d, int x, int y,
490 const text_t *text, int len, 565 const text_t *text, int len,
491 int fg, int bg); 566 int fg, int bg);
492 567
493 bool slow; // wether this is a proportional font or has other funny characteristics 568 bool slow; // whether this is a proportional font or has other funny characteristics
494 XFontStruct *f; 569 XFontStruct *f;
495 codeset cs;
496 bool enc2b, encm; 570 bool enc2b, encm;
497 571
498 char *get_property (XFontStruct *f, const char *property, const char *repl) const; 572 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); 573 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); 574 bool set_properties (rxvt_fontprop &p, XFontStruct *f);
501 bool set_properties (rxvt_fontprop &p, const char *name); 575 bool set_properties (rxvt_fontprop &p, const char *name);
502}; 576};
503 577
504char * 578char *
505rxvt_font_x11::get_property (XFontStruct *f, const char *property, const char *repl) const 579rxvt_font_x11::get_property (XFontStruct *f, Atom property, const char *repl) const
506{ 580{
507 unsigned long value; 581 unsigned long value;
508 582
509 if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value)) 583 if (XGetFontProperty (f, property, &value))
510 return XGetAtomName (DISPLAY, value); 584 return XGetAtomName (term->dpy, value);
511 else 585 else
512 return rxvt_strdup (repl); 586 return repl ? strdup (repl) : 0;
513} 587}
514 588
515rxvt_fontprop 589rxvt_fontprop
516rxvt_font_x11::properties () 590rxvt_font_x11::properties ()
517{ 591{
… …
521} 595}
522 596
523bool 597bool
524rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth) 598rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth)
525{ 599{
526 p.width = avgwidth ? (avgwidth + 1) / 10 : (height + 1) / 2; 600 p.width = width != rxvt_fontprop::unset ? width
601 : avgwidth ? (avgwidth + 1) / 10
602 : (height + 1) / 2;
527 p.height = height; 603 p.height = height;
604 p.ascent = rxvt_fontprop::unset;
528 p.weight = *weight == 'B' || *weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium; 605 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; 606 p.slant = *slant == 'r' || *slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic;
530 607
531 return true; 608 return true;
532} 609}
… …
535rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f) 612rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)
536{ 613{
537 unsigned long height; 614 unsigned long height;
538 615
539#if 0 616#if 0
540 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "PIXEL_SIZE", 0), &height)) 617 if (!XGetFontProperty (f, XInternAtom (term->dpy, "PIXEL_SIZE", 0), &height))
541 return false; 618 return false;
542#else 619#else
543 height = f->ascent + f->descent; 620 height = f->ascent + f->descent;
544#endif 621#endif
545 622
546 unsigned long avgwidth; 623 unsigned long avgwidth;
547 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth)) 624 if (!XGetFontProperty (f, term->xa [XA_AVERAGE_WIDTH], &avgwidth))
548 avgwidth = 0; 625 avgwidth = 0;
549 626
550 char *weight = get_property (f, "WEIGHT_NAME", "medium"); 627 char *weight = get_property (f, term->xa [XA_WEIGHT_NAME], "medium");
551 char *slant = get_property (f, "SLANT", "r"); 628 char *slant = get_property (f, term->xa [XA_SLANT], "r");
552 629
553 set_properties (p, height, weight, slant, avgwidth); 630 set_properties (p, height, weight, slant, avgwidth);
554 631
555 free (weight); 632 free (weight);
556 free (slant); 633 free (slant);
557 634
635 p.ascent = f->ascent;
636
558 return true; 637 return true;
559} 638}
560 639
561bool 640bool
562rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name) 641rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name)
563{ 642{
643 dTermDisplay;
564 int slashes = 0; 644 int slashes = 0;
565 const char *comp[13]; 645 const char *comp[13];
566 646
567 for (const char *c = name; *c; c++) 647 for (const char *c = name; *c; c++)
568 if (*c == '-') 648 if (*c == '-')
… …
576 if (slashes >= 13 656 if (slashes >= 13
577 && (*comp[ 6] >= '1' && *comp[ 6] <= '9') 657 && (*comp[ 6] >= '1' && *comp[ 6] <= '9')
578 && (*comp[11] >= '0' && *comp[11] <= '9')) 658 && (*comp[11] >= '0' && *comp[11] <= '9'))
579 return set_properties (p, atoi (comp[6]), comp[2], comp[3], atoi (comp[11])); 659 return set_properties (p, atoi (comp[6]), comp[2], comp[3], atoi (comp[11]));
580 660
581 XFontStruct *f = XLoadQueryFont (DISPLAY, name); 661 XFontStruct *f = XLoadQueryFont (disp, name);
582 662
583 if (f) 663 if (f)
584 { 664 {
585 // the font should really exist now. if not, we have a problem 665 // 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). 666 // (e.g. if the user did xset fp rehash just when we were searching fonts).
587 // in that case, just return garbage. 667 // in that case, just return garbage.
588 bool ret = set_properties (p, f); 668 bool ret = set_properties (p, f);
589 XFreeFont (DISPLAY, f); 669 XFreeFont (disp, f);
590 return ret; 670 return ret;
591 } 671 }
592 else 672 else
593 return false; 673 return false;
594} 674}
595 675
596// fix the size of scalable fonts 676// fix the size of scalable fonts
597static bool 677static bool
598replace_field (char *buf, const char *name, int index, const char old, const char *replace) 678replace_field (char **ptr, const char *name, int index, const char old, const char *replace)
599{ 679{
600 int slashes = 0; 680 int slashes = 0;
601 const char *field, *end; 681 const char *field, *end;
602 682
603 for (const char *c = name; *c; c++) 683 for (const char *c = name; *c; c++)
… …
613 break; 693 break;
614 } 694 }
615 695
616 if (slashes >= 13 && (!old || *field == old)) 696 if (slashes >= 13 && (!old || *field == old))
617 { 697 {
618 // TODO: check for overflow in font-name 698 size_t len = field - name;
619 strncpy (buf, name, field - name); 699 *ptr = (char *)malloc (len + strlen (replace) + strlen (end) + 1);
620 buf += field - name; 700 memcpy (*ptr, name, len);
621 strcpy (buf, replace); 701 strcpy (*ptr + len, replace);
622 strcat (buf, end); 702 strcat (*ptr, end);
623 703
624 return true; 704 return true;
625 } 705 }
626 else 706 else
627 { 707 {
628 strcpy (buf, name); 708 *ptr = strdup (name);
629 709
630 return false; 710 return false;
631 } 711 }
632} 712}
633 713
634bool 714bool
635rxvt_font_x11::load (const rxvt_fontprop &prop) 715rxvt_font_x11::load (const rxvt_fontprop &prop, bool force_prop)
636{ 716{
637 Display *disp = DISPLAY; 717 dTermDisplay;
638 718
639 clear (); 719 clear ();
640 720
641 char field_str[64]; // enough for 128 bits 721 char field_str[64]; // enough for 128 bits
642 722
643 // first morph the font if required 723 // first morph the font if required
644 if (prop.weight != rxvt_fontprop::unset 724 if (force_prop)
645 || prop.slant != rxvt_fontprop::unset)
646 { 725 {
647 char fname[1024]; 726 char *fname;
648 727
649 if (name[0] != '-') 728 if (name[0] != '-')
650 { 729 {
651 f = XLoadQueryFont (disp, name); 730 f = XLoadQueryFont (disp, name);
652 731
653 if (!f) 732 if (!f)
654 return false; 733 return false;
655 734
656 char *new_name = get_property (f, "FONT", name); 735 char *new_name = get_property (f, XA_FONT, 0);
657 736
658 if (new_name) 737 if (new_name)
659 set_name (new_name); 738 set_name (new_name);
660 else 739 else
661 rxvt_warn ("font '%s' has no FONT property, continuing without.", name); 740 rxvt_warn ("font '%s' has no FONT property, continuing without.\n", name);
662 741
663 XFreeFont (disp, f); 742 XFreeFont (disp, f);
664 f = 0; 743 f = 0;
665 } 744 }
666 745
667 if (prop.weight != rxvt_fontprop::unset) 746 if (prop.weight != rxvt_fontprop::unset)
668 { 747 {
669 replace_field (fname, name, 2, 0, 748 replace_field (&fname, name, 2, 0,
670 prop.weight < rxvt_fontprop::bold 749 prop.weight < rxvt_fontprop::bold
671 ? "medium" : "bold"); 750 ? "medium" : "bold");
672 set_name (strdup (fname)); 751 set_name (fname);
673 } 752 }
674 753
675 if (prop.slant != rxvt_fontprop::unset) 754 if (prop.slant != rxvt_fontprop::unset)
676 { 755 {
677 replace_field (fname, name, 3, 0, 756 replace_field (&fname, name, 3, 0,
678 prop.slant < rxvt_fontprop::italic 757 prop.slant < rxvt_fontprop::italic
679 ? "r" : "i"); // TODO: handle "o"blique, too 758 ? "r" : "i"); // TODO: handle "o"blique, too
680 set_name (strdup (fname)); 759 set_name (fname);
681 } 760 }
682 } 761 }
683 762
684 sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset 763 sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset
685 ? 0 : prop.height); 764 ? 0 : prop.height);
… …
710 font_weight *fonts = new font_weight[count]; 789 font_weight *fonts = new font_weight[count];
711 790
712 for (int i = 0; i < count; i++) 791 for (int i = 0; i < count; i++)
713 { 792 {
714 rxvt_fontprop p; 793 rxvt_fontprop p;
715 char fname[1024]; 794 char *fname;
716 795
717 int diff = 0; 796 int diff = 0;
718 797
719 if (replace_field (fname, list[i], 6, '0', field_str)) 798 if (replace_field (&fname, list[i], 6, '0', field_str))
720 diff += 10; // slightly penalize scalable fonts 799 diff += 10; // slightly penalize scalable fonts
800 else
801 {
802 free (fname);
721 else if (replace_field (fname, list[i], 11, '0', "0")) 803 if (replace_field (&fname, list[i], 11, '0', "0"))
722 diff += 300; // more heavily penalize what looks like scaled bitmap fotns 804 diff += 300; // more heavily penalize what looks like scaled bitmap fonts
805 }
723 806
724 if (!set_properties (p, fname)) 807 if (!set_properties (p, fname)
808 // also weed out too large fonts
809 || (prop.height != rxvt_fontprop::unset
810 && p.height > prop.height))
811 {
812 free (fname);
725 continue; 813 continue;
726 814 }
727 if (prop.height != rxvt_fontprop::unset
728 && p.height > prop.height) // weed out too large fonts
729 continue;
730 815
731 if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128; 816 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); 817 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); 818 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); 819 //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width);
735 820
736 fonts[i].name = strdup (fname); 821 fonts[i].name = fname;
737 fonts[i].diff = diff; 822 fonts[i].diff = diff;
738 } 823 }
739 824
740 XFreeFontNames (list); 825 XFreeFontNames (list);
741 826
742 // this loop only iterates when the guessed font-size is too small 827 // this loop only iterates when the guessed font-size is too small
743 for (;;) 828 for (;;)
744 { 829 {
745 font_weight *best = fonts + count - 1; 830 font_weight *best = fonts;
746 831
747 for (font_weight *w = best; w-- > fonts; ) 832 for (font_weight *w = fonts + 1; w < fonts + count; w++)
748 if (w->diff <= best->diff) 833 if (w->diff < best->diff)
749 best = w; 834 best = w;
750 835
751 if (!best->name 836 if (!best->name
752 || !(f = XLoadQueryFont (disp, best->name))) 837 || !(f = XLoadQueryFont (disp, best->name)))
753 break; 838 break;
… …
770 delete [] fonts; 855 delete [] fonts;
771 856
772 if (!f) 857 if (!f)
773 return false; 858 return false;
774 859
775 char *registry = get_property (f, "CHARSET_REGISTRY", 0); 860 char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0);
776 char *encoding = get_property (f, "CHARSET_ENCODING", 0); 861 char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0);
862
863 cs = CS_UNKNOWN;
777 864
778 if (registry && encoding) 865 if (registry && encoding)
779 { 866 {
780 char charset[64]; 867 char charset[64];
781 snprintf (charset, 64, "%s-%s", registry, encoding); 868 snprintf (charset, 64, "%s-%s", registry, encoding);
782 869
783 cs = codeset_from_name (charset); 870 cs = codeset_from_name (charset);
784 } 871
785 else 872 if (cs == CS_UNKNOWN)
873 rxvt_warn ("%s: cannot deduce encoding from registry/encoding properties \"%s\", ignoring font.\n", name, charset);
786 { 874 }
875
876 free (registry);
877 free (encoding);
878
879 if (cs == CS_UNKNOWN)
880 {
787 const char *charset = get_property (f, "FONT", 0); 881 char *value = get_property (f, XA_FONT, 0);
882 const char *charset = value;
788 883
789 if (!charset) 884 if (!charset)
790 charset = name; 885 charset = name;
791 886
792 int count = 13; 887 int count = 13;
793 while (*charset) 888 while (*charset)
794 if (*charset++ == '-' && !--count) 889 if (*charset++ == '-' && !--count)
795 break; 890 break;
796 891
797 cs = codeset_from_name (charset); 892 cs = codeset_from_name (charset);
893 if (cs == CS_UNKNOWN)
894 rxvt_warn ("%s: cannot deduce encoding from font name property \"%s\", ignoring font.\n", name, charset);
895
896 free (value);
897 }
898
899 if (cs == CS_UNKNOWN)
798 } 900 {
799 901 clear ();
800 free (registry); 902 return false;
801 free (encoding); 903 }
802 904
803 if (cs == CS_UNICODE) 905 if (cs == CS_UNICODE)
804 cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font 906 cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font
805 907
806 encm = f->min_byte1 != 0 || f->max_byte1 != 0; 908 encm = f->min_byte1 != 0 || f->max_byte1 != 0;
807 enc2b = encm || f->max_char_or_byte2 > 255; 909 enc2b = encm || f->max_char_or_byte2 > 255;
808 910
809 slow = false; 911 slow = false;
810 912
811#if 1 // only used for slow detection, TODO optimize 913#if 1 // only used for slow detection, TODO optimize
812 if (f->min_bounds.width == f->max_bounds.width) 914 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; 915 width = f->max_bounds.width;
816 else 916 else
817 { 917 {
818 slow = true; 918 slow = true;
819 919
820 int N = f->max_char_or_byte2 - f->min_char_or_byte2; 920 int N = f->max_char_or_byte2 - f->min_char_or_byte2;
821 921
822 if (encm) 922 if (encm)
823 N += (f->max_byte1 - f->min_byte1) 923 N += (f->max_byte1 - f->min_byte1)
824 * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1); 924 * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1);
825 925
826 while (N) 926 while (N)
827 { 927 {
828 if (f->per_char[N].width > width) 928 if (f->per_char[N].width > width)
829 width = f->per_char[N].width; 929 width = f->per_char[N].width;
830 930
… …
833 } 933 }
834#endif 934#endif
835 935
836 width = 1; 936 width = 1;
837 937
838 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 938 for (uint16_t *t = extent_test_chars; t < extent_test_chars + ecb_array_length (extent_test_chars); t++)
839 { 939 {
840 if (cs != CS_UNICODE
841 && *t > 0x100
842 && FROM_UNICODE (cs, *t) == NOCHAR) 940 if (FROM_UNICODE (cs, *t) == NOCHAR)
843 continue; 941 continue;
844 942
845 // ignore characters we wouldn't use anyways 943 // ignore characters we wouldn't use anyways
846 bool careful; 944 bool careful;
847 if (!has_char (*t, &prop, careful)) 945 if (!has_char (*t, &prop, careful))
848 continue; 946 continue;
849 947
850 XChar2b ch = { *t >> 8, *t }; 948 // the casts are needed in C++11 (see 8.5.1)
949 XChar2b ch = { (unsigned char)(*t >> 8), (unsigned char)*t };
851 950
852 XCharStruct g; 951 XCharStruct g;
853 int dir_ret, asc_ret, des_ret; 952 int dir_ret, asc_ret, des_ret;
854 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); 953 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);
855 954
955 int wcw = WCWIDTH (*t);
856 int wcw = wcwidth (*t); if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; 956 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
857 957
858 if (width < g.width) width = g.width; 958 if (width < g.width) width = g.width;
859 }
860
861 if (cs == CS_UNKNOWN)
862 { 959 }
863 fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);
864 960
961#if 0 // do it per-character
962 if (prop && width > prop->width)
963 {
865 clear (); 964 clear ();
866 return false; 965 return false;
867 } 966 }
868
869#if 0 // do it per-character
870 if (prop && width > prop->width)
871 {
872 clear ();
873 return false;
874 }
875#endif 967#endif
876 968
877 return true; 969 return true;
878} 970}
879 971
880void 972void
881rxvt_font_x11::clear () 973rxvt_font_x11::clear ()
882{ 974{
883 if (f) 975 if (f)
884 { 976 {
885 XFreeFont (DISPLAY, f); 977 XFreeFont (term->dpy, f);
886 f = 0; 978 f = 0;
887 } 979 }
888} 980}
889 981
890bool 982bool
891rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) 983rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
892{ 984{
985 careful = false;
986
893 uint32_t ch = FROM_UNICODE (cs, unicode); 987 uint32_t ch = FROM_UNICODE (cs, unicode);
894 988
895 if (ch == NOCHAR) 989 if (ch == NOCHAR)
896 return false; 990 return false;
897 991
898 /* check wether the character exists in _this_ font. horrible. */ 992 /* check whether the character exists in _this_ font. horrible. */
899 XCharStruct *xcs; 993 XCharStruct *xcs;
900 994
901 if (encm) 995 if (encm)
902 { 996 {
903 unsigned char byte1 = ch >> 8; 997 unsigned char byte1 = ch >> 8;
… …
933 return false; 1027 return false;
934 1028
935 if (!prop || prop->width == rxvt_fontprop::unset) 1029 if (!prop || prop->width == rxvt_fontprop::unset)
936 return true; 1030 return true;
937 1031
938 // check character against base font bounding box 1032 // check whether character overlaps previous/next character
939 int w = xcs->width; 1033 int w = xcs->rbearing - xcs->lbearing;
940 int wcw = wcwidth (unicode); 1034 int wcw = max (WCWIDTH (unicode), 1);
941 if (wcw > 0) w = (w + wcw - 1) / wcw;
942 1035
943 careful = w > prop->width; 1036 careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw;
944 if (careful && w > prop->width * MAX_OVERLAP >> 2) 1037
1038 if (careful && !OVERLAP_OK (w, wcw, prop))
945 return false; 1039 return false;
946 1040
947 return true; 1041 return true;
948} 1042}
949 1043
… …
955 // this looks like a mess /. 1049 // this looks like a mess /.
956 // and it is a mess /. 1050 // and it is a mess /.
957 // yet we are trying to be perfect /. 1051 // yet we are trying to be perfect /.
958 // but the result still isn't perfect /. 1052 // but the result still isn't perfect /.
959 1053
1054 dTermDisplay;
1055 dTermGC;
1056
960 bool slow = this->slow 1057 bool slow = this->slow
961 || width != r->TermWin.fwidth 1058 || width != term->fwidth
962 || height != r->TermWin.fheight; 1059 || height != term->fheight
1060 || ascent != f->ascent;
963 1061
964 int base = ascent; // sorry, incorrect: r->TermWin.fbase; 1062 int base = ascent; // sorry, incorrect: term->fbase;
965 1063
966 XGCValues v; 1064 XGCValues v;
967 v.foreground = r->pix_colors[fg]; 1065 v.foreground = term->pix_colors[fg];
968 v.font = f->fid; 1066 v.font = f->fid;
969 1067
970 if (enc2b) 1068 if (enc2b)
971 { 1069 {
972 const XChar2b *xc = enc_xchar2b (text, len, cs, slow); 1070 const XChar2b *xc = enc_xchar2b (text, len, cs, slow);
973 1071
974 if (bg == Color_bg && !slow) 1072 if (bg == Color_bg && !slow)
975 { 1073 {
976 v.background = r->pix_colors[bg]; 1074 v.background = term->pix_colors[bg];
977 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); 1075 XChangeGC (disp, gc, GCForeground | GCBackground | GCFont, &v);
978 XDrawImageString16 (d.display->display, d, TGC, x, y + base, xc, len); 1076 XDrawImageString16 (disp, d, gc, x, y + base, xc, len);
979 } 1077 }
980 else 1078 else
981 { 1079 {
982 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 1080 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
983 1081
984 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v); 1082 XChangeGC (disp, gc, GCForeground | GCFont, &v);
985 1083
986 if (slow) 1084 if (slow)
987 { 1085 {
988 do 1086 do
989 { 1087 {
990 if (xc->byte1 || xc->byte2) 1088 if (xc->byte1 || xc->byte2)
991 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, 1); 1089 XDrawString16 (disp, d, gc, x, y + base, xc, 1);
992 1090
993 x += r->TermWin.fwidth; 1091 x += term->fwidth;
994 xc++; len--; 1092 xc++; len--;
995 } 1093 }
996 while (len); 1094 while (len);
997 } 1095 }
998 else 1096 else
999 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, len); 1097 XDrawString16 (disp, d, gc, x, y + base, xc, len);
1000 } 1098 }
1001 } 1099 }
1002 else 1100 else
1003 { 1101 {
1004 const char *xc = enc_char (text, len, cs, slow); 1102 const char *xc = enc_char (text, len, cs, slow);
1005 1103
1006 if (bg == Color_bg && !slow) 1104 if (bg == Color_bg && !slow)
1007 { 1105 {
1008 v.background = r->pix_colors[bg]; 1106 v.background = term->pix_colors[bg];
1009 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); 1107 XChangeGC (disp, gc, GCForeground | GCBackground | GCFont, &v);
1010 XDrawImageString (d.display->display, d, TGC, x, y + base, xc, len); 1108 XDrawImageString (disp, d, gc, x, y + base, xc, len);
1011 } 1109 }
1012 else 1110 else
1013 { 1111 {
1014 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 1112 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
1015 1113
1016 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v); 1114 XChangeGC (disp, gc, GCForeground | GCFont, &v);
1017 1115
1018 if (slow) 1116 if (slow)
1019 { 1117 {
1020 do 1118 do
1021 { 1119 {
1022 if (*xc) 1120 if (*xc)
1023 XDrawString (d.display->display, d, TGC, x, y + base, xc, 1); 1121 XDrawString (disp, d, gc, x, y + base, xc, 1);
1024 1122
1025 x += r->TermWin.fwidth; 1123 x += term->fwidth;
1026 xc++; len--; 1124 xc++; len--;
1027 } 1125 }
1028 while (len); 1126 while (len);
1029 } 1127 }
1030 else 1128 else
1031 XDrawString (d.display->display, d, TGC, x, y + base, xc, len); 1129 XDrawString (disp, d, gc, x, y + base, xc, len);
1032 } 1130 }
1033 } 1131 }
1034} 1132}
1035 1133
1036///////////////////////////////////////////////////////////////////////////// 1134/////////////////////////////////////////////////////////////////////////////
… …
1042 1140
1043 void clear (); 1141 void clear ();
1044 1142
1045 rxvt_fontprop properties (); 1143 rxvt_fontprop properties ();
1046 1144
1047 bool load (const rxvt_fontprop &prop); 1145 bool load (const rxvt_fontprop &prop, bool force_prop);
1048 1146
1049 void draw (rxvt_drawable &d, int x, int y, 1147 void draw (rxvt_drawable &d, int x, int y,
1050 const text_t *text, int len, 1148 const text_t *text, int len,
1051 int fg, int bg); 1149 int fg, int bg);
1052 1150
1053 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &carefull); 1151 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
1054 1152
1055protected: 1153protected:
1056 XftFont *f; 1154 XftFont *f;
1057}; 1155};
1058 1156
1059void 1157void
1060rxvt_font_xft::clear () 1158rxvt_font_xft::clear ()
1061{ 1159{
1062 if (f) 1160 if (f)
1063 { 1161 {
1064 XftFontClose (DISPLAY, f); 1162 XftFontClose (term->dpy, f);
1065 f = 0; 1163 f = 0;
1066 } 1164 }
1067} 1165}
1068 1166
1069rxvt_fontprop 1167rxvt_fontprop
… …
1073 1171
1074 FT_Face face = XftLockFace (f); 1172 FT_Face face = XftLockFace (f);
1075 1173
1076 p.width = width; 1174 p.width = width;
1077 p.height = height; 1175 p.height = height;
1176 p.ascent = ascent;
1078 p.weight = face->style_flags & FT_STYLE_FLAG_BOLD 1177 p.weight = face->style_flags & FT_STYLE_FLAG_BOLD
1079 ? rxvt_fontprop::bold : rxvt_fontprop::medium; 1178 ? rxvt_fontprop::bold : rxvt_fontprop::medium;
1080 p.slant = face->style_flags & FT_STYLE_FLAG_ITALIC 1179 p.slant = face->style_flags & FT_STYLE_FLAG_ITALIC
1081 ? rxvt_fontprop::italic : rxvt_fontprop::roman; 1180 ? rxvt_fontprop::italic : rxvt_fontprop::roman;
1082 1181
… …
1084 1183
1085 return p; 1184 return p;
1086} 1185}
1087 1186
1088bool 1187bool
1089rxvt_font_xft::load (const rxvt_fontprop &prop) 1188rxvt_font_xft::load (const rxvt_fontprop &prop, bool force_prop)
1090{ 1189{
1091 Display *disp = DISPLAY; 1190 dTermDisplay;
1092 1191
1093 clear (); 1192 clear ();
1094 1193
1095 FcPattern *p = FcNameParse ((FcChar8 *) name); 1194 FcPattern *p = FcNameParse ((FcChar8 *) name);
1096 1195
… …
1103 && (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch 1202 && (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch
1104 && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch)) 1203 && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch))
1105 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height); 1204 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);
1106 1205
1107 if (prop.weight != rxvt_fontprop::unset 1206 if (prop.weight != rxvt_fontprop::unset
1108 && FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch) 1207 && (force_prop || FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch))
1109 FcPatternAddInteger (p, FC_WEIGHT, prop.weight); 1208 FcPatternAddInteger (p, FC_WEIGHT, prop.weight);
1110 1209
1111 if (prop.slant != rxvt_fontprop::unset 1210 if (prop.slant != rxvt_fontprop::unset
1112 && FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch) 1211 && (force_prop || FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch))
1113 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1212 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1114 1213
1115#if 0 // clipping unfortunately destroys our precious double-width-characters 1214#if 0 // clipping unfortunately destroys our precious double-width-characters
1116 // clip width, we can't do better, or can we? 1215 // clip width, we can't do better, or can we?
1117 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) 1216 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
1118 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop->width); 1217 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width);
1119#endif 1218#endif
1120 1219
1121 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch) 1220 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch)
1122 FcPatternAddBool (p, FC_MINSPACE, 1); 1221 FcPatternAddBool (p, FC_MINSPACE, 1);
1123 1222
1124 // store generated name so iso14755 view gives better results 1223 // store generated name so iso14755 view gives better results
1125 set_name ((char *)FcNameUnparse (p)); 1224 set_name ((char *)FcNameUnparse (p));
1126 1225
1127 XftResult result; 1226 XftResult result;
1128 FcPattern *match = XftFontMatch (disp, r->display->screen, p, &result); 1227 FcPattern *match = XftFontMatch (disp, term->display->screen, p, &result);
1129 1228
1130 FcPatternDestroy (p); 1229 FcPatternDestroy (p);
1131 1230
1132 if (!match) 1231 if (!match)
1133 return false; 1232 return false;
… …
1135 int ftheight = 0; 1234 int ftheight = 0;
1136 bool success = true; 1235 bool success = true;
1137 1236
1138 for (;;) 1237 for (;;)
1139 { 1238 {
1239 p = FcPatternDuplicate (match);
1140 f = XftFontOpenPattern (disp, FcPatternDuplicate (match)); 1240 f = XftFontOpenPattern (disp, p);
1141 1241
1142 if (!f) 1242 if (!f)
1143 { 1243 {
1244 FcPatternDestroy (p);
1144 success = false; 1245 success = false;
1145 break; 1246 break;
1146 } 1247 }
1147 1248
1148 FT_Face face = XftLockFace (f); 1249 FT_Face face = XftLockFace (f);
… …
1156 1257
1157 XftUnlockFace (f); 1258 XftUnlockFace (f);
1158 1259
1159 int glheight = height; 1260 int glheight = height;
1160 1261
1161 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 1262 for (uint16_t *t = extent_test_chars; t < extent_test_chars + ecb_array_length (extent_test_chars); t++)
1162 { 1263 {
1163 FcChar16 ch = *t; 1264 FcChar16 ch = *t;
1164 1265
1165 if (cs != CS_UNICODE 1266 if (cs != CS_UNICODE
1166 && ch > 0x100 1267 && ch > 0x100
… …
1175 XGlyphInfo g; 1276 XGlyphInfo g;
1176 XftTextExtents16 (disp, f, &ch, 1, &g); 1277 XftTextExtents16 (disp, f, &ch, 1, &g);
1177 1278
1178 g.width -= g.x; 1279 g.width -= g.x;
1179 1280
1180 int wcw = wcwidth (ch); 1281 int wcw = WCWIDTH (ch);
1181 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; 1282 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
1182 1283
1183 if (width < g.width ) width = g.width; 1284 if (width < g.width ) width = g.width;
1184 if (height < g.height ) height = g.height; 1285 if (height < g.height ) height = g.height;
1185 if (glheight < g.height - g.y) glheight = g.height - g.y; 1286 if (glheight < g.height - g.y) glheight = g.height - g.y;
1287 }
1288
1289 if (!width)
1290 {
1291 rxvt_warn ("unable to calculate font width for '%s', ignoring.\n", name);
1292
1293 XftFontClose (disp, f);
1294 f = 0;
1295
1296 success = false;
1297 break;
1186 } 1298 }
1187 1299
1188 if (prop.height == rxvt_fontprop::unset 1300 if (prop.height == rxvt_fontprop::unset
1189 || (height <= prop.height && glheight <= prop.height) 1301 || (height <= prop.height && glheight <= prop.height)
1190 || height <= 2 1302 || height <= 2
… …
1201 ftheight -= height - prop.height; 1313 ftheight -= height - prop.height;
1202 } 1314 }
1203 else 1315 else
1204 ftheight = prop.height - 1; 1316 ftheight = prop.height - 1;
1205 1317
1206 XftFontClose (disp, f); 1318 XftFontClose (disp, f);
1207 FcPatternDel (match, FC_PIXEL_SIZE); 1319 FcPatternDel (match, FC_PIXEL_SIZE);
1208 FcPatternAddInteger (match, FC_PIXEL_SIZE, ftheight); 1320 FcPatternAddInteger (match, FC_PIXEL_SIZE, ftheight);
1209 } 1321 }
1210 1322
1211 FcPatternDestroy (match); 1323 FcPatternDestroy (match);
1212 1324
1213#if 0 // do it per-character 1325#if 0 // do it per-character
… …
1220 1332
1221 return success; 1333 return success;
1222} 1334}
1223 1335
1224bool 1336bool
1225rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) 1337rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
1226{ 1338{
1227 careful = false; 1339 careful = false;
1228 1340
1229 if (!XftCharExists (DISPLAY, f, unicode)) 1341 if (!XftCharExists (term->dpy, f, unicode))
1230 return false; 1342 return false;
1231 1343
1232 if (!prop || prop->width == rxvt_fontprop::unset) 1344 if (!prop || prop->width == rxvt_fontprop::unset)
1233 return true; 1345 return true;
1234 1346
1235 // check character against base font bounding box 1347 // check character against base font bounding box
1236 FcChar32 ch = unicode; 1348 FcChar32 ch = unicode;
1237 XGlyphInfo g; 1349 XGlyphInfo g;
1238 XftTextExtents32 (DISPLAY, f, &ch, 1, &g); 1350 XftTextExtents32 (term->dpy, f, &ch, 1, &g);
1239 1351
1240 int w = g.width - g.x; 1352 int w = g.width - g.x;
1241 int wcw = wcwidth (unicode); 1353 int wcw = max (WCWIDTH (unicode), 1);
1242 if (wcw > 0) w = (w + wcw - 1) / wcw;
1243 1354
1244 careful = w > prop->width; 1355 careful = g.x > 0 || w > prop->width * wcw;
1245 if (careful && w > prop->width * MAX_OVERLAP >> 2) 1356
1357 if (careful && !OVERLAP_OK (w, wcw, prop))
1358 return false;
1359
1360 // this weeds out _totally_ broken fonts, or glyphs
1361 if (!OVERLAP_OK (g.xOff, wcw, prop))
1246 return false; 1362 return false;
1247 1363
1248 return true; 1364 return true;
1249} 1365}
1250 1366
1251void 1367void
1252rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, 1368rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1253 const text_t *text, int len, 1369 const text_t *text, int len,
1254 int fg, int bg) 1370 int fg, int bg)
1255{ 1371{
1256 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
1257
1258 int base = ascent; // should be fbase, but that is incorrect
1259
1260 XGlyphInfo extents; 1372 XGlyphInfo extents;
1261 FcChar32 *enc = (FcChar32 *) get_enc_buf (len * sizeof (FcChar32)); 1373 XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len);
1262 FcChar32 *ep = enc; 1374 XftGlyphSpec *ep = enc;
1263 int ewidth = 0; 1375
1376 dTermDisplay;
1377 dTermGC;
1378
1379 int w = term->fwidth * len;
1380 int h = term->fheight;
1381
1382 bool buffered = bg >= Color_transparent
1383 && term->option (Opt_buffered);
1384
1385 // cut trailing spaces
1386 while (len && text [len - 1] == ' ')
1387 len--;
1388
1389 int x_ = buffered ? 0 : x;
1390 int y_ = buffered ? 0 : y;
1264 1391
1265 while (len) 1392 while (len)
1266 { 1393 {
1267 int cwidth = r->TermWin.fwidth; 1394 int cwidth = term->fwidth;
1268 FcChar32 fc = *text++; len--; 1395 FcChar32 fc = *text++; len--;
1269 1396
1270 while (len && *text == NOCHAR) 1397 while (len && *text == NOCHAR)
1271 text++, len--, cwidth += r->TermWin.fwidth; 1398 text++, len--, cwidth += term->fwidth;
1399
1400 if (fc != ' ') // skip spaces
1272 1401 {
1273 if (fc == ' ' && ep == enc) // skip leading spaces 1402 FT_UInt glyph = XftCharIndex (disp, f, fc);
1403 XftGlyphExtents (disp, f, &glyph, 1, &extents);
1404
1405 ep->glyph = glyph;
1406 ep->x = x_ + (cwidth - extents.xOff >> 1);
1407 ep->y = y_ + ascent;
1408
1409 if (extents.xOff == 0)
1410 ep->x = x_ + cwidth;
1411
1412 ep++;
1413 }
1414
1274 x += cwidth; 1415 x_ += cwidth;
1275 else 1416 }
1276 {
1277 FT_UInt gl = XftCharIndex (d.display->display, f, fc);
1278 XftGlyphExtents (d.display->display, f, &gl, 1, &extents);
1279 1417
1280 if (extents.xOff != cwidth) 1418 if (buffered)
1419 {
1420 if (ep != enc)
1421 {
1422 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1423
1424#ifdef HAVE_IMG
1425 Picture dst = 0; // the only assignment is done conditionally in the following if condition
1426
1427 if (term->bg_img
1428 && (bg == Color_transparent || bg == Color_bg
1429 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2))))))
1281 { 1430 {
1282 if (ewidth) 1431 int src_x = x, src_y = y;
1432
1433 if (term->bg_flags & rxvt_term::BG_IS_TRANSPARENT)
1283 { 1434 {
1284 XftDrawGlyphs (d, &r->pix_colors[fg].c, f,
1285 x, y + base, enc, ep - enc);
1286 x += ewidth; 1435 src_x += term->window_vt_x;
1287 1436 src_y += term->window_vt_y;
1288 ep = enc;
1289 ewidth = 0;
1290 } 1437 }
1291 1438
1292 if (extents.xOff > cwidth) 1439 if (term->bg_img->w >= src_x + w
1293 extents.xOff = cwidth; 1440 && term->bg_img->h >= src_y + h)
1441 {
1442 XCopyArea (disp, term->bg_img->pm, d2, gc,
1443 src_x, src_y, w, h, 0, 0);
1444 }
1445 else
1446 {
1447 XGCValues gcv;
1294 1448
1295 XftDrawGlyphs (d, &r->pix_colors[fg].c, f, 1449 gcv.fill_style = FillTiled;
1296 x + (cwidth - extents.xOff >> 1), 1450 gcv.tile = term->bg_img->pm;
1451 gcv.ts_x_origin = -src_x;
1452 gcv.ts_y_origin = -src_y;
1453
1454 XChangeGC (disp, gc,
1455 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
1297 y + base, &gl, 1); 1456 &gcv);
1298 x += cwidth; 1457
1458 XFillRectangle (disp, d2, gc, 0, 0, w, h);
1459
1460 gcv.fill_style = FillSolid;
1461 XChangeGC (disp, gc, GCFillStyle, &gcv);
1462 }
1463
1464 if (dst)
1465 {
1466 Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c);
1467
1468 // dst can only be set when bg >= 0
1469 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h);
1470 }
1299 } 1471 }
1300 else 1472 else
1301 { 1473#endif
1302 *ep++ = gl; 1474 XftDrawRect (d2, &term->pix_colors[bg >= 0 ? bg : Color_bg].c, 0, 0, w, h);
1303 ewidth += cwidth; 1475
1476 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);
1477 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
1304 } 1478 }
1305 } 1479 else
1480 clear_rect (d, x, y, w, h, bg);
1481 }
1482 else
1306 } 1483 {
1307 1484 clear_rect (d, x, y, w, h, bg);
1308 if (ep != enc)
1309 XftDrawGlyphs (d, &r->pix_colors[fg].c, f, 1485 XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc);
1310 x, y + base, enc, ep - enc); 1486 }
1311} 1487}
1488
1312#endif 1489#endif
1313 1490
1314///////////////////////////////////////////////////////////////////////////// 1491/////////////////////////////////////////////////////////////////////////////
1315 1492
1316rxvt_fontset::rxvt_fontset (rxvt_t r) 1493rxvt_fontset::rxvt_fontset (rxvt_term *term)
1317: fontdesc (0), r (r) 1494: fontdesc (0), term (term)
1318{ 1495{
1319 clear (); 1496 clear ();
1320} 1497}
1321 1498
1322rxvt_fontset::~rxvt_fontset () 1499rxvt_fontset::~rxvt_fontset ()
… …
1325} 1502}
1326 1503
1327void 1504void
1328rxvt_fontset::clear () 1505rxvt_fontset::clear ()
1329{ 1506{
1330 prop.width = prop.height = prop.weight = prop.slant 1507 prop.width = prop.height = prop.ascent = prop.weight = prop.slant
1331 = rxvt_fontprop::unset; 1508 = rxvt_fontprop::unset;
1509 force_prop = false;
1332 1510
1333 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) 1511 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1334 FONT_UNREF (*i); 1512 (*i)->unref ();
1335 1513
1336 for (pagemap **p = fmap.begin (); p != fmap.end (); p++) 1514 for (pagemap **p = fmap.begin (); p != fmap.end (); p++)
1337 delete *p; 1515 delete *p;
1338 1516
1339 free (fontdesc); fontdesc = 0; 1517 free (fontdesc); fontdesc = 0;
… …
1341 fonts.clear (); 1519 fonts.clear ();
1342 1520
1343 fallback = fallback_fonts; 1521 fallback = fallback_fonts;
1344} 1522}
1345 1523
1524void
1525rxvt_fontset::prepare_font (rxvt_font *font, codeset cs)
1526{
1527 font->set_term (term);
1528
1529 font->cs = cs;
1530 font->loaded = false;
1531}
1532
1346rxvt_font * 1533rxvt_font *
1347rxvt_fontset::new_font (const char *name, codeset cs) 1534rxvt_fontset::new_font (const char *name, codeset cs)
1348{ 1535{
1349 rxvt_font *f; 1536 rxvt_font *f;
1350 1537
1351 if (!name || !*name) 1538 if (!name || !*name)
1352 { 1539 {
1353 name = ""; 1540 name = "";
1354 f = new rxvt_font_default (this); 1541 f = new rxvt_font_default (this);
1355 } 1542 }
… …
1366 f = new rxvt_font_x11; 1553 f = new rxvt_font_x11;
1367 } 1554 }
1368 else 1555 else
1369 f = new rxvt_font_x11; 1556 f = new rxvt_font_x11;
1370 1557
1371 f->set_term (r);
1372 f->set_name (strdup (name)); 1558 f->set_name (strdup (name));
1373 1559 prepare_font (f, cs);
1374 f->cs = cs;
1375 f->loaded = false;
1376 1560
1377 return f; 1561 return f;
1378} 1562}
1379 1563
1380///////////////////////////////////////////////////////////////////////////// 1564/////////////////////////////////////////////////////////////////////////////
1565
1566void
1567rxvt_fontset::push_font (rxvt_font *font)
1568{
1569 // the fontCount index is reserved for the overflow font, it is only
1570 // necessary when we get fontCount or more fonts, as they cannot be
1571 // represented in the rendition.
1572 if (fonts.size () == fontCount)
1573 {
1574 rxvt_font *f = new rxvt_font_overflow (this);
1575
1576 prepare_font (f, CS_UNICODE);
1577 fonts.push_back (f);
1578 }
1579
1580 fonts.push_back (font);
1581}
1381 1582
1382void 1583void
1383rxvt_fontset::add_fonts (const char *desc) 1584rxvt_fontset::add_fonts (const char *desc)
1384{ 1585{
1385 if (desc) 1586 if (desc)
… …
1414 cs = codeset_from_name (spec + sizeof ("codeset=") - 1); 1615 cs = codeset_from_name (spec + sizeof ("codeset=") - 1);
1415 else 1616 else
1416 rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec); 1617 rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec);
1417 1618
1418 desc++; 1619 desc++;
1419 while (*desc <= ' ') desc++; 1620 while (*desc <= ' ' && *desc) desc++;
1420 } 1621 }
1421 1622
1422 end = strchr (desc, ','); 1623 end = strchr (desc, ',');
1423 if (!end) 1624 if (!end)
1424 end = desc + strlen (desc); 1625 end = desc + strlen (desc);
1425 1626
1426 if (end - desc < 511) 1627 if (end - desc < 511)
1427 { 1628 {
1428 strncpy (buf, desc, end - desc); 1629 memcpy (buf, desc, end - desc);
1429 buf[end - desc] = 0; 1630 buf[end - desc] = 0;
1430 1631
1431 fonts.push_back (new_font (buf, cs)); 1632 push_font (new_font (buf, cs));
1432 } 1633 }
1433 else 1634 else
1434 rxvt_warn ("fontset element too long (>511 bytes), ignored."); 1635 rxvt_warn ("fontset element too long (>511 bytes), ignored.\n");
1435 1636
1436 desc = end + 1; 1637 desc = end + 1;
1437 } 1638 }
1438 while (*end); 1639 while (*end);
1439 } 1640 }
… …
1448 if (fonts[i]->loaded) 1649 if (fonts[i]->loaded)
1449 return true; 1650 return true;
1450 1651
1451 fonts[i]->loaded = true; 1652 fonts[i]->loaded = true;
1452 1653
1453 if (!fonts[i]->load (prop)) 1654 if (!fonts[i]->load (prop, force_prop))
1454 { 1655 {
1455 fonts[i]->cs = CS_UNKNOWN; 1656 fonts[i]->cs = CS_UNKNOWN;
1456 return false; 1657 return false;
1457 } 1658 }
1458 1659
… …
1464{ 1665{
1465 clear (); 1666 clear ();
1466 1667
1467 fontdesc = strdup (desc); 1668 fontdesc = strdup (desc);
1468 1669
1469 fonts.push_back (new_font (0, CS_UNICODE)); 1670 push_font (new_font (0, CS_UNICODE));
1470 realize_font (0); 1671 realize_font (0);
1471 1672
1472 add_fonts (desc); 1673 add_fonts (desc);
1473 1674
1474 return true; 1675 return true;
… …
1483 1684
1484 return -1; 1685 return -1;
1485} 1686}
1486 1687
1487int 1688int
1488rxvt_fontset::find_font (unicode_t unicode) 1689rxvt_fontset::find_font_idx (unicode_t unicode)
1489{ 1690{
1490 if (unicode >= 1<<20) 1691 if (unicode >= 1<<20)
1491 return 0; 1692 return 0;
1492 1693
1493 unicode_t hi = unicode >> 8; 1694 unicode_t hi = unicode >> 8;
… …
1508 if (FROM_UNICODE (f->cs, unicode) == NOCHAR) 1709 if (FROM_UNICODE (f->cs, unicode) == NOCHAR)
1509 goto next_font; 1710 goto next_font;
1510 1711
1511 if (!realize_font (i)) 1712 if (!realize_font (i))
1512 goto next_font; 1713 goto next_font;
1714
1715 if (prop.ascent != rxvt_fontprop::unset)
1716 max_it (f->ascent, prop.ascent);
1513 } 1717 }
1514 1718
1515 if (f->cs == CS_UNKNOWN) 1719 if (f->cs == CS_UNKNOWN)
1516 goto next_font; 1720 goto next_font;
1517 1721
1518 bool careful; 1722 bool careful;
1519 if (f->has_char (unicode, &prop, careful)) 1723 if (f->has_char (unicode, &prop, careful))
1520 { 1724 {
1521 if (careful) 1725 i = (i << 1) | careful;
1522 i |= 128;
1523 1726
1524 goto found; 1727 goto found;
1525 } 1728 }
1526 1729
1527 next_font: 1730 next_font:
1528 if (i == fonts.size () - 1) 1731 if (i == fonts.size () - 1)
1529 { 1732 {
1530 if (fallback->name) 1733 if (fallback->name)
1531 { 1734 {
1532 // search through the fallback list 1735 // search through the fallback list
1533 fonts.push_back (new_font (fallback->name, fallback->cs)); 1736 push_font (new_font (fallback->name, fallback->cs));
1534 fallback++; 1737 fallback++;
1535 } 1738 }
1536 else 1739 else
1537 { 1740 {
1538 // try to find a new font. 1741 // try to find a new font.
… …
1540 // way to configure this and xft is easier to hack in, 1743 // way to configure this and xft is easier to hack in,
1541 // while x11 has more framework in place already. 1744 // while x11 has more framework in place already.
1542 // TODO: this is a real resource hog, xft takes ages(?) 1745 // TODO: this is a real resource hog, xft takes ages(?)
1543#if XFT && USE_SLOW_LOOKUP 1746#if XFT && USE_SLOW_LOOKUP
1544 // grab the first xft font that seems suitable 1747 // grab the first xft font that seems suitable
1748 // TOOD: should go first for cellchar (spacing 110) then mono, then else
1545 FcPattern *p = FcPatternCreate (); 1749 FcPattern *p = FcPatternCreate ();
1546 1750
1547 FcCharSet *s = FcCharSetCreate (); 1751 FcCharSet *s = FcCharSetCreate ();
1548 FcCharSetAddChar (s, unicode); 1752 FcCharSetAddChar (s, unicode);
1549 FcPatternAddCharSet (p, FC_CHARSET, s); 1753 FcPatternAddCharSet (p, FC_CHARSET, s);
… …
1556 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1760 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1557 FcPatternAddBool (p, FC_MINSPACE, 1); 1761 FcPatternAddBool (p, FC_MINSPACE, 1);
1558 //FcPatternAddBool (p, FC_ANTIALIAS, 1); 1762 //FcPatternAddBool (p, FC_ANTIALIAS, 1);
1559 1763
1560 XftResult result; 1764 XftResult result;
1561 FcPattern *match = XftFontMatch (DISPLAY, r->display->screen, p, &result); 1765 FcPattern *match = XftFontMatch (term->dpy, term->display->screen, p, &result);
1562 1766
1563 FcPatternDestroy (p); 1767 FcPatternDestroy (p);
1564 1768
1565 if (match) 1769 if (match)
1566 { 1770 {
… …
1569 FcPatternDestroy (match); 1773 FcPatternDestroy (match);
1570 1774
1571 if (find_font (font) < 0) 1775 if (find_font (font) < 0)
1572 { 1776 {
1573 char fontname[4096]; 1777 char fontname[4096];
1574 sprintf (fontname, "xft:%-.4090s", font); 1778 snprintf (fontname, sizeof (fontname), "xft:%s", font);
1575 1779
1576 fonts.push_back (new_font (fontname, CS_UNICODE)); 1780 push_font (new_font (fontname, CS_UNICODE));
1577 } 1781 }
1578 1782
1579 free (font); 1783 free (font);
1580 } 1784 }
1581#endif 1785#endif
… …
1593 while (hi >= fmap.size ()) 1797 while (hi >= fmap.size ())
1594 fmap.push_back (0); 1798 fmap.push_back (0);
1595 1799
1596 if (!fmap[hi]) 1800 if (!fmap[hi])
1597 { 1801 {
1598 fmap[hi] = (pagemap *)new pagemap; 1802 fmap[hi] = new pagemap;
1599 memset (fmap[hi], 0xff, sizeof (pagemap)); 1803 memset (fmap[hi], 0xff, sizeof (pagemap));
1600 } 1804 }
1601 1805
1602 (*fmap[hi])[unicode & 0xff] = i; 1806 (*fmap[hi])[unicode & 0xff] = i;
1603 } 1807 }
1604 1808
1605 return i; 1809 return i;
1606} 1810}
1607 1811
1608
1609

Diff Legend

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