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.171 by sf-exg, Thu Dec 30 17:28:29 2010 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 <pcg@goof.com>
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->bgPixmap.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 (*fs)[fid]->draw (d, x, y, text, 1, fg, bg);
533 ++text;
534 x += term->fwidth;
535 }
536 }
537};
538
490///////////////////////////////////////////////////////////////////////////// 539/////////////////////////////////////////////////////////////////////////////
491 540
492struct rxvt_font_x11 : rxvt_font { 541struct rxvt_font_x11 : rxvt_font {
493 rxvt_font_x11 () { f = 0; } 542 rxvt_font_x11 () { f = 0; }
494 543
… …
502 551
503 void draw (rxvt_drawable &d, int x, int y, 552 void draw (rxvt_drawable &d, int x, int y,
504 const text_t *text, int len, 553 const text_t *text, int len,
505 int fg, int bg); 554 int fg, int bg);
506 555
507 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
508 XFontStruct *f; 557 XFontStruct *f;
509 bool enc2b, encm; 558 bool enc2b, encm;
510 559
511 char *get_property (XFontStruct *f, Atom property, const char *repl) const; 560 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); 561 bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth);
… …
741 free (fname); 790 free (fname);
742 if (replace_field (&fname, list[i], 11, '0', "0")) 791 if (replace_field (&fname, list[i], 11, '0', "0"))
743 diff += 300; // more heavily penalize what looks like scaled bitmap fonts 792 diff += 300; // more heavily penalize what looks like scaled bitmap fonts
744 } 793 }
745 794
746 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);
747 continue; 801 continue;
748 802 }
749 if (prop.height != rxvt_fontprop::unset
750 && p.height > prop.height) // weed out too large fonts
751 continue;
752 803
753 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;
754 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);
755 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);
756 //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);
… …
795 return false; 846 return false;
796 847
797 char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0); 848 char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0);
798 char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0); 849 char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0);
799 850
851 cs = CS_UNKNOWN;
852
800 if (registry && encoding) 853 if (registry && encoding)
801 { 854 {
802 char charset[64]; 855 char charset[64];
803 snprintf (charset, 64, "%s-%s", registry, encoding); 856 snprintf (charset, 64, "%s-%s", registry, encoding);
804 857
805 cs = codeset_from_name (charset); 858 cs = codeset_from_name (charset);
806 } 859
807 else 860 if (cs == CS_UNKNOWN)
861 rxvt_warn ("%s: cannot deduce encoding from registry/encoding properties \"%s\", ignoring font.\n", name, charset);
808 { 862 }
863
864 free (registry);
865 free (encoding);
866
867 if (cs == CS_UNKNOWN)
868 {
809 const char *charset = get_property (f, XA_FONT, 0); 869 char *value = get_property (f, XA_FONT, 0);
870 const char *charset = value;
810 871
811 if (!charset) 872 if (!charset)
812 charset = name; 873 charset = name;
813 874
814 int count = 13; 875 int count = 13;
815 while (*charset) 876 while (*charset)
816 if (*charset++ == '-' && !--count) 877 if (*charset++ == '-' && !--count)
817 break; 878 break;
818 879
819 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)
820 } 888 {
821 889 clear ();
822 free (registry); 890 return false;
823 free (encoding); 891 }
824 892
825 if (cs == CS_UNICODE) 893 if (cs == CS_UNICODE)
826 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
827 895
828 encm = f->min_byte1 != 0 || f->max_byte1 != 0; 896 encm = f->min_byte1 != 0 || f->max_byte1 != 0;
… …
853 } 921 }
854#endif 922#endif
855 923
856 width = 1; 924 width = 1;
857 925
858 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; )
859 { 927 {
860 if (FROM_UNICODE (cs, *t) == NOCHAR) 928 if (FROM_UNICODE (cs, *t) == NOCHAR)
861 continue; 929 continue;
862 930
863 // ignore characters we wouldn't use anyways 931 // ignore characters we wouldn't use anyways
… …
875 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; 943 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
876 944
877 if (width < g.width) width = g.width; 945 if (width < g.width) width = g.width;
878 } 946 }
879 947
880 if (cs == CS_UNKNOWN) 948#if 0 // do it per-character
949 if (prop && width > prop->width)
881 { 950 {
882 fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);
883
884 clear (); 951 clear ();
885 return false; 952 return false;
886 } 953 }
887
888#if 0 // do it per-character
889 if (prop && width > prop->width)
890 {
891 clear ();
892 return false;
893 }
894#endif 954#endif
895 955
896 return true; 956 return true;
897} 957}
898 958
… …
912 uint32_t ch = FROM_UNICODE (cs, unicode); 972 uint32_t ch = FROM_UNICODE (cs, unicode);
913 973
914 if (ch == NOCHAR) 974 if (ch == NOCHAR)
915 return false; 975 return false;
916 976
917 /* check wether the character exists in _this_ font. horrible. */ 977 /* check whether the character exists in _this_ font. horrible. */
918 XCharStruct *xcs; 978 XCharStruct *xcs;
919 979
920 if (encm) 980 if (encm)
921 { 981 {
922 unsigned char byte1 = ch >> 8; 982 unsigned char byte1 = ch >> 8;
… …
952 return false; 1012 return false;
953 1013
954 if (!prop || prop->width == rxvt_fontprop::unset) 1014 if (!prop || prop->width == rxvt_fontprop::unset)
955 return true; 1015 return true;
956 1016
957 // check wether character overlaps previous/next character 1017 // check whether character overlaps previous/next character
958 int w = xcs->rbearing - xcs->lbearing; 1018 int w = xcs->rbearing - xcs->lbearing;
959 int wcw = max (WCWIDTH (unicode), 1); 1019 int wcw = max (WCWIDTH (unicode), 1);
960 1020
961 careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw; 1021 careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw;
962 1022
… …
1136 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1196 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1137 1197
1138#if 0 // clipping unfortunately destroys our precious double-width-characters 1198#if 0 // clipping unfortunately destroys our precious double-width-characters
1139 // clip width, we can't do better, or can we? 1199 // clip width, we can't do better, or can we?
1140 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) 1200 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
1141 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop->width); 1201 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width);
1142#endif 1202#endif
1143 1203
1144 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch) 1204 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch)
1145 FcPatternAddBool (p, FC_MINSPACE, 1); 1205 FcPatternAddBool (p, FC_MINSPACE, 1);
1146 1206
… …
1179 1239
1180 XftUnlockFace (f); 1240 XftUnlockFace (f);
1181 1241
1182 int glheight = height; 1242 int glheight = height;
1183 1243
1184 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 1244 for (uint16_t *t = extent_test_chars + ARRAY_LENGTH(extent_test_chars); t-- > extent_test_chars; )
1185 { 1245 {
1186 FcChar16 ch = *t; 1246 FcChar16 ch = *t;
1187 1247
1188 if (cs != CS_UNICODE 1248 if (cs != CS_UNICODE
1189 && ch > 0x100 1249 && ch > 0x100
… …
1290rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, 1350rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1291 const text_t *text, int len, 1351 const text_t *text, int len,
1292 int fg, int bg) 1352 int fg, int bg)
1293{ 1353{
1294 XGlyphInfo extents; 1354 XGlyphInfo extents;
1295 XftGlyphSpec *enc = (XftGlyphSpec *)rxvt_temp_buf (len * sizeof (XftGlyphSpec)); 1355 XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len);
1296 XftGlyphSpec *ep = enc; 1356 XftGlyphSpec *ep = enc;
1297 1357
1298 dTermDisplay; 1358 dTermDisplay;
1299 dTermGC; 1359 dTermGC;
1300 1360
1301 int w = term->fwidth * len; 1361 int w = term->fwidth * len;
1302 int h = term->fheight; 1362 int h = term->fheight;
1303 1363
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; 1364 bool buffered = bg >= Color_transparent
1309#ifdef FORCE_UNBUFFERED_XFT 1365 && term->option (Opt_buffered);
1310 buffered = false;
1311#endif
1312 1366
1313 // cut trailing spaces 1367 // cut trailing spaces
1314 while (len && text [len - 1] == ' ') 1368 while (len && text [len - 1] == ' ')
1315 len--; 1369 len--;
1316 1370
… …
1345 1399
1346 if (buffered) 1400 if (buffered)
1347 { 1401 {
1348 if (ep != enc) 1402 if (ep != enc)
1349 { 1403 {
1350 bool back_rendered = false;
1351 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); 1404 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1352 1405
1353#ifdef HAVE_BG_PIXMAP 1406#ifdef HAVE_BG_PIXMAP
1407 Picture dst = 0; // the only assignment is done conditionally in the following if condition
1354 1408
1355 if (term->bgPixmap.pixmap 1409 if (term->bgPixmap.pixmap
1356 && !(bg >= 0 && term->pix_colors[bg].is_opaque ())) 1410 && (bg == Color_transparent || bg == Color_bg
1411 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2))))))
1357 { 1412 {
1358 Picture dst = XftDrawPicture (d2);
1359
1360 int src_x = x, src_y = y; 1413 int src_x = x, src_y = y;
1361 1414
1362 if (term->bgPixmap.is_parentOrigin ()) 1415 if (term->bgPixmap.flags & bgPixmap_t::isTransparent)
1363 { 1416 {
1364 src_x += term->window_vt_x; 1417 src_x += term->window_vt_x;
1365 src_y += term->window_vt_y; 1418 src_y += term->window_vt_y;
1366 } 1419 }
1367 1420
1368 if (term->bgPixmap.pmap_width >= src_x+w 1421 if (term->bgPixmap.pmap_width >= src_x + w
1369 && term->bgPixmap.pmap_height >= src_y+h) 1422 && term->bgPixmap.pmap_height >= src_y + h)
1370 { 1423 {
1371 XCopyArea (disp, term->bgPixmap.pixmap, d2, gc, 1424 XCopyArea (disp, term->bgPixmap.pixmap, d2, gc,
1372 src_x, src_y, w, h, 0, 0); 1425 src_x, src_y, w, h, 0, 0);
1373 } 1426 }
1374 else 1427 else
… …
1388 1441
1389 gcv.fill_style = FillSolid; 1442 gcv.fill_style = FillSolid;
1390 XChangeGC (disp, gc, GCFillStyle, &gcv); 1443 XChangeGC (disp, gc, GCFillStyle, &gcv);
1391 } 1444 }
1392 1445
1393 if (bg >= 0 && dst) // colour must be (and is) non-opaque here 1446 if (dst)
1394 { 1447 {
1395 Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c); 1448 Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c);
1449
1450 // 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); 1451 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h);
1397 } 1452 }
1398
1399 back_rendered = true;
1400 } 1453 }
1454 else
1401#endif 1455#endif
1402
1403 if (!back_rendered)
1404 XftDrawRect (d2, &term->pix_colors[bg < 0 ? Color_bg : bg].c, 0, 0, w, h); 1456 XftDrawRect (d2, &term->pix_colors[bg >= 0 ? bg : Color_bg].c, 0, 0, w, h);
1405 1457
1406 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc); 1458 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);
1407 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y); 1459 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
1408 } 1460 }
1409 else 1461 else
… …
1437 prop.width = prop.height = prop.ascent = prop.weight = prop.slant 1489 prop.width = prop.height = prop.ascent = prop.weight = prop.slant
1438 = rxvt_fontprop::unset; 1490 = rxvt_fontprop::unset;
1439 force_prop = false; 1491 force_prop = false;
1440 1492
1441 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) 1493 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1442 FONT_UNREF (*i); 1494 (*i)->unref ();
1443 1495
1444 for (pagemap **p = fmap.begin (); p != fmap.end (); p++) 1496 for (pagemap **p = fmap.begin (); p != fmap.end (); p++)
1445 delete *p; 1497 delete *p;
1446 1498
1447 free (fontdesc); fontdesc = 0; 1499 free (fontdesc); fontdesc = 0;
… …
1449 fonts.clear (); 1501 fonts.clear ();
1450 1502
1451 fallback = fallback_fonts; 1503 fallback = fallback_fonts;
1452} 1504}
1453 1505
1506void
1507rxvt_fontset::prepare_font (rxvt_font *font, codeset cs)
1508{
1509 font->set_term (term);
1510
1511 font->cs = cs;
1512 font->loaded = false;
1513}
1514
1454rxvt_font * 1515rxvt_font *
1455rxvt_fontset::new_font (const char *name, codeset cs) 1516rxvt_fontset::new_font (const char *name, codeset cs)
1456{ 1517{
1457 rxvt_font *f; 1518 rxvt_font *f;
1458 1519
… …
1474 f = new rxvt_font_x11; 1535 f = new rxvt_font_x11;
1475 } 1536 }
1476 else 1537 else
1477 f = new rxvt_font_x11; 1538 f = new rxvt_font_x11;
1478 1539
1479 f->set_term (term);
1480 f->set_name (strdup (name)); 1540 f->set_name (strdup (name));
1481 1541 prepare_font (f, cs);
1482 f->cs = cs;
1483 f->loaded = false;
1484 1542
1485 return f; 1543 return f;
1486} 1544}
1487 1545
1488///////////////////////////////////////////////////////////////////////////// 1546/////////////////////////////////////////////////////////////////////////////
1547
1548void
1549rxvt_fontset::push_font (rxvt_font *font)
1550{
1551 // the fontCount index is reserved for the overflow font, it is only
1552 // necessary when we get fontCount or more fonts, as they cannot be
1553 // represented in the rendition.
1554 if (fonts.size () == fontCount)
1555 {
1556 rxvt_font *f = new rxvt_font_overflow (this);
1557
1558 prepare_font (f, CS_UNICODE);
1559 fonts.push_back (f);
1560 }
1561
1562 fonts.push_back (font);
1563}
1489 1564
1490void 1565void
1491rxvt_fontset::add_fonts (const char *desc) 1566rxvt_fontset::add_fonts (const char *desc)
1492{ 1567{
1493 if (desc) 1568 if (desc)
… …
1534 if (end - desc < 511) 1609 if (end - desc < 511)
1535 { 1610 {
1536 memcpy (buf, desc, end - desc); 1611 memcpy (buf, desc, end - desc);
1537 buf[end - desc] = 0; 1612 buf[end - desc] = 0;
1538 1613
1539 fonts.push_back (new_font (buf, cs)); 1614 push_font (new_font (buf, cs));
1540 } 1615 }
1541 else 1616 else
1542 rxvt_warn ("fontset element too long (>511 bytes), ignored."); 1617 rxvt_warn ("fontset element too long (>511 bytes), ignored.");
1543 1618
1544 desc = end + 1; 1619 desc = end + 1;
… …
1572{ 1647{
1573 clear (); 1648 clear ();
1574 1649
1575 fontdesc = strdup (desc); 1650 fontdesc = strdup (desc);
1576 1651
1577 fonts.push_back (new_font (0, CS_UNICODE)); 1652 push_font (new_font (0, CS_UNICODE));
1578 realize_font (0); 1653 realize_font (0);
1579 1654
1580 add_fonts (desc); 1655 add_fonts (desc);
1581 1656
1582 return true; 1657 return true;
… …
1591 1666
1592 return -1; 1667 return -1;
1593} 1668}
1594 1669
1595int 1670int
1596rxvt_fontset::find_font (unicode_t unicode) 1671rxvt_fontset::find_font_idx (unicode_t unicode)
1597{ 1672{
1598 if (unicode >= 1<<20) 1673 if (unicode >= 1<<20)
1599 return 0; 1674 return 0;
1600 1675
1601 unicode_t hi = unicode >> 8; 1676 unicode_t hi = unicode >> 8;
… …
1627 goto next_font; 1702 goto next_font;
1628 1703
1629 bool careful; 1704 bool careful;
1630 if (f->has_char (unicode, &prop, careful)) 1705 if (f->has_char (unicode, &prop, careful))
1631 { 1706 {
1632 if (careful) 1707 i = (i << 1) | careful;
1633 i |= 128;
1634 1708
1635 goto found; 1709 goto found;
1636 } 1710 }
1637 1711
1638 next_font: 1712 next_font:
1639 if (i == fonts.size () - 1) 1713 if (i == fonts.size () - 1)
1640 { 1714 {
1641 if (fallback->name) 1715 if (fallback->name)
1642 { 1716 {
1643 // search through the fallback list 1717 // search through the fallback list
1644 fonts.push_back (new_font (fallback->name, fallback->cs)); 1718 push_font (new_font (fallback->name, fallback->cs));
1645 fallback++; 1719 fallback++;
1646 } 1720 }
1647 else 1721 else
1648 { 1722 {
1649 // try to find a new font. 1723 // try to find a new font.
… …
1680 FcPatternDestroy (match); 1754 FcPatternDestroy (match);
1681 1755
1682 if (find_font (font) < 0) 1756 if (find_font (font) < 0)
1683 { 1757 {
1684 char fontname[4096]; 1758 char fontname[4096];
1685 sprintf (fontname, "xft:%-.4090s", font); 1759 snprintf (fontname, sizeof (fontname), "xft:%s", font);
1686 1760
1687 fonts.push_back (new_font (fontname, CS_UNICODE)); 1761 push_font (new_font (fontname, CS_UNICODE));
1688 } 1762 }
1689 1763
1690 free (font); 1764 free (font);
1691 } 1765 }
1692#endif 1766#endif
… …
1714 } 1788 }
1715 1789
1716 return i; 1790 return i;
1717} 1791}
1718 1792
1719
1720

Diff Legend

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