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

Diff Legend

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