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.135 by root, Wed Jan 23 10:54:54 2008 UTC vs.
Revision 1.220 by root, Sat Jul 3 04:47:08 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
… …
22#include "../config.h" 22#include "../config.h"
23#include "rxvt.h" 23#include "rxvt.h"
24#include "rxvtutil.h" 24#include "rxvtutil.h"
25#include "rxvtfont.h" 25#include "rxvtfont.h"
26 26
27#include <cstdlib> 27#include <stdlib.h>
28 28
29#include <inttypes.h> 29#include <inttypes.h>
30
31#if XFT
32# include <fontconfig/fontconfig.h>
33#endif
30 34
31#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
32#define MAX_OVERLAP_ITALIC (8 + 3) // max. overlap for italic fonts 36#define MAX_OVERLAP_ITALIC (8 + 3) // max. overlap for italic fonts
33 37
34#define OVERLAP_OK(w,wcw,prop) ((w) <= ( \ 38#define OVERLAP_OK(w,wcw,prop) ((w) <= ( \
35 (prop)->slant >= rxvt_fontprop::italic \ 39 (prop)->slant >= rxvt_fontprop::italic \
36 ? ((prop)->width * (wcw) * MAX_OVERLAP_ITALIC + 7) >> 3 \ 40 ? ((prop)->width * (wcw) * MAX_OVERLAP_ITALIC + 7) >> 3 \
37 : ((prop)->width * (wcw) * MAX_OVERLAP_ROMAN + 7) >> 3 \ 41 : ((prop)->width * (wcw) * MAX_OVERLAP_ROMAN + 7) >> 3 \
38 )) 42 ))
39 43
40const struct rxvt_fallback_font { 44static const struct rxvt_fallback_font {
41 codeset cs; 45 codeset cs;
42 const char *name; 46 const char *name;
43} fallback_fonts[] = { 47} fallback_fonts[] = {
44 { CS_ISO8859_1, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-1" }, 48 { CS_ISO8859_1, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-1" },
45 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-15" }, 49 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-15" },
… …
79 83
80 // japanese 84 // japanese
81#if ENCODING_JP || ENCODING_JP_EXT 85#if ENCODING_JP || ENCODING_JP_EXT
82# if XFT 86# if XFT
83 // prefer xft for complex scripts 87 // prefer xft for complex scripts
88 { CS_JIS0208_1990_0, "xft:Sazanami Mincho:antialias=false" },
84 { CS_JIS0208_1990_0, "xft:Kochi Gothic:antialias=false" }, 89 { CS_JIS0208_1990_0, "xft:Kochi Gothic:antialias=false" },
85 { CS_JIS0208_1990_0, "xft:Sazanami Mincho:antialias=false" },
86 { CS_JIS0208_1990_0, "xft:Mincho:antialias=false" }, 90 { CS_JIS0208_1990_0, "xft:Mincho:antialias=false" },
87 { CS_JIS0208_1990_0, "xft::lang=ja:antialias=false" }, 91 { CS_JIS0208_1990_0, "xft::lang=ja:antialias=false" },
88# endif 92# endif
89 { CS_JIS0201_1976_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0201*-0" }, 93 { CS_JIS0201_1976_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0201*-0" },
90 { CS_JIS0208_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" }, 94 { CS_JIS0208_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" },
… …
128 { CS_KSC5601_1987_0, "xft:Baekmuk Gulim:antialias=false" }, 132 { CS_KSC5601_1987_0, "xft:Baekmuk Gulim:antialias=false" },
129 { CS_KSC5601_1987_0, "xft::lang=ko:antialias=false" }, 133 { CS_KSC5601_1987_0, "xft::lang=ko:antialias=false" },
130# endif 134# endif
131#endif 135#endif
132 136
133 { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" },
134 //{ 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.
135#if XFT 138#if XFT
136 { CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true" }, 139 { CS_UNICODE, "xft:DejaVu Sans Mono:antialias=false:autohint=true" },
137 { CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" }, 140 { CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" },
138 { CS_UNICODE, "xft:Andale Mono:antialias=false:autohint=false" }, 141 { CS_UNICODE, "xft:Andale Mono:antialias=false:autohint=false" },
139 { CS_UNICODE, "xft:Arial Unicode MS:antialias=false:autohint=false" }, 142 { CS_UNICODE, "xft:Arial Unicode MS:antialias=false:autohint=false" },
140 143
141 // FreeMono is usually uglier than x fonts, so try after the others 144 // FreeMono is usually uglier than x fonts, so try after the others
142 { CS_UNICODE, "xft:FreeMono:autohint=true" }, 145 { CS_UNICODE, "xft:FreeMono:autohint=true" },
143#endif 146#endif
144 147
… …
155 '0', '1', '8', 'a', 'd', 'x', 'm', 'y', 'g', 'W', 'X', '\'', '_', 158 '0', '1', '8', 'a', 'd', 'x', 'm', 'y', 'g', 'W', 'X', '\'', '_',
156 0x00cd, 0x00d5, 0x0114, 0x0177, 0x0643, // ÍÕĔŷﻙ 159 0x00cd, 0x00d5, 0x0114, 0x0177, 0x0643, // ÍÕĔŷﻙ
157 0x304c, 0x672c, // が本 160 0x304c, 0x672c, // が本
158}; 161};
159 162
160#define NUM_EXTENT_TEST_CHARS (sizeof (extent_test_chars) / sizeof (extent_test_chars[0]))
161
162#define dTermDisplay Display *disp = term->dpy 163#define dTermDisplay Display *disp = term->dpy
163#define dTermGC GC gc = term->gc 164#define dTermGC GC gc = term->gc
164 165
165///////////////////////////////////////////////////////////////////////////// 166/////////////////////////////////////////////////////////////////////////////
166 167
… …
216: name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset) 217: name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset)
217{ 218{
218} 219}
219 220
220void 221void
221rxvt_font::set_name (char *name) 222rxvt_font::set_name (char *name_)
222{ 223{
223 if (this->name == name) 224 if (name == name_)
224 return; 225 return;
225 226
226 if (this->name) free (this->name); // let the compiler optimize 227 if (name) free (name); // let the compiler optimize
227 this->name = name; 228 name = name_;
228} 229}
229 230
230void 231void
231rxvt_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
232{ 233{
… …
238 else if (color >= 0) 239 else if (color >= 0)
239 { 240 {
240#if XFT 241#if XFT
241 Picture dst; 242 Picture dst;
242 243
243# ifdef HAVE_BG_PIXMAP 244# ifdef HAVE_IMG
244 if (term->bgPixmap.pixmap 245 if (term->bg_img
245 && color >= 0 && !term->pix_colors[color].is_opaque () 246 && !term->pix_colors[color].is_opaque ()
246 && ((Picture dst = XftDrawPicture (d)))) 247 && ((dst = XftDrawPicture (d))))
247 { 248 {
248 XClearArea (disp, d, x, y, w, h, false); 249 XClearArea (disp, d, x, y, w, h, false);
249 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);
… …
261 } 262 }
262} 263}
263 264
264///////////////////////////////////////////////////////////////////////////// 265/////////////////////////////////////////////////////////////////////////////
265 266
266struct rxvt_font_default : rxvt_font { 267struct rxvt_font_default : rxvt_font
268{
267 struct rxvt_fontset *fs; 269 struct rxvt_fontset *fs;
268 270
269 rxvt_font_default (rxvt_fontset *fs) 271 rxvt_font_default (rxvt_fontset *fs)
270 : rxvt_font () 272 : rxvt_font ()
271 { 273 {
… …
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;
314#endif 316#endif
315 317
316 if (IS_COMPOSE (unicode)) 318 // we do not check for IS_COMPOSE here, as this would
317 return true; 319 // rob other fonts from taking over.
318 320
319 switch (unicode) 321 switch (unicode)
320 { 322 {
321 case ZERO_WIDTH_CHAR: 323 case ZERO_WIDTH_CHAR:
322 case NOCHAR: 324 case NOCHAR:
… …
343 345
344 XSetForeground (disp, gc, term->pix_colors[fg]); 346 XSetForeground (disp, gc, term->pix_colors[fg]);
345 347
346 while (len) 348 while (len)
347 { 349 {
350 const text_t *tp = text;
351 text_t t = *tp;
352
353 while (++text, --len && *text == NOCHAR)
354 ;
355
348#if ENABLE_COMBINING 356#if ENABLE_COMBINING
349 compose_char *cc; 357 compose_char *cc;
350#endif 358#endif
351 const text_t *tp = text;
352 text_t t = *tp;
353
354 while (++text, --len && *text == NOCHAR)
355 ;
356
357 int width = text - tp; 359 int width = text - tp;
358 int fwidth = term->fwidth * width; 360 int fwidth = term->fwidth * width;
359 361
360#ifdef BUILTIN_GLYPHS 362#ifdef BUILTIN_GLYPHS
361 if (0x2500 <= t && t <= 0x259f) 363 if (0x2500 <= t && t <= 0x259f)
… …
443#endif 445#endif
444#if ENABLE_COMBINING 446#if ENABLE_COMBINING
445 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) 447 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
446 { 448 {
447 min_it (width, 2); // we only support wcwidth up to 2 449 min_it (width, 2); // we only support wcwidth up to 2
448
449 text_t chrs[2]; 450 text_t chrs[2];
450 chrs [1] = NOCHAR; 451 chrs [1] = NOCHAR;
451 452
452 *chrs = cc->c1; 453 *chrs = cc->c1;
453 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)]; 454 rxvt_font *f1 = (*fs)[fs->find_font_idx (cc->c1)];
454 f1->draw (d, x, y, chrs, width, fg, bg); 455 f1->draw (d, x, y, chrs, width, fg, bg);
455 456
456 if (cc->c2 != NOCHAR) 457 if (cc->c2 != NOCHAR)
457 { 458 {
458 bool careful; 459 bool careful;
459 460
460 // prefer font of first character, for no good reasons 461 // prefer font of first character, for no good reasons
461 *chrs = cc->c2; 462 *chrs = cc->c2;
462 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful) 463 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful)
463 ? f1 464 ? f1
464 : (*fs)[fs->find_font (cc->c2)]; 465 : (*fs)[fs->find_font_idx (cc->c2)];
465 466
466 f2->draw (d, x, y, chrs, width, fg, Color_none); 467 f2->draw (d, x, y, chrs, width, fg, Color_none);
467 } 468 }
468 } 469 }
469#endif 470#endif
… …
473 case '\t': 474 case '\t':
474 case ZERO_WIDTH_CHAR: 475 case ZERO_WIDTH_CHAR:
475 case NOCHAR: 476 case NOCHAR:
476 break; 477 break;
477 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
478 default: 488 default:
479 XDrawRectangle (disp, d, gc, x + 2, y + 2, 489 XDrawRectangle (disp, d, gc, x + 2, y + 2,
480 fwidth - 4, term->fheight - 4); 490 fwidth - 4, term->fheight - 4);
481 } 491 }
482 492
483 x += fwidth; 493 x += fwidth;
484 } 494 }
485} 495}
486 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
487///////////////////////////////////////////////////////////////////////////// 552/////////////////////////////////////////////////////////////////////////////
488 553
489struct rxvt_font_x11 : rxvt_font { 554struct rxvt_font_x11 : rxvt_font
555{
490 rxvt_font_x11 () { f = 0; } 556 rxvt_font_x11 () { f = 0; }
491 557
492 void clear (); 558 void clear ();
493 559
494 rxvt_fontprop properties (); 560 rxvt_fontprop properties ();
… …
499 565
500 void draw (rxvt_drawable &d, int x, int y, 566 void draw (rxvt_drawable &d, int x, int y,
501 const text_t *text, int len, 567 const text_t *text, int len,
502 int fg, int bg); 568 int fg, int bg);
503 569
504 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
505 XFontStruct *f; 571 XFontStruct *f;
506 bool enc2b, encm; 572 bool enc2b, encm;
507 573
508 char *get_property (XFontStruct *f, Atom property, const char *repl) const; 574 char *get_property (XFontStruct *f, Atom property, const char *repl) const;
509 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);
… …
666 f = XLoadQueryFont (disp, name); 732 f = XLoadQueryFont (disp, name);
667 733
668 if (!f) 734 if (!f)
669 return false; 735 return false;
670 736
671 char *new_name = get_property (f, XA_FONT, name); 737 char *new_name = get_property (f, XA_FONT, 0);
672 738
673 if (new_name) 739 if (new_name)
674 set_name (new_name); 740 set_name (new_name);
675 else 741 else
676 rxvt_warn ("font '%s' has no FONT property, continuing without.", name); 742 rxvt_warn ("font '%s' has no FONT property, continuing without.\n", name);
677 743
678 XFreeFont (disp, f); 744 XFreeFont (disp, f);
679 f = 0; 745 f = 0;
680 } 746 }
681 747
… …
738 free (fname); 804 free (fname);
739 if (replace_field (&fname, list[i], 11, '0', "0")) 805 if (replace_field (&fname, list[i], 11, '0', "0"))
740 diff += 300; // more heavily penalize what looks like scaled bitmap fonts 806 diff += 300; // more heavily penalize what looks like scaled bitmap fonts
741 } 807 }
742 808
743 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);
744 continue; 815 continue;
745 816 }
746 if (prop.height != rxvt_fontprop::unset
747 && p.height > prop.height) // weed out too large fonts
748 continue;
749 817
750 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;
751 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);
752 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);
753 //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);
… …
759 XFreeFontNames (list); 827 XFreeFontNames (list);
760 828
761 // 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
762 for (;;) 830 for (;;)
763 { 831 {
764 font_weight *best = fonts + count - 1; 832 font_weight *best = fonts;
765 833
766 for (font_weight *w = best; w-- > fonts; ) 834 for (font_weight *w = fonts + 1; w < fonts + count; w++)
767 if (w->diff <= best->diff) 835 if (w->diff < best->diff)
768 best = w; 836 best = w;
769 837
770 if (!best->name 838 if (!best->name
771 || !(f = XLoadQueryFont (disp, best->name))) 839 || !(f = XLoadQueryFont (disp, best->name)))
772 break; 840 break;
… …
792 return false; 860 return false;
793 861
794 char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0); 862 char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0);
795 char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0); 863 char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0);
796 864
865 cs = CS_UNKNOWN;
866
797 if (registry && encoding) 867 if (registry && encoding)
798 { 868 {
799 char charset[64]; 869 char charset[64];
800 snprintf (charset, 64, "%s-%s", registry, encoding); 870 snprintf (charset, 64, "%s-%s", registry, encoding);
801 871
802 cs = codeset_from_name (charset); 872 cs = codeset_from_name (charset);
803 } 873
804 else 874 if (cs == CS_UNKNOWN)
875 rxvt_warn ("%s: cannot deduce encoding from registry/encoding properties \"%s\", ignoring font.\n", name, charset);
805 { 876 }
877
878 free (registry);
879 free (encoding);
880
881 if (cs == CS_UNKNOWN)
882 {
806 const char *charset = get_property (f, XA_FONT, 0); 883 char *value = get_property (f, XA_FONT, 0);
884 const char *charset = value;
807 885
808 if (!charset) 886 if (!charset)
809 charset = name; 887 charset = name;
810 888
811 int count = 13; 889 int count = 13;
812 while (*charset) 890 while (*charset)
813 if (*charset++ == '-' && !--count) 891 if (*charset++ == '-' && !--count)
814 break; 892 break;
815 893
816 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)
817 } 902 {
818 903 clear ();
819 free (registry); 904 return false;
820 free (encoding); 905 }
821 906
822 if (cs == CS_UNICODE) 907 if (cs == CS_UNICODE)
823 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
824 909
825 encm = f->min_byte1 != 0 || f->max_byte1 != 0; 910 encm = f->min_byte1 != 0 || f->max_byte1 != 0;
… …
850 } 935 }
851#endif 936#endif
852 937
853 width = 1; 938 width = 1;
854 939
855 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++)
856 { 941 {
857 if (FROM_UNICODE (cs, *t) == NOCHAR) 942 if (FROM_UNICODE (cs, *t) == NOCHAR)
858 continue; 943 continue;
859 944
860 // ignore characters we wouldn't use anyways 945 // ignore characters we wouldn't use anyways
861 bool careful; 946 bool careful;
862 if (!has_char (*t, &prop, careful)) 947 if (!has_char (*t, &prop, careful))
863 continue; 948 continue;
864 949
865 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 };
866 952
867 XCharStruct g; 953 XCharStruct g;
868 int dir_ret, asc_ret, des_ret; 954 int dir_ret, asc_ret, des_ret;
869 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); 955 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);
870 956
… …
872 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; 958 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
873 959
874 if (width < g.width) width = g.width; 960 if (width < g.width) width = g.width;
875 } 961 }
876 962
877 if (cs == CS_UNKNOWN) 963#if 0 // do it per-character
964 if (prop && width > prop->width)
878 { 965 {
879 fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);
880
881 clear (); 966 clear ();
882 return false; 967 return false;
883 } 968 }
884
885#if 0 // do it per-character
886 if (prop && width > prop->width)
887 {
888 clear ();
889 return false;
890 }
891#endif 969#endif
892 970
893 return true; 971 return true;
894} 972}
895 973
… …
904} 982}
905 983
906bool 984bool
907rxvt_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
908{ 986{
987 careful = false;
988
909 uint32_t ch = FROM_UNICODE (cs, unicode); 989 uint32_t ch = FROM_UNICODE (cs, unicode);
910 990
911 if (ch == NOCHAR) 991 if (ch == NOCHAR)
912 return false; 992 return false;
913 993
914 /* check wether the character exists in _this_ font. horrible. */ 994 /* check whether the character exists in _this_ font. horrible. */
915 XCharStruct *xcs; 995 XCharStruct *xcs;
916 996
917 if (encm) 997 if (encm)
918 { 998 {
919 unsigned char byte1 = ch >> 8; 999 unsigned char byte1 = ch >> 8;
… …
949 return false; 1029 return false;
950 1030
951 if (!prop || prop->width == rxvt_fontprop::unset) 1031 if (!prop || prop->width == rxvt_fontprop::unset)
952 return true; 1032 return true;
953 1033
954 // check wether character overlaps previous/next character 1034 // check whether character overlaps previous/next character
955 int w = xcs->rbearing - xcs->lbearing; 1035 int w = xcs->rbearing - xcs->lbearing;
956 int wcw = max (WCWIDTH (unicode), 1); 1036 int wcw = max (WCWIDTH (unicode), 1);
957 1037
958 careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw; 1038 careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw;
959 1039
… …
976 dTermDisplay; 1056 dTermDisplay;
977 dTermGC; 1057 dTermGC;
978 1058
979 bool slow = this->slow 1059 bool slow = this->slow
980 || width != term->fwidth 1060 || width != term->fwidth
981 || height != term->fheight; 1061 || height != term->fheight
1062 || ascent != f->ascent;
982 1063
983 int base = ascent; // sorry, incorrect: term->fbase; 1064 int base = ascent; // sorry, incorrect: term->fbase;
984 1065
985 XGCValues v; 1066 XGCValues v;
986 v.foreground = term->pix_colors[fg]; 1067 v.foreground = term->pix_colors[fg];
… …
1054 1135
1055///////////////////////////////////////////////////////////////////////////// 1136/////////////////////////////////////////////////////////////////////////////
1056 1137
1057#if XFT 1138#if XFT
1058 1139
1059struct rxvt_font_xft : rxvt_font { 1140struct rxvt_font_xft : rxvt_font
1141{
1142#if XFT_CHAR_CACHE
1143 // we cache the qascii range xoffsets in the name of speed,
1144 // expecting terminals to deal mostly with these characters
1145 // we also assume the xoff always fits into uint8_t,
1146 // which is questionable, but let's see...
1147 // also, it is uncomfortably big, due to the uints.
1148 enum { char_cache_min = 0x20, char_cache_max = 0x7e };
1149 uint8_t xoff_cache [char_cache_max - char_cache_min + 1];
1150 FT_UInt glyph_cache [char_cache_max - char_cache_min + 1];
1151#endif
1152
1060 rxvt_font_xft () { f = 0; } 1153 rxvt_font_xft ()
1154 {
1155 f = 0;
1156 }
1061 1157
1062 void clear (); 1158 void clear ();
1063 1159
1064 rxvt_fontprop properties (); 1160 rxvt_fontprop properties ();
1065 1161
… …
1133 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1229 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1134 1230
1135#if 0 // clipping unfortunately destroys our precious double-width-characters 1231#if 0 // clipping unfortunately destroys our precious double-width-characters
1136 // clip width, we can't do better, or can we? 1232 // clip width, we can't do better, or can we?
1137 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) 1233 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
1138 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop->width); 1234 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width);
1139#endif 1235#endif
1140 1236
1141 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch) 1237 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch)
1142 FcPatternAddBool (p, FC_MINSPACE, 1); 1238 FcPatternAddBool (p, FC_MINSPACE, 1);
1143 1239
… …
1155 int ftheight = 0; 1251 int ftheight = 0;
1156 bool success = true; 1252 bool success = true;
1157 1253
1158 for (;;) 1254 for (;;)
1159 { 1255 {
1256 p = FcPatternDuplicate (match);
1160 f = XftFontOpenPattern (disp, FcPatternDuplicate (match)); 1257 f = XftFontOpenPattern (disp, p);
1161 1258
1162 if (!f) 1259 if (!f)
1163 { 1260 {
1261 FcPatternDestroy (p);
1164 success = false; 1262 success = false;
1165 break; 1263 break;
1166 } 1264 }
1167 1265
1168 FT_Face face = XftLockFace (f); 1266 FT_Face face = XftLockFace (f);
… …
1176 1274
1177 XftUnlockFace (f); 1275 XftUnlockFace (f);
1178 1276
1179 int glheight = height; 1277 int glheight = height;
1180 1278
1181 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 1279 for (uint16_t *t = extent_test_chars; t < extent_test_chars + ecb_array_length (extent_test_chars); t++)
1182 { 1280 {
1183 FcChar16 ch = *t; 1281 FcChar16 ch = *t;
1184 1282
1185 if (cs != CS_UNICODE 1283 if (cs != CS_UNICODE
1186 && ch > 0x100 1284 && ch > 0x100
… …
1205 if (glheight < g.height - g.y) glheight = g.height - g.y; 1303 if (glheight < g.height - g.y) glheight = g.height - g.y;
1206 } 1304 }
1207 1305
1208 if (!width) 1306 if (!width)
1209 { 1307 {
1210 rxvt_warn ("unable to calculate font width for '%s', ignoring.\n", name); 1308 rxvt_warn ("unable to calculate font width for '%s', using max_advance_width.\n", name);
1211 1309 width = f->max_advance_width;
1212 XftFontClose (disp, f);
1213 f = 0;
1214
1215 success = false;
1216 break; 1310 break;
1217 } 1311 }
1218 1312
1219 if (prop.height == rxvt_fontprop::unset 1313 if (prop.height == rxvt_fontprop::unset
1220 || (height <= prop.height && glheight <= prop.height) 1314 || (height <= prop.height && glheight <= prop.height)
… …
1247 clear (); 1341 clear ();
1248 success = false; 1342 success = false;
1249 } 1343 }
1250#endif 1344#endif
1251 1345
1346#if XFT_CHAR_CACHE
1347 // populate char cache
1348 for (FcChar16 ch = char_cache_min; ch <= char_cache_max; ++ch)
1349 {
1350 FT_UInt glyph = XftCharIndex (disp, f, ch);
1351 glyph_cache [ch - char_cache_min] = glyph;
1352
1353 XGlyphInfo g;
1354 XftGlyphExtents (disp, f, &glyph, 1, &g);
1355 xoff_cache [ch - char_cache_min] = g.xOff;
1356 }
1357#endif
1358
1252 return success; 1359 return success;
1253} 1360}
1254 1361
1255bool 1362bool
1256rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const 1363rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
1257{ 1364{
1258 careful = false; 1365 careful = false;
1259 1366
1367 // handle non-bmp chars when text_t is 16 bit
1368#if ENABLE_COMBINING && !UNICODE_3
1369 if (ecb_expect_false (IS_COMPOSE (unicode)))
1370 if (compose_char *cc = rxvt_composite [unicode])
1371 if (cc->c2 == NOCHAR)
1372 unicode = cc->c1;
1373 else
1374 return false;
1375 else
1376 return false;
1377#endif
1378
1379 FcChar32 chr = unicode;
1380
1260 if (!XftCharExists (term->dpy, f, unicode)) 1381 if (!XftCharExists (term->dpy, f, chr))
1261 return false; 1382 return false;
1262 1383
1263 if (!prop || prop->width == rxvt_fontprop::unset) 1384 if (!prop || prop->width == rxvt_fontprop::unset)
1264 return true; 1385 return true;
1265 1386
1266 // check character against base font bounding box 1387 int wcw = max (WCWIDTH (chr), 1);
1267 FcChar32 ch = unicode; 1388
1268 XGlyphInfo g; 1389 XGlyphInfo g;
1269 XftTextExtents32 (term->dpy, f, &ch, 1, &g); 1390 XftTextExtents32 (term->dpy, f, &chr, 1, &g);
1391
1392 int cwidth = prop->width * wcw;
1393
1394 // use same adjustments as in ->draw, see there
1395 g.x += g.xOff ? cwidth - g.xOff >> 1 : 0;
1396 g.x += g.xOff ? 0 : cwidth;
1270 1397
1271 int w = g.width - g.x; 1398 int w = g.width - g.x;
1272 int wcw = max (WCWIDTH (unicode), 1);
1273 1399
1274 careful = g.x > 0 || w > prop->width * wcw; 1400 careful = g.x > 0 || w > cwidth;
1275 1401
1276 if (careful && !OVERLAP_OK (w, wcw, prop)) 1402 if (careful && !OVERLAP_OK (w, wcw, prop))
1277 return false; 1403 return false;
1278 1404
1279 // this weeds out _totally_ broken fonts, or glyphs 1405 // this weeds out _totally_ broken fonts, or glyphs
… …
1286void 1412void
1287rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, 1413rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1288 const text_t *text, int len, 1414 const text_t *text, int len,
1289 int fg, int bg) 1415 int fg, int bg)
1290{ 1416{
1291 XGlyphInfo extents; 1417 XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len);
1292 XftGlyphSpec *enc = (XftGlyphSpec *)rxvt_temp_buf (len * sizeof (XftGlyphSpec));
1293 XftGlyphSpec *ep = enc; 1418 XftGlyphSpec *ep = enc;
1294 1419
1295 dTermDisplay; 1420 dTermDisplay;
1296 dTermGC; 1421 dTermGC;
1297 1422
1298 int w = term->fwidth * len; 1423 int w = term->fwidth * len;
1299 int h = term->fheight; 1424 int h = term->fheight;
1300 1425
1301 /*
1302 * Maybe make buffering into a resource flag? Compile time option doesn't seems like a
1303 * good idea from the perspective of packaging for wide variety of user configs.
1304 */
1305 bool buffered = bg >= Color_transparent; 1426 bool buffered = bg >= Color_transparent
1306#ifdef FORCE_UNBUFFERED_XFT 1427 && term->option (Opt_buffered);
1307 buffered = false;
1308#endif
1309 1428
1310 // cut trailing spaces 1429 // cut trailing spaces
1311 while (len && text [len - 1] == ' ') 1430 while (len && text [len - 1] == ' ')
1312 len--; 1431 len--;
1313 1432
… …
1315 int y_ = buffered ? 0 : y; 1434 int y_ = buffered ? 0 : y;
1316 1435
1317 while (len) 1436 while (len)
1318 { 1437 {
1319 int cwidth = term->fwidth; 1438 int cwidth = term->fwidth;
1320 FcChar32 fc = *text++; len--; 1439 FcChar32 chr = *text++; len--;
1321 1440
1322 while (len && *text == NOCHAR) 1441 while (len && *text == NOCHAR)
1323 text++, len--, cwidth += term->fwidth; 1442 text++, len--, cwidth += term->fwidth;
1324 1443
1325 if (fc != ' ') // skip spaces 1444 if (chr != ' ') // skip spaces
1445 {
1446 // handle non-bmp chars when text_t is 16 bit
1447 #if ENABLE_COMBINING && !UNICODE_3
1448 if (ecb_expect_false (IS_COMPOSE (chr)))
1449 if (compose_char *cc = rxvt_composite [chr])
1450 if (cc->c2 == NOCHAR)
1451 chr = cc->c1;
1452 #endif
1453
1454 #if 0
1455 FT_UInt glyphs [decltype (exp)::max_size];
1456
1457 for (int i = 0; i < nchrs; ++i)
1458 glyphs [i] = XftCharIndex (disp, f, chrs [i]);
1459
1460 for (int i = 0; i < nchrs; ++i)
1326 { 1461 {
1462 XGlyphInfo ep;
1463 XftGlyphExtents (disp, f, glyphs+i, 1, &ep);
1464 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);
1465 }
1466 #endif
1467
1468 FT_UInt glyph;
1469 int xOff;
1470
1471 #if XFT_CHAR_CACHE
1472 if (ecb_expect_true (IN_RANGE_INC (chr, char_cache_min, char_cache_max)))
1473 {
1474 glyph = glyph_cache [chr - char_cache_min];
1475 xOff = xoff_cache [chr - char_cache_min];
1476 }
1477 else
1478 #endif
1479 {
1327 FT_UInt glyph = XftCharIndex (disp, f, fc); 1480 glyph = XftCharIndex (disp, f, chr);
1481 XGlyphInfo extents;
1328 XftGlyphExtents (disp, f, &glyph, 1, &extents); 1482 XftGlyphExtents (disp, f, &glyph, 1, &extents);
1483 xOff = extents.xOff;
1484 }
1329 1485
1330 ep->glyph = glyph; 1486 ep->glyph = glyph;
1331 ep->x = x_ + (cwidth - extents.xOff >> 1); 1487 ep->x = x_;
1332 ep->y = y_ + ascent; 1488 ep->y = y_ + ascent;
1333 1489
1334 if (extents.xOff == 0) 1490 // the xft font cell might differ from the terminal font cell,
1491 // in which case we use the average between the two.
1492 ep->x += xOff ? cwidth - xOff >> 1 : 0;
1493
1494 // xft/freetype represent combining characters as characters with zero
1495 // width rendered over the previous character with some fonts, while
1496 // in other fonts, they are considered normal characters, while yet
1497 // in other fonts, they are shifted all over the place.
1498 // we handle the first two cases by keying off on xOff being 0
1499 // for zero-width chars. normally, we would add extents.xOff
1500 // of the base character here, but we don't have that, so we use cwidth.
1335 ep->x = x_ + cwidth; 1501 ep->x += xOff ? 0 : cwidth;
1336 1502
1337 ep++; 1503 ++ep;
1338 } 1504 }
1339 1505
1340 x_ += cwidth; 1506 x_ += cwidth;
1341 } 1507 }
1342 1508
1343 if (buffered) 1509 if (buffered)
1344 { 1510 {
1345 if (ep != enc) 1511 if (ep != enc)
1346 { 1512 {
1347 bool back_rendered = false;
1348 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); 1513 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1349 1514
1350#ifdef HAVE_BG_PIXMAP 1515#ifdef HAVE_IMG
1516 Picture dst = 0; // the only assignment is done conditionally in the following if condition
1351 1517
1352 if (term->bgPixmap.pixmap 1518 if (term->bg_img
1353 && !(bg >= 0 && term->pix_colors[bg].is_opaque ())) 1519 && (bg == Color_transparent || bg == Color_bg
1520 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2))))))
1354 { 1521 {
1355 Picture dst = XftDrawPicture (d2);
1356
1357 int src_x = x, src_y = y; 1522 int src_x = x, src_y = y;
1358 1523
1359 if (term->bgPixmap.is_parentOrigin ()) 1524 if (term->bg_flags & rxvt_term::BG_IS_TRANSPARENT)
1360 { 1525 {
1361 src_x += term->window_vt_x; 1526 src_x += term->window_vt_x;
1362 src_y += term->window_vt_y; 1527 src_y += term->window_vt_y;
1363 } 1528 }
1364 1529
1365 if (term->bgPixmap.pmap_width >= src_x+w 1530 if (term->bg_img->w >= src_x + w
1366 && term->bgPixmap.pmap_height >= src_y+h) 1531 && term->bg_img->h >= src_y + h)
1367 { 1532 {
1368 XCopyArea (disp, term->bgPixmap.pixmap, d2, gc, 1533 XCopyArea (disp, term->bg_img->pm, d2, gc,
1369 src_x, src_y, w, h, 0, 0); 1534 src_x, src_y, w, h, 0, 0);
1370 } 1535 }
1371 else 1536 else
1372 { 1537 {
1373 XGCValues gcv; 1538 XGCValues gcv;
1374 1539
1375 gcv.fill_style = FillTiled; 1540 gcv.fill_style = FillTiled;
1376 gcv.tile = term->bgPixmap.pixmap; 1541 gcv.tile = term->bg_img->pm;
1377 gcv.ts_x_origin = -src_x; 1542 gcv.ts_x_origin = -src_x;
1378 gcv.ts_y_origin = -src_y; 1543 gcv.ts_y_origin = -src_y;
1379 1544
1380 XChangeGC (disp, gc, 1545 XChangeGC (disp, gc,
1381 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle, 1546 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
… …
1385 1550
1386 gcv.fill_style = FillSolid; 1551 gcv.fill_style = FillSolid;
1387 XChangeGC (disp, gc, GCFillStyle, &gcv); 1552 XChangeGC (disp, gc, GCFillStyle, &gcv);
1388 } 1553 }
1389 1554
1390 if (bg >= 0 && dst) // colour must be (and is) non-opaque here 1555 if (dst)
1391 { 1556 {
1392 Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c); 1557 Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c);
1558
1559 // dst can only be set when bg >= 0
1393 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h); 1560 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h);
1394 } 1561 }
1395
1396 back_rendered = true;
1397 } 1562 }
1563 else
1398#endif 1564#endif
1399
1400 if (!back_rendered)
1401 XftDrawRect (d2, &term->pix_colors[bg < 0 ? Color_bg : bg].c, 0, 0, w, h); 1565 XftDrawRect (d2, &term->pix_colors[bg >= 0 ? bg : Color_bg].c, 0, 0, w, h);
1402 1566
1403 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc); 1567 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);
1404 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y); 1568 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
1405 } 1569 }
1406 else 1570 else
… …
1434 prop.width = prop.height = prop.ascent = prop.weight = prop.slant 1598 prop.width = prop.height = prop.ascent = prop.weight = prop.slant
1435 = rxvt_fontprop::unset; 1599 = rxvt_fontprop::unset;
1436 force_prop = false; 1600 force_prop = false;
1437 1601
1438 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) 1602 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1439 FONT_UNREF (*i); 1603 (*i)->unref ();
1440 1604
1441 for (pagemap **p = fmap.begin (); p != fmap.end (); p++) 1605 for (pagemap **p = fmap.begin (); p != fmap.end (); p++)
1442 delete *p; 1606 delete *p;
1443 1607
1444 free (fontdesc); fontdesc = 0; 1608 free (fontdesc); fontdesc = 0;
… …
1446 fonts.clear (); 1610 fonts.clear ();
1447 1611
1448 fallback = fallback_fonts; 1612 fallback = fallback_fonts;
1449} 1613}
1450 1614
1615void
1616rxvt_fontset::prepare_font (rxvt_font *font, codeset cs)
1617{
1618 font->set_term (term);
1619
1620 font->cs = cs;
1621 font->loaded = false;
1622}
1623
1451rxvt_font * 1624rxvt_font *
1452rxvt_fontset::new_font (const char *name, codeset cs) 1625rxvt_fontset::new_font (const char *name, codeset cs)
1453{ 1626{
1454 rxvt_font *f; 1627 rxvt_font *f;
1455 1628
… …
1471 f = new rxvt_font_x11; 1644 f = new rxvt_font_x11;
1472 } 1645 }
1473 else 1646 else
1474 f = new rxvt_font_x11; 1647 f = new rxvt_font_x11;
1475 1648
1476 f->set_term (term);
1477 f->set_name (strdup (name)); 1649 f->set_name (strdup (name));
1478 1650 prepare_font (f, cs);
1479 f->cs = cs;
1480 f->loaded = false;
1481 1651
1482 return f; 1652 return f;
1483} 1653}
1484 1654
1485///////////////////////////////////////////////////////////////////////////// 1655/////////////////////////////////////////////////////////////////////////////
1656
1657void
1658rxvt_fontset::push_font (rxvt_font *font)
1659{
1660 // the fontCount index is reserved for the overflow font, it is only
1661 // necessary when we get fontCount or more fonts, as they cannot be
1662 // represented in the rendition.
1663 if (fonts.size () == fontCount)
1664 {
1665 rxvt_font *f = new rxvt_font_overflow (this);
1666
1667 prepare_font (f, CS_UNICODE);
1668 fonts.push_back (f);
1669 }
1670
1671 fonts.push_back (font);
1672}
1486 1673
1487void 1674void
1488rxvt_fontset::add_fonts (const char *desc) 1675rxvt_fontset::add_fonts (const char *desc)
1489{ 1676{
1490 if (desc) 1677 if (desc)
… …
1519 cs = codeset_from_name (spec + sizeof ("codeset=") - 1); 1706 cs = codeset_from_name (spec + sizeof ("codeset=") - 1);
1520 else 1707 else
1521 rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec); 1708 rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec);
1522 1709
1523 desc++; 1710 desc++;
1524 while (*desc <= ' ') desc++; 1711 while (*desc <= ' ' && *desc) desc++;
1525 } 1712 }
1526 1713
1527 end = strchr (desc, ','); 1714 end = strchr (desc, ',');
1528 if (!end) 1715 if (!end)
1529 end = desc + strlen (desc); 1716 end = desc + strlen (desc);
… …
1531 if (end - desc < 511) 1718 if (end - desc < 511)
1532 { 1719 {
1533 memcpy (buf, desc, end - desc); 1720 memcpy (buf, desc, end - desc);
1534 buf[end - desc] = 0; 1721 buf[end - desc] = 0;
1535 1722
1536 fonts.push_back (new_font (buf, cs)); 1723 push_font (new_font (buf, cs));
1537 } 1724 }
1538 else 1725 else
1539 rxvt_warn ("fontset element too long (>511 bytes), ignored."); 1726 rxvt_warn ("fontset element too long (>511 bytes), ignored.\n");
1540 1727
1541 desc = end + 1; 1728 desc = end + 1;
1542 } 1729 }
1543 while (*end); 1730 while (*end);
1544 } 1731 }
… …
1569{ 1756{
1570 clear (); 1757 clear ();
1571 1758
1572 fontdesc = strdup (desc); 1759 fontdesc = strdup (desc);
1573 1760
1574 fonts.push_back (new_font (0, CS_UNICODE)); 1761 push_font (new_font (0, CS_UNICODE));
1575 realize_font (0); 1762 realize_font (0);
1576 1763
1577 add_fonts (desc); 1764 add_fonts (desc);
1578 1765
1579 return true; 1766 return true;
… …
1588 1775
1589 return -1; 1776 return -1;
1590} 1777}
1591 1778
1592int 1779int
1593rxvt_fontset::find_font (unicode_t unicode) 1780rxvt_fontset::find_font_idx (unicode_t unicode)
1594{ 1781{
1595 if (unicode >= 1<<20) 1782 // this limits fmap size. it has to accommodate COMPOSE_HI when UNICODE_3
1783 if (unicode > 0x1fffff)
1596 return 0; 1784 return 0;
1597 1785
1598 unicode_t hi = unicode >> 8; 1786 unicode_t hi = unicode >> 8;
1599 1787
1600 if (hi < fmap.size () 1788 if (hi < fmap.size ())
1601 && fmap[hi] 1789 if (pagemap *pm = fmap[hi])
1602 && (*fmap[hi])[unicode & 0xff] != 0xff) 1790 if ((*pm)[unicode & 0xff] != 0xff)
1603 return (*fmap[hi])[unicode & 0xff]; 1791 return (*pm)[unicode & 0xff];
1604 1792
1605 unsigned int i; 1793 unsigned int i;
1606 1794
1607 for (i = 0; i < fonts.size (); i++) 1795 for (i = 0; i < fonts.size (); i++)
1608 { 1796 {
… …
1624 goto next_font; 1812 goto next_font;
1625 1813
1626 bool careful; 1814 bool careful;
1627 if (f->has_char (unicode, &prop, careful)) 1815 if (f->has_char (unicode, &prop, careful))
1628 { 1816 {
1629 if (careful) 1817 i = (i << 1) | careful;
1630 i |= 128;
1631 1818
1632 goto found; 1819 goto found;
1633 } 1820 }
1634 1821
1635 next_font: 1822 next_font:
1636 if (i == fonts.size () - 1) 1823 if (i == fonts.size () - 1)
1637 { 1824 {
1825 // compose characters are handled by the default font, unless another font takes over
1826 // we do not go via the fallback list for speed reasons.
1827 if (IS_COMPOSE (unicode))
1828 return 0;
1829
1638 if (fallback->name) 1830 if (fallback->name)
1639 { 1831 {
1640 // search through the fallback list 1832 // search through the fallback list
1641 fonts.push_back (new_font (fallback->name, fallback->cs)); 1833 push_font (new_font (fallback->name, fallback->cs));
1642 fallback++; 1834 fallback++;
1643 } 1835 }
1644 else 1836 else
1645 { 1837 {
1646 // try to find a new font. 1838 // try to find a new font.
… …
1648 // way to configure this and xft is easier to hack in, 1840 // way to configure this and xft is easier to hack in,
1649 // while x11 has more framework in place already. 1841 // while x11 has more framework in place already.
1650 // TODO: this is a real resource hog, xft takes ages(?) 1842 // TODO: this is a real resource hog, xft takes ages(?)
1651#if XFT && USE_SLOW_LOOKUP 1843#if XFT && USE_SLOW_LOOKUP
1652 // grab the first xft font that seems suitable 1844 // grab the first xft font that seems suitable
1845 // TOOD: should go first for cellchar (spacing 110) then mono, then else
1653 FcPattern *p = FcPatternCreate (); 1846 FcPattern *p = FcPatternCreate ();
1654 1847
1655 FcCharSet *s = FcCharSetCreate (); 1848 FcCharSet *s = FcCharSetCreate ();
1656 FcCharSetAddChar (s, unicode); 1849 FcCharSetAddChar (s, unicode);
1657 FcPatternAddCharSet (p, FC_CHARSET, s); 1850 FcPatternAddCharSet (p, FC_CHARSET, s);
… …
1677 FcPatternDestroy (match); 1870 FcPatternDestroy (match);
1678 1871
1679 if (find_font (font) < 0) 1872 if (find_font (font) < 0)
1680 { 1873 {
1681 char fontname[4096]; 1874 char fontname[4096];
1682 sprintf (fontname, "xft:%-.4090s", font); 1875 snprintf (fontname, sizeof (fontname), "xft:%s", font);
1683 1876
1684 fonts.push_back (new_font (fontname, CS_UNICODE)); 1877 push_font (new_font (fontname, CS_UNICODE));
1685 } 1878 }
1686 1879
1687 free (font); 1880 free (font);
1688 } 1881 }
1689#endif 1882#endif
… …
1701 while (hi >= fmap.size ()) 1894 while (hi >= fmap.size ())
1702 fmap.push_back (0); 1895 fmap.push_back (0);
1703 1896
1704 if (!fmap[hi]) 1897 if (!fmap[hi])
1705 { 1898 {
1706 fmap[hi] = (pagemap *)new pagemap; 1899 fmap[hi] = new pagemap;
1707 memset (fmap[hi], 0xff, sizeof (pagemap)); 1900 memset (fmap[hi], 0xff, sizeof (pagemap));
1708 } 1901 }
1709 1902
1710 (*fmap[hi])[unicode & 0xff] = i; 1903 (*fmap[hi])[unicode & 0xff] = i;
1711 } 1904 }
1712 1905
1713 return i; 1906 return i;
1714} 1907}
1715 1908
1716
1717

Diff Legend

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