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.170 by sf-exg, Thu Dec 30 01:13:24 2010 UTC vs.
Revision 1.201 by root, Thu Jun 17 01:44:29 2021 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 30
31#if XFT 31#if XFT
32# include <fontconfig/fontconfig.h> 32# include <fontconfig/fontconfig.h>
… …
132 { CS_KSC5601_1987_0, "xft:Baekmuk Gulim:antialias=false" }, 132 { CS_KSC5601_1987_0, "xft:Baekmuk Gulim:antialias=false" },
133 { CS_KSC5601_1987_0, "xft::lang=ko:antialias=false" }, 133 { CS_KSC5601_1987_0, "xft::lang=ko:antialias=false" },
134# endif 134# endif
135#endif 135#endif
136 136
137 { CS_UNICODE, "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" },
138 //{ 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.
139#if XFT 138#if XFT
140 { CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true" }, 139 { CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true" },
141 { CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" }, 140 { CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" },
142 { CS_UNICODE, "xft:Andale Mono:antialias=false:autohint=false" }, 141 { CS_UNICODE, "xft:Andale Mono:antialias=false:autohint=false" },
… …
213} 212}
214 213
215///////////////////////////////////////////////////////////////////////////// 214/////////////////////////////////////////////////////////////////////////////
216 215
217rxvt_font::rxvt_font () 216rxvt_font::rxvt_font ()
218: name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset) 217: name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset), can_compose(false)
219{ 218{
220} 219}
221 220
222void 221void
223rxvt_font::set_name (char *name_) 222rxvt_font::set_name (char *name_)
… …
240 else if (color >= 0) 239 else if (color >= 0)
241 { 240 {
242#if XFT 241#if XFT
243 Picture dst; 242 Picture dst;
244 243
245# ifdef HAVE_BG_PIXMAP 244# ifdef HAVE_IMG
246 if (term->bgPixmap.pixmap 245 if (term->bg_img
247 && !term->pix_colors[color].is_opaque () 246 && !term->pix_colors[color].is_opaque ()
248 && ((dst = XftDrawPicture (d)))) 247 && ((dst = XftDrawPicture (d))))
249 { 248 {
250 XClearArea (disp, d, x, y, w, h, false); 249 XClearArea (disp, d, x, y, w, h, false);
251 250
… …
263 } 262 }
264} 263}
265 264
266///////////////////////////////////////////////////////////////////////////// 265/////////////////////////////////////////////////////////////////////////////
267 266
268struct rxvt_font_default : rxvt_font { 267struct rxvt_font_default : rxvt_font
268{
269 struct rxvt_fontset *fs; 269 struct rxvt_fontset *fs;
270 270
271 rxvt_font_default (rxvt_fontset *fs) 271 rxvt_font_default (rxvt_fontset *fs)
272 : rxvt_font () 272 : rxvt_font ()
273 { 273 {
… …
313 if (unicode >= 0x2500 && unicode <= 0x259f && 313 if (unicode >= 0x2500 && unicode <= 0x259f &&
314 !term->option (Opt_skipBuiltinGlyphs)) 314 !term->option (Opt_skipBuiltinGlyphs))
315 return true; 315 return true;
316#endif 316#endif
317 317
318 if (IS_COMPOSE (unicode)) 318 // we do not check for IS_COMPOSE here, as this would
319 return true; 319 // rob other fonts from taking over.
320 320
321 switch (unicode) 321 switch (unicode)
322 { 322 {
323 case ZERO_WIDTH_CHAR: 323 case ZERO_WIDTH_CHAR:
324 case NOCHAR: 324 case NOCHAR:
… …
345 345
346 XSetForeground (disp, gc, term->pix_colors[fg]); 346 XSetForeground (disp, gc, term->pix_colors[fg]);
347 347
348 while (len) 348 while (len)
349 { 349 {
350 const text_t *tp = text;
351 text_t t = *tp;
352
353 while (++text, --len && *text == NOCHAR)
354 ;
355
350#if ENABLE_COMBINING 356#if ENABLE_COMBINING
351 compose_char *cc; 357 compose_char *cc;
352#endif 358#endif
353 const text_t *tp = text;
354 text_t t = *tp;
355
356 while (++text, --len && *text == NOCHAR)
357 ;
358
359 int width = text - tp; 359 int width = text - tp;
360 int fwidth = term->fwidth * width; 360 int fwidth = term->fwidth * width;
361 361
362#ifdef BUILTIN_GLYPHS 362#ifdef BUILTIN_GLYPHS
363 if (0x2500 <= t && t <= 0x259f) 363 if (0x2500 <= t && t <= 0x259f)
… …
446#if ENABLE_COMBINING 446#if ENABLE_COMBINING
447 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) 447 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
448 { 448 {
449 min_it (width, 2); // we only support wcwidth up to 2 449 min_it (width, 2); // we only support wcwidth up to 2
450 450
451 #if NOT_YET
452 vector<text_t> chrs;
453 chrs.reserve (rxvt_composite.expand (t));
454 rxvt_composite.expand (t, &chrs[0]);
455
456 while (!chrs.empty ())
457 {
458 rxvt_font *f1 = fs->find_font_idx (chrs[0])
459
460 int i = 0;
461 while (i < chrs.size () - 1
462 && f1->can_combine
463 && f1->has-char (chrs[i + 1], careful)
464 && !careful
465 ++i;
466
467 (*fs)[f1]->draw (d, x, y, &chrs[0], width, fg, bg);
468 chrs.erase (&chrs[0], &chrs[i]);
469 }
470 #endif
471
472 #if 1
451 text_t chrs[2]; 473 text_t chrs[2];
452 chrs [1] = NOCHAR; 474 chrs [1] = NOCHAR;
453 475
454 *chrs = cc->c1; 476 *chrs = cc->c1;
455 rxvt_font *f1 = (*fs)[fs->find_font_idx (cc->c1)]; 477 rxvt_font *f1 = (*fs)[fs->find_font_idx (cc->c1)];
… …
465 ? f1 487 ? f1
466 : (*fs)[fs->find_font_idx (cc->c2)]; 488 : (*fs)[fs->find_font_idx (cc->c2)];
467 489
468 f2->draw (d, x, y, chrs, width, fg, Color_none); 490 f2->draw (d, x, y, chrs, width, fg, Color_none);
469 } 491 }
492 #endif
470 } 493 }
471#endif 494#endif
472 else 495 else
473 switch (t) 496 switch (t)
474 { 497 {
475 case '\t': 498 case '\t':
476 case ZERO_WIDTH_CHAR: 499 case ZERO_WIDTH_CHAR:
477 case NOCHAR: 500 case NOCHAR:
478 break; 501 break;
479 502
503 /*
504 * If the base font does not support variation selectors, treat them as ZWC.
505 * a point could be made to do this for all wcwidth == 0 characters, but I
506 * decided against that until more data is available.
507 */
508 case 0xfe00: case 0xfe01: case 0xfe02: case 0xfe03: case 0xfe04: case 0xfe05: case 0xfe06: case 0xfe07:
509 case 0xfe08: case 0xfe09: case 0xfe0a: case 0xfe0b: case 0xfe0c: case 0xfe0d: case 0xfe0e: case 0xfe0f:
510 break;
511
480 default: 512 default:
481 XDrawRectangle (disp, d, gc, x + 2, y + 2, 513 XDrawRectangle (disp, d, gc, x + 2, y + 2,
482 fwidth - 4, term->fheight - 4); 514 fwidth - 4, term->fheight - 4);
483 } 515 }
484 516
485 x += fwidth; 517 x += fwidth;
486 } 518 }
487} 519}
488 520
489struct rxvt_font_overflow : rxvt_font { 521struct rxvt_font_overflow : rxvt_font
522{
490 struct rxvt_fontset *fs; 523 struct rxvt_fontset *fs;
491 524
492 rxvt_font_overflow (rxvt_fontset *fs) 525 rxvt_font_overflow (rxvt_fontset *fs)
493 : rxvt_font () 526 : rxvt_font ()
494 { 527 {
… …
524 557
525 void draw (rxvt_drawable &d, int x, int y, 558 void draw (rxvt_drawable &d, int x, int y,
526 const text_t *text, int len, 559 const text_t *text, int len,
527 int fg, int bg) 560 int fg, int bg)
528 { 561 {
529 while (len--) 562 while (len)
530 { 563 {
531 int fid = fs->find_font_idx (*text); 564 int fid = fs->find_font_idx (*text);
565 int w = 1;
566 while (w < len && text[w] == NOCHAR)
567 w++;
532 (*fs)[fid]->draw (d, x, y, text, 1, fg, bg); 568 (*fs)[fid]->draw (d, x, y, text, w, fg, bg);
533 ++text; 569 text += w;
570 len -= w;
534 x += term->fwidth; 571 x += term->fwidth * w;
535 } 572 }
536 } 573 }
537}; 574};
538 575
539///////////////////////////////////////////////////////////////////////////// 576/////////////////////////////////////////////////////////////////////////////
540 577
541struct rxvt_font_x11 : rxvt_font { 578struct rxvt_font_x11 : rxvt_font
579{
542 rxvt_font_x11 () { f = 0; } 580 rxvt_font_x11 () { f = 0; }
543 581
544 void clear (); 582 void clear ();
545 583
546 rxvt_fontprop properties (); 584 rxvt_fontprop properties ();
… …
718 f = XLoadQueryFont (disp, name); 756 f = XLoadQueryFont (disp, name);
719 757
720 if (!f) 758 if (!f)
721 return false; 759 return false;
722 760
723 char *new_name = get_property (f, XA_FONT, name); 761 char *new_name = get_property (f, XA_FONT, 0);
724 762
725 if (new_name) 763 if (new_name)
726 set_name (new_name); 764 set_name (new_name);
727 else 765 else
728 rxvt_warn ("font '%s' has no FONT property, continuing without.", name); 766 rxvt_warn ("font '%s' has no FONT property, continuing without.\n", name);
729 767
730 XFreeFont (disp, f); 768 XFreeFont (disp, f);
731 f = 0; 769 f = 0;
732 } 770 }
733 771
… …
813 XFreeFontNames (list); 851 XFreeFontNames (list);
814 852
815 // this loop only iterates when the guessed font-size is too small 853 // this loop only iterates when the guessed font-size is too small
816 for (;;) 854 for (;;)
817 { 855 {
818 font_weight *best = fonts + count - 1; 856 font_weight *best = fonts;
819 857
820 for (font_weight *w = best; w-- > fonts; ) 858 for (font_weight *w = fonts + 1; w < fonts + count; w++)
821 if (w->diff <= best->diff) 859 if (w->diff < best->diff)
822 best = w; 860 best = w;
823 861
824 if (!best->name 862 if (!best->name
825 || !(f = XLoadQueryFont (disp, best->name))) 863 || !(f = XLoadQueryFont (disp, best->name)))
826 break; 864 break;
… …
864 free (registry); 902 free (registry);
865 free (encoding); 903 free (encoding);
866 904
867 if (cs == CS_UNKNOWN) 905 if (cs == CS_UNKNOWN)
868 { 906 {
869 const char *charset = get_property (f, XA_FONT, 0); 907 char *value = get_property (f, XA_FONT, 0);
908 const char *charset = value;
870 909
871 if (!charset) 910 if (!charset)
872 charset = name; 911 charset = name;
873 912
874 int count = 13; 913 int count = 13;
… …
877 break; 916 break;
878 917
879 cs = codeset_from_name (charset); 918 cs = codeset_from_name (charset);
880 if (cs == CS_UNKNOWN) 919 if (cs == CS_UNKNOWN)
881 rxvt_warn ("%s: cannot deduce encoding from font name property \"%s\", ignoring font.\n", name, charset); 920 rxvt_warn ("%s: cannot deduce encoding from font name property \"%s\", ignoring font.\n", name, charset);
921
922 free (value);
882 } 923 }
883 924
884 if (cs == CS_UNKNOWN) 925 if (cs == CS_UNKNOWN)
885 { 926 {
886 clear (); 927 clear ();
… …
918 } 959 }
919#endif 960#endif
920 961
921 width = 1; 962 width = 1;
922 963
923 for (uint16_t *t = extent_test_chars + ARRAY_LENGTH(extent_test_chars); t-- > extent_test_chars; ) 964 for (uint16_t *t = extent_test_chars; t < extent_test_chars + ecb_array_length (extent_test_chars); t++)
924 { 965 {
925 if (FROM_UNICODE (cs, *t) == NOCHAR) 966 if (FROM_UNICODE (cs, *t) == NOCHAR)
926 continue; 967 continue;
927 968
928 // ignore characters we wouldn't use anyways 969 // ignore characters we wouldn't use anyways
929 bool careful; 970 bool careful;
930 if (!has_char (*t, &prop, careful)) 971 if (!has_char (*t, &prop, careful))
931 continue; 972 continue;
932 973
933 XChar2b ch = { *t >> 8, *t }; 974 // the casts are needed in C++11 (see 8.5.1)
975 XChar2b ch = { (unsigned char)(*t >> 8), (unsigned char)*t };
934 976
935 XCharStruct g; 977 XCharStruct g;
936 int dir_ret, asc_ret, des_ret; 978 int dir_ret, asc_ret, des_ret;
937 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); 979 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);
938 980
… …
964} 1006}
965 1007
966bool 1008bool
967rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const 1009rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
968{ 1010{
1011 careful = false;
1012
969 uint32_t ch = FROM_UNICODE (cs, unicode); 1013 uint32_t ch = FROM_UNICODE (cs, unicode);
970 1014
971 if (ch == NOCHAR) 1015 if (ch == NOCHAR)
972 return false; 1016 return false;
973 1017
… …
1036 dTermDisplay; 1080 dTermDisplay;
1037 dTermGC; 1081 dTermGC;
1038 1082
1039 bool slow = this->slow 1083 bool slow = this->slow
1040 || width != term->fwidth 1084 || width != term->fwidth
1041 || height != term->fheight; 1085 || height != term->fheight
1086 || ascent != f->ascent;
1042 1087
1043 int base = ascent; // sorry, incorrect: term->fbase; 1088 int base = ascent; // sorry, incorrect: term->fbase;
1044 1089
1045 XGCValues v; 1090 XGCValues v;
1046 v.foreground = term->pix_colors[fg]; 1091 v.foreground = term->pix_colors[fg];
… …
1114 1159
1115///////////////////////////////////////////////////////////////////////////// 1160/////////////////////////////////////////////////////////////////////////////
1116 1161
1117#if XFT 1162#if XFT
1118 1163
1119struct rxvt_font_xft : rxvt_font { 1164struct rxvt_font_xft : rxvt_font
1165{
1120 rxvt_font_xft () { f = 0; } 1166 rxvt_font_xft ()
1167 {
1168 can_compose = true;
1169 f = 0;
1170 }
1121 1171
1122 void clear (); 1172 void clear ();
1123 1173
1124 rxvt_fontprop properties (); 1174 rxvt_fontprop properties ();
1125 1175
… …
1215 int ftheight = 0; 1265 int ftheight = 0;
1216 bool success = true; 1266 bool success = true;
1217 1267
1218 for (;;) 1268 for (;;)
1219 { 1269 {
1270 p = FcPatternDuplicate (match);
1220 f = XftFontOpenPattern (disp, FcPatternDuplicate (match)); 1271 f = XftFontOpenPattern (disp, p);
1221 1272
1222 if (!f) 1273 if (!f)
1223 { 1274 {
1275 FcPatternDestroy (p);
1224 success = false; 1276 success = false;
1225 break; 1277 break;
1226 } 1278 }
1227 1279
1228 FT_Face face = XftLockFace (f); 1280 FT_Face face = XftLockFace (f);
… …
1236 1288
1237 XftUnlockFace (f); 1289 XftUnlockFace (f);
1238 1290
1239 int glheight = height; 1291 int glheight = height;
1240 1292
1241 for (uint16_t *t = extent_test_chars + ARRAY_LENGTH(extent_test_chars); t-- > extent_test_chars; ) 1293 for (uint16_t *t = extent_test_chars; t < extent_test_chars + ecb_array_length (extent_test_chars); t++)
1242 { 1294 {
1243 FcChar16 ch = *t; 1295 FcChar16 ch = *t;
1244 1296
1245 if (cs != CS_UNICODE 1297 if (cs != CS_UNICODE
1246 && ch > 0x100 1298 && ch > 0x100
… …
1315bool 1367bool
1316rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const 1368rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
1317{ 1369{
1318 careful = false; 1370 careful = false;
1319 1371
1372#if ENABLE_COMBINING && !UNICODE_3
1373 if (ecb_expect_false (IS_COMPOSE (unicode)))
1374 if (compose_char *cc = rxvt_composite[unicode])
1375 if (cc->c2 == NOCHAR)
1376 unicode = cc->c1;
1377#endif
1378
1320 if (!XftCharExists (term->dpy, f, unicode)) 1379 if (!XftCharExists (term->dpy, f, unicode))
1321 return false; 1380 return false;
1322 1381
1323 if (!prop || prop->width == rxvt_fontprop::unset) 1382 if (!prop || prop->width == rxvt_fontprop::unset)
1324 return true; 1383 return true;
… …
1371 while (len) 1430 while (len)
1372 { 1431 {
1373 int cwidth = term->fwidth; 1432 int cwidth = term->fwidth;
1374 FcChar32 fc = *text++; len--; 1433 FcChar32 fc = *text++; len--;
1375 1434
1435#if ENABLE_COMBINING && !UNICODE_3
1436 if (ecb_expect_false (IS_COMPOSE (fc)))
1437 if (compose_char *cc = rxvt_composite[fc]) // should always be true, but better be safe than sorry
1438 fc = cc->c1; // c2 must be NOCHAR, as has_char handles it that way
1439#endif
1440
1376 while (len && *text == NOCHAR) 1441 while (len && *text == NOCHAR)
1377 text++, len--, cwidth += term->fwidth; 1442 text++, len--, cwidth += term->fwidth;
1378 1443
1379 if (fc != ' ') // skip spaces 1444 if (fc != ' ') // skip spaces
1380 { 1445 {
… …
1398 { 1463 {
1399 if (ep != enc) 1464 if (ep != enc)
1400 { 1465 {
1401 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); 1466 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1402 1467
1403#ifdef HAVE_BG_PIXMAP 1468#ifdef HAVE_IMG
1404 Picture dst = 0; // the only assignment is done conditionally in the following if condition 1469 Picture dst = 0; // the only assignment is done conditionally in the following if condition
1405 1470
1406 if (term->bgPixmap.pixmap 1471 if (term->bg_img
1407 && (bg == Color_transparent || bg == Color_bg 1472 && (bg == Color_transparent || bg == Color_bg
1408 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2)))))) 1473 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2))))))
1409 { 1474 {
1410 int src_x = x, src_y = y; 1475 int src_x = x, src_y = y;
1411 1476
1412 if (term->bgPixmap.flags & bgPixmap_t::isTransparent) 1477 if (term->bg_flags & rxvt_term::BG_IS_TRANSPARENT)
1413 { 1478 {
1414 src_x += term->window_vt_x; 1479 src_x += term->window_vt_x;
1415 src_y += term->window_vt_y; 1480 src_y += term->window_vt_y;
1416 } 1481 }
1417 1482
1418 if (term->bgPixmap.pmap_width >= src_x + w 1483 if (term->bg_img->w >= src_x + w
1419 && term->bgPixmap.pmap_height >= src_y + h) 1484 && term->bg_img->h >= src_y + h)
1420 { 1485 {
1421 XCopyArea (disp, term->bgPixmap.pixmap, d2, gc, 1486 XCopyArea (disp, term->bg_img->pm, d2, gc,
1422 src_x, src_y, w, h, 0, 0); 1487 src_x, src_y, w, h, 0, 0);
1423 } 1488 }
1424 else 1489 else
1425 { 1490 {
1426 XGCValues gcv; 1491 XGCValues gcv;
1427 1492
1428 gcv.fill_style = FillTiled; 1493 gcv.fill_style = FillTiled;
1429 gcv.tile = term->bgPixmap.pixmap; 1494 gcv.tile = term->bg_img->pm;
1430 gcv.ts_x_origin = -src_x; 1495 gcv.ts_x_origin = -src_x;
1431 gcv.ts_y_origin = -src_y; 1496 gcv.ts_y_origin = -src_y;
1432 1497
1433 XChangeGC (disp, gc, 1498 XChangeGC (disp, gc,
1434 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle, 1499 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
… …
1594 cs = codeset_from_name (spec + sizeof ("codeset=") - 1); 1659 cs = codeset_from_name (spec + sizeof ("codeset=") - 1);
1595 else 1660 else
1596 rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec); 1661 rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec);
1597 1662
1598 desc++; 1663 desc++;
1599 while (*desc <= ' ') desc++; 1664 while (*desc <= ' ' && *desc) desc++;
1600 } 1665 }
1601 1666
1602 end = strchr (desc, ','); 1667 end = strchr (desc, ',');
1603 if (!end) 1668 if (!end)
1604 end = desc + strlen (desc); 1669 end = desc + strlen (desc);
… …
1609 buf[end - desc] = 0; 1674 buf[end - desc] = 0;
1610 1675
1611 push_font (new_font (buf, cs)); 1676 push_font (new_font (buf, cs));
1612 } 1677 }
1613 else 1678 else
1614 rxvt_warn ("fontset element too long (>511 bytes), ignored."); 1679 rxvt_warn ("fontset element too long (>511 bytes), ignored.\n");
1615 1680
1616 desc = end + 1; 1681 desc = end + 1;
1617 } 1682 }
1618 while (*end); 1683 while (*end);
1619 } 1684 }
… …
1665} 1730}
1666 1731
1667int 1732int
1668rxvt_fontset::find_font_idx (unicode_t unicode) 1733rxvt_fontset::find_font_idx (unicode_t unicode)
1669{ 1734{
1670 if (unicode >= 1<<20) 1735 // this limits fmap size. it has to accomodate COMPOSE_HI when UNICODE_3
1736 if (unicode > 0x1fffff)
1671 return 0; 1737 return 0;
1672 1738
1673 unicode_t hi = unicode >> 8; 1739 unicode_t hi = unicode >> 8;
1674 1740
1675 if (hi < fmap.size () 1741 if (hi < fmap.size ()
… …
1707 } 1773 }
1708 1774
1709 next_font: 1775 next_font:
1710 if (i == fonts.size () - 1) 1776 if (i == fonts.size () - 1)
1711 { 1777 {
1778 // compose characters are handled by the default font, unless another font takes over
1779 // we do not go via the fallback list for speed reasons.
1780 if (IS_COMPOSE (unicode))
1781 return 0;
1782
1712 if (fallback->name) 1783 if (fallback->name)
1713 { 1784 {
1714 // search through the fallback list 1785 // search through the fallback list
1715 push_font (new_font (fallback->name, fallback->cs)); 1786 push_font (new_font (fallback->name, fallback->cs));
1716 fallback++; 1787 fallback++;
… …
1722 // way to configure this and xft is easier to hack in, 1793 // way to configure this and xft is easier to hack in,
1723 // while x11 has more framework in place already. 1794 // while x11 has more framework in place already.
1724 // TODO: this is a real resource hog, xft takes ages(?) 1795 // TODO: this is a real resource hog, xft takes ages(?)
1725#if XFT && USE_SLOW_LOOKUP 1796#if XFT && USE_SLOW_LOOKUP
1726 // grab the first xft font that seems suitable 1797 // grab the first xft font that seems suitable
1798 // TOOD: should go first for cellchar (spacing 110) then mono, then else
1727 FcPattern *p = FcPatternCreate (); 1799 FcPattern *p = FcPatternCreate ();
1728 1800
1729 FcCharSet *s = FcCharSetCreate (); 1801 FcCharSet *s = FcCharSetCreate ();
1730 FcCharSetAddChar (s, unicode); 1802 FcCharSetAddChar (s, unicode);
1731 FcPatternAddCharSet (p, FC_CHARSET, s); 1803 FcPatternAddCharSet (p, FC_CHARSET, s);
… …
1775 while (hi >= fmap.size ()) 1847 while (hi >= fmap.size ())
1776 fmap.push_back (0); 1848 fmap.push_back (0);
1777 1849
1778 if (!fmap[hi]) 1850 if (!fmap[hi])
1779 { 1851 {
1780 fmap[hi] = (pagemap *)new pagemap; 1852 fmap[hi] = new pagemap;
1781 memset (fmap[hi], 0xff, sizeof (pagemap)); 1853 memset (fmap[hi], 0xff, sizeof (pagemap));
1782 } 1854 }
1783 1855
1784 (*fmap[hi])[unicode & 0xff] = i; 1856 (*fmap[hi])[unicode & 0xff] = i;
1785 } 1857 }

Diff Legend

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