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.99 by root, Sat Mar 4 18:42:15 2006 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[] = {
… …
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{
234 dTermDisplay;
235 dTermGC;
236
252 if (color == Color_bg) 237 if (color < 0 || color == Color_bg)
253 XClearArea (d.display->display, d, x, y, w, h, FALSE); 238 XClearArea (disp, d, x, y, w, h, false);
254 else if (color >= 0) 239 else
255 { 240 {
256#if XFT 241#if XFT
257 XftDrawRect (d, &r->pix_colors[color].c, x, y, w, h); 242 XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);
258#else 243#else
259 XSetForeground (d.display->display, TGC, r->pix_colors[color]); 244 XSetForeground (disp, gc, term->pix_colors[color]);
260 XFillRectangle (d.display->display, d, TGC, x, y, w, h); 245 XFillRectangle (disp, d, gc, x, y, w, h);
261#endif 246#endif
262 } 247 }
263} 248}
249
250/////////////////////////////////////////////////////////////////////////////
264 251
265#include "table/linedraw.h" 252#include "table/linedraw.h"
266 253
267struct rxvt_font_default : rxvt_font { 254struct rxvt_font_default : rxvt_font {
268 struct rxvt_fontset *fs; 255 struct rxvt_fontset *fs;
… …
293 set_name (strdup ("built-in support font")); 280 set_name (strdup ("built-in support font"));
294 281
295 return true; 282 return true;
296 } 283 }
297 284
298 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) 285 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
299 { 286 {
300 careful = false; 287 careful = false;
301 288
302 if (unicode <= 0x001f) 289 if (unicode <= 0x001f)
303 return true; 290 return true;
… …
306 return false; 293 return false;
307 294
308 if (unicode <= 0x009f) 295 if (unicode <= 0x009f)
309 return true; 296 return true;
310 297
311 if (unicode >= 0x2500 && unicode <= 0x259f) 298 if (unicode >= 0x2500 && unicode <= 0x259f &&
299 !term->option (Opt_skipBuiltinGlyphs))
312 return true; 300 return true;
313 301
314 if (IS_COMPOSE (unicode)) 302 if (IS_COMPOSE (unicode))
315 return true; 303 return true;
316 304
… …
332void 320void
333rxvt_font_default::draw (rxvt_drawable &d, int x, int y, 321rxvt_font_default::draw (rxvt_drawable &d, int x, int y,
334 const text_t *text, int len, 322 const text_t *text, int len,
335 int fg, int bg) 323 int fg, int bg)
336{ 324{
337 Display *disp = d.display->display; 325 dTermDisplay;
326 dTermGC;
338 327
339 clear_rect (d, x, y, r->fwidth * len, r->fheight, bg); 328 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
340 329
341 XSetForeground (disp, TGC, r->pix_colors[fg]); 330 XSetForeground (disp, gc, term->pix_colors[fg]);
342 331
343 while (len) 332 while (len)
344 { 333 {
345#if ENABLE_COMBINING 334#if ENABLE_COMBINING
346 compose_char *cc; 335 compose_char *cc;
… …
350 339
351 while (++text, --len && *text == NOCHAR) 340 while (++text, --len && *text == NOCHAR)
352 ; 341 ;
353 342
354 int width = text - tp; 343 int width = text - tp;
355 int fwidth = r->fwidth * width; 344 int fwidth = term->fwidth * width;
356 345
357 if (0x2500 <= t && t <= 0x259f) 346 if (0x2500 <= t && t <= 0x259f)
358 { 347 {
359 uint16_t offs = linedraw_offs[t - 0x2500]; 348 uint16_t offs = linedraw_offs[t - 0x2500];
360 uint32_t *a = linedraw_command + (offs >> 4); 349 uint32_t *a = linedraw_command + (offs >> 4);
361 uint32_t *b = a + (offs & 15); 350 uint32_t *b = a + (offs & 15);
362 351
363 int W = fwidth; 352 int W = fwidth;
364 int H = r->fheight; 353 int H = term->fheight;
365 354
366 int x_[16]; 355 int x_[16];
367 int y_[16]; 356 int y_[16];
368 357
369 for (int i = 0; i <= 8; i++) 358 for (int i = 0; i <= 8; i++)
… …
377 366
378 XGCValues gcv; 367 XGCValues gcv;
379 368
380 gcv.cap_style = CapButt; 369 gcv.cap_style = CapButt;
381 gcv.line_width = 0; 370 gcv.line_width = 0;
382 XChangeGC (disp, TGC, GCLineWidth | GCCapStyle, &gcv); 371 XChangeGC (disp, gc, GCLineWidth | GCCapStyle, &gcv);
383 372
384 while (a < b) 373 while (a < b)
385 { 374 {
386 uint32_t command = *a++; 375 uint32_t command = *a++;
387 376
… …
394 int y2 = y_[(command >> 0) & 15]; 383 int y2 = y_[(command >> 0) & 15];
395 384
396 switch (op) 385 switch (op)
397 { 386 {
398 case 0: // line 387 case 0: // line
399 XDrawLine (disp, d, TGC, x1, y1, x2, y2); 388 XDrawLine (disp, d, gc, x1, y1, x2, y2);
400 break; 389 break;
401 390
402 case 1: // rectangle, possibly stippled 391 case 1: // rectangle, possibly stippled
403 if (a) 392 if (a)
404 { 393 {
… …
407 gcv.fill_style = FillStippled; 396 gcv.fill_style = FillStippled;
408 gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2); 397 gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2);
409 gcv.ts_x_origin = x; 398 gcv.ts_x_origin = x;
410 gcv.ts_y_origin = y; 399 gcv.ts_y_origin = y;
411 400
412 XChangeGC (disp, TGC, 401 XChangeGC (disp, gc,
413 GCFillStyle | GCStipple | GCTileStipXOrigin | GCTileStipYOrigin, 402 GCFillStyle | GCStipple | GCTileStipXOrigin | GCTileStipYOrigin,
414 &gcv); 403 &gcv);
415 } 404 }
416 405
417 XFillRectangle (disp, d, TGC, x1, y1, x2 - x1 + 1, y2 - y1 + 1); 406 XFillRectangle (disp, d, gc, x1, y1, x2 - x1 + 1, y2 - y1 + 1);
418 407
419 if (a) 408 if (a)
420 { 409 {
421 XFreePixmap (disp, gcv.stipple); 410 XFreePixmap (disp, gcv.stipple);
422 gcv.stipple = 0; 411 gcv.stipple = 0;
423 gcv.fill_style = FillSolid; 412 gcv.fill_style = FillSolid;
424 XChangeGC (disp, TGC, GCFillStyle, &gcv); 413 XChangeGC (disp, gc, GCFillStyle, &gcv);
425 } 414 }
426 break; 415 break;
427 case 2: // arc 416 case 2: // arc
428 XDrawArc (disp, d, TGC, 417 XDrawArc (disp, d, gc,
429 x1 - W/2, y1 - H/2, W-1, H-1, 418 x1 - W/2, y1 - H/2, W-1, H-1,
430 (a - 1) * 90*64, (b - 1) * 90*64); 419 (a - 1) * 90*64, (b - 1) * 90*64);
431 break; 420 break;
432 } 421 }
433 } 422 }
434 } 423 }
435#if ENABLE_COMBINING 424#if ENABLE_COMBINING
436 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) 425 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
437 { 426 {
427 min_it (width, 2); // we only support wcwidth up to 2
428
438 text_t chrs[2]; 429 text_t chrs[2];
439 width = min (2, width);
440 chrs [1] = NOCHAR; 430 chrs [1] = NOCHAR;
441 431
442 *chrs = cc->c1; 432 *chrs = cc->c1;
443 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)]; 433 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)];
444 f1->draw (d, x, y, chrs, width, fg, bg); 434 f1->draw (d, x, y, chrs, width, fg, bg);
… …
464 case ZERO_WIDTH_CHAR: 454 case ZERO_WIDTH_CHAR:
465 case NOCHAR: 455 case NOCHAR:
466 break; 456 break;
467 457
468 default: 458 default:
469 XDrawRectangle (disp, d, TGC, x + 2, y + 2, 459 XDrawRectangle (disp, d, gc, x + 2, y + 2,
470 fwidth - 4, r->fheight - 4); 460 fwidth - 4, term->fheight - 4);
471 } 461 }
472 462
473 x += fwidth; 463 x += fwidth;
474 } 464 }
475} 465}
… …
483 473
484 rxvt_fontprop properties (); 474 rxvt_fontprop properties ();
485 475
486 bool load (const rxvt_fontprop &prop); 476 bool load (const rxvt_fontprop &prop);
487 477
488 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful); 478 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
489 479
490 void draw (rxvt_drawable &d, int x, int y, 480 void draw (rxvt_drawable &d, int x, int y,
491 const text_t *text, int len, 481 const text_t *text, int len,
492 int fg, int bg); 482 int fg, int bg);
493 483
494 bool slow; // wether this is a proportional font or has other funny characteristics 484 bool slow; // wether this is a proportional font or has other funny characteristics
495 XFontStruct *f; 485 XFontStruct *f;
496 codeset cs; 486 codeset cs;
497 bool enc2b, encm; 487 bool enc2b, encm;
498 488
499 char *get_property (XFontStruct *f, const char *property, const char *repl) const; 489 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); 490 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); 491 bool set_properties (rxvt_fontprop &p, XFontStruct *f);
502 bool set_properties (rxvt_fontprop &p, const char *name); 492 bool set_properties (rxvt_fontprop &p, const char *name);
503}; 493};
504 494
505char * 495char *
506rxvt_font_x11::get_property (XFontStruct *f, const char *property, const char *repl) const 496rxvt_font_x11::get_property (XFontStruct *f, Atom property, const char *repl) const
507{ 497{
508 unsigned long value; 498 unsigned long value;
509 499
510 if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value)) 500 if (XGetFontProperty (f, property, &value))
511 return XGetAtomName (DISPLAY, value); 501 return XGetAtomName (term->dpy, value);
512 else 502 else
513 return rxvt_strdup (repl); 503 return rxvt_strdup (repl);
514} 504}
515 505
516rxvt_fontprop 506rxvt_fontprop
… …
522} 512}
523 513
524bool 514bool
525rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth) 515rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth)
526{ 516{
527 p.width = avgwidth ? (avgwidth + 1) / 10 : (height + 1) / 2; 517 p.width = width != rxvt_fontprop::unset ? width
518 : avgwidth ? (avgwidth + 1) / 10
519 : (height + 1) / 2;
528 p.height = height; 520 p.height = height;
529 p.ascent = rxvt_fontprop::unset; 521 p.ascent = rxvt_fontprop::unset;
530 p.weight = *weight == 'B' || *weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium; 522 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; 523 p.slant = *slant == 'r' || *slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic;
532 524
… …
537rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f) 529rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)
538{ 530{
539 unsigned long height; 531 unsigned long height;
540 532
541#if 0 533#if 0
542 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "PIXEL_SIZE", 0), &height)) 534 if (!XGetFontProperty (f, XInternAtom (term->dpy, "PIXEL_SIZE", 0), &height))
543 return false; 535 return false;
544#else 536#else
545 height = f->ascent + f->descent; 537 height = f->ascent + f->descent;
546#endif 538#endif
547 539
548 unsigned long avgwidth; 540 unsigned long avgwidth;
549 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth)) 541 if (!XGetFontProperty (f, term->xa [XA_AVERAGE_WIDTH], &avgwidth))
550 avgwidth = 0; 542 avgwidth = 0;
551 543
552 char *weight = get_property (f, "WEIGHT_NAME", "medium"); 544 char *weight = get_property (f, term->xa [XA_WEIGHT_NAME], "medium");
553 char *slant = get_property (f, "SLANT", "r"); 545 char *slant = get_property (f, term->xa [XA_SLANT], "r");
554 546
555 set_properties (p, height, weight, slant, avgwidth); 547 set_properties (p, height, weight, slant, avgwidth);
556 548
557 free (weight); 549 free (weight);
558 free (slant); 550 free (slant);
… …
563} 555}
564 556
565bool 557bool
566rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name) 558rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name)
567{ 559{
560 dTermDisplay;
568 int slashes = 0; 561 int slashes = 0;
569 const char *comp[13]; 562 const char *comp[13];
570 563
571 for (const char *c = name; *c; c++) 564 for (const char *c = name; *c; c++)
572 if (*c == '-') 565 if (*c == '-')
… …
580 if (slashes >= 13 573 if (slashes >= 13
581 && (*comp[ 6] >= '1' && *comp[ 6] <= '9') 574 && (*comp[ 6] >= '1' && *comp[ 6] <= '9')
582 && (*comp[11] >= '0' && *comp[11] <= '9')) 575 && (*comp[11] >= '0' && *comp[11] <= '9'))
583 return set_properties (p, atoi (comp[6]), comp[2], comp[3], atoi (comp[11])); 576 return set_properties (p, atoi (comp[6]), comp[2], comp[3], atoi (comp[11]));
584 577
585 XFontStruct *f = XLoadQueryFont (DISPLAY, name); 578 XFontStruct *f = XLoadQueryFont (disp, name);
586 579
587 if (f) 580 if (f)
588 { 581 {
589 // the font should really exist now. if not, we have a problem 582 // 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). 583 // (e.g. if the user did xset fp rehash just when we were searching fonts).
591 // in that case, just return garbage. 584 // in that case, just return garbage.
592 bool ret = set_properties (p, f); 585 bool ret = set_properties (p, f);
593 XFreeFont (DISPLAY, f); 586 XFreeFont (disp, f);
594 return ret; 587 return ret;
595 } 588 }
596 else 589 else
597 return false; 590 return false;
598} 591}
… …
636} 629}
637 630
638bool 631bool
639rxvt_font_x11::load (const rxvt_fontprop &prop) 632rxvt_font_x11::load (const rxvt_fontprop &prop)
640{ 633{
641 Display *disp = DISPLAY; 634 dTermDisplay;
642 635
643 clear (); 636 clear ();
644 637
645 char field_str[64]; // enough for 128 bits 638 char field_str[64]; // enough for 128 bits
646 639
… …
655 f = XLoadQueryFont (disp, name); 648 f = XLoadQueryFont (disp, name);
656 649
657 if (!f) 650 if (!f)
658 return false; 651 return false;
659 652
660 char *new_name = get_property (f, "FONT", name); 653 char *new_name = get_property (f, XA_FONT, name);
661 654
662 if (new_name) 655 if (new_name)
663 set_name (new_name); 656 set_name (new_name);
664 else 657 else
665 rxvt_warn ("font '%s' has no FONT property, continuing without.", name); 658 rxvt_warn ("font '%s' has no FONT property, continuing without.", name);
… …
721 int diff = 0; 714 int diff = 0;
722 715
723 if (replace_field (fname, list[i], 6, '0', field_str)) 716 if (replace_field (fname, list[i], 6, '0', field_str))
724 diff += 10; // slightly penalize scalable fonts 717 diff += 10; // slightly penalize scalable fonts
725 else if (replace_field (fname, list[i], 11, '0', "0")) 718 else if (replace_field (fname, list[i], 11, '0', "0"))
726 diff += 300; // more heavily penalize what looks like scaled bitmap fotns 719 diff += 300; // more heavily penalize what looks like scaled bitmap fonts
727 720
728 if (!set_properties (p, fname)) 721 if (!set_properties (p, fname))
729 continue; 722 continue;
730 723
731 if (prop.height != rxvt_fontprop::unset 724 if (prop.height != rxvt_fontprop::unset
… …
774 delete [] fonts; 767 delete [] fonts;
775 768
776 if (!f) 769 if (!f)
777 return false; 770 return false;
778 771
779 char *registry = get_property (f, "CHARSET_REGISTRY", 0); 772 char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0);
780 char *encoding = get_property (f, "CHARSET_ENCODING", 0); 773 char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0);
781 774
782 if (registry && encoding) 775 if (registry && encoding)
783 { 776 {
784 char charset[64]; 777 char charset[64];
785 snprintf (charset, 64, "%s-%s", registry, encoding); 778 snprintf (charset, 64, "%s-%s", registry, encoding);
786 779
787 cs = codeset_from_name (charset); 780 cs = codeset_from_name (charset);
788 } 781 }
789 else 782 else
790 { 783 {
791 const char *charset = get_property (f, "FONT", 0); 784 const char *charset = get_property (f, XA_FONT, 0);
792 785
793 if (!charset) 786 if (!charset)
794 charset = name; 787 charset = name;
795 788
796 int count = 13; 789 int count = 13;
… …
811 enc2b = encm || f->max_char_or_byte2 > 255; 804 enc2b = encm || f->max_char_or_byte2 > 255;
812 805
813 slow = false; 806 slow = false;
814 807
815#if 1 // only used for slow detection, TODO optimize 808#if 1 // only used for slow detection, TODO optimize
816 if (f->min_bounds.width == f->max_bounds.width) 809 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; 810 width = f->max_bounds.width;
820 else 811 else
821 { 812 {
822 slow = true; 813 slow = true;
823 814
… …
839 830
840 width = 1; 831 width = 1;
841 832
842 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 833 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; )
843 { 834 {
844 if (cs != CS_UNICODE
845 && *t > 0x100
846 && FROM_UNICODE (cs, *t) == NOCHAR) 835 if (FROM_UNICODE (cs, *t) == NOCHAR)
847 continue; 836 continue;
848 837
849 // ignore characters we wouldn't use anyways 838 // ignore characters we wouldn't use anyways
850 bool careful; 839 bool careful;
851 if (!has_char (*t, &prop, careful)) 840 if (!has_char (*t, &prop, careful))
… …
855 844
856 XCharStruct g; 845 XCharStruct g;
857 int dir_ret, asc_ret, des_ret; 846 int dir_ret, asc_ret, des_ret;
858 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); 847 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);
859 848
849 int wcw = WCWIDTH (*t);
860 int wcw = wcwidth (*t); if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; 850 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
861 851
862 if (width < g.width) width = g.width; 852 if (width < g.width) width = g.width;
863 } 853 }
864 854
865 if (cs == CS_UNKNOWN) 855 if (cs == CS_UNKNOWN)
866 { 856 {
867 fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name); 857 fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);
… …
884void 874void
885rxvt_font_x11::clear () 875rxvt_font_x11::clear ()
886{ 876{
887 if (f) 877 if (f)
888 { 878 {
889 XFreeFont (DISPLAY, f); 879 XFreeFont (term->dpy, f);
890 f = 0; 880 f = 0;
891 } 881 }
892} 882}
893 883
894bool 884bool
895rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) 885rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
896{ 886{
897 uint32_t ch = FROM_UNICODE (cs, unicode); 887 uint32_t ch = FROM_UNICODE (cs, unicode);
898 888
899 if (ch == NOCHAR) 889 if (ch == NOCHAR)
900 return false; 890 return false;
… …
937 return false; 927 return false;
938 928
939 if (!prop || prop->width == rxvt_fontprop::unset) 929 if (!prop || prop->width == rxvt_fontprop::unset)
940 return true; 930 return true;
941 931
942 // check character against base font bounding box 932 // check wether character overlaps previous/next character
943 int w = xcs->width; 933 int w = xcs->rbearing - xcs->lbearing;
944 int wcw = wcwidth (unicode); 934 int wcw = max (WCWIDTH (unicode), 1);
945 if (wcw > 0) w = (w + wcw - 1) / wcw;
946 935
947 careful = w > prop->width; 936 careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw;
948 if (careful && w > prop->width * MAX_OVERLAP >> 2) 937
938 if (careful && !OVERLAP_OK (w, wcw, prop))
949 return false; 939 return false;
950 940
951 return true; 941 return true;
952} 942}
953 943
… …
959 // this looks like a mess /. 949 // this looks like a mess /.
960 // and it is a mess /. 950 // and it is a mess /.
961 // yet we are trying to be perfect /. 951 // yet we are trying to be perfect /.
962 // but the result still isn't perfect /. 952 // but the result still isn't perfect /.
963 953
954 dTermDisplay;
955 dTermGC;
956
964 bool slow = this->slow 957 bool slow = this->slow
965 || width != r->fwidth 958 || width != term->fwidth
966 || height != r->fheight; 959 || height != term->fheight;
967 960
968 int base = ascent; // sorry, incorrect: r->fbase; 961 int base = ascent; // sorry, incorrect: term->fbase;
969 962
970 XGCValues v; 963 XGCValues v;
971 v.foreground = r->pix_colors[fg]; 964 v.foreground = term->pix_colors[fg];
972 v.font = f->fid; 965 v.font = f->fid;
973 966
974 if (enc2b) 967 if (enc2b)
975 { 968 {
976 const XChar2b *xc = enc_xchar2b (text, len, cs, slow); 969 const XChar2b *xc = enc_xchar2b (text, len, cs, slow);
977 970
978 if (bg == Color_bg && !slow) 971 if (bg == Color_bg && !slow)
979 { 972 {
980 v.background = r->pix_colors[bg]; 973 v.background = term->pix_colors[bg];
981 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); 974 XChangeGC (disp, gc, GCForeground | GCBackground | GCFont, &v);
982 XDrawImageString16 (d.display->display, d, TGC, x, y + base, xc, len); 975 XDrawImageString16 (disp, d, gc, x, y + base, xc, len);
983 } 976 }
984 else 977 else
985 { 978 {
986 clear_rect (d, x, y, r->fwidth * len, r->fheight, bg); 979 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
987 980
988 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v); 981 XChangeGC (disp, gc, GCForeground | GCFont, &v);
989 982
990 if (slow) 983 if (slow)
991 { 984 {
992 do 985 do
993 { 986 {
994 if (xc->byte1 || xc->byte2) 987 if (xc->byte1 || xc->byte2)
995 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, 1); 988 XDrawString16 (disp, d, gc, x, y + base, xc, 1);
996 989
997 x += r->fwidth; 990 x += term->fwidth;
998 xc++; len--; 991 xc++; len--;
999 } 992 }
1000 while (len); 993 while (len);
1001 } 994 }
1002 else 995 else
1003 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, len); 996 XDrawString16 (disp, d, gc, x, y + base, xc, len);
1004 } 997 }
1005 } 998 }
1006 else 999 else
1007 { 1000 {
1008 const char *xc = enc_char (text, len, cs, slow); 1001 const char *xc = enc_char (text, len, cs, slow);
1009 1002
1010 if (bg == Color_bg && !slow) 1003 if (bg == Color_bg && !slow)
1011 { 1004 {
1012 v.background = r->pix_colors[bg]; 1005 v.background = term->pix_colors[bg];
1013 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); 1006 XChangeGC (disp, gc, GCForeground | GCBackground | GCFont, &v);
1014 XDrawImageString (d.display->display, d, TGC, x, y + base, xc, len); 1007 XDrawImageString (disp, d, gc, x, y + base, xc, len);
1015 } 1008 }
1016 else 1009 else
1017 { 1010 {
1018 clear_rect (d, x, y, r->fwidth * len, r->fheight, bg); 1011 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
1019 1012
1020 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v); 1013 XChangeGC (disp, gc, GCForeground | GCFont, &v);
1021 1014
1022 if (slow) 1015 if (slow)
1023 { 1016 {
1024 do 1017 do
1025 { 1018 {
1026 if (*xc) 1019 if (*xc)
1027 XDrawString (d.display->display, d, TGC, x, y + base, xc, 1); 1020 XDrawString (disp, d, gc, x, y + base, xc, 1);
1028 1021
1029 x += r->fwidth; 1022 x += term->fwidth;
1030 xc++; len--; 1023 xc++; len--;
1031 } 1024 }
1032 while (len); 1025 while (len);
1033 } 1026 }
1034 else 1027 else
1035 XDrawString (d.display->display, d, TGC, x, y + base, xc, len); 1028 XDrawString (disp, d, gc, x, y + base, xc, len);
1036 } 1029 }
1037 } 1030 }
1038} 1031}
1039 1032
1040///////////////////////////////////////////////////////////////////////////// 1033/////////////////////////////////////////////////////////////////////////////
… …
1052 1045
1053 void draw (rxvt_drawable &d, int x, int y, 1046 void draw (rxvt_drawable &d, int x, int y,
1054 const text_t *text, int len, 1047 const text_t *text, int len,
1055 int fg, int bg); 1048 int fg, int bg);
1056 1049
1057 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &carefull); 1050 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &carefull) const;
1058 1051
1059protected: 1052protected:
1060 XftFont *f; 1053 XftFont *f;
1061}; 1054};
1062 1055
1063void 1056void
1064rxvt_font_xft::clear () 1057rxvt_font_xft::clear ()
1065{ 1058{
1066 if (f) 1059 if (f)
1067 { 1060 {
1068 XftFontClose (DISPLAY, f); 1061 XftFontClose (term->dpy, f);
1069 f = 0; 1062 f = 0;
1070 } 1063 }
1071} 1064}
1072 1065
1073rxvt_fontprop 1066rxvt_fontprop
… …
1091} 1084}
1092 1085
1093bool 1086bool
1094rxvt_font_xft::load (const rxvt_fontprop &prop) 1087rxvt_font_xft::load (const rxvt_fontprop &prop)
1095{ 1088{
1096 Display *disp = DISPLAY; 1089 dTermDisplay;
1097 1090
1098 clear (); 1091 clear ();
1099 1092
1100 FcPattern *p = FcNameParse ((FcChar8 *) name); 1093 FcPattern *p = FcNameParse ((FcChar8 *) name);
1101 1094
… …
1128 1121
1129 // store generated name so iso14755 view gives better results 1122 // store generated name so iso14755 view gives better results
1130 set_name ((char *)FcNameUnparse (p)); 1123 set_name ((char *)FcNameUnparse (p));
1131 1124
1132 XftResult result; 1125 XftResult result;
1133 FcPattern *match = XftFontMatch (disp, r->display->screen, p, &result); 1126 FcPattern *match = XftFontMatch (disp, term->display->screen, p, &result);
1134 1127
1135 FcPatternDestroy (p); 1128 FcPatternDestroy (p);
1136 1129
1137 if (!match) 1130 if (!match)
1138 return false; 1131 return false;
… …
1180 XGlyphInfo g; 1173 XGlyphInfo g;
1181 XftTextExtents16 (disp, f, &ch, 1, &g); 1174 XftTextExtents16 (disp, f, &ch, 1, &g);
1182 1175
1183 g.width -= g.x; 1176 g.width -= g.x;
1184 1177
1185 int wcw = wcwidth (ch); 1178 int wcw = WCWIDTH (ch);
1186 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; 1179 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
1187 1180
1188 if (width < g.width ) width = g.width; 1181 if (width < g.width ) width = g.width;
1189 if (height < g.height ) height = g.height; 1182 if (height < g.height ) height = g.height;
1190 if (glheight < g.height - g.y) glheight = g.height - g.y; 1183 if (glheight < g.height - g.y) glheight = g.height - g.y;
… …
1236 1229
1237 return success; 1230 return success;
1238} 1231}
1239 1232
1240bool 1233bool
1241rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) 1234rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
1242{ 1235{
1243 careful = false; 1236 careful = false;
1244 1237
1245 if (!XftCharExists (DISPLAY, f, unicode)) 1238 if (!XftCharExists (term->dpy, f, unicode))
1246 return false; 1239 return false;
1247 1240
1248 if (!prop || prop->width == rxvt_fontprop::unset) 1241 if (!prop || prop->width == rxvt_fontprop::unset)
1249 return true; 1242 return true;
1250 1243
1251 // check character against base font bounding box 1244 // check character against base font bounding box
1252 FcChar32 ch = unicode; 1245 FcChar32 ch = unicode;
1253 XGlyphInfo g; 1246 XGlyphInfo g;
1254 XftTextExtents32 (DISPLAY, f, &ch, 1, &g); 1247 XftTextExtents32 (term->dpy, f, &ch, 1, &g);
1255 1248
1256 int w = g.width - g.x; 1249 int w = g.width - g.x;
1257 int wcw = wcwidth (unicode); 1250 int wcw = max (WCWIDTH (unicode), 1);
1258 if (wcw > 0) w = (w + wcw - 1) / wcw;
1259 1251
1260 careful = w > prop->width; 1252 careful = g.x > 0 || w > prop->width * wcw;
1261 if (careful && w > prop->width * MAX_OVERLAP >> 2) 1253
1254 if (careful && !OVERLAP_OK (w, wcw, prop))
1255 return false;
1256
1257 // this weeds out _totally_ broken fonts, or glyphs
1258 if (!OVERLAP_OK (g.xOff, wcw, prop))
1262 return false; 1259 return false;
1263 1260
1264 return true; 1261 return true;
1265} 1262}
1266 1263
1267void 1264void
1268rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, 1265rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1269 const text_t *text, int len, 1266 const text_t *text, int len,
1270 int fg, int bg) 1267 int fg, int bg)
1271{ 1268{
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; 1269 XGlyphInfo extents;
1277 FcChar32 *enc = (FcChar32 *) get_enc_buf (len * sizeof (FcChar32)); 1270 XftGlyphSpec *enc = (XftGlyphSpec *)rxvt_temp_buf (len * sizeof (XftGlyphSpec));
1278 FcChar32 *ep = enc; 1271 XftGlyphSpec *ep = enc;
1279 int ewidth = 0; 1272
1273 dTermDisplay;
1274 dTermGC;
1275
1276 int w = term->fwidth * len;
1277 int h = term->fheight;
1278
1279 bool buffered = 0
1280#ifndef FORCE_UNBUFFERED_XFT
1281# if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
1282 || !term->am_transparent // we aren't transparent
1283 || term->am_pixmap_trans // we have a pixmap
1284# endif
1285 || bg >= 0; // we don't use a transparent bg
1286#endif
1287
1288 // cut trailing spaces
1289 while (len && text [len - 1] == ' ')
1290 len--;
1291
1292 int x_ = buffered ? 0 : x;
1293 int y_ = buffered ? 0 : y;
1280 1294
1281 while (len) 1295 while (len)
1282 { 1296 {
1283 int cwidth = r->fwidth; 1297 int cwidth = term->fwidth;
1284 FcChar32 fc = *text++; len--; 1298 FcChar32 fc = *text++; len--;
1285 1299
1286 while (len && *text == NOCHAR) 1300 while (len && *text == NOCHAR)
1287 text++, len--, cwidth += r->fwidth; 1301 text++, len--, cwidth += term->fwidth;
1288 1302
1289 if (fc == ' ' && ep == enc) // skip leading spaces 1303 if (fc != ' ') // skip spaces
1304 {
1305 FT_UInt glyph = XftCharIndex (disp, f, fc);
1306 XftGlyphExtents (disp, f, &glyph, 1, &extents);
1307
1308 ep->glyph = glyph;
1309 ep->x = x_ + (cwidth - extents.xOff >> 1);
1310 ep->y = y_ + ascent;
1311
1312 if (extents.xOff == 0)
1313 ep->x = x_ + cwidth;
1314
1315 ep++;
1316 }
1317
1290 x += cwidth; 1318 x_ += cwidth;
1291 else 1319 }
1292 {
1293 FT_UInt gl = XftCharIndex (d.display->display, f, fc);
1294 XftGlyphExtents (d.display->display, f, &gl, 1, &extents);
1295 1320
1296 if (extents.xOff != cwidth) 1321 if (buffered)
1322 {
1323 if (ep != enc)
1324 {
1325 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1326
1327#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
1328 if (bg < 0 && term->am_pixmap_trans)
1329 XCopyArea (disp, term->pixmap, d2, gc, x, y, w, h, 0, 0);
1330 else if (bg < 0 && term->bgPixmap.pixmap)
1297 { 1331 {
1298 if (ewidth) 1332 XGCValues gcv;
1299 {
1300 XftDrawGlyphs (d, &r->pix_colors[fg].c, f,
1301 x, y + base, enc, ep - enc);
1302 x += ewidth;
1303 1333
1304 ep = enc; 1334 gcv.fill_style = FillTiled;
1305 ewidth = 0; 1335 gcv.tile = term->pixmap;
1306 } 1336 gcv.ts_x_origin = -x;
1337 gcv.ts_y_origin = -y;
1307 1338
1308 if (extents.xOff > cwidth) 1339 GC gc2 = XCreateGC (disp, d2,
1309 extents.xOff = cwidth; 1340 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
1310
1311 XftDrawGlyphs (d, &r->pix_colors[fg].c, f,
1312 x + (cwidth - extents.xOff >> 1),
1313 y + base, &gl, 1); 1341 &gcv);
1314 x += cwidth; 1342
1343 XFillRectangle (disp, d2, gc2, 0, 0, w, h);
1344
1345 XFreeGC (disp, gc2);
1315 } 1346 }
1316 else 1347 else
1317 { 1348#endif
1318 *ep++ = gl; 1349 XftDrawRect (d2, &term->pix_colors[bg].c, 0, 0, w, h);
1319 ewidth += cwidth; 1350
1351 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);
1352 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
1320 } 1353 }
1321 } 1354 else
1355 clear_rect (d, x, y, w, h, bg);
1356 }
1357 else
1322 } 1358 {
1323 1359 clear_rect (d, x, y, w, h, bg);
1324 if (ep != enc)
1325 XftDrawGlyphs (d, &r->pix_colors[fg].c, f, 1360 XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc);
1326 x, y + base, enc, ep - enc); 1361 }
1327} 1362}
1363
1328#endif 1364#endif
1329 1365
1330///////////////////////////////////////////////////////////////////////////// 1366/////////////////////////////////////////////////////////////////////////////
1331 1367
1332rxvt_fontset::rxvt_fontset (rxvt_t r) 1368rxvt_fontset::rxvt_fontset (rxvt_term *term)
1333: fontdesc (0), r (r) 1369: fontdesc (0), term (term)
1334{ 1370{
1335 clear (); 1371 clear ();
1336} 1372}
1337 1373
1338rxvt_fontset::~rxvt_fontset () 1374rxvt_fontset::~rxvt_fontset ()
… …
1382 f = new rxvt_font_x11; 1418 f = new rxvt_font_x11;
1383 } 1419 }
1384 else 1420 else
1385 f = new rxvt_font_x11; 1421 f = new rxvt_font_x11;
1386 1422
1387 f->set_term (r); 1423 f->set_term (term);
1388 f->set_name (strdup (name)); 1424 f->set_name (strdup (name));
1389 1425
1390 f->cs = cs; 1426 f->cs = cs;
1391 f->loaded = false; 1427 f->loaded = false;
1392 1428
… …
1575 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1611 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1576 FcPatternAddBool (p, FC_MINSPACE, 1); 1612 FcPatternAddBool (p, FC_MINSPACE, 1);
1577 //FcPatternAddBool (p, FC_ANTIALIAS, 1); 1613 //FcPatternAddBool (p, FC_ANTIALIAS, 1);
1578 1614
1579 XftResult result; 1615 XftResult result;
1580 FcPattern *match = XftFontMatch (DISPLAY, r->display->screen, p, &result); 1616 FcPattern *match = XftFontMatch (term->dpy, term->display->screen, p, &result);
1581 1617
1582 FcPatternDestroy (p); 1618 FcPatternDestroy (p);
1583 1619
1584 if (match) 1620 if (match)
1585 { 1621 {

Diff Legend

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