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.78 by root, Fri Jan 6 05:37:59 2006 UTC vs.
Revision 1.119 by sasha, Thu Sep 20 15:32:34 2007 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: rxvtfont.C 2 * File: rxvtfont.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 4 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
5 * - original version. 5 * - original version.
6 * 6 *
… …
24#include "rxvtlib.h" 24#include "rxvtlib.h"
25#include "rxvtutil.h" 25#include "rxvtutil.h"
26#include "rxvtfont.h" 26#include "rxvtfont.h"
27 27
28#include <cstdlib> 28#include <cstdlib>
29#include <wchar.h> 29
30#include <inttypes.h> 30#include <inttypes.h>
31 31
32#define DISPLAY r->display->display
33#define TGC r->gc
34
35#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 ))
36 40
37const struct rxvt_fallback_font { 41const struct rxvt_fallback_font {
38 codeset cs; 42 codeset cs;
39 const char *name; 43 const char *name;
40} fallback_fonts[] = { 44} fallback_fonts[] = {
… …
60 { CS_ISO8859_13, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-13" }, 64 { CS_ISO8859_13, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-13" },
61 { CS_ISO8859_14, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-14" }, 65 { CS_ISO8859_14, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-14" },
62 { CS_ISO8859_16, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-16" }, 66 { CS_ISO8859_16, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-16" },
63 67
64# if XFT 68# if XFT
65 { CS_KOI8_U, "xft::spacing=100:lang=ru:antialias=false" }, 69 { CS_KOI8_U, "xft::lang=ru" },
66 70
67 { CS_ISO8859_5, "xft::spacing=100:lang=ru:antialias=false" }, 71 { CS_ISO8859_5, "xft::lang=ru" },
68 { CS_ISO8859_6, "xft::spacing=100:lang=ar:antialias=false" }, 72 { CS_ISO8859_6, "xft::lang=ar" },
69 { CS_ISO8859_7, "xft::spacing=100:lang=el:antialias=false" }, 73 { CS_ISO8859_7, "xft::lang=el" },
70 { CS_ISO8859_8, "xft::spacing=100:lang=he:antialias=false" }, 74 { CS_ISO8859_8, "xft::lang=he" },
71 { CS_ISO8859_9, "xft::spacing=100:lang=tr:antialias=false" }, 75 { CS_ISO8859_9, "xft::lang=tr" },
72 { CS_ISO8859_10, "xft::spacing=100:lang=se:antialias=false" }, 76 { CS_ISO8859_10, "xft::lang=se" },
73 { CS_ISO8859_11, "xft::spacing=100:lang=th:antialias=false" }, 77 { CS_ISO8859_11, "xft::lang=th" },
74# endif 78# endif
75#endif 79#endif
76 80
77 // japanese 81 // japanese
78#if ENCODING_JP || ENCODING_JP_EXT 82#if ENCODING_JP || ENCODING_JP_EXT
79# if XFT 83# if XFT
80 // prefer xft for complex scripts 84 // prefer xft for complex scripts
81 { CS_JIS0208_1990_0, "xft:Kochi Gothic:antialias=false" }, 85 { CS_JIS0208_1990_0, "xft:Kochi Gothic:antialias=false" },
82 { CS_JIS0208_1990_0, "xft:Sazanami Mincho:antialias=false" }, 86 { CS_JIS0208_1990_0, "xft:Sazanami Mincho:antialias=false" },
83 { CS_JIS0208_1990_0, "xft:Mincho:antialias=false" }, 87 { CS_JIS0208_1990_0, "xft:Mincho:antialias=false" },
84 { CS_JIS0208_1990_0, "xft::lang=ja:spacing=100:antialias=false" }, 88 { CS_JIS0208_1990_0, "xft::lang=ja:antialias=false" },
85# endif 89# endif
86 { CS_JIS0201_1976_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0201*-0" }, 90 { CS_JIS0201_1976_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0201*-0" },
87 { CS_JIS0208_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" }, 91 { CS_JIS0208_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" },
88 { CS_JIS0212_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0212*-0" }, 92 { CS_JIS0212_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0212*-0" },
89 { CS_JIS0201_1976_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0201*-0" }, 93 { CS_JIS0201_1976_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0201*-0" },
… …
93 97
94#if ENCODING_ZH || ENCODING_ZH_EXT 98#if ENCODING_ZH || ENCODING_ZH_EXT
95# if XFT 99# if XFT
96 { CS_GBK_0, "xft:AR PL KaitiM GB" }, 100 { CS_GBK_0, "xft:AR PL KaitiM GB" },
97 { CS_GBK_0, "xft:AR PL SungtiL GB" }, 101 { CS_GBK_0, "xft:AR PL SungtiL GB" },
98 { CS_GBK_0, "xft::spacing=100:lang=zh" }, 102 { CS_GBK_0, "xft::lang=zh" },
99 { CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" }, 103 { CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" },
100 { CS_BIG5_EXT, "xft:AR PL KaitiM Big5" }, 104 { CS_BIG5_EXT, "xft:AR PL KaitiM Big5" },
101 { CS_GB2312_1980_0, "xft:AR PL KaitiM GB" }, 105 { CS_GB2312_1980_0, "xft:AR PL KaitiM GB" },
102 { CS_GB2312_1980_0, "xft:AR PL SungtiL GB" }, 106 { CS_GB2312_1980_0, "xft:AR PL SungtiL GB" },
103 { CS_GB2312_1980_0, "xft::spacing=100:lang=zh" }, 107 { CS_GB2312_1980_0, "xft::lang=zh" },
104# endif 108# endif
105 { CS_GBK_0, "-*-*-*-*-*-*-*-*-*-*-c-*-gbk*-0" }, 109 { CS_GBK_0, "-*-*-*-*-*-*-*-*-*-*-c-*-gbk*-0" },
106 { CS_BIG5, "-*-*-*-*-*-*-*-*-*-*-c-*-big5-0" }, 110 { CS_BIG5, "-*-*-*-*-*-*-*-*-*-*-c-*-big5-0" },
107 { CS_BIG5_PLUS, "-*-*-*-*-*-*-*-*-*-*-c-*-big5p-0" }, 111 { CS_BIG5_PLUS, "-*-*-*-*-*-*-*-*-*-*-c-*-big5p-0" },
108 { CS_BIG5_EXT, "-*-*-*-*-*-*-*-*-*-*-c-*-big5.eten-0" }, 112 { CS_BIG5_EXT, "-*-*-*-*-*-*-*-*-*-*-c-*-big5.eten-0" },
… …
121#if ENCODING_KR 125#if ENCODING_KR
122 { CS_KSC5601_1987_0, "-baekmuk-gulim-*-*-*-*-*-*-*-*-c-*-ksc5601*" }, 126 { CS_KSC5601_1987_0, "-baekmuk-gulim-*-*-*-*-*-*-*-*-c-*-ksc5601*" },
123 { CS_KSC5601_1987_0, "-*-*-*-*-*-*-*-*-*-*-c-*-ksc5601*" }, 127 { CS_KSC5601_1987_0, "-*-*-*-*-*-*-*-*-*-*-c-*-ksc5601*" },
124# if XFT 128# if XFT
125 { CS_KSC5601_1987_0, "xft:Baekmuk Gulim:antialias=false" }, 129 { CS_KSC5601_1987_0, "xft:Baekmuk Gulim:antialias=false" },
126 { CS_KSC5601_1987_0, "xft::spacing=100:lang=ko:antialias=false" }, 130 { CS_KSC5601_1987_0, "xft::lang=ko:antialias=false" },
127# endif 131# endif
128#endif 132#endif
129 133
130 // generic font fallback
131 { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" }, 134 { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" },
132 { 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.
133 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" },
134 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" },
135#if XFT 136#if XFT
136 { CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true" }, 137 { CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true" },
137 { CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" }, 138 { CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" },
138 { CS_UNICODE, "xft:Andale Mono:antialias=false:autohint=false" }, 139 { CS_UNICODE, "xft:Andale Mono:antialias=false:autohint=false" },
139 { CS_UNICODE, "xft:Arial Unicode MS:antialias=false:autohint=false" }, 140 { CS_UNICODE, "xft:Arial Unicode MS:antialias=false:autohint=false" },
140 141
141 // FreeMono is usually uglier than x fonts, so try last only. 142 // FreeMono is usually uglier than x fonts, so try after the others
142 { CS_UNICODE, "xft:FreeMono:autohint=true" }, 143 { CS_UNICODE, "xft:FreeMono:autohint=true" },
143#endif 144#endif
144 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" },
145 { CS_UNKNOWN, 0 } 150 { CS_UNKNOWN, 0 }
146}; 151};
147 152
148// these characters are used to guess the font height and width 153// these characters are used to guess the font height and width
149// 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.
… …
153 0x304c, 0x672c, // が本 158 0x304c, 0x672c, // が本
154}; 159};
155 160
156#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]))
157 162
163#define dTermDisplay Display *disp = term->dpy
164#define dTermGC GC gc = term->gc
165
158///////////////////////////////////////////////////////////////////////////// 166/////////////////////////////////////////////////////////////////////////////
159
160#if XFT
161rxvt_drawable::~rxvt_drawable ()
162{
163 if (xftdrawable)
164 XftDrawDestroy (xftdrawable);
165}
166
167rxvt_drawable::operator XftDraw *()
168{
169 if (!xftdrawable)
170 xftdrawable = XftDrawCreate (display->display, drawable, display->visual, display->cmap);
171
172 return xftdrawable;
173}
174#endif
175
176/////////////////////////////////////////////////////////////////////////////
177
178static void *enc_buf;
179static uint32_t enc_len;
180
181static inline void *
182get_enc_buf (uint32_t len)
183{
184 if (len > enc_len)
185 {
186 free (enc_buf);
187 enc_buf = malloc (len);
188 enc_len = len;
189 }
190
191 return enc_buf;
192}
193 167
194static const char * 168static const char *
195enc_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)
196{ 170{
197 uint8_t *buf = (uint8_t *)get_enc_buf (len); 171 uint8_t *buf = rxvt_temp_buf<uint8_t> (len);
172 uint8_t *res = buf;
198 173
199 while (len--) 174 while (len--)
200 { 175 {
201 uint32_t c = FROM_UNICODE (cs, *text++); 176 uint32_t c = FROM_UNICODE (cs, *text++);
202 177
… …
207 } 182 }
208 183
209 *buf++ = c; 184 *buf++ = c;
210 } 185 }
211 186
212 return (const char *)enc_buf; 187 return (const char *)res;
213} 188}
214 189
215static const XChar2b * 190static const XChar2b *
216enc_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)
217{ 192{
218 XChar2b *buf = (XChar2b *)get_enc_buf (len * sizeof (XChar2b)); 193 XChar2b *buf = rxvt_temp_buf<XChar2b> (len);
194 XChar2b *res = buf;
219 195
220 while (len--) 196 while (len--)
221 { 197 {
222 uint32_t c = FROM_UNICODE (cs, *text++); 198 uint32_t c = FROM_UNICODE (cs, *text++);
223 199
… …
230 buf->byte1 = c >> 8; 206 buf->byte1 = c >> 8;
231 buf->byte2 = c; 207 buf->byte2 = c;
232 buf++; 208 buf++;
233 } 209 }
234 210
235 return (XChar2b *)enc_buf; 211 return res;
236} 212}
237 213
238///////////////////////////////////////////////////////////////////////////// 214/////////////////////////////////////////////////////////////////////////////
215
216rxvt_font::rxvt_font ()
217: name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset)
218{
219}
239 220
240void 221void
241rxvt_font::set_name (char *name) 222rxvt_font::set_name (char *name)
242{ 223{
243 if (this->name == name) 224 if (this->name == name)
… …
246 if (this->name) free (this->name); // let the compiler optimize 227 if (this->name) free (this->name); // let the compiler optimize
247 this->name = name; 228 this->name = name;
248} 229}
249 230
250void 231void
251rxvt_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
252{ 233{
253 if (color == Color_bg) 234 dTermDisplay;
254 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);
255 else if (color >= 0) 239 else if (color >= 0)
256 { 240 {
257#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)
258 XftDrawRect (d, &r->pix_colors[color].c, x, y, w, h); 257 XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);
259#else 258#else
260 XSetForeground (d.display->display, TGC, r->pix_colors[color]); 259 XSetForeground (disp, gc, term->pix_colors[color]);
261 XFillRectangle (d.display->display, d, TGC, x, y, w, h); 260 XFillRectangle (disp, d, gc, x, y, w, h);
262#endif 261#endif
263 } 262 }
264} 263}
264
265/////////////////////////////////////////////////////////////////////////////
265 266
266#include "table/linedraw.h" 267#include "table/linedraw.h"
267 268
268struct rxvt_font_default : rxvt_font { 269struct rxvt_font_default : rxvt_font {
269 struct rxvt_fontset *fs; 270 struct rxvt_fontset *fs;
… …
284 p.slant = rxvt_fontprop::roman; 285 p.slant = rxvt_fontprop::roman;
285 286
286 return p; 287 return p;
287 } 288 }
288 289
289 bool load (const rxvt_fontprop &prop) 290 bool load (const rxvt_fontprop &prop, bool force_prop)
290 { 291 {
291 width = 1; height = 1; 292 width = 1; height = 1;
292 ascent = 1; descent = 0; 293 ascent = 1; descent = 0;
293 294
294 set_name (strdup ("built-in support font")); 295 set_name (strdup ("built-in support font"));
295 296
296 return true; 297 return true;
297 } 298 }
298 299
299 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) 300 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
300 { 301 {
301 careful = false; 302 careful = false;
302 303
303 if (unicode <= 0x001f) 304 if (unicode <= 0x001f)
304 return true; 305 return true;
… …
308 309
309 if (unicode <= 0x009f) 310 if (unicode <= 0x009f)
310 return true; 311 return true;
311 312
312 if (unicode >= 0x2500 && unicode <= 0x259f && 313 if (unicode >= 0x2500 && unicode <= 0x259f &&
313 ! OPTION_R (Opt_skipBuiltinGlyphs)) 314 !term->option (Opt_skipBuiltinGlyphs))
314 return true; 315 return true;
315 316
316 if (IS_COMPOSE (unicode)) 317 if (IS_COMPOSE (unicode))
317 return true; 318 return true;
318 319
… …
334void 335void
335rxvt_font_default::draw (rxvt_drawable &d, int x, int y, 336rxvt_font_default::draw (rxvt_drawable &d, int x, int y,
336 const text_t *text, int len, 337 const text_t *text, int len,
337 int fg, int bg) 338 int fg, int bg)
338{ 339{
339 Display *disp = d.display->display; 340 dTermDisplay;
341 dTermGC;
340 342
341 clear_rect (d, x, y, r->fwidth * len, r->fheight, bg); 343 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
342 344
343 XSetForeground (disp, TGC, r->pix_colors[fg]); 345 XSetForeground (disp, gc, term->pix_colors[fg]);
344 346
345 while (len) 347 while (len)
346 { 348 {
347#if ENABLE_COMBINING 349#if ENABLE_COMBINING
348 compose_char *cc; 350 compose_char *cc;
… …
352 354
353 while (++text, --len && *text == NOCHAR) 355 while (++text, --len && *text == NOCHAR)
354 ; 356 ;
355 357
356 int width = text - tp; 358 int width = text - tp;
357 int fwidth = r->fwidth * width; 359 int fwidth = term->fwidth * width;
358 360
359 if (0x2500 <= t && t <= 0x259f && 361 if (0x2500 <= t && t <= 0x259f)
360 ! OPTION_R (Opt_skipBuiltinGlyphs))
361 { 362 {
362 uint16_t offs = linedraw_offs[t - 0x2500]; 363 uint16_t offs = linedraw_offs[t - 0x2500];
363 uint32_t *a = linedraw_command + (offs >> 4); 364 uint32_t *a = linedraw_command + (offs >> 4);
364 uint32_t *b = a + (offs & 15); 365 uint32_t *b = a + (offs & 15);
365 366
366 int W = fwidth; 367 int W = fwidth;
367 int H = r->fheight; 368 int H = term->fheight;
368 369
369 int x_[16]; 370 int x_[16];
370 int y_[16]; 371 int y_[16];
371 372
372 for (int i = 0; i <= 8; i++) 373 for (int i = 0; i <= 8; i++)
… …
380 381
381 XGCValues gcv; 382 XGCValues gcv;
382 383
383 gcv.cap_style = CapButt; 384 gcv.cap_style = CapButt;
384 gcv.line_width = 0; 385 gcv.line_width = 0;
385 XChangeGC (disp, TGC, GCLineWidth | GCCapStyle, &gcv); 386 XChangeGC (disp, gc, GCLineWidth | GCCapStyle, &gcv);
386 387
387 while (a < b) 388 while (a < b)
388 { 389 {
389 uint32_t command = *a++; 390 uint32_t command = *a++;
390 391
… …
397 int y2 = y_[(command >> 0) & 15]; 398 int y2 = y_[(command >> 0) & 15];
398 399
399 switch (op) 400 switch (op)
400 { 401 {
401 case 0: // line 402 case 0: // line
402 XDrawLine (disp, d, TGC, x1, y1, x2, y2); 403 XDrawLine (disp, d, gc, x1, y1, x2, y2);
403 break; 404 break;
404 405
405 case 1: // rectangle, possibly stippled 406 case 1: // rectangle, possibly stippled
406 if (a) 407 if (a)
407 { 408 {
… …
410 gcv.fill_style = FillStippled; 411 gcv.fill_style = FillStippled;
411 gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2); 412 gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2);
412 gcv.ts_x_origin = x; 413 gcv.ts_x_origin = x;
413 gcv.ts_y_origin = y; 414 gcv.ts_y_origin = y;
414 415
415 XChangeGC (disp, TGC, 416 XChangeGC (disp, gc,
416 GCFillStyle | GCStipple | GCTileStipXOrigin | GCTileStipYOrigin, 417 GCFillStyle | GCStipple | GCTileStipXOrigin | GCTileStipYOrigin,
417 &gcv); 418 &gcv);
418 } 419 }
419 420
420 XFillRectangle (disp, d, TGC, x1, y1, x2 - x1 + 1, y2 - y1 + 1); 421 XFillRectangle (disp, d, gc, x1, y1, x2 - x1 + 1, y2 - y1 + 1);
421 422
422 if (a) 423 if (a)
423 { 424 {
424 XFreePixmap (disp, gcv.stipple); 425 XFreePixmap (disp, gcv.stipple);
425 gcv.stipple = 0; 426 gcv.stipple = 0;
426 gcv.fill_style = FillSolid; 427 gcv.fill_style = FillSolid;
427 XChangeGC (disp, TGC, GCFillStyle, &gcv); 428 XChangeGC (disp, gc, GCFillStyle, &gcv);
428 } 429 }
429 break; 430 break;
430 case 2: // arc 431 case 2: // arc
431 XDrawArc (disp, d, TGC, 432 XDrawArc (disp, d, gc,
432 x1 - W/2, y1 - H/2, W-1, H-1, 433 x1 - W/2, y1 - H/2, W-1, H-1,
433 (a - 1) * 90*64, (b - 1) * 90*64); 434 (a - 1) * 90*64, (b - 1) * 90*64);
434 break; 435 break;
435 } 436 }
436 } 437 }
437 } 438 }
438#if ENABLE_COMBINING 439#if ENABLE_COMBINING
439 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) 440 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
440 { 441 {
442 min_it (width, 2); // we only support wcwidth up to 2
443
441 text_t chrs[2]; 444 text_t chrs[2];
442 width = min (2, width);
443 chrs [1] = NOCHAR; 445 chrs [1] = NOCHAR;
444 446
445 *chrs = cc->c1; 447 *chrs = cc->c1;
446 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)]; 448 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)];
447 f1->draw (d, x, y, chrs, width, fg, bg); 449 f1->draw (d, x, y, chrs, width, fg, bg);
… …
454 *chrs = cc->c2; 456 *chrs = cc->c2;
455 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful) 457 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful)
456 ? f1 458 ? f1
457 : (*fs)[fs->find_font (cc->c2)]; 459 : (*fs)[fs->find_font (cc->c2)];
458 460
459 f2->draw (d, x, y, chrs, width, fg, -1); 461 f2->draw (d, x, y, chrs, width, fg, Color_none);
460 } 462 }
461 } 463 }
462#endif 464#endif
463 else 465 else
464 switch (t) 466 switch (t)
… …
467 case ZERO_WIDTH_CHAR: 469 case ZERO_WIDTH_CHAR:
468 case NOCHAR: 470 case NOCHAR:
469 break; 471 break;
470 472
471 default: 473 default:
472 XDrawRectangle (disp, d, TGC, x + 2, y + 2, 474 XDrawRectangle (disp, d, gc, x + 2, y + 2,
473 fwidth - 4, r->fheight - 4); 475 fwidth - 4, term->fheight - 4);
474 } 476 }
475 477
476 x += fwidth; 478 x += fwidth;
477 } 479 }
478} 480}
… …
484 486
485 void clear (); 487 void clear ();
486 488
487 rxvt_fontprop properties (); 489 rxvt_fontprop properties ();
488 490
489 bool load (const rxvt_fontprop &prop); 491 bool load (const rxvt_fontprop &prop, bool force_prop);
490 492
491 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful); 493 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
492 494
493 void draw (rxvt_drawable &d, int x, int y, 495 void draw (rxvt_drawable &d, int x, int y,
494 const text_t *text, int len, 496 const text_t *text, int len,
495 int fg, int bg); 497 int fg, int bg);
496 498
497 bool slow; // wether this is a proportional font or has other funny characteristics 499 bool slow; // wether this is a proportional font or has other funny characteristics
498 XFontStruct *f; 500 XFontStruct *f;
499 codeset cs;
500 bool enc2b, encm; 501 bool enc2b, encm;
501 502
502 char *get_property (XFontStruct *f, const char *property, const char *repl) const; 503 char *get_property (XFontStruct *f, Atom property, const char *repl) const;
503 bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth); 504 bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth);
504 bool set_properties (rxvt_fontprop &p, XFontStruct *f); 505 bool set_properties (rxvt_fontprop &p, XFontStruct *f);
505 bool set_properties (rxvt_fontprop &p, const char *name); 506 bool set_properties (rxvt_fontprop &p, const char *name);
506}; 507};
507 508
508char * 509char *
509rxvt_font_x11::get_property (XFontStruct *f, const char *property, const char *repl) const 510rxvt_font_x11::get_property (XFontStruct *f, Atom property, const char *repl) const
510{ 511{
511 unsigned long value; 512 unsigned long value;
512 513
513 if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value)) 514 if (XGetFontProperty (f, property, &value))
514 return XGetAtomName (DISPLAY, value); 515 return XGetAtomName (term->dpy, value);
515 else 516 else
516 return rxvt_strdup (repl); 517 return rxvt_strdup (repl);
517} 518}
518 519
519rxvt_fontprop 520rxvt_fontprop
… …
525} 526}
526 527
527bool 528bool
528rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth) 529rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth)
529{ 530{
530 p.width = avgwidth ? (avgwidth + 1) / 10 : (height + 1) / 2; 531 p.width = width != rxvt_fontprop::unset ? width
532 : avgwidth ? (avgwidth + 1) / 10
533 : (height + 1) / 2;
531 p.height = height; 534 p.height = height;
532 p.ascent = rxvt_fontprop::unset; 535 p.ascent = rxvt_fontprop::unset;
533 p.weight = *weight == 'B' || *weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium; 536 p.weight = *weight == 'B' || *weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium;
534 p.slant = *slant == 'r' || *slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic; 537 p.slant = *slant == 'r' || *slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic;
535 538
… …
540rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f) 543rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)
541{ 544{
542 unsigned long height; 545 unsigned long height;
543 546
544#if 0 547#if 0
545 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "PIXEL_SIZE", 0), &height)) 548 if (!XGetFontProperty (f, XInternAtom (term->dpy, "PIXEL_SIZE", 0), &height))
546 return false; 549 return false;
547#else 550#else
548 height = f->ascent + f->descent; 551 height = f->ascent + f->descent;
549#endif 552#endif
550 553
551 unsigned long avgwidth; 554 unsigned long avgwidth;
552 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth)) 555 if (!XGetFontProperty (f, term->xa [XA_AVERAGE_WIDTH], &avgwidth))
553 avgwidth = 0; 556 avgwidth = 0;
554 557
555 char *weight = get_property (f, "WEIGHT_NAME", "medium"); 558 char *weight = get_property (f, term->xa [XA_WEIGHT_NAME], "medium");
556 char *slant = get_property (f, "SLANT", "r"); 559 char *slant = get_property (f, term->xa [XA_SLANT], "r");
557 560
558 set_properties (p, height, weight, slant, avgwidth); 561 set_properties (p, height, weight, slant, avgwidth);
559 562
560 free (weight); 563 free (weight);
561 free (slant); 564 free (slant);
… …
566} 569}
567 570
568bool 571bool
569rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name) 572rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name)
570{ 573{
574 dTermDisplay;
571 int slashes = 0; 575 int slashes = 0;
572 const char *comp[13]; 576 const char *comp[13];
573 577
574 for (const char *c = name; *c; c++) 578 for (const char *c = name; *c; c++)
575 if (*c == '-') 579 if (*c == '-')
… …
583 if (slashes >= 13 587 if (slashes >= 13
584 && (*comp[ 6] >= '1' && *comp[ 6] <= '9') 588 && (*comp[ 6] >= '1' && *comp[ 6] <= '9')
585 && (*comp[11] >= '0' && *comp[11] <= '9')) 589 && (*comp[11] >= '0' && *comp[11] <= '9'))
586 return set_properties (p, atoi (comp[6]), comp[2], comp[3], atoi (comp[11])); 590 return set_properties (p, atoi (comp[6]), comp[2], comp[3], atoi (comp[11]));
587 591
588 XFontStruct *f = XLoadQueryFont (DISPLAY, name); 592 XFontStruct *f = XLoadQueryFont (disp, name);
589 593
590 if (f) 594 if (f)
591 { 595 {
592 // the font should really exist now. if not, we have a problem 596 // the font should really exist now. if not, we have a problem
593 // (e.g. if the user did xset fp rehash just when we were searching fonts). 597 // (e.g. if the user did xset fp rehash just when we were searching fonts).
594 // in that case, just return garbage. 598 // in that case, just return garbage.
595 bool ret = set_properties (p, f); 599 bool ret = set_properties (p, f);
596 XFreeFont (DISPLAY, f); 600 XFreeFont (disp, f);
597 return ret; 601 return ret;
598 } 602 }
599 else 603 else
600 return false; 604 return false;
601} 605}
… …
637 return false; 641 return false;
638 } 642 }
639} 643}
640 644
641bool 645bool
642rxvt_font_x11::load (const rxvt_fontprop &prop) 646rxvt_font_x11::load (const rxvt_fontprop &prop, bool force_prop)
643{ 647{
644 Display *disp = DISPLAY; 648 dTermDisplay;
645 649
646 clear (); 650 clear ();
647 651
648 char field_str[64]; // enough for 128 bits 652 char field_str[64]; // enough for 128 bits
649 653
650 // first morph the font if required 654 // first morph the font if required
651 if (prop.weight != rxvt_fontprop::unset 655 if (force_prop)
652 || prop.slant != rxvt_fontprop::unset)
653 { 656 {
654 char fname[1024]; 657 char fname[1024];
655 658
656 if (name[0] != '-') 659 if (name[0] != '-')
657 { 660 {
658 f = XLoadQueryFont (disp, name); 661 f = XLoadQueryFont (disp, name);
659 662
660 if (!f) 663 if (!f)
661 return false; 664 return false;
662 665
663 char *new_name = get_property (f, "FONT", name); 666 char *new_name = get_property (f, XA_FONT, name);
664 667
665 if (new_name) 668 if (new_name)
666 set_name (new_name); 669 set_name (new_name);
667 else 670 else
668 rxvt_warn ("font '%s' has no FONT property, continuing without.", name); 671 rxvt_warn ("font '%s' has no FONT property, continuing without.", name);
… …
724 int diff = 0; 727 int diff = 0;
725 728
726 if (replace_field (fname, list[i], 6, '0', field_str)) 729 if (replace_field (fname, list[i], 6, '0', field_str))
727 diff += 10; // slightly penalize scalable fonts 730 diff += 10; // slightly penalize scalable fonts
728 else if (replace_field (fname, list[i], 11, '0', "0")) 731 else if (replace_field (fname, list[i], 11, '0', "0"))
729 diff += 300; // more heavily penalize what looks like scaled bitmap fotns 732 diff += 300; // more heavily penalize what looks like scaled bitmap fonts
730 733
731 if (!set_properties (p, fname)) 734 if (!set_properties (p, fname))
732 continue; 735 continue;
733 736
734 if (prop.height != rxvt_fontprop::unset 737 if (prop.height != rxvt_fontprop::unset
… …
777 delete [] fonts; 780 delete [] fonts;
778 781
779 if (!f) 782 if (!f)
780 return false; 783 return false;
781 784
782 char *registry = get_property (f, "CHARSET_REGISTRY", 0); 785 char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0);
783 char *encoding = get_property (f, "CHARSET_ENCODING", 0); 786 char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0);
784 787
785 if (registry && encoding) 788 if (registry && encoding)
786 { 789 {
787 char charset[64]; 790 char charset[64];
788 snprintf (charset, 64, "%s-%s", registry, encoding); 791 snprintf (charset, 64, "%s-%s", registry, encoding);
789 792
790 cs = codeset_from_name (charset); 793 cs = codeset_from_name (charset);
791 } 794 }
792 else 795 else
793 { 796 {
794 const char *charset = get_property (f, "FONT", 0); 797 const char *charset = get_property (f, XA_FONT, 0);
795 798
796 if (!charset) 799 if (!charset)
797 charset = name; 800 charset = name;
798 801
799 int count = 13; 802 int count = 13;
… …
814 enc2b = encm || f->max_char_or_byte2 > 255; 817 enc2b = encm || f->max_char_or_byte2 > 255;
815 818
816 slow = false; 819 slow = false;
817 820
818#if 1 // only used for slow detection, TODO optimize 821#if 1 // only used for slow detection, TODO optimize
819 if (f->min_bounds.width == f->max_bounds.width) 822 if (f->min_bounds.width == f->max_bounds.width || !f->per_char)
820 width = f->min_bounds.width;
821 else if (f->per_char == NULL)
822 width = f->max_bounds.width; 823 width = f->max_bounds.width;
823 else 824 else
824 { 825 {
825 slow = true; 826 slow = true;
826 827
… …
842 843
843 width = 1; 844 width = 1;
844 845
845 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 846 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; )
846 { 847 {
847 if (cs != CS_UNICODE
848 && *t > 0x100
849 && FROM_UNICODE (cs, *t) == NOCHAR) 848 if (FROM_UNICODE (cs, *t) == NOCHAR)
850 continue; 849 continue;
851 850
852 // ignore characters we wouldn't use anyways 851 // ignore characters we wouldn't use anyways
853 bool careful; 852 bool careful;
854 if (!has_char (*t, &prop, careful)) 853 if (!has_char (*t, &prop, careful))
… …
858 857
859 XCharStruct g; 858 XCharStruct g;
860 int dir_ret, asc_ret, des_ret; 859 int dir_ret, asc_ret, des_ret;
861 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); 860 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);
862 861
862 int wcw = WCWIDTH (*t);
863 int wcw = wcwidth (*t); if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; 863 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
864 864
865 if (width < g.width) width = g.width; 865 if (width < g.width) width = g.width;
866 } 866 }
867 867
868 if (cs == CS_UNKNOWN) 868 if (cs == CS_UNKNOWN)
869 { 869 {
870 fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name); 870 fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);
… …
887void 887void
888rxvt_font_x11::clear () 888rxvt_font_x11::clear ()
889{ 889{
890 if (f) 890 if (f)
891 { 891 {
892 XFreeFont (DISPLAY, f); 892 XFreeFont (term->dpy, f);
893 f = 0; 893 f = 0;
894 } 894 }
895} 895}
896 896
897bool 897bool
898rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) 898rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
899{ 899{
900 uint32_t ch = FROM_UNICODE (cs, unicode); 900 uint32_t ch = FROM_UNICODE (cs, unicode);
901 901
902 if (ch == NOCHAR) 902 if (ch == NOCHAR)
903 return false; 903 return false;
… …
940 return false; 940 return false;
941 941
942 if (!prop || prop->width == rxvt_fontprop::unset) 942 if (!prop || prop->width == rxvt_fontprop::unset)
943 return true; 943 return true;
944 944
945 // check character against base font bounding box 945 // check wether character overlaps previous/next character
946 int w = xcs->width; 946 int w = xcs->rbearing - xcs->lbearing;
947 int wcw = wcwidth (unicode); 947 int wcw = max (WCWIDTH (unicode), 1);
948 if (wcw > 0) w = (w + wcw - 1) / wcw;
949 948
950 careful = w > prop->width; 949 careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw;
951 if (careful && w > prop->width * MAX_OVERLAP >> 2) 950
951 if (careful && !OVERLAP_OK (w, wcw, prop))
952 return false; 952 return false;
953 953
954 return true; 954 return true;
955} 955}
956 956
… …
962 // this looks like a mess /. 962 // this looks like a mess /.
963 // and it is a mess /. 963 // and it is a mess /.
964 // yet we are trying to be perfect /. 964 // yet we are trying to be perfect /.
965 // but the result still isn't perfect /. 965 // but the result still isn't perfect /.
966 966
967 dTermDisplay;
968 dTermGC;
969
967 bool slow = this->slow 970 bool slow = this->slow
968 || width != r->fwidth 971 || width != term->fwidth
969 || height != r->fheight; 972 || height != term->fheight;
970 973
971 int base = ascent; // sorry, incorrect: r->fbase; 974 int base = ascent; // sorry, incorrect: term->fbase;
972 975
973 XGCValues v; 976 XGCValues v;
974 v.foreground = r->pix_colors[fg]; 977 v.foreground = term->pix_colors[fg];
975 v.font = f->fid; 978 v.font = f->fid;
976 979
977 if (enc2b) 980 if (enc2b)
978 { 981 {
979 const XChar2b *xc = enc_xchar2b (text, len, cs, slow); 982 const XChar2b *xc = enc_xchar2b (text, len, cs, slow);
980 983
981 if (bg == Color_bg && !slow) 984 if (bg == Color_bg && !slow)
982 { 985 {
983 v.background = r->pix_colors[bg]; 986 v.background = term->pix_colors[bg];
984 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); 987 XChangeGC (disp, gc, GCForeground | GCBackground | GCFont, &v);
985 XDrawImageString16 (d.display->display, d, TGC, x, y + base, xc, len); 988 XDrawImageString16 (disp, d, gc, x, y + base, xc, len);
986 } 989 }
987 else 990 else
988 { 991 {
989 clear_rect (d, x, y, r->fwidth * len, r->fheight, bg); 992 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
990 993
991 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v); 994 XChangeGC (disp, gc, GCForeground | GCFont, &v);
992 995
993 if (slow) 996 if (slow)
994 { 997 {
995 do 998 do
996 { 999 {
997 if (xc->byte1 || xc->byte2) 1000 if (xc->byte1 || xc->byte2)
998 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, 1); 1001 XDrawString16 (disp, d, gc, x, y + base, xc, 1);
999 1002
1000 x += r->fwidth; 1003 x += term->fwidth;
1001 xc++; len--; 1004 xc++; len--;
1002 } 1005 }
1003 while (len); 1006 while (len);
1004 } 1007 }
1005 else 1008 else
1006 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, len); 1009 XDrawString16 (disp, d, gc, x, y + base, xc, len);
1007 } 1010 }
1008 } 1011 }
1009 else 1012 else
1010 { 1013 {
1011 const char *xc = enc_char (text, len, cs, slow); 1014 const char *xc = enc_char (text, len, cs, slow);
1012 1015
1013 if (bg == Color_bg && !slow) 1016 if (bg == Color_bg && !slow)
1014 { 1017 {
1015 v.background = r->pix_colors[bg]; 1018 v.background = term->pix_colors[bg];
1016 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); 1019 XChangeGC (disp, gc, GCForeground | GCBackground | GCFont, &v);
1017 XDrawImageString (d.display->display, d, TGC, x, y + base, xc, len); 1020 XDrawImageString (disp, d, gc, x, y + base, xc, len);
1018 } 1021 }
1019 else 1022 else
1020 { 1023 {
1021 clear_rect (d, x, y, r->fwidth * len, r->fheight, bg); 1024 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
1022 1025
1023 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v); 1026 XChangeGC (disp, gc, GCForeground | GCFont, &v);
1024 1027
1025 if (slow) 1028 if (slow)
1026 { 1029 {
1027 do 1030 do
1028 { 1031 {
1029 if (*xc) 1032 if (*xc)
1030 XDrawString (d.display->display, d, TGC, x, y + base, xc, 1); 1033 XDrawString (disp, d, gc, x, y + base, xc, 1);
1031 1034
1032 x += r->fwidth; 1035 x += term->fwidth;
1033 xc++; len--; 1036 xc++; len--;
1034 } 1037 }
1035 while (len); 1038 while (len);
1036 } 1039 }
1037 else 1040 else
1038 XDrawString (d.display->display, d, TGC, x, y + base, xc, len); 1041 XDrawString (disp, d, gc, x, y + base, xc, len);
1039 } 1042 }
1040 } 1043 }
1041} 1044}
1042 1045
1043///////////////////////////////////////////////////////////////////////////// 1046/////////////////////////////////////////////////////////////////////////////
… …
1049 1052
1050 void clear (); 1053 void clear ();
1051 1054
1052 rxvt_fontprop properties (); 1055 rxvt_fontprop properties ();
1053 1056
1054 bool load (const rxvt_fontprop &prop); 1057 bool load (const rxvt_fontprop &prop, bool force_prop);
1055 1058
1056 void draw (rxvt_drawable &d, int x, int y, 1059 void draw (rxvt_drawable &d, int x, int y,
1057 const text_t *text, int len, 1060 const text_t *text, int len,
1058 int fg, int bg); 1061 int fg, int bg);
1059 1062
1060 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &carefull); 1063 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &carefull) const;
1061 1064
1062protected: 1065protected:
1063 XftFont *f; 1066 XftFont *f;
1064}; 1067};
1065 1068
1066void 1069void
1067rxvt_font_xft::clear () 1070rxvt_font_xft::clear ()
1068{ 1071{
1069 if (f) 1072 if (f)
1070 { 1073 {
1071 XftFontClose (DISPLAY, f); 1074 XftFontClose (term->dpy, f);
1072 f = 0; 1075 f = 0;
1073 } 1076 }
1074} 1077}
1075 1078
1076rxvt_fontprop 1079rxvt_fontprop
… …
1092 1095
1093 return p; 1096 return p;
1094} 1097}
1095 1098
1096bool 1099bool
1097rxvt_font_xft::load (const rxvt_fontprop &prop) 1100rxvt_font_xft::load (const rxvt_fontprop &prop, bool force_prop)
1098{ 1101{
1099 Display *disp = DISPLAY; 1102 dTermDisplay;
1100 1103
1101 clear (); 1104 clear ();
1102 1105
1103 FcPattern *p = FcNameParse ((FcChar8 *) name); 1106 FcPattern *p = FcNameParse ((FcChar8 *) name);
1104 1107
… …
1111 && (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch 1114 && (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch
1112 && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch)) 1115 && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch))
1113 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height); 1116 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);
1114 1117
1115 if (prop.weight != rxvt_fontprop::unset 1118 if (prop.weight != rxvt_fontprop::unset
1116 && FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch) 1119 && (force_prop || FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch))
1117 FcPatternAddInteger (p, FC_WEIGHT, prop.weight); 1120 FcPatternAddInteger (p, FC_WEIGHT, prop.weight);
1118 1121
1119 if (prop.slant != rxvt_fontprop::unset 1122 if (prop.slant != rxvt_fontprop::unset
1120 && FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch) 1123 && (force_prop || FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch))
1121 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1124 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1122 1125
1123#if 0 // clipping unfortunately destroys our precious double-width-characters 1126#if 0 // clipping unfortunately destroys our precious double-width-characters
1124 // clip width, we can't do better, or can we? 1127 // clip width, we can't do better, or can we?
1125 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) 1128 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
… …
1131 1134
1132 // store generated name so iso14755 view gives better results 1135 // store generated name so iso14755 view gives better results
1133 set_name ((char *)FcNameUnparse (p)); 1136 set_name ((char *)FcNameUnparse (p));
1134 1137
1135 XftResult result; 1138 XftResult result;
1136 FcPattern *match = XftFontMatch (disp, r->display->screen, p, &result); 1139 FcPattern *match = XftFontMatch (disp, term->display->screen, p, &result);
1137 1140
1138 FcPatternDestroy (p); 1141 FcPatternDestroy (p);
1139 1142
1140 if (!match) 1143 if (!match)
1141 return false; 1144 return false;
… …
1183 XGlyphInfo g; 1186 XGlyphInfo g;
1184 XftTextExtents16 (disp, f, &ch, 1, &g); 1187 XftTextExtents16 (disp, f, &ch, 1, &g);
1185 1188
1186 g.width -= g.x; 1189 g.width -= g.x;
1187 1190
1188 int wcw = wcwidth (ch); 1191 int wcw = WCWIDTH (ch);
1189 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; 1192 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
1190 1193
1191 if (width < g.width ) width = g.width; 1194 if (width < g.width ) width = g.width;
1192 if (height < g.height ) height = g.height; 1195 if (height < g.height ) height = g.height;
1193 if (glheight < g.height - g.y) glheight = g.height - g.y; 1196 if (glheight < g.height - g.y) glheight = g.height - g.y;
… …
1239 1242
1240 return success; 1243 return success;
1241} 1244}
1242 1245
1243bool 1246bool
1244rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) 1247rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
1245{ 1248{
1246 careful = false; 1249 careful = false;
1247 1250
1248 if (!XftCharExists (DISPLAY, f, unicode)) 1251 if (!XftCharExists (term->dpy, f, unicode))
1249 return false; 1252 return false;
1250 1253
1251 if (!prop || prop->width == rxvt_fontprop::unset) 1254 if (!prop || prop->width == rxvt_fontprop::unset)
1252 return true; 1255 return true;
1253 1256
1254 // check character against base font bounding box 1257 // check character against base font bounding box
1255 FcChar32 ch = unicode; 1258 FcChar32 ch = unicode;
1256 XGlyphInfo g; 1259 XGlyphInfo g;
1257 XftTextExtents32 (DISPLAY, f, &ch, 1, &g); 1260 XftTextExtents32 (term->dpy, f, &ch, 1, &g);
1258 1261
1259 int w = g.width - g.x; 1262 int w = g.width - g.x;
1260 int wcw = wcwidth (unicode); 1263 int wcw = max (WCWIDTH (unicode), 1);
1261 if (wcw > 0) w = (w + wcw - 1) / wcw;
1262 1264
1263 careful = w > prop->width; 1265 careful = g.x > 0 || w > prop->width * wcw;
1264 if (careful && w > prop->width * MAX_OVERLAP >> 2) 1266
1267 if (careful && !OVERLAP_OK (w, wcw, prop))
1268 return false;
1269
1270 // this weeds out _totally_ broken fonts, or glyphs
1271 if (!OVERLAP_OK (g.xOff, wcw, prop))
1265 return false; 1272 return false;
1266 1273
1267 return true; 1274 return true;
1268} 1275}
1269 1276
1270void 1277void
1271rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, 1278rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1272 const text_t *text, int len, 1279 const text_t *text, int len,
1273 int fg, int bg) 1280 int fg, int bg)
1274{ 1281{
1275 clear_rect (d, x, y, r->fwidth * len, r->fheight, bg);
1276
1277 int base = ascent; // should be fbase, but that is incorrect
1278
1279 XGlyphInfo extents; 1282 XGlyphInfo extents;
1280 FcChar32 *enc = (FcChar32 *) get_enc_buf (len * sizeof (FcChar32)); 1283 XftGlyphSpec *enc = (XftGlyphSpec *)rxvt_temp_buf (len * sizeof (XftGlyphSpec));
1281 FcChar32 *ep = enc; 1284 XftGlyphSpec *ep = enc;
1282 int ewidth = 0; 1285
1286 dTermDisplay;
1287 dTermGC;
1288
1289 int w = term->fwidth * len;
1290 int h = term->fheight;
1291
1292 /* TODO: this logic needs some more thinking, since we no longer do pseudo-transparency.
1293 * Maybe make buffering into a resource flag? Compile time option doesn't seems like a
1294 * good idea from the perspective of packaging for wide variety of user configs.
1295 */
1296 bool buffered = true
1297#ifdef FORCE_UNBUFFERED_XFT
1298 && bg >= 0
1299#endif
1300 ;
1301 // cut trailing spaces
1302 while (len && text [len - 1] == ' ')
1303 len--;
1304
1305 int x_ = buffered ? 0 : x;
1306 int y_ = buffered ? 0 : y;
1283 1307
1284 while (len) 1308 while (len)
1285 { 1309 {
1286 int cwidth = r->fwidth; 1310 int cwidth = term->fwidth;
1287 FcChar32 fc = *text++; len--; 1311 FcChar32 fc = *text++; len--;
1288 1312
1289 while (len && *text == NOCHAR) 1313 while (len && *text == NOCHAR)
1290 text++, len--, cwidth += r->fwidth; 1314 text++, len--, cwidth += term->fwidth;
1291 1315
1292 if (fc == ' ' && ep == enc) // skip leading spaces 1316 if (fc != ' ') // skip spaces
1317 {
1318 FT_UInt glyph = XftCharIndex (disp, f, fc);
1319 XftGlyphExtents (disp, f, &glyph, 1, &extents);
1320
1321 ep->glyph = glyph;
1322 ep->x = x_ + (cwidth - extents.xOff >> 1);
1323 ep->y = y_ + ascent;
1324
1325 if (extents.xOff == 0)
1326 ep->x = x_ + cwidth;
1327
1328 ep++;
1329 }
1330
1293 x += cwidth; 1331 x_ += cwidth;
1332 }
1333
1334 if (buffered)
1335 {
1336 bool back_rendered = false;
1337 if (ep != enc)
1338 {
1339 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1340
1341#ifdef HAVE_BG_PIXMAP
1342 if (term->bgPixmap.pixmap)
1343 {
1344 Picture dst = 0;
1345
1346 if (bg >= 0 && term->pix_colors[bg].c.color.alpha < 0x0ff00)
1347 dst = XftDrawPicture (d2);
1348
1349 if (bg < 0 || dst != 0)
1350 {
1351 int src_x = x, src_y = y ;
1352
1353 if (term->bgPixmap.is_parentOrigin ())
1354 {
1355 src_x += term->window_vt_x;
1356 src_y += term->window_vt_y;
1357 }
1358
1359 if (term->bgPixmap.pmap_width >= src_x+w
1360 && term->bgPixmap.pmap_height >= src_y+h)
1361 {
1362 XCopyArea (disp, term->bgPixmap.pixmap, d2, gc,
1363 src_x, src_y, w, h, 0, 0);
1364 }
1365 else
1366 {
1367 XGCValues gcv;
1368
1369 gcv.fill_style = FillTiled;
1370 gcv.tile = term->bgPixmap.pixmap;
1371 gcv.ts_x_origin = -src_x;
1372 gcv.ts_y_origin = -src_y;
1373
1374 XChangeGC (disp, gc,
1375 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
1376 &gcv);
1377
1378 XFillRectangle (disp, d2, gc, 0, 0, w, h);
1379
1380 gcv.fill_style = FillSolid;
1381 XChangeGC (disp, gc, GCFillStyle, &gcv);
1382 }
1383
1384 if (bg >= 0)
1385 {
1386 Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c);
1387 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h);
1388 }
1389
1390 back_rendered = true;
1391 }
1392 }
1393#endif
1394
1395 if (bg >= 0 && !back_rendered)
1396 XftDrawRect (d2, &term->pix_colors[bg].c, 0, 0, w, h);
1397
1398 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);
1399 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
1400 }
1294 else 1401 else
1295 { 1402 clear_rect (d, x, y, w, h, bg);
1296 FT_UInt gl = XftCharIndex (d.display->display, f, fc); 1403 }
1297 XftGlyphExtents (d.display->display, f, &gl, 1, &extents); 1404 else
1298
1299 if (extents.xOff != cwidth)
1300 {
1301 if (ewidth)
1302 {
1303 XftDrawGlyphs (d, &r->pix_colors[fg].c, f,
1304 x, y + base, enc, ep - enc);
1305 x += ewidth;
1306
1307 ep = enc;
1308 ewidth = 0;
1309 }
1310
1311 if (extents.xOff > cwidth)
1312 extents.xOff = cwidth;
1313
1314 XftDrawGlyphs (d, &r->pix_colors[fg].c, f,
1315 x + (cwidth - extents.xOff >> 1),
1316 y + base, &gl, 1);
1317 x += cwidth;
1318 }
1319 else
1320 {
1321 *ep++ = gl;
1322 ewidth += cwidth;
1323 }
1324 }
1325 } 1405 {
1326 1406 clear_rect (d, x, y, w, h, bg);
1327 if (ep != enc)
1328 XftDrawGlyphs (d, &r->pix_colors[fg].c, f, 1407 XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc);
1329 x, y + base, enc, ep - enc); 1408 }
1330} 1409}
1410
1331#endif 1411#endif
1332 1412
1333///////////////////////////////////////////////////////////////////////////// 1413/////////////////////////////////////////////////////////////////////////////
1334 1414
1335rxvt_fontset::rxvt_fontset (rxvt_t r) 1415rxvt_fontset::rxvt_fontset (rxvt_term *term)
1336: fontdesc (0), r (r) 1416: fontdesc (0), term (term)
1337{ 1417{
1338 clear (); 1418 clear ();
1339} 1419}
1340 1420
1341rxvt_fontset::~rxvt_fontset () 1421rxvt_fontset::~rxvt_fontset ()
… …
1346void 1426void
1347rxvt_fontset::clear () 1427rxvt_fontset::clear ()
1348{ 1428{
1349 prop.width = prop.height = prop.ascent = prop.weight = prop.slant 1429 prop.width = prop.height = prop.ascent = prop.weight = prop.slant
1350 = rxvt_fontprop::unset; 1430 = rxvt_fontprop::unset;
1431 force_prop = false;
1351 1432
1352 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) 1433 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1353 FONT_UNREF (*i); 1434 FONT_UNREF (*i);
1354 1435
1355 for (pagemap **p = fmap.begin (); p != fmap.end (); p++) 1436 for (pagemap **p = fmap.begin (); p != fmap.end (); p++)
… …
1385 f = new rxvt_font_x11; 1466 f = new rxvt_font_x11;
1386 } 1467 }
1387 else 1468 else
1388 f = new rxvt_font_x11; 1469 f = new rxvt_font_x11;
1389 1470
1390 f->set_term (r); 1471 f->set_term (term);
1391 f->set_name (strdup (name)); 1472 f->set_name (strdup (name));
1392 1473
1393 f->cs = cs; 1474 f->cs = cs;
1394 f->loaded = false; 1475 f->loaded = false;
1395 1476
… …
1467 if (fonts[i]->loaded) 1548 if (fonts[i]->loaded)
1468 return true; 1549 return true;
1469 1550
1470 fonts[i]->loaded = true; 1551 fonts[i]->loaded = true;
1471 1552
1472 if (!fonts[i]->load (prop)) 1553 if (!fonts[i]->load (prop, force_prop))
1473 { 1554 {
1474 fonts[i]->cs = CS_UNKNOWN; 1555 fonts[i]->cs = CS_UNKNOWN;
1475 return false; 1556 return false;
1476 } 1557 }
1477 1558
… …
1578 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1659 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1579 FcPatternAddBool (p, FC_MINSPACE, 1); 1660 FcPatternAddBool (p, FC_MINSPACE, 1);
1580 //FcPatternAddBool (p, FC_ANTIALIAS, 1); 1661 //FcPatternAddBool (p, FC_ANTIALIAS, 1);
1581 1662
1582 XftResult result; 1663 XftResult result;
1583 FcPattern *match = XftFontMatch (DISPLAY, r->display->screen, p, &result); 1664 FcPattern *match = XftFontMatch (term->dpy, term->display->screen, p, &result);
1584 1665
1585 FcPatternDestroy (p); 1666 FcPatternDestroy (p);
1586 1667
1587 if (match) 1668 if (match)
1588 { 1669 {

Diff Legend

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