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

Diff Legend

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