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.194 by root, Fri Nov 14 11:06:49 2014 UTC vs.
Revision 1.219 by root, Sat Jul 3 04:35:07 2021 UTC

… …
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_img 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);
… …
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 {
… …
539 } 549 }
540}; 550};
541 551
542///////////////////////////////////////////////////////////////////////////// 552/////////////////////////////////////////////////////////////////////////////
543 553
544struct rxvt_font_x11 : rxvt_font { 554struct rxvt_font_x11 : rxvt_font
555{
545 rxvt_font_x11 () { f = 0; } 556 rxvt_font_x11 () { f = 0; }
546 557
547 void clear (); 558 void clear ();
548 559
549 rxvt_fontprop properties (); 560 rxvt_fontprop properties ();
… …
1124 1135
1125///////////////////////////////////////////////////////////////////////////// 1136/////////////////////////////////////////////////////////////////////////////
1126 1137
1127#if XFT 1138#if XFT
1128 1139
1129struct rxvt_font_xft : rxvt_font { 1140struct rxvt_font_xft : rxvt_font
1141{
1142#if XFT_CHAR_CACHE
1143 // we cache the qascii range xoffsets in the name of speed,
1144 // expecting terminals to deal mostly with these characters
1145 // we also assume the xoff always fits into uint8_t,
1146 // which is questionable, but let's see...
1147 // also, it is uncomfortably big, due to the uints.
1148 enum { char_cache_min = 0x20, char_cache_max = 0x7e };
1149 uint8_t xoff_cache [char_cache_max - char_cache_min + 1];
1150 FT_UInt glyph_cache [char_cache_max - char_cache_min + 1];
1151#endif
1152
1130 rxvt_font_xft () { f = 0; } 1153 rxvt_font_xft ()
1154 {
1155 f = 0;
1156 }
1131 1157
1132 void clear (); 1158 void clear ();
1133 1159
1134 rxvt_fontprop properties (); 1160 rxvt_fontprop properties ();
1135 1161
… …
1277 if (glheight < g.height - g.y) glheight = g.height - g.y; 1303 if (glheight < g.height - g.y) glheight = g.height - g.y;
1278 } 1304 }
1279 1305
1280 if (!width) 1306 if (!width)
1281 { 1307 {
1282 rxvt_warn ("unable to calculate font width for '%s', ignoring.\n", name); 1308 rxvt_warn ("unable to calculate font width for '%s', using max_advance_width.\n", name);
1283 1309 width = f->max_advance_width;
1284 XftFontClose (disp, f);
1285 f = 0;
1286
1287 success = false;
1288 break; 1310 break;
1289 } 1311 }
1290 1312
1291 if (prop.height == rxvt_fontprop::unset 1313 if (prop.height == rxvt_fontprop::unset
1292 || (height <= prop.height && glheight <= prop.height) 1314 || (height <= prop.height && glheight <= prop.height)
… …
1319 clear (); 1341 clear ();
1320 success = false; 1342 success = false;
1321 } 1343 }
1322#endif 1344#endif
1323 1345
1346#if XFT_CHAR_CACHE
1347 // populate char cache
1348 for (FcChar16 ch = char_cache_min; ch <= char_cache_max; ++ch)
1349 {
1350 FT_UInt glyph = XftCharIndex (disp, f, ch);
1351 glyph_cache [ch - char_cache_min] = glyph;
1352
1353 XGlyphInfo g;
1354 XftGlyphExtents (disp, f, &glyph, 1, &g);
1355 xoff_cache [ch - char_cache_min] = g.xOff;
1356 }
1357#endif
1358
1324 return success; 1359 return success;
1325} 1360}
1326 1361
1327bool 1362bool
1328rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const 1363rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
1329{ 1364{
1330 careful = false; 1365 careful = false;
1331 1366
1367 // handle non-bmp chars when text_t is 16 bit
1368#if ENABLE_COMBINING && !UNICODE_3
1369 if (ecb_expect_false (IS_COMPOSE (unicode)))
1370 if (compose_char *cc = rxvt_composite [unicode])
1371 if (cc->c2 == NOCHAR)
1372 unicode = cc->c1;
1373 else
1374 return false;
1375 else
1376 return false;
1377#endif
1378
1379 FcChar32 chr = unicode;
1380
1332 if (!XftCharExists (term->dpy, f, unicode)) 1381 if (!XftCharExists (term->dpy, f, chr))
1333 return false; 1382 return false;
1334 1383
1335 if (!prop || prop->width == rxvt_fontprop::unset) 1384 if (!prop || prop->width == rxvt_fontprop::unset)
1336 return true; 1385 return true;
1337 1386
1338 // check character against base font bounding box 1387 int wcw = max (WCWIDTH (chr), 1);
1339 FcChar32 ch = unicode; 1388
1340 XGlyphInfo g; 1389 XGlyphInfo g;
1341 XftTextExtents32 (term->dpy, f, &ch, 1, &g); 1390 XftTextExtents32 (term->dpy, f, &chr, 1, &g);
1342 1391
1343 int w = g.width - g.x; 1392 int w = g.width - g.x;
1344 int wcw = max (WCWIDTH (unicode), 1);
1345 1393
1346 careful = g.x > 0 || w > prop->width * wcw; 1394 careful = g.x > 0 || w > prop->width * wcw;
1347 1395
1348 if (careful && !OVERLAP_OK (w, wcw, prop)) 1396 if (careful && !OVERLAP_OK (w, wcw, prop))
1349 return false; 1397 return false;
… …
1358void 1406void
1359rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, 1407rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1360 const text_t *text, int len, 1408 const text_t *text, int len,
1361 int fg, int bg) 1409 int fg, int bg)
1362{ 1410{
1363 XGlyphInfo extents;
1364 XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len); 1411 XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len);
1365 XftGlyphSpec *ep = enc; 1412 XftGlyphSpec *ep = enc;
1366 1413
1367 dTermDisplay; 1414 dTermDisplay;
1368 dTermGC; 1415 dTermGC;
… …
1381 int y_ = buffered ? 0 : y; 1428 int y_ = buffered ? 0 : y;
1382 1429
1383 while (len) 1430 while (len)
1384 { 1431 {
1385 int cwidth = term->fwidth; 1432 int cwidth = term->fwidth;
1386 FcChar32 fc = *text++; len--; 1433 FcChar32 chr = *text++; len--;
1387 1434
1388 while (len && *text == NOCHAR) 1435 while (len && *text == NOCHAR)
1389 text++, len--, cwidth += term->fwidth; 1436 text++, len--, cwidth += term->fwidth;
1390 1437
1391 if (fc != ' ') // skip spaces 1438 if (chr != ' ') // skip spaces
1439 {
1440 // handle non-bmp chars when text_t is 16 bit
1441 #if ENABLE_COMBINING && !UNICODE_3
1442 if (ecb_expect_false (IS_COMPOSE (chr)))
1443 if (compose_char *cc = rxvt_composite [chr])
1444 if (cc->c2 == NOCHAR)
1445 chr = cc->c1;
1446 #endif
1447
1448 #if 0
1449 FT_UInt glyphs [decltype (exp)::max_size];
1450
1451 for (int i = 0; i < nchrs; ++i)
1452 glyphs [i] = XftCharIndex (disp, f, chrs [i]);
1453
1454 for (int i = 0; i < nchrs; ++i)
1392 { 1455 {
1456 XGlyphInfo ep;
1457 XftGlyphExtents (disp, f, glyphs+i, 1, &ep);
1458 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);
1459 }
1460 #endif
1461
1462 FT_UInt glyph;
1463 int xOff;
1464
1465 #if XFT_CHAR_CACHE
1466 if (ecb_expect_true (IN_RANGE_INC (chr, char_cache_min, char_cache_max)))
1467 {
1468 glyph = glyph_cache [chr - char_cache_min];
1469 xOff = xoff_cache [chr - char_cache_min];
1470 }
1471 else
1472 #endif
1473 {
1393 FT_UInt glyph = XftCharIndex (disp, f, fc); 1474 glyph = XftCharIndex (disp, f, chr);
1475 XGlyphInfo extents;
1394 XftGlyphExtents (disp, f, &glyph, 1, &extents); 1476 XftGlyphExtents (disp, f, &glyph, 1, &extents);
1477 xOff = extents.xOff;
1478 }
1395 1479
1396 ep->glyph = glyph; 1480 ep->glyph = glyph;
1397 ep->x = x_ + (cwidth - extents.xOff >> 1); 1481 ep->x = x_;
1398 ep->y = y_ + ascent; 1482 ep->y = y_ + ascent;
1399 1483
1400 if (extents.xOff == 0) 1484 // the xft font cell might differ from the terminal font cell,
1485 // in which case we use the average between the two.
1486 ep->x += xOff ? cwidth - xOff >> 1 : 0;
1487
1488 // xft/freetype represent combining characters as characters with zero
1489 // width rendered over the previous character with some fonts, while
1490 // in other fonts, they are considered normal characters, while yet
1491 // in other fonts, they are shifted all over the place.
1492 // we handle the first two cases by keying off on xOff being 0
1493 // for zero-width chars. normally, we would add extents.xOff
1494 // of the base character here, but we don't have that, so we use cwidth.
1401 ep->x = x_ + cwidth; 1495 ep->x += xOff ? 0 : cwidth;
1402 1496
1403 ep++; 1497 ++ep;
1404 } 1498 }
1405 1499
1406 x_ += cwidth; 1500 x_ += cwidth;
1407 } 1501 }
1408 1502
… …
1410 { 1504 {
1411 if (ep != enc) 1505 if (ep != enc)
1412 { 1506 {
1413 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); 1507 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1414 1508
1415#ifdef HAVE_BG_PIXMAP 1509#ifdef HAVE_IMG
1416 Picture dst = 0; // the only assignment is done conditionally in the following if condition 1510 Picture dst = 0; // the only assignment is done conditionally in the following if condition
1417 1511
1418 if (term->bg_img 1512 if (term->bg_img
1419 && (bg == Color_transparent || bg == Color_bg 1513 && (bg == Color_transparent || bg == Color_bg
1420 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2)))))) 1514 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2))))))
… …
1606 cs = codeset_from_name (spec + sizeof ("codeset=") - 1); 1700 cs = codeset_from_name (spec + sizeof ("codeset=") - 1);
1607 else 1701 else
1608 rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec); 1702 rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec);
1609 1703
1610 desc++; 1704 desc++;
1611 while (*desc <= ' ') desc++; 1705 while (*desc <= ' ' && *desc) desc++;
1612 } 1706 }
1613 1707
1614 end = strchr (desc, ','); 1708 end = strchr (desc, ',');
1615 if (!end) 1709 if (!end)
1616 end = desc + strlen (desc); 1710 end = desc + strlen (desc);
… …
1677} 1771}
1678 1772
1679int 1773int
1680rxvt_fontset::find_font_idx (unicode_t unicode) 1774rxvt_fontset::find_font_idx (unicode_t unicode)
1681{ 1775{
1682 if (unicode >= 1<<20) 1776 // this limits fmap size. it has to accommodate COMPOSE_HI when UNICODE_3
1777 if (unicode > 0x1fffff)
1683 return 0; 1778 return 0;
1684 1779
1685 unicode_t hi = unicode >> 8; 1780 unicode_t hi = unicode >> 8;
1686 1781
1687 if (hi < fmap.size () 1782 if (hi < fmap.size ())
1688 && fmap[hi] 1783 if (pagemap *pm = fmap[hi])
1689 && (*fmap[hi])[unicode & 0xff] != 0xff) 1784 if ((*pm)[unicode & 0xff] != 0xff)
1690 return (*fmap[hi])[unicode & 0xff]; 1785 return (*pm)[unicode & 0xff];
1691 1786
1692 unsigned int i; 1787 unsigned int i;
1693 1788
1694 for (i = 0; i < fonts.size (); i++) 1789 for (i = 0; i < fonts.size (); i++)
1695 { 1790 {
… …
1719 } 1814 }
1720 1815
1721 next_font: 1816 next_font:
1722 if (i == fonts.size () - 1) 1817 if (i == fonts.size () - 1)
1723 { 1818 {
1819 // compose characters are handled by the default font, unless another font takes over
1820 // we do not go via the fallback list for speed reasons.
1821 if (IS_COMPOSE (unicode))
1822 return 0;
1823
1724 if (fallback->name) 1824 if (fallback->name)
1725 { 1825 {
1726 // search through the fallback list 1826 // search through the fallback list
1727 push_font (new_font (fallback->name, fallback->cs)); 1827 push_font (new_font (fallback->name, fallback->cs));
1728 fallback++; 1828 fallback++;
… …
1734 // way to configure this and xft is easier to hack in, 1834 // way to configure this and xft is easier to hack in,
1735 // while x11 has more framework in place already. 1835 // while x11 has more framework in place already.
1736 // TODO: this is a real resource hog, xft takes ages(?) 1836 // TODO: this is a real resource hog, xft takes ages(?)
1737#if XFT && USE_SLOW_LOOKUP 1837#if XFT && USE_SLOW_LOOKUP
1738 // grab the first xft font that seems suitable 1838 // grab the first xft font that seems suitable
1839 // TOOD: should go first for cellchar (spacing 110) then mono, then else
1739 FcPattern *p = FcPatternCreate (); 1840 FcPattern *p = FcPatternCreate ();
1740 1841
1741 FcCharSet *s = FcCharSetCreate (); 1842 FcCharSet *s = FcCharSetCreate ();
1742 FcCharSetAddChar (s, unicode); 1843 FcCharSetAddChar (s, unicode);
1743 FcPatternAddCharSet (p, FC_CHARSET, s); 1844 FcPatternAddCharSet (p, FC_CHARSET, s);

Diff Legend

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