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.140 by root, Wed Jan 23 14:18:19 2008 UTC vs.
Revision 1.170 by sf-exg, Thu Dec 30 01:13:24 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{
… …
448 450
449 text_t chrs[2]; 451 text_t chrs[2];
450 chrs [1] = NOCHAR; 452 chrs [1] = NOCHAR;
451 453
452 *chrs = cc->c1; 454 *chrs = cc->c1;
453 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)]; 455 rxvt_font *f1 = (*fs)[fs->find_font_idx (cc->c1)];
454 f1->draw (d, x, y, chrs, width, fg, bg); 456 f1->draw (d, x, y, chrs, width, fg, bg);
455 457
456 if (cc->c2 != NOCHAR) 458 if (cc->c2 != NOCHAR)
457 { 459 {
458 bool careful; 460 bool careful;
459 461
460 // prefer font of first character, for no good reasons 462 // prefer font of first character, for no good reasons
461 *chrs = cc->c2; 463 *chrs = cc->c2;
462 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful) 464 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful)
463 ? f1 465 ? f1
464 : (*fs)[fs->find_font (cc->c2)]; 466 : (*fs)[fs->find_font_idx (cc->c2)];
465 467
466 f2->draw (d, x, y, chrs, width, fg, Color_none); 468 f2->draw (d, x, y, chrs, width, fg, Color_none);
467 } 469 }
468 } 470 }
469#endif 471#endif
… …
482 484
483 x += fwidth; 485 x += fwidth;
484 } 486 }
485} 487}
486 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
487///////////////////////////////////////////////////////////////////////////// 539/////////////////////////////////////////////////////////////////////////////
488 540
489struct rxvt_font_x11 : rxvt_font { 541struct rxvt_font_x11 : rxvt_font {
490 rxvt_font_x11 () { f = 0; } 542 rxvt_font_x11 () { f = 0; }
491 543
… …
499 551
500 void draw (rxvt_drawable &d, int x, int y, 552 void draw (rxvt_drawable &d, int x, int y,
501 const text_t *text, int len, 553 const text_t *text, int len,
502 int fg, int bg); 554 int fg, int bg);
503 555
504 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
505 XFontStruct *f; 557 XFontStruct *f;
506 bool enc2b, encm; 558 bool enc2b, encm;
507 559
508 char *get_property (XFontStruct *f, Atom property, const char *repl) const; 560 char *get_property (XFontStruct *f, Atom property, const char *repl) const;
509 bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth); 561 bool set_properties (rxvt_fontprop &p, int height, const char *weight, const char *slant, int avgwidth);
… …
738 free (fname); 790 free (fname);
739 if (replace_field (&fname, list[i], 11, '0', "0")) 791 if (replace_field (&fname, list[i], 11, '0', "0"))
740 diff += 300; // more heavily penalize what looks like scaled bitmap fonts 792 diff += 300; // more heavily penalize what looks like scaled bitmap fonts
741 } 793 }
742 794
743 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);
744 continue; 801 continue;
745 802 }
746 if (prop.height != rxvt_fontprop::unset
747 && p.height > prop.height) // weed out too large fonts
748 continue;
749 803
750 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;
751 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);
752 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);
753 //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);
… …
792 return false; 846 return false;
793 847
794 char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0); 848 char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0);
795 char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0); 849 char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0);
796 850
851 cs = CS_UNKNOWN;
852
797 if (registry && encoding) 853 if (registry && encoding)
798 { 854 {
799 char charset[64]; 855 char charset[64];
800 snprintf (charset, 64, "%s-%s", registry, encoding); 856 snprintf (charset, 64, "%s-%s", registry, encoding);
801 857
802 cs = codeset_from_name (charset); 858 cs = codeset_from_name (charset);
859
860 if (cs == CS_UNKNOWN)
861 rxvt_warn ("%s: cannot deduce encoding from registry/encoding properties \"%s\", ignoring font.\n", name, charset);
803 } 862 }
804 else 863
864 free (registry);
865 free (encoding);
866
867 if (cs == CS_UNKNOWN)
805 { 868 {
806 const char *charset = get_property (f, XA_FONT, 0); 869 const char *charset = get_property (f, XA_FONT, 0);
807 870
808 if (!charset) 871 if (!charset)
809 charset = name; 872 charset = name;
… …
812 while (*charset) 875 while (*charset)
813 if (*charset++ == '-' && !--count) 876 if (*charset++ == '-' && !--count)
814 break; 877 break;
815 878
816 cs = codeset_from_name (charset); 879 cs = codeset_from_name (charset);
880 if (cs == CS_UNKNOWN)
881 rxvt_warn ("%s: cannot deduce encoding from font name property \"%s\", ignoring font.\n", name, charset);
882 }
883
884 if (cs == CS_UNKNOWN)
817 } 885 {
818 886 clear ();
819 free (registry); 887 return false;
820 free (encoding); 888 }
821 889
822 if (cs == CS_UNICODE) 890 if (cs == CS_UNICODE)
823 cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font 891 cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font
824 892
825 encm = f->min_byte1 != 0 || f->max_byte1 != 0; 893 encm = f->min_byte1 != 0 || f->max_byte1 != 0;
… …
850 } 918 }
851#endif 919#endif
852 920
853 width = 1; 921 width = 1;
854 922
855 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 923 for (uint16_t *t = extent_test_chars + ARRAY_LENGTH(extent_test_chars); t-- > extent_test_chars; )
856 { 924 {
857 if (FROM_UNICODE (cs, *t) == NOCHAR) 925 if (FROM_UNICODE (cs, *t) == NOCHAR)
858 continue; 926 continue;
859 927
860 // ignore characters we wouldn't use anyways 928 // ignore characters we wouldn't use anyways
… …
872 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; 940 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
873 941
874 if (width < g.width) width = g.width; 942 if (width < g.width) width = g.width;
875 } 943 }
876 944
877 if (cs == CS_UNKNOWN) 945#if 0 // do it per-character
946 if (prop && width > prop->width)
878 { 947 {
879 fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);
880
881 clear (); 948 clear ();
882 return false; 949 return false;
883 } 950 }
884
885#if 0 // do it per-character
886 if (prop && width > prop->width)
887 {
888 clear ();
889 return false;
890 }
891#endif 951#endif
892 952
893 return true; 953 return true;
894} 954}
895 955
… …
909 uint32_t ch = FROM_UNICODE (cs, unicode); 969 uint32_t ch = FROM_UNICODE (cs, unicode);
910 970
911 if (ch == NOCHAR) 971 if (ch == NOCHAR)
912 return false; 972 return false;
913 973
914 /* check wether the character exists in _this_ font. horrible. */ 974 /* check whether the character exists in _this_ font. horrible. */
915 XCharStruct *xcs; 975 XCharStruct *xcs;
916 976
917 if (encm) 977 if (encm)
918 { 978 {
919 unsigned char byte1 = ch >> 8; 979 unsigned char byte1 = ch >> 8;
… …
949 return false; 1009 return false;
950 1010
951 if (!prop || prop->width == rxvt_fontprop::unset) 1011 if (!prop || prop->width == rxvt_fontprop::unset)
952 return true; 1012 return true;
953 1013
954 // check wether character overlaps previous/next character 1014 // check whether character overlaps previous/next character
955 int w = xcs->rbearing - xcs->lbearing; 1015 int w = xcs->rbearing - xcs->lbearing;
956 int wcw = max (WCWIDTH (unicode), 1); 1016 int wcw = max (WCWIDTH (unicode), 1);
957 1017
958 careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw; 1018 careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw;
959 1019
… …
1133 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1193 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1134 1194
1135#if 0 // clipping unfortunately destroys our precious double-width-characters 1195#if 0 // clipping unfortunately destroys our precious double-width-characters
1136 // clip width, we can't do better, or can we? 1196 // clip width, we can't do better, or can we?
1137 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) 1197 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
1138 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop->width); 1198 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width);
1139#endif 1199#endif
1140 1200
1141 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch) 1201 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch)
1142 FcPatternAddBool (p, FC_MINSPACE, 1); 1202 FcPatternAddBool (p, FC_MINSPACE, 1);
1143 1203
… …
1176 1236
1177 XftUnlockFace (f); 1237 XftUnlockFace (f);
1178 1238
1179 int glheight = height; 1239 int glheight = height;
1180 1240
1181 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 1241 for (uint16_t *t = extent_test_chars + ARRAY_LENGTH(extent_test_chars); t-- > extent_test_chars; )
1182 { 1242 {
1183 FcChar16 ch = *t; 1243 FcChar16 ch = *t;
1184 1244
1185 if (cs != CS_UNICODE 1245 if (cs != CS_UNICODE
1186 && ch > 0x100 1246 && ch > 0x100
… …
1287rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, 1347rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1288 const text_t *text, int len, 1348 const text_t *text, int len,
1289 int fg, int bg) 1349 int fg, int bg)
1290{ 1350{
1291 XGlyphInfo extents; 1351 XGlyphInfo extents;
1292 XftGlyphSpec *enc = (XftGlyphSpec *)rxvt_temp_buf (len * sizeof (XftGlyphSpec)); 1352 XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len);
1293 XftGlyphSpec *ep = enc; 1353 XftGlyphSpec *ep = enc;
1294 1354
1295 dTermDisplay; 1355 dTermDisplay;
1296 dTermGC; 1356 dTermGC;
1297 1357
1298 int w = term->fwidth * len; 1358 int w = term->fwidth * len;
1299 int h = term->fheight; 1359 int h = term->fheight;
1300 1360
1301 /*
1302 * Maybe make buffering into a resource flag? Compile time option doesn't seems like a
1303 * good idea from the perspective of packaging for wide variety of user configs.
1304 */
1305 bool buffered = bg >= Color_transparent; 1361 bool buffered = bg >= Color_transparent
1306#ifdef FORCE_UNBUFFERED_XFT 1362 && term->option (Opt_buffered);
1307 buffered = false;
1308#endif
1309 buffered=false;//D
1310 1363
1311 // cut trailing spaces 1364 // cut trailing spaces
1312 while (len && text [len - 1] == ' ') 1365 while (len && text [len - 1] == ' ')
1313 len--; 1366 len--;
1314 1367
… …
1346 if (ep != enc) 1399 if (ep != enc)
1347 { 1400 {
1348 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); 1401 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1349 1402
1350#ifdef HAVE_BG_PIXMAP 1403#ifdef HAVE_BG_PIXMAP
1351 Picture dst = 0; 1404 Picture dst = 0; // the only assignment is done conditionally in the following if condition
1352 1405
1353 if (term->bgPixmap.pixmap 1406 if (term->bgPixmap.pixmap
1354 && (bg == Color_transparent || bg == Color_bg 1407 && (bg == Color_transparent || bg == Color_bg
1355 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2)))))) 1408 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2))))))
1356 { 1409 {
1357 int src_x = x, src_y = y; 1410 int src_x = x, src_y = y;
1358 1411
1359 if (term->bgPixmap.is_parentOrigin ()) 1412 if (term->bgPixmap.flags & bgPixmap_t::isTransparent)
1360 { 1413 {
1361 src_x += term->window_vt_x; 1414 src_x += term->window_vt_x;
1362 src_y += term->window_vt_y; 1415 src_y += term->window_vt_y;
1363 } 1416 }
1364 1417
… …
1389 1442
1390 if (dst) 1443 if (dst)
1391 { 1444 {
1392 Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c); 1445 Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c);
1393 1446
1447 // dst can only be set when bg >= 0
1394 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h); 1448 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h);
1395 } 1449 }
1396 } 1450 }
1397 else 1451 else
1398#endif 1452#endif
1399 clear_rect (d, x, y, w, h, bg); 1453 XftDrawRect (d2, &term->pix_colors[bg >= 0 ? bg : Color_bg].c, 0, 0, w, h);
1400 1454
1401 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc); 1455 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);
1402 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y); 1456 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
1403 } 1457 }
1404 else 1458 else
… …
1432 prop.width = prop.height = prop.ascent = prop.weight = prop.slant 1486 prop.width = prop.height = prop.ascent = prop.weight = prop.slant
1433 = rxvt_fontprop::unset; 1487 = rxvt_fontprop::unset;
1434 force_prop = false; 1488 force_prop = false;
1435 1489
1436 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) 1490 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1437 FONT_UNREF (*i); 1491 (*i)->unref ();
1438 1492
1439 for (pagemap **p = fmap.begin (); p != fmap.end (); p++) 1493 for (pagemap **p = fmap.begin (); p != fmap.end (); p++)
1440 delete *p; 1494 delete *p;
1441 1495
1442 free (fontdesc); fontdesc = 0; 1496 free (fontdesc); fontdesc = 0;
… …
1444 fonts.clear (); 1498 fonts.clear ();
1445 1499
1446 fallback = fallback_fonts; 1500 fallback = fallback_fonts;
1447} 1501}
1448 1502
1503void
1504rxvt_fontset::prepare_font (rxvt_font *font, codeset cs)
1505{
1506 font->set_term (term);
1507
1508 font->cs = cs;
1509 font->loaded = false;
1510}
1511
1449rxvt_font * 1512rxvt_font *
1450rxvt_fontset::new_font (const char *name, codeset cs) 1513rxvt_fontset::new_font (const char *name, codeset cs)
1451{ 1514{
1452 rxvt_font *f; 1515 rxvt_font *f;
1453 1516
… …
1469 f = new rxvt_font_x11; 1532 f = new rxvt_font_x11;
1470 } 1533 }
1471 else 1534 else
1472 f = new rxvt_font_x11; 1535 f = new rxvt_font_x11;
1473 1536
1474 f->set_term (term);
1475 f->set_name (strdup (name)); 1537 f->set_name (strdup (name));
1476 1538 prepare_font (f, cs);
1477 f->cs = cs;
1478 f->loaded = false;
1479 1539
1480 return f; 1540 return f;
1481} 1541}
1482 1542
1483///////////////////////////////////////////////////////////////////////////// 1543/////////////////////////////////////////////////////////////////////////////
1544
1545void
1546rxvt_fontset::push_font (rxvt_font *font)
1547{
1548 // the fontCount index is reserved for the overflow font, it is only
1549 // necessary when we get fontCount or more fonts, as they cannot be
1550 // represented in the rendition.
1551 if (fonts.size () == fontCount)
1552 {
1553 rxvt_font *f = new rxvt_font_overflow (this);
1554
1555 prepare_font (f, CS_UNICODE);
1556 fonts.push_back (f);
1557 }
1558
1559 fonts.push_back (font);
1560}
1484 1561
1485void 1562void
1486rxvt_fontset::add_fonts (const char *desc) 1563rxvt_fontset::add_fonts (const char *desc)
1487{ 1564{
1488 if (desc) 1565 if (desc)
… …
1529 if (end - desc < 511) 1606 if (end - desc < 511)
1530 { 1607 {
1531 memcpy (buf, desc, end - desc); 1608 memcpy (buf, desc, end - desc);
1532 buf[end - desc] = 0; 1609 buf[end - desc] = 0;
1533 1610
1534 fonts.push_back (new_font (buf, cs)); 1611 push_font (new_font (buf, cs));
1535 } 1612 }
1536 else 1613 else
1537 rxvt_warn ("fontset element too long (>511 bytes), ignored."); 1614 rxvt_warn ("fontset element too long (>511 bytes), ignored.");
1538 1615
1539 desc = end + 1; 1616 desc = end + 1;
… …
1567{ 1644{
1568 clear (); 1645 clear ();
1569 1646
1570 fontdesc = strdup (desc); 1647 fontdesc = strdup (desc);
1571 1648
1572 fonts.push_back (new_font (0, CS_UNICODE)); 1649 push_font (new_font (0, CS_UNICODE));
1573 realize_font (0); 1650 realize_font (0);
1574 1651
1575 add_fonts (desc); 1652 add_fonts (desc);
1576 1653
1577 return true; 1654 return true;
… …
1586 1663
1587 return -1; 1664 return -1;
1588} 1665}
1589 1666
1590int 1667int
1591rxvt_fontset::find_font (unicode_t unicode) 1668rxvt_fontset::find_font_idx (unicode_t unicode)
1592{ 1669{
1593 if (unicode >= 1<<20) 1670 if (unicode >= 1<<20)
1594 return 0; 1671 return 0;
1595 1672
1596 unicode_t hi = unicode >> 8; 1673 unicode_t hi = unicode >> 8;
… …
1622 goto next_font; 1699 goto next_font;
1623 1700
1624 bool careful; 1701 bool careful;
1625 if (f->has_char (unicode, &prop, careful)) 1702 if (f->has_char (unicode, &prop, careful))
1626 { 1703 {
1627 if (careful) 1704 i = (i << 1) | careful;
1628 i |= 128;
1629 1705
1630 goto found; 1706 goto found;
1631 } 1707 }
1632 1708
1633 next_font: 1709 next_font:
1634 if (i == fonts.size () - 1) 1710 if (i == fonts.size () - 1)
1635 { 1711 {
1636 if (fallback->name) 1712 if (fallback->name)
1637 { 1713 {
1638 // search through the fallback list 1714 // search through the fallback list
1639 fonts.push_back (new_font (fallback->name, fallback->cs)); 1715 push_font (new_font (fallback->name, fallback->cs));
1640 fallback++; 1716 fallback++;
1641 } 1717 }
1642 else 1718 else
1643 { 1719 {
1644 // try to find a new font. 1720 // try to find a new font.
… …
1675 FcPatternDestroy (match); 1751 FcPatternDestroy (match);
1676 1752
1677 if (find_font (font) < 0) 1753 if (find_font (font) < 0)
1678 { 1754 {
1679 char fontname[4096]; 1755 char fontname[4096];
1680 sprintf (fontname, "xft:%-.4090s", font); 1756 snprintf (fontname, sizeof (fontname), "xft:%s", font);
1681 1757
1682 fonts.push_back (new_font (fontname, CS_UNICODE)); 1758 push_font (new_font (fontname, CS_UNICODE));
1683 } 1759 }
1684 1760
1685 free (font); 1761 free (font);
1686 } 1762 }
1687#endif 1763#endif
… …
1709 } 1785 }
1710 1786
1711 return i; 1787 return i;
1712} 1788}
1713 1789
1714
1715

Diff Legend

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