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.125 by ayin, Sun Nov 25 11:23:18 2007 UTC vs.
Revision 1.178 by root, Mon Feb 21 07:41:03 2011 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
… …
19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA 19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20 *---------------------------------------------------------------------*/ 20 *---------------------------------------------------------------------*/
21 21
22#include "../config.h" 22#include "../config.h"
23#include "rxvt.h" 23#include "rxvt.h"
24#include "rxvtlib.h"
25#include "rxvtutil.h" 24#include "rxvtutil.h"
26#include "rxvtfont.h" 25#include "rxvtfont.h"
27 26
28#include <cstdlib> 27#include <cstdlib>
29 28
30#include <inttypes.h> 29#include <inttypes.h>
30
31#if XFT
32# include <fontconfig/fontconfig.h>
33#endif
31 34
32#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
33#define MAX_OVERLAP_ITALIC (8 + 3) // max. overlap for italic fonts 36#define MAX_OVERLAP_ITALIC (8 + 3) // max. overlap for italic fonts
34 37
35#define OVERLAP_OK(w,wcw,prop) ((w) <= ( \ 38#define OVERLAP_OK(w,wcw,prop) ((w) <= ( \
36 (prop)->slant >= rxvt_fontprop::italic \ 39 (prop)->slant >= rxvt_fontprop::italic \
37 ? ((prop)->width * (wcw) * MAX_OVERLAP_ITALIC + 7) >> 3 \ 40 ? ((prop)->width * (wcw) * MAX_OVERLAP_ITALIC + 7) >> 3 \
38 : ((prop)->width * (wcw) * MAX_OVERLAP_ROMAN + 7) >> 3 \ 41 : ((prop)->width * (wcw) * MAX_OVERLAP_ROMAN + 7) >> 3 \
39 )) 42 ))
40 43
41const struct rxvt_fallback_font { 44static const struct rxvt_fallback_font {
42 codeset cs; 45 codeset cs;
43 const char *name; 46 const char *name;
44} fallback_fonts[] = { 47} fallback_fonts[] = {
45 { CS_ISO8859_1, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-1" }, 48 { CS_ISO8859_1, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-1" },
46 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-15" }, 49 { CS_ISO8859_15, "-*-*-*-r-*--*-*-*-*-c-*-iso8859-15" },
… …
80 83
81 // japanese 84 // japanese
82#if ENCODING_JP || ENCODING_JP_EXT 85#if ENCODING_JP || ENCODING_JP_EXT
83# if XFT 86# if XFT
84 // prefer xft for complex scripts 87 // prefer xft for complex scripts
88 { CS_JIS0208_1990_0, "xft:Sazanami Mincho:antialias=false" },
85 { CS_JIS0208_1990_0, "xft:Kochi Gothic:antialias=false" }, 89 { CS_JIS0208_1990_0, "xft:Kochi Gothic:antialias=false" },
86 { CS_JIS0208_1990_0, "xft:Sazanami Mincho:antialias=false" },
87 { CS_JIS0208_1990_0, "xft:Mincho:antialias=false" }, 90 { CS_JIS0208_1990_0, "xft:Mincho:antialias=false" },
88 { CS_JIS0208_1990_0, "xft::lang=ja:antialias=false" }, 91 { CS_JIS0208_1990_0, "xft::lang=ja:antialias=false" },
89# endif 92# endif
90 { CS_JIS0201_1976_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0201*-0" }, 93 { CS_JIS0201_1976_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0201*-0" },
91 { CS_JIS0208_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" }, 94 { CS_JIS0208_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" },
… …
156 '0', '1', '8', 'a', 'd', 'x', 'm', 'y', 'g', 'W', 'X', '\'', '_', 159 '0', '1', '8', 'a', 'd', 'x', 'm', 'y', 'g', 'W', 'X', '\'', '_',
157 0x00cd, 0x00d5, 0x0114, 0x0177, 0x0643, // ÍÕĔŷﻙ 160 0x00cd, 0x00d5, 0x0114, 0x0177, 0x0643, // ÍÕĔŷﻙ
158 0x304c, 0x672c, // が本 161 0x304c, 0x672c, // が本
159}; 162};
160 163
161#define NUM_EXTENT_TEST_CHARS (sizeof (extent_test_chars) / sizeof (extent_test_chars[0]))
162
163#define dTermDisplay Display *disp = term->dpy 164#define dTermDisplay Display *disp = term->dpy
164#define dTermGC GC gc = term->gc 165#define dTermGC GC gc = term->gc
165 166
166///////////////////////////////////////////////////////////////////////////// 167/////////////////////////////////////////////////////////////////////////////
167 168
… …
217: name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset) 218: name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset)
218{ 219{
219} 220}
220 221
221void 222void
222rxvt_font::set_name (char *name) 223rxvt_font::set_name (char *name_)
223{ 224{
224 if (this->name == name) 225 if (name == name_)
225 return; 226 return;
226 227
227 if (this->name) free (this->name); // let the compiler optimize 228 if (name) free (name); // let the compiler optimize
228 this->name = name; 229 name = name_;
229} 230}
230 231
231void 232void
232rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const 233rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const
233{ 234{
… …
237 if (color == Color_bg || color == Color_transparent) 238 if (color == Color_bg || color == Color_transparent)
238 XClearArea (disp, d, x, y, w, h, false); 239 XClearArea (disp, d, x, y, w, h, false);
239 else if (color >= 0) 240 else if (color >= 0)
240 { 241 {
241#if XFT 242#if XFT
242 bool done = false; 243 Picture dst;
244
243#ifdef HAVE_BG_PIXMAP 245# ifdef HAVE_BG_PIXMAP
244 if (term->bgPixmap.pixmap && color >= 0 && term->pix_colors[color].c.color.alpha < 0x0ff00) 246 if (term->bg_pixmap
245 { 247 && !term->pix_colors[color].is_opaque ()
246 Picture dst = XftDrawPicture (d); 248 && ((dst = XftDrawPicture (d))))
247 if (dst != 0)
248 { 249 {
249 XClearArea (disp, d, x, y, w, h, false); 250 XClearArea (disp, d, x, y, w, h, false);
251
250 Picture solid_color_pict = XftDrawSrcPicture (d, &term->pix_colors[color].c); 252 Picture solid_color_pict = XftDrawSrcPicture (d, &term->pix_colors[color].c);
251 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, x, y, w, h); 253 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, x, y, w, h);
252 done = true;
253 } 254 }
254 } 255 else
255#endif 256# endif
256 if (!done)
257 XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h); 257 XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);
258
258#else 259#else
259 XSetForeground (disp, gc, term->pix_colors[color]); 260 XSetForeground (disp, gc, term->pix_colors[color]);
260 XFillRectangle (disp, d, gc, x, y, w, h); 261 XFillRectangle (disp, d, gc, x, y, w, h);
261#endif 262#endif
262 } 263 }
… …
449 450
450 text_t chrs[2]; 451 text_t chrs[2];
451 chrs [1] = NOCHAR; 452 chrs [1] = NOCHAR;
452 453
453 *chrs = cc->c1; 454 *chrs = cc->c1;
454 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)]; 455 rxvt_font *f1 = (*fs)[fs->find_font_idx (cc->c1)];
455 f1->draw (d, x, y, chrs, width, fg, bg); 456 f1->draw (d, x, y, chrs, width, fg, bg);
456 457
457 if (cc->c2 != NOCHAR) 458 if (cc->c2 != NOCHAR)
458 { 459 {
459 bool careful; 460 bool careful;
460 461
461 // prefer font of first character, for no good reasons 462 // prefer font of first character, for no good reasons
462 *chrs = cc->c2; 463 *chrs = cc->c2;
463 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful) 464 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful)
464 ? f1 465 ? f1
465 : (*fs)[fs->find_font (cc->c2)]; 466 : (*fs)[fs->find_font_idx (cc->c2)];
466 467
467 f2->draw (d, x, y, chrs, width, fg, Color_none); 468 f2->draw (d, x, y, chrs, width, fg, Color_none);
468 } 469 }
469 } 470 }
470#endif 471#endif
… …
483 484
484 x += fwidth; 485 x += fwidth;
485 } 486 }
486} 487}
487 488
489struct rxvt_font_overflow : rxvt_font {
490 struct rxvt_fontset *fs;
491
492 rxvt_font_overflow (rxvt_fontset *fs)
493 : rxvt_font ()
494 {
495 this->fs = fs;
496 }
497
498 rxvt_fontprop properties ()
499 {
500 rxvt_fontprop p;
501
502 p.width = p.height = 1;
503 p.ascent = rxvt_fontprop::unset;
504 p.weight = rxvt_fontprop::medium;
505 p.slant = rxvt_fontprop::roman;
506
507 return p;
508 }
509
510 bool load (const rxvt_fontprop &prop, bool force_prop)
511 {
512 width = 1; height = 1;
513 ascent = 1; descent = 0;
514
515 set_name (strdup ("built-in rendition overflow font"));
516
517 return true;
518 }
519
520 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
521 {
522 return false;
523 }
524
525 void draw (rxvt_drawable &d, int x, int y,
526 const text_t *text, int len,
527 int fg, int bg)
528 {
529 while (len--)
530 {
531 int fid = fs->find_font_idx (*text);
532 (*fs)[fid]->draw (d, x, y, text, 1, fg, bg);
533 ++text;
534 x += term->fwidth;
535 }
536 }
537};
538
488///////////////////////////////////////////////////////////////////////////// 539/////////////////////////////////////////////////////////////////////////////
489 540
490struct rxvt_font_x11 : rxvt_font { 541struct rxvt_font_x11 : rxvt_font {
491 rxvt_font_x11 () { f = 0; } 542 rxvt_font_x11 () { f = 0; }
492 543
… …
500 551
501 void draw (rxvt_drawable &d, int x, int y, 552 void draw (rxvt_drawable &d, int x, int y,
502 const text_t *text, int len, 553 const text_t *text, int len,
503 int fg, int bg); 554 int fg, int bg);
504 555
505 bool slow; // wether this is a proportional font or has other funny characteristics 556 bool slow; // whether this is a proportional font or has other funny characteristics
506 XFontStruct *f; 557 XFontStruct *f;
507 bool enc2b, encm; 558 bool enc2b, encm;
508 559
509 char *get_property (XFontStruct *f, Atom property, const char *repl) const; 560 char *get_property (XFontStruct *f, Atom property, const char *repl) const;
510 bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth); 561 bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth);
… …
632 683
633 if (slashes >= 13 && (!old || *field == old)) 684 if (slashes >= 13 && (!old || *field == old))
634 { 685 {
635 size_t len = field - name; 686 size_t len = field - name;
636 *ptr = (char *)malloc (len + strlen (replace) + strlen (end) + 1); 687 *ptr = (char *)malloc (len + strlen (replace) + strlen (end) + 1);
637 strncpy (*ptr, name, len); 688 memcpy (*ptr, name, len);
638 strcpy (*ptr + len, replace); 689 strcpy (*ptr + len, replace);
639 strcat (*ptr, end); 690 strcat (*ptr, end);
640 691
641 return true; 692 return true;
642 } 693 }
… …
667 f = XLoadQueryFont (disp, name); 718 f = XLoadQueryFont (disp, name);
668 719
669 if (!f) 720 if (!f)
670 return false; 721 return false;
671 722
672 char *new_name = get_property (f, XA_FONT, name); 723 char *new_name = get_property (f, XA_FONT, 0);
673 724
674 if (new_name) 725 if (new_name)
675 set_name (new_name); 726 set_name (new_name);
676 else 727 else
677 rxvt_warn ("font '%s' has no FONT property, continuing without.", name); 728 rxvt_warn ("font '%s' has no FONT property, continuing without.\n", name);
678 729
679 XFreeFont (disp, f); 730 XFreeFont (disp, f);
680 f = 0; 731 f = 0;
681 } 732 }
682 733
… …
739 free (fname); 790 free (fname);
740 if (replace_field (&fname, list[i], 11, '0', "0")) 791 if (replace_field (&fname, list[i], 11, '0', "0"))
741 diff += 300; // more heavily penalize what looks like scaled bitmap fonts 792 diff += 300; // more heavily penalize what looks like scaled bitmap fonts
742 } 793 }
743 794
744 if (!set_properties (p, fname)) 795 if (!set_properties (p, fname)
796 // also weed out too large fonts
797 || (prop.height != rxvt_fontprop::unset
798 && p.height > prop.height))
799 {
800 free (fname);
745 continue; 801 continue;
746 802 }
747 if (prop.height != rxvt_fontprop::unset
748 && p.height > prop.height) // weed out too large fonts
749 continue;
750 803
751 if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128; 804 if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128;
752 if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight); 805 if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight);
753 if (prop.slant != rxvt_fontprop::unset) diff += abs (prop.slant - p.slant); 806 if (prop.slant != rxvt_fontprop::unset) diff += abs (prop.slant - p.slant);
754 //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width); 807 //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width);
… …
793 return false; 846 return false;
794 847
795 char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0); 848 char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0);
796 char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0); 849 char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0);
797 850
851 cs = CS_UNKNOWN;
852
798 if (registry && encoding) 853 if (registry && encoding)
799 { 854 {
800 char charset[64]; 855 char charset[64];
801 snprintf (charset, 64, "%s-%s", registry, encoding); 856 snprintf (charset, 64, "%s-%s", registry, encoding);
802 857
803 cs = codeset_from_name (charset); 858 cs = codeset_from_name (charset);
804 } 859
805 else 860 if (cs == CS_UNKNOWN)
861 rxvt_warn ("%s: cannot deduce encoding from registry/encoding properties \"%s\", ignoring font.\n", name, charset);
806 { 862 }
863
864 free (registry);
865 free (encoding);
866
867 if (cs == CS_UNKNOWN)
868 {
807 const char *charset = get_property (f, XA_FONT, 0); 869 char *value = get_property (f, XA_FONT, 0);
870 const char *charset = value;
808 871
809 if (!charset) 872 if (!charset)
810 charset = name; 873 charset = name;
811 874
812 int count = 13; 875 int count = 13;
813 while (*charset) 876 while (*charset)
814 if (*charset++ == '-' && !--count) 877 if (*charset++ == '-' && !--count)
815 break; 878 break;
816 879
817 cs = codeset_from_name (charset); 880 cs = codeset_from_name (charset);
881 if (cs == CS_UNKNOWN)
882 rxvt_warn ("%s: cannot deduce encoding from font name property \"%s\", ignoring font.\n", name, charset);
883
884 free (value);
885 }
886
887 if (cs == CS_UNKNOWN)
818 } 888 {
819 889 clear ();
820 free (registry); 890 return false;
821 free (encoding); 891 }
822 892
823 if (cs == CS_UNICODE) 893 if (cs == CS_UNICODE)
824 cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font 894 cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font
825 895
826 encm = f->min_byte1 != 0 || f->max_byte1 != 0; 896 encm = f->min_byte1 != 0 || f->max_byte1 != 0;
… …
851 } 921 }
852#endif 922#endif
853 923
854 width = 1; 924 width = 1;
855 925
856 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 926 for (uint16_t *t = extent_test_chars + ARRAY_LENGTH(extent_test_chars); t-- > extent_test_chars; )
857 { 927 {
858 if (FROM_UNICODE (cs, *t) == NOCHAR) 928 if (FROM_UNICODE (cs, *t) == NOCHAR)
859 continue; 929 continue;
860 930
861 // ignore characters we wouldn't use anyways 931 // ignore characters we wouldn't use anyways
… …
873 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; 943 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
874 944
875 if (width < g.width) width = g.width; 945 if (width < g.width) width = g.width;
876 } 946 }
877 947
878 if (cs == CS_UNKNOWN) 948#if 0 // do it per-character
949 if (prop && width > prop->width)
879 { 950 {
880 fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);
881
882 clear (); 951 clear ();
883 return false; 952 return false;
884 } 953 }
885
886#if 0 // do it per-character
887 if (prop && width > prop->width)
888 {
889 clear ();
890 return false;
891 }
892#endif 954#endif
893 955
894 return true; 956 return true;
895} 957}
896 958
… …
905} 967}
906 968
907bool 969bool
908rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const 970rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
909{ 971{
972 careful = false;
973
910 uint32_t ch = FROM_UNICODE (cs, unicode); 974 uint32_t ch = FROM_UNICODE (cs, unicode);
911 975
912 if (ch == NOCHAR) 976 if (ch == NOCHAR)
913 return false; 977 return false;
914 978
915 /* check wether the character exists in _this_ font. horrible. */ 979 /* check whether the character exists in _this_ font. horrible. */
916 XCharStruct *xcs; 980 XCharStruct *xcs;
917 981
918 if (encm) 982 if (encm)
919 { 983 {
920 unsigned char byte1 = ch >> 8; 984 unsigned char byte1 = ch >> 8;
… …
950 return false; 1014 return false;
951 1015
952 if (!prop || prop->width == rxvt_fontprop::unset) 1016 if (!prop || prop->width == rxvt_fontprop::unset)
953 return true; 1017 return true;
954 1018
955 // check wether character overlaps previous/next character 1019 // check whether character overlaps previous/next character
956 int w = xcs->rbearing - xcs->lbearing; 1020 int w = xcs->rbearing - xcs->lbearing;
957 int wcw = max (WCWIDTH (unicode), 1); 1021 int wcw = max (WCWIDTH (unicode), 1);
958 1022
959 careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw; 1023 careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw;
960 1024
… …
1134 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1198 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1135 1199
1136#if 0 // clipping unfortunately destroys our precious double-width-characters 1200#if 0 // clipping unfortunately destroys our precious double-width-characters
1137 // clip width, we can't do better, or can we? 1201 // clip width, we can't do better, or can we?
1138 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) 1202 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
1139 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop->width); 1203 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width);
1140#endif 1204#endif
1141 1205
1142 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch) 1206 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch)
1143 FcPatternAddBool (p, FC_MINSPACE, 1); 1207 FcPatternAddBool (p, FC_MINSPACE, 1);
1144 1208
… …
1156 int ftheight = 0; 1220 int ftheight = 0;
1157 bool success = true; 1221 bool success = true;
1158 1222
1159 for (;;) 1223 for (;;)
1160 { 1224 {
1225 p = FcPatternDuplicate (match);
1161 f = XftFontOpenPattern (disp, FcPatternDuplicate (match)); 1226 f = XftFontOpenPattern (disp, p);
1162 1227
1163 if (!f) 1228 if (!f)
1164 { 1229 {
1230 FcPatternDestroy (p);
1165 success = false; 1231 success = false;
1166 break; 1232 break;
1167 } 1233 }
1168 1234
1169 FT_Face face = XftLockFace (f); 1235 FT_Face face = XftLockFace (f);
… …
1177 1243
1178 XftUnlockFace (f); 1244 XftUnlockFace (f);
1179 1245
1180 int glheight = height; 1246 int glheight = height;
1181 1247
1182 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 1248 for (uint16_t *t = extent_test_chars + ARRAY_LENGTH(extent_test_chars); t-- > extent_test_chars; )
1183 { 1249 {
1184 FcChar16 ch = *t; 1250 FcChar16 ch = *t;
1185 1251
1186 if (cs != CS_UNICODE 1252 if (cs != CS_UNICODE
1187 && ch > 0x100 1253 && ch > 0x100
… …
1288rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, 1354rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1289 const text_t *text, int len, 1355 const text_t *text, int len,
1290 int fg, int bg) 1356 int fg, int bg)
1291{ 1357{
1292 XGlyphInfo extents; 1358 XGlyphInfo extents;
1293 XftGlyphSpec *enc = (XftGlyphSpec *)rxvt_temp_buf (len * sizeof (XftGlyphSpec)); 1359 XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len);
1294 XftGlyphSpec *ep = enc; 1360 XftGlyphSpec *ep = enc;
1295 1361
1296 dTermDisplay; 1362 dTermDisplay;
1297 dTermGC; 1363 dTermGC;
1298 1364
1299 int w = term->fwidth * len; 1365 int w = term->fwidth * len;
1300 int h = term->fheight; 1366 int h = term->fheight;
1301 1367
1302 /* TODO: this logic needs some more thinking, since we no longer do pseudo-transparency. 1368 bool buffered = bg >= Color_transparent
1303 * Maybe make buffering into a resource flag? Compile time option doesn't seems like a 1369 && term->option (Opt_buffered);
1304 * good idea from the perspective of packaging for wide variety of user configs. 1370
1305 */
1306 bool buffered = true
1307#ifdef FORCE_UNBUFFERED_XFT
1308 && bg >= 0
1309#endif
1310 ;
1311 // cut trailing spaces 1371 // cut trailing spaces
1312 while (len && text [len - 1] == ' ') 1372 while (len && text [len - 1] == ' ')
1313 len--; 1373 len--;
1314 1374
1315 int x_ = buffered ? 0 : x; 1375 int x_ = buffered ? 0 : x;
… …
1341 x_ += cwidth; 1401 x_ += cwidth;
1342 } 1402 }
1343 1403
1344 if (buffered) 1404 if (buffered)
1345 { 1405 {
1346 bool back_rendered = false;
1347 if (ep != enc) 1406 if (ep != enc)
1348 { 1407 {
1349 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); 1408 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1350 1409
1351#ifdef HAVE_BG_PIXMAP 1410#ifdef HAVE_BG_PIXMAP
1411 Picture dst = 0; // the only assignment is done conditionally in the following if condition
1412
1352 if (term->bgPixmap.pixmap) 1413 if (term->bg_pixmap
1414 && (bg == Color_transparent || bg == Color_bg
1415 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2))))))
1353 { 1416 {
1354 Picture dst = 0; 1417 int src_x = x, src_y = y;
1355 1418
1356 if (bg >= 0 && term->pix_colors[bg].c.color.alpha < 0x0ff00) 1419 if (term->bg_flags & rxvt_term::BG_IS_TRANSPARENT)
1357 dst = XftDrawPicture (d2);
1358
1359 if (bg < 0 || dst != 0)
1360 { 1420 {
1361 int src_x = x, src_y = y ;
1362
1363 if (term->bgPixmap.is_parentOrigin ())
1364 {
1365 src_x += term->window_vt_x; 1421 src_x += term->window_vt_x;
1366 src_y += term->window_vt_y; 1422 src_y += term->window_vt_y;
1367 } 1423 }
1368 1424
1369 if (term->bgPixmap.pmap_width >= src_x+w 1425 if (term->bg_pmap_width >= src_x + w
1370 && term->bgPixmap.pmap_height >= src_y+h) 1426 && term->bg_pmap_height >= src_y + h)
1371 { 1427 {
1372 XCopyArea (disp, term->bgPixmap.pixmap, d2, gc, 1428 XCopyArea (disp, term->bg_pixmap, d2, gc,
1373 src_x, src_y, w, h, 0, 0); 1429 src_x, src_y, w, h, 0, 0);
1374 } 1430 }
1375 else 1431 else
1376 { 1432 {
1377 XGCValues gcv; 1433 XGCValues gcv;
1378 1434
1379 gcv.fill_style = FillTiled; 1435 gcv.fill_style = FillTiled;
1380 gcv.tile = term->bgPixmap.pixmap; 1436 gcv.tile = term->bg_pixmap;
1381 gcv.ts_x_origin = -src_x; 1437 gcv.ts_x_origin = -src_x;
1382 gcv.ts_y_origin = -src_y; 1438 gcv.ts_y_origin = -src_y;
1383 1439
1384 XChangeGC (disp, gc, 1440 XChangeGC (disp, gc,
1385 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle, 1441 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
1386 &gcv); 1442 &gcv);
1387 1443
1388 XFillRectangle (disp, d2, gc, 0, 0, w, h); 1444 XFillRectangle (disp, d2, gc, 0, 0, w, h);
1389 1445
1390 gcv.fill_style = FillSolid; 1446 gcv.fill_style = FillSolid;
1391 XChangeGC (disp, gc, GCFillStyle, &gcv); 1447 XChangeGC (disp, gc, GCFillStyle, &gcv);
1392 } 1448 }
1393 1449
1394 if (bg >= 0) 1450 if (dst)
1395 { 1451 {
1396 Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c); 1452 Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c);
1453
1454 // dst can only be set when bg >= 0
1397 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h); 1455 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h);
1398 }
1399
1400 back_rendered = true;
1401 } 1456 }
1402 } 1457 }
1458 else
1403#endif 1459#endif
1404
1405 if (bg >= 0 && !back_rendered)
1406 XftDrawRect (d2, &term->pix_colors[bg].c, 0, 0, w, h); 1460 XftDrawRect (d2, &term->pix_colors[bg >= 0 ? bg : Color_bg].c, 0, 0, w, h);
1407 1461
1408 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc); 1462 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);
1409 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y); 1463 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
1410 } 1464 }
1411 else 1465 else
… …
1439 prop.width = prop.height = prop.ascent = prop.weight = prop.slant 1493 prop.width = prop.height = prop.ascent = prop.weight = prop.slant
1440 = rxvt_fontprop::unset; 1494 = rxvt_fontprop::unset;
1441 force_prop = false; 1495 force_prop = false;
1442 1496
1443 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) 1497 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1444 FONT_UNREF (*i); 1498 (*i)->unref ();
1445 1499
1446 for (pagemap **p = fmap.begin (); p != fmap.end (); p++) 1500 for (pagemap **p = fmap.begin (); p != fmap.end (); p++)
1447 delete *p; 1501 delete *p;
1448 1502
1449 free (fontdesc); fontdesc = 0; 1503 free (fontdesc); fontdesc = 0;
… …
1451 fonts.clear (); 1505 fonts.clear ();
1452 1506
1453 fallback = fallback_fonts; 1507 fallback = fallback_fonts;
1454} 1508}
1455 1509
1510void
1511rxvt_fontset::prepare_font (rxvt_font *font, codeset cs)
1512{
1513 font->set_term (term);
1514
1515 font->cs = cs;
1516 font->loaded = false;
1517}
1518
1456rxvt_font * 1519rxvt_font *
1457rxvt_fontset::new_font (const char *name, codeset cs) 1520rxvt_fontset::new_font (const char *name, codeset cs)
1458{ 1521{
1459 rxvt_font *f; 1522 rxvt_font *f;
1460 1523
… …
1476 f = new rxvt_font_x11; 1539 f = new rxvt_font_x11;
1477 } 1540 }
1478 else 1541 else
1479 f = new rxvt_font_x11; 1542 f = new rxvt_font_x11;
1480 1543
1481 f->set_term (term);
1482 f->set_name (strdup (name)); 1544 f->set_name (strdup (name));
1483 1545 prepare_font (f, cs);
1484 f->cs = cs;
1485 f->loaded = false;
1486 1546
1487 return f; 1547 return f;
1488} 1548}
1489 1549
1490///////////////////////////////////////////////////////////////////////////// 1550/////////////////////////////////////////////////////////////////////////////
1551
1552void
1553rxvt_fontset::push_font (rxvt_font *font)
1554{
1555 // the fontCount index is reserved for the overflow font, it is only
1556 // necessary when we get fontCount or more fonts, as they cannot be
1557 // represented in the rendition.
1558 if (fonts.size () == fontCount)
1559 {
1560 rxvt_font *f = new rxvt_font_overflow (this);
1561
1562 prepare_font (f, CS_UNICODE);
1563 fonts.push_back (f);
1564 }
1565
1566 fonts.push_back (font);
1567}
1491 1568
1492void 1569void
1493rxvt_fontset::add_fonts (const char *desc) 1570rxvt_fontset::add_fonts (const char *desc)
1494{ 1571{
1495 if (desc) 1572 if (desc)
… …
1533 if (!end) 1610 if (!end)
1534 end = desc + strlen (desc); 1611 end = desc + strlen (desc);
1535 1612
1536 if (end - desc < 511) 1613 if (end - desc < 511)
1537 { 1614 {
1538 strncpy (buf, desc, end - desc); 1615 memcpy (buf, desc, end - desc);
1539 buf[end - desc] = 0; 1616 buf[end - desc] = 0;
1540 1617
1541 fonts.push_back (new_font (buf, cs)); 1618 push_font (new_font (buf, cs));
1542 } 1619 }
1543 else 1620 else
1544 rxvt_warn ("fontset element too long (>511 bytes), ignored."); 1621 rxvt_warn ("fontset element too long (>511 bytes), ignored.\n");
1545 1622
1546 desc = end + 1; 1623 desc = end + 1;
1547 } 1624 }
1548 while (*end); 1625 while (*end);
1549 } 1626 }
… …
1574{ 1651{
1575 clear (); 1652 clear ();
1576 1653
1577 fontdesc = strdup (desc); 1654 fontdesc = strdup (desc);
1578 1655
1579 fonts.push_back (new_font (0, CS_UNICODE)); 1656 push_font (new_font (0, CS_UNICODE));
1580 realize_font (0); 1657 realize_font (0);
1581 1658
1582 add_fonts (desc); 1659 add_fonts (desc);
1583 1660
1584 return true; 1661 return true;
… …
1593 1670
1594 return -1; 1671 return -1;
1595} 1672}
1596 1673
1597int 1674int
1598rxvt_fontset::find_font (unicode_t unicode) 1675rxvt_fontset::find_font_idx (unicode_t unicode)
1599{ 1676{
1600 if (unicode >= 1<<20) 1677 if (unicode >= 1<<20)
1601 return 0; 1678 return 0;
1602 1679
1603 unicode_t hi = unicode >> 8; 1680 unicode_t hi = unicode >> 8;
… …
1629 goto next_font; 1706 goto next_font;
1630 1707
1631 bool careful; 1708 bool careful;
1632 if (f->has_char (unicode, &prop, careful)) 1709 if (f->has_char (unicode, &prop, careful))
1633 { 1710 {
1634 if (careful) 1711 i = (i << 1) | careful;
1635 i |= 128;
1636 1712
1637 goto found; 1713 goto found;
1638 } 1714 }
1639 1715
1640 next_font: 1716 next_font:
1641 if (i == fonts.size () - 1) 1717 if (i == fonts.size () - 1)
1642 { 1718 {
1643 if (fallback->name) 1719 if (fallback->name)
1644 { 1720 {
1645 // search through the fallback list 1721 // search through the fallback list
1646 fonts.push_back (new_font (fallback->name, fallback->cs)); 1722 push_font (new_font (fallback->name, fallback->cs));
1647 fallback++; 1723 fallback++;
1648 } 1724 }
1649 else 1725 else
1650 { 1726 {
1651 // try to find a new font. 1727 // try to find a new font.
… …
1682 FcPatternDestroy (match); 1758 FcPatternDestroy (match);
1683 1759
1684 if (find_font (font) < 0) 1760 if (find_font (font) < 0)
1685 { 1761 {
1686 char fontname[4096]; 1762 char fontname[4096];
1687 sprintf (fontname, "xft:%-.4090s", font); 1763 snprintf (fontname, sizeof (fontname), "xft:%s", font);
1688 1764
1689 fonts.push_back (new_font (fontname, CS_UNICODE)); 1765 push_font (new_font (fontname, CS_UNICODE));
1690 } 1766 }
1691 1767
1692 free (font); 1768 free (font);
1693 } 1769 }
1694#endif 1770#endif
… …
1716 } 1792 }
1717 1793
1718 return i; 1794 return i;
1719} 1795}
1720 1796
1721
1722

Diff Legend

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