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.193 by sf-exg, Fri Nov 7 13:45:55 2014 UTC vs.
Revision 1.214 by root, Sat Jun 19 09:47:41 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 ();
… …
1045 dTermDisplay; 1056 dTermDisplay;
1046 dTermGC; 1057 dTermGC;
1047 1058
1048 bool slow = this->slow 1059 bool slow = this->slow
1049 || width != term->fwidth 1060 || width != term->fwidth
1050 || height != term->fheight; 1061 || height != term->fheight
1062 || ascent != f->ascent;
1051 1063
1052 int base = ascent; // sorry, incorrect: term->fbase; 1064 int base = ascent; // sorry, incorrect: term->fbase;
1053 1065
1054 XGCValues v; 1066 XGCValues v;
1055 v.foreground = term->pix_colors[fg]; 1067 v.foreground = term->pix_colors[fg];
… …
1123 1135
1124///////////////////////////////////////////////////////////////////////////// 1136/////////////////////////////////////////////////////////////////////////////
1125 1137
1126#if XFT 1138#if XFT
1127 1139
1128struct rxvt_font_xft : rxvt_font { 1140struct rxvt_font_xft : rxvt_font
1141{
1129 rxvt_font_xft () { f = 0; } 1142 rxvt_font_xft ()
1143 {
1144 f = 0;
1145 }
1130 1146
1131 void clear (); 1147 void clear ();
1132 1148
1133 rxvt_fontprop properties (); 1149 rxvt_fontprop properties ();
1134 1150
… …
1276 if (glheight < g.height - g.y) glheight = g.height - g.y; 1292 if (glheight < g.height - g.y) glheight = g.height - g.y;
1277 } 1293 }
1278 1294
1279 if (!width) 1295 if (!width)
1280 { 1296 {
1281 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);
1282 1298 width = f->max_advance_width;
1283 XftFontClose (disp, f);
1284 f = 0;
1285
1286 success = false;
1287 break; 1299 break;
1288 } 1300 }
1289 1301
1290 if (prop.height == rxvt_fontprop::unset 1302 if (prop.height == rxvt_fontprop::unset
1291 || (height <= prop.height && glheight <= prop.height) 1303 || (height <= prop.height && glheight <= prop.height)
… …
1326bool 1338bool
1327rxvt_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
1328{ 1340{
1329 careful = false; 1341 careful = false;
1330 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
1331 if (!XftCharExists (term->dpy, f, unicode)) 1357 if (!XftCharExists (term->dpy, f, chr))
1332 return false; 1358 return false;
1333 1359
1334 if (!prop || prop->width == rxvt_fontprop::unset) 1360 if (!prop || prop->width == rxvt_fontprop::unset)
1335 return true; 1361 return true;
1336 1362
1337 // check character against base font bounding box 1363 int wcw = max (WCWIDTH (chr), 1);
1338 FcChar32 ch = unicode; 1364
1339 XGlyphInfo g; 1365 XGlyphInfo g;
1340 XftTextExtents32 (term->dpy, f, &ch, 1, &g); 1366 XftTextExtents32 (term->dpy, f, &chr, 1, &g);
1341 1367
1342 int w = g.width - g.x; 1368 int w = g.width - g.x;
1343 int wcw = max (WCWIDTH (unicode), 1);
1344 1369
1345 careful = g.x > 0 || w > prop->width * wcw; 1370 careful = g.x > 0 || w > prop->width * wcw;
1346 1371
1347 if (careful && !OVERLAP_OK (w, wcw, prop)) 1372 if (careful && !OVERLAP_OK (w, wcw, prop))
1348 return false; 1373 return false;
… …
1357void 1382void
1358rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, 1383rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1359 const text_t *text, int len, 1384 const text_t *text, int len,
1360 int fg, int bg) 1385 int fg, int bg)
1361{ 1386{
1362 XGlyphInfo extents;
1363 XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len); 1387 XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len);
1364 XftGlyphSpec *ep = enc; 1388 XftGlyphSpec *ep = enc;
1365 1389
1366 dTermDisplay; 1390 dTermDisplay;
1367 dTermGC; 1391 dTermGC;
… …
1380 int y_ = buffered ? 0 : y; 1404 int y_ = buffered ? 0 : y;
1381 1405
1382 while (len) 1406 while (len)
1383 { 1407 {
1384 int cwidth = term->fwidth; 1408 int cwidth = term->fwidth;
1385 FcChar32 fc = *text++; len--; 1409 FcChar32 chr = *text++; len--;
1386 1410
1387 while (len && *text == NOCHAR) 1411 while (len && *text == NOCHAR)
1388 text++, len--, cwidth += term->fwidth; 1412 text++, len--, cwidth += term->fwidth;
1389 1413
1390 if (fc != ' ') // skip spaces 1414 if (chr != ' ') // skip spaces
1415 {
1416 // handle non-bmp chars when text_t is 16 bit
1417 #if ENABLE_COMBINING && !UNICODE_3
1418 if (ecb_expect_false (IS_COMPOSE (chr)))
1419 if (compose_char *cc = rxvt_composite [chr])
1420 if (cc->c2 == NOCHAR)
1421 chr = cc->c1;
1422 #endif
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)
1391 { 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
1392 FT_UInt glyph = XftCharIndex (disp, f, fc); 1438 FT_UInt glyph = XftCharIndex (disp, f, chr);
1439 XGlyphInfo extents;
1393 XftGlyphExtents (disp, f, &glyph, 1, &extents); 1440 XftGlyphExtents (disp, f, &glyph, 1, &extents);
1394 1441
1442 int xOff = extents.xOff ? extents.xOff : cwidth;
1443
1395 ep->glyph = glyph; 1444 ep->glyph = glyph;
1396 ep->x = x_ + (cwidth - extents.xOff >> 1); 1445 ep->x = x_;
1397 ep->y = y_ + ascent; 1446 ep->y = y_ + ascent;
1398 1447
1448 // the xft font cell might differ from the terminal font cell,
1449 // in which case we use the average between the two.
1399 if (extents.xOff == 0) 1450 if (extents.xOff)
1400 ep->x = x_ + cwidth; 1451 ep->x += extents.xOff ? cwidth - extents.xOff >> 1 : 0;
1401 1452
1453 // xft/freetype represent combining characters as characters with zero
1454 // width rendered over the previous character with some fonts, while
1455 // in other fonts, they are considered normal characters, while yet
1456 // in other fonts, they are shifted all over the place.
1457 // we handle the first two cases by keying off on xOff being 0
1458 // for zero-width chars. normally, we would add extents.xOff
1459 // of the base character here, but we don't have that, so we use cwidth.
1460 ep->x += extents.xOff ? 0 : cwidth;
1461
1402 ep++; 1462 ++ep;
1403 } 1463 }
1404 1464
1405 x_ += cwidth; 1465 x_ += cwidth;
1406 } 1466 }
1407 1467
… …
1409 { 1469 {
1410 if (ep != enc) 1470 if (ep != enc)
1411 { 1471 {
1412 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); 1472 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1413 1473
1414#ifdef HAVE_BG_PIXMAP 1474#ifdef HAVE_IMG
1415 Picture dst = 0; // the only assignment is done conditionally in the following if condition 1475 Picture dst = 0; // the only assignment is done conditionally in the following if condition
1416 1476
1417 if (term->bg_img 1477 if (term->bg_img
1418 && (bg == Color_transparent || bg == Color_bg 1478 && (bg == Color_transparent || bg == Color_bg
1419 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2)))))) 1479 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2))))))
… …
1605 cs = codeset_from_name (spec + sizeof ("codeset=") - 1); 1665 cs = codeset_from_name (spec + sizeof ("codeset=") - 1);
1606 else 1666 else
1607 rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec); 1667 rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec);
1608 1668
1609 desc++; 1669 desc++;
1610 while (*desc <= ' ') desc++; 1670 while (*desc <= ' ' && *desc) desc++;
1611 } 1671 }
1612 1672
1613 end = strchr (desc, ','); 1673 end = strchr (desc, ',');
1614 if (!end) 1674 if (!end)
1615 end = desc + strlen (desc); 1675 end = desc + strlen (desc);
… …
1676} 1736}
1677 1737
1678int 1738int
1679rxvt_fontset::find_font_idx (unicode_t unicode) 1739rxvt_fontset::find_font_idx (unicode_t unicode)
1680{ 1740{
1681 if (unicode >= 1<<20) 1741 // this limits fmap size. it has to accommodate COMPOSE_HI when UNICODE_3
1742 if (unicode > 0x1fffff)
1682 return 0; 1743 return 0;
1683 1744
1684 unicode_t hi = unicode >> 8; 1745 unicode_t hi = unicode >> 8;
1685 1746
1686 if (hi < fmap.size () 1747 if (hi < fmap.size ())
1687 && fmap[hi] 1748 if (pagemap *pm = fmap[hi])
1688 && (*fmap[hi])[unicode & 0xff] != 0xff) 1749 if ((*pm)[unicode & 0xff] != 0xff)
1689 return (*fmap[hi])[unicode & 0xff]; 1750 return (*pm)[unicode & 0xff];
1690 1751
1691 unsigned int i; 1752 unsigned int i;
1692 1753
1693 for (i = 0; i < fonts.size (); i++) 1754 for (i = 0; i < fonts.size (); i++)
1694 { 1755 {
… …
1718 } 1779 }
1719 1780
1720 next_font: 1781 next_font:
1721 if (i == fonts.size () - 1) 1782 if (i == fonts.size () - 1)
1722 { 1783 {
1784 // compose characters are handled by the default font, unless another font takes over
1785 // we do not go via the fallback list for speed reasons.
1786 if (IS_COMPOSE (unicode))
1787 return 0;
1788
1723 if (fallback->name) 1789 if (fallback->name)
1724 { 1790 {
1725 // search through the fallback list 1791 // search through the fallback list
1726 push_font (new_font (fallback->name, fallback->cs)); 1792 push_font (new_font (fallback->name, fallback->cs));
1727 fallback++; 1793 fallback++;
… …
1733 // way to configure this and xft is easier to hack in, 1799 // way to configure this and xft is easier to hack in,
1734 // while x11 has more framework in place already. 1800 // while x11 has more framework in place already.
1735 // TODO: this is a real resource hog, xft takes ages(?) 1801 // TODO: this is a real resource hog, xft takes ages(?)
1736#if XFT && USE_SLOW_LOOKUP 1802#if XFT && USE_SLOW_LOOKUP
1737 // grab the first xft font that seems suitable 1803 // grab the first xft font that seems suitable
1804 // TOOD: should go first for cellchar (spacing 110) then mono, then else
1738 FcPattern *p = FcPatternCreate (); 1805 FcPattern *p = FcPatternCreate ();
1739 1806
1740 FcCharSet *s = FcCharSetCreate (); 1807 FcCharSet *s = FcCharSetCreate ();
1741 FcCharSetAddChar (s, unicode); 1808 FcCharSetAddChar (s, unicode);
1742 FcPatternAddCharSet (p, FC_CHARSET, s); 1809 FcPatternAddCharSet (p, FC_CHARSET, s);

Diff Legend

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