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.131 by root, Wed Jan 23 06:00:53 2008 UTC vs.
Revision 1.223 by sf-exg, Sat Aug 19 17:44:35 2023 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{
… …
236 if (color == Color_bg || color == Color_transparent) 237 if (color == Color_bg || color == Color_transparent)
237 XClearArea (disp, d, x, y, w, h, false); 238 XClearArea (disp, d, x, y, w, h, false);
238 else if (color >= 0) 239 else if (color >= 0)
239 { 240 {
240#if XFT 241#if XFT
241 bool done = false; 242 Picture dst;
242#ifdef HAVE_BG_PIXMAP 243
243 if (term->bgPixmap.pixmap && color >= 0 && term->pix_colors[color].c.color.alpha < 0x0ff00) 244# ifdef HAVE_IMG
244 { 245 if (term->bg_img
246 && !term->pix_colors[color].is_opaque ()
245 Picture dst = XftDrawPicture (d); 247 && ((dst = XftDrawPicture (d))))
246 if (dst != 0)
247 { 248 {
248 XClearArea (disp, d, x, y, w, h, false); 249 XClearArea (disp, d, x, y, w, h, false);
250
249 Picture solid_color_pict = XftDrawSrcPicture (d, &term->pix_colors[color].c); 251 Picture solid_color_pict = XftDrawSrcPicture (d, &term->pix_colors[color].c);
250 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);
251 done = true;
252 } 253 }
253 } 254 else
254#endif 255# endif
255 if (!done)
256 XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h); 256 XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);
257
257#else 258#else
258 XSetForeground (disp, gc, term->pix_colors[color]); 259 XSetForeground (disp, gc, term->pix_colors[color]);
259 XFillRectangle (disp, d, gc, x, y, w, h); 260 XFillRectangle (disp, d, gc, x, y, w, h);
260#endif 261#endif
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;
523 descent = (*fs)[2]->descent;
524
525 set_name (strdup ("built-in rendition overflow font"));
526
527 return true;
528 }
529
530 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
531 {
532 return false;
533 }
534
535 void draw (rxvt_drawable &d, int x, int y,
536 const text_t *text, int len,
537 int fg, int bg)
538 {
539 while (len)
540 {
541 int fid = fs->find_font_idx (*text);
542 int w = 1;
543 while (w < len && text[w] == NOCHAR)
544 w++;
545 (*fs)[fid]->draw (d, x, y, text, w, fg, bg);
546 text += w;
547 len -= w;
548 x += term->fwidth * w;
549 }
550 }
551};
552
487///////////////////////////////////////////////////////////////////////////// 553/////////////////////////////////////////////////////////////////////////////
488 554
489struct rxvt_font_x11 : rxvt_font { 555struct rxvt_font_x11 : rxvt_font
556{
490 rxvt_font_x11 () { f = 0; } 557 rxvt_font_x11 () { f = 0; }
491 558
492 void clear (); 559 void clear ();
493 560
494 rxvt_fontprop properties (); 561 rxvt_fontprop properties ();
… …
499 566
500 void draw (rxvt_drawable &d, int x, int y, 567 void draw (rxvt_drawable &d, int x, int y,
501 const text_t *text, int len, 568 const text_t *text, int len,
502 int fg, int bg); 569 int fg, int bg);
503 570
504 bool slow; // wether this is a proportional font or has other funny characteristics 571 bool slow; // whether this is a proportional font or has other funny characteristics
505 XFontStruct *f; 572 XFontStruct *f;
506 bool enc2b, encm; 573 bool enc2b, encm;
507 574
508 char *get_property (XFontStruct *f, Atom property, const char *repl) const; 575 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); 576 bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth);
… …
666 f = XLoadQueryFont (disp, name); 733 f = XLoadQueryFont (disp, name);
667 734
668 if (!f) 735 if (!f)
669 return false; 736 return false;
670 737
671 char *new_name = get_property (f, XA_FONT, name); 738 char *new_name = get_property (f, XA_FONT, 0);
672 739
673 if (new_name) 740 if (new_name)
674 set_name (new_name); 741 set_name (new_name);
675 else 742 else
676 rxvt_warn ("font '%s' has no FONT property, continuing without.", name); 743 rxvt_warn ("font '%s' has no FONT property, continuing without.\n", name);
677 744
678 XFreeFont (disp, f); 745 XFreeFont (disp, f);
679 f = 0; 746 f = 0;
680 } 747 }
681 748
… …
738 free (fname); 805 free (fname);
739 if (replace_field (&fname, list[i], 11, '0', "0")) 806 if (replace_field (&fname, list[i], 11, '0', "0"))
740 diff += 300; // more heavily penalize what looks like scaled bitmap fonts 807 diff += 300; // more heavily penalize what looks like scaled bitmap fonts
741 } 808 }
742 809
743 if (!set_properties (p, fname)) 810 if (!set_properties (p, fname)
811 // also weed out too large fonts
812 || (prop.height != rxvt_fontprop::unset
813 && p.height > prop.height))
814 {
815 free (fname);
744 continue; 816 continue;
745 817 }
746 if (prop.height != rxvt_fontprop::unset
747 && p.height > prop.height) // weed out too large fonts
748 continue;
749 818
750 if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128; 819 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); 820 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); 821 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); 822 //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width);
… …
759 XFreeFontNames (list); 828 XFreeFontNames (list);
760 829
761 // this loop only iterates when the guessed font-size is too small 830 // this loop only iterates when the guessed font-size is too small
762 for (;;) 831 for (;;)
763 { 832 {
764 font_weight *best = fonts + count - 1; 833 font_weight *best = fonts;
765 834
766 for (font_weight *w = best; w-- > fonts; ) 835 for (font_weight *w = fonts + 1; w < fonts + count; w++)
767 if (w->diff <= best->diff) 836 if (w->diff < best->diff)
768 best = w; 837 best = w;
769 838
770 if (!best->name 839 if (!best->name
771 || !(f = XLoadQueryFont (disp, best->name))) 840 || !(f = XLoadQueryFont (disp, best->name)))
772 break; 841 break;
… …
792 return false; 861 return false;
793 862
794 char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0); 863 char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0);
795 char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0); 864 char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0);
796 865
866 cs = CS_UNKNOWN;
867
797 if (registry && encoding) 868 if (registry && encoding)
798 { 869 {
799 char charset[64]; 870 char charset[64];
800 snprintf (charset, 64, "%s-%s", registry, encoding); 871 snprintf (charset, 64, "%s-%s", registry, encoding);
801 872
802 cs = codeset_from_name (charset); 873 cs = codeset_from_name (charset);
803 } 874
804 else 875 if (cs == CS_UNKNOWN)
876 rxvt_warn ("%s: cannot deduce encoding from registry/encoding properties \"%s\", ignoring font.\n", name, charset);
805 { 877 }
878
879 free (registry);
880 free (encoding);
881
882 if (cs == CS_UNKNOWN)
883 {
806 const char *charset = get_property (f, XA_FONT, 0); 884 char *value = get_property (f, XA_FONT, 0);
885 const char *charset = value;
807 886
808 if (!charset) 887 if (!charset)
809 charset = name; 888 charset = name;
810 889
811 int count = 13; 890 int count = 13;
812 while (*charset) 891 while (*charset)
813 if (*charset++ == '-' && !--count) 892 if (*charset++ == '-' && !--count)
814 break; 893 break;
815 894
816 cs = codeset_from_name (charset); 895 cs = codeset_from_name (charset);
896 if (cs == CS_UNKNOWN)
897 rxvt_warn ("%s: cannot deduce encoding from font name property \"%s\", ignoring font.\n", name, charset);
898
899 free (value);
900 }
901
902 if (cs == CS_UNKNOWN)
817 } 903 {
818 904 clear ();
819 free (registry); 905 return false;
820 free (encoding); 906 }
821 907
822 if (cs == CS_UNICODE) 908 if (cs == CS_UNICODE)
823 cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font 909 cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font
824 910
825 encm = f->min_byte1 != 0 || f->max_byte1 != 0; 911 encm = f->min_byte1 != 0 || f->max_byte1 != 0;
… …
850 } 936 }
851#endif 937#endif
852 938
853 width = 1; 939 width = 1;
854 940
855 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 941 for (uint16_t *t = extent_test_chars; t < extent_test_chars + ecb_array_length (extent_test_chars); t++)
856 { 942 {
857 if (FROM_UNICODE (cs, *t) == NOCHAR) 943 if (FROM_UNICODE (cs, *t) == NOCHAR)
858 continue; 944 continue;
859 945
860 // ignore characters we wouldn't use anyways 946 // ignore characters we wouldn't use anyways
861 bool careful; 947 bool careful;
862 if (!has_char (*t, &prop, careful)) 948 if (!has_char (*t, &prop, careful))
863 continue; 949 continue;
864 950
865 XChar2b ch = { *t >> 8, *t }; 951 // the casts are needed in C++11 (see 8.5.1)
952 XChar2b ch = { (unsigned char)(*t >> 8), (unsigned char)*t };
866 953
867 XCharStruct g; 954 XCharStruct g;
868 int dir_ret, asc_ret, des_ret; 955 int dir_ret, asc_ret, des_ret;
869 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); 956 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);
870 957
… …
872 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; 959 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
873 960
874 if (width < g.width) width = g.width; 961 if (width < g.width) width = g.width;
875 } 962 }
876 963
877 if (cs == CS_UNKNOWN) 964#if 0 // do it per-character
965 if (prop && width > prop->width)
878 { 966 {
879 fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);
880
881 clear (); 967 clear ();
882 return false; 968 return false;
883 } 969 }
884
885#if 0 // do it per-character
886 if (prop && width > prop->width)
887 {
888 clear ();
889 return false;
890 }
891#endif 970#endif
892 971
893 return true; 972 return true;
894} 973}
895 974
… …
904} 983}
905 984
906bool 985bool
907rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const 986rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
908{ 987{
988 careful = false;
989
909 uint32_t ch = FROM_UNICODE (cs, unicode); 990 uint32_t ch = FROM_UNICODE (cs, unicode);
910 991
911 if (ch == NOCHAR) 992 if (ch == NOCHAR)
912 return false; 993 return false;
913 994
914 /* check wether the character exists in _this_ font. horrible. */ 995 /* check whether the character exists in _this_ font. horrible. */
915 XCharStruct *xcs; 996 XCharStruct *xcs;
916 997
917 if (encm) 998 if (encm)
918 { 999 {
919 unsigned char byte1 = ch >> 8; 1000 unsigned char byte1 = ch >> 8;
… …
949 return false; 1030 return false;
950 1031
951 if (!prop || prop->width == rxvt_fontprop::unset) 1032 if (!prop || prop->width == rxvt_fontprop::unset)
952 return true; 1033 return true;
953 1034
954 // check wether character overlaps previous/next character 1035 // check whether character overlaps previous/next character
955 int w = xcs->rbearing - xcs->lbearing; 1036 int w = xcs->rbearing - xcs->lbearing;
956 int wcw = max (WCWIDTH (unicode), 1); 1037 int wcw = max (WCWIDTH (unicode), 1);
957 1038
958 careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw; 1039 careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw;
959 1040
… …
976 dTermDisplay; 1057 dTermDisplay;
977 dTermGC; 1058 dTermGC;
978 1059
979 bool slow = this->slow 1060 bool slow = this->slow
980 || width != term->fwidth 1061 || width != term->fwidth
981 || height != term->fheight; 1062 || height != term->fheight
1063 || ascent != f->ascent;
982 1064
983 int base = ascent; // sorry, incorrect: term->fbase; 1065 int base = ascent; // sorry, incorrect: term->fbase;
984 1066
985 XGCValues v; 1067 XGCValues v;
986 v.foreground = term->pix_colors[fg]; 1068 v.foreground = term->pix_colors[fg];
… …
1054 1136
1055///////////////////////////////////////////////////////////////////////////// 1137/////////////////////////////////////////////////////////////////////////////
1056 1138
1057#if XFT 1139#if XFT
1058 1140
1059struct rxvt_font_xft : rxvt_font { 1141struct rxvt_font_xft : rxvt_font
1142{
1143#if XFT_CHAR_CACHE
1144 // we cache the qascii range xoffsets in the name of speed,
1145 // expecting terminals to deal mostly with these characters
1146 // we also assume the xoff always fits into uint8_t,
1147 // which is questionable, but let's see...
1148 // also, it is uncomfortably big, due to the uints.
1149 enum { char_cache_min = 0x20, char_cache_max = 0x7e };
1150 uint8_t xoff_cache [char_cache_max - char_cache_min + 1];
1151 FT_UInt glyph_cache [char_cache_max - char_cache_min + 1];
1152#endif
1153
1060 rxvt_font_xft () { f = 0; } 1154 rxvt_font_xft ()
1155 {
1156 f = 0;
1157 }
1061 1158
1062 void clear (); 1159 void clear ();
1063 1160
1064 rxvt_fontprop properties (); 1161 rxvt_fontprop properties ();
1065 1162
… …
1133 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1230 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1134 1231
1135#if 0 // clipping unfortunately destroys our precious double-width-characters 1232#if 0 // clipping unfortunately destroys our precious double-width-characters
1136 // clip width, we can't do better, or can we? 1233 // clip width, we can't do better, or can we?
1137 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) 1234 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
1138 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop->width); 1235 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width);
1139#endif 1236#endif
1140 1237
1141 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch) 1238 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch)
1142 FcPatternAddBool (p, FC_MINSPACE, 1); 1239 FcPatternAddBool (p, FC_MINSPACE, 1);
1143 1240
… …
1155 int ftheight = 0; 1252 int ftheight = 0;
1156 bool success = true; 1253 bool success = true;
1157 1254
1158 for (;;) 1255 for (;;)
1159 { 1256 {
1257 p = FcPatternDuplicate (match);
1160 f = XftFontOpenPattern (disp, FcPatternDuplicate (match)); 1258 f = XftFontOpenPattern (disp, p);
1161 1259
1162 if (!f) 1260 if (!f)
1163 { 1261 {
1262 FcPatternDestroy (p);
1164 success = false; 1263 success = false;
1165 break; 1264 break;
1166 } 1265 }
1167 1266
1168 FT_Face face = XftLockFace (f); 1267 FT_Face face = XftLockFace (f);
1268
1269 // fuck me plenty: XftLockFace can actually return 0. try not to crash.
1270 // we also assume blindly that if the first lock succeeds, then subsequent
1271 // locks will also succeed.
1272 if (!face)
1273 {
1274 XftFontClose (disp, f);
1275 success = false;
1276 break;
1277 }
1169 1278
1170 ascent = (face->size->metrics.ascender + 63) >> 6; 1279 ascent = (face->size->metrics.ascender + 63) >> 6;
1171 descent = (-face->size->metrics.descender + 63) >> 6; 1280 descent = (-face->size->metrics.descender + 63) >> 6;
1172 height = max (ascent + descent, (face->size->metrics.height + 63) >> 6); 1281 height = max (ascent + descent, (face->size->metrics.height + 63) >> 6);
1173 width = 0; 1282 width = 0;
… …
1176 1285
1177 XftUnlockFace (f); 1286 XftUnlockFace (f);
1178 1287
1179 int glheight = height; 1288 int glheight = height;
1180 1289
1181 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 1290 for (uint16_t *t = extent_test_chars; t < extent_test_chars + ecb_array_length (extent_test_chars); t++)
1182 { 1291 {
1183 FcChar16 ch = *t; 1292 FcChar16 ch = *t;
1184 1293
1185 if (cs != CS_UNICODE 1294 if (cs != CS_UNICODE
1186 && ch > 0x100 1295 && ch > 0x100
… …
1205 if (glheight < g.height - g.y) glheight = g.height - g.y; 1314 if (glheight < g.height - g.y) glheight = g.height - g.y;
1206 } 1315 }
1207 1316
1208 if (!width) 1317 if (!width)
1209 { 1318 {
1210 rxvt_warn ("unable to calculate font width for '%s', ignoring.\n", name); 1319 rxvt_warn ("unable to calculate font width for '%s', using max_advance_width.\n", name);
1211 1320 width = f->max_advance_width;
1212 XftFontClose (disp, f);
1213 f = 0;
1214
1215 success = false;
1216 break; 1321 break;
1217 } 1322 }
1218 1323
1219 if (prop.height == rxvt_fontprop::unset 1324 if (prop.height == rxvt_fontprop::unset
1220 || (height <= prop.height && glheight <= prop.height) 1325 || (height <= prop.height && glheight <= prop.height)
… …
1247 clear (); 1352 clear ();
1248 success = false; 1353 success = false;
1249 } 1354 }
1250#endif 1355#endif
1251 1356
1357#if XFT_CHAR_CACHE
1358 // populate char cache
1359 for (FcChar16 ch = char_cache_min; ch <= char_cache_max; ++ch)
1360 {
1361 FT_UInt glyph = XftCharIndex (disp, f, ch);
1362 glyph_cache [ch - char_cache_min] = glyph;
1363
1364 XGlyphInfo g;
1365 XftGlyphExtents (disp, f, &glyph, 1, &g);
1366 xoff_cache [ch - char_cache_min] = g.xOff;
1367 }
1368#endif
1369
1252 return success; 1370 return success;
1253} 1371}
1254 1372
1255bool 1373bool
1256rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const 1374rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
1257{ 1375{
1258 careful = false; 1376 careful = false;
1259 1377
1378 // handle non-bmp chars when text_t is 16 bit
1379#if ENABLE_COMBINING && !UNICODE_3
1380 if (ecb_expect_false (IS_COMPOSE (unicode)))
1381 if (compose_char *cc = rxvt_composite [unicode])
1382 if (cc->c2 == NOCHAR)
1383 unicode = cc->c1;
1384 else
1385 return false;
1386 else
1387 return false;
1388#endif
1389
1390 FcChar32 chr = unicode;
1391
1260 if (!XftCharExists (term->dpy, f, unicode)) 1392 if (!XftCharExists (term->dpy, f, chr))
1261 return false; 1393 return false;
1262 1394
1263 if (!prop || prop->width == rxvt_fontprop::unset) 1395 if (!prop || prop->width == rxvt_fontprop::unset)
1264 return true; 1396 return true;
1265 1397
1266 // check character against base font bounding box 1398 int wcw = max (WCWIDTH (chr), 1);
1267 FcChar32 ch = unicode; 1399
1268 XGlyphInfo g; 1400 XGlyphInfo g;
1269 XftTextExtents32 (term->dpy, f, &ch, 1, &g); 1401 XftTextExtents32 (term->dpy, f, &chr, 1, &g);
1402
1403 int cwidth = prop->width * wcw;
1404
1405 // use same adjustments as in ->draw, see there
1406 g.x += g.xOff ? cwidth - g.xOff >> 1 : 0;
1407 g.x += g.xOff ? 0 : cwidth;
1270 1408
1271 int w = g.width - g.x; 1409 int w = g.width - g.x;
1272 int wcw = max (WCWIDTH (unicode), 1);
1273 1410
1274 careful = g.x > 0 || w > prop->width * wcw; 1411 careful = g.x > 0 || w > cwidth;
1275 1412
1276 if (careful && !OVERLAP_OK (w, wcw, prop)) 1413 if (careful && !OVERLAP_OK (w, wcw, prop))
1277 return false; 1414 return false;
1278 1415
1279 // this weeds out _totally_ broken fonts, or glyphs 1416 // this weeds out _totally_ broken fonts, or glyphs
… …
1286void 1423void
1287rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, 1424rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1288 const text_t *text, int len, 1425 const text_t *text, int len,
1289 int fg, int bg) 1426 int fg, int bg)
1290{ 1427{
1291 XGlyphInfo extents; 1428 XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len);
1292 XftGlyphSpec *enc = (XftGlyphSpec *)rxvt_temp_buf (len * sizeof (XftGlyphSpec));
1293 XftGlyphSpec *ep = enc; 1429 XftGlyphSpec *ep = enc;
1294 1430
1295 dTermDisplay; 1431 dTermDisplay;
1296 dTermGC; 1432 dTermGC;
1297 1433
1298 int w = term->fwidth * len; 1434 int w = term->fwidth * len;
1299 int h = term->fheight; 1435 int h = term->fheight;
1300 1436
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; 1437 bool buffered = bg >= Color_transparent
1306#ifdef FORCE_UNBUFFERED_XFT 1438 && term->option (Opt_buffered);
1307 buffered = false;
1308#endif
1309 1439
1310 // cut trailing spaces 1440 // cut trailing spaces
1311 while (len && text [len - 1] == ' ') 1441 while (len && text [len - 1] == ' ')
1312 len--; 1442 len--;
1313 1443
… …
1315 int y_ = buffered ? 0 : y; 1445 int y_ = buffered ? 0 : y;
1316 1446
1317 while (len) 1447 while (len)
1318 { 1448 {
1319 int cwidth = term->fwidth; 1449 int cwidth = term->fwidth;
1320 FcChar32 fc = *text++; len--; 1450 FcChar32 chr = *text++; len--;
1321 1451
1322 while (len && *text == NOCHAR) 1452 while (len && *text == NOCHAR)
1323 text++, len--, cwidth += term->fwidth; 1453 text++, len--, cwidth += term->fwidth;
1324 1454
1325 if (fc != ' ') // skip spaces 1455 if (chr != ' ') // skip spaces
1456 {
1457 // handle non-bmp chars when text_t is 16 bit
1458 #if ENABLE_COMBINING && !UNICODE_3
1459 if (ecb_expect_false (IS_COMPOSE (chr)))
1460 if (compose_char *cc = rxvt_composite [chr])
1461 if (cc->c2 == NOCHAR)
1462 chr = cc->c1;
1463 #endif
1464
1465 #if 0
1466 FT_UInt glyphs [decltype (exp)::max_size];
1467
1468 for (int i = 0; i < nchrs; ++i)
1469 glyphs [i] = XftCharIndex (disp, f, chrs [i]);
1470
1471 for (int i = 0; i < nchrs; ++i)
1326 { 1472 {
1473 XGlyphInfo ep;
1474 XftGlyphExtents (disp, f, glyphs+i, 1, &ep);
1475 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);
1476 }
1477 #endif
1478
1479 FT_UInt glyph;
1480 int xOff;
1481
1482 #if XFT_CHAR_CACHE
1483 if (ecb_expect_true (IN_RANGE_INC (chr, char_cache_min, char_cache_max)))
1484 {
1485 glyph = glyph_cache [chr - char_cache_min];
1486 xOff = xoff_cache [chr - char_cache_min];
1487 }
1488 else
1489 #endif
1490 {
1327 FT_UInt glyph = XftCharIndex (disp, f, fc); 1491 glyph = XftCharIndex (disp, f, chr);
1492 XGlyphInfo extents;
1328 XftGlyphExtents (disp, f, &glyph, 1, &extents); 1493 XftGlyphExtents (disp, f, &glyph, 1, &extents);
1494 xOff = extents.xOff;
1495 }
1329 1496
1330 ep->glyph = glyph; 1497 ep->glyph = glyph;
1331 ep->x = x_ + (cwidth - extents.xOff >> 1); 1498 ep->x = x_;
1332 ep->y = y_ + ascent; 1499 ep->y = y_ + ascent;
1333 1500
1334 if (extents.xOff == 0) 1501 // the xft font cell might differ from the terminal font cell,
1502 // in which case we use the average between the two.
1503 ep->x += xOff ? cwidth - xOff >> 1 : 0;
1504
1505 // xft/freetype represent combining characters as characters with zero
1506 // width rendered over the previous character with some fonts, while
1507 // in other fonts, they are considered normal characters, while yet
1508 // in other fonts, they are shifted all over the place.
1509 // we handle the first two cases by keying off on xOff being 0
1510 // for zero-width chars. normally, we would add extents.xOff
1511 // of the base character here, but we don't have that, so we use cwidth.
1335 ep->x = x_ + cwidth; 1512 ep->x += xOff ? 0 : cwidth;
1336 1513
1337 ep++; 1514 ++ep;
1338 } 1515 }
1339 1516
1340 x_ += cwidth; 1517 x_ += cwidth;
1341 } 1518 }
1342 1519
1343 if (buffered) 1520 if (buffered)
1344 { 1521 {
1345 if (ep != enc) 1522 if (ep != enc)
1346 { 1523 {
1347 bool back_rendered = false;
1348 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); 1524 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1349 1525
1350#ifdef HAVE_BG_PIXMAP 1526#ifdef HAVE_IMG
1527 Picture dst = 0; // the only assignment is done conditionally in the following if condition
1528
1351 if (term->bgPixmap.pixmap) 1529 if (term->bg_img
1530 && (bg == Color_transparent || bg == Color_bg
1531 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2))))))
1352 { 1532 {
1353 Picture dst = 0; 1533 int src_x = x, src_y = y;
1354 1534
1355 if (bg >= 0 && term->pix_colors[bg].is_opaque ()) 1535 if (term->bg_flags & rxvt_term::BG_IS_TRANSPARENT)
1356 dst = XftDrawPicture (d2); 1536 {
1537 src_x += term->window_vt_x;
1538 src_y += term->window_vt_y;
1539 }
1540
1541 if (term->bg_img->w >= src_x + w
1542 && term->bg_img->h >= src_y + h)
1543 {
1544 XCopyArea (disp, term->bg_img->pm, d2, gc,
1545 src_x, src_y, w, h, 0, 0);
1546 }
1547 else
1548 {
1549 XGCValues gcv;
1550
1551 gcv.fill_style = FillTiled;
1552 gcv.tile = term->bg_img->pm;
1553 gcv.ts_x_origin = -src_x;
1554 gcv.ts_y_origin = -src_y;
1555
1556 XChangeGC (disp, gc,
1557 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
1558 &gcv);
1559
1560 XFillRectangle (disp, d2, gc, 0, 0, w, h);
1561
1562 gcv.fill_style = FillSolid;
1563 XChangeGC (disp, gc, GCFillStyle, &gcv);
1564 }
1357 1565
1358 if (dst) 1566 if (dst)
1359 { 1567 {
1360 int src_x = x, src_y = y;
1361
1362 if (term->bgPixmap.is_parentOrigin ())
1363 {
1364 src_x += term->window_vt_x;
1365 src_y += term->window_vt_y;
1366 }
1367
1368 if (term->bgPixmap.pmap_width >= src_x+w
1369 && term->bgPixmap.pmap_height >= src_y+h)
1370 {
1371 XCopyArea (disp, term->bgPixmap.pixmap, d2, gc,
1372 src_x, src_y, w, h, 0, 0);
1373 }
1374 else
1375 {
1376 XGCValues gcv;
1377
1378 gcv.fill_style = FillTiled;
1379 gcv.tile = term->bgPixmap.pixmap;
1380 gcv.ts_x_origin = -src_x;
1381 gcv.ts_y_origin = -src_y;
1382
1383 XChangeGC (disp, gc,
1384 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
1385 &gcv);
1386
1387 XFillRectangle (disp, d2, gc, 0, 0, w, h);
1388
1389 gcv.fill_style = FillSolid;
1390 XChangeGC (disp, gc, GCFillStyle, &gcv);
1391 }
1392
1393 if (bg >= 0)
1394 {
1395 Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c); 1568 Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c);
1569
1570 // dst can only be set when bg >= 0
1396 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h); 1571 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h);
1397 }
1398
1399 back_rendered = true;
1400 } 1572 }
1401 } 1573 }
1574 else
1402#endif 1575#endif
1403
1404 if (!back_rendered)
1405 XftDrawRect (d2, &term->pix_colors[bg < 0 ? Color_bg : bg].c, 0, 0, w, h); 1576 XftDrawRect (d2, &term->pix_colors[bg >= 0 ? bg : Color_bg].c, 0, 0, w, h);
1406 1577
1407 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc); 1578 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);
1408 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y); 1579 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
1409 } 1580 }
1410 else 1581 else
… …
1438 prop.width = prop.height = prop.ascent = prop.weight = prop.slant 1609 prop.width = prop.height = prop.ascent = prop.weight = prop.slant
1439 = rxvt_fontprop::unset; 1610 = rxvt_fontprop::unset;
1440 force_prop = false; 1611 force_prop = false;
1441 1612
1442 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) 1613 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1443 FONT_UNREF (*i); 1614 (*i)->unref ();
1444 1615
1445 for (pagemap **p = fmap.begin (); p != fmap.end (); p++) 1616 for (pagemap **p = fmap.begin (); p != fmap.end (); p++)
1446 delete *p; 1617 delete *p;
1447 1618
1448 free (fontdesc); fontdesc = 0; 1619 free (fontdesc); fontdesc = 0;
… …
1450 fonts.clear (); 1621 fonts.clear ();
1451 1622
1452 fallback = fallback_fonts; 1623 fallback = fallback_fonts;
1453} 1624}
1454 1625
1626void
1627rxvt_fontset::prepare_font (rxvt_font *font, codeset cs)
1628{
1629 font->set_term (term);
1630
1631 font->cs = cs;
1632 font->loaded = false;
1633}
1634
1455rxvt_font * 1635rxvt_font *
1456rxvt_fontset::new_font (const char *name, codeset cs) 1636rxvt_fontset::new_font (const char *name, codeset cs)
1457{ 1637{
1458 rxvt_font *f; 1638 rxvt_font *f;
1459 1639
… …
1475 f = new rxvt_font_x11; 1655 f = new rxvt_font_x11;
1476 } 1656 }
1477 else 1657 else
1478 f = new rxvt_font_x11; 1658 f = new rxvt_font_x11;
1479 1659
1480 f->set_term (term);
1481 f->set_name (strdup (name)); 1660 f->set_name (strdup (name));
1482 1661 prepare_font (f, cs);
1483 f->cs = cs;
1484 f->loaded = false;
1485 1662
1486 return f; 1663 return f;
1487} 1664}
1488 1665
1489///////////////////////////////////////////////////////////////////////////// 1666/////////////////////////////////////////////////////////////////////////////
1667
1668void
1669rxvt_fontset::push_font (rxvt_font *font)
1670{
1671 // the fontCount index is reserved for the overflow font, it is only
1672 // necessary when we get fontCount or more fonts, as they cannot be
1673 // represented in the rendition.
1674 if (fonts.size () == fontCount)
1675 {
1676 rxvt_font *f = new rxvt_font_overflow (this);
1677
1678 prepare_font (f, CS_UNICODE);
1679 fonts.push_back (f);
1680 }
1681
1682 fonts.push_back (font);
1683}
1490 1684
1491void 1685void
1492rxvt_fontset::add_fonts (const char *desc) 1686rxvt_fontset::add_fonts (const char *desc)
1493{ 1687{
1494 if (desc) 1688 if (desc)
… …
1523 cs = codeset_from_name (spec + sizeof ("codeset=") - 1); 1717 cs = codeset_from_name (spec + sizeof ("codeset=") - 1);
1524 else 1718 else
1525 rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec); 1719 rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec);
1526 1720
1527 desc++; 1721 desc++;
1528 while (*desc <= ' ') desc++; 1722 while (*desc <= ' ' && *desc) desc++;
1529 } 1723 }
1530 1724
1531 end = strchr (desc, ','); 1725 end = strchr (desc, ',');
1532 if (!end) 1726 if (!end)
1533 end = desc + strlen (desc); 1727 end = desc + strlen (desc);
… …
1535 if (end - desc < 511) 1729 if (end - desc < 511)
1536 { 1730 {
1537 memcpy (buf, desc, end - desc); 1731 memcpy (buf, desc, end - desc);
1538 buf[end - desc] = 0; 1732 buf[end - desc] = 0;
1539 1733
1540 fonts.push_back (new_font (buf, cs)); 1734 push_font (new_font (buf, cs));
1541 } 1735 }
1542 else 1736 else
1543 rxvt_warn ("fontset element too long (>511 bytes), ignored."); 1737 rxvt_warn ("fontset element too long (>511 bytes), ignored.\n");
1544 1738
1545 desc = end + 1; 1739 desc = end + 1;
1546 } 1740 }
1547 while (*end); 1741 while (*end);
1548 } 1742 }
… …
1573{ 1767{
1574 clear (); 1768 clear ();
1575 1769
1576 fontdesc = strdup (desc); 1770 fontdesc = strdup (desc);
1577 1771
1578 fonts.push_back (new_font (0, CS_UNICODE)); 1772 push_font (new_font (0, CS_UNICODE));
1579 realize_font (0); 1773 realize_font (0);
1580 1774
1581 add_fonts (desc); 1775 add_fonts (desc);
1582 1776
1583 return true; 1777 return true;
… …
1592 1786
1593 return -1; 1787 return -1;
1594} 1788}
1595 1789
1596int 1790int
1597rxvt_fontset::find_font (unicode_t unicode) 1791rxvt_fontset::find_font_idx (unicode_t unicode)
1598{ 1792{
1599 if (unicode >= 1<<20) 1793 // this limits fmap size. it has to accommodate COMPOSE_HI when UNICODE_3
1794 if (unicode > 0x1fffff)
1600 return 0; 1795 return 0;
1601 1796
1602 unicode_t hi = unicode >> 8; 1797 unicode_t hi = unicode >> 8;
1603 1798
1604 if (hi < fmap.size () 1799 if (hi < fmap.size ())
1605 && fmap[hi] 1800 if (pagemap *pm = fmap[hi])
1606 && (*fmap[hi])[unicode & 0xff] != 0xff) 1801 if ((*pm)[unicode & 0xff] != 0xff)
1607 return (*fmap[hi])[unicode & 0xff]; 1802 return (*pm)[unicode & 0xff];
1608 1803
1609 unsigned int i; 1804 unsigned int i;
1610 1805
1611 for (i = 0; i < fonts.size (); i++) 1806 for (i = 0; i < fonts.size (); i++)
1612 { 1807 {
… …
1628 goto next_font; 1823 goto next_font;
1629 1824
1630 bool careful; 1825 bool careful;
1631 if (f->has_char (unicode, &prop, careful)) 1826 if (f->has_char (unicode, &prop, careful))
1632 { 1827 {
1633 if (careful) 1828 i = (i << 1) | careful;
1634 i |= 128;
1635 1829
1636 goto found; 1830 goto found;
1637 } 1831 }
1638 1832
1639 next_font: 1833 next_font:
1640 if (i == fonts.size () - 1) 1834 if (i == fonts.size () - 1)
1641 { 1835 {
1836 // compose characters are handled by the default font, unless another font takes over
1837 // we do not go via the fallback list for speed reasons.
1838 if (IS_COMPOSE (unicode))
1839 return 0;
1840
1642 if (fallback->name) 1841 if (fallback->name)
1643 { 1842 {
1644 // search through the fallback list 1843 // search through the fallback list
1645 fonts.push_back (new_font (fallback->name, fallback->cs)); 1844 push_font (new_font (fallback->name, fallback->cs));
1646 fallback++; 1845 fallback++;
1647 } 1846 }
1648 else 1847 else
1649 { 1848 {
1650 // try to find a new font. 1849 // try to find a new font.
… …
1652 // way to configure this and xft is easier to hack in, 1851 // way to configure this and xft is easier to hack in,
1653 // while x11 has more framework in place already. 1852 // while x11 has more framework in place already.
1654 // TODO: this is a real resource hog, xft takes ages(?) 1853 // TODO: this is a real resource hog, xft takes ages(?)
1655#if XFT && USE_SLOW_LOOKUP 1854#if XFT && USE_SLOW_LOOKUP
1656 // grab the first xft font that seems suitable 1855 // grab the first xft font that seems suitable
1856 // TOOD: should go first for cellchar (spacing 110) then mono, then else
1657 FcPattern *p = FcPatternCreate (); 1857 FcPattern *p = FcPatternCreate ();
1658 1858
1659 FcCharSet *s = FcCharSetCreate (); 1859 FcCharSet *s = FcCharSetCreate ();
1660 FcCharSetAddChar (s, unicode); 1860 FcCharSetAddChar (s, unicode);
1661 FcPatternAddCharSet (p, FC_CHARSET, s); 1861 FcPatternAddCharSet (p, FC_CHARSET, s);
… …
1681 FcPatternDestroy (match); 1881 FcPatternDestroy (match);
1682 1882
1683 if (find_font (font) < 0) 1883 if (find_font (font) < 0)
1684 { 1884 {
1685 char fontname[4096]; 1885 char fontname[4096];
1686 sprintf (fontname, "xft:%-.4090s", font); 1886 snprintf (fontname, sizeof (fontname), "xft:%s", font);
1687 1887
1688 fonts.push_back (new_font (fontname, CS_UNICODE)); 1888 push_font (new_font (fontname, CS_UNICODE));
1689 } 1889 }
1690 1890
1691 free (font); 1891 free (font);
1692 } 1892 }
1693#endif 1893#endif
… …
1705 while (hi >= fmap.size ()) 1905 while (hi >= fmap.size ())
1706 fmap.push_back (0); 1906 fmap.push_back (0);
1707 1907
1708 if (!fmap[hi]) 1908 if (!fmap[hi])
1709 { 1909 {
1710 fmap[hi] = (pagemap *)new pagemap; 1910 fmap[hi] = new pagemap;
1711 memset (fmap[hi], 0xff, sizeof (pagemap)); 1911 memset (fmap[hi], 0xff, sizeof (pagemap));
1712 } 1912 }
1713 1913
1714 (*fmap[hi])[unicode & 0xff] = i; 1914 (*fmap[hi])[unicode & 0xff] = i;
1715 } 1915 }
1716 1916
1717 return i; 1917 return i;
1718} 1918}
1719 1919
1720
1721

Diff Legend

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