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.145 by root, Fri Jan 25 16:04:57 2008 UTC vs.
Revision 1.204 by root, Thu Jun 17 11:45:19 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
… …
211} 212}
212 213
213///////////////////////////////////////////////////////////////////////////// 214/////////////////////////////////////////////////////////////////////////////
214 215
215rxvt_font::rxvt_font () 216rxvt_font::rxvt_font ()
216: name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset) 217: name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset), can_compose(false)
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)
… …
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 450
451 #if NOT_YET
452 vector<text_t> chrs;
453 chrs.reserve (rxvt_composite.expand (t));
454 rxvt_composite.expand (t, &chrs[0]);
455
456 while (!chrs.empty ())
457 {
458 rxvt_font *f1 = fs->find_font_idx (chrs[0])
459
460 int i = 0;
461 while (i < chrs.size () - 1
462 && f1->can_combine
463 && f1->has-char (chrs[i + 1], careful)
464 && !careful
465 ++i;
466
467 (*fs)[f1]->draw (d, x, y, &chrs[0], width, fg, bg);
468 chrs.erase (&chrs[0], &chrs[i]);
469 }
470 #endif
471
472 #if 1
449 text_t chrs[2]; 473 text_t chrs[2];
450 chrs [1] = NOCHAR; 474 chrs [1] = NOCHAR;
451 475
452 *chrs = cc->c1; 476 *chrs = cc->c1;
453 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)]; 477 rxvt_font *f1 = (*fs)[fs->find_font_idx (cc->c1)];
454 f1->draw (d, x, y, chrs, width, fg, bg); 478 f1->draw (d, x, y, chrs, width, fg, bg);
455 479
456 if (cc->c2 != NOCHAR) 480 if (cc->c2 != NOCHAR)
457 { 481 {
458 bool careful; 482 bool careful;
459 483
460 // prefer font of first character, for no good reasons 484 // prefer font of first character, for no good reasons
461 *chrs = cc->c2; 485 *chrs = cc->c2;
462 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful) 486 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful)
463 ? f1 487 ? f1
464 : (*fs)[fs->find_font (cc->c2)]; 488 : (*fs)[fs->find_font_idx (cc->c2)];
465 489
466 f2->draw (d, x, y, chrs, width, fg, Color_none); 490 f2->draw (d, x, y, chrs, width, fg, Color_none);
467 } 491 }
492 #endif
468 } 493 }
469#endif 494#endif
470 else 495 else
471 switch (t) 496 switch (t)
472 { 497 {
473 case '\t': 498 case '\t':
474 case ZERO_WIDTH_CHAR: 499 case ZERO_WIDTH_CHAR:
475 case NOCHAR: 500 case NOCHAR:
476 break; 501 break;
477 502
503 /*
504 * If the base font does not support variation selectors, treat them as ZWC.
505 * a point could be made to do this for all wcwidth == 0 characters, but I
506 * decided against that until more data is available.
507 */
508 case 0xfe00: case 0xfe01: case 0xfe02: case 0xfe03: case 0xfe04: case 0xfe05: case 0xfe06: case 0xfe07:
509 case 0xfe08: case 0xfe09: case 0xfe0a: case 0xfe0b: case 0xfe0c: case 0xfe0d: case 0xfe0e: case 0xfe0f:
510 break;
511
478 default: 512 default:
479 XDrawRectangle (disp, d, gc, x + 2, y + 2, 513 XDrawRectangle (disp, d, gc, x + 2, y + 2,
480 fwidth - 4, term->fheight - 4); 514 fwidth - 4, term->fheight - 4);
481 } 515 }
482 516
483 x += fwidth; 517 x += fwidth;
484 } 518 }
485} 519}
486 520
521struct rxvt_font_overflow : rxvt_font
522{
523 struct rxvt_fontset *fs;
524
525 rxvt_font_overflow (rxvt_fontset *fs)
526 : rxvt_font ()
527 {
528 this->fs = fs;
529 }
530
531 rxvt_fontprop properties ()
532 {
533 rxvt_fontprop p;
534
535 p.width = p.height = 1;
536 p.ascent = rxvt_fontprop::unset;
537 p.weight = rxvt_fontprop::medium;
538 p.slant = rxvt_fontprop::roman;
539
540 return p;
541 }
542
543 bool load (const rxvt_fontprop &prop, bool force_prop)
544 {
545 width = 1; height = 1;
546 ascent = 1; descent = 0;
547
548 set_name (strdup ("built-in rendition overflow font"));
549
550 return true;
551 }
552
553 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
554 {
555 return false;
556 }
557
558 void draw (rxvt_drawable &d, int x, int y,
559 const text_t *text, int len,
560 int fg, int bg)
561 {
562 while (len)
563 {
564 int fid = fs->find_font_idx (*text);
565 int w = 1;
566 while (w < len && text[w] == NOCHAR)
567 w++;
568 (*fs)[fid]->draw (d, x, y, text, w, fg, bg);
569 text += w;
570 len -= w;
571 x += term->fwidth * w;
572 }
573 }
574};
575
487///////////////////////////////////////////////////////////////////////////// 576/////////////////////////////////////////////////////////////////////////////
488 577
489struct rxvt_font_x11 : rxvt_font { 578struct rxvt_font_x11 : rxvt_font
579{
490 rxvt_font_x11 () { f = 0; } 580 rxvt_font_x11 () { f = 0; }
491 581
492 void clear (); 582 void clear ();
493 583
494 rxvt_fontprop properties (); 584 rxvt_fontprop properties ();
… …
499 589
500 void draw (rxvt_drawable &d, int x, int y, 590 void draw (rxvt_drawable &d, int x, int y,
501 const text_t *text, int len, 591 const text_t *text, int len,
502 int fg, int bg); 592 int fg, int bg);
503 593
504 bool slow; // wether this is a proportional font or has other funny characteristics 594 bool slow; // whether this is a proportional font or has other funny characteristics
505 XFontStruct *f; 595 XFontStruct *f;
506 bool enc2b, encm; 596 bool enc2b, encm;
507 597
508 char *get_property (XFontStruct *f, Atom property, const char *repl) const; 598 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); 599 bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth);
… …
666 f = XLoadQueryFont (disp, name); 756 f = XLoadQueryFont (disp, name);
667 757
668 if (!f) 758 if (!f)
669 return false; 759 return false;
670 760
671 char *new_name = get_property (f, XA_FONT, name); 761 char *new_name = get_property (f, XA_FONT, 0);
672 762
673 if (new_name) 763 if (new_name)
674 set_name (new_name); 764 set_name (new_name);
675 else 765 else
676 rxvt_warn ("font '%s' has no FONT property, continuing without.", name); 766 rxvt_warn ("font '%s' has no FONT property, continuing without.\n", name);
677 767
678 XFreeFont (disp, f); 768 XFreeFont (disp, f);
679 f = 0; 769 f = 0;
680 } 770 }
681 771
… …
738 free (fname); 828 free (fname);
739 if (replace_field (&fname, list[i], 11, '0', "0")) 829 if (replace_field (&fname, list[i], 11, '0', "0"))
740 diff += 300; // more heavily penalize what looks like scaled bitmap fonts 830 diff += 300; // more heavily penalize what looks like scaled bitmap fonts
741 } 831 }
742 832
743 if (!set_properties (p, fname)) 833 if (!set_properties (p, fname)
834 // also weed out too large fonts
835 || (prop.height != rxvt_fontprop::unset
836 && p.height > prop.height))
837 {
838 free (fname);
744 continue; 839 continue;
745 840 }
746 if (prop.height != rxvt_fontprop::unset
747 && p.height > prop.height) // weed out too large fonts
748 continue;
749 841
750 if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128; 842 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); 843 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); 844 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); 845 //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width);
… …
759 XFreeFontNames (list); 851 XFreeFontNames (list);
760 852
761 // this loop only iterates when the guessed font-size is too small 853 // this loop only iterates when the guessed font-size is too small
762 for (;;) 854 for (;;)
763 { 855 {
764 font_weight *best = fonts + count - 1; 856 font_weight *best = fonts;
765 857
766 for (font_weight *w = best; w-- > fonts; ) 858 for (font_weight *w = fonts + 1; w < fonts + count; w++)
767 if (w->diff <= best->diff) 859 if (w->diff < best->diff)
768 best = w; 860 best = w;
769 861
770 if (!best->name 862 if (!best->name
771 || !(f = XLoadQueryFont (disp, best->name))) 863 || !(f = XLoadQueryFont (disp, best->name)))
772 break; 864 break;
… …
792 return false; 884 return false;
793 885
794 char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0); 886 char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0);
795 char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0); 887 char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0);
796 888
889 cs = CS_UNKNOWN;
890
797 if (registry && encoding) 891 if (registry && encoding)
798 { 892 {
799 char charset[64]; 893 char charset[64];
800 snprintf (charset, 64, "%s-%s", registry, encoding); 894 snprintf (charset, 64, "%s-%s", registry, encoding);
801 895
802 cs = codeset_from_name (charset); 896 cs = codeset_from_name (charset);
803 } 897
804 else 898 if (cs == CS_UNKNOWN)
899 rxvt_warn ("%s: cannot deduce encoding from registry/encoding properties \"%s\", ignoring font.\n", name, charset);
805 { 900 }
901
902 free (registry);
903 free (encoding);
904
905 if (cs == CS_UNKNOWN)
906 {
806 const char *charset = get_property (f, XA_FONT, 0); 907 char *value = get_property (f, XA_FONT, 0);
908 const char *charset = value;
807 909
808 if (!charset) 910 if (!charset)
809 charset = name; 911 charset = name;
810 912
811 int count = 13; 913 int count = 13;
812 while (*charset) 914 while (*charset)
813 if (*charset++ == '-' && !--count) 915 if (*charset++ == '-' && !--count)
814 break; 916 break;
815 917
816 cs = codeset_from_name (charset); 918 cs = codeset_from_name (charset);
919 if (cs == CS_UNKNOWN)
920 rxvt_warn ("%s: cannot deduce encoding from font name property \"%s\", ignoring font.\n", name, charset);
921
922 free (value);
923 }
924
925 if (cs == CS_UNKNOWN)
817 } 926 {
818 927 clear ();
819 free (registry); 928 return false;
820 free (encoding); 929 }
821 930
822 if (cs == CS_UNICODE) 931 if (cs == CS_UNICODE)
823 cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font 932 cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font
824 933
825 encm = f->min_byte1 != 0 || f->max_byte1 != 0; 934 encm = f->min_byte1 != 0 || f->max_byte1 != 0;
… …
850 } 959 }
851#endif 960#endif
852 961
853 width = 1; 962 width = 1;
854 963
855 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 964 for (uint16_t *t = extent_test_chars; t < extent_test_chars + ecb_array_length (extent_test_chars); t++)
856 { 965 {
857 if (FROM_UNICODE (cs, *t) == NOCHAR) 966 if (FROM_UNICODE (cs, *t) == NOCHAR)
858 continue; 967 continue;
859 968
860 // ignore characters we wouldn't use anyways 969 // ignore characters we wouldn't use anyways
861 bool careful; 970 bool careful;
862 if (!has_char (*t, &prop, careful)) 971 if (!has_char (*t, &prop, careful))
863 continue; 972 continue;
864 973
865 XChar2b ch = { *t >> 8, *t }; 974 // the casts are needed in C++11 (see 8.5.1)
975 XChar2b ch = { (unsigned char)(*t >> 8), (unsigned char)*t };
866 976
867 XCharStruct g; 977 XCharStruct g;
868 int dir_ret, asc_ret, des_ret; 978 int dir_ret, asc_ret, des_ret;
869 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); 979 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);
870 980
… …
872 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; 982 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
873 983
874 if (width < g.width) width = g.width; 984 if (width < g.width) width = g.width;
875 } 985 }
876 986
877 if (cs == CS_UNKNOWN) 987#if 0 // do it per-character
988 if (prop && width > prop->width)
878 { 989 {
879 fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);
880
881 clear (); 990 clear ();
882 return false; 991 return false;
883 } 992 }
884
885#if 0 // do it per-character
886 if (prop && width > prop->width)
887 {
888 clear ();
889 return false;
890 }
891#endif 993#endif
892 994
893 return true; 995 return true;
894} 996}
895 997
… …
904} 1006}
905 1007
906bool 1008bool
907rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const 1009rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
908{ 1010{
1011 careful = false;
1012
909 uint32_t ch = FROM_UNICODE (cs, unicode); 1013 uint32_t ch = FROM_UNICODE (cs, unicode);
910 1014
911 if (ch == NOCHAR) 1015 if (ch == NOCHAR)
912 return false; 1016 return false;
913 1017
914 /* check wether the character exists in _this_ font. horrible. */ 1018 /* check whether the character exists in _this_ font. horrible. */
915 XCharStruct *xcs; 1019 XCharStruct *xcs;
916 1020
917 if (encm) 1021 if (encm)
918 { 1022 {
919 unsigned char byte1 = ch >> 8; 1023 unsigned char byte1 = ch >> 8;
… …
949 return false; 1053 return false;
950 1054
951 if (!prop || prop->width == rxvt_fontprop::unset) 1055 if (!prop || prop->width == rxvt_fontprop::unset)
952 return true; 1056 return true;
953 1057
954 // check wether character overlaps previous/next character 1058 // check whether character overlaps previous/next character
955 int w = xcs->rbearing - xcs->lbearing; 1059 int w = xcs->rbearing - xcs->lbearing;
956 int wcw = max (WCWIDTH (unicode), 1); 1060 int wcw = max (WCWIDTH (unicode), 1);
957 1061
958 careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw; 1062 careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw;
959 1063
… …
976 dTermDisplay; 1080 dTermDisplay;
977 dTermGC; 1081 dTermGC;
978 1082
979 bool slow = this->slow 1083 bool slow = this->slow
980 || width != term->fwidth 1084 || width != term->fwidth
981 || height != term->fheight; 1085 || height != term->fheight
1086 || ascent != f->ascent;
982 1087
983 int base = ascent; // sorry, incorrect: term->fbase; 1088 int base = ascent; // sorry, incorrect: term->fbase;
984 1089
985 XGCValues v; 1090 XGCValues v;
986 v.foreground = term->pix_colors[fg]; 1091 v.foreground = term->pix_colors[fg];
… …
1054 1159
1055///////////////////////////////////////////////////////////////////////////// 1160/////////////////////////////////////////////////////////////////////////////
1056 1161
1057#if XFT 1162#if XFT
1058 1163
1059struct rxvt_font_xft : rxvt_font { 1164struct rxvt_font_xft : rxvt_font
1165{
1060 rxvt_font_xft () { f = 0; } 1166 rxvt_font_xft ()
1167 {
1168 can_compose = true;
1169 f = 0;
1170 }
1061 1171
1062 void clear (); 1172 void clear ();
1063 1173
1064 rxvt_fontprop properties (); 1174 rxvt_fontprop properties ();
1065 1175
… …
1133 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1243 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1134 1244
1135#if 0 // clipping unfortunately destroys our precious double-width-characters 1245#if 0 // clipping unfortunately destroys our precious double-width-characters
1136 // clip width, we can't do better, or can we? 1246 // clip width, we can't do better, or can we?
1137 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) 1247 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
1138 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop->width); 1248 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width);
1139#endif 1249#endif
1140 1250
1141 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch) 1251 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch)
1142 FcPatternAddBool (p, FC_MINSPACE, 1); 1252 FcPatternAddBool (p, FC_MINSPACE, 1);
1143 1253
… …
1155 int ftheight = 0; 1265 int ftheight = 0;
1156 bool success = true; 1266 bool success = true;
1157 1267
1158 for (;;) 1268 for (;;)
1159 { 1269 {
1270 p = FcPatternDuplicate (match);
1160 f = XftFontOpenPattern (disp, FcPatternDuplicate (match)); 1271 f = XftFontOpenPattern (disp, p);
1161 1272
1162 if (!f) 1273 if (!f)
1163 { 1274 {
1275 FcPatternDestroy (p);
1164 success = false; 1276 success = false;
1165 break; 1277 break;
1166 } 1278 }
1167 1279
1168 FT_Face face = XftLockFace (f); 1280 FT_Face face = XftLockFace (f);
… …
1176 1288
1177 XftUnlockFace (f); 1289 XftUnlockFace (f);
1178 1290
1179 int glheight = height; 1291 int glheight = height;
1180 1292
1181 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 1293 for (uint16_t *t = extent_test_chars; t < extent_test_chars + ecb_array_length (extent_test_chars); t++)
1182 { 1294 {
1183 FcChar16 ch = *t; 1295 FcChar16 ch = *t;
1184 1296
1185 if (cs != CS_UNICODE 1297 if (cs != CS_UNICODE
1186 && ch > 0x100 1298 && ch > 0x100
… …
1205 if (glheight < g.height - g.y) glheight = g.height - g.y; 1317 if (glheight < g.height - g.y) glheight = g.height - g.y;
1206 } 1318 }
1207 1319
1208 if (!width) 1320 if (!width)
1209 { 1321 {
1210 rxvt_warn ("unable to calculate font width for '%s', ignoring.\n", name); 1322 rxvt_warn ("unable to calculate font width for '%s', using max_advance_width.\n", name);
1211 1323 width = f->max_advance_width;
1212 XftFontClose (disp, f);
1213 f = 0;
1214
1215 success = false;
1216 break; 1324 break;
1217 } 1325 }
1218 1326
1219 if (prop.height == rxvt_fontprop::unset 1327 if (prop.height == rxvt_fontprop::unset
1220 || (height <= prop.height && glheight <= prop.height) 1328 || (height <= prop.height && glheight <= prop.height)
… …
1255bool 1363bool
1256rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const 1364rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
1257{ 1365{
1258 careful = false; 1366 careful = false;
1259 1367
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#endif
1374
1260 if (!XftCharExists (term->dpy, f, unicode)) 1375 if (!XftCharExists (term->dpy, f, unicode))
1376 return false;
1377
1378 // some fonts claim they can render private use chars and then
1379 // render them as boxes.
1380 if (ecb_expect_false (IS_COMPOSE (unicode)))
1261 return false; 1381 return false;
1262 1382
1263 if (!prop || prop->width == rxvt_fontprop::unset) 1383 if (!prop || prop->width == rxvt_fontprop::unset)
1264 return true; 1384 return true;
1265 1385
… …
1287rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, 1407rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1288 const text_t *text, int len, 1408 const text_t *text, int len,
1289 int fg, int bg) 1409 int fg, int bg)
1290{ 1410{
1291 XGlyphInfo extents; 1411 XGlyphInfo extents;
1292 XftGlyphSpec *enc = (XftGlyphSpec *)rxvt_temp_buf (len * sizeof (XftGlyphSpec)); 1412 XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len);
1293 XftGlyphSpec *ep = enc; 1413 XftGlyphSpec *ep = enc;
1294 1414
1295 dTermDisplay; 1415 dTermDisplay;
1296 dTermGC; 1416 dTermGC;
1297 1417
1298 int w = term->fwidth * len; 1418 int w = term->fwidth * len;
1299 int h = term->fheight; 1419 int h = term->fheight;
1300 1420
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; 1421 bool buffered = bg >= Color_transparent
1306#ifdef FORCE_UNBUFFERED_XFT 1422 && term->option (Opt_buffered);
1307 buffered = false;
1308#endif
1309 1423
1310 // cut trailing spaces 1424 // cut trailing spaces
1311 while (len && text [len - 1] == ' ') 1425 while (len && text [len - 1] == ' ')
1312 len--; 1426 len--;
1313 1427
… …
1317 while (len) 1431 while (len)
1318 { 1432 {
1319 int cwidth = term->fwidth; 1433 int cwidth = term->fwidth;
1320 FcChar32 fc = *text++; len--; 1434 FcChar32 fc = *text++; len--;
1321 1435
1436#if ENABLE_COMBINING && !UNICODE_3
1437 if (ecb_expect_false (IS_COMPOSE (fc)))
1438 if (compose_char *cc = rxvt_composite[fc]) // should always be true, but better be safe than sorry
1439 fc = cc->c1; // c2 must be NOCHAR, as has_char handles it that way
1440#endif
1441
1322 while (len && *text == NOCHAR) 1442 while (len && *text == NOCHAR)
1323 text++, len--, cwidth += term->fwidth; 1443 text++, len--, cwidth += term->fwidth;
1324 1444
1325 if (fc != ' ') // skip spaces 1445 if (fc != ' ') // skip spaces
1326 { 1446 {
… …
1344 { 1464 {
1345 if (ep != enc) 1465 if (ep != enc)
1346 { 1466 {
1347 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); 1467 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1348 1468
1349#ifdef HAVE_BG_PIXMAP 1469#ifdef HAVE_IMG
1350 Picture dst = 0; // the only assignment is done conditionally in the following if condition 1470 Picture dst = 0; // the only assignment is done conditionally in the following if condition
1351 1471
1352 if (term->bgPixmap.pixmap 1472 if (term->bg_img
1353 && (bg == Color_transparent || bg == Color_bg 1473 && (bg == Color_transparent || bg == Color_bg
1354 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2)))))) 1474 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2))))))
1355 { 1475 {
1356 int src_x = x, src_y = y; 1476 int src_x = x, src_y = y;
1357 1477
1358 if (term->bgPixmap.is_parentOrigin ()) 1478 if (term->bg_flags & rxvt_term::BG_IS_TRANSPARENT)
1359 { 1479 {
1360 src_x += term->window_vt_x; 1480 src_x += term->window_vt_x;
1361 src_y += term->window_vt_y; 1481 src_y += term->window_vt_y;
1362 } 1482 }
1363 1483
1364 if (term->bgPixmap.pmap_width >= src_x + w 1484 if (term->bg_img->w >= src_x + w
1365 && term->bgPixmap.pmap_height >= src_y + h) 1485 && term->bg_img->h >= src_y + h)
1366 { 1486 {
1367 XCopyArea (disp, term->bgPixmap.pixmap, d2, gc, 1487 XCopyArea (disp, term->bg_img->pm, d2, gc,
1368 src_x, src_y, w, h, 0, 0); 1488 src_x, src_y, w, h, 0, 0);
1369 } 1489 }
1370 else 1490 else
1371 { 1491 {
1372 XGCValues gcv; 1492 XGCValues gcv;
1373 1493
1374 gcv.fill_style = FillTiled; 1494 gcv.fill_style = FillTiled;
1375 gcv.tile = term->bgPixmap.pixmap; 1495 gcv.tile = term->bg_img->pm;
1376 gcv.ts_x_origin = -src_x; 1496 gcv.ts_x_origin = -src_x;
1377 gcv.ts_y_origin = -src_y; 1497 gcv.ts_y_origin = -src_y;
1378 1498
1379 XChangeGC (disp, gc, 1499 XChangeGC (disp, gc,
1380 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle, 1500 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
… …
1432 prop.width = prop.height = prop.ascent = prop.weight = prop.slant 1552 prop.width = prop.height = prop.ascent = prop.weight = prop.slant
1433 = rxvt_fontprop::unset; 1553 = rxvt_fontprop::unset;
1434 force_prop = false; 1554 force_prop = false;
1435 1555
1436 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) 1556 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1437 FONT_UNREF (*i); 1557 (*i)->unref ();
1438 1558
1439 for (pagemap **p = fmap.begin (); p != fmap.end (); p++) 1559 for (pagemap **p = fmap.begin (); p != fmap.end (); p++)
1440 delete *p; 1560 delete *p;
1441 1561
1442 free (fontdesc); fontdesc = 0; 1562 free (fontdesc); fontdesc = 0;
… …
1444 fonts.clear (); 1564 fonts.clear ();
1445 1565
1446 fallback = fallback_fonts; 1566 fallback = fallback_fonts;
1447} 1567}
1448 1568
1569void
1570rxvt_fontset::prepare_font (rxvt_font *font, codeset cs)
1571{
1572 font->set_term (term);
1573
1574 font->cs = cs;
1575 font->loaded = false;
1576}
1577
1449rxvt_font * 1578rxvt_font *
1450rxvt_fontset::new_font (const char *name, codeset cs) 1579rxvt_fontset::new_font (const char *name, codeset cs)
1451{ 1580{
1452 rxvt_font *f; 1581 rxvt_font *f;
1453 1582
… …
1469 f = new rxvt_font_x11; 1598 f = new rxvt_font_x11;
1470 } 1599 }
1471 else 1600 else
1472 f = new rxvt_font_x11; 1601 f = new rxvt_font_x11;
1473 1602
1474 f->set_term (term);
1475 f->set_name (strdup (name)); 1603 f->set_name (strdup (name));
1476 1604 prepare_font (f, cs);
1477 f->cs = cs;
1478 f->loaded = false;
1479 1605
1480 return f; 1606 return f;
1481} 1607}
1482 1608
1483///////////////////////////////////////////////////////////////////////////// 1609/////////////////////////////////////////////////////////////////////////////
1610
1611void
1612rxvt_fontset::push_font (rxvt_font *font)
1613{
1614 // the fontCount index is reserved for the overflow font, it is only
1615 // necessary when we get fontCount or more fonts, as they cannot be
1616 // represented in the rendition.
1617 if (fonts.size () == fontCount)
1618 {
1619 rxvt_font *f = new rxvt_font_overflow (this);
1620
1621 prepare_font (f, CS_UNICODE);
1622 fonts.push_back (f);
1623 }
1624
1625 fonts.push_back (font);
1626}
1484 1627
1485void 1628void
1486rxvt_fontset::add_fonts (const char *desc) 1629rxvt_fontset::add_fonts (const char *desc)
1487{ 1630{
1488 if (desc) 1631 if (desc)
… …
1517 cs = codeset_from_name (spec + sizeof ("codeset=") - 1); 1660 cs = codeset_from_name (spec + sizeof ("codeset=") - 1);
1518 else 1661 else
1519 rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec); 1662 rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec);
1520 1663
1521 desc++; 1664 desc++;
1522 while (*desc <= ' ') desc++; 1665 while (*desc <= ' ' && *desc) desc++;
1523 } 1666 }
1524 1667
1525 end = strchr (desc, ','); 1668 end = strchr (desc, ',');
1526 if (!end) 1669 if (!end)
1527 end = desc + strlen (desc); 1670 end = desc + strlen (desc);
… …
1529 if (end - desc < 511) 1672 if (end - desc < 511)
1530 { 1673 {
1531 memcpy (buf, desc, end - desc); 1674 memcpy (buf, desc, end - desc);
1532 buf[end - desc] = 0; 1675 buf[end - desc] = 0;
1533 1676
1534 fonts.push_back (new_font (buf, cs)); 1677 push_font (new_font (buf, cs));
1535 } 1678 }
1536 else 1679 else
1537 rxvt_warn ("fontset element too long (>511 bytes), ignored."); 1680 rxvt_warn ("fontset element too long (>511 bytes), ignored.\n");
1538 1681
1539 desc = end + 1; 1682 desc = end + 1;
1540 } 1683 }
1541 while (*end); 1684 while (*end);
1542 } 1685 }
… …
1567{ 1710{
1568 clear (); 1711 clear ();
1569 1712
1570 fontdesc = strdup (desc); 1713 fontdesc = strdup (desc);
1571 1714
1572 fonts.push_back (new_font (0, CS_UNICODE)); 1715 push_font (new_font (0, CS_UNICODE));
1573 realize_font (0); 1716 realize_font (0);
1574 1717
1575 add_fonts (desc); 1718 add_fonts (desc);
1576 1719
1577 return true; 1720 return true;
… …
1586 1729
1587 return -1; 1730 return -1;
1588} 1731}
1589 1732
1590int 1733int
1591rxvt_fontset::find_font (unicode_t unicode) 1734rxvt_fontset::find_font_idx (unicode_t unicode)
1592{ 1735{
1593 if (unicode >= 1<<20) 1736 // this limits fmap size. it has to accomodate COMPOSE_HI when UNICODE_3
1737 if (unicode > 0x1fffff)
1594 return 0; 1738 return 0;
1595 1739
1596 unicode_t hi = unicode >> 8; 1740 unicode_t hi = unicode >> 8;
1597 1741
1598 if (hi < fmap.size () 1742 if (hi < fmap.size ())
1599 && fmap[hi] 1743 if (pagemap *pm = fmap[hi])
1600 && (*fmap[hi])[unicode & 0xff] != 0xff) 1744 if ((*pm)[unicode & 0xff] != 0xff)
1601 return (*fmap[hi])[unicode & 0xff]; 1745 return (*pm)[unicode & 0xff];
1602 1746
1603 unsigned int i; 1747 unsigned int i;
1604 1748
1605 for (i = 0; i < fonts.size (); i++) 1749 for (i = 0; i < fonts.size (); i++)
1606 { 1750 {
… …
1622 goto next_font; 1766 goto next_font;
1623 1767
1624 bool careful; 1768 bool careful;
1625 if (f->has_char (unicode, &prop, careful)) 1769 if (f->has_char (unicode, &prop, careful))
1626 { 1770 {
1627 if (careful) 1771 i = (i << 1) | careful;
1628 i |= 128;
1629 1772
1630 goto found; 1773 goto found;
1631 } 1774 }
1632 1775
1633 next_font: 1776 next_font:
1634 if (i == fonts.size () - 1) 1777 if (i == fonts.size () - 1)
1635 { 1778 {
1779 // compose characters are handled by the default font, unless another font takes over
1780 // we do not go via the fallback list for speed reasons.
1781 if (IS_COMPOSE (unicode))
1782 return 0;
1783
1636 if (fallback->name) 1784 if (fallback->name)
1637 { 1785 {
1638 // search through the fallback list 1786 // search through the fallback list
1639 fonts.push_back (new_font (fallback->name, fallback->cs)); 1787 push_font (new_font (fallback->name, fallback->cs));
1640 fallback++; 1788 fallback++;
1641 } 1789 }
1642 else 1790 else
1643 { 1791 {
1644 // try to find a new font. 1792 // try to find a new font.
… …
1646 // way to configure this and xft is easier to hack in, 1794 // way to configure this and xft is easier to hack in,
1647 // while x11 has more framework in place already. 1795 // while x11 has more framework in place already.
1648 // TODO: this is a real resource hog, xft takes ages(?) 1796 // TODO: this is a real resource hog, xft takes ages(?)
1649#if XFT && USE_SLOW_LOOKUP 1797#if XFT && USE_SLOW_LOOKUP
1650 // grab the first xft font that seems suitable 1798 // grab the first xft font that seems suitable
1799 // TOOD: should go first for cellchar (spacing 110) then mono, then else
1651 FcPattern *p = FcPatternCreate (); 1800 FcPattern *p = FcPatternCreate ();
1652 1801
1653 FcCharSet *s = FcCharSetCreate (); 1802 FcCharSet *s = FcCharSetCreate ();
1654 FcCharSetAddChar (s, unicode); 1803 FcCharSetAddChar (s, unicode);
1655 FcPatternAddCharSet (p, FC_CHARSET, s); 1804 FcPatternAddCharSet (p, FC_CHARSET, s);
… …
1675 FcPatternDestroy (match); 1824 FcPatternDestroy (match);
1676 1825
1677 if (find_font (font) < 0) 1826 if (find_font (font) < 0)
1678 { 1827 {
1679 char fontname[4096]; 1828 char fontname[4096];
1680 sprintf (fontname, "xft:%-.4090s", font); 1829 snprintf (fontname, sizeof (fontname), "xft:%s", font);
1681 1830
1682 fonts.push_back (new_font (fontname, CS_UNICODE)); 1831 push_font (new_font (fontname, CS_UNICODE));
1683 } 1832 }
1684 1833
1685 free (font); 1834 free (font);
1686 } 1835 }
1687#endif 1836#endif
… …
1699 while (hi >= fmap.size ()) 1848 while (hi >= fmap.size ())
1700 fmap.push_back (0); 1849 fmap.push_back (0);
1701 1850
1702 if (!fmap[hi]) 1851 if (!fmap[hi])
1703 { 1852 {
1704 fmap[hi] = (pagemap *)new pagemap; 1853 fmap[hi] = new pagemap;
1705 memset (fmap[hi], 0xff, sizeof (pagemap)); 1854 memset (fmap[hi], 0xff, sizeof (pagemap));
1706 } 1855 }
1707 1856
1708 (*fmap[hi])[unicode & 0xff] = i; 1857 (*fmap[hi])[unicode & 0xff] = i;
1709 } 1858 }
1710 1859
1711 return i; 1860 return i;
1712} 1861}
1713 1862
1714
1715

Diff Legend

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