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.160 by sf-exg, Wed Mar 31 21:52:05 2010 UTC vs.
Revision 1.195 by root, Mon Sep 7 14:50:56 2015 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 3 of the License, or
10 * (at your option) any later version. 10 * (at your option) any later version.
11 * 11 *
12 * This program is distributed in the hope that it will be useful, 12 * This program is distributed in the hope that it will be useful,
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of 13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
22#include "../config.h" 22#include "../config.h"
23#include "rxvt.h" 23#include "rxvt.h"
24#include "rxvtutil.h" 24#include "rxvtutil.h"
25#include "rxvtfont.h" 25#include "rxvtfont.h"
26 26
27#include <cstdlib> 27#include <stdlib.h>
28 28
29#include <inttypes.h> 29#include <inttypes.h>
30
31#if XFT
32# include <fontconfig/fontconfig.h>
33#endif
30 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" },
… …
128 { CS_KSC5601_1987_0, "xft:Baekmuk Gulim:antialias=false" }, 132 { CS_KSC5601_1987_0, "xft:Baekmuk Gulim:antialias=false" },
129 { CS_KSC5601_1987_0, "xft::lang=ko:antialias=false" }, 133 { CS_KSC5601_1987_0, "xft::lang=ko:antialias=false" },
130# endif 134# endif
131#endif 135#endif
132 136
133 { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" },
134 //{ CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" }, // this gem of a font has actual dotted circles within the combining character glyphs. 137 //{ CS_UNICODE, "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1" }, // this gem of a font has actual dotted circles within the combining character glyphs.
135#if XFT 138#if XFT
136 { CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true" }, 139 { CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true" },
137 { CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" }, 140 { CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" },
138 { CS_UNICODE, "xft:Andale Mono:antialias=false:autohint=false" }, 141 { CS_UNICODE, "xft:Andale Mono:antialias=false:autohint=false" },
… …
155 '0', '1', '8', 'a', 'd', 'x', 'm', 'y', 'g', 'W', 'X', '\'', '_', 158 '0', '1', '8', 'a', 'd', 'x', 'm', 'y', 'g', 'W', 'X', '\'', '_',
156 0x00cd, 0x00d5, 0x0114, 0x0177, 0x0643, // ÍÕĔŷﻙ 159 0x00cd, 0x00d5, 0x0114, 0x0177, 0x0643, // ÍÕĔŷﻙ
157 0x304c, 0x672c, // が本 160 0x304c, 0x672c, // が本
158}; 161};
159 162
160#define NUM_EXTENT_TEST_CHARS (sizeof (extent_test_chars) / sizeof (extent_test_chars[0]))
161
162#define dTermDisplay Display *disp = term->dpy 163#define dTermDisplay Display *disp = term->dpy
163#define dTermGC GC gc = term->gc 164#define dTermGC GC gc = term->gc
164 165
165///////////////////////////////////////////////////////////////////////////// 166/////////////////////////////////////////////////////////////////////////////
166 167
… …
239 { 240 {
240#if XFT 241#if XFT
241 Picture dst; 242 Picture dst;
242 243
243# ifdef HAVE_BG_PIXMAP 244# ifdef HAVE_BG_PIXMAP
244 if (term->bgPixmap.pixmap 245 if (term->bg_img
245 && !term->pix_colors[color].is_opaque () 246 && !term->pix_colors[color].is_opaque ()
246 && ((dst = XftDrawPicture (d)))) 247 && ((dst = XftDrawPicture (d))))
247 { 248 {
248 XClearArea (disp, d, x, y, w, h, false); 249 XClearArea (disp, d, x, y, w, h, false);
249 250
… …
448 449
449 text_t chrs[2]; 450 text_t chrs[2];
450 chrs [1] = NOCHAR; 451 chrs [1] = NOCHAR;
451 452
452 *chrs = cc->c1; 453 *chrs = cc->c1;
453 rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)]; 454 rxvt_font *f1 = (*fs)[fs->find_font_idx (cc->c1)];
454 f1->draw (d, x, y, chrs, width, fg, bg); 455 f1->draw (d, x, y, chrs, width, fg, bg);
455 456
456 if (cc->c2 != NOCHAR) 457 if (cc->c2 != NOCHAR)
457 { 458 {
458 bool careful; 459 bool careful;
459 460
460 // prefer font of first character, for no good reasons 461 // prefer font of first character, for no good reasons
461 *chrs = cc->c2; 462 *chrs = cc->c2;
462 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful) 463 rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful)
463 ? f1 464 ? f1
464 : (*fs)[fs->find_font (cc->c2)]; 465 : (*fs)[fs->find_font_idx (cc->c2)];
465 466
466 f2->draw (d, x, y, chrs, width, fg, Color_none); 467 f2->draw (d, x, y, chrs, width, fg, Color_none);
467 } 468 }
468 } 469 }
469#endif 470#endif
… …
482 483
483 x += fwidth; 484 x += fwidth;
484 } 485 }
485} 486}
486 487
487struct rxvt_font_meta : rxvt_font { 488struct rxvt_font_overflow : rxvt_font {
488 struct rxvt_fontset *fs; 489 struct rxvt_fontset *fs;
489 490
490 rxvt_font_meta (rxvt_fontset *fs) 491 rxvt_font_overflow (rxvt_fontset *fs)
491 : rxvt_font () 492 : rxvt_font ()
492 { 493 {
493 this->fs = fs; 494 this->fs = fs;
494 } 495 }
495 496
… …
508 bool load (const rxvt_fontprop &prop, bool force_prop) 509 bool load (const rxvt_fontprop &prop, bool force_prop)
509 { 510 {
510 width = 1; height = 1; 511 width = 1; height = 1;
511 ascent = 1; descent = 0; 512 ascent = 1; descent = 0;
512 513
513 set_name (strdup ("built-in meta font")); 514 set_name (strdup ("built-in rendition overflow font"));
514 515
515 return true; 516 return true;
516 } 517 }
517 518
518 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const 519 bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
… …
522 523
523 void draw (rxvt_drawable &d, int x, int y, 524 void draw (rxvt_drawable &d, int x, int y,
524 const text_t *text, int len, 525 const text_t *text, int len,
525 int fg, int bg) 526 int fg, int bg)
526 { 527 {
527 while (len--) 528 while (len)
528 { 529 {
529 int fid = fs->find_font_idx (*text); 530 int fid = fs->find_font_idx (*text);
531 int w = 1;
532 while (w < len && text[w] == NOCHAR)
533 w++;
530 (*fs)[fid]->draw (d, x, y, text, 1, fg, bg); 534 (*fs)[fid]->draw (d, x, y, text, w, fg, bg);
531 ++text; 535 text += w;
536 len -= w;
532 x += term->fwidth; 537 x += term->fwidth * w;
533 } 538 }
534 } 539 }
535}; 540};
536 541
537///////////////////////////////////////////////////////////////////////////// 542/////////////////////////////////////////////////////////////////////////////
… …
716 f = XLoadQueryFont (disp, name); 721 f = XLoadQueryFont (disp, name);
717 722
718 if (!f) 723 if (!f)
719 return false; 724 return false;
720 725
721 char *new_name = get_property (f, XA_FONT, name); 726 char *new_name = get_property (f, XA_FONT, 0);
722 727
723 if (new_name) 728 if (new_name)
724 set_name (new_name); 729 set_name (new_name);
725 else 730 else
726 rxvt_warn ("font '%s' has no FONT property, continuing without.", name); 731 rxvt_warn ("font '%s' has no FONT property, continuing without.\n", name);
727 732
728 XFreeFont (disp, f); 733 XFreeFont (disp, f);
729 f = 0; 734 f = 0;
730 } 735 }
731 736
… …
788 free (fname); 793 free (fname);
789 if (replace_field (&fname, list[i], 11, '0', "0")) 794 if (replace_field (&fname, list[i], 11, '0', "0"))
790 diff += 300; // more heavily penalize what looks like scaled bitmap fonts 795 diff += 300; // more heavily penalize what looks like scaled bitmap fonts
791 } 796 }
792 797
793 if (!set_properties (p, fname)) 798 if (!set_properties (p, fname)
799 // also weed out too large fonts
800 || (prop.height != rxvt_fontprop::unset
801 && p.height > prop.height))
802 {
803 free (fname);
794 continue; 804 continue;
795 805 }
796 if (prop.height != rxvt_fontprop::unset
797 && p.height > prop.height) // weed out too large fonts
798 continue;
799 806
800 if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128; 807 if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128;
801 if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight); 808 if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight);
802 if (prop.slant != rxvt_fontprop::unset) diff += abs (prop.slant - p.slant); 809 if (prop.slant != rxvt_fontprop::unset) diff += abs (prop.slant - p.slant);
803 //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width); 810 //if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width);
… …
809 XFreeFontNames (list); 816 XFreeFontNames (list);
810 817
811 // this loop only iterates when the guessed font-size is too small 818 // this loop only iterates when the guessed font-size is too small
812 for (;;) 819 for (;;)
813 { 820 {
814 font_weight *best = fonts + count - 1; 821 font_weight *best = fonts;
815 822
816 for (font_weight *w = best; w-- > fonts; ) 823 for (font_weight *w = fonts + 1; w < fonts + count; w++)
817 if (w->diff <= best->diff) 824 if (w->diff < best->diff)
818 best = w; 825 best = w;
819 826
820 if (!best->name 827 if (!best->name
821 || !(f = XLoadQueryFont (disp, best->name))) 828 || !(f = XLoadQueryFont (disp, best->name)))
822 break; 829 break;
… …
860 free (registry); 867 free (registry);
861 free (encoding); 868 free (encoding);
862 869
863 if (cs == CS_UNKNOWN) 870 if (cs == CS_UNKNOWN)
864 { 871 {
865 const char *charset = get_property (f, XA_FONT, 0); 872 char *value = get_property (f, XA_FONT, 0);
873 const char *charset = value;
866 874
867 if (!charset) 875 if (!charset)
868 charset = name; 876 charset = name;
869 877
870 int count = 13; 878 int count = 13;
… …
873 break; 881 break;
874 882
875 cs = codeset_from_name (charset); 883 cs = codeset_from_name (charset);
876 if (cs == CS_UNKNOWN) 884 if (cs == CS_UNKNOWN)
877 rxvt_warn ("%s: cannot deduce encoding from font name property \"%s\", ignoring font.\n", name, charset); 885 rxvt_warn ("%s: cannot deduce encoding from font name property \"%s\", ignoring font.\n", name, charset);
886
887 free (value);
878 } 888 }
879 889
880 if (cs == CS_UNKNOWN) 890 if (cs == CS_UNKNOWN)
881 { 891 {
882 clear (); 892 clear ();
… …
914 } 924 }
915#endif 925#endif
916 926
917 width = 1; 927 width = 1;
918 928
919 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 929 for (uint16_t *t = extent_test_chars; t < extent_test_chars + ecb_array_length (extent_test_chars); t++)
920 { 930 {
921 if (FROM_UNICODE (cs, *t) == NOCHAR) 931 if (FROM_UNICODE (cs, *t) == NOCHAR)
922 continue; 932 continue;
923 933
924 // ignore characters we wouldn't use anyways 934 // ignore characters we wouldn't use anyways
925 bool careful; 935 bool careful;
926 if (!has_char (*t, &prop, careful)) 936 if (!has_char (*t, &prop, careful))
927 continue; 937 continue;
928 938
929 XChar2b ch = { *t >> 8, *t }; 939 // the casts are needed in C++11 (see 8.5.1)
940 XChar2b ch = { (unsigned char)(*t >> 8), (unsigned char)*t };
930 941
931 XCharStruct g; 942 XCharStruct g;
932 int dir_ret, asc_ret, des_ret; 943 int dir_ret, asc_ret, des_ret;
933 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); 944 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);
934 945
… …
960} 971}
961 972
962bool 973bool
963rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const 974rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
964{ 975{
976 careful = false;
977
965 uint32_t ch = FROM_UNICODE (cs, unicode); 978 uint32_t ch = FROM_UNICODE (cs, unicode);
966 979
967 if (ch == NOCHAR) 980 if (ch == NOCHAR)
968 return false; 981 return false;
969 982
… …
1032 dTermDisplay; 1045 dTermDisplay;
1033 dTermGC; 1046 dTermGC;
1034 1047
1035 bool slow = this->slow 1048 bool slow = this->slow
1036 || width != term->fwidth 1049 || width != term->fwidth
1037 || height != term->fheight; 1050 || height != term->fheight
1051 || ascent != f->ascent;
1038 1052
1039 int base = ascent; // sorry, incorrect: term->fbase; 1053 int base = ascent; // sorry, incorrect: term->fbase;
1040 1054
1041 XGCValues v; 1055 XGCValues v;
1042 v.foreground = term->pix_colors[fg]; 1056 v.foreground = term->pix_colors[fg];
… …
1211 int ftheight = 0; 1225 int ftheight = 0;
1212 bool success = true; 1226 bool success = true;
1213 1227
1214 for (;;) 1228 for (;;)
1215 { 1229 {
1230 p = FcPatternDuplicate (match);
1216 f = XftFontOpenPattern (disp, FcPatternDuplicate (match)); 1231 f = XftFontOpenPattern (disp, p);
1217 1232
1218 if (!f) 1233 if (!f)
1219 { 1234 {
1235 FcPatternDestroy (p);
1220 success = false; 1236 success = false;
1221 break; 1237 break;
1222 } 1238 }
1223 1239
1224 FT_Face face = XftLockFace (f); 1240 FT_Face face = XftLockFace (f);
… …
1232 1248
1233 XftUnlockFace (f); 1249 XftUnlockFace (f);
1234 1250
1235 int glheight = height; 1251 int glheight = height;
1236 1252
1237 for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; ) 1253 for (uint16_t *t = extent_test_chars; t < extent_test_chars + ecb_array_length (extent_test_chars); t++)
1238 { 1254 {
1239 FcChar16 ch = *t; 1255 FcChar16 ch = *t;
1240 1256
1241 if (cs != CS_UNICODE 1257 if (cs != CS_UNICODE
1242 && ch > 0x100 1258 && ch > 0x100
… …
1397 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); 1413 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1398 1414
1399#ifdef HAVE_BG_PIXMAP 1415#ifdef HAVE_BG_PIXMAP
1400 Picture dst = 0; // the only assignment is done conditionally in the following if condition 1416 Picture dst = 0; // the only assignment is done conditionally in the following if condition
1401 1417
1402 if (term->bgPixmap.pixmap 1418 if (term->bg_img
1403 && (bg == Color_transparent || bg == Color_bg 1419 && (bg == Color_transparent || bg == Color_bg
1404 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2)))))) 1420 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2))))))
1405 { 1421 {
1406 int src_x = x, src_y = y; 1422 int src_x = x, src_y = y;
1407 1423
1408 if (term->bgPixmap.is_parentOrigin ()) 1424 if (term->bg_flags & rxvt_term::BG_IS_TRANSPARENT)
1409 { 1425 {
1410 src_x += term->window_vt_x; 1426 src_x += term->window_vt_x;
1411 src_y += term->window_vt_y; 1427 src_y += term->window_vt_y;
1412 } 1428 }
1413 1429
1414 if (term->bgPixmap.pmap_width >= src_x + w 1430 if (term->bg_img->w >= src_x + w
1415 && term->bgPixmap.pmap_height >= src_y + h) 1431 && term->bg_img->h >= src_y + h)
1416 { 1432 {
1417 XCopyArea (disp, term->bgPixmap.pixmap, d2, gc, 1433 XCopyArea (disp, term->bg_img->pm, d2, gc,
1418 src_x, src_y, w, h, 0, 0); 1434 src_x, src_y, w, h, 0, 0);
1419 } 1435 }
1420 else 1436 else
1421 { 1437 {
1422 XGCValues gcv; 1438 XGCValues gcv;
1423 1439
1424 gcv.fill_style = FillTiled; 1440 gcv.fill_style = FillTiled;
1425 gcv.tile = term->bgPixmap.pixmap; 1441 gcv.tile = term->bg_img->pm;
1426 gcv.ts_x_origin = -src_x; 1442 gcv.ts_x_origin = -src_x;
1427 gcv.ts_y_origin = -src_y; 1443 gcv.ts_y_origin = -src_y;
1428 1444
1429 XChangeGC (disp, gc, 1445 XChangeGC (disp, gc,
1430 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle, 1446 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
… …
1482 prop.width = prop.height = prop.ascent = prop.weight = prop.slant 1498 prop.width = prop.height = prop.ascent = prop.weight = prop.slant
1483 = rxvt_fontprop::unset; 1499 = rxvt_fontprop::unset;
1484 force_prop = false; 1500 force_prop = false;
1485 1501
1486 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) 1502 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1487 FONT_UNREF (*i); 1503 (*i)->unref ();
1488 1504
1489 for (pagemap **p = fmap.begin (); p != fmap.end (); p++) 1505 for (pagemap **p = fmap.begin (); p != fmap.end (); p++)
1490 delete *p; 1506 delete *p;
1491 1507
1492 free (fontdesc); fontdesc = 0; 1508 free (fontdesc); fontdesc = 0;
… …
1494 fonts.clear (); 1510 fonts.clear ();
1495 1511
1496 fallback = fallback_fonts; 1512 fallback = fallback_fonts;
1497} 1513}
1498 1514
1515void
1516rxvt_fontset::prepare_font (rxvt_font *font, codeset cs)
1517{
1518 font->set_term (term);
1519
1520 font->cs = cs;
1521 font->loaded = false;
1522}
1523
1499rxvt_font * 1524rxvt_font *
1500rxvt_fontset::new_font (const char *name, codeset cs) 1525rxvt_fontset::new_font (const char *name, codeset cs)
1501{ 1526{
1502 rxvt_font *f; 1527 rxvt_font *f;
1503 1528
… …
1519 f = new rxvt_font_x11; 1544 f = new rxvt_font_x11;
1520 } 1545 }
1521 else 1546 else
1522 f = new rxvt_font_x11; 1547 f = new rxvt_font_x11;
1523 1548
1524 f->set_term (term);
1525 f->set_name (strdup (name)); 1549 f->set_name (strdup (name));
1526 1550 prepare_font (f, cs);
1527 f->cs = cs;
1528 f->loaded = false;
1529 1551
1530 return f; 1552 return f;
1531} 1553}
1532 1554
1533///////////////////////////////////////////////////////////////////////////// 1555/////////////////////////////////////////////////////////////////////////////
1556
1557void
1558rxvt_fontset::push_font (rxvt_font *font)
1559{
1560 // the fontCount index is reserved for the overflow font, it is only
1561 // necessary when we get fontCount or more fonts, as they cannot be
1562 // represented in the rendition.
1563 if (fonts.size () == fontCount)
1564 {
1565 rxvt_font *f = new rxvt_font_overflow (this);
1566
1567 prepare_font (f, CS_UNICODE);
1568 fonts.push_back (f);
1569 }
1570
1571 fonts.push_back (font);
1572}
1534 1573
1535void 1574void
1536rxvt_fontset::add_fonts (const char *desc) 1575rxvt_fontset::add_fonts (const char *desc)
1537{ 1576{
1538 if (desc) 1577 if (desc)
… …
1567 cs = codeset_from_name (spec + sizeof ("codeset=") - 1); 1606 cs = codeset_from_name (spec + sizeof ("codeset=") - 1);
1568 else 1607 else
1569 rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec); 1608 rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec);
1570 1609
1571 desc++; 1610 desc++;
1572 while (*desc <= ' ') desc++; 1611 while (*desc <= ' ' && *desc) desc++;
1573 } 1612 }
1574 1613
1575 end = strchr (desc, ','); 1614 end = strchr (desc, ',');
1576 if (!end) 1615 if (!end)
1577 end = desc + strlen (desc); 1616 end = desc + strlen (desc);
… …
1579 if (end - desc < 511) 1618 if (end - desc < 511)
1580 { 1619 {
1581 memcpy (buf, desc, end - desc); 1620 memcpy (buf, desc, end - desc);
1582 buf[end - desc] = 0; 1621 buf[end - desc] = 0;
1583 1622
1584 fonts.push_back (new_font (buf, cs)); 1623 push_font (new_font (buf, cs));
1585 } 1624 }
1586 else 1625 else
1587 rxvt_warn ("fontset element too long (>511 bytes), ignored."); 1626 rxvt_warn ("fontset element too long (>511 bytes), ignored.\n");
1588 1627
1589 desc = end + 1; 1628 desc = end + 1;
1590 } 1629 }
1591 while (*end); 1630 while (*end);
1592 } 1631 }
… …
1617{ 1656{
1618 clear (); 1657 clear ();
1619 1658
1620 fontdesc = strdup (desc); 1659 fontdesc = strdup (desc);
1621 1660
1622 fonts.push_back (new_font (0, CS_UNICODE)); 1661 push_font (new_font (0, CS_UNICODE));
1623 realize_font (0); 1662 realize_font (0);
1624 1663
1625 add_fonts (desc); 1664 add_fonts (desc);
1626 1665
1627 return true; 1666 return true;
… …
1672 goto next_font; 1711 goto next_font;
1673 1712
1674 bool careful; 1713 bool careful;
1675 if (f->has_char (unicode, &prop, careful)) 1714 if (f->has_char (unicode, &prop, careful))
1676 { 1715 {
1677 if (careful) 1716 i = (i << 1) | careful;
1678 i |= 128;
1679 1717
1680 goto found; 1718 goto found;
1681 } 1719 }
1682 1720
1683 next_font: 1721 next_font:
1684 if (i == fonts.size () - 1) 1722 if (i == fonts.size () - 1)
1685 { 1723 {
1686 if (fallback->name) 1724 if (fallback->name)
1687 { 1725 {
1688 // search through the fallback list 1726 // search through the fallback list
1689 fonts.push_back (new_font (fallback->name, fallback->cs)); 1727 push_font (new_font (fallback->name, fallback->cs));
1690 fallback++; 1728 fallback++;
1691 } 1729 }
1692 else 1730 else
1693 { 1731 {
1694 // try to find a new font. 1732 // try to find a new font.
… …
1727 if (find_font (font) < 0) 1765 if (find_font (font) < 0)
1728 { 1766 {
1729 char fontname[4096]; 1767 char fontname[4096];
1730 snprintf (fontname, sizeof (fontname), "xft:%s", font); 1768 snprintf (fontname, sizeof (fontname), "xft:%s", font);
1731 1769
1732 fonts.push_back (new_font (fontname, CS_UNICODE)); 1770 push_font (new_font (fontname, CS_UNICODE));
1733 } 1771 }
1734 1772
1735 free (font); 1773 free (font);
1736 } 1774 }
1737#endif 1775#endif
… …
1749 while (hi >= fmap.size ()) 1787 while (hi >= fmap.size ())
1750 fmap.push_back (0); 1788 fmap.push_back (0);
1751 1789
1752 if (!fmap[hi]) 1790 if (!fmap[hi])
1753 { 1791 {
1754 fmap[hi] = (pagemap *)new pagemap; 1792 fmap[hi] = new pagemap;
1755 memset (fmap[hi], 0xff, sizeof (pagemap)); 1793 memset (fmap[hi], 0xff, sizeof (pagemap));
1756 } 1794 }
1757 1795
1758 (*fmap[hi])[unicode & 0xff] = i; 1796 (*fmap[hi])[unicode & 0xff] = i;
1759 } 1797 }
1760 1798
1761 return i; 1799 return i;
1762} 1800}
1763 1801
1764int
1765rxvt_fontset::find_font (unicode_t unicode)
1766{
1767 int id = find_font_idx (unicode);
1768
1769 return min<int> (fontCount, id & 127) | (id & 128 ? Careful : 0);
1770}

Diff Legend

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