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.139 by root, Wed Jan 23 14:09:21 2008 UTC vs.
Revision 1.195 by root, Mon Sep 7 14:50:56 2015 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{
… …
239 { 240 {
240#if XFT 241#if XFT
241 Picture dst; 242 Picture dst;
242 243
243# ifdef HAVE_BG_PIXMAP 244# ifdef HAVE_BG_PIXMAP
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
… …
448 449
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
… …
482 483
483 x += fwidth; 484 x += fwidth;
484 } 485 }
485} 486}
486 487
488struct rxvt_font_overflow : rxvt_font {
489 struct rxvt_fontset *fs;
490
491 rxvt_font_overflow (rxvt_fontset *fs)
492 : rxvt_font ()
493 {
494 this->fs = fs;
495 }
496
497 rxvt_fontprop properties ()
498 {
499 rxvt_fontprop p;
500
501 p.width = p.height = 1;
502 p.ascent = rxvt_fontprop::unset;
503 p.weight = rxvt_fontprop::medium;
504 p.slant = rxvt_fontprop::roman;
505
506 return p;
507 }
508
509 bool load (const rxvt_fontprop &prop, bool force_prop)
510 {
511 width = 1; height = 1;
512 ascent = 1; descent = 0;
513
514 set_name (strdup ("built-in rendition overflow font"));
515
516 return true;
517 }
518
519 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
520 {
521 return false;
522 }
523
524 void draw (rxvt_drawable &d, int x, int y,
525 const text_t *text, int len,
526 int fg, int bg)
527 {
528 while (len)
529 {
530 int fid = fs->find_font_idx (*text);
531 int w = 1;
532 while (w < len && text[w] == NOCHAR)
533 w++;
534 (*fs)[fid]->draw (d, x, y, text, w, fg, bg);
535 text += w;
536 len -= w;
537 x += term->fwidth * w;
538 }
539 }
540};
541
487///////////////////////////////////////////////////////////////////////////// 542/////////////////////////////////////////////////////////////////////////////
488 543
489struct rxvt_font_x11 : rxvt_font { 544struct rxvt_font_x11 : rxvt_font {
490 rxvt_font_x11 () { f = 0; } 545 rxvt_font_x11 () { f = 0; }
491 546
… …
499 554
500 void draw (rxvt_drawable &d, int x, int y, 555 void draw (rxvt_drawable &d, int x, int y,
501 const text_t *text, int len, 556 const text_t *text, int len,
502 int fg, int bg); 557 int fg, int bg);
503 558
504 bool slow; // wether this is a proportional font or has other funny characteristics 559 bool slow; // whether this is a proportional font or has other funny characteristics
505 XFontStruct *f; 560 XFontStruct *f;
506 bool enc2b, encm; 561 bool enc2b, encm;
507 562
508 char *get_property (XFontStruct *f, Atom property, const char *repl) const; 563 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); 564 bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth);
… …
666 f = XLoadQueryFont (disp, name); 721 f = XLoadQueryFont (disp, name);
667 722
668 if (!f) 723 if (!f)
669 return false; 724 return false;
670 725
671 char *new_name = get_property (f, XA_FONT, name); 726 char *new_name = get_property (f, XA_FONT, 0);
672 727
673 if (new_name) 728 if (new_name)
674 set_name (new_name); 729 set_name (new_name);
675 else 730 else
676 rxvt_warn ("font '%s' has no FONT property, continuing without.", name); 731 rxvt_warn ("font '%s' has no FONT property, continuing without.\n", name);
677 732
678 XFreeFont (disp, f); 733 XFreeFont (disp, f);
679 f = 0; 734 f = 0;
680 } 735 }
681 736
… …
738 free (fname); 793 free (fname);
739 if (replace_field (&fname, list[i], 11, '0', "0")) 794 if (replace_field (&fname, list[i], 11, '0', "0"))
740 diff += 300; // more heavily penalize what looks like scaled bitmap fonts 795 diff += 300; // more heavily penalize what looks like scaled bitmap fonts
741 } 796 }
742 797
743 if (!set_properties (p, fname)) 798 if (!set_properties (p, fname)
799 // also weed out too large fonts
800 || (prop.height != rxvt_fontprop::unset
801 && p.height > prop.height))
802 {
803 free (fname);
744 continue; 804 continue;
745 805 }
746 if (prop.height != rxvt_fontprop::unset
747 && p.height > prop.height) // weed out too large fonts
748 continue;
749 806
750 if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128; 807 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); 808 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); 809 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); 810 //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width);
… …
759 XFreeFontNames (list); 816 XFreeFontNames (list);
760 817
761 // this loop only iterates when the guessed font-size is too small 818 // this loop only iterates when the guessed font-size is too small
762 for (;;) 819 for (;;)
763 { 820 {
764 font_weight *best = fonts + count - 1; 821 font_weight *best = fonts;
765 822
766 for (font_weight *w = best; w-- > fonts; ) 823 for (font_weight *w = fonts + 1; w < fonts + count; w++)
767 if (w->diff <= best->diff) 824 if (w->diff < best->diff)
768 best = w; 825 best = w;
769 826
770 if (!best->name 827 if (!best->name
771 || !(f = XLoadQueryFont (disp, best->name))) 828 || !(f = XLoadQueryFont (disp, best->name)))
772 break; 829 break;
… …
792 return false; 849 return false;
793 850
794 char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0); 851 char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0);
795 char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0); 852 char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0);
796 853
854 cs = CS_UNKNOWN;
855
797 if (registry && encoding) 856 if (registry && encoding)
798 { 857 {
799 char charset[64]; 858 char charset[64];
800 snprintf (charset, 64, "%s-%s", registry, encoding); 859 snprintf (charset, 64, "%s-%s", registry, encoding);
801 860
802 cs = codeset_from_name (charset); 861 cs = codeset_from_name (charset);
803 } 862
804 else 863 if (cs == CS_UNKNOWN)
864 rxvt_warn ("%s: cannot deduce encoding from registry/encoding properties \"%s\", ignoring font.\n", name, charset);
805 { 865 }
866
867 free (registry);
868 free (encoding);
869
870 if (cs == CS_UNKNOWN)
871 {
806 const char *charset = get_property (f, XA_FONT, 0); 872 char *value = get_property (f, XA_FONT, 0);
873 const char *charset = value;
807 874
808 if (!charset) 875 if (!charset)
809 charset = name; 876 charset = name;
810 877
811 int count = 13; 878 int count = 13;
812 while (*charset) 879 while (*charset)
813 if (*charset++ == '-' && !--count) 880 if (*charset++ == '-' && !--count)
814 break; 881 break;
815 882
816 cs = codeset_from_name (charset); 883 cs = codeset_from_name (charset);
884 if (cs == CS_UNKNOWN)
885 rxvt_warn ("%s: cannot deduce encoding from font name property \"%s\", ignoring font.\n", name, charset);
886
887 free (value);
888 }
889
890 if (cs == CS_UNKNOWN)
817 } 891 {
818 892 clear ();
819 free (registry); 893 return false;
820 free (encoding); 894 }
821 895
822 if (cs == CS_UNICODE) 896 if (cs == CS_UNICODE)
823 cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font 897 cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font
824 898
825 encm = f->min_byte1 != 0 || f->max_byte1 != 0; 899 encm = f->min_byte1 != 0 || f->max_byte1 != 0;
… …
850 } 924 }
851#endif 925#endif
852 926
853 width = 1; 927 width = 1;
854 928
855 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 929 for (uint16_t *t = extent_test_chars; t < extent_test_chars + ecb_array_length (extent_test_chars); t++)
856 { 930 {
857 if (FROM_UNICODE (cs, *t) == NOCHAR) 931 if (FROM_UNICODE (cs, *t) == NOCHAR)
858 continue; 932 continue;
859 933
860 // ignore characters we wouldn't use anyways 934 // ignore characters we wouldn't use anyways
861 bool careful; 935 bool careful;
862 if (!has_char (*t, &prop, careful)) 936 if (!has_char (*t, &prop, careful))
863 continue; 937 continue;
864 938
865 XChar2b ch = { *t >> 8, *t }; 939 // the casts are needed in C++11 (see 8.5.1)
940 XChar2b ch = { (unsigned char)(*t >> 8), (unsigned char)*t };
866 941
867 XCharStruct g; 942 XCharStruct g;
868 int dir_ret, asc_ret, des_ret; 943 int dir_ret, asc_ret, des_ret;
869 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); 944 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);
870 945
… …
872 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; 947 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
873 948
874 if (width < g.width) width = g.width; 949 if (width < g.width) width = g.width;
875 } 950 }
876 951
877 if (cs == CS_UNKNOWN) 952#if 0 // do it per-character
953 if (prop && width > prop->width)
878 { 954 {
879 fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);
880
881 clear (); 955 clear ();
882 return false; 956 return false;
883 } 957 }
884
885#if 0 // do it per-character
886 if (prop && width > prop->width)
887 {
888 clear ();
889 return false;
890 }
891#endif 958#endif
892 959
893 return true; 960 return true;
894} 961}
895 962
… …
904} 971}
905 972
906bool 973bool
907rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const 974rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
908{ 975{
976 careful = false;
977
909 uint32_t ch = FROM_UNICODE (cs, unicode); 978 uint32_t ch = FROM_UNICODE (cs, unicode);
910 979
911 if (ch == NOCHAR) 980 if (ch == NOCHAR)
912 return false; 981 return false;
913 982
914 /* check wether the character exists in _this_ font. horrible. */ 983 /* check whether the character exists in _this_ font. horrible. */
915 XCharStruct *xcs; 984 XCharStruct *xcs;
916 985
917 if (encm) 986 if (encm)
918 { 987 {
919 unsigned char byte1 = ch >> 8; 988 unsigned char byte1 = ch >> 8;
… …
949 return false; 1018 return false;
950 1019
951 if (!prop || prop->width == rxvt_fontprop::unset) 1020 if (!prop || prop->width == rxvt_fontprop::unset)
952 return true; 1021 return true;
953 1022
954 // check wether character overlaps previous/next character 1023 // check whether character overlaps previous/next character
955 int w = xcs->rbearing - xcs->lbearing; 1024 int w = xcs->rbearing - xcs->lbearing;
956 int wcw = max (WCWIDTH (unicode), 1); 1025 int wcw = max (WCWIDTH (unicode), 1);
957 1026
958 careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw; 1027 careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw;
959 1028
… …
976 dTermDisplay; 1045 dTermDisplay;
977 dTermGC; 1046 dTermGC;
978 1047
979 bool slow = this->slow 1048 bool slow = this->slow
980 || width != term->fwidth 1049 || width != term->fwidth
981 || height != term->fheight; 1050 || height != term->fheight
1051 || ascent != f->ascent;
982 1052
983 int base = ascent; // sorry, incorrect: term->fbase; 1053 int base = ascent; // sorry, incorrect: term->fbase;
984 1054
985 XGCValues v; 1055 XGCValues v;
986 v.foreground = term->pix_colors[fg]; 1056 v.foreground = term->pix_colors[fg];
… …
1133 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1203 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1134 1204
1135#if 0 // clipping unfortunately destroys our precious double-width-characters 1205#if 0 // clipping unfortunately destroys our precious double-width-characters
1136 // clip width, we can't do better, or can we? 1206 // clip width, we can't do better, or can we?
1137 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) 1207 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
1138 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop->width); 1208 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width);
1139#endif 1209#endif
1140 1210
1141 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch) 1211 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch)
1142 FcPatternAddBool (p, FC_MINSPACE, 1); 1212 FcPatternAddBool (p, FC_MINSPACE, 1);
1143 1213
… …
1155 int ftheight = 0; 1225 int ftheight = 0;
1156 bool success = true; 1226 bool success = true;
1157 1227
1158 for (;;) 1228 for (;;)
1159 { 1229 {
1230 p = FcPatternDuplicate (match);
1160 f = XftFontOpenPattern (disp, FcPatternDuplicate (match)); 1231 f = XftFontOpenPattern (disp, p);
1161 1232
1162 if (!f) 1233 if (!f)
1163 { 1234 {
1235 FcPatternDestroy (p);
1164 success = false; 1236 success = false;
1165 break; 1237 break;
1166 } 1238 }
1167 1239
1168 FT_Face face = XftLockFace (f); 1240 FT_Face face = XftLockFace (f);
… …
1176 1248
1177 XftUnlockFace (f); 1249 XftUnlockFace (f);
1178 1250
1179 int glheight = height; 1251 int glheight = height;
1180 1252
1181 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 1253 for (uint16_t *t = extent_test_chars; t < extent_test_chars + ecb_array_length (extent_test_chars); t++)
1182 { 1254 {
1183 FcChar16 ch = *t; 1255 FcChar16 ch = *t;
1184 1256
1185 if (cs != CS_UNICODE 1257 if (cs != CS_UNICODE
1186 && ch > 0x100 1258 && ch > 0x100
… …
1287rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, 1359rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1288 const text_t *text, int len, 1360 const text_t *text, int len,
1289 int fg, int bg) 1361 int fg, int bg)
1290{ 1362{
1291 XGlyphInfo extents; 1363 XGlyphInfo extents;
1292 XftGlyphSpec *enc = (XftGlyphSpec *)rxvt_temp_buf (len * sizeof (XftGlyphSpec)); 1364 XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len);
1293 XftGlyphSpec *ep = enc; 1365 XftGlyphSpec *ep = enc;
1294 1366
1295 dTermDisplay; 1367 dTermDisplay;
1296 dTermGC; 1368 dTermGC;
1297 1369
1298 int w = term->fwidth * len; 1370 int w = term->fwidth * len;
1299 int h = term->fheight; 1371 int h = term->fheight;
1300 1372
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; 1373 bool buffered = bg >= Color_transparent
1306#ifdef FORCE_UNBUFFERED_XFT 1374 && term->option (Opt_buffered);
1307 buffered = false;
1308#endif
1309 buffered=false;//D
1310 1375
1311 // cut trailing spaces 1376 // cut trailing spaces
1312 while (len && text [len - 1] == ' ') 1377 while (len && text [len - 1] == ' ')
1313 len--; 1378 len--;
1314 1379
… …
1346 if (ep != enc) 1411 if (ep != enc)
1347 { 1412 {
1348 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); 1413 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1349 1414
1350#ifdef HAVE_BG_PIXMAP 1415#ifdef HAVE_BG_PIXMAP
1351 Picture dst = 0; 1416 Picture dst = 0; // the only assignment is done conditionally in the following if condition
1352 1417
1353 if (term->bgPixmap.pixmap 1418 if (term->bg_img
1354 && (bg == Color_transparent || bg == Color_bg 1419 && (bg == Color_transparent || bg == Color_bg
1355 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2)))))) 1420 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2))))))
1356 { 1421 {
1357 int src_x = x, src_y = y; 1422 int src_x = x, src_y = y;
1358 1423
1359 if (term->bgPixmap.is_parentOrigin ()) 1424 if (term->bg_flags & rxvt_term::BG_IS_TRANSPARENT)
1360 { 1425 {
1361 src_x += term->window_vt_x; 1426 src_x += term->window_vt_x;
1362 src_y += term->window_vt_y; 1427 src_y += term->window_vt_y;
1363 } 1428 }
1364 1429
1365 if (term->bgPixmap.pmap_width >= src_x + w 1430 if (term->bg_img->w >= src_x + w
1366 && term->bgPixmap.pmap_height >= src_y + h) 1431 && term->bg_img->h >= src_y + h)
1367 { 1432 {
1368 XCopyArea (disp, term->bgPixmap.pixmap, d2, gc, 1433 XCopyArea (disp, term->bg_img->pm, d2, gc,
1369 src_x, src_y, w, h, 0, 0); 1434 src_x, src_y, w, h, 0, 0);
1370 } 1435 }
1371 else 1436 else
1372 { 1437 {
1373 XGCValues gcv; 1438 XGCValues gcv;
1374 1439
1375 gcv.fill_style = FillTiled; 1440 gcv.fill_style = FillTiled;
1376 gcv.tile = term->bgPixmap.pixmap; 1441 gcv.tile = term->bg_img->pm;
1377 gcv.ts_x_origin = -src_x; 1442 gcv.ts_x_origin = -src_x;
1378 gcv.ts_y_origin = -src_y; 1443 gcv.ts_y_origin = -src_y;
1379 1444
1380 XChangeGC (disp, gc, 1445 XChangeGC (disp, gc,
1381 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle, 1446 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
… …
1389 1454
1390 if (dst) 1455 if (dst)
1391 { 1456 {
1392 Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c); 1457 Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c);
1393 1458
1459 // dst can only be set when bg >= 0
1394 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h); 1460 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h);
1395 } 1461 }
1396 } 1462 }
1397 else 1463 else
1398#endif 1464#endif
1399 XftDrawRect (d2, &term->pix_colors[bg == Color_transparent ? Color_bg : bg].c, 0, 0, w, h); 1465 XftDrawRect (d2, &term->pix_colors[bg >= 0 ? bg : Color_bg].c, 0, 0, w, h);
1400 1466
1401 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc); 1467 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);
1402 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y); 1468 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
1403 } 1469 }
1404 else 1470 else
… …
1432 prop.width = prop.height = prop.ascent = prop.weight = prop.slant 1498 prop.width = prop.height = prop.ascent = prop.weight = prop.slant
1433 = rxvt_fontprop::unset; 1499 = rxvt_fontprop::unset;
1434 force_prop = false; 1500 force_prop = false;
1435 1501
1436 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) 1502 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1437 FONT_UNREF (*i); 1503 (*i)->unref ();
1438 1504
1439 for (pagemap **p = fmap.begin (); p != fmap.end (); p++) 1505 for (pagemap **p = fmap.begin (); p != fmap.end (); p++)
1440 delete *p; 1506 delete *p;
1441 1507
1442 free (fontdesc); fontdesc = 0; 1508 free (fontdesc); fontdesc = 0;
… …
1444 fonts.clear (); 1510 fonts.clear ();
1445 1511
1446 fallback = fallback_fonts; 1512 fallback = fallback_fonts;
1447} 1513}
1448 1514
1515void
1516rxvt_fontset::prepare_font (rxvt_font *font, codeset cs)
1517{
1518 font->set_term (term);
1519
1520 font->cs = cs;
1521 font->loaded = false;
1522}
1523
1449rxvt_font * 1524rxvt_font *
1450rxvt_fontset::new_font (const char *name, codeset cs) 1525rxvt_fontset::new_font (const char *name, codeset cs)
1451{ 1526{
1452 rxvt_font *f; 1527 rxvt_font *f;
1453 1528
… …
1469 f = new rxvt_font_x11; 1544 f = new rxvt_font_x11;
1470 } 1545 }
1471 else 1546 else
1472 f = new rxvt_font_x11; 1547 f = new rxvt_font_x11;
1473 1548
1474 f->set_term (term);
1475 f->set_name (strdup (name)); 1549 f->set_name (strdup (name));
1476 1550 prepare_font (f, cs);
1477 f->cs = cs;
1478 f->loaded = false;
1479 1551
1480 return f; 1552 return f;
1481} 1553}
1482 1554
1483///////////////////////////////////////////////////////////////////////////// 1555/////////////////////////////////////////////////////////////////////////////
1556
1557void
1558rxvt_fontset::push_font (rxvt_font *font)
1559{
1560 // the fontCount index is reserved for the overflow font, it is only
1561 // necessary when we get fontCount or more fonts, as they cannot be
1562 // represented in the rendition.
1563 if (fonts.size () == fontCount)
1564 {
1565 rxvt_font *f = new rxvt_font_overflow (this);
1566
1567 prepare_font (f, CS_UNICODE);
1568 fonts.push_back (f);
1569 }
1570
1571 fonts.push_back (font);
1572}
1484 1573
1485void 1574void
1486rxvt_fontset::add_fonts (const char *desc) 1575rxvt_fontset::add_fonts (const char *desc)
1487{ 1576{
1488 if (desc) 1577 if (desc)
… …
1517 cs = codeset_from_name (spec + sizeof ("codeset=") - 1); 1606 cs = codeset_from_name (spec + sizeof ("codeset=") - 1);
1518 else 1607 else
1519 rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec); 1608 rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec);
1520 1609
1521 desc++; 1610 desc++;
1522 while (*desc <= ' ') desc++; 1611 while (*desc <= ' ' && *desc) desc++;
1523 } 1612 }
1524 1613
1525 end = strchr (desc, ','); 1614 end = strchr (desc, ',');
1526 if (!end) 1615 if (!end)
1527 end = desc + strlen (desc); 1616 end = desc + strlen (desc);
… …
1529 if (end - desc < 511) 1618 if (end - desc < 511)
1530 { 1619 {
1531 memcpy (buf, desc, end - desc); 1620 memcpy (buf, desc, end - desc);
1532 buf[end - desc] = 0; 1621 buf[end - desc] = 0;
1533 1622
1534 fonts.push_back (new_font (buf, cs)); 1623 push_font (new_font (buf, cs));
1535 } 1624 }
1536 else 1625 else
1537 rxvt_warn ("fontset element too long (>511 bytes), ignored."); 1626 rxvt_warn ("fontset element too long (>511 bytes), ignored.\n");
1538 1627
1539 desc = end + 1; 1628 desc = end + 1;
1540 } 1629 }
1541 while (*end); 1630 while (*end);
1542 } 1631 }
… …
1567{ 1656{
1568 clear (); 1657 clear ();
1569 1658
1570 fontdesc = strdup (desc); 1659 fontdesc = strdup (desc);
1571 1660
1572 fonts.push_back (new_font (0, CS_UNICODE)); 1661 push_font (new_font (0, CS_UNICODE));
1573 realize_font (0); 1662 realize_font (0);
1574 1663
1575 add_fonts (desc); 1664 add_fonts (desc);
1576 1665
1577 return true; 1666 return true;
… …
1586 1675
1587 return -1; 1676 return -1;
1588} 1677}
1589 1678
1590int 1679int
1591rxvt_fontset::find_font (unicode_t unicode) 1680rxvt_fontset::find_font_idx (unicode_t unicode)
1592{ 1681{
1593 if (unicode >= 1<<20) 1682 if (unicode >= 1<<20)
1594 return 0; 1683 return 0;
1595 1684
1596 unicode_t hi = unicode >> 8; 1685 unicode_t hi = unicode >> 8;
… …
1622 goto next_font; 1711 goto next_font;
1623 1712
1624 bool careful; 1713 bool careful;
1625 if (f->has_char (unicode, &prop, careful)) 1714 if (f->has_char (unicode, &prop, careful))
1626 { 1715 {
1627 if (careful) 1716 i = (i << 1) | careful;
1628 i |= 128;
1629 1717
1630 goto found; 1718 goto found;
1631 } 1719 }
1632 1720
1633 next_font: 1721 next_font:
1634 if (i == fonts.size () - 1) 1722 if (i == fonts.size () - 1)
1635 { 1723 {
1636 if (fallback->name) 1724 if (fallback->name)
1637 { 1725 {
1638 // search through the fallback list 1726 // search through the fallback list
1639 fonts.push_back (new_font (fallback->name, fallback->cs)); 1727 push_font (new_font (fallback->name, fallback->cs));
1640 fallback++; 1728 fallback++;
1641 } 1729 }
1642 else 1730 else
1643 { 1731 {
1644 // try to find a new font. 1732 // try to find a new font.
… …
1675 FcPatternDestroy (match); 1763 FcPatternDestroy (match);
1676 1764
1677 if (find_font (font) < 0) 1765 if (find_font (font) < 0)
1678 { 1766 {
1679 char fontname[4096]; 1767 char fontname[4096];
1680 sprintf (fontname, "xft:%-.4090s", font); 1768 snprintf (fontname, sizeof (fontname), "xft:%s", font);
1681 1769
1682 fonts.push_back (new_font (fontname, CS_UNICODE)); 1770 push_font (new_font (fontname, CS_UNICODE));
1683 } 1771 }
1684 1772
1685 free (font); 1773 free (font);
1686 } 1774 }
1687#endif 1775#endif
… …
1699 while (hi >= fmap.size ()) 1787 while (hi >= fmap.size ())
1700 fmap.push_back (0); 1788 fmap.push_back (0);
1701 1789
1702 if (!fmap[hi]) 1790 if (!fmap[hi])
1703 { 1791 {
1704 fmap[hi] = (pagemap *)new pagemap; 1792 fmap[hi] = new pagemap;
1705 memset (fmap[hi], 0xff, sizeof (pagemap)); 1793 memset (fmap[hi], 0xff, sizeof (pagemap));
1706 } 1794 }
1707 1795
1708 (*fmap[hi])[unicode & 0xff] = i; 1796 (*fmap[hi])[unicode & 0xff] = i;
1709 } 1797 }
1710 1798
1711 return i; 1799 return i;
1712} 1800}
1713 1801
1714
1715

Diff Legend

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