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.138 by root, Wed Jan 23 13:34:20 2008 UTC vs.
Revision 1.172 by sf-exg, Thu Dec 30 18:19:38 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);
… …
666 f = XLoadQueryFont (disp, name); 718 f = XLoadQueryFont (disp, name);
667 719
668 if (!f) 720 if (!f)
669 return false; 721 return false;
670 722
671 char *new_name = get_property (f, XA_FONT, name); 723 char *new_name = get_property (f, XA_FONT, 0);
672 724
673 if (new_name) 725 if (new_name)
674 set_name (new_name); 726 set_name (new_name);
675 else 727 else
676 rxvt_warn ("font '%s' has no FONT property, continuing without.", name); 728 rxvt_warn ("font '%s' has no FONT property, continuing without.\n", name);
677 729
678 XFreeFont (disp, f); 730 XFreeFont (disp, f);
679 f = 0; 731 f = 0;
680 } 732 }
681 733
… …
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);
803 } 859
804 else 860 if (cs == CS_UNKNOWN)
861 rxvt_warn ("%s: cannot deduce encoding from registry/encoding properties \"%s\", ignoring font.\n", name, charset);
805 { 862 }
863
864 free (registry);
865 free (encoding);
866
867 if (cs == CS_UNKNOWN)
868 {
806 const char *charset = get_property (f, XA_FONT, 0); 869 char *value = get_property (f, XA_FONT, 0);
870 const char *charset = value;
807 871
808 if (!charset) 872 if (!charset)
809 charset = name; 873 charset = name;
810 874
811 int count = 13; 875 int count = 13;
812 while (*charset) 876 while (*charset)
813 if (*charset++ == '-' && !--count) 877 if (*charset++ == '-' && !--count)
814 break; 878 break;
815 879
816 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)
817 } 888 {
818 889 clear ();
819 free (registry); 890 return false;
820 free (encoding); 891 }
821 892
822 if (cs == CS_UNICODE) 893 if (cs == CS_UNICODE)
823 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
824 895
825 encm = f->min_byte1 != 0 || f->max_byte1 != 0; 896 encm = f->min_byte1 != 0 || f->max_byte1 != 0;
… …
850 } 921 }
851#endif 922#endif
852 923
853 width = 1; 924 width = 1;
854 925
855 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; )
856 { 927 {
857 if (FROM_UNICODE (cs, *t) == NOCHAR) 928 if (FROM_UNICODE (cs, *t) == NOCHAR)
858 continue; 929 continue;
859 930
860 // ignore characters we wouldn't use anyways 931 // ignore characters we wouldn't use anyways
… …
872 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; 943 if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
873 944
874 if (width < g.width) width = g.width; 945 if (width < g.width) width = g.width;
875 } 946 }
876 947
877 if (cs == CS_UNKNOWN) 948#if 0 // do it per-character
949 if (prop && width > prop->width)
878 { 950 {
879 fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);
880
881 clear (); 951 clear ();
882 return false; 952 return false;
883 } 953 }
884
885#if 0 // do it per-character
886 if (prop && width > prop->width)
887 {
888 clear ();
889 return false;
890 }
891#endif 954#endif
892 955
893 return true; 956 return true;
894} 957}
895 958
… …
909 uint32_t ch = FROM_UNICODE (cs, unicode); 972 uint32_t ch = FROM_UNICODE (cs, unicode);
910 973
911 if (ch == NOCHAR) 974 if (ch == NOCHAR)
912 return false; 975 return false;
913 976
914 /* check wether the character exists in _this_ font. horrible. */ 977 /* check whether the character exists in _this_ font. horrible. */
915 XCharStruct *xcs; 978 XCharStruct *xcs;
916 979
917 if (encm) 980 if (encm)
918 { 981 {
919 unsigned char byte1 = ch >> 8; 982 unsigned char byte1 = ch >> 8;
… …
949 return false; 1012 return false;
950 1013
951 if (!prop || prop->width == rxvt_fontprop::unset) 1014 if (!prop || prop->width == rxvt_fontprop::unset)
952 return true; 1015 return true;
953 1016
954 // check wether character overlaps previous/next character 1017 // check whether character overlaps previous/next character
955 int w = xcs->rbearing - xcs->lbearing; 1018 int w = xcs->rbearing - xcs->lbearing;
956 int wcw = max (WCWIDTH (unicode), 1); 1019 int wcw = max (WCWIDTH (unicode), 1);
957 1020
958 careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw; 1021 careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw;
959 1022
… …
1133 FcPatternAddInteger (p, FC_SLANT, prop.slant); 1196 FcPatternAddInteger (p, FC_SLANT, prop.slant);
1134 1197
1135#if 0 // clipping unfortunately destroys our precious double-width-characters 1198#if 0 // clipping unfortunately destroys our precious double-width-characters
1136 // clip width, we can't do better, or can we? 1199 // clip width, we can't do better, or can we?
1137 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch) 1200 if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
1138 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop->width); 1201 FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width);
1139#endif 1202#endif
1140 1203
1141 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch) 1204 if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch)
1142 FcPatternAddBool (p, FC_MINSPACE, 1); 1205 FcPatternAddBool (p, FC_MINSPACE, 1);
1143 1206
… …
1176 1239
1177 XftUnlockFace (f); 1240 XftUnlockFace (f);
1178 1241
1179 int glheight = height; 1242 int glheight = height;
1180 1243
1181 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; )
1182 { 1245 {
1183 FcChar16 ch = *t; 1246 FcChar16 ch = *t;
1184 1247
1185 if (cs != CS_UNICODE 1248 if (cs != CS_UNICODE
1186 && ch > 0x100 1249 && ch > 0x100
… …
1287rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, 1350rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1288 const text_t *text, int len, 1351 const text_t *text, int len,
1289 int fg, int bg) 1352 int fg, int bg)
1290{ 1353{
1291 XGlyphInfo extents; 1354 XGlyphInfo extents;
1292 XftGlyphSpec *enc = (XftGlyphSpec *)rxvt_temp_buf (len * sizeof (XftGlyphSpec)); 1355 XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len);
1293 XftGlyphSpec *ep = enc; 1356 XftGlyphSpec *ep = enc;
1294 1357
1295 dTermDisplay; 1358 dTermDisplay;
1296 dTermGC; 1359 dTermGC;
1297 1360
1298 int w = term->fwidth * len; 1361 int w = term->fwidth * len;
1299 int h = term->fheight; 1362 int h = term->fheight;
1300 1363
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; 1364 bool buffered = bg >= Color_transparent
1306#ifdef FORCE_UNBUFFERED_XFT 1365 && term->option (Opt_buffered);
1307 buffered = false;
1308#endif
1309 1366
1310 // cut trailing spaces 1367 // cut trailing spaces
1311 while (len && text [len - 1] == ' ') 1368 while (len && text [len - 1] == ' ')
1312 len--; 1369 len--;
1313 1370
… …
1345 if (ep != enc) 1402 if (ep != enc)
1346 { 1403 {
1347 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); 1404 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1348 1405
1349#ifdef HAVE_BG_PIXMAP 1406#ifdef HAVE_BG_PIXMAP
1350 Picture dst = 0; 1407 Picture dst = 0; // the only assignment is done conditionally in the following if condition
1351 1408
1352 if (term->bgPixmap.pixmap 1409 if (term->bgPixmap.pixmap
1353 && (bg == Color_transparent || bg == Color_bg 1410 && (bg == Color_transparent || bg == Color_bg
1354 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2)))))) 1411 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2))))))
1355 { 1412 {
1356 int src_x = x, src_y = y; 1413 int src_x = x, src_y = y;
1357 1414
1358 if (term->bgPixmap.is_parentOrigin ()) 1415 if (term->bgPixmap.flags & bgPixmap_t::isTransparent)
1359 { 1416 {
1360 src_x += term->window_vt_x; 1417 src_x += term->window_vt_x;
1361 src_y += term->window_vt_y; 1418 src_y += term->window_vt_y;
1362 } 1419 }
1363 1420
… …
1388 1445
1389 if (dst) 1446 if (dst)
1390 { 1447 {
1391 Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c); 1448 Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c);
1392 1449
1450 // dst can only be set when bg >= 0
1393 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);
1394 } 1452 }
1395 } 1453 }
1396 else 1454 else
1397#endif 1455#endif
1398 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);
1399 1457
1400 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc); 1458 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);
1401 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y); 1459 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
1402 } 1460 }
1403 else 1461 else
… …
1431 prop.width = prop.height = prop.ascent = prop.weight = prop.slant 1489 prop.width = prop.height = prop.ascent = prop.weight = prop.slant
1432 = rxvt_fontprop::unset; 1490 = rxvt_fontprop::unset;
1433 force_prop = false; 1491 force_prop = false;
1434 1492
1435 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) 1493 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1436 FONT_UNREF (*i); 1494 (*i)->unref ();
1437 1495
1438 for (pagemap **p = fmap.begin (); p != fmap.end (); p++) 1496 for (pagemap **p = fmap.begin (); p != fmap.end (); p++)
1439 delete *p; 1497 delete *p;
1440 1498
1441 free (fontdesc); fontdesc = 0; 1499 free (fontdesc); fontdesc = 0;
… …
1443 fonts.clear (); 1501 fonts.clear ();
1444 1502
1445 fallback = fallback_fonts; 1503 fallback = fallback_fonts;
1446} 1504}
1447 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
1448rxvt_font * 1515rxvt_font *
1449rxvt_fontset::new_font (const char *name, codeset cs) 1516rxvt_fontset::new_font (const char *name, codeset cs)
1450{ 1517{
1451 rxvt_font *f; 1518 rxvt_font *f;
1452 1519
… …
1468 f = new rxvt_font_x11; 1535 f = new rxvt_font_x11;
1469 } 1536 }
1470 else 1537 else
1471 f = new rxvt_font_x11; 1538 f = new rxvt_font_x11;
1472 1539
1473 f->set_term (term);
1474 f->set_name (strdup (name)); 1540 f->set_name (strdup (name));
1475 1541 prepare_font (f, cs);
1476 f->cs = cs;
1477 f->loaded = false;
1478 1542
1479 return f; 1543 return f;
1480} 1544}
1481 1545
1482///////////////////////////////////////////////////////////////////////////// 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}
1483 1564
1484void 1565void
1485rxvt_fontset::add_fonts (const char *desc) 1566rxvt_fontset::add_fonts (const char *desc)
1486{ 1567{
1487 if (desc) 1568 if (desc)
… …
1528 if (end - desc < 511) 1609 if (end - desc < 511)
1529 { 1610 {
1530 memcpy (buf, desc, end - desc); 1611 memcpy (buf, desc, end - desc);
1531 buf[end - desc] = 0; 1612 buf[end - desc] = 0;
1532 1613
1533 fonts.push_back (new_font (buf, cs)); 1614 push_font (new_font (buf, cs));
1534 } 1615 }
1535 else 1616 else
1536 rxvt_warn ("fontset element too long (>511 bytes), ignored."); 1617 rxvt_warn ("fontset element too long (>511 bytes), ignored.");
1537 1618
1538 desc = end + 1; 1619 desc = end + 1;
… …
1566{ 1647{
1567 clear (); 1648 clear ();
1568 1649
1569 fontdesc = strdup (desc); 1650 fontdesc = strdup (desc);
1570 1651
1571 fonts.push_back (new_font (0, CS_UNICODE)); 1652 push_font (new_font (0, CS_UNICODE));
1572 realize_font (0); 1653 realize_font (0);
1573 1654
1574 add_fonts (desc); 1655 add_fonts (desc);
1575 1656
1576 return true; 1657 return true;
… …
1585 1666
1586 return -1; 1667 return -1;
1587} 1668}
1588 1669
1589int 1670int
1590rxvt_fontset::find_font (unicode_t unicode) 1671rxvt_fontset::find_font_idx (unicode_t unicode)
1591{ 1672{
1592 if (unicode >= 1<<20) 1673 if (unicode >= 1<<20)
1593 return 0; 1674 return 0;
1594 1675
1595 unicode_t hi = unicode >> 8; 1676 unicode_t hi = unicode >> 8;
… …
1621 goto next_font; 1702 goto next_font;
1622 1703
1623 bool careful; 1704 bool careful;
1624 if (f->has_char (unicode, &prop, careful)) 1705 if (f->has_char (unicode, &prop, careful))
1625 { 1706 {
1626 if (careful) 1707 i = (i << 1) | careful;
1627 i |= 128;
1628 1708
1629 goto found; 1709 goto found;
1630 } 1710 }
1631 1711
1632 next_font: 1712 next_font:
1633 if (i == fonts.size () - 1) 1713 if (i == fonts.size () - 1)
1634 { 1714 {
1635 if (fallback->name) 1715 if (fallback->name)
1636 { 1716 {
1637 // search through the fallback list 1717 // search through the fallback list
1638 fonts.push_back (new_font (fallback->name, fallback->cs)); 1718 push_font (new_font (fallback->name, fallback->cs));
1639 fallback++; 1719 fallback++;
1640 } 1720 }
1641 else 1721 else
1642 { 1722 {
1643 // try to find a new font. 1723 // try to find a new font.
… …
1674 FcPatternDestroy (match); 1754 FcPatternDestroy (match);
1675 1755
1676 if (find_font (font) < 0) 1756 if (find_font (font) < 0)
1677 { 1757 {
1678 char fontname[4096]; 1758 char fontname[4096];
1679 sprintf (fontname, "xft:%-.4090s", font); 1759 snprintf (fontname, sizeof (fontname), "xft:%s", font);
1680 1760
1681 fonts.push_back (new_font (fontname, CS_UNICODE)); 1761 push_font (new_font (fontname, CS_UNICODE));
1682 } 1762 }
1683 1763
1684 free (font); 1764 free (font);
1685 } 1765 }
1686#endif 1766#endif
… …
1708 } 1788 }
1709 1789
1710 return i; 1790 return i;
1711} 1791}
1712 1792
1713
1714

Diff Legend

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