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.146 by ayin, Sat Jan 26 14:24:43 2008 UTC vs.
Revision 1.214 by root, Sat Jun 19 09:47:41 2021 UTC

1/*----------------------------------------------------------------------* 1/*----------------------------------------------------------------------*
2 * File: rxvtfont.C 2 * File: rxvtfont.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * Copyright (c) 2003-2008 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:Bitstream Vera 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" },
… …
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 && !term->pix_colors[color].is_opaque () 246 && !term->pix_colors[color].is_opaque ()
246 && ((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
… …
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{
1060 rxvt_font_xft () { f = 0; } 1142 rxvt_font_xft ()
1143 {
1144 f = 0;
1145 }
1061 1146
1062 void clear (); 1147 void clear ();
1063 1148
1064 rxvt_fontprop properties (); 1149 rxvt_fontprop properties ();
1065 1150
… …
1133 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1218 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1134 1219
1135#if 0 // clipping unfortunately destroys our precious double-width-characters 1220#if 0 // clipping unfortunately destroys our precious double-width-characters
1136 // clip width, we can't do better, or can we? 1221 // clip width, we can't do better, or can we?
1137 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) 1222 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
1138 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop->width); 1223 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width);
1139#endif 1224#endif
1140 1225
1141 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch) 1226 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch)
1142 FcPatternAddBool (p, FC_MINSPACE, 1); 1227 FcPatternAddBool (p, FC_MINSPACE, 1);
1143 1228
… …
1155 int ftheight = 0; 1240 int ftheight = 0;
1156 bool success = true; 1241 bool success = true;
1157 1242
1158 for (;;) 1243 for (;;)
1159 { 1244 {
1245 p = FcPatternDuplicate (match);
1160 f = XftFontOpenPattern (disp, FcPatternDuplicate (match)); 1246 f = XftFontOpenPattern (disp, p);
1161 1247
1162 if (!f) 1248 if (!f)
1163 { 1249 {
1250 FcPatternDestroy (p);
1164 success = false; 1251 success = false;
1165 break; 1252 break;
1166 } 1253 }
1167 1254
1168 FT_Face face = XftLockFace (f); 1255 FT_Face face = XftLockFace (f);
… …
1176 1263
1177 XftUnlockFace (f); 1264 XftUnlockFace (f);
1178 1265
1179 int glheight = height; 1266 int glheight = height;
1180 1267
1181 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++)
1182 { 1269 {
1183 FcChar16 ch = *t; 1270 FcChar16 ch = *t;
1184 1271
1185 if (cs != CS_UNICODE 1272 if (cs != CS_UNICODE
1186 && ch > 0x100 1273 && ch > 0x100
… …
1205 if (glheight < g.height - g.y) glheight = g.height - g.y; 1292 if (glheight < g.height - g.y) glheight = g.height - g.y;
1206 } 1293 }
1207 1294
1208 if (!width) 1295 if (!width)
1209 { 1296 {
1210 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);
1211 1298 width = f->max_advance_width;
1212 XftFontClose (disp, f);
1213 f = 0;
1214
1215 success = false;
1216 break; 1299 break;
1217 } 1300 }
1218 1301
1219 if (prop.height == rxvt_fontprop::unset 1302 if (prop.height == rxvt_fontprop::unset
1220 || (height <= prop.height && glheight <= prop.height) 1303 || (height <= prop.height && glheight <= prop.height)
… …
1255bool 1338bool
1256rxvt_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
1257{ 1340{
1258 careful = false; 1341 careful = false;
1259 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
1260 if (!XftCharExists (term->dpy, f, unicode)) 1357 if (!XftCharExists (term->dpy, f, chr))
1261 return false; 1358 return false;
1262 1359
1263 if (!prop || prop->width == rxvt_fontprop::unset) 1360 if (!prop || prop->width == rxvt_fontprop::unset)
1264 return true; 1361 return true;
1265 1362
1266 // check character against base font bounding box 1363 int wcw = max (WCWIDTH (chr), 1);
1267 FcChar32 ch = unicode; 1364
1268 XGlyphInfo g; 1365 XGlyphInfo g;
1269 XftTextExtents32 (term->dpy, f, &ch, 1, &g); 1366 XftTextExtents32 (term->dpy, f, &chr, 1, &g);
1270 1367
1271 int w = g.width - g.x; 1368 int w = g.width - g.x;
1272 int wcw = max (WCWIDTH (unicode), 1);
1273 1369
1274 careful = g.x > 0 || w > prop->width * wcw; 1370 careful = g.x > 0 || w > prop->width * wcw;
1275 1371
1276 if (careful && !OVERLAP_OK (w, wcw, prop)) 1372 if (careful && !OVERLAP_OK (w, wcw, prop))
1277 return false; 1373 return false;
… …
1286void 1382void
1287rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, 1383rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1288 const text_t *text, int len, 1384 const text_t *text, int len,
1289 int fg, int bg) 1385 int fg, int bg)
1290{ 1386{
1291 XGlyphInfo extents; 1387 XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len);
1292 XftGlyphSpec *enc = (XftGlyphSpec *)rxvt_temp_buf (len * sizeof (XftGlyphSpec));
1293 XftGlyphSpec *ep = enc; 1388 XftGlyphSpec *ep = enc;
1294 1389
1295 dTermDisplay; 1390 dTermDisplay;
1296 dTermGC; 1391 dTermGC;
1297 1392
1298 int w = term->fwidth * len; 1393 int w = term->fwidth * len;
1299 int h = term->fheight; 1394 int h = term->fheight;
1300 1395
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 1396 bool buffered = bg >= Color_transparent
1306 && term->option (Opt_buffered); 1397 && term->option (Opt_buffered);
1307 1398
1308 // cut trailing spaces 1399 // cut trailing spaces
1309 while (len && text [len - 1] == ' ') 1400 while (len && text [len - 1] == ' ')
1310 len--; 1401 len--;
1311 1402
… …
1313 int y_ = buffered ? 0 : y; 1404 int y_ = buffered ? 0 : y;
1314 1405
1315 while (len) 1406 while (len)
1316 { 1407 {
1317 int cwidth = term->fwidth; 1408 int cwidth = term->fwidth;
1318 FcChar32 fc = *text++; len--; 1409 FcChar32 chr = *text++; len--;
1319 1410
1320 while (len && *text == NOCHAR) 1411 while (len && *text == NOCHAR)
1321 text++, len--, cwidth += term->fwidth; 1412 text++, len--, cwidth += term->fwidth;
1322 1413
1323 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)
1324 { 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
1325 FT_UInt glyph = XftCharIndex (disp, f, fc); 1438 FT_UInt glyph = XftCharIndex (disp, f, chr);
1439 XGlyphInfo extents;
1326 XftGlyphExtents (disp, f, &glyph, 1, &extents); 1440 XftGlyphExtents (disp, f, &glyph, 1, &extents);
1327 1441
1442 int xOff = extents.xOff ? extents.xOff : cwidth;
1443
1328 ep->glyph = glyph; 1444 ep->glyph = glyph;
1329 ep->x = x_ + (cwidth - extents.xOff >> 1); 1445 ep->x = x_;
1330 ep->y = y_ + ascent; 1446 ep->y = y_ + ascent;
1331 1447
1448 // the xft font cell might differ from the terminal font cell,
1449 // in which case we use the average between the two.
1332 if (extents.xOff == 0) 1450 if (extents.xOff)
1333 ep->x = x_ + cwidth; 1451 ep->x += extents.xOff ? cwidth - extents.xOff >> 1 : 0;
1334 1452
1453 // xft/freetype represent combining characters as characters with zero
1454 // width rendered over the previous character with some fonts, while
1455 // in other fonts, they are considered normal characters, while yet
1456 // in other fonts, they are shifted all over the place.
1457 // we handle the first two cases by keying off on xOff being 0
1458 // for zero-width chars. normally, we would add extents.xOff
1459 // of the base character here, but we don't have that, so we use cwidth.
1460 ep->x += extents.xOff ? 0 : cwidth;
1461
1335 ep++; 1462 ++ep;
1336 } 1463 }
1337 1464
1338 x_ += cwidth; 1465 x_ += cwidth;
1339 } 1466 }
1340 1467
… …
1342 { 1469 {
1343 if (ep != enc) 1470 if (ep != enc)
1344 { 1471 {
1345 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); 1472 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1346 1473
1347#ifdef HAVE_BG_PIXMAP 1474#ifdef HAVE_IMG
1348 Picture dst = 0; // the only assignment is done conditionally in the following if condition 1475 Picture dst = 0; // the only assignment is done conditionally in the following if condition
1349 1476
1350 if (term->bgPixmap.pixmap 1477 if (term->bg_img
1351 && (bg == Color_transparent || bg == Color_bg 1478 && (bg == Color_transparent || bg == Color_bg
1352 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2)))))) 1479 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2))))))
1353 { 1480 {
1354 int src_x = x, src_y = y; 1481 int src_x = x, src_y = y;
1355 1482
1356 if (term->bgPixmap.is_parentOrigin ()) 1483 if (term->bg_flags & rxvt_term::BG_IS_TRANSPARENT)
1357 { 1484 {
1358 src_x += term->window_vt_x; 1485 src_x += term->window_vt_x;
1359 src_y += term->window_vt_y; 1486 src_y += term->window_vt_y;
1360 } 1487 }
1361 1488
1362 if (term->bgPixmap.pmap_width >= src_x + w 1489 if (term->bg_img->w >= src_x + w
1363 && term->bgPixmap.pmap_height >= src_y + h) 1490 && term->bg_img->h >= src_y + h)
1364 { 1491 {
1365 XCopyArea (disp, term->bgPixmap.pixmap, d2, gc, 1492 XCopyArea (disp, term->bg_img->pm, d2, gc,
1366 src_x, src_y, w, h, 0, 0); 1493 src_x, src_y, w, h, 0, 0);
1367 } 1494 }
1368 else 1495 else
1369 { 1496 {
1370 XGCValues gcv; 1497 XGCValues gcv;
1371 1498
1372 gcv.fill_style = FillTiled; 1499 gcv.fill_style = FillTiled;
1373 gcv.tile = term->bgPixmap.pixmap; 1500 gcv.tile = term->bg_img->pm;
1374 gcv.ts_x_origin = -src_x; 1501 gcv.ts_x_origin = -src_x;
1375 gcv.ts_y_origin = -src_y; 1502 gcv.ts_y_origin = -src_y;
1376 1503
1377 XChangeGC (disp, gc, 1504 XChangeGC (disp, gc,
1378 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle, 1505 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
… …
1430 prop.width = prop.height = prop.ascent = prop.weight = prop.slant 1557 prop.width = prop.height = prop.ascent = prop.weight = prop.slant
1431 = rxvt_fontprop::unset; 1558 = rxvt_fontprop::unset;
1432 force_prop = false; 1559 force_prop = false;
1433 1560
1434 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) 1561 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1435 FONT_UNREF (*i); 1562 (*i)->unref ();
1436 1563
1437 for (pagemap **p = fmap.begin (); p != fmap.end (); p++) 1564 for (pagemap **p = fmap.begin (); p != fmap.end (); p++)
1438 delete *p; 1565 delete *p;
1439 1566
1440 free (fontdesc); fontdesc = 0; 1567 free (fontdesc); fontdesc = 0;
… …
1442 fonts.clear (); 1569 fonts.clear ();
1443 1570
1444 fallback = fallback_fonts; 1571 fallback = fallback_fonts;
1445} 1572}
1446 1573
1574void
1575rxvt_fontset::prepare_font (rxvt_font *font, codeset cs)
1576{
1577 font->set_term (term);
1578
1579 font->cs = cs;
1580 font->loaded = false;
1581}
1582
1447rxvt_font * 1583rxvt_font *
1448rxvt_fontset::new_font (const char *name, codeset cs) 1584rxvt_fontset::new_font (const char *name, codeset cs)
1449{ 1585{
1450 rxvt_font *f; 1586 rxvt_font *f;
1451 1587
… …
1467 f = new rxvt_font_x11; 1603 f = new rxvt_font_x11;
1468 } 1604 }
1469 else 1605 else
1470 f = new rxvt_font_x11; 1606 f = new rxvt_font_x11;
1471 1607
1472 f->set_term (term);
1473 f->set_name (strdup (name)); 1608 f->set_name (strdup (name));
1474 1609 prepare_font (f, cs);
1475 f->cs = cs;
1476 f->loaded = false;
1477 1610
1478 return f; 1611 return f;
1479} 1612}
1480 1613
1481///////////////////////////////////////////////////////////////////////////// 1614/////////////////////////////////////////////////////////////////////////////
1615
1616void
1617rxvt_fontset::push_font (rxvt_font *font)
1618{
1619 // the fontCount index is reserved for the overflow font, it is only
1620 // necessary when we get fontCount or more fonts, as they cannot be
1621 // represented in the rendition.
1622 if (fonts.size () == fontCount)
1623 {
1624 rxvt_font *f = new rxvt_font_overflow (this);
1625
1626 prepare_font (f, CS_UNICODE);
1627 fonts.push_back (f);
1628 }
1629
1630 fonts.push_back (font);
1631}
1482 1632
1483void 1633void
1484rxvt_fontset::add_fonts (const char *desc) 1634rxvt_fontset::add_fonts (const char *desc)
1485{ 1635{
1486 if (desc) 1636 if (desc)
… …
1515 cs = codeset_from_name (spec + sizeof ("codeset=") - 1); 1665 cs = codeset_from_name (spec + sizeof ("codeset=") - 1);
1516 else 1666 else
1517 rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec); 1667 rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec);
1518 1668
1519 desc++; 1669 desc++;
1520 while (*desc <= ' ') desc++; 1670 while (*desc <= ' ' && *desc) desc++;
1521 } 1671 }
1522 1672
1523 end = strchr (desc, ','); 1673 end = strchr (desc, ',');
1524 if (!end) 1674 if (!end)
1525 end = desc + strlen (desc); 1675 end = desc + strlen (desc);
… …
1527 if (end - desc < 511) 1677 if (end - desc < 511)
1528 { 1678 {
1529 memcpy (buf, desc, end - desc); 1679 memcpy (buf, desc, end - desc);
1530 buf[end - desc] = 0; 1680 buf[end - desc] = 0;
1531 1681
1532 fonts.push_back (new_font (buf, cs)); 1682 push_font (new_font (buf, cs));
1533 } 1683 }
1534 else 1684 else
1535 rxvt_warn ("fontset element too long (>511 bytes), ignored."); 1685 rxvt_warn ("fontset element too long (>511 bytes), ignored.\n");
1536 1686
1537 desc = end + 1; 1687 desc = end + 1;
1538 } 1688 }
1539 while (*end); 1689 while (*end);
1540 } 1690 }
… …
1565{ 1715{
1566 clear (); 1716 clear ();
1567 1717
1568 fontdesc = strdup (desc); 1718 fontdesc = strdup (desc);
1569 1719
1570 fonts.push_back (new_font (0, CS_UNICODE)); 1720 push_font (new_font (0, CS_UNICODE));
1571 realize_font (0); 1721 realize_font (0);
1572 1722
1573 add_fonts (desc); 1723 add_fonts (desc);
1574 1724
1575 return true; 1725 return true;
… …
1584 1734
1585 return -1; 1735 return -1;
1586} 1736}
1587 1737
1588int 1738int
1589rxvt_fontset::find_font (unicode_t unicode) 1739rxvt_fontset::find_font_idx (unicode_t unicode)
1590{ 1740{
1591 if (unicode >= 1<<20) 1741 // this limits fmap size. it has to accommodate COMPOSE_HI when UNICODE_3
1742 if (unicode > 0x1fffff)
1592 return 0; 1743 return 0;
1593 1744
1594 unicode_t hi = unicode >> 8; 1745 unicode_t hi = unicode >> 8;
1595 1746
1596 if (hi < fmap.size () 1747 if (hi < fmap.size ())
1597 && fmap[hi] 1748 if (pagemap *pm = fmap[hi])
1598 && (*fmap[hi])[unicode & 0xff] != 0xff) 1749 if ((*pm)[unicode & 0xff] != 0xff)
1599 return (*fmap[hi])[unicode & 0xff]; 1750 return (*pm)[unicode & 0xff];
1600 1751
1601 unsigned int i; 1752 unsigned int i;
1602 1753
1603 for (i = 0; i < fonts.size (); i++) 1754 for (i = 0; i < fonts.size (); i++)
1604 { 1755 {
… …
1620 goto next_font; 1771 goto next_font;
1621 1772
1622 bool careful; 1773 bool careful;
1623 if (f->has_char (unicode, &prop, careful)) 1774 if (f->has_char (unicode, &prop, careful))
1624 { 1775 {
1625 if (careful) 1776 i = (i << 1) | careful;
1626 i |= 128;
1627 1777
1628 goto found; 1778 goto found;
1629 } 1779 }
1630 1780
1631 next_font: 1781 next_font:
1632 if (i == fonts.size () - 1) 1782 if (i == fonts.size () - 1)
1633 { 1783 {
1784 // compose characters are handled by the default font, unless another font takes over
1785 // we do not go via the fallback list for speed reasons.
1786 if (IS_COMPOSE (unicode))
1787 return 0;
1788
1634 if (fallback->name) 1789 if (fallback->name)
1635 { 1790 {
1636 // search through the fallback list 1791 // search through the fallback list
1637 fonts.push_back (new_font (fallback->name, fallback->cs)); 1792 push_font (new_font (fallback->name, fallback->cs));
1638 fallback++; 1793 fallback++;
1639 } 1794 }
1640 else 1795 else
1641 { 1796 {
1642 // try to find a new font. 1797 // try to find a new font.
… …
1644 // way to configure this and xft is easier to hack in, 1799 // way to configure this and xft is easier to hack in,
1645 // while x11 has more framework in place already. 1800 // while x11 has more framework in place already.
1646 // TODO: this is a real resource hog, xft takes ages(?) 1801 // TODO: this is a real resource hog, xft takes ages(?)
1647#if XFT && USE_SLOW_LOOKUP 1802#if XFT && USE_SLOW_LOOKUP
1648 // grab the first xft font that seems suitable 1803 // grab the first xft font that seems suitable
1804 // TOOD: should go first for cellchar (spacing 110) then mono, then else
1649 FcPattern *p = FcPatternCreate (); 1805 FcPattern *p = FcPatternCreate ();
1650 1806
1651 FcCharSet *s = FcCharSetCreate (); 1807 FcCharSet *s = FcCharSetCreate ();
1652 FcCharSetAddChar (s, unicode); 1808 FcCharSetAddChar (s, unicode);
1653 FcPatternAddCharSet (p, FC_CHARSET, s); 1809 FcPatternAddCharSet (p, FC_CHARSET, s);
… …
1673 FcPatternDestroy (match); 1829 FcPatternDestroy (match);
1674 1830
1675 if (find_font (font) < 0) 1831 if (find_font (font) < 0)
1676 { 1832 {
1677 char fontname[4096]; 1833 char fontname[4096];
1678 sprintf (fontname, "xft:%-.4090s", font); 1834 snprintf (fontname, sizeof (fontname), "xft:%s", font);
1679 1835
1680 fonts.push_back (new_font (fontname, CS_UNICODE)); 1836 push_font (new_font (fontname, CS_UNICODE));
1681 } 1837 }
1682 1838
1683 free (font); 1839 free (font);
1684 } 1840 }
1685#endif 1841#endif
… …
1697 while (hi >= fmap.size ()) 1853 while (hi >= fmap.size ())
1698 fmap.push_back (0); 1854 fmap.push_back (0);
1699 1855
1700 if (!fmap[hi]) 1856 if (!fmap[hi])
1701 { 1857 {
1702 fmap[hi] = (pagemap *)new pagemap; 1858 fmap[hi] = new pagemap;
1703 memset (fmap[hi], 0xff, sizeof (pagemap)); 1859 memset (fmap[hi], 0xff, sizeof (pagemap));
1704 } 1860 }
1705 1861
1706 (*fmap[hi])[unicode & 0xff] = i; 1862 (*fmap[hi])[unicode & 0xff] = i;
1707 } 1863 }
1708 1864
1709 return i; 1865 return i;
1710} 1866}
1711 1867
1712
1713

Diff Legend

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