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.188 by root, Thu Jan 26 13:08:51 2012 UTC vs.
Revision 1.223 by sf-exg, Sat Aug 19 17:44:35 2023 UTC

… …
4 * Copyright (c) 2003-2008 Marc Lehmann <schmorp@schmorp.de> 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
… …
134# endif 134# endif
135#endif 135#endif
136 136
137 //{ 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.
138#if XFT 138#if XFT
139 { CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true" }, 139 { CS_UNICODE, "xft:DejaVu Sans Mono:antialias=false:autohint=true" },
140 { CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" }, 140 { CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" },
141 { CS_UNICODE, "xft:Andale Mono:antialias=false:autohint=false" }, 141 { CS_UNICODE, "xft:Andale Mono:antialias=false:autohint=false" },
142 { CS_UNICODE, "xft:Arial Unicode MS:antialias=false:autohint=false" }, 142 { CS_UNICODE, "xft:Arial Unicode MS:antialias=false:autohint=false" },
143 143
144 // FreeMono is usually uglier than x fonts, so try after the others 144 // FreeMono is usually uglier than x fonts, so try after the others
145 { CS_UNICODE, "xft:FreeMono:autohint=true" }, 145 { CS_UNICODE, "xft:FreeMono:autohint=true" },
146#endif 146#endif
147 147
… …
239 else if (color >= 0) 239 else if (color >= 0)
240 { 240 {
241#if XFT 241#if XFT
242 Picture dst; 242 Picture dst;
243 243
244# ifdef HAVE_BG_PIXMAP 244# ifdef HAVE_IMG
245 if (term->bg_pixmap 245 if (term->bg_img
246 && !term->pix_colors[color].is_opaque () 246 && !term->pix_colors[color].is_opaque ()
247 && ((dst = XftDrawPicture (d)))) 247 && ((dst = XftDrawPicture (d))))
248 { 248 {
249 XClearArea (disp, d, x, y, w, h, false); 249 XClearArea (disp, d, x, y, w, h, false);
250 250
… …
262 } 262 }
263} 263}
264 264
265///////////////////////////////////////////////////////////////////////////// 265/////////////////////////////////////////////////////////////////////////////
266 266
267struct rxvt_font_default : rxvt_font { 267struct rxvt_font_default : rxvt_font
268{
268 struct rxvt_fontset *fs; 269 struct rxvt_fontset *fs;
269 270
270 rxvt_font_default (rxvt_fontset *fs) 271 rxvt_font_default (rxvt_fontset *fs)
271 : rxvt_font () 272 : rxvt_font ()
272 { 273 {
… …
312 if (unicode >= 0x2500 && unicode <= 0x259f && 313 if (unicode >= 0x2500 && unicode <= 0x259f &&
313 !term->option (Opt_skipBuiltinGlyphs)) 314 !term->option (Opt_skipBuiltinGlyphs))
314 return true; 315 return true;
315#endif 316#endif
316 317
317 if (IS_COMPOSE (unicode)) 318 // we do not check for IS_COMPOSE here, as this would
318 return true; 319 // rob other fonts from taking over.
319 320
320 switch (unicode) 321 switch (unicode)
321 { 322 {
322 case ZERO_WIDTH_CHAR: 323 case ZERO_WIDTH_CHAR:
323 case NOCHAR: 324 case NOCHAR:
… …
344 345
345 XSetForeground (disp, gc, term->pix_colors[fg]); 346 XSetForeground (disp, gc, term->pix_colors[fg]);
346 347
347 while (len) 348 while (len)
348 { 349 {
350 const text_t *tp = text;
351 text_t t = *tp;
352
353 while (++text, --len && *text == NOCHAR)
354 ;
355
349#if ENABLE_COMBINING 356#if ENABLE_COMBINING
350 compose_char *cc; 357 compose_char *cc;
351#endif 358#endif
352 const text_t *tp = text;
353 text_t t = *tp;
354
355 while (++text, --len && *text == NOCHAR)
356 ;
357
358 int width = text - tp; 359 int width = text - tp;
359 int fwidth = term->fwidth * width; 360 int fwidth = term->fwidth * width;
360 361
361#ifdef BUILTIN_GLYPHS 362#ifdef BUILTIN_GLYPHS
362 if (0x2500 <= t && t <= 0x259f) 363 if (0x2500 <= t && t <= 0x259f)
… …
444#endif 445#endif
445#if ENABLE_COMBINING 446#if ENABLE_COMBINING
446 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t])) 447 else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
447 { 448 {
448 min_it (width, 2); // we only support wcwidth up to 2 449 min_it (width, 2); // we only support wcwidth up to 2
449
450 text_t chrs[2]; 450 text_t chrs[2];
451 chrs [1] = NOCHAR; 451 chrs [1] = NOCHAR;
452 452
453 *chrs = cc->c1; 453 *chrs = cc->c1;
454 rxvt_font *f1 = (*fs)[fs->find_font_idx (cc->c1)]; 454 rxvt_font *f1 = (*fs)[fs->find_font_idx (cc->c1)];
… …
474 case '\t': 474 case '\t':
475 case ZERO_WIDTH_CHAR: 475 case ZERO_WIDTH_CHAR:
476 case NOCHAR: 476 case NOCHAR:
477 break; 477 break;
478 478
479 /*
480 * If the base font does not support variation selectors, treat them as ZWC.
481 * a point could be made to do this for all wcwidth == 0 characters, but I
482 * decided against that until more data is available.
483 */
484 case 0xfe00: case 0xfe01: case 0xfe02: case 0xfe03: case 0xfe04: case 0xfe05: case 0xfe06: case 0xfe07:
485 case 0xfe08: case 0xfe09: case 0xfe0a: case 0xfe0b: case 0xfe0c: case 0xfe0d: case 0xfe0e: case 0xfe0f:
486 break;
487
479 default: 488 default:
480 XDrawRectangle (disp, d, gc, x + 2, y + 2, 489 XDrawRectangle (disp, d, gc, x + 2, y + 2,
481 fwidth - 4, term->fheight - 4); 490 fwidth - 4, term->fheight - 4);
482 } 491 }
483 492
484 x += fwidth; 493 x += fwidth;
485 } 494 }
486} 495}
487 496
488struct rxvt_font_overflow : rxvt_font { 497struct rxvt_font_overflow : rxvt_font
498{
489 struct rxvt_fontset *fs; 499 struct rxvt_fontset *fs;
490 500
491 rxvt_font_overflow (rxvt_fontset *fs) 501 rxvt_font_overflow (rxvt_fontset *fs)
492 : rxvt_font () 502 : rxvt_font ()
493 { 503 {
… …
507 } 517 }
508 518
509 bool load (const rxvt_fontprop &prop, bool force_prop) 519 bool load (const rxvt_fontprop &prop, bool force_prop)
510 { 520 {
511 width = 1; height = 1; 521 width = 1; height = 1;
512 ascent = 1; descent = 0; 522 ascent = 1;
523 descent = (*fs)[2]->descent;
513 524
514 set_name (strdup ("built-in rendition overflow font")); 525 set_name (strdup ("built-in rendition overflow font"));
515 526
516 return true; 527 return true;
517 } 528 }
… …
539 } 550 }
540}; 551};
541 552
542///////////////////////////////////////////////////////////////////////////// 553/////////////////////////////////////////////////////////////////////////////
543 554
544struct rxvt_font_x11 : rxvt_font { 555struct rxvt_font_x11 : rxvt_font
556{
545 rxvt_font_x11 () { f = 0; } 557 rxvt_font_x11 () { f = 0; }
546 558
547 void clear (); 559 void clear ();
548 560
549 rxvt_fontprop properties (); 561 rxvt_fontprop properties ();
… …
934 // ignore characters we wouldn't use anyways 946 // ignore characters we wouldn't use anyways
935 bool careful; 947 bool careful;
936 if (!has_char (*t, &prop, careful)) 948 if (!has_char (*t, &prop, careful))
937 continue; 949 continue;
938 950
939 XChar2b ch = { *t >> 8, *t }; 951 // the casts are needed in C++11 (see 8.5.1)
952 XChar2b ch = { (unsigned char)(*t >> 8), (unsigned char)*t };
940 953
941 XCharStruct g; 954 XCharStruct g;
942 int dir_ret, asc_ret, des_ret; 955 int dir_ret, asc_ret, des_ret;
943 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); 956 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);
944 957
… …
1044 dTermDisplay; 1057 dTermDisplay;
1045 dTermGC; 1058 dTermGC;
1046 1059
1047 bool slow = this->slow 1060 bool slow = this->slow
1048 || width != term->fwidth 1061 || width != term->fwidth
1049 || height != term->fheight; 1062 || height != term->fheight
1063 || ascent != f->ascent;
1050 1064
1051 int base = ascent; // sorry, incorrect: term->fbase; 1065 int base = ascent; // sorry, incorrect: term->fbase;
1052 1066
1053 XGCValues v; 1067 XGCValues v;
1054 v.foreground = term->pix_colors[fg]; 1068 v.foreground = term->pix_colors[fg];
… …
1122 1136
1123///////////////////////////////////////////////////////////////////////////// 1137/////////////////////////////////////////////////////////////////////////////
1124 1138
1125#if XFT 1139#if XFT
1126 1140
1127struct rxvt_font_xft : rxvt_font { 1141struct rxvt_font_xft : rxvt_font
1142{
1143#if XFT_CHAR_CACHE
1144 // we cache the qascii range xoffsets in the name of speed,
1145 // expecting terminals to deal mostly with these characters
1146 // we also assume the xoff always fits into uint8_t,
1147 // which is questionable, but let's see...
1148 // also, it is uncomfortably big, due to the uints.
1149 enum { char_cache_min = 0x20, char_cache_max = 0x7e };
1150 uint8_t xoff_cache [char_cache_max - char_cache_min + 1];
1151 FT_UInt glyph_cache [char_cache_max - char_cache_min + 1];
1152#endif
1153
1128 rxvt_font_xft () { f = 0; } 1154 rxvt_font_xft ()
1155 {
1156 f = 0;
1157 }
1129 1158
1130 void clear (); 1159 void clear ();
1131 1160
1132 rxvt_fontprop properties (); 1161 rxvt_fontprop properties ();
1133 1162
… …
1235 break; 1264 break;
1236 } 1265 }
1237 1266
1238 FT_Face face = XftLockFace (f); 1267 FT_Face face = XftLockFace (f);
1239 1268
1269 // fuck me plenty: XftLockFace can actually return 0. try not to crash.
1270 // we also assume blindly that if the first lock succeeds, then subsequent
1271 // locks will also succeed.
1272 if (!face)
1273 {
1274 XftFontClose (disp, f);
1275 success = false;
1276 break;
1277 }
1278
1240 ascent = (face->size->metrics.ascender + 63) >> 6; 1279 ascent = (face->size->metrics.ascender + 63) >> 6;
1241 descent = (-face->size->metrics.descender + 63) >> 6; 1280 descent = (-face->size->metrics.descender + 63) >> 6;
1242 height = max (ascent + descent, (face->size->metrics.height + 63) >> 6); 1281 height = max (ascent + descent, (face->size->metrics.height + 63) >> 6);
1243 width = 0; 1282 width = 0;
1244 1283
… …
1275 if (glheight < g.height - g.y) glheight = g.height - g.y; 1314 if (glheight < g.height - g.y) glheight = g.height - g.y;
1276 } 1315 }
1277 1316
1278 if (!width) 1317 if (!width)
1279 { 1318 {
1280 rxvt_warn ("unable to calculate font width for '%s', ignoring.\n", name); 1319 rxvt_warn ("unable to calculate font width for '%s', using max_advance_width.\n", name);
1281 1320 width = f->max_advance_width;
1282 XftFontClose (disp, f);
1283 f = 0;
1284
1285 success = false;
1286 break; 1321 break;
1287 } 1322 }
1288 1323
1289 if (prop.height == rxvt_fontprop::unset 1324 if (prop.height == rxvt_fontprop::unset
1290 || (height <= prop.height && glheight <= prop.height) 1325 || (height <= prop.height && glheight <= prop.height)
… …
1317 clear (); 1352 clear ();
1318 success = false; 1353 success = false;
1319 } 1354 }
1320#endif 1355#endif
1321 1356
1357#if XFT_CHAR_CACHE
1358 // populate char cache
1359 for (FcChar16 ch = char_cache_min; ch <= char_cache_max; ++ch)
1360 {
1361 FT_UInt glyph = XftCharIndex (disp, f, ch);
1362 glyph_cache [ch - char_cache_min] = glyph;
1363
1364 XGlyphInfo g;
1365 XftGlyphExtents (disp, f, &glyph, 1, &g);
1366 xoff_cache [ch - char_cache_min] = g.xOff;
1367 }
1368#endif
1369
1322 return success; 1370 return success;
1323} 1371}
1324 1372
1325bool 1373bool
1326rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const 1374rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
1327{ 1375{
1328 careful = false; 1376 careful = false;
1329 1377
1378 // handle non-bmp chars when text_t is 16 bit
1379#if ENABLE_COMBINING && !UNICODE_3
1380 if (ecb_expect_false (IS_COMPOSE (unicode)))
1381 if (compose_char *cc = rxvt_composite [unicode])
1382 if (cc->c2 == NOCHAR)
1383 unicode = cc->c1;
1384 else
1385 return false;
1386 else
1387 return false;
1388#endif
1389
1390 FcChar32 chr = unicode;
1391
1330 if (!XftCharExists (term->dpy, f, unicode)) 1392 if (!XftCharExists (term->dpy, f, chr))
1331 return false; 1393 return false;
1332 1394
1333 if (!prop || prop->width == rxvt_fontprop::unset) 1395 if (!prop || prop->width == rxvt_fontprop::unset)
1334 return true; 1396 return true;
1335 1397
1336 // check character against base font bounding box 1398 int wcw = max (WCWIDTH (chr), 1);
1337 FcChar32 ch = unicode; 1399
1338 XGlyphInfo g; 1400 XGlyphInfo g;
1339 XftTextExtents32 (term->dpy, f, &ch, 1, &g); 1401 XftTextExtents32 (term->dpy, f, &chr, 1, &g);
1402
1403 int cwidth = prop->width * wcw;
1404
1405 // use same adjustments as in ->draw, see there
1406 g.x += g.xOff ? cwidth - g.xOff >> 1 : 0;
1407 g.x += g.xOff ? 0 : cwidth;
1340 1408
1341 int w = g.width - g.x; 1409 int w = g.width - g.x;
1342 int wcw = max (WCWIDTH (unicode), 1);
1343 1410
1344 careful = g.x > 0 || w > prop->width * wcw; 1411 careful = g.x > 0 || w > cwidth;
1345 1412
1346 if (careful && !OVERLAP_OK (w, wcw, prop)) 1413 if (careful && !OVERLAP_OK (w, wcw, prop))
1347 return false; 1414 return false;
1348 1415
1349 // this weeds out _totally_ broken fonts, or glyphs 1416 // this weeds out _totally_ broken fonts, or glyphs
… …
1356void 1423void
1357rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, 1424rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1358 const text_t *text, int len, 1425 const text_t *text, int len,
1359 int fg, int bg) 1426 int fg, int bg)
1360{ 1427{
1361 XGlyphInfo extents;
1362 XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len); 1428 XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len);
1363 XftGlyphSpec *ep = enc; 1429 XftGlyphSpec *ep = enc;
1364 1430
1365 dTermDisplay; 1431 dTermDisplay;
1366 dTermGC; 1432 dTermGC;
… …
1379 int y_ = buffered ? 0 : y; 1445 int y_ = buffered ? 0 : y;
1380 1446
1381 while (len) 1447 while (len)
1382 { 1448 {
1383 int cwidth = term->fwidth; 1449 int cwidth = term->fwidth;
1384 FcChar32 fc = *text++; len--; 1450 FcChar32 chr = *text++; len--;
1385 1451
1386 while (len && *text == NOCHAR) 1452 while (len && *text == NOCHAR)
1387 text++, len--, cwidth += term->fwidth; 1453 text++, len--, cwidth += term->fwidth;
1388 1454
1389 if (fc != ' ') // skip spaces 1455 if (chr != ' ') // skip spaces
1456 {
1457 // handle non-bmp chars when text_t is 16 bit
1458 #if ENABLE_COMBINING && !UNICODE_3
1459 if (ecb_expect_false (IS_COMPOSE (chr)))
1460 if (compose_char *cc = rxvt_composite [chr])
1461 if (cc->c2 == NOCHAR)
1462 chr = cc->c1;
1463 #endif
1464
1465 #if 0
1466 FT_UInt glyphs [decltype (exp)::max_size];
1467
1468 for (int i = 0; i < nchrs; ++i)
1469 glyphs [i] = XftCharIndex (disp, f, chrs [i]);
1470
1471 for (int i = 0; i < nchrs; ++i)
1390 { 1472 {
1473 XGlyphInfo ep;
1474 XftGlyphExtents (disp, f, glyphs+i, 1, &ep);
1475 printf ("gs %4x g %4x + %3d,%3d o %3d,%3d wh %3d,%3d\n", chrs[i],glyphs[i],ep.x,ep.y,ep.xOff,ep.yOff,ep.width,ep.height);
1476 }
1477 #endif
1478
1479 FT_UInt glyph;
1480 int xOff;
1481
1482 #if XFT_CHAR_CACHE
1483 if (ecb_expect_true (IN_RANGE_INC (chr, char_cache_min, char_cache_max)))
1484 {
1485 glyph = glyph_cache [chr - char_cache_min];
1486 xOff = xoff_cache [chr - char_cache_min];
1487 }
1488 else
1489 #endif
1490 {
1391 FT_UInt glyph = XftCharIndex (disp, f, fc); 1491 glyph = XftCharIndex (disp, f, chr);
1492 XGlyphInfo extents;
1392 XftGlyphExtents (disp, f, &glyph, 1, &extents); 1493 XftGlyphExtents (disp, f, &glyph, 1, &extents);
1494 xOff = extents.xOff;
1495 }
1393 1496
1394 ep->glyph = glyph; 1497 ep->glyph = glyph;
1395 ep->x = x_ + (cwidth - extents.xOff >> 1); 1498 ep->x = x_;
1396 ep->y = y_ + ascent; 1499 ep->y = y_ + ascent;
1397 1500
1398 if (extents.xOff == 0) 1501 // the xft font cell might differ from the terminal font cell,
1502 // in which case we use the average between the two.
1503 ep->x += xOff ? cwidth - xOff >> 1 : 0;
1504
1505 // xft/freetype represent combining characters as characters with zero
1506 // width rendered over the previous character with some fonts, while
1507 // in other fonts, they are considered normal characters, while yet
1508 // in other fonts, they are shifted all over the place.
1509 // we handle the first two cases by keying off on xOff being 0
1510 // for zero-width chars. normally, we would add extents.xOff
1511 // of the base character here, but we don't have that, so we use cwidth.
1399 ep->x = x_ + cwidth; 1512 ep->x += xOff ? 0 : cwidth;
1400 1513
1401 ep++; 1514 ++ep;
1402 } 1515 }
1403 1516
1404 x_ += cwidth; 1517 x_ += cwidth;
1405 } 1518 }
1406 1519
… …
1408 { 1521 {
1409 if (ep != enc) 1522 if (ep != enc)
1410 { 1523 {
1411 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); 1524 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1412 1525
1413#ifdef HAVE_BG_PIXMAP 1526#ifdef HAVE_IMG
1414 Picture dst = 0; // the only assignment is done conditionally in the following if condition 1527 Picture dst = 0; // the only assignment is done conditionally in the following if condition
1415 1528
1416 if (term->bg_pixmap 1529 if (term->bg_img
1417 && (bg == Color_transparent || bg == Color_bg 1530 && (bg == Color_transparent || bg == Color_bg
1418 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2)))))) 1531 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2))))))
1419 { 1532 {
1420 int src_x = x, src_y = y; 1533 int src_x = x, src_y = y;
1421 1534
… …
1423 { 1536 {
1424 src_x += term->window_vt_x; 1537 src_x += term->window_vt_x;
1425 src_y += term->window_vt_y; 1538 src_y += term->window_vt_y;
1426 } 1539 }
1427 1540
1428 if (term->bg_pmap_width >= src_x + w 1541 if (term->bg_img->w >= src_x + w
1429 && term->bg_pmap_height >= src_y + h) 1542 && term->bg_img->h >= src_y + h)
1430 { 1543 {
1431 XCopyArea (disp, term->bg_pixmap, d2, gc, 1544 XCopyArea (disp, term->bg_img->pm, d2, gc,
1432 src_x, src_y, w, h, 0, 0); 1545 src_x, src_y, w, h, 0, 0);
1433 } 1546 }
1434 else 1547 else
1435 { 1548 {
1436 XGCValues gcv; 1549 XGCValues gcv;
1437 1550
1438 gcv.fill_style = FillTiled; 1551 gcv.fill_style = FillTiled;
1439 gcv.tile = term->bg_pixmap; 1552 gcv.tile = term->bg_img->pm;
1440 gcv.ts_x_origin = -src_x; 1553 gcv.ts_x_origin = -src_x;
1441 gcv.ts_y_origin = -src_y; 1554 gcv.ts_y_origin = -src_y;
1442 1555
1443 XChangeGC (disp, gc, 1556 XChangeGC (disp, gc,
1444 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle, 1557 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
… …
1499 1612
1500 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) 1613 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1501 (*i)->unref (); 1614 (*i)->unref ();
1502 1615
1503 for (pagemap **p = fmap.begin (); p != fmap.end (); p++) 1616 for (pagemap **p = fmap.begin (); p != fmap.end (); p++)
1504 delete [] *p; 1617 delete *p;
1505 1618
1506 free (fontdesc); fontdesc = 0; 1619 free (fontdesc); fontdesc = 0;
1507 1620
1508 fonts.clear (); 1621 fonts.clear ();
1509 1622
… …
1604 cs = codeset_from_name (spec + sizeof ("codeset=") - 1); 1717 cs = codeset_from_name (spec + sizeof ("codeset=") - 1);
1605 else 1718 else
1606 rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec); 1719 rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec);
1607 1720
1608 desc++; 1721 desc++;
1609 while (*desc <= ' ') desc++; 1722 while (*desc <= ' ' && *desc) desc++;
1610 } 1723 }
1611 1724
1612 end = strchr (desc, ','); 1725 end = strchr (desc, ',');
1613 if (!end) 1726 if (!end)
1614 end = desc + strlen (desc); 1727 end = desc + strlen (desc);
… …
1675} 1788}
1676 1789
1677int 1790int
1678rxvt_fontset::find_font_idx (unicode_t unicode) 1791rxvt_fontset::find_font_idx (unicode_t unicode)
1679{ 1792{
1680 if (unicode >= 1<<20) 1793 // this limits fmap size. it has to accommodate COMPOSE_HI when UNICODE_3
1794 if (unicode > 0x1fffff)
1681 return 0; 1795 return 0;
1682 1796
1683 unicode_t hi = unicode >> 8; 1797 unicode_t hi = unicode >> 8;
1684 1798
1685 if (hi < fmap.size () 1799 if (hi < fmap.size ())
1686 && fmap[hi] 1800 if (pagemap *pm = fmap[hi])
1687 && (*fmap[hi])[unicode & 0xff] != 0xff) 1801 if ((*pm)[unicode & 0xff] != 0xff)
1688 return (*fmap[hi])[unicode & 0xff]; 1802 return (*pm)[unicode & 0xff];
1689 1803
1690 unsigned int i; 1804 unsigned int i;
1691 1805
1692 for (i = 0; i < fonts.size (); i++) 1806 for (i = 0; i < fonts.size (); i++)
1693 { 1807 {
… …
1717 } 1831 }
1718 1832
1719 next_font: 1833 next_font:
1720 if (i == fonts.size () - 1) 1834 if (i == fonts.size () - 1)
1721 { 1835 {
1836 // compose characters are handled by the default font, unless another font takes over
1837 // we do not go via the fallback list for speed reasons.
1838 if (IS_COMPOSE (unicode))
1839 return 0;
1840
1722 if (fallback->name) 1841 if (fallback->name)
1723 { 1842 {
1724 // search through the fallback list 1843 // search through the fallback list
1725 push_font (new_font (fallback->name, fallback->cs)); 1844 push_font (new_font (fallback->name, fallback->cs));
1726 fallback++; 1845 fallback++;
… …
1732 // way to configure this and xft is easier to hack in, 1851 // way to configure this and xft is easier to hack in,
1733 // while x11 has more framework in place already. 1852 // while x11 has more framework in place already.
1734 // TODO: this is a real resource hog, xft takes ages(?) 1853 // TODO: this is a real resource hog, xft takes ages(?)
1735#if XFT && USE_SLOW_LOOKUP 1854#if XFT && USE_SLOW_LOOKUP
1736 // grab the first xft font that seems suitable 1855 // grab the first xft font that seems suitable
1856 // TOOD: should go first for cellchar (spacing 110) then mono, then else
1737 FcPattern *p = FcPatternCreate (); 1857 FcPattern *p = FcPatternCreate ();
1738 1858
1739 FcCharSet *s = FcCharSetCreate (); 1859 FcCharSet *s = FcCharSetCreate ();
1740 FcCharSetAddChar (s, unicode); 1860 FcCharSetAddChar (s, unicode);
1741 FcPatternAddCharSet (p, FC_CHARSET, s); 1861 FcPatternAddCharSet (p, FC_CHARSET, s);
… …
1785 while (hi >= fmap.size ()) 1905 while (hi >= fmap.size ())
1786 fmap.push_back (0); 1906 fmap.push_back (0);
1787 1907
1788 if (!fmap[hi]) 1908 if (!fmap[hi])
1789 { 1909 {
1790 // we use [1] here because C++ has no separate new and new [] forms,
1791 // and pagemap is char[256], so new incorrectly assumes we want to
1792 // allocate an array of chars instead of a single pagemap.
1793 // we can either cast the resulting pointer to (pagemap *) or
1794 // allocate an array of pagemaps, returning a pointer to the first member
1795 // this is no extra overhead, as new even allocates an array for
1796 // "new pagemap"
1797 fmap[hi] = new pagemap[1]; 1910 fmap[hi] = new pagemap;
1798 memset (fmap[hi], 0xff, sizeof (pagemap)); 1911 memset (fmap[hi], 0xff, sizeof (pagemap));
1799 } 1912 }
1800 1913
1801 (*fmap[hi])[unicode & 0xff] = i; 1914 (*fmap[hi])[unicode & 0xff] = i;
1802 } 1915 }

Diff Legend

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