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.93 by root, Tue Jan 31 00:25:16 2006 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
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->xdisp
164#define dTermGC GC gc = term->gc
165
157///////////////////////////////////////////////////////////////////////////// 166/////////////////////////////////////////////////////////////////////////////
158 167
159#if XFT 168#if XFT
160rxvt_drawable::~rxvt_drawable () 169rxvt_drawable::~rxvt_drawable ()
161{ 170{
… …
164} 173}
165 174
166rxvt_drawable::operator XftDraw *() 175rxvt_drawable::operator XftDraw *()
167{ 176{
168 if (!xftdrawable) 177 if (!xftdrawable)
169 xftdrawable = XftDrawCreate (display->display, drawable, display->visual, display->cmap); 178 xftdrawable = XftDrawCreate (screen->xdisp, drawable, screen->visual, screen->cmap);
170 179
171 return xftdrawable; 180 return xftdrawable;
172} 181}
173#endif 182#endif
174 183
175///////////////////////////////////////////////////////////////////////////// 184/////////////////////////////////////////////////////////////////////////////
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 185
193static const char * 186static const char *
194enc_char (const text_t *text, uint32_t len, codeset cs, bool &zero) 187enc_char (const text_t *text, uint32_t len, codeset cs, bool &zero)
195{ 188{
196 uint8_t *buf = (uint8_t *)get_enc_buf (len); 189 uint8_t *buf = rxvt_temp_buf<uint8_t> (len);
190 uint8_t *res = buf;
197 191
198 while (len--) 192 while (len--)
199 { 193 {
200 uint32_t c = FROM_UNICODE (cs, *text++); 194 uint32_t c = FROM_UNICODE (cs, *text++);
201 195
… …
206 } 200 }
207 201
208 *buf++ = c; 202 *buf++ = c;
209 } 203 }
210 204
211 return (const char *)enc_buf; 205 return (const char *)res;
212} 206}
213 207
214static const XChar2b * 208static const XChar2b *
215enc_xchar2b (const text_t *text, uint32_t len, codeset cs, bool &zero) 209enc_xchar2b (const text_t *text, uint32_t len, codeset cs, bool &zero)
216{ 210{
217 XChar2b *buf = (XChar2b *)get_enc_buf (len * sizeof (XChar2b)); 211 XChar2b *buf = rxvt_temp_buf<XChar2b> (len);
212 XChar2b *res = buf;
218 213
219 while (len--) 214 while (len--)
220 { 215 {
221 uint32_t c = FROM_UNICODE (cs, *text++); 216 uint32_t c = FROM_UNICODE (cs, *text++);
222 217
… …
229 buf->byte1 = c >> 8; 224 buf->byte1 = c >> 8;
230 buf->byte2 = c; 225 buf->byte2 = c;
231 buf++; 226 buf++;
232 } 227 }
233 228
234 return (XChar2b *)enc_buf; 229 return res;
235} 230}
236 231
237///////////////////////////////////////////////////////////////////////////// 232/////////////////////////////////////////////////////////////////////////////
233
234rxvt_font::rxvt_font ()
235: name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset)
236{
237}
238 238
239void 239void
240rxvt_font::set_name (char *name) 240rxvt_font::set_name (char *name)
241{ 241{
242 if (this->name == name) 242 if (this->name == name)
… …
245 if (this->name) free (this->name); // let the compiler optimize 245 if (this->name) free (this->name); // let the compiler optimize
246 this->name = name; 246 this->name = name;
247} 247}
248 248
249void 249void
250rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) 250rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const
251{ 251{
252 dTermDisplay;
253 dTermGC;
254
252 if (color == Color_bg) 255 if (color == Color_bg)
253 XClearArea (d.display->display, d, x, y, w, h, FALSE); 256 XClearArea (disp, d, x, y, w, h, false);
254 else if (color >= 0) 257 else if (color >= 0)
255 { 258 {
256#if XFT 259#if XFT
257 XftDrawRect (d, &r->pix_colors[color].c, x, y, w, h); 260 XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);
258#else 261#else
259 XSetForeground (d.display->display, TGC, r->pix_colors[color]); 262 XSetForeground (disp, gc, term->pix_colors[color]);
260 XFillRectangle (d.display->display, d, TGC, x, y, w, h); 263 XFillRectangle (disp, d, gc, x, y, w, h);
261#endif 264#endif
262 } 265 }
263} 266}
267
268/////////////////////////////////////////////////////////////////////////////
264 269
265#include "table/linedraw.h" 270#include "table/linedraw.h"
266 271
267struct rxvt_font_default : rxvt_font { 272struct rxvt_font_default : rxvt_font {
268 struct rxvt_fontset *fs; 273 struct rxvt_fontset *fs;
… …
293 set_name (strdup ("built-in support font")); 298 set_name (strdup ("built-in support font"));
294 299
295 return true; 300 return true;
296 } 301 }
297 302
298 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) 303 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
299 { 304 {
300 careful = false; 305 careful = false;
301 306
302 if (unicode <= 0x001f) 307 if (unicode <= 0x001f)
303 return true; 308 return true;
… …
306 return false; 311 return false;
307 312
308 if (unicode <= 0x009f) 313 if (unicode <= 0x009f)
309 return true; 314 return true;
310 315
311 if (unicode >= 0x2500 && unicode <= 0x259f) 316 if (unicode >= 0x2500 && unicode <= 0x259f &&
317 !term->option (Opt_skipBuiltinGlyphs))
312 return true; 318 return true;
313 319
314 if (IS_COMPOSE (unicode)) 320 if (IS_COMPOSE (unicode))
315 return true; 321 return true;
316 322
… …
332void 338void
333rxvt_font_default::draw (rxvt_drawable &d, int x, int y, 339rxvt_font_default::draw (rxvt_drawable &d, int x, int y,
334 const text_t *text, int len, 340 const text_t *text, int len,
335 int fg, int bg) 341 int fg, int bg)
336{ 342{
337 Display *disp = d.display->display; 343 dTermDisplay;
344 dTermGC;
338 345
339 clear_rect (d, x, y, r->fwidth * len, r->fheight, bg); 346 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
340 347
341 XSetForeground (disp, TGC, r->pix_colors[fg]); 348 XSetForeground (disp, gc, term->pix_colors[fg]);
342 349
343 while (len) 350 while (len)
344 { 351 {
345#if ENABLE_COMBINING 352#if ENABLE_COMBINING
346 compose_char *cc; 353 compose_char *cc;
… …
350 357
351 while (++text, --len && *text == NOCHAR) 358 while (++text, --len && *text == NOCHAR)
352 ; 359 ;
353 360
354 int width = text - tp; 361 int width = text - tp;
355 int fwidth = r->fwidth * width; 362 int fwidth = term->fwidth * width;
356 363
357 if (0x2500 <= t && t <= 0x259f) 364 if (0x2500 <= t && t <= 0x259f)
358 { 365 {
359 uint16_t offs = linedraw_offs[t - 0x2500]; 366 uint16_t offs = linedraw_offs[t - 0x2500];
360 uint32_t *a = linedraw_command + (offs >> 4); 367 uint32_t *a = linedraw_command + (offs >> 4);
361 uint32_t *b = a + (offs & 15); 368 uint32_t *b = a + (offs & 15);
362 369
363 int W = fwidth; 370 int W = fwidth;
364 int H = r->fheight; 371 int H = term->fheight;
365 372
366 int x_[16]; 373 int x_[16];
367 int y_[16]; 374 int y_[16];
368 375
369 for (int i = 0; i <= 8; i++) 376 for (int i = 0; i <= 8; i++)
… …
377 384
378 XGCValues gcv; 385 XGCValues gcv;
379 386
380 gcv.cap_style = CapButt; 387 gcv.cap_style = CapButt;
381 gcv.line_width = 0; 388 gcv.line_width = 0;
382 XChangeGC (disp, TGC, GCLineWidth | GCCapStyle, &gcv); 389 XChangeGC (disp, gc, GCLineWidth | GCCapStyle, &gcv);
383 390
384 while (a < b) 391 while (a < b)
385 { 392 {
386 uint32_t command = *a++; 393 uint32_t command = *a++;
387 394
… …
394 int y2 = y_[(command >> 0) & 15]; 401 int y2 = y_[(command >> 0) & 15];
395 402
396 switch (op) 403 switch (op)
397 { 404 {
398 case 0: // line 405 case 0: // line
399 XDrawLine (disp, d, TGC, x1, y1, x2, y2); 406 XDrawLine (disp, d, gc, x1, y1, x2, y2);
400 break; 407 break;
401 408
402 case 1: // rectangle, possibly stippled 409 case 1: // rectangle, possibly stippled
403 if (a) 410 if (a)
404 { 411 {
… …
407 gcv.fill_style = FillStippled; 414 gcv.fill_style = FillStippled;
408 gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2); 415 gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2);
409 gcv.ts_x_origin = x; 416 gcv.ts_x_origin = x;
410 gcv.ts_y_origin = y; 417 gcv.ts_y_origin = y;
411 418
412 XChangeGC (disp, TGC, 419 XChangeGC (disp, gc,
413 GCFillStyle | GCStipple | GCTileStipXOrigin | GCTileStipYOrigin, 420 GCFillStyle | GCStipple | GCTileStipXOrigin | GCTileStipYOrigin,
414 &gcv); 421 &gcv);
415 } 422 }
416 423
417 XFillRectangle (disp, d, TGC, x1, y1, x2 - x1 + 1, y2 - y1 + 1); 424 XFillRectangle (disp, d, gc, x1, y1, x2 - x1 + 1, y2 - y1 + 1);
418 425
419 if (a) 426 if (a)
420 { 427 {
421 XFreePixmap (disp, gcv.stipple); 428 XFreePixmap (disp, gcv.stipple);
422 gcv.stipple = 0; 429 gcv.stipple = 0;
423 gcv.fill_style = FillSolid; 430 gcv.fill_style = FillSolid;
424 XChangeGC (disp, TGC, GCFillStyle, &gcv); 431 XChangeGC (disp, gc, GCFillStyle, &gcv);
425 } 432 }
426 break; 433 break;
427 case 2: // arc 434 case 2: // arc
428 XDrawArc (disp, d, TGC, 435 XDrawArc (disp, d, gc,
429 x1 - W/2, y1 - H/2, W-1, H-1, 436 x1 - W/2, y1 - H/2, W-1, H-1,
430 (a - 1) * 90*64, (b - 1) * 90*64); 437 (a - 1) * 90*64, (b - 1) * 90*64);
431 break; 438 break;
432 } 439 }
433 } 440 }
434 } 441 }
435#if ENABLE_COMBINING 442#if ENABLE_COMBINING
436 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) 443 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
437 { 444 {
445 min_it (width, 2); // we only support wcwidth up to 2
446
438 text_t chrs[2]; 447 text_t chrs[2];
439 width = min (2, width);
440 chrs [1] = NOCHAR; 448 chrs [1] = NOCHAR;
441 449
442 *chrs = cc->c1; 450 *chrs = cc->c1;
443 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)]; 451 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)];
444 f1->draw (d, x, y, chrs, width, fg, bg); 452 f1->draw (d, x, y, chrs, width, fg, bg);
… …
464 case ZERO_WIDTH_CHAR: 472 case ZERO_WIDTH_CHAR:
465 case NOCHAR: 473 case NOCHAR:
466 break; 474 break;
467 475
468 default: 476 default:
469 XDrawRectangle (disp, d, TGC, x + 2, y + 2, 477 XDrawRectangle (disp, d, gc, x + 2, y + 2,
470 fwidth - 4, r->fheight - 4); 478 fwidth - 4, term->fheight - 4);
471 } 479 }
472 480
473 x += fwidth; 481 x += fwidth;
474 } 482 }
475} 483}
… …
483 491
484 rxvt_fontprop properties (); 492 rxvt_fontprop properties ();
485 493
486 bool load (const rxvt_fontprop &prop); 494 bool load (const rxvt_fontprop &prop);
487 495
488 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful); 496 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
489 497
490 void draw (rxvt_drawable &d, int x, int y, 498 void draw (rxvt_drawable &d, int x, int y,
491 const text_t *text, int len, 499 const text_t *text, int len,
492 int fg, int bg); 500 int fg, int bg);
493 501
494 bool slow; // wether this is a proportional font or has other funny characteristics 502 bool slow; // wether this is a proportional font or has other funny characteristics
495 XFontStruct *f; 503 XFontStruct *f;
496 codeset cs; 504 codeset cs;
497 bool enc2b, encm; 505 bool enc2b, encm;
498 506
499 char *get_property (XFontStruct *f, const char *property, const char *repl) const; 507 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); 508 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); 509 bool set_properties (rxvt_fontprop &p, XFontStruct *f);
502 bool set_properties (rxvt_fontprop &p, const char *name); 510 bool set_properties (rxvt_fontprop &p, const char *name);
503}; 511};
504 512
505char * 513char *
506rxvt_font_x11::get_property (XFontStruct *f, const char *property, const char *repl) const 514rxvt_font_x11::get_property (XFontStruct *f, Atom property, const char *repl) const
507{ 515{
508 unsigned long value; 516 unsigned long value;
509 517
510 if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value)) 518 if (XGetFontProperty (f, property, &value))
511 return XGetAtomName (DISPLAY, value); 519 return XGetAtomName (term->xdisp, value);
512 else 520 else
513 return rxvt_strdup (repl); 521 return rxvt_strdup (repl);
514} 522}
515 523
516rxvt_fontprop 524rxvt_fontprop
… …
522} 530}
523 531
524bool 532bool
525rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth) 533rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth)
526{ 534{
527 p.width = avgwidth ? (avgwidth + 1) / 10 : (height + 1) / 2; 535 p.width = width != rxvt_fontprop::unset ? width
536 : avgwidth ? (avgwidth + 1) / 10
537 : (height + 1) / 2;
528 p.height = height; 538 p.height = height;
529 p.ascent = rxvt_fontprop::unset; 539 p.ascent = rxvt_fontprop::unset;
530 p.weight = *weight == 'B' || *weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium; 540 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; 541 p.slant = *slant == 'r' || *slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic;
532 542
… …
537rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f) 547rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)
538{ 548{
539 unsigned long height; 549 unsigned long height;
540 550
541#if 0 551#if 0
542 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "PIXEL_SIZE", 0), &height)) 552 if (!XGetFontProperty (f, XInternAtom (term->xdisp, "PIXEL_SIZE", 0), &height))
543 return false; 553 return false;
544#else 554#else
545 height = f->ascent + f->descent; 555 height = f->ascent + f->descent;
546#endif 556#endif
547 557
548 unsigned long avgwidth; 558 unsigned long avgwidth;
549 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth)) 559 if (!XGetFontProperty (f, term->xa [XA_AVERAGE_WIDTH], &avgwidth))
550 avgwidth = 0; 560 avgwidth = 0;
551 561
552 char *weight = get_property (f, "WEIGHT_NAME", "medium"); 562 char *weight = get_property (f, term->xa [XA_WEIGHT_NAME], "medium");
553 char *slant = get_property (f, "SLANT", "r"); 563 char *slant = get_property (f, term->xa [XA_SLANT], "r");
554 564
555 set_properties (p, height, weight, slant, avgwidth); 565 set_properties (p, height, weight, slant, avgwidth);
556 566
557 free (weight); 567 free (weight);
558 free (slant); 568 free (slant);
… …
563} 573}
564 574
565bool 575bool
566rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name) 576rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name)
567{ 577{
578 dTermDisplay;
568 int slashes = 0; 579 int slashes = 0;
569 const char *comp[13]; 580 const char *comp[13];
570 581
571 for (const char *c = name; *c; c++) 582 for (const char *c = name; *c; c++)
572 if (*c == '-') 583 if (*c == '-')
… …
580 if (slashes >= 13 591 if (slashes >= 13
581 && (*comp[ 6] >= '1' && *comp[ 6] <= '9') 592 && (*comp[ 6] >= '1' && *comp[ 6] <= '9')
582 && (*comp[11] >= '0' && *comp[11] <= '9')) 593 && (*comp[11] >= '0' && *comp[11] <= '9'))
583 return set_properties (p, atoi (comp[6]), comp[2], comp[3], atoi (comp[11])); 594 return set_properties (p, atoi (comp[6]), comp[2], comp[3], atoi (comp[11]));
584 595
585 XFontStruct *f = XLoadQueryFont (DISPLAY, name); 596 XFontStruct *f = XLoadQueryFont (disp, name);
586 597
587 if (f) 598 if (f)
588 { 599 {
589 // the font should really exist now. if not, we have a problem 600 // 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). 601 // (e.g. if the user did xset fp rehash just when we were searching fonts).
591 // in that case, just return garbage. 602 // in that case, just return garbage.
592 bool ret = set_properties (p, f); 603 bool ret = set_properties (p, f);
593 XFreeFont (DISPLAY, f); 604 XFreeFont (disp, f);
594 return ret; 605 return ret;
595 } 606 }
596 else 607 else
597 return false; 608 return false;
598} 609}
… …
636} 647}
637 648
638bool 649bool
639rxvt_font_x11::load (const rxvt_fontprop &prop) 650rxvt_font_x11::load (const rxvt_fontprop &prop)
640{ 651{
641 Display *disp = DISPLAY; 652 dTermDisplay;
642 653
643 clear (); 654 clear ();
644 655
645 char field_str[64]; // enough for 128 bits 656 char field_str[64]; // enough for 128 bits
646 657
… …
655 f = XLoadQueryFont (disp, name); 666 f = XLoadQueryFont (disp, name);
656 667
657 if (!f) 668 if (!f)
658 return false; 669 return false;
659 670
660 char *new_name = get_property (f, "FONT", name); 671 char *new_name = get_property (f, XA_FONT, name);
661 672
662 if (new_name) 673 if (new_name)
663 set_name (new_name); 674 set_name (new_name);
664 else 675 else
665 rxvt_warn ("font '%s' has no FONT property, continuing without.", name); 676 rxvt_warn ("font '%s' has no FONT property, continuing without.", name);
… …
721 int diff = 0; 732 int diff = 0;
722 733
723 if (replace_field (fname, list[i], 6, '0', field_str)) 734 if (replace_field (fname, list[i], 6, '0', field_str))
724 diff += 10; // slightly penalize scalable fonts 735 diff += 10; // slightly penalize scalable fonts
725 else if (replace_field (fname, list[i], 11, '0', "0")) 736 else if (replace_field (fname, list[i], 11, '0', "0"))
726 diff += 300; // more heavily penalize what looks like scaled bitmap fotns 737 diff += 300; // more heavily penalize what looks like scaled bitmap fonts
727 738
728 if (!set_properties (p, fname)) 739 if (!set_properties (p, fname))
729 continue; 740 continue;
730 741
731 if (prop.height != rxvt_fontprop::unset 742 if (prop.height != rxvt_fontprop::unset
… …
774 delete [] fonts; 785 delete [] fonts;
775 786
776 if (!f) 787 if (!f)
777 return false; 788 return false;
778 789
779 char *registry = get_property (f, "CHARSET_REGISTRY", 0); 790 char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0);
780 char *encoding = get_property (f, "CHARSET_ENCODING", 0); 791 char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0);
781 792
782 if (registry && encoding) 793 if (registry && encoding)
783 { 794 {
784 char charset[64]; 795 char charset[64];
785 snprintf (charset, 64, "%s-%s", registry, encoding); 796 snprintf (charset, 64, "%s-%s", registry, encoding);
786 797
787 cs = codeset_from_name (charset); 798 cs = codeset_from_name (charset);
788 } 799 }
789 else 800 else
790 { 801 {
791 const char *charset = get_property (f, "FONT", 0); 802 const char *charset = get_property (f, XA_FONT, 0);
792 803
793 if (!charset) 804 if (!charset)
794 charset = name; 805 charset = name;
795 806
796 int count = 13; 807 int count = 13;
… …
811 enc2b = encm || f->max_char_or_byte2 > 255; 822 enc2b = encm || f->max_char_or_byte2 > 255;
812 823
813 slow = false; 824 slow = false;
814 825
815#if 1 // only used for slow detection, TODO optimize 826#if 1 // only used for slow detection, TODO optimize
816 if (f->min_bounds.width == f->max_bounds.width) 827 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; 828 width = f->max_bounds.width;
820 else 829 else
821 { 830 {
822 slow = true; 831 slow = true;
823 832
… …
839 848
840 width = 1; 849 width = 1;
841 850
842 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 851 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; )
843 { 852 {
844 if (cs != CS_UNICODE
845 && *t > 0x100
846 && FROM_UNICODE (cs, *t) == NOCHAR) 853 if (FROM_UNICODE (cs, *t) == NOCHAR)
847 continue; 854 continue;
848 855
849 // ignore characters we wouldn't use anyways 856 // ignore characters we wouldn't use anyways
850 bool careful; 857 bool careful;
851 if (!has_char (*t, &prop, careful)) 858 if (!has_char (*t, &prop, careful))
… …
855 862
856 XCharStruct g; 863 XCharStruct g;
857 int dir_ret, asc_ret, des_ret; 864 int dir_ret, asc_ret, des_ret;
858 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); 865 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);
859 866
867 int wcw = WCWIDTH (*t);
860 int wcw = wcwidth (*t); if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; 868 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
861 869
862 if (width < g.width) width = g.width; 870 if (width < g.width) width = g.width;
863 } 871 }
864 872
865 if (cs == CS_UNKNOWN) 873 if (cs == CS_UNKNOWN)
866 { 874 {
867 fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name); 875 fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);
… …
884void 892void
885rxvt_font_x11::clear () 893rxvt_font_x11::clear ()
886{ 894{
887 if (f) 895 if (f)
888 { 896 {
889 XFreeFont (DISPLAY, f); 897 XFreeFont (term->xdisp, f);
890 f = 0; 898 f = 0;
891 } 899 }
892} 900}
893 901
894bool 902bool
895rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) 903rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
896{ 904{
897 uint32_t ch = FROM_UNICODE (cs, unicode); 905 uint32_t ch = FROM_UNICODE (cs, unicode);
898 906
899 if (ch == NOCHAR) 907 if (ch == NOCHAR)
900 return false; 908 return false;
… …
937 return false; 945 return false;
938 946
939 if (!prop || prop->width == rxvt_fontprop::unset) 947 if (!prop || prop->width == rxvt_fontprop::unset)
940 return true; 948 return true;
941 949
942 // check character against base font bounding box 950 // check wether character overlaps previous/next character
943 int w = xcs->width; 951 int w = xcs->rbearing - xcs->lbearing;
944 int wcw = wcwidth (unicode); 952 int wcw = max (WCWIDTH (unicode), 1);
945 if (wcw > 0) w = (w + wcw - 1) / wcw;
946 953
947 careful = w > prop->width; 954 careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw;
948 if (careful && w > prop->width * MAX_OVERLAP >> 2) 955
956 if (careful && !OVERLAP_OK (w, wcw, prop))
949 return false; 957 return false;
950 958
951 return true; 959 return true;
952} 960}
953 961
… …
959 // this looks like a mess /. 967 // this looks like a mess /.
960 // and it is a mess /. 968 // and it is a mess /.
961 // yet we are trying to be perfect /. 969 // yet we are trying to be perfect /.
962 // but the result still isn't perfect /. 970 // but the result still isn't perfect /.
963 971
972 dTermDisplay;
973 dTermGC;
974
964 bool slow = this->slow 975 bool slow = this->slow
965 || width != r->fwidth 976 || width != term->fwidth
966 || height != r->fheight; 977 || height != term->fheight;
967 978
968 int base = ascent; // sorry, incorrect: r->fbase; 979 int base = ascent; // sorry, incorrect: term->fbase;
969 980
970 XGCValues v; 981 XGCValues v;
971 v.foreground = r->pix_colors[fg]; 982 v.foreground = term->pix_colors[fg];
972 v.font = f->fid; 983 v.font = f->fid;
973 984
974 if (enc2b) 985 if (enc2b)
975 { 986 {
976 const XChar2b *xc = enc_xchar2b (text, len, cs, slow); 987 const XChar2b *xc = enc_xchar2b (text, len, cs, slow);
977 988
978 if (bg == Color_bg && !slow) 989 if (bg == Color_bg && !slow)
979 { 990 {
980 v.background = r->pix_colors[bg]; 991 v.background = term->pix_colors[bg];
981 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); 992 XChangeGC (disp, gc, GCForeground | GCBackground | GCFont, &v);
982 XDrawImageString16 (d.display->display, d, TGC, x, y + base, xc, len); 993 XDrawImageString16 (disp, d, gc, x, y + base, xc, len);
983 } 994 }
984 else 995 else
985 { 996 {
986 clear_rect (d, x, y, r->fwidth * len, r->fheight, bg); 997 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
987 998
988 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v); 999 XChangeGC (disp, gc, GCForeground | GCFont, &v);
989 1000
990 if (slow) 1001 if (slow)
991 { 1002 {
992 do 1003 do
993 { 1004 {
994 if (xc->byte1 || xc->byte2) 1005 if (xc->byte1 || xc->byte2)
995 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, 1); 1006 XDrawString16 (disp, d, gc, x, y + base, xc, 1);
996 1007
997 x += r->fwidth; 1008 x += term->fwidth;
998 xc++; len--; 1009 xc++; len--;
999 } 1010 }
1000 while (len); 1011 while (len);
1001 } 1012 }
1002 else 1013 else
1003 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, len); 1014 XDrawString16 (disp, d, gc, x, y + base, xc, len);
1004 } 1015 }
1005 } 1016 }
1006 else 1017 else
1007 { 1018 {
1008 const char *xc = enc_char (text, len, cs, slow); 1019 const char *xc = enc_char (text, len, cs, slow);
1009 1020
1010 if (bg == Color_bg && !slow) 1021 if (bg == Color_bg && !slow)
1011 { 1022 {
1012 v.background = r->pix_colors[bg]; 1023 v.background = term->pix_colors[bg];
1013 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); 1024 XChangeGC (disp, gc, GCForeground | GCBackground | GCFont, &v);
1014 XDrawImageString (d.display->display, d, TGC, x, y + base, xc, len); 1025 XDrawImageString (disp, d, gc, x, y + base, xc, len);
1015 } 1026 }
1016 else 1027 else
1017 { 1028 {
1018 clear_rect (d, x, y, r->fwidth * len, r->fheight, bg); 1029 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
1019 1030
1020 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v); 1031 XChangeGC (disp, gc, GCForeground | GCFont, &v);
1021 1032
1022 if (slow) 1033 if (slow)
1023 { 1034 {
1024 do 1035 do
1025 { 1036 {
1026 if (*xc) 1037 if (*xc)
1027 XDrawString (d.display->display, d, TGC, x, y + base, xc, 1); 1038 XDrawString (disp, d, gc, x, y + base, xc, 1);
1028 1039
1029 x += r->fwidth; 1040 x += term->fwidth;
1030 xc++; len--; 1041 xc++; len--;
1031 } 1042 }
1032 while (len); 1043 while (len);
1033 } 1044 }
1034 else 1045 else
1035 XDrawString (d.display->display, d, TGC, x, y + base, xc, len); 1046 XDrawString (disp, d, gc, x, y + base, xc, len);
1036 } 1047 }
1037 } 1048 }
1038} 1049}
1039 1050
1040///////////////////////////////////////////////////////////////////////////// 1051/////////////////////////////////////////////////////////////////////////////
… …
1052 1063
1053 void draw (rxvt_drawable &d, int x, int y, 1064 void draw (rxvt_drawable &d, int x, int y,
1054 const text_t *text, int len, 1065 const text_t *text, int len,
1055 int fg, int bg); 1066 int fg, int bg);
1056 1067
1057 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &carefull); 1068 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &carefull) const;
1058 1069
1059protected: 1070protected:
1060 XftFont *f; 1071 XftFont *f;
1061}; 1072};
1062 1073
1063void 1074void
1064rxvt_font_xft::clear () 1075rxvt_font_xft::clear ()
1065{ 1076{
1066 if (f) 1077 if (f)
1067 { 1078 {
1068 XftFontClose (DISPLAY, f); 1079 XftFontClose (term->xdisp, f);
1069 f = 0; 1080 f = 0;
1070 } 1081 }
1071} 1082}
1072 1083
1073rxvt_fontprop 1084rxvt_fontprop
… …
1091} 1102}
1092 1103
1093bool 1104bool
1094rxvt_font_xft::load (const rxvt_fontprop &prop) 1105rxvt_font_xft::load (const rxvt_fontprop &prop)
1095{ 1106{
1096 Display *disp = DISPLAY; 1107 dTermDisplay;
1097 1108
1098 clear (); 1109 clear ();
1099 1110
1100 FcPattern *p = FcNameParse ((FcChar8 *) name); 1111 FcPattern *p = FcNameParse ((FcChar8 *) name);
1101 1112
… …
1128 1139
1129 // store generated name so iso14755 view gives better results 1140 // store generated name so iso14755 view gives better results
1130 set_name ((char *)FcNameUnparse (p)); 1141 set_name ((char *)FcNameUnparse (p));
1131 1142
1132 XftResult result; 1143 XftResult result;
1133 FcPattern *match = XftFontMatch (disp, r->display->screen, p, &result); 1144 FcPattern *match = XftFontMatch (disp, term->display->screen, p, &result);
1134 1145
1135 FcPatternDestroy (p); 1146 FcPatternDestroy (p);
1136 1147
1137 if (!match) 1148 if (!match)
1138 return false; 1149 return false;
… …
1180 XGlyphInfo g; 1191 XGlyphInfo g;
1181 XftTextExtents16 (disp, f, &ch, 1, &g); 1192 XftTextExtents16 (disp, f, &ch, 1, &g);
1182 1193
1183 g.width -= g.x; 1194 g.width -= g.x;
1184 1195
1185 int wcw = wcwidth (ch); 1196 int wcw = WCWIDTH (ch);
1186 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; 1197 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
1187 1198
1188 if (width < g.width ) width = g.width; 1199 if (width < g.width ) width = g.width;
1189 if (height < g.height ) height = g.height; 1200 if (height < g.height ) height = g.height;
1190 if (glheight < g.height - g.y) glheight = g.height - g.y; 1201 if (glheight < g.height - g.y) glheight = g.height - g.y;
… …
1236 1247
1237 return success; 1248 return success;
1238} 1249}
1239 1250
1240bool 1251bool
1241rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) 1252rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
1242{ 1253{
1243 careful = false; 1254 careful = false;
1244 1255
1245 if (!XftCharExists (DISPLAY, f, unicode)) 1256 if (!XftCharExists (term->xdisp, f, unicode))
1246 return false; 1257 return false;
1247 1258
1248 if (!prop || prop->width == rxvt_fontprop::unset) 1259 if (!prop || prop->width == rxvt_fontprop::unset)
1249 return true; 1260 return true;
1250 1261
1251 // check character against base font bounding box 1262 // check character against base font bounding box
1252 FcChar32 ch = unicode; 1263 FcChar32 ch = unicode;
1253 XGlyphInfo g; 1264 XGlyphInfo g;
1254 XftTextExtents32 (DISPLAY, f, &ch, 1, &g); 1265 XftTextExtents32 (term->xdisp, f, &ch, 1, &g);
1255 1266
1256 int w = g.width - g.x; 1267 int w = g.width - g.x;
1257 int wcw = wcwidth (unicode); 1268 int wcw = max (WCWIDTH (unicode), 1);
1258 if (wcw > 0) w = (w + wcw - 1) / wcw;
1259 1269
1260 careful = w > prop->width; 1270 careful = g.x > 0 || w > prop->width * wcw;
1261 if (careful && w > prop->width * MAX_OVERLAP >> 2) 1271
1272 if (careful && !OVERLAP_OK (w, wcw, prop))
1273 return false;
1274
1275 // this weeds out _totally_ broken fonts, or glyphs
1276 if (!OVERLAP_OK (g.xOff, wcw, prop))
1262 return false; 1277 return false;
1263 1278
1264 return true; 1279 return true;
1265} 1280}
1266 1281
1267void 1282void
1268rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, 1283rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1269 const text_t *text, int len, 1284 const text_t *text, int len,
1270 int fg, int bg) 1285 int fg, int bg)
1271{ 1286{
1272 clear_rect (d, x, y, r->fwidth * len, r->fheight, bg); 1287 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
1273
1274 int base = ascent; // should be fbase, but that is incorrect
1275 1288
1276 XGlyphInfo extents; 1289 XGlyphInfo extents;
1277 FcChar32 *enc = (FcChar32 *) get_enc_buf (len * sizeof (FcChar32)); 1290 XftGlyphSpec *enc = (XftGlyphSpec *)rxvt_temp_buf (len * sizeof (XftGlyphSpec));
1278 FcChar32 *ep = enc; 1291 XftGlyphSpec *ep = enc;
1279 int ewidth = 0; 1292
1293 dTermDisplay;
1294 dTermGC;
1295
1296 // cut trailing spaces
1297 while (len && text [len - 1] == ' ')
1298 len--;
1280 1299
1281 while (len) 1300 while (len)
1282 { 1301 {
1283 int cwidth = r->fwidth; 1302 int cwidth = term->fwidth;
1284 FcChar32 fc = *text++; len--; 1303 FcChar32 fc = *text++; len--;
1285 1304
1286 while (len && *text == NOCHAR) 1305 while (len && *text == NOCHAR)
1287 text++, len--, cwidth += r->fwidth; 1306 text++, len--, cwidth += term->fwidth;
1288 1307
1289 if (fc == ' ' && ep == enc) // skip leading spaces 1308 if (fc != ' ') // skip spaces
1309 {
1310 FT_UInt glyph = XftCharIndex (disp, f, fc);
1311 XftGlyphExtents (disp, f, &glyph, 1, &extents);
1312
1313 ep->glyph = glyph;
1314 ep->x = x + (cwidth - extents.xOff >> 1);
1315 ep->y = y + ascent;
1316
1317 if (extents.xOff == 0)
1318 ep->x = x + cwidth;
1319
1320 ep++;
1321 }
1322
1290 x += cwidth; 1323 x += cwidth;
1291 else
1292 {
1293 FT_UInt gl = XftCharIndex (d.display->display, f, fc);
1294 XftGlyphExtents (d.display->display, f, &gl, 1, &extents);
1295
1296 if (extents.xOff != cwidth)
1297 {
1298 if (ewidth)
1299 {
1300 XftDrawGlyphs (d, &r->pix_colors[fg].c, f,
1301 x, y + base, enc, ep - enc);
1302 x += ewidth;
1303
1304 ep = enc;
1305 ewidth = 0;
1306 }
1307
1308 if (extents.xOff > cwidth)
1309 extents.xOff = cwidth;
1310
1311 XftDrawGlyphs (d, &r->pix_colors[fg].c, f,
1312 x + (cwidth - extents.xOff >> 1),
1313 y + base, &gl, 1);
1314 x += cwidth;
1315 }
1316 else
1317 {
1318 *ep++ = gl;
1319 ewidth += cwidth;
1320 }
1321 }
1322 } 1324 }
1323 1325
1324 if (ep != enc) 1326 if (ep != enc)
1325 XftDrawGlyphs (d, &r->pix_colors[fg].c, f, 1327 XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc);
1326 x, y + base, enc, ep - enc);
1327} 1328}
1328#endif 1329#endif
1329 1330
1330///////////////////////////////////////////////////////////////////////////// 1331/////////////////////////////////////////////////////////////////////////////
1331 1332
1332rxvt_fontset::rxvt_fontset (rxvt_t r) 1333rxvt_fontset::rxvt_fontset (rxvt_term *term)
1333: fontdesc (0), r (r) 1334: fontdesc (0), term (term)
1334{ 1335{
1335 clear (); 1336 clear ();
1336} 1337}
1337 1338
1338rxvt_fontset::~rxvt_fontset () 1339rxvt_fontset::~rxvt_fontset ()
… …
1382 f = new rxvt_font_x11; 1383 f = new rxvt_font_x11;
1383 } 1384 }
1384 else 1385 else
1385 f = new rxvt_font_x11; 1386 f = new rxvt_font_x11;
1386 1387
1387 f->set_term (r); 1388 f->set_term (term);
1388 f->set_name (strdup (name)); 1389 f->set_name (strdup (name));
1389 1390
1390 f->cs = cs; 1391 f->cs = cs;
1391 f->loaded = false; 1392 f->loaded = false;
1392 1393
… …
1575 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1576 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1576 FcPatternAddBool (p, FC_MINSPACE, 1); 1577 FcPatternAddBool (p, FC_MINSPACE, 1);
1577 //FcPatternAddBool (p, FC_ANTIALIAS, 1); 1578 //FcPatternAddBool (p, FC_ANTIALIAS, 1);
1578 1579
1579 XftResult result; 1580 XftResult result;
1580 FcPattern *match = XftFontMatch (DISPLAY, r->display->screen, p, &result); 1581 FcPattern *match = XftFontMatch (term->xdisp, term->display->screen, p, &result);
1581 1582
1582 FcPatternDestroy (p); 1583 FcPatternDestroy (p);
1583 1584
1584 if (match) 1585 if (match)
1585 { 1586 {

Diff Legend

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