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.123 by ayin, Sat Nov 24 10:32:33 2007 UTC vs.
Revision 1.216 by root, Sat Jun 19 10:08:10 2021 UTC

1/*----------------------------------------------------------------------* 1/*----------------------------------------------------------------------*
2 * File: rxvtfont.C 2 * File: rxvtfont.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 4 * Copyright (c) 2003-2008 Marc Lehmann <schmorp@schmorp.de>
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 3 of the License, or
10 * (at your option) any later version. 10 * (at your option) any later version.
11 * 11 *
12 * This program is distributed in the hope that it will be useful, 12 * This program is distributed in the hope that it will be useful,
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of 13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA 19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20 *---------------------------------------------------------------------*/ 20 *---------------------------------------------------------------------*/
21 21
22#include "../config.h" 22#include "../config.h"
23#include "rxvt.h" 23#include "rxvt.h"
24#include "rxvtlib.h"
25#include "rxvtutil.h" 24#include "rxvtutil.h"
26#include "rxvtfont.h" 25#include "rxvtfont.h"
27 26
28#include <cstdlib> 27#include <stdlib.h>
29 28
30#include <inttypes.h> 29#include <inttypes.h>
30
31#if XFT
32# include <fontconfig/fontconfig.h>
33#endif
31 34
32#define MAX_OVERLAP_ROMAN (8 + 2) // max. character width in 8ths of the base width 35#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 36#define MAX_OVERLAP_ITALIC (8 + 3) // max. overlap for italic fonts
34 37
35#define OVERLAP_OK(w,wcw,prop) ((w) <= ( \ 38#define OVERLAP_OK(w,wcw,prop) ((w) <= ( \
36 (prop)->slant >= rxvt_fontprop::italic \ 39 (prop)->slant >= rxvt_fontprop::italic \
37 ? ((prop)->width * (wcw) * MAX_OVERLAP_ITALIC + 7) >> 3 \ 40 ? ((prop)->width * (wcw) * MAX_OVERLAP_ITALIC + 7) >> 3 \
38 : ((prop)->width * (wcw) * MAX_OVERLAP_ROMAN + 7) >> 3 \ 41 : ((prop)->width * (wcw) * MAX_OVERLAP_ROMAN + 7) >> 3 \
39 )) 42 ))
40 43
41const struct rxvt_fallback_font { 44static const struct rxvt_fallback_font {
42 codeset cs; 45 codeset cs;
43 const char *name; 46 const char *name;
44} fallback_fonts[] = { 47} fallback_fonts[] = {
45 { CS_ISO8859_1, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-1" }, 48 { CS_ISO8859_1, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-1" },
46 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-15" }, 49 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-15" },
… …
80 83
81 // japanese 84 // japanese
82#if ENCODING_JP || ENCODING_JP_EXT 85#if ENCODING_JP || ENCODING_JP_EXT
83# if XFT 86# if XFT
84 // prefer xft for complex scripts 87 // prefer xft for complex scripts
88 { CS_JIS0208_1990_0, "xft:Sazanami Mincho:antialias=false" },
85 { CS_JIS0208_1990_0, "xft:Kochi Gothic:antialias=false" }, 89 { CS_JIS0208_1990_0, "xft:Kochi Gothic:antialias=false" },
86 { CS_JIS0208_1990_0, "xft:Sazanami Mincho:antialias=false" },
87 { CS_JIS0208_1990_0, "xft:Mincho:antialias=false" }, 90 { CS_JIS0208_1990_0, "xft:Mincho:antialias=false" },
88 { CS_JIS0208_1990_0, "xft::lang=ja:antialias=false" }, 91 { CS_JIS0208_1990_0, "xft::lang=ja:antialias=false" },
89# endif 92# endif
90 { CS_JIS0201_1976_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0201*-0" }, 93 { CS_JIS0201_1976_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0201*-0" },
91 { CS_JIS0208_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" }, 94 { CS_JIS0208_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" },
… …
129 { CS_KSC5601_1987_0, "xft:Baekmuk Gulim:antialias=false" }, 132 { CS_KSC5601_1987_0, "xft:Baekmuk Gulim:antialias=false" },
130 { CS_KSC5601_1987_0, "xft::lang=ko:antialias=false" }, 133 { CS_KSC5601_1987_0, "xft::lang=ko:antialias=false" },
131# endif 134# endif
132#endif 135#endif
133 136
134 { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" },
135 //{ CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" }, // this gem of a font has actual dotted circles within the combining character glyphs. 137 //{ CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" }, // this gem of a font has actual dotted circles within the combining character glyphs.
136#if XFT 138#if XFT
137 { CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true" }, 139 { CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true" },
138 { CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" }, 140 { CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" },
139 { CS_UNICODE, "xft:Andale Mono:antialias=false:autohint=false" }, 141 { CS_UNICODE, "xft:Andale Mono:antialias=false:autohint=false" },
… …
156 '0', '1', '8', 'a', 'd', 'x', 'm', 'y', 'g', 'W', 'X', '\'', '_', 158 '0', '1', '8', 'a', 'd', 'x', 'm', 'y', 'g', 'W', 'X', '\'', '_',
157 0x00cd, 0x00d5, 0x0114, 0x0177, 0x0643, // ÍÕĔŷﻙ 159 0x00cd, 0x00d5, 0x0114, 0x0177, 0x0643, // ÍÕĔŷﻙ
158 0x304c, 0x672c, // が本 160 0x304c, 0x672c, // が本
159}; 161};
160 162
161#define NUM_EXTENT_TEST_CHARS (sizeof (extent_test_chars) / sizeof (extent_test_chars[0]))
162
163#define dTermDisplay Display *disp = term->dpy 163#define dTermDisplay Display *disp = term->dpy
164#define dTermGC GC gc = term->gc 164#define dTermGC GC gc = term->gc
165 165
166///////////////////////////////////////////////////////////////////////////// 166/////////////////////////////////////////////////////////////////////////////
167 167
… …
217: name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset) 217: name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset)
218{ 218{
219} 219}
220 220
221void 221void
222rxvt_font::set_name (char *name) 222rxvt_font::set_name (char *name_)
223{ 223{
224 if (this->name == name) 224 if (name == name_)
225 return; 225 return;
226 226
227 if (this->name) free (this->name); // let the compiler optimize 227 if (name) free (name); // let the compiler optimize
228 this->name = name; 228 name = name_;
229} 229}
230 230
231void 231void
232rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const 232rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const
233{ 233{
… …
237 if (color == Color_bg || color == Color_transparent) 237 if (color == Color_bg || color == Color_transparent)
238 XClearArea (disp, d, x, y, w, h, false); 238 XClearArea (disp, d, x, y, w, h, false);
239 else if (color >= 0) 239 else if (color >= 0)
240 { 240 {
241#if XFT 241#if XFT
242 bool done = false; 242 Picture dst;
243#ifdef HAVE_BG_PIXMAP 243
244 if (term->bgPixmap.pixmap && color >= 0 && term->pix_colors[color].c.color.alpha < 0x0ff00) 244# ifdef HAVE_IMG
245 { 245 if (term->bg_img
246 && !term->pix_colors[color].is_opaque ()
246 Picture dst = XftDrawPicture (d); 247 && ((dst = XftDrawPicture (d))))
247 if (dst != 0)
248 { 248 {
249 XClearArea (disp, d, x, y, w, h, false); 249 XClearArea (disp, d, x, y, w, h, false);
250
250 Picture solid_color_pict = XftDrawSrcPicture (d, &term->pix_colors[color].c); 251 Picture solid_color_pict = XftDrawSrcPicture (d, &term->pix_colors[color].c);
251 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, x, y, w, h); 252 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, x, y, w, h);
252 done = true;
253 } 253 }
254 } 254 else
255#endif 255# endif
256 if (!done)
257 XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h); 256 XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);
257
258#else 258#else
259 XSetForeground (disp, gc, term->pix_colors[color]); 259 XSetForeground (disp, gc, term->pix_colors[color]);
260 XFillRectangle (disp, d, gc, x, y, w, h); 260 XFillRectangle (disp, d, gc, x, y, w, h);
261#endif 261#endif
262 } 262 }
263} 263}
264 264
265///////////////////////////////////////////////////////////////////////////// 265/////////////////////////////////////////////////////////////////////////////
266 266
267struct rxvt_font_default : rxvt_font { 267struct rxvt_font_default : rxvt_font
268{
268 struct rxvt_fontset *fs; 269 struct rxvt_fontset *fs;
269 270
270 rxvt_font_default (rxvt_fontset *fs) 271 rxvt_font_default (rxvt_fontset *fs)
271 : rxvt_font () 272 : rxvt_font ()
272 { 273 {
… …
306 return false; 307 return false;
307 308
308 if (unicode <= 0x009f) 309 if (unicode <= 0x009f)
309 return true; 310 return true;
310 311
312#ifdef BUILTIN_GLYPHS
311 if (unicode >= 0x2500 && unicode <= 0x259f && 313 if (unicode >= 0x2500 && unicode <= 0x259f &&
312 !term->option (Opt_skipBuiltinGlyphs)) 314 !term->option (Opt_skipBuiltinGlyphs))
313 return true; 315 return true;
316#endif
314 317
315 if (IS_COMPOSE (unicode)) 318 // we do not check for IS_COMPOSE here, as this would
316 return true; 319 // rob other fonts from taking over.
317 320
318 switch (unicode) 321 switch (unicode)
319 { 322 {
320 case ZERO_WIDTH_CHAR: 323 case ZERO_WIDTH_CHAR:
321 case NOCHAR: 324 case NOCHAR:
… …
342 345
343 XSetForeground (disp, gc, term->pix_colors[fg]); 346 XSetForeground (disp, gc, term->pix_colors[fg]);
344 347
345 while (len) 348 while (len)
346 { 349 {
350 const text_t *tp = text;
351 text_t t = *tp;
352
353 while (++text, --len && *text == NOCHAR)
354 ;
355
347#if ENABLE_COMBINING 356#if ENABLE_COMBINING
348 compose_char *cc; 357 compose_char *cc;
349#endif 358#endif
350 const text_t *tp = text;
351 text_t t = *tp;
352
353 while (++text, --len && *text == NOCHAR)
354 ;
355
356 int width = text - tp; 359 int width = text - tp;
357 int fwidth = term->fwidth * width; 360 int fwidth = term->fwidth * width;
358 361
359#ifdef BUILTIN_GLYPHS 362#ifdef BUILTIN_GLYPHS
360 if (0x2500 <= t && t <= 0x259f) 363 if (0x2500 <= t && t <= 0x259f)
… …
442#endif 445#endif
443#if ENABLE_COMBINING 446#if ENABLE_COMBINING
444 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) 447 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
445 { 448 {
446 min_it (width, 2); // we only support wcwidth up to 2 449 min_it (width, 2); // we only support wcwidth up to 2
447
448 text_t chrs[2]; 450 text_t chrs[2];
449 chrs [1] = NOCHAR; 451 chrs [1] = NOCHAR;
450 452
451 *chrs = cc->c1; 453 *chrs = cc->c1;
452 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)]; 454 rxvt_font *f1 = (*fs)[fs->find_font_idx (cc->c1)];
453 f1->draw (d, x, y, chrs, width, fg, bg); 455 f1->draw (d, x, y, chrs, width, fg, bg);
454 456
455 if (cc->c2 != NOCHAR) 457 if (cc->c2 != NOCHAR)
456 { 458 {
457 bool careful; 459 bool careful;
458 460
459 // prefer font of first character, for no good reasons 461 // prefer font of first character, for no good reasons
460 *chrs = cc->c2; 462 *chrs = cc->c2;
461 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful) 463 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful)
462 ? f1 464 ? f1
463 : (*fs)[fs->find_font (cc->c2)]; 465 : (*fs)[fs->find_font_idx (cc->c2)];
464 466
465 f2->draw (d, x, y, chrs, width, fg, Color_none); 467 f2->draw (d, x, y, chrs, width, fg, Color_none);
466 } 468 }
467 } 469 }
468#endif 470#endif
… …
472 case '\t': 474 case '\t':
473 case ZERO_WIDTH_CHAR: 475 case ZERO_WIDTH_CHAR:
474 case NOCHAR: 476 case NOCHAR:
475 break; 477 break;
476 478
479 /*
480 * If the base font does not support variation selectors, treat them as ZWC.
481 * a point could be made to do this for all wcwidth == 0 characters, but I
482 * decided against that until more data is available.
483 */
484 case 0xfe00: case 0xfe01: case 0xfe02: case 0xfe03: case 0xfe04: case 0xfe05: case 0xfe06: case 0xfe07:
485 case 0xfe08: case 0xfe09: case 0xfe0a: case 0xfe0b: case 0xfe0c: case 0xfe0d: case 0xfe0e: case 0xfe0f:
486 break;
487
477 default: 488 default:
478 XDrawRectangle (disp, d, gc, x + 2, y + 2, 489 XDrawRectangle (disp, d, gc, x + 2, y + 2,
479 fwidth - 4, term->fheight - 4); 490 fwidth - 4, term->fheight - 4);
480 } 491 }
481 492
482 x += fwidth; 493 x += fwidth;
483 } 494 }
484} 495}
485 496
497struct rxvt_font_overflow : rxvt_font
498{
499 struct rxvt_fontset *fs;
500
501 rxvt_font_overflow (rxvt_fontset *fs)
502 : rxvt_font ()
503 {
504 this->fs = fs;
505 }
506
507 rxvt_fontprop properties ()
508 {
509 rxvt_fontprop p;
510
511 p.width = p.height = 1;
512 p.ascent = rxvt_fontprop::unset;
513 p.weight = rxvt_fontprop::medium;
514 p.slant = rxvt_fontprop::roman;
515
516 return p;
517 }
518
519 bool load (const rxvt_fontprop &prop, bool force_prop)
520 {
521 width = 1; height = 1;
522 ascent = 1; descent = 0;
523
524 set_name (strdup ("built-in rendition overflow font"));
525
526 return true;
527 }
528
529 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
530 {
531 return false;
532 }
533
534 void draw (rxvt_drawable &d, int x, int y,
535 const text_t *text, int len,
536 int fg, int bg)
537 {
538 while (len)
539 {
540 int fid = fs->find_font_idx (*text);
541 int w = 1;
542 while (w < len && text[w] == NOCHAR)
543 w++;
544 (*fs)[fid]->draw (d, x, y, text, w, fg, bg);
545 text += w;
546 len -= w;
547 x += term->fwidth * w;
548 }
549 }
550};
551
486///////////////////////////////////////////////////////////////////////////// 552/////////////////////////////////////////////////////////////////////////////
487 553
488struct rxvt_font_x11 : rxvt_font { 554struct rxvt_font_x11 : rxvt_font
555{
489 rxvt_font_x11 () { f = 0; } 556 rxvt_font_x11 () { f = 0; }
490 557
491 void clear (); 558 void clear ();
492 559
493 rxvt_fontprop properties (); 560 rxvt_fontprop properties ();
… …
498 565
499 void draw (rxvt_drawable &d, int x, int y, 566 void draw (rxvt_drawable &d, int x, int y,
500 const text_t *text, int len, 567 const text_t *text, int len,
501 int fg, int bg); 568 int fg, int bg);
502 569
503 bool slow; // wether this is a proportional font or has other funny characteristics 570 bool slow; // whether this is a proportional font or has other funny characteristics
504 XFontStruct *f; 571 XFontStruct *f;
505 bool enc2b, encm; 572 bool enc2b, encm;
506 573
507 char *get_property (XFontStruct *f, Atom property, const char *repl) const; 574 char *get_property (XFontStruct *f, Atom property, const char *repl) const;
508 bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth); 575 bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth);
… …
608 return false; 675 return false;
609} 676}
610 677
611// fix the size of scalable fonts 678// fix the size of scalable fonts
612static bool 679static bool
613replace_field (char *buf, const char *name, int index, const char old, const char *replace) 680replace_field (char **ptr, const char *name, int index, const char old, const char *replace)
614{ 681{
615 int slashes = 0; 682 int slashes = 0;
616 const char *field, *end; 683 const char *field, *end;
617 684
618 for (const char *c = name; *c; c++) 685 for (const char *c = name; *c; c++)
… …
628 break; 695 break;
629 } 696 }
630 697
631 if (slashes >= 13 && (!old || *field == old)) 698 if (slashes >= 13 && (!old || *field == old))
632 { 699 {
633 // TODO: check for overflow in font-name 700 size_t len = field - name;
634 strncpy (buf, name, field - name); 701 *ptr = (char *)malloc (len + strlen (replace) + strlen (end) + 1);
635 buf += field - name; 702 memcpy (*ptr, name, len);
636 strcpy (buf, replace); 703 strcpy (*ptr + len, replace);
637 strcat (buf, end); 704 strcat (*ptr, end);
638 705
639 return true; 706 return true;
640 } 707 }
641 else 708 else
642 { 709 {
643 strcpy (buf, name); 710 *ptr = strdup (name);
644 711
645 return false; 712 return false;
646 } 713 }
647} 714}
648 715
… …
656 char field_str[64]; // enough for 128 bits 723 char field_str[64]; // enough for 128 bits
657 724
658 // first morph the font if required 725 // first morph the font if required
659 if (force_prop) 726 if (force_prop)
660 { 727 {
661 char fname[1024]; 728 char *fname;
662 729
663 if (name[0] != '-') 730 if (name[0] != '-')
664 { 731 {
665 f = XLoadQueryFont (disp, name); 732 f = XLoadQueryFont (disp, name);
666 733
667 if (!f) 734 if (!f)
668 return false; 735 return false;
669 736
670 char *new_name = get_property (f, XA_FONT, name); 737 char *new_name = get_property (f, XA_FONT, 0);
671 738
672 if (new_name) 739 if (new_name)
673 set_name (new_name); 740 set_name (new_name);
674 else 741 else
675 rxvt_warn ("font '%s' has no FONT property, continuing without.", name); 742 rxvt_warn ("font '%s' has no FONT property, continuing without.\n", name);
676 743
677 XFreeFont (disp, f); 744 XFreeFont (disp, f);
678 f = 0; 745 f = 0;
679 } 746 }
680 747
681 if (prop.weight != rxvt_fontprop::unset) 748 if (prop.weight != rxvt_fontprop::unset)
682 { 749 {
683 replace_field (fname, name, 2, 0, 750 replace_field (&fname, name, 2, 0,
684 prop.weight < rxvt_fontprop::bold 751 prop.weight < rxvt_fontprop::bold
685 ? "medium" : "bold"); 752 ? "medium" : "bold");
686 set_name (strdup (fname)); 753 set_name (fname);
687 } 754 }
688 755
689 if (prop.slant != rxvt_fontprop::unset) 756 if (prop.slant != rxvt_fontprop::unset)
690 { 757 {
691 replace_field (fname, name, 3, 0, 758 replace_field (&fname, name, 3, 0,
692 prop.slant < rxvt_fontprop::italic 759 prop.slant < rxvt_fontprop::italic
693 ? "r" : "i"); // TODO: handle "o"blique, too 760 ? "r" : "i"); // TODO: handle "o"blique, too
694 set_name (strdup (fname)); 761 set_name (fname);
695 } 762 }
696 } 763 }
697 764
698 sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset 765 sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset
699 ? 0 : prop.height); 766 ? 0 : prop.height);
… …
724 font_weight *fonts = new font_weight[count]; 791 font_weight *fonts = new font_weight[count];
725 792
726 for (int i = 0; i < count; i++) 793 for (int i = 0; i < count; i++)
727 { 794 {
728 rxvt_fontprop p; 795 rxvt_fontprop p;
729 char fname[1024]; 796 char *fname;
730 797
731 int diff = 0; 798 int diff = 0;
732 799
733 if (replace_field (fname, list[i], 6, '0', field_str)) 800 if (replace_field (&fname, list[i], 6, '0', field_str))
734 diff += 10; // slightly penalize scalable fonts 801 diff += 10; // slightly penalize scalable fonts
802 else
803 {
804 free (fname);
735 else if (replace_field (fname, list[i], 11, '0', "0")) 805 if (replace_field (&fname, list[i], 11, '0', "0"))
736 diff += 300; // more heavily penalize what looks like scaled bitmap fonts 806 diff += 300; // more heavily penalize what looks like scaled bitmap fonts
807 }
737 808
738 if (!set_properties (p, fname)) 809 if (!set_properties (p, fname)
810 // also weed out too large fonts
811 || (prop.height != rxvt_fontprop::unset
812 && p.height > prop.height))
813 {
814 free (fname);
739 continue; 815 continue;
740 816 }
741 if (prop.height != rxvt_fontprop::unset
742 && p.height > prop.height) // weed out too large fonts
743 continue;
744 817
745 if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128; 818 if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128;
746 if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight); 819 if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight);
747 if (prop.slant != rxvt_fontprop::unset) diff += abs (prop.slant - p.slant); 820 if (prop.slant != rxvt_fontprop::unset) diff += abs (prop.slant - p.slant);
748 //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width); 821 //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width);
749 822
750 fonts[i].name = strdup (fname); 823 fonts[i].name = fname;
751 fonts[i].diff = diff; 824 fonts[i].diff = diff;
752 } 825 }
753 826
754 XFreeFontNames (list); 827 XFreeFontNames (list);
755 828
756 // this loop only iterates when the guessed font-size is too small 829 // this loop only iterates when the guessed font-size is too small
757 for (;;) 830 for (;;)
758 { 831 {
759 font_weight *best = fonts + count - 1; 832 font_weight *best = fonts;
760 833
761 for (font_weight *w = best; w-- > fonts; ) 834 for (font_weight *w = fonts + 1; w < fonts + count; w++)
762 if (w->diff <= best->diff) 835 if (w->diff < best->diff)
763 best = w; 836 best = w;
764 837
765 if (!best->name 838 if (!best->name
766 || !(f = XLoadQueryFont (disp, best->name))) 839 || !(f = XLoadQueryFont (disp, best->name)))
767 break; 840 break;
… …
787 return false; 860 return false;
788 861
789 char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0); 862 char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0);
790 char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0); 863 char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0);
791 864
865 cs = CS_UNKNOWN;
866
792 if (registry && encoding) 867 if (registry && encoding)
793 { 868 {
794 char charset[64]; 869 char charset[64];
795 snprintf (charset, 64, "%s-%s", registry, encoding); 870 snprintf (charset, 64, "%s-%s", registry, encoding);
796 871
797 cs = codeset_from_name (charset); 872 cs = codeset_from_name (charset);
798 } 873
799 else 874 if (cs == CS_UNKNOWN)
875 rxvt_warn ("%s: cannot deduce encoding from registry/encoding properties \"%s\", ignoring font.\n", name, charset);
800 { 876 }
877
878 free (registry);
879 free (encoding);
880
881 if (cs == CS_UNKNOWN)
882 {
801 const char *charset = get_property (f, XA_FONT, 0); 883 char *value = get_property (f, XA_FONT, 0);
884 const char *charset = value;
802 885
803 if (!charset) 886 if (!charset)
804 charset = name; 887 charset = name;
805 888
806 int count = 13; 889 int count = 13;
807 while (*charset) 890 while (*charset)
808 if (*charset++ == '-' && !--count) 891 if (*charset++ == '-' && !--count)
809 break; 892 break;
810 893
811 cs = codeset_from_name (charset); 894 cs = codeset_from_name (charset);
895 if (cs == CS_UNKNOWN)
896 rxvt_warn ("%s: cannot deduce encoding from font name property \"%s\", ignoring font.\n", name, charset);
897
898 free (value);
899 }
900
901 if (cs == CS_UNKNOWN)
812 } 902 {
813 903 clear ();
814 free (registry); 904 return false;
815 free (encoding); 905 }
816 906
817 if (cs == CS_UNICODE) 907 if (cs == CS_UNICODE)
818 cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font 908 cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font
819 909
820 encm = f->min_byte1 != 0 || f->max_byte1 != 0; 910 encm = f->min_byte1 != 0 || f->max_byte1 != 0;
… …
845 } 935 }
846#endif 936#endif
847 937
848 width = 1; 938 width = 1;
849 939
850 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 940 for (uint16_t *t = extent_test_chars; t < extent_test_chars + ecb_array_length (extent_test_chars); t++)
851 { 941 {
852 if (FROM_UNICODE (cs, *t) == NOCHAR) 942 if (FROM_UNICODE (cs, *t) == NOCHAR)
853 continue; 943 continue;
854 944
855 // ignore characters we wouldn't use anyways 945 // ignore characters we wouldn't use anyways
856 bool careful; 946 bool careful;
857 if (!has_char (*t, &prop, careful)) 947 if (!has_char (*t, &prop, careful))
858 continue; 948 continue;
859 949
860 XChar2b ch = { *t >> 8, *t }; 950 // the casts are needed in C++11 (see 8.5.1)
951 XChar2b ch = { (unsigned char)(*t >> 8), (unsigned char)*t };
861 952
862 XCharStruct g; 953 XCharStruct g;
863 int dir_ret, asc_ret, des_ret; 954 int dir_ret, asc_ret, des_ret;
864 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); 955 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);
865 956
… …
867 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; 958 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
868 959
869 if (width < g.width) width = g.width; 960 if (width < g.width) width = g.width;
870 } 961 }
871 962
872 if (cs == CS_UNKNOWN) 963#if 0 // do it per-character
964 if (prop && width > prop->width)
873 { 965 {
874 fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);
875
876 clear (); 966 clear ();
877 return false; 967 return false;
878 } 968 }
879
880#if 0 // do it per-character
881 if (prop && width > prop->width)
882 {
883 clear ();
884 return false;
885 }
886#endif 969#endif
887 970
888 return true; 971 return true;
889} 972}
890 973
… …
899} 982}
900 983
901bool 984bool
902rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const 985rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
903{ 986{
987 careful = false;
988
904 uint32_t ch = FROM_UNICODE (cs, unicode); 989 uint32_t ch = FROM_UNICODE (cs, unicode);
905 990
906 if (ch == NOCHAR) 991 if (ch == NOCHAR)
907 return false; 992 return false;
908 993
909 /* check wether the character exists in _this_ font. horrible. */ 994 /* check whether the character exists in _this_ font. horrible. */
910 XCharStruct *xcs; 995 XCharStruct *xcs;
911 996
912 if (encm) 997 if (encm)
913 { 998 {
914 unsigned char byte1 = ch >> 8; 999 unsigned char byte1 = ch >> 8;
… …
944 return false; 1029 return false;
945 1030
946 if (!prop || prop->width == rxvt_fontprop::unset) 1031 if (!prop || prop->width == rxvt_fontprop::unset)
947 return true; 1032 return true;
948 1033
949 // check wether character overlaps previous/next character 1034 // check whether character overlaps previous/next character
950 int w = xcs->rbearing - xcs->lbearing; 1035 int w = xcs->rbearing - xcs->lbearing;
951 int wcw = max (WCWIDTH (unicode), 1); 1036 int wcw = max (WCWIDTH (unicode), 1);
952 1037
953 careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw; 1038 careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw;
954 1039
… …
971 dTermDisplay; 1056 dTermDisplay;
972 dTermGC; 1057 dTermGC;
973 1058
974 bool slow = this->slow 1059 bool slow = this->slow
975 || width != term->fwidth 1060 || width != term->fwidth
976 || height != term->fheight; 1061 || height != term->fheight
1062 || ascent != f->ascent;
977 1063
978 int base = ascent; // sorry, incorrect: term->fbase; 1064 int base = ascent; // sorry, incorrect: term->fbase;
979 1065
980 XGCValues v; 1066 XGCValues v;
981 v.foreground = term->pix_colors[fg]; 1067 v.foreground = term->pix_colors[fg];
… …
1049 1135
1050///////////////////////////////////////////////////////////////////////////// 1136/////////////////////////////////////////////////////////////////////////////
1051 1137
1052#if XFT 1138#if XFT
1053 1139
1054struct rxvt_font_xft : rxvt_font { 1140struct rxvt_font_xft : rxvt_font
1141{
1055 rxvt_font_xft () { f = 0; } 1142 rxvt_font_xft ()
1143 {
1144 f = 0;
1145 }
1056 1146
1057 void clear (); 1147 void clear ();
1058 1148
1059 rxvt_fontprop properties (); 1149 rxvt_fontprop properties ();
1060 1150
… …
1128 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1218 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1129 1219
1130#if 0 // clipping unfortunately destroys our precious double-width-characters 1220#if 0 // clipping unfortunately destroys our precious double-width-characters
1131 // clip width, we can't do better, or can we? 1221 // clip width, we can't do better, or can we?
1132 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) 1222 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
1133 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop->width); 1223 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width);
1134#endif 1224#endif
1135 1225
1136 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch) 1226 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch)
1137 FcPatternAddBool (p, FC_MINSPACE, 1); 1227 FcPatternAddBool (p, FC_MINSPACE, 1);
1138 1228
… …
1150 int ftheight = 0; 1240 int ftheight = 0;
1151 bool success = true; 1241 bool success = true;
1152 1242
1153 for (;;) 1243 for (;;)
1154 { 1244 {
1245 p = FcPatternDuplicate (match);
1155 f = XftFontOpenPattern (disp, FcPatternDuplicate (match)); 1246 f = XftFontOpenPattern (disp, p);
1156 1247
1157 if (!f) 1248 if (!f)
1158 { 1249 {
1250 FcPatternDestroy (p);
1159 success = false; 1251 success = false;
1160 break; 1252 break;
1161 } 1253 }
1162 1254
1163 FT_Face face = XftLockFace (f); 1255 FT_Face face = XftLockFace (f);
… …
1171 1263
1172 XftUnlockFace (f); 1264 XftUnlockFace (f);
1173 1265
1174 int glheight = height; 1266 int glheight = height;
1175 1267
1176 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 1268 for (uint16_t *t = extent_test_chars; t < extent_test_chars + ecb_array_length (extent_test_chars); t++)
1177 { 1269 {
1178 FcChar16 ch = *t; 1270 FcChar16 ch = *t;
1179 1271
1180 if (cs != CS_UNICODE 1272 if (cs != CS_UNICODE
1181 && ch > 0x100 1273 && ch > 0x100
… …
1200 if (glheight < g.height - g.y) glheight = g.height - g.y; 1292 if (glheight < g.height - g.y) glheight = g.height - g.y;
1201 } 1293 }
1202 1294
1203 if (!width) 1295 if (!width)
1204 { 1296 {
1205 rxvt_warn ("unable to calculate font width for '%s', ignoring.\n", name); 1297 rxvt_warn ("unable to calculate font width for '%s', using max_advance_width.\n", name);
1206 1298 width = f->max_advance_width;
1207 XftFontClose (disp, f);
1208 f = 0;
1209
1210 success = false;
1211 break; 1299 break;
1212 } 1300 }
1213 1301
1214 if (prop.height == rxvt_fontprop::unset 1302 if (prop.height == rxvt_fontprop::unset
1215 || (height <= prop.height && glheight <= prop.height) 1303 || (height <= prop.height && glheight <= prop.height)
… …
1250bool 1338bool
1251rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const 1339rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
1252{ 1340{
1253 careful = false; 1341 careful = false;
1254 1342
1343 // handle non-bmp chars when text_t is 16 bit
1344#if ENABLE_COMBINING && !UNICODE_3
1345 if (ecb_expect_false (IS_COMPOSE (unicode)))
1346 if (compose_char *cc = rxvt_composite [unicode])
1347 if (cc->c2 == NOCHAR)
1348 unicode = cc->c1;
1349 else
1350 return false;
1351 else
1352 return false;
1353#endif
1354
1355 FcChar32 chr = unicode;
1356
1255 if (!XftCharExists (term->dpy, f, unicode)) 1357 if (!XftCharExists (term->dpy, f, chr))
1256 return false; 1358 return false;
1257 1359
1258 if (!prop || prop->width == rxvt_fontprop::unset) 1360 if (!prop || prop->width == rxvt_fontprop::unset)
1259 return true; 1361 return true;
1260 1362
1261 // check character against base font bounding box 1363 int wcw = max (WCWIDTH (chr), 1);
1262 FcChar32 ch = unicode; 1364
1263 XGlyphInfo g; 1365 XGlyphInfo g;
1264 XftTextExtents32 (term->dpy, f, &ch, 1, &g); 1366 XftTextExtents32 (term->dpy, f, &chr, 1, &g);
1265 1367
1266 int w = g.width - g.x; 1368 int w = g.width - g.x;
1267 int wcw = max (WCWIDTH (unicode), 1);
1268 1369
1269 careful = g.x > 0 || w > prop->width * wcw; 1370 careful = g.x > 0 || w > prop->width * wcw;
1270 1371
1271 if (careful && !OVERLAP_OK (w, wcw, prop)) 1372 if (careful && !OVERLAP_OK (w, wcw, prop))
1272 return false; 1373 return false;
… …
1281void 1382void
1282rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, 1383rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1283 const text_t *text, int len, 1384 const text_t *text, int len,
1284 int fg, int bg) 1385 int fg, int bg)
1285{ 1386{
1286 XGlyphInfo extents; 1387 XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len);
1287 XftGlyphSpec *enc = (XftGlyphSpec *)rxvt_temp_buf (len * sizeof (XftGlyphSpec));
1288 XftGlyphSpec *ep = enc; 1388 XftGlyphSpec *ep = enc;
1289 1389
1290 dTermDisplay; 1390 dTermDisplay;
1291 dTermGC; 1391 dTermGC;
1292 1392
1293 int w = term->fwidth * len; 1393 int w = term->fwidth * len;
1294 int h = term->fheight; 1394 int h = term->fheight;
1295 1395
1296 /* TODO: this logic needs some more thinking, since we no longer do pseudo-transparency. 1396 bool buffered = bg >= Color_transparent
1297 * Maybe make buffering into a resource flag? Compile time option doesn't seems like a 1397 && term->option (Opt_buffered);
1298 * good idea from the perspective of packaging for wide variety of user configs. 1398
1299 */
1300 bool buffered = true
1301#ifdef FORCE_UNBUFFERED_XFT
1302 && bg >= 0
1303#endif
1304 ;
1305 // cut trailing spaces 1399 // cut trailing spaces
1306 while (len && text [len - 1] == ' ') 1400 while (len && text [len - 1] == ' ')
1307 len--; 1401 len--;
1308 1402
1309 int x_ = buffered ? 0 : x; 1403 int x_ = buffered ? 0 : x;
1310 int y_ = buffered ? 0 : y; 1404 int y_ = buffered ? 0 : y;
1311 1405
1312 while (len) 1406 while (len)
1313 { 1407 {
1314 int cwidth = term->fwidth; 1408 int cwidth = term->fwidth;
1315 FcChar32 fc = *text++; len--; 1409 FcChar32 chr = *text++; len--;
1316 1410
1317 while (len && *text == NOCHAR) 1411 while (len && *text == NOCHAR)
1318 text++, len--, cwidth += term->fwidth; 1412 text++, len--, cwidth += term->fwidth;
1319 1413
1320 if (fc != ' ') // skip spaces 1414 if (chr != ' ') // skip spaces
1415 {
1416 // handle non-bmp chars when text_t is 16 bit
1417 #if ENABLE_COMBINING && !UNICODE_3
1418 if (ecb_expect_false (IS_COMPOSE (chr)))
1419 if (compose_char *cc = rxvt_composite [chr])
1420 if (cc->c2 == NOCHAR)
1421 chr = cc->c1;
1422 #endif
1423
1424 #if 0
1425 FT_UInt glyphs [decltype (exp)::max_size];
1426
1427 for (int i = 0; i < nchrs; ++i)
1428 glyphs [i] = XftCharIndex (disp, f, chrs [i]);
1429
1430 for (int i = 0; i < nchrs; ++i)
1321 { 1431 {
1432 XGlyphInfo ep;
1433 XftGlyphExtents (disp, f, glyphs+i, 1, &ep);
1434 printf ("gs %4x g %4x + %3d,%3d o %3d,%3d wh %3d,%3d\n", chrs[i],glyphs[i],ep.x,ep.y,ep.xOff,ep.yOff,ep.width,ep.height);
1435 }
1436 #endif
1437
1322 FT_UInt glyph = XftCharIndex (disp, f, fc); 1438 FT_UInt glyph = XftCharIndex (disp, f, chr);
1439 XGlyphInfo extents;
1323 XftGlyphExtents (disp, f, &glyph, 1, &extents); 1440 XftGlyphExtents (disp, f, &glyph, 1, &extents);
1324 1441
1325 ep->glyph = glyph; 1442 ep->glyph = glyph;
1326 ep->x = x_ + (cwidth - extents.xOff >> 1); 1443 ep->x = x_;
1327 ep->y = y_ + ascent; 1444 ep->y = y_ + ascent;
1328 1445
1329 if (extents.xOff == 0) 1446 // the xft font cell might differ from the terminal font cell,
1330 ep->x = x_ + cwidth; 1447 // in which case we use the average between the two.
1448 ep->x += extents.xOff ? cwidth - extents.xOff >> 1 : 0;
1331 1449
1450 // xft/freetype represent combining characters as characters with zero
1451 // width rendered over the previous character with some fonts, while
1452 // in other fonts, they are considered normal characters, while yet
1453 // in other fonts, they are shifted all over the place.
1454 // we handle the first two cases by keying off on xOff being 0
1455 // for zero-width chars. normally, we would add extents.xOff
1456 // of the base character here, but we don't have that, so we use cwidth.
1457 ep->x += extents.xOff ? 0 : cwidth;
1458
1332 ep++; 1459 ++ep;
1333 } 1460 }
1334 1461
1335 x_ += cwidth; 1462 x_ += cwidth;
1336 } 1463 }
1337 1464
1338 if (buffered) 1465 if (buffered)
1339 { 1466 {
1340 bool back_rendered = false;
1341 if (ep != enc) 1467 if (ep != enc)
1342 { 1468 {
1343 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); 1469 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1344 1470
1345#ifdef HAVE_BG_PIXMAP 1471#ifdef HAVE_IMG
1472 Picture dst = 0; // the only assignment is done conditionally in the following if condition
1473
1346 if (term->bgPixmap.pixmap) 1474 if (term->bg_img
1475 && (bg == Color_transparent || bg == Color_bg
1476 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2))))))
1347 { 1477 {
1348 Picture dst = 0; 1478 int src_x = x, src_y = y;
1349 1479
1350 if (bg >= 0 && term->pix_colors[bg].c.color.alpha < 0x0ff00) 1480 if (term->bg_flags & rxvt_term::BG_IS_TRANSPARENT)
1351 dst = XftDrawPicture (d2);
1352
1353 if (bg < 0 || dst != 0)
1354 { 1481 {
1355 int src_x = x, src_y = y ;
1356
1357 if (term->bgPixmap.is_parentOrigin ())
1358 {
1359 src_x += term->window_vt_x; 1482 src_x += term->window_vt_x;
1360 src_y += term->window_vt_y; 1483 src_y += term->window_vt_y;
1361 } 1484 }
1362 1485
1363 if (term->bgPixmap.pmap_width >= src_x+w 1486 if (term->bg_img->w >= src_x + w
1364 && term->bgPixmap.pmap_height >= src_y+h) 1487 && term->bg_img->h >= src_y + h)
1365 { 1488 {
1366 XCopyArea (disp, term->bgPixmap.pixmap, d2, gc, 1489 XCopyArea (disp, term->bg_img->pm, d2, gc,
1367 src_x, src_y, w, h, 0, 0); 1490 src_x, src_y, w, h, 0, 0);
1368 } 1491 }
1369 else 1492 else
1370 { 1493 {
1371 XGCValues gcv; 1494 XGCValues gcv;
1372 1495
1373 gcv.fill_style = FillTiled; 1496 gcv.fill_style = FillTiled;
1374 gcv.tile = term->bgPixmap.pixmap; 1497 gcv.tile = term->bg_img->pm;
1375 gcv.ts_x_origin = -src_x; 1498 gcv.ts_x_origin = -src_x;
1376 gcv.ts_y_origin = -src_y; 1499 gcv.ts_y_origin = -src_y;
1377 1500
1378 XChangeGC (disp, gc, 1501 XChangeGC (disp, gc,
1379 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle, 1502 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
1380 &gcv); 1503 &gcv);
1381 1504
1382 XFillRectangle (disp, d2, gc, 0, 0, w, h); 1505 XFillRectangle (disp, d2, gc, 0, 0, w, h);
1383 1506
1384 gcv.fill_style = FillSolid; 1507 gcv.fill_style = FillSolid;
1385 XChangeGC (disp, gc, GCFillStyle, &gcv); 1508 XChangeGC (disp, gc, GCFillStyle, &gcv);
1386 } 1509 }
1387 1510
1388 if (bg >= 0) 1511 if (dst)
1389 { 1512 {
1390 Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c); 1513 Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c);
1514
1515 // dst can only be set when bg >= 0
1391 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h); 1516 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h);
1392 }
1393
1394 back_rendered = true;
1395 } 1517 }
1396 } 1518 }
1519 else
1397#endif 1520#endif
1398
1399 if (bg >= 0 && !back_rendered)
1400 XftDrawRect (d2, &term->pix_colors[bg].c, 0, 0, w, h); 1521 XftDrawRect (d2, &term->pix_colors[bg >= 0 ? bg : Color_bg].c, 0, 0, w, h);
1401 1522
1402 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc); 1523 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);
1403 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y); 1524 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
1404 } 1525 }
1405 else 1526 else
… …
1433 prop.width = prop.height = prop.ascent = prop.weight = prop.slant 1554 prop.width = prop.height = prop.ascent = prop.weight = prop.slant
1434 = rxvt_fontprop::unset; 1555 = rxvt_fontprop::unset;
1435 force_prop = false; 1556 force_prop = false;
1436 1557
1437 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) 1558 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1438 FONT_UNREF (*i); 1559 (*i)->unref ();
1439 1560
1440 for (pagemap **p = fmap.begin (); p != fmap.end (); p++) 1561 for (pagemap **p = fmap.begin (); p != fmap.end (); p++)
1441 delete *p; 1562 delete *p;
1442 1563
1443 free (fontdesc); fontdesc = 0; 1564 free (fontdesc); fontdesc = 0;
… …
1445 fonts.clear (); 1566 fonts.clear ();
1446 1567
1447 fallback = fallback_fonts; 1568 fallback = fallback_fonts;
1448} 1569}
1449 1570
1571void
1572rxvt_fontset::prepare_font (rxvt_font *font, codeset cs)
1573{
1574 font->set_term (term);
1575
1576 font->cs = cs;
1577 font->loaded = false;
1578}
1579
1450rxvt_font * 1580rxvt_font *
1451rxvt_fontset::new_font (const char *name, codeset cs) 1581rxvt_fontset::new_font (const char *name, codeset cs)
1452{ 1582{
1453 rxvt_font *f; 1583 rxvt_font *f;
1454 1584
… …
1470 f = new rxvt_font_x11; 1600 f = new rxvt_font_x11;
1471 } 1601 }
1472 else 1602 else
1473 f = new rxvt_font_x11; 1603 f = new rxvt_font_x11;
1474 1604
1475 f->set_term (term);
1476 f->set_name (strdup (name)); 1605 f->set_name (strdup (name));
1477 1606 prepare_font (f, cs);
1478 f->cs = cs;
1479 f->loaded = false;
1480 1607
1481 return f; 1608 return f;
1482} 1609}
1483 1610
1484///////////////////////////////////////////////////////////////////////////// 1611/////////////////////////////////////////////////////////////////////////////
1612
1613void
1614rxvt_fontset::push_font (rxvt_font *font)
1615{
1616 // the fontCount index is reserved for the overflow font, it is only
1617 // necessary when we get fontCount or more fonts, as they cannot be
1618 // represented in the rendition.
1619 if (fonts.size () == fontCount)
1620 {
1621 rxvt_font *f = new rxvt_font_overflow (this);
1622
1623 prepare_font (f, CS_UNICODE);
1624 fonts.push_back (f);
1625 }
1626
1627 fonts.push_back (font);
1628}
1485 1629
1486void 1630void
1487rxvt_fontset::add_fonts (const char *desc) 1631rxvt_fontset::add_fonts (const char *desc)
1488{ 1632{
1489 if (desc) 1633 if (desc)
… …
1518 cs = codeset_from_name (spec + sizeof ("codeset=") - 1); 1662 cs = codeset_from_name (spec + sizeof ("codeset=") - 1);
1519 else 1663 else
1520 rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec); 1664 rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec);
1521 1665
1522 desc++; 1666 desc++;
1523 while (*desc <= ' ') desc++; 1667 while (*desc <= ' ' && *desc) desc++;
1524 } 1668 }
1525 1669
1526 end = strchr (desc, ','); 1670 end = strchr (desc, ',');
1527 if (!end) 1671 if (!end)
1528 end = desc + strlen (desc); 1672 end = desc + strlen (desc);
1529 1673
1530 if (end - desc < 511) 1674 if (end - desc < 511)
1531 { 1675 {
1532 strncpy (buf, desc, end - desc); 1676 memcpy (buf, desc, end - desc);
1533 buf[end - desc] = 0; 1677 buf[end - desc] = 0;
1534 1678
1535 fonts.push_back (new_font (buf, cs)); 1679 push_font (new_font (buf, cs));
1536 } 1680 }
1537 else 1681 else
1538 rxvt_warn ("fontset element too long (>511 bytes), ignored."); 1682 rxvt_warn ("fontset element too long (>511 bytes), ignored.\n");
1539 1683
1540 desc = end + 1; 1684 desc = end + 1;
1541 } 1685 }
1542 while (*end); 1686 while (*end);
1543 } 1687 }
… …
1568{ 1712{
1569 clear (); 1713 clear ();
1570 1714
1571 fontdesc = strdup (desc); 1715 fontdesc = strdup (desc);
1572 1716
1573 fonts.push_back (new_font (0, CS_UNICODE)); 1717 push_font (new_font (0, CS_UNICODE));
1574 realize_font (0); 1718 realize_font (0);
1575 1719
1576 add_fonts (desc); 1720 add_fonts (desc);
1577 1721
1578 return true; 1722 return true;
… …
1587 1731
1588 return -1; 1732 return -1;
1589} 1733}
1590 1734
1591int 1735int
1592rxvt_fontset::find_font (unicode_t unicode) 1736rxvt_fontset::find_font_idx (unicode_t unicode)
1593{ 1737{
1594 if (unicode >= 1<<20) 1738 // this limits fmap size. it has to accommodate COMPOSE_HI when UNICODE_3
1739 if (unicode > 0x1fffff)
1595 return 0; 1740 return 0;
1596 1741
1597 unicode_t hi = unicode >> 8; 1742 unicode_t hi = unicode >> 8;
1598 1743
1599 if (hi < fmap.size () 1744 if (hi < fmap.size ())
1600 && fmap[hi] 1745 if (pagemap *pm = fmap[hi])
1601 && (*fmap[hi])[unicode & 0xff] != 0xff) 1746 if ((*pm)[unicode & 0xff] != 0xff)
1602 return (*fmap[hi])[unicode & 0xff]; 1747 return (*pm)[unicode & 0xff];
1603 1748
1604 unsigned int i; 1749 unsigned int i;
1605 1750
1606 for (i = 0; i < fonts.size (); i++) 1751 for (i = 0; i < fonts.size (); i++)
1607 { 1752 {
… …
1623 goto next_font; 1768 goto next_font;
1624 1769
1625 bool careful; 1770 bool careful;
1626 if (f->has_char (unicode, &prop, careful)) 1771 if (f->has_char (unicode, &prop, careful))
1627 { 1772 {
1628 if (careful) 1773 i = (i << 1) | careful;
1629 i |= 128;
1630 1774
1631 goto found; 1775 goto found;
1632 } 1776 }
1633 1777
1634 next_font: 1778 next_font:
1635 if (i == fonts.size () - 1) 1779 if (i == fonts.size () - 1)
1636 { 1780 {
1781 // compose characters are handled by the default font, unless another font takes over
1782 // we do not go via the fallback list for speed reasons.
1783 if (IS_COMPOSE (unicode))
1784 return 0;
1785
1637 if (fallback->name) 1786 if (fallback->name)
1638 { 1787 {
1639 // search through the fallback list 1788 // search through the fallback list
1640 fonts.push_back (new_font (fallback->name, fallback->cs)); 1789 push_font (new_font (fallback->name, fallback->cs));
1641 fallback++; 1790 fallback++;
1642 } 1791 }
1643 else 1792 else
1644 { 1793 {
1645 // try to find a new font. 1794 // try to find a new font.
… …
1647 // way to configure this and xft is easier to hack in, 1796 // way to configure this and xft is easier to hack in,
1648 // while x11 has more framework in place already. 1797 // while x11 has more framework in place already.
1649 // TODO: this is a real resource hog, xft takes ages(?) 1798 // TODO: this is a real resource hog, xft takes ages(?)
1650#if XFT && USE_SLOW_LOOKUP 1799#if XFT && USE_SLOW_LOOKUP
1651 // grab the first xft font that seems suitable 1800 // grab the first xft font that seems suitable
1801 // TOOD: should go first for cellchar (spacing 110) then mono, then else
1652 FcPattern *p = FcPatternCreate (); 1802 FcPattern *p = FcPatternCreate ();
1653 1803
1654 FcCharSet *s = FcCharSetCreate (); 1804 FcCharSet *s = FcCharSetCreate ();
1655 FcCharSetAddChar (s, unicode); 1805 FcCharSetAddChar (s, unicode);
1656 FcPatternAddCharSet (p, FC_CHARSET, s); 1806 FcPatternAddCharSet (p, FC_CHARSET, s);
… …
1676 FcPatternDestroy (match); 1826 FcPatternDestroy (match);
1677 1827
1678 if (find_font (font) < 0) 1828 if (find_font (font) < 0)
1679 { 1829 {
1680 char fontname[4096]; 1830 char fontname[4096];
1681 sprintf (fontname, "xft:%-.4090s", font); 1831 snprintf (fontname, sizeof (fontname), "xft:%s", font);
1682 1832
1683 fonts.push_back (new_font (fontname, CS_UNICODE)); 1833 push_font (new_font (fontname, CS_UNICODE));
1684 } 1834 }
1685 1835
1686 free (font); 1836 free (font);
1687 } 1837 }
1688#endif 1838#endif
… …
1700 while (hi >= fmap.size ()) 1850 while (hi >= fmap.size ())
1701 fmap.push_back (0); 1851 fmap.push_back (0);
1702 1852
1703 if (!fmap[hi]) 1853 if (!fmap[hi])
1704 { 1854 {
1705 fmap[hi] = (pagemap *)new pagemap; 1855 fmap[hi] = new pagemap;
1706 memset (fmap[hi], 0xff, sizeof (pagemap)); 1856 memset (fmap[hi], 0xff, sizeof (pagemap));
1707 } 1857 }
1708 1858
1709 (*fmap[hi])[unicode & 0xff] = i; 1859 (*fmap[hi])[unicode & 0xff] = i;
1710 } 1860 }
1711 1861
1712 return i; 1862 return i;
1713} 1863}
1714 1864
1715
1716

Diff Legend

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