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.84 by root, Tue Jan 17 05:47:42 2006 UTC vs.
Revision 1.160 by sf-exg, Wed Mar 31 21:52:05 2010 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: rxvtfont.C 2 * File: rxvtfont.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 4 * Copyright (c) 2003-2008 Marc Lehmann <pcg@goof.com>
5 * - original version. 5 * - original version.
6 * 6 *
7 * This program is free software; you can redistribute it and/or modify 7 * This program is free software; you can redistribute it and/or modify
8 * it under the terms of the GNU General Public License as published by 8 * it under the terms of the GNU General Public License as published by
9 * the Free Software Foundation; either version 2 of the License, or 9 * the Free Software Foundation; either version 2 of the License, or
… …
19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA 19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20 *---------------------------------------------------------------------*/ 20 *---------------------------------------------------------------------*/
21 21
22#include "../config.h" 22#include "../config.h"
23#include "rxvt.h" 23#include "rxvt.h"
24#include "rxvtlib.h"
25#include "rxvtutil.h" 24#include "rxvtutil.h"
26#include "rxvtfont.h" 25#include "rxvtfont.h"
27 26
28#include <cstdlib> 27#include <cstdlib>
29#include <wchar.h> 28
30#include <inttypes.h> 29#include <inttypes.h>
31 30
32#define MAX_OVERLAP (4 + 1) // max. character width in 4ths of the base width 31#define MAX_OVERLAP_ROMAN (8 + 2) // max. character width in 8ths of the base width
32#define MAX_OVERLAP_ITALIC (8 + 3) // max. overlap for italic fonts
33
34#define OVERLAP_OK(w,wcw,prop) ((w) <= ( \
35 (prop)->slant >= rxvt_fontprop::italic \
36 ? ((prop)->width * (wcw) * MAX_OVERLAP_ITALIC + 7) >> 3 \
37 : ((prop)->width * (wcw) * MAX_OVERLAP_ROMAN + 7) >> 3 \
38 ))
33 39
34const struct rxvt_fallback_font { 40const struct rxvt_fallback_font {
35 codeset cs; 41 codeset cs;
36 const char *name; 42 const char *name;
37} fallback_fonts[] = { 43} fallback_fonts[] = {
38 { CS_ISO8859_1, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-1" }, 44 { CS_ISO8859_1, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-1" },
39 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-15" }, 45 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-15" },
40 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-fcd8859-15" }, 46 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-fcd8859-15" },
41 47
42#if ENCODING_EU 48#if ENCODING_EU
43 // cyrillic 49 // cyrillic
44 { CS_KOI8_R, "-*-*-*-r-*--*-*-*-*-c-*-koi8-r" }, 50 { CS_KOI8_R, "-*-*-*-r-*--*-*-*-*-c-*-koi8-r" },
45 { CS_KOI8_U, "-*-*-*-r-*--*-*-*-*-c-*-koi8-u" }, 51 { CS_KOI8_U, "-*-*-*-r-*--*-*-*-*-c-*-koi8-u" },
46 52
47 { CS_ISO8859_2, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-2" }, 53 { CS_ISO8859_2, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-2" },
48 { CS_ISO8859_3, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-3" }, 54 { CS_ISO8859_3, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-3" },
49 { CS_ISO8859_4, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-4" }, 55 { CS_ISO8859_4, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-4" },
50 { CS_ISO8859_5, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-5" }, 56 { CS_ISO8859_5, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-5" },
51 { CS_ISO8859_6, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-6" }, 57 { CS_ISO8859_6, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-6" },
… …
57 { CS_ISO8859_13, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-13" }, 63 { CS_ISO8859_13, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-13" },
58 { CS_ISO8859_14, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-14" }, 64 { CS_ISO8859_14, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-14" },
59 { CS_ISO8859_16, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-16" }, 65 { CS_ISO8859_16, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-16" },
60 66
61# if XFT 67# if XFT
62 { CS_KOI8_U, "xft::spacing=100:lang=ru:antialias=false" }, 68 { CS_KOI8_U, "xft::lang=ru" },
63 69
64 { CS_ISO8859_5, "xft::spacing=100:lang=ru:antialias=false" }, 70 { CS_ISO8859_5, "xft::lang=ru" },
65 { CS_ISO8859_6, "xft::spacing=100:lang=ar:antialias=false" }, 71 { CS_ISO8859_6, "xft::lang=ar" },
66 { CS_ISO8859_7, "xft::spacing=100:lang=el:antialias=false" }, 72 { CS_ISO8859_7, "xft::lang=el" },
67 { CS_ISO8859_8, "xft::spacing=100:lang=he:antialias=false" }, 73 { CS_ISO8859_8, "xft::lang=he" },
68 { CS_ISO8859_9, "xft::spacing=100:lang=tr:antialias=false" }, 74 { CS_ISO8859_9, "xft::lang=tr" },
69 { CS_ISO8859_10, "xft::spacing=100:lang=se:antialias=false" }, 75 { CS_ISO8859_10, "xft::lang=se" },
70 { CS_ISO8859_11, "xft::spacing=100:lang=th:antialias=false" }, 76 { CS_ISO8859_11, "xft::lang=th" },
71# endif 77# endif
72#endif 78#endif
73 79
74 // japanese 80 // japanese
75#if ENCODING_JP || ENCODING_JP_EXT 81#if ENCODING_JP || ENCODING_JP_EXT
76# if XFT 82# if XFT
77 // prefer xft for complex scripts 83 // prefer xft for complex scripts
84 { CS_JIS0208_1990_0, "xft:Sazanami Mincho:antialias=false" },
78 { CS_JIS0208_1990_0, "xft:Kochi Gothic:antialias=false" }, 85 { CS_JIS0208_1990_0, "xft:Kochi Gothic:antialias=false" },
79 { CS_JIS0208_1990_0, "xft:Sazanami Mincho:antialias=false" },
80 { CS_JIS0208_1990_0, "xft:Mincho:antialias=false" }, 86 { CS_JIS0208_1990_0, "xft:Mincho:antialias=false" },
81 { CS_JIS0208_1990_0, "xft::lang=ja:spacing=100:antialias=false" }, 87 { CS_JIS0208_1990_0, "xft::lang=ja:antialias=false" },
82# endif 88# endif
83 { CS_JIS0201_1976_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0201*-0" }, 89 { CS_JIS0201_1976_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0201*-0" },
84 { CS_JIS0208_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" }, 90 { CS_JIS0208_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" },
85 { CS_JIS0212_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0212*-0" }, 91 { CS_JIS0212_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0212*-0" },
86 { CS_JIS0201_1976_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0201*-0" }, 92 { CS_JIS0201_1976_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0201*-0" },
… …
90 96
91#if ENCODING_ZH || ENCODING_ZH_EXT 97#if ENCODING_ZH || ENCODING_ZH_EXT
92# if XFT 98# if XFT
93 { CS_GBK_0, "xft:AR PL KaitiM GB" }, 99 { CS_GBK_0, "xft:AR PL KaitiM GB" },
94 { CS_GBK_0, "xft:AR PL SungtiL GB" }, 100 { CS_GBK_0, "xft:AR PL SungtiL GB" },
95 { CS_GBK_0, "xft::spacing=100:lang=zh" }, 101 { CS_GBK_0, "xft::lang=zh" },
96 { CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" }, 102 { CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" },
97 { CS_BIG5_EXT, "xft:AR PL KaitiM Big5" }, 103 { CS_BIG5_EXT, "xft:AR PL KaitiM Big5" },
98 { CS_GB2312_1980_0, "xft:AR PL KaitiM GB" }, 104 { CS_GB2312_1980_0, "xft:AR PL KaitiM GB" },
99 { CS_GB2312_1980_0, "xft:AR PL SungtiL GB" }, 105 { CS_GB2312_1980_0, "xft:AR PL SungtiL GB" },
100 { CS_GB2312_1980_0, "xft::spacing=100:lang=zh" }, 106 { CS_GB2312_1980_0, "xft::lang=zh" },
101# endif 107# endif
102 { CS_GBK_0, "-*-*-*-*-*-*-*-*-*-*-c-*-gbk*-0" }, 108 { CS_GBK_0, "-*-*-*-*-*-*-*-*-*-*-c-*-gbk*-0" },
103 { CS_BIG5, "-*-*-*-*-*-*-*-*-*-*-c-*-big5-0" }, 109 { CS_BIG5, "-*-*-*-*-*-*-*-*-*-*-c-*-big5-0" },
104 { CS_BIG5_PLUS, "-*-*-*-*-*-*-*-*-*-*-c-*-big5p-0" }, 110 { CS_BIG5_PLUS, "-*-*-*-*-*-*-*-*-*-*-c-*-big5p-0" },
105 { CS_BIG5_EXT, "-*-*-*-*-*-*-*-*-*-*-c-*-big5.eten-0" }, 111 { CS_BIG5_EXT, "-*-*-*-*-*-*-*-*-*-*-c-*-big5.eten-0" },
… …
118#if ENCODING_KR 124#if ENCODING_KR
119 { CS_KSC5601_1987_0, "-baekmuk-gulim-*-*-*-*-*-*-*-*-c-*-ksc5601*" }, 125 { CS_KSC5601_1987_0, "-baekmuk-gulim-*-*-*-*-*-*-*-*-c-*-ksc5601*" },
120 { CS_KSC5601_1987_0, "-*-*-*-*-*-*-*-*-*-*-c-*-ksc5601*" }, 126 { CS_KSC5601_1987_0, "-*-*-*-*-*-*-*-*-*-*-c-*-ksc5601*" },
121# if XFT 127# if XFT
122 { CS_KSC5601_1987_0, "xft:Baekmuk Gulim:antialias=false" }, 128 { CS_KSC5601_1987_0, "xft:Baekmuk Gulim:antialias=false" },
123 { CS_KSC5601_1987_0, "xft::spacing=100:lang=ko:antialias=false" }, 129 { CS_KSC5601_1987_0, "xft::lang=ko:antialias=false" },
124# endif 130# endif
125#endif 131#endif
126 132
127 // generic font fallback
128 { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" }, 133 { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" },
129 { CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" }, 134 //{ CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" }, // this gem of a font has actual dotted circles within the combining character glyphs.
130 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" },
131 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" },
132#if XFT 135#if XFT
133 { CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true" }, 136 { CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true" },
134 { CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" }, 137 { CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" },
135 { CS_UNICODE, "xft:Andale Mono:antialias=false:autohint=false" }, 138 { CS_UNICODE, "xft:Andale Mono:antialias=false:autohint=false" },
136 { CS_UNICODE, "xft:Arial Unicode MS:antialias=false:autohint=false" }, 139 { CS_UNICODE, "xft:Arial Unicode MS:antialias=false:autohint=false" },
137 140
138 // FreeMono is usually uglier than x fonts, so try last only. 141 // FreeMono is usually uglier than x fonts, so try after the others
139 { CS_UNICODE, "xft:FreeMono:autohint=true" }, 142 { CS_UNICODE, "xft:FreeMono:autohint=true" },
140#endif 143#endif
141 144
145 // generic font fallback, put this last, as many iso10646 fonts have extents
146 // specified for all glyphs in the range they cover, but most are simply empty
147 //{ CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" },
148 //{ CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" },
142 { CS_UNKNOWN, 0 } 149 { CS_UNKNOWN, 0 }
143}; 150};
144 151
145// these characters are used to guess the font height and width 152// these characters are used to guess the font height and width
146// pango uses a similar algorithm and doesn't trust the font either. 153// pango uses a similar algorithm and doesn't trust the font either.
… …
150 0x304c, 0x672c, // が本 157 0x304c, 0x672c, // が本
151}; 158};
152 159
153#define NUM_EXTENT_TEST_CHARS (sizeof (extent_test_chars) / sizeof (extent_test_chars[0])) 160#define NUM_EXTENT_TEST_CHARS (sizeof (extent_test_chars) / sizeof (extent_test_chars[0]))
154 161
155#define dTermDisplay Display *disp = term->display->display 162#define dTermDisplay Display *disp = term->dpy
156#define dTermGC GC gc = term->gc 163#define dTermGC GC gc = term->gc
157 164
158///////////////////////////////////////////////////////////////////////////// 165/////////////////////////////////////////////////////////////////////////////
159
160#if XFT
161rxvt_drawable::~rxvt_drawable ()
162{
163 if (xftdrawable)
164 XftDrawDestroy (xftdrawable);
165}
166
167rxvt_drawable::operator XftDraw *()
168{
169 if (!xftdrawable)
170 xftdrawable = XftDrawCreate (display->display, drawable, display->visual, display->cmap);
171
172 return xftdrawable;
173}
174#endif
175
176/////////////////////////////////////////////////////////////////////////////
177
178static void *enc_buf;
179static uint32_t enc_len;
180
181static inline void *
182get_enc_buf (uint32_t len)
183{
184 if (len > enc_len)
185 {
186 free (enc_buf);
187 enc_buf = malloc (len);
188 enc_len = len;
189 }
190
191 return enc_buf;
192}
193 166
194static const char * 167static const char *
195enc_char (const text_t *text, uint32_t len, codeset cs, bool &zero) 168enc_char (const text_t *text, uint32_t len, codeset cs, bool &zero)
196{ 169{
197 uint8_t *buf = (uint8_t *)get_enc_buf (len); 170 uint8_t *buf = rxvt_temp_buf<uint8_t> (len);
171 uint8_t *res = buf;
198 172
199 while (len--) 173 while (len--)
200 { 174 {
201 uint32_t c = FROM_UNICODE (cs, *text++); 175 uint32_t c = FROM_UNICODE (cs, *text++);
202 176
… …
207 } 181 }
208 182
209 *buf++ = c; 183 *buf++ = c;
210 } 184 }
211 185
212 return (const char *)enc_buf; 186 return (const char *)res;
213} 187}
214 188
215static const XChar2b * 189static const XChar2b *
216enc_xchar2b (const text_t *text, uint32_t len, codeset cs, bool &zero) 190enc_xchar2b (const text_t *text, uint32_t len, codeset cs, bool &zero)
217{ 191{
218 XChar2b *buf = (XChar2b *)get_enc_buf (len * sizeof (XChar2b)); 192 XChar2b *buf = rxvt_temp_buf<XChar2b> (len);
193 XChar2b *res = buf;
219 194
220 while (len--) 195 while (len--)
221 { 196 {
222 uint32_t c = FROM_UNICODE (cs, *text++); 197 uint32_t c = FROM_UNICODE (cs, *text++);
223 198
… …
230 buf->byte1 = c >> 8; 205 buf->byte1 = c >> 8;
231 buf->byte2 = c; 206 buf->byte2 = c;
232 buf++; 207 buf++;
233 } 208 }
234 209
235 return (XChar2b *)enc_buf; 210 return res;
236} 211}
237 212
238///////////////////////////////////////////////////////////////////////////// 213/////////////////////////////////////////////////////////////////////////////
239 214
215rxvt_font::rxvt_font ()
216: name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset)
217{
218}
219
240void 220void
241rxvt_font::set_name (char *name) 221rxvt_font::set_name (char *name_)
242{ 222{
243 if (this->name == name) 223 if (name == name_)
244 return; 224 return;
245 225
246 if (this->name) free (this->name); // let the compiler optimize 226 if (name) free (name); // let the compiler optimize
247 this->name = name; 227 name = name_;
248} 228}
249 229
250void 230void
251rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const 231rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const
252{ 232{
253 dTermDisplay; 233 dTermDisplay;
254 dTermGC; 234 dTermGC;
255 235
256 if (color == Color_bg) 236 if (color == Color_bg || color == Color_transparent)
257 XClearArea (disp, d, x, y, w, h, FALSE); 237 XClearArea (disp, d, x, y, w, h, false);
258 else if (color >= 0) 238 else if (color >= 0)
259 { 239 {
260#if XFT 240#if XFT
241 Picture dst;
242
243# ifdef HAVE_BG_PIXMAP
244 if (term->bgPixmap.pixmap
245 && !term->pix_colors[color].is_opaque ()
246 && ((dst = XftDrawPicture (d))))
247 {
248 XClearArea (disp, d, x, y, w, h, false);
249
250 Picture solid_color_pict = XftDrawSrcPicture (d, &term->pix_colors[color].c);
251 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, x, y, w, h);
252 }
253 else
254# endif
261 XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h); 255 XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);
256
262#else 257#else
263 XSetForeground (disp, gc, term->pix_colors[color]); 258 XSetForeground (disp, gc, term->pix_colors[color]);
264 XFillRectangle (disp, d, gc, x, y, w, h); 259 XFillRectangle (disp, d, gc, x, y, w, h);
265#endif 260#endif
266 } 261 }
267} 262}
268 263
269#include "table/linedraw.h" 264/////////////////////////////////////////////////////////////////////////////
270 265
271struct rxvt_font_default : rxvt_font { 266struct rxvt_font_default : rxvt_font {
272 struct rxvt_fontset *fs; 267 struct rxvt_fontset *fs;
273 268
274 rxvt_font_default (rxvt_fontset *fs) 269 rxvt_font_default (rxvt_fontset *fs)
… …
287 p.slant = rxvt_fontprop::roman; 282 p.slant = rxvt_fontprop::roman;
288 283
289 return p; 284 return p;
290 } 285 }
291 286
292 bool load (const rxvt_fontprop &prop) 287 bool load (const rxvt_fontprop &prop, bool force_prop)
293 { 288 {
294 width = 1; height = 1; 289 width = 1; height = 1;
295 ascent = 1; descent = 0; 290 ascent = 1; descent = 0;
296 291
297 set_name (strdup ("built-in support font")); 292 set_name (strdup ("built-in support font"));
… …
310 return false; 305 return false;
311 306
312 if (unicode <= 0x009f) 307 if (unicode <= 0x009f)
313 return true; 308 return true;
314 309
310#ifdef BUILTIN_GLYPHS
315 if (unicode >= 0x2500 && unicode <= 0x259f && 311 if (unicode >= 0x2500 && unicode <= 0x259f &&
316 !term->option (Opt_skipBuiltinGlyphs)) 312 !term->option (Opt_skipBuiltinGlyphs))
317 return true; 313 return true;
314#endif
318 315
319 if (IS_COMPOSE (unicode)) 316 if (IS_COMPOSE (unicode))
320 return true; 317 return true;
321 318
322 switch (unicode) 319 switch (unicode)
… …
358 ; 355 ;
359 356
360 int width = text - tp; 357 int width = text - tp;
361 int fwidth = term->fwidth * width; 358 int fwidth = term->fwidth * width;
362 359
360#ifdef BUILTIN_GLYPHS
363 if (0x2500 <= t && t <= 0x259f) 361 if (0x2500 <= t && t <= 0x259f)
364 { 362 {
363# include "table/linedraw.h"
365 uint16_t offs = linedraw_offs[t - 0x2500]; 364 uint16_t offs = linedraw_offs[t - 0x2500];
366 uint32_t *a = linedraw_command + (offs >> 4); 365 uint32_t *a = linedraw_command + (offs >> 4);
367 uint32_t *b = a + (offs & 15); 366 uint32_t *b = a + (offs & 15);
368 367
369 int W = fwidth; 368 int W = fwidth;
… …
407 406
408 case 1: // rectangle, possibly stippled 407 case 1: // rectangle, possibly stippled
409 if (a) 408 if (a)
410 { 409 {
411 static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 }; 410 static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 };
412 411
413 gcv.fill_style = FillStippled; 412 gcv.fill_style = FillStippled;
414 gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2); 413 gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2);
415 gcv.ts_x_origin = x; 414 gcv.ts_x_origin = x;
416 gcv.ts_y_origin = y; 415 gcv.ts_y_origin = y;
417 416
… …
436 (a - 1) * 90*64, (b - 1) * 90*64); 435 (a - 1) * 90*64, (b - 1) * 90*64);
437 break; 436 break;
438 } 437 }
439 } 438 }
440 } 439 }
440#else
441 if (0)
442 ;
443#endif
441#if ENABLE_COMBINING 444#if ENABLE_COMBINING
442 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) 445 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
443 { 446 {
447 min_it (width, 2); // we only support wcwidth up to 2
448
444 text_t chrs[2]; 449 text_t chrs[2];
445 width = min (2, width);
446 chrs [1] = NOCHAR; 450 chrs [1] = NOCHAR;
447 451
448 *chrs = cc->c1; 452 *chrs = cc->c1;
449 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)]; 453 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)];
450 f1->draw (d, x, y, chrs, width, fg, bg); 454 f1->draw (d, x, y, chrs, width, fg, bg);
… …
457 *chrs = cc->c2; 461 *chrs = cc->c2;
458 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful) 462 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful)
459 ? f1 463 ? f1
460 : (*fs)[fs->find_font (cc->c2)]; 464 : (*fs)[fs->find_font (cc->c2)];
461 465
462 f2->draw (d, x, y, chrs, width, fg, -1); 466 f2->draw (d, x, y, chrs, width, fg, Color_none);
463 } 467 }
464 } 468 }
465#endif 469#endif
466 else 470 else
467 switch (t) 471 switch (t)
… …
478 482
479 x += fwidth; 483 x += fwidth;
480 } 484 }
481} 485}
482 486
487struct rxvt_font_meta : rxvt_font {
488 struct rxvt_fontset *fs;
489
490 rxvt_font_meta (rxvt_fontset *fs)
491 : rxvt_font ()
492 {
493 this->fs = fs;
494 }
495
496 rxvt_fontprop properties ()
497 {
498 rxvt_fontprop p;
499
500 p.width = p.height = 1;
501 p.ascent = rxvt_fontprop::unset;
502 p.weight = rxvt_fontprop::medium;
503 p.slant = rxvt_fontprop::roman;
504
505 return p;
506 }
507
508 bool load (const rxvt_fontprop &prop, bool force_prop)
509 {
510 width = 1; height = 1;
511 ascent = 1; descent = 0;
512
513 set_name (strdup ("built-in meta font"));
514
515 return true;
516 }
517
518 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
519 {
520 return false;
521 }
522
523 void draw (rxvt_drawable &d, int x, int y,
524 const text_t *text, int len,
525 int fg, int bg)
526 {
527 while (len--)
528 {
529 int fid = fs->find_font_idx (*text);
530 (*fs)[fid]->draw (d, x, y, text, 1, fg, bg);
531 ++text;
532 x += term->fwidth;
533 }
534 }
535};
536
483///////////////////////////////////////////////////////////////////////////// 537/////////////////////////////////////////////////////////////////////////////
484 538
485struct rxvt_font_x11 : rxvt_font { 539struct rxvt_font_x11 : rxvt_font {
486 rxvt_font_x11 () { f = 0; } 540 rxvt_font_x11 () { f = 0; }
487 541
488 void clear (); 542 void clear ();
489 543
490 rxvt_fontprop properties (); 544 rxvt_fontprop properties ();
491 545
492 bool load (const rxvt_fontprop &prop); 546 bool load (const rxvt_fontprop &prop, bool force_prop);
493 547
494 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const; 548 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
495 549
496 void draw (rxvt_drawable &d, int x, int y, 550 void draw (rxvt_drawable &d, int x, int y,
497 const text_t *text, int len, 551 const text_t *text, int len,
498 int fg, int bg); 552 int fg, int bg);
499 553
500 bool slow; // wether this is a proportional font or has other funny characteristics 554 bool slow; // whether this is a proportional font or has other funny characteristics
501 XFontStruct *f; 555 XFontStruct *f;
502 codeset cs;
503 bool enc2b, encm; 556 bool enc2b, encm;
504 557
505 char *get_property (XFontStruct *f, const char *property, const char *repl) const; 558 char *get_property (XFontStruct *f, Atom property, const char *repl) const;
506 bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth); 559 bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth);
507 bool set_properties (rxvt_fontprop &p, XFontStruct *f); 560 bool set_properties (rxvt_fontprop &p, XFontStruct *f);
508 bool set_properties (rxvt_fontprop &p, const char *name); 561 bool set_properties (rxvt_fontprop &p, const char *name);
509}; 562};
510 563
511char * 564char *
512rxvt_font_x11::get_property (XFontStruct *f, const char *property, const char *repl) const 565rxvt_font_x11::get_property (XFontStruct *f, Atom property, const char *repl) const
513{ 566{
514 unsigned long value; 567 unsigned long value;
515 568
516 if (XGetFontProperty (f, XInternAtom (term->display->display, property, 0), &value)) 569 if (XGetFontProperty (f, property, &value))
517 return XGetAtomName (term->display->display, value); 570 return XGetAtomName (term->dpy, value);
518 else 571 else
519 return rxvt_strdup (repl); 572 return repl ? strdup (repl) : 0;
520} 573}
521 574
522rxvt_fontprop 575rxvt_fontprop
523rxvt_font_x11::properties () 576rxvt_font_x11::properties ()
524{ 577{
… …
528} 581}
529 582
530bool 583bool
531rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth) 584rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth)
532{ 585{
533 p.width = avgwidth ? (avgwidth + 1) / 10 : (height + 1) / 2; 586 p.width = width != rxvt_fontprop::unset ? width
587 : avgwidth ? (avgwidth + 1) / 10
588 : (height + 1) / 2;
534 p.height = height; 589 p.height = height;
535 p.ascent = rxvt_fontprop::unset; 590 p.ascent = rxvt_fontprop::unset;
536 p.weight = *weight == 'B' || *weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium; 591 p.weight = *weight == 'B' || *weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium;
537 p.slant = *slant == 'r' || *slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic; 592 p.slant = *slant == 'r' || *slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic;
538 593
… …
543rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f) 598rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)
544{ 599{
545 unsigned long height; 600 unsigned long height;
546 601
547#if 0 602#if 0
548 if (!XGetFontProperty (f, XInternAtom (term->display->display, "PIXEL_SIZE", 0), &height)) 603 if (!XGetFontProperty (f, XInternAtom (term->dpy, "PIXEL_SIZE", 0), &height))
549 return false; 604 return false;
550#else 605#else
551 height = f->ascent + f->descent; 606 height = f->ascent + f->descent;
552#endif 607#endif
553 608
554 unsigned long avgwidth; 609 unsigned long avgwidth;
555 if (!XGetFontProperty (f, XInternAtom (term->display->display, "AVERAGE_WIDTH", 0), &avgwidth)) 610 if (!XGetFontProperty (f, term->xa [XA_AVERAGE_WIDTH], &avgwidth))
556 avgwidth = 0; 611 avgwidth = 0;
557 612
558 char *weight = get_property (f, "WEIGHT_NAME", "medium"); 613 char *weight = get_property (f, term->xa [XA_WEIGHT_NAME], "medium");
559 char *slant = get_property (f, "SLANT", "r"); 614 char *slant = get_property (f, term->xa [XA_SLANT], "r");
560 615
561 set_properties (p, height, weight, slant, avgwidth); 616 set_properties (p, height, weight, slant, avgwidth);
562 617
563 free (weight); 618 free (weight);
564 free (slant); 619 free (slant);
… …
604 return false; 659 return false;
605} 660}
606 661
607// fix the size of scalable fonts 662// fix the size of scalable fonts
608static bool 663static bool
609replace_field (char *buf, const char *name, int index, const char old, const char *replace) 664replace_field (char **ptr, const char *name, int index, const char old, const char *replace)
610{ 665{
611 int slashes = 0; 666 int slashes = 0;
612 const char *field, *end; 667 const char *field, *end;
613 668
614 for (const char *c = name; *c; c++) 669 for (const char *c = name; *c; c++)
… …
624 break; 679 break;
625 } 680 }
626 681
627 if (slashes >= 13 && (!old || *field == old)) 682 if (slashes >= 13 && (!old || *field == old))
628 { 683 {
629 // TODO: check for overflow in font-name 684 size_t len = field - name;
630 strncpy (buf, name, field - name); 685 *ptr = (char *)malloc (len + strlen (replace) + strlen (end) + 1);
631 buf += field - name; 686 memcpy (*ptr, name, len);
632 strcpy (buf, replace); 687 strcpy (*ptr + len, replace);
633 strcat (buf, end); 688 strcat (*ptr, end);
634 689
635 return true; 690 return true;
636 } 691 }
637 else 692 else
638 { 693 {
639 strcpy (buf, name); 694 *ptr = strdup (name);
640 695
641 return false; 696 return false;
642 } 697 }
643} 698}
644 699
645bool 700bool
646rxvt_font_x11::load (const rxvt_fontprop &prop) 701rxvt_font_x11::load (const rxvt_fontprop &prop, bool force_prop)
647{ 702{
648 dTermDisplay; 703 dTermDisplay;
649 704
650 clear (); 705 clear ();
651 706
652 char field_str[64]; // enough for 128 bits 707 char field_str[64]; // enough for 128 bits
653 708
654 // first morph the font if required 709 // first morph the font if required
655 if (prop.weight != rxvt_fontprop::unset 710 if (force_prop)
656 || prop.slant != rxvt_fontprop::unset)
657 { 711 {
658 char fname[1024]; 712 char *fname;
659 713
660 if (name[0] != '-') 714 if (name[0] != '-')
661 { 715 {
662 f = XLoadQueryFont (disp, name); 716 f = XLoadQueryFont (disp, name);
663 717
664 if (!f) 718 if (!f)
665 return false; 719 return false;
666 720
667 char *new_name = get_property (f, "FONT", name); 721 char *new_name = get_property (f, XA_FONT, name);
668 722
669 if (new_name) 723 if (new_name)
670 set_name (new_name); 724 set_name (new_name);
671 else 725 else
672 rxvt_warn ("font '%s' has no FONT property, continuing without.", name); 726 rxvt_warn ("font '%s' has no FONT property, continuing without.", name);
… …
675 f = 0; 729 f = 0;
676 } 730 }
677 731
678 if (prop.weight != rxvt_fontprop::unset) 732 if (prop.weight != rxvt_fontprop::unset)
679 { 733 {
680 replace_field (fname, name, 2, 0, 734 replace_field (&fname, name, 2, 0,
681 prop.weight < rxvt_fontprop::bold 735 prop.weight < rxvt_fontprop::bold
682 ? "medium" : "bold"); 736 ? "medium" : "bold");
683 set_name (strdup (fname)); 737 set_name (fname);
684 } 738 }
685 739
686 if (prop.slant != rxvt_fontprop::unset) 740 if (prop.slant != rxvt_fontprop::unset)
687 { 741 {
688 replace_field (fname, name, 3, 0, 742 replace_field (&fname, name, 3, 0,
689 prop.slant < rxvt_fontprop::italic 743 prop.slant < rxvt_fontprop::italic
690 ? "r" : "i"); // TODO: handle "o"blique, too 744 ? "r" : "i"); // TODO: handle "o"blique, too
691 set_name (strdup (fname)); 745 set_name (fname);
692 } 746 }
693 } 747 }
694 748
695 sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset 749 sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset
696 ? 0 : prop.height); 750 ? 0 : prop.height);
… …
721 font_weight *fonts = new font_weight[count]; 775 font_weight *fonts = new font_weight[count];
722 776
723 for (int i = 0; i < count; i++) 777 for (int i = 0; i < count; i++)
724 { 778 {
725 rxvt_fontprop p; 779 rxvt_fontprop p;
726 char fname[1024]; 780 char *fname;
727 781
728 int diff = 0; 782 int diff = 0;
729 783
730 if (replace_field (fname, list[i], 6, '0', field_str)) 784 if (replace_field (&fname, list[i], 6, '0', field_str))
731 diff += 10; // slightly penalize scalable fonts 785 diff += 10; // slightly penalize scalable fonts
786 else
787 {
788 free (fname);
732 else if (replace_field (fname, list[i], 11, '0', "0")) 789 if (replace_field (&fname, list[i], 11, '0', "0"))
733 diff += 300; // more heavily penalize what looks like scaled bitmap fonts 790 diff += 300; // more heavily penalize what looks like scaled bitmap fonts
791 }
734 792
735 if (!set_properties (p, fname)) 793 if (!set_properties (p, fname))
736 continue; 794 continue;
737 795
738 if (prop.height != rxvt_fontprop::unset 796 if (prop.height != rxvt_fontprop::unset
… …
742 if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128; 800 if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128;
743 if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight); 801 if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight);
744 if (prop.slant != rxvt_fontprop::unset) diff += abs (prop.slant - p.slant); 802 if (prop.slant != rxvt_fontprop::unset) diff += abs (prop.slant - p.slant);
745 //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width); 803 //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width);
746 804
747 fonts[i].name = strdup (fname); 805 fonts[i].name = fname;
748 fonts[i].diff = diff; 806 fonts[i].diff = diff;
749 } 807 }
750 808
751 XFreeFontNames (list); 809 XFreeFontNames (list);
752 810
… …
781 delete [] fonts; 839 delete [] fonts;
782 840
783 if (!f) 841 if (!f)
784 return false; 842 return false;
785 843
786 char *registry = get_property (f, "CHARSET_REGISTRY", 0); 844 char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0);
787 char *encoding = get_property (f, "CHARSET_ENCODING", 0); 845 char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0);
846
847 cs = CS_UNKNOWN;
788 848
789 if (registry && encoding) 849 if (registry && encoding)
790 { 850 {
791 char charset[64]; 851 char charset[64];
792 snprintf (charset, 64, "%s-%s", registry, encoding); 852 snprintf (charset, 64, "%s-%s", registry, encoding);
793 853
794 cs = codeset_from_name (charset); 854 cs = codeset_from_name (charset);
795 } 855
796 else 856 if (cs == CS_UNKNOWN)
857 rxvt_warn ("%s: cannot deduce encoding from registry/encoding properties \"%s\", ignoring font.\n", name, charset);
797 { 858 }
859
860 free (registry);
861 free (encoding);
862
863 if (cs == CS_UNKNOWN)
864 {
798 const char *charset = get_property (f, "FONT", 0); 865 const char *charset = get_property (f, XA_FONT, 0);
799 866
800 if (!charset) 867 if (!charset)
801 charset = name; 868 charset = name;
802 869
803 int count = 13; 870 int count = 13;
804 while (*charset) 871 while (*charset)
805 if (*charset++ == '-' && !--count) 872 if (*charset++ == '-' && !--count)
806 break; 873 break;
807 874
808 cs = codeset_from_name (charset); 875 cs = codeset_from_name (charset);
876 if (cs == CS_UNKNOWN)
877 rxvt_warn ("%s: cannot deduce encoding from font name property \"%s\", ignoring font.\n", name, charset);
878 }
879
880 if (cs == CS_UNKNOWN)
809 } 881 {
810 882 clear ();
811 free (registry); 883 return false;
812 free (encoding); 884 }
813 885
814 if (cs == CS_UNICODE) 886 if (cs == CS_UNICODE)
815 cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font 887 cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font
816 888
817 encm = f->min_byte1 != 0 || f->max_byte1 != 0; 889 encm = f->min_byte1 != 0 || f->max_byte1 != 0;
818 enc2b = encm || f->max_char_or_byte2 > 255; 890 enc2b = encm || f->max_char_or_byte2 > 255;
819 891
820 slow = false; 892 slow = false;
821 893
822#if 1 // only used for slow detection, TODO optimize 894#if 1 // only used for slow detection, TODO optimize
823 if (f->min_bounds.width == f->max_bounds.width) 895 if (f->min_bounds.width == f->max_bounds.width || !f->per_char)
824 width = f->min_bounds.width;
825 else if (f->per_char == NULL)
826 width = f->max_bounds.width; 896 width = f->max_bounds.width;
827 else 897 else
828 { 898 {
829 slow = true; 899 slow = true;
830 900
831 int N = f->max_char_or_byte2 - f->min_char_or_byte2; 901 int N = f->max_char_or_byte2 - f->min_char_or_byte2;
832 902
833 if (encm) 903 if (encm)
834 N += (f->max_byte1 - f->min_byte1) 904 N += (f->max_byte1 - f->min_byte1)
835 * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1); 905 * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1);
836 906
837 while (N) 907 while (N)
838 { 908 {
839 if (f->per_char[N].width > width) 909 if (f->per_char[N].width > width)
840 width = f->per_char[N].width; 910 width = f->per_char[N].width;
841 911
… …
846 916
847 width = 1; 917 width = 1;
848 918
849 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 919 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; )
850 { 920 {
851 if (cs != CS_UNICODE
852 && *t > 0x100
853 && FROM_UNICODE (cs, *t) == NOCHAR) 921 if (FROM_UNICODE (cs, *t) == NOCHAR)
854 continue; 922 continue;
855 923
856 // ignore characters we wouldn't use anyways 924 // ignore characters we wouldn't use anyways
857 bool careful; 925 bool careful;
858 if (!has_char (*t, &prop, careful)) 926 if (!has_char (*t, &prop, careful))
… …
862 930
863 XCharStruct g; 931 XCharStruct g;
864 int dir_ret, asc_ret, des_ret; 932 int dir_ret, asc_ret, des_ret;
865 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); 933 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);
866 934
935 int wcw = WCWIDTH (*t);
867 int wcw = wcwidth (*t); if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; 936 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
868 937
869 if (width < g.width) width = g.width; 938 if (width < g.width) width = g.width;
870 }
871
872 if (cs == CS_UNKNOWN)
873 { 939 }
874 fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);
875 940
941#if 0 // do it per-character
942 if (prop && width > prop->width)
943 {
876 clear (); 944 clear ();
877 return false; 945 return false;
878 } 946 }
879
880#if 0 // do it per-character
881 if (prop && width > prop->width)
882 {
883 clear ();
884 return false;
885 }
886#endif 947#endif
887 948
888 return true; 949 return true;
889} 950}
890 951
891void 952void
892rxvt_font_x11::clear () 953rxvt_font_x11::clear ()
893{ 954{
894 if (f) 955 if (f)
895 { 956 {
896 XFreeFont (term->display->display, f); 957 XFreeFont (term->dpy, f);
897 f = 0; 958 f = 0;
898 } 959 }
899} 960}
900 961
901bool 962bool
… …
904 uint32_t ch = FROM_UNICODE (cs, unicode); 965 uint32_t ch = FROM_UNICODE (cs, unicode);
905 966
906 if (ch == NOCHAR) 967 if (ch == NOCHAR)
907 return false; 968 return false;
908 969
909 /* check wether the character exists in _this_ font. horrible. */ 970 /* check whether the character exists in _this_ font. horrible. */
910 XCharStruct *xcs; 971 XCharStruct *xcs;
911 972
912 if (encm) 973 if (encm)
913 { 974 {
914 unsigned char byte1 = ch >> 8; 975 unsigned char byte1 = ch >> 8;
… …
944 return false; 1005 return false;
945 1006
946 if (!prop || prop->width == rxvt_fontprop::unset) 1007 if (!prop || prop->width == rxvt_fontprop::unset)
947 return true; 1008 return true;
948 1009
949 // check character against base font bounding box 1010 // check whether character overlaps previous/next character
950 int w = xcs->width; 1011 int w = xcs->rbearing - xcs->lbearing;
951 int wcw = wcwidth (unicode); 1012 int wcw = max (WCWIDTH (unicode), 1);
952 if (wcw > 0) w = (w + wcw - 1) / wcw;
953 1013
954 careful = w > prop->width; 1014 careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw;
955 if (careful && w > prop->width * MAX_OVERLAP >> 2) 1015
1016 if (careful && !OVERLAP_OK (w, wcw, prop))
956 return false; 1017 return false;
957 1018
958 return true; 1019 return true;
959} 1020}
960 1021
… …
994 else 1055 else
995 { 1056 {
996 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); 1057 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
997 1058
998 XChangeGC (disp, gc, GCForeground | GCFont, &v); 1059 XChangeGC (disp, gc, GCForeground | GCFont, &v);
999 1060
1000 if (slow) 1061 if (slow)
1001 { 1062 {
1002 do 1063 do
1003 { 1064 {
1004 if (xc->byte1 || xc->byte2) 1065 if (xc->byte1 || xc->byte2)
… …
1026 else 1087 else
1027 { 1088 {
1028 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg); 1089 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
1029 1090
1030 XChangeGC (disp, gc, GCForeground | GCFont, &v); 1091 XChangeGC (disp, gc, GCForeground | GCFont, &v);
1031 1092
1032 if (slow) 1093 if (slow)
1033 { 1094 {
1034 do 1095 do
1035 { 1096 {
1036 if (*xc) 1097 if (*xc)
… …
1056 1117
1057 void clear (); 1118 void clear ();
1058 1119
1059 rxvt_fontprop properties (); 1120 rxvt_fontprop properties ();
1060 1121
1061 bool load (const rxvt_fontprop &prop); 1122 bool load (const rxvt_fontprop &prop, bool force_prop);
1062 1123
1063 void draw (rxvt_drawable &d, int x, int y, 1124 void draw (rxvt_drawable &d, int x, int y,
1064 const text_t *text, int len, 1125 const text_t *text, int len,
1065 int fg, int bg); 1126 int fg, int bg);
1066 1127
1067 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &carefull) const; 1128 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
1068 1129
1069protected: 1130protected:
1070 XftFont *f; 1131 XftFont *f;
1071}; 1132};
1072 1133
1073void 1134void
1074rxvt_font_xft::clear () 1135rxvt_font_xft::clear ()
1075{ 1136{
1076 if (f) 1137 if (f)
1077 { 1138 {
1078 XftFontClose (term->display->display, f); 1139 XftFontClose (term->dpy, f);
1079 f = 0; 1140 f = 0;
1080 } 1141 }
1081} 1142}
1082 1143
1083rxvt_fontprop 1144rxvt_fontprop
… …
1099 1160
1100 return p; 1161 return p;
1101} 1162}
1102 1163
1103bool 1164bool
1104rxvt_font_xft::load (const rxvt_fontprop &prop) 1165rxvt_font_xft::load (const rxvt_fontprop &prop, bool force_prop)
1105{ 1166{
1106 dTermDisplay; 1167 dTermDisplay;
1107 1168
1108 clear (); 1169 clear ();
1109 1170
… …
1118 && (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch 1179 && (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch
1119 && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch)) 1180 && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch))
1120 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height); 1181 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);
1121 1182
1122 if (prop.weight != rxvt_fontprop::unset 1183 if (prop.weight != rxvt_fontprop::unset
1123 && FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch) 1184 && (force_prop || FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch))
1124 FcPatternAddInteger (p, FC_WEIGHT, prop.weight); 1185 FcPatternAddInteger (p, FC_WEIGHT, prop.weight);
1125 1186
1126 if (prop.slant != rxvt_fontprop::unset 1187 if (prop.slant != rxvt_fontprop::unset
1127 && FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch) 1188 && (force_prop || FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch))
1128 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1189 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1129 1190
1130#if 0 // clipping unfortunately destroys our precious double-width-characters 1191#if 0 // clipping unfortunately destroys our precious double-width-characters
1131 // clip width, we can't do better, or can we? 1192 // clip width, we can't do better, or can we?
1132 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) 1193 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
1133 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop->width); 1194 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width);
1134#endif 1195#endif
1135 1196
1136 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch) 1197 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch)
1137 FcPatternAddBool (p, FC_MINSPACE, 1); 1198 FcPatternAddBool (p, FC_MINSPACE, 1);
1138 1199
… …
1190 XGlyphInfo g; 1251 XGlyphInfo g;
1191 XftTextExtents16 (disp, f, &ch, 1, &g); 1252 XftTextExtents16 (disp, f, &ch, 1, &g);
1192 1253
1193 g.width -= g.x; 1254 g.width -= g.x;
1194 1255
1195 int wcw = wcwidth (ch); 1256 int wcw = WCWIDTH (ch);
1196 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; 1257 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
1197 1258
1198 if (width < g.width ) width = g.width; 1259 if (width < g.width ) width = g.width;
1199 if (height < g.height ) height = g.height; 1260 if (height < g.height ) height = g.height;
1200 if (glheight < g.height - g.y) glheight = g.height - g.y; 1261 if (glheight < g.height - g.y) glheight = g.height - g.y;
… …
1250bool 1311bool
1251rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const 1312rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
1252{ 1313{
1253 careful = false; 1314 careful = false;
1254 1315
1255 if (!XftCharExists (term->display->display, f, unicode)) 1316 if (!XftCharExists (term->dpy, f, unicode))
1256 return false; 1317 return false;
1257 1318
1258 if (!prop || prop->width == rxvt_fontprop::unset) 1319 if (!prop || prop->width == rxvt_fontprop::unset)
1259 return true; 1320 return true;
1260 1321
1261 // check character against base font bounding box 1322 // check character against base font bounding box
1262 FcChar32 ch = unicode; 1323 FcChar32 ch = unicode;
1263 XGlyphInfo g; 1324 XGlyphInfo g;
1264 XftTextExtents32 (term->display->display, f, &ch, 1, &g); 1325 XftTextExtents32 (term->dpy, f, &ch, 1, &g);
1265 1326
1266 int w = g.width - g.x; 1327 int w = g.width - g.x;
1267 int wcw = wcwidth (unicode); 1328 int wcw = max (WCWIDTH (unicode), 1);
1268 if (wcw > 0) w = (w + wcw - 1) / wcw;
1269 1329
1270 careful = w > prop->width; 1330 careful = g.x > 0 || w > prop->width * wcw;
1271 if (careful && w > prop->width * MAX_OVERLAP >> 2) 1331
1332 if (careful && !OVERLAP_OK (w, wcw, prop))
1333 return false;
1334
1335 // this weeds out _totally_ broken fonts, or glyphs
1336 if (!OVERLAP_OK (g.xOff, wcw, prop))
1272 return false; 1337 return false;
1273 1338
1274 return true; 1339 return true;
1275} 1340}
1276 1341
1277void 1342void
1278rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, 1343rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1279 const text_t *text, int len, 1344 const text_t *text, int len,
1280 int fg, int bg) 1345 int fg, int bg)
1281{ 1346{
1282 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
1283
1284 XGlyphInfo extents; 1347 XGlyphInfo extents;
1285 XftGlyphSpec *enc = (XftGlyphSpec *)get_enc_buf (len * sizeof (XftGlyphSpec)); 1348 XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len);
1286 XftGlyphSpec *ep = enc; 1349 XftGlyphSpec *ep = enc;
1287 1350
1288 dTermDisplay; 1351 dTermDisplay;
1289 dTermGC; 1352 dTermGC;
1353
1354 int w = term->fwidth * len;
1355 int h = term->fheight;
1356
1357 bool buffered = bg >= Color_transparent
1358 && term->option (Opt_buffered);
1290 1359
1291 // cut trailing spaces 1360 // cut trailing spaces
1292 while (len && text [len - 1] == ' ') 1361 while (len && text [len - 1] == ' ')
1293 len--; 1362 len--;
1294 1363
1364 int x_ = buffered ? 0 : x;
1365 int y_ = buffered ? 0 : y;
1366
1295 while (len) 1367 while (len)
1296 { 1368 {
1297 int cwidth = term->fwidth; 1369 int cwidth = term->fwidth;
1298 FcChar32 fc = *text++; len--; 1370 FcChar32 fc = *text++; len--;
1299 1371
1300 while (len && *text == NOCHAR) 1372 while (len && *text == NOCHAR)
1301 text++, len--, cwidth += term->fwidth; 1373 text++, len--, cwidth += term->fwidth;
1302 1374
1303 if (fc != ' ') // skip spaces 1375 if (fc != ' ') // skip spaces
1304 { 1376 {
1305 FT_UInt glyph = XftCharIndex (disp, f, fc); 1377 FT_UInt glyph = XftCharIndex (disp, f, fc);
1306 XftGlyphExtents (disp, f, &glyph, 1, &extents); 1378 XftGlyphExtents (disp, f, &glyph, 1, &extents);
1307 1379
1308 ep->glyph = glyph; 1380 ep->glyph = glyph;
1309 ep->x = x + (cwidth - extents.xOff >> 1); 1381 ep->x = x_ + (cwidth - extents.xOff >> 1);
1310 ep->y = y + ascent; 1382 ep->y = y_ + ascent;
1383
1384 if (extents.xOff == 0)
1385 ep->x = x_ + cwidth;
1386
1311 ep++; 1387 ep++;
1312 } 1388 }
1313 1389
1314 x += cwidth; 1390 x_ += cwidth;
1391 }
1392
1393 if (buffered)
1315 } 1394 {
1316
1317 if (ep != enc) 1395 if (ep != enc)
1396 {
1397 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1398
1399#ifdef HAVE_BG_PIXMAP
1400 Picture dst = 0; // the only assignment is done conditionally in the following if condition
1401
1402 if (term->bgPixmap.pixmap
1403 && (bg == Color_transparent || bg == Color_bg
1404 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2))))))
1405 {
1406 int src_x = x, src_y = y;
1407
1408 if (term->bgPixmap.is_parentOrigin ())
1409 {
1410 src_x += term->window_vt_x;
1411 src_y += term->window_vt_y;
1412 }
1413
1414 if (term->bgPixmap.pmap_width >= src_x + w
1415 && term->bgPixmap.pmap_height >= src_y + h)
1416 {
1417 XCopyArea (disp, term->bgPixmap.pixmap, d2, gc,
1418 src_x, src_y, w, h, 0, 0);
1419 }
1420 else
1421 {
1422 XGCValues gcv;
1423
1424 gcv.fill_style = FillTiled;
1425 gcv.tile = term->bgPixmap.pixmap;
1426 gcv.ts_x_origin = -src_x;
1427 gcv.ts_y_origin = -src_y;
1428
1429 XChangeGC (disp, gc,
1430 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
1431 &gcv);
1432
1433 XFillRectangle (disp, d2, gc, 0, 0, w, h);
1434
1435 gcv.fill_style = FillSolid;
1436 XChangeGC (disp, gc, GCFillStyle, &gcv);
1437 }
1438
1439 if (dst)
1440 {
1441 Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c);
1442
1443 // dst can only be set when bg >= 0
1444 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h);
1445 }
1446 }
1447 else
1448#endif
1449 XftDrawRect (d2, &term->pix_colors[bg >= 0 ? bg : Color_bg].c, 0, 0, w, h);
1450
1451 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);
1452 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
1453 }
1454 else
1455 clear_rect (d, x, y, w, h, bg);
1456 }
1457 else
1458 {
1459 clear_rect (d, x, y, w, h, bg);
1318 XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc); 1460 XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc);
1461 }
1319} 1462}
1463
1320#endif 1464#endif
1321 1465
1322///////////////////////////////////////////////////////////////////////////// 1466/////////////////////////////////////////////////////////////////////////////
1323 1467
1324rxvt_fontset::rxvt_fontset (rxvt_term *term) 1468rxvt_fontset::rxvt_fontset (rxvt_term *term)
… …
1335void 1479void
1336rxvt_fontset::clear () 1480rxvt_fontset::clear ()
1337{ 1481{
1338 prop.width = prop.height = prop.ascent = prop.weight = prop.slant 1482 prop.width = prop.height = prop.ascent = prop.weight = prop.slant
1339 = rxvt_fontprop::unset; 1483 = rxvt_fontprop::unset;
1484 force_prop = false;
1340 1485
1341 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) 1486 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1342 FONT_UNREF (*i); 1487 FONT_UNREF (*i);
1343 1488
1344 for (pagemap **p = fmap.begin (); p != fmap.end (); p++) 1489 for (pagemap **p = fmap.begin (); p != fmap.end (); p++)
… …
1353 1498
1354rxvt_font * 1499rxvt_font *
1355rxvt_fontset::new_font (const char *name, codeset cs) 1500rxvt_fontset::new_font (const char *name, codeset cs)
1356{ 1501{
1357 rxvt_font *f; 1502 rxvt_font *f;
1358 1503
1359 if (!name || !*name) 1504 if (!name || !*name)
1360 { 1505 {
1361 name = ""; 1506 name = "";
1362 f = new rxvt_font_default (this); 1507 f = new rxvt_font_default (this);
1363 } 1508 }
… …
1431 if (!end) 1576 if (!end)
1432 end = desc + strlen (desc); 1577 end = desc + strlen (desc);
1433 1578
1434 if (end - desc < 511) 1579 if (end - desc < 511)
1435 { 1580 {
1436 strncpy (buf, desc, end - desc); 1581 memcpy (buf, desc, end - desc);
1437 buf[end - desc] = 0; 1582 buf[end - desc] = 0;
1438 1583
1439 fonts.push_back (new_font (buf, cs)); 1584 fonts.push_back (new_font (buf, cs));
1440 } 1585 }
1441 else 1586 else
… …
1456 if (fonts[i]->loaded) 1601 if (fonts[i]->loaded)
1457 return true; 1602 return true;
1458 1603
1459 fonts[i]->loaded = true; 1604 fonts[i]->loaded = true;
1460 1605
1461 if (!fonts[i]->load (prop)) 1606 if (!fonts[i]->load (prop, force_prop))
1462 { 1607 {
1463 fonts[i]->cs = CS_UNKNOWN; 1608 fonts[i]->cs = CS_UNKNOWN;
1464 return false; 1609 return false;
1465 } 1610 }
1466 1611
… …
1491 1636
1492 return -1; 1637 return -1;
1493} 1638}
1494 1639
1495int 1640int
1496rxvt_fontset::find_font (unicode_t unicode) 1641rxvt_fontset::find_font_idx (unicode_t unicode)
1497{ 1642{
1498 if (unicode >= 1<<20) 1643 if (unicode >= 1<<20)
1499 return 0; 1644 return 0;
1500 1645
1501 unicode_t hi = unicode >> 8; 1646 unicode_t hi = unicode >> 8;
… …
1567 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1712 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1568 FcPatternAddBool (p, FC_MINSPACE, 1); 1713 FcPatternAddBool (p, FC_MINSPACE, 1);
1569 //FcPatternAddBool (p, FC_ANTIALIAS, 1); 1714 //FcPatternAddBool (p, FC_ANTIALIAS, 1);
1570 1715
1571 XftResult result; 1716 XftResult result;
1572 FcPattern *match = XftFontMatch (term->display->display, term->display->screen, p, &result); 1717 FcPattern *match = XftFontMatch (term->dpy, term->display->screen, p, &result);
1573 1718
1574 FcPatternDestroy (p); 1719 FcPatternDestroy (p);
1575 1720
1576 if (match) 1721 if (match)
1577 { 1722 {
… …
1580 FcPatternDestroy (match); 1725 FcPatternDestroy (match);
1581 1726
1582 if (find_font (font) < 0) 1727 if (find_font (font) < 0)
1583 { 1728 {
1584 char fontname[4096]; 1729 char fontname[4096];
1585 sprintf (fontname, "xft:%-.4090s", font); 1730 snprintf (fontname, sizeof (fontname), "xft:%s", font);
1586 1731
1587 fonts.push_back (new_font (fontname, CS_UNICODE)); 1732 fonts.push_back (new_font (fontname, CS_UNICODE));
1588 } 1733 }
1589 1734
1590 free (font); 1735 free (font);
1591 } 1736 }
1592#endif 1737#endif
… …
1614 } 1759 }
1615 1760
1616 return i; 1761 return i;
1617} 1762}
1618 1763
1764int
1765rxvt_fontset::find_font (unicode_t unicode)
1766{
1767 int id = find_font_idx (unicode);
1619 1768
1620 1769 return min<int> (fontCount, id & 127) | (id & 128 ? Careful : 0);
1770}

Diff Legend

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