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.198 by root, Wed Jun 16 22:51:55 2021 UTC vs.
Revision 1.205 by root, Thu Jun 17 14:55:05 2021 UTC

… …
212} 212}
213 213
214///////////////////////////////////////////////////////////////////////////// 214/////////////////////////////////////////////////////////////////////////////
215 215
216rxvt_font::rxvt_font () 216rxvt_font::rxvt_font ()
217: name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset) 217: name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset), can_compose(false)
218{ 218{
219} 219}
220 220
221void 221void
222rxvt_font::set_name (char *name_) 222rxvt_font::set_name (char *name_)
… …
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)
… …
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
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
450 text_t chrs[2]; 473 text_t chrs[2];
451 chrs [1] = NOCHAR; 474 chrs [1] = NOCHAR;
452 475
453 *chrs = cc->c1; 476 *chrs = cc->c1;
454 rxvt_font *f1 = (*fs)[fs->find_font_idx (cc->c1)]; 477 rxvt_font *f1 = (*fs)[fs->find_font_idx (cc->c1)];
… …
464 ? f1 487 ? f1
465 : (*fs)[fs->find_font_idx (cc->c2)]; 488 : (*fs)[fs->find_font_idx (cc->c2)];
466 489
467 f2->draw (d, x, y, chrs, width, fg, Color_none); 490 f2->draw (d, x, y, chrs, width, fg, Color_none);
468 } 491 }
492 #endif
469 } 493 }
470#endif 494#endif
471 else 495 else
472 switch (t) 496 switch (t)
473 { 497 {
… …
492 516
493 x += fwidth; 517 x += fwidth;
494 } 518 }
495} 519}
496 520
497struct rxvt_font_overflow : rxvt_font { 521struct rxvt_font_overflow : rxvt_font
522{
498 struct rxvt_fontset *fs; 523 struct rxvt_fontset *fs;
499 524
500 rxvt_font_overflow (rxvt_fontset *fs) 525 rxvt_font_overflow (rxvt_fontset *fs)
501 : rxvt_font () 526 : rxvt_font ()
502 { 527 {
… …
548 } 573 }
549}; 574};
550 575
551///////////////////////////////////////////////////////////////////////////// 576/////////////////////////////////////////////////////////////////////////////
552 577
553struct rxvt_font_x11 : rxvt_font { 578struct rxvt_font_x11 : rxvt_font
579{
554 rxvt_font_x11 () { f = 0; } 580 rxvt_font_x11 () { f = 0; }
555 581
556 void clear (); 582 void clear ();
557 583
558 rxvt_fontprop properties (); 584 rxvt_fontprop properties ();
… …
1133 1159
1134///////////////////////////////////////////////////////////////////////////// 1160/////////////////////////////////////////////////////////////////////////////
1135 1161
1136#if XFT 1162#if XFT
1137 1163
1138struct rxvt_font_xft : rxvt_font { 1164struct rxvt_font_xft : rxvt_font
1165{
1139 rxvt_font_xft () { f = 0; } 1166 rxvt_font_xft ()
1167 {
1168 can_compose = true;
1169 f = 0;
1170 }
1140 1171
1141 void clear (); 1172 void clear ();
1142 1173
1143 rxvt_fontprop properties (); 1174 rxvt_fontprop properties ();
1144 1175
… …
1286 if (glheight < g.height - g.y) glheight = g.height - g.y; 1317 if (glheight < g.height - g.y) glheight = g.height - g.y;
1287 } 1318 }
1288 1319
1289 if (!width) 1320 if (!width)
1290 { 1321 {
1291 rxvt_warn ("unable to calculate font width for '%s', ignoring.\n", name); 1322 rxvt_warn ("unable to calculate font width for '%s', using max_advance_width.\n", name);
1292 1323 width = f->max_advance_width;
1293 XftFontClose (disp, f);
1294 f = 0;
1295
1296 success = false;
1297 break; 1324 break;
1298 } 1325 }
1299 1326
1300 if (prop.height == rxvt_fontprop::unset 1327 if (prop.height == rxvt_fontprop::unset
1301 || (height <= prop.height && glheight <= prop.height) 1328 || (height <= prop.height && glheight <= prop.height)
… …
1336bool 1363bool
1337rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const 1364rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
1338{ 1365{
1339 careful = false; 1366 careful = false;
1340 1367
1368#if ENABLE_COMBINING && !UNICODE_3
1369 // handle non-BMP characters when our storage uses 16 bit
1370 if (ecb_expect_false (IS_COMPOSE (unicode)))
1371 if (compose_char *cc = rxvt_composite[unicode])
1372 if (cc->c2 == NOCHAR)
1373 unicode = cc->c1;
1374#endif
1375
1341 if (!XftCharExists (term->dpy, f, unicode)) 1376 if (!XftCharExists (term->dpy, f, unicode))
1377 return false;
1378
1379 // some fonts claim they can render private use chars and then
1380 // render them as boxes.
1381 if (ecb_expect_false (IS_COMPOSE (unicode)))
1342 return false; 1382 return false;
1343 1383
1344 if (!prop || prop->width == rxvt_fontprop::unset) 1384 if (!prop || prop->width == rxvt_fontprop::unset)
1345 return true; 1385 return true;
1346 1386
… …
1391 1431
1392 while (len) 1432 while (len)
1393 { 1433 {
1394 int cwidth = term->fwidth; 1434 int cwidth = term->fwidth;
1395 FcChar32 fc = *text++; len--; 1435 FcChar32 fc = *text++; len--;
1436
1437#if ENABLE_COMBINING && !UNICODE_3
1438 // handle non-BMP characters when our storage uses 16 bit
1439 if (ecb_expect_false (IS_COMPOSE (fc)))
1440 if (compose_char *cc = rxvt_composite[fc]) // should always be true, but better be safe than sorry
1441 fc = cc->c1; // c2 must be NOCHAR, as has_char handles it that way
1442#endif
1396 1443
1397 while (len && *text == NOCHAR) 1444 while (len && *text == NOCHAR)
1398 text++, len--, cwidth += term->fwidth; 1445 text++, len--, cwidth += term->fwidth;
1399 1446
1400 if (fc != ' ') // skip spaces 1447 if (fc != ' ') // skip spaces
… …
1686} 1733}
1687 1734
1688int 1735int
1689rxvt_fontset::find_font_idx (unicode_t unicode) 1736rxvt_fontset::find_font_idx (unicode_t unicode)
1690{ 1737{
1691 if (unicode >= 1<<20) 1738 // this limits fmap size. it has to accomodate COMPOSE_HI when UNICODE_3
1739 if (unicode > 0x1fffff)
1692 return 0; 1740 return 0;
1693 1741
1694 unicode_t hi = unicode >> 8; 1742 unicode_t hi = unicode >> 8;
1695 1743
1696 if (hi < fmap.size () 1744 if (hi < fmap.size ())
1697 && fmap[hi] 1745 if (pagemap *pm = fmap[hi])
1698 && (*fmap[hi])[unicode & 0xff] != 0xff) 1746 if ((*pm)[unicode & 0xff] != 0xff)
1699 return (*fmap[hi])[unicode & 0xff]; 1747 return (*pm)[unicode & 0xff];
1700 1748
1701 unsigned int i; 1749 unsigned int i;
1702 1750
1703 for (i = 0; i < fonts.size (); i++) 1751 for (i = 0; i < fonts.size (); i++)
1704 { 1752 {
… …
1728 } 1776 }
1729 1777
1730 next_font: 1778 next_font:
1731 if (i == fonts.size () - 1) 1779 if (i == fonts.size () - 1)
1732 { 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
1733 if (fallback->name) 1786 if (fallback->name)
1734 { 1787 {
1735 // search through the fallback list 1788 // search through the fallback list
1736 push_font (new_font (fallback->name, fallback->cs)); 1789 push_font (new_font (fallback->name, fallback->cs));
1737 fallback++; 1790 fallback++;

Diff Legend

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