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.52 by root, Sat Dec 4 02:56:06 2004 UTC vs.
Revision 1.87 by root, Wed Jan 25 21:03:04 2006 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: defaultfont.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
… …
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 * GNU General Public License for more details. 15 * GNU General Public License for more details.
16 * 16 *
17 * You should have received a copy of the GNU General Public License 17 * You should have received a copy of the GNU General Public License
18 * along with this program; if not, write to the Free Software 18 * along with this program; if not, write to the Free Software
19 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 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#include <wchar.h>
29#include <inttypes.h> 30#include <inttypes.h>
30 31
31#define DISPLAY r->display->display
32#define TGC r->TermWin.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,prop) (w) > ( \
36 prop->slant >= rxvt_fontprop::italic \
37 ? (prop->width * MAX_OVERLAP_ITALIC + 7) >> 3 \
38 : (prop->width * 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[] = {
… …
90 { CS_JIS0212_1990_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0212*-0" }, 95 { CS_JIS0212_1990_0, "-*-*-*-r-*--*-*-*-*-c-*-jisx0212*-0" },
91#endif 96#endif
92 97
93#if ENCODING_ZH || ENCODING_ZH_EXT 98#if ENCODING_ZH || ENCODING_ZH_EXT
94# if XFT 99# if XFT
100 { CS_GBK_0, "xft:AR PL KaitiM GB" },
101 { CS_GBK_0, "xft:AR PL SungtiL GB" },
102 { CS_GBK_0, "xft::spacing=100:lang=zh" },
95 { CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" }, 103 { CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" },
96 { CS_BIG5_EXT, "xft:AR PL KaitiM Big5" }, 104 { CS_BIG5_EXT, "xft:AR PL KaitiM Big5" },
97 { CS_GB2312_1980_0, "xft:AR PL KaitiM GB" }, 105 { CS_GB2312_1980_0, "xft:AR PL KaitiM GB" },
98 { CS_GB2312_1980_0, "xft:AR PL SungtiL GB" }, 106 { CS_GB2312_1980_0, "xft:AR PL SungtiL GB" },
99 { CS_GB2312_1980_0, "xft::spacing=100:lang=zh" }, 107 { CS_GB2312_1980_0, "xft::spacing=100:lang=zh" },
100# endif 108# endif
109 { CS_GBK_0, "-*-*-*-*-*-*-*-*-*-*-c-*-gbk*-0" },
101 { CS_BIG5, "-*-*-*-*-*-*-*-*-*-*-c-*-big5-0" }, 110 { CS_BIG5, "-*-*-*-*-*-*-*-*-*-*-c-*-big5-0" },
102 { CS_BIG5_PLUS, "-*-*-*-*-*-*-*-*-*-*-c-*-big5p-0" }, 111 { CS_BIG5_PLUS, "-*-*-*-*-*-*-*-*-*-*-c-*-big5p-0" },
103 { CS_BIG5_EXT, "-*-*-*-*-*-*-*-*-*-*-c-*-big5.eten-0" }, 112 { CS_BIG5_EXT, "-*-*-*-*-*-*-*-*-*-*-c-*-big5.eten-0" },
113 { CS_GB2312_1980_0, "-*-*-*-*-*-*-*-*-*-*-c-*-gb2312*-0" },
104 { CS_CNS11643_1992_1, "-*-*-*-*-*-*-*-*-*-*-c-*-gb2312*-0" }, 114 { CS_CNS11643_1992_1, "-*-*-*-*-*-*-*-*-*-*-c-*-gb2312*-0" },
105 { CS_CNS11643_1992_1, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-1" }, 115 { CS_CNS11643_1992_1, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-1" },
106 { CS_CNS11643_1992_2, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-2" }, 116 { CS_CNS11643_1992_2, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-2" },
107 { CS_CNS11643_1992_3, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-3" }, 117 { CS_CNS11643_1992_3, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-3" },
108 { CS_CNS11643_1992_4, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-4" }, 118 { CS_CNS11643_1992_4, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643*-4" },
… …
125 { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" }, 135 { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" },
126 { CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" }, 136 { CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" },
127 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" }, 137 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1" },
128 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" }, 138 { CS_UNICODE, "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" },
129#if XFT 139#if XFT
130 { CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true"}, 140 { CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true" },
131 { CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" }, 141 { CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" },
132 { CS_UNICODE, "xft:Andale Mono:antialias=false" }, 142 { CS_UNICODE, "xft:Andale Mono:antialias=false:autohint=false" },
133 { CS_UNICODE, "xft:Arial Unicode MS:antialias=false" }, 143 { CS_UNICODE, "xft:Arial Unicode MS:antialias=false:autohint=false" },
134 144
135 // FreeMono is usually uglier than x fonts, so try last only. 145 // FreeMono is usually uglier than x fonts, so try last only.
136 { CS_UNICODE, "xft:FreeMono:autohint=true" }, 146 { CS_UNICODE, "xft:FreeMono:autohint=true" },
137#endif 147#endif
138 148
139 { CS_UNKNOWN, 0 } 149 { CS_UNKNOWN, 0 }
140}; 150};
141 151
142// these characters are used to guess the font height and width 152// these characters are used to guess the font height and width
143// pango uses a similar algorithm and eosn't trust the font either. 153// pango uses a similar algorithm and doesn't trust the font either.
144static uint16_t extent_test_chars[] = { 154static uint16_t extent_test_chars[] = {
145 '0', '1', '8', 'a', 'd', 'x', 'm', 'y', 'g', 'W', 'X', '\'', '_', 155 '0', '1', '8', 'a', 'd', 'x', 'm', 'y', 'g', 'W', 'X', '\'', '_',
146 0x00cd, 0x00d5, 0x0114, 0x0177, 0x0643, // ÍÕĔŷﻙ 156 0x00cd, 0x00d5, 0x0114, 0x0177, 0x0643, // ÍÕĔŷﻙ
147 0x304c, 0x672c, // が本 157 0x304c, 0x672c, // が本
148}; 158};
149 159
150#define NUM_EXTENT_TEST_CHARS (sizeof (extent_test_chars) / sizeof (extent_test_chars[0])) 160#define NUM_EXTENT_TEST_CHARS (sizeof (extent_test_chars) / sizeof (extent_test_chars[0]))
151 161
162#define dTermDisplay Display *disp = term->display->display
163#define dTermGC GC gc = term->gc
164
152///////////////////////////////////////////////////////////////////////////// 165/////////////////////////////////////////////////////////////////////////////
153 166
154#if XFT 167#if XFT
155rxvt_drawable::~rxvt_drawable () 168rxvt_drawable::~rxvt_drawable ()
156{ 169{
… …
159} 172}
160 173
161rxvt_drawable::operator XftDraw *() 174rxvt_drawable::operator XftDraw *()
162{ 175{
163 if (!xftdrawable) 176 if (!xftdrawable)
164 xftdrawable = XftDrawCreate (display->display, drawable, display->visual, display->cmap); 177 xftdrawable = XftDrawCreate (screen->xdisp, drawable, screen->visual, screen->cmap);
165 178
166 return xftdrawable; 179 return xftdrawable;
167} 180}
168#endif 181#endif
169 182
170///////////////////////////////////////////////////////////////////////////// 183/////////////////////////////////////////////////////////////////////////////
171
172static void *enc_buf;
173static uint32_t enc_len;
174
175static inline void *
176get_enc_buf (uint32_t len)
177{
178 if (len > enc_len)
179 {
180 free (enc_buf);
181 enc_buf = malloc (len);
182 enc_len = len;
183 }
184
185 return enc_buf;
186}
187 184
188static const char * 185static const char *
189enc_char (const text_t *text, uint32_t len, codeset cs, bool &zero) 186enc_char (const text_t *text, uint32_t len, codeset cs, bool &zero)
190{ 187{
191 uint8_t *buf = (uint8_t *)get_enc_buf (len); 188 uint8_t *buf = rxvt_temp_buf<uint8_t> (len);
189 uint8_t *res = buf;
192 190
193 while (len--) 191 while (len--)
194 { 192 {
195 uint32_t c = FROM_UNICODE (cs, *text++); 193 uint32_t c = FROM_UNICODE (cs, *text++);
196 194
… …
201 } 199 }
202 200
203 *buf++ = c; 201 *buf++ = c;
204 } 202 }
205 203
206 return (const char *)enc_buf; 204 return (const char *)res;
207} 205}
208 206
209static const XChar2b * 207static const XChar2b *
210enc_xchar2b (const text_t *text, uint32_t len, codeset cs, bool &zero) 208enc_xchar2b (const text_t *text, uint32_t len, codeset cs, bool &zero)
211{ 209{
212 XChar2b *buf = (XChar2b *)get_enc_buf (len * sizeof (XChar2b)); 210 XChar2b *buf = rxvt_temp_buf<XChar2b> (len);
211 XChar2b *res = buf;
213 212
214 while (len--) 213 while (len--)
215 { 214 {
216 uint32_t c = FROM_UNICODE (cs, *text++); 215 uint32_t c = FROM_UNICODE (cs, *text++);
217 216
… …
224 buf->byte1 = c >> 8; 223 buf->byte1 = c >> 8;
225 buf->byte2 = c; 224 buf->byte2 = c;
226 buf++; 225 buf++;
227 } 226 }
228 227
229 return (XChar2b *)enc_buf; 228 return res;
230} 229}
231 230
232///////////////////////////////////////////////////////////////////////////// 231/////////////////////////////////////////////////////////////////////////////
233 232
234void 233void
… …
240 if (this->name) free (this->name); // let the compiler optimize 239 if (this->name) free (this->name); // let the compiler optimize
241 this->name = name; 240 this->name = name;
242} 241}
243 242
244void 243void
245rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) 244rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const
246{ 245{
246 dTermDisplay;
247 dTermGC;
248
247 if (color == Color_bg) 249 if (color == Color_bg)
248 XClearArea (d.display->display, d, x, y, w, h, FALSE); 250 XClearArea (disp, d, x, y, w, h, FALSE);
249 else if (color >= 0) 251 else if (color >= 0)
250 { 252 {
251#if XFT 253#if XFT
252 XftDrawRect (d, &r->pix_colors[color].c, x, y, w, h); 254 XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);
253#else 255#else
254 XSetForeground (d.display->display, TGC, r->pix_colors[color]); 256 XSetForeground (disp, gc, term->pix_colors[color]);
255 XFillRectangle (d.display->display, d, TGC, x, y, w, h); 257 XFillRectangle (disp, d, gc, x, y, w, h);
256#endif 258#endif
257 } 259 }
258} 260}
259 261
260#include "table/linedraw.h" 262#include "table/linedraw.h"
… …
271 rxvt_fontprop properties () 273 rxvt_fontprop properties ()
272 { 274 {
273 rxvt_fontprop p; 275 rxvt_fontprop p;
274 276
275 p.width = p.height = 1; 277 p.width = p.height = 1;
278 p.ascent = rxvt_fontprop::unset;
276 p.weight = rxvt_fontprop::medium; 279 p.weight = rxvt_fontprop::medium;
277 p.slant = rxvt_fontprop::roman; 280 p.slant = rxvt_fontprop::roman;
278 281
279 return p; 282 return p;
280 } 283 }
… …
287 set_name (strdup ("built-in support font")); 290 set_name (strdup ("built-in support font"));
288 291
289 return true; 292 return true;
290 } 293 }
291 294
292 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) 295 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
293 { 296 {
294 careful = false; 297 careful = false;
295 298
296 if (unicode <= 0x001f) 299 if (unicode <= 0x001f)
297 return true; 300 return true;
… …
300 return false; 303 return false;
301 304
302 if (unicode <= 0x009f) 305 if (unicode <= 0x009f)
303 return true; 306 return true;
304 307
305 if (unicode >= 0x2500 && unicode <= 0x259f) 308 if (unicode >= 0x2500 && unicode <= 0x259f &&
309 !term->option (Opt_skipBuiltinGlyphs))
306 return true; 310 return true;
307 311
308 if (IS_COMPOSE (unicode)) 312 if (IS_COMPOSE (unicode))
309 return true; 313 return true;
310 314
… …
326void 330void
327rxvt_font_default::draw (rxvt_drawable &d, int x, int y, 331rxvt_font_default::draw (rxvt_drawable &d, int x, int y,
328 const text_t *text, int len, 332 const text_t *text, int len,
329 int fg, int bg) 333 int fg, int bg)
330{ 334{
335 dTermDisplay;
336 dTermGC;
337
331 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 338 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
332 339
333 XSetForeground (d.display->display, TGC, r->pix_colors[fg]); 340 XSetForeground (disp, gc, term->pix_colors[fg]);
334 341
335 while (len--) 342 while (len)
336 { 343 {
337#if ENABLE_COMBINING 344#if ENABLE_COMBINING
338 compose_char *cc; 345 compose_char *cc;
339#endif 346#endif
347 const text_t *tp = text;
340 text_t t = *text++; 348 text_t t = *tp;
349
350 while (++text, --len && *text == NOCHAR)
351 ;
352
353 int width = text - tp;
354 int fwidth = term->fwidth * width;
341 355
342 if (0x2500 <= t && t <= 0x259f) 356 if (0x2500 <= t && t <= 0x259f)
343 { 357 {
344 uint16_t offs = linedraw_offs[t - 0x2500]; 358 uint16_t offs = linedraw_offs[t - 0x2500];
345 uint32_t *a = linedraw_command + (offs >> 4); 359 uint32_t *a = linedraw_command + (offs >> 4);
346 uint32_t *b = a + (offs & 15); 360 uint32_t *b = a + (offs & 15);
347 361
348 int W = r->TermWin.fwidth; 362 int W = fwidth;
349 int H = r->TermWin.fheight; 363 int H = term->fheight;
350
351 // support double-width (but not more) graphics chars
352 // TODO: do this outside the if/elsif.. statement for all cases
353 if (len && *text == NOCHAR)
354 W += r->TermWin.fwidth;
355 364
356 int x_[16]; 365 int x_[16];
357 int y_[16]; 366 int y_[16];
358 367
359 for (int i = 0; i <= 8; i++) 368 for (int i = 0; i <= 8; i++)
… …
367 376
368 XGCValues gcv; 377 XGCValues gcv;
369 378
370 gcv.cap_style = CapButt; 379 gcv.cap_style = CapButt;
371 gcv.line_width = 0; 380 gcv.line_width = 0;
372 XChangeGC (d.display->display, TGC, GCLineWidth | GCCapStyle, &gcv); 381 XChangeGC (disp, gc, GCLineWidth | GCCapStyle, &gcv);
373 382
374 while (a < b) 383 while (a < b)
375 { 384 {
376 uint32_t command = *a++; 385 uint32_t command = *a++;
377 386
… …
384 int y2 = y_[(command >> 0) & 15]; 393 int y2 = y_[(command >> 0) & 15];
385 394
386 switch (op) 395 switch (op)
387 { 396 {
388 case 0: // line 397 case 0: // line
389 XDrawLine (d.display->display, d, TGC, x1, y1, x2, y2); 398 XDrawLine (disp, d, gc, x1, y1, x2, y2);
390 break; 399 break;
391 400
392 case 1: // rectangle, possibly stippled 401 case 1: // rectangle, possibly stippled
393 if (a) 402 if (a)
394 { 403 {
395 static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 }; 404 static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 };
396 405
397 gcv.fill_style = FillStippled; 406 gcv.fill_style = FillStippled;
398 gcv.stipple = XCreateBitmapFromData (d.display->display, d, bm + a * 2, 2, 2); 407 gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2);
399 gcv.ts_x_origin = x; 408 gcv.ts_x_origin = x;
400 gcv.ts_y_origin = y; 409 gcv.ts_y_origin = y;
401 410
402 XChangeGC (d.display->display, TGC, 411 XChangeGC (disp, gc,
403 GCFillStyle | GCStipple | GCTileStipXOrigin | GCTileStipYOrigin, 412 GCFillStyle | GCStipple | GCTileStipXOrigin | GCTileStipYOrigin,
404 &gcv); 413 &gcv);
405 } 414 }
406 415
407 XFillRectangle (d.display->display, d, TGC, x1, y1, x2 - x1 + 1, y2 - y1 + 1); 416 XFillRectangle (disp, d, gc, x1, y1, x2 - x1 + 1, y2 - y1 + 1);
408 417
409 if (a) 418 if (a)
410 { 419 {
411 XFreePixmap (d.display->display, gcv.stipple); 420 XFreePixmap (disp, gcv.stipple);
412 gcv.stipple = 0; 421 gcv.stipple = 0;
413 gcv.fill_style = FillSolid; 422 gcv.fill_style = FillSolid;
414 XChangeGC (d.display->display, TGC, GCFillStyle, &gcv); 423 XChangeGC (disp, gc, GCFillStyle, &gcv);
415 } 424 }
416 break; 425 break;
417 case 2: // arc 426 case 2: // arc
418 XDrawArc (d.display->display, d, TGC, 427 XDrawArc (disp, d, gc,
419 x1 - W/2, y1 - H/2, W-1, H-1, 428 x1 - W/2, y1 - H/2, W-1, H-1,
420 (a - 1) * 90*64, (b - 1) * 90*64); 429 (a - 1) * 90*64, (b - 1) * 90*64);
421 break; 430 break;
422 } 431 }
423 } 432 }
424 } 433 }
425#if ENABLE_COMBINING 434#if ENABLE_COMBINING
426 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) 435 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
427 { 436 {
428 text_t c2[2]; 437 text_t chrs[2];
429 int len2 = 1; 438 width = min (2, width);
430 439 chrs [1] = NOCHAR;
431 // support double-width (but not more) combining characters
432 if (len && *text == NOCHAR)
433 {
434 c2[1] = *text; // not text++ to get correct x-width
435 len2++;
436 }
437 440
438 c2[0] = cc->c1; 441 *chrs = cc->c1;
439 rxvt_font *f1 = (*fs)[fs->find_font (c2[0])]; 442 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)];
440 f1->draw (d, x, y, c2, len2, fg, bg); 443 f1->draw (d, x, y, chrs, width, fg, bg);
441 444
442 if (cc->c2 != NOCHAR) 445 if (cc->c2 != NOCHAR)
443 { 446 {
444 bool careful; 447 bool careful;
445 448
446 // prefer font of first character, for no good reasons 449 // prefer font of first character, for no good reasons
447 c2[0] = cc->c2; 450 *chrs = cc->c2;
448 rxvt_font *f2 = (f1->has_char (c2[0], 0, careful) && !careful) 451 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful)
449 ? f1 452 ? f1
450 : (*fs)[fs->find_font (c2[0])]; 453 : (*fs)[fs->find_font (cc->c2)];
451 454
452 f2->draw (d, x, y, c2, len2, fg, -1); 455 f2->draw (d, x, y, chrs, width, fg, -1);
453 } 456 }
454 } 457 }
455#endif 458#endif
456 else 459 else
457 switch (t) 460 switch (t)
… …
460 case ZERO_WIDTH_CHAR: 463 case ZERO_WIDTH_CHAR:
461 case NOCHAR: 464 case NOCHAR:
462 break; 465 break;
463 466
464 default: 467 default:
465 int w = 0;
466 while (len > 0 && *text == NOCHAR)
467 {
468 ++text;
469 --len;
470 w += r->TermWin.fwidth;
471 }
472
473 XDrawRectangle (d.display->display, d, TGC, x + 2, y + 2, 468 XDrawRectangle (disp, d, gc, x + 2, y + 2,
474 w + r->TermWin.fwidth - 4, r->TermWin.fheight - 4); 469 fwidth - 4, term->fheight - 4);
475 x += w;
476 } 470 }
477 471
478 x += r->TermWin.fwidth; 472 x += fwidth;
479 } 473 }
480} 474}
481 475
482///////////////////////////////////////////////////////////////////////////// 476/////////////////////////////////////////////////////////////////////////////
483 477
… …
488 482
489 rxvt_fontprop properties (); 483 rxvt_fontprop properties ();
490 484
491 bool load (const rxvt_fontprop &prop); 485 bool load (const rxvt_fontprop &prop);
492 486
493 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful); 487 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
494 488
495 void draw (rxvt_drawable &d, int x, int y, 489 void draw (rxvt_drawable &d, int x, int y,
496 const text_t *text, int len, 490 const text_t *text, int len,
497 int fg, int bg); 491 int fg, int bg);
498 492
… …
510char * 504char *
511rxvt_font_x11::get_property (XFontStruct *f, const char *property, const char *repl) const 505rxvt_font_x11::get_property (XFontStruct *f, const char *property, const char *repl) const
512{ 506{
513 unsigned long value; 507 unsigned long value;
514 508
515 if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value)) 509 if (XGetFontProperty (f, XInternAtom (term->display->display, property, 0), &value))
516 return XGetAtomName (DISPLAY, value); 510 return XGetAtomName (term->display->display, value);
517 else 511 else
518 return rxvt_strdup (repl); 512 return rxvt_strdup (repl);
519} 513}
520 514
521rxvt_fontprop 515rxvt_fontprop
… …
529bool 523bool
530rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth) 524rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth)
531{ 525{
532 p.width = avgwidth ? (avgwidth + 1) / 10 : (height + 1) / 2; 526 p.width = avgwidth ? (avgwidth + 1) / 10 : (height + 1) / 2;
533 p.height = height; 527 p.height = height;
528 p.ascent = rxvt_fontprop::unset;
534 p.weight = *weight == 'B' || *weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium; 529 p.weight = *weight == 'B' || *weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium;
535 p.slant = *slant == 'r' || *slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic; 530 p.slant = *slant == 'r' || *slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic;
536 531
537 return true; 532 return true;
538} 533}
539 534
540bool 535bool
541rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f) 536rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)
542{ 537{
543 unsigned long height; 538 unsigned long height;
539
540#if 0
544 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "PIXEL_SIZE", 0), &height)) 541 if (!XGetFontProperty (f, XInternAtom (term->display->display, "PIXEL_SIZE", 0), &height))
545 return false; 542 return false;
543#else
544 height = f->ascent + f->descent;
545#endif
546 546
547 unsigned long avgwidth; 547 unsigned long avgwidth;
548 if (!XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth)) 548 if (!XGetFontProperty (f, XInternAtom (term->display->display, "AVERAGE_WIDTH", 0), &avgwidth))
549 avgwidth = 0; 549 avgwidth = 0;
550 550
551 char *weight = get_property (f, "WEIGHT_NAME", "medium"); 551 char *weight = get_property (f, "WEIGHT_NAME", "medium");
552 char *slant = get_property (f, "SLANT", "r"); 552 char *slant = get_property (f, "SLANT", "r");
553 553
554 set_properties (p, height, weight, slant, avgwidth); 554 set_properties (p, height, weight, slant, avgwidth);
555 555
556 free (weight); 556 free (weight);
557 free (slant); 557 free (slant);
558 558
559 p.ascent = f->ascent;
560
559 return true; 561 return true;
560} 562}
561 563
562bool 564bool
563rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name) 565rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name)
564{ 566{
567 dTermDisplay;
565 int slashes = 0; 568 int slashes = 0;
566 const char *comp[13]; 569 const char *comp[13];
567 570
568 for (const char *c = name; *c; c++) 571 for (const char *c = name; *c; c++)
569 if (*c == '-') 572 if (*c == '-')
… …
577 if (slashes >= 13 580 if (slashes >= 13
578 && (*comp[ 6] >= '1' && *comp[ 6] <= '9') 581 && (*comp[ 6] >= '1' && *comp[ 6] <= '9')
579 && (*comp[11] >= '0' && *comp[11] <= '9')) 582 && (*comp[11] >= '0' && *comp[11] <= '9'))
580 return set_properties (p, atoi (comp[6]), comp[2], comp[3], atoi (comp[11])); 583 return set_properties (p, atoi (comp[6]), comp[2], comp[3], atoi (comp[11]));
581 584
582 XFontStruct *f = XLoadQueryFont (DISPLAY, name); 585 XFontStruct *f = XLoadQueryFont (disp, name);
583 586
584 if (f) 587 if (f)
585 { 588 {
586 // the font should really exist now. if not, we have a problem 589 // the font should really exist now. if not, we have a problem
587 // (e.g. if the user did xset fp rehash just when we were searching fonts). 590 // (e.g. if the user did xset fp rehash just when we were searching fonts).
588 // in that case, just return garbage. 591 // in that case, just return garbage.
589 bool ret = set_properties (p, f); 592 bool ret = set_properties (p, f);
590 XFreeFont (DISPLAY, f); 593 XFreeFont (disp, f);
591 return ret; 594 return ret;
592 } 595 }
593 else 596 else
594 return false; 597 return false;
595} 598}
… …
633} 636}
634 637
635bool 638bool
636rxvt_font_x11::load (const rxvt_fontprop &prop) 639rxvt_font_x11::load (const rxvt_fontprop &prop)
637{ 640{
641 dTermDisplay;
642
638 clear (); 643 clear ();
639 644
640 char field_str[64]; // enough for 128 bits 645 char field_str[64]; // enough for 128 bits
641 646
642 // first morph the font if required 647 // first morph the font if required
… …
645 { 650 {
646 char fname[1024]; 651 char fname[1024];
647 652
648 if (name[0] != '-') 653 if (name[0] != '-')
649 { 654 {
650 f = XLoadQueryFont (DISPLAY, name); 655 f = XLoadQueryFont (disp, name);
651 656
652 if (!f) 657 if (!f)
653 return false; 658 return false;
654 659
655 char *new_name = get_property (f, "FONT", name); 660 char *new_name = get_property (f, "FONT", name);
… …
657 if (new_name) 662 if (new_name)
658 set_name (new_name); 663 set_name (new_name);
659 else 664 else
660 rxvt_warn ("font '%s' has no FONT property, continuing without.", name); 665 rxvt_warn ("font '%s' has no FONT property, continuing without.", name);
661 666
662 XFreeFont (DISPLAY, f); 667 XFreeFont (disp, f);
663 f = 0; 668 f = 0;
664 } 669 }
665 670
666 if (prop.weight != rxvt_fontprop::unset) 671 if (prop.weight != rxvt_fontprop::unset)
667 { 672 {
… …
678 ? "r" : "i"); // TODO: handle "o"blique, too 683 ? "r" : "i"); // TODO: handle "o"blique, too
679 set_name (strdup (fname)); 684 set_name (strdup (fname));
680 } 685 }
681 } 686 }
682 687
688 sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset
689 ? 0 : prop.height);
690
691 struct font_weight {
692 char *name;
693 int diff;
694
695 void clear ()
696 {
697 name = 0;
698 diff = 0x7fffffff;
699 }
700
701 font_weight () { clear (); }
702 ~font_weight () { free (name); }
703 };
704
683 char **list; 705 char **list;
684 int count; 706 int count;
685 list = XListFonts (DISPLAY, name, 1024, &count); 707 list = XListFonts (disp, name, 4000, &count);
686 708
687 set_name (0); 709 set_name (0);
688 710
689 if (!list) 711 if (!list)
690 return false; 712 return false;
691 713
692 sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset 714 font_weight *fonts = new font_weight[count];
693 ? 0 : prop.height);
694 715
695 int bestdiff = 0x7fffffff;
696 for (int i = 0; i < count; i++) 716 for (int i = 0; i < count; i++)
697 { 717 {
698 rxvt_fontprop p; 718 rxvt_fontprop p;
699 char fname[1024]; 719 char fname[1024];
700 720
701 int diff = 0; 721 int diff = 0;
702 722
703 if (replace_field (fname, list[i], 6, '0', field_str)) 723 if (replace_field (fname, list[i], 6, '0', field_str))
704 diff += 10; // slightly penalize scalable fonts 724 diff += 10; // slightly penalize scalable fonts
725 else if (replace_field (fname, list[i], 11, '0', "0"))
726 diff += 300; // more heavily penalize what looks like scaled bitmap fonts
705 727
706 if (!set_properties (p, fname)) 728 if (!set_properties (p, fname))
707 continue; 729 continue;
708 730
709 if (prop.height != rxvt_fontprop::unset 731 if (prop.height != rxvt_fontprop::unset
… …
713 if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128; 735 if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128;
714 if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight); 736 if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight);
715 if (prop.slant != rxvt_fontprop::unset) diff += abs (prop.slant - p.slant); 737 if (prop.slant != rxvt_fontprop::unset) diff += abs (prop.slant - p.slant);
716 //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width); 738 //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width);
717 739
718 if (!name // compare against best found so far 740 fonts[i].name = strdup (fname);
719 || diff < bestdiff) 741 fonts[i].diff = diff;
720 {
721 set_name (strdup (fname));
722 bestdiff = diff;
723 }
724 } 742 }
725 743
726 XFreeFontNames (list); 744 XFreeFontNames (list);
727 745
728 if (!name) 746 // this loop only iterates when the guessed font-size is too small
729 return false; 747 for (;;)
748 {
749 font_weight *best = fonts + count - 1;
730 750
731 f = XLoadQueryFont (DISPLAY, name); 751 for (font_weight *w = best; w-- > fonts; )
752 if (w->diff <= best->diff)
753 best = w;
754
755 if (!best->name
756 || !(f = XLoadQueryFont (disp, best->name)))
757 break;
758
759 set_name (best->name);
760 best->clear ();
761
762 ascent = f->ascent;
763 descent = f->descent;
764 height = ascent + descent;
765
766 if (prop.height == rxvt_fontprop::unset
767 || height <= prop.height)
768 break; // font is ready for use
769
770 // PIXEL_SIZE small enough, but real height too large
771 clear ();
772 }
773
774 delete [] fonts;
732 775
733 if (!f) 776 if (!f)
734 return false; 777 return false;
735 778
736 char *registry = get_property (f, "CHARSET_REGISTRY", 0); 779 char *registry = get_property (f, "CHARSET_REGISTRY", 0);
… …
764 if (cs == CS_UNICODE) 807 if (cs == CS_UNICODE)
765 cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font 808 cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font
766 809
767 encm = f->min_byte1 != 0 || f->max_byte1 != 0; 810 encm = f->min_byte1 != 0 || f->max_byte1 != 0;
768 enc2b = encm || f->max_char_or_byte2 > 255; 811 enc2b = encm || f->max_char_or_byte2 > 255;
769
770 ascent = f->ascent;
771 descent = f->descent;
772 height = ascent + descent;
773 812
774 slow = false; 813 slow = false;
775 814
776#if 1 // only used for slow detection, TODO optimize 815#if 1 // only used for slow detection, TODO optimize
777 if (f->min_bounds.width == f->max_bounds.width) 816 if (f->min_bounds.width == f->max_bounds.width)
… …
816 855
817 XCharStruct g; 856 XCharStruct g;
818 int dir_ret, asc_ret, des_ret; 857 int dir_ret, asc_ret, des_ret;
819 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); 858 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);
820 859
821 int wcw = wcwidth (*t); if (wcw > 0) g.width = g.width / wcw; 860 int wcw = WCWIDTH (*t); if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
822 861
823 if (width < g.width) width = g.width; 862 if (width < g.width) width = g.width;
824 } 863 }
825 864
826 if (cs == CS_UNKNOWN) 865 if (cs == CS_UNKNOWN)
… …
845void 884void
846rxvt_font_x11::clear () 885rxvt_font_x11::clear ()
847{ 886{
848 if (f) 887 if (f)
849 { 888 {
850 XFreeFont (DISPLAY, f); 889 XFreeFont (term->display->display, f);
851 f = 0; 890 f = 0;
852 } 891 }
853} 892}
854 893
855bool 894bool
856rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) 895rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
857{ 896{
858 uint32_t ch = FROM_UNICODE (cs, unicode); 897 uint32_t ch = FROM_UNICODE (cs, unicode);
859 898
860 if (ch == NOCHAR) 899 if (ch == NOCHAR)
861 return false; 900 return false;
… …
899 938
900 if (!prop || prop->width == rxvt_fontprop::unset) 939 if (!prop || prop->width == rxvt_fontprop::unset)
901 return true; 940 return true;
902 941
903 // check character against base font bounding box 942 // check character against base font bounding box
904 int w = xcs->width; 943 int w = xcs->rbearing - xcs->lbearing;
905 int wcw = wcwidth (unicode); 944 int wcw = WCWIDTH (unicode);
906 if (wcw > 0) w /= wcw; 945 if (wcw > 0) w = (w + wcw - 1) / wcw;
907 946
908 careful = w > prop->width; 947 careful = w > prop->width;
909 if (careful && w > prop->width * MAX_OVERLAP >> 2) 948 if (careful && OVERLAP_OK (w, prop))
910 return false; 949 return false;
911 950
912 return true; 951 return true;
913} 952}
914 953
… …
920 // this looks like a mess /. 959 // this looks like a mess /.
921 // and it is a mess /. 960 // and it is a mess /.
922 // yet we are trying to be perfect /. 961 // yet we are trying to be perfect /.
923 // but the result still isn't perfect /. 962 // but the result still isn't perfect /.
924 963
964 dTermDisplay;
965 dTermGC;
966
925 bool slow = this->slow 967 bool slow = this->slow
926 || width != r->TermWin.fwidth 968 || width != term->fwidth
927 || height != r->TermWin.fheight; 969 || height != term->fheight;
928 970
929 int base = ascent; // sorry, incorrect: r->TermWin.fbase; 971 int base = ascent; // sorry, incorrect: term->fbase;
930 972
931 XGCValues v; 973 XGCValues v;
932 v.foreground = r->pix_colors[fg]; 974 v.foreground = term->pix_colors[fg];
933 v.font = f->fid; 975 v.font = f->fid;
934 976
935 if (enc2b) 977 if (enc2b)
936 { 978 {
937 const XChar2b *xc = enc_xchar2b (text, len, cs, slow); 979 const XChar2b *xc = enc_xchar2b (text, len, cs, slow);
938 980
939 if (bg == Color_bg && !slow) 981 if (bg == Color_bg && !slow)
940 { 982 {
941 v.background = r->pix_colors[bg]; 983 v.background = term->pix_colors[bg];
942 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); 984 XChangeGC (disp, gc, GCForeground | GCBackground | GCFont, &v);
943 XDrawImageString16 (d.display->display, d, TGC, x, y + base, xc, len); 985 XDrawImageString16 (disp, d, gc, x, y + base, xc, len);
944 } 986 }
945 else 987 else
946 { 988 {
947 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 989 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
948 990
949 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v); 991 XChangeGC (disp, gc, GCForeground | GCFont, &v);
950 992
951 if (slow) 993 if (slow)
952 { 994 {
953 do 995 do
954 { 996 {
955 if (xc->byte1 || xc->byte2) 997 if (xc->byte1 || xc->byte2)
956 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, 1); 998 XDrawString16 (disp, d, gc, x, y + base, xc, 1);
957 999
958 x += r->TermWin.fwidth; 1000 x += term->fwidth;
959 xc++; len--; 1001 xc++; len--;
960 } 1002 }
961 while (len); 1003 while (len);
962 } 1004 }
963 else 1005 else
964 XDrawString16 (d.display->display, d, TGC, x, y + base, xc, len); 1006 XDrawString16 (disp, d, gc, x, y + base, xc, len);
965 } 1007 }
966 } 1008 }
967 else 1009 else
968 { 1010 {
969 const char *xc = enc_char (text, len, cs, slow); 1011 const char *xc = enc_char (text, len, cs, slow);
970 1012
971 if (bg == Color_bg && !slow) 1013 if (bg == Color_bg && !slow)
972 { 1014 {
973 v.background = r->pix_colors[bg]; 1015 v.background = term->pix_colors[bg];
974 XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v); 1016 XChangeGC (disp, gc, GCForeground | GCBackground | GCFont, &v);
975 XDrawImageString (d.display->display, d, TGC, x, y + base, xc, len); 1017 XDrawImageString (disp, d, gc, x, y + base, xc, len);
976 } 1018 }
977 else 1019 else
978 { 1020 {
979 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 1021 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
980 1022
981 XChangeGC (d.display->display, TGC, GCForeground | GCFont, &v); 1023 XChangeGC (disp, gc, GCForeground | GCFont, &v);
982 1024
983 if (slow) 1025 if (slow)
984 { 1026 {
985 do 1027 do
986 { 1028 {
987 if (*xc) 1029 if (*xc)
988 XDrawString (d.display->display, d, TGC, x, y + base, xc, 1); 1030 XDrawString (disp, d, gc, x, y + base, xc, 1);
989 1031
990 x += r->TermWin.fwidth; 1032 x += term->fwidth;
991 xc++; len--; 1033 xc++; len--;
992 } 1034 }
993 while (len); 1035 while (len);
994 } 1036 }
995 else 1037 else
996 XDrawString (d.display->display, d, TGC, x, y + base, xc, len); 1038 XDrawString (disp, d, gc, x, y + base, xc, len);
997 } 1039 }
998 } 1040 }
999} 1041}
1000 1042
1001///////////////////////////////////////////////////////////////////////////// 1043/////////////////////////////////////////////////////////////////////////////
… …
1013 1055
1014 void draw (rxvt_drawable &d, int x, int y, 1056 void draw (rxvt_drawable &d, int x, int y,
1015 const text_t *text, int len, 1057 const text_t *text, int len,
1016 int fg, int bg); 1058 int fg, int bg);
1017 1059
1018 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &carefull); 1060 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &carefull) const;
1019 1061
1020protected: 1062protected:
1021 XftFont *f; 1063 XftFont *f;
1022}; 1064};
1023 1065
1024void 1066void
1025rxvt_font_xft::clear () 1067rxvt_font_xft::clear ()
1026{ 1068{
1027 if (f) 1069 if (f)
1028 { 1070 {
1029 XftFontClose (DISPLAY, f); 1071 XftFontClose (term->display->display, f);
1030 f = 0; 1072 f = 0;
1031 } 1073 }
1032} 1074}
1033 1075
1034rxvt_fontprop 1076rxvt_fontprop
… …
1038 1080
1039 FT_Face face = XftLockFace (f); 1081 FT_Face face = XftLockFace (f);
1040 1082
1041 p.width = width; 1083 p.width = width;
1042 p.height = height; 1084 p.height = height;
1085 p.ascent = ascent;
1043 p.weight = face->style_flags & FT_STYLE_FLAG_BOLD 1086 p.weight = face->style_flags & FT_STYLE_FLAG_BOLD
1044 ? rxvt_fontprop::bold : rxvt_fontprop::medium; 1087 ? rxvt_fontprop::bold : rxvt_fontprop::medium;
1045 p.slant = face->style_flags & FT_STYLE_FLAG_ITALIC 1088 p.slant = face->style_flags & FT_STYLE_FLAG_ITALIC
1046 ? rxvt_fontprop::italic : rxvt_fontprop::roman; 1089 ? rxvt_fontprop::italic : rxvt_fontprop::roman;
1047 1090
… …
1051} 1094}
1052 1095
1053bool 1096bool
1054rxvt_font_xft::load (const rxvt_fontprop &prop) 1097rxvt_font_xft::load (const rxvt_fontprop &prop)
1055{ 1098{
1099 dTermDisplay;
1100
1056 clear (); 1101 clear ();
1057 1102
1058 FcPattern *p = FcNameParse ((FcChar8 *) name); 1103 FcPattern *p = FcNameParse ((FcChar8 *) name);
1059 1104
1060 if (!p) 1105 if (!p)
1061 return false; 1106 return false;
1062 1107
1063 FcValue v; 1108 FcValue v;
1064 1109
1065 if (prop.height != rxvt_fontprop::unset 1110 if (prop.height != rxvt_fontprop::unset
1066 || (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch 1111 && (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch
1067 && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch)) 1112 && FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch))
1068 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height); 1113 FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);
1069 1114
1070 if (prop.weight != rxvt_fontprop::unset 1115 if (prop.weight != rxvt_fontprop::unset
1071 && FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch) 1116 && FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch)
… …
1086 1131
1087 // store generated name so iso14755 view gives better results 1132 // store generated name so iso14755 view gives better results
1088 set_name ((char *)FcNameUnparse (p)); 1133 set_name ((char *)FcNameUnparse (p));
1089 1134
1090 XftResult result; 1135 XftResult result;
1091 FcPattern *match = XftFontMatch (DISPLAY, DefaultScreen (DISPLAY), p, &result); 1136 FcPattern *match = XftFontMatch (disp, term->display->screen, p, &result);
1092 1137
1093 FcPatternDestroy (p); 1138 FcPatternDestroy (p);
1094 1139
1095 if (!match) 1140 if (!match)
1096 return false; 1141 return false;
… …
1098 int ftheight = 0; 1143 int ftheight = 0;
1099 bool success = true; 1144 bool success = true;
1100 1145
1101 for (;;) 1146 for (;;)
1102 { 1147 {
1103 f = XftFontOpenPattern (DISPLAY, FcPatternDuplicate (match)); 1148 f = XftFontOpenPattern (disp, FcPatternDuplicate (match));
1104 1149
1105 if (!f) 1150 if (!f)
1106 { 1151 {
1107 success = false; 1152 success = false;
1108 break; 1153 break;
… …
1117 1162
1118 bool scalable = face->face_flags & FT_FACE_FLAG_SCALABLE; 1163 bool scalable = face->face_flags & FT_FACE_FLAG_SCALABLE;
1119 1164
1120 XftUnlockFace (f); 1165 XftUnlockFace (f);
1121 1166
1167 int glheight = height;
1168
1122 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 1169 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; )
1123 { 1170 {
1124 FcChar16 ch = *t; 1171 FcChar16 ch = *t;
1125 1172
1126 if (cs != CS_UNICODE 1173 if (cs != CS_UNICODE
… …
1132 bool careful; 1179 bool careful;
1133 if (!has_char (*t, &prop, careful)) 1180 if (!has_char (*t, &prop, careful))
1134 continue; 1181 continue;
1135 1182
1136 XGlyphInfo g; 1183 XGlyphInfo g;
1137 XftTextExtents16 (DISPLAY, f, &ch, 1, &g); 1184 XftTextExtents16 (disp, f, &ch, 1, &g);
1138 1185
1186 g.width -= g.x;
1187
1139 int wcw = wcwidth (ch); 1188 int wcw = WCWIDTH (ch);
1140 if (wcw > 0) g.width = g.width / wcw; 1189 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
1141 1190
1142 if (width < g.width) width = g.width; 1191 if (width < g.width ) width = g.width;
1143 if (height < g.height) height = g.height; 1192 if (height < g.height ) height = g.height;
1193 if (glheight < g.height - g.y) glheight = g.height - g.y;
1194 }
1195
1196 if (!width)
1197 {
1198 rxvt_warn ("unable to calculate font width for '%s', ignoring.\n", name);
1199
1200 XftFontClose (disp, f);
1201 f = 0;
1202
1203 success = false;
1204 break;
1144 } 1205 }
1145 1206
1146 if (prop.height == rxvt_fontprop::unset 1207 if (prop.height == rxvt_fontprop::unset
1147 || height <= prop.height 1208 || (height <= prop.height && glheight <= prop.height)
1148 || height <= 2 1209 || height <= 2
1149 || !scalable) 1210 || !scalable)
1150 break; 1211 break;
1151 1212
1152 if (ftheight) 1213 if (ftheight)
… …
1159 ftheight -= height - prop.height; 1220 ftheight -= height - prop.height;
1160 } 1221 }
1161 else 1222 else
1162 ftheight = prop.height - 1; 1223 ftheight = prop.height - 1;
1163 1224
1164 XftFontClose (DISPLAY, f); 1225 XftFontClose (disp, f);
1165 FcPatternDel (match, FC_PIXEL_SIZE); 1226 FcPatternDel (match, FC_PIXEL_SIZE);
1166 FcPatternAddInteger (match, FC_PIXEL_SIZE, ftheight); 1227 FcPatternAddInteger (match, FC_PIXEL_SIZE, ftheight);
1167 } 1228 }
1168 1229
1169 FcPatternDestroy (match); 1230 FcPatternDestroy (match);
1170 1231
1171#if 0 // do it per-character 1232#if 0 // do it per-character
… …
1178 1239
1179 return success; 1240 return success;
1180} 1241}
1181 1242
1182bool 1243bool
1183rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) 1244rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
1184{ 1245{
1185 careful = false; 1246 careful = false;
1186 1247
1187 if (!XftCharExists (DISPLAY, f, unicode)) 1248 if (!XftCharExists (term->display->display, f, unicode))
1188 return false; 1249 return false;
1189 1250
1190 if (!prop || prop->width == rxvt_fontprop::unset) 1251 if (!prop || prop->width == rxvt_fontprop::unset)
1191 return true; 1252 return true;
1192 1253
1193 // check character against base font bounding box 1254 // check character against base font bounding box
1194 FcChar32 ch = unicode; 1255 FcChar32 ch = unicode;
1195 XGlyphInfo g; 1256 XGlyphInfo g;
1196 XftTextExtents32 (DISPLAY, f, &ch, 1, &g); 1257 XftTextExtents32 (term->display->display, f, &ch, 1, &g);
1197 1258
1198 int w = g.width; 1259 int w = g.width - g.x;
1199 int wcw = wcwidth (unicode); 1260 int wcw = WCWIDTH (unicode);
1200 if (wcw > 0) w /= wcw; 1261 if (wcw > 0) w = (w + wcw - 1) / wcw;
1201 1262
1202 careful = w > prop->width; 1263 careful = w > prop->width;
1203 if (careful && w > prop->width * MAX_OVERLAP >> 2) 1264 if (careful && OVERLAP_OK (w, prop))
1204 return false; 1265 return false;
1205 1266
1206 return true; 1267 return true;
1207} 1268}
1208 1269
1209void 1270void
1210rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, 1271rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1211 const text_t *text, int len, 1272 const text_t *text, int len,
1212 int fg, int bg) 1273 int fg, int bg)
1213{ 1274{
1214 clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg); 1275 clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
1215
1216 int base = ascent; // should be fbase, but that is incorrect
1217 1276
1218 XGlyphInfo extents; 1277 XGlyphInfo extents;
1219 FcChar32 *enc = (FcChar32 *) get_enc_buf (len * sizeof (FcChar32)); 1278 XftGlyphSpec *enc = (XftGlyphSpec *)rxvt_temp_buf (len * sizeof (XftGlyphSpec));
1220 FcChar32 *ep = enc; 1279 XftGlyphSpec *ep = enc;
1221 int ewidth = 0; 1280
1222 int xoff = 0; 1281 dTermDisplay;
1282 dTermGC;
1283
1284 // cut trailing spaces
1285 while (len && text [len - 1] == ' ')
1286 len--;
1223 1287
1224 while (len) 1288 while (len)
1225 { 1289 {
1226 int cwidth = r->TermWin.fwidth; 1290 int cwidth = term->fwidth;
1227 FcChar32 fc = *text++; len--; 1291 FcChar32 fc = *text++; len--;
1228 FT_UInt gl;
1229 1292
1230 while (len && *text == NOCHAR) 1293 while (len && *text == NOCHAR)
1231 text++, len--, cwidth += r->TermWin.fwidth; 1294 text++, len--, cwidth += term->fwidth;
1232 1295
1233 gl = XftCharIndex (d.display->display, f, fc); 1296 if (fc != ' ') // skip spaces
1234 XftGlyphExtents (d.display->display, f, &gl, 1, &extents);
1235
1236 if (extents.xOff != cwidth && ep != enc)
1237 {
1238 if (xoff > ewidth) xoff = ewidth;
1239 XftDrawGlyphs (d, &r->pix_colors[fg].c, f,
1240 x + (ewidth - xoff >> 1),
1241 y + base, enc, ep - enc);
1242 x += ewidth;
1243
1244 ep = enc;
1245 ewidth = 0;
1246 xoff = 0;
1247 } 1297 {
1298 FT_UInt glyph = XftCharIndex (disp, f, fc);
1299 XftGlyphExtents (disp, f, &glyph, 1, &extents);
1248 1300
1249 if (fc == ' ' && ep == enc) // skip leading spaces 1301 ep->glyph = glyph;
1302 ep->x = x + (cwidth - extents.xOff >> 1);
1303 ep->y = y + ascent;
1304 ep++;
1250 { 1305 }
1306
1251 x += cwidth; 1307 x += cwidth;
1252 continue;
1253 }
1254
1255 else
1256 {
1257 *ep++ = gl;
1258 ewidth += cwidth;
1259 xoff += extents.xOff;
1260 }
1261 } 1308 }
1262 1309
1263 if (ep != enc) 1310 if (ep != enc)
1264 {
1265 if (xoff > ewidth) xoff = ewidth;
1266 XftDrawGlyphs (d, &r->pix_colors[fg].c, f, 1311 XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc);
1267 x + (ewidth - xoff >> 1),
1268 y + base, enc, ep - enc);
1269 }
1270} 1312}
1271#endif 1313#endif
1272 1314
1273///////////////////////////////////////////////////////////////////////////// 1315/////////////////////////////////////////////////////////////////////////////
1274 1316
1275rxvt_fontset::rxvt_fontset (rxvt_t r) 1317rxvt_fontset::rxvt_fontset (rxvt_term *term)
1276: r (r), fontdesc (0) 1318: fontdesc (0), term (term)
1277{ 1319{
1278 clear (); 1320 clear ();
1279} 1321}
1280 1322
1281rxvt_fontset::~rxvt_fontset () 1323rxvt_fontset::~rxvt_fontset ()
… …
1284} 1326}
1285 1327
1286void 1328void
1287rxvt_fontset::clear () 1329rxvt_fontset::clear ()
1288{ 1330{
1289 prop.width = prop.height = prop.weight = prop.slant 1331 prop.width = prop.height = prop.ascent = prop.weight = prop.slant
1290 = rxvt_fontprop::unset; 1332 = rxvt_fontprop::unset;
1291 1333
1292 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) 1334 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1293 FONT_UNREF (*i); 1335 FONT_UNREF (*i);
1294 1336
… …
1325 f = new rxvt_font_x11; 1367 f = new rxvt_font_x11;
1326 } 1368 }
1327 else 1369 else
1328 f = new rxvt_font_x11; 1370 f = new rxvt_font_x11;
1329 1371
1330 f->set_term (r); 1372 f->set_term (term);
1331 f->set_name (strdup (name)); 1373 f->set_name (strdup (name));
1332 1374
1333 f->cs = cs; 1375 f->cs = cs;
1334 f->loaded = false; 1376 f->loaded = false;
1335 1377
… …
1346 char buf[512]; 1388 char buf[512];
1347 const char *end; 1389 const char *end;
1348 1390
1349 do 1391 do
1350 { 1392 {
1351 while (*desc <= ' ') desc++; 1393 while (*desc && *desc <= ' ')
1394 desc++;
1352 1395
1353 codeset cs = CS_UNICODE; 1396 codeset cs = CS_UNICODE;
1354 1397
1355 if (*desc == '[') 1398 if (*desc == '[')
1356 { 1399 {
… …
1466 if (FROM_UNICODE (f->cs, unicode) == NOCHAR) 1509 if (FROM_UNICODE (f->cs, unicode) == NOCHAR)
1467 goto next_font; 1510 goto next_font;
1468 1511
1469 if (!realize_font (i)) 1512 if (!realize_font (i))
1470 goto next_font; 1513 goto next_font;
1514
1515 if (prop.ascent != rxvt_fontprop::unset)
1516 max_it (f->ascent, prop.ascent);
1471 } 1517 }
1472 1518
1473 if (f->cs == CS_UNKNOWN) 1519 if (f->cs == CS_UNKNOWN)
1474 goto next_font; 1520 goto next_font;
1475 1521
… …
1514 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1560 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1515 FcPatternAddBool (p, FC_MINSPACE, 1); 1561 FcPatternAddBool (p, FC_MINSPACE, 1);
1516 //FcPatternAddBool (p, FC_ANTIALIAS, 1); 1562 //FcPatternAddBool (p, FC_ANTIALIAS, 1);
1517 1563
1518 XftResult result; 1564 XftResult result;
1519 FcPattern *match = XftFontMatch (DISPLAY, DefaultScreen (DISPLAY), p, &result); 1565 FcPattern *match = XftFontMatch (term->display->display, term->display->screen, p, &result);
1520 1566
1521 FcPatternDestroy (p); 1567 FcPatternDestroy (p);
1522 1568
1523 if (match) 1569 if (match)
1524 { 1570 {

Diff Legend

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