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.151 by root, Sat Apr 4 13:58:55 2009 UTC vs.
Revision 1.178 by root, Mon Feb 21 07:41:03 2011 UTC

1/*----------------------------------------------------------------------* 1/*----------------------------------------------------------------------*
2 * File: rxvtfont.C 2 * File: rxvtfont.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * Copyright (c) 2003-2008 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" },
… …
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
… …
239 { 241 {
240#if XFT 242#if XFT
241 Picture dst; 243 Picture dst;
242 244
243# ifdef HAVE_BG_PIXMAP 245# ifdef HAVE_BG_PIXMAP
244 if (term->bgPixmap.pixmap 246 if (term->bg_pixmap
245 && !term->pix_colors[color].is_opaque () 247 && !term->pix_colors[color].is_opaque ()
246 && ((dst = XftDrawPicture (d)))) 248 && ((dst = XftDrawPicture (d))))
247 { 249 {
248 XClearArea (disp, d, x, y, w, h, false); 250 XClearArea (disp, d, x, y, w, h, false);
249 251
… …
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
… …
904} 967}
905 968
906bool 969bool
907rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const 970rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
908{ 971{
972 careful = false;
973
909 uint32_t ch = FROM_UNICODE (cs, unicode); 974 uint32_t ch = FROM_UNICODE (cs, unicode);
910 975
911 if (ch == NOCHAR) 976 if (ch == NOCHAR)
912 return false; 977 return false;
913 978
914 /* check wether the character exists in _this_ font. horrible. */ 979 /* check whether the character exists in _this_ font. horrible. */
915 XCharStruct *xcs; 980 XCharStruct *xcs;
916 981
917 if (encm) 982 if (encm)
918 { 983 {
919 unsigned char byte1 = ch >> 8; 984 unsigned char byte1 = ch >> 8;
… …
949 return false; 1014 return false;
950 1015
951 if (!prop || prop->width == rxvt_fontprop::unset) 1016 if (!prop || prop->width == rxvt_fontprop::unset)
952 return true; 1017 return true;
953 1018
954 // check wether character overlaps previous/next character 1019 // check whether character overlaps previous/next character
955 int w = xcs->rbearing - xcs->lbearing; 1020 int w = xcs->rbearing - xcs->lbearing;
956 int wcw = max (WCWIDTH (unicode), 1); 1021 int wcw = max (WCWIDTH (unicode), 1);
957 1022
958 careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw; 1023 careful = xcs->lbearing < 0 || xcs->rbearing > prop->width * wcw;
959 1024
… …
1155 int ftheight = 0; 1220 int ftheight = 0;
1156 bool success = true; 1221 bool success = true;
1157 1222
1158 for (;;) 1223 for (;;)
1159 { 1224 {
1225 p = FcPatternDuplicate (match);
1160 f = XftFontOpenPattern (disp, FcPatternDuplicate (match)); 1226 f = XftFontOpenPattern (disp, p);
1161 1227
1162 if (!f) 1228 if (!f)
1163 { 1229 {
1230 FcPatternDestroy (p);
1164 success = false; 1231 success = false;
1165 break; 1232 break;
1166 } 1233 }
1167 1234
1168 FT_Face face = XftLockFace (f); 1235 FT_Face face = XftLockFace (f);
… …
1176 1243
1177 XftUnlockFace (f); 1244 XftUnlockFace (f);
1178 1245
1179 int glheight = height; 1246 int glheight = height;
1180 1247
1181 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 1248 for (uint16_t *t = extent_test_chars + ARRAY_LENGTH(extent_test_chars); t-- > extent_test_chars; )
1182 { 1249 {
1183 FcChar16 ch = *t; 1250 FcChar16 ch = *t;
1184 1251
1185 if (cs != CS_UNICODE 1252 if (cs != CS_UNICODE
1186 && ch > 0x100 1253 && ch > 0x100
… …
1287rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, 1354rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1288 const text_t *text, int len, 1355 const text_t *text, int len,
1289 int fg, int bg) 1356 int fg, int bg)
1290{ 1357{
1291 XGlyphInfo extents; 1358 XGlyphInfo extents;
1292 XftGlyphSpec *enc = (XftGlyphSpec *)rxvt_temp_buf (len * sizeof (XftGlyphSpec)); 1359 XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len);
1293 XftGlyphSpec *ep = enc; 1360 XftGlyphSpec *ep = enc;
1294 1361
1295 dTermDisplay; 1362 dTermDisplay;
1296 dTermGC; 1363 dTermGC;
1297 1364
… …
1341 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); 1408 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1342 1409
1343#ifdef HAVE_BG_PIXMAP 1410#ifdef HAVE_BG_PIXMAP
1344 Picture dst = 0; // the only assignment is done conditionally in the following if condition 1411 Picture dst = 0; // the only assignment is done conditionally in the following if condition
1345 1412
1346 if (term->bgPixmap.pixmap 1413 if (term->bg_pixmap
1347 && (bg == Color_transparent || bg == Color_bg 1414 && (bg == Color_transparent || bg == Color_bg
1348 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2)))))) 1415 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2))))))
1349 { 1416 {
1350 int src_x = x, src_y = y; 1417 int src_x = x, src_y = y;
1351 1418
1352 if (term->bgPixmap.is_parentOrigin ()) 1419 if (term->bg_flags & rxvt_term::BG_IS_TRANSPARENT)
1353 { 1420 {
1354 src_x += term->window_vt_x; 1421 src_x += term->window_vt_x;
1355 src_y += term->window_vt_y; 1422 src_y += term->window_vt_y;
1356 } 1423 }
1357 1424
1358 if (term->bgPixmap.pmap_width >= src_x + w 1425 if (term->bg_pmap_width >= src_x + w
1359 && term->bgPixmap.pmap_height >= src_y + h) 1426 && term->bg_pmap_height >= src_y + h)
1360 { 1427 {
1361 XCopyArea (disp, term->bgPixmap.pixmap, d2, gc, 1428 XCopyArea (disp, term->bg_pixmap, d2, gc,
1362 src_x, src_y, w, h, 0, 0); 1429 src_x, src_y, w, h, 0, 0);
1363 } 1430 }
1364 else 1431 else
1365 { 1432 {
1366 XGCValues gcv; 1433 XGCValues gcv;
1367 1434
1368 gcv.fill_style = FillTiled; 1435 gcv.fill_style = FillTiled;
1369 gcv.tile = term->bgPixmap.pixmap; 1436 gcv.tile = term->bg_pixmap;
1370 gcv.ts_x_origin = -src_x; 1437 gcv.ts_x_origin = -src_x;
1371 gcv.ts_y_origin = -src_y; 1438 gcv.ts_y_origin = -src_y;
1372 1439
1373 XChangeGC (disp, gc, 1440 XChangeGC (disp, gc,
1374 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle, 1441 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
… …
1426 prop.width = prop.height = prop.ascent = prop.weight = prop.slant 1493 prop.width = prop.height = prop.ascent = prop.weight = prop.slant
1427 = rxvt_fontprop::unset; 1494 = rxvt_fontprop::unset;
1428 force_prop = false; 1495 force_prop = false;
1429 1496
1430 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) 1497 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1431 FONT_UNREF (*i); 1498 (*i)->unref ();
1432 1499
1433 for (pagemap **p = fmap.begin (); p != fmap.end (); p++) 1500 for (pagemap **p = fmap.begin (); p != fmap.end (); p++)
1434 delete *p; 1501 delete *p;
1435 1502
1436 free (fontdesc); fontdesc = 0; 1503 free (fontdesc); fontdesc = 0;
… …
1438 fonts.clear (); 1505 fonts.clear ();
1439 1506
1440 fallback = fallback_fonts; 1507 fallback = fallback_fonts;
1441} 1508}
1442 1509
1510void
1511rxvt_fontset::prepare_font (rxvt_font *font, codeset cs)
1512{
1513 font->set_term (term);
1514
1515 font->cs = cs;
1516 font->loaded = false;
1517}
1518
1443rxvt_font * 1519rxvt_font *
1444rxvt_fontset::new_font (const char *name, codeset cs) 1520rxvt_fontset::new_font (const char *name, codeset cs)
1445{ 1521{
1446 rxvt_font *f; 1522 rxvt_font *f;
1447 1523
… …
1463 f = new rxvt_font_x11; 1539 f = new rxvt_font_x11;
1464 } 1540 }
1465 else 1541 else
1466 f = new rxvt_font_x11; 1542 f = new rxvt_font_x11;
1467 1543
1468 f->set_term (term);
1469 f->set_name (strdup (name)); 1544 f->set_name (strdup (name));
1470 1545 prepare_font (f, cs);
1471 f->cs = cs;
1472 f->loaded = false;
1473 1546
1474 return f; 1547 return f;
1475} 1548}
1476 1549
1477///////////////////////////////////////////////////////////////////////////// 1550/////////////////////////////////////////////////////////////////////////////
1551
1552void
1553rxvt_fontset::push_font (rxvt_font *font)
1554{
1555 // the fontCount index is reserved for the overflow font, it is only
1556 // necessary when we get fontCount or more fonts, as they cannot be
1557 // represented in the rendition.
1558 if (fonts.size () == fontCount)
1559 {
1560 rxvt_font *f = new rxvt_font_overflow (this);
1561
1562 prepare_font (f, CS_UNICODE);
1563 fonts.push_back (f);
1564 }
1565
1566 fonts.push_back (font);
1567}
1478 1568
1479void 1569void
1480rxvt_fontset::add_fonts (const char *desc) 1570rxvt_fontset::add_fonts (const char *desc)
1481{ 1571{
1482 if (desc) 1572 if (desc)
… …
1523 if (end - desc < 511) 1613 if (end - desc < 511)
1524 { 1614 {
1525 memcpy (buf, desc, end - desc); 1615 memcpy (buf, desc, end - desc);
1526 buf[end - desc] = 0; 1616 buf[end - desc] = 0;
1527 1617
1528 fonts.push_back (new_font (buf, cs)); 1618 push_font (new_font (buf, cs));
1529 } 1619 }
1530 else 1620 else
1531 rxvt_warn ("fontset element too long (>511 bytes), ignored."); 1621 rxvt_warn ("fontset element too long (>511 bytes), ignored.\n");
1532 1622
1533 desc = end + 1; 1623 desc = end + 1;
1534 } 1624 }
1535 while (*end); 1625 while (*end);
1536 } 1626 }
… …
1561{ 1651{
1562 clear (); 1652 clear ();
1563 1653
1564 fontdesc = strdup (desc); 1654 fontdesc = strdup (desc);
1565 1655
1566 fonts.push_back (new_font (0, CS_UNICODE)); 1656 push_font (new_font (0, CS_UNICODE));
1567 realize_font (0); 1657 realize_font (0);
1568 1658
1569 add_fonts (desc); 1659 add_fonts (desc);
1570 1660
1571 return true; 1661 return true;
… …
1580 1670
1581 return -1; 1671 return -1;
1582} 1672}
1583 1673
1584int 1674int
1585rxvt_fontset::find_font (unicode_t unicode) 1675rxvt_fontset::find_font_idx (unicode_t unicode)
1586{ 1676{
1587 if (unicode >= 1<<20) 1677 if (unicode >= 1<<20)
1588 return 0; 1678 return 0;
1589 1679
1590 unicode_t hi = unicode >> 8; 1680 unicode_t hi = unicode >> 8;
… …
1616 goto next_font; 1706 goto next_font;
1617 1707
1618 bool careful; 1708 bool careful;
1619 if (f->has_char (unicode, &prop, careful)) 1709 if (f->has_char (unicode, &prop, careful))
1620 { 1710 {
1621 if (careful) 1711 i = (i << 1) | careful;
1622 i |= 128;
1623 1712
1624 goto found; 1713 goto found;
1625 } 1714 }
1626 1715
1627 next_font: 1716 next_font:
1628 if (i == fonts.size () - 1) 1717 if (i == fonts.size () - 1)
1629 { 1718 {
1630 if (fallback->name) 1719 if (fallback->name)
1631 { 1720 {
1632 // search through the fallback list 1721 // search through the fallback list
1633 fonts.push_back (new_font (fallback->name, fallback->cs)); 1722 push_font (new_font (fallback->name, fallback->cs));
1634 fallback++; 1723 fallback++;
1635 } 1724 }
1636 else 1725 else
1637 { 1726 {
1638 // try to find a new font. 1727 // try to find a new font.
… …
1669 FcPatternDestroy (match); 1758 FcPatternDestroy (match);
1670 1759
1671 if (find_font (font) < 0) 1760 if (find_font (font) < 0)
1672 { 1761 {
1673 char fontname[4096]; 1762 char fontname[4096];
1674 sprintf (fontname, "xft:%-.4090s", font); 1763 snprintf (fontname, sizeof (fontname), "xft:%s", font);
1675 1764
1676 fonts.push_back (new_font (fontname, CS_UNICODE)); 1765 push_font (new_font (fontname, CS_UNICODE));
1677 } 1766 }
1678 1767
1679 free (font); 1768 free (font);
1680 } 1769 }
1681#endif 1770#endif
… …
1703 } 1792 }
1704 1793
1705 return i; 1794 return i;
1706} 1795}
1707 1796
1708
1709

Diff Legend

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