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.142 by root, Wed Jan 23 14:54:52 2008 UTC vs.
Revision 1.199 by root, Thu Jun 17 00:08:35 2021 UTC

1/*----------------------------------------------------------------------* 1/*----------------------------------------------------------------------*
2 * File: rxvtfont.C 2 * File: rxvtfont.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 4 * Copyright (c) 2003-2008 Marc Lehmann <schmorp@schmorp.de>
5 * - original version. 5 * - original version.
6 * 6 *
7 * This program is free software; you can redistribute it and/or modify 7 * This program is free software; you can redistribute it and/or modify
8 * it under the terms of the GNU General Public License as published by 8 * it under the terms of the GNU General Public License as published by
9 * the Free Software Foundation; either version 2 of the License, or 9 * the Free Software Foundation; either version 3 of the License, or
10 * (at your option) any later version. 10 * (at your option) any later version.
11 * 11 *
12 * This program is distributed in the hope that it will be useful, 12 * This program is distributed in the hope that it will be useful,
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of 13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
22#include "../config.h" 22#include "../config.h"
23#include "rxvt.h" 23#include "rxvt.h"
24#include "rxvtutil.h" 24#include "rxvtutil.h"
25#include "rxvtfont.h" 25#include "rxvtfont.h"
26 26
27#include <cstdlib> 27#include <stdlib.h>
28 28
29#include <inttypes.h> 29#include <inttypes.h>
30
31#if XFT
32# include <fontconfig/fontconfig.h>
33#endif
30 34
31#define MAX_OVERLAP_ROMAN (8 + 2) // max. character width in 8ths of the base width 35#define MAX_OVERLAP_ROMAN (8 + 2) // max. character width in 8ths of the base width
32#define MAX_OVERLAP_ITALIC (8 + 3) // max. overlap for italic fonts 36#define MAX_OVERLAP_ITALIC (8 + 3) // max. overlap for italic fonts
33 37
34#define OVERLAP_OK(w,wcw,prop) ((w) <= ( \ 38#define OVERLAP_OK(w,wcw,prop) ((w) <= ( \
35 (prop)->slant >= rxvt_fontprop::italic \ 39 (prop)->slant >= rxvt_fontprop::italic \
36 ? ((prop)->width * (wcw) * MAX_OVERLAP_ITALIC + 7) >> 3 \ 40 ? ((prop)->width * (wcw) * MAX_OVERLAP_ITALIC + 7) >> 3 \
37 : ((prop)->width * (wcw) * MAX_OVERLAP_ROMAN + 7) >> 3 \ 41 : ((prop)->width * (wcw) * MAX_OVERLAP_ROMAN + 7) >> 3 \
38 )) 42 ))
39 43
40const struct rxvt_fallback_font { 44static const struct rxvt_fallback_font {
41 codeset cs; 45 codeset cs;
42 const char *name; 46 const char *name;
43} fallback_fonts[] = { 47} fallback_fonts[] = {
44 { CS_ISO8859_1, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-1" }, 48 { CS_ISO8859_1, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-1" },
45 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-15" }, 49 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-15" },
… …
79 83
80 // japanese 84 // japanese
81#if ENCODING_JP || ENCODING_JP_EXT 85#if ENCODING_JP || ENCODING_JP_EXT
82# if XFT 86# if XFT
83 // prefer xft for complex scripts 87 // prefer xft for complex scripts
88 { CS_JIS0208_1990_0, "xft:Sazanami Mincho:antialias=false" },
84 { CS_JIS0208_1990_0, "xft:Kochi Gothic:antialias=false" }, 89 { CS_JIS0208_1990_0, "xft:Kochi Gothic:antialias=false" },
85 { CS_JIS0208_1990_0, "xft:Sazanami Mincho:antialias=false" },
86 { CS_JIS0208_1990_0, "xft:Mincho:antialias=false" }, 90 { CS_JIS0208_1990_0, "xft:Mincho:antialias=false" },
87 { CS_JIS0208_1990_0, "xft::lang=ja:antialias=false" }, 91 { CS_JIS0208_1990_0, "xft::lang=ja:antialias=false" },
88# endif 92# endif
89 { CS_JIS0201_1976_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0201*-0" }, 93 { CS_JIS0201_1976_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0201*-0" },
90 { CS_JIS0208_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" }, 94 { CS_JIS0208_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" },
… …
128 { CS_KSC5601_1987_0, "xft:Baekmuk Gulim:antialias=false" }, 132 { CS_KSC5601_1987_0, "xft:Baekmuk Gulim:antialias=false" },
129 { CS_KSC5601_1987_0, "xft::lang=ko:antialias=false" }, 133 { CS_KSC5601_1987_0, "xft::lang=ko:antialias=false" },
130# endif 134# endif
131#endif 135#endif
132 136
133 { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" },
134 //{ CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" }, // this gem of a font has actual dotted circles within the combining character glyphs. 137 //{ CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" }, // this gem of a font has actual dotted circles within the combining character glyphs.
135#if XFT 138#if XFT
136 { CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true" }, 139 { CS_UNICODE, "xft: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 {
… …
448 450
449 text_t chrs[2]; 451 text_t chrs[2];
450 chrs [1] = NOCHAR; 452 chrs [1] = NOCHAR;
451 453
452 *chrs = cc->c1; 454 *chrs = cc->c1;
453 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)]; 455 rxvt_font *f1 = (*fs)[fs->find_font_idx (cc->c1)];
454 f1->draw (d, x, y, chrs, width, fg, bg); 456 f1->draw (d, x, y, chrs, width, fg, bg);
455 457
456 if (cc->c2 != NOCHAR) 458 if (cc->c2 != NOCHAR)
457 { 459 {
458 bool careful; 460 bool careful;
459 461
460 // prefer font of first character, for no good reasons 462 // prefer font of first character, for no good reasons
461 *chrs = cc->c2; 463 *chrs = cc->c2;
462 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful) 464 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful)
463 ? f1 465 ? f1
464 : (*fs)[fs->find_font (cc->c2)]; 466 : (*fs)[fs->find_font_idx (cc->c2)];
465 467
466 f2->draw (d, x, y, chrs, width, fg, Color_none); 468 f2->draw (d, x, y, chrs, width, fg, Color_none);
467 } 469 }
468 } 470 }
469#endif 471#endif
… …
473 case '\t': 475 case '\t':
474 case ZERO_WIDTH_CHAR: 476 case ZERO_WIDTH_CHAR:
475 case NOCHAR: 477 case NOCHAR:
476 break; 478 break;
477 479
480 /*
481 * If the base font does not support variation selectors, treat them as ZWC.
482 * a point could be made to do this for all wcwidth == 0 characters, but I
483 * decided against that until more data is available.
484 */
485 case 0xfe00: case 0xfe01: case 0xfe02: case 0xfe03: case 0xfe04: case 0xfe05: case 0xfe06: case 0xfe07:
486 case 0xfe08: case 0xfe09: case 0xfe0a: case 0xfe0b: case 0xfe0c: case 0xfe0d: case 0xfe0e: case 0xfe0f:
487 break;
488
478 default: 489 default:
479 XDrawRectangle (disp, d, gc, x + 2, y + 2, 490 XDrawRectangle (disp, d, gc, x + 2, y + 2,
480 fwidth - 4, term->fheight - 4); 491 fwidth - 4, term->fheight - 4);
481 } 492 }
482 493
483 x += fwidth; 494 x += fwidth;
484 } 495 }
485} 496}
486 497
498struct rxvt_font_overflow : rxvt_font
499{
500 struct rxvt_fontset *fs;
501
502 rxvt_font_overflow (rxvt_fontset *fs)
503 : rxvt_font ()
504 {
505 this->fs = fs;
506 }
507
508 rxvt_fontprop properties ()
509 {
510 rxvt_fontprop p;
511
512 p.width = p.height = 1;
513 p.ascent = rxvt_fontprop::unset;
514 p.weight = rxvt_fontprop::medium;
515 p.slant = rxvt_fontprop::roman;
516
517 return p;
518 }
519
520 bool load (const rxvt_fontprop &prop, bool force_prop)
521 {
522 width = 1; height = 1;
523 ascent = 1; descent = 0;
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{
1060 rxvt_font_xft () { f = 0; } 1143 rxvt_font_xft ()
1144 {
1145 f = 0;
1146 }
1061 1147
1062 void clear (); 1148 void clear ();
1063 1149
1064 rxvt_fontprop properties (); 1150 rxvt_fontprop properties ();
1065 1151
… …
1133 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1219 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1134 1220
1135#if 0 // clipping unfortunately destroys our precious double-width-characters 1221#if 0 // clipping unfortunately destroys our precious double-width-characters
1136 // clip width, we can't do better, or can we? 1222 // clip width, we can't do better, or can we?
1137 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) 1223 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
1138 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop->width); 1224 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width);
1139#endif 1225#endif
1140 1226
1141 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch) 1227 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch)
1142 FcPatternAddBool (p, FC_MINSPACE, 1); 1228 FcPatternAddBool (p, FC_MINSPACE, 1);
1143 1229
… …
1155 int ftheight = 0; 1241 int ftheight = 0;
1156 bool success = true; 1242 bool success = true;
1157 1243
1158 for (;;) 1244 for (;;)
1159 { 1245 {
1246 p = FcPatternDuplicate (match);
1160 f = XftFontOpenPattern (disp, FcPatternDuplicate (match)); 1247 f = XftFontOpenPattern (disp, p);
1161 1248
1162 if (!f) 1249 if (!f)
1163 { 1250 {
1251 FcPatternDestroy (p);
1164 success = false; 1252 success = false;
1165 break; 1253 break;
1166 } 1254 }
1167 1255
1168 FT_Face face = XftLockFace (f); 1256 FT_Face face = XftLockFace (f);
… …
1176 1264
1177 XftUnlockFace (f); 1265 XftUnlockFace (f);
1178 1266
1179 int glheight = height; 1267 int glheight = height;
1180 1268
1181 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 1269 for (uint16_t *t = extent_test_chars; t < extent_test_chars + ecb_array_length (extent_test_chars); t++)
1182 { 1270 {
1183 FcChar16 ch = *t; 1271 FcChar16 ch = *t;
1184 1272
1185 if (cs != CS_UNICODE 1273 if (cs != CS_UNICODE
1186 && ch > 0x100 1274 && ch > 0x100
… …
1287rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, 1375rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1288 const text_t *text, int len, 1376 const text_t *text, int len,
1289 int fg, int bg) 1377 int fg, int bg)
1290{ 1378{
1291 XGlyphInfo extents; 1379 XGlyphInfo extents;
1292 XftGlyphSpec *enc = (XftGlyphSpec *)rxvt_temp_buf (len * sizeof (XftGlyphSpec)); 1380 XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len);
1293 XftGlyphSpec *ep = enc; 1381 XftGlyphSpec *ep = enc;
1294 1382
1295 dTermDisplay; 1383 dTermDisplay;
1296 dTermGC; 1384 dTermGC;
1297 1385
1298 int w = term->fwidth * len; 1386 int w = term->fwidth * len;
1299 int h = term->fheight; 1387 int h = term->fheight;
1300 1388
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; 1389 bool buffered = bg >= Color_transparent
1306#ifdef FORCE_UNBUFFERED_XFT 1390 && term->option (Opt_buffered);
1307 buffered = false;
1308#endif
1309 1391
1310 // cut trailing spaces 1392 // cut trailing spaces
1311 while (len && text [len - 1] == ' ') 1393 while (len && text [len - 1] == ' ')
1312 len--; 1394 len--;
1313 1395
… …
1344 { 1426 {
1345 if (ep != enc) 1427 if (ep != enc)
1346 { 1428 {
1347 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); 1429 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1348 1430
1349#ifdef HAVE_BG_PIXMAP 1431#ifdef HAVE_IMG
1350 Picture dst = 0; 1432 Picture dst = 0; // the only assignment is done conditionally in the following if condition
1351 1433
1352 if (term->bgPixmap.pixmap 1434 if (term->bg_img
1353 && (bg == Color_transparent || bg == Color_bg 1435 && (bg == Color_transparent || bg == Color_bg
1354 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2)))))) 1436 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2))))))
1355 { 1437 {
1356 int src_x = x, src_y = y; 1438 int src_x = x, src_y = y;
1357 1439
1358 if (term->bgPixmap.is_parentOrigin ()) 1440 if (term->bg_flags & rxvt_term::BG_IS_TRANSPARENT)
1359 { 1441 {
1360 src_x += term->window_vt_x; 1442 src_x += term->window_vt_x;
1361 src_y += term->window_vt_y; 1443 src_y += term->window_vt_y;
1362 } 1444 }
1363 1445
1364 if (term->bgPixmap.pmap_width >= src_x + w 1446 if (term->bg_img->w >= src_x + w
1365 && term->bgPixmap.pmap_height >= src_y + h) 1447 && term->bg_img->h >= src_y + h)
1366 { 1448 {
1367 XCopyArea (disp, term->bgPixmap.pixmap, d2, gc, 1449 XCopyArea (disp, term->bg_img->pm, d2, gc,
1368 src_x, src_y, w, h, 0, 0); 1450 src_x, src_y, w, h, 0, 0);
1369 } 1451 }
1370 else 1452 else
1371 { 1453 {
1372 XGCValues gcv; 1454 XGCValues gcv;
1373 1455
1374 gcv.fill_style = FillTiled; 1456 gcv.fill_style = FillTiled;
1375 gcv.tile = term->bgPixmap.pixmap; 1457 gcv.tile = term->bg_img->pm;
1376 gcv.ts_x_origin = -src_x; 1458 gcv.ts_x_origin = -src_x;
1377 gcv.ts_y_origin = -src_y; 1459 gcv.ts_y_origin = -src_y;
1378 1460
1379 XChangeGC (disp, gc, 1461 XChangeGC (disp, gc,
1380 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle, 1462 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
… …
1388 1470
1389 if (dst) 1471 if (dst)
1390 { 1472 {
1391 Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c); 1473 Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c);
1392 1474
1475 // dst can only be set when bg >= 0
1393 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h); 1476 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h);
1394 } 1477 }
1395 } 1478 }
1396 else 1479 else
1397#endif 1480#endif
1398 clear_rect (d2, 0, 0, w, h, bg); 1481 XftDrawRect (d2, &term->pix_colors[bg >= 0 ? bg : Color_bg].c, 0, 0, w, h);
1399 1482
1400 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc); 1483 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);
1401 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y); 1484 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
1402 } 1485 }
1403 else 1486 else
… …
1431 prop.width = prop.height = prop.ascent = prop.weight = prop.slant 1514 prop.width = prop.height = prop.ascent = prop.weight = prop.slant
1432 = rxvt_fontprop::unset; 1515 = rxvt_fontprop::unset;
1433 force_prop = false; 1516 force_prop = false;
1434 1517
1435 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) 1518 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1436 FONT_UNREF (*i); 1519 (*i)->unref ();
1437 1520
1438 for (pagemap **p = fmap.begin (); p != fmap.end (); p++) 1521 for (pagemap **p = fmap.begin (); p != fmap.end (); p++)
1439 delete *p; 1522 delete *p;
1440 1523
1441 free (fontdesc); fontdesc = 0; 1524 free (fontdesc); fontdesc = 0;
… …
1443 fonts.clear (); 1526 fonts.clear ();
1444 1527
1445 fallback = fallback_fonts; 1528 fallback = fallback_fonts;
1446} 1529}
1447 1530
1531void
1532rxvt_fontset::prepare_font (rxvt_font *font, codeset cs)
1533{
1534 font->set_term (term);
1535
1536 font->cs = cs;
1537 font->loaded = false;
1538}
1539
1448rxvt_font * 1540rxvt_font *
1449rxvt_fontset::new_font (const char *name, codeset cs) 1541rxvt_fontset::new_font (const char *name, codeset cs)
1450{ 1542{
1451 rxvt_font *f; 1543 rxvt_font *f;
1452 1544
… …
1468 f = new rxvt_font_x11; 1560 f = new rxvt_font_x11;
1469 } 1561 }
1470 else 1562 else
1471 f = new rxvt_font_x11; 1563 f = new rxvt_font_x11;
1472 1564
1473 f->set_term (term);
1474 f->set_name (strdup (name)); 1565 f->set_name (strdup (name));
1475 1566 prepare_font (f, cs);
1476 f->cs = cs;
1477 f->loaded = false;
1478 1567
1479 return f; 1568 return f;
1480} 1569}
1481 1570
1482///////////////////////////////////////////////////////////////////////////// 1571/////////////////////////////////////////////////////////////////////////////
1572
1573void
1574rxvt_fontset::push_font (rxvt_font *font)
1575{
1576 // the fontCount index is reserved for the overflow font, it is only
1577 // necessary when we get fontCount or more fonts, as they cannot be
1578 // represented in the rendition.
1579 if (fonts.size () == fontCount)
1580 {
1581 rxvt_font *f = new rxvt_font_overflow (this);
1582
1583 prepare_font (f, CS_UNICODE);
1584 fonts.push_back (f);
1585 }
1586
1587 fonts.push_back (font);
1588}
1483 1589
1484void 1590void
1485rxvt_fontset::add_fonts (const char *desc) 1591rxvt_fontset::add_fonts (const char *desc)
1486{ 1592{
1487 if (desc) 1593 if (desc)
… …
1516 cs = codeset_from_name (spec + sizeof ("codeset=") - 1); 1622 cs = codeset_from_name (spec + sizeof ("codeset=") - 1);
1517 else 1623 else
1518 rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec); 1624 rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec);
1519 1625
1520 desc++; 1626 desc++;
1521 while (*desc <= ' ') desc++; 1627 while (*desc <= ' ' && *desc) desc++;
1522 } 1628 }
1523 1629
1524 end = strchr (desc, ','); 1630 end = strchr (desc, ',');
1525 if (!end) 1631 if (!end)
1526 end = desc + strlen (desc); 1632 end = desc + strlen (desc);
… …
1528 if (end - desc < 511) 1634 if (end - desc < 511)
1529 { 1635 {
1530 memcpy (buf, desc, end - desc); 1636 memcpy (buf, desc, end - desc);
1531 buf[end - desc] = 0; 1637 buf[end - desc] = 0;
1532 1638
1533 fonts.push_back (new_font (buf, cs)); 1639 push_font (new_font (buf, cs));
1534 } 1640 }
1535 else 1641 else
1536 rxvt_warn ("fontset element too long (>511 bytes), ignored."); 1642 rxvt_warn ("fontset element too long (>511 bytes), ignored.\n");
1537 1643
1538 desc = end + 1; 1644 desc = end + 1;
1539 } 1645 }
1540 while (*end); 1646 while (*end);
1541 } 1647 }
… …
1566{ 1672{
1567 clear (); 1673 clear ();
1568 1674
1569 fontdesc = strdup (desc); 1675 fontdesc = strdup (desc);
1570 1676
1571 fonts.push_back (new_font (0, CS_UNICODE)); 1677 push_font (new_font (0, CS_UNICODE));
1572 realize_font (0); 1678 realize_font (0);
1573 1679
1574 add_fonts (desc); 1680 add_fonts (desc);
1575 1681
1576 return true; 1682 return true;
… …
1585 1691
1586 return -1; 1692 return -1;
1587} 1693}
1588 1694
1589int 1695int
1590rxvt_fontset::find_font (unicode_t unicode) 1696rxvt_fontset::find_font_idx (unicode_t unicode)
1591{ 1697{
1592 if (unicode >= 1<<20) 1698 if (unicode >= 1<<20)
1593 return 0; 1699 return 0;
1594 1700
1595 unicode_t hi = unicode >> 8; 1701 unicode_t hi = unicode >> 8;
… …
1621 goto next_font; 1727 goto next_font;
1622 1728
1623 bool careful; 1729 bool careful;
1624 if (f->has_char (unicode, &prop, careful)) 1730 if (f->has_char (unicode, &prop, careful))
1625 { 1731 {
1626 if (careful) 1732 i = (i << 1) | careful;
1627 i |= 128;
1628 1733
1629 goto found; 1734 goto found;
1630 } 1735 }
1631 1736
1632 next_font: 1737 next_font:
1633 if (i == fonts.size () - 1) 1738 if (i == fonts.size () - 1)
1634 { 1739 {
1635 if (fallback->name) 1740 if (fallback->name)
1636 { 1741 {
1637 // search through the fallback list 1742 // search through the fallback list
1638 fonts.push_back (new_font (fallback->name, fallback->cs)); 1743 push_font (new_font (fallback->name, fallback->cs));
1639 fallback++; 1744 fallback++;
1640 } 1745 }
1641 else 1746 else
1642 { 1747 {
1643 // try to find a new font. 1748 // try to find a new font.
… …
1645 // way to configure this and xft is easier to hack in, 1750 // way to configure this and xft is easier to hack in,
1646 // while x11 has more framework in place already. 1751 // while x11 has more framework in place already.
1647 // TODO: this is a real resource hog, xft takes ages(?) 1752 // TODO: this is a real resource hog, xft takes ages(?)
1648#if XFT && USE_SLOW_LOOKUP 1753#if XFT && USE_SLOW_LOOKUP
1649 // grab the first xft font that seems suitable 1754 // grab the first xft font that seems suitable
1755 // TOOD: should go first for cellchar (spacing 110) then mono, then else
1650 FcPattern *p = FcPatternCreate (); 1756 FcPattern *p = FcPatternCreate ();
1651 1757
1652 FcCharSet *s = FcCharSetCreate (); 1758 FcCharSet *s = FcCharSetCreate ();
1653 FcCharSetAddChar (s, unicode); 1759 FcCharSetAddChar (s, unicode);
1654 FcPatternAddCharSet (p, FC_CHARSET, s); 1760 FcPatternAddCharSet (p, FC_CHARSET, s);
… …
1674 FcPatternDestroy (match); 1780 FcPatternDestroy (match);
1675 1781
1676 if (find_font (font) < 0) 1782 if (find_font (font) < 0)
1677 { 1783 {
1678 char fontname[4096]; 1784 char fontname[4096];
1679 sprintf (fontname, "xft:%-.4090s", font); 1785 snprintf (fontname, sizeof (fontname), "xft:%s", font);
1680 1786
1681 fonts.push_back (new_font (fontname, CS_UNICODE)); 1787 push_font (new_font (fontname, CS_UNICODE));
1682 } 1788 }
1683 1789
1684 free (font); 1790 free (font);
1685 } 1791 }
1686#endif 1792#endif
… …
1698 while (hi >= fmap.size ()) 1804 while (hi >= fmap.size ())
1699 fmap.push_back (0); 1805 fmap.push_back (0);
1700 1806
1701 if (!fmap[hi]) 1807 if (!fmap[hi])
1702 { 1808 {
1703 fmap[hi] = (pagemap *)new pagemap; 1809 fmap[hi] = new pagemap;
1704 memset (fmap[hi], 0xff, sizeof (pagemap)); 1810 memset (fmap[hi], 0xff, sizeof (pagemap));
1705 } 1811 }
1706 1812
1707 (*fmap[hi])[unicode & 0xff] = i; 1813 (*fmap[hi])[unicode & 0xff] = i;
1708 } 1814 }
1709 1815
1710 return i; 1816 return i;
1711} 1817}
1712 1818
1713
1714

Diff Legend

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