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.133 by root, Wed Jan 23 06:49:30 2008 UTC vs.
Revision 1.180 by sf-exg, Mon May 30 18:39: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
… …
26 26
27#include <cstdlib> 27#include <cstdlib>
28 28
29#include <inttypes.h> 29#include <inttypes.h>
30 30
31#if XFT
32# include <fontconfig/fontconfig.h>
33#endif
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" },
… …
155 '0', '1', '8', 'a', 'd', 'x', 'm', 'y', 'g', 'W', 'X', '\'', '_', 159 '0', '1', '8', 'a', 'd', 'x', 'm', 'y', 'g', 'W', 'X', '\'', '_',
156 0x00cd, 0x00d5, 0x0114, 0x0177, 0x0643, // ÍÕĔŷﻙ 160 0x00cd, 0x00d5, 0x0114, 0x0177, 0x0643, // ÍÕĔŷﻙ
157 0x304c, 0x672c, // が本 161 0x304c, 0x672c, // が本
158}; 162};
159 163
160#define NUM_EXTENT_TEST_CHARS (sizeof (extent_test_chars) / sizeof (extent_test_chars[0]))
161
162#define dTermDisplay Display *disp = term->dpy 164#define dTermDisplay Display *disp = term->dpy
163#define dTermGC GC gc = term->gc 165#define dTermGC GC gc = term->gc
164 166
165///////////////////////////////////////////////////////////////////////////// 167/////////////////////////////////////////////////////////////////////////////
166 168
… …
216: name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset) 218: name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset)
217{ 219{
218} 220}
219 221
220void 222void
221rxvt_font::set_name (char *name) 223rxvt_font::set_name (char *name_)
222{ 224{
223 if (this->name == name) 225 if (name == name_)
224 return; 226 return;
225 227
226 if (this->name) free (this->name); // let the compiler optimize 228 if (name) free (name); // let the compiler optimize
227 this->name = name; 229 name = name_;
228} 230}
229 231
230void 232void
231rxvt_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
232{ 234{
… …
236 if (color == Color_bg || color == Color_transparent) 238 if (color == Color_bg || color == Color_transparent)
237 XClearArea (disp, d, x, y, w, h, false); 239 XClearArea (disp, d, x, y, w, h, false);
238 else if (color >= 0) 240 else if (color >= 0)
239 { 241 {
240#if XFT 242#if XFT
241 bool done = false; 243 Picture dst;
242 244
243# ifdef HAVE_BG_PIXMAP 245# ifdef HAVE_BG_PIXMAP
244 if (term->bgPixmap.pixmap && color >= 0 && !term->pix_colors[color].is_opaque ()) 246 if (term->bg_pixmap
245 { 247 && !term->pix_colors[color].is_opaque ()
246 Picture dst = XftDrawPicture (d); 248 && ((dst = XftDrawPicture (d))))
247
248 if (dst != 0)
249 { 249 {
250 XClearArea (disp, d, x, y, w, h, false); 250 XClearArea (disp, d, x, y, w, h, false);
251
251 Picture solid_color_pict = XftDrawSrcPicture (d, &term->pix_colors[color].c); 252 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); 253 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, x, y, w, h);
253 done = true;
254 } 254 }
255 } 255 else
256# endif 256# endif
257 if (!done)
258 XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h); 257 XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);
259 258
260#else 259#else
261 XSetForeground (disp, gc, term->pix_colors[color]); 260 XSetForeground (disp, gc, term->pix_colors[color]);
262 XFillRectangle (disp, d, gc, x, y, w, h); 261 XFillRectangle (disp, d, gc, x, y, w, h);
… …
451 450
452 text_t chrs[2]; 451 text_t chrs[2];
453 chrs [1] = NOCHAR; 452 chrs [1] = NOCHAR;
454 453
455 *chrs = cc->c1; 454 *chrs = cc->c1;
456 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)]; 455 rxvt_font *f1 = (*fs)[fs->find_font_idx (cc->c1)];
457 f1->draw (d, x, y, chrs, width, fg, bg); 456 f1->draw (d, x, y, chrs, width, fg, bg);
458 457
459 if (cc->c2 != NOCHAR) 458 if (cc->c2 != NOCHAR)
460 { 459 {
461 bool careful; 460 bool careful;
462 461
463 // prefer font of first character, for no good reasons 462 // prefer font of first character, for no good reasons
464 *chrs = cc->c2; 463 *chrs = cc->c2;
465 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful) 464 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful)
466 ? f1 465 ? f1
467 : (*fs)[fs->find_font (cc->c2)]; 466 : (*fs)[fs->find_font_idx (cc->c2)];
468 467
469 f2->draw (d, x, y, chrs, width, fg, Color_none); 468 f2->draw (d, x, y, chrs, width, fg, Color_none);
470 } 469 }
471 } 470 }
472#endif 471#endif
… …
485 484
486 x += fwidth; 485 x += fwidth;
487 } 486 }
488} 487}
489 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 int w = 1;
533 while (w < len && text[w] == NOCHAR)
534 w++;
535 (*fs)[fid]->draw (d, x, y, text, w, fg, bg);
536 text += w;
537 len -= w;
538 x += term->fwidth * w;
539 }
540 }
541};
542
490///////////////////////////////////////////////////////////////////////////// 543/////////////////////////////////////////////////////////////////////////////
491 544
492struct rxvt_font_x11 : rxvt_font { 545struct rxvt_font_x11 : rxvt_font {
493 rxvt_font_x11 () { f = 0; } 546 rxvt_font_x11 () { f = 0; }
494 547
… …
502 555
503 void draw (rxvt_drawable &d, int x, int y, 556 void draw (rxvt_drawable &d, int x, int y,
504 const text_t *text, int len, 557 const text_t *text, int len,
505 int fg, int bg); 558 int fg, int bg);
506 559
507 bool slow; // wether this is a proportional font or has other funny characteristics 560 bool slow; // whether this is a proportional font or has other funny characteristics
508 XFontStruct *f; 561 XFontStruct *f;
509 bool enc2b, encm; 562 bool enc2b, encm;
510 563
511 char *get_property (XFontStruct *f, Atom property, const char *repl) const; 564 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); 565 bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth);
… …
669 f = XLoadQueryFont (disp, name); 722 f = XLoadQueryFont (disp, name);
670 723
671 if (!f) 724 if (!f)
672 return false; 725 return false;
673 726
674 char *new_name = get_property (f, XA_FONT, name); 727 char *new_name = get_property (f, XA_FONT, 0);
675 728
676 if (new_name) 729 if (new_name)
677 set_name (new_name); 730 set_name (new_name);
678 else 731 else
679 rxvt_warn ("font '%s' has no FONT property, continuing without.", name); 732 rxvt_warn ("font '%s' has no FONT property, continuing without.\n", name);
680 733
681 XFreeFont (disp, f); 734 XFreeFont (disp, f);
682 f = 0; 735 f = 0;
683 } 736 }
684 737
… …
741 free (fname); 794 free (fname);
742 if (replace_field (&fname, list[i], 11, '0', "0")) 795 if (replace_field (&fname, list[i], 11, '0', "0"))
743 diff += 300; // more heavily penalize what looks like scaled bitmap fonts 796 diff += 300; // more heavily penalize what looks like scaled bitmap fonts
744 } 797 }
745 798
746 if (!set_properties (p, fname)) 799 if (!set_properties (p, fname)
800 // also weed out too large fonts
801 || (prop.height != rxvt_fontprop::unset
802 && p.height > prop.height))
803 {
804 free (fname);
747 continue; 805 continue;
748 806 }
749 if (prop.height != rxvt_fontprop::unset
750 && p.height > prop.height) // weed out too large fonts
751 continue;
752 807
753 if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128; 808 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); 809 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); 810 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); 811 //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width);
… …
795 return false; 850 return false;
796 851
797 char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0); 852 char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0);
798 char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0); 853 char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0);
799 854
855 cs = CS_UNKNOWN;
856
800 if (registry && encoding) 857 if (registry && encoding)
801 { 858 {
802 char charset[64]; 859 char charset[64];
803 snprintf (charset, 64, "%s-%s", registry, encoding); 860 snprintf (charset, 64, "%s-%s", registry, encoding);
804 861
805 cs = codeset_from_name (charset); 862 cs = codeset_from_name (charset);
806 } 863
807 else 864 if (cs == CS_UNKNOWN)
865 rxvt_warn ("%s: cannot deduce encoding from registry/encoding properties \"%s\", ignoring font.\n", name, charset);
808 { 866 }
867
868 free (registry);
869 free (encoding);
870
871 if (cs == CS_UNKNOWN)
872 {
809 const char *charset = get_property (f, XA_FONT, 0); 873 char *value = get_property (f, XA_FONT, 0);
874 const char *charset = value;
810 875
811 if (!charset) 876 if (!charset)
812 charset = name; 877 charset = name;
813 878
814 int count = 13; 879 int count = 13;
815 while (*charset) 880 while (*charset)
816 if (*charset++ == '-' && !--count) 881 if (*charset++ == '-' && !--count)
817 break; 882 break;
818 883
819 cs = codeset_from_name (charset); 884 cs = codeset_from_name (charset);
885 if (cs == CS_UNKNOWN)
886 rxvt_warn ("%s: cannot deduce encoding from font name property \"%s\", ignoring font.\n", name, charset);
887
888 free (value);
889 }
890
891 if (cs == CS_UNKNOWN)
820 } 892 {
821 893 clear ();
822 free (registry); 894 return false;
823 free (encoding); 895 }
824 896
825 if (cs == CS_UNICODE) 897 if (cs == CS_UNICODE)
826 cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font 898 cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font
827 899
828 encm = f->min_byte1 != 0 || f->max_byte1 != 0; 900 encm = f->min_byte1 != 0 || f->max_byte1 != 0;
… …
853 } 925 }
854#endif 926#endif
855 927
856 width = 1; 928 width = 1;
857 929
858 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 930 for (uint16_t *t = extent_test_chars + ecb_array_length (extent_test_chars); t-- > extent_test_chars; )
859 { 931 {
860 if (FROM_UNICODE (cs, *t) == NOCHAR) 932 if (FROM_UNICODE (cs, *t) == NOCHAR)
861 continue; 933 continue;
862 934
863 // ignore characters we wouldn't use anyways 935 // ignore characters we wouldn't use anyways
… …
875 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; 947 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
876 948
877 if (width < g.width) width = g.width; 949 if (width < g.width) width = g.width;
878 } 950 }
879 951
880 if (cs == CS_UNKNOWN) 952#if 0 // do it per-character
953 if (prop && width > prop->width)
881 { 954 {
882 fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);
883
884 clear (); 955 clear ();
885 return false; 956 return false;
886 } 957 }
887
888#if 0 // do it per-character
889 if (prop && width > prop->width)
890 {
891 clear ();
892 return false;
893 }
894#endif 958#endif
895 959
896 return true; 960 return true;
897} 961}
898 962
… …
907} 971}
908 972
909bool 973bool
910rxvt_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
911{ 975{
976 careful = false;
977
912 uint32_t ch = FROM_UNICODE (cs, unicode); 978 uint32_t ch = FROM_UNICODE (cs, unicode);
913 979
914 if (ch == NOCHAR) 980 if (ch == NOCHAR)
915 return false; 981 return false;
916 982
917 /* check wether the character exists in _this_ font. horrible. */ 983 /* check whether the character exists in _this_ font. horrible. */
918 XCharStruct *xcs; 984 XCharStruct *xcs;
919 985
920 if (encm) 986 if (encm)
921 { 987 {
922 unsigned char byte1 = ch >> 8; 988 unsigned char byte1 = ch >> 8;
… …
952 return false; 1018 return false;
953 1019
954 if (!prop || prop->width == rxvt_fontprop::unset) 1020 if (!prop || prop->width == rxvt_fontprop::unset)
955 return true; 1021 return true;
956 1022
957 // check wether character overlaps previous/next character 1023 // check whether character overlaps previous/next character
958 int w = xcs->rbearing - xcs->lbearing; 1024 int w = xcs->rbearing - xcs->lbearing;
959 int wcw = max (WCWIDTH (unicode), 1); 1025 int wcw = max (WCWIDTH (unicode), 1);
960 1026
961 careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw; 1027 careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw;
962 1028
… …
1136 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1202 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1137 1203
1138#if 0 // clipping unfortunately destroys our precious double-width-characters 1204#if 0 // clipping unfortunately destroys our precious double-width-characters
1139 // clip width, we can't do better, or can we? 1205 // clip width, we can't do better, or can we?
1140 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) 1206 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
1141 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop->width); 1207 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width);
1142#endif 1208#endif
1143 1209
1144 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch) 1210 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch)
1145 FcPatternAddBool (p, FC_MINSPACE, 1); 1211 FcPatternAddBool (p, FC_MINSPACE, 1);
1146 1212
… …
1158 int ftheight = 0; 1224 int ftheight = 0;
1159 bool success = true; 1225 bool success = true;
1160 1226
1161 for (;;) 1227 for (;;)
1162 { 1228 {
1229 p = FcPatternDuplicate (match);
1163 f = XftFontOpenPattern (disp, FcPatternDuplicate (match)); 1230 f = XftFontOpenPattern (disp, p);
1164 1231
1165 if (!f) 1232 if (!f)
1166 { 1233 {
1234 FcPatternDestroy (p);
1167 success = false; 1235 success = false;
1168 break; 1236 break;
1169 } 1237 }
1170 1238
1171 FT_Face face = XftLockFace (f); 1239 FT_Face face = XftLockFace (f);
… …
1179 1247
1180 XftUnlockFace (f); 1248 XftUnlockFace (f);
1181 1249
1182 int glheight = height; 1250 int glheight = height;
1183 1251
1184 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 1252 for (uint16_t *t = extent_test_chars + ecb_array_length (extent_test_chars); t-- > extent_test_chars; )
1185 { 1253 {
1186 FcChar16 ch = *t; 1254 FcChar16 ch = *t;
1187 1255
1188 if (cs != CS_UNICODE 1256 if (cs != CS_UNICODE
1189 && ch > 0x100 1257 && ch > 0x100
… …
1290rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, 1358rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1291 const text_t *text, int len, 1359 const text_t *text, int len,
1292 int fg, int bg) 1360 int fg, int bg)
1293{ 1361{
1294 XGlyphInfo extents; 1362 XGlyphInfo extents;
1295 XftGlyphSpec *enc = (XftGlyphSpec *)rxvt_temp_buf (len * sizeof (XftGlyphSpec)); 1363 XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len);
1296 XftGlyphSpec *ep = enc; 1364 XftGlyphSpec *ep = enc;
1297 1365
1298 dTermDisplay; 1366 dTermDisplay;
1299 dTermGC; 1367 dTermGC;
1300 1368
1301 int w = term->fwidth * len; 1369 int w = term->fwidth * len;
1302 int h = term->fheight; 1370 int h = term->fheight;
1303 1371
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; 1372 bool buffered = bg >= Color_transparent
1309#ifdef FORCE_UNBUFFERED_XFT 1373 && term->option (Opt_buffered);
1310 buffered = false;
1311#endif
1312 1374
1313 // cut trailing spaces 1375 // cut trailing spaces
1314 while (len && text [len - 1] == ' ') 1376 while (len && text [len - 1] == ' ')
1315 len--; 1377 len--;
1316 1378
… …
1345 1407
1346 if (buffered) 1408 if (buffered)
1347 { 1409 {
1348 if (ep != enc) 1410 if (ep != enc)
1349 { 1411 {
1350 bool back_rendered = false;
1351 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); 1412 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1352 1413
1353#ifdef HAVE_BG_PIXMAP 1414#ifdef HAVE_BG_PIXMAP
1415 Picture dst = 0; // the only assignment is done conditionally in the following if condition
1416
1354 if (term->bgPixmap.pixmap) 1417 if (term->bg_pixmap
1418 && (bg == Color_transparent || bg == Color_bg
1419 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2))))))
1355 { 1420 {
1356 Picture dst = 0; 1421 int src_x = x, src_y = y;
1357 1422
1358 if (bg >= 0 && term->pix_colors[bg].is_opaque ()) 1423 if (term->bg_flags & rxvt_term::BG_IS_TRANSPARENT)
1359 XftDrawRect (d2, &term->pix_colors[bg].c, 0, 0, w, h); 1424 {
1425 src_x += term->window_vt_x;
1426 src_y += term->window_vt_y;
1427 }
1428
1429 if (term->bg_pmap_width >= src_x + w
1430 && term->bg_pmap_height >= src_y + h)
1431 {
1432 XCopyArea (disp, term->bg_pixmap, d2, gc,
1433 src_x, src_y, w, h, 0, 0);
1434 }
1360 else 1435 else
1361 dst = XftDrawPicture (d2); 1436 {
1437 XGCValues gcv;
1438
1439 gcv.fill_style = FillTiled;
1440 gcv.tile = term->bg_pixmap;
1441 gcv.ts_x_origin = -src_x;
1442 gcv.ts_y_origin = -src_y;
1443
1444 XChangeGC (disp, gc,
1445 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
1446 &gcv);
1447
1448 XFillRectangle (disp, d2, gc, 0, 0, w, h);
1449
1450 gcv.fill_style = FillSolid;
1451 XChangeGC (disp, gc, GCFillStyle, &gcv);
1452 }
1362 1453
1363 if (dst) 1454 if (dst)
1364 { 1455 {
1365 int src_x = x, src_y = y;
1366
1367 if (term->bgPixmap.is_parentOrigin ())
1368 {
1369 src_x += term->window_vt_x;
1370 src_y += term->window_vt_y;
1371 }
1372
1373 if (term->bgPixmap.pmap_width >= src_x+w
1374 && term->bgPixmap.pmap_height >= src_y+h)
1375 {
1376 XCopyArea (disp, term->bgPixmap.pixmap, d2, gc,
1377 src_x, src_y, w, h, 0, 0);
1378 }
1379 else
1380 {
1381 XGCValues gcv;
1382
1383 gcv.fill_style = FillTiled;
1384 gcv.tile = term->bgPixmap.pixmap;
1385 gcv.ts_x_origin = -src_x;
1386 gcv.ts_y_origin = -src_y;
1387
1388 XChangeGC (disp, gc,
1389 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
1390 &gcv);
1391
1392 XFillRectangle (disp, d2, gc, 0, 0, w, h);
1393
1394 gcv.fill_style = FillSolid;
1395 XChangeGC (disp, gc, GCFillStyle, &gcv);
1396 }
1397
1398 if (bg >= 0)
1399 {
1400 Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c); 1456 Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c);
1457
1458 // dst can only be set when bg >= 0
1401 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h); 1459 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h);
1402 }
1403
1404 back_rendered = true;
1405 } 1460 }
1406 } 1461 }
1462 else
1407#endif 1463#endif
1408
1409 if (!back_rendered)
1410 XftDrawRect (d2, &term->pix_colors[bg < 0 ? Color_bg : bg].c, 0, 0, w, h); 1464 XftDrawRect (d2, &term->pix_colors[bg >= 0 ? bg : Color_bg].c, 0, 0, w, h);
1411 1465
1412 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc); 1466 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);
1413 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y); 1467 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
1414 } 1468 }
1415 else 1469 else
… …
1443 prop.width = prop.height = prop.ascent = prop.weight = prop.slant 1497 prop.width = prop.height = prop.ascent = prop.weight = prop.slant
1444 = rxvt_fontprop::unset; 1498 = rxvt_fontprop::unset;
1445 force_prop = false; 1499 force_prop = false;
1446 1500
1447 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) 1501 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1448 FONT_UNREF (*i); 1502 (*i)->unref ();
1449 1503
1450 for (pagemap **p = fmap.begin (); p != fmap.end (); p++) 1504 for (pagemap **p = fmap.begin (); p != fmap.end (); p++)
1451 delete *p; 1505 delete *p;
1452 1506
1453 free (fontdesc); fontdesc = 0; 1507 free (fontdesc); fontdesc = 0;
… …
1455 fonts.clear (); 1509 fonts.clear ();
1456 1510
1457 fallback = fallback_fonts; 1511 fallback = fallback_fonts;
1458} 1512}
1459 1513
1514void
1515rxvt_fontset::prepare_font (rxvt_font *font, codeset cs)
1516{
1517 font->set_term (term);
1518
1519 font->cs = cs;
1520 font->loaded = false;
1521}
1522
1460rxvt_font * 1523rxvt_font *
1461rxvt_fontset::new_font (const char *name, codeset cs) 1524rxvt_fontset::new_font (const char *name, codeset cs)
1462{ 1525{
1463 rxvt_font *f; 1526 rxvt_font *f;
1464 1527
… …
1480 f = new rxvt_font_x11; 1543 f = new rxvt_font_x11;
1481 } 1544 }
1482 else 1545 else
1483 f = new rxvt_font_x11; 1546 f = new rxvt_font_x11;
1484 1547
1485 f->set_term (term);
1486 f->set_name (strdup (name)); 1548 f->set_name (strdup (name));
1487 1549 prepare_font (f, cs);
1488 f->cs = cs;
1489 f->loaded = false;
1490 1550
1491 return f; 1551 return f;
1492} 1552}
1493 1553
1494///////////////////////////////////////////////////////////////////////////// 1554/////////////////////////////////////////////////////////////////////////////
1555
1556void
1557rxvt_fontset::push_font (rxvt_font *font)
1558{
1559 // the fontCount index is reserved for the overflow font, it is only
1560 // necessary when we get fontCount or more fonts, as they cannot be
1561 // represented in the rendition.
1562 if (fonts.size () == fontCount)
1563 {
1564 rxvt_font *f = new rxvt_font_overflow (this);
1565
1566 prepare_font (f, CS_UNICODE);
1567 fonts.push_back (f);
1568 }
1569
1570 fonts.push_back (font);
1571}
1495 1572
1496void 1573void
1497rxvt_fontset::add_fonts (const char *desc) 1574rxvt_fontset::add_fonts (const char *desc)
1498{ 1575{
1499 if (desc) 1576 if (desc)
… …
1540 if (end - desc < 511) 1617 if (end - desc < 511)
1541 { 1618 {
1542 memcpy (buf, desc, end - desc); 1619 memcpy (buf, desc, end - desc);
1543 buf[end - desc] = 0; 1620 buf[end - desc] = 0;
1544 1621
1545 fonts.push_back (new_font (buf, cs)); 1622 push_font (new_font (buf, cs));
1546 } 1623 }
1547 else 1624 else
1548 rxvt_warn ("fontset element too long (>511 bytes), ignored."); 1625 rxvt_warn ("fontset element too long (>511 bytes), ignored.\n");
1549 1626
1550 desc = end + 1; 1627 desc = end + 1;
1551 } 1628 }
1552 while (*end); 1629 while (*end);
1553 } 1630 }
… …
1578{ 1655{
1579 clear (); 1656 clear ();
1580 1657
1581 fontdesc = strdup (desc); 1658 fontdesc = strdup (desc);
1582 1659
1583 fonts.push_back (new_font (0, CS_UNICODE)); 1660 push_font (new_font (0, CS_UNICODE));
1584 realize_font (0); 1661 realize_font (0);
1585 1662
1586 add_fonts (desc); 1663 add_fonts (desc);
1587 1664
1588 return true; 1665 return true;
… …
1597 1674
1598 return -1; 1675 return -1;
1599} 1676}
1600 1677
1601int 1678int
1602rxvt_fontset::find_font (unicode_t unicode) 1679rxvt_fontset::find_font_idx (unicode_t unicode)
1603{ 1680{
1604 if (unicode >= 1<<20) 1681 if (unicode >= 1<<20)
1605 return 0; 1682 return 0;
1606 1683
1607 unicode_t hi = unicode >> 8; 1684 unicode_t hi = unicode >> 8;
… …
1633 goto next_font; 1710 goto next_font;
1634 1711
1635 bool careful; 1712 bool careful;
1636 if (f->has_char (unicode, &prop, careful)) 1713 if (f->has_char (unicode, &prop, careful))
1637 { 1714 {
1638 if (careful) 1715 i = (i << 1) | careful;
1639 i |= 128;
1640 1716
1641 goto found; 1717 goto found;
1642 } 1718 }
1643 1719
1644 next_font: 1720 next_font:
1645 if (i == fonts.size () - 1) 1721 if (i == fonts.size () - 1)
1646 { 1722 {
1647 if (fallback->name) 1723 if (fallback->name)
1648 { 1724 {
1649 // search through the fallback list 1725 // search through the fallback list
1650 fonts.push_back (new_font (fallback->name, fallback->cs)); 1726 push_font (new_font (fallback->name, fallback->cs));
1651 fallback++; 1727 fallback++;
1652 } 1728 }
1653 else 1729 else
1654 { 1730 {
1655 // try to find a new font. 1731 // try to find a new font.
… …
1686 FcPatternDestroy (match); 1762 FcPatternDestroy (match);
1687 1763
1688 if (find_font (font) < 0) 1764 if (find_font (font) < 0)
1689 { 1765 {
1690 char fontname[4096]; 1766 char fontname[4096];
1691 sprintf (fontname, "xft:%-.4090s", font); 1767 snprintf (fontname, sizeof (fontname), "xft:%s", font);
1692 1768
1693 fonts.push_back (new_font (fontname, CS_UNICODE)); 1769 push_font (new_font (fontname, CS_UNICODE));
1694 } 1770 }
1695 1771
1696 free (font); 1772 free (font);
1697 } 1773 }
1698#endif 1774#endif
… …
1720 } 1796 }
1721 1797
1722 return i; 1798 return i;
1723} 1799}
1724 1800
1725
1726

Diff Legend

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