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.213 by sf-exg, Sat Jun 19 09:13:51 2021 UTC

… …
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{
1130 rxvt_font_xft () { f = 0; } 1142 rxvt_font_xft ()
1143 {
1144 f = 0;
1145 }
1131 1146
1132 void clear (); 1147 void clear ();
1133 1148
1134 rxvt_fontprop properties (); 1149 rxvt_fontprop properties ();
1135 1150
… …
1277 if (glheight < g.height - g.y) glheight = g.height - g.y; 1292 if (glheight < g.height - g.y) glheight = g.height - g.y;
1278 } 1293 }
1279 1294
1280 if (!width) 1295 if (!width)
1281 { 1296 {
1282 rxvt_warn ("unable to calculate font width for '%s', ignoring.\n", name); 1297 rxvt_warn ("unable to calculate font width for '%s', using max_advance_width.\n", name);
1283 1298 width = f->max_advance_width;
1284 XftFontClose (disp, f);
1285 f = 0;
1286
1287 success = false;
1288 break; 1299 break;
1289 } 1300 }
1290 1301
1291 if (prop.height == rxvt_fontprop::unset 1302 if (prop.height == rxvt_fontprop::unset
1292 || (height <= prop.height && glheight <= prop.height) 1303 || (height <= prop.height && glheight <= prop.height)
… …
1327bool 1338bool
1328rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const 1339rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
1329{ 1340{
1330 careful = false; 1341 careful = false;
1331 1342
1343 // handle non-bmp chars when text_t is 16 bit
1344#if ENABLE_COMBINING && !UNICODE_3
1345 if (ecb_expect_false (IS_COMPOSE (unicode)))
1346 if (compose_char *cc = rxvt_composite [unicode])
1347 if (cc->c2 == NOCHAR)
1348 unicode = cc->c1;
1349 else
1350 return false;
1351 else
1352 return false;
1353#endif
1354
1355 FcChar32 chr = unicode;
1356
1332 if (!XftCharExists (term->dpy, f, unicode)) 1357 if (!XftCharExists (term->dpy, f, chr))
1333 return false; 1358 return false;
1334 1359
1335 if (!prop || prop->width == rxvt_fontprop::unset) 1360 if (!prop || prop->width == rxvt_fontprop::unset)
1336 return true; 1361 return true;
1337 1362
1338 // check character against base font bounding box 1363 int wcw = max (WCWIDTH (chr), 1);
1339 FcChar32 ch = unicode; 1364
1340 XGlyphInfo g; 1365 XGlyphInfo g;
1341 XftTextExtents32 (term->dpy, f, &ch, 1, &g); 1366 XftTextExtents32 (term->dpy, f, &chr, 1, &g);
1342 1367
1343 int w = g.width - g.x; 1368 int w = g.width - g.x;
1344 int wcw = max (WCWIDTH (unicode), 1);
1345 1369
1346 careful = g.x > 0 || w > prop->width * wcw; 1370 careful = g.x > 0 || w > prop->width * wcw;
1347 1371
1348 if (careful && !OVERLAP_OK (w, wcw, prop)) 1372 if (careful && !OVERLAP_OK (w, wcw, prop))
1349 return false; 1373 return false;
… …
1358void 1382void
1359rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, 1383rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1360 const text_t *text, int len, 1384 const text_t *text, int len,
1361 int fg, int bg) 1385 int fg, int bg)
1362{ 1386{
1363 XGlyphInfo extents;
1364 XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len); 1387 XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len);
1365 XftGlyphSpec *ep = enc; 1388 XftGlyphSpec *ep = enc;
1366 1389
1367 dTermDisplay; 1390 dTermDisplay;
1368 dTermGC; 1391 dTermGC;
… …
1381 int y_ = buffered ? 0 : y; 1404 int y_ = buffered ? 0 : y;
1382 1405
1383 while (len) 1406 while (len)
1384 { 1407 {
1385 int cwidth = term->fwidth; 1408 int cwidth = term->fwidth;
1386 FcChar32 fc = *text++; len--; 1409 FcChar32 chr = *text++; len--;
1410
1411 // handle non-bmp chars when text_t is 16 bit
1412 #if ENABLE_COMBINING && !UNICODE_3
1413 if (ecb_expect_false (IS_COMPOSE (chr)))
1414 if (compose_char *cc = rxvt_composite [chr])
1415 if (cc->c2 == NOCHAR)
1416 chr = cc->c1;
1417 #endif
1387 1418
1388 while (len && *text == NOCHAR) 1419 while (len && *text == NOCHAR)
1389 text++, len--, cwidth += term->fwidth; 1420 text++, len--, cwidth += term->fwidth;
1390 1421
1391 if (fc != ' ') // skip spaces 1422 if (chr != ' ') // skip spaces
1423 {
1424 #if 0
1425 FT_UInt glyphs [decltype (exp)::max_size];
1426
1427 for (int i = 0; i < nchrs; ++i)
1428 glyphs [i] = XftCharIndex (disp, f, chrs [i]);
1429
1430 for (int i = 0; i < nchrs; ++i)
1392 { 1431 {
1432 XGlyphInfo ep;
1433 XftGlyphExtents (disp, f, glyphs+i, 1, &ep);
1434 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);
1435 }
1436 #endif
1437
1393 FT_UInt glyph = XftCharIndex (disp, f, fc); 1438 FT_UInt glyph = XftCharIndex (disp, f, chr);
1439 XGlyphInfo extents;
1394 XftGlyphExtents (disp, f, &glyph, 1, &extents); 1440 XftGlyphExtents (disp, f, &glyph, 1, &extents);
1395 1441
1396 ep->glyph = glyph; 1442 ep->glyph = glyph;
1397 ep->x = x_ + (cwidth - extents.xOff >> 1); 1443 ep->x = x_;
1398 ep->y = y_ + ascent; 1444 ep->y = y_ + ascent;
1399 1445
1400 if (extents.xOff == 0) 1446 // the xft font cell might differ from the terminal font cell,
1401 ep->x = x_ + cwidth; 1447 // in which case we use the average between the two.
1448 ep->x += cwidth - extents.xOff >> 1;
1402 1449
1450 // xft/freetype represent combining characters as characters with zero
1451 // width rendered over the previous character with some fonts, while
1452 // in other fonts, they are considered normal characters, while yet
1453 // in other fonts, they are shifted all over the place.
1454 // we handle the first two cases by keying off on xOff being 0
1455 // for zero-width chars. normally, we would add extents.xOff
1456 // of the base character here, but we don't have that, so we use cwidth.
1457 ep->x += extents.xOff ? 0 : cwidth;
1458
1403 ep++; 1459 ++ep;
1404 } 1460 }
1405 1461
1406 x_ += cwidth; 1462 x_ += cwidth;
1407 } 1463 }
1408 1464
… …
1410 { 1466 {
1411 if (ep != enc) 1467 if (ep != enc)
1412 { 1468 {
1413 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); 1469 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1414 1470
1415#ifdef HAVE_BG_PIXMAP 1471#ifdef HAVE_IMG
1416 Picture dst = 0; // the only assignment is done conditionally in the following if condition 1472 Picture dst = 0; // the only assignment is done conditionally in the following if condition
1417 1473
1418 if (term->bg_img 1474 if (term->bg_img
1419 && (bg == Color_transparent || bg == Color_bg 1475 && (bg == Color_transparent || bg == Color_bg
1420 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2)))))) 1476 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2))))))
… …
1606 cs = codeset_from_name (spec + sizeof ("codeset=") - 1); 1662 cs = codeset_from_name (spec + sizeof ("codeset=") - 1);
1607 else 1663 else
1608 rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec); 1664 rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec);
1609 1665
1610 desc++; 1666 desc++;
1611 while (*desc <= ' ') desc++; 1667 while (*desc <= ' ' && *desc) desc++;
1612 } 1668 }
1613 1669
1614 end = strchr (desc, ','); 1670 end = strchr (desc, ',');
1615 if (!end) 1671 if (!end)
1616 end = desc + strlen (desc); 1672 end = desc + strlen (desc);
… …
1677} 1733}
1678 1734
1679int 1735int
1680rxvt_fontset::find_font_idx (unicode_t unicode) 1736rxvt_fontset::find_font_idx (unicode_t unicode)
1681{ 1737{
1682 if (unicode >= 1<<20) 1738 // this limits fmap size. it has to accommodate COMPOSE_HI when UNICODE_3
1739 if (unicode > 0x1fffff)
1683 return 0; 1740 return 0;
1684 1741
1685 unicode_t hi = unicode >> 8; 1742 unicode_t hi = unicode >> 8;
1686 1743
1687 if (hi < fmap.size () 1744 if (hi < fmap.size ())
1688 && fmap[hi] 1745 if (pagemap *pm = fmap[hi])
1689 && (*fmap[hi])[unicode & 0xff] != 0xff) 1746 if ((*pm)[unicode & 0xff] != 0xff)
1690 return (*fmap[hi])[unicode & 0xff]; 1747 return (*pm)[unicode & 0xff];
1691 1748
1692 unsigned int i; 1749 unsigned int i;
1693 1750
1694 for (i = 0; i < fonts.size (); i++) 1751 for (i = 0; i < fonts.size (); i++)
1695 { 1752 {
… …
1719 } 1776 }
1720 1777
1721 next_font: 1778 next_font:
1722 if (i == fonts.size () - 1) 1779 if (i == fonts.size () - 1)
1723 { 1780 {
1781 // compose characters are handled by the default font, unless another font takes over
1782 // we do not go via the fallback list for speed reasons.
1783 if (IS_COMPOSE (unicode))
1784 return 0;
1785
1724 if (fallback->name) 1786 if (fallback->name)
1725 { 1787 {
1726 // search through the fallback list 1788 // search through the fallback list
1727 push_font (new_font (fallback->name, fallback->cs)); 1789 push_font (new_font (fallback->name, fallback->cs));
1728 fallback++; 1790 fallback++;
… …
1734 // way to configure this and xft is easier to hack in, 1796 // way to configure this and xft is easier to hack in,
1735 // while x11 has more framework in place already. 1797 // while x11 has more framework in place already.
1736 // TODO: this is a real resource hog, xft takes ages(?) 1798 // TODO: this is a real resource hog, xft takes ages(?)
1737#if XFT && USE_SLOW_LOOKUP 1799#if XFT && USE_SLOW_LOOKUP
1738 // grab the first xft font that seems suitable 1800 // grab the first xft font that seems suitable
1801 // TOOD: should go first for cellchar (spacing 110) then mono, then else
1739 FcPattern *p = FcPatternCreate (); 1802 FcPattern *p = FcPatternCreate ();
1740 1803
1741 FcCharSet *s = FcCharSetCreate (); 1804 FcCharSet *s = FcCharSetCreate ();
1742 FcCharSetAddChar (s, unicode); 1805 FcCharSetAddChar (s, unicode);
1743 FcPatternAddCharSet (p, FC_CHARSET, s); 1806 FcPatternAddCharSet (p, FC_CHARSET, s);

Diff Legend

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