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.124 by ayin, Sat Nov 24 11:41:11 2007 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-2006 Marc Lehmann <pcg@goof.com>
5 * - original version. 5 * - original version.
6 * 6 *
7 * This program is free software; you can redistribute it and/or modify 7 * This program is free software; you can redistribute it and/or modify
8 * it under the terms of the GNU General Public License as published by 8 * it under the terms of the GNU General Public License as published by
9 * the Free Software Foundation; either version 2 of the License, or 9 * the Free Software Foundation; either version 2 of the License, or
… …
19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA 19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20 *---------------------------------------------------------------------*/ 20 *---------------------------------------------------------------------*/
21 21
22#include "../config.h" 22#include "../config.h"
23#include "rxvt.h" 23#include "rxvt.h"
24#include "rxvtlib.h"
24#include "rxvtutil.h" 25#include "rxvtutil.h"
25#include "rxvtfont.h" 26#include "rxvtfont.h"
26 27
27#include <cstdlib> 28#include <cstdlib>
28#include <wchar.h> 29
29#include <inttypes.h> 30#include <inttypes.h>
30 31
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 32#define MAX_OVERLAP_ROMAN (8 + 2) // max. character width in 8ths of the base width
33#define MAX_OVERLAP_ITALIC (8 + 3) // max. overlap for italic fonts
34
35#define OVERLAP_OK(w,wcw,prop) ((w) <= ( \
36 (prop)->slant >= rxvt_fontprop::italic \
37 ? ((prop)->width * (wcw) * MAX_OVERLAP_ITALIC + 7) >> 3 \
38 : ((prop)->width * (wcw) * MAX_OVERLAP_ROMAN + 7) >> 3 \
39 ))
35 40
36const struct rxvt_fallback_font { 41const struct rxvt_fallback_font {
37 codeset cs; 42 codeset cs;
38 const char *name; 43 const char *name;
39} fallback_fonts[] = { 44} fallback_fonts[] = {
40 { CS_ISO8859_1, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-1" }, 45 { CS_ISO8859_1, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-1" },
41 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-15" }, 46 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-15" },
42 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-fcd8859-15" }, 47 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-fcd8859-15" },
43 48
44#if ENCODING_EU 49#if ENCODING_EU
45 // cyrillic 50 // cyrillic
46 { CS_KOI8_R, "-*-*-*-r-*--*-*-*-*-c-*-koi8-r" }, 51 { CS_KOI8_R, "-*-*-*-r-*--*-*-*-*-c-*-koi8-r" },
47 { CS_KOI8_U, "-*-*-*-r-*--*-*-*-*-c-*-koi8-u" }, 52 { CS_KOI8_U, "-*-*-*-r-*--*-*-*-*-c-*-koi8-u" },
48 53
49 { CS_ISO8859_2, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-2" }, 54 { CS_ISO8859_2, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-2" },
50 { CS_ISO8859_3, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-3" }, 55 { CS_ISO8859_3, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-3" },
51 { CS_ISO8859_4, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-4" }, 56 { CS_ISO8859_4, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-4" },
52 { CS_ISO8859_5, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-5" }, 57 { CS_ISO8859_5, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-5" },
53 { CS_ISO8859_6, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-6" }, 58 { CS_ISO8859_6, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-6" },
… …
59 { CS_ISO8859_13, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-13" }, 64 { CS_ISO8859_13, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-13" },
60 { CS_ISO8859_14, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-14" }, 65 { CS_ISO8859_14, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-14" },
61 { CS_ISO8859_16, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-16" }, 66 { CS_ISO8859_16, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-16" },
62 67
63# if XFT 68# if XFT
64 { CS_KOI8_U, "xft::spacing=100:lang=ru:antialias=false" }, 69 { CS_KOI8_U, "xft::lang=ru" },
65 70
66 { CS_ISO8859_5, "xft::spacing=100:lang=ru:antialias=false" }, 71 { CS_ISO8859_5, "xft::lang=ru" },
67 { CS_ISO8859_6, "xft::spacing=100:lang=ar:antialias=false" }, 72 { CS_ISO8859_6, "xft::lang=ar" },
68 { CS_ISO8859_7, "xft::spacing=100:lang=el:antialias=false" }, 73 { CS_ISO8859_7, "xft::lang=el" },
69 { CS_ISO8859_8, "xft::spacing=100:lang=he:antialias=false" }, 74 { CS_ISO8859_8, "xft::lang=he" },
70 { CS_ISO8859_9, "xft::spacing=100:lang=tr:antialias=false" }, 75 { CS_ISO8859_9, "xft::lang=tr" },
71 { CS_ISO8859_10, "xft::spacing=100:lang=se:antialias=false" }, 76 { CS_ISO8859_10, "xft::lang=se" },
72 { CS_ISO8859_11, "xft::spacing=100:lang=th:antialias=false" }, 77 { CS_ISO8859_11, "xft::lang=th" },
73# endif 78# endif
74#endif 79#endif
75 80
76 // japanese 81 // japanese
77#if ENCODING_JP || ENCODING_JP_EXT 82#if ENCODING_JP || ENCODING_JP_EXT
78# if XFT 83# if XFT
79 // prefer xft for complex scripts 84 // prefer xft for complex scripts
80 { CS_JIS0208_1990_0, "xft:Kochi Gothic:antialias=false" }, 85 { CS_JIS0208_1990_0, "xft:Kochi Gothic:antialias=false" },
81 { CS_JIS0208_1990_0, "xft:Sazanami Mincho:antialias=false" }, 86 { CS_JIS0208_1990_0, "xft:Sazanami Mincho:antialias=false" },
82 { CS_JIS0208_1990_0, "xft:Mincho:antialias=false" }, 87 { CS_JIS0208_1990_0, "xft:Mincho:antialias=false" },
83 { CS_JIS0208_1990_0, "xft::lang=ja:spacing=100:antialias=false" }, 88 { CS_JIS0208_1990_0, "xft::lang=ja:antialias=false" },
84# endif 89# endif
85 { CS_JIS0201_1976_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0201*-0" }, 90 { CS_JIS0201_1976_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0201*-0" },
86 { CS_JIS0208_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" }, 91 { CS_JIS0208_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" },
87 { CS_JIS0212_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0212*-0" }, 92 { CS_JIS0212_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0212*-0" },
88 { CS_JIS0201_1976_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0201*-0" }, 93 { CS_JIS0201_1976_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0201*-0" },
… …
92 97
93#if ENCODING_ZH || ENCODING_ZH_EXT 98#if ENCODING_ZH || ENCODING_ZH_EXT
94# if XFT 99# if XFT
95 { CS_GBK_0, "xft:AR PL KaitiM GB" }, 100 { CS_GBK_0, "xft:AR PL KaitiM GB" },
96 { CS_GBK_0, "xft:AR PL SungtiL GB" }, 101 { CS_GBK_0, "xft:AR PL SungtiL GB" },
97 { CS_GBK_0, "xft::spacing=100:lang=zh" }, 102 { CS_GBK_0, "xft::lang=zh" },
98 { CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" }, 103 { CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" },
99 { CS_BIG5_EXT, "xft:AR PL KaitiM Big5" }, 104 { CS_BIG5_EXT, "xft:AR PL KaitiM Big5" },
100 { CS_GB2312_1980_0, "xft:AR PL KaitiM GB" }, 105 { CS_GB2312_1980_0, "xft:AR PL KaitiM GB" },
101 { CS_GB2312_1980_0, "xft:AR PL SungtiL GB" }, 106 { CS_GB2312_1980_0, "xft:AR PL SungtiL GB" },
102 { CS_GB2312_1980_0, "xft::spacing=100:lang=zh" }, 107 { CS_GB2312_1980_0, "xft::lang=zh" },
103# endif 108# endif
104 { CS_GBK_0, "-*-*-*-*-*-*-*-*-*-*-c-*-gbk*-0" }, 109 { CS_GBK_0, "-*-*-*-*-*-*-*-*-*-*-c-*-gbk*-0" },
105 { CS_BIG5, "-*-*-*-*-*-*-*-*-*-*-c-*-big5-0" }, 110 { CS_BIG5, "-*-*-*-*-*-*-*-*-*-*-c-*-big5-0" },
106 { CS_BIG5_PLUS, "-*-*-*-*-*-*-*-*-*-*-c-*-big5p-0" }, 111 { CS_BIG5_PLUS, "-*-*-*-*-*-*-*-*-*-*-c-*-big5p-0" },
107 { CS_BIG5_EXT, "-*-*-*-*-*-*-*-*-*-*-c-*-big5.eten-0" }, 112 { CS_BIG5_EXT, "-*-*-*-*-*-*-*-*-*-*-c-*-big5.eten-0" },
… …
120#if ENCODING_KR 125#if ENCODING_KR
121 { CS_KSC5601_1987_0, "-baekmuk-gulim-*-*-*-*-*-*-*-*-c-*-ksc5601*" }, 126 { CS_KSC5601_1987_0, "-baekmuk-gulim-*-*-*-*-*-*-*-*-c-*-ksc5601*" },
122 { CS_KSC5601_1987_0, "-*-*-*-*-*-*-*-*-*-*-c-*-ksc5601*" }, 127 { CS_KSC5601_1987_0, "-*-*-*-*-*-*-*-*-*-*-c-*-ksc5601*" },
123# if XFT 128# if XFT
124 { CS_KSC5601_1987_0, "xft:Baekmuk Gulim:antialias=false" }, 129 { CS_KSC5601_1987_0, "xft:Baekmuk Gulim:antialias=false" },
125 { CS_KSC5601_1987_0, "xft::spacing=100:lang=ko:antialias=false" }, 130 { CS_KSC5601_1987_0, "xft::lang=ko:antialias=false" },
126# endif 131# endif
127#endif 132#endif
128 133
129 // generic font fallback
130 { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" }, 134 { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" },
131 { CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" }, 135 //{ 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 136#if XFT
135 { CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true" }, 137 { CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true" },
136 { CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" }, 138 { CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" },
137 { CS_UNICODE, "xft:Andale Mono:antialias=false:autohint=false" }, 139 { CS_UNICODE, "xft:Andale Mono:antialias=false:autohint=false" },
138 { CS_UNICODE, "xft:Arial Unicode MS:antialias=false:autohint=false" }, 140 { CS_UNICODE, "xft:Arial Unicode MS:antialias=false:autohint=false" },
139 141
140 // FreeMono is usually uglier than x fonts, so try last only. 142 // FreeMono is usually uglier than x fonts, so try after the others
141 { CS_UNICODE, "xft:FreeMono:autohint=true" }, 143 { CS_UNICODE, "xft:FreeMono:autohint=true" },
142#endif 144#endif
143 145
146 // generic font fallback, put this last, as many iso10646 fonts have extents
147 // specified for all glyphs in the range they cover, but most are simply empty
148 //{ CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" },
149 //{ CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" },
144 { CS_UNKNOWN, 0 } 150 { CS_UNKNOWN, 0 }
145}; 151};
146 152
147// these characters are used to guess the font height and width 153// these characters are used to guess the font height and width
148// pango uses a similar algorithm and doesn't trust the font either. 154// pango uses a similar algorithm and doesn't trust the font either.
… …
152 0x304c, 0x672c, // が本 158 0x304c, 0x672c, // が本
153}; 159};
154 160
155#define NUM_EXTENT_TEST_CHARS (sizeof (extent_test_chars) / sizeof (extent_test_chars[0])) 161#define NUM_EXTENT_TEST_CHARS (sizeof (extent_test_chars) / sizeof (extent_test_chars[0]))
156 162
163#define dTermDisplay Display *disp = term->dpy
164#define dTermGC GC gc = term->gc
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/////////////////////////////////////////////////////////////////////////////
215
216rxvt_font::rxvt_font ()
217: name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset)
218{
219}
238 220
239void 221void
240rxvt_font::set_name (char *name) 222rxvt_font::set_name (char *name)
241{ 223{
242 if (this->name == name) 224 if (this->name == name)
… …
245 if (this->name) free (this->name); // let the compiler optimize 227 if (this->name) free (this->name); // let the compiler optimize
246 this->name = name; 228 this->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 bool done = false;
243#ifdef HAVE_BG_PIXMAP
244 if (term->bgPixmap.pixmap && color >= 0 && term->pix_colors[color].c.color.alpha < 0x0ff00)
245 {
246 Picture dst = XftDrawPicture (d);
247 if (dst != 0)
248 {
249 XClearArea (disp, d, x, y, w, h, false);
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 done = true;
253 }
254 }
255#endif
256 if (!done)
257 XftDrawRect (d, &r->pix_colors[color].c, x, y, w, h); 257 XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);
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 (cc->c1)];
444 f1->draw (d, x, y, chrs, width, fg, bg); 455 f1->draw (d, x, y, chrs, width, fg, bg);
… …
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 (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}
… …
481 492
482 void clear (); 493 void clear ();
483 494
484 rxvt_fontprop properties (); 495 rxvt_fontprop properties ();
485 496
486 bool load (const rxvt_fontprop &prop); 497 bool load (const rxvt_fontprop &prop, bool force_prop);
487 498
488 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful); 499 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
489 500
490 void draw (rxvt_drawable &d, int x, int y, 501 void draw (rxvt_drawable &d, int x, int y,
491 const text_t *text, int len, 502 const text_t *text, int len,
492 int fg, int bg); 503 int fg, int bg);
493 504
494 bool slow; // wether this is a proportional font or has other funny characteristics 505 bool slow; // wether this is a proportional font or has other funny characteristics
495 XFontStruct *f; 506 XFontStruct *f;
496 codeset cs;
497 bool enc2b, encm; 507 bool enc2b, encm;
498 508
499 char *get_property (XFontStruct *f, const char *property, const char *repl) const; 509 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); 510 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); 511 bool set_properties (rxvt_fontprop &p, XFontStruct *f);
502 bool set_properties (rxvt_fontprop &p, const char *name); 512 bool set_properties (rxvt_fontprop &p, const char *name);
503}; 513};
504 514
505char * 515char *
506rxvt_font_x11::get_property (XFontStruct *f, const char *property, const char *repl) const 516rxvt_font_x11::get_property (XFontStruct *f, Atom property, const char *repl) const
507{ 517{
508 unsigned long value; 518 unsigned long value;
509 519
510 if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value)) 520 if (XGetFontProperty (f, property, &value))
511 return XGetAtomName (DISPLAY, value); 521 return XGetAtomName (term->dpy, value);
512 else 522 else
513 return rxvt_strdup (repl); 523 return repl ? strdup (repl) : 0;
514} 524}
515 525
516rxvt_fontprop 526rxvt_fontprop
517rxvt_font_x11::properties () 527rxvt_font_x11::properties ()
518{ 528{
… …
522} 532}
523 533
524bool 534bool
525rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth) 535rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth)
526{ 536{
527 p.width = avgwidth ? (avgwidth + 1) / 10 : (height + 1) / 2; 537 p.width = width != rxvt_fontprop::unset ? width
538 : avgwidth ? (avgwidth + 1) / 10
539 : (height + 1) / 2;
528 p.height = height; 540 p.height = height;
529 p.ascent = rxvt_fontprop::unset; 541 p.ascent = rxvt_fontprop::unset;
530 p.weight = *weight == 'B' || *weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium; 542 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; 543 p.slant = *slant == 'r' || *slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic;
532 544
… …
537rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f) 549rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)
538{ 550{
539 unsigned long height; 551 unsigned long height;
540 552
541#if 0 553#if 0
542 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "PIXEL_SIZE", 0), &height)) 554 if (!XGetFontProperty (f, XInternAtom (term->dpy, "PIXEL_SIZE", 0), &height))
543 return false; 555 return false;
544#else 556#else
545 height = f->ascent + f->descent; 557 height = f->ascent + f->descent;
546#endif 558#endif
547 559
548 unsigned long avgwidth; 560 unsigned long avgwidth;
549 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth)) 561 if (!XGetFontProperty (f, term->xa [XA_AVERAGE_WIDTH], &avgwidth))
550 avgwidth = 0; 562 avgwidth = 0;
551 563
552 char *weight = get_property (f, "WEIGHT_NAME", "medium"); 564 char *weight = get_property (f, term->xa [XA_WEIGHT_NAME], "medium");
553 char *slant = get_property (f, "SLANT", "r"); 565 char *slant = get_property (f, term->xa [XA_SLANT], "r");
554 566
555 set_properties (p, height, weight, slant, avgwidth); 567 set_properties (p, height, weight, slant, avgwidth);
556 568
557 free (weight); 569 free (weight);
558 free (slant); 570 free (slant);
… …
563} 575}
564 576
565bool 577bool
566rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name) 578rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name)
567{ 579{
580 dTermDisplay;
568 int slashes = 0; 581 int slashes = 0;
569 const char *comp[13]; 582 const char *comp[13];
570 583
571 for (const char *c = name; *c; c++) 584 for (const char *c = name; *c; c++)
572 if (*c == '-') 585 if (*c == '-')
… …
580 if (slashes >= 13 593 if (slashes >= 13
581 && (*comp[ 6] >= '1' && *comp[ 6] <= '9') 594 && (*comp[ 6] >= '1' && *comp[ 6] <= '9')
582 && (*comp[11] >= '0' && *comp[11] <= '9')) 595 && (*comp[11] >= '0' && *comp[11] <= '9'))
583 return set_properties (p, atoi (comp[6]), comp[2], comp[3], atoi (comp[11])); 596 return set_properties (p, atoi (comp[6]), comp[2], comp[3], atoi (comp[11]));
584 597
585 XFontStruct *f = XLoadQueryFont (DISPLAY, name); 598 XFontStruct *f = XLoadQueryFont (disp, name);
586 599
587 if (f) 600 if (f)
588 { 601 {
589 // the font should really exist now. if not, we have a problem 602 // 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). 603 // (e.g. if the user did xset fp rehash just when we were searching fonts).
591 // in that case, just return garbage. 604 // in that case, just return garbage.
592 bool ret = set_properties (p, f); 605 bool ret = set_properties (p, f);
593 XFreeFont (DISPLAY, f); 606 XFreeFont (disp, f);
594 return ret; 607 return ret;
595 } 608 }
596 else 609 else
597 return false; 610 return false;
598} 611}
… …
634 return false; 647 return false;
635 } 648 }
636} 649}
637 650
638bool 651bool
639rxvt_font_x11::load (const rxvt_fontprop &prop) 652rxvt_font_x11::load (const rxvt_fontprop &prop, bool force_prop)
640{ 653{
641 Display *disp = DISPLAY; 654 dTermDisplay;
642 655
643 clear (); 656 clear ();
644 657
645 char field_str[64]; // enough for 128 bits 658 char field_str[64]; // enough for 128 bits
646 659
647 // first morph the font if required 660 // first morph the font if required
648 if (prop.weight != rxvt_fontprop::unset 661 if (force_prop)
649 || prop.slant != rxvt_fontprop::unset)
650 { 662 {
651 char fname[1024]; 663 char fname[1024];
652 664
653 if (name[0] != '-') 665 if (name[0] != '-')
654 { 666 {
655 f = XLoadQueryFont (disp, name); 667 f = XLoadQueryFont (disp, name);
656 668
657 if (!f) 669 if (!f)
658 return false; 670 return false;
659 671
660 char *new_name = get_property (f, "FONT", name); 672 char *new_name = get_property (f, XA_FONT, name);
661 673
662 if (new_name) 674 if (new_name)
663 set_name (new_name); 675 set_name (new_name);
664 else 676 else
665 rxvt_warn ("font '%s' has no FONT property, continuing without.", name); 677 rxvt_warn ("font '%s' has no FONT property, continuing without.", name);
… …
668 f = 0; 680 f = 0;
669 } 681 }
670 682
671 if (prop.weight != rxvt_fontprop::unset) 683 if (prop.weight != rxvt_fontprop::unset)
672 { 684 {
673 replace_field (fname, name, 2, 0, 685 replace_field (fname, name, 2, 0,
674 prop.weight < rxvt_fontprop::bold 686 prop.weight < rxvt_fontprop::bold
675 ? "medium" : "bold"); 687 ? "medium" : "bold");
676 set_name (strdup (fname)); 688 set_name (strdup (fname));
677 } 689 }
678 690
… …
721 int diff = 0; 733 int diff = 0;
722 734
723 if (replace_field (fname, list[i], 6, '0', field_str)) 735 if (replace_field (fname, list[i], 6, '0', field_str))
724 diff += 10; // slightly penalize scalable fonts 736 diff += 10; // slightly penalize scalable fonts
725 else if (replace_field (fname, list[i], 11, '0', "0")) 737 else if (replace_field (fname, list[i], 11, '0', "0"))
726 diff += 300; // more heavily penalize what looks like scaled bitmap fotns 738 diff += 300; // more heavily penalize what looks like scaled bitmap fonts
727 739
728 if (!set_properties (p, fname)) 740 if (!set_properties (p, fname))
729 continue; 741 continue;
730 742
731 if (prop.height != rxvt_fontprop::unset 743 if (prop.height != rxvt_fontprop::unset
… …
774 delete [] fonts; 786 delete [] fonts;
775 787
776 if (!f) 788 if (!f)
777 return false; 789 return false;
778 790
779 char *registry = get_property (f, "CHARSET_REGISTRY", 0); 791 char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0);
780 char *encoding = get_property (f, "CHARSET_ENCODING", 0); 792 char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0);
781 793
782 if (registry && encoding) 794 if (registry && encoding)
783 { 795 {
784 char charset[64]; 796 char charset[64];
785 snprintf (charset, 64, "%s-%s", registry, encoding); 797 snprintf (charset, 64, "%s-%s", registry, encoding);
786 798
787 cs = codeset_from_name (charset); 799 cs = codeset_from_name (charset);
788 } 800 }
789 else 801 else
790 { 802 {
791 const char *charset = get_property (f, "FONT", 0); 803 const char *charset = get_property (f, XA_FONT, 0);
792 804
793 if (!charset) 805 if (!charset)
794 charset = name; 806 charset = name;
795 807
796 int count = 13; 808 int count = 13;
… …
811 enc2b = encm || f->max_char_or_byte2 > 255; 823 enc2b = encm || f->max_char_or_byte2 > 255;
812 824
813 slow = false; 825 slow = false;
814 826
815#if 1 // only used for slow detection, TODO optimize 827#if 1 // only used for slow detection, TODO optimize
816 if (f->min_bounds.width == f->max_bounds.width) 828 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; 829 width = f->max_bounds.width;
820 else 830 else
821 { 831 {
822 slow = true; 832 slow = true;
823 833
824 int N = f->max_char_or_byte2 - f->min_char_or_byte2; 834 int N = f->max_char_or_byte2 - f->min_char_or_byte2;
825 835
826 if (encm) 836 if (encm)
827 N += (f->max_byte1 - f->min_byte1) 837 N += (f->max_byte1 - f->min_byte1)
828 * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1); 838 * (f->max_char_or_byte2 - f->min_char_or_byte2 + 1);
829 839
830 while (N) 840 while (N)
831 { 841 {
832 if (f->per_char[N].width > width) 842 if (f->per_char[N].width > width)
833 width = f->per_char[N].width; 843 width = f->per_char[N].width;
834 844
… …
839 849
840 width = 1; 850 width = 1;
841 851
842 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 852 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; )
843 { 853 {
844 if (cs != CS_UNICODE
845 && *t > 0x100
846 && FROM_UNICODE (cs, *t) == NOCHAR) 854 if (FROM_UNICODE (cs, *t) == NOCHAR)
847 continue; 855 continue;
848 856
849 // ignore characters we wouldn't use anyways 857 // ignore characters we wouldn't use anyways
850 bool careful; 858 bool careful;
851 if (!has_char (*t, &prop, careful)) 859 if (!has_char (*t, &prop, careful))
… …
855 863
856 XCharStruct g; 864 XCharStruct g;
857 int dir_ret, asc_ret, des_ret; 865 int dir_ret, asc_ret, des_ret;
858 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); 866 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);
859 867
868 int wcw = WCWIDTH (*t);
860 int wcw = wcwidth (*t); if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; 869 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
861 870
862 if (width < g.width) width = g.width; 871 if (width < g.width) width = g.width;
863 } 872 }
864 873
865 if (cs == CS_UNKNOWN) 874 if (cs == CS_UNKNOWN)
866 { 875 {
867 fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name); 876 fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);
… …
884void 893void
885rxvt_font_x11::clear () 894rxvt_font_x11::clear ()
886{ 895{
887 if (f) 896 if (f)
888 { 897 {
889 XFreeFont (DISPLAY, f); 898 XFreeFont (term->dpy, f);
890 f = 0; 899 f = 0;
891 } 900 }
892} 901}
893 902
894bool 903bool
895rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) 904rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
896{ 905{
897 uint32_t ch = FROM_UNICODE (cs, unicode); 906 uint32_t ch = FROM_UNICODE (cs, unicode);
898 907
899 if (ch == NOCHAR) 908 if (ch == NOCHAR)
900 return false; 909 return false;
… …
937 return false; 946 return false;
938 947
939 if (!prop || prop->width == rxvt_fontprop::unset) 948 if (!prop || prop->width == rxvt_fontprop::unset)
940 return true; 949 return true;
941 950
942 // check character against base font bounding box 951 // check wether character overlaps previous/next character
943 int w = xcs->width; 952 int w = xcs->rbearing - xcs->lbearing;
944 int wcw = wcwidth (unicode); 953 int wcw = max (WCWIDTH (unicode), 1);
945 if (wcw > 0) w = (w + wcw - 1) / wcw;
946 954
947 careful = w > prop->width; 955 careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw;
948 if (careful && w > prop->width * MAX_OVERLAP >> 2) 956
957 if (careful && !OVERLAP_OK (w, wcw, prop))
949 return false; 958 return false;
950 959
951 return true; 960 return true;
952} 961}
953 962
… …
959 // this looks like a mess /. 968 // this looks like a mess /.
960 // and it is a mess /. 969 // and it is a mess /.
961 // yet we are trying to be perfect /. 970 // yet we are trying to be perfect /.
962 // but the result still isn't perfect /. 971 // but the result still isn't perfect /.
963 972
973 dTermDisplay;
974 dTermGC;
975
964 bool slow = this->slow 976 bool slow = this->slow
965 || width != r->fwidth 977 || width != term->fwidth
966 || height != r->fheight; 978 || height != term->fheight;
967 979
968 int base = ascent; // sorry, incorrect: r->fbase; 980 int base = ascent; // sorry, incorrect: term->fbase;
969 981
970 XGCValues v; 982 XGCValues v;
971 v.foreground = r->pix_colors[fg]; 983 v.foreground = term->pix_colors[fg];
972 v.font = f->fid; 984 v.font = f->fid;
973 985
974 if (enc2b) 986 if (enc2b)
975 { 987 {
976 const XChar2b *xc = enc_xchar2b (text, len, cs, slow); 988 const XChar2b *xc = enc_xchar2b (text, len, cs, slow);
977 989
978 if (bg == Color_bg && !slow) 990 if (bg == Color_bg && !slow)
979 { 991 {
980 v.background = r->pix_colors[bg]; 992 v.background = term->pix_colors[bg];
981 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); 993 XChangeGC (disp, gc, GCForeground | GCBackground | GCFont, &v);
982 XDrawImageString16 (d.display->display, d, TGC, x, y + base, xc, len); 994 XDrawImageString16 (disp, d, gc, x, y + base, xc, len);
983 } 995 }
984 else 996 else
985 { 997 {
986 clear_rect (d, x, y, r->fwidth * len, r->fheight, bg); 998 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
987 999
988 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v); 1000 XChangeGC (disp, gc, GCForeground | GCFont, &v);
989 1001
990 if (slow) 1002 if (slow)
991 { 1003 {
992 do 1004 do
993 { 1005 {
994 if (xc->byte1 || xc->byte2) 1006 if (xc->byte1 || xc->byte2)
995 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, 1); 1007 XDrawString16 (disp, d, gc, x, y + base, xc, 1);
996 1008
997 x += r->fwidth; 1009 x += term->fwidth;
998 xc++; len--; 1010 xc++; len--;
999 } 1011 }
1000 while (len); 1012 while (len);
1001 } 1013 }
1002 else 1014 else
1003 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, len); 1015 XDrawString16 (disp, d, gc, x, y + base, xc, len);
1004 } 1016 }
1005 } 1017 }
1006 else 1018 else
1007 { 1019 {
1008 const char *xc = enc_char (text, len, cs, slow); 1020 const char *xc = enc_char (text, len, cs, slow);
1009 1021
1010 if (bg == Color_bg && !slow) 1022 if (bg == Color_bg && !slow)
1011 { 1023 {
1012 v.background = r->pix_colors[bg]; 1024 v.background = term->pix_colors[bg];
1013 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); 1025 XChangeGC (disp, gc, GCForeground | GCBackground | GCFont, &v);
1014 XDrawImageString (d.display->display, d, TGC, x, y + base, xc, len); 1026 XDrawImageString (disp, d, gc, x, y + base, xc, len);
1015 } 1027 }
1016 else 1028 else
1017 { 1029 {
1018 clear_rect (d, x, y, r->fwidth * len, r->fheight, bg); 1030 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
1019 1031
1020 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v); 1032 XChangeGC (disp, gc, GCForeground | GCFont, &v);
1021 1033
1022 if (slow) 1034 if (slow)
1023 { 1035 {
1024 do 1036 do
1025 { 1037 {
1026 if (*xc) 1038 if (*xc)
1027 XDrawString (d.display->display, d, TGC, x, y + base, xc, 1); 1039 XDrawString (disp, d, gc, x, y + base, xc, 1);
1028 1040
1029 x += r->fwidth; 1041 x += term->fwidth;
1030 xc++; len--; 1042 xc++; len--;
1031 } 1043 }
1032 while (len); 1044 while (len);
1033 } 1045 }
1034 else 1046 else
1035 XDrawString (d.display->display, d, TGC, x, y + base, xc, len); 1047 XDrawString (disp, d, gc, x, y + base, xc, len);
1036 } 1048 }
1037 } 1049 }
1038} 1050}
1039 1051
1040///////////////////////////////////////////////////////////////////////////// 1052/////////////////////////////////////////////////////////////////////////////
… …
1046 1058
1047 void clear (); 1059 void clear ();
1048 1060
1049 rxvt_fontprop properties (); 1061 rxvt_fontprop properties ();
1050 1062
1051 bool load (const rxvt_fontprop &prop); 1063 bool load (const rxvt_fontprop &prop, bool force_prop);
1052 1064
1053 void draw (rxvt_drawable &d, int x, int y, 1065 void draw (rxvt_drawable &d, int x, int y,
1054 const text_t *text, int len, 1066 const text_t *text, int len,
1055 int fg, int bg); 1067 int fg, int bg);
1056 1068
1057 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &carefull); 1069 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
1058 1070
1059protected: 1071protected:
1060 XftFont *f; 1072 XftFont *f;
1061}; 1073};
1062 1074
1063void 1075void
1064rxvt_font_xft::clear () 1076rxvt_font_xft::clear ()
1065{ 1077{
1066 if (f) 1078 if (f)
1067 { 1079 {
1068 XftFontClose (DISPLAY, f); 1080 XftFontClose (term->dpy, f);
1069 f = 0; 1081 f = 0;
1070 } 1082 }
1071} 1083}
1072 1084
1073rxvt_fontprop 1085rxvt_fontprop
… …
1089 1101
1090 return p; 1102 return p;
1091} 1103}
1092 1104
1093bool 1105bool
1094rxvt_font_xft::load (const rxvt_fontprop &prop) 1106rxvt_font_xft::load (const rxvt_fontprop &prop, bool force_prop)
1095{ 1107{
1096 Display *disp = DISPLAY; 1108 dTermDisplay;
1097 1109
1098 clear (); 1110 clear ();
1099 1111
1100 FcPattern *p = FcNameParse ((FcChar8 *) name); 1112 FcPattern *p = FcNameParse ((FcChar8 *) name);
1101 1113
… …
1108 && (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch 1120 && (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch
1109 && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch)) 1121 && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch))
1110 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height); 1122 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);
1111 1123
1112 if (prop.weight != rxvt_fontprop::unset 1124 if (prop.weight != rxvt_fontprop::unset
1113 && FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch) 1125 && (force_prop || FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch))
1114 FcPatternAddInteger (p, FC_WEIGHT, prop.weight); 1126 FcPatternAddInteger (p, FC_WEIGHT, prop.weight);
1115 1127
1116 if (prop.slant != rxvt_fontprop::unset 1128 if (prop.slant != rxvt_fontprop::unset
1117 && FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch) 1129 && (force_prop || FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch))
1118 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1130 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1119 1131
1120#if 0 // clipping unfortunately destroys our precious double-width-characters 1132#if 0 // clipping unfortunately destroys our precious double-width-characters
1121 // clip width, we can't do better, or can we? 1133 // clip width, we can't do better, or can we?
1122 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) 1134 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
… …
1128 1140
1129 // store generated name so iso14755 view gives better results 1141 // store generated name so iso14755 view gives better results
1130 set_name ((char *)FcNameUnparse (p)); 1142 set_name ((char *)FcNameUnparse (p));
1131 1143
1132 XftResult result; 1144 XftResult result;
1133 FcPattern *match = XftFontMatch (disp, r->display->screen, p, &result); 1145 FcPattern *match = XftFontMatch (disp, term->display->screen, p, &result);
1134 1146
1135 FcPatternDestroy (p); 1147 FcPatternDestroy (p);
1136 1148
1137 if (!match) 1149 if (!match)
1138 return false; 1150 return false;
… …
1180 XGlyphInfo g; 1192 XGlyphInfo g;
1181 XftTextExtents16 (disp, f, &ch, 1, &g); 1193 XftTextExtents16 (disp, f, &ch, 1, &g);
1182 1194
1183 g.width -= g.x; 1195 g.width -= g.x;
1184 1196
1185 int wcw = wcwidth (ch); 1197 int wcw = WCWIDTH (ch);
1186 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; 1198 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
1187 1199
1188 if (width < g.width ) width = g.width; 1200 if (width < g.width ) width = g.width;
1189 if (height < g.height ) height = g.height; 1201 if (height < g.height ) height = g.height;
1190 if (glheight < g.height - g.y) glheight = g.height - g.y; 1202 if (glheight < g.height - g.y) glheight = g.height - g.y;
… …
1236 1248
1237 return success; 1249 return success;
1238} 1250}
1239 1251
1240bool 1252bool
1241rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) 1253rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
1242{ 1254{
1243 careful = false; 1255 careful = false;
1244 1256
1245 if (!XftCharExists (DISPLAY, f, unicode)) 1257 if (!XftCharExists (term->dpy, f, unicode))
1246 return false; 1258 return false;
1247 1259
1248 if (!prop || prop->width == rxvt_fontprop::unset) 1260 if (!prop || prop->width == rxvt_fontprop::unset)
1249 return true; 1261 return true;
1250 1262
1251 // check character against base font bounding box 1263 // check character against base font bounding box
1252 FcChar32 ch = unicode; 1264 FcChar32 ch = unicode;
1253 XGlyphInfo g; 1265 XGlyphInfo g;
1254 XftTextExtents32 (DISPLAY, f, &ch, 1, &g); 1266 XftTextExtents32 (term->dpy, f, &ch, 1, &g);
1255 1267
1256 int w = g.width - g.x; 1268 int w = g.width - g.x;
1257 int wcw = wcwidth (unicode); 1269 int wcw = max (WCWIDTH (unicode), 1);
1258 if (wcw > 0) w = (w + wcw - 1) / wcw;
1259 1270
1260 careful = w > prop->width; 1271 careful = g.x > 0 || w > prop->width * wcw;
1261 if (careful && w > prop->width * MAX_OVERLAP >> 2) 1272
1273 if (careful && !OVERLAP_OK (w, wcw, prop))
1274 return false;
1275
1276 // this weeds out _totally_ broken fonts, or glyphs
1277 if (!OVERLAP_OK (g.xOff, wcw, prop))
1262 return false; 1278 return false;
1263 1279
1264 return true; 1280 return true;
1265} 1281}
1266 1282
1267void 1283void
1268rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, 1284rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1269 const text_t *text, int len, 1285 const text_t *text, int len,
1270 int fg, int bg) 1286 int fg, int bg)
1271{ 1287{
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; 1288 XGlyphInfo extents;
1277 FcChar32 *enc = (FcChar32 *) get_enc_buf (len * sizeof (FcChar32)); 1289 XftGlyphSpec *enc = (XftGlyphSpec *)rxvt_temp_buf (len * sizeof (XftGlyphSpec));
1278 FcChar32 *ep = enc; 1290 XftGlyphSpec *ep = enc;
1279 int ewidth = 0; 1291
1292 dTermDisplay;
1293 dTermGC;
1294
1295 int w = term->fwidth * len;
1296 int h = term->fheight;
1297
1298 /* TODO: this logic needs some more thinking, since we no longer do pseudo-transparency.
1299 * Maybe make buffering into a resource flag? Compile time option doesn't seems like a
1300 * good idea from the perspective of packaging for wide variety of user configs.
1301 */
1302 bool buffered = true
1303#ifdef FORCE_UNBUFFERED_XFT
1304 && bg >= 0
1305#endif
1306 ;
1307 // cut trailing spaces
1308 while (len && text [len - 1] == ' ')
1309 len--;
1310
1311 int x_ = buffered ? 0 : x;
1312 int y_ = buffered ? 0 : y;
1280 1313
1281 while (len) 1314 while (len)
1282 { 1315 {
1283 int cwidth = r->fwidth; 1316 int cwidth = term->fwidth;
1284 FcChar32 fc = *text++; len--; 1317 FcChar32 fc = *text++; len--;
1285 1318
1286 while (len && *text == NOCHAR) 1319 while (len && *text == NOCHAR)
1287 text++, len--, cwidth += r->fwidth; 1320 text++, len--, cwidth += term->fwidth;
1321
1322 if (fc != ' ') // skip spaces
1288 1323 {
1289 if (fc == ' ' && ep == enc) // skip leading spaces 1324 FT_UInt glyph = XftCharIndex (disp, f, fc);
1325 XftGlyphExtents (disp, f, &glyph, 1, &extents);
1326
1327 ep->glyph = glyph;
1328 ep->x = x_ + (cwidth - extents.xOff >> 1);
1329 ep->y = y_ + ascent;
1330
1331 if (extents.xOff == 0)
1332 ep->x = x_ + cwidth;
1333
1334 ep++;
1335 }
1336
1290 x += cwidth; 1337 x_ += cwidth;
1338 }
1339
1340 if (buffered)
1341 {
1342 bool back_rendered = false;
1343 if (ep != enc)
1344 {
1345 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1346
1347#ifdef HAVE_BG_PIXMAP
1348 if (term->bgPixmap.pixmap)
1349 {
1350 Picture dst = 0;
1351
1352 if (bg >= 0 && term->pix_colors[bg].c.color.alpha < 0x0ff00)
1353 dst = XftDrawPicture (d2);
1354
1355 if (bg < 0 || dst != 0)
1356 {
1357 int src_x = x, src_y = y ;
1358
1359 if (term->bgPixmap.is_parentOrigin ())
1360 {
1361 src_x += term->window_vt_x;
1362 src_y += term->window_vt_y;
1363 }
1364
1365 if (term->bgPixmap.pmap_width >= src_x+w
1366 && term->bgPixmap.pmap_height >= src_y+h)
1367 {
1368 XCopyArea (disp, term->bgPixmap.pixmap, d2, gc,
1369 src_x, src_y, w, h, 0, 0);
1370 }
1371 else
1372 {
1373 XGCValues gcv;
1374
1375 gcv.fill_style = FillTiled;
1376 gcv.tile = term->bgPixmap.pixmap;
1377 gcv.ts_x_origin = -src_x;
1378 gcv.ts_y_origin = -src_y;
1379
1380 XChangeGC (disp, gc,
1381 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
1382 &gcv);
1383
1384 XFillRectangle (disp, d2, gc, 0, 0, w, h);
1385
1386 gcv.fill_style = FillSolid;
1387 XChangeGC (disp, gc, GCFillStyle, &gcv);
1388 }
1389
1390 if (bg >= 0)
1391 {
1392 Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c);
1393 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h);
1394 }
1395
1396 back_rendered = true;
1397 }
1398 }
1399#endif
1400
1401 if (bg >= 0 && !back_rendered)
1402 XftDrawRect (d2, &term->pix_colors[bg].c, 0, 0, w, h);
1403
1404 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);
1405 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
1406 }
1291 else 1407 else
1292 { 1408 clear_rect (d, x, y, w, h, bg);
1293 FT_UInt gl = XftCharIndex (d.display->display, f, fc); 1409 }
1294 XftGlyphExtents (d.display->display, f, &gl, 1, &extents); 1410 else
1295
1296 if (extents.xOff != cwidth)
1297 {
1298 if (ewidth)
1299 {
1300 XftDrawGlyphs (d, &r->pix_colors[fg].c, f,
1301 x, y + base, enc, ep - enc);
1302 x += ewidth;
1303
1304 ep = enc;
1305 ewidth = 0;
1306 }
1307
1308 if (extents.xOff > cwidth)
1309 extents.xOff = cwidth;
1310
1311 XftDrawGlyphs (d, &r->pix_colors[fg].c, f,
1312 x + (cwidth - extents.xOff >> 1),
1313 y + base, &gl, 1);
1314 x += cwidth;
1315 }
1316 else
1317 {
1318 *ep++ = gl;
1319 ewidth += cwidth;
1320 }
1321 }
1322 } 1411 {
1323 1412 clear_rect (d, x, y, w, h, bg);
1324 if (ep != enc)
1325 XftDrawGlyphs (d, &r->pix_colors[fg].c, f, 1413 XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc);
1326 x, y + base, enc, ep - enc); 1414 }
1327} 1415}
1416
1328#endif 1417#endif
1329 1418
1330///////////////////////////////////////////////////////////////////////////// 1419/////////////////////////////////////////////////////////////////////////////
1331 1420
1332rxvt_fontset::rxvt_fontset (rxvt_t r) 1421rxvt_fontset::rxvt_fontset (rxvt_term *term)
1333: fontdesc (0), r (r) 1422: fontdesc (0), term (term)
1334{ 1423{
1335 clear (); 1424 clear ();
1336} 1425}
1337 1426
1338rxvt_fontset::~rxvt_fontset () 1427rxvt_fontset::~rxvt_fontset ()
… …
1343void 1432void
1344rxvt_fontset::clear () 1433rxvt_fontset::clear ()
1345{ 1434{
1346 prop.width = prop.height = prop.ascent = prop.weight = prop.slant 1435 prop.width = prop.height = prop.ascent = prop.weight = prop.slant
1347 = rxvt_fontprop::unset; 1436 = rxvt_fontprop::unset;
1437 force_prop = false;
1348 1438
1349 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) 1439 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1350 FONT_UNREF (*i); 1440 FONT_UNREF (*i);
1351 1441
1352 for (pagemap **p = fmap.begin (); p != fmap.end (); p++) 1442 for (pagemap **p = fmap.begin (); p != fmap.end (); p++)
… …
1361 1451
1362rxvt_font * 1452rxvt_font *
1363rxvt_fontset::new_font (const char *name, codeset cs) 1453rxvt_fontset::new_font (const char *name, codeset cs)
1364{ 1454{
1365 rxvt_font *f; 1455 rxvt_font *f;
1366 1456
1367 if (!name || !*name) 1457 if (!name || !*name)
1368 { 1458 {
1369 name = ""; 1459 name = "";
1370 f = new rxvt_font_default (this); 1460 f = new rxvt_font_default (this);
1371 } 1461 }
… …
1382 f = new rxvt_font_x11; 1472 f = new rxvt_font_x11;
1383 } 1473 }
1384 else 1474 else
1385 f = new rxvt_font_x11; 1475 f = new rxvt_font_x11;
1386 1476
1387 f->set_term (r); 1477 f->set_term (term);
1388 f->set_name (strdup (name)); 1478 f->set_name (strdup (name));
1389 1479
1390 f->cs = cs; 1480 f->cs = cs;
1391 f->loaded = false; 1481 f->loaded = false;
1392 1482
… …
1464 if (fonts[i]->loaded) 1554 if (fonts[i]->loaded)
1465 return true; 1555 return true;
1466 1556
1467 fonts[i]->loaded = true; 1557 fonts[i]->loaded = true;
1468 1558
1469 if (!fonts[i]->load (prop)) 1559 if (!fonts[i]->load (prop, force_prop))
1470 { 1560 {
1471 fonts[i]->cs = CS_UNKNOWN; 1561 fonts[i]->cs = CS_UNKNOWN;
1472 return false; 1562 return false;
1473 } 1563 }
1474 1564
… …
1575 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1665 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1576 FcPatternAddBool (p, FC_MINSPACE, 1); 1666 FcPatternAddBool (p, FC_MINSPACE, 1);
1577 //FcPatternAddBool (p, FC_ANTIALIAS, 1); 1667 //FcPatternAddBool (p, FC_ANTIALIAS, 1);
1578 1668
1579 XftResult result; 1669 XftResult result;
1580 FcPattern *match = XftFontMatch (DISPLAY, r->display->screen, p, &result); 1670 FcPattern *match = XftFontMatch (term->dpy, term->display->screen, p, &result);
1581 1671
1582 FcPatternDestroy (p); 1672 FcPatternDestroy (p);
1583 1673
1584 if (match) 1674 if (match)
1585 { 1675 {
… …
1590 if (find_font (font) < 0) 1680 if (find_font (font) < 0)
1591 { 1681 {
1592 char fontname[4096]; 1682 char fontname[4096];
1593 sprintf (fontname, "xft:%-.4090s", font); 1683 sprintf (fontname, "xft:%-.4090s", font);
1594 1684
1595 fonts.push_back (new_font (fontname, CS_UNICODE)); 1685 fonts.push_back (new_font (fontname, CS_UNICODE));
1596 } 1686 }
1597 1687
1598 free (font); 1688 free (font);
1599 } 1689 }
1600#endif 1690#endif

Diff Legend

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