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.197 by root, Mon Jan 20 09:35:17 2020 UTC vs.
Revision 1.204 by root, Thu Jun 17 11:45:19 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 {
474 case '\t': 498 case '\t':
475 case ZERO_WIDTH_CHAR: 499 case ZERO_WIDTH_CHAR:
476 case NOCHAR: 500 case NOCHAR:
477 break; 501 break;
478 502
503 /*
504 * If the base font does not support variation selectors, treat them as ZWC.
505 * a point could be made to do this for all wcwidth == 0 characters, but I
506 * decided against that until more data is available.
507 */
508 case 0xfe00: case 0xfe01: case 0xfe02: case 0xfe03: case 0xfe04: case 0xfe05: case 0xfe06: case 0xfe07:
509 case 0xfe08: case 0xfe09: case 0xfe0a: case 0xfe0b: case 0xfe0c: case 0xfe0d: case 0xfe0e: case 0xfe0f:
510 break;
511
479 default: 512 default:
480 XDrawRectangle (disp, d, gc, x + 2, y + 2, 513 XDrawRectangle (disp, d, gc, x + 2, y + 2,
481 fwidth - 4, term->fheight - 4); 514 fwidth - 4, term->fheight - 4);
482 } 515 }
483 516
484 x += fwidth; 517 x += fwidth;
485 } 518 }
486} 519}
487 520
488struct rxvt_font_overflow : rxvt_font { 521struct rxvt_font_overflow : rxvt_font
522{
489 struct rxvt_fontset *fs; 523 struct rxvt_fontset *fs;
490 524
491 rxvt_font_overflow (rxvt_fontset *fs) 525 rxvt_font_overflow (rxvt_fontset *fs)
492 : rxvt_font () 526 : rxvt_font ()
493 { 527 {
… …
539 } 573 }
540}; 574};
541 575
542///////////////////////////////////////////////////////////////////////////// 576/////////////////////////////////////////////////////////////////////////////
543 577
544struct rxvt_font_x11 : rxvt_font { 578struct rxvt_font_x11 : rxvt_font
579{
545 rxvt_font_x11 () { f = 0; } 580 rxvt_font_x11 () { f = 0; }
546 581
547 void clear (); 582 void clear ();
548 583
549 rxvt_fontprop properties (); 584 rxvt_fontprop properties ();
… …
1124 1159
1125///////////////////////////////////////////////////////////////////////////// 1160/////////////////////////////////////////////////////////////////////////////
1126 1161
1127#if XFT 1162#if XFT
1128 1163
1129struct rxvt_font_xft : rxvt_font { 1164struct rxvt_font_xft : rxvt_font
1165{
1130 rxvt_font_xft () { f = 0; } 1166 rxvt_font_xft ()
1167 {
1168 can_compose = true;
1169 f = 0;
1170 }
1131 1171
1132 void clear (); 1172 void clear ();
1133 1173
1134 rxvt_fontprop properties (); 1174 rxvt_fontprop properties ();
1135 1175
… …
1277 if (glheight < g.height - g.y) glheight = g.height - g.y; 1317 if (glheight < g.height - g.y) glheight = g.height - g.y;
1278 } 1318 }
1279 1319
1280 if (!width) 1320 if (!width)
1281 { 1321 {
1282 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);
1283 1323 width = f->max_advance_width;
1284 XftFontClose (disp, f);
1285 f = 0;
1286
1287 success = false;
1288 break; 1324 break;
1289 } 1325 }
1290 1326
1291 if (prop.height == rxvt_fontprop::unset 1327 if (prop.height == rxvt_fontprop::unset
1292 || (height <= prop.height && glheight <= prop.height) 1328 || (height <= prop.height && glheight <= prop.height)
… …
1327bool 1363bool
1328rxvt_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
1329{ 1365{
1330 careful = false; 1366 careful = false;
1331 1367
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#endif
1374
1332 if (!XftCharExists (term->dpy, f, unicode)) 1375 if (!XftCharExists (term->dpy, f, unicode))
1376 return false;
1377
1378 // some fonts claim they can render private use chars and then
1379 // render them as boxes.
1380 if (ecb_expect_false (IS_COMPOSE (unicode)))
1333 return false; 1381 return false;
1334 1382
1335 if (!prop || prop->width == rxvt_fontprop::unset) 1383 if (!prop || prop->width == rxvt_fontprop::unset)
1336 return true; 1384 return true;
1337 1385
… …
1382 1430
1383 while (len) 1431 while (len)
1384 { 1432 {
1385 int cwidth = term->fwidth; 1433 int cwidth = term->fwidth;
1386 FcChar32 fc = *text++; len--; 1434 FcChar32 fc = *text++; len--;
1435
1436#if ENABLE_COMBINING && !UNICODE_3
1437 if (ecb_expect_false (IS_COMPOSE (fc)))
1438 if (compose_char *cc = rxvt_composite[fc]) // should always be true, but better be safe than sorry
1439 fc = cc->c1; // c2 must be NOCHAR, as has_char handles it that way
1440#endif
1387 1441
1388 while (len && *text == NOCHAR) 1442 while (len && *text == NOCHAR)
1389 text++, len--, cwidth += term->fwidth; 1443 text++, len--, cwidth += term->fwidth;
1390 1444
1391 if (fc != ' ') // skip spaces 1445 if (fc != ' ') // skip spaces
… …
1677} 1731}
1678 1732
1679int 1733int
1680rxvt_fontset::find_font_idx (unicode_t unicode) 1734rxvt_fontset::find_font_idx (unicode_t unicode)
1681{ 1735{
1682 if (unicode >= 1<<20) 1736 // this limits fmap size. it has to accomodate COMPOSE_HI when UNICODE_3
1737 if (unicode > 0x1fffff)
1683 return 0; 1738 return 0;
1684 1739
1685 unicode_t hi = unicode >> 8; 1740 unicode_t hi = unicode >> 8;
1686 1741
1687 if (hi < fmap.size () 1742 if (hi < fmap.size ())
1688 && fmap[hi] 1743 if (pagemap *pm = fmap[hi])
1689 && (*fmap[hi])[unicode & 0xff] != 0xff) 1744 if ((*pm)[unicode & 0xff] != 0xff)
1690 return (*fmap[hi])[unicode & 0xff]; 1745 return (*pm)[unicode & 0xff];
1691 1746
1692 unsigned int i; 1747 unsigned int i;
1693 1748
1694 for (i = 0; i < fonts.size (); i++) 1749 for (i = 0; i < fonts.size (); i++)
1695 { 1750 {
… …
1719 } 1774 }
1720 1775
1721 next_font: 1776 next_font:
1722 if (i == fonts.size () - 1) 1777 if (i == fonts.size () - 1)
1723 { 1778 {
1779 // compose characters are handled by the default font, unless another font takes over
1780 // we do not go via the fallback list for speed reasons.
1781 if (IS_COMPOSE (unicode))
1782 return 0;
1783
1724 if (fallback->name) 1784 if (fallback->name)
1725 { 1785 {
1726 // search through the fallback list 1786 // search through the fallback list
1727 push_font (new_font (fallback->name, fallback->cs)); 1787 push_font (new_font (fallback->name, fallback->cs));
1728 fallback++; 1788 fallback++;

Diff Legend

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