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.134 by root, Wed Jan 23 09:42:02 2008 UTC vs.
Revision 1.189 by root, Thu May 17 20:05:55 2012 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 2 of the License, or
… …
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{
… …
236 if (color == Color_bg || color == Color_transparent) 237 if (color == Color_bg || color == Color_transparent)
237 XClearArea (disp, d, x, y, w, h, false); 238 XClearArea (disp, d, x, y, w, h, false);
238 else if (color >= 0) 239 else if (color >= 0)
239 { 240 {
240#if XFT 241#if XFT
241 bool done = false; 242 Picture dst;
242 243
243# ifdef HAVE_BG_PIXMAP 244# ifdef HAVE_BG_PIXMAP
244 if (term->bgPixmap.pixmap && color >= 0 && !term->pix_colors[color].is_opaque ()) 245 if (term->bg_pixmap
245 { 246 && !term->pix_colors[color].is_opaque ()
246 Picture dst = XftDrawPicture (d); 247 && ((dst = XftDrawPicture (d))))
247
248 if (dst != 0)
249 { 248 {
250 XClearArea (disp, d, x, y, w, h, false); 249 XClearArea (disp, d, x, y, w, h, false);
250
251 Picture solid_color_pict = XftDrawSrcPicture (d, &term->pix_colors[color].c); 251 Picture solid_color_pict = XftDrawSrcPicture (d, &term->pix_colors[color].c);
252 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, x, y, w, h); 252 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, x, y, w, h);
253 done = true;
254 } 253 }
255 } 254 else
256# endif 255# endif
257 if (!done)
258 XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h); 256 XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);
259 257
260#else 258#else
261 XSetForeground (disp, gc, term->pix_colors[color]); 259 XSetForeground (disp, gc, term->pix_colors[color]);
262 XFillRectangle (disp, d, gc, x, y, w, h); 260 XFillRectangle (disp, d, gc, x, y, w, h);
… …
451 449
452 text_t chrs[2]; 450 text_t chrs[2];
453 chrs [1] = NOCHAR; 451 chrs [1] = NOCHAR;
454 452
455 *chrs = cc->c1; 453 *chrs = cc->c1;
456 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)]; 454 rxvt_font *f1 = (*fs)[fs->find_font_idx (cc->c1)];
457 f1->draw (d, x, y, chrs, width, fg, bg); 455 f1->draw (d, x, y, chrs, width, fg, bg);
458 456
459 if (cc->c2 != NOCHAR) 457 if (cc->c2 != NOCHAR)
460 { 458 {
461 bool careful; 459 bool careful;
462 460
463 // prefer font of first character, for no good reasons 461 // prefer font of first character, for no good reasons
464 *chrs = cc->c2; 462 *chrs = cc->c2;
465 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful) 463 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful)
466 ? f1 464 ? f1
467 : (*fs)[fs->find_font (cc->c2)]; 465 : (*fs)[fs->find_font_idx (cc->c2)];
468 466
469 f2->draw (d, x, y, chrs, width, fg, Color_none); 467 f2->draw (d, x, y, chrs, width, fg, Color_none);
470 } 468 }
471 } 469 }
472#endif 470#endif
… …
485 483
486 x += fwidth; 484 x += fwidth;
487 } 485 }
488} 486}
489 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
490///////////////////////////////////////////////////////////////////////////// 542/////////////////////////////////////////////////////////////////////////////
491 543
492struct rxvt_font_x11 : rxvt_font { 544struct rxvt_font_x11 : rxvt_font {
493 rxvt_font_x11 () { f = 0; } 545 rxvt_font_x11 () { f = 0; }
494 546
… …
502 554
503 void draw (rxvt_drawable &d, int x, int y, 555 void draw (rxvt_drawable &d, int x, int y,
504 const text_t *text, int len, 556 const text_t *text, int len,
505 int fg, int bg); 557 int fg, int bg);
506 558
507 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
508 XFontStruct *f; 560 XFontStruct *f;
509 bool enc2b, encm; 561 bool enc2b, encm;
510 562
511 char *get_property (XFontStruct *f, Atom property, const char *repl) const; 563 char *get_property (XFontStruct *f, Atom property, const char *repl) const;
512 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);
… …
669 f = XLoadQueryFont (disp, name); 721 f = XLoadQueryFont (disp, name);
670 722
671 if (!f) 723 if (!f)
672 return false; 724 return false;
673 725
674 char *new_name = get_property (f, XA_FONT, name); 726 char *new_name = get_property (f, XA_FONT, 0);
675 727
676 if (new_name) 728 if (new_name)
677 set_name (new_name); 729 set_name (new_name);
678 else 730 else
679 rxvt_warn ("font '%s' has no FONT property, continuing without.", name); 731 rxvt_warn ("font '%s' has no FONT property, continuing without.\n", name);
680 732
681 XFreeFont (disp, f); 733 XFreeFont (disp, f);
682 f = 0; 734 f = 0;
683 } 735 }
684 736
… …
741 free (fname); 793 free (fname);
742 if (replace_field (&fname, list[i], 11, '0', "0")) 794 if (replace_field (&fname, list[i], 11, '0', "0"))
743 diff += 300; // more heavily penalize what looks like scaled bitmap fonts 795 diff += 300; // more heavily penalize what looks like scaled bitmap fonts
744 } 796 }
745 797
746 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);
747 continue; 804 continue;
748 805 }
749 if (prop.height != rxvt_fontprop::unset
750 && p.height > prop.height) // weed out too large fonts
751 continue;
752 806
753 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;
754 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);
755 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);
756 //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);
… …
762 XFreeFontNames (list); 816 XFreeFontNames (list);
763 817
764 // 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
765 for (;;) 819 for (;;)
766 { 820 {
767 font_weight *best = fonts + count - 1; 821 font_weight *best = fonts;
768 822
769 for (font_weight *w = best; w-- > fonts; ) 823 for (font_weight *w = fonts + 1; w < fonts + count; w++)
770 if (w->diff <= best->diff) 824 if (w->diff < best->diff)
771 best = w; 825 best = w;
772 826
773 if (!best->name 827 if (!best->name
774 || !(f = XLoadQueryFont (disp, best->name))) 828 || !(f = XLoadQueryFont (disp, best->name)))
775 break; 829 break;
… …
795 return false; 849 return false;
796 850
797 char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0); 851 char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0);
798 char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0); 852 char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0);
799 853
854 cs = CS_UNKNOWN;
855
800 if (registry && encoding) 856 if (registry && encoding)
801 { 857 {
802 char charset[64]; 858 char charset[64];
803 snprintf (charset, 64, "%s-%s", registry, encoding); 859 snprintf (charset, 64, "%s-%s", registry, encoding);
804 860
805 cs = codeset_from_name (charset); 861 cs = codeset_from_name (charset);
806 } 862
807 else 863 if (cs == CS_UNKNOWN)
864 rxvt_warn ("%s: cannot deduce encoding from registry/encoding properties \"%s\", ignoring font.\n", name, charset);
808 { 865 }
866
867 free (registry);
868 free (encoding);
869
870 if (cs == CS_UNKNOWN)
871 {
809 const char *charset = get_property (f, XA_FONT, 0); 872 char *value = get_property (f, XA_FONT, 0);
873 const char *charset = value;
810 874
811 if (!charset) 875 if (!charset)
812 charset = name; 876 charset = name;
813 877
814 int count = 13; 878 int count = 13;
815 while (*charset) 879 while (*charset)
816 if (*charset++ == '-' && !--count) 880 if (*charset++ == '-' && !--count)
817 break; 881 break;
818 882
819 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)
820 } 891 {
821 892 clear ();
822 free (registry); 893 return false;
823 free (encoding); 894 }
824 895
825 if (cs == CS_UNICODE) 896 if (cs == CS_UNICODE)
826 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
827 898
828 encm = f->min_byte1 != 0 || f->max_byte1 != 0; 899 encm = f->min_byte1 != 0 || f->max_byte1 != 0;
… …
853 } 924 }
854#endif 925#endif
855 926
856 width = 1; 927 width = 1;
857 928
858 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++)
859 { 930 {
860 if (FROM_UNICODE (cs, *t) == NOCHAR) 931 if (FROM_UNICODE (cs, *t) == NOCHAR)
861 continue; 932 continue;
862 933
863 // ignore characters we wouldn't use anyways 934 // ignore characters we wouldn't use anyways
… …
875 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; 946 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
876 947
877 if (width < g.width) width = g.width; 948 if (width < g.width) width = g.width;
878 } 949 }
879 950
880 if (cs == CS_UNKNOWN) 951#if 0 // do it per-character
952 if (prop && width > prop->width)
881 { 953 {
882 fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);
883
884 clear (); 954 clear ();
885 return false; 955 return false;
886 } 956 }
887
888#if 0 // do it per-character
889 if (prop && width > prop->width)
890 {
891 clear ();
892 return false;
893 }
894#endif 957#endif
895 958
896 return true; 959 return true;
897} 960}
898 961
… …
907} 970}
908 971
909bool 972bool
910rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const 973rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
911{ 974{
975 careful = false;
976
912 uint32_t ch = FROM_UNICODE (cs, unicode); 977 uint32_t ch = FROM_UNICODE (cs, unicode);
913 978
914 if (ch == NOCHAR) 979 if (ch == NOCHAR)
915 return false; 980 return false;
916 981
917 /* check wether the character exists in _this_ font. horrible. */ 982 /* check whether the character exists in _this_ font. horrible. */
918 XCharStruct *xcs; 983 XCharStruct *xcs;
919 984
920 if (encm) 985 if (encm)
921 { 986 {
922 unsigned char byte1 = ch >> 8; 987 unsigned char byte1 = ch >> 8;
… …
952 return false; 1017 return false;
953 1018
954 if (!prop || prop->width == rxvt_fontprop::unset) 1019 if (!prop || prop->width == rxvt_fontprop::unset)
955 return true; 1020 return true;
956 1021
957 // check wether character overlaps previous/next character 1022 // check whether character overlaps previous/next character
958 int w = xcs->rbearing - xcs->lbearing; 1023 int w = xcs->rbearing - xcs->lbearing;
959 int wcw = max (WCWIDTH (unicode), 1); 1024 int wcw = max (WCWIDTH (unicode), 1);
960 1025
961 careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw; 1026 careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw;
962 1027
… …
1136 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1201 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1137 1202
1138#if 0 // clipping unfortunately destroys our precious double-width-characters 1203#if 0 // clipping unfortunately destroys our precious double-width-characters
1139 // clip width, we can't do better, or can we? 1204 // clip width, we can't do better, or can we?
1140 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) 1205 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
1141 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop->width); 1206 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width);
1142#endif 1207#endif
1143 1208
1144 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch) 1209 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch)
1145 FcPatternAddBool (p, FC_MINSPACE, 1); 1210 FcPatternAddBool (p, FC_MINSPACE, 1);
1146 1211
… …
1158 int ftheight = 0; 1223 int ftheight = 0;
1159 bool success = true; 1224 bool success = true;
1160 1225
1161 for (;;) 1226 for (;;)
1162 { 1227 {
1228 p = FcPatternDuplicate (match);
1163 f = XftFontOpenPattern (disp, FcPatternDuplicate (match)); 1229 f = XftFontOpenPattern (disp, p);
1164 1230
1165 if (!f) 1231 if (!f)
1166 { 1232 {
1233 FcPatternDestroy (p);
1167 success = false; 1234 success = false;
1168 break; 1235 break;
1169 } 1236 }
1170 1237
1171 FT_Face face = XftLockFace (f); 1238 FT_Face face = XftLockFace (f);
… …
1179 1246
1180 XftUnlockFace (f); 1247 XftUnlockFace (f);
1181 1248
1182 int glheight = height; 1249 int glheight = height;
1183 1250
1184 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 1251 for (uint16_t *t = extent_test_chars; t < extent_test_chars + ecb_array_length (extent_test_chars); t++)
1185 { 1252 {
1186 FcChar16 ch = *t; 1253 FcChar16 ch = *t;
1187 1254
1188 if (cs != CS_UNICODE 1255 if (cs != CS_UNICODE
1189 && ch > 0x100 1256 && ch > 0x100
… …
1290rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, 1357rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1291 const text_t *text, int len, 1358 const text_t *text, int len,
1292 int fg, int bg) 1359 int fg, int bg)
1293{ 1360{
1294 XGlyphInfo extents; 1361 XGlyphInfo extents;
1295 XftGlyphSpec *enc = (XftGlyphSpec *)rxvt_temp_buf (len * sizeof (XftGlyphSpec)); 1362 XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len);
1296 XftGlyphSpec *ep = enc; 1363 XftGlyphSpec *ep = enc;
1297 1364
1298 dTermDisplay; 1365 dTermDisplay;
1299 dTermGC; 1366 dTermGC;
1300 1367
1301 int w = term->fwidth * len; 1368 int w = term->fwidth * len;
1302 int h = term->fheight; 1369 int h = term->fheight;
1303 1370
1304 /*
1305 * Maybe make buffering into a resource flag? Compile time option doesn't seems like a
1306 * good idea from the perspective of packaging for wide variety of user configs.
1307 */
1308 bool buffered = bg >= Color_transparent; 1371 bool buffered = bg >= Color_transparent
1309#ifdef FORCE_UNBUFFERED_XFT 1372 && term->option (Opt_buffered);
1310 buffered = false;
1311#endif
1312 1373
1313 // cut trailing spaces 1374 // cut trailing spaces
1314 while (len && text [len - 1] == ' ') 1375 while (len && text [len - 1] == ' ')
1315 len--; 1376 len--;
1316 1377
… …
1345 1406
1346 if (buffered) 1407 if (buffered)
1347 { 1408 {
1348 if (ep != enc) 1409 if (ep != enc)
1349 { 1410 {
1350 bool back_rendered = false;
1351 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); 1411 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1352 1412
1353#ifdef HAVE_BG_PIXMAP 1413#ifdef HAVE_BG_PIXMAP
1414 Picture dst = 0; // the only assignment is done conditionally in the following if condition
1354 1415
1355 if (term->bgPixmap.pixmap 1416 if (term->bg_pixmap
1356 && !(bg >= 0 && term->pix_colors[bg].is_opaque ())) 1417 && (bg == Color_transparent || bg == Color_bg
1418 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2))))))
1357 { 1419 {
1358 Picture dst = XftDrawPicture (d2);
1359
1360 int src_x = x, src_y = y; 1420 int src_x = x, src_y = y;
1361 1421
1362 if (term->bgPixmap.is_parentOrigin ()) 1422 if (term->bg_flags & rxvt_term::BG_IS_TRANSPARENT)
1363 { 1423 {
1364 src_x += term->window_vt_x; 1424 src_x += term->window_vt_x;
1365 src_y += term->window_vt_y; 1425 src_y += term->window_vt_y;
1366 } 1426 }
1367 1427
1368 if (term->bgPixmap.pmap_width >= src_x+w 1428 if (term->bg_pmap_width >= src_x + w
1369 && term->bgPixmap.pmap_height >= src_y+h) 1429 && term->bg_pmap_height >= src_y + h)
1370 { 1430 {
1371 XCopyArea (disp, term->bgPixmap.pixmap, d2, gc, 1431 XCopyArea (disp, term->bg_pixmap, d2, gc,
1372 src_x, src_y, w, h, 0, 0); 1432 src_x, src_y, w, h, 0, 0);
1373 } 1433 }
1374 else 1434 else
1375 { 1435 {
1376 XGCValues gcv; 1436 XGCValues gcv;
1377 1437
1378 gcv.fill_style = FillTiled; 1438 gcv.fill_style = FillTiled;
1379 gcv.tile = term->bgPixmap.pixmap; 1439 gcv.tile = term->bg_pixmap;
1380 gcv.ts_x_origin = -src_x; 1440 gcv.ts_x_origin = -src_x;
1381 gcv.ts_y_origin = -src_y; 1441 gcv.ts_y_origin = -src_y;
1382 1442
1383 XChangeGC (disp, gc, 1443 XChangeGC (disp, gc,
1384 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle, 1444 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
… …
1388 1448
1389 gcv.fill_style = FillSolid; 1449 gcv.fill_style = FillSolid;
1390 XChangeGC (disp, gc, GCFillStyle, &gcv); 1450 XChangeGC (disp, gc, GCFillStyle, &gcv);
1391 } 1451 }
1392 1452
1393 if (bg >= 0 && dst) // colour must be (and is) non-opaque here 1453 if (dst)
1394 { 1454 {
1395 Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c); 1455 Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c);
1456
1457 // dst can only be set when bg >= 0
1396 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h); 1458 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h);
1397 } 1459 }
1398
1399 back_rendered = true;
1400 } 1460 }
1461 else
1401#endif 1462#endif
1402
1403 if (!back_rendered)
1404 XftDrawRect (d2, &term->pix_colors[bg < 0 ? Color_bg : bg].c, 0, 0, w, h); 1463 XftDrawRect (d2, &term->pix_colors[bg >= 0 ? bg : Color_bg].c, 0, 0, w, h);
1405 1464
1406 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc); 1465 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);
1407 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y); 1466 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
1408 } 1467 }
1409 else 1468 else
… …
1437 prop.width = prop.height = prop.ascent = prop.weight = prop.slant 1496 prop.width = prop.height = prop.ascent = prop.weight = prop.slant
1438 = rxvt_fontprop::unset; 1497 = rxvt_fontprop::unset;
1439 force_prop = false; 1498 force_prop = false;
1440 1499
1441 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) 1500 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1442 FONT_UNREF (*i); 1501 (*i)->unref ();
1443 1502
1444 for (pagemap **p = fmap.begin (); p != fmap.end (); p++) 1503 for (pagemap **p = fmap.begin (); p != fmap.end (); p++)
1445 delete *p; 1504 delete [] *p;
1446 1505
1447 free (fontdesc); fontdesc = 0; 1506 free (fontdesc); fontdesc = 0;
1448 1507
1449 fonts.clear (); 1508 fonts.clear ();
1450 1509
1451 fallback = fallback_fonts; 1510 fallback = fallback_fonts;
1511}
1512
1513void
1514rxvt_fontset::prepare_font (rxvt_font *font, codeset cs)
1515{
1516 font->set_term (term);
1517
1518 font->cs = cs;
1519 font->loaded = false;
1452} 1520}
1453 1521
1454rxvt_font * 1522rxvt_font *
1455rxvt_fontset::new_font (const char *name, codeset cs) 1523rxvt_fontset::new_font (const char *name, codeset cs)
1456{ 1524{
… …
1474 f = new rxvt_font_x11; 1542 f = new rxvt_font_x11;
1475 } 1543 }
1476 else 1544 else
1477 f = new rxvt_font_x11; 1545 f = new rxvt_font_x11;
1478 1546
1479 f->set_term (term);
1480 f->set_name (strdup (name)); 1547 f->set_name (strdup (name));
1481 1548 prepare_font (f, cs);
1482 f->cs = cs;
1483 f->loaded = false;
1484 1549
1485 return f; 1550 return f;
1486} 1551}
1487 1552
1488///////////////////////////////////////////////////////////////////////////// 1553/////////////////////////////////////////////////////////////////////////////
1554
1555void
1556rxvt_fontset::push_font (rxvt_font *font)
1557{
1558 // the fontCount index is reserved for the overflow font, it is only
1559 // necessary when we get fontCount or more fonts, as they cannot be
1560 // represented in the rendition.
1561 if (fonts.size () == fontCount)
1562 {
1563 rxvt_font *f = new rxvt_font_overflow (this);
1564
1565 prepare_font (f, CS_UNICODE);
1566 fonts.push_back (f);
1567 }
1568
1569 fonts.push_back (font);
1570}
1489 1571
1490void 1572void
1491rxvt_fontset::add_fonts (const char *desc) 1573rxvt_fontset::add_fonts (const char *desc)
1492{ 1574{
1493 if (desc) 1575 if (desc)
… …
1534 if (end - desc < 511) 1616 if (end - desc < 511)
1535 { 1617 {
1536 memcpy (buf, desc, end - desc); 1618 memcpy (buf, desc, end - desc);
1537 buf[end - desc] = 0; 1619 buf[end - desc] = 0;
1538 1620
1539 fonts.push_back (new_font (buf, cs)); 1621 push_font (new_font (buf, cs));
1540 } 1622 }
1541 else 1623 else
1542 rxvt_warn ("fontset element too long (>511 bytes), ignored."); 1624 rxvt_warn ("fontset element too long (>511 bytes), ignored.\n");
1543 1625
1544 desc = end + 1; 1626 desc = end + 1;
1545 } 1627 }
1546 while (*end); 1628 while (*end);
1547 } 1629 }
… …
1572{ 1654{
1573 clear (); 1655 clear ();
1574 1656
1575 fontdesc = strdup (desc); 1657 fontdesc = strdup (desc);
1576 1658
1577 fonts.push_back (new_font (0, CS_UNICODE)); 1659 push_font (new_font (0, CS_UNICODE));
1578 realize_font (0); 1660 realize_font (0);
1579 1661
1580 add_fonts (desc); 1662 add_fonts (desc);
1581 1663
1582 return true; 1664 return true;
… …
1591 1673
1592 return -1; 1674 return -1;
1593} 1675}
1594 1676
1595int 1677int
1596rxvt_fontset::find_font (unicode_t unicode) 1678rxvt_fontset::find_font_idx (unicode_t unicode)
1597{ 1679{
1598 if (unicode >= 1<<20) 1680 if (unicode >= 1<<20)
1599 return 0; 1681 return 0;
1600 1682
1601 unicode_t hi = unicode >> 8; 1683 unicode_t hi = unicode >> 8;
… …
1627 goto next_font; 1709 goto next_font;
1628 1710
1629 bool careful; 1711 bool careful;
1630 if (f->has_char (unicode, &prop, careful)) 1712 if (f->has_char (unicode, &prop, careful))
1631 { 1713 {
1632 if (careful) 1714 i = (i << 1) | careful;
1633 i |= 128;
1634 1715
1635 goto found; 1716 goto found;
1636 } 1717 }
1637 1718
1638 next_font: 1719 next_font:
1639 if (i == fonts.size () - 1) 1720 if (i == fonts.size () - 1)
1640 { 1721 {
1641 if (fallback->name) 1722 if (fallback->name)
1642 { 1723 {
1643 // search through the fallback list 1724 // search through the fallback list
1644 fonts.push_back (new_font (fallback->name, fallback->cs)); 1725 push_font (new_font (fallback->name, fallback->cs));
1645 fallback++; 1726 fallback++;
1646 } 1727 }
1647 else 1728 else
1648 { 1729 {
1649 // try to find a new font. 1730 // try to find a new font.
… …
1680 FcPatternDestroy (match); 1761 FcPatternDestroy (match);
1681 1762
1682 if (find_font (font) < 0) 1763 if (find_font (font) < 0)
1683 { 1764 {
1684 char fontname[4096]; 1765 char fontname[4096];
1685 sprintf (fontname, "xft:%-.4090s", font); 1766 snprintf (fontname, sizeof (fontname), "xft:%s", font);
1686 1767
1687 fonts.push_back (new_font (fontname, CS_UNICODE)); 1768 push_font (new_font (fontname, CS_UNICODE));
1688 } 1769 }
1689 1770
1690 free (font); 1771 free (font);
1691 } 1772 }
1692#endif 1773#endif
… …
1704 while (hi >= fmap.size ()) 1785 while (hi >= fmap.size ())
1705 fmap.push_back (0); 1786 fmap.push_back (0);
1706 1787
1707 if (!fmap[hi]) 1788 if (!fmap[hi])
1708 { 1789 {
1709 fmap[hi] = (pagemap *)new pagemap; 1790 fmap[hi] = new pagemap;
1710 memset (fmap[hi], 0xff, sizeof (pagemap)); 1791 memset (fmap[hi], 0xff, sizeof (pagemap));
1711 } 1792 }
1712 1793
1713 (*fmap[hi])[unicode & 0xff] = i; 1794 (*fmap[hi])[unicode & 0xff] = i;
1714 } 1795 }
1715 1796
1716 return i; 1797 return i;
1717} 1798}
1718 1799
1719
1720

Diff Legend

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