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.71 by root, Sat Jun 18 10:02:35 2005 UTC vs.
Revision 1.195 by root, Mon Sep 7 14:50:56 2015 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_BG_PIXMAP
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)
… …
463 case ZERO_WIDTH_CHAR: 475 case ZERO_WIDTH_CHAR:
464 case NOCHAR: 476 case NOCHAR:
465 break; 477 break;
466 478
467 default: 479 default:
468 XDrawRectangle (disp, d, TGC, x + 2, y + 2, 480 XDrawRectangle (disp, d, gc, x + 2, y + 2,
469 fwidth - 4, r->TermWin.fheight - 4); 481 fwidth - 4, term->fheight - 4);
470 } 482 }
471 483
472 x += fwidth; 484 x += fwidth;
473 } 485 }
474} 486}
487
488struct rxvt_font_overflow : rxvt_font {
489 struct rxvt_fontset *fs;
490
491 rxvt_font_overflow (rxvt_fontset *fs)
492 : rxvt_font ()
493 {
494 this->fs = fs;
495 }
496
497 rxvt_fontprop properties ()
498 {
499 rxvt_fontprop p;
500
501 p.width = p.height = 1;
502 p.ascent = rxvt_fontprop::unset;
503 p.weight = rxvt_fontprop::medium;
504 p.slant = rxvt_fontprop::roman;
505
506 return p;
507 }
508
509 bool load (const rxvt_fontprop &prop, bool force_prop)
510 {
511 width = 1; height = 1;
512 ascent = 1; descent = 0;
513
514 set_name (strdup ("built-in rendition overflow font"));
515
516 return true;
517 }
518
519 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
520 {
521 return false;
522 }
523
524 void draw (rxvt_drawable &d, int x, int y,
525 const text_t *text, int len,
526 int fg, int bg)
527 {
528 while (len)
529 {
530 int fid = fs->find_font_idx (*text);
531 int w = 1;
532 while (w < len && text[w] == NOCHAR)
533 w++;
534 (*fs)[fid]->draw (d, x, y, text, w, fg, bg);
535 text += w;
536 len -= w;
537 x += term->fwidth * w;
538 }
539 }
540};
475 541
476///////////////////////////////////////////////////////////////////////////// 542/////////////////////////////////////////////////////////////////////////////
477 543
478struct rxvt_font_x11 : rxvt_font { 544struct rxvt_font_x11 : rxvt_font {
479 rxvt_font_x11 () { f = 0; } 545 rxvt_font_x11 () { f = 0; }
480 546
481 void clear (); 547 void clear ();
482 548
483 rxvt_fontprop properties (); 549 rxvt_fontprop properties ();
484 550
485 bool load (const rxvt_fontprop &prop); 551 bool load (const rxvt_fontprop &prop, bool force_prop);
486 552
487 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful); 553 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
488 554
489 void draw (rxvt_drawable &d, int x, int y, 555 void draw (rxvt_drawable &d, int x, int y,
490 const text_t *text, int len, 556 const text_t *text, int len,
491 int fg, int bg); 557 int fg, int bg);
492 558
493 bool slow; // wether this is a proportional font or has other funny characteristics 559 bool slow; // whether this is a proportional font or has other funny characteristics
494 XFontStruct *f; 560 XFontStruct *f;
495 codeset cs;
496 bool enc2b, encm; 561 bool enc2b, encm;
497 562
498 char *get_property (XFontStruct *f, const char *property, const char *repl) const; 563 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); 564 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); 565 bool set_properties (rxvt_fontprop &p, XFontStruct *f);
501 bool set_properties (rxvt_fontprop &p, const char *name); 566 bool set_properties (rxvt_fontprop &p, const char *name);
502}; 567};
503 568
504char * 569char *
505rxvt_font_x11::get_property (XFontStruct *f, const char *property, const char *repl) const 570rxvt_font_x11::get_property (XFontStruct *f, Atom property, const char *repl) const
506{ 571{
507 unsigned long value; 572 unsigned long value;
508 573
509 if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value)) 574 if (XGetFontProperty (f, property, &value))
510 return XGetAtomName (DISPLAY, value); 575 return XGetAtomName (term->dpy, value);
511 else 576 else
512 return rxvt_strdup (repl); 577 return repl ? strdup (repl) : 0;
513} 578}
514 579
515rxvt_fontprop 580rxvt_fontprop
516rxvt_font_x11::properties () 581rxvt_font_x11::properties ()
517{ 582{
… …
521} 586}
522 587
523bool 588bool
524rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth) 589rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth)
525{ 590{
526 p.width = avgwidth ? (avgwidth + 1) / 10 : (height + 1) / 2; 591 p.width = width != rxvt_fontprop::unset ? width
592 : avgwidth ? (avgwidth + 1) / 10
593 : (height + 1) / 2;
527 p.height = height; 594 p.height = height;
595 p.ascent = rxvt_fontprop::unset;
528 p.weight = *weight == 'B' || *weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium; 596 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; 597 p.slant = *slant == 'r' || *slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic;
530 598
531 return true; 599 return true;
532} 600}
… …
535rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f) 603rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)
536{ 604{
537 unsigned long height; 605 unsigned long height;
538 606
539#if 0 607#if 0
540 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "PIXEL_SIZE", 0), &height)) 608 if (!XGetFontProperty (f, XInternAtom (term->dpy, "PIXEL_SIZE", 0), &height))
541 return false; 609 return false;
542#else 610#else
543 height = f->ascent + f->descent; 611 height = f->ascent + f->descent;
544#endif 612#endif
545 613
546 unsigned long avgwidth; 614 unsigned long avgwidth;
547 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth)) 615 if (!XGetFontProperty (f, term->xa [XA_AVERAGE_WIDTH], &avgwidth))
548 avgwidth = 0; 616 avgwidth = 0;
549 617
550 char *weight = get_property (f, "WEIGHT_NAME", "medium"); 618 char *weight = get_property (f, term->xa [XA_WEIGHT_NAME], "medium");
551 char *slant = get_property (f, "SLANT", "r"); 619 char *slant = get_property (f, term->xa [XA_SLANT], "r");
552 620
553 set_properties (p, height, weight, slant, avgwidth); 621 set_properties (p, height, weight, slant, avgwidth);
554 622
555 free (weight); 623 free (weight);
556 free (slant); 624 free (slant);
557 625
626 p.ascent = f->ascent;
627
558 return true; 628 return true;
559} 629}
560 630
561bool 631bool
562rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name) 632rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name)
563{ 633{
634 dTermDisplay;
564 int slashes = 0; 635 int slashes = 0;
565 const char *comp[13]; 636 const char *comp[13];
566 637
567 for (const char *c = name; *c; c++) 638 for (const char *c = name; *c; c++)
568 if (*c == '-') 639 if (*c == '-')
… …
576 if (slashes >= 13 647 if (slashes >= 13
577 && (*comp[ 6] >= '1' && *comp[ 6] <= '9') 648 && (*comp[ 6] >= '1' && *comp[ 6] <= '9')
578 && (*comp[11] >= '0' && *comp[11] <= '9')) 649 && (*comp[11] >= '0' && *comp[11] <= '9'))
579 return set_properties (p, atoi (comp[6]), comp[2], comp[3], atoi (comp[11])); 650 return set_properties (p, atoi (comp[6]), comp[2], comp[3], atoi (comp[11]));
580 651
581 XFontStruct *f = XLoadQueryFont (DISPLAY, name); 652 XFontStruct *f = XLoadQueryFont (disp, name);
582 653
583 if (f) 654 if (f)
584 { 655 {
585 // the font should really exist now. if not, we have a problem 656 // 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). 657 // (e.g. if the user did xset fp rehash just when we were searching fonts).
587 // in that case, just return garbage. 658 // in that case, just return garbage.
588 bool ret = set_properties (p, f); 659 bool ret = set_properties (p, f);
589 XFreeFont (DISPLAY, f); 660 XFreeFont (disp, f);
590 return ret; 661 return ret;
591 } 662 }
592 else 663 else
593 return false; 664 return false;
594} 665}
595 666
596// fix the size of scalable fonts 667// fix the size of scalable fonts
597static bool 668static bool
598replace_field (char *buf, const char *name, int index, const char old, const char *replace) 669replace_field (char **ptr, const char *name, int index, const char old, const char *replace)
599{ 670{
600 int slashes = 0; 671 int slashes = 0;
601 const char *field, *end; 672 const char *field, *end;
602 673
603 for (const char *c = name; *c; c++) 674 for (const char *c = name; *c; c++)
… …
613 break; 684 break;
614 } 685 }
615 686
616 if (slashes >= 13 && (!old || *field == old)) 687 if (slashes >= 13 && (!old || *field == old))
617 { 688 {
618 // TODO: check for overflow in font-name 689 size_t len = field - name;
619 strncpy (buf, name, field - name); 690 *ptr = (char *)malloc (len + strlen (replace) + strlen (end) + 1);
620 buf += field - name; 691 memcpy (*ptr, name, len);
621 strcpy (buf, replace); 692 strcpy (*ptr + len, replace);
622 strcat (buf, end); 693 strcat (*ptr, end);
623 694
624 return true; 695 return true;
625 } 696 }
626 else 697 else
627 { 698 {
628 strcpy (buf, name); 699 *ptr = strdup (name);
629 700
630 return false; 701 return false;
631 } 702 }
632} 703}
633 704
634bool 705bool
635rxvt_font_x11::load (const rxvt_fontprop &prop) 706rxvt_font_x11::load (const rxvt_fontprop &prop, bool force_prop)
636{ 707{
637 Display *disp = DISPLAY; 708 dTermDisplay;
638 709
639 clear (); 710 clear ();
640 711
641 char field_str[64]; // enough for 128 bits 712 char field_str[64]; // enough for 128 bits
642 713
643 // first morph the font if required 714 // first morph the font if required
644 if (prop.weight != rxvt_fontprop::unset 715 if (force_prop)
645 || prop.slant != rxvt_fontprop::unset)
646 { 716 {
647 char fname[1024]; 717 char *fname;
648 718
649 if (name[0] != '-') 719 if (name[0] != '-')
650 { 720 {
651 f = XLoadQueryFont (disp, name); 721 f = XLoadQueryFont (disp, name);
652 722
653 if (!f) 723 if (!f)
654 return false; 724 return false;
655 725
656 char *new_name = get_property (f, "FONT", name); 726 char *new_name = get_property (f, XA_FONT, 0);
657 727
658 if (new_name) 728 if (new_name)
659 set_name (new_name); 729 set_name (new_name);
660 else 730 else
661 rxvt_warn ("font '%s' has no FONT property, continuing without.", name); 731 rxvt_warn ("font '%s' has no FONT property, continuing without.\n", name);
662 732
663 XFreeFont (disp, f); 733 XFreeFont (disp, f);
664 f = 0; 734 f = 0;
665 } 735 }
666 736
667 if (prop.weight != rxvt_fontprop::unset) 737 if (prop.weight != rxvt_fontprop::unset)
668 { 738 {
669 replace_field (fname, name, 2, 0, 739 replace_field (&fname, name, 2, 0,
670 prop.weight < rxvt_fontprop::bold 740 prop.weight < rxvt_fontprop::bold
671 ? "medium" : "bold"); 741 ? "medium" : "bold");
672 set_name (strdup (fname)); 742 set_name (fname);
673 } 743 }
674 744
675 if (prop.slant != rxvt_fontprop::unset) 745 if (prop.slant != rxvt_fontprop::unset)
676 { 746 {
677 replace_field (fname, name, 3, 0, 747 replace_field (&fname, name, 3, 0,
678 prop.slant < rxvt_fontprop::italic 748 prop.slant < rxvt_fontprop::italic
679 ? "r" : "i"); // TODO: handle "o"blique, too 749 ? "r" : "i"); // TODO: handle "o"blique, too
680 set_name (strdup (fname)); 750 set_name (fname);
681 } 751 }
682 } 752 }
683 753
684 sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset 754 sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset
685 ? 0 : prop.height); 755 ? 0 : prop.height);
… …
710 font_weight *fonts = new font_weight[count]; 780 font_weight *fonts = new font_weight[count];
711 781
712 for (int i = 0; i < count; i++) 782 for (int i = 0; i < count; i++)
713 { 783 {
714 rxvt_fontprop p; 784 rxvt_fontprop p;
715 char fname[1024]; 785 char *fname;
716 786
717 int diff = 0; 787 int diff = 0;
718 788
719 if (replace_field (fname, list[i], 6, '0', field_str)) 789 if (replace_field (&fname, list[i], 6, '0', field_str))
720 diff += 10; // slightly penalize scalable fonts 790 diff += 10; // slightly penalize scalable fonts
791 else
792 {
793 free (fname);
721 else if (replace_field (fname, list[i], 11, '0', "0")) 794 if (replace_field (&fname, list[i], 11, '0', "0"))
722 diff += 300; // more heavily penalize what looks like scaled bitmap fotns 795 diff += 300; // more heavily penalize what looks like scaled bitmap fonts
796 }
723 797
724 if (!set_properties (p, fname)) 798 if (!set_properties (p, fname)
799 // also weed out too large fonts
800 || (prop.height != rxvt_fontprop::unset
801 && p.height > prop.height))
802 {
803 free (fname);
725 continue; 804 continue;
726 805 }
727 if (prop.height != rxvt_fontprop::unset
728 && p.height > prop.height) // weed out too large fonts
729 continue;
730 806
731 if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128; 807 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); 808 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); 809 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); 810 //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width);
735 811
736 fonts[i].name = strdup (fname); 812 fonts[i].name = fname;
737 fonts[i].diff = diff; 813 fonts[i].diff = diff;
738 } 814 }
739 815
740 XFreeFontNames (list); 816 XFreeFontNames (list);
741 817
742 // this loop only iterates when the guessed font-size is too small 818 // this loop only iterates when the guessed font-size is too small
743 for (;;) 819 for (;;)
744 { 820 {
745 font_weight *best = fonts + count - 1; 821 font_weight *best = fonts;
746 822
747 for (font_weight *w = best; w-- > fonts; ) 823 for (font_weight *w = fonts + 1; w < fonts + count; w++)
748 if (w->diff <= best->diff) 824 if (w->diff < best->diff)
749 best = w; 825 best = w;
750 826
751 if (!best->name 827 if (!best->name
752 || !(f = XLoadQueryFont (disp, best->name))) 828 || !(f = XLoadQueryFont (disp, best->name)))
753 break; 829 break;
… …
770 delete [] fonts; 846 delete [] fonts;
771 847
772 if (!f) 848 if (!f)
773 return false; 849 return false;
774 850
775 char *registry = get_property (f, "CHARSET_REGISTRY", 0); 851 char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0);
776 char *encoding = get_property (f, "CHARSET_ENCODING", 0); 852 char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0);
853
854 cs = CS_UNKNOWN;
777 855
778 if (registry && encoding) 856 if (registry && encoding)
779 { 857 {
780 char charset[64]; 858 char charset[64];
781 snprintf (charset, 64, "%s-%s", registry, encoding); 859 snprintf (charset, 64, "%s-%s", registry, encoding);
782 860
783 cs = codeset_from_name (charset); 861 cs = codeset_from_name (charset);
784 } 862
785 else 863 if (cs == CS_UNKNOWN)
864 rxvt_warn ("%s: cannot deduce encoding from registry/encoding properties \"%s\", ignoring font.\n", name, charset);
786 { 865 }
866
867 free (registry);
868 free (encoding);
869
870 if (cs == CS_UNKNOWN)
871 {
787 const char *charset = get_property (f, "FONT", 0); 872 char *value = get_property (f, XA_FONT, 0);
873 const char *charset = value;
788 874
789 if (!charset) 875 if (!charset)
790 charset = name; 876 charset = name;
791 877
792 int count = 13; 878 int count = 13;
793 while (*charset) 879 while (*charset)
794 if (*charset++ == '-' && !--count) 880 if (*charset++ == '-' && !--count)
795 break; 881 break;
796 882
797 cs = codeset_from_name (charset); 883 cs = codeset_from_name (charset);
884 if (cs == CS_UNKNOWN)
885 rxvt_warn ("%s: cannot deduce encoding from font name property \"%s\", ignoring font.\n", name, charset);
886
887 free (value);
888 }
889
890 if (cs == CS_UNKNOWN)
798 } 891 {
799 892 clear ();
800 free (registry); 893 return false;
801 free (encoding); 894 }
802 895
803 if (cs == CS_UNICODE) 896 if (cs == CS_UNICODE)
804 cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font 897 cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font
805 898
806 encm = f->min_byte1 != 0 || f->max_byte1 != 0; 899 encm = f->min_byte1 != 0 || f->max_byte1 != 0;
807 enc2b = encm || f->max_char_or_byte2 > 255; 900 enc2b = encm || f->max_char_or_byte2 > 255;
808 901
809 slow = false; 902 slow = false;
810 903
811#if 1 // only used for slow detection, TODO optimize 904#if 1 // only used for slow detection, TODO optimize
812 if (f->min_bounds.width == f->max_bounds.width) 905 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; 906 width = f->max_bounds.width;
816 else 907 else
817 { 908 {
818 slow = true; 909 slow = true;
819 910
820 int N = f->max_char_or_byte2 - f->min_char_or_byte2; 911 int N = f->max_char_or_byte2 - f->min_char_or_byte2;
821 912
822 if (encm) 913 if (encm)
823 N += (f->max_byte1 - f->min_byte1) 914 N += (f->max_byte1 - f->min_byte1)
824 * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1); 915 * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1);
825 916
826 while (N) 917 while (N)
827 { 918 {
828 if (f->per_char[N].width > width) 919 if (f->per_char[N].width > width)
829 width = f->per_char[N].width; 920 width = f->per_char[N].width;
830 921
… …
833 } 924 }
834#endif 925#endif
835 926
836 width = 1; 927 width = 1;
837 928
838 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 929 for (uint16_t *t = extent_test_chars; t < extent_test_chars + ecb_array_length (extent_test_chars); t++)
839 { 930 {
840 if (cs != CS_UNICODE
841 && *t > 0x100
842 && FROM_UNICODE (cs, *t) == NOCHAR) 931 if (FROM_UNICODE (cs, *t) == NOCHAR)
843 continue; 932 continue;
844 933
845 // ignore characters we wouldn't use anyways 934 // ignore characters we wouldn't use anyways
846 bool careful; 935 bool careful;
847 if (!has_char (*t, &prop, careful)) 936 if (!has_char (*t, &prop, careful))
848 continue; 937 continue;
849 938
850 XChar2b ch = { *t >> 8, *t }; 939 // the casts are needed in C++11 (see 8.5.1)
940 XChar2b ch = { (unsigned char)(*t >> 8), (unsigned char)*t };
851 941
852 XCharStruct g; 942 XCharStruct g;
853 int dir_ret, asc_ret, des_ret; 943 int dir_ret, asc_ret, des_ret;
854 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); 944 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);
855 945
856 int wcw = wcwidth (*t); if (wcw > 0) g.width = g.width / wcw; 946 int wcw = WCWIDTH (*t);
947 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
857 948
858 if (width < g.width) width = g.width; 949 if (width < g.width) width = g.width;
859 }
860
861 if (cs == CS_UNKNOWN)
862 { 950 }
863 fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);
864 951
952#if 0 // do it per-character
953 if (prop && width > prop->width)
954 {
865 clear (); 955 clear ();
866 return false; 956 return false;
867 } 957 }
868
869#if 0 // do it per-character
870 if (prop && width > prop->width)
871 {
872 clear ();
873 return false;
874 }
875#endif 958#endif
876 959
877 return true; 960 return true;
878} 961}
879 962
880void 963void
881rxvt_font_x11::clear () 964rxvt_font_x11::clear ()
882{ 965{
883 if (f) 966 if (f)
884 { 967 {
885 XFreeFont (DISPLAY, f); 968 XFreeFont (term->dpy, f);
886 f = 0; 969 f = 0;
887 } 970 }
888} 971}
889 972
890bool 973bool
891rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) 974rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
892{ 975{
976 careful = false;
977
893 uint32_t ch = FROM_UNICODE (cs, unicode); 978 uint32_t ch = FROM_UNICODE (cs, unicode);
894 979
895 if (ch == NOCHAR) 980 if (ch == NOCHAR)
896 return false; 981 return false;
897 982
898 /* check wether the character exists in _this_ font. horrible. */ 983 /* check whether the character exists in _this_ font. horrible. */
899 XCharStruct *xcs; 984 XCharStruct *xcs;
900 985
901 if (encm) 986 if (encm)
902 { 987 {
903 unsigned char byte1 = ch >> 8; 988 unsigned char byte1 = ch >> 8;
… …
933 return false; 1018 return false;
934 1019
935 if (!prop || prop->width == rxvt_fontprop::unset) 1020 if (!prop || prop->width == rxvt_fontprop::unset)
936 return true; 1021 return true;
937 1022
938 // check character against base font bounding box 1023 // check whether character overlaps previous/next character
939 int w = xcs->width; 1024 int w = xcs->rbearing - xcs->lbearing;
940 int wcw = wcwidth (unicode); 1025 int wcw = max (WCWIDTH (unicode), 1);
941 if (wcw > 0) w /= wcw;
942 1026
943 careful = w > prop->width; 1027 careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw;
944 if (careful && w > prop->width * MAX_OVERLAP >> 2) 1028
1029 if (careful && !OVERLAP_OK (w, wcw, prop))
945 return false; 1030 return false;
946 1031
947 return true; 1032 return true;
948} 1033}
949 1034
… …
955 // this looks like a mess /. 1040 // this looks like a mess /.
956 // and it is a mess /. 1041 // and it is a mess /.
957 // yet we are trying to be perfect /. 1042 // yet we are trying to be perfect /.
958 // but the result still isn't perfect /. 1043 // but the result still isn't perfect /.
959 1044
1045 dTermDisplay;
1046 dTermGC;
1047
960 bool slow = this->slow 1048 bool slow = this->slow
961 || width != r->TermWin.fwidth 1049 || width != term->fwidth
962 || height != r->TermWin.fheight; 1050 || height != term->fheight
1051 || ascent != f->ascent;
963 1052
964 int base = ascent; // sorry, incorrect: r->TermWin.fbase; 1053 int base = ascent; // sorry, incorrect: term->fbase;
965 1054
966 XGCValues v; 1055 XGCValues v;
967 v.foreground = r->pix_colors[fg]; 1056 v.foreground = term->pix_colors[fg];
968 v.font = f->fid; 1057 v.font = f->fid;
969 1058
970 if (enc2b) 1059 if (enc2b)
971 { 1060 {
972 const XChar2b *xc = enc_xchar2b (text, len, cs, slow); 1061 const XChar2b *xc = enc_xchar2b (text, len, cs, slow);
973 1062
974 if (bg == Color_bg && !slow) 1063 if (bg == Color_bg && !slow)
975 { 1064 {
976 v.background = r->pix_colors[bg]; 1065 v.background = term->pix_colors[bg];
977 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); 1066 XChangeGC (disp, gc, GCForeground | GCBackground | GCFont, &v);
978 XDrawImageString16 (d.display->display, d, TGC, x, y + base, xc, len); 1067 XDrawImageString16 (disp, d, gc, x, y + base, xc, len);
979 } 1068 }
980 else 1069 else
981 { 1070 {
982 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 1071 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
983 1072
984 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v); 1073 XChangeGC (disp, gc, GCForeground | GCFont, &v);
985 1074
986 if (slow) 1075 if (slow)
987 { 1076 {
988 do 1077 do
989 { 1078 {
990 if (xc->byte1 || xc->byte2) 1079 if (xc->byte1 || xc->byte2)
991 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, 1); 1080 XDrawString16 (disp, d, gc, x, y + base, xc, 1);
992 1081
993 x += r->TermWin.fwidth; 1082 x += term->fwidth;
994 xc++; len--; 1083 xc++; len--;
995 } 1084 }
996 while (len); 1085 while (len);
997 } 1086 }
998 else 1087 else
999 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, len); 1088 XDrawString16 (disp, d, gc, x, y + base, xc, len);
1000 } 1089 }
1001 } 1090 }
1002 else 1091 else
1003 { 1092 {
1004 const char *xc = enc_char (text, len, cs, slow); 1093 const char *xc = enc_char (text, len, cs, slow);
1005 1094
1006 if (bg == Color_bg && !slow) 1095 if (bg == Color_bg && !slow)
1007 { 1096 {
1008 v.background = r->pix_colors[bg]; 1097 v.background = term->pix_colors[bg];
1009 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); 1098 XChangeGC (disp, gc, GCForeground | GCBackground | GCFont, &v);
1010 XDrawImageString (d.display->display, d, TGC, x, y + base, xc, len); 1099 XDrawImageString (disp, d, gc, x, y + base, xc, len);
1011 } 1100 }
1012 else 1101 else
1013 { 1102 {
1014 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 1103 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
1015 1104
1016 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v); 1105 XChangeGC (disp, gc, GCForeground | GCFont, &v);
1017 1106
1018 if (slow) 1107 if (slow)
1019 { 1108 {
1020 do 1109 do
1021 { 1110 {
1022 if (*xc) 1111 if (*xc)
1023 XDrawString (d.display->display, d, TGC, x, y + base, xc, 1); 1112 XDrawString (disp, d, gc, x, y + base, xc, 1);
1024 1113
1025 x += r->TermWin.fwidth; 1114 x += term->fwidth;
1026 xc++; len--; 1115 xc++; len--;
1027 } 1116 }
1028 while (len); 1117 while (len);
1029 } 1118 }
1030 else 1119 else
1031 XDrawString (d.display->display, d, TGC, x, y + base, xc, len); 1120 XDrawString (disp, d, gc, x, y + base, xc, len);
1032 } 1121 }
1033 } 1122 }
1034} 1123}
1035 1124
1036///////////////////////////////////////////////////////////////////////////// 1125/////////////////////////////////////////////////////////////////////////////
… …
1042 1131
1043 void clear (); 1132 void clear ();
1044 1133
1045 rxvt_fontprop properties (); 1134 rxvt_fontprop properties ();
1046 1135
1047 bool load (const rxvt_fontprop &prop); 1136 bool load (const rxvt_fontprop &prop, bool force_prop);
1048 1137
1049 void draw (rxvt_drawable &d, int x, int y, 1138 void draw (rxvt_drawable &d, int x, int y,
1050 const text_t *text, int len, 1139 const text_t *text, int len,
1051 int fg, int bg); 1140 int fg, int bg);
1052 1141
1053 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &carefull); 1142 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
1054 1143
1055protected: 1144protected:
1056 XftFont *f; 1145 XftFont *f;
1057}; 1146};
1058 1147
1059void 1148void
1060rxvt_font_xft::clear () 1149rxvt_font_xft::clear ()
1061{ 1150{
1062 if (f) 1151 if (f)
1063 { 1152 {
1064 XftFontClose (DISPLAY, f); 1153 XftFontClose (term->dpy, f);
1065 f = 0; 1154 f = 0;
1066 } 1155 }
1067} 1156}
1068 1157
1069rxvt_fontprop 1158rxvt_fontprop
… …
1073 1162
1074 FT_Face face = XftLockFace (f); 1163 FT_Face face = XftLockFace (f);
1075 1164
1076 p.width = width; 1165 p.width = width;
1077 p.height = height; 1166 p.height = height;
1167 p.ascent = ascent;
1078 p.weight = face->style_flags & FT_STYLE_FLAG_BOLD 1168 p.weight = face->style_flags & FT_STYLE_FLAG_BOLD
1079 ? rxvt_fontprop::bold : rxvt_fontprop::medium; 1169 ? rxvt_fontprop::bold : rxvt_fontprop::medium;
1080 p.slant = face->style_flags & FT_STYLE_FLAG_ITALIC 1170 p.slant = face->style_flags & FT_STYLE_FLAG_ITALIC
1081 ? rxvt_fontprop::italic : rxvt_fontprop::roman; 1171 ? rxvt_fontprop::italic : rxvt_fontprop::roman;
1082 1172
… …
1084 1174
1085 return p; 1175 return p;
1086} 1176}
1087 1177
1088bool 1178bool
1089rxvt_font_xft::load (const rxvt_fontprop &prop) 1179rxvt_font_xft::load (const rxvt_fontprop &prop, bool force_prop)
1090{ 1180{
1091 Display *disp = DISPLAY; 1181 dTermDisplay;
1092 1182
1093 clear (); 1183 clear ();
1094 1184
1095 FcPattern *p = FcNameParse ((FcChar8 *) name); 1185 FcPattern *p = FcNameParse ((FcChar8 *) name);
1096 1186
… …
1103 && (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch 1193 && (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch
1104 && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch)) 1194 && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch))
1105 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height); 1195 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);
1106 1196
1107 if (prop.weight != rxvt_fontprop::unset 1197 if (prop.weight != rxvt_fontprop::unset
1108 && FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch) 1198 && (force_prop || FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch))
1109 FcPatternAddInteger (p, FC_WEIGHT, prop.weight); 1199 FcPatternAddInteger (p, FC_WEIGHT, prop.weight);
1110 1200
1111 if (prop.slant != rxvt_fontprop::unset 1201 if (prop.slant != rxvt_fontprop::unset
1112 && FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch) 1202 && (force_prop || FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch))
1113 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1203 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1114 1204
1115#if 0 // clipping unfortunately destroys our precious double-width-characters 1205#if 0 // clipping unfortunately destroys our precious double-width-characters
1116 // clip width, we can't do better, or can we? 1206 // clip width, we can't do better, or can we?
1117 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) 1207 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
1118 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop->width); 1208 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width);
1119#endif 1209#endif
1120 1210
1121 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch) 1211 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch)
1122 FcPatternAddBool (p, FC_MINSPACE, 1); 1212 FcPatternAddBool (p, FC_MINSPACE, 1);
1123 1213
1124 // store generated name so iso14755 view gives better results 1214 // store generated name so iso14755 view gives better results
1125 set_name ((char *)FcNameUnparse (p)); 1215 set_name ((char *)FcNameUnparse (p));
1126 1216
1127 XftResult result; 1217 XftResult result;
1128 FcPattern *match = XftFontMatch (disp, r->display->screen, p, &result); 1218 FcPattern *match = XftFontMatch (disp, term->display->screen, p, &result);
1129 1219
1130 FcPatternDestroy (p); 1220 FcPatternDestroy (p);
1131 1221
1132 if (!match) 1222 if (!match)
1133 return false; 1223 return false;
… …
1135 int ftheight = 0; 1225 int ftheight = 0;
1136 bool success = true; 1226 bool success = true;
1137 1227
1138 for (;;) 1228 for (;;)
1139 { 1229 {
1230 p = FcPatternDuplicate (match);
1140 f = XftFontOpenPattern (disp, FcPatternDuplicate (match)); 1231 f = XftFontOpenPattern (disp, p);
1141 1232
1142 if (!f) 1233 if (!f)
1143 { 1234 {
1235 FcPatternDestroy (p);
1144 success = false; 1236 success = false;
1145 break; 1237 break;
1146 } 1238 }
1147 1239
1148 FT_Face face = XftLockFace (f); 1240 FT_Face face = XftLockFace (f);
… …
1154 1246
1155 bool scalable = face->face_flags & FT_FACE_FLAG_SCALABLE; 1247 bool scalable = face->face_flags & FT_FACE_FLAG_SCALABLE;
1156 1248
1157 XftUnlockFace (f); 1249 XftUnlockFace (f);
1158 1250
1159 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 1251 int glheight = height;
1252
1253 for (uint16_t *t = extent_test_chars; t < extent_test_chars + ecb_array_length (extent_test_chars); t++)
1160 { 1254 {
1161 FcChar16 ch = *t; 1255 FcChar16 ch = *t;
1162 1256
1163 if (cs != CS_UNICODE 1257 if (cs != CS_UNICODE
1164 && ch > 0x100 1258 && ch > 0x100
… …
1171 continue; 1265 continue;
1172 1266
1173 XGlyphInfo g; 1267 XGlyphInfo g;
1174 XftTextExtents16 (disp, f, &ch, 1, &g); 1268 XftTextExtents16 (disp, f, &ch, 1, &g);
1175 1269
1270 g.width -= g.x;
1271
1176 int wcw = wcwidth (ch); 1272 int wcw = WCWIDTH (ch);
1177 if (wcw > 0) g.width = g.width / wcw; 1273 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
1178 1274
1179 if (width < g.width) width = g.width; 1275 if (width < g.width ) width = g.width;
1180 if (height < g.height) height = g.height; 1276 if (height < g.height ) height = g.height;
1277 if (glheight < g.height - g.y) glheight = g.height - g.y;
1278 }
1279
1280 if (!width)
1281 {
1282 rxvt_warn ("unable to calculate font width for '%s', ignoring.\n", name);
1283
1284 XftFontClose (disp, f);
1285 f = 0;
1286
1287 success = false;
1288 break;
1181 } 1289 }
1182 1290
1183 if (prop.height == rxvt_fontprop::unset 1291 if (prop.height == rxvt_fontprop::unset
1184 || height <= prop.height 1292 || (height <= prop.height && glheight <= prop.height)
1185 || height <= 2 1293 || height <= 2
1186 || !scalable) 1294 || !scalable)
1187 break; 1295 break;
1188 1296
1189 if (ftheight) 1297 if (ftheight)
… …
1196 ftheight -= height - prop.height; 1304 ftheight -= height - prop.height;
1197 } 1305 }
1198 else 1306 else
1199 ftheight = prop.height - 1; 1307 ftheight = prop.height - 1;
1200 1308
1201 XftFontClose (disp, f); 1309 XftFontClose (disp, f);
1202 FcPatternDel (match, FC_PIXEL_SIZE); 1310 FcPatternDel (match, FC_PIXEL_SIZE);
1203 FcPatternAddInteger (match, FC_PIXEL_SIZE, ftheight); 1311 FcPatternAddInteger (match, FC_PIXEL_SIZE, ftheight);
1204 } 1312 }
1205 1313
1206 FcPatternDestroy (match); 1314 FcPatternDestroy (match);
1207 1315
1208#if 0 // do it per-character 1316#if 0 // do it per-character
… …
1215 1323
1216 return success; 1324 return success;
1217} 1325}
1218 1326
1219bool 1327bool
1220rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) 1328rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
1221{ 1329{
1222 careful = false; 1330 careful = false;
1223 1331
1224 if (!XftCharExists (DISPLAY, f, unicode)) 1332 if (!XftCharExists (term->dpy, f, unicode))
1225 return false; 1333 return false;
1226 1334
1227 if (!prop || prop->width == rxvt_fontprop::unset) 1335 if (!prop || prop->width == rxvt_fontprop::unset)
1228 return true; 1336 return true;
1229 1337
1230 // check character against base font bounding box 1338 // check character against base font bounding box
1231 FcChar32 ch = unicode; 1339 FcChar32 ch = unicode;
1232 XGlyphInfo g; 1340 XGlyphInfo g;
1233 XftTextExtents32 (DISPLAY, f, &ch, 1, &g); 1341 XftTextExtents32 (term->dpy, f, &ch, 1, &g);
1234 1342
1235 int w = g.width; 1343 int w = g.width - g.x;
1236 int wcw = wcwidth (unicode); 1344 int wcw = max (WCWIDTH (unicode), 1);
1237 if (wcw > 0) w /= wcw;
1238 1345
1239 careful = w > prop->width; 1346 careful = g.x > 0 || w > prop->width * wcw;
1240 if (careful && w > prop->width * MAX_OVERLAP >> 2) 1347
1348 if (careful && !OVERLAP_OK (w, wcw, prop))
1349 return false;
1350
1351 // this weeds out _totally_ broken fonts, or glyphs
1352 if (!OVERLAP_OK (g.xOff, wcw, prop))
1241 return false; 1353 return false;
1242 1354
1243 return true; 1355 return true;
1244} 1356}
1245 1357
1246void 1358void
1247rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, 1359rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1248 const text_t *text, int len, 1360 const text_t *text, int len,
1249 int fg, int bg) 1361 int fg, int bg)
1250{ 1362{
1251 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
1252
1253 int base = ascent; // should be fbase, but that is incorrect
1254
1255 XGlyphInfo extents; 1363 XGlyphInfo extents;
1256 FcChar32 *enc = (FcChar32 *) get_enc_buf (len * sizeof (FcChar32)); 1364 XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len);
1257 FcChar32 *ep = enc; 1365 XftGlyphSpec *ep = enc;
1258 int ewidth = 0; 1366
1367 dTermDisplay;
1368 dTermGC;
1369
1370 int w = term->fwidth * len;
1371 int h = term->fheight;
1372
1373 bool buffered = bg >= Color_transparent
1374 && term->option (Opt_buffered);
1375
1376 // cut trailing spaces
1377 while (len && text [len - 1] == ' ')
1378 len--;
1379
1380 int x_ = buffered ? 0 : x;
1381 int y_ = buffered ? 0 : y;
1259 1382
1260 while (len) 1383 while (len)
1261 { 1384 {
1262 int cwidth = r->TermWin.fwidth; 1385 int cwidth = term->fwidth;
1263 FcChar32 fc = *text++; len--; 1386 FcChar32 fc = *text++; len--;
1264 1387
1265 while (len && *text == NOCHAR) 1388 while (len && *text == NOCHAR)
1266 text++, len--, cwidth += r->TermWin.fwidth; 1389 text++, len--, cwidth += term->fwidth;
1390
1391 if (fc != ' ') // skip spaces
1267 1392 {
1268 if (fc == ' ' && ep == enc) // skip leading spaces 1393 FT_UInt glyph = XftCharIndex (disp, f, fc);
1394 XftGlyphExtents (disp, f, &glyph, 1, &extents);
1395
1396 ep->glyph = glyph;
1397 ep->x = x_ + (cwidth - extents.xOff >> 1);
1398 ep->y = y_ + ascent;
1399
1400 if (extents.xOff == 0)
1401 ep->x = x_ + cwidth;
1402
1403 ep++;
1404 }
1405
1269 x += cwidth; 1406 x_ += cwidth;
1270 else 1407 }
1271 {
1272 FT_UInt gl = XftCharIndex (d.display->display, f, fc);
1273 XftGlyphExtents (d.display->display, f, &gl, 1, &extents);
1274 1408
1275 if (extents.xOff != cwidth) 1409 if (buffered)
1410 {
1411 if (ep != enc)
1412 {
1413 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1414
1415#ifdef HAVE_BG_PIXMAP
1416 Picture dst = 0; // the only assignment is done conditionally in the following if condition
1417
1418 if (term->bg_img
1419 && (bg == Color_transparent || bg == Color_bg
1420 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2))))))
1276 { 1421 {
1277 if (ewidth) 1422 int src_x = x, src_y = y;
1423
1424 if (term->bg_flags & rxvt_term::BG_IS_TRANSPARENT)
1278 { 1425 {
1279 XftDrawGlyphs (d, &r->pix_colors[fg].c, f,
1280 x, y + base, enc, ep - enc);
1281 x += ewidth; 1426 src_x += term->window_vt_x;
1282 1427 src_y += term->window_vt_y;
1283 ep = enc;
1284 ewidth = 0;
1285 } 1428 }
1286 1429
1287 if (extents.xOff > cwidth) 1430 if (term->bg_img->w >= src_x + w
1288 extents.xOff = cwidth; 1431 && term->bg_img->h >= src_y + h)
1432 {
1433 XCopyArea (disp, term->bg_img->pm, d2, gc,
1434 src_x, src_y, w, h, 0, 0);
1435 }
1436 else
1437 {
1438 XGCValues gcv;
1289 1439
1290 XftDrawGlyphs (d, &r->pix_colors[fg].c, f, 1440 gcv.fill_style = FillTiled;
1291 x + (cwidth - extents.xOff >> 1), 1441 gcv.tile = term->bg_img->pm;
1442 gcv.ts_x_origin = -src_x;
1443 gcv.ts_y_origin = -src_y;
1444
1445 XChangeGC (disp, gc,
1446 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
1292 y + base, &gl, 1); 1447 &gcv);
1293 x += cwidth; 1448
1449 XFillRectangle (disp, d2, gc, 0, 0, w, h);
1450
1451 gcv.fill_style = FillSolid;
1452 XChangeGC (disp, gc, GCFillStyle, &gcv);
1453 }
1454
1455 if (dst)
1456 {
1457 Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c);
1458
1459 // dst can only be set when bg >= 0
1460 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h);
1461 }
1294 } 1462 }
1295 else 1463 else
1296 { 1464#endif
1297 *ep++ = gl; 1465 XftDrawRect (d2, &term->pix_colors[bg >= 0 ? bg : Color_bg].c, 0, 0, w, h);
1298 ewidth += cwidth; 1466
1467 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);
1468 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
1299 } 1469 }
1300 } 1470 else
1471 clear_rect (d, x, y, w, h, bg);
1472 }
1473 else
1301 } 1474 {
1302 1475 clear_rect (d, x, y, w, h, bg);
1303 if (ep != enc)
1304 XftDrawGlyphs (d, &r->pix_colors[fg].c, f, 1476 XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc);
1305 x, y + base, enc, ep - enc); 1477 }
1306} 1478}
1479
1307#endif 1480#endif
1308 1481
1309///////////////////////////////////////////////////////////////////////////// 1482/////////////////////////////////////////////////////////////////////////////
1310 1483
1311rxvt_fontset::rxvt_fontset (rxvt_t r) 1484rxvt_fontset::rxvt_fontset (rxvt_term *term)
1312: r (r), fontdesc (0) 1485: fontdesc (0), term (term)
1313{ 1486{
1314 clear (); 1487 clear ();
1315} 1488}
1316 1489
1317rxvt_fontset::~rxvt_fontset () 1490rxvt_fontset::~rxvt_fontset ()
… …
1320} 1493}
1321 1494
1322void 1495void
1323rxvt_fontset::clear () 1496rxvt_fontset::clear ()
1324{ 1497{
1325 prop.width = prop.height = prop.weight = prop.slant 1498 prop.width = prop.height = prop.ascent = prop.weight = prop.slant
1326 = rxvt_fontprop::unset; 1499 = rxvt_fontprop::unset;
1500 force_prop = false;
1327 1501
1328 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) 1502 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1329 FONT_UNREF (*i); 1503 (*i)->unref ();
1330 1504
1331 for (pagemap **p = fmap.begin (); p != fmap.end (); p++) 1505 for (pagemap **p = fmap.begin (); p != fmap.end (); p++)
1332 delete *p; 1506 delete *p;
1333 1507
1334 free (fontdesc); fontdesc = 0; 1508 free (fontdesc); fontdesc = 0;
… …
1336 fonts.clear (); 1510 fonts.clear ();
1337 1511
1338 fallback = fallback_fonts; 1512 fallback = fallback_fonts;
1339} 1513}
1340 1514
1515void
1516rxvt_fontset::prepare_font (rxvt_font *font, codeset cs)
1517{
1518 font->set_term (term);
1519
1520 font->cs = cs;
1521 font->loaded = false;
1522}
1523
1341rxvt_font * 1524rxvt_font *
1342rxvt_fontset::new_font (const char *name, codeset cs) 1525rxvt_fontset::new_font (const char *name, codeset cs)
1343{ 1526{
1344 rxvt_font *f; 1527 rxvt_font *f;
1345 1528
1346 if (!name || !*name) 1529 if (!name || !*name)
1347 { 1530 {
1348 name = ""; 1531 name = "";
1349 f = new rxvt_font_default (this); 1532 f = new rxvt_font_default (this);
1350 } 1533 }
… …
1361 f = new rxvt_font_x11; 1544 f = new rxvt_font_x11;
1362 } 1545 }
1363 else 1546 else
1364 f = new rxvt_font_x11; 1547 f = new rxvt_font_x11;
1365 1548
1366 f->set_term (r);
1367 f->set_name (strdup (name)); 1549 f->set_name (strdup (name));
1368 1550 prepare_font (f, cs);
1369 f->cs = cs;
1370 f->loaded = false;
1371 1551
1372 return f; 1552 return f;
1373} 1553}
1374 1554
1375///////////////////////////////////////////////////////////////////////////// 1555/////////////////////////////////////////////////////////////////////////////
1556
1557void
1558rxvt_fontset::push_font (rxvt_font *font)
1559{
1560 // the fontCount index is reserved for the overflow font, it is only
1561 // necessary when we get fontCount or more fonts, as they cannot be
1562 // represented in the rendition.
1563 if (fonts.size () == fontCount)
1564 {
1565 rxvt_font *f = new rxvt_font_overflow (this);
1566
1567 prepare_font (f, CS_UNICODE);
1568 fonts.push_back (f);
1569 }
1570
1571 fonts.push_back (font);
1572}
1376 1573
1377void 1574void
1378rxvt_fontset::add_fonts (const char *desc) 1575rxvt_fontset::add_fonts (const char *desc)
1379{ 1576{
1380 if (desc) 1577 if (desc)
… …
1409 cs = codeset_from_name (spec + sizeof ("codeset=") - 1); 1606 cs = codeset_from_name (spec + sizeof ("codeset=") - 1);
1410 else 1607 else
1411 rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec); 1608 rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec);
1412 1609
1413 desc++; 1610 desc++;
1414 while (*desc <= ' ') desc++; 1611 while (*desc <= ' ' && *desc) desc++;
1415 } 1612 }
1416 1613
1417 end = strchr (desc, ','); 1614 end = strchr (desc, ',');
1418 if (!end) 1615 if (!end)
1419 end = desc + strlen (desc); 1616 end = desc + strlen (desc);
1420 1617
1421 if (end - desc < 511) 1618 if (end - desc < 511)
1422 { 1619 {
1423 strncpy (buf, desc, end - desc); 1620 memcpy (buf, desc, end - desc);
1424 buf[end - desc] = 0; 1621 buf[end - desc] = 0;
1425 1622
1426 fonts.push_back (new_font (buf, cs)); 1623 push_font (new_font (buf, cs));
1427 } 1624 }
1428 else 1625 else
1429 rxvt_warn ("fontset element too long (>511 bytes), ignored."); 1626 rxvt_warn ("fontset element too long (>511 bytes), ignored.\n");
1430 1627
1431 desc = end + 1; 1628 desc = end + 1;
1432 } 1629 }
1433 while (*end); 1630 while (*end);
1434 } 1631 }
… …
1443 if (fonts[i]->loaded) 1640 if (fonts[i]->loaded)
1444 return true; 1641 return true;
1445 1642
1446 fonts[i]->loaded = true; 1643 fonts[i]->loaded = true;
1447 1644
1448 if (!fonts[i]->load (prop)) 1645 if (!fonts[i]->load (prop, force_prop))
1449 { 1646 {
1450 fonts[i]->cs = CS_UNKNOWN; 1647 fonts[i]->cs = CS_UNKNOWN;
1451 return false; 1648 return false;
1452 } 1649 }
1453 1650
… …
1459{ 1656{
1460 clear (); 1657 clear ();
1461 1658
1462 fontdesc = strdup (desc); 1659 fontdesc = strdup (desc);
1463 1660
1464 fonts.push_back (new_font (0, CS_UNICODE)); 1661 push_font (new_font (0, CS_UNICODE));
1465 realize_font (0); 1662 realize_font (0);
1466 1663
1467 add_fonts (desc); 1664 add_fonts (desc);
1468 1665
1469 return true; 1666 return true;
… …
1478 1675
1479 return -1; 1676 return -1;
1480} 1677}
1481 1678
1482int 1679int
1483rxvt_fontset::find_font (unicode_t unicode) 1680rxvt_fontset::find_font_idx (unicode_t unicode)
1484{ 1681{
1485 if (unicode >= 1<<20) 1682 if (unicode >= 1<<20)
1486 return 0; 1683 return 0;
1487 1684
1488 unicode_t hi = unicode >> 8; 1685 unicode_t hi = unicode >> 8;
… …
1503 if (FROM_UNICODE (f->cs, unicode) == NOCHAR) 1700 if (FROM_UNICODE (f->cs, unicode) == NOCHAR)
1504 goto next_font; 1701 goto next_font;
1505 1702
1506 if (!realize_font (i)) 1703 if (!realize_font (i))
1507 goto next_font; 1704 goto next_font;
1705
1706 if (prop.ascent != rxvt_fontprop::unset)
1707 max_it (f->ascent, prop.ascent);
1508 } 1708 }
1509 1709
1510 if (f->cs == CS_UNKNOWN) 1710 if (f->cs == CS_UNKNOWN)
1511 goto next_font; 1711 goto next_font;
1512 1712
1513 bool careful; 1713 bool careful;
1514 if (f->has_char (unicode, &prop, careful)) 1714 if (f->has_char (unicode, &prop, careful))
1515 { 1715 {
1516 if (careful) 1716 i = (i << 1) | careful;
1517 i |= 128;
1518 1717
1519 goto found; 1718 goto found;
1520 } 1719 }
1521 1720
1522 next_font: 1721 next_font:
1523 if (i == fonts.size () - 1) 1722 if (i == fonts.size () - 1)
1524 { 1723 {
1525 if (fallback->name) 1724 if (fallback->name)
1526 { 1725 {
1527 // search through the fallback list 1726 // search through the fallback list
1528 fonts.push_back (new_font (fallback->name, fallback->cs)); 1727 push_font (new_font (fallback->name, fallback->cs));
1529 fallback++; 1728 fallback++;
1530 } 1729 }
1531 else 1730 else
1532 { 1731 {
1533 // try to find a new font. 1732 // try to find a new font.
… …
1551 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1750 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1552 FcPatternAddBool (p, FC_MINSPACE, 1); 1751 FcPatternAddBool (p, FC_MINSPACE, 1);
1553 //FcPatternAddBool (p, FC_ANTIALIAS, 1); 1752 //FcPatternAddBool (p, FC_ANTIALIAS, 1);
1554 1753
1555 XftResult result; 1754 XftResult result;
1556 FcPattern *match = XftFontMatch (DISPLAY, r->display->screen, p, &result); 1755 FcPattern *match = XftFontMatch (term->dpy, term->display->screen, p, &result);
1557 1756
1558 FcPatternDestroy (p); 1757 FcPatternDestroy (p);
1559 1758
1560 if (match) 1759 if (match)
1561 { 1760 {
… …
1564 FcPatternDestroy (match); 1763 FcPatternDestroy (match);
1565 1764
1566 if (find_font (font) < 0) 1765 if (find_font (font) < 0)
1567 { 1766 {
1568 char fontname[4096]; 1767 char fontname[4096];
1569 sprintf (fontname, "xft:%-.4090s", font); 1768 snprintf (fontname, sizeof (fontname), "xft:%s", font);
1570 1769
1571 fonts.push_back (new_font (fontname, CS_UNICODE)); 1770 push_font (new_font (fontname, CS_UNICODE));
1572 } 1771 }
1573 1772
1574 free (font); 1773 free (font);
1575 } 1774 }
1576#endif 1775#endif
… …
1588 while (hi >= fmap.size ()) 1787 while (hi >= fmap.size ())
1589 fmap.push_back (0); 1788 fmap.push_back (0);
1590 1789
1591 if (!fmap[hi]) 1790 if (!fmap[hi])
1592 { 1791 {
1593 fmap[hi] = (pagemap *)new pagemap; 1792 fmap[hi] = new pagemap;
1594 memset (fmap[hi], 0xff, sizeof (pagemap)); 1793 memset (fmap[hi], 0xff, sizeof (pagemap));
1595 } 1794 }
1596 1795
1597 (*fmap[hi])[unicode & 0xff] = i; 1796 (*fmap[hi])[unicode & 0xff] = i;
1598 } 1797 }
1599 1798
1600 return i; 1799 return i;
1601} 1800}
1602 1801
1603
1604

Diff Legend

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