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.145 by root, Fri Jan 25 16:04:57 2008 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 <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
… …
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 <cstdlib>
28#include <wchar.h> 28
29#include <inttypes.h> 29#include <inttypes.h>
30 30
31#define DISPLAY r->display->display
32#define TGC r->gc
33
34#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 ))
35 39
36const struct rxvt_fallback_font { 40const struct rxvt_fallback_font {
37 codeset cs; 41 codeset cs;
38 const char *name; 42 const char *name;
39} fallback_fonts[] = { 43} fallback_fonts[] = {
40 { CS_ISO8859_1, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-1" }, 44 { CS_ISO8859_1, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-1" },
41 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-15" }, 45 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-15" },
42 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-fcd8859-15" }, 46 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-fcd8859-15" },
43 47
44#if ENCODING_EU 48#if ENCODING_EU
45 // cyrillic 49 // cyrillic
46 { CS_KOI8_R, "-*-*-*-r-*--*-*-*-*-c-*-koi8-r" }, 50 { CS_KOI8_R, "-*-*-*-r-*--*-*-*-*-c-*-koi8-r" },
47 { CS_KOI8_U, "-*-*-*-r-*--*-*-*-*-c-*-koi8-u" }, 51 { CS_KOI8_U, "-*-*-*-r-*--*-*-*-*-c-*-koi8-u" },
48 52
49 { CS_ISO8859_2, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-2" }, 53 { CS_ISO8859_2, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-2" },
50 { CS_ISO8859_3, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-3" }, 54 { CS_ISO8859_3, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-3" },
51 { CS_ISO8859_4, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-4" }, 55 { CS_ISO8859_4, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-4" },
52 { CS_ISO8859_5, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-5" }, 56 { CS_ISO8859_5, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-5" },
53 { CS_ISO8859_6, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-6" }, 57 { CS_ISO8859_6, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-6" },
… …
59 { CS_ISO8859_13, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-13" }, 63 { CS_ISO8859_13, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-13" },
60 { CS_ISO8859_14, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-14" }, 64 { CS_ISO8859_14, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-14" },
61 { CS_ISO8859_16, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-16" }, 65 { CS_ISO8859_16, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-16" },
62 66
63# if XFT 67# if XFT
64 { CS_KOI8_U, "xft::spacing=100:lang=ru:antialias=false" }, 68 { CS_KOI8_U, "xft::lang=ru" },
65 69
66 { CS_ISO8859_5, "xft::spacing=100:lang=ru:antialias=false" }, 70 { CS_ISO8859_5, "xft::lang=ru" },
67 { CS_ISO8859_6, "xft::spacing=100:lang=ar:antialias=false" }, 71 { CS_ISO8859_6, "xft::lang=ar" },
68 { CS_ISO8859_7, "xft::spacing=100:lang=el:antialias=false" }, 72 { CS_ISO8859_7, "xft::lang=el" },
69 { CS_ISO8859_8, "xft::spacing=100:lang=he:antialias=false" }, 73 { CS_ISO8859_8, "xft::lang=he" },
70 { CS_ISO8859_9, "xft::spacing=100:lang=tr:antialias=false" }, 74 { CS_ISO8859_9, "xft::lang=tr" },
71 { CS_ISO8859_10, "xft::spacing=100:lang=se:antialias=false" }, 75 { CS_ISO8859_10, "xft::lang=se" },
72 { CS_ISO8859_11, "xft::spacing=100:lang=th:antialias=false" }, 76 { CS_ISO8859_11, "xft::lang=th" },
73# endif 77# endif
74#endif 78#endif
75 79
76 // japanese 80 // japanese
77#if ENCODING_JP || ENCODING_JP_EXT 81#if ENCODING_JP || ENCODING_JP_EXT
78# if XFT 82# if XFT
79 // prefer xft for complex scripts 83 // prefer xft for complex scripts
80 { CS_JIS0208_1990_0, "xft:Kochi Gothic:antialias=false" }, 84 { CS_JIS0208_1990_0, "xft:Kochi Gothic:antialias=false" },
81 { CS_JIS0208_1990_0, "xft:Sazanami Mincho:antialias=false" }, 85 { CS_JIS0208_1990_0, "xft:Sazanami Mincho:antialias=false" },
82 { CS_JIS0208_1990_0, "xft:Mincho:antialias=false" }, 86 { CS_JIS0208_1990_0, "xft:Mincho:antialias=false" },
83 { CS_JIS0208_1990_0, "xft::lang=ja:spacing=100:antialias=false" }, 87 { CS_JIS0208_1990_0, "xft::lang=ja:antialias=false" },
84# endif 88# endif
85 { CS_JIS0201_1976_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0201*-0" }, 89 { CS_JIS0201_1976_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0201*-0" },
86 { CS_JIS0208_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" }, 90 { CS_JIS0208_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" },
87 { CS_JIS0212_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0212*-0" }, 91 { CS_JIS0212_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0212*-0" },
88 { CS_JIS0201_1976_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0201*-0" }, 92 { CS_JIS0201_1976_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0201*-0" },
… …
92 96
93#if ENCODING_ZH || ENCODING_ZH_EXT 97#if ENCODING_ZH || ENCODING_ZH_EXT
94# if XFT 98# if XFT
95 { CS_GBK_0, "xft:AR PL KaitiM GB" }, 99 { CS_GBK_0, "xft:AR PL KaitiM GB" },
96 { CS_GBK_0, "xft:AR PL SungtiL GB" }, 100 { CS_GBK_0, "xft:AR PL SungtiL GB" },
97 { CS_GBK_0, "xft::spacing=100:lang=zh" }, 101 { CS_GBK_0, "xft::lang=zh" },
98 { CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" }, 102 { CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" },
99 { CS_BIG5_EXT, "xft:AR PL KaitiM Big5" }, 103 { CS_BIG5_EXT, "xft:AR PL KaitiM Big5" },
100 { CS_GB2312_1980_0, "xft:AR PL KaitiM GB" }, 104 { CS_GB2312_1980_0, "xft:AR PL KaitiM GB" },
101 { CS_GB2312_1980_0, "xft:AR PL SungtiL GB" }, 105 { CS_GB2312_1980_0, "xft:AR PL SungtiL GB" },
102 { CS_GB2312_1980_0, "xft::spacing=100:lang=zh" }, 106 { CS_GB2312_1980_0, "xft::lang=zh" },
103# endif 107# endif
104 { CS_GBK_0, "-*-*-*-*-*-*-*-*-*-*-c-*-gbk*-0" }, 108 { CS_GBK_0, "-*-*-*-*-*-*-*-*-*-*-c-*-gbk*-0" },
105 { CS_BIG5, "-*-*-*-*-*-*-*-*-*-*-c-*-big5-0" }, 109 { CS_BIG5, "-*-*-*-*-*-*-*-*-*-*-c-*-big5-0" },
106 { CS_BIG5_PLUS, "-*-*-*-*-*-*-*-*-*-*-c-*-big5p-0" }, 110 { CS_BIG5_PLUS, "-*-*-*-*-*-*-*-*-*-*-c-*-big5p-0" },
107 { CS_BIG5_EXT, "-*-*-*-*-*-*-*-*-*-*-c-*-big5.eten-0" }, 111 { CS_BIG5_EXT, "-*-*-*-*-*-*-*-*-*-*-c-*-big5.eten-0" },
… …
120#if ENCODING_KR 124#if ENCODING_KR
121 { CS_KSC5601_1987_0, "-baekmuk-gulim-*-*-*-*-*-*-*-*-c-*-ksc5601*" }, 125 { CS_KSC5601_1987_0, "-baekmuk-gulim-*-*-*-*-*-*-*-*-c-*-ksc5601*" },
122 { CS_KSC5601_1987_0, "-*-*-*-*-*-*-*-*-*-*-c-*-ksc5601*" }, 126 { CS_KSC5601_1987_0, "-*-*-*-*-*-*-*-*-*-*-c-*-ksc5601*" },
123# if XFT 127# if XFT
124 { CS_KSC5601_1987_0, "xft:Baekmuk Gulim:antialias=false" }, 128 { CS_KSC5601_1987_0, "xft:Baekmuk Gulim:antialias=false" },
125 { CS_KSC5601_1987_0, "xft::spacing=100:lang=ko:antialias=false" }, 129 { CS_KSC5601_1987_0, "xft::lang=ko:antialias=false" },
126# endif 130# endif
127#endif 131#endif
128 132
129 // generic font fallback
130 { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" }, 133 { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" },
131 { 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.
132 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" },
133 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" },
134#if XFT 135#if XFT
135 { CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true" }, 136 { CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true" },
136 { CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" }, 137 { CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" },
137 { CS_UNICODE, "xft:Andale Mono:antialias=false:autohint=false" }, 138 { CS_UNICODE, "xft:Andale Mono:antialias=false:autohint=false" },
138 { CS_UNICODE, "xft:Arial Unicode MS:antialias=false:autohint=false" }, 139 { CS_UNICODE, "xft:Arial Unicode MS:antialias=false:autohint=false" },
139 140
140 // FreeMono is usually uglier than x fonts, so try last only. 141 // FreeMono is usually uglier than x fonts, so try after the others
141 { CS_UNICODE, "xft:FreeMono:autohint=true" }, 142 { CS_UNICODE, "xft:FreeMono:autohint=true" },
142#endif 143#endif
143 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" },
144 { CS_UNKNOWN, 0 } 149 { CS_UNKNOWN, 0 }
145}; 150};
146 151
147// these characters are used to guess the font height and width 152// these characters are used to guess the font height and width
148// 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.
… …
152 0x304c, 0x672c, // が本 157 0x304c, 0x672c, // が本
153}; 158};
154 159
155#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]))
156 161
162#define dTermDisplay Display *disp = term->dpy
163#define dTermGC GC gc = term->gc
164
157///////////////////////////////////////////////////////////////////////////// 165/////////////////////////////////////////////////////////////////////////////
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 166
193static const char * 167static const char *
194enc_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)
195{ 169{
196 uint8_t *buf = (uint8_t *)get_enc_buf (len); 170 uint8_t *buf = rxvt_temp_buf<uint8_t> (len);
171 uint8_t *res = buf;
197 172
198 while (len--) 173 while (len--)
199 { 174 {
200 uint32_t c = FROM_UNICODE (cs, *text++); 175 uint32_t c = FROM_UNICODE (cs, *text++);
201 176
… …
206 } 181 }
207 182
208 *buf++ = c; 183 *buf++ = c;
209 } 184 }
210 185
211 return (const char *)enc_buf; 186 return (const char *)res;
212} 187}
213 188
214static const XChar2b * 189static const XChar2b *
215enc_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)
216{ 191{
217 XChar2b *buf = (XChar2b *)get_enc_buf (len * sizeof (XChar2b)); 192 XChar2b *buf = rxvt_temp_buf<XChar2b> (len);
193 XChar2b *res = buf;
218 194
219 while (len--) 195 while (len--)
220 { 196 {
221 uint32_t c = FROM_UNICODE (cs, *text++); 197 uint32_t c = FROM_UNICODE (cs, *text++);
222 198
… …
229 buf->byte1 = c >> 8; 205 buf->byte1 = c >> 8;
230 buf->byte2 = c; 206 buf->byte2 = c;
231 buf++; 207 buf++;
232 } 208 }
233 209
234 return (XChar2b *)enc_buf; 210 return res;
235} 211}
236 212
237///////////////////////////////////////////////////////////////////////////// 213/////////////////////////////////////////////////////////////////////////////
214
215rxvt_font::rxvt_font ()
216: name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset)
217{
218}
238 219
239void 220void
240rxvt_font::set_name (char *name) 221rxvt_font::set_name (char *name)
241{ 222{
242 if (this->name == name) 223 if (this->name == name)
… …
245 if (this->name) free (this->name); // let the compiler optimize 226 if (this->name) free (this->name); // let the compiler optimize
246 this->name = name; 227 this->name = name;
247} 228}
248 229
249void 230void
250rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) 231rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const
251{ 232{
252 if (color == Color_bg) 233 dTermDisplay;
253 XClearArea (d.display->display, d, x, y, w, h, FALSE); 234 dTermGC;
235
236 if (color == Color_bg || color == Color_transparent)
237 XClearArea (disp, d, x, y, w, h, false);
254 else if (color >= 0) 238 else if (color >= 0)
255 { 239 {
256#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
257 XftDrawRect (d, &r->pix_colors[color].c, x, y, w, h); 255 XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);
256
258#else 257#else
259 XSetForeground (d.display->display, TGC, r->pix_colors[color]); 258 XSetForeground (disp, gc, term->pix_colors[color]);
260 XFillRectangle (d.display->display, d, TGC, x, y, w, h); 259 XFillRectangle (disp, d, gc, x, y, w, h);
261#endif 260#endif
262 } 261 }
263} 262}
264 263
265#include "table/linedraw.h" 264/////////////////////////////////////////////////////////////////////////////
266 265
267struct rxvt_font_default : rxvt_font { 266struct rxvt_font_default : rxvt_font {
268 struct rxvt_fontset *fs; 267 struct rxvt_fontset *fs;
269 268
270 rxvt_font_default (rxvt_fontset *fs) 269 rxvt_font_default (rxvt_fontset *fs)
… …
283 p.slant = rxvt_fontprop::roman; 282 p.slant = rxvt_fontprop::roman;
284 283
285 return p; 284 return p;
286 } 285 }
287 286
288 bool load (const rxvt_fontprop &prop) 287 bool load (const rxvt_fontprop &prop, bool force_prop)
289 { 288 {
290 width = 1; height = 1; 289 width = 1; height = 1;
291 ascent = 1; descent = 0; 290 ascent = 1; descent = 0;
292 291
293 set_name (strdup ("built-in support font")); 292 set_name (strdup ("built-in support font"));
294 293
295 return true; 294 return true;
296 } 295 }
297 296
298 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) 297 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
299 { 298 {
300 careful = false; 299 careful = false;
301 300
302 if (unicode <= 0x001f) 301 if (unicode <= 0x001f)
303 return true; 302 return true;
… …
306 return false; 305 return false;
307 306
308 if (unicode <= 0x009f) 307 if (unicode <= 0x009f)
309 return true; 308 return true;
310 309
310#ifdef BUILTIN_GLYPHS
311 if (unicode >= 0x2500 && unicode <= 0x259f) 311 if (unicode >= 0x2500 && unicode <= 0x259f &&
312 !term->option (Opt_skipBuiltinGlyphs))
312 return true; 313 return true;
314#endif
313 315
314 if (IS_COMPOSE (unicode)) 316 if (IS_COMPOSE (unicode))
315 return true; 317 return true;
316 318
317 switch (unicode) 319 switch (unicode)
… …
332void 334void
333rxvt_font_default::draw (rxvt_drawable &d, int x, int y, 335rxvt_font_default::draw (rxvt_drawable &d, int x, int y,
334 const text_t *text, int len, 336 const text_t *text, int len,
335 int fg, int bg) 337 int fg, int bg)
336{ 338{
337 Display *disp = d.display->display; 339 dTermDisplay;
340 dTermGC;
338 341
339 clear_rect (d, x, y, r->fwidth * len, r->fheight, bg); 342 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
340 343
341 XSetForeground (disp, TGC, r->pix_colors[fg]); 344 XSetForeground (disp, gc, term->pix_colors[fg]);
342 345
343 while (len) 346 while (len)
344 { 347 {
345#if ENABLE_COMBINING 348#if ENABLE_COMBINING
346 compose_char *cc; 349 compose_char *cc;
… …
350 353
351 while (++text, --len && *text == NOCHAR) 354 while (++text, --len && *text == NOCHAR)
352 ; 355 ;
353 356
354 int width = text - tp; 357 int width = text - tp;
355 int fwidth = r->fwidth * width; 358 int fwidth = term->fwidth * width;
356 359
360#ifdef BUILTIN_GLYPHS
357 if (0x2500 <= t && t <= 0x259f) 361 if (0x2500 <= t && t <= 0x259f)
358 { 362 {
363# include "table/linedraw.h"
359 uint16_t offs = linedraw_offs[t - 0x2500]; 364 uint16_t offs = linedraw_offs[t - 0x2500];
360 uint32_t *a = linedraw_command + (offs >> 4); 365 uint32_t *a = linedraw_command + (offs >> 4);
361 uint32_t *b = a + (offs & 15); 366 uint32_t *b = a + (offs & 15);
362 367
363 int W = fwidth; 368 int W = fwidth;
364 int H = r->fheight; 369 int H = term->fheight;
365 370
366 int x_[16]; 371 int x_[16];
367 int y_[16]; 372 int y_[16];
368 373
369 for (int i = 0; i <= 8; i++) 374 for (int i = 0; i <= 8; i++)
… …
377 382
378 XGCValues gcv; 383 XGCValues gcv;
379 384
380 gcv.cap_style = CapButt; 385 gcv.cap_style = CapButt;
381 gcv.line_width = 0; 386 gcv.line_width = 0;
382 XChangeGC (disp, TGC, GCLineWidth | GCCapStyle, &gcv); 387 XChangeGC (disp, gc, GCLineWidth | GCCapStyle, &gcv);
383 388
384 while (a < b) 389 while (a < b)
385 { 390 {
386 uint32_t command = *a++; 391 uint32_t command = *a++;
387 392
… …
394 int y2 = y_[(command >> 0) & 15]; 399 int y2 = y_[(command >> 0) & 15];
395 400
396 switch (op) 401 switch (op)
397 { 402 {
398 case 0: // line 403 case 0: // line
399 XDrawLine (disp, d, TGC, x1, y1, x2, y2); 404 XDrawLine (disp, d, gc, x1, y1, x2, y2);
400 break; 405 break;
401 406
402 case 1: // rectangle, possibly stippled 407 case 1: // rectangle, possibly stippled
403 if (a) 408 if (a)
404 { 409 {
405 static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 }; 410 static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 };
406 411
407 gcv.fill_style = FillStippled; 412 gcv.fill_style = FillStippled;
408 gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2); 413 gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2);
409 gcv.ts_x_origin = x; 414 gcv.ts_x_origin = x;
410 gcv.ts_y_origin = y; 415 gcv.ts_y_origin = y;
411 416
412 XChangeGC (disp, TGC, 417 XChangeGC (disp, gc,
413 GCFillStyle | GCStipple | GCTileStipXOrigin | GCTileStipYOrigin, 418 GCFillStyle | GCStipple | GCTileStipXOrigin | GCTileStipYOrigin,
414 &gcv); 419 &gcv);
415 } 420 }
416 421
417 XFillRectangle (disp, d, TGC, x1, y1, x2 - x1 + 1, y2 - y1 + 1); 422 XFillRectangle (disp, d, gc, x1, y1, x2 - x1 + 1, y2 - y1 + 1);
418 423
419 if (a) 424 if (a)
420 { 425 {
421 XFreePixmap (disp, gcv.stipple); 426 XFreePixmap (disp, gcv.stipple);
422 gcv.stipple = 0; 427 gcv.stipple = 0;
423 gcv.fill_style = FillSolid; 428 gcv.fill_style = FillSolid;
424 XChangeGC (disp, TGC, GCFillStyle, &gcv); 429 XChangeGC (disp, gc, GCFillStyle, &gcv);
425 } 430 }
426 break; 431 break;
427 case 2: // arc 432 case 2: // arc
428 XDrawArc (disp, d, TGC, 433 XDrawArc (disp, d, gc,
429 x1 - W/2, y1 - H/2, W-1, H-1, 434 x1 - W/2, y1 - H/2, W-1, H-1,
430 (a - 1) * 90*64, (b - 1) * 90*64); 435 (a - 1) * 90*64, (b - 1) * 90*64);
431 break; 436 break;
432 } 437 }
433 } 438 }
434 } 439 }
440#else
441 if (0)
442 ;
443#endif
435#if ENABLE_COMBINING 444#if ENABLE_COMBINING
436 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) 445 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
437 { 446 {
447 min_it (width, 2); // we only support wcwidth up to 2
448
438 text_t chrs[2]; 449 text_t chrs[2];
439 width = min (2, width);
440 chrs [1] = NOCHAR; 450 chrs [1] = NOCHAR;
441 451
442 *chrs = cc->c1; 452 *chrs = cc->c1;
443 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)]; 453 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)];
444 f1->draw (d, x, y, chrs, width, fg, bg); 454 f1->draw (d, x, y, chrs, width, fg, bg);
… …
451 *chrs = cc->c2; 461 *chrs = cc->c2;
452 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful) 462 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful)
453 ? f1 463 ? f1
454 : (*fs)[fs->find_font (cc->c2)]; 464 : (*fs)[fs->find_font (cc->c2)];
455 465
456 f2->draw (d, x, y, chrs, width, fg, -1); 466 f2->draw (d, x, y, chrs, width, fg, Color_none);
457 } 467 }
458 } 468 }
459#endif 469#endif
460 else 470 else
461 switch (t) 471 switch (t)
… …
464 case ZERO_WIDTH_CHAR: 474 case ZERO_WIDTH_CHAR:
465 case NOCHAR: 475 case NOCHAR:
466 break; 476 break;
467 477
468 default: 478 default:
469 XDrawRectangle (disp, d, TGC, x + 2, y + 2, 479 XDrawRectangle (disp, d, gc, x + 2, y + 2,
470 fwidth - 4, r->fheight - 4); 480 fwidth - 4, term->fheight - 4);
471 } 481 }
472 482
473 x += fwidth; 483 x += fwidth;
474 } 484 }
475} 485}
… …
481 491
482 void clear (); 492 void clear ();
483 493
484 rxvt_fontprop properties (); 494 rxvt_fontprop properties ();
485 495
486 bool load (const rxvt_fontprop &prop); 496 bool load (const rxvt_fontprop &prop, bool force_prop);
487 497
488 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful); 498 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
489 499
490 void draw (rxvt_drawable &d, int x, int y, 500 void draw (rxvt_drawable &d, int x, int y,
491 const text_t *text, int len, 501 const text_t *text, int len,
492 int fg, int bg); 502 int fg, int bg);
493 503
494 bool slow; // wether this is a proportional font or has other funny characteristics 504 bool slow; // wether this is a proportional font or has other funny characteristics
495 XFontStruct *f; 505 XFontStruct *f;
496 codeset cs;
497 bool enc2b, encm; 506 bool enc2b, encm;
498 507
499 char *get_property (XFontStruct *f, const char *property, const char *repl) const; 508 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); 509 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); 510 bool set_properties (rxvt_fontprop &p, XFontStruct *f);
502 bool set_properties (rxvt_fontprop &p, const char *name); 511 bool set_properties (rxvt_fontprop &p, const char *name);
503}; 512};
504 513
505char * 514char *
506rxvt_font_x11::get_property (XFontStruct *f, const char *property, const char *repl) const 515rxvt_font_x11::get_property (XFontStruct *f, Atom property, const char *repl) const
507{ 516{
508 unsigned long value; 517 unsigned long value;
509 518
510 if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value)) 519 if (XGetFontProperty (f, property, &value))
511 return XGetAtomName (DISPLAY, value); 520 return XGetAtomName (term->dpy, value);
512 else 521 else
513 return rxvt_strdup (repl); 522 return repl ? strdup (repl) : 0;
514} 523}
515 524
516rxvt_fontprop 525rxvt_fontprop
517rxvt_font_x11::properties () 526rxvt_font_x11::properties ()
518{ 527{
… …
522} 531}
523 532
524bool 533bool
525rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth) 534rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth)
526{ 535{
527 p.width = avgwidth ? (avgwidth + 1) / 10 : (height + 1) / 2; 536 p.width = width != rxvt_fontprop::unset ? width
537 : avgwidth ? (avgwidth + 1) / 10
538 : (height + 1) / 2;
528 p.height = height; 539 p.height = height;
529 p.ascent = rxvt_fontprop::unset; 540 p.ascent = rxvt_fontprop::unset;
530 p.weight = *weight == 'B' || *weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium; 541 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; 542 p.slant = *slant == 'r' || *slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic;
532 543
… …
537rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f) 548rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)
538{ 549{
539 unsigned long height; 550 unsigned long height;
540 551
541#if 0 552#if 0
542 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "PIXEL_SIZE", 0), &height)) 553 if (!XGetFontProperty (f, XInternAtom (term->dpy, "PIXEL_SIZE", 0), &height))
543 return false; 554 return false;
544#else 555#else
545 height = f->ascent + f->descent; 556 height = f->ascent + f->descent;
546#endif 557#endif
547 558
548 unsigned long avgwidth; 559 unsigned long avgwidth;
549 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth)) 560 if (!XGetFontProperty (f, term->xa [XA_AVERAGE_WIDTH], &avgwidth))
550 avgwidth = 0; 561 avgwidth = 0;
551 562
552 char *weight = get_property (f, "WEIGHT_NAME", "medium"); 563 char *weight = get_property (f, term->xa [XA_WEIGHT_NAME], "medium");
553 char *slant = get_property (f, "SLANT", "r"); 564 char *slant = get_property (f, term->xa [XA_SLANT], "r");
554 565
555 set_properties (p, height, weight, slant, avgwidth); 566 set_properties (p, height, weight, slant, avgwidth);
556 567
557 free (weight); 568 free (weight);
558 free (slant); 569 free (slant);
… …
563} 574}
564 575
565bool 576bool
566rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name) 577rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name)
567{ 578{
579 dTermDisplay;
568 int slashes = 0; 580 int slashes = 0;
569 const char *comp[13]; 581 const char *comp[13];
570 582
571 for (const char *c = name; *c; c++) 583 for (const char *c = name; *c; c++)
572 if (*c == '-') 584 if (*c == '-')
… …
580 if (slashes >= 13 592 if (slashes >= 13
581 && (*comp[ 6] >= '1' && *comp[ 6] <= '9') 593 && (*comp[ 6] >= '1' && *comp[ 6] <= '9')
582 && (*comp[11] >= '0' && *comp[11] <= '9')) 594 && (*comp[11] >= '0' && *comp[11] <= '9'))
583 return set_properties (p, atoi (comp[6]), comp[2], comp[3], atoi (comp[11])); 595 return set_properties (p, atoi (comp[6]), comp[2], comp[3], atoi (comp[11]));
584 596
585 XFontStruct *f = XLoadQueryFont (DISPLAY, name); 597 XFontStruct *f = XLoadQueryFont (disp, name);
586 598
587 if (f) 599 if (f)
588 { 600 {
589 // the font should really exist now. if not, we have a problem 601 // 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). 602 // (e.g. if the user did xset fp rehash just when we were searching fonts).
591 // in that case, just return garbage. 603 // in that case, just return garbage.
592 bool ret = set_properties (p, f); 604 bool ret = set_properties (p, f);
593 XFreeFont (DISPLAY, f); 605 XFreeFont (disp, f);
594 return ret; 606 return ret;
595 } 607 }
596 else 608 else
597 return false; 609 return false;
598} 610}
599 611
600// fix the size of scalable fonts 612// fix the size of scalable fonts
601static bool 613static bool
602replace_field (char *buf, const char *name, int index, const char old, const char *replace) 614replace_field (char **ptr, const char *name, int index, const char old, const char *replace)
603{ 615{
604 int slashes = 0; 616 int slashes = 0;
605 const char *field, *end; 617 const char *field, *end;
606 618
607 for (const char *c = name; *c; c++) 619 for (const char *c = name; *c; c++)
… …
617 break; 629 break;
618 } 630 }
619 631
620 if (slashes >= 13 && (!old || *field == old)) 632 if (slashes >= 13 && (!old || *field == old))
621 { 633 {
622 // TODO: check for overflow in font-name 634 size_t len = field - name;
623 strncpy (buf, name, field - name); 635 *ptr = (char *)malloc (len + strlen (replace) + strlen (end) + 1);
624 buf += field - name; 636 memcpy (*ptr, name, len);
625 strcpy (buf, replace); 637 strcpy (*ptr + len, replace);
626 strcat (buf, end); 638 strcat (*ptr, end);
627 639
628 return true; 640 return true;
629 } 641 }
630 else 642 else
631 { 643 {
632 strcpy (buf, name); 644 *ptr = strdup (name);
633 645
634 return false; 646 return false;
635 } 647 }
636} 648}
637 649
638bool 650bool
639rxvt_font_x11::load (const rxvt_fontprop &prop) 651rxvt_font_x11::load (const rxvt_fontprop &prop, bool force_prop)
640{ 652{
641 Display *disp = DISPLAY; 653 dTermDisplay;
642 654
643 clear (); 655 clear ();
644 656
645 char field_str[64]; // enough for 128 bits 657 char field_str[64]; // enough for 128 bits
646 658
647 // first morph the font if required 659 // first morph the font if required
648 if (prop.weight != rxvt_fontprop::unset 660 if (force_prop)
649 || prop.slant != rxvt_fontprop::unset)
650 { 661 {
651 char fname[1024]; 662 char *fname;
652 663
653 if (name[0] != '-') 664 if (name[0] != '-')
654 { 665 {
655 f = XLoadQueryFont (disp, name); 666 f = XLoadQueryFont (disp, name);
656 667
657 if (!f) 668 if (!f)
658 return false; 669 return false;
659 670
660 char *new_name = get_property (f, "FONT", name); 671 char *new_name = get_property (f, XA_FONT, name);
661 672
662 if (new_name) 673 if (new_name)
663 set_name (new_name); 674 set_name (new_name);
664 else 675 else
665 rxvt_warn ("font '%s' has no FONT property, continuing without.", name); 676 rxvt_warn ("font '%s' has no FONT property, continuing without.", name);
… …
668 f = 0; 679 f = 0;
669 } 680 }
670 681
671 if (prop.weight != rxvt_fontprop::unset) 682 if (prop.weight != rxvt_fontprop::unset)
672 { 683 {
673 replace_field (fname, name, 2, 0, 684 replace_field (&fname, name, 2, 0,
674 prop.weight < rxvt_fontprop::bold 685 prop.weight < rxvt_fontprop::bold
675 ? "medium" : "bold"); 686 ? "medium" : "bold");
676 set_name (strdup (fname)); 687 set_name (fname);
677 } 688 }
678 689
679 if (prop.slant != rxvt_fontprop::unset) 690 if (prop.slant != rxvt_fontprop::unset)
680 { 691 {
681 replace_field (fname, name, 3, 0, 692 replace_field (&fname, name, 3, 0,
682 prop.slant < rxvt_fontprop::italic 693 prop.slant < rxvt_fontprop::italic
683 ? "r" : "i"); // TODO: handle "o"blique, too 694 ? "r" : "i"); // TODO: handle "o"blique, too
684 set_name (strdup (fname)); 695 set_name (fname);
685 } 696 }
686 } 697 }
687 698
688 sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset 699 sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset
689 ? 0 : prop.height); 700 ? 0 : prop.height);
… …
714 font_weight *fonts = new font_weight[count]; 725 font_weight *fonts = new font_weight[count];
715 726
716 for (int i = 0; i < count; i++) 727 for (int i = 0; i < count; i++)
717 { 728 {
718 rxvt_fontprop p; 729 rxvt_fontprop p;
719 char fname[1024]; 730 char *fname;
720 731
721 int diff = 0; 732 int diff = 0;
722 733
723 if (replace_field (fname, list[i], 6, '0', field_str)) 734 if (replace_field (&fname, list[i], 6, '0', field_str))
724 diff += 10; // slightly penalize scalable fonts 735 diff += 10; // slightly penalize scalable fonts
736 else
737 {
738 free (fname);
725 else if (replace_field (fname, list[i], 11, '0', "0")) 739 if (replace_field (&fname, list[i], 11, '0', "0"))
726 diff += 300; // more heavily penalize what looks like scaled bitmap fotns 740 diff += 300; // more heavily penalize what looks like scaled bitmap fonts
741 }
727 742
728 if (!set_properties (p, fname)) 743 if (!set_properties (p, fname))
729 continue; 744 continue;
730 745
731 if (prop.height != rxvt_fontprop::unset 746 if (prop.height != rxvt_fontprop::unset
… …
735 if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128; 750 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); 751 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); 752 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); 753 //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width);
739 754
740 fonts[i].name = strdup (fname); 755 fonts[i].name = fname;
741 fonts[i].diff = diff; 756 fonts[i].diff = diff;
742 } 757 }
743 758
744 XFreeFontNames (list); 759 XFreeFontNames (list);
745 760
… …
774 delete [] fonts; 789 delete [] fonts;
775 790
776 if (!f) 791 if (!f)
777 return false; 792 return false;
778 793
779 char *registry = get_property (f, "CHARSET_REGISTRY", 0); 794 char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0);
780 char *encoding = get_property (f, "CHARSET_ENCODING", 0); 795 char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0);
781 796
782 if (registry && encoding) 797 if (registry && encoding)
783 { 798 {
784 char charset[64]; 799 char charset[64];
785 snprintf (charset, 64, "%s-%s", registry, encoding); 800 snprintf (charset, 64, "%s-%s", registry, encoding);
786 801
787 cs = codeset_from_name (charset); 802 cs = codeset_from_name (charset);
788 } 803 }
789 else 804 else
790 { 805 {
791 const char *charset = get_property (f, "FONT", 0); 806 const char *charset = get_property (f, XA_FONT, 0);
792 807
793 if (!charset) 808 if (!charset)
794 charset = name; 809 charset = name;
795 810
796 int count = 13; 811 int count = 13;
… …
811 enc2b = encm || f->max_char_or_byte2 > 255; 826 enc2b = encm || f->max_char_or_byte2 > 255;
812 827
813 slow = false; 828 slow = false;
814 829
815#if 1 // only used for slow detection, TODO optimize 830#if 1 // only used for slow detection, TODO optimize
816 if (f->min_bounds.width == f->max_bounds.width) 831 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; 832 width = f->max_bounds.width;
820 else 833 else
821 { 834 {
822 slow = true; 835 slow = true;
823 836
824 int N = f->max_char_or_byte2 - f->min_char_or_byte2; 837 int N = f->max_char_or_byte2 - f->min_char_or_byte2;
825 838
826 if (encm) 839 if (encm)
827 N += (f->max_byte1 - f->min_byte1) 840 N += (f->max_byte1 - f->min_byte1)
828 * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1); 841 * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1);
829 842
830 while (N) 843 while (N)
831 { 844 {
832 if (f->per_char[N].width > width) 845 if (f->per_char[N].width > width)
833 width = f->per_char[N].width; 846 width = f->per_char[N].width;
834 847
… …
839 852
840 width = 1; 853 width = 1;
841 854
842 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 855 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; )
843 { 856 {
844 if (cs != CS_UNICODE
845 && *t > 0x100
846 && FROM_UNICODE (cs, *t) == NOCHAR) 857 if (FROM_UNICODE (cs, *t) == NOCHAR)
847 continue; 858 continue;
848 859
849 // ignore characters we wouldn't use anyways 860 // ignore characters we wouldn't use anyways
850 bool careful; 861 bool careful;
851 if (!has_char (*t, &prop, careful)) 862 if (!has_char (*t, &prop, careful))
… …
855 866
856 XCharStruct g; 867 XCharStruct g;
857 int dir_ret, asc_ret, des_ret; 868 int dir_ret, asc_ret, des_ret;
858 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); 869 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);
859 870
871 int wcw = WCWIDTH (*t);
860 int wcw = wcwidth (*t); if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; 872 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
861 873
862 if (width < g.width) width = g.width; 874 if (width < g.width) width = g.width;
863 } 875 }
864 876
865 if (cs == CS_UNKNOWN) 877 if (cs == CS_UNKNOWN)
866 { 878 {
867 fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name); 879 fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);
… …
884void 896void
885rxvt_font_x11::clear () 897rxvt_font_x11::clear ()
886{ 898{
887 if (f) 899 if (f)
888 { 900 {
889 XFreeFont (DISPLAY, f); 901 XFreeFont (term->dpy, f);
890 f = 0; 902 f = 0;
891 } 903 }
892} 904}
893 905
894bool 906bool
895rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) 907rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
896{ 908{
897 uint32_t ch = FROM_UNICODE (cs, unicode); 909 uint32_t ch = FROM_UNICODE (cs, unicode);
898 910
899 if (ch == NOCHAR) 911 if (ch == NOCHAR)
900 return false; 912 return false;
… …
937 return false; 949 return false;
938 950
939 if (!prop || prop->width == rxvt_fontprop::unset) 951 if (!prop || prop->width == rxvt_fontprop::unset)
940 return true; 952 return true;
941 953
942 // check character against base font bounding box 954 // check wether character overlaps previous/next character
943 int w = xcs->width; 955 int w = xcs->rbearing - xcs->lbearing;
944 int wcw = wcwidth (unicode); 956 int wcw = max (WCWIDTH (unicode), 1);
945 if (wcw > 0) w = (w + wcw - 1) / wcw;
946 957
947 careful = w > prop->width; 958 careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw;
948 if (careful && w > prop->width * MAX_OVERLAP >> 2) 959
960 if (careful && !OVERLAP_OK (w, wcw, prop))
949 return false; 961 return false;
950 962
951 return true; 963 return true;
952} 964}
953 965
… …
959 // this looks like a mess /. 971 // this looks like a mess /.
960 // and it is a mess /. 972 // and it is a mess /.
961 // yet we are trying to be perfect /. 973 // yet we are trying to be perfect /.
962 // but the result still isn't perfect /. 974 // but the result still isn't perfect /.
963 975
976 dTermDisplay;
977 dTermGC;
978
964 bool slow = this->slow 979 bool slow = this->slow
965 || width != r->fwidth 980 || width != term->fwidth
966 || height != r->fheight; 981 || height != term->fheight;
967 982
968 int base = ascent; // sorry, incorrect: r->fbase; 983 int base = ascent; // sorry, incorrect: term->fbase;
969 984
970 XGCValues v; 985 XGCValues v;
971 v.foreground = r->pix_colors[fg]; 986 v.foreground = term->pix_colors[fg];
972 v.font = f->fid; 987 v.font = f->fid;
973 988
974 if (enc2b) 989 if (enc2b)
975 { 990 {
976 const XChar2b *xc = enc_xchar2b (text, len, cs, slow); 991 const XChar2b *xc = enc_xchar2b (text, len, cs, slow);
977 992
978 if (bg == Color_bg && !slow) 993 if (bg == Color_bg && !slow)
979 { 994 {
980 v.background = r->pix_colors[bg]; 995 v.background = term->pix_colors[bg];
981 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); 996 XChangeGC (disp, gc, GCForeground | GCBackground | GCFont, &v);
982 XDrawImageString16 (d.display->display, d, TGC, x, y + base, xc, len); 997 XDrawImageString16 (disp, d, gc, x, y + base, xc, len);
983 } 998 }
984 else 999 else
985 { 1000 {
986 clear_rect (d, x, y, r->fwidth * len, r->fheight, bg); 1001 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
987 1002
988 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v); 1003 XChangeGC (disp, gc, GCForeground | GCFont, &v);
989 1004
990 if (slow) 1005 if (slow)
991 { 1006 {
992 do 1007 do
993 { 1008 {
994 if (xc->byte1 || xc->byte2) 1009 if (xc->byte1 || xc->byte2)
995 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, 1); 1010 XDrawString16 (disp, d, gc, x, y + base, xc, 1);
996 1011
997 x += r->fwidth; 1012 x += term->fwidth;
998 xc++; len--; 1013 xc++; len--;
999 } 1014 }
1000 while (len); 1015 while (len);
1001 } 1016 }
1002 else 1017 else
1003 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, len); 1018 XDrawString16 (disp, d, gc, x, y + base, xc, len);
1004 } 1019 }
1005 } 1020 }
1006 else 1021 else
1007 { 1022 {
1008 const char *xc = enc_char (text, len, cs, slow); 1023 const char *xc = enc_char (text, len, cs, slow);
1009 1024
1010 if (bg == Color_bg && !slow) 1025 if (bg == Color_bg && !slow)
1011 { 1026 {
1012 v.background = r->pix_colors[bg]; 1027 v.background = term->pix_colors[bg];
1013 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); 1028 XChangeGC (disp, gc, GCForeground | GCBackground | GCFont, &v);
1014 XDrawImageString (d.display->display, d, TGC, x, y + base, xc, len); 1029 XDrawImageString (disp, d, gc, x, y + base, xc, len);
1015 } 1030 }
1016 else 1031 else
1017 { 1032 {
1018 clear_rect (d, x, y, r->fwidth * len, r->fheight, bg); 1033 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
1019 1034
1020 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v); 1035 XChangeGC (disp, gc, GCForeground | GCFont, &v);
1021 1036
1022 if (slow) 1037 if (slow)
1023 { 1038 {
1024 do 1039 do
1025 { 1040 {
1026 if (*xc) 1041 if (*xc)
1027 XDrawString (d.display->display, d, TGC, x, y + base, xc, 1); 1042 XDrawString (disp, d, gc, x, y + base, xc, 1);
1028 1043
1029 x += r->fwidth; 1044 x += term->fwidth;
1030 xc++; len--; 1045 xc++; len--;
1031 } 1046 }
1032 while (len); 1047 while (len);
1033 } 1048 }
1034 else 1049 else
1035 XDrawString (d.display->display, d, TGC, x, y + base, xc, len); 1050 XDrawString (disp, d, gc, x, y + base, xc, len);
1036 } 1051 }
1037 } 1052 }
1038} 1053}
1039 1054
1040///////////////////////////////////////////////////////////////////////////// 1055/////////////////////////////////////////////////////////////////////////////
… …
1046 1061
1047 void clear (); 1062 void clear ();
1048 1063
1049 rxvt_fontprop properties (); 1064 rxvt_fontprop properties ();
1050 1065
1051 bool load (const rxvt_fontprop &prop); 1066 bool load (const rxvt_fontprop &prop, bool force_prop);
1052 1067
1053 void draw (rxvt_drawable &d, int x, int y, 1068 void draw (rxvt_drawable &d, int x, int y,
1054 const text_t *text, int len, 1069 const text_t *text, int len,
1055 int fg, int bg); 1070 int fg, int bg);
1056 1071
1057 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &carefull); 1072 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
1058 1073
1059protected: 1074protected:
1060 XftFont *f; 1075 XftFont *f;
1061}; 1076};
1062 1077
1063void 1078void
1064rxvt_font_xft::clear () 1079rxvt_font_xft::clear ()
1065{ 1080{
1066 if (f) 1081 if (f)
1067 { 1082 {
1068 XftFontClose (DISPLAY, f); 1083 XftFontClose (term->dpy, f);
1069 f = 0; 1084 f = 0;
1070 } 1085 }
1071} 1086}
1072 1087
1073rxvt_fontprop 1088rxvt_fontprop
… …
1089 1104
1090 return p; 1105 return p;
1091} 1106}
1092 1107
1093bool 1108bool
1094rxvt_font_xft::load (const rxvt_fontprop &prop) 1109rxvt_font_xft::load (const rxvt_fontprop &prop, bool force_prop)
1095{ 1110{
1096 Display *disp = DISPLAY; 1111 dTermDisplay;
1097 1112
1098 clear (); 1113 clear ();
1099 1114
1100 FcPattern *p = FcNameParse ((FcChar8 *) name); 1115 FcPattern *p = FcNameParse ((FcChar8 *) name);
1101 1116
… …
1108 && (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch 1123 && (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch
1109 && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch)) 1124 && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch))
1110 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height); 1125 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);
1111 1126
1112 if (prop.weight != rxvt_fontprop::unset 1127 if (prop.weight != rxvt_fontprop::unset
1113 && FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch) 1128 && (force_prop || FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch))
1114 FcPatternAddInteger (p, FC_WEIGHT, prop.weight); 1129 FcPatternAddInteger (p, FC_WEIGHT, prop.weight);
1115 1130
1116 if (prop.slant != rxvt_fontprop::unset 1131 if (prop.slant != rxvt_fontprop::unset
1117 && FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch) 1132 && (force_prop || FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch))
1118 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1133 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1119 1134
1120#if 0 // clipping unfortunately destroys our precious double-width-characters 1135#if 0 // clipping unfortunately destroys our precious double-width-characters
1121 // clip width, we can't do better, or can we? 1136 // clip width, we can't do better, or can we?
1122 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) 1137 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
… …
1128 1143
1129 // store generated name so iso14755 view gives better results 1144 // store generated name so iso14755 view gives better results
1130 set_name ((char *)FcNameUnparse (p)); 1145 set_name ((char *)FcNameUnparse (p));
1131 1146
1132 XftResult result; 1147 XftResult result;
1133 FcPattern *match = XftFontMatch (disp, r->display->screen, p, &result); 1148 FcPattern *match = XftFontMatch (disp, term->display->screen, p, &result);
1134 1149
1135 FcPatternDestroy (p); 1150 FcPatternDestroy (p);
1136 1151
1137 if (!match) 1152 if (!match)
1138 return false; 1153 return false;
… …
1180 XGlyphInfo g; 1195 XGlyphInfo g;
1181 XftTextExtents16 (disp, f, &ch, 1, &g); 1196 XftTextExtents16 (disp, f, &ch, 1, &g);
1182 1197
1183 g.width -= g.x; 1198 g.width -= g.x;
1184 1199
1185 int wcw = wcwidth (ch); 1200 int wcw = WCWIDTH (ch);
1186 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; 1201 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
1187 1202
1188 if (width < g.width ) width = g.width; 1203 if (width < g.width ) width = g.width;
1189 if (height < g.height ) height = g.height; 1204 if (height < g.height ) height = g.height;
1190 if (glheight < g.height - g.y) glheight = g.height - g.y; 1205 if (glheight < g.height - g.y) glheight = g.height - g.y;
… …
1236 1251
1237 return success; 1252 return success;
1238} 1253}
1239 1254
1240bool 1255bool
1241rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) 1256rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
1242{ 1257{
1243 careful = false; 1258 careful = false;
1244 1259
1245 if (!XftCharExists (DISPLAY, f, unicode)) 1260 if (!XftCharExists (term->dpy, f, unicode))
1246 return false; 1261 return false;
1247 1262
1248 if (!prop || prop->width == rxvt_fontprop::unset) 1263 if (!prop || prop->width == rxvt_fontprop::unset)
1249 return true; 1264 return true;
1250 1265
1251 // check character against base font bounding box 1266 // check character against base font bounding box
1252 FcChar32 ch = unicode; 1267 FcChar32 ch = unicode;
1253 XGlyphInfo g; 1268 XGlyphInfo g;
1254 XftTextExtents32 (DISPLAY, f, &ch, 1, &g); 1269 XftTextExtents32 (term->dpy, f, &ch, 1, &g);
1255 1270
1256 int w = g.width - g.x; 1271 int w = g.width - g.x;
1257 int wcw = wcwidth (unicode); 1272 int wcw = max (WCWIDTH (unicode), 1);
1258 if (wcw > 0) w = (w + wcw - 1) / wcw;
1259 1273
1260 careful = w > prop->width; 1274 careful = g.x > 0 || w > prop->width * wcw;
1261 if (careful && w > prop->width * MAX_OVERLAP >> 2) 1275
1276 if (careful && !OVERLAP_OK (w, wcw, prop))
1277 return false;
1278
1279 // this weeds out _totally_ broken fonts, or glyphs
1280 if (!OVERLAP_OK (g.xOff, wcw, prop))
1262 return false; 1281 return false;
1263 1282
1264 return true; 1283 return true;
1265} 1284}
1266 1285
1267void 1286void
1268rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, 1287rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1269 const text_t *text, int len, 1288 const text_t *text, int len,
1270 int fg, int bg) 1289 int fg, int bg)
1271{ 1290{
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; 1291 XGlyphInfo extents;
1277 FcChar32 *enc = (FcChar32 *) get_enc_buf (len * sizeof (FcChar32)); 1292 XftGlyphSpec *enc = (XftGlyphSpec *)rxvt_temp_buf (len * sizeof (XftGlyphSpec));
1278 FcChar32 *ep = enc; 1293 XftGlyphSpec *ep = enc;
1279 int ewidth = 0; 1294
1295 dTermDisplay;
1296 dTermGC;
1297
1298 int w = term->fwidth * len;
1299 int h = term->fheight;
1300
1301 /*
1302 * Maybe make buffering into a resource flag? Compile time option doesn't seems like a
1303 * good idea from the perspective of packaging for wide variety of user configs.
1304 */
1305 bool buffered = bg >= Color_transparent;
1306#ifdef FORCE_UNBUFFERED_XFT
1307 buffered = false;
1308#endif
1309
1310 // cut trailing spaces
1311 while (len && text [len - 1] == ' ')
1312 len--;
1313
1314 int x_ = buffered ? 0 : x;
1315 int y_ = buffered ? 0 : y;
1280 1316
1281 while (len) 1317 while (len)
1282 { 1318 {
1283 int cwidth = r->fwidth; 1319 int cwidth = term->fwidth;
1284 FcChar32 fc = *text++; len--; 1320 FcChar32 fc = *text++; len--;
1285 1321
1286 while (len && *text == NOCHAR) 1322 while (len && *text == NOCHAR)
1287 text++, len--, cwidth += r->fwidth; 1323 text++, len--, cwidth += term->fwidth;
1324
1325 if (fc != ' ') // skip spaces
1288 1326 {
1289 if (fc == ' ' && ep == enc) // skip leading spaces 1327 FT_UInt glyph = XftCharIndex (disp, f, fc);
1328 XftGlyphExtents (disp, f, &glyph, 1, &extents);
1329
1330 ep->glyph = glyph;
1331 ep->x = x_ + (cwidth - extents.xOff >> 1);
1332 ep->y = y_ + ascent;
1333
1334 if (extents.xOff == 0)
1335 ep->x = x_ + cwidth;
1336
1337 ep++;
1338 }
1339
1290 x += cwidth; 1340 x_ += cwidth;
1291 else 1341 }
1292 {
1293 FT_UInt gl = XftCharIndex (d.display->display, f, fc);
1294 XftGlyphExtents (d.display->display, f, &gl, 1, &extents);
1295 1342
1296 if (extents.xOff != cwidth) 1343 if (buffered)
1344 {
1345 if (ep != enc)
1346 {
1347 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1348
1349#ifdef HAVE_BG_PIXMAP
1350 Picture dst = 0; // the only assignment is done conditionally in the following if condition
1351
1352 if (term->bgPixmap.pixmap
1353 && (bg == Color_transparent || bg == Color_bg
1354 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2))))))
1297 { 1355 {
1298 if (ewidth) 1356 int src_x = x, src_y = y;
1357
1358 if (term->bgPixmap.is_parentOrigin ())
1299 { 1359 {
1300 XftDrawGlyphs (d, &r->pix_colors[fg].c, f,
1301 x, y + base, enc, ep - enc);
1302 x += ewidth; 1360 src_x += term->window_vt_x;
1303 1361 src_y += term->window_vt_y;
1304 ep = enc;
1305 ewidth = 0;
1306 } 1362 }
1307 1363
1308 if (extents.xOff > cwidth) 1364 if (term->bgPixmap.pmap_width >= src_x + w
1309 extents.xOff = cwidth; 1365 && term->bgPixmap.pmap_height >= src_y + h)
1366 {
1367 XCopyArea (disp, term->bgPixmap.pixmap, d2, gc,
1368 src_x, src_y, w, h, 0, 0);
1369 }
1370 else
1371 {
1372 XGCValues gcv;
1310 1373
1311 XftDrawGlyphs (d, &r->pix_colors[fg].c, f, 1374 gcv.fill_style = FillTiled;
1312 x + (cwidth - extents.xOff >> 1), 1375 gcv.tile = term->bgPixmap.pixmap;
1376 gcv.ts_x_origin = -src_x;
1377 gcv.ts_y_origin = -src_y;
1378
1379 XChangeGC (disp, gc,
1380 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
1313 y + base, &gl, 1); 1381 &gcv);
1314 x += cwidth; 1382
1383 XFillRectangle (disp, d2, gc, 0, 0, w, h);
1384
1385 gcv.fill_style = FillSolid;
1386 XChangeGC (disp, gc, GCFillStyle, &gcv);
1387 }
1388
1389 if (dst)
1390 {
1391 Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c);
1392
1393 // dst can only be set when bg >= 0
1394 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h);
1395 }
1315 } 1396 }
1316 else 1397 else
1317 { 1398#endif
1318 *ep++ = gl; 1399 XftDrawRect (d2, &term->pix_colors[bg >= 0 ? bg : Color_bg].c, 0, 0, w, h);
1319 ewidth += cwidth; 1400
1401 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);
1402 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
1320 } 1403 }
1321 } 1404 else
1405 clear_rect (d, x, y, w, h, bg);
1406 }
1407 else
1322 } 1408 {
1323 1409 clear_rect (d, x, y, w, h, bg);
1324 if (ep != enc)
1325 XftDrawGlyphs (d, &r->pix_colors[fg].c, f, 1410 XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc);
1326 x, y + base, enc, ep - enc); 1411 }
1327} 1412}
1413
1328#endif 1414#endif
1329 1415
1330///////////////////////////////////////////////////////////////////////////// 1416/////////////////////////////////////////////////////////////////////////////
1331 1417
1332rxvt_fontset::rxvt_fontset (rxvt_t r) 1418rxvt_fontset::rxvt_fontset (rxvt_term *term)
1333: fontdesc (0), r (r) 1419: fontdesc (0), term (term)
1334{ 1420{
1335 clear (); 1421 clear ();
1336} 1422}
1337 1423
1338rxvt_fontset::~rxvt_fontset () 1424rxvt_fontset::~rxvt_fontset ()
… …
1343void 1429void
1344rxvt_fontset::clear () 1430rxvt_fontset::clear ()
1345{ 1431{
1346 prop.width = prop.height = prop.ascent = prop.weight = prop.slant 1432 prop.width = prop.height = prop.ascent = prop.weight = prop.slant
1347 = rxvt_fontprop::unset; 1433 = rxvt_fontprop::unset;
1434 force_prop = false;
1348 1435
1349 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) 1436 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1350 FONT_UNREF (*i); 1437 FONT_UNREF (*i);
1351 1438
1352 for (pagemap **p = fmap.begin (); p != fmap.end (); p++) 1439 for (pagemap **p = fmap.begin (); p != fmap.end (); p++)
… …
1361 1448
1362rxvt_font * 1449rxvt_font *
1363rxvt_fontset::new_font (const char *name, codeset cs) 1450rxvt_fontset::new_font (const char *name, codeset cs)
1364{ 1451{
1365 rxvt_font *f; 1452 rxvt_font *f;
1366 1453
1367 if (!name || !*name) 1454 if (!name || !*name)
1368 { 1455 {
1369 name = ""; 1456 name = "";
1370 f = new rxvt_font_default (this); 1457 f = new rxvt_font_default (this);
1371 } 1458 }
… …
1382 f = new rxvt_font_x11; 1469 f = new rxvt_font_x11;
1383 } 1470 }
1384 else 1471 else
1385 f = new rxvt_font_x11; 1472 f = new rxvt_font_x11;
1386 1473
1387 f->set_term (r); 1474 f->set_term (term);
1388 f->set_name (strdup (name)); 1475 f->set_name (strdup (name));
1389 1476
1390 f->cs = cs; 1477 f->cs = cs;
1391 f->loaded = false; 1478 f->loaded = false;
1392 1479
… …
1439 if (!end) 1526 if (!end)
1440 end = desc + strlen (desc); 1527 end = desc + strlen (desc);
1441 1528
1442 if (end - desc < 511) 1529 if (end - desc < 511)
1443 { 1530 {
1444 strncpy (buf, desc, end - desc); 1531 memcpy (buf, desc, end - desc);
1445 buf[end - desc] = 0; 1532 buf[end - desc] = 0;
1446 1533
1447 fonts.push_back (new_font (buf, cs)); 1534 fonts.push_back (new_font (buf, cs));
1448 } 1535 }
1449 else 1536 else
… …
1464 if (fonts[i]->loaded) 1551 if (fonts[i]->loaded)
1465 return true; 1552 return true;
1466 1553
1467 fonts[i]->loaded = true; 1554 fonts[i]->loaded = true;
1468 1555
1469 if (!fonts[i]->load (prop)) 1556 if (!fonts[i]->load (prop, force_prop))
1470 { 1557 {
1471 fonts[i]->cs = CS_UNKNOWN; 1558 fonts[i]->cs = CS_UNKNOWN;
1472 return false; 1559 return false;
1473 } 1560 }
1474 1561
… …
1575 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1662 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1576 FcPatternAddBool (p, FC_MINSPACE, 1); 1663 FcPatternAddBool (p, FC_MINSPACE, 1);
1577 //FcPatternAddBool (p, FC_ANTIALIAS, 1); 1664 //FcPatternAddBool (p, FC_ANTIALIAS, 1);
1578 1665
1579 XftResult result; 1666 XftResult result;
1580 FcPattern *match = XftFontMatch (DISPLAY, r->display->screen, p, &result); 1667 FcPattern *match = XftFontMatch (term->dpy, term->display->screen, p, &result);
1581 1668
1582 FcPatternDestroy (p); 1669 FcPatternDestroy (p);
1583 1670
1584 if (match) 1671 if (match)
1585 { 1672 {
… …
1590 if (find_font (font) < 0) 1677 if (find_font (font) < 0)
1591 { 1678 {
1592 char fontname[4096]; 1679 char fontname[4096];
1593 sprintf (fontname, "xft:%-.4090s", font); 1680 sprintf (fontname, "xft:%-.4090s", font);
1594 1681
1595 fonts.push_back (new_font (fontname, CS_UNICODE)); 1682 fonts.push_back (new_font (fontname, CS_UNICODE));
1596 } 1683 }
1597 1684
1598 free (font); 1685 free (font);
1599 } 1686 }
1600#endif 1687#endif

Diff Legend

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