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.189 by root, Thu May 17 20:05:55 2012 UTC vs.
Revision 1.210 by root, Fri Jun 18 22:11:09 2021 UTC

… …
4 * Copyright (c) 2003-2008 Marc Lehmann <schmorp@schmorp.de> 4 * Copyright (c) 2003-2008 Marc Lehmann <schmorp@schmorp.de>
5 * - original version. 5 * - original version.
6 * 6 *
7 * This program is free software; you can redistribute it and/or modify 7 * This program is free software; you can redistribute it and/or modify
8 * it under the terms of the GNU General Public License as published by 8 * it under the terms of the GNU General Public License as published by
9 * the Free Software Foundation; either version 2 of the License, or 9 * the Free Software Foundation; either version 3 of the License, or
10 * (at your option) any later version. 10 * (at your option) any later version.
11 * 11 *
12 * This program is distributed in the hope that it will be useful, 12 * This program is distributed in the hope that it will be useful,
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of 13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
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_pixmap 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);
250 250
… …
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 ();
… …
934 // ignore characters we wouldn't use anyways 945 // ignore characters we wouldn't use anyways
935 bool careful; 946 bool careful;
936 if (!has_char (*t, &prop, careful)) 947 if (!has_char (*t, &prop, careful))
937 continue; 948 continue;
938 949
939 XChar2b ch = { *t >> 8, *t }; 950 // the casts are needed in C++11 (see 8.5.1)
951 XChar2b ch = { (unsigned char)(*t >> 8), (unsigned char)*t };
940 952
941 XCharStruct g; 953 XCharStruct g;
942 int dir_ret, asc_ret, des_ret; 954 int dir_ret, asc_ret, des_ret;
943 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); 955 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);
944 956
… …
1044 dTermDisplay; 1056 dTermDisplay;
1045 dTermGC; 1057 dTermGC;
1046 1058
1047 bool slow = this->slow 1059 bool slow = this->slow
1048 || width != term->fwidth 1060 || width != term->fwidth
1049 || height != term->fheight; 1061 || height != term->fheight
1062 || ascent != f->ascent;
1050 1063
1051 int base = ascent; // sorry, incorrect: term->fbase; 1064 int base = ascent; // sorry, incorrect: term->fbase;
1052 1065
1053 XGCValues v; 1066 XGCValues v;
1054 v.foreground = term->pix_colors[fg]; 1067 v.foreground = term->pix_colors[fg];
… …
1122 1135
1123///////////////////////////////////////////////////////////////////////////// 1136/////////////////////////////////////////////////////////////////////////////
1124 1137
1125#if XFT 1138#if XFT
1126 1139
1127struct rxvt_font_xft : rxvt_font { 1140struct rxvt_font_xft : rxvt_font
1141{
1128 rxvt_font_xft () { f = 0; } 1142 rxvt_font_xft ()
1143 {
1144 f = 0;
1145 }
1129 1146
1130 void clear (); 1147 void clear ();
1131 1148
1132 rxvt_fontprop properties (); 1149 rxvt_fontprop properties ();
1133 1150
… …
1275 if (glheight < g.height - g.y) glheight = g.height - g.y; 1292 if (glheight < g.height - g.y) glheight = g.height - g.y;
1276 } 1293 }
1277 1294
1278 if (!width) 1295 if (!width)
1279 { 1296 {
1280 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);
1281 1298 width = f->max_advance_width;
1282 XftFontClose (disp, f);
1283 f = 0;
1284
1285 success = false;
1286 break; 1299 break;
1287 } 1300 }
1288 1301
1289 if (prop.height == rxvt_fontprop::unset 1302 if (prop.height == rxvt_fontprop::unset
1290 || (height <= prop.height && glheight <= prop.height) 1303 || (height <= prop.height && glheight <= prop.height)
… …
1325bool 1338bool
1326rxvt_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
1327{ 1340{
1328 careful = false; 1341 careful = false;
1329 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
1330 if (!XftCharExists (term->dpy, f, unicode)) 1357 if (!XftCharExists (term->dpy, f, chr))
1331 return false; 1358 return false;
1332 1359
1333 if (!prop || prop->width == rxvt_fontprop::unset) 1360 if (!prop || prop->width == rxvt_fontprop::unset)
1334 return true; 1361 return true;
1335 1362
1336 // check character against base font bounding box 1363 int wcw = max (WCWIDTH (chr), 1);
1337 FcChar32 ch = unicode; 1364
1338 XGlyphInfo g; 1365 XGlyphInfo g;
1339 XftTextExtents32 (term->dpy, f, &ch, 1, &g); 1366 XftTextExtents32 (term->dpy, f, &chr, 1, &g);
1340 1367
1341 int w = g.width - g.x; 1368 int w = g.width - g.x;
1342 int wcw = max (WCWIDTH (unicode), 1);
1343 1369
1344 careful = g.x > 0 || w > prop->width * wcw; 1370 careful = g.x > 0 || w > prop->width * wcw;
1345 1371
1346 if (careful && !OVERLAP_OK (w, wcw, prop)) 1372 if (careful && !OVERLAP_OK (w, wcw, prop))
1347 return false; 1373 return false;
… …
1356void 1382void
1357rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, 1383rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1358 const text_t *text, int len, 1384 const text_t *text, int len,
1359 int fg, int bg) 1385 int fg, int bg)
1360{ 1386{
1361 XGlyphInfo extents;
1362 XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len); 1387 //XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len);//D
1363 XftGlyphSpec *ep = enc; 1388 //XftGlyphSpec *ep = enc;//D
1389 static vector<XftGlyphSpec> enc; enc.resize (0); // static to avoid malloc, still slow
1364 1390
1365 dTermDisplay; 1391 dTermDisplay;
1366 dTermGC; 1392 dTermGC;
1367 1393
1368 int w = term->fwidth * len; 1394 int w = term->fwidth * len;
… …
1379 int y_ = buffered ? 0 : y; 1405 int y_ = buffered ? 0 : y;
1380 1406
1381 while (len) 1407 while (len)
1382 { 1408 {
1383 int cwidth = term->fwidth; 1409 int cwidth = term->fwidth;
1384 FcChar32 fc = *text++; len--; 1410 FcChar32 chr = *text++; len--;
1411
1412 // handle non-bmp chars when text_t is 16 bit
1413 #if ENABLE_COMBINING && !UNICODE_3
1414 if (ecb_expect_false (IS_COMPOSE (chr)))
1415 if (compose_char *cc = rxvt_composite [chr])
1416 if (cc->c2 == NOCHAR)
1417 chr = cc->c1;
1418 #endif
1385 1419
1386 while (len && *text == NOCHAR) 1420 while (len && *text == NOCHAR)
1387 text++, len--, cwidth += term->fwidth; 1421 text++, len--, cwidth += term->fwidth;
1388 1422
1389 if (fc != ' ') // skip spaces 1423 if (chr != ' ') // skip spaces
1424 {
1425 #if 0
1426 FT_UInt glyphs [decltype (exp)::max_size];
1427
1428 for (int i = 0; i < nchrs; ++i)
1429 glyphs [i] = XftCharIndex (disp, f, chrs [i]);
1430
1431 for (int i = 0; i < nchrs; ++i)
1390 { 1432 {
1433 XGlyphInfo ep;
1434 XftGlyphExtents (disp, f, glyphs+i, 1, &ep);
1435 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);
1436 }
1437 #endif
1438
1391 FT_UInt glyph = XftCharIndex (disp, f, fc); 1439 FT_UInt glyph = XftCharIndex (disp, f, chr);
1440 XGlyphInfo extents;
1392 XftGlyphExtents (disp, f, &glyph, 1, &extents); 1441 XftGlyphExtents (disp, f, &glyph, 1, &extents);
1393 1442
1443 XftGlyphSpec ep;
1394 ep->glyph = glyph; 1444 ep.glyph = glyph;
1395 ep->x = x_ + (cwidth - extents.xOff >> 1); 1445 ep.x = x_;
1396 ep->y = y_ + ascent; 1446 ep.y = y_ + ascent;
1397 1447
1398 if (extents.xOff == 0) 1448 // the xft font cell might differ from the terminal font cell,
1399 ep->x = x_ + cwidth; 1449 // in which we use the average between the two
1450 ep.x += cwidth - extents.xOff >> 1;
1400 1451
1401 ep++; 1452 // xft/freetype represent combining characters as characters with zero
1453 // width rendered over the previous character with some fonts, while
1454 // in other fonts, they are considered normal characters, while yet
1455 // in other fonts, they are shifted all over the place.
1456 // we handle the first two cases by keying off on xOff being 0
1457 // for zero-width chars. normally, we would add extents.xOff
1458 // of the base chaarcter here, but we don't have that, so we use cwidth.
1459 ep.x += extents.xOff ? 0 : cwidth;
1460
1461 enc.push_back (ep);
1402 } 1462 }
1403 1463
1404 x_ += cwidth; 1464 x_ += cwidth;
1405 } 1465 }
1406 1466
1407 if (buffered) 1467 if (buffered)
1408 { 1468 {
1409 if (ep != enc) 1469 if (!enc.empty ())
1410 { 1470 {
1411 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); 1471 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1412 1472
1413#ifdef HAVE_BG_PIXMAP 1473#ifdef HAVE_IMG
1414 Picture dst = 0; // the only assignment is done conditionally in the following if condition 1474 Picture dst = 0; // the only assignment is done conditionally in the following if condition
1415 1475
1416 if (term->bg_pixmap 1476 if (term->bg_img
1417 && (bg == Color_transparent || bg == Color_bg 1477 && (bg == Color_transparent || bg == Color_bg
1418 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2)))))) 1478 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2))))))
1419 { 1479 {
1420 int src_x = x, src_y = y; 1480 int src_x = x, src_y = y;
1421 1481
… …
1423 { 1483 {
1424 src_x += term->window_vt_x; 1484 src_x += term->window_vt_x;
1425 src_y += term->window_vt_y; 1485 src_y += term->window_vt_y;
1426 } 1486 }
1427 1487
1428 if (term->bg_pmap_width >= src_x + w 1488 if (term->bg_img->w >= src_x + w
1429 && term->bg_pmap_height >= src_y + h) 1489 && term->bg_img->h >= src_y + h)
1430 { 1490 {
1431 XCopyArea (disp, term->bg_pixmap, d2, gc, 1491 XCopyArea (disp, term->bg_img->pm, d2, gc,
1432 src_x, src_y, w, h, 0, 0); 1492 src_x, src_y, w, h, 0, 0);
1433 } 1493 }
1434 else 1494 else
1435 { 1495 {
1436 XGCValues gcv; 1496 XGCValues gcv;
1437 1497
1438 gcv.fill_style = FillTiled; 1498 gcv.fill_style = FillTiled;
1439 gcv.tile = term->bg_pixmap; 1499 gcv.tile = term->bg_img->pm;
1440 gcv.ts_x_origin = -src_x; 1500 gcv.ts_x_origin = -src_x;
1441 gcv.ts_y_origin = -src_y; 1501 gcv.ts_y_origin = -src_y;
1442 1502
1443 XChangeGC (disp, gc, 1503 XChangeGC (disp, gc,
1444 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle, 1504 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
… …
1460 } 1520 }
1461 else 1521 else
1462#endif 1522#endif
1463 XftDrawRect (d2, &term->pix_colors[bg >= 0 ? bg : Color_bg].c, 0, 0, w, h); 1523 XftDrawRect (d2, &term->pix_colors[bg >= 0 ? bg : Color_bg].c, 0, 0, w, h);
1464 1524
1465 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc); 1525 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, &enc[0], enc.size ());
1466 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y); 1526 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
1467 } 1527 }
1468 else 1528 else
1469 clear_rect (d, x, y, w, h, bg); 1529 clear_rect (d, x, y, w, h, bg);
1470 } 1530 }
1471 else 1531 else
1472 { 1532 {
1473 clear_rect (d, x, y, w, h, bg); 1533 clear_rect (d, x, y, w, h, bg);
1474 XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc); 1534 XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, &enc[0], enc.size ());
1475 } 1535 }
1476} 1536}
1477 1537
1478#endif 1538#endif
1479 1539
… …
1499 1559
1500 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) 1560 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1501 (*i)->unref (); 1561 (*i)->unref ();
1502 1562
1503 for (pagemap **p = fmap.begin (); p != fmap.end (); p++) 1563 for (pagemap **p = fmap.begin (); p != fmap.end (); p++)
1504 delete [] *p; 1564 delete *p;
1505 1565
1506 free (fontdesc); fontdesc = 0; 1566 free (fontdesc); fontdesc = 0;
1507 1567
1508 fonts.clear (); 1568 fonts.clear ();
1509 1569
… …
1604 cs = codeset_from_name (spec + sizeof ("codeset=") - 1); 1664 cs = codeset_from_name (spec + sizeof ("codeset=") - 1);
1605 else 1665 else
1606 rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec); 1666 rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec);
1607 1667
1608 desc++; 1668 desc++;
1609 while (*desc <= ' ') desc++; 1669 while (*desc <= ' ' && *desc) desc++;
1610 } 1670 }
1611 1671
1612 end = strchr (desc, ','); 1672 end = strchr (desc, ',');
1613 if (!end) 1673 if (!end)
1614 end = desc + strlen (desc); 1674 end = desc + strlen (desc);
… …
1675} 1735}
1676 1736
1677int 1737int
1678rxvt_fontset::find_font_idx (unicode_t unicode) 1738rxvt_fontset::find_font_idx (unicode_t unicode)
1679{ 1739{
1680 if (unicode >= 1<<20) 1740 // this limits fmap size. it has to accomodate COMPOSE_HI when UNICODE_3
1741 if (unicode > 0x1fffff)
1681 return 0; 1742 return 0;
1682 1743
1683 unicode_t hi = unicode >> 8; 1744 unicode_t hi = unicode >> 8;
1684 1745
1685 if (hi < fmap.size () 1746 if (hi < fmap.size ())
1686 && fmap[hi] 1747 if (pagemap *pm = fmap[hi])
1687 && (*fmap[hi])[unicode & 0xff] != 0xff) 1748 if ((*pm)[unicode & 0xff] != 0xff)
1688 return (*fmap[hi])[unicode & 0xff]; 1749 return (*pm)[unicode & 0xff];
1689 1750
1690 unsigned int i; 1751 unsigned int i;
1691 1752
1692 for (i = 0; i < fonts.size (); i++) 1753 for (i = 0; i < fonts.size (); i++)
1693 { 1754 {
… …
1717 } 1778 }
1718 1779
1719 next_font: 1780 next_font:
1720 if (i == fonts.size () - 1) 1781 if (i == fonts.size () - 1)
1721 { 1782 {
1783 // compose characters are handled by the default font, unless another font takes over
1784 // we do not go via the fallback list for speed reasons.
1785 if (IS_COMPOSE (unicode))
1786 return 0;
1787
1722 if (fallback->name) 1788 if (fallback->name)
1723 { 1789 {
1724 // search through the fallback list 1790 // search through the fallback list
1725 push_font (new_font (fallback->name, fallback->cs)); 1791 push_font (new_font (fallback->name, fallback->cs));
1726 fallback++; 1792 fallback++;
… …
1732 // way to configure this and xft is easier to hack in, 1798 // way to configure this and xft is easier to hack in,
1733 // while x11 has more framework in place already. 1799 // while x11 has more framework in place already.
1734 // TODO: this is a real resource hog, xft takes ages(?) 1800 // TODO: this is a real resource hog, xft takes ages(?)
1735#if XFT && USE_SLOW_LOOKUP 1801#if XFT && USE_SLOW_LOOKUP
1736 // grab the first xft font that seems suitable 1802 // grab the first xft font that seems suitable
1803 // TOOD: should go first for cellchar (spacing 110) then mono, then else
1737 FcPattern *p = FcPatternCreate (); 1804 FcPattern *p = FcPatternCreate ();
1738 1805
1739 FcCharSet *s = FcCharSetCreate (); 1806 FcCharSet *s = FcCharSetCreate ();
1740 FcCharSetAddChar (s, unicode); 1807 FcCharSetAddChar (s, unicode);
1741 FcPatternAddCharSet (p, FC_CHARSET, s); 1808 FcPatternAddCharSet (p, FC_CHARSET, s);

Diff Legend

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